diff --git a/.cargo/config.toml b/.cargo/config.toml
index 4796a2c26965c1021d14c6acc854bca1aea76941..a5ff1d8dffa08affe3e1b20720eea65edc924813 100644
--- a/.cargo/config.toml
+++ b/.cargo/config.toml
@@ -1,4 +1,9 @@
-#
+[build]
+rustdocflags = [
+  "-Dwarnings",
+  "-Arustdoc::redundant_explicit_links", # stylistic
+]
+
 # An auto defined `clippy` feature was introduced,
 # but it was found to clash with user defined features,
 # so was renamed to `cargo-clippy`.
@@ -10,7 +15,7 @@ rustflags = [
   "-Aclippy::all",
   "-Dclippy::correctness",
   "-Aclippy::if-same-then-else",
-  "-Aclippy::clone-double-ref",
+  "-Asuspicious_double_ref_op",
   "-Dclippy::complexity",
   "-Aclippy::zero-prefixed-literal",     # 00_1000_000
   "-Aclippy::type_complexity",           # raison d'etre
@@ -30,4 +35,5 @@ rustflags = [
   "-Aclippy::derivable_impls",           # false positives
   "-Aclippy::stable_sort_primitive",     # prefer stable sort
   "-Aclippy::extra-unused-type-parameters", # stylistic
+  "-Aclippy::default_constructed_unit_structs", # stylistic
 ]
diff --git a/.config/lychee.toml b/.config/lychee.toml
new file mode 100644
index 0000000000000000000000000000000000000000..9b2ae069931769251fc26b57686fd1dbc5ff0b83
--- /dev/null
+++ b/.config/lychee.toml
@@ -0,0 +1,50 @@
+# Config file for lychee link checker: <https://github.com/lycheeverse/lychee>
+# Run with `lychee -c .config/lychee.toml ./**/*.rs ./**/*.prdoc`
+
+cache = true
+max_cache_age = "1d"
+max_redirects = 10
+max_retries = 6
+
+# Exclude localhost et.al.
+exclude_all_private = true
+
+# Treat these codes as success condition:
+accept = [
+	# Ok
+	200,
+
+	# Rate limited - GitHub likes to throw this.
+	429
+]
+
+exclude_path = [ "./target" ]
+
+exclude = [
+  # Place holders (no need to fix these):
+  "http://visitme/",
+  "https://visitme/",
+  
+  # TODO <https://github.com/paritytech/polkadot-sdk/issues/134>
+  "https://docs.substrate.io/main-docs/build/custom-rpc/#public-rpcs",
+  "https://docs.substrate.io/rustdocs/latest/sp_api/macro.decl_runtime_apis.html",
+  "https://github.com/ipfs/js-ipfs-bitswap/blob/",
+  "https://github.com/paritytech/polkadot-sdk/substrate/frame/timestamp",
+  "https://github.com/paritytech/substrate/frame/fast-unstake",
+  "https://github.com/zkcrypto/bls12_381/blob/e224ad4ea1babfc582ccd751c2bf128611d10936/src/test-data/mod.rs",
+  "https://polkadot.network/the-path-of-a-parachain-block/",
+  "https://research.web3.foundation/en/latest/polkadot/BABE/Babe/#6-practical-results",
+  "https://research.web3.foundation/en/latest/polkadot/block-production/Babe.html",
+  "https://research.web3.foundation/en/latest/polkadot/block-production/Babe.html#-6.-practical-results",
+  "https://research.web3.foundation/en/latest/polkadot/networking/3-avail-valid.html#topology",
+  "https://research.web3.foundation/en/latest/polkadot/NPoS/3.%20Balancing.html",
+  "https://research.web3.foundation/en/latest/polkadot/overview/2-token-economics.html",
+  "https://research.web3.foundation/en/latest/polkadot/overview/2-token-economics.html#inflation-model",
+  "https://research.web3.foundation/en/latest/polkadot/slashing/npos.html",
+  "https://research.web3.foundation/en/latest/polkadot/Token%20Economics.html#inflation-model",
+  "https://rpc.polkadot.io/",
+  "https://w3f.github.io/parachain-implementers-guide/node/approval/approval-distribution.html",
+  "https://w3f.github.io/parachain-implementers-guide/node/index.html",
+  "https://w3f.github.io/parachain-implementers-guide/protocol-chain-selection.html",
+  "https://w3f.github.io/parachain-implementers-guide/runtime/session_info.html",
+]
diff --git a/.github/.markdownlint.yaml b/.github/.markdownlint.yaml
new file mode 100644
index 0000000000000000000000000000000000000000..6a93d89c46ad4601505dd75ac252816fa4af5c40
--- /dev/null
+++ b/.github/.markdownlint.yaml
@@ -0,0 +1,210 @@
+# Default state for all rules
+default: true
+
+# Path to configuration file to extend
+extends: null
+
+# MD001/heading-increment/header-increment - Heading levels should only increment by one level at a time
+MD001: true
+
+# MD002/first-heading-h1/first-header-h1 - First heading should be a top-level heading
+MD002:
+  # Heading level
+  level: 1
+
+# MD003/heading-style/header-style - Heading style
+MD003:
+  # Heading style
+  style: "consistent"
+
+# MD004/ul-style - Unordered list style
+MD004:
+  # List style
+  style: "consistent"
+
+# MD005/list-indent - Inconsistent indentation for list items at the same level
+MD005: false
+
+# MD006/ul-start-left - Consider starting bulleted lists at the beginning of the line
+MD006: false
+
+# MD007/ul-indent - Unordered list indentation
+MD007: false
+
+# MD009/no-trailing-spaces - Trailing spaces
+MD009:
+  # Spaces for line break
+  br_spaces: 2
+  # Allow spaces for empty lines in list items
+  list_item_empty_lines: false
+  # Include unnecessary breaks
+  strict: false
+
+# MD010/no-hard-tabs - Hard tabs
+MD010: false
+
+# MD011/no-reversed-links - Reversed link syntax
+MD011: true
+
+# MD012/no-multiple-blanks - Multiple consecutive blank lines
+MD012:
+  # Consecutive blank lines
+  maximum: 2
+
+# MD013/line-length - Line length
+MD013:
+  # Number of characters
+  line_length: 120
+  # Number of characters for headings
+  heading_line_length: 120
+  # Number of characters for code blocks
+  code_block_line_length: 150
+  # Include code blocks
+  code_blocks: true
+  # Include tables
+  tables: true
+  # Include headings
+  headings: true
+  # Include headings
+  headers: true
+  # Strict length checking
+  strict: false
+  # Stern length checking
+  stern: false
+
+# MD014/commands-show-output - Dollar signs used before commands without showing output
+MD014: true
+
+# MD018/no-missing-space-atx - No space after hash on atx style heading
+MD018: true
+
+# MD019/no-multiple-space-atx - Multiple spaces after hash on atx style heading
+MD019: true
+
+# MD020/no-missing-space-closed-atx - No space inside hashes on closed atx style heading
+MD020: true
+
+# MD021/no-multiple-space-closed-atx - Multiple spaces inside hashes on closed atx style heading
+MD021: true
+
+# MD022/blanks-around-headings/blanks-around-headers - Headings should be surrounded by blank lines
+MD022: false
+
+# MD023/heading-start-left/header-start-left - Headings must start at the beginning of the line
+MD023: true
+
+# MD024/no-duplicate-heading/no-duplicate-header - Multiple headings with the same content
+MD024: false
+
+# MD025/single-title/single-h1 - Multiple top-level headings in the same document
+MD025: false
+
+# MD026/no-trailing-punctuation - Trailing punctuation in heading
+MD026:
+  # Punctuation characters
+  punctuation: ".,;:!。，；：！"
+
+# MD027/no-multiple-space-blockquote - Multiple spaces after blockquote symbol
+MD027: true
+
+# MD028/no-blanks-blockquote - Blank line inside blockquote
+MD028: true
+
+# MD029/ol-prefix - Ordered list item prefix
+MD029:
+  # List style
+  style: "one_or_ordered"
+
+# MD030/list-marker-space - Spaces after list markers
+MD030:
+  # Spaces for single-line unordered list items
+  ul_single: 1
+  # Spaces for single-line ordered list items
+  ol_single: 1
+  # Spaces for multi-line unordered list items
+  ul_multi: 1
+  # Spaces for multi-line ordered list items
+  ol_multi: 1
+
+# MD031/blanks-around-fences - Fenced code blocks should be surrounded by blank lines
+MD031: false
+
+# MD032/blanks-around-lists - Lists should be surrounded by blank lines
+MD032: false
+
+# MD033/no-inline-html - Inline HTML
+MD033: false
+
+# MD034/no-bare-urls - Bare URL used
+MD034: false
+
+# MD035/hr-style - Horizontal rule style
+MD035:
+  # Horizontal rule style
+  style: "consistent"
+
+# MD036/no-emphasis-as-heading/no-emphasis-as-header - Emphasis used instead of a heading
+MD036: false
+
+# MD037/no-space-in-emphasis - Spaces inside emphasis markers
+MD037: true
+
+# MD038/no-space-in-code - Spaces inside code span elements
+MD038: true
+
+# MD039/no-space-in-links - Spaces inside link text
+MD039: true
+
+# MD040/fenced-code-language - Fenced code blocks should have a language specified
+MD040: false
+
+# MD041/first-line-heading/first-line-h1 - First line in a file should be a top-level heading
+MD041: false
+
+# MD042/no-empty-links - No empty links
+MD042: true
+
+# MD043/required-headings/required-headers - Required heading structure
+MD043: false
+
+# MD044/proper-names - Proper names should have the correct capitalization
+MD044:
+  # List of proper names
+  names: ["Polkadot", "Substrate", "Cumulus", "Parity"]
+  # Include code blocks
+  code_blocks: false
+  # Include HTML elements
+  html_elements: false
+
+# MD045/no-alt-text - Images should have alternate text (alt text)
+MD045: false
+
+# MD046/code-block-style - Code block style
+MD046:
+  # Block style
+  style: "consistent"
+
+# MD047/single-trailing-newline - Files should end with a single newline character
+MD047: true
+
+# MD048/code-fence-style - Code fence style
+MD048:
+  # Code fence style
+  style: "consistent"
+
+# MD049/emphasis-style - Emphasis style should be consistent
+MD049: false
+
+# MD050/strong-style - Strong style should be consistent
+MD050:
+  # Strong style
+  style: "consistent"
+
+# MD051/link-fragments - Link fragments should be valid
+MD051: false
+
+# MD052/reference-links-images - Reference links and images should use a label that is defined
+MD052: false
+
+# MD053/link-image-reference-definitions - Link and image reference definitions should be needed
+MD053: false
diff --git a/.github/CODEOWNERS b/.github/CODEOWNERS
new file mode 100644
index 0000000000000000000000000000000000000000..fdaa0c8628f766e241ba9043698b611a0bd78811
--- /dev/null
+++ b/.github/CODEOWNERS
@@ -0,0 +1,75 @@
+# Lists some code owners.
+#
+# A codeowner just oversees some part of the codebase. If an owned file is changed then the
+# corresponding codeowner receives a review request. An approval of the codeowner might be
+# required for merging a PR (depends on repository settings).
+#
+# For details about syntax, see:
+# https://help.github.com/en/articles/about-code-owners
+# But here are some important notes:
+#
+# - Glob syntax is git-like, e.g. `/core` means the core directory in the root, unlike `core`
+#   which can be everywhere.
+# - Multiple owners are supported.
+# - Either handle (e.g, @github_user or @github/team) or email can be used. Keep in mind,
+#   that handles might work better because they are more recognizable on GitHub,
+#   eyou can use them for mentioning unlike an email.
+# - The latest matching rule, if multiple, takes precedence.
+
+# CI
+/.github/ @paritytech/ci @paritytech/release-engineering
+/.gitlab-ci.yml @paritytech/ci
+/.gitlab/ @paritytech/ci
+
+# XCM
+/polkadot/xcm/ @paritytech/xcm
+
+# WASM executor, low-level client <-> WASM interface and other WASM-related code
+/substrate/client/allocator/ @koute
+/substrate/client/executor/ @koute
+/substrate/primitives/panic-handler/ @koute
+/substrate/primitives/runtime-interface/ @koute
+/substrate/primitives/wasm-interface/ @koute
+/substrate/utils/wasm-builder/ @koute
+
+# Systems-related bits and bobs on the client side
+/substrate/client/sysinfo/ @koute
+/substrate/client/tracing/ @koute
+
+# Documentation audit
+/substrate/primitives/runtime @paritytech/docs-audit
+/substrate/primitives/arithmetic @paritytech/docs-audit
+# /primitives/core (to be added later)
+# /primitives/io (to be added later)
+
+# FRAME
+/substrate/frame/ @paritytech/frame-coders @paritytech/docs-audit
+/substrate/frame/nfts/ @jsidorenko @paritytech/docs-audit
+/substrate/frame/state-trie-migration/ @paritytech/frame-coders @cheme
+/substrate/frame/uniques/ @jsidorenko @paritytech/docs-audit
+
+# GRANDPA, BABE, consensus stuff
+/substrate/client/consensus/babe/ @andresilva
+/substrate/client/consensus/grandpa/ @andresilva
+/substrate/client/consensus/pow/ @sorpaas
+/substrate/client/consensus/slots/ @andresilva
+/substrate/frame/babe/ @andresilva
+/substrate/frame/grandpa/ @andresilva
+/substrate/primitives/consensus/pow/ @sorpaas
+
+# BEEFY, MMR
+/substrate/frame/beefy/ @acatangiu
+/substrate/frame/beefy-mmr/ @acatangiu
+/substrate/frame/merkle-mountain-range/ @acatangiu
+/substrate/primitives/merkle-mountain-range/ @acatangiu
+
+# Contracts
+/substrate/frame/contracts/ @athei @paritytech/docs-audit
+
+# NPoS and election
+/substrate/frame/election-provider-multi-phase/ @paritytech/staking-core @paritytech/docs-audit
+/substrate/frame/election-provider-support/ @paritytech/staking-core @paritytech/docs-audit
+/substrate/frame/elections-phragmen/ @paritytech/staking-core @paritytech/docs-audit
+/substrate/frame/nomination-pools/ @paritytech/staking-core @paritytech/docs-audit
+/substrate/frame/staking/ @paritytech/staking-core @paritytech/docs-audit
+/substrate/primitives/npos-elections/ @paritytech/staking-core @paritytech/docs-audit
diff --git a/cumulus/.github/ISSUE_TEMPLATE/blank.md b/.github/ISSUE_TEMPLATE/blank.md
similarity index 100%
rename from cumulus/.github/ISSUE_TEMPLATE/blank.md
rename to .github/ISSUE_TEMPLATE/blank.md
diff --git a/substrate/.github/ISSUE_TEMPLATE/bug.yaml b/.github/ISSUE_TEMPLATE/bug_report.yaml
similarity index 92%
rename from substrate/.github/ISSUE_TEMPLATE/bug.yaml
rename to .github/ISSUE_TEMPLATE/bug_report.yaml
index ae40df08eca761dc75a4a66cd3912666ba457912..f828a5d9d8931580713ba49a25c83643a74cf090 100644
--- a/substrate/.github/ISSUE_TEMPLATE/bug.yaml
+++ b/.github/ISSUE_TEMPLATE/bug_report.yaml
@@ -1,6 +1,7 @@
 name: Bug Report
 description: Let us know about an issue you experienced with this software
-# labels: ["some existing label","another one"]
+labels: [ I2-bug, I10-unconfirmed ]
+
 body:
   - type: checkboxes
     attributes:
@@ -20,7 +21,7 @@ body:
     id: bug
     attributes:
       label: Description of bug
-      # description: What seems to be the problem?
+      description: What seems to be the problem?
       # placeholder: Describe the problem.
     validations:
       required: true
diff --git a/substrate/.github/ISSUE_TEMPLATE/config.yml b/.github/ISSUE_TEMPLATE/config.yml
similarity index 100%
rename from substrate/.github/ISSUE_TEMPLATE/config.yml
rename to .github/ISSUE_TEMPLATE/config.yml
diff --git a/substrate/.github/ISSUE_TEMPLATE/feature.yaml b/.github/ISSUE_TEMPLATE/feature.yaml
similarity index 98%
rename from substrate/.github/ISSUE_TEMPLATE/feature.yaml
rename to .github/ISSUE_TEMPLATE/feature.yaml
index 6a59522ab4b4829fae056fcadf006393cbd58a1a..828e8b461ccc85179a2e71511a08f60f9d7588a8 100644
--- a/substrate/.github/ISSUE_TEMPLATE/feature.yaml
+++ b/.github/ISSUE_TEMPLATE/feature.yaml
@@ -1,6 +1,6 @@
 name: Feature Request
 description: Submit your requests and suggestions to improve!
-labels: ["J0-enhancement"]
+labels: [ I5-enhancement ]
 body:
   - type: checkboxes
     id: existing
diff --git a/.github/dependabot.yml b/.github/dependabot.yml
new file mode 100644
index 0000000000000000000000000000000000000000..3277a6e4607a74b2b59e24fce951e68c8703fcfc
--- /dev/null
+++ b/.github/dependabot.yml
@@ -0,0 +1,27 @@
+version: 2
+updates:
+  # Update github actions:
+  - package-ecosystem: github-actions
+    directory: '/'
+    labels: ["A1-insubstantial", "R0-silent"]
+    schedule:
+      interval: daily
+  # Update Rust dependencies:
+  - package-ecosystem: "cargo"
+    directory: "/"
+    labels: ["A1-insubstantial", "R0-silent"]
+    schedule:
+      interval: "daily"
+    groups:
+      # We assume these crates to be semver abiding and can therefore group them together.
+      known_good_semver:
+        patterns:
+        - "syn"
+        - "quote"
+        - "log"
+        - "paste"
+        - "*serde*"
+        - "clap"
+        update-types:
+        - "minor"
+        - "patch"
diff --git a/.github/pr-custom-review.yml b/.github/pr-custom-review.yml
index a453336bddb65aaf1a361b5c6e8de75f0e80f299..ac13d862a4ac2aee487de33de56fe34d6507c0dc 100644
--- a/.github/pr-custom-review.yml
+++ b/.github/pr-custom-review.yml
@@ -8,34 +8,18 @@ rules:
     check_type: changed_files
     condition:
       include: ^\.gitlab-ci\.yml|^docker/.*|^\.github/.*|^\.gitlab/.*|^\.config/nextest.toml|^\.cargo/.*
-      exclude: ^./gitlab/pipeline/zombienet.yml$
+      exclude: ^\.gitlab/pipeline/zombienet.*
     min_approvals: 2
     teams:
       - ci
       - release-engineering
 
-  - name: Audit rules
-    check_type: changed_files
-    condition:
-      include: ^polkadot/runtime\/(kusama|polkadot|common)\/.*|^polkadot/primitives/src\/.+\.rs$|^substrate/primitives/.*|^substrate/frame/.*
-      exclude: ^polkadot/runtime\/(kusama|polkadot)\/src\/weights\/.+\.rs$|^substrate\/frame\/.+\.md$
-    all_distinct:
-      - min_approvals: 1
-        teams:
-          - locks-review
-      - min_approvals: 1
-        teams:
-          - polkadot-review
-      - min_approvals: 1
-        teams:
-          - srlabs
-
   - name: Core developers
     check_type: changed_files
     condition:
       include: .*
       # excluding files from 'Runtime files' and 'CI files' rules
-      exclude: ^polkadot/runtime/(kusama|polkadot)/src/[^/]+\.rs$|^cumulus/parachains/runtimes/assets/(asset-hub-kusama|asset-hub-polkadot)/src/[^/]+\.rs$|^cumulus/parachains/runtimes/bridge-hubs/(bridge-hub-kusama|bridge-hub-polkadot)/src/[^/]+\.rs$|^cumulus/parachains/runtimes/collectives/collectives-polkadot/src/[^/]+\.rs$|^cumulus/parachains/common/src/[^/]+\.rs$|^substrate/frame/(?!.*(nfts/.*|uniques/.*|babe/.*|grandpa/.*|beefy|merkle-mountain-range/.*|contracts/.*|election|nomination-pools/.*|staking/.*|aura/.*))|^polkadot/runtime/(kusama|polkadot)/src/[^/]+\.rs$|^\.gitlab-ci\.yml|^(?!.*\.dic$|.*spellcheck\.toml$)scripts/ci/.*|^\.github/.*
+      exclude: ^polkadot/runtime/(kusama|polkadot)/src/[^/]+\.rs$|^cumulus/parachains/runtimes/assets/(asset-hub-kusama|asset-hub-polkadot)/src/[^/]+\.rs$|^cumulus/parachains/runtimes/bridge-hubs/(bridge-hub-kusama|bridge-hub-polkadot)/src/[^/]+\.rs$|^cumulus/parachains/runtimes/collectives/collectives-polkadot/src/[^/]+\.rs$|^cumulus/parachains/common/src/[^/]+\.rs$|^substrate/frame/(?!.*(nfts/.*|uniques/.*|babe/.*|grandpa/.*|beefy|merkle-mountain-range/.*|contracts/.*|election|nomination-pools/.*|staking/.*|aura/.*))|^polkadot/runtime/(kusama|polkadot)/src/[^/]+\.rs$|^\.gitlab-ci\.yml|^docker/.*|^\.github/.*|^\.gitlab/.*|^\.config/nextest.toml|^\.cargo/.*
     min_approvals: 2
     teams:
       - core-devs
@@ -55,7 +39,7 @@ rules:
   # if there are any changes in the bridges subtree (in case of backport changes back to bridges repo)
   - name: Bridges subtree files
     check_type: changed_files
-    condition: ^cumulus/bridges/.*
+    condition: ^bridges/.*
     min_approvals: 1
     teams:
       - bridges-core
diff --git a/.github/review-bot.yml b/.github/review-bot.yml
new file mode 100644
index 0000000000000000000000000000000000000000..581e33762608a298fdb0c251fa3414b06ea01de6
--- /dev/null
+++ b/.github/review-bot.yml
@@ -0,0 +1,120 @@
+rules:
+  - name: CI files
+    condition:
+      include: 
+        - ^\.gitlab-ci\.yml
+        - ^docker/.*
+        - ^\.github/.*
+        - ^\.gitlab/.*
+        - ^\.config/nextest.toml
+        - ^\.cargo/.*
+      exclude: 
+        - ^./gitlab/pipeline/zombienet.*
+    minApprovals: 2
+    type: basic
+    teams:
+      - ci
+      - release-engineering
+
+  - name: Audit rules
+    type: basic
+    condition:
+      include: 
+        - ^polkadot/runtime\/(kusama|polkadot|common)\/.*
+        - ^polkadot/primitives/src\/.+\.rs$
+        - ^substrate/primitives/.*
+        - ^substrate/frame/.*
+      exclude: 
+        - ^polkadot/runtime\/(kusama|polkadot)\/src\/weights\/.+\.rs$
+        - ^substrate\/frame\/.+\.md$
+    minApprovals: 1
+    allowedToSkipRule:
+      teams:
+        - core-devs
+    teams:
+      - srlabs
+
+  - name: Core developers
+    countAuthor: true
+    condition:
+      include:
+        - .*
+      # excluding files from 'Runtime files' and 'CI files' rules
+      exclude:
+        - ^polkadot/runtime/(kusama|polkadot)/src/[^/]+\.rs$
+        - ^cumulus/parachains/runtimes/assets/(asset-hub-kusama|asset-hub-polkadot)/src/[^/]+\.rs$
+        - ^cumulus/parachains/runtimes/bridge-hubs/(bridge-hub-kusama|bridge-hub-polkadot)/src/[^/]+\.rs$
+        - ^cumulus/parachains/runtimes/collectives/collectives-polkadot/src/[^/]+\.rs$
+        - ^cumulus/parachains/common/src/[^/]+\.rs$
+        - ^substrate/frame/(?!.*(nfts/.*|uniques/.*|babe/.*|grandpa/.*|beefy|merkle-mountain-range/.*|contracts/.*|election|nomination-pools/.*|staking/.*|aura/.*))
+        - ^polkadot/runtime/(kusama|polkadot)/src/[^/]+\.rs$
+        - ^\.gitlab-ci\.yml
+        - ^docker/.*
+        - ^\.github/.*
+        - ^\.gitlab/.*
+        - ^\.config/nextest.toml
+        - ^\.cargo/.*
+    minApprovals: 2
+    type: basic
+    teams:
+      - core-devs
+
+  # cumulus
+  - name: Runtime files cumulus
+    countAuthor: true
+    condition:
+      include:
+        - ^cumulus/parachains/runtimes/assets/(asset-hub-kusama|asset-hub-polkadot)/src/[^/]+\.rs$
+        - ^cumulus/parachains/runtimes/bridge-hubs/(bridge-hub-kusama|bridge-hub-polkadot)/src/[^/]+\.rs$
+        - ^cumulus/parachains/runtimes/collectives/collectives-polkadot/src/[^/]+\.rs$
+        - ^cumulus/parachains/common/src/[^/]+\.rs$
+    type: and-distinct
+    reviewers:
+      - minApprovals: 1
+        teams:
+          - locks-review
+      - minApprovals: 1
+        teams:
+          - polkadot-review
+
+  # if there are any changes in the bridges subtree (in case of backport changes back to bridges repo)
+  - name: Bridges subtree files
+    type: basic
+    condition: 
+      include:
+        - ^bridges/.*
+    minApprovals: 1
+    teams:
+      - bridges-core
+
+  # substrate
+
+  - name: FRAME coders substrate
+    condition:
+      include: 
+        - ^substrate/frame/(?!.*(nfts/.*|uniques/.*|babe/.*|grandpa/.*|beefy|merkle-mountain-range/.*|contracts/.*|election|nomination-pools/.*|staking/.*|aura/.*))
+    type: "and"
+    reviewers:
+      - minApprovals: 2
+        teams:
+          - core-devs
+      - minApprovals: 1
+        teams:
+          - frame-coders
+
+  # Protection of THIS file
+  - name: Review Bot
+    condition:
+      include: 
+        - review-bot\.yml
+    type: "and"
+    reviewers:
+      - minApprovals: 1
+        teams:
+          - opstooling
+      - minApprovals: 1
+        teams:
+          - locks-review
+      - minApprovals: 1
+        teams:
+          - ci
diff --git a/polkadot/scripts/ci/common/lib.sh b/.github/scripts/common/lib.sh
similarity index 98%
rename from polkadot/scripts/ci/common/lib.sh
rename to .github/scripts/common/lib.sh
index e490ec22d5bf4f845c6c662122f8849b0f39d534..b0f9cb32063a43cda58d2e6e8f25e0ff66a134eb 100755
--- a/polkadot/scripts/ci/common/lib.sh
+++ b/.github/scripts/common/lib.sh
@@ -201,6 +201,7 @@ check_bootnode(){
 fetch_release_artifacts() {
   echo "Release ID : $RELEASE_ID"
   echo "Repo       : $REPO"
+  echo "Binary     : $BINARY"
 
   curl -L -s \
     -H "Accept: application/vnd.github+json" \
@@ -213,8 +214,8 @@ fetch_release_artifacts() {
   count=$(jq '.assets|length' < release.json )
 
   # Fetch artifacts
-  mkdir -p "./release-artifacts"
-  pushd "./release-artifacts" > /dev/null
+  mkdir -p "./release-artifacts/${BINARY}"
+  pushd "./release-artifacts/${BINARY}" > /dev/null
 
   iter=1
   for id in "${ids[@]}"
diff --git a/.github/workflows/check-D-labels.yml b/.github/workflows/check-D-labels.yml
deleted file mode 100644
index 94a818fcc2a3dc4309c0a2412e3802fea1cbbbf4..0000000000000000000000000000000000000000
--- a/.github/workflows/check-D-labels.yml
+++ /dev/null
@@ -1,54 +0,0 @@
-# name: Check D labels
-# disabled in favor of pr-custom-review
-
-# on:
-#   pull_request:
-#     types: [labeled, opened, synchronize, unlabeled]
-#     paths:
-#       - cumulus/primitives/**
-#       - polkadot/runtime/polkadot/**
-#       - polkadot/runtime/kusama/**
-#       - polkadot/runtime/common/**
-#       - polkadot/primitives/src/**
-#       - substrate/frame/**
-#       - substrate/primitives/**
-
-# jobs:
-#   check-labels:
-#     runs-on: ubuntu-latest
-#     steps:
-#       - name: Pull image
-#         env:
-#           IMAGE: paritytech/ruled_labels:0.4.0
-#         run: docker pull $IMAGE
-
-#       - name: Check labels
-#         env:
-#           IMAGE: paritytech/ruled_labels:0.4.0
-#           MOUNT: /work
-#           GITHUB_PR: ${{ github.event.pull_request.number }}
-#           GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
-#           API_BASE: https://api.github.com/repos
-#           REPO: ${{ github.repository }}
-#           RULES_PATH: labels/ruled_labels
-#           CHECK_SPECS: specs_cumulus.yaml
-#         run: |
-#           echo "REPO: ${REPO}"
-#           echo "GITHUB_PR: ${GITHUB_PR}"
-#           # Clone repo with labels specs
-#           git clone https://github.com/paritytech/labels
-#           # Fetch the labels for the PR under test
-#           labels=$( curl -H "Authorization: token ${GITHUB_TOKEN}" -s "$API_BASE/${REPO}/pulls/${GITHUB_PR}" | jq '.labels | .[] | .name' | tr "\n" ",")
-
-#           if [ -z "${labels}" ]; then
-#             docker run --rm -i -v $PWD/${RULES_PATH}/:$MOUNT $IMAGE check $MOUNT/$CHECK_SPECS --tags audit --no-label
-#           fi
-
-#           labels_args=${labels: :-1}
-#           printf "Checking labels: %s\n" "${labels_args}"
-
-#           # Prevent the shell from splitting labels with spaces
-#           IFS=","
-
-#           # --dev is more useful to debug mode to debug
-#           docker run --rm -i -v $PWD/${RULES_PATH}/:$MOUNT $IMAGE check $MOUNT/$CHECK_SPECS --labels ${labels_args} --dev --tags audit
diff --git a/.github/workflows/check-licenses.yml b/.github/workflows/check-licenses.yml
index 39104c3a4a811d23ddf865963183b72c7c33dbb7..a5c4f2577c0019b91d4ba94da46b2dc7f15e2ec4 100644
--- a/.github/workflows/check-licenses.yml
+++ b/.github/workflows/check-licenses.yml
@@ -3,24 +3,43 @@ name: Check licenses
 on:
   pull_request:
 
+permissions:
+  packages: read
+
 jobs:
   check-licenses:
     runs-on: ubuntu-22.04
+    env:
+      LICENSES: "'Apache-2.0' 'GPL-3.0-only' 'GPL-3.0-or-later WITH Classpath-exception-2.0'"
+      NODE_AUTH_TOKEN: ${{ secrets.GITHUB_TOKEN }}
     steps:
       - name: Checkout sources
-        uses: actions/checkout@v3
+        uses: actions/checkout@8ade135a41bc03ea155e62e844d188df1ea18608 # v4.1.0
       - uses: actions/setup-node@v3.8.1
         with:
-          node-version: '18.x'
-          registry-url: 'https://npm.pkg.github.com'
-          scope: '@paritytech'
-      - name: Check the licenses
+          node-version: "18.x"
+          registry-url: "https://npm.pkg.github.com"
+          scope: "@paritytech"
+        
+      - name: Check the licenses in Polkadot
+        run: |
+          shopt -s globstar
+          npx @paritytech/license-scanner scan \
+            --ensure-licenses ${{ env.LICENSES }} \
+            -- ./polkadot/**/*.rs
+
+      - name: Check the licenses in Cumulus
         run: |
           shopt -s globstar
+          npx @paritytech/license-scanner scan \
+            --ensure-licenses ${{ env.LICENSES }} \
+            --exclude ./cumulus/parachain-template \
+            -- ./cumulus/**/*.rs
 
-          npx --yes https://github.com/paritytech/license-scanner scan \
-            --ensure-licenses=Apache-2.0 \
-            --ensure-licenses=GPL-3.0-only \
-            ./**/*.rs
-        env:
-          NODE_AUTH_TOKEN: ${{ secrets.GITHUB_TOKEN }}
+      - name: Check the licenses in Substrate
+        run: |
+          shopt -s globstar
+          npx @paritytech/license-scanner scan \
+            --ensure-licenses ${{ env.LICENSES }} \
+            --exclude ./substrate/bin/node-template \
+            -- ./substrate/**/*.rs
diff --git a/.github/workflows/check-links.yml b/.github/workflows/check-links.yml
new file mode 100644
index 0000000000000000000000000000000000000000..ec606f1b1487563766092bdfcdafcdc49d4c19d7
--- /dev/null
+++ b/.github/workflows/check-links.yml
@@ -0,0 +1,40 @@
+name: Check links
+
+on:
+  pull_request:
+    paths:
+      - "*.rs"
+      - "*.prdoc"
+      - ".github/workflows/check-links.yml"
+      - ".config/lychee.toml"
+    types: [opened, synchronize, reopened, ready_for_review]
+
+permissions:
+  packages: read
+
+jobs:
+  link-checker:
+    runs-on: ubuntu-latest
+    steps:
+      - name: Restore lychee cache
+        uses: actions/cache@704facf57e6136b1bc63b828d79edcd491f0ee84 # v3.3.2 (7. Sep 2023)
+        with:
+          path: .lycheecache
+          key: cache-lychee-${{ github.sha }}
+          # This should restore from the most recent one:
+          restore-keys: cache-lychee-
+
+      - uses: actions/checkout@8ade135a41bc03ea155e62e844d188df1ea18608 # v4.1.0 (22. Sep 2023)
+
+      - name: Lychee link checker
+        uses: lycheeverse/lychee-action@2ac9f030ccdea0033e2510a23a67da2a2da98492 # for v1.8.0 (15. May 2023)
+        with:
+          args: >-
+            --config .config/lychee.toml
+            --no-progress
+            './**/*.rs'
+            './**/*.prdoc'
+          fail: true
+        env:
+          # To bypass GitHub rate-limit:
+          GITHUB_TOKEN: ${{secrets.GITHUB_TOKEN}}
diff --git a/.github/workflows/check-markdown.yml b/.github/workflows/check-markdown.yml
new file mode 100644
index 0000000000000000000000000000000000000000..be676d3c1e8c85afc4ee39a6427105487c6a5d53
--- /dev/null
+++ b/.github/workflows/check-markdown.yml
@@ -0,0 +1,33 @@
+name: Check Markdown
+
+on:
+  pull_request:
+    types: [opened, synchronize, reopened, ready_for_review]
+
+permissions:
+  packages: read
+
+jobs:
+  lint-markdown:
+    runs-on: ubuntu-latest
+
+    steps:
+      - name: Checkout sources
+        uses: actions/checkout@8ade135a41bc03ea155e62e844d188df1ea18608 # v4.1.0
+
+      - uses: actions/setup-node@v3.8.1
+        with:
+          node-version: "18.x"
+          registry-url: "https://npm.pkg.github.com"
+          scope: "@paritytech"
+
+      - name: Install tooling
+        run: |
+            npm install -g markdownlint-cli
+            markdownlint --version
+
+      - name: Check Markdown
+        env:
+          CONFIG: .github/.markdownlint.yaml
+        run: |
+          markdownlint --config "$CONFIG" --ignore target .
diff --git a/.github/workflows/check-prdoc.yml b/.github/workflows/check-prdoc.yml
new file mode 100644
index 0000000000000000000000000000000000000000..23ae2d1aca9dc7e9cdaa099402332dfb543e9641
--- /dev/null
+++ b/.github/workflows/check-prdoc.yml
@@ -0,0 +1,49 @@
+name: Check PRdoc
+
+on:
+  pull_request:
+    types: [labeled, opened, synchronize, unlabeled]
+
+env:
+  IMAGE: paritytech/prdoc:latest
+  API_BASE: https://api.github.com/repos
+  REPO: ${{ github.repository }}
+  GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
+  GITHUB_PR: ${{ github.event.pull_request.number }}
+  MOUNT: /prdoc
+  ENGINE: docker
+
+jobs:
+  check-prdoc:
+    runs-on: ubuntu-latest
+    steps:
+      - name: Pull image
+        run: |
+          echo "Pulling $IMAGE"
+          docker pull $IMAGE
+          docker run --rm $IMAGE --version
+
+      - name: Check if PRdoc is required
+        id: get-labels
+        run: |
+          # Fetch the labels for the PR under test
+          echo "Fetch the labels for $API_BASE/${REPO}/pulls/${GITHUB_PR}"
+          labels=$( curl -H "Authorization: token ${GITHUB_TOKEN}" -s "$API_BASE/${REPO}/pulls/${GITHUB_PR}" | jq '.labels | .[] | .name' | tr "\n" ",")
+          echo "Labels: ${labels}"
+          echo "labels=${labels}" >> "$GITHUB_OUTPUT"
+
+      - name: No PRdoc required
+        if: ${{ contains(steps.get-labels.outputs.labels, 'R0') }}
+        run: |
+          echo "PR detected as silent, no PRdoc is required, exiting..."
+          exit 0
+
+      - name: Checkout repo
+        if: ${{ !contains(steps.get-labels.outputs.labels, 'R0') }}
+        uses: actions/checkout@8ade135a41bc03ea155e62e844d188df1ea18608 #v4.1.0
+
+      - name: PRdoc check for PR#${{ github.event.pull_request.number }}
+        if: ${{ !contains(steps.get-labels.outputs.labels, 'R0') }}
+        run: |
+          echo "Checking for PR#${GITHUB_PR} in $MOUNT"
+          $ENGINE run --rm -v $PWD/prdoc:/doc $IMAGE check -n ${GITHUB_PR} || true
diff --git a/.github/workflows/fmt-check.yml b/.github/workflows/fmt-check.yml
index fd4b72061b925dfb3f6e4193a6b1fb97c0de75d8..db93a3d53a76ceab86879ffa8740df380ddeb2d2 100644
--- a/.github/workflows/fmt-check.yml
+++ b/.github/workflows/fmt-check.yml
@@ -16,7 +16,7 @@ jobs:
     container:
       image: paritytech/ci-unified:bullseye-1.70.0-2023-05-23-v20230706
     steps:
-      - uses: actions/checkout@c85c95e3d7251135ab7dc9ce3241c5835cc595a9 # v3.5.3
+      - uses: actions/checkout@8ade135a41bc03ea155e62e844d188df1ea18608 # v4.1.0
 
       - name: Cargo fmt
         run: cargo +nightly fmt --all -- --check
diff --git a/.github/workflows/release-50_publish-docker.yml b/.github/workflows/release-50_publish-docker.yml
new file mode 100644
index 0000000000000000000000000000000000000000..71677fc36d46432df1aae22f56f98103be9f9f49
--- /dev/null
+++ b/.github/workflows/release-50_publish-docker.yml
@@ -0,0 +1,287 @@
+name: Release - Publish Docker Image
+
+# This workflow listens to published releases or can be triggered manually.
+# It builds and published releases and rc candidates.
+
+on:
+  #TODO: activate automated run later
+  # release:
+  #  types:
+  #    - published
+  workflow_dispatch:
+    inputs:
+      image_type:
+        description: Type of the image to be published
+        required: true
+        default: rc
+        type: choice
+        options:
+          - rc
+          - release
+
+      binary:
+        description: Binary to be published
+        required: true
+        default: polkadot
+        type: choice
+        options:
+          - polkadot
+          - polkadot-parachain
+
+      release_id:
+        description: |
+          Release ID.
+          You can find it using the command:
+          curl -s \
+            -H "Authorization: Bearer ${GITHUB_TOKEN}" https://api.github.com/repos/$OWNER/$REPO/releases | \
+            jq '.[] | { name: .name, id: .id }'
+        required: true
+        type: string
+
+      registry:
+        description: Container registry
+        required: true
+        type: string
+        default: docker.io
+
+      # The owner is often the same than the Docker Hub username but does ont have to be.
+      # In our case, it is not.
+      owner:
+        description: Owner of the container image repo
+        required: true
+        type: string
+        default: parity
+
+      version:
+        description: version to build/release
+        default: v0.9.18
+        required: true
+
+permissions:
+  contents: write
+
+env:
+  RELEASE_ID: ${{ inputs.release_id }}
+  ENGINE: docker
+  REGISTRY: ${{ inputs.registry }}
+  GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
+  DOCKER_OWNER: ${{ inputs.owner || github.repository_owner }}
+  REPO: ${{ github.repository }}
+  BINARY: ${{ inputs.binary }}
+  # EVENT_ACTION: ${{ github.event.action }}
+  EVENT_NAME: ${{ github.event_name }}
+  IMAGE_TYPE: ${{ inputs.image_type }}
+
+jobs:
+  fetch-artifacts: # this job will be triggered for the polkadot-parachain rc and release or polkadot rc image build
+    if: ${{ inputs.binary == 'polkadot-parachain' || inputs.image_type == 'rc' }}
+    runs-on: ubuntu-latest
+
+    steps:
+      - name: Checkout sources
+        uses: actions/checkout@8ade135a41bc03ea155e62e844d188df1ea18608 # v4.1.0
+
+      #TODO: this step will be needed when automated triggering will work
+        #this step runs only if the workflow is triggered automatically when new release is published
+        # if: ${{ env.EVENT_NAME == 'release' && env.EVENT_ACTION != '' && env.EVENT_ACTION == 'published' }}
+        # run: |
+        #   mkdir -p release-artifacts && cd release-artifacts
+
+        #   for f in $BINARY $BINARY.asc $BINARY.sha256; do
+        #     URL="https://github.com/${{ github.event.repository.full_name }}/releases/download/${{ github.event.release.tag_name }}/$f"
+        #     echo " - Fetching $f from $URL"
+        #     wget "$URL" -O "$f"
+        #   done
+        #   chmod a+x $BINARY
+        #   ls -al
+
+      - name: Fetch rc artifacts or release artifacts based on release id
+        #this step runs only if the workflow is triggered manually
+        if: ${{ env.EVENT_NAME  == 'workflow_dispatch' }}
+        run: |
+          . ./.github/scripts/common/lib.sh
+
+          fetch_release_artifacts
+
+      - name: Cache the artifacts
+        uses: actions/cache@704facf57e6136b1bc63b828d79edcd491f0ee84 # v3.3.2
+        with:
+          key: artifacts-${{ env.BINARY }}-${{ github.sha }}
+          path: |
+            ./release-artifacts/${{ env.BINARY }}/**/*
+
+  build-container: # this job will be triggered for the polkadot-parachain rc and release or polkadot rc image build
+    if: ${{ inputs.binary == 'polkadot-parachain' || inputs.image_type == 'rc' }}
+    runs-on: ubuntu-latest
+    needs: fetch-artifacts
+    environment: master
+
+    steps:
+      - name: Checkout sources
+        uses: actions/checkout@8ade135a41bc03ea155e62e844d188df1ea18608 # v4.1.0
+
+      - name: Get artifacts from cache
+        uses: actions/cache@704facf57e6136b1bc63b828d79edcd491f0ee84 # v3.3.2
+        with:
+          key: artifacts-${{ env.BINARY }}-${{ github.sha }}
+          fail-on-cache-miss: true
+          path: |
+            ./release-artifacts/${{ env.BINARY }}/**/*
+
+      - name: Check sha256 ${{ env.BINARY }}
+        working-directory: ./release-artifacts/${{ env.BINARY }}
+        run: |
+          . ../../.github/scripts/common/lib.sh
+
+          echo "Checking binary $BINARY"
+          check_sha256 $BINARY && echo "OK" || echo "ERR"
+
+      - name: Check GPG ${{ env.BINARY }}
+        working-directory: ./release-artifacts/${{ env.BINARY }}
+        run: |
+          . ../../.github/scripts/common/lib.sh
+          import_gpg_keys
+          check_gpg $BINARY
+
+      - name: Fetch rc commit and tag
+        if: ${{ env.IMAGE_TYPE == 'rc' }}
+        id: fetch_rc_refs
+        run: |
+          release=release-${{ inputs.release_id }} && \
+          echo "release=${release}" >> $GITHUB_OUTPUT
+
+          commit=$(git rev-parse --short HEAD) && \
+          echo "commit=${commit}" >> $GITHUB_OUTPUT
+
+          tag=$(git name-rev --tags --name-only $(git rev-parse HEAD)) && \
+          [ "${tag}" != "undefined" ] && echo "tag=${tag}" >> $GITHUB_OUTPUT || \
+          echo "No tag, doing without"
+
+      - name: Fetch release tags
+        working-directory: ./release-artifacts/${{ env.BINARY }}
+        if: ${{ env.IMAGE_TYPE == 'release'}}
+        id: fetch_release_refs
+        run: |
+          chmod a+rx $BINARY
+          VERSION=$(./$BINARY --version | awk '{ print $2 }' )
+          release=$( echo $VERSION | cut -f1 -d- )
+          echo "tag=latest" >> $GITHUB_OUTPUT
+          echo "release=${release}" >> $GITHUB_OUTPUT
+
+      - name: Build Injected Container image for polkadot rc
+        if: ${{ env.BINARY == 'polkadot' }}
+        env:
+          ARTIFACTS_FOLDER: ./release-artifacts
+          IMAGE_NAME: ${{ env.BINARY }}
+          OWNER: ${{ env.DOCKER_OWNER }}
+          TAGS: ${{ join(steps.fetch_rc_refs.outputs.*, ',') || join(steps.fetch_release_refs.outputs.*, ',') }}
+        run: |
+          ls -al
+          echo "Building container for $BINARY"
+          ./docker/scripts/build-injected.sh
+
+      - name: Build Injected Container image for polkadot-parachain
+        if: ${{ env.BINARY == 'polkadot-parachain' }}
+        env:
+          ARTIFACTS_FOLDER: ./release-artifacts
+          IMAGE_NAME: ${{ env.BINARY }}
+          OWNER: ${{ env.DOCKER_OWNER }}
+          DOCKERFILE: docker/dockerfiles/polkadot-parachain/polkadot-parachain_injected.Dockerfile
+          TAGS: ${{ join(steps.fetch_rc_refs.outputs.*, ',') || join(steps.fetch_release_refs.outputs.*, ',') }}
+        run: |
+          ls -al
+          mkdir -p $ARTIFACTS_FOLDER/specs
+          cp cumulus/parachains/chain-specs/*.json $ARTIFACTS_FOLDER/specs
+
+          echo "Building container for $BINARY"
+          ./docker/scripts/build-injected.sh
+
+      - name: Login to Dockerhub
+        uses: docker/login-action@343f7c4344506bcbf9b4de18042ae17996df046d # v3.0.0
+        with:
+          username: ${{ secrets.CUMULUS_DOCKERHUB_USERNAME }}
+          password: ${{ secrets.CUMULUS_DOCKERHUB_TOKEN }}
+
+      - name: Push Container image for ${{ env.BINARY }}
+        id: docker_push
+        run: |
+          $ENGINE images | grep ${BINARY}
+          $ENGINE push --all-tags ${REGISTRY}/${DOCKER_OWNER}/${BINARY}
+
+      - name: Check version for the published image for ${{ env.BINARY }}
+        env:
+          RELEASE_TAG: ${{ steps.fetch_rc_refs.outputs.release || steps.fetch_release_refs.outputs.release  }}
+        run: |
+          echo "Checking tag ${RELEASE_TAG} for image ${REGISTRY}/${DOCKER_OWNER}/${BINARY}"
+          $ENGINE run -i ${REGISTRY}/${DOCKER_OWNER}/${BINARY}:${RELEASE_TAG} --version
+
+  fetch-latest-debian-package-version: # this job will be triggered for polkadot release build
+    if: ${{ inputs.binary == 'polkadot' && inputs.image_type == 'release' }}
+    runs-on: ubuntu-latest
+    outputs:
+      polkadot_apt_version: ${{ steps.fetch-latest-apt.outputs.polkadot_apt_version }}
+    container:
+      image: paritytech/parity-keyring
+      options: --user root
+    steps:
+      - name: Get version
+        id: fetch-latest-apt
+        run: |
+          apt update
+          apt show polkadot
+          version=$(apt show polkadot 2>/dev/null | grep "Version:" | awk '{print $2}')
+          echo "polkadot_apt_version=v$version" >> $GITHUB_OUTPUT
+          echo "You passed ${{ inputs.version }} but this is ignored"
+          echo "We use the version from the Debian Package: $version"
+
+  build-polkadot-release-container: # this job will be triggered for polkadot release build
+    if: ${{ inputs.binary == 'polkadot' && inputs.image_type == 'release' }}
+    runs-on: ubuntu-latest
+    needs: fetch-latest-debian-package-version
+    environment: master
+    steps:
+      - name: Checkout sources
+        uses: actions/checkout@8ade135a41bc03ea155e62e844d188df1ea18608 # v4.1.0
+
+      - name: Set up Docker Buildx
+        uses: docker/setup-buildx-action@f95db51fddba0c2d1ec667646a06c2ce06100226 # v3.0.0
+
+      - name: Cache Docker layers
+        uses: actions/cache@704facf57e6136b1bc63b828d79edcd491f0ee84 # v3.3.2
+        with:
+         path: /tmp/.buildx-cache
+         key: ${{ runner.os }}-buildx-${{ github.sha }}
+         restore-keys: |
+           ${{ runner.os }}-buildx-
+
+      - name: Login to Docker Hub
+        uses: docker/login-action@343f7c4344506bcbf9b4de18042ae17996df046d # v3.0.0
+        with:
+          username: ${{ secrets.POLKADOT_DOCKERHUB_USERNAME }}
+          password: ${{ secrets.POLKADOT_DOCKERHUB_TOKEN }}
+
+      - name: Fetch values
+        id: fetch-data
+        run: |
+          date=$(date -u '+%Y-%m-%dT%H:%M:%SZ')
+          echo "date=$date" >> $GITHUB_OUTPUT
+
+      - name: Build and push
+        id:   docker_build
+        uses: docker/build-push-action@0565240e2d4ab88bba5387d719585280857ece09 #  v5.0.0
+        with:
+          push: true
+          file: docker/dockerfiles/polkadot/polkadot_injected_debian.Dockerfile
+          # 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: |
+            parity/polkadot:latest
+            parity/polkadot:${{ needs.fetch-latest-debian-package-version.outputs.polkadot_apt_version }}
+          build-args: |
+            VCS_REF=${{ github.ref }}
+            POLKADOT_VERSION=${{ needs.fetch-latest-debian-package-version.outputs.polkadot_apt_version }}
+            BUILD_DATE=${{ steps.fetch-data.outputs.date }}
+          cache-from: type=local,src=/tmp/.buildx-cache
+          cache-to: type=local,dest=/tmp/.buildx-cache
+      - name: Image digest
+        run: echo ${{ steps.docker_build.outputs.digest }}
diff --git a/.github/workflows/review-bot.yml b/.github/workflows/review-bot.yml
new file mode 100644
index 0000000000000000000000000000000000000000..b9799935abe678dea2600298cf5bbe5309f08112
--- /dev/null
+++ b/.github/workflows/review-bot.yml
@@ -0,0 +1,31 @@
+name: Review PR
+on:
+  pull_request_target:
+    types:
+      - opened
+      - reopened
+      - synchronize
+      - review_requested
+      - review_request_removed
+      - ready_for_review
+  pull_request_review:
+
+permissions:
+  contents: read
+
+jobs:
+  review-approvals:
+    runs-on: ubuntu-latest
+    steps:
+      - name: Generate token
+        id: team_token
+        uses: tibdex/github-app-token@v1
+        with:
+          app_id: ${{ secrets.REVIEW_APP_ID }}
+          private_key: ${{ secrets.REVIEW_APP_KEY }}
+      - name: "Evaluates PR reviews and assigns reviewers"
+        uses: paritytech/review-bot@v2.0.1
+        with:
+          repo-token: ${{ secrets.GITHUB_TOKEN }}
+          team-token: ${{ steps.team_token.outputs.token }}
+          checks-token: ${{ steps.team_token.outputs.token }}
diff --git a/.gitignore b/.gitignore
index b71c270d7368c10acd64ddf90258c3c584367664..7feea8ada5c58d6ae92bafaa8740bca7a448e434 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1,13 +1,40 @@
-target/
-**/target/
+!polkadot.service
+.cargo-remote.toml
+.direnv/
+.DS_Store
+.env*
 .idea
+.local
+.lycheecache
 .vscode
-.DS_Store
-/.cargo/config
-polkadot_argument_parsing
-**/node_modules
-**/chains/
+.wasm-binaries
+*.adoc
+*.bin
 *.iml
-.env
+*.orig
+*.rej
+*.swp
 **/._*
-
+**/.criterion/
+**/*.rs.bk
+**/chains/
+**/hfuzz_target/
+**/hfuzz_workspace/
+**/node_modules
+**/target/
+**/wip/*.stderr
+/.cargo/config
+/.envrc
+artifacts
+bin/node-template/Cargo.lock
+nohup.out
+polkadot_argument_parsing
+polkadot.*
+pwasm-alloc/Cargo.lock
+pwasm-libc/Cargo.lock
+release-artifacts
+release.json
+rls*.log
+runtime/wasm/target/
+substrate.code-workspace
+target/
diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index 13a11b9bb4f325e66d8164e63baef52235099918..61451a9c462011369bc7ade4b593347f4a92f9f0 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -1,32 +1,9 @@
-# .gitlab-ci.yml
+# polkadot-sdk | CI definitions (via GitLab CI)
 #
-# substrate
+# FYI: Pipelines can be triggered manually through the web UI (if you have enough permissions)
 #
-# pipelines can be triggered manually in the web
-#
-# Currently the file is divided into subfiles. Each stage has a different file which
-# can be found here: gitlab/pipeline/<stage_name>.yml
-#
-# Instead of YAML anchors "extends" is used.
-# Useful links:
-#    https://docs.gitlab.com/ee/ci/yaml/index.html#extends
-#    https://docs.gitlab.com/ee/ci/yaml/yaml_optimization.html#reference-tags
-#
-# SAMPLE JOB TEMPLATE - This is not a complete example but is enough to build a
-# simple CI job. For full documentation, visit https://docs.gitlab.com/ee/ci/yaml/
-#
-# my-example-job:
-#   stage:                           test # One of the stages listed below this job (required)
-#   image:                           paritytech/tools:latest # Any docker image (required)
-#   allow_failure:                   true # Allow the pipeline to continue if this job fails (default: false)
-#   needs:
-#     - job:                         test-linux # Any jobs that are required to run before this job (optional)
-#   variables:
-#     MY_ENVIRONMENT_VARIABLE:       "some useful value" # Environment variables passed to the job (optional)
-#   script:
-#     - echo "List of shell commands to run in your job"
-#     - echo "You can also just specify a script here, like so:"
-#     - ./gitlab/my_amazing_script.sh
+# Currently, entire CI instructions are split into different subfiles. Each CI stage has a corresponding
+# file which can be found here: .gitlab/pipeline/<stage_name>.yml
 
 stages:
   - check
@@ -44,8 +21,8 @@ workflow:
     - if: $CI_COMMIT_BRANCH
 
 variables:
-  CI_IMAGE: "paritytech/ci-unified:bullseye-1.70.0-2023-05-23-v20230706"
-  BUILDAH_IMAGE: "quay.io/buildah/stable:v1.29"
+  CI_IMAGE: !reference [.ci-unified, variables, CI_IMAGE]
+  # BUILDAH_IMAGE is defined in group variables
   BUILDAH_COMMAND: "buildah --storage-driver overlay2"
   RELENG_SCRIPTS_BRANCH: "master"
   RUSTY_CACHIER_SINGLE_BRANCH: master
@@ -53,7 +30,7 @@ variables:
   RUSTY_CACHIER_COMPRESSION_METHOD: zstd
   NEXTEST_FAILURE_OUTPUT: immediate-final
   NEXTEST_SUCCESS_OUTPUT: final
-  ZOMBIENET_IMAGE: "docker.io/paritytech/zombienet:v1.3.59"
+  ZOMBIENET_IMAGE: "docker.io/paritytech/zombienet:v1.3.69"
   DOCKER_IMAGES_VERSION: "${CI_COMMIT_REF_NAME}-${CI_COMMIT_SHORT_SHA}"
 
 default:
@@ -84,15 +61,18 @@ default:
 
 .prepare-env:
   before_script:
-    # TODO: remove unset invocation when we'll be free from 'ENV RUSTC_WRAPPER=sccache' & sccache
-    # itself in all images
-    - unset RUSTC_WRAPPER
     # $WASM_BUILD_WORKSPACE_HINT enables wasm-builder to find the Cargo.lock from within generated
     # packages
     - export WASM_BUILD_WORKSPACE_HINT="$PWD"
     # ensure that RUSTFLAGS are set correctly
     - echo $RUSTFLAGS
 
+.common-before-script:
+  before_script:
+    - !reference [.job-switcher, before_script]
+    - !reference [.timestamp, before_script]
+    - !reference [.pipeline-stopper-vars, script]
+
 .job-switcher:
   before_script:
     - if echo "$CI_DISABLED_JOBS" | grep -xF "$CI_JOB_NAME"; then echo "The job has been cancelled in CI settings"; exit 0; fi
@@ -100,7 +80,7 @@ default:
 .kubernetes-env:
   image: "${CI_IMAGE}"
   before_script:
-    # - !reference [.job-switcher, before_script]
+    - !reference [.common-before-script, before_script]
     - !reference [.prepare-env, before_script]
   tags:
     - kubernetes-parity-build
@@ -112,9 +92,10 @@ default:
     - rustup +nightly show
     - cargo +nightly --version
 
+# collecting vars for pipeline stopper
+# they will be used if the job fails
 .pipeline-stopper-vars:
   script:
-    - !reference [.job-switcher, before_script]
     - echo "Collecting env variables for the cancel-pipeline job"
     - echo "FAILED_JOB_URL=${CI_JOB_URL}" > pipeline-stopper.env
     - echo "FAILED_JOB_NAME=${CI_JOB_NAME}" >> pipeline-stopper.env
@@ -128,28 +109,26 @@ default:
 .docker-env:
   image: "${CI_IMAGE}"
   before_script:
-    - !reference [.job-switcher, before_script]
+    - !reference [.common-before-script, before_script]
     - !reference [.prepare-env, before_script]
     - !reference [.rust-info-script, script]
     - !reference [.rusty-cachier, before_script]
-    - !reference [.pipeline-stopper-vars, script]
-  after_script:
-    - !reference [.rusty-cachier, after_script]
   tags:
-    - linux-docker-vm-c2
+    - linux-docker
 
 # rusty-cachier's hidden job. Parts of this job are used to instrument the pipeline's other real jobs with rusty-cachier
-# Description of the commands is available here - https://gitlab.parity.io/parity/infrastructure/ci_cd/rusty-cachier/client#description
+# rusty-cachier's commands are described here: https://gitlab.parity.io/parity/infrastructure/ci_cd/rusty-cachier/client#description
 .rusty-cachier:
   before_script:
     # - curl -s https://gitlab-ci-token:${CI_JOB_TOKEN}@gitlab.parity.io/parity/infrastructure/ci_cd/rusty-cachier/client/-/raw/release/util/install.sh | bash
-    # - rusty-cachier environment check --gracefully
-    # - $(rusty-cachier environment inject)
-    # - rusty-cachier project mtime
+    # - mkdir -p cargo_home cargo_target_dir
+    # - export CARGO_HOME=$CI_PROJECT_DIR/cargo_home
+    # - export CARGO_TARGET_DIR=$CI_PROJECT_DIR/cargo_target_dir
+    # - find . \( -path ./cargo_target_dir -o -path ./cargo_home \) -prune -o -type f -exec touch -t 202005260100 {} +
+    # - git restore-mtime
+    # - rusty-cachier --version
+    # - rusty-cachier project touch-changed
     - echo tbd
-  after_script:
-    - echo tbd
-    # - env RUSTY_CACHIER_SUPRESS_OUTPUT=true rusty-cachier snapshot destroy
 
 .common-refs:
   rules:
@@ -218,8 +197,6 @@ default:
   extends: .build-refs
 
 include:
-  # weights jobs
-  # - gitlab/pipeline/weights.yml
   # check jobs
   - .gitlab/pipeline/check.yml
   # test jobs
@@ -232,7 +209,183 @@ include:
   - .gitlab/pipeline/publish.yml
   # zombienet jobs
   - .gitlab/pipeline/zombienet.yml
-  # # timestamp handler
-  # - project: parity/infrastructure/ci_cd/shared
-  #   ref: v0.2
-  #   file: /common/timestamp.yml
+  # timestamp handler
+  - project: parity/infrastructure/ci_cd/shared
+    ref: v0.2
+    file: /common/timestamp.yml
+  # ci image
+  - project: parity/infrastructure/ci_cd/shared
+    ref: main
+    file: /common/ci-unified.yml
+# This job cancels the whole pipeline if any of provided jobs fail.
+# In a DAG, every jobs chain is executed independently of others. The `fail_fast` principle suggests
+# to fail the pipeline as soon as possible to shorten the feedback loop.
+.cancel-pipeline-template:
+  stage: .post
+  rules:
+    - if: $CI_COMMIT_REF_NAME =~ /^[0-9]+$/ # PRs
+      when: on_failure
+  variables:
+    PROJECT_ID: "${CI_PROJECT_ID}"
+    PROJECT_NAME: "${CI_PROJECT_NAME}"
+    PIPELINE_ID: "${CI_PIPELINE_ID}"
+    FAILED_JOB_URL: "${FAILED_JOB_URL}"
+    FAILED_JOB_NAME: "${FAILED_JOB_NAME}"
+    PR_NUM: "${PR_NUM}"
+  trigger:
+    project: "parity/infrastructure/ci_cd/pipeline-stopper"
+
+remove-cancel-pipeline-message:
+  stage: .post
+  rules:
+    - if: $CI_COMMIT_REF_NAME =~ /^[0-9]+$/ # PRs
+  variables:
+    PROJECT_ID: "${CI_PROJECT_ID}"
+    PROJECT_NAME: "${CI_PROJECT_NAME}"
+    PIPELINE_ID: "${CI_PIPELINE_ID}"
+    FAILED_JOB_URL: "https://gitlab.com"
+    FAILED_JOB_NAME: "nope"
+    PR_NUM: "${CI_COMMIT_REF_NAME}"
+  trigger:
+    project: "parity/infrastructure/ci_cd/pipeline-stopper"
+# need to copy jobs this way because otherwise gitlab will wait
+# for all 3 jobs to finish instead of cancelling if one fails
+cancel-pipeline-test-linux-stable1:
+  extends: .cancel-pipeline-template
+  needs:
+    - job: "test-linux-stable 1/3"
+
+cancel-pipeline-test-linux-stable2:
+  extends: .cancel-pipeline-template
+  needs:
+    - job: "test-linux-stable 2/3"
+
+cancel-pipeline-test-linux-stable3:
+  extends: .cancel-pipeline-template
+  needs:
+    - job: "test-linux-stable 3/3"
+
+cancel-pipeline-test-linux-stable-additional-tests:
+  extends: .cancel-pipeline-template
+  needs:
+    - job: "test-linux-stable-additional-tests"
+
+cancel-pipeline-test-linux-stable-slow:
+  extends: .cancel-pipeline-template
+  needs:
+    - job: "test-linux-stable-slow"
+
+cancel-pipeline-cargo-check-benches1:
+  extends: .cancel-pipeline-template
+  needs:
+    - job: "cargo-check-benches 1/2"
+
+cancel-pipeline-cargo-check-benches2:
+  extends: .cancel-pipeline-template
+  needs:
+    - job: "cargo-check-benches 2/2"
+
+cancel-pipeline-test-linux-stable-int:
+  extends: .cancel-pipeline-template
+  needs:
+    - job: test-linux-stable-int
+
+cancel-pipeline-cargo-check-each-crate-1:
+  extends: .cancel-pipeline-template
+  needs:
+    - job: "cargo-check-each-crate 1/6"
+
+cancel-pipeline-cargo-check-each-crate-2:
+  extends: .cancel-pipeline-template
+  needs:
+    - job: "cargo-check-each-crate 2/6"
+
+cancel-pipeline-cargo-check-each-crate-3:
+  extends: .cancel-pipeline-template
+  needs:
+    - job: "cargo-check-each-crate 3/6"
+
+cancel-pipeline-cargo-check-each-crate-4:
+  extends: .cancel-pipeline-template
+  needs:
+    - job: "cargo-check-each-crate 4/6"
+
+cancel-pipeline-cargo-check-each-crate-5:
+  extends: .cancel-pipeline-template
+  needs:
+    - job: "cargo-check-each-crate 5/6"
+
+cancel-pipeline-cargo-check-each-crate-6:
+  extends: .cancel-pipeline-template
+  needs:
+    - job: "cargo-check-each-crate 6/6"
+
+cancel-pipeline-cargo-check-each-crate-macos:
+  extends: .cancel-pipeline-template
+  needs:
+    - job: cargo-check-each-crate-macos
+
+cancel-pipeline-check-tracing:
+  extends: .cancel-pipeline-template
+  needs:
+    - job: check-tracing
+
+cancel-pipeline-cargo-clippy:
+  extends: .cancel-pipeline-template
+  needs:
+    - job: cargo-clippy
+
+cancel-pipeline-build-linux-stable:
+  extends: .cancel-pipeline-template
+  needs:
+    - job: build-linux-stable
+
+cancel-pipeline-build-linux-stable-cumulus:
+  extends: .cancel-pipeline-template
+  needs:
+    - job: build-linux-stable-cumulus
+
+cancel-pipeline-build-linux-substrate:
+  extends: .cancel-pipeline-template
+  needs:
+    - job: build-linux-substrate
+
+cancel-pipeline-test-node-metrics:
+  extends: .cancel-pipeline-template
+  needs:
+    - job: test-node-metrics
+
+cancel-pipeline-test-frame-ui:
+  extends: .cancel-pipeline-template
+  needs:
+    - job: test-frame-ui
+
+cancel-pipeline-quick-benchmarks:
+  extends: .cancel-pipeline-template
+  needs:
+    - job: quick-benchmarks
+
+cancel-pipeline-check-try-runtime:
+  extends: .cancel-pipeline-template
+  needs:
+    - job: check-try-runtime
+
+cancel-pipeline-test-frame-examples-compile-to-wasm:
+  extends: .cancel-pipeline-template
+  needs:
+    - job: test-frame-examples-compile-to-wasm
+
+cancel-pipeline-build-short-benchmark:
+  extends: .cancel-pipeline-template
+  needs:
+    - job: build-short-benchmark
+
+cancel-pipeline-check-runtime-migration-rococo:
+  extends: .cancel-pipeline-template
+  needs:
+    - job: check-runtime-migration-rococo
+
+cancel-pipeline-check-runtime-migration-westend:
+  extends: .cancel-pipeline-template
+  needs:
+    - job: check-runtime-migration-westend
diff --git a/.gitlab/common/lib.sh b/.gitlab/common/lib.sh
deleted file mode 100755
index ba5b171487288928f779f2db034f8d989213c647..0000000000000000000000000000000000000000
--- a/.gitlab/common/lib.sh
+++ /dev/null
@@ -1,195 +0,0 @@
-#!/bin/sh
-
-api_base="https://api.github.com/repos"
-
-# Function to take 2 git tags/commits and get any lines from commit messages
-# that contain something that looks like a PR reference: e.g., (#1234)
-sanitised_git_logs(){
-  git --no-pager log --pretty=format:"%s" "$1...$2" |
-  # Only find messages referencing a PR
-  grep -E '\(#[0-9]+\)' |
-  # Strip any asterisks
-  sed 's/^* //g'
-}
-
-# Checks whether a tag on github has been verified
-# repo: 'organization/repo'
-# tagver: 'v1.2.3'
-# Usage: check_tag $repo $tagver
-check_tag () {
-  repo=$1
-  tagver=$2
-  if [ -n "$GITHUB_RELEASE_TOKEN" ]; then
-    echo '[+] Fetching tag using privileged token'
-    tag_out=$(curl -H "Authorization: token $GITHUB_RELEASE_TOKEN" -s "$api_base/$repo/git/refs/tags/$tagver")
-  else
-    echo '[+] Fetching tag using unprivileged token'
-    tag_out=$(curl -H "Authorization: token $GITHUB_PR_TOKEN" -s "$api_base/$repo/git/refs/tags/$tagver")
-  fi
-  tag_sha=$(echo "$tag_out" | jq -r .object.sha)
-  object_url=$(echo "$tag_out" | jq -r .object.url)
-  if [ "$tag_sha" = "null" ]; then
-    return 2
-  fi
-  echo "[+] Tag object SHA: $tag_sha"
-  verified_str=$(curl -H "Authorization: token $GITHUB_RELEASE_TOKEN" -s "$object_url" | jq -r .verification.verified)
-  if [ "$verified_str" = "true" ]; then
-    # Verified, everything is good
-    return 0
-  else
-    # Not verified. Bad juju.
-    return 1
-  fi
-}
-
-# Checks whether a given PR has a given label.
-# repo: 'organization/repo'
-# pr_id: 12345
-# label: B1-silent
-# Usage: has_label $repo $pr_id $label
-has_label(){
-  repo="$1"
-  pr_id="$2"
-  label="$3"
-
-  # These will exist if the function is called in Gitlab.
-  # If the function's called in Github, we should have GITHUB_ACCESS_TOKEN set
-  # already.
-  if [ -n "$GITHUB_RELEASE_TOKEN" ]; then
-    GITHUB_TOKEN="$GITHUB_RELEASE_TOKEN"
-  elif [ -n "$GITHUB_PR_TOKEN" ]; then
-    GITHUB_TOKEN="$GITHUB_PR_TOKEN"
-  fi
-
-  out=$(curl -H "Authorization: token $GITHUB_TOKEN" -s "$api_base/$repo/pulls/$pr_id")
-  [ -n "$(echo "$out" | tr -d '\r\n' | jq ".labels | .[] | select(.name==\"$label\")")" ]
-}
-
-github_label () {
-  echo
-  echo "# run github-api job for labeling it ${1}"
-  curl -sS -X POST \
-    -F "token=${CI_JOB_TOKEN}" \
-    -F "ref=master" \
-    -F "variables[LABEL]=${1}" \
-    -F "variables[PRNO]=${CI_COMMIT_REF_NAME}" \
-    -F "variables[PROJECT]=paritytech/polkadot" \
-    "${GITLAB_API}/projects/${GITHUB_API_PROJECT}/trigger/pipeline"
-}
-
-# Formats a message into a JSON string for posting to Matrix
-# message: 'any plaintext message'
-# formatted_message: '<strong>optional message formatted in <em>html</em></strong>'
-# Usage: structure_message $content $formatted_content (optional)
-structure_message() {
-  if [ -z "$2" ]; then
-    body=$(jq -Rs --arg body "$1" '{"msgtype": "m.text", $body}' < /dev/null)
-  else
-    body=$(jq -Rs --arg body "$1" --arg formatted_body "$2" '{"msgtype": "m.text", $body, "format": "org.matrix.custom.html", $formatted_body}' < /dev/null)
-  fi
-  echo "$body"
-}
-
-# Post a message to a matrix room
-# body: '{body: "JSON string produced by structure_message"}'
-# room_id: !fsfSRjgjBWEWffws:matrix.parity.io
-# access_token: see https://matrix.org/docs/guides/client-server-api/
-# Usage: send_message $body (json formatted) $room_id $access_token
-send_message() {
-curl -XPOST -d "$1" "https://matrix.parity.io/_matrix/client/r0/rooms/$2/send/m.room.message?access_token=$3"
-}
-
-# Pretty-printing functions
-boldprint () { printf "|\n| \033[1m%s\033[0m\n|\n" "${@}"; }
-boldcat () { printf "|\n"; while read -r l; do printf "| \033[1m%s\033[0m\n" "${l}"; done; printf "|\n" ; }
-
-skip_if_companion_pr() {
-  url="https://api.github.com/repos/paritytech/polkadot/pulls/${CI_COMMIT_REF_NAME}"
-  echo "[+] API URL: $url"
-
-  pr_title=$(curl -sSL -H "Authorization: token ${GITHUB_PR_TOKEN}" "$url" | jq -r .title)
-  echo "[+] PR title: $pr_title"
-
-  if echo "$pr_title" | grep -qi '^companion'; then
-    echo "[!] PR is a companion PR. Build is already done in substrate"
-    exit 0
-  else
-    echo "[+] PR is not a companion PR. Proceeding test"
-  fi
-}
-
-# Fetches the tag name of the latest release from a repository
-# repo: 'organisation/repo'
-# Usage: latest_release 'paritytech/polkadot'
-latest_release() {
-  curl -s "$api_base/$1/releases/latest" | jq -r '.tag_name'
-}
-
-# Check for runtime changes between two commits. This is defined as any changes
-# to /primitives/src/* and any *production* chains under /runtime
-has_runtime_changes() {
-  from=$1
-  to=$2
-
-  if git diff --name-only "${from}...${to}" \
-    | grep -q -e '^runtime/polkadot' -e '^runtime/kusama' -e '^primitives/src/' -e '^runtime/common'
-  then
-    return 0
-  else
-    return 1
-  fi
-}
-
-# given a bootnode and the path to a chainspec file, this function will create a new chainspec file
-# with only the bootnode specified and test whether that bootnode provides peers
-# The optional third argument is the index of the bootnode in the list of bootnodes, this is just used to pick an ephemeral
-# port for the node to run on. If you're only testing one, it'll just use the first ephemeral port
-# BOOTNODE: /dns/polkadot-connect-0.parity.io/tcp/443/wss/p2p/12D3KooWEPmjoRpDSUuiTjvyNDd8fejZ9eNWH5bE965nyBMDrB4o
-# CHAINSPEC_FILE: /path/to/polkadot.json
-check_bootnode(){
-    BOOTNODE=$1
-    BASE_CHAINSPEC=$2
-    RUNTIME=$(basename "$BASE_CHAINSPEC" | cut -d '.' -f 1)
-    MIN_PEERS=1
-
-    # Generate a temporary chainspec file containing only the bootnode we care about
-    TMP_CHAINSPEC_FILE="$RUNTIME.$(echo "$BOOTNODE" | tr '/' '_').tmp.json"
-    jq ".bootNodes = [\"$BOOTNODE\"] " < "$CHAINSPEC_FILE" > "$TMP_CHAINSPEC_FILE"
-
-    # Grab an unused port by binding to port 0 and then immediately closing the socket
-    # This is a bit of a hack, but it's the only way to do it in the shell
-    RPC_PORT=$(python -c "import socket; s=socket.socket(); s.bind(('', 0)); print(s.getsockname()[1]); s.close()")
-
-    echo "[+] Checking bootnode $BOOTNODE"
-    polkadot --chain "$TMP_CHAINSPEC_FILE" --no-mdns --rpc-port="$RPC_PORT" --tmp > /dev/null 2>&1 &
-    # Wait a few seconds for the node to start up
-    sleep 5
-    POLKADOT_PID=$!
-
-    MAX_POLLS=10
-    TIME_BETWEEN_POLLS=3
-    for _ in $(seq 1 "$MAX_POLLS"); do
-    # Check the health endpoint of the RPC node
-      PEERS="$(curl -s -X POST -H "Content-Type: application/json" --data '{"jsonrpc":"2.0","method":"system_health","params":[],"id":1}' http://localhost:"$RPC_PORT" | jq -r '.result.peers')"
-      # Sometimes due to machine load or other reasons, we don't get a response from the RPC node
-      # If $PEERS is an empty variable, make it 0 so we can still do the comparison
-      if [ -z "$PEERS" ]; then
-        PEERS=0
-      fi
-      if [ "$PEERS" -ge $MIN_PEERS ]; then
-        echo "[+] $PEERS peers found for $BOOTNODE"
-        echo "    Bootnode appears contactable"
-        kill $POLKADOT_PID
-        # Delete the temporary chainspec file now we're done running the node
-        rm "$TMP_CHAINSPEC_FILE"
-        return 0
-      fi
-      sleep "$TIME_BETWEEN_POLLS"
-    done
-    kill $POLKADOT_PID
-    # Delete the temporary chainspec file now we're done running the node
-    rm "$TMP_CHAINSPEC_FILE"
-    echo "[!] No peers found for $BOOTNODE"
-    echo "    Bootnode appears unreachable"
-    return 1
-}
diff --git a/.gitlab/pipeline/build.yml b/.gitlab/pipeline/build.yml
index 290ef8c8f72d1e30b8464facdc6d02c00299048a..fefa3739a9ff41bb412379dcf99a8e12033fc994 100644
--- a/.gitlab/pipeline/build.yml
+++ b/.gitlab/pipeline/build.yml
@@ -18,11 +18,19 @@ build-linux-stable:
     # Ensure we run the UI tests.
     RUN_UI_TESTS: 1
   script:
-    - time cargo build --locked --profile testnet --features pyroscope,fast-runtime --bin polkadot
+    - time cargo build --locked --profile testnet --features pyroscope,fast-runtime --bin polkadot --bin polkadot-prepare-worker --bin polkadot-execute-worker
+    - time ROCOCO_EPOCH_DURATION=10  ./polkadot/scripts/build-only-wasm.sh rococo-runtime $(pwd)/runtimes/rococo-runtime-10/
+    - time ROCOCO_EPOCH_DURATION=100 ./polkadot/scripts/build-only-wasm.sh rococo-runtime $(pwd)/runtimes/rococo-runtime-100/
+    - time ROCOCO_EPOCH_DURATION=600 ./polkadot/scripts/build-only-wasm.sh rococo-runtime $(pwd)/runtimes/rococo-runtime-600/
+    - pwd
+    - ls -alR runtimes
     # pack artifacts
     - mkdir -p ./artifacts
     - VERSION="${CI_COMMIT_REF_NAME}" # will be tag or branch name
     - mv ./target/testnet/polkadot ./artifacts/.
+    - mv ./target/testnet/polkadot-prepare-worker ./artifacts/.
+    - mv ./target/testnet/polkadot-execute-worker ./artifacts/.
+    - mv ./runtimes/ ./artifacts/.
     - pushd artifacts
     - sha256sum polkadot | tee polkadot.sha256
     - shasum -c polkadot.sha256
@@ -44,8 +52,8 @@ build-test-collators:
     - .run-immediately
     - .collect-artifacts
   script:
-    - time cargo build --locked --profile testnet --verbose -p test-parachain-adder-collator
-    - time cargo build --locked --profile testnet --verbose -p test-parachain-undying-collator
+    - time cargo build --locked --profile testnet -p test-parachain-adder-collator
+    - time cargo build --locked --profile testnet -p test-parachain-undying-collator
     # pack artifacts
     - mkdir -p ./artifacts
     - mv ./target/testnet/adder-collator ./artifacts/.
@@ -64,32 +72,17 @@ build-malus:
     - .run-immediately
     - .collect-artifacts
   script:
-    - time cargo build --locked --profile testnet --verbose -p polkadot-test-malus
+    - time cargo build --locked --profile testnet -p polkadot-test-malus --bin malus --bin polkadot-prepare-worker --bin polkadot-execute-worker
     # pack artifacts
     - mkdir -p ./artifacts
     - mv ./target/testnet/malus ./artifacts/.
+    - mv ./target/testnet/polkadot-execute-worker ./artifacts/.
+    - mv ./target/testnet/polkadot-prepare-worker ./artifacts/.
     - echo -n "${CI_COMMIT_REF_NAME}" > ./artifacts/VERSION
     - echo -n "${CI_COMMIT_REF_NAME}-${CI_COMMIT_SHORT_SHA}" > ./artifacts/EXTRATAG
     - echo "polkadot-test-malus = $(cat ./artifacts/VERSION) (EXTRATAG = $(cat ./artifacts/EXTRATAG))"
     - cp -r ./docker/* ./artifacts
 
-build-staking-miner:
-  stage: build
-  extends:
-    - .docker-env
-    - .common-refs
-    - .run-immediately
-    - .collect-artifacts
-  script:
-    - time cargo build --locked --release --package staking-miner
-    # # pack artifacts
-    # - mkdir -p ./artifacts
-    # - mv ./target/release/staking-miner ./artifacts/.
-    # - echo -n "${CI_COMMIT_REF_NAME}" > ./artifacts/VERSION
-    # - echo -n "${CI_COMMIT_REF_NAME}-${CI_COMMIT_SHORT_SHA}" > ./artifacts/EXTRATAG
-    # - echo "staking-miner = $(cat ./artifacts/VERSION) (EXTRATAG = $(cat ./artifacts/EXTRATAG))"
-    # - cp -r ./scripts/* ./artifacts
-
 build-rustdoc:
   stage: build
   extends:
@@ -98,20 +91,40 @@ build-rustdoc:
     - .run-immediately
   variables:
     SKIP_WASM_BUILD: 1
-  # artifacts:
-  #   name: "${CI_JOB_NAME}_${CI_COMMIT_REF_NAME}-doc"
-  #   when: on_success
-  #   expire_in: 1 days
-  #   paths:
-  #     - ./crate-docs/
+    RUSTDOCFLAGS: ""
+  artifacts:
+    name: "${CI_JOB_NAME}_${CI_COMMIT_REF_NAME}-doc"
+    when: on_success
+    expire_in: 1 days
+    paths:
+      - ./crate-docs/
   script:
     # FIXME: it fails with `RUSTDOCFLAGS="-Dwarnings"` and `--all-features`
-    # FIXME: return to stable when https://github.com/rust-lang/rust/issues/96937 gets into stable
-    - time cargo doc --workspace --verbose --no-deps
+    - time cargo doc --features try-runtime,experimental --workspace --no-deps
     - rm -f ./target/doc/.lock
     - mv ./target/doc ./crate-docs
-    # FIXME: remove me after CI image gets nonroot
-    - chown -R nonroot:nonroot ./crate-docs
+    # Inject Simple Analytics (https://www.simpleanalytics.com/) privacy preserving tracker into
+    # all .html files
+    - |
+      inject_simple_analytics() {
+        local path="$1"
+        local script_content="<script async defer src=\"https://apisa.parity.io/latest.js\"></script><noscript><img src=\"https://apisa.parity.io/latest.js\" alt=\"\" referrerpolicy=\"no-referrer-when-downgrade\" /></noscript>"
+
+        # Function that inject script into the head of an html file using sed.
+        process_file() {
+            local file="$1"
+            echo "Adding Simple Analytics script to $file"
+            sed -i "s|</head>|$script_content</head>|" "$file"
+        }
+        export -f process_file
+        # xargs runs process_file in seperate shells without access to outer variables.
+        # to make script_content available inside process_file, export it as an env var here.
+        export script_content
+
+        # Modify .html files in parallel using xargs, otherwise it can take a long time.
+        find "$path" -name '*.html' | xargs -I {} -P "$(nproc)" bash -c 'process_file "$@"' _ {}
+      }
+      inject_simple_analytics "./crate-docs"
     - echo "<meta http-equiv=refresh content=0;url=polkadot_service/index.html>" > ./crate-docs/index.html
 
 build-implementers-guide:
@@ -120,7 +133,7 @@ build-implementers-guide:
     - .kubernetes-env
     - .common-refs
     - .run-immediately
-    # - .collect-artifacts
+    - .collect-artifacts
   # git depth is set on purpose: https://github.com/paritytech/polkadot/issues/6284
   variables:
     GIT_STRATEGY: clone
@@ -139,7 +152,7 @@ build-short-benchmark:
     - .run-immediately
     - .collect-artifacts
   script:
-    - cargo build --profile release --locked --features=runtime-benchmarks
+    - cargo build --profile release --locked --features=runtime-benchmarks,on-chain-release-build --bin polkadot --workspace
     - mkdir -p artifacts
     - target/release/polkadot --version
     - cp ./target/release/polkadot ./artifacts/
@@ -159,7 +172,7 @@ build-linux-stable-cumulus:
     RUSTFLAGS: "-Cdebug-assertions=y -Dwarnings"
   script:
     - echo "___Building a binary, please refrain from using it in production since it goes with the debug assertions.___"
-    - time cargo build --release --locked --bin polkadot-parachain
+    - time cargo build --release --locked -p polkadot-parachain-bin --bin polkadot-parachain
     - echo "___Packing the artifacts___"
     - mkdir -p ./artifacts
     - mv ./target/release/polkadot-parachain ./artifacts/.
@@ -179,7 +192,7 @@ build-test-parachain:
     RUSTFLAGS: "-Cdebug-assertions=y -Dwarnings"
   script:
     - echo "___Building a binary, please refrain from using it in production since it goes with the debug assertions.___"
-    - time cargo build --release --locked --bin test-parachain
+    - time cargo build --release --locked -p cumulus-test-service --bin test-parachain
     - echo "___Packing the artifacts___"
     - mkdir -p ./artifacts
     - mv ./target/release/test-parachain ./artifacts/.
@@ -258,6 +271,19 @@ build-runtime-testing:
     - job: build-runtime-starters
       artifacts: false
 
+build-short-benchmark-cumulus:
+  stage: build
+  extends:
+    - .docker-env
+    - .common-refs
+    - .run-immediately
+    - .collect-artifacts
+  script:
+    - cargo build --profile release --locked --features=runtime-benchmarks,on-chain-release-build -p polkadot-parachain-bin --bin polkadot-parachain --workspace
+    - mkdir -p artifacts
+    - target/release/polkadot-parachain --version
+    - cp ./target/release/polkadot-parachain ./artifacts/
+
 # substrate
 
 build-linux-substrate:
@@ -265,8 +291,11 @@ build-linux-substrate:
   extends:
     - .docker-env
     - .common-refs
-    - .run-immediately
     - .collect-artifacts
+  # DAG
+  needs:
+    - job: build-linux-stable
+      artifacts: false
   variables:
     # this variable gets overriden by "rusty-cachier environment inject", use the value as default
     CARGO_TARGET_DIR: "$CI_PROJECT_DIR/target"
@@ -276,7 +305,7 @@ build-linux-substrate:
     # see https://github.com/paritytech/ci_cd/issues/682#issuecomment-1340953589
     - git checkout -B "$CI_COMMIT_REF_NAME" "$CI_COMMIT_SHA"
   script:
-    - WASM_BUILD_NO_COLOR=1 time cargo build --locked --release --verbose
+    - WASM_BUILD_NO_COLOR=1 time cargo build --locked --release -p node-cli
     - mv $CARGO_TARGET_DIR/release/substrate-node ./artifacts/substrate/substrate
     - echo -n "Substrate version = "
     - if [ "${CI_COMMIT_TAG}" ]; then
@@ -286,7 +315,7 @@ build-linux-substrate:
       cut -d ' ' -f 2 | tee ./artifacts/substrate/VERSION;
       fi
     - sha256sum ./artifacts/substrate/substrate | tee ./artifacts/substrate/substrate.sha256
-    - cp -r ./docker/substrate_injected.Dockerfile ./artifacts/substrate/
+    - cp -r ./docker/dockerfiles/substrate_injected.Dockerfile ./artifacts/substrate/
     # - printf '\n# building node-template\n\n'
     # - ./scripts/ci/node-template-release.sh ./artifacts/substrate/substrate-node-template.tar.gz
 
@@ -304,7 +333,7 @@ build-linux-substrate:
     - mkdir -p ./artifacts/subkey
   script:
     - cd ./substrate/bin/utils/subkey
-    - SKIP_WASM_BUILD=1 time cargo build --locked --release --verbose
+    - SKIP_WASM_BUILD=1 time cargo build --locked --release
     # - cd -
     # - mv $CARGO_TARGET_DIR/release/subkey ./artifacts/subkey/.
     # - echo -n "Subkey version = "
@@ -316,6 +345,10 @@ build-linux-substrate:
 
 build-subkey-linux:
   extends: .build-subkey
+  # DAG
+  needs:
+    - job: build-malus
+      artifacts: false
 # tbd
 # build-subkey-macos:
 #   extends: .build-subkey
@@ -327,7 +360,7 @@ build-subkey-linux:
 #     - mkdir -p ./artifacts/subkey
 #   script:
 #     - cd ./bin/utils/subkey
-#     - SKIP_WASM_BUILD=1 time cargo build --locked --release --verbose
+#     - SKIP_WASM_BUILD=1 time cargo build --locked --release
 #     - cd -
 #     - mv ./target/release/subkey ./artifacts/subkey/.
 #     - echo -n "Subkey version = "
@@ -339,4 +372,3 @@ build-subkey-linux:
 #   after_script: [""]
 #   tags:
 #     - osx
-
diff --git a/.gitlab/pipeline/check.yml b/.gitlab/pipeline/check.yml
index 123e02a8cd1cd373e0958f0ce139f7136d2ca4b8..4f92e6c15d2b07d93a3e16fabfc92369e0ee5e99 100644
--- a/.gitlab/pipeline/check.yml
+++ b/.gitlab/pipeline/check.yml
@@ -3,10 +3,9 @@ cargo-clippy:
   extends:
     - .docker-env
     - .common-refs
+    - .pipeline-stopper-artifacts
   script:
     - SKIP_WASM_BUILD=1 env -u RUSTFLAGS cargo clippy --all-targets --locked --workspace
-  # fixme!
-  allow_failure: true
 
 check-try-runtime:
   stage: check
@@ -20,7 +19,7 @@ check-try-runtime:
     - time cargo check --locked -p parachain-template-node --features try-runtime
     # add after https://github.com/paritytech/substrate/pull/14502 is merged
     # experimental code may rely on try-runtime and vice-versa
-    - time cargo check --locked --features try-runtime,experimental
+    - time cargo check --locked --all --features try-runtime,experimental
 
 cargo-fmt-manifest:
   stage: check
@@ -28,12 +27,13 @@ cargo-fmt-manifest:
     - .docker-env
     - .common-refs
   script:
-    - cargo install zepter --locked --version 0.10.0 -q -f --no-default-features && zepter --version
+    - cargo install zepter --locked --version 0.11.0 -q -f --no-default-features && zepter --version
     - echo "👉 Hello developer! If you see this CI check failing then it means that one of the your changes in a Cargo.toml file introduced ill-formatted or unsorted features. Please take a look at 'docs/STYLE_GUIDE.md#manifest-formatting' to find out more."
     - zepter format features --check
   allow_failure: true # Experimental
 
-cargo-deny-licenses:
+# FIXME
+.cargo-deny-licenses:
   stage: check
   extends:
     - .docker-env
@@ -43,7 +43,6 @@ cargo-deny-licenses:
   script:
     - $CARGO_DENY_CMD --hide-inclusion-graph
   after_script:
-    # - !reference [.rusty-cachier, after_script]
     - echo "___The complete log is in the artifacts___"
     - $CARGO_DENY_CMD 2> deny.log
     - if [ $CI_JOB_STATUS != 'success' ]; then
@@ -99,12 +98,11 @@ test-rust-feature-propagation:
     - .kubernetes-env
     - .test-pr-refs
   script:
-    - cargo install --locked --version 0.10.0 -q -f zepter && zepter --version
+    - cargo install --locked --version 0.11.1 -q -f zepter && zepter --version
     - echo "👉 Hello developer! If you see this CI check failing then it means that one of the crates is missing a feature for one of its dependencies. The output below tells you which feature needs to be added for which dependency to which crate. You can do this by modifying the Cargo.toml file. For more context see the MR where this check was introduced https://github.com/paritytech/substrate/pull/14660"
     - zepter lint propagate-feature --feature try-runtime --left-side-feature-missing=ignore --workspace --feature-enables-dep="try-runtime:frame-try-runtime" --locked
     - zepter lint propagate-feature --feature runtime-benchmarks --left-side-feature-missing=ignore --workspace --feature-enables-dep="runtime-benchmarks:frame-benchmarking" --locked
     - zepter lint propagate-feature --feature std --left-side-feature-missing=ignore --workspace --locked
-  allow_failure: true # Experimental
 
 # More info can be found here: https://github.com/paritytech/polkadot/pull/5865
 .check-runtime-migration:
@@ -115,52 +113,79 @@ test-rust-feature-propagation:
   script:
     - |
       export RUST_LOG=remote-ext=debug,runtime=debug
-      echo "---------- Running try-runtime for ${NETWORK} ----------"
-      time cargo install --locked --git https://github.com/paritytech/try-runtime-cli --rev a93c9b5abe5d31a4cf1936204f7e5c489184b521
-      time cargo build --release --locked -p "$NETWORK"-runtime --features try-runtime
+      echo "---------- Installing try-runtime-cli ----------"
+      time cargo install --locked --git https://github.com/paritytech/try-runtime-cli --tag v0.3.0
+      echo "---------- Building ${PACKAGE} runtime ----------"
+      time cargo build --release --locked -p "$PACKAGE" --features try-runtime
+      echo "---------- Executing `on-runtime-upgrade` for ${NETWORK} ----------"
       time try-runtime \
-          --runtime ./target/release/wbuild/"$NETWORK"-runtime/target/wasm32-unknown-unknown/release/"$NETWORK"_runtime.wasm \
-          on-runtime-upgrade --checks=pre-and-post live --uri wss://${NETWORK}-try-runtime-node.parity-chains.parity.io:443
+          --runtime ./target/release/wbuild/"$PACKAGE"/"$WASM" \
+          on-runtime-upgrade --checks=pre-and-post ${EXTRA_ARGS} live --uri ${URI}
 
-check-runtime-migration-polkadot:
+# Check runtime migrations for Parity managed relay chains
+check-runtime-migration-westend:
   stage: check
   extends:
     - .docker-env
     - .test-pr-refs
     - .check-runtime-migration
   variables:
-    NETWORK: "polkadot"
-  allow_failure: true # FIXME https://github.com/paritytech/substrate/issues/13107
+    NETWORK: "westend"
+    PACKAGE: "westend-runtime"
+    WASM: "westend_runtime.compact.compressed.wasm"
+    URI: "wss://westend-try-runtime-node.parity-chains.parity.io:443"
+    EXTRA_ARGS: "--no-weight-warnings"
 
-check-runtime-migration-kusama:
+check-runtime-migration-rococo:
   stage: check
   extends:
     - .docker-env
     - .test-pr-refs
     - .check-runtime-migration
   variables:
-    NETWORK: "kusama"
-  allow_failure: true # FIXME https://github.com/paritytech/substrate/issues/13107
+    NETWORK: "rococo"
+    PACKAGE: "rococo-runtime"
+    WASM: "rococo_runtime.compact.compressed.wasm"
+    URI: "wss://rococo-try-runtime-node.parity-chains.parity.io:443"
+    EXTRA_ARGS: "--no-weight-warnings"
 
-check-runtime-migration-westend:
+# Check runtime migrations for Parity managed asset hub chains
+check-runtime-migration-asset-hub-westend:
   stage: check
   extends:
     - .docker-env
     - .test-pr-refs
     - .check-runtime-migration
   variables:
-    NETWORK: "westend"
-  allow_failure: true # FIXME https://github.com/paritytech/substrate/issues/13107
+    NETWORK: "asset-hub-westend"
+    PACKAGE: "asset-hub-westend-runtime"
+    WASM: "asset_hub_westend_runtime.compact.compressed.wasm"
+    URI: "wss://westend-asset-hub-rpc.polkadot.io:443"
 
-check-runtime-migration-rococo:
+check-runtime-migration-bridge-hub-rococo:
   stage: check
   extends:
     - .docker-env
     - .test-pr-refs
     - .check-runtime-migration
   variables:
-    NETWORK: "rococo"
-  allow_failure: true # FIXME https://github.com/paritytech/substrate/issues/13107
+    NETWORK: "bridge-hub-rococo"
+    PACKAGE: "bridge-hub-rococo-runtime"
+    WASM: "bridge_hub_rococo_runtime.compact.compressed.wasm"
+    URI: "wss://rococo-bridge-hub-rpc.polkadot.io:443"
+
+# Check runtime migrations for Parity managed contract chains
+check-runtime-migration-contracts-rococo:
+  stage: check
+  extends:
+    - .docker-env
+    - .test-pr-refs
+    - .check-runtime-migration
+  variables:
+    NETWORK: "contracts-rococo"
+    PACKAGE: "contracts-rococo-runtime"
+    WASM: "contracts_rococo_runtime.compact.compressed.wasm"
+    URI: "wss://rococo-contracts-rpc.polkadot.io:443"
 
 find-fail-ci-phrase:
   stage: check
diff --git a/.gitlab/pipeline/publish.yml b/.gitlab/pipeline/publish.yml
index ed18082344f02b719471e50b21d8db0765343a5e..a03d407c040904a6a1a4fd7095052a039d0019e0 100644
--- a/.gitlab/pipeline/publish.yml
+++ b/.gitlab/pipeline/publish.yml
@@ -1,6 +1,68 @@
 # This file is part of .gitlab-ci.yml
 # Here are all jobs that are executed during "publish" stage
 
+publish-rustdoc:
+  stage: publish
+  extends: .kubernetes-env
+  variables:
+    CI_IMAGE: node:18
+    GIT_DEPTH: 100
+    RUSTDOCS_DEPLOY_REFS: "master"
+  rules:
+    - if: $CI_PIPELINE_SOURCE == "pipeline"
+      when: never
+    - if: $CI_PIPELINE_SOURCE == "web" && $CI_COMMIT_REF_NAME == "master"
+    - if: $CI_COMMIT_REF_NAME == "master"
+  needs:
+    - job: build-rustdoc
+      artifacts: true
+    - job: build-implementers-guide
+      artifacts: true
+  script:
+    # If $CI_COMMIT_REF_NAME doesn't match one of $RUSTDOCS_DEPLOY_REFS space-separated values, we
+    # exit immediately.
+    # Putting spaces at the front and back to ensure we are not matching just any substring, but the
+    # whole space-separated value.
+    # setup ssh
+    - eval $(ssh-agent)
+    - ssh-add - <<< ${GITHUB_SSH_PRIV_KEY}
+    - mkdir ~/.ssh && touch ~/.ssh/known_hosts
+    - ssh-keyscan -t rsa github.com >> ~/.ssh/known_hosts
+    # Set git config
+    - git config user.email "devops-team@parity.io"
+    - git config user.name "${GITHUB_USER}"
+    - git config remote.origin.url "git@github.com:/paritytech/${CI_PROJECT_NAME}.git"
+    - git config remote.origin.fetch "+refs/heads/*:refs/remotes/origin/*"
+    - git fetch origin gh-pages
+    # Save README and docs
+    - cp -r ./crate-docs/ /tmp/doc/
+    - cp -r ./artifacts/book/ /tmp/
+    - cp README.md /tmp/doc/
+    # we don't need to commit changes because we copy docs to /tmp
+    - git checkout gh-pages --force
+    # Enable if docs needed for other refs
+    # Install `index-tpl-crud` and generate index.html based on RUSTDOCS_DEPLOY_REFS
+    # - which index-tpl-crud &> /dev/null || yarn global add @substrate/index-tpl-crud
+    # - index-tpl-crud upsert ./index.html ${CI_COMMIT_REF_NAME}
+    # Ensure the destination dir doesn't exist.
+    - rm -rf ${CI_COMMIT_REF_NAME}
+    - rm -rf book/
+    - mv -f /tmp/doc ${CI_COMMIT_REF_NAME}
+    # dir for implementors guide
+    - mkdir -p book
+    - mv /tmp/book/html/* book/
+    # Upload files
+    - git add --all
+    # `git commit` has an exit code of > 0 if there is nothing to commit.
+    # This causes GitLab to exit immediately and marks this job failed.
+    # We don't want to mark the entire job failed if there's nothing to
+    # publish though, hence the `|| true`.
+    - git commit -m "___Updated docs for ${CI_COMMIT_REF_NAME}___" ||
+      echo "___Nothing to commit___"
+    - git push origin gh-pages --force
+  after_script:
+    - rm -rf .git/ ./*
+
 # cumulus
 
 .build-push-image:
@@ -35,7 +97,7 @@ build-push-image-polkadot-parachain-debug:
     - job: build-linux-stable-cumulus
       artifacts: true
   variables:
-    DOCKERFILE: "docker/polkadot-parachain-debug_unsigned_injected.Dockerfile"
+    DOCKERFILE: "docker/dockerfiles/polkadot-parachain/polkadot-parachain-debug_unsigned_injected.Dockerfile"
     IMAGE_NAME: "docker.io/paritypr/polkadot-parachain-debug"
 
 build-push-image-test-parachain:
@@ -48,7 +110,7 @@ build-push-image-test-parachain:
     - job: build-test-parachain
       artifacts: true
   variables:
-    DOCKERFILE: "docker/test-parachain_injected.Dockerfile"
+    DOCKERFILE: "docker/dockerfiles/test-parachain_injected.Dockerfile"
     IMAGE_NAME: "docker.io/paritypr/test-parachain"
 # publish-s3:
 #   stage: publish
@@ -114,7 +176,7 @@ build-push-image-polkadot-debug:
     - job: build-linux-stable
       artifacts: true
   variables:
-    DOCKERFILE: "docker/polkadot_injected_debug.Dockerfile"
+    DOCKERFILE: "docker/dockerfiles/polkadot/polkadot_injected_debug.Dockerfile"
     IMAGE_NAME: "docker.io/paritypr/polkadot-debug"
 
 build-push-image-colander:
@@ -127,7 +189,7 @@ build-push-image-colander:
     - job: build-test-collators
       artifacts: true
   variables:
-    DOCKERFILE: "docker/collator_injected.Dockerfile"
+    DOCKERFILE: "docker/dockerfiles/collator_injected.Dockerfile"
     IMAGE_NAME: "docker.io/paritypr/colander"
 
 build-push-image-malus:
@@ -140,7 +202,7 @@ build-push-image-malus:
     - job: build-malus
       artifacts: true
   variables:
-    DOCKERFILE: "docker/malus_injected.Dockerfile"
+    DOCKERFILE: "docker/dockerfiles/malus_injected.Dockerfile"
     IMAGE_NAME: "docker.io/paritypr/malus"
 
 build-push-image-substrate-pr:
@@ -153,7 +215,7 @@ build-push-image-substrate-pr:
     - job: build-linux-substrate
       artifacts: true
   variables:
-    DOCKERFILE: "docker/substrate_injected.Dockerfile"
+    DOCKERFILE: "docker/dockerfiles/substrate_injected.Dockerfile"
     IMAGE_NAME: "docker.io/paritypr/substrate"
 # old way
 
@@ -201,7 +263,7 @@ build-push-image-substrate-pr:
 #     GIT_STRATEGY: none
 #     DOCKER_USER: ${PARITYPR_USER}
 #     DOCKER_PASS: ${PARITYPR_PASS}
-#     # scripts/ci/dockerfiles/polkadot_injected_debug.Dockerfile
+#     # docker/dockerfiles/polkadot/polkadot_injected_debug.Dockerfile
 #     DOCKERFILE: polkadot_injected_debug.Dockerfile
 #     IMAGE_NAME: docker.io/paritypr/polkadot-debug
 #   needs:
@@ -230,7 +292,7 @@ build-push-image-substrate-pr:
 #     GIT_STRATEGY: none
 #     DOCKER_USER: ${PARITYPR_USER}
 #     DOCKER_PASS: ${PARITYPR_PASS}
-#     # scripts/ci/dockerfiles/collator_injected.Dockerfile
+#     # docker/dockerfiles/collator_injected.Dockerfile
 #     DOCKERFILE: collator_injected.Dockerfile
 #     IMAGE_NAME: docker.io/paritypr/colander
 #   needs:
@@ -258,7 +320,7 @@ build-push-image-substrate-pr:
 #     GIT_STRATEGY: none
 #     DOCKER_USER: ${PARITYPR_USER}
 #     DOCKER_PASS: ${PARITYPR_PASS}
-#     # scripts/ci/dockerfiles/malus_injected.Dockerfile
+#     # docker/dockerfiles/malus_injected.Dockerfile
 #     DOCKERFILE: malus_injected.Dockerfile
 #     IMAGE_NAME: docker.io/paritypr/malus
 #   needs:
@@ -274,24 +336,6 @@ build-push-image-substrate-pr:
 #       # this artifact is used in zombienet-tests job
 #       dotenv: ./artifacts/malus.env
 
-# publish-staking-miner-image:
-#   stage: publish
-#   extends:
-#     - .kubernetes-env
-#     - .build-push-image
-#     - .publish-refs
-#   variables:
-#     CI_IMAGE: ${BUILDAH_IMAGE}
-#     # scripts/ci/dockerfiles/staking-miner/staking-miner_injected.Dockerfile
-#     DOCKERFILE: ci/dockerfiles/staking-miner/staking-miner_injected.Dockerfile
-#     IMAGE_NAME: docker.io/paritytech/staking-miner
-#     GIT_STRATEGY: none
-#     DOCKER_USER: ${Docker_Hub_User_Parity}
-#     DOCKER_PASS: ${Docker_Hub_Pass_Parity}
-#   needs:
-#     - job: build-staking-miner
-#       artifacts: true
-
 # substrate
 
 # publish-substrate-image-pr:
diff --git a/.gitlab/pipeline/short-benchmarks.yml b/.gitlab/pipeline/short-benchmarks.yml
index 2993338cabb15f5d3c01b91d39e0d5a1b4477f35..5bfe4b729e6204a9899e6b1abd0c70d5a1f400f4 100644
--- a/.gitlab/pipeline/short-benchmarks.yml
+++ b/.gitlab/pipeline/short-benchmarks.yml
@@ -2,7 +2,10 @@
 # Here are all jobs that are executed during "short-benchmarks" stage
 
 # Run all pallet benchmarks only once to check if there are any errors
-short-benchmark-polkadot: &short-bench
+
+# run short-benchmarks for relay chain runtimes from polkadot
+
+short-benchmark-westend: &short-bench
   stage: short-benchmarks
   extends:
     - .docker-env
@@ -11,16 +14,77 @@ short-benchmark-polkadot: &short-bench
     - job: build-short-benchmark
       artifacts: true
   variables:
-    RUNTIME: polkadot
+    RUNTIME: westend
+    # Enable debug assertions since we are running optimized builds for testing
+    # but still want to have debug assertions.
+    RUSTFLAGS: "-C debug-assertions -D warnings"
+    RUST_BACKTRACE: "full"
+    WASM_BUILD_NO_COLOR: 1
+    WASM_BUILD_RUSTFLAGS: "-C debug-assertions -D warnings"
+  tags:
+    - benchmark
   script:
-    - ./artifacts/polkadot benchmark pallet --execution wasm --wasm-execution compiled --chain $RUNTIME-dev --pallet "*" --extrinsic "*" --steps 2 --repeat 1
+    - ./artifacts/polkadot benchmark pallet --chain $RUNTIME-dev --pallet "*" --extrinsic "*" --steps 2 --repeat 1
+
+# run short-benchmarks for system parachain runtimes from cumulus
 
-short-benchmark-kusama:
-  <<: *short-bench
+.short-benchmark-cumulus: &short-bench-cumulus
+  stage: short-benchmarks
+  extends:
+    - .common-refs
+    - .docker-env
+  needs:
+    - job: build-short-benchmark-cumulus
+      artifacts: true
   variables:
-    RUNTIME: kusama
+    RUNTIME_CHAIN: benchmarked-runtime-chain
+    # Enable debug assertions since we are running optimized builds for testing
+    # but still want to have debug assertions.
+    RUSTFLAGS: "-C debug-assertions -D warnings"
+    RUST_BACKTRACE: "full"
+    WASM_BUILD_NO_COLOR: 1
+    WASM_BUILD_RUSTFLAGS: "-C debug-assertions -D warnings"
+  tags:
+    - benchmark
+  script:
+    - ./artifacts/polkadot-parachain benchmark pallet --chain $RUNTIME_CHAIN --pallet "*" --extrinsic "*" --steps 2 --repeat 1
 
-short-benchmark-westend:
-  <<: *short-bench
+short-benchmark-asset-hub-polkadot:
+  <<: *short-bench-cumulus
   variables:
-    RUNTIME: westend
+    RUNTIME_CHAIN: asset-hub-polkadot-dev
+
+short-benchmark-asset-hub-kusama:
+  <<: *short-bench-cumulus
+  variables:
+    RUNTIME_CHAIN: asset-hub-kusama-dev
+
+short-benchmark-asset-hub-westend:
+  <<: *short-bench-cumulus
+  variables:
+    RUNTIME_CHAIN: asset-hub-westend-dev
+
+short-benchmark-bridge-hub-polkadot:
+  <<: *short-bench-cumulus
+  variables:
+    RUNTIME_CHAIN: bridge-hub-polkadot-dev
+
+short-benchmark-bridge-hub-kusama:
+  <<: *short-bench-cumulus
+  variables:
+    RUNTIME_CHAIN: bridge-hub-kusama-dev
+
+short-benchmark-bridge-hub-rococo:
+  <<: *short-bench-cumulus
+  variables:
+    RUNTIME_CHAIN: bridge-hub-rococo-dev
+
+short-benchmark-collectives-polkadot:
+  <<: *short-bench-cumulus
+  variables:
+    RUNTIME_CHAIN: collectives-polkadot-dev
+
+short-benchmark-glutton-kusama:
+  <<: *short-bench-cumulus
+  variables:
+    RUNTIME_CHAIN: glutton-kusama-dev-1300
diff --git a/.gitlab/pipeline/test.yml b/.gitlab/pipeline/test.yml
index ca8da4ea756686da753230ec1700cb586de23b07..12ce2140b1468d00bb3e5dc9f467a1e417dfa86d 100644
--- a/.gitlab/pipeline/test.yml
+++ b/.gitlab/pipeline/test.yml
@@ -11,6 +11,7 @@ test-linux-stable:
     - .docker-env
     - .common-refs
     - .run-immediately
+    - .pipeline-stopper-artifacts
   variables:
     RUST_TOOLCHAIN: stable
     # Enable debug assertions since we are running optimized builds for testing
@@ -22,29 +23,53 @@ test-linux-stable:
     - echo "Node index - ${CI_NODE_INDEX}. Total amount - ${CI_NODE_TOTAL}"
     # add experimental to features after https://github.com/paritytech/substrate/pull/14502 is merged
     # "upgrade_version_checks_should_work" is currently failing
-    # "receive_rate_limit_is_enforced"and "benchmark_block_works" can be found in test-linux-stable-additional-tests
-    # they fail if run with other tests
-    # "rx::tests::sent_views_include_finalized_number_update", "follow_chain_works", "create_snapshot_works" and "block_execution_works"
-    # can be found in test-linux-stable-slow
     - |
       time cargo nextest run \
-        -E 'all() & !test(upgrade_version_checks_should_work) & !test(receive_rate_limit_is_enforced) & !test(benchmark_block_works) & !test(rx::tests::sent_views_include_finalized_number_update) & !test(follow_chain_works) & !test(create_snapshot_works) & !test(block_execution_works)' \
         --workspace \
         --locked \
         --release \
-        --verbose \
         --no-fail-fast \
-        --features runtime-benchmarks,try-runtime,experimental \
+        --features try-runtime,experimental \
         --partition count:${CI_NODE_INDEX}/${CI_NODE_TOTAL}
+    # Upload tests results to Elasticsearch
+    - echo "Upload test results to Elasticsearch"
+    - cat target/nextest/default/junit.xml | xq . > target/nextest/default/junit.json
+    - |
+      curl -v -XPOST --http1.1 \
+      -u ${ELASTIC_USERNAME}:${ELASTIC_PASSWORD} \
+      https://elasticsearch.parity-build.parity.io/unit-tests/_doc/${CI_JOB_ID} \
+      -H 'Content-Type: application/json' \
+      -d @target/nextest/default/junit.json || echo "failed to upload junit report"
     # run runtime-api tests with `enable-staging-api` feature on the 1st node
     - if [ ${CI_NODE_INDEX} == 1 ]; then time cargo nextest run -p sp-api-test --features enable-staging-api; fi
-    # todo: add flacky-test collector
+  artifacts:
+    when: always
+    paths:
+      - target/nextest/default/junit.xml
+    reports:
+      junit: target/nextest/default/junit.xml
 
 test-linux-oldkernel-stable:
   extends: test-linux-stable
   tags:
     - oldkernel-vm
 
+# https://github.com/paritytech/ci_cd/issues/864
+test-linux-stable-runtime-benchmarks:
+  stage: test
+  extends:
+    - .docker-env
+    - .common-refs
+    - .run-immediately
+    - .pipeline-stopper-artifacts
+  variables:
+    RUST_TOOLCHAIN: stable
+    # Enable debug assertions since we are running optimized builds for testing
+    # but still want to have debug assertions.
+    RUSTFLAGS: "-Cdebug-assertions=y -Dwarnings"
+  script:
+    - time cargo nextest run --workspace --features runtime-benchmarks benchmark --locked --cargo-profile testnet
+
 # can be used to run all tests
 # test-linux-stable-all:
 #   stage: test
@@ -66,36 +91,30 @@ test-linux-oldkernel-stable:
 #         --workspace \
 #         --locked \
 #         --release \
-#         --verbose \
 #         --no-fail-fast \
 #         --features runtime-benchmarks,try-runtime \
 #         --partition count:${CI_NODE_INDEX}/${CI_NODE_TOTAL}
 #     # todo: add flacky-test collector
 
-# for some reasons these tests fail if run with all tests
+# TODO: remove me
 test-linux-stable-additional-tests:
   stage: test
   extends:
     - .docker-env
     - .common-refs
     - .run-immediately
+    - .pipeline-stopper-artifacts
   variables:
     RUST_TOOLCHAIN: stable
     # Enable debug assertions since we are running optimized builds for testing
     # but still want to have debug assertions.
     RUSTFLAGS: "-Cdebug-assertions=y -Dwarnings"
   script:
-    - |
-      time cargo nextest run \
-        -E 'test(receive_rate_limit_is_enforced) + test(benchmark_block_works)' \
-        --workspace \
-        --locked \
-        --release \
-        --verbose \
-        --features runtime-benchmarks,try-runtime
-  allow_failure: true
+    # tests were moved to test-linux-stable
+    # the jobs should be removed
+    - exit 0
 
-# these ones can be really slow so it's better to run them separately
+# TODO: remove me
 test-linux-stable-slow:
   stage: test
   # remove after cache is setup
@@ -104,21 +123,16 @@ test-linux-stable-slow:
     - .docker-env
     - .common-refs
     - .run-immediately
+    - .pipeline-stopper-artifacts
   variables:
     RUST_TOOLCHAIN: stable
     # Enable debug assertions since we are running optimized builds for testing
     # but still want to have debug assertions.
     RUSTFLAGS: "-Cdebug-assertions=y -Dwarnings"
   script:
-    - |
-      time cargo nextest run \
-        -E 'test(rx::tests::sent_views_include_finalized_number_update) + test(follow_chain_works) + test(create_snapshot_works) + test(block_execution_works)' \
-        --workspace \
-        --locked \
-        --release \
-        --verbose \
-        --features runtime-benchmarks,try-runtime
-  allow_failure: true
+    # tests were moved to test-linux-stable
+    # the jobs should be removed
+    - exit 0
 
 # takes about 1,5h without cache
 # can be used to check that nextest works correctly
@@ -148,13 +162,16 @@ test-doc:
   extends:
     - .docker-env
     - .common-refs
-    - .run-immediately
+  # DAG
+  needs:
+    - job: test-rustdoc
+      artifacts: false
   variables:
     # Enable debug assertions since we are running optimized builds for testing
     # but still want to have debug assertions.
     RUSTFLAGS: "-Cdebug-assertions=y -Dwarnings"
   script:
-    - time cargo test --doc
+    - time cargo test --doc --workspace
 
 test-rustdoc:
   stage: test
@@ -164,9 +181,8 @@ test-rustdoc:
     - .run-immediately
   variables:
     SKIP_WASM_BUILD: 1
-    RUSTDOCFLAGS: "-Dwarnings"
   script:
-    - time cargo doc --workspace --all-features --verbose --no-deps
+    - time cargo doc --workspace --all-features --no-deps
   allow_failure: true
 
 cargo-check-all-benches:
@@ -174,7 +190,10 @@ cargo-check-all-benches:
   extends:
     - .docker-env
     - .common-refs
-    - .run-immediately
+  # DAG
+  needs:
+    - job: cargo-hfuzz
+      artifacts: false
   script:
     - time cargo check --all --benches
 
@@ -191,21 +210,32 @@ test-node-metrics:
     # but still want to have debug assertions.
     RUSTFLAGS: "-Cdebug-assertions=y -Dwarnings"
   script:
+    # Build the required workers.
+    - cargo build --bin polkadot-execute-worker --bin polkadot-prepare-worker --profile testnet --verbose --locked
     - mkdir -p artifacts
     - time cargo test --profile testnet
       --locked
       --features=runtime-metrics -p polkadot-node-metrics > artifacts/log.txt
-  # FIXME!
-  allow_failure: true
 
 test-deterministic-wasm:
   stage: test
   extends:
     - .docker-env
     - .common-refs
-    - .run-immediately
+  # DAG
+  needs:
+    - job: test-frame-ui
+      artifacts: false
   script:
-    - .gitlab/test_deterministic_wasm.sh
+    # build runtime
+    - WASM_BUILD_NO_COLOR=1 cargo build -q --locked --release -p westend-runtime -p rococo-runtime
+    # make checksum
+    - sha256sum target/release/wbuild/*-runtime/target/wasm32-unknown-unknown/release/*.wasm > checksum.sha256
+    - cargo clean
+    # build again
+    - WASM_BUILD_NO_COLOR=1 cargo build -q --locked --release -p westend-runtime -p rococo-runtime
+    # confirm checksum
+    - sha256sum -c checksum.sha256
 
 cargo-check-benches:
   stage: test
@@ -216,6 +246,7 @@ cargo-check-benches:
     - .common-refs
     - .run-immediately
     - .collect-artifacts
+    - .pipeline-stopper-artifacts
   before_script:
     # TODO: DON'T FORGET TO CHANGE FOR PROD VALUES!!!
     # merges in the master branch on PRs. skip if base is not master
@@ -282,14 +313,17 @@ node-bench-regression-guard:
       --compare-with artifacts/benches/$CI_COMMIT_REF_NAME-$CI_COMMIT_SHORT_SHA"
   after_script: [""]
 
-# if this fails (especially after rust version upgrade) run
-# ./substrate/.maintain/update-rust-stable.sh <rust_version>
-test-frame-support:
+# if this fails run `bot update-ui` in the Pull Request or "./scripts/update-ui-tests.sh" locally
+# see ./docs/CONTRIBUTING.md#ui-tests
+test-frame-ui:
   stage: test
   extends:
     - .docker-env
     - .common-refs
-    - .run-immediately
+  # DAG
+  needs:
+    - job: test-frame-examples-compile-to-wasm
+      artifacts: false
   variables:
     # Enable debug assertions since we are running optimized builds for testing
     # but still want to have debug assertions.
@@ -300,9 +334,8 @@ test-frame-support:
     # Ensure we run the UI tests.
     RUN_UI_TESTS: 1
   script:
-    - time cargo test --locked -p frame-support-test --features=frame-feature-testing,no-metadata-docs,try-runtime,experimental --manifest-path ./substrate/frame/support/test/Cargo.toml
-    - time cargo test --locked -p frame-support-test --features=frame-feature-testing,frame-feature-testing-2,no-metadata-docs,try-runtime,experimental --manifest-path ./substrate/frame/support/test/Cargo.toml
-    - SUBSTRATE_TEST_TIMEOUT=1 time cargo test -p substrate-test-utils --release --locked -- --ignored timeout
+    - time cargo test --locked -q --profile testnet -p frame-support-test --features=frame-feature-testing,no-metadata-docs,try-runtime,experimental
+    - time cargo test --locked -q --profile testnet -p frame-support-test --features=frame-feature-testing,frame-feature-testing-2,no-metadata-docs,try-runtime,experimental
     - cat /cargo_target_dir/debug/.fingerprint/memory_units-759eddf317490d2b/lib-memory_units.json || true
 
 # This job runs all benchmarks defined in the `/bin/node/runtime` once to check that there are no errors.
@@ -320,7 +353,7 @@ quick-benchmarks:
     WASM_BUILD_NO_COLOR: 1
     WASM_BUILD_RUSTFLAGS: "-C debug-assertions -D warnings"
   script:
-    - time cargo run --locked --release --features runtime-benchmarks -- benchmark pallet --execution wasm --wasm-execution compiled --chain dev --pallet "*" --extrinsic "*" --steps 2 --repeat 1
+    - time cargo run --locked --release -p node-cli --bin substrate-node --features runtime-benchmarks -- benchmark pallet --execution wasm --wasm-execution compiled --chain dev --pallet "*" --extrinsic "*" --steps 2 --repeat 1
 
 test-frame-examples-compile-to-wasm:
   # into one job
@@ -328,7 +361,10 @@ test-frame-examples-compile-to-wasm:
   extends:
     - .docker-env
     - .common-refs
-    - .run-immediately
+  # DAG
+  needs:
+    - job: test-full-crypto-feature
+      artifacts: false
   variables:
     # Enable debug assertions since we are running optimized builds for testing
     # but still want to have debug assertions.
@@ -348,6 +384,7 @@ test-linux-stable-int:
     - .docker-env
     - .common-refs
     - .run-immediately
+    - .pipeline-stopper-artifacts
   variables:
     # Enable debug assertions since we are running optimized builds for testing
     # but still want to have debug assertions.
@@ -370,6 +407,7 @@ check-tracing:
     - .docker-env
     - .common-refs
     - .run-immediately
+    - .pipeline-stopper-artifacts
   script:
     # with-tracing must be explicitly activated, we run a test to ensure this works as expected in both cases
     - time cargo test --locked --manifest-path ./substrate/primitives/tracing/Cargo.toml --no-default-features
@@ -390,9 +428,9 @@ test-full-crypto-feature:
     RUST_BACKTRACE: 1
   script:
     - cd substrate/primitives/core/
-    - time cargo build --locked --verbose --no-default-features --features full_crypto
+    - time cargo build --locked --no-default-features --features full_crypto
     - cd ../application-crypto
-    - time cargo build --locked --verbose --no-default-features --features full_crypto
+    - time cargo build --locked --no-default-features --features full_crypto
 
 cargo-check-each-crate:
   stage: test
@@ -437,7 +475,10 @@ cargo-hfuzz:
   extends:
     - .docker-env
     - .common-refs
-    - .run-immediately
+  # DAG
+  needs:
+    - job: check-tracing
+      artifacts: false
   variables:
     # max 10s per iteration, 60s per file
     HFUZZ_RUN_ARGS: >
diff --git a/.gitlab/pipeline/zombienet/cumulus.yml b/.gitlab/pipeline/zombienet/cumulus.yml
index ca96828a1a553c437fa40c2b446e346c479d5a4d..3f2c6f64fbfe120ae15bf394982d6dbdd29405b0 100644
--- a/.gitlab/pipeline/zombienet/cumulus.yml
+++ b/.gitlab/pipeline/zombienet/cumulus.yml
@@ -5,7 +5,7 @@
   before_script:
     - echo "Zombie-net Tests Config"
     - echo "${ZOMBIENET_IMAGE}"
-    - echo "${RELAY_IMAGE}"
+    - echo "${POLKADOT_IMAGE}"
     - echo "${COL_IMAGE}"
     - echo "${GH_DIR}"
     - echo "${LOCAL_DIR}"
@@ -31,6 +31,7 @@
     LOCAL_DIR: "/builds/parity/mirrors/polkadot-sdk/cumulus/zombienet/tests"
     COL_IMAGE: "docker.io/paritypr/test-parachain:${DOCKER_IMAGES_VERSION}"
     FF_DISABLE_UMASK_FOR_DOCKER_EXECUTOR: 1
+    RUN_IN_CONTAINER: "1"
   artifacts:
     name: "${CI_JOB_NAME}_${CI_COMMIT_REF_NAME}"
     when: always
diff --git a/.gitlab/pipeline/zombienet/polkadot.yml b/.gitlab/pipeline/zombienet/polkadot.yml
index 82dd13cd290c5d205f4354812522ace1eb09b42c..0402c194134b78256aaee00999e87c7a18397bf0 100644
--- a/.gitlab/pipeline/zombienet/polkadot.yml
+++ b/.gitlab/pipeline/zombienet/polkadot.yml
@@ -4,25 +4,42 @@
 # common settings for all zombienet jobs
 .zombienet-polkadot-common:
   before_script:
+    - export BUILD_RELEASE_VERSION="$(cat ./artifacts/BUILD_RELEASE_VERSION)" # from build-linux-stable job
     - export DEBUG=zombie,zombie::network-node
     - export ZOMBIENET_INTEGRATION_TEST_IMAGE="${POLKADOT_IMAGE}":${PIPELINE_IMAGE_TAG}
     - export COL_IMAGE="${COLANDER_IMAGE}":${PIPELINE_IMAGE_TAG}
+    - export CUMULUS_IMAGE="docker.io/paritypr/polkadot-parachain-debug:${DOCKER_IMAGES_VERSION}"
     - export MALUS_IMAGE="${MALUS_IMAGE}":${PIPELINE_IMAGE_TAG}
+    - IMAGE_AVAILABLE=$(curl -o /dev/null -w "%{http_code}" -I -L -s https://registry.hub.docker.com/v2/repositories/parity/polkadot/tags/${BUILD_RELEASE_VERSION})
+    - if [ $IMAGE_AVAILABLE -eq 200 ]; then
+        export ZOMBIENET_INTEGRATION_TEST_SECONDARY_IMAGE="docker.io/parity/polkadot:${BUILD_RELEASE_VERSION}";
+      else
+        echo "Getting the image to use as SECONDARY, using ${BUILD_RELEASE_VERSION} as base";
+        VERSIONS=$(curl -L -s 'https://registry.hub.docker.com/v2/repositories/parity/polkadot/tags/' | jq -r '.results[].name'| grep -E "v[0-9]" |grep -vE "[0-9]-");
+        VERSION_TO_USE=$(echo "${BUILD_RELEASE_VERSION}\n$VERSIONS"|sort -r|grep -A1 "${BUILD_RELEASE_VERSION}"|tail -1);
+        export ZOMBIENET_INTEGRATION_TEST_SECONDARY_IMAGE="docker.io/parity/polkadot:${VERSION_TO_USE}";
+      fi
     - echo "Zombienet Tests Config"
     - echo "gh-dir ${GH_DIR}"
     - echo "local-dir ${LOCAL_DIR}"
     - echo "polkadot image ${ZOMBIENET_INTEGRATION_TEST_IMAGE}"
+    - echo "polkadot secondary image ${ZOMBIENET_INTEGRATION_TEST_SECONDARY_IMAGE}"
     - echo "colander image ${COL_IMAGE}"
+    - echo "cumulus image ${CUMULUS_IMAGE}"
     - echo "malus image ${MALUS_IMAGE}"
   stage: zombienet
   image: "${ZOMBIENET_IMAGE}"
   needs:
+    - job: build-linux-stable
+      artifacts: true
     - job: build-push-image-malus
       artifacts: true
     - job: build-push-image-polkadot-debug
       artifacts: true
     - job: build-push-image-colander
       artifacts: true
+    - job: build-push-image-polkadot-parachain-debug
+      artifacts: true
   extends:
     - .kubernetes-env
     - .zombienet-refs
@@ -34,6 +51,7 @@
     GH_DIR: "https://github.com/paritytech/substrate/tree/${CI_COMMIT_SHA}/zombienet"
     LOCAL_DIR: "/builds/parity/mirrors/polkadot-sdk/polkadot/zombienet_tests"
     FF_DISABLE_UMASK_FOR_DOCKER_EXECUTOR: 1
+    RUN_IN_CONTAINER: "1"
   artifacts:
     name: "${CI_JOB_NAME}_${CI_COMMIT_REF_NAME}"
     when: always
@@ -63,28 +81,36 @@ zombienet-polkadot-functional-0002-parachains-disputes:
       --local-dir="${LOCAL_DIR}/functional"
       --test="0002-parachains-disputes.zndsl"
 
-zombienet-polkadot-functional-0003-parachains-disputes-garbage-candidate:
+zombienet-polkadot-functional-0003-beefy-and-mmr:
   extends:
     - .zombienet-polkadot-common
   script:
     - /home/nonroot/zombie-net/scripts/ci/run-test-local-env-manager.sh
       --local-dir="${LOCAL_DIR}/functional"
-      --test="0003-parachains-garbage-candidate.zndsl"
+      --test="0003-beefy-and-mmr.zndsl"
 
-zombienet-polkadot-functional-0004-beefy-and-mmr:
+zombienet-polkadot-functional-0004-parachains-disputes-garbage-candidate:
   extends:
     - .zombienet-polkadot-common
   script:
     - /home/nonroot/zombie-net/scripts/ci/run-test-local-env-manager.sh
       --local-dir="${LOCAL_DIR}/functional"
-      --test="0003-beefy-and-mmr.zndsl"
+      --test="0004-parachains-garbage-candidate.zndsl"
+
+zombienet-polkadot-functional-0005-parachains-disputes-past-session:
+  extends:
+    - .zombienet-polkadot-common
+  script:
+    - /home/nonroot/zombie-net/scripts/ci/run-test-local-env-manager.sh
+      --local-dir="${LOCAL_DIR}/functional"
+      --test="0005-parachains-disputes-past-session.zndsl"
 
 zombienet-polkadot-smoke-0001-parachains-smoke-test:
   extends:
     - .zombienet-polkadot-common
   before_script:
     - export ZOMBIENET_INTEGRATION_TEST_IMAGE="${POLKADOT_IMAGE}":${PIPELINE_IMAGE_TAG}
-    - export COL_IMAGE="docker.io/paritypr/colander:4519" # The collator image is fixed
+    - export COL_IMAGE="${COLANDER_IMAGE}":${PIPELINE_IMAGE_TAG}
     - echo "Zombienet Tests Config"
     - echo "gh-dir ${GH_DIR}"
     - echo "local-dir ${LOCAL_DIR}"
@@ -101,12 +127,12 @@ zombienet-polkadot-smoke-0002-parachains-parachains-upgrade-smoke:
     - .zombienet-polkadot-common
   before_script:
     - export ZOMBIENET_INTEGRATION_TEST_IMAGE="${POLKADOT_IMAGE}":${PIPELINE_IMAGE_TAG}
-    - export COL_IMAGE="docker.io/parity/polkadot-collator:latest" # Use cumulus lastest image
+    - export CUMULUS_IMAGE="docker.io/paritypr/polkadot-parachain-debug:${DOCKER_IMAGES_VERSION}"
     - echo "Zombienet Tests Config"
     - echo "gh-dir ${GH_DIR}"
     - echo "local-dir ${LOCAL_DIR}"
     - echo "polkadot image ${ZOMBIENET_INTEGRATION_TEST_IMAGE}"
-    - echo "colander image ${COL_IMAGE}"
+    - echo "polkadot-parachain image ${CUMULUS_IMAGE}"
     - echo "malus image ${MALUS_IMAGE}"
   script:
     - /home/nonroot/zombie-net/scripts/ci/run-test-local-env-manager.sh
@@ -146,7 +172,7 @@ zombienet-polkadot-misc-0002-upgrade-node:
     - echo "Overrided poladot image ${ZOMBIENET_INTEGRATION_TEST_IMAGE}"
     - export COL_IMAGE="${COLANDER_IMAGE}":${PIPELINE_IMAGE_TAG}
     - BUILD_LINUX_JOB_ID="$(cat ./artifacts/BUILD_LINUX_JOB_ID)"
-    - export POLKADOT_PR_BIN_URL="https://gitlab-stg.parity.io/parity/mirrors/polkadot-sdk/-/jobs/${BUILD_LINUX_JOB_ID}/artifacts/raw/artifacts/polkadot"
+    - export POLKADOT_PR_ARTIFACTS_URL="https://gitlab.parity.io/parity/mirrors/polkadot-sdk/-/jobs/${BUILD_LINUX_JOB_ID}/artifacts/raw/artifacts"
     - echo "Zombienet Tests Config"
     - echo "gh-dir ${GH_DIR}"
     - echo "local-dir ${LOCAL_DIR}"
diff --git a/.gitlab/pipeline/zombienet/substrate.yml b/.gitlab/pipeline/zombienet/substrate.yml
index 9a461ca41709948c17344e8bc4ca440aedff2108..9fb2f161ad73367a86279a6e7268f9116eae8f54 100644
--- a/.gitlab/pipeline/zombienet/substrate.yml
+++ b/.gitlab/pipeline/zombienet/substrate.yml
@@ -24,6 +24,7 @@
     GH_DIR: "https://github.com/paritytech/substrate/tree/${CI_COMMIT_SHA}/zombienet"
     LOCAL_DIR: "/builds/parity/mirrors/polkadot-sdk/substrate/zombienet"
     FF_DISABLE_UMASK_FOR_DOCKER_EXECUTOR: 1
+    RUN_IN_CONTAINER: "1"
   artifacts:
     name: "${CI_JOB_NAME}_${CI_COMMIT_REF_NAME}"
     when: always
diff --git a/.gitlab/test_deterministic_wasm.sh b/.gitlab/test_deterministic_wasm.sh
deleted file mode 100755
index 5b04013e1df3d5d6b49f5c78c230ceb2e56cf3f8..0000000000000000000000000000000000000000
--- a/.gitlab/test_deterministic_wasm.sh
+++ /dev/null
@@ -1,15 +0,0 @@
-#!/usr/bin/env bash
-
-#shellcheck source=../common/lib.sh
-source "$( cd "$( dirname "${BASH_SOURCE[0]}" )" >/dev/null 2>&1 && pwd )/common/lib.sh"
-
-# build runtime
-WASM_BUILD_NO_COLOR=1 cargo build --verbose --release -p kusama-runtime -p polkadot-runtime -p westend-runtime
-# make checksum
-sha256sum target/release/wbuild/*-runtime/target/wasm32-unknown-unknown/release/*.wasm > checksum.sha256
-# clean up - FIXME: can we reuse some of the artifacts?
-cargo clean
-# build again
-WASM_BUILD_NO_COLOR=1 cargo build --verbose --release -p kusama-runtime -p polkadot-runtime -p westend-runtime
-# confirm checksum
-sha256sum -c checksum.sha256
diff --git a/cumulus/.rustfmt.toml b/.rustfmt.toml
similarity index 99%
rename from cumulus/.rustfmt.toml
rename to .rustfmt.toml
index e2c4a037f37fe229bd237cf50c4bb218814b890f..c34215391239c1f39a1beab05e61b81b6ad60cab 100644
--- a/cumulus/.rustfmt.toml
+++ b/.rustfmt.toml
@@ -3,18 +3,11 @@ edition = "2021"
 hard_tabs = true
 max_width = 100
 use_small_heuristics = "Max"
-
 # Imports
 imports_granularity = "Crate"
 reorder_imports = true
-
 # Consistency
 newline_style = "Unix"
-
-# Format comments
-comment_width = 100
-wrap_comments = true
-
 # Misc
 chain_width = 80
 spaces_around_ranges = false
@@ -26,3 +19,6 @@ match_block_trailing_comma = true
 trailing_comma = "Vertical"
 trailing_semicolon = false
 use_field_init_shorthand = true
+# Format comments
+comment_width = 100
+wrap_comments = true
diff --git a/cumulus/BRIDGES.md b/BRIDGES.md
similarity index 74%
rename from cumulus/BRIDGES.md
rename to BRIDGES.md
index 8766de92c17e3b5b0d4596453cbf6bfce1893297..a6f00aec09283e10d1a697bcef3f523881941663 100644
--- a/cumulus/BRIDGES.md
+++ b/BRIDGES.md
@@ -1,13 +1,13 @@
-# Using Parity Bridges Common dependency (`git subtree`).
+# Using Parity Bridges Common dependency (`git subtree`)
 
 In `./bridges` sub-directory you can find a `git subtree` imported version of:
-[parity-bridges-common](https://github.com/paritytech/parity-bridges-common/) repository.
+[`parity-bridges-common`](https://github.com/paritytech/parity-bridges-common/) repository.
 
 (For regular Cumulus contributor 1. is relevant) \
 (For Cumulus maintainer 1. and 2. are relevant) \
 (For Bridges team 1. and 2. and 3. are relevant)
 
-# 1. How to fix broken Bridges code?
+## How to fix broken Bridges code?
 
 To fix Bridges code simply create a commit in current (`Cumulus`) repo. Best if
 the commit is isolated to changes in `./bridges` sub-directory, because it makes
@@ -16,7 +16,7 @@ it easier to import that change back to upstream repo.
 (Any changes to `bridges` subtree require Bridges team approve and they should manage backport to Bridges repo)
 
 
-# 2. How to pull latest Bridges code to the `bridges` subtree
+## How to pull latest Bridges code to the `bridges` subtree
 (in practice)
 
 The `bridges` repo has a stabilized branch `polkadot-staging` dedicated for releasing.
@@ -25,7 +25,7 @@ The `bridges` repo has a stabilized branch `polkadot-staging` dedicated for rele
 cd <cumulus-git-repo-dir>
 
 # this will update new git branches from bridges repo
-# there could be unresolved conflicts, but dont worry,
+# there could be unresolved conflicts, but don't worry,
 # lots of them are caused because of removed unneeded files with patch step,
 BRANCH=polkadot-staging ./scripts/bridges_update_subtree.sh fetch
 
@@ -45,9 +45,9 @@ BRANCH=polkadot-staging ./scripts/bridges_update_subtree.sh fetch
 # so after all conflicts are solved and patch passes and compiles,
 # then we need to finish merge with:
 git merge --continue
-````
+```
 
-# 3. How to pull latest Bridges code or contribute back?
+## How to pull latest Bridges code or contribute back?
 (in theory)
 
 Note that it's totally fine to ping the **Bridges Team** to do that for you. The point
@@ -58,34 +58,34 @@ If you still would like to either update the code to match latest code from the
 or create an upstream PR read below. The following commands should be run in the
 current (`polkadot`) repo.
 
-1. Add Bridges repo as a local remote:
+### Add Bridges repo as a local remote
 ```
-$ git remote add -f bridges git@github.com:paritytech/parity-bridges-common.git
+git remote add -f bridges git@github.com:paritytech/parity-bridges-common.git
 ```
 
 If you plan to contribute back, consider forking the repository on Github and adding
 your personal fork as a remote as well.
 ```
-$ git remote add -f my-bridges git@github.com:tomusdrw/parity-bridges-common.git
+git remote add -f my-bridges git@github.com:tomusdrw/parity-bridges-common.git
 ```
 
-2. To update Bridges:
+### To update Bridges
+```
+git fetch bridges polkadot-staging
+git subtree pull --prefix=bridges bridges polkadot-staging --squash
 ```
-$ git fetch bridges polkadot-staging
-$ git subtree pull --prefix=bridges bridges polkadot-staging --squash
-````
 
 We use `--squash` to avoid adding individual commits and rather squashing them
 all into one.
 
-3. Clean unneeded files here:
+### Clean unneeded files here
 ```
 ./bridges/scripts/verify-pallets-build.sh --ignore-git-state --no-revert
 ```
 
-4. Contributing back to Bridges (creating upstream PR)
+### Contributing back to Bridges (creating upstream PR)
 ```
-$ git subtree push --prefix=bridges my-bridges polkadot-staging
+git subtree push --prefix=bridges my-bridges polkadot-staging
 ```
 This command will push changes to your personal fork of Bridges repo, from where
 you can simply create a PR to the main repo.
diff --git a/Cargo.lock b/Cargo.lock
index c755be63042b4efda333ecbb172a0ccf9f0708b6..f12e16276e78db653e0bdc9a3b6f9d8667542961 100644
--- a/Cargo.lock
+++ b/Cargo.lock
@@ -116,7 +116,7 @@ dependencies = [
  "cipher 0.3.0",
  "ctr 0.8.0",
  "ghash 0.4.4",
- "subtle",
+ "subtle 2.4.1",
 ]
 
 [[package]]
@@ -130,7 +130,7 @@ dependencies = [
  "cipher 0.4.4",
  "ctr 0.9.2",
  "ghash 0.5.0",
- "subtle",
+ "subtle 2.4.1",
 ]
 
 [[package]]
@@ -229,9 +229,9 @@ dependencies = [
 
 [[package]]
 name = "anstream"
-version = "0.5.0"
+version = "0.6.4"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "b1f58811cfac344940f1a400b6e6231ce35171f614f26439e80f8c1465c5cc0c"
+checksum = "2ab91ebe16eb252986481c5b62f6098f3b698a45e34b5b98200cf20dd2484a44"
 dependencies = [
  "anstyle",
  "anstyle-parse",
@@ -267,9 +267,9 @@ dependencies = [
 
 [[package]]
 name = "anstyle-wincon"
-version = "2.1.0"
+version = "3.0.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "58f54d10c6dfa51283a066ceab3ec1ab78d13fae00aa49243a45e4571fb79dfd"
+checksum = "f0699d10d2f4d628a98ee7b57b289abbc98ff3bad977cb3152709d4bf2330628"
 dependencies = [
  "anstyle",
  "windows-sys 0.48.0",
@@ -316,26 +316,6 @@ version = "1.6.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "bddcadddf5e9015d310179a59bb28c4d4b9920ad0f11e8e14dbadf654890c9a6"
 
-[[package]]
-name = "ark-algebra-test-templates"
-version = "0.4.2"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "400bd3a79c741b1832f1416d4373ae077ef82ca14a8b4cee1248a2f11c8b9172"
-dependencies = [
- "ark-ec",
- "ark-ff",
- "ark-serialize",
- "ark-std",
- "hex",
- "num-bigint",
- "num-integer",
- "num-traits",
- "serde",
- "serde_derive",
- "serde_json",
- "sha2 0.10.7",
-]
-
 [[package]]
 name = "ark-bls12-377"
 version = "0.4.0"
@@ -468,51 +448,24 @@ dependencies = [
  "hashbrown 0.13.2",
 ]
 
-[[package]]
-name = "ark-r1cs-std"
-version = "0.4.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "de1d1472e5cb020cb3405ce2567c91c8d43f21b674aef37b0202f5c3304761db"
-dependencies = [
- "ark-ec",
- "ark-ff",
- "ark-relations",
- "ark-std",
- "derivative",
- "num-bigint",
- "num-integer",
- "num-traits",
- "tracing",
-]
-
-[[package]]
-name = "ark-relations"
-version = "0.4.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "00796b6efc05a3f48225e59cb6a2cda78881e7c390872d5786aaf112f31fb4f0"
-dependencies = [
- "ark-ff",
- "ark-std",
- "tracing",
- "tracing-subscriber 0.2.25",
-]
-
 [[package]]
 name = "ark-scale"
-version = "0.0.3"
+version = "0.0.11"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "4d028cd1025d002fa88c10cd644d29028a7b40806579b608c6ba843b937bbb23"
+checksum = "51bd73bb6ddb72630987d37fa963e99196896c0d0ea81b7c894567e74a2f83af"
 dependencies = [
  "ark-ec",
+ "ark-ff",
  "ark-serialize",
  "ark-std",
  "parity-scale-codec",
+ "scale-info",
 ]
 
 [[package]]
 name = "ark-secret-scalar"
 version = "0.0.2"
-source = "git+https://github.com/w3f/ring-vrf?rev=c86ebd4#c86ebd4114d3165d05f9ce28c1d9e8d7a9a4e801"
+source = "git+https://github.com/w3f/ring-vrf?rev=4b09416#4b09416fd23383ec436ddac127d58c7b7cd392c6"
 dependencies = [
  "ark-ec",
  "ark-ff",
@@ -560,7 +513,7 @@ dependencies = [
 [[package]]
 name = "ark-transcript"
 version = "0.0.2"
-source = "git+https://github.com/w3f/ring-vrf?rev=c86ebd4#c86ebd4114d3165d05f9ce28c1d9e8d7a9a4e801"
+source = "git+https://github.com/w3f/ring-vrf?rev=4b09416#4b09416fd23383ec436ddac127d58c7b7cd392c6"
 dependencies = [
  "ark-ff",
  "ark-serialize",
@@ -570,6 +523,12 @@ dependencies = [
  "sha3",
 ]
 
+[[package]]
+name = "array-bytes"
+version = "4.2.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "f52f63c5c1316a16a4b35eaac8b76a98248961a533f061684cb2a7cb0eafb6c6"
+
 [[package]]
 name = "array-bytes"
 version = "6.1.0"
@@ -616,7 +575,7 @@ dependencies = [
  "num-traits",
  "rusticata-macros",
  "thiserror",
- "time 0.3.27",
+ "time",
 ]
 
 [[package]]
@@ -632,7 +591,7 @@ dependencies = [
  "num-traits",
  "rusticata-macros",
  "thiserror",
- "time 0.3.27",
+ "time",
 ]
 
 [[package]]
@@ -691,36 +650,6 @@ version = "1.5.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "9b34d609dfbaf33d6889b2b7106d3ca345eacad44200913df5ba02bfd31d2ba9"
 
-[[package]]
-name = "asset-hub-kusama-integration-tests"
-version = "1.0.0"
-dependencies = [
- "assert_matches",
- "asset-hub-kusama-runtime",
- "cumulus-pallet-dmp-queue",
- "cumulus-pallet-parachain-system",
- "cumulus-pallet-xcmp-queue",
- "frame-support",
- "frame-system",
- "integration-tests-common",
- "pallet-asset-conversion",
- "pallet-assets",
- "pallet-balances",
- "pallet-xcm",
- "parachains-common",
- "parity-scale-codec",
- "polkadot-core-primitives",
- "polkadot-parachain",
- "polkadot-runtime",
- "polkadot-runtime-parachains",
- "sp-core",
- "sp-runtime",
- "sp-weights",
- "xcm",
- "xcm-emulator",
- "xcm-executor",
-]
-
 [[package]]
 name = "asset-hub-kusama-runtime"
 version = "0.9.420"
@@ -742,8 +671,7 @@ dependencies = [
  "frame-system-benchmarking",
  "frame-system-rpc-runtime-api",
  "frame-try-runtime",
- "hex-literal 0.4.1",
- "kusama-runtime-constants",
+ "hex-literal",
  "log",
  "pallet-asset-conversion",
  "pallet-asset-conversion-tx-payment",
@@ -770,7 +698,7 @@ dependencies = [
  "parachains-common",
  "parity-scale-codec",
  "polkadot-core-primitives",
- "polkadot-parachain",
+ "polkadot-parachain-primitives",
  "polkadot-runtime-common",
  "primitive-types",
  "scale-info",
@@ -779,6 +707,7 @@ dependencies = [
  "sp-block-builder",
  "sp-consensus-aura",
  "sp-core",
+ "sp-genesis-builder",
  "sp-inherents",
  "sp-offchain",
  "sp-runtime",
@@ -788,37 +717,10 @@ dependencies = [
  "sp-transaction-pool",
  "sp-version",
  "sp-weights",
+ "staging-xcm",
+ "staging-xcm-builder",
+ "staging-xcm-executor",
  "substrate-wasm-builder",
- "xcm",
- "xcm-builder",
- "xcm-executor",
-]
-
-[[package]]
-name = "asset-hub-polkadot-integration-tests"
-version = "1.0.0"
-dependencies = [
- "cumulus-pallet-dmp-queue",
- "cumulus-pallet-parachain-system",
- "cumulus-pallet-xcmp-queue",
- "frame-support",
- "frame-system",
- "integration-tests-common",
- "pallet-assets",
- "pallet-balances",
- "pallet-xcm",
- "parachains-common",
- "parity-scale-codec",
- "polkadot-core-primitives",
- "polkadot-parachain",
- "polkadot-runtime",
- "polkadot-runtime-parachains",
- "sp-core",
- "sp-runtime",
- "sp-weights",
- "xcm",
- "xcm-emulator",
- "xcm-executor",
 ]
 
 [[package]]
@@ -842,7 +744,7 @@ dependencies = [
  "frame-system-benchmarking",
  "frame-system-rpc-runtime-api",
  "frame-try-runtime",
- "hex-literal 0.4.1",
+ "hex-literal",
  "log",
  "pallet-asset-tx-payment",
  "pallet-assets",
@@ -866,15 +768,15 @@ dependencies = [
  "parachains-common",
  "parity-scale-codec",
  "polkadot-core-primitives",
- "polkadot-parachain",
+ "polkadot-parachain-primitives",
  "polkadot-runtime-common",
- "polkadot-runtime-constants",
  "scale-info",
  "smallvec",
  "sp-api",
  "sp-block-builder",
  "sp-consensus-aura",
  "sp-core",
+ "sp-genesis-builder",
  "sp-inherents",
  "sp-offchain",
  "sp-runtime",
@@ -884,10 +786,21 @@ dependencies = [
  "sp-transaction-pool",
  "sp-version",
  "sp-weights",
+ "staging-xcm",
+ "staging-xcm-builder",
+ "staging-xcm-executor",
  "substrate-wasm-builder",
- "xcm",
- "xcm-builder",
- "xcm-executor",
+]
+
+[[package]]
+name = "asset-hub-rococo-integration-tests"
+version = "1.0.0"
+dependencies = [
+ "frame-support",
+ "integration-tests-common",
+ "parity-scale-codec",
+ "staging-xcm",
+ "xcm-emulator",
 ]
 
 [[package]]
@@ -898,26 +811,26 @@ dependencies = [
  "asset-hub-westend-runtime",
  "cumulus-pallet-dmp-queue",
  "cumulus-pallet-parachain-system",
- "cumulus-pallet-xcmp-queue",
  "frame-support",
  "frame-system",
  "integration-tests-common",
  "pallet-asset-conversion",
+ "pallet-asset-rate",
  "pallet-assets",
  "pallet-balances",
+ "pallet-treasury",
  "pallet-xcm",
  "parachains-common",
  "parity-scale-codec",
  "polkadot-core-primitives",
- "polkadot-parachain",
- "polkadot-runtime",
+ "polkadot-parachain-primitives",
+ "polkadot-runtime-common",
  "polkadot-runtime-parachains",
- "sp-core",
  "sp-runtime",
- "sp-weights",
- "xcm",
+ "staging-xcm",
+ "staging-xcm-builder",
+ "staging-xcm-executor",
  "xcm-emulator",
- "xcm-executor",
 ]
 
 [[package]]
@@ -941,7 +854,7 @@ dependencies = [
  "frame-system-benchmarking",
  "frame-system-rpc-runtime-api",
  "frame-try-runtime",
- "hex-literal 0.4.1",
+ "hex-literal",
  "log",
  "pallet-asset-conversion",
  "pallet-asset-conversion-tx-payment",
@@ -967,7 +880,7 @@ dependencies = [
  "parachains-common",
  "parity-scale-codec",
  "polkadot-core-primitives",
- "polkadot-parachain",
+ "polkadot-parachain-primitives",
  "polkadot-runtime-common",
  "primitive-types",
  "scale-info",
@@ -976,6 +889,7 @@ dependencies = [
  "sp-block-builder",
  "sp-consensus-aura",
  "sp-core",
+ "sp-genesis-builder",
  "sp-inherents",
  "sp-io",
  "sp-offchain",
@@ -985,11 +899,11 @@ dependencies = [
  "sp-storage",
  "sp-transaction-pool",
  "sp-version",
+ "staging-xcm",
+ "staging-xcm-builder",
+ "staging-xcm-executor",
  "substrate-wasm-builder",
  "westend-runtime-constants",
- "xcm",
- "xcm-builder",
- "xcm-executor",
 ]
 
 [[package]]
@@ -1005,7 +919,7 @@ dependencies = [
  "cumulus-test-relay-sproof-builder",
  "frame-support",
  "frame-system",
- "hex-literal 0.4.1",
+ "hex-literal",
  "pallet-assets",
  "pallet-balances",
  "pallet-collator-selection",
@@ -1015,15 +929,15 @@ dependencies = [
  "parachains-common",
  "parachains-runtimes-test-utils",
  "parity-scale-codec",
- "polkadot-parachain",
+ "polkadot-parachain-primitives",
  "sp-consensus-aura",
  "sp-core",
  "sp-io",
  "sp-runtime",
  "sp-std",
+ "staging-xcm",
+ "staging-xcm-executor",
  "substrate-wasm-builder",
- "xcm",
- "xcm-executor",
 ]
 
 [[package]]
@@ -1043,10 +957,10 @@ dependencies = [
  "sp-api",
  "sp-runtime",
  "sp-std",
+ "staging-xcm",
+ "staging-xcm-builder",
+ "staging-xcm-executor",
  "substrate-wasm-builder",
- "xcm",
- "xcm-builder",
- "xcm-executor",
 ]
 
 [[package]]
@@ -1145,17 +1059,6 @@ dependencies = [
  "windows-sys 0.48.0",
 ]
 
-[[package]]
-name = "async-recursion"
-version = "1.0.4"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "0e97ce7de6cf12de5d7226c73f5ba9811622f4db3a5b91b55c53e987e5f91cba"
-dependencies = [
- "proc-macro2",
- "quote",
- "syn 2.0.29",
-]
-
 [[package]]
 name = "async-stream"
 version = "0.3.5"
@@ -1175,7 +1078,7 @@ checksum = "16e62a023e7c117e27523144c5d2459f4397fcc3cab0085af8e2224f643a0193"
 dependencies = [
  "proc-macro2",
  "quote",
- "syn 2.0.29",
+ "syn 2.0.38",
 ]
 
 [[package]]
@@ -1192,7 +1095,7 @@ checksum = "bc00ceb34980c03614e35a3a4e218276a0a824e911d07651cd0d858a51e8c0f0"
 dependencies = [
  "proc-macro2",
  "quote",
- "syn 2.0.29",
+ "syn 2.0.38",
 ]
 
 [[package]]
@@ -1255,7 +1158,7 @@ dependencies = [
 [[package]]
 name = "bandersnatch_vrfs"
 version = "0.0.1"
-source = "git+https://github.com/w3f/ring-vrf?rev=c86ebd4#c86ebd4114d3165d05f9ce28c1d9e8d7a9a4e801"
+source = "git+https://github.com/w3f/ring-vrf?rev=4b09416#4b09416fd23383ec436ddac127d58c7b7cd392c6"
 dependencies = [
  "ark-bls12-381",
  "ark-ec",
@@ -1331,7 +1234,7 @@ dependencies = [
 name = "binary-merkle-tree"
 version = "4.0.0-dev"
 dependencies = [
- "array-bytes",
+ "array-bytes 6.1.0",
  "env_logger 0.9.3",
  "hash-db",
  "log",
@@ -1366,7 +1269,7 @@ dependencies = [
  "regex",
  "rustc-hash",
  "shlex",
- "syn 2.0.29",
+ "syn 2.0.38",
 ]
 
 [[package]]
@@ -1408,6 +1311,18 @@ dependencies = [
  "wyz",
 ]
 
+[[package]]
+name = "blake2"
+version = "0.8.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "94cb07b0da6a73955f8fb85d24c466778e70cda767a568229b104f0264089330"
+dependencies = [
+ "byte-tools",
+ "crypto-mac 0.7.0",
+ "digest 0.8.1",
+ "opaque-debug 0.2.3",
+]
+
 [[package]]
 name = "blake2"
 version = "0.10.6"
@@ -1650,7 +1565,7 @@ dependencies = [
  "finality-grandpa",
  "frame-support",
  "hex",
- "hex-literal 0.4.1",
+ "hex-literal",
  "parity-scale-codec",
  "scale-info",
  "serde",
@@ -1680,7 +1595,7 @@ dependencies = [
  "bp-runtime",
  "frame-support",
  "hex",
- "hex-literal 0.4.1",
+ "hex-literal",
  "parity-scale-codec",
  "scale-info",
  "serde",
@@ -1716,6 +1631,23 @@ dependencies = [
  "sp-std",
 ]
 
+[[package]]
+name = "bp-polkadot-bulletin"
+version = "0.1.0"
+dependencies = [
+ "bp-header-chain",
+ "bp-messages",
+ "bp-polkadot-core",
+ "bp-runtime",
+ "frame-support",
+ "frame-system",
+ "parity-scale-codec",
+ "scale-info",
+ "sp-api",
+ "sp-runtime",
+ "sp-std",
+]
+
 [[package]]
 name = "bp-polkadot-core"
 version = "0.1.0"
@@ -1742,7 +1674,7 @@ dependencies = [
  "bp-runtime",
  "frame-support",
  "hex",
- "hex-literal 0.4.1",
+ "hex-literal",
  "parity-scale-codec",
  "scale-info",
  "sp-runtime",
@@ -1768,7 +1700,7 @@ dependencies = [
  "frame-support",
  "frame-system",
  "hash-db",
- "hex-literal 0.4.1",
+ "hex-literal",
  "impl-trait-for-tuples",
  "log",
  "num-traits",
@@ -1792,7 +1724,7 @@ dependencies = [
  "bp-parachains",
  "bp-polkadot-core",
  "bp-runtime",
- "ed25519-dalek 1.0.1",
+ "ed25519-dalek",
  "finality-grandpa",
  "parity-scale-codec",
  "sp-application-crypto",
@@ -1846,8 +1778,7 @@ dependencies = [
  "frame-system-benchmarking",
  "frame-system-rpc-runtime-api",
  "frame-try-runtime",
- "hex-literal 0.4.1",
- "kusama-runtime-constants",
+ "hex-literal",
  "log",
  "pallet-aura",
  "pallet-authorship",
@@ -1865,7 +1796,7 @@ dependencies = [
  "parachains-common",
  "parity-scale-codec",
  "polkadot-core-primitives",
- "polkadot-parachain",
+ "polkadot-parachain-primitives",
  "polkadot-runtime-common",
  "scale-info",
  "serde",
@@ -1874,6 +1805,7 @@ dependencies = [
  "sp-block-builder",
  "sp-consensus-aura",
  "sp-core",
+ "sp-genesis-builder",
  "sp-inherents",
  "sp-io",
  "sp-offchain",
@@ -1883,10 +1815,10 @@ dependencies = [
  "sp-storage",
  "sp-transaction-pool",
  "sp-version",
+ "staging-xcm",
+ "staging-xcm-builder",
+ "staging-xcm-executor",
  "substrate-wasm-builder",
- "xcm",
- "xcm-builder",
- "xcm-executor",
 ]
 
 [[package]]
@@ -1909,7 +1841,7 @@ dependencies = [
  "frame-system-benchmarking",
  "frame-system-rpc-runtime-api",
  "frame-try-runtime",
- "hex-literal 0.4.1",
+ "hex-literal",
  "log",
  "pallet-aura",
  "pallet-authorship",
@@ -1927,9 +1859,8 @@ dependencies = [
  "parachains-common",
  "parity-scale-codec",
  "polkadot-core-primitives",
- "polkadot-parachain",
+ "polkadot-parachain-primitives",
  "polkadot-runtime-common",
- "polkadot-runtime-constants",
  "scale-info",
  "serde",
  "smallvec",
@@ -1937,6 +1868,7 @@ dependencies = [
  "sp-block-builder",
  "sp-consensus-aura",
  "sp-core",
+ "sp-genesis-builder",
  "sp-inherents",
  "sp-io",
  "sp-offchain",
@@ -1946,10 +1878,10 @@ dependencies = [
  "sp-storage",
  "sp-transaction-pool",
  "sp-version",
+ "staging-xcm",
+ "staging-xcm-builder",
+ "staging-xcm-executor",
  "substrate-wasm-builder",
- "xcm",
- "xcm-builder",
- "xcm-executor",
 ]
 
 [[package]]
@@ -1957,27 +1889,19 @@ name = "bridge-hub-rococo-integration-tests"
 version = "1.0.0"
 dependencies = [
  "bp-messages",
- "cumulus-pallet-parachain-system",
+ "cumulus-pallet-dmp-queue",
  "cumulus-pallet-xcmp-queue",
  "frame-support",
- "frame-system",
  "integration-tests-common",
- "pallet-assets",
- "pallet-balances",
  "pallet-bridge-messages",
  "pallet-xcm",
  "parachains-common",
  "parity-scale-codec",
  "polkadot-core-primitives",
- "polkadot-parachain",
- "polkadot-runtime",
+ "polkadot-parachain-primitives",
  "polkadot-runtime-parachains",
- "sp-core",
- "sp-runtime",
- "sp-weights",
- "xcm",
+ "staging-xcm",
  "xcm-emulator",
- "xcm-executor",
 ]
 
 [[package]]
@@ -2011,7 +1935,7 @@ dependencies = [
  "frame-system-benchmarking",
  "frame-system-rpc-runtime-api",
  "frame-try-runtime",
- "hex-literal 0.4.1",
+ "hex-literal",
  "log",
  "pallet-aura",
  "pallet-authorship",
@@ -2033,7 +1957,7 @@ dependencies = [
  "parachains-common",
  "parity-scale-codec",
  "polkadot-core-primitives",
- "polkadot-parachain",
+ "polkadot-parachain-primitives",
  "polkadot-runtime-common",
  "rococo-runtime-constants",
  "scale-info",
@@ -2043,6 +1967,7 @@ dependencies = [
  "sp-block-builder",
  "sp-consensus-aura",
  "sp-core",
+ "sp-genesis-builder",
  "sp-inherents",
  "sp-io",
  "sp-keyring",
@@ -2053,11 +1978,11 @@ dependencies = [
  "sp-storage",
  "sp-transaction-pool",
  "sp-version",
+ "staging-xcm",
+ "staging-xcm-builder",
+ "staging-xcm-executor",
  "static_assertions",
  "substrate-wasm-builder",
- "xcm",
- "xcm-builder",
- "xcm-executor",
 ]
 
 [[package]]
@@ -2102,9 +2027,9 @@ dependencies = [
  "sp-io",
  "sp-keyring",
  "sp-runtime",
- "xcm",
- "xcm-builder",
- "xcm-executor",
+ "staging-xcm",
+ "staging-xcm-builder",
+ "staging-xcm-executor",
 ]
 
 [[package]]
@@ -2138,9 +2063,9 @@ dependencies = [
  "sp-runtime",
  "sp-std",
  "sp-trie",
+ "staging-xcm",
+ "staging-xcm-builder",
  "static_assertions",
- "xcm",
- "xcm-builder",
 ]
 
 [[package]]
@@ -2225,6 +2150,16 @@ dependencies = [
  "pkg-config",
 ]
 
+[[package]]
+name = "c2-chacha"
+version = "0.3.3"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "d27dae93fe7b1e0424dc57179ac396908c26b035a87234809f5c4dfd1b47dc80"
+dependencies = [
+ "cipher 0.2.5",
+ "ppv-lite86",
+]
+
 [[package]]
 name = "camino"
 version = "1.1.6"
@@ -2281,7 +2216,7 @@ checksum = "5aca1a8fbc20b50ac9673ff014abfb2b5f4085ee1a850d408f14a159c5853ac7"
 dependencies = [
  "aead 0.3.2",
  "cipher 0.2.5",
- "subtle",
+ "subtle 2.4.1",
 ]
 
 [[package]]
@@ -2295,9 +2230,9 @@ dependencies = [
 
 [[package]]
 name = "cfg-expr"
-version = "0.15.4"
+version = "0.15.5"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "b40ccee03b5175c18cde8f37e7d2a33bcef6f8ec8f7cc0d81090d1bb380949c9"
+checksum = "03915af431787e6ffdcc74c645077518c6b6e01f80b761e0fbbfa288536311b3"
 dependencies = [
  "smallvec",
 ]
@@ -2314,6 +2249,16 @@ version = "0.1.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "fd16c4719339c4530435d38e511904438d07cce7950afa3718a84ac36c10e89e"
 
+[[package]]
+name = "chacha"
+version = "0.3.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "ddf3c081b5fba1e5615640aae998e0fbd10c24cbd897ee39ed754a77601a4862"
+dependencies = [
+ "byteorder",
+ "keystream",
+]
+
 [[package]]
 name = "chacha20"
 version = "0.8.2"
@@ -2355,7 +2300,7 @@ name = "chain-spec-builder"
 version = "2.0.0"
 dependencies = [
  "ansi_term",
- "clap 4.4.0",
+ "clap 4.4.6",
  "node-cli",
  "rand 0.8.5",
  "sc-chain-spec",
@@ -2366,17 +2311,16 @@ dependencies = [
 
 [[package]]
 name = "chrono"
-version = "0.4.26"
+version = "0.4.30"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "ec837a71355b28f6556dbd569b37b3f363091c0bd4b2e735674521b4c5fd9bc5"
+checksum = "defd4e7873dbddba6c7c91e199c7fcb946abc4a6a4ac3195400bcfb01b5de877"
 dependencies = [
  "android-tzdata",
  "iana-time-zone",
  "js-sys",
  "num-traits",
- "time 0.1.45",
  "wasm-bindgen",
- "winapi",
+ "windows-targets 0.48.5",
 ]
 
 [[package]]
@@ -2486,20 +2430,19 @@ dependencies = [
 
 [[package]]
 name = "clap"
-version = "4.4.0"
+version = "4.4.6"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "1d5f1946157a96594eb2d2c10eb7ad9a2b27518cb3000209dec700c35df9197d"
+checksum = "d04704f56c2cde07f43e8e2c154b43f216dc5c92fc98ada720177362f953b956"
 dependencies = [
  "clap_builder",
- "clap_derive 4.4.0",
- "once_cell",
+ "clap_derive 4.4.2",
 ]
 
 [[package]]
 name = "clap_builder"
-version = "4.4.0"
+version = "4.4.6"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "78116e32a042dd73c2901f0dc30790d20ff3447f3e3472fad359e8c3d282bcd6"
+checksum = "0e231faeaca65ebd1ea3c737966bf858971cd38c3849107aa3ea7de90a804e45"
 dependencies = [
  "anstream",
  "anstyle",
@@ -2513,7 +2456,7 @@ version = "4.4.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "586a385f7ef2f8b4d86bddaa0c094794e7ccbfe5ffef1f434fe928143fc783a5"
 dependencies = [
- "clap 4.4.0",
+ "clap 4.4.6",
 ]
 
 [[package]]
@@ -2531,14 +2474,14 @@ dependencies = [
 
 [[package]]
 name = "clap_derive"
-version = "4.4.0"
+version = "4.4.2"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "c9fd1a5729c4548118d7d70ff234a44868d00489a4b6597b0b020918a0e91a1a"
+checksum = "0862016ff20d69b84ef8247369fabf5c008a7417002411897d40ee1f4532b873"
 dependencies = [
  "heck",
  "proc-macro2",
  "quote",
- "syn 2.0.29",
+ "syn 2.0.38",
 ]
 
 [[package]]
@@ -2578,36 +2521,6 @@ dependencies = [
  "unicode-width",
 ]
 
-[[package]]
-name = "collectives-polkadot-integration-tests"
-version = "0.1.0"
-dependencies = [
- "asset-hub-polkadot-runtime",
- "collectives-polkadot-runtime",
- "cumulus-pallet-parachain-system",
- "cumulus-pallet-xcmp-queue",
- "frame-support",
- "frame-system",
- "integration-tests-common",
- "pallet-assets",
- "pallet-balances",
- "pallet-core-fellowship",
- "pallet-salary",
- "pallet-xcm",
- "parachains-common",
- "parity-scale-codec",
- "polkadot-core-primitives",
- "polkadot-parachain",
- "polkadot-runtime",
- "polkadot-runtime-parachains",
- "sp-core",
- "sp-runtime",
- "sp-weights",
- "xcm",
- "xcm-emulator",
- "xcm-executor",
-]
-
 [[package]]
 name = "collectives-polkadot-runtime"
 version = "1.0.0"
@@ -2627,7 +2540,7 @@ dependencies = [
  "frame-system-benchmarking",
  "frame-system-rpc-runtime-api",
  "frame-try-runtime",
- "hex-literal 0.4.1",
+ "hex-literal",
  "log",
  "pallet-alliance",
  "pallet-aura",
@@ -2635,6 +2548,7 @@ dependencies = [
  "pallet-balances",
  "pallet-collator-selection",
  "pallet-collective",
+ "pallet-collective-content",
  "pallet-core-fellowship",
  "pallet-multisig",
  "pallet-preimage",
@@ -2653,9 +2567,8 @@ dependencies = [
  "parachains-common",
  "parity-scale-codec",
  "polkadot-core-primitives",
- "polkadot-parachain",
+ "polkadot-parachain-primitives",
  "polkadot-runtime-common",
- "polkadot-runtime-constants",
  "scale-info",
  "smallvec",
  "sp-api",
@@ -2663,6 +2576,7 @@ dependencies = [
  "sp-block-builder",
  "sp-consensus-aura",
  "sp-core",
+ "sp-genesis-builder",
  "sp-inherents",
  "sp-io",
  "sp-offchain",
@@ -2672,10 +2586,10 @@ dependencies = [
  "sp-storage",
  "sp-transaction-pool",
  "sp-version",
+ "staging-xcm",
+ "staging-xcm-builder",
+ "staging-xcm-executor",
  "substrate-wasm-builder",
- "xcm",
- "xcm-builder",
- "xcm-executor",
 ]
 
 [[package]]
@@ -2732,7 +2646,7 @@ dependencies = [
 [[package]]
 name = "common"
 version = "0.1.0"
-source = "git+https://github.com/w3f/ring-proof#0e948f3c28cbacecdd3020403c4841c0eb339213"
+source = "git+https://github.com/w3f/ring-proof#edd1e90b847e560bf60fc2e8712235ccfa11a9a9"
 dependencies = [
  "ark-ec",
  "ark-ff",
@@ -2741,6 +2655,7 @@ dependencies = [
  "ark-std",
  "fflonk",
  "merlin 3.0.0",
+ "rand_chacha 0.3.1",
 ]
 
 [[package]]
@@ -2842,8 +2757,7 @@ dependencies = [
  "frame-system-benchmarking",
  "frame-system-rpc-runtime-api",
  "frame-try-runtime",
- "hex-literal 0.4.1",
- "kusama-runtime-constants",
+ "hex-literal",
  "log",
  "pallet-aura",
  "pallet-authorship",
@@ -2864,7 +2778,7 @@ dependencies = [
  "parachains-common",
  "parity-scale-codec",
  "polkadot-core-primitives",
- "polkadot-parachain",
+ "polkadot-parachain-primitives",
  "polkadot-runtime-common",
  "scale-info",
  "smallvec",
@@ -2872,6 +2786,7 @@ dependencies = [
  "sp-block-builder",
  "sp-consensus-aura",
  "sp-core",
+ "sp-genesis-builder",
  "sp-inherents",
  "sp-offchain",
  "sp-runtime",
@@ -2880,10 +2795,10 @@ dependencies = [
  "sp-storage",
  "sp-transaction-pool",
  "sp-version",
+ "staging-xcm",
+ "staging-xcm-builder",
+ "staging-xcm-executor",
  "substrate-wasm-builder",
- "xcm",
- "xcm-builder",
- "xcm-executor",
 ]
 
 [[package]]
@@ -3113,7 +3028,7 @@ dependencies = [
  "anes",
  "cast",
  "ciborium",
- "clap 4.4.0",
+ "clap 4.4.6",
  "criterion-plot",
  "futures",
  "is-terminal",
@@ -3209,7 +3124,7 @@ checksum = "ef2b4b23cddf68b89b8f8069890e8c270d54e2d5fe1b143820234805e4cb17ef"
 dependencies = [
  "generic-array 0.14.7",
  "rand_core 0.6.4",
- "subtle",
+ "subtle 2.4.1",
  "zeroize",
 ]
 
@@ -3221,7 +3136,7 @@ checksum = "cf4c2f4e1afd912bc40bfd6fed5d9dc1f288e0ba01bfcc835cc5bc3eb13efe15"
 dependencies = [
  "generic-array 0.14.7",
  "rand_core 0.6.4",
- "subtle",
+ "subtle 2.4.1",
  "zeroize",
 ]
 
@@ -3236,6 +3151,16 @@ dependencies = [
  "typenum",
 ]
 
+[[package]]
+name = "crypto-mac"
+version = "0.7.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "4434400df11d95d556bac068ddfedd482915eb18fe8bea89bc80b6e4b1c179e5"
+dependencies = [
+ "generic-array 0.12.4",
+ "subtle 1.0.0",
+]
+
 [[package]]
 name = "crypto-mac"
 version = "0.8.0"
@@ -3243,7 +3168,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "b584a330336237c1eecd3e94266efb216c56ed91225d634cb2991c5f3fd1aeab"
 dependencies = [
  "generic-array 0.14.7",
- "subtle",
+ "subtle 2.4.1",
 ]
 
 [[package]]
@@ -3253,7 +3178,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "b1d1a86f49236c215f271d40892d5fc950490551400b02ef360692c29815c714"
 dependencies = [
  "generic-array 0.14.7",
- "subtle",
+ "subtle 2.4.1",
 ]
 
 [[package]]
@@ -3278,7 +3203,7 @@ dependencies = [
 name = "cumulus-client-cli"
 version = "0.1.0"
 dependencies = [
- "clap 4.4.0",
+ "clap 4.4.6",
  "parity-scale-codec",
  "sc-chain-spec",
  "sc-cli",
@@ -3332,7 +3257,6 @@ dependencies = [
  "cumulus-primitives-parachain-inherent",
  "cumulus-relay-chain-interface",
  "futures",
- "lru 0.10.1",
  "parity-scale-codec",
  "polkadot-node-primitives",
  "polkadot-node-subsystem",
@@ -3344,6 +3268,7 @@ dependencies = [
  "sc-consensus-babe",
  "sc-consensus-slots",
  "sc-telemetry",
+ "schnellru",
  "sp-api",
  "sp-application-crypto",
  "sp-block-builder",
@@ -3442,7 +3367,7 @@ dependencies = [
  "parity-scale-codec",
  "parking_lot 0.12.1",
  "polkadot-node-primitives",
- "polkadot-parachain",
+ "polkadot-parachain-primitives",
  "polkadot-primitives",
  "polkadot-test-client",
  "portpicker",
@@ -3555,7 +3480,7 @@ dependencies = [
  "sp-runtime",
  "sp-std",
  "sp-version",
- "xcm",
+ "staging-xcm",
 ]
 
 [[package]]
@@ -3572,12 +3497,12 @@ dependencies = [
  "environmental",
  "frame-support",
  "frame-system",
- "hex-literal 0.4.1",
+ "hex-literal",
  "impl-trait-for-tuples",
  "lazy_static",
  "log",
  "parity-scale-codec",
- "polkadot-parachain",
+ "polkadot-parachain-primitives",
  "sc-client-api",
  "scale-info",
  "sp-core",
@@ -3591,8 +3516,8 @@ dependencies = [
  "sp-tracing",
  "sp-trie",
  "sp-version",
+ "staging-xcm",
  "trie-db",
- "xcm",
 ]
 
 [[package]]
@@ -3602,7 +3527,7 @@ dependencies = [
  "proc-macro-crate",
  "proc-macro2",
  "quote",
- "syn 2.0.29",
+ "syn 2.0.38",
 ]
 
 [[package]]
@@ -3645,7 +3570,7 @@ dependencies = [
  "sp-io",
  "sp-runtime",
  "sp-std",
- "xcm",
+ "staging-xcm",
 ]
 
 [[package]]
@@ -3667,9 +3592,9 @@ dependencies = [
  "sp-io",
  "sp-runtime",
  "sp-std",
- "xcm",
- "xcm-builder",
- "xcm-executor",
+ "staging-xcm",
+ "staging-xcm-builder",
+ "staging-xcm-executor",
 ]
 
 [[package]]
@@ -3684,7 +3609,7 @@ dependencies = [
  "scale-info",
  "sp-runtime",
  "sp-std",
- "xcm",
+ "staging-xcm",
 ]
 
 [[package]]
@@ -3706,14 +3631,14 @@ version = "0.1.0"
 dependencies = [
  "parity-scale-codec",
  "polkadot-core-primitives",
- "polkadot-parachain",
+ "polkadot-parachain-primitives",
  "polkadot-primitives",
  "scale-info",
  "sp-api",
  "sp-runtime",
  "sp-std",
  "sp-trie",
- "xcm",
+ "staging-xcm",
 ]
 
 [[package]]
@@ -3762,9 +3687,9 @@ dependencies = [
  "sp-io",
  "sp-runtime",
  "sp-std",
- "xcm",
- "xcm-builder",
- "xcm-executor",
+ "staging-xcm",
+ "staging-xcm-builder",
+ "staging-xcm-executor",
 ]
 
 [[package]]
@@ -3816,13 +3741,12 @@ dependencies = [
 name = "cumulus-relay-chain-minimal-node"
 version = "0.1.0"
 dependencies = [
- "array-bytes",
+ "array-bytes 6.1.0",
  "async-trait",
  "cumulus-primitives-core",
  "cumulus-relay-chain-interface",
  "cumulus-relay-chain-rpc-interface",
  "futures",
- "lru 0.11.0",
  "polkadot-availability-recovery",
  "polkadot-collator-protocol",
  "polkadot-core-primitives",
@@ -3839,6 +3763,7 @@ dependencies = [
  "sc-service",
  "sc-tracing",
  "sc-utils",
+ "schnellru",
  "sp-api",
  "sp-consensus",
  "sp-consensus-babe",
@@ -3857,7 +3782,6 @@ dependencies = [
  "futures",
  "futures-timer",
  "jsonrpsee",
- "lru 0.11.0",
  "parity-scale-codec",
  "pin-project",
  "polkadot-overseer",
@@ -3865,6 +3789,7 @@ dependencies = [
  "sc-client-api",
  "sc-rpc-api",
  "sc-service",
+ "schnellru",
  "serde",
  "serde_json",
  "smoldot",
@@ -3896,7 +3821,7 @@ dependencies = [
  "pallet-balances",
  "pallet-transaction-payment",
  "parity-scale-codec",
- "polkadot-parachain",
+ "polkadot-parachain-primitives",
  "polkadot-primitives",
  "sc-block-builder",
  "sc-consensus",
@@ -3927,14 +3852,6 @@ dependencies = [
  "sp-trie",
 ]
 
-[[package]]
-name = "cumulus-test-relay-validation-worker-provider"
-version = "0.1.0"
-dependencies = [
- "polkadot-node-core-pvf",
- "toml 0.7.6",
-]
-
 [[package]]
 name = "cumulus-test-runtime"
 version = "0.1.0"
@@ -3971,7 +3888,7 @@ name = "cumulus-test-service"
 version = "0.1.0"
 dependencies = [
  "async-trait",
- "clap 4.4.0",
+ "clap 4.4.6",
  "criterion 0.5.1",
  "cumulus-client-cli",
  "cumulus-client-consensus-common",
@@ -3986,7 +3903,6 @@ dependencies = [
  "cumulus-relay-chain-minimal-node",
  "cumulus-test-client",
  "cumulus-test-relay-sproof-builder",
- "cumulus-test-relay-validation-worker-provider",
  "cumulus-test-runtime",
  "frame-system",
  "frame-system-rpc-runtime-api",
@@ -4052,7 +3968,7 @@ dependencies = [
  "byteorder",
  "digest 0.8.1",
  "rand_core 0.5.1",
- "subtle",
+ "subtle 2.4.1",
  "zeroize",
 ]
 
@@ -4065,7 +3981,7 @@ dependencies = [
  "byteorder",
  "digest 0.9.0",
  "rand_core 0.5.1",
- "subtle",
+ "subtle 2.4.1",
  "zeroize",
 ]
 
@@ -4082,7 +3998,7 @@ dependencies = [
  "fiat-crypto",
  "platforms",
  "rustc_version 0.4.0",
- "subtle",
+ "subtle 2.4.1",
  "zeroize",
 ]
 
@@ -4094,7 +4010,7 @@ checksum = "83fdaf97f4804dcebfa5862639bc9ce4121e82140bec2a987ac5140294865b5b"
 dependencies = [
  "proc-macro2",
  "quote",
- "syn 2.0.29",
+ "syn 2.0.38",
 ]
 
 [[package]]
@@ -4134,7 +4050,7 @@ dependencies = [
  "proc-macro2",
  "quote",
  "scratch",
- "syn 2.0.29",
+ "syn 2.0.38",
 ]
 
 [[package]]
@@ -4151,7 +4067,7 @@ checksum = "50c49547d73ba8dcfd4ad7325d64c6d5391ff4224d498fc39a6f3f49825a530d"
 dependencies = [
  "proc-macro2",
  "quote",
- "syn 2.0.29",
+ "syn 2.0.38",
 ]
 
 [[package]]
@@ -4397,14 +4313,14 @@ dependencies = [
  "block-buffer 0.10.4",
  "const-oid",
  "crypto-common",
- "subtle",
+ "subtle 2.4.1",
 ]
 
 [[package]]
 name = "directories"
-version = "4.0.1"
+version = "5.0.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "f51c5d4ddabd36886dd3e1438cb358cdcb0d7c499cb99cb4ac2e38e18b5cb210"
+checksum = "9a49173b84e034382284f27f1af4dcbbd231ffa358c0fe316541a7337f376a35"
 dependencies = [
  "dirs-sys",
 ]
@@ -4421,13 +4337,14 @@ dependencies = [
 
 [[package]]
 name = "dirs-sys"
-version = "0.3.7"
+version = "0.4.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "1b1d1d91c932ef41c0f2663aa8b0ca0342d444d842c06914aa0a7e352d0bada6"
+checksum = "520f05a5cbd335fae5a99ff7a6ab8627577660ee5cfd6a94a6a929b52ff0321c"
 dependencies = [
  "libc",
+ "option-ext",
  "redox_users",
- "winapi",
+ "windows-sys 0.48.0",
 ]
 
 [[package]]
@@ -4449,7 +4366,7 @@ checksum = "487585f4d0c6655fe74905e2504d8ad6908e4db67f744eb140876906c2f3175d"
 dependencies = [
  "proc-macro2",
  "quote",
- "syn 2.0.29",
+ "syn 2.0.38",
 ]
 
 [[package]]
@@ -4461,10 +4378,11 @@ checksum = "86e3bdc80eee6e16b2b6b0f87fbc98c04bee3455e35174c0de1a125d0688c632"
 [[package]]
 name = "dleq_vrf"
 version = "0.0.2"
-source = "git+https://github.com/w3f/ring-vrf?rev=c86ebd4#c86ebd4114d3165d05f9ce28c1d9e8d7a9a4e801"
+source = "git+https://github.com/w3f/ring-vrf?rev=4b09416#4b09416fd23383ec436ddac127d58c7b7cd392c6"
 dependencies = [
  "ark-ec",
  "ark-ff",
+ "ark-scale",
  "ark-secret-scalar",
  "ark-serialize",
  "ark-std",
@@ -4491,18 +4409,18 @@ checksum = "fea41bba32d969b513997752735605054bc0dfa92b4c56bf1189f2e174be7a10"
 
 [[package]]
 name = "docify"
-version = "0.2.1"
+version = "0.2.4"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "029de870d175d11969524d91a3fb2cbf6d488b853bff99d41cf65e533ac7d9d2"
+checksum = "76ee528c501ddd15d5181997e9518e59024844eac44fd1e40cb20ddb2a8562fa"
 dependencies = [
  "docify_macros",
 ]
 
 [[package]]
 name = "docify_macros"
-version = "0.2.1"
+version = "0.2.4"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "cac43324656a1b05eb0186deb51f27d2d891c704c37f34de281ef6297ba193e5"
+checksum = "0ca01728ab2679c464242eca99f94e2ce0514b52ac9ad950e2ed03fca991231c"
 dependencies = [
  "common-path",
  "derive-syn-parse",
@@ -4510,7 +4428,7 @@ dependencies = [
  "proc-macro2",
  "quote",
  "regex",
- "syn 2.0.29",
+ "syn 2.0.38",
  "termcolor",
  "toml 0.7.6",
  "walkdir",
@@ -4587,15 +4505,6 @@ dependencies = [
  "spki 0.7.2",
 ]
 
-[[package]]
-name = "ed25519"
-version = "1.5.3"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "91cff35c70bba8a626e3185d8cd48cc11b5437e1a5bcd15b9b5fa3c64b6dfee7"
-dependencies = [
- "signature 1.6.4",
-]
-
 [[package]]
 name = "ed25519"
 version = "2.2.2"
@@ -4608,27 +4517,13 @@ dependencies = [
 
 [[package]]
 name = "ed25519-dalek"
-version = "1.0.1"
+version = "2.0.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "c762bae6dcaf24c4c84667b8579785430908723d5c889f469d76a41d59cc7a9d"
+checksum = "7277392b266383ef8396db7fdeb1e77b6c52fed775f5df15bb24f35b72156980"
 dependencies = [
- "curve25519-dalek 3.2.0",
- "ed25519 1.5.3",
- "rand 0.7.3",
- "serde",
- "sha2 0.9.9",
- "zeroize",
-]
-
-[[package]]
-name = "ed25519-dalek"
-version = "2.0.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "7277392b266383ef8396db7fdeb1e77b6c52fed775f5df15bb24f35b72156980"
-dependencies = [
- "curve25519-dalek 4.0.0",
- "ed25519 2.2.2",
- "rand_core 0.6.4",
+ "curve25519-dalek 4.0.0",
+ "ed25519",
+ "rand_core 0.6.4",
  "serde",
  "sha2 0.10.7",
  "zeroize",
@@ -4655,7 +4550,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "4e83e509bcd060ca4b54b72bde5bb306cb2088cb01e14797ebae90a24f70f5f7"
 dependencies = [
  "curve25519-dalek 4.0.0",
- "ed25519 2.2.2",
+ "ed25519",
  "hashbrown 0.14.0",
  "hex",
  "rand_core 0.6.4",
@@ -4687,7 +4582,7 @@ dependencies = [
  "pkcs8 0.9.0",
  "rand_core 0.6.4",
  "sec1 0.3.0",
- "subtle",
+ "subtle 2.4.1",
  "zeroize",
 ]
 
@@ -4706,7 +4601,7 @@ dependencies = [
  "pkcs8 0.10.2",
  "rand_core 0.6.4",
  "sec1 0.7.3",
- "subtle",
+ "subtle 2.4.1",
  "zeroize",
 ]
 
@@ -4754,18 +4649,18 @@ checksum = "5e9a1f9f7d83e59740248a6e14ecf93929ade55027844dfcea78beafccc15745"
 dependencies = [
  "proc-macro2",
  "quote",
- "syn 2.0.29",
+ "syn 2.0.38",
 ]
 
 [[package]]
 name = "enumn"
-version = "0.1.11"
+version = "0.1.12"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "b893c4eb2dc092c811165f84dc7447fae16fb66521717968c34c509b39b1a5c5"
+checksum = "c2ad8cef1d801a4686bfd8919f0b30eac4c8e48968c437a6405ded4fb5272d2b"
 dependencies = [
  "proc-macro2",
  "quote",
- "syn 2.0.29",
+ "syn 2.0.38",
 ]
 
 [[package]]
@@ -4888,12 +4783,6 @@ dependencies = [
  "futures",
 ]
 
-[[package]]
-name = "exitcode"
-version = "1.1.2"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "de853764b47027c2e862a995c34978ffa63c1501f2e15f987ba11bd4f9bba193"
-
 [[package]]
 name = "expander"
 version = "0.0.4"
@@ -4906,29 +4795,17 @@ dependencies = [
  "quote",
 ]
 
-[[package]]
-name = "expander"
-version = "0.0.6"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "3774182a5df13c3d1690311ad32fbe913feef26baba609fa2dd5f72042bd2ab6"
-dependencies = [
- "blake2",
- "fs-err",
- "proc-macro2",
- "quote",
-]
-
 [[package]]
 name = "expander"
 version = "2.0.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "5f86a749cf851891866c10515ef6c299b5c69661465e9c3bbe7e07a2b77fb0f7"
 dependencies = [
- "blake2",
+ "blake2 0.10.6",
  "fs-err",
  "proc-macro2",
  "quote",
- "syn 2.0.29",
+ "syn 2.0.38",
 ]
 
 [[package]]
@@ -5025,7 +4902,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "d013fc25338cc558c5c2cfbad646908fb23591e2404481826742b651c9af7160"
 dependencies = [
  "rand_core 0.6.4",
- "subtle",
+ "subtle 2.4.1",
 ]
 
 [[package]]
@@ -5035,7 +4912,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "ded41244b729663b1e574f1b4fb731469f69f79c17667b5d776b16cda0479449"
 dependencies = [
  "rand_core 0.6.4",
- "subtle",
+ "subtle 2.4.1",
 ]
 
 [[package]]
@@ -5184,11 +5061,19 @@ version = "2.0.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "6c2141d6d6c8512188a7891b4b01590a45f6dac67afb4f255c4124dbb86d4eaa"
 
+[[package]]
+name = "frame"
+version = "0.1.0"
+dependencies = [
+ "frame-support",
+ "frame-system",
+]
+
 [[package]]
 name = "frame-benchmarking"
 version = "4.0.0-dev"
 dependencies = [
- "array-bytes",
+ "array-bytes 6.1.0",
  "frame-support",
  "frame-support-procedural",
  "frame-system",
@@ -5216,9 +5101,9 @@ name = "frame-benchmarking-cli"
 version = "4.0.0-dev"
 dependencies = [
  "Inflector",
- "array-bytes",
+ "array-bytes 6.1.0",
  "chrono",
- "clap 4.4.0",
+ "clap 4.4.6",
  "comfy-table",
  "frame-benchmarking",
  "frame-support",
@@ -5284,7 +5169,7 @@ dependencies = [
  "quote",
  "scale-info",
  "sp-arithmetic",
- "syn 2.0.29",
+ "syn 2.0.38",
  "trybuild",
 ]
 
@@ -5310,7 +5195,7 @@ dependencies = [
 name = "frame-election-solution-type-fuzzer"
 version = "2.0.0-alpha.5"
 dependencies = [
- "clap 4.4.0",
+ "clap 4.4.6",
  "frame-election-provider-solution-type",
  "frame-election-provider-support",
  "frame-support",
@@ -5327,7 +5212,7 @@ dependencies = [
 name = "frame-executive"
 version = "4.0.0-dev"
 dependencies = [
- "array-bytes",
+ "array-bytes 6.1.0",
  "frame-support",
  "frame-system",
  "frame-try-runtime",
@@ -5361,7 +5246,6 @@ dependencies = [
 name = "frame-remote-externalities"
 version = "0.10.0-dev"
 dependencies = [
- "async-recursion",
  "futures",
  "indicatif",
  "jsonrpsee",
@@ -5384,7 +5268,7 @@ name = "frame-support"
 version = "4.0.0-dev"
 dependencies = [
  "aquamarine",
- "array-bytes",
+ "array-bytes 6.1.0",
  "assert_matches",
  "bitflags 1.3.2",
  "docify",
@@ -5436,7 +5320,8 @@ dependencies = [
  "proc-macro-warning",
  "proc-macro2",
  "quote",
- "syn 2.0.29",
+ "sp-core-hashing",
+ "syn 2.0.38",
 ]
 
 [[package]]
@@ -5447,7 +5332,7 @@ dependencies = [
  "proc-macro-crate",
  "proc-macro2",
  "quote",
- "syn 2.0.29",
+ "syn 2.0.38",
 ]
 
 [[package]]
@@ -5456,7 +5341,7 @@ version = "3.0.0"
 dependencies = [
  "proc-macro2",
  "quote",
- "syn 2.0.29",
+ "syn 2.0.38",
 ]
 
 [[package]]
@@ -5512,6 +5397,15 @@ dependencies = [
  "sp-runtime",
 ]
 
+[[package]]
+name = "frame-support-test-stg-frame-crate"
+version = "0.1.0"
+dependencies = [
+ "frame",
+ "parity-scale-codec",
+ "scale-info",
+]
+
 [[package]]
 name = "frame-system"
 version = "4.0.0-dev"
@@ -5679,7 +5573,7 @@ checksum = "89ca545a94061b6365f2c7355b4b32bd20df3ff95f02da9329b34ccc3bd6ee72"
 dependencies = [
  "proc-macro2",
  "quote",
- "syn 2.0.29",
+ "syn 2.0.38",
 ]
 
 [[package]]
@@ -5799,10 +5693,8 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "be4136b2a15dd319360be1c07d9933517ccf0be8f16bf62a3bee4f0d618df427"
 dependencies = [
  "cfg-if",
- "js-sys",
  "libc",
  "wasi 0.11.0+wasi-snapshot-preview1",
- "wasm-bindgen",
 ]
 
 [[package]]
@@ -5865,9 +5757,12 @@ dependencies = [
 name = "glutton-runtime"
 version = "1.0.0"
 dependencies = [
+ "cumulus-pallet-aura-ext",
  "cumulus-pallet-parachain-system",
  "cumulus-pallet-xcm",
+ "cumulus-primitives-aura",
  "cumulus-primitives-core",
+ "cumulus-primitives-timestamp",
  "frame-benchmarking",
  "frame-executive",
  "frame-support",
@@ -5875,15 +5770,19 @@ dependencies = [
  "frame-system-benchmarking",
  "frame-system-rpc-runtime-api",
  "frame-try-runtime",
+ "pallet-aura",
  "pallet-glutton",
  "pallet-sudo",
+ "pallet-timestamp",
  "parachain-info",
  "parachains-common",
  "parity-scale-codec",
  "scale-info",
  "sp-api",
  "sp-block-builder",
+ "sp-consensus-aura",
  "sp-core",
+ "sp-genesis-builder",
  "sp-inherents",
  "sp-offchain",
  "sp-runtime",
@@ -5892,10 +5791,10 @@ dependencies = [
  "sp-storage",
  "sp-transaction-pool",
  "sp-version",
+ "staging-xcm",
+ "staging-xcm-builder",
+ "staging-xcm-executor",
  "substrate-wasm-builder",
- "xcm",
- "xcm-builder",
- "xcm-executor",
 ]
 
 [[package]]
@@ -5906,7 +5805,7 @@ checksum = "5dfbfb3a6cfbd390d5c9564ab283a0349b9b9fcd46a706c1eb10e0db70bfbac7"
 dependencies = [
  "ff 0.12.1",
  "rand_core 0.6.4",
- "subtle",
+ "subtle 2.4.1",
 ]
 
 [[package]]
@@ -5917,7 +5816,7 @@ checksum = "f0f9ef7462f7c099f518d754361858f86d8a07af53ba9af0fe635bbccb151a63"
 dependencies = [
  "ff 0.13.0",
  "rand_core 0.6.4",
- "subtle",
+ "subtle 2.4.1",
 ]
 
 [[package]]
@@ -6003,6 +5902,15 @@ dependencies = [
  "serde",
 ]
 
+[[package]]
+name = "hashlink"
+version = "0.8.4"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "e8094feaf31ff591f651a2664fb9cfd92bba7a60ce3197265e9482ebe753c8f7"
+dependencies = [
+ "hashbrown 0.14.0",
+]
+
 [[package]]
 name = "heck"
 version = "0.4.1"
@@ -6030,12 +5938,6 @@ version = "0.4.3"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "7f24254aa9a54b5c858eaee2f5bccdb46aaf0e486a595ed5fd8f86ba55232a70"
 
-[[package]]
-name = "hex-literal"
-version = "0.3.4"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "7ebdb29d2ea9ed0083cd8cece49bbd968021bd99b0849edb4a9a7ee0fdf6a4e0"
-
 [[package]]
 name = "hex-literal"
 version = "0.4.1"
@@ -6435,7 +6337,6 @@ dependencies = [
  "asset-hub-polkadot-runtime",
  "asset-hub-westend-runtime",
  "bp-messages",
- "bp-runtime",
  "bridge-hub-kusama-runtime",
  "bridge-hub-polkadot-runtime",
  "bridge-hub-rococo-runtime",
@@ -6446,10 +6347,6 @@ dependencies = [
  "cumulus-pallet-xcmp-queue",
  "cumulus-primitives-core",
  "frame-support",
- "frame-system",
- "kusama-runtime",
- "kusama-runtime-constants",
- "lazy_static",
  "pallet-assets",
  "pallet-balances",
  "pallet-bridge-messages",
@@ -6457,16 +6354,13 @@ dependencies = [
  "pallet-message-queue",
  "pallet-staking",
  "pallet-xcm",
- "parachain-info",
  "parachains-common",
  "parity-scale-codec",
  "paste",
  "penpal-runtime",
  "polkadot-core-primitives",
- "polkadot-parachain",
+ "polkadot-parachain-primitives",
  "polkadot-primitives",
- "polkadot-runtime",
- "polkadot-runtime-constants",
  "polkadot-runtime-parachains",
  "polkadot-service",
  "rococo-runtime",
@@ -6477,13 +6371,10 @@ dependencies = [
  "sp-consensus-beefy",
  "sp-core",
  "sp-runtime",
- "sp-tracing",
- "sp-weights",
+ "staging-xcm",
  "westend-runtime",
  "westend-runtime-constants",
- "xcm",
  "xcm-emulator",
- "xcm-executor",
 ]
 
 [[package]]
@@ -6505,12 +6396,6 @@ dependencies = [
  "webrtc-util",
 ]
 
-[[package]]
-name = "intx"
-version = "0.1.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "f6f38a50a899dc47a6d0ed5508e7f601a2e34c3a85303514b5d137f3c10a0c75"
-
 [[package]]
 name = "io-lifetimes"
 version = "1.0.11"
@@ -6802,6 +6687,12 @@ dependencies = [
  "tiny-keccak",
 ]
 
+[[package]]
+name = "keystream"
+version = "1.0.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "c33070833c9ee02266356de0c43f723152bd38bd96ddf52c82b3af10c9138b28"
+
 [[package]]
 name = "kitchensink-runtime"
 version = "3.0.0-dev"
@@ -6850,6 +6741,7 @@ dependencies = [
  "pallet-lottery",
  "pallet-membership",
  "pallet-message-queue",
+ "pallet-mixnet",
  "pallet-mmr",
  "pallet-multisig",
  "pallet-nft-fractionalization",
@@ -6900,8 +6792,10 @@ dependencies = [
  "sp-consensus-babe",
  "sp-consensus-grandpa",
  "sp-core",
+ "sp-genesis-builder",
  "sp-inherents",
  "sp-io",
+ "sp-mixnet",
  "sp-offchain",
  "sp-runtime",
  "sp-session",
@@ -6915,132 +6809,6 @@ dependencies = [
  "substrate-wasm-builder",
 ]
 
-[[package]]
-name = "kusama-runtime"
-version = "1.0.0"
-dependencies = [
- "binary-merkle-tree",
- "bitvec",
- "frame-benchmarking",
- "frame-election-provider-support",
- "frame-executive",
- "frame-remote-externalities",
- "frame-support",
- "frame-system",
- "frame-system-benchmarking",
- "frame-system-rpc-runtime-api",
- "frame-try-runtime",
- "hex-literal 0.4.1",
- "kusama-runtime-constants",
- "log",
- "pallet-authority-discovery",
- "pallet-authorship",
- "pallet-babe",
- "pallet-bags-list",
- "pallet-balances",
- "pallet-beefy",
- "pallet-beefy-mmr",
- "pallet-bounties",
- "pallet-child-bounties",
- "pallet-collective",
- "pallet-conviction-voting",
- "pallet-democracy",
- "pallet-election-provider-multi-phase",
- "pallet-election-provider-support-benchmarking",
- "pallet-elections-phragmen",
- "pallet-fast-unstake",
- "pallet-grandpa",
- "pallet-identity",
- "pallet-im-online",
- "pallet-indices",
- "pallet-membership",
- "pallet-message-queue",
- "pallet-mmr",
- "pallet-multisig",
- "pallet-nis",
- "pallet-nomination-pools",
- "pallet-nomination-pools-benchmarking",
- "pallet-nomination-pools-runtime-api",
- "pallet-offences",
- "pallet-offences-benchmarking",
- "pallet-preimage",
- "pallet-proxy",
- "pallet-ranked-collective",
- "pallet-recovery",
- "pallet-referenda",
- "pallet-scheduler",
- "pallet-session",
- "pallet-session-benchmarking",
- "pallet-society",
- "pallet-staking",
- "pallet-staking-runtime-api",
- "pallet-state-trie-migration",
- "pallet-timestamp",
- "pallet-tips",
- "pallet-transaction-payment",
- "pallet-transaction-payment-rpc-runtime-api",
- "pallet-treasury",
- "pallet-utility",
- "pallet-vesting",
- "pallet-whitelist",
- "pallet-xcm",
- "pallet-xcm-benchmarks",
- "parity-scale-codec",
- "polkadot-primitives",
- "polkadot-runtime-common",
- "polkadot-runtime-parachains",
- "rustc-hex",
- "scale-info",
- "separator",
- "serde",
- "serde_derive",
- "serde_json",
- "smallvec",
- "sp-api",
- "sp-application-crypto",
- "sp-arithmetic",
- "sp-authority-discovery",
- "sp-block-builder",
- "sp-consensus-babe",
- "sp-consensus-beefy",
- "sp-core",
- "sp-inherents",
- "sp-io",
- "sp-keyring",
- "sp-mmr-primitives",
- "sp-npos-elections",
- "sp-offchain",
- "sp-runtime",
- "sp-session",
- "sp-staking",
- "sp-std",
- "sp-storage",
- "sp-tracing",
- "sp-transaction-pool",
- "sp-trie",
- "sp-version",
- "static_assertions",
- "substrate-wasm-builder",
- "tiny-keccak",
- "tokio",
- "xcm",
- "xcm-builder",
- "xcm-executor",
-]
-
-[[package]]
-name = "kusama-runtime-constants"
-version = "1.0.0"
-dependencies = [
- "frame-support",
- "polkadot-primitives",
- "polkadot-runtime-common",
- "smallvec",
- "sp-core",
- "sp-runtime",
- "sp-weights",
-]
-
 [[package]]
 name = "kvdb"
 version = "0.13.0"
@@ -7085,15 +6853,24 @@ dependencies = [
 
 [[package]]
 name = "landlock"
-version = "0.2.0"
+version = "0.3.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "520baa32708c4e957d2fc3a186bc5bd8d26637c33137f399ddfc202adb240068"
+checksum = "1530c5b973eeed4ac216af7e24baf5737645a6272e361f1fb95710678b67d9cc"
 dependencies = [
  "enumflags2",
  "libc",
  "thiserror",
 ]
 
+[[package]]
+name = "layout-rs"
+version = "0.1.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "1164ef87cb9607c2d887216eca79f0fc92895affe1789bba805dd38d829584e0"
+dependencies = [
+ "log",
+]
+
 [[package]]
 name = "lazy_static"
 version = "1.4.0"
@@ -7283,7 +7060,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "276bb57e7af15d8f100d3c11cbdd32c6752b7eef4ba7a18ecf464972c07abcce"
 dependencies = [
  "bs58 0.4.0",
- "ed25519-dalek 2.0.0",
+ "ed25519-dalek",
  "log",
  "multiaddr",
  "multihash",
@@ -7621,7 +7398,7 @@ checksum = "5be9b9bb642d8522a44d533eab56c16c738301965504753b03ad1de3425d5451"
 dependencies = [
  "crunchy",
  "digest 0.9.0",
- "subtle",
+ "subtle 2.4.1",
 ]
 
 [[package]]
@@ -7704,6 +7481,18 @@ version = "0.4.5"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "57bcfdad1b858c2db7c38303a6d2ad4dfaf5eb53dfeb0910128b2c26d6158503"
 
+[[package]]
+name = "lioness"
+version = "0.1.2"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "4ae926706ba42c425c9457121178330d75e273df2e82e28b758faf3de3a9acb9"
+dependencies = [
+ "arrayref",
+ "blake2 0.8.1",
+ "chacha",
+ "keystream",
+]
+
 [[package]]
 name = "lite-json"
 version = "0.2.0"
@@ -7765,9 +7554,6 @@ name = "lru"
 version = "0.11.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "eedb2bdbad7e0634f83989bf596f497b070130daaa398ab22d84c39e266deec5"
-dependencies = [
- "hashbrown 0.14.0",
-]
 
 [[package]]
 name = "lru-cache"
@@ -7809,50 +7595,50 @@ dependencies = [
 
 [[package]]
 name = "macro_magic"
-version = "0.4.2"
+version = "0.5.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "aee866bfee30d2d7e83835a4574aad5b45adba4cc807f2a3bbba974e5d4383c9"
+checksum = "e03844fc635e92f3a0067e25fa4bf3e3dbf3f2927bf3aa01bb7bc8f1c428949d"
 dependencies = [
  "macro_magic_core",
  "macro_magic_macros",
  "quote",
- "syn 2.0.29",
+ "syn 2.0.38",
 ]
 
 [[package]]
 name = "macro_magic_core"
-version = "0.4.2"
+version = "0.5.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "7e766a20fd9c72bab3e1e64ed63f36bd08410e75803813df210d1ce297d7ad00"
+checksum = "468155613a44cfd825f1fb0ffa532b018253920d404e6fca1e8d43155198a46d"
 dependencies = [
  "const-random",
  "derive-syn-parse",
  "macro_magic_core_macros",
  "proc-macro2",
  "quote",
- "syn 2.0.29",
+ "syn 2.0.38",
 ]
 
 [[package]]
 name = "macro_magic_core_macros"
-version = "0.4.2"
+version = "0.5.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "c12469fc165526520dff2807c2975310ab47cf7190a45b99b49a7dc8befab17b"
+checksum = "9ea73aa640dc01d62a590d48c0c3521ed739d53b27f919b25c3551e233481654"
 dependencies = [
  "proc-macro2",
  "quote",
- "syn 2.0.29",
+ "syn 2.0.38",
 ]
 
 [[package]]
 name = "macro_magic_macros"
-version = "0.4.2"
+version = "0.5.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "b8fb85ec1620619edf2984a7693497d4ec88a9665d8b87e942856884c92dbf2a"
+checksum = "ef9d79ae96aaba821963320eb2b6e34d17df1e5a83d8a1985c29cc5be59577b3"
 dependencies = [
  "macro_magic_core",
  "quote",
- "syn 2.0.29",
+ "syn 2.0.38",
 ]
 
 [[package]]
@@ -7876,15 +7662,6 @@ dependencies = [
  "regex-automata 0.1.10",
 ]
 
-[[package]]
-name = "matchers"
-version = "0.1.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "8263075bb86c5a1b1427b5ae862e8889656f126e9f77c484496e8b47cf5c5558"
-dependencies = [
- "regex-automata 0.1.10",
-]
-
 [[package]]
 name = "matches"
 version = "0.1.10"
@@ -8046,6 +7823,31 @@ dependencies = [
  "windows-sys 0.48.0",
 ]
 
+[[package]]
+name = "mixnet"
+version = "0.7.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "daa3eb39495d8e2e2947a1d862852c90cc6a4a8845f8b41c8829cb9fcc047f4a"
+dependencies = [
+ "arrayref",
+ "arrayvec 0.7.4",
+ "bitflags 1.3.2",
+ "blake2 0.10.6",
+ "c2-chacha",
+ "curve25519-dalek 4.0.0",
+ "either",
+ "hashlink",
+ "lioness",
+ "log",
+ "parking_lot 0.12.1",
+ "rand 0.8.5",
+ "rand_chacha 0.3.1",
+ "rand_distr",
+ "subtle 2.4.1",
+ "thiserror",
+ "zeroize",
+]
+
 [[package]]
 name = "mmr-gadget"
 version = "4.0.0-dev"
@@ -8347,8 +8149,8 @@ checksum = "43794a0ace135be66a25d3ae77d41b91615fb68ae937f904090203e81f755b65"
 name = "node-bench"
 version = "0.9.0-dev"
 dependencies = [
- "array-bytes",
- "clap 4.4.0",
+ "array-bytes 6.1.0",
+ "clap 4.4.6",
  "derive_more",
  "fs_extra",
  "futures",
@@ -8383,9 +8185,9 @@ dependencies = [
 name = "node-cli"
 version = "3.0.0-dev"
 dependencies = [
- "array-bytes",
+ "array-bytes 6.1.0",
  "assert_cmd",
- "clap 4.4.0",
+ "clap 4.4.6",
  "clap_complete",
  "criterion 0.4.0",
  "frame-benchmarking-cli",
@@ -8424,6 +8226,7 @@ dependencies = [
  "sc-consensus-slots",
  "sc-executor",
  "sc-keystore",
+ "sc-mixnet",
  "sc-network",
  "sc-network-common",
  "sc-network-statement",
@@ -8453,6 +8256,7 @@ dependencies = [
  "sp-io",
  "sp-keyring",
  "sp-keystore",
+ "sp-mixnet",
  "sp-runtime",
  "sp-statement-store",
  "sp-timestamp",
@@ -8511,7 +8315,7 @@ dependencies = [
 name = "node-inspect"
 version = "0.9.0-dev"
 dependencies = [
- "clap 4.4.0",
+ "clap 4.4.6",
  "parity-scale-codec",
  "sc-cli",
  "sc-client-api",
@@ -8544,6 +8348,7 @@ dependencies = [
  "sc-consensus-babe-rpc",
  "sc-consensus-grandpa",
  "sc-consensus-grandpa-rpc",
+ "sc-mixnet",
  "sc-rpc",
  "sc-rpc-api",
  "sc-rpc-spec-v2",
@@ -8565,7 +8370,7 @@ dependencies = [
 name = "node-runtime-generate-bags"
 version = "3.0.0"
 dependencies = [
- "clap 4.4.0",
+ "clap 4.4.6",
  "generate-bags",
  "kitchensink-runtime",
 ]
@@ -8574,7 +8379,7 @@ dependencies = [
 name = "node-template"
 version = "4.0.0-dev"
 dependencies = [
- "clap 4.4.0",
+ "clap 4.4.6",
  "frame-benchmarking",
  "frame-benchmarking-cli",
  "frame-system",
@@ -8617,7 +8422,7 @@ dependencies = [
 name = "node-template-release"
 version = "3.0.0"
 dependencies = [
- "clap 4.4.0",
+ "clap 4.4.6",
  "flate2",
  "fs_extra",
  "glob",
@@ -8653,6 +8458,7 @@ dependencies = [
  "sp-consensus-aura",
  "sp-consensus-grandpa",
  "sp-core",
+ "sp-genesis-builder",
  "sp-inherents",
  "sp-offchain",
  "sp-runtime",
@@ -8728,16 +8534,6 @@ version = "0.3.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "61807f77802ff30975e01f4f071c8ba10c022052f98b3294119f3e615d13e5be"
 
-[[package]]
-name = "nu-ansi-term"
-version = "0.46.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "77a8165726e8236064dbb45459242600304b42a5ea24ee2948e18e023bf7ba84"
-dependencies = [
- "overload",
- "winapi",
-]
-
 [[package]]
 name = "num"
 version = "0.4.1"
@@ -8910,11 +8706,17 @@ version = "0.1.5"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "ff011a302c396a5197692431fc1948019154afc178baf7d8e37367442a4601cf"
 
+[[package]]
+name = "option-ext"
+version = "0.2.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "04744f49eae99ab78e0d5c0b603ab218f515ea8cfe5a456d7629ad883a3b6e7d"
+
 [[package]]
 name = "orchestra"
-version = "0.0.5"
+version = "0.3.3"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "227585216d05ba65c7ab0a0450a3cf2cbd81a98862a54c4df8e14d5ac6adb015"
+checksum = "46d78e1deb2a8d54fc1f063a544130db4da31dfe4d5d3b493186424910222a76"
 dependencies = [
  "async-trait",
  "dyn-clonable",
@@ -8929,12 +8731,16 @@ dependencies = [
 
 [[package]]
 name = "orchestra-proc-macro"
-version = "0.0.5"
+version = "0.3.3"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "2871aadd82a2c216ee68a69837a526dfe788ecbe74c4c5038a6acdbff6653066"
+checksum = "d035b1f968d91a826f2e34a9d6d02cb2af5aa7ca39ebd27922d850ab4b2dd2c6"
 dependencies = [
- "expander 0.0.6",
- "itertools 0.10.5",
+ "anyhow",
+ "expander 2.0.0",
+ "fs-err",
+ "indexmap 2.0.0",
+ "itertools 0.11.0",
+ "layout-rs",
  "petgraph",
  "proc-macro-crate",
  "proc-macro2",
@@ -8957,12 +8763,6 @@ version = "6.5.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "4d5d9eb14b174ee9aa2ef96dc2b94637a2d4b6e7cb873c7e171f0c20c6cf3eac"
 
-[[package]]
-name = "overload"
-version = "0.1.1"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "b15813163c1d831bf4a13c3610c05c0d03b39feb07f7e09fa234dac9b15aaf39"
-
 [[package]]
 name = "owo-colors"
 version = "3.5.0"
@@ -8995,7 +8795,7 @@ dependencies = [
 name = "pallet-alliance"
 version = "4.0.0-dev"
 dependencies = [
- "array-bytes",
+ "array-bytes 6.1.0",
  "frame-benchmarking",
  "frame-support",
  "frame-system",
@@ -9298,7 +9098,7 @@ dependencies = [
 name = "pallet-beefy-mmr"
 version = "4.0.0-dev"
 dependencies = [
- "array-bytes",
+ "array-bytes 6.1.0",
  "binary-merkle-tree",
  "frame-support",
  "frame-system",
@@ -9502,11 +9302,26 @@ dependencies = [
  "sp-std",
 ]
 
+[[package]]
+name = "pallet-collective-content"
+version = "0.1.0"
+dependencies = [
+ "frame-benchmarking",
+ "frame-support",
+ "frame-system",
+ "parity-scale-codec",
+ "scale-info",
+ "sp-core",
+ "sp-io",
+ "sp-runtime",
+ "sp-std",
+]
+
 [[package]]
 name = "pallet-contracts"
 version = "4.0.0-dev"
 dependencies = [
- "array-bytes",
+ "array-bytes 6.1.0",
  "assert_matches",
  "bitflags 1.3.2",
  "env_logger 0.9.3",
@@ -9537,7 +9352,7 @@ dependencies = [
  "sp-runtime",
  "sp-std",
  "wasm-instrument 0.4.0",
- "wasmi 0.30.0",
+ "wasmi",
  "wat",
 ]
 
@@ -9559,7 +9374,7 @@ version = "4.0.0-dev"
 dependencies = [
  "proc-macro2",
  "quote",
- "syn 2.0.29",
+ "syn 2.0.38",
 ]
 
 [[package]]
@@ -9840,7 +9655,7 @@ dependencies = [
 name = "pallet-glutton"
 version = "4.0.0-dev"
 dependencies = [
- "blake2",
+ "blake2 0.10.6",
  "frame-benchmarking",
  "frame-support",
  "frame-system",
@@ -10008,11 +9823,30 @@ dependencies = [
  "sp-weights",
 ]
 
+[[package]]
+name = "pallet-mixnet"
+version = "0.1.0-dev"
+dependencies = [
+ "frame-benchmarking",
+ "frame-support",
+ "frame-system",
+ "log",
+ "parity-scale-codec",
+ "scale-info",
+ "serde",
+ "sp-application-crypto",
+ "sp-arithmetic",
+ "sp-io",
+ "sp-mixnet",
+ "sp-runtime",
+ "sp-std",
+]
+
 [[package]]
 name = "pallet-mmr"
 version = "4.0.0-dev"
 dependencies = [
- "array-bytes",
+ "array-bytes 6.1.0",
  "env_logger 0.9.3",
  "frame-benchmarking",
  "frame-support",
@@ -10086,7 +9920,6 @@ dependencies = [
 name = "pallet-nfts-runtime-api"
 version = "4.0.0-dev"
 dependencies = [
- "frame-support",
  "pallet-nfts",
  "parity-scale-codec",
  "sp-api",
@@ -10631,7 +10464,7 @@ dependencies = [
  "proc-macro2",
  "quote",
  "sp-runtime",
- "syn 2.0.29",
+ "syn 2.0.38",
 ]
 
 [[package]]
@@ -10697,6 +10530,7 @@ dependencies = [
 name = "pallet-sudo"
 version = "4.0.0-dev"
 dependencies = [
+ "docify",
  "frame-benchmarking",
  "frame-support",
  "frame-system",
@@ -10727,6 +10561,7 @@ dependencies = [
 name = "pallet-timestamp"
 version = "4.0.0-dev"
 dependencies = [
+ "docify",
  "frame-benchmarking",
  "frame-support",
  "frame-system",
@@ -10809,7 +10644,7 @@ dependencies = [
 name = "pallet-transaction-storage"
 version = "4.0.0-dev"
 dependencies = [
- "array-bytes",
+ "array-bytes 6.1.0",
  "frame-benchmarking",
  "frame-support",
  "frame-system",
@@ -10830,6 +10665,7 @@ dependencies = [
 name = "pallet-treasury"
 version = "4.0.0-dev"
 dependencies = [
+ "docify",
  "frame-benchmarking",
  "frame-support",
  "frame-system",
@@ -10945,7 +10781,7 @@ dependencies = [
  "log",
  "pallet-balances",
  "parity-scale-codec",
- "polkadot-parachain",
+ "polkadot-parachain-primitives",
  "polkadot-runtime-parachains",
  "scale-info",
  "serde",
@@ -10953,9 +10789,9 @@ dependencies = [
  "sp-io",
  "sp-runtime",
  "sp-std",
- "xcm",
- "xcm-builder",
- "xcm-executor",
+ "staging-xcm",
+ "staging-xcm-builder",
+ "staging-xcm-executor",
 ]
 
 [[package]]
@@ -10978,9 +10814,9 @@ dependencies = [
  "sp-runtime",
  "sp-std",
  "sp-tracing",
- "xcm",
- "xcm-builder",
- "xcm-executor",
+ "staging-xcm",
+ "staging-xcm-builder",
+ "staging-xcm-executor",
 ]
 
 [[package]]
@@ -10998,8 +10834,8 @@ dependencies = [
  "sp-io",
  "sp-runtime",
  "sp-std",
- "xcm",
- "xcm-builder",
+ "staging-xcm",
+ "staging-xcm-builder",
 ]
 
 [[package]]
@@ -11019,7 +10855,7 @@ dependencies = [
 name = "parachain-template-node"
 version = "0.1.0"
 dependencies = [
- "clap 4.4.0",
+ "clap 4.4.6",
  "color-print",
  "cumulus-client-cli",
  "cumulus-client-collator",
@@ -11066,10 +10902,10 @@ dependencies = [
  "sp-keystore",
  "sp-runtime",
  "sp-timestamp",
+ "staging-xcm",
  "substrate-build-script-utils",
  "substrate-frame-rpc-system",
  "substrate-prometheus-endpoint",
- "xcm",
 ]
 
 [[package]]
@@ -11091,7 +10927,7 @@ dependencies = [
  "frame-system-benchmarking",
  "frame-system-rpc-runtime-api",
  "frame-try-runtime",
- "hex-literal 0.4.1",
+ "hex-literal",
  "log",
  "pallet-aura",
  "pallet-authorship",
@@ -11106,7 +10942,7 @@ dependencies = [
  "pallet-xcm",
  "parachain-info",
  "parity-scale-codec",
- "polkadot-parachain",
+ "polkadot-parachain-primitives",
  "polkadot-runtime-common",
  "scale-info",
  "smallvec",
@@ -11114,6 +10950,7 @@ dependencies = [
  "sp-block-builder",
  "sp-consensus-aura",
  "sp-core",
+ "sp-genesis-builder",
  "sp-inherents",
  "sp-offchain",
  "sp-runtime",
@@ -11121,10 +10958,10 @@ dependencies = [
  "sp-std",
  "sp-transaction-pool",
  "sp-version",
+ "staging-xcm",
+ "staging-xcm-builder",
+ "staging-xcm-executor",
  "substrate-wasm-builder",
- "xcm",
- "xcm-builder",
- "xcm-executor",
 ]
 
 [[package]]
@@ -11143,17 +10980,21 @@ dependencies = [
  "pallet-balances",
  "pallet-collator-selection",
  "parity-scale-codec",
+ "polkadot-core-primitives",
  "polkadot-primitives",
+ "rococo-runtime-constants",
  "scale-info",
+ "smallvec",
  "sp-consensus-aura",
  "sp-core",
  "sp-io",
  "sp-runtime",
  "sp-std",
+ "staging-xcm",
+ "staging-xcm-builder",
+ "staging-xcm-executor",
  "substrate-wasm-builder",
- "xcm",
- "xcm-builder",
- "xcm-executor",
+ "westend-runtime-constants",
 ]
 
 [[package]]
@@ -11169,7 +11010,7 @@ dependencies = [
  "cumulus-test-relay-sproof-builder",
  "frame-support",
  "frame-system",
- "hex-literal 0.4.1",
+ "hex-literal",
  "pallet-assets",
  "pallet-balances",
  "pallet-collator-selection",
@@ -11178,16 +11019,16 @@ dependencies = [
  "parachain-info",
  "parachains-common",
  "parity-scale-codec",
- "polkadot-parachain",
+ "polkadot-parachain-primitives",
  "sp-consensus-aura",
  "sp-core",
  "sp-io",
  "sp-runtime",
  "sp-std",
  "sp-tracing",
+ "staging-xcm",
+ "staging-xcm-executor",
  "substrate-wasm-builder",
- "xcm",
- "xcm-executor",
 ]
 
 [[package]]
@@ -11196,7 +11037,7 @@ version = "0.4.10"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "78f19d20a0d2cc52327a88d131fa1c4ea81ea4a04714aedcfeca2dd410049cf8"
 dependencies = [
- "blake2",
+ "blake2 0.10.6",
  "crc32fast",
  "fs2",
  "hex",
@@ -11414,7 +11255,7 @@ dependencies = [
  "frame-system-benchmarking",
  "frame-system-rpc-runtime-api",
  "frame-try-runtime",
- "hex-literal 0.4.1",
+ "hex-literal",
  "log",
  "pallet-asset-tx-payment",
  "pallet-assets",
@@ -11431,7 +11272,7 @@ dependencies = [
  "parachain-info",
  "parachains-common",
  "parity-scale-codec",
- "polkadot-parachain",
+ "polkadot-parachain-primitives",
  "polkadot-primitives",
  "polkadot-runtime-common",
  "scale-info",
@@ -11440,6 +11281,7 @@ dependencies = [
  "sp-block-builder",
  "sp-consensus-aura",
  "sp-core",
+ "sp-genesis-builder",
  "sp-inherents",
  "sp-offchain",
  "sp-runtime",
@@ -11448,10 +11290,10 @@ dependencies = [
  "sp-storage",
  "sp-transaction-pool",
  "sp-version",
+ "staging-xcm",
+ "staging-xcm-builder",
+ "staging-xcm-executor",
  "substrate-wasm-builder",
- "xcm",
- "xcm-builder",
- "xcm-executor",
 ]
 
 [[package]]
@@ -11490,7 +11332,7 @@ dependencies = [
  "pest_meta",
  "proc-macro2",
  "quote",
- "syn 2.0.29",
+ "syn 2.0.38",
 ]
 
 [[package]]
@@ -11531,7 +11373,7 @@ checksum = "4359fd9c9171ec6e8c62926d6faaf553a8dc3f64e1507e76da7911b4f6a04405"
 dependencies = [
  "proc-macro2",
  "quote",
- "syn 2.0.29",
+ "syn 2.0.38",
 ]
 
 [[package]]
@@ -11614,7 +11456,7 @@ dependencies = [
 
 [[package]]
 name = "polkadot"
-version = "1.0.0"
+version = "1.1.0"
 dependencies = [
  "assert_cmd",
  "color-eyre",
@@ -11696,7 +11538,6 @@ dependencies = [
  "fatality",
  "futures",
  "futures-timer",
- "lru 0.11.0",
  "parity-scale-codec",
  "polkadot-erasure-coding",
  "polkadot-node-network-protocol",
@@ -11708,6 +11549,7 @@ dependencies = [
  "polkadot-primitives-test-helpers",
  "rand 0.8.5",
  "sc-network",
+ "schnellru",
  "sp-core",
  "sp-keyring",
  "sp-keystore",
@@ -11721,12 +11563,12 @@ name = "polkadot-availability-recovery"
 version = "1.0.0"
 dependencies = [
  "assert_matches",
+ "async-trait",
  "env_logger 0.9.3",
  "fatality",
  "futures",
  "futures-timer",
  "log",
- "lru 0.11.0",
  "parity-scale-codec",
  "polkadot-erasure-coding",
  "polkadot-node-network-protocol",
@@ -11738,6 +11580,7 @@ dependencies = [
  "polkadot-primitives-test-helpers",
  "rand 0.8.5",
  "sc-network",
+ "schnellru",
  "sp-application-crypto",
  "sp-core",
  "sp-keyring",
@@ -11747,14 +11590,14 @@ dependencies = [
 
 [[package]]
 name = "polkadot-cli"
-version = "1.0.0"
+version = "1.1.0"
 dependencies = [
- "clap 4.4.0",
+ "clap 4.4.6",
  "frame-benchmarking-cli",
  "futures",
  "log",
  "polkadot-node-metrics",
- "polkadot-performance-test",
+ "polkadot-node-primitives",
  "polkadot-service",
  "pyroscope",
  "pyroscope_pprofrs",
@@ -11827,7 +11670,6 @@ dependencies = [
  "futures-timer",
  "indexmap 1.9.3",
  "lazy_static",
- "lru 0.11.0",
  "parity-scale-codec",
  "polkadot-erasure-coding",
  "polkadot-node-network-protocol",
@@ -11839,6 +11681,7 @@ dependencies = [
  "polkadot-primitives-test-helpers",
  "sc-keystore",
  "sc-network",
+ "schnellru",
  "sp-application-crypto",
  "sp-keyring",
  "sp-keystore",
@@ -11951,7 +11794,6 @@ dependencies = [
  "futures-timer",
  "kvdb",
  "kvdb-memorydb",
- "lru 0.11.0",
  "merlin 2.0.1",
  "parity-scale-codec",
  "parking_lot 0.12.1",
@@ -11965,6 +11807,7 @@ dependencies = [
  "polkadot-primitives-test-helpers",
  "rand_core 0.5.1",
  "sc-keystore",
+ "schnellru",
  "schnorrkel 0.9.1",
  "sp-application-crypto",
  "sp-consensus",
@@ -12066,7 +11909,7 @@ dependencies = [
  "polkadot-node-subsystem-test-helpers",
  "polkadot-node-subsystem-util",
  "polkadot-overseer",
- "polkadot-parachain",
+ "polkadot-parachain-primitives",
  "polkadot-primitives",
  "polkadot-primitives-test-helpers",
  "sp-core",
@@ -12125,7 +11968,6 @@ dependencies = [
  "futures-timer",
  "kvdb",
  "kvdb-memorydb",
- "lru 0.11.0",
  "parity-scale-codec",
  "polkadot-node-primitives",
  "polkadot-node-subsystem",
@@ -12134,6 +11976,7 @@ dependencies = [
  "polkadot-primitives",
  "polkadot-primitives-test-helpers",
  "sc-keystore",
+ "schnellru",
  "sp-application-crypto",
  "sp-core",
  "sp-keyring",
@@ -12210,9 +12053,10 @@ version = "1.0.0"
 dependencies = [
  "always-assert",
  "assert_matches",
+ "cfg-if",
  "futures",
  "futures-timer",
- "hex-literal 0.3.4",
+ "hex-literal",
  "libc",
  "parity-scale-codec",
  "pin-project",
@@ -12223,13 +12067,12 @@ dependencies = [
  "polkadot-node-core-pvf-prepare-worker",
  "polkadot-node-metrics",
  "polkadot-node-primitives",
- "polkadot-parachain",
+ "polkadot-parachain-primitives",
  "polkadot-primitives",
  "rand 0.8.5",
  "slotmap",
  "sp-core",
  "sp-maybe-compressed-blob",
- "sp-tracing",
  "sp-wasm-interface",
  "substrate-build-script-utils",
  "tempfile",
@@ -12267,12 +12110,13 @@ name = "polkadot-node-core-pvf-common"
 version = "1.0.0"
 dependencies = [
  "assert_matches",
+ "cfg-if",
  "cpu-time",
  "futures",
  "landlock",
  "libc",
  "parity-scale-codec",
- "polkadot-parachain",
+ "polkadot-parachain-primitives",
  "polkadot-primitives",
  "sc-executor",
  "sc-executor-common",
@@ -12294,13 +12138,12 @@ dependencies = [
  "futures",
  "parity-scale-codec",
  "polkadot-node-core-pvf-common",
- "polkadot-parachain",
+ "polkadot-parachain-primitives",
  "polkadot-primitives",
  "rayon",
  "sp-core",
  "sp-maybe-compressed-blob",
  "sp-tracing",
- "tikv-jemalloc-ctl",
  "tokio",
  "tracing-gum",
 ]
@@ -12309,11 +12152,12 @@ dependencies = [
 name = "polkadot-node-core-pvf-prepare-worker"
 version = "1.0.0"
 dependencies = [
+ "cfg-if",
  "futures",
  "libc",
  "parity-scale-codec",
  "polkadot-node-core-pvf-common",
- "polkadot-parachain",
+ "polkadot-parachain-primitives",
  "polkadot-primitives",
  "rayon",
  "sc-executor",
@@ -12333,7 +12177,6 @@ version = "1.0.0"
 dependencies = [
  "async-trait",
  "futures",
- "lru 0.11.0",
  "polkadot-node-metrics",
  "polkadot-node-primitives",
  "polkadot-node-subsystem",
@@ -12341,6 +12184,7 @@ dependencies = [
  "polkadot-node-subsystem-types",
  "polkadot-primitives",
  "polkadot-primitives-test-helpers",
+ "schnellru",
  "sp-api",
  "sp-consensus-babe",
  "sp-core",
@@ -12370,7 +12214,7 @@ name = "polkadot-node-metrics"
 version = "1.0.0"
 dependencies = [
  "assert_cmd",
- "bs58 0.4.0",
+ "bs58 0.5.0",
  "futures",
  "futures-timer",
  "hyper",
@@ -12423,7 +12267,7 @@ dependencies = [
  "futures",
  "parity-scale-codec",
  "polkadot-erasure-coding",
- "polkadot-parachain",
+ "polkadot-parachain-primitives",
  "polkadot-primitives",
  "schnorrkel 0.9.1",
  "serde",
@@ -12434,7 +12278,7 @@ dependencies = [
  "sp-maybe-compressed-blob",
  "sp-runtime",
  "thiserror",
- "zstd 0.11.2+zstd.1.5.2",
+ "zstd 0.12.4",
 ]
 
 [[package]]
@@ -12455,9 +12299,10 @@ dependencies = [
  "parking_lot 0.12.1",
  "polkadot-node-subsystem",
  "polkadot-node-subsystem-util",
- "polkadot-overseer",
  "polkadot-primitives",
+ "sc-client-api",
  "sc-keystore",
+ "sc-utils",
  "sp-application-crypto",
  "sp-core",
  "sp-keyring",
@@ -12477,6 +12322,7 @@ dependencies = [
  "polkadot-node-primitives",
  "polkadot-primitives",
  "polkadot-statement-table",
+ "sc-client-api",
  "sc-network",
  "sc-transaction-pool-api",
  "smallvec",
@@ -12504,7 +12350,6 @@ dependencies = [
  "kvdb-shared-tests",
  "lazy_static",
  "log",
- "lru 0.11.0",
  "parity-db",
  "parity-scale-codec",
  "parking_lot 0.11.2",
@@ -12515,11 +12360,14 @@ dependencies = [
  "polkadot-node-primitives",
  "polkadot-node-subsystem",
  "polkadot-node-subsystem-test-helpers",
+ "polkadot-node-subsystem-types",
  "polkadot-overseer",
  "polkadot-primitives",
  "polkadot-primitives-test-helpers",
  "prioritized-metered-channel",
  "rand 0.8.5",
+ "sc-client-api",
+ "schnellru",
  "sp-application-crypto",
  "sp-core",
  "sp-keystore",
@@ -12537,42 +12385,27 @@ dependencies = [
  "femme",
  "futures",
  "futures-timer",
- "lru 0.11.0",
  "orchestra",
  "parking_lot 0.12.1",
  "polkadot-node-metrics",
  "polkadot-node-network-protocol",
  "polkadot-node-primitives",
+ "polkadot-node-subsystem-test-helpers",
  "polkadot-node-subsystem-types",
  "polkadot-primitives",
  "polkadot-primitives-test-helpers",
  "prioritized-metered-channel",
  "sc-client-api",
+ "schnellru",
  "sp-api",
  "sp-core",
  "tikv-jemalloc-ctl",
  "tracing-gum",
 ]
 
-[[package]]
-name = "polkadot-parachain"
-version = "1.0.0"
-dependencies = [
- "bounded-collections",
- "derive_more",
- "frame-support",
- "parity-scale-codec",
- "polkadot-core-primitives",
- "scale-info",
- "serde",
- "sp-core",
- "sp-runtime",
- "sp-std",
-]
-
 [[package]]
 name = "polkadot-parachain-bin"
-version = "1.0.0"
+version = "1.1.0"
 dependencies = [
  "assert_cmd",
  "asset-hub-kusama-runtime",
@@ -12582,7 +12415,7 @@ dependencies = [
  "bridge-hub-kusama-runtime",
  "bridge-hub-polkadot-runtime",
  "bridge-hub-rococo-runtime",
- "clap 4.4.0",
+ "clap 4.4.6",
  "collectives-polkadot-runtime",
  "color-print",
  "contracts-rococo-runtime",
@@ -12593,6 +12426,7 @@ dependencies = [
  "cumulus-client-consensus-proposer",
  "cumulus-client-consensus-relay-chain",
  "cumulus-client-service",
+ "cumulus-primitives-aura",
  "cumulus-primitives-core",
  "cumulus-primitives-parachain-inherent",
  "cumulus-relay-chain-interface",
@@ -12600,7 +12434,7 @@ dependencies = [
  "frame-benchmarking-cli",
  "futures",
  "glutton-runtime",
- "hex-literal 0.4.1",
+ "hex-literal",
  "jsonrpsee",
  "log",
  "nix 0.26.2",
@@ -12643,6 +12477,7 @@ dependencies = [
  "sp-session",
  "sp-timestamp",
  "sp-transaction-pool",
+ "staging-xcm",
  "substrate-build-script-utils",
  "substrate-frame-rpc-system",
  "substrate-prometheus-endpoint",
@@ -12650,24 +12485,22 @@ dependencies = [
  "tempfile",
  "tokio",
  "wait-timeout",
- "xcm",
 ]
 
 [[package]]
-name = "polkadot-performance-test"
+name = "polkadot-parachain-primitives"
 version = "1.0.0"
 dependencies = [
- "env_logger 0.9.3",
- "kusama-runtime",
- "log",
- "polkadot-erasure-coding",
- "polkadot-node-core-pvf-prepare-worker",
- "polkadot-node-primitives",
- "polkadot-primitives",
- "quote",
- "sc-executor-common",
- "sp-maybe-compressed-blob",
- "thiserror",
+ "bounded-collections",
+ "derive_more",
+ "frame-support",
+ "parity-scale-codec",
+ "polkadot-core-primitives",
+ "scale-info",
+ "serde",
+ "sp-core",
+ "sp-runtime",
+ "sp-std",
 ]
 
 [[package]]
@@ -12675,10 +12508,10 @@ name = "polkadot-primitives"
 version = "1.0.0"
 dependencies = [
  "bitvec",
- "hex-literal 0.4.1",
+ "hex-literal",
  "parity-scale-codec",
  "polkadot-core-primitives",
- "polkadot-parachain",
+ "polkadot-parachain-primitives",
  "scale-info",
  "serde",
  "sp-api",
@@ -12738,110 +12571,6 @@ dependencies = [
  "substrate-state-trie-migration-rpc",
 ]
 
-[[package]]
-name = "polkadot-runtime"
-version = "1.0.0"
-dependencies = [
- "bitvec",
- "frame-benchmarking",
- "frame-election-provider-support",
- "frame-executive",
- "frame-remote-externalities",
- "frame-support",
- "frame-system",
- "frame-system-benchmarking",
- "frame-system-rpc-runtime-api",
- "frame-try-runtime",
- "hex-literal 0.4.1",
- "log",
- "pallet-authority-discovery",
- "pallet-authorship",
- "pallet-babe",
- "pallet-bags-list",
- "pallet-balances",
- "pallet-bounties",
- "pallet-child-bounties",
- "pallet-collective",
- "pallet-conviction-voting",
- "pallet-democracy",
- "pallet-election-provider-multi-phase",
- "pallet-election-provider-support-benchmarking",
- "pallet-elections-phragmen",
- "pallet-fast-unstake",
- "pallet-grandpa",
- "pallet-identity",
- "pallet-im-online",
- "pallet-indices",
- "pallet-membership",
- "pallet-message-queue",
- "pallet-multisig",
- "pallet-nomination-pools",
- "pallet-nomination-pools-benchmarking",
- "pallet-nomination-pools-runtime-api",
- "pallet-offences",
- "pallet-offences-benchmarking",
- "pallet-preimage",
- "pallet-proxy",
- "pallet-referenda",
- "pallet-scheduler",
- "pallet-session",
- "pallet-session-benchmarking",
- "pallet-staking",
- "pallet-staking-reward-curve",
- "pallet-staking-runtime-api",
- "pallet-timestamp",
- "pallet-tips",
- "pallet-transaction-payment",
- "pallet-transaction-payment-rpc-runtime-api",
- "pallet-treasury",
- "pallet-utility",
- "pallet-vesting",
- "pallet-whitelist",
- "pallet-xcm",
- "pallet-xcm-benchmarks",
- "parity-scale-codec",
- "polkadot-primitives",
- "polkadot-runtime-common",
- "polkadot-runtime-constants",
- "polkadot-runtime-parachains",
- "rustc-hex",
- "scale-info",
- "separator",
- "serde",
- "serde_derive",
- "serde_json",
- "smallvec",
- "sp-api",
- "sp-arithmetic",
- "sp-authority-discovery",
- "sp-block-builder",
- "sp-consensus-babe",
- "sp-consensus-beefy",
- "sp-core",
- "sp-inherents",
- "sp-io",
- "sp-keyring",
- "sp-mmr-primitives",
- "sp-npos-elections",
- "sp-offchain",
- "sp-runtime",
- "sp-session",
- "sp-staking",
- "sp-std",
- "sp-storage",
- "sp-tracing",
- "sp-transaction-pool",
- "sp-trie",
- "sp-version",
- "static_assertions",
- "substrate-wasm-builder",
- "tiny-keccak",
- "tokio",
- "xcm",
- "xcm-builder",
- "xcm-executor",
-]
-
 [[package]]
 name = "polkadot-runtime-common"
 version = "1.0.0"
@@ -12852,10 +12581,11 @@ dependencies = [
  "frame-support",
  "frame-support-test",
  "frame-system",
- "hex-literal 0.4.1",
+ "hex-literal",
  "impl-trait-for-tuples",
  "libsecp256k1",
  "log",
+ "pallet-asset-rate",
  "pallet-authorship",
  "pallet-babe",
  "pallet-balances",
@@ -12889,28 +12619,16 @@ dependencies = [
  "sp-session",
  "sp-staking",
  "sp-std",
+ "staging-xcm",
+ "staging-xcm-builder",
  "static_assertions",
- "xcm",
-]
-
-[[package]]
-name = "polkadot-runtime-constants"
-version = "1.0.0"
-dependencies = [
- "frame-support",
- "polkadot-primitives",
- "polkadot-runtime-common",
- "smallvec",
- "sp-core",
- "sp-runtime",
- "sp-weights",
 ]
 
 [[package]]
 name = "polkadot-runtime-metrics"
 version = "1.0.0"
 dependencies = [
- "bs58 0.4.0",
+ "bs58 0.5.0",
  "frame-benchmarking",
  "parity-scale-codec",
  "polkadot-primitives",
@@ -12931,7 +12649,8 @@ dependencies = [
  "frame-support-test",
  "frame-system",
  "futures",
- "hex-literal 0.4.1",
+ "hex-literal",
+ "impl-trait-for-tuples",
  "log",
  "pallet-authority-discovery",
  "pallet-authorship",
@@ -12943,7 +12662,8 @@ dependencies = [
  "pallet-timestamp",
  "pallet-vesting",
  "parity-scale-codec",
- "polkadot-parachain",
+ "polkadot-core-primitives",
+ "polkadot-parachain-primitives",
  "polkadot-primitives",
  "polkadot-primitives-test-helpers",
  "polkadot-runtime-metrics",
@@ -12966,10 +12686,10 @@ dependencies = [
  "sp-staking",
  "sp-std",
  "sp-tracing",
+ "staging-xcm",
+ "staging-xcm-executor",
  "static_assertions",
  "thousands",
- "xcm",
- "xcm-executor",
 ]
 
 [[package]]
@@ -12985,14 +12705,11 @@ dependencies = [
  "frame-system",
  "frame-system-rpc-runtime-api",
  "futures",
- "hex-literal 0.4.1",
+ "hex-literal",
  "is_executable",
- "kusama-runtime",
- "kusama-runtime-constants",
  "kvdb",
  "kvdb-rocksdb",
  "log",
- "lru 0.11.0",
  "mmr-gadget",
  "pallet-babe",
  "pallet-im-online",
@@ -13032,12 +12749,9 @@ dependencies = [
  "polkadot-node-subsystem-types",
  "polkadot-node-subsystem-util",
  "polkadot-overseer",
- "polkadot-parachain",
+ "polkadot-parachain-primitives",
  "polkadot-primitives",
  "polkadot-rpc",
- "polkadot-runtime",
- "polkadot-runtime-common",
- "polkadot-runtime-constants",
  "polkadot-runtime-parachains",
  "polkadot-statement-distribution",
  "polkadot-test-client",
@@ -13066,6 +12780,7 @@ dependencies = [
  "sc-telemetry",
  "sc-transaction-pool",
  "sc-transaction-pool-api",
+ "schnellru",
  "serde",
  "serde_json",
  "serial_test",
@@ -13179,7 +12894,7 @@ version = "1.0.0"
 dependencies = [
  "assert_matches",
  "async-trait",
- "clap 4.4.0",
+ "clap 4.4.6",
  "color-eyre",
  "futures",
  "futures-timer",
@@ -13214,7 +12929,7 @@ dependencies = [
  "frame-support",
  "frame-system",
  "frame-system-rpc-runtime-api",
- "hex-literal 0.4.1",
+ "hex-literal",
  "log",
  "pallet-authority-discovery",
  "pallet-authorship",
@@ -13233,7 +12948,7 @@ dependencies = [
  "pallet-vesting",
  "pallet-xcm",
  "parity-scale-codec",
- "polkadot-parachain",
+ "polkadot-parachain-primitives",
  "polkadot-primitives",
  "polkadot-runtime-common",
  "polkadot-runtime-parachains",
@@ -13249,6 +12964,7 @@ dependencies = [
  "sp-consensus-babe",
  "sp-consensus-beefy",
  "sp-core",
+ "sp-genesis-builder",
  "sp-inherents",
  "sp-io",
  "sp-keyring",
@@ -13261,12 +12977,12 @@ dependencies = [
  "sp-transaction-pool",
  "sp-trie",
  "sp-version",
+ "staging-xcm",
+ "staging-xcm-builder",
+ "staging-xcm-executor",
  "substrate-wasm-builder",
  "test-runtime-constants",
  "tiny-keccak",
- "xcm",
- "xcm-builder",
- "xcm-executor",
 ]
 
 [[package]]
@@ -13282,7 +12998,7 @@ dependencies = [
  "polkadot-node-primitives",
  "polkadot-node-subsystem",
  "polkadot-overseer",
- "polkadot-parachain",
+ "polkadot-parachain-primitives",
  "polkadot-primitives",
  "polkadot-rpc",
  "polkadot-runtime-common",
@@ -13325,10 +13041,8 @@ dependencies = [
 name = "polkadot-voter-bags"
 version = "1.0.0"
 dependencies = [
- "clap 4.4.0",
+ "clap 4.4.6",
  "generate-bags",
- "kusama-runtime",
- "polkadot-runtime",
  "sp-io",
  "westend-runtime",
 ]
@@ -13505,7 +13219,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "6c64d9ba0963cdcea2e1b2230fbae2bab30eb25a174be395c41e764bfb65dd62"
 dependencies = [
  "proc-macro2",
- "syn 2.0.29",
+ "syn 2.0.38",
 ]
 
 [[package]]
@@ -13525,9 +13239,9 @@ dependencies = [
 
 [[package]]
 name = "prioritized-metered-channel"
-version = "0.2.0"
+version = "0.5.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "382698e48a268c832d0b181ed438374a6bb708a82a8ca273bb0f61c74cf209c4"
+checksum = "e99f0c89bd88f393aab44a4ab949351f7bc7e7e1179d11ecbfe50cbe4c47e342"
 dependencies = [
  "coarsetime",
  "crossbeam-queue",
@@ -13581,20 +13295,20 @@ checksum = "dc375e1527247fe1a97d8b7156678dfe7c1af2fc075c9a4db3690ecd2a148068"
 
 [[package]]
 name = "proc-macro-warning"
-version = "0.4.1"
+version = "1.0.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "70550716265d1ec349c41f70dd4f964b4fd88394efe4405f0c1da679c4799a07"
+checksum = "9b698b0b09d40e9b7c1a47b132d66a8b54bcd20583d9b6d06e4535e383b4405c"
 dependencies = [
  "proc-macro2",
  "quote",
- "syn 2.0.29",
+ "syn 2.0.38",
 ]
 
 [[package]]
 name = "proc-macro2"
-version = "1.0.66"
+version = "1.0.68"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "18fb31db3f9bddb2ea821cde30a9f70117e3f119938b5ee630b7403aa6e2ead9"
+checksum = "5b1106fec09662ec6dd98ccac0f81cef56984d0b49f75c92d8cbad76e20c005c"
 dependencies = [
  "unicode-ident",
 ]
@@ -13633,7 +13347,7 @@ checksum = "440f724eba9f6996b75d63681b0a92b06947f1457076d503a4d2e2c8f56442b8"
 dependencies = [
  "proc-macro2",
  "quote",
- "syn 2.0.29",
+ "syn 2.0.38",
 ]
 
 [[package]]
@@ -13948,7 +13662,7 @@ checksum = "6413f3de1edee53342e6138e75b56d32e7bc6e332b3bd62d497b1929d4cfbcdd"
 dependencies = [
  "pem",
  "ring 0.16.20",
- "time 0.3.27",
+ "time",
  "x509-parser 0.13.2",
  "yasna",
 ]
@@ -13961,7 +13675,7 @@ checksum = "ffbe84efe2f38dea12e9bfc1f65377fdf03e53a18cb3b995faedf7934c7e785b"
 dependencies = [
  "pem",
  "ring 0.16.20",
- "time 0.3.27",
+ "time",
  "yasna",
 ]
 
@@ -14024,7 +13738,7 @@ checksum = "7f7473c2cfcf90008193dd0e3e16599455cb601a9fce322b5bb55de799664925"
 dependencies = [
  "proc-macro2",
  "quote",
- "syn 2.0.29",
+ "syn 2.0.38",
 ]
 
 [[package]]
@@ -14087,14 +13801,10 @@ checksum = "e5ea92a5b6195c6ef2a0295ea818b312502c6fc94dde986c5553242e18fd4ce2"
 name = "remote-ext-tests-bags-list"
 version = "1.0.0"
 dependencies = [
- "clap 4.4.0",
+ "clap 4.4.6",
  "frame-system",
- "kusama-runtime",
- "kusama-runtime-constants",
  "log",
  "pallet-bags-list-remote-tests",
- "polkadot-runtime",
- "polkadot-runtime-constants",
  "sp-core",
  "sp-tracing",
  "tokio",
@@ -14169,19 +13879,20 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "f8dd2a808d456c4a54e300a23e9f5a67e122c3024119acbfd73e3bf664491cb2"
 dependencies = [
  "hmac 0.12.1",
- "subtle",
+ "subtle 2.4.1",
 ]
 
 [[package]]
 name = "ring"
 version = "0.1.0"
-source = "git+https://github.com/w3f/ring-proof#0e948f3c28cbacecdd3020403c4841c0eb339213"
+source = "git+https://github.com/w3f/ring-proof#edd1e90b847e560bf60fc2e8712235ccfa11a9a9"
 dependencies = [
  "ark-ec",
  "ark-ff",
  "ark-poly",
  "ark-serialize",
  "ark-std",
+ "blake2 0.10.6",
  "common",
  "fflonk",
  "merlin 3.0.0",
@@ -14256,12 +13967,13 @@ dependencies = [
  "parachain-info",
  "parachains-common",
  "parity-scale-codec",
- "polkadot-parachain",
+ "polkadot-parachain-primitives",
  "scale-info",
  "sp-api",
  "sp-block-builder",
  "sp-consensus-aura",
  "sp-core",
+ "sp-genesis-builder",
  "sp-inherents",
  "sp-offchain",
  "sp-runtime",
@@ -14269,10 +13981,10 @@ dependencies = [
  "sp-std",
  "sp-transaction-pool",
  "sp-version",
+ "staging-xcm",
+ "staging-xcm-builder",
+ "staging-xcm-executor",
  "substrate-wasm-builder",
- "xcm",
- "xcm-builder",
- "xcm-executor",
 ]
 
 [[package]]
@@ -14288,8 +14000,9 @@ dependencies = [
  "frame-system-benchmarking",
  "frame-system-rpc-runtime-api",
  "frame-try-runtime",
- "hex-literal 0.4.1",
+ "hex-literal",
  "log",
+ "pallet-asset-rate",
  "pallet-authority-discovery",
  "pallet-authorship",
  "pallet-babe",
@@ -14299,6 +14012,7 @@ dependencies = [
  "pallet-bounties",
  "pallet-child-bounties",
  "pallet-collective",
+ "pallet-conviction-voting",
  "pallet-democracy",
  "pallet-elections-phragmen",
  "pallet-grandpa",
@@ -14313,7 +14027,9 @@ dependencies = [
  "pallet-offences",
  "pallet-preimage",
  "pallet-proxy",
+ "pallet-ranked-collective",
  "pallet-recovery",
+ "pallet-referenda",
  "pallet-scheduler",
  "pallet-session",
  "pallet-society",
@@ -14327,10 +14043,11 @@ dependencies = [
  "pallet-treasury",
  "pallet-utility",
  "pallet-vesting",
+ "pallet-whitelist",
  "pallet-xcm",
  "pallet-xcm-benchmarks",
  "parity-scale-codec",
- "polkadot-parachain",
+ "polkadot-parachain-primitives",
  "polkadot-primitives",
  "polkadot-runtime-common",
  "polkadot-runtime-parachains",
@@ -14342,11 +14059,13 @@ dependencies = [
  "serde_json",
  "smallvec",
  "sp-api",
+ "sp-arithmetic",
  "sp-authority-discovery",
  "sp-block-builder",
  "sp-consensus-babe",
  "sp-consensus-beefy",
  "sp-core",
+ "sp-genesis-builder",
  "sp-inherents",
  "sp-io",
  "sp-keyring",
@@ -14361,13 +14080,13 @@ dependencies = [
  "sp-transaction-pool",
  "sp-trie",
  "sp-version",
+ "staging-xcm",
+ "staging-xcm-builder",
+ "staging-xcm-executor",
  "static_assertions",
  "substrate-wasm-builder",
  "tiny-keccak",
  "tokio",
- "xcm",
- "xcm-builder",
- "xcm-executor",
 ]
 
 [[package]]
@@ -14786,16 +14505,16 @@ dependencies = [
  "proc-macro-crate",
  "proc-macro2",
  "quote",
- "syn 2.0.29",
+ "syn 2.0.38",
 ]
 
 [[package]]
 name = "sc-cli"
 version = "0.10.0-dev"
 dependencies = [
- "array-bytes",
+ "array-bytes 6.1.0",
  "chrono",
- "clap 4.4.0",
+ "clap 4.4.6",
  "fdlimit",
  "futures",
  "futures-timer",
@@ -14809,6 +14528,7 @@ dependencies = [
  "sc-client-api",
  "sc-client-db",
  "sc-keystore",
+ "sc-mixnet",
  "sc-network",
  "sc-service",
  "sc-telemetry",
@@ -14853,6 +14573,7 @@ dependencies = [
  "sp-statement-store",
  "sp-storage",
  "sp-test-primitives",
+ "sp-trie",
  "substrate-prometheus-endpoint",
  "substrate-test-runtime",
  "thiserror",
@@ -14862,7 +14583,7 @@ dependencies = [
 name = "sc-client-db"
 version = "0.10.0-dev"
 dependencies = [
- "array-bytes",
+ "array-bytes 6.1.0",
  "criterion 0.4.0",
  "hash-db",
  "kitchensink-runtime",
@@ -14967,17 +14688,14 @@ dependencies = [
  "num-traits",
  "parity-scale-codec",
  "parking_lot 0.12.1",
- "rand_chacha 0.2.2",
  "sc-block-builder",
  "sc-client-api",
  "sc-consensus",
  "sc-consensus-epochs",
  "sc-consensus-slots",
- "sc-network",
  "sc-network-test",
  "sc-telemetry",
  "sc-transaction-pool-api",
- "scale-info",
  "sp-api",
  "sp-application-crypto",
  "sp-block-builder",
@@ -15030,7 +14748,7 @@ dependencies = [
 name = "sc-consensus-beefy"
 version = "4.0.0-dev"
 dependencies = [
- "array-bytes",
+ "array-bytes 6.1.0",
  "async-channel",
  "async-trait",
  "fnv",
@@ -15106,7 +14824,7 @@ name = "sc-consensus-grandpa"
 version = "0.10.0-dev"
 dependencies = [
  "ahash 0.8.3",
- "array-bytes",
+ "array-bytes 6.1.0",
  "assert_matches",
  "async-trait",
  "dyn-clone",
@@ -15261,7 +14979,7 @@ dependencies = [
 name = "sc-executor"
 version = "0.10.0-dev"
 dependencies = [
- "array-bytes",
+ "array-bytes 6.1.0",
  "assert_matches",
  "criterion 0.4.0",
  "env_logger 0.9.3",
@@ -15291,7 +15009,7 @@ dependencies = [
  "substrate-test-runtime",
  "tempfile",
  "tracing",
- "tracing-subscriber 0.2.25",
+ "tracing-subscriber",
  "wat",
 ]
 
@@ -15348,7 +15066,7 @@ dependencies = [
 name = "sc-keystore"
 version = "4.0.0-dev"
 dependencies = [
- "array-bytes",
+ "array-bytes 6.1.0",
  "parking_lot 0.12.1",
  "serde_json",
  "sp-application-crypto",
@@ -15358,11 +15076,38 @@ dependencies = [
  "thiserror",
 ]
 
+[[package]]
+name = "sc-mixnet"
+version = "0.1.0-dev"
+dependencies = [
+ "array-bytes 4.2.0",
+ "arrayvec 0.7.4",
+ "blake2 0.10.6",
+ "futures",
+ "futures-timer",
+ "libp2p-identity",
+ "log",
+ "mixnet",
+ "multiaddr",
+ "parity-scale-codec",
+ "parking_lot 0.12.1",
+ "sc-client-api",
+ "sc-network",
+ "sc-transaction-pool-api",
+ "sp-api",
+ "sp-consensus",
+ "sp-core",
+ "sp-keystore",
+ "sp-mixnet",
+ "sp-runtime",
+ "thiserror",
+]
+
 [[package]]
 name = "sc-network"
 version = "0.10.0-dev"
 dependencies = [
- "array-bytes",
+ "array-bytes 6.1.0",
  "assert_matches",
  "async-channel",
  "async-trait",
@@ -15477,7 +15222,7 @@ dependencies = [
 name = "sc-network-light"
 version = "0.10.0-dev"
 dependencies = [
- "array-bytes",
+ "array-bytes 6.1.0",
  "async-channel",
  "futures",
  "libp2p-identity",
@@ -15497,7 +15242,7 @@ dependencies = [
 name = "sc-network-statement"
 version = "0.10.0-dev"
 dependencies = [
- "array-bytes",
+ "array-bytes 6.1.0",
  "async-channel",
  "futures",
  "libp2p",
@@ -15514,7 +15259,7 @@ dependencies = [
 name = "sc-network-sync"
 version = "0.10.0-dev"
 dependencies = [
- "array-bytes",
+ "array-bytes 6.1.0",
  "async-channel",
  "async-trait",
  "fork-tree",
@@ -15547,6 +15292,7 @@ dependencies = [
  "substrate-test-runtime-client",
  "thiserror",
  "tokio",
+ "tokio-stream",
 ]
 
 [[package]]
@@ -15583,7 +15329,7 @@ dependencies = [
 name = "sc-network-transactions"
 version = "0.10.0-dev"
 dependencies = [
- "array-bytes",
+ "array-bytes 6.1.0",
  "futures",
  "libp2p",
  "log",
@@ -15600,7 +15346,7 @@ dependencies = [
 name = "sc-offchain"
 version = "4.0.0-dev"
 dependencies = [
- "array-bytes",
+ "array-bytes 6.1.0",
  "bytes",
  "fnv",
  "futures",
@@ -15660,6 +15406,7 @@ dependencies = [
  "sc-block-builder",
  "sc-chain-spec",
  "sc-client-api",
+ "sc-mixnet",
  "sc-network",
  "sc-network-common",
  "sc-rpc-api",
@@ -15691,6 +15438,7 @@ dependencies = [
  "jsonrpsee",
  "parity-scale-codec",
  "sc-chain-spec",
+ "sc-mixnet",
  "sc-transaction-pool-api",
  "scale-info",
  "serde",
@@ -15720,7 +15468,7 @@ dependencies = [
 name = "sc-rpc-spec-v2"
 version = "0.10.0-dev"
 dependencies = [
- "array-bytes",
+ "array-bytes 6.1.0",
  "assert_matches",
  "futures",
  "futures-util",
@@ -15833,7 +15581,7 @@ dependencies = [
 name = "sc-service-test"
 version = "2.0.0"
 dependencies = [
- "array-bytes",
+ "array-bytes 6.1.0",
  "async-channel",
  "fdlimit",
  "futures",
@@ -15899,7 +15647,7 @@ dependencies = [
 name = "sc-storage-monitor"
 version = "0.1.0"
 dependencies = [
- "clap 4.4.0",
+ "clap 4.4.6",
  "fs4",
  "log",
  "sc-client-db",
@@ -15989,7 +15737,7 @@ dependencies = [
  "thiserror",
  "tracing",
  "tracing-log",
- "tracing-subscriber 0.2.25",
+ "tracing-subscriber",
 ]
 
 [[package]]
@@ -15999,14 +15747,14 @@ dependencies = [
  "proc-macro-crate",
  "proc-macro2",
  "quote",
- "syn 2.0.29",
+ "syn 2.0.38",
 ]
 
 [[package]]
 name = "sc-transaction-pool"
 version = "4.0.0-dev"
 dependencies = [
- "array-bytes",
+ "array-bytes 6.1.0",
  "assert_matches",
  "async-trait",
  "criterion 0.4.0",
@@ -16126,7 +15874,7 @@ dependencies = [
  "rand 0.7.3",
  "rand_core 0.5.1",
  "sha2 0.8.2",
- "subtle",
+ "subtle 2.4.1",
  "zeroize",
 ]
 
@@ -16200,7 +15948,7 @@ dependencies = [
  "der 0.6.1",
  "generic-array 0.14.7",
  "pkcs8 0.9.0",
- "subtle",
+ "subtle 2.4.1",
  "zeroize",
 ]
 
@@ -16214,7 +15962,7 @@ dependencies = [
  "der 0.7.8",
  "generic-array 0.14.7",
  "pkcs8 0.10.2",
- "subtle",
+ "subtle 2.4.1",
  "zeroize",
 ]
 
@@ -16272,21 +16020,27 @@ dependencies = [
 name = "seedling-runtime"
 version = "0.1.0"
 dependencies = [
+ "cumulus-pallet-aura-ext",
  "cumulus-pallet-parachain-system",
  "cumulus-pallet-solo-to-para",
  "cumulus-primitives-core",
+ "cumulus-primitives-timestamp",
  "frame-executive",
  "frame-support",
  "frame-system",
+ "pallet-aura",
  "pallet-balances",
  "pallet-sudo",
+ "pallet-timestamp",
  "parachain-info",
  "parachains-common",
  "parity-scale-codec",
  "scale-info",
  "sp-api",
  "sp-block-builder",
+ "sp-consensus-aura",
  "sp-core",
+ "sp-genesis-builder",
  "sp-inherents",
  "sp-offchain",
  "sp-runtime",
@@ -16338,22 +16092,22 @@ checksum = "f97841a747eef040fcd2e7b3b9a220a7205926e60488e673d9e4926d27772ce5"
 
 [[package]]
 name = "serde"
-version = "1.0.186"
+version = "1.0.188"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "9f5db24220c009de9bd45e69fb2938f4b6d2df856aa9304ce377b3180f83b7c1"
+checksum = "cf9e0fcba69a370eed61bcf2b728575f726b50b55cba78064753d708ddc7549e"
 dependencies = [
  "serde_derive",
 ]
 
 [[package]]
 name = "serde_derive"
-version = "1.0.186"
+version = "1.0.188"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "5ad697f7e0b65af4983a4ce8f56ed5b357e8d3c36651bf6a7e13639c17b8e670"
+checksum = "4eca7ac642d82aa35b60049a6eccb4be6be75e599bd2e9adb5f875a737654af2"
 dependencies = [
  "proc-macro2",
  "quote",
- "syn 2.0.29",
+ "syn 2.0.38",
 ]
 
 [[package]]
@@ -16367,9 +16121,9 @@ dependencies = [
 
 [[package]]
 name = "serde_json"
-version = "1.0.105"
+version = "1.0.107"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "693151e1ac27563d6dbcec9dee9fbd5da8539b20fa14ad3752b2e6d363ace360"
+checksum = "6b420ce6e3d8bd882e9b243c6eed35dbc9a6110c9769e74b584e0d68d1f20c65"
 dependencies = [
  "itoa",
  "ryu",
@@ -16419,7 +16173,7 @@ checksum = "91d129178576168c589c9ec973feedf7d3126c01ac2bf08795109aa35b69fb8f"
 dependencies = [
  "proc-macro2",
  "quote",
- "syn 2.0.29",
+ "syn 2.0.38",
 ]
 
 [[package]]
@@ -16516,6 +16270,7 @@ dependencies = [
 name = "shell-runtime"
 version = "0.1.0"
 dependencies = [
+ "cumulus-pallet-aura-ext",
  "cumulus-pallet-parachain-system",
  "cumulus-pallet-xcm",
  "cumulus-primitives-core",
@@ -16523,13 +16278,17 @@ dependencies = [
  "frame-support",
  "frame-system",
  "frame-try-runtime",
+ "pallet-aura",
+ "pallet-timestamp",
  "parachain-info",
  "parachains-common",
  "parity-scale-codec",
  "scale-info",
  "sp-api",
  "sp-block-builder",
+ "sp-consensus-aura",
  "sp-core",
+ "sp-genesis-builder",
  "sp-inherents",
  "sp-offchain",
  "sp-runtime",
@@ -16537,10 +16296,10 @@ dependencies = [
  "sp-std",
  "sp-transaction-pool",
  "sp-version",
+ "staging-xcm",
+ "staging-xcm-builder",
+ "staging-xcm-executor",
  "substrate-wasm-builder",
- "xcm",
- "xcm-builder",
- "xcm-executor",
 ]
 
 [[package]]
@@ -16568,18 +16327,6 @@ dependencies = [
  "libc",
 ]
 
-[[package]]
-name = "signal-hook-tokio"
-version = "0.3.1"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "213241f76fb1e37e27de3b6aa1b068a2c333233b59cca6634f634b80a27ecf1e"
-dependencies = [
- "futures-core",
- "libc",
- "signal-hook",
- "tokio",
-]
-
 [[package]]
 name = "signature"
 version = "1.6.4"
@@ -16726,7 +16473,7 @@ dependencies = [
  "smallvec",
  "soketto",
  "twox-hash",
- "wasmi 0.31.0",
+ "wasmi",
  "x25519-dalek 2.0.0",
  "zeroize",
 ]
@@ -16780,14 +16527,14 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "0c9d1425eb528a21de2755c75af4c9b5d57f50a0d4c3b7f1828a4cd03f8ba155"
 dependencies = [
  "aes-gcm 0.9.4",
- "blake2",
+ "blake2 0.10.6",
  "chacha20poly1305",
  "curve25519-dalek 4.0.0",
  "rand_core 0.6.4",
  "ring 0.16.20",
  "rustc_version 0.4.0",
  "sha2 0.10.7",
- "subtle",
+ "subtle 2.4.1",
 ]
 
 [[package]]
@@ -16854,12 +16601,12 @@ version = "4.0.0-dev"
 dependencies = [
  "Inflector",
  "assert_matches",
- "blake2",
+ "blake2 0.10.6",
  "expander 2.0.0",
  "proc-macro-crate",
  "proc-macro2",
  "quote",
- "syn 2.0.29",
+ "syn 2.0.38",
 ]
 
 [[package]]
@@ -16936,100 +16683,6 @@ dependencies = [
  "sp-arithmetic",
 ]
 
-[[package]]
-name = "sp-ark-bls12-377"
-version = "0.4.0-beta"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "1b8e61a06f286f4e8565a67865ef52e83edabf447881898c94527ffc7b839177"
-dependencies = [
- "ark-bls12-377",
- "ark-ff",
- "ark-r1cs-std",
- "ark-scale",
- "ark-std",
- "parity-scale-codec",
- "sp-ark-models",
-]
-
-[[package]]
-name = "sp-ark-bls12-381"
-version = "0.4.0-beta"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "3352feef6c9c34022fa766a0c9a86a88a83d280a3e5b34781a1a9af98377a130"
-dependencies = [
- "ark-bls12-381",
- "ark-ff",
- "ark-scale",
- "ark-serialize",
- "ark-std",
- "parity-scale-codec",
- "sp-ark-models",
-]
-
-[[package]]
-name = "sp-ark-bw6-761"
-version = "0.4.0-beta"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "2bf069165e230aef3c4680edea2d8ab3caa89c039e0b61fad2b8e061fb393668"
-dependencies = [
- "ark-bw6-761",
- "ark-ff",
- "ark-scale",
- "ark-std",
- "parity-scale-codec",
- "sp-ark-models",
-]
-
-[[package]]
-name = "sp-ark-ed-on-bls12-377"
-version = "0.4.0-beta"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "e63f1fe8e7e87cb0258d61212b019d4d0fd230293ec42a564eb671c83d437497"
-dependencies = [
- "ark-ed-on-bls12-377",
- "ark-ff",
- "ark-r1cs-std",
- "ark-scale",
- "ark-serialize",
- "ark-std",
- "parity-scale-codec",
- "sp-ark-models",
-]
-
-[[package]]
-name = "sp-ark-ed-on-bls12-381-bandersnatch"
-version = "0.4.0-beta"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "838ddc5508aff3e89f930e7e7f3565d0786ac27868cfd61587afe681011e1140"
-dependencies = [
- "ark-ec",
- "ark-ed-on-bls12-381-bandersnatch",
- "ark-ff",
- "ark-r1cs-std",
- "ark-scale",
- "ark-std",
- "parity-scale-codec",
- "sp-ark-bls12-381",
- "sp-ark-models",
-]
-
-[[package]]
-name = "sp-ark-models"
-version = "0.4.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "28fa906b809d7a346b2aa32a4bd0c884a75f9f588f9a4a07272f63eaf8a10765"
-dependencies = [
- "ark-ec",
- "ark-ff",
- "ark-serialize",
- "ark-std",
- "derivative",
- "getrandom 0.2.10",
- "itertools 0.10.5",
- "num-traits",
- "zeroize",
-]
-
 [[package]]
 name = "sp-authority-discovery"
 version = "4.0.0-dev"
@@ -17122,7 +16775,7 @@ dependencies = [
 name = "sp-consensus-beefy"
 version = "4.0.0-dev"
 dependencies = [
- "array-bytes",
+ "array-bytes 6.1.0",
  "lazy_static",
  "parity-scale-codec",
  "scale-info",
@@ -17166,6 +16819,21 @@ dependencies = [
  "sp-std",
 ]
 
+[[package]]
+name = "sp-consensus-sassafras"
+version = "0.3.4-dev"
+dependencies = [
+ "parity-scale-codec",
+ "scale-info",
+ "serde",
+ "sp-api",
+ "sp-application-crypto",
+ "sp-consensus-slots",
+ "sp-core",
+ "sp-runtime",
+ "sp-std",
+]
+
 [[package]]
 name = "sp-consensus-slots"
 version = "0.10.0-dev"
@@ -17181,13 +16849,12 @@ dependencies = [
 name = "sp-core"
 version = "21.0.0"
 dependencies = [
- "array-bytes",
- "arrayvec 0.7.4",
+ "array-bytes 6.1.0",
  "bandersnatch_vrfs",
  "bitflags 1.3.2",
- "blake2",
+ "blake2 0.10.6",
  "bounded-collections",
- "bs58 0.4.0",
+ "bs58 0.5.0",
  "criterion 0.4.0",
  "dyn-clonable",
  "ed25519-zebra 3.1.0",
@@ -17245,32 +16912,20 @@ version = "9.0.0"
 dependencies = [
  "quote",
  "sp-core-hashing",
- "syn 2.0.29",
+ "syn 2.0.38",
 ]
 
 [[package]]
 name = "sp-crypto-ec-utils"
 version = "0.4.0"
 dependencies = [
- "ark-algebra-test-templates",
  "ark-bls12-377",
  "ark-bls12-381",
  "ark-bw6-761",
  "ark-ec",
  "ark-ed-on-bls12-377",
  "ark-ed-on-bls12-381-bandersnatch",
- "ark-ff",
  "ark-scale",
- "ark-serialize",
- "ark-std",
- "parity-scale-codec",
- "sp-ark-bls12-377",
- "sp-ark-bls12-381",
- "sp-ark-bw6-761",
- "sp-ark-ed-on-bls12-377",
- "sp-ark-ed-on-bls12-381-bandersnatch",
- "sp-ark-models",
- "sp-io",
  "sp-runtime-interface",
  "sp-std",
 ]
@@ -17289,7 +16944,7 @@ version = "8.0.0"
 dependencies = [
  "proc-macro2",
  "quote",
- "syn 2.0.29",
+ "syn 2.0.38",
 ]
 
 [[package]]
@@ -17331,7 +16986,7 @@ name = "sp-io"
 version = "23.0.0"
 dependencies = [
  "bytes",
- "ed25519-dalek 2.0.0",
+ "ed25519-dalek",
  "libsecp256k1",
  "log",
  "parity-scale-codec",
@@ -17390,11 +17045,22 @@ dependencies = [
  "sp-std",
 ]
 
+[[package]]
+name = "sp-mixnet"
+version = "0.1.0-dev"
+dependencies = [
+ "parity-scale-codec",
+ "scale-info",
+ "sp-api",
+ "sp-application-crypto",
+ "sp-std",
+]
+
 [[package]]
 name = "sp-mmr-primitives"
 version = "4.0.0-dev"
 dependencies = [
- "array-bytes",
+ "array-bytes 6.1.0",
  "ckb-merkle-mountain-range",
  "log",
  "parity-scale-codec",
@@ -17427,7 +17093,7 @@ dependencies = [
 name = "sp-npos-elections-fuzzer"
 version = "2.0.0-alpha.5"
 dependencies = [
- "clap 4.4.0",
+ "clap 4.4.6",
  "honggfuzz",
  "rand 0.8.5",
  "sp-npos-elections",
@@ -17520,7 +17186,7 @@ dependencies = [
  "proc-macro-crate",
  "proc-macro2",
  "quote",
- "syn 2.0.29",
+ "syn 2.0.38",
 ]
 
 [[package]]
@@ -17592,7 +17258,7 @@ dependencies = [
 name = "sp-state-machine"
 version = "0.28.0"
 dependencies = [
- "array-bytes",
+ "array-bytes 6.1.0",
  "assert_matches",
  "hash-db",
  "log",
@@ -17618,7 +17284,7 @@ version = "4.0.0-dev"
 dependencies = [
  "aes-gcm 0.10.2",
  "curve25519-dalek 4.0.0",
- "ed25519-dalek 2.0.0",
+ "ed25519-dalek",
  "hkdf",
  "parity-scale-codec",
  "rand 0.8.5",
@@ -17684,7 +17350,7 @@ dependencies = [
  "sp-std",
  "tracing",
  "tracing-core",
- "tracing-subscriber 0.2.25",
+ "tracing-subscriber",
 ]
 
 [[package]]
@@ -17714,7 +17380,7 @@ name = "sp-trie"
 version = "22.0.0"
 dependencies = [
  "ahash 0.8.3",
- "array-bytes",
+ "array-bytes 6.1.0",
  "criterion 0.4.0",
  "hash-db",
  "hashbrown 0.13.2",
@@ -17760,7 +17426,7 @@ dependencies = [
  "proc-macro2",
  "quote",
  "sp-version",
- "syn 2.0.29",
+ "syn 2.0.38",
 ]
 
 [[package]]
@@ -17854,44 +17520,71 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "a8f112729512f8e442d81f95a8a7ddf2b7c6b8a1a6f509a95864142b30cab2d3"
 
 [[package]]
-name = "staking-miner"
+name = "staging-xcm"
 version = "1.0.0"
 dependencies = [
- "assert_cmd",
- "clap 4.4.0",
- "exitcode",
- "frame-election-provider-support",
- "frame-remote-externalities",
+ "bounded-collections",
+ "derivative",
+ "environmental",
+ "hex",
+ "hex-literal",
+ "impl-trait-for-tuples",
+ "log",
+ "parity-scale-codec",
+ "scale-info",
+ "serde",
+ "sp-io",
+ "sp-weights",
+ "xcm-procedural",
+]
+
+[[package]]
+name = "staging-xcm-builder"
+version = "1.0.0"
+dependencies = [
+ "assert_matches",
  "frame-support",
  "frame-system",
- "futures-util",
- "jsonrpsee",
- "kusama-runtime",
+ "impl-trait-for-tuples",
  "log",
+ "pallet-assets",
  "pallet-balances",
- "pallet-election-provider-multi-phase",
- "pallet-staking",
+ "pallet-salary",
  "pallet-transaction-payment",
+ "pallet-xcm",
  "parity-scale-codec",
- "paste",
- "polkadot-core-primitives",
- "polkadot-runtime",
- "polkadot-runtime-common",
- "sc-transaction-pool-api",
- "serde",
- "serde_json",
- "signal-hook",
- "signal-hook-tokio",
+ "polkadot-parachain-primitives",
+ "polkadot-primitives",
+ "polkadot-runtime-parachains",
+ "polkadot-test-runtime",
+ "primitive-types",
+ "scale-info",
+ "sp-arithmetic",
+ "sp-io",
+ "sp-runtime",
+ "sp-std",
+ "sp-weights",
+ "staging-xcm",
+ "staging-xcm-executor",
+]
+
+[[package]]
+name = "staging-xcm-executor"
+version = "1.0.0"
+dependencies = [
+ "environmental",
+ "frame-benchmarking",
+ "frame-support",
+ "impl-trait-for-tuples",
+ "log",
+ "parity-scale-codec",
+ "sp-arithmetic",
  "sp-core",
- "sp-npos-elections",
+ "sp-io",
  "sp-runtime",
- "sp-state-machine",
- "sp-version",
- "sub-tokens",
- "thiserror",
- "tokio",
- "tracing-subscriber 0.3.17",
- "westend-runtime",
+ "sp-std",
+ "sp-weights",
+ "staging-xcm",
 ]
 
 [[package]]
@@ -17993,7 +17686,7 @@ dependencies = [
  "md-5",
  "rand 0.8.5",
  "ring 0.16.20",
- "subtle",
+ "subtle 2.4.1",
  "thiserror",
  "tokio",
  "url",
@@ -18001,19 +17694,30 @@ dependencies = [
 ]
 
 [[package]]
-name = "sub-tokens"
-version = "0.1.0"
-source = "git+https://github.com/paritytech/substrate-debug-kit?branch=master#e12503ab781e913735dc389865a3b8b4a6c6399d"
+name = "subkey"
+version = "3.0.0"
 dependencies = [
- "separator",
+ "clap 4.4.6",
+ "sc-cli",
 ]
 
 [[package]]
-name = "subkey"
-version = "3.0.0"
+name = "substrate"
+version = "1.0.0"
 dependencies = [
- "clap 4.4.0",
+ "aquamarine",
+ "chain-spec-builder",
+ "frame-support",
  "sc-cli",
+ "sc-consensus-aura",
+ "sc-consensus-babe",
+ "sc-consensus-beefy",
+ "sc-consensus-grandpa",
+ "sc-consensus-manual-seal",
+ "sc-consensus-pow",
+ "sc-service",
+ "sp-runtime",
+ "subkey",
 ]
 
 [[package]]
@@ -18054,7 +17758,7 @@ dependencies = [
 name = "substrate-frame-cli"
 version = "4.0.0-dev"
 dependencies = [
- "clap 4.4.0",
+ "clap 4.4.6",
  "frame-support",
  "frame-system",
  "sc-cli",
@@ -18148,7 +17852,7 @@ dependencies = [
 name = "substrate-test-client"
 version = "2.0.1"
 dependencies = [
- "array-bytes",
+ "array-bytes 6.1.0",
  "async-trait",
  "futures",
  "parity-scale-codec",
@@ -18173,7 +17877,7 @@ dependencies = [
 name = "substrate-test-runtime"
 version = "2.0.0"
 dependencies = [
- "array-bytes",
+ "array-bytes 6.1.0",
  "frame-executive",
  "frame-support",
  "frame-system",
@@ -18257,30 +17961,10 @@ version = "4.0.0-dev"
 dependencies = [
  "futures",
  "sc-service",
- "substrate-test-utils-derive",
  "tokio",
  "trybuild",
 ]
 
-[[package]]
-name = "substrate-test-utils-derive"
-version = "0.10.0-dev"
-dependencies = [
- "proc-macro-crate",
- "proc-macro2",
- "quote",
- "syn 2.0.29",
-]
-
-[[package]]
-name = "substrate-test-utils-test-crate"
-version = "0.1.0"
-dependencies = [
- "sc-service",
- "substrate-test-utils",
- "tokio",
-]
-
 [[package]]
 name = "substrate-wasm-builder"
 version = "5.0.0-dev"
@@ -18307,6 +17991,12 @@ dependencies = [
  "autocfg",
 ]
 
+[[package]]
+name = "subtle"
+version = "1.0.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "2d67a5a62ba6e01cb2192ff309324cb4875d0c451d55fe2319433abe7a05a8ee"
+
 [[package]]
 name = "subtle"
 version = "2.4.1"
@@ -18423,9 +18113,9 @@ dependencies = [
 
 [[package]]
 name = "syn"
-version = "2.0.29"
+version = "2.0.38"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "c324c494eba9d92503e6f1ef2e6df781e78f6a7705a0202d9801b198807d518a"
+checksum = "e96b79aaa137db8f61e26363a0c9b47d8b4ec75da28b7d1d614c2303e232408b"
 dependencies = [
  "proc-macro2",
  "quote",
@@ -18522,7 +18212,7 @@ version = "1.0.0"
 dependencies = [
  "dlmalloc",
  "parity-scale-codec",
- "polkadot-parachain",
+ "polkadot-parachain-primitives",
  "sp-io",
  "sp-std",
  "substrate-wasm-builder",
@@ -18533,7 +18223,7 @@ dependencies = [
 name = "test-parachain-adder-collator"
 version = "1.0.0"
 dependencies = [
- "clap 4.4.0",
+ "clap 4.4.6",
  "futures",
  "futures-timer",
  "log",
@@ -18542,7 +18232,7 @@ dependencies = [
  "polkadot-node-core-pvf",
  "polkadot-node-primitives",
  "polkadot-node-subsystem",
- "polkadot-parachain",
+ "polkadot-parachain-primitives",
  "polkadot-primitives",
  "polkadot-service",
  "polkadot-test-service",
@@ -18552,7 +18242,6 @@ dependencies = [
  "sp-keyring",
  "substrate-test-utils",
  "test-parachain-adder",
- "test-parachain-adder-collator",
  "tokio",
 ]
 
@@ -18571,7 +18260,7 @@ dependencies = [
  "dlmalloc",
  "log",
  "parity-scale-codec",
- "polkadot-parachain",
+ "polkadot-parachain-primitives",
  "sp-io",
  "sp-std",
  "substrate-wasm-builder",
@@ -18582,7 +18271,7 @@ dependencies = [
 name = "test-parachain-undying-collator"
 version = "1.0.0"
 dependencies = [
- "clap 4.4.0",
+ "clap 4.4.6",
  "futures",
  "futures-timer",
  "log",
@@ -18591,7 +18280,7 @@ dependencies = [
  "polkadot-node-core-pvf",
  "polkadot-node-primitives",
  "polkadot-node-subsystem",
- "polkadot-parachain",
+ "polkadot-parachain-primitives",
  "polkadot-primitives",
  "polkadot-service",
  "polkadot-test-service",
@@ -18601,7 +18290,6 @@ dependencies = [
  "sp-keyring",
  "substrate-test-utils",
  "test-parachain-undying",
- "test-parachain-undying-collator",
  "tokio",
 ]
 
@@ -18637,9 +18325,9 @@ checksum = "222a222a5bfe1bba4a77b45ec488a741b3cb8872e5e499451fd7d0129c9c7c3d"
 
 [[package]]
 name = "thiserror"
-version = "1.0.47"
+version = "1.0.48"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "97a802ec30afc17eee47b2855fc72e0c4cd62be9b4efe6591edde0ec5bd68d8f"
+checksum = "9d6d7a740b8a666a7e828dd00da9c0dc290dff53154ea77ac109281de90589b7"
 dependencies = [
  "thiserror-impl",
 ]
@@ -18666,13 +18354,13 @@ dependencies = [
 
 [[package]]
 name = "thiserror-impl"
-version = "1.0.47"
+version = "1.0.48"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "6bb623b56e39ab7dcd4b1b98bb6c8f8d907ed255b18de254088016b27a8ee19b"
+checksum = "49922ecae66cc8a249b77e68d1d0623c1b2c514f0060c27cdc68bd62a1219d35"
 dependencies = [
  "proc-macro2",
  "quote",
- "syn 2.0.29",
+ "syn 2.0.38",
 ]
 
 [[package]]
@@ -18744,17 +18432,6 @@ dependencies = [
  "tikv-jemalloc-sys",
 ]
 
-[[package]]
-name = "time"
-version = "0.1.45"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "1b797afad3f312d1c66a56d11d0316f916356d11bd158fbc6ca6389ff6bf805a"
-dependencies = [
- "libc",
- "wasi 0.10.0+wasi-snapshot-preview1",
- "winapi",
-]
-
 [[package]]
 name = "time"
 version = "0.3.27"
@@ -18863,7 +18540,7 @@ checksum = "630bdcf245f78637c13ec01ffae6187cca34625e8c63150d424b59e55af2675e"
 dependencies = [
  "proc-macro2",
  "quote",
- "syn 2.0.29",
+ "syn 2.0.38",
 ]
 
 [[package]]
@@ -19044,7 +18721,7 @@ checksum = "5f4f31f56159e98206da9efd823404b79b6ef3143b4a7ab76e67b1751b25a4ab"
 dependencies = [
  "proc-macro2",
  "quote",
- "syn 2.0.29",
+ "syn 2.0.38",
 ]
 
 [[package]]
@@ -19087,7 +18764,7 @@ dependencies = [
  "proc-macro-crate",
  "proc-macro2",
  "quote",
- "syn 2.0.29",
+ "syn 2.0.38",
 ]
 
 [[package]]
@@ -19120,7 +18797,7 @@ dependencies = [
  "ansi_term",
  "chrono",
  "lazy_static",
- "matchers 0.0.1",
+ "matchers",
  "parking_lot 0.11.2",
  "regex",
  "serde",
@@ -19134,29 +18811,11 @@ dependencies = [
  "tracing-serde",
 ]
 
-[[package]]
-name = "tracing-subscriber"
-version = "0.3.17"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "30a651bc37f915e81f087d86e62a18eec5f79550c7faff886f7090b4ea757c77"
-dependencies = [
- "matchers 0.1.0",
- "nu-ansi-term",
- "once_cell",
- "regex",
- "sharded-slab",
- "smallvec",
- "thread_local",
- "tracing",
- "tracing-core",
- "tracing-log",
-]
-
 [[package]]
 name = "trie-bench"
-version = "0.37.0"
+version = "0.38.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "4f54b4f9d51d368e62cf7e0730c7c1e18fc658cc84333656bab5b328f44aa964"
+checksum = "a4680cb226e31d2a096592d0edecdda91cc371743002f80c0f8cf80219819b3b"
 dependencies = [
  "criterion 0.4.0",
  "hash-db",
@@ -19170,9 +18829,9 @@ dependencies = [
 
 [[package]]
 name = "trie-db"
-version = "0.27.1"
+version = "0.28.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "767abe6ffed88a1889671a102c2861ae742726f52e0a5a425b92c9fbfa7e9c85"
+checksum = "ff28e0f815c2fea41ebddf148e008b077d2faddb026c9555b29696114d602642"
 dependencies = [
  "hash-db",
  "hashbrown 0.13.2",
@@ -19258,7 +18917,7 @@ version = "0.10.0-dev"
 dependencies = [
  "assert_cmd",
  "async-trait",
- "clap 4.4.0",
+ "clap 4.4.6",
  "frame-remote-externalities",
  "frame-try-runtime",
  "hex",
@@ -19429,7 +19088,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "9f214e8f697e925001e66ec2c6e37a4ef93f0f78c2eed7814394e10c62025b05"
 dependencies = [
  "generic-array 0.14.7",
- "subtle",
+ "subtle 2.4.1",
 ]
 
 [[package]]
@@ -19439,7 +19098,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "fc1de2c688dc15305988b563c3854064043356019f97a4b46276fe734c4f07ea"
 dependencies = [
  "crypto-common",
- "subtle",
+ "subtle 2.4.1",
 ]
 
 [[package]]
@@ -19625,12 +19284,6 @@ version = "0.9.0+wasi-snapshot-preview1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "cccddf32554fecc6acb585f82a32a72e28b48f8c4c1883ddfeeeaa96f7d8e519"
 
-[[package]]
-name = "wasi"
-version = "0.10.0+wasi-snapshot-preview1"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "1a143597ca7c7793eff794def352d41792a93c481eb1042423ff7ff72ba2c31f"
-
 [[package]]
 name = "wasi"
 version = "0.11.0+wasi-snapshot-preview1"
@@ -19660,7 +19313,7 @@ dependencies = [
  "once_cell",
  "proc-macro2",
  "quote",
- "syn 2.0.29",
+ "syn 2.0.38",
  "wasm-bindgen-shared",
 ]
 
@@ -19694,7 +19347,7 @@ checksum = "54681b18a46765f095758388f2d0cf16eb8d4169b639ab575a8f5693af210c7b"
 dependencies = [
  "proc-macro2",
  "quote",
- "syn 2.0.29",
+ "syn 2.0.38",
  "wasm-bindgen-backend",
  "wasm-bindgen-shared",
 ]
@@ -19787,20 +19440,6 @@ dependencies = [
  "web-sys",
 ]
 
-[[package]]
-name = "wasmi"
-version = "0.30.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "e51fb5c61993e71158abf5bb863df2674ca3ec39ed6471c64f07aeaf751d67b4"
-dependencies = [
- "intx",
- "smallvec",
- "spin 0.9.8",
- "wasmi_arena",
- "wasmi_core 0.12.0",
- "wasmparser-nostd",
-]
-
 [[package]]
 name = "wasmi"
 version = "0.31.0"
@@ -19810,7 +19449,7 @@ dependencies = [
  "smallvec",
  "spin 0.9.8",
  "wasmi_arena",
- "wasmi_core 0.13.0",
+ "wasmi_core",
  "wasmparser-nostd",
 ]
 
@@ -19820,18 +19459,6 @@ version = "0.4.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "401c1f35e413fac1846d4843745589d9ec678977ab35a384db8ae7830525d468"
 
-[[package]]
-name = "wasmi_core"
-version = "0.12.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "624e6333e861ef49095d2d678b76ebf30b06bf37effca845be7e5b87c90071b7"
-dependencies = [
- "downcast-rs",
- "libm",
- "num-traits",
- "paste",
-]
-
 [[package]]
 name = "wasmi_core"
 version = "0.13.0"
@@ -20159,7 +19786,7 @@ dependencies = [
  "sha2 0.10.7",
  "stun",
  "thiserror",
- "time 0.3.27",
+ "time",
  "tokio",
  "turn",
  "url",
@@ -20220,7 +19847,7 @@ dependencies = [
  "sha1",
  "sha2 0.10.7",
  "signature 1.6.4",
- "subtle",
+ "subtle 2.4.1",
  "thiserror",
  "tokio",
  "webpki 0.21.4",
@@ -20314,7 +19941,7 @@ dependencies = [
  "rtcp",
  "rtp",
  "sha-1 0.9.8",
- "subtle",
+ "subtle 2.4.1",
  "thiserror",
  "tokio",
  "webrtc-util",
@@ -20356,8 +19983,9 @@ dependencies = [
  "frame-system-benchmarking",
  "frame-system-rpc-runtime-api",
  "frame-try-runtime",
- "hex-literal 0.4.1",
+ "hex-literal",
  "log",
+ "pallet-asset-rate",
  "pallet-authority-discovery",
  "pallet-authorship",
  "pallet-babe",
@@ -20366,6 +19994,7 @@ dependencies = [
  "pallet-beefy",
  "pallet-beefy-mmr",
  "pallet-collective",
+ "pallet-conviction-voting",
  "pallet-democracy",
  "pallet-election-provider-multi-phase",
  "pallet-election-provider-support-benchmarking",
@@ -20387,6 +20016,7 @@ dependencies = [
  "pallet-preimage",
  "pallet-proxy",
  "pallet-recovery",
+ "pallet-referenda",
  "pallet-scheduler",
  "pallet-session",
  "pallet-session-benchmarking",
@@ -20402,10 +20032,11 @@ dependencies = [
  "pallet-treasury",
  "pallet-utility",
  "pallet-vesting",
+ "pallet-whitelist",
  "pallet-xcm",
  "pallet-xcm-benchmarks",
  "parity-scale-codec",
- "polkadot-parachain",
+ "polkadot-parachain-primitives",
  "polkadot-primitives",
  "polkadot-runtime-common",
  "polkadot-runtime-parachains",
@@ -20417,11 +20048,13 @@ dependencies = [
  "smallvec",
  "sp-api",
  "sp-application-crypto",
+ "sp-arithmetic",
  "sp-authority-discovery",
  "sp-block-builder",
  "sp-consensus-babe",
  "sp-consensus-beefy",
  "sp-core",
+ "sp-genesis-builder",
  "sp-inherents",
  "sp-io",
  "sp-keyring",
@@ -20436,13 +20069,13 @@ dependencies = [
  "sp-tracing",
  "sp-transaction-pool",
  "sp-version",
+ "staging-xcm",
+ "staging-xcm-builder",
+ "staging-xcm-executor",
  "substrate-wasm-builder",
  "tiny-keccak",
  "tokio",
  "westend-runtime-constants",
- "xcm",
- "xcm-builder",
- "xcm-executor",
 ]
 
 [[package]]
@@ -20767,7 +20400,7 @@ dependencies = [
  "ring 0.16.20",
  "rusticata-macros",
  "thiserror",
- "time 0.3.27",
+ "time",
 ]
 
 [[package]]
@@ -20785,7 +20418,7 @@ dependencies = [
  "oid-registry 0.6.1",
  "rusticata-macros",
  "thiserror",
- "time 0.3.27",
+ "time",
 ]
 
 [[package]]
@@ -20797,61 +20430,11 @@ dependencies = [
  "libc",
 ]
 
-[[package]]
-name = "xcm"
-version = "1.0.0"
-dependencies = [
- "bounded-collections",
- "derivative",
- "hex",
- "hex-literal 0.4.1",
- "impl-trait-for-tuples",
- "log",
- "parity-scale-codec",
- "scale-info",
- "serde",
- "sp-io",
- "sp-weights",
- "xcm-procedural",
-]
-
-[[package]]
-name = "xcm-builder"
-version = "1.0.0"
-dependencies = [
- "assert_matches",
- "frame-support",
- "frame-system",
- "impl-trait-for-tuples",
- "log",
- "pallet-assets",
- "pallet-balances",
- "pallet-salary",
- "pallet-transaction-payment",
- "pallet-xcm",
- "parity-scale-codec",
- "polkadot-parachain",
- "polkadot-primitives",
- "polkadot-runtime-parachains",
- "polkadot-test-runtime",
- "primitive-types",
- "scale-info",
- "sp-arithmetic",
- "sp-io",
- "sp-runtime",
- "sp-std",
- "sp-weights",
- "xcm",
- "xcm-executor",
-]
-
 [[package]]
 name = "xcm-emulator"
 version = "0.1.0"
 dependencies = [
- "cumulus-pallet-dmp-queue",
  "cumulus-pallet-parachain-system",
- "cumulus-pallet-xcmp-queue",
  "cumulus-primitives-core",
  "cumulus-primitives-parachain-inherent",
  "cumulus-test-relay-sproof-builder",
@@ -20862,10 +20445,10 @@ dependencies = [
  "log",
  "pallet-balances",
  "pallet-message-queue",
- "parachain-info",
  "parachains-common",
  "parity-scale-codec",
  "paste",
+ "polkadot-parachain-primitives",
  "polkadot-primitives",
  "polkadot-runtime-parachains",
  "sp-arithmetic",
@@ -20873,28 +20456,9 @@ dependencies = [
  "sp-io",
  "sp-runtime",
  "sp-std",
- "sp-trie",
- "xcm",
- "xcm-executor",
-]
-
-[[package]]
-name = "xcm-executor"
-version = "1.0.0"
-dependencies = [
- "environmental",
- "frame-benchmarking",
- "frame-support",
- "impl-trait-for-tuples",
- "log",
- "parity-scale-codec",
- "sp-arithmetic",
- "sp-core",
- "sp-io",
- "sp-runtime",
- "sp-std",
- "sp-weights",
- "xcm",
+ "sp-tracing",
+ "staging-xcm",
+ "staging-xcm-executor",
 ]
 
 [[package]]
@@ -20914,8 +20478,8 @@ dependencies = [
  "sp-runtime",
  "sp-state-machine",
  "sp-tracing",
- "xcm",
- "xcm-executor",
+ "staging-xcm",
+ "staging-xcm-executor",
 ]
 
 [[package]]
@@ -20925,7 +20489,7 @@ dependencies = [
  "Inflector",
  "proc-macro2",
  "quote",
- "syn 2.0.29",
+ "syn 2.0.38",
 ]
 
 [[package]]
@@ -20936,13 +20500,13 @@ dependencies = [
  "parity-scale-codec",
  "paste",
  "polkadot-core-primitives",
- "polkadot-parachain",
+ "polkadot-parachain-primitives",
  "polkadot-runtime-parachains",
  "sp-io",
  "sp-std",
- "xcm",
- "xcm-builder",
- "xcm-executor",
+ "staging-xcm",
+ "staging-xcm-builder",
+ "staging-xcm-executor",
 ]
 
 [[package]]
@@ -20958,7 +20522,7 @@ dependencies = [
  "pallet-xcm",
  "parity-scale-codec",
  "polkadot-core-primitives",
- "polkadot-parachain",
+ "polkadot-parachain-primitives",
  "polkadot-runtime-parachains",
  "scale-info",
  "sp-core",
@@ -20966,9 +20530,9 @@ dependencies = [
  "sp-runtime",
  "sp-std",
  "sp-tracing",
- "xcm",
- "xcm-builder",
- "xcm-executor",
+ "staging-xcm",
+ "staging-xcm-builder",
+ "staging-xcm-executor",
  "xcm-simulator",
 ]
 
@@ -20985,16 +20549,16 @@ dependencies = [
  "pallet-xcm",
  "parity-scale-codec",
  "polkadot-core-primitives",
- "polkadot-parachain",
+ "polkadot-parachain-primitives",
  "polkadot-runtime-parachains",
  "scale-info",
  "sp-core",
  "sp-io",
  "sp-runtime",
  "sp-std",
- "xcm",
- "xcm-builder",
- "xcm-executor",
+ "staging-xcm",
+ "staging-xcm-builder",
+ "staging-xcm-executor",
  "xcm-simulator",
 ]
 
@@ -21024,7 +20588,7 @@ version = "0.5.2"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "e17bb3549cc1321ae1296b9cdc2698e2b6cb1992adfa19a8c72e5b7a738f44cd"
 dependencies = [
- "time 0.3.27",
+ "time",
 ]
 
 [[package]]
@@ -21044,7 +20608,7 @@ checksum = "ce36e65b0d2999d2aafac989fb249189a141aee1f53c612c1f37d72631959f69"
 dependencies = [
  "proc-macro2",
  "quote",
- "syn 2.0.29",
+ "syn 2.0.38",
 ]
 
 [[package]]
diff --git a/Cargo.toml b/Cargo.toml
index ab10fe5bb75958fd85fbaeeb76339bf1b8adc28f..6ba153329d55e1df19b0839dce496974bba5365c 100644
--- a/Cargo.toml
+++ b/Cargo.toml
@@ -1,32 +1,39 @@
+[workspace.package]
+authors = ["Parity Technologies <admin@parity.io>"]
+edition = "2021"
+repository = "https://github.com/paritytech/polkadot-sdk.git"
+license = "GPL-3.0-only"
+
 [workspace]
 resolver = "2"
 
 members = [
-	"cumulus/bridges/bin/runtime-common",
-	"cumulus/bridges/modules/grandpa",
-	"cumulus/bridges/modules/messages",
-	"cumulus/bridges/modules/parachains",
-	"cumulus/bridges/modules/relayers",
-	"cumulus/bridges/modules/xcm-bridge-hub-router",
-	"cumulus/bridges/primitives/chain-asset-hub-kusama",
-	"cumulus/bridges/primitives/chain-asset-hub-polkadot",
-	"cumulus/bridges/primitives/chain-bridge-hub-cumulus",
-	"cumulus/bridges/primitives/chain-bridge-hub-kusama",
-	"cumulus/bridges/primitives/chain-bridge-hub-polkadot",
-	"cumulus/bridges/primitives/chain-bridge-hub-rococo",
-	"cumulus/bridges/primitives/chain-bridge-hub-wococo",
-	"cumulus/bridges/primitives/chain-kusama",
-	"cumulus/bridges/primitives/chain-polkadot",
-	"cumulus/bridges/primitives/chain-rococo",
-	"cumulus/bridges/primitives/chain-wococo",
-	"cumulus/bridges/primitives/header-chain",
-	"cumulus/bridges/primitives/messages",
-	"cumulus/bridges/primitives/parachains",
-	"cumulus/bridges/primitives/polkadot-core",
-	"cumulus/bridges/primitives/relayers",
-	"cumulus/bridges/primitives/runtime",
-	"cumulus/bridges/primitives/test-utils",
-	"cumulus/bridges/primitives/xcm-bridge-hub-router",
+	"bridges/bin/runtime-common",
+	"bridges/modules/grandpa",
+	"bridges/modules/messages",
+	"bridges/modules/parachains",
+	"bridges/modules/relayers",
+	"bridges/modules/xcm-bridge-hub-router",
+	"bridges/primitives/chain-asset-hub-kusama",
+	"bridges/primitives/chain-asset-hub-polkadot",
+	"bridges/primitives/chain-bridge-hub-cumulus",
+	"bridges/primitives/chain-bridge-hub-kusama",
+	"bridges/primitives/chain-bridge-hub-polkadot",
+	"bridges/primitives/chain-bridge-hub-rococo",
+	"bridges/primitives/chain-bridge-hub-wococo",
+	"bridges/primitives/chain-kusama",
+	"bridges/primitives/chain-polkadot",
+	"bridges/primitives/chain-polkadot-bulletin",
+	"bridges/primitives/chain-rococo",
+	"bridges/primitives/chain-wococo",
+	"bridges/primitives/header-chain",
+	"bridges/primitives/messages",
+	"bridges/primitives/parachains",
+	"bridges/primitives/polkadot-core",
+	"bridges/primitives/relayers",
+	"bridges/primitives/runtime",
+	"bridges/primitives/test-utils",
+	"bridges/primitives/xcm-bridge-hub-router",
 	"cumulus/client/cli",
 	"cumulus/client/collator",
 	"cumulus/client/consensus/aura",
@@ -53,12 +60,11 @@ members = [
 	"cumulus/parachain-template/pallets/template",
 	"cumulus/parachain-template/runtime",
 	"cumulus/parachains/common",
-	"cumulus/parachains/integration-tests/emulated/assets/asset-hub-kusama",
-	"cumulus/parachains/integration-tests/emulated/assets/asset-hub-polkadot",
+	"cumulus/parachains/integration-tests/emulated/assets/asset-hub-rococo",
 	"cumulus/parachains/integration-tests/emulated/assets/asset-hub-westend",
 	"cumulus/parachains/integration-tests/emulated/bridges/bridge-hub-rococo",
-	"cumulus/parachains/integration-tests/emulated/collectives/collectives-polkadot",
 	"cumulus/parachains/integration-tests/emulated/common",
+	"cumulus/parachains/pallets/collective-content",
 	"cumulus/parachains/pallets/parachain-info",
 	"cumulus/parachains/pallets/ping",
 	"cumulus/parachains/runtimes/assets/asset-hub-kusama",
@@ -86,7 +92,6 @@ members = [
 	"cumulus/primitives/utility",
 	"cumulus/test/client",
 	"cumulus/test/relay-sproof-builder",
-	"cumulus/test/relay-validation-worker-provider",
 	"cumulus/test/runtime",
 	"cumulus/test/service",
 	"cumulus/xcm/xcm-emulator",
@@ -107,11 +112,11 @@ members = [
 	"polkadot/node/core/parachains-inherent",
 	"polkadot/node/core/prospective-parachains",
 	"polkadot/node/core/provisioner",
+	"polkadot/node/core/pvf-checker",
 	"polkadot/node/core/pvf",
 	"polkadot/node/core/pvf/common",
 	"polkadot/node/core/pvf/execute-worker",
 	"polkadot/node/core/pvf/prepare-worker",
-	"polkadot/node/core/pvf-checker",
 	"polkadot/node/core/runtime-api",
 	"polkadot/node/gum",
 	"polkadot/node/gum/proc-macro",
@@ -131,12 +136,11 @@ members = [
 	"polkadot/node/overseer",
 	"polkadot/node/primitives",
 	"polkadot/node/service",
-	"polkadot/node/subsystem",
 	"polkadot/node/subsystem-test-helpers",
 	"polkadot/node/subsystem-types",
 	"polkadot/node/subsystem-util",
+	"polkadot/node/subsystem",
 	"polkadot/node/test/client",
-	"polkadot/node/test/performance-test",
 	"polkadot/node/test/service",
 	"polkadot/node/zombienet-backchannel",
 	"polkadot/parachain",
@@ -151,12 +155,8 @@ members = [
 	"polkadot/rpc",
 	"polkadot/runtime/common",
 	"polkadot/runtime/common/slot_range_helper",
-	"polkadot/runtime/kusama",
-	"polkadot/runtime/kusama/constants",
 	"polkadot/runtime/metrics",
 	"polkadot/runtime/parachains",
-	"polkadot/runtime/polkadot",
-	"polkadot/runtime/polkadot/constants",
 	"polkadot/runtime/rococo",
 	"polkadot/runtime/rococo/constants",
 	"polkadot/runtime/test-runtime",
@@ -166,10 +166,9 @@ members = [
 	"polkadot/statement-table",
 	"polkadot/utils/generate-bags",
 	"polkadot/utils/remote-ext-tests/bags-list",
-	"polkadot/utils/staking-miner",
 	"polkadot/xcm",
-	"polkadot/xcm/pallet-xcm",
 	"polkadot/xcm/pallet-xcm-benchmarks",
+	"polkadot/xcm/pallet-xcm",
 	"polkadot/xcm/procedural",
 	"polkadot/xcm/xcm-builder",
 	"polkadot/xcm/xcm-executor",
@@ -177,6 +176,10 @@ members = [
 	"polkadot/xcm/xcm-simulator",
 	"polkadot/xcm/xcm-simulator/example",
 	"polkadot/xcm/xcm-simulator/fuzzer",
+	"substrate",
+	"substrate/bin/node-template/node",
+	"substrate/bin/node-template/pallets/template",
+	"substrate/bin/node-template/runtime",
 	"substrate/bin/node/bench",
 	"substrate/bin/node/cli",
 	"substrate/bin/node/executor",
@@ -185,9 +188,6 @@ members = [
 	"substrate/bin/node/rpc",
 	"substrate/bin/node/runtime",
 	"substrate/bin/node/testing",
-	"substrate/bin/node-template/node",
-	"substrate/bin/node-template/pallets/template",
-	"substrate/bin/node-template/runtime",
 	"substrate/bin/utils/chain-spec-builder",
 	"substrate/bin/utils/subkey",
 	"substrate/client/allocator",
@@ -219,6 +219,8 @@ members = [
 	"substrate/client/keystore",
 	"substrate/client/merkle-mountain-range",
 	"substrate/client/merkle-mountain-range/rpc",
+	"substrate/client/mixnet",
+	"substrate/client/network-gossip",
 	"substrate/client/network",
 	"substrate/client/network/bitswap",
 	"substrate/client/network/common",
@@ -227,13 +229,12 @@ members = [
 	"substrate/client/network/sync",
 	"substrate/client/network/test",
 	"substrate/client/network/transactions",
-	"substrate/client/network-gossip",
 	"substrate/client/offchain",
 	"substrate/client/proposer-metrics",
-	"substrate/client/rpc",
 	"substrate/client/rpc-api",
 	"substrate/client/rpc-servers",
 	"substrate/client/rpc-spec-v2",
+	"substrate/client/rpc",
 	"substrate/client/service",
 	"substrate/client/service/test",
 	"substrate/client/state-db",
@@ -260,8 +261,8 @@ members = [
 	"substrate/frame/bags-list/fuzzer",
 	"substrate/frame/bags-list/remote-tests",
 	"substrate/frame/balances",
-	"substrate/frame/beefy",
 	"substrate/frame/beefy-mmr",
+	"substrate/frame/beefy",
 	"substrate/frame/benchmarking",
 	"substrate/frame/benchmarking/pov",
 	"substrate/frame/bounties",
@@ -300,6 +301,7 @@ members = [
 	"substrate/frame/membership",
 	"substrate/frame/merkle-mountain-range",
 	"substrate/frame/message-queue",
+	"substrate/frame/mixnet",
 	"substrate/frame/multisig",
 	"substrate/frame/nft-fractionalization",
 	"substrate/frame/nfts",
@@ -345,6 +347,8 @@ members = [
 	"substrate/frame/support/test",
 	"substrate/frame/support/test/compile_pass",
 	"substrate/frame/support/test/pallet",
+	"substrate/frame/support/test/stg_frame_crate/frame",
+	"substrate/frame/support/test/stg_frame_crate",
 	"substrate/frame/system",
 	"substrate/frame/system/benchmarking",
 	"substrate/frame/system/rpc/runtime-api",
@@ -379,6 +383,7 @@ members = [
 	"substrate/primitives/consensus/common",
 	"substrate/primitives/consensus/grandpa",
 	"substrate/primitives/consensus/pow",
+	"substrate/primitives/consensus/sassafras",
 	"substrate/primitives/consensus/slots",
 	"substrate/primitives/core",
 	"substrate/primitives/core/hashing",
@@ -395,17 +400,18 @@ members = [
 	"substrate/primitives/maybe-compressed-blob",
 	"substrate/primitives/merkle-mountain-range",
 	"substrate/primitives/metadata-ir",
+	"substrate/primitives/mixnet",
 	"substrate/primitives/npos-elections",
 	"substrate/primitives/npos-elections/fuzzer",
 	"substrate/primitives/offchain",
 	"substrate/primitives/panic-handler",
 	"substrate/primitives/rpc",
-	"substrate/primitives/runtime",
 	"substrate/primitives/runtime-interface",
 	"substrate/primitives/runtime-interface/proc-macro",
-	"substrate/primitives/runtime-interface/test",
-	"substrate/primitives/runtime-interface/test-wasm",
 	"substrate/primitives/runtime-interface/test-wasm-deprecated",
+	"substrate/primitives/runtime-interface/test-wasm",
+	"substrate/primitives/runtime-interface/test",
+	"substrate/primitives/runtime",
 	"substrate/primitives/session",
 	"substrate/primitives/staking",
 	"substrate/primitives/state-machine",
@@ -426,11 +432,9 @@ members = [
 	"substrate/test-utils",
 	"substrate/test-utils/cli",
 	"substrate/test-utils/client",
-	"substrate/test-utils/derive",
 	"substrate/test-utils/runtime",
 	"substrate/test-utils/runtime/client",
 	"substrate/test-utils/runtime/transaction-pool",
-	"substrate/test-utils/test-crate",
 	"substrate/utils/binary-merkle-tree",
 	"substrate/utils/build-script-utils",
 	"substrate/utils/fork-tree",
@@ -447,16 +451,80 @@ members = [
 	"substrate/utils/prometheus",
 	"substrate/utils/wasm-builder",
 ]
+default-members = [ "polkadot" ]
 
-[workspace.package]
-authors = ["Parity Technologies <admin@parity.io>"]
-edition = "2021"
-repository = "https://github.com/paritytech/polkadot-sdk.git"
-license = "GPL-3.0-only"
-version = "1.0.0"
+[profile.release]
+# Polkadot runtime requires unwinding.
+panic = "unwind"
+opt-level = 3
+
+# make sure dev builds with backtrace do
+# not slow us down
+[profile.dev.package.backtrace]
+inherits = "release"
+
+[profile.production]
+inherits = "release"
+lto = true
+codegen-units = 1
 
 [profile.testnet]
 inherits = "release"
 debug = 1               # debug symbols are useful for profilers
 debug-assertions = true
 overflow-checks = true
+
+# The list of dependencies below (which can be both direct and indirect dependencies) are crates
+# that are suspected to be CPU-intensive, and that are unlikely to require debugging (as some of
+# their debug info might be missing) or to require to be frequently recompiled. We compile these
+# dependencies with `opt-level=3` even in "dev" mode in order to make "dev" mode more usable.
+# The majority of these crates are cryptographic libraries.
+#
+# If you see an error mentioning "profile package spec ... did not match any packages", it
+# probably concerns this list.
+#
+# This list is ordered alphabetically.
+[profile.dev.package]
+blake2 = { opt-level = 3 }
+blake2b_simd = { opt-level = 3 }
+chacha20poly1305 = { opt-level = 3 }
+cranelift-codegen = { opt-level = 3 }
+cranelift-wasm = { opt-level = 3 }
+crc32fast = { opt-level = 3 }
+crossbeam-deque = { opt-level = 3 }
+crypto-mac = { opt-level = 3 }
+curve25519-dalek = { opt-level = 3 }
+ed25519-dalek = { opt-level = 3 }
+flate2 = { opt-level = 3 }
+futures-channel = { opt-level = 3 }
+hash-db = { opt-level = 3 }
+hashbrown = { opt-level = 3 }
+hmac = { opt-level = 3 }
+httparse = { opt-level = 3 }
+integer-sqrt = { opt-level = 3 }
+keccak = { opt-level = 3 }
+libm = { opt-level = 3 }
+librocksdb-sys = { opt-level = 3 }
+libsecp256k1 = { opt-level = 3 }
+libz-sys = { opt-level = 3 }
+mio = { opt-level = 3 }
+nalgebra = { opt-level = 3 }
+num-bigint = { opt-level = 3 }
+parking_lot = { opt-level = 3 }
+parking_lot_core = { opt-level = 3 }
+percent-encoding = { opt-level = 3 }
+primitive-types = { opt-level = 3 }
+reed-solomon-novelpoly = { opt-level = 3 }
+ring = { opt-level = 3 }
+rustls = { opt-level = 3 }
+sha2 = { opt-level = 3 }
+sha3 = { opt-level = 3 }
+smallvec = { opt-level = 3 }
+snow = { opt-level = 3 }
+substrate-bip39 = { opt-level = 3 }
+twox-hash = { opt-level = 3 }
+uint = { opt-level = 3 }
+wasmi = { opt-level = 3 }
+x25519-dalek = { opt-level = 3 }
+yamux = { opt-level = 3 }
+zeroize = { opt-level = 3 }
diff --git a/README.md b/README.md
new file mode 100644
index 0000000000000000000000000000000000000000..56b3481bafc038f7d3dd0606558e9e37243dcd53
--- /dev/null
+++ b/README.md
@@ -0,0 +1,60 @@
+> NOTE: We have recently made significant changes to our repository structure. In order to streamline our development
+process and foster better contributions, we have merged three separate repositories Cumulus, Substrate and Polkadot into
+this repository. Read more about the changes [
+here](https://polkadot-public.notion.site/Polkadot-SDK-FAQ-fbc4cecc2c46443fb37b9eeec2f0d85f).
+
+# Polkadot SDK
+
+![](https://cms.polkadot.network/content/images/2021/06/1-xPcVR_fkITd0ssKBvJ3GMw.png)
+
+[![StackExchange](https://img.shields.io/badge/StackExchange-Community%20&%20Support-222222?logo=stackexchange)](https://substrate.stackexchange.com/)
+
+The Polkadot SDK repository provides all the resources needed to start building on the Polkadot network, a multi-chain
+blockchain platform that enables different blockchains to interoperate and share information in a secure and scalable
+way. The Polkadot SDK comprises three main pieces of software:
+
+## [Polkadot](./polkadot/)
+[![PolkadotForum](https://img.shields.io/badge/Polkadot_Forum-e6007a?logo=polkadot)](https://forum.polkadot.network/)
+[![Polkadot-license](https://img.shields.io/badge/License-GPL3-blue)](./polkadot/LICENSE)
+
+Implementation of a node for the https://polkadot.network in Rust, using the Substrate framework. This directory
+currently contains runtimes for the Polkadot, Kusama, Westend, and Rococo networks. In the future, these will be
+relocated to the [`runtimes`](https://github.com/polkadot-fellows/runtimes/) repository.
+
+## [Substrate](./substrate/)
+ [![SubstrateRustDocs](https://img.shields.io/badge/Rust_Docs-Substrate-24CC85?logo=rust)](https://paritytech.github.io/substrate/master/substrate/index.html)
+ [![Substrate-license](https://img.shields.io/badge/License-GPL3%2FApache2.0-blue)](./substrate/README.md#LICENSE)
+
+Substrate is the primary blockchain SDK used by developers to create the parachains that make up the Polkadot network.
+Additionally, it allows for the development of self-sovereign blockchains that operate completely independently of
+Polkadot.
+
+## [Cumulus](./cumulus/)
+[![CumulusRustDocs](https://img.shields.io/badge/Rust_Docs-Cumulus-222222?logo=rust)](https://paritytech.github.io/cumulus/cumulus_client_collator/index.html)
+[![Cumulus-license](https://img.shields.io/badge/License-GPL3-blue)](./cumulus/LICENSE)
+
+Cumulus is a set of tools for writing Substrate-based Polkadot parachains.
+
+## Upstream Dependencies
+
+Below are the primary upstream dependencies utilized in this project:
+
+- [`parity-scale-codec`](https://crates.io/crates/parity-scale-codec)
+- [`parity-db`](https://crates.io/crates/parity-db)
+- [`parity-common`](https://github.com/paritytech/parity-common)
+- [`trie`](https://github.com/paritytech/trie)
+
+## Security
+
+The security policy and procedures can be found in [docs/SECURITY.md](./docs/SECURITY.md).
+
+## Contributing & Code of Conduct
+
+Ensure you follow our [contribution guidelines](./docs/CONTRIBUTING.md). In every interaction and contribution, this
+project adheres to the [Contributor Covenant Code of Conduct](./docs/CODE_OF_CONDUCT.md).
+
+## Additional Resources
+
+- For monitoring upcoming changes and current proposals related to the technical implementation of the Polkadot network,
+  visit the [`Requests for Comment (RFC)`](https://github.com/polkadot-fellows/RFCs) repository. While it's maintained
+  by the Polkadot Fellowship, the RFC process welcomes contributions from everyone.
diff --git a/cumulus/bridges/.gitignore b/bridges/.gitignore
similarity index 100%
rename from cumulus/bridges/.gitignore
rename to bridges/.gitignore
diff --git a/cumulus/bridges/CODE_OF_CONDUCT.md b/bridges/CODE_OF_CONDUCT.md
similarity index 96%
rename from cumulus/bridges/CODE_OF_CONDUCT.md
rename to bridges/CODE_OF_CONDUCT.md
index 70541fb72fa25af86a4268b947cdeb880d1d739c..23411da2e048c758d56d511c792e020a37d0ee0d 100644
--- a/cumulus/bridges/CODE_OF_CONDUCT.md
+++ b/bridges/CODE_OF_CONDUCT.md
@@ -34,9 +34,9 @@ of preference.  We see that blockchains are naturally community platforms with u
 ultimate decision makers.  We assert that good software will maximise user agency by facilitate
 user-expression on the network. As such:
 
-- This project will strive to give users as much choice as is both reasonable and possible over what
+* This project will strive to give users as much choice as is both reasonable and possible over what
   protocol they adhere to; but
-- use of the project's technical forums, commenting systems, pull requests and issue trackers as a
+* use of the project's technical forums, commenting systems, pull requests and issue trackers as a
   means to express individual protocol preferences is forbidden.
 
 ## Our Responsibilities
diff --git a/cumulus/bridges/LICENSE b/bridges/LICENSE
similarity index 100%
rename from cumulus/bridges/LICENSE
rename to bridges/LICENSE
diff --git a/cumulus/bridges/README.md b/bridges/README.md
similarity index 70%
rename from cumulus/bridges/README.md
rename to bridges/README.md
index 2f8c5ca9abb293699fc9510ed60ef4be117dd783..da46fe67d924acb2afffcf971bacb60b560f0cd5 100644
--- a/cumulus/bridges/README.md
+++ b/bridges/README.md
@@ -2,11 +2,10 @@
 
 This is a collection of components for building bridges.
 
-These components include Substrate pallets for syncing headers, passing arbitrary messages, as well
-as libraries for building relayers to provide cross-chain communication capabilities.
+These components include Substrate pallets for syncing headers, passing arbitrary messages, as well as libraries for
+building relayers to provide cross-chain communication capabilities.
 
-Three bridge nodes are also available. The nodes can be used to run test networks which bridge other
-Substrate chains.
+Three bridge nodes are also available. The nodes can be used to run test networks which bridge other Substrate chains.
 
 🚧 The bridges are currently under construction - a hardhat is recommended beyond this point 🚧
 
@@ -21,8 +20,8 @@ Substrate chains.
 
 ## Installation
 
-To get up and running you need both stable and nightly Rust. Rust nightly is used to build the Web
-Assembly (WASM) runtime for the node. You can configure the WASM support as so:
+To get up and running you need both stable and nightly Rust. Rust nightly is used to build the Web Assembly (WASM)
+runtime for the node. You can configure the WASM support as so:
 
 ```bash
 rustup install nightly
@@ -38,8 +37,8 @@ cargo build --all
 cargo test --all
 ```
 
-Also you can build the repo with
-[Parity CI Docker image](https://github.com/paritytech/scripts/tree/master/dockerfiles/bridges-ci):
+Also you can build the repo with [Parity CI Docker
+image](https://github.com/paritytech/scripts/tree/master/dockerfiles/bridges-ci):
 
 ```bash
 docker pull paritytech/bridges-ci:production
@@ -57,16 +56,14 @@ docker run --rm -it -w /shellhere/parity-bridges-common \
 If you want to reproduce other steps of CI process you can use the following
 [guide](https://github.com/paritytech/scripts#reproduce-ci-locally).
 
-If you need more information about setting up your development environment [Substrate's
-Installation page](https://docs.substrate.io/main-docs/install/) is a good
-resource.
+If you need more information about setting up your development environment [Substrate's Installation
+page](https://docs.substrate.io/main-docs/install/) is a good resource.
 
 ## High-Level Architecture
 
-This repo has support for bridging foreign chains together using a combination of Substrate pallets
-and external processes called relayers. A bridge chain is one that is able to follow the consensus
-of a foreign chain independently. For example, consider the case below where we want to bridge two
-Substrate based chains.
+This repo has support for bridging foreign chains together using a combination of Substrate pallets and external
+processes called relayers. A bridge chain is one that is able to follow the consensus of a foreign chain independently.
+For example, consider the case below where we want to bridge two Substrate based chains.
 
 ```
 +---------------+                 +---------------+
@@ -82,19 +79,19 @@ Substrate based chains.
                 +---------------+
 ```
 
-The Millau chain must be able to accept Rialto headers and verify their integrity. It does this by
-using a runtime module designed to track GRANDPA finality. Since two blockchains can't interact
-directly they need an external service, called a relayer, to communicate. The relayer will subscribe
-to new Rialto headers via RPC and submit them to the Millau chain for verification.
+The Millau chain must be able to accept Rialto headers and verify their integrity. It does this by using a runtime
+module designed to track GRANDPA finality. Since two blockchains can't interact directly they need an external service,
+called a relayer, to communicate. The relayer will subscribe to new Rialto headers via RPC and submit them to the Millau
+chain for verification.
 
-Take a look at [Bridge High Level Documentation](./docs/high-level-overview.md) for more in-depth
-description of the bridge interaction.
+Take a look at [Bridge High Level Documentation](./docs/high-level-overview.md) for more in-depth description of the
+bridge interaction.
 
 ## Project Layout
 
-Here's an overview of how the project is laid out. The main bits are the `bin`, which is the actual
-"blockchain", the `modules` which are used to build the blockchain's logic (a.k.a the runtime) and
-the `relays` which are used to pass messages between chains.
+Here's an overview of how the project is laid out. The main bits are the `bin`, which is the actual "blockchain", the
+`modules` which are used to build the blockchain's logic (a.k.a the runtime) and the `relays` which are used to pass
+messages between chains.
 
 ```
 ├── bin             // Node and Runtime for the various Substrate chains
@@ -117,16 +114,16 @@ the `relays` which are used to pass messages between chains.
 
 ## Running the Bridge
 
-To run the Bridge you need to be able to connect the bridge relay node to the RPC interface of nodes
-on each side of the bridge (source and target chain).
+To run the Bridge you need to be able to connect the bridge relay node to the RPC interface of nodes on each side of the
+bridge (source and target chain).
 
 There are 2 ways to run the bridge, described below:
 
-- building & running from source: with this option, you'll be able to run the bridge between two standalone
-chains that are running GRANDPA finality gadget to achieve finality;
+- building & running from source: with this option, you'll be able to run the bridge between two standalone chains that
+are running GRANDPA finality gadget to achieve finality;
 
-- running a Docker Compose setup: this is a recommended option, where you'll see bridges with parachains,
-complex relays and more.
+- running a Docker Compose setup: this is a recommended option, where you'll see bridges with parachains, complex relays
+and more.
 
 ### Using the Source
 
@@ -141,16 +138,15 @@ cargo build -p substrate-relay
 
 ### Running a Dev network
 
-We will launch a dev network to demonstrate how to relay a message between two Substrate based
-chains (named Rialto and Millau).
+We will launch a dev network to demonstrate how to relay a message between two Substrate based chains (named Rialto and
+Millau).
 
-To do this we will need two nodes, two relayers which will relay headers, and two relayers which
-will relay messages.
+To do this we will need two nodes, two relayers which will relay headers, and two relayers which will relay messages.
 
 #### Running from local scripts
 
-To run a simple dev network you can use the scripts located in the
-[`deployments/local-scripts` folder](./deployments/local-scripts).
+To run a simple dev network you can use the scripts located in the [`deployments/local-scripts`
+folder](./deployments/local-scripts).
 
 First, we must run the two Substrate nodes.
 
@@ -167,8 +163,8 @@ After the nodes are up we can run the header relayers.
 ./deployments/local-scripts/relay-rialto-to-millau.sh
 ```
 
-At this point you should see the relayer submitting headers from the Millau Substrate chain to the
-Rialto Substrate chain.
+At this point you should see the relayer submitting headers from the Millau Substrate chain to the Rialto Substrate
+chain.
 
 ```
 # Header Relayer Logs
@@ -192,20 +188,23 @@ You will also see the message lane relayers listening for new messages.
 [Millau_to_Rialto_MessageLane_00000000] [date] DEBUG bridge Asking Millau::ReceivingConfirmationsDelivery about best message nonces
 [...] [date] INFO bridge Synced Some(2) of Some(3) nonces in Millau::MessagesDelivery -> Rialto::MessagesDelivery race
 [...] [date] DEBUG bridge Asking Millau::MessagesDelivery about message nonces
-[...] [date] DEBUG bridge Received best nonces from Millau::ReceivingConfirmationsDelivery: TargetClientNonces { latest_nonce: 0, nonces_data: () }
+[...] [date] DEBUG bridge Received best nonces from Millau::ReceivingConfirmationsDelivery: TargetClientNonces {
+	  latest_nonce: 0, nonces_data: () }
 [...] [date] DEBUG bridge Asking Millau::ReceivingConfirmationsDelivery about finalized message nonces
-[...] [date] DEBUG bridge Received finalized nonces from Millau::ReceivingConfirmationsDelivery: TargetClientNonces { latest_nonce: 0, nonces_data: () }
+[...] [date] DEBUG bridge Received finalized nonces from Millau::ReceivingConfirmationsDelivery: TargetClientNonces {
+	  latest_nonce: 0, nonces_data: () }
 [...] [date] DEBUG bridge Received nonces from Millau::MessagesDelivery: SourceClientNonces { new_nonces: {}, confirmed_nonce: Some(0) }
 [...] [date] DEBUG bridge Asking Millau node about its state
-[...] [date] DEBUG bridge Received state from Millau node: ClientState { best_self: HeaderId(1593, 0xacac***), best_finalized_self: HeaderId(1590, 0x0be81d...), best_finalized_peer_at_best_self: HeaderId(0, 0xdcdd89...) }
+[...] [date] DEBUG bridge Received state from Millau node: ClientState { best_self: HeaderId(1593, 0xacac***), best_finalized_self:
+       HeaderId(1590, 0x0be81d...), best_finalized_peer_at_best_self: HeaderId(0, 0xdcdd89...) }
 ```
 
 To send a message see the ["How to send a message" section](#how-to-send-a-message).
 
 ### How to send a message
 
-In this section we'll show you how to quickly send a bridge message. The message is just an encoded XCM
-`Trap(43)` message.
+In this section we'll show you how to quickly send a bridge message. The message is just an encoded XCM `Trap(43)`
+message.
 
 ```bash
 # In `parity-bridges-common` folder
@@ -222,20 +221,20 @@ TRACE bridge Sent transaction to Millau node: 0x5e68...
 And at the Rialto node logs you'll something like this:
 
 ```
-... runtime::bridge-messages: Received messages: total=1, valid=1. Weight used: Weight(ref_time: 1215065371, proof_size: 48559)/Weight(ref_time: 1215065371, proof_size: 54703).
-``` 
+... runtime::bridge-messages: Received messages: total=1, valid=1. Weight used: Weight(ref_time: 1215065371, proof_size:
+    48559)/Weight(ref_time: 1215065371, proof_size: 54703).
+```
 
-It means that the message has been delivered and dispatched. Message may be dispatched with an
-error, though - the goal of our test bridge is to ensure that messages are successfully delivered
-and all involved components are working.
+It means that the message has been delivered and dispatched. Message may be dispatched with an error, though - the goal
+of our test bridge is to ensure that messages are successfully delivered and all involved components are working.
 
 ## Full Network Docker Compose Setup
 
-For a more sophisticated deployment which includes bidirectional header sync, message passing,
-monitoring dashboards, etc. see the [Deployments README](./deployments/README.md).
+For a more sophisticated deployment which includes bidirectional header sync, message passing, monitoring dashboards,
+etc. see the [Deployments README](./deployments/README.md).
 
-You should note that you can find images for all the bridge components published on
-[Docker Hub](https://hub.docker.com/u/paritytech).
+You should note that you can find images for all the bridge components published on [Docker
+Hub](https://hub.docker.com/u/paritytech).
 
 To run a Rialto node for example, you can use the following command:
 
@@ -247,13 +246,12 @@ docker run -p 30333:30333 -p 9933:9933 -p 9944:9944 \
 
 ## Community
 
-Main hangout for the community is [Element](https://element.io/) (formerly Riot). Element is a chat
-server like, for example, Discord. Most discussions around Polkadot and Substrate happen
-in various Element "rooms" (channels). So, joining Element might be a good idea, anyway.
+Main hangout for the community is [Element](https://element.io/) (formerly Riot). Element is a chat server like, for
+example, Discord. Most discussions around Polkadot and Substrate happen in various Element "rooms" (channels). So,
+joining Element might be a good idea, anyway.
 
-If you are interested in information exchange and development of Polkadot related bridges please
-feel free to join the [Polkadot Bridges](https://app.element.io/#/room/#bridges:web3.foundation)
-Element channel.
+If you are interested in information exchange and development of Polkadot related bridges please feel free to join the
+[Polkadot Bridges](https://app.element.io/#/room/#bridges:web3.foundation) Element channel.
 
-The [Substrate Technical](https://app.element.io/#/room/#substrate-technical:matrix.org) Element
-channel is most suited for discussions regarding Substrate itself.
+The [Substrate Technical](https://app.element.io/#/room/#substrate-technical:matrix.org) Element channel is most suited
+for discussions regarding Substrate itself.
diff --git a/bridges/SECURITY.md b/bridges/SECURITY.md
new file mode 100644
index 0000000000000000000000000000000000000000..9f215c88765474e6b211882296c8cf190f216780
--- /dev/null
+++ b/bridges/SECURITY.md
@@ -0,0 +1,18 @@
+# Security Policy
+
+Thanks for helping make the Parity ecosystem more secure. Security is one of our first priorities.
+
+## Reporting a vulnerability
+
+If you find something that can be treated as a security vulnerability, please do not use the issue tracker or discuss it
+in the public forum as it can cause more damage, rather than giving real help to the ecosystem.
+
+Security vulnerabilities should be reported by the [contact form](https://security-submission.parity.io/).
+
+If you think that your report might be eligible for the Bug Bounty Program, please mark this during the submission.
+Please check up-to-date [Parity Bug Bounty Program rules](https://www.parity.io/bug-bounty) to find out the information
+about our Bug Bounty Program.
+
+**Warning**: This is an unified SECURITY.md file for Paritytech GitHub Organization. The presence of this file does not
+mean that this repository is covered by the Bug Bounty program. Please always check the Bug Bounty Program scope for
+information.
diff --git a/cumulus/bridges/bin/runtime-common/Cargo.toml b/bridges/bin/runtime-common/Cargo.toml
similarity index 65%
rename from cumulus/bridges/bin/runtime-common/Cargo.toml
rename to bridges/bin/runtime-common/Cargo.toml
index ee133420f053c96e10e5acf5167251f5582c3db5..5c3fefc69ce710b1af10721ad41d1e5144b00f5a 100644
--- a/cumulus/bridges/bin/runtime-common/Cargo.toml
+++ b/bridges/bin/runtime-common/Cargo.toml
@@ -1,9 +1,9 @@
 [package]
 name = "bridge-runtime-common"
 version = "0.1.0"
-authors = ["Parity Technologies <admin@parity.io>"]
-edition = "2021"
-repository = "https://github.com/paritytech/parity-bridges-common/"
+authors.workspace = true
+edition.workspace = true
+repository.workspace = true
 license = "GPL-3.0-or-later WITH Classpath-exception-2.0"
 
 [dependencies]
@@ -29,24 +29,24 @@ pallet-bridge-relayers = { path = "../../modules/relayers", default-features = f
 
 # Substrate dependencies
 
-frame-support = { path = "../../../../substrate/frame/support", default-features = false }
-frame-system = { path = "../../../../substrate/frame/system", default-features = false }
-pallet-transaction-payment = { path = "../../../../substrate/frame/transaction-payment", default-features = false }
-pallet-utility = { path = "../../../../substrate/frame/utility", default-features = false }
-sp-api = { path = "../../../../substrate/primitives/api", default-features = false }
-sp-core = { path = "../../../../substrate/primitives/core", default-features = false }
-sp-io = { path = "../../../../substrate/primitives/io", default-features = false }
-sp-runtime = { path = "../../../../substrate/primitives/runtime", default-features = false }
-sp-std = { path = "../../../../substrate/primitives/std", default-features = false }
-sp-trie = { path = "../../../../substrate/primitives/trie", default-features = false }
+frame-support = { path = "../../../substrate/frame/support", default-features = false }
+frame-system = { path = "../../../substrate/frame/system", default-features = false }
+pallet-transaction-payment = { path = "../../../substrate/frame/transaction-payment", default-features = false }
+pallet-utility = { path = "../../../substrate/frame/utility", default-features = false }
+sp-api = { path = "../../../substrate/primitives/api", default-features = false }
+sp-core = { path = "../../../substrate/primitives/core", default-features = false }
+sp-io = { path = "../../../substrate/primitives/io", default-features = false }
+sp-runtime = { path = "../../../substrate/primitives/runtime", default-features = false }
+sp-std = { path = "../../../substrate/primitives/std", default-features = false }
+sp-trie = { path = "../../../substrate/primitives/trie", default-features = false }
 
 # Polkadot dependencies
-xcm = { path = "../../../../polkadot/xcm", default-features = false }
-xcm-builder = { path = "../../../../polkadot/xcm/xcm-builder", default-features = false }
+xcm = { package = "staging-xcm", path = "../../../polkadot/xcm", default-features = false }
+xcm-builder = { package = "staging-xcm-builder", path = "../../../polkadot/xcm/xcm-builder", default-features = false }
 
 [dev-dependencies]
 bp-test-utils = { path = "../../primitives/test-utils" }
-pallet-balances = { path = "../../../../substrate/frame/balances" }
+pallet-balances = { path = "../../../substrate/frame/balances" }
 
 [features]
 default = [ "std" ]
@@ -55,6 +55,7 @@ std = [
 	"bp-messages/std",
 	"bp-parachains/std",
 	"bp-polkadot-core/std",
+	"bp-relayers/std",
 	"bp-runtime/std",
 	"bp-xcm-bridge-hub-router/std",
 	"codec/std",
@@ -79,10 +80,15 @@ std = [
 	"xcm/std",
 ]
 runtime-benchmarks = [
+	"frame-support/runtime-benchmarks",
+	"frame-system/runtime-benchmarks",
+	"pallet-balances/runtime-benchmarks",
 	"pallet-bridge-grandpa/runtime-benchmarks",
 	"pallet-bridge-messages/runtime-benchmarks",
 	"pallet-bridge-parachains/runtime-benchmarks",
 	"pallet-bridge-relayers/runtime-benchmarks",
+	"pallet-utility/runtime-benchmarks",
+	"sp-runtime/runtime-benchmarks",
 	"xcm-builder/runtime-benchmarks",
 ]
 integrity-test = [ "static_assertions" ]
diff --git a/cumulus/bridges/bin/runtime-common/src/integrity.rs b/bridges/bin/runtime-common/src/integrity.rs
similarity index 96%
rename from cumulus/bridges/bin/runtime-common/src/integrity.rs
rename to bridges/bin/runtime-common/src/integrity.rs
index a0af3b981f307dfa1592b8a9199dcd8fb002aced..d3827a14dd6cc24e088a8d05d26aba9d769eb213 100644
--- a/cumulus/bridges/bin/runtime-common/src/integrity.rs
+++ b/bridges/bin/runtime-common/src/integrity.rs
@@ -1,4 +1,4 @@
-// Copyright 2019-2021 Parity Technologies (UK) Ltd.
+// Copyright (C) Parity Technologies (UK) Ltd.
 // This file is part of Parity Bridges Common.
 
 // Parity Bridges Common is free software: you can redistribute it and/or modify
@@ -27,7 +27,6 @@ use codec::Encode;
 use frame_support::{storage::generator::StorageValue, traits::Get, weights::Weight};
 use frame_system::limits;
 use pallet_bridge_messages::WeightInfoExt as _;
-use sp_runtime::traits::SignedExtension;
 
 /// Macro that ensures that the runtime configuration and chain primitives crate are sharing
 /// the same types (nonce, block number, hash, hasher, account id and header).
@@ -347,15 +346,3 @@ pub fn check_message_lane_weights<
 		);
 	}
 }
-
-/// Check that the `AdditionalSigned` type of a wrapped runtime is the same as the one of the
-/// corresponding actual runtime.
-///
-/// This method doesn't perform any `assert`. If the condition is not true it will generate a
-/// compile-time error.
-pub fn check_additional_signed<SignedExt, IndirectSignedExt: SignedExtension>()
-where
-	SignedExt: SignedExtension,
-	IndirectSignedExt: SignedExtension<AdditionalSigned = SignedExt::AdditionalSigned>,
-{
-}
diff --git a/cumulus/bridges/bin/runtime-common/src/lib.rs b/bridges/bin/runtime-common/src/lib.rs
similarity index 99%
rename from cumulus/bridges/bin/runtime-common/src/lib.rs
rename to bridges/bin/runtime-common/src/lib.rs
index 817922bc907d8d5f27d7c698a1df460361865f9f..ae6f40b142145dc265a69e8c78ef313f5ce9340f 100644
--- a/cumulus/bridges/bin/runtime-common/src/lib.rs
+++ b/bridges/bin/runtime-common/src/lib.rs
@@ -1,4 +1,4 @@
-// Copyright 2019-2021 Parity Technologies (UK) Ltd.
+// Copyright (C) Parity Technologies (UK) Ltd.
 // This file is part of Parity Bridges Common.
 
 // Parity Bridges Common is free software: you can redistribute it and/or modify
diff --git a/cumulus/bridges/bin/runtime-common/src/messages.rs b/bridges/bin/runtime-common/src/messages.rs
similarity index 99%
rename from cumulus/bridges/bin/runtime-common/src/messages.rs
rename to bridges/bin/runtime-common/src/messages.rs
index a650f082774618881fc1c635a75f9f211e429047..ac66adae6614b168855b285b4ef4f3cd74ecb068 100644
--- a/cumulus/bridges/bin/runtime-common/src/messages.rs
+++ b/bridges/bin/runtime-common/src/messages.rs
@@ -1,4 +1,4 @@
-// Copyright 2019-2021 Parity Technologies (UK) Ltd.
+// Copyright (C) Parity Technologies (UK) Ltd.
 // This file is part of Parity Bridges Common.
 
 // Parity Bridges Common is free software: you can redistribute it and/or modify
diff --git a/cumulus/bridges/bin/runtime-common/src/messages_api.rs b/bridges/bin/runtime-common/src/messages_api.rs
similarity index 97%
rename from cumulus/bridges/bin/runtime-common/src/messages_api.rs
rename to bridges/bin/runtime-common/src/messages_api.rs
index 199e062fe9826cc44527ffe825a44a530fb618ef..ccf1c754041ed84dc302f0660fdd5bde8dc8d533 100644
--- a/cumulus/bridges/bin/runtime-common/src/messages_api.rs
+++ b/bridges/bin/runtime-common/src/messages_api.rs
@@ -1,4 +1,4 @@
-// Copyright 2019-2021 Parity Technologies (UK) Ltd.
+// Copyright (C) Parity Technologies (UK) Ltd.
 // This file is part of Parity Bridges Common.
 
 // Parity Bridges Common is free software: you can redistribute it and/or modify
diff --git a/cumulus/bridges/bin/runtime-common/src/messages_benchmarking.rs b/bridges/bin/runtime-common/src/messages_benchmarking.rs
similarity index 80%
rename from cumulus/bridges/bin/runtime-common/src/messages_benchmarking.rs
rename to bridges/bin/runtime-common/src/messages_benchmarking.rs
index b067523c305b99aeb5ec9859b9c6b7b6eb77df1e..d80a88f1068c8975426105f881d963e1c3053ee5 100644
--- a/cumulus/bridges/bin/runtime-common/src/messages_benchmarking.rs
+++ b/bridges/bin/runtime-common/src/messages_benchmarking.rs
@@ -1,4 +1,4 @@
-// Copyright 2019-2021 Parity Technologies (UK) Ltd.
+// Copyright (C) Parity Technologies (UK) Ltd.
 // This file is part of Parity Bridges Common.
 
 // Parity Bridges Common is free software: you can redistribute it and/or modify
@@ -29,7 +29,7 @@ use crate::{
 	},
 };
 
-use bp_messages::storage_keys;
+use bp_messages::{storage_keys, MessagePayload};
 use bp_polkadot_core::parachains::ParaHash;
 use bp_runtime::{
 	record_all_trie_keys, Chain, Parachain, RawStorageProof, StorageProofSize, UnderlyingChainOf,
@@ -45,8 +45,8 @@ use xcm::v3::prelude::*;
 /// Prepare inbound bridge message according to given message proof parameters.
 fn prepare_inbound_message(
 	params: &MessageProofParams,
-	destination: InteriorMultiLocation,
-) -> Vec<u8> {
+	successful_dispatch_message_generator: impl Fn(usize) -> MessagePayload,
+) -> MessagePayload {
 	// we only care about **this** message size when message proof needs to be `Minimal`
 	let expected_size = match params.size {
 		StorageProofSize::Minimal(size) => size as usize,
@@ -58,20 +58,15 @@ fn prepare_inbound_message(
 		return vec![0u8; expected_size]
 	}
 
-	// else let's prepare successful message. For XCM bridge hubs, it is the message that
-	// will be pushed further to some XCM queue (XCMP/UMP)
-	let location = xcm::VersionedInteriorMultiLocation::V3(destination);
-	let location_encoded_size = location.encoded_size();
-
-	// we don't need to be super-precise with `expected_size` here
-	let xcm_size = expected_size.saturating_sub(location_encoded_size);
-	let xcm = xcm::VersionedXcm::<()>::V3(vec![Instruction::ClearOrigin; xcm_size].into());
-
-	// this is the `BridgeMessage` from polkadot xcm builder, but it has no constructor
-	// or public fields, so just tuple
-	// (double encoding, because `.encode()` is called on original Xcm BLOB when it is pushed
-	// to the storage)
-	(location, xcm).encode().encode()
+	// else let's prepare successful message.
+	let msg = successful_dispatch_message_generator(expected_size);
+	assert!(
+		msg.len() >= expected_size,
+		"msg.len(): {} does not match expected_size: {}",
+		expected_size,
+		msg.len()
+	);
+	msg
 }
 
 /// Prepare proof of messages for the `receive_messages_proof` call.
@@ -84,7 +79,7 @@ fn prepare_inbound_message(
 /// function.
 pub fn prepare_message_proof_from_grandpa_chain<R, FI, B>(
 	params: MessageProofParams,
-	message_destination: InteriorMultiLocation,
+	message_generator: impl Fn(usize) -> MessagePayload,
 ) -> (FromBridgedChainMessagesProof<HashOf<BridgedChain<B>>>, Weight)
 where
 	R: pallet_bridge_grandpa::Config<FI, BridgedChain = UnderlyingChainOf<BridgedChain<B>>>,
@@ -97,7 +92,7 @@ where
 		params.message_nonces.clone(),
 		params.outbound_lane_data.clone(),
 		params.size,
-		prepare_inbound_message(&params, message_destination),
+		prepare_inbound_message(&params, message_generator),
 		encode_all_messages,
 		encode_lane_data,
 	);
@@ -127,7 +122,7 @@ where
 /// `prepare_message_proof_from_grandpa_chain` function.
 pub fn prepare_message_proof_from_parachain<R, PI, B>(
 	params: MessageProofParams,
-	message_destination: InteriorMultiLocation,
+	message_generator: impl Fn(usize) -> MessagePayload,
 ) -> (FromBridgedChainMessagesProof<HashOf<BridgedChain<B>>>, Weight)
 where
 	R: pallet_bridge_parachains::Config<PI>,
@@ -141,7 +136,7 @@ where
 		params.message_nonces.clone(),
 		params.outbound_lane_data.clone(),
 		params.size,
-		prepare_inbound_message(&params, message_destination),
+		prepare_inbound_message(&params, message_generator),
 		encode_all_messages,
 		encode_lane_data,
 	);
@@ -291,3 +286,53 @@ where
 	pallet_bridge_parachains::initialize_for_benchmarks::<R, PI, PC>(bridged_header);
 	(bridged_block_number, bridged_header_hash)
 }
+
+/// Returns callback which generates `BridgeMessage` from Polkadot XCM builder based on
+/// `expected_message_size` for benchmark.
+pub fn generate_xcm_builder_bridge_message_sample(
+	destination: InteriorMultiLocation,
+) -> impl Fn(usize) -> MessagePayload {
+	move |expected_message_size| -> MessagePayload {
+		// For XCM bridge hubs, it is the message that
+		// will be pushed further to some XCM queue (XCMP/UMP)
+		let location = xcm::VersionedInteriorMultiLocation::V3(destination);
+		let location_encoded_size = location.encoded_size();
+
+		// we don't need to be super-precise with `expected_size` here
+		let xcm_size = expected_message_size.saturating_sub(location_encoded_size);
+		let xcm_data_size = xcm_size.saturating_sub(
+			// minus empty instruction size
+			xcm::v3::Instruction::<()>::ExpectPallet {
+				index: 0,
+				name: vec![],
+				module_name: vec![],
+				crate_major: 0,
+				min_crate_minor: 0,
+			}
+			.encoded_size(),
+		);
+
+		log::trace!(
+			target: "runtime::bridge-benchmarks",
+			"generate_xcm_builder_bridge_message_sample with expected_message_size: {}, location_encoded_size: {}, xcm_size: {}, xcm_data_size: {}",
+			expected_message_size, location_encoded_size, xcm_size, xcm_data_size,
+		);
+
+		let xcm = xcm::VersionedXcm::<()>::V3(
+			vec![xcm::v3::Instruction::<()>::ExpectPallet {
+				index: 0,
+				name: vec![42; xcm_data_size],
+				module_name: vec![],
+				crate_major: 0,
+				min_crate_minor: 0,
+			}]
+			.into(),
+		);
+
+		// this is the `BridgeMessage` from polkadot xcm builder, but it has no constructor
+		// or public fields, so just tuple
+		// (double encoding, because `.encode()` is called on original Xcm BLOB when it is pushed
+		// to the storage)
+		(location, xcm).encode().encode()
+	}
+}
diff --git a/cumulus/bridges/bin/runtime-common/src/messages_call_ext.rs b/bridges/bin/runtime-common/src/messages_call_ext.rs
similarity index 94%
rename from cumulus/bridges/bin/runtime-common/src/messages_call_ext.rs
rename to bridges/bin/runtime-common/src/messages_call_ext.rs
index badb17efa0841430721ab07ce293bc086306a988..5303fcb7ba030fa3f00a74c817d97537243f0e24 100644
--- a/cumulus/bridges/bin/runtime-common/src/messages_call_ext.rs
+++ b/bridges/bin/runtime-common/src/messages_call_ext.rs
@@ -1,4 +1,4 @@
-// Copyright 2021 Parity Technologies (UK) Ltd.
+// Copyright (C) Parity Technologies (UK) Ltd.
 // This file is part of Parity Bridges Common.
 
 // Parity Bridges Common is free software: you can redistribute it and/or modify
@@ -18,6 +18,7 @@ use crate::messages::{
 	source::FromBridgedChainMessagesDeliveryProof, target::FromBridgedChainMessagesProof,
 };
 use bp_messages::{target_chain::MessageDispatch, InboundLaneData, LaneId, MessageNonce};
+use bp_runtime::OwnedBridgeModule;
 use frame_support::{
 	dispatch::CallableCallFor,
 	traits::{Get, IsSubType},
@@ -187,8 +188,22 @@ pub trait MessagesCallSubType<T: Config<I, RuntimeCall = Self>, I: 'static>:
 	/// or a `ReceiveMessagesDeliveryProof` call, if the call is for the provided lane.
 	fn call_info_for(&self, lane_id: LaneId) -> Option<CallInfo>;
 
-	/// Check that a `ReceiveMessagesProof` or a `ReceiveMessagesDeliveryProof` call is trying
-	/// to deliver/confirm at least some messages that are better than the ones we know of.
+	/// Ensures that a `ReceiveMessagesProof` or a `ReceiveMessagesDeliveryProof` call:
+	///
+	/// - does not deliver already delivered messages. We require all messages in the
+	///   `ReceiveMessagesProof` call to be undelivered;
+	///
+	/// - does not submit empty `ReceiveMessagesProof` call with zero messages, unless the lane
+	///   needs to be unblocked by providing relayer rewards proof;
+	///
+	/// - brings no new delivery confirmations in a `ReceiveMessagesDeliveryProof` call. We require
+	///   at least one new delivery confirmation in the unrewarded relayers set;
+	///
+	/// - does not violate some basic (easy verifiable) messages pallet rules obsolete (like
+	///   submitting a call when a pallet is halted or delivering messages when a dispatcher is
+	///   inactive).
+	///
+	/// If one of above rules is violated, the transaction is treated as invalid.
 	fn check_obsolete_call(&self) -> TransactionValidity;
 }
 
@@ -278,7 +293,17 @@ impl<
 	}
 
 	fn check_obsolete_call(&self) -> TransactionValidity {
+		let is_pallet_halted = Pallet::<T, I>::ensure_not_halted().is_err();
 		match self.call_info() {
+			Some(proof_info) if is_pallet_halted => {
+				log::trace!(
+					target: pallet_bridge_messages::LOG_TARGET,
+					"Rejecting messages transaction on halted pallet: {:?}",
+					proof_info
+				);
+
+				return sp_runtime::transaction_validity::InvalidTransaction::Call.into()
+			},
 			Some(CallInfo::ReceiveMessagesProof(proof_info))
 				if proof_info.is_obsolete(T::MessageDispatch::is_active()) =>
 			{
diff --git a/cumulus/bridges/bin/runtime-common/src/messages_generation.rs b/bridges/bin/runtime-common/src/messages_generation.rs
similarity index 98%
rename from cumulus/bridges/bin/runtime-common/src/messages_generation.rs
rename to bridges/bin/runtime-common/src/messages_generation.rs
index 8dbf3abd683cfff79e3068f70d6c4ecab5e91bd3..3c550a9bd0fd546ba90753b8871e049e65a702e3 100644
--- a/cumulus/bridges/bin/runtime-common/src/messages_generation.rs
+++ b/bridges/bin/runtime-common/src/messages_generation.rs
@@ -1,4 +1,4 @@
-// Copyright 2019-2022 Parity Technologies (UK) Ltd.
+// Copyright (C) Parity Technologies (UK) Ltd.
 // This file is part of Parity Bridges Common.
 
 // Parity Bridges Common is free software: you can redistribute it and/or modify
diff --git a/cumulus/bridges/bin/runtime-common/src/messages_xcm_extension.rs b/bridges/bin/runtime-common/src/messages_xcm_extension.rs
similarity index 99%
rename from cumulus/bridges/bin/runtime-common/src/messages_xcm_extension.rs
rename to bridges/bin/runtime-common/src/messages_xcm_extension.rs
index 44e554ecb24f807cfc716f6dbf14f124382382f0..77c23db3b2ba2d01aef0d2c45a20377eaf8ea129 100644
--- a/cumulus/bridges/bin/runtime-common/src/messages_xcm_extension.rs
+++ b/bridges/bin/runtime-common/src/messages_xcm_extension.rs
@@ -1,4 +1,4 @@
-// Copyright 2023 Parity Technologies (UK) Ltd.
+// Copyright (C) Parity Technologies (UK) Ltd.
 // This file is part of Parity Bridges Common.
 
 // Parity Bridges Common is free software: you can redistribute it and/or modify
@@ -29,7 +29,7 @@ use bp_messages::{
 use bp_runtime::messages::MessageDispatchResult;
 use bp_xcm_bridge_hub_router::XcmChannelStatusProvider;
 use codec::{Decode, Encode};
-use frame_support::{dispatch::Weight, traits::Get, CloneNoBound, EqNoBound, PartialEqNoBound};
+use frame_support::{traits::Get, weights::Weight, CloneNoBound, EqNoBound, PartialEqNoBound};
 use pallet_bridge_messages::{
 	Config as MessagesConfig, OutboundLanesCongestedSignals, Pallet as MessagesPallet,
 	WeightInfoExt as MessagesPalletWeights,
diff --git a/cumulus/bridges/bin/runtime-common/src/mock.rs b/bridges/bin/runtime-common/src/mock.rs
similarity index 99%
rename from cumulus/bridges/bin/runtime-common/src/mock.rs
rename to bridges/bin/runtime-common/src/mock.rs
index 9c41d17fa9957fd5dd5bf43fd868bcac06fe50f3..45ef790d74482b01948a74cdb0a53c332aa41896 100644
--- a/cumulus/bridges/bin/runtime-common/src/mock.rs
+++ b/bridges/bin/runtime-common/src/mock.rs
@@ -1,4 +1,4 @@
-// Copyright 2019-2021 Parity Technologies (UK) Ltd.
+// Copyright (C) Parity Technologies (UK) Ltd.
 // This file is part of Parity Bridges Common.
 
 // Parity Bridges Common is free software: you can redistribute it and/or modify
diff --git a/cumulus/bridges/bin/runtime-common/src/parachains_benchmarking.rs b/bridges/bin/runtime-common/src/parachains_benchmarking.rs
similarity index 98%
rename from cumulus/bridges/bin/runtime-common/src/parachains_benchmarking.rs
rename to bridges/bin/runtime-common/src/parachains_benchmarking.rs
index aad53673c3ad3eb36b1b16b2543203e50986c794..63dc78385e46ebb537f06e88a139efacaeeb3832 100644
--- a/cumulus/bridges/bin/runtime-common/src/parachains_benchmarking.rs
+++ b/bridges/bin/runtime-common/src/parachains_benchmarking.rs
@@ -1,4 +1,4 @@
-// Copyright 2019-2021 Parity Technologies (UK) Ltd.
+// Copyright (C) Parity Technologies (UK) Ltd.
 // This file is part of Parity Bridges Common.
 
 // Parity Bridges Common is free software: you can redistribute it and/or modify
diff --git a/cumulus/bridges/bin/runtime-common/src/priority_calculator.rs b/bridges/bin/runtime-common/src/priority_calculator.rs
similarity index 97%
rename from cumulus/bridges/bin/runtime-common/src/priority_calculator.rs
rename to bridges/bin/runtime-common/src/priority_calculator.rs
index 590de05fb1c66c839c711e8dce37963136488de9..fd10344812517bab17ad33e5d276a5627e01c0c0 100644
--- a/cumulus/bridges/bin/runtime-common/src/priority_calculator.rs
+++ b/bridges/bin/runtime-common/src/priority_calculator.rs
@@ -1,4 +1,4 @@
-// Copyright 2021 Parity Technologies (UK) Ltd.
+// Copyright (C) Parity Technologies (UK) Ltd.
 // This file is part of Parity Bridges Common.
 
 // Parity Bridges Common is free software: you can redistribute it and/or modify
@@ -38,7 +38,7 @@ where
 	PriorityBoostPerMessage: Get<TransactionPriority>,
 {
 	// we don't want any boost for transaction with single message => minus one
-	PriorityBoostPerMessage::get().saturating_mul(messages - 1)
+	PriorityBoostPerMessage::get().saturating_mul(messages.saturating_sub(1))
 }
 
 #[cfg(not(feature = "integrity-test"))]
@@ -51,13 +51,13 @@ mod integrity_tests {
 	use bp_messages::MessageNonce;
 	use bp_runtime::PreComputedSize;
 	use frame_support::{
-		dispatch::{DispatchClass, DispatchInfo, Dispatchable, Pays, PostDispatchInfo},
+		dispatch::{DispatchClass, DispatchInfo, Pays, PostDispatchInfo},
 		traits::Get,
 	};
 	use pallet_bridge_messages::WeightInfoExt;
 	use pallet_transaction_payment::OnChargeTransaction;
 	use sp_runtime::{
-		traits::{UniqueSaturatedInto, Zero},
+		traits::{Dispatchable, UniqueSaturatedInto, Zero},
 		transaction_validity::TransactionPriority,
 		FixedPointOperand, SaturatedConversion, Saturating,
 	};
diff --git a/cumulus/bridges/bin/runtime-common/src/refund_relayer_extension.rs b/bridges/bin/runtime-common/src/refund_relayer_extension.rs
similarity index 69%
rename from cumulus/bridges/bin/runtime-common/src/refund_relayer_extension.rs
rename to bridges/bin/runtime-common/src/refund_relayer_extension.rs
index 4e577e88a4118283127392db926d219411334c33..6d8b2114808588a83571de6dc02a141cc146d2e3 100644
--- a/cumulus/bridges/bin/runtime-common/src/refund_relayer_extension.rs
+++ b/bridges/bin/runtime-common/src/refund_relayer_extension.rs
@@ -1,4 +1,4 @@
-// Copyright 2021 Parity Technologies (UK) Ltd.
+// Copyright (C) Parity Technologies (UK) Ltd.
 // This file is part of Parity Bridges Common.
 
 // Parity Bridges Common is free software: you can redistribute it and/or modify
@@ -24,16 +24,17 @@ use crate::messages_call_ext::{
 };
 use bp_messages::{LaneId, MessageNonce};
 use bp_relayers::{RewardsAccountOwner, RewardsAccountParams};
-use bp_runtime::{Parachain, ParachainIdOf, RangeInclusiveExt, StaticStrProvider};
-use codec::{Decode, Encode};
+use bp_runtime::{Chain, Parachain, ParachainIdOf, RangeInclusiveExt, StaticStrProvider};
+use codec::{Codec, Decode, Encode};
 use frame_support::{
-	dispatch::{CallableCallFor, DispatchInfo, Dispatchable, PostDispatchInfo},
+	dispatch::{CallableCallFor, DispatchInfo, PostDispatchInfo},
 	traits::IsSubType,
 	weights::Weight,
 	CloneNoBound, DefaultNoBound, EqNoBound, PartialEqNoBound, RuntimeDebugNoBound,
 };
 use pallet_bridge_grandpa::{
-	CallSubType as GrandpaCallSubType, SubmitFinalityProofHelper, SubmitFinalityProofInfo,
+	CallSubType as GrandpaCallSubType, Config as GrandpaConfig, SubmitFinalityProofHelper,
+	SubmitFinalityProofInfo,
 };
 use pallet_bridge_messages::Config as MessagesConfig;
 use pallet_bridge_parachains::{
@@ -47,7 +48,7 @@ use pallet_transaction_payment::{Config as TransactionPaymentConfig, OnChargeTra
 use pallet_utility::{Call as UtilityCall, Config as UtilityConfig, Pallet as UtilityPallet};
 use scale_info::TypeInfo;
 use sp_runtime::{
-	traits::{DispatchInfoOf, Get, PostDispatchInfoOf, SignedExtension, Zero},
+	traits::{DispatchInfoOf, Dispatchable, Get, PostDispatchInfoOf, SignedExtension, Zero},
 	transaction_validity::{
 		TransactionPriority, TransactionValidity, TransactionValidityError, ValidTransactionBuilder,
 	},
@@ -96,7 +97,7 @@ where
 /// coming from this lane.
 pub trait RefundableMessagesLaneId {
 	/// The instance of the bridge messages pallet.
-	type Instance;
+	type Instance: 'static;
 	/// The messages lane id.
 	type Id: Get<LaneId>;
 }
@@ -106,6 +107,7 @@ pub struct RefundableMessagesLane<Instance, Id>(PhantomData<(Instance, Id)>);
 
 impl<Instance, Id> RefundableMessagesLaneId for RefundableMessagesLane<Instance, Id>
 where
+	Instance: 'static,
 	Id: Get<LaneId>,
 {
 	type Instance = Instance;
@@ -165,7 +167,11 @@ pub enum CallInfo {
 		SubmitParachainHeadsInfo,
 		MessagesCallInfo,
 	),
+	/// Relay chain finality + message delivery/confirmation calls.
+	RelayFinalityAndMsgs(SubmitFinalityProofInfo<RelayBlockNumber>, MessagesCallInfo),
 	/// Parachain finality + message delivery/confirmation calls.
+	///
+	/// This variant is used only when bridging with parachain.
 	ParachainFinalityAndMsgs(SubmitParachainHeadsInfo, MessagesCallInfo),
 	/// Standalone message delivery/confirmation call.
 	Msgs(MessagesCallInfo),
@@ -184,6 +190,7 @@ impl CallInfo {
 	fn submit_finality_proof_info(&self) -> Option<SubmitFinalityProofInfo<RelayBlockNumber>> {
 		match *self {
 			Self::AllFinalityAndMsgs(info, _, _) => Some(info),
+			Self::RelayFinalityAndMsgs(info, _) => Some(info),
 			_ => None,
 		}
 	}
@@ -201,6 +208,7 @@ impl CallInfo {
 	fn messages_call_info(&self) -> &MessagesCallInfo {
 		match self {
 			Self::AllFinalityAndMsgs(_, _, info) => info,
+			Self::RelayFinalityAndMsgs(_, info) => info,
 			Self::ParachainFinalityAndMsgs(_, info) => info,
 			Self::Msgs(info) => info,
 		}
@@ -209,7 +217,7 @@ impl CallInfo {
 
 /// The actions on relayer account that need to be performed because of his actions.
 #[derive(RuntimeDebug, PartialEq)]
-enum RelayerAccountAction<AccountId, Reward> {
+pub enum RelayerAccountAction<AccountId, Reward> {
 	/// Do nothing with relayer account.
 	None,
 	/// Reward the relayer.
@@ -218,121 +226,60 @@ enum RelayerAccountAction<AccountId, Reward> {
 	Slash(AccountId, RewardsAccountParams),
 }
 
-/// Signed extension that refunds a relayer for new messages coming from a parachain.
-///
-/// Also refunds relayer for successful finality delivery if it comes in batch (`utility.batchAll`)
-/// with message delivery transaction. Batch may deliver either both relay chain header and
-/// parachain head, or just parachain head. Corresponding headers must be used in messages
-/// proof verification.
-///
-/// Extension does not refund transaction tip due to security reasons.
-#[derive(
-	DefaultNoBound,
-	CloneNoBound,
-	Decode,
-	Encode,
-	EqNoBound,
-	PartialEqNoBound,
-	RuntimeDebugNoBound,
-	TypeInfo,
-)]
-#[scale_info(skip_type_params(Runtime, Para, Msgs, Refund, Priority, Id))]
-pub struct RefundBridgedParachainMessages<Runtime, Para, Msgs, Refund, Priority, Id>(
-	PhantomData<(
-		// runtime with `frame-utility`, `pallet-bridge-grandpa`, `pallet-bridge-parachains`,
-		// `pallet-bridge-messages` and `pallet-bridge-relayers` pallets deployed
-		Runtime,
-		// implementation of `RefundableParachainId` trait, which specifies the instance of
-		// the used `pallet-bridge-parachains` pallet and the bridged parachain id
-		Para,
-		// implementation of `RefundableMessagesLaneId` trait, which specifies the instance of
-		// the used `pallet-bridge-messages` pallet and the lane within this pallet
-		Msgs,
-		// implementation of the `RefundCalculator` trait, that is used to compute refund that
-		// we give to relayer for his transaction
-		Refund,
-		// getter for per-message `TransactionPriority` boost that we give to message
-		// delivery transactions
-		Priority,
-		// the runtime-unique identifier of this signed extension
-		Id,
-	)>,
-);
-
-impl<Runtime, Para, Msgs, Refund, Priority, Id>
-	RefundBridgedParachainMessages<Runtime, Para, Msgs, Refund, Priority, Id>
+/// Everything common among our refund signed extensions.
+pub trait RefundSignedExtension:
+	'static + Clone + Codec + sp_std::fmt::Debug + Default + Eq + PartialEq + Send + Sync + TypeInfo
 where
-	Self: 'static + Send + Sync,
-	Runtime: UtilityConfig<RuntimeCall = CallOf<Runtime>>
-		+ BoundedBridgeGrandpaConfig<Runtime::BridgesGrandpaPalletInstance>
-		+ ParachainsConfig<Para::Instance>
-		+ MessagesConfig<Msgs::Instance>
-		+ RelayersConfig,
-	Para: RefundableParachainId,
-	Msgs: RefundableMessagesLaneId,
-	Refund: RefundCalculator<Balance = Runtime::Reward>,
-	Priority: Get<TransactionPriority>,
-	Id: StaticStrProvider,
-	CallOf<Runtime>: Dispatchable<Info = DispatchInfo, PostInfo = PostDispatchInfo>
-		+ IsSubType<CallableCallFor<UtilityPallet<Runtime>, Runtime>>
-		+ GrandpaCallSubType<Runtime, Runtime::BridgesGrandpaPalletInstance>
-		+ ParachainsCallSubType<Runtime, Para::Instance>
-		+ MessagesCallSubType<Runtime, Msgs::Instance>,
+	<Self::Runtime as GrandpaConfig<Self::GrandpaInstance>>::BridgedChain:
+		Chain<BlockNumber = RelayBlockNumber>,
 {
-	fn expand_call<'a>(&self, call: &'a CallOf<Runtime>) -> Vec<&'a CallOf<Runtime>> {
-		match call.is_sub_type() {
-			Some(UtilityCall::<Runtime>::batch_all { ref calls }) if calls.len() <= 3 =>
-				calls.iter().collect(),
-			Some(_) => vec![],
-			None => vec![call],
-		}
-	}
-
+	/// This chain runtime.
+	type Runtime: UtilityConfig<RuntimeCall = CallOf<Self::Runtime>>
+		+ GrandpaConfig<Self::GrandpaInstance>
+		+ MessagesConfig<<Self::Msgs as RefundableMessagesLaneId>::Instance>
+		+ RelayersConfig;
+	/// Grandpa pallet reference.
+	type GrandpaInstance: 'static;
+	/// Messages pallet and lane reference.
+	type Msgs: RefundableMessagesLaneId;
+	/// Refund amount calculator.
+	type Refund: RefundCalculator<Balance = <Self::Runtime as RelayersConfig>::Reward>;
+	/// Priority boost calculator.
+	type Priority: Get<TransactionPriority>;
+	/// Signed extension unique identifier.
+	type Id: StaticStrProvider;
+
+	/// Unpack batch runtime call.
+	fn expand_call(call: &CallOf<Self::Runtime>) -> Vec<&CallOf<Self::Runtime>>;
+
+	/// Given runtime call, check if it has supported format. Additionally, check if any of
+	/// (optionally batched) calls are obsolete and we shall reject the transaction.
 	fn parse_and_check_for_obsolete_call(
-		&self,
-		call: &CallOf<Runtime>,
-	) -> Result<Option<CallInfo>, TransactionValidityError> {
-		let calls = self.expand_call(call);
-		let total_calls = calls.len();
-		let mut calls = calls.into_iter().map(Self::check_obsolete_call).rev();
-
-		let msgs_call = calls.next().transpose()?.and_then(|c| c.call_info_for(Msgs::Id::get()));
-		let para_finality_call = calls
-			.next()
-			.transpose()?
-			.and_then(|c| c.submit_parachain_heads_info_for(Para::Id::get()));
-		let relay_finality_call =
-			calls.next().transpose()?.and_then(|c| c.submit_finality_proof_info());
+		call: &CallOf<Self::Runtime>,
+	) -> Result<Option<CallInfo>, TransactionValidityError>;
 
-		Ok(match (total_calls, relay_finality_call, para_finality_call, msgs_call) {
-			(3, Some(relay_finality_call), Some(para_finality_call), Some(msgs_call)) => Some(
-				CallInfo::AllFinalityAndMsgs(relay_finality_call, para_finality_call, msgs_call),
-			),
-			(2, None, Some(para_finality_call), Some(msgs_call)) =>
-				Some(CallInfo::ParachainFinalityAndMsgs(para_finality_call, msgs_call)),
-			(1, None, None, Some(msgs_call)) => Some(CallInfo::Msgs(msgs_call)),
-			_ => None,
-		})
-	}
+	/// Check if parsed call is already obsolete.
+	fn check_obsolete_parsed_call(
+		call: &CallOf<Self::Runtime>,
+	) -> Result<&CallOf<Self::Runtime>, TransactionValidityError>;
 
-	fn check_obsolete_call(
-		call: &CallOf<Runtime>,
-	) -> Result<&CallOf<Runtime>, TransactionValidityError> {
-		call.check_obsolete_submit_finality_proof()?;
-		call.check_obsolete_submit_parachain_heads()?;
-		call.check_obsolete_call()?;
-		Ok(call)
-	}
+	/// Called from post-dispatch and shall perform additional checks (apart from relay
+	/// chain finality and messages transaction finality) of given call result.
+	fn additional_call_result_check(
+		relayer: &AccountIdOf<Self::Runtime>,
+		call_info: &CallInfo,
+	) -> bool;
 
 	/// Given post-dispatch information, analyze the outcome of relayer call and return
 	/// actions that need to be performed on relayer account.
 	fn analyze_call_result(
-		pre: Option<Option<PreDispatchData<Runtime::AccountId>>>,
+		pre: Option<Option<PreDispatchData<AccountIdOf<Self::Runtime>>>>,
 		info: &DispatchInfo,
 		post_info: &PostDispatchInfo,
 		len: usize,
 		result: &DispatchResult,
-	) -> RelayerAccountAction<AccountIdOf<Runtime>, Runtime::Reward> {
+	) -> RelayerAccountAction<AccountIdOf<Self::Runtime>, <Self::Runtime as RelayersConfig>::Reward>
+	{
 		let mut extra_weight = Weight::zero();
 		let mut extra_size = 0;
 
@@ -344,15 +291,18 @@ where
 
 		// now we know that the relayer either needs to be rewarded, or slashed
 		// => let's prepare the correspondent account that pays reward/receives slashed amount
-		let reward_account_params = RewardsAccountParams::new(
-			Msgs::Id::get(),
-			Runtime::BridgedChainId::get(),
-			if call_info.is_receive_messages_proof_call() {
-				RewardsAccountOwner::ThisChain
-			} else {
-				RewardsAccountOwner::BridgedChain
-			},
-		);
+		let reward_account_params =
+			RewardsAccountParams::new(
+				<Self::Msgs as RefundableMessagesLaneId>::Id::get(),
+				<Self::Runtime as MessagesConfig<
+					<Self::Msgs as RefundableMessagesLaneId>::Instance,
+				>>::BridgedChainId::get(),
+				if call_info.is_receive_messages_proof_call() {
+					RewardsAccountOwner::ThisChain
+				} else {
+					RewardsAccountOwner::BridgedChain
+				},
+			);
 
 		// prepare return value for the case if the call has failed or it has not caused
 		// expected side effects (e.g. not all messages have been accepted)
@@ -376,10 +326,9 @@ where
 		if let Err(e) = result {
 			log::trace!(
 				target: "runtime::bridge",
-				"{} from parachain {} via {:?}: relayer {:?} has submitted invalid messages transaction: {:?}",
-				Self::IDENTIFIER,
-				Para::Id::get(),
-				Msgs::Id::get(),
+				"{} via {:?}: relayer {:?} has submitted invalid messages transaction: {:?}",
+				Self::Id::STR,
+				<Self::Msgs as RefundableMessagesLaneId>::Id::get(),
 				relayer,
 				e,
 			);
@@ -388,19 +337,18 @@ where
 
 		// check if relay chain state has been updated
 		if let Some(finality_proof_info) = call_info.submit_finality_proof_info() {
-			if !SubmitFinalityProofHelper::<Runtime, Runtime::BridgesGrandpaPalletInstance>::was_successful(
+			if !SubmitFinalityProofHelper::<Self::Runtime, Self::GrandpaInstance>::was_successful(
 				finality_proof_info.block_number,
 			) {
 				// we only refund relayer if all calls have updated chain state
 				log::trace!(
 					target: "runtime::bridge",
-					"{} from parachain {} via {:?}: relayer {:?} has submitted invalid relay chain finality proof",
-					Self::IDENTIFIER,
-					Para::Id::get(),
-					Msgs::Id::get(),
+					"{} via {:?}: relayer {:?} has submitted invalid relay chain finality proof",
+					Self::Id::STR,
+					<Self::Msgs as RefundableMessagesLaneId>::Id::get(),
 					relayer,
 				);
-				return slash_relayer_if_delivery_result;
+				return slash_relayer_if_delivery_result
 			}
 
 			// there's a conflict between how bridge GRANDPA pallet works and a `utility.batchAll`
@@ -416,39 +364,25 @@ where
 			extra_size = finality_proof_info.extra_size;
 		}
 
-		// check if parachain state has been updated
-		if let Some(para_proof_info) = call_info.submit_parachain_heads_info() {
-			if !SubmitParachainHeadsHelper::<Runtime, Para::Instance>::was_successful(
-				para_proof_info,
-			) {
-				// we only refund relayer if all calls have updated chain state
-				log::trace!(
-					target: "runtime::bridge",
-					"{} from parachain {} via {:?}: relayer {:?} has submitted invalid parachain finality proof",
-					Self::IDENTIFIER,
-					Para::Id::get(),
-					Msgs::Id::get(),
-					relayer,
-				);
-				return slash_relayer_if_delivery_result
-			}
-		}
-
 		// Check if the `ReceiveMessagesProof` call delivered at least some of the messages that
 		// it contained. If this happens, we consider the transaction "helpful" and refund it.
 		let msgs_call_info = call_info.messages_call_info();
-		if !MessagesCallHelper::<Runtime, Msgs::Instance>::was_successful(msgs_call_info) {
+		if !MessagesCallHelper::<Self::Runtime, <Self::Msgs as RefundableMessagesLaneId>::Instance>::was_successful(msgs_call_info) {
 			log::trace!(
 				target: "runtime::bridge",
-				"{} from parachain {} via {:?}: relayer {:?} has submitted invalid messages call",
-				Self::IDENTIFIER,
-				Para::Id::get(),
-				Msgs::Id::get(),
+				"{} via {:?}: relayer {:?} has submitted invalid messages call",
+				Self::Id::STR,
+				<Self::Msgs as RefundableMessagesLaneId>::Id::get(),
 				relayer,
 			);
 			return slash_relayer_if_delivery_result
 		}
 
+		// do additional check
+		if !Self::additional_call_result_check(&relayer, &call_info) {
+			return slash_relayer_if_delivery_result
+		}
+
 		// regarding the tip - refund that happens here (at this side of the bridge) isn't the whole
 		// relayer compensation. He'll receive some amount at the other side of the bridge. It shall
 		// (in theory) cover the tip there. Otherwise, if we'll be compensating tip here, some
@@ -464,14 +398,14 @@ where
 		// let's also replace the weight of slashing relayer with the weight of rewarding relayer
 		if call_info.is_receive_messages_proof_call() {
 			post_info_weight = post_info_weight.saturating_sub(
-				<Runtime as RelayersConfig>::WeightInfo::extra_weight_of_successful_receive_messages_proof_call(),
+				<Self::Runtime as RelayersConfig>::WeightInfo::extra_weight_of_successful_receive_messages_proof_call(),
 			);
 		}
 
 		// compute the relayer refund
 		let mut post_info = *post_info;
 		post_info.actual_weight = Some(post_info_weight);
-		let refund = Refund::compute_refund(info, &post_info, post_info_len, tip);
+		let refund = Self::Refund::compute_refund(info, &post_info, post_info_len, tip);
 
 		// we can finally reward relayer
 		RelayerAccountAction::Reward(relayer, reward_account_params, refund)
@@ -497,7 +431,11 @@ where
 		let bundled_messages = parsed_call.messages_call_info().bundled_messages().saturating_len();
 
 		// a quick check to avoid invalid high-priority transactions
-		if bundled_messages > Runtime::MaxUnconfirmedMessagesAtInboundLane::get() {
+		let max_unconfirmed_messages_in_confirmation_tx = <Self::Runtime as MessagesConfig<
+			<Self::Msgs as RefundableMessagesLaneId>::Instance,
+		>>::MaxUnconfirmedMessagesAtInboundLane::get(
+		);
+		if bundled_messages > max_unconfirmed_messages_in_confirmation_tx {
 			return None
 		}
 
@@ -505,31 +443,37 @@ where
 	}
 }
 
-impl<Runtime, Para, Msgs, Refund, Priority, Id> SignedExtension
-	for RefundBridgedParachainMessages<Runtime, Para, Msgs, Refund, Priority, Id>
+/// Adapter that allow implementing `sp_runtime::traits::SignedExtension` for any
+/// `RefundSignedExtension`.
+#[derive(
+	DefaultNoBound,
+	CloneNoBound,
+	Decode,
+	Encode,
+	EqNoBound,
+	PartialEqNoBound,
+	RuntimeDebugNoBound,
+	TypeInfo,
+)]
+pub struct RefundSignedExtensionAdapter<T: RefundSignedExtension>(T)
 where
-	Self: 'static + Send + Sync,
-	Runtime: UtilityConfig<RuntimeCall = CallOf<Runtime>>
-		+ BoundedBridgeGrandpaConfig<Runtime::BridgesGrandpaPalletInstance>
-		+ ParachainsConfig<Para::Instance>
-		+ MessagesConfig<Msgs::Instance>
-		+ RelayersConfig,
-	Para: RefundableParachainId,
-	Msgs: RefundableMessagesLaneId,
-	Refund: RefundCalculator<Balance = Runtime::Reward>,
-	Priority: Get<TransactionPriority>,
-	Id: StaticStrProvider,
-	CallOf<Runtime>: Dispatchable<Info = DispatchInfo, PostInfo = PostDispatchInfo>
-		+ IsSubType<CallableCallFor<UtilityPallet<Runtime>, Runtime>>
-		+ GrandpaCallSubType<Runtime, Runtime::BridgesGrandpaPalletInstance>
-		+ ParachainsCallSubType<Runtime, Para::Instance>
-		+ MessagesCallSubType<Runtime, Msgs::Instance>,
+	<T::Runtime as GrandpaConfig<T::GrandpaInstance>>::BridgedChain:
+		Chain<BlockNumber = RelayBlockNumber>;
+
+impl<T: RefundSignedExtension> SignedExtension for RefundSignedExtensionAdapter<T>
+where
+	<T::Runtime as GrandpaConfig<T::GrandpaInstance>>::BridgedChain:
+		Chain<BlockNumber = RelayBlockNumber>,
+	CallOf<T::Runtime>: Dispatchable<Info = DispatchInfo, PostInfo = PostDispatchInfo>
+		+ IsSubType<CallableCallFor<UtilityPallet<T::Runtime>, T::Runtime>>
+		+ GrandpaCallSubType<T::Runtime, T::GrandpaInstance>
+		+ MessagesCallSubType<T::Runtime, <T::Msgs as RefundableMessagesLaneId>::Instance>,
 {
-	const IDENTIFIER: &'static str = Id::STR;
-	type AccountId = Runtime::AccountId;
-	type Call = CallOf<Runtime>;
+	const IDENTIFIER: &'static str = T::Id::STR;
+	type AccountId = AccountIdOf<T::Runtime>;
+	type Call = CallOf<T::Runtime>;
 	type AdditionalSigned = ();
-	type Pre = Option<PreDispatchData<Runtime::AccountId>>;
+	type Pre = Option<PreDispatchData<AccountIdOf<T::Runtime>>>;
 
 	fn additional_signed(&self) -> Result<(), TransactionValidityError> {
 		Ok(())
@@ -547,34 +491,32 @@ where
 		// we're not calling `validate` from `pre_dispatch` directly because of performance
 		// reasons, so if you're adding some code that may fail here, please check if it needs
 		// to be added to the `pre_dispatch` as well
-		let parsed_call = self.parse_and_check_for_obsolete_call(call)?;
+		let parsed_call = T::parse_and_check_for_obsolete_call(call)?;
 
 		// the following code just plays with transaction priority and never returns an error
 
 		// we only boost priority of presumably correct message delivery transactions
-		let bundled_messages = match Self::bundled_messages_for_priority_boost(parsed_call.as_ref())
-		{
+		let bundled_messages = match T::bundled_messages_for_priority_boost(parsed_call.as_ref()) {
 			Some(bundled_messages) => bundled_messages,
 			None => return Ok(Default::default()),
 		};
 
 		// we only boost priority if relayer has staked required balance
-		if !RelayersPallet::<Runtime>::is_registration_active(who) {
+		if !RelayersPallet::<T::Runtime>::is_registration_active(who) {
 			return Ok(Default::default())
 		}
 
 		// compute priority boost
 		let priority_boost =
-			crate::priority_calculator::compute_priority_boost::<Priority>(bundled_messages);
+			crate::priority_calculator::compute_priority_boost::<T::Priority>(bundled_messages);
 		let valid_transaction = ValidTransactionBuilder::default().priority(priority_boost);
 
 		log::trace!(
 			target: "runtime::bridge",
-			"{} from parachain {} via {:?} has boosted priority of message delivery transaction \
+			"{} via {:?} has boosted priority of message delivery transaction \
 			of relayer {:?}: {} messages -> {} priority",
 			Self::IDENTIFIER,
-			Para::Id::get(),
-			Msgs::Id::get(),
+			<T::Msgs as RefundableMessagesLaneId>::Id::get(),
 			who,
 			bundled_messages,
 			priority_boost,
@@ -591,15 +533,14 @@ where
 		_len: usize,
 	) -> Result<Self::Pre, TransactionValidityError> {
 		// this is a relevant piece of `validate` that we need here (in `pre_dispatch`)
-		let parsed_call = self.parse_and_check_for_obsolete_call(call)?;
+		let parsed_call = T::parse_and_check_for_obsolete_call(call)?;
 
 		Ok(parsed_call.map(|call_info| {
 			log::trace!(
 				target: "runtime::bridge",
-				"{} from parachain {} via {:?} parsed bridge transaction in pre-dispatch: {:?}",
+				"{} via {:?} parsed bridge transaction in pre-dispatch: {:?}",
 				Self::IDENTIFIER,
-				Para::Id::get(),
-				Msgs::Id::get(),
+				<T::Msgs as RefundableMessagesLaneId>::Id::get(),
 				call_info,
 			);
 			PreDispatchData { relayer: who.clone(), call_info }
@@ -613,12 +554,12 @@ where
 		len: usize,
 		result: &DispatchResult,
 	) -> Result<(), TransactionValidityError> {
-		let call_result = Self::analyze_call_result(pre, info, post_info, len, result);
+		let call_result = T::analyze_call_result(pre, info, post_info, len, result);
 
 		match call_result {
 			RelayerAccountAction::None => (),
 			RelayerAccountAction::Reward(relayer, reward_account, reward) => {
-				RelayersPallet::<Runtime>::register_relayer_reward(
+				RelayersPallet::<T::Runtime>::register_relayer_reward(
 					reward_account,
 					&relayer,
 					reward,
@@ -626,22 +567,263 @@ where
 
 				log::trace!(
 					target: "runtime::bridge",
-					"{} from parachain {} via {:?} has registered reward: {:?} for {:?}",
+					"{} via {:?} has registered reward: {:?} for {:?}",
 					Self::IDENTIFIER,
-					Para::Id::get(),
-					Msgs::Id::get(),
+					<T::Msgs as RefundableMessagesLaneId>::Id::get(),
 					reward,
 					relayer,
 				);
 			},
 			RelayerAccountAction::Slash(relayer, slash_account) =>
-				RelayersPallet::<Runtime>::slash_and_deregister(&relayer, slash_account),
+				RelayersPallet::<T::Runtime>::slash_and_deregister(&relayer, slash_account),
 		}
 
 		Ok(())
 	}
 }
 
+/// Signed extension that refunds a relayer for new messages coming from a parachain.
+///
+/// Also refunds relayer for successful finality delivery if it comes in batch (`utility.batchAll`)
+/// with message delivery transaction. Batch may deliver either both relay chain header and
+/// parachain head, or just parachain head. Corresponding headers must be used in messages
+/// proof verification.
+///
+/// Extension does not refund transaction tip due to security reasons.
+#[derive(
+	DefaultNoBound,
+	CloneNoBound,
+	Decode,
+	Encode,
+	EqNoBound,
+	PartialEqNoBound,
+	RuntimeDebugNoBound,
+	TypeInfo,
+)]
+#[scale_info(skip_type_params(Runtime, Para, Msgs, Refund, Priority, Id))]
+pub struct RefundBridgedParachainMessages<Runtime, Para, Msgs, Refund, Priority, Id>(
+	PhantomData<(
+		// runtime with `frame-utility`, `pallet-bridge-grandpa`, `pallet-bridge-parachains`,
+		// `pallet-bridge-messages` and `pallet-bridge-relayers` pallets deployed
+		Runtime,
+		// implementation of `RefundableParachainId` trait, which specifies the instance of
+		// the used `pallet-bridge-parachains` pallet and the bridged parachain id
+		Para,
+		// implementation of `RefundableMessagesLaneId` trait, which specifies the instance of
+		// the used `pallet-bridge-messages` pallet and the lane within this pallet
+		Msgs,
+		// implementation of the `RefundCalculator` trait, that is used to compute refund that
+		// we give to relayer for his transaction
+		Refund,
+		// getter for per-message `TransactionPriority` boost that we give to message
+		// delivery transactions
+		Priority,
+		// the runtime-unique identifier of this signed extension
+		Id,
+	)>,
+);
+
+impl<Runtime, Para, Msgs, Refund, Priority, Id> RefundSignedExtension
+	for RefundBridgedParachainMessages<Runtime, Para, Msgs, Refund, Priority, Id>
+where
+	Self: 'static + Send + Sync,
+	Runtime: UtilityConfig<RuntimeCall = CallOf<Runtime>>
+		+ BoundedBridgeGrandpaConfig<Runtime::BridgesGrandpaPalletInstance>
+		+ ParachainsConfig<Para::Instance>
+		+ MessagesConfig<Msgs::Instance>
+		+ RelayersConfig,
+	Para: RefundableParachainId,
+	Msgs: RefundableMessagesLaneId,
+	Refund: RefundCalculator<Balance = Runtime::Reward>,
+	Priority: Get<TransactionPriority>,
+	Id: StaticStrProvider,
+	CallOf<Runtime>: Dispatchable<Info = DispatchInfo, PostInfo = PostDispatchInfo>
+		+ IsSubType<CallableCallFor<UtilityPallet<Runtime>, Runtime>>
+		+ GrandpaCallSubType<Runtime, Runtime::BridgesGrandpaPalletInstance>
+		+ ParachainsCallSubType<Runtime, Para::Instance>
+		+ MessagesCallSubType<Runtime, Msgs::Instance>,
+{
+	type Runtime = Runtime;
+	type GrandpaInstance = Runtime::BridgesGrandpaPalletInstance;
+	type Msgs = Msgs;
+	type Refund = Refund;
+	type Priority = Priority;
+	type Id = Id;
+
+	fn expand_call(call: &CallOf<Runtime>) -> Vec<&CallOf<Runtime>> {
+		match call.is_sub_type() {
+			Some(UtilityCall::<Runtime>::batch_all { ref calls }) if calls.len() <= 3 =>
+				calls.iter().collect(),
+			Some(_) => vec![],
+			None => vec![call],
+		}
+	}
+
+	fn parse_and_check_for_obsolete_call(
+		call: &CallOf<Runtime>,
+	) -> Result<Option<CallInfo>, TransactionValidityError> {
+		let calls = Self::expand_call(call);
+		let total_calls = calls.len();
+		let mut calls = calls.into_iter().map(Self::check_obsolete_parsed_call).rev();
+
+		let msgs_call = calls.next().transpose()?.and_then(|c| c.call_info_for(Msgs::Id::get()));
+		let para_finality_call = calls
+			.next()
+			.transpose()?
+			.and_then(|c| c.submit_parachain_heads_info_for(Para::Id::get()));
+		let relay_finality_call =
+			calls.next().transpose()?.and_then(|c| c.submit_finality_proof_info());
+
+		Ok(match (total_calls, relay_finality_call, para_finality_call, msgs_call) {
+			(3, Some(relay_finality_call), Some(para_finality_call), Some(msgs_call)) => Some(
+				CallInfo::AllFinalityAndMsgs(relay_finality_call, para_finality_call, msgs_call),
+			),
+			(2, None, Some(para_finality_call), Some(msgs_call)) =>
+				Some(CallInfo::ParachainFinalityAndMsgs(para_finality_call, msgs_call)),
+			(1, None, None, Some(msgs_call)) => Some(CallInfo::Msgs(msgs_call)),
+			_ => None,
+		})
+	}
+
+	fn check_obsolete_parsed_call(
+		call: &CallOf<Runtime>,
+	) -> Result<&CallOf<Runtime>, TransactionValidityError> {
+		call.check_obsolete_submit_finality_proof()?;
+		call.check_obsolete_submit_parachain_heads()?;
+		call.check_obsolete_call()?;
+		Ok(call)
+	}
+
+	fn additional_call_result_check(relayer: &Runtime::AccountId, call_info: &CallInfo) -> bool {
+		// check if parachain state has been updated
+		if let Some(para_proof_info) = call_info.submit_parachain_heads_info() {
+			if !SubmitParachainHeadsHelper::<Runtime, Para::Instance>::was_successful(
+				para_proof_info,
+			) {
+				// we only refund relayer if all calls have updated chain state
+				log::trace!(
+					target: "runtime::bridge",
+					"{} from parachain {} via {:?}: relayer {:?} has submitted invalid parachain finality proof",
+					Id::STR,
+					Para::Id::get(),
+					Msgs::Id::get(),
+					relayer,
+				);
+				return false
+			}
+		}
+
+		true
+	}
+}
+
+/// Signed extension that refunds a relayer for new messages coming from a standalone (GRANDPA)
+/// chain.
+///
+/// Also refunds relayer for successful finality delivery if it comes in batch (`utility.batchAll`)
+/// with message delivery transaction. Batch may deliver either both relay chain header and
+/// parachain head, or just parachain head. Corresponding headers must be used in messages
+/// proof verification.
+///
+/// Extension does not refund transaction tip due to security reasons.
+#[derive(
+	DefaultNoBound,
+	CloneNoBound,
+	Decode,
+	Encode,
+	EqNoBound,
+	PartialEqNoBound,
+	RuntimeDebugNoBound,
+	TypeInfo,
+)]
+#[scale_info(skip_type_params(Runtime, GrandpaInstance, Msgs, Refund, Priority, Id))]
+pub struct RefundBridgedGrandpaMessages<Runtime, GrandpaInstance, Msgs, Refund, Priority, Id>(
+	PhantomData<(
+		// runtime with `frame-utility`, `pallet-bridge-grandpa`,
+		// `pallet-bridge-messages` and `pallet-bridge-relayers` pallets deployed
+		Runtime,
+		// bridge GRANDPA pallet instance, used to track bridged chain state
+		GrandpaInstance,
+		// implementation of `RefundableMessagesLaneId` trait, which specifies the instance of
+		// the used `pallet-bridge-messages` pallet and the lane within this pallet
+		Msgs,
+		// implementation of the `RefundCalculator` trait, that is used to compute refund that
+		// we give to relayer for his transaction
+		Refund,
+		// getter for per-message `TransactionPriority` boost that we give to message
+		// delivery transactions
+		Priority,
+		// the runtime-unique identifier of this signed extension
+		Id,
+	)>,
+);
+
+impl<Runtime, GrandpaInstance, Msgs, Refund, Priority, Id> RefundSignedExtension
+	for RefundBridgedGrandpaMessages<Runtime, GrandpaInstance, Msgs, Refund, Priority, Id>
+where
+	Self: 'static + Send + Sync,
+	Runtime: UtilityConfig<RuntimeCall = CallOf<Runtime>>
+		+ BoundedBridgeGrandpaConfig<GrandpaInstance>
+		+ MessagesConfig<Msgs::Instance>
+		+ RelayersConfig,
+	GrandpaInstance: 'static,
+	Msgs: RefundableMessagesLaneId,
+	Refund: RefundCalculator<Balance = Runtime::Reward>,
+	Priority: Get<TransactionPriority>,
+	Id: StaticStrProvider,
+	CallOf<Runtime>: Dispatchable<Info = DispatchInfo, PostInfo = PostDispatchInfo>
+		+ IsSubType<CallableCallFor<UtilityPallet<Runtime>, Runtime>>
+		+ GrandpaCallSubType<Runtime, GrandpaInstance>
+		+ MessagesCallSubType<Runtime, Msgs::Instance>,
+{
+	type Runtime = Runtime;
+	type GrandpaInstance = GrandpaInstance;
+	type Msgs = Msgs;
+	type Refund = Refund;
+	type Priority = Priority;
+	type Id = Id;
+
+	fn expand_call(call: &CallOf<Runtime>) -> Vec<&CallOf<Runtime>> {
+		match call.is_sub_type() {
+			Some(UtilityCall::<Runtime>::batch_all { ref calls }) if calls.len() <= 2 =>
+				calls.iter().collect(),
+			Some(_) => vec![],
+			None => vec![call],
+		}
+	}
+
+	fn parse_and_check_for_obsolete_call(
+		call: &CallOf<Runtime>,
+	) -> Result<Option<CallInfo>, TransactionValidityError> {
+		let calls = Self::expand_call(call);
+		let total_calls = calls.len();
+		let mut calls = calls.into_iter().map(Self::check_obsolete_parsed_call).rev();
+
+		let msgs_call = calls.next().transpose()?.and_then(|c| c.call_info_for(Msgs::Id::get()));
+		let relay_finality_call =
+			calls.next().transpose()?.and_then(|c| c.submit_finality_proof_info());
+
+		Ok(match (total_calls, relay_finality_call, msgs_call) {
+			(2, Some(relay_finality_call), Some(msgs_call)) =>
+				Some(CallInfo::RelayFinalityAndMsgs(relay_finality_call, msgs_call)),
+			(1, None, Some(msgs_call)) => Some(CallInfo::Msgs(msgs_call)),
+			_ => None,
+		})
+	}
+
+	fn check_obsolete_parsed_call(
+		call: &CallOf<Runtime>,
+	) -> Result<&CallOf<Runtime>, TransactionValidityError> {
+		call.check_obsolete_submit_finality_proof()?;
+		call.check_obsolete_call()?;
+		Ok(call)
+	}
+
+	fn additional_call_result_check(_relayer: &Runtime::AccountId, _call_info: &CallInfo) -> bool {
+		true
+	}
+}
+
 #[cfg(test)]
 mod tests {
 	use super::*;
@@ -655,19 +837,24 @@ mod tests {
 		},
 		mock::*,
 	};
-	use bp_messages::{InboundLaneData, MessageNonce, OutboundLaneData, UnrewardedRelayersState};
+	use bp_messages::{
+		DeliveredMessages, InboundLaneData, MessageNonce, MessagesOperatingMode, OutboundLaneData,
+		UnrewardedRelayer, UnrewardedRelayersState,
+	};
 	use bp_parachains::{BestParaHeadHash, ParaInfo};
 	use bp_polkadot_core::parachains::{ParaHeadsProof, ParaId};
-	use bp_runtime::HeaderId;
+	use bp_runtime::{BasicOperatingMode, HeaderId};
 	use bp_test_utils::{make_default_justification, test_keyring};
 	use frame_support::{
 		assert_storage_noop, parameter_types,
 		traits::{fungible::Mutate, ReservableCurrency},
 		weights::Weight,
 	};
-	use pallet_bridge_grandpa::{Call as GrandpaCall, StoredAuthoritySet};
-	use pallet_bridge_messages::Call as MessagesCall;
-	use pallet_bridge_parachains::{Call as ParachainsCall, RelayBlockHash};
+	use pallet_bridge_grandpa::{Call as GrandpaCall, Pallet as GrandpaPallet, StoredAuthoritySet};
+	use pallet_bridge_messages::{Call as MessagesCall, Pallet as MessagesPallet};
+	use pallet_bridge_parachains::{
+		Call as ParachainsCall, Pallet as ParachainsPallet, RelayBlockHash,
+	};
 	use sp_runtime::{
 		traits::{ConstU64, Header as HeaderT},
 		transaction_validity::{InvalidTransaction, ValidTransaction},
@@ -690,7 +877,17 @@ mod tests {
 	}
 
 	bp_runtime::generate_static_str_provider!(TestExtension);
-	type TestExtension = RefundBridgedParachainMessages<
+
+	type TestGrandpaExtensionProvider = RefundBridgedGrandpaMessages<
+		TestRuntime,
+		(),
+		RefundableMessagesLane<(), TestLaneId>,
+		ActualFeeRefund<TestRuntime>,
+		ConstU64<1>,
+		StrTestExtension,
+	>;
+	type TestGrandpaExtension = RefundSignedExtensionAdapter<TestGrandpaExtensionProvider>;
+	type TestExtensionProvider = RefundBridgedParachainMessages<
 		TestRuntime,
 		DefaultRefundableParachainId<(), TestParachain>,
 		RefundableMessagesLane<(), TestLaneId>,
@@ -698,6 +895,7 @@ mod tests {
 		ConstU64<1>,
 		StrTestExtension,
 	>;
+	type TestExtension = RefundSignedExtensionAdapter<TestExtensionProvider>;
 
 	fn initial_balance_of_relayer_account_at_this_chain() -> ThisChainBalance {
 		let test_stake: ThisChainBalance = TestStake::get();
@@ -825,25 +1023,49 @@ mod tests {
 		})
 	}
 
-	fn parachain_finality_and_delivery_batch_call(
-		parachain_head_at_relay_header_number: RelayBlockNumber,
+	fn parachain_finality_and_delivery_batch_call(
+		parachain_head_at_relay_header_number: RelayBlockNumber,
+		best_message: MessageNonce,
+	) -> RuntimeCall {
+		RuntimeCall::Utility(UtilityCall::batch_all {
+			calls: vec![
+				submit_parachain_head_call(parachain_head_at_relay_header_number),
+				message_delivery_call(best_message),
+			],
+		})
+	}
+
+	fn parachain_finality_and_confirmation_batch_call(
+		parachain_head_at_relay_header_number: RelayBlockNumber,
+		best_message: MessageNonce,
+	) -> RuntimeCall {
+		RuntimeCall::Utility(UtilityCall::batch_all {
+			calls: vec![
+				submit_parachain_head_call(parachain_head_at_relay_header_number),
+				message_confirmation_call(best_message),
+			],
+		})
+	}
+
+	fn relay_finality_and_delivery_batch_call(
+		relay_header_number: RelayBlockNumber,
 		best_message: MessageNonce,
 	) -> RuntimeCall {
 		RuntimeCall::Utility(UtilityCall::batch_all {
 			calls: vec![
-				submit_parachain_head_call(parachain_head_at_relay_header_number),
+				submit_relay_header_call(relay_header_number),
 				message_delivery_call(best_message),
 			],
 		})
 	}
 
-	fn parachain_finality_and_confirmation_batch_call(
-		parachain_head_at_relay_header_number: RelayBlockNumber,
+	fn relay_finality_and_confirmation_batch_call(
+		relay_header_number: RelayBlockNumber,
 		best_message: MessageNonce,
 	) -> RuntimeCall {
 		RuntimeCall::Utility(UtilityCall::batch_all {
 			calls: vec![
-				submit_parachain_head_call(parachain_head_at_relay_header_number),
+				submit_relay_header_call(relay_header_number),
 				message_confirmation_call(best_message),
 			],
 		})
@@ -931,6 +1153,50 @@ mod tests {
 		}
 	}
 
+	fn relay_finality_pre_dispatch_data() -> PreDispatchData<ThisChainAccountId> {
+		PreDispatchData {
+			relayer: relayer_account_at_this_chain(),
+			call_info: CallInfo::RelayFinalityAndMsgs(
+				SubmitFinalityProofInfo {
+					block_number: 200,
+					extra_weight: Weight::zero(),
+					extra_size: 0,
+				},
+				MessagesCallInfo::ReceiveMessagesProof(ReceiveMessagesProofInfo {
+					base: BaseMessagesProofInfo {
+						lane_id: TEST_LANE_ID,
+						bundled_range: 101..=200,
+						best_stored_nonce: 100,
+					},
+					unrewarded_relayers: UnrewardedRelayerOccupation {
+						free_relayer_slots: MaxUnrewardedRelayerEntriesAtInboundLane::get(),
+						free_message_slots: MaxUnconfirmedMessagesAtInboundLane::get(),
+					},
+				}),
+			),
+		}
+	}
+
+	fn relay_finality_confirmation_pre_dispatch_data() -> PreDispatchData<ThisChainAccountId> {
+		PreDispatchData {
+			relayer: relayer_account_at_this_chain(),
+			call_info: CallInfo::RelayFinalityAndMsgs(
+				SubmitFinalityProofInfo {
+					block_number: 200,
+					extra_weight: Weight::zero(),
+					extra_size: 0,
+				},
+				MessagesCallInfo::ReceiveMessagesDeliveryProof(ReceiveMessagesDeliveryProofInfo(
+					BaseMessagesProofInfo {
+						lane_id: TEST_LANE_ID,
+						bundled_range: 101..=200,
+						best_stored_nonce: 100,
+					},
+				)),
+			),
+		}
+	}
+
 	fn parachain_finality_pre_dispatch_data() -> PreDispatchData<ThisChainAccountId> {
 		PreDispatchData {
 			relayer: relayer_account_at_this_chain(),
@@ -1013,6 +1279,7 @@ mod tests {
 	) -> PreDispatchData<ThisChainAccountId> {
 		let msg_info = match pre_dispatch_data.call_info {
 			CallInfo::AllFinalityAndMsgs(_, _, ref mut info) => info,
+			CallInfo::RelayFinalityAndMsgs(_, ref mut info) => info,
 			CallInfo::ParachainFinalityAndMsgs(_, ref mut info) => info,
 			CallInfo::Msgs(ref mut info) => info,
 		};
@@ -1025,7 +1292,14 @@ mod tests {
 	}
 
 	fn run_validate(call: RuntimeCall) -> TransactionValidity {
-		let extension: TestExtension = RefundBridgedParachainMessages(PhantomData);
+		let extension: TestExtension =
+			RefundSignedExtensionAdapter(RefundBridgedParachainMessages(PhantomData));
+		extension.validate(&relayer_account_at_this_chain(), &call, &DispatchInfo::default(), 0)
+	}
+
+	fn run_grandpa_validate(call: RuntimeCall) -> TransactionValidity {
+		let extension: TestGrandpaExtension =
+			RefundSignedExtensionAdapter(RefundBridgedGrandpaMessages(PhantomData));
 		extension.validate(&relayer_account_at_this_chain(), &call, &DispatchInfo::default(), 0)
 	}
 
@@ -1039,7 +1313,16 @@ mod tests {
 	fn run_pre_dispatch(
 		call: RuntimeCall,
 	) -> Result<Option<PreDispatchData<ThisChainAccountId>>, TransactionValidityError> {
-		let extension: TestExtension = RefundBridgedParachainMessages(PhantomData);
+		let extension: TestExtension =
+			RefundSignedExtensionAdapter(RefundBridgedParachainMessages(PhantomData));
+		extension.pre_dispatch(&relayer_account_at_this_chain(), &call, &DispatchInfo::default(), 0)
+	}
+
+	fn run_grandpa_pre_dispatch(
+		call: RuntimeCall,
+	) -> Result<Option<PreDispatchData<ThisChainAccountId>>, TransactionValidityError> {
+		let extension: TestGrandpaExtension =
+			RefundSignedExtensionAdapter(RefundBridgedGrandpaMessages(PhantomData));
 		extension.pre_dispatch(&relayer_account_at_this_chain(), &call, &DispatchInfo::default(), 0)
 	}
 
@@ -1311,6 +1594,99 @@ mod tests {
 		});
 	}
 
+	#[test]
+	fn ext_rejects_batch_with_grandpa_finality_proof_when_grandpa_pallet_is_halted() {
+		run_test(|| {
+			initialize_environment(100, 100, 100);
+
+			GrandpaPallet::<TestRuntime, ()>::set_operating_mode(
+				RuntimeOrigin::root(),
+				BasicOperatingMode::Halted,
+			)
+			.unwrap();
+
+			assert_eq!(
+				run_pre_dispatch(all_finality_and_delivery_batch_call(200, 200, 200)),
+				Err(TransactionValidityError::Invalid(InvalidTransaction::Call)),
+			);
+			assert_eq!(
+				run_pre_dispatch(all_finality_and_confirmation_batch_call(200, 200, 200)),
+				Err(TransactionValidityError::Invalid(InvalidTransaction::Call)),
+			);
+		});
+	}
+
+	#[test]
+	fn ext_rejects_batch_with_parachain_finality_proof_when_parachains_pallet_is_halted() {
+		run_test(|| {
+			initialize_environment(100, 100, 100);
+
+			ParachainsPallet::<TestRuntime, ()>::set_operating_mode(
+				RuntimeOrigin::root(),
+				BasicOperatingMode::Halted,
+			)
+			.unwrap();
+
+			assert_eq!(
+				run_pre_dispatch(all_finality_and_delivery_batch_call(200, 200, 200)),
+				Err(TransactionValidityError::Invalid(InvalidTransaction::Call)),
+			);
+			assert_eq!(
+				run_pre_dispatch(all_finality_and_confirmation_batch_call(200, 200, 200)),
+				Err(TransactionValidityError::Invalid(InvalidTransaction::Call)),
+			);
+
+			assert_eq!(
+				run_pre_dispatch(parachain_finality_and_delivery_batch_call(200, 200)),
+				Err(TransactionValidityError::Invalid(InvalidTransaction::Call)),
+			);
+			assert_eq!(
+				run_pre_dispatch(parachain_finality_and_confirmation_batch_call(200, 200)),
+				Err(TransactionValidityError::Invalid(InvalidTransaction::Call)),
+			);
+		});
+	}
+
+	#[test]
+	fn ext_rejects_transaction_when_messages_pallet_is_halted() {
+		run_test(|| {
+			initialize_environment(100, 100, 100);
+
+			MessagesPallet::<TestRuntime, ()>::set_operating_mode(
+				RuntimeOrigin::root(),
+				MessagesOperatingMode::Basic(BasicOperatingMode::Halted),
+			)
+			.unwrap();
+
+			assert_eq!(
+				run_pre_dispatch(all_finality_and_delivery_batch_call(200, 200, 200)),
+				Err(TransactionValidityError::Invalid(InvalidTransaction::Call)),
+			);
+			assert_eq!(
+				run_pre_dispatch(all_finality_and_confirmation_batch_call(200, 200, 200)),
+				Err(TransactionValidityError::Invalid(InvalidTransaction::Call)),
+			);
+
+			assert_eq!(
+				run_pre_dispatch(parachain_finality_and_delivery_batch_call(200, 200)),
+				Err(TransactionValidityError::Invalid(InvalidTransaction::Call)),
+			);
+			assert_eq!(
+				run_pre_dispatch(parachain_finality_and_confirmation_batch_call(200, 200)),
+				Err(TransactionValidityError::Invalid(InvalidTransaction::Call)),
+			);
+
+			assert_eq!(
+				run_pre_dispatch(message_delivery_call(200)),
+				Err(TransactionValidityError::Invalid(InvalidTransaction::Call)),
+			);
+			assert_eq!(
+				run_pre_dispatch(message_confirmation_call(200)),
+				Err(TransactionValidityError::Invalid(InvalidTransaction::Call)),
+			);
+		});
+	}
+
 	#[test]
 	fn pre_dispatch_parses_batch_with_relay_chain_and_parachain_headers() {
 		run_test(|| {
@@ -1674,7 +2050,7 @@ mod tests {
 		pre_dispatch_data: PreDispatchData<ThisChainAccountId>,
 		dispatch_result: DispatchResult,
 	) -> RelayerAccountAction<ThisChainAccountId, ThisChainBalance> {
-		TestExtension::analyze_call_result(
+		TestExtensionProvider::analyze_call_result(
 			Some(Some(pre_dispatch_data)),
 			&dispatch_info(),
 			&post_dispatch_info(),
@@ -1737,4 +2113,209 @@ mod tests {
 			);
 		});
 	}
+
+	#[test]
+	fn grandpa_ext_only_parses_valid_batches() {
+		run_test(|| {
+			initialize_environment(100, 100, 100);
+
+			// relay + parachain + message delivery calls batch is ignored
+			assert_eq!(
+				TestGrandpaExtensionProvider::parse_and_check_for_obsolete_call(
+					&all_finality_and_delivery_batch_call(200, 200, 200)
+				),
+				Ok(None),
+			);
+
+			// relay + parachain + message confirmation calls batch is ignored
+			assert_eq!(
+				TestGrandpaExtensionProvider::parse_and_check_for_obsolete_call(
+					&all_finality_and_confirmation_batch_call(200, 200, 200)
+				),
+				Ok(None),
+			);
+
+			// parachain + message delivery call batch is ignored
+			assert_eq!(
+				TestGrandpaExtensionProvider::parse_and_check_for_obsolete_call(
+					&parachain_finality_and_delivery_batch_call(200, 200)
+				),
+				Ok(None),
+			);
+
+			// parachain + message confirmation call batch is ignored
+			assert_eq!(
+				TestGrandpaExtensionProvider::parse_and_check_for_obsolete_call(
+					&parachain_finality_and_confirmation_batch_call(200, 200)
+				),
+				Ok(None),
+			);
+
+			// relay + message delivery call batch is accepted
+			assert_eq!(
+				TestGrandpaExtensionProvider::parse_and_check_for_obsolete_call(
+					&relay_finality_and_delivery_batch_call(200, 200)
+				),
+				Ok(Some(relay_finality_pre_dispatch_data().call_info)),
+			);
+
+			// relay + message confirmation call batch is accepted
+			assert_eq!(
+				TestGrandpaExtensionProvider::parse_and_check_for_obsolete_call(
+					&relay_finality_and_confirmation_batch_call(200, 200)
+				),
+				Ok(Some(relay_finality_confirmation_pre_dispatch_data().call_info)),
+			);
+
+			// message delivery call batch is accepted
+			assert_eq!(
+				TestGrandpaExtensionProvider::parse_and_check_for_obsolete_call(
+					&message_delivery_call(200)
+				),
+				Ok(Some(delivery_pre_dispatch_data().call_info)),
+			);
+
+			// message confirmation call batch is accepted
+			assert_eq!(
+				TestGrandpaExtensionProvider::parse_and_check_for_obsolete_call(
+					&message_confirmation_call(200)
+				),
+				Ok(Some(confirmation_pre_dispatch_data().call_info)),
+			);
+		});
+	}
+
+	#[test]
+	fn grandpa_ext_rejects_batch_with_obsolete_relay_chain_header() {
+		run_test(|| {
+			initialize_environment(100, 100, 100);
+
+			assert_eq!(
+				run_grandpa_pre_dispatch(relay_finality_and_delivery_batch_call(100, 200)),
+				Err(TransactionValidityError::Invalid(InvalidTransaction::Stale)),
+			);
+
+			assert_eq!(
+				run_grandpa_validate(relay_finality_and_delivery_batch_call(100, 200)),
+				Err(TransactionValidityError::Invalid(InvalidTransaction::Stale)),
+			);
+		});
+	}
+
+	#[test]
+	fn grandpa_ext_rejects_calls_with_obsolete_messages() {
+		run_test(|| {
+			initialize_environment(100, 100, 100);
+
+			assert_eq!(
+				run_grandpa_pre_dispatch(relay_finality_and_delivery_batch_call(200, 100)),
+				Err(TransactionValidityError::Invalid(InvalidTransaction::Stale)),
+			);
+			assert_eq!(
+				run_grandpa_pre_dispatch(relay_finality_and_confirmation_batch_call(200, 100)),
+				Err(TransactionValidityError::Invalid(InvalidTransaction::Stale)),
+			);
+
+			assert_eq!(
+				run_grandpa_validate(relay_finality_and_delivery_batch_call(200, 100)),
+				Err(TransactionValidityError::Invalid(InvalidTransaction::Stale)),
+			);
+			assert_eq!(
+				run_grandpa_validate(relay_finality_and_confirmation_batch_call(200, 100)),
+				Err(TransactionValidityError::Invalid(InvalidTransaction::Stale)),
+			);
+
+			assert_eq!(
+				run_grandpa_pre_dispatch(message_delivery_call(100)),
+				Err(TransactionValidityError::Invalid(InvalidTransaction::Stale)),
+			);
+			assert_eq!(
+				run_grandpa_pre_dispatch(message_confirmation_call(100)),
+				Err(TransactionValidityError::Invalid(InvalidTransaction::Stale)),
+			);
+
+			assert_eq!(
+				run_grandpa_validate(message_delivery_call(100)),
+				Err(TransactionValidityError::Invalid(InvalidTransaction::Stale)),
+			);
+			assert_eq!(
+				run_grandpa_validate(message_confirmation_call(100)),
+				Err(TransactionValidityError::Invalid(InvalidTransaction::Stale)),
+			);
+		});
+	}
+
+	#[test]
+	fn grandpa_ext_accepts_calls_with_new_messages() {
+		run_test(|| {
+			initialize_environment(100, 100, 100);
+
+			assert_eq!(
+				run_grandpa_pre_dispatch(relay_finality_and_delivery_batch_call(200, 200)),
+				Ok(Some(relay_finality_pre_dispatch_data()),)
+			);
+			assert_eq!(
+				run_grandpa_pre_dispatch(relay_finality_and_confirmation_batch_call(200, 200)),
+				Ok(Some(relay_finality_confirmation_pre_dispatch_data())),
+			);
+
+			assert_eq!(
+				run_grandpa_validate(relay_finality_and_delivery_batch_call(200, 200)),
+				Ok(Default::default()),
+			);
+			assert_eq!(
+				run_grandpa_validate(relay_finality_and_confirmation_batch_call(200, 200)),
+				Ok(Default::default()),
+			);
+
+			assert_eq!(
+				run_grandpa_pre_dispatch(message_delivery_call(200)),
+				Ok(Some(delivery_pre_dispatch_data())),
+			);
+			assert_eq!(
+				run_grandpa_pre_dispatch(message_confirmation_call(200)),
+				Ok(Some(confirmation_pre_dispatch_data())),
+			);
+
+			assert_eq!(run_grandpa_validate(message_delivery_call(200)), Ok(Default::default()),);
+			assert_eq!(
+				run_grandpa_validate(message_confirmation_call(200)),
+				Ok(Default::default()),
+			);
+		});
+	}
+
+	#[test]
+	fn does_not_panic_on_boosting_priority_of_empty_message_delivery_transaction() {
+		run_test(|| {
+			let best_delivered_message = MaxUnconfirmedMessagesAtInboundLane::get();
+			initialize_environment(100, 100, best_delivered_message);
+
+			// register relayer so it gets priority boost
+			BridgeRelayers::register(RuntimeOrigin::signed(relayer_account_at_this_chain()), 1000)
+				.unwrap();
+
+			// allow empty message delivery transactions
+			let lane_id = TestLaneId::get();
+			let in_lane_data = InboundLaneData {
+				last_confirmed_nonce: 0,
+				relayers: vec![UnrewardedRelayer {
+					relayer: relayer_account_at_bridged_chain(),
+					messages: DeliveredMessages { begin: 1, end: best_delivered_message },
+				}]
+				.into(),
+			};
+			pallet_bridge_messages::InboundLanes::<TestRuntime>::insert(lane_id, in_lane_data);
+
+			// now check that the priority of empty tx is the same as priority of 1-message tx
+			let priority_of_zero_messages_delivery =
+				run_validate(message_delivery_call(best_delivered_message)).unwrap().priority;
+			let priority_of_one_messages_delivery =
+				run_validate(message_delivery_call(best_delivered_message + 1))
+					.unwrap()
+					.priority;
+
+			assert_eq!(priority_of_zero_messages_delivery, priority_of_one_messages_delivery);
+		});
+	}
 }
diff --git a/cumulus/bridges/docs/complex-relay.html b/bridges/docs/complex-relay.html
similarity index 100%
rename from cumulus/bridges/docs/complex-relay.html
rename to bridges/docs/complex-relay.html
diff --git a/cumulus/bridges/docs/grandpa-finality-relay.html b/bridges/docs/grandpa-finality-relay.html
similarity index 100%
rename from cumulus/bridges/docs/grandpa-finality-relay.html
rename to bridges/docs/grandpa-finality-relay.html
diff --git a/bridges/docs/high-level-overview.md b/bridges/docs/high-level-overview.md
new file mode 100644
index 0000000000000000000000000000000000000000..42efc8100bd080763c22ea3e4e813f3c3c87db37
--- /dev/null
+++ b/bridges/docs/high-level-overview.md
@@ -0,0 +1,184 @@
+# High-Level Bridge Documentation
+
+This document gives a brief, abstract description of main components that may be found in this repository. If you want
+to see how we're using them to build Rococo <> Wococo (Kusama <> Polkadot) bridge, please refer to the [Polkadot <>
+Kusama Bridge](./polkadot-kusama-bridge-overview.md).
+
+## Purpose
+
+This repo contains all components required to build a trustless connection between standalone Substrate chains, that are
+using GRANDPA finality, their parachains or any combination of those. On top of this connection, we offer a messaging
+pallet that provides means to organize messages exchange.
+
+On top of that layered infrastructure, anyone may build their own bridge applications - e.g. [XCM
+messaging](./polkadot-kusama-bridge-overview.md), [encoded calls
+messaging](https://github.com/paritytech/parity-bridges-common/releases/tag/encoded-calls-messaging) and so on.
+
+## Terminology
+
+Even though we support (and require) two-way bridging, the documentation will generally talk about a one-sided
+interaction. That's to say, we will only talk about syncing finality proofs and messages from a _source_ chain to a
+_target_ chain. This is because the two-sided interaction is really just the one-sided interaction with the source and
+target chains switched.
+
+The bridge has both on-chain (pallets) and offchain (relayers) components.
+
+## On-chain components
+
+On-chain bridge components are pallets that are deployed at the chain runtime. Finality pallets require deployment at
+the target chain, while messages pallet needs to be deployed at both, source and target chains.
+
+### Bridge GRANDPA Finality Pallet
+
+A GRANDPA light client of the source chain built into the target chain's runtime. It provides a "source of truth" about
+the source chain headers which have been finalized. This is useful for higher level applications.
+
+The pallet tracks current GRANDPA authorities set and only accepts finality proofs (GRANDPA justifications), generated
+by the current authorities set. The GRANDPA protocol itself requires current authorities set to generate explicit
+justification for the header that enacts next authorities set. Such headers and their finality proofs are called
+mandatory in the pallet and relayer pays no fee for such headers submission.
+
+The pallet does not require all headers to be imported or provided. The relayer itself chooses which headers he wants to
+submit (with the exception of mandatory headers).
+
+More: [pallet level documentation and code](../modules/grandpa/).
+
+### Bridge Parachains Finality Pallet
+
+Parachains are not supposed to have their own finality, so we can't use bridge GRANDPA pallet to verify their finality
+proofs. Instead, they rely on their relay chain finality. The parachain header is considered final, when it is accepted
+by the [`paras`
+pallet](https://github.com/paritytech/polkadot/tree/1a034bd6de0e76721d19aed02a538bcef0787260/runtime/parachains/src/paras)
+at its relay chain. Obviously, the relay chain block, where it is accepted, must also be finalized by the relay chain
+GRANDPA gadget.
+
+That said, the bridge parachains pallet accepts storage proof of one or several parachain heads, inserted to the
+[`Heads`](https://github.com/paritytech/polkadot/blob/1a034bd6de0e76721d19aed02a538bcef0787260/runtime/parachains/src/paras/mod.rs#L642)
+map of the [`paras`
+pallet](https://github.com/paritytech/polkadot/tree/1a034bd6de0e76721d19aed02a538bcef0787260/runtime/parachains/src/paras).
+To verify this storage proof, the pallet uses relay chain header, imported earlier by the bridge GRANDPA pallet.
+
+The pallet may track multiple parachains at once and those parachains may use different primitives. So the parachain
+header decoding never happens at the pallet level. For maintaining the headers order, the pallet uses relay chain header
+number.
+
+More: [pallet level documentation and code](../modules/parachains/).
+
+### Bridge Messages Pallet
+
+The pallet is responsible for queuing messages at the source chain and receiving the messages proofs at the target
+chain. The messages are sent to the particular _lane_, where they are guaranteed to be received in the same order they
+are sent. The pallet supports many lanes.
+
+The lane has two ends. Outbound lane end is storing number of messages that have been sent and the number of messages
+that have been received. Inbound lane end stores the number of messages that have been received and also a map that maps
+messages to relayers that have delivered those messages to the target chain.
+
+The pallet has three main entrypoints:
+- the `send_message` may be used by the other runtime pallets to send the messages;
+- the `receive_messages_proof` is responsible for parsing the messages proof and handing messages over to the dispatch
+code;
+- the `receive_messages_delivery_proof` is responsible for parsing the messages delivery proof and rewarding relayers
+that have delivered the message.
+
+Many things are abstracted by the pallet:
+- the message itself may mean anything, the pallet doesn't care about its content;
+- the message dispatch happens during delivery, but it is decoupled from the pallet code;
+- the messages proof and messages delivery proof are verified outside of the pallet;
+- the relayers incentivization scheme is defined outside of the pallet.
+
+Outside of the messaging pallet, we have a set of adapters, where messages and delivery proofs are regular storage
+proofs. The proofs are generated at the bridged chain and require bridged chain finality. So messages pallet, in this
+case, depends on one of the finality pallets. The messages are XCM messages and we are using XCM executor to dispatch
+them on receival. You may find more info in [Polkadot <> Kusama Bridge](./polkadot-kusama-bridge-overview.md) document.
+
+More: [pallet level documentation and code](../modules/messages/).
+
+### Bridge Relayers Pallet
+
+The pallet is quite simple. It just registers relayer rewards and has an entrypoint to collect them. When the rewards
+are registered and the reward amount is configured outside of the pallet.
+
+More: [pallet level documentation and code](../modules/relayers/).
+
+## Offchain Components
+
+Offchain bridge components are separate processes, called relayers. Relayers are connected both to the source chain and
+target chain nodes. Relayers are reading state of the source chain, compare it to the state of the target chain and, if
+state at target chain needs to be updated, submits target chain transaction.
+
+### GRANDPA Finality Relay
+
+The task of relay is to submit source chain GRANDPA justifications and their corresponding headers to the Bridge GRANDPA
+Finality Pallet, deployed at the target chain. For that, the relay subscribes to the source chain GRANDPA justifications
+stream and submits every new justification it sees to the target chain GRANDPA light client. In addition, relay is
+searching for mandatory headers and submits their justifications - without that the pallet will be unable to move
+forward.
+
+More: [GRANDPA Finality Relay Sequence Diagram](./grandpa-finality-relay.html), [pallet level documentation and
+code](../relays/finality/).
+
+### Parachains Finality Relay
+
+The relay connects to the source _relay_ chain and the target chain nodes. It doesn't need to connect to the tracked
+parachain nodes. The relay looks at the
+[`Heads`](https://github.com/paritytech/polkadot/blob/1a034bd6de0e76721d19aed02a538bcef0787260/runtime/parachains/src/paras/mod.rs#L642)
+map of the [`paras`
+pallet](https://github.com/paritytech/polkadot/tree/1a034bd6de0e76721d19aed02a538bcef0787260/runtime/parachains/src/paras)
+in source chain, and compares the value with the best parachain head, stored in the bridge parachains pallet at the
+target chain. If new parachain head appears at the relay chain block `B`, the relay process **waits** until header `B`
+or one of its ancestors appears at the target chain. Once it is available, the storage proof of the map entry is
+generated and is submitted to the target chain.
+
+As its on-chain component (which requires bridge GRANDPA pallet to be deployed nearby), the parachains finality relay
+requires GRANDPA finality relay to be running in parallel. Without it, the header `B` or any of its children's finality
+at source won't be relayed at target, and target chain won't be able to verify generated storage proof.
+
+More: [Parachains Finality Relay Sequence Diagram](./parachains-finality-relay.html), [code](../relays/parachains/).
+
+### Messages Relay
+
+Messages relay is actually two relays that are running in a single process: messages delivery relay and delivery
+confirmation relay. Even though they are more complex and have many caveats, the overall algorithm is the same as in
+other relays.
+
+Message delivery relay connects to the source chain and looks at the outbound lane end, waiting until new messages are
+queued there. Once they appear at the source block `B`, the relay start waiting for the block `B` or its descendant
+appear at the target chain. Then the messages storage proof is generated and submitted to the bridge messages pallet at
+the target chain. In addition, the transaction may include the storage proof of the outbound lane state - that proves
+that relayer rewards have been paid and this data (map of relay accounts to the delivered messages) may be pruned from
+the inbound lane state at the target chain.
+
+Delivery confirmation relay connects to the target chain and starts watching the inbound lane end. When new messages are
+delivered to the target chain, the corresponding _source chain account_ is inserted to the map in the inbound lane data.
+Relay detects that, say, at the target chain block `B` and waits until that block or its descendant appears at the
+source chain. Once that happens, the relay crafts a storage proof of that data and sends it to the messages pallet,
+deployed at the source chain.
+
+As you can see, the messages relay also requires finality relay to be operating in parallel. Since messages relay
+submits transactions to both source and target chains, it requires both _source-to-target_ and _target-to-source_
+finality relays. They can be GRANDPA finality relays or GRANDPA+parachains finality relays, depending on the type of
+connected chain.
+
+More: [Messages Relay Sequence Diagram](./messages-relay.html), [pallet level documentation and
+code](../relays/messages/).
+
+### Complex Relay
+
+Every relay transaction has its cost. The only transaction, that is "free" to relayer is when the mandatory GRANDPA
+header is submitted. The relay that feeds the bridge with every relay chain and/or parachain head it sees, will have to
+pay a (quite large) cost. And if no messages are sent through the bridge, that is just waste of money.
+
+We have a special relay mode, called _complex relay_, where relay mostly sleeps and only submits transactions that are
+required for the messages/confirmations delivery. This mode starts two message relays (in both directions). All required
+finality relays are also started in a special _on-demand_ mode. In this mode they do not submit any headers without
+special request. As always, the only exception is when GRANDPA finality relay sees the mandatory header - it is
+submitted without such request.
+
+The message relays are watching their lanes and when, at some block `B`, they see new messages/confirmations to be
+delivered, they are asking on-demand relays to relay this block `B`. On-demand relays does that and then message relay
+may perform its job. If on-demand relay is a parachain finality relay, it also runs its own on-demand GRANDPA relay,
+which is used to relay required relay chain headers.
+
+More: [Complex Relay Sequence Diagram](./complex-relay.html),
+[code](../relays/bin-substrate/src/cli/relay_headers_and_messages/).
diff --git a/cumulus/bridges/docs/messages-relay.html b/bridges/docs/messages-relay.html
similarity index 100%
rename from cumulus/bridges/docs/messages-relay.html
rename to bridges/docs/messages-relay.html
diff --git a/cumulus/bridges/docs/parachains-finality-relay.html b/bridges/docs/parachains-finality-relay.html
similarity index 100%
rename from cumulus/bridges/docs/parachains-finality-relay.html
rename to bridges/docs/parachains-finality-relay.html
diff --git a/cumulus/bridges/docs/polkadot-kusama-bridge-overview.md b/bridges/docs/polkadot-kusama-bridge-overview.md
similarity index 56%
rename from cumulus/bridges/docs/polkadot-kusama-bridge-overview.md
rename to bridges/docs/polkadot-kusama-bridge-overview.md
index b469720f65b2bb5b8b941ec34e89df505d13ac67..08036f0b0722b869786ae3d0abfc6ae7ea7c2c18 100644
--- a/cumulus/bridges/docs/polkadot-kusama-bridge-overview.md
+++ b/bridges/docs/polkadot-kusama-bridge-overview.md
@@ -1,35 +1,35 @@
 # Polkadot <> Kusama Bridge Overview
 
-This document describes how we use all components, described in the [High-Level Bridge Documentation](./high-level-overview.md),
-to build the XCM bridge between Kusama and Polkadot. In this case, our components merely work as a XCM transport
-(like XCMP/UMP/HRMP), between chains that are not a part of the same consensus system.
+This document describes how we use all components, described in the [High-Level Bridge
+Documentation](./high-level-overview.md), to build the XCM bridge between Kusama and Polkadot. In this case, our
+components merely work as a XCM transport (like XCMP/UMP/HRMP), between chains that are not a part of the same consensus
+system.
 
 The overall architecture may be seen in [this diagram](./polkadot-kusama-bridge.html).
 
 ## Bridge Hubs
 
-All operations at relay chain are expensive. Ideally all non-mandatory transactions must happen on parachains.
-That's why we are planning to have two parachains - Polkadot Bridge Hub under Polkadot consensus and Kusama
-Bridge Hub under Kusama consensus.
+All operations at relay chain are expensive. Ideally all non-mandatory transactions must happen on parachains. That's
+why we are planning to have two parachains - Polkadot Bridge Hub under Polkadot consensus and Kusama Bridge Hub under
+Kusama consensus.
 
-The Bridge Hub will have all required bridge pallets in its runtime. We hope that later, other teams will be able to
-use our bridge hubs too and have their pallets there.
+The Bridge Hub will have all required bridge pallets in its runtime. We hope that later, other teams will be able to use
+our bridge hubs too and have their pallets there.
 
-The Bridge Hub will use the base token of the ecosystem - KSM at Kusama Bridge Hub and DOT at Polkadot Bridge Hub.
-The runtime will have minimal set of non-bridge pallets, so there's not much you can do directly on bridge hubs.
+The Bridge Hub will use the base token of the ecosystem - KSM at Kusama Bridge Hub and DOT at Polkadot Bridge Hub. The
+runtime will have minimal set of non-bridge pallets, so there's not much you can do directly on bridge hubs.
 
 ## Connecting Parachains
 
-You won't be able to directly use bridge hub transactions to send XCM messages over the bridge. Instead, you'll need
-to use other parachains transactions, which will use HRMP to deliver messages to the Bridge Hub. The Bridge Hub will
-just queue these messages in its outbound lane, which is dedicated to deliver messages between two parachains.
+You won't be able to directly use bridge hub transactions to send XCM messages over the bridge. Instead, you'll need to
+use other parachains transactions, which will use HRMP to deliver messages to the Bridge Hub. The Bridge Hub will just
+queue these messages in its outbound lane, which is dedicated to deliver messages between two parachains.
 
-Our first planned bridge will connect the Polkadot and Kusama Asset Hubs. A bridge between those two
-parachains would allow Asset Hub Polkadot accounts to hold wrapped KSM tokens and Asset Hub Kusama
-accounts to hold wrapped DOT tokens.
+Our first planned bridge will connect the Polkadot and Kusama Asset Hubs. A bridge between those two parachains would
+allow Asset Hub Polkadot accounts to hold wrapped KSM tokens and Asset Hub Kusama accounts to hold wrapped DOT tokens.
 
-For that bridge (pair of parachains under different consensus systems) we'll be using the lane 00000000. Later,
-when other parachains will join the bridge, they will be using other lanes for their messages.
+For that bridge (pair of parachains under different consensus systems) we'll be using the lane 00000000. Later, when
+other parachains will join the bridge, they will be using other lanes for their messages.
 
 ## Running Relayers
 
@@ -38,9 +38,9 @@ justifications to the bridge hubs at the other side. It'll also relay finalized
 Hub heads. This will only happen when messages will be queued at hubs. So most of time relayer will be idle.
 
 There's no any active relayer sets, or something like that. Anyone may start its own relayer and relay queued messages.
-We are not against that and, as always, appreciate any community efforts. Of course, running relayer has the cost.
-Apart from paying for the CPU and network, the relayer pays for transactions at both sides of the bridge. We have
-a mechanism for rewarding relayers.
+We are not against that and, as always, appreciate any community efforts. Of course, running relayer has the cost. Apart
+from paying for the CPU and network, the relayer pays for transactions at both sides of the bridge. We have a mechanism
+for rewarding relayers.
 
 ### Compensating the Cost of Message Delivery Transactions
 
@@ -56,51 +56,49 @@ is the relayer, which is following our rules:
 
 - we compensate the cost of message delivery transactions that have actually delivered the messages. So if your
   transaction has claimed to deliver messages `[42, 43, 44]`, but, because of some reasons, has actually delivered
-  messages `[42, 43]`, the transaction will be free for relayer. If it has not delivered any messages, then
-  the relayer pays the full cost of the transaction;
+  messages `[42, 43]`, the transaction will be free for relayer. If it has not delivered any messages, then the relayer
+  pays the full cost of the transaction;
 
 - we compensate the cost of message delivery and all required finality calls, if they are part of the same
   [`frame_utility::batch_all`](https://github.com/paritytech/substrate/blob/891d6a5c870ab88521183facafc811a203bb6541/frame/utility/src/lib.rs#L326)
-  transaction. Of course, the calls inside the batch must be linked - e.g. the submitted parachain head must be used
-  to prove messages. Relay header must be used to prove parachain head finality. If one of calls fails, or if they
-  are not linked together, the relayer pays the full transaction cost.
+  transaction. Of course, the calls inside the batch must be linked - e.g. the submitted parachain head must be used to
+  prove messages. Relay header must be used to prove parachain head finality. If one of calls fails, or if they are not
+  linked together, the relayer pays the full transaction cost.
 
 Please keep in mind that the fee of "zero-cost" transactions is still withdrawn from the relayer account. But the
-compensation is registered in the `pallet_bridge_relayers::RelayerRewards` map at the target bridge hub. The relayer
-may later claim all its rewards later, using the `pallet_bridge_relayers::claim_rewards` call.
+compensation is registered in the `pallet_bridge_relayers::RelayerRewards` map at the target bridge hub. The relayer may
+later claim all its rewards later, using the `pallet_bridge_relayers::claim_rewards` call.
 
 *A side note*: why we don't simply set the cost of useful transactions to zero? That's because the bridge has its cost.
 If we won't take any fees, it would mean that the sender is not obliged to pay for its messages. And Bridge Hub
-collators (and, maybe, "treasury") are not receiving any payment for including transactions. More about this later,
-in the [Who is Rewarding Relayers](#who-is-rewarding-relayers) section.
+collators (and, maybe, "treasury") are not receiving any payment for including transactions. More about this later, in
+the [Who is Rewarding Relayers](#who-is-rewarding-relayers) section.
 
 ### Message Delivery Confirmation Rewards
 
 In addition to the "zero-cost" message delivery transactions, the relayer is also rewarded for:
 
-- delivering every message. The reward is registered during delivery confirmation transaction at the Source Bridge
-  Hub.;
+- delivering every message. The reward is registered during delivery confirmation transaction at the Source Bridge Hub.;
 
-- submitting delivery confirmation transaction. The relayer may submit delivery confirmation that e.g. confirms
-  delivery of four messages, of which the only one (or zero) messages is actually delivered by this relayer. It
-  receives some fee for confirming messages, delivered by other relayers.
+- submitting delivery confirmation transaction. The relayer may submit delivery confirmation that e.g. confirms delivery
+  of four messages, of which the only one (or zero) messages is actually delivered by this relayer. It receives some fee
+  for confirming messages, delivered by other relayers.
 
 Both rewards may be claimed using the `pallet_bridge_relayers::claim_rewards` call at the Source Bridge Hub.
 
 ### Who is Rewarding Relayers
 
 Obviously, there should be someone who is paying relayer rewards. We want bridge transactions to have a cost, so we
-can't use fees for rewards. Instead, the parachains using the bridge, use sovereign accounts on both sides
-of the bridge to cover relayer rewards.
+can't use fees for rewards. Instead, the parachains using the bridge, use sovereign accounts on both sides of the bridge
+to cover relayer rewards.
 
-Bridged Parachains will have sovereign accounts at bridge hubs. For example, the Kusama Asset Hub will
-have an account at the Polkadot Bridge Hub. The Polkadot Asset Hub will have an account at the Kusama
-Bridge Hub. The sovereign accounts are used as a source of funds when the relayer is calling the
-`pallet_bridge_relayers::claim_rewards`.
+Bridged Parachains will have sovereign accounts at bridge hubs. For example, the Kusama Asset Hub will have an account
+at the Polkadot Bridge Hub. The Polkadot Asset Hub will have an account at the Kusama Bridge Hub. The sovereign accounts
+are used as a source of funds when the relayer is calling the `pallet_bridge_relayers::claim_rewards`.
 
-Since messages lane is only used by the pair of parachains, there's no collision between different bridges. E.g.
-Kusama Asset Hub will only reward relayers that are delivering messages from Kusama Asset Hub. The Kusama Asset Hub sovereign account
-is not used to cover rewards of bridging with some other Polkadot Parachain.
+Since messages lane is only used by the pair of parachains, there's no collision between different bridges. E.g. Kusama
+Asset Hub will only reward relayers that are delivering messages from Kusama Asset Hub. The Kusama Asset Hub sovereign
+account is not used to cover rewards of bridging with some other Polkadot Parachain.
 
 ### Multiple Relayers and Rewards
 
@@ -108,25 +106,24 @@ Our goal is to incentivize running honest relayers. But we have no relayers sets
 message delivery transaction, hoping that the cost of this transaction will be compensated. So what if some message is
 currently queued and two relayers are submitting two identical message delivery transactions at once? Without any
 special means, the cost of first included transaction will be compensated and the cost of the other one won't. A honest,
-but unlucky relayer will lose some money. In addition, we'll waste some portion of block size and weight, which
-may be used by other useful transactions.
+but unlucky relayer will lose some money. In addition, we'll waste some portion of block size and weight, which may be
+used by other useful transactions.
 
-To solve the problem, we have two signed extensions ([generate_bridge_reject_obsolete_headers_and_messages! {}](../bin/runtime-common/src/lib.rs)
-and [RefundRelayerForMessagesFromParachain](../bin/runtime-common/src/refund_relayer_extension.rs)), that are
-preventing bridge transactions with obsolete data from including into the block. We are rejecting following
-transactions:
+To solve the problem, we have two signed extensions ([generate_bridge_reject_obsolete_headers_and_messages!
+{}](../bin/runtime-common/src/lib.rs) and
+[RefundRelayerForMessagesFromParachain](../bin/runtime-common/src/refund_relayer_extension.rs)), that are preventing
+bridge transactions with obsolete data from including into the block. We are rejecting following transactions:
 
 - transactions, that are submitting the GRANDPA justification for the best finalized header, or one of its ancestors;
 
 - transactions, that are submitting the proof of the current best parachain head, or one of its ancestors;
 
-- transactions, that are delivering already delivered messages. If at least one of messages is not yet delivered,
-  the transaction is not rejected;
+- transactions, that are delivering already delivered messages. If at least one of messages is not yet delivered, the
+  transaction is not rejected;
 
-- transactions, that are confirming delivery of already confirmed messages. If at least one of confirmations is new,
-  the transaction is not rejected;
+- transactions, that are confirming delivery of already confirmed messages. If at least one of confirmations is new, the
+  transaction is not rejected;
 
 - [`frame_utility::batch_all`](https://github.com/paritytech/substrate/blob/891d6a5c870ab88521183facafc811a203bb6541/frame/utility/src/lib.rs#L326)
-  transactions, that have both finality and message delivery calls. All restrictions from the
-  [Compensating the Cost of Message Delivery Transactions](#compensating-the-cost-of-message-delivery-transactions)
-  are applied.
+  transactions, that have both finality and message delivery calls. All restrictions from the [Compensating the Cost of
+  Message Delivery Transactions](#compensating-the-cost-of-message-delivery-transactions) are applied.
diff --git a/cumulus/bridges/docs/polkadot-kusama-bridge.html b/bridges/docs/polkadot-kusama-bridge.html
similarity index 100%
rename from cumulus/bridges/docs/polkadot-kusama-bridge.html
rename to bridges/docs/polkadot-kusama-bridge.html
diff --git a/cumulus/bridges/modules/grandpa/Cargo.toml b/bridges/modules/grandpa/Cargo.toml
similarity index 54%
rename from cumulus/bridges/modules/grandpa/Cargo.toml
rename to bridges/modules/grandpa/Cargo.toml
index 3e25b5d0c6d49525451fd12cee299b5eff97fc8b..05d6a8e5c26b0d82f5dc80ce5be21d9a53b46d33 100644
--- a/cumulus/bridges/modules/grandpa/Cargo.toml
+++ b/bridges/modules/grandpa/Cargo.toml
@@ -1,8 +1,8 @@
 [package]
 name = "pallet-bridge-grandpa"
 version = "0.1.0"
-authors = ["Parity Technologies <admin@parity.io>"]
-edition = "2021"
+authors.workspace = true
+edition.workspace = true
 license = "GPL-3.0-or-later WITH Classpath-exception-2.0"
 
 # See more keys and their definitions at https://doc.rust-lang.org/cargo/reference/manifest.html
@@ -20,20 +20,20 @@ bp-header-chain = { path = "../../primitives/header-chain", default-features = f
 
 # Substrate Dependencies
 
-frame-support = { path = "../../../../substrate/frame/support", default-features = false }
-frame-system = { path = "../../../../substrate/frame/system", default-features = false }
-sp-consensus-grandpa = { path = "../../../../substrate/primitives/consensus/grandpa", default-features = false, features = ["serde"] }
-sp-runtime = { path = "../../../../substrate/primitives/runtime", default-features = false, features = ["serde"] }
-sp-std = { path = "../../../../substrate/primitives/std", default-features = false }
-sp-trie = { path = "../../../../substrate/primitives/trie", default-features = false }
+frame-support = { path = "../../../substrate/frame/support", default-features = false }
+frame-system = { path = "../../../substrate/frame/system", default-features = false }
+sp-consensus-grandpa = { path = "../../../substrate/primitives/consensus/grandpa", default-features = false, features = ["serde"] }
+sp-runtime = { path = "../../../substrate/primitives/runtime", default-features = false, features = ["serde"] }
+sp-std = { path = "../../../substrate/primitives/std", default-features = false }
+sp-trie = { path = "../../../substrate/primitives/trie", default-features = false }
 
 # Optional Benchmarking Dependencies
 bp-test-utils = { path = "../../primitives/test-utils", default-features = false, optional = true }
-frame-benchmarking = { path = "../../../../substrate/frame/benchmarking", default-features = false, optional = true }
+frame-benchmarking = { path = "../../../substrate/frame/benchmarking", default-features = false, optional = true }
 
 [dev-dependencies]
-sp-core = { path = "../../../../substrate/primitives/core" }
-sp-io = { path = "../../../../substrate/primitives/io" }
+sp-core = { path = "../../../substrate/primitives/core" }
+sp-io = { path = "../../../substrate/primitives/io" }
 
 [features]
 default = [ "std" ]
@@ -56,5 +56,12 @@ std = [
 runtime-benchmarks = [
 	"bp-test-utils",
 	"frame-benchmarking/runtime-benchmarks",
+	"frame-support/runtime-benchmarks",
+	"frame-system/runtime-benchmarks",
+	"sp-runtime/runtime-benchmarks",
+]
+try-runtime = [
+	"frame-support/try-runtime",
+	"frame-system/try-runtime",
+	"sp-runtime/try-runtime",
 ]
-try-runtime = [ "frame-support/try-runtime", "frame-system/try-runtime" ]
diff --git a/cumulus/bridges/modules/grandpa/README.md b/bridges/modules/grandpa/README.md
similarity index 100%
rename from cumulus/bridges/modules/grandpa/README.md
rename to bridges/modules/grandpa/README.md
diff --git a/cumulus/bridges/modules/grandpa/src/benchmarking.rs b/bridges/modules/grandpa/src/benchmarking.rs
similarity index 99%
rename from cumulus/bridges/modules/grandpa/src/benchmarking.rs
rename to bridges/modules/grandpa/src/benchmarking.rs
index aa222d6e4de6f0ffa9eabe93436bb3726129bd31..182b2f56eb1c57a165cf2eb1e86b585d70fd1801 100644
--- a/cumulus/bridges/modules/grandpa/src/benchmarking.rs
+++ b/bridges/modules/grandpa/src/benchmarking.rs
@@ -1,4 +1,4 @@
-// Copyright 2019-2021 Parity Technologies (UK) Ltd.
+// Copyright (C) Parity Technologies (UK) Ltd.
 // This file is part of Parity Bridges Common.
 
 // Parity Bridges Common is free software: you can redistribute it and/or modify
diff --git a/cumulus/bridges/modules/grandpa/src/call_ext.rs b/bridges/modules/grandpa/src/call_ext.rs
similarity index 95%
rename from cumulus/bridges/modules/grandpa/src/call_ext.rs
rename to bridges/modules/grandpa/src/call_ext.rs
index 7a6c61007dec86def244014d8b33e964dd994cef..f238064f92bcacde89971479a501b60469f01691 100644
--- a/cumulus/bridges/modules/grandpa/src/call_ext.rs
+++ b/bridges/modules/grandpa/src/call_ext.rs
@@ -1,4 +1,4 @@
-// Copyright 2021 Parity Technologies (UK) Ltd.
+// Copyright (C) Parity Technologies (UK) Ltd.
 // This file is part of Parity Bridges Common.
 
 // Parity Bridges Common is free software: you can redistribute it and/or modify
@@ -16,7 +16,7 @@
 
 use crate::{weights::WeightInfo, BridgedBlockNumber, BridgedHeader, Config, Error, Pallet};
 use bp_header_chain::{justification::GrandpaJustification, ChainWithGrandpa};
-use bp_runtime::BlockNumberOf;
+use bp_runtime::{BlockNumberOf, OwnedBridgeModule};
 use codec::Encode;
 use frame_support::{dispatch::CallableCallFor, traits::IsSubType, weights::Weight};
 use sp_runtime::{
@@ -126,6 +126,10 @@ pub trait CallSubType<T: Config<I, RuntimeCall = Self>, I: 'static>:
 			_ => return Ok(ValidTransaction::default()),
 		};
 
+		if Pallet::<T, I>::ensure_not_halted().is_err() {
+			return InvalidTransaction::Call.into()
+		}
+
 		match SubmitFinalityProofHelper::<T, I>::check_obsolete(finality_target.block_number) {
 			Ok(_) => Ok(ValidTransaction::default()),
 			Err(Error::<T, I>::OldHeader) => InvalidTransaction::Stale.into(),
@@ -192,10 +196,10 @@ mod tests {
 	use crate::{
 		call_ext::CallSubType,
 		mock::{run_test, test_header, RuntimeCall, TestBridgedChain, TestNumber, TestRuntime},
-		BestFinalized, Config, WeightInfo,
+		BestFinalized, Config, PalletOperatingMode, WeightInfo,
 	};
 	use bp_header_chain::ChainWithGrandpa;
-	use bp_runtime::HeaderId;
+	use bp_runtime::{BasicOperatingMode, HeaderId};
 	use bp_test_utils::{
 		make_default_justification, make_justification_for_header, JustificationGeneratorParams,
 	};
@@ -238,6 +242,17 @@ mod tests {
 		});
 	}
 
+	#[test]
+	fn extension_rejects_new_header_if_pallet_is_halted() {
+		run_test(|| {
+			// when pallet is halted => tx is rejected
+			sync_to_header_10();
+			PalletOperatingMode::<TestRuntime, ()>::put(BasicOperatingMode::Halted);
+
+			assert!(!validate_block_submit(15));
+		});
+	}
+
 	#[test]
 	fn extension_accepts_new_header() {
 		run_test(|| {
diff --git a/cumulus/bridges/modules/grandpa/src/lib.rs b/bridges/modules/grandpa/src/lib.rs
similarity index 99%
rename from cumulus/bridges/modules/grandpa/src/lib.rs
rename to bridges/modules/grandpa/src/lib.rs
index 425712ad9a20e4d2f21fe40e47127c6bc3c6ba23..22df604bf18951073996f8f2195aefc78c62639b 100644
--- a/cumulus/bridges/modules/grandpa/src/lib.rs
+++ b/bridges/modules/grandpa/src/lib.rs
@@ -1,4 +1,4 @@
-// Copyright 2021 Parity Technologies (UK) Ltd.
+// Copyright (C) Parity Technologies (UK) Ltd.
 // This file is part of Parity Bridges Common.
 
 // Parity Bridges Common is free software: you can redistribute it and/or modify
diff --git a/cumulus/bridges/modules/grandpa/src/mock.rs b/bridges/modules/grandpa/src/mock.rs
similarity index 98%
rename from cumulus/bridges/modules/grandpa/src/mock.rs
rename to bridges/modules/grandpa/src/mock.rs
index bd305dfef9dc05967d6fc966fe599318c9acb6d2..f88a0a3e6a6ee187222a6fb8eb1628e22b37abbe 100644
--- a/cumulus/bridges/modules/grandpa/src/mock.rs
+++ b/bridges/modules/grandpa/src/mock.rs
@@ -1,4 +1,4 @@
-// Copyright 2019-2021 Parity Technologies (UK) Ltd.
+// Copyright (C) Parity Technologies (UK) Ltd.
 // This file is part of Parity Bridges Common.
 
 // Parity Bridges Common is free software: you can redistribute it and/or modify
diff --git a/cumulus/bridges/modules/grandpa/src/storage_types.rs b/bridges/modules/grandpa/src/storage_types.rs
similarity index 99%
rename from cumulus/bridges/modules/grandpa/src/storage_types.rs
rename to bridges/modules/grandpa/src/storage_types.rs
index 59fcb5d3f077ff624c0aa360215e46cf8be696e3..6d1a7882dd4996c600e8ae1cb149410b60af3bf4 100644
--- a/cumulus/bridges/modules/grandpa/src/storage_types.rs
+++ b/bridges/modules/grandpa/src/storage_types.rs
@@ -1,4 +1,4 @@
-// Copyright 2022 Parity Technologies (UK) Ltd.
+// Copyright (C) Parity Technologies (UK) Ltd.
 // This file is part of Parity Bridges Common.
 
 // Parity Bridges Common is free software: you can redistribute it and/or modify
diff --git a/cumulus/bridges/modules/grandpa/src/weights.rs b/bridges/modules/grandpa/src/weights.rs
similarity index 99%
rename from cumulus/bridges/modules/grandpa/src/weights.rs
rename to bridges/modules/grandpa/src/weights.rs
index 4b94f7adfe73b8b65180a0652c46a72a1521342e..89ed70d13ac3359f23fa6b756d3a8e07ff8b7092 100644
--- a/cumulus/bridges/modules/grandpa/src/weights.rs
+++ b/bridges/modules/grandpa/src/weights.rs
@@ -1,4 +1,4 @@
-// Copyright 2019-2021 Parity Technologies (UK) Ltd.
+// Copyright (C) Parity Technologies (UK) Ltd.
 // This file is part of Parity Bridges Common.
 
 // Parity Bridges Common is free software: you can redistribute it and/or modify
diff --git a/bridges/modules/messages/Cargo.toml b/bridges/modules/messages/Cargo.toml
new file mode 100644
index 0000000000000000000000000000000000000000..7b7ea06198102ece6d93313413451a7c0294ef8b
--- /dev/null
+++ b/bridges/modules/messages/Cargo.toml
@@ -0,0 +1,62 @@
+[package]
+name = "pallet-bridge-messages"
+description = "Module that allows bridged chains to exchange messages using lane concept."
+version = "0.1.0"
+authors.workspace = true
+edition.workspace = true
+license = "GPL-3.0-or-later WITH Classpath-exception-2.0"
+
+[dependencies]
+codec = { package = "parity-scale-codec", version = "3.1.5", default-features = false }
+log = { version = "0.4.20", default-features = false }
+num-traits = { version = "0.2", default-features = false }
+scale-info = { version = "2.9.0", default-features = false, features = ["derive"] }
+
+# Bridge dependencies
+
+bp-messages = { path = "../../primitives/messages", default-features = false }
+bp-runtime = { path = "../../primitives/runtime", default-features = false }
+
+# Substrate Dependencies
+
+frame-benchmarking = { path = "../../../substrate/frame/benchmarking", default-features = false, optional = true }
+frame-support = { path = "../../../substrate/frame/support", default-features = false }
+frame-system = { path = "../../../substrate/frame/system", default-features = false }
+sp-core = { path = "../../../substrate/primitives/core", default-features = false }
+sp-runtime = { path = "../../../substrate/primitives/runtime", default-features = false }
+sp-std = { path = "../../../substrate/primitives/std", default-features = false }
+
+[dev-dependencies]
+bp-test-utils = { path = "../../primitives/test-utils" }
+pallet-balances = { path = "../../../substrate/frame/balances" }
+sp-io = { path = "../../../substrate/primitives/io" }
+
+[features]
+default = [ "std" ]
+std = [
+	"bp-messages/std",
+	"bp-runtime/std",
+	"codec/std",
+	"frame-benchmarking/std",
+	"frame-support/std",
+	"frame-system/std",
+	"log/std",
+	"num-traits/std",
+	"scale-info/std",
+	"sp-core/std",
+	"sp-runtime/std",
+	"sp-std/std",
+]
+runtime-benchmarks = [
+	"frame-benchmarking/runtime-benchmarks",
+	"frame-support/runtime-benchmarks",
+	"frame-system/runtime-benchmarks",
+	"pallet-balances/runtime-benchmarks",
+	"sp-runtime/runtime-benchmarks",
+]
+try-runtime = [
+	"frame-support/try-runtime",
+	"frame-system/try-runtime",
+	"pallet-balances/try-runtime",
+	"sp-runtime/try-runtime",
+]
diff --git a/bridges/modules/messages/README.md b/bridges/modules/messages/README.md
new file mode 100644
index 0000000000000000000000000000000000000000..457d5f5facfa70fdb11d05c5d544e75eb44f975f
--- /dev/null
+++ b/bridges/modules/messages/README.md
@@ -0,0 +1,215 @@
+# Bridge Messages Pallet
+
+The messages pallet is used to deliver messages from source chain to target chain. Message is (almost) opaque to the
+module and the final goal is to hand message to the message dispatch mechanism.
+
+## Contents
+
+- [Overview](#overview)
+- [Message Workflow](#message-workflow)
+- [Integrating Message Lane Module into Runtime](#integrating-messages-module-into-runtime)
+- [Non-Essential Functionality](#non-essential-functionality)
+- [Weights of Module Extrinsics](#weights-of-module-extrinsics)
+
+## Overview
+
+Message lane is an unidirectional channel, where messages are sent from source chain to the target chain. At the same
+time, a single instance of messages module supports both outbound lanes and inbound lanes. So the chain where the module
+is deployed (this chain), may act as a source chain for outbound messages (heading to a bridged chain) and as a target
+chain for inbound messages (coming from a bridged chain).
+
+Messages module supports multiple message lanes. Every message lane is identified with a 4-byte identifier. Messages
+sent through the lane are assigned unique (for this lane) increasing integer value that is known as nonce ("number that
+can only be used once"). Messages that are sent over the same lane are guaranteed to be delivered to the target chain in
+the same order they're sent from the source chain. In other words, message with nonce `N` will be delivered right before
+delivering a message with nonce `N+1`.
+
+Single message lane may be seen as a transport channel for single application (onchain, offchain or mixed). At the same
+time the module itself never dictates any lane or message rules. In the end, it is the runtime developer who defines
+what message lane and message mean for this runtime.
+
+In our [Kusama<>Polkadot bridge](../../docs/polkadot-kusama-bridge-overview.md) we are using lane as a channel of
+communication between two parachains of different relay chains. For example, lane `[0, 0, 0, 0]` is used for Polkadot <>
+Kusama Asset Hub communications. Other lanes may be used to bridge other parachains.
+
+## Message Workflow
+
+The pallet is not intended to be used by end users and provides no public calls to send the message. Instead, it
+provides runtime-internal method that allows other pallets (or other runtime code) to queue outbound messages.
+
+The message "appears" when some runtime code calls the `send_message()` method of the pallet. The submitter specifies
+the lane that they're willing to use and the message itself. If some fee must be paid for sending the message, it must
+be paid outside of the pallet. If a message passes all checks (that include, for example, message size check, disabled
+lane check, ...), the nonce is assigned and the message is stored in the module storage. The message is in an
+"undelivered" state now.
+
+We assume that there are external, offchain actors, called relayers, that are submitting module related transactions to
+both target and source chains. The pallet itself has no assumptions about relayers incentivization scheme, but it has
+some callbacks for paying rewards. See [Integrating Messages Module into
+runtime](#Integrating-Messages-Module-into-runtime) for details.
+
+Eventually, some relayer would notice this message in the "undelivered" state and it would decide to deliver this
+message. Relayer then crafts `receive_messages_proof()` transaction (aka delivery transaction) for the messages module
+instance, deployed at the target chain. Relayer provides its account id at the source chain, the proof of message (or
+several messages), the number of messages in the transaction and their cumulative dispatch weight. Once a transaction is
+mined, the message is considered "delivered".
+
+Once a message is delivered, the relayer may want to confirm delivery back to the source chain. There are two reasons
+why it would want to do that. The first is that we intentionally limit number of "delivered", but not yet "confirmed"
+messages at inbound lanes (see [What about other Constants in the Messages Module Configuration
+Trait](#What-about-other-Constants-in-the-Messages-Module-Configuration-Trait) for explanation). So at some point, the
+target chain may stop accepting new messages until relayers confirm some of these. The second is that if the relayer
+wants to be rewarded for delivery, it must prove the fact that it has actually delivered the message. And this proof may
+only be generated after the delivery transaction is mined. So relayer crafts the `receive_messages_delivery_proof()`
+transaction (aka confirmation transaction) for the messages module instance, deployed at the source chain. Once this
+transaction is mined, the message is considered "confirmed".
+
+The "confirmed" state is the final state of the message. But there's one last thing related to the message - the fact
+that it is now "confirmed" and reward has been paid to the relayer (or at least callback for this has been called), must
+be confirmed to the target chain. Otherwise, we may reach the limit of "unconfirmed" messages at the target chain and it
+will stop accepting new messages. So relayer sometimes includes a nonce of the latest "confirmed" message in the next
+`receive_messages_proof()` transaction, proving that some messages have been confirmed.
+
+## Integrating Messages Module into Runtime
+
+As it has been said above, the messages module supports both outbound and inbound message lanes. So if we will integrate
+a module in some runtime, it may act as the source chain runtime for outbound messages and as the target chain runtime
+for inbound messages. In this section, we'll sometimes refer to the chain we're currently integrating with, as "this
+chain" and the other chain as "bridged chain".
+
+Messages module doesn't simply accept transactions that are claiming that the bridged chain has some updated data for
+us. Instead of this, the module assumes that the bridged chain is able to prove that updated data in some way. The proof
+is abstracted from the module and may be of any kind. In our Substrate-to-Substrate bridge we're using runtime storage
+proofs. Other bridges may use transaction proofs, Substrate header digests or anything else that may be proved.
+
+**IMPORTANT NOTE**: everything below in this chapter describes details of the messages module configuration. But if
+you're interested in well-probed and relatively easy integration of two Substrate-based chains, you may want to look at
+the [bridge-runtime-common](../../bin/runtime-common/) crate. This crate is providing a lot of helpers for integration,
+which may be directly used from within your runtime. Then if you'll decide to change something in this scheme, get back
+here for detailed information.
+
+### General Information
+
+The messages module supports instances. Every module instance is supposed to bridge this chain and some bridged chain.
+To bridge with another chain, using another instance is suggested (this isn't forced anywhere in the code, though). Keep
+in mind, that the pallet may be used to build virtual channels between multiple chains, as we do in our [Polkadot <>
+Kusama bridge](../../docs/polkadot-kusama-bridge-overview.md). There, the pallet actually bridges only two parachains -
+Kusama Bridge Hub and Polkadot Bridge Hub. However, other Kusama and Polkadot parachains are able to send (XCM) messages
+to their Bridge Hubs. The messages will be delivered to the other side of the bridge and routed to the proper
+destination parachain within the bridged chain consensus.
+
+Message submitters may track message progress by inspecting module events. When Message is accepted, the
+`MessageAccepted` event is emitted. The event contains both message lane identifier and nonce that has been assigned to
+the message. When a message is delivered to the target chain, the `MessagesDelivered` event is emitted from the
+`receive_messages_delivery_proof()` transaction. The `MessagesDelivered` contains the message lane identifier and
+inclusive range of delivered message nonces.
+
+The pallet provides no means to get the result of message dispatch at the target chain. If that is required, it must be
+done outside of the pallet. For example, XCM messages, when dispatched, have special instructions to send some data back
+to the sender. Other dispatchers may use similar mechanism for that.
+### How to plug-in Messages Module to Send Messages to the Bridged Chain?
+
+The `pallet_bridge_messages::Config` trait has 3 main associated types that are used to work with outbound messages. The
+`pallet_bridge_messages::Config::TargetHeaderChain` defines how we see the bridged chain as the target for our outbound
+messages. It must be able to check that the bridged chain may accept our message - like that the message has size below
+maximal possible transaction size of the chain and so on. And when the relayer sends us a confirmation transaction, this
+implementation must be able to parse and verify the proof of messages delivery. Normally, you would reuse the same
+(configurable) type on all chains that are sending messages to the same bridged chain.
+
+The `pallet_bridge_messages::Config::LaneMessageVerifier` defines a single callback to verify outbound messages. The
+simplest callback may just accept all messages. But in this case you'll need to answer many questions first. Who will
+pay for the delivery and confirmation transaction? Are we sure that someone will ever deliver this message to the
+bridged chain? Are we sure that we don't bloat our runtime storage by accepting this message? What if the message is
+improperly encoded or has some fields set to invalid values? Answering all those (and similar) questions would lead to
+correct implementation.
+
+There's another thing to consider when implementing type for use in
+`pallet_bridge_messages::Config::LaneMessageVerifier`. It is whether we treat all message lanes identically, or they'll
+have different sets of verification rules? For example, you may reserve lane#1 for messages coming from some
+'wrapped-token' pallet - then you may verify in your implementation that the origin is associated with this pallet.
+Lane#2 may be reserved for 'system' messages and you may charge zero fee for such messages. You may have some rate
+limiting for messages sent over the lane#3. Or you may just verify the same rules set for all outbound messages - it is
+all up to the `pallet_bridge_messages::Config::LaneMessageVerifier` implementation.
+
+The last type is the `pallet_bridge_messages::Config::DeliveryConfirmationPayments`. When confirmation transaction is
+received, we call the `pay_reward()` method, passing the range of delivered messages. You may use the
+[`pallet-bridge-relayers`](../relayers/) pallet and its
+[`DeliveryConfirmationPaymentsAdapter`](../relayers/src/payment_adapter.rs) adapter as a possible implementation. It
+allows you to pay fixed reward for relaying the message and some of its portion for confirming delivery.
+
+### I have a Messages Module in my Runtime, but I Want to Reject all Outbound Messages. What shall I do?
+
+You should be looking at the `bp_messages::source_chain::ForbidOutboundMessages` structure
+[`bp_messages::source_chain`](../../primitives/messages/src/source_chain.rs). It implements all required traits and will
+simply reject all transactions, related to outbound messages.
+
+### How to plug-in Messages Module to Receive Messages from the Bridged Chain?
+
+The `pallet_bridge_messages::Config` trait has 2 main associated types that are used to work with inbound messages. The
+`pallet_bridge_messages::Config::SourceHeaderChain` defines how we see the bridged chain as the source of our inbound
+messages. When relayer sends us a delivery transaction, this implementation must be able to parse and verify the proof
+of messages wrapped in this transaction. Normally, you would reuse the same (configurable) type on all chains that are
+sending messages to the same bridged chain.
+
+The `pallet_bridge_messages::Config::MessageDispatch` defines a way on how to dispatch delivered messages. Apart from
+actually dispatching the message, the implementation must return the correct dispatch weight of the message before
+dispatch is called.
+
+### I have a Messages Module in my Runtime, but I Want to Reject all Inbound Messages. What shall I do?
+
+You should be looking at the `bp_messages::target_chain::ForbidInboundMessages` structure from the
+[`bp_messages::target_chain`](../../primitives/messages/src/target_chain.rs) module. It implements all required traits
+and will simply reject all transactions, related to inbound messages.
+
+### What about other Constants in the Messages Module Configuration Trait?
+
+Two settings that are used to check messages in the `send_message()` function. The
+`pallet_bridge_messages::Config::ActiveOutboundLanes` is an array of all message lanes, that may be used to send
+messages. All messages sent using other lanes are rejected. All messages that have size above
+`pallet_bridge_messages::Config::MaximalOutboundPayloadSize` will also be rejected.
+
+To be able to reward the relayer for delivering messages, we store a map of message nonces range => identifier of the
+relayer that has delivered this range at the target chain runtime storage. If a relayer delivers multiple consequent
+ranges, they're merged into single entry. So there may be more than one entry for the same relayer. Eventually, this
+whole map must be delivered back to the source chain to confirm delivery and pay rewards. So to make sure we are able to
+craft this confirmation transaction, we need to: (1) keep the size of this map below a certain limit and (2) make sure
+that the weight of processing this map is below a certain limit. Both size and processing weight mostly depend on the
+number of entries. The number of entries is limited with the
+`pallet_bridge_messages::ConfigMaxUnrewardedRelayerEntriesAtInboundLane` parameter. Processing weight also depends on
+the total number of messages that are being confirmed, because every confirmed message needs to be read. So there's
+another `pallet_bridge_messages::Config::MaxUnconfirmedMessagesAtInboundLane` parameter for that.
+
+When choosing values for these parameters, you must also keep in mind that if proof in your scheme is based on finality
+of headers (and it is the most obvious option for Substrate-based chains with finality notion), then choosing too small
+values for these parameters may cause significant delays in message delivery. That's because there are too many actors
+involved in this scheme: 1) authorities that are finalizing headers of the target chain need to finalize header with
+non-empty map; 2) the headers relayer then needs to submit this header and its finality proof to the source chain; 3)
+the messages relayer must then send confirmation transaction (storage proof of this map) to the source chain; 4) when
+the confirmation transaction will be mined at some header, source chain authorities must finalize this header; 5) the
+headers relay then needs to submit this header and its finality proof to the target chain; 6) only now the messages
+relayer may submit new messages from the source to target chain and prune the entry from the map.
+
+Delivery transaction requires the relayer to provide both number of entries and total number of messages in the map.
+This means that the module never charges an extra cost for delivering a map - the relayer would need to pay exactly for
+the number of entries+messages it has delivered. So the best guess for values of these parameters would be the pair that
+would occupy `N` percent of the maximal transaction size and weight of the source chain. The `N` should be large enough
+to process large maps, at the same time keeping reserve for future source chain upgrades.
+
+## Non-Essential Functionality
+
+There may be a special account in every runtime where the messages module is deployed. This account, named 'module
+owner', is like a module-level sudo account - he's able to halt and resume all module operations without requiring
+runtime upgrade. Calls that are related to this account are:
+- `fn set_owner()`: current module owner may call it to transfer "ownership" to another account;
+- `fn halt_operations()`: the module owner (or sudo account) may call this function to stop all module operations. After
+  this call, all message-related transactions will be rejected until further `resume_operations` call'. This call may be
+  used when something extraordinary happens with the bridge;
+- `fn resume_operations()`: module owner may call this function to resume bridge operations. The module will resume its
+  regular operations after this call.
+
+If pallet owner is not defined, the governance may be used to make those calls.
+
+## Messages Relay
+
+We have an offchain actor, who is watching for new messages and submits them to the bridged chain. It is the messages
+relay - you may look at the [crate level documentation and the code](../../relays/messages/).
diff --git a/cumulus/bridges/modules/messages/src/benchmarking.rs b/bridges/modules/messages/src/benchmarking.rs
similarity index 99%
rename from cumulus/bridges/modules/messages/src/benchmarking.rs
rename to bridges/modules/messages/src/benchmarking.rs
index 04f64b53b305f74600d151d539f7b32b5dc4ce78..8c4e6fbf00ca42dd4a61c85c14d90fbff72ed042 100644
--- a/cumulus/bridges/modules/messages/src/benchmarking.rs
+++ b/bridges/modules/messages/src/benchmarking.rs
@@ -1,4 +1,4 @@
-// Copyright 2019-2021 Parity Technologies (UK) Ltd.
+// Copyright (C) Parity Technologies (UK) Ltd.
 // This file is part of Parity Bridges Common.
 
 // Parity Bridges Common is free software: you can redistribute it and/or modify
diff --git a/cumulus/bridges/modules/messages/src/inbound_lane.rs b/bridges/modules/messages/src/inbound_lane.rs
similarity index 99%
rename from cumulus/bridges/modules/messages/src/inbound_lane.rs
rename to bridges/modules/messages/src/inbound_lane.rs
index 359e9022b0b60c1e155648582ab0066b0281999d..966ec939e70e22e830ee30157d2d7da74d59733c 100644
--- a/cumulus/bridges/modules/messages/src/inbound_lane.rs
+++ b/bridges/modules/messages/src/inbound_lane.rs
@@ -1,4 +1,4 @@
-// Copyright 2019-2021 Parity Technologies (UK) Ltd.
+// Copyright (C) Parity Technologies (UK) Ltd.
 // This file is part of Parity Bridges Common.
 
 // Parity Bridges Common is free software: you can redistribute it and/or modify
diff --git a/cumulus/bridges/modules/messages/src/lib.rs b/bridges/modules/messages/src/lib.rs
similarity index 99%
rename from cumulus/bridges/modules/messages/src/lib.rs
rename to bridges/modules/messages/src/lib.rs
index 67c6fb23cf16765067ef815b91521e349b1ebf1c..b87c64d160752862a59a14f6591bf64f363004e8 100644
--- a/cumulus/bridges/modules/messages/src/lib.rs
+++ b/bridges/modules/messages/src/lib.rs
@@ -1,4 +1,4 @@
-// Copyright 2019-2021 Parity Technologies (UK) Ltd.
+// Copyright (C) Parity Technologies (UK) Ltd.
 // This file is part of Parity Bridges Common.
 
 // Parity Bridges Common is free software: you can redistribute it and/or modify
diff --git a/cumulus/bridges/modules/messages/src/mock.rs b/bridges/modules/messages/src/mock.rs
similarity index 99%
rename from cumulus/bridges/modules/messages/src/mock.rs
rename to bridges/modules/messages/src/mock.rs
index 67f7b78a487aa64dfddf74cc215cbed9207de6f2..aebb7eafa7871d13cd8140d5a352978ca36433dd 100644
--- a/cumulus/bridges/modules/messages/src/mock.rs
+++ b/bridges/modules/messages/src/mock.rs
@@ -1,4 +1,4 @@
-// Copyright 2019-2021 Parity Technologies (UK) Ltd.
+// Copyright (C) Parity Technologies (UK) Ltd.
 // This file is part of Parity Bridges Common.
 
 // Parity Bridges Common is free software: you can redistribute it and/or modify
diff --git a/cumulus/bridges/modules/messages/src/outbound_lane.rs b/bridges/modules/messages/src/outbound_lane.rs
similarity index 99%
rename from cumulus/bridges/modules/messages/src/outbound_lane.rs
rename to bridges/modules/messages/src/outbound_lane.rs
index 45b0f4e680955e9faf868b3503bdbc4bc3f747dd..f92e9ccfd95c61ac9797e6423eae5d4e8f02dc2c 100644
--- a/cumulus/bridges/modules/messages/src/outbound_lane.rs
+++ b/bridges/modules/messages/src/outbound_lane.rs
@@ -1,4 +1,4 @@
-// Copyright 2019-2021 Parity Technologies (UK) Ltd.
+// Copyright (C) Parity Technologies (UK) Ltd.
 // This file is part of Parity Bridges Common.
 
 // Parity Bridges Common is free software: you can redistribute it and/or modify
diff --git a/cumulus/bridges/modules/messages/src/weights.rs b/bridges/modules/messages/src/weights.rs
similarity index 99%
rename from cumulus/bridges/modules/messages/src/weights.rs
rename to bridges/modules/messages/src/weights.rs
index 9880f1dd1ea3d45fb1aa6a3cee3255468fa11a0b..5b6863984ec78c0e250c54a0ed3363d1278f196f 100644
--- a/cumulus/bridges/modules/messages/src/weights.rs
+++ b/bridges/modules/messages/src/weights.rs
@@ -1,4 +1,4 @@
-// Copyright 2019-2021 Parity Technologies (UK) Ltd.
+// Copyright (C) Parity Technologies (UK) Ltd.
 // This file is part of Parity Bridges Common.
 
 // Parity Bridges Common is free software: you can redistribute it and/or modify
diff --git a/cumulus/bridges/modules/messages/src/weights_ext.rs b/bridges/modules/messages/src/weights_ext.rs
similarity index 99%
rename from cumulus/bridges/modules/messages/src/weights_ext.rs
rename to bridges/modules/messages/src/weights_ext.rs
index 3aefd6be7ca787202c83935bf25eda8d55811922..aeb3a581a69ee6ebb233ca6ec5e0f0bd4d25a408 100644
--- a/cumulus/bridges/modules/messages/src/weights_ext.rs
+++ b/bridges/modules/messages/src/weights_ext.rs
@@ -1,4 +1,4 @@
-// Copyright 2019-2021 Parity Technologies (UK) Ltd.
+// Copyright (C) Parity Technologies (UK) Ltd.
 // This file is part of Parity Bridges Common.
 
 // Parity Bridges Common is free software: you can redistribute it and/or modify
@@ -29,8 +29,8 @@ pub const EXPECTED_DEFAULT_MESSAGE_LENGTH: u32 = 128;
 /// calls we're checking here would fit 1KB.
 const SIGNED_EXTENSIONS_SIZE: u32 = 1024;
 
-/// Number of extra bytes (excluding size of storage value itself) of storage proof, built at
-/// Rialto chain. This mostly depends on number of entries (and their density) in the storage trie.
+/// Number of extra bytes (excluding size of storage value itself) of storage proof.
+/// This mostly depends on number of entries (and their density) in the storage trie.
 /// Some reserve is reserved to account future chain growth.
 pub const EXTRA_STORAGE_PROOF_SIZE: u32 = 1024;
 
diff --git a/cumulus/bridges/modules/parachains/Cargo.toml b/bridges/modules/parachains/Cargo.toml
similarity index 54%
rename from cumulus/bridges/modules/parachains/Cargo.toml
rename to bridges/modules/parachains/Cargo.toml
index d7384c0ab3b107d5062dfe55dc105699143fdacf..4eb09ed78d17f3b4da620ac6b28645bdaab88c12 100644
--- a/cumulus/bridges/modules/parachains/Cargo.toml
+++ b/bridges/modules/parachains/Cargo.toml
@@ -1,8 +1,8 @@
 [package]
 name = "pallet-bridge-parachains"
 version = "0.1.0"
-authors = ["Parity Technologies <admin@parity.io>"]
-edition = "2021"
+authors.workspace = true
+edition.workspace = true
 license = "GPL-3.0-or-later WITH Classpath-exception-2.0"
 
 [dependencies]
@@ -20,18 +20,18 @@ pallet-bridge-grandpa = { path = "../grandpa", default-features = false }
 
 # Substrate Dependencies
 
-frame-benchmarking = { path = "../../../../substrate/frame/benchmarking", default-features = false, optional = true }
-frame-support = { path = "../../../../substrate/frame/support", default-features = false }
-frame-system = { path = "../../../../substrate/frame/system", default-features = false }
-sp-runtime = { path = "../../../../substrate/primitives/runtime", default-features = false }
-sp-std = { path = "../../../../substrate/primitives/std", default-features = false }
-sp-trie = { path = "../../../../substrate/primitives/trie", default-features = false }
+frame-benchmarking = { path = "../../../substrate/frame/benchmarking", default-features = false, optional = true }
+frame-support = { path = "../../../substrate/frame/support", default-features = false }
+frame-system = { path = "../../../substrate/frame/system", default-features = false }
+sp-runtime = { path = "../../../substrate/primitives/runtime", default-features = false }
+sp-std = { path = "../../../substrate/primitives/std", default-features = false }
+sp-trie = { path = "../../../substrate/primitives/trie", default-features = false }
 
 [dev-dependencies]
 bp-header-chain = { path = "../../primitives/header-chain" }
 bp-test-utils = { path = "../../primitives/test-utils" }
-sp-core = { path = "../../../../substrate/primitives/core" }
-sp-io = { path = "../../../../substrate/primitives/io" }
+sp-core = { path = "../../../substrate/primitives/core" }
+sp-io = { path = "../../../substrate/primitives/io" }
 
 [features]
 default = [ "std" ]
@@ -51,5 +51,16 @@ std = [
 	"sp-std/std",
 	"sp-trie/std",
 ]
-runtime-benchmarks = [ "frame-benchmarking/runtime-benchmarks" ]
-try-runtime = [ "frame-support/try-runtime", "frame-system/try-runtime" ]
+runtime-benchmarks = [
+	"frame-benchmarking/runtime-benchmarks",
+	"frame-support/runtime-benchmarks",
+	"frame-system/runtime-benchmarks",
+	"pallet-bridge-grandpa/runtime-benchmarks",
+	"sp-runtime/runtime-benchmarks",
+]
+try-runtime = [
+	"frame-support/try-runtime",
+	"frame-system/try-runtime",
+	"pallet-bridge-grandpa/try-runtime",
+	"sp-runtime/try-runtime",
+]
diff --git a/cumulus/bridges/modules/parachains/README.md b/bridges/modules/parachains/README.md
similarity index 89%
rename from cumulus/bridges/modules/parachains/README.md
rename to bridges/modules/parachains/README.md
index 5982c65ad3166107128b9256f89f337f8de7c69e..9ca6080383443df2a72041e9089c0eb5c861fbc0 100644
--- a/cumulus/bridges/modules/parachains/README.md
+++ b/bridges/modules/parachains/README.md
@@ -9,17 +9,17 @@ to verify storage proofs, generated at the bridged relay chain.
 
 ## A Brief Introduction into Parachains Finality
 
-You can find detailed information on parachains finality in the [Polkadot](https://github.com/paritytech/polkadot)
-and [Cumulus](https://github.com/paritytech/cumulus) repositories. This section gives a brief overview of how
-the parachain finality works and how to build a light client for a parachain.
+You can find detailed information on parachains finality in the
+[Polkadot-SDK](https://github.com/paritytech/polkadot-sdk) repository. This section gives a brief overview of how the
+parachain finality works and how to build a light client for a parachain.
 
 The main thing there is that the parachain generates blocks on its own, but it can't achieve finality without
 help of its relay chain. Instead, the parachain collators create a block and hand it over to the relay chain
 validators. Validators validate the block and register the new parachain head in the
-[`Heads` map](https://github.com/paritytech/polkadot/blob/88013730166ba90745ae7c9eb3e0c1be1513c7cc/runtime/parachains/src/paras/mod.rs#L645)
-of the [`paras`](https://github.com/paritytech/polkadot/tree/master/runtime/parachains/src/paras) pallet,
+[`Heads` map](https://github.com/paritytech/polkadot-sdk/blob/bc5005217a8c2e7c95b9011c96d7e619879b1200/polkadot/runtime/parachains/src/paras/mod.rs#L683-L686)
+of the [`paras`](https://github.com/paritytech/polkadot-sdk/tree/master/polkadot/runtime/parachains/src/paras) pallet,
 deployed at the relay chain. Keep in mind that this pallet, deployed at a relay chain, is **NOT** a bridge pallet,
-even though the names are similar. 
+even though the names are similar.
 
 And what the bridge parachains pallet does, is simply verifying storage proofs of parachain heads within that
 `Heads` map. It does that using relay chain header, that has been previously imported by the
diff --git a/cumulus/bridges/modules/parachains/src/benchmarking.rs b/bridges/modules/parachains/src/benchmarking.rs
similarity index 98%
rename from cumulus/bridges/modules/parachains/src/benchmarking.rs
rename to bridges/modules/parachains/src/benchmarking.rs
index 59c4642cde9997b5046afa491f59fc11b88ae17b..27e06a12a1d93486d93aa258afc1d7de4713df2c 100644
--- a/cumulus/bridges/modules/parachains/src/benchmarking.rs
+++ b/bridges/modules/parachains/src/benchmarking.rs
@@ -1,4 +1,4 @@
-// Copyright 2019-2021 Parity Technologies (UK) Ltd.
+// Copyright (C) Parity Technologies (UK) Ltd.
 // This file is part of Parity Bridges Common.
 
 // Parity Bridges Common is free software: you can redistribute it and/or modify
diff --git a/cumulus/bridges/modules/parachains/src/call_ext.rs b/bridges/modules/parachains/src/call_ext.rs
similarity index 92%
rename from cumulus/bridges/modules/parachains/src/call_ext.rs
rename to bridges/modules/parachains/src/call_ext.rs
index ea842a61b3e800e5c745a5616a3bc2ad35b068f2..198ff11be49512ef90ab38a093e6889a3d8f0702 100644
--- a/cumulus/bridges/modules/parachains/src/call_ext.rs
+++ b/bridges/modules/parachains/src/call_ext.rs
@@ -1,4 +1,4 @@
-// Copyright 2021 Parity Technologies (UK) Ltd.
+// Copyright (C) Parity Technologies (UK) Ltd.
 // This file is part of Parity Bridges Common.
 
 // Parity Bridges Common is free software: you can redistribute it and/or modify
@@ -17,6 +17,7 @@
 use crate::{Config, Pallet, RelayBlockNumber};
 use bp_parachains::BestParaHeadHash;
 use bp_polkadot_core::parachains::{ParaHash, ParaId};
+use bp_runtime::OwnedBridgeModule;
 use frame_support::{dispatch::CallableCallFor, traits::IsSubType};
 use sp_runtime::{
 	transaction_validity::{InvalidTransaction, TransactionValidity, ValidTransaction},
@@ -141,6 +142,10 @@ pub trait CallSubType<T: Config<I, RuntimeCall = Self>, I: 'static>:
 			None => return Ok(ValidTransaction::default()),
 		};
 
+		if Pallet::<T, I>::ensure_not_halted().is_err() {
+			return InvalidTransaction::Call.into()
+		}
+
 		if SubmitParachainHeadsHelper::<T, I>::is_obsolete(&update) {
 			return InvalidTransaction::Stale.into()
 		}
@@ -160,10 +165,11 @@ where
 mod tests {
 	use crate::{
 		mock::{run_test, RuntimeCall, TestRuntime},
-		CallSubType, ParaInfo, ParasInfo, RelayBlockNumber,
+		CallSubType, PalletOperatingMode, ParaInfo, ParasInfo, RelayBlockNumber,
 	};
 	use bp_parachains::BestParaHeadHash;
 	use bp_polkadot_core::parachains::{ParaHash, ParaHeadsProof, ParaId};
+	use bp_runtime::BasicOperatingMode;
 
 	fn validate_submit_parachain_heads(
 		num: RelayBlockNumber,
@@ -221,6 +227,17 @@ mod tests {
 		});
 	}
 
+	#[test]
+	fn extension_rejects_header_if_pallet_is_halted() {
+		run_test(|| {
+			// when pallet is halted => tx is rejected
+			sync_to_relay_header_10();
+			PalletOperatingMode::<TestRuntime, ()>::put(BasicOperatingMode::Halted);
+
+			assert!(!validate_submit_parachain_heads(15, vec![(ParaId(1), [2u8; 32].into())]));
+		});
+	}
+
 	#[test]
 	fn extension_accepts_new_header() {
 		run_test(|| {
diff --git a/cumulus/bridges/modules/parachains/src/lib.rs b/bridges/modules/parachains/src/lib.rs
similarity index 99%
rename from cumulus/bridges/modules/parachains/src/lib.rs
rename to bridges/modules/parachains/src/lib.rs
index be46fae3c9253d5276fc4dec6d96ba8e0579623a..b2ef0bf52bd3d5b5f619a6b8e28bbf8228c1a72c 100644
--- a/cumulus/bridges/modules/parachains/src/lib.rs
+++ b/bridges/modules/parachains/src/lib.rs
@@ -1,4 +1,4 @@
-// Copyright 2021 Parity Technologies (UK) Ltd.
+// Copyright (C) Parity Technologies (UK) Ltd.
 // This file is part of Parity Bridges Common.
 
 // Parity Bridges Common is free software: you can redistribute it and/or modify
diff --git a/cumulus/bridges/modules/parachains/src/mock.rs b/bridges/modules/parachains/src/mock.rs
similarity index 99%
rename from cumulus/bridges/modules/parachains/src/mock.rs
rename to bridges/modules/parachains/src/mock.rs
index a7030f0ae0310ecacaae6361d42facf0129a3cca..14afe38417105a789f9eb13ca913c1be91e6f789 100644
--- a/cumulus/bridges/modules/parachains/src/mock.rs
+++ b/bridges/modules/parachains/src/mock.rs
@@ -1,4 +1,4 @@
-// Copyright 2019-2021 Parity Technologies (UK) Ltd.
+// Copyright (C) Parity Technologies (UK) Ltd.
 // This file is part of Parity Bridges Common.
 
 // Parity Bridges Common is free software: you can redistribute it and/or modify
diff --git a/cumulus/bridges/modules/parachains/src/weights.rs b/bridges/modules/parachains/src/weights.rs
similarity index 99%
rename from cumulus/bridges/modules/parachains/src/weights.rs
rename to bridges/modules/parachains/src/weights.rs
index 1e81dba72fe99ea1ecd968feb93f73d0e5417680..9182ec466117b2c642910148a1240a10ae438b8a 100644
--- a/cumulus/bridges/modules/parachains/src/weights.rs
+++ b/bridges/modules/parachains/src/weights.rs
@@ -1,4 +1,4 @@
-// Copyright 2019-2021 Parity Technologies (UK) Ltd.
+// Copyright (C) Parity Technologies (UK) Ltd.
 // This file is part of Parity Bridges Common.
 
 // Parity Bridges Common is free software: you can redistribute it and/or modify
diff --git a/cumulus/bridges/modules/parachains/src/weights_ext.rs b/bridges/modules/parachains/src/weights_ext.rs
similarity index 98%
rename from cumulus/bridges/modules/parachains/src/weights_ext.rs
rename to bridges/modules/parachains/src/weights_ext.rs
index eecdfe903593eb7b62cf3e5f7ddf9971699272fe..13bc9ad2bbce0f26d5946cf8198e689597e5f968 100644
--- a/cumulus/bridges/modules/parachains/src/weights_ext.rs
+++ b/bridges/modules/parachains/src/weights_ext.rs
@@ -1,4 +1,4 @@
-// Copyright 2019-2021 Parity Technologies (UK) Ltd.
+// Copyright (C) Parity Technologies (UK) Ltd.
 // This file is part of Parity Bridges Common.
 
 // Parity Bridges Common is free software: you can redistribute it and/or modify
diff --git a/bridges/modules/relayers/Cargo.toml b/bridges/modules/relayers/Cargo.toml
new file mode 100644
index 0000000000000000000000000000000000000000..46fc3bb43b1de23b5784179ccd2dbc31ae6c7230
--- /dev/null
+++ b/bridges/modules/relayers/Cargo.toml
@@ -0,0 +1,68 @@
+[package]
+name = "pallet-bridge-relayers"
+description = "Module used to store relayer rewards and coordinate relayers set."
+version = "0.1.0"
+authors.workspace = true
+edition.workspace = true
+license = "GPL-3.0-or-later WITH Classpath-exception-2.0"
+
+[dependencies]
+codec = { package = "parity-scale-codec", version = "3.1.5", default-features = false }
+log = { version = "0.4.20", default-features = false }
+scale-info = { version = "2.9.0", default-features = false, features = ["derive"] }
+
+# Bridge dependencies
+
+bp-messages = { path = "../../primitives/messages", default-features = false }
+bp-relayers = { path = "../../primitives/relayers", default-features = false }
+bp-runtime = { path = "../../primitives/runtime", default-features = false }
+pallet-bridge-messages = { path = "../messages", default-features = false }
+
+# Substrate Dependencies
+
+frame-benchmarking = { path = "../../../substrate/frame/benchmarking", default-features = false, optional = true }
+frame-support = { path = "../../../substrate/frame/support", default-features = false }
+frame-system = { path = "../../../substrate/frame/system", default-features = false }
+sp-arithmetic = { path = "../../../substrate/primitives/arithmetic", default-features = false }
+sp-runtime = { path = "../../../substrate/primitives/runtime", default-features = false }
+sp-std = { path = "../../../substrate/primitives/std", default-features = false }
+
+[dev-dependencies]
+bp-runtime = { path = "../../primitives/runtime" }
+pallet-balances = { path = "../../../substrate/frame/balances" }
+sp-core = { path = "../../../substrate/primitives/core" }
+sp-io = { path = "../../../substrate/primitives/io" }
+sp-runtime = { path = "../../../substrate/primitives/runtime" }
+
+[features]
+default = [ "std" ]
+std = [
+	"bp-messages/std",
+	"bp-relayers/std",
+	"bp-runtime/std",
+	"codec/std",
+	"frame-benchmarking/std",
+	"frame-support/std",
+	"frame-system/std",
+	"log/std",
+	"pallet-bridge-messages/std",
+	"scale-info/std",
+	"sp-arithmetic/std",
+	"sp-runtime/std",
+	"sp-std/std",
+]
+runtime-benchmarks = [
+	"frame-benchmarking/runtime-benchmarks",
+	"frame-support/runtime-benchmarks",
+	"frame-system/runtime-benchmarks",
+	"pallet-balances/runtime-benchmarks",
+	"pallet-bridge-messages/runtime-benchmarks",
+	"sp-runtime/runtime-benchmarks",
+]
+try-runtime = [
+	"frame-support/try-runtime",
+	"frame-system/try-runtime",
+	"pallet-balances/try-runtime",
+	"pallet-bridge-messages/try-runtime",
+	"sp-runtime/try-runtime",
+]
diff --git a/cumulus/bridges/modules/relayers/README.md b/bridges/modules/relayers/README.md
similarity index 100%
rename from cumulus/bridges/modules/relayers/README.md
rename to bridges/modules/relayers/README.md
diff --git a/cumulus/bridges/modules/relayers/src/benchmarking.rs b/bridges/modules/relayers/src/benchmarking.rs
similarity index 99%
rename from cumulus/bridges/modules/relayers/src/benchmarking.rs
rename to bridges/modules/relayers/src/benchmarking.rs
index d66a11ff06d027ede93518d5fb79f6b906c7998d..2d74ab38f9dbd1711b62df5e6bebd697fda1b988 100644
--- a/cumulus/bridges/modules/relayers/src/benchmarking.rs
+++ b/bridges/modules/relayers/src/benchmarking.rs
@@ -1,4 +1,4 @@
-// Copyright 2019-2021 Parity Technologies (UK) Ltd.
+// Copyright (C) Parity Technologies (UK) Ltd.
 // This file is part of Parity Bridges Common.
 
 // Parity Bridges Common is free software: you can redistribute it and/or modify
diff --git a/cumulus/bridges/modules/relayers/src/lib.rs b/bridges/modules/relayers/src/lib.rs
similarity index 99%
rename from cumulus/bridges/modules/relayers/src/lib.rs
rename to bridges/modules/relayers/src/lib.rs
index a71c218443b3d40f7fda1eb81d2317b2b5518075..b9b98ca7e253fdb952125e2079752484e37241a2 100644
--- a/cumulus/bridges/modules/relayers/src/lib.rs
+++ b/bridges/modules/relayers/src/lib.rs
@@ -1,4 +1,4 @@
-// Copyright 2019-2021 Parity Technologies (UK) Ltd.
+// Copyright (C) Parity Technologies (UK) Ltd.
 // This file is part of Parity Bridges Common.
 
 // Parity Bridges Common is free software: you can redistribute it and/or modify
diff --git a/cumulus/bridges/modules/relayers/src/mock.rs b/bridges/modules/relayers/src/mock.rs
similarity index 99%
rename from cumulus/bridges/modules/relayers/src/mock.rs
rename to bridges/modules/relayers/src/mock.rs
index b3fcb24cdd20d6c5aeb4471719caffafd9c945e7..4713ec91658afa9ad4e0c2d13055a0921cf1be88 100644
--- a/cumulus/bridges/modules/relayers/src/mock.rs
+++ b/bridges/modules/relayers/src/mock.rs
@@ -1,4 +1,4 @@
-// Copyright 2019-2021 Parity Technologies (UK) Ltd.
+// Copyright (C) Parity Technologies (UK) Ltd.
 // This file is part of Parity Bridges Common.
 
 // Parity Bridges Common is free software: you can redistribute it and/or modify
diff --git a/cumulus/bridges/modules/relayers/src/payment_adapter.rs b/bridges/modules/relayers/src/payment_adapter.rs
similarity index 98%
rename from cumulus/bridges/modules/relayers/src/payment_adapter.rs
rename to bridges/modules/relayers/src/payment_adapter.rs
index a9536cfc0275f319c32e20d48500aacfe7eba991..b2d9c676bddc493700a45fc957235dbb9516296b 100644
--- a/cumulus/bridges/modules/relayers/src/payment_adapter.rs
+++ b/bridges/modules/relayers/src/payment_adapter.rs
@@ -1,4 +1,4 @@
-// Copyright 2019-2021 Parity Technologies (UK) Ltd.
+// Copyright (C) Parity Technologies (UK) Ltd.
 // This file is part of Parity Bridges Common.
 
 // Parity Bridges Common is free software: you can redistribute it and/or modify
diff --git a/cumulus/bridges/modules/relayers/src/stake_adapter.rs b/bridges/modules/relayers/src/stake_adapter.rs
similarity index 99%
rename from cumulus/bridges/modules/relayers/src/stake_adapter.rs
rename to bridges/modules/relayers/src/stake_adapter.rs
index 055b6a111ec724a457e9919b93c986d03f650137..88af9b1877bfe85614f081ee66dbb28586b1d34b 100644
--- a/cumulus/bridges/modules/relayers/src/stake_adapter.rs
+++ b/bridges/modules/relayers/src/stake_adapter.rs
@@ -1,4 +1,4 @@
-// Copyright 2019-2021 Parity Technologies (UK) Ltd.
+// Copyright (C) Parity Technologies (UK) Ltd.
 // This file is part of Parity Bridges Common.
 
 // Parity Bridges Common is free software: you can redistribute it and/or modify
diff --git a/cumulus/bridges/modules/relayers/src/weights.rs b/bridges/modules/relayers/src/weights.rs
similarity index 99%
rename from cumulus/bridges/modules/relayers/src/weights.rs
rename to bridges/modules/relayers/src/weights.rs
index 1bc195a5424728d2b1e4df39d058b72511091e81..2e064a3936df3a0661fc08af48be87520c04dba0 100644
--- a/cumulus/bridges/modules/relayers/src/weights.rs
+++ b/bridges/modules/relayers/src/weights.rs
@@ -1,4 +1,4 @@
-// Copyright 2019-2021 Parity Technologies (UK) Ltd.
+// Copyright (C) Parity Technologies (UK) Ltd.
 // This file is part of Parity Bridges Common.
 
 // Parity Bridges Common is free software: you can redistribute it and/or modify
diff --git a/cumulus/bridges/modules/relayers/src/weights_ext.rs b/bridges/modules/relayers/src/weights_ext.rs
similarity index 97%
rename from cumulus/bridges/modules/relayers/src/weights_ext.rs
rename to bridges/modules/relayers/src/weights_ext.rs
index d459b0686bd7e51eed4fdd88113ec9b507842559..9cd25c47c3782f709249dd9b1fd24e4c6ec8ab7f 100644
--- a/cumulus/bridges/modules/relayers/src/weights_ext.rs
+++ b/bridges/modules/relayers/src/weights_ext.rs
@@ -1,4 +1,4 @@
-// Copyright 2019-2021 Parity Technologies (UK) Ltd.
+// Copyright (C) Parity Technologies (UK) Ltd.
 // This file is part of Parity Bridges Common.
 
 // Parity Bridges Common is free software: you can redistribute it and/or modify
diff --git a/bridges/modules/xcm-bridge-hub-router/Cargo.toml b/bridges/modules/xcm-bridge-hub-router/Cargo.toml
new file mode 100644
index 0000000000000000000000000000000000000000..c61cab291e142e5e1aa4680b162d288ee62284a5
--- /dev/null
+++ b/bridges/modules/xcm-bridge-hub-router/Cargo.toml
@@ -0,0 +1,63 @@
+[package]
+name = "pallet-xcm-bridge-hub-router"
+description = "Bridge hub interface for sibling/parent chains with dynamic fees support."
+version = "0.1.0"
+authors.workspace = true
+edition.workspace = true
+license = "GPL-3.0-or-later WITH Classpath-exception-2.0"
+
+[dependencies]
+codec = { package = "parity-scale-codec", version = "3.1.5", default-features = false }
+log = { version = "0.4.20", default-features = false }
+scale-info = { version = "2.8.0", default-features = false, features = ["bit-vec", "derive", "serde"] }
+
+# Bridge dependencies
+
+bp-xcm-bridge-hub-router = { path = "../../primitives/xcm-bridge-hub-router", default-features = false }
+
+# Substrate Dependencies
+
+frame-benchmarking = { path = "../../../substrate/frame/benchmarking", default-features = false, optional = true }
+frame-support = { path = "../../../substrate/frame/support", default-features = false }
+frame-system = { path = "../../../substrate/frame/system", default-features = false }
+sp-core = { path = "../../../substrate/primitives/core", default-features = false }
+sp-runtime = { path = "../../../substrate/primitives/runtime", default-features = false }
+sp-std = { path = "../../../substrate/primitives/std", default-features = false }
+
+# Polkadot Dependencies
+
+xcm = { package = "staging-xcm", path = "../../../polkadot/xcm", default-features = false }
+xcm-builder = { package = "staging-xcm-builder", path = "../../../polkadot/xcm/xcm-builder", default-features = false }
+
+[dev-dependencies]
+sp-io = { path = "../../../substrate/primitives/io" }
+sp-std = { path = "../../../substrate/primitives/std" }
+
+[features]
+default = [ "std" ]
+std = [
+	"bp-xcm-bridge-hub-router/std",
+	"codec/std",
+	"frame-benchmarking/std",
+	"frame-support/std",
+	"frame-system/std",
+	"log/std",
+	"scale-info/std",
+	"sp-core/std",
+	"sp-runtime/std",
+	"sp-std/std",
+	"xcm-builder/std",
+	"xcm/std",
+]
+runtime-benchmarks = [
+	"frame-benchmarking/runtime-benchmarks",
+	"frame-support/runtime-benchmarks",
+	"frame-system/runtime-benchmarks",
+	"sp-runtime/runtime-benchmarks",
+	"xcm-builder/runtime-benchmarks",
+]
+try-runtime = [
+	"frame-support/try-runtime",
+	"frame-system/try-runtime",
+	"sp-runtime/try-runtime",
+]
diff --git a/cumulus/bridges/modules/xcm-bridge-hub-router/src/benchmarking.rs b/bridges/modules/xcm-bridge-hub-router/src/benchmarking.rs
similarity index 95%
rename from cumulus/bridges/modules/xcm-bridge-hub-router/src/benchmarking.rs
rename to bridges/modules/xcm-bridge-hub-router/src/benchmarking.rs
index b32b983daf72c9ed4b104a3a28cc43011a0865d0..4bbe414f66355bfb2fc866cc74b89f7b97988837 100644
--- a/cumulus/bridges/modules/xcm-bridge-hub-router/src/benchmarking.rs
+++ b/bridges/modules/xcm-bridge-hub-router/src/benchmarking.rs
@@ -1,4 +1,4 @@
-// Copyright 2019-2021 Parity Technologies (UK) Ltd.
+// Copyright (C) Parity Technologies (UK) Ltd.
 // This file is part of Parity Bridges Common.
 
 // Parity Bridges Common is free software: you can redistribute it and/or modify
@@ -22,10 +22,7 @@ use crate::{Bridge, Call};
 
 use bp_xcm_bridge_hub_router::{BridgeState, MINIMAL_DELIVERY_FEE_FACTOR};
 use frame_benchmarking::benchmarks_instance_pallet;
-use frame_support::{
-	dispatch::UnfilteredDispatchable,
-	traits::{EnsureOrigin, Get, Hooks},
-};
+use frame_support::traits::{EnsureOrigin, Get, Hooks, UnfilteredDispatchable};
 use sp_runtime::traits::Zero;
 use xcm::prelude::*;
 
diff --git a/cumulus/bridges/modules/xcm-bridge-hub-router/src/lib.rs b/bridges/modules/xcm-bridge-hub-router/src/lib.rs
similarity index 99%
rename from cumulus/bridges/modules/xcm-bridge-hub-router/src/lib.rs
rename to bridges/modules/xcm-bridge-hub-router/src/lib.rs
index 87e050b45c73645ac169cbf68480929d3662b53f..5cf94fc83fd9dffda2e1fa614608eb53ea13922e 100644
--- a/cumulus/bridges/modules/xcm-bridge-hub-router/src/lib.rs
+++ b/bridges/modules/xcm-bridge-hub-router/src/lib.rs
@@ -1,4 +1,4 @@
-// Copyright 2019-2021 Parity Technologies (UK) Ltd.
+// Copyright (C) Parity Technologies (UK) Ltd.
 // This file is part of Parity Bridges Common.
 
 // Parity Bridges Common is free software: you can redistribute it and/or modify
diff --git a/cumulus/bridges/modules/xcm-bridge-hub-router/src/mock.rs b/bridges/modules/xcm-bridge-hub-router/src/mock.rs
similarity index 98%
rename from cumulus/bridges/modules/xcm-bridge-hub-router/src/mock.rs
rename to bridges/modules/xcm-bridge-hub-router/src/mock.rs
index 5ad7be4890a176c16cd88037207361a952fafe78..58df21a6d9016a70a8414b884ccedf33d7ae1524 100644
--- a/cumulus/bridges/modules/xcm-bridge-hub-router/src/mock.rs
+++ b/bridges/modules/xcm-bridge-hub-router/src/mock.rs
@@ -1,4 +1,4 @@
-// Copyright 2019-2021 Parity Technologies (UK) Ltd.
+// Copyright (C) Parity Technologies (UK) Ltd.
 // This file is part of Parity Bridges Common.
 
 // Parity Bridges Common is free software: you can redistribute it and/or modify
@@ -144,5 +144,5 @@ pub fn new_test_ext() -> sp_io::TestExternalities {
 
 /// Run pallet test.
 pub fn run_test<T>(test: impl FnOnce() -> T) -> T {
-	new_test_ext().execute_with(|| test())
+	new_test_ext().execute_with(test)
 }
diff --git a/cumulus/bridges/modules/xcm-bridge-hub-router/src/weights.rs b/bridges/modules/xcm-bridge-hub-router/src/weights.rs
similarity index 99%
rename from cumulus/bridges/modules/xcm-bridge-hub-router/src/weights.rs
rename to bridges/modules/xcm-bridge-hub-router/src/weights.rs
index 04909f3b2e838c058fc12fc9314333fa78ca3e8a..62936e997f3cd0aaea17859b49d7c0edf6b65989 100644
--- a/cumulus/bridges/modules/xcm-bridge-hub-router/src/weights.rs
+++ b/bridges/modules/xcm-bridge-hub-router/src/weights.rs
@@ -1,4 +1,4 @@
-// Copyright 2019-2021 Parity Technologies (UK) Ltd.
+// Copyright (C) Parity Technologies (UK) Ltd.
 // This file is part of Parity Bridges Common.
 
 // Parity Bridges Common is free software: you can redistribute it and/or modify
diff --git a/cumulus/bridges/primitives/chain-asset-hub-kusama/Cargo.toml b/bridges/primitives/chain-asset-hub-kusama/Cargo.toml
similarity index 79%
rename from cumulus/bridges/primitives/chain-asset-hub-kusama/Cargo.toml
rename to bridges/primitives/chain-asset-hub-kusama/Cargo.toml
index 9bc7c46e07e3b579ca8a6080164de54701dbc3f0..adb9a57bc134729ab753e3006093207e0de32e61 100644
--- a/cumulus/bridges/primitives/chain-asset-hub-kusama/Cargo.toml
+++ b/bridges/primitives/chain-asset-hub-kusama/Cargo.toml
@@ -2,8 +2,8 @@
 name = "bp-asset-hub-kusama"
 description = "Primitives of AssetHubKusama parachain runtime."
 version = "0.1.0"
-authors = ["Parity Technologies <admin@parity.io>"]
-edition = "2021"
+authors.workspace = true
+edition.workspace = true
 license = "GPL-3.0-or-later WITH Classpath-exception-2.0"
 
 [dependencies]
@@ -11,7 +11,7 @@ codec = { package = "parity-scale-codec", version = "3.1.5", default-features =
 scale-info = { version = "2.9.0", default-features = false, features = ["derive"] }
 
 # Substrate Dependencies
-frame-support = { path = "../../../../substrate/frame/support", default-features = false }
+frame-support = { path = "../../../substrate/frame/support", default-features = false }
 
 # Bridge Dependencies
 bp-xcm-bridge-hub-router = { path = "../xcm-bridge-hub-router", default-features = false }
diff --git a/cumulus/bridges/primitives/chain-asset-hub-kusama/src/lib.rs b/bridges/primitives/chain-asset-hub-kusama/src/lib.rs
similarity index 97%
rename from cumulus/bridges/primitives/chain-asset-hub-kusama/src/lib.rs
rename to bridges/primitives/chain-asset-hub-kusama/src/lib.rs
index b3b25ba6eddd7b36991db10d3a6165b7d9933e3c..94016c1da0cb1235dec6717bd6da79ff4dab74f4 100644
--- a/cumulus/bridges/primitives/chain-asset-hub-kusama/src/lib.rs
+++ b/bridges/primitives/chain-asset-hub-kusama/src/lib.rs
@@ -1,4 +1,4 @@
-// Copyright 2022 Parity Technologies (UK) Ltd.
+// Copyright (C) Parity Technologies (UK) Ltd.
 // This file is part of Parity Bridges Common.
 
 // Parity Bridges Common is free software: you can redistribute it and/or modify
diff --git a/cumulus/bridges/primitives/chain-asset-hub-polkadot/Cargo.toml b/bridges/primitives/chain-asset-hub-polkadot/Cargo.toml
similarity index 72%
rename from cumulus/bridges/primitives/chain-asset-hub-polkadot/Cargo.toml
rename to bridges/primitives/chain-asset-hub-polkadot/Cargo.toml
index b5b5fcde4e20228e62be1e4115767b27110c913e..857ead15b0ddf79b82fd7b8c01da767419e22e2b 100644
--- a/cumulus/bridges/primitives/chain-asset-hub-polkadot/Cargo.toml
+++ b/bridges/primitives/chain-asset-hub-polkadot/Cargo.toml
@@ -2,8 +2,8 @@
 name = "bp-asset-hub-polkadot"
 description = "Primitives of AssetHubPolkadot parachain runtime."
 version = "0.1.0"
-authors = ["Parity Technologies <admin@parity.io>"]
-edition = "2021"
+authors.workspace = true
+edition.workspace = true
 license = "GPL-3.0-or-later WITH Classpath-exception-2.0"
 
 [dependencies]
@@ -11,8 +11,8 @@ codec = { package = "parity-scale-codec", version = "3.1.5", default-features =
 scale-info = { version = "2.9.0", default-features = false, features = ["derive"] }
 
 # Substrate Dependencies
-frame-support = { path = "../../../../substrate/frame/support", default-features = false }
-sp-runtime = { path = "../../../../substrate/primitives/runtime", default-features = false }
+frame-support = { path = "../../../substrate/frame/support", default-features = false }
+sp-runtime = { path = "../../../substrate/primitives/runtime", default-features = false }
 
 # Bridge Dependencies
 bp-xcm-bridge-hub-router = { path = "../xcm-bridge-hub-router", default-features = false }
diff --git a/cumulus/bridges/primitives/chain-asset-hub-polkadot/src/lib.rs b/bridges/primitives/chain-asset-hub-polkadot/src/lib.rs
similarity index 97%
rename from cumulus/bridges/primitives/chain-asset-hub-polkadot/src/lib.rs
rename to bridges/primitives/chain-asset-hub-polkadot/src/lib.rs
index 7363e5af02a2ccff76e2f1d54883673ead3583bd..486fba60e1f8836d0eec2feece7919205cf6c372 100644
--- a/cumulus/bridges/primitives/chain-asset-hub-polkadot/src/lib.rs
+++ b/bridges/primitives/chain-asset-hub-polkadot/src/lib.rs
@@ -1,4 +1,4 @@
-// Copyright 2022 Parity Technologies (UK) Ltd.
+// Copyright (C) Parity Technologies (UK) Ltd.
 // This file is part of Parity Bridges Common.
 
 // Parity Bridges Common is free software: you can redistribute it and/or modify
diff --git a/cumulus/bridges/primitives/chain-bridge-hub-cumulus/Cargo.toml b/bridges/primitives/chain-bridge-hub-cumulus/Cargo.toml
similarity index 57%
rename from cumulus/bridges/primitives/chain-bridge-hub-cumulus/Cargo.toml
rename to bridges/primitives/chain-bridge-hub-cumulus/Cargo.toml
index af916665814b345cd5b61983218dce96d66682d8..24cf7236d45333254dd62073dfebcd85ec526362 100644
--- a/cumulus/bridges/primitives/chain-bridge-hub-cumulus/Cargo.toml
+++ b/bridges/primitives/chain-bridge-hub-cumulus/Cargo.toml
@@ -2,8 +2,8 @@
 name = "bp-bridge-hub-cumulus"
 description = "Primitives of BridgeHubRococo parachain runtime."
 version = "0.1.0"
-authors = ["Parity Technologies <admin@parity.io>"]
-edition = "2021"
+authors.workspace = true
+edition.workspace = true
 license = "GPL-3.0-or-later WITH Classpath-exception-2.0"
 
 [dependencies]
@@ -15,13 +15,13 @@ bp-runtime = { path = "../runtime", default-features = false }
 
 # Substrate Based Dependencies
 
-frame-system = { path = "../../../../substrate/frame/system", default-features = false }
-frame-support = { path = "../../../../substrate/frame/support", default-features = false }
-sp-api = { path = "../../../../substrate/primitives/api", default-features = false }
-sp-std = { path = "../../../../substrate/primitives/std", default-features = false }
+frame-system = { path = "../../../substrate/frame/system", default-features = false }
+frame-support = { path = "../../../substrate/frame/support", default-features = false }
+sp-api = { path = "../../../substrate/primitives/api", default-features = false }
+sp-std = { path = "../../../substrate/primitives/std", default-features = false }
 
 # Polkadot Dependencies
-polkadot-primitives = { path = "../../../../polkadot/primitives", default-features = false }
+polkadot-primitives = { path = "../../../polkadot/primitives", default-features = false }
 
 [features]
 default = [ "std" ]
diff --git a/cumulus/bridges/primitives/chain-bridge-hub-cumulus/src/lib.rs b/bridges/primitives/chain-bridge-hub-cumulus/src/lib.rs
similarity index 71%
rename from cumulus/bridges/primitives/chain-bridge-hub-cumulus/src/lib.rs
rename to bridges/primitives/chain-bridge-hub-cumulus/src/lib.rs
index 525b2e62ceab0583c43791aae850c2cd6b7715e5..cd281324ee55fa9a0c4bfcfe454b34ecba9bfd07 100644
--- a/cumulus/bridges/primitives/chain-bridge-hub-cumulus/src/lib.rs
+++ b/bridges/primitives/chain-bridge-hub-cumulus/src/lib.rs
@@ -1,4 +1,4 @@
-// Copyright 2022 Parity Technologies (UK) Ltd.
+// Copyright (C) Parity Technologies (UK) Ltd.
 // This file is part of Parity Bridges Common.
 
 // Parity Bridges Common is free software: you can redistribute it and/or modify
@@ -23,10 +23,9 @@ pub use bp_polkadot_core::{
 };
 
 use bp_messages::*;
+use bp_polkadot_core::SuffixedCommonSignedExtension;
 use bp_runtime::extensions::{
-	BridgeRejectObsoleteHeadersAndMessages, ChargeTransactionPayment, CheckEra, CheckGenesis,
-	CheckNonZeroSender, CheckNonce, CheckSpecVersion, CheckTxVersion, CheckWeight,
-	GenericSignedExtension, RefundBridgedParachainMessagesSchema,
+	BridgeRejectObsoleteHeadersAndMessages, RefundBridgedParachainMessagesSchema,
 };
 use frame_support::{
 	dispatch::DispatchClass,
@@ -53,7 +52,7 @@ pub const NORMAL_DISPATCH_RATIO: Perbill = Perbill::from_percent(75);
 /// This is a copy-paste from the cumulus repo's `parachains-common` crate.
 const MAXIMUM_BLOCK_WEIGHT: Weight = Weight::from_parts(constants::WEIGHT_REF_TIME_PER_SECOND, 0)
 	.saturating_div(2)
-	.set_proof_size(polkadot_primitives::v5::MAX_POV_SIZE as u64);
+	.set_proof_size(polkadot_primitives::MAX_POV_SIZE as u64);
 
 /// All cumulus bridge hubs assume that about 5 percent of the block weight is consumed by
 /// `on_initialize` handlers. This is used to limit the maximal weight of a single extrinsic.
@@ -133,88 +132,8 @@ pub const MAX_UNREWARDED_RELAYERS_IN_CONFIRMATION_TX: MessageNonce = 1024;
 /// analysis (like the one above).
 pub const MAX_UNCONFIRMED_MESSAGES_IN_CONFIRMATION_TX: MessageNonce = 4096;
 
-/// Extra signed extension data that is used by all bridge hubs.
-pub type SignedExtra = (
-	CheckNonZeroSender,
-	CheckSpecVersion,
-	CheckTxVersion,
-	CheckGenesis<Hash>,
-	CheckEra<Hash>,
-	CheckNonce<Nonce>,
-	CheckWeight,
-	ChargeTransactionPayment<Balance>,
+/// Signed extension that is used by all bridge hubs.
+pub type SignedExtension = SuffixedCommonSignedExtension<(
 	BridgeRejectObsoleteHeadersAndMessages,
 	RefundBridgedParachainMessagesSchema,
-);
-
-/// Signed extension that is used by all bridge hubs.
-pub type SignedExtension = GenericSignedExtension<SignedExtra>;
-
-/// Helper trait to define some extra methods on bridge hubs signed extension (and
-/// overcome Rust limitations).
-pub trait BridgeHubSignedExtension {
-	/// Create signed extension from its components.
-	fn from_params(
-		spec_version: u32,
-		transaction_version: u32,
-		era: bp_runtime::TransactionEra<BlockNumber, Hash>,
-		genesis_hash: Hash,
-		nonce: Nonce,
-		tip: Balance,
-	) -> Self;
-
-	/// Return transaction nonce.
-	fn nonce(&self) -> Nonce;
-
-	/// Return transaction tip.
-	fn tip(&self) -> Balance;
-}
-
-impl BridgeHubSignedExtension for SignedExtension {
-	/// Create signed extension from its components.
-	fn from_params(
-		spec_version: u32,
-		transaction_version: u32,
-		era: bp_runtime::TransactionEra<BlockNumber, Hash>,
-		genesis_hash: Hash,
-		nonce: Nonce,
-		tip: Balance,
-	) -> Self {
-		GenericSignedExtension::new(
-			(
-				(),              // non-zero sender
-				(),              // spec version
-				(),              // tx version
-				(),              // genesis
-				era.frame_era(), // era
-				nonce.into(),    // nonce (compact encoding)
-				(),              // Check weight
-				tip.into(),      // transaction payment / tip (compact encoding)
-				(),              // bridge reject obsolete headers and msgs
-				(),              // bridge reward to relayer for message passing
-			),
-			Some((
-				(),
-				spec_version,
-				transaction_version,
-				genesis_hash,
-				era.signed_payload(genesis_hash),
-				(),
-				(),
-				(),
-				(),
-				(),
-			)),
-		)
-	}
-
-	/// Return transaction nonce.
-	fn nonce(&self) -> Nonce {
-		self.payload.5 .0
-	}
-
-	/// Return transaction tip.
-	fn tip(&self) -> Balance {
-		self.payload.7 .0
-	}
-}
+)>;
diff --git a/cumulus/bridges/primitives/chain-bridge-hub-kusama/Cargo.toml b/bridges/primitives/chain-bridge-hub-kusama/Cargo.toml
similarity index 60%
rename from cumulus/bridges/primitives/chain-bridge-hub-kusama/Cargo.toml
rename to bridges/primitives/chain-bridge-hub-kusama/Cargo.toml
index d6d92ebb578da4823e81c556f7a13664a7942a52..387f5e8ade6e7dc501159266a94168dd7055a8c1 100644
--- a/cumulus/bridges/primitives/chain-bridge-hub-kusama/Cargo.toml
+++ b/bridges/primitives/chain-bridge-hub-kusama/Cargo.toml
@@ -2,8 +2,8 @@
 name = "bp-bridge-hub-kusama"
 description = "Primitives of BridgeHubRococo parachain runtime."
 version = "0.1.0"
-authors = ["Parity Technologies <admin@parity.io>"]
-edition = "2021"
+authors.workspace = true
+edition.workspace = true
 license = "GPL-3.0-or-later WITH Classpath-exception-2.0"
 
 [dependencies]
@@ -15,10 +15,10 @@ bp-messages = { path = "../messages", default-features = false }
 
 # Substrate Based Dependencies
 
-frame-support = { path = "../../../../substrate/frame/support", default-features = false }
-sp-api = { path = "../../../../substrate/primitives/api", default-features = false }
-sp-runtime = { path = "../../../../substrate/primitives/runtime", default-features = false }
-sp-std = { path = "../../../../substrate/primitives/std", default-features = false }
+frame-support = { path = "../../../substrate/frame/support", default-features = false }
+sp-api = { path = "../../../substrate/primitives/api", default-features = false }
+sp-runtime = { path = "../../../substrate/primitives/runtime", default-features = false }
+sp-std = { path = "../../../substrate/primitives/std", default-features = false }
 
 [features]
 default = [ "std" ]
diff --git a/cumulus/bridges/primitives/chain-bridge-hub-kusama/src/lib.rs b/bridges/primitives/chain-bridge-hub-kusama/src/lib.rs
similarity index 97%
rename from cumulus/bridges/primitives/chain-bridge-hub-kusama/src/lib.rs
rename to bridges/primitives/chain-bridge-hub-kusama/src/lib.rs
index af50a97b28b3dc486023dfeb38de9a005aa0aa96..66e0dad05895c7df72cda7158c39e589b78ada73 100644
--- a/cumulus/bridges/primitives/chain-bridge-hub-kusama/src/lib.rs
+++ b/bridges/primitives/chain-bridge-hub-kusama/src/lib.rs
@@ -1,4 +1,4 @@
-// Copyright 2022 Parity Technologies (UK) Ltd.
+// Copyright (C) Parity Technologies (UK) Ltd.
 // This file is part of Parity Bridges Common.
 
 // Parity Bridges Common is free software: you can redistribute it and/or modify
@@ -29,7 +29,6 @@ use frame_support::{
 	sp_runtime::{MultiAddress, MultiSigner},
 };
 use sp_runtime::RuntimeDebug;
-use sp_std::prelude::Vec;
 
 /// BridgeHubKusama parachain.
 #[derive(RuntimeDebug)]
diff --git a/cumulus/bridges/primitives/chain-bridge-hub-polkadot/Cargo.toml b/bridges/primitives/chain-bridge-hub-polkadot/Cargo.toml
similarity index 60%
rename from cumulus/bridges/primitives/chain-bridge-hub-polkadot/Cargo.toml
rename to bridges/primitives/chain-bridge-hub-polkadot/Cargo.toml
index cb5ebf3b478c68d8ef5a61fe31340e4e9b0bcad9..40b386e22d224da198043f44210a8c1de65af3ac 100644
--- a/cumulus/bridges/primitives/chain-bridge-hub-polkadot/Cargo.toml
+++ b/bridges/primitives/chain-bridge-hub-polkadot/Cargo.toml
@@ -2,8 +2,8 @@
 name = "bp-bridge-hub-polkadot"
 description = "Primitives of BridgeHubWococo parachain runtime."
 version = "0.1.0"
-authors = ["Parity Technologies <admin@parity.io>"]
-edition = "2021"
+authors.workspace = true
+edition.workspace = true
 license = "GPL-3.0-or-later WITH Classpath-exception-2.0"
 
 [dependencies]
@@ -16,10 +16,10 @@ bp-messages = { path = "../messages", default-features = false }
 
 # Substrate Based Dependencies
 
-frame-support = { path = "../../../../substrate/frame/support", default-features = false }
-sp-api = { path = "../../../../substrate/primitives/api", default-features = false }
-sp-runtime = { path = "../../../../substrate/primitives/runtime", default-features = false }
-sp-std = { path = "../../../../substrate/primitives/std", default-features = false }
+frame-support = { path = "../../../substrate/frame/support", default-features = false }
+sp-api = { path = "../../../substrate/primitives/api", default-features = false }
+sp-runtime = { path = "../../../substrate/primitives/runtime", default-features = false }
+sp-std = { path = "../../../substrate/primitives/std", default-features = false }
 
 [features]
 default = [ "std" ]
diff --git a/cumulus/bridges/primitives/chain-bridge-hub-polkadot/src/lib.rs b/bridges/primitives/chain-bridge-hub-polkadot/src/lib.rs
similarity index 96%
rename from cumulus/bridges/primitives/chain-bridge-hub-polkadot/src/lib.rs
rename to bridges/primitives/chain-bridge-hub-polkadot/src/lib.rs
index a1f6ae1a1a9a37a1ed11d52c37993c8c0b570695..c3661c1adcada619bb319ae8853c20623565c0c9 100644
--- a/cumulus/bridges/primitives/chain-bridge-hub-polkadot/src/lib.rs
+++ b/bridges/primitives/chain-bridge-hub-polkadot/src/lib.rs
@@ -1,4 +1,4 @@
-// Copyright 2019-2021 Parity Technologies (UK) Ltd.
+// Copyright (C) Parity Technologies (UK) Ltd.
 // This file is part of Parity Bridges Common.
 
 // Parity Bridges Common is free software: you can redistribute it and/or modify
@@ -26,7 +26,6 @@ use bp_runtime::{
 };
 use frame_support::dispatch::DispatchClass;
 use sp_runtime::RuntimeDebug;
-use sp_std::prelude::Vec;
 
 /// BridgeHubPolkadot parachain.
 #[derive(RuntimeDebug)]
diff --git a/cumulus/bridges/primitives/chain-bridge-hub-rococo/Cargo.toml b/bridges/primitives/chain-bridge-hub-rococo/Cargo.toml
similarity index 60%
rename from cumulus/bridges/primitives/chain-bridge-hub-rococo/Cargo.toml
rename to bridges/primitives/chain-bridge-hub-rococo/Cargo.toml
index cb11afff7af787f854142b324801c6e5a426402f..05b8163e9fcaacc8f32c0b45bfafffc882e0f1be 100644
--- a/cumulus/bridges/primitives/chain-bridge-hub-rococo/Cargo.toml
+++ b/bridges/primitives/chain-bridge-hub-rococo/Cargo.toml
@@ -2,8 +2,8 @@
 name = "bp-bridge-hub-rococo"
 description = "Primitives of BridgeHubRococo parachain runtime."
 version = "0.1.0"
-authors = ["Parity Technologies <admin@parity.io>"]
-edition = "2021"
+authors.workspace = true
+edition.workspace = true
 license = "GPL-3.0-or-later WITH Classpath-exception-2.0"
 
 [dependencies]
@@ -15,10 +15,10 @@ bp-messages = { path = "../messages", default-features = false }
 
 # Substrate Based Dependencies
 
-frame-support = { path = "../../../../substrate/frame/support", default-features = false }
-sp-api = { path = "../../../../substrate/primitives/api", default-features = false }
-sp-runtime = { path = "../../../../substrate/primitives/runtime", default-features = false }
-sp-std = { path = "../../../../substrate/primitives/std", default-features = false }
+frame-support = { path = "../../../substrate/frame/support", default-features = false }
+sp-api = { path = "../../../substrate/primitives/api", default-features = false }
+sp-runtime = { path = "../../../substrate/primitives/runtime", default-features = false }
+sp-std = { path = "../../../substrate/primitives/std", default-features = false }
 
 [features]
 default = [ "std" ]
diff --git a/cumulus/bridges/primitives/chain-bridge-hub-rococo/src/lib.rs b/bridges/primitives/chain-bridge-hub-rococo/src/lib.rs
similarity index 97%
rename from cumulus/bridges/primitives/chain-bridge-hub-rococo/src/lib.rs
rename to bridges/primitives/chain-bridge-hub-rococo/src/lib.rs
index 37b1a9ebb927ca5e58987d38c481b75a197ccfaf..a50bda23ac8d358259d725e0c93be31983caba0d 100644
--- a/cumulus/bridges/primitives/chain-bridge-hub-rococo/src/lib.rs
+++ b/bridges/primitives/chain-bridge-hub-rococo/src/lib.rs
@@ -1,4 +1,4 @@
-// Copyright 2022 Parity Technologies (UK) Ltd.
+// Copyright (C) Parity Technologies (UK) Ltd.
 // This file is part of Parity Bridges Common.
 
 // Parity Bridges Common is free software: you can redistribute it and/or modify
@@ -26,7 +26,7 @@ use bp_runtime::{
 };
 use frame_support::dispatch::DispatchClass;
 use sp_runtime::{MultiAddress, MultiSigner, RuntimeDebug};
-use sp_std::prelude::Vec;
+
 /// BridgeHubRococo parachain.
 #[derive(RuntimeDebug)]
 pub struct BridgeHubRococo;
diff --git a/cumulus/bridges/primitives/chain-bridge-hub-wococo/Cargo.toml b/bridges/primitives/chain-bridge-hub-wococo/Cargo.toml
similarity index 60%
rename from cumulus/bridges/primitives/chain-bridge-hub-wococo/Cargo.toml
rename to bridges/primitives/chain-bridge-hub-wococo/Cargo.toml
index 7302d9ff76d03ee3504525133a3f91241c4c2df9..17c134f4412f7d74a45e089c920bd260bcd95008 100644
--- a/cumulus/bridges/primitives/chain-bridge-hub-wococo/Cargo.toml
+++ b/bridges/primitives/chain-bridge-hub-wococo/Cargo.toml
@@ -2,8 +2,8 @@
 name = "bp-bridge-hub-wococo"
 description = "Primitives of BridgeHubWococo parachain runtime."
 version = "0.1.0"
-authors = ["Parity Technologies <admin@parity.io>"]
-edition = "2021"
+authors.workspace = true
+edition.workspace = true
 license = "GPL-3.0-or-later WITH Classpath-exception-2.0"
 
 [dependencies]
@@ -16,10 +16,10 @@ bp-messages = { path = "../messages", default-features = false }
 
 # Substrate Based Dependencies
 
-frame-support = { path = "../../../../substrate/frame/support", default-features = false }
-sp-api = { path = "../../../../substrate/primitives/api", default-features = false }
-sp-runtime = { path = "../../../../substrate/primitives/runtime", default-features = false }
-sp-std = { path = "../../../../substrate/primitives/std", default-features = false }
+frame-support = { path = "../../../substrate/frame/support", default-features = false }
+sp-api = { path = "../../../substrate/primitives/api", default-features = false }
+sp-runtime = { path = "../../../substrate/primitives/runtime", default-features = false }
+sp-std = { path = "../../../substrate/primitives/std", default-features = false }
 
 [features]
 default = [ "std" ]
diff --git a/cumulus/bridges/primitives/chain-bridge-hub-wococo/src/lib.rs b/bridges/primitives/chain-bridge-hub-wococo/src/lib.rs
similarity index 96%
rename from cumulus/bridges/primitives/chain-bridge-hub-wococo/src/lib.rs
rename to bridges/primitives/chain-bridge-hub-wococo/src/lib.rs
index 635a4c96054ad40d4f47394c547591674c2b68f1..ce4600f5ff35d674afb1f6a6bdd24a044990fe78 100644
--- a/cumulus/bridges/primitives/chain-bridge-hub-wococo/src/lib.rs
+++ b/bridges/primitives/chain-bridge-hub-wococo/src/lib.rs
@@ -1,4 +1,4 @@
-// Copyright 2019-2021 Parity Technologies (UK) Ltd.
+// Copyright (C) Parity Technologies (UK) Ltd.
 // This file is part of Parity Bridges Common.
 
 // Parity Bridges Common is free software: you can redistribute it and/or modify
@@ -26,7 +26,6 @@ use bp_runtime::{
 };
 use frame_support::dispatch::DispatchClass;
 use sp_runtime::RuntimeDebug;
-use sp_std::prelude::Vec;
 
 /// BridgeHubWococo parachain.
 #[derive(RuntimeDebug)]
diff --git a/cumulus/bridges/primitives/chain-kusama/Cargo.toml b/bridges/primitives/chain-kusama/Cargo.toml
similarity index 64%
rename from cumulus/bridges/primitives/chain-kusama/Cargo.toml
rename to bridges/primitives/chain-kusama/Cargo.toml
index 4ad39858df347a2857e0b93057933a53c2537c09..2d63c3f374fb50c94e2572c09511bf20d63b61e4 100644
--- a/cumulus/bridges/primitives/chain-kusama/Cargo.toml
+++ b/bridges/primitives/chain-kusama/Cargo.toml
@@ -2,8 +2,8 @@
 name = "bp-kusama"
 description = "Primitives of Kusama runtime."
 version = "0.1.0"
-authors = ["Parity Technologies <admin@parity.io>"]
-edition = "2021"
+authors.workspace = true
+edition.workspace = true
 license = "GPL-3.0-or-later WITH Classpath-exception-2.0"
 
 [dependencies]
@@ -16,9 +16,9 @@ bp-runtime = { path = "../runtime", default-features = false }
 
 # Substrate Based Dependencies
 
-frame-support = { path = "../../../../substrate/frame/support", default-features = false }
-sp-api = { path = "../../../../substrate/primitives/api", default-features = false }
-sp-std = { path = "../../../../substrate/primitives/std", default-features = false }
+frame-support = { path = "../../../substrate/frame/support", default-features = false }
+sp-api = { path = "../../../substrate/primitives/api", default-features = false }
+sp-std = { path = "../../../substrate/primitives/std", default-features = false }
 
 [features]
 default = [ "std" ]
diff --git a/cumulus/bridges/primitives/chain-kusama/src/lib.rs b/bridges/primitives/chain-kusama/src/lib.rs
similarity index 94%
rename from cumulus/bridges/primitives/chain-kusama/src/lib.rs
rename to bridges/primitives/chain-kusama/src/lib.rs
index b758484aefeb41c3adb80f2c47189c2e4cddd8f0..d5748aa132cea6caddeabd102b62345bbdc6153f 100644
--- a/cumulus/bridges/primitives/chain-kusama/src/lib.rs
+++ b/bridges/primitives/chain-kusama/src/lib.rs
@@ -1,4 +1,4 @@
-// Copyright 2019-2021 Parity Technologies (UK) Ltd.
+// Copyright (C) Parity Technologies (UK) Ltd.
 // This file is part of Parity Bridges Common.
 
 // Parity Bridges Common is free software: you can redistribute it and/or modify
@@ -23,7 +23,6 @@ pub use bp_polkadot_core::*;
 use bp_header_chain::ChainWithGrandpa;
 use bp_runtime::{decl_bridge_finality_runtime_apis, Chain};
 use frame_support::weights::Weight;
-use sp_std::prelude::Vec;
 
 /// Kusama Chain
 pub struct Kusama;
@@ -57,6 +56,9 @@ impl ChainWithGrandpa for Kusama {
 	const AVERAGE_HEADER_SIZE_IN_JUSTIFICATION: u32 = AVERAGE_HEADER_SIZE_IN_JUSTIFICATION;
 }
 
+// The SignedExtension used by Kusama.
+pub use bp_polkadot_core::CommonSignedExtension as SignedExtension;
+
 /// Name of the parachains pallet in the Kusama runtime.
 pub const PARAS_PALLET_NAME: &str = "Paras";
 
diff --git a/bridges/primitives/chain-polkadot-bulletin/Cargo.toml b/bridges/primitives/chain-polkadot-bulletin/Cargo.toml
new file mode 100644
index 0000000000000000000000000000000000000000..4311aec47276e5144ddc56074cda205a1ec454da
--- /dev/null
+++ b/bridges/primitives/chain-polkadot-bulletin/Cargo.toml
@@ -0,0 +1,41 @@
+[package]
+name = "bp-polkadot-bulletin"
+description = "Primitives of Polkadot Bulletin chain runtime."
+version = "0.1.0"
+authors = ["Parity Technologies <admin@parity.io>"]
+edition = "2021"
+license = "GPL-3.0-or-later WITH Classpath-exception-2.0"
+
+[dependencies]
+codec = { package = "parity-scale-codec", version = "3.1.5", default-features = false, features = ["derive"] }
+scale-info = { version = "2.9.0", default-features = false, features = ["derive"] }
+
+# Bridge Dependencies
+
+bp-header-chain = { path = "../header-chain", default-features = false }
+bp-messages = { path = "../messages", default-features = false }
+bp-polkadot-core = { path = "../polkadot-core", default-features = false }
+bp-runtime = { path = "../runtime", default-features = false }
+
+# Substrate Based Dependencies
+
+frame-support = { path = "../../../substrate/frame/support", default-features = false }
+frame-system = { path = "../../../substrate/frame/system", default-features = false }
+sp-api = { path = "../../../substrate/primitives/api", default-features = false }
+sp-runtime = { path = "../../../substrate/primitives/runtime", default-features = false }
+sp-std = { path = "../../../substrate/primitives/std", default-features = false }
+
+[features]
+default = [ "std" ]
+std = [
+	"bp-header-chain/std",
+	"bp-messages/std",
+	"bp-polkadot-core/std",
+	"bp-runtime/std",
+	"codec/std",
+	"frame-support/std",
+	"frame-system/std",
+	"sp-api/std",
+	"sp-runtime/std",
+	"sp-std/std",
+]
diff --git a/bridges/primitives/chain-polkadot-bulletin/src/lib.rs b/bridges/primitives/chain-polkadot-bulletin/src/lib.rs
new file mode 100644
index 0000000000000000000000000000000000000000..fcc6e90eb1b298e703b7c4b1a83c914f0a018031
--- /dev/null
+++ b/bridges/primitives/chain-polkadot-bulletin/src/lib.rs
@@ -0,0 +1,215 @@
+// Copyright (C) Parity Technologies (UK) Ltd.
+// This file is part of Parity Bridges Common.
+
+// Parity Bridges Common 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.
+
+// Parity Bridges Common 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 Parity Bridges Common.  If not, see <http://www.gnu.org/licenses/>.
+
+//! Polkadot Bulletin Chain primitives.
+
+#![warn(missing_docs)]
+#![cfg_attr(not(feature = "std"), no_std)]
+
+use bp_header_chain::ChainWithGrandpa;
+use bp_messages::MessageNonce;
+use bp_runtime::{
+	decl_bridge_finality_runtime_apis, decl_bridge_messages_runtime_apis,
+	extensions::{
+		CheckEra, CheckGenesis, CheckNonZeroSender, CheckNonce, CheckSpecVersion, CheckTxVersion,
+		CheckWeight, GenericSignedExtension, GenericSignedExtensionSchema,
+	},
+	Chain, TransactionEra,
+};
+use codec::{Decode, Encode};
+use frame_support::{
+	dispatch::DispatchClass,
+	parameter_types,
+	weights::{constants::WEIGHT_REF_TIME_PER_SECOND, Weight},
+};
+use frame_system::limits;
+use scale_info::TypeInfo;
+use sp_runtime::{traits::DispatchInfoOf, transaction_validity::TransactionValidityError, Perbill};
+
+// This chain reuses most of Polkadot primitives.
+pub use bp_polkadot_core::{
+	AccountAddress, AccountId, Balance, Block, BlockNumber, Hash, Hasher, Header, Nonce, Signature,
+	SignedBlock, UncheckedExtrinsic, AVERAGE_HEADER_SIZE_IN_JUSTIFICATION,
+	EXTRA_STORAGE_PROOF_SIZE, MAX_HEADER_SIZE, REASONABLE_HEADERS_IN_JUSTIFICATON_ANCESTRY,
+};
+
+/// Maximal number of GRANDPA authorities at Polkadot Bulletin chain.
+pub const MAX_AUTHORITIES_COUNT: u32 = 100;
+
+/// Name of the With-Polkadot Bulletin chain GRANDPA pallet instance that is deployed at bridged
+/// chains.
+pub const WITH_POLKADOT_BULLETIN_GRANDPA_PALLET_NAME: &str = "BridgePolkadotBulletinGrandpa";
+/// Name of the With-Polkadot Bulletin chain messages pallet instance that is deployed at bridged
+/// chains.
+pub const WITH_POLKADOT_BULLETIN_MESSAGES_PALLET_NAME: &str = "BridgePolkadotBulletinMessages";
+
+// There are fewer system operations on this chain (e.g. staking, governance, etc.). Use a higher
+// percentage of the block for data storage.
+const NORMAL_DISPATCH_RATIO: Perbill = Perbill::from_percent(90);
+
+// Re following constants - we are using the same values at Cumulus parachains. They are limited
+// by the maximal transaction weight/size. Since block limits at Bulletin Chain are larger than
+// at the Cumulus Bridgeg Hubs, we could reuse the same values.
+
+/// Maximal number of unrewarded relayer entries at inbound lane for Cumulus-based parachains.
+pub const MAX_UNREWARDED_RELAYERS_IN_CONFIRMATION_TX: MessageNonce = 1024;
+
+/// Maximal number of unconfirmed messages at inbound lane for Cumulus-based parachains.
+pub const MAX_UNCONFIRMED_MESSAGES_IN_CONFIRMATION_TX: MessageNonce = 4096;
+
+/// This signed extension is used to ensure that the chain transactions are signed by proper
+pub type ValidateSigned = GenericSignedExtensionSchema<(), ()>;
+
+/// Signed extension schema, used by Polkadot Bulletin.
+pub type SignedExtensionSchema = GenericSignedExtension<(
+	(
+		CheckNonZeroSender,
+		CheckSpecVersion,
+		CheckTxVersion,
+		CheckGenesis<Hash>,
+		CheckEra<Hash>,
+		CheckNonce<Nonce>,
+		CheckWeight,
+	),
+	ValidateSigned,
+)>;
+
+/// Signed extension, used by Polkadot Bulletin.
+#[derive(Encode, Decode, Debug, PartialEq, Eq, Clone, TypeInfo)]
+pub struct SignedExtension(SignedExtensionSchema);
+
+impl sp_runtime::traits::SignedExtension for SignedExtension {
+	const IDENTIFIER: &'static str = "Not needed.";
+	type AccountId = ();
+	type Call = ();
+	type AdditionalSigned =
+		<SignedExtensionSchema as sp_runtime::traits::SignedExtension>::AdditionalSigned;
+	type Pre = ();
+
+	fn additional_signed(&self) -> Result<Self::AdditionalSigned, TransactionValidityError> {
+		self.0.additional_signed()
+	}
+
+	fn pre_dispatch(
+		self,
+		_who: &Self::AccountId,
+		_call: &Self::Call,
+		_info: &DispatchInfoOf<Self::Call>,
+		_len: usize,
+	) -> Result<Self::Pre, TransactionValidityError> {
+		Ok(())
+	}
+}
+
+impl SignedExtension {
+	/// Create signed extension from its components.
+	pub fn from_params(
+		spec_version: u32,
+		transaction_version: u32,
+		era: TransactionEra<BlockNumber, Hash>,
+		genesis_hash: Hash,
+		nonce: Nonce,
+	) -> Self {
+		Self(GenericSignedExtension::new(
+			(
+				(
+					(),              // non-zero sender
+					(),              // spec version
+					(),              // tx version
+					(),              // genesis
+					era.frame_era(), // era
+					nonce.into(),    // nonce (compact encoding)
+					(),              // Check weight
+				),
+				(),
+			),
+			Some((
+				(
+					(),
+					spec_version,
+					transaction_version,
+					genesis_hash,
+					era.signed_payload(genesis_hash),
+					(),
+					(),
+				),
+				(),
+			)),
+		))
+	}
+
+	/// Return transaction nonce.
+	pub fn nonce(&self) -> Nonce {
+		let common_payload = self.0.payload.0;
+		common_payload.5 .0
+	}
+}
+
+parameter_types! {
+	/// We allow for 2 seconds of compute with a 6 second average block time.
+	pub BlockWeights: limits::BlockWeights = limits::BlockWeights::with_sensible_defaults(
+			Weight::from_parts(2u64 * WEIGHT_REF_TIME_PER_SECOND, u64::MAX),
+			NORMAL_DISPATCH_RATIO,
+		);
+	// Note: Max transaction size is 8 MB. Set max block size to 10 MB to facilitate data storage.
+	// This is double the "normal" Relay Chain block length limit.
+	/// Maximal block length at Polkadot Bulletin chain.
+	pub BlockLength: limits::BlockLength = limits::BlockLength::max_with_normal_ratio(
+		10 * 1024 * 1024,
+		NORMAL_DISPATCH_RATIO,
+	);
+}
+
+/// Polkadot Bulletin Chain declaration.
+pub struct PolkadotBulletin;
+
+impl Chain for PolkadotBulletin {
+	type BlockNumber = BlockNumber;
+	type Hash = Hash;
+	type Hasher = Hasher;
+	type Header = Header;
+
+	type AccountId = AccountId;
+	// The Bulletin Chain is a permissioned blockchain without any balances. Our `Chain` trait
+	// requires balance type, which is then used by various bridge infrastructure code. However
+	// this code is optional and we are not planning to use it in our bridge.
+	type Balance = Balance;
+	type Nonce = Nonce;
+	type Signature = Signature;
+
+	fn max_extrinsic_size() -> u32 {
+		*BlockLength::get().max.get(DispatchClass::Normal)
+	}
+
+	fn max_extrinsic_weight() -> Weight {
+		BlockWeights::get()
+			.get(DispatchClass::Normal)
+			.max_extrinsic
+			.unwrap_or(Weight::MAX)
+	}
+}
+
+impl ChainWithGrandpa for PolkadotBulletin {
+	const WITH_CHAIN_GRANDPA_PALLET_NAME: &'static str = WITH_POLKADOT_BULLETIN_GRANDPA_PALLET_NAME;
+	const MAX_AUTHORITIES_COUNT: u32 = MAX_AUTHORITIES_COUNT;
+	const REASONABLE_HEADERS_IN_JUSTIFICATON_ANCESTRY: u32 =
+		REASONABLE_HEADERS_IN_JUSTIFICATON_ANCESTRY;
+	const MAX_HEADER_SIZE: u32 = MAX_HEADER_SIZE;
+	const AVERAGE_HEADER_SIZE_IN_JUSTIFICATION: u32 = AVERAGE_HEADER_SIZE_IN_JUSTIFICATION;
+}
+
+decl_bridge_finality_runtime_apis!(polkadot_bulletin, grandpa);
+decl_bridge_messages_runtime_apis!(polkadot_bulletin);
diff --git a/cumulus/bridges/primitives/chain-polkadot/Cargo.toml b/bridges/primitives/chain-polkadot/Cargo.toml
similarity index 64%
rename from cumulus/bridges/primitives/chain-polkadot/Cargo.toml
rename to bridges/primitives/chain-polkadot/Cargo.toml
index 3cec5d267ea02cd475f0e1e563e1cd0a82c37df1..539b10ef9c68f490756d4f7e0453b25c9b7fc5c7 100644
--- a/cumulus/bridges/primitives/chain-polkadot/Cargo.toml
+++ b/bridges/primitives/chain-polkadot/Cargo.toml
@@ -2,8 +2,8 @@
 name = "bp-polkadot"
 description = "Primitives of Polkadot runtime."
 version = "0.1.0"
-authors = ["Parity Technologies <admin@parity.io>"]
-edition = "2021"
+authors.workspace = true
+edition.workspace = true
 license = "GPL-3.0-or-later WITH Classpath-exception-2.0"
 
 [dependencies]
@@ -16,9 +16,9 @@ bp-runtime = { path = "../runtime", default-features = false }
 
 # Substrate Based Dependencies
 
-frame-support = { path = "../../../../substrate/frame/support", default-features = false }
-sp-api = { path = "../../../../substrate/primitives/api", default-features = false }
-sp-std = { path = "../../../../substrate/primitives/std", default-features = false }
+frame-support = { path = "../../../substrate/frame/support", default-features = false }
+sp-api = { path = "../../../substrate/primitives/api", default-features = false }
+sp-std = { path = "../../../substrate/primitives/std", default-features = false }
 
 [features]
 default = [ "std" ]
diff --git a/cumulus/bridges/primitives/chain-polkadot/src/lib.rs b/bridges/primitives/chain-polkadot/src/lib.rs
similarity index 90%
rename from cumulus/bridges/primitives/chain-polkadot/src/lib.rs
rename to bridges/primitives/chain-polkadot/src/lib.rs
index eb62c1729adfdeb4865d826fd342deecfb969bc7..61c8ca927d807ac6c169bb30d324f9720118e010 100644
--- a/cumulus/bridges/primitives/chain-polkadot/src/lib.rs
+++ b/bridges/primitives/chain-polkadot/src/lib.rs
@@ -1,4 +1,4 @@
-// Copyright 2019-2021 Parity Technologies (UK) Ltd.
+// Copyright (C) Parity Technologies (UK) Ltd.
 // This file is part of Parity Bridges Common.
 
 // Parity Bridges Common is free software: you can redistribute it and/or modify
@@ -21,9 +21,8 @@
 pub use bp_polkadot_core::*;
 
 use bp_header_chain::ChainWithGrandpa;
-use bp_runtime::{decl_bridge_finality_runtime_apis, Chain};
+use bp_runtime::{decl_bridge_finality_runtime_apis, extensions::PrevalidateAttests, Chain};
 use frame_support::weights::Weight;
-use sp_std::prelude::Vec;
 
 /// Polkadot Chain
 pub struct Polkadot;
@@ -57,6 +56,9 @@ impl ChainWithGrandpa for Polkadot {
 	const AVERAGE_HEADER_SIZE_IN_JUSTIFICATION: u32 = AVERAGE_HEADER_SIZE_IN_JUSTIFICATION;
 }
 
+/// The SignedExtension used by Polkadot.
+pub type SignedExtension = SuffixedCommonSignedExtension<PrevalidateAttests>;
+
 /// Name of the parachains pallet in the Polkadot runtime.
 pub const PARAS_PALLET_NAME: &str = "Paras";
 
diff --git a/cumulus/bridges/primitives/chain-rococo/Cargo.toml b/bridges/primitives/chain-rococo/Cargo.toml
similarity index 64%
rename from cumulus/bridges/primitives/chain-rococo/Cargo.toml
rename to bridges/primitives/chain-rococo/Cargo.toml
index 9a2eb1069095714c4dbc0e890a2f6e4b35ccf6db..3c4d3917bc219bfd7dd65ec9e8a0c283fe834e49 100644
--- a/cumulus/bridges/primitives/chain-rococo/Cargo.toml
+++ b/bridges/primitives/chain-rococo/Cargo.toml
@@ -2,8 +2,8 @@
 name = "bp-rococo"
 description = "Primitives of Rococo runtime."
 version = "0.1.0"
-authors = ["Parity Technologies <admin@parity.io>"]
-edition = "2021"
+authors.workspace = true
+edition.workspace = true
 license = "GPL-3.0-or-later WITH Classpath-exception-2.0"
 
 [dependencies]
@@ -16,9 +16,9 @@ bp-runtime = { path = "../runtime", default-features = false }
 
 # Substrate Based Dependencies
 
-sp-api = { path = "../../../../substrate/primitives/api", default-features = false }
-sp-std = { path = "../../../../substrate/primitives/std", default-features = false }
-frame-support = { path = "../../../../substrate/frame/support", default-features = false }
+sp-api = { path = "../../../substrate/primitives/api", default-features = false }
+sp-std = { path = "../../../substrate/primitives/std", default-features = false }
+frame-support = { path = "../../../substrate/frame/support", default-features = false }
 
 [features]
 default = [ "std" ]
diff --git a/cumulus/bridges/primitives/chain-rococo/src/lib.rs b/bridges/primitives/chain-rococo/src/lib.rs
similarity index 94%
rename from cumulus/bridges/primitives/chain-rococo/src/lib.rs
rename to bridges/primitives/chain-rococo/src/lib.rs
index 140069d756959ffcfddd6b10788ef660e66ebcd4..5436ad846468cda632aab9ffcf46748f4c1546f8 100644
--- a/cumulus/bridges/primitives/chain-rococo/src/lib.rs
+++ b/bridges/primitives/chain-rococo/src/lib.rs
@@ -1,4 +1,4 @@
-// Copyright 2019-2021 Parity Technologies (UK) Ltd.
+// Copyright (C) Parity Technologies (UK) Ltd.
 // This file is part of Parity Bridges Common.
 
 // Parity Bridges Common is free software: you can redistribute it and/or modify
@@ -23,7 +23,6 @@ pub use bp_polkadot_core::*;
 use bp_header_chain::ChainWithGrandpa;
 use bp_runtime::{decl_bridge_finality_runtime_apis, Chain};
 use frame_support::{parameter_types, weights::Weight};
-use sp_std::prelude::Vec;
 
 /// Rococo Chain
 pub struct Rococo;
@@ -61,6 +60,9 @@ parameter_types! {
 	pub const SS58Prefix: u8 = 42;
 }
 
+// The SignedExtension used by Rococo.
+pub use bp_polkadot_core::CommonSignedExtension as SignedExtension;
+
 /// Name of the parachains pallet in the Rococo runtime.
 pub const PARAS_PALLET_NAME: &str = "Paras";
 
diff --git a/cumulus/bridges/primitives/chain-wococo/Cargo.toml b/bridges/primitives/chain-wococo/Cargo.toml
similarity index 67%
rename from cumulus/bridges/primitives/chain-wococo/Cargo.toml
rename to bridges/primitives/chain-wococo/Cargo.toml
index d3be18aa0647cef9a21e92bfcc0aaaa27ead7c32..05901821b366b71d40d9c28392150172be44a0b7 100644
--- a/cumulus/bridges/primitives/chain-wococo/Cargo.toml
+++ b/bridges/primitives/chain-wococo/Cargo.toml
@@ -2,8 +2,8 @@
 name = "bp-wococo"
 description = "Primitives of Wococo runtime."
 version = "0.1.0"
-authors = ["Parity Technologies <admin@parity.io>"]
-edition = "2021"
+authors.workspace = true
+edition.workspace = true
 license = "GPL-3.0-or-later WITH Classpath-exception-2.0"
 
 [dependencies]
@@ -17,9 +17,9 @@ bp-rococo = { path = "../chain-rococo", default-features = false }
 
 # Substrate Based Dependencies
 
-frame-support = { path = "../../../../substrate/frame/support", default-features = false }
-sp-api = { path = "../../../../substrate/primitives/api", default-features = false }
-sp-std = { path = "../../../../substrate/primitives/std", default-features = false }
+frame-support = { path = "../../../substrate/frame/support", default-features = false }
+sp-api = { path = "../../../substrate/primitives/api", default-features = false }
+sp-std = { path = "../../../substrate/primitives/std", default-features = false }
 
 [features]
 default = [ "std" ]
diff --git a/cumulus/bridges/primitives/chain-wococo/src/lib.rs b/bridges/primitives/chain-wococo/src/lib.rs
similarity index 94%
rename from cumulus/bridges/primitives/chain-wococo/src/lib.rs
rename to bridges/primitives/chain-wococo/src/lib.rs
index 8247b63238ce4924a70f2797e3c82225f0df43c8..b1df65630beffdaad80ce8f22ba357dbf766ea0f 100644
--- a/cumulus/bridges/primitives/chain-wococo/src/lib.rs
+++ b/bridges/primitives/chain-wococo/src/lib.rs
@@ -1,4 +1,4 @@
-// Copyright 2019-2021 Parity Technologies (UK) Ltd.
+// Copyright (C) Parity Technologies (UK) Ltd.
 // This file is part of Parity Bridges Common.
 
 // Parity Bridges Common is free software: you can redistribute it and/or modify
@@ -26,7 +26,6 @@ pub use bp_rococo::{
 use bp_header_chain::ChainWithGrandpa;
 use bp_runtime::{decl_bridge_finality_runtime_apis, Chain};
 use frame_support::weights::Weight;
-use sp_std::prelude::Vec;
 
 /// Wococo Chain
 pub struct Wococo;
@@ -60,6 +59,9 @@ impl ChainWithGrandpa for Wococo {
 	const AVERAGE_HEADER_SIZE_IN_JUSTIFICATION: u32 = AVERAGE_HEADER_SIZE_IN_JUSTIFICATION;
 }
 
+// The SignedExtension used by Wococo.
+pub use bp_rococo::CommonSignedExtension as SignedExtension;
+
 /// Name of the With-Wococo GRANDPA pallet instance that is deployed at bridged chains.
 pub const WITH_WOCOCO_GRANDPA_PALLET_NAME: &str = "BridgeWococoGrandpa";
 
diff --git a/cumulus/bridges/primitives/header-chain/Cargo.toml b/bridges/primitives/header-chain/Cargo.toml
similarity index 62%
rename from cumulus/bridges/primitives/header-chain/Cargo.toml
rename to bridges/primitives/header-chain/Cargo.toml
index 8b59a2be8963d57446ad4b695544817cfac166fd..e3e83235960a8d1565d5be040ce222b632e95876 100644
--- a/cumulus/bridges/primitives/header-chain/Cargo.toml
+++ b/bridges/primitives/header-chain/Cargo.toml
@@ -2,8 +2,8 @@
 name = "bp-header-chain"
 description = "A common interface for describing what a bridge pallet should be able to do."
 version = "0.1.0"
-authors = ["Parity Technologies <admin@parity.io>"]
-edition = "2021"
+authors.workspace = true
+edition.workspace = true
 license = "GPL-3.0-or-later WITH Classpath-exception-2.0"
 
 [dependencies]
@@ -18,11 +18,11 @@ bp-runtime = { path = "../runtime", default-features = false }
 
 # Substrate Dependencies
 
-frame-support = { path = "../../../../substrate/frame/support", default-features = false }
-sp-core = { path = "../../../../substrate/primitives/core", default-features = false, features = ["serde"] }
-sp-consensus-grandpa = { path = "../../../../substrate/primitives/consensus/grandpa", default-features = false, features = ["serde"] }
-sp-runtime = { path = "../../../../substrate/primitives/runtime", default-features = false, features = ["serde"] }
-sp-std = { path = "../../../../substrate/primitives/std", default-features = false }
+frame-support = { path = "../../../substrate/frame/support", default-features = false }
+sp-core = { path = "../../../substrate/primitives/core", default-features = false, features = ["serde"] }
+sp-consensus-grandpa = { path = "../../../substrate/primitives/consensus/grandpa", default-features = false, features = ["serde"] }
+sp-runtime = { path = "../../../substrate/primitives/runtime", default-features = false, features = ["serde"] }
+sp-std = { path = "../../../substrate/primitives/std", default-features = false }
 
 [dev-dependencies]
 bp-test-utils = { path = "../test-utils" }
diff --git a/cumulus/bridges/primitives/header-chain/src/justification/mod.rs b/bridges/primitives/header-chain/src/justification/mod.rs
similarity index 96%
rename from cumulus/bridges/primitives/header-chain/src/justification/mod.rs
rename to bridges/primitives/header-chain/src/justification/mod.rs
index 44548b8d3ffd95a26bf43780c1d0b391a2886dff..72a5f68918d9703babe1e9c263f9148c57df4340 100644
--- a/cumulus/bridges/primitives/header-chain/src/justification/mod.rs
+++ b/bridges/primitives/header-chain/src/justification/mod.rs
@@ -1,4 +1,4 @@
-// Copyright 2019-2023 Parity Technologies (UK) Ltd.
+// Copyright (C) Parity Technologies (UK) Ltd.
 // This file is part of Parity Bridges Common.
 
 // Parity Bridges Common is free software: you can redistribute it and/or modify
@@ -97,7 +97,11 @@ impl<H: HeaderT> GrandpaJustification<H> {
 	}
 }
 
-impl<H: HeaderT> crate::FinalityProof<H::Number> for GrandpaJustification<H> {
+impl<H: HeaderT> crate::FinalityProof<H::Hash, H::Number> for GrandpaJustification<H> {
+	fn target_header_hash(&self) -> H::Hash {
+		self.commit.target_hash
+	}
+
 	fn target_header_number(&self) -> H::Number {
 		self.commit.target_number
 	}
diff --git a/cumulus/bridges/primitives/header-chain/src/justification/verification/equivocation.rs b/bridges/primitives/header-chain/src/justification/verification/equivocation.rs
similarity index 99%
rename from cumulus/bridges/primitives/header-chain/src/justification/verification/equivocation.rs
rename to bridges/primitives/header-chain/src/justification/verification/equivocation.rs
index 2484fc4d6b2bf9df26e8a9cff72f4d0e65a6e2b4..e2d7a8e804c20bcaeef48e3ba96c29911a3c6012 100644
--- a/cumulus/bridges/primitives/header-chain/src/justification/verification/equivocation.rs
+++ b/bridges/primitives/header-chain/src/justification/verification/equivocation.rs
@@ -1,4 +1,4 @@
-// Copyright 2019-2023 Parity Technologies (UK) Ltd.
+// Copyright (C) Parity Technologies (UK) Ltd.
 // This file is part of Parity Bridges Common.
 
 // Parity Bridges Common is free software: you can redistribute it and/or modify
diff --git a/cumulus/bridges/primitives/header-chain/src/justification/verification/mod.rs b/bridges/primitives/header-chain/src/justification/verification/mod.rs
similarity index 99%
rename from cumulus/bridges/primitives/header-chain/src/justification/verification/mod.rs
rename to bridges/primitives/header-chain/src/justification/verification/mod.rs
index 353960734cc9dc9ccff37334e1859e672e02afbb..a66fc1e0d91d1fe45ca747a0060abdb87f9d0e44 100644
--- a/cumulus/bridges/primitives/header-chain/src/justification/verification/mod.rs
+++ b/bridges/primitives/header-chain/src/justification/verification/mod.rs
@@ -1,4 +1,4 @@
-// Copyright 2019-2023 Parity Technologies (UK) Ltd.
+// Copyright (C) Parity Technologies (UK) Ltd.
 // This file is part of Parity Bridges Common.
 
 // Parity Bridges Common is free software: you can redistribute it and/or modify
@@ -143,6 +143,7 @@ pub enum PrecommitError {
 }
 
 /// The context needed for validating GRANDPA finality proofs.
+#[derive(RuntimeDebug)]
 pub struct JustificationVerificationContext {
 	/// The authority set used to verify the justification.
 	pub voter_set: VoterSet<AuthorityId>,
diff --git a/cumulus/bridges/primitives/header-chain/src/justification/verification/optimizer.rs b/bridges/primitives/header-chain/src/justification/verification/optimizer.rs
similarity index 98%
rename from cumulus/bridges/primitives/header-chain/src/justification/verification/optimizer.rs
rename to bridges/primitives/header-chain/src/justification/verification/optimizer.rs
index 99ccdd50616b0facc43359d5c27a32011a3f09b1..6552b359170a89d9b9816a8e933dacaf70d6d248 100644
--- a/cumulus/bridges/primitives/header-chain/src/justification/verification/optimizer.rs
+++ b/bridges/primitives/header-chain/src/justification/verification/optimizer.rs
@@ -1,4 +1,4 @@
-// Copyright 2019-2023 Parity Technologies (UK) Ltd.
+// Copyright (C) Parity Technologies (UK) Ltd.
 // This file is part of Parity Bridges Common.
 
 // Parity Bridges Common is free software: you can redistribute it and/or modify
diff --git a/cumulus/bridges/primitives/header-chain/src/justification/verification/strict.rs b/bridges/primitives/header-chain/src/justification/verification/strict.rs
similarity index 98%
rename from cumulus/bridges/primitives/header-chain/src/justification/verification/strict.rs
rename to bridges/primitives/header-chain/src/justification/verification/strict.rs
index a9d5f4c1f7362691745130365b5365e6e6bb6ed4..f899c6c8efc06c6a1dfa38c38c4050993b09b5af 100644
--- a/cumulus/bridges/primitives/header-chain/src/justification/verification/strict.rs
+++ b/bridges/primitives/header-chain/src/justification/verification/strict.rs
@@ -1,4 +1,4 @@
-// Copyright 2019-2023 Parity Technologies (UK) Ltd.
+// Copyright (C) Parity Technologies (UK) Ltd.
 // This file is part of Parity Bridges Common.
 
 // Parity Bridges Common is free software: you can redistribute it and/or modify
diff --git a/cumulus/bridges/primitives/header-chain/src/lib.rs b/bridges/primitives/header-chain/src/lib.rs
similarity index 98%
rename from cumulus/bridges/primitives/header-chain/src/lib.rs
rename to bridges/primitives/header-chain/src/lib.rs
index ea6c58f4c09791fb9784e9a5e80fce1aef7d497c..d2c7ec0759e884713cb37a871bbcc65cabd256af 100644
--- a/cumulus/bridges/primitives/header-chain/src/lib.rs
+++ b/bridges/primitives/header-chain/src/lib.rs
@@ -1,4 +1,4 @@
-// Copyright 2019-2021 Parity Technologies (UK) Ltd.
+// Copyright (C) Parity Technologies (UK) Ltd.
 // This file is part of Parity Bridges Common.
 
 // Parity Bridges Common is free software: you can redistribute it and/or modify
@@ -127,7 +127,10 @@ pub struct InitializationData<H: HeaderT> {
 }
 
 /// Abstract finality proof that is justifying block finality.
-pub trait FinalityProof<Number>: Clone + Send + Sync + Debug {
+pub trait FinalityProof<Hash, Number>: Clone + Send + Sync + Debug {
+	/// Return hash of header that this proof is generated for.
+	fn target_header_hash(&self) -> Hash;
+
 	/// Return number of header that this proof is generated for.
 	fn target_header_number(&self) -> Number;
 }
@@ -209,7 +212,7 @@ impl<Header: HeaderT> TryFrom<StoredHeaderGrandpaInfo<Header>> for HeaderGrandpa
 /// Helper trait for finding equivocations in finality proofs.
 pub trait FindEquivocations<FinalityProof, FinalityVerificationContext, EquivocationProof> {
 	/// The type returned when encountering an error while looking for equivocations.
-	type Error;
+	type Error: Debug;
 
 	/// Find equivocations.
 	fn find_equivocations(
diff --git a/cumulus/bridges/primitives/header-chain/src/storage_keys.rs b/bridges/primitives/header-chain/src/storage_keys.rs
similarity index 98%
rename from cumulus/bridges/primitives/header-chain/src/storage_keys.rs
rename to bridges/primitives/header-chain/src/storage_keys.rs
index c4dbe53bd9a7f39c41dce8c6b550058cdce08174..55d095afbf2ae5ab00848676e455bf6da3c91166 100644
--- a/cumulus/bridges/primitives/header-chain/src/storage_keys.rs
+++ b/bridges/primitives/header-chain/src/storage_keys.rs
@@ -1,4 +1,4 @@
-// Copyright 2019-2021 Parity Technologies (UK) Ltd.
+// Copyright (C) Parity Technologies (UK) Ltd.
 // This file is part of Parity Bridges Common.
 
 // Parity Bridges Common is free software: you can redistribute it and/or modify
diff --git a/cumulus/bridges/primitives/header-chain/tests/implementation_match.rs b/bridges/primitives/header-chain/tests/implementation_match.rs
similarity index 99%
rename from cumulus/bridges/primitives/header-chain/tests/implementation_match.rs
rename to bridges/primitives/header-chain/tests/implementation_match.rs
index db96961832d4ba489e58178662c67829346dddb5..f664a419621f67e7153adf3d9195546cca80fd0f 100644
--- a/cumulus/bridges/primitives/header-chain/tests/implementation_match.rs
+++ b/bridges/primitives/header-chain/tests/implementation_match.rs
@@ -1,4 +1,4 @@
-// Copyright 2020-2021 Parity Technologies (UK) Ltd.
+// Copyright (C) Parity Technologies (UK) Ltd.
 // This file is part of Parity Bridges Common.
 
 // Parity Bridges Common is free software: you can redistribute it and/or modify
diff --git a/cumulus/bridges/primitives/header-chain/tests/justification/equivocation.rs b/bridges/primitives/header-chain/tests/justification/equivocation.rs
similarity index 98%
rename from cumulus/bridges/primitives/header-chain/tests/justification/equivocation.rs
rename to bridges/primitives/header-chain/tests/justification/equivocation.rs
index f3c133481fb896a83ef42e9ffa642347822ddba9..0bc084cc1a97069dd4dff35f41ad53e6fde69319 100644
--- a/cumulus/bridges/primitives/header-chain/tests/justification/equivocation.rs
+++ b/bridges/primitives/header-chain/tests/justification/equivocation.rs
@@ -1,4 +1,4 @@
-// Copyright 2020-2021 Parity Technologies (UK) Ltd.
+// Copyright (C) Parity Technologies (UK) Ltd.
 // This file is part of Parity Bridges Common.
 
 // Parity Bridges Common is free software: you can redistribute it and/or modify
diff --git a/cumulus/bridges/primitives/header-chain/tests/justification/optimizer.rs b/bridges/primitives/header-chain/tests/justification/optimizer.rs
similarity index 99%
rename from cumulus/bridges/primitives/header-chain/tests/justification/optimizer.rs
rename to bridges/primitives/header-chain/tests/justification/optimizer.rs
index bdc90a3b07cf6d3de85d67d8e6b05137eefb85a4..21bcd7e86b51e2f898024999a86c8ac403286bba 100644
--- a/cumulus/bridges/primitives/header-chain/tests/justification/optimizer.rs
+++ b/bridges/primitives/header-chain/tests/justification/optimizer.rs
@@ -1,4 +1,4 @@
-// Copyright 2020-2021 Parity Technologies (UK) Ltd.
+// Copyright (C) Parity Technologies (UK) Ltd.
 // This file is part of Parity Bridges Common.
 
 // Parity Bridges Common is free software: you can redistribute it and/or modify
diff --git a/cumulus/bridges/primitives/header-chain/tests/justification/strict.rs b/bridges/primitives/header-chain/tests/justification/strict.rs
similarity index 99%
rename from cumulus/bridges/primitives/header-chain/tests/justification/strict.rs
rename to bridges/primitives/header-chain/tests/justification/strict.rs
index 9568f7f7cf9a3b7c71cca415e792af1a15f3ce52..188c9f5baba26b10f50fd8ed875b0cc856c3ec8d 100644
--- a/cumulus/bridges/primitives/header-chain/tests/justification/strict.rs
+++ b/bridges/primitives/header-chain/tests/justification/strict.rs
@@ -1,4 +1,4 @@
-// Copyright 2020-2021 Parity Technologies (UK) Ltd.
+// Copyright (C) Parity Technologies (UK) Ltd.
 // This file is part of Parity Bridges Common.
 
 // Parity Bridges Common is free software: you can redistribute it and/or modify
diff --git a/polkadot/node/test/performance-test/build.rs b/bridges/primitives/header-chain/tests/tests.rs
similarity index 55%
rename from polkadot/node/test/performance-test/build.rs
rename to bridges/primitives/header-chain/tests/tests.rs
index 304b24c3b85f45d0a8a37915499078b095e03965..269fde09bb71ce3df3d955811f9da3e10c100ef3 100644
--- a/polkadot/node/test/performance-test/build.rs
+++ b/bridges/primitives/header-chain/tests/tests.rs
@@ -1,21 +1,23 @@
 // Copyright (C) Parity Technologies (UK) Ltd.
-// This file is part of Polkadot.
+// This file is part of Parity Bridges Common.
 
-// Polkadot is free software: you can redistribute it and/or modify
+// Parity Bridges Common 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,
+// Parity Bridges Common 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/>.
+// along with Parity Bridges Common.  If not, see <http://www.gnu.org/licenses/>.
 
-fn main() {
-	if let Ok(profile) = std::env::var("PROFILE") {
-		println!("cargo:rustc-cfg=build_type=\"{}\"", profile);
-	}
+mod justification {
+	mod equivocation;
+	mod optimizer;
+	mod strict;
 }
+
+mod implementation_match;
diff --git a/cumulus/bridges/primitives/messages/Cargo.toml b/bridges/primitives/messages/Cargo.toml
similarity index 72%
rename from cumulus/bridges/primitives/messages/Cargo.toml
rename to bridges/primitives/messages/Cargo.toml
index 1e9e4db087ee88ce2dd87f80a23ab6af70c5e3e2..b30d6d2559f7916e79f2a3aa2c83ff66298bb24c 100644
--- a/cumulus/bridges/primitives/messages/Cargo.toml
+++ b/bridges/primitives/messages/Cargo.toml
@@ -2,8 +2,8 @@
 name = "bp-messages"
 description = "Primitives of messages module."
 version = "0.1.0"
-authors = ["Parity Technologies <admin@parity.io>"]
-edition = "2021"
+authors.workspace = true
+edition.workspace = true
 license = "GPL-3.0-or-later WITH Classpath-exception-2.0"
 
 [dependencies]
@@ -18,9 +18,9 @@ bp-header-chain = { path = "../header-chain", default-features = false }
 
 # Substrate Dependencies
 
-frame-support = { path = "../../../../substrate/frame/support", default-features = false }
-sp-core = { path = "../../../../substrate/primitives/core", default-features = false }
-sp-std = { path = "../../../../substrate/primitives/std", default-features = false }
+frame-support = { path = "../../../substrate/frame/support", default-features = false }
+sp-core = { path = "../../../substrate/primitives/core", default-features = false }
+sp-std = { path = "../../../substrate/primitives/std", default-features = false }
 
 [dev-dependencies]
 hex = "0.4"
diff --git a/cumulus/bridges/primitives/messages/src/lib.rs b/bridges/primitives/messages/src/lib.rs
similarity index 99%
rename from cumulus/bridges/primitives/messages/src/lib.rs
rename to bridges/primitives/messages/src/lib.rs
index 8cafd58650f35ef7a39f065c62b1415c287bb18a..e48914f7591866a5621c791193e26edd03959b9c 100644
--- a/cumulus/bridges/primitives/messages/src/lib.rs
+++ b/bridges/primitives/messages/src/lib.rs
@@ -1,4 +1,4 @@
-// Copyright 2019-2021 Parity Technologies (UK) Ltd.
+// Copyright (C) Parity Technologies (UK) Ltd.
 // This file is part of Parity Bridges Common.
 
 // Parity Bridges Common is free software: you can redistribute it and/or modify
diff --git a/cumulus/bridges/primitives/messages/src/source_chain.rs b/bridges/primitives/messages/src/source_chain.rs
similarity index 99%
rename from cumulus/bridges/primitives/messages/src/source_chain.rs
rename to bridges/primitives/messages/src/source_chain.rs
index 5e4be53c53a521758519c018a5e1f31b591b28e0..73092c3cce0a575283dd3a856bdfc197e0e4d969 100644
--- a/cumulus/bridges/primitives/messages/src/source_chain.rs
+++ b/bridges/primitives/messages/src/source_chain.rs
@@ -1,4 +1,4 @@
-// Copyright 2019-2021 Parity Technologies (UK) Ltd.
+// Copyright (C) Parity Technologies (UK) Ltd.
 // This file is part of Parity Bridges Common.
 
 // Parity Bridges Common is free software: you can redistribute it and/or modify
diff --git a/cumulus/bridges/primitives/messages/src/storage_keys.rs b/bridges/primitives/messages/src/storage_keys.rs
similarity index 98%
rename from cumulus/bridges/primitives/messages/src/storage_keys.rs
rename to bridges/primitives/messages/src/storage_keys.rs
index 4edf9828cfde02e44f65ecc0d3d869f66e5d9b50..8eedf8fcc7ac98ae300ca0485a0827afd3cd1bb5 100644
--- a/cumulus/bridges/primitives/messages/src/storage_keys.rs
+++ b/bridges/primitives/messages/src/storage_keys.rs
@@ -1,4 +1,4 @@
-// Copyright 2019-2021 Parity Technologies (UK) Ltd.
+// Copyright (C) Parity Technologies (UK) Ltd.
 // This file is part of Parity Bridges Common.
 
 // Parity Bridges Common is free software: you can redistribute it and/or modify
diff --git a/cumulus/bridges/primitives/messages/src/target_chain.rs b/bridges/primitives/messages/src/target_chain.rs
similarity index 99%
rename from cumulus/bridges/primitives/messages/src/target_chain.rs
rename to bridges/primitives/messages/src/target_chain.rs
index 3d73ca500139a2d01eacb36b502282425ed3e3af..388ce16ccdc06d3e2c42c3a094aae4d6180a0d09 100644
--- a/cumulus/bridges/primitives/messages/src/target_chain.rs
+++ b/bridges/primitives/messages/src/target_chain.rs
@@ -1,4 +1,4 @@
-// Copyright 2019-2021 Parity Technologies (UK) Ltd.
+// Copyright (C) Parity Technologies (UK) Ltd.
 // This file is part of Parity Bridges Common.
 
 // Parity Bridges Common is free software: you can redistribute it and/or modify
diff --git a/cumulus/bridges/primitives/parachains/Cargo.toml b/bridges/primitives/parachains/Cargo.toml
similarity index 67%
rename from cumulus/bridges/primitives/parachains/Cargo.toml
rename to bridges/primitives/parachains/Cargo.toml
index 1e4acc6c50193858eca5b1b253406afe708af4c7..ca69523dde37a68ea75dfbc23b5258d04c5510b9 100644
--- a/cumulus/bridges/primitives/parachains/Cargo.toml
+++ b/bridges/primitives/parachains/Cargo.toml
@@ -2,8 +2,8 @@
 name = "bp-parachains"
 description = "Primitives of parachains module."
 version = "0.1.0"
-authors = ["Parity Technologies <admin@parity.io>"]
-edition = "2021"
+authors.workspace = true
+edition.workspace = true
 license = "GPL-3.0-or-later WITH Classpath-exception-2.0"
 
 [dependencies]
@@ -19,10 +19,10 @@ bp-runtime = { path = "../runtime", default-features = false }
 
 # Substrate dependencies
 
-frame-support = { path = "../../../../substrate/frame/support", default-features = false }
-sp-core = { path = "../../../../substrate/primitives/core", default-features = false }
-sp-runtime = { path = "../../../../substrate/primitives/runtime", default-features = false }
-sp-std = { path = "../../../../substrate/primitives/std", default-features = false }
+frame-support = { path = "../../../substrate/frame/support", default-features = false }
+sp-core = { path = "../../../substrate/primitives/core", default-features = false }
+sp-runtime = { path = "../../../substrate/primitives/runtime", default-features = false }
+sp-std = { path = "../../../substrate/primitives/std", default-features = false }
 
 [features]
 default = [ "std" ]
diff --git a/cumulus/bridges/primitives/parachains/src/lib.rs b/bridges/primitives/parachains/src/lib.rs
similarity index 99%
rename from cumulus/bridges/primitives/parachains/src/lib.rs
rename to bridges/primitives/parachains/src/lib.rs
index 21e78e0009f4f311079ddc551b6d71ba768edb82..262b9c6f977529e23d2a0b1515a578cc9455f7ac 100644
--- a/cumulus/bridges/primitives/parachains/src/lib.rs
+++ b/bridges/primitives/parachains/src/lib.rs
@@ -1,4 +1,4 @@
-// Copyright 2019-2021 Parity Technologies (UK) Ltd.
+// Copyright (C) Parity Technologies (UK) Ltd.
 // This file is part of Parity Bridges Common.
 
 // Parity Bridges Common is free software: you can redistribute it and/or modify
diff --git a/cumulus/bridges/primitives/polkadot-core/Cargo.toml b/bridges/primitives/polkadot-core/Cargo.toml
similarity index 65%
rename from cumulus/bridges/primitives/polkadot-core/Cargo.toml
rename to bridges/primitives/polkadot-core/Cargo.toml
index 33829e7a96c6bc1b20773274d32e7d2b0535eb5f..aa7eb8024fbf2c7613264af8daa5fefe0b24f7cc 100644
--- a/cumulus/bridges/primitives/polkadot-core/Cargo.toml
+++ b/bridges/primitives/polkadot-core/Cargo.toml
@@ -2,8 +2,8 @@
 name = "bp-polkadot-core"
 description = "Primitives of Polkadot-like runtime."
 version = "0.1.0"
-authors = ["Parity Technologies <admin@parity.io>"]
-edition = "2021"
+authors.workspace = true
+edition.workspace = true
 license = "GPL-3.0-or-later WITH Classpath-exception-2.0"
 
 [dependencies]
@@ -19,11 +19,11 @@ bp-runtime = { path = "../runtime", default-features = false }
 
 # Substrate Based Dependencies
 
-frame-support = { path = "../../../../substrate/frame/support", default-features = false }
-frame-system = { path = "../../../../substrate/frame/system", default-features = false }
-sp-core = { path = "../../../../substrate/primitives/core", default-features = false }
-sp-runtime = { path = "../../../../substrate/primitives/runtime", default-features = false }
-sp-std = { path = "../../../../substrate/primitives/std", default-features = false }
+frame-support = { path = "../../../substrate/frame/support", default-features = false }
+frame-system = { path = "../../../substrate/frame/system", default-features = false }
+sp-core = { path = "../../../substrate/primitives/core", default-features = false }
+sp-runtime = { path = "../../../substrate/primitives/runtime", default-features = false }
+sp-std = { path = "../../../substrate/primitives/std", default-features = false }
 
 [dev-dependencies]
 hex = "0.4"
diff --git a/cumulus/bridges/primitives/polkadot-core/src/lib.rs b/bridges/primitives/polkadot-core/src/lib.rs
similarity index 80%
rename from cumulus/bridges/primitives/polkadot-core/src/lib.rs
rename to bridges/primitives/polkadot-core/src/lib.rs
index 36ef58eed4dd78542d200f74f5455afa3aea001c..af39b5ab9babae2b2e6858bff83eaf8c29ef74bb 100644
--- a/cumulus/bridges/primitives/polkadot-core/src/lib.rs
+++ b/bridges/primitives/polkadot-core/src/lib.rs
@@ -1,4 +1,4 @@
-// Copyright 2019-2021 Parity Technologies (UK) Ltd.
+// Copyright (C) Parity Technologies (UK) Ltd.
 // This file is part of Parity Bridges Common.
 
 // Parity Bridges Common is free software: you can redistribute it and/or modify
@@ -17,7 +17,15 @@
 #![cfg_attr(not(feature = "std"), no_std)]
 
 use bp_messages::MessageNonce;
-use bp_runtime::{Chain, EncodedOrDecodedCall, StorageMapKeyProvider};
+use bp_runtime::{
+	self,
+	extensions::{
+		ChargeTransactionPayment, CheckEra, CheckGenesis, CheckNonZeroSender, CheckNonce,
+		CheckSpecVersion, CheckTxVersion, CheckWeight, GenericSignedExtension,
+		SignedExtensionSchema,
+	},
+	Chain, EncodedOrDecodedCall, StorageMapKeyProvider, TransactionEra,
+};
 use frame_support::{
 	dispatch::DispatchClass,
 	parameter_types,
@@ -272,6 +280,99 @@ impl AccountInfoStorageMapKeyProvider {
 	}
 }
 
+/// Extra signed extension data that is used by most chains.
+pub type CommonSignedExtra = (
+	CheckNonZeroSender,
+	CheckSpecVersion,
+	CheckTxVersion,
+	CheckGenesis<Hash>,
+	CheckEra<Hash>,
+	CheckNonce<Nonce>,
+	CheckWeight,
+	ChargeTransactionPayment<Balance>,
+);
+
+/// Extra signed extension data that starts with `CommonSignedExtra`.
+pub type SuffixedCommonSignedExtension<Suffix> =
+	GenericSignedExtension<(CommonSignedExtra, Suffix)>;
+
+/// Helper trait to define some extra methods on `SuffixedCommonSignedExtension`.
+pub trait SuffixedCommonSignedExtensionExt<Suffix: SignedExtensionSchema> {
+	/// Create signed extension from its components.
+	fn from_params(
+		spec_version: u32,
+		transaction_version: u32,
+		era: TransactionEra<BlockNumber, Hash>,
+		genesis_hash: Hash,
+		nonce: Nonce,
+		tip: Balance,
+		extra: (Suffix::Payload, Suffix::AdditionalSigned),
+	) -> Self;
+
+	/// Return transaction nonce.
+	fn nonce(&self) -> Nonce;
+
+	/// Return transaction tip.
+	fn tip(&self) -> Balance;
+}
+
+impl<Suffix> SuffixedCommonSignedExtensionExt<Suffix> for SuffixedCommonSignedExtension<Suffix>
+where
+	Suffix: SignedExtensionSchema,
+{
+	fn from_params(
+		spec_version: u32,
+		transaction_version: u32,
+		era: TransactionEra<BlockNumber, Hash>,
+		genesis_hash: Hash,
+		nonce: Nonce,
+		tip: Balance,
+		extra: (Suffix::Payload, Suffix::AdditionalSigned),
+	) -> Self {
+		GenericSignedExtension::new(
+			(
+				(
+					(),              // non-zero sender
+					(),              // spec version
+					(),              // tx version
+					(),              // genesis
+					era.frame_era(), // era
+					nonce.into(),    // nonce (compact encoding)
+					(),              // Check weight
+					tip.into(),      // transaction payment / tip (compact encoding)
+				),
+				extra.0,
+			),
+			Some((
+				(
+					(),
+					spec_version,
+					transaction_version,
+					genesis_hash,
+					era.signed_payload(genesis_hash),
+					(),
+					(),
+					(),
+				),
+				extra.1,
+			)),
+		)
+	}
+
+	fn nonce(&self) -> Nonce {
+		let common_payload = self.payload.0;
+		common_payload.5 .0
+	}
+
+	fn tip(&self) -> Balance {
+		let common_payload = self.payload.0;
+		common_payload.7 .0
+	}
+}
+
+/// Signed extension that is used by most chains.
+pub type CommonSignedExtension = SuffixedCommonSignedExtension<()>;
+
 #[cfg(test)]
 mod tests {
 	use super::*;
diff --git a/cumulus/bridges/primitives/polkadot-core/src/parachains.rs b/bridges/primitives/polkadot-core/src/parachains.rs
similarity index 92%
rename from cumulus/bridges/primitives/polkadot-core/src/parachains.rs
rename to bridges/primitives/polkadot-core/src/parachains.rs
index 7268d9c70afa0f7016a442bb157bf662554227d8..223956171f86499397842f491d809eb2f8d81a63 100644
--- a/cumulus/bridges/primitives/polkadot-core/src/parachains.rs
+++ b/bridges/primitives/polkadot-core/src/parachains.rs
@@ -1,4 +1,4 @@
-// Copyright 2019-2021 Parity Technologies (UK) Ltd.
+// Copyright (C) Parity Technologies (UK) Ltd.
 // This file is part of Parity Bridges Common.
 
 // Parity Bridges Common is free software: you can redistribute it and/or modify
@@ -37,7 +37,8 @@ use parity_util_mem::MallocSizeOf;
 
 /// Parachain id.
 ///
-/// This is an equivalent of the `polkadot_parachain::Id`, which is a compact-encoded `u32`.
+/// This is an equivalent of the `polkadot_parachain_primitives::Id`, which is a compact-encoded
+/// `u32`.
 #[derive(
 	Clone,
 	CompactAs,
@@ -64,7 +65,7 @@ impl From<u32> for ParaId {
 
 /// Parachain head.
 ///
-/// This is an equivalent of the `polkadot_parachain::HeadData`.
+/// This is an equivalent of the `polkadot_parachain_primitives::HeadData`.
 ///
 /// The parachain head means (at least in Cumulus) a SCALE-encoded parachain header.
 #[derive(
diff --git a/cumulus/bridges/primitives/relayers/Cargo.toml b/bridges/primitives/relayers/Cargo.toml
similarity index 69%
rename from cumulus/bridges/primitives/relayers/Cargo.toml
rename to bridges/primitives/relayers/Cargo.toml
index 56edea067dc045ccb3e8f7937343e97a2d2882cf..99cd79c68417205f11d329bcce8637022aaa6e51 100644
--- a/cumulus/bridges/primitives/relayers/Cargo.toml
+++ b/bridges/primitives/relayers/Cargo.toml
@@ -2,8 +2,8 @@
 name = "bp-relayers"
 description = "Primitives of relayers module."
 version = "0.1.0"
-authors = ["Parity Technologies <admin@parity.io>"]
-edition = "2021"
+authors.workspace = true
+edition.workspace = true
 license = "GPL-3.0-or-later WITH Classpath-exception-2.0"
 
 [dependencies]
@@ -17,9 +17,9 @@ bp-runtime = { path = "../runtime", default-features = false }
 
 # Substrate Dependencies
 
-frame-support = { path = "../../../../substrate/frame/support", default-features = false }
-sp-runtime = { path = "../../../../substrate/primitives/runtime", default-features = false }
-sp-std = { path = "../../../../substrate/primitives/std", default-features = false }
+frame-support = { path = "../../../substrate/frame/support", default-features = false }
+sp-runtime = { path = "../../../substrate/primitives/runtime", default-features = false }
+sp-std = { path = "../../../substrate/primitives/std", default-features = false }
 
 [dev-dependencies]
 hex = "0.4"
diff --git a/cumulus/bridges/primitives/relayers/src/lib.rs b/bridges/primitives/relayers/src/lib.rs
similarity index 99%
rename from cumulus/bridges/primitives/relayers/src/lib.rs
rename to bridges/primitives/relayers/src/lib.rs
index 21f66a2ffa10041107b9d02f3521ccd8f6db7309..c529eea536d73e91aa4293aa23813f9273f6f8b5 100644
--- a/cumulus/bridges/primitives/relayers/src/lib.rs
+++ b/bridges/primitives/relayers/src/lib.rs
@@ -1,4 +1,4 @@
-// Copyright 2019-2021 Parity Technologies (UK) Ltd.
+// Copyright (C) Parity Technologies (UK) Ltd.
 // This file is part of Parity Bridges Common.
 
 // Parity Bridges Common is free software: you can redistribute it and/or modify
diff --git a/cumulus/bridges/primitives/relayers/src/registration.rs b/bridges/primitives/relayers/src/registration.rs
similarity index 99%
rename from cumulus/bridges/primitives/relayers/src/registration.rs
rename to bridges/primitives/relayers/src/registration.rs
index 7ab20844bdf934ba37393c316f532cb7bcfbdfa1..bc2d0d127aefec3c6982b17915202cc0f87984f2 100644
--- a/cumulus/bridges/primitives/relayers/src/registration.rs
+++ b/bridges/primitives/relayers/src/registration.rs
@@ -1,4 +1,4 @@
-// Copyright 2021 Parity Technologies (UK) Ltd.
+// Copyright (C) Parity Technologies (UK) Ltd.
 // This file is part of Parity Bridges Common.
 
 // Parity Bridges Common is free software: you can redistribute it and/or modify
diff --git a/cumulus/bridges/primitives/runtime/Cargo.toml b/bridges/primitives/runtime/Cargo.toml
similarity index 54%
rename from cumulus/bridges/primitives/runtime/Cargo.toml
rename to bridges/primitives/runtime/Cargo.toml
index 0d6b9fb400c78b96633af0083c8a4c4fcf4f332c..4454066b59faed0d57b1ab8d06f619949007b5d4 100644
--- a/cumulus/bridges/primitives/runtime/Cargo.toml
+++ b/bridges/primitives/runtime/Cargo.toml
@@ -2,8 +2,8 @@
 name = "bp-runtime"
 description = "Primitives that may be used at (bridges) runtime level."
 version = "0.1.0"
-authors = ["Parity Technologies <admin@parity.io>"]
-edition = "2021"
+authors.workspace = true
+edition.workspace = true
 license = "GPL-3.0-or-later WITH Classpath-exception-2.0"
 
 [dependencies]
@@ -17,15 +17,15 @@ serde = { version = "1.0", default-features = false, features = ["alloc", "deriv
 
 # Substrate Dependencies
 
-frame-support = { path = "../../../../substrate/frame/support", default-features = false }
-frame-system = { path = "../../../../substrate/frame/system", default-features = false }
-sp-core = { path = "../../../../substrate/primitives/core", default-features = false }
-sp-io = { path = "../../../../substrate/primitives/io", default-features = false }
-sp-runtime = { path = "../../../../substrate/primitives/runtime", default-features = false, features = ["serde"] }
-sp-state-machine = { path = "../../../../substrate/primitives/state-machine", default-features = false }
-sp-std = { path = "../../../../substrate/primitives/std", default-features = false }
-sp-trie = { path = "../../../../substrate/primitives/trie", default-features = false }
-trie-db = { version = "0.27.1", default-features = false }
+frame-support = { path = "../../../substrate/frame/support", default-features = false }
+frame-system = { path = "../../../substrate/frame/system", default-features = false }
+sp-core = { path = "../../../substrate/primitives/core", default-features = false }
+sp-io = { path = "../../../substrate/primitives/io", default-features = false }
+sp-runtime = { path = "../../../substrate/primitives/runtime", default-features = false, features = ["serde"] }
+sp-state-machine = { path = "../../../substrate/primitives/state-machine", default-features = false }
+sp-std = { path = "../../../substrate/primitives/std", default-features = false }
+sp-trie = { path = "../../../substrate/primitives/trie", default-features = false }
+trie-db = { version = "0.28.0", default-features = false }
 
 [dev-dependencies]
 hex-literal = "0.4"
diff --git a/cumulus/bridges/primitives/runtime/src/chain.rs b/bridges/primitives/runtime/src/chain.rs
similarity index 96%
rename from cumulus/bridges/primitives/runtime/src/chain.rs
rename to bridges/primitives/runtime/src/chain.rs
index 43fdaf8da1b7ffb4c29e6e3513f81b7b461a099e..e1809e145248f1cb37022ed4c2bb29d1547b2b2a 100644
--- a/cumulus/bridges/primitives/runtime/src/chain.rs
+++ b/bridges/primitives/runtime/src/chain.rs
@@ -1,4 +1,4 @@
-// Copyright 2019-2021 Parity Technologies (UK) Ltd.
+// Copyright (C) Parity Technologies (UK) Ltd.
 // This file is part of Parity Bridges Common.
 
 // Parity Bridges Common is free software: you can redistribute it and/or modify
@@ -311,7 +311,7 @@ macro_rules! decl_bridge_finality_runtime_apis {
 						$(
 							/// Returns the justifications accepted in the current block.
 							fn [<synced_headers_ $consensus:lower _info>](
-							) -> Vec<$justification_type>;
+							) -> sp_std::vec::Vec<$justification_type>;
 						)?
 					}
 				}
@@ -360,10 +360,10 @@ macro_rules! decl_bridge_messages_runtime_apis {
 						/// If some (or all) messages are missing from the storage, they'll also will
 						/// be missing from the resulting vector. The vector is ordered by the nonce.
 						fn message_details(
-							lane: LaneId,
-							begin: MessageNonce,
-							end: MessageNonce,
-						) -> Vec<OutboundMessageDetails>;
+							lane: bp_messages::LaneId,
+							begin: bp_messages::MessageNonce,
+							end: bp_messages::MessageNonce,
+						) -> sp_std::vec::Vec<bp_messages::OutboundMessageDetails>;
 					}
 
 					/// Inbound message lane API for messages sent by this chain.
@@ -376,9 +376,9 @@ macro_rules! decl_bridge_messages_runtime_apis {
 					pub trait [<From $chain:camel InboundLaneApi>] {
 						/// Return details of given inbound messages.
 						fn message_details(
-							lane: LaneId,
-							messages: Vec<(MessagePayload, OutboundMessageDetails)>,
-						) -> Vec<InboundMessageDetails>;
+							lane: bp_messages::LaneId,
+							messages: sp_std::vec::Vec<(bp_messages::MessagePayload, bp_messages::OutboundMessageDetails)>,
+						) -> sp_std::vec::Vec<bp_messages::InboundMessageDetails>;
 					}
 				}
 			}
diff --git a/cumulus/bridges/primitives/runtime/src/extensions.rs b/bridges/primitives/runtime/src/extensions.rs
similarity index 93%
rename from cumulus/bridges/primitives/runtime/src/extensions.rs
rename to bridges/primitives/runtime/src/extensions.rs
index 96ee9d1e6ec9130e173894624fe389198acce7ac..44eeaad93c91603b34713ca477b5623f4e07aad0 100644
--- a/cumulus/bridges/primitives/runtime/src/extensions.rs
+++ b/bridges/primitives/runtime/src/extensions.rs
@@ -1,4 +1,4 @@
-// Copyright 2019-2021 Parity Technologies (UK) Ltd.
+// Copyright (C) Parity Technologies (UK) Ltd.
 // This file is part of Parity Bridges Common.
 
 // Parity Bridges Common is free software: you can redistribute it and/or modify
@@ -35,7 +35,12 @@ pub trait SignedExtensionSchema: Encode + Decode + Debug + Eq + Clone + StaticTy
 	type AdditionalSigned: Encode + Debug + Eq + Clone + StaticTypeInfo;
 }
 
-// An implementation of `SignedExtensionSchema` using generic params.
+impl SignedExtensionSchema for () {
+	type Payload = ();
+	type AdditionalSigned = ();
+}
+
+/// An implementation of `SignedExtensionSchema` using generic params.
 #[derive(Encode, Decode, Clone, Debug, PartialEq, Eq, TypeInfo)]
 pub struct GenericSignedExtensionSchema<P, S>(PhantomData<(P, S)>);
 
@@ -72,6 +77,9 @@ pub type CheckWeight = GenericSignedExtensionSchema<(), ()>;
 /// The `SignedExtensionSchema` for `pallet_transaction_payment::ChargeTransactionPayment`.
 pub type ChargeTransactionPayment<Balance> = GenericSignedExtensionSchema<Compact<Balance>, ()>;
 
+/// The `SignedExtensionSchema` for `polkadot-runtime-common::PrevalidateAttests`.
+pub type PrevalidateAttests = GenericSignedExtensionSchema<(), ()>;
+
 /// The `SignedExtensionSchema` for `BridgeRejectObsoleteHeadersAndMessages`.
 pub type BridgeRejectObsoleteHeadersAndMessages = GenericSignedExtensionSchema<(), ()>;
 
@@ -99,7 +107,7 @@ pub struct GenericSignedExtension<S: SignedExtensionSchema> {
 	// It may be set to `None` if extensions are decoded. We are never reconstructing transactions
 	// (and it makes no sense to do that) => decoded version of `SignedExtensions` is only used to
 	// read fields of the `payload`. And when resigning transaction, we're reconstructing
-	// `SignedExtensions` from the scratch.
+	// `SignedExtensions` from scratch.
 	additional_signed: Option<S::AdditionalSigned>,
 }
 
diff --git a/cumulus/bridges/primitives/runtime/src/lib.rs b/bridges/primitives/runtime/src/lib.rs
similarity index 99%
rename from cumulus/bridges/primitives/runtime/src/lib.rs
rename to bridges/primitives/runtime/src/lib.rs
index f4f52866de95d30b8e898a753d52bceed0d5445f..7f4a1a030b14562e17e9938ddffa1293cfcda204 100644
--- a/cumulus/bridges/primitives/runtime/src/lib.rs
+++ b/bridges/primitives/runtime/src/lib.rs
@@ -1,4 +1,4 @@
-// Copyright 2019-2021 Parity Technologies (UK) Ltd.
+// Copyright (C) Parity Technologies (UK) Ltd.
 // This file is part of Parity Bridges Common.
 
 // Parity Bridges Common is free software: you can redistribute it and/or modify
@@ -74,6 +74,9 @@ pub const MILLAU_CHAIN_ID: ChainId = *b"mlau";
 /// Polkadot chain id.
 pub const POLKADOT_CHAIN_ID: ChainId = *b"pdot";
 
+/// Polkadot Bulletin chain id.
+pub const POLKADOT_BULLETIN_CHAIN_ID: ChainId = *b"pdbc";
+
 /// Kusama chain id.
 pub const KUSAMA_CHAIN_ID: ChainId = *b"ksma";
 
diff --git a/cumulus/bridges/primitives/runtime/src/messages.rs b/bridges/primitives/runtime/src/messages.rs
similarity index 96%
rename from cumulus/bridges/primitives/runtime/src/messages.rs
rename to bridges/primitives/runtime/src/messages.rs
index e3ce37ed5922da46521d96f125e2e95d6b3dcb53..0f219e984f7289b231c888c55e0e2acfb8829a88 100644
--- a/cumulus/bridges/primitives/runtime/src/messages.rs
+++ b/bridges/primitives/runtime/src/messages.rs
@@ -1,4 +1,4 @@
-// Copyright 2019-2021 Parity Technologies (UK) Ltd.
+// Copyright (C) Parity Technologies (UK) Ltd.
 // This file is part of Parity Bridges Common.
 
 // Parity Bridges Common is free software: you can redistribute it and/or modify
diff --git a/cumulus/bridges/primitives/runtime/src/storage_proof.rs b/bridges/primitives/runtime/src/storage_proof.rs
similarity index 99%
rename from cumulus/bridges/primitives/runtime/src/storage_proof.rs
rename to bridges/primitives/runtime/src/storage_proof.rs
index 09641376666af9feecb3f9255dc02e6fdf2adca0..1b706aa66c16fc73a21ce83f550bea8a8fe128e5 100644
--- a/cumulus/bridges/primitives/runtime/src/storage_proof.rs
+++ b/bridges/primitives/runtime/src/storage_proof.rs
@@ -1,4 +1,4 @@
-// Copyright 2019-2021 Parity Technologies (UK) Ltd.
+// Copyright (C) Parity Technologies (UK) Ltd.
 // This file is part of Parity Bridges Common.
 
 // Parity Bridges Common is free software: you can redistribute it and/or modify
diff --git a/cumulus/bridges/primitives/runtime/src/storage_types.rs b/bridges/primitives/runtime/src/storage_types.rs
similarity index 98%
rename from cumulus/bridges/primitives/runtime/src/storage_types.rs
rename to bridges/primitives/runtime/src/storage_types.rs
index e555f60e87f5fb1084914d541d5405a66e8e02e5..91c5451805a9861d9e58c462f9ab5849409d59a7 100644
--- a/cumulus/bridges/primitives/runtime/src/storage_types.rs
+++ b/bridges/primitives/runtime/src/storage_types.rs
@@ -1,4 +1,4 @@
-// Copyright 2022 Parity Technologies (UK) Ltd.
+// Copyright (C) Parity Technologies (UK) Ltd.
 // This file is part of Parity Bridges Common.
 
 // Parity Bridges Common is free software: you can redistribute it and/or modify
diff --git a/cumulus/bridges/primitives/test-utils/Cargo.toml b/bridges/primitives/test-utils/Cargo.toml
similarity index 52%
rename from cumulus/bridges/primitives/test-utils/Cargo.toml
rename to bridges/primitives/test-utils/Cargo.toml
index e841c81f146921a23191e7d34b5ef68975b4c1f3..7081ce90f97b90c3eb437d297fae5cc9f65cfe61 100644
--- a/cumulus/bridges/primitives/test-utils/Cargo.toml
+++ b/bridges/primitives/test-utils/Cargo.toml
@@ -1,8 +1,8 @@
 [package]
 name = "bp-test-utils"
 version = "0.1.0"
-authors = ["Parity Technologies <admin@parity.io>"]
-edition = "2021"
+authors.workspace = true
+edition.workspace = true
 license = "GPL-3.0-or-later WITH Classpath-exception-2.0"
 
 [dependencies]
@@ -11,20 +11,22 @@ bp-parachains = { path = "../parachains", default-features = false }
 bp-polkadot-core = { path = "../polkadot-core", default-features = false  }
 bp-runtime = { path = "../runtime", default-features = false }
 codec = { package = "parity-scale-codec", version = "3.1.5", default-features = false }
-ed25519-dalek = { version = "1.0", default-features = false, features = ["u64_backend"] }
+ed25519-dalek = { version = "2.0", default-features = false }
 finality-grandpa = { version = "0.16.2", default-features = false }
-sp-application-crypto = { path = "../../../../substrate/primitives/application-crypto", default-features = false }
-sp-consensus-grandpa = { path = "../../../../substrate/primitives/consensus/grandpa", default-features = false }
-sp-core = { path = "../../../../substrate/primitives/core", default-features = false }
-sp-runtime = { path = "../../../../substrate/primitives/runtime", default-features = false }
-sp-std = { path = "../../../../substrate/primitives/std", default-features = false }
-sp-trie = { path = "../../../../substrate/primitives/trie", default-features = false }
+sp-application-crypto = { path = "../../../substrate/primitives/application-crypto", default-features = false }
+sp-consensus-grandpa = { path = "../../../substrate/primitives/consensus/grandpa", default-features = false }
+sp-core = { path = "../../../substrate/primitives/core", default-features = false }
+sp-runtime = { path = "../../../substrate/primitives/runtime", default-features = false }
+sp-std = { path = "../../../substrate/primitives/std", default-features = false }
+sp-trie = { path = "../../../substrate/primitives/trie", default-features = false }
 
 [features]
 default = [ "std" ]
 std = [
 	"bp-header-chain/std",
+	"bp-parachains/std",
 	"bp-polkadot-core/std",
+	"bp-runtime/std",
 	"codec/std",
 	"ed25519-dalek/std",
 	"finality-grandpa/std",
@@ -33,4 +35,5 @@ std = [
 	"sp-core/std",
 	"sp-runtime/std",
 	"sp-std/std",
+	"sp-trie/std",
 ]
diff --git a/cumulus/bridges/primitives/test-utils/src/keyring.rs b/bridges/primitives/test-utils/src/keyring.rs
similarity index 80%
rename from cumulus/bridges/primitives/test-utils/src/keyring.rs
rename to bridges/primitives/test-utils/src/keyring.rs
index a4e818a3b88806b18e3394e506bb2fc4a167196c..eabf9c784eb8182f2824cd4c62defe4b92657450 100644
--- a/cumulus/bridges/primitives/test-utils/src/keyring.rs
+++ b/bridges/primitives/test-utils/src/keyring.rs
@@ -1,4 +1,4 @@
-// Copyright 2021 Parity Technologies (UK) Ltd.
+// Copyright (C) Parity Technologies (UK) Ltd.
 // This file is part of Parity Bridges Common.
 
 // Parity Bridges Common is free software: you can redistribute it and/or modify
@@ -18,7 +18,7 @@
 
 use bp_header_chain::{justification::JustificationVerificationContext, AuthoritySet};
 use codec::Encode;
-use ed25519_dalek::{Keypair, PublicKey, SecretKey, Signature};
+use ed25519_dalek::{Signature, SigningKey, VerifyingKey};
 use finality_grandpa::voter_set::VoterSet;
 use sp_consensus_grandpa::{AuthorityId, AuthorityList, AuthorityWeight, SetId};
 use sp_runtime::RuntimeDebug;
@@ -37,29 +37,15 @@ pub const FERDIE: Account = Account(5);
 pub struct Account(pub u16);
 
 impl Account {
-	pub fn public(&self) -> PublicKey {
-		(&self.secret()).into()
+	pub fn public(&self) -> VerifyingKey {
+		self.pair().verifying_key()
 	}
 
-	pub fn secret(&self) -> SecretKey {
+	pub fn pair(&self) -> SigningKey {
 		let data = self.0.encode();
 		let mut bytes = [0_u8; 32];
 		bytes[0..data.len()].copy_from_slice(&data);
-		SecretKey::from_bytes(&bytes)
-			.expect("A static array of the correct length is a known good.")
-	}
-
-	pub fn pair(&self) -> Keypair {
-		let mut pair: [u8; 64] = [0; 64];
-
-		let secret = self.secret();
-		pair[..32].copy_from_slice(&secret.to_bytes());
-
-		let public = self.public();
-		pair[32..].copy_from_slice(&public.to_bytes());
-
-		Keypair::from_bytes(&pair)
-			.expect("We expect the SecretKey to be good, so this must also be good.")
+		SigningKey::from_bytes(&bytes)
 	}
 
 	pub fn sign(&self, msg: &[u8]) -> Signature {
diff --git a/cumulus/bridges/primitives/test-utils/src/lib.rs b/bridges/primitives/test-utils/src/lib.rs
similarity index 99%
rename from cumulus/bridges/primitives/test-utils/src/lib.rs
rename to bridges/primitives/test-utils/src/lib.rs
index 5a7d0cca279a0c78c94e4e80ab671c59eb7d2262..4d3b84759938b98116a7157b5445804df464cc66 100644
--- a/cumulus/bridges/primitives/test-utils/src/lib.rs
+++ b/bridges/primitives/test-utils/src/lib.rs
@@ -1,4 +1,4 @@
-// Copyright 2021 Parity Technologies (UK) Ltd.
+// Copyright (C) Parity Technologies (UK) Ltd.
 // This file is part of Parity Bridges Common.
 
 // Parity Bridges Common is free software: you can redistribute it and/or modify
diff --git a/cumulus/bridges/primitives/xcm-bridge-hub-router/Cargo.toml b/bridges/primitives/xcm-bridge-hub-router/Cargo.toml
similarity index 68%
rename from cumulus/bridges/primitives/xcm-bridge-hub-router/Cargo.toml
rename to bridges/primitives/xcm-bridge-hub-router/Cargo.toml
index dccb36af6de8c27a7400e11967f8813ba2fd0143..725a7d94564e226110453b35cdf4f0161c12c113 100644
--- a/cumulus/bridges/primitives/xcm-bridge-hub-router/Cargo.toml
+++ b/bridges/primitives/xcm-bridge-hub-router/Cargo.toml
@@ -2,8 +2,8 @@
 name = "bp-xcm-bridge-hub-router"
 description = "Primitives of the xcm-bridge-hub fee pallet."
 version = "0.1.0"
-authors = ["Parity Technologies <admin@parity.io>"]
-edition = "2021"
+authors.workspace = true
+edition.workspace = true
 license = "GPL-3.0-or-later WITH Classpath-exception-2.0"
 
 [dependencies]
@@ -11,8 +11,8 @@ codec = { package = "parity-scale-codec", version = "3.1.5", default-features =
 scale-info = { version = "2.9.0", default-features = false, features = ["bit-vec", "derive"] }
 
 # Substrate Dependencies
-sp-runtime = { path = "../../../../substrate/primitives/runtime", default-features = false }
-sp-core = { path = "../../../../substrate/primitives/core", default-features = false }
+sp-runtime = { path = "../../../substrate/primitives/runtime", default-features = false }
+sp-core = { path = "../../../substrate/primitives/core", default-features = false }
 
 [features]
 default = [ "std" ]
diff --git a/cumulus/bridges/primitives/xcm-bridge-hub-router/src/lib.rs b/bridges/primitives/xcm-bridge-hub-router/src/lib.rs
similarity index 97%
rename from cumulus/bridges/primitives/xcm-bridge-hub-router/src/lib.rs
rename to bridges/primitives/xcm-bridge-hub-router/src/lib.rs
index 0dd329f9e4a0e4fdf3571b0121793e4c78c33e3e..dbedb7a52c7fee85e35c7fadc67d11d8cfa434dc 100644
--- a/cumulus/bridges/primitives/xcm-bridge-hub-router/src/lib.rs
+++ b/bridges/primitives/xcm-bridge-hub-router/src/lib.rs
@@ -1,4 +1,4 @@
-// Copyright 2019-2021 Parity Technologies (UK) Ltd.
+// Copyright (C) Parity Technologies (UK) Ltd.
 // This file is part of Parity Bridges Common.
 
 // Parity Bridges Common is free software: you can redistribute it and/or modify
diff --git a/cumulus/bridges/scripts/verify-pallets-build.sh b/bridges/scripts/verify-pallets-build.sh
similarity index 93%
rename from cumulus/bridges/scripts/verify-pallets-build.sh
rename to bridges/scripts/verify-pallets-build.sh
index 1ea3dbe8626030eaeb644ce80a0d58fd2760f038..b8ac09e26b8bcd78e4a0c3022c098f2ebc93afd3 100755
--- a/cumulus/bridges/scripts/verify-pallets-build.sh
+++ b/bridges/scripts/verify-pallets-build.sh
@@ -89,17 +89,26 @@ rm -rf $BRIDGES_FOLDER/scripts/update-weights-setup.sh
 rm -rf $BRIDGES_FOLDER/scripts/update_substrate.sh
 rm -rf $BRIDGES_FOLDER/tools
 rm -f $BRIDGES_FOLDER/.dockerignore
+rm -f $BRIDGES_FOLDER/local.Dockerfile.dockerignore
 rm -f $BRIDGES_FOLDER/deny.toml
 rm -f $BRIDGES_FOLDER/.gitlab-ci.yml
 rm -f $BRIDGES_FOLDER/.editorconfig
 rm -f $BRIDGES_FOLDER/Cargo.toml
 rm -f $BRIDGES_FOLDER/ci.Dockerfile
+rm -f $BRIDGES_FOLDER/local.Dockerfile
 rm -f $BRIDGES_FOLDER/CODEOWNERS
 rm -f $BRIDGES_FOLDER/Dockerfile
+rm -f $BRIDGES_FOLDER/rustfmt.toml
 
 # let's fix Cargo.toml a bit (it'll be helpful if we are in the bridges repo)
 if [[ ! -f "Cargo.toml" ]]; then
 	cat > Cargo.toml <<-CARGO_TOML
+	[workspace.package]
+	authors = ["Parity Technologies <admin@parity.io>"]
+	edition = "2021"
+	repository = "https://github.com/paritytech/parity-bridges-common.git"
+	license = "GPL-3.0-only"
+
 	[workspace]
 	resolver = "2"
 
diff --git a/cumulus/.cargo/config.toml b/cumulus/.cargo/config.toml
deleted file mode 100644
index 4796a2c26965c1021d14c6acc854bca1aea76941..0000000000000000000000000000000000000000
--- a/cumulus/.cargo/config.toml
+++ /dev/null
@@ -1,33 +0,0 @@
-#
-# An auto defined `clippy` feature was introduced,
-# but it was found to clash with user defined features,
-# so was renamed to `cargo-clippy`.
-#
-# If you want standard clippy run:
-# RUSTFLAGS= cargo clippy
-[target.'cfg(feature = "cargo-clippy")']
-rustflags = [
-  "-Aclippy::all",
-  "-Dclippy::correctness",
-  "-Aclippy::if-same-then-else",
-  "-Aclippy::clone-double-ref",
-  "-Dclippy::complexity",
-  "-Aclippy::zero-prefixed-literal",     # 00_1000_000
-  "-Aclippy::type_complexity",           # raison d'etre
-  "-Aclippy::nonminimal-bool",           # maybe
-  "-Aclippy::borrowed-box",              # Reasonable to fix this one
-  "-Aclippy::too-many-arguments",        # (Turning this on would lead to)
-  "-Aclippy::unnecessary_cast",          # Types may change
-  "-Aclippy::identity-op",               # One case where we do 0 +
-  "-Aclippy::useless_conversion",        # Types may change
-  "-Aclippy::unit_arg",                  # styalistic.
-  "-Aclippy::option-map-unit-fn",        # styalistic
-  "-Aclippy::bind_instead_of_map",       # styalistic
-  "-Aclippy::erasing_op",                # E.g. 0 * DOLLARS
-  "-Aclippy::eq_op",                     # In tests we test equality.
-  "-Aclippy::while_immutable_condition", # false positives
-  "-Aclippy::needless_option_as_deref",  # false positives
-  "-Aclippy::derivable_impls",           # false positives
-  "-Aclippy::stable_sort_primitive",     # prefer stable sort
-  "-Aclippy::extra-unused-type-parameters", # stylistic
-]
diff --git a/cumulus/.gitattributes b/cumulus/.gitattributes
deleted file mode 100644
index 2ea1ab2d6b9cff5f075666eb5a780575870c221e..0000000000000000000000000000000000000000
--- a/cumulus/.gitattributes
+++ /dev/null
@@ -1,2 +0,0 @@
-/.gitlab-ci.yml filter=ci-prettier
-/scripts/ci/gitlab/pipeline/*.yml filter=ci-prettier
diff --git a/cumulus/.github/ISSUE_TEMPLATE/release-client.md b/cumulus/.github/ISSUE_TEMPLATE/release-client.md
deleted file mode 100644
index bb7f206157674634e395631eb2434659c5ad026e..0000000000000000000000000000000000000000
--- a/cumulus/.github/ISSUE_TEMPLATE/release-client.md
+++ /dev/null
@@ -1,20 +0,0 @@
----
-name: Release Checklist for Client
-about: Release Checklist for Client
-title: Release Checklist for Client {{ env.VERSION }}
----
-
-# Release Checklist - Client
-
-### Client Release
-
-- [ ] build a new `polkadot-parachain` binary and publish it to S3
-- [ ] new `polkadot-parachain` version has [run on the network](../../docs/release.md#burnin)
-    without issue for at least 12h
-- [ ] a draft release has been created in the [Github Releases page](https://github.com/paritytech/cumulus/releases) with the relevant release-notes
-- [ ] the [build artifacts](../../docs/release.md#build-artifacts) have been added to the
-    draft-release.
-
----
-
-Read more about the [release documentation](../../docs/release.md).
diff --git a/cumulus/.github/ISSUE_TEMPLATE/release-runtime.md b/cumulus/.github/ISSUE_TEMPLATE/release-runtime.md
deleted file mode 100644
index 0f3543759afd924ca6c74011ed6e64dc1e5005f4..0000000000000000000000000000000000000000
--- a/cumulus/.github/ISSUE_TEMPLATE/release-runtime.md
+++ /dev/null
@@ -1,54 +0,0 @@
----
-name: Release Checklist for Runtime
-about: Release Checklist for Runtime
-title: Release Checklist for Runtime {{ env.VERSION }}
----
-
-# Release Checklist - Runtimes
-
-**All** following checks must be completed before publishing a new release.
-The release process is owned and led by @paritytech/release-engineering team.
-The checks marked with :crab: are meant to be checked by [a runtime engineer](https://github.com/paritytech/cumulus/issues/1761).
-
-## Runtimes Release
-
-### Codebase
-These checks should be performed on the codebase.
-
-- [ ] the [`spec_version`](https://github.com/paritytech/cumulus/blob/master/docs/release.md#spec-version) has been incremented since the
-    last release for any native runtimes from any existing use on public (non-private/test) networks
-- [ ] :crab: previously [completed migrations](https://github.com/paritytech/cumulus/blob/master/docs/release.md#old-migrations-removed) are removed for any public (non-private/test) networks
-- [ ] pallet and [extrinsic ordering](https://github.com/paritytech/cumulus/blob/master/docs/release.md#extrinsic-ordering--storage) as well as `SignedExtension`s have stayed
-    the same. Bump `transaction_version` otherwise
-- [ ] the [benchmarks](https://github.com/paritytech/ci_cd/wiki/Benchmarks:-cumulus) ran
-- [ ] the weights have been updated for any modified runtime logic
-- [ ] :crab: the new weights are sane, there are no significant (>50%) drops or rises with no reason
-- [ ] :crab: XCM config is compatible with the configurations and versions of relevant interlocutors, like the Relay Chain.
-
-### On the release branch
-
-The following checks can be performed after we have forked off to the release-candidate branch or started an additional release candidate branch (rc-2, rc-3, etc)
-
-- [ ] Verify [new migrations](https://github.com/paritytech/cumulus/blob/master/docs/release.md#new-migrations) complete successfully, and the
-    runtime state is correctly updated for any public (non-private/test)
-    networks
-- [ ] Run [integration tests](https://github.com/paritytech/cumulus/blob/master/docs/release.md#integration-tests), and make sure they pass.
-- [ ] Push runtime upgrade to Asset Hub Westend and verify network stability
-- [ ] Push runtime upgrade to Collectives and verify network stability
-- [ ] Push runtime upgrade to Bridge-Hub-Kusama and verify network stability
-
-
-### Github
-
-- [ ] Check that a draft release has been created at the [Github Releases page](https://github.com/paritytech/cumulus/releases) with relevant [release
-    notes](https://github.com/paritytech/cumulus/blob/master/docs/release.md#release-notes)
-- [ ] Check that [build artifacts](https://github.com/paritytech/cumulus/blob/master/docs/release.md#build-artifacts) have been added to the
-    draft-release.
-
-# Post release
-
-- [ ] :crab: all commits (runtime version bumps, fixes) on this release branch have been merged back to master.
-
----
-
-Read more about the [release documentation](https://github.com/paritytech/cumulus/blob/master/docs/release.md).
diff --git a/cumulus/.github/dependabot.yml b/cumulus/.github/dependabot.yml
deleted file mode 100644
index 349a34690d4eb6ad43a21f215e165d2ba44b09fc..0000000000000000000000000000000000000000
--- a/cumulus/.github/dependabot.yml
+++ /dev/null
@@ -1,31 +0,0 @@
-version: 2
-updates:
-  - package-ecosystem: "cargo"
-    directory: "/"
-    labels: ["A2-insubstantial", "B0-silent", "C1-low"]
-    # Handle updates for crates from github.com/paritytech/substrate manually.
-    ignore:
-      - dependency-name: "substrate-*"
-      - dependency-name: "sc-*"
-      - dependency-name: "sp-*"
-      - dependency-name: "frame-*"
-      - dependency-name: "fork-tree"
-      - dependency-name: "frame-remote-externalities"
-      - dependency-name: "pallet-*"
-      - dependency-name: "beefy-*"
-      - dependency-name: "try-runtime-*"
-      - dependency-name: "test-runner"
-      - dependency-name: "generate-bags"
-      - dependency-name: "sub-tokens"
-      - dependency-name: "polkadot-*"
-      - dependency-name: "xcm*"
-      - dependency-name: "kusama-*"
-      - dependency-name: "westend-*"
-      - dependency-name: "rococo-*"
-    schedule:
-      interval: "daily"
-  - package-ecosystem: github-actions
-    directory: '/'
-    labels: ["A2-insubstantial", "B0-silent", "C1-low", "E2-dependencies"]
-    schedule:
-      interval: daily
diff --git a/cumulus/.github/pr-custom-review.yml b/cumulus/.github/pr-custom-review.yml
deleted file mode 100644
index fc26ee677f065089eda5a490e52d9ce0705a3558..0000000000000000000000000000000000000000
--- a/cumulus/.github/pr-custom-review.yml
+++ /dev/null
@@ -1,48 +0,0 @@
-# 🔒 PROTECTED: Changes to locks-review-team should be approved by the current locks-review-team
-locks-review-team: cumulus-locks-review
-team-leads-team: polkadot-review
-action-review-team: ci
-
-rules:
-  - name: Runtime files
-    check_type: changed_files
-    condition: ^parachains/runtimes/assets/(asset-hub-kusama|asset-hub-polkadot)/src/[^/]+\.rs$|^parachains/runtimes/bridge-hubs/(bridge-hub-kusama|bridge-hub-polkadot)/src/[^/]+\.rs$|^parachains/runtimes/collectives/collectives-polkadot/src/[^/]+\.rs$|^parachains/common/src/[^/]+\.rs$
-    all_distinct:
-      - min_approvals: 1
-        teams:
-          - cumulus-locks-review
-      - min_approvals: 1
-        teams:
-          - polkadot-review
-
-  - name: Core developers
-    check_type: changed_files
-    condition:
-      include: .*
-      # excluding files from 'Runtime files' and 'CI files' rules and `Bridges subtree files`
-      exclude: ^parachains/runtimes/assets/(asset-hub-kusama|asset-hub-polkadot)/src/[^/]+\.rs$|^parachains/runtimes/bridge-hubs/(bridge-hub-kusama|bridge-hub-polkadot)/src/[^/]+\.rs$|^parachains/runtimes/collectives/collectives-polkadot/src/[^/]+\.rs$|^parachains/common/src/[^/]+\.rs$|^\.gitlab-ci\.yml|^scripts/ci/.*|^\.github/.*
-    min_approvals: 2
-    teams:
-      - core-devs
-
-  # if there are any changes in the bridges subtree (in case of backport changes back to bridges repo)
-  - name: Bridges subtree files
-    check_type: changed_files
-    condition: ^bridges/.*
-    min_approvals: 1
-    teams:
-      - bridges-core
-
-  - name: CI files
-    check_type: changed_files
-    condition:
-      include: ^\.gitlab-ci\.yml|^scripts/ci/.*|^\.github/.*
-      exclude: ^scripts/ci/gitlab/pipeline/zombienet.yml$
-    min_approvals: 2
-    teams:
-      - ci
-      - release-engineering
-
-prevent-review-request:
-  teams:
-    - core-devs
diff --git a/cumulus/.github/workflows/check-D-labels.yml b/cumulus/.github/workflows/check-D-labels.yml
deleted file mode 100644
index 91062720931078730a43390f0b36edf964628472..0000000000000000000000000000000000000000
--- a/cumulus/.github/workflows/check-D-labels.yml
+++ /dev/null
@@ -1,47 +0,0 @@
-name: Check D labels
-
-on:
-  pull_request:
-    types: [labeled, opened, synchronize, unlabeled]
-    paths:
-      - primitives/**
-
-jobs:
-  check-labels:
-    runs-on: ubuntu-latest
-    steps:
-      - name: Pull image
-        env:
-          IMAGE: paritytech/ruled_labels:0.4.0
-        run: docker pull $IMAGE
-
-      - name: Check labels
-        env:
-          IMAGE: paritytech/ruled_labels:0.4.0
-          MOUNT: /work
-          GITHUB_PR: ${{ github.event.pull_request.number }}
-          GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
-          API_BASE: https://api.github.com/repos
-          REPO: ${{ github.repository }}
-          RULES_PATH: labels/ruled_labels
-          CHECK_SPECS: specs_cumulus.yaml
-        run: |
-          echo "REPO: ${REPO}"
-          echo "GITHUB_PR: ${GITHUB_PR}"
-          # Clone repo with labels specs
-          git clone https://github.com/paritytech/labels
-          # Fetch the labels for the PR under test
-          labels=$( curl -H "Authorization: token ${GITHUB_TOKEN}" -s "$API_BASE/${REPO}/pulls/${GITHUB_PR}" | jq '.labels | .[] | .name' | tr "\n" ",")
-
-          if [ -z "${labels}" ]; then
-            docker run --rm -i -v $PWD/${RULES_PATH}/:$MOUNT $IMAGE check $MOUNT/$CHECK_SPECS --tags audit --no-label
-          fi
-
-          labels_args=${labels: :-1}
-          printf "Checking labels: %s\n" "${labels_args}"
-
-          # Prevent the shell from splitting labels with spaces
-          IFS=","
-
-          # --dev is more useful to debug mode to debug
-          docker run --rm -i -v $PWD/${RULES_PATH}/:$MOUNT $IMAGE check $MOUNT/$CHECK_SPECS --labels ${labels_args} --dev --tags audit
diff --git a/cumulus/.github/workflows/check-labels.yml b/cumulus/.github/workflows/check-labels.yml
deleted file mode 100644
index 004271d7788ad48336544d851bd7802e4dd201e6..0000000000000000000000000000000000000000
--- a/cumulus/.github/workflows/check-labels.yml
+++ /dev/null
@@ -1,45 +0,0 @@
-name: Check labels
-
-on:
-  pull_request:
-    types: [labeled, opened, synchronize, unlabeled]
-
-jobs:
-  check-labels:
-    runs-on: ubuntu-latest
-    steps:
-      - name: Pull image
-        env:
-          IMAGE: paritytech/ruled_labels:0.4.0
-        run: docker pull $IMAGE
-
-      - name: Check labels
-        env:
-          IMAGE: paritytech/ruled_labels:0.4.0
-          MOUNT: /work
-          GITHUB_PR: ${{ github.event.pull_request.number }}
-          GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
-          API_BASE: https://api.github.com/repos
-          REPO: ${{ github.repository }}
-          RULES_PATH: labels/ruled_labels
-          CHECK_SPECS: specs_cumulus.yaml
-        run: |
-          echo "REPO: ${REPO}"
-          echo "GITHUB_PR: ${GITHUB_PR}"
-          # Clone repo with labels specs
-          git clone https://github.com/paritytech/labels
-          # Fetch the labels for the PR under test
-          labels=$( curl -H "Authorization: token ${GITHUB_TOKEN}" -s "$API_BASE/${REPO}/pulls/${GITHUB_PR}" | jq '.labels | .[] | .name' | tr "\n" ",")
-
-          if [ -z "${labels}" ]; then
-            docker run --rm -i -v $PWD/${RULES_PATH}/:$MOUNT $IMAGE check $MOUNT/$CHECK_SPECS --tags audit --no-label
-          fi
-
-          labels_args=${labels: :-1}
-          printf "Checking labels: %s\n" "${labels_args}"
-
-          # Prevent the shell from splitting labels with spaces
-          IFS=","
-
-          # --dev is more useful to debug mode to debug
-          docker run --rm -i -v $PWD/${RULES_PATH}/:$MOUNT $IMAGE check $MOUNT/$CHECK_SPECS --labels ${labels_args} --dev --tags PR
diff --git a/cumulus/.github/workflows/docs.yml b/cumulus/.github/workflows/docs.yml
deleted file mode 100644
index 6aab3f27be6b4256e2e3cfd6db58d54a7f952d50..0000000000000000000000000000000000000000
--- a/cumulus/.github/workflows/docs.yml
+++ /dev/null
@@ -1,39 +0,0 @@
-name: Publish Rust Docs
-
-on:
-  push:
-    branches:
-      - master
-
-jobs:
-  deploy-docs:
-    name: Deploy docs
-    runs-on: ubuntu-latest
-
-    steps:
-      - name: Install tooling
-        run: |
-          sudo apt-get install -y protobuf-compiler
-          protoc --version
-
-      - name: Checkout repository
-        uses: actions/checkout@c85c95e3d7251135ab7dc9ce3241c5835cc595a9 # v3.5.3
-
-      - name: Rust versions
-        run:  rustup show
-
-      - name: Rust cache
-        uses: Swatinem/rust-cache@e207df5d269b42b69c8bc5101da26f7d31feddb4 # v2.6.2
-
-      - name: Build rustdocs
-        run:  SKIP_WASM_BUILD=1 cargo doc --all --no-deps
-
-      - name: Make index.html
-        run:  echo "<meta http-equiv=refresh content=0;url=cumulus_client_collator/index.html>" > ./target/doc/index.html
-
-      - name: Deploy documentation
-        uses: peaceiris/actions-gh-pages@373f7f263a76c20808c831209c920827a82a2847 # v3.9.3
-        with:
-          github_token: ${{ secrets.GITHUB_TOKEN }}
-          publish_branch: gh-pages
-          publish_dir: ./target/doc
diff --git a/cumulus/.github/workflows/fmt-check.yml b/cumulus/.github/workflows/fmt-check.yml
deleted file mode 100644
index 7571c51116be8bd5f6a4225fb90a24c4109ef1fc..0000000000000000000000000000000000000000
--- a/cumulus/.github/workflows/fmt-check.yml
+++ /dev/null
@@ -1,22 +0,0 @@
-name: Rustfmt check
-
-on:
-  push:
-    branches:
-      - master
-  pull_request:
-    types: [opened, synchronize, reopened, ready_for_review]
-
-jobs:
-  quick_check:
-    strategy:
-      matrix:
-        os: ["ubuntu-latest"]
-    runs-on: ${{ matrix.os }}
-    container:
-      image: paritytech/ci-linux:production
-    steps:
-      - uses: actions/checkout@c85c95e3d7251135ab7dc9ce3241c5835cc595a9 # v3.5.3
-
-      - name: Cargo fmt
-        run: cargo +nightly fmt --all -- --check
diff --git a/cumulus/.github/workflows/pr-custom-review.yml b/cumulus/.github/workflows/pr-custom-review.yml
deleted file mode 100644
index 8e40c9ee72989d9ef244247456aa578d3836f8c6..0000000000000000000000000000000000000000
--- a/cumulus/.github/workflows/pr-custom-review.yml
+++ /dev/null
@@ -1,42 +0,0 @@
-name: Assign reviewers
-
-on:
-  pull_request:
-    branches:
-      - master
-      - main
-    types:
-      - opened
-      - reopened
-      - synchronize
-      - review_requested
-      - review_request_removed
-      - ready_for_review
-      - converted_to_draft
-  pull_request_review:
-
-jobs:
-  pr-custom-review:
-    runs-on: ubuntu-latest
-    steps:
-      - name: Skip if pull request is in Draft
-        # `if: github.event.pull_request.draft == true` should be kept here, at
-        # the step level, rather than at the job level. The latter is not
-        # recommended because when the PR is moved from "Draft" to "Ready to
-        # review" the workflow will immediately be passing (since it was skipped),
-        # even though it hasn't actually ran, since it takes a few seconds for
-        # the workflow to start. This is also disclosed in:
-        # https://github.community/t/dont-run-actions-on-draft-pull-requests/16817/17
-        # That scenario would open an opportunity for the check to be bypassed:
-        # 1. Get your PR approved
-        # 2. Move it to Draft
-        # 3. Push whatever commits you want
-        # 4. Move it to "Ready for review"; now the workflow is passing (it was
-        #    skipped) and "Check reviews" is also passing (it won't be updated
-        #    until the workflow is finished)
-        if: github.event.pull_request.draft == true
-        run: exit 1
-      - name: pr-custom-review
-        uses: paritytech/pr-custom-review@action-v3
-        with:
-          checks-reviews-api: http://pcr.parity-prod.parity.io/api/v1/check_reviews
diff --git a/cumulus/.github/workflows/release-01_branch-check.yml b/cumulus/.github/workflows/release-01_branch-check.yml
deleted file mode 100644
index afcd4580f176fd31dcf007d99ece9db00e39f45e..0000000000000000000000000000000000000000
--- a/cumulus/.github/workflows/release-01_branch-check.yml
+++ /dev/null
@@ -1,22 +0,0 @@
-name: Release branch check
-on:
-  push:
-    branches:
-      - release-**v[0-9]+.[0-9]+.[0-9]+ # client
-      - release-**v[0-9]+               # runtimes
-      - polkadot-v[0-9]+.[0-9]+.[0-9]+  # cumulus code
-
-  workflow_dispatch:
-
-jobs:
-  check_branch:
-    runs-on: ubuntu-latest
-    steps:
-      - name: Checkout sources
-        uses: actions/checkout@c85c95e3d7251135ab7dc9ce3241c5835cc595a9 # v3.5.3
-        with:
-          fetch-depth: 0
-
-      - name: Run check
-        shell: bash
-        run: ./scripts/ci/github/check-rel-br
diff --git a/cumulus/.github/workflows/release-10_rc-automation.yml b/cumulus/.github/workflows/release-10_rc-automation.yml
deleted file mode 100644
index d1795faef096e36ffc6e0050802704d3c5ffbe48..0000000000000000000000000000000000000000
--- a/cumulus/.github/workflows/release-10_rc-automation.yml
+++ /dev/null
@@ -1,87 +0,0 @@
-name: Release - RC automation
-on:
-  push:
-    branches:
-      - release-v[0-9]+.[0-9]+.[0-9]+
-      - release-parachains-v[0-9]+
-  workflow_dispatch:
-
-jobs:
-  tag_rc:
-    runs-on: ubuntu-latest
-    strategy:
-      matrix:
-        channel:
-          - name: 'RelEng: Cumulus Release Coordination'
-            room: '!NAEMyPAHWOiOQHsvus:parity.io'
-            pre-releases: true
-    steps:
-      - name: Checkout sources
-        uses: actions/checkout@c85c95e3d7251135ab7dc9ce3241c5835cc595a9 # v3.5.3
-        with:
-          fetch-depth: 0
-      - id: compute_tag
-        name: Compute next rc tag
-        shell: bash
-        run: |
-          # Get last rc tag if exists, else set it to {version}-rc1
-          version=${GITHUB_REF#refs/heads/release-}
-          echo "$version"
-          echo "version=$version" >> $GITHUB_OUTPUT
-          git tag -l
-          last_rc=$(git tag -l "$version-rc*" | sort -V | tail -n 1)
-          if [ -n "$last_rc" ]; then
-            suffix=$(echo "$last_rc" | grep -Eo '[0-9]+$')
-            echo $suffix
-            ((suffix++))
-            echo $suffix
-            echo "new_tag=$version-rc$suffix" >> $GITHUB_OUTPUT
-            echo "first_rc=false" >> $GITHUB_OUTPUT
-          else
-            echo "new_tag=$version-rc1" >> $GITHUB_OUTPUT
-            echo "first_rc=true" >> $GITHUB_OUTPUT
-          fi
-
-      - name: Apply new tag
-        uses: tvdias/github-tagger@ed7350546e3e503b5e942dffd65bc8751a95e49d # v0.0.2
-        with:
-          # We can't use the normal GITHUB_TOKEN for the following reason:
-          # https://docs.github.com/en/actions/reference/events-that-trigger-workflows#triggering-new-workflows-using-a-personal-access-token
-          # RELEASE_BRANCH_TOKEN requires public_repo OAuth scope
-          repo-token: "${{ secrets.RELEASE_BRANCH_TOKEN }}"
-          tag: ${{ steps.compute_tag.outputs.new_tag }}
-
-      - id: create-issue-checklist-client
-        uses: JasonEtco/create-an-issue@e27dddc79c92bc6e4562f268fffa5ed752639abd # v2.9.1
-        # Only create the issue if it's the first release candidate
-        if: steps.compute_tag.outputs.first_rc == 'true'
-        env:
-          GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
-          VERSION: ${{ steps.compute_tag.outputs.version }}
-        with:
-          assignees: EgorPopelyaev, coderobe, chevdor
-          filename: .github/ISSUE_TEMPLATE/release-client.md
-
-      - id: create-issue-checklist-runtime
-        uses: JasonEtco/create-an-issue@e27dddc79c92bc6e4562f268fffa5ed752639abd # v2.9.1
-        # Only create the issue if it's the first release candidate
-        if: steps.compute_tag.outputs.first_rc == 'true'
-        env:
-          GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
-          VERSION: ${{ steps.compute_tag.outputs.version }}
-        with:
-          assignees: EgorPopelyaev, coderobe, chevdor
-          filename: .github/ISSUE_TEMPLATE/release-runtime.md
-
-      - name: Matrix notification to ${{ matrix.channel.name }}
-        uses: s3krit/matrix-message-action@70ad3fb812ee0e45ff8999d6af11cafad11a6ecf # v0.0.3
-        if: steps.create-issue-checklist-client.outputs.url != '' && steps.create-issue-checklist-runtime.outputs.url != ''
-        with:
-          room_id: ${{ matrix.channel.room }}
-          access_token: ${{ secrets.RELEASENOTES_MATRIX_V2_ACCESS_TOKEN }}
-          server: "m.parity.io"
-          message: |
-            The Release Process for Cumulus ${{ steps.compute_tag.outputs.version }} has been started.<br/>
-            Tracking issues:
-              - client: ${{ steps.create-issue-checklist-client.outputs.url }}"
-              - runtime: ${{ steps.create-issue-checklist-runtime.outputs.url }}"
diff --git a/cumulus/.github/workflows/release-20_extrinsic-ordering-check-from-bin.yml b/cumulus/.github/workflows/release-20_extrinsic-ordering-check-from-bin.yml
deleted file mode 100644
index d902e57ac9e7f2d95b9f7a8eb96fb7febe2da887..0000000000000000000000000000000000000000
--- a/cumulus/.github/workflows/release-20_extrinsic-ordering-check-from-bin.yml
+++ /dev/null
@@ -1,86 +0,0 @@
-# This workflow performs the Extrinsic Ordering Check on demand using a binary
-
-name: Release - Extrinsic Ordering Check from Binary
-on:
-  workflow_dispatch:
-    inputs:
-      reference_url:
-        description: The WebSocket url of the reference node
-        default: wss://kusama-asset-hub-rpc.polkadot.io
-        required: true
-      binary_url:
-        description: A url to a Linux binary for the node containing the runtime to test
-        default: https://releases.parity.io/cumulus/polkadot-v0.9.21/polkadot-parachain
-        required: true
-      chain:
-        description: The name of the chain under test. Usually, you would pass a local chain
-        default: asset-hub-kusama-local
-        required: true
-
-jobs:
-  check:
-    name: Run check
-    runs-on: ubuntu-latest
-    env:
-      CHAIN: ${{github.event.inputs.chain}}
-      BIN: node-bin
-      BIN_PATH: ./tmp/$BIN
-      BIN_URL: ${{github.event.inputs.binary_url}}
-      REF_URL: ${{github.event.inputs.reference_url}}
-
-    steps:
-      - uses: actions/checkout@c85c95e3d7251135ab7dc9ce3241c5835cc595a9 # v3.5.3
-
-      - name: Fetch binary
-        run: |
-          echo Creating a temp dir to download and run binary
-          mkdir -p tmp
-          echo Fetching $BIN_URL
-          wget $BIN_URL -O $BIN_PATH
-          chmod a+x $BIN_PATH
-          $BIN_PATH --version
-
-      - name: Start local node
-        run: |
-          echo Running on $CHAIN
-          $BIN_PATH --chain=$CHAIN -- --chain polkadot-local &
-
-      - name: Prepare output
-        run: |
-          VERSION=$($BIN_PATH --version)
-          echo "Metadata comparison:" >> output.txt
-          echo "Date: $(date)" >> output.txt
-          echo "Reference: $REF_URL" >> output.txt
-          echo "Target version: $VERSION" >> output.txt
-          echo "Chain: $CHAIN" >> output.txt
-          echo "----------------------------------------------------------------------" >> output.txt
-
-      - name: Pull polkadot-js-tools image
-        run: docker pull jacogr/polkadot-js-tools
-
-      - name: Compare the metadata
-        run: |
-          CMD="docker run --pull always --network host jacogr/polkadot-js-tools metadata $REF_URL ws://localhost:9944"
-          echo -e "Running:\n$CMD"
-          $CMD >> output.txt
-          sed -z -i 's/\n\n/\n/g' output.txt
-          cat output.txt | egrep -n -i ''
-          SUMMARY=$(./scripts/ci/github/extrinsic-ordering-filter.sh output.txt)
-          echo -e $SUMMARY
-          echo -e $SUMMARY >> output.txt
-
-      - name: Show result
-        run: |
-          cat output.txt
-
-      - name: Stop our local node
-        run: |
-          pkill $BIN
-        continue-on-error: true
-
-      - name: Save output as artifact
-        uses: actions/upload-artifact@0b7f8abb1508181956e8e162db84b466c27e18ce # v3.1.2
-        with:
-          name: ${{ env.CHAIN }}
-          path: |
-            output.txt
diff --git a/cumulus/.github/workflows/release-21_extrinsic-ordering-check-from-two.yml b/cumulus/.github/workflows/release-21_extrinsic-ordering-check-from-two.yml
deleted file mode 100644
index 93c0050ff6f2500237e6461160d769caadfe2225..0000000000000000000000000000000000000000
--- a/cumulus/.github/workflows/release-21_extrinsic-ordering-check-from-two.yml
+++ /dev/null
@@ -1,120 +0,0 @@
-# This workflow performs the Extrinsic Ordering Check on demand using two reference binaries
-
-name: Release - Extrinsic API Check with reference bins
-on:
-  workflow_dispatch:
-    inputs:
-      reference_binary_url:
-        description: A url to a Linux binary for the node containing the reference runtime to test against
-        default: https://releases.parity.io/cumulus/v0.9.230/polkadot-parachain
-        required: true
-      binary_url:
-        description: A url to a Linux binary for the node containing the runtime to test
-        default: https://releases.parity.io/cumulus/v0.9.270-rc7/polkadot-parachain
-        required: true
-
-jobs:
-  check:
-    name: Run check
-    runs-on: ubuntu-latest
-    timeout-minutes: 10
-    env:
-      REF_URL: ${{github.event.inputs.reference_binary_url}}
-      BIN_REF: polkadot-parachain-ref
-      BIN_URL: ${{github.event.inputs.binary_url}}
-      BIN_BASE: polkadot-parachain
-      TMP: ./tmp
-    strategy:
-      fail-fast: false
-      matrix:
-        include:
-          - runtime: asset-hub-kusama
-            local: asset-hub-kusama-local
-            relay: kusama-local
-          - runtime: asset-hub-polkadot
-            local: asset-hub-polkadot-local
-            relay: polkadot-local
-          - runtime: asset-hub-westend
-            local: asset-hub-westend-local
-            relay: polkadot-local
-          - runtime: contracts-rococo
-            local: contracts-rococo-local
-            relay: polkadot-local
-
-    steps:
-      - uses: actions/checkout@c85c95e3d7251135ab7dc9ce3241c5835cc595a9 # v3.5.3
-
-      - name: Create tmp dir
-        run: |
-          mkdir -p $TMP
-          pwd
-
-      - name: Fetch reference binary for ${{ matrix.runtime }}
-        run: |
-          echo Fetching $REF_URL
-          curl $REF_URL -o $TMP/$BIN_REF
-          chmod a+x  $TMP/$BIN_REF
-          $TMP/$BIN_REF --version
-
-      - name: Fetch test binary for ${{ matrix.runtime }}
-        run: |
-          echo Fetching $BIN_URL
-          curl $BIN_URL -o $TMP/$BIN_BASE
-          chmod a+x  $TMP/$BIN_BASE
-          $TMP/$BIN_BASE --version
-
-      - name: Start local reference node for ${{ matrix.runtime }}
-        run: |
-          echo Running reference on ${{ matrix.local }}
-          $TMP/$BIN_REF --chain=${{ matrix.local }} --ws-port=9954 --tmp -- --chain ${{ matrix.relay }} &
-          sleep 15
-
-      - name: Start local test node for ${{ matrix.runtime }}
-        run: |
-          echo Running test on ${{ matrix.local }}
-          $TMP/$BIN_BASE --chain=${{ matrix.local }} --ws-port=9944 --tmp -- --chain ${{ matrix.relay }} &
-          sleep 15
-
-      - name: Prepare output
-        run: |
-          REF_VERSION=$($TMP/$BIN_REF --version)
-          BIN_VERSION=$($TMP/$BIN_BASE --version)
-          echo "Metadata comparison:" >> output.txt
-          echo "Date: $(date)" >> output.txt
-          echo "Ref. binary: $REF_URL" >> output.txt
-          echo "Test binary: $BIN_URL" >> output.txt
-          echo "Ref. version: $REF_VERSION" >> output.txt
-          echo "Test version: $BIN_VERSION" >> output.txt
-          echo "Chain: ${{ matrix.local }}" >> output.txt
-          echo "Relay: ${{ matrix.relay }}" >> output.txt
-          echo "----------------------------------------------------------------------" >> output.txt
-
-      - name: Pull polkadot-js-tools image
-        run: docker pull jacogr/polkadot-js-tools
-
-      - name: Compare the metadata
-        run: |
-          CMD="docker run --pull always --network host jacogr/polkadot-js-tools metadata ws://localhost:9954 ws://localhost:9944"
-          echo -e "Running:\n$CMD"
-          $CMD >> output.txt
-          sed -z -i 's/\n\n/\n/g' output.txt
-          cat output.txt | egrep -n -i ''
-          SUMMARY=$(./scripts/ci/github/extrinsic-ordering-filter.sh output.txt)
-          echo -e $SUMMARY
-          echo -e $SUMMARY >> output.txt
-
-      - name: Show result
-        run: |
-          cat output.txt
-
-      - name: Save output as artifact
-        uses: actions/upload-artifact@0b7f8abb1508181956e8e162db84b466c27e18ce # v3.1.2
-        with:
-          name: ${{ matrix.runtime }}
-          path: |
-            output.txt
-
-      - name: Stop our local nodes
-        run: |
-          pkill $BIN_REF || true
-          pkill $BIN_BASE || true
diff --git a/cumulus/.github/workflows/release-30_create-draft.yml b/cumulus/.github/workflows/release-30_create-draft.yml
deleted file mode 100644
index 2d11dfe18cec86883ad53cda1389a30d6b40f1d2..0000000000000000000000000000000000000000
--- a/cumulus/.github/workflows/release-30_create-draft.yml
+++ /dev/null
@@ -1,311 +0,0 @@
-name: Release - Create draft
-
-on:
-  workflow_dispatch:
-    inputs:
-      ref1:
-        description: The 'from' tag to use for the diff
-        default: parachains-v9.0.0
-        required: true
-      ref2:
-        description: The 'to' tag to use for the diff
-        default: release-parachains-v10.0.0
-        required: true
-      release_type:
-        description: Pass "client" for client releases, leave empty otherwise
-        required: false
-      pre_release:
-        description: For pre-releases
-        default: "true"
-        required: true
-      notification:
-        description: Whether or not to notify over Matrix
-        default: "true"
-        required: true
-
-jobs:
-  get-rust-versions:
-    runs-on: ubuntu-latest
-    container:
-      image: paritytech/ci-linux:production
-    outputs:
-      rustc-stable: ${{ steps.get-rust-versions.outputs.stable }}
-      rustc-nightly: ${{ steps.get-rust-versions.outputs.nightly }}
-    steps:
-      - id: get-rust-versions
-        run: |
-          echo "stable=$(rustc +stable --version)" >> $GITHUB_OUTPUT
-          echo "nightly=$(rustc +nightly --version)" >> $GITHUB_OUTPUT
-
-  # We do not skip the entire job for client builds (although we don't need it)
-  # because it is a dep of the next job. However we skip the time consuming steps.
-  build-runtimes:
-    runs-on: ubuntu-latest
-    strategy:
-       matrix:
-        include:
-          - category: assets
-            runtime: asset-hub-kusama
-          - category: assets
-            runtime: asset-hub-polkadot
-          - category: assets
-            runtime: asset-hub-westend
-          - category: bridge-hubs
-            runtime: bridge-hub-polkadot
-          - category: bridge-hubs
-            runtime: bridge-hub-kusama
-          - category: bridge-hubs
-            runtime: bridge-hub-rococo
-          - category: collectives
-            runtime: collectives-polkadot
-          - category: contracts
-            runtime: contracts-rococo
-          - category: starters
-            runtime: seedling
-          - category: starters
-            runtime: shell
-          - category: testing
-            runtime: rococo-parachain
-    steps:
-      - name: Checkout sources
-        uses: actions/checkout@c85c95e3d7251135ab7dc9ce3241c5835cc595a9 # v3.5.3
-        with:
-          ref: ${{ github.event.inputs.ref2 }}
-
-      - name: Cache target dir
-        if: ${{ github.event.inputs.release_type != 'client' }}
-        uses: actions/cache@88522ab9f39a2ea568f7027eddc7d8d8bc9d59c8 # v3.3.1
-        with:
-          path: "${{ github.workspace }}/runtime/${{ matrix.runtime }}/target"
-          key: srtool-target-${{ matrix.runtime }}-${{ github.sha }}
-          restore-keys: |
-            srtool-target-${{ matrix.runtime }}-
-            srtool-target-
-
-      - name: Build ${{ matrix.runtime }} runtime
-        if: ${{ github.event.inputs.release_type != 'client' }}
-        id: srtool_build
-        uses: chevdor/srtool-actions@v0.7.0
-        with:
-          image: paritytech/srtool
-          chain: ${{ matrix.runtime }}
-          runtime_dir: parachains/runtimes/${{ matrix.category }}/${{ matrix.runtime }}
-
-      - name: Store srtool digest to disk
-        if: ${{ github.event.inputs.release_type != 'client' }}
-        run: |
-          echo '${{ steps.srtool_build.outputs.json }}' | \
-            jq > ${{ matrix.runtime }}-srtool-digest.json
-
-      - name: Upload ${{ matrix.runtime }} srtool json
-        if: ${{ github.event.inputs.release_type != 'client' }}
-        uses: actions/upload-artifact@0b7f8abb1508181956e8e162db84b466c27e18ce # v3.1.2
-        with:
-          name: ${{ matrix.runtime }}-srtool-json
-          path: ${{ matrix.runtime }}-srtool-digest.json
-
-      - name: Upload ${{ matrix.runtime }} runtime
-        if: ${{ github.event.inputs.release_type != 'client' }}
-        uses: actions/upload-artifact@0b7f8abb1508181956e8e162db84b466c27e18ce # v3.1.2
-        with:
-          name: ${{ matrix.runtime }}-runtime
-          path: |
-            ${{ steps.srtool_build.outputs.wasm_compressed }}
-
-  publish-draft-release:
-    runs-on: ubuntu-latest
-    needs: ["get-rust-versions", "build-runtimes"]
-    outputs:
-      release_url: ${{ steps.create-release.outputs.html_url }}
-      asset_upload_url: ${{ steps.create-release.outputs.upload_url }}
-    steps:
-      - name: Checkout sources
-        uses: actions/checkout@c85c95e3d7251135ab7dc9ce3241c5835cc595a9 # v3.5.3
-        with:
-          fetch-depth: 0
-          path: cumulus
-          ref: ${{ github.event.inputs.ref2 }}
-
-      - uses: ruby/setup-ruby@250fcd6a742febb1123a77a841497ccaa8b9e939 # v1.152.0
-        with:
-          ruby-version: 3.0.0
-
-      - name: Download srtool json output
-        uses: actions/download-artifact@9bc31d5ccc31df68ecc42ccf4149144866c47d8a # v3.0.2
-
-      - name: Prepare tooling
-        run: |
-          cd cumulus/scripts/ci/changelog
-          gem install bundler changelogerator:0.9.1
-          bundle install
-          changelogerator --help
-
-          URL=https://github.com/chevdor/tera-cli/releases/download/v0.2.1/tera-cli_linux_amd64.deb
-          wget $URL -O tera.deb
-          sudo dpkg -i tera.deb
-          tera --version
-
-      - name: Generate release notes
-        env:
-          RUSTC_STABLE: ${{ needs.get-rust-versions.outputs.rustc-stable }}
-          RUSTC_NIGHTLY: ${{ needs.get-rust-versions.outputs.rustc-nightly }}
-          GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
-          NO_CACHE: 1
-          DEBUG: 1
-          SHELL_DIGEST: ${{ github.workspace}}/shell-srtool-json/shell-srtool-digest.json
-          ASSET_HUB_WESTEND_DIGEST: ${{ github.workspace}}/asset-hub-westend-srtool-json/asset-hub-westend-srtool-digest.json
-          ASSET_HUB_KUSAMA_DIGEST: ${{ github.workspace}}/asset-hub-kusama-srtool-json/asset-hub-kusama-srtool-digest.json
-          ASSET_HUB_POLKADOT_DIGEST: ${{ github.workspace}}/asset-hub-polkadot-srtool-json/asset-hub-polkadot-srtool-digest.json
-          BRIDGE_HUB_ROCOCO_DIGEST: ${{ github.workspace}}/bridge-hub-rococo-srtool-json/bridge-hub-rococo-srtool-digest.json
-          BRIDGE_HUB_KUSAMA_DIGEST: ${{ github.workspace}}/bridge-hub-kusama-srtool-json/bridge-hub-kusama-srtool-digest.json
-          BRIDGE_HUB_POLKADOT_DIGEST: ${{ github.workspace}}/bridge-hub-polkadot-srtool-json/bridge-hub-polkadot-srtool-digest.json
-          COLLECTIVES_POLKADOT_DIGEST: ${{ github.workspace}}/collectives-polkadot-srtool-json/collectives-polkadot-srtool-digest.json
-          ROCOCO_PARA_DIGEST: ${{ github.workspace}}/rococo-parachain-srtool-json/rococo-parachain-srtool-digest.json
-          CANVAS_KUSAMA_DIGEST: ${{ github.workspace}}/contracts-rococo-srtool-json/contracts-rococo-srtool-digest.json
-          REF1: ${{ github.event.inputs.ref1 }}
-          REF2: ${{ github.event.inputs.ref2 }}
-          PRE_RELEASE: ${{ github.event.inputs.pre_release }}
-          RELEASE_TYPE: ${{ github.event.inputs.release_type }}
-        run: |
-          find ${{env.GITHUB_WORKSPACE}} -type f -name "*-srtool-digest.json"
-
-          if [ "$RELEASE_TYPE" != "client" ]; then
-            ls -al $SHELL_DIGEST || true
-            ls -al $ASSET_HUB_WESTEND_DIGEST || true
-            ls -al $ASSET_HUB_KUSAMA_DIGEST || true
-            ls -al $ASSET_HUB_POLKADOT_DIGEST || true
-            ls -al $BRIDGE_HUB_ROCOCO_DIGEST || true
-            ls -al $BRIDGE_HUB_KUSAMA_DIGEST || true
-            ls -al $BRIDGE_HUB_POLKADOT_DIGEST || true
-            ls -al $COLLECTIVES_POLKADOT_DIGEST || true
-            ls -al $ROCOCO_PARA_DIGEST || true
-            ls -al $CANVAS_KUSAMA_DIGEST || true
-          fi
-
-          echo "The diff will be computed from $REF1 to $REF2"
-          cd cumulus/scripts/ci/changelog
-          ./bin/changelog $REF1 $REF2 release-notes.md
-          ls -al {release-notes.md,context.json} || true
-
-      - name: Archive srtool json
-        if: ${{ github.event.inputs.release_type != 'client' }}
-        uses: actions/upload-artifact@0b7f8abb1508181956e8e162db84b466c27e18ce # v3.1.2
-        with:
-          name: srtool-json
-          path: |
-            **/*-srtool-digest.json
-
-      - name: Archive context artifact
-        uses: actions/upload-artifact@0b7f8abb1508181956e8e162db84b466c27e18ce # v3.1.2
-        with:
-          name: release-notes-context
-          path: |
-            cumulus/scripts/ci/changelog/context.json
-
-      - name: Create draft release
-        id: create-release
-        uses: actions/create-release@0cb9c9b65d5d1901c1f53e5e66eaf4afd303e70e # v1.1.4
-        env:
-          GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
-        with:
-          body_path: ./cumulus/scripts/ci/changelog/release-notes.md
-          tag_name: ${{ github.event.inputs.ref2 }}
-          release_name: ${{ github.event.inputs.ref2 }}
-          draft: true
-
-  publish-runtimes:
-    if: ${{ github.event.inputs.release_type != 'client' }}
-    runs-on: ubuntu-latest
-    needs: ["publish-draft-release"]
-    env:
-      RUNTIME_DIR: parachains/runtimes
-    strategy:
-       matrix:
-        include:
-          - category: assets
-            runtime: asset-hub-kusama
-          - category: assets
-            runtime: asset-hub-polkadot
-          - category: assets
-            runtime: asset-hub-westend
-          - category: bridge-hubs
-            runtime: bridge-hub-polkadot
-          - category: bridge-hubs
-            runtime: bridge-hub-kusama
-          - category: bridge-hubs
-            runtime: bridge-hub-rococo
-          - category: collectives
-            runtime: collectives-polkadot
-          - category: contracts
-            runtime: contracts-rococo
-          - category: starters
-            runtime: seedling
-          - category: starters
-            runtime: shell
-          - category: testing
-            runtime: rococo-parachain
-    steps:
-      - name: Checkout sources
-        uses: actions/checkout@c85c95e3d7251135ab7dc9ce3241c5835cc595a9 # v3.5.3
-        with:
-          ref: ${{ github.event.inputs.ref2 }}
-
-      - name: Download artifacts
-        uses: actions/download-artifact@9bc31d5ccc31df68ecc42ccf4149144866c47d8a # v3.0.2
-
-      - uses: ruby/setup-ruby@250fcd6a742febb1123a77a841497ccaa8b9e939 # v1.152.0
-        with:
-          ruby-version: 3.0.0
-
-      - name: Get runtime version for ${{ matrix.runtime }}
-        id: get-runtime-ver
-        run: |
-          echo "require './scripts/ci/github/runtime-version.rb'" > script.rb
-          echo "puts get_runtime(runtime: \"${{ matrix.runtime }}\", runtime_dir: \"$RUNTIME_DIR/${{ matrix.category }}\")" >> script.rb
-
-          echo "Current folder: $PWD"
-          ls "$RUNTIME_DIR/${{ matrix.category }}/${{ matrix.runtime }}"
-          runtime_ver=$(ruby script.rb)
-          echo "Found version: >$runtime_ver<"
-          echo "runtime_ver=$runtime_ver" >> $GITHUB_OUTPUT
-
-      - name: Fix runtime name
-        id: fix-runtime-path
-        run: |
-          cd "${{ matrix.runtime }}-runtime/"
-          mv "$(sed -E 's/- */_/g' <<< ${{ matrix.runtime }})_runtime.compact.compressed.wasm" "${{ matrix.runtime }}_runtime.compact.compressed.wasm" || true
-
-      - name: Upload compressed ${{ matrix.runtime }} wasm
-        uses: actions/upload-release-asset@e8f9f06c4b078e705bd2ea027f0926603fc9b4d5 # v1.0.2
-        env:
-          GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
-        with:
-          upload_url: ${{ needs.publish-draft-release.outputs.asset_upload_url }}
-          asset_path: "${{ matrix.runtime }}-runtime/${{ matrix.runtime }}_runtime.compact.compressed.wasm"
-          asset_name: ${{ matrix.runtime }}_runtime-v${{ steps.get-runtime-ver.outputs.runtime_ver }}.compact.compressed.wasm
-          asset_content_type: application/wasm
-
-  post_to_matrix:
-    if: ${{ github.event.inputs.notification == 'true' }}
-    runs-on: ubuntu-latest
-    needs: publish-draft-release
-    strategy:
-      matrix:
-        channel:
-          - name: 'RelEng: Cumulus Release Coordination'
-            room: '!NAEMyPAHWOiOQHsvus:parity.io'
-            pre-releases: true
-    steps:
-      - name: Matrix notification to ${{ matrix.channel.name }}
-        uses: s3krit/matrix-message-action@70ad3fb812ee0e45ff8999d6af11cafad11a6ecf # v0.0.3
-        with:
-          room_id: ${{ matrix.channel.room }}
-          access_token: ${{ secrets.RELEASENOTES_MATRIX_V2_ACCESS_TOKEN }}
-          server: "m.parity.io"
-          message: |
-            **New draft for ${{ github.repository }}**: ${{ github.event.inputs.ref2 }}<br/>
-
-            Draft release created: [draft](${{ needs.publish-draft-release.outputs.release_url }})
-
-            NOTE: The link above will no longer be valid if the draft is edited. You can then use the following link:
-            [${{ github.server_url }}/${{ github.repository }}/releases](${{ github.server_url }}/${{ github.repository }}/releases)
diff --git a/cumulus/.github/workflows/release-50_publish-docker.yml b/cumulus/.github/workflows/release-50_publish-docker.yml
deleted file mode 100644
index 6ad943c3903ca597b38dedf64061e62a6c39cf6e..0000000000000000000000000000000000000000
--- a/cumulus/.github/workflows/release-50_publish-docker.yml
+++ /dev/null
@@ -1,206 +0,0 @@
-name: Release - Publish Docker Image
-
-# This workflow listens to pubished releases or can be triggered manually.
-# It includes releases and rc candidates.
-# It fetches the binaries, checks sha256 and GPG
-# signatures, then builds an injected docker
-# image and publishes it.
-
-on:
-  release:
-    types:
-      - published
-  workflow_dispatch:
-    inputs:
-      release_id:
-        description: |
-          Release ID.
-          You can find it using the command:
-          curl -s \
-            -H "Authorization: Bearer ${GITHUB_TOKEN}" https://api.github.com/repos/$OWNER/$REPO/releases | \
-            jq '.[] | { name: .name, id: .id }'
-        required: true
-        type: string
-      image_type:
-        description: Type of the image to be published
-        required: true
-        default: rc
-        type: choice
-        options:
-          - rc
-          - release
-      registry:
-        description: Container registry
-        required: true
-        type: string
-        default: docker.io
-      owner:
-        description: Owner of the container image repo
-        required: true
-        type: string
-        default: parity
-
-env:
-  RELEASE_ID: ${{ inputs.release_id }}
-  ENGINE: docker
-  REGISTRY: ${{ inputs.registry }}
-  GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
-  DOCKER_OWNER: ${{ inputs.owner || github.repository_owner }}
-  REPO: ${{ github.repository }}
-  BINARY: polkadot-parachain
-  EVENT_ACTION: ${{ github.event.action }}
-  EVENT_NAME: ${{ github.event_name }}
-  IMAGE_TYPE: ${{ inputs.image_type }}
-
-jobs:
-  fetch-artifacts:
-    runs-on: ubuntu-latest
-
-    steps:
-      - name: Checkout sources
-        uses: actions/checkout@c85c95e3d7251135ab7dc9ce3241c5835cc595a9 # v3.5.3
-
-      - name: Prepare temp folder
-        run: |
-          TMP=$(mktemp -d)
-          echo "TMP=$TMP" >> "$GITHUB_ENV"
-          pwd
-          ls -al "$TMP"
-
-      - name: Fetch lib.sh from polkadot repo
-        working-directory: ${{ env.TMP }}
-        run: |
-          curl -O -L \
-            -H "Accept: application/vnd.github.v3.raw" \
-            https://raw.githubusercontent.com/paritytech/polkadot/master/scripts/ci/common/lib.sh
-
-          chmod a+x lib.sh
-          ls -al
-
-      - name: Fetch release artifacts based on final release tag
-        #this step runs only if the workflow is triggered automatically when new release is published
-        if: ${{ env.EVENT_NAME == 'release' && env.EVENT_ACTION != '' && env.EVENT_ACTION == 'published' }}
-        run: |
-          mkdir -p release-artifacts && cd release-artifacts
-
-          for f in $BINARY $BINARY.asc $BINARY.sha256; do
-            URL="https://github.com/${{ github.event.repository.full_name }}/releases/download/${{ github.event.release.tag_name }}/$f"
-            echo " - Fetching $f from $URL"
-            wget "$URL" -O "$f"
-          done
-          chmod a+x $BINARY
-          cp -f ${TMP}/lib.sh .
-          ls -al
-
-      - name: Fetch rc artifacts or release artifacts based on release id
-        #this step runs only if the workflow is triggered manually
-        if: ${{ env.EVENT_NAME  == 'workflow_dispatch' }}
-        run: |
-          . ${TMP}/lib.sh
-
-          fetch_release_artifacts
-
-          chmod a+x release-artifacts/$BINARY
-          ls -al
-
-          cp -f ${TMP}/lib.sh release-artifacts/
-
-      - name: Cache the artifacts
-        uses: actions/cache@88522ab9f39a2ea568f7027eddc7d8d8bc9d59c8 # v3.3.1
-        with:
-          key: artifacts-${{ github.sha }}
-          path: |
-            ./release-artifacts/**/*
-
-  build-container:
-    runs-on: ubuntu-latest
-    needs: fetch-artifacts
-
-    steps:
-      - name: Checkout sources
-        uses: actions/checkout@c85c95e3d7251135ab7dc9ce3241c5835cc595a9 # v3.5.3
-
-      - name: Get artifacts from cache
-        uses: actions/cache@88522ab9f39a2ea568f7027eddc7d8d8bc9d59c8 # v3.3.1
-        with:
-          key: artifacts-${{ github.sha }}
-          fail-on-cache-miss: true
-          path: |
-            ./release-artifacts/**/*
-
-      - name: Check sha256 ${{ env.BINARY }}
-        working-directory: ./release-artifacts
-        run: |
-          . ./lib.sh
-
-          echo "Checking binary $BINARY"
-          check_sha256 $BINARY && echo "OK" || echo "ERR"
-
-      - name: Check GPG ${{ env.BINARY }}
-        working-directory: ./release-artifacts
-        run: |
-          . ./lib.sh
-          import_gpg_keys
-          check_gpg $BINARY
-
-      - name: Build Injected Container image for ${{ env.BINARY }}
-        env:
-          IMAGE_NAME: ${{ env.BINARY }}
-          OWNER: ${{ env.DOCKER_OWNER }}
-        run: |
-          ls -al
-          echo "Building container for $BINARY"
-          ./docker/scripts/build-injected-image.sh
-
-      - name: Fetch rc commit and tag
-        if: ${{ env.IMAGE_TYPE == 'rc' }}
-        id: fetch_rc_refs
-        run: |
-          release=release-${{ inputs.release_id }} && \
-          echo "release=${release}" >> $GITHUB_OUTPUT
-
-          commit=$(git rev-parse --short HEAD) && \
-          echo "commit=${commit}" >> $GITHUB_OUTPUT
-
-          tag=$(git name-rev --tags --name-only $(git rev-parse HEAD)) && \
-          [ "${tag}" != "undefined" ] && echo "tag=${tag}" >> $GITHUB_OUTPUT || \
-          echo "No tag, doing without"
-
-      - name: Fetch release tags
-        if: ${{ env.IMAGE_TYPE == 'release' || env.EVENT_NAME == 'release' &&  env.EVENT_ACTION != '' && env.EVENT_ACTION == 'published' }}
-        id: fetch_release_refs
-        run: |
-          VERSION=$(docker run --pull never --rm $DOCKER_OWNER/$BINARY --version | awk '{ print $2 }' )
-          release=$( echo $VERSION | cut -f1 -d- )
-          echo "tag=latest" >> $GITHUB_OUTPUT
-          echo "release=${release}" >> $GITHUB_OUTPUT
-
-
-      - name: Login to Dockerhub
-        uses: docker/login-action@v2
-        with:
-          username: ${{ secrets.DOCKERHUB_USERNAME }}
-          password: ${{ secrets.DOCKERHUB_TOKEN }}
-
-      - name: Tag and Push Container image for ${{ env.BINARY }}
-        id: docker_push
-        env:
-          TAGS: ${{ join(steps.fetch_rc_refs.outputs.*, ',') || join(steps.fetch_release_refs.outputs.*, ',') }}
-        run: |
-          TAGS=${TAGS[@]:-latest}
-          IFS=',' read -r -a TAG_ARRAY <<< "$TAGS"
-
-          echo "The image ${BINARY} will be tagged with ${TAG_ARRAY[*]}"
-          for TAG in "${TAG_ARRAY[@]}"; do
-            $ENGINE tag ${DOCKER_OWNER}/${BINARY} ${DOCKER_OWNER}/${BINARY}:${TAG}
-            $ENGINE push ${DOCKER_OWNER}/${BINARY}:${TAG}
-          done
-
-          $ENGINE images | grep ${BINARY}
-
-      - name: Check version for the published image for ${{ env.BINARY }}
-        env:
-          RELEASE_TAG: ${{ steps.fetch_rc_refs.outputs.release || steps.fetch_release_refs.outputs.release  }}
-        run: |
-          echo "Checking tag ${RELEASE_TAG} for image ${REGISTRY}/${DOCKER_OWNER}/${BINARY}"
-          $ENGINE run -i ${REGISTRY}/${DOCKER_OWNER}/${BINARY}:${RELEASE_TAG} --version
diff --git a/cumulus/.github/workflows/release-99_bot-announce.yml b/cumulus/.github/workflows/release-99_bot-announce.yml
deleted file mode 100644
index 5c2604924c4c0d25216986265ca70c3c81d423f9..0000000000000000000000000000000000000000
--- a/cumulus/.github/workflows/release-99_bot-announce.yml
+++ /dev/null
@@ -1,39 +0,0 @@
-name: Release - Pushes release notes to a Matrix room
-on:
-  release:
-    types:
-      - published
-
-jobs:
-  ping_matrix:
-    runs-on: ubuntu-latest
-    strategy:
-      matrix:
-        channel:
-          - name: 'RelEng: Cumulus Release Coordination'
-            room: '!NAEMyPAHWOiOQHsvus:parity.io'
-            pre-releases: true
-          - name: 'Ledger <> Polkadot Coordination'
-            room: '!EoIhaKfGPmFOBrNSHT:web3.foundation'
-            pre-release: true
-          - name: 'General: Rust, Polkadot, Substrate'
-            room: '!aJymqQYtCjjqImFLSb:parity.io'
-            pre-release: false
-          - name: 'Team: DevOps'
-            room: '!lUslSijLMgNcEKcAiE:parity.io'
-            pre-release: true
-
-    steps:
-      - name: Matrix notification to ${{ matrix.channel.name }}
-        uses: s3krit/matrix-message-action@70ad3fb812ee0e45ff8999d6af11cafad11a6ecf # v0.0.3
-        with:
-          room_id: ${{ matrix.channel.room }}
-          access_token: ${{ secrets.RELEASENOTES_MATRIX_V2_ACCESS_TOKEN }}
-          server: "m.parity.io"
-          message: |
-            A (pre)release has been ${{github.event.action}} in **${{github.event.repository.full_name}}:**<br/>
-            Release version: [${{github.event.release.tag_name}}](${{github.event.release.html_url}})
-
-            -----
-
-            ${{github.event.release.body}}
diff --git a/cumulus/.github/workflows/srtool.yml b/cumulus/.github/workflows/srtool.yml
deleted file mode 100644
index ae473b4813709f5f75244e07b770f43654881647..0000000000000000000000000000000000000000
--- a/cumulus/.github/workflows/srtool.yml
+++ /dev/null
@@ -1,122 +0,0 @@
-name: Srtool build
-
-env:
-  SUBWASM_VERSION: 0.20.0
-
-on:
-  push:
-    tags:
-      - "*"
-
-    # paths-ignore:
-    #   - "docker"
-    #   - "docs"
-    #   - "scripts"
-    #   - "test"
-    #   - "client"
-    paths:
-      - parachains/runtimes/**/*
-
-    branches:
-      - "release*"
-
-  schedule:
-    - cron: "00 02 * * 1" # 2AM weekly on monday
-
-  workflow_dispatch:
-
-jobs:
-  srtool:
-    runs-on: ubuntu-latest
-    strategy:
-      matrix:
-        include:
-          - category: assets
-            runtime: asset-hub-kusama
-          - category: assets
-            runtime: asset-hub-polkadot
-          - category: assets
-            runtime: asset-hub-westend
-          - category: bridge-hubs
-            runtime: bridge-hub-polkadot
-          - category: bridge-hubs
-            runtime: bridge-hub-kusama
-          - category: bridge-hubs
-            runtime: bridge-hub-rococo
-          - category: collectives
-            runtime: collectives-polkadot
-          - category: contracts
-            runtime: contracts-rococo
-          - category: starters
-            runtime: seedling
-          - category: starters
-            runtime: shell
-          - category: testing
-            runtime: rococo-parachain
-    steps:
-      - uses: actions/checkout@c85c95e3d7251135ab7dc9ce3241c5835cc595a9 # v3.5.3
-        with:
-          fetch-depth: 0
-
-      - name: Srtool build
-        id: srtool_build
-        uses: chevdor/srtool-actions@v0.7.0
-        with:
-          chain: ${{ matrix.runtime }}
-          runtime_dir: parachains/runtimes/${{ matrix.category }}/${{ matrix.runtime }}
-
-      - name: Summary
-        run: |
-          echo '${{ steps.srtool_build.outputs.json }}' | jq > ${{ matrix.runtime }}-srtool-digest.json
-          cat ${{ matrix.runtime }}-srtool-digest.json
-          echo "Compact Runtime: ${{ steps.srtool_build.outputs.wasm }}"
-          echo "Compressed Runtime: ${{ steps.srtool_build.outputs.wasm_compressed }}"
-
-      # it takes a while to build the runtime, so let's save the artifact as soon as we have it
-      - name: Archive Artifacts for ${{ matrix.runtime }}
-        uses: actions/upload-artifact@0b7f8abb1508181956e8e162db84b466c27e18ce # v3.1.2
-        with:
-          name: ${{ matrix.runtime }}-runtime
-          path: |
-            ${{ steps.srtool_build.outputs.wasm }}
-            ${{ steps.srtool_build.outputs.wasm_compressed }}
-            ${{ matrix.runtime }}-srtool-digest.json
-
-      # We now get extra information thanks to subwasm
-      - name: Install subwasm
-        run: |
-          wget https://github.com/chevdor/subwasm/releases/download/v${{ env.SUBWASM_VERSION }}/subwasm_linux_amd64_v${{ env.SUBWASM_VERSION }}.deb
-          sudo dpkg -i subwasm_linux_amd64_v${{ env.SUBWASM_VERSION }}.deb
-          subwasm --version
-
-      - name: Show Runtime information
-        shell: bash
-        run: |
-          subwasm info ${{ steps.srtool_build.outputs.wasm }}
-          subwasm info ${{ steps.srtool_build.outputs.wasm_compressed }}
-          subwasm --json info ${{ steps.srtool_build.outputs.wasm }} > ${{ matrix.runtime }}-info.json
-          subwasm --json info ${{ steps.srtool_build.outputs.wasm_compressed }} > ${{ matrix.runtime }}-compressed-info.json
-
-      - name: Extract the metadata
-        shell: bash
-        run: |
-          subwasm meta ${{ steps.srtool_build.outputs.wasm }}
-          subwasm --json meta ${{ steps.srtool_build.outputs.wasm }} > ${{ matrix.runtime }}-metadata.json
-
-      - name: Check the metadata diff
-        shell: bash
-        # the following subwasm call will error for chains that are not known and/or live, that includes shell for instance
-        run: |
-          subwasm diff ${{ steps.srtool_build.outputs.wasm }} --chain-b ${{ matrix.runtime }} || \
-            echo "Subwasm call failed, check the logs. This is likely because ${{ matrix.runtime }} is not known by subwasm" | \
-            tee ${{ matrix.runtime }}-diff.txt
-
-      - name: Archive Subwasm results
-        uses: actions/upload-artifact@0b7f8abb1508181956e8e162db84b466c27e18ce # v3.1.2
-        with:
-          name: ${{ matrix.runtime }}-runtime
-          path: |
-            ${{ matrix.runtime }}-info.json
-            ${{ matrix.runtime }}-compressed-info.json
-            ${{ matrix.runtime }}-metadata.json
-            ${{ matrix.runtime }}-diff.txt
diff --git a/cumulus/.gitignore b/cumulus/.gitignore
deleted file mode 100644
index 225be857745879e7e8f15ec09c68f65b0da34c48..0000000000000000000000000000000000000000
--- a/cumulus/.gitignore
+++ /dev/null
@@ -1,11 +0,0 @@
-**/target/
-.idea
-.vscode
-.DS_Store
-/.cargo/config
-polkadot_argument_parsing
-**/node_modules
-**/chains/
-*.iml
-.env
-**/._*
diff --git a/cumulus/.gitlab-ci.yml b/cumulus/.gitlab-ci.yml
deleted file mode 100644
index f032901c6f47123954187e400467d2d88396eac0..0000000000000000000000000000000000000000
--- a/cumulus/.gitlab-ci.yml
+++ /dev/null
@@ -1,201 +0,0 @@
-# .gitlab-ci.yml
-#
-# cumulus
-#
-# pipelines can be triggered manually in the web
-
-stages:
-  - test
-  - build
-  # used for manual job run for regenerate weights for release-* branches (not needed anymore, just leave it here for a while as PlanB)
-  - benchmarks-build
-  # used for manual job run for regenerate weights for release-* branches (not needed anymore, just leave it here for a while as PlanB)
-  - benchmarks-run
-  - publish
-  - integration-tests
-  - zombienet
-  - short-benchmarks
-
-default:
-  interruptible: true
-  retry:
-    max: 2
-    when:
-      - runner_system_failure
-      - unknown_failure
-      - api_failure
-
-variables:
-  GIT_STRATEGY: fetch
-  GIT_DEPTH: 100
-  CARGO_INCREMENTAL: 0
-  CI_IMAGE: !reference [.ci-unified, variables, CI_IMAGE]  
-  DOCKER_OS: "debian:stretch"
-  ARCH: "x86_64"
-  ZOMBIENET_IMAGE: "docker.io/paritytech/zombienet:v1.3.55"
-  BUILDAH_IMAGE: "quay.io/buildah/stable:v1.29"
-  BUILDAH_COMMAND: "buildah --storage-driver overlay2"
-
-.common-before-script:
-  before_script:
-    - !reference [.job-switcher, before_script]
-    - !reference [.timestamp, before_script]
-
-.collect-artifacts:
-  artifacts:
-    name: "${CI_JOB_NAME}_${CI_COMMIT_REF_NAME}"
-    when: on_success
-    expire_in: 1 days
-    paths:
-      - ./artifacts/
-
-# collecting vars for pipeline stopper
-# they will be used if the job fails
-.pipeline-stopper-vars:
-  before_script:
-    - echo "FAILED_JOB_URL=${CI_JOB_URL}" > pipeline-stopper.env
-    - echo "FAILED_JOB_NAME=${CI_JOB_NAME}" >> pipeline-stopper.env
-    - echo "FAILED_JOB_NAME=${CI_JOB_NAME}" >> pipeline-stopper.env
-    - echo "PR_NUM=${CI_COMMIT_REF_NAME}" >> pipeline-stopper.env
-
-.pipeline-stopper-artifacts:
-  artifacts:
-    reports:
-      dotenv: pipeline-stopper.env
-
-.common-refs:
-  # these jobs run always*
-  rules:
-    - if: $CI_PIPELINE_SOURCE == "schedule"
-    - if: $CI_COMMIT_REF_NAME == "master"
-    - if: $CI_COMMIT_REF_NAME =~ /^[0-9]+$/ # PRs
-    - if: $CI_COMMIT_REF_NAME =~ /^v[0-9]+\.[0-9]+.*$/ # i.e. v1.0, v2.1rc1
-    - if: $CI_COMMIT_REF_NAME =~ /^release-parachains-v[0-9].*$/ # i.e. release-parachains-v1.0, release-parachains-v2.1rc1, release-parachains-v3000
-    - if: $CI_COMMIT_REF_NAME =~ /^polkadot-v[0-9]+\.[0-9]+.*$/ # i.e. polkadot-v1.0.99, polkadot-v2.1rc1
-
-.pr-refs:
-  # these jobs run always*
-  rules:
-    - if: $CI_COMMIT_REF_NAME =~ /^[0-9]+$/ # PRs
-
-.publish-refs:
-  rules:
-    - if: $CI_COMMIT_REF_NAME == "master"
-    - if: $CI_PIPELINE_SOURCE == "schedule"
-    - if: $CI_COMMIT_REF_NAME =~ /^v[0-9]+\.[0-9]+.*$/ # i.e. v1.0, v2.1rc1
-
-# run benchmarks manually only on release-parachains-v* branch
-.benchmarks-manual-refs:
-  rules:
-    - if: $CI_COMMIT_REF_NAME =~ /^release-parachains-v[0-9].*$/ # i.e. release-parachains-v1.0, release-parachains-v2.1rc1, release-parachains-v3000
-      when: manual
-
-# run benchmarks only on release-parachains-v* branch
-.benchmarks-refs:
-  rules:
-    - if: $CI_COMMIT_REF_NAME =~ /^release-parachains-v[0-9].*$/ # i.e. release-parachains-v1.0, release-parachains-v2.1rc1, release-parachains-v3000
-
-.zombienet-refs:
-  rules:
-    - if: $CI_PIPELINE_SOURCE == "pipeline"
-      when: never
-    - if: $CI_PIPELINE_SOURCE == "schedule"
-      when: never
-    - if: $CI_COMMIT_REF_NAME == "master"
-    - if: $CI_COMMIT_REF_NAME =~ /^[0-9]+$/ # PRs
-
-.job-switcher:
-  before_script:
-    - if echo "$CI_DISABLED_JOBS" | grep -xF "$CI_JOB_NAME"; then echo "The job has been cancelled in CI settings"; exit 0; fi
-
-.docker-env:
-  image: "${CI_IMAGE}"
-  before_script:
-    - !reference [.common-before-script, before_script]
-    - rustup show
-    - cargo --version
-    - bash --version
-  tags:
-    - linux-docker-vm-c2
-
-.kubernetes-env:
-  image: "${CI_IMAGE}"
-  before_script:
-    - !reference [.common-before-script, before_script]
-  tags:
-    - kubernetes-parity-build
-
-.git-commit-push:
-  script:
-    - git status
-    # Set git config
-    - rm -rf .git/config
-    - git config --global user.email "${GITHUB_EMAIL}"
-    - git config --global user.name "${GITHUB_USER}"
-    - git config remote.origin.url "https://${GITHUB_USER}:${GITHUB_TOKEN}@github.com/paritytech/${CI_PROJECT_NAME}.git"
-    - git config remote.origin.fetch "+refs/heads/*:refs/remotes/origin/*"
-    # push results to github
-    - git checkout -b $BRANCHNAME
-    - git add parachains/*
-    - git commit -m "[benchmarks] pr with weights"
-    - git push origin $BRANCHNAME
-
-include:
-  # test jobs
-  - scripts/ci/gitlab/pipeline/test.yml
-  # # build jobs
-  - scripts/ci/gitlab/pipeline/build.yml
-  # short-benchmarks jobs
-  - scripts/ci/gitlab/pipeline/short-benchmarks.yml
-  # # benchmarks jobs
-  # # used for manual job run for regenerate weights for release-* branches (not needed anymore, just leave it here for a while as PlanB)
-  - scripts/ci/gitlab/pipeline/benchmarks.yml
-  # # publish jobs
-  - scripts/ci/gitlab/pipeline/publish.yml
-  # zombienet jobs
-  - scripts/ci/gitlab/pipeline/zombienet.yml
-  # timestamp handler
-  - project: parity/infrastructure/ci_cd/shared
-    ref: main
-    file: /common/timestamp.yml
-  - project: parity/infrastructure/ci_cd/shared
-    ref: main
-    file: /common/ci-unified.yml  
-
-
-#### stage:                        .post
-
-# This job cancels the whole pipeline if any of provided jobs fail.
-# In a DAG, every jobs chain is executed independently of others. The `fail_fast` principle suggests
-# to fail the pipeline as soon as possible to shorten the feedback loop.
-cancel-pipeline:
-  stage: .post
-  needs:
-    - job: test-linux-stable
-  rules:
-    - if: $CI_COMMIT_REF_NAME =~ /^[0-9]+$/ # PRs
-      when: on_failure
-  variables:
-    PROJECT_ID: "${CI_PROJECT_ID}"
-    PROJECT_NAME: "${CI_PROJECT_NAME}"
-    PIPELINE_ID: "${CI_PIPELINE_ID}"
-    FAILED_JOB_URL: "${FAILED_JOB_URL}"
-    FAILED_JOB_NAME: "${FAILED_JOB_NAME}"
-    PR_NUM: "${PR_NUM}"
-  trigger:
-    project: "parity/infrastructure/ci_cd/pipeline-stopper"
-    branch: "as-improve"
-
-remove-cancel-pipeline-message:
-  stage: .post
-  rules:
-    - if: $CI_COMMIT_REF_NAME =~ /^[0-9]+$/ # PRs
-  variables:
-    PROJECT_ID: "${CI_PROJECT_ID}"
-    PROJECT_NAME: "${CI_PROJECT_NAME}"
-    PIPELINE_ID: "${CI_PIPELINE_ID}"
-    FAILED_JOB_URL: "https://gitlab.com"
-    FAILED_JOB_NAME: "nope"
-    PR_NUM: "${CI_COMMIT_REF_NAME}"
-  trigger:
-    project: "parity/infrastructure/ci_cd/pipeline-stopper"
diff --git a/cumulus/CODEOWNERS b/cumulus/CODEOWNERS
deleted file mode 100644
index 3e5e8bd062dda4d1fd5675b49daaf7186b3a034e..0000000000000000000000000000000000000000
--- a/cumulus/CODEOWNERS
+++ /dev/null
@@ -1,23 +0,0 @@
-# Lists some code owners.
-#
-# A codeowner just oversees some part of the codebase. If an owned file is changed then the
-# corresponding codeowner receives a review request. An approval of the codeowner might be
-# required for merging a PR (depends on repository settings).
-#
-# For details about syntax, see:
-# https://help.github.com/en/articles/about-code-owners
-# But here are some important notes:
-#
-# - Glob syntax is git-like, e.g. `/core` means the core directory in the root, unlike `core`
-#   which can be everywhere.
-# - Multiple owners are supported.
-# - Either handle (e.g, @github_user or @github/team) or email can be used. Keep in mind,
-#   that handles might work better because they are more recognizable on GitHub,
-#   eyou can use them for mentioning unlike an email.
-# - The latest matching rule, if multiple, takes precedence.
-
-# CI
-/.github/ @paritytech/ci @paritytech/release-engineering
-/.gitlab-ci.yml @paritytech/ci
-/scripts/ci/ @paritytech/ci @paritytech/release-engineering
-
diff --git a/cumulus/README.md b/cumulus/README.md
index 59e0cff015d39c5d3bdbdb83668b81ab019a4112..19f9f3f113dd06655c418a4caf6b30a9cad6ee9f 100644
--- a/cumulus/README.md
+++ b/cumulus/README.md
@@ -1,13 +1,258 @@
-Dear contributors and users,
+# Cumulus ☁️
 
-We would like to inform you that we have recently made significant changes to our repository structure. In order to streamline our development process and foster better contributions, we have merged three separate repositories Cumulus, Substrate and Polkadot into a single new repository: [the Polkadot SDK](https://github.com/paritytech/polkadot-sdk). Go ahead and make sure to support us by giving a star ⭐️ to the new repo.
+[![Doc](https://img.shields.io/badge/cumulus%20docs-master-brightgreen)](https://paritytech.github.io/cumulus/)
 
-By consolidating our codebase, we aim to enhance collaboration and provide a more efficient platform for future development.
+This repository contains both the Cumulus SDK and also specific chains implemented on top of this SDK.
 
-If you currently have an open pull request in any of the merged repositories, we kindly request that you resubmit your PR in the new repository. This will ensure that your contributions are considered within the updated context and enable us to review and merge them more effectively.
+If you only want to run a **Polkadot Parachain Node**, check out our [container section](./docs/container.md).
 
-We appreciate your understanding and ongoing support throughout this transition. Should you have any questions or require further assistance, please don't hesitate to [reach out to us](https://forum.polkadot.network/t/psa-parity-is-currently-working-on-merging-the-polkadot-stack-repositories-into-one-single-repository/2883).
+## Cumulus SDK
 
-Best Regards,
+A set of tools for writing [Substrate](https://substrate.io/)-based [Polkadot](https://wiki.polkadot.network/en/)
+[parachains](https://wiki.polkadot.network/docs/en/learn-parachains). Refer to the included [overview](docs/overview.md)
+for architectural details, and the [Connect to a relay chain how-to
+guide](https://docs.substrate.io/reference/how-to-guides/parachains/connect-to-a-relay-chain/) for a guided walk-through
+of using these tools.
 
-Parity Technologies
\ No newline at end of file
+It's easy to write blockchains using Substrate, and the overhead of writing parachains' distribution, p2p, database, and
+synchronization layers should be just as low. This project aims to make it easy to write parachains for Polkadot by
+leveraging the power of Substrate.
+
+Cumulus clouds are shaped sort of like dots; together they form a system that is intricate, beautiful and functional.
+
+### Consensus
+
+[`parachain-consensus`](https://github.com/paritytech/polkadot-sdk/blob/master/cumulus/client/consensus/common/src/parachain_consensus.rs)
+is a [consensus engine](https://docs.substrate.io/v3/advanced/consensus) for Substrate that follows a Polkadot [relay
+chain](https://wiki.polkadot.network/docs/en/learn-architecture#relay-chain). This will run a Polkadot node internally,
+and dictate to the client and synchronization algorithms which chain to follow,
+[finalize](https://wiki.polkadot.network/docs/en/learn-consensus#probabilistic-vs-provable-finality), and treat as best.
+
+### Collator
+
+A Polkadot [collator](https://wiki.polkadot.network/docs/en/learn-collator) for the parachain is implemented by the
+`polkadot-parachain` binary (previously called `polkadot-collator`).
+
+You may run `polkadot-parachain` locally after building it or using one of the container option described
+[here](./docs/container.md).
+
+### Relay Chain Interaction
+To operate a parachain node, a connection to the corresponding relay chain is necessary. This can be achieved in one of
+three ways:
+1. Run a full relay chain node within the parachain node (default)
+2. Connect to an external relay chain node via WebSocket RPC
+3. Run a light client for the relay chain
+
+#### In-process Relay Chain Node
+If an external relay chain node is not specified (default behavior), then a full relay chain node is spawned within the
+same process.
+
+This node has all of the typical components of a regular Polkadot node and will have to fully sync with the relay chain
+to work.
+
+##### Example command
+```bash
+polkadot-parachain \
+	--chain parachain-chainspec.json \
+	--tmp \
+	-- \
+	--chain relaychain-chainspec.json
+```
+
+#### External Relay Chain Node
+An external relay chain node is connected via WebsSocket 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.
+
+Parachain nodes using this feature won't have to fully sync with the relay chain to work, so in general they will use
+fewer system resources.
+
+**Note:** At this time, any parachain nodes using this feature will still spawn a significantly cut-down relay chain
+node in-process. Even though they lack the majority of normal Polkadot subsystems, they will still need to connect
+directly to the relay chain network.
+
+##### Example command
+
+```bash
+polkadot-parachain \
+	--chain parachain-chainspec.json \
+	--tmp \
+	--relay-chain-rpc-urls \
+		"ws://relaychain-rpc-endpoint:9944" \
+		"ws://relaychain-rpc-endpoint-backup:9944" \
+	-- \
+	--chain relaychain-chainspec.json
+```
+
+#### Relay Chain Light Client
+An internal relay chain light client provides a fast and lightweight approach for connecting to the relay chain network.
+It provides relay chain notifications and facilitates runtime calls.
+
+To specify which chain the light client should connect to, users need to supply a relay chain chain-spec as part of the
+relay chain arguments.
+
+**Note:** At this time, any parachain nodes using this feature will still spawn a significantly cut-down relay chain
+node in-process. Even though they lack the majority of normal Polkadot subsystems, they will still need to connect
+directly to the relay chain network.
+
+
+##### Example command
+```bash
+polkadot-parachain \
+	--chain parachain-chainspec.json \
+	--tmp \
+	--relay-chain-light-client \
+	-- \
+	--chain relaychain-chainspec.json
+```
+
+## Installation and Setup
+Before building Cumulus SDK based nodes / runtimes prepare your environment by following Substrate [installation
+instructions](https://docs.substrate.io/main-docs/install/).
+
+To launch a local network, you can use [zombienet](https://github.com/paritytech/zombienet) for quick setup and
+experimentation or follow the [manual setup](#manual-setup).
+
+### Zombienet
+We use Zombienet to spin up networks for integration tests and local networks. Follow [these installation
+steps](https://github.com/paritytech/zombienet#requirements-by-provider) to set it up on your machine. A simple network
+specification with two relay chain nodes and one collator is located at
+[zombienet/examples/small_network.toml](zombienet/examples/small_network.toml).
+
+#### Which provider should I use?
+Zombienet offers multiple providers to run networks. Choose the one that best fits your needs:
+- **Podman:** Choose this if you want to spin up a network quick and easy.
+- **Native:** Choose this if you want to develop and deploy your changes. Requires compilation of the binaries.
+- **Kubernetes:** Choose this for advanced use-cases or running on cloud-infrastructure.
+
+#### How to run
+To run the example network, use the following commands:
+```bash
+# Podman provider
+zombienet --provider podman spawn ./zombienet/examples/small_network.toml
+
+# Native provider, assumes polkadot and polkadot-parachains binary in $PATH
+zombienet --provider native spawn ./zombienet/examples/small_network.toml
+```
+
+### Manual Setup
+#### Launch the Relay Chain
+
+```bash
+# Clone
+git clone https://github.com/paritytech/polkadot-sdk
+
+# Compile Polkadot
+cargo build --release --bin polkadot
+
+# Generate a raw chain spec
+./target/release/polkadot build-spec --chain rococo-local --disable-default-bootnode --raw > rococo-local-cfde.json
+
+# Alice
+./target/release/polkadot --chain rococo-local-cfde.json --alice --tmp
+
+# Bob (In a separate terminal)
+./target/release/polkadot --chain rococo-local-cfde.json --bob --tmp --port 30334
+```
+
+#### Launch the Parachain
+
+```bash
+# Clone
+git clone https://github.com/paritytech/polkadot-sdk
+
+# Compile
+cargo build --release --bin polkadot-parachain
+
+# Export genesis state
+./target/release/polkadot-parachain export-genesis-state > genesis-state
+
+# Export genesis wasm
+./target/release/polkadot-parachain export-genesis-wasm > genesis-wasm
+
+# Collator1
+./target/release/polkadot-parachain --collator --alice --force-authoring \
+  --tmp --port 40335 --rpc-port 9946 -- --chain ../polkadot/rococo-local-cfde.json --port 30335
+
+# Collator2
+./target/release/polkadot-parachain --collator --bob --force-authoring \
+  --tmp --port 40336 --rpc-port 9947 -- --chain ../polkadot/rococo-local-cfde.json --port 30336
+
+# Parachain Full Node 1
+./target/release/polkadot-parachain --tmp --port 40337 --rpc-port 9948 -- \
+  --chain ../polkadot/rococo-local-cfde.json --port 30337
+```
+
+#### Register the parachain
+
+![image](https://user-images.githubusercontent.com/2915325/99548884-1be13580-2987-11eb-9a8b-20be658d34f9.png)
+
+
+## Asset Hub 🪙
+
+This repository also contains the Asset Hub runtimes. Asset Hub is a system parachain providing an asset store for the
+Polkadot ecosystem.
+
+### Build & Launch a Node
+
+To run an Asset Hub node, you will need to compile the `polkadot-parachain` binary:
+
+```bash
+cargo build --release --locked --bin polkadot-parachain
+```
+
+Once the executable is built, launch the parachain node via:
+
+```bash
+CHAIN=asset-hub-westend # or asset-hub-kusama
+./target/release/polkadot-parachain --chain $CHAIN
+```
+
+Refer to the [setup instructions](#manual-setup) to run a local network for development.
+
+## Contracts 📝
+
+See [the `contracts-rococo` readme](parachains/runtimes/contracts/contracts-rococo/README.md) for details.
+
+## Bridge-hub 📝
+
+See [the `bridge-hubs` readme](parachains/runtimes/bridge-hubs/README.md) for details.
+
+## Rococo 👑
+[Rococo](https://polkadot.js.org/apps/?rpc=wss://rococo-rpc.polkadot.io) is becoming a [Community Parachain
+Testbed](https://polkadot.network/blog/rococo-revamp-becoming-a-community-parachain-testbed/) for parachain teams in the
+Polkadot ecosystem. It supports multiple parachains with the differentiation of long-term connections and recurring
+short-term connections, to see which parachains are currently connected and how long they will be connected for [see
+here](https://polkadot.js.org/apps/?rpc=wss%3A%2F%2Frococo-rpc.polkadot.io#/parachains).
+
+Rococo is an elaborate style of design and the name describes the painstaking effort that has gone into this project.
+
+### Build & Launch Rococo Collators
+
+Collators are similar to validators in the relay chain. These nodes build the blocks that will eventually be included by
+the relay chain for a parachain.
+
+To run a Rococo collator you will need to compile the following binary:
+
+
+```bash
+cargo build --release --locked --bin polkadot-parachain
+```
+
+Once the executable is built, launch collators for each parachain (repeat once each for chain `tick`, `trick`, `track`):
+
+```bash
+./target/release/polkadot-parachain --chain $CHAIN --validator
+```
+
+You can also build [using a container](./docs/container.md).
+
+### Parachains
+
+- [Asset Hub](https://polkadot.js.org/apps/?rpc=wss%3A%2F%2Frococo-statemint-rpc.polkadot.io#/explorer)
+- [Contracts on Rococo](https://polkadot.js.org/apps/?rpc=wss%3A%2F%2Frococo-contracts-rpc.polkadot.io#/explorer)
+- [RILT](https://polkadot.js.org/apps/?rpc=wss%3A%2F%2Frococo.kilt.io#/explorer)
+
+The network uses horizontal message passing (HRMP) to enable communication between parachains and the relay chain and,
+in turn, between parachains. This means that every message is sent to the relay chain, and from the relay chain to its
+destination parachain.
diff --git a/cumulus/bridges/SECURITY.md b/cumulus/bridges/SECURITY.md
deleted file mode 100644
index 65f2f3bff05dd94786f7f3c8d084af2ca9fe236f..0000000000000000000000000000000000000000
--- a/cumulus/bridges/SECURITY.md
+++ /dev/null
@@ -1,14 +0,0 @@
-# Security Policy
-
-Thanks for helping make the Parity ecosystem more secure. Security is one of our first priorities.
-
-## Reporting a vulnerability
-
-If you find something that can be treated as a security vulnerability, please do not use the issue tracker or discuss it in the public forum as it can cause more damage, rather than giving real help to the ecosystem.
-
-Security vulnerabilities should be reported by the [contact form](https://security-submission.parity.io/).
-
-If you think that your report might be eligible for the Bug Bounty Program, please mark this during the submission. Please check up-to-date [Parity Bug Bounty Program rules](https://www.parity.io/bug-bounty) to find out the information about our Bug Bounty Program.
-
-**Warning**: This is an unified SECURITY.md file for Paritytech GitHub Organization. The presence of this file does not mean that this repository is covered by the Bug Bounty program. Please always check the Bug Bounty Program scope for information.
-
diff --git a/cumulus/bridges/docs/high-level-overview.md b/cumulus/bridges/docs/high-level-overview.md
deleted file mode 100644
index 449224124afd77a4e53d55e7cf6b3b9a65961802..0000000000000000000000000000000000000000
--- a/cumulus/bridges/docs/high-level-overview.md
+++ /dev/null
@@ -1,181 +0,0 @@
-# High-Level Bridge Documentation
-
-This document gives a brief, abstract description of main components that may be found in this repository.
-If you want to see how we're using them to build Rococo <> Wococo (Kusama <> Polkadot) bridge, please
-refer to the [Polkadot <> Kusama Bridge](./polkadot-kusama-bridge-overview.md).
-
-## Purpose
-
-This repo contains all components required to build a trustless connection between standalone Substrate chains,
-that are using GRANDPA finality, their parachains or any combination of those. On top of this connection, we
-offer a messaging pallet that provides means to organize messages exchange.
-
-On top of that layered infrastructure, anyone may build their own bridge applications - e.g. [XCM messaging](./polkadot-kusama-bridge-overview.md), 
-[encoded calls messaging](https://github.com/paritytech/parity-bridges-common/releases/tag/encoded-calls-messaging) and so on.
-
-## Terminology
-
-Even though we support (and require) two-way bridging, the documentation will generally talk about
-a one-sided interaction. That's to say, we will only talk about syncing finality proofs and messages
-from a _source_ chain to a _target_ chain. This is because the two-sided interaction is really just the
-one-sided interaction with the source and target chains switched.
-
-The bridge has both on-chain (pallets) and offchain (relayers) components.
-
-## On-chain components
-
-On-chain bridge components are pallets that are deployed at the chain runtime. Finality pallets require
-deployment at the target chain, while messages pallet needs to be deployed at both, source
-and target chains.
-
-### Bridge GRANDPA Finality Pallet
-
-A GRANDPA light client of the source chain built into the target chain's runtime. It provides a "source of truth"
-about the source chain headers which have been finalized. This is useful for higher level applications.
-
-The pallet tracks current GRANDPA authorities set and only accepts finality proofs (GRANDPA justifications),
-generated by the current authorities set. The GRANDPA protocol itself requires current authorities set to
-generate explicit justification for the header that enacts next authorities set. Such headers and their finality
-proofs are called mandatory in the pallet and relayer pays no fee for such headers submission.
-
-The pallet does not require all headers to be imported or provided. The relayer itself chooses which headers
-he wants to submit (with the exception of mandatory headers).
-
-More: [pallet level documentation and code](../modules/grandpa/).
-
-### Bridge Parachains Finality Pallet
-
-Parachains are not supposed to have their own finality, so we can't use bridge GRANDPA pallet to verify their
-finality proofs. Instead, they rely on their relay chain finality. The parachain header is considered final,
-when it is accepted by the [`paras` pallet](https://github.com/paritytech/polkadot/tree/1a034bd6de0e76721d19aed02a538bcef0787260/runtime/parachains/src/paras)
-at its relay chain. Obviously, the relay chain block, where it is accepted, must also be finalized by the relay
-chain GRANDPA gadget.
-
-That said, the bridge parachains pallet accepts storage proof of one or several parachain heads, inserted to the
-[`Heads`](https://github.com/paritytech/polkadot/blob/1a034bd6de0e76721d19aed02a538bcef0787260/runtime/parachains/src/paras/mod.rs#L642)
-map of the [`paras` pallet](https://github.com/paritytech/polkadot/tree/1a034bd6de0e76721d19aed02a538bcef0787260/runtime/parachains/src/paras).
-To verify this storage proof, the pallet uses relay chain header, imported earlier by the bridge GRANDPA pallet.
-
-The pallet may track multiple parachains at once and those parachains may use different primitives. So the
-parachain header decoding never happens at the pallet level. For maintaining the headers order, the pallet
-uses relay chain header number.
-
-More: [pallet level documentation and code](../modules/parachains/).
-
-### Bridge Messages Pallet
-
-The pallet is responsible for queuing messages at the source chain and receiving the messages proofs at the
-target chain. The messages are sent to the particular _lane_, where they are guaranteed to be received in the
-same order they are sent. The pallet supports many lanes.
-
-The lane has two ends. Outbound lane end is storing number of messages that have been sent and the number of
-messages that have been received. Inbound lane end stores the number of messages that have been received and
-also a map that maps messages to relayers that have delivered those messages to the target chain.
-
-The pallet has three main entrypoints:
-- the `send_message` may be used by the other runtime pallets to send the messages;
-- the `receive_messages_proof` is responsible for parsing the messages proof and handing messages over to the
-dispatch code;
-- the `receive_messages_delivery_proof` is responsible for parsing the messages delivery proof and rewarding
-relayers that have delivered the message.
-
-Many things are abstracted by the pallet:
-- the message itself may mean anything, the pallet doesn't care about its content;
-- the message dispatch happens during delivery, but it is decoupled from the pallet code;
-- the messages proof and messages delivery proof are verified outside of the pallet;
-- the relayers incentivization scheme is defined outside of the pallet.
-
-Outside of the messaging pallet, we have a set of adapters, where messages and delivery proofs are regular
-storage proofs. The proofs are generated at the bridged chain and require bridged chain finality. So messages
-pallet, in this case, depends on one of the finality pallets. The messages are XCM messages and we are using
-XCM executor to dispatch them on receival. You may find more info in [Polkadot <> Kusama Bridge](./polkadot-kusama-bridge-overview.md)
-document.
-
-More: [pallet level documentation and code](../modules/messages/).
-
-### Bridge Relayers Pallet
-
-The pallet is quite simple. It just registers relayer rewards and has an entrypoint to collect them. When
-the rewards are registered and the reward amount is configured outside of the pallet.
-
-More: [pallet level documentation and code](../modules/relayers/).
-
-## Offchain Components
-
-Offchain bridge components are separate processes, called relayers. Relayers are connected both to the
-source chain and target chain nodes. Relayers are reading state of the source chain, compare it to the
-state of the target chain and, if state at target chain needs to be updated, submits target chain
-transaction.
-
-### GRANDPA Finality Relay
-
-The task of relay is to submit source chain GRANDPA justifications and their corresponding headers to
-the Bridge GRANDPA Finality Pallet, deployed at the target chain. For that, the relay subscribes to
-the source chain GRANDPA justifications stream and submits every new justification it sees to the
-target chain GRANDPA light client. In addition, relay is searching for mandatory headers and
-submits their justifications - without that the pallet will be unable to move forward.
-
-More: [GRANDPA Finality Relay Sequence Diagram](./grandpa-finality-relay.html), [pallet level documentation and code](../relays/finality/).
-
-### Parachains Finality Relay
-
-The relay connects to the source _relay_ chain and the target chain nodes. It doesn't need to connect to the
-tracked parachain nodes. The relay looks at the [`Heads`](https://github.com/paritytech/polkadot/blob/1a034bd6de0e76721d19aed02a538bcef0787260/runtime/parachains/src/paras/mod.rs#L642)
-map of the [`paras` pallet](https://github.com/paritytech/polkadot/tree/1a034bd6de0e76721d19aed02a538bcef0787260/runtime/parachains/src/paras)
-in source chain, and compares the value with the best parachain head, stored in the bridge parachains pallet at
-the target chain. If new parachain head appears at the relay chain block `B`, the relay process **waits**
-until header `B` or one of its ancestors appears at the target chain. Once it is available, the storage
-proof of the map entry is generated and is submitted to the target chain.
-
-As its on-chain component (which requires bridge GRANDPA pallet to be deployed nearby), the parachains
-finality relay requires GRANDPA finality relay to be running in parallel. Without it, the header `B` or
-any of its children's finality at source won't be relayed at target, and target chain
-won't be able to verify generated storage proof. 
-
-More: [Parachains Finality Relay Sequence Diagram](./parachains-finality-relay.html), [code](../relays/parachains/).
-
-### Messages Relay
-
-Messages relay is actually two relays that are running in a single process: messages delivery relay and
-delivery confirmation relay. Even though they are more complex and have many caveats, the overall algorithm
-is the same as in other relays.
-
-Message delivery relay connects to the source chain and looks at the outbound lane end, waiting until new
-messages are queued there. Once they appear at the source block `B`, the relay start waiting for the block
-`B` or its descendant appear at the target chain. Then the messages storage proof is generated and submitted
-to the bridge messages pallet at the target chain. In addition, the transaction may include the storage proof
-of the outbound lane state - that proves that relayer rewards have been paid and this data (map of relay
-accounts to the delivered messages) may be pruned from the inbound lane state at the target chain.
-
-Delivery confirmation relay connects to the target chain and starts watching the inbound lane end. When new
-messages are delivered to the target chain, the corresponding _source chain account_ is inserted to the
-map in the inbound lane data. Relay detects that, say, at the target chain block `B` and waits until that
-block or its descendant appears at the source chain. Once that happens, the relay crafts a storage proof of
-that data and sends it to the messages pallet, deployed at the source chain.
-
-As you can see, the messages relay also requires finality relay to be operating in parallel. Since messages
-relay submits transactions to both source and target chains, it requires both _source-to-target_ and
-_target-to-source_ finality relays. They can be GRANDPA finality relays or GRANDPA+parachains finality relays,
-depending on the type of connected chain.
-
-More: [Messages Relay Sequence Diagram](./messages-relay.html), [pallet level documentation and code](../relays/messages/).
-
-### Complex Relay
-
-Every relay transaction has its cost. The only transaction, that is "free" to relayer is when the mandatory
-GRANDPA header is submitted. The relay that feeds the bridge with every relay chain and/or parachain head it
-sees, will have to pay a (quite large) cost. And if no messages are sent through the bridge, that is just
-waste of money.
-
-We have a special relay mode, called _complex relay_, where relay mostly sleeps and only submits transactions
-that are required for the messages/confirmations delivery. This mode starts two message relays (in both
-directions). All required finality relays are also started in a special _on-demand_ mode. In this mode they
-do not submit any headers without special request. As always, the only exception is when GRANDPA finality
-relay sees the mandatory header - it is submitted without such request.
-
-The message relays are watching their lanes and when, at some block `B`, they see new messages/confirmations
-to be delivered, they are asking on-demand relays to relay this block `B`. On-demand relays does that and
-then message relay may perform its job. If on-demand relay is a parachain finality relay, it also runs its
-own on-demand GRANDPA relay, which is used to relay required relay chain headers.
-
-More: [Complex Relay Sequence Diagram](./complex-relay.html), [code](../relays/bin-substrate/src/cli/relay_headers_and_messages/).
diff --git a/cumulus/bridges/modules/messages/Cargo.toml b/cumulus/bridges/modules/messages/Cargo.toml
deleted file mode 100644
index 8108b5df1c5826d413abd3ac88afb76e19a5ff55..0000000000000000000000000000000000000000
--- a/cumulus/bridges/modules/messages/Cargo.toml
+++ /dev/null
@@ -1,51 +0,0 @@
-[package]
-name = "pallet-bridge-messages"
-description = "Module that allows bridged chains to exchange messages using lane concept."
-version = "0.1.0"
-authors = ["Parity Technologies <admin@parity.io>"]
-edition = "2021"
-license = "GPL-3.0-or-later WITH Classpath-exception-2.0"
-
-[dependencies]
-codec = { package = "parity-scale-codec", version = "3.1.5", default-features = false }
-log = { version = "0.4.20", default-features = false }
-num-traits = { version = "0.2", default-features = false }
-scale-info = { version = "2.9.0", default-features = false, features = ["derive"] }
-
-# Bridge dependencies
-
-bp-messages = { path = "../../primitives/messages", default-features = false }
-bp-runtime = { path = "../../primitives/runtime", default-features = false }
-
-# Substrate Dependencies
-
-frame-benchmarking = { path = "../../../../substrate/frame/benchmarking", default-features = false, optional = true }
-frame-support = { path = "../../../../substrate/frame/support", default-features = false }
-frame-system = { path = "../../../../substrate/frame/system", default-features = false }
-sp-core = { path = "../../../../substrate/primitives/core", default-features = false }
-sp-runtime = { path = "../../../../substrate/primitives/runtime", default-features = false }
-sp-std = { path = "../../../../substrate/primitives/std", default-features = false }
-
-[dev-dependencies]
-bp-test-utils = { path = "../../primitives/test-utils" }
-pallet-balances = { path = "../../../../substrate/frame/balances" }
-sp-io = { path = "../../../../substrate/primitives/io" }
-
-[features]
-default = [ "std" ]
-std = [
-	"bp-messages/std",
-	"bp-runtime/std",
-	"codec/std",
-	"frame-benchmarking/std",
-	"frame-support/std",
-	"frame-system/std",
-	"log/std",
-	"num-traits/std",
-	"scale-info/std",
-	"sp-core/std",
-	"sp-runtime/std",
-	"sp-std/std",
-]
-runtime-benchmarks = [ "frame-benchmarking/runtime-benchmarks" ]
-try-runtime = [ "frame-support/try-runtime", "frame-system/try-runtime" ]
diff --git a/cumulus/bridges/modules/messages/README.md b/cumulus/bridges/modules/messages/README.md
deleted file mode 100644
index b5250d0dca0b23be3943fecb3926be4ea7097be0..0000000000000000000000000000000000000000
--- a/cumulus/bridges/modules/messages/README.md
+++ /dev/null
@@ -1,242 +0,0 @@
-# Bridge Messages Pallet
-
-The messages pallet is used to deliver messages from source chain to target chain. Message is
-(almost) opaque to the module and the final goal is to hand message to the message dispatch
-mechanism.
-
-## Contents
-
-- [Overview](#overview)
-- [Message Workflow](#message-workflow)
-- [Integrating Message Lane Module into Runtime](#integrating-messages-module-into-runtime)
-- [Non-Essential Functionality](#non-essential-functionality)
-- [Weights of Module Extrinsics](#weights-of-module-extrinsics)
-
-## Overview
-
-Message lane is an unidirectional channel, where messages are sent from source chain to the target
-chain. At the same time, a single instance of messages module supports both outbound lanes and
-inbound lanes. So the chain where the module is deployed (this chain), may act as a source chain for
-outbound messages (heading to a bridged chain) and as a target chain for inbound messages (coming
-from a bridged chain).
-
-Messages module supports multiple message lanes. Every message lane is identified with a 4-byte
-identifier. Messages sent through the lane are assigned unique (for this lane) increasing integer
-value that is known as nonce ("number that can only be used once"). Messages that are sent over the
-same lane are guaranteed to be delivered to the target chain in the same order they're sent from
-the source chain. In other words, message with nonce `N` will be delivered right before delivering a
-message with nonce `N+1`.
-
-Single message lane may be seen as a transport channel for single application (onchain, offchain or
-mixed). At the same time the module itself never dictates any lane or message rules. In the end, it
-is the runtime developer who defines what message lane and message mean for this runtime.
-
-In our [Kusama<>Polkadot bridge](../../docs/polkadot-kusama-bridge-overview.md) we are using lane
-as a channel of communication between two parachains of different relay chains. For example, lane
-`[0, 0, 0, 0]` is used for Polkadot <> Kusama Asset Hub communications. Other lanes may be used to
-bridge other parachains.
-
-## Message Workflow
-
-The pallet is not intended to be used by end users and provides no public calls to send the message.
-Instead, it provides runtime-internal method that allows other pallets (or other runtime code) to queue
-outbound messages.
-
-The message "appears" when some runtime code calls the `send_message()` method of the pallet.
-The submitter specifies the lane that they're willing to use and the message itself. If some fee must
-be paid for sending the message, it must be paid outside of the pallet. If a message passes all checks
-(that include, for example, message size check, disabled lane check, ...), the nonce is assigned and
-the message is stored in the module storage. The message is in an "undelivered" state now.
-
-We assume that there are external, offchain actors, called relayers, that are submitting module
-related transactions to both target and source chains. The pallet itself has no assumptions about
-relayers incentivization scheme, but it has some callbacks for paying rewards. See
-[Integrating Messages Module into runtime](#Integrating-Messages-Module-into-runtime)
-for details.
-
-Eventually, some relayer would notice this message in the "undelivered" state and it would decide to
-deliver this message. Relayer then crafts `receive_messages_proof()` transaction (aka delivery
-transaction) for the messages module instance, deployed at the target chain. Relayer provides
-its account id at the source chain, the proof of message (or several messages), the number of
-messages in the transaction and their cumulative dispatch weight. Once a transaction is mined, the
-message is considered "delivered".
-
-Once a message is delivered, the relayer may want to confirm delivery back to the source chain.
-There are two reasons why it would want to do that. The first is that we intentionally limit number
-of "delivered", but not yet "confirmed" messages at inbound lanes
-(see [What about other Constants in the Messages Module Configuration Trait](#What-about-other-Constants-in-the-Messages-Module-Configuration-Trait) for explanation).
-So at some point, the target chain may stop accepting new messages until relayers confirm some of
-these. The second is that if the relayer wants to be rewarded for delivery, it must prove the fact
-that it has actually delivered the message. And this proof may only be generated after the delivery
-transaction is mined. So relayer crafts the `receive_messages_delivery_proof()` transaction (aka
-confirmation transaction) for the messages module instance, deployed at the source chain. Once
-this transaction is mined, the message is considered "confirmed".
-
-The "confirmed" state is the final state of the message. But there's one last thing related to the
-message - the fact that it is now "confirmed" and reward has been paid to the relayer (or at least
-callback for this has been called), must be confirmed to the target chain. Otherwise, we may reach
-the limit of "unconfirmed" messages at the target chain and it will stop accepting new messages. So
-relayer sometimes includes a nonce of the latest "confirmed" message in the next
-`receive_messages_proof()` transaction, proving that some messages have been confirmed.
-
-## Integrating Messages Module into Runtime
-
-As it has been said above, the messages module supports both outbound and inbound message lanes.
-So if we will integrate a module in some runtime, it may act as the source chain runtime for
-outbound messages and as the target chain runtime for inbound messages. In this section, we'll
-sometimes refer to the chain we're currently integrating with, as "this chain" and the other
-chain as "bridged chain".
-
-Messages module doesn't simply accept transactions that are claiming that the bridged chain has
-some updated data for us. Instead of this, the module assumes that the bridged chain is able to
-prove that updated data in some way. The proof is abstracted from the module and may be of any kind.
-In our Substrate-to-Substrate bridge we're using runtime storage proofs. Other bridges may use
-transaction proofs, Substrate header digests or anything else that may be proved.
-
-**IMPORTANT NOTE**: everything below in this chapter describes details of the messages module
-configuration. But if you're interested in well-probed and relatively easy integration of two
-Substrate-based chains, you may want to look at the
-[bridge-runtime-common](../../bin/runtime-common/) crate. This crate is providing a lot of
-helpers for integration, which may be directly used from within your runtime. Then if you'll decide
-to change something in this scheme, get back here for detailed information.
-
-### General Information
-
-The messages module supports instances. Every module instance is supposed to bridge this chain
-and some bridged chain. To bridge with another chain, using another instance is suggested (this
-isn't forced anywhere in the code, though). Keep in mind, that the pallet may be used to build
-virtual channels between multiple chains, as we do in our [Polkadot <> Kusama bridge](../../docs/polkadot-kusama-bridge-overview.md).
-There, the pallet actually bridges only two parachains - Kusama Bridge Hub and Polkadot
-Bridge Hub. However, other Kusama and Polkadot parachains are able to send (XCM) messages to their
-Bridge Hubs. The messages will be delivered to the other side of the bridge and routed to the proper
-destination parachain within the bridged chain consensus.
-
-Message submitters may track message progress by inspecting module events. When Message is accepted,
-the `MessageAccepted` event is emitted. The event contains both message lane identifier and nonce that
-has been assigned to the message. When a message is delivered to the target chain, the `MessagesDelivered`
-event is emitted from the `receive_messages_delivery_proof()` transaction. The `MessagesDelivered` contains
-the message lane identifier and inclusive range of delivered message nonces.
-
-The pallet provides no means to get the result of message dispatch at the target chain. If that is
-required, it must be done outside of the pallet. For example, XCM messages, when dispatched, have
-special instructions to send some data back to the sender. Other dispatchers may use similar
-mechanism for that.
-### How to plug-in Messages Module to Send Messages to the Bridged Chain?
-
-The `pallet_bridge_messages::Config` trait has 3 main associated types that are used to work with
-outbound messages. The `pallet_bridge_messages::Config::TargetHeaderChain` defines how we see the
-bridged chain as the target for our outbound messages. It must be able to check that the bridged
-chain may accept our message - like that the message has size below maximal possible transaction
-size of the chain and so on. And when the relayer sends us a confirmation transaction, this
-implementation must be able to parse and verify the proof of messages delivery. Normally, you would
-reuse the same (configurable) type on all chains that are sending messages to the same bridged
-chain.
-
-The `pallet_bridge_messages::Config::LaneMessageVerifier` defines a single callback to verify outbound
-messages. The simplest callback may just accept all messages. But in this case you'll need to answer
-many questions first. Who will pay for the delivery and confirmation transaction? Are we sure that
-someone will ever deliver this message to the bridged chain? Are we sure that we don't bloat our
-runtime storage by accepting this message? What if the message is improperly encoded or has some
-fields set to invalid values? Answering all those (and similar) questions would lead to correct
-implementation.
-
-There's another thing to consider when implementing type for use in
-`pallet_bridge_messages::Config::LaneMessageVerifier`. It is whether we treat all message lanes
-identically, or they'll have different sets of verification rules? For example, you may reserve
-lane#1 for messages coming from some 'wrapped-token' pallet - then you may verify in your
-implementation that the origin is associated with this pallet. Lane#2 may be reserved for 'system'
-messages and you may charge zero fee for such messages. You may have some rate limiting for messages
-sent over the lane#3. Or you may just verify the same rules set for all outbound messages - it is
-all up to the `pallet_bridge_messages::Config::LaneMessageVerifier` implementation.
-
-The last type is the `pallet_bridge_messages::Config::DeliveryConfirmationPayments`. When confirmation
-transaction is received, we call the `pay_reward()` method, passing the range of delivered messages.
-You may use the [`pallet-bridge-relayers`](../relayers/) pallet and its
-[`DeliveryConfirmationPaymentsAdapter`](../relayers/src/payment_adapter.rs) adapter as a possible
-implementation. It allows you to pay fixed reward for relaying the message and some of its portion
-for confirming delivery.
-
-### I have a Messages Module in my Runtime, but I Want to Reject all Outbound Messages. What shall I do?
-
-You should be looking at the `bp_messages::source_chain::ForbidOutboundMessages` structure
-[`bp_messages::source_chain`](../../primitives/messages/src/source_chain.rs). It implements
-all required traits and will simply reject all transactions, related to outbound messages.
-
-### How to plug-in Messages Module to Receive Messages from the Bridged Chain?
-
-The `pallet_bridge_messages::Config` trait has 2 main associated types that are used to work with
-inbound messages. The `pallet_bridge_messages::Config::SourceHeaderChain` defines how we see the
-bridged chain as the source of our inbound messages. When relayer sends us a delivery transaction,
-this implementation must be able to parse and verify the proof of messages wrapped in this
-transaction. Normally, you would reuse the same (configurable) type on all chains that are sending
-messages to the same bridged chain.
-
-The `pallet_bridge_messages::Config::MessageDispatch` defines a way on how to dispatch delivered
-messages. Apart from actually dispatching the message, the implementation must return the correct
-dispatch weight of the message before dispatch is called.
-
-### I have a Messages Module in my Runtime, but I Want to Reject all Inbound Messages. What shall I do?
-
-You should be looking at the `bp_messages::target_chain::ForbidInboundMessages` structure from
-the [`bp_messages::target_chain`](../../primitives/messages/src/target_chain.rs) module. It
-implements all required traits and will simply reject all transactions, related to inbound messages.
-
-### What about other Constants in the Messages Module Configuration Trait?
-
-Two settings that are used to check messages in the `send_message()` function. The
-`pallet_bridge_messages::Config::ActiveOutboundLanes` is an array of all message lanes, that
-may be used to send messages. All messages sent using other lanes are rejected. All messages that have
-size above `pallet_bridge_messages::Config::MaximalOutboundPayloadSize` will also be rejected.
-
-To be able to reward the relayer for delivering messages, we store a map of message nonces range =>
-identifier of the relayer that has delivered this range at the target chain runtime storage. If a
-relayer delivers multiple consequent ranges, they're merged into single entry. So there may be more
-than one entry for the same relayer. Eventually, this whole map must be delivered back to the source
-chain to confirm delivery and pay rewards. So to make sure we are able to craft this confirmation
-transaction, we need to: (1) keep the size of this map below a certain limit and (2) make sure that
-the weight of processing this map is below a certain limit. Both size and processing weight mostly
-depend on the number of entries. The number of entries is limited with the
-`pallet_bridge_messages::ConfigMaxUnrewardedRelayerEntriesAtInboundLane` parameter. Processing weight
-also depends on the total number of messages that are being confirmed, because every confirmed
-message needs to be read. So there's another
-`pallet_bridge_messages::Config::MaxUnconfirmedMessagesAtInboundLane` parameter for that.
-
-When choosing values for these parameters, you must also keep in mind that if proof in your scheme
-is based on finality of headers (and it is the most obvious option for Substrate-based chains with
-finality notion), then choosing too small values for these parameters may cause significant delays
-in message delivery. That's because there are too many actors involved in this scheme: 1) authorities
-that are finalizing headers of the target chain need to finalize header with non-empty map; 2) the
-headers relayer then needs to submit this header and its finality proof to the source chain; 3) the
-messages relayer must then send confirmation transaction (storage proof of this map) to the source
-chain; 4) when the confirmation transaction will be mined at some header, source chain authorities
-must finalize this header; 5) the headers relay then needs to submit this header and its finality
-proof to the target chain; 6) only now the messages relayer may submit new messages from the source
-to target chain and prune the entry from the map.
-
-Delivery transaction requires the relayer to provide both number of entries and total number of
-messages in the map. This means that the module never charges an extra cost for delivering a map -
-the relayer would need to pay exactly for the number of entries+messages it has delivered. So the
-best guess for values of these parameters would be the pair that would occupy `N` percent of the
-maximal transaction size and weight of the source chain. The `N` should be large enough to process
-large maps, at the same time keeping reserve for future source chain upgrades.
-
-## Non-Essential Functionality
-
-There may be a special account in every runtime where the messages module is deployed. This
-account, named 'module owner', is like a module-level sudo account - he's able to halt and
-resume all module operations without requiring runtime upgrade. Calls that are related to this
-account are:
-- `fn set_owner()`: current module owner may call it to transfer "ownership" to another account;
-- `fn halt_operations()`: the module owner (or sudo account) may call this function to stop all
-  module operations. After this call, all message-related transactions will be rejected until
-  further `resume_operations` call'. This call may be used when something extraordinary happens with
-  the bridge;
-- `fn resume_operations()`: module owner may call this function to resume bridge operations. The
-  module will resume its regular operations after this call.
-
-If pallet owner is not defined, the governance may be used to make those calls.
-
-## Messages Relay
-
-We have an offchain actor, who is watching for new messages and submits them to the bridged chain.
-It is the messages relay - you may look at the [crate level documentation and the code](../../relays/messages/).
diff --git a/cumulus/bridges/modules/relayers/Cargo.toml b/cumulus/bridges/modules/relayers/Cargo.toml
deleted file mode 100644
index 8a5a4efe65dfe91873a155d345bcaa9b082661d4..0000000000000000000000000000000000000000
--- a/cumulus/bridges/modules/relayers/Cargo.toml
+++ /dev/null
@@ -1,54 +0,0 @@
-[package]
-name = "pallet-bridge-relayers"
-description = "Module used to store relayer rewards and coordinate relayers set."
-version = "0.1.0"
-authors = ["Parity Technologies <admin@parity.io>"]
-edition = "2021"
-license = "GPL-3.0-or-later WITH Classpath-exception-2.0"
-
-[dependencies]
-codec = { package = "parity-scale-codec", version = "3.1.5", default-features = false }
-log = { version = "0.4.20", default-features = false }
-scale-info = { version = "2.9.0", default-features = false, features = ["derive"] }
-
-# Bridge dependencies
-
-bp-messages = { path = "../../primitives/messages", default-features = false }
-bp-relayers = { path = "../../primitives/relayers", default-features = false }
-bp-runtime = { path = "../../primitives/runtime", default-features = false }
-pallet-bridge-messages = { path = "../messages", default-features = false }
-
-# Substrate Dependencies
-
-frame-benchmarking = { path = "../../../../substrate/frame/benchmarking", default-features = false, optional = true }
-frame-support = { path = "../../../../substrate/frame/support", default-features = false }
-frame-system = { path = "../../../../substrate/frame/system", default-features = false }
-sp-arithmetic = { path = "../../../../substrate/primitives/arithmetic", default-features = false }
-sp-runtime = { path = "../../../../substrate/primitives/runtime", default-features = false }
-sp-std = { path = "../../../../substrate/primitives/std", default-features = false }
-
-[dev-dependencies]
-bp-runtime = { path = "../../primitives/runtime" }
-pallet-balances = { path = "../../../../substrate/frame/balances" }
-sp-core = { path = "../../../../substrate/primitives/core" }
-sp-io = { path = "../../../../substrate/primitives/io" }
-sp-runtime = { path = "../../../../substrate/primitives/runtime" }
-
-[features]
-default = [ "std" ]
-std = [
-	"bp-messages/std",
-	"bp-relayers/std",
-	"bp-runtime/std",
-	"codec/std",
-	"frame-benchmarking/std",
-	"frame-support/std",
-	"frame-system/std",
-	"log/std",
-	"scale-info/std",
-	"sp-arithmetic/std",
-	"sp-runtime/std",
-	"sp-std/std",
-]
-runtime-benchmarks = [ "frame-benchmarking/runtime-benchmarks" ]
-try-runtime = [ "frame-support/try-runtime", "frame-system/try-runtime" ]
diff --git a/cumulus/bridges/modules/xcm-bridge-hub-router/Cargo.toml b/cumulus/bridges/modules/xcm-bridge-hub-router/Cargo.toml
deleted file mode 100644
index 7f57c53426566723bc4df4240cdaa9ae9a2736d8..0000000000000000000000000000000000000000
--- a/cumulus/bridges/modules/xcm-bridge-hub-router/Cargo.toml
+++ /dev/null
@@ -1,56 +0,0 @@
-[package]
-name = "pallet-xcm-bridge-hub-router"
-description = "Bridge hub interface for sibling/parent chains with dynamic fees support."
-version = "0.1.0"
-authors = ["Parity Technologies <admin@parity.io>"]
-edition = "2021"
-license = "GPL-3.0-or-later WITH Classpath-exception-2.0"
-
-[dependencies]
-codec = { package = "parity-scale-codec", version = "3.1.5", default-features = false }
-log = { version = "0.4.19", default-features = false }
-scale-info = { version = "2.8.0", default-features = false, features = ["bit-vec", "derive", "serde"] }
-
-# Bridge dependencies
-
-bp-xcm-bridge-hub-router = { path = "../../primitives/xcm-bridge-hub-router", default-features = false }
-
-# Substrate Dependencies
-
-frame-benchmarking = { path = "../../../../substrate/frame/benchmarking", default-features = false, optional = true }
-frame-support = { path = "../../../../substrate/frame/support", default-features = false }
-frame-system = { path = "../../../../substrate/frame/system", default-features = false }
-sp-core = { path = "../../../../substrate/primitives/core", default-features = false }
-sp-runtime = { path = "../../../../substrate/primitives/runtime", default-features = false }
-sp-std = { path = "../../../../substrate/primitives/std", default-features = false }
-
-# Polkadot Dependencies
-
-xcm = { path = "../../../../polkadot/xcm", default-features = false }
-xcm-builder = { path = "../../../../polkadot/xcm/xcm-builder", default-features = false }
-
-[dev-dependencies]
-sp-io = { path = "../../../../substrate/primitives/io" }
-sp-std = { path = "../../../../substrate/primitives/std" }
-
-[features]
-default = [ "std" ]
-std = [
-	"bp-xcm-bridge-hub-router/std",
-	"codec/std",
-	"frame-benchmarking/std",
-	"frame-support/std",
-	"frame-system/std",
-	"log/std",
-	"scale-info/std",
-	"sp-core/std",
-	"sp-runtime/std",
-	"sp-std/std",
-	"xcm-builder/std",
-	"xcm/std",
-]
-runtime-benchmarks = [
-	"frame-benchmarking/runtime-benchmarks",
-	"xcm-builder/runtime-benchmarks",
-]
-try-runtime = [ "frame-support/try-runtime", "frame-system/try-runtime" ]
diff --git a/cumulus/bridges/primitives/header-chain/tests/tests.rs b/cumulus/bridges/primitives/header-chain/tests/tests.rs
deleted file mode 100644
index 7c525a9303adcd3ca9c9d469f19da59e030cad50..0000000000000000000000000000000000000000
--- a/cumulus/bridges/primitives/header-chain/tests/tests.rs
+++ /dev/null
@@ -1,7 +0,0 @@
-mod justification {
-	mod equivocation;
-	mod optimizer;
-	mod strict;
-}
-
-mod implementation_match;
diff --git a/cumulus/bridges/rustfmt.toml b/cumulus/bridges/rustfmt.toml
deleted file mode 100644
index 082150daf04ee39ada660c315fd0f5bbcf99dea0..0000000000000000000000000000000000000000
--- a/cumulus/bridges/rustfmt.toml
+++ /dev/null
@@ -1,24 +0,0 @@
-# Basic
-hard_tabs = true
-max_width = 100
-use_small_heuristics = "Max"
-# Imports
-imports_granularity = "Crate"
-reorder_imports = true
-# Consistency
-newline_style = "Unix"
-# Format comments
-comment_width = 100
-wrap_comments = true
-# Misc
-chain_width = 80
-spaces_around_ranges = false
-binop_separator = "Back"
-reorder_impl_items = false
-match_arm_leading_pipes = "Preserve"
-match_arm_blocks = false
-match_block_trailing_comma = true
-trailing_comma = "Vertical"
-trailing_semicolon = false
-use_field_init_shorthand = true
-
diff --git a/cumulus/client/cli/Cargo.toml b/cumulus/client/cli/Cargo.toml
index f22d82f5be278ac13435434770b7114e0f31d74d..5dd18f0c156d1581c09d73e2ab9d6422dbe9ab4c 100644
--- a/cumulus/client/cli/Cargo.toml
+++ b/cumulus/client/cli/Cargo.toml
@@ -1,11 +1,11 @@
 [package]
 name = "cumulus-client-cli"
 version = "0.1.0"
-authors = ["Parity Technologies <admin@parity.io>"]
-edition = "2021"
+authors.workspace = true
+edition.workspace = true
 
 [dependencies]
-clap = { version = "4.3.24", features = ["derive"] }
+clap = { version = "4.4.6", features = ["derive"] }
 codec = { package = "parity-scale-codec", version = "3.0.0" }
 url = "2.4.0"
 
diff --git a/cumulus/client/cli/src/lib.rs b/cumulus/client/cli/src/lib.rs
index 3ad68eb04ead3722489122155eaa483250360d06..1b18ed064373fdd58224b70da022a969ad641eb6 100644
--- a/cumulus/client/cli/src/lib.rs
+++ b/cumulus/client/cli/src/lib.rs
@@ -1,4 +1,4 @@
-// Copyright 2021 Parity Technologies (UK) Ltd.
+// Copyright (C) Parity Technologies (UK) Ltd.
 // This file is part of Cumulus.
 
 // Cumulus is free software: you can redistribute it and/or modify
diff --git a/cumulus/client/collator/Cargo.toml b/cumulus/client/collator/Cargo.toml
index 2866793a21b55be3592d5ca81eead0b95c7a0b28..1d87efa443ce38f6b82a78d56c0fd090294e63d0 100644
--- a/cumulus/client/collator/Cargo.toml
+++ b/cumulus/client/collator/Cargo.toml
@@ -1,8 +1,8 @@
 [package]
 name = "cumulus-client-collator"
 version = "0.1.0"
-authors = ["Parity Technologies <admin@parity.io>"]
-edition = "2021"
+authors.workspace = true
+edition.workspace = true
 
 [dependencies]
 parking_lot = "0.12.1"
diff --git a/cumulus/client/collator/src/lib.rs b/cumulus/client/collator/src/lib.rs
index 647107a7c7c73a58c7301cd26a461da3c3d7354e..f17ae488310608d461238a134597cd875311ba6b 100644
--- a/cumulus/client/collator/src/lib.rs
+++ b/cumulus/client/collator/src/lib.rs
@@ -1,4 +1,4 @@
-// Copyright 2019-2021 Parity Technologies (UK) Ltd.
+// Copyright (C) Parity Technologies (UK) Ltd.
 // This file is part of Cumulus.
 
 // Substrate is free software: you can redistribute it and/or modify
diff --git a/cumulus/client/collator/src/service.rs b/cumulus/client/collator/src/service.rs
index c798cb84c23fd9a5f64df6b752b1048e7c6f98ab..c06be006fc17fd5153f0c0478a6786692f841ecb 100644
--- a/cumulus/client/collator/src/service.rs
+++ b/cumulus/client/collator/src/service.rs
@@ -1,4 +1,4 @@
-// Copyright 2023 Parity Technologies (UK) Ltd.
+// Copyright (C) Parity Technologies (UK) Ltd.
 // This file is part of Cumulus.
 
 // Cumulus is free software: you can redistribute it and/or modify
diff --git a/cumulus/client/consensus/aura/Cargo.toml b/cumulus/client/consensus/aura/Cargo.toml
index d5781d5ed8125ca99a59d4a3746c4f1e253a053f..8239a498746e3cfd8bda6190b125c95a17ebe735 100644
--- a/cumulus/client/consensus/aura/Cargo.toml
+++ b/cumulus/client/consensus/aura/Cargo.toml
@@ -2,15 +2,15 @@
 name = "cumulus-client-consensus-aura"
 description = "AURA consensus algorithm for parachains"
 version = "0.1.0"
-authors = ["Parity Technologies <admin@parity.io>"]
-edition = "2021"
+authors.workspace = true
+edition.workspace = true
 
 [dependencies]
 async-trait = "0.1.73"
 codec = { package = "parity-scale-codec", version = "3.0.0", features = [ "derive" ] }
 futures = "0.3.28"
 tracing = "0.1.37"
-lru = "0.10.0"
+schnellru = "0.2.1"
 
 # Substrate
 sc-client-api = { path = "../../../../substrate/client/api" }
diff --git a/cumulus/client/consensus/aura/src/collator.rs b/cumulus/client/consensus/aura/src/collator.rs
index 37cf1ea57c3d5dca7f128c89e4578f515de97cdc..b00c3952e2bc90e057dc464ac4b9179927cd67da 100644
--- a/cumulus/client/consensus/aura/src/collator.rs
+++ b/cumulus/client/consensus/aura/src/collator.rs
@@ -1,4 +1,4 @@
-// Copyright 2023 Parity Technologies (UK) Ltd.
+// Copyright (C) Parity Technologies (UK) Ltd.
 // This file is part of Cumulus.
 
 // Cumulus is free software: you can redistribute it and/or modify
diff --git a/cumulus/client/consensus/aura/src/collators/basic.rs b/cumulus/client/consensus/aura/src/collators/basic.rs
index d6f30aa672b51b187b2694ac04e5920514afbd21..3c904915ceafb9b97fa6493d4db21b8b1609585b 100644
--- a/cumulus/client/consensus/aura/src/collators/basic.rs
+++ b/cumulus/client/consensus/aura/src/collators/basic.rs
@@ -1,4 +1,4 @@
-// Copyright 2023 Parity Technologies (UK) Ltd.
+// Copyright (C) Parity Technologies (UK) Ltd.
 // This file is part of Cumulus.
 
 // Cumulus is free software: you can redistribute it and/or modify
diff --git a/cumulus/client/consensus/aura/src/collators/lookahead.rs b/cumulus/client/consensus/aura/src/collators/lookahead.rs
index 9663ef5ad3ab238afbd883b4c3a0507000fef892..57cd646fbcdef58fca265454eeeb677c35beee7b 100644
--- a/cumulus/client/consensus/aura/src/collators/lookahead.rs
+++ b/cumulus/client/consensus/aura/src/collators/lookahead.rs
@@ -1,4 +1,4 @@
-// Copyright 2023 Parity Technologies (UK) Ltd.
+// Copyright (C) Parity Technologies (UK) Ltd.
 // This file is part of Cumulus.
 
 // Cumulus is free software: you can redistribute it and/or modify
@@ -34,7 +34,8 @@
 use codec::{Codec, Encode};
 use cumulus_client_collator::service::ServiceInterface as CollatorServiceInterface;
 use cumulus_client_consensus_common::{
-	self as consensus_common, ParachainBlockImportMarker, ParentSearchParams,
+	self as consensus_common, load_abridged_host_configuration, ParachainBlockImportMarker,
+	ParentSearchParams,
 };
 use cumulus_client_consensus_proposer::ProposerInterface;
 use cumulus_primitives_aura::AuraUnincludedSegmentApi;
@@ -44,11 +45,13 @@ use cumulus_primitives_core::{
 use cumulus_relay_chain_interface::RelayChainInterface;
 
 use polkadot_node_primitives::SubmitCollationParams;
-use polkadot_node_subsystem::messages::CollationGenerationMessage;
+use polkadot_node_subsystem::messages::{
+	CollationGenerationMessage, RuntimeApiMessage, RuntimeApiRequest,
+};
 use polkadot_overseer::Handle as OverseerHandle;
 use polkadot_primitives::{CollatorPair, Id as ParaId, OccupiedCoreAssumption};
 
-use futures::prelude::*;
+use futures::{channel::oneshot, prelude::*};
 use sc_client_api::{backend::AuxStore, BlockBackend, BlockOf};
 use sc_consensus::BlockImport;
 use sc_consensus_aura::standalone as aura_internal;
@@ -180,6 +183,17 @@ where
 		while let Some(relay_parent_header) = import_notifications.next().await {
 			let relay_parent = relay_parent_header.hash();
 
+			if !is_para_scheduled(relay_parent, params.para_id, &mut params.overseer_handle).await {
+				tracing::trace!(
+					target: crate::LOG_TARGET,
+					?relay_parent,
+					?params.para_id,
+					"Para is not scheduled on any core, skipping import notification",
+				);
+
+				continue
+			}
+
 			let max_pov_size = match params
 				.relay_client
 				.persisted_validation_data(
@@ -416,16 +430,68 @@ where
 	Some(SlotClaim::unchecked::<P>(author_pub, slot, timestamp))
 }
 
+/// Reads allowed ancestry length parameter from the relay chain storage at the given relay parent.
+///
+/// Falls back to 0 in case of an error.
 async fn max_ancestry_lookback(
-	_relay_parent: PHash,
-	_relay_client: &impl RelayChainInterface,
+	relay_parent: PHash,
+	relay_client: &impl RelayChainInterface,
 ) -> usize {
-	// TODO [https://github.com/paritytech/cumulus/issues/2706]
-	// We need to read the relay-chain state to know what the maximum
-	// age truly is, but that depends on those pallets existing.
-	//
-	// For now, just provide the conservative value of '2'.
-	// Overestimating can cause problems, as we'd be building on forks of the
-	// chain that can never get included. Underestimating is less of an issue.
-	2
+	match load_abridged_host_configuration(relay_parent, relay_client).await {
+		Ok(Some(config)) => config.async_backing_params.allowed_ancestry_len as usize,
+		Ok(None) => {
+			tracing::error!(
+				target: crate::LOG_TARGET,
+				"Active config is missing in relay chain storage",
+			);
+			0
+		},
+		Err(err) => {
+			tracing::error!(
+				target: crate::LOG_TARGET,
+				?err,
+				?relay_parent,
+				"Failed to read active config from relay chain client",
+			);
+			0
+		},
+	}
+}
+
+// Checks if there exists a scheduled core for the para at the provided relay parent.
+//
+// Falls back to `false` in case of an error.
+async fn is_para_scheduled(
+	relay_parent: PHash,
+	para_id: ParaId,
+	overseer_handle: &mut OverseerHandle,
+) -> bool {
+	let (tx, rx) = oneshot::channel();
+	let request = RuntimeApiRequest::AvailabilityCores(tx);
+	overseer_handle
+		.send_msg(RuntimeApiMessage::Request(relay_parent, request), "LookaheadCollator")
+		.await;
+
+	let cores = match rx.await {
+		Ok(Ok(cores)) => cores,
+		Ok(Err(error)) => {
+			tracing::error!(
+				target: crate::LOG_TARGET,
+				?error,
+				?relay_parent,
+				"Failed to query availability cores runtime API",
+			);
+			return false
+		},
+		Err(oneshot::Canceled) => {
+			tracing::error!(
+				target: crate::LOG_TARGET,
+				?relay_parent,
+				"Sender for availability cores runtime request dropped",
+			);
+			return false
+		},
+	};
+
+	cores.iter().any(|core| core.para_id() == Some(para_id))
 }
diff --git a/cumulus/client/consensus/aura/src/collators/mod.rs b/cumulus/client/consensus/aura/src/collators/mod.rs
index 55128dfdc8502c8795109d256e7c223ece59ea28..4c7b759daf736f69de48b586b082a7d01534d7e3 100644
--- a/cumulus/client/consensus/aura/src/collators/mod.rs
+++ b/cumulus/client/consensus/aura/src/collators/mod.rs
@@ -1,4 +1,4 @@
-// Copyright 2023 Parity Technologies (UK) Ltd.
+// Copyright (C) Parity Technologies (UK) Ltd.
 // This file is part of Cumulus.
 
 // Cumulus is free software: you can redistribute it and/or modify
diff --git a/cumulus/client/consensus/aura/src/equivocation_import_queue.rs b/cumulus/client/consensus/aura/src/equivocation_import_queue.rs
index 682b7b91a655696b23a6d80dda068eca9669660f..5cd65ed5546bae392df811e8043ac44214f6a7eb 100644
--- a/cumulus/client/consensus/aura/src/equivocation_import_queue.rs
+++ b/cumulus/client/consensus/aura/src/equivocation_import_queue.rs
@@ -1,4 +1,4 @@
-// Copyright 2023 Parity Technologies (UK) Ltd.
+// Copyright (C) Parity Technologies (UK) Ltd.
 // This file is part of Cumulus.
 
 // Cumulus is free software: you can redistribute it and/or modify
@@ -21,7 +21,7 @@
 /// should be thrown out and which ones should be kept.
 use codec::Codec;
 use cumulus_client_consensus_common::ParachainBlockImportMarker;
-use lru::LruCache;
+use schnellru::{ByLength, LruMap};
 
 use sc_consensus::{
 	import_queue::{BasicQueue, Verifier as VerifierT},
@@ -36,27 +36,28 @@ use sp_consensus_aura::{AuraApi, Slot, SlotDuration};
 use sp_core::crypto::Pair;
 use sp_inherents::{CreateInherentDataProviders, InherentDataProvider};
 use sp_runtime::traits::{Block as BlockT, Header as HeaderT};
-use std::{fmt::Debug, num::NonZeroUsize, sync::Arc};
+use std::{fmt::Debug, sync::Arc};
 
-const LRU_WINDOW: usize = 256;
+const LRU_WINDOW: u32 = 256;
 const EQUIVOCATION_LIMIT: usize = 16;
 
 struct NaiveEquivocationDefender {
-	cache: LruCache<u64, usize>,
+	cache: LruMap<u64, usize>,
 }
 
 impl Default for NaiveEquivocationDefender {
 	fn default() -> Self {
-		NaiveEquivocationDefender {
-			cache: LruCache::new(NonZeroUsize::new(LRU_WINDOW).expect("window > 0; qed")),
-		}
+		NaiveEquivocationDefender { cache: LruMap::new(ByLength::new(LRU_WINDOW)) }
 	}
 }
 
 impl NaiveEquivocationDefender {
 	// return `true` if equivocation is beyond the limit.
 	fn insert_and_check(&mut self, slot: Slot) -> bool {
-		let val = self.cache.get_or_insert_mut(*slot, || 0);
+		let val = self
+			.cache
+			.get_or_insert(*slot, || 0)
+			.expect("insertion with ByLength limiter always succeeds; qed");
 		if *val == EQUIVOCATION_LIMIT {
 			true
 		} else {
diff --git a/cumulus/client/consensus/aura/src/import_queue.rs b/cumulus/client/consensus/aura/src/import_queue.rs
index 2f422b9edb174cf00acbacc6c4cc53d29af18aee..2611eaf532f8ffadebc1c2932f429803e561924e 100644
--- a/cumulus/client/consensus/aura/src/import_queue.rs
+++ b/cumulus/client/consensus/aura/src/import_queue.rs
@@ -1,4 +1,4 @@
-// Copyright 2021 Parity Technologies (UK) Ltd.
+// Copyright (C) Parity Technologies (UK) Ltd.
 // This file is part of Cumulus.
 
 // Cumulus is free software: you can redistribute it and/or modify
diff --git a/cumulus/client/consensus/aura/src/lib.rs b/cumulus/client/consensus/aura/src/lib.rs
index 792f7b230d62e25093aa7fef0d10812e0f02c32f..6ededa7a92c11cb8c313f7da01017eeef256fb06 100644
--- a/cumulus/client/consensus/aura/src/lib.rs
+++ b/cumulus/client/consensus/aura/src/lib.rs
@@ -1,4 +1,4 @@
-// Copyright 2021 Parity Technologies (UK) Ltd.
+// Copyright (C) Parity Technologies (UK) Ltd.
 // This file is part of Cumulus.
 
 // Cumulus is free software: you can redistribute it and/or modify
diff --git a/cumulus/client/consensus/common/Cargo.toml b/cumulus/client/consensus/common/Cargo.toml
index 738434b910b648434fb5583d34314c04df3cc6bc..26d7ba1b142c07cd5a5e133d7e4594028755dccf 100644
--- a/cumulus/client/consensus/common/Cargo.toml
+++ b/cumulus/client/consensus/common/Cargo.toml
@@ -2,8 +2,8 @@
 name = "cumulus-client-consensus-common"
 description = "Cumulus specific common consensus implementations"
 version = "0.1.0"
-authors = ["Parity Technologies <admin@parity.io>"]
-edition = "2021"
+authors.workspace = true
+edition.workspace = true
 
 [dependencies]
 async-trait = "0.1.73"
diff --git a/cumulus/client/consensus/common/src/import_queue.rs b/cumulus/client/consensus/common/src/import_queue.rs
index e54598ac8568765e2d31b6b82913032622c7d13e..311a2b7ad8cfddf50abe0b18aeb5bf5f1f193c1d 100644
--- a/cumulus/client/consensus/common/src/import_queue.rs
+++ b/cumulus/client/consensus/common/src/import_queue.rs
@@ -1,4 +1,4 @@
-// Copyright 2019-2023 Parity Technologies (UK) Ltd.
+// Copyright (C) Parity Technologies (UK) Ltd.
 // This file is part of Cumulus.
 
 // Cumulus is free software: you can redistribute it and/or modify
diff --git a/cumulus/client/consensus/common/src/level_monitor.rs b/cumulus/client/consensus/common/src/level_monitor.rs
index 8a6bbef62f35752a530089297f364698a09e818c..5f115ec2c4a3c885b60da5f5dd9f0fe3faefab16 100644
--- a/cumulus/client/consensus/common/src/level_monitor.rs
+++ b/cumulus/client/consensus/common/src/level_monitor.rs
@@ -1,4 +1,4 @@
-// Copyright 2022 Parity Technologies (UK) Ltd.
+// Copyright (C) Parity Technologies (UK) Ltd.
 // This file is part of Cumulus.
 
 // Cumulus is free software: you can redistribute it and/or modify
diff --git a/cumulus/client/consensus/common/src/lib.rs b/cumulus/client/consensus/common/src/lib.rs
index 49e157481e7aa647eab0b1d7517248ba4a4812c2..08bceabb2bd4a49ac8917e82caf1b97cd9eac183 100644
--- a/cumulus/client/consensus/common/src/lib.rs
+++ b/cumulus/client/consensus/common/src/lib.rs
@@ -1,4 +1,4 @@
-// Copyright 2019-2021 Parity Technologies (UK) Ltd.
+// Copyright (C) Parity Technologies (UK) Ltd.
 // This file is part of Cumulus.
 
 // Cumulus is free software: you can redistribute it and/or modify
@@ -20,8 +20,8 @@ use polkadot_primitives::{
 };
 
 use cumulus_primitives_core::{
-	relay_chain::{BlockId as RBlockId, OccupiedCoreAssumption},
-	ParaId,
+	relay_chain::{self, BlockId as RBlockId, OccupiedCoreAssumption},
+	AbridgedHostConfiguration, ParaId,
 };
 use cumulus_relay_chain_interface::{RelayChainError, RelayChainInterface};
 
@@ -211,6 +211,7 @@ pub trait ParachainBlockImportMarker {}
 impl<B: BlockT, BI, BE> ParachainBlockImportMarker for ParachainBlockImport<B, BI, BE> {}
 
 /// Parameters when searching for suitable parents to build on top of.
+#[derive(Debug)]
 pub struct ParentSearchParams {
 	/// The relay-parent that is intended to be used.
 	pub relay_parent: PHash,
@@ -228,6 +229,7 @@ pub struct ParentSearchParams {
 }
 
 /// A potential parent block returned from [`find_potential_parents`]
+#[derive(Debug, PartialEq)]
 pub struct PotentialParent<B: BlockT> {
 	/// The hash of the block.
 	pub hash: B::Hash,
@@ -412,3 +414,18 @@ pub fn relay_slot_and_timestamp(
 		})
 		.ok()
 }
+
+/// Reads abridged host configuration from the relay chain storage at the given relay parent.
+pub async fn load_abridged_host_configuration(
+	relay_parent: PHash,
+	relay_client: &impl RelayChainInterface,
+) -> Result<Option<AbridgedHostConfiguration>, RelayChainError> {
+	relay_client
+		.get_storage_by_key(relay_parent, relay_chain::well_known_keys::ACTIVE_CONFIG)
+		.await?
+		.map(|bytes| {
+			AbridgedHostConfiguration::decode(&mut &bytes[..])
+				.map_err(RelayChainError::DeserializationError)
+		})
+		.transpose()
+}
diff --git a/cumulus/client/consensus/common/src/parachain_consensus.rs b/cumulus/client/consensus/common/src/parachain_consensus.rs
index 5bbaa2893cff8c2c76c843220fde28945c3d9b0f..b4b315bb32be6ea18d7ae9399cafe4640096f2b4 100644
--- a/cumulus/client/consensus/common/src/parachain_consensus.rs
+++ b/cumulus/client/consensus/common/src/parachain_consensus.rs
@@ -1,4 +1,4 @@
-// Copyright 2019-2021 Parity Technologies (UK) Ltd.
+// Copyright (C) Parity Technologies (UK) Ltd.
 // This file is part of Cumulus.
 
 // Cumulus is free software: you can redistribute it and/or modify
diff --git a/cumulus/client/consensus/common/src/tests.rs b/cumulus/client/consensus/common/src/tests.rs
index b6fcc4a17643bf1ec1a9ead19e5cf30f4f05258c..9658a0add790da01ad9fe83f11956d1fbd88523a 100644
--- a/cumulus/client/consensus/common/src/tests.rs
+++ b/cumulus/client/consensus/common/src/tests.rs
@@ -1,4 +1,4 @@
-// Copyright 2019-2021 Parity Technologies (UK) Ltd.
+// Copyright (C) Parity Technologies (UK) Ltd.
 // This file is part of Cumulus.
 
 // Cumulus is free software: you can redistribute it and/or modify
@@ -19,7 +19,10 @@ use crate::*;
 use async_trait::async_trait;
 use codec::Encode;
 use cumulus_client_pov_recovery::RecoveryKind;
-use cumulus_primitives_core::{relay_chain::BlockId, InboundDownwardMessage, InboundHrmpMessage};
+use cumulus_primitives_core::{
+	relay_chain::{self, BlockId},
+	CumulusDigestItem, InboundDownwardMessage, InboundHrmpMessage,
+};
 use cumulus_relay_chain_interface::{
 	CommittedCandidateReceipt, OccupiedCoreAssumption, OverseerHandle, PHeader, ParaId,
 	RelayChainInterface, RelayChainResult, SessionIndex, StorageValue, ValidatorId,
@@ -42,12 +45,21 @@ use std::{
 	time::Duration,
 };
 
+fn relay_block_num_from_hash(hash: &PHash) -> relay_chain::BlockNumber {
+	hash.to_low_u64_be() as u32
+}
+
+fn relay_hash_from_block_num(block_number: relay_chain::BlockNumber) -> PHash {
+	PHash::from_low_u64_be(block_number as u64)
+}
+
 struct RelaychainInner {
 	new_best_heads: Option<mpsc::UnboundedReceiver<Header>>,
 	finalized_heads: Option<mpsc::UnboundedReceiver<Header>>,
 	new_best_heads_sender: mpsc::UnboundedSender<Header>,
 	finalized_heads_sender: mpsc::UnboundedSender<Header>,
 	relay_chain_hash_to_header: HashMap<PHash, Header>,
+	relay_chain_hash_to_header_pending: HashMap<PHash, Header>,
 }
 
 impl RelaychainInner {
@@ -61,6 +73,7 @@ impl RelaychainInner {
 			new_best_heads: Some(new_best_heads),
 			finalized_heads: Some(finalized_heads),
 			relay_chain_hash_to_header: Default::default(),
+			relay_chain_hash_to_header_pending: Default::default(),
 		}
 	}
 }
@@ -110,20 +123,17 @@ impl RelayChainInterface for Relaychain {
 		&self,
 		hash: PHash,
 		_: ParaId,
-		_: OccupiedCoreAssumption,
+		assumption: OccupiedCoreAssumption,
 	) -> RelayChainResult<Option<PersistedValidationData>> {
-		Ok(Some(PersistedValidationData {
-			parent_head: self
-				.inner
-				.lock()
-				.unwrap()
-				.relay_chain_hash_to_header
-				.get(&hash)
-				.unwrap()
-				.encode()
-				.into(),
-			..Default::default()
-		}))
+		let inner = self.inner.lock().unwrap();
+		let relay_to_header = match assumption {
+			OccupiedCoreAssumption::Included => &inner.relay_chain_hash_to_header_pending,
+			_ => &inner.relay_chain_hash_to_header,
+		};
+		let Some(parent_head) = relay_to_header.get(&hash).map(|head| head.encode().into()) else {
+			return Ok(None)
+		};
+		Ok(Some(PersistedValidationData { parent_head, ..Default::default() }))
 	}
 
 	async fn candidate_pending_availability(
@@ -135,7 +145,7 @@ impl RelayChainInterface for Relaychain {
 	}
 
 	async fn session_index_for_child(&self, _: PHash) -> RelayChainResult<SessionIndex> {
-		unimplemented!("Not needed for test")
+		Ok(0)
 	}
 
 	async fn import_notification_stream(
@@ -210,8 +220,23 @@ impl RelayChainInterface for Relaychain {
 			.boxed())
 	}
 
-	async fn header(&self, _block_id: BlockId) -> RelayChainResult<Option<PHeader>> {
-		unimplemented!("Not needed for test")
+	async fn header(&self, block_id: BlockId) -> RelayChainResult<Option<PHeader>> {
+		let number = match block_id {
+			BlockId::Hash(hash) => relay_block_num_from_hash(&hash),
+			BlockId::Number(block_number) => block_number,
+		};
+		let parent_hash = number
+			.checked_sub(1)
+			.map(relay_hash_from_block_num)
+			.unwrap_or_else(|| PHash::zero());
+
+		Ok(Some(PHeader {
+			parent_hash,
+			number,
+			digest: sp_runtime::Digest::default(),
+			state_root: PHash::zero(),
+			extrinsics_root: PHash::zero(),
+		}))
 	}
 }
 
@@ -238,6 +263,7 @@ fn build_block<B: InitBlockBuilder>(
 	sproof: RelayStateSproofBuilder,
 	at: Option<Hash>,
 	timestamp: Option<u64>,
+	relay_parent: Option<PHash>,
 ) -> Block {
 	let builder = match at {
 		Some(at) => match timestamp {
@@ -249,10 +275,17 @@ fn build_block<B: InitBlockBuilder>(
 
 	let mut block = builder.build().unwrap().block;
 
-	// Simulate some form of post activity (like a Seal or Other generic things).
-	// This is mostly used to exercise the `LevelMonitor` correct behavior.
-	// (in practice we want that header post-hash != pre-hash)
-	block.header.digest.push(sp_runtime::DigestItem::Other(vec![1, 2, 3]));
+	if let Some(relay_parent) = relay_parent {
+		block
+			.header
+			.digest
+			.push(CumulusDigestItem::RelayParent(relay_parent).to_digest_item());
+	} else {
+		// Simulate some form of post activity (like a Seal or Other generic things).
+		// This is mostly used to exercise the `LevelMonitor` correct behavior.
+		// (in practice we want that header post-hash != pre-hash)
+		block.header.digest.push(sp_runtime::DigestItem::Other(vec![1, 2, 3]));
+	}
 
 	block
 }
@@ -292,13 +325,14 @@ fn build_and_import_block_ext<I: BlockImport<Block>>(
 	importer: &mut I,
 	at: Option<Hash>,
 	timestamp: Option<u64>,
+	relay_parent: Option<PHash>,
 ) -> Block {
 	let sproof = match at {
 		None => sproof_with_best_parent(client),
 		Some(at) => sproof_with_parent_by_hash(client, at),
 	};
 
-	let block = build_block(client, sproof, at, timestamp);
+	let block = build_block(client, sproof, at, timestamp, relay_parent);
 	import_block_sync(importer, block.clone(), origin, import_as_best);
 	block
 }
@@ -311,6 +345,7 @@ fn build_and_import_block(mut client: Arc<Client>, import_as_best: bool) -> Bloc
 		&mut client,
 		None,
 		None,
+		None,
 	)
 }
 
@@ -372,7 +407,7 @@ fn follow_new_best_with_dummy_recovery_works() {
 		let header = client.header(best).ok().flatten().expect("No header for best");
 		sproof_with_parent(HeadData(header.encode()))
 	};
-	let block = build_block(&*client, sproof, None, None);
+	let block = build_block(&*client, sproof, None, None, None);
 	let block_clone = block.clone();
 	let client_clone = client.clone();
 
@@ -544,7 +579,7 @@ fn follow_new_best_sets_best_after_it_is_imported() {
 		block_import_params.fork_choice = Some(ForkChoiceStrategy::Custom(false));
 		block_import_params.body = Some(body);
 
-		// Now import the unkown block to make it "known"
+		// Now import the unknown block to make it "known"
 		client.import_block(block_import_params).await.unwrap();
 
 		loop {
@@ -638,6 +673,7 @@ fn prune_blocks_on_level_overflow() {
 		&mut para_import,
 		None,
 		None,
+		None,
 	);
 	let id0 = block0.header.hash();
 
@@ -650,6 +686,7 @@ fn prune_blocks_on_level_overflow() {
 				&mut para_import,
 				Some(id0),
 				Some(i as u64 * TIMESTAMP_MULTIPLIER),
+				None,
 			)
 		})
 		.collect::<Vec<_>>();
@@ -664,6 +701,7 @@ fn prune_blocks_on_level_overflow() {
 				&mut para_import,
 				Some(id10),
 				Some(i as u64 * TIMESTAMP_MULTIPLIER),
+				None,
 			)
 		})
 		.collect::<Vec<_>>();
@@ -692,6 +730,7 @@ fn prune_blocks_on_level_overflow() {
 		&mut para_import,
 		Some(id0),
 		Some(LEVEL_LIMIT as u64 * TIMESTAMP_MULTIPLIER),
+		None,
 	);
 
 	// Expected scenario
@@ -711,6 +750,7 @@ fn prune_blocks_on_level_overflow() {
 		&mut para_import,
 		Some(id0),
 		Some(2 * LEVEL_LIMIT as u64 * TIMESTAMP_MULTIPLIER),
+		None,
 	);
 
 	// Expected scenario
@@ -749,6 +789,7 @@ fn restore_limit_monitor() {
 		&mut para_import,
 		None,
 		None,
+		None,
 	);
 	let id00 = block00.header.hash();
 
@@ -761,6 +802,7 @@ fn restore_limit_monitor() {
 				&mut para_import,
 				Some(id00),
 				Some(i as u64 * TIMESTAMP_MULTIPLIER),
+				None,
 			)
 		})
 		.collect::<Vec<_>>();
@@ -775,6 +817,7 @@ fn restore_limit_monitor() {
 				&mut para_import,
 				Some(id10),
 				Some(i as u64 * TIMESTAMP_MULTIPLIER),
+				None,
 			)
 		})
 		.collect::<Vec<_>>();
@@ -809,6 +852,7 @@ fn restore_limit_monitor() {
 		&mut para_import,
 		Some(id00),
 		Some(LEVEL_LIMIT as u64 * TIMESTAMP_MULTIPLIER),
+		None,
 	);
 
 	// Expected scenario
@@ -830,3 +874,487 @@ fn restore_limit_monitor() {
 	}));
 	assert_eq!(*monitor.freshness.get(&block13.header.hash()).unwrap(), monitor.import_counter);
 }
+
+#[test]
+fn find_potential_parents_in_allowed_ancestry() {
+	sp_tracing::try_init_simple();
+
+	let backend = Arc::new(Backend::new_test(1000, 1));
+	let client = Arc::new(TestClientBuilder::with_backend(backend.clone()).build());
+	let mut para_import = ParachainBlockImport::new(client.clone(), backend.clone());
+
+	let relay_parent = relay_hash_from_block_num(10);
+	let block = build_and_import_block_ext(
+		&client,
+		BlockOrigin::Own,
+		true,
+		&mut para_import,
+		None,
+		None,
+		Some(relay_parent),
+	);
+
+	let relay_chain = Relaychain::new();
+	{
+		let included_map = &mut relay_chain.inner.lock().unwrap().relay_chain_hash_to_header;
+		included_map.insert(relay_parent, block.header().clone());
+	}
+
+	let potential_parents = block_on(find_potential_parents(
+		ParentSearchParams {
+			relay_parent,
+			para_id: ParaId::from(100),
+			ancestry_lookback: 0,
+			max_depth: 0,
+			ignore_alternative_branches: true,
+		},
+		&*backend,
+		&relay_chain,
+	))
+	.unwrap();
+	assert_eq!(potential_parents.len(), 1);
+	let parent = &potential_parents[0];
+
+	assert_eq!(parent.hash, block.hash());
+	assert_eq!(&parent.header, block.header());
+	assert_eq!(parent.depth, 0);
+	assert!(parent.aligned_with_pending);
+
+	// New block is not pending or included.
+	let block_relay_parent = relay_hash_from_block_num(11);
+	let search_relay_parent = relay_hash_from_block_num(13);
+	{
+		let included_map = &mut relay_chain.inner.lock().unwrap().relay_chain_hash_to_header;
+		included_map.insert(search_relay_parent, block.header().clone());
+	}
+	let block = build_and_import_block_ext(
+		&client,
+		BlockOrigin::Own,
+		true,
+		&mut para_import,
+		Some(block.header().hash()),
+		None,
+		Some(block_relay_parent),
+	);
+	let potential_parents = block_on(find_potential_parents(
+		ParentSearchParams {
+			relay_parent: search_relay_parent,
+			para_id: ParaId::from(100),
+			ancestry_lookback: 2,
+			max_depth: 1,
+			ignore_alternative_branches: true,
+		},
+		&*backend,
+		&relay_chain,
+	))
+	.unwrap();
+
+	assert_eq!(potential_parents.len(), 2);
+	let parent = &potential_parents[1];
+
+	assert_eq!(parent.hash, block.hash());
+	assert_eq!(&parent.header, block.header());
+	assert_eq!(parent.depth, 1);
+	assert!(parent.aligned_with_pending);
+
+	// Reduce allowed ancestry.
+	let potential_parents = block_on(find_potential_parents(
+		ParentSearchParams {
+			relay_parent: search_relay_parent,
+			para_id: ParaId::from(100),
+			ancestry_lookback: 1,
+			max_depth: 1,
+			ignore_alternative_branches: true,
+		},
+		&*backend,
+		&relay_chain,
+	))
+	.unwrap();
+	assert_eq!(potential_parents.len(), 1);
+	let parent = &potential_parents[0];
+	assert_ne!(parent.hash, block.hash());
+}
+
+/// Tests that pending availability block is always potential parent.
+#[test]
+fn find_potential_pending_parent() {
+	sp_tracing::try_init_simple();
+
+	let backend = Arc::new(Backend::new_test(1000, 1));
+	let client = Arc::new(TestClientBuilder::with_backend(backend.clone()).build());
+	let mut para_import = ParachainBlockImport::new(client.clone(), backend.clone());
+
+	let relay_parent = relay_hash_from_block_num(10);
+	let included_block = build_and_import_block_ext(
+		&client,
+		BlockOrigin::Own,
+		true,
+		&mut para_import,
+		None,
+		None,
+		Some(relay_parent),
+	);
+	let relay_parent = relay_hash_from_block_num(12);
+	let pending_block = build_and_import_block_ext(
+		&client,
+		BlockOrigin::Own,
+		true,
+		&mut para_import,
+		Some(included_block.header().hash()),
+		None,
+		Some(relay_parent),
+	);
+
+	let relay_chain = Relaychain::new();
+	let search_relay_parent = relay_hash_from_block_num(15);
+	{
+		let relay_inner = &mut relay_chain.inner.lock().unwrap();
+		relay_inner
+			.relay_chain_hash_to_header
+			.insert(search_relay_parent, included_block.header().clone());
+		relay_inner
+			.relay_chain_hash_to_header_pending
+			.insert(search_relay_parent, pending_block.header().clone());
+	}
+
+	let potential_parents = block_on(find_potential_parents(
+		ParentSearchParams {
+			relay_parent: search_relay_parent,
+			para_id: ParaId::from(100),
+			ancestry_lookback: 0,
+			max_depth: 1,
+			ignore_alternative_branches: true,
+		},
+		&*backend,
+		&relay_chain,
+	))
+	.unwrap();
+	assert_eq!(potential_parents.len(), 2);
+	let included_parent = &potential_parents[0];
+
+	assert_eq!(included_parent.hash, included_block.hash());
+	assert_eq!(&included_parent.header, included_block.header());
+	assert_eq!(included_parent.depth, 0);
+	assert!(included_parent.aligned_with_pending);
+
+	let pending_parent = &potential_parents[1];
+
+	assert_eq!(pending_parent.hash, pending_block.hash());
+	assert_eq!(&pending_parent.header, pending_block.header());
+	assert_eq!(pending_parent.depth, 1);
+	assert!(pending_parent.aligned_with_pending);
+}
+
+#[test]
+fn find_potential_parents_with_max_depth() {
+	sp_tracing::try_init_simple();
+
+	const NON_INCLUDED_CHAIN_LEN: usize = 5;
+
+	let backend = Arc::new(Backend::new_test(1000, 1));
+	let client = Arc::new(TestClientBuilder::with_backend(backend.clone()).build());
+	let mut para_import = ParachainBlockImport::new(client.clone(), backend.clone());
+
+	let relay_parent = relay_hash_from_block_num(10);
+	let included_block = build_and_import_block_ext(
+		&client,
+		BlockOrigin::Own,
+		true,
+		&mut para_import,
+		None,
+		None,
+		Some(relay_parent),
+	);
+
+	let relay_chain = Relaychain::new();
+	{
+		let included_map = &mut relay_chain.inner.lock().unwrap().relay_chain_hash_to_header;
+		included_map.insert(relay_parent, included_block.header().clone());
+	}
+
+	let mut blocks = Vec::new();
+	let mut parent = included_block.header().hash();
+	for _ in 0..NON_INCLUDED_CHAIN_LEN {
+		let block = build_and_import_block_ext(
+			&client,
+			BlockOrigin::Own,
+			true,
+			&mut para_import,
+			Some(parent),
+			None,
+			Some(relay_parent),
+		);
+		parent = block.header().hash();
+		blocks.push(block);
+	}
+	for max_depth in 0..=NON_INCLUDED_CHAIN_LEN {
+		let potential_parents = block_on(find_potential_parents(
+			ParentSearchParams {
+				relay_parent,
+				para_id: ParaId::from(100),
+				ancestry_lookback: 0,
+				max_depth,
+				ignore_alternative_branches: true,
+			},
+			&*backend,
+			&relay_chain,
+		))
+		.unwrap();
+		assert_eq!(potential_parents.len(), max_depth + 1);
+		let expected_parents: Vec<_> =
+			std::iter::once(&included_block).chain(blocks.iter().take(max_depth)).collect();
+
+		for i in 0..(max_depth + 1) {
+			let parent = &potential_parents[i];
+			let expected = &expected_parents[i];
+
+			assert_eq!(parent.hash, expected.hash());
+			assert_eq!(&parent.header, expected.header());
+			assert_eq!(parent.depth, i);
+			assert!(parent.aligned_with_pending);
+		}
+	}
+}
+
+#[test]
+fn find_potential_parents_aligned_with_pending() {
+	sp_tracing::try_init_simple();
+
+	const NON_INCLUDED_CHAIN_LEN: usize = 5;
+
+	let backend = Arc::new(Backend::new_test(1000, 1));
+	let client = Arc::new(TestClientBuilder::with_backend(backend.clone()).build());
+	let mut para_import = ParachainBlockImport::new(client.clone(), backend.clone());
+
+	let relay_parent = relay_hash_from_block_num(10);
+	// Choose different relay parent for alternative chain to get new hashes.
+	let search_relay_parent = relay_hash_from_block_num(11);
+	let included_block = build_and_import_block_ext(
+		&client,
+		BlockOrigin::NetworkInitialSync,
+		true,
+		&mut para_import,
+		None,
+		None,
+		Some(relay_parent),
+	);
+	let pending_block = build_and_import_block_ext(
+		&client,
+		BlockOrigin::Own,
+		true,
+		&mut para_import,
+		Some(included_block.header().hash()),
+		None,
+		Some(relay_parent),
+	);
+
+	let relay_chain = Relaychain::new();
+	{
+		let relay_inner = &mut relay_chain.inner.lock().unwrap();
+		relay_inner
+			.relay_chain_hash_to_header
+			.insert(search_relay_parent, included_block.header().clone());
+		relay_inner
+			.relay_chain_hash_to_header_pending
+			.insert(search_relay_parent, pending_block.header().clone());
+	}
+
+	// Build two sibling chains from the included block.
+	let mut aligned_blocks = Vec::new();
+	let mut parent = pending_block.header().hash();
+	for _ in 1..NON_INCLUDED_CHAIN_LEN {
+		let block = build_and_import_block_ext(
+			&client,
+			BlockOrigin::Own,
+			true,
+			&mut para_import,
+			Some(parent),
+			None,
+			Some(relay_parent),
+		);
+		parent = block.header().hash();
+		aligned_blocks.push(block);
+	}
+
+	let mut alt_blocks = Vec::new();
+	let mut parent = included_block.header().hash();
+	for _ in 0..NON_INCLUDED_CHAIN_LEN {
+		let block = build_and_import_block_ext(
+			&client,
+			BlockOrigin::NetworkInitialSync,
+			true,
+			&mut para_import,
+			Some(parent),
+			None,
+			Some(search_relay_parent),
+		);
+		parent = block.header().hash();
+		alt_blocks.push(block);
+	}
+
+	// Ignore alternative branch:
+	for max_depth in 0..=NON_INCLUDED_CHAIN_LEN {
+		let potential_parents = block_on(find_potential_parents(
+			ParentSearchParams {
+				relay_parent: search_relay_parent,
+				para_id: ParaId::from(100),
+				ancestry_lookback: 1, // aligned chain is in ancestry.
+				max_depth,
+				ignore_alternative_branches: true,
+			},
+			&*backend,
+			&relay_chain,
+		))
+		.unwrap();
+		assert_eq!(potential_parents.len(), max_depth + 1);
+		let expected_parents: Vec<_> = [&included_block, &pending_block]
+			.into_iter()
+			.chain(aligned_blocks.iter())
+			.take(max_depth + 1)
+			.collect();
+
+		for i in 0..(max_depth + 1) {
+			let parent = &potential_parents[i];
+			let expected = &expected_parents[i];
+
+			assert_eq!(parent.hash, expected.hash());
+			assert_eq!(&parent.header, expected.header());
+			assert_eq!(parent.depth, i);
+			assert!(parent.aligned_with_pending);
+		}
+	}
+
+	// Do not ignore:
+	for max_depth in 0..=NON_INCLUDED_CHAIN_LEN {
+		let potential_parents = block_on(find_potential_parents(
+			ParentSearchParams {
+				relay_parent: search_relay_parent,
+				para_id: ParaId::from(100),
+				ancestry_lookback: 1, // aligned chain is in ancestry.
+				max_depth,
+				ignore_alternative_branches: false,
+			},
+			&*backend,
+			&relay_chain,
+		))
+		.unwrap();
+
+		let expected_len = 2 * max_depth + 1;
+		assert_eq!(potential_parents.len(), expected_len);
+		let expected_aligned: Vec<_> = [&included_block, &pending_block]
+			.into_iter()
+			.chain(aligned_blocks.iter())
+			.take(max_depth + 1)
+			.collect();
+		let expected_alt = alt_blocks.iter().take(max_depth);
+
+		let expected_parents: Vec<_> =
+			expected_aligned.clone().into_iter().chain(expected_alt).collect();
+		// Check correctness.
+		assert_eq!(expected_parents.len(), expected_len);
+
+		for i in 0..expected_len {
+			let parent = &potential_parents[i];
+			let expected = expected_parents
+				.iter()
+				.find(|block| block.header().hash() == parent.hash)
+				.expect("missing parent");
+
+			let is_aligned = expected_aligned.contains(&expected);
+
+			assert_eq!(parent.hash, expected.hash());
+			assert_eq!(&parent.header, expected.header());
+
+			assert_eq!(parent.aligned_with_pending, is_aligned);
+		}
+	}
+}
+
+/// Tests that no potential parent gets discarded if there's no pending availability block.
+#[test]
+fn find_potential_parents_aligned_no_pending() {
+	sp_tracing::try_init_simple();
+
+	const NON_INCLUDED_CHAIN_LEN: usize = 5;
+
+	let backend = Arc::new(Backend::new_test(1000, 1));
+	let client = Arc::new(TestClientBuilder::with_backend(backend.clone()).build());
+	let mut para_import = ParachainBlockImport::new(client.clone(), backend.clone());
+
+	let relay_parent = relay_hash_from_block_num(10);
+	// Choose different relay parent for alternative chain to get new hashes.
+	let search_relay_parent = relay_hash_from_block_num(11);
+	let included_block = build_and_import_block_ext(
+		&client,
+		BlockOrigin::Own,
+		true,
+		&mut para_import,
+		None,
+		None,
+		Some(relay_parent),
+	);
+
+	let relay_chain = Relaychain::new();
+	{
+		let included_map = &mut relay_chain.inner.lock().unwrap().relay_chain_hash_to_header;
+		included_map.insert(search_relay_parent, included_block.header().clone());
+	}
+
+	// Build two sibling chains from the included block.
+	let mut parent = included_block.header().hash();
+	for _ in 0..NON_INCLUDED_CHAIN_LEN {
+		let block = build_and_import_block_ext(
+			&client,
+			BlockOrigin::Own,
+			true,
+			&mut para_import,
+			Some(parent),
+			None,
+			Some(relay_parent),
+		);
+		parent = block.header().hash();
+	}
+
+	let mut parent = included_block.header().hash();
+	for _ in 0..NON_INCLUDED_CHAIN_LEN {
+		let block = build_and_import_block_ext(
+			&client,
+			BlockOrigin::NetworkInitialSync,
+			true,
+			&mut para_import,
+			Some(parent),
+			None,
+			Some(search_relay_parent),
+		);
+		parent = block.header().hash();
+	}
+
+	for max_depth in 0..=NON_INCLUDED_CHAIN_LEN {
+		let potential_parents_aligned = block_on(find_potential_parents(
+			ParentSearchParams {
+				relay_parent: search_relay_parent,
+				para_id: ParaId::from(100),
+				ancestry_lookback: 1, // aligned chain is in ancestry.
+				max_depth,
+				ignore_alternative_branches: true,
+			},
+			&*backend,
+			&relay_chain,
+		))
+		.unwrap();
+		let potential_parents = block_on(find_potential_parents(
+			ParentSearchParams {
+				relay_parent: search_relay_parent,
+				para_id: ParaId::from(100),
+				ancestry_lookback: 1,
+				max_depth,
+				ignore_alternative_branches: false,
+			},
+			&*backend,
+			&relay_chain,
+		))
+		.unwrap();
+		assert_eq!(potential_parents.len(), 2 * max_depth + 1);
+		assert_eq!(potential_parents, potential_parents_aligned);
+	}
+}
diff --git a/cumulus/client/consensus/proposer/Cargo.toml b/cumulus/client/consensus/proposer/Cargo.toml
index a4384c3859c5033ab3c707241c82dde99f6ada0e..29720a8f4791124536095ffba44189762de47f90 100644
--- a/cumulus/client/consensus/proposer/Cargo.toml
+++ b/cumulus/client/consensus/proposer/Cargo.toml
@@ -2,13 +2,13 @@
 name = "cumulus-client-consensus-proposer"
 description = "A Substrate `Proposer` for building parachain blocks"
 version = "0.1.0"
-authors = ["Parity Technologies <admin@parity.io>"]
-edition = "2021"
+authors.workspace = true
+edition.workspace = true
 
 [dependencies]
 anyhow = "1.0"
 async-trait = "0.1.73"
-thiserror = "1.0.47"
+thiserror = "1.0.48"
 
 # Substrate
 sp-consensus = { path = "../../../../substrate/primitives/consensus/common" }
diff --git a/cumulus/client/consensus/proposer/src/lib.rs b/cumulus/client/consensus/proposer/src/lib.rs
index c2e95eca3a3862536222c163d3a323c22ae2566e..7404651bcd96cc40eeecc3c465b2fafffc25c567 100644
--- a/cumulus/client/consensus/proposer/src/lib.rs
+++ b/cumulus/client/consensus/proposer/src/lib.rs
@@ -1,4 +1,4 @@
-// Copyright 2023 Parity Technologies (UK) Ltd.
+// Copyright (C) Parity Technologies (UK) Ltd.
 // This file is part of Cumulus.
 
 // Cumulus is free software: you can redistribute it and/or modify
diff --git a/cumulus/client/consensus/relay-chain/Cargo.toml b/cumulus/client/consensus/relay-chain/Cargo.toml
index ef74a0830b5d75665997303a3cc435d5cfe9cfc3..ba077f624030b8838c23d3c46c42b3527dbe6b2c 100644
--- a/cumulus/client/consensus/relay-chain/Cargo.toml
+++ b/cumulus/client/consensus/relay-chain/Cargo.toml
@@ -2,8 +2,8 @@
 name = "cumulus-client-consensus-relay-chain"
 description = "The relay-chain provided consensus algorithm"
 version = "0.1.0"
-authors = ["Parity Technologies <admin@parity.io>"]
-edition = "2021"
+authors.workspace = true
+edition.workspace = true
 
 [dependencies]
 async-trait = "0.1.73"
diff --git a/cumulus/client/consensus/relay-chain/src/import_queue.rs b/cumulus/client/consensus/relay-chain/src/import_queue.rs
index 72704673bf8848d7b483d96d81913c143078d77c..9ee03b95904c60fb3b26f60e54023c13c88a2808 100644
--- a/cumulus/client/consensus/relay-chain/src/import_queue.rs
+++ b/cumulus/client/consensus/relay-chain/src/import_queue.rs
@@ -1,4 +1,4 @@
-// Copyright 2019-2021 Parity Technologies (UK) Ltd.
+// Copyright (C) Parity Technologies (UK) Ltd.
 // This file is part of Cumulus.
 
 // Cumulus is free software: you can redistribute it and/or modify
diff --git a/cumulus/client/consensus/relay-chain/src/lib.rs b/cumulus/client/consensus/relay-chain/src/lib.rs
index ee912520d6630dd1e439d22df5c52be1b2fd6b89..fc395a9d9573fe2efd70d8322f64997670b6d8ec 100644
--- a/cumulus/client/consensus/relay-chain/src/lib.rs
+++ b/cumulus/client/consensus/relay-chain/src/lib.rs
@@ -1,4 +1,4 @@
-// Copyright 2021 Parity Technologies (UK) Ltd.
+// Copyright (C) Parity Technologies (UK) Ltd.
 // This file is part of Cumulus.
 
 // Cumulus is free software: you can redistribute it and/or modify
diff --git a/cumulus/client/network/Cargo.toml b/cumulus/client/network/Cargo.toml
index a17d2a8e329697307f29cc787c7753e1f0c1afe7..eaaf497ac3edcc74415ab0ba6a1c3caf6faff953 100644
--- a/cumulus/client/network/Cargo.toml
+++ b/cumulus/client/network/Cargo.toml
@@ -1,9 +1,9 @@
 [package]
 name = "cumulus-client-network"
 version = "0.1.0"
-authors = ["Parity Technologies <admin@parity.io>"]
+authors.workspace = true
 description = "Cumulus-specific networking protocol"
-edition = "2021"
+edition.workspace = true
 
 [dependencies]
 async-trait = "0.1.73"
@@ -23,7 +23,7 @@ sp-state-machine = { path = "../../../substrate/primitives/state-machine" }
 
 # Polkadot
 polkadot-node-primitives = { path = "../../../polkadot/node/primitives" }
-polkadot-parachain = { path = "../../../polkadot/parachain" }
+polkadot-parachain-primitives = { path = "../../../polkadot/parachain" }
 polkadot-primitives = { path = "../../../polkadot/primitives" }
 
 # Cumulus
diff --git a/cumulus/client/network/src/lib.rs b/cumulus/client/network/src/lib.rs
index b42342e5b77805447e40365d771e97a3f18409ef..ebd557b805c5d7ea4362632dac8bf0a59ddc6469 100644
--- a/cumulus/client/network/src/lib.rs
+++ b/cumulus/client/network/src/lib.rs
@@ -1,4 +1,4 @@
-// Copyright 2019-2021 Parity Technologies (UK) Ltd.
+// Copyright (C) Parity Technologies (UK) Ltd.
 // This file is part of Polkadot.
 
 // Polkadot is free software: you can redistribute it and/or modify
@@ -28,7 +28,7 @@ use sp_runtime::traits::{Block as BlockT, Header as HeaderT};
 
 use cumulus_relay_chain_interface::RelayChainInterface;
 use polkadot_node_primitives::{CollationSecondedSignal, Statement};
-use polkadot_parachain::primitives::HeadData;
+use polkadot_parachain_primitives::primitives::HeadData;
 use polkadot_primitives::{
 	CandidateReceipt, CompactStatement, Hash as PHash, Id as ParaId, OccupiedCoreAssumption,
 	SigningContext, UncheckedSigned,
diff --git a/cumulus/client/network/src/tests.rs b/cumulus/client/network/src/tests.rs
index e1bb961c75fd22064b41334595122fef47b2e475..e03f470753bb6c32c4410a7c694dea8312c74c31 100644
--- a/cumulus/client/network/src/tests.rs
+++ b/cumulus/client/network/src/tests.rs
@@ -1,4 +1,4 @@
-// Copyright 2020-2021 Parity Technologies (UK) Ltd.
+// Copyright (C) Parity Technologies (UK) Ltd.
 // This file is part of Polkadot.
 
 // Polkadot is free software: you can redistribute it and/or modify
@@ -125,8 +125,10 @@ impl RelayChainInterface for DummyRelayChainInterface {
 		if self.data.lock().has_pending_availability {
 			Ok(Some(CommittedCandidateReceipt {
 				descriptor: CandidateDescriptor {
-					para_head: polkadot_parachain::primitives::HeadData(default_header().encode())
-						.hash(),
+					para_head: polkadot_parachain_primitives::primitives::HeadData(
+						default_header().encode(),
+					)
+					.hash(),
 					para_id: 0u32.into(),
 					relay_parent: PHash::random(),
 					collator: CollatorPair::generate().0.public(),
@@ -315,7 +317,7 @@ async fn make_gossip_message_and_header(
 			pov_hash: PHash::random(),
 			erasure_root: PHash::random(),
 			signature: sp_core::sr25519::Signature([0u8; 64]).into(),
-			para_head: polkadot_parachain::primitives::HeadData(header.encode()).hash(),
+			para_head: polkadot_parachain_primitives::primitives::HeadData(header.encode()).hash(),
 			validation_code_hash: ValidationCodeHash::from(PHash::random()),
 		},
 	};
diff --git a/cumulus/client/pov-recovery/Cargo.toml b/cumulus/client/pov-recovery/Cargo.toml
index b44a8023b981978f85d6a481b837bcff6e968851..2ce903fd35249a4bbf3863c24c6a34ef4907ef15 100644
--- a/cumulus/client/pov-recovery/Cargo.toml
+++ b/cumulus/client/pov-recovery/Cargo.toml
@@ -1,9 +1,9 @@
 [package]
 name = "cumulus-client-pov-recovery"
 version = "0.1.0"
-authors = ["Parity Technologies <admin@parity.io>"]
+authors.workspace = true
 description = "Cumulus-specific networking protocol"
-edition = "2021"
+edition.workspace = true
 
 [dependencies]
 codec = { package = "parity-scale-codec", version = "3.0.0", features = [ "derive" ] }
diff --git a/cumulus/client/pov-recovery/src/active_candidate_recovery.rs b/cumulus/client/pov-recovery/src/active_candidate_recovery.rs
index feb09d005cec4a6b84effe06dfc46ff6ae82a531..322b19c796a8c10191f3bfb261b293aba4348944 100644
--- a/cumulus/client/pov-recovery/src/active_candidate_recovery.rs
+++ b/cumulus/client/pov-recovery/src/active_candidate_recovery.rs
@@ -1,4 +1,4 @@
-// Copyright 2021 Parity Technologies (UK) Ltd.
+// Copyright (C) Parity Technologies (UK) Ltd.
 // This file is part of Polkadot.
 
 // Polkadot is free software: you can redistribute it and/or modify
diff --git a/cumulus/client/pov-recovery/src/lib.rs b/cumulus/client/pov-recovery/src/lib.rs
index a7509c54ab09d32efe444de32160ab6fb837e8e8..b050bc66799c7aa84db67374dc801890e0e7ce25 100644
--- a/cumulus/client/pov-recovery/src/lib.rs
+++ b/cumulus/client/pov-recovery/src/lib.rs
@@ -1,4 +1,4 @@
-// Copyright 2021 Parity Technologies (UK) Ltd.
+// Copyright (C) Parity Technologies (UK) Ltd.
 // This file is part of Cumulus.
 
 // Cumulus is free software: you can redistribute it and/or modify
diff --git a/cumulus/client/relay-chain-inprocess-interface/Cargo.toml b/cumulus/client/relay-chain-inprocess-interface/Cargo.toml
index 20f46a7a95a434f52d8c0bcfa3de3fb1f0914bd1..bc8d0d430c774bb3255f9494cd1fdced5a2d944d 100644
--- a/cumulus/client/relay-chain-inprocess-interface/Cargo.toml
+++ b/cumulus/client/relay-chain-inprocess-interface/Cargo.toml
@@ -1,8 +1,8 @@
 [package]
-authors = ["Parity Technologies <admin@parity.io>"]
+authors.workspace = true
 name = "cumulus-relay-chain-inprocess-interface"
 version = "0.1.0"
-edition = "2021"
+edition.workspace = true
 
 [dependencies]
 async-trait = "0.1.73"
@@ -37,10 +37,7 @@ sp-keyring = { path = "../../../substrate/primitives/keyring" }
 # Polkadot
 polkadot-primitives = { path = "../../../polkadot/primitives" }
 polkadot-test-client = { path = "../../../polkadot/node/test/client" }
-metered = { package = "prioritized-metered-channel", version = "0.2.0" }
+metered = { package = "prioritized-metered-channel", version = "0.5.1", default-features = false, features=["futures_channel"] }
 
 # Cumulus
 cumulus-test-service = { path = "../../test/service" }
-
-[features]
-network-protocol-staging = [ "polkadot-service/network-protocol-staging" ]
diff --git a/cumulus/client/relay-chain-inprocess-interface/src/lib.rs b/cumulus/client/relay-chain-inprocess-interface/src/lib.rs
index 5b3ab15ed6fd9aa2d1da475c8f8bb342a80cf601..42a56b649f035bdf10aa18099fe3851a3b5d238e 100644
--- a/cumulus/client/relay-chain-inprocess-interface/src/lib.rs
+++ b/cumulus/client/relay-chain-inprocess-interface/src/lib.rs
@@ -1,4 +1,4 @@
-// Copyright 2021 Parity Technologies (UK) Ltd.
+// Copyright (C) Parity Technologies (UK) Ltd.
 // This file is part of Cumulus.
 
 // Cumulus is free software: you can redistribute it and/or modify
diff --git a/cumulus/client/relay-chain-interface/Cargo.toml b/cumulus/client/relay-chain-interface/Cargo.toml
index 54bd8e87cdec13a7d4d364a96ca54953193fcbdb..3da7ab0b0e8212d7a05d972ca3fb7c82a0955bd3 100644
--- a/cumulus/client/relay-chain-interface/Cargo.toml
+++ b/cumulus/client/relay-chain-interface/Cargo.toml
@@ -1,8 +1,8 @@
 [package]
-authors = ["Parity Technologies <admin@parity.io>"]
+authors.workspace = true
 name = "cumulus-relay-chain-interface"
 version = "0.1.0"
-edition = "2021"
+edition.workspace = true
 
 [dependencies]
 polkadot-overseer = { path = "../../../polkadot/node/overseer" }
@@ -16,6 +16,6 @@ sc-client-api = { path = "../../../substrate/client/api" }
 
 futures = "0.3.28"
 async-trait = "0.1.73"
-thiserror = "1.0.47"
+thiserror = "1.0.48"
 jsonrpsee-core = "0.16.2"
 parity-scale-codec = "3.6.4"
diff --git a/cumulus/client/relay-chain-interface/src/lib.rs b/cumulus/client/relay-chain-interface/src/lib.rs
index a0258e20632830c0da88e218936f6e873c94c2ae..3dda61635804d47440689872271751e0bba27d87 100644
--- a/cumulus/client/relay-chain-interface/src/lib.rs
+++ b/cumulus/client/relay-chain-interface/src/lib.rs
@@ -1,4 +1,4 @@
-// Copyright 2021 Parity Technologies (UK) Ltd.
+// Copyright (C) Parity Technologies (UK) Ltd.
 // This file is part of Cumulus.
 
 // Cumulus is free software: you can redistribute it and/or modify
@@ -41,7 +41,7 @@ pub type RelayChainResult<T> = Result<T, RelayChainError>;
 
 #[derive(thiserror::Error, Debug)]
 pub enum RelayChainError {
-	#[error("Error occured while calling relay chain runtime: {0}")]
+	#[error("Error occurred while calling relay chain runtime: {0}")]
 	ApiError(#[from] ApiError),
 	#[error("Timeout while waiting for relay-chain block `{0}` to be imported.")]
 	WaitTimeout(PHash),
@@ -53,7 +53,7 @@ pub enum RelayChainError {
 	WaitBlockchainError(PHash, sp_blockchain::Error),
 	#[error("Blockchain returned an error: {0}")]
 	BlockchainError(#[from] sp_blockchain::Error),
-	#[error("State machine error occured: {0}")]
+	#[error("State machine error occurred: {0}")]
 	StateMachineError(Box<dyn sp_state_machine::Error>),
 	#[error("Unable to call RPC method '{0}'")]
 	RpcCallError(String),
@@ -67,7 +67,7 @@ pub enum RelayChainError {
 	Application(#[from] Box<dyn std::error::Error + Send + Sync + 'static>),
 	#[error("Prometheus error: {0}")]
 	PrometheusError(#[from] PrometheusError),
-	#[error("Unspecified error occured: {0}")]
+	#[error("Unspecified error occurred: {0}")]
 	GenericError(String),
 }
 
diff --git a/cumulus/client/relay-chain-minimal-node/Cargo.toml b/cumulus/client/relay-chain-minimal-node/Cargo.toml
index 7fc53d17470a67533296a7935bab87d54ff8d8e6..226474d3d38cd1b34c6d1304855338bf3c6f4ff9 100644
--- a/cumulus/client/relay-chain-minimal-node/Cargo.toml
+++ b/cumulus/client/relay-chain-minimal-node/Cargo.toml
@@ -1,8 +1,8 @@
 [package]
-authors = ["Parity Technologies <admin@parity.io>"]
+authors.workspace = true
 name = "cumulus-relay-chain-minimal-node"
 version = "0.1.0"
-edition = "2021"
+edition.workspace = true
 
 [dependencies]
 # polkadot deps
@@ -36,12 +36,8 @@ cumulus-relay-chain-rpc-interface = { path = "../relay-chain-rpc-interface" }
 cumulus-primitives-core = { path = "../../primitives/core" }
 
 array-bytes = "6.1"
-lru = "0.11.0"
+schnellru = "0.2.1"
 tracing = "0.1.37"
 async-trait = "0.1.73"
 futures = "0.3.28"
 
-[features]
-network-protocol-staging = [
-	"polkadot-node-network-protocol/network-protocol-staging",
-]
diff --git a/cumulus/client/relay-chain-minimal-node/src/blockchain_rpc_client.rs b/cumulus/client/relay-chain-minimal-node/src/blockchain_rpc_client.rs
index fc4d803002cb2ea106d9897ee8d99b9f7a5ab06a..1e78df7115435449e6beb89224f0af32f3b3b988 100644
--- a/cumulus/client/relay-chain-minimal-node/src/blockchain_rpc_client.rs
+++ b/cumulus/client/relay-chain-minimal-node/src/blockchain_rpc_client.rs
@@ -1,4 +1,4 @@
-// Copyright 2022 Parity Technologies (UK) Ltd.
+// Copyright (C) Parity Technologies (UK) Ltd.
 // This file is part of Cumulus.
 
 // Cumulus is free software: you can redistribute it and/or modify
@@ -22,8 +22,8 @@ use futures::{Stream, StreamExt};
 use polkadot_core_primitives::{Block, BlockNumber, Hash, Header};
 use polkadot_overseer::RuntimeApiSubsystemClient;
 use polkadot_primitives::{
+	async_backing::{AsyncBackingParams, BackingState},
 	slashing,
-	vstaging::{AsyncBackingParams, BackingState},
 };
 use sc_authority_discovery::{AuthorityDiscovery, Error as AuthorityDiscoveryError};
 use sp_api::{ApiError, RuntimeApiInfo};
@@ -338,16 +338,31 @@ impl RuntimeApiSubsystemClient for BlockChainRpcClient {
 			.await?)
 	}
 
-	async fn staging_async_backing_params(&self, at: Hash) -> Result<AsyncBackingParams, ApiError> {
-		Ok(self.rpc_client.parachain_host_staging_async_backing_params(at).await?)
+	async fn minimum_backing_votes(
+		&self,
+		at: Hash,
+		session_index: polkadot_primitives::SessionIndex,
+	) -> Result<u32, ApiError> {
+		Ok(self.rpc_client.parachain_host_minimum_backing_votes(at, session_index).await?)
+	}
+
+	async fn disabled_validators(
+		&self,
+		at: Hash,
+	) -> Result<Vec<polkadot_primitives::ValidatorIndex>, ApiError> {
+		Ok(self.rpc_client.parachain_host_disabled_validators(at).await?)
+	}
+
+	async fn async_backing_params(&self, at: Hash) -> Result<AsyncBackingParams, ApiError> {
+		Ok(self.rpc_client.parachain_host_async_backing_params(at).await?)
 	}
 
-	async fn staging_para_backing_state(
+	async fn para_backing_state(
 		&self,
 		at: Hash,
 		para_id: cumulus_primitives_core::ParaId,
 	) -> Result<Option<BackingState>, ApiError> {
-		Ok(self.rpc_client.parachain_host_staging_para_backing_state(at, para_id).await?)
+		Ok(self.rpc_client.parachain_host_para_backing_state(at, para_id).await?)
 	}
 }
 
diff --git a/cumulus/client/relay-chain-minimal-node/src/collator_overseer.rs b/cumulus/client/relay-chain-minimal-node/src/collator_overseer.rs
index 4d843eb224f2cf754aea3defbcaf24988df650a7..a83a18f7cd965743cdb4490c3966b6ca8b6b7272 100644
--- a/cumulus/client/relay-chain-minimal-node/src/collator_overseer.rs
+++ b/cumulus/client/relay-chain-minimal-node/src/collator_overseer.rs
@@ -1,4 +1,4 @@
-// Copyright 2022 Parity Technologies (UK) Ltd.
+// Copyright (C) Parity Technologies (UK) Ltd.
 // This file is part of Polkadot.
 
 // Polkadot is free software: you can redistribute it and/or modify
@@ -15,7 +15,7 @@
 // along with Polkadot.  If not, see <http://www.gnu.org/licenses/>.
 
 use futures::{select, StreamExt};
-use lru::LruCache;
+use schnellru::{ByLength, LruMap};
 use std::sync::Arc;
 
 use polkadot_availability_recovery::AvailabilityRecoverySubsystem;
@@ -30,19 +30,20 @@ use polkadot_node_network_protocol::{
 	peer_set::PeerSetProtocolNames,
 	request_response::{
 		v1::{self, AvailableDataFetchingRequest},
-		vstaging, IncomingRequestReceiver, ReqProtocolNames,
+		v2, IncomingRequestReceiver, ReqProtocolNames,
 	},
 };
 use polkadot_node_subsystem_util::metrics::{prometheus::Registry, Metrics};
 use polkadot_overseer::{
 	BlockInfo, DummySubsystem, Handle, Overseer, OverseerConnector, OverseerHandle, SpawnGlue,
-	KNOWN_LEAVES_CACHE_SIZE,
+	UnpinHandle, KNOWN_LEAVES_CACHE_SIZE,
 };
 use polkadot_primitives::CollatorPair;
 
 use sc_authority_discovery::Service as AuthorityDiscoveryService;
 use sc_network::NetworkStateInfo;
 use sc_service::TaskManager;
+use sc_utils::mpsc::tracing_unbounded;
 use sp_runtime::traits::Block as BlockT;
 
 use cumulus_primitives_core::relay_chain::{Block, Hash as PHash};
@@ -62,9 +63,8 @@ pub(crate) struct CollatorOverseerGenArgs<'a> {
 	pub authority_discovery_service: AuthorityDiscoveryService,
 	/// Receiver for collation request protocol v1.
 	pub collation_req_receiver_v1: IncomingRequestReceiver<v1::CollationFetchingRequest>,
-	/// Receiver for collation request protocol vstaging.
-	pub collation_req_receiver_vstaging:
-		IncomingRequestReceiver<vstaging::CollationFetchingRequest>,
+	/// Receiver for collation request protocol v2.
+	pub collation_req_receiver_v2: IncomingRequestReceiver<v2::CollationFetchingRequest>,
 	/// Receiver for availability request protocol
 	pub available_data_req_receiver: IncomingRequestReceiver<AvailableDataFetchingRequest>,
 	/// Prometheus registry, commonly used for production systems, less so for test.
@@ -87,7 +87,7 @@ fn build_overseer(
 		sync_oracle,
 		authority_discovery_service,
 		collation_req_receiver_v1,
-		collation_req_receiver_vstaging,
+		collation_req_receiver_v2,
 		available_data_req_receiver,
 		registry,
 		spawner,
@@ -120,7 +120,7 @@ fn build_overseer(
 				peer_id: network_service.local_peer_id(),
 				collator_pair,
 				request_receiver_v1: collation_req_receiver_v1,
-				request_receiver_vstaging: collation_req_receiver_vstaging,
+				request_receiver_v2: collation_req_receiver_v2,
 				metrics: Metrics::register(registry)?,
 			};
 			CollatorProtocolSubsystem::new(side)
@@ -157,7 +157,7 @@ fn build_overseer(
 		.span_per_active_leaf(Default::default())
 		.active_leaves(Default::default())
 		.supports_parachains(runtime_client)
-		.known_leaves(LruCache::new(KNOWN_LEAVES_CACHE_SIZE))
+		.known_leaves(LruMap::new(ByLength::new(KNOWN_LEAVES_CACHE_SIZE)))
 		.metrics(Metrics::register(registry)?)
 		.spawner(spawner);
 
@@ -221,20 +221,25 @@ async fn forward_collator_events(
 ) -> Result<(), RelayChainError> {
 	let mut finality = client.finality_notification_stream().await?.fuse();
 	let mut imports = client.import_notification_stream().await?.fuse();
+	// Collators do no need to pin any specific blocks
+	let (dummy_sink, _) = tracing_unbounded("does-not-matter", 42);
+	let dummy_unpin_handle = UnpinHandle::new(Default::default(), dummy_sink);
 
 	loop {
 		select! {
 			f = finality.next() => {
 				match f {
 					Some(header) => {
+						let hash = header.hash();
 						tracing::info!(
 							target: "minimal-polkadot-node",
 							"Received finalized block via RPC: #{} ({} -> {})",
 							header.number,
 							header.parent_hash,
-							header.hash()
+							hash,
 						);
-						let block_info = BlockInfo { hash: header.hash(), parent_hash: header.parent_hash, number: header.number };
+						let unpin_handle = dummy_unpin_handle.clone();
+						let block_info = BlockInfo { hash, parent_hash: header.parent_hash, number: header.number, unpin_handle };
 						handle.block_finalized(block_info).await;
 					}
 					None => return Err(RelayChainError::GenericError("Relay chain finality stream ended.".to_string())),
@@ -243,14 +248,16 @@ async fn forward_collator_events(
 			i = imports.next() => {
 				match i {
 					Some(header) => {
+						let hash = header.hash();
 						tracing::info!(
 							target: "minimal-polkadot-node",
 							"Received imported block via RPC: #{} ({} -> {})",
 							header.number,
 							header.parent_hash,
-							header.hash()
+							hash,
 						);
-						let block_info = BlockInfo { hash: header.hash(), parent_hash: header.parent_hash, number: header.number };
+						let unpin_handle = dummy_unpin_handle.clone();
+						let block_info = BlockInfo { hash, parent_hash: header.parent_hash, number: header.number, unpin_handle };
 						handle.block_imported(block_info).await;
 					}
 					None => return Err(RelayChainError::GenericError("Relay chain import stream ended.".to_string())),
diff --git a/cumulus/client/relay-chain-minimal-node/src/lib.rs b/cumulus/client/relay-chain-minimal-node/src/lib.rs
index 8d0228219089b6e5de4734fa9aa65fcb28ae9c2f..08e4e8e34aba4219382b4554bfb8ff97762c2009 100644
--- a/cumulus/client/relay-chain-minimal-node/src/lib.rs
+++ b/cumulus/client/relay-chain-minimal-node/src/lib.rs
@@ -1,4 +1,4 @@
-// Copyright 2017-2022 Parity Technologies (UK) Ltd.
+// Copyright (C) Parity Technologies (UK) Ltd.
 // This file is part of Polkadot.
 
 // Polkadot is free software: you can redistribute it and/or modify
@@ -23,7 +23,7 @@ use polkadot_network_bridge::{peer_sets_info, IsAuthority};
 use polkadot_node_network_protocol::{
 	peer_set::PeerSetProtocolNames,
 	request_response::{
-		v1, vstaging, IncomingRequest, IncomingRequestReceiver, Protocol, ReqProtocolNames,
+		v1, v2, IncomingRequest, IncomingRequestReceiver, Protocol, ReqProtocolNames,
 	},
 };
 
@@ -182,7 +182,7 @@ async fn new_minimal_relay_chain(
 	}
 
 	let request_protocol_names = ReqProtocolNames::new(genesis_hash, config.chain_spec.fork_id());
-	let (collation_req_receiver_v1, collation_req_receiver_vstaging, available_data_req_receiver) =
+	let (collation_req_receiver_v1, collation_req_receiver_v2, available_data_req_receiver) =
 		build_request_response_protocol_receivers(&request_protocol_names, &mut net_config);
 
 	let best_header = relay_chain_rpc_client
@@ -212,7 +212,7 @@ async fn new_minimal_relay_chain(
 		sync_oracle,
 		authority_discovery_service,
 		collation_req_receiver_v1,
-		collation_req_receiver_vstaging,
+		collation_req_receiver_v2,
 		available_data_req_receiver,
 		registry: prometheus_registry.as_ref(),
 		spawner: task_manager.spawn_handle(),
@@ -234,13 +234,13 @@ fn build_request_response_protocol_receivers(
 	config: &mut FullNetworkConfiguration,
 ) -> (
 	IncomingRequestReceiver<v1::CollationFetchingRequest>,
-	IncomingRequestReceiver<vstaging::CollationFetchingRequest>,
+	IncomingRequestReceiver<v2::CollationFetchingRequest>,
 	IncomingRequestReceiver<v1::AvailableDataFetchingRequest>,
 ) {
 	let (collation_req_receiver_v1, cfg) =
 		IncomingRequest::get_config_receiver(request_protocol_names);
 	config.add_request_response_protocol(cfg);
-	let (collation_req_receiver_vstaging, cfg) =
+	let (collation_req_receiver_v2, cfg) =
 		IncomingRequest::get_config_receiver(request_protocol_names);
 	config.add_request_response_protocol(cfg);
 	let (available_data_req_receiver, cfg) =
@@ -248,5 +248,5 @@ fn build_request_response_protocol_receivers(
 	config.add_request_response_protocol(cfg);
 	let cfg = Protocol::ChunkFetchingV1.get_outbound_only_config(request_protocol_names);
 	config.add_request_response_protocol(cfg);
-	(collation_req_receiver_v1, collation_req_receiver_vstaging, available_data_req_receiver)
+	(collation_req_receiver_v1, collation_req_receiver_v2, available_data_req_receiver)
 }
diff --git a/cumulus/client/relay-chain-minimal-node/src/network.rs b/cumulus/client/relay-chain-minimal-node/src/network.rs
index 5097e6ce33a672e8c09d1a2e641e486ca8c198c5..f39d7a26dd8838d693d8c32d62d51fa147c26cda 100644
--- a/cumulus/client/relay-chain-minimal-node/src/network.rs
+++ b/cumulus/client/relay-chain-minimal-node/src/network.rs
@@ -1,4 +1,4 @@
-// Copyright 2022 Parity Technologies (UK) Ltd.
+// Copyright (C) Parity Technologies (UK) Ltd.
 // This file is part of Cumulus.
 
 // Cumulus is free software: you can redistribute it and/or modify
diff --git a/cumulus/client/relay-chain-rpc-interface/Cargo.toml b/cumulus/client/relay-chain-rpc-interface/Cargo.toml
index d73b9ae8989ad72152f2db1aedd0e91da944674d..0f09377e106ce4274ddf0d59028476af3127a51b 100644
--- a/cumulus/client/relay-chain-rpc-interface/Cargo.toml
+++ b/cumulus/client/relay-chain-rpc-interface/Cargo.toml
@@ -1,8 +1,8 @@
 [package]
-authors = ["Parity Technologies <admin@parity.io>"]
+authors.workspace = true
 name = "cumulus-relay-chain-rpc-interface"
 version = "0.1.0"
-edition = "2021"
+edition.workspace = true
 
 
 [dependencies]
@@ -32,12 +32,12 @@ jsonrpsee = { version = "0.16.2", features = ["ws-client"] }
 tracing = "0.1.37"
 async-trait = "0.1.73"
 url = "2.4.0"
-serde_json = "1.0.105"
-serde = "1.0.183"
-lru = "0.11.0"
+serde_json = "1.0.107"
+serde = "1.0.188"
+schnellru = "0.2.1"
 smoldot = { version = "0.11.0",  default_features = false, features = ["std"]}
 smoldot-light = { version = "0.9.0", default_features = false, features = ["std"] }
 either = "1.8.1"
-thiserror = "1.0.38"
+thiserror = "1.0.48"
 rand = "0.8.5"
 pin-project = "1.1.3"
diff --git a/cumulus/client/relay-chain-rpc-interface/src/lib.rs b/cumulus/client/relay-chain-rpc-interface/src/lib.rs
index c01f38433dc7b266b43445d016aed3f45b4ee9c3..96f8fc8b5563335eb7796bc8fd105fced15bc5e1 100644
--- a/cumulus/client/relay-chain-rpc-interface/src/lib.rs
+++ b/cumulus/client/relay-chain-rpc-interface/src/lib.rs
@@ -1,4 +1,4 @@
-// Copyright 2022 Parity Technologies (UK) Ltd.
+// Copyright (C) Parity Technologies (UK) Ltd.
 // This file is part of Cumulus.
 
 // Cumulus is free software: you can redistribute it and/or modify
diff --git a/cumulus/client/relay-chain-rpc-interface/src/light_client_worker.rs b/cumulus/client/relay-chain-rpc-interface/src/light_client_worker.rs
index b6773870512843549af0d38e902d2b40a0effb6d..6fd057e170b715a1586dbd2dbf3f608268c539bd 100644
--- a/cumulus/client/relay-chain-rpc-interface/src/light_client_worker.rs
+++ b/cumulus/client/relay-chain-rpc-interface/src/light_client_worker.rs
@@ -1,4 +1,4 @@
-// Copyright 2023 Parity Technologies (UK) Ltd.
+// Copyright (C) Parity Technologies (UK) Ltd.
 // This file is part of Cumulus.
 
 // Cumulus is free software: you can redistribute it and/or modify
@@ -48,7 +48,7 @@ const MAX_SUBSCRIPTIONS: u32 = 64;
 
 #[derive(thiserror::Error, Debug)]
 enum LightClientError {
-	#[error("Error occured while executing smoldot request: {0}")]
+	#[error("Error occurred while executing smoldot request: {0}")]
 	SmoldotError(String),
 	#[error("Nothing returned from json_rpc_responses")]
 	EmptyResult,
diff --git a/cumulus/client/relay-chain-rpc-interface/src/reconnecting_ws_client.rs b/cumulus/client/relay-chain-rpc-interface/src/reconnecting_ws_client.rs
index 5add8a96ef10084e46fd8e3378e9c38e103e1b37..322bcc93dae6d8158a0e6cfb99ded9a29bee79c5 100644
--- a/cumulus/client/relay-chain-rpc-interface/src/reconnecting_ws_client.rs
+++ b/cumulus/client/relay-chain-rpc-interface/src/reconnecting_ws_client.rs
@@ -1,4 +1,4 @@
-// Copyright 2022 Parity Technologies (UK) Ltd.
+// Copyright (C) Parity Technologies (UK) Ltd.
 // This file is part of Cumulus.
 
 // Cumulus is free software: you can redistribute it and/or modify
@@ -31,10 +31,10 @@ use jsonrpsee::{
 	},
 	ws_client::WsClientBuilder,
 };
-use lru::LruCache;
 use sc_rpc_api::chain::ChainApiClient;
+use schnellru::{ByLength, LruMap};
 use sp_runtime::generic::SignedBlock;
-use std::{num::NonZeroUsize, sync::Arc};
+use std::sync::Arc;
 use tokio::sync::mpsc::{
 	channel as tokio_channel, Receiver as TokioReceiver, Sender as TokioSender,
 };
@@ -307,8 +307,7 @@ impl ReconnectingWebsocketWorker {
 			return
 		};
 
-		let mut imported_blocks_cache =
-			LruCache::new(NonZeroUsize::new(40).expect("40 is nonzero; qed."));
+		let mut imported_blocks_cache = LruMap::new(ByLength::new(40));
 		let mut should_reconnect = ConnectionStatus::Connected;
 		let mut last_seen_finalized_num: RelayNumber = 0;
 		loop {
@@ -365,7 +364,7 @@ impl ReconnectingWebsocketWorker {
 					match import_event {
 						Some(Ok(header)) => {
 							let hash = header.hash();
-							if imported_blocks_cache.contains(&hash) {
+							if imported_blocks_cache.peek(&hash).is_some() {
 								tracing::debug!(
 									target: LOG_TARGET,
 									number = header.number,
@@ -374,7 +373,7 @@ impl ReconnectingWebsocketWorker {
 								);
 								continue;
 							}
-							imported_blocks_cache.put(hash, ());
+							imported_blocks_cache.insert(hash, ());
 							distribute_header(header, &mut self.imported_header_listeners);
 						},
 						None => {
diff --git a/cumulus/client/relay-chain-rpc-interface/src/rpc_client.rs b/cumulus/client/relay-chain-rpc-interface/src/rpc_client.rs
index b079294b78421f11a6b770236bc00a95775c93dd..5924716adcb41d8b4c93b525ea4e1ae8093b413b 100644
--- a/cumulus/client/relay-chain-rpc-interface/src/rpc_client.rs
+++ b/cumulus/client/relay-chain-rpc-interface/src/rpc_client.rs
@@ -1,4 +1,4 @@
-// Copyright 2022 Parity Technologies (UK) Ltd.
+// Copyright (C) Parity Technologies (UK) Ltd.
 // This file is part of Cumulus.
 
 // Cumulus is free software: you can redistribute it and/or modify
@@ -30,9 +30,8 @@ use parity_scale_codec::{Decode, Encode};
 
 use cumulus_primitives_core::{
 	relay_chain::{
-		slashing,
-		vstaging::{AsyncBackingParams, BackingState},
-		BlockNumber, CandidateCommitments, CandidateEvent, CandidateHash,
+		async_backing::{AsyncBackingParams, BackingState},
+		slashing, BlockNumber, CandidateCommitments, CandidateEvent, CandidateHash,
 		CommittedCandidateReceipt, CoreState, DisputeState, ExecutorParams, GroupRotationInfo,
 		Hash as RelayHash, Header as RelayHeader, InboundHrmpMessage, OccupiedCoreAssumption,
 		PvfCheckStatement, ScrapedOnChainVotes, SessionIndex, SessionInfo, ValidationCode,
@@ -588,31 +587,41 @@ impl RelayChainRpcClient {
 			.await
 	}
 
+	/// Get the minimum number of backing votes for a candidate.
+	pub async fn parachain_host_minimum_backing_votes(
+		&self,
+		at: RelayHash,
+		_session_index: SessionIndex,
+	) -> Result<u32, RelayChainError> {
+		self.call_remote_runtime_function("ParachainHost_minimum_backing_votes", at, None::<()>)
+			.await
+	}
+
+	pub async fn parachain_host_disabled_validators(
+		&self,
+		at: RelayHash,
+	) -> Result<Vec<ValidatorIndex>, RelayChainError> {
+		self.call_remote_runtime_function("ParachainHost_disabled_validators", at, None::<()>)
+			.await
+	}
+
 	#[allow(missing_docs)]
-	pub async fn parachain_host_staging_async_backing_params(
+	pub async fn parachain_host_async_backing_params(
 		&self,
 		at: RelayHash,
 	) -> Result<AsyncBackingParams, RelayChainError> {
-		self.call_remote_runtime_function(
-			"ParachainHost_staging_async_backing_params",
-			at,
-			None::<()>,
-		)
-		.await
+		self.call_remote_runtime_function("ParachainHost_async_backing_params", at, None::<()>)
+			.await
 	}
 
 	#[allow(missing_docs)]
-	pub async fn parachain_host_staging_para_backing_state(
+	pub async fn parachain_host_para_backing_state(
 		&self,
 		at: RelayHash,
 		para_id: ParaId,
 	) -> Result<Option<BackingState>, RelayChainError> {
-		self.call_remote_runtime_function(
-			"ParachainHost_staging_para_backing_state",
-			at,
-			Some(para_id),
-		)
-		.await
+		self.call_remote_runtime_function("ParachainHost_para_backing_state", at, Some(para_id))
+			.await
 	}
 
 	fn send_register_message_to_worker(
diff --git a/cumulus/client/relay-chain-rpc-interface/src/tokio_platform.rs b/cumulus/client/relay-chain-rpc-interface/src/tokio_platform.rs
index 7b8c69645b61bc6985119c266e5bc8a370264158..75a5604d741b4fe92e55cfe4f55fdaba747e4bb5 100644
--- a/cumulus/client/relay-chain-rpc-interface/src/tokio_platform.rs
+++ b/cumulus/client/relay-chain-rpc-interface/src/tokio_platform.rs
@@ -1,4 +1,4 @@
-// Copyright 2023 Parity Technologies (UK) Ltd.
+// Copyright (C) Parity Technologies (UK) Ltd.
 // This file is part of Cumulus.
 
 // Cumulus is free software: you can redistribute it and/or modify
diff --git a/cumulus/client/service/Cargo.toml b/cumulus/client/service/Cargo.toml
index 0c557dc9ca732210cfb9b83f3be710fef6046f06..b7c274ceecdcbb524ee57d228ef475699402ea49 100644
--- a/cumulus/client/service/Cargo.toml
+++ b/cumulus/client/service/Cargo.toml
@@ -1,8 +1,8 @@
 [package]
 name = "cumulus-client-service"
 version = "0.1.0"
-authors = ["Parity Technologies <admin@parity.io>"]
-edition = "2021"
+authors.workspace = true
+edition.workspace = true
 
 [dependencies]
 futures = "0.3.28"
@@ -40,8 +40,3 @@ cumulus-relay-chain-interface = { path = "../relay-chain-interface" }
 cumulus-relay-chain-inprocess-interface = { path = "../relay-chain-inprocess-interface" }
 cumulus-relay-chain-minimal-node = { path = "../relay-chain-minimal-node" }
 
-[features]
-network-protocol-staging = [
-	"cumulus-relay-chain-inprocess-interface/network-protocol-staging",
-	"cumulus-relay-chain-minimal-node/network-protocol-staging",
-]
diff --git a/cumulus/client/service/src/lib.rs b/cumulus/client/service/src/lib.rs
index 11b6240eb73fc890033ca66b9c514b00ccb0b5c6..82890666ebae3f197e291019d215ea9d446ef71f 100644
--- a/cumulus/client/service/src/lib.rs
+++ b/cumulus/client/service/src/lib.rs
@@ -1,4 +1,4 @@
-// Copyright 2020-2021 Parity Technologies (UK) Ltd.
+// Copyright (C) Parity Technologies (UK) Ltd.
 // This file is part of Cumulus.
 
 // Substrate is free software: you can redistribute it and/or modify
@@ -484,6 +484,7 @@ where
 		import_queue,
 		block_announce_validator_builder: Some(Box::new(move |_| block_announce_validator)),
 		warp_sync_params,
+		block_relay: None,
 	})
 }
 
diff --git a/cumulus/docker/polkadot-parachain-debug_unsigned_injected.Dockerfile b/cumulus/docker/polkadot-parachain-debug_unsigned_injected.Dockerfile
deleted file mode 100644
index a2e32049f5bb4fccb3d7bf1ce3b04ffea69fd9e4..0000000000000000000000000000000000000000
--- a/cumulus/docker/polkadot-parachain-debug_unsigned_injected.Dockerfile
+++ /dev/null
@@ -1,49 +0,0 @@
-FROM docker.io/library/ubuntu:20.04
-
-# metadata
-ARG VCS_REF
-ARG BUILD_DATE
-ARG IMAGE_NAME
-
-LABEL io.parity.image.authors="devops-team@parity.io" \
-	io.parity.image.vendor="Parity Technologies" \
-	io.parity.image.title="${IMAGE_NAME}" \
-	io.parity.image.description="Cumulus, the Polkadot collator." \
-	io.parity.image.source="https://github.com/paritytech/cumulus/blob/${VCS_REF}/scripts/docker/polkadot-parachain-debug_unsigned_injected.Dockerfile" \
-	io.parity.image.revision="${VCS_REF}" \
-	io.parity.image.created="${BUILD_DATE}" \
-	io.parity.image.documentation="https://github.com/paritytech/cumulus/"
-
-# show backtraces
-ENV RUST_BACKTRACE 1
-
-# install tools and dependencies
-RUN apt-get update && \
-	DEBIAN_FRONTEND=noninteractive apt-get install -y \
-	libssl1.1 \
-	ca-certificates \
-	curl && \
-	# apt cleanup
-	apt-get autoremove -y && \
-	apt-get clean && \
-	find /var/lib/apt/lists/ -type f -not -name lock -delete; \
-	# add user and link ~/.local/share/polkadot-parachain to /data
-	useradd -m -u 10000 -U -s /bin/sh -d /polkadot-parachain polkadot-parachain && \
-	mkdir -p /data /polkadot-parachain/.local/share && \
-	chown -R polkadot-parachain:polkadot-parachain /data && \
-	ln -s /data /polkadot-parachain/.local/share/polkadot-parachain && \
-	mkdir -p /specs
-
-# add polkadot-parachain binary to the docker image
-COPY ./artifacts/polkadot-parachain /usr/local/bin
-COPY ./parachains/chain-specs/*.json /specs/
-
-USER polkadot-parachain
-
-# check if executable works in this container
-RUN /usr/local/bin/polkadot-parachain --version
-
-EXPOSE 30333 9933 9944
-VOLUME ["/polkadot-parachain"]
-
-ENTRYPOINT ["/usr/local/bin/polkadot-parachain"]
diff --git a/cumulus/docker/polkadot-parachain_builder.Containerfile b/cumulus/docker/polkadot-parachain_builder.Containerfile
deleted file mode 100644
index 159bcb323693865d924b93d674af770f8a6bdf41..0000000000000000000000000000000000000000
--- a/cumulus/docker/polkadot-parachain_builder.Containerfile
+++ /dev/null
@@ -1,36 +0,0 @@
-# This file is sourced from https://github.com/paritytech/polkadot/blob/master/scripts/ci/dockerfiles/polkadot/polkadot_builder.Dockerfile
-# This is the build stage for polkadot-parachain. Here we create the binary in a temporary image.
-FROM docker.io/paritytech/ci-linux:production as builder
-
-WORKDIR /cumulus
-COPY . /cumulus
-
-RUN cargo build --release --locked -p polkadot-parachain
-
-# This is the 2nd stage: a very small image where we copy the Polkadot binary."
-FROM docker.io/library/ubuntu:20.04
-
-LABEL io.parity.image.type="builder" \
-    io.parity.image.authors="devops-team@parity.io" \
-    io.parity.image.vendor="Parity Technologies" \
-    io.parity.image.description="Multistage Docker image for polkadot-parachain" \
-    io.parity.image.source="https://github.com/paritytech/polkadot/blob/${VCS_REF}/scripts/ci/dockerfiles/polkadot/polkadot-parachain_builder.Dockerfile" \
-    io.parity.image.documentation="https://github.com/paritytech/cumulus"
-
-COPY --from=builder /cumulus/target/release/polkadot-parachain /usr/local/bin
-
-RUN useradd -m -u 1000 -U -s /bin/sh -d /cumulus polkadot-parachain && \
-    mkdir -p /data /cumulus/.local/share && \
-    chown -R polkadot-parachain:polkadot-parachain /data && \
-    ln -s /data /cumulus/.local/share/polkadot-parachain && \
-# unclutter and minimize the attack surface
-    rm -rf /usr/bin /usr/sbin && \
-# check if executable works in this container
-    /usr/local/bin/polkadot-parachain --version
-
-USER polkadot-parachain
-
-EXPOSE 30333 9933 9944 9615
-VOLUME ["/data"]
-
-ENTRYPOINT ["/usr/local/bin/polkadot-parachain"]
diff --git a/cumulus/docker/scripts/build_docker.sh b/cumulus/docker/scripts/build_docker.sh
index ba44544930102dbdf71a9e9461b587b72c913025..752d6bd00fc86598af5bb28e38b38cf3b0fa7efd 100755
--- a/cumulus/docker/scripts/build_docker.sh
+++ b/cumulus/docker/scripts/build_docker.sh
@@ -6,7 +6,7 @@ cd "$(cd "$(dirname "$0")" && git rev-parse --show-toplevel)"
 
 dockerfile="$1"
 if [ -z "$dockerfile" ]; then
-    dockerfile="./docker/test-parachain-collator.dockerfile"
+    dockerfile="./docker/test-parachain-collator.Dockerfile"
 else
     shift 1
 fi
diff --git a/cumulus/docker/test-parachain-collator.dockerfile b/cumulus/docker/test-parachain-collator.dockerfile
deleted file mode 100644
index 9c2d8fbe5818fe241da70a401968aa45a39fbf44..0000000000000000000000000000000000000000
--- a/cumulus/docker/test-parachain-collator.dockerfile
+++ /dev/null
@@ -1,46 +0,0 @@
-# This file is sourced from https://github.com/paritytech/polkadot/blob/master/scripts/ci/dockerfiles/polkadot/polkadot_builder.Dockerfile
-FROM docker.io/paritytech/ci-linux:production as builder
-
-WORKDIR /cumulus
-COPY . /cumulus
-
-RUN cargo build --release --locked -p polkadot-parachain
-
-# the collator stage is normally built once, cached, and then ignored, but can
-# be specified with the --target build flag. This adds some extra tooling to the
-# image, which is required for a launcher script. The script simply adds two
-# arguments to the list passed in:
-#
-#   --bootnodes /ip4/127.0.0.1/tcp/30333/p2p/PEER_ID
-#
-# with the appropriate ip and ID for both Alice and Bob
-FROM debian:buster-slim as collator
-RUN apt-get update && apt-get install jq curl bash -y && \
-    curl -sSo /wait-for-it.sh https://raw.githubusercontent.com/vishnubob/wait-for-it/master/wait-for-it.sh && \
-    chmod +x /wait-for-it.sh && \
-    curl -sL https://deb.nodesource.com/setup_12.x | bash - && \
-    apt-get install -y nodejs && \
-    npm install --global yarn && \
-    yarn global add @polkadot/api-cli@0.10.0-beta.14
-COPY --from=builder \
-    /paritytech/cumulus/target/release/polkadot-parachain /usr/bin
-COPY ./docker/scripts/inject_bootnodes.sh /usr/bin
-CMD ["/usr/bin/inject_bootnodes.sh"]
-COPY ./docker/scripts/healthcheck.sh /usr/bin/
-HEALTHCHECK --interval=300s --timeout=75s --start-period=30s --retries=3 \
-    CMD ["/usr/bin/healthcheck.sh"]
-
-# the runtime stage is normally built once, cached, and ignored, but can be
-# specified with the --target build flag. This just preserves one of the builder's
-# outputs, which can then be moved into a volume at runtime
-FROM debian:buster-slim as runtime
-COPY --from=builder \
-    /paritytech/cumulus/target/release/wbuild/cumulus-test-parachain-runtime/cumulus_test_parachain_runtime.compact.wasm \
-    /var/opt/
-CMD ["cp", "-v", "/var/opt/cumulus_test_parachain_runtime.compact.wasm", "/runtime/"]
-
-FROM debian:buster-slim
-COPY --from=builder \
-    /paritytech/cumulus/target/release/polkadot-parachain /usr/bin
-
-CMD ["/usr/bin/polkadot-parachain"]
diff --git a/cumulus/docker/test-parachain_injected.Dockerfile b/cumulus/docker/test-parachain_injected.Dockerfile
deleted file mode 100644
index 6056c504604e3be218b123791065624c32f4e87a..0000000000000000000000000000000000000000
--- a/cumulus/docker/test-parachain_injected.Dockerfile
+++ /dev/null
@@ -1,49 +0,0 @@
-FROM docker.io/library/ubuntu:20.04
-
-# metadata
-ARG VCS_REF
-ARG BUILD_DATE
-ARG IMAGE_NAME
-
-LABEL io.parity.image.authors="devops-team@parity.io" \
-	io.parity.image.vendor="Parity Technologies" \
-	io.parity.image.title="${IMAGE_NAME}" \
-	io.parity.image.description="Test parachain for Zombienet" \
-	io.parity.image.source="https://github.com/paritytech/cumulus/blob/${VCS_REF}/docker/test-parachain_injected.Dockerfile" \
-	io.parity.image.revision="${VCS_REF}" \
-	io.parity.image.created="${BUILD_DATE}" \
-	io.parity.image.documentation="https://github.com/paritytech/cumulus/"
-
-# show backtraces
-ENV RUST_BACKTRACE 1
-
-# install tools and dependencies
-RUN apt-get update && \
-	DEBIAN_FRONTEND=noninteractive apt-get install -y \
-	libssl1.1 \
-	ca-certificates \
-	curl && \
-	# apt cleanup
-	apt-get autoremove -y && \
-	apt-get clean && \
-	find /var/lib/apt/lists/ -type f -not -name lock -delete; \
-	# add user and link ~/.local/share/test-parachain to /data
-	useradd -m -u 10000 -U -s /bin/sh -d /test-parachain test-parachain && \
-	mkdir -p /data /test-parachain/.local/share && \
-	chown -R test-parachain:test-parachain /data && \
-	ln -s /data /test-parachain/.local/share/test-parachain && \
-	mkdir -p /specs
-
-# add test-parachain binary to the docker image
-COPY ./artifacts/test-parachain /usr/local/bin
-COPY ./parachains/chain-specs/*.json /specs/
-
-USER test-parachain
-
-# check if executable works in this container
-RUN /usr/local/bin/test-parachain --version
-
-EXPOSE 30333 9933 9944
-VOLUME ["/test-parachain"]
-
-ENTRYPOINT ["/usr/local/bin/test-parachain"]
diff --git a/cumulus/docs/container.md b/cumulus/docs/container.md
deleted file mode 100644
index 63575f37a59b93fc31d8d09030b1d97153566a42..0000000000000000000000000000000000000000
--- a/cumulus/docs/container.md
+++ /dev/null
@@ -1,60 +0,0 @@
-## Using Containers
-
-Using containers via **Podman** or **Docker** brings benefit, whether it is to build a container image or
-run a node while keeping a minimum footprint on your local system.
-
-This document mentions using `podman` or `docker`. Those are usually interchangeable and it is encouraged using preferably **Podman**. If you have podman installed and want to use all the commands mentioned below, you can simply create an alias with `alias docker=podman`.
-
-There are a few options to build a node within a container and inject a binary inside an image.
-
-### Parity built container image
-
-Parity builds and publishes a container image that can be found as `docker.io/parity/polkadot-parachain`.
-
-### Parity CI image
-
-Parity maintains and uses internally a generic "CI" image that can be used as a base to build binaries: [Parity CI container image](https://github.com/paritytech/scripts/tree/master/dockerfiles/ci-linux):
-
-The command below allows building a Linux binary without having to even install Rust or any dependency locally:
-
-```bash
-docker run --rm -it \
-	-w /shellhere/cumulus \
-    -v $(pwd):/shellhere/cumulus \
-    paritytech/ci-linux:production
-		cargo build --release --locked --bin polkadot-parachain
-sudo chown -R $(id -u):$(id -g) target/
-```
-
-If you want to reproduce other steps of CI process you can use the following
-[guide](https://github.com/paritytech/scripts#gitlab-ci-for-building-docker-images).
-
-### Injected image
-
-Injecting a binary inside a base image is the quickest option to get a working container image. This only works if you were able to build a Linux binary, either locally, or using a container as described above.
-
-After building a Linux binary ()`polkadot-parachain`) with cargo or with Parity CI image as documented above, the following command allows producing a new container image where the compiled binary is injected:
-
-```bash
-./docker/scripts/build-injected-image.sh
-```
-
-### Container build
-
-Alternatively, you can build an image with a builder pattern. This options takes a while but offers a simple method for anyone to get a working container image without requiring any of the Rust toolchain installed locally.
-
-```bash
-docker build \
-	--tag $OWNER/$IMAGE_NAME \
-	--file ./docker/polkadot-parachain_builder.Containerfile .
-```
-
-You may then run your new container:
-
-```bash
-docker run --rm -it \
-	$OWNER/$IMAGE_NAME \
-		--collator --tmp \
-		--execution wasm \
-		--chain /specs/westmint.json
-```
diff --git a/cumulus/docs/documentation.md b/cumulus/docs/documentation.md
deleted file mode 100644
index 383f7ff3c405795f45c54da0c71bbb379153a23d..0000000000000000000000000000000000000000
--- a/cumulus/docs/documentation.md
+++ /dev/null
@@ -1 +0,0 @@
-Was moved [here](https://github.com/paritytech/labels/blob/main/docs/doc_cumulus.md)
\ No newline at end of file
diff --git a/cumulus/docs/release.md b/cumulus/docs/release.md
index b04c4e844c4eda09fa82a4febeda9a47d0f527c9..8302b7b9b7fc046920a92a97894ff16e8baca214 100644
--- a/cumulus/docs/release.md
+++ b/cumulus/docs/release.md
@@ -37,8 +37,8 @@ performed during the release process.
 
 ### <a name="burnin"></a>Burn In
 
-Ensure that Parity DevOps has run the new release on Westend and Kusama Asset Hub collators for 12h
-prior to publishing the release.
+Ensure that Parity DevOps has run the new release on Westend and Kusama Asset Hub collators for 12h prior to publishing
+the release.
 
 ### Build Artifacts
 
@@ -75,56 +75,61 @@ function of the appropriate pallets.
 
 ### Extrinsic Ordering & Storage
 
-Offline signing libraries depend on a consistent ordering of call indices and
-functions. Compare the metadata of the current and new runtimes and ensure that
-the `module index, call index` tuples map to the same set of functions. It also checks if there have been any changes in `storage`. In case of a breaking change, increase `transaction_version`.
+Offline signing libraries depend on a consistent ordering of call indices and functions. Compare the metadata of the
+current and new runtimes and ensure that the `module index, call index` tuples map to the same set of functions. It also
+checks if there have been any changes in `storage`. In case of a breaking change, increase `transaction_version`.
 
-To verify the order has not changed, manually start the following [Github Action](https://github.com/paritytech/cumulus/actions/workflows/extrinsic-ordering-check-from-bin.yml). It takes around a minute to run and will produce the report as artifact you need to manually check.
+To verify the order has not changed, manually start the following
+[Github Action](https://github.com/paritytech/polkadot-sdk/cumulus/.github/workflows/release-20_extrinsic-ordering-check-from-bin.yml).
+It takes around a minute to run and will produce the report as artifact you need to manually check.
 
 To run it, in the _Run Workflow_ dropdown:
 1. **Use workflow from**: to ignore, leave `master` as default
-2. **The WebSocket url of the reference node**:
-	- Asset Hub Polkadot: `wss://statemint-rpc.polkadot.io`
+2. **The WebSocket url of the reference node**: - Asset Hub Polkadot: `wss://statemint-rpc.polkadot.io`
     - Asset Hub Kusama: `wss://statemine-rpc.polkadot.io`
     - Asset Hub Westend: `wss://westmint-rpc.polkadot.io`
-3. **A url to a Linux binary for the node containing the runtime to test**: Paste the URL of the latest release-candidate binary from the draft-release on Github. The binary has to previously be uploaded to S3 (Github url link to the binary is constantly changing)
+3. **A url to a Linux binary for the node containing the runtime to test**: Paste the URL of the latest
+   release-candidate binary from the draft-release on Github. The binary has to previously be uploaded to S3 (Github url
+   link to the binary is constantly changing)
     - E.g: https://releases.parity.io/cumulus/v0.9.270-rc3/polkadot-parachain
-4. **The name of the chain under test. Usually, you would pass a local chain**:
-	- Asset Hub Polkadot: `asset-hub-polkadot-local`
+4. **The name of the chain under test. Usually, you would pass a local chain**: - Asset Hub Polkadot:
+	`asset-hub-polkadot-local`
     - Asset Hub Kusama: `asset-hub-kusama-local`
     - Asset Hub Westend: `asset-hub-westend-local`
 5. Click **Run workflow**
 
-When the workflow is done, click on it and download the zip artifact, inside you'll find an `output.txt` file. The things to look for in the output are lines like:
+When the workflow is done, click on it and download the zip artifact, inside you'll find an `output.txt` file. The
+things to look for in the output are lines like:
 
 - `[Identity] idx 28 -> 25 (calls 15)` - indicates the index for Identity has changed
 - `[+] Society, Recovery` - indicates the new version includes 2 additional modules/pallets.
 - If no indices have changed, every modules line should look something like `[Identity] idx 25 (calls 15)`
 
-**Note**: Adding new functions to the runtime does not constitute a breaking change
-as long as the indexes did not change.
+**Note**: Adding new functions to the runtime does not constitute a breaking change as long as the indexes did not
+change.
 
-**Note**: Extrinsic function signatures changes (adding/removing & ordering arguments) are not caught by the job, so those changes should be reviewed "manually"
+**Note**: Extrinsic function signatures changes (adding/removing & ordering arguments) are not caught by the job, so
+those changes should be reviewed "manually"
 
 ### Benchmarks
 
-The Benchmarks can now be started from the CI. First find the CI pipeline from [here](https://gitlab.parity.io/parity/mirrors/cumulus/-/pipelines?page=1&scope=all&ref=release-parachains-v9220) and pick the latest.
-[Guide](https://github.com/paritytech/ci_cd/wiki/Benchmarks:-cumulus)
+The Benchmarks can now be started from the CI. First find the CI pipeline from
+[here](https://gitlab.parity.io/parity/mirrors/cumulus/-/pipelines?page=1&scope=all&ref=release-parachains-v9220) and
+pick the latest. [Guide](https://github.com/paritytech/ci_cd/wiki/Benchmarks:-cumulus)
 
 ### Integration Tests
 
 Until https://github.com/paritytech/ci_cd/issues/499 is done, tests will have to be run manually.
-1. Go to https://github.com/paritytech/parachains-integration-tests and check out the release branch.
-E.g. https://github.com/paritytech/parachains-integration-tests/tree/release-v9270-v0.9.27
-for `release-parachains-v0.9.270`
+1. Go to https://github.com/paritytech/parachains-integration-tests and check out the release branch. E.g.
+https://github.com/paritytech/parachains-integration-tests/tree/release-v9270-v0.9.27 for `release-parachains-v0.9.270`
 2. Clone `release-parachains-<version>` branch from Cumulus
 3. `cargo build --release`
 4. Copy `./target/polkadot-parachain` to `./bin`
-5. Clone `it/release-<version>-fast-sudo` from Polkadot
-In case the branch does not exists (it is a manual process): cherry pick paritytech/polkadot@791c8b8 and run
-`find . -type f -name "*.toml" -print0 | xargs -0 sed -i '' -e 's/polkadot-vX.X.X/polkadot-v<version>/g'`
+5. Clone `it/release-<version>-fast-sudo` from Polkadot In case the branch does not exists (it is a manual process):
+	cherry pick `paritytech/polkadot@791c8b8` and run:
+	`find . -type f -name "*.toml" -print0 | xargs -0 sed -i '' -e 's/polkadot-vX.X.X/polkadot-v<version>/g'`
 6. `cargo build --release --features fast-runtime`
 7. Copy `./target/polkadot` into `./bin` (in Cumulus)
 8. Run the tests:
-	- Asset Hub Polkadot: `yarn zombienet-test -c ./examples/statemint/config.toml -t ./examples/statemint`
-	- Asset Hub Kusama: `yarn zombienet-test -c ./examples/statemine/config.toml -t ./examples/statemine`
+   - Asset Hub Polkadot: `yarn zombienet-test -c ./examples/statemint/config.toml -t ./examples/statemint`
+   - Asset Hub Kusama: `yarn zombienet-test -c ./examples/statemine/config.toml -t ./examples/statemine`
diff --git a/cumulus/file_header.txt b/cumulus/file_header.txt
index 04f0c5de2716eb3f5c6037a67cca718c56b56e1e..712045bf2ca1506c47abc51d93b8e231133f0011 100644
--- a/cumulus/file_header.txt
+++ b/cumulus/file_header.txt
@@ -1,4 +1,4 @@
-// Copyright Parity Technologies (UK) Ltd.
+// Copyright (C) Parity Technologies (UK) Ltd.
 // This file is part of Cumulus.
 
 // Cumulus is free software: you can redistribute it and/or modify
diff --git a/cumulus/pallets/aura-ext/Cargo.toml b/cumulus/pallets/aura-ext/Cargo.toml
index b29bbe977899dcb581e36341280948f2b0bc4c32..a804edb58b39cd81ac9b93fb876db087510d5dda 100644
--- a/cumulus/pallets/aura-ext/Cargo.toml
+++ b/cumulus/pallets/aura-ext/Cargo.toml
@@ -1,8 +1,8 @@
 [package]
 name = "cumulus-pallet-aura-ext"
 version = "0.1.0"
-authors = ["Parity Technologies <admin@parity.io>"]
-edition = "2021"
+authors.workspace = true
+edition.workspace = true
 description = "AURA consensus extension pallet for parachains"
 
 [dependencies]
@@ -35,10 +35,18 @@ std = [
 	"frame-support/std",
 	"frame-system/std",
 	"pallet-aura/std",
+	"pallet-timestamp/std",
 	"scale-info/std",
 	"sp-application-crypto/std",
 	"sp-consensus-aura/std",
 	"sp-runtime/std",
 	"sp-std/std",
 ]
-try-runtime = [ "frame-support/try-runtime" ]
+try-runtime = [
+	"cumulus-pallet-parachain-system/try-runtime",
+	"frame-support/try-runtime",
+	"frame-system/try-runtime",
+	"pallet-aura/try-runtime",
+	"pallet-timestamp/try-runtime",
+	"sp-runtime/try-runtime",
+]
diff --git a/cumulus/pallets/aura-ext/src/consensus_hook.rs b/cumulus/pallets/aura-ext/src/consensus_hook.rs
index 745ee7a3352d305b777ef794b4dd902d7cc05c2a..089ab5c3198b98129e53e155dc4fcc009bf0e6d8 100644
--- a/cumulus/pallets/aura-ext/src/consensus_hook.rs
+++ b/cumulus/pallets/aura-ext/src/consensus_hook.rs
@@ -1,4 +1,4 @@
-// Copyright 2023 Parity Technologies (UK) Ltd.
+// Copyright (C) Parity Technologies (UK) Ltd.
 // This file is part of Cumulus.
 
 // Cumulus is free software: you can redistribute it and/or modify
diff --git a/cumulus/pallets/aura-ext/src/lib.rs b/cumulus/pallets/aura-ext/src/lib.rs
index d22202bdbaa8f8d7067288ec243ce50c3dc60da5..34a41557152d8df38e0abc2d612151b2f74dc779 100644
--- a/cumulus/pallets/aura-ext/src/lib.rs
+++ b/cumulus/pallets/aura-ext/src/lib.rs
@@ -1,4 +1,4 @@
-// Copyright 2021 Parity Technologies (UK) Ltd.
+// Copyright (C) Parity Technologies (UK) Ltd.
 // This file is part of Cumulus.
 
 // Cumulus is free software: you can redistribute it and/or modify
diff --git a/cumulus/pallets/collator-selection/Cargo.toml b/cumulus/pallets/collator-selection/Cargo.toml
index cce7e344daa6a54ee965fac3c427ae3f441dc4f9..1aba84aa29c7bde5ddedb2a16af7663d13f14b70 100644
--- a/cumulus/pallets/collator-selection/Cargo.toml
+++ b/cumulus/pallets/collator-selection/Cargo.toml
@@ -1,12 +1,12 @@
 [package]
-authors = ["Parity Technologies <admin@parity.io>"]
+authors.workspace = true
 description = "Simple pallet to select collators for a parachain."
-edition = "2021"
+edition.workspace = true
 homepage = "https://substrate.io"
 license = "Apache-2.0"
 name = "pallet-collator-selection"
 readme = "README.md"
-repository = "https://github.com/paritytech/cumulus/"
+repository.workspace = true
 version = "3.0.0"
 
 [package.metadata.docs.rs]
@@ -44,6 +44,10 @@ runtime-benchmarks = [
 	"frame-benchmarking/runtime-benchmarks",
 	"frame-support/runtime-benchmarks",
 	"frame-system/runtime-benchmarks",
+	"pallet-balances/runtime-benchmarks",
+	"pallet-timestamp/runtime-benchmarks",
+	"sp-runtime/runtime-benchmarks",
+	"sp-staking/runtime-benchmarks",
 ]
 std = [
 	"codec/std",
@@ -60,6 +64,15 @@ std = [
 	"sp-std/std",
 ]
 
-try-runtime = [ "frame-support/try-runtime" ]
+try-runtime = [
+	"frame-support/try-runtime",
+	"frame-system/try-runtime",
+	"pallet-aura/try-runtime",
+	"pallet-authorship/try-runtime",
+	"pallet-balances/try-runtime",
+	"pallet-session/try-runtime",
+	"pallet-timestamp/try-runtime",
+	"sp-runtime/try-runtime",
+]
 
 experimental = [ "pallet-aura/experimental" ]
diff --git a/cumulus/pallets/collator-selection/README.md b/cumulus/pallets/collator-selection/README.md
index 9718db58b37e9ae1c81b5b627fe27e51129cf418..811207fd8c0f916f31d08d27fc53499572b6bef4 100644
--- a/cumulus/pallets/collator-selection/README.md
+++ b/cumulus/pallets/collator-selection/README.md
@@ -1 +1 @@
-License: Apache-2.0
\ No newline at end of file
+License: Apache-2.0
diff --git a/cumulus/pallets/collator-selection/src/benchmarking.rs b/cumulus/pallets/collator-selection/src/benchmarking.rs
index 5eb8a5ce65bf41d700e119db1aa091b5eed9e647..49999dc114df7bdc94dca2f8c563d7c1d8bb6083 100644
--- a/cumulus/pallets/collator-selection/src/benchmarking.rs
+++ b/cumulus/pallets/collator-selection/src/benchmarking.rs
@@ -1,4 +1,4 @@
-// Copyright (C) 2021 Parity Technologies (UK) Ltd.
+// Copyright (C) Parity Technologies (UK) Ltd.
 // SPDX-License-Identifier: Apache-2.0
 
 // Licensed under the Apache License, Version 2.0 (the "License");
diff --git a/cumulus/pallets/collator-selection/src/lib.rs b/cumulus/pallets/collator-selection/src/lib.rs
index 924b24d71047da62dc96c7e979f8ea97a73e7df6..24493ce9d9cdc7f451f2e997615962ee5f0662e0 100644
--- a/cumulus/pallets/collator-selection/src/lib.rs
+++ b/cumulus/pallets/collator-selection/src/lib.rs
@@ -1,4 +1,4 @@
-// Copyright (C) 2021 Parity Technologies (UK) Ltd.
+// Copyright (C) Parity Technologies (UK) Ltd.
 // SPDX-License-Identifier: Apache-2.0
 
 // Licensed under the Apache License, Version 2.0 (the "License");
diff --git a/cumulus/pallets/collator-selection/src/migration.rs b/cumulus/pallets/collator-selection/src/migration.rs
index 3b298353386d0f8265004033a297d17575eae1e9..58b4cc5b06a1ab7da17b31ad3c457fd992c59136 100644
--- a/cumulus/pallets/collator-selection/src/migration.rs
+++ b/cumulus/pallets/collator-selection/src/migration.rs
@@ -1,4 +1,4 @@
-// Copyright Parity Technologies (UK) Ltd.
+// Copyright (C) Parity Technologies (UK) Ltd.
 // This file is part of Polkadot.
 
 // Polkadot is free software: you can redistribute it and/or modify
diff --git a/cumulus/pallets/collator-selection/src/mock.rs b/cumulus/pallets/collator-selection/src/mock.rs
index d8c6d783f3f3a538bf0013ba1bafda33b63485db..44d531c971ee3bee08f572ac797a93d1759a5cfa 100644
--- a/cumulus/pallets/collator-selection/src/mock.rs
+++ b/cumulus/pallets/collator-selection/src/mock.rs
@@ -1,4 +1,4 @@
-// Copyright (C) 2021 Parity Technologies (UK) Ltd.
+// Copyright (C) Parity Technologies (UK) Ltd.
 // SPDX-License-Identifier: Apache-2.0
 
 // Licensed under the Apache License, Version 2.0 (the "License");
diff --git a/cumulus/pallets/collator-selection/src/tests.rs b/cumulus/pallets/collator-selection/src/tests.rs
index cbfbde743f0ee583b0e729cb7718c736c491d76f..d4dae513df375145c35a83d7af274e581a94a60b 100644
--- a/cumulus/pallets/collator-selection/src/tests.rs
+++ b/cumulus/pallets/collator-selection/src/tests.rs
@@ -1,4 +1,4 @@
-// Copyright (C) 2021 Parity Technologies (UK) Ltd.
+// Copyright (C) Parity Technologies (UK) Ltd.
 // SPDX-License-Identifier: Apache-2.0
 
 // Licensed under the Apache License, Version 2.0 (the "License");
diff --git a/cumulus/pallets/collator-selection/src/weights.rs b/cumulus/pallets/collator-selection/src/weights.rs
index a4a30d833612a11f8ad77ba08a13aefaaad3d8b8..f8f86fb7dec2c08601eebe4d8b345a0f7c930b70 100644
--- a/cumulus/pallets/collator-selection/src/weights.rs
+++ b/cumulus/pallets/collator-selection/src/weights.rs
@@ -1,6 +1,6 @@
 // This file is part of Substrate.
 
-// Copyright (C) 2021 Parity Technologies (UK) Ltd.
+// Copyright (C) Parity Technologies (UK) Ltd.
 // SPDX-License-Identifier: Apache-2.0
 
 // Licensed under the Apache License, Version 2.0 (the "License");
diff --git a/cumulus/pallets/dmp-queue/Cargo.toml b/cumulus/pallets/dmp-queue/Cargo.toml
index 3777383349fc3f60f704cc55339f9eb98df077cf..9d61a2c99fd35af24ac0bdd51a4dfb5aa4b5fd65 100644
--- a/cumulus/pallets/dmp-queue/Cargo.toml
+++ b/cumulus/pallets/dmp-queue/Cargo.toml
@@ -1,8 +1,8 @@
 [package]
 name = "cumulus-pallet-dmp-queue"
 version = "0.1.0"
-authors = ["Parity Technologies <admin@parity.io>"]
-edition = "2021"
+authors.workspace = true
+edition.workspace = true
 
 [dependencies]
 codec = { package = "parity-scale-codec", version = "3.0.0", features = [ "derive" ], default-features = false }
@@ -17,7 +17,7 @@ sp-runtime = { path = "../../../substrate/primitives/runtime", default-features
 sp-std = { path = "../../../substrate/primitives/std", default-features = false}
 
 # Polkadot
-xcm = { path = "../../../polkadot/xcm", default-features = false}
+xcm = { package = "staging-xcm", path = "../../../polkadot/xcm", default-features = false}
 
 # Cumulus
 cumulus-primitives-core = { path = "../../primitives/core", default-features = false }
@@ -35,9 +35,15 @@ std = [
 	"frame-system/std",
 	"log/std",
 	"scale-info/std",
+	"sp-core/std",
 	"sp-io/std",
 	"sp-runtime/std",
 	"sp-std/std",
+	"sp-version/std",
 	"xcm/std",
 ]
-try-runtime = [ "frame-support/try-runtime" ]
+try-runtime = [
+	"frame-support/try-runtime",
+	"frame-system/try-runtime",
+	"sp-runtime/try-runtime",
+]
diff --git a/cumulus/pallets/dmp-queue/src/lib.rs b/cumulus/pallets/dmp-queue/src/lib.rs
index aca9025d9e33594a2897f383457fae6c04de5de9..eff4a625ef1b6ff88ae23cee2cc252af78921a67 100644
--- a/cumulus/pallets/dmp-queue/src/lib.rs
+++ b/cumulus/pallets/dmp-queue/src/lib.rs
@@ -1,4 +1,4 @@
-// Copyright 2020-2021 Parity Technologies (UK) Ltd.
+// Copyright (C) Parity Technologies (UK) Ltd.
 // This file is part of Cumulus.
 
 // Cumulus is free software: you can redistribute it and/or modify
diff --git a/cumulus/pallets/dmp-queue/src/migration.rs b/cumulus/pallets/dmp-queue/src/migration.rs
index b2323f6a60fa6e14a333df27a2f986aaa646fed8..63457ee493697cc7e0b6cb32433cd0d55b9e2244 100644
--- a/cumulus/pallets/dmp-queue/src/migration.rs
+++ b/cumulus/pallets/dmp-queue/src/migration.rs
@@ -1,4 +1,4 @@
-// Copyright 2022 Parity Technologies (UK) Ltd.
+// Copyright (C) Parity Technologies (UK) Ltd.
 // This file is part of Polkadot.
 
 // Polkadot is free software: you can redistribute it and/or modify
diff --git a/cumulus/pallets/parachain-system/Cargo.toml b/cumulus/pallets/parachain-system/Cargo.toml
index cfc439724f5aa8c0b1d496629cc94e527cfab515..5470dce47480e3d5f3287ec078f886eb0302aaa9 100644
--- a/cumulus/pallets/parachain-system/Cargo.toml
+++ b/cumulus/pallets/parachain-system/Cargo.toml
@@ -1,8 +1,8 @@
 [package]
 name = "cumulus-pallet-parachain-system"
 version = "0.1.0"
-authors = ["Parity Technologies <admin@parity.io>"]
-edition = "2021"
+authors.workspace = true
+edition.workspace = true
 description = "Base pallet for cumulus-based parachains"
 
 [dependencies]
@@ -11,7 +11,7 @@ codec = { package = "parity-scale-codec", version = "3.0.0", default-features =
 environmental = { version = "1.1.4", default-features = false }
 impl-trait-for-tuples = "0.2.1"
 log = { version = "0.4.20", default-features = false }
-trie-db = { version = "0.27.1", default-features = false }
+trie-db = { version = "0.28.0", default-features = false }
 scale-info = { version = "2.9.0", default-features = false, features = ["derive"] }
 
 # Substrate
@@ -28,8 +28,8 @@ sp-trie = { path = "../../../substrate/primitives/trie", default-features = fals
 sp-version = { path = "../../../substrate/primitives/version", default-features = false}
 
 # Polkadot
-polkadot-parachain = { path = "../../../polkadot/parachain", default-features = false, features = [ "wasm-api" ]}
-xcm = { path = "../../../polkadot/xcm", default-features = false}
+polkadot-parachain-primitives = { path = "../../../polkadot/parachain", default-features = false, features = [ "wasm-api" ]}
+xcm = { package = "staging-xcm", path = "../../../polkadot/xcm", default-features = false}
 
 # Cumulus
 cumulus-pallet-parachain-system-proc-macro = { path = "proc-macro", default-features = false }
@@ -62,9 +62,11 @@ std = [
 	"frame-support/std",
 	"frame-system/std",
 	"log/std",
+	"polkadot-parachain-primitives/std",
 	"scale-info/std",
 	"sp-core/std",
 	"sp-externalities/std",
+	"sp-inherents/std",
 	"sp-io/std",
 	"sp-runtime/std",
 	"sp-state-machine/std",
@@ -74,8 +76,17 @@ std = [
 	"xcm/std",
 ]
 
-runtime-benchmarks = [ "sp-runtime/runtime-benchmarks" ]
+runtime-benchmarks = [
+	"frame-support/runtime-benchmarks",
+	"frame-system/runtime-benchmarks",
+	"polkadot-parachain-primitives/runtime-benchmarks",
+	"sp-runtime/runtime-benchmarks",
+]
 
-try-runtime = [ "frame-support/try-runtime" ]
+try-runtime = [
+	"frame-support/try-runtime",
+	"frame-system/try-runtime",
+	"sp-runtime/try-runtime",
+]
 
 parameterized-consensus-hook = []
diff --git a/cumulus/pallets/parachain-system/proc-macro/Cargo.toml b/cumulus/pallets/parachain-system/proc-macro/Cargo.toml
index 2b5b339d9da99ddb3e408b06029e3c9705d28322..cb5d9904c7cf3c37e4a0d8fe13fc175888cad20d 100644
--- a/cumulus/pallets/parachain-system/proc-macro/Cargo.toml
+++ b/cumulus/pallets/parachain-system/proc-macro/Cargo.toml
@@ -1,15 +1,15 @@
 [package]
 name = "cumulus-pallet-parachain-system-proc-macro"
 version = "0.1.0"
-authors = ["Parity Technologies <admin@parity.io>"]
-edition = "2021"
+authors.workspace = true
+edition.workspace = true
 description = "Proc macros provided by the parachain-system pallet"
 
 [lib]
 proc-macro = true
 
 [dependencies]
-syn = "2.0.29"
+syn = "2.0.38"
 proc-macro2 = "1.0.64"
 quote = "1.0.33"
 proc-macro-crate = "1.3.1"
diff --git a/cumulus/pallets/parachain-system/proc-macro/src/lib.rs b/cumulus/pallets/parachain-system/proc-macro/src/lib.rs
index 70c6857120c73466bd3f1e9c49eec4e2bffd8701..8ab5d81efdcf486dff67db6a1f5a62a5a8454ae8 100644
--- a/cumulus/pallets/parachain-system/proc-macro/src/lib.rs
+++ b/cumulus/pallets/parachain-system/proc-macro/src/lib.rs
@@ -1,4 +1,4 @@
-// Copyright 2021 Parity Technologies (UK) Ltd.
+// Copyright (C) Parity Technologies (UK) Ltd.
 // This file is part of Cumulus.
 
 // Cumulus is free software: you can redistribute it and/or modify
@@ -142,7 +142,7 @@ pub fn register_validate_block(input: proc_macro::TokenStream) -> proc_macro::To
 						#check_inherents,
 					>(params);
 
-					#crate_::validate_block::polkadot_parachain::write_result(&res)
+					#crate_::validate_block::polkadot_parachain_primitives::write_result(&res)
 				}
 			}
 		}
diff --git a/cumulus/pallets/parachain-system/src/consensus_hook.rs b/cumulus/pallets/parachain-system/src/consensus_hook.rs
index 2566eea9bbcc2ad3d418ca9765ececcdabf77bf2..91353fc7bbda7ce05cfb5259e05bde64c758bbe4 100644
--- a/cumulus/pallets/parachain-system/src/consensus_hook.rs
+++ b/cumulus/pallets/parachain-system/src/consensus_hook.rs
@@ -1,4 +1,4 @@
-// Copyright 2023 Parity Technologies (UK) Ltd.
+// Copyright (C) Parity Technologies (UK) Ltd.
 // This file is part of Cumulus.
 
 // Cumulus is free software: you can redistribute it and/or modify
diff --git a/cumulus/pallets/parachain-system/src/lib.rs b/cumulus/pallets/parachain-system/src/lib.rs
index ded869bf6f793aae860eee4e26d9f1e58515a5d6..eaf15768e290de18e7d7c22cb9ca8abec9afa53d 100644
--- a/cumulus/pallets/parachain-system/src/lib.rs
+++ b/cumulus/pallets/parachain-system/src/lib.rs
@@ -1,4 +1,4 @@
-// Copyright 2020 Parity Technologies (UK) Ltd.
+// Copyright (C) Parity Technologies (UK) Ltd.
 // This file is part of Cumulus.
 
 // Cumulus is free software: you can redistribute it and/or modify
@@ -36,7 +36,7 @@ use cumulus_primitives_core::{
 };
 use cumulus_primitives_parachain_inherent::{MessageQueueChain, ParachainInherentData};
 use frame_support::{
-	dispatch::{DispatchError, DispatchResult, Pays, PostDispatchInfo},
+	dispatch::{DispatchResult, Pays, PostDispatchInfo},
 	ensure,
 	inherent::{InherentData, InherentIdentifier, ProvideInherent},
 	storage,
@@ -44,7 +44,7 @@ use frame_support::{
 	weights::Weight,
 };
 use frame_system::{ensure_none, ensure_root, pallet_prelude::HeaderFor};
-use polkadot_parachain::primitives::RelayChainBlockNumber;
+use polkadot_parachain_primitives::primitives::RelayChainBlockNumber;
 use scale_info::TypeInfo;
 use sp_runtime::{
 	traits::{Block as BlockT, BlockNumberProvider, Hash},
@@ -52,7 +52,7 @@ use sp_runtime::{
 		InvalidTransaction, TransactionLongevity, TransactionSource, TransactionValidity,
 		ValidTransaction,
 	},
-	RuntimeDebug,
+	DispatchError, RuntimeDebug,
 };
 use sp_std::{cmp, collections::btree_map::BTreeMap, prelude::*};
 use xcm::latest::XcmHash;
@@ -245,10 +245,10 @@ pub mod pallet {
 			<UpgradeRestrictionSignal<T>>::kill();
 			let relay_upgrade_go_ahead = <UpgradeGoAhead<T>>::take();
 
-			assert!(
-				<ValidationData<T>>::exists(),
-				"set_validation_data inherent needs to be present in every block!"
-			);
+			let vfp = <ValidationData<T>>::get()
+				.expect("set_validation_data inherent needs to be present in every block!");
+
+			LastRelayChainBlockNumber::<T>::put(vfp.relay_parent_number);
 
 			let host_config = match Self::host_configuration() {
 				Some(ok) => ok,
@@ -380,8 +380,7 @@ pub mod pallet {
 				let ancestor = Ancestor::new_unchecked(used_bandwidth, consumed_go_ahead_signal);
 
 				let watermark = HrmpWatermark::<T>::get();
-				let watermark_update =
-					HrmpWatermarkUpdate::new(watermark, LastRelayChainBlockNumber::<T>::get());
+				let watermark_update = HrmpWatermarkUpdate::new(watermark, vfp.relay_parent_number);
 
 				aggregated_segment
 					.append(&ancestor, watermark_update, &total_bandwidth_out)
@@ -460,6 +459,9 @@ pub mod pallet {
 				4 + hrmp_max_message_num_per_candidate as u64,
 			);
 
+			// Weight for updating the last relay chain block number in `on_finalize`.
+			weight += T::DbWeight::get().reads_writes(1, 1);
+
 			// Weight for adjusting the unincluded segment in `on_finalize`.
 			weight += T::DbWeight::get().reads_writes(6, 3);
 
@@ -515,7 +517,6 @@ pub mod pallet {
 				vfp.relay_parent_number,
 				LastRelayChainBlockNumber::<T>::get(),
 			);
-			LastRelayChainBlockNumber::<T>::put(vfp.relay_parent_number);
 
 			let relay_state_proof = RelayChainStateProof::new(
 				T::SelfParaId::get(),
@@ -756,6 +757,8 @@ pub mod pallet {
 	pub(super) type DidSetValidationCode<T: Config> = StorageValue<_, bool, ValueQuery>;
 
 	/// The relay chain block number associated with the last parachain block.
+	///
+	/// This is updated in `on_finalize`.
 	#[pallet::storage]
 	pub(super) type LastRelayChainBlockNumber<T: Config> =
 		StorageValue<_, RelayChainBlockNumber, ValueQuery>;
@@ -1400,12 +1403,12 @@ impl<T: Config> Pallet<T> {
 		CustomValidationHeadData::<T>::put(head_data);
 	}
 
-	/// Open HRMP channel for using it in benchmarks.
+	/// Open HRMP channel for using it in benchmarks or tests.
 	///
 	/// The caller assumes that the pallet will accept regular outbound message to the sibling
 	/// `target_parachain` after this call. No other assumptions are made.
-	#[cfg(feature = "runtime-benchmarks")]
-	pub fn open_outbound_hrmp_channel_for_benchmarks(target_parachain: ParaId) {
+	#[cfg(any(feature = "runtime-benchmarks", feature = "std"))]
+	pub fn open_outbound_hrmp_channel_for_benchmarks_or_tests(target_parachain: ParaId) {
 		RelevantMessagingState::<T>::put(MessagingStateSnapshot {
 			dmq_mqc_head: Default::default(),
 			relay_dispatch_queue_remaining_capacity: Default::default(),
@@ -1429,7 +1432,7 @@ impl<T: Config> Pallet<T> {
 	pub fn initialize_for_set_code_benchmark(max_code_size: u32) {
 		// insert dummy ValidationData
 		let vfp = PersistedValidationData {
-			parent_head: polkadot_parachain::primitives::HeadData(Default::default()),
+			parent_head: polkadot_parachain_primitives::primitives::HeadData(Default::default()),
 			relay_parent_number: 1,
 			relay_parent_storage_root: Default::default(),
 			max_pov_size: 1_000,
@@ -1447,7 +1450,7 @@ impl<T: Config> Pallet<T> {
 			hrmp_max_message_num_per_candidate: 2,
 			validation_upgrade_cooldown: 2,
 			validation_upgrade_delay: 2,
-			async_backing_params: relay_chain::vstaging::AsyncBackingParams {
+			async_backing_params: relay_chain::AsyncBackingParams {
 				allowed_ancestry_len: 0,
 				max_candidate_depth: 0,
 			},
@@ -1501,6 +1504,12 @@ impl<T: Config> Pallet<T> {
 		Self::deposit_event(Event::UpwardMessageSent { message_hash: Some(hash) });
 		Ok((0, hash))
 	}
+
+	/// Get the relay chain block number which was used as an anchor for the last block in this
+	/// chain.
+	pub fn last_relay_block_number(&self) -> RelayChainBlockNumber {
+		LastRelayChainBlockNumber::<T>::get()
+	}
 }
 
 impl<T: Config> UpwardMessageSender for Pallet<T> {
diff --git a/cumulus/pallets/parachain-system/src/migration.rs b/cumulus/pallets/parachain-system/src/migration.rs
index 17dce3a11a9da9d193e342df083c295d7db85294..a92f85b9cd420e9e1027d1f82c643d90fea8b97c 100644
--- a/cumulus/pallets/parachain-system/src/migration.rs
+++ b/cumulus/pallets/parachain-system/src/migration.rs
@@ -1,4 +1,4 @@
-// Copyright 2021 Parity Technologies (UK) Ltd.
+// Copyright (C) Parity Technologies (UK) Ltd.
 // This file is part of Cumulus.
 
 // Cumulus is free software: you can redistribute it and/or modify
diff --git a/cumulus/pallets/parachain-system/src/relay_state_snapshot.rs b/cumulus/pallets/parachain-system/src/relay_state_snapshot.rs
index b8556485041657e9664f061d1121ba0ac4d59547..5519d1521ea6da85573f2ecdd9cca001616b5806 100644
--- a/cumulus/pallets/parachain-system/src/relay_state_snapshot.rs
+++ b/cumulus/pallets/parachain-system/src/relay_state_snapshot.rs
@@ -1,4 +1,4 @@
-// Copyright 2021 Parity Technologies (UK) Ltd.
+// Copyright (C) Parity Technologies (UK) Ltd.
 // This file is part of Cumulus.
 
 // Cumulus is free software: you can redistribute it and/or modify
diff --git a/cumulus/pallets/parachain-system/src/tests.rs b/cumulus/pallets/parachain-system/src/tests.rs
index 41e8dc63808d7178a7da38d3f3b76c5a8406f6f9..626196790bc99f611c099a815019e336b4dd7df0 100755
--- a/cumulus/pallets/parachain-system/src/tests.rs
+++ b/cumulus/pallets/parachain-system/src/tests.rs
@@ -1,4 +1,4 @@
-// Copyright 2020 Parity Technologies (UK) Ltd.
+// Copyright (C) Parity Technologies (UK) Ltd.
 // This file is part of Cumulus.
 
 // Cumulus is free software: you can redistribute it and/or modify
@@ -23,10 +23,9 @@ use cumulus_primitives_core::{
 use cumulus_test_relay_sproof_builder::RelayStateSproofBuilder;
 use frame_support::{
 	assert_ok,
-	dispatch::UnfilteredDispatchable,
 	inherent::{InherentData, ProvideInherent},
 	parameter_types,
-	traits::{OnFinalize, OnInitialize},
+	traits::{OnFinalize, OnInitialize, UnfilteredDispatchable},
 	weights::Weight,
 };
 use frame_system::{
diff --git a/cumulus/pallets/parachain-system/src/unincluded_segment.rs b/cumulus/pallets/parachain-system/src/unincluded_segment.rs
index 2598228dd60c41a53b921c805b72cfff00a526c3..1e83a945c4ee37f2ad8ee1c45d11892f47c40be4 100644
--- a/cumulus/pallets/parachain-system/src/unincluded_segment.rs
+++ b/cumulus/pallets/parachain-system/src/unincluded_segment.rs
@@ -1,4 +1,4 @@
-// Copyright 2023 Parity Technologies (UK) Ltd.
+// Copyright (C) Parity Technologies (UK) Ltd.
 // This file is part of Cumulus.
 
 // Cumulus is free software: you can redistribute it and/or modify
diff --git a/cumulus/pallets/parachain-system/src/validate_block/implementation.rs b/cumulus/pallets/parachain-system/src/validate_block/implementation.rs
index 0eb83639018bf28f234907f819f2a4bdaf27b0a6..ce3b724420f1c9e50b65a81074e023c6b735227b 100644
--- a/cumulus/pallets/parachain-system/src/validate_block/implementation.rs
+++ b/cumulus/pallets/parachain-system/src/validate_block/implementation.rs
@@ -1,4 +1,4 @@
-// Copyright 2019-2021 Parity Technologies (UK) Ltd.
+// Copyright (C) Parity Technologies (UK) Ltd.
 // This file is part of Substrate.
 
 // Substrate is free software: you can redistribute it and/or modify
@@ -22,7 +22,9 @@ use cumulus_primitives_core::{
 };
 use cumulus_primitives_parachain_inherent::ParachainInherentData;
 
-use polkadot_parachain::primitives::{HeadData, RelayChainBlockNumber, ValidationResult};
+use polkadot_parachain_primitives::primitives::{
+	HeadData, RelayChainBlockNumber, ValidationResult,
+};
 
 use codec::Encode;
 
diff --git a/cumulus/pallets/parachain-system/src/validate_block/mod.rs b/cumulus/pallets/parachain-system/src/validate_block/mod.rs
index 4e387bf849623f0aea2c3ab5ae82c851a166b278..db149401638aabeb65f3242fc450e27f8edb93cd 100644
--- a/cumulus/pallets/parachain-system/src/validate_block/mod.rs
+++ b/cumulus/pallets/parachain-system/src/validate_block/mod.rs
@@ -1,4 +1,4 @@
-// Copyright 2019-2021 Parity Technologies (UK) Ltd.
+// Copyright (C) Parity Technologies (UK) Ltd.
 // This file is part of Substrate.
 
 // Substrate is free software: you can redistribute it and/or modify
@@ -34,7 +34,7 @@ pub use bytes;
 pub use codec::decode_from_bytes;
 #[cfg(not(feature = "std"))]
 #[doc(hidden)]
-pub use polkadot_parachain;
+pub use polkadot_parachain_primitives;
 #[cfg(not(feature = "std"))]
 #[doc(hidden)]
 pub use sp_runtime::traits::GetRuntimeBlockType;
@@ -42,15 +42,16 @@ pub use sp_runtime::traits::GetRuntimeBlockType;
 #[doc(hidden)]
 pub use sp_std;
 
-/// Basically the same as [`ValidationParams`](polkadot_parachain::primitives::ValidationParams),
-/// but a little bit optimized for our use case here.
+/// Basically the same as
+/// [`ValidationParams`](polkadot_parachain_primitives::primitives::ValidationParams), but a little
+/// bit optimized for our use case here.
 ///
 /// `block_data` and `head_data` are represented as [`bytes::Bytes`] to make them reuse
 /// the memory of the input parameter of the exported `validate_blocks` function.
 ///
 /// The layout of this type must match exactly the layout of
-/// [`ValidationParams`](polkadot_parachain::primitives::ValidationParams) to have the same
-/// SCALE encoding.
+/// [`ValidationParams`](polkadot_parachain_primitives::primitives::ValidationParams) to have the
+/// same SCALE encoding.
 #[derive(codec::Decode)]
 #[cfg_attr(feature = "std", derive(codec::Encode))]
 #[doc(hidden)]
diff --git a/cumulus/pallets/parachain-system/src/validate_block/tests.rs b/cumulus/pallets/parachain-system/src/validate_block/tests.rs
index 7772f6372567a70e43a8c38fe9e93aaf89a901b4..0cf68f25cc34b7be302b5983d5f7f27fcfcf13f1 100644
--- a/cumulus/pallets/parachain-system/src/validate_block/tests.rs
+++ b/cumulus/pallets/parachain-system/src/validate_block/tests.rs
@@ -1,4 +1,4 @@
-// Copyright 2019-2021 Parity Technologies (UK) Ltd.
+// Copyright (C) Parity Technologies (UK) Ltd.
 // This file is part of Substrate.
 
 // Substrate is free software: you can redistribute it and/or modify
diff --git a/cumulus/pallets/session-benchmarking/Cargo.toml b/cumulus/pallets/session-benchmarking/Cargo.toml
index 901ddb186eead5d7be4a3b4e61a36699dff8c651..a28971d66d3f667892676d7a9d756a40f1d9f4d2 100644
--- a/cumulus/pallets/session-benchmarking/Cargo.toml
+++ b/cumulus/pallets/session-benchmarking/Cargo.toml
@@ -1,11 +1,11 @@
 [package]
 name = "cumulus-pallet-session-benchmarking"
 version = "3.0.0"
-authors = ["Parity Technologies <admin@parity.io>"]
-edition = "2021"
+authors.workspace = true
+edition.workspace = true
 license = "Apache-2.0"
 homepage = "https://substrate.io"
-repository = "https://github.com/paritytech/cumulus/"
+repository.workspace = true
 description = "FRAME sessions pallet benchmarking"
 readme = "README.md"
 
@@ -27,6 +27,7 @@ runtime-benchmarks = [
 	"frame-benchmarking/runtime-benchmarks",
 	"frame-support/runtime-benchmarks",
 	"frame-system/runtime-benchmarks",
+	"sp-runtime/runtime-benchmarks",
 ]
 std = [
 	"frame-benchmarking/std",
diff --git a/cumulus/pallets/session-benchmarking/src/lib.rs b/cumulus/pallets/session-benchmarking/src/lib.rs
index 5217bbae71b478b74f917a071b8144a122953353..f474def6b13762136ca90b2f812e9c5a3e26a0e2 100644
--- a/cumulus/pallets/session-benchmarking/src/lib.rs
+++ b/cumulus/pallets/session-benchmarking/src/lib.rs
@@ -1,4 +1,4 @@
-// Copyright (C) 2021 Parity Technologies (UK) Ltd.
+// Copyright (C) Parity Technologies (UK) Ltd.
 // SPDX-License-Identifier: Apache-2.0
 
 // Licensed under the Apache License, Version 2.0 (the "License");
diff --git a/cumulus/pallets/solo-to-para/Cargo.toml b/cumulus/pallets/solo-to-para/Cargo.toml
index 94e0becafc985ab3e6721839ee42a3060d7d5db4..6a3fe59b4020e44c53bd0d4f0a5696f63b602282 100644
--- a/cumulus/pallets/solo-to-para/Cargo.toml
+++ b/cumulus/pallets/solo-to-para/Cargo.toml
@@ -1,8 +1,8 @@
 [package]
 name = "cumulus-pallet-solo-to-para"
 version = "0.1.0"
-authors = ["Parity Technologies <admin@parity.io>"]
-edition = "2021"
+authors.workspace = true
+edition.workspace = true
 description = "Adds functionality to migrate from a Solo to a Parachain"
 
 [dependencies]
@@ -35,4 +35,10 @@ std = [
 	"sp-runtime/std",
 	"sp-std/std",
 ]
-try-runtime = [ "frame-support/try-runtime" ]
+try-runtime = [
+	"cumulus-pallet-parachain-system/try-runtime",
+	"frame-support/try-runtime",
+	"frame-system/try-runtime",
+	"pallet-sudo/try-runtime",
+	"sp-runtime/try-runtime",
+]
diff --git a/cumulus/pallets/solo-to-para/src/lib.rs b/cumulus/pallets/solo-to-para/src/lib.rs
index 5672ec4ece4ab4763be94c786eb60bf3a2366885..da948615d4e90a5f109cb56b47f796acead6535c 100644
--- a/cumulus/pallets/solo-to-para/src/lib.rs
+++ b/cumulus/pallets/solo-to-para/src/lib.rs
@@ -1,4 +1,4 @@
-// Copyright 2022 Parity Technologies (UK) Ltd.
+// Copyright (C) Parity Technologies (UK) Ltd.
 // This file is part of Cumulus.
 
 // Cumulus is free software: you can redistribute it and/or modify
diff --git a/cumulus/pallets/xcm/Cargo.toml b/cumulus/pallets/xcm/Cargo.toml
index d6b8c62005793312c0f4f85611cff6f1aacb64e3..229edaaab4c881c7399ff6036dafbb2f0d7ba1e2 100644
--- a/cumulus/pallets/xcm/Cargo.toml
+++ b/cumulus/pallets/xcm/Cargo.toml
@@ -1,6 +1,6 @@
 [package]
-authors = ["Parity Technologies <admin@parity.io>"]
-edition = "2021"
+authors.workspace = true
+edition.workspace = true
 name = "cumulus-pallet-xcm"
 version = "0.1.0"
 
@@ -14,7 +14,7 @@ sp-runtime = { path = "../../../substrate/primitives/runtime", default-features
 frame-support = { path = "../../../substrate/frame/support", default-features = false}
 frame-system = { path = "../../../substrate/frame/system", default-features = false}
 
-xcm = { path = "../../../polkadot/xcm", default-features = false}
+xcm = { package = "staging-xcm", path = "../../../polkadot/xcm", default-features = false}
 
 cumulus-primitives-core = { path = "../../primitives/core", default-features = false }
 
@@ -26,8 +26,13 @@ std = [
 	"frame-support/std",
 	"frame-system/std",
 	"scale-info/std",
+	"sp-io/std",
 	"sp-runtime/std",
 	"sp-std/std",
 	"xcm/std",
 ]
-try-runtime = [ "frame-support/try-runtime" ]
+try-runtime = [
+	"frame-support/try-runtime",
+	"frame-system/try-runtime",
+	"sp-runtime/try-runtime",
+]
diff --git a/cumulus/pallets/xcm/src/lib.rs b/cumulus/pallets/xcm/src/lib.rs
index f230ced5dc5581eb0e2573676391c99aa5e575da..69b4f43754003495b4e6cec9b8e9e29e1ce73a08 100644
--- a/cumulus/pallets/xcm/src/lib.rs
+++ b/cumulus/pallets/xcm/src/lib.rs
@@ -1,4 +1,4 @@
-// Copyright 2020-2021 Parity Technologies (UK) Ltd.
+// Copyright (C) Parity Technologies (UK) Ltd.
 // This file is part of Cumulus.
 
 // Cumulus is free software: you can redistribute it and/or modify
@@ -24,7 +24,7 @@ use codec::{Decode, DecodeLimit, Encode};
 use cumulus_primitives_core::{
 	relay_chain::BlockNumber as RelayBlockNumber, DmpMessageHandler, ParaId,
 };
-use frame_support::dispatch::Weight;
+use frame_support::weights::Weight;
 pub use pallet::*;
 use scale_info::TypeInfo;
 use sp_runtime::{traits::BadOrigin, RuntimeDebug};
diff --git a/cumulus/pallets/xcmp-queue/Cargo.toml b/cumulus/pallets/xcmp-queue/Cargo.toml
index 2cd319dd1c6634216cdbdf94ed78526e3e00da28..5aab57da91b4f731567bd81d384cab646beb936d 100644
--- a/cumulus/pallets/xcmp-queue/Cargo.toml
+++ b/cumulus/pallets/xcmp-queue/Cargo.toml
@@ -1,8 +1,8 @@
 [package]
 name = "cumulus-pallet-xcmp-queue"
 version = "0.1.0"
-authors = ["Parity Technologies <admin@parity.io>"]
-edition = "2021"
+authors.workspace = true
+edition.workspace = true
 
 [dependencies]
 codec = { package = "parity-scale-codec", version = "3.0.0", features = [ "derive" ], default-features = false }
@@ -19,8 +19,8 @@ sp-std = { path = "../../../substrate/primitives/std", default-features = false}
 
 # Polkadot
 polkadot-runtime-common = { path = "../../../polkadot/runtime/common", default-features = false}
-xcm = { path = "../../../polkadot/xcm", default-features = false}
-xcm-executor = { path = "../../../polkadot/xcm/xcm-executor", default-features = false}
+xcm = { package = "staging-xcm", path = "../../../polkadot/xcm", default-features = false}
+xcm-executor = { package = "staging-xcm-executor", path = "../../../polkadot/xcm/xcm-executor", default-features = false}
 
 # Cumulus
 cumulus-primitives-core = { path = "../../primitives/core", default-features = false }
@@ -35,16 +35,17 @@ sp-core = { path = "../../../substrate/primitives/core" }
 pallet-balances = { path = "../../../substrate/frame/balances" }
 
 # Polkadot
-xcm-builder = { path = "../../../polkadot/xcm/xcm-builder" }
+xcm-builder = { package = "staging-xcm-builder", path = "../../../polkadot/xcm/xcm-builder" }
 
 # Cumulus
-cumulus-pallet-parachain-system = { path = "../parachain-system" }
+cumulus-pallet-parachain-system = { path = "../parachain-system", features = ["parameterized-consensus-hook"] }
 
 [features]
 default = [ "std" ]
 std = [
 	"codec/std",
 	"cumulus-primitives-core/std",
+	"frame-benchmarking?/std",
 	"frame-support/std",
 	"frame-system/std",
 	"log/std",
@@ -58,9 +59,21 @@ std = [
 ]
 
 runtime-benchmarks = [
+	"cumulus-pallet-parachain-system/runtime-benchmarks",
 	"frame-benchmarking/runtime-benchmarks",
 	"frame-support/runtime-benchmarks",
 	"frame-system/runtime-benchmarks",
+	"pallet-balances/runtime-benchmarks",
+	"polkadot-runtime-common/runtime-benchmarks",
+	"sp-runtime/runtime-benchmarks",
 	"xcm-builder/runtime-benchmarks",
+	"xcm-executor/runtime-benchmarks",
+]
+try-runtime = [
+	"cumulus-pallet-parachain-system/try-runtime",
+	"frame-support/try-runtime",
+	"frame-system/try-runtime",
+	"pallet-balances/try-runtime",
+	"polkadot-runtime-common/try-runtime",
+	"sp-runtime/try-runtime",
 ]
-try-runtime = [ "frame-support/try-runtime" ]
diff --git a/cumulus/pallets/xcmp-queue/src/benchmarking.rs b/cumulus/pallets/xcmp-queue/src/benchmarking.rs
index f4167e522fa4bcb8cc6453a31e0f6c95e69df4d0..17ec60a2f3fafe9d257074fc803c6567b4422c31 100644
--- a/cumulus/pallets/xcmp-queue/src/benchmarking.rs
+++ b/cumulus/pallets/xcmp-queue/src/benchmarking.rs
@@ -1,4 +1,4 @@
-// Copyright (C) 2021 Parity Technologies (UK) Ltd.
+// Copyright (C) Parity Technologies (UK) Ltd.
 // SPDX-License-Identifier: Apache-2.0
 
 // Licensed under the Apache License, Version 2.0 (the "License");
diff --git a/cumulus/pallets/xcmp-queue/src/lib.rs b/cumulus/pallets/xcmp-queue/src/lib.rs
index 960af9b5b7724acd70f2dd6d82d8d4d897b4eb3a..7ee07a7beb0a79fadaef0b34a712fb72765cdf97 100644
--- a/cumulus/pallets/xcmp-queue/src/lib.rs
+++ b/cumulus/pallets/xcmp-queue/src/lib.rs
@@ -1,4 +1,4 @@
-// Copyright 2020-2021 Parity Technologies (UK) Ltd.
+// Copyright (C) Parity Technologies (UK) Ltd.
 // This file is part of Cumulus.
 
 // Substrate is free software: you can redistribute it and/or modify
@@ -1129,7 +1129,7 @@ impl<T: Config> XcmpMessageSource for Pallet<T> {
 		let pruned = old_statuses_len - statuses.len();
 		// removing an item from status implies a message being sent, so the result messages must
 		// be no less than the pruned channels.
-		statuses.rotate_left(result.len() - pruned);
+		statuses.rotate_left(result.len().saturating_sub(pruned));
 
 		<OutboundXcmpStatus<T>>::put(statuses);
 
diff --git a/cumulus/pallets/xcmp-queue/src/migration.rs b/cumulus/pallets/xcmp-queue/src/migration.rs
index bda54620cd9bd07e4a8020dce892a640d087aa3f..a54ddfb9cecd0888bb0b54ab19a28d5796e41fab 100644
--- a/cumulus/pallets/xcmp-queue/src/migration.rs
+++ b/cumulus/pallets/xcmp-queue/src/migration.rs
@@ -1,4 +1,4 @@
-// Copyright 2021 Parity Technologies (UK) Ltd.
+// Copyright (C) Parity Technologies (UK) Ltd.
 // This file is part of Polkadot.
 
 // Polkadot is free software: you can redistribute it and/or modify
diff --git a/cumulus/pallets/xcmp-queue/src/mock.rs b/cumulus/pallets/xcmp-queue/src/mock.rs
index 5573408781481b2d428e85700c14b369c12e085f..a3f10fa5428ce2cc67ada4359cd81f8b5c180fa5 100644
--- a/cumulus/pallets/xcmp-queue/src/mock.rs
+++ b/cumulus/pallets/xcmp-queue/src/mock.rs
@@ -1,4 +1,4 @@
-// Copyright (C) 2021 Parity Technologies (UK) Ltd.
+// Copyright (C) Parity Technologies (UK) Ltd.
 // SPDX-License-Identifier: Apache-2.0
 
 // Licensed under the Apache License, Version 2.0 (the "License");
diff --git a/cumulus/pallets/xcmp-queue/src/tests.rs b/cumulus/pallets/xcmp-queue/src/tests.rs
index 45c4519d3aa496b06744c5bc35f9ec2092d69c23..ba005a5badfeb69472b09cddd1f93f6dc0ac42dd 100644
--- a/cumulus/pallets/xcmp-queue/src/tests.rs
+++ b/cumulus/pallets/xcmp-queue/src/tests.rs
@@ -1,4 +1,4 @@
-// Copyright (C) 2021 Parity Technologies (UK) Ltd.
+// Copyright (C) Parity Technologies (UK) Ltd.
 // SPDX-License-Identifier: Apache-2.0
 
 // Licensed under the Apache License, Version 2.0 (the "License");
@@ -14,9 +14,9 @@
 // limitations under the License.
 
 use super::*;
-use cumulus_primitives_core::XcmpMessageHandler;
+use cumulus_primitives_core::{ParaId, XcmpMessageHandler};
 use frame_support::{assert_noop, assert_ok};
-use mock::{new_test_ext, RuntimeCall, RuntimeOrigin, Test, XcmpQueue};
+use mock::{new_test_ext, ParachainSystem, RuntimeCall, RuntimeOrigin, Test, XcmpQueue};
 use sp_runtime::traits::BadOrigin;
 
 #[test]
@@ -341,3 +341,32 @@ fn xcmp_queue_consumes_dest_and_msg_on_ok_validate() {
 		);
 	});
 }
+
+#[test]
+fn xcmp_queue_send_xcm_works() {
+	new_test_ext().execute_with(|| {
+		let sibling_para_id = ParaId::from(12345);
+		let dest = (Parent, X1(Parachain(sibling_para_id.into()))).into();
+		let msg = Xcm(vec![ClearOrigin]);
+
+		// try to send without opened HRMP channel to the sibling_para_id
+		assert_eq!(
+			send_xcm::<XcmpQueue>(dest, msg.clone()),
+			Err(SendError::Transport("NoChannel")),
+		);
+
+		// open HRMP channel to the sibling_para_id
+		ParachainSystem::open_outbound_hrmp_channel_for_benchmarks_or_tests(sibling_para_id);
+
+		// check empty outbound queue
+		assert!(XcmpQueue::take_outbound_messages(usize::MAX).is_empty());
+
+		// now send works
+		assert_ok!(send_xcm::<XcmpQueue>(dest, msg));
+
+		// check outbound queue contains message/page for sibling_para_id
+		assert!(XcmpQueue::take_outbound_messages(usize::MAX)
+			.iter()
+			.any(|(para_id, _)| para_id == &sibling_para_id));
+	})
+}
diff --git a/cumulus/pallets/xcmp-queue/src/weights.rs b/cumulus/pallets/xcmp-queue/src/weights.rs
index cbb29ac3ae3166c9a0e2b9c03196396408b5f647..2d20bba6f8f6b18571ea4d241d57f08998d13d87 100644
--- a/cumulus/pallets/xcmp-queue/src/weights.rs
+++ b/cumulus/pallets/xcmp-queue/src/weights.rs
@@ -1,3 +1,18 @@
+// 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.
+
 #![allow(unused_parens)]
 #![allow(unused_imports)]
 
diff --git a/cumulus/parachain-template/README.md b/cumulus/parachain-template/README.md
index 6dcc70c538290e16587025b652131954c8264ea3..01e9cc26d9af3e8c437486b6785d6f5eb8d6047c 100644
--- a/cumulus/parachain-template/README.md
+++ b/cumulus/parachain-template/README.md
@@ -1,6 +1,6 @@
 # Substrate Cumulus Parachain Template
 
-A new [Cumulus](https://github.com/paritytech/cumulus/)-based Substrate node, ready for hacking ☁️..
+A new [Cumulus](https://github.com/paritytech/polkadot-sdk/tree/master/cumulus)-based Substrate node, ready for hacking ☁️..
 
 This project is originally a fork of the
 [Substrate Node Template](https://github.com/substrate-developer-hub/substrate-node-template)
@@ -10,7 +10,7 @@ modified to include dependencies required for registering this node as a **parat
 The stand-alone version of this template is hosted on the
 [Substrate Devhub Parachain Template](https://github.com/substrate-developer-hub/substrate-parachain-template/)
 for each release of Polkadot. It is generated directly to the upstream
-[Parachain Template in Cumulus](https://github.com/paritytech/cumulus/tree/master/parachain-template)
+[Parachain Template in Cumulus](https://github.com/paritytech/polkadot-sdk/tree/master/cumulus/parachain-template)
 at each release branch using the
 [Substrate Template Generator](https://github.com/paritytech/substrate-template-generator/).
 
@@ -19,4 +19,4 @@ parathreads [here](https://wiki.polkadot.network/docs/learn-parathreads).
 
 
 🧙 Learn about how to use this template and run your own parachain testnet for it in the
-[Devhub Cumulus Tutorial](https://docs.substrate.io/tutorials/v3/cumulus/start-relay/).
\ No newline at end of file
+[Devhub Cumulus Tutorial](https://docs.substrate.io/tutorials/v3/cumulus/start-relay/).
diff --git a/cumulus/parachain-template/node/Cargo.toml b/cumulus/parachain-template/node/Cargo.toml
index f110e98aacb44e38a5acdef6a6e9700b5b632391..e73c7b507262eca43c2e77293d0ecadd606bdc57 100644
--- a/cumulus/parachain-template/node/Cargo.toml
+++ b/cumulus/parachain-template/node/Cargo.toml
@@ -5,15 +5,16 @@ authors = ["Anonymous"]
 description = "A new Cumulus FRAME-based Substrate Node, ready for hacking together a parachain."
 license = "Unlicense"
 homepage = "https://substrate.io"
-repository = "https://github.com/paritytech/cumulus/"
-edition = "2021"
+repository.workspace = true
+edition.workspace = true
 build = "build.rs"
+publish = false
 
 [dependencies]
-clap = { version = "4.3.24", features = ["derive"] }
+clap = { version = "4.4.6", features = ["derive"] }
 log = "0.4.20"
 codec = { package = "parity-scale-codec", version = "3.0.0" }
-serde = { version = "1.0.183", features = ["derive"] }
+serde = { version = "1.0.188", features = ["derive"] }
 jsonrpsee = { version = "0.16.2", features = ["server"] }
 futures = "0.3.28"
 
@@ -55,7 +56,7 @@ substrate-prometheus-endpoint = { path = "../../../substrate/utils/prometheus" }
 # Polkadot
 polkadot-cli = { path = "../../../polkadot/cli", features = ["rococo-native"] }
 polkadot-primitives = { path = "../../../polkadot/primitives" }
-xcm = { path = "../../../polkadot/xcm", default-features = false}
+xcm = { package = "staging-xcm", path = "../../../polkadot/xcm", default-features = false}
 
 # Cumulus
 cumulus-client-cli = { path = "../../client/cli" }
@@ -75,11 +76,17 @@ substrate-build-script-utils = { path = "../../../substrate/utils/build-script-u
 [features]
 default = []
 runtime-benchmarks = [
+	"frame-benchmarking-cli/runtime-benchmarks",
+	"frame-benchmarking/runtime-benchmarks",
 	"parachain-template-runtime/runtime-benchmarks",
 	"polkadot-cli/runtime-benchmarks",
+	"polkadot-primitives/runtime-benchmarks",
+	"sc-service/runtime-benchmarks",
+	"sp-runtime/runtime-benchmarks",
 ]
-try-runtime = [ "parachain-template-runtime/try-runtime" ]
-network-protocol-staging = [
-	"cumulus-client-service/network-protocol-staging",
-	"polkadot-cli/network-protocol-staging",
+try-runtime = [
+	"parachain-template-runtime/try-runtime",
+	"polkadot-cli/try-runtime",
+	"sp-runtime/try-runtime",
 ]
+
diff --git a/cumulus/parachain-template/node/src/command.rs b/cumulus/parachain-template/node/src/command.rs
index 7acfb0c2035e3c1b0efcc1b28124711da114409b..4dd8463f6be67cb4d8012b8dba1f32be341dfe24 100644
--- a/cumulus/parachain-template/node/src/command.rs
+++ b/cumulus/parachain-template/node/src/command.rs
@@ -50,7 +50,7 @@ impl SubstrateCli for Cli {
 	}
 
 	fn support_url() -> String {
-		"https://github.com/paritytech/cumulus/issues/new".into()
+		"https://github.com/paritytech/polkadot-sdk/issues/new".into()
 	}
 
 	fn copyright_start_year() -> i32 {
@@ -86,7 +86,7 @@ impl SubstrateCli for RelayChainCli {
 	}
 
 	fn support_url() -> String {
-		"https://github.com/paritytech/cumulus/issues/new".into()
+		"https://github.com/paritytech/polkadot-sdk/issues/new".into()
 	}
 
 	fn copyright_start_year() -> i32 {
diff --git a/cumulus/parachain-template/pallets/template/Cargo.toml b/cumulus/parachain-template/pallets/template/Cargo.toml
index 9235cbab5a5dc2108dba7b78593842c910be9eec..af35ab651dc48e85da2a6d138f84de367cb033f8 100644
--- a/cumulus/parachain-template/pallets/template/Cargo.toml
+++ b/cumulus/parachain-template/pallets/template/Cargo.toml
@@ -5,8 +5,8 @@ description = "FRAME pallet template for defining custom runtime logic."
 version = "0.1.0"
 license = "Unlicense"
 homepage = "https://substrate.io"
-repository = "https://github.com/paritytech/substrate/"
-edition = "2021"
+repository.workspace = true
+edition.workspace = true
 
 [package.metadata.docs.rs]
 targets = ["x86_64-unknown-linux-gnu"]
@@ -21,7 +21,7 @@ frame-support = { path = "../../../../substrate/frame/support", default-features
 frame-system = { path = "../../../../substrate/frame/system", default-features = false}
 
 [dev-dependencies]
-serde = { version = "1.0.183" }
+serde = { version = "1.0.188" }
 
 # Substrate
 sp-core = { path = "../../../../substrate/primitives/core", default-features = false}
@@ -30,12 +30,24 @@ sp-runtime = { path = "../../../../substrate/primitives/runtime", default-featur
 
 [features]
 default = [ "std" ]
-runtime-benchmarks = [ "frame-benchmarking/runtime-benchmarks" ]
+runtime-benchmarks = [
+	"frame-benchmarking/runtime-benchmarks",
+	"frame-support/runtime-benchmarks",
+	"frame-system/runtime-benchmarks",
+	"sp-runtime/runtime-benchmarks",
+]
 std = [
 	"codec/std",
 	"frame-benchmarking/std",
 	"frame-support/std",
 	"frame-system/std",
 	"scale-info/std",
+	"sp-core/std",
+	"sp-io/std",
+	"sp-runtime/std",
+]
+try-runtime = [
+	"frame-support/try-runtime",
+	"frame-system/try-runtime",
+	"sp-runtime/try-runtime",
 ]
-try-runtime = [ "frame-support/try-runtime" ]
diff --git a/cumulus/parachain-template/runtime/Cargo.toml b/cumulus/parachain-template/runtime/Cargo.toml
index c61df9dbc8ae508de498ba623285dcdea786cb00..68db2f041ddb3019b62cfbcb1478ee3ee13c6cea 100644
--- a/cumulus/parachain-template/runtime/Cargo.toml
+++ b/cumulus/parachain-template/runtime/Cargo.toml
@@ -5,8 +5,8 @@ authors = ["Anonymous"]
 description = "A new Cumulus FRAME-based Substrate Runtime, ready for hacking together a parachain."
 license = "Unlicense"
 homepage = "https://substrate.io"
-repository = "https://github.com/paritytech/cumulus/"
-edition = "2021"
+repository.workspace = true
+edition.workspace = true
 
 [package.metadata.docs.rs]
 targets = ["x86_64-unknown-linux-gnu"]
@@ -44,6 +44,7 @@ sp-api = { path = "../../../substrate/primitives/api", default-features = false}
 sp-block-builder = { path = "../../../substrate/primitives/block-builder", default-features = false}
 sp-consensus-aura = { path = "../../../substrate/primitives/consensus/aura", default-features = false}
 sp-core = { path = "../../../substrate/primitives/core", default-features = false}
+sp-genesis-builder = { path = "../../../substrate/primitives/genesis-builder", default-features = false }
 sp-inherents = { path = "../../../substrate/primitives/inherents", default-features = false}
 sp-offchain = { path = "../../../substrate/primitives/offchain", default-features = false}
 sp-runtime = { path = "../../../substrate/primitives/runtime", default-features = false}
@@ -54,11 +55,11 @@ sp-version = { path = "../../../substrate/primitives/version", default-features
 
 # Polkadot
 pallet-xcm = { path = "../../../polkadot/xcm/pallet-xcm", default-features = false}
-polkadot-parachain = { path = "../../../polkadot/parachain", default-features = false}
+polkadot-parachain-primitives = { path = "../../../polkadot/parachain", default-features = false}
 polkadot-runtime-common = { path = "../../../polkadot/runtime/common", default-features = false}
-xcm = { path = "../../../polkadot/xcm", default-features = false}
-xcm-builder = { path = "../../../polkadot/xcm/xcm-builder", default-features = false}
-xcm-executor = { path = "../../../polkadot/xcm/xcm-executor", default-features = false}
+xcm = { package = "staging-xcm", path = "../../../polkadot/xcm", default-features = false}
+xcm-builder = { package = "staging-xcm-builder", path = "../../../polkadot/xcm/xcm-builder", default-features = false}
+xcm-executor = { package = "staging-xcm-executor", path = "../../../polkadot/xcm/xcm-executor", default-features = false}
 
 # Cumulus
 cumulus-pallet-aura-ext = { path = "../../pallets/aura-ext", default-features = false }
@@ -79,14 +80,18 @@ std = [
 	"cumulus-pallet-aura-ext/std",
 	"cumulus-pallet-dmp-queue/std",
 	"cumulus-pallet-parachain-system/std",
+	"cumulus-pallet-session-benchmarking/std",
 	"cumulus-pallet-xcm/std",
 	"cumulus-pallet-xcmp-queue/std",
 	"cumulus-primitives-core/std",
 	"cumulus-primitives-utility/std",
+	"frame-benchmarking?/std",
 	"frame-executive/std",
 	"frame-support/std",
+	"frame-system-benchmarking?/std",
 	"frame-system-rpc-runtime-api/std",
 	"frame-system/std",
+	"frame-try-runtime?/std",
 	"log/std",
 	"pallet-aura/std",
 	"pallet-authorship/std",
@@ -100,13 +105,14 @@ std = [
 	"pallet-transaction-payment/std",
 	"pallet-xcm/std",
 	"parachain-info/std",
-	"polkadot-parachain/std",
+	"polkadot-parachain-primitives/std",
 	"polkadot-runtime-common/std",
 	"scale-info/std",
 	"sp-api/std",
 	"sp-block-builder/std",
 	"sp-consensus-aura/std",
 	"sp-core/std",
+	"sp-genesis-builder/std",
 	"sp-inherents/std",
 	"sp-offchain/std",
 	"sp-runtime/std",
@@ -124,6 +130,7 @@ runtime-benchmarks = [
 	"cumulus-pallet-parachain-system/runtime-benchmarks",
 	"cumulus-pallet-session-benchmarking/runtime-benchmarks",
 	"cumulus-pallet-xcmp-queue/runtime-benchmarks",
+	"cumulus-primitives-utility/runtime-benchmarks",
 	"frame-benchmarking/runtime-benchmarks",
 	"frame-support/runtime-benchmarks",
 	"frame-system-benchmarking/runtime-benchmarks",
@@ -135,8 +142,11 @@ runtime-benchmarks = [
 	"pallet-sudo/runtime-benchmarks",
 	"pallet-timestamp/runtime-benchmarks",
 	"pallet-xcm/runtime-benchmarks",
+	"polkadot-parachain-primitives/runtime-benchmarks",
+	"polkadot-runtime-common/runtime-benchmarks",
 	"sp-runtime/runtime-benchmarks",
 	"xcm-builder/runtime-benchmarks",
+	"xcm-executor/runtime-benchmarks",
 ]
 
 try-runtime = [
@@ -146,6 +156,7 @@ try-runtime = [
 	"cumulus-pallet-xcm/try-runtime",
 	"cumulus-pallet-xcmp-queue/try-runtime",
 	"frame-executive/try-runtime",
+	"frame-support/try-runtime",
 	"frame-system/try-runtime",
 	"frame-try-runtime/try-runtime",
 	"pallet-aura/try-runtime",
@@ -159,6 +170,8 @@ try-runtime = [
 	"pallet-transaction-payment/try-runtime",
 	"pallet-xcm/try-runtime",
 	"parachain-info/try-runtime",
+	"polkadot-runtime-common/try-runtime",
+	"sp-runtime/try-runtime",
 ]
 
 experimental = [ "pallet-aura/experimental" ]
diff --git a/cumulus/parachain-template/runtime/src/lib.rs b/cumulus/parachain-template/runtime/src/lib.rs
index 038597096f6a56ca7fda99b84a1d4b67e5ef4a26..b9bf97d7786f6c27736929ad5b408a57f9f64a37 100644
--- a/cumulus/parachain-template/runtime/src/lib.rs
+++ b/cumulus/parachain-template/runtime/src/lib.rs
@@ -28,6 +28,7 @@ use sp_version::RuntimeVersion;
 use frame_support::{
 	construct_runtime,
 	dispatch::DispatchClass,
+	genesis_builder_helper::{build_config, create_default_config},
 	parameter_types,
 	traits::{ConstBool, ConstU32, ConstU64, ConstU8, EitherOfDiverse, Everything},
 	weights::{
@@ -742,6 +743,16 @@ impl_runtime_apis! {
 			Ok(batches)
 		}
 	}
+
+	impl sp_genesis_builder::GenesisBuilder<Block> for Runtime {
+		fn create_default_config() -> Vec<u8> {
+			create_default_config::<RuntimeGenesisConfig>()
+		}
+
+		fn build_config(config: Vec<u8>) -> sp_genesis_builder::Result {
+			build_config::<RuntimeGenesisConfig>(config)
+		}
+	}
 }
 
 cumulus_pallet_parachain_system::register_validate_block! {
diff --git a/cumulus/parachain-template/runtime/src/weights/block_weights.rs b/cumulus/parachain-template/runtime/src/weights/block_weights.rs
index b2092d875c8328210667da4cbb95de0642e60ae3..e7fdb2aae2a01ec06076de83d94817e540e205dd 100644
--- a/cumulus/parachain-template/runtime/src/weights/block_weights.rs
+++ b/cumulus/parachain-template/runtime/src/weights/block_weights.rs
@@ -1,6 +1,6 @@
 // This file is part of Substrate.
 
-// Copyright (C) 2022 Parity Technologies (UK) Ltd.
+// Copyright (C) Parity Technologies (UK) Ltd.
 // SPDX-License-Identifier: Apache-2.0
 
 // Licensed under the Apache License, Version 2.0 (the "License");
diff --git a/cumulus/parachain-template/runtime/src/weights/extrinsic_weights.rs b/cumulus/parachain-template/runtime/src/weights/extrinsic_weights.rs
index 332c3b324bb9c1b386257bf7953d37aba8f5af13..1a4adb968bb7195428ea00d59cd92dcd3b6eea5f 100644
--- a/cumulus/parachain-template/runtime/src/weights/extrinsic_weights.rs
+++ b/cumulus/parachain-template/runtime/src/weights/extrinsic_weights.rs
@@ -1,6 +1,6 @@
 // This file is part of Substrate.
 
-// Copyright (C) 2022 Parity Technologies (UK) Ltd.
+// Copyright (C) Parity Technologies (UK) Ltd.
 // SPDX-License-Identifier: Apache-2.0
 
 // Licensed under the Apache License, Version 2.0 (the "License");
diff --git a/cumulus/parachain-template/runtime/src/weights/mod.rs b/cumulus/parachain-template/runtime/src/weights/mod.rs
index ed0b4dbcd47fbffb125bda4b337099ae69e51ce2..30fa2c4060689ff98cc427c84f81866172845e52 100644
--- a/cumulus/parachain-template/runtime/src/weights/mod.rs
+++ b/cumulus/parachain-template/runtime/src/weights/mod.rs
@@ -1,6 +1,6 @@
 // This file is part of Substrate.
 
-// Copyright (C) 2022 Parity Technologies (UK) Ltd.
+// Copyright (C) Parity Technologies (UK) Ltd.
 // SPDX-License-Identifier: Apache-2.0
 
 // Licensed under the Apache License, Version 2.0 (the "License");
diff --git a/cumulus/parachain-template/runtime/src/weights/paritydb_weights.rs b/cumulus/parachain-template/runtime/src/weights/paritydb_weights.rs
index 4338d928d807a41cc60ec91d86e91c81bb253631..25679703831a13b8d1bb7fb7dd4d92fa84b1f255 100644
--- a/cumulus/parachain-template/runtime/src/weights/paritydb_weights.rs
+++ b/cumulus/parachain-template/runtime/src/weights/paritydb_weights.rs
@@ -1,6 +1,6 @@
 // This file is part of Substrate.
 
-// Copyright (C) 2022 Parity Technologies (UK) Ltd.
+// Copyright (C) Parity Technologies (UK) Ltd.
 // SPDX-License-Identifier: Apache-2.0
 
 // Licensed under the Apache License, Version 2.0 (the "License");
diff --git a/cumulus/parachain-template/runtime/src/weights/rocksdb_weights.rs b/cumulus/parachain-template/runtime/src/weights/rocksdb_weights.rs
index 1d115d963facb39fe29d6258918fda3bc8d94900..3dd817aa6f137085b0e5fdf2b11b7f50e5c8b002 100644
--- a/cumulus/parachain-template/runtime/src/weights/rocksdb_weights.rs
+++ b/cumulus/parachain-template/runtime/src/weights/rocksdb_weights.rs
@@ -1,6 +1,6 @@
 // This file is part of Substrate.
 
-// Copyright (C) 2022 Parity Technologies (UK) Ltd.
+// Copyright (C) Parity Technologies (UK) Ltd.
 // SPDX-License-Identifier: Apache-2.0
 
 // Licensed under the Apache License, Version 2.0 (the "License");
diff --git a/cumulus/parachain-template/runtime/src/xcm_config.rs b/cumulus/parachain-template/runtime/src/xcm_config.rs
index ff996d4dde306d18ef2e0481c51e723d41e00ab7..353f68d22e35085a4b6fb803171a7b5d3c680fc6 100644
--- a/cumulus/parachain-template/runtime/src/xcm_config.rs
+++ b/cumulus/parachain-template/runtime/src/xcm_config.rs
@@ -9,7 +9,7 @@ use frame_support::{
 };
 use frame_system::EnsureRoot;
 use pallet_xcm::XcmPassthrough;
-use polkadot_parachain::primitives::Sibling;
+use polkadot_parachain_primitives::primitives::Sibling;
 use polkadot_runtime_common::impls::ToAuthor;
 use xcm::latest::prelude::*;
 use xcm_builder::{
diff --git a/cumulus/parachains/common/Cargo.toml b/cumulus/parachains/common/Cargo.toml
index 5900ec9f3095d819b8ade62c08886add09ebee4a..cb389b4b607b807a24c4f80bc2f6a37e0ed19a7b 100644
--- a/cumulus/parachains/common/Cargo.toml
+++ b/cumulus/parachains/common/Cargo.toml
@@ -1,8 +1,8 @@
 [package]
 name = "parachains-common"
 version = "1.0.0"
-authors = ["Parity Technologies <admin@parity.io>"]
-edition = "2021"
+authors.workspace = true
+edition.workspace = true
 description = "Logic which is common to all parachain runtimes"
 
 [package.metadata.docs.rs]
@@ -13,6 +13,7 @@ codec = { package = "parity-scale-codec", version = "3.0.0", features = ["derive
 log = { version = "0.4.19", default-features = false }
 scale-info = { version = "2.9.0", default-features = false, features = ["derive"] }
 num-traits = { version = "0.2", default-features = false}
+smallvec = "1.11.0"
 
 # Substrate
 frame-support = { path = "../../../substrate/frame/support", default-features = false }
@@ -28,10 +29,13 @@ sp-runtime = { path = "../../../substrate/primitives/runtime", default-features
 sp-std = { path = "../../../substrate/primitives/std", default-features = false }
 
 # Polkadot
+rococo-runtime-constants = { path = "../../../polkadot/runtime/rococo/constants", default-features = false}
+westend-runtime-constants = { path = "../../../polkadot/runtime/westend/constants", default-features = false}
+polkadot-core-primitives = { path = "../../../polkadot/core-primitives", default-features = false}
 polkadot-primitives = { path = "../../../polkadot/primitives", default-features = false}
-xcm = { path = "../../../polkadot/xcm", default-features = false}
-xcm-builder = { path = "../../../polkadot/xcm/xcm-builder", default-features = false}
-xcm-executor = { path = "../../../polkadot/xcm/xcm-executor", default-features = false}
+xcm = { package = "staging-xcm", path = "../../../polkadot/xcm", default-features = false}
+xcm-builder = { package = "staging-xcm-builder", path = "../../../polkadot/xcm/xcm-builder", default-features = false}
+xcm-executor = { package = "staging-xcm-executor", path = "../../../polkadot/xcm/xcm-executor", default-features = false}
 
 # Cumulus
 pallet-collator-selection = { path = "../../pallets/collator-selection", default-features = false }
@@ -53,14 +57,35 @@ std = [
 	"frame-support/std",
 	"frame-system/std",
 	"log/std",
+	"pallet-asset-tx-payment/std",
 	"pallet-assets/std",
 	"pallet-authorship/std",
 	"pallet-balances/std",
 	"pallet-collator-selection/std",
+	"polkadot-core-primitives/std",
 	"polkadot-primitives/std",
+	"rococo-runtime-constants/std",
 	"sp-consensus-aura/std",
+	"sp-core/std",
 	"sp-io/std",
+	"sp-runtime/std",
 	"sp-std/std",
+	"westend-runtime-constants/std",
+	"xcm-builder/std",
 	"xcm-executor/std",
 	"xcm/std",
 ]
+
+runtime-benchmarks = [
+	"cumulus-primitives-utility/runtime-benchmarks",
+	"frame-support/runtime-benchmarks",
+	"frame-system/runtime-benchmarks",
+	"pallet-asset-tx-payment/runtime-benchmarks",
+	"pallet-assets/runtime-benchmarks",
+	"pallet-balances/runtime-benchmarks",
+	"pallet-collator-selection/runtime-benchmarks",
+	"polkadot-primitives/runtime-benchmarks",
+	"sp-runtime/runtime-benchmarks",
+	"xcm-builder/runtime-benchmarks",
+	"xcm-executor/runtime-benchmarks",
+]
diff --git a/cumulus/parachains/common/src/impls.rs b/cumulus/parachains/common/src/impls.rs
index 4a1f4f90d05571381ad22b90e02ace54f1dc518a..107cd5c687328bce1369c59cfa7d4fcbcdd377f3 100644
--- a/cumulus/parachains/common/src/impls.rs
+++ b/cumulus/parachains/common/src/impls.rs
@@ -1,4 +1,4 @@
-// Copyright (C) 2021 Parity Technologies (UK) Ltd.
+// Copyright (C) Parity Technologies (UK) Ltd.
 // SPDX-License-Identifier: Apache-2.0
 
 // Licensed under the Apache License, Version 2.0 (the "License");
diff --git a/cumulus/parachains/runtimes/contracts/contracts-rococo/src/constants.rs b/cumulus/parachains/common/src/kusama.rs
similarity index 85%
rename from cumulus/parachains/runtimes/contracts/contracts-rococo/src/constants.rs
rename to cumulus/parachains/common/src/kusama.rs
index db7922ea905b8588d5bdd3289e9bd4f8fc813097..073971a70750f78fb8ad86ad86b0f07bbcdd3cde 100644
--- a/cumulus/parachains/runtimes/contracts/contracts-rococo/src/constants.rs
+++ b/cumulus/parachains/common/src/kusama.rs
@@ -1,4 +1,4 @@
-// Copyright (C) 2021 Parity Technologies (UK) Ltd.
+// Copyright (C) Parity Technologies (UK) Ltd.
 // SPDX-License-Identifier: Apache-2.0
 
 // Licensed under the Apache License, Version 2.0 (the "License");
@@ -13,25 +13,38 @@
 // See the License for the specific language governing permissions and
 // limitations under the License.
 
+/// Consensus-related.
+pub mod consensus {
+	/// Maximum number of blocks simultaneously accepted by the Runtime, not yet included
+	/// into the relay chain.
+	pub const UNINCLUDED_SEGMENT_CAPACITY: u32 = 1;
+	/// How many parachain blocks are processed by the relay chain per parent. Limits the
+	/// number of blocks authored per slot.
+	pub const BLOCK_PROCESSING_VELOCITY: u32 = 1;
+	/// Relay chain slot duration, in milliseconds.
+	pub const RELAY_CHAIN_SLOT_DURATION_MILLIS: u32 = 6000;
+}
+
+/// Constants relating to KSM.
 pub mod currency {
-	use kusama_runtime_constants as constants;
 	use polkadot_core_primitives::Balance;
 
 	/// The existential deposit. Set to 1/10 of its parent Relay Chain.
-	pub const EXISTENTIAL_DEPOSIT: Balance = constants::currency::EXISTENTIAL_DEPOSIT / 10;
+	pub const EXISTENTIAL_DEPOSIT: Balance = 1 * CENTS / 10;
 
-	pub const UNITS: Balance = constants::currency::UNITS;
-	pub const CENTS: Balance = constants::currency::CENTS;
-	pub const GRAND: Balance = constants::currency::GRAND;
-	pub const MILLICENTS: Balance = constants::currency::MILLICENTS;
+	pub const UNITS: Balance = 1_000_000_000_000;
+	pub const QUID: Balance = UNITS / 30;
+	pub const CENTS: Balance = QUID / 100;
+	pub const GRAND: Balance = QUID * 1_000;
+	pub const MILLICENTS: Balance = CENTS / 1_000;
 
 	pub const fn deposit(items: u32, bytes: u32) -> Balance {
 		// map to 1/100 of what the kusama relay chain charges (v9020)
-		constants::currency::deposit(items, bytes) / 100
+		(items as Balance * 2_000 * CENTS + (bytes as Balance) * 100 * MILLICENTS) / 100
 	}
 }
 
-/// Fee-related.
+/// Constants related to Kusama fee payment.
 pub mod fee {
 	use frame_support::{
 		pallet_prelude::Weight,
@@ -75,8 +88,8 @@ pub mod fee {
 	impl WeightToFeePolynomial for RefTimeToFee {
 		type Balance = Balance;
 		fn polynomial() -> WeightToFeeCoefficients<Self::Balance> {
-			// in Kusama, extrinsic base weight (smallest non-zero weight) is mapped to 1/10 CENT:
-			// in Rococo Contracts, we map to 1/10 of that, or 1/100 CENT
+			// In Kusama, extrinsic base weight (smallest non-zero weight) is mapped to 1/10 CENT:
+			// The standard system parachain configuration is 1/10 of that, as in 1/100 CENT.
 			let p = super::currency::CENTS;
 			let q = 100 * Balance::from(ExtrinsicBaseWeight::get().ref_time());
 
@@ -107,15 +120,3 @@ pub mod fee {
 		}
 	}
 }
-
-/// Consensus-related.
-pub mod consensus {
-	/// Maximum number of blocks simultaneously accepted by the Runtime, not yet included
-	/// into the relay chain.
-	pub const UNINCLUDED_SEGMENT_CAPACITY: u32 = 1;
-	/// How many parachain blocks are processed by the relay chain per parent. Limits the
-	/// number of blocks authored per slot.
-	pub const BLOCK_PROCESSING_VELOCITY: u32 = 1;
-	/// Relay chain slot duration, in milliseconds.
-	pub const RELAY_CHAIN_SLOT_DURATION_MILLIS: u32 = 6000;
-}
diff --git a/cumulus/parachains/common/src/lib.rs b/cumulus/parachains/common/src/lib.rs
index 0a9686bf8a3719499f08c9e84d7351561013d0f5..cb2ac1a1e3e45d7af1cba07c8dddbba1837cf199 100644
--- a/cumulus/parachains/common/src/lib.rs
+++ b/cumulus/parachains/common/src/lib.rs
@@ -1,4 +1,4 @@
-// Copyright (C) 2021 Parity Technologies (UK) Ltd.
+// Copyright (C) Parity Technologies (UK) Ltd.
 // SPDX-License-Identifier: Apache-2.0
 
 // Licensed under the Apache License, Version 2.0 (the "License");
@@ -16,6 +16,10 @@
 #![cfg_attr(not(feature = "std"), no_std)]
 
 pub mod impls;
+pub mod kusama;
+pub mod polkadot;
+pub mod rococo;
+pub mod westend;
 pub mod xcm_config;
 pub use constants::*;
 pub use opaque::*;
diff --git a/cumulus/parachains/runtimes/collectives/collectives-polkadot/src/constants.rs b/cumulus/parachains/common/src/polkadot.rs
similarity index 81%
rename from cumulus/parachains/runtimes/collectives/collectives-polkadot/src/constants.rs
rename to cumulus/parachains/common/src/polkadot.rs
index ac516447c7407dae82ce2b221747e3374b765db2..744108bce2e5f539e17dc71725a7c1dd7af52675 100644
--- a/cumulus/parachains/runtimes/collectives/collectives-polkadot/src/constants.rs
+++ b/cumulus/parachains/common/src/polkadot.rs
@@ -1,4 +1,4 @@
-// Copyright (C) 2021 Parity Technologies (UK) Ltd.
+// Copyright (C) Parity Technologies (UK) Ltd.
 // SPDX-License-Identifier: Apache-2.0
 
 // Licensed under the Apache License, Version 2.0 (the "License");
@@ -13,6 +13,7 @@
 // See the License for the specific language governing permissions and
 // limitations under the License.
 
+/// Universally recognized accounts.
 pub mod account {
 	use frame_support::PalletId;
 
@@ -26,27 +27,44 @@ pub mod account {
 	/// It is used as a temporarily place to deposit a slashed imbalance
 	/// before the teleport to the Treasury.
 	pub const REFERENDA_PALLET_ID: PalletId = PalletId(*b"py/refer");
+	/// Ambassador Referenda pallet ID.
+	/// It is used as a temporarily place to deposit a slashed imbalance
+	/// before the teleport to the Treasury.
+	pub const AMBASSADOR_REFERENDA_PALLET_ID: PalletId = PalletId(*b"py/amref");
+}
+
+/// Consensus-related.
+pub mod consensus {
+	/// Maximum number of blocks simultaneously accepted by the Runtime, not yet included
+	/// into the relay chain.
+	pub const UNINCLUDED_SEGMENT_CAPACITY: u32 = 1;
+	/// How many parachain blocks are processed by the relay chain per parent. Limits the
+	/// number of blocks authored per slot.
+	pub const BLOCK_PROCESSING_VELOCITY: u32 = 1;
+	/// Relay chain slot duration, in milliseconds.
+	pub const RELAY_CHAIN_SLOT_DURATION_MILLIS: u32 = 6000;
 }
 
+/// Constants relating to DOT.
 pub mod currency {
 	use polkadot_core_primitives::Balance;
-	use polkadot_runtime_constants as constants;
 
 	/// The existential deposit. Set to 1/10 of its parent Relay Chain.
-	pub const EXISTENTIAL_DEPOSIT: Balance = constants::currency::EXISTENTIAL_DEPOSIT / 10;
+	pub const EXISTENTIAL_DEPOSIT: Balance = 100 * CENTS / 10;
 
-	pub const UNITS: Balance = constants::currency::UNITS;
-	pub const DOLLARS: Balance = constants::currency::DOLLARS;
-	pub const CENTS: Balance = constants::currency::CENTS;
-	pub const MILLICENTS: Balance = constants::currency::MILLICENTS;
+	pub const UNITS: Balance = 10_000_000_000;
+	pub const DOLLARS: Balance = UNITS; // 10_000_000_000
+	pub const GRAND: Balance = DOLLARS * 1_000; // 10_000_000_000_000
+	pub const CENTS: Balance = DOLLARS / 100; // 100_000_000
+	pub const MILLICENTS: Balance = CENTS / 1_000; // 100_000
 
 	pub const fn deposit(items: u32, bytes: u32) -> Balance {
-		// 1/100 of Polkadot.
-		constants::currency::deposit(items, bytes) / 100
+		// 1/100 of Polkadot
+		(items as Balance * 20 * DOLLARS + (bytes as Balance) * 100 * MILLICENTS) / 100
 	}
 }
 
-/// Fee-related.
+/// Constants related to Polkadot fee payment.
 pub mod fee {
 	use frame_support::{
 		pallet_prelude::Weight,
@@ -90,8 +108,8 @@ pub mod fee {
 	impl WeightToFeePolynomial for RefTimeToFee {
 		type Balance = Balance;
 		fn polynomial() -> WeightToFeeCoefficients<Self::Balance> {
-			// in Polkadot, extrinsic base weight (smallest non-zero weight) is mapped to 1/10 CENT:
-			// in a parachain, we map to 1/10 of that, or 1/100 CENT
+			// In Polkadot, extrinsic base weight (smallest non-zero weight) is mapped to 1/10 CENT:
+			// The standard system parachain configuration is 1/10 of that, as in 1/100 CENT.
 			let p = super::currency::CENTS;
 			let q = 100 * Balance::from(ExtrinsicBaseWeight::get().ref_time());
 
@@ -122,15 +140,3 @@ pub mod fee {
 		}
 	}
 }
-
-/// Consensus-related.
-pub mod consensus {
-	/// Maximum number of blocks simultaneously accepted by the Runtime, not yet included
-	/// into the relay chain.
-	pub const UNINCLUDED_SEGMENT_CAPACITY: u32 = 1;
-	/// How many parachain blocks are processed by the relay chain per parent. Limits the
-	/// number of blocks authored per slot.
-	pub const BLOCK_PROCESSING_VELOCITY: u32 = 1;
-	/// Relay chain slot duration, in milliseconds.
-	pub const RELAY_CHAIN_SLOT_DURATION_MILLIS: u32 = 6000;
-}
diff --git a/cumulus/parachains/runtimes/bridge-hubs/bridge-hub-rococo/src/constants.rs b/cumulus/parachains/common/src/rococo.rs
similarity index 95%
rename from cumulus/parachains/runtimes/bridge-hubs/bridge-hub-rococo/src/constants.rs
rename to cumulus/parachains/common/src/rococo.rs
index 860b4ad2ba96ace315287db92a0fe5fe1221c168..6e31def4b55b923f1596793e6cb114163551c017 100644
--- a/cumulus/parachains/runtimes/bridge-hubs/bridge-hub-rococo/src/constants.rs
+++ b/cumulus/parachains/common/src/rococo.rs
@@ -1,4 +1,4 @@
-// Copyright (C) 2022 Parity Technologies (UK) Ltd.
+// Copyright (C) Parity Technologies (UK) Ltd.
 // SPDX-License-Identifier: Apache-2.0
 
 // Licensed under the Apache License, Version 2.0 (the "License");
@@ -73,8 +73,8 @@ pub mod fee {
 	impl WeightToFeePolynomial for RefTimeToFee {
 		type Balance = Balance;
 		fn polynomial() -> WeightToFeeCoefficients<Self::Balance> {
-			// in Rococo, extrinsic base weight (smallest non-zero weight) is mapped to 1/10 CENT:
-			// in Bridge Hub, we map to 1/10 of that, or 1/100 CENT
+			// In Rococo, extrinsic base weight (smallest non-zero weight) is mapped to 1/10 CENT:
+			// The standard system parachain configuration is 1/10 of that, as in 1/100 CENT.
 			let p = super::currency::CENTS;
 			let q = 100 * Balance::from(ExtrinsicBaseWeight::get().ref_time());
 
diff --git a/cumulus/parachains/runtimes/assets/asset-hub-westend/src/constants.rs b/cumulus/parachains/common/src/westend.rs
similarity index 95%
rename from cumulus/parachains/runtimes/assets/asset-hub-westend/src/constants.rs
rename to cumulus/parachains/common/src/westend.rs
index fe789569a8ad796c85f67adb3f0fc62b04fbebcf..9d3e0bd1a0e2a51d2dde47b5be329be0bc8b5d38 100644
--- a/cumulus/parachains/runtimes/assets/asset-hub-westend/src/constants.rs
+++ b/cumulus/parachains/common/src/westend.rs
@@ -1,4 +1,4 @@
-// Copyright (C) 2021 Parity Technologies (UK) Ltd.
+// Copyright (C) Parity Technologies (UK) Ltd.
 // SPDX-License-Identifier: Apache-2.0
 
 // Licensed under the Apache License, Version 2.0 (the "License");
@@ -75,8 +75,8 @@ pub mod fee {
 	impl WeightToFeePolynomial for RefTimeToFee {
 		type Balance = Balance;
 		fn polynomial() -> WeightToFeeCoefficients<Self::Balance> {
-			// in Westend, extrinsic base weight (smallest non-zero weight) is mapped to 1/10 CENT:
-			// in Asset Hub, we map to 1/10 of that, or 1/100 CENT
+			// In Westend, extrinsic base weight (smallest non-zero weight) is mapped to 1/10 CENT:
+			// The standard system parachain configuration is 1/10 of that, as in 1/100 CENT.
 			let p = super::currency::CENTS;
 			let q = 100 * Balance::from(ExtrinsicBaseWeight::get().ref_time());
 
diff --git a/cumulus/parachains/common/src/xcm_config.rs b/cumulus/parachains/common/src/xcm_config.rs
index 99dd0ace0fc59b553493129a179958ea37d45f16..534253b4aaeb1e5adebe9f518d6f8f7d39074fa4 100644
--- a/cumulus/parachains/common/src/xcm_config.rs
+++ b/cumulus/parachains/common/src/xcm_config.rs
@@ -1,5 +1,21 @@
+// 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.
+
 use crate::impls::AccountIdOf;
 use core::marker::PhantomData;
+use cumulus_primitives_core::{IsSystem, ParaId};
 use frame_support::{
 	traits::{fungibles::Inspect, tokens::ConversionToAssetBalance, ContainsPair},
 	weights::Weight,
@@ -63,3 +79,85 @@ impl<Location: Get<MultiLocation>> ContainsPair<MultiAsset, MultiLocation>
 		matches!(asset.id, Concrete(ref id) if id == origin && origin == &Location::get())
 	}
 }
+
+/// Accepts an asset if it is a concrete asset from the system (Relay Chain or system parachain).
+pub struct ConcreteAssetFromSystem<AssetLocation>(PhantomData<AssetLocation>);
+impl<AssetLocation: Get<MultiLocation>> ContainsPair<MultiAsset, MultiLocation>
+	for ConcreteAssetFromSystem<AssetLocation>
+{
+	fn contains(asset: &MultiAsset, origin: &MultiLocation) -> bool {
+		log::trace!(target: "xcm::contains", "ConcreteAssetFromSystem asset: {:?}, origin: {:?}", asset, origin);
+		let is_system = match origin {
+			// The Relay Chain
+			MultiLocation { parents: 1, interior: Here } => true,
+			// System parachain
+			MultiLocation { parents: 1, interior: X1(Parachain(id)) } =>
+				ParaId::from(*id).is_system(),
+			// Others
+			_ => false,
+		};
+		matches!(asset.id, Concrete(id) if id == AssetLocation::get()) && is_system
+	}
+}
+
+#[cfg(test)]
+mod tests {
+	use frame_support::parameter_types;
+
+	use super::{
+		ConcreteAssetFromSystem, ContainsPair, GeneralIndex, Here, MultiAsset, MultiLocation,
+		PalletInstance, Parachain, Parent,
+	};
+
+	parameter_types! {
+		pub const RelayLocation: MultiLocation = MultiLocation::parent();
+	}
+
+	#[test]
+	fn concrete_asset_from_relay_works() {
+		let expected_asset: MultiAsset = (Parent, 1000000).into();
+		let expected_origin: MultiLocation = (Parent, Here).into();
+
+		assert!(<ConcreteAssetFromSystem<RelayLocation>>::contains(
+			&expected_asset,
+			&expected_origin
+		));
+	}
+
+	#[test]
+	fn concrete_asset_from_sibling_system_para_fails_for_wrong_asset() {
+		let unexpected_assets: Vec<MultiAsset> = vec![
+			(Here, 1000000).into(),
+			((PalletInstance(50), GeneralIndex(1)), 1000000).into(),
+			((Parent, Parachain(1000), PalletInstance(50), GeneralIndex(1)), 1000000).into(),
+		];
+		let expected_origin: MultiLocation = (Parent, Parachain(1000)).into();
+
+		unexpected_assets.iter().for_each(|asset| {
+			assert!(!<ConcreteAssetFromSystem<RelayLocation>>::contains(asset, &expected_origin));
+		});
+	}
+
+	#[test]
+	fn concrete_asset_from_sibling_system_para_works_for_correct_asset() {
+		// (para_id, expected_result)
+		let test_data = vec![
+			(0, true),
+			(1, true),
+			(1000, true),
+			(1999, true),
+			(2000, false), // Not a System Parachain
+			(2001, false), // Not a System Parachain
+		];
+
+		let expected_asset: MultiAsset = (Parent, 1000000).into();
+
+		for (para_id, expected_result) in test_data {
+			let origin: MultiLocation = (Parent, Parachain(para_id)).into();
+			assert_eq!(
+				expected_result,
+				<ConcreteAssetFromSystem<RelayLocation>>::contains(&expected_asset, &origin)
+			);
+		}
+	}
+}
diff --git a/cumulus/parachains/integration-tests/e2e/collectives/README.md b/cumulus/parachains/integration-tests/e2e/collectives/README.md
index 98ea77aac60642ac7001297bc5d3024124cd7822..9c4efe7c9504835814e1a693dd8d57710da1bc3b 100644
--- a/cumulus/parachains/integration-tests/e2e/collectives/README.md
+++ b/cumulus/parachains/integration-tests/e2e/collectives/README.md
@@ -1,19 +1,23 @@
-E2E tests concerning Polkadot Governance and the Collectives Parachain. The tests run by the Parachain Integration Tests [tool](https://github.com/paritytech/parachains-integration-tests/).
+E2E tests concerning Polkadot Governance and the Collectives Parachain. The tests run by the Parachain Integration Tests
+[tool](https://github.com/paritytech/parachains-integration-tests/).
 
-## Requirements
+# Requirements
 The tests require some changes to the regular production runtime builds:
 
-RelayChain runtime:
+## RelayChain runtime
 1. Alice has SUDO
-2. Public Referenda `StakingAdmin`, `FellowshipAdmin` tracks settings (see the corresponding keys of the `TRACKS_DATA` constant in the `governance::tracks` module of the Relay Chain runtime crate):
+2. Public Referenda `StakingAdmin`, `FellowshipAdmin` tracks settings (see the corresponding keys of the `TRACKS_DATA`
+   constant in the `governance::tracks` module of the Relay Chain runtime crate):
 ``` yaml
 prepare_period: 5 Block,
 decision_period: 1 Block,
 confirm_period: 1 Block,
 min_enactment_period: 1 Block,
 ```
-Collectives runtime:
-1. Fellowship Referenda `Fellows` track settings (see the corresponding key of the `TRACKS_DATA` constant in the `fellowship::tracks` module of the Collectives runtime crate):
+
+## Collectives runtime
+1. Fellowship Referenda `Fellows` track settings (see the corresponding key of the `TRACKS_DATA` constant in the
+   `fellowship::tracks` module of the Collectives runtime crate):
 ``` yaml
 prepare_period: 5 Block,
 decision_period: 1 Block,
diff --git a/cumulus/parachains/integration-tests/e2e/collectives/collectives-polkadot/0_xcm/3_hrmp-open-channels.yml b/cumulus/parachains/integration-tests/e2e/collectives/collectives-polkadot/0_xcm/3_hrmp-open-channels.yml
index 1038ec8dc42b314e4d46d744aeba9afde5de38a4..17a16d9ccd7da8e0d7fc53973987bb0ed117705b 100644
--- a/cumulus/parachains/integration-tests/e2e/collectives/collectives-polkadot/0_xcm/3_hrmp-open-channels.yml
+++ b/cumulus/parachains/integration-tests/e2e/collectives/collectives-polkadot/0_xcm/3_hrmp-open-channels.yml
@@ -37,7 +37,12 @@ tests:
                   ]
                   events:
                     - name: hrmp.HrmpChannelForceOpened
-                      result: [*cp_id, *sp_id, *hrmp_proposed_max_capacity, *hrmp_proposed_max_message_size]
+                      result: {
+                        sender: *cp_id,
+                        recipient: *sp_id,
+                        proposed_max_capacity: *hrmp_proposed_max_capacity,
+                        proposed_max_message_size: *hrmp_proposed_max_message_size
+                      }
       - name: Force Open HRMP Channel From AssetHub Parachain → Collectives Parachain
         its:
           - name: Alice calls hrmp.forceOpenHrmpChannel
@@ -56,4 +61,9 @@ tests:
                   ]
                   events:
                     - name: hrmp.HrmpChannelForceOpened
-                      result: [*sp_id, *cp_id, *hrmp_proposed_max_capacity, *hrmp_proposed_max_message_size]
+                      result: {
+                        sender: *sp_id,
+                        recipient: *cp_id,
+                        proposed_max_capacity: *hrmp_proposed_max_capacity,
+                        proposed_max_message_size: *hrmp_proposed_max_message_size
+                      }
diff --git a/cumulus/parachains/integration-tests/emulated/assets/asset-hub-kusama/Cargo.toml b/cumulus/parachains/integration-tests/emulated/assets/asset-hub-kusama/Cargo.toml
deleted file mode 100644
index 83209e7e46ceaba039139ad96436b6de865d14ce..0000000000000000000000000000000000000000
--- a/cumulus/parachains/integration-tests/emulated/assets/asset-hub-kusama/Cargo.toml
+++ /dev/null
@@ -1,40 +0,0 @@
-[package]
-name = "asset-hub-kusama-integration-tests"
-version = "1.0.0"
-authors = ["Parity Technologies <admin@parity.io>"]
-edition = "2021"
-description = "Asset Hub Kusama runtime integration tests with xcm-emulator"
-
-[dependencies]
-codec = { package = "parity-scale-codec", version = "3.4.0", default-features = false }
-assert_matches = "1.5.0"
-
-# Substrate
-sp-runtime = { path = "../../../../../../substrate/primitives/runtime", default-features = false}
-frame-support = { path = "../../../../../../substrate/frame/support", default-features = false}
-frame-system = { path = "../../../../../../substrate/frame/system", default-features = false}
-sp-core = { path = "../../../../../../substrate/primitives/core", default-features = false}
-sp-weights = { path = "../../../../../../substrate/primitives/weights", default-features = false}
-pallet-balances = { path = "../../../../../../substrate/frame/balances", default-features = false}
-pallet-assets = { path = "../../../../../../substrate/frame/assets", default-features = false}
-pallet-asset-conversion = { path = "../../../../../../substrate/frame/asset-conversion", default-features = false}
-
-# Polkadot
-polkadot-core-primitives = { path = "../../../../../../polkadot/core-primitives", default-features = false}
-polkadot-parachain = { path = "../../../../../../polkadot/parachain", default-features = false}
-polkadot-runtime-parachains = { path = "../../../../../../polkadot/runtime/parachains" }
-polkadot-runtime = { path = "../../../../../../polkadot/runtime/polkadot" }
-xcm = { path = "../../../../../../polkadot/xcm", default-features = false}
-xcm-executor = { path = "../../../../../../polkadot/xcm/xcm-executor", default-features = false}
-pallet-xcm = { path = "../../../../../../polkadot/xcm/pallet-xcm", default-features = false}
-
-# Cumulus
-parachains-common = { path = "../../../../common" }
-asset-hub-kusama-runtime = { path = "../../../../runtimes/assets/asset-hub-kusama" }
-cumulus-pallet-dmp-queue = { path = "../../../../../pallets/dmp-queue" }
-cumulus-pallet-xcmp-queue = { path = "../../../../../pallets/xcmp-queue", default-features = false}
-cumulus-pallet-parachain-system = { path = "../../../../../pallets/parachain-system" }
-
-# Local
-xcm-emulator = { path = "../../../../../xcm/xcm-emulator", default-features = false}
-integration-tests-common = { path = "../../common", default-features = false}
diff --git a/cumulus/parachains/integration-tests/emulated/assets/asset-hub-kusama/src/lib.rs b/cumulus/parachains/integration-tests/emulated/assets/asset-hub-kusama/src/lib.rs
deleted file mode 100644
index 2609ba4ca8dc73b98978164030c56ec3a1734e37..0000000000000000000000000000000000000000
--- a/cumulus/parachains/integration-tests/emulated/assets/asset-hub-kusama/src/lib.rs
+++ /dev/null
@@ -1,104 +0,0 @@
-// Copyright 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/>.
-
-pub use codec::Encode;
-pub use frame_support::{
-	assert_err, assert_ok,
-	instances::Instance1,
-	pallet_prelude::Weight,
-	sp_runtime::{AccountId32, DispatchError, DispatchResult, MultiAddress},
-	traits::{fungibles::Inspect, OriginTrait},
-};
-pub use integration_tests_common::{
-	constants::{
-		accounts::{ALICE, BOB},
-		asset_hub_kusama::ED as ASSET_HUB_KUSAMA_ED,
-		kusama::ED as KUSAMA_ED,
-		PROOF_SIZE_THRESHOLD, REF_TIME_THRESHOLD, XCM_V3,
-	},
-	lazy_static::lazy_static,
-	xcm_transact_paid_execution, xcm_transact_unpaid_execution, AccountId, AssetHubKusama,
-	AssetHubKusamaPallet, AssetHubKusamaReceiver, AssetHubKusamaSender, BridgeHubKusama,
-	BridgeHubKusamaPallet, BridgeHubKusamaReceiver, BridgeHubKusamaSender, BridgeHubPolkadot,
-	BridgeHubPolkadotPallet, BridgeHubPolkadotReceiver, BridgeHubPolkadotSender, Collectives,
-	CollectivesPallet, CollectivesReceiver, CollectivesSender, Kusama, KusamaMockNet, KusamaPallet,
-	KusamaReceiver, KusamaSender, PenpalKusamaA, PenpalKusamaAPallet, PenpalKusamaAReceiver,
-	PenpalKusamaASender, PenpalKusamaB, PenpalKusamaBPallet, PenpalKusamaBReceiver,
-	PenpalKusamaBSender, PenpalPolkadotA, PenpalPolkadotAReceiver, PenpalPolkadotASender, Polkadot,
-	PolkadotMockNet, PolkadotPallet, PolkadotReceiver, PolkadotSender,
-};
-pub use parachains_common::Balance;
-pub use polkadot_core_primitives::InboundDownwardMessage;
-pub use polkadot_parachain::primitives::{HrmpChannelId, Id};
-pub use polkadot_runtime_parachains::inclusion::{AggregateMessageOrigin, UmpQueueId};
-pub use xcm::{
-	prelude::*,
-	v3::{Error, NetworkId::Kusama as KusamaId},
-	DoubleEncoded,
-};
-pub use xcm_emulator::{
-	assert_expected_events, bx, cumulus_pallet_dmp_queue, helpers::weight_within_threshold,
-	AccountId32Junction, Chain, ParaId, Parachain as Para, RelayChain as Relay, Test, TestArgs,
-	TestContext, TestExt, TestExternalities,
-};
-
-pub const ASSET_ID: u32 = 1;
-pub const ASSET_MIN_BALANCE: u128 = 1000;
-// `Assets` pallet index
-pub const ASSETS_PALLET_ID: u8 = 50;
-
-pub type RelayToSystemParaTest = Test<Kusama, AssetHubKusama>;
-pub type SystemParaToRelayTest = Test<AssetHubKusama, Kusama>;
-pub type SystemParaToParaTest = Test<AssetHubKusama, PenpalKusamaA>;
-
-/// Returns a `TestArgs` instance to de used for the Relay Chain accross integraton tests
-pub fn relay_test_args(amount: Balance) -> TestArgs {
-	TestArgs {
-		dest: Kusama::child_location_of(AssetHubKusama::para_id()),
-		beneficiary: AccountId32Junction {
-			network: None,
-			id: AssetHubKusamaReceiver::get().into(),
-		}
-		.into(),
-		amount,
-		assets: (Here, amount).into(),
-		asset_id: None,
-		fee_asset_item: 0,
-		weight_limit: WeightLimit::Unlimited,
-	}
-}
-
-/// Returns a `TestArgs` instance to de used for the System Parachain accross integraton tests
-pub fn system_para_test_args(
-	dest: MultiLocation,
-	beneficiary_id: AccountId32,
-	amount: Balance,
-	assets: MultiAssets,
-	asset_id: Option<u32>,
-) -> TestArgs {
-	TestArgs {
-		dest,
-		beneficiary: AccountId32Junction { network: None, id: beneficiary_id.into() }.into(),
-		amount,
-		assets,
-		asset_id,
-		fee_asset_item: 0,
-		weight_limit: WeightLimit::Unlimited,
-	}
-}
-
-#[cfg(test)]
-mod tests;
diff --git a/cumulus/parachains/integration-tests/emulated/assets/asset-hub-kusama/src/tests/hrmp_channels.rs b/cumulus/parachains/integration-tests/emulated/assets/asset-hub-kusama/src/tests/hrmp_channels.rs
deleted file mode 100644
index 99dd042ccafb8745d0f8abfaf236b6aafb0212e3..0000000000000000000000000000000000000000
--- a/cumulus/parachains/integration-tests/emulated/assets/asset-hub-kusama/src/tests/hrmp_channels.rs
+++ /dev/null
@@ -1,206 +0,0 @@
-// Copyright 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/>.
-
-use crate::*;
-
-const MAX_CAPACITY: u32 = 8;
-const MAX_MESSAGE_SIZE: u32 = 8192;
-
-/// Opening HRMP channels between Parachains should work
-#[test]
-#[cfg(feature = "FIXME-IGNORED")] // <https://github.com/paritytech/cumulus/issues/3027>
-fn open_hrmp_channel_between_paras_works() {
-	// Parchain A init values
-	let para_a_id = PenpalKusamaA::para_id();
-	let para_a_root_origin = <PenpalKusamaA as Chain>::RuntimeOrigin::root();
-
-	// Parachain B init values
-	let para_b_id = PenpalKusamaB::para_id();
-	let para_b_root_origin = <PenpalKusamaB as Chain>::RuntimeOrigin::root();
-
-	let fee_amount = KUSAMA_ED * 1000;
-	let fund_amount = KUSAMA_ED * 1000_000_000;
-
-	// Fund Parachain's Sovereign accounts to be able to reserve the deposit
-	let para_a_sovereign_account = Kusama::fund_para_sovereign(fund_amount, para_a_id);
-	let para_b_sovereign_account = Kusama::fund_para_sovereign(fund_amount, para_b_id);
-
-	let relay_destination: VersionedMultiLocation = PenpalKusamaA::parent_location().into();
-
-	// ---- Init Open channel from Parachain to System Parachain
-	let mut call = Kusama::init_open_channel_call(para_b_id, MAX_CAPACITY, MAX_MESSAGE_SIZE);
-	let origin_kind = OriginKind::Native;
-	let native_asset: MultiAsset = (Here, fee_amount).into();
-	let beneficiary = Kusama::sovereign_account_id_of_child_para(para_a_id);
-
-	let mut xcm = xcm_transact_paid_execution(call, origin_kind, native_asset.clone(), beneficiary);
-
-	PenpalKusamaA::execute_with(|| {
-		assert_ok!(<PenpalKusamaA as PenpalKusamaAPallet>::PolkadotXcm::send(
-			para_a_root_origin,
-			bx!(relay_destination.clone()),
-			bx!(xcm),
-		));
-
-		PenpalKusamaA::assert_xcm_pallet_sent();
-	});
-
-	Kusama::execute_with(|| {
-		type RuntimeEvent = <Kusama as Chain>::RuntimeEvent;
-
-		Kusama::assert_ump_queue_processed(
-			true,
-			Some(para_a_id),
-			Some(Weight::from_parts(1_312_558_000, 200000)),
-		);
-
-		assert_expected_events!(
-			Kusama,
-			vec![
-				// Parachain's Sovereign account balance is withdrawn to pay XCM fees
-				RuntimeEvent::Balances(pallet_balances::Event::Withdraw { who, amount }) => {
-					who: *who == para_a_sovereign_account.clone(),
-					amount: *amount == fee_amount,
-				},
-				// Sender deposit is reserved for Parachain's Sovereign account
-				RuntimeEvent::Balances(pallet_balances::Event::Reserved { who, .. }) =>{
-					who: *who == para_a_sovereign_account,
-				},
-				// Open channel requested from Para A to Para B
-				RuntimeEvent::Hrmp(
-					polkadot_runtime_parachains::hrmp::Event::OpenChannelRequested(
-						sender, recipient, max_capacity, max_message_size
-					)
-				) => {
-					sender: *sender == para_a_id.into(),
-					recipient: *recipient == para_b_id.into(),
-					max_capacity: *max_capacity == MAX_CAPACITY,
-					max_message_size: *max_message_size == MAX_MESSAGE_SIZE,
-				},
-			]
-		);
-	});
-
-	// ---- Accept Open channel from Parachain to System Parachain
-	call = Kusama::accept_open_channel_call(para_a_id);
-	let beneficiary = Kusama::sovereign_account_id_of_child_para(para_b_id);
-
-	xcm = xcm_transact_paid_execution(call, origin_kind, native_asset, beneficiary);
-
-	PenpalKusamaB::execute_with(|| {
-		assert_ok!(<PenpalKusamaB as PenpalKusamaBPallet>::PolkadotXcm::send(
-			para_b_root_origin,
-			bx!(relay_destination),
-			bx!(xcm),
-		));
-
-		PenpalKusamaB::assert_xcm_pallet_sent();
-	});
-
-	Kusama::execute_with(|| {
-		type RuntimeEvent = <Kusama as Chain>::RuntimeEvent;
-
-		Kusama::assert_ump_queue_processed(
-			true,
-			Some(para_b_id),
-			Some(Weight::from_parts(1_312_558_000, 200_000)),
-		);
-
-		assert_expected_events!(
-			Kusama,
-			vec![
-				// Parachain's Sovereign account balance is withdrawn to pay XCM fees
-				RuntimeEvent::Balances(pallet_balances::Event::Withdraw { who, amount }) => {
-					who: *who == para_b_sovereign_account.clone(),
-					amount: *amount == fee_amount,
-				},
-				// Sender deposit is reserved for Parachain's Sovereign account
-				RuntimeEvent::Balances(pallet_balances::Event::Reserved { who, .. }) =>{
-					who: *who == para_b_sovereign_account,
-				},
-				// Open channel accepted for Para A to Para B
-				RuntimeEvent::Hrmp(
-					polkadot_runtime_parachains::hrmp::Event::OpenChannelAccepted(
-						sender, recipient
-					)
-				) => {
-					sender: *sender == para_a_id.into(),
-					recipient: *recipient == para_b_id.into(),
-				},
-			]
-		);
-	});
-
-	Kusama::force_process_hrmp_open(para_a_id, para_b_id);
-}
-
-/// Opening HRMP channels between System Parachains and Parachains should work
-#[test]
-fn force_open_hrmp_channel_for_system_para_works() {
-	// Relay Chain init values
-	let relay_root_origin = <Kusama as Chain>::RuntimeOrigin::root();
-
-	// System Para init values
-	let system_para_id = AssetHubKusama::para_id();
-
-	// Parachain A init values
-	let para_a_id = PenpalKusamaA::para_id();
-
-	let fund_amount = KUSAMA_ED * 1000_000_000;
-
-	// Fund Parachain's Sovereign accounts to be able to reserve the deposit
-	let para_a_sovereign_account = Kusama::fund_para_sovereign(fund_amount, para_a_id);
-	let system_para_sovereign_account = Kusama::fund_para_sovereign(fund_amount, system_para_id);
-
-	Kusama::execute_with(|| {
-		assert_ok!(<Kusama as KusamaPallet>::Hrmp::force_open_hrmp_channel(
-			relay_root_origin,
-			system_para_id,
-			para_a_id,
-			MAX_CAPACITY,
-			MAX_MESSAGE_SIZE
-		));
-
-		type RuntimeEvent = <Kusama as Chain>::RuntimeEvent;
-
-		assert_expected_events!(
-			Kusama,
-			vec![
-				// Sender deposit is reserved for System Parachain's Sovereign account
-				RuntimeEvent::Balances(pallet_balances::Event::Reserved { who, .. }) =>{
-					who: *who == system_para_sovereign_account,
-				},
-				// Recipient deposit is reserved for Parachain's Sovereign account
-				RuntimeEvent::Balances(pallet_balances::Event::Reserved { who, .. }) =>{
-					who: *who == para_a_sovereign_account,
-				},
-				// HRMP channel forced opened
-				RuntimeEvent::Hrmp(
-					polkadot_runtime_parachains::hrmp::Event::HrmpChannelForceOpened(
-						sender, recipient, max_capacity, max_message_size
-					)
-				) => {
-					sender: *sender == system_para_id.into(),
-					recipient: *recipient == para_a_id.into(),
-					max_capacity: *max_capacity == MAX_CAPACITY,
-					max_message_size: *max_message_size == MAX_MESSAGE_SIZE,
-				},
-			]
-		);
-	});
-
-	Kusama::force_process_hrmp_open(system_para_id, para_a_id);
-}
diff --git a/cumulus/parachains/integration-tests/emulated/assets/asset-hub-kusama/src/tests/mod.rs b/cumulus/parachains/integration-tests/emulated/assets/asset-hub-kusama/src/tests/mod.rs
deleted file mode 100644
index 73dd76ec9c66b817818a4f58d0539553943b309c..0000000000000000000000000000000000000000
--- a/cumulus/parachains/integration-tests/emulated/assets/asset-hub-kusama/src/tests/mod.rs
+++ /dev/null
@@ -1,22 +0,0 @@
-// Copyright 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/>.
-
-mod hrmp_channels;
-mod reserve_transfer;
-mod send;
-mod set_xcm_versions;
-mod swap;
-mod teleport;
diff --git a/cumulus/parachains/integration-tests/emulated/assets/asset-hub-kusama/src/tests/reserve_transfer.rs b/cumulus/parachains/integration-tests/emulated/assets/asset-hub-kusama/src/tests/reserve_transfer.rs
deleted file mode 100644
index 9e11830acce2499f9918ec9334f37c173a186235..0000000000000000000000000000000000000000
--- a/cumulus/parachains/integration-tests/emulated/assets/asset-hub-kusama/src/tests/reserve_transfer.rs
+++ /dev/null
@@ -1,415 +0,0 @@
-// Copyright 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/>.
-
-use crate::*;
-
-fn relay_origin_assertions(t: RelayToSystemParaTest) {
-	type RuntimeEvent = <Kusama as Chain>::RuntimeEvent;
-
-	Kusama::assert_xcm_pallet_attempted_complete(Some(Weight::from_parts(630_092_000, 6_196)));
-
-	assert_expected_events!(
-		Kusama,
-		vec![
-			// Amount to reserve transfer is transferred to System Parachain's Sovereign account
-			RuntimeEvent::Balances(pallet_balances::Event::Transfer { from, to, amount }) => {
-				from: *from == t.sender.account_id,
-				to: *to == Kusama::sovereign_account_id_of(
-					t.args.dest
-				),
-				amount:  *amount == t.args.amount,
-			},
-		]
-	);
-}
-
-fn system_para_dest_assertions_incomplete(_t: RelayToSystemParaTest) {
-	AssetHubKusama::assert_dmp_queue_incomplete(
-		Some(Weight::from_parts(1_000_000_000, 0)),
-		Some(Error::UntrustedReserveLocation),
-	);
-}
-
-fn system_para_to_relay_assertions(_t: SystemParaToRelayTest) {
-	AssetHubKusama::assert_xcm_pallet_attempted_error(Some(XcmError::Barrier))
-}
-
-fn system_para_to_para_assertions(t: SystemParaToParaTest) {
-	type RuntimeEvent = <AssetHubKusama as Chain>::RuntimeEvent;
-
-	AssetHubKusama::assert_xcm_pallet_attempted_complete(Some(Weight::from_parts(
-		630_092_000,
-		6_196,
-	)));
-
-	assert_expected_events!(
-		AssetHubKusama,
-		vec![
-			// Amount to reserve transfer is transferred to Parachain's Sovereing account
-			RuntimeEvent::Balances(
-				pallet_balances::Event::Transfer { from, to, amount }
-			) => {
-				from: *from == t.sender.account_id,
-				to: *to == AssetHubKusama::sovereign_account_id_of(
-					t.args.dest
-				),
-				amount: *amount == t.args.amount,
-			},
-		]
-	);
-}
-
-fn system_para_to_para_assets_assertions(t: SystemParaToParaTest) {
-	type RuntimeEvent = <AssetHubKusama as Chain>::RuntimeEvent;
-
-	AssetHubKusama::assert_xcm_pallet_attempted_complete(Some(Weight::from_parts(
-		676_119_000,
-		6196,
-	)));
-
-	assert_expected_events!(
-		AssetHubKusama,
-		vec![
-			// Amount to reserve transfer is transferred to Parachain's Sovereing account
-			RuntimeEvent::Assets(
-				pallet_assets::Event::Transferred { asset_id, from, to, amount }
-			) => {
-				asset_id: *asset_id == ASSET_ID,
-				from: *from == t.sender.account_id,
-				to: *to == AssetHubKusama::sovereign_account_id_of(
-					t.args.dest
-				),
-				amount: *amount == t.args.amount,
-			},
-		]
-	);
-}
-
-fn relay_limited_reserve_transfer_assets(t: RelayToSystemParaTest) -> DispatchResult {
-	<Kusama as KusamaPallet>::XcmPallet::limited_reserve_transfer_assets(
-		t.signed_origin,
-		bx!(t.args.dest.into()),
-		bx!(t.args.beneficiary.into()),
-		bx!(t.args.assets.into()),
-		t.args.fee_asset_item,
-		t.args.weight_limit,
-	)
-}
-
-fn relay_reserve_transfer_assets(t: RelayToSystemParaTest) -> DispatchResult {
-	<Kusama as KusamaPallet>::XcmPallet::reserve_transfer_assets(
-		t.signed_origin,
-		bx!(t.args.dest.into()),
-		bx!(t.args.beneficiary.into()),
-		bx!(t.args.assets.into()),
-		t.args.fee_asset_item,
-	)
-}
-
-fn system_para_limited_reserve_transfer_assets(t: SystemParaToRelayTest) -> DispatchResult {
-	<AssetHubKusama as AssetHubKusamaPallet>::PolkadotXcm::limited_reserve_transfer_assets(
-		t.signed_origin,
-		bx!(t.args.dest.into()),
-		bx!(t.args.beneficiary.into()),
-		bx!(t.args.assets.into()),
-		t.args.fee_asset_item,
-		t.args.weight_limit,
-	)
-}
-
-fn system_para_reserve_transfer_assets(t: SystemParaToRelayTest) -> DispatchResult {
-	<AssetHubKusama as AssetHubKusamaPallet>::PolkadotXcm::reserve_transfer_assets(
-		t.signed_origin,
-		bx!(t.args.dest.into()),
-		bx!(t.args.beneficiary.into()),
-		bx!(t.args.assets.into()),
-		t.args.fee_asset_item,
-	)
-}
-
-fn system_para_to_para_limited_reserve_transfer_assets(t: SystemParaToParaTest) -> DispatchResult {
-	<AssetHubKusama as AssetHubKusamaPallet>::PolkadotXcm::limited_reserve_transfer_assets(
-		t.signed_origin,
-		bx!(t.args.dest.into()),
-		bx!(t.args.beneficiary.into()),
-		bx!(t.args.assets.into()),
-		t.args.fee_asset_item,
-		t.args.weight_limit,
-	)
-}
-
-fn system_para_to_para_reserve_transfer_assets(t: SystemParaToParaTest) -> DispatchResult {
-	<AssetHubKusama as AssetHubKusamaPallet>::PolkadotXcm::reserve_transfer_assets(
-		t.signed_origin,
-		bx!(t.args.dest.into()),
-		bx!(t.args.beneficiary.into()),
-		bx!(t.args.assets.into()),
-		t.args.fee_asset_item,
-	)
-}
-
-/// Limited Reserve Transfers of native asset from Relay Chain to the System Parachain shouldn't
-/// work
-#[test]
-fn limited_reserve_transfer_native_asset_from_relay_to_system_para_fails() {
-	// Init values for Relay Chain
-	let amount_to_send: Balance = KUSAMA_ED * 1000;
-	let test_args = TestContext {
-		sender: KusamaSender::get(),
-		receiver: AssetHubKusamaReceiver::get(),
-		args: relay_test_args(amount_to_send),
-	};
-
-	let mut test = RelayToSystemParaTest::new(test_args);
-
-	let sender_balance_before = test.sender.balance;
-	let receiver_balance_before = test.receiver.balance;
-
-	test.set_assertion::<Kusama>(relay_origin_assertions);
-	test.set_assertion::<AssetHubKusama>(system_para_dest_assertions_incomplete);
-	test.set_dispatchable::<Kusama>(relay_limited_reserve_transfer_assets);
-	test.assert();
-
-	let sender_balance_after = test.sender.balance;
-	let receiver_balance_after = test.receiver.balance;
-
-	assert_eq!(sender_balance_before - amount_to_send, sender_balance_after);
-	assert_eq!(receiver_balance_before, receiver_balance_after);
-}
-
-/// Limited Reserve Transfers of native asset from System Parachain to Relay Chain shoudln't work
-#[test]
-fn limited_reserve_transfer_native_asset_from_system_para_to_relay_fails() {
-	// Init values for System Parachain
-	let destination = AssetHubKusama::parent_location();
-	let beneficiary_id = KusamaReceiver::get();
-	let amount_to_send: Balance = ASSET_HUB_KUSAMA_ED * 1000;
-	let assets = (Parent, amount_to_send).into();
-
-	let test_args = TestContext {
-		sender: AssetHubKusamaSender::get(),
-		receiver: KusamaReceiver::get(),
-		args: system_para_test_args(destination, beneficiary_id, amount_to_send, assets, None),
-	};
-
-	let mut test = SystemParaToRelayTest::new(test_args);
-
-	let sender_balance_before = test.sender.balance;
-	let receiver_balance_before = test.receiver.balance;
-
-	test.set_assertion::<AssetHubKusama>(system_para_to_relay_assertions);
-	test.set_dispatchable::<AssetHubKusama>(system_para_limited_reserve_transfer_assets);
-	test.assert();
-
-	let sender_balance_after = test.sender.balance;
-	let receiver_balance_after = test.receiver.balance;
-
-	assert_eq!(sender_balance_before, sender_balance_after);
-	assert_eq!(receiver_balance_before, receiver_balance_after);
-}
-
-/// Reserve Transfers of native asset from Relay Chain to the System Parachain shouldn't work
-#[test]
-fn reserve_transfer_native_asset_from_relay_to_system_para_fails() {
-	// Init values for Relay Chain
-	let amount_to_send: Balance = KUSAMA_ED * 1000;
-	let test_args = TestContext {
-		sender: KusamaSender::get(),
-		receiver: AssetHubKusamaReceiver::get(),
-		args: relay_test_args(amount_to_send),
-	};
-
-	let mut test = RelayToSystemParaTest::new(test_args);
-
-	let sender_balance_before = test.sender.balance;
-	let receiver_balance_before = test.receiver.balance;
-
-	test.set_assertion::<Kusama>(relay_origin_assertions);
-	test.set_assertion::<AssetHubKusama>(system_para_dest_assertions_incomplete);
-	test.set_dispatchable::<Kusama>(relay_reserve_transfer_assets);
-	test.assert();
-
-	let sender_balance_after = test.sender.balance;
-	let receiver_balance_after = test.receiver.balance;
-
-	assert_eq!(sender_balance_before - amount_to_send, sender_balance_after);
-	assert_eq!(receiver_balance_before, receiver_balance_after);
-}
-
-/// Reserve Transfers of native asset from System Parachain to Relay Chain shouldn't work
-#[test]
-fn reserve_transfer_native_asset_from_system_para_to_relay_fails() {
-	// Init values for System Parachain
-	let destination = AssetHubKusama::parent_location();
-	let beneficiary_id = KusamaReceiver::get();
-	let amount_to_send: Balance = ASSET_HUB_KUSAMA_ED * 1000;
-	let assets = (Parent, amount_to_send).into();
-
-	let test_args = TestContext {
-		sender: AssetHubKusamaSender::get(),
-		receiver: KusamaReceiver::get(),
-		args: system_para_test_args(destination, beneficiary_id, amount_to_send, assets, None),
-	};
-
-	let mut test = SystemParaToRelayTest::new(test_args);
-
-	let sender_balance_before = test.sender.balance;
-	let receiver_balance_before = test.receiver.balance;
-
-	test.set_assertion::<AssetHubKusama>(system_para_to_relay_assertions);
-	test.set_dispatchable::<AssetHubKusama>(system_para_reserve_transfer_assets);
-	test.assert();
-
-	let sender_balance_after = test.sender.balance;
-	let receiver_balance_after = test.receiver.balance;
-
-	assert_eq!(sender_balance_before, sender_balance_after);
-	assert_eq!(receiver_balance_before, receiver_balance_after);
-}
-
-/// Limited Reserve Transfers of native asset from System Parachain to Parachain should work
-#[test]
-fn limited_reserve_transfer_native_asset_from_system_para_to_para() {
-	// Init values for System Parachain
-	let destination = AssetHubKusama::sibling_location_of(PenpalKusamaA::para_id());
-	let beneficiary_id = PenpalKusamaAReceiver::get();
-	let amount_to_send: Balance = ASSET_HUB_KUSAMA_ED * 1000;
-	let assets = (Parent, amount_to_send).into();
-
-	let test_args = TestContext {
-		sender: AssetHubKusamaSender::get(),
-		receiver: PenpalKusamaAReceiver::get(),
-		args: system_para_test_args(destination, beneficiary_id, amount_to_send, assets, None),
-	};
-
-	let mut test = SystemParaToParaTest::new(test_args);
-
-	let sender_balance_before = test.sender.balance;
-
-	test.set_assertion::<AssetHubKusama>(system_para_to_para_assertions);
-	// TODO: Add assertion for Penpal runtime. Right now message is failing with
-	// `UntrustedReserveLocation`
-	test.set_dispatchable::<AssetHubKusama>(system_para_to_para_limited_reserve_transfer_assets);
-	test.assert();
-
-	let sender_balance_after = test.sender.balance;
-
-	assert_eq!(sender_balance_before - amount_to_send, sender_balance_after);
-	// TODO: Check receiver balance when Penpal runtime is improved to propery handle reserve
-	// transfers
-}
-
-/// Reserve Transfers of native asset from System Parachain to Parachain should work
-#[test]
-fn reserve_transfer_native_asset_from_system_para_to_para() {
-	// Init values for System Parachain
-	let destination = AssetHubKusama::sibling_location_of(PenpalKusamaA::para_id());
-	let beneficiary_id = PenpalKusamaAReceiver::get();
-	let amount_to_send: Balance = ASSET_HUB_KUSAMA_ED * 1000;
-	let assets = (Parent, amount_to_send).into();
-
-	let test_args = TestContext {
-		sender: AssetHubKusamaSender::get(),
-		receiver: PenpalKusamaAReceiver::get(),
-		args: system_para_test_args(destination, beneficiary_id, amount_to_send, assets, None),
-	};
-
-	let mut test = SystemParaToParaTest::new(test_args);
-
-	let sender_balance_before = test.sender.balance;
-
-	test.set_assertion::<AssetHubKusama>(system_para_to_para_assertions);
-	// TODO: Add assertion for Penpal runtime. Right now message is failing with
-	// `UntrustedReserveLocation`
-	test.set_dispatchable::<AssetHubKusama>(system_para_to_para_reserve_transfer_assets);
-	test.assert();
-
-	let sender_balance_after = test.sender.balance;
-
-	assert_eq!(sender_balance_before - amount_to_send, sender_balance_after);
-	// TODO: Check receiver balance when Penpal runtime is improved to propery handle reserve
-	// transfers
-}
-
-/// Limited Reserve Transfers of a local asset from System Parachain to Parachain should work
-#[test]
-fn limited_reserve_transfer_asset_from_system_para_to_para() {
-	// Force create asset from Relay Chain and mint assets for System Parachain's sender account
-	AssetHubKusama::force_create_and_mint_asset(
-		ASSET_ID,
-		ASSET_MIN_BALANCE,
-		true,
-		AssetHubKusamaSender::get(),
-		ASSET_MIN_BALANCE * 1000000,
-	);
-
-	// Init values for System Parachain
-	let destination = AssetHubKusama::sibling_location_of(PenpalKusamaA::para_id());
-	let beneficiary_id = PenpalKusamaAReceiver::get();
-	let amount_to_send = ASSET_MIN_BALANCE * 1000;
-	let assets =
-		(X2(PalletInstance(ASSETS_PALLET_ID), GeneralIndex(ASSET_ID.into())), amount_to_send)
-			.into();
-
-	let system_para_test_args = TestContext {
-		sender: AssetHubKusamaSender::get(),
-		receiver: PenpalKusamaAReceiver::get(),
-		args: system_para_test_args(destination, beneficiary_id, amount_to_send, assets, None),
-	};
-
-	let mut system_para_test = SystemParaToParaTest::new(system_para_test_args);
-
-	system_para_test.set_assertion::<AssetHubKusama>(system_para_to_para_assets_assertions);
-	// TODO: Add assertions when Penpal is able to manage assets
-	system_para_test
-		.set_dispatchable::<AssetHubKusama>(system_para_to_para_limited_reserve_transfer_assets);
-	system_para_test.assert();
-}
-
-/// Reserve Transfers of a local asset from System Parachain to Parachain should work
-#[test]
-fn reserve_transfer_asset_from_system_para_to_para() {
-	// Force create asset from Relay Chain and mint assets for System Parachain's sender account
-	AssetHubKusama::force_create_and_mint_asset(
-		ASSET_ID,
-		ASSET_MIN_BALANCE,
-		true,
-		AssetHubKusamaSender::get(),
-		ASSET_MIN_BALANCE * 1000000,
-	);
-
-	// Init values for System Parachain
-	let destination = AssetHubKusama::sibling_location_of(PenpalKusamaA::para_id());
-	let beneficiary_id = PenpalKusamaAReceiver::get();
-	let amount_to_send = ASSET_MIN_BALANCE * 1000;
-	let assets =
-		(X2(PalletInstance(ASSETS_PALLET_ID), GeneralIndex(ASSET_ID.into())), amount_to_send)
-			.into();
-
-	let system_para_test_args = TestContext {
-		sender: AssetHubKusamaSender::get(),
-		receiver: PenpalKusamaAReceiver::get(),
-		args: system_para_test_args(destination, beneficiary_id, amount_to_send, assets, None),
-	};
-
-	let mut system_para_test = SystemParaToParaTest::new(system_para_test_args);
-
-	system_para_test.set_assertion::<AssetHubKusama>(system_para_to_para_assets_assertions);
-	// TODO: Add assertions when Penpal is able to manage assets
-	system_para_test
-		.set_dispatchable::<AssetHubKusama>(system_para_to_para_reserve_transfer_assets);
-	system_para_test.assert();
-}
diff --git a/cumulus/parachains/integration-tests/emulated/assets/asset-hub-kusama/src/tests/send.rs b/cumulus/parachains/integration-tests/emulated/assets/asset-hub-kusama/src/tests/send.rs
deleted file mode 100644
index 819517ee840790eb4a8f36bee06c629a32903cd9..0000000000000000000000000000000000000000
--- a/cumulus/parachains/integration-tests/emulated/assets/asset-hub-kusama/src/tests/send.rs
+++ /dev/null
@@ -1,197 +0,0 @@
-// Copyright 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/>.
-
-use crate::*;
-
-/// Relay Chain should be able to execute `Transact` instructions in System Parachain
-/// when `OriginKind::Superuser` and signer is `sudo`
-#[test]
-fn send_transact_sudo_from_relay_to_system_para_works() {
-	// Init tests variables
-	let root_origin = <Kusama as Chain>::RuntimeOrigin::root();
-	let system_para_destination = Kusama::child_location_of(AssetHubKusama::para_id()).into();
-	let asset_owner: AccountId = AssetHubKusamaSender::get().into();
-	let xcm = AssetHubKusama::force_create_asset_xcm(
-		OriginKind::Superuser,
-		ASSET_ID,
-		asset_owner.clone(),
-		true,
-		1000,
-	);
-	// Send XCM message from Relay Chain
-	Kusama::execute_with(|| {
-		assert_ok!(<Kusama as KusamaPallet>::XcmPallet::send(
-			root_origin,
-			bx!(system_para_destination),
-			bx!(xcm),
-		));
-
-		Kusama::assert_xcm_pallet_sent();
-	});
-
-	// Receive XCM message in Assets Parachain
-	AssetHubKusama::execute_with(|| {
-		type RuntimeEvent = <AssetHubKusama as Chain>::RuntimeEvent;
-
-		AssetHubKusama::assert_dmp_queue_complete(Some(Weight::from_parts(1_019_445_000, 200_000)));
-
-		assert_expected_events!(
-			AssetHubKusama,
-			vec![
-				RuntimeEvent::Assets(pallet_assets::Event::ForceCreated { asset_id, owner }) => {
-					asset_id: *asset_id == ASSET_ID,
-					owner: *owner == asset_owner,
-				},
-			]
-		);
-
-		assert!(<AssetHubKusama as AssetHubKusamaPallet>::Assets::asset_exists(ASSET_ID));
-	});
-}
-
-/// Relay Chain shouldn't be able to execute `Transact` instructions in System Parachain
-/// when `OriginKind::Native`
-#[test]
-fn send_transact_native_from_relay_to_system_para_fails() {
-	// Init tests variables
-	let signed_origin = <Kusama as Chain>::RuntimeOrigin::signed(KusamaSender::get().into());
-	let system_para_destination = Kusama::child_location_of(AssetHubKusama::para_id()).into();
-	let asset_owner = AssetHubKusamaSender::get().into();
-	let xcm = AssetHubKusama::force_create_asset_xcm(
-		OriginKind::Native,
-		ASSET_ID,
-		asset_owner,
-		true,
-		1000,
-	);
-
-	// Send XCM message from Relay Chain
-	Kusama::execute_with(|| {
-		assert_err!(
-			<Kusama as KusamaPallet>::XcmPallet::send(
-				signed_origin,
-				bx!(system_para_destination),
-				bx!(xcm)
-			),
-			DispatchError::BadOrigin
-		);
-	});
-}
-
-/// System Parachain shouldn't be able to execute `Transact` instructions in Relay Chain
-/// when `OriginKind::Native`
-#[test]
-fn send_transact_native_from_system_para_to_relay_fails() {
-	// Init tests variables
-	let signed_origin =
-		<AssetHubKusama as Chain>::RuntimeOrigin::signed(AssetHubKusamaSender::get().into());
-	let relay_destination = AssetHubKusama::parent_location().into();
-	let call = <Kusama as Chain>::RuntimeCall::System(frame_system::Call::<
-		<Kusama as Chain>::Runtime,
-	>::remark_with_event {
-		remark: vec![0, 1, 2, 3],
-	})
-	.encode()
-	.into();
-	let origin_kind = OriginKind::Native;
-
-	let xcm = xcm_transact_unpaid_execution(call, origin_kind);
-
-	// Send XCM message from Relay Chain
-	AssetHubKusama::execute_with(|| {
-		assert_err!(
-			<AssetHubKusama as AssetHubKusamaPallet>::PolkadotXcm::send(
-				signed_origin,
-				bx!(relay_destination),
-				bx!(xcm)
-			),
-			DispatchError::BadOrigin
-		);
-	});
-}
-
-/// Parachain should be able to send XCM paying its fee with sufficient asset
-/// in the System Parachain
-#[test]
-#[ignore]
-fn send_xcm_from_para_to_system_para_paying_fee_with_assets_works() {
-	// let para_sovereign_account = AssetHubKusama::sovereign_account_id_of(
-	// 	AssetHubKusama::sibling_location_of(PenpalKusamaA::para_id()),
-	// );
-
-	// // Force create and mint assets for Parachain's sovereign account
-	// AssetHubKusama::force_create_and_mint_asset(
-	// 	ASSET_ID,
-	// 	ASSET_MIN_BALANCE,
-	// 	true,
-	// 	para_sovereign_account.clone(),
-	// 	ASSET_MIN_BALANCE * 1000000000,
-	// );
-
-	// // We just need a call that can pass the `SafeCallFilter`
-	// // Call values are not relevant
-	// let call = AssetHubKusama::force_create_asset_call(
-	// 	ASSET_ID,
-	// 	para_sovereign_account.clone(),
-	// 	true,
-	// 	ASSET_MIN_BALANCE,
-	// );
-
-	// let origin_kind = OriginKind::SovereignAccount;
-	// let fee_amount = ASSET_MIN_BALANCE * 1000000;
-	// let native_asset =
-	// 	(X2(PalletInstance(ASSETS_PALLET_ID), GeneralIndex(ASSET_ID.into())), fee_amount).into();
-
-	// let root_origin = <PenpalKusamaA as Chain>::RuntimeOrigin::root();
-	// let system_para_destination =
-	// 	PenpalKusamaA::sibling_location_of(AssetHubKusama::para_id()).into();
-	// let xcm = xcm_transact_paid_execution(
-	// 	call,
-	// 	origin_kind,
-	// 	native_asset,
-	// 	para_sovereign_account.clone(),
-	// );
-
-	// PenpalKusamaA::execute_with(|| {
-	// 	assert_ok!(<PenpalKusamaA as PenpalKusamaAPallet>::PolkadotXcm::send(
-	// 		root_origin,
-	// 		bx!(system_para_destination),
-	// 		bx!(xcm),
-	// 	));
-
-	// 	PenpalKusamaA::assert_xcm_pallet_sent();
-	// });
-
-	// AssetHubKusama::execute_with(|| {
-	// 	type RuntimeEvent = <AssetHubKusama as Chain>::RuntimeEvent;
-
-	// 	AssetHubKusama::assert_xcmp_queue_success(Some(Weight::from_parts(2_176_414_000, 203_593)));
-
-	// 	assert_expected_events!(
-	// 		AssetHubKusama,
-	// 		vec![
-	// 			RuntimeEvent::Assets(pallet_assets::Event::Burned { asset_id, owner, balance }) => {
-	// 				asset_id: *asset_id == ASSET_ID,
-	// 				owner: *owner == para_sovereign_account,
-	// 				balance: *balance == fee_amount,
-	// 			},
-	// 			RuntimeEvent::Assets(pallet_assets::Event::Issued { asset_id, .. }) => {
-	// 				asset_id: *asset_id == ASSET_ID,
-	// 			},
-	// 		]
-	// 	);
-	// });
-}
diff --git a/cumulus/parachains/integration-tests/emulated/assets/asset-hub-kusama/src/tests/set_xcm_versions.rs b/cumulus/parachains/integration-tests/emulated/assets/asset-hub-kusama/src/tests/set_xcm_versions.rs
deleted file mode 100644
index 0ab53b451224d1546dceac8d51ae9784ee747d6f..0000000000000000000000000000000000000000
--- a/cumulus/parachains/integration-tests/emulated/assets/asset-hub-kusama/src/tests/set_xcm_versions.rs
+++ /dev/null
@@ -1,94 +0,0 @@
-// Copyright 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/>.
-
-use crate::*;
-
-#[test]
-fn relay_sets_system_para_xcm_supported_version() {
-	// Init tests variables
-	let sudo_origin = <Kusama as Chain>::RuntimeOrigin::root();
-	let system_para_destination: MultiLocation =
-		Kusama::child_location_of(AssetHubKusama::para_id());
-
-	// Relay Chain sets supported version for Asset Parachain
-	Kusama::execute_with(|| {
-		assert_ok!(<Kusama as KusamaPallet>::XcmPallet::force_xcm_version(
-			sudo_origin,
-			bx!(system_para_destination),
-			XCM_V3
-		));
-
-		type RuntimeEvent = <Kusama as Chain>::RuntimeEvent;
-
-		assert_expected_events!(
-			Kusama,
-			vec![
-				RuntimeEvent::XcmPallet(pallet_xcm::Event::SupportedVersionChanged {
-					location,
-					version: XCM_V3
-				}) => { location: *location == system_para_destination, },
-			]
-		);
-	});
-}
-
-#[test]
-fn system_para_sets_relay_xcm_supported_version() {
-	// Init test variables
-	let sudo_origin = <Kusama as Chain>::RuntimeOrigin::root();
-	let parent_location = AssetHubKusama::parent_location();
-	let system_para_destination: VersionedMultiLocation =
-		Kusama::child_location_of(AssetHubKusama::para_id()).into();
-	let call = <AssetHubKusama as Chain>::RuntimeCall::PolkadotXcm(pallet_xcm::Call::<
-		<AssetHubKusama as Chain>::Runtime,
-	>::force_xcm_version {
-		location: bx!(parent_location),
-		version: XCM_V3,
-	})
-	.encode()
-	.into();
-	let origin_kind = OriginKind::Superuser;
-
-	let xcm = xcm_transact_unpaid_execution(call, origin_kind);
-
-	// System Parachain sets supported version for Relay Chain throught it
-	Kusama::execute_with(|| {
-		assert_ok!(<Kusama as KusamaPallet>::XcmPallet::send(
-			sudo_origin,
-			bx!(system_para_destination),
-			bx!(xcm),
-		));
-
-		Kusama::assert_xcm_pallet_sent();
-	});
-
-	// System Parachain receive the XCM message
-	AssetHubKusama::execute_with(|| {
-		type RuntimeEvent = <AssetHubKusama as Chain>::RuntimeEvent;
-
-		AssetHubKusama::assert_dmp_queue_complete(Some(Weight::from_parts(1_019_210_000, 200_000)));
-
-		assert_expected_events!(
-			AssetHubKusama,
-			vec![
-				RuntimeEvent::PolkadotXcm(pallet_xcm::Event::SupportedVersionChanged {
-					location,
-					version: XCM_V3
-				}) => { location: *location == parent_location, },
-			]
-		);
-	});
-}
diff --git a/cumulus/parachains/integration-tests/emulated/assets/asset-hub-kusama/src/tests/swap.rs b/cumulus/parachains/integration-tests/emulated/assets/asset-hub-kusama/src/tests/swap.rs
deleted file mode 100644
index eb545155a540bceb6c5aeb0591d2c07ec2ee925e..0000000000000000000000000000000000000000
--- a/cumulus/parachains/integration-tests/emulated/assets/asset-hub-kusama/src/tests/swap.rs
+++ /dev/null
@@ -1,351 +0,0 @@
-use crate::*;
-use asset_hub_kusama_runtime::constants::currency::EXISTENTIAL_DEPOSIT;
-use frame_support::{instances::Instance2, BoundedVec};
-use sp_runtime::{DispatchError, ModuleError};
-
-#[test]
-fn swap_locally_on_chain_using_local_assets() {
-	let asset_native = Box::new(asset_hub_kusama_runtime::xcm_config::KsmLocation::get());
-	let asset_one = Box::new(MultiLocation {
-		parents: 0,
-		interior: X2(PalletInstance(ASSETS_PALLET_ID), GeneralIndex(ASSET_ID.into())),
-	});
-
-	AssetHubKusama::execute_with(|| {
-		type RuntimeEvent = <AssetHubKusama as Chain>::RuntimeEvent;
-
-		assert_ok!(<AssetHubKusama as AssetHubKusamaPallet>::Assets::create(
-			<AssetHubKusama as Chain>::RuntimeOrigin::signed(AssetHubKusamaSender::get()),
-			ASSET_ID.into(),
-			AssetHubKusamaSender::get().into(),
-			1000,
-		));
-		assert!(<AssetHubKusama as AssetHubKusamaPallet>::Assets::asset_exists(ASSET_ID));
-
-		assert_ok!(<AssetHubKusama as AssetHubKusamaPallet>::Assets::mint(
-			<AssetHubKusama as Chain>::RuntimeOrigin::signed(AssetHubKusamaSender::get()),
-			ASSET_ID.into(),
-			AssetHubKusamaSender::get().into(),
-			100_000_000_000_000,
-		));
-
-		assert_ok!(<AssetHubKusama as AssetHubKusamaPallet>::Balances::force_set_balance(
-			<AssetHubKusama as Chain>::RuntimeOrigin::root(),
-			AssetHubKusamaSender::get().into(),
-			100_000_000_000_000,
-		));
-
-		assert_ok!(<AssetHubKusama as AssetHubKusamaPallet>::AssetConversion::create_pool(
-			<AssetHubKusama as Chain>::RuntimeOrigin::signed(AssetHubKusamaSender::get()),
-			asset_native.clone(),
-			asset_one.clone(),
-		));
-
-		assert_expected_events!(
-			AssetHubKusama,
-			vec![
-				RuntimeEvent::AssetConversion(pallet_asset_conversion::Event::PoolCreated { .. }) => {},
-			]
-		);
-
-		assert_ok!(<AssetHubKusama as AssetHubKusamaPallet>::AssetConversion::add_liquidity(
-			<AssetHubKusama as Chain>::RuntimeOrigin::signed(AssetHubKusamaSender::get()),
-			asset_native.clone(),
-			asset_one.clone(),
-			1_000_000_000_000,
-			2_000_000_000_000,
-			0,
-			0,
-			AssetHubKusamaSender::get().into()
-		));
-
-		assert_expected_events!(
-			AssetHubKusama,
-			vec![
-				RuntimeEvent::AssetConversion(pallet_asset_conversion::Event::LiquidityAdded {lp_token_minted, .. }) => { lp_token_minted: *lp_token_minted == 1414213562273, },
-			]
-		);
-
-		let path = BoundedVec::<_, _>::truncate_from(vec![asset_native.clone(), asset_one.clone()]);
-
-		assert_ok!(
-			<AssetHubKusama as AssetHubKusamaPallet>::AssetConversion::swap_exact_tokens_for_tokens(
-				<AssetHubKusama as Chain>::RuntimeOrigin::signed(AssetHubKusamaSender::get()),
-				path,
-				100,
-				1,
-				AssetHubKusamaSender::get().into(),
-				true
-			)
-		);
-
-		assert_expected_events!(
-			AssetHubKusama,
-			vec![
-				RuntimeEvent::AssetConversion(pallet_asset_conversion::Event::SwapExecuted { amount_in, amount_out, .. }) => {
-					amount_in: *amount_in == 100,
-					amount_out: *amount_out == 199,
-				},
-			]
-		);
-
-		assert_ok!(<AssetHubKusama as AssetHubKusamaPallet>::AssetConversion::remove_liquidity(
-			<AssetHubKusama as Chain>::RuntimeOrigin::signed(AssetHubKusamaSender::get()),
-			asset_native,
-			asset_one,
-			1414213562273 - EXISTENTIAL_DEPOSIT * 2, // all but the 2 EDs can't be retrieved.
-			0,
-			0,
-			AssetHubKusamaSender::get().into(),
-		));
-	});
-}
-
-#[test]
-fn swap_locally_on_chain_using_foreign_assets() {
-	use frame_support::weights::WeightToFee;
-
-	let asset_native = Box::new(asset_hub_kusama_runtime::xcm_config::KsmLocation::get());
-
-	let foreign_asset1_at_asset_hub_kusama = Box::new(MultiLocation {
-		parents: 1,
-		interior: X3(
-			Parachain(PenpalKusamaA::para_id().into()),
-			PalletInstance(ASSETS_PALLET_ID),
-			GeneralIndex(ASSET_ID.into()),
-		),
-	});
-
-	let assets_para_destination: VersionedMultiLocation =
-		MultiLocation { parents: 1, interior: X1(Parachain(AssetHubKusama::para_id().into())) }
-			.into();
-
-	let penpal_location =
-		MultiLocation { parents: 1, interior: X1(Parachain(PenpalKusamaA::para_id().into())) };
-
-	// 1. Create asset on penpal:
-	PenpalKusamaA::execute_with(|| {
-		assert_ok!(<PenpalKusamaA as PenpalKusamaAPallet>::Assets::create(
-			<PenpalKusamaA as Chain>::RuntimeOrigin::signed(PenpalKusamaASender::get()),
-			ASSET_ID.into(),
-			PenpalKusamaASender::get().into(),
-			1000,
-		));
-
-		assert!(<PenpalKusamaA as PenpalKusamaAPallet>::Assets::asset_exists(ASSET_ID));
-	});
-
-	// 2. Create foreign asset on asset_hub_kusama:
-
-	let require_weight_at_most = Weight::from_parts(1_100_000_000_000, 30_000);
-	let origin_kind = OriginKind::Xcm;
-	let sov_penpal_on_asset_hub_kusama = AssetHubKusama::sovereign_account_id_of(penpal_location);
-
-	AssetHubKusama::fund_accounts(vec![
-		(AssetHubKusamaSender::get().into(), 5_000_000 * KUSAMA_ED), /* An account to swap dot
-		                                                              * for something else. */
-		(sov_penpal_on_asset_hub_kusama.clone().into(), 1000_000_000_000_000_000 * KUSAMA_ED),
-	]);
-
-	let sov_penpal_on_asset_hub_kusama_as_location: MultiLocation = MultiLocation {
-		parents: 0,
-		interior: X1(AccountId32Junction {
-			network: None,
-			id: sov_penpal_on_asset_hub_kusama.clone().into(),
-		}),
-	};
-
-	let call_foreign_assets_create =
-		<AssetHubKusama as Chain>::RuntimeCall::ForeignAssets(pallet_assets::Call::<
-			<AssetHubKusama as Chain>::Runtime,
-			Instance2,
-		>::create {
-			id: *foreign_asset1_at_asset_hub_kusama,
-			min_balance: 1000,
-			admin: sov_penpal_on_asset_hub_kusama.clone().into(),
-		})
-		.encode()
-		.into();
-
-	let buy_execution_fee_amount =
-		asset_hub_kusama_runtime::constants::fee::WeightToFee::weight_to_fee(&Weight::from_parts(
-			10_100_000_000_000,
-			300_000,
-		));
-	let buy_execution_fee = MultiAsset {
-		id: Concrete(MultiLocation { parents: 1, interior: Here }),
-		fun: Fungible(buy_execution_fee_amount),
-	};
-
-	let xcm = VersionedXcm::from(Xcm(vec![
-		WithdrawAsset { 0: vec![buy_execution_fee.clone()].into() },
-		BuyExecution { fees: buy_execution_fee.clone(), weight_limit: Unlimited },
-		Transact { require_weight_at_most, origin_kind, call: call_foreign_assets_create },
-		RefundSurplus,
-		DepositAsset {
-			assets: All.into(),
-			beneficiary: sov_penpal_on_asset_hub_kusama_as_location,
-		},
-	]));
-
-	// Send XCM message from penpal => asset_hub_kusama
-	let sudo_penpal_origin = <PenpalKusamaA as Chain>::RuntimeOrigin::root();
-	PenpalKusamaA::execute_with(|| {
-		assert_ok!(<PenpalKusamaA as PenpalKusamaAPallet>::PolkadotXcm::send(
-			sudo_penpal_origin.clone(),
-			bx!(assets_para_destination.clone()),
-			bx!(xcm),
-		));
-
-		type RuntimeEvent = <PenpalKusamaA as Chain>::RuntimeEvent;
-
-		assert_expected_events!(
-			PenpalKusamaA,
-			vec![
-				RuntimeEvent::PolkadotXcm(pallet_xcm::Event::Sent { .. }) => {},
-			]
-		);
-	});
-
-	// Receive XCM message in Assets Parachain
-	AssetHubKusama::execute_with(|| {
-		assert!(<AssetHubKusama as AssetHubKusamaPallet>::ForeignAssets::asset_exists(
-			*foreign_asset1_at_asset_hub_kusama
-		));
-
-		// 3: Mint foreign asset on asset_hub_kusama:
-		//
-		// (While it might be nice to use batch,
-		// currently that's disabled due to safe call filters.)
-
-		type RuntimeEvent = <AssetHubKusama as Chain>::RuntimeEvent;
-		// 3. Mint foreign asset (in reality this should be a teleport or some such)
-		assert_ok!(<AssetHubKusama as AssetHubKusamaPallet>::ForeignAssets::mint(
-			<AssetHubKusama as Chain>::RuntimeOrigin::signed(
-				sov_penpal_on_asset_hub_kusama.clone().into()
-			),
-			*foreign_asset1_at_asset_hub_kusama,
-			sov_penpal_on_asset_hub_kusama.clone().into(),
-			3_000_000_000_000,
-		));
-
-		assert_expected_events!(
-			AssetHubKusama,
-			vec![
-				RuntimeEvent::ForeignAssets(pallet_assets::Event::Issued { .. }) => {},
-			]
-		);
-
-		// 4. Create pool:
-		assert_ok!(<AssetHubKusama as AssetHubKusamaPallet>::AssetConversion::create_pool(
-			<AssetHubKusama as Chain>::RuntimeOrigin::signed(AssetHubKusamaSender::get()),
-			asset_native.clone(),
-			foreign_asset1_at_asset_hub_kusama.clone(),
-		));
-
-		assert_expected_events!(
-			AssetHubKusama,
-			vec![
-				RuntimeEvent::AssetConversion(pallet_asset_conversion::Event::PoolCreated { .. }) => {},
-			]
-		);
-
-		// 5. Add liquidity:
-		assert_ok!(<AssetHubKusama as AssetHubKusamaPallet>::AssetConversion::add_liquidity(
-			<AssetHubKusama as Chain>::RuntimeOrigin::signed(
-				sov_penpal_on_asset_hub_kusama.clone()
-			),
-			asset_native.clone(),
-			foreign_asset1_at_asset_hub_kusama.clone(),
-			1_000_000_000_000,
-			2_000_000_000_000,
-			0,
-			0,
-			sov_penpal_on_asset_hub_kusama.clone().into()
-		));
-
-		assert_expected_events!(
-			AssetHubKusama,
-			vec![
-				RuntimeEvent::AssetConversion(pallet_asset_conversion::Event::LiquidityAdded {lp_token_minted, .. }) => {
-					lp_token_minted: *lp_token_minted == 1414213562273,
-				},
-			]
-		);
-
-		// 6. Swap!
-		let path = BoundedVec::<_, _>::truncate_from(vec![
-			asset_native.clone(),
-			foreign_asset1_at_asset_hub_kusama.clone(),
-		]);
-
-		assert_ok!(
-			<AssetHubKusama as AssetHubKusamaPallet>::AssetConversion::swap_exact_tokens_for_tokens(
-				<AssetHubKusama as Chain>::RuntimeOrigin::signed(AssetHubKusamaSender::get()),
-				path,
-				100000,
-				1000,
-				AssetHubKusamaSender::get().into(),
-				true
-			)
-		);
-
-		assert_expected_events!(
-			AssetHubKusama,
-			vec![
-				RuntimeEvent::AssetConversion(pallet_asset_conversion::Event::SwapExecuted { amount_in, amount_out, .. },) => {
-					amount_in: *amount_in == 100000,
-					amount_out: *amount_out == 199399,
-				},
-			]
-		);
-
-		// 7. Remove liquidity
-		assert_ok!(<AssetHubKusama as AssetHubKusamaPallet>::AssetConversion::remove_liquidity(
-			<AssetHubKusama as Chain>::RuntimeOrigin::signed(
-				sov_penpal_on_asset_hub_kusama.clone()
-			),
-			asset_native,
-			foreign_asset1_at_asset_hub_kusama,
-			1414213562273 - 2_000_000_000, // all but the 2 EDs can't be retrieved.
-			0,
-			0,
-			sov_penpal_on_asset_hub_kusama.clone().into(),
-		));
-	});
-}
-
-#[test]
-fn cannot_create_pool_from_pool_assets() {
-	let asset_native = Box::new(asset_hub_kusama_runtime::xcm_config::KsmLocation::get());
-	let mut asset_one = asset_hub_kusama_runtime::xcm_config::PoolAssetsPalletLocation::get();
-	asset_one.append_with(GeneralIndex(ASSET_ID.into())).expect("pool assets");
-
-	AssetHubKusama::execute_with(|| {
-		let pool_owner_account_id = asset_hub_kusama_runtime::AssetConversionOrigin::get();
-
-		assert_ok!(<AssetHubKusama as AssetHubKusamaPallet>::PoolAssets::create(
-			<AssetHubKusama as Chain>::RuntimeOrigin::signed(pool_owner_account_id.clone()),
-			ASSET_ID.into(),
-			pool_owner_account_id.clone().into(),
-			1000,
-		));
-		assert!(<AssetHubKusama as AssetHubKusamaPallet>::PoolAssets::asset_exists(ASSET_ID));
-
-		assert_ok!(<AssetHubKusama as AssetHubKusamaPallet>::PoolAssets::mint(
-			<AssetHubKusama as Chain>::RuntimeOrigin::signed(pool_owner_account_id),
-			ASSET_ID.into(),
-			AssetHubKusamaSender::get().into(),
-			3_000_000_000_000,
-		));
-
-		assert_matches::assert_matches!(
-			<AssetHubKusama as AssetHubKusamaPallet>::AssetConversion::create_pool(
-				<AssetHubKusama as Chain>::RuntimeOrigin::signed(AssetHubKusamaSender::get()),
-				asset_native.clone(),
-				Box::new(asset_one),
-			),
-			Err(DispatchError::Module(ModuleError{index: _, error: _, message})) => assert_eq!(message, Some("UnsupportedAsset"))
-		);
-	});
-}
diff --git a/cumulus/parachains/integration-tests/emulated/assets/asset-hub-kusama/src/tests/teleport.rs b/cumulus/parachains/integration-tests/emulated/assets/asset-hub-kusama/src/tests/teleport.rs
deleted file mode 100644
index cf9f5a2327206786e961f1a5e0d0db5fc324e89b..0000000000000000000000000000000000000000
--- a/cumulus/parachains/integration-tests/emulated/assets/asset-hub-kusama/src/tests/teleport.rs
+++ /dev/null
@@ -1,366 +0,0 @@
-// Copyright 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/>.
-
-#![allow(dead_code)] // <https://github.com/paritytech/cumulus/issues/3027>
-
-use crate::*;
-
-fn relay_origin_assertions(t: RelayToSystemParaTest) {
-	type RuntimeEvent = <Kusama as Chain>::RuntimeEvent;
-
-	Kusama::assert_xcm_pallet_attempted_complete(Some(Weight::from_parts(631_531_000, 7_186)));
-
-	assert_expected_events!(
-		Kusama,
-		vec![
-			// Amount to teleport is withdrawn from Sender
-			RuntimeEvent::Balances(pallet_balances::Event::Withdraw { who, amount }) => {
-				who: *who == t.sender.account_id,
-				amount: *amount == t.args.amount,
-			},
-			// Amount to teleport is deposited in Relay's `CheckAccount`
-			RuntimeEvent::Balances(pallet_balances::Event::Deposit { who, amount }) => {
-				who: *who == <Kusama as KusamaPallet>::XcmPallet::check_account(),
-				amount:  *amount == t.args.amount,
-			},
-		]
-	);
-}
-
-fn relay_dest_assertions(t: SystemParaToRelayTest) {
-	type RuntimeEvent = <Kusama as Chain>::RuntimeEvent;
-
-	Kusama::assert_ump_queue_processed(
-		true,
-		Some(AssetHubKusama::para_id()),
-		Some(Weight::from_parts(307_225_000, 7_186)),
-	);
-
-	assert_expected_events!(
-		Kusama,
-		vec![
-			// Amount is witdrawn from Relay Chain's `CheckAccount`
-			RuntimeEvent::Balances(pallet_balances::Event::Withdraw { who, amount }) => {
-				who: *who == <Kusama as KusamaPallet>::XcmPallet::check_account(),
-				amount: *amount == t.args.amount,
-			},
-			// Amount minus fees are deposited in Receiver's account
-			RuntimeEvent::Balances(pallet_balances::Event::Deposit { who, .. }) => {
-				who: *who == t.receiver.account_id,
-			},
-		]
-	);
-}
-
-fn relay_dest_assertions_fail(_t: SystemParaToRelayTest) {
-	Kusama::assert_ump_queue_processed(
-		false,
-		Some(AssetHubKusama::para_id()),
-		Some(Weight::from_parts(148_433_000, 3_593)),
-	);
-}
-
-fn para_origin_assertions(t: SystemParaToRelayTest) {
-	type RuntimeEvent = <AssetHubKusama as Chain>::RuntimeEvent;
-
-	AssetHubKusama::assert_xcm_pallet_attempted_complete(Some(Weight::from_parts(
-		534_872_000,
-		7_133,
-	)));
-
-	AssetHubKusama::assert_parachain_system_ump_sent();
-
-	assert_expected_events!(
-		AssetHubKusama,
-		vec![
-			// Amount is withdrawn from Sender's account
-			RuntimeEvent::Balances(pallet_balances::Event::Withdraw { who, amount }) => {
-				who: *who == t.sender.account_id,
-				amount: *amount == t.args.amount,
-			},
-		]
-	);
-}
-
-fn para_dest_assertions(t: RelayToSystemParaTest) {
-	type RuntimeEvent = <AssetHubKusama as Chain>::RuntimeEvent;
-
-	AssetHubKusama::assert_dmp_queue_complete(Some(Weight::from_parts(165_592_000, 0)));
-
-	assert_expected_events!(
-		AssetHubKusama,
-		vec![
-			// Amount minus fees are deposited in Receiver's account
-			RuntimeEvent::Balances(pallet_balances::Event::Deposit { who, .. }) => {
-				who: *who == t.receiver.account_id,
-			},
-		]
-	);
-}
-
-fn relay_limited_teleport_assets(t: RelayToSystemParaTest) -> DispatchResult {
-	<Kusama as KusamaPallet>::XcmPallet::limited_teleport_assets(
-		t.signed_origin,
-		bx!(t.args.dest.into()),
-		bx!(t.args.beneficiary.into()),
-		bx!(t.args.assets.into()),
-		t.args.fee_asset_item,
-		t.args.weight_limit,
-	)
-}
-
-fn relay_teleport_assets(t: RelayToSystemParaTest) -> DispatchResult {
-	<Kusama as KusamaPallet>::XcmPallet::teleport_assets(
-		t.signed_origin,
-		bx!(t.args.dest.into()),
-		bx!(t.args.beneficiary.into()),
-		bx!(t.args.assets.into()),
-		t.args.fee_asset_item,
-	)
-}
-
-fn system_para_limited_teleport_assets(t: SystemParaToRelayTest) -> DispatchResult {
-	<AssetHubKusama as AssetHubKusamaPallet>::PolkadotXcm::limited_teleport_assets(
-		t.signed_origin,
-		bx!(t.args.dest.into()),
-		bx!(t.args.beneficiary.into()),
-		bx!(t.args.assets.into()),
-		t.args.fee_asset_item,
-		t.args.weight_limit,
-	)
-}
-
-// TODO: Uncomment when https://github.com/paritytech/polkadot/pull/7424 is merged
-// fn system_para_teleport_assets(t: SystemParaToRelayTest) -> DispatchResult {
-// 	<AssetHubKusama as AssetHubKusamaPallet>::PolkadotXcm::teleport_assets(
-// 		t.signed_origin,
-// 		bx!(t.args.dest),
-// 		bx!(t.args.beneficiary),
-// 		bx!(t.args.assets),
-// 		t.args.fee_asset_item,
-// 	)
-// }
-
-/// Limited Teleport of native asset from Relay Chain to the System Parachain should work
-#[test]
-fn limited_teleport_native_assets_from_relay_to_system_para_works() {
-	// Init values for Relay Chain
-	let amount_to_send: Balance = KUSAMA_ED * 1000;
-	let test_args = TestContext {
-		sender: KusamaSender::get(),
-		receiver: AssetHubKusamaReceiver::get(),
-		args: relay_test_args(amount_to_send),
-	};
-
-	let mut test = RelayToSystemParaTest::new(test_args);
-
-	let sender_balance_before = test.sender.balance;
-	let receiver_balance_before = test.receiver.balance;
-
-	test.set_assertion::<Kusama>(relay_origin_assertions);
-	test.set_assertion::<AssetHubKusama>(para_dest_assertions);
-	test.set_dispatchable::<Kusama>(relay_limited_teleport_assets);
-	test.assert();
-
-	let sender_balance_after = test.sender.balance;
-	let receiver_balance_after = test.receiver.balance;
-
-	// Sender's balance is reduced
-	assert_eq!(sender_balance_before - amount_to_send, sender_balance_after);
-	// Receiver's balance is increased
-	assert!(receiver_balance_after > receiver_balance_before);
-}
-
-/// Limited Teleport of native asset from System Parachain to Relay Chain
-/// should work when there is enough balance in Relay Chain's `CheckAccount`
-#[test]
-#[cfg(feature = "FIXME-IGNORED")] // <https://github.com/paritytech/cumulus/issues/3027>
-fn limited_teleport_native_assets_back_from_system_para_to_relay_works() {
-	// Dependency - Relay Chain's `CheckAccount` should have enough balance
-	limited_teleport_native_assets_from_relay_to_system_para_works();
-
-	// Init values for Relay Chain
-	let amount_to_send: Balance = ASSET_HUB_KUSAMA_ED * 1000;
-	let destination = AssetHubKusama::parent_location();
-	let beneficiary_id = KusamaReceiver::get();
-	let assets = (Parent, amount_to_send).into();
-
-	let test_args = TestContext {
-		sender: AssetHubKusamaSender::get(),
-		receiver: KusamaReceiver::get(),
-		args: system_para_test_args(destination, beneficiary_id, amount_to_send, assets, None),
-	};
-
-	let mut test = SystemParaToRelayTest::new(test_args);
-
-	let sender_balance_before = test.sender.balance;
-	let receiver_balance_before = test.receiver.balance;
-
-	test.set_assertion::<AssetHubKusama>(para_origin_assertions);
-	test.set_assertion::<Kusama>(relay_dest_assertions);
-	test.set_dispatchable::<AssetHubKusama>(system_para_limited_teleport_assets);
-	test.assert();
-
-	let sender_balance_after = test.sender.balance;
-	let receiver_balance_after = test.receiver.balance;
-
-	// Sender's balance is reduced
-	assert_eq!(sender_balance_before - amount_to_send, sender_balance_after);
-	// Receiver's balance is increased
-	assert!(receiver_balance_after > receiver_balance_before);
-}
-
-/// Limited Teleport of native asset from System Parachain to Relay Chain
-/// should't work when there is not enough balance in Relay Chain's `CheckAccount`
-#[test]
-#[cfg(feature = "FIXME-IGNORED")] // <https://github.com/paritytech/cumulus/issues/3027>
-fn limited_teleport_native_assets_from_system_para_to_relay_fails() {
-	// Init values for Relay Chain
-	let amount_to_send: Balance = ASSET_HUB_KUSAMA_ED * 1000;
-	let destination = AssetHubKusama::parent_location().into();
-	let beneficiary_id = KusamaReceiver::get().into();
-	let assets = (Parent, amount_to_send).into();
-
-	let test_args = TestContext {
-		sender: AssetHubKusamaSender::get(),
-		receiver: KusamaReceiver::get(),
-		args: system_para_test_args(destination, beneficiary_id, amount_to_send, assets, None),
-	};
-
-	let mut test = SystemParaToRelayTest::new(test_args);
-
-	let sender_balance_before = test.sender.balance;
-	let receiver_balance_before = test.receiver.balance;
-
-	test.set_assertion::<AssetHubKusama>(para_origin_assertions);
-	test.set_assertion::<Kusama>(relay_dest_assertions_fail);
-	test.set_dispatchable::<AssetHubKusama>(system_para_limited_teleport_assets);
-	test.assert();
-
-	let sender_balance_after = test.sender.balance;
-	let receiver_balance_after = test.receiver.balance;
-
-	// Sender's balance is reduced
-	assert_eq!(sender_balance_before - amount_to_send, sender_balance_after);
-	// Receiver's balance does not change
-	assert_eq!(receiver_balance_after, receiver_balance_before);
-}
-
-/// Teleport of native asset from Relay Chain to the System Parachain should work
-#[test]
-fn teleport_native_assets_from_relay_to_system_para_works() {
-	// Init values for Relay Chain
-	let amount_to_send: Balance = KUSAMA_ED * 1000;
-	let test_args = TestContext {
-		sender: KusamaSender::get(),
-		receiver: AssetHubKusamaReceiver::get(),
-		args: relay_test_args(amount_to_send),
-	};
-
-	let mut test = RelayToSystemParaTest::new(test_args);
-
-	let sender_balance_before = test.sender.balance;
-	let receiver_balance_before = test.receiver.balance;
-
-	test.set_assertion::<Kusama>(relay_origin_assertions);
-	test.set_assertion::<AssetHubKusama>(para_dest_assertions);
-	test.set_dispatchable::<Kusama>(relay_teleport_assets);
-	test.assert();
-
-	let sender_balance_after = test.sender.balance;
-	let receiver_balance_after = test.receiver.balance;
-
-	// Sender's balance is reduced
-	assert_eq!(sender_balance_before - amount_to_send, sender_balance_after);
-	// Receiver's balance is increased
-	assert!(receiver_balance_after > receiver_balance_before);
-}
-
-// TODO: Uncomment when https://github.com/paritytech/polkadot/pull/7424 is merged
-
-// Right now it is failing in the Relay Chain with a
-// `messageQueue.ProcessingFailed` event `error: Unsupported`.
-// The reason is the `Weigher` in `pallet_xcm` is not properly calculating the `remote_weight`
-// and it cause an `Overweight` error in `AllowTopLevelPaidExecutionFrom` barrier
-
-// /// Teleport of native asset from System Parachains to the Relay Chain
-// /// should work when there is enough balance in Relay Chain's `CheckAccount`
-// #[test]
-// fn teleport_native_assets_back_from_system_para_to_relay_works() {
-// 	// Dependency - Relay Chain's `CheckAccount` should have enough balance
-// 	teleport_native_assets_from_relay_to_system_para_works();
-
-// 	// Init values for Relay Chain
-// 	let amount_to_send: Balance = ASSET_HUB_KUSAMA_ED * 1000;
-// 	let test_args = TestContext {
-// 		sender: AssetHubKusamaSender::get(),
-// 		receiver: KusamaReceiver::get(),
-// 		args: get_para_dispatch_args(amount_to_send),
-// 	};
-
-// 	let mut test = SystemParaToRelayTest::new(test_args);
-
-// 	let sender_balance_before = test.sender.balance;
-// 	let receiver_balance_before = test.receiver.balance;
-
-// 	test.set_assertion::<AssetHubKusama>(para_origin_assertions);
-// 	test.set_assertion::<Kusama>(relay_dest_assertions);
-// 	test.set_dispatchable::<AssetHubKusama>(system_para_teleport_assets);
-// 	test.assert();
-
-// 	let sender_balance_after = test.sender.balance;
-// 	let receiver_balance_after = test.receiver.balance;
-
-// 	// Sender's balance is reduced
-// 	assert_eq!(sender_balance_before - amount_to_send, sender_balance_after);
-// 	// Receiver's balance is increased
-// 	assert!(receiver_balance_after > receiver_balance_before);
-// }
-
-// /// Teleport of native asset from System Parachain to Relay Chain
-// /// shouldn't work when there is not enough balance in Relay Chain's `CheckAccount`
-// #[test]
-// fn teleport_native_assets_from_system_para_to_relay_fails() {
-// 	// Init values for Relay Chain
-// 	let amount_to_send: Balance = ASSET_HUB_KUSAMA_ED * 1000;
-//  let assets = (Parent, amount_to_send).into();
-//
-// 	let test_args = TestContext {
-// 		sender: AssetHubKusamaSender::get(),
-// 		receiver: KusamaReceiver::get(),
-// 		args: system_para_test_args(amount_to_send),
-//      assets,
-//      None
-// 	};
-
-// 	let mut test = SystemParaToRelayTest::new(test_args);
-
-// 	let sender_balance_before = test.sender.balance;
-// 	let receiver_balance_before = test.receiver.balance;
-
-// 	test.set_assertion::<AssetHubKusama>(para_origin_assertions);
-// 	test.set_assertion::<Kusama>(relay_dest_assertions);
-// 	test.set_dispatchable::<AssetHubKusama>(system_para_teleport_assets);
-// 	test.assert();
-
-// 	let sender_balance_after = test.sender.balance;
-// 	let receiver_balance_after = test.receiver.balance;
-
-// 	// Sender's balance is reduced
-// 	assert_eq!(sender_balance_before - amount_to_send, sender_balance_after);
-// 	// Receiver's balance does not change
-// 	assert_eq!(receiver_balance_after, receiver_balance_before);
-// }
diff --git a/cumulus/parachains/integration-tests/emulated/assets/asset-hub-polkadot/Cargo.toml b/cumulus/parachains/integration-tests/emulated/assets/asset-hub-polkadot/Cargo.toml
deleted file mode 100644
index 93cd66cf4db194d646e8657d7b100e71fc221a1a..0000000000000000000000000000000000000000
--- a/cumulus/parachains/integration-tests/emulated/assets/asset-hub-polkadot/Cargo.toml
+++ /dev/null
@@ -1,37 +0,0 @@
-[package]
-name = "asset-hub-polkadot-integration-tests"
-version = "1.0.0"
-authors = ["Parity Technologies <admin@parity.io>"]
-edition = "2021"
-description = "Asset Hub Polkadot runtime integration tests with xcm-emulator"
-
-[dependencies]
-codec = { package = "parity-scale-codec", version = "3.4.0", default-features = false }
-
-# Substrate
-sp-runtime = { path = "../../../../../../substrate/primitives/runtime", default-features = false}
-frame-support = { path = "../../../../../../substrate/frame/support", default-features = false}
-frame-system = { path = "../../../../../../substrate/frame/system", default-features = false}
-sp-core = { path = "../../../../../../substrate/primitives/core", default-features = false}
-sp-weights = { path = "../../../../../../substrate/primitives/weights", default-features = false}
-pallet-balances = { path = "../../../../../../substrate/frame/balances", default-features = false}
-pallet-assets = { path = "../../../../../../substrate/frame/assets", default-features = false}
-
-# Polkadot
-polkadot-core-primitives = { path = "../../../../../../polkadot/core-primitives", default-features = false}
-polkadot-parachain = { path = "../../../../../../polkadot/parachain", default-features = false}
-polkadot-runtime-parachains = { path = "../../../../../../polkadot/runtime/parachains" }
-polkadot-runtime = { path = "../../../../../../polkadot/runtime/polkadot" }
-xcm = { path = "../../../../../../polkadot/xcm", default-features = false}
-xcm-executor = { path = "../../../../../../polkadot/xcm/xcm-executor", default-features = false}
-pallet-xcm = { path = "../../../../../../polkadot/xcm/pallet-xcm", default-features = false}
-
-# Cumulus
-parachains-common = { path = "../../../../common" }
-cumulus-pallet-dmp-queue = { path = "../../../../../pallets/dmp-queue" }
-cumulus-pallet-xcmp-queue = { path = "../../../../../pallets/xcmp-queue", default-features = false}
-cumulus-pallet-parachain-system = { path = "../../../../../pallets/parachain-system" }
-
-# Local
-xcm-emulator = { path = "../../../../../xcm/xcm-emulator", default-features = false}
-integration-tests-common = { path = "../../common", default-features = false}
diff --git a/cumulus/parachains/integration-tests/emulated/assets/asset-hub-polkadot/src/lib.rs b/cumulus/parachains/integration-tests/emulated/assets/asset-hub-polkadot/src/lib.rs
deleted file mode 100644
index 9d87458f876c4ce6fa7969315d6a9bc3a7e8545e..0000000000000000000000000000000000000000
--- a/cumulus/parachains/integration-tests/emulated/assets/asset-hub-polkadot/src/lib.rs
+++ /dev/null
@@ -1,102 +0,0 @@
-// Copyright 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/>.
-
-pub use codec::Encode;
-pub use frame_support::{
-	assert_err, assert_ok,
-	instances::Instance1,
-	pallet_prelude::Weight,
-	sp_runtime::{AccountId32, DispatchError, DispatchResult, MultiAddress},
-	traits::{fungibles::Inspect, OriginTrait},
-};
-pub use integration_tests_common::{
-	constants::{
-		accounts::{ALICE, BOB},
-		asset_hub_polkadot::ED as ASSET_HUB_POLKADOT_ED,
-		polkadot::ED as POLKADOT_ED,
-		PROOF_SIZE_THRESHOLD, REF_TIME_THRESHOLD, XCM_V3,
-	},
-	lazy_static::lazy_static,
-	xcm_transact_paid_execution, xcm_transact_unpaid_execution, AssetHubPolkadot,
-	AssetHubPolkadotPallet, AssetHubPolkadotReceiver, AssetHubPolkadotSender, BridgeHubPolkadot,
-	BridgeHubPolkadotPallet, BridgeHubPolkadotReceiver, BridgeHubPolkadotSender, Collectives,
-	CollectivesPallet, CollectivesReceiver, CollectivesSender, PenpalPolkadotA,
-	PenpalPolkadotAPallet, PenpalPolkadotAReceiver, PenpalPolkadotASender, PenpalPolkadotB,
-	PenpalPolkadotBPallet, PenpalPolkadotBReceiver, PenpalPolkadotBSender, Polkadot,
-	PolkadotMockNet, PolkadotPallet, PolkadotReceiver, PolkadotSender,
-};
-pub use parachains_common::{AccountId, Balance};
-pub use polkadot_core_primitives::InboundDownwardMessage;
-pub use polkadot_parachain::primitives::{HrmpChannelId, Id};
-pub use polkadot_runtime_parachains::inclusion::{AggregateMessageOrigin, UmpQueueId};
-pub use xcm::{
-	prelude::*,
-	v3::{Error, NetworkId::Polkadot as PolkadotId},
-	DoubleEncoded,
-};
-pub use xcm_emulator::{
-	assert_expected_events, bx, cumulus_pallet_dmp_queue, helpers::weight_within_threshold,
-	AccountId32Junction, Chain, ParaId, Parachain as Para, RelayChain as Relay, Test, TestArgs,
-	TestContext, TestExt, TestExternalities,
-};
-
-pub const ASSET_ID: u32 = 1;
-pub const ASSET_MIN_BALANCE: u128 = 1000;
-// `Assets` pallet index
-pub const ASSETS_PALLET_ID: u8 = 50;
-
-pub type RelayToSystemParaTest = Test<Polkadot, AssetHubPolkadot>;
-pub type SystemParaToRelayTest = Test<AssetHubPolkadot, Polkadot>;
-pub type SystemParaToParaTest = Test<AssetHubPolkadot, PenpalPolkadotA>;
-
-/// Returns a `TestArgs` instance to de used for the Relay Chain accross integraton tests
-pub fn relay_test_args(amount: Balance) -> TestArgs {
-	TestArgs {
-		dest: Polkadot::child_location_of(AssetHubPolkadot::para_id()),
-		beneficiary: AccountId32Junction {
-			network: None,
-			id: AssetHubPolkadotReceiver::get().into(),
-		}
-		.into(),
-		amount,
-		assets: (Here, amount).into(),
-		asset_id: None,
-		fee_asset_item: 0,
-		weight_limit: WeightLimit::Unlimited,
-	}
-}
-
-/// Returns a `TestArgs` instance to de used for the System Parachain accross integraton tests
-pub fn system_para_test_args(
-	dest: MultiLocation,
-	beneficiary_id: AccountId32,
-	amount: Balance,
-	assets: MultiAssets,
-	asset_id: Option<u32>,
-) -> TestArgs {
-	TestArgs {
-		dest,
-		beneficiary: AccountId32Junction { network: None, id: beneficiary_id.into() }.into(),
-		amount,
-		assets,
-		asset_id,
-		fee_asset_item: 0,
-		weight_limit: WeightLimit::Unlimited,
-	}
-}
-
-#[cfg(test)]
-mod tests;
diff --git a/cumulus/parachains/integration-tests/emulated/assets/asset-hub-polkadot/src/tests/hrmp_channels.rs b/cumulus/parachains/integration-tests/emulated/assets/asset-hub-polkadot/src/tests/hrmp_channels.rs
deleted file mode 100644
index 9335d69b4d7d4bcf87d07101677828ea72fd294c..0000000000000000000000000000000000000000
--- a/cumulus/parachains/integration-tests/emulated/assets/asset-hub-polkadot/src/tests/hrmp_channels.rs
+++ /dev/null
@@ -1,206 +0,0 @@
-// Copyright 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/>.
-
-use crate::*;
-
-const MAX_CAPACITY: u32 = 8;
-const MAX_MESSAGE_SIZE: u32 = 8192;
-
-/// Opening HRMP channels between Parachains should work
-#[test]
-#[cfg(feature = "FIXME-IGNORED")] // <https://github.com/paritytech/cumulus/issues/3027>
-fn open_hrmp_channel_between_paras_works() {
-	// Parchain A init values
-	let para_a_id = PenpalPolkadotA::para_id();
-	let para_a_root_origin = <PenpalPolkadotA as Chain>::RuntimeOrigin::root();
-
-	// Parachain B init values
-	let para_b_id = PenpalPolkadotB::para_id();
-	let para_b_root_origin = <PenpalPolkadotB as Chain>::RuntimeOrigin::root();
-
-	let fee_amount = POLKADOT_ED * 1000;
-	let fund_amount = POLKADOT_ED * 1000_000_000;
-
-	// Fund Parachain's Sovereign accounts to be able to reserve the deposit
-	let para_a_sovereign_account = Polkadot::fund_para_sovereign(fund_amount, para_a_id);
-	let para_b_sovereign_account = Polkadot::fund_para_sovereign(fund_amount, para_b_id);
-
-	let relay_destination: VersionedMultiLocation = PenpalPolkadotA::parent_location().into();
-
-	// ---- Init Open channel from Parachain to System Parachain
-	let mut call = Polkadot::init_open_channel_call(para_b_id, MAX_CAPACITY, MAX_MESSAGE_SIZE);
-	let origin_kind = OriginKind::Native;
-	let native_asset: MultiAsset = (Here, fee_amount).into();
-	let beneficiary = Polkadot::sovereign_account_id_of_child_para(para_a_id);
-
-	let mut xcm = xcm_transact_paid_execution(call, origin_kind, native_asset.clone(), beneficiary);
-
-	PenpalPolkadotA::execute_with(|| {
-		assert_ok!(<PenpalPolkadotA as PenpalPolkadotAPallet>::PolkadotXcm::send(
-			para_a_root_origin,
-			bx!(relay_destination.clone()),
-			bx!(xcm),
-		));
-
-		PenpalPolkadotA::assert_xcm_pallet_sent();
-	});
-
-	Polkadot::execute_with(|| {
-		type RuntimeEvent = <Polkadot as Chain>::RuntimeEvent;
-
-		Polkadot::assert_ump_queue_processed(
-			true,
-			Some(para_a_id),
-			Some(Weight::from_parts(1_282_426_000, 207_186)),
-		);
-
-		assert_expected_events!(
-			Polkadot,
-			vec![
-				// Parachain's Sovereign account balance is withdrawn to pay XCM fees
-				RuntimeEvent::Balances(pallet_balances::Event::Withdraw { who, amount }) => {
-					who: *who == para_a_sovereign_account.clone(),
-					amount: *amount == fee_amount,
-				},
-				// Sender deposit is reserved for Parachain's Sovereign account
-				RuntimeEvent::Balances(pallet_balances::Event::Reserved { who, .. }) =>{
-					who: *who == para_a_sovereign_account,
-				},
-				// Open channel requested from Para A to Para B
-				RuntimeEvent::Hrmp(
-					polkadot_runtime_parachains::hrmp::Event::OpenChannelRequested(
-						sender, recipient, max_capacity, max_message_size
-					)
-				) => {
-					sender: *sender == para_a_id.into(),
-					recipient: *recipient == para_b_id.into(),
-					max_capacity: *max_capacity == MAX_CAPACITY,
-					max_message_size: *max_message_size == MAX_MESSAGE_SIZE,
-				},
-			]
-		);
-	});
-
-	// ---- Accept Open channel from Parachain to System Parachain
-	call = Polkadot::accept_open_channel_call(para_a_id);
-	let beneficiary = Polkadot::sovereign_account_id_of_child_para(para_b_id);
-
-	xcm = xcm_transact_paid_execution(call, origin_kind, native_asset, beneficiary);
-
-	PenpalPolkadotB::execute_with(|| {
-		assert_ok!(<PenpalPolkadotB as PenpalPolkadotBPallet>::PolkadotXcm::send(
-			para_b_root_origin,
-			bx!(relay_destination),
-			bx!(xcm),
-		));
-
-		PenpalPolkadotB::assert_xcm_pallet_sent();
-	});
-
-	Polkadot::execute_with(|| {
-		type RuntimeEvent = <Polkadot as Chain>::RuntimeEvent;
-
-		Polkadot::assert_ump_queue_processed(
-			true,
-			Some(para_b_id),
-			Some(Weight::from_parts(1_282_426_000, 207_186)),
-		);
-
-		assert_expected_events!(
-			Polkadot,
-			vec![
-				// Parachain's Sovereign account balance is withdrawn to pay XCM fees
-				RuntimeEvent::Balances(pallet_balances::Event::Withdraw { who, amount }) => {
-					who: *who == para_b_sovereign_account.clone(),
-					amount: *amount == fee_amount,
-				},
-				// Sender deposit is reserved for Parachain's Sovereign account
-				RuntimeEvent::Balances(pallet_balances::Event::Reserved { who, .. }) =>{
-					who: *who == para_b_sovereign_account,
-				},
-				// Open channel accepted for Para A to Para B
-				RuntimeEvent::Hrmp(
-					polkadot_runtime_parachains::hrmp::Event::OpenChannelAccepted(
-						sender, recipient
-					)
-				) => {
-					sender: *sender == para_a_id.into(),
-					recipient: *recipient == para_b_id.into(),
-				},
-			]
-		);
-	});
-
-	Polkadot::force_process_hrmp_open(para_a_id, para_b_id);
-}
-
-/// Opening HRMP channels between System Parachains and Parachains should work
-#[test]
-fn force_open_hrmp_channel_for_system_para_works() {
-	// Relay Chain init values
-	let relay_root_origin = <Polkadot as Chain>::RuntimeOrigin::root();
-
-	// System Para init values
-	let system_para_id = AssetHubPolkadot::para_id();
-
-	// Parachain A init values
-	let para_a_id = PenpalPolkadotA::para_id();
-
-	let fund_amount = POLKADOT_ED * 1000_000_000;
-
-	// Fund Parachain's Sovereign accounts to be able to reserve the deposit
-	let system_para_sovereign_account = Polkadot::fund_para_sovereign(fund_amount, system_para_id);
-	let para_a_sovereign_account = Polkadot::fund_para_sovereign(fund_amount, para_a_id);
-
-	Polkadot::execute_with(|| {
-		assert_ok!(<Polkadot as PolkadotPallet>::Hrmp::force_open_hrmp_channel(
-			relay_root_origin,
-			system_para_id,
-			para_a_id,
-			MAX_CAPACITY,
-			MAX_MESSAGE_SIZE
-		));
-
-		type RuntimeEvent = <Polkadot as Chain>::RuntimeEvent;
-
-		assert_expected_events!(
-			Polkadot,
-			vec![
-				// Sender deposit is reserved for System Parachain's Sovereign account
-				RuntimeEvent::Balances(pallet_balances::Event::Reserved { who, .. }) =>{
-					who: *who == system_para_sovereign_account,
-				},
-				// Recipient deposit is reserved for Parachain's Sovereign account
-				RuntimeEvent::Balances(pallet_balances::Event::Reserved { who, .. }) =>{
-					who: *who == para_a_sovereign_account,
-				},
-				// HRMP channel forced opened
-				RuntimeEvent::Hrmp(
-					polkadot_runtime_parachains::hrmp::Event::HrmpChannelForceOpened(
-						sender, recipient, max_capacity, max_message_size
-					)
-				) => {
-					sender: *sender == system_para_id.into(),
-					recipient: *recipient == para_a_id.into(),
-					max_capacity: *max_capacity == MAX_CAPACITY,
-					max_message_size: *max_message_size == MAX_MESSAGE_SIZE,
-				},
-			]
-		);
-	});
-
-	Polkadot::force_process_hrmp_open(system_para_id, para_a_id);
-}
diff --git a/cumulus/parachains/integration-tests/emulated/assets/asset-hub-polkadot/src/tests/mod.rs b/cumulus/parachains/integration-tests/emulated/assets/asset-hub-polkadot/src/tests/mod.rs
deleted file mode 100644
index 00e0a663e4794d5fe1577b6f72df0624116db7fe..0000000000000000000000000000000000000000
--- a/cumulus/parachains/integration-tests/emulated/assets/asset-hub-polkadot/src/tests/mod.rs
+++ /dev/null
@@ -1,21 +0,0 @@
-// Copyright 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/>.
-
-mod hrmp_channels;
-mod reserve_transfer;
-mod send;
-mod set_xcm_versions;
-mod teleport;
diff --git a/cumulus/parachains/integration-tests/emulated/assets/asset-hub-polkadot/src/tests/reserve_transfer.rs b/cumulus/parachains/integration-tests/emulated/assets/asset-hub-polkadot/src/tests/reserve_transfer.rs
deleted file mode 100644
index 7d773a5865ea0781d1d6b0ebab4c4242360e3b8a..0000000000000000000000000000000000000000
--- a/cumulus/parachains/integration-tests/emulated/assets/asset-hub-polkadot/src/tests/reserve_transfer.rs
+++ /dev/null
@@ -1,415 +0,0 @@
-// Copyright 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/>.
-
-use crate::*;
-
-fn relay_origin_assertions(t: RelayToSystemParaTest) {
-	type RuntimeEvent = <Polkadot as Chain>::RuntimeEvent;
-
-	Polkadot::assert_xcm_pallet_attempted_complete(Some(Weight::from_parts(629_384_000, 6_196)));
-
-	assert_expected_events!(
-		Polkadot,
-		vec![
-			// Amount to reserve transfer is transferred to System Parachain's Sovereign account
-			RuntimeEvent::Balances(pallet_balances::Event::Transfer { from, to, amount }) => {
-				from: *from == t.sender.account_id,
-				to: *to == Polkadot::sovereign_account_id_of(
-					t.args.dest
-				),
-				amount:  *amount == t.args.amount,
-			},
-		]
-	);
-}
-
-fn system_para_dest_assertions_incomplete(_t: RelayToSystemParaTest) {
-	AssetHubPolkadot::assert_dmp_queue_incomplete(
-		Some(Weight::from_parts(1_000_000_000, 0)),
-		Some(Error::UntrustedReserveLocation),
-	);
-}
-
-fn system_para_to_relay_assertions(_t: SystemParaToRelayTest) {
-	AssetHubPolkadot::assert_xcm_pallet_attempted_error(Some(XcmError::Barrier))
-}
-
-fn system_para_to_para_assertions(t: SystemParaToParaTest) {
-	type RuntimeEvent = <AssetHubPolkadot as Chain>::RuntimeEvent;
-
-	AssetHubPolkadot::assert_xcm_pallet_attempted_complete(Some(Weight::from_parts(
-		676_119_000,
-		6196,
-	)));
-
-	assert_expected_events!(
-		AssetHubPolkadot,
-		vec![
-			// Amount to reserve transfer is transferred to Parachain's Sovereing account
-			RuntimeEvent::Balances(
-				pallet_balances::Event::Transfer { from, to, amount }
-			) => {
-				from: *from == t.sender.account_id,
-				to: *to == AssetHubPolkadot::sovereign_account_id_of(
-					t.args.dest
-				),
-				amount: *amount == t.args.amount,
-			},
-		]
-	);
-}
-
-fn system_para_to_para_assets_assertions(t: SystemParaToParaTest) {
-	type RuntimeEvent = <AssetHubPolkadot as Chain>::RuntimeEvent;
-
-	AssetHubPolkadot::assert_xcm_pallet_attempted_complete(Some(Weight::from_parts(
-		676_119_000,
-		6196,
-	)));
-
-	assert_expected_events!(
-		AssetHubPolkadot,
-		vec![
-			// Amount to reserve transfer is transferred to Parachain's Sovereing account
-			RuntimeEvent::Assets(
-				pallet_assets::Event::Transferred { asset_id, from, to, amount }
-			) => {
-				asset_id: *asset_id == ASSET_ID,
-				from: *from == t.sender.account_id,
-				to: *to == AssetHubPolkadot::sovereign_account_id_of(
-					t.args.dest
-				),
-				amount: *amount == t.args.amount,
-			},
-		]
-	);
-}
-
-fn relay_limited_reserve_transfer_assets(t: RelayToSystemParaTest) -> DispatchResult {
-	<Polkadot as PolkadotPallet>::XcmPallet::limited_reserve_transfer_assets(
-		t.signed_origin,
-		bx!(t.args.dest.into()),
-		bx!(t.args.beneficiary.into()),
-		bx!(t.args.assets.into()),
-		t.args.fee_asset_item,
-		t.args.weight_limit,
-	)
-}
-
-fn relay_reserve_transfer_assets(t: RelayToSystemParaTest) -> DispatchResult {
-	<Polkadot as PolkadotPallet>::XcmPallet::reserve_transfer_assets(
-		t.signed_origin,
-		bx!(t.args.dest.into()),
-		bx!(t.args.beneficiary.into()),
-		bx!(t.args.assets.into()),
-		t.args.fee_asset_item,
-	)
-}
-
-fn system_para_limited_reserve_transfer_assets(t: SystemParaToRelayTest) -> DispatchResult {
-	<AssetHubPolkadot as AssetHubPolkadotPallet>::PolkadotXcm::limited_reserve_transfer_assets(
-		t.signed_origin,
-		bx!(t.args.dest.into()),
-		bx!(t.args.beneficiary.into()),
-		bx!(t.args.assets.into()),
-		t.args.fee_asset_item,
-		t.args.weight_limit,
-	)
-}
-
-fn system_para_reserve_transfer_assets(t: SystemParaToRelayTest) -> DispatchResult {
-	<AssetHubPolkadot as AssetHubPolkadotPallet>::PolkadotXcm::reserve_transfer_assets(
-		t.signed_origin,
-		bx!(t.args.dest.into()),
-		bx!(t.args.beneficiary.into()),
-		bx!(t.args.assets.into()),
-		t.args.fee_asset_item,
-	)
-}
-
-fn system_para_to_para_limited_reserve_transfer_assets(t: SystemParaToParaTest) -> DispatchResult {
-	<AssetHubPolkadot as AssetHubPolkadotPallet>::PolkadotXcm::limited_reserve_transfer_assets(
-		t.signed_origin,
-		bx!(t.args.dest.into()),
-		bx!(t.args.beneficiary.into()),
-		bx!(t.args.assets.into()),
-		t.args.fee_asset_item,
-		t.args.weight_limit,
-	)
-}
-
-fn system_para_to_para_reserve_transfer_assets(t: SystemParaToParaTest) -> DispatchResult {
-	<AssetHubPolkadot as AssetHubPolkadotPallet>::PolkadotXcm::reserve_transfer_assets(
-		t.signed_origin,
-		bx!(t.args.dest.into()),
-		bx!(t.args.beneficiary.into()),
-		bx!(t.args.assets.into()),
-		t.args.fee_asset_item,
-	)
-}
-
-/// Limited Reserve Transfers of native asset from Relay Chain to the System Parachain shouldn't
-/// work
-#[test]
-fn limited_reserve_transfer_native_asset_from_relay_to_system_para_fails() {
-	// Init values for Relay Chain
-	let amount_to_send: Balance = POLKADOT_ED * 1000;
-	let test_args = TestContext {
-		sender: PolkadotSender::get(),
-		receiver: AssetHubPolkadotReceiver::get(),
-		args: relay_test_args(amount_to_send),
-	};
-
-	let mut test = RelayToSystemParaTest::new(test_args);
-
-	let sender_balance_before = test.sender.balance;
-	let receiver_balance_before = test.receiver.balance;
-
-	test.set_assertion::<Polkadot>(relay_origin_assertions);
-	test.set_assertion::<AssetHubPolkadot>(system_para_dest_assertions_incomplete);
-	test.set_dispatchable::<Polkadot>(relay_limited_reserve_transfer_assets);
-	test.assert();
-
-	let sender_balance_after = test.sender.balance;
-	let receiver_balance_after = test.receiver.balance;
-
-	assert_eq!(sender_balance_before - amount_to_send, sender_balance_after);
-	assert_eq!(receiver_balance_before, receiver_balance_after);
-}
-
-/// Limited Reserve Transfers of native asset from System Parachain to Relay Chain shoudln't work
-#[test]
-fn limited_reserve_transfer_native_asset_from_system_para_to_relay_fails() {
-	// Init values for System Parachain
-	let destination = AssetHubPolkadot::parent_location();
-	let beneficiary_id = PolkadotReceiver::get();
-	let amount_to_send: Balance = ASSET_HUB_POLKADOT_ED * 1000;
-	let assets = (Parent, amount_to_send).into();
-
-	let test_args = TestContext {
-		sender: AssetHubPolkadotSender::get(),
-		receiver: PolkadotReceiver::get(),
-		args: system_para_test_args(destination, beneficiary_id, amount_to_send, assets, None),
-	};
-
-	let mut test = SystemParaToRelayTest::new(test_args);
-
-	let sender_balance_before = test.sender.balance;
-	let receiver_balance_before = test.receiver.balance;
-
-	test.set_assertion::<AssetHubPolkadot>(system_para_to_relay_assertions);
-	test.set_dispatchable::<AssetHubPolkadot>(system_para_limited_reserve_transfer_assets);
-	test.assert();
-
-	let sender_balance_after = test.sender.balance;
-	let receiver_balance_after = test.receiver.balance;
-
-	assert_eq!(sender_balance_before, sender_balance_after);
-	assert_eq!(receiver_balance_before, receiver_balance_after);
-}
-
-/// Reserve Transfers of native asset from Relay Chain to the System Parachain shouldn't work
-#[test]
-fn reserve_transfer_native_asset_from_relay_to_system_para_fails() {
-	// Init values for Relay Chain
-	let amount_to_send: Balance = POLKADOT_ED * 1000;
-	let test_args = TestContext {
-		sender: PolkadotSender::get(),
-		receiver: AssetHubPolkadotReceiver::get(),
-		args: relay_test_args(amount_to_send),
-	};
-
-	let mut test = RelayToSystemParaTest::new(test_args);
-
-	let sender_balance_before = test.sender.balance;
-	let receiver_balance_before = test.receiver.balance;
-
-	test.set_assertion::<Polkadot>(relay_origin_assertions);
-	test.set_assertion::<AssetHubPolkadot>(system_para_dest_assertions_incomplete);
-	test.set_dispatchable::<Polkadot>(relay_reserve_transfer_assets);
-	test.assert();
-
-	let sender_balance_after = test.sender.balance;
-	let receiver_balance_after = test.receiver.balance;
-
-	assert_eq!(sender_balance_before - amount_to_send, sender_balance_after);
-	assert_eq!(receiver_balance_before, receiver_balance_after);
-}
-
-/// Reserve Transfers of native asset from System Parachain to Relay Chain shouldn't work
-#[test]
-fn reserve_transfer_native_asset_from_system_para_to_relay_fails() {
-	// Init values for System Parachain
-	let destination = AssetHubPolkadot::parent_location();
-	let beneficiary_id = PolkadotReceiver::get();
-	let amount_to_send: Balance = ASSET_HUB_POLKADOT_ED * 1000;
-	let assets = (Parent, amount_to_send).into();
-
-	let test_args = TestContext {
-		sender: AssetHubPolkadotSender::get(),
-		receiver: PolkadotReceiver::get(),
-		args: system_para_test_args(destination, beneficiary_id, amount_to_send, assets, None),
-	};
-
-	let mut test = SystemParaToRelayTest::new(test_args);
-
-	let sender_balance_before = test.sender.balance;
-	let receiver_balance_before = test.receiver.balance;
-
-	test.set_assertion::<AssetHubPolkadot>(system_para_to_relay_assertions);
-	test.set_dispatchable::<AssetHubPolkadot>(system_para_reserve_transfer_assets);
-	test.assert();
-
-	let sender_balance_after = test.sender.balance;
-	let receiver_balance_after = test.receiver.balance;
-
-	assert_eq!(sender_balance_before, sender_balance_after);
-	assert_eq!(receiver_balance_before, receiver_balance_after);
-}
-
-/// Limited Reserve Transfers of native asset from System Parachain to Parachain should work
-#[test]
-fn limited_reserve_transfer_native_asset_from_system_para_to_para() {
-	// Init values for System Parachain
-	let destination = AssetHubPolkadot::sibling_location_of(PenpalPolkadotA::para_id());
-	let beneficiary_id = PenpalPolkadotAReceiver::get();
-	let amount_to_send: Balance = ASSET_HUB_POLKADOT_ED * 1000;
-	let assets = (Parent, amount_to_send).into();
-
-	let test_args = TestContext {
-		sender: AssetHubPolkadotSender::get(),
-		receiver: PenpalPolkadotAReceiver::get(),
-		args: system_para_test_args(destination, beneficiary_id, amount_to_send, assets, None),
-	};
-
-	let mut test = SystemParaToParaTest::new(test_args);
-
-	let sender_balance_before = test.sender.balance;
-
-	test.set_assertion::<AssetHubPolkadot>(system_para_to_para_assertions);
-	// TODO: Add assertion for Penpal runtime. Right now message is failing with
-	// `UntrustedReserveLocation`
-	test.set_dispatchable::<AssetHubPolkadot>(system_para_to_para_limited_reserve_transfer_assets);
-	test.assert();
-
-	let sender_balance_after = test.sender.balance;
-
-	assert_eq!(sender_balance_before - amount_to_send, sender_balance_after);
-	// TODO: Check receiver balance when Penpal runtime is improved to propery handle reserve
-	// transfers
-}
-
-/// Reserve Transfers of native asset from System Parachain to Parachain should work
-#[test]
-fn reserve_transfer_native_asset_from_system_para_to_para() {
-	// Init values for System Parachain
-	let destination = AssetHubPolkadot::sibling_location_of(PenpalPolkadotA::para_id());
-	let beneficiary_id = PenpalPolkadotAReceiver::get();
-	let amount_to_send: Balance = ASSET_HUB_POLKADOT_ED * 1000;
-	let assets = (Parent, amount_to_send).into();
-
-	let test_args = TestContext {
-		sender: AssetHubPolkadotSender::get(),
-		receiver: PenpalPolkadotAReceiver::get(),
-		args: system_para_test_args(destination, beneficiary_id, amount_to_send, assets, None),
-	};
-
-	let mut test = SystemParaToParaTest::new(test_args);
-
-	let sender_balance_before = test.sender.balance;
-
-	test.set_assertion::<AssetHubPolkadot>(system_para_to_para_assertions);
-	// TODO: Add assertion for Penpal runtime. Right now message is failing with
-	// `UntrustedReserveLocation`
-	test.set_dispatchable::<AssetHubPolkadot>(system_para_to_para_reserve_transfer_assets);
-	test.assert();
-
-	let sender_balance_after = test.sender.balance;
-
-	assert_eq!(sender_balance_before - amount_to_send, sender_balance_after);
-	// TODO: Check receiver balance when Penpal runtime is improved to propery handle reserve
-	// transfers
-}
-
-/// Limited Reserve Transfers of a local asset from System Parachain to Parachain should work
-#[test]
-fn limited_reserve_transfer_asset_from_system_para_to_para() {
-	// Force create asset from Relay Chain and mint assets for System Parachain's sender account
-	AssetHubPolkadot::force_create_and_mint_asset(
-		ASSET_ID,
-		ASSET_MIN_BALANCE,
-		true,
-		AssetHubPolkadotSender::get(),
-		ASSET_MIN_BALANCE * 1000000,
-	);
-
-	// Init values for System Parachain
-	let destination = AssetHubPolkadot::sibling_location_of(PenpalPolkadotA::para_id());
-	let beneficiary_id = PenpalPolkadotAReceiver::get();
-	let amount_to_send = ASSET_MIN_BALANCE * 1000;
-	let assets =
-		(X2(PalletInstance(ASSETS_PALLET_ID), GeneralIndex(ASSET_ID.into())), amount_to_send)
-			.into();
-
-	let system_para_test_args = TestContext {
-		sender: AssetHubPolkadotSender::get(),
-		receiver: PenpalPolkadotAReceiver::get(),
-		args: system_para_test_args(destination, beneficiary_id, amount_to_send, assets, None),
-	};
-
-	let mut system_para_test = SystemParaToParaTest::new(system_para_test_args);
-
-	system_para_test.set_assertion::<AssetHubPolkadot>(system_para_to_para_assets_assertions);
-	// TODO: Add assertions when Penpal is able to manage assets
-	system_para_test
-		.set_dispatchable::<AssetHubPolkadot>(system_para_to_para_limited_reserve_transfer_assets);
-	system_para_test.assert();
-}
-
-/// Reserve Transfers of a local asset from System Parachain to Parachain should work
-#[test]
-fn reserve_transfer_asset_from_system_para_to_para() {
-	// Force create asset from Relay Chain and mint assets for System Parachain's sender account
-	AssetHubPolkadot::force_create_and_mint_asset(
-		ASSET_ID,
-		ASSET_MIN_BALANCE,
-		true,
-		AssetHubPolkadotSender::get(),
-		ASSET_MIN_BALANCE * 1000000,
-	);
-
-	// Init values for System Parachain
-	let destination = AssetHubPolkadot::sibling_location_of(PenpalPolkadotA::para_id());
-	let beneficiary_id = PenpalPolkadotAReceiver::get();
-	let amount_to_send = ASSET_MIN_BALANCE * 1000;
-	let assets =
-		(X2(PalletInstance(ASSETS_PALLET_ID), GeneralIndex(ASSET_ID.into())), amount_to_send)
-			.into();
-
-	let system_para_test_args = TestContext {
-		sender: AssetHubPolkadotSender::get(),
-		receiver: PenpalPolkadotAReceiver::get(),
-		args: system_para_test_args(destination, beneficiary_id, amount_to_send, assets, None),
-	};
-
-	let mut system_para_test = SystemParaToParaTest::new(system_para_test_args);
-
-	system_para_test.set_assertion::<AssetHubPolkadot>(system_para_to_para_assets_assertions);
-	// TODO: Add assertions when Penpal is able to manage assets
-	system_para_test
-		.set_dispatchable::<AssetHubPolkadot>(system_para_to_para_reserve_transfer_assets);
-	system_para_test.assert();
-}
diff --git a/cumulus/parachains/integration-tests/emulated/assets/asset-hub-polkadot/src/tests/send.rs b/cumulus/parachains/integration-tests/emulated/assets/asset-hub-polkadot/src/tests/send.rs
deleted file mode 100644
index eb4c2ae6add09d9d1c980c2e3ae061640a7b17f8..0000000000000000000000000000000000000000
--- a/cumulus/parachains/integration-tests/emulated/assets/asset-hub-polkadot/src/tests/send.rs
+++ /dev/null
@@ -1,203 +0,0 @@
-// Copyright 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/>.
-
-use crate::*;
-
-/// Relay Chain should be able to execute `Transact` instructions in System Parachain
-/// when `OriginKind::Superuser` and signer is `sudo`
-#[test]
-fn send_transact_sudo_from_relay_to_system_para_works() {
-	// Init tests variables
-	let root_origin = <Polkadot as Chain>::RuntimeOrigin::root();
-	let system_para_destination = Polkadot::child_location_of(AssetHubPolkadot::para_id()).into();
-	let asset_owner: AccountId = AssetHubPolkadotSender::get().into();
-	let xcm = AssetHubPolkadot::force_create_asset_xcm(
-		OriginKind::Superuser,
-		ASSET_ID,
-		asset_owner.clone(),
-		true,
-		1000,
-	);
-	// Send XCM message from Relay Chain
-	Polkadot::execute_with(|| {
-		assert_ok!(<Polkadot as PolkadotPallet>::XcmPallet::send(
-			root_origin,
-			bx!(system_para_destination),
-			bx!(xcm),
-		));
-
-		Polkadot::assert_xcm_pallet_sent();
-	});
-
-	// Receive XCM message in Assets Parachain
-	AssetHubPolkadot::execute_with(|| {
-		type RuntimeEvent = <AssetHubPolkadot as Chain>::RuntimeEvent;
-
-		AssetHubPolkadot::assert_dmp_queue_complete(Some(Weight::from_parts(
-			1_019_445_000,
-			200_000,
-		)));
-
-		assert_expected_events!(
-			AssetHubPolkadot,
-			vec![
-				RuntimeEvent::Assets(pallet_assets::Event::ForceCreated { asset_id, owner }) => {
-					asset_id: *asset_id == ASSET_ID,
-					owner: *owner == asset_owner,
-				},
-			]
-		);
-
-		assert!(<AssetHubPolkadot as AssetHubPolkadotPallet>::Assets::asset_exists(ASSET_ID));
-	});
-}
-
-/// Relay Chain shouldn't be able to execute `Transact` instructions in System Parachain
-/// when `OriginKind::Native`
-#[test]
-fn send_transact_native_from_relay_to_system_para_fails() {
-	// Init tests variables
-	let signed_origin = <Polkadot as Chain>::RuntimeOrigin::signed(PolkadotSender::get().into());
-	let system_para_destination = Polkadot::child_location_of(AssetHubPolkadot::para_id()).into();
-	let asset_owner = AssetHubPolkadotSender::get().into();
-	let xcm = AssetHubPolkadot::force_create_asset_xcm(
-		OriginKind::Native,
-		ASSET_ID,
-		asset_owner,
-		true,
-		1000,
-	);
-
-	// Send XCM message from Relay Chain
-	Polkadot::execute_with(|| {
-		assert_err!(
-			<Polkadot as PolkadotPallet>::XcmPallet::send(
-				signed_origin,
-				bx!(system_para_destination),
-				bx!(xcm)
-			),
-			DispatchError::BadOrigin
-		);
-	});
-}
-
-/// System Parachain shouldn't be able to execute `Transact` instructions in Relay Chain
-/// when `OriginKind::Native`
-#[test]
-fn send_transact_native_from_system_para_to_relay_fails() {
-	// Init tests variables
-	let signed_origin =
-		<AssetHubPolkadot as Chain>::RuntimeOrigin::signed(AssetHubPolkadotSender::get().into());
-	let relay_destination = AssetHubPolkadot::parent_location().into();
-	let call = <Polkadot as Chain>::RuntimeCall::System(frame_system::Call::<
-		<Polkadot as Chain>::Runtime,
-	>::remark_with_event {
-		remark: vec![0, 1, 2, 3],
-	})
-	.encode()
-	.into();
-	let origin_kind = OriginKind::Native;
-
-	let xcm = xcm_transact_unpaid_execution(call, origin_kind);
-
-	// Send XCM message from Relay Chain
-	AssetHubPolkadot::execute_with(|| {
-		assert_err!(
-			<AssetHubPolkadot as AssetHubPolkadotPallet>::PolkadotXcm::send(
-				signed_origin,
-				bx!(relay_destination),
-				bx!(xcm)
-			),
-			DispatchError::BadOrigin
-		);
-	});
-}
-
-/// Parachain should be able to send XCM paying its fee with sufficient asset
-/// in the System Parachain
-#[test]
-#[ignore]
-fn send_xcm_from_para_to_system_para_paying_fee_with_assets_works() {
-	// let para_sovereign_account = AssetHubPolkadot::sovereign_account_id_of(
-	// 	AssetHubPolkadot::sibling_location_of(PenpalPolkadotA::para_id()),
-	// );
-
-	// // Force create and mint assets for Parachain's sovereign account
-	// AssetHubPolkadot::force_create_and_mint_asset(
-	// 	ASSET_ID,
-	// 	ASSET_MIN_BALANCE,
-	// 	true,
-	// 	para_sovereign_account.clone(),
-	// 	ASSET_MIN_BALANCE * 1000000000,
-	// );
-
-	// // We just need a call that can pass the `SafeCallFilter`
-	// // Call values are not relevant
-	// let call = AssetHubPolkadot::force_create_asset_call(
-	// 	ASSET_ID,
-	// 	para_sovereign_account.clone(),
-	// 	true,
-	// 	ASSET_MIN_BALANCE,
-	// );
-
-	// let origin_kind = OriginKind::SovereignAccount;
-	// let fee_amount = ASSET_MIN_BALANCE * 1000000;
-	// let native_asset =
-	// 	(X2(PalletInstance(ASSETS_PALLET_ID), GeneralIndex(ASSET_ID.into())), fee_amount).into();
-
-	// let root_origin = <PenpalPolkadotA as Chain>::RuntimeOrigin::root();
-	// let system_para_destination =
-	// 	PenpalPolkadotA::sibling_location_of(AssetHubPolkadot::para_id()).into();
-	// let xcm = xcm_transact_paid_execution(
-	// 	call,
-	// 	origin_kind,
-	// 	native_asset,
-	// 	para_sovereign_account.clone(),
-	// );
-
-	// PenpalPolkadotA::execute_with(|| {
-	// 	assert_ok!(<PenpalPolkadotA as PenpalPolkadotAPallet>::PolkadotXcm::send(
-	// 		root_origin,
-	// 		bx!(system_para_destination),
-	// 		bx!(xcm),
-	// 	));
-
-	// 	PenpalPolkadotA::assert_xcm_pallet_sent();
-	// });
-
-	// AssetHubPolkadot::execute_with(|| {
-	// 	type RuntimeEvent = <AssetHubPolkadot as Chain>::RuntimeEvent;
-
-	// 	AssetHubPolkadot::assert_xcmp_queue_success(Some(Weight::from_parts(
-	// 		2_176_414_000,
-	// 		203_593,
-	// 	)));
-
-	// 	assert_expected_events!(
-	// 		AssetHubPolkadot,
-	// 		vec![
-	// 			RuntimeEvent::Assets(pallet_assets::Event::Burned { asset_id, owner, balance }) => {
-	// 				asset_id: *asset_id == ASSET_ID,
-	// 				owner: *owner == para_sovereign_account,
-	// 				balance: *balance == fee_amount,
-	// 			},
-	// 			RuntimeEvent::Assets(pallet_assets::Event::Issued { asset_id, .. }) => {
-	// 				asset_id: *asset_id == ASSET_ID,
-	// 			},
-	// 		]
-	// 	);
-	// });
-}
diff --git a/cumulus/parachains/integration-tests/emulated/assets/asset-hub-polkadot/src/tests/set_xcm_versions.rs b/cumulus/parachains/integration-tests/emulated/assets/asset-hub-polkadot/src/tests/set_xcm_versions.rs
deleted file mode 100644
index 84abf630e507ee14e883b333963954ad4526b113..0000000000000000000000000000000000000000
--- a/cumulus/parachains/integration-tests/emulated/assets/asset-hub-polkadot/src/tests/set_xcm_versions.rs
+++ /dev/null
@@ -1,97 +0,0 @@
-// Copyright 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/>.
-
-use crate::*;
-
-#[test]
-fn relay_sets_system_para_xcm_supported_version() {
-	// Init tests variables
-	let sudo_origin = <Polkadot as Chain>::RuntimeOrigin::root();
-	let system_para_destination: MultiLocation =
-		Polkadot::child_location_of(AssetHubPolkadot::para_id());
-
-	// Relay Chain sets supported version for Asset Parachain
-	Polkadot::execute_with(|| {
-		assert_ok!(<Polkadot as PolkadotPallet>::XcmPallet::force_xcm_version(
-			sudo_origin,
-			bx!(system_para_destination),
-			XCM_V3
-		));
-
-		type RuntimeEvent = <Polkadot as Chain>::RuntimeEvent;
-
-		assert_expected_events!(
-			Polkadot,
-			vec![
-				RuntimeEvent::XcmPallet(pallet_xcm::Event::SupportedVersionChanged {
-					location,
-					version: XCM_V3
-				}) => { location: *location == system_para_destination, },
-			]
-		);
-	});
-}
-
-#[test]
-fn system_para_sets_relay_xcm_supported_version() {
-	// Init test variables
-	let sudo_origin = <Polkadot as Chain>::RuntimeOrigin::root();
-	let parent_location = AssetHubPolkadot::parent_location();
-	let system_para_destination: VersionedMultiLocation =
-		Polkadot::child_location_of(AssetHubPolkadot::para_id()).into();
-	let call = <AssetHubPolkadot as Chain>::RuntimeCall::PolkadotXcm(pallet_xcm::Call::<
-		<AssetHubPolkadot as Chain>::Runtime,
-	>::force_xcm_version {
-		location: bx!(parent_location),
-		version: XCM_V3,
-	})
-	.encode()
-	.into();
-	let origin_kind = OriginKind::Superuser;
-
-	let xcm = xcm_transact_unpaid_execution(call, origin_kind);
-
-	// System Parachain sets supported version for Relay Chain throught it
-	Polkadot::execute_with(|| {
-		assert_ok!(<Polkadot as PolkadotPallet>::XcmPallet::send(
-			sudo_origin,
-			bx!(system_para_destination),
-			bx!(xcm),
-		));
-
-		Polkadot::assert_xcm_pallet_sent();
-	});
-
-	// System Parachain receive the XCM message
-	AssetHubPolkadot::execute_with(|| {
-		type RuntimeEvent = <AssetHubPolkadot as Chain>::RuntimeEvent;
-
-		AssetHubPolkadot::assert_dmp_queue_complete(Some(Weight::from_parts(
-			1_019_210_000,
-			200_000,
-		)));
-
-		assert_expected_events!(
-			AssetHubPolkadot,
-			vec![
-				RuntimeEvent::PolkadotXcm(pallet_xcm::Event::SupportedVersionChanged {
-					location,
-					version: XCM_V3
-				}) => { location: *location == parent_location, },
-			]
-		);
-	});
-}
diff --git a/cumulus/parachains/integration-tests/emulated/assets/asset-hub-polkadot/src/tests/teleport.rs b/cumulus/parachains/integration-tests/emulated/assets/asset-hub-polkadot/src/tests/teleport.rs
deleted file mode 100644
index 843ef6d3ccedb46bac0d788fb5860830bc0cb777..0000000000000000000000000000000000000000
--- a/cumulus/parachains/integration-tests/emulated/assets/asset-hub-polkadot/src/tests/teleport.rs
+++ /dev/null
@@ -1,366 +0,0 @@
-// Copyright 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/>.
-
-#![allow(dead_code)] // <https://github.com/paritytech/cumulus/issues/3027>
-
-use crate::*;
-
-fn relay_origin_assertions(t: RelayToSystemParaTest) {
-	type RuntimeEvent = <Polkadot as Chain>::RuntimeEvent;
-
-	Polkadot::assert_xcm_pallet_attempted_complete(Some(Weight::from_parts(632_207_000, 7_186)));
-
-	assert_expected_events!(
-		Polkadot,
-		vec![
-			// Amount to teleport is withdrawn from Sender
-			RuntimeEvent::Balances(pallet_balances::Event::Withdraw { who, amount }) => {
-				who: *who == t.sender.account_id,
-				amount: *amount == t.args.amount,
-			},
-			// Amount to teleport is deposited in Relay's `CheckAccount`
-			RuntimeEvent::Balances(pallet_balances::Event::Deposit { who, amount }) => {
-				who: *who == <Polkadot as PolkadotPallet>::XcmPallet::check_account(),
-				amount:  *amount == t.args.amount,
-			},
-		]
-	);
-}
-
-fn relay_dest_assertions(t: SystemParaToRelayTest) {
-	type RuntimeEvent = <Polkadot as Chain>::RuntimeEvent;
-
-	Polkadot::assert_ump_queue_processed(
-		true,
-		Some(AssetHubPolkadot::para_id()),
-		Some(Weight::from_parts(368_931_000, 7_186)),
-	);
-
-	assert_expected_events!(
-		Polkadot,
-		vec![
-			// Amount is witdrawn from Relay Chain's `CheckAccount`
-			RuntimeEvent::Balances(pallet_balances::Event::Withdraw { who, amount }) => {
-				who: *who == <Polkadot as PolkadotPallet>::XcmPallet::check_account(),
-				amount: *amount == t.args.amount,
-			},
-			// Amount minus fees are deposited in Receiver's account
-			RuntimeEvent::Balances(pallet_balances::Event::Deposit { who, .. }) => {
-				who: *who == t.receiver.account_id,
-			},
-		]
-	);
-}
-
-fn relay_dest_assertions_fail(_t: SystemParaToRelayTest) {
-	Polkadot::assert_ump_queue_processed(
-		false,
-		Some(AssetHubPolkadot::para_id()),
-		Some(Weight::from_parts(232_982_000, 3_593)),
-	);
-}
-
-fn para_origin_assertions(t: SystemParaToRelayTest) {
-	type RuntimeEvent = <AssetHubPolkadot as Chain>::RuntimeEvent;
-
-	AssetHubPolkadot::assert_xcm_pallet_attempted_complete(Some(Weight::from_parts(
-		632_207_000,
-		7_186,
-	)));
-
-	AssetHubPolkadot::assert_parachain_system_ump_sent();
-
-	assert_expected_events!(
-		AssetHubPolkadot,
-		vec![
-			// Amount is withdrawn from Sender's account
-			RuntimeEvent::Balances(pallet_balances::Event::Withdraw { who, amount }) => {
-				who: *who == t.sender.account_id,
-				amount: *amount == t.args.amount,
-			},
-		]
-	);
-}
-
-fn para_dest_assertions(t: RelayToSystemParaTest) {
-	type RuntimeEvent = <AssetHubPolkadot as Chain>::RuntimeEvent;
-
-	AssetHubPolkadot::assert_dmp_queue_complete(Some(Weight::from_parts(161_196_000, 0)));
-
-	assert_expected_events!(
-		AssetHubPolkadot,
-		vec![
-			// Amount minus fees are deposited in Receiver's account
-			RuntimeEvent::Balances(pallet_balances::Event::Deposit { who, .. }) => {
-				who: *who == t.receiver.account_id,
-			},
-		]
-	);
-}
-
-fn relay_limited_teleport_assets(t: RelayToSystemParaTest) -> DispatchResult {
-	<Polkadot as PolkadotPallet>::XcmPallet::limited_teleport_assets(
-		t.signed_origin,
-		bx!(t.args.dest.into()),
-		bx!(t.args.beneficiary.into()),
-		bx!(t.args.assets.into()),
-		t.args.fee_asset_item,
-		t.args.weight_limit,
-	)
-}
-
-fn relay_teleport_assets(t: RelayToSystemParaTest) -> DispatchResult {
-	<Polkadot as PolkadotPallet>::XcmPallet::teleport_assets(
-		t.signed_origin,
-		bx!(t.args.dest.into()),
-		bx!(t.args.beneficiary.into()),
-		bx!(t.args.assets.into()),
-		t.args.fee_asset_item,
-	)
-}
-
-fn system_para_limited_teleport_assets(t: SystemParaToRelayTest) -> DispatchResult {
-	<AssetHubPolkadot as AssetHubPolkadotPallet>::PolkadotXcm::limited_teleport_assets(
-		t.signed_origin,
-		bx!(t.args.dest.into()),
-		bx!(t.args.beneficiary.into()),
-		bx!(t.args.assets.into()),
-		t.args.fee_asset_item,
-		t.args.weight_limit,
-	)
-}
-
-// TODO: Uncomment when https://github.com/paritytech/polkadot/pull/7424 is merged
-// fn system_para_teleport_assets(t: SystemParaToRelayTest) -> DispatchResult {
-// 	<AssetHubPolkadot as AssetHubPolkadotPallet>::PolkadotXcm::teleport_assets(
-// 		t.signed_origin,
-// 		bx!(t.args.dest),
-// 		bx!(t.args.beneficiary),
-// 		bx!(t.args.assets),
-// 		t.args.fee_asset_item,
-// 	)
-// }
-
-/// Limited Teleport of native asset from Relay Chain to the System Parachain should work
-#[test]
-fn limited_teleport_native_assets_from_relay_to_system_para_works() {
-	// Init values for Relay Chain
-	let amount_to_send: Balance = POLKADOT_ED * 1000;
-	let test_args = TestContext {
-		sender: PolkadotSender::get(),
-		receiver: AssetHubPolkadotReceiver::get(),
-		args: relay_test_args(amount_to_send),
-	};
-
-	let mut test = RelayToSystemParaTest::new(test_args);
-
-	let sender_balance_before = test.sender.balance;
-	let receiver_balance_before = test.receiver.balance;
-
-	test.set_assertion::<Polkadot>(relay_origin_assertions);
-	test.set_assertion::<AssetHubPolkadot>(para_dest_assertions);
-	test.set_dispatchable::<Polkadot>(relay_limited_teleport_assets);
-	test.assert();
-
-	let sender_balance_after = test.sender.balance;
-	let receiver_balance_after = test.receiver.balance;
-
-	// Sender's balance is reduced
-	assert_eq!(sender_balance_before - amount_to_send, sender_balance_after);
-	// Receiver's balance is increased
-	assert!(receiver_balance_after > receiver_balance_before);
-}
-
-/// Limited Teleport of native asset from System Parachain to Relay Chain
-/// should work when there is enough balance in Relay Chain's `CheckAccount`
-#[test]
-#[cfg(feature = "FIXME-IGNORED")] // <https://github.com/paritytech/cumulus/issues/3027>
-fn limited_teleport_native_assets_back_from_system_para_to_relay_works() {
-	// Dependency - Relay Chain's `CheckAccount` should have enough balance
-	limited_teleport_native_assets_from_relay_to_system_para_works();
-
-	// Init values for Relay Chain
-	let amount_to_send: Balance = ASSET_HUB_POLKADOT_ED * 1000;
-	let destination = AssetHubPolkadot::parent_location();
-	let beneficiary_id = PolkadotReceiver::get();
-	let assets = (Parent, amount_to_send).into();
-
-	let test_args = TestContext {
-		sender: AssetHubPolkadotSender::get(),
-		receiver: PolkadotReceiver::get(),
-		args: system_para_test_args(destination, beneficiary_id, amount_to_send, assets, None),
-	};
-
-	let mut test = SystemParaToRelayTest::new(test_args);
-
-	let sender_balance_before = test.sender.balance;
-	let receiver_balance_before = test.receiver.balance;
-
-	test.set_assertion::<AssetHubPolkadot>(para_origin_assertions);
-	test.set_assertion::<Polkadot>(relay_dest_assertions);
-	test.set_dispatchable::<AssetHubPolkadot>(system_para_limited_teleport_assets);
-	test.assert();
-
-	let sender_balance_after = test.sender.balance;
-	let receiver_balance_after = test.receiver.balance;
-
-	// Sender's balance is reduced
-	assert_eq!(sender_balance_before - amount_to_send, sender_balance_after);
-	// Receiver's balance is increased
-	assert!(receiver_balance_after > receiver_balance_before);
-}
-
-/// Limited Teleport of native asset from System Parachain to Relay Chain
-/// should't work when there is not enough balance in Relay Chain's `CheckAccount`
-#[test]
-#[cfg(feature = "FIXME-IGNORED")] // <https://github.com/paritytech/cumulus/issues/3027>
-fn limited_teleport_native_assets_from_system_para_to_relay_fails() {
-	// Init values for Relay Chain
-	let amount_to_send: Balance = ASSET_HUB_POLKADOT_ED * 1000;
-	let destination = AssetHubPolkadot::parent_location().into();
-	let beneficiary_id = PolkadotReceiver::get().into();
-	let assets = (Parent, amount_to_send).into();
-
-	let test_args = TestContext {
-		sender: AssetHubPolkadotSender::get(),
-		receiver: PolkadotReceiver::get(),
-		args: system_para_test_args(destination, beneficiary_id, amount_to_send, assets, None),
-	};
-
-	let mut test = SystemParaToRelayTest::new(test_args);
-
-	let sender_balance_before = test.sender.balance;
-	let receiver_balance_before = test.receiver.balance;
-
-	test.set_assertion::<AssetHubPolkadot>(para_origin_assertions);
-	test.set_assertion::<Polkadot>(relay_dest_assertions_fail);
-	test.set_dispatchable::<AssetHubPolkadot>(system_para_limited_teleport_assets);
-	test.assert();
-
-	let sender_balance_after = test.sender.balance;
-	let receiver_balance_after = test.receiver.balance;
-
-	// Sender's balance is reduced
-	assert_eq!(sender_balance_before - amount_to_send, sender_balance_after);
-	// Receiver's balance does not change
-	assert_eq!(receiver_balance_after, receiver_balance_before);
-}
-
-/// Teleport of native asset from Relay Chain to the System Parachain should work
-#[test]
-fn teleport_native_assets_from_relay_to_system_para_works() {
-	// Init values for Relay Chain
-	let amount_to_send: Balance = POLKADOT_ED * 1000;
-	let test_args = TestContext {
-		sender: PolkadotSender::get(),
-		receiver: AssetHubPolkadotReceiver::get(),
-		args: relay_test_args(amount_to_send),
-	};
-
-	let mut test = RelayToSystemParaTest::new(test_args);
-
-	let sender_balance_before = test.sender.balance;
-	let receiver_balance_before = test.receiver.balance;
-
-	test.set_assertion::<Polkadot>(relay_origin_assertions);
-	test.set_assertion::<AssetHubPolkadot>(para_dest_assertions);
-	test.set_dispatchable::<Polkadot>(relay_teleport_assets);
-	test.assert();
-
-	let sender_balance_after = test.sender.balance;
-	let receiver_balance_after = test.receiver.balance;
-
-	// Sender's balance is reduced
-	assert_eq!(sender_balance_before - amount_to_send, sender_balance_after);
-	// Receiver's balance is increased
-	assert!(receiver_balance_after > receiver_balance_before);
-}
-
-// TODO: Uncomment when https://github.com/paritytech/polkadot/pull/7424 is merged
-
-// Right now it is failing in the Relay Chain with a
-// `messageQueue.ProcessingFailed` event `error: Unsupported`.
-// The reason is the `Weigher` in `pallet_xcm` is not properly calculating the `remote_weight`
-// and it cause an `Overweight` error in `AllowTopLevelPaidExecutionFrom` barrier
-
-// /// Teleport of native asset from System Parachains to the Relay Chain
-// /// should work when there is enough balance in Relay Chain's `CheckAccount`
-// #[test]
-// fn teleport_native_assets_back_from_system_para_to_relay_works() {
-// 	// Dependency - Relay Chain's `CheckAccount` should have enough balance
-// 	teleport_native_assets_from_relay_to_system_para_works();
-
-// 	// Init values for Relay Chain
-// 	let amount_to_send: Balance = ASSET_HUB_POLKADOT_ED * 1000;
-// 	let test_args = TestContext {
-// 		sender: AssetHubPolkadotSender::get(),
-// 		receiver: PolkadotReceiver::get(),
-// 		args: get_para_dispatch_args(amount_to_send),
-// 	};
-
-// 	let mut test = SystemParaToRelayTest::new(test_args);
-
-// 	let sender_balance_before = test.sender.balance;
-// 	let receiver_balance_before = test.receiver.balance;
-
-// 	test.set_assertion::<AssetHubPolkadot>(para_origin_assertions);
-// 	test.set_assertion::<Polkadot>(relay_dest_assertions);
-// 	test.set_dispatchable::<AssetHubPolkadot>(system_para_teleport_assets);
-// 	test.assert();
-
-// 	let sender_balance_after = test.sender.balance;
-// 	let receiver_balance_after = test.receiver.balance;
-
-// 	// Sender's balance is reduced
-// 	assert_eq!(sender_balance_before - amount_to_send, sender_balance_after);
-// 	// Receiver's balance is increased
-// 	assert!(receiver_balance_after > receiver_balance_before);
-// }
-
-// /// Teleport of native asset from System Parachain to Relay Chain
-// /// shouldn't work when there is not enough balance in Relay Chain's `CheckAccount`
-// #[test]
-// fn teleport_native_assets_from_system_para_to_relay_fails() {
-// 	// Init values for Relay Chain
-// 	let amount_to_send: Balance = ASSET_HUB_POLKADOT_ED * 1000;
-//  let assets = (Parent, amount_to_send).into();
-//
-// 	let test_args = TestContext {
-// 		sender: AssetHubPolkadotSender::get(),
-// 		receiver: PolkadotReceiver::get(),
-// 		args: system_para_test_args(amount_to_send),
-//      assets,
-//      None
-// 	};
-
-// 	let mut test = SystemParaToRelayTest::new(test_args);
-
-// 	let sender_balance_before = test.sender.balance;
-// 	let receiver_balance_before = test.receiver.balance;
-
-// 	test.set_assertion::<AssetHubPolkadot>(para_origin_assertions);
-// 	test.set_assertion::<Polkadot>(relay_dest_assertions);
-// 	test.set_dispatchable::<AssetHubPolkadot>(system_para_teleport_assets);
-// 	test.assert();
-
-// 	let sender_balance_after = test.sender.balance;
-// 	let receiver_balance_after = test.receiver.balance;
-
-// 	// Sender's balance is reduced
-// 	assert_eq!(sender_balance_before - amount_to_send, sender_balance_after);
-// 	// Receiver's balance does not change
-// 	assert_eq!(receiver_balance_after, receiver_balance_before);
-// }
diff --git a/cumulus/parachains/integration-tests/emulated/assets/asset-hub-rococo/Cargo.toml b/cumulus/parachains/integration-tests/emulated/assets/asset-hub-rococo/Cargo.toml
new file mode 100644
index 0000000000000000000000000000000000000000..f280afdda4a440333b940adf9d9cfd015e3cfa5d
--- /dev/null
+++ b/cumulus/parachains/integration-tests/emulated/assets/asset-hub-rococo/Cargo.toml
@@ -0,0 +1,24 @@
+[package]
+name = "asset-hub-rococo-integration-tests"
+version = "1.0.0"
+authors.workspace = true
+edition.workspace = true
+description = "Asset Hub Rococo runtime integration tests with xcm-emulator"
+publish = false
+
+[dependencies]
+codec = { package = "parity-scale-codec", version = "3.4.0", default-features = false }
+
+# Substrate
+frame-support = { path = "../../../../../../substrate/frame/support", default-features = false}
+xcm = { package = "staging-xcm", path = "../../../../../../polkadot/xcm", default-features = false}
+
+# Local
+xcm-emulator = { path = "../../../../../xcm/xcm-emulator", default-features = false}
+integration-tests-common = { path = "../../common", default-features = false}
+
+[features]
+runtime-benchmarks = [
+	"frame-support/runtime-benchmarks",
+	"integration-tests-common/runtime-benchmarks",
+]
diff --git a/cumulus/parachains/integration-tests/emulated/assets/asset-hub-rococo/src/lib.rs b/cumulus/parachains/integration-tests/emulated/assets/asset-hub-rococo/src/lib.rs
new file mode 100644
index 0000000000000000000000000000000000000000..f8a917afe1b60ada9379a0af935b02dbd82a5344
--- /dev/null
+++ b/cumulus/parachains/integration-tests/emulated/assets/asset-hub-rococo/src/lib.rs
@@ -0,0 +1,26 @@
+// 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.
+
+pub use frame_support::assert_ok;
+pub use integration_tests_common::{
+	constants::asset_hub_rococo::ED as ASSET_HUB_ROCOCO_ED, test_parachain_is_trusted_teleporter,
+	AssetHubRococo, AssetHubRococoPallet, AssetHubRococoSender, BridgeHubRococo,
+	BridgeHubRococoReceiver,
+};
+pub use xcm::prelude::*;
+pub use xcm_emulator::{assert_expected_events, bx, Chain, Parachain, TestExt};
+
+#[cfg(test)]
+mod tests;
diff --git a/cumulus/parachains/integration-tests/emulated/assets/asset-hub-rococo/src/tests/mod.rs b/cumulus/parachains/integration-tests/emulated/assets/asset-hub-rococo/src/tests/mod.rs
new file mode 100644
index 0000000000000000000000000000000000000000..516ec37cc10a0bd6b116ccbbc183a8cfc0ff6e5e
--- /dev/null
+++ b/cumulus/parachains/integration-tests/emulated/assets/asset-hub-rococo/src/tests/mod.rs
@@ -0,0 +1,16 @@
+// 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.
+
+mod teleport;
diff --git a/cumulus/parachains/integration-tests/emulated/assets/asset-hub-rococo/src/tests/teleport.rs b/cumulus/parachains/integration-tests/emulated/assets/asset-hub-rococo/src/tests/teleport.rs
new file mode 100644
index 0000000000000000000000000000000000000000..36b65c6d010ff1bd2c5c956ba95a929e7d9611b2
--- /dev/null
+++ b/cumulus/parachains/integration-tests/emulated/assets/asset-hub-rococo/src/tests/teleport.rs
@@ -0,0 +1,28 @@
+// 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.
+
+use crate::*;
+
+#[test]
+fn teleport_to_other_system_parachains_works() {
+	let amount = ASSET_HUB_ROCOCO_ED * 100;
+	let native_asset: VersionedMultiAssets = (Parent, amount).into();
+
+	test_parachain_is_trusted_teleporter!(
+		AssetHubRococo,        // Origin
+		vec![BridgeHubRococo], // Destinations
+		(native_asset, amount)
+	);
+}
diff --git a/cumulus/parachains/integration-tests/emulated/assets/asset-hub-westend/Cargo.toml b/cumulus/parachains/integration-tests/emulated/assets/asset-hub-westend/Cargo.toml
index 1225cf8763c863cc83f3e1dc89560b1b472691d6..bf141dafebf2cde02f3eeda6b71841b02ae62282 100644
--- a/cumulus/parachains/integration-tests/emulated/assets/asset-hub-westend/Cargo.toml
+++ b/cumulus/parachains/integration-tests/emulated/assets/asset-hub-westend/Cargo.toml
@@ -1,9 +1,11 @@
 [package]
 name = "asset-hub-westend-integration-tests"
 version = "1.0.0"
-authors = ["Parity Technologies <admin@parity.io>"]
-edition = "2021"
+authors.workspace = true
+edition.workspace = true
+license = "Apache-2.0"
 description = "Asset Hub Westend runtime integration tests with xcm-emulator"
+publish = false
 
 [dependencies]
 codec = { package = "parity-scale-codec", version = "3.4.0", default-features = false }
@@ -13,28 +15,50 @@ assert_matches = "1.5.0"
 sp-runtime = { path = "../../../../../../substrate/primitives/runtime", default-features = false}
 frame-support = { path = "../../../../../../substrate/frame/support", default-features = false}
 frame-system = { path = "../../../../../../substrate/frame/system", default-features = false}
-sp-core = { path = "../../../../../../substrate/primitives/core", default-features = false}
-sp-weights = { path = "../../../../../../substrate/primitives/weights", default-features = false}
 pallet-balances = { path = "../../../../../../substrate/frame/balances", default-features = false}
 pallet-assets = { path = "../../../../../../substrate/frame/assets", default-features = false}
 pallet-asset-conversion = { path = "../../../../../../substrate/frame/asset-conversion", default-features = false}
+pallet-treasury = { path = "../../../../../../substrate/frame/treasury", default-features = false}
+pallet-asset-rate = { path = "../../../../../../substrate/frame/asset-rate", default-features = false}
 
 # Polkadot
 polkadot-core-primitives = { path = "../../../../../../polkadot/core-primitives", default-features = false}
-polkadot-parachain = { path = "../../../../../../polkadot/parachain", default-features = false}
+polkadot-parachain-primitives = { path = "../../../../../../polkadot/parachain", default-features = false}
+polkadot-runtime-common = { path = "../../../../../../polkadot/runtime/common" }
 polkadot-runtime-parachains = { path = "../../../../../../polkadot/runtime/parachains" }
-polkadot-runtime = { path = "../../../../../../polkadot/runtime/polkadot" }
-xcm = { path = "../../../../../../polkadot/xcm", default-features = false}
-xcm-executor = { path = "../../../../../../polkadot/xcm/xcm-executor", default-features = false}
+xcm = { package = "staging-xcm", path = "../../../../../../polkadot/xcm", default-features = false}
+xcm-builder = { package = "staging-xcm-builder",  path = "../../../../../../polkadot/xcm/xcm-builder", default-features = false}
+xcm-executor = { package = "staging-xcm-executor",  path = "../../../../../../polkadot/xcm/xcm-executor", default-features = false}
 pallet-xcm = { path = "../../../../../../polkadot/xcm/pallet-xcm", default-features = false}
 
 # Cumulus
 parachains-common = { path = "../../../../common" }
 asset-hub-westend-runtime = { path = "../../../../runtimes/assets/asset-hub-westend" }
-cumulus-pallet-dmp-queue = { path = "../../../../../pallets/dmp-queue" }
-cumulus-pallet-xcmp-queue = { path = "../../../../../pallets/xcmp-queue", default-features = false}
-cumulus-pallet-parachain-system = { path = "../../../../../pallets/parachain-system" }
+cumulus-pallet-dmp-queue = { default-features = false, path = "../../../../../pallets/dmp-queue" }
+cumulus-pallet-parachain-system = { default-features = false, path = "../../../../../pallets/parachain-system" }
 
 # Local
 xcm-emulator = { path = "../../../../../xcm/xcm-emulator", default-features = false}
 integration-tests-common = { path = "../../common", default-features = false}
+
+[features]
+runtime-benchmarks = [
+	"asset-hub-westend-runtime/runtime-benchmarks",
+	"cumulus-pallet-parachain-system/runtime-benchmarks",
+	"frame-support/runtime-benchmarks",
+	"frame-system/runtime-benchmarks",
+	"integration-tests-common/runtime-benchmarks",
+	"pallet-asset-conversion/runtime-benchmarks",
+	"pallet-asset-rate/runtime-benchmarks",
+	"pallet-assets/runtime-benchmarks",
+	"pallet-balances/runtime-benchmarks",
+	"pallet-treasury/runtime-benchmarks",
+	"pallet-xcm/runtime-benchmarks",
+	"parachains-common/runtime-benchmarks",
+	"polkadot-parachain-primitives/runtime-benchmarks",
+	"polkadot-runtime-common/runtime-benchmarks",
+	"polkadot-runtime-parachains/runtime-benchmarks",
+	"sp-runtime/runtime-benchmarks",
+	"xcm-builder/runtime-benchmarks",
+	"xcm-executor/runtime-benchmarks",
+]
diff --git a/cumulus/parachains/integration-tests/emulated/assets/asset-hub-westend/src/lib.rs b/cumulus/parachains/integration-tests/emulated/assets/asset-hub-westend/src/lib.rs
index b7f064e7d6ea791076b896636b2fca286ecb6ad9..c25cc601fbefb978c8d041c8fda8e60594749df8 100644
--- a/cumulus/parachains/integration-tests/emulated/assets/asset-hub-westend/src/lib.rs
+++ b/cumulus/parachains/integration-tests/emulated/assets/asset-hub-westend/src/lib.rs
@@ -1,55 +1,46 @@
-// Copyright Parity Technologies (UK) Ltd.
-// This file is part of Cumulus.
+// Copyright (C) Parity Technologies (UK) Ltd.
+// SPDX-License-Identifier: Apache-2.0
 
-// 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/>.
+// Licensed under the Apache License, Version 2.0 (the "License");
+// you may not use this file except in compliance with the License.
+// You may obtain a copy of the License at
+//
+// 	http://www.apache.org/licenses/LICENSE-2.0
+//
+// Unless required by applicable law or agreed to in writing, software
+// distributed under the License is distributed on an "AS IS" BASIS,
+// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+// See the License for the specific language governing permissions and
+// limitations under the License.
 
 pub use codec::Encode;
 pub use frame_support::{
 	assert_err, assert_ok,
-	instances::{Instance1, Instance2},
+	instances::Instance2,
 	pallet_prelude::Weight,
-	sp_runtime::{AccountId32, DispatchError, DispatchResult, ModuleError, MultiAddress},
-	traits::{fungibles::Inspect, OriginTrait},
+	sp_runtime::{AccountId32, DispatchError, DispatchResult, ModuleError},
+	traits::fungibles::Inspect,
 	BoundedVec,
 };
 pub use integration_tests_common::{
 	constants::{
-		accounts::{ALICE, BOB},
-		asset_hub_westend::ED as ASSET_HUB_WESTEND_ED,
-		westend::ED as WESTEND_ED,
+		asset_hub_westend::ED as ASSET_HUB_WESTEND_ED, westend::ED as WESTEND_ED,
 		PROOF_SIZE_THRESHOLD, REF_TIME_THRESHOLD, XCM_V3,
 	},
-	lazy_static::lazy_static,
-	xcm_transact_paid_execution, xcm_transact_unpaid_execution, AssetHubWestend,
-	AssetHubWestendPallet, AssetHubWestendReceiver, AssetHubWestendSender, Collectives,
-	CollectivesPallet, CollectivesReceiver, CollectivesSender, PenpalWestendA,
-	PenpalWestendAPallet, PenpalWestendAReceiver, PenpalWestendASender, Westend, WestendMockNet,
+	test_parachain_is_trusted_teleporter,
+	xcm_helpers::{xcm_transact_paid_execution, xcm_transact_unpaid_execution},
+	AssetHubWestend, AssetHubWestendPallet, AssetHubWestendReceiver, AssetHubWestendSender,
+	PenpalWestendA, PenpalWestendAPallet, PenpalWestendAReceiver, PenpalWestendASender, Westend,
 	WestendPallet, WestendReceiver, WestendSender,
 };
 pub use parachains_common::{AccountId, Balance};
-pub use polkadot_core_primitives::InboundDownwardMessage;
-pub use polkadot_parachain::primitives::{HrmpChannelId, Id};
-pub use polkadot_runtime_parachains::inclusion::{AggregateMessageOrigin, UmpQueueId};
 pub use xcm::{
-	prelude::*,
+	prelude::{AccountId32 as AccountId32Junction, *},
 	v3::{Error, NetworkId::Westend as WestendId},
-	DoubleEncoded,
 };
 pub use xcm_emulator::{
-	assert_expected_events, bx, cumulus_pallet_dmp_queue, helpers::weight_within_threshold,
-	AccountId32Junction, Chain, ParaId, Parachain as Para, RelayChain as Relay, Test, TestArgs,
-	TestContext, TestExt, TestExternalities,
+	assert_expected_events, bx, helpers::weight_within_threshold, Chain, Parachain as Para,
+	RelayChain as Relay, Test, TestArgs, TestContext, TestExt,
 };
 
 pub const ASSET_ID: u32 = 1;
diff --git a/cumulus/parachains/integration-tests/emulated/assets/asset-hub-westend/src/tests/mod.rs b/cumulus/parachains/integration-tests/emulated/assets/asset-hub-westend/src/tests/mod.rs
index e45b78da1c254ef4c42b8b746d5732ea7539cfee..0c9de89c5f98f04a8a8f79048faf260c7bae27d5 100644
--- a/cumulus/parachains/integration-tests/emulated/assets/asset-hub-westend/src/tests/mod.rs
+++ b/cumulus/parachains/integration-tests/emulated/assets/asset-hub-westend/src/tests/mod.rs
@@ -1,21 +1,21 @@
-// Copyright Parity Technologies (UK) Ltd.
-// This file is part of Cumulus.
+// Copyright (C) Parity Technologies (UK) Ltd.
+// SPDX-License-Identifier: Apache-2.0
 
-// 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/>.
+// 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.
 
 mod reserve_transfer;
 mod send;
 mod set_xcm_versions;
 mod swap;
 mod teleport;
+mod treasury;
diff --git a/cumulus/parachains/integration-tests/emulated/assets/asset-hub-westend/src/tests/reserve_transfer.rs b/cumulus/parachains/integration-tests/emulated/assets/asset-hub-westend/src/tests/reserve_transfer.rs
index 8d3c5358a37f6d95460ecc99c51980806cc35c7f..8f8b7a7dde77723d70b845210740cb88e36fac09 100644
--- a/cumulus/parachains/integration-tests/emulated/assets/asset-hub-westend/src/tests/reserve_transfer.rs
+++ b/cumulus/parachains/integration-tests/emulated/assets/asset-hub-westend/src/tests/reserve_transfer.rs
@@ -1,18 +1,17 @@
-// Copyright 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/>.
+// 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.
 
 use crate::*;
 
@@ -36,11 +35,8 @@ fn relay_origin_assertions(t: RelayToSystemParaTest) {
 	);
 }
 
-fn system_para_dest_assertions_incomplete(_t: RelayToSystemParaTest) {
-	AssetHubWestend::assert_dmp_queue_incomplete(
-		Some(Weight::from_parts(1_000_000_000, 0)),
-		Some(Error::UntrustedReserveLocation),
-	);
+fn system_para_dest_assertions(_t: RelayToSystemParaTest) {
+	AssetHubWestend::assert_dmp_queue_error(Error::WeightNotComputable);
 }
 
 fn system_para_to_relay_assertions(_t: SystemParaToRelayTest) {
@@ -179,7 +175,7 @@ fn limited_reserve_transfer_native_asset_from_relay_to_system_para_fails() {
 	let receiver_balance_before = test.receiver.balance;
 
 	test.set_assertion::<Westend>(relay_origin_assertions);
-	test.set_assertion::<AssetHubWestend>(system_para_dest_assertions_incomplete);
+	test.set_assertion::<AssetHubWestend>(system_para_dest_assertions);
 	test.set_dispatchable::<Westend>(relay_limited_reserve_transfer_assets);
 	test.assert();
 
@@ -238,7 +234,7 @@ fn reserve_transfer_native_asset_from_relay_to_system_para_fails() {
 	let receiver_balance_before = test.receiver.balance;
 
 	test.set_assertion::<Westend>(relay_origin_assertions);
-	test.set_assertion::<AssetHubWestend>(system_para_dest_assertions_incomplete);
+	test.set_assertion::<AssetHubWestend>(system_para_dest_assertions);
 	test.set_dispatchable::<Westend>(relay_reserve_transfer_assets);
 	test.assert();
 
@@ -353,6 +349,7 @@ fn limited_reserve_transfer_asset_from_system_para_to_para() {
 		ASSET_MIN_BALANCE,
 		true,
 		AssetHubWestendSender::get(),
+		Some(Weight::from_parts(1_019_445_000, 200_000)),
 		ASSET_MIN_BALANCE * 1000000,
 	);
 
@@ -388,6 +385,7 @@ fn reserve_transfer_asset_from_system_para_to_para() {
 		ASSET_MIN_BALANCE,
 		true,
 		AssetHubWestendSender::get(),
+		Some(Weight::from_parts(1_019_445_000, 200_000)),
 		ASSET_MIN_BALANCE * 1000000,
 	);
 
diff --git a/cumulus/parachains/integration-tests/emulated/assets/asset-hub-westend/src/tests/send.rs b/cumulus/parachains/integration-tests/emulated/assets/asset-hub-westend/src/tests/send.rs
index 87dfab93a5b5790d6bfcae39c7e300f10b893196..e603af685bb5c50ca4ab695ab8ccb588bb52edfd 100644
--- a/cumulus/parachains/integration-tests/emulated/assets/asset-hub-westend/src/tests/send.rs
+++ b/cumulus/parachains/integration-tests/emulated/assets/asset-hub-westend/src/tests/send.rs
@@ -1,142 +1,105 @@
-// Copyright 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/>.
+// 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.
 
 use crate::*;
 
 /// Relay Chain should be able to execute `Transact` instructions in System Parachain
-/// when `OriginKind::Superuser` and signer is `sudo`
+/// when `OriginKind::Superuser`.
 #[test]
-fn send_transact_sudo_from_relay_to_system_para_works() {
-	// Init tests variables
-	let root_origin = <Westend as Chain>::RuntimeOrigin::root();
-	let system_para_destination = Westend::child_location_of(AssetHubWestend::para_id()).into();
-	let asset_owner: AccountId = AssetHubWestendSender::get().into();
-	let xcm = AssetHubWestend::force_create_asset_xcm(
-		OriginKind::Superuser,
+fn send_transact_as_superuser_from_relay_to_system_para_works() {
+	AssetHubWestend::force_create_asset_from_relay_as_root(
 		ASSET_ID,
-		asset_owner.clone(),
+		ASSET_MIN_BALANCE,
 		true,
-		1000,
+		AssetHubWestendSender::get().into(),
+		Some(Weight::from_parts(1_019_445_000, 200_000)),
+	)
+}
+
+/// Parachain should be able to send XCM paying its fee with sufficient asset
+/// in the System Parachain
+#[test]
+fn send_xcm_from_para_to_system_para_paying_fee_with_assets_works() {
+	let para_sovereign_account = AssetHubWestend::sovereign_account_id_of(
+		AssetHubWestend::sibling_location_of(PenpalWestendA::para_id()),
+	);
+
+	// Force create and mint assets for Parachain's sovereign account
+	AssetHubWestend::force_create_and_mint_asset(
+		ASSET_ID,
+		ASSET_MIN_BALANCE,
+		true,
+		para_sovereign_account.clone(),
+		Some(Weight::from_parts(1_019_445_000, 200_000)),
+		ASSET_MIN_BALANCE * 1000000000,
+	);
+
+	// We just need a call that can pass the `SafeCallFilter`
+	// Call values are not relevant
+	let call = AssetHubWestend::force_create_asset_call(
+		ASSET_ID,
+		para_sovereign_account.clone(),
+		true,
+		ASSET_MIN_BALANCE,
+	);
+
+	let origin_kind = OriginKind::SovereignAccount;
+	let fee_amount = ASSET_MIN_BALANCE * 1000000;
+	let native_asset =
+		(X2(PalletInstance(ASSETS_PALLET_ID), GeneralIndex(ASSET_ID.into())), fee_amount).into();
+
+	let root_origin = <PenpalWestendA as Chain>::RuntimeOrigin::root();
+	let system_para_destination =
+		PenpalWestendA::sibling_location_of(AssetHubWestend::para_id()).into();
+	let xcm = xcm_transact_paid_execution(
+		call,
+		origin_kind,
+		native_asset,
+		para_sovereign_account.clone(),
 	);
-	// Send XCM message from Relay Chain
-	Westend::execute_with(|| {
-		assert_ok!(<Westend as WestendPallet>::XcmPallet::send(
+
+	PenpalWestendA::execute_with(|| {
+		assert_ok!(<PenpalWestendA as PenpalWestendAPallet>::PolkadotXcm::send(
 			root_origin,
 			bx!(system_para_destination),
 			bx!(xcm),
 		));
 
-		Westend::assert_xcm_pallet_sent();
+		PenpalWestendA::assert_xcm_pallet_sent();
 	});
 
-	// Receive XCM message in Assets Parachain
 	AssetHubWestend::execute_with(|| {
 		type RuntimeEvent = <AssetHubWestend as Chain>::RuntimeEvent;
 
-		AssetHubWestend::assert_dmp_queue_complete(Some(Weight::from_parts(
-			1_019_445_000,
-			200_000,
+		AssetHubWestend::assert_xcmp_queue_success(Some(Weight::from_parts(
+			16_290_336_000,
+			562_893,
 		)));
 
 		assert_expected_events!(
 			AssetHubWestend,
 			vec![
-				RuntimeEvent::Assets(pallet_assets::Event::ForceCreated { asset_id, owner }) => {
+				RuntimeEvent::Assets(pallet_assets::Event::Burned { asset_id, owner, balance }) => {
+					asset_id: *asset_id == ASSET_ID,
+					owner: *owner == para_sovereign_account,
+					balance: *balance == fee_amount,
+				},
+				RuntimeEvent::Assets(pallet_assets::Event::Issued { asset_id, .. }) => {
 					asset_id: *asset_id == ASSET_ID,
-					owner: *owner == asset_owner,
 				},
 			]
 		);
-
-		assert!(<AssetHubWestend as AssetHubWestendPallet>::Assets::asset_exists(ASSET_ID));
 	});
 }
-
-/// Parachain should be able to send XCM paying its fee with sufficient asset
-/// in the System Parachain
-#[test]
-#[ignore]
-fn send_xcm_from_para_to_system_para_paying_fee_with_assets_works() {
-	// let para_sovereign_account = AssetHubWestend::sovereign_account_id_of(
-	// 	AssetHubWestend::sibling_location_of(PenpalWestendA::para_id()),
-	// );
-
-	// // Force create and mint assets for Parachain's sovereign account
-	// AssetHubWestend::force_create_and_mint_asset(
-	// 	ASSET_ID,
-	// 	ASSET_MIN_BALANCE,
-	// 	true,
-	// 	para_sovereign_account.clone(),
-	// 	ASSET_MIN_BALANCE * 1000000000,
-	// );
-
-	// // We just need a call that can pass the `SafeCallFilter`
-	// // Call values are not relevant
-	// let call = AssetHubWestend::force_create_asset_call(
-	// 	ASSET_ID,
-	// 	para_sovereign_account.clone(),
-	// 	true,
-	// 	ASSET_MIN_BALANCE,
-	// );
-
-	// let origin_kind = OriginKind::SovereignAccount;
-	// let fee_amount = ASSET_MIN_BALANCE * 1000000;
-	// let native_asset =
-	// 	(X2(PalletInstance(ASSETS_PALLET_ID), GeneralIndex(ASSET_ID.into())), fee_amount).into();
-
-	// let root_origin = <PenpalWestendA as Chain>::RuntimeOrigin::root();
-	// let system_para_destination =
-	// 	PenpalWestendA::sibling_location_of(AssetHubWestend::para_id()).into();
-	// let xcm = xcm_transact_paid_execution(
-	// 	call,
-	// 	origin_kind,
-	// 	native_asset,
-	// 	para_sovereign_account.clone(),
-	// );
-
-	// PenpalWestendA::execute_with(|| {
-	// 	assert_ok!(<PenpalWestendA as PenpalWestendAPallet>::PolkadotXcm::send(
-	// 		root_origin,
-	// 		bx!(system_para_destination),
-	// 		bx!(xcm),
-	// 	));
-
-	// 	PenpalWestendA::assert_xcm_pallet_sent();
-	// });
-
-	// AssetHubWestend::execute_with(|| {
-	// 	type RuntimeEvent = <AssetHubWestend as Chain>::RuntimeEvent;
-
-	// 	AssetHubWestend::assert_xcmp_queue_success(Some(Weight::from_parts(
-	// 		2_176_414_000,
-	// 		203_593,
-	// 	)));
-
-	// 	assert_expected_events!(
-	// 		AssetHubWestend,
-	// 		vec![
-	// 			RuntimeEvent::Assets(pallet_assets::Event::Burned { asset_id, owner, balance }) => {
-	// 				asset_id: *asset_id == ASSET_ID,
-	// 				owner: *owner == para_sovereign_account,
-	// 				balance: *balance == fee_amount,
-	// 			},
-	// 			RuntimeEvent::Assets(pallet_assets::Event::Issued { asset_id, .. }) => {
-	// 				asset_id: *asset_id == ASSET_ID,
-	// 			},
-	// 		]
-	// 	);
-	// });
-}
diff --git a/cumulus/parachains/integration-tests/emulated/assets/asset-hub-westend/src/tests/set_xcm_versions.rs b/cumulus/parachains/integration-tests/emulated/assets/asset-hub-westend/src/tests/set_xcm_versions.rs
index 76e38083659edf13efeba34c288c55909647dbb7..2133d5e5fb7c7537ae757c30a8c6ba3b96cc9c00 100644
--- a/cumulus/parachains/integration-tests/emulated/assets/asset-hub-westend/src/tests/set_xcm_versions.rs
+++ b/cumulus/parachains/integration-tests/emulated/assets/asset-hub-westend/src/tests/set_xcm_versions.rs
@@ -1,18 +1,17 @@
-// Copyright Parity Technologies (UK) Ltd.
-// This file is part of Cumulus.
+// Copyright (C) Parity Technologies (UK) Ltd.
+// SPDX-License-Identifier: Apache-2.0
 
-// 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/>.
+// 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.
 
 use crate::*;
 
@@ -48,32 +47,22 @@ fn relay_sets_system_para_xcm_supported_version() {
 #[test]
 fn system_para_sets_relay_xcm_supported_version() {
 	// Init test variables
-	let sudo_origin = <Westend as Chain>::RuntimeOrigin::root();
 	let parent_location = AssetHubWestend::parent_location();
-	let system_para_destination: VersionedMultiLocation =
-		Westend::child_location_of(AssetHubWestend::para_id()).into();
-	let call = <AssetHubWestend as Chain>::RuntimeCall::PolkadotXcm(pallet_xcm::Call::<
-		<AssetHubWestend as Chain>::Runtime,
-	>::force_xcm_version {
-		location: bx!(parent_location),
-		version: XCM_V3,
-	})
-	.encode()
-	.into();
-	let origin_kind = OriginKind::Superuser;
-
-	let xcm = xcm_transact_unpaid_execution(call, origin_kind);
-
-	// System Parachain sets supported version for Relay Chain throught it
-	Westend::execute_with(|| {
-		assert_ok!(<Westend as WestendPallet>::XcmPallet::send(
-			sudo_origin,
-			bx!(system_para_destination),
-			bx!(xcm),
-		));
+	let force_xcm_version_call =
+		<AssetHubWestend as Chain>::RuntimeCall::PolkadotXcm(pallet_xcm::Call::<
+			<AssetHubWestend as Chain>::Runtime,
+		>::force_xcm_version {
+			location: bx!(parent_location),
+			version: XCM_V3,
+		})
+		.encode()
+		.into();
 
-		Westend::assert_xcm_pallet_sent();
-	});
+	// System Parachain sets supported version for Relay Chain through it
+	Westend::send_unpaid_transact_to_parachain_as_root(
+		AssetHubWestend::para_id(),
+		force_xcm_version_call,
+	);
 
 	// System Parachain receive the XCM message
 	AssetHubWestend::execute_with(|| {
diff --git a/cumulus/parachains/integration-tests/emulated/assets/asset-hub-westend/src/tests/swap.rs b/cumulus/parachains/integration-tests/emulated/assets/asset-hub-westend/src/tests/swap.rs
index 03ac75146089976b8a4402e3918caaa9789f8c39..7d1615c9e29182c97146ca46c966f0ae85991b11 100644
--- a/cumulus/parachains/integration-tests/emulated/assets/asset-hub-westend/src/tests/swap.rs
+++ b/cumulus/parachains/integration-tests/emulated/assets/asset-hub-westend/src/tests/swap.rs
@@ -1,3 +1,18 @@
+// 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.
+
 use crate::*;
 
 #[test]
@@ -155,11 +170,9 @@ fn swap_locally_on_chain_using_foreign_assets() {
 		.encode()
 		.into();
 
-	let buy_execution_fee_amount =
-		asset_hub_westend_runtime::constants::fee::WeightToFee::weight_to_fee(&Weight::from_parts(
-			10_100_000_000_000,
-			300_000,
-		));
+	let buy_execution_fee_amount = parachains_common::westend::fee::WeightToFee::weight_to_fee(
+		&Weight::from_parts(10_100_000_000_000, 300_000),
+	);
 	let buy_execution_fee = MultiAsset {
 		id: Concrete(MultiLocation { parents: 1, interior: Here }),
 		fun: Fungible(buy_execution_fee_amount),
diff --git a/cumulus/parachains/integration-tests/emulated/assets/asset-hub-westend/src/tests/teleport.rs b/cumulus/parachains/integration-tests/emulated/assets/asset-hub-westend/src/tests/teleport.rs
index 17f204f38077d65f8cfb8066d51b24f432f49192..81471c401f39637c7d53f95465f7e95ecf4bf8ba 100644
--- a/cumulus/parachains/integration-tests/emulated/assets/asset-hub-westend/src/tests/teleport.rs
+++ b/cumulus/parachains/integration-tests/emulated/assets/asset-hub-westend/src/tests/teleport.rs
@@ -1,18 +1,17 @@
-// Copyright Parity Technologies (UK) Ltd.
-// This file is part of Cumulus.
+// Copyright (C) Parity Technologies (UK) Ltd.
+// SPDX-License-Identifier: Apache-2.0
 
-// 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/>.
+// 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.
 
 #![allow(dead_code)] // <https://github.com/paritytech/cumulus/issues/3027>
 
@@ -98,7 +97,7 @@ fn para_origin_assertions(t: SystemParaToRelayTest) {
 fn para_dest_assertions(t: RelayToSystemParaTest) {
 	type RuntimeEvent = <AssetHubWestend as Chain>::RuntimeEvent;
 
-	AssetHubWestend::assert_dmp_queue_complete(Some(Weight::from_parts(164_733_000, 0)));
+	AssetHubWestend::assert_dmp_queue_complete(Some(Weight::from_parts(164_793_000, 3593)));
 
 	assert_expected_events!(
 		AssetHubWestend,
@@ -143,16 +142,15 @@ fn system_para_limited_teleport_assets(t: SystemParaToRelayTest) -> DispatchResu
 	)
 }
 
-// TODO: Uncomment when https://github.com/paritytech/polkadot/pull/7424 is merged
-// fn system_para_teleport_assets(t: SystemParaToRelayTest) -> DispatchResult {
-// 	<AssetHubWestend as AssetHubWestendPallet>::PolkadotXcm::teleport_assets(
-// 		t.signed_origin,
-// 		bx!(t.args.dest),
-// 		bx!(t.args.beneficiary),
-// 		bx!(t.args.assets),
-// 		t.args.fee_asset_item,
-// 	)
-// }
+fn system_para_teleport_assets(t: SystemParaToRelayTest) -> DispatchResult {
+	<AssetHubWestend as AssetHubWestendPallet>::PolkadotXcm::teleport_assets(
+		t.signed_origin,
+		bx!(t.args.dest.into()),
+		bx!(t.args.beneficiary.into()),
+		bx!(t.args.assets.into()),
+		t.args.fee_asset_item,
+	)
+}
 
 /// Limited Teleport of native asset from Relay Chain to the System Parachain should work
 #[test]
@@ -187,7 +185,6 @@ fn limited_teleport_native_assets_from_relay_to_system_para_works() {
 /// Limited Teleport of native asset from System Parachain to Relay Chain
 /// should work when there is enough balance in Relay Chain's `CheckAccount`
 #[test]
-#[cfg(feature = "FIXME-IGNORED")] // <https://github.com/paritytech/cumulus/issues/3027>
 fn limited_teleport_native_assets_back_from_system_para_to_relay_works() {
 	// Dependency - Relay Chain's `CheckAccount` should have enough balance
 	limited_teleport_native_assets_from_relay_to_system_para_works();
@@ -226,7 +223,6 @@ fn limited_teleport_native_assets_back_from_system_para_to_relay_works() {
 /// Limited Teleport of native asset from System Parachain to Relay Chain
 /// should't work when there is not enough balance in Relay Chain's `CheckAccount`
 #[test]
-#[cfg(feature = "FIXME-IGNORED")] // <https://github.com/paritytech/cumulus/issues/3027>
 fn limited_teleport_native_assets_from_system_para_to_relay_fails() {
 	// Init values for Relay Chain
 	let amount_to_send: Balance = ASSET_HUB_WESTEND_ED * 1000;
@@ -289,78 +285,89 @@ fn teleport_native_assets_from_relay_to_system_para_works() {
 	assert!(receiver_balance_after > receiver_balance_before);
 }
 
-// TODO: Uncomment when https://github.com/paritytech/polkadot/pull/7424 is merged
+/// Teleport of native asset from System Parachains to the Relay Chain
+/// should work when there is enough balance in Relay Chain's `CheckAccount`
+#[test]
+fn teleport_native_assets_back_from_system_para_to_relay_works() {
+	// Dependency - Relay Chain's `CheckAccount` should have enough balance
+	teleport_native_assets_from_relay_to_system_para_works();
 
-// Right now it is failing in the Relay Chain with a
-// `messageQueue.ProcessingFailed` event `error: Unsupported`.
-// The reason is the `Weigher` in `pallet_xcm` is not properly calculating the `remote_weight`
-// and it cause an `Overweight` error in `AllowTopLevelPaidExecutionFrom` barrier
+	// Init values for Relay Chain
+	let amount_to_send: Balance = ASSET_HUB_WESTEND_ED * 1000;
+	let destination = AssetHubWestend::parent_location();
+	let beneficiary_id = WestendReceiver::get();
+	let assets = (Parent, amount_to_send).into();
 
-// /// Teleport of native asset from System Parachains to the Relay Chain
-// /// should work when there is enough balance in Relay Chain's `CheckAccount`
-// #[test]
-// fn teleport_native_assets_back_from_system_para_to_relay_works() {
-// 	// Dependency - Relay Chain's `CheckAccount` should have enough balance
-// 	teleport_native_assets_from_relay_to_system_para_works();
-
-// 	// Init values for Relay Chain
-// 	let amount_to_send: Balance = ASSET_HUB_WESTEND_ED * 1000;
-// 	let test_args = TestContext {
-// 		sender: AssetHubWestendSender::get(),
-// 		receiver: WestendReceiver::get(),
-// 		args: get_para_dispatch_args(amount_to_send),
-// 	};
-
-// 	let mut test = SystemParaToRelayTest::new(test_args);
-
-// 	let sender_balance_before = test.sender.balance;
-// 	let receiver_balance_before = test.receiver.balance;
-
-// 	test.set_assertion::<AssetHubWestend>(para_origin_assertions);
-// 	test.set_assertion::<Westend>(relay_dest_assertions);
-// 	test.set_dispatchable::<AssetHubWestend>(system_para_teleport_assets);
-// 	test.assert();
-
-// 	let sender_balance_after = test.sender.balance;
-// 	let receiver_balance_after = test.receiver.balance;
-
-// 	// Sender's balance is reduced
-// 	assert_eq!(sender_balance_before - amount_to_send, sender_balance_after);
-// 	// Receiver's balance is increased
-// 	assert!(receiver_balance_after > receiver_balance_before);
-// }
+	let test_args = TestContext {
+		sender: AssetHubWestendSender::get(),
+		receiver: WestendReceiver::get(),
+		args: system_para_test_args(destination, beneficiary_id, amount_to_send, assets, None),
+	};
+
+	let mut test = SystemParaToRelayTest::new(test_args);
+
+	let sender_balance_before = test.sender.balance;
+	let receiver_balance_before = test.receiver.balance;
+
+	test.set_assertion::<AssetHubWestend>(para_origin_assertions);
+	test.set_assertion::<Westend>(relay_dest_assertions);
+	test.set_dispatchable::<AssetHubWestend>(system_para_teleport_assets);
+	test.assert();
+
+	let sender_balance_after = test.sender.balance;
+	let receiver_balance_after = test.receiver.balance;
 
-// /// Teleport of native asset from System Parachain to Relay Chain
-// /// shouldn't work when there is not enough balance in Relay Chain's `CheckAccount`
+	// Sender's balance is reduced
+	assert_eq!(sender_balance_before - amount_to_send, sender_balance_after);
+	// Receiver's balance is increased
+	assert!(receiver_balance_after > receiver_balance_before);
+}
+
+/// Teleport of native asset from System Parachain to Relay Chain
+/// shouldn't work when there is not enough balance in Relay Chain's `CheckAccount`
+#[test]
+fn teleport_native_assets_from_system_para_to_relay_fails() {
+	// Init values for Relay Chain
+	let amount_to_send: Balance = ASSET_HUB_WESTEND_ED * 1000;
+	let destination = AssetHubWestend::parent_location();
+	let beneficiary_id = WestendReceiver::get();
+	let assets = (Parent, amount_to_send).into();
+
+	let test_args = TestContext {
+		sender: AssetHubWestendSender::get(),
+		receiver: WestendReceiver::get(),
+		args: system_para_test_args(destination, beneficiary_id, amount_to_send, assets, None),
+	};
+
+	let mut test = SystemParaToRelayTest::new(test_args);
+
+	let sender_balance_before = test.sender.balance;
+	let receiver_balance_before = test.receiver.balance;
+
+	test.set_assertion::<AssetHubWestend>(para_origin_assertions);
+	test.set_assertion::<Westend>(relay_dest_assertions_fail);
+	test.set_dispatchable::<AssetHubWestend>(system_para_teleport_assets);
+	test.assert();
+
+	let sender_balance_after = test.sender.balance;
+	let receiver_balance_after = test.receiver.balance;
+
+	// Sender's balance is reduced
+	assert_eq!(sender_balance_before - amount_to_send, sender_balance_after);
+	// Receiver's balance does not change
+	assert_eq!(receiver_balance_after, receiver_balance_before);
+}
+
+// TODO: uncomment when CollectivesWestend and BridgeHubWestend are implemented
+// https://github.com/paritytech/polkadot-sdk/pull/1737 (CollectivesWestend)
 // #[test]
-// fn teleport_native_assets_from_system_para_to_relay_fails() {
-// 	// Init values for Relay Chain
-// 	let amount_to_send: Balance = ASSET_HUB_WESTEND_ED * 1000;
-//  let assets = (Parent, amount_to_send).into();
-//
-// 	let test_args = TestContext {
-// 		sender: AssetHubWestendSender::get(),
-// 		receiver: WestendReceiver::get(),
-// 		args: system_para_test_args(amount_to_send),
-//      assets,
-//      None
-// 	};
-
-// 	let mut test = SystemParaToRelayTest::new(test_args);
-
-// 	let sender_balance_before = test.sender.balance;
-// 	let receiver_balance_before = test.receiver.balance;
-
-// 	test.set_assertion::<AssetHubWestend>(para_origin_assertions);
-// 	test.set_assertion::<Westend>(relay_dest_assertions);
-// 	test.set_dispatchable::<AssetHubWestend>(system_para_teleport_assets);
-// 	test.assert();
-
-// 	let sender_balance_after = test.sender.balance;
-// 	let receiver_balance_after = test.receiver.balance;
-
-// 	// Sender's balance is reduced
-// 	assert_eq!(sender_balance_before - amount_to_send, sender_balance_after);
-// 	// Receiver's balance does not change
-// 	assert_eq!(receiver_balance_after, receiver_balance_before);
+// fn teleport_to_other_system_parachains_works() {
+// 	let amount = ASSET_HUB_WESTEND_ED * 100;
+// 	let native_asset: VersionedMultiAssets = (Parent, amount).into();
+
+// 	test_parachain_is_trusted_teleporter!(
+// 		AssetHubWestend,                            // Origin
+// 		vec![CollectivesWestend, BridgeHubWestend], // Destinations
+// 		(native_asset, amount)
+// 	);
 // }
diff --git a/cumulus/parachains/integration-tests/emulated/assets/asset-hub-westend/src/tests/treasury.rs b/cumulus/parachains/integration-tests/emulated/assets/asset-hub-westend/src/tests/treasury.rs
new file mode 100644
index 0000000000000000000000000000000000000000..cf06f58682da2d8dfb626305a9e8f0aff7b48804
--- /dev/null
+++ b/cumulus/parachains/integration-tests/emulated/assets/asset-hub-westend/src/tests/treasury.rs
@@ -0,0 +1,126 @@
+// 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.
+
+use crate::*;
+use frame_support::traits::fungibles::{Create, Inspect, Mutate};
+use integration_tests_common::constants::accounts::{ALICE, BOB};
+use polkadot_runtime_common::impls::VersionedLocatableAsset;
+use xcm_executor::traits::ConvertLocation;
+
+#[test]
+fn create_and_claim_treasury_spend() {
+	const ASSET_ID: u32 = 1984;
+	const SPEND_AMOUNT: u128 = 1_000_000;
+	// treasury location from a sibling parachain.
+	let treasury_location: MultiLocation = MultiLocation::new(1, PalletInstance(37));
+	// treasury account on a sibling parachain.
+	let treasury_account =
+		asset_hub_westend_runtime::xcm_config::LocationToAccountId::convert_location(
+			&treasury_location,
+		)
+		.unwrap();
+	let asset_hub_location = MultiLocation::new(0, Parachain(AssetHubWestend::para_id().into()));
+	let root = <Westend as Chain>::RuntimeOrigin::root();
+	// asset kind to be spend from the treasury.
+	let asset_kind = VersionedLocatableAsset::V3 {
+		location: asset_hub_location,
+		asset_id: AssetId::Concrete((PalletInstance(50), GeneralIndex(ASSET_ID.into())).into()),
+	};
+	// treasury spend beneficiary.
+	let alice: AccountId = Westend::account_id_of(ALICE);
+	let bob: AccountId = Westend::account_id_of(BOB);
+	let bob_signed = <Westend as Chain>::RuntimeOrigin::signed(bob.clone());
+
+	AssetHubWestend::execute_with(|| {
+		type Assets = <AssetHubWestend as AssetHubWestendPallet>::Assets;
+
+		// create an asset class and mint some assets to the treasury account.
+		assert_ok!(<Assets as Create<_>>::create(
+			ASSET_ID,
+			treasury_account.clone(),
+			true,
+			SPEND_AMOUNT / 2
+		));
+		assert_ok!(<Assets as Mutate<_>>::mint_into(ASSET_ID, &treasury_account, SPEND_AMOUNT * 4));
+		// beneficiary has zero balance.
+		assert_eq!(<Assets as Inspect<_>>::balance(ASSET_ID, &alice,), 0u128,);
+	});
+
+	Westend::execute_with(|| {
+		type RuntimeEvent = <Westend as Chain>::RuntimeEvent;
+		type Treasury = <Westend as WestendPallet>::Treasury;
+		type AssetRate = <Westend as WestendPallet>::AssetRate;
+
+		// create a conversion rate from `asset_kind` to the native currency.
+		assert_ok!(AssetRate::create(root.clone(), Box::new(asset_kind.clone()), 2.into()));
+
+		// create and approve a treasury spend.
+		assert_ok!(Treasury::spend(
+			root,
+			Box::new(asset_kind),
+			SPEND_AMOUNT,
+			Box::new(MultiLocation::new(0, Into::<[u8; 32]>::into(alice.clone())).into()),
+			None,
+		));
+		// claim the spend.
+		assert_ok!(Treasury::payout(bob_signed.clone(), 0));
+
+		assert_expected_events!(
+			Westend,
+			vec![
+				RuntimeEvent::Treasury(pallet_treasury::Event::Paid { .. }) => {},
+			]
+		);
+	});
+
+	AssetHubWestend::execute_with(|| {
+		type RuntimeEvent = <AssetHubWestend as Chain>::RuntimeEvent;
+		type Assets = <AssetHubWestend as AssetHubWestendPallet>::Assets;
+
+		// assert events triggered by xcm pay program
+		// 1. treasury asset transferred to spend beneficiary
+		// 2. response to Relay Chain treasury pallet instance sent back
+		// 3. XCM program completed
+		assert_expected_events!(
+			AssetHubWestend,
+			vec![
+				RuntimeEvent::Assets(pallet_assets::Event::Transferred { asset_id: id, from, to, amount }) => {
+					id: id == &ASSET_ID,
+					from: from == &treasury_account,
+					to: to == &alice,
+					amount: amount == &SPEND_AMOUNT,
+				},
+				RuntimeEvent::ParachainSystem(cumulus_pallet_parachain_system::Event::UpwardMessageSent { .. }) => {},
+				RuntimeEvent::DmpQueue(cumulus_pallet_dmp_queue::Event::ExecutedDownward { outcome: Outcome::Complete(..) ,.. }) => {},
+			]
+		);
+		// beneficiary received the assets from the treasury.
+		assert_eq!(<Assets as Inspect<_>>::balance(ASSET_ID, &alice,), SPEND_AMOUNT,);
+	});
+
+	Westend::execute_with(|| {
+		type RuntimeEvent = <Westend as Chain>::RuntimeEvent;
+		type Treasury = <Westend as WestendPallet>::Treasury;
+
+		// check the payment status to ensure the response from the AssetHub was received.
+		assert_ok!(Treasury::check_status(bob_signed, 0));
+		assert_expected_events!(
+			Westend,
+			vec![
+				RuntimeEvent::Treasury(pallet_treasury::Event::SpendProcessed { .. }) => {},
+			]
+		);
+	});
+}
diff --git a/cumulus/parachains/integration-tests/emulated/bridges/bridge-hub-rococo/Cargo.toml b/cumulus/parachains/integration-tests/emulated/bridges/bridge-hub-rococo/Cargo.toml
index fb3905c3c739ac61559b2844a36255efd8deae8a..7ecf87158241d443c9592e9da85a82dd6eb26729 100644
--- a/cumulus/parachains/integration-tests/emulated/bridges/bridge-hub-rococo/Cargo.toml
+++ b/cumulus/parachains/integration-tests/emulated/bridges/bridge-hub-rococo/Cargo.toml
@@ -1,37 +1,31 @@
 [package]
 name = "bridge-hub-rococo-integration-tests"
 version = "1.0.0"
-authors = ["Parity Technologies <admin@parity.io>"]
-edition = "2021"
+authors.workspace = true
+edition.workspace = true
+license = "Apache-2.0"
 description = "Bridge Hub Rococo runtime integration tests with xcm-emulator"
+publish = false
 
 [dependencies]
 codec = { package = "parity-scale-codec", version = "3.4.0", default-features = false }
 
 # Substrate
-sp-runtime = { path = "../../../../../../substrate/primitives/runtime", default-features = false}
 frame-support = { path = "../../../../../../substrate/frame/support", default-features = false}
-frame-system = { path = "../../../../../../substrate/frame/system", default-features = false}
-sp-core = { path = "../../../../../../substrate/primitives/core", default-features = false}
-sp-weights = { path = "../../../../../../substrate/primitives/weights", default-features = false}
-pallet-balances = { path = "../../../../../../substrate/frame/balances", default-features = false}
-pallet-assets = { path = "../../../../../../substrate/frame/assets", default-features = false}
 
 # Polkadot
 polkadot-core-primitives = { path = "../../../../../../polkadot/core-primitives", default-features = false}
-polkadot-parachain = { path = "../../../../../../polkadot/parachain", default-features = false}
+polkadot-parachain-primitives = { path = "../../../../../../polkadot/parachain", default-features = false}
 polkadot-runtime-parachains = { path = "../../../../../../polkadot/runtime/parachains" }
-polkadot-runtime = { path = "../../../../../../polkadot/runtime/polkadot" }
-xcm = { path = "../../../../../../polkadot/xcm", default-features = false}
-xcm-executor = { path = "../../../../../../polkadot/xcm/xcm-executor", default-features = false}
+xcm = { package = "staging-xcm", path = "../../../../../../polkadot/xcm", default-features = false}
 pallet-xcm = { path = "../../../../../../polkadot/xcm/pallet-xcm", default-features = false}
 
 # Cumulus
 parachains-common = { path = "../../../../common" }
 cumulus-pallet-xcmp-queue = { path = "../../../../../pallets/xcmp-queue", default-features = false}
-cumulus-pallet-parachain-system = { path = "../../../../../pallets/parachain-system" }
-pallet-bridge-messages = { path = "../../../../../bridges/modules/messages", default-features = false}
-bp-messages = { path = "../../../../../bridges/primitives/messages", default-features = false}
+cumulus-pallet-dmp-queue = { path = "../../../../../pallets/dmp-queue", default-features = false}
+pallet-bridge-messages = { path = "../../../../../../bridges/modules/messages", default-features = false}
+bp-messages = { path = "../../../../../../bridges/primitives/messages", default-features = false}
 
 # Local
 xcm-emulator = { path = "../../../../../xcm/xcm-emulator", default-features = false}
diff --git a/cumulus/parachains/integration-tests/emulated/bridges/bridge-hub-rococo/src/lib.rs b/cumulus/parachains/integration-tests/emulated/bridges/bridge-hub-rococo/src/lib.rs
index 2a4927d857c366a513307585620c8586e1d9f8e0..3c4dbe18a9ac42d126efb3c999645f926a521483 100644
--- a/cumulus/parachains/integration-tests/emulated/bridges/bridge-hub-rococo/src/lib.rs
+++ b/cumulus/parachains/integration-tests/emulated/bridges/bridge-hub-rococo/src/lib.rs
@@ -1,62 +1,41 @@
-// Copyright Parity Technologies (UK) Ltd.
-// This file is part of Cumulus.
+// Copyright (C) Parity Technologies (UK) Ltd.
+// SPDX-License-Identifier: Apache-2.0
 
-// 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/>.
+// Licensed under the Apache License, Version 2.0 (the "License");
+// you may not use this file except in compliance with the License.
+// You may obtain a copy of the License at
+//
+// 	http://www.apache.org/licenses/LICENSE-2.0
+//
+// Unless required by applicable law or agreed to in writing, software
+// distributed under the License is distributed on an "AS IS" BASIS,
+// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+// See the License for the specific language governing permissions and
+// limitations under the License.
 
 pub use bp_messages::LaneId;
-pub use codec::Encode;
-pub use frame_support::{
-	assert_err, assert_ok,
-	instances::Instance1,
-	pallet_prelude::Weight,
-	sp_runtime::{AccountId32, DispatchError, DispatchResult, MultiAddress},
-	traits::{fungibles::Inspect, OriginTrait},
-};
+pub use frame_support::assert_ok;
 pub use integration_tests_common::{
 	constants::{
-		accounts::{ALICE, BOB},
-		asset_hub_kusama::ED as ASSET_HUB_ROCOCO_ED,
-		kusama::ED as ROCOCO_ED,
+		bridge_hub_rococo::ED as BRIDGE_HUB_ROCOCO_ED, rococo::ED as ROCOCO_ED,
 		PROOF_SIZE_THRESHOLD, REF_TIME_THRESHOLD, XCM_V3,
 	},
-	lazy_static::lazy_static,
-	xcm_transact_paid_execution, xcm_transact_unpaid_execution, AssetHubRococo,
-	AssetHubRococoPallet, AssetHubRococoReceiver, AssetHubRococoSender, AssetHubWococo,
-	AssetHubWococoPallet, AssetHubWococoReceiver, AssetHubWococoSender, BridgeHubRococo,
-	BridgeHubRococoPallet, BridgeHubRococoReceiver, BridgeHubRococoSender, BridgeHubWococo,
-	BridgeHubWococoPallet, BridgeHubWococoReceiver, BridgeHubWococoSender, Collectives,
-	CollectivesPallet, CollectivesReceiver, CollectivesSender, PenpalRococoA, PenpalRococoAPallet,
-	PenpalRococoAReceiver, PenpalRococoASender, Rococo, RococoMockNet, RococoPallet,
-	RococoReceiver, RococoSender, Wococo, WococoMockNet, WococoPallet, WococoReceiver,
-	WococoSender,
+	test_parachain_is_trusted_teleporter,
+	xcm_helpers::{xcm_transact_paid_execution, xcm_transact_unpaid_execution},
+	AssetHubRococo, AssetHubRococoReceiver, AssetHubWococo, BridgeHubRococo, BridgeHubRococoPallet,
+	BridgeHubRococoSender, BridgeHubWococo, PenpalRococoA, Rococo, RococoPallet,
 };
 pub use parachains_common::{AccountId, Balance};
-pub use polkadot_core_primitives::InboundDownwardMessage;
-pub use polkadot_parachain::primitives::{HrmpChannelId, Id};
-pub use polkadot_runtime_parachains::inclusion::{AggregateMessageOrigin, UmpQueueId};
 pub use xcm::{
-	prelude::*,
+	prelude::{AccountId32 as AccountId32Junction, *},
 	v3::{
 		Error,
 		NetworkId::{Rococo as RococoId, Wococo as WococoId},
 	},
-	DoubleEncoded,
 };
 pub use xcm_emulator::{
-	assert_expected_events, bx, cumulus_pallet_dmp_queue, helpers::weight_within_threshold,
-	AccountId32Junction, Chain, ParaId, Parachain as Para, RelayChain as Relay, Test, TestArgs,
-	TestContext, TestExt, TestExternalities,
+	assert_expected_events, bx, helpers::weight_within_threshold, Chain, Parachain as Para,
+	RelayChain as Relay, Test, TestArgs, TestContext, TestExt,
 };
 
 pub const ASSET_ID: u32 = 1;
diff --git a/cumulus/parachains/integration-tests/emulated/bridges/bridge-hub-rococo/src/tests/example.rs b/cumulus/parachains/integration-tests/emulated/bridges/bridge-hub-rococo/src/tests/example.rs
index 1293f65929a886b02d7d2080c12ea009dc15a13d..f24e13bb71b875d8d68be161e5dc833198f93c39 100644
--- a/cumulus/parachains/integration-tests/emulated/bridges/bridge-hub-rococo/src/tests/example.rs
+++ b/cumulus/parachains/integration-tests/emulated/bridges/bridge-hub-rococo/src/tests/example.rs
@@ -1,98 +1,98 @@
-// Copyright Parity Technologies (UK) Ltd.
-// This file is part of Cumulus.
+// Copyright (C) Parity Technologies (UK) Ltd.
+// SPDX-License-Identifier: Apache-2.0
 
-// 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.
+// 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.
 
-// 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/>.
+use crate::*;
 
 #[test]
-#[ignore]
 fn example() {
-	// // Init tests variables
-	// // XcmPallet send arguments
-	// let sudo_origin = <Rococo as Chain>::RuntimeOrigin::root();
-	// let destination = Rococo::child_location_of(BridgeHubRococo::para_id()).into();
-	// let weight_limit = WeightLimit::Unlimited;
-	// let check_origin = None;
+	// Init tests variables
+	// XcmPallet send arguments
+	let sudo_origin = <Rococo as Chain>::RuntimeOrigin::root();
+	let destination = Rococo::child_location_of(BridgeHubRococo::para_id()).into();
+	let weight_limit = WeightLimit::Unlimited;
+	let check_origin = None;
 
-	// let remote_xcm = Xcm(vec![ClearOrigin]);
+	let remote_xcm = Xcm(vec![ClearOrigin]);
 
-	// let xcm = VersionedXcm::from(Xcm(vec![
-	// 	UnpaidExecution { weight_limit, check_origin },
-	// 	ExportMessage {
-	// 		network: WococoId,
-	// 		destination: X1(Parachain(AssetHubWococo::para_id().into())),
-	// 		xcm: remote_xcm,
-	// 	},
-	// ]));
+	let xcm = VersionedXcm::from(Xcm(vec![
+		UnpaidExecution { weight_limit, check_origin },
+		ExportMessage {
+			network: WococoId,
+			destination: X1(Parachain(AssetHubWococo::para_id().into())),
+			xcm: remote_xcm,
+		},
+	]));
 
-	// //Rococo Global Consensus
-	// // Send XCM message from Relay Chain to Bridge Hub source Parachain
-	// Rococo::execute_with(|| {
-	// 	assert_ok!(<Rococo as RococoPallet>::XcmPallet::send(
-	// 		sudo_origin,
-	// 		bx!(destination),
-	// 		bx!(xcm),
-	// 	));
+	//Rococo Global Consensus
+	// Send XCM message from Relay Chain to Bridge Hub source Parachain
+	Rococo::execute_with(|| {
+		assert_ok!(<Rococo as RococoPallet>::XcmPallet::send(
+			sudo_origin,
+			bx!(destination),
+			bx!(xcm),
+		));
 
-	// 	type RuntimeEvent = <Rococo as Chain>::RuntimeEvent;
+		type RuntimeEvent = <Rococo as Chain>::RuntimeEvent;
 
-	// 	assert_expected_events!(
-	// 		Rococo,
-	// 		vec![
-	// 			RuntimeEvent::XcmPallet(pallet_xcm::Event::Sent { .. }) => {},
-	// 		]
-	// 	);
-	// });
-	// // Receive XCM message in Bridge Hub source Parachain
-	// BridgeHubRococo::execute_with(|| {
-	// 	type RuntimeEvent = <BridgeHubRococo as Chain>::RuntimeEvent;
+		assert_expected_events!(
+			Rococo,
+			vec![
+				RuntimeEvent::XcmPallet(pallet_xcm::Event::Sent { .. }) => {},
+			]
+		);
+	});
+	// Receive XCM message in Bridge Hub source Parachain
+	BridgeHubRococo::execute_with(|| {
+		type RuntimeEvent = <BridgeHubRococo as Chain>::RuntimeEvent;
 
-	// 	assert_expected_events!(
-	// 		BridgeHubRococo,
-	// 		vec![
-	// 			RuntimeEvent::DmpQueue(cumulus_pallet_dmp_queue::Event::ExecutedDownward {
-	// 				outcome: Outcome::Complete(_),
-	// 				..
-	// 			}) => {},
-	// 			RuntimeEvent::BridgeWococoMessages(pallet_bridge_messages::Event::MessageAccepted {
-	// 				lane_id: LaneId([0, 0, 0, 1]),
-	// 				nonce: 1,
-	// 			}) => {},
-	// 		]
-	// 	);
-	// });
+		assert_expected_events!(
+			BridgeHubRococo,
+			vec![
+				RuntimeEvent::DmpQueue(cumulus_pallet_dmp_queue::Event::ExecutedDownward {
+					outcome: Outcome::Complete(_),
+					..
+				}) => {},
+				RuntimeEvent::BridgeWococoMessages(pallet_bridge_messages::Event::MessageAccepted {
+					lane_id: LaneId([0, 0, 0, 1]),
+					nonce: 1,
+				}) => {},
+			]
+		);
+	});
 
-	// // Wococo GLobal Consensus
-	// // Receive XCM message in Bridge Hub target Parachain
-	// BridgeHubWococo::execute_with(|| {
-	// 	type RuntimeEvent = <BridgeHubWococo as Chain>::RuntimeEvent;
+	// Wococo GLobal Consensus
+	// Receive XCM message in Bridge Hub target Parachain
+	BridgeHubWococo::execute_with(|| {
+		type RuntimeEvent = <BridgeHubWococo as Chain>::RuntimeEvent;
 
-	// 	assert_expected_events!(
-	// 		BridgeHubWococo,
-	// 		vec![
-	// 			RuntimeEvent::XcmpQueue(cumulus_pallet_xcmp_queue::Event::XcmpMessageSent { .. }) => {},
-	// 		]
-	// 	);
-	// });
-	// // Receive embeded XCM message within `ExportMessage` in Parachain destination
-	// AssetHubWococo::execute_with(|| {
-	// 	type RuntimeEvent = <AssetHubWococo as Chain>::RuntimeEvent;
+		assert_expected_events!(
+			BridgeHubWococo,
+			vec![
+				RuntimeEvent::XcmpQueue(cumulus_pallet_xcmp_queue::Event::XcmpMessageSent { .. }) => {},
+			]
+		);
+	});
+	// Receive embeded XCM message within `ExportMessage` in Parachain destination
+	AssetHubWococo::execute_with(|| {
+		type RuntimeEvent = <AssetHubWococo as Chain>::RuntimeEvent;
 
-	// 	assert_expected_events!(
-	// 		AssetHubWococo,
-	// 		vec![
-	// 			RuntimeEvent::XcmpQueue(cumulus_pallet_xcmp_queue::Event::Fail { .. }) => {},
-	// 		]
-	// 	);
-	// });
+		assert_expected_events!(
+			AssetHubWococo,
+			vec![
+				RuntimeEvent::XcmpQueue(cumulus_pallet_xcmp_queue::Event::Fail { .. }) => {},
+			]
+		);
+	});
 }
diff --git a/cumulus/parachains/integration-tests/emulated/bridges/bridge-hub-rococo/src/tests/mod.rs b/cumulus/parachains/integration-tests/emulated/bridges/bridge-hub-rococo/src/tests/mod.rs
index 532e31aa1a67464f501932db1c6684afbb31bb48..1eef05c6b9281e26d3e412f4aac8b9e265d2d5c0 100644
--- a/cumulus/parachains/integration-tests/emulated/bridges/bridge-hub-rococo/src/tests/mod.rs
+++ b/cumulus/parachains/integration-tests/emulated/bridges/bridge-hub-rococo/src/tests/mod.rs
@@ -1,17 +1,17 @@
-// Copyright Parity Technologies (UK) Ltd.
-// This file is part of Cumulus.
+// Copyright (C) Parity Technologies (UK) Ltd.
+// SPDX-License-Identifier: Apache-2.0
 
-// 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/>.
+// 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.
 
 mod example;
+mod teleport;
diff --git a/cumulus/parachains/integration-tests/emulated/bridges/bridge-hub-rococo/src/tests/teleport.rs b/cumulus/parachains/integration-tests/emulated/bridges/bridge-hub-rococo/src/tests/teleport.rs
new file mode 100644
index 0000000000000000000000000000000000000000..4c7e37fab6230acaae461da20fda9c4d1a9bcefd
--- /dev/null
+++ b/cumulus/parachains/integration-tests/emulated/bridges/bridge-hub-rococo/src/tests/teleport.rs
@@ -0,0 +1,28 @@
+// 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.
+
+use crate::*;
+
+#[test]
+fn teleport_to_other_system_parachains_works() {
+	let amount = BRIDGE_HUB_ROCOCO_ED * 100;
+	let native_asset: VersionedMultiAssets = (Parent, amount).into();
+
+	test_parachain_is_trusted_teleporter!(
+		BridgeHubRococo,      // Origin
+		vec![AssetHubRococo], // Destinations
+		(native_asset, amount)
+	);
+}
diff --git a/cumulus/parachains/integration-tests/emulated/collectives/collectives-polkadot/Cargo.toml b/cumulus/parachains/integration-tests/emulated/collectives/collectives-polkadot/Cargo.toml
deleted file mode 100644
index cee67639e27f35810ed2bd19edac3b1d2eddfe53..0000000000000000000000000000000000000000
--- a/cumulus/parachains/integration-tests/emulated/collectives/collectives-polkadot/Cargo.toml
+++ /dev/null
@@ -1,40 +0,0 @@
-[package]
-name = "collectives-polkadot-integration-tests"
-version = "0.1.0"
-authors = ["Parity Technologies <admin@parity.io>"]
-edition = "2021"
-description = "Polkadot Collectives parachain runtime integration tests based on xcm-emulator"
-
-[dependencies]
-codec = { package = "parity-scale-codec", version = "3.4.0", default-features = false }
-
-# Substrate
-sp-runtime = { path = "../../../../../../substrate/primitives/runtime", default-features = false}
-frame-support = { path = "../../../../../../substrate/frame/support", default-features = false}
-frame-system = { path = "../../../../../../substrate/frame/system", default-features = false}
-sp-core = { path = "../../../../../../substrate/primitives/core", default-features = false}
-sp-weights = { path = "../../../../../../substrate/primitives/weights", default-features = false}
-pallet-balances = { path = "../../../../../../substrate/frame/balances", default-features = false}
-pallet-assets = { path = "../../../../../../substrate/frame/assets", default-features = false}
-pallet-core-fellowship = { path = "../../../../../../substrate/frame/core-fellowship", default-features = false}
-pallet-salary = { path = "../../../../../../substrate/frame/salary", default-features = false}
-
-# Polkadot
-polkadot-core-primitives = { path = "../../../../../../polkadot/core-primitives", default-features = false}
-polkadot-parachain = { path = "../../../../../../polkadot/parachain", default-features = false}
-polkadot-runtime-parachains = { path = "../../../../../../polkadot/runtime/parachains" }
-polkadot-runtime = { path = "../../../../../../polkadot/runtime/polkadot" }
-xcm = { path = "../../../../../../polkadot/xcm", default-features = false}
-xcm-executor = { path = "../../../../../../polkadot/xcm/xcm-executor", default-features = false}
-pallet-xcm = { path = "../../../../../../polkadot/xcm/pallet-xcm", default-features = false}
-
-# Cumulus
-parachains-common = { path = "../../../../common" }
-cumulus-pallet-xcmp-queue = { path = "../../../../../pallets/xcmp-queue", default-features = false}
-cumulus-pallet-parachain-system = { path = "../../../../../pallets/parachain-system" }
-collectives-polkadot-runtime = { path = "../../../../runtimes/collectives/collectives-polkadot" }
-asset-hub-polkadot-runtime = { path = "../../../../runtimes/assets/asset-hub-polkadot" }
-
-# Local
-xcm-emulator = { path = "../../../../../xcm/xcm-emulator", default-features = false}
-integration-tests-common = { path = "../../common", default-features = false}
diff --git a/cumulus/parachains/integration-tests/emulated/collectives/collectives-polkadot/src/lib.rs b/cumulus/parachains/integration-tests/emulated/collectives/collectives-polkadot/src/lib.rs
deleted file mode 100644
index b71ee65a22217c0ffc524f14fc5e90d9ce37e5b9..0000000000000000000000000000000000000000
--- a/cumulus/parachains/integration-tests/emulated/collectives/collectives-polkadot/src/lib.rs
+++ /dev/null
@@ -1,101 +0,0 @@
-// Copyright 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/>.
-
-pub use codec::Encode;
-pub use frame_support::{
-	assert_err, assert_ok,
-	instances::Instance1,
-	pallet_prelude::Weight,
-	sp_runtime::{AccountId32, DispatchError, DispatchResult, MultiAddress},
-	traits::{fungibles::Inspect, OriginTrait},
-};
-pub use integration_tests_common::{
-	constants::{
-		accounts::{ALICE, BOB},
-		asset_hub_polkadot::ED as ASSET_HUB_POLKADOT_ED,
-		polkadot::ED as POLKADOT_ED,
-		PROOF_SIZE_THRESHOLD, REF_TIME_THRESHOLD, XCM_V3,
-	},
-	lazy_static::lazy_static,
-	xcm_transact_paid_execution, xcm_transact_unpaid_execution, AssetHubPolkadot,
-	AssetHubPolkadotPallet, AssetHubPolkadotReceiver, AssetHubPolkadotSender, BridgeHubPolkadot,
-	BridgeHubPolkadotPallet, BridgeHubPolkadotReceiver, BridgeHubPolkadotSender, Collectives,
-	CollectivesPallet, CollectivesReceiver, CollectivesSender, PenpalPolkadotA,
-	PenpalPolkadotAPallet, PenpalPolkadotAReceiver, PenpalPolkadotASender, PenpalPolkadotB,
-	PenpalPolkadotBPallet, PenpalPolkadotBReceiver, PenpalPolkadotBSender, Polkadot,
-	PolkadotMockNet, PolkadotPallet, PolkadotReceiver, PolkadotSender,
-};
-pub use parachains_common::{AccountId, Balance};
-pub use polkadot_core_primitives::InboundDownwardMessage;
-pub use polkadot_parachain::primitives::{HrmpChannelId, Id};
-pub use polkadot_runtime_parachains::inclusion::{AggregateMessageOrigin, UmpQueueId};
-pub use xcm::{
-	prelude::*,
-	v3::{Error, NetworkId::Polkadot as PolkadotId},
-	DoubleEncoded,
-};
-pub use xcm_emulator::{
-	assert_expected_events, bx, cumulus_pallet_dmp_queue, helpers::weight_within_threshold,
-	AccountId32Junction, Chain, ParaId, Parachain as Para, RelayChain as Relay, Test, TestArgs,
-	TestContext, TestExt, TestExternalities,
-};
-
-pub const ASSET_ID: u32 = 1;
-pub const ASSET_MIN_BALANCE: u128 = 1000;
-pub const ASSETS_PALLET_ID: u8 = 50;
-
-pub type RelayToSystemParaTest = Test<Polkadot, AssetHubPolkadot>;
-pub type SystemParaToRelayTest = Test<AssetHubPolkadot, Polkadot>;
-pub type SystemParaToParaTest = Test<AssetHubPolkadot, PenpalPolkadotA>;
-
-/// Returns a `TestArgs` instance to de used for the Relay Chain accross integraton tests
-pub fn relay_test_args(amount: Balance) -> TestArgs {
-	TestArgs {
-		dest: Polkadot::child_location_of(AssetHubPolkadot::para_id()),
-		beneficiary: AccountId32Junction {
-			network: None,
-			id: AssetHubPolkadotReceiver::get().into(),
-		}
-		.into(),
-		amount,
-		assets: (Here, amount).into(),
-		asset_id: None,
-		fee_asset_item: 0,
-		weight_limit: WeightLimit::Unlimited,
-	}
-}
-
-/// Returns a `TestArgs` instance to de used for the System Parachain accross integraton tests
-pub fn system_para_test_args(
-	dest: MultiLocation,
-	beneficiary_id: AccountId32,
-	amount: Balance,
-	assets: MultiAssets,
-	asset_id: Option<u32>,
-) -> TestArgs {
-	TestArgs {
-		dest,
-		beneficiary: AccountId32Junction { network: None, id: beneficiary_id.into() }.into(),
-		amount,
-		assets,
-		asset_id,
-		fee_asset_item: 0,
-		weight_limit: WeightLimit::Unlimited,
-	}
-}
-
-#[cfg(test)]
-mod tests;
diff --git a/cumulus/parachains/integration-tests/emulated/collectives/collectives-polkadot/src/tests/fellowship.rs b/cumulus/parachains/integration-tests/emulated/collectives/collectives-polkadot/src/tests/fellowship.rs
deleted file mode 100644
index a6d16a273b79122765766dbbe803a79cd35e0fa4..0000000000000000000000000000000000000000
--- a/cumulus/parachains/integration-tests/emulated/collectives/collectives-polkadot/src/tests/fellowship.rs
+++ /dev/null
@@ -1,69 +0,0 @@
-// Copyright 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/>.
-
-//! Integration tests concerning the Fellowship.
-
-#[test]
-#[ignore]
-fn pay_salary() {
-	// let asset_id: u32 = 1984;
-	// let pay_from: AccountId =
-	// 	<AccountId as Ss58Codec>::from_string("13w7NdvSR1Af8xsQTArDtZmVvjE8XhWNdL4yed3iFHrUNCnS")
-	// 		.unwrap();
-	// let pay_to = Polkadot::account_id_of(ALICE);
-	// let pay_amount = 9000;
-
-	// AssetHubPolkadot::execute_with(|| {
-	// 	type AssetHubAssets = <AssetHubPolkadot as AssetHubPolkadotPallet>::Assets;
-
-	// 	assert_ok!(<AssetHubAssets as Create<_>>::create(
-	// 		asset_id,
-	// 		pay_to.clone(),
-	// 		true,
-	// 		pay_amount / 2
-	// 	));
-	// 	assert_ok!(<AssetHubAssets as Mutate<_>>::mint_into(asset_id, &pay_from, pay_amount * 2));
-	// });
-
-	// Collectives::execute_with(|| {
-	// 	type RuntimeEvent = <Collectives as Chain>::RuntimeEvent;
-
-	// 	assert_ok!(FellowshipSalaryPaymaster::pay(&pay_to, (), pay_amount));
-	// 	assert_expected_events!(
-	// 		Collectives,
-	// 		vec![
-	// 			RuntimeEvent::XcmpQueue(cumulus_pallet_xcmp_queue::Event::XcmpMessageSent { .. }) => {},
-	// 		]
-	// 	);
-	// });
-
-	// AssetHubPolkadot::execute_with(|| {
-	// 	type RuntimeEvent = <AssetHubPolkadot as Chain>::RuntimeEvent;
-
-	// 	assert_expected_events!(
-	// 		AssetHubPolkadot,
-	// 		vec![
-	// 			RuntimeEvent::Assets(pallet_assets::Event::Transferred { asset_id: id, from, to, amount }) =>
-	// { 				asset_id: id == &asset_id,
-	// 				from: from == &pay_from,
-	// 				to: to == &pay_to,
-	// 				amount: amount == &pay_amount,
-	// 			},
-	// 			RuntimeEvent::XcmpQueue(cumulus_pallet_xcmp_queue::Event::Success { .. }) => {},
-	// 		]
-	// 	);
-	// });
-}
diff --git a/cumulus/parachains/integration-tests/emulated/collectives/collectives-polkadot/src/tests/mod.rs b/cumulus/parachains/integration-tests/emulated/collectives/collectives-polkadot/src/tests/mod.rs
deleted file mode 100644
index 1ede78b59799056cf4b74386e3aa56ee57b0f53e..0000000000000000000000000000000000000000
--- a/cumulus/parachains/integration-tests/emulated/collectives/collectives-polkadot/src/tests/mod.rs
+++ /dev/null
@@ -1,17 +0,0 @@
-// Copyright 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/>.
-
-mod fellowship;
diff --git a/cumulus/parachains/integration-tests/emulated/common/Cargo.toml b/cumulus/parachains/integration-tests/emulated/common/Cargo.toml
index 0122379b7d83a3cfb01f5f5de5dfdb4933d8ad92..bc661ce3e204cc94befd41c8e551cb1af422ed89 100644
--- a/cumulus/parachains/integration-tests/emulated/common/Cargo.toml
+++ b/cumulus/parachains/integration-tests/emulated/common/Cargo.toml
@@ -1,13 +1,14 @@
 [package]
 name = "integration-tests-common"
 version = "1.0.0"
-authors = ["Parity Technologies <admin@parity.io>"]
-edition = "2021"
+authors.workspace = true
+edition.workspace = true
+license = "Apache-2.0"
 description = "Common resources for integration testing with xcm-emulator"
+publish = false
 
 [dependencies]
 codec = { package = "parity-scale-codec", version = "3.4.0", default-features = false }
-lazy_static = "1.4.0"
 paste = "1.0.14"
 
 # Substrate
@@ -15,13 +16,10 @@ grandpa = { package = "sc-consensus-grandpa", path = "../../../../../substrate/c
 sp-authority-discovery = { path = "../../../../../substrate/primitives/authority-discovery", default-features = false}
 sp-runtime = { path = "../../../../../substrate/primitives/runtime", default-features = false}
 frame-support = { path = "../../../../../substrate/frame/support", default-features = false}
-frame-system = { path = "../../../../../substrate/frame/system", default-features = false}
 sp-core = { path = "../../../../../substrate/primitives/core", default-features = false}
-sp-weights = { path = "../../../../../substrate/primitives/weights", default-features = false}
 sp-consensus-babe = { path = "../../../../../substrate/primitives/consensus/babe", default-features = false}
-sp-tracing = { path = "../../../../../substrate/primitives/tracing" }
-pallet-balances = { path = "../../../../../substrate/frame/balances", default-features = false}
 pallet-assets = { path = "../../../../../substrate/frame/assets", default-features = false}
+pallet-balances = { path = "../../../../../substrate/frame/balances", default-features = false}
 pallet-staking = { path = "../../../../../substrate/frame/staking", default-features = false}
 pallet-message-queue = { path = "../../../../../substrate/frame/message-queue", default-features = false}
 pallet-im-online = { path = "../../../../../substrate/frame/im-online", default-features = false}
@@ -29,25 +27,19 @@ beefy-primitives = { package = "sp-consensus-beefy", path = "../../../../../subs
 
 # Polkadot
 polkadot-core-primitives = { path = "../../../../../polkadot/core-primitives", default-features = false}
-polkadot-parachain = { path = "../../../../../polkadot/parachain", default-features = false}
+polkadot-parachain-primitives = { path = "../../../../../polkadot/parachain", default-features = false}
 polkadot-service = { path = "../../../../../polkadot/node/service", default-features = false, features = ["full-node"] }
 polkadot-primitives = { path = "../../../../../polkadot/primitives", default-features = false}
 polkadot-runtime-parachains = { path = "../../../../../polkadot/runtime/parachains" }
-polkadot-runtime = { path = "../../../../../polkadot/runtime/polkadot" }
-polkadot-runtime-constants = { path = "../../../../../polkadot/runtime/polkadot/constants" }
-kusama-runtime = { path = "../../../../../polkadot/runtime/kusama" }
-kusama-runtime-constants = { path = "../../../../../polkadot/runtime/kusama/constants" }
 rococo-runtime = { path = "../../../../../polkadot/runtime/rococo" }
 rococo-runtime-constants = { path = "../../../../../polkadot/runtime/rococo/constants" }
 westend-runtime = { path = "../../../../../polkadot/runtime/westend" }
 westend-runtime-constants = { path = "../../../../../polkadot/runtime/westend/constants" }
-xcm = { path = "../../../../../polkadot/xcm", default-features = false}
-xcm-executor = { path = "../../../../../polkadot/xcm/xcm-executor", default-features = false}
+xcm = { package = "staging-xcm", path = "../../../../../polkadot/xcm", default-features = false}
 pallet-xcm = { path = "../../../../../polkadot/xcm/pallet-xcm", default-features = false}
 
 # Cumulus
 parachains-common = { path = "../../../common" }
-parachain-info = { path = "../../../pallets/parachain-info" }
 cumulus-primitives-core = { path = "../../../../primitives/core" }
 penpal-runtime = { path = "../../../runtimes/testing/penpal" }
 asset-hub-polkadot-runtime = { path = "../../../runtimes/assets/asset-hub-polkadot" }
@@ -61,14 +53,37 @@ xcm-emulator = { path = "../../../../xcm/xcm-emulator", default-features = false
 cumulus-pallet-dmp-queue = { path = "../../../../pallets/dmp-queue" }
 cumulus-pallet-xcmp-queue = { path = "../../../../pallets/xcmp-queue", default-features = false}
 cumulus-pallet-parachain-system = { path = "../../../../pallets/parachain-system" }
-bp-messages = { path = "../../../../bridges/primitives/messages" }
-bp-runtime = { path = "../../../../bridges/primitives/runtime" }
-pallet-bridge-messages = { path = "../../../../bridges/modules/messages" }
-bridge-runtime-common = { path = "../../../../bridges/bin/runtime-common" }
+bp-messages = { path = "../../../../../bridges/primitives/messages" }
+pallet-bridge-messages = { path = "../../../../../bridges/modules/messages" }
+bridge-runtime-common = { path = "../../../../../bridges/bin/runtime-common" }
 
 [features]
 runtime-benchmarks = [
-	"kusama-runtime/runtime-benchmarks",
-	"polkadot-runtime/runtime-benchmarks",
+	"asset-hub-kusama-runtime/runtime-benchmarks",
+	"asset-hub-polkadot-runtime/runtime-benchmarks",
+	"asset-hub-westend-runtime/runtime-benchmarks",
+	"bridge-hub-kusama-runtime/runtime-benchmarks",
+	"bridge-hub-polkadot-runtime/runtime-benchmarks",
+	"bridge-hub-rococo-runtime/runtime-benchmarks",
+	"bridge-runtime-common/runtime-benchmarks",
+	"collectives-polkadot-runtime/runtime-benchmarks",
+	"cumulus-pallet-parachain-system/runtime-benchmarks",
+	"cumulus-pallet-xcmp-queue/runtime-benchmarks",
+	"frame-support/runtime-benchmarks",
+	"pallet-assets/runtime-benchmarks",
+	"pallet-balances/runtime-benchmarks",
+	"pallet-bridge-messages/runtime-benchmarks",
+	"pallet-im-online/runtime-benchmarks",
+	"pallet-message-queue/runtime-benchmarks",
+	"pallet-staking/runtime-benchmarks",
+	"pallet-xcm/runtime-benchmarks",
+	"parachains-common/runtime-benchmarks",
+	"penpal-runtime/runtime-benchmarks",
+	"polkadot-parachain-primitives/runtime-benchmarks",
+	"polkadot-primitives/runtime-benchmarks",
+	"polkadot-runtime-parachains/runtime-benchmarks",
+	"polkadot-service/runtime-benchmarks",
+	"rococo-runtime/runtime-benchmarks",
+	"sp-runtime/runtime-benchmarks",
 	"westend-runtime/runtime-benchmarks",
 ]
diff --git a/cumulus/parachains/integration-tests/emulated/common/src/constants.rs b/cumulus/parachains/integration-tests/emulated/common/src/constants.rs
index 3eb65fa26c162833a2a5eecafc1d68e47baa6444..33a9ac38c8c6f70dc99b722b17ceb876914ecc78 100644
--- a/cumulus/parachains/integration-tests/emulated/common/src/constants.rs
+++ b/cumulus/parachains/integration-tests/emulated/common/src/constants.rs
@@ -1,14 +1,22 @@
+// 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.
+
+// Substrate
 use beefy_primitives::ecdsa_crypto::AuthorityId as BeefyId;
 use grandpa::AuthorityId as GrandpaId;
 use pallet_im_online::sr25519::AuthorityId as ImOnlineId;
-use parachains_common::{AccountId, AssetHubPolkadotAuraId, AuraId, Balance, BlockNumber};
-use polkadot_parachain::primitives::{HeadData, ValidationCode};
-use polkadot_primitives::{AssignmentId, ValidatorId};
-use polkadot_runtime_parachains::{
-	configuration::HostConfiguration,
-	paras::{ParaGenesisArgs, ParaKind},
-};
-use polkadot_service::chain_spec::get_authority_keys_from_seed_no_beefy;
 use sp_authority_discovery::AuthorityId as AuthorityDiscoveryId;
 use sp_consensus_babe::AuthorityId as BabeId;
 use sp_core::{sr25519, storage::Storage, Pair, Public};
@@ -16,6 +24,12 @@ use sp_runtime::{
 	traits::{IdentifyAccount, Verify},
 	BuildStorage, MultiSignature, Perbill,
 };
+
+// Cumulus
+use parachains_common::{AccountId, AssetHubPolkadotAuraId, AuraId, Balance, BlockNumber};
+use polkadot_primitives::{AssignmentId, ValidatorId};
+use polkadot_runtime_parachains::configuration::HostConfiguration;
+use polkadot_service::chain_spec::get_authority_keys_from_seed_no_beefy;
 use xcm;
 
 pub const XCM_V2: u32 = 3;
@@ -120,144 +134,6 @@ pub mod validators {
 
 /// The default XCM version to set in genesis config.
 const SAFE_XCM_VERSION: u32 = xcm::prelude::XCM_VERSION;
-// Polkadot
-pub mod polkadot {
-	use super::*;
-	pub const ED: Balance = polkadot_runtime_constants::currency::EXISTENTIAL_DEPOSIT;
-	const STASH: u128 = 100 * polkadot_runtime_constants::currency::UNITS;
-
-	pub fn get_host_config() -> HostConfiguration<BlockNumber> {
-		HostConfiguration {
-			max_upward_queue_count: 10,
-			max_upward_queue_size: 51200,
-			max_upward_message_size: 51200,
-			max_upward_message_num_per_candidate: 10,
-			max_downward_message_size: 51200,
-			hrmp_sender_deposit: 100_000_000_000,
-			hrmp_recipient_deposit: 100_000_000_000,
-			hrmp_channel_max_capacity: 1000,
-			hrmp_channel_max_message_size: 102400,
-			hrmp_channel_max_total_size: 102400,
-			hrmp_max_parachain_outbound_channels: 30,
-			hrmp_max_parachain_inbound_channels: 30,
-			..Default::default()
-		}
-	}
-
-	fn session_keys(
-		babe: BabeId,
-		grandpa: GrandpaId,
-		im_online: ImOnlineId,
-		para_validator: ValidatorId,
-		para_assignment: AssignmentId,
-		authority_discovery: AuthorityDiscoveryId,
-	) -> polkadot_runtime::SessionKeys {
-		polkadot_runtime::SessionKeys {
-			babe,
-			grandpa,
-			im_online,
-			para_validator,
-			para_assignment,
-			authority_discovery,
-		}
-	}
-
-	pub fn genesis() -> Storage {
-		let genesis_config = polkadot_runtime::RuntimeGenesisConfig {
-			system: polkadot_runtime::SystemConfig {
-				code: polkadot_runtime::WASM_BINARY.unwrap().to_vec(),
-				..Default::default()
-			},
-			balances: polkadot_runtime::BalancesConfig {
-				balances: accounts::init_balances()
-					.iter()
-					.cloned()
-					.map(|k| (k, ED * 4096))
-					.collect(),
-			},
-			session: polkadot_runtime::SessionConfig {
-				keys: validators::initial_authorities()
-					.iter()
-					.map(|x| {
-						(
-							x.0.clone(),
-							x.0.clone(),
-							polkadot::session_keys(
-								x.2.clone(),
-								x.3.clone(),
-								x.4.clone(),
-								x.5.clone(),
-								x.6.clone(),
-								x.7.clone(),
-							),
-						)
-					})
-					.collect::<Vec<_>>(),
-			},
-			staking: polkadot_runtime::StakingConfig {
-				validator_count: validators::initial_authorities().len() as u32,
-				minimum_validator_count: 1,
-				stakers: validators::initial_authorities()
-					.iter()
-					.map(|x| {
-						(x.0.clone(), x.1.clone(), STASH, polkadot_runtime::StakerStatus::Validator)
-					})
-					.collect(),
-				invulnerables: validators::initial_authorities()
-					.iter()
-					.map(|x| x.0.clone())
-					.collect(),
-				force_era: pallet_staking::Forcing::ForceNone,
-				slash_reward_fraction: Perbill::from_percent(10),
-				..Default::default()
-			},
-			babe: polkadot_runtime::BabeConfig {
-				authorities: Default::default(),
-				epoch_config: Some(polkadot_runtime::BABE_GENESIS_EPOCH_CONFIG),
-				..Default::default()
-			},
-			configuration: polkadot_runtime::ConfigurationConfig { config: get_host_config() },
-			paras: polkadot_runtime::ParasConfig {
-				paras: vec![
-					(
-						asset_hub_polkadot::PARA_ID.into(),
-						ParaGenesisArgs {
-							genesis_head: HeadData::default(),
-							validation_code: ValidationCode(
-								asset_hub_polkadot_runtime::WASM_BINARY.unwrap().to_vec(),
-							),
-							para_kind: ParaKind::Parachain,
-						},
-					),
-					(
-						penpal::PARA_ID_A.into(),
-						ParaGenesisArgs {
-							genesis_head: HeadData::default(),
-							validation_code: ValidationCode(
-								penpal_runtime::WASM_BINARY.unwrap().to_vec(),
-							),
-							para_kind: ParaKind::Parachain,
-						},
-					),
-					(
-						penpal::PARA_ID_B.into(),
-						ParaGenesisArgs {
-							genesis_head: HeadData::default(),
-							validation_code: ValidationCode(
-								penpal_runtime::WASM_BINARY.unwrap().to_vec(),
-							),
-							para_kind: ParaKind::Parachain,
-						},
-					),
-				],
-				..Default::default()
-			},
-			..Default::default()
-		};
-
-		genesis_config.build_storage().unwrap()
-	}
-}
 
 // Westend
 pub mod westend {
@@ -368,149 +244,6 @@ pub mod westend {
 	}
 }
 
-// Kusama
-pub mod kusama {
-	use super::*;
-	pub const ED: Balance = kusama_runtime_constants::currency::EXISTENTIAL_DEPOSIT;
-	use kusama_runtime_constants::currency::UNITS as KSM;
-	const ENDOWMENT: u128 = 1_000_000 * KSM;
-	const STASH: u128 = 100 * KSM;
-
-	pub fn get_host_config() -> HostConfiguration<BlockNumber> {
-		HostConfiguration {
-			max_upward_queue_count: 10,
-			max_upward_queue_size: 51200,
-			max_upward_message_size: 51200,
-			max_upward_message_num_per_candidate: 10,
-			max_downward_message_size: 51200,
-			hrmp_sender_deposit: 5_000_000_000_000,
-			hrmp_recipient_deposit: 5_000_000_000_000,
-			hrmp_channel_max_capacity: 1000,
-			hrmp_channel_max_message_size: 102400,
-			hrmp_channel_max_total_size: 102400,
-			hrmp_max_parachain_outbound_channels: 30,
-			hrmp_max_parachain_inbound_channels: 30,
-			..Default::default()
-		}
-	}
-
-	fn session_keys(
-		babe: BabeId,
-		grandpa: GrandpaId,
-		im_online: ImOnlineId,
-		para_validator: ValidatorId,
-		para_assignment: AssignmentId,
-		authority_discovery: AuthorityDiscoveryId,
-		beefy: BeefyId,
-	) -> kusama_runtime::SessionKeys {
-		kusama_runtime::SessionKeys {
-			babe,
-			grandpa,
-			im_online,
-			para_validator,
-			para_assignment,
-			authority_discovery,
-			beefy,
-		}
-	}
-
-	pub fn genesis() -> Storage {
-		let genesis_config = kusama_runtime::RuntimeGenesisConfig {
-			system: kusama_runtime::SystemConfig {
-				code: kusama_runtime::WASM_BINARY.unwrap().to_vec(),
-				..Default::default()
-			},
-			balances: kusama_runtime::BalancesConfig {
-				balances: accounts::init_balances()
-					.iter()
-					.map(|k: &AccountId| (k.clone(), ENDOWMENT))
-					.collect(),
-			},
-			session: kusama_runtime::SessionConfig {
-				keys: validators::initial_authorities()
-					.iter()
-					.map(|x| {
-						(
-							x.0.clone(),
-							x.0.clone(),
-							kusama::session_keys(
-								x.2.clone(),
-								x.3.clone(),
-								x.4.clone(),
-								x.5.clone(),
-								x.6.clone(),
-								x.7.clone(),
-								get_from_seed::<BeefyId>("Alice"),
-							),
-						)
-					})
-					.collect::<Vec<_>>(),
-			},
-			staking: kusama_runtime::StakingConfig {
-				validator_count: validators::initial_authorities().len() as u32,
-				minimum_validator_count: 1,
-				stakers: validators::initial_authorities()
-					.iter()
-					.map(|x| {
-						(x.0.clone(), x.1.clone(), STASH, kusama_runtime::StakerStatus::Validator)
-					})
-					.collect(),
-				invulnerables: validators::initial_authorities()
-					.iter()
-					.map(|x| x.0.clone())
-					.collect(),
-				force_era: pallet_staking::Forcing::NotForcing,
-				slash_reward_fraction: Perbill::from_percent(10),
-				..Default::default()
-			},
-			babe: kusama_runtime::BabeConfig {
-				authorities: Default::default(),
-				epoch_config: Some(kusama_runtime::BABE_GENESIS_EPOCH_CONFIG),
-				..Default::default()
-			},
-			configuration: kusama_runtime::ConfigurationConfig { config: get_host_config() },
-			paras: kusama_runtime::ParasConfig {
-				paras: vec![
-					(
-						asset_hub_kusama::PARA_ID.into(),
-						ParaGenesisArgs {
-							genesis_head: HeadData::default(),
-							validation_code: ValidationCode(
-								asset_hub_kusama_runtime::WASM_BINARY.unwrap().to_vec(),
-							),
-							para_kind: ParaKind::Parachain,
-						},
-					),
-					(
-						penpal::PARA_ID_A.into(),
-						ParaGenesisArgs {
-							genesis_head: HeadData::default(),
-							validation_code: ValidationCode(
-								penpal_runtime::WASM_BINARY.unwrap().to_vec(),
-							),
-							para_kind: ParaKind::Parachain,
-						},
-					),
-					(
-						penpal::PARA_ID_B.into(),
-						ParaGenesisArgs {
-							genesis_head: HeadData::default(),
-							validation_code: ValidationCode(
-								penpal_runtime::WASM_BINARY.unwrap().to_vec(),
-							),
-							para_kind: ParaKind::Parachain,
-						},
-					),
-				],
-				..Default::default()
-			},
-			..Default::default()
-		};
-
-		genesis_config.build_storage().unwrap()
-	}
-}
-
 // Rococo
 pub mod rococo {
 	use super::*;
@@ -609,68 +342,11 @@ pub mod rococo {
 	}
 }
 
-// Asset Hub Polkadot
-pub mod asset_hub_polkadot {
-	use super::*;
-	pub const PARA_ID: u32 = 1000;
-	pub const ED: Balance = asset_hub_polkadot_runtime::constants::currency::EXISTENTIAL_DEPOSIT;
-
-	pub fn genesis() -> Storage {
-		let genesis_config = asset_hub_polkadot_runtime::RuntimeGenesisConfig {
-			system: asset_hub_polkadot_runtime::SystemConfig {
-				code: asset_hub_polkadot_runtime::WASM_BINARY
-					.expect("WASM binary was not build, please build it!")
-					.to_vec(),
-				..Default::default()
-			},
-			balances: asset_hub_polkadot_runtime::BalancesConfig {
-				balances: accounts::init_balances()
-					.iter()
-					.cloned()
-					.map(|k| (k, ED * 4096))
-					.collect(),
-			},
-			parachain_info: asset_hub_polkadot_runtime::ParachainInfoConfig {
-				parachain_id: PARA_ID.into(),
-				..Default::default()
-			},
-			collator_selection: asset_hub_polkadot_runtime::CollatorSelectionConfig {
-				invulnerables: collators::invulnerables_asset_hub_polkadot()
-					.iter()
-					.cloned()
-					.map(|(acc, _)| acc)
-					.collect(),
-				candidacy_bond: ED * 16,
-				..Default::default()
-			},
-			session: asset_hub_polkadot_runtime::SessionConfig {
-				keys: collators::invulnerables_asset_hub_polkadot()
-					.into_iter()
-					.map(|(acc, aura)| {
-						(
-							acc.clone(),                                      // account id
-							acc,                                              // validator id
-							asset_hub_polkadot_runtime::SessionKeys { aura }, // session keys
-						)
-					})
-					.collect(),
-			},
-			polkadot_xcm: asset_hub_polkadot_runtime::PolkadotXcmConfig {
-				safe_xcm_version: Some(SAFE_XCM_VERSION),
-				..Default::default()
-			},
-			..Default::default()
-		};
-
-		genesis_config.build_storage().unwrap()
-	}
-}
-
 // Asset Hub Westend
 pub mod asset_hub_westend {
 	use super::*;
 	pub const PARA_ID: u32 = 1000;
-	pub const ED: Balance = asset_hub_westend_runtime::constants::currency::EXISTENTIAL_DEPOSIT;
+	pub const ED: Balance = parachains_common::westend::currency::EXISTENTIAL_DEPOSIT;
 
 	pub fn genesis() -> Storage {
 		let genesis_config = asset_hub_westend_runtime::RuntimeGenesisConfig {
@@ -724,31 +400,31 @@ pub mod asset_hub_westend {
 }
 
 // Asset Hub Kusama
-pub mod asset_hub_kusama {
+pub mod asset_hub_rococo {
 	use super::*;
 	pub const PARA_ID: u32 = 1000;
-	pub const ED: Balance = asset_hub_kusama_runtime::constants::currency::EXISTENTIAL_DEPOSIT;
+	pub const ED: Balance = parachains_common::rococo::currency::EXISTENTIAL_DEPOSIT;
 
 	pub fn genesis() -> Storage {
-		let genesis_config = asset_hub_kusama_runtime::RuntimeGenesisConfig {
-			system: asset_hub_kusama_runtime::SystemConfig {
-				code: asset_hub_kusama_runtime::WASM_BINARY
+		let genesis_config = asset_hub_westend_runtime::RuntimeGenesisConfig {
+			system: asset_hub_westend_runtime::SystemConfig {
+				code: asset_hub_westend_runtime::WASM_BINARY
 					.expect("WASM binary was not build, please build it!")
 					.to_vec(),
 				..Default::default()
 			},
-			balances: asset_hub_kusama_runtime::BalancesConfig {
+			balances: asset_hub_westend_runtime::BalancesConfig {
 				balances: accounts::init_balances()
 					.iter()
 					.cloned()
 					.map(|k| (k, ED * 4096))
 					.collect(),
 			},
-			parachain_info: asset_hub_kusama_runtime::ParachainInfoConfig {
+			parachain_info: asset_hub_westend_runtime::ParachainInfoConfig {
 				parachain_id: PARA_ID.into(),
 				..Default::default()
 			},
-			collator_selection: asset_hub_kusama_runtime::CollatorSelectionConfig {
+			collator_selection: asset_hub_westend_runtime::CollatorSelectionConfig {
 				invulnerables: collators::invulnerables()
 					.iter()
 					.cloned()
@@ -757,19 +433,19 @@ pub mod asset_hub_kusama {
 				candidacy_bond: ED * 16,
 				..Default::default()
 			},
-			session: asset_hub_kusama_runtime::SessionConfig {
+			session: asset_hub_westend_runtime::SessionConfig {
 				keys: collators::invulnerables()
 					.into_iter()
 					.map(|(acc, aura)| {
 						(
-							acc.clone(),                                    // account id
-							acc,                                            // validator id
-							asset_hub_kusama_runtime::SessionKeys { aura }, // session keys
+							acc.clone(),                                     // account id
+							acc,                                             // validator id
+							asset_hub_westend_runtime::SessionKeys { aura }, // session keys
 						)
 					})
 					.collect(),
 			},
-			polkadot_xcm: asset_hub_kusama_runtime::PolkadotXcmConfig {
+			polkadot_xcm: asset_hub_westend_runtime::PolkadotXcmConfig {
 				safe_xcm_version: Some(SAFE_XCM_VERSION),
 				..Default::default()
 			},
@@ -841,182 +517,11 @@ pub mod penpal {
 	}
 }
 
-// Collectives
-pub mod collectives {
-	use super::*;
-	pub const PARA_ID: u32 = 1001;
-	pub const ED: Balance = collectives_polkadot_runtime::constants::currency::EXISTENTIAL_DEPOSIT;
-
-	pub fn genesis() -> Storage {
-		let genesis_config = collectives_polkadot_runtime::RuntimeGenesisConfig {
-			system: collectives_polkadot_runtime::SystemConfig {
-				code: collectives_polkadot_runtime::WASM_BINARY
-					.expect("WASM binary was not build, please build it!")
-					.to_vec(),
-				..Default::default()
-			},
-			balances: collectives_polkadot_runtime::BalancesConfig {
-				balances: accounts::init_balances()
-					.iter()
-					.cloned()
-					.map(|k| (k, ED * 4096))
-					.collect(),
-			},
-			parachain_info: collectives_polkadot_runtime::ParachainInfoConfig {
-				parachain_id: PARA_ID.into(),
-				..Default::default()
-			},
-			collator_selection: collectives_polkadot_runtime::CollatorSelectionConfig {
-				invulnerables: collators::invulnerables()
-					.iter()
-					.cloned()
-					.map(|(acc, _)| acc)
-					.collect(),
-				candidacy_bond: ED * 16,
-				..Default::default()
-			},
-			session: collectives_polkadot_runtime::SessionConfig {
-				keys: collators::invulnerables()
-					.into_iter()
-					.map(|(acc, aura)| {
-						(
-							acc.clone(),                                        // account id
-							acc,                                                // validator id
-							collectives_polkadot_runtime::SessionKeys { aura }, // session keys
-						)
-					})
-					.collect(),
-			},
-			polkadot_xcm: collectives_polkadot_runtime::PolkadotXcmConfig {
-				safe_xcm_version: Some(SAFE_XCM_VERSION),
-				..Default::default()
-			},
-			..Default::default()
-		};
-
-		genesis_config.build_storage().unwrap()
-	}
-}
-
-// Bridge Hub Kusama
-pub mod bridge_hub_kusama {
-	use super::*;
-	pub const PARA_ID: u32 = 1002;
-	pub const ED: Balance = bridge_hub_kusama_runtime::constants::currency::EXISTENTIAL_DEPOSIT;
-
-	pub fn genesis() -> Storage {
-		let genesis_config = bridge_hub_kusama_runtime::RuntimeGenesisConfig {
-			system: bridge_hub_kusama_runtime::SystemConfig {
-				code: bridge_hub_kusama_runtime::WASM_BINARY
-					.expect("WASM binary was not build, please build it!")
-					.to_vec(),
-				..Default::default()
-			},
-			balances: bridge_hub_kusama_runtime::BalancesConfig {
-				balances: accounts::init_balances()
-					.iter()
-					.cloned()
-					.map(|k| (k, ED * 4096))
-					.collect(),
-			},
-			parachain_info: bridge_hub_kusama_runtime::ParachainInfoConfig {
-				parachain_id: PARA_ID.into(),
-				..Default::default()
-			},
-			collator_selection: bridge_hub_kusama_runtime::CollatorSelectionConfig {
-				invulnerables: collators::invulnerables()
-					.iter()
-					.cloned()
-					.map(|(acc, _)| acc)
-					.collect(),
-				candidacy_bond: ED * 16,
-				..Default::default()
-			},
-			session: bridge_hub_kusama_runtime::SessionConfig {
-				keys: collators::invulnerables()
-					.into_iter()
-					.map(|(acc, aura)| {
-						(
-							acc.clone(),                                     // account id
-							acc,                                             // validator id
-							bridge_hub_kusama_runtime::SessionKeys { aura }, // session keys
-						)
-					})
-					.collect(),
-			},
-			polkadot_xcm: bridge_hub_kusama_runtime::PolkadotXcmConfig {
-				safe_xcm_version: Some(SAFE_XCM_VERSION),
-				..Default::default()
-			},
-			..Default::default()
-		};
-
-		genesis_config.build_storage().unwrap()
-	}
-}
-
-// Bridge Hub Polkadot
-pub mod bridge_hub_polkadot {
-	use super::*;
-	pub const PARA_ID: u32 = 1002;
-	pub const ED: Balance = bridge_hub_polkadot_runtime::constants::currency::EXISTENTIAL_DEPOSIT;
-
-	pub fn genesis() -> Storage {
-		let genesis_config = bridge_hub_polkadot_runtime::RuntimeGenesisConfig {
-			system: bridge_hub_polkadot_runtime::SystemConfig {
-				code: bridge_hub_polkadot_runtime::WASM_BINARY
-					.expect("WASM binary was not build, please build it!")
-					.to_vec(),
-				..Default::default()
-			},
-			balances: bridge_hub_polkadot_runtime::BalancesConfig {
-				balances: accounts::init_balances()
-					.iter()
-					.cloned()
-					.map(|k| (k, ED * 4096))
-					.collect(),
-			},
-			parachain_info: bridge_hub_polkadot_runtime::ParachainInfoConfig {
-				parachain_id: PARA_ID.into(),
-				..Default::default()
-			},
-			collator_selection: bridge_hub_polkadot_runtime::CollatorSelectionConfig {
-				invulnerables: collators::invulnerables()
-					.iter()
-					.cloned()
-					.map(|(acc, _)| acc)
-					.collect(),
-				candidacy_bond: ED * 16,
-				..Default::default()
-			},
-			session: bridge_hub_polkadot_runtime::SessionConfig {
-				keys: collators::invulnerables()
-					.into_iter()
-					.map(|(acc, aura)| {
-						(
-							acc.clone(),                                       // account id
-							acc,                                               // validator id
-							bridge_hub_polkadot_runtime::SessionKeys { aura }, // session keys
-						)
-					})
-					.collect(),
-			},
-			polkadot_xcm: bridge_hub_polkadot_runtime::PolkadotXcmConfig {
-				safe_xcm_version: Some(SAFE_XCM_VERSION),
-				..Default::default()
-			},
-			..Default::default()
-		};
-
-		genesis_config.build_storage().unwrap()
-	}
-}
-
 // Bridge Hub Rococo & Bridge Hub Wococo
 pub mod bridge_hub_rococo {
 	use super::*;
 	pub const PARA_ID: u32 = 1013;
-	pub const ED: Balance = bridge_hub_rococo_runtime::constants::currency::EXISTENTIAL_DEPOSIT;
+	pub const ED: Balance = parachains_common::rococo::currency::EXISTENTIAL_DEPOSIT;
 
 	pub fn genesis() -> Storage {
 		let genesis_config = bridge_hub_rococo_runtime::RuntimeGenesisConfig {
diff --git a/cumulus/parachains/integration-tests/emulated/common/src/impls.rs b/cumulus/parachains/integration-tests/emulated/common/src/impls.rs
index 92c68f4dd6133ac5b577cbfdeee57814851d9662..bb4c9d102e98a928de6d721ee6fb8f1dd7abf9f4 100644
--- a/cumulus/parachains/integration-tests/emulated/common/src/impls.rs
+++ b/cumulus/parachains/integration-tests/emulated/common/src/impls.rs
@@ -1,15 +1,63 @@
-use super::{BridgeHubRococo, BridgeHubWococo};
-// pub use paste;
+// 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.
+
+pub use codec::{Decode, Encode};
+pub use paste;
+
+pub use crate::{
+	constants::{PROOF_SIZE_THRESHOLD, REF_TIME_THRESHOLD},
+	xcm_helpers::xcm_transact_unpaid_execution,
+	BridgeHubRococo, BridgeHubWococo,
+};
+
+// Substrate
+pub use frame_support::{assert_ok, traits::fungibles::Inspect};
+pub use pallet_assets;
+pub use pallet_message_queue;
+use sp_core::Get;
+
+// Cumulus
 use bp_messages::{
 	target_chain::{DispatchMessage, DispatchMessageData, MessageDispatch},
 	LaneId, MessageKey, OutboundLaneData,
 };
 use bridge_runtime_common::messages_xcm_extension::XcmBlobMessageDispatchResult;
-use codec::Decode;
-pub use cumulus_primitives_core::{DmpMessageHandler, XcmpMessageHandler};
+pub use cumulus_pallet_dmp_queue;
+pub use cumulus_pallet_parachain_system;
+pub use cumulus_pallet_xcmp_queue;
+pub use cumulus_primitives_core::{
+	relay_chain::HrmpChannelId, DmpMessageHandler, ParaId, XcmpMessageHandler,
+};
 use pallet_bridge_messages::{Config, Instance1, Instance2, OutboundLanes, Pallet};
-use sp_core::Get;
-use xcm_emulator::{BridgeMessage, BridgeMessageDispatchError, BridgeMessageHandler, Chain};
+pub use parachains_common::{AccountId, Balance};
+pub use xcm_emulator::{
+	assert_expected_events, bx, helpers::weight_within_threshold, BridgeMessage,
+	BridgeMessageDispatchError, BridgeMessageHandler, Chain, Parachain, RelayChain, TestExt,
+};
+
+// Polkadot
+pub use pallet_xcm;
+pub use polkadot_runtime_parachains::{
+	dmp, hrmp,
+	inclusion::{AggregateMessageOrigin, UmpQueueId},
+};
+pub use xcm::{
+	prelude::{MultiLocation, OriginKind, Outcome, VersionedXcm, Weight},
+	v3::Error,
+	DoubleEncoded,
+};
 
 pub struct BridgeHubMessageHandler<S, T, I> {
 	_marker: std::marker::PhantomData<(S, T, I)>,
@@ -32,21 +80,11 @@ impl From<u32> for LaneIdWrapper {
 type BridgeHubRococoRuntime = <BridgeHubRococo as Chain>::Runtime;
 type BridgeHubWococoRuntime = <BridgeHubWococo as Chain>::Runtime;
 
-// TODO: uncomment when https://github.com/paritytech/cumulus/pull/2528 is merged
-// type BridgeHubPolkadotRuntime = <BridgeHubPolkadot as Chain>::Runtime;
-// type BridgeHubKusamaRuntime = <BridgeHubKusama as Chain>::Runtime;
-
 pub type RococoWococoMessageHandler =
 	BridgeHubMessageHandler<BridgeHubRococoRuntime, BridgeHubWococoRuntime, Instance2>;
 pub type WococoRococoMessageHandler =
 	BridgeHubMessageHandler<BridgeHubWococoRuntime, BridgeHubRococoRuntime, Instance2>;
 
-// TODO: uncomment when https://github.com/paritytech/cumulus/pull/2528 is merged
-// pub type PolkadotKusamaMessageHandler
-//	= BridgeHubMessageHandler<BridgeHubPolkadotRuntime, BridgeHubKusamaRuntime, Instance1>;
-// pub type KusamaPolkadotMessageHandler
-//	= BridgeHubMessageHandler<BridgeHubKusamaRuntime, BridgeHubPolkadoRuntime, Instance1>;
-
 impl<S, T, I> BridgeMessageHandler for BridgeHubMessageHandler<S, T, I>
 where
 	S: Config<Instance1>,
@@ -129,14 +167,14 @@ where
 #[macro_export]
 macro_rules! impl_accounts_helpers_for_relay_chain {
 	( $chain:ident ) => {
-		$crate::paste::paste! {
+		$crate::impls::paste::paste! {
 			impl $chain {
 				/// Fund a set of accounts with a balance
-				pub fn fund_accounts(accounts: Vec<(AccountId, Balance)>) {
-					Self::execute_with(|| {
+				pub fn fund_accounts(accounts: Vec<($crate::impls::AccountId, $crate::impls::Balance)>) {
+					<Self as $crate::impls::TestExt>::execute_with(|| {
 						for account in accounts {
-							assert_ok!(<Self as [<$chain Pallet>]>::Balances::force_set_balance(
-								<Self as Chain>::RuntimeOrigin::root(),
+							$crate::impls::assert_ok!(<Self as [<$chain Pallet>]>::Balances::force_set_balance(
+								<Self as $crate::impls::Chain>::RuntimeOrigin::root(),
 								account.0.into(),
 								account.1,
 							));
@@ -144,8 +182,8 @@ macro_rules! impl_accounts_helpers_for_relay_chain {
 					});
 				}
 				/// Fund a sovereign account based on its Parachain Id
-				pub fn fund_para_sovereign(amount: Balance, para_id: ParaId) -> sp_runtime::AccountId32 {
-					let sovereign_account = Self::sovereign_account_id_of_child_para(para_id);
+				pub fn fund_para_sovereign(amount: $crate::impls::Balance, para_id: $crate::impls::ParaId) -> sp_runtime::AccountId32 {
+					let sovereign_account = <Self as $crate::impls::RelayChain>::sovereign_account_id_of_child_para(para_id);
 					Self::fund_accounts(vec![(sovereign_account.clone(), amount)]);
 					sovereign_account
 				}
@@ -157,20 +195,20 @@ macro_rules! impl_accounts_helpers_for_relay_chain {
 #[macro_export]
 macro_rules! impl_assert_events_helpers_for_relay_chain {
 	( $chain:ident ) => {
-		$crate::paste::paste! {
-			type [<$chain RuntimeEvent>] = <$chain as Chain>::RuntimeEvent;
+		$crate::impls::paste::paste! {
+			type [<$chain RuntimeEvent>] = <$chain as $crate::impls::Chain>::RuntimeEvent;
 
 			impl $chain {
 				/// Asserts a dispatchable is completely executed and XCM sent
-				pub fn assert_xcm_pallet_attempted_complete(expected_weight: Option<Weight>) {
-					assert_expected_events!(
+				pub fn assert_xcm_pallet_attempted_complete(expected_weight: Option<$crate::impls::Weight>) {
+					$crate::impls::assert_expected_events!(
 						Self,
 						vec![
 							[<$chain RuntimeEvent>]::XcmPallet(
-								pallet_xcm::Event::Attempted { outcome: Outcome::Complete(weight) }
+								$crate::impls::pallet_xcm::Event::Attempted { outcome: $crate::impls::Outcome::Complete(weight) }
 							) => {
-								weight: weight_within_threshold(
-									(REF_TIME_THRESHOLD, PROOF_SIZE_THRESHOLD),
+								weight: $crate::impls::weight_within_threshold(
+									($crate::impls::REF_TIME_THRESHOLD, $crate::impls::PROOF_SIZE_THRESHOLD),
 									expected_weight.unwrap_or(*weight),
 									*weight
 								),
@@ -181,18 +219,18 @@ macro_rules! impl_assert_events_helpers_for_relay_chain {
 
 				/// Asserts a dispatchable is incompletely executed and XCM sent
 				pub fn assert_xcm_pallet_attempted_incomplete(
-					expected_weight: Option<Weight>,
-					expected_error: Option<Error>,
+					expected_weight: Option<$crate::impls::Weight>,
+					expected_error: Option<$crate::impls::Error>,
 				) {
-					assert_expected_events!(
+					$crate::impls::assert_expected_events!(
 						Self,
 						vec![
 							// Dispatchable is properly executed and XCM message sent
 							[<$chain RuntimeEvent>]::XcmPallet(
-								pallet_xcm::Event::Attempted { outcome: Outcome::Incomplete(weight, error) }
+								$crate::impls::pallet_xcm::Event::Attempted { outcome: $crate::impls::Outcome::Incomplete(weight, error) }
 							) => {
-								weight: weight_within_threshold(
-									(REF_TIME_THRESHOLD, PROOF_SIZE_THRESHOLD),
+								weight: $crate::impls::weight_within_threshold(
+									($crate::impls::REF_TIME_THRESHOLD, $crate::impls::PROOF_SIZE_THRESHOLD),
 									expected_weight.unwrap_or(*weight),
 									*weight
 								),
@@ -204,10 +242,10 @@ macro_rules! impl_assert_events_helpers_for_relay_chain {
 
 				/// Asserts a XCM message is sent
 				pub fn assert_xcm_pallet_sent() {
-					assert_expected_events!(
+					$crate::impls::assert_expected_events!(
 						Self,
 						vec![
-							[<$chain RuntimeEvent>]::XcmPallet(pallet_xcm::Event::Sent { .. }) => {},
+							[<$chain RuntimeEvent>]::XcmPallet($crate::impls::pallet_xcm::Event::Sent { .. }) => {},
 						]
 					);
 				}
@@ -215,22 +253,22 @@ macro_rules! impl_assert_events_helpers_for_relay_chain {
 				/// Asserts a XCM from System Parachain is succesfully received and proccessed
 				pub fn assert_ump_queue_processed(
 					expected_success: bool,
-					expected_id: Option<ParaId>,
-					expected_weight: Option<Weight>,
+					expected_id: Option<$crate::impls::ParaId>,
+					expected_weight: Option<$crate::impls::Weight>,
 				) {
-					assert_expected_events!(
+					$crate::impls::assert_expected_events!(
 						Self,
 						vec![
 							// XCM is succesfully received and proccessed
-							[<$chain RuntimeEvent>]::MessageQueue(pallet_message_queue::Event::Processed {
-								origin: AggregateMessageOrigin::Ump(UmpQueueId::Para(id)),
+							[<$chain RuntimeEvent>]::MessageQueue($crate::impls::pallet_message_queue::Event::Processed {
+								origin: $crate::impls::AggregateMessageOrigin::Ump($crate::impls::UmpQueueId::Para(id)),
 								weight_used,
 								success,
 								..
 							}) => {
 								id: *id == expected_id.unwrap_or(*id),
-								weight_used: weight_within_threshold(
-									(REF_TIME_THRESHOLD, PROOF_SIZE_THRESHOLD),
+								weight_used: $crate::impls::weight_within_threshold(
+									($crate::impls::REF_TIME_THRESHOLD, $crate::impls::PROOF_SIZE_THRESHOLD),
 									expected_weight.unwrap_or(*weight_used),
 									*weight_used
 								),
@@ -247,16 +285,18 @@ macro_rules! impl_assert_events_helpers_for_relay_chain {
 #[macro_export]
 macro_rules! impl_hrmp_channels_helpers_for_relay_chain {
 	( $chain:ident ) => {
-		$crate::paste::paste! {
+		$crate::impls::paste::paste! {
 			impl $chain {
 				/// Init open channel request with another Parachain
 				pub fn init_open_channel_call(
-					recipient_para_id: ParaId,
+					recipient_para_id: $crate::impls::ParaId,
 					max_capacity: u32,
 					max_message_size: u32,
-				) -> DoubleEncoded<()> {
-					<Self as Chain>::RuntimeCall::Hrmp(polkadot_runtime_parachains::hrmp::Call::<
-						<Self as Chain>::Runtime,
+				) -> $crate::impls::DoubleEncoded<()> {
+					use $crate::impls::Encode;
+
+					<Self as $crate::impls::Chain>::RuntimeCall::Hrmp($crate::impls::hrmp::Call::<
+						<Self as $crate::impls::Chain>::Runtime,
 					>::hrmp_init_open_channel {
 						recipient: recipient_para_id,
 						proposed_max_capacity: max_capacity,
@@ -266,9 +306,11 @@ macro_rules! impl_hrmp_channels_helpers_for_relay_chain {
 					.into()
 				}
 				/// Recipient Parachain accept the open request from another Parachain
-				pub fn accept_open_channel_call(sender_para_id: ParaId) -> DoubleEncoded<()> {
-					<Self as Chain>::RuntimeCall::Hrmp(polkadot_runtime_parachains::hrmp::Call::<
-						<Self as Chain>::Runtime,
+				pub fn accept_open_channel_call(sender_para_id: $crate::impls::ParaId) -> $crate::impls::DoubleEncoded<()> {
+					use $crate::impls::Encode;
+
+					<Self as $crate::impls::Chain>::RuntimeCall::Hrmp($crate::impls::hrmp::Call::<
+						<Self as $crate::impls::Chain>::Runtime,
 					>::hrmp_accept_open_channel {
 						sender: sender_para_id,
 					})
@@ -277,19 +319,21 @@ macro_rules! impl_hrmp_channels_helpers_for_relay_chain {
 				}
 
 				/// A root origin force to open a channel between two Parachains
-				pub fn force_process_hrmp_open(sender: ParaId, recipient: ParaId) {
-					Self::execute_with(|| {
+				pub fn force_process_hrmp_open(sender: $crate::impls::ParaId, recipient: $crate::impls::ParaId) {
+					use $crate::impls::Chain;
+
+					<Self as $crate::impls::TestExt>::execute_with(|| {
 						let relay_root_origin = <Self as Chain>::RuntimeOrigin::root();
 
 						// Force process HRMP open channel requests without waiting for the next session
-						assert_ok!(<Self as [<$chain Pallet>]>::Hrmp::force_process_hrmp_open(
+						$crate::impls::assert_ok!(<Self as [<$chain Pallet>]>::Hrmp::force_process_hrmp_open(
 							relay_root_origin,
 							0
 						));
 
-						let channel_id = HrmpChannelId { sender, recipient };
+						let channel_id = $crate::impls::HrmpChannelId { sender, recipient };
 
-						let hrmp_channel_exist = polkadot_runtime_parachains::hrmp::HrmpChannels::<
+						let hrmp_channel_exist = $crate::impls::hrmp::HrmpChannels::<
 							<Self as Chain>::Runtime,
 						>::contains_key(&channel_id);
 
@@ -302,17 +346,48 @@ macro_rules! impl_hrmp_channels_helpers_for_relay_chain {
 	};
 }
 
+#[macro_export]
+macro_rules! impl_send_transact_helpers_for_relay_chain {
+	( $chain:ident ) => {
+		$crate::impls::paste::paste! {
+			impl $chain {
+				/// A root origin (as governance) sends `xcm::Transact` with `UnpaidExecution` and encoded `call` to child parachain.
+				pub fn send_unpaid_transact_to_parachain_as_root(
+					recipient: $crate::impls::ParaId,
+					call: $crate::impls::DoubleEncoded<()>
+				) {
+					use $crate::impls::{bx, Chain, RelayChain};
+
+					<Self as $crate::impls::TestExt>::execute_with(|| {
+						let root_origin = <Self as Chain>::RuntimeOrigin::root();
+						let destination:  $crate::impls::MultiLocation = <Self as RelayChain>::child_location_of(recipient);
+						let xcm = $crate::impls::xcm_transact_unpaid_execution(call, $crate::impls::OriginKind::Superuser);
+
+						// Send XCM `Transact`
+						$crate::impls::assert_ok!(<Self as [<$chain Pallet>]>::XcmPallet::send(
+							root_origin,
+							bx!(destination.into()),
+							bx!(xcm),
+						));
+						Self::assert_xcm_pallet_sent();
+					});
+				}
+			}
+		}
+	};
+}
+
 #[macro_export]
 macro_rules! impl_accounts_helpers_for_parachain {
 	( $chain:ident ) => {
-		$crate::paste::paste! {
+		$crate::impls::paste::paste! {
 			impl $chain {
 				/// Fund a set of accounts with a balance
-				pub fn fund_accounts(accounts: Vec<(AccountId, Balance)>) {
-					Self::execute_with(|| {
+				pub fn fund_accounts(accounts: Vec<($crate::impls::AccountId, $crate::impls::Balance)>) {
+					<Self as $crate::impls::TestExt>::execute_with(|| {
 						for account in accounts {
-							assert_ok!(<Self as [<$chain Pallet>]>::Balances::force_set_balance(
-								<Self as Chain>::RuntimeOrigin::root(),
+							$crate::impls::assert_ok!(<Self as [<$chain Pallet>]>::Balances::force_set_balance(
+								<Self as $crate::impls::Chain>::RuntimeOrigin::root(),
 								account.0.into(),
 								account.1,
 							));
@@ -327,20 +402,20 @@ macro_rules! impl_accounts_helpers_for_parachain {
 #[macro_export]
 macro_rules! impl_assert_events_helpers_for_parachain {
 	( $chain:ident ) => {
-		$crate::paste::paste! {
-			type [<$chain RuntimeEvent>] = <$chain as Chain>::RuntimeEvent;
+		$crate::impls::paste::paste! {
+			type [<$chain RuntimeEvent>] = <$chain as $crate::impls::Chain>::RuntimeEvent;
 
 			impl $chain {
 				/// Asserts a dispatchable is completely executed and XCM sent
-				pub fn assert_xcm_pallet_attempted_complete(expected_weight: Option<Weight>) {
-					assert_expected_events!(
+				pub fn assert_xcm_pallet_attempted_complete(expected_weight: Option<$crate::impls::Weight>) {
+					$crate::impls::assert_expected_events!(
 						Self,
 						vec![
 							[<$chain RuntimeEvent>]::PolkadotXcm(
-								pallet_xcm::Event::Attempted { outcome: Outcome::Complete(weight) }
+								$crate::impls::pallet_xcm::Event::Attempted { outcome: $crate::impls::Outcome::Complete(weight) }
 							) => {
-								weight: weight_within_threshold(
-									(REF_TIME_THRESHOLD, PROOF_SIZE_THRESHOLD),
+								weight: $crate::impls::weight_within_threshold(
+									($crate::impls::REF_TIME_THRESHOLD, $crate::impls::PROOF_SIZE_THRESHOLD),
 									expected_weight.unwrap_or(*weight),
 									*weight
 								),
@@ -351,18 +426,18 @@ macro_rules! impl_assert_events_helpers_for_parachain {
 
 				/// Asserts a dispatchable is incompletely executed and XCM sent
 				pub fn assert_xcm_pallet_attempted_incomplete(
-					expected_weight: Option<Weight>,
-					expected_error: Option<Error>,
+					expected_weight: Option<$crate::impls::Weight>,
+					expected_error: Option<$crate::impls::Error>,
 				) {
-					assert_expected_events!(
+					$crate::impls::assert_expected_events!(
 						Self,
 						vec![
 							// Dispatchable is properly executed and XCM message sent
 							[<$chain RuntimeEvent>]::PolkadotXcm(
-								pallet_xcm::Event::Attempted { outcome: Outcome::Incomplete(weight, error) }
+								$crate::impls::pallet_xcm::Event::Attempted { outcome: $crate::impls::Outcome::Incomplete(weight, error) }
 							) => {
-								weight: weight_within_threshold(
-									(REF_TIME_THRESHOLD, PROOF_SIZE_THRESHOLD),
+								weight: $crate::impls::weight_within_threshold(
+									($crate::impls::REF_TIME_THRESHOLD, $crate::impls::PROOF_SIZE_THRESHOLD),
 									expected_weight.unwrap_or(*weight),
 									*weight
 								),
@@ -373,13 +448,13 @@ macro_rules! impl_assert_events_helpers_for_parachain {
 				}
 
 				/// Asserts a dispatchable throws and error when trying to be sent
-				pub fn assert_xcm_pallet_attempted_error(expected_error: Option<Error>) {
-					assert_expected_events!(
+				pub fn assert_xcm_pallet_attempted_error(expected_error: Option<$crate::impls::Error>) {
+					$crate::impls::assert_expected_events!(
 						Self,
 						vec![
 							// Execution fails in the origin with `Barrier`
 							[<$chain RuntimeEvent>]::PolkadotXcm(
-								pallet_xcm::Event::Attempted { outcome: Outcome::Error(error) }
+								$crate::impls::pallet_xcm::Event::Attempted { outcome: $crate::impls::Outcome::Error(error) }
 							) => {
 								error: *error == expected_error.unwrap_or(*error),
 							},
@@ -389,36 +464,36 @@ macro_rules! impl_assert_events_helpers_for_parachain {
 
 				/// Asserts a XCM message is sent
 				pub fn assert_xcm_pallet_sent() {
-					assert_expected_events!(
+					$crate::impls::assert_expected_events!(
 						Self,
 						vec![
-							[<$chain RuntimeEvent>]::PolkadotXcm(pallet_xcm::Event::Sent { .. }) => {},
+							[<$chain RuntimeEvent>]::PolkadotXcm($crate::impls::pallet_xcm::Event::Sent { .. }) => {},
 						]
 					);
 				}
 
 				/// Asserts a XCM message is sent to Relay Chain
 				pub fn assert_parachain_system_ump_sent() {
-					assert_expected_events!(
+					$crate::impls::assert_expected_events!(
 						Self,
 						vec![
 							[<$chain RuntimeEvent>]::ParachainSystem(
-								cumulus_pallet_parachain_system::Event::UpwardMessageSent { .. }
+								$crate::impls::cumulus_pallet_parachain_system::Event::UpwardMessageSent { .. }
 							) => {},
 						]
 					);
 				}
 
 				/// Asserts a XCM from Relay Chain is completely executed
-				pub fn assert_dmp_queue_complete(expected_weight: Option<Weight>) {
-					assert_expected_events!(
+				pub fn assert_dmp_queue_complete(expected_weight: Option<$crate::impls::Weight>) {
+					$crate::impls::assert_expected_events!(
 						Self,
 						vec![
-							[<$chain RuntimeEvent>]::DmpQueue(cumulus_pallet_dmp_queue::Event::ExecutedDownward {
-								outcome: Outcome::Complete(weight), ..
+							[<$chain RuntimeEvent>]::DmpQueue($crate::impls::cumulus_pallet_dmp_queue::Event::ExecutedDownward {
+								outcome: $crate::impls::Outcome::Complete(weight), ..
 							}) => {
-								weight: weight_within_threshold(
-									(REF_TIME_THRESHOLD, PROOF_SIZE_THRESHOLD),
+								weight: $crate::impls::weight_within_threshold(
+									($crate::impls::REF_TIME_THRESHOLD, $crate::impls::PROOF_SIZE_THRESHOLD),
 									expected_weight.unwrap_or(*weight),
 									*weight
 								),
@@ -429,17 +504,17 @@ macro_rules! impl_assert_events_helpers_for_parachain {
 
 				/// Asserts a XCM from Relay Chain is incompletely executed
 				pub fn assert_dmp_queue_incomplete(
-					expected_weight: Option<Weight>,
-					expected_error: Option<Error>,
+					expected_weight: Option<$crate::impls::Weight>,
+					expected_error: Option<$crate::impls::Error>,
 				) {
-					assert_expected_events!(
+					$crate::impls::assert_expected_events!(
 						Self,
 						vec![
-							[<$chain RuntimeEvent>]::DmpQueue(cumulus_pallet_dmp_queue::Event::ExecutedDownward {
-								outcome: Outcome::Incomplete(weight, error), ..
+							[<$chain RuntimeEvent>]::DmpQueue($crate::impls::cumulus_pallet_dmp_queue::Event::ExecutedDownward {
+								outcome: $crate::impls::Outcome::Incomplete(weight, error), ..
 							}) => {
-								weight: weight_within_threshold(
-									(REF_TIME_THRESHOLD, PROOF_SIZE_THRESHOLD),
+								weight: $crate::impls::weight_within_threshold(
+									($crate::impls::REF_TIME_THRESHOLD, $crate::impls::PROOF_SIZE_THRESHOLD),
 									expected_weight.unwrap_or(*weight),
 									*weight
 								),
@@ -449,16 +524,32 @@ macro_rules! impl_assert_events_helpers_for_parachain {
 					);
 				}
 
+				/// Asserts a XCM from Relay Chain is executed with error
+				pub fn assert_dmp_queue_error(
+					expected_error: $crate::impls::Error,
+				) {
+					$crate::impls::assert_expected_events!(
+						Self,
+						vec![
+							[<$chain RuntimeEvent>]::DmpQueue($crate::impls::cumulus_pallet_dmp_queue::Event::ExecutedDownward {
+								outcome: $crate::impls::Outcome::Error(error), ..
+							}) => {
+								error: *error == expected_error,
+							},
+						]
+					);
+				}
+
 				/// Asserts a XCM from another Parachain is completely executed
-				pub fn assert_xcmp_queue_success(expected_weight: Option<Weight>) {
-					assert_expected_events!(
+				pub fn assert_xcmp_queue_success(expected_weight: Option<$crate::impls::Weight>) {
+					$crate::impls::assert_expected_events!(
 						Self,
 						vec![
 							[<$chain RuntimeEvent>]::XcmpQueue(
-								cumulus_pallet_xcmp_queue::Event::Success { weight, .. }
+								$crate::impls::cumulus_pallet_xcmp_queue::Event::Success { weight, .. }
 							) => {
-								weight: weight_within_threshold(
-									(REF_TIME_THRESHOLD, PROOF_SIZE_THRESHOLD),
+								weight: $crate::impls::weight_within_threshold(
+									($crate::impls::REF_TIME_THRESHOLD, $crate::impls::PROOF_SIZE_THRESHOLD),
 									expected_weight.unwrap_or(*weight),
 									*weight
 								),
@@ -474,18 +565,20 @@ macro_rules! impl_assert_events_helpers_for_parachain {
 #[macro_export]
 macro_rules! impl_assets_helpers_for_parachain {
 	( $chain:ident, $relay_chain:ident ) => {
-		$crate::paste::paste! {
+		$crate::impls::paste::paste! {
 			impl $chain {
 				/// Returns the encoded call for `force_create` from the assets pallet
 				pub fn force_create_asset_call(
 					asset_id: u32,
-					owner: AccountId,
+					owner: $crate::impls::AccountId,
 					is_sufficient: bool,
-					min_balance: Balance,
-				) -> DoubleEncoded<()> {
-					<Self as Chain>::RuntimeCall::Assets(pallet_assets::Call::<
+					min_balance: $crate::impls::Balance,
+				) -> $crate::impls::DoubleEncoded<()> {
+					use $crate::impls::{Chain, Encode};
+
+					<Self as Chain>::RuntimeCall::Assets($crate::impls::pallet_assets::Call::<
 						<Self as Chain>::Runtime,
-						Instance1,
+						$crate::impls::pallet_assets::Instance1,
 					>::force_create {
 						id: asset_id.into(),
 						owner: owner.into(),
@@ -498,37 +591,37 @@ macro_rules! impl_assets_helpers_for_parachain {
 
 				/// Returns a `VersionedXcm` for `force_create` from the assets pallet
 				pub fn force_create_asset_xcm(
-					origin_kind: OriginKind,
+					origin_kind: $crate::impls::OriginKind,
 					asset_id: u32,
-					owner: AccountId,
+					owner: $crate::impls::AccountId,
 					is_sufficient: bool,
-					min_balance: Balance,
-				) -> VersionedXcm<()> {
+					min_balance: $crate::impls::Balance,
+				) -> $crate::impls::VersionedXcm<()> {
 					let call = Self::force_create_asset_call(asset_id, owner, is_sufficient, min_balance);
-					xcm_transact_unpaid_execution(call, origin_kind)
+					$crate::impls::xcm_transact_unpaid_execution(call, origin_kind)
 				}
 
 				/// Mint assets making use of the assets pallet
 				pub fn mint_asset(
-					signed_origin: <Self as Chain>::RuntimeOrigin,
+					signed_origin: <Self as $crate::impls::Chain>::RuntimeOrigin,
 					id: u32,
-					beneficiary: AccountId,
+					beneficiary: $crate::impls::AccountId,
 					amount_to_mint: u128,
 				) {
-					Self::execute_with(|| {
-						assert_ok!(<Self as [<$chain Pallet>]>::Assets::mint(
+					<Self as $crate::impls::TestExt>::execute_with(|| {
+						$crate::impls::assert_ok!(<Self as [<$chain Pallet>]>::Assets::mint(
 							signed_origin,
 							id.into(),
 							beneficiary.clone().into(),
 							amount_to_mint
 						));
 
-						type RuntimeEvent = <$chain as Chain>::RuntimeEvent;
+						type RuntimeEvent = <$chain as $crate::impls::Chain>::RuntimeEvent;
 
-						assert_expected_events!(
+						$crate::impls::assert_expected_events!(
 							Self,
 							vec![
-								RuntimeEvent::Assets(pallet_assets::Event::Issued { asset_id, owner, amount }) => {
+								RuntimeEvent::Assets($crate::impls::pallet_assets::Event::Issued { asset_id, owner, amount }) => {
 									asset_id: *asset_id == id,
 									owner: *owner == beneficiary.clone().into(),
 									amount: *amount == amount_to_mint,
@@ -543,53 +636,59 @@ macro_rules! impl_assets_helpers_for_parachain {
 					id: u32,
 					min_balance: u128,
 					is_sufficient: bool,
-					asset_owner: AccountId,
+					asset_owner: $crate::impls::AccountId,
+					dmp_weight_threshold: Option<$crate::impls::Weight>,
 					amount_to_mint: u128,
 				) {
-					// Init values for Relay Chain
-					let root_origin = <$relay_chain as Chain>::RuntimeOrigin::root();
-					let destination = <$relay_chain>::child_location_of(<$chain>::para_id());
-					let xcm = Self::force_create_asset_xcm(
-						OriginKind::Superuser,
+					use $crate::impls::Chain;
+
+					// Force create asset
+					Self::force_create_asset_from_relay_as_root(
 						id,
-						asset_owner.clone(),
-						is_sufficient,
 						min_balance,
+						is_sufficient,
+						asset_owner.clone(),
+						dmp_weight_threshold
 					);
 
-					<$relay_chain>::execute_with(|| {
-						assert_ok!(<$relay_chain as [<$relay_chain Pallet>]>::XcmPallet::send(
-							root_origin,
-							bx!(destination.into()),
-							bx!(xcm),
-						));
+					// Mint asset for System Parachain's sender
+					let signed_origin = <Self as Chain>::RuntimeOrigin::signed(asset_owner.clone());
+					Self::mint_asset(signed_origin, id, asset_owner, amount_to_mint);
+				}
 
-						<$relay_chain>::assert_xcm_pallet_sent();
-					});
+				/// Relay Chain sends `Transact` instruction with `force_create_asset` to Parachain with `Assets` instance of `pallet_assets` .
+				pub fn force_create_asset_from_relay_as_root(
+					id: u32,
+					min_balance: u128,
+					is_sufficient: bool,
+					asset_owner: $crate::impls::AccountId,
+					dmp_weight_threshold: Option<$crate::impls::Weight>,
+				) {
+					use $crate::impls::{Parachain, Inspect, TestExt};
 
+					<$relay_chain>::send_unpaid_transact_to_parachain_as_root(
+						Self::para_id(),
+						Self::force_create_asset_call(id, asset_owner.clone(), is_sufficient, min_balance),
+					);
+
+					// Receive XCM message in Assets Parachain
 					Self::execute_with(|| {
-						Self::assert_dmp_queue_complete(Some(Weight::from_parts(1_019_445_000, 200_000)));
+						type RuntimeEvent = <$chain as $crate::impls::Chain>::RuntimeEvent;
 
-						type RuntimeEvent = <$chain as Chain>::RuntimeEvent;
+						Self::assert_dmp_queue_complete(dmp_weight_threshold);
 
-						assert_expected_events!(
+						$crate::impls::assert_expected_events!(
 							Self,
 							vec![
-								// Asset has been created
-								RuntimeEvent::Assets(pallet_assets::Event::ForceCreated { asset_id, owner }) => {
+								RuntimeEvent::Assets($crate::impls::pallet_assets::Event::ForceCreated { asset_id, owner }) => {
 									asset_id: *asset_id == id,
-									owner: *owner == asset_owner.clone(),
+									owner: *owner == asset_owner,
 								},
 							]
 						);
 
 						assert!(<Self as [<$chain Pallet>]>::Assets::asset_exists(id.into()));
 					});
-
-					let signed_origin = <Self as Chain>::RuntimeOrigin::signed(asset_owner.clone());
-
-					// Mint asset for System Parachain's sender
-					Self::mint_asset(signed_origin, id, asset_owner, amount_to_mint);
 				}
 			}
 		}
diff --git a/cumulus/parachains/integration-tests/emulated/common/src/lib.rs b/cumulus/parachains/integration-tests/emulated/common/src/lib.rs
index f6d589700360cfafef7d59255fafe876e3de5a87..e9a30aadedd497ee50f5074d3c9c716f49659235 100644
--- a/cumulus/parachains/integration-tests/emulated/common/src/lib.rs
+++ b/cumulus/parachains/integration-tests/emulated/common/src/lib.rs
@@ -1,76 +1,48 @@
-pub use lazy_static;
+// 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.
+
 pub mod constants;
 pub mod impls;
+pub mod macros;
+pub mod xcm_helpers;
 
-pub use codec::Encode;
-pub use constants::{
+use constants::{
 	accounts::{ALICE, BOB},
-	asset_hub_kusama, asset_hub_polkadot, asset_hub_westend, bridge_hub_kusama,
-	bridge_hub_polkadot, bridge_hub_rococo, collectives, kusama, penpal, polkadot, rococo, westend,
-	PROOF_SIZE_THRESHOLD, REF_TIME_THRESHOLD,
-};
-use frame_support::{
-	assert_ok,
-	instances::Instance1,
-	parameter_types,
-	traits::{fungibles::Inspect, Hooks},
+	asset_hub_rococo, asset_hub_westend, bridge_hub_rococo, penpal, rococo, westend,
 };
-pub use impls::{RococoWococoMessageHandler, WococoRococoMessageHandler};
-pub use parachains_common::{AccountId, Balance};
+use impls::{RococoWococoMessageHandler, WococoRococoMessageHandler};
 pub use paste;
-use polkadot_parachain::primitives::HrmpChannelId;
-pub use polkadot_runtime_parachains::inclusion::{AggregateMessageOrigin, UmpQueueId};
-pub use sp_core::{sr25519, storage::Storage, Get};
-use sp_tracing;
+
+// Substrate
+use frame_support::traits::OnInitialize;
+pub use pallet_balances;
+
+// Cumulus
+pub use cumulus_pallet_xcmp_queue;
+pub use xcm_emulator::Chain;
 use xcm_emulator::{
-	assert_expected_events, bx, decl_test_bridges, decl_test_networks, decl_test_parachains,
-	decl_test_relay_chains, decl_test_sender_receiver_accounts_parameter_types,
-	helpers::weight_within_threshold, BridgeMessageHandler, Chain, DefaultMessageProcessor, ParaId,
-	Parachain, RelayChain, TestExt,
+	decl_test_bridges, decl_test_networks, decl_test_parachains, decl_test_relay_chains,
+	decl_test_sender_receiver_accounts_parameter_types, DefaultMessageProcessor,
 };
 
-pub use xcm::{
-	prelude::{
-		AccountId32, All, BuyExecution, DepositAsset, MultiAsset, MultiAssets, MultiLocation,
-		OriginKind, Outcome, RefundSurplus, Transact, UnpaidExecution, VersionedXcm, Weight,
-		WeightLimit, WithdrawAsset, Xcm, X1,
-	},
-	v3::Error,
-	DoubleEncoded,
-};
+// Polkadot
+pub use pallet_xcm;
+pub use xcm::prelude::{AccountId32, WeightLimit};
 
 decl_test_relay_chains! {
-	#[api_version(5)]
-	pub struct Polkadot {
-		genesis = polkadot::genesis(),
-		on_init = (),
-		runtime = polkadot_runtime,
-		core = {
-			MessageProcessor: DefaultMessageProcessor<Polkadot>,
-			SovereignAccountOf: polkadot_runtime::xcm_config::SovereignAccountOf,
-		},
-		pallets = {
-			XcmPallet: polkadot_runtime::XcmPallet,
-			Balances: polkadot_runtime::Balances,
-			Hrmp: polkadot_runtime::Hrmp,
-		}
-	},
-	#[api_version(5)]
-	pub struct Kusama {
-		genesis = kusama::genesis(),
-		on_init = (),
-		runtime = kusama_runtime,
-		core = {
-			MessageProcessor: DefaultMessageProcessor<Kusama>,
-			SovereignAccountOf: kusama_runtime::xcm_config::SovereignAccountOf,
-		},
-		pallets = {
-			XcmPallet: kusama_runtime::XcmPallet,
-			Balances: kusama_runtime::Balances,
-			Hrmp: kusama_runtime::Hrmp,
-		}
-	},
-	#[api_version(5)]
+	#[api_version(8)]
 	pub struct Westend {
 		genesis = westend::genesis(),
 		on_init = (),
@@ -83,9 +55,11 @@ decl_test_relay_chains! {
 			XcmPallet: westend_runtime::XcmPallet,
 			Sudo: westend_runtime::Sudo,
 			Balances: westend_runtime::Balances,
+			Treasury: westend_runtime::Treasury,
+			AssetRate: westend_runtime::AssetRate,
 		}
 	},
-	#[api_version(5)]
+	#[api_version(8)]
 	pub struct Rococo {
 		genesis = rococo::genesis(),
 		on_init = (),
@@ -100,7 +74,7 @@ decl_test_relay_chains! {
 			Balances: rococo_runtime::Balances,
 		}
 	},
-	#[api_version(5)]
+	#[api_version(8)]
 	pub struct Wococo {
 		genesis = rococo::genesis(),
 		on_init = (),
@@ -118,164 +92,6 @@ decl_test_relay_chains! {
 }
 
 decl_test_parachains! {
-	// Polkadot Parachains
-	pub struct AssetHubPolkadot {
-		genesis = asset_hub_polkadot::genesis(),
-		on_init = {
-			asset_hub_polkadot_runtime::AuraExt::on_initialize(1);
-		},
-		runtime = asset_hub_polkadot_runtime,
-		core = {
-			XcmpMessageHandler: asset_hub_polkadot_runtime::XcmpQueue,
-			DmpMessageHandler: asset_hub_polkadot_runtime::DmpQueue,
-			LocationToAccountId: asset_hub_polkadot_runtime::xcm_config::LocationToAccountId,
-			ParachainInfo: asset_hub_polkadot_runtime::ParachainInfo,
-		},
-		pallets = {
-			PolkadotXcm: asset_hub_polkadot_runtime::PolkadotXcm,
-			Assets: asset_hub_polkadot_runtime::Assets,
-			Balances: asset_hub_polkadot_runtime::Balances,
-		}
-	},
-	pub struct Collectives {
-		genesis = collectives::genesis(),
-		on_init = {
-			collectives_polkadot_runtime::AuraExt::on_initialize(1);
-		},
-		runtime = collectives_polkadot_runtime,
-		core = {
-			XcmpMessageHandler: collectives_polkadot_runtime::XcmpQueue,
-			DmpMessageHandler: collectives_polkadot_runtime::DmpQueue,
-			LocationToAccountId: collectives_polkadot_runtime::xcm_config::LocationToAccountId,
-			ParachainInfo: collectives_polkadot_runtime::ParachainInfo,
-		},
-		pallets = {
-			PolkadotXcm: collectives_polkadot_runtime::PolkadotXcm,
-			Balances: collectives_polkadot_runtime::Balances,
-		}
-	},
-	pub struct BridgeHubPolkadot {
-		genesis = bridge_hub_polkadot::genesis(),
-		on_init = {
-			bridge_hub_polkadot_runtime::AuraExt::on_initialize(1);
-		},
-		runtime = bridge_hub_polkadot_runtime,
-		core = {
-			XcmpMessageHandler: bridge_hub_polkadot_runtime::XcmpQueue,
-			DmpMessageHandler: bridge_hub_polkadot_runtime::DmpQueue,
-			LocationToAccountId: bridge_hub_polkadot_runtime::xcm_config::LocationToAccountId,
-			ParachainInfo: bridge_hub_polkadot_runtime::ParachainInfo,
-		},
-		pallets = {
-			PolkadotXcm: bridge_hub_polkadot_runtime::PolkadotXcm,
-		}
-	},
-	pub struct PenpalPolkadotA {
-		genesis = penpal::genesis(penpal::PARA_ID_A),
-		on_init = {
-			penpal_runtime::AuraExt::on_initialize(1);
-		},
-		runtime = penpal_runtime,
-		core = {
-			XcmpMessageHandler: penpal_runtime::XcmpQueue,
-			DmpMessageHandler: penpal_runtime::DmpQueue,
-			LocationToAccountId: penpal_runtime::xcm_config::LocationToAccountId,
-			ParachainInfo: penpal_runtime::ParachainInfo,
-		},
-		pallets = {
-			PolkadotXcm: penpal_runtime::PolkadotXcm,
-			Assets: penpal_runtime::Assets,
-		}
-	},
-	pub struct PenpalPolkadotB {
-		genesis = penpal::genesis(penpal::PARA_ID_B),
-		on_init = {
-			penpal_runtime::AuraExt::on_initialize(1);
-		},
-		runtime = penpal_runtime,
-		core = {
-			XcmpMessageHandler: penpal_runtime::XcmpQueue,
-			DmpMessageHandler: penpal_runtime::DmpQueue,
-			LocationToAccountId: penpal_runtime::xcm_config::LocationToAccountId,
-			ParachainInfo: penpal_runtime::ParachainInfo,
-		},
-		pallets = {
-			PolkadotXcm: penpal_runtime::PolkadotXcm,
-			Assets: penpal_runtime::Assets,
-		}
-	},
-	// Kusama Parachains
-	pub struct AssetHubKusama {
-		genesis = asset_hub_kusama::genesis(),
-		on_init = {
-			asset_hub_kusama_runtime::AuraExt::on_initialize(1);
-		},
-		runtime = asset_hub_kusama_runtime,
-		core = {
-			XcmpMessageHandler: asset_hub_kusama_runtime::XcmpQueue,
-			DmpMessageHandler: asset_hub_kusama_runtime::DmpQueue,
-			LocationToAccountId: asset_hub_kusama_runtime::xcm_config::LocationToAccountId,
-			ParachainInfo: asset_hub_kusama_runtime::ParachainInfo,
-		},
-		pallets = {
-			PolkadotXcm: asset_hub_kusama_runtime::PolkadotXcm,
-			Assets: asset_hub_kusama_runtime::Assets,
-			ForeignAssets: asset_hub_kusama_runtime::ForeignAssets,
-			PoolAssets: asset_hub_kusama_runtime::PoolAssets,
-			AssetConversion: asset_hub_kusama_runtime::AssetConversion,
-			Balances: asset_hub_kusama_runtime::Balances,
-		}
-	},
-	pub struct BridgeHubKusama {
-		genesis = bridge_hub_kusama::genesis(),
-		on_init = {
-			bridge_hub_kusama_runtime::AuraExt::on_initialize(1);
-		},
-		runtime = bridge_hub_kusama_runtime,
-		core = {
-			XcmpMessageHandler: bridge_hub_kusama_runtime::XcmpQueue,
-			DmpMessageHandler: bridge_hub_kusama_runtime::DmpQueue,
-			LocationToAccountId: bridge_hub_kusama_runtime::xcm_config::LocationToAccountId,
-			ParachainInfo: bridge_hub_kusama_runtime::ParachainInfo,
-		},
-		pallets = {
-			PolkadotXcm: bridge_hub_kusama_runtime::PolkadotXcm,
-		}
-	},
-	pub struct PenpalKusamaA {
-		genesis = penpal::genesis(penpal::PARA_ID_A),
-		on_init = {
-			penpal_runtime::AuraExt::on_initialize(1);
-		},
-		runtime = penpal_runtime,
-		core = {
-			XcmpMessageHandler: penpal_runtime::XcmpQueue,
-			DmpMessageHandler: penpal_runtime::DmpQueue,
-			LocationToAccountId: penpal_runtime::xcm_config::LocationToAccountId,
-			ParachainInfo: penpal_runtime::ParachainInfo,
-		},
-		pallets = {
-			PolkadotXcm: penpal_runtime::PolkadotXcm,
-			Assets: penpal_runtime::Assets,
-		}
-	},
-	pub struct PenpalKusamaB {
-		genesis = penpal::genesis(penpal::PARA_ID_B),
-		on_init = {
-			penpal_runtime::AuraExt::on_initialize(1);
-		},
-		runtime = penpal_runtime,
-		core = {
-			XcmpMessageHandler: penpal_runtime::XcmpQueue,
-			DmpMessageHandler: penpal_runtime::DmpQueue,
-			LocationToAccountId: penpal_runtime::xcm_config::LocationToAccountId,
-			ParachainInfo: penpal_runtime::ParachainInfo,
-		},
-		pallets = {
-			PolkadotXcm: penpal_runtime::PolkadotXcm,
-			Assets: penpal_runtime::Assets,
-		}
-	},
 	// Westend Parachains
 	pub struct AssetHubWestend {
 		genesis = asset_hub_westend::genesis(),
@@ -313,6 +129,7 @@ decl_test_parachains! {
 		pallets = {
 			PolkadotXcm: penpal_runtime::PolkadotXcm,
 			Assets: penpal_runtime::Assets,
+			Balances: penpal_runtime::Balances,
 		}
 	},
 	// Rococo Parachains
@@ -335,7 +152,7 @@ decl_test_parachains! {
 	},
 	// AssetHubRococo (aka Rockmine/Rockmine2) mirrors AssetHubKusama
 	pub struct AssetHubRococo {
-		genesis = asset_hub_kusama::genesis(),
+		genesis = asset_hub_rococo::genesis(),
 		on_init = {
 			asset_hub_polkadot_runtime::AuraExt::on_initialize(1);
 		},
@@ -349,6 +166,7 @@ decl_test_parachains! {
 		pallets = {
 			PolkadotXcm: asset_hub_kusama_runtime::PolkadotXcm,
 			Assets: asset_hub_kusama_runtime::Assets,
+			Balances: asset_hub_kusama_runtime::Balances,
 		}
 	},
 	// Wococo Parachains
@@ -369,7 +187,7 @@ decl_test_parachains! {
 		}
 	},
 	pub struct AssetHubWococo {
-		genesis = asset_hub_polkadot::genesis(),
+		genesis = asset_hub_westend::genesis(),
 		on_init = {
 			asset_hub_polkadot_runtime::AuraExt::on_initialize(1);
 		},
@@ -383,6 +201,7 @@ decl_test_parachains! {
 		pallets = {
 			PolkadotXcm: asset_hub_polkadot_runtime::PolkadotXcm,
 			Assets: asset_hub_polkadot_runtime::Assets,
+			Balances: asset_hub_polkadot_runtime::Balances,
 		}
 	},
 	pub struct PenpalRococoA {
@@ -405,31 +224,6 @@ decl_test_parachains! {
 }
 
 decl_test_networks! {
-	pub struct PolkadotMockNet {
-		relay_chain = Polkadot,
-		parachains = vec![
-			AssetHubPolkadot,
-			Collectives,
-			BridgeHubPolkadot,
-			PenpalPolkadotA,
-			PenpalPolkadotB,
-		],
-		// TODO: uncomment when https://github.com/paritytech/cumulus/pull/2528 is merged
-		// bridge = PolkadotKusamaMockBridge
-		bridge = ()
-	},
-	pub struct KusamaMockNet {
-		relay_chain = Kusama,
-		parachains = vec![
-			AssetHubKusama,
-			PenpalKusamaA,
-			BridgeHubKusama,
-			PenpalKusamaB,
-		],
-		// TODO: uncomment when https://github.com/paritytech/cumulus/pull/2528 is merged
-		// bridge = KusamaPolkadotMockBridge
-		bridge = ()
-	},
 	pub struct WestendMockNet {
 		relay_chain = Westend,
 		parachains = vec![
@@ -468,141 +262,48 @@ decl_test_bridges! {
 		target = BridgeHubRococo,
 		handler = WococoRococoMessageHandler
 	}
-	// TODO: uncomment when https://github.com/paritytech/cumulus/pull/2528 is merged
-	// pub struct PolkadotKusamaMockBridge {
-	// 	source = BridgeHubPolkadot,
-	// 	target = BridgeHubKusama,
-	//  handler = PolkadotKusamaMessageHandler
-	// },
-	// pub struct KusamaPolkadotMockBridge {
-	// 	source = BridgeHubKusama,
-	// 	target = BridgeHubPolkadot,
-	// 	handler = KusamaPolkadotMessageHandler
-	// }
 }
 
-// Polkadot implementation
-impl_accounts_helpers_for_relay_chain!(Polkadot);
-impl_assert_events_helpers_for_relay_chain!(Polkadot);
-impl_hrmp_channels_helpers_for_relay_chain!(Polkadot);
-
-// Kusama implementation
-impl_accounts_helpers_for_relay_chain!(Kusama);
-impl_assert_events_helpers_for_relay_chain!(Kusama);
-impl_hrmp_channels_helpers_for_relay_chain!(Kusama);
-
 // Westend implementation
 impl_accounts_helpers_for_relay_chain!(Westend);
 impl_assert_events_helpers_for_relay_chain!(Westend);
+impl_send_transact_helpers_for_relay_chain!(Westend);
 
 // Rococo implementation
 impl_accounts_helpers_for_relay_chain!(Rococo);
 impl_assert_events_helpers_for_relay_chain!(Rococo);
+impl_send_transact_helpers_for_relay_chain!(Rococo);
 
 // Wococo implementation
 impl_accounts_helpers_for_relay_chain!(Wococo);
 impl_assert_events_helpers_for_relay_chain!(Wococo);
-
-// AssetHubPolkadot implementation
-impl_accounts_helpers_for_parachain!(AssetHubPolkadot);
-impl_assets_helpers_for_parachain!(AssetHubPolkadot, Polkadot);
-impl_assert_events_helpers_for_parachain!(AssetHubPolkadot);
-
-// AssetHubKusama implementation
-impl_accounts_helpers_for_parachain!(AssetHubKusama);
-impl_assets_helpers_for_parachain!(AssetHubKusama, Kusama);
-impl_assert_events_helpers_for_parachain!(AssetHubKusama);
+impl_send_transact_helpers_for_relay_chain!(Wococo);
 
 // AssetHubWestend implementation
 impl_accounts_helpers_for_parachain!(AssetHubWestend);
 impl_assets_helpers_for_parachain!(AssetHubWestend, Westend);
 impl_assert_events_helpers_for_parachain!(AssetHubWestend);
 
-// PenpalPolkadot implementations
-impl_assert_events_helpers_for_parachain!(PenpalPolkadotA);
-impl_assert_events_helpers_for_parachain!(PenpalPolkadotB);
-
-// PenpalKusama implementations
-impl_assert_events_helpers_for_parachain!(PenpalKusamaA);
-impl_assert_events_helpers_for_parachain!(PenpalKusamaB);
-
 // PenpalWestendA implementation
 impl_assert_events_helpers_for_parachain!(PenpalWestendA);
 
-// Collectives implementation
-impl_accounts_helpers_for_parachain!(Collectives);
-impl_assert_events_helpers_for_parachain!(Collectives);
-
 // BridgeHubRococo implementation
 impl_accounts_helpers_for_parachain!(BridgeHubRococo);
 impl_assert_events_helpers_for_parachain!(BridgeHubRococo);
 
 decl_test_sender_receiver_accounts_parameter_types! {
 	// Relays
-	Polkadot { sender: ALICE, receiver: BOB },
-	Kusama { sender: ALICE, receiver: BOB },
 	Westend { sender: ALICE, receiver: BOB },
 	Rococo { sender: ALICE, receiver: BOB },
 	Wococo { sender: ALICE, receiver: BOB },
 	// Asset Hubs
-	AssetHubPolkadot { sender: ALICE, receiver: BOB },
-	AssetHubKusama { sender: ALICE, receiver: BOB },
 	AssetHubWestend { sender: ALICE, receiver: BOB },
 	AssetHubRococo { sender: ALICE, receiver: BOB },
 	AssetHubWococo { sender: ALICE, receiver: BOB },
-	// Collectives
-	Collectives { sender: ALICE, receiver: BOB },
 	// Bridged Hubs
-	BridgeHubPolkadot { sender: ALICE, receiver: BOB },
-	BridgeHubKusama { sender: ALICE, receiver: BOB },
 	BridgeHubRococo { sender: ALICE, receiver: BOB },
 	BridgeHubWococo { sender: ALICE, receiver: BOB },
 	// Penpals
-	PenpalPolkadotA { sender: ALICE, receiver: BOB },
-	PenpalPolkadotB { sender: ALICE, receiver: BOB },
-	PenpalKusamaA { sender: ALICE, receiver: BOB },
-	PenpalKusamaB { sender: ALICE, receiver: BOB },
 	PenpalWestendA { sender: ALICE, receiver: BOB },
 	PenpalRococoA { sender: ALICE, receiver: BOB }
 }
-
-/// Helper method to build a XCM with a `Transact` instruction and paying for its execution
-pub fn xcm_transact_paid_execution(
-	call: DoubleEncoded<()>,
-	origin_kind: OriginKind,
-	native_asset: MultiAsset,
-	beneficiary: AccountId,
-) -> VersionedXcm<()> {
-	let weight_limit = WeightLimit::Unlimited;
-	let require_weight_at_most = Weight::from_parts(1000000000, 200000);
-	let native_assets: MultiAssets = native_asset.clone().into();
-
-	VersionedXcm::from(Xcm(vec![
-		WithdrawAsset(native_assets),
-		BuyExecution { fees: native_asset, weight_limit },
-		Transact { require_weight_at_most, origin_kind, call },
-		RefundSurplus,
-		DepositAsset {
-			assets: All.into(),
-			beneficiary: MultiLocation {
-				parents: 0,
-				interior: X1(AccountId32 { network: None, id: beneficiary.into() }),
-			},
-		},
-	]))
-}
-
-/// Helper method to build a XCM with a `Transact` instruction without paying for its execution
-pub fn xcm_transact_unpaid_execution(
-	call: DoubleEncoded<()>,
-	origin_kind: OriginKind,
-) -> VersionedXcm<()> {
-	let weight_limit = WeightLimit::Unlimited;
-	let require_weight_at_most = Weight::from_parts(1000000000, 200000);
-	let check_origin = None;
-
-	VersionedXcm::from(Xcm(vec![
-		UnpaidExecution { weight_limit, check_origin },
-		Transact { require_weight_at_most, origin_kind, call },
-	]))
-}
diff --git a/cumulus/parachains/integration-tests/emulated/common/src/macros.rs b/cumulus/parachains/integration-tests/emulated/common/src/macros.rs
new file mode 100644
index 0000000000000000000000000000000000000000..e87c361ebeacc611fee2861598dc1713b6ddc05d
--- /dev/null
+++ b/cumulus/parachains/integration-tests/emulated/common/src/macros.rs
@@ -0,0 +1,102 @@
+// 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.
+
+#[macro_export]
+macro_rules! test_parachain_is_trusted_teleporter {
+	( $sender_para:ty, vec![$( $receiver_para:ty ),+], ($assets:expr, $amount:expr) ) => {
+		$crate::paste::paste! {
+			// init Origin variables
+			let sender = [<$sender_para Sender>]::get();
+			let mut para_sender_balance_before =
+				<$sender_para as $crate::Chain>::account_data_of(sender.clone()).free;
+			let origin = <$sender_para as $crate::Chain>::RuntimeOrigin::signed(sender.clone());
+			let fee_asset_item = 0;
+			let weight_limit = $crate::WeightLimit::Unlimited;
+
+			$(
+				{
+					// init Destination variables
+					let receiver = [<$receiver_para Receiver>]::get();
+					let para_receiver_balance_before =
+						<$receiver_para as $crate::Chain>::account_data_of(receiver.clone()).free;
+					let para_destination =
+						<$sender_para>::sibling_location_of(<$receiver_para>::para_id()).into();
+					let beneficiary =
+						$crate::AccountId32 { network: None, id: receiver.clone().into() }.into();
+
+					// Send XCM message from Origin Parachain
+					// We are only testing the limited teleport version, which should be ok since success will
+					// depend only on a proper `XcmConfig` at destination.
+					<$sender_para>::execute_with(|| {
+						assert_ok!(<$sender_para as [<$sender_para Pallet>]>::PolkadotXcm::limited_teleport_assets(
+							origin.clone(),
+							bx!(para_destination),
+							bx!(beneficiary),
+							bx!($assets.clone()),
+							fee_asset_item,
+							weight_limit.clone(),
+						));
+
+						type RuntimeEvent = <$sender_para as $crate::Chain>::RuntimeEvent;
+
+						assert_expected_events!(
+							$sender_para,
+							vec![
+								RuntimeEvent::PolkadotXcm(
+									$crate::pallet_xcm::Event::Attempted { outcome: Outcome::Complete { .. } }
+								) => {},
+								RuntimeEvent::XcmpQueue(
+									$crate::cumulus_pallet_xcmp_queue::Event::XcmpMessageSent { .. }
+								) => {},
+								RuntimeEvent::Balances(
+									$crate::pallet_balances::Event::Withdraw { who: sender, amount }
+								) => {},
+							]
+						);
+					});
+
+					// Receive XCM message in Destination Parachain
+					<$receiver_para>::execute_with(|| {
+						type RuntimeEvent = <$receiver_para as $crate::Chain>::RuntimeEvent;
+
+						assert_expected_events!(
+							$receiver_para,
+							vec![
+								RuntimeEvent::Balances(
+									$crate::pallet_balances::Event::Deposit { who: receiver, .. }
+								) => {},
+								RuntimeEvent::XcmpQueue(
+									$crate::cumulus_pallet_xcmp_queue::Event::Success { .. }
+								) => {},
+							]
+						);
+					});
+
+					// Check if balances are updated accordingly in Origin and Destination Parachains
+					let para_sender_balance_after =
+						<$sender_para as $crate::Chain>::account_data_of(sender.clone()).free;
+					let para_receiver_balance_after =
+						<$receiver_para as $crate::Chain>::account_data_of(receiver.clone()).free;
+
+					assert_eq!(para_sender_balance_before - $amount, para_sender_balance_after);
+					assert!(para_receiver_balance_after > para_receiver_balance_before);
+
+					// Update sender balance
+					para_sender_balance_before = <$sender_para as $crate::Chain>::account_data_of(sender.clone()).free;
+				}
+			)+
+		}
+	};
+}
diff --git a/cumulus/parachains/integration-tests/emulated/common/src/xcm_helpers.rs b/cumulus/parachains/integration-tests/emulated/common/src/xcm_helpers.rs
new file mode 100644
index 0000000000000000000000000000000000000000..7c218bfbc092f319a115090a504808bcf28c1bea
--- /dev/null
+++ b/cumulus/parachains/integration-tests/emulated/common/src/xcm_helpers.rs
@@ -0,0 +1,65 @@
+// 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.
+
+use parachains_common::AccountId;
+use xcm::{
+	prelude::{
+		AccountId32, All, BuyExecution, DepositAsset, MultiAsset, MultiAssets, MultiLocation,
+		OriginKind, RefundSurplus, Transact, UnpaidExecution, VersionedXcm, Weight, WeightLimit,
+		WithdrawAsset, Xcm, X1,
+	},
+	DoubleEncoded,
+};
+
+/// Helper method to build a XCM with a `Transact` instruction and paying for its execution
+pub fn xcm_transact_paid_execution(
+	call: DoubleEncoded<()>,
+	origin_kind: OriginKind,
+	native_asset: MultiAsset,
+	beneficiary: AccountId,
+) -> VersionedXcm<()> {
+	let weight_limit = WeightLimit::Unlimited;
+	let require_weight_at_most = Weight::from_parts(1000000000, 200000);
+	let native_assets: MultiAssets = native_asset.clone().into();
+
+	VersionedXcm::from(Xcm(vec![
+		WithdrawAsset(native_assets),
+		BuyExecution { fees: native_asset, weight_limit },
+		Transact { require_weight_at_most, origin_kind, call },
+		RefundSurplus,
+		DepositAsset {
+			assets: All.into(),
+			beneficiary: MultiLocation {
+				parents: 0,
+				interior: X1(AccountId32 { network: None, id: beneficiary.into() }),
+			},
+		},
+	]))
+}
+
+/// Helper method to build a XCM with a `Transact` instruction without paying for its execution
+pub fn xcm_transact_unpaid_execution(
+	call: DoubleEncoded<()>,
+	origin_kind: OriginKind,
+) -> VersionedXcm<()> {
+	let weight_limit = WeightLimit::Unlimited;
+	let require_weight_at_most = Weight::from_parts(1000000000, 200000);
+	let check_origin = None;
+
+	VersionedXcm::from(Xcm(vec![
+		UnpaidExecution { weight_limit, check_origin },
+		Transact { require_weight_at_most, origin_kind, call },
+	]))
+}
diff --git a/cumulus/parachains/pallets/collective-content/Cargo.toml b/cumulus/parachains/pallets/collective-content/Cargo.toml
new file mode 100644
index 0000000000000000000000000000000000000000..1c831ac7268a54533acf38188b3dcf73edcec6c1
--- /dev/null
+++ b/cumulus/parachains/pallets/collective-content/Cargo.toml
@@ -0,0 +1,48 @@
+[package]
+name = "pallet-collective-content"
+version = "0.1.0"
+authors = ["Parity Technologies <admin@parity.io>"]
+edition = "2021"
+description = "Managed content"
+
+[dependencies]
+codec = { package = "parity-scale-codec", version = "3.0.0", default-features = false, features = ["derive", "max-encoded-len"] }
+scale-info = { version = "2.3.0", default-features = false, features = ["derive"] }
+
+frame-benchmarking = { path = "../../../../substrate/frame/benchmarking", optional = true, default-features = false }
+frame-support = { path = "../../../../substrate/frame/support", default-features = false }
+frame-system = { path = "../../../../substrate/frame/system", default-features = false }
+
+sp-core = { path = "../../../../substrate/primitives/core", default-features = false }
+sp-runtime = { path = "../../../../substrate/primitives/runtime", default-features = false }
+sp-std = { path = "../../../../substrate/primitives/std", default-features = false }
+
+[dev-dependencies]
+sp-io = { path = "../../../../substrate/primitives/io", default-features = false }
+
+[features]
+default = [ "std" ]
+runtime-benchmarks = [
+	"frame-benchmarking/runtime-benchmarks",
+	"frame-support/runtime-benchmarks",
+	"frame-system/runtime-benchmarks",
+	"sp-runtime/runtime-benchmarks",
+]
+
+try-runtime = [
+	"frame-support/try-runtime",
+	"frame-system/try-runtime",
+	"sp-runtime/try-runtime",
+]
+
+std = [
+	"codec/std",
+	"frame-benchmarking/std",
+	"frame-support/std",
+	"frame-system/std",
+	"scale-info/std",
+	"sp-core/std",
+	"sp-io/std",
+	"sp-runtime/std",
+	"sp-std/std",
+]
diff --git a/cumulus/parachains/pallets/collective-content/src/benchmarking.rs b/cumulus/parachains/pallets/collective-content/src/benchmarking.rs
new file mode 100644
index 0000000000000000000000000000000000000000..1f145f725b139b4e93481a9c69b0715471f7ec0b
--- /dev/null
+++ b/cumulus/parachains/pallets/collective-content/src/benchmarking.rs
@@ -0,0 +1,88 @@
+// Copyright (C) 2023 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.
+
+//! The pallet benchmarks.
+
+use super::{Pallet as CollectiveContent, *};
+use frame_benchmarking::{impl_benchmark_test_suite, v2::*};
+use frame_support::traits::EnsureOrigin;
+
+fn assert_last_event<T: Config<I>, I: 'static>(generic_event: <T as Config<I>>::RuntimeEvent) {
+	frame_system::Pallet::<T>::assert_last_event(generic_event.into());
+}
+
+/// returns CID hash of 68 bytes of given `i`.
+fn create_cid(i: u8) -> OpaqueCid {
+	let cid: OpaqueCid = [i; 68].to_vec().try_into().unwrap();
+	cid
+}
+
+#[instance_benchmarks]
+mod benchmarks {
+	use super::*;
+
+	#[benchmark]
+	fn set_charter() -> Result<(), BenchmarkError> {
+		let cid: OpaqueCid = create_cid(1);
+		let origin =
+			T::CharterOrigin::try_successful_origin().map_err(|_| BenchmarkError::Weightless)?;
+
+		#[extrinsic_call]
+		_(origin as T::RuntimeOrigin, cid.clone());
+
+		assert_eq!(Charter::<T, I>::get(), Some(cid.clone()));
+		assert_last_event::<T, I>(Event::NewCharterSet { cid }.into());
+		Ok(())
+	}
+
+	#[benchmark]
+	fn announce() -> Result<(), BenchmarkError> {
+		let expire_at = DispatchTime::<_>::At(10u32.into());
+		let now = frame_system::Pallet::<T>::block_number();
+		let cid: OpaqueCid = create_cid(1);
+		let origin = T::AnnouncementOrigin::try_successful_origin()
+			.map_err(|_| BenchmarkError::Weightless)?;
+
+		#[extrinsic_call]
+		_(origin as T::RuntimeOrigin, cid.clone(), Some(expire_at.clone()));
+
+		assert_eq!(<Announcements<T, I>>::count(), 1);
+		assert_last_event::<T, I>(
+			Event::AnnouncementAnnounced { cid, expire_at: expire_at.evaluate(now) }.into(),
+		);
+
+		Ok(())
+	}
+
+	#[benchmark]
+	fn remove_announcement() -> Result<(), BenchmarkError> {
+		let cid: OpaqueCid = create_cid(1);
+		let origin = T::AnnouncementOrigin::try_successful_origin()
+			.map_err(|_| BenchmarkError::Weightless)?;
+		CollectiveContent::<T, I>::announce(origin.clone(), cid.clone(), None)
+			.expect("could not publish an announcement");
+		assert_eq!(<Announcements<T, I>>::count(), 1);
+
+		#[extrinsic_call]
+		_(origin as T::RuntimeOrigin, cid.clone());
+
+		assert_eq!(<Announcements<T, I>>::count(), 0);
+		assert_last_event::<T, I>(Event::AnnouncementRemoved { cid }.into());
+
+		Ok(())
+	}
+
+	impl_benchmark_test_suite!(CollectiveContent, super::mock::new_bench_ext(), super::mock::Test);
+}
diff --git a/cumulus/parachains/pallets/collective-content/src/lib.rs b/cumulus/parachains/pallets/collective-content/src/lib.rs
new file mode 100644
index 0000000000000000000000000000000000000000..7a685858accb67868837e734ba9808741a4f7ea1
--- /dev/null
+++ b/cumulus/parachains/pallets/collective-content/src/lib.rs
@@ -0,0 +1,206 @@
+// Copyright (C) 2023 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.
+
+//! Managed Collective Content Pallet
+//!
+//! The pallet provides the functionality to store different types of content. This would typically
+//! be used by an on-chain collective, such as the Polkadot Alliance or Ambassador Program.
+//!
+//! The pallet stores content as an [OpaqueCid], which should correspond to some off-chain hosting
+//! service, such as IPFS, and contain any type of data. Each type of content has its own origin
+//! from which it can be managed. The origins are configurable in the runtime. Storing content does
+//! not require a deposit, as it is expected to be managed by a trusted collective.
+//!
+//! Content types:
+//!
+//! - Collective [charter](pallet::Charter): A single document (`OpaqueCid`) managed by
+//!   [CharterOrigin](pallet::Config::CharterOrigin).
+//! - Collective [announcements](pallet::Announcements): A list of announcements managed by
+//!   [AnnouncementOrigin](pallet::Config::AnnouncementOrigin).
+
+#![cfg_attr(not(feature = "std"), no_std)]
+
+#[cfg(test)]
+mod mock;
+#[cfg(test)]
+mod tests;
+
+#[cfg(feature = "runtime-benchmarks")]
+mod benchmarking;
+pub mod weights;
+
+pub use pallet::*;
+pub use weights::WeightInfo;
+
+use frame_support::{traits::schedule::DispatchTime, BoundedVec};
+use sp_core::ConstU32;
+use sp_std::prelude::*;
+
+/// IPFS compatible CID.
+// Worst case 2 bytes base and codec, 2 bytes hash type and size, 64 bytes hash digest.
+pub type OpaqueCid = BoundedVec<u8, ConstU32<68>>;
+
+#[frame_support::pallet]
+pub mod pallet {
+	use super::*;
+	use frame_support::{ensure, pallet_prelude::*};
+	use frame_system::pallet_prelude::*;
+	use sp_runtime::{traits::BadOrigin, Saturating};
+
+	/// The current storage version.
+	const STORAGE_VERSION: StorageVersion = StorageVersion::new(0);
+
+	#[pallet::pallet]
+	#[pallet::storage_version(STORAGE_VERSION)]
+	pub struct Pallet<T, I = ()>(PhantomData<(T, I)>);
+
+	/// The module configuration trait.
+	#[pallet::config]
+	pub trait Config<I: 'static = ()>: frame_system::Config {
+		/// The overarching event type.
+		type RuntimeEvent: From<Event<Self, I>>
+			+ IsType<<Self as frame_system::Config>::RuntimeEvent>;
+
+		/// Default lifetime for an announcement before it expires.
+		type AnnouncementLifetime: Get<BlockNumberFor<Self>>;
+
+		/// The origin to control the collective announcements.
+		type AnnouncementOrigin: EnsureOrigin<Self::RuntimeOrigin>;
+
+		/// Maximum number of announcements in the storage.
+		#[pallet::constant]
+		type MaxAnnouncements: Get<u32>;
+
+		/// The origin to control the collective charter.
+		type CharterOrigin: EnsureOrigin<Self::RuntimeOrigin>;
+
+		/// Weight information needed for the pallet.
+		type WeightInfo: WeightInfo;
+	}
+
+	#[pallet::error]
+	pub enum Error<T, I = ()> {
+		/// The announcement is not found.
+		MissingAnnouncement,
+		/// Number of announcements exceeds `MaxAnnouncementsCount`.
+		TooManyAnnouncements,
+		/// Cannot expire in the past.
+		InvalidExpiration,
+	}
+
+	#[pallet::event]
+	#[pallet::generate_deposit(pub(super) fn deposit_event)]
+	pub enum Event<T: Config<I>, I: 'static = ()> {
+		/// A new charter has been set.
+		NewCharterSet { cid: OpaqueCid },
+		/// A new announcement has been made.
+		AnnouncementAnnounced { cid: OpaqueCid, expire_at: BlockNumberFor<T> },
+		/// An on-chain announcement has been removed.
+		AnnouncementRemoved { cid: OpaqueCid },
+	}
+
+	/// The collective charter.
+	#[pallet::storage]
+	pub type Charter<T: Config<I>, I: 'static = ()> = StorageValue<_, OpaqueCid, OptionQuery>;
+
+	/// The collective announcements.
+	#[pallet::storage]
+	pub type Announcements<T: Config<I>, I: 'static = ()> =
+		CountedStorageMap<_, Blake2_128Concat, OpaqueCid, BlockNumberFor<T>, OptionQuery>;
+
+	#[pallet::call]
+	impl<T: Config<I>, I: 'static> Pallet<T, I> {
+		/// Set the collective charter.
+		///
+		/// Parameters:
+		/// - `origin`: Must be the [Config::CharterOrigin].
+		/// - `cid`: [CID](super::OpaqueCid) of the IPFS document of the collective charter.
+		#[pallet::call_index(0)]
+		#[pallet::weight(T::WeightInfo::set_charter())]
+		pub fn set_charter(origin: OriginFor<T>, cid: OpaqueCid) -> DispatchResult {
+			T::CharterOrigin::ensure_origin(origin)?;
+
+			Charter::<T, I>::put(&cid);
+
+			Self::deposit_event(Event::<T, I>::NewCharterSet { cid });
+			Ok(())
+		}
+
+		/// Publish an announcement.
+		///
+		/// Parameters:
+		/// - `origin`: Must be the [Config::AnnouncementOrigin].
+		/// - `cid`: [CID](super::OpaqueCid) of the IPFS document to announce.
+		/// - `maybe_expire`: Expiration block of the announcement. If `None`
+		///   [`Config::AnnouncementLifetime`]
+		/// used as a default.
+		#[pallet::call_index(1)]
+		#[pallet::weight(T::WeightInfo::announce())]
+		pub fn announce(
+			origin: OriginFor<T>,
+			cid: OpaqueCid,
+			maybe_expire: Option<DispatchTime<BlockNumberFor<T>>>,
+		) -> DispatchResult {
+			T::AnnouncementOrigin::ensure_origin(origin)?;
+
+			let now = frame_system::Pallet::<T>::block_number();
+			let expire_at = maybe_expire
+				.map_or(now.saturating_add(T::AnnouncementLifetime::get()), |e| e.evaluate(now));
+			ensure!(expire_at > now, Error::<T, I>::InvalidExpiration);
+			ensure!(
+				T::MaxAnnouncements::get() > <Announcements<T, I>>::count(),
+				Error::<T, I>::TooManyAnnouncements
+			);
+
+			<Announcements<T, I>>::insert(cid.clone(), expire_at);
+
+			Self::deposit_event(Event::<T, I>::AnnouncementAnnounced { cid, expire_at });
+			Ok(())
+		}
+
+		/// Remove an announcement.
+		///
+		/// Transaction fee refunded for expired announcements.
+		///
+		/// Parameters:
+		/// - `origin`: Must be the [Config::AnnouncementOrigin] or signed for expired
+		///   announcements.
+		/// - `cid`: [CID](super::OpaqueCid) of the IPFS document to remove.
+		#[pallet::call_index(2)]
+		#[pallet::weight(T::WeightInfo::remove_announcement())]
+		pub fn remove_announcement(
+			origin: OriginFor<T>,
+			cid: OpaqueCid,
+		) -> DispatchResultWithPostInfo {
+			let maybe_who = match T::AnnouncementOrigin::try_origin(origin) {
+				Ok(_) => None,
+				Err(origin) => Some(ensure_signed(origin)?),
+			};
+			let expire_at = <Announcements<T, I>>::get(cid.clone())
+				.ok_or(Error::<T, I>::MissingAnnouncement)?;
+			let now = frame_system::Pallet::<T>::block_number();
+			ensure!(maybe_who.is_none() || now >= expire_at, BadOrigin);
+
+			<Announcements<T, I>>::remove(cid.clone());
+
+			Self::deposit_event(Event::<T, I>::AnnouncementRemoved { cid });
+
+			if now >= expire_at {
+				return Ok(Pays::No.into())
+			}
+			Ok(Pays::Yes.into())
+		}
+	}
+}
diff --git a/cumulus/parachains/pallets/collective-content/src/mock.rs b/cumulus/parachains/pallets/collective-content/src/mock.rs
new file mode 100644
index 0000000000000000000000000000000000000000..2ae5943f332acf61b60792563b7d3f9b1e808c70
--- /dev/null
+++ b/cumulus/parachains/pallets/collective-content/src/mock.rs
@@ -0,0 +1,107 @@
+// Copyright (C) 2023 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.
+
+//! Test utilities.
+
+pub use crate as pallet_collective_content;
+use crate::WeightInfo;
+use frame_support::{
+	ord_parameter_types, parameter_types,
+	traits::{ConstU32, ConstU64},
+	weights::Weight,
+};
+use frame_system::EnsureSignedBy;
+use sp_runtime::{traits::IdentityLookup, BuildStorage};
+
+frame_support::construct_runtime!(
+	pub enum Test {
+		System: frame_system,
+		CollectiveContent: pallet_collective_content,
+	}
+);
+
+type AccountId = u64;
+type Block = frame_system::mocking::MockBlock<Test>;
+
+ord_parameter_types! {
+	pub const CharterManager: u64 = 1;
+	pub const AnnouncementManager: u64 = 2;
+	pub const SomeAccount: u64 = 3;
+}
+
+parameter_types! {
+	pub const AnnouncementLifetime: u64 = 100;
+	pub const MaxAnnouncements: u32 = 5;
+}
+
+impl pallet_collective_content::Config for Test {
+	type RuntimeEvent = RuntimeEvent;
+	type AnnouncementLifetime = AnnouncementLifetime;
+	type AnnouncementOrigin = EnsureSignedBy<AnnouncementManager, AccountId>;
+	type MaxAnnouncements = MaxAnnouncements;
+	type CharterOrigin = EnsureSignedBy<CharterManager, AccountId>;
+	type WeightInfo = CCWeightInfo;
+}
+
+impl frame_system::Config for Test {
+	type BaseCallFilter = ();
+	type BlockWeights = ();
+	type BlockLength = ();
+	type DbWeight = ();
+	type RuntimeOrigin = RuntimeOrigin;
+	type RuntimeCall = RuntimeCall;
+	type Nonce = u64;
+	type Block = Block;
+	type Hash = sp_core::H256;
+	type Hashing = sp_runtime::traits::BlakeTwo256;
+	type AccountId = AccountId;
+	type Lookup = IdentityLookup<Self::AccountId>;
+	type RuntimeEvent = RuntimeEvent;
+	type BlockHashCount = ConstU64<250>;
+	type Version = ();
+	type PalletInfo = PalletInfo;
+	type AccountData = ();
+	type OnNewAccount = ();
+	type OnKilledAccount = ();
+	type SystemWeightInfo = ();
+	type SS58Prefix = ();
+	type OnSetCode = ();
+	type MaxConsumers = ConstU32<16>;
+}
+pub struct CCWeightInfo;
+impl WeightInfo for CCWeightInfo {
+	fn set_charter() -> Weight {
+		Weight::zero()
+	}
+	fn announce() -> Weight {
+		Weight::zero()
+	}
+	fn remove_announcement() -> Weight {
+		Weight::zero()
+	}
+}
+
+// Build test environment.
+pub fn new_test_ext() -> sp_io::TestExternalities {
+	let t = RuntimeGenesisConfig::default().build_storage().unwrap().into();
+	let mut ext = sp_io::TestExternalities::new(t);
+	ext.execute_with(|| System::set_block_number(1));
+	ext
+}
+
+#[cfg(feature = "runtime-benchmarks")]
+pub fn new_bench_ext() -> sp_io::TestExternalities {
+	RuntimeGenesisConfig::default().build_storage().unwrap().into()
+}
diff --git a/cumulus/parachains/pallets/collective-content/src/tests.rs b/cumulus/parachains/pallets/collective-content/src/tests.rs
new file mode 100644
index 0000000000000000000000000000000000000000..4910b30b89af84430a60e2eab011ed2c5c6a3d03
--- /dev/null
+++ b/cumulus/parachains/pallets/collective-content/src/tests.rs
@@ -0,0 +1,204 @@
+// Copyright (C) 2023 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.
+
+//! Tests.
+
+use super::{mock::*, *};
+use frame_support::{assert_noop, assert_ok, error::BadOrigin, pallet_prelude::Pays};
+
+/// returns CID hash of 68 bytes of given `i`.
+fn create_cid(i: u8) -> OpaqueCid {
+	let cid: OpaqueCid = [i; 68].to_vec().try_into().unwrap();
+	cid
+}
+
+#[test]
+fn set_charter_works() {
+	new_test_ext().execute_with(|| {
+		// wrong origin.
+		let origin = RuntimeOrigin::signed(SomeAccount::get());
+		let cid = create_cid(1);
+		assert_noop!(CollectiveContent::set_charter(origin, cid), BadOrigin);
+
+		// success.
+		let origin = RuntimeOrigin::signed(CharterManager::get());
+		let cid = create_cid(2);
+
+		assert_ok!(CollectiveContent::set_charter(origin, cid.clone()));
+		assert_eq!(Charter::<Test, _>::get(), Some(cid.clone()));
+		System::assert_last_event(RuntimeEvent::CollectiveContent(Event::NewCharterSet { cid }));
+
+		// reset. success.
+		let origin = RuntimeOrigin::signed(CharterManager::get());
+		let cid = create_cid(3);
+
+		assert_ok!(CollectiveContent::set_charter(origin, cid.clone()));
+		assert_eq!(Charter::<Test, _>::get(), Some(cid.clone()));
+		System::assert_last_event(RuntimeEvent::CollectiveContent(Event::NewCharterSet { cid }));
+	});
+}
+
+#[test]
+fn announce_works() {
+	new_test_ext().execute_with(|| {
+		let now = frame_system::Pallet::<Test>::block_number();
+		// wrong origin.
+		let origin = RuntimeOrigin::signed(SomeAccount::get());
+		let cid = create_cid(1);
+
+		assert_noop!(CollectiveContent::announce(origin, cid, None), BadOrigin);
+
+		// success.
+		let origin = RuntimeOrigin::signed(AnnouncementManager::get());
+		let cid = create_cid(2);
+		let maybe_expire_at = None;
+
+		assert_ok!(CollectiveContent::announce(origin, cid.clone(), maybe_expire_at));
+		System::assert_last_event(RuntimeEvent::CollectiveContent(Event::AnnouncementAnnounced {
+			cid,
+			expire_at: now.saturating_add(AnnouncementLifetime::get()),
+		}));
+
+		// one more. success.
+		let origin = RuntimeOrigin::signed(AnnouncementManager::get());
+		let cid = create_cid(3);
+		let maybe_expire_at = None;
+
+		assert_ok!(CollectiveContent::announce(origin, cid.clone(), maybe_expire_at));
+		System::assert_last_event(RuntimeEvent::CollectiveContent(Event::AnnouncementAnnounced {
+			cid,
+			expire_at: now.saturating_add(AnnouncementLifetime::get()),
+		}));
+
+		// one more with expire. success.
+		let origin = RuntimeOrigin::signed(AnnouncementManager::get());
+		let cid = create_cid(4);
+		let maybe_expire_at = DispatchTime::<_>::After(10);
+
+		assert_ok!(CollectiveContent::announce(origin, cid.clone(), Some(maybe_expire_at)));
+		System::assert_last_event(RuntimeEvent::CollectiveContent(Event::AnnouncementAnnounced {
+			cid,
+			expire_at: maybe_expire_at.evaluate(now),
+		}));
+
+		// one more with later expire. success.
+		let origin = RuntimeOrigin::signed(AnnouncementManager::get());
+		let cid = create_cid(5);
+		let maybe_expire_at = DispatchTime::<_>::At(now + 20);
+
+		assert_ok!(CollectiveContent::announce(origin, cid.clone(), Some(maybe_expire_at)));
+		System::assert_last_event(RuntimeEvent::CollectiveContent(Event::AnnouncementAnnounced {
+			cid,
+			expire_at: maybe_expire_at.evaluate(now),
+		}));
+
+		// one more with earlier expire. success.
+		let origin = RuntimeOrigin::signed(AnnouncementManager::get());
+		let cid = create_cid(6);
+		let maybe_expire_at = DispatchTime::<_>::At(now + 5);
+
+		assert_ok!(CollectiveContent::announce(origin, cid.clone(), Some(maybe_expire_at)));
+		System::assert_last_event(RuntimeEvent::CollectiveContent(Event::AnnouncementAnnounced {
+			cid,
+			expire_at: maybe_expire_at.evaluate(now),
+		}));
+
+		// one more with earlier expire. success.
+		let origin = RuntimeOrigin::signed(AnnouncementManager::get());
+		let cid = create_cid(7);
+		let maybe_expire_at = DispatchTime::<_>::At(now + 5);
+
+		assert_eq!(<Announcements<Test, _>>::count(), MaxAnnouncements::get());
+		assert_noop!(
+			CollectiveContent::announce(origin, cid.clone(), Some(maybe_expire_at)),
+			Error::<Test>::TooManyAnnouncements
+		);
+	});
+}
+
+#[test]
+fn remove_announcement_works() {
+	new_test_ext().execute_with(|| {
+		// wrong origin.
+		let origin = RuntimeOrigin::signed(CharterManager::get());
+		let cid = create_cid(8);
+
+		assert_noop!(
+			CollectiveContent::remove_announcement(origin, cid),
+			Error::<Test>::MissingAnnouncement
+		);
+
+		// missing announcement.
+		let origin = RuntimeOrigin::signed(AnnouncementManager::get());
+		let cid = create_cid(9);
+
+		assert_noop!(
+			CollectiveContent::remove_announcement(origin, cid),
+			Error::<Test>::MissingAnnouncement
+		);
+
+		// wrong origin. announcement not yet expired.
+		let origin = RuntimeOrigin::signed(AnnouncementManager::get());
+		let cid = create_cid(10);
+		assert_ok!(CollectiveContent::announce(origin.clone(), cid.clone(), None));
+		assert!(<Announcements<Test>>::contains_key(cid.clone()));
+
+		let origin = RuntimeOrigin::signed(SomeAccount::get());
+		assert_noop!(CollectiveContent::remove_announcement(origin, cid.clone()), BadOrigin);
+		let origin = RuntimeOrigin::signed(AnnouncementManager::get());
+		assert_ok!(CollectiveContent::remove_announcement(origin, cid));
+
+		// success.
+
+		// remove first announcement and assert.
+		let origin = RuntimeOrigin::signed(AnnouncementManager::get());
+		let cid = create_cid(11);
+		assert_ok!(CollectiveContent::announce(origin.clone(), cid.clone(), None));
+		assert!(<Announcements<Test>>::contains_key(cid.clone()));
+
+		let info = CollectiveContent::remove_announcement(origin.clone(), cid.clone()).unwrap();
+		assert_eq!(info.pays_fee, Pays::Yes);
+		System::assert_last_event(RuntimeEvent::CollectiveContent(Event::AnnouncementRemoved {
+			cid: cid.clone(),
+		}));
+		assert_noop!(
+			CollectiveContent::remove_announcement(origin, cid.clone()),
+			Error::<Test>::MissingAnnouncement
+		);
+		assert!(!<Announcements<Test>>::contains_key(cid));
+
+		// remove expired announcement and assert.
+		let origin = RuntimeOrigin::signed(AnnouncementManager::get());
+		let cid = create_cid(12);
+		assert_ok!(CollectiveContent::announce(
+			origin.clone(),
+			cid.clone(),
+			Some(DispatchTime::<_>::At(10))
+		));
+		assert!(<Announcements<Test>>::contains_key(cid.clone()));
+
+		System::set_block_number(11);
+		let origin = RuntimeOrigin::signed(SomeAccount::get());
+		let info = CollectiveContent::remove_announcement(origin.clone(), cid.clone()).unwrap();
+		assert_eq!(info.pays_fee, Pays::No);
+		System::assert_last_event(RuntimeEvent::CollectiveContent(Event::AnnouncementRemoved {
+			cid: cid.clone(),
+		}));
+		assert_noop!(
+			CollectiveContent::remove_announcement(origin, cid),
+			Error::<Test>::MissingAnnouncement
+		);
+	});
+}
diff --git a/cumulus/parachains/pallets/collective-content/src/weights.rs b/cumulus/parachains/pallets/collective-content/src/weights.rs
new file mode 100644
index 0000000000000000000000000000000000000000..7ebbaabb5acc2451dc9323874c4f912f98ad8fef
--- /dev/null
+++ b/cumulus/parachains/pallets/collective-content/src/weights.rs
@@ -0,0 +1,41 @@
+// Copyright (C) 2023 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.
+
+//! The pallet weight info trait and its unit implementation.
+
+use frame_support::weights::Weight;
+
+/// Weights information needed for the pallet.
+pub trait WeightInfo {
+	/// Returns the weight of the set_charter extrinsic.
+	fn set_charter() -> Weight;
+	/// Returns the weight of the announce extrinsic.
+	fn announce() -> Weight;
+	/// Returns the weight of the remove_announcement extrinsic.
+	fn remove_announcement() -> Weight;
+}
+
+/// Unit implementation of the [WeightInfo].
+impl WeightInfo for () {
+	fn set_charter() -> Weight {
+		Weight::zero()
+	}
+	fn announce() -> Weight {
+		Weight::zero()
+	}
+	fn remove_announcement() -> Weight {
+		Weight::zero()
+	}
+}
diff --git a/cumulus/parachains/pallets/parachain-info/Cargo.toml b/cumulus/parachains/pallets/parachain-info/Cargo.toml
index 11876b50abee320d5e985c26d9b2e4a141aef0aa..931df9d9273d8cf0d511ff321973593ecf563657 100644
--- a/cumulus/parachains/pallets/parachain-info/Cargo.toml
+++ b/cumulus/parachains/pallets/parachain-info/Cargo.toml
@@ -1,9 +1,8 @@
 [package]
-authors = ["Parity Technologies <admin@parity.io>"]
-edition = "2021"
+authors.workspace = true
+edition.workspace = true
 name = "parachain-info"
 version = "0.1.0"
-publish = false
 
 [dependencies]
 codec = { package = "parity-scale-codec", version = "3.0.0", default-features = false, features = ["derive"] }
@@ -25,5 +24,11 @@ std = [
 	"frame-support/std",
 	"frame-system/std",
 	"scale-info/std",
+	"sp-runtime/std",
+	"sp-std/std",
+]
+try-runtime = [
+	"frame-support/try-runtime",
+	"frame-system/try-runtime",
+	"sp-runtime/try-runtime",
 ]
-try-runtime = [ "frame-support/try-runtime" ]
diff --git a/cumulus/parachains/pallets/parachain-info/src/lib.rs b/cumulus/parachains/pallets/parachain-info/src/lib.rs
index 6a9707365c372bc0a259c7708a9a729afb6ef1a5..c17a6d5e1460a2ef319109c0d867b6c73a6493e0 100644
--- a/cumulus/parachains/pallets/parachain-info/src/lib.rs
+++ b/cumulus/parachains/pallets/parachain-info/src/lib.rs
@@ -1,4 +1,4 @@
-// Copyright 2020-2021 Parity Technologies (UK) Ltd.
+// Copyright (C) Parity Technologies (UK) Ltd.
 // This file is part of Cumulus.
 
 // Cumulus is free software: you can redistribute it and/or modify
diff --git a/cumulus/parachains/pallets/ping/Cargo.toml b/cumulus/parachains/pallets/ping/Cargo.toml
index d883be6f430f0a8a86505b4c9a5c7fd7432a2f69..f0afa63d692d458c4f5ea008bf0dee223c7e2c6c 100644
--- a/cumulus/parachains/pallets/ping/Cargo.toml
+++ b/cumulus/parachains/pallets/ping/Cargo.toml
@@ -1,6 +1,6 @@
 [package]
-authors = ["Parity Technologies <admin@parity.io>"]
-edition = "2021"
+authors.workspace = true
+edition.workspace = true
 name = "cumulus-ping"
 version = "0.1.0"
 
@@ -13,7 +13,7 @@ sp-runtime = { path = "../../../../substrate/primitives/runtime", default-featur
 frame-support = { path = "../../../../substrate/frame/support", default-features = false}
 frame-system = { path = "../../../../substrate/frame/system", default-features = false}
 
-xcm = { path = "../../../../polkadot/xcm", default-features = false}
+xcm = { package = "staging-xcm", path = "../../../../polkadot/xcm", default-features = false}
 
 cumulus-primitives-core = { path = "../../../primitives/core", default-features = false }
 cumulus-pallet-xcm = { path = "../../../pallets/xcm", default-features = false }
@@ -22,6 +22,7 @@ cumulus-pallet-xcm = { path = "../../../pallets/xcm", default-features = false }
 default = [ "std" ]
 std = [
 	"codec/std",
+	"cumulus-pallet-xcm/std",
 	"cumulus-primitives-core/std",
 	"frame-support/std",
 	"frame-system/std",
diff --git a/cumulus/parachains/pallets/ping/src/lib.rs b/cumulus/parachains/pallets/ping/src/lib.rs
index 7425b5bd52f43d5b45fd0b1d29fa608f883c633c..feda3d0b6f9f0f52ee0294e1af6cff7c6764dc66 100644
--- a/cumulus/parachains/pallets/ping/src/lib.rs
+++ b/cumulus/parachains/pallets/ping/src/lib.rs
@@ -1,4 +1,4 @@
-// Copyright 2020-2021 Parity Technologies (UK) Ltd.
+// Copyright (C) Parity Technologies (UK) Ltd.
 // This file is part of Cumulus.
 
 // Cumulus is free software: you can redistribute it and/or modify
diff --git a/cumulus/parachains/runtimes/assets/asset-hub-kusama/Cargo.toml b/cumulus/parachains/runtimes/assets/asset-hub-kusama/Cargo.toml
index 682581a27b671978ab0536fdf662f8b32d6ae9d9..eb0f249aaae79307629cb0abc73826a14dcbda56 100644
--- a/cumulus/parachains/runtimes/assets/asset-hub-kusama/Cargo.toml
+++ b/cumulus/parachains/runtimes/assets/asset-hub-kusama/Cargo.toml
@@ -1,8 +1,8 @@
 [package]
 name = "asset-hub-kusama-runtime"
 version = "0.9.420"
-authors = ["Parity Technologies <admin@parity.io>"]
-edition = "2021"
+authors.workspace = true
+edition.workspace = true
 description = "Kusama variant of Asset Hub parachain runtime"
 
 [dependencies]
@@ -42,6 +42,7 @@ sp-api = { path = "../../../../../substrate/primitives/api", default-features =
 sp-block-builder = { path = "../../../../../substrate/primitives/block-builder", default-features = false}
 sp-consensus-aura = { path = "../../../../../substrate/primitives/consensus/aura", default-features = false}
 sp-core = { path = "../../../../../substrate/primitives/core", default-features = false}
+sp-genesis-builder = { path = "../../../../../substrate/primitives/genesis-builder", default-features = false }
 sp-inherents = { path = "../../../../../substrate/primitives/inherents", default-features = false}
 sp-offchain = { path = "../../../../../substrate/primitives/offchain", default-features = false}
 sp-runtime = { path = "../../../../../substrate/primitives/runtime", default-features = false}
@@ -55,15 +56,14 @@ sp-weights = { path = "../../../../../substrate/primitives/weights", default-fea
 primitive-types = { version = "0.12.1", default-features = false, features = ["codec", "scale-info", "num-traits"] }
 
 # Polkadot
-kusama-runtime-constants = { path = "../../../../../polkadot/runtime/kusama/constants", default-features = false}
 pallet-xcm = { path = "../../../../../polkadot/xcm/pallet-xcm", default-features = false}
 pallet-xcm-benchmarks = { path = "../../../../../polkadot/xcm/pallet-xcm-benchmarks", default-features = false, optional = true }
 polkadot-core-primitives = { path = "../../../../../polkadot/core-primitives", default-features = false}
-polkadot-parachain = { path = "../../../../../polkadot/parachain", default-features = false}
+polkadot-parachain-primitives = { path = "../../../../../polkadot/parachain", default-features = false}
 polkadot-runtime-common = { path = "../../../../../polkadot/runtime/common", default-features = false}
-xcm = { path = "../../../../../polkadot/xcm", default-features = false}
-xcm-builder = { path = "../../../../../polkadot/xcm/xcm-builder", default-features = false}
-xcm-executor = { path = "../../../../../polkadot/xcm/xcm-executor", default-features = false}
+xcm = { package = "staging-xcm", path = "../../../../../polkadot/xcm", default-features = false}
+xcm-builder = { package = "staging-xcm-builder", path = "../../../../../polkadot/xcm/xcm-builder", default-features = false}
+xcm-executor = { package = "staging-xcm-executor", path = "../../../../../polkadot/xcm/xcm-executor", default-features = false}
 
 # Cumulus
 cumulus-pallet-aura-ext = { path = "../../../../pallets/aura-ext", default-features = false }
@@ -100,6 +100,7 @@ runtime-benchmarks = [
 	"cumulus-pallet-parachain-system/runtime-benchmarks",
 	"cumulus-pallet-session-benchmarking/runtime-benchmarks",
 	"cumulus-pallet-xcmp-queue/runtime-benchmarks",
+	"cumulus-primitives-utility/runtime-benchmarks",
 	"frame-benchmarking/runtime-benchmarks",
 	"frame-support/runtime-benchmarks",
 	"frame-system-benchmarking/runtime-benchmarks",
@@ -118,8 +119,12 @@ runtime-benchmarks = [
 	"pallet-utility/runtime-benchmarks",
 	"pallet-xcm-benchmarks/runtime-benchmarks",
 	"pallet-xcm/runtime-benchmarks",
+	"parachains-common/runtime-benchmarks",
+	"polkadot-parachain-primitives/runtime-benchmarks",
+	"polkadot-runtime-common/runtime-benchmarks",
 	"sp-runtime/runtime-benchmarks",
 	"xcm-builder/runtime-benchmarks",
+	"xcm-executor/runtime-benchmarks",
 ]
 try-runtime = [
 	"cumulus-pallet-aura-ext/try-runtime",
@@ -128,6 +133,7 @@ try-runtime = [
 	"cumulus-pallet-xcm/try-runtime",
 	"cumulus-pallet-xcmp-queue/try-runtime",
 	"frame-executive/try-runtime",
+	"frame-support/try-runtime",
 	"frame-system/try-runtime",
 	"frame-try-runtime/try-runtime",
 	"pallet-asset-conversion-tx-payment/try-runtime",
@@ -149,6 +155,8 @@ try-runtime = [
 	"pallet-utility/try-runtime",
 	"pallet-xcm/try-runtime",
 	"parachain-info/try-runtime",
+	"polkadot-runtime-common/try-runtime",
+	"sp-runtime/try-runtime",
 ]
 std = [
 	"assets-common/std",
@@ -156,15 +164,18 @@ std = [
 	"cumulus-pallet-aura-ext/std",
 	"cumulus-pallet-dmp-queue/std",
 	"cumulus-pallet-parachain-system/std",
+	"cumulus-pallet-session-benchmarking/std",
 	"cumulus-pallet-xcm/std",
 	"cumulus-pallet-xcmp-queue/std",
 	"cumulus-primitives-core/std",
 	"cumulus-primitives-utility/std",
+	"frame-benchmarking?/std",
 	"frame-executive/std",
 	"frame-support/std",
+	"frame-system-benchmarking?/std",
 	"frame-system-rpc-runtime-api/std",
 	"frame-system/std",
-	"kusama-runtime-constants/std",
+	"frame-try-runtime?/std",
 	"log/std",
 	"pallet-asset-conversion-tx-payment/std",
 	"pallet-asset-conversion/std",
@@ -185,24 +196,28 @@ std = [
 	"pallet-transaction-payment/std",
 	"pallet-uniques/std",
 	"pallet-utility/std",
+	"pallet-xcm-benchmarks?/std",
 	"pallet-xcm/std",
 	"parachain-info/std",
 	"parachains-common/std",
 	"polkadot-core-primitives/std",
-	"polkadot-parachain/std",
+	"polkadot-parachain-primitives/std",
 	"polkadot-runtime-common/std",
 	"scale-info/std",
 	"sp-api/std",
 	"sp-block-builder/std",
 	"sp-consensus-aura/std",
 	"sp-core/std",
+	"sp-genesis-builder/std",
 	"sp-inherents/std",
 	"sp-offchain/std",
 	"sp-runtime/std",
 	"sp-session/std",
 	"sp-std/std",
+	"sp-storage/std",
 	"sp-transaction-pool/std",
 	"sp-version/std",
+	"sp-weights/std",
 	"substrate-wasm-builder",
 	"xcm-builder/std",
 	"xcm-executor/std",
diff --git a/cumulus/parachains/runtimes/assets/asset-hub-kusama/src/constants.rs b/cumulus/parachains/runtimes/assets/asset-hub-kusama/src/constants.rs
deleted file mode 100644
index 0ca93a8446f75a8fddc6ad87df1a0fb24c4a1c1f..0000000000000000000000000000000000000000
--- a/cumulus/parachains/runtimes/assets/asset-hub-kusama/src/constants.rs
+++ /dev/null
@@ -1,118 +0,0 @@
-// Copyright (C) 2021 Parity Technologies (UK) Ltd.
-// SPDX-License-Identifier: Apache-2.0
-
-// Licensed under the Apache License, Version 2.0 (the "License");
-// you may not use this file except in compliance with the License.
-// You may obtain a copy of the License at
-//
-// 	http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the License is distributed on an "AS IS" BASIS,
-// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-// See the License for the specific language governing permissions and
-// limitations under the License.
-
-pub mod currency {
-	use kusama_runtime_constants as constants;
-	use polkadot_core_primitives::Balance;
-
-	/// The existential deposit. Set to 1/10 of its parent Relay Chain.
-	pub const EXISTENTIAL_DEPOSIT: Balance = constants::currency::EXISTENTIAL_DEPOSIT / 10;
-
-	pub const UNITS: Balance = constants::currency::UNITS;
-	pub const CENTS: Balance = constants::currency::CENTS;
-	pub const GRAND: Balance = constants::currency::GRAND;
-	pub const MILLICENTS: Balance = constants::currency::MILLICENTS;
-
-	pub const fn deposit(items: u32, bytes: u32) -> Balance {
-		// map to 1/100 of what the kusama relay chain charges (v9020)
-		constants::currency::deposit(items, bytes) / 100
-	}
-}
-
-/// Fee-related.
-pub mod fee {
-	use frame_support::weights::{
-		constants::ExtrinsicBaseWeight, FeePolynomial, Weight, WeightToFeeCoefficient,
-		WeightToFeeCoefficients, WeightToFeePolynomial,
-	};
-	use polkadot_core_primitives::Balance;
-	use smallvec::smallvec;
-	pub use sp_runtime::Perbill;
-
-	/// The block saturation level. Fees will be updates based on this value.
-	pub const TARGET_BLOCK_FULLNESS: Perbill = Perbill::from_percent(25);
-
-	/// Handles converting a weight scalar to a fee value, based on the scale and granularity of the
-	/// node's balance type.
-	///
-	/// This should typically create a mapping between the following ranges:
-	///   - [0, MAXIMUM_BLOCK_WEIGHT]
-	///   - [Balance::min, Balance::max]
-	///
-	/// Yet, it can be used for any other sort of change to weight-fee. Some examples being:
-	///   - Setting it to `0` will essentially disable the weight fee.
-	///   - Setting it to `1` will cause the literal `#[weight = x]` values to be charged.
-	pub struct WeightToFee;
-	impl frame_support::weights::WeightToFee for WeightToFee {
-		type Balance = Balance;
-
-		fn weight_to_fee(weight: &Weight) -> Self::Balance {
-			let time_poly: FeePolynomial<Balance> = RefTimeToFee::polynomial().into();
-			let proof_poly: FeePolynomial<Balance> = ProofSizeToFee::polynomial().into();
-
-			// Take the maximum instead of the sum to charge by the more scarce resource.
-			time_poly.eval(weight.ref_time()).max(proof_poly.eval(weight.proof_size()))
-		}
-	}
-
-	/// Maps the reference time component of `Weight` to a fee.
-	pub struct RefTimeToFee;
-	impl WeightToFeePolynomial for RefTimeToFee {
-		type Balance = Balance;
-		fn polynomial() -> WeightToFeeCoefficients<Self::Balance> {
-			// in Kusama, extrinsic base weight (smallest non-zero weight) is mapped to 1/10 CENT:
-			// in Asset Hub, we map to 1/10 of that, or 1/100 CENT
-			let p = super::currency::CENTS;
-			let q = 100 * Balance::from(ExtrinsicBaseWeight::get().ref_time());
-
-			smallvec![WeightToFeeCoefficient {
-				degree: 1,
-				negative: false,
-				coeff_frac: Perbill::from_rational(p % q, q),
-				coeff_integer: p / q,
-			}]
-		}
-	}
-
-	/// Maps the proof size component of `Weight` to a fee.
-	pub struct ProofSizeToFee;
-	impl WeightToFeePolynomial for ProofSizeToFee {
-		type Balance = Balance;
-		fn polynomial() -> WeightToFeeCoefficients<Self::Balance> {
-			// Map 10kb proof to 1 CENT.
-			let p = super::currency::CENTS;
-			let q = 10_000;
-
-			smallvec![WeightToFeeCoefficient {
-				degree: 1,
-				negative: false,
-				coeff_frac: Perbill::from_rational(p % q, q),
-				coeff_integer: p / q,
-			}]
-		}
-	}
-}
-
-/// Consensus-related.
-pub mod consensus {
-	/// Maximum number of blocks simultaneously accepted by the Runtime, not yet included
-	/// into the relay chain.
-	pub const UNINCLUDED_SEGMENT_CAPACITY: u32 = 1;
-	/// How many parachain blocks are processed by the relay chain per parent. Limits the
-	/// number of blocks authored per slot.
-	pub const BLOCK_PROCESSING_VELOCITY: u32 = 1;
-	/// Relay chain slot duration, in milliseconds.
-	pub const RELAY_CHAIN_SLOT_DURATION_MILLIS: u32 = 6000;
-}
diff --git a/cumulus/parachains/runtimes/assets/asset-hub-kusama/src/lib.rs b/cumulus/parachains/runtimes/assets/asset-hub-kusama/src/lib.rs
index 2130c6502f8ef53e9042ebcdc21d90b07312da33..40ce122112d296d538496cb216ad33602d58e9b9 100644
--- a/cumulus/parachains/runtimes/assets/asset-hub-kusama/src/lib.rs
+++ b/cumulus/parachains/runtimes/assets/asset-hub-kusama/src/lib.rs
@@ -1,4 +1,4 @@
-// Copyright (C) 2021-2022 Parity Technologies (UK) Ltd.
+// Copyright (C) Parity Technologies (UK) Ltd.
 // SPDX-License-Identifier: Apache-2.0
 
 // Licensed under the Apache License, Version 2.0 (the "License");
@@ -24,7 +24,6 @@
 #[cfg(feature = "std")]
 include!(concat!(env!("OUT_DIR"), "/wasm_binary.rs"));
 
-pub mod constants;
 mod weights;
 pub mod xcm_config;
 
@@ -50,10 +49,10 @@ use sp_version::NativeVersion;
 use sp_version::RuntimeVersion;
 
 use codec::{Decode, Encode, MaxEncodedLen};
-use constants::{consensus::*, currency::*, fee::WeightToFee};
 use frame_support::{
 	construct_runtime,
 	dispatch::DispatchClass,
+	genesis_builder_helper::{build_config, create_default_config},
 	ord_parameter_types, parameter_types,
 	traits::{
 		AsEnsureOriginWithArg, ConstBool, ConstU128, ConstU32, ConstU64, ConstU8, EitherOfDiverse,
@@ -70,8 +69,10 @@ use pallet_asset_conversion_tx_payment::AssetConversionAdapter;
 use pallet_nfts::PalletFeatures;
 pub use parachains_common as common;
 use parachains_common::{
-	impls::DealWithFees, AccountId, AssetIdForTrustBackedAssets, AuraId, Balance, BlockNumber,
-	Hash, Header, Nonce, Signature, AVERAGE_ON_INITIALIZE_RATIO, DAYS, HOURS, MAXIMUM_BLOCK_WEIGHT,
+	impls::DealWithFees,
+	kusama::{consensus::*, currency::*, fee::WeightToFee},
+	AccountId, AssetIdForTrustBackedAssets, AuraId, Balance, BlockNumber, Hash, Header, Nonce,
+	Signature, AVERAGE_ON_INITIALIZE_RATIO, DAYS, HOURS, MAXIMUM_BLOCK_WEIGHT,
 	NORMAL_DISPATCH_RATIO, SLOT_DURATION,
 };
 use sp_runtime::RuntimeDebug;
@@ -1340,6 +1341,16 @@ impl_runtime_apis! {
 			Ok(batches)
 		}
 	}
+
+	impl sp_genesis_builder::GenesisBuilder<Block> for Runtime {
+		fn create_default_config() -> Vec<u8> {
+			create_default_config::<RuntimeGenesisConfig>()
+		}
+
+		fn build_config(config: Vec<u8>) -> sp_genesis_builder::Result {
+			build_config::<RuntimeGenesisConfig>(config)
+		}
+	}
 }
 
 cumulus_pallet_parachain_system::register_validate_block! {
@@ -1395,8 +1406,9 @@ fn ensure_key_ss58() {
 
 #[cfg(test)]
 mod tests {
-	use super::{constants::fee, *};
+	use super::*;
 	use crate::{CENTS, MILLICENTS};
+	use parachains_common::kusama::fee;
 	use sp_runtime::traits::Zero;
 	use sp_weights::WeightToFee;
 
diff --git a/cumulus/parachains/runtimes/assets/asset-hub-kusama/src/weights/block_weights.rs b/cumulus/parachains/runtimes/assets/asset-hub-kusama/src/weights/block_weights.rs
index b2092d875c8328210667da4cbb95de0642e60ae3..e7fdb2aae2a01ec06076de83d94817e540e205dd 100644
--- a/cumulus/parachains/runtimes/assets/asset-hub-kusama/src/weights/block_weights.rs
+++ b/cumulus/parachains/runtimes/assets/asset-hub-kusama/src/weights/block_weights.rs
@@ -1,6 +1,6 @@
 // This file is part of Substrate.
 
-// Copyright (C) 2022 Parity Technologies (UK) Ltd.
+// Copyright (C) Parity Technologies (UK) Ltd.
 // SPDX-License-Identifier: Apache-2.0
 
 // Licensed under the Apache License, Version 2.0 (the "License");
diff --git a/cumulus/parachains/runtimes/assets/asset-hub-kusama/src/weights/cumulus_pallet_xcmp_queue.rs b/cumulus/parachains/runtimes/assets/asset-hub-kusama/src/weights/cumulus_pallet_xcmp_queue.rs
index df8188debddfa97be6c40b0eb632f8913488d5d4..9c7a56687b314e51ff3d77134b5d389e9568b293 100644
--- a/cumulus/parachains/runtimes/assets/asset-hub-kusama/src/weights/cumulus_pallet_xcmp_queue.rs
+++ b/cumulus/parachains/runtimes/assets/asset-hub-kusama/src/weights/cumulus_pallet_xcmp_queue.rs
@@ -1,4 +1,4 @@
-// Copyright Parity Technologies (UK) Ltd.
+// Copyright (C) Parity Technologies (UK) Ltd.
 // This file is part of Cumulus.
 
 // Cumulus is free software: you can redistribute it and/or modify
diff --git a/cumulus/parachains/runtimes/assets/asset-hub-kusama/src/weights/extrinsic_weights.rs b/cumulus/parachains/runtimes/assets/asset-hub-kusama/src/weights/extrinsic_weights.rs
index 332c3b324bb9c1b386257bf7953d37aba8f5af13..1a4adb968bb7195428ea00d59cd92dcd3b6eea5f 100644
--- a/cumulus/parachains/runtimes/assets/asset-hub-kusama/src/weights/extrinsic_weights.rs
+++ b/cumulus/parachains/runtimes/assets/asset-hub-kusama/src/weights/extrinsic_weights.rs
@@ -1,6 +1,6 @@
 // This file is part of Substrate.
 
-// Copyright (C) 2022 Parity Technologies (UK) Ltd.
+// Copyright (C) Parity Technologies (UK) Ltd.
 // SPDX-License-Identifier: Apache-2.0
 
 // Licensed under the Apache License, Version 2.0 (the "License");
diff --git a/cumulus/parachains/runtimes/assets/asset-hub-kusama/src/weights/frame_system.rs b/cumulus/parachains/runtimes/assets/asset-hub-kusama/src/weights/frame_system.rs
index 20e421541b0d6f401b09b4677f7de3818369d559..96477ddf4bd3fab597a6d2a89ae30e30f33840cd 100644
--- a/cumulus/parachains/runtimes/assets/asset-hub-kusama/src/weights/frame_system.rs
+++ b/cumulus/parachains/runtimes/assets/asset-hub-kusama/src/weights/frame_system.rs
@@ -1,4 +1,4 @@
-// Copyright Parity Technologies (UK) Ltd.
+// Copyright (C) Parity Technologies (UK) Ltd.
 // This file is part of Cumulus.
 
 // Cumulus is free software: you can redistribute it and/or modify
diff --git a/cumulus/parachains/runtimes/assets/asset-hub-kusama/src/weights/mod.rs b/cumulus/parachains/runtimes/assets/asset-hub-kusama/src/weights/mod.rs
index 955d4690634e8cb7949afe63cefc5ae66e600d14..281c013b3372f57a24b57812de91e684ffabd0c9 100644
--- a/cumulus/parachains/runtimes/assets/asset-hub-kusama/src/weights/mod.rs
+++ b/cumulus/parachains/runtimes/assets/asset-hub-kusama/src/weights/mod.rs
@@ -1,3 +1,19 @@
+// 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/>.
+
 pub mod block_weights;
 pub mod cumulus_pallet_xcmp_queue;
 pub mod extrinsic_weights;
diff --git a/cumulus/parachains/runtimes/assets/asset-hub-kusama/src/weights/pallet_asset_conversion.rs b/cumulus/parachains/runtimes/assets/asset-hub-kusama/src/weights/pallet_asset_conversion.rs
index bb09a85133290d4f30e2c1561aef8aad417f7121..702f3743a7203f7103474dea554cb7aec2448ce6 100644
--- a/cumulus/parachains/runtimes/assets/asset-hub-kusama/src/weights/pallet_asset_conversion.rs
+++ b/cumulus/parachains/runtimes/assets/asset-hub-kusama/src/weights/pallet_asset_conversion.rs
@@ -1,4 +1,4 @@
-// Copyright Parity Technologies (UK) Ltd.
+// Copyright (C) Parity Technologies (UK) Ltd.
 // This file is part of Cumulus.
 
 // Cumulus is free software: you can redistribute it and/or modify
diff --git a/cumulus/parachains/runtimes/assets/asset-hub-kusama/src/weights/pallet_assets_foreign.rs b/cumulus/parachains/runtimes/assets/asset-hub-kusama/src/weights/pallet_assets_foreign.rs
index 3a801b758cf78865e568f38e4624817456294035..7c237b20389db7af3bab0e5e231dac0097210328 100644
--- a/cumulus/parachains/runtimes/assets/asset-hub-kusama/src/weights/pallet_assets_foreign.rs
+++ b/cumulus/parachains/runtimes/assets/asset-hub-kusama/src/weights/pallet_assets_foreign.rs
@@ -1,4 +1,4 @@
-// Copyright Parity Technologies (UK) Ltd.
+// Copyright (C) Parity Technologies (UK) Ltd.
 // This file is part of Cumulus.
 
 // Cumulus is free software: you can redistribute it and/or modify
diff --git a/cumulus/parachains/runtimes/assets/asset-hub-kusama/src/weights/pallet_assets_local.rs b/cumulus/parachains/runtimes/assets/asset-hub-kusama/src/weights/pallet_assets_local.rs
index d88f5991e3290ca38d73f3c18018cdc874e1cef7..10bd4b1f8b097d40bb23e9a24a1f81ee0c6fea09 100644
--- a/cumulus/parachains/runtimes/assets/asset-hub-kusama/src/weights/pallet_assets_local.rs
+++ b/cumulus/parachains/runtimes/assets/asset-hub-kusama/src/weights/pallet_assets_local.rs
@@ -1,4 +1,4 @@
-// Copyright Parity Technologies (UK) Ltd.
+// Copyright (C) Parity Technologies (UK) Ltd.
 // This file is part of Cumulus.
 
 // Cumulus is free software: you can redistribute it and/or modify
diff --git a/cumulus/parachains/runtimes/assets/asset-hub-kusama/src/weights/pallet_assets_pool.rs b/cumulus/parachains/runtimes/assets/asset-hub-kusama/src/weights/pallet_assets_pool.rs
index eeac89bb453383ae94c38af0cd15196908cc8d72..444699e33ef7d714aac0f0cb11a4ead143c76c87 100644
--- a/cumulus/parachains/runtimes/assets/asset-hub-kusama/src/weights/pallet_assets_pool.rs
+++ b/cumulus/parachains/runtimes/assets/asset-hub-kusama/src/weights/pallet_assets_pool.rs
@@ -1,4 +1,4 @@
-// Copyright Parity Technologies (UK) Ltd.
+// Copyright (C) Parity Technologies (UK) Ltd.
 // This file is part of Cumulus.
 
 // Cumulus is free software: you can redistribute it and/or modify
diff --git a/cumulus/parachains/runtimes/assets/asset-hub-kusama/src/weights/pallet_balances.rs b/cumulus/parachains/runtimes/assets/asset-hub-kusama/src/weights/pallet_balances.rs
index b387e626209cd20a4196c17da3553624cebc38bf..be1ac3011f79e72f852010f8fbdbaf19c4776b8b 100644
--- a/cumulus/parachains/runtimes/assets/asset-hub-kusama/src/weights/pallet_balances.rs
+++ b/cumulus/parachains/runtimes/assets/asset-hub-kusama/src/weights/pallet_balances.rs
@@ -1,4 +1,4 @@
-// Copyright Parity Technologies (UK) Ltd.
+// Copyright (C) Parity Technologies (UK) Ltd.
 // This file is part of Cumulus.
 
 // Cumulus is free software: you can redistribute it and/or modify
diff --git a/cumulus/parachains/runtimes/assets/asset-hub-kusama/src/weights/pallet_collator_selection.rs b/cumulus/parachains/runtimes/assets/asset-hub-kusama/src/weights/pallet_collator_selection.rs
index a528b0f66852fd4104c8a3f35d977fcaf14400e3..7fe56ac31f7aa11c8eb497dbacdabef522ccb294 100644
--- a/cumulus/parachains/runtimes/assets/asset-hub-kusama/src/weights/pallet_collator_selection.rs
+++ b/cumulus/parachains/runtimes/assets/asset-hub-kusama/src/weights/pallet_collator_selection.rs
@@ -1,4 +1,4 @@
-// Copyright Parity Technologies (UK) Ltd.
+// Copyright (C) Parity Technologies (UK) Ltd.
 // This file is part of Cumulus.
 
 // Cumulus is free software: you can redistribute it and/or modify
diff --git a/cumulus/parachains/runtimes/assets/asset-hub-kusama/src/weights/pallet_multisig.rs b/cumulus/parachains/runtimes/assets/asset-hub-kusama/src/weights/pallet_multisig.rs
index f949a0786bfc6c04d62ec1de0ed2e6be12142f36..ee7b70736414d86fc270d08777fe606ba76c0b34 100644
--- a/cumulus/parachains/runtimes/assets/asset-hub-kusama/src/weights/pallet_multisig.rs
+++ b/cumulus/parachains/runtimes/assets/asset-hub-kusama/src/weights/pallet_multisig.rs
@@ -1,4 +1,4 @@
-// Copyright Parity Technologies (UK) Ltd.
+// Copyright (C) Parity Technologies (UK) Ltd.
 // This file is part of Cumulus.
 
 // Cumulus is free software: you can redistribute it and/or modify
diff --git a/cumulus/parachains/runtimes/assets/asset-hub-kusama/src/weights/pallet_nft_fractionalization.rs b/cumulus/parachains/runtimes/assets/asset-hub-kusama/src/weights/pallet_nft_fractionalization.rs
index ab3bcbea8268846c26dce403d5f75ac7f78b9a71..c55a18adc5233d75dd05f8b35678023a548051ed 100644
--- a/cumulus/parachains/runtimes/assets/asset-hub-kusama/src/weights/pallet_nft_fractionalization.rs
+++ b/cumulus/parachains/runtimes/assets/asset-hub-kusama/src/weights/pallet_nft_fractionalization.rs
@@ -1,4 +1,4 @@
-// Copyright Parity Technologies (UK) Ltd.
+// Copyright (C) Parity Technologies (UK) Ltd.
 // This file is part of Cumulus.
 
 // Cumulus is free software: you can redistribute it and/or modify
diff --git a/cumulus/parachains/runtimes/assets/asset-hub-kusama/src/weights/pallet_nfts.rs b/cumulus/parachains/runtimes/assets/asset-hub-kusama/src/weights/pallet_nfts.rs
index 453d2d477bf043f3ceeb48bd0ca3ba0050b121c4..2de706bbdc70087cb8fe8128a30644e6e1f2ce74 100644
--- a/cumulus/parachains/runtimes/assets/asset-hub-kusama/src/weights/pallet_nfts.rs
+++ b/cumulus/parachains/runtimes/assets/asset-hub-kusama/src/weights/pallet_nfts.rs
@@ -1,4 +1,4 @@
-// Copyright Parity Technologies (UK) Ltd.
+// Copyright (C) Parity Technologies (UK) Ltd.
 // This file is part of Cumulus.
 
 // Cumulus is free software: you can redistribute it and/or modify
diff --git a/cumulus/parachains/runtimes/assets/asset-hub-kusama/src/weights/pallet_proxy.rs b/cumulus/parachains/runtimes/assets/asset-hub-kusama/src/weights/pallet_proxy.rs
index 6c548ac1f27c1b16fafb4536db51bcf7c390df78..9bc4ba448e5af7d50988a319f62718ac486b689c 100644
--- a/cumulus/parachains/runtimes/assets/asset-hub-kusama/src/weights/pallet_proxy.rs
+++ b/cumulus/parachains/runtimes/assets/asset-hub-kusama/src/weights/pallet_proxy.rs
@@ -1,4 +1,4 @@
-// Copyright Parity Technologies (UK) Ltd.
+// Copyright (C) Parity Technologies (UK) Ltd.
 // This file is part of Cumulus.
 
 // Cumulus is free software: you can redistribute it and/or modify
diff --git a/cumulus/parachains/runtimes/assets/asset-hub-kusama/src/weights/pallet_session.rs b/cumulus/parachains/runtimes/assets/asset-hub-kusama/src/weights/pallet_session.rs
index c5064adf8b03070277c69f23614e4b09f4df7d47..56982f565ac478cc59ae9db6864e78e27a795191 100644
--- a/cumulus/parachains/runtimes/assets/asset-hub-kusama/src/weights/pallet_session.rs
+++ b/cumulus/parachains/runtimes/assets/asset-hub-kusama/src/weights/pallet_session.rs
@@ -1,4 +1,4 @@
-// Copyright Parity Technologies (UK) Ltd.
+// Copyright (C) Parity Technologies (UK) Ltd.
 // This file is part of Cumulus.
 
 // Cumulus is free software: you can redistribute it and/or modify
diff --git a/cumulus/parachains/runtimes/assets/asset-hub-kusama/src/weights/pallet_timestamp.rs b/cumulus/parachains/runtimes/assets/asset-hub-kusama/src/weights/pallet_timestamp.rs
index 8edae065f1b9173a3767a037c167f05420b95a70..94914eefba04db2a068767adeb7657e328613460 100644
--- a/cumulus/parachains/runtimes/assets/asset-hub-kusama/src/weights/pallet_timestamp.rs
+++ b/cumulus/parachains/runtimes/assets/asset-hub-kusama/src/weights/pallet_timestamp.rs
@@ -1,4 +1,4 @@
-// Copyright Parity Technologies (UK) Ltd.
+// Copyright (C) Parity Technologies (UK) Ltd.
 // This file is part of Cumulus.
 
 // Cumulus is free software: you can redistribute it and/or modify
diff --git a/cumulus/parachains/runtimes/assets/asset-hub-kusama/src/weights/pallet_uniques.rs b/cumulus/parachains/runtimes/assets/asset-hub-kusama/src/weights/pallet_uniques.rs
index 4da387aa872efa667226089535caacb4d55ab585..43bc74931cb0e7c7ae8c90e8dafbac12df83669c 100644
--- a/cumulus/parachains/runtimes/assets/asset-hub-kusama/src/weights/pallet_uniques.rs
+++ b/cumulus/parachains/runtimes/assets/asset-hub-kusama/src/weights/pallet_uniques.rs
@@ -1,4 +1,4 @@
-// Copyright Parity Technologies (UK) Ltd.
+// Copyright (C) Parity Technologies (UK) Ltd.
 // This file is part of Cumulus.
 
 // Cumulus is free software: you can redistribute it and/or modify
diff --git a/cumulus/parachains/runtimes/assets/asset-hub-kusama/src/weights/pallet_utility.rs b/cumulus/parachains/runtimes/assets/asset-hub-kusama/src/weights/pallet_utility.rs
index 22d20c26e25ee261d05756e50791dc26d5944754..680e65a2dcf90271faf4f25e1f02656ded9d6881 100644
--- a/cumulus/parachains/runtimes/assets/asset-hub-kusama/src/weights/pallet_utility.rs
+++ b/cumulus/parachains/runtimes/assets/asset-hub-kusama/src/weights/pallet_utility.rs
@@ -1,4 +1,4 @@
-// Copyright Parity Technologies (UK) Ltd.
+// Copyright (C) Parity Technologies (UK) Ltd.
 // This file is part of Cumulus.
 
 // Cumulus is free software: you can redistribute it and/or modify
diff --git a/cumulus/parachains/runtimes/assets/asset-hub-kusama/src/weights/pallet_xcm.rs b/cumulus/parachains/runtimes/assets/asset-hub-kusama/src/weights/pallet_xcm.rs
index ee76b111e83c497c9f051e6a848b9b83eced0388..c2ed67d2f5d45196894955e3e2fbe41e175454c0 100644
--- a/cumulus/parachains/runtimes/assets/asset-hub-kusama/src/weights/pallet_xcm.rs
+++ b/cumulus/parachains/runtimes/assets/asset-hub-kusama/src/weights/pallet_xcm.rs
@@ -1,4 +1,4 @@
-// Copyright Parity Technologies (UK) Ltd.
+// Copyright (C) Parity Technologies (UK) Ltd.
 // This file is part of Cumulus.
 
 // Cumulus is free software: you can redistribute it and/or modify
diff --git a/cumulus/parachains/runtimes/assets/asset-hub-kusama/src/weights/paritydb_weights.rs b/cumulus/parachains/runtimes/assets/asset-hub-kusama/src/weights/paritydb_weights.rs
index 4338d928d807a41cc60ec91d86e91c81bb253631..25679703831a13b8d1bb7fb7dd4d92fa84b1f255 100644
--- a/cumulus/parachains/runtimes/assets/asset-hub-kusama/src/weights/paritydb_weights.rs
+++ b/cumulus/parachains/runtimes/assets/asset-hub-kusama/src/weights/paritydb_weights.rs
@@ -1,6 +1,6 @@
 // This file is part of Substrate.
 
-// Copyright (C) 2022 Parity Technologies (UK) Ltd.
+// Copyright (C) Parity Technologies (UK) Ltd.
 // SPDX-License-Identifier: Apache-2.0
 
 // Licensed under the Apache License, Version 2.0 (the "License");
diff --git a/cumulus/parachains/runtimes/assets/asset-hub-kusama/src/weights/rocksdb_weights.rs b/cumulus/parachains/runtimes/assets/asset-hub-kusama/src/weights/rocksdb_weights.rs
index 1d115d963facb39fe29d6258918fda3bc8d94900..3dd817aa6f137085b0e5fdf2b11b7f50e5c8b002 100644
--- a/cumulus/parachains/runtimes/assets/asset-hub-kusama/src/weights/rocksdb_weights.rs
+++ b/cumulus/parachains/runtimes/assets/asset-hub-kusama/src/weights/rocksdb_weights.rs
@@ -1,6 +1,6 @@
 // This file is part of Substrate.
 
-// Copyright (C) 2022 Parity Technologies (UK) Ltd.
+// Copyright (C) Parity Technologies (UK) Ltd.
 // SPDX-License-Identifier: Apache-2.0
 
 // Licensed under the Apache License, Version 2.0 (the "License");
diff --git a/cumulus/parachains/runtimes/assets/asset-hub-kusama/src/weights/xcm/mod.rs b/cumulus/parachains/runtimes/assets/asset-hub-kusama/src/weights/xcm/mod.rs
index 8608d04af069073e6e507565dc2e8e5096731dcb..ce6e92065156ea474afcaf004798b527c1c1f7e0 100644
--- a/cumulus/parachains/runtimes/assets/asset-hub-kusama/src/weights/xcm/mod.rs
+++ b/cumulus/parachains/runtimes/assets/asset-hub-kusama/src/weights/xcm/mod.rs
@@ -1,4 +1,4 @@
-// Copyright 2022 Parity Technologies (UK) Ltd.
+// Copyright (C) Parity Technologies (UK) Ltd.
 // This file is part of Cumulus.
 
 // Cumulus is free software: you can redistribute it and/or modify
@@ -61,16 +61,8 @@ impl<Call> XcmWeightInfo<Call> for AssetHubKusamaXcmWeight<Call> {
 	fn withdraw_asset(assets: &MultiAssets) -> Weight {
 		assets.weigh_multi_assets(XcmFungibleWeight::<Runtime>::withdraw_asset())
 	}
-	// Currently there is no trusted reserve (`IsReserve = ()`),
-	// but we need this hack for `pallet_xcm::reserve_transfer_assets`
-	// (TODO) fix https://github.com/paritytech/polkadot/pull/7424
-	// (TODO) fix https://github.com/paritytech/polkadot/pull/7546
-	fn reserve_asset_deposited(_assets: &MultiAssets) -> Weight {
-		// TODO: if we change `IsReserve = ...` then use this line...
-		// TODO: or if remote weight estimation is fixed, then remove
-		// TODO: hardcoded - fix https://github.com/paritytech/cumulus/issues/1974
-		let hardcoded_weight = Weight::from_parts(1_000_000_000_u64, 0);
-		hardcoded_weight.min(XcmFungibleWeight::<Runtime>::reserve_asset_deposited())
+	fn reserve_asset_deposited(assets: &MultiAssets) -> Weight {
+		assets.weigh_multi_assets(XcmFungibleWeight::<Runtime>::reserve_asset_deposited())
 	}
 	fn receive_teleported_asset(assets: &MultiAssets) -> Weight {
 		assets.weigh_multi_assets(XcmFungibleWeight::<Runtime>::receive_teleported_asset())
@@ -127,10 +119,7 @@ impl<Call> XcmWeightInfo<Call> for AssetHubKusamaXcmWeight<Call> {
 	}
 
 	fn deposit_asset(assets: &MultiAssetFilter, _dest: &MultiLocation) -> Weight {
-		// Hardcoded till the XCM pallet is fixed
-		let hardcoded_weight = Weight::from_parts(1_000_000_000_u64, 0);
-		let weight = assets.weigh_multi_assets(XcmFungibleWeight::<Runtime>::deposit_asset());
-		hardcoded_weight.min(weight)
+		assets.weigh_multi_assets(XcmFungibleWeight::<Runtime>::deposit_asset())
 	}
 	fn deposit_reserve_asset(
 		assets: &MultiAssetFilter,
diff --git a/cumulus/parachains/runtimes/assets/asset-hub-kusama/src/weights/xcm/pallet_xcm_benchmarks_fungible.rs b/cumulus/parachains/runtimes/assets/asset-hub-kusama/src/weights/xcm/pallet_xcm_benchmarks_fungible.rs
index 17e4ea7c8b69bcb31eeea4c344010b25bac0d66e..9b8611fd6637aab79237ba23883b6497e091b53b 100644
--- a/cumulus/parachains/runtimes/assets/asset-hub-kusama/src/weights/xcm/pallet_xcm_benchmarks_fungible.rs
+++ b/cumulus/parachains/runtimes/assets/asset-hub-kusama/src/weights/xcm/pallet_xcm_benchmarks_fungible.rs
@@ -1,4 +1,4 @@
-// Copyright Parity Technologies (UK) Ltd.
+// Copyright (C) Parity Technologies (UK) Ltd.
 // This file is part of Cumulus.
 
 // Cumulus is free software: you can redistribute it and/or modify
@@ -17,28 +17,26 @@
 //! Autogenerated weights for `pallet_xcm_benchmarks::fungible`
 //!
 //! THIS FILE WAS AUTO-GENERATED USING THE SUBSTRATE BENCHMARK CLI VERSION 4.0.0-dev
-//! DATE: 2023-07-31, STEPS: `50`, REPEAT: `20`, LOW RANGE: `[]`, HIGH RANGE: `[]`
+//! DATE: 2023-09-28, STEPS: `50`, REPEAT: `20`, LOW RANGE: `[]`, HIGH RANGE: `[]`
 //! WORST CASE MAP SIZE: `1000000`
-//! HOSTNAME: `runner-ynta1nyy-project-238-concurrent-0`, CPU: `Intel(R) Xeon(R) CPU @ 2.60GHz`
-//! EXECUTION: , WASM-EXECUTION: Compiled, CHAIN: Some("asset-hub-kusama-dev"), DB CACHE: 1024
+//! HOSTNAME: `runner-nbnwcyh-project-674-concurrent-0`, CPU: `Intel(R) Xeon(R) CPU @ 2.60GHz`
+//! WASM-EXECUTION: Compiled, CHAIN: Some("asset-hub-kusama-dev"), DB CACHE: 1024
 
 // Executed Command:
-// ./target/production/polkadot-parachain
+// target/production/polkadot-parachain
 // benchmark
 // pallet
-// --template=./templates/xcm-bench-template.hbs
-// --chain=asset-hub-kusama-dev
-// --wasm-execution=compiled
-// --pallet=pallet_xcm_benchmarks::fungible
-// --no-storage-info
-// --no-median-slopes
-// --no-min-squares
-// --extrinsic=*
 // --steps=50
 // --repeat=20
-// --json
-// --header=./file_header.txt
-// --output=./parachains/runtimes/assets/asset-hub-kusama/src/weights/xcm/pallet_xcm_benchmarks_fungible.rs
+// --extrinsic=*
+// --wasm-execution=compiled
+// --heap-pages=4096
+// --json-file=/builds/parity/mirrors/polkadot-sdk/.git/.artifacts/bench.json
+// --pallet=pallet_xcm_benchmarks::fungible
+// --chain=asset-hub-kusama-dev
+// --header=./cumulus/file_header.txt
+// --template=./cumulus/templates/xcm-bench-template.hbs
+// --output=./cumulus/parachains/runtimes/assets/asset-hub-kusama/src/weights/xcm/
 
 #![cfg_attr(rustfmt, rustfmt_skip)]
 #![allow(unused_parens)]
@@ -56,8 +54,8 @@ impl<T: frame_system::Config> WeightInfo<T> {
 		// Proof Size summary in bytes:
 		//  Measured:  `101`
 		//  Estimated: `3593`
-		// Minimum execution time: 26_104_000 picoseconds.
-		Weight::from_parts(26_722_000, 3593)
+		// Minimum execution time: 25_602_000 picoseconds.
+		Weight::from_parts(26_312_000, 3593)
 			.saturating_add(T::DbWeight::get().reads(1))
 			.saturating_add(T::DbWeight::get().writes(1))
 	}
@@ -67,8 +65,8 @@ impl<T: frame_system::Config> WeightInfo<T> {
 		// Proof Size summary in bytes:
 		//  Measured:  `101`
 		//  Estimated: `6196`
-		// Minimum execution time: 52_259_000 picoseconds.
-		Weight::from_parts(53_854_000, 6196)
+		// Minimum execution time: 51_173_000 picoseconds.
+		Weight::from_parts(52_221_000, 6196)
 			.saturating_add(T::DbWeight::get().reads(2))
 			.saturating_add(T::DbWeight::get().writes(2))
 	}
@@ -88,10 +86,10 @@ impl<T: frame_system::Config> WeightInfo<T> {
 	// Proof: `ParachainSystem::PendingUpwardMessages` (`max_values`: Some(1), `max_size`: None, mode: `Measured`)
 	pub fn transfer_reserve_asset() -> Weight {
 		// Proof Size summary in bytes:
-		//  Measured:  `210`
+		//  Measured:  `246`
 		//  Estimated: `6196`
-		// Minimum execution time: 77_248_000 picoseconds.
-		Weight::from_parts(80_354_000, 6196)
+		// Minimum execution time: 74_651_000 picoseconds.
+		Weight::from_parts(76_500_000, 6196)
 			.saturating_add(T::DbWeight::get().reads(8))
 			.saturating_add(T::DbWeight::get().writes(4))
 	}
@@ -101,8 +99,8 @@ impl<T: frame_system::Config> WeightInfo<T> {
 		// Proof Size summary in bytes:
 		//  Measured:  `0`
 		//  Estimated: `0`
-		// Minimum execution time: 500_000_000_000 picoseconds.
-		Weight::from_parts(500_000_000_000, 0)
+		// Minimum execution time: 18_446_744_073_709_551_000 picoseconds.
+		Weight::from_parts(18_446_744_073_709_551_000, 0)
 	}
 	// Storage: `ParachainInfo::ParachainId` (r:1 w:0)
 	// Proof: `ParachainInfo::ParachainId` (`max_values`: Some(1), `max_size`: Some(4), added: 499, mode: `MaxEncodedLen`)
@@ -118,10 +116,10 @@ impl<T: frame_system::Config> WeightInfo<T> {
 	// Proof: `ParachainSystem::PendingUpwardMessages` (`max_values`: Some(1), `max_size`: None, mode: `Measured`)
 	pub fn initiate_reserve_withdraw() -> Weight {
 		// Proof Size summary in bytes:
-		//  Measured:  `109`
-		//  Estimated: `3574`
-		// Minimum execution time: 482_070_000 picoseconds.
-		Weight::from_parts(490_269_000, 3574)
+		//  Measured:  `145`
+		//  Estimated: `3610`
+		// Minimum execution time: 458_666_000 picoseconds.
+		Weight::from_parts(470_470_000, 3610)
 			.saturating_add(T::DbWeight::get().reads(6))
 			.saturating_add(T::DbWeight::get().writes(2))
 	}
@@ -129,8 +127,8 @@ impl<T: frame_system::Config> WeightInfo<T> {
 		// Proof Size summary in bytes:
 		//  Measured:  `0`
 		//  Estimated: `0`
-		// Minimum execution time: 3_970_000 picoseconds.
-		Weight::from_parts(4_056_000, 0)
+		// Minimum execution time: 3_701_000 picoseconds.
+		Weight::from_parts(3_887_000, 0)
 	}
 	// Storage: `System::Account` (r:1 w:1)
 	// Proof: `System::Account` (`max_values`: None, `max_size`: Some(128), added: 2603, mode: `MaxEncodedLen`)
@@ -138,8 +136,8 @@ impl<T: frame_system::Config> WeightInfo<T> {
 		// Proof Size summary in bytes:
 		//  Measured:  `0`
 		//  Estimated: `3593`
-		// Minimum execution time: 26_324_000 picoseconds.
-		Weight::from_parts(26_985_000, 3593)
+		// Minimum execution time: 25_709_000 picoseconds.
+		Weight::from_parts(26_320_000, 3593)
 			.saturating_add(T::DbWeight::get().reads(1))
 			.saturating_add(T::DbWeight::get().writes(1))
 	}
@@ -159,10 +157,10 @@ impl<T: frame_system::Config> WeightInfo<T> {
 	// Proof: `ParachainSystem::PendingUpwardMessages` (`max_values`: Some(1), `max_size`: None, mode: `Measured`)
 	pub fn deposit_reserve_asset() -> Weight {
 		// Proof Size summary in bytes:
-		//  Measured:  `109`
-		//  Estimated: `3593`
-		// Minimum execution time: 52_814_000 picoseconds.
-		Weight::from_parts(54_666_000, 3593)
+		//  Measured:  `145`
+		//  Estimated: `3610`
+		// Minimum execution time: 51_663_000 picoseconds.
+		Weight::from_parts(52_538_000, 3610)
 			.saturating_add(T::DbWeight::get().reads(7))
 			.saturating_add(T::DbWeight::get().writes(3))
 	}
@@ -180,10 +178,10 @@ impl<T: frame_system::Config> WeightInfo<T> {
 	// Proof: `ParachainSystem::PendingUpwardMessages` (`max_values`: Some(1), `max_size`: None, mode: `Measured`)
 	pub fn initiate_teleport() -> Weight {
 		// Proof Size summary in bytes:
-		//  Measured:  `109`
-		//  Estimated: `3574`
-		// Minimum execution time: 33_044_000 picoseconds.
-		Weight::from_parts(33_849_000, 3574)
+		//  Measured:  `145`
+		//  Estimated: `3610`
+		// Minimum execution time: 31_972_000 picoseconds.
+		Weight::from_parts(32_834_000, 3610)
 			.saturating_add(T::DbWeight::get().reads(6))
 			.saturating_add(T::DbWeight::get().writes(2))
 	}
diff --git a/cumulus/parachains/runtimes/assets/asset-hub-kusama/src/weights/xcm/pallet_xcm_benchmarks_generic.rs b/cumulus/parachains/runtimes/assets/asset-hub-kusama/src/weights/xcm/pallet_xcm_benchmarks_generic.rs
index 4988047014beb00b8c0d3feeb389e52b000ef9b8..625549ecfccfa348e11debd99325f7ac41646445 100644
--- a/cumulus/parachains/runtimes/assets/asset-hub-kusama/src/weights/xcm/pallet_xcm_benchmarks_generic.rs
+++ b/cumulus/parachains/runtimes/assets/asset-hub-kusama/src/weights/xcm/pallet_xcm_benchmarks_generic.rs
@@ -1,4 +1,4 @@
-// Copyright Parity Technologies (UK) Ltd.
+// Copyright (C) Parity Technologies (UK) Ltd.
 // This file is part of Cumulus.
 
 // Cumulus is free software: you can redistribute it and/or modify
diff --git a/cumulus/parachains/runtimes/assets/asset-hub-kusama/src/xcm_config.rs b/cumulus/parachains/runtimes/assets/asset-hub-kusama/src/xcm_config.rs
index 25d47b55977cbdfca7a1f6d1e4c5908f17e9cfb5..cf91c1513ece2f0b7986dda2658ffa497b90576d 100644
--- a/cumulus/parachains/runtimes/assets/asset-hub-kusama/src/xcm_config.rs
+++ b/cumulus/parachains/runtimes/assets/asset-hub-kusama/src/xcm_config.rs
@@ -1,4 +1,4 @@
-// Copyright (C) 2022 Parity Technologies (UK) Ltd.
+// Copyright (C) Parity Technologies (UK) Ltd.
 // SPDX-License-Identifier: Apache-2.0
 
 // Licensed under the Apache License, Version 2.0 (the "License");
@@ -31,16 +31,19 @@ use frame_support::{
 };
 use frame_system::EnsureRoot;
 use pallet_xcm::XcmPassthrough;
-use parachains_common::{impls::ToStakingPot, xcm_config::AssetFeeAsExistentialDepositMultiplier};
-use polkadot_parachain::primitives::Sibling;
+use parachains_common::{
+	impls::ToStakingPot,
+	xcm_config::{AssetFeeAsExistentialDepositMultiplier, ConcreteAssetFromSystem},
+};
+use polkadot_parachain_primitives::primitives::Sibling;
 use sp_runtime::traits::ConvertInto;
 use xcm::latest::prelude::*;
 use xcm_builder::{
 	AccountId32Aliases, AllowExplicitUnpaidExecutionFrom, AllowKnownQueryResponses,
 	AllowSubscriptionsFrom, AllowTopLevelPaidExecutionFrom, CurrencyAdapter,
 	DenyReserveTransferToRelayChain, DenyThenTry, DescribeAllTerminal, DescribeFamily,
-	EnsureXcmOrigin, FungiblesAdapter, HashedDescription, IsConcrete, LocalMint, NativeAsset,
-	NoChecking, ParentAsSuperuser, ParentIsPreset, RelayChainAsNative, SiblingParachainAsNative,
+	EnsureXcmOrigin, FungiblesAdapter, HashedDescription, IsConcrete, LocalMint, NoChecking,
+	ParentAsSuperuser, ParentIsPreset, RelayChainAsNative, SiblingParachainAsNative,
 	SiblingParachainConvertsVia, SignedAccountId32AsNative, SignedToAccountId32,
 	SovereignSignedViaLocation, TakeWeightCredit, TrailingSetTopicAsId, UsingComponents,
 	WeightInfoBounds, WithComputedOrigin, WithUniqueTopic,
@@ -470,6 +473,15 @@ pub type AssetFeeAsExistentialDepositMultiplierFeeCharger = AssetFeeAsExistentia
 	TrustBackedAssetsInstance,
 >;
 
+/// Cases where a remote origin is accepted as trusted Teleporter for a given asset:
+///
+/// - KSM with the parent Relay Chain and sibling system parachains; and
+/// - Sibling parachains' assets from where they originate (as `ForeignCreators`).
+pub type TrustedTeleporters = (
+	ConcreteAssetFromSystem<KsmLocation>,
+	IsForeignConcreteAsset<FromSiblingParachain<parachain_info::Pallet<Runtime>>>,
+);
+
 pub struct XcmConfig;
 impl xcm_executor::Config for XcmConfig {
 	type RuntimeCall = RuntimeCall;
@@ -480,13 +492,7 @@ impl xcm_executor::Config for XcmConfig {
 	// Asset Hub acting _as_ a reserve location for KSM and assets created under `pallet-assets`.
 	// For KSM, users must use teleport where allowed (e.g. with the Relay Chain).
 	type IsReserve = ();
-	// We allow:
-	// - teleportation of KSM
-	// - teleportation of sibling parachain's assets (as ForeignCreators)
-	type IsTeleporter = (
-		NativeAsset,
-		IsForeignConcreteAsset<FromSiblingParachain<parachain_info::Pallet<Runtime>>>,
-	);
+	type IsTeleporter = TrustedTeleporters;
 	type UniversalLocation = UniversalLocation;
 	type Barrier = Barrier;
 	type Weigher = WeightInfoBounds<
diff --git a/cumulus/parachains/runtimes/assets/asset-hub-kusama/tests/tests.rs b/cumulus/parachains/runtimes/assets/asset-hub-kusama/tests/tests.rs
index 6d9eccdf3744778af680575cbac79490732ad1ea..7d49b56e461a0a3919e2130dbb6d84f6888349ad 100644
--- a/cumulus/parachains/runtimes/assets/asset-hub-kusama/tests/tests.rs
+++ b/cumulus/parachains/runtimes/assets/asset-hub-kusama/tests/tests.rs
@@ -21,7 +21,6 @@ use asset_hub_kusama_runtime::xcm_config::{
 	AssetFeeAsExistentialDepositMultiplierFeeCharger, KsmLocation, TrustBackedAssetsPalletLocation,
 };
 pub use asset_hub_kusama_runtime::{
-	constants::fee::WeightToFee,
 	xcm_config::{CheckingAccount, ForeignCreatorsSovereignAccountOf, XcmConfig},
 	AllPalletsWithoutSystem, AssetDeposit, Assets, Balances, ExistentialDeposit, ForeignAssets,
 	ForeignAssetsInstance, MetadataDepositBase, MetadataDepositPerByte, ParachainSystem, Runtime,
@@ -35,7 +34,9 @@ use frame_support::{
 	traits::fungibles::InspectEnumerable,
 	weights::{Weight, WeightToFee as WeightToFeeT},
 };
-use parachains_common::{AccountId, AssetIdForTrustBackedAssets, AuraId, Balance};
+use parachains_common::{
+	kusama::fee::WeightToFee, AccountId, AssetIdForTrustBackedAssets, AuraId, Balance,
+};
 use sp_runtime::traits::MaybeEquivalence;
 use xcm::latest::prelude::*;
 use xcm_executor::traits::{Identity, JustTry, WeightTrader};
diff --git a/cumulus/parachains/runtimes/assets/asset-hub-polkadot/Cargo.toml b/cumulus/parachains/runtimes/assets/asset-hub-polkadot/Cargo.toml
index dba374cfa070a93ee92bb2f41d7af980920f875d..df38e4d9d64a9b70bfb3d09042e404221e1b430e 100644
--- a/cumulus/parachains/runtimes/assets/asset-hub-polkadot/Cargo.toml
+++ b/cumulus/parachains/runtimes/assets/asset-hub-polkadot/Cargo.toml
@@ -1,8 +1,8 @@
 [package]
 name = "asset-hub-polkadot-runtime"
 version = "0.9.420"
-authors = ["Parity Technologies <admin@parity.io>"]
-edition = "2021"
+authors.workspace = true
+edition.workspace = true
 description = "Asset Hub Polkadot parachain runtime"
 
 [dependencies]
@@ -39,6 +39,7 @@ sp-api = { path = "../../../../../substrate/primitives/api", default-features =
 sp-block-builder = { path = "../../../../../substrate/primitives/block-builder", default-features = false}
 sp-consensus-aura = { path = "../../../../../substrate/primitives/consensus/aura", default-features = false}
 sp-core = { path = "../../../../../substrate/primitives/core", default-features = false}
+sp-genesis-builder = { path = "../../../../../substrate/primitives/genesis-builder", default-features = false }
 sp-inherents = { path = "../../../../../substrate/primitives/inherents", default-features = false}
 sp-offchain = { path = "../../../../../substrate/primitives/offchain", default-features = false}
 sp-runtime = { path = "../../../../../substrate/primitives/runtime", default-features = false}
@@ -53,12 +54,11 @@ sp-weights = { path = "../../../../../substrate/primitives/weights", default-fea
 pallet-xcm = { path = "../../../../../polkadot/xcm/pallet-xcm", default-features = false}
 pallet-xcm-benchmarks = { path = "../../../../../polkadot/xcm/pallet-xcm-benchmarks", default-features = false, optional = true }
 polkadot-core-primitives = { path = "../../../../../polkadot/core-primitives", default-features = false}
-polkadot-parachain = { path = "../../../../../polkadot/parachain", default-features = false}
+polkadot-parachain-primitives = { path = "../../../../../polkadot/parachain", default-features = false}
 polkadot-runtime-common = { path = "../../../../../polkadot/runtime/common", default-features = false}
-polkadot-runtime-constants = { path = "../../../../../polkadot/runtime/polkadot/constants", default-features = false}
-xcm = { path = "../../../../../polkadot/xcm", default-features = false}
-xcm-builder = { path = "../../../../../polkadot/xcm/xcm-builder", default-features = false}
-xcm-executor = { path = "../../../../../polkadot/xcm/xcm-executor", default-features = false}
+xcm = { package = "staging-xcm", path = "../../../../../polkadot/xcm", default-features = false}
+xcm-builder = { package = "staging-xcm-builder", path = "../../../../../polkadot/xcm/xcm-builder", default-features = false}
+xcm-executor = { package = "staging-xcm-executor", path = "../../../../../polkadot/xcm/xcm-executor", default-features = false}
 
 # Cumulus
 cumulus-pallet-aura-ext = { path = "../../../../pallets/aura-ext", default-features = false }
@@ -88,11 +88,13 @@ runtime-benchmarks = [
 	"cumulus-pallet-parachain-system/runtime-benchmarks",
 	"cumulus-pallet-session-benchmarking/runtime-benchmarks",
 	"cumulus-pallet-xcmp-queue/runtime-benchmarks",
+	"cumulus-primitives-utility/runtime-benchmarks",
 	"frame-benchmarking/runtime-benchmarks",
 	"frame-support/runtime-benchmarks",
 	"frame-system-benchmarking/runtime-benchmarks",
 	"frame-system/runtime-benchmarks",
 	"hex-literal",
+	"pallet-asset-tx-payment/runtime-benchmarks",
 	"pallet-assets/runtime-benchmarks",
 	"pallet-balances/runtime-benchmarks",
 	"pallet-collator-selection/runtime-benchmarks",
@@ -104,8 +106,12 @@ runtime-benchmarks = [
 	"pallet-utility/runtime-benchmarks",
 	"pallet-xcm-benchmarks/runtime-benchmarks",
 	"pallet-xcm/runtime-benchmarks",
+	"parachains-common/runtime-benchmarks",
+	"polkadot-parachain-primitives/runtime-benchmarks",
+	"polkadot-runtime-common/runtime-benchmarks",
 	"sp-runtime/runtime-benchmarks",
 	"xcm-builder/runtime-benchmarks",
+	"xcm-executor/runtime-benchmarks",
 ]
 try-runtime = [
 	"cumulus-pallet-aura-ext/try-runtime",
@@ -114,6 +120,7 @@ try-runtime = [
 	"cumulus-pallet-xcm/try-runtime",
 	"cumulus-pallet-xcmp-queue/try-runtime",
 	"frame-executive/try-runtime",
+	"frame-support/try-runtime",
 	"frame-system/try-runtime",
 	"frame-try-runtime/try-runtime",
 	"pallet-asset-tx-payment/try-runtime",
@@ -132,6 +139,8 @@ try-runtime = [
 	"pallet-utility/try-runtime",
 	"pallet-xcm/try-runtime",
 	"parachain-info/try-runtime",
+	"polkadot-runtime-common/try-runtime",
+	"sp-runtime/try-runtime",
 ]
 std = [
 	"assets-common/std",
@@ -139,14 +148,18 @@ std = [
 	"cumulus-pallet-aura-ext/std",
 	"cumulus-pallet-dmp-queue/std",
 	"cumulus-pallet-parachain-system/std",
+	"cumulus-pallet-session-benchmarking/std",
 	"cumulus-pallet-xcm/std",
 	"cumulus-pallet-xcmp-queue/std",
 	"cumulus-primitives-core/std",
 	"cumulus-primitives-utility/std",
+	"frame-benchmarking?/std",
 	"frame-executive/std",
 	"frame-support/std",
+	"frame-system-benchmarking?/std",
 	"frame-system-rpc-runtime-api/std",
 	"frame-system/std",
+	"frame-try-runtime?/std",
 	"log/std",
 	"pallet-asset-tx-payment/std",
 	"pallet-assets/std",
@@ -164,25 +177,28 @@ std = [
 	"pallet-transaction-payment/std",
 	"pallet-uniques/std",
 	"pallet-utility/std",
+	"pallet-xcm-benchmarks?/std",
 	"pallet-xcm/std",
 	"parachain-info/std",
 	"parachains-common/std",
 	"polkadot-core-primitives/std",
-	"polkadot-parachain/std",
+	"polkadot-parachain-primitives/std",
 	"polkadot-runtime-common/std",
-	"polkadot-runtime-constants/std",
 	"scale-info/std",
 	"sp-api/std",
 	"sp-block-builder/std",
 	"sp-consensus-aura/std",
 	"sp-core/std",
+	"sp-genesis-builder/std",
 	"sp-inherents/std",
 	"sp-offchain/std",
 	"sp-runtime/std",
 	"sp-session/std",
 	"sp-std/std",
+	"sp-storage/std",
 	"sp-transaction-pool/std",
 	"sp-version/std",
+	"sp-weights/std",
 	"substrate-wasm-builder",
 	"xcm-builder/std",
 	"xcm-executor/std",
diff --git a/cumulus/parachains/runtimes/assets/asset-hub-polkadot/src/constants.rs b/cumulus/parachains/runtimes/assets/asset-hub-polkadot/src/constants.rs
deleted file mode 100644
index d3ddab9a854fa07b59d933b4f8ca09f6d65c04c4..0000000000000000000000000000000000000000
--- a/cumulus/parachains/runtimes/assets/asset-hub-polkadot/src/constants.rs
+++ /dev/null
@@ -1,119 +0,0 @@
-// Copyright (C) 2021 Parity Technologies (UK) Ltd.
-// SPDX-License-Identifier: Apache-2.0
-
-// Licensed under the Apache License, Version 2.0 (the "License");
-// you may not use this file except in compliance with the License.
-// You may obtain a copy of the License at
-//
-// 	http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the License is distributed on an "AS IS" BASIS,
-// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-// See the License for the specific language governing permissions and
-// limitations under the License.
-
-pub mod currency {
-	use polkadot_core_primitives::Balance;
-	use polkadot_runtime_constants as constants;
-
-	/// The existential deposit. Set to 1/10 of its parent Relay Chain.
-	pub const EXISTENTIAL_DEPOSIT: Balance = constants::currency::EXISTENTIAL_DEPOSIT / 10;
-
-	pub const UNITS: Balance = constants::currency::UNITS;
-	pub const DOLLARS: Balance = constants::currency::DOLLARS;
-	pub const CENTS: Balance = constants::currency::CENTS;
-	pub const MILLICENTS: Balance = constants::currency::MILLICENTS;
-
-	pub const fn deposit(items: u32, bytes: u32) -> Balance {
-		// 1/100 of Polkadot
-		constants::currency::deposit(items, bytes) / 100
-	}
-}
-
-/// Fee-related.
-pub mod fee {
-	use frame_support::weights::{
-		constants::ExtrinsicBaseWeight, FeePolynomial, WeightToFeeCoefficient,
-		WeightToFeeCoefficients, WeightToFeePolynomial,
-	};
-	use polkadot_core_primitives::Balance;
-	use smallvec::smallvec;
-	pub use sp_runtime::Perbill;
-	use sp_weights::Weight;
-
-	/// The block saturation level. Fees will be updates based on this value.
-	pub const TARGET_BLOCK_FULLNESS: Perbill = Perbill::from_percent(25);
-
-	/// Handles converting a weight scalar to a fee value, based on the scale and granularity of the
-	/// node's balance type.
-	///
-	/// This should typically create a mapping between the following ranges:
-	///   - [0, MAXIMUM_BLOCK_WEIGHT]
-	///   - [Balance::min, Balance::max]
-	///
-	/// Yet, it can be used for any other sort of change to weight-fee. Some examples being:
-	///   - Setting it to `0` will essentially disable the weight fee.
-	///   - Setting it to `1` will cause the literal `#[weight = x]` values to be charged.
-	pub struct WeightToFee;
-	impl frame_support::weights::WeightToFee for WeightToFee {
-		type Balance = Balance;
-
-		fn weight_to_fee(weight: &Weight) -> Self::Balance {
-			let time_poly: FeePolynomial<Balance> = RefTimeToFee::polynomial().into();
-			let proof_poly: FeePolynomial<Balance> = ProofSizeToFee::polynomial().into();
-
-			// Take the maximum instead of the sum to charge by the more scarce resource.
-			time_poly.eval(weight.ref_time()).max(proof_poly.eval(weight.proof_size()))
-		}
-	}
-
-	/// Maps the reference time component of `Weight` to a fee.
-	pub struct RefTimeToFee;
-	impl WeightToFeePolynomial for RefTimeToFee {
-		type Balance = Balance;
-		fn polynomial() -> WeightToFeeCoefficients<Self::Balance> {
-			// in Polkadot, extrinsic base weight (smallest non-zero weight) is mapped to 1/10 CENT:
-			// in Asset Hub, we map to 1/10 of that, or 1/100 CENT
-			let p = super::currency::CENTS;
-			let q = 100 * Balance::from(ExtrinsicBaseWeight::get().ref_time());
-
-			smallvec![WeightToFeeCoefficient {
-				degree: 1,
-				negative: false,
-				coeff_frac: Perbill::from_rational(p % q, q),
-				coeff_integer: p / q,
-			}]
-		}
-	}
-
-	/// Maps the proof size component of `Weight` to a fee.
-	pub struct ProofSizeToFee;
-	impl WeightToFeePolynomial for ProofSizeToFee {
-		type Balance = Balance;
-		fn polynomial() -> WeightToFeeCoefficients<Self::Balance> {
-			// Map 10kb proof to 1 CENT.
-			let p = super::currency::CENTS;
-			let q = 10_000;
-
-			smallvec![WeightToFeeCoefficient {
-				degree: 1,
-				negative: false,
-				coeff_frac: Perbill::from_rational(p % q, q),
-				coeff_integer: p / q,
-			}]
-		}
-	}
-}
-
-/// Consensus-related.
-pub mod consensus {
-	/// Maximum number of blocks simultaneously accepted by the Runtime, not yet included
-	/// into the relay chain.
-	pub const UNINCLUDED_SEGMENT_CAPACITY: u32 = 1;
-	/// How many parachain blocks are processed by the relay chain per parent. Limits the
-	/// number of blocks authored per slot.
-	pub const BLOCK_PROCESSING_VELOCITY: u32 = 1;
-	/// Relay chain slot duration, in milliseconds.
-	pub const RELAY_CHAIN_SLOT_DURATION_MILLIS: u32 = 6000;
-}
diff --git a/cumulus/parachains/runtimes/assets/asset-hub-polkadot/src/lib.rs b/cumulus/parachains/runtimes/assets/asset-hub-polkadot/src/lib.rs
index 4a81c7fb6e3358812cfe0eb6be2459730a89a419..d4f7d6ef361674e5fa7bbd407e2eb830529a2963 100644
--- a/cumulus/parachains/runtimes/assets/asset-hub-polkadot/src/lib.rs
+++ b/cumulus/parachains/runtimes/assets/asset-hub-polkadot/src/lib.rs
@@ -1,4 +1,4 @@
-// Copyright (C) 2021-2022 Parity Technologies (UK) Ltd.
+// Copyright (C) Parity Technologies (UK) Ltd.
 // SPDX-License-Identifier: Apache-2.0
 
 // Licensed under the Apache License, Version 2.0 (the "License");
@@ -59,7 +59,6 @@
 #[cfg(feature = "std")]
 include!(concat!(env!("OUT_DIR"), "/wasm_binary.rs"));
 
-pub mod constants;
 mod weights;
 pub mod xcm_config;
 
@@ -82,10 +81,10 @@ use sp_version::NativeVersion;
 use sp_version::RuntimeVersion;
 
 use codec::{Decode, Encode, MaxEncodedLen};
-use constants::{consensus::*, currency::*, fee::WeightToFee};
 use frame_support::{
 	construct_runtime,
 	dispatch::DispatchClass,
+	genesis_builder_helper::{build_config, create_default_config},
 	parameter_types,
 	traits::{
 		AsEnsureOriginWithArg, ConstBool, ConstU32, ConstU64, ConstU8, EitherOfDiverse,
@@ -102,6 +101,7 @@ use pallet_nfts::PalletFeatures;
 pub use parachains_common as common;
 use parachains_common::{
 	impls::{AssetsToBlockAuthor, DealWithFees},
+	polkadot::{consensus::*, currency::*, fee::WeightToFee},
 	AccountId, AssetHubPolkadotAuraId as AuraId, AssetIdForTrustBackedAssets, Balance, BlockNumber,
 	Hash, Header, Nonce, Signature, AVERAGE_ON_INITIALIZE_RATIO, DAYS, HOURS, MAXIMUM_BLOCK_WEIGHT,
 	NORMAL_DISPATCH_RATIO, SLOT_DURATION,
@@ -1219,6 +1219,16 @@ impl_runtime_apis! {
 			Ok(batches)
 		}
 	}
+
+	impl sp_genesis_builder::GenesisBuilder<Block> for Runtime {
+		fn create_default_config() -> Vec<u8> {
+			create_default_config::<RuntimeGenesisConfig>()
+		}
+
+		fn build_config(config: Vec<u8>) -> sp_genesis_builder::Result {
+			build_config::<RuntimeGenesisConfig>(config)
+		}
+	}
 }
 
 cumulus_pallet_parachain_system::register_validate_block! {
@@ -1228,8 +1238,9 @@ cumulus_pallet_parachain_system::register_validate_block! {
 
 #[cfg(test)]
 mod tests {
-	use super::{constants::fee, *};
+	use super::*;
 	use crate::{CENTS, MILLICENTS};
+	use parachains_common::polkadot::fee;
 	use sp_runtime::traits::Zero;
 	use sp_weights::WeightToFee;
 
diff --git a/cumulus/parachains/runtimes/assets/asset-hub-polkadot/src/weights/block_weights.rs b/cumulus/parachains/runtimes/assets/asset-hub-polkadot/src/weights/block_weights.rs
index b2092d875c8328210667da4cbb95de0642e60ae3..e7fdb2aae2a01ec06076de83d94817e540e205dd 100644
--- a/cumulus/parachains/runtimes/assets/asset-hub-polkadot/src/weights/block_weights.rs
+++ b/cumulus/parachains/runtimes/assets/asset-hub-polkadot/src/weights/block_weights.rs
@@ -1,6 +1,6 @@
 // This file is part of Substrate.
 
-// Copyright (C) 2022 Parity Technologies (UK) Ltd.
+// Copyright (C) Parity Technologies (UK) Ltd.
 // SPDX-License-Identifier: Apache-2.0
 
 // Licensed under the Apache License, Version 2.0 (the "License");
diff --git a/cumulus/parachains/runtimes/assets/asset-hub-polkadot/src/weights/cumulus_pallet_xcmp_queue.rs b/cumulus/parachains/runtimes/assets/asset-hub-polkadot/src/weights/cumulus_pallet_xcmp_queue.rs
index e3c64776ae1c05edc997a7f01e70475c0227411c..65844ce194a0e66415179919a444eacbf6cccbe0 100644
--- a/cumulus/parachains/runtimes/assets/asset-hub-polkadot/src/weights/cumulus_pallet_xcmp_queue.rs
+++ b/cumulus/parachains/runtimes/assets/asset-hub-polkadot/src/weights/cumulus_pallet_xcmp_queue.rs
@@ -1,4 +1,4 @@
-// Copyright Parity Technologies (UK) Ltd.
+// Copyright (C) Parity Technologies (UK) Ltd.
 // This file is part of Cumulus.
 
 // Cumulus is free software: you can redistribute it and/or modify
diff --git a/cumulus/parachains/runtimes/assets/asset-hub-polkadot/src/weights/extrinsic_weights.rs b/cumulus/parachains/runtimes/assets/asset-hub-polkadot/src/weights/extrinsic_weights.rs
index 332c3b324bb9c1b386257bf7953d37aba8f5af13..1a4adb968bb7195428ea00d59cd92dcd3b6eea5f 100644
--- a/cumulus/parachains/runtimes/assets/asset-hub-polkadot/src/weights/extrinsic_weights.rs
+++ b/cumulus/parachains/runtimes/assets/asset-hub-polkadot/src/weights/extrinsic_weights.rs
@@ -1,6 +1,6 @@
 // This file is part of Substrate.
 
-// Copyright (C) 2022 Parity Technologies (UK) Ltd.
+// Copyright (C) Parity Technologies (UK) Ltd.
 // SPDX-License-Identifier: Apache-2.0
 
 // Licensed under the Apache License, Version 2.0 (the "License");
diff --git a/cumulus/parachains/runtimes/assets/asset-hub-polkadot/src/weights/frame_system.rs b/cumulus/parachains/runtimes/assets/asset-hub-polkadot/src/weights/frame_system.rs
index a2007347211d3ed80780aab58b7ec3f6060cba2a..713c33d34f77f5cc3a5e659a2b31dbbfd5721931 100644
--- a/cumulus/parachains/runtimes/assets/asset-hub-polkadot/src/weights/frame_system.rs
+++ b/cumulus/parachains/runtimes/assets/asset-hub-polkadot/src/weights/frame_system.rs
@@ -1,4 +1,4 @@
-// Copyright Parity Technologies (UK) Ltd.
+// Copyright (C) Parity Technologies (UK) Ltd.
 // This file is part of Cumulus.
 
 // Cumulus is free software: you can redistribute it and/or modify
diff --git a/cumulus/parachains/runtimes/assets/asset-hub-polkadot/src/weights/mod.rs b/cumulus/parachains/runtimes/assets/asset-hub-polkadot/src/weights/mod.rs
index 2cf514a5598139c5384cdc5fa4092cf9d33f43c7..3eb3b925e651836446a7ea771cb20f9b9444594d 100644
--- a/cumulus/parachains/runtimes/assets/asset-hub-polkadot/src/weights/mod.rs
+++ b/cumulus/parachains/runtimes/assets/asset-hub-polkadot/src/weights/mod.rs
@@ -1,3 +1,19 @@
+// 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/>.
+
 pub mod block_weights;
 pub mod cumulus_pallet_xcmp_queue;
 pub mod extrinsic_weights;
diff --git a/cumulus/parachains/runtimes/assets/asset-hub-polkadot/src/weights/pallet_assets_foreign.rs b/cumulus/parachains/runtimes/assets/asset-hub-polkadot/src/weights/pallet_assets_foreign.rs
index 817d567c8637c77a4c0a0f28d770dd68f918bc75..51413bb471b953b6724def2d8d009532425c02da 100644
--- a/cumulus/parachains/runtimes/assets/asset-hub-polkadot/src/weights/pallet_assets_foreign.rs
+++ b/cumulus/parachains/runtimes/assets/asset-hub-polkadot/src/weights/pallet_assets_foreign.rs
@@ -1,4 +1,4 @@
-// Copyright Parity Technologies (UK) Ltd.
+// Copyright (C) Parity Technologies (UK) Ltd.
 // This file is part of Cumulus.
 
 // Cumulus is free software: you can redistribute it and/or modify
diff --git a/cumulus/parachains/runtimes/assets/asset-hub-polkadot/src/weights/pallet_assets_local.rs b/cumulus/parachains/runtimes/assets/asset-hub-polkadot/src/weights/pallet_assets_local.rs
index 829b3543ee317022c929eded9365b4665ba18f17..c8420e72ba213fda9f11754552cf05fb84a530d4 100644
--- a/cumulus/parachains/runtimes/assets/asset-hub-polkadot/src/weights/pallet_assets_local.rs
+++ b/cumulus/parachains/runtimes/assets/asset-hub-polkadot/src/weights/pallet_assets_local.rs
@@ -1,4 +1,4 @@
-// Copyright Parity Technologies (UK) Ltd.
+// Copyright (C) Parity Technologies (UK) Ltd.
 // This file is part of Cumulus.
 
 // Cumulus is free software: you can redistribute it and/or modify
diff --git a/cumulus/parachains/runtimes/assets/asset-hub-polkadot/src/weights/pallet_balances.rs b/cumulus/parachains/runtimes/assets/asset-hub-polkadot/src/weights/pallet_balances.rs
index 0da4d38eda247abceef5e0b827a565f4e881cbbf..a7f02ba24fd13ff409e599b5344d8c6a512aa9c9 100644
--- a/cumulus/parachains/runtimes/assets/asset-hub-polkadot/src/weights/pallet_balances.rs
+++ b/cumulus/parachains/runtimes/assets/asset-hub-polkadot/src/weights/pallet_balances.rs
@@ -1,4 +1,4 @@
-// Copyright Parity Technologies (UK) Ltd.
+// Copyright (C) Parity Technologies (UK) Ltd.
 // This file is part of Cumulus.
 
 // Cumulus is free software: you can redistribute it and/or modify
diff --git a/cumulus/parachains/runtimes/assets/asset-hub-polkadot/src/weights/pallet_collator_selection.rs b/cumulus/parachains/runtimes/assets/asset-hub-polkadot/src/weights/pallet_collator_selection.rs
index 6d8828e836cca7fe0b2d7e8a44cdb65e80bb994f..53efb218440a87dbd5557708a42c92ef39add826 100644
--- a/cumulus/parachains/runtimes/assets/asset-hub-polkadot/src/weights/pallet_collator_selection.rs
+++ b/cumulus/parachains/runtimes/assets/asset-hub-polkadot/src/weights/pallet_collator_selection.rs
@@ -1,4 +1,4 @@
-// Copyright Parity Technologies (UK) Ltd.
+// Copyright (C) Parity Technologies (UK) Ltd.
 // This file is part of Cumulus.
 
 // Cumulus is free software: you can redistribute it and/or modify
diff --git a/cumulus/parachains/runtimes/assets/asset-hub-polkadot/src/weights/pallet_multisig.rs b/cumulus/parachains/runtimes/assets/asset-hub-polkadot/src/weights/pallet_multisig.rs
index d51eb85f6dcf5f71aa3e1d88a28234ac5fb1cc03..705aca9e1a4e78222f231a11ca44dd27ac20c70e 100644
--- a/cumulus/parachains/runtimes/assets/asset-hub-polkadot/src/weights/pallet_multisig.rs
+++ b/cumulus/parachains/runtimes/assets/asset-hub-polkadot/src/weights/pallet_multisig.rs
@@ -1,4 +1,4 @@
-// Copyright Parity Technologies (UK) Ltd.
+// Copyright (C) Parity Technologies (UK) Ltd.
 // This file is part of Cumulus.
 
 // Cumulus is free software: you can redistribute it and/or modify
diff --git a/cumulus/parachains/runtimes/assets/asset-hub-polkadot/src/weights/pallet_nfts.rs b/cumulus/parachains/runtimes/assets/asset-hub-polkadot/src/weights/pallet_nfts.rs
index 1a04d8b0991d0039621efe0927e61dfbbe0f976c..6d6f7cbbafb44c31b55def7c36a731aee984bf40 100644
--- a/cumulus/parachains/runtimes/assets/asset-hub-polkadot/src/weights/pallet_nfts.rs
+++ b/cumulus/parachains/runtimes/assets/asset-hub-polkadot/src/weights/pallet_nfts.rs
@@ -1,4 +1,4 @@
-// Copyright Parity Technologies (UK) Ltd.
+// Copyright (C) Parity Technologies (UK) Ltd.
 // This file is part of Cumulus.
 
 // Cumulus is free software: you can redistribute it and/or modify
diff --git a/cumulus/parachains/runtimes/assets/asset-hub-polkadot/src/weights/pallet_proxy.rs b/cumulus/parachains/runtimes/assets/asset-hub-polkadot/src/weights/pallet_proxy.rs
index df0124b471d59ba581562eb0e7ba054b6549dcb3..99db2865692fc6e0316285f4985a974d85dba766 100644
--- a/cumulus/parachains/runtimes/assets/asset-hub-polkadot/src/weights/pallet_proxy.rs
+++ b/cumulus/parachains/runtimes/assets/asset-hub-polkadot/src/weights/pallet_proxy.rs
@@ -1,4 +1,4 @@
-// Copyright Parity Technologies (UK) Ltd.
+// Copyright (C) Parity Technologies (UK) Ltd.
 // This file is part of Cumulus.
 
 // Cumulus is free software: you can redistribute it and/or modify
diff --git a/cumulus/parachains/runtimes/assets/asset-hub-polkadot/src/weights/pallet_session.rs b/cumulus/parachains/runtimes/assets/asset-hub-polkadot/src/weights/pallet_session.rs
index 50c77fd3bc89921a9e7032a05b9d0ffa61c819ff..8a6943d53048047641132a70d6cade4983e503b6 100644
--- a/cumulus/parachains/runtimes/assets/asset-hub-polkadot/src/weights/pallet_session.rs
+++ b/cumulus/parachains/runtimes/assets/asset-hub-polkadot/src/weights/pallet_session.rs
@@ -1,4 +1,4 @@
-// Copyright Parity Technologies (UK) Ltd.
+// Copyright (C) Parity Technologies (UK) Ltd.
 // This file is part of Cumulus.
 
 // Cumulus is free software: you can redistribute it and/or modify
diff --git a/cumulus/parachains/runtimes/assets/asset-hub-polkadot/src/weights/pallet_timestamp.rs b/cumulus/parachains/runtimes/assets/asset-hub-polkadot/src/weights/pallet_timestamp.rs
index 93f7e31120ca68504342a0d3d36eed05235ece77..8c6a2b5505e56afe4b3f32c06d2a3ccb59bc36f0 100644
--- a/cumulus/parachains/runtimes/assets/asset-hub-polkadot/src/weights/pallet_timestamp.rs
+++ b/cumulus/parachains/runtimes/assets/asset-hub-polkadot/src/weights/pallet_timestamp.rs
@@ -1,4 +1,4 @@
-// Copyright Parity Technologies (UK) Ltd.
+// Copyright (C) Parity Technologies (UK) Ltd.
 // This file is part of Cumulus.
 
 // Cumulus is free software: you can redistribute it and/or modify
diff --git a/cumulus/parachains/runtimes/assets/asset-hub-polkadot/src/weights/pallet_uniques.rs b/cumulus/parachains/runtimes/assets/asset-hub-polkadot/src/weights/pallet_uniques.rs
index 3917b594c3f1f113a422c590e91a3f58e965e0af..a88928be65348beb3fc0fe29c893e1de0bacacfe 100644
--- a/cumulus/parachains/runtimes/assets/asset-hub-polkadot/src/weights/pallet_uniques.rs
+++ b/cumulus/parachains/runtimes/assets/asset-hub-polkadot/src/weights/pallet_uniques.rs
@@ -1,4 +1,4 @@
-// Copyright Parity Technologies (UK) Ltd.
+// Copyright (C) Parity Technologies (UK) Ltd.
 // This file is part of Cumulus.
 
 // Cumulus is free software: you can redistribute it and/or modify
diff --git a/cumulus/parachains/runtimes/assets/asset-hub-polkadot/src/weights/pallet_utility.rs b/cumulus/parachains/runtimes/assets/asset-hub-polkadot/src/weights/pallet_utility.rs
index bda0c6e1aa94891b24f726a84f3cc58cef3251f7..c6fc093cc4b44e1396d49b4a74e34eb99f07bd3c 100644
--- a/cumulus/parachains/runtimes/assets/asset-hub-polkadot/src/weights/pallet_utility.rs
+++ b/cumulus/parachains/runtimes/assets/asset-hub-polkadot/src/weights/pallet_utility.rs
@@ -1,4 +1,4 @@
-// Copyright Parity Technologies (UK) Ltd.
+// Copyright (C) Parity Technologies (UK) Ltd.
 // This file is part of Cumulus.
 
 // Cumulus is free software: you can redistribute it and/or modify
diff --git a/cumulus/parachains/runtimes/assets/asset-hub-polkadot/src/weights/pallet_xcm.rs b/cumulus/parachains/runtimes/assets/asset-hub-polkadot/src/weights/pallet_xcm.rs
index 8d14734888b6798f9f205a3845dd5c9977e9edbb..bd7615895e2e96fa95d45389e3296d988fc7057e 100644
--- a/cumulus/parachains/runtimes/assets/asset-hub-polkadot/src/weights/pallet_xcm.rs
+++ b/cumulus/parachains/runtimes/assets/asset-hub-polkadot/src/weights/pallet_xcm.rs
@@ -1,4 +1,4 @@
-// Copyright Parity Technologies (UK) Ltd.
+// Copyright (C) Parity Technologies (UK) Ltd.
 // This file is part of Cumulus.
 
 // Cumulus is free software: you can redistribute it and/or modify
diff --git a/cumulus/parachains/runtimes/assets/asset-hub-polkadot/src/weights/paritydb_weights.rs b/cumulus/parachains/runtimes/assets/asset-hub-polkadot/src/weights/paritydb_weights.rs
index 4338d928d807a41cc60ec91d86e91c81bb253631..25679703831a13b8d1bb7fb7dd4d92fa84b1f255 100644
--- a/cumulus/parachains/runtimes/assets/asset-hub-polkadot/src/weights/paritydb_weights.rs
+++ b/cumulus/parachains/runtimes/assets/asset-hub-polkadot/src/weights/paritydb_weights.rs
@@ -1,6 +1,6 @@
 // This file is part of Substrate.
 
-// Copyright (C) 2022 Parity Technologies (UK) Ltd.
+// Copyright (C) Parity Technologies (UK) Ltd.
 // SPDX-License-Identifier: Apache-2.0
 
 // Licensed under the Apache License, Version 2.0 (the "License");
diff --git a/cumulus/parachains/runtimes/assets/asset-hub-polkadot/src/weights/rocksdb_weights.rs b/cumulus/parachains/runtimes/assets/asset-hub-polkadot/src/weights/rocksdb_weights.rs
index 1d115d963facb39fe29d6258918fda3bc8d94900..3dd817aa6f137085b0e5fdf2b11b7f50e5c8b002 100644
--- a/cumulus/parachains/runtimes/assets/asset-hub-polkadot/src/weights/rocksdb_weights.rs
+++ b/cumulus/parachains/runtimes/assets/asset-hub-polkadot/src/weights/rocksdb_weights.rs
@@ -1,6 +1,6 @@
 // This file is part of Substrate.
 
-// Copyright (C) 2022 Parity Technologies (UK) Ltd.
+// Copyright (C) Parity Technologies (UK) Ltd.
 // SPDX-License-Identifier: Apache-2.0
 
 // Licensed under the Apache License, Version 2.0 (the "License");
diff --git a/cumulus/parachains/runtimes/assets/asset-hub-polkadot/src/weights/xcm/mod.rs b/cumulus/parachains/runtimes/assets/asset-hub-polkadot/src/weights/xcm/mod.rs
index 79f8e83a4f20475f5b1d8c7390c1ac494f4a65a7..eb140c4bf32383697ca6c27c913e56edd2f100c4 100644
--- a/cumulus/parachains/runtimes/assets/asset-hub-polkadot/src/weights/xcm/mod.rs
+++ b/cumulus/parachains/runtimes/assets/asset-hub-polkadot/src/weights/xcm/mod.rs
@@ -1,4 +1,4 @@
-// Copyright 2022 Parity Technologies (UK) Ltd.
+// Copyright (C) Parity Technologies (UK) Ltd.
 // This file is part of Cumulus.
 
 // Cumulus is free software: you can redistribute it and/or modify
@@ -61,16 +61,8 @@ impl<Call> XcmWeightInfo<Call> for AssetHubPolkadotXcmWeight<Call> {
 	fn withdraw_asset(assets: &MultiAssets) -> Weight {
 		assets.weigh_multi_assets(XcmFungibleWeight::<Runtime>::withdraw_asset())
 	}
-	// Currently there is no trusted reserve (`IsReserve = ()`),
-	// but we need this hack for `pallet_xcm::reserve_transfer_assets`
-	// (TODO) fix https://github.com/paritytech/polkadot/pull/7424
-	// (TODO) fix https://github.com/paritytech/polkadot/pull/7546
-	fn reserve_asset_deposited(_assets: &MultiAssets) -> Weight {
-		// TODO: if we change `IsReserve = ...` then use this line...
-		// TODO: or if remote weight estimation is fixed, then remove
-		// TODO: hardcoded - fix https://github.com/paritytech/cumulus/issues/1974
-		let hardcoded_weight = Weight::from_parts(1_000_000_000_u64, 0);
-		hardcoded_weight.min(XcmFungibleWeight::<Runtime>::reserve_asset_deposited())
+	fn reserve_asset_deposited(assets: &MultiAssets) -> Weight {
+		assets.weigh_multi_assets(XcmFungibleWeight::<Runtime>::reserve_asset_deposited())
 	}
 	fn receive_teleported_asset(assets: &MultiAssets) -> Weight {
 		assets.weigh_multi_assets(XcmFungibleWeight::<Runtime>::receive_teleported_asset())
@@ -127,10 +119,7 @@ impl<Call> XcmWeightInfo<Call> for AssetHubPolkadotXcmWeight<Call> {
 	}
 
 	fn deposit_asset(assets: &MultiAssetFilter, _dest: &MultiLocation) -> Weight {
-		// Hardcoded till the XCM pallet is fixed
-		let hardcoded_weight = Weight::from_parts(1_000_000_000_u64, 0);
-		let weight = assets.weigh_multi_assets(XcmFungibleWeight::<Runtime>::deposit_asset());
-		hardcoded_weight.min(weight)
+		assets.weigh_multi_assets(XcmFungibleWeight::<Runtime>::deposit_asset())
 	}
 	fn deposit_reserve_asset(
 		assets: &MultiAssetFilter,
diff --git a/cumulus/parachains/runtimes/assets/asset-hub-polkadot/src/weights/xcm/pallet_xcm_benchmarks_fungible.rs b/cumulus/parachains/runtimes/assets/asset-hub-polkadot/src/weights/xcm/pallet_xcm_benchmarks_fungible.rs
index 7fea608319f0bf61fd071d1e685f0c05c5945efe..96d86ec423f20e1923cf0842830a6e12ad81d436 100644
--- a/cumulus/parachains/runtimes/assets/asset-hub-polkadot/src/weights/xcm/pallet_xcm_benchmarks_fungible.rs
+++ b/cumulus/parachains/runtimes/assets/asset-hub-polkadot/src/weights/xcm/pallet_xcm_benchmarks_fungible.rs
@@ -1,4 +1,4 @@
-// Copyright Parity Technologies (UK) Ltd.
+// Copyright (C) Parity Technologies (UK) Ltd.
 // This file is part of Cumulus.
 
 // Cumulus is free software: you can redistribute it and/or modify
@@ -17,28 +17,26 @@
 //! Autogenerated weights for `pallet_xcm_benchmarks::fungible`
 //!
 //! THIS FILE WAS AUTO-GENERATED USING THE SUBSTRATE BENCHMARK CLI VERSION 4.0.0-dev
-//! DATE: 2023-07-31, STEPS: `50`, REPEAT: `20`, LOW RANGE: `[]`, HIGH RANGE: `[]`
+//! DATE: 2023-09-27, STEPS: `50`, REPEAT: `20`, LOW RANGE: `[]`, HIGH RANGE: `[]`
 //! WORST CASE MAP SIZE: `1000000`
-//! HOSTNAME: `runner-ynta1nyy-project-238-concurrent-0`, CPU: `Intel(R) Xeon(R) CPU @ 2.60GHz`
-//! EXECUTION: , WASM-EXECUTION: Compiled, CHAIN: Some("asset-hub-polkadot-dev"), DB CACHE: 1024
+//! HOSTNAME: `runner-nbnwcyh-project-674-concurrent-0`, CPU: `Intel(R) Xeon(R) CPU @ 2.60GHz`
+//! WASM-EXECUTION: Compiled, CHAIN: Some("asset-hub-polkadot-dev"), DB CACHE: 1024
 
 // Executed Command:
-// ./target/production/polkadot-parachain
+// target/production/polkadot-parachain
 // benchmark
 // pallet
-// --template=./templates/xcm-bench-template.hbs
-// --chain=asset-hub-polkadot-dev
-// --wasm-execution=compiled
-// --pallet=pallet_xcm_benchmarks::fungible
-// --no-storage-info
-// --no-median-slopes
-// --no-min-squares
-// --extrinsic=*
 // --steps=50
 // --repeat=20
-// --json
-// --header=./file_header.txt
-// --output=./parachains/runtimes/assets/asset-hub-polkadot/src/weights/xcm/pallet_xcm_benchmarks_fungible.rs
+// --extrinsic=*
+// --wasm-execution=compiled
+// --heap-pages=4096
+// --json-file=/builds/parity/mirrors/polkadot-sdk/.git/.artifacts/bench.json
+// --pallet=pallet_xcm_benchmarks::fungible
+// --chain=asset-hub-polkadot-dev
+// --header=./cumulus/file_header.txt
+// --template=./cumulus/templates/xcm-bench-template.hbs
+// --output=./cumulus/parachains/runtimes/assets/asset-hub-polkadot/src/weights/xcm/
 
 #![cfg_attr(rustfmt, rustfmt_skip)]
 #![allow(unused_parens)]
@@ -56,8 +54,8 @@ impl<T: frame_system::Config> WeightInfo<T> {
 		// Proof Size summary in bytes:
 		//  Measured:  `101`
 		//  Estimated: `3593`
-		// Minimum execution time: 26_090_000 picoseconds.
-		Weight::from_parts(27_006_000, 3593)
+		// Minimum execution time: 25_903_000 picoseconds.
+		Weight::from_parts(26_768_000, 3593)
 			.saturating_add(T::DbWeight::get().reads(1))
 			.saturating_add(T::DbWeight::get().writes(1))
 	}
@@ -67,8 +65,8 @@ impl<T: frame_system::Config> WeightInfo<T> {
 		// Proof Size summary in bytes:
 		//  Measured:  `101`
 		//  Estimated: `6196`
-		// Minimum execution time: 50_699_000 picoseconds.
-		Weight::from_parts(51_888_000, 6196)
+		// Minimum execution time: 51_042_000 picoseconds.
+		Weight::from_parts(51_939_000, 6196)
 			.saturating_add(T::DbWeight::get().reads(2))
 			.saturating_add(T::DbWeight::get().writes(2))
 	}
@@ -90,8 +88,8 @@ impl<T: frame_system::Config> WeightInfo<T> {
 		// Proof Size summary in bytes:
 		//  Measured:  `176`
 		//  Estimated: `6196`
-		// Minimum execution time: 72_130_000 picoseconds.
-		Weight::from_parts(73_994_000, 6196)
+		// Minimum execution time: 74_626_000 picoseconds.
+		Weight::from_parts(75_963_000, 6196)
 			.saturating_add(T::DbWeight::get().reads(8))
 			.saturating_add(T::DbWeight::get().writes(4))
 	}
@@ -101,8 +99,8 @@ impl<T: frame_system::Config> WeightInfo<T> {
 		// Proof Size summary in bytes:
 		//  Measured:  `0`
 		//  Estimated: `0`
-		// Minimum execution time: 500_000_000_000 picoseconds.
-		Weight::from_parts(500_000_000_000, 0)
+		// Minimum execution time: 18_446_744_073_709_551_000 picoseconds.
+		Weight::from_parts(18_446_744_073_709_551_000, 0)
 	}
 	// Storage: `ParachainInfo::ParachainId` (r:1 w:0)
 	// Proof: `ParachainInfo::ParachainId` (`max_values`: Some(1), `max_size`: Some(4), added: 499, mode: `MaxEncodedLen`)
@@ -120,8 +118,8 @@ impl<T: frame_system::Config> WeightInfo<T> {
 		// Proof Size summary in bytes:
 		//  Measured:  `75`
 		//  Estimated: `3540`
-		// Minimum execution time: 477_183_000 picoseconds.
-		Weight::from_parts(488_156_000, 3540)
+		// Minimum execution time: 480_030_000 picoseconds.
+		Weight::from_parts(486_039_000, 3540)
 			.saturating_add(T::DbWeight::get().reads(6))
 			.saturating_add(T::DbWeight::get().writes(2))
 	}
@@ -129,8 +127,8 @@ impl<T: frame_system::Config> WeightInfo<T> {
 		// Proof Size summary in bytes:
 		//  Measured:  `0`
 		//  Estimated: `0`
-		// Minimum execution time: 3_966_000 picoseconds.
-		Weight::from_parts(4_129_000, 0)
+		// Minimum execution time: 3_936_000 picoseconds.
+		Weight::from_parts(4_033_000, 0)
 	}
 	// Storage: `System::Account` (r:1 w:1)
 	// Proof: `System::Account` (`max_values`: None, `max_size`: Some(128), added: 2603, mode: `MaxEncodedLen`)
@@ -138,8 +136,8 @@ impl<T: frame_system::Config> WeightInfo<T> {
 		// Proof Size summary in bytes:
 		//  Measured:  `0`
 		//  Estimated: `3593`
-		// Minimum execution time: 26_047_000 picoseconds.
-		Weight::from_parts(26_982_000, 3593)
+		// Minimum execution time: 26_274_000 picoseconds.
+		Weight::from_parts(26_609_000, 3593)
 			.saturating_add(T::DbWeight::get().reads(1))
 			.saturating_add(T::DbWeight::get().writes(1))
 	}
@@ -161,8 +159,8 @@ impl<T: frame_system::Config> WeightInfo<T> {
 		// Proof Size summary in bytes:
 		//  Measured:  `75`
 		//  Estimated: `3593`
-		// Minimum execution time: 51_076_000 picoseconds.
-		Weight::from_parts(51_826_000, 3593)
+		// Minimum execution time: 52_888_000 picoseconds.
+		Weight::from_parts(53_835_000, 3593)
 			.saturating_add(T::DbWeight::get().reads(7))
 			.saturating_add(T::DbWeight::get().writes(3))
 	}
@@ -182,8 +180,8 @@ impl<T: frame_system::Config> WeightInfo<T> {
 		// Proof Size summary in bytes:
 		//  Measured:  `75`
 		//  Estimated: `3540`
-		// Minimum execution time: 30_606_000 picoseconds.
-		Weight::from_parts(31_168_000, 3540)
+		// Minimum execution time: 33_395_000 picoseconds.
+		Weight::from_parts(33_827_000, 3540)
 			.saturating_add(T::DbWeight::get().reads(6))
 			.saturating_add(T::DbWeight::get().writes(2))
 	}
diff --git a/cumulus/parachains/runtimes/assets/asset-hub-polkadot/src/weights/xcm/pallet_xcm_benchmarks_generic.rs b/cumulus/parachains/runtimes/assets/asset-hub-polkadot/src/weights/xcm/pallet_xcm_benchmarks_generic.rs
index aa7451594f5bc66c8db20f529489279c01547c00..061992691a605b42702a292eeb11e0520160272c 100644
--- a/cumulus/parachains/runtimes/assets/asset-hub-polkadot/src/weights/xcm/pallet_xcm_benchmarks_generic.rs
+++ b/cumulus/parachains/runtimes/assets/asset-hub-polkadot/src/weights/xcm/pallet_xcm_benchmarks_generic.rs
@@ -1,4 +1,4 @@
-// Copyright Parity Technologies (UK) Ltd.
+// Copyright (C) Parity Technologies (UK) Ltd.
 // This file is part of Cumulus.
 
 // Cumulus is free software: you can redistribute it and/or modify
diff --git a/cumulus/parachains/runtimes/assets/asset-hub-polkadot/src/xcm_config.rs b/cumulus/parachains/runtimes/assets/asset-hub-polkadot/src/xcm_config.rs
index 3e40afb83f9c7c28b09353851bc9d9a7c0b9446d..46d508d0fed80419fb00160147fdb62adb787fdf 100644
--- a/cumulus/parachains/runtimes/assets/asset-hub-polkadot/src/xcm_config.rs
+++ b/cumulus/parachains/runtimes/assets/asset-hub-polkadot/src/xcm_config.rs
@@ -1,4 +1,4 @@
-// Copyright (C) 2022 Parity Technologies (UK) Ltd.
+// Copyright (C) Parity Technologies (UK) Ltd.
 // SPDX-License-Identifier: Apache-2.0
 
 // Licensed under the Apache License, Version 2.0 (the "License");
@@ -27,16 +27,19 @@ use frame_support::{
 };
 use frame_system::EnsureRoot;
 use pallet_xcm::XcmPassthrough;
-use parachains_common::{impls::ToStakingPot, xcm_config::AssetFeeAsExistentialDepositMultiplier};
-use polkadot_parachain::primitives::Sibling;
+use parachains_common::{
+	impls::ToStakingPot,
+	xcm_config::{AssetFeeAsExistentialDepositMultiplier, ConcreteAssetFromSystem},
+};
+use polkadot_parachain_primitives::primitives::Sibling;
 use sp_runtime::traits::ConvertInto;
 use xcm::latest::prelude::*;
 use xcm_builder::{
 	AccountId32Aliases, AllowExplicitUnpaidExecutionFrom, AllowKnownQueryResponses,
 	AllowSubscriptionsFrom, AllowTopLevelPaidExecutionFrom, CurrencyAdapter,
 	DenyReserveTransferToRelayChain, DenyThenTry, DescribeFamily, DescribePalletTerminal,
-	EnsureXcmOrigin, FungiblesAdapter, HashedDescription, IsConcrete, LocalMint, NativeAsset,
-	NoChecking, ParentAsSuperuser, ParentIsPreset, RelayChainAsNative, SiblingParachainAsNative,
+	EnsureXcmOrigin, FungiblesAdapter, HashedDescription, IsConcrete, LocalMint, NoChecking,
+	ParentAsSuperuser, ParentIsPreset, RelayChainAsNative, SiblingParachainAsNative,
 	SiblingParachainConvertsVia, SignedAccountId32AsNative, SignedToAccountId32,
 	SovereignSignedViaLocation, TakeWeightCredit, TrailingSetTopicAsId, UsingComponents,
 	WeightInfoBounds, WithComputedOrigin, WithUniqueTopic,
@@ -186,6 +189,9 @@ match_types! {
 	pub type FellowshipSalaryPallet: impl Contains<MultiLocation> = {
 		MultiLocation { parents: 1, interior: X2(Parachain(1001), PalletInstance(64)) }
 	};
+	pub type AmbassadorSalaryPallet: impl Contains<MultiLocation> = {
+		MultiLocation { parents: 1, interior: X2(Parachain(1001), PalletInstance(74)) }
+	};
 }
 
 /// A call filter for the XCM Transact instruction. This is a temporary measure until we properly
@@ -372,6 +378,7 @@ pub type Barrier = TrailingSetTopicAsId<
 						ParentOrParentsPlurality,
 						FellowsPlurality,
 						FellowshipSalaryPallet,
+						AmbassadorSalaryPallet,
 					)>,
 					// Subscriptions for version tracking are OK.
 					AllowSubscriptionsFrom<ParentOrSiblings>,
@@ -390,6 +397,15 @@ pub type AssetFeeAsExistentialDepositMultiplierFeeCharger = AssetFeeAsExistentia
 	TrustBackedAssetsInstance,
 >;
 
+/// Cases where a remote origin is accepted as trusted Teleporter for a given asset:
+///
+/// - DOT with the parent Relay Chain and sibling system parachains; and
+/// - Sibling parachains' assets from where they originate (as `ForeignCreators`).
+pub type TrustedTeleporters = (
+	ConcreteAssetFromSystem<DotLocation>,
+	IsForeignConcreteAsset<FromSiblingParachain<parachain_info::Pallet<Runtime>>>,
+);
+
 pub struct XcmConfig;
 impl xcm_executor::Config for XcmConfig {
 	type RuntimeCall = RuntimeCall;
@@ -400,13 +416,7 @@ impl xcm_executor::Config for XcmConfig {
 	// Asset Hub acting _as_ a reserve location for DOT and assets created under `pallet-assets`.
 	// For DOT, users must use teleport where allowed (e.g. with the Relay Chain).
 	type IsReserve = ();
-	// We allow:
-	// - teleportation of DOT
-	// - teleportation of sibling parachain's assets (as ForeignCreators)
-	type IsTeleporter = (
-		NativeAsset,
-		IsForeignConcreteAsset<FromSiblingParachain<parachain_info::Pallet<Runtime>>>,
-	);
+	type IsTeleporter = TrustedTeleporters;
 	type UniversalLocation = UniversalLocation;
 	type Barrier = Barrier;
 	type Weigher = WeightInfoBounds<
diff --git a/cumulus/parachains/runtimes/assets/asset-hub-polkadot/tests/tests.rs b/cumulus/parachains/runtimes/assets/asset-hub-polkadot/tests/tests.rs
index 3eab6723ec20cd23a70f78d6e8afe93abe93199b..7200ebc16a2875336fc50e711386cab41df6c9b4 100644
--- a/cumulus/parachains/runtimes/assets/asset-hub-polkadot/tests/tests.rs
+++ b/cumulus/parachains/runtimes/assets/asset-hub-polkadot/tests/tests.rs
@@ -22,10 +22,9 @@ use asset_hub_polkadot_runtime::xcm_config::{
 	ForeignCreatorsSovereignAccountOf, TrustBackedAssetsPalletLocation, XcmConfig,
 };
 pub use asset_hub_polkadot_runtime::{
-	constants::fee::WeightToFee, AllPalletsWithoutSystem, AssetDeposit, Assets, Balances,
-	ExistentialDeposit, ForeignAssets, ForeignAssetsInstance, MetadataDepositBase,
-	MetadataDepositPerByte, ParachainSystem, Runtime, RuntimeCall, RuntimeEvent, SessionKeys,
-	System, TrustBackedAssetsInstance,
+	AllPalletsWithoutSystem, AssetDeposit, Assets, Balances, ExistentialDeposit, ForeignAssets,
+	ForeignAssetsInstance, MetadataDepositBase, MetadataDepositPerByte, ParachainSystem, Runtime,
+	RuntimeCall, RuntimeEvent, SessionKeys, System, TrustBackedAssetsInstance,
 };
 use asset_test_utils::{CollatorSessionKeys, ExtBuilder};
 use codec::{Decode, Encode};
@@ -36,7 +35,8 @@ use frame_support::{
 	weights::{Weight, WeightToFee as WeightToFeeT},
 };
 use parachains_common::{
-	AccountId, AssetHubPolkadotAuraId as AuraId, AssetIdForTrustBackedAssets, Balance,
+	polkadot::fee::WeightToFee, AccountId, AssetHubPolkadotAuraId as AuraId,
+	AssetIdForTrustBackedAssets, Balance,
 };
 use sp_runtime::traits::MaybeEquivalence;
 use xcm::latest::prelude::*;
diff --git a/cumulus/parachains/runtimes/assets/asset-hub-westend/Cargo.toml b/cumulus/parachains/runtimes/assets/asset-hub-westend/Cargo.toml
index 1e9c49cabe453c79c7929072099e1f9d40ac0d92..f7f6fdf68e46692182839bdd06b6ea7d7fde5b19 100644
--- a/cumulus/parachains/runtimes/assets/asset-hub-westend/Cargo.toml
+++ b/cumulus/parachains/runtimes/assets/asset-hub-westend/Cargo.toml
@@ -1,8 +1,8 @@
 [package]
 name = "asset-hub-westend-runtime"
 version = "0.9.420"
-authors = ["Parity Technologies <admin@parity.io>"]
-edition = "2021"
+authors.workspace = true
+edition.workspace = true
 description = "Westend variant of Asset Hub parachain runtime"
 
 [dependencies]
@@ -41,6 +41,7 @@ sp-api = { path = "../../../../../substrate/primitives/api", default-features =
 sp-block-builder = { path = "../../../../../substrate/primitives/block-builder", default-features = false}
 sp-consensus-aura = { path = "../../../../../substrate/primitives/consensus/aura", default-features = false}
 sp-core = { path = "../../../../../substrate/primitives/core", default-features = false}
+sp-genesis-builder = { path = "../../../../../substrate/primitives/genesis-builder", default-features = false }
 sp-inherents = { path = "../../../../../substrate/primitives/inherents", default-features = false}
 sp-offchain = { path = "../../../../../substrate/primitives/offchain", default-features = false}
 sp-runtime = { path = "../../../../../substrate/primitives/runtime", default-features = false}
@@ -56,12 +57,12 @@ primitive-types = { version = "0.12.1", default-features = false, features = ["c
 pallet-xcm = { path = "../../../../../polkadot/xcm/pallet-xcm", default-features = false}
 pallet-xcm-benchmarks = { path = "../../../../../polkadot/xcm/pallet-xcm-benchmarks", default-features = false, optional = true }
 polkadot-core-primitives = { path = "../../../../../polkadot/core-primitives", default-features = false}
-polkadot-parachain = { path = "../../../../../polkadot/parachain", default-features = false}
+polkadot-parachain-primitives = { path = "../../../../../polkadot/parachain", default-features = false}
 polkadot-runtime-common = { path = "../../../../../polkadot/runtime/common", default-features = false}
 westend-runtime-constants = { path = "../../../../../polkadot/runtime/westend/constants", default-features = false}
-xcm = { path = "../../../../../polkadot/xcm", default-features = false}
-xcm-builder = { path = "../../../../../polkadot/xcm/xcm-builder", default-features = false}
-xcm-executor = { path = "../../../../../polkadot/xcm/xcm-executor", default-features = false}
+xcm = { package = "staging-xcm", path = "../../../../../polkadot/xcm", default-features = false}
+xcm-builder = { package = "staging-xcm-builder", path = "../../../../../polkadot/xcm/xcm-builder", default-features = false}
+xcm-executor = { package = "staging-xcm-executor", path = "../../../../../polkadot/xcm/xcm-executor", default-features = false}
 
 # Cumulus
 cumulus-pallet-aura-ext = { path = "../../../../pallets/aura-ext", default-features = false }
@@ -92,6 +93,7 @@ runtime-benchmarks = [
 	"cumulus-pallet-parachain-system/runtime-benchmarks",
 	"cumulus-pallet-session-benchmarking/runtime-benchmarks",
 	"cumulus-pallet-xcmp-queue/runtime-benchmarks",
+	"cumulus-primitives-utility/runtime-benchmarks",
 	"frame-benchmarking/runtime-benchmarks",
 	"frame-support/runtime-benchmarks",
 	"frame-system-benchmarking/runtime-benchmarks",
@@ -110,8 +112,12 @@ runtime-benchmarks = [
 	"pallet-utility/runtime-benchmarks",
 	"pallet-xcm-benchmarks/runtime-benchmarks",
 	"pallet-xcm/runtime-benchmarks",
+	"parachains-common/runtime-benchmarks",
+	"polkadot-parachain-primitives/runtime-benchmarks",
+	"polkadot-runtime-common/runtime-benchmarks",
 	"sp-runtime/runtime-benchmarks",
 	"xcm-builder/runtime-benchmarks",
+	"xcm-executor/runtime-benchmarks",
 ]
 try-runtime = [
 	"cumulus-pallet-aura-ext/try-runtime",
@@ -120,6 +126,7 @@ try-runtime = [
 	"cumulus-pallet-xcm/try-runtime",
 	"cumulus-pallet-xcmp-queue/try-runtime",
 	"frame-executive/try-runtime",
+	"frame-support/try-runtime",
 	"frame-system/try-runtime",
 	"frame-try-runtime/try-runtime",
 	"pallet-asset-conversion-tx-payment/try-runtime",
@@ -140,6 +147,8 @@ try-runtime = [
 	"pallet-utility/try-runtime",
 	"pallet-xcm/try-runtime",
 	"parachain-info/try-runtime",
+	"polkadot-runtime-common/try-runtime",
+	"sp-runtime/try-runtime",
 ]
 std = [
 	"assets-common/std",
@@ -147,14 +156,18 @@ std = [
 	"cumulus-pallet-aura-ext/std",
 	"cumulus-pallet-dmp-queue/std",
 	"cumulus-pallet-parachain-system/std",
+	"cumulus-pallet-session-benchmarking/std",
 	"cumulus-pallet-xcm/std",
 	"cumulus-pallet-xcmp-queue/std",
 	"cumulus-primitives-core/std",
 	"cumulus-primitives-utility/std",
+	"frame-benchmarking?/std",
 	"frame-executive/std",
 	"frame-support/std",
+	"frame-system-benchmarking?/std",
 	"frame-system-rpc-runtime-api/std",
 	"frame-system/std",
+	"frame-try-runtime?/std",
 	"log/std",
 	"pallet-asset-conversion-tx-payment/std",
 	"pallet-asset-conversion/std",
@@ -174,22 +187,25 @@ std = [
 	"pallet-transaction-payment/std",
 	"pallet-uniques/std",
 	"pallet-utility/std",
+	"pallet-xcm-benchmarks?/std",
 	"pallet-xcm/std",
 	"parachain-info/std",
 	"parachains-common/std",
 	"polkadot-core-primitives/std",
-	"polkadot-parachain/std",
+	"polkadot-parachain-primitives/std",
 	"polkadot-runtime-common/std",
 	"scale-info/std",
 	"sp-api/std",
 	"sp-block-builder/std",
 	"sp-consensus-aura/std",
 	"sp-core/std",
+	"sp-genesis-builder/std",
 	"sp-inherents/std",
 	"sp-offchain/std",
 	"sp-runtime/std",
 	"sp-session/std",
 	"sp-std/std",
+	"sp-storage/std",
 	"sp-transaction-pool/std",
 	"sp-version/std",
 	"substrate-wasm-builder",
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 48f2bfa45d80637632f02e151c143333bd9fd749..943332087627c56765d1ee4199c9a9ffd7d03854 100644
--- a/cumulus/parachains/runtimes/assets/asset-hub-westend/src/lib.rs
+++ b/cumulus/parachains/runtimes/assets/asset-hub-westend/src/lib.rs
@@ -1,4 +1,4 @@
-// Copyright (C) 2021-2022 Parity Technologies (UK) Ltd.
+// Copyright (C) Parity Technologies (UK) Ltd.
 // SPDX-License-Identifier: Apache-2.0
 
 // Licensed under the Apache License, Version 2.0 (the "License");
@@ -24,7 +24,6 @@
 #[cfg(feature = "std")]
 include!(concat!(env!("OUT_DIR"), "/wasm_binary.rs"));
 
-pub mod constants;
 mod weights;
 pub mod xcm_config;
 
@@ -36,11 +35,11 @@ use assets_common::{
 	AssetIdForTrustBackedAssetsConvert,
 };
 use codec::{Decode, Encode, MaxEncodedLen};
-use constants::{consensus::*, currency::*, fee::WeightToFee};
 use cumulus_pallet_parachain_system::RelayNumberStrictlyIncreases;
 use frame_support::{
 	construct_runtime,
 	dispatch::DispatchClass,
+	genesis_builder_helper::{build_config, create_default_config},
 	ord_parameter_types, parameter_types,
 	traits::{
 		tokens::nonfungibles_v2::Inspect, AsEnsureOriginWithArg, ConstBool, ConstU128, ConstU32,
@@ -57,8 +56,10 @@ use pallet_asset_conversion_tx_payment::AssetConversionAdapter;
 use pallet_nfts::PalletFeatures;
 pub use parachains_common as common;
 use parachains_common::{
-	impls::DealWithFees, AccountId, AssetIdForTrustBackedAssets, AuraId, Balance, BlockNumber,
-	Hash, Header, Nonce, Signature, AVERAGE_ON_INITIALIZE_RATIO, DAYS, HOURS, MAXIMUM_BLOCK_WEIGHT,
+	impls::DealWithFees,
+	westend::{consensus::*, currency::*, fee::WeightToFee},
+	AccountId, AssetIdForTrustBackedAssets, AuraId, Balance, BlockNumber, Hash, Header, Nonce,
+	Signature, AVERAGE_ON_INITIALIZE_RATIO, DAYS, HOURS, MAXIMUM_BLOCK_WEIGHT,
 	NORMAL_DISPATCH_RATIO, SLOT_DURATION,
 };
 use sp_api::impl_runtime_apis;
@@ -856,8 +857,46 @@ pub type Migrations = (
 	pallet_collator_selection::migration::v1::MigrateToV1<Runtime>,
 	// unreleased
 	migrations::NativeAssetParents0ToParents1Migration<Runtime>,
+	// unreleased
+	pallet_multisig::migrations::v1::MigrateToV1<Runtime>,
+	// unreleased
+	InitStorageVersions,
 );
 
+/// Migration to initialize storage versions for pallets added after genesis.
+///
+/// Ideally this would be done automatically (see
+/// <https://github.com/paritytech/polkadot-sdk/pull/1297>), but it probably won't be ready for some
+/// time and it's beneficial to get try-runtime-cli on-runtime-upgrade checks into the CI, so we're
+/// doing it manually.
+pub struct InitStorageVersions;
+
+impl frame_support::traits::OnRuntimeUpgrade for InitStorageVersions {
+	fn on_runtime_upgrade() -> Weight {
+		use frame_support::traits::{GetStorageVersion, StorageVersion};
+		use sp_runtime::traits::Saturating;
+
+		let mut writes = 0;
+
+		if PolkadotXcm::on_chain_storage_version() == StorageVersion::new(0) {
+			PolkadotXcm::current_storage_version().put::<PolkadotXcm>();
+			writes.saturating_inc();
+		}
+
+		if ForeignAssets::on_chain_storage_version() == StorageVersion::new(0) {
+			ForeignAssets::current_storage_version().put::<ForeignAssets>();
+			writes.saturating_inc();
+		}
+
+		if PoolAssets::on_chain_storage_version() == StorageVersion::new(0) {
+			PoolAssets::current_storage_version().put::<PoolAssets>();
+			writes.saturating_inc();
+		}
+
+		<Runtime as frame_system::Config>::DbWeight::get().reads_writes(3, writes)
+	}
+}
+
 /// Executive: handles dispatch to the various modules.
 pub type Executive = frame_executive::Executive<
 	Runtime,
@@ -1353,6 +1392,16 @@ impl_runtime_apis! {
 			Ok(batches)
 		}
 	}
+
+	impl sp_genesis_builder::GenesisBuilder<Block> for Runtime {
+		fn create_default_config() -> Vec<u8> {
+			create_default_config::<RuntimeGenesisConfig>()
+		}
+
+		fn build_config(config: Vec<u8>) -> sp_genesis_builder::Result {
+			build_config::<RuntimeGenesisConfig>(config)
+		}
+	}
 }
 
 cumulus_pallet_parachain_system::register_validate_block! {
diff --git a/cumulus/parachains/runtimes/assets/asset-hub-westend/src/weights/block_weights.rs b/cumulus/parachains/runtimes/assets/asset-hub-westend/src/weights/block_weights.rs
index b2092d875c8328210667da4cbb95de0642e60ae3..e7fdb2aae2a01ec06076de83d94817e540e205dd 100644
--- a/cumulus/parachains/runtimes/assets/asset-hub-westend/src/weights/block_weights.rs
+++ b/cumulus/parachains/runtimes/assets/asset-hub-westend/src/weights/block_weights.rs
@@ -1,6 +1,6 @@
 // This file is part of Substrate.
 
-// Copyright (C) 2022 Parity Technologies (UK) Ltd.
+// Copyright (C) Parity Technologies (UK) Ltd.
 // SPDX-License-Identifier: Apache-2.0
 
 // Licensed under the Apache License, Version 2.0 (the "License");
diff --git a/cumulus/parachains/runtimes/assets/asset-hub-westend/src/weights/cumulus_pallet_xcmp_queue.rs b/cumulus/parachains/runtimes/assets/asset-hub-westend/src/weights/cumulus_pallet_xcmp_queue.rs
index 55ddfea38d1512e8853f73c6f5c544811bdebd04..cda66f6ea7eee25ece39733cf266dbf16c5c0338 100644
--- a/cumulus/parachains/runtimes/assets/asset-hub-westend/src/weights/cumulus_pallet_xcmp_queue.rs
+++ b/cumulus/parachains/runtimes/assets/asset-hub-westend/src/weights/cumulus_pallet_xcmp_queue.rs
@@ -1,4 +1,4 @@
-// Copyright Parity Technologies (UK) Ltd.
+// Copyright (C) Parity Technologies (UK) Ltd.
 // This file is part of Cumulus.
 
 // Cumulus is free software: you can redistribute it and/or modify
diff --git a/cumulus/parachains/runtimes/assets/asset-hub-westend/src/weights/extrinsic_weights.rs b/cumulus/parachains/runtimes/assets/asset-hub-westend/src/weights/extrinsic_weights.rs
index 332c3b324bb9c1b386257bf7953d37aba8f5af13..1a4adb968bb7195428ea00d59cd92dcd3b6eea5f 100644
--- a/cumulus/parachains/runtimes/assets/asset-hub-westend/src/weights/extrinsic_weights.rs
+++ b/cumulus/parachains/runtimes/assets/asset-hub-westend/src/weights/extrinsic_weights.rs
@@ -1,6 +1,6 @@
 // This file is part of Substrate.
 
-// Copyright (C) 2022 Parity Technologies (UK) Ltd.
+// Copyright (C) Parity Technologies (UK) Ltd.
 // SPDX-License-Identifier: Apache-2.0
 
 // Licensed under the Apache License, Version 2.0 (the "License");
diff --git a/cumulus/parachains/runtimes/assets/asset-hub-westend/src/weights/frame_system.rs b/cumulus/parachains/runtimes/assets/asset-hub-westend/src/weights/frame_system.rs
index 9ec9befa97c94d9aff38844b0ee0961295db6ea2..c70ea9d58b2649c5f6fbf53cf620757c4aa19f1b 100644
--- a/cumulus/parachains/runtimes/assets/asset-hub-westend/src/weights/frame_system.rs
+++ b/cumulus/parachains/runtimes/assets/asset-hub-westend/src/weights/frame_system.rs
@@ -1,4 +1,4 @@
-// Copyright Parity Technologies (UK) Ltd.
+// Copyright (C) Parity Technologies (UK) Ltd.
 // This file is part of Cumulus.
 
 // Cumulus is free software: you can redistribute it and/or modify
diff --git a/cumulus/parachains/runtimes/assets/asset-hub-westend/src/weights/mod.rs b/cumulus/parachains/runtimes/assets/asset-hub-westend/src/weights/mod.rs
index 955d4690634e8cb7949afe63cefc5ae66e600d14..281c013b3372f57a24b57812de91e684ffabd0c9 100644
--- a/cumulus/parachains/runtimes/assets/asset-hub-westend/src/weights/mod.rs
+++ b/cumulus/parachains/runtimes/assets/asset-hub-westend/src/weights/mod.rs
@@ -1,3 +1,19 @@
+// 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/>.
+
 pub mod block_weights;
 pub mod cumulus_pallet_xcmp_queue;
 pub mod extrinsic_weights;
diff --git a/cumulus/parachains/runtimes/assets/asset-hub-westend/src/weights/pallet_asset_conversion.rs b/cumulus/parachains/runtimes/assets/asset-hub-westend/src/weights/pallet_asset_conversion.rs
index 1744fcbe3977868687b07ce4dabc85263fe010ad..2f39df65403043dad536ccb180c396108c73f487 100644
--- a/cumulus/parachains/runtimes/assets/asset-hub-westend/src/weights/pallet_asset_conversion.rs
+++ b/cumulus/parachains/runtimes/assets/asset-hub-westend/src/weights/pallet_asset_conversion.rs
@@ -1,4 +1,4 @@
-// Copyright Parity Technologies (UK) Ltd.
+// Copyright (C) Parity Technologies (UK) Ltd.
 // This file is part of Cumulus.
 
 // Cumulus is free software: you can redistribute it and/or modify
diff --git a/cumulus/parachains/runtimes/assets/asset-hub-westend/src/weights/pallet_assets_foreign.rs b/cumulus/parachains/runtimes/assets/asset-hub-westend/src/weights/pallet_assets_foreign.rs
index 5deffe235cc263cd2dbab3cf412e2d5b65541d11..5be1319b10dfb221230a66429c578248fc30a9d0 100644
--- a/cumulus/parachains/runtimes/assets/asset-hub-westend/src/weights/pallet_assets_foreign.rs
+++ b/cumulus/parachains/runtimes/assets/asset-hub-westend/src/weights/pallet_assets_foreign.rs
@@ -1,4 +1,4 @@
-// Copyright Parity Technologies (UK) Ltd.
+// Copyright (C) Parity Technologies (UK) Ltd.
 // This file is part of Cumulus.
 
 // Cumulus is free software: you can redistribute it and/or modify
diff --git a/cumulus/parachains/runtimes/assets/asset-hub-westend/src/weights/pallet_assets_local.rs b/cumulus/parachains/runtimes/assets/asset-hub-westend/src/weights/pallet_assets_local.rs
index 15f4fdecbd2f21b84d60a7399848d8b27ebc94b3..aa09be829c85c6e19d252ad03dd584e34024abc4 100644
--- a/cumulus/parachains/runtimes/assets/asset-hub-westend/src/weights/pallet_assets_local.rs
+++ b/cumulus/parachains/runtimes/assets/asset-hub-westend/src/weights/pallet_assets_local.rs
@@ -1,4 +1,4 @@
-// Copyright Parity Technologies (UK) Ltd.
+// Copyright (C) Parity Technologies (UK) Ltd.
 // This file is part of Cumulus.
 
 // Cumulus is free software: you can redistribute it and/or modify
diff --git a/cumulus/parachains/runtimes/assets/asset-hub-westend/src/weights/pallet_assets_pool.rs b/cumulus/parachains/runtimes/assets/asset-hub-westend/src/weights/pallet_assets_pool.rs
index 6101141e3ae1e73ed8034f7ab02599d57f2bd9d6..bfe73e1cfafa5dda9690f4b57f07e08c6ea3b740 100644
--- a/cumulus/parachains/runtimes/assets/asset-hub-westend/src/weights/pallet_assets_pool.rs
+++ b/cumulus/parachains/runtimes/assets/asset-hub-westend/src/weights/pallet_assets_pool.rs
@@ -1,4 +1,4 @@
-// Copyright Parity Technologies (UK) Ltd.
+// Copyright (C) Parity Technologies (UK) Ltd.
 // This file is part of Cumulus.
 
 // Cumulus is free software: you can redistribute it and/or modify
diff --git a/cumulus/parachains/runtimes/assets/asset-hub-westend/src/weights/pallet_balances.rs b/cumulus/parachains/runtimes/assets/asset-hub-westend/src/weights/pallet_balances.rs
index db6dd8fef51fd649657a6de9450e2c0823c565b1..f6bf09d63bae20a899301bda372a48ad389c935c 100644
--- a/cumulus/parachains/runtimes/assets/asset-hub-westend/src/weights/pallet_balances.rs
+++ b/cumulus/parachains/runtimes/assets/asset-hub-westend/src/weights/pallet_balances.rs
@@ -1,4 +1,4 @@
-// Copyright Parity Technologies (UK) Ltd.
+// Copyright (C) Parity Technologies (UK) Ltd.
 // This file is part of Cumulus.
 
 // Cumulus is free software: you can redistribute it and/or modify
diff --git a/cumulus/parachains/runtimes/assets/asset-hub-westend/src/weights/pallet_collator_selection.rs b/cumulus/parachains/runtimes/assets/asset-hub-westend/src/weights/pallet_collator_selection.rs
index 80da7446bcd6f490ccfb5cfd827a1d4d339bc740..2473c58e45818145674d62c31f6c6a07b6f6794f 100644
--- a/cumulus/parachains/runtimes/assets/asset-hub-westend/src/weights/pallet_collator_selection.rs
+++ b/cumulus/parachains/runtimes/assets/asset-hub-westend/src/weights/pallet_collator_selection.rs
@@ -1,4 +1,4 @@
-// Copyright Parity Technologies (UK) Ltd.
+// Copyright (C) Parity Technologies (UK) Ltd.
 // This file is part of Cumulus.
 
 // Cumulus is free software: you can redistribute it and/or modify
diff --git a/cumulus/parachains/runtimes/assets/asset-hub-westend/src/weights/pallet_multisig.rs b/cumulus/parachains/runtimes/assets/asset-hub-westend/src/weights/pallet_multisig.rs
index 230539e94df79b21b36163ed5b107c4624f5e6ff..107d78c98f978f6500f721193fc81ec009204b98 100644
--- a/cumulus/parachains/runtimes/assets/asset-hub-westend/src/weights/pallet_multisig.rs
+++ b/cumulus/parachains/runtimes/assets/asset-hub-westend/src/weights/pallet_multisig.rs
@@ -1,4 +1,4 @@
-// Copyright Parity Technologies (UK) Ltd.
+// Copyright (C) Parity Technologies (UK) Ltd.
 // This file is part of Cumulus.
 
 // Cumulus is free software: you can redistribute it and/or modify
diff --git a/cumulus/parachains/runtimes/assets/asset-hub-westend/src/weights/pallet_nft_fractionalization.rs b/cumulus/parachains/runtimes/assets/asset-hub-westend/src/weights/pallet_nft_fractionalization.rs
index 38387a1df0631a123a63cfc655bc4f37cfd1bf1d..e155e1bada3abc8f959404b112d7d393c40c0a61 100644
--- a/cumulus/parachains/runtimes/assets/asset-hub-westend/src/weights/pallet_nft_fractionalization.rs
+++ b/cumulus/parachains/runtimes/assets/asset-hub-westend/src/weights/pallet_nft_fractionalization.rs
@@ -1,4 +1,4 @@
-// Copyright Parity Technologies (UK) Ltd.
+// Copyright (C) Parity Technologies (UK) Ltd.
 // This file is part of Cumulus.
 
 // Cumulus is free software: you can redistribute it and/or modify
diff --git a/cumulus/parachains/runtimes/assets/asset-hub-westend/src/weights/pallet_nfts.rs b/cumulus/parachains/runtimes/assets/asset-hub-westend/src/weights/pallet_nfts.rs
index 5c0a53e9333ae469b8d4a9806c9a8cd9fdc9adcf..687dfa07f75148de35519507e1721f61dcf7cee8 100644
--- a/cumulus/parachains/runtimes/assets/asset-hub-westend/src/weights/pallet_nfts.rs
+++ b/cumulus/parachains/runtimes/assets/asset-hub-westend/src/weights/pallet_nfts.rs
@@ -1,4 +1,4 @@
-// Copyright Parity Technologies (UK) Ltd.
+// Copyright (C) Parity Technologies (UK) Ltd.
 // This file is part of Cumulus.
 
 // Cumulus is free software: you can redistribute it and/or modify
diff --git a/cumulus/parachains/runtimes/assets/asset-hub-westend/src/weights/pallet_proxy.rs b/cumulus/parachains/runtimes/assets/asset-hub-westend/src/weights/pallet_proxy.rs
index 076d79ff6275e0c351d4cf9d7d19c10aa8957915..657bd2764cf2d88bdb22d322fc7a67f881c9f3be 100644
--- a/cumulus/parachains/runtimes/assets/asset-hub-westend/src/weights/pallet_proxy.rs
+++ b/cumulus/parachains/runtimes/assets/asset-hub-westend/src/weights/pallet_proxy.rs
@@ -1,4 +1,4 @@
-// Copyright Parity Technologies (UK) Ltd.
+// Copyright (C) Parity Technologies (UK) Ltd.
 // This file is part of Cumulus.
 
 // Cumulus is free software: you can redistribute it and/or modify
diff --git a/cumulus/parachains/runtimes/assets/asset-hub-westend/src/weights/pallet_session.rs b/cumulus/parachains/runtimes/assets/asset-hub-westend/src/weights/pallet_session.rs
index 8b8e5500d10f87879c95d78b0e5b1dee84bd6c81..926021917441904d3553f996e3fe9074ba1fe97a 100644
--- a/cumulus/parachains/runtimes/assets/asset-hub-westend/src/weights/pallet_session.rs
+++ b/cumulus/parachains/runtimes/assets/asset-hub-westend/src/weights/pallet_session.rs
@@ -1,4 +1,4 @@
-// Copyright Parity Technologies (UK) Ltd.
+// Copyright (C) Parity Technologies (UK) Ltd.
 // This file is part of Cumulus.
 
 // Cumulus is free software: you can redistribute it and/or modify
diff --git a/cumulus/parachains/runtimes/assets/asset-hub-westend/src/weights/pallet_timestamp.rs b/cumulus/parachains/runtimes/assets/asset-hub-westend/src/weights/pallet_timestamp.rs
index 40c5f3536097d04ceb13c1b7232129903bd5e5e6..13f18861d37e8d715e0fb19d71bd60af8dcb8321 100644
--- a/cumulus/parachains/runtimes/assets/asset-hub-westend/src/weights/pallet_timestamp.rs
+++ b/cumulus/parachains/runtimes/assets/asset-hub-westend/src/weights/pallet_timestamp.rs
@@ -1,4 +1,4 @@
-// Copyright Parity Technologies (UK) Ltd.
+// Copyright (C) Parity Technologies (UK) Ltd.
 // This file is part of Cumulus.
 
 // Cumulus is free software: you can redistribute it and/or modify
diff --git a/cumulus/parachains/runtimes/assets/asset-hub-westend/src/weights/pallet_uniques.rs b/cumulus/parachains/runtimes/assets/asset-hub-westend/src/weights/pallet_uniques.rs
index 813d472709d26d069ce73067fca666a8c8f82bf3..53bead08f5d4cd9ed4388555a58eca1ae183a2ab 100644
--- a/cumulus/parachains/runtimes/assets/asset-hub-westend/src/weights/pallet_uniques.rs
+++ b/cumulus/parachains/runtimes/assets/asset-hub-westend/src/weights/pallet_uniques.rs
@@ -1,4 +1,4 @@
-// Copyright Parity Technologies (UK) Ltd.
+// Copyright (C) Parity Technologies (UK) Ltd.
 // This file is part of Cumulus.
 
 // Cumulus is free software: you can redistribute it and/or modify
diff --git a/cumulus/parachains/runtimes/assets/asset-hub-westend/src/weights/pallet_utility.rs b/cumulus/parachains/runtimes/assets/asset-hub-westend/src/weights/pallet_utility.rs
index ca0ead95b15b73181c19850ada621d66b998cd74..7db443ebbf19967d00676518a53909130ae77a86 100644
--- a/cumulus/parachains/runtimes/assets/asset-hub-westend/src/weights/pallet_utility.rs
+++ b/cumulus/parachains/runtimes/assets/asset-hub-westend/src/weights/pallet_utility.rs
@@ -1,4 +1,4 @@
-// Copyright Parity Technologies (UK) Ltd.
+// Copyright (C) Parity Technologies (UK) Ltd.
 // This file is part of Cumulus.
 
 // Cumulus is free software: you can redistribute it and/or modify
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 0256b49be3fe1c25eb011f23d53d9f9b7c0c9c84..1cc4c2d0e24cf205e5ad33bf40e93dd22f864d80 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
@@ -1,4 +1,4 @@
-// Copyright Parity Technologies (UK) Ltd.
+// Copyright (C) Parity Technologies (UK) Ltd.
 // This file is part of Cumulus.
 
 // Cumulus is free software: you can redistribute it and/or modify
diff --git a/cumulus/parachains/runtimes/assets/asset-hub-westend/src/weights/paritydb_weights.rs b/cumulus/parachains/runtimes/assets/asset-hub-westend/src/weights/paritydb_weights.rs
index 4338d928d807a41cc60ec91d86e91c81bb253631..25679703831a13b8d1bb7fb7dd4d92fa84b1f255 100644
--- a/cumulus/parachains/runtimes/assets/asset-hub-westend/src/weights/paritydb_weights.rs
+++ b/cumulus/parachains/runtimes/assets/asset-hub-westend/src/weights/paritydb_weights.rs
@@ -1,6 +1,6 @@
 // This file is part of Substrate.
 
-// Copyright (C) 2022 Parity Technologies (UK) Ltd.
+// Copyright (C) Parity Technologies (UK) Ltd.
 // SPDX-License-Identifier: Apache-2.0
 
 // Licensed under the Apache License, Version 2.0 (the "License");
diff --git a/cumulus/parachains/runtimes/assets/asset-hub-westend/src/weights/rocksdb_weights.rs b/cumulus/parachains/runtimes/assets/asset-hub-westend/src/weights/rocksdb_weights.rs
index 1d115d963facb39fe29d6258918fda3bc8d94900..3dd817aa6f137085b0e5fdf2b11b7f50e5c8b002 100644
--- a/cumulus/parachains/runtimes/assets/asset-hub-westend/src/weights/rocksdb_weights.rs
+++ b/cumulus/parachains/runtimes/assets/asset-hub-westend/src/weights/rocksdb_weights.rs
@@ -1,6 +1,6 @@
 // This file is part of Substrate.
 
-// Copyright (C) 2022 Parity Technologies (UK) Ltd.
+// Copyright (C) Parity Technologies (UK) Ltd.
 // SPDX-License-Identifier: Apache-2.0
 
 // Licensed under the Apache License, Version 2.0 (the "License");
diff --git a/cumulus/parachains/runtimes/assets/asset-hub-westend/src/weights/xcm/mod.rs b/cumulus/parachains/runtimes/assets/asset-hub-westend/src/weights/xcm/mod.rs
index 763cb6c10f13560b9504b5c6843cea6d9c64194d..3e47cf077a292c21e94404a5b11ec4203ed8ee81 100644
--- a/cumulus/parachains/runtimes/assets/asset-hub-westend/src/weights/xcm/mod.rs
+++ b/cumulus/parachains/runtimes/assets/asset-hub-westend/src/weights/xcm/mod.rs
@@ -1,4 +1,4 @@
-// Copyright 2022 Parity Technologies (UK) Ltd.
+// Copyright (C) Parity Technologies (UK) Ltd.
 // This file is part of Cumulus.
 
 // Cumulus is free software: you can redistribute it and/or modify
@@ -61,16 +61,8 @@ impl<Call> XcmWeightInfo<Call> for AssetHubWestendXcmWeight<Call> {
 	fn withdraw_asset(assets: &MultiAssets) -> Weight {
 		assets.weigh_multi_assets(XcmFungibleWeight::<Runtime>::withdraw_asset())
 	}
-	// Currently there is no trusted reserve (`IsReserve = ()`),
-	// but we need this hack for `pallet_xcm::reserve_transfer_assets`
-	// (TODO) fix https://github.com/paritytech/polkadot/pull/7424
-	// (TODO) fix https://github.com/paritytech/polkadot/pull/7546
-	fn reserve_asset_deposited(_assets: &MultiAssets) -> Weight {
-		// TODO: if we change `IsReserve = ...` then use this line...
-		// TODO: or if remote weight estimation is fixed, then remove
-		// TODO: hardcoded - fix https://github.com/paritytech/cumulus/issues/1974
-		let hardcoded_weight = Weight::from_parts(1_000_000_000_u64, 0);
-		hardcoded_weight.min(XcmFungibleWeight::<Runtime>::reserve_asset_deposited())
+	fn reserve_asset_deposited(assets: &MultiAssets) -> Weight {
+		assets.weigh_multi_assets(XcmFungibleWeight::<Runtime>::reserve_asset_deposited())
 	}
 	fn receive_teleported_asset(assets: &MultiAssets) -> Weight {
 		assets.weigh_multi_assets(XcmFungibleWeight::<Runtime>::receive_teleported_asset())
@@ -127,10 +119,7 @@ impl<Call> XcmWeightInfo<Call> for AssetHubWestendXcmWeight<Call> {
 	}
 
 	fn deposit_asset(assets: &MultiAssetFilter, _dest: &MultiLocation) -> Weight {
-		// Hardcoded till the XCM pallet is fixed
-		let hardcoded_weight = Weight::from_parts(1_000_000_000_u64, 0);
-		let weight = assets.weigh_multi_assets(XcmFungibleWeight::<Runtime>::deposit_asset());
-		hardcoded_weight.min(weight)
+		assets.weigh_multi_assets(XcmFungibleWeight::<Runtime>::deposit_asset())
 	}
 	fn deposit_reserve_asset(
 		assets: &MultiAssetFilter,
diff --git a/cumulus/parachains/runtimes/assets/asset-hub-westend/src/weights/xcm/pallet_xcm_benchmarks_fungible.rs b/cumulus/parachains/runtimes/assets/asset-hub-westend/src/weights/xcm/pallet_xcm_benchmarks_fungible.rs
index ee435559f46ffbeaefbb8517ad2a51124be11fe2..f482064e84e9c5b918882ed47ae1afd471f3422c 100644
--- a/cumulus/parachains/runtimes/assets/asset-hub-westend/src/weights/xcm/pallet_xcm_benchmarks_fungible.rs
+++ b/cumulus/parachains/runtimes/assets/asset-hub-westend/src/weights/xcm/pallet_xcm_benchmarks_fungible.rs
@@ -1,4 +1,4 @@
-// Copyright Parity Technologies (UK) Ltd.
+// Copyright (C) Parity Technologies (UK) Ltd.
 // This file is part of Cumulus.
 
 // Cumulus is free software: you can redistribute it and/or modify
@@ -17,28 +17,26 @@
 //! Autogenerated weights for `pallet_xcm_benchmarks::fungible`
 //!
 //! THIS FILE WAS AUTO-GENERATED USING THE SUBSTRATE BENCHMARK CLI VERSION 4.0.0-dev
-//! DATE: 2023-07-31, STEPS: `50`, REPEAT: `20`, LOW RANGE: `[]`, HIGH RANGE: `[]`
+//! DATE: 2023-09-28, STEPS: `50`, REPEAT: `20`, LOW RANGE: `[]`, HIGH RANGE: `[]`
 //! WORST CASE MAP SIZE: `1000000`
-//! HOSTNAME: `runner-ynta1nyy-project-238-concurrent-0`, CPU: `Intel(R) Xeon(R) CPU @ 2.60GHz`
-//! EXECUTION: , WASM-EXECUTION: Compiled, CHAIN: Some("asset-hub-westend-dev"), DB CACHE: 1024
+//! HOSTNAME: `runner-nbnwcyh-project-674-concurrent-0`, 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
+// target/production/polkadot-parachain
 // benchmark
 // pallet
-// --template=./templates/xcm-bench-template.hbs
-// --chain=asset-hub-westend-dev
-// --wasm-execution=compiled
-// --pallet=pallet_xcm_benchmarks::fungible
-// --no-storage-info
-// --no-median-slopes
-// --no-min-squares
-// --extrinsic=*
 // --steps=50
 // --repeat=20
-// --json
-// --header=./file_header.txt
-// --output=./parachains/runtimes/assets/asset-hub-westend/src/weights/xcm/pallet_xcm_benchmarks_fungible.rs
+// --extrinsic=*
+// --wasm-execution=compiled
+// --heap-pages=4096
+// --json-file=/builds/parity/mirrors/polkadot-sdk/.git/.artifacts/bench.json
+// --pallet=pallet_xcm_benchmarks::fungible
+// --chain=asset-hub-westend-dev
+// --header=./cumulus/file_header.txt
+// --template=./cumulus/templates/xcm-bench-template.hbs
+// --output=./cumulus/parachains/runtimes/assets/asset-hub-westend/src/weights/xcm/
 
 #![cfg_attr(rustfmt, rustfmt_skip)]
 #![allow(unused_parens)]
@@ -56,8 +54,8 @@ impl<T: frame_system::Config> WeightInfo<T> {
 		// Proof Size summary in bytes:
 		//  Measured:  `101`
 		//  Estimated: `3593`
-		// Minimum execution time: 25_411_000 picoseconds.
-		Weight::from_parts(25_663_000, 3593)
+		// Minimum execution time: 25_407_000 picoseconds.
+		Weight::from_parts(25_949_000, 3593)
 			.saturating_add(T::DbWeight::get().reads(1))
 			.saturating_add(T::DbWeight::get().writes(1))
 	}
@@ -67,8 +65,8 @@ impl<T: frame_system::Config> WeightInfo<T> {
 		// Proof Size summary in bytes:
 		//  Measured:  `101`
 		//  Estimated: `6196`
-		// Minimum execution time: 49_478_000 picoseconds.
-		Weight::from_parts(50_417_000, 6196)
+		// Minimum execution time: 51_335_000 picoseconds.
+		Weight::from_parts(52_090_000, 6196)
 			.saturating_add(T::DbWeight::get().reads(2))
 			.saturating_add(T::DbWeight::get().writes(2))
 	}
@@ -90,8 +88,8 @@ impl<T: frame_system::Config> WeightInfo<T> {
 		// Proof Size summary in bytes:
 		//  Measured:  `246`
 		//  Estimated: `6196`
-		// Minimum execution time: 72_958_000 picoseconds.
-		Weight::from_parts(74_503_000, 6196)
+		// Minimum execution time: 74_312_000 picoseconds.
+		Weight::from_parts(76_725_000, 6196)
 			.saturating_add(T::DbWeight::get().reads(8))
 			.saturating_add(T::DbWeight::get().writes(4))
 	}
@@ -101,8 +99,8 @@ impl<T: frame_system::Config> WeightInfo<T> {
 		// Proof Size summary in bytes:
 		//  Measured:  `0`
 		//  Estimated: `0`
-		// Minimum execution time: 500_000_000_000 picoseconds.
-		Weight::from_parts(500_000_000_000, 0)
+		// Minimum execution time: 18_446_744_073_709_551_000 picoseconds.
+		Weight::from_parts(18_446_744_073_709_551_000, 0)
 	}
 	// Storage: `ParachainInfo::ParachainId` (r:1 w:0)
 	// Proof: `ParachainInfo::ParachainId` (`max_values`: Some(1), `max_size`: Some(4), added: 499, mode: `MaxEncodedLen`)
@@ -120,8 +118,8 @@ impl<T: frame_system::Config> WeightInfo<T> {
 		// Proof Size summary in bytes:
 		//  Measured:  `145`
 		//  Estimated: `3610`
-		// Minimum execution time: 456_993_000 picoseconds.
-		Weight::from_parts(469_393_000, 3610)
+		// Minimum execution time: 446_848_000 picoseconds.
+		Weight::from_parts(466_251_000, 3610)
 			.saturating_add(T::DbWeight::get().reads(6))
 			.saturating_add(T::DbWeight::get().writes(2))
 	}
@@ -129,8 +127,8 @@ impl<T: frame_system::Config> WeightInfo<T> {
 		// Proof Size summary in bytes:
 		//  Measured:  `0`
 		//  Estimated: `0`
-		// Minimum execution time: 3_580_000 picoseconds.
-		Weight::from_parts(3_717_000, 0)
+		// Minimum execution time: 3_602_000 picoseconds.
+		Weight::from_parts(3_844_000, 0)
 	}
 	// Storage: `System::Account` (r:1 w:1)
 	// Proof: `System::Account` (`max_values`: None, `max_size`: Some(128), added: 2603, mode: `MaxEncodedLen`)
@@ -138,8 +136,8 @@ impl<T: frame_system::Config> WeightInfo<T> {
 		// Proof Size summary in bytes:
 		//  Measured:  `0`
 		//  Estimated: `3593`
-		// Minimum execution time: 25_087_000 picoseconds.
-		Weight::from_parts(25_788_000, 3593)
+		// Minimum execution time: 25_480_000 picoseconds.
+		Weight::from_parts(26_142_000, 3593)
 			.saturating_add(T::DbWeight::get().reads(1))
 			.saturating_add(T::DbWeight::get().writes(1))
 	}
@@ -161,8 +159,8 @@ impl<T: frame_system::Config> WeightInfo<T> {
 		// Proof Size summary in bytes:
 		//  Measured:  `145`
 		//  Estimated: `3610`
-		// Minimum execution time: 50_824_000 picoseconds.
-		Weight::from_parts(52_309_000, 3610)
+		// Minimum execution time: 51_540_000 picoseconds.
+		Weight::from_parts(53_744_000, 3610)
 			.saturating_add(T::DbWeight::get().reads(7))
 			.saturating_add(T::DbWeight::get().writes(3))
 	}
@@ -182,8 +180,8 @@ impl<T: frame_system::Config> WeightInfo<T> {
 		// Proof Size summary in bytes:
 		//  Measured:  `145`
 		//  Estimated: `3610`
-		// Minimum execution time: 31_854_000 picoseconds.
-		Weight::from_parts(32_553_000, 3610)
+		// Minimum execution time: 32_279_000 picoseconds.
+		Weight::from_parts(33_176_000, 3610)
 			.saturating_add(T::DbWeight::get().reads(6))
 			.saturating_add(T::DbWeight::get().writes(2))
 	}
diff --git a/cumulus/parachains/runtimes/assets/asset-hub-westend/src/weights/xcm/pallet_xcm_benchmarks_generic.rs b/cumulus/parachains/runtimes/assets/asset-hub-westend/src/weights/xcm/pallet_xcm_benchmarks_generic.rs
index a1d06914aa64672227bed6b2fba6007652478dcd..e776529eb7f8e0cfdc70dcc76200e1ec21de7aeb 100644
--- a/cumulus/parachains/runtimes/assets/asset-hub-westend/src/weights/xcm/pallet_xcm_benchmarks_generic.rs
+++ b/cumulus/parachains/runtimes/assets/asset-hub-westend/src/weights/xcm/pallet_xcm_benchmarks_generic.rs
@@ -1,4 +1,4 @@
-// Copyright Parity Technologies (UK) Ltd.
+// Copyright (C) Parity Technologies (UK) Ltd.
 // This file is part of Cumulus.
 
 // Cumulus is free software: you can redistribute it and/or modify
diff --git a/cumulus/parachains/runtimes/assets/asset-hub-westend/src/xcm_config.rs b/cumulus/parachains/runtimes/assets/asset-hub-westend/src/xcm_config.rs
index e0af76d6d00214fb9dba07d8fd3c7a00976422f8..b1ec6be5b7e52ff81ade844aba3b74ca51e10a25 100644
--- a/cumulus/parachains/runtimes/assets/asset-hub-westend/src/xcm_config.rs
+++ b/cumulus/parachains/runtimes/assets/asset-hub-westend/src/xcm_config.rs
@@ -1,4 +1,4 @@
-// Copyright (C) 2022 Parity Technologies (UK) Ltd.
+// Copyright (C) Parity Technologies (UK) Ltd.
 // SPDX-License-Identifier: Apache-2.0
 
 // Licensed under the Apache License, Version 2.0 (the "License");
@@ -31,18 +31,22 @@ use frame_support::{
 };
 use frame_system::EnsureRoot;
 use pallet_xcm::XcmPassthrough;
-use parachains_common::{impls::ToStakingPot, xcm_config::AssetFeeAsExistentialDepositMultiplier};
-use polkadot_parachain::primitives::Sibling;
+use parachains_common::{
+	impls::ToStakingPot,
+	xcm_config::{AssetFeeAsExistentialDepositMultiplier, ConcreteAssetFromSystem},
+};
+use polkadot_parachain_primitives::primitives::Sibling;
 use sp_runtime::traits::ConvertInto;
 use xcm::latest::prelude::*;
 use xcm_builder::{
 	AccountId32Aliases, AllowExplicitUnpaidExecutionFrom, AllowKnownQueryResponses,
 	AllowSubscriptionsFrom, AllowTopLevelPaidExecutionFrom, CurrencyAdapter,
-	DenyReserveTransferToRelayChain, DenyThenTry, EnsureXcmOrigin, FungiblesAdapter, IsConcrete,
-	LocalMint, NativeAsset, NoChecking, ParentAsSuperuser, ParentIsPreset, RelayChainAsNative,
-	SiblingParachainAsNative, SiblingParachainConvertsVia, SignedAccountId32AsNative,
-	SignedToAccountId32, SovereignSignedViaLocation, TakeWeightCredit, TrailingSetTopicAsId,
-	UsingComponents, WeightInfoBounds, WithComputedOrigin, WithUniqueTopic,
+	DenyReserveTransferToRelayChain, DenyThenTry, DescribeFamily, DescribePalletTerminal,
+	EnsureXcmOrigin, FungiblesAdapter, HashedDescription, IsConcrete, LocalMint, NoChecking,
+	ParentAsSuperuser, ParentIsPreset, RelayChainAsNative, SiblingParachainAsNative,
+	SiblingParachainConvertsVia, SignedAccountId32AsNative, SignedToAccountId32,
+	SovereignSignedViaLocation, TakeWeightCredit, TrailingSetTopicAsId, UsingComponents,
+	WeightInfoBounds, WithComputedOrigin, WithUniqueTopic,
 };
 use xcm_executor::{traits::WithOriginFilter, XcmExecutor};
 
@@ -75,6 +79,9 @@ pub type LocationToAccountId = (
 	SiblingParachainConvertsVia<Sibling, AccountId>,
 	// Straight up local `AccountId32` origins just alias directly to `AccountId`.
 	AccountId32Aliases<RelayNetwork, AccountId>,
+	// Foreign chain account alias into local accounts according to a hash of their standard
+	// description.
+	HashedDescription<AccountId, DescribeFamily<DescribePalletTerminal>>,
 );
 
 /// Means for transacting the native currency on this chain.
@@ -222,6 +229,9 @@ match_types! {
 		MultiLocation { parents: 1, interior: Here } |
 		MultiLocation { parents: 1, interior: X1(Plurality { .. }) }
 	};
+	pub type TreasuryPallet: impl Contains<MultiLocation> = {
+		MultiLocation { parents: 1, interior: X1(PalletInstance(37)) }
+	};
 }
 
 /// A call filter for the XCM Transact instruction. This is a temporary measure until we properly
@@ -449,8 +459,9 @@ pub type Barrier = TrailingSetTopicAsId<
 					// If the message is one that immediately attemps to pay for execution, then
 					// allow it.
 					AllowTopLevelPaidExecutionFrom<Everything>,
-					// Parent and its pluralities (i.e. governance bodies) get free execution.
-					AllowExplicitUnpaidExecutionFrom<ParentOrParentsPlurality>,
+					// Parent, its pluralities (i.e. governance bodies) and treasury pallet get
+					// free execution.
+					AllowExplicitUnpaidExecutionFrom<(ParentOrParentsPlurality, TreasuryPallet)>,
 					// Subscriptions for version tracking are OK.
 					AllowSubscriptionsFrom<Everything>,
 				),
@@ -473,6 +484,15 @@ pub type AssetFeeAsExistentialDepositMultiplierFeeCharger = AssetFeeAsExistentia
 	TrustBackedAssetsInstance,
 >;
 
+/// Cases where a remote origin is accepted as trusted Teleporter for a given asset:
+///
+/// - WND with the parent Relay Chain and sibling system parachains; and
+/// - Sibling parachains' assets from where they originate (as `ForeignCreators`).
+pub type TrustedTeleporters = (
+	ConcreteAssetFromSystem<WestendLocation>,
+	IsForeignConcreteAsset<FromSiblingParachain<parachain_info::Pallet<Runtime>>>,
+);
+
 pub struct XcmConfig;
 impl xcm_executor::Config for XcmConfig {
 	type RuntimeCall = RuntimeCall;
@@ -483,13 +503,7 @@ impl xcm_executor::Config for XcmConfig {
 	// Asset Hub acting _as_ a reserve location for WND and assets created under `pallet-assets`.
 	// For WND, users must use teleport where allowed (e.g. with the Relay Chain).
 	type IsReserve = ();
-	// We allow:
-	// - teleportation of WND
-	// - teleportation of sibling parachain's assets (as ForeignCreators)
-	type IsTeleporter = (
-		NativeAsset,
-		IsForeignConcreteAsset<FromSiblingParachain<parachain_info::Pallet<Runtime>>>,
-	);
+	type IsTeleporter = TrustedTeleporters;
 	type UniversalLocation = UniversalLocation;
 	type Barrier = Barrier;
 	type Weigher = WeightInfoBounds<
diff --git a/cumulus/parachains/runtimes/assets/asset-hub-westend/tests/tests.rs b/cumulus/parachains/runtimes/assets/asset-hub-westend/tests/tests.rs
index b2bb511182eb2091dc1fd5c4d9a95baa0e51e970..599ff90e254aa5f4fb745e153b8a3e9b9addb0e8 100644
--- a/cumulus/parachains/runtimes/assets/asset-hub-westend/tests/tests.rs
+++ b/cumulus/parachains/runtimes/assets/asset-hub-westend/tests/tests.rs
@@ -17,13 +17,6 @@
 
 //! Tests for the Westmint (Westend Assets Hub) chain.
 
-pub use asset_hub_westend_runtime::{
-	constants::fee::WeightToFee,
-	xcm_config::{CheckingAccount, TrustBackedAssetsPalletLocation, XcmConfig},
-	AllowMultiAssetPools, AssetDeposit, Assets, Balances, ExistentialDeposit, ForeignAssets,
-	ForeignAssetsInstance, ParachainSystem, Runtime, SessionKeys, System,
-	TrustBackedAssetsInstance,
-};
 use asset_hub_westend_runtime::{
 	xcm_config::{
 		AssetFeeAsExistentialDepositMultiplierFeeCharger, ForeignCreatorsSovereignAccountOf,
@@ -32,6 +25,12 @@ use asset_hub_westend_runtime::{
 	AllPalletsWithoutSystem, MetadataDepositBase, MetadataDepositPerByte, RuntimeCall,
 	RuntimeEvent,
 };
+pub use asset_hub_westend_runtime::{
+	xcm_config::{CheckingAccount, TrustBackedAssetsPalletLocation, XcmConfig},
+	AllowMultiAssetPools, AssetDeposit, Assets, Balances, ExistentialDeposit, ForeignAssets,
+	ForeignAssetsInstance, ParachainSystem, Runtime, SessionKeys, System,
+	TrustBackedAssetsInstance,
+};
 use asset_test_utils::{CollatorSessionKeys, ExtBuilder, XcmReceivedFrom};
 use codec::{Decode, DecodeLimit, Encode};
 use cumulus_primitives_utility::ChargeWeightInFungibles;
@@ -40,7 +39,9 @@ use frame_support::{
 	traits::fungibles::InspectEnumerable,
 	weights::{Weight, WeightToFee as WeightToFeeT},
 };
-use parachains_common::{AccountId, AssetIdForTrustBackedAssets, AuraId, Balance};
+use parachains_common::{
+	westend::fee::WeightToFee, AccountId, AssetIdForTrustBackedAssets, AuraId, Balance,
+};
 use sp_io;
 use sp_runtime::traits::MaybeEquivalence;
 use std::convert::Into;
diff --git a/cumulus/parachains/runtimes/assets/common/Cargo.toml b/cumulus/parachains/runtimes/assets/common/Cargo.toml
index dc4f62f4fefc3902144f56876089937fb9370c97..0cd5de2ddcd47df05cf3f9dc76c39ada47ac0cb1 100644
--- a/cumulus/parachains/runtimes/assets/common/Cargo.toml
+++ b/cumulus/parachains/runtimes/assets/common/Cargo.toml
@@ -1,8 +1,8 @@
 [package]
 name = "assets-common"
 version = "0.1.0"
-authors = ["Parity Technologies <admin@parity.io>"]
-edition = "2021"
+authors.workspace = true
+edition.workspace = true
 description = "Assets common utilities"
 
 [dependencies]
@@ -21,9 +21,9 @@ pallet-asset-tx-payment = { path = "../../../../../substrate/frame/transaction-p
 
 # Polkadot
 pallet-xcm = { path = "../../../../../polkadot/xcm/pallet-xcm", default-features = false}
-xcm = { path = "../../../../../polkadot/xcm", default-features = false}
-xcm-builder = { path = "../../../../../polkadot/xcm/xcm-builder", default-features = false}
-xcm-executor = { path = "../../../../../polkadot/xcm/xcm-executor", default-features = false}
+xcm = { package = "staging-xcm", path = "../../../../../polkadot/xcm", default-features = false}
+xcm-builder = { package = "staging-xcm-builder", path = "../../../../../polkadot/xcm/xcm-builder", default-features = false}
+xcm-executor = { package = "staging-xcm-executor", path = "../../../../../polkadot/xcm/xcm-executor", default-features = false}
 
 # Cumulus
 parachains-common = { path = "../../../common", default-features = false }
@@ -53,6 +53,11 @@ std = [
 
 runtime-benchmarks = [
 	"frame-support/runtime-benchmarks",
+	"pallet-asset-conversion/runtime-benchmarks",
+	"pallet-asset-tx-payment/runtime-benchmarks",
 	"pallet-xcm/runtime-benchmarks",
+	"parachains-common/runtime-benchmarks",
+	"sp-runtime/runtime-benchmarks",
 	"xcm-builder/runtime-benchmarks",
+	"xcm-executor/runtime-benchmarks",
 ]
diff --git a/cumulus/parachains/runtimes/assets/common/src/foreign_creators.rs b/cumulus/parachains/runtimes/assets/common/src/foreign_creators.rs
index 00f336f9c68239f8d51b83fa15dd5553fd5fce9a..1ed7bd0538c287bba5255c41145a1c3fa3a10064 100644
--- a/cumulus/parachains/runtimes/assets/common/src/foreign_creators.rs
+++ b/cumulus/parachains/runtimes/assets/common/src/foreign_creators.rs
@@ -1,4 +1,4 @@
-// Copyright (C) 2023 Parity Technologies (UK) Ltd.
+// Copyright (C) Parity Technologies (UK) Ltd.
 // SPDX-License-Identifier: Apache-2.0
 
 // Licensed under the Apache License, Version 2.0 (the "License");
diff --git a/cumulus/parachains/runtimes/assets/common/src/fungible_conversion.rs b/cumulus/parachains/runtimes/assets/common/src/fungible_conversion.rs
index 5aa5a69caa941de30a40a2930fd08a0f84fe472f..80f8a971d21781004e264600c67a62f9a18c2ce4 100644
--- a/cumulus/parachains/runtimes/assets/common/src/fungible_conversion.rs
+++ b/cumulus/parachains/runtimes/assets/common/src/fungible_conversion.rs
@@ -1,4 +1,4 @@
-// Copyright (C) 2023 Parity Technologies (UK) Ltd.
+// Copyright (C) Parity Technologies (UK) Ltd.
 // SPDX-License-Identifier: Apache-2.0
 
 // Licensed under the Apache License, Version 2.0 (the "License");
diff --git a/cumulus/parachains/runtimes/assets/common/src/lib.rs b/cumulus/parachains/runtimes/assets/common/src/lib.rs
index 25ab296ff1c6c068d01e420e907e1115f59238dc..560a89b131c03520da8a574620f8641f87e66ccf 100644
--- a/cumulus/parachains/runtimes/assets/common/src/lib.rs
+++ b/cumulus/parachains/runtimes/assets/common/src/lib.rs
@@ -1,4 +1,4 @@
-// Copyright (C) 2023 Parity Technologies (UK) Ltd.
+// Copyright (C) Parity Technologies (UK) Ltd.
 // SPDX-License-Identifier: Apache-2.0
 
 // Licensed under the Apache License, Version 2.0 (the "License");
diff --git a/cumulus/parachains/runtimes/assets/common/src/local_and_foreign_assets.rs b/cumulus/parachains/runtimes/assets/common/src/local_and_foreign_assets.rs
index 72fd9e7a9165de2227d9d26b59eb557727740040..5c66d1cabe571a5098f85fba47a81a4058cacbd6 100644
--- a/cumulus/parachains/runtimes/assets/common/src/local_and_foreign_assets.rs
+++ b/cumulus/parachains/runtimes/assets/common/src/local_and_foreign_assets.rs
@@ -1,4 +1,4 @@
-// Copyright (C) 2021 Parity Technologies (UK) Ltd.
+// Copyright (C) Parity Technologies (UK) Ltd.
 // SPDX-License-Identifier: Apache-2.0
 
 // Licensed under the Apache License, Version 2.0 (the "License");
@@ -13,19 +13,16 @@
 // See the License for the specific language governing permissions and
 // limitations under the License.
 
-use frame_support::{
-	pallet_prelude::DispatchError,
-	traits::{
-		fungibles::{Balanced, Create, HandleImbalanceDrop, Inspect, Mutate, Unbalanced},
-		tokens::{
-			DepositConsequence, Fortitude, Precision, Preservation, Provenance, WithdrawConsequence,
-		},
-		AccountTouch, Contains, ContainsPair, Get, PalletInfoAccess,
+use frame_support::traits::{
+	fungibles::{Balanced, Create, HandleImbalanceDrop, Inspect, Mutate, Unbalanced},
+	tokens::{
+		DepositConsequence, Fortitude, Precision, Preservation, Provenance, WithdrawConsequence,
 	},
+	AccountTouch, Contains, ContainsPair, Get, PalletInfoAccess,
 };
 use pallet_asset_conversion::{MultiAssetIdConversionResult, MultiAssetIdConverter};
 use parachains_common::AccountId;
-use sp_runtime::{traits::MaybeEquivalence, DispatchResult};
+use sp_runtime::{traits::MaybeEquivalence, DispatchError, DispatchResult};
 use sp_std::{boxed::Box, marker::PhantomData};
 use xcm::latest::MultiLocation;
 
diff --git a/cumulus/parachains/runtimes/assets/common/src/matching.rs b/cumulus/parachains/runtimes/assets/common/src/matching.rs
index 964f25cda35194633ca7a2c84b9989c7e219dc8e..08d391170014cfb0958887c09372f6e368910a56 100644
--- a/cumulus/parachains/runtimes/assets/common/src/matching.rs
+++ b/cumulus/parachains/runtimes/assets/common/src/matching.rs
@@ -1,4 +1,4 @@
-// Copyright (C) 2023 Parity Technologies (UK) Ltd.
+// Copyright (C) Parity Technologies (UK) Ltd.
 // SPDX-License-Identifier: Apache-2.0
 
 // Licensed under the Apache License, Version 2.0 (the "License");
diff --git a/cumulus/parachains/runtimes/assets/common/src/runtime_api.rs b/cumulus/parachains/runtimes/assets/common/src/runtime_api.rs
index 7eee95bb3b648d4a1bf64973d2243eb132fc2826..0a166a048193998fe15b1f35f3e667a76d71540b 100644
--- a/cumulus/parachains/runtimes/assets/common/src/runtime_api.rs
+++ b/cumulus/parachains/runtimes/assets/common/src/runtime_api.rs
@@ -1,4 +1,4 @@
-// Copyright (C) 2023 Parity Technologies (UK) Ltd.
+// Copyright (C) Parity Technologies (UK) Ltd.
 // SPDX-License-Identifier: Apache-2.0
 
 // Licensed under the Apache License, Version 2.0 (the "License");
diff --git a/cumulus/parachains/runtimes/assets/test-utils/Cargo.toml b/cumulus/parachains/runtimes/assets/test-utils/Cargo.toml
index 919f1b805d59236e21d681193689395437044bb0..0a27535ed22bd447774fbf13636f1a2c09a5699c 100644
--- a/cumulus/parachains/runtimes/assets/test-utils/Cargo.toml
+++ b/cumulus/parachains/runtimes/assets/test-utils/Cargo.toml
@@ -1,8 +1,8 @@
 [package]
 name = "asset-test-utils"
 version = "1.0.0"
-authors = ["Parity Technologies <admin@parity.io>"]
-edition = "2021"
+authors.workspace = true
+edition.workspace = true
 description = "Test utils for Asset Hub runtimes."
 
 [dependencies]
@@ -34,10 +34,10 @@ parachain-info = { path = "../../../pallets/parachain-info", default-features =
 parachains-runtimes-test-utils = { path = "../../test-utils", default-features = false }
 
 # Polkadot
-xcm = { path = "../../../../../polkadot/xcm", default-features = false}
-xcm-executor = { path = "../../../../../polkadot/xcm/xcm-executor", default-features = false}
+xcm = { package = "staging-xcm", path = "../../../../../polkadot/xcm", default-features = false}
+xcm-executor = { package = "staging-xcm-executor", path = "../../../../../polkadot/xcm/xcm-executor", default-features = false}
 pallet-xcm = { path = "../../../../../polkadot/xcm/pallet-xcm", default-features = false}
-polkadot-parachain = { path = "../../../../../polkadot/parachain", default-features = false}
+polkadot-parachain-primitives = { path = "../../../../../polkadot/parachain", default-features = false}
 
 [dev-dependencies]
 hex-literal = "0.4.1"
@@ -51,7 +51,6 @@ std = [
 	"assets-common/std",
 	"cumulus-pallet-dmp-queue/std",
 	"cumulus-pallet-parachain-system/std",
-	"cumulus-pallet-parachain-system/std",
 	"cumulus-pallet-xcmp-queue/std",
 	"cumulus-primitives-core/std",
 	"cumulus-primitives-parachain-inherent/std",
@@ -66,8 +65,9 @@ std = [
 	"parachain-info/std",
 	"parachains-common/std",
 	"parachains-runtimes-test-utils/std",
-	"polkadot-parachain/std",
+	"polkadot-parachain-primitives/std",
 	"sp-consensus-aura/std",
+	"sp-core/std",
 	"sp-io/std",
 	"sp-runtime/std",
 	"sp-std/std",
diff --git a/cumulus/parachains/runtimes/assets/test-utils/src/lib.rs b/cumulus/parachains/runtimes/assets/test-utils/src/lib.rs
index 9a24867592e2adbf6b6a79d4baada39a04786a0c..7177726e07046e1d55a015016e88924db418077a 100644
--- a/cumulus/parachains/runtimes/assets/test-utils/src/lib.rs
+++ b/cumulus/parachains/runtimes/assets/test-utils/src/lib.rs
@@ -1,4 +1,4 @@
-// Copyright Parity Technologies (UK) Ltd.
+// Copyright (C) Parity Technologies (UK) Ltd.
 // This file is part of Cumulus.
 
 // Cumulus is free software: you can redistribute it and/or modify
diff --git a/cumulus/parachains/runtimes/assets/test-utils/src/test_cases.rs b/cumulus/parachains/runtimes/assets/test-utils/src/test_cases.rs
index f11d590f4afa2effbff97a4b59fc7854eb32d568..7a8d571403c6b5c5f856dd30c08eaa092423cda5 100644
--- a/cumulus/parachains/runtimes/assets/test-utils/src/test_cases.rs
+++ b/cumulus/parachains/runtimes/assets/test-utils/src/test_cases.rs
@@ -1,4 +1,4 @@
-// Copyright (C) 2023 Parity Technologies (UK) Ltd.
+// Copyright (C) Parity Technologies (UK) Ltd.
 // SPDX-License-Identifier: Apache-2.0
 
 // Licensed under the Apache License, Version 2.0 (the "License");
diff --git a/cumulus/parachains/runtimes/bridge-hubs/README.md b/cumulus/parachains/runtimes/bridge-hubs/README.md
index 1520065b7e3a47656c7215bdf2c3883c03c0c379..487c601ef84023310fe7e15c5642ca060c9e550b 100644
--- a/cumulus/parachains/runtimes/bridge-hubs/README.md
+++ b/cumulus/parachains/runtimes/bridge-hubs/README.md
@@ -1,26 +1,26 @@
 - [Bridge-hub Parachains](#bridge-hub-parachains)
-  * [Requirements for local run/testing](#requirements-for-local-runtesting)
-  * [How to test local Rococo <-> Wococo bridge](#how-to-test-local-rococo---wococo-bridge)
-    + [Run chains (Rococo + BridgeHub, Wococo + BridgeHub) with zombienet](#run-chains-rococo--bridgehub-wococo--bridgehub-with-zombienet)
-    + [Run relayer (BridgeHubRococo, BridgeHubWococo)](#run-relayer-bridgehubrococo-bridgehubwococo)
+  - [Requirements for local run/testing](#requirements-for-local-runtesting)
+  - [How to test local Rococo <-> Wococo bridge](#how-to-test-local-rococo---wococo-bridge)
+    - [Run chains (Rococo + BridgeHub, Wococo + BridgeHub) with
+      zombienet](#run-chains-rococo--bridgehub-wococo--bridgehub-with-zombienet)
+    - [Run relayer (BridgeHubRococo, BridgeHubWococo)](#run-relayer-bridgehubrococo-bridgehubwococo)
       - [Run with script (alternative 1)](#run-with-script-alternative-1)
       - [Run with binary (alternative 2)](#run-with-binary-alternative-2)
-    + [Send messages - transfer asset over bridge](#send-messages---transfer-asset-over-bridge)
-  * [How to test live BridgeHubRococo/BridgeHubWococo](#how-to-test-live-bridgehubrococobridgehubwococo)
-  * [How to test local BridgeHubKusama/BridgeHubPolkadot](#how-to-test-local-bridgehubkusamabridgehubpolkadot)
+    - [Send messages - transfer asset over bridge](#send-messages---transfer-asset-over-bridge)
+  - [How to test live BridgeHubRococo/BridgeHubWococo](#how-to-test-live-bridgehubrococobridgehubwococo)
+  - [How to test local BridgeHubKusama/BridgeHubPolkadot](#how-to-test-local-bridgehubkusamabridgehubpolkadot)
 
 # Bridge-hub Parachains
 
-_BridgeHub(s)_ are **_system parachains_** that will house trustless bridges from the local
-ecosystem to others.
-The current trustless bridges planned for the BridgeHub(s) are:
+_BridgeHub(s)_ are **_system parachains_** that will house trustless bridges from the local ecosystem to others. The
+current trustless bridges planned for the BridgeHub(s) are:
 - `BridgeHubPolkadot` system parachain:
 	1. Polkadot <-> Kusama bridge
 	2. Polkadot <-> Ethereum bridge (Snowbridge)
 - `BridgeHubKusama` system parachain:
 	1. Kusama <-> Polkadot bridge
-	2. Kusama <-> Ethereum bridge
-	   The high-level responsibilities of each bridge living on BridgeHub:
+	2. Kusama <-> Ethereum bridge The high-level
+	responsibilities of each bridge living on BridgeHub:
 - sync finality proofs between relay chains (or equivalent)
 - sync finality proofs between BridgeHub parachains
 - pass (XCM) messages between different BridgeHub parachains
@@ -192,43 +192,40 @@ RUST_LOG=runtime=trace,rpc=trace,bridge=trace \
 ```
 
 **Check relay-chain headers relaying:**
-- Rococo parachain:
-	- https://polkadot.js.org/apps/?rpc=ws%3A%2F%2F127.0.0.1%3A8943#/chainstate
-	- Pallet: **bridgeWococoGrandpa**
-	- Keys: **bestFinalized()**
-- Wococo parachain:
-	- https://polkadot.js.org/apps/?rpc=ws%3A%2F%2F127.0.0.1%3A8945#/chainstate
-	- Pallet: **bridgeRococoGrandpa**
-	- Keys: **bestFinalized()**
+- Rococo parachain: - https://polkadot.js.org/apps/?rpc=ws%3A%2F%2F127.0.0.1%3A8943#/chainstate - Pallet:
+	**bridgeWococoGrandpa** - Keys: **bestFinalized()**
+- Wococo parachain: - https://polkadot.js.org/apps/?rpc=ws%3A%2F%2F127.0.0.1%3A8945#/chainstate - Pallet:
+	**bridgeRococoGrandpa** - Keys: **bestFinalized()**
 
 **Check parachain headers relaying:**
-- Rococo parachain:
-	- https://polkadot.js.org/apps/?rpc=ws%3A%2F%2F127.0.0.1%3A8943#/chainstate
-	- Pallet: **bridgeWococoParachain**
-	- Keys: **bestParaHeads()**
-- Wococo parachain:
-	- https://polkadot.js.org/apps/?rpc=ws%3A%2F%2F127.0.0.1%3A8945#/chainstate
-	- Pallet: **bridgeRococoParachain**
-	- Keys: **bestParaHeads()**
+- Rococo parachain: - https://polkadot.js.org/apps/?rpc=ws%3A%2F%2F127.0.0.1%3A8943#/chainstate - Pallet:
+	**bridgeWococoParachain** - Keys: **bestParaHeads()**
+- Wococo parachain: - https://polkadot.js.org/apps/?rpc=ws%3A%2F%2F127.0.0.1%3A8945#/chainstate - Pallet:
+	**bridgeRococoParachain** - Keys: **bestParaHeads()**
 
 ### Send messages - transfer asset over bridge
 
 TODO: see `# !!! READ HERE` above
 
 ## How to test live BridgeHubRococo/BridgeHubWococo
-(here is still deployed older PoC from branch `origin/bko-transfer-asset-via-bridge`, which uses custom extrinsic, which is going to be replaced by `pallet_xcm` usage)
+(here is still deployed older PoC from branch `origin/bko-transfer-asset-via-bridge`, which uses custom extrinsic, which
+is going to be replaced by `pallet_xcm` usage)
 - uses account seed on Live Rococo:Rockmine2
   ```
   cd <cumulus-git-repo-dir>
   ./scripts/bridges_rococo_wococo.sh transfer-asset-from-asset-hub-rococo
   ```
 
-- open explorers:
-	- Rockmine2 (see events `xcmpQueue.XcmpMessageSent`, `bridgeTransfer.ReserveAssetsDeposited`, `bridgeTransfer.TransferInitiated`) https://polkadot.js.org/apps/?rpc=wss%3A%2F%2Fws-rococo-rockmine2-collator-node-0.parity-testnet.parity.io#/explorer
-	- BridgeHubRococo (see `bridgeWococoMessages.MessageAccepted`) https://polkadot.js.org/apps/?rpc=wss%3A%2F%2Frococo-bridge-hub-rpc.polkadot.io#/explorer
-	- BridgeHubWococo (see `bridgeRococoMessages.MessagesReceived`) https://polkadot.js.org/apps/?rpc=wss%3A%2F%2Fwococo-bridge-hub-rpc.polkadot.io#/explorer
-	- Wockmint (see `xcmpQueue.Success` for `transfer-asset` and `xcmpQueue.Fail` for `ping-via-bridge`) https://polkadot.js.org/apps/?rpc=wss%3A%2F%2Fwococo-wockmint-rpc.polkadot.io#/explorer
-	- BridgeHubRococo (see `bridgeWococoMessages.MessagesDelivered`)
+- open explorers: - Rockmine2 (see events `xcmpQueue.XcmpMessageSent`, `bridgeTransfer.ReserveAssetsDeposited`,
+	`bridgeTransfer.TransferInitiated`)
+	https://polkadot.js.org/apps/?rpc=wss%3A%2F%2Fws-rococo-rockmine2-collator-node-0.parity-testnet.parity.io#/explorer
+	- BridgeHubRococo (see `bridgeWococoMessages.MessageAccepted`)
+	https://polkadot.js.org/apps/?rpc=wss%3A%2F%2Frococo-bridge-hub-rpc.polkadot.io#/explorer - BridgeHubWococo (see
+	`bridgeRococoMessages.MessagesReceived`)
+	https://polkadot.js.org/apps/?rpc=wss%3A%2F%2Fwococo-bridge-hub-rpc.polkadot.io#/explorer - Wockmint (see
+	`xcmpQueue.Success` for `transfer-asset` and `xcmpQueue.Fail` for `ping-via-bridge`)
+	https://polkadot.js.org/apps/?rpc=wss%3A%2F%2Fwococo-wockmint-rpc.polkadot.io#/explorer - BridgeHubRococo (see
+	`bridgeWococoMessages.MessagesDelivered`)
 
 
 ## How to test local BridgeHubKusama/BridgeHubPolkadot
diff --git a/cumulus/parachains/runtimes/bridge-hubs/bridge-hub-kusama/Cargo.toml b/cumulus/parachains/runtimes/bridge-hubs/bridge-hub-kusama/Cargo.toml
index 0dbe3ed9f261c79499fccee2a4f685d061ce855c..bfb0b9e712709f01da525c9b2fcf71d33bf35d38 100644
--- a/cumulus/parachains/runtimes/bridge-hubs/bridge-hub-kusama/Cargo.toml
+++ b/cumulus/parachains/runtimes/bridge-hubs/bridge-hub-kusama/Cargo.toml
@@ -1,8 +1,8 @@
 [package]
 name = "bridge-hub-kusama-runtime"
 version = "0.1.0"
-authors = ["Parity Technologies <admin@parity.io>"]
-edition = "2021"
+authors.workspace = true
+edition.workspace = true
 description = "Kusama's BridgeHub parachain runtime"
 
 [build-dependencies]
@@ -13,7 +13,7 @@ codec = { package = "parity-scale-codec", version = "3.0.0", default-features =
 hex-literal = { version = "0.4.1" }
 log = { version = "0.4.20", default-features = false }
 scale-info = { version = "2.9.0", default-features = false, features = ["derive"] }
-serde = { version = "1.0.183", optional = true, features = ["derive"] }
+serde = { version = "1.0.188", optional = true, features = ["derive"] }
 smallvec = "1.11.0"
 
 # Substrate
@@ -37,6 +37,7 @@ sp-api = { path = "../../../../../substrate/primitives/api", default-features =
 sp-block-builder = { path = "../../../../../substrate/primitives/block-builder", default-features = false}
 sp-consensus-aura = { path = "../../../../../substrate/primitives/consensus/aura", default-features = false}
 sp-core = { path = "../../../../../substrate/primitives/core", default-features = false}
+sp-genesis-builder = { path = "../../../../../substrate/primitives/genesis-builder", default-features = false }
 sp-inherents = { path = "../../../../../substrate/primitives/inherents", default-features = false}
 sp-io = { path = "../../../../../substrate/primitives/io", default-features = false}
 sp-offchain = { path = "../../../../../substrate/primitives/offchain", default-features = false}
@@ -48,15 +49,14 @@ sp-transaction-pool = { path = "../../../../../substrate/primitives/transaction-
 sp-version = { path = "../../../../../substrate/primitives/version", default-features = false}
 
 # Polkadot
-kusama-runtime-constants = { path = "../../../../../polkadot/runtime/kusama/constants", default-features = false}
 pallet-xcm = { path = "../../../../../polkadot/xcm/pallet-xcm", default-features = false}
 pallet-xcm-benchmarks = { path = "../../../../../polkadot/xcm/pallet-xcm-benchmarks", default-features = false, optional = true }
 polkadot-core-primitives = { path = "../../../../../polkadot/core-primitives", default-features = false}
-polkadot-parachain = { path = "../../../../../polkadot/parachain", default-features = false}
+polkadot-parachain-primitives = { path = "../../../../../polkadot/parachain", default-features = false}
 polkadot-runtime-common = { path = "../../../../../polkadot/runtime/common", default-features = false}
-xcm = { path = "../../../../../polkadot/xcm", default-features = false}
-xcm-builder = { path = "../../../../../polkadot/xcm/xcm-builder", default-features = false}
-xcm-executor = { path = "../../../../../polkadot/xcm/xcm-executor", default-features = false}
+xcm = { package = "staging-xcm", path = "../../../../../polkadot/xcm", default-features = false}
+xcm-builder = { package = "staging-xcm-builder", path = "../../../../../polkadot/xcm/xcm-builder", default-features = false}
+xcm-executor = { package = "staging-xcm-executor", path = "../../../../../polkadot/xcm/xcm-executor", default-features = false}
 
 # Cumulus
 cumulus-pallet-aura-ext = { path = "../../../../pallets/aura-ext", default-features = false }
@@ -81,15 +81,18 @@ std = [
 	"cumulus-pallet-aura-ext/std",
 	"cumulus-pallet-dmp-queue/std",
 	"cumulus-pallet-parachain-system/std",
+	"cumulus-pallet-session-benchmarking/std",
 	"cumulus-pallet-xcm/std",
 	"cumulus-pallet-xcmp-queue/std",
 	"cumulus-primitives-core/std",
 	"cumulus-primitives-utility/std",
+	"frame-benchmarking?/std",
 	"frame-executive/std",
 	"frame-support/std",
+	"frame-system-benchmarking?/std",
 	"frame-system-rpc-runtime-api/std",
 	"frame-system/std",
-	"kusama-runtime-constants/std",
+	"frame-try-runtime?/std",
 	"log/std",
 	"pallet-aura/std",
 	"pallet-authorship/std",
@@ -101,11 +104,12 @@ std = [
 	"pallet-transaction-payment-rpc-runtime-api/std",
 	"pallet-transaction-payment/std",
 	"pallet-utility/std",
+	"pallet-xcm-benchmarks?/std",
 	"pallet-xcm/std",
 	"parachain-info/std",
 	"parachains-common/std",
 	"polkadot-core-primitives/std",
-	"polkadot-parachain/std",
+	"polkadot-parachain-primitives/std",
 	"polkadot-runtime-common/std",
 	"scale-info/std",
 	"serde",
@@ -113,12 +117,14 @@ std = [
 	"sp-block-builder/std",
 	"sp-consensus-aura/std",
 	"sp-core/std",
+	"sp-genesis-builder/std",
 	"sp-inherents/std",
 	"sp-io/std",
 	"sp-offchain/std",
 	"sp-runtime/std",
 	"sp-session/std",
 	"sp-std/std",
+	"sp-storage/std",
 	"sp-transaction-pool/std",
 	"sp-version/std",
 	"substrate-wasm-builder",
@@ -131,6 +137,7 @@ runtime-benchmarks = [
 	"cumulus-pallet-parachain-system/runtime-benchmarks",
 	"cumulus-pallet-session-benchmarking/runtime-benchmarks",
 	"cumulus-pallet-xcmp-queue/runtime-benchmarks",
+	"cumulus-primitives-utility/runtime-benchmarks",
 	"frame-benchmarking/runtime-benchmarks",
 	"frame-support/runtime-benchmarks",
 	"frame-system-benchmarking/runtime-benchmarks",
@@ -142,8 +149,12 @@ runtime-benchmarks = [
 	"pallet-utility/runtime-benchmarks",
 	"pallet-xcm-benchmarks/runtime-benchmarks",
 	"pallet-xcm/runtime-benchmarks",
+	"parachains-common/runtime-benchmarks",
+	"polkadot-parachain-primitives/runtime-benchmarks",
+	"polkadot-runtime-common/runtime-benchmarks",
 	"sp-runtime/runtime-benchmarks",
 	"xcm-builder/runtime-benchmarks",
+	"xcm-executor/runtime-benchmarks",
 ]
 
 try-runtime = [
@@ -153,6 +164,7 @@ try-runtime = [
 	"cumulus-pallet-xcm/try-runtime",
 	"cumulus-pallet-xcmp-queue/try-runtime",
 	"frame-executive/try-runtime",
+	"frame-support/try-runtime",
 	"frame-system/try-runtime",
 	"frame-try-runtime/try-runtime",
 	"pallet-aura/try-runtime",
@@ -166,6 +178,8 @@ try-runtime = [
 	"pallet-utility/try-runtime",
 	"pallet-xcm/try-runtime",
 	"parachain-info/try-runtime",
+	"polkadot-runtime-common/try-runtime",
+	"sp-runtime/try-runtime",
 ]
 
 experimental = [ "pallet-aura/experimental" ]
diff --git a/cumulus/parachains/runtimes/bridge-hubs/bridge-hub-kusama/src/constants.rs b/cumulus/parachains/runtimes/bridge-hubs/bridge-hub-kusama/src/constants.rs
deleted file mode 100644
index f0908fcd4395095378ef7721d88fc59e65591e3b..0000000000000000000000000000000000000000
--- a/cumulus/parachains/runtimes/bridge-hubs/bridge-hub-kusama/src/constants.rs
+++ /dev/null
@@ -1,117 +0,0 @@
-// Copyright (C) 2022 Parity Technologies (UK) Ltd.
-// SPDX-License-Identifier: Apache-2.0
-
-// Licensed under the Apache License, Version 2.0 (the "License");
-// you may not use this file except in compliance with the License.
-// You may obtain a copy of the License at
-//
-// 	http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the License is distributed on an "AS IS" BASIS,
-// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-// See the License for the specific language governing permissions and
-// limitations under the License.
-
-pub mod currency {
-	use kusama_runtime_constants as constants;
-	use polkadot_core_primitives::Balance;
-
-	/// The existential deposit. Set to 1/10 of its parent Relay Chain.
-	pub const EXISTENTIAL_DEPOSIT: Balance = constants::currency::EXISTENTIAL_DEPOSIT / 10;
-
-	pub const UNITS: Balance = constants::currency::UNITS;
-	pub const CENTS: Balance = constants::currency::CENTS;
-	pub const MILLICENTS: Balance = constants::currency::MILLICENTS;
-
-	pub const fn deposit(items: u32, bytes: u32) -> Balance {
-		// map to 1/100 of what the kusama relay chain charges (v9020)
-		constants::currency::deposit(items, bytes) / 100
-	}
-}
-
-/// Fee-related.
-pub mod fee {
-	use frame_support::{
-		pallet_prelude::Weight,
-		weights::{
-			constants::ExtrinsicBaseWeight, FeePolynomial, WeightToFeeCoefficient,
-			WeightToFeeCoefficients, WeightToFeePolynomial,
-		},
-	};
-	use polkadot_core_primitives::Balance;
-	use smallvec::smallvec;
-	pub use sp_runtime::Perbill;
-
-	/// Handles converting a weight scalar to a fee value, based on the scale and granularity of the
-	/// node's balance type.
-	///
-	/// This should typically create a mapping between the following ranges:
-	///   - [0, MAXIMUM_BLOCK_WEIGHT]
-	///   - [Balance::min, Balance::max]
-	///
-	/// Yet, it can be used for any other sort of change to weight-fee. Some examples being:
-	///   - Setting it to `0` will essentially disable the weight fee.
-	///   - Setting it to `1` will cause the literal `#[weight = x]` values to be charged.
-	pub struct WeightToFee;
-	impl frame_support::weights::WeightToFee for WeightToFee {
-		type Balance = Balance;
-
-		fn weight_to_fee(weight: &Weight) -> Self::Balance {
-			let time_poly: FeePolynomial<Balance> = RefTimeToFee::polynomial().into();
-			let proof_poly: FeePolynomial<Balance> = ProofSizeToFee::polynomial().into();
-
-			// Take the maximum instead of the sum to charge by the more scarce resource.
-			time_poly.eval(weight.ref_time()).max(proof_poly.eval(weight.proof_size()))
-		}
-	}
-
-	/// Maps the reference time component of `Weight` to a fee.
-	pub struct RefTimeToFee;
-	impl WeightToFeePolynomial for RefTimeToFee {
-		type Balance = Balance;
-		fn polynomial() -> WeightToFeeCoefficients<Self::Balance> {
-			// in Kusama, extrinsic base weight (smallest non-zero weight) is mapped to 1/10 CENT:
-			// in Bridge Hub, we map to 1/10 of that, or 1/100 CENT
-			let p = super::currency::CENTS;
-			let q = 100 * Balance::from(ExtrinsicBaseWeight::get().ref_time());
-
-			smallvec![WeightToFeeCoefficient {
-				degree: 1,
-				negative: false,
-				coeff_frac: Perbill::from_rational(p % q, q),
-				coeff_integer: p / q,
-			}]
-		}
-	}
-
-	/// Maps the proof size component of `Weight` to a fee.
-	pub struct ProofSizeToFee;
-	impl WeightToFeePolynomial for ProofSizeToFee {
-		type Balance = Balance;
-		fn polynomial() -> WeightToFeeCoefficients<Self::Balance> {
-			// Map 10kb proof to 1 CENT.
-			let p = super::currency::CENTS;
-			let q = 10_000;
-
-			smallvec![WeightToFeeCoefficient {
-				degree: 1,
-				negative: false,
-				coeff_frac: Perbill::from_rational(p % q, q),
-				coeff_integer: p / q,
-			}]
-		}
-	}
-}
-
-/// Consensus-related.
-pub mod consensus {
-	/// Maximum number of blocks simultaneously accepted by the Runtime, not yet included
-	/// into the relay chain.
-	pub const UNINCLUDED_SEGMENT_CAPACITY: u32 = 1;
-	/// How many parachain blocks are processed by the relay chain per parent. Limits the
-	/// number of blocks authored per slot.
-	pub const BLOCK_PROCESSING_VELOCITY: u32 = 1;
-	/// Relay chain slot duration, in milliseconds.
-	pub const RELAY_CHAIN_SLOT_DURATION_MILLIS: u32 = 6000;
-}
diff --git a/cumulus/parachains/runtimes/bridge-hubs/bridge-hub-kusama/src/lib.rs b/cumulus/parachains/runtimes/bridge-hubs/bridge-hub-kusama/src/lib.rs
index af00e06c78113e42f29bdab1c358e91ef8741848..791751e7736851e46c26fb3056bafaed36389baf 100644
--- a/cumulus/parachains/runtimes/bridge-hubs/bridge-hub-kusama/src/lib.rs
+++ b/cumulus/parachains/runtimes/bridge-hubs/bridge-hub-kusama/src/lib.rs
@@ -1,4 +1,4 @@
-// Copyright 2022 Parity Technologies (UK) Ltd.
+// Copyright (C) Parity Technologies (UK) Ltd.
 // This file is part of Cumulus.
 
 // Cumulus is free software: you can redistribute it and/or modify
@@ -22,7 +22,6 @@
 #[cfg(feature = "std")]
 include!(concat!(env!("OUT_DIR"), "/wasm_binary.rs"));
 
-pub mod constants;
 mod weights;
 pub mod xcm_config;
 
@@ -41,10 +40,10 @@ use sp_std::prelude::*;
 use sp_version::NativeVersion;
 use sp_version::RuntimeVersion;
 
-use constants::{consensus::*, currency::*, fee::WeightToFee};
 use frame_support::{
 	construct_runtime,
 	dispatch::DispatchClass,
+	genesis_builder_helper::{build_config, create_default_config},
 	parameter_types,
 	traits::{ConstBool, ConstU32, ConstU64, ConstU8, EitherOfDiverse, Everything},
 	weights::{ConstantMultiplier, Weight},
@@ -69,8 +68,10 @@ use polkadot_runtime_common::{BlockHashCount, SlowAdjustingFeeUpdate};
 use weights::{BlockExecutionWeight, ExtrinsicBaseWeight, RocksDbWeight};
 
 use parachains_common::{
-	impls::DealWithFees, AccountId, Balance, BlockNumber, Hash, Header, Nonce, Signature,
-	AVERAGE_ON_INITIALIZE_RATIO, HOURS, MAXIMUM_BLOCK_WEIGHT, NORMAL_DISPATCH_RATIO, SLOT_DURATION,
+	impls::DealWithFees,
+	kusama::{consensus::*, currency::*, fee::WeightToFee},
+	AccountId, Balance, BlockNumber, Hash, Header, Nonce, Signature, AVERAGE_ON_INITIALIZE_RATIO,
+	HOURS, MAXIMUM_BLOCK_WEIGHT, NORMAL_DISPATCH_RATIO, SLOT_DURATION,
 };
 
 // XCM Imports
@@ -779,6 +780,16 @@ impl_runtime_apis! {
 			Ok(batches)
 		}
 	}
+
+	impl sp_genesis_builder::GenesisBuilder<Block> for Runtime {
+		fn create_default_config() -> Vec<u8> {
+			create_default_config::<RuntimeGenesisConfig>()
+		}
+
+		fn build_config(config: Vec<u8>) -> sp_genesis_builder::Result {
+			build_config::<RuntimeGenesisConfig>(config)
+		}
+	}
 }
 
 cumulus_pallet_parachain_system::register_validate_block! {
diff --git a/cumulus/parachains/runtimes/bridge-hubs/bridge-hub-kusama/src/weights/block_weights.rs b/cumulus/parachains/runtimes/bridge-hubs/bridge-hub-kusama/src/weights/block_weights.rs
index b2092d875c8328210667da4cbb95de0642e60ae3..e7fdb2aae2a01ec06076de83d94817e540e205dd 100644
--- a/cumulus/parachains/runtimes/bridge-hubs/bridge-hub-kusama/src/weights/block_weights.rs
+++ b/cumulus/parachains/runtimes/bridge-hubs/bridge-hub-kusama/src/weights/block_weights.rs
@@ -1,6 +1,6 @@
 // This file is part of Substrate.
 
-// Copyright (C) 2022 Parity Technologies (UK) Ltd.
+// Copyright (C) Parity Technologies (UK) Ltd.
 // SPDX-License-Identifier: Apache-2.0
 
 // Licensed under the Apache License, Version 2.0 (the "License");
diff --git a/cumulus/parachains/runtimes/bridge-hubs/bridge-hub-kusama/src/weights/cumulus_pallet_xcmp_queue.rs b/cumulus/parachains/runtimes/bridge-hubs/bridge-hub-kusama/src/weights/cumulus_pallet_xcmp_queue.rs
index 83b242f045992b54f12e199366282463b516ea2a..991cba573bf2a64bf917f5c50a246354c7f82355 100644
--- a/cumulus/parachains/runtimes/bridge-hubs/bridge-hub-kusama/src/weights/cumulus_pallet_xcmp_queue.rs
+++ b/cumulus/parachains/runtimes/bridge-hubs/bridge-hub-kusama/src/weights/cumulus_pallet_xcmp_queue.rs
@@ -1,4 +1,4 @@
-// Copyright Parity Technologies (UK) Ltd.
+// Copyright (C) Parity Technologies (UK) Ltd.
 // This file is part of Cumulus.
 
 // Cumulus is free software: you can redistribute it and/or modify
diff --git a/cumulus/parachains/runtimes/bridge-hubs/bridge-hub-kusama/src/weights/extrinsic_weights.rs b/cumulus/parachains/runtimes/bridge-hubs/bridge-hub-kusama/src/weights/extrinsic_weights.rs
index 332c3b324bb9c1b386257bf7953d37aba8f5af13..1a4adb968bb7195428ea00d59cd92dcd3b6eea5f 100644
--- a/cumulus/parachains/runtimes/bridge-hubs/bridge-hub-kusama/src/weights/extrinsic_weights.rs
+++ b/cumulus/parachains/runtimes/bridge-hubs/bridge-hub-kusama/src/weights/extrinsic_weights.rs
@@ -1,6 +1,6 @@
 // This file is part of Substrate.
 
-// Copyright (C) 2022 Parity Technologies (UK) Ltd.
+// Copyright (C) Parity Technologies (UK) Ltd.
 // SPDX-License-Identifier: Apache-2.0
 
 // Licensed under the Apache License, Version 2.0 (the "License");
diff --git a/cumulus/parachains/runtimes/bridge-hubs/bridge-hub-kusama/src/weights/frame_system.rs b/cumulus/parachains/runtimes/bridge-hubs/bridge-hub-kusama/src/weights/frame_system.rs
index 83b8ec960fb12a71399b7d8461fedb9e49c07823..5a0a60cc9952dc8f7eb98458a848b24b9c166f3a 100644
--- a/cumulus/parachains/runtimes/bridge-hubs/bridge-hub-kusama/src/weights/frame_system.rs
+++ b/cumulus/parachains/runtimes/bridge-hubs/bridge-hub-kusama/src/weights/frame_system.rs
@@ -1,4 +1,4 @@
-// Copyright Parity Technologies (UK) Ltd.
+// Copyright (C) Parity Technologies (UK) Ltd.
 // This file is part of Cumulus.
 
 // Cumulus is free software: you can redistribute it and/or modify
diff --git a/cumulus/parachains/runtimes/bridge-hubs/bridge-hub-kusama/src/weights/mod.rs b/cumulus/parachains/runtimes/bridge-hubs/bridge-hub-kusama/src/weights/mod.rs
index d5722374defcfc6c9efc6579031a369208807187..e226021e77ab58d51bda2eaa23ff732d53e7f4cb 100644
--- a/cumulus/parachains/runtimes/bridge-hubs/bridge-hub-kusama/src/weights/mod.rs
+++ b/cumulus/parachains/runtimes/bridge-hubs/bridge-hub-kusama/src/weights/mod.rs
@@ -1,6 +1,6 @@
 // This file is part of Substrate.
 
-// Copyright (C) 2022 Parity Technologies (UK) Ltd.
+// Copyright (C) Parity Technologies (UK) Ltd.
 // SPDX-License-Identifier: Apache-2.0
 
 // Licensed under the Apache License, Version 2.0 (the "License");
diff --git a/cumulus/parachains/runtimes/bridge-hubs/bridge-hub-kusama/src/weights/pallet_balances.rs b/cumulus/parachains/runtimes/bridge-hubs/bridge-hub-kusama/src/weights/pallet_balances.rs
index 1387ee30c7d37485a1c1c42636150b9bb624fe41..51ca2e660b3b578a5d23e38eb215e2b4a5c5debc 100644
--- a/cumulus/parachains/runtimes/bridge-hubs/bridge-hub-kusama/src/weights/pallet_balances.rs
+++ b/cumulus/parachains/runtimes/bridge-hubs/bridge-hub-kusama/src/weights/pallet_balances.rs
@@ -1,4 +1,4 @@
-// Copyright Parity Technologies (UK) Ltd.
+// Copyright (C) Parity Technologies (UK) Ltd.
 // This file is part of Cumulus.
 
 // Cumulus is free software: you can redistribute it and/or modify
diff --git a/cumulus/parachains/runtimes/bridge-hubs/bridge-hub-kusama/src/weights/pallet_collator_selection.rs b/cumulus/parachains/runtimes/bridge-hubs/bridge-hub-kusama/src/weights/pallet_collator_selection.rs
index 7854bf88e404aeac79e2361c884f9d45ab40d1fb..fa0ac199ca2c06d07a757e191d9a00e9e1f9cb7e 100644
--- a/cumulus/parachains/runtimes/bridge-hubs/bridge-hub-kusama/src/weights/pallet_collator_selection.rs
+++ b/cumulus/parachains/runtimes/bridge-hubs/bridge-hub-kusama/src/weights/pallet_collator_selection.rs
@@ -1,4 +1,4 @@
-// Copyright Parity Technologies (UK) Ltd.
+// Copyright (C) Parity Technologies (UK) Ltd.
 // This file is part of Cumulus.
 
 // Cumulus is free software: you can redistribute it and/or modify
diff --git a/cumulus/parachains/runtimes/bridge-hubs/bridge-hub-kusama/src/weights/pallet_multisig.rs b/cumulus/parachains/runtimes/bridge-hubs/bridge-hub-kusama/src/weights/pallet_multisig.rs
index 14b11f9380a6720afecea7479f02d648d1c6a79a..96b2d859ed864d8a368bc258038890825c8b4d36 100644
--- a/cumulus/parachains/runtimes/bridge-hubs/bridge-hub-kusama/src/weights/pallet_multisig.rs
+++ b/cumulus/parachains/runtimes/bridge-hubs/bridge-hub-kusama/src/weights/pallet_multisig.rs
@@ -1,4 +1,4 @@
-// Copyright Parity Technologies (UK) Ltd.
+// Copyright (C) Parity Technologies (UK) Ltd.
 // This file is part of Cumulus.
 
 // Cumulus is free software: you can redistribute it and/or modify
diff --git a/cumulus/parachains/runtimes/bridge-hubs/bridge-hub-kusama/src/weights/pallet_session.rs b/cumulus/parachains/runtimes/bridge-hubs/bridge-hub-kusama/src/weights/pallet_session.rs
index 69371604e796013cdad7edfbfd2290c23590307a..cc1b4aeb0ddb6718b57ebfd65c985fc4071867b1 100644
--- a/cumulus/parachains/runtimes/bridge-hubs/bridge-hub-kusama/src/weights/pallet_session.rs
+++ b/cumulus/parachains/runtimes/bridge-hubs/bridge-hub-kusama/src/weights/pallet_session.rs
@@ -1,4 +1,4 @@
-// Copyright Parity Technologies (UK) Ltd.
+// Copyright (C) Parity Technologies (UK) Ltd.
 // This file is part of Cumulus.
 
 // Cumulus is free software: you can redistribute it and/or modify
diff --git a/cumulus/parachains/runtimes/bridge-hubs/bridge-hub-kusama/src/weights/pallet_timestamp.rs b/cumulus/parachains/runtimes/bridge-hubs/bridge-hub-kusama/src/weights/pallet_timestamp.rs
index 31830fbc722e69d942ace4d5cfb6dadff215480d..32f6e4a6b43598cf3b3b6a6df7a571bd38f44697 100644
--- a/cumulus/parachains/runtimes/bridge-hubs/bridge-hub-kusama/src/weights/pallet_timestamp.rs
+++ b/cumulus/parachains/runtimes/bridge-hubs/bridge-hub-kusama/src/weights/pallet_timestamp.rs
@@ -1,4 +1,4 @@
-// Copyright Parity Technologies (UK) Ltd.
+// Copyright (C) Parity Technologies (UK) Ltd.
 // This file is part of Cumulus.
 
 // Cumulus is free software: you can redistribute it and/or modify
diff --git a/cumulus/parachains/runtimes/bridge-hubs/bridge-hub-kusama/src/weights/pallet_utility.rs b/cumulus/parachains/runtimes/bridge-hubs/bridge-hub-kusama/src/weights/pallet_utility.rs
index f871f81b756f3f14cf3984b32073f59581b088d9..15b06676cd364efcd9d80361f7f7437cab032efe 100644
--- a/cumulus/parachains/runtimes/bridge-hubs/bridge-hub-kusama/src/weights/pallet_utility.rs
+++ b/cumulus/parachains/runtimes/bridge-hubs/bridge-hub-kusama/src/weights/pallet_utility.rs
@@ -1,4 +1,4 @@
-// Copyright Parity Technologies (UK) Ltd.
+// Copyright (C) Parity Technologies (UK) Ltd.
 // This file is part of Cumulus.
 
 // Cumulus is free software: you can redistribute it and/or modify
diff --git a/cumulus/parachains/runtimes/bridge-hubs/bridge-hub-kusama/src/weights/pallet_xcm.rs b/cumulus/parachains/runtimes/bridge-hubs/bridge-hub-kusama/src/weights/pallet_xcm.rs
index e2effcd36df687b9bdaac1f5a74a25f504086462..71bc583077100ecb9edfbca039a9c7b539ff6d66 100644
--- a/cumulus/parachains/runtimes/bridge-hubs/bridge-hub-kusama/src/weights/pallet_xcm.rs
+++ b/cumulus/parachains/runtimes/bridge-hubs/bridge-hub-kusama/src/weights/pallet_xcm.rs
@@ -1,4 +1,4 @@
-// Copyright Parity Technologies (UK) Ltd.
+// Copyright (C) Parity Technologies (UK) Ltd.
 // This file is part of Cumulus.
 
 // Cumulus is free software: you can redistribute it and/or modify
diff --git a/cumulus/parachains/runtimes/bridge-hubs/bridge-hub-kusama/src/weights/paritydb_weights.rs b/cumulus/parachains/runtimes/bridge-hubs/bridge-hub-kusama/src/weights/paritydb_weights.rs
index 4338d928d807a41cc60ec91d86e91c81bb253631..25679703831a13b8d1bb7fb7dd4d92fa84b1f255 100644
--- a/cumulus/parachains/runtimes/bridge-hubs/bridge-hub-kusama/src/weights/paritydb_weights.rs
+++ b/cumulus/parachains/runtimes/bridge-hubs/bridge-hub-kusama/src/weights/paritydb_weights.rs
@@ -1,6 +1,6 @@
 // This file is part of Substrate.
 
-// Copyright (C) 2022 Parity Technologies (UK) Ltd.
+// Copyright (C) Parity Technologies (UK) Ltd.
 // SPDX-License-Identifier: Apache-2.0
 
 // Licensed under the Apache License, Version 2.0 (the "License");
diff --git a/cumulus/parachains/runtimes/bridge-hubs/bridge-hub-kusama/src/weights/rocksdb_weights.rs b/cumulus/parachains/runtimes/bridge-hubs/bridge-hub-kusama/src/weights/rocksdb_weights.rs
index 1d115d963facb39fe29d6258918fda3bc8d94900..3dd817aa6f137085b0e5fdf2b11b7f50e5c8b002 100644
--- a/cumulus/parachains/runtimes/bridge-hubs/bridge-hub-kusama/src/weights/rocksdb_weights.rs
+++ b/cumulus/parachains/runtimes/bridge-hubs/bridge-hub-kusama/src/weights/rocksdb_weights.rs
@@ -1,6 +1,6 @@
 // This file is part of Substrate.
 
-// Copyright (C) 2022 Parity Technologies (UK) Ltd.
+// Copyright (C) Parity Technologies (UK) Ltd.
 // SPDX-License-Identifier: Apache-2.0
 
 // Licensed under the Apache License, Version 2.0 (the "License");
diff --git a/cumulus/parachains/runtimes/bridge-hubs/bridge-hub-kusama/src/weights/xcm/mod.rs b/cumulus/parachains/runtimes/bridge-hubs/bridge-hub-kusama/src/weights/xcm/mod.rs
index 295e222f27ac54af2ab24cc3880efae03971910c..ded5dc6702e60f4ddea9583d4b66c893f6d38b04 100644
--- a/cumulus/parachains/runtimes/bridge-hubs/bridge-hub-kusama/src/weights/xcm/mod.rs
+++ b/cumulus/parachains/runtimes/bridge-hubs/bridge-hub-kusama/src/weights/xcm/mod.rs
@@ -1,4 +1,4 @@
-// Copyright 2022 Parity Technologies (UK) Ltd.
+// Copyright (C) Parity Technologies (UK) Ltd.
 // This file is part of Cumulus.
 
 // Cumulus is free software: you can redistribute it and/or modify
@@ -61,16 +61,8 @@ impl<Call> XcmWeightInfo<Call> for BridgeHubKusamaXcmWeight<Call> {
 	fn withdraw_asset(assets: &MultiAssets) -> Weight {
 		assets.weigh_multi_assets(XcmFungibleWeight::<Runtime>::withdraw_asset())
 	}
-	// Currently there is no trusted reserve (`IsReserve = ()`),
-	// but we need this hack for `pallet_xcm::reserve_transfer_assets`
-	// (TODO) fix https://github.com/paritytech/polkadot/pull/7424
-	// (TODO) fix https://github.com/paritytech/polkadot/pull/7546
-	fn reserve_asset_deposited(_assets: &MultiAssets) -> Weight {
-		// TODO: if we change `IsReserve = ...` then use this line...
-		// TODO: or if remote weight estimation is fixed, then remove
-		// TODO: hardcoded - fix https://github.com/paritytech/cumulus/issues/1974
-		let hardcoded_weight = Weight::from_parts(1_000_000_000_u64, 0);
-		hardcoded_weight.min(XcmFungibleWeight::<Runtime>::reserve_asset_deposited())
+	fn reserve_asset_deposited(assets: &MultiAssets) -> Weight {
+		assets.weigh_multi_assets(XcmFungibleWeight::<Runtime>::reserve_asset_deposited())
 	}
 	fn receive_teleported_asset(assets: &MultiAssets) -> Weight {
 		assets.weigh_multi_assets(XcmFungibleWeight::<Runtime>::receive_teleported_asset())
@@ -127,10 +119,7 @@ impl<Call> XcmWeightInfo<Call> for BridgeHubKusamaXcmWeight<Call> {
 	}
 
 	fn deposit_asset(assets: &MultiAssetFilter, _dest: &MultiLocation) -> Weight {
-		// Hardcoded till the XCM pallet is fixed
-		let hardcoded_weight = Weight::from_parts(1_000_000_000_u64, 0);
-		let weight = assets.weigh_multi_assets(XcmFungibleWeight::<Runtime>::deposit_asset());
-		hardcoded_weight.min(weight)
+		assets.weigh_multi_assets(XcmFungibleWeight::<Runtime>::deposit_asset())
 	}
 	fn deposit_reserve_asset(
 		assets: &MultiAssetFilter,
diff --git a/cumulus/parachains/runtimes/bridge-hubs/bridge-hub-kusama/src/weights/xcm/pallet_xcm_benchmarks_fungible.rs b/cumulus/parachains/runtimes/bridge-hubs/bridge-hub-kusama/src/weights/xcm/pallet_xcm_benchmarks_fungible.rs
index 4ebc6eacb9fb081dc995336d372d5f9b9b1393dd..17ee5cb6a8dca0fbebefec1c817f16a275489260 100644
--- a/cumulus/parachains/runtimes/bridge-hubs/bridge-hub-kusama/src/weights/xcm/pallet_xcm_benchmarks_fungible.rs
+++ b/cumulus/parachains/runtimes/bridge-hubs/bridge-hub-kusama/src/weights/xcm/pallet_xcm_benchmarks_fungible.rs
@@ -1,4 +1,4 @@
-// Copyright Parity Technologies (UK) Ltd.
+// Copyright (C) Parity Technologies (UK) Ltd.
 // This file is part of Cumulus.
 
 // Cumulus is free software: you can redistribute it and/or modify
@@ -17,28 +17,26 @@
 //! Autogenerated weights for `pallet_xcm_benchmarks::fungible`
 //!
 //! THIS FILE WAS AUTO-GENERATED USING THE SUBSTRATE BENCHMARK CLI VERSION 4.0.0-dev
-//! DATE: 2023-07-31, STEPS: `50`, REPEAT: `20`, LOW RANGE: `[]`, HIGH RANGE: `[]`
+//! DATE: 2023-09-28, STEPS: `50`, REPEAT: `20`, LOW RANGE: `[]`, HIGH RANGE: `[]`
 //! WORST CASE MAP SIZE: `1000000`
-//! HOSTNAME: `runner-ynta1nyy-project-238-concurrent-0`, CPU: `Intel(R) Xeon(R) CPU @ 2.60GHz`
-//! EXECUTION: , WASM-EXECUTION: Compiled, CHAIN: Some("bridge-hub-kusama-dev"), DB CACHE: 1024
+//! HOSTNAME: `runner-nbnwcyh-project-674-concurrent-0`, CPU: `Intel(R) Xeon(R) CPU @ 2.60GHz`
+//! WASM-EXECUTION: Compiled, CHAIN: Some("bridge-hub-kusama-dev"), DB CACHE: 1024
 
 // Executed Command:
-// ./target/production/polkadot-parachain
+// target/production/polkadot-parachain
 // benchmark
 // pallet
-// --template=./templates/xcm-bench-template.hbs
-// --chain=bridge-hub-kusama-dev
-// --wasm-execution=compiled
-// --pallet=pallet_xcm_benchmarks::fungible
-// --no-storage-info
-// --no-median-slopes
-// --no-min-squares
-// --extrinsic=*
 // --steps=50
 // --repeat=20
-// --json
-// --header=./file_header.txt
-// --output=./parachains/runtimes/bridge-hubs/bridge-hub-kusama/src/weights/xcm/pallet_xcm_benchmarks_fungible.rs
+// --extrinsic=*
+// --wasm-execution=compiled
+// --heap-pages=4096
+// --json-file=/builds/parity/mirrors/polkadot-sdk/.git/.artifacts/bench.json
+// --pallet=pallet_xcm_benchmarks::fungible
+// --chain=bridge-hub-kusama-dev
+// --header=./cumulus/file_header.txt
+// --template=./cumulus/templates/xcm-bench-template.hbs
+// --output=./cumulus/parachains/runtimes/bridge-hubs/bridge-hub-kusama/src/weights/xcm/
 
 #![cfg_attr(rustfmt, rustfmt_skip)]
 #![allow(unused_parens)]
@@ -56,8 +54,8 @@ impl<T: frame_system::Config> WeightInfo<T> {
 		// Proof Size summary in bytes:
 		//  Measured:  `101`
 		//  Estimated: `3593`
-		// Minimum execution time: 24_064_000 picoseconds.
-		Weight::from_parts(24_751_000, 3593)
+		// Minimum execution time: 25_447_000 picoseconds.
+		Weight::from_parts(25_810_000, 3593)
 			.saturating_add(T::DbWeight::get().reads(1))
 			.saturating_add(T::DbWeight::get().writes(1))
 	}
@@ -67,8 +65,8 @@ impl<T: frame_system::Config> WeightInfo<T> {
 		// Proof Size summary in bytes:
 		//  Measured:  `153`
 		//  Estimated: `6196`
-		// Minimum execution time: 51_097_000 picoseconds.
-		Weight::from_parts(51_960_000, 6196)
+		// Minimum execution time: 53_908_000 picoseconds.
+		Weight::from_parts(54_568_000, 6196)
 			.saturating_add(T::DbWeight::get().reads(2))
 			.saturating_add(T::DbWeight::get().writes(2))
 	}
@@ -90,8 +88,8 @@ impl<T: frame_system::Config> WeightInfo<T> {
 		// Proof Size summary in bytes:
 		//  Measured:  `223`
 		//  Estimated: `6196`
-		// Minimum execution time: 75_319_000 picoseconds.
-		Weight::from_parts(77_356_000, 6196)
+		// Minimum execution time: 79_923_000 picoseconds.
+		Weight::from_parts(80_790_000, 6196)
 			.saturating_add(T::DbWeight::get().reads(8))
 			.saturating_add(T::DbWeight::get().writes(4))
 	}
@@ -101,8 +99,8 @@ impl<T: frame_system::Config> WeightInfo<T> {
 		// Proof Size summary in bytes:
 		//  Measured:  `0`
 		//  Estimated: `0`
-		// Minimum execution time: 500_000_000_000 picoseconds.
-		Weight::from_parts(500_000_000_000, 0)
+		// Minimum execution time: 18_446_744_073_709_551_000 picoseconds.
+		Weight::from_parts(18_446_744_073_709_551_000, 0)
 	}
 	// Storage: `ParachainInfo::ParachainId` (r:1 w:0)
 	// Proof: `ParachainInfo::ParachainId` (`max_values`: Some(1), `max_size`: Some(4), added: 499, mode: `MaxEncodedLen`)
@@ -120,8 +118,8 @@ impl<T: frame_system::Config> WeightInfo<T> {
 		// Proof Size summary in bytes:
 		//  Measured:  `70`
 		//  Estimated: `3535`
-		// Minimum execution time: 29_392_000 picoseconds.
-		Weight::from_parts(29_943_000, 3535)
+		// Minimum execution time: 31_923_000 picoseconds.
+		Weight::from_parts(32_499_000, 3535)
 			.saturating_add(T::DbWeight::get().reads(6))
 			.saturating_add(T::DbWeight::get().writes(2))
 	}
@@ -129,8 +127,8 @@ impl<T: frame_system::Config> WeightInfo<T> {
 		// Proof Size summary in bytes:
 		//  Measured:  `0`
 		//  Estimated: `0`
-		// Minimum execution time: 3_637_000 picoseconds.
-		Weight::from_parts(3_720_000, 0)
+		// Minimum execution time: 3_903_000 picoseconds.
+		Weight::from_parts(4_065_000, 0)
 	}
 	// Storage: `System::Account` (r:1 w:1)
 	// Proof: `System::Account` (`max_values`: None, `max_size`: Some(128), added: 2603, mode: `MaxEncodedLen`)
@@ -138,8 +136,8 @@ impl<T: frame_system::Config> WeightInfo<T> {
 		// Proof Size summary in bytes:
 		//  Measured:  `52`
 		//  Estimated: `3593`
-		// Minimum execution time: 25_045_000 picoseconds.
-		Weight::from_parts(25_546_000, 3593)
+		// Minimum execution time: 26_987_000 picoseconds.
+		Weight::from_parts(27_486_000, 3593)
 			.saturating_add(T::DbWeight::get().reads(1))
 			.saturating_add(T::DbWeight::get().writes(1))
 	}
@@ -161,8 +159,8 @@ impl<T: frame_system::Config> WeightInfo<T> {
 		// Proof Size summary in bytes:
 		//  Measured:  `122`
 		//  Estimated: `3593`
-		// Minimum execution time: 51_450_000 picoseconds.
-		Weight::from_parts(52_354_000, 3593)
+		// Minimum execution time: 56_012_000 picoseconds.
+		Weight::from_parts(58_067_000, 3593)
 			.saturating_add(T::DbWeight::get().reads(7))
 			.saturating_add(T::DbWeight::get().writes(3))
 	}
@@ -182,8 +180,8 @@ impl<T: frame_system::Config> WeightInfo<T> {
 		// Proof Size summary in bytes:
 		//  Measured:  `70`
 		//  Estimated: `3535`
-		// Minimum execution time: 29_711_000 picoseconds.
-		Weight::from_parts(30_759_000, 3535)
+		// Minimum execution time: 32_350_000 picoseconds.
+		Weight::from_parts(33_403_000, 3535)
 			.saturating_add(T::DbWeight::get().reads(6))
 			.saturating_add(T::DbWeight::get().writes(2))
 	}
diff --git a/cumulus/parachains/runtimes/bridge-hubs/bridge-hub-kusama/src/weights/xcm/pallet_xcm_benchmarks_generic.rs b/cumulus/parachains/runtimes/bridge-hubs/bridge-hub-kusama/src/weights/xcm/pallet_xcm_benchmarks_generic.rs
index d38d177a605c7d485130dd78bd37bb3594c110ac..b1e8107b30bbddb9e30f0bf3c648627993fa4448 100644
--- a/cumulus/parachains/runtimes/bridge-hubs/bridge-hub-kusama/src/weights/xcm/pallet_xcm_benchmarks_generic.rs
+++ b/cumulus/parachains/runtimes/bridge-hubs/bridge-hub-kusama/src/weights/xcm/pallet_xcm_benchmarks_generic.rs
@@ -1,4 +1,4 @@
-// Copyright Parity Technologies (UK) Ltd.
+// Copyright (C) Parity Technologies (UK) Ltd.
 // This file is part of Cumulus.
 
 // Cumulus is free software: you can redistribute it and/or modify
diff --git a/cumulus/parachains/runtimes/bridge-hubs/bridge-hub-kusama/src/xcm_config.rs b/cumulus/parachains/runtimes/bridge-hubs/bridge-hub-kusama/src/xcm_config.rs
index 1fcec7b6b9c5da19057279d3393be342939e18f3..ddc5fc0c4a473fe379d63de5bebf28f8df5c35f3 100644
--- a/cumulus/parachains/runtimes/bridge-hubs/bridge-hub-kusama/src/xcm_config.rs
+++ b/cumulus/parachains/runtimes/bridge-hubs/bridge-hub-kusama/src/xcm_config.rs
@@ -1,4 +1,4 @@
-// Copyright 2022 Parity Technologies (UK) Ltd.
+// Copyright (C) Parity Technologies (UK) Ltd.
 // This file is part of Cumulus.
 
 // Cumulus is free software: you can redistribute it and/or modify
@@ -24,8 +24,8 @@ use frame_support::{
 };
 use frame_system::EnsureRoot;
 use pallet_xcm::XcmPassthrough;
-use parachains_common::{impls::ToStakingPot, xcm_config::ConcreteNativeAssetFrom};
-use polkadot_parachain::primitives::Sibling;
+use parachains_common::{impls::ToStakingPot, xcm_config::ConcreteAssetFromSystem};
+use polkadot_parachain_primitives::primitives::Sibling;
 use xcm::latest::prelude::*;
 use xcm_builder::{
 	AccountId32Aliases, AllowExplicitUnpaidExecutionFrom, AllowKnownQueryResponses,
@@ -177,6 +177,10 @@ pub type Barrier = TrailingSetTopicAsId<
 	>,
 >;
 
+/// Cases where a remote origin is accepted as trusted Teleporter for a given asset:
+/// - KSM with the parent Relay Chain and sibling parachains.
+pub type TrustedTeleporters = ConcreteAssetFromSystem<KsmRelayLocation>;
+
 pub struct XcmConfig;
 impl xcm_executor::Config for XcmConfig {
 	type RuntimeCall = RuntimeCall;
@@ -186,8 +190,7 @@ impl xcm_executor::Config for XcmConfig {
 	// BridgeHub does not recognize a reserve location for any asset. Users must teleport KSM
 	// where allowed (e.g. with the Relay Chain).
 	type IsReserve = ();
-	/// Only allow teleportation of KSM.
-	type IsTeleporter = ConcreteNativeAssetFrom<KsmRelayLocation>;
+	type IsTeleporter = TrustedTeleporters;
 	type UniversalLocation = UniversalLocation;
 	type Barrier = Barrier;
 	type Weigher = WeightInfoBounds<
diff --git a/cumulus/parachains/runtimes/bridge-hubs/bridge-hub-kusama/tests/tests.rs b/cumulus/parachains/runtimes/bridge-hubs/bridge-hub-kusama/tests/tests.rs
index c9215b6157c37c6ffff820aa8d6b956c3ee5bf96..893524e12f66230f5de2a48966344b8b93f08489 100644
--- a/cumulus/parachains/runtimes/bridge-hubs/bridge-hub-kusama/tests/tests.rs
+++ b/cumulus/parachains/runtimes/bridge-hubs/bridge-hub-kusama/tests/tests.rs
@@ -1,4 +1,4 @@
-// Copyright 2023 Parity Technologies (UK) Ltd.
+// Copyright (C) Parity Technologies (UK) Ltd.
 // This file is part of Cumulus.
 
 // Cumulus is free software: you can redistribute it and/or modify
@@ -15,12 +15,12 @@
 // along with Cumulus.  If not, see <http://www.gnu.org/licenses/>.
 
 pub use bridge_hub_kusama_runtime::{
-	constants::fee::WeightToFee, xcm_config::XcmConfig, AllPalletsWithoutSystem, Balances,
-	ExistentialDeposit, ParachainSystem, PolkadotXcm, Runtime, RuntimeEvent, SessionKeys,
+	xcm_config::XcmConfig, AllPalletsWithoutSystem, Balances, ExistentialDeposit, ParachainSystem,
+	PolkadotXcm, Runtime, RuntimeEvent, SessionKeys,
 };
 use codec::Decode;
 use frame_support::parameter_types;
-use parachains_common::{AccountId, AuraId};
+use parachains_common::{kusama::fee::WeightToFee, AccountId, AuraId};
 
 const ALICE: [u8; 32] = [1u8; 32];
 
diff --git a/cumulus/parachains/runtimes/bridge-hubs/bridge-hub-polkadot/Cargo.toml b/cumulus/parachains/runtimes/bridge-hubs/bridge-hub-polkadot/Cargo.toml
index 9243f2918dbf3747b6b1dd7549c1a722fb05a114..eb0c18f5b460b0d15cb96890e219e9fe6187d8f9 100644
--- a/cumulus/parachains/runtimes/bridge-hubs/bridge-hub-polkadot/Cargo.toml
+++ b/cumulus/parachains/runtimes/bridge-hubs/bridge-hub-polkadot/Cargo.toml
@@ -1,8 +1,8 @@
 [package]
 name = "bridge-hub-polkadot-runtime"
 version = "0.1.0"
-authors = ["Parity Technologies <admin@parity.io>"]
-edition = "2021"
+authors.workspace = true
+edition.workspace = true
 description = "Polkadot's BridgeHub parachain runtime"
 
 [build-dependencies]
@@ -13,7 +13,7 @@ codec = { package = "parity-scale-codec", version = "3.0.0", default-features =
 hex-literal = { version = "0.4.1" }
 log = { version = "0.4.20", default-features = false }
 scale-info = { version = "2.9.0", default-features = false, features = ["derive"] }
-serde = { version = "1.0.183", optional = true, features = ["derive"] }
+serde = { version = "1.0.188", optional = true, features = ["derive"] }
 smallvec = "1.11.0"
 
 # Substrate
@@ -37,6 +37,7 @@ sp-api = { path = "../../../../../substrate/primitives/api", default-features =
 sp-block-builder = { path = "../../../../../substrate/primitives/block-builder", default-features = false}
 sp-consensus-aura = { path = "../../../../../substrate/primitives/consensus/aura", default-features = false}
 sp-core = { path = "../../../../../substrate/primitives/core", default-features = false}
+sp-genesis-builder = { path = "../../../../../substrate/primitives/genesis-builder", default-features = false }
 sp-inherents = { path = "../../../../../substrate/primitives/inherents", default-features = false}
 sp-io = { path = "../../../../../substrate/primitives/io", default-features = false}
 sp-offchain = { path = "../../../../../substrate/primitives/offchain", default-features = false}
@@ -48,15 +49,14 @@ sp-transaction-pool = { path = "../../../../../substrate/primitives/transaction-
 sp-version = { path = "../../../../../substrate/primitives/version", default-features = false}
 
 # Polkadot
-polkadot-runtime-constants = { path = "../../../../../polkadot/runtime/polkadot/constants", default-features = false}
 pallet-xcm = { path = "../../../../../polkadot/xcm/pallet-xcm", default-features = false}
 pallet-xcm-benchmarks = { path = "../../../../../polkadot/xcm/pallet-xcm-benchmarks", default-features = false, optional = true }
 polkadot-core-primitives = { path = "../../../../../polkadot/core-primitives", default-features = false}
-polkadot-parachain = { path = "../../../../../polkadot/parachain", default-features = false}
+polkadot-parachain-primitives = { path = "../../../../../polkadot/parachain", default-features = false}
 polkadot-runtime-common = { path = "../../../../../polkadot/runtime/common", default-features = false}
-xcm = { path = "../../../../../polkadot/xcm", default-features = false}
-xcm-builder = { path = "../../../../../polkadot/xcm/xcm-builder", default-features = false}
-xcm-executor = { path = "../../../../../polkadot/xcm/xcm-executor", default-features = false}
+xcm = { package = "staging-xcm", path = "../../../../../polkadot/xcm", default-features = false}
+xcm-builder = { package = "staging-xcm-builder", path = "../../../../../polkadot/xcm/xcm-builder", default-features = false}
+xcm-executor = { package = "staging-xcm-executor", path = "../../../../../polkadot/xcm/xcm-executor", default-features = false}
 
 # Cumulus
 cumulus-pallet-aura-ext = { path = "../../../../pallets/aura-ext", default-features = false }
@@ -81,14 +81,18 @@ std = [
 	"cumulus-pallet-aura-ext/std",
 	"cumulus-pallet-dmp-queue/std",
 	"cumulus-pallet-parachain-system/std",
+	"cumulus-pallet-session-benchmarking/std",
 	"cumulus-pallet-xcm/std",
 	"cumulus-pallet-xcmp-queue/std",
 	"cumulus-primitives-core/std",
 	"cumulus-primitives-utility/std",
+	"frame-benchmarking?/std",
 	"frame-executive/std",
 	"frame-support/std",
+	"frame-system-benchmarking?/std",
 	"frame-system-rpc-runtime-api/std",
 	"frame-system/std",
+	"frame-try-runtime?/std",
 	"log/std",
 	"pallet-aura/std",
 	"pallet-authorship/std",
@@ -100,25 +104,27 @@ std = [
 	"pallet-transaction-payment-rpc-runtime-api/std",
 	"pallet-transaction-payment/std",
 	"pallet-utility/std",
+	"pallet-xcm-benchmarks?/std",
 	"pallet-xcm/std",
 	"parachain-info/std",
 	"parachains-common/std",
 	"polkadot-core-primitives/std",
-	"polkadot-parachain/std",
+	"polkadot-parachain-primitives/std",
 	"polkadot-runtime-common/std",
-	"polkadot-runtime-constants/std",
 	"scale-info/std",
 	"serde",
 	"sp-api/std",
 	"sp-block-builder/std",
 	"sp-consensus-aura/std",
 	"sp-core/std",
+	"sp-genesis-builder/std",
 	"sp-inherents/std",
 	"sp-io/std",
 	"sp-offchain/std",
 	"sp-runtime/std",
 	"sp-session/std",
 	"sp-std/std",
+	"sp-storage/std",
 	"sp-transaction-pool/std",
 	"sp-version/std",
 	"substrate-wasm-builder",
@@ -131,6 +137,7 @@ runtime-benchmarks = [
 	"cumulus-pallet-parachain-system/runtime-benchmarks",
 	"cumulus-pallet-session-benchmarking/runtime-benchmarks",
 	"cumulus-pallet-xcmp-queue/runtime-benchmarks",
+	"cumulus-primitives-utility/runtime-benchmarks",
 	"frame-benchmarking/runtime-benchmarks",
 	"frame-support/runtime-benchmarks",
 	"frame-system-benchmarking/runtime-benchmarks",
@@ -142,8 +149,12 @@ runtime-benchmarks = [
 	"pallet-utility/runtime-benchmarks",
 	"pallet-xcm-benchmarks/runtime-benchmarks",
 	"pallet-xcm/runtime-benchmarks",
+	"parachains-common/runtime-benchmarks",
+	"polkadot-parachain-primitives/runtime-benchmarks",
+	"polkadot-runtime-common/runtime-benchmarks",
 	"sp-runtime/runtime-benchmarks",
 	"xcm-builder/runtime-benchmarks",
+	"xcm-executor/runtime-benchmarks",
 ]
 
 try-runtime = [
@@ -153,6 +164,7 @@ try-runtime = [
 	"cumulus-pallet-xcm/try-runtime",
 	"cumulus-pallet-xcmp-queue/try-runtime",
 	"frame-executive/try-runtime",
+	"frame-support/try-runtime",
 	"frame-system/try-runtime",
 	"frame-try-runtime/try-runtime",
 	"pallet-aura/try-runtime",
@@ -166,6 +178,8 @@ try-runtime = [
 	"pallet-utility/try-runtime",
 	"pallet-xcm/try-runtime",
 	"parachain-info/try-runtime",
+	"polkadot-runtime-common/try-runtime",
+	"sp-runtime/try-runtime",
 ]
 
 experimental = [ "pallet-aura/experimental" ]
diff --git a/cumulus/parachains/runtimes/bridge-hubs/bridge-hub-polkadot/src/constants.rs b/cumulus/parachains/runtimes/bridge-hubs/bridge-hub-polkadot/src/constants.rs
deleted file mode 100644
index a42c3e4f85d2a061639a95ac6866df0e07700a28..0000000000000000000000000000000000000000
--- a/cumulus/parachains/runtimes/bridge-hubs/bridge-hub-polkadot/src/constants.rs
+++ /dev/null
@@ -1,117 +0,0 @@
-// Copyright (C) 2023 Parity Technologies (UK) Ltd.
-// SPDX-License-Identifier: Apache-2.0
-
-// Licensed under the Apache License, Version 2.0 (the "License");
-// you may not use this file except in compliance with the License.
-// You may obtain a copy of the License at
-//
-// 	http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the License is distributed on an "AS IS" BASIS,
-// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-// See the License for the specific language governing permissions and
-// limitations under the License.
-
-pub mod currency {
-	use polkadot_core_primitives::Balance;
-	use polkadot_runtime_constants as constants;
-
-	/// The existential deposit. Set to 1/10 of its parent Relay Chain.
-	pub const EXISTENTIAL_DEPOSIT: Balance = constants::currency::EXISTENTIAL_DEPOSIT / 10;
-
-	pub const UNITS: Balance = constants::currency::UNITS;
-	pub const CENTS: Balance = constants::currency::CENTS;
-	pub const MILLICENTS: Balance = constants::currency::MILLICENTS;
-
-	pub const fn deposit(items: u32, bytes: u32) -> Balance {
-		// 1/100 of Polkadot
-		constants::currency::deposit(items, bytes) / 100
-	}
-}
-
-/// Fee-related.
-pub mod fee {
-	use frame_support::{
-		pallet_prelude::Weight,
-		weights::{
-			constants::ExtrinsicBaseWeight, FeePolynomial, WeightToFeeCoefficient,
-			WeightToFeeCoefficients, WeightToFeePolynomial,
-		},
-	};
-	use polkadot_core_primitives::Balance;
-	use smallvec::smallvec;
-	pub use sp_runtime::Perbill;
-
-	/// Handles converting a weight scalar to a fee value, based on the scale and granularity of the
-	/// node's balance type.
-	///
-	/// This should typically create a mapping between the following ranges:
-	///   - [0, MAXIMUM_BLOCK_WEIGHT]
-	///   - [Balance::min, Balance::max]
-	///
-	/// Yet, it can be used for any other sort of change to weight-fee. Some examples being:
-	///   - Setting it to `0` will essentially disable the weight fee.
-	///   - Setting it to `1` will cause the literal `#[weight = x]` values to be charged.
-	pub struct WeightToFee;
-	impl frame_support::weights::WeightToFee for WeightToFee {
-		type Balance = Balance;
-
-		fn weight_to_fee(weight: &Weight) -> Self::Balance {
-			let time_poly: FeePolynomial<Balance> = RefTimeToFee::polynomial().into();
-			let proof_poly: FeePolynomial<Balance> = ProofSizeToFee::polynomial().into();
-
-			// Take the maximum instead of the sum to charge by the more scarce resource.
-			time_poly.eval(weight.ref_time()).max(proof_poly.eval(weight.proof_size()))
-		}
-	}
-
-	/// Maps the reference time component of `Weight` to a fee.
-	pub struct RefTimeToFee;
-	impl WeightToFeePolynomial for RefTimeToFee {
-		type Balance = Balance;
-		fn polynomial() -> WeightToFeeCoefficients<Self::Balance> {
-			// in Polkadot, extrinsic base weight (smallest non-zero weight) is mapped to 1/10 CENT:
-			// in Bridge Hub, we map to 1/10 of that, or 1/100 CENT
-			let p = super::currency::CENTS;
-			let q = 100 * Balance::from(ExtrinsicBaseWeight::get().ref_time());
-
-			smallvec![WeightToFeeCoefficient {
-				degree: 1,
-				negative: false,
-				coeff_frac: Perbill::from_rational(p % q, q),
-				coeff_integer: p / q,
-			}]
-		}
-	}
-
-	/// Maps the proof size component of `Weight` to a fee.
-	pub struct ProofSizeToFee;
-	impl WeightToFeePolynomial for ProofSizeToFee {
-		type Balance = Balance;
-		fn polynomial() -> WeightToFeeCoefficients<Self::Balance> {
-			// Map 10kb proof to 1 CENT.
-			let p = super::currency::CENTS;
-			let q = 10_000;
-
-			smallvec![WeightToFeeCoefficient {
-				degree: 1,
-				negative: false,
-				coeff_frac: Perbill::from_rational(p % q, q),
-				coeff_integer: p / q,
-			}]
-		}
-	}
-}
-
-/// Consensus-related.
-pub mod consensus {
-	/// Maximum number of blocks simultaneously accepted by the Runtime, not yet included
-	/// into the relay chain.
-	pub const UNINCLUDED_SEGMENT_CAPACITY: u32 = 1;
-	/// How many parachain blocks are processed by the relay chain per parent. Limits the
-	/// number of blocks authored per slot.
-	pub const BLOCK_PROCESSING_VELOCITY: u32 = 1;
-	/// Relay chain slot duration, in milliseconds.
-	pub const RELAY_CHAIN_SLOT_DURATION_MILLIS: u32 = 6000;
-}
diff --git a/cumulus/parachains/runtimes/bridge-hubs/bridge-hub-polkadot/src/lib.rs b/cumulus/parachains/runtimes/bridge-hubs/bridge-hub-polkadot/src/lib.rs
index 0a6bddb225717341d7c6c2abcf745160b59c825e..928b9d091ec5bf85a69582794dd23e933637eccf 100644
--- a/cumulus/parachains/runtimes/bridge-hubs/bridge-hub-polkadot/src/lib.rs
+++ b/cumulus/parachains/runtimes/bridge-hubs/bridge-hub-polkadot/src/lib.rs
@@ -1,4 +1,4 @@
-// Copyright 2023 Parity Technologies (UK) Ltd.
+// Copyright (C) Parity Technologies (UK) Ltd.
 // This file is part of Cumulus.
 
 // Cumulus is free software: you can redistribute it and/or modify
@@ -22,7 +22,6 @@
 #[cfg(feature = "std")]
 include!(concat!(env!("OUT_DIR"), "/wasm_binary.rs"));
 
-pub mod constants;
 mod weights;
 pub mod xcm_config;
 
@@ -41,10 +40,10 @@ use sp_std::prelude::*;
 use sp_version::NativeVersion;
 use sp_version::RuntimeVersion;
 
-use constants::{consensus::*, currency::*, fee::WeightToFee};
 use frame_support::{
 	construct_runtime,
 	dispatch::DispatchClass,
+	genesis_builder_helper::{build_config, create_default_config},
 	parameter_types,
 	traits::{ConstBool, ConstU32, ConstU64, ConstU8, EitherOfDiverse, Everything},
 	weights::{ConstantMultiplier, Weight},
@@ -70,8 +69,10 @@ use polkadot_runtime_common::{BlockHashCount, SlowAdjustingFeeUpdate};
 use weights::{BlockExecutionWeight, ExtrinsicBaseWeight, RocksDbWeight};
 
 use parachains_common::{
-	impls::DealWithFees, AccountId, Balance, BlockNumber, Hash, Header, Nonce, Signature,
-	AVERAGE_ON_INITIALIZE_RATIO, HOURS, MAXIMUM_BLOCK_WEIGHT, NORMAL_DISPATCH_RATIO, SLOT_DURATION,
+	impls::DealWithFees,
+	polkadot::{consensus::*, currency::*, fee::WeightToFee},
+	AccountId, Balance, BlockNumber, Hash, Header, Nonce, Signature, AVERAGE_ON_INITIALIZE_RATIO,
+	HOURS, MAXIMUM_BLOCK_WEIGHT, NORMAL_DISPATCH_RATIO, SLOT_DURATION,
 };
 // XCM Imports
 use xcm::latest::prelude::BodyId;
@@ -779,6 +780,16 @@ impl_runtime_apis! {
 			Ok(batches)
 		}
 	}
+
+	impl sp_genesis_builder::GenesisBuilder<Block> for Runtime {
+		fn create_default_config() -> Vec<u8> {
+			create_default_config::<RuntimeGenesisConfig>()
+		}
+
+		fn build_config(config: Vec<u8>) -> sp_genesis_builder::Result {
+			build_config::<RuntimeGenesisConfig>(config)
+		}
+	}
 }
 
 cumulus_pallet_parachain_system::register_validate_block! {
diff --git a/cumulus/parachains/runtimes/bridge-hubs/bridge-hub-polkadot/src/weights/block_weights.rs b/cumulus/parachains/runtimes/bridge-hubs/bridge-hub-polkadot/src/weights/block_weights.rs
index 2bd7975bf98c36996520716c9dc11822d8287234..e7fdb2aae2a01ec06076de83d94817e540e205dd 100644
--- a/cumulus/parachains/runtimes/bridge-hubs/bridge-hub-polkadot/src/weights/block_weights.rs
+++ b/cumulus/parachains/runtimes/bridge-hubs/bridge-hub-polkadot/src/weights/block_weights.rs
@@ -1,6 +1,6 @@
 // This file is part of Substrate.
 
-// Copyright (C) 2023 Parity Technologies (UK) Ltd.
+// Copyright (C) Parity Technologies (UK) Ltd.
 // SPDX-License-Identifier: Apache-2.0
 
 // Licensed under the Apache License, Version 2.0 (the "License");
diff --git a/cumulus/parachains/runtimes/bridge-hubs/bridge-hub-polkadot/src/weights/cumulus_pallet_xcmp_queue.rs b/cumulus/parachains/runtimes/bridge-hubs/bridge-hub-polkadot/src/weights/cumulus_pallet_xcmp_queue.rs
index 740c3e9dd0a189ccefdc54a20763bfcb2e036816..98834cc44e880e432c13c4b1b3d8a5dfe3cbf624 100644
--- a/cumulus/parachains/runtimes/bridge-hubs/bridge-hub-polkadot/src/weights/cumulus_pallet_xcmp_queue.rs
+++ b/cumulus/parachains/runtimes/bridge-hubs/bridge-hub-polkadot/src/weights/cumulus_pallet_xcmp_queue.rs
@@ -1,4 +1,4 @@
-// Copyright Parity Technologies (UK) Ltd.
+// Copyright (C) Parity Technologies (UK) Ltd.
 // This file is part of Cumulus.
 
 // Cumulus is free software: you can redistribute it and/or modify
diff --git a/cumulus/parachains/runtimes/bridge-hubs/bridge-hub-polkadot/src/weights/extrinsic_weights.rs b/cumulus/parachains/runtimes/bridge-hubs/bridge-hub-polkadot/src/weights/extrinsic_weights.rs
index 898d72ec5b19519a77ec0b75bb65d757213b35d4..1a4adb968bb7195428ea00d59cd92dcd3b6eea5f 100644
--- a/cumulus/parachains/runtimes/bridge-hubs/bridge-hub-polkadot/src/weights/extrinsic_weights.rs
+++ b/cumulus/parachains/runtimes/bridge-hubs/bridge-hub-polkadot/src/weights/extrinsic_weights.rs
@@ -1,6 +1,6 @@
 // This file is part of Substrate.
 
-// Copyright (C) 2023 Parity Technologies (UK) Ltd.
+// Copyright (C) Parity Technologies (UK) Ltd.
 // SPDX-License-Identifier: Apache-2.0
 
 // Licensed under the Apache License, Version 2.0 (the "License");
diff --git a/cumulus/parachains/runtimes/bridge-hubs/bridge-hub-polkadot/src/weights/frame_system.rs b/cumulus/parachains/runtimes/bridge-hubs/bridge-hub-polkadot/src/weights/frame_system.rs
index 62883b2d9073faf1a68cd69bc07b7af64145caf5..4aeb4660d8786b81100e26f1309dc2be8898e874 100644
--- a/cumulus/parachains/runtimes/bridge-hubs/bridge-hub-polkadot/src/weights/frame_system.rs
+++ b/cumulus/parachains/runtimes/bridge-hubs/bridge-hub-polkadot/src/weights/frame_system.rs
@@ -1,4 +1,4 @@
-// Copyright Parity Technologies (UK) Ltd.
+// Copyright (C) Parity Technologies (UK) Ltd.
 // This file is part of Cumulus.
 
 // Cumulus is free software: you can redistribute it and/or modify
diff --git a/cumulus/parachains/runtimes/bridge-hubs/bridge-hub-polkadot/src/weights/mod.rs b/cumulus/parachains/runtimes/bridge-hubs/bridge-hub-polkadot/src/weights/mod.rs
index 457d00f36bd9ab44b2a72828eee6d2fc81a3e495..e226021e77ab58d51bda2eaa23ff732d53e7f4cb 100644
--- a/cumulus/parachains/runtimes/bridge-hubs/bridge-hub-polkadot/src/weights/mod.rs
+++ b/cumulus/parachains/runtimes/bridge-hubs/bridge-hub-polkadot/src/weights/mod.rs
@@ -1,6 +1,6 @@
 // This file is part of Substrate.
 
-// Copyright (C) 2023 Parity Technologies (UK) Ltd.
+// Copyright (C) Parity Technologies (UK) Ltd.
 // SPDX-License-Identifier: Apache-2.0
 
 // Licensed under the Apache License, Version 2.0 (the "License");
diff --git a/cumulus/parachains/runtimes/bridge-hubs/bridge-hub-polkadot/src/weights/pallet_balances.rs b/cumulus/parachains/runtimes/bridge-hubs/bridge-hub-polkadot/src/weights/pallet_balances.rs
index d58126b3fd61aa6bfb2e8498b51d5d496f73d251..5abe64bb411750f714e65038a2c750932240f2f7 100644
--- a/cumulus/parachains/runtimes/bridge-hubs/bridge-hub-polkadot/src/weights/pallet_balances.rs
+++ b/cumulus/parachains/runtimes/bridge-hubs/bridge-hub-polkadot/src/weights/pallet_balances.rs
@@ -1,4 +1,4 @@
-// Copyright Parity Technologies (UK) Ltd.
+// Copyright (C) Parity Technologies (UK) Ltd.
 // This file is part of Cumulus.
 
 // Cumulus is free software: you can redistribute it and/or modify
diff --git a/cumulus/parachains/runtimes/bridge-hubs/bridge-hub-polkadot/src/weights/pallet_collator_selection.rs b/cumulus/parachains/runtimes/bridge-hubs/bridge-hub-polkadot/src/weights/pallet_collator_selection.rs
index 0b153be27193d75b5a135278b4cca96520ccce5e..e0f4156fe4d4c4d3f31229bdaa6308456a5cabb7 100644
--- a/cumulus/parachains/runtimes/bridge-hubs/bridge-hub-polkadot/src/weights/pallet_collator_selection.rs
+++ b/cumulus/parachains/runtimes/bridge-hubs/bridge-hub-polkadot/src/weights/pallet_collator_selection.rs
@@ -1,4 +1,4 @@
-// Copyright Parity Technologies (UK) Ltd.
+// Copyright (C) Parity Technologies (UK) Ltd.
 // This file is part of Cumulus.
 
 // Cumulus is free software: you can redistribute it and/or modify
diff --git a/cumulus/parachains/runtimes/bridge-hubs/bridge-hub-polkadot/src/weights/pallet_multisig.rs b/cumulus/parachains/runtimes/bridge-hubs/bridge-hub-polkadot/src/weights/pallet_multisig.rs
index 9984823b1c16ae6a232c30fa4edfac5d91d9b198..4625c4f474ea2f807652e549898a0f38be510554 100644
--- a/cumulus/parachains/runtimes/bridge-hubs/bridge-hub-polkadot/src/weights/pallet_multisig.rs
+++ b/cumulus/parachains/runtimes/bridge-hubs/bridge-hub-polkadot/src/weights/pallet_multisig.rs
@@ -1,4 +1,4 @@
-// Copyright Parity Technologies (UK) Ltd.
+// Copyright (C) Parity Technologies (UK) Ltd.
 // This file is part of Cumulus.
 
 // Cumulus is free software: you can redistribute it and/or modify
diff --git a/cumulus/parachains/runtimes/bridge-hubs/bridge-hub-polkadot/src/weights/pallet_session.rs b/cumulus/parachains/runtimes/bridge-hubs/bridge-hub-polkadot/src/weights/pallet_session.rs
index 3b74d0afd189d112ddb3f6a767118e4184487307..29bc576ebc80d13e02f52837a5eae57436f278ff 100644
--- a/cumulus/parachains/runtimes/bridge-hubs/bridge-hub-polkadot/src/weights/pallet_session.rs
+++ b/cumulus/parachains/runtimes/bridge-hubs/bridge-hub-polkadot/src/weights/pallet_session.rs
@@ -1,4 +1,4 @@
-// Copyright Parity Technologies (UK) Ltd.
+// Copyright (C) Parity Technologies (UK) Ltd.
 // This file is part of Cumulus.
 
 // Cumulus is free software: you can redistribute it and/or modify
diff --git a/cumulus/parachains/runtimes/bridge-hubs/bridge-hub-polkadot/src/weights/pallet_timestamp.rs b/cumulus/parachains/runtimes/bridge-hubs/bridge-hub-polkadot/src/weights/pallet_timestamp.rs
index fdb3c2ac9596999d30f0c8398c882a1ce7b66ea2..8252834cc11e3cebb131332a92ffc80d25921dd4 100644
--- a/cumulus/parachains/runtimes/bridge-hubs/bridge-hub-polkadot/src/weights/pallet_timestamp.rs
+++ b/cumulus/parachains/runtimes/bridge-hubs/bridge-hub-polkadot/src/weights/pallet_timestamp.rs
@@ -1,4 +1,4 @@
-// Copyright Parity Technologies (UK) Ltd.
+// Copyright (C) Parity Technologies (UK) Ltd.
 // This file is part of Cumulus.
 
 // Cumulus is free software: you can redistribute it and/or modify
diff --git a/cumulus/parachains/runtimes/bridge-hubs/bridge-hub-polkadot/src/weights/pallet_utility.rs b/cumulus/parachains/runtimes/bridge-hubs/bridge-hub-polkadot/src/weights/pallet_utility.rs
index a7b31d3d38530ef685410dd83d5d41835b2de131..5205e9fff8593dda91a9f4b1433c1c5ff4fb3e55 100644
--- a/cumulus/parachains/runtimes/bridge-hubs/bridge-hub-polkadot/src/weights/pallet_utility.rs
+++ b/cumulus/parachains/runtimes/bridge-hubs/bridge-hub-polkadot/src/weights/pallet_utility.rs
@@ -1,4 +1,4 @@
-// Copyright Parity Technologies (UK) Ltd.
+// Copyright (C) Parity Technologies (UK) Ltd.
 // This file is part of Cumulus.
 
 // Cumulus is free software: you can redistribute it and/or modify
diff --git a/cumulus/parachains/runtimes/bridge-hubs/bridge-hub-polkadot/src/weights/pallet_xcm.rs b/cumulus/parachains/runtimes/bridge-hubs/bridge-hub-polkadot/src/weights/pallet_xcm.rs
index c9e13f2bdb2fdb488ec3862044fa3a5406111f49..ffc5fa2fc23ed2c4cb5a0624866dc800ab5ae1e3 100644
--- a/cumulus/parachains/runtimes/bridge-hubs/bridge-hub-polkadot/src/weights/pallet_xcm.rs
+++ b/cumulus/parachains/runtimes/bridge-hubs/bridge-hub-polkadot/src/weights/pallet_xcm.rs
@@ -1,4 +1,4 @@
-// Copyright Parity Technologies (UK) Ltd.
+// Copyright (C) Parity Technologies (UK) Ltd.
 // This file is part of Cumulus.
 
 // Cumulus is free software: you can redistribute it and/or modify
diff --git a/cumulus/parachains/runtimes/bridge-hubs/bridge-hub-polkadot/src/weights/paritydb_weights.rs b/cumulus/parachains/runtimes/bridge-hubs/bridge-hub-polkadot/src/weights/paritydb_weights.rs
index 1c6d2ebe568cc81e91167ec723102eebde49259c..25679703831a13b8d1bb7fb7dd4d92fa84b1f255 100644
--- a/cumulus/parachains/runtimes/bridge-hubs/bridge-hub-polkadot/src/weights/paritydb_weights.rs
+++ b/cumulus/parachains/runtimes/bridge-hubs/bridge-hub-polkadot/src/weights/paritydb_weights.rs
@@ -1,6 +1,6 @@
 // This file is part of Substrate.
 
-// Copyright (C) 2023 Parity Technologies (UK) Ltd.
+// Copyright (C) Parity Technologies (UK) Ltd.
 // SPDX-License-Identifier: Apache-2.0
 
 // Licensed under the Apache License, Version 2.0 (the "License");
diff --git a/cumulus/parachains/runtimes/bridge-hubs/bridge-hub-polkadot/src/weights/rocksdb_weights.rs b/cumulus/parachains/runtimes/bridge-hubs/bridge-hub-polkadot/src/weights/rocksdb_weights.rs
index aa0cb2b4bc377bae5bce9b18cbb78820c91f344d..3dd817aa6f137085b0e5fdf2b11b7f50e5c8b002 100644
--- a/cumulus/parachains/runtimes/bridge-hubs/bridge-hub-polkadot/src/weights/rocksdb_weights.rs
+++ b/cumulus/parachains/runtimes/bridge-hubs/bridge-hub-polkadot/src/weights/rocksdb_weights.rs
@@ -1,6 +1,6 @@
 // This file is part of Substrate.
 
-// Copyright (C) 2023 Parity Technologies (UK) Ltd.
+// Copyright (C) Parity Technologies (UK) Ltd.
 // SPDX-License-Identifier: Apache-2.0
 
 // Licensed under the Apache License, Version 2.0 (the "License");
diff --git a/cumulus/parachains/runtimes/bridge-hubs/bridge-hub-polkadot/src/weights/xcm/mod.rs b/cumulus/parachains/runtimes/bridge-hubs/bridge-hub-polkadot/src/weights/xcm/mod.rs
index 4d7b626cb72536b739da3c1ef209890d3ea9ed74..7e9f21842725ecef79df3305b9f708d3516d8faf 100644
--- a/cumulus/parachains/runtimes/bridge-hubs/bridge-hub-polkadot/src/weights/xcm/mod.rs
+++ b/cumulus/parachains/runtimes/bridge-hubs/bridge-hub-polkadot/src/weights/xcm/mod.rs
@@ -1,4 +1,4 @@
-// Copyright 2023 Parity Technologies (UK) Ltd.
+// Copyright (C) Parity Technologies (UK) Ltd.
 // This file is part of Cumulus.
 
 // Cumulus is free software: you can redistribute it and/or modify
@@ -61,16 +61,8 @@ impl<Call> XcmWeightInfo<Call> for BridgeHubPolkadotXcmWeight<Call> {
 	fn withdraw_asset(assets: &MultiAssets) -> Weight {
 		assets.weigh_multi_assets(XcmFungibleWeight::<Runtime>::withdraw_asset())
 	}
-	// Currently there is no trusted reserve (`IsReserve = ()`),
-	// but we need this hack for `pallet_xcm::reserve_transfer_assets`
-	// (TODO) fix https://github.com/paritytech/polkadot/pull/7424
-	// (TODO) fix https://github.com/paritytech/polkadot/pull/7546
-	fn reserve_asset_deposited(_assets: &MultiAssets) -> Weight {
-		// TODO: if we change `IsReserve = ...` then use this line...
-		// TODO: or if remote weight estimation is fixed, then remove
-		// TODO: hardcoded - fix https://github.com/paritytech/cumulus/issues/1974
-		let hardcoded_weight = Weight::from_parts(1_000_000_000_u64, 0);
-		hardcoded_weight.min(XcmFungibleWeight::<Runtime>::reserve_asset_deposited())
+	fn reserve_asset_deposited(assets: &MultiAssets) -> Weight {
+		assets.weigh_multi_assets(XcmFungibleWeight::<Runtime>::reserve_asset_deposited())
 	}
 	fn receive_teleported_asset(assets: &MultiAssets) -> Weight {
 		assets.weigh_multi_assets(XcmFungibleWeight::<Runtime>::receive_teleported_asset())
@@ -127,10 +119,7 @@ impl<Call> XcmWeightInfo<Call> for BridgeHubPolkadotXcmWeight<Call> {
 	}
 
 	fn deposit_asset(assets: &MultiAssetFilter, _dest: &MultiLocation) -> Weight {
-		// Hardcoded till the XCM pallet is fixed
-		let hardcoded_weight = Weight::from_parts(1_000_000_000_u64, 0);
-		let weight = assets.weigh_multi_assets(XcmFungibleWeight::<Runtime>::deposit_asset());
-		hardcoded_weight.min(weight)
+		assets.weigh_multi_assets(XcmFungibleWeight::<Runtime>::deposit_asset())
 	}
 	fn deposit_reserve_asset(
 		assets: &MultiAssetFilter,
@@ -154,10 +143,7 @@ impl<Call> XcmWeightInfo<Call> for BridgeHubPolkadotXcmWeight<Call> {
 		_dest: &MultiLocation,
 		_xcm: &Xcm<()>,
 	) -> Weight {
-		// Hardcoded till the XCM pallet is fixed
-		let hardcoded_weight = Weight::from_parts(200_000_000_u64, 0);
-		let weight = assets.weigh_multi_assets(XcmFungibleWeight::<Runtime>::initiate_teleport());
-		hardcoded_weight.min(weight)
+		assets.weigh_multi_assets(XcmFungibleWeight::<Runtime>::initiate_teleport())
 	}
 	fn report_holding(_response_info: &QueryResponseInfo, _assets: &MultiAssetFilter) -> Weight {
 		XcmGeneric::<Runtime>::report_holding()
diff --git a/cumulus/parachains/runtimes/bridge-hubs/bridge-hub-polkadot/src/weights/xcm/pallet_xcm_benchmarks_fungible.rs b/cumulus/parachains/runtimes/bridge-hubs/bridge-hub-polkadot/src/weights/xcm/pallet_xcm_benchmarks_fungible.rs
index b02cfcbf75f3c2075fd26b9af80e04f46427bc47..f45f3936365281c8d592c4a79d8974fb8d468a90 100644
--- a/cumulus/parachains/runtimes/bridge-hubs/bridge-hub-polkadot/src/weights/xcm/pallet_xcm_benchmarks_fungible.rs
+++ b/cumulus/parachains/runtimes/bridge-hubs/bridge-hub-polkadot/src/weights/xcm/pallet_xcm_benchmarks_fungible.rs
@@ -1,4 +1,4 @@
-// Copyright Parity Technologies (UK) Ltd.
+// Copyright (C) Parity Technologies (UK) Ltd.
 // This file is part of Cumulus.
 
 // Cumulus is free software: you can redistribute it and/or modify
@@ -17,28 +17,26 @@
 //! Autogenerated weights for `pallet_xcm_benchmarks::fungible`
 //!
 //! THIS FILE WAS AUTO-GENERATED USING THE SUBSTRATE BENCHMARK CLI VERSION 4.0.0-dev
-//! DATE: 2023-07-31, STEPS: `50`, REPEAT: `20`, LOW RANGE: `[]`, HIGH RANGE: `[]`
+//! DATE: 2023-09-28, STEPS: `50`, REPEAT: `20`, LOW RANGE: `[]`, HIGH RANGE: `[]`
 //! WORST CASE MAP SIZE: `1000000`
-//! HOSTNAME: `runner-ynta1nyy-project-238-concurrent-0`, CPU: `Intel(R) Xeon(R) CPU @ 2.60GHz`
-//! EXECUTION: , WASM-EXECUTION: Compiled, CHAIN: Some("bridge-hub-polkadot-dev"), DB CACHE: 1024
+//! HOSTNAME: `runner-nbnwcyh-project-674-concurrent-0`, CPU: `Intel(R) Xeon(R) CPU @ 2.60GHz`
+//! WASM-EXECUTION: Compiled, CHAIN: Some("bridge-hub-polkadot-dev"), DB CACHE: 1024
 
 // Executed Command:
-// ./target/production/polkadot-parachain
+// target/production/polkadot-parachain
 // benchmark
 // pallet
-// --template=./templates/xcm-bench-template.hbs
-// --chain=bridge-hub-polkadot-dev
-// --wasm-execution=compiled
-// --pallet=pallet_xcm_benchmarks::fungible
-// --no-storage-info
-// --no-median-slopes
-// --no-min-squares
-// --extrinsic=*
 // --steps=50
 // --repeat=20
-// --json
-// --header=./file_header.txt
-// --output=./parachains/runtimes/bridge-hubs/bridge-hub-polkadot/src/weights/xcm/pallet_xcm_benchmarks_fungible.rs
+// --extrinsic=*
+// --wasm-execution=compiled
+// --heap-pages=4096
+// --json-file=/builds/parity/mirrors/polkadot-sdk/.git/.artifacts/bench.json
+// --pallet=pallet_xcm_benchmarks::fungible
+// --chain=bridge-hub-polkadot-dev
+// --header=./cumulus/file_header.txt
+// --template=./cumulus/templates/xcm-bench-template.hbs
+// --output=./cumulus/parachains/runtimes/bridge-hubs/bridge-hub-polkadot/src/weights/xcm/
 
 #![cfg_attr(rustfmt, rustfmt_skip)]
 #![allow(unused_parens)]
@@ -56,8 +54,8 @@ impl<T: frame_system::Config> WeightInfo<T> {
 		// Proof Size summary in bytes:
 		//  Measured:  `101`
 		//  Estimated: `3593`
-		// Minimum execution time: 23_862_000 picoseconds.
-		Weight::from_parts(24_603_000, 3593)
+		// Minimum execution time: 24_237_000 picoseconds.
+		Weight::from_parts(24_697_000, 3593)
 			.saturating_add(T::DbWeight::get().reads(1))
 			.saturating_add(T::DbWeight::get().writes(1))
 	}
@@ -67,8 +65,8 @@ impl<T: frame_system::Config> WeightInfo<T> {
 		// Proof Size summary in bytes:
 		//  Measured:  `153`
 		//  Estimated: `6196`
-		// Minimum execution time: 51_101_000 picoseconds.
-		Weight::from_parts(51_976_000, 6196)
+		// Minimum execution time: 52_269_000 picoseconds.
+		Weight::from_parts(53_848_000, 6196)
 			.saturating_add(T::DbWeight::get().reads(2))
 			.saturating_add(T::DbWeight::get().writes(2))
 	}
@@ -90,8 +88,8 @@ impl<T: frame_system::Config> WeightInfo<T> {
 		// Proof Size summary in bytes:
 		//  Measured:  `223`
 		//  Estimated: `6196`
-		// Minimum execution time: 72_983_000 picoseconds.
-		Weight::from_parts(74_099_000, 6196)
+		// Minimum execution time: 77_611_000 picoseconds.
+		Weight::from_parts(82_634_000, 6196)
 			.saturating_add(T::DbWeight::get().reads(8))
 			.saturating_add(T::DbWeight::get().writes(4))
 	}
@@ -101,8 +99,8 @@ impl<T: frame_system::Config> WeightInfo<T> {
 		// Proof Size summary in bytes:
 		//  Measured:  `0`
 		//  Estimated: `0`
-		// Minimum execution time: 500_000_000_000 picoseconds.
-		Weight::from_parts(500_000_000_000, 0)
+		// Minimum execution time: 18_446_744_073_709_551_000 picoseconds.
+		Weight::from_parts(18_446_744_073_709_551_000, 0)
 	}
 	// Storage: `ParachainInfo::ParachainId` (r:1 w:0)
 	// Proof: `ParachainInfo::ParachainId` (`max_values`: Some(1), `max_size`: Some(4), added: 499, mode: `MaxEncodedLen`)
@@ -120,8 +118,8 @@ impl<T: frame_system::Config> WeightInfo<T> {
 		// Proof Size summary in bytes:
 		//  Measured:  `70`
 		//  Estimated: `3535`
-		// Minimum execution time: 27_131_000 picoseconds.
-		Weight::from_parts(28_062_000, 3535)
+		// Minimum execution time: 29_506_000 picoseconds.
+		Weight::from_parts(30_269_000, 3535)
 			.saturating_add(T::DbWeight::get().reads(6))
 			.saturating_add(T::DbWeight::get().writes(2))
 	}
@@ -129,8 +127,8 @@ impl<T: frame_system::Config> WeightInfo<T> {
 		// Proof Size summary in bytes:
 		//  Measured:  `0`
 		//  Estimated: `0`
-		// Minimum execution time: 3_564_000 picoseconds.
-		Weight::from_parts(3_738_000, 0)
+		// Minimum execution time: 3_541_000 picoseconds.
+		Weight::from_parts(3_629_000, 0)
 	}
 	// Storage: `System::Account` (r:1 w:1)
 	// Proof: `System::Account` (`max_values`: None, `max_size`: Some(128), added: 2603, mode: `MaxEncodedLen`)
@@ -138,8 +136,8 @@ impl<T: frame_system::Config> WeightInfo<T> {
 		// Proof Size summary in bytes:
 		//  Measured:  `52`
 		//  Estimated: `3593`
-		// Minimum execution time: 24_453_000 picoseconds.
-		Weight::from_parts(25_216_000, 3593)
+		// Minimum execution time: 25_651_000 picoseconds.
+		Weight::from_parts(26_078_000, 3593)
 			.saturating_add(T::DbWeight::get().reads(1))
 			.saturating_add(T::DbWeight::get().writes(1))
 	}
@@ -161,8 +159,8 @@ impl<T: frame_system::Config> WeightInfo<T> {
 		// Proof Size summary in bytes:
 		//  Measured:  `122`
 		//  Estimated: `3593`
-		// Minimum execution time: 48_913_000 picoseconds.
-		Weight::from_parts(50_202_000, 3593)
+		// Minimum execution time: 52_050_000 picoseconds.
+		Weight::from_parts(53_293_000, 3593)
 			.saturating_add(T::DbWeight::get().reads(7))
 			.saturating_add(T::DbWeight::get().writes(3))
 	}
@@ -182,8 +180,8 @@ impl<T: frame_system::Config> WeightInfo<T> {
 		// Proof Size summary in bytes:
 		//  Measured:  `70`
 		//  Estimated: `3535`
-		// Minimum execution time: 27_592_000 picoseconds.
-		Weight::from_parts(28_099_000, 3535)
+		// Minimum execution time: 30_009_000 picoseconds.
+		Weight::from_parts(30_540_000, 3535)
 			.saturating_add(T::DbWeight::get().reads(6))
 			.saturating_add(T::DbWeight::get().writes(2))
 	}
diff --git a/cumulus/parachains/runtimes/bridge-hubs/bridge-hub-polkadot/src/weights/xcm/pallet_xcm_benchmarks_generic.rs b/cumulus/parachains/runtimes/bridge-hubs/bridge-hub-polkadot/src/weights/xcm/pallet_xcm_benchmarks_generic.rs
index 87bd0a6173bc8ff0cd7ba0165bb92a3a5b0d35ce..7968649d143c1ca54d05285d0958379a2124fe7a 100644
--- a/cumulus/parachains/runtimes/bridge-hubs/bridge-hub-polkadot/src/weights/xcm/pallet_xcm_benchmarks_generic.rs
+++ b/cumulus/parachains/runtimes/bridge-hubs/bridge-hub-polkadot/src/weights/xcm/pallet_xcm_benchmarks_generic.rs
@@ -1,4 +1,4 @@
-// Copyright Parity Technologies (UK) Ltd.
+// Copyright (C) Parity Technologies (UK) Ltd.
 // This file is part of Cumulus.
 
 // Cumulus is free software: you can redistribute it and/or modify
diff --git a/cumulus/parachains/runtimes/bridge-hubs/bridge-hub-polkadot/src/xcm_config.rs b/cumulus/parachains/runtimes/bridge-hubs/bridge-hub-polkadot/src/xcm_config.rs
index 0b5831f028b0a4e3ab2111963fa7dfae80b2fa0f..84672a6c394415327fb3911a8423e6662be12fb7 100644
--- a/cumulus/parachains/runtimes/bridge-hubs/bridge-hub-polkadot/src/xcm_config.rs
+++ b/cumulus/parachains/runtimes/bridge-hubs/bridge-hub-polkadot/src/xcm_config.rs
@@ -1,4 +1,4 @@
-// Copyright 2023 Parity Technologies (UK) Ltd.
+// Copyright (C) Parity Technologies (UK) Ltd.
 // This file is part of Cumulus.
 
 // Cumulus is free software: you can redistribute it and/or modify
@@ -24,8 +24,8 @@ use frame_support::{
 };
 use frame_system::EnsureRoot;
 use pallet_xcm::XcmPassthrough;
-use parachains_common::{impls::ToStakingPot, xcm_config::ConcreteNativeAssetFrom};
-use polkadot_parachain::primitives::Sibling;
+use parachains_common::{impls::ToStakingPot, xcm_config::ConcreteAssetFromSystem};
+use polkadot_parachain_primitives::primitives::Sibling;
 use xcm::latest::prelude::*;
 use xcm_builder::{
 	AccountId32Aliases, AllowExplicitUnpaidExecutionFrom, AllowKnownQueryResponses,
@@ -181,6 +181,10 @@ pub type Barrier = TrailingSetTopicAsId<
 	>,
 >;
 
+/// Cases where a remote origin is accepted as trusted Teleporter for a given asset:
+/// - DOT with the parent Relay Chain and sibling parachains.
+pub type TrustedTeleporters = ConcreteAssetFromSystem<DotRelayLocation>;
+
 pub struct XcmConfig;
 impl xcm_executor::Config for XcmConfig {
 	type RuntimeCall = RuntimeCall;
@@ -190,8 +194,7 @@ impl xcm_executor::Config for XcmConfig {
 	// BridgeHub does not recognize a reserve location for any asset. Users must teleport DOT
 	// where allowed (e.g. with the Relay Chain).
 	type IsReserve = ();
-	/// Only allow teleportation of DOT.
-	type IsTeleporter = ConcreteNativeAssetFrom<DotRelayLocation>;
+	type IsTeleporter = TrustedTeleporters;
 	type UniversalLocation = UniversalLocation;
 	type Barrier = Barrier;
 	type Weigher = WeightInfoBounds<
diff --git a/cumulus/parachains/runtimes/bridge-hubs/bridge-hub-polkadot/tests/tests.rs b/cumulus/parachains/runtimes/bridge-hubs/bridge-hub-polkadot/tests/tests.rs
index f9fbf35e9f145ea8f9ce90237a6ff54c596c41ed..0be87bd46facfc079cda4a1ea4cf6b7a34114d75 100644
--- a/cumulus/parachains/runtimes/bridge-hubs/bridge-hub-polkadot/tests/tests.rs
+++ b/cumulus/parachains/runtimes/bridge-hubs/bridge-hub-polkadot/tests/tests.rs
@@ -1,4 +1,4 @@
-// Copyright 2023 Parity Technologies (UK) Ltd.
+// Copyright (C) Parity Technologies (UK) Ltd.
 // This file is part of Cumulus.
 
 // Cumulus is free software: you can redistribute it and/or modify
@@ -15,12 +15,12 @@
 // along with Cumulus.  If not, see <http://www.gnu.org/licenses/>.
 
 pub use bridge_hub_polkadot_runtime::{
-	constants::fee::WeightToFee, xcm_config::XcmConfig, AllPalletsWithoutSystem, Balances,
-	ExistentialDeposit, ParachainSystem, PolkadotXcm, Runtime, RuntimeEvent, SessionKeys,
+	xcm_config::XcmConfig, AllPalletsWithoutSystem, Balances, ExistentialDeposit, ParachainSystem,
+	PolkadotXcm, Runtime, RuntimeEvent, SessionKeys,
 };
 use codec::Decode;
 use frame_support::parameter_types;
-use parachains_common::{AccountId, AuraId};
+use parachains_common::{polkadot::fee::WeightToFee, AccountId, AuraId};
 
 const ALICE: [u8; 32] = [1u8; 32];
 
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 5e049dbff108a32f16eb1cb2bd045fe62b984295..fec00fe0794c5202900da8570b2c174b16769f39 100644
--- a/cumulus/parachains/runtimes/bridge-hubs/bridge-hub-rococo/Cargo.toml
+++ b/cumulus/parachains/runtimes/bridge-hubs/bridge-hub-rococo/Cargo.toml
@@ -1,8 +1,8 @@
 [package]
 name = "bridge-hub-rococo-runtime"
 version = "0.1.0"
-authors = ["Parity Technologies <admin@parity.io>"]
-edition = "2021"
+authors.workspace = true
+edition.workspace = true
 description = "Rococo's BridgeHub  parachain runtime"
 
 [build-dependencies]
@@ -13,7 +13,7 @@ codec = { package = "parity-scale-codec", version = "3.0.0", default-features =
 hex-literal = { version = "0.4.1" }
 log = { version = "0.4.20", default-features = false }
 scale-info = { version = "2.9.0", default-features = false, features = ["derive"] }
-serde = { version = "1.0.183", optional = true, features = ["derive"] }
+serde = { version = "1.0.188", optional = true, features = ["derive"] }
 smallvec = "1.11.0"
 
 # Substrate
@@ -37,6 +37,7 @@ sp-api = { path = "../../../../../substrate/primitives/api", default-features =
 sp-block-builder = { path = "../../../../../substrate/primitives/block-builder", default-features = false}
 sp-consensus-aura = { path = "../../../../../substrate/primitives/consensus/aura", default-features = false}
 sp-core = { path = "../../../../../substrate/primitives/core", default-features = false}
+sp-genesis-builder = { path = "../../../../../substrate/primitives/genesis-builder", default-features = false }
 sp-inherents = { path = "../../../../../substrate/primitives/inherents", default-features = false}
 sp-io = { path = "../../../../../substrate/primitives/io", default-features = false}
 sp-offchain = { path = "../../../../../substrate/primitives/offchain", default-features = false}
@@ -52,11 +53,11 @@ rococo-runtime-constants = { path = "../../../../../polkadot/runtime/rococo/cons
 pallet-xcm = { path = "../../../../../polkadot/xcm/pallet-xcm", default-features = false}
 pallet-xcm-benchmarks = { path = "../../../../../polkadot/xcm/pallet-xcm-benchmarks", default-features = false, optional = true }
 polkadot-core-primitives = { path = "../../../../../polkadot/core-primitives", default-features = false}
-polkadot-parachain = { path = "../../../../../polkadot/parachain", default-features = false}
+polkadot-parachain-primitives = { path = "../../../../../polkadot/parachain", default-features = false}
 polkadot-runtime-common = { path = "../../../../../polkadot/runtime/common", default-features = false}
-xcm = { path = "../../../../../polkadot/xcm", default-features = false}
-xcm-builder = { path = "../../../../../polkadot/xcm/xcm-builder", default-features = false}
-xcm-executor = { path = "../../../../../polkadot/xcm/xcm-executor", default-features = false}
+xcm = { package = "staging-xcm", path = "../../../../../polkadot/xcm", default-features = false}
+xcm-builder = { package = "staging-xcm-builder", path = "../../../../../polkadot/xcm/xcm-builder", default-features = false}
+xcm-executor = { package = "staging-xcm-executor", path = "../../../../../polkadot/xcm/xcm-executor", default-features = false}
 
 # Cumulus
 cumulus-pallet-aura-ext = { path = "../../../../pallets/aura-ext", default-features = false }
@@ -72,26 +73,26 @@ parachain-info = { path = "../../../pallets/parachain-info", default-features =
 parachains-common = { path = "../../../common", default-features = false }
 
 # Bridges
-bp-bridge-hub-rococo = { path = "../../../../bridges/primitives/chain-bridge-hub-rococo", default-features = false }
-bp-bridge-hub-wococo = { path = "../../../../bridges/primitives/chain-bridge-hub-wococo", default-features = false }
-bp-header-chain = { path = "../../../../bridges/primitives/header-chain", default-features = false }
-bp-messages = { path = "../../../../bridges/primitives/messages", default-features = false }
-bp-parachains = { path = "../../../../bridges/primitives/parachains", default-features = false }
-bp-polkadot-core = { path = "../../../../bridges/primitives/polkadot-core", default-features = false }
-bp-relayers = { path = "../../../../bridges/primitives/relayers", default-features = false }
-bp-runtime = { path = "../../../../bridges/primitives/runtime", default-features = false }
-bp-rococo = { path = "../../../../bridges/primitives/chain-rococo", default-features = false }
-bp-wococo = { path = "../../../../bridges/primitives/chain-wococo", default-features = false }
-pallet-bridge-grandpa = { path = "../../../../bridges/modules/grandpa", default-features = false }
-pallet-bridge-messages = { path = "../../../../bridges/modules/messages", default-features = false }
-pallet-bridge-parachains = { path = "../../../../bridges/modules/parachains", default-features = false }
-pallet-bridge-relayers = { path = "../../../../bridges/modules/relayers", default-features = false }
-bridge-runtime-common = { path = "../../../../bridges/bin/runtime-common", default-features = false }
+bp-bridge-hub-rococo = { path = "../../../../../bridges/primitives/chain-bridge-hub-rococo", default-features = false }
+bp-bridge-hub-wococo = { path = "../../../../../bridges/primitives/chain-bridge-hub-wococo", default-features = false }
+bp-header-chain = { path = "../../../../../bridges/primitives/header-chain", default-features = false }
+bp-messages = { path = "../../../../../bridges/primitives/messages", default-features = false }
+bp-parachains = { path = "../../../../../bridges/primitives/parachains", default-features = false }
+bp-polkadot-core = { path = "../../../../../bridges/primitives/polkadot-core", default-features = false }
+bp-relayers = { path = "../../../../../bridges/primitives/relayers", default-features = false }
+bp-runtime = { path = "../../../../../bridges/primitives/runtime", default-features = false }
+bp-rococo = { path = "../../../../../bridges/primitives/chain-rococo", default-features = false }
+bp-wococo = { path = "../../../../../bridges/primitives/chain-wococo", default-features = false }
+pallet-bridge-grandpa = { path = "../../../../../bridges/modules/grandpa", default-features = false }
+pallet-bridge-messages = { path = "../../../../../bridges/modules/messages", default-features = false }
+pallet-bridge-parachains = { path = "../../../../../bridges/modules/parachains", default-features = false }
+pallet-bridge-relayers = { path = "../../../../../bridges/modules/relayers", default-features = false }
+bridge-runtime-common = { path = "../../../../../bridges/bin/runtime-common", default-features = false }
 
 [dev-dependencies]
 static_assertions = "1.1"
 bridge-hub-test-utils = { path = "../test-utils" }
-bridge-runtime-common = { path = "../../../../bridges/bin/runtime-common", features = ["integrity-test"] }
+bridge-runtime-common = { path = "../../../../../bridges/bin/runtime-common", features = ["integrity-test"] }
 sp-keyring = { path = "../../../../../substrate/primitives/keyring" }
 
 [features]
@@ -112,6 +113,7 @@ std = [
 	"cumulus-pallet-aura-ext/std",
 	"cumulus-pallet-dmp-queue/std",
 	"cumulus-pallet-parachain-system/std",
+	"cumulus-pallet-session-benchmarking/std",
 	"cumulus-pallet-xcm/std",
 	"cumulus-pallet-xcmp-queue/std",
 	"cumulus-primitives-core/std",
@@ -119,8 +121,10 @@ std = [
 	"frame-benchmarking/std",
 	"frame-executive/std",
 	"frame-support/std",
+	"frame-system-benchmarking?/std",
 	"frame-system-rpc-runtime-api/std",
 	"frame-system/std",
+	"frame-try-runtime?/std",
 	"log/std",
 	"pallet-aura/std",
 	"pallet-authorship/std",
@@ -136,11 +140,12 @@ std = [
 	"pallet-transaction-payment-rpc-runtime-api/std",
 	"pallet-transaction-payment/std",
 	"pallet-utility/std",
+	"pallet-xcm-benchmarks?/std",
 	"pallet-xcm/std",
 	"parachain-info/std",
 	"parachains-common/std",
 	"polkadot-core-primitives/std",
-	"polkadot-parachain/std",
+	"polkadot-parachain-primitives/std",
 	"polkadot-runtime-common/std",
 	"rococo-runtime-constants/std",
 	"scale-info/std",
@@ -149,12 +154,14 @@ std = [
 	"sp-block-builder/std",
 	"sp-consensus-aura/std",
 	"sp-core/std",
+	"sp-genesis-builder/std",
 	"sp-inherents/std",
 	"sp-io/std",
 	"sp-offchain/std",
 	"sp-runtime/std",
 	"sp-session/std",
 	"sp-std/std",
+	"sp-storage/std",
 	"sp-transaction-pool/std",
 	"sp-version/std",
 	"substrate-wasm-builder",
@@ -168,6 +175,7 @@ runtime-benchmarks = [
 	"cumulus-pallet-parachain-system/runtime-benchmarks",
 	"cumulus-pallet-session-benchmarking/runtime-benchmarks",
 	"cumulus-pallet-xcmp-queue/runtime-benchmarks",
+	"cumulus-primitives-utility/runtime-benchmarks",
 	"frame-benchmarking/runtime-benchmarks",
 	"frame-support/runtime-benchmarks",
 	"frame-system-benchmarking/runtime-benchmarks",
@@ -183,8 +191,12 @@ runtime-benchmarks = [
 	"pallet-utility/runtime-benchmarks",
 	"pallet-xcm-benchmarks/runtime-benchmarks",
 	"pallet-xcm/runtime-benchmarks",
+	"parachains-common/runtime-benchmarks",
+	"polkadot-parachain-primitives/runtime-benchmarks",
+	"polkadot-runtime-common/runtime-benchmarks",
 	"sp-runtime/runtime-benchmarks",
 	"xcm-builder/runtime-benchmarks",
+	"xcm-executor/runtime-benchmarks",
 ]
 
 try-runtime = [
@@ -194,6 +206,7 @@ try-runtime = [
 	"cumulus-pallet-xcm/try-runtime",
 	"cumulus-pallet-xcmp-queue/try-runtime",
 	"frame-executive/try-runtime",
+	"frame-support/try-runtime",
 	"frame-system/try-runtime",
 	"frame-try-runtime/try-runtime",
 	"pallet-aura/try-runtime",
@@ -211,6 +224,8 @@ try-runtime = [
 	"pallet-utility/try-runtime",
 	"pallet-xcm/try-runtime",
 	"parachain-info/try-runtime",
+	"polkadot-runtime-common/try-runtime",
+	"sp-runtime/try-runtime",
 ]
 
 experimental = [ "pallet-aura/experimental" ]
diff --git a/cumulus/parachains/runtimes/bridge-hubs/bridge-hub-rococo/src/bridge_hub_rococo_config.rs b/cumulus/parachains/runtimes/bridge-hubs/bridge-hub-rococo/src/bridge_hub_rococo_config.rs
index d45238b0f4239412acb2a3b1b0960a50c22d8421..f59c9e238f5f276e233d357a66a9de87bb6c8fbc 100644
--- a/cumulus/parachains/runtimes/bridge-hubs/bridge-hub-rococo/src/bridge_hub_rococo_config.rs
+++ b/cumulus/parachains/runtimes/bridge-hubs/bridge-hub-rococo/src/bridge_hub_rococo_config.rs
@@ -1,4 +1,4 @@
-// Copyright 2022 Parity Technologies (UK) Ltd.
+// Copyright (C) Parity Technologies (UK) Ltd.
 // This file is part of Cumulus.
 
 // Cumulus is free software: you can redistribute it and/or modify
@@ -29,8 +29,8 @@ use bridge_runtime_common::{
 	},
 	messages_xcm_extension::{SenderAndLane, XcmBlobHauler, XcmBlobHaulerAdapter},
 	refund_relayer_extension::{
-		ActualFeeRefund, RefundBridgedParachainMessages, RefundableMessagesLane,
-		RefundableParachain,
+		ActualFeeRefund, RefundBridgedParachainMessages, RefundSignedExtensionAdapter,
+		RefundableMessagesLane, RefundableParachain,
 	},
 };
 use frame_support::{parameter_types, traits::PalletInfoAccess};
@@ -136,13 +136,15 @@ impl ThisChainWithMessages for BridgeHubRococo {
 }
 
 /// Signed extension that refunds relayers that are delivering messages from the Wococo parachain.
-pub type BridgeRefundBridgeHubWococoMessages = RefundBridgedParachainMessages<
-	Runtime,
-	RefundableParachain<BridgeParachainWococoInstance, bp_bridge_hub_wococo::BridgeHubWococo>,
-	RefundableMessagesLane<WithBridgeHubWococoMessagesInstance, BridgeHubWococoMessagesLane>,
-	ActualFeeRefund<Runtime>,
-	PriorityBoostPerMessage,
-	StrBridgeRefundBridgeHubWococoMessages,
+pub type BridgeRefundBridgeHubWococoMessages = RefundSignedExtensionAdapter<
+	RefundBridgedParachainMessages<
+		Runtime,
+		RefundableParachain<BridgeParachainWococoInstance, bp_bridge_hub_wococo::BridgeHubWococo>,
+		RefundableMessagesLane<WithBridgeHubWococoMessagesInstance, BridgeHubWococoMessagesLane>,
+		ActualFeeRefund<Runtime>,
+		PriorityBoostPerMessage,
+		StrBridgeRefundBridgeHubWococoMessages,
+	>,
 >;
 bp_runtime::generate_static_str_provider!(BridgeRefundBridgeHubWococoMessages);
 
diff --git a/cumulus/parachains/runtimes/bridge-hubs/bridge-hub-rococo/src/bridge_hub_wococo_config.rs b/cumulus/parachains/runtimes/bridge-hubs/bridge-hub-rococo/src/bridge_hub_wococo_config.rs
index b676e2c5994bb41eb7cf4233b47d5f0424095f50..a0b16bace51d0c480cc4569f2d2ab8074150af16 100644
--- a/cumulus/parachains/runtimes/bridge-hubs/bridge-hub-rococo/src/bridge_hub_wococo_config.rs
+++ b/cumulus/parachains/runtimes/bridge-hubs/bridge-hub-rococo/src/bridge_hub_wococo_config.rs
@@ -1,4 +1,4 @@
-// Copyright 2022 Parity Technologies (UK) Ltd.
+// Copyright (C) Parity Technologies (UK) Ltd.
 // This file is part of Cumulus.
 
 // Cumulus is free software: you can redistribute it and/or modify
@@ -29,8 +29,8 @@ use bridge_runtime_common::{
 	},
 	messages_xcm_extension::{SenderAndLane, XcmBlobHauler, XcmBlobHaulerAdapter},
 	refund_relayer_extension::{
-		ActualFeeRefund, RefundBridgedParachainMessages, RefundableMessagesLane,
-		RefundableParachain,
+		ActualFeeRefund, RefundBridgedParachainMessages, RefundSignedExtensionAdapter,
+		RefundableMessagesLane, RefundableParachain,
 	},
 };
 use frame_support::{parameter_types, traits::PalletInfoAccess};
@@ -136,13 +136,15 @@ impl ThisChainWithMessages for BridgeHubWococo {
 }
 
 /// Signed extension that refunds relayers that are delivering messages from the Rococo parachain.
-pub type BridgeRefundBridgeHubRococoMessages = RefundBridgedParachainMessages<
-	Runtime,
-	RefundableParachain<BridgeParachainRococoInstance, bp_bridge_hub_rococo::BridgeHubRococo>,
-	RefundableMessagesLane<WithBridgeHubRococoMessagesInstance, BridgeHubRococoMessagesLane>,
-	ActualFeeRefund<Runtime>,
-	PriorityBoostPerMessage,
-	StrBridgeRefundBridgeHubRococoMessages,
+pub type BridgeRefundBridgeHubRococoMessages = RefundSignedExtensionAdapter<
+	RefundBridgedParachainMessages<
+		Runtime,
+		RefundableParachain<BridgeParachainRococoInstance, bp_bridge_hub_rococo::BridgeHubRococo>,
+		RefundableMessagesLane<WithBridgeHubRococoMessagesInstance, BridgeHubRococoMessagesLane>,
+		ActualFeeRefund<Runtime>,
+		PriorityBoostPerMessage,
+		StrBridgeRefundBridgeHubRococoMessages,
+	>,
 >;
 bp_runtime::generate_static_str_provider!(BridgeRefundBridgeHubRococoMessages);
 
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 a00dd30a870ad0cc8e167e1219b2551d8403c94f..c4e510ee4095e8f125edf9eae33de881fb17e21a 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
@@ -1,4 +1,4 @@
-// Copyright 2022 Parity Technologies (UK) Ltd.
+// Copyright (C) Parity Technologies (UK) Ltd.
 // This file is part of Cumulus.
 
 // Cumulus is free software: you can redistribute it and/or modify
@@ -24,11 +24,9 @@ include!(concat!(env!("OUT_DIR"), "/wasm_binary.rs"));
 
 pub mod bridge_hub_rococo_config;
 pub mod bridge_hub_wococo_config;
-pub mod constants;
 mod weights;
 pub mod xcm_config;
 
-use constants::{consensus::*, currency::*};
 use cumulus_pallet_parachain_system::RelayNumberStrictlyIncreases;
 use sp_api::impl_runtime_apis;
 use sp_core::{crypto::KeyTypeId, OpaqueMetadata};
@@ -47,6 +45,7 @@ use sp_version::RuntimeVersion;
 use frame_support::{
 	construct_runtime,
 	dispatch::DispatchClass,
+	genesis_builder_helper::{build_config, create_default_config},
 	parameter_types,
 	traits::{ConstBool, ConstU32, ConstU64, ConstU8, Everything},
 	weights::{ConstantMultiplier, Weight},
@@ -79,7 +78,6 @@ use crate::{
 		BridgeRefundBridgeHubRococoMessages, OnBridgeHubWococoBlobDispatcher,
 		WithBridgeHubRococoMessageBridge,
 	},
-	constants::fee::WeightToFee,
 	xcm_config::XcmRouter,
 };
 use bridge_runtime_common::{
@@ -87,8 +85,10 @@ use bridge_runtime_common::{
 	messages_xcm_extension::{XcmAsPlainPayload, XcmBlobMessageDispatch},
 };
 use parachains_common::{
-	impls::DealWithFees, AccountId, Balance, BlockNumber, Hash, Header, Nonce, Signature,
-	AVERAGE_ON_INITIALIZE_RATIO, HOURS, MAXIMUM_BLOCK_WEIGHT, NORMAL_DISPATCH_RATIO, SLOT_DURATION,
+	impls::DealWithFees,
+	rococo::{consensus::*, currency::*, fee::WeightToFee},
+	AccountId, Balance, BlockNumber, Hash, Header, Nonce, Signature, AVERAGE_ON_INITIALIZE_RATIO,
+	HOURS, MAXIMUM_BLOCK_WEIGHT, NORMAL_DISPATCH_RATIO, SLOT_DURATION,
 };
 use xcm_executor::XcmExecutor;
 
@@ -123,7 +123,40 @@ pub type UncheckedExtrinsic =
 	generic::UncheckedExtrinsic<Address, RuntimeCall, Signature, SignedExtra>;
 
 /// Migrations to apply on runtime upgrade.
-pub type Migrations = (pallet_collator_selection::migration::v1::MigrateToV1<Runtime>,);
+pub type Migrations = (
+	pallet_collator_selection::migration::v1::MigrateToV1<Runtime>,
+	pallet_multisig::migrations::v1::MigrateToV1<Runtime>,
+	InitStorageVersions,
+);
+
+/// Migration to initialize storage versions for pallets added after genesis.
+///
+/// Ideally this would be done automatically (see
+/// <https://github.com/paritytech/polkadot-sdk/pull/1297>), but it probably won't be ready for some
+/// time and it's beneficial to get try-runtime-cli on-runtime-upgrade checks into the CI, so we're
+/// doing it manually.
+pub struct InitStorageVersions;
+
+impl frame_support::traits::OnRuntimeUpgrade for InitStorageVersions {
+	fn on_runtime_upgrade() -> Weight {
+		use frame_support::traits::{GetStorageVersion, StorageVersion};
+		use sp_runtime::traits::Saturating;
+
+		let mut writes = 0;
+
+		if PolkadotXcm::on_chain_storage_version() == StorageVersion::new(0) {
+			PolkadotXcm::current_storage_version().put::<PolkadotXcm>();
+			writes.saturating_inc();
+		}
+
+		if Balances::on_chain_storage_version() == StorageVersion::new(0) {
+			Balances::current_storage_version().put::<Balances>();
+			writes.saturating_inc();
+		}
+
+		<Runtime as frame_system::Config>::DbWeight::get().reads_writes(2, writes)
+	}
+}
 
 /// Executive: handles dispatch to the various modules.
 pub type Executive = frame_executive::Executive<
@@ -1040,7 +1073,11 @@ impl_runtime_apis! {
 			type XcmBalances = pallet_xcm_benchmarks::fungible::Pallet::<Runtime>;
 			type XcmGeneric = pallet_xcm_benchmarks::generic::Pallet::<Runtime>;
 
-			use bridge_runtime_common::messages_benchmarking::{prepare_message_delivery_proof_from_parachain, prepare_message_proof_from_parachain};
+			use bridge_runtime_common::messages_benchmarking::{
+				prepare_message_delivery_proof_from_parachain,
+				prepare_message_proof_from_parachain,
+				generate_xcm_builder_bridge_message_sample,
+			};
 			use pallet_bridge_messages::benchmarking::{
 				Config as BridgeMessagesConfig,
 				Pallet as BridgeMessagesBench,
@@ -1067,12 +1104,12 @@ impl_runtime_apis! {
 				) -> (bridge_hub_rococo_config::FromWococoBridgeHubMessagesProof, Weight) {
 					use cumulus_primitives_core::XcmpMessageSource;
 					assert!(XcmpQueue::take_outbound_messages(usize::MAX).is_empty());
-					ParachainSystem::open_outbound_hrmp_channel_for_benchmarks(42.into());
+					ParachainSystem::open_outbound_hrmp_channel_for_benchmarks_or_tests(42.into());
 					prepare_message_proof_from_parachain::<
 						Runtime,
 						BridgeGrandpaWococoInstance,
 						bridge_hub_rococo_config::WithBridgeHubWococoMessageBridge,
-					>(params, X2(GlobalConsensus(Rococo), Parachain(42)))
+					>(params, generate_xcm_builder_bridge_message_sample(X2(GlobalConsensus(Rococo), Parachain(42))))
 				}
 
 				fn prepare_message_delivery_proof(
@@ -1110,12 +1147,12 @@ impl_runtime_apis! {
 				) -> (bridge_hub_wococo_config::FromRococoBridgeHubMessagesProof, Weight) {
 					use cumulus_primitives_core::XcmpMessageSource;
 					assert!(XcmpQueue::take_outbound_messages(usize::MAX).is_empty());
-					ParachainSystem::open_outbound_hrmp_channel_for_benchmarks(42.into());
+					ParachainSystem::open_outbound_hrmp_channel_for_benchmarks_or_tests(42.into());
 					prepare_message_proof_from_parachain::<
 						Runtime,
 						BridgeGrandpaRococoInstance,
 						bridge_hub_wococo_config::WithBridgeHubRococoMessageBridge,
-					>(params, X2(GlobalConsensus(Wococo), Parachain(42)))
+					>(params, generate_xcm_builder_bridge_message_sample(X2(GlobalConsensus(Wococo), Parachain(42))))
 				}
 
 				fn prepare_message_delivery_proof(
@@ -1230,6 +1267,16 @@ impl_runtime_apis! {
 			Ok(batches)
 		}
 	}
+
+	impl sp_genesis_builder::GenesisBuilder<Block> for Runtime {
+		fn create_default_config() -> Vec<u8> {
+			create_default_config::<RuntimeGenesisConfig>()
+		}
+
+		fn build_config(config: Vec<u8>) -> sp_genesis_builder::Result {
+			build_config::<RuntimeGenesisConfig>(config)
+		}
+	}
 }
 
 cumulus_pallet_parachain_system::register_validate_block! {
@@ -1240,55 +1287,67 @@ cumulus_pallet_parachain_system::register_validate_block! {
 #[cfg(test)]
 mod tests {
 	use super::*;
-	use bp_runtime::TransactionEra;
-	use bridge_hub_test_utils::test_header;
 	use codec::Encode;
-
-	pub type TestBlockHeader =
-		sp_runtime::generic::Header<bp_polkadot_core::BlockNumber, bp_polkadot_core::Hasher>;
+	use sp_runtime::{
+		generic::Era,
+		traits::{SignedExtension, Zero},
+	};
 
 	#[test]
 	fn ensure_signed_extension_definition_is_compatible_with_relay() {
-		let payload: SignedExtra = (
-			frame_system::CheckNonZeroSender::new(),
-			frame_system::CheckSpecVersion::new(),
-			frame_system::CheckTxVersion::new(),
-			frame_system::CheckGenesis::new(),
-			frame_system::CheckEra::from(sp_runtime::generic::Era::Immortal),
-			frame_system::CheckNonce::from(10),
-			frame_system::CheckWeight::new(),
-			pallet_transaction_payment::ChargeTransactionPayment::from(10),
-			BridgeRejectObsoleteHeadersAndMessages {},
-			(
-				BridgeRefundBridgeHubRococoMessages::default(),
-				BridgeRefundBridgeHubWococoMessages::default(),
-			),
-		);
-
-		{
-			use bp_bridge_hub_rococo::BridgeHubSignedExtension;
-			let bhr_indirect_payload = bp_bridge_hub_rococo::SignedExtension::from_params(
-				10,
-				10,
-				TransactionEra::Immortal,
-				test_header::<TestBlockHeader>(1).hash(),
-				10,
-				10,
+		use bp_polkadot_core::SuffixedCommonSignedExtensionExt;
+
+		sp_io::TestExternalities::default().execute_with(|| {
+			frame_system::BlockHash::<Runtime>::insert(BlockNumber::zero(), Hash::default());
+			let payload: SignedExtra = (
+				frame_system::CheckNonZeroSender::new(),
+				frame_system::CheckSpecVersion::new(),
+				frame_system::CheckTxVersion::new(),
+				frame_system::CheckGenesis::new(),
+				frame_system::CheckEra::from(Era::Immortal),
+				frame_system::CheckNonce::from(10),
+				frame_system::CheckWeight::new(),
+				pallet_transaction_payment::ChargeTransactionPayment::from(10),
+				BridgeRejectObsoleteHeadersAndMessages,
+				(
+					BridgeRefundBridgeHubRococoMessages::default(),
+					BridgeRefundBridgeHubWococoMessages::default(),
+				),
 			);
-			assert_eq!(payload.encode(), bhr_indirect_payload.encode());
-		}
 
-		{
-			use bp_bridge_hub_wococo::BridgeHubSignedExtension;
-			let bhw_indirect_payload = bp_bridge_hub_wococo::SignedExtension::from_params(
-				10,
-				10,
-				TransactionEra::Immortal,
-				test_header::<TestBlockHeader>(1).hash(),
-				10,
-				10,
-			);
-			assert_eq!(payload.encode(), bhw_indirect_payload.encode());
-		}
+			{
+				let bhr_indirect_payload = bp_bridge_hub_rococo::SignedExtension::from_params(
+					VERSION.spec_version,
+					VERSION.transaction_version,
+					bp_runtime::TransactionEra::Immortal,
+					System::block_hash(BlockNumber::zero()),
+					10,
+					10,
+					(((), ()), ((), ())),
+				);
+				assert_eq!(payload.encode(), bhr_indirect_payload.encode());
+				assert_eq!(
+					payload.additional_signed().unwrap().encode(),
+					bhr_indirect_payload.additional_signed().unwrap().encode()
+				)
+			}
+
+			{
+				let bhw_indirect_payload = bp_bridge_hub_rococo::SignedExtension::from_params(
+					VERSION.spec_version,
+					VERSION.transaction_version,
+					bp_runtime::TransactionEra::Immortal,
+					System::block_hash(BlockNumber::zero()),
+					10,
+					10,
+					(((), ()), ((), ())),
+				);
+				assert_eq!(payload.encode(), bhw_indirect_payload.encode());
+				assert_eq!(
+					payload.additional_signed().unwrap().encode(),
+					bhw_indirect_payload.additional_signed().unwrap().encode()
+				)
+			}
+		});
 	}
 }
diff --git a/cumulus/parachains/runtimes/bridge-hubs/bridge-hub-rococo/src/weights/block_weights.rs b/cumulus/parachains/runtimes/bridge-hubs/bridge-hub-rococo/src/weights/block_weights.rs
index b2092d875c8328210667da4cbb95de0642e60ae3..e7fdb2aae2a01ec06076de83d94817e540e205dd 100644
--- a/cumulus/parachains/runtimes/bridge-hubs/bridge-hub-rococo/src/weights/block_weights.rs
+++ b/cumulus/parachains/runtimes/bridge-hubs/bridge-hub-rococo/src/weights/block_weights.rs
@@ -1,6 +1,6 @@
 // This file is part of Substrate.
 
-// Copyright (C) 2022 Parity Technologies (UK) Ltd.
+// Copyright (C) Parity Technologies (UK) Ltd.
 // SPDX-License-Identifier: Apache-2.0
 
 // Licensed under the Apache License, Version 2.0 (the "License");
diff --git a/cumulus/parachains/runtimes/bridge-hubs/bridge-hub-rococo/src/weights/cumulus_pallet_xcmp_queue.rs b/cumulus/parachains/runtimes/bridge-hubs/bridge-hub-rococo/src/weights/cumulus_pallet_xcmp_queue.rs
index 23bdc6fa4d723e95c9bd67060219f3d4972ddbf8..0106d6398f45938ae89603622db23abf300ec3ca 100644
--- a/cumulus/parachains/runtimes/bridge-hubs/bridge-hub-rococo/src/weights/cumulus_pallet_xcmp_queue.rs
+++ b/cumulus/parachains/runtimes/bridge-hubs/bridge-hub-rococo/src/weights/cumulus_pallet_xcmp_queue.rs
@@ -1,4 +1,4 @@
-// Copyright Parity Technologies (UK) Ltd.
+// Copyright (C) Parity Technologies (UK) Ltd.
 // This file is part of Cumulus.
 
 // Cumulus is free software: you can redistribute it and/or modify
diff --git a/cumulus/parachains/runtimes/bridge-hubs/bridge-hub-rococo/src/weights/extrinsic_weights.rs b/cumulus/parachains/runtimes/bridge-hubs/bridge-hub-rococo/src/weights/extrinsic_weights.rs
index 332c3b324bb9c1b386257bf7953d37aba8f5af13..1a4adb968bb7195428ea00d59cd92dcd3b6eea5f 100644
--- a/cumulus/parachains/runtimes/bridge-hubs/bridge-hub-rococo/src/weights/extrinsic_weights.rs
+++ b/cumulus/parachains/runtimes/bridge-hubs/bridge-hub-rococo/src/weights/extrinsic_weights.rs
@@ -1,6 +1,6 @@
 // This file is part of Substrate.
 
-// Copyright (C) 2022 Parity Technologies (UK) Ltd.
+// Copyright (C) Parity Technologies (UK) Ltd.
 // SPDX-License-Identifier: Apache-2.0
 
 // Licensed under the Apache License, Version 2.0 (the "License");
diff --git a/cumulus/parachains/runtimes/bridge-hubs/bridge-hub-rococo/src/weights/frame_system.rs b/cumulus/parachains/runtimes/bridge-hubs/bridge-hub-rococo/src/weights/frame_system.rs
index 7146e59f1d04605b0f4b680be61c8403df289b29..3dec4cc7f182c9aede28084122747dca63b24431 100644
--- a/cumulus/parachains/runtimes/bridge-hubs/bridge-hub-rococo/src/weights/frame_system.rs
+++ b/cumulus/parachains/runtimes/bridge-hubs/bridge-hub-rococo/src/weights/frame_system.rs
@@ -1,4 +1,4 @@
-// Copyright Parity Technologies (UK) Ltd.
+// Copyright (C) Parity Technologies (UK) Ltd.
 // This file is part of Cumulus.
 
 // Cumulus is free software: you can redistribute it and/or modify
diff --git a/cumulus/parachains/runtimes/bridge-hubs/bridge-hub-rococo/src/weights/mod.rs b/cumulus/parachains/runtimes/bridge-hubs/bridge-hub-rococo/src/weights/mod.rs
index 81ecd10512f9327d473fad146d2e8df13fff0814..54c7c03fb6085dca07eebd9ddfb052d9a5dbb969 100644
--- a/cumulus/parachains/runtimes/bridge-hubs/bridge-hub-rococo/src/weights/mod.rs
+++ b/cumulus/parachains/runtimes/bridge-hubs/bridge-hub-rococo/src/weights/mod.rs
@@ -1,6 +1,6 @@
 // This file is part of Substrate.
 
-// Copyright (C) 2022 Parity Technologies (UK) Ltd.
+// Copyright (C) Parity Technologies (UK) Ltd.
 // SPDX-License-Identifier: Apache-2.0
 
 // Licensed under the Apache License, Version 2.0 (the "License");
diff --git a/cumulus/parachains/runtimes/bridge-hubs/bridge-hub-rococo/src/weights/pallet_balances.rs b/cumulus/parachains/runtimes/bridge-hubs/bridge-hub-rococo/src/weights/pallet_balances.rs
index 9f16d8b8141b133fee299be2b7082d53ca7c136b..26a188a98610a7ecc822eb5e7e448ad7f1867eb8 100644
--- a/cumulus/parachains/runtimes/bridge-hubs/bridge-hub-rococo/src/weights/pallet_balances.rs
+++ b/cumulus/parachains/runtimes/bridge-hubs/bridge-hub-rococo/src/weights/pallet_balances.rs
@@ -1,4 +1,4 @@
-// Copyright Parity Technologies (UK) Ltd.
+// Copyright (C) Parity Technologies (UK) Ltd.
 // This file is part of Cumulus.
 
 // Cumulus is free software: you can redistribute it and/or modify
diff --git a/cumulus/parachains/runtimes/bridge-hubs/bridge-hub-rococo/src/weights/pallet_bridge_grandpa.rs b/cumulus/parachains/runtimes/bridge-hubs/bridge-hub-rococo/src/weights/pallet_bridge_grandpa.rs
index 2465d52cbe6425371fd972c5a5f012c613b1f582..5fbe2da8eaa31ae2689a389709fa468ee2d975a7 100644
--- a/cumulus/parachains/runtimes/bridge-hubs/bridge-hub-rococo/src/weights/pallet_bridge_grandpa.rs
+++ b/cumulus/parachains/runtimes/bridge-hubs/bridge-hub-rococo/src/weights/pallet_bridge_grandpa.rs
@@ -1,4 +1,4 @@
-// Copyright Parity Technologies (UK) Ltd.
+// Copyright (C) Parity Technologies (UK) Ltd.
 // This file is part of Cumulus.
 
 // Cumulus is free software: you can redistribute it and/or modify
diff --git a/cumulus/parachains/runtimes/bridge-hubs/bridge-hub-rococo/src/weights/pallet_bridge_grandpa_bridge_rococo_grandpa.rs b/cumulus/parachains/runtimes/bridge-hubs/bridge-hub-rococo/src/weights/pallet_bridge_grandpa_bridge_rococo_grandpa.rs
index 746db2a421cfbbc7463318d753699bf743b8328c..f646ddc3a387b1cf8a0b712e98a94c0dbea42492 100644
--- a/cumulus/parachains/runtimes/bridge-hubs/bridge-hub-rococo/src/weights/pallet_bridge_grandpa_bridge_rococo_grandpa.rs
+++ b/cumulus/parachains/runtimes/bridge-hubs/bridge-hub-rococo/src/weights/pallet_bridge_grandpa_bridge_rococo_grandpa.rs
@@ -1,4 +1,4 @@
-// Copyright Parity Technologies (UK) Ltd.
+// Copyright (C) Parity Technologies (UK) Ltd.
 // This file is part of Cumulus.
 
 // Cumulus is free software: you can redistribute it and/or modify
diff --git a/cumulus/parachains/runtimes/bridge-hubs/bridge-hub-rococo/src/weights/pallet_bridge_grandpa_bridge_wococo_grandpa.rs b/cumulus/parachains/runtimes/bridge-hubs/bridge-hub-rococo/src/weights/pallet_bridge_grandpa_bridge_wococo_grandpa.rs
index 377569f1aebda393e8dfce68354b1b5e6afb87a9..5c7c824624748cf1df16cd3c8e198ae52c0fa5fc 100644
--- a/cumulus/parachains/runtimes/bridge-hubs/bridge-hub-rococo/src/weights/pallet_bridge_grandpa_bridge_wococo_grandpa.rs
+++ b/cumulus/parachains/runtimes/bridge-hubs/bridge-hub-rococo/src/weights/pallet_bridge_grandpa_bridge_wococo_grandpa.rs
@@ -1,4 +1,4 @@
-// Copyright Parity Technologies (UK) Ltd.
+// Copyright (C) Parity Technologies (UK) Ltd.
 // This file is part of Cumulus.
 
 // Cumulus is free software: you can redistribute it and/or modify
diff --git a/cumulus/parachains/runtimes/bridge-hubs/bridge-hub-rococo/src/weights/pallet_bridge_messages.rs b/cumulus/parachains/runtimes/bridge-hubs/bridge-hub-rococo/src/weights/pallet_bridge_messages.rs
index f5ab0edddde372be7ca87e5473a97c5c76410bdc..ec40615dc133949d8c880e00c687cb106d55cdc3 100644
--- a/cumulus/parachains/runtimes/bridge-hubs/bridge-hub-rococo/src/weights/pallet_bridge_messages.rs
+++ b/cumulus/parachains/runtimes/bridge-hubs/bridge-hub-rococo/src/weights/pallet_bridge_messages.rs
@@ -1,4 +1,4 @@
-// Copyright Parity Technologies (UK) Ltd.
+// Copyright (C) Parity Technologies (UK) Ltd.
 // This file is part of Cumulus.
 
 // Cumulus is free software: you can redistribute it and/or modify
diff --git a/cumulus/parachains/runtimes/bridge-hubs/bridge-hub-rococo/src/weights/pallet_bridge_messages_bridge_messages_bench_runtime_with_bridge_hub_rococo_messages_instance.rs b/cumulus/parachains/runtimes/bridge-hubs/bridge-hub-rococo/src/weights/pallet_bridge_messages_bridge_messages_bench_runtime_with_bridge_hub_rococo_messages_instance.rs
index 3fe496036f16c24d0f16b64e58440805ba389701..7c25ae337ad6e731d97ed887bbf7e22e95354e0e 100644
--- a/cumulus/parachains/runtimes/bridge-hubs/bridge-hub-rococo/src/weights/pallet_bridge_messages_bridge_messages_bench_runtime_with_bridge_hub_rococo_messages_instance.rs
+++ b/cumulus/parachains/runtimes/bridge-hubs/bridge-hub-rococo/src/weights/pallet_bridge_messages_bridge_messages_bench_runtime_with_bridge_hub_rococo_messages_instance.rs
@@ -1,4 +1,4 @@
-// Copyright Parity Technologies (UK) Ltd.
+// Copyright (C) Parity Technologies (UK) Ltd.
 // This file is part of Cumulus.
 
 // Cumulus is free software: you can redistribute it and/or modify
diff --git a/cumulus/parachains/runtimes/bridge-hubs/bridge-hub-rococo/src/weights/pallet_bridge_messages_bridge_messages_bench_runtime_with_bridge_hub_wococo_messages_instance.rs b/cumulus/parachains/runtimes/bridge-hubs/bridge-hub-rococo/src/weights/pallet_bridge_messages_bridge_messages_bench_runtime_with_bridge_hub_wococo_messages_instance.rs
index 112eb22714869e620e07561aa7e3e5ec4cd47545..c3dbc19518bcd420338dbc810c3c8ed4889517f0 100644
--- a/cumulus/parachains/runtimes/bridge-hubs/bridge-hub-rococo/src/weights/pallet_bridge_messages_bridge_messages_bench_runtime_with_bridge_hub_wococo_messages_instance.rs
+++ b/cumulus/parachains/runtimes/bridge-hubs/bridge-hub-rococo/src/weights/pallet_bridge_messages_bridge_messages_bench_runtime_with_bridge_hub_wococo_messages_instance.rs
@@ -1,4 +1,4 @@
-// Copyright Parity Technologies (UK) Ltd.
+// Copyright (C) Parity Technologies (UK) Ltd.
 // This file is part of Cumulus.
 
 // Cumulus is free software: you can redistribute it and/or modify
diff --git a/cumulus/parachains/runtimes/bridge-hubs/bridge-hub-rococo/src/weights/pallet_bridge_parachains.rs b/cumulus/parachains/runtimes/bridge-hubs/bridge-hub-rococo/src/weights/pallet_bridge_parachains.rs
index d77c43e729f5049ea2a8a11a3a3043396380f898..c9f1d7e05d34e00fcb1f7b28939e93a01dece2de 100644
--- a/cumulus/parachains/runtimes/bridge-hubs/bridge-hub-rococo/src/weights/pallet_bridge_parachains.rs
+++ b/cumulus/parachains/runtimes/bridge-hubs/bridge-hub-rococo/src/weights/pallet_bridge_parachains.rs
@@ -1,4 +1,4 @@
-// Copyright Parity Technologies (UK) Ltd.
+// Copyright (C) Parity Technologies (UK) Ltd.
 // This file is part of Cumulus.
 
 // Cumulus is free software: you can redistribute it and/or modify
diff --git a/cumulus/parachains/runtimes/bridge-hubs/bridge-hub-rococo/src/weights/pallet_bridge_parachains_bridge_parachains_bench_runtime_bridge_parachain_rococo_instance.rs b/cumulus/parachains/runtimes/bridge-hubs/bridge-hub-rococo/src/weights/pallet_bridge_parachains_bridge_parachains_bench_runtime_bridge_parachain_rococo_instance.rs
index 3ba8fabf7797361078c755130f1a636ed3996e95..147e8447ee87ed33740393299ffee3d8d92d772e 100644
--- a/cumulus/parachains/runtimes/bridge-hubs/bridge-hub-rococo/src/weights/pallet_bridge_parachains_bridge_parachains_bench_runtime_bridge_parachain_rococo_instance.rs
+++ b/cumulus/parachains/runtimes/bridge-hubs/bridge-hub-rococo/src/weights/pallet_bridge_parachains_bridge_parachains_bench_runtime_bridge_parachain_rococo_instance.rs
@@ -1,4 +1,4 @@
-// Copyright Parity Technologies (UK) Ltd.
+// Copyright (C) Parity Technologies (UK) Ltd.
 // This file is part of Cumulus.
 
 // Cumulus is free software: you can redistribute it and/or modify
diff --git a/cumulus/parachains/runtimes/bridge-hubs/bridge-hub-rococo/src/weights/pallet_bridge_parachains_bridge_parachains_bench_runtime_bridge_parachain_wococo_instance.rs b/cumulus/parachains/runtimes/bridge-hubs/bridge-hub-rococo/src/weights/pallet_bridge_parachains_bridge_parachains_bench_runtime_bridge_parachain_wococo_instance.rs
index da5ec6c14187a27a8dcc9359c7c23f046b6f5757..432f9f9969db11ccd9f38f51473bccc700bb9133 100644
--- a/cumulus/parachains/runtimes/bridge-hubs/bridge-hub-rococo/src/weights/pallet_bridge_parachains_bridge_parachains_bench_runtime_bridge_parachain_wococo_instance.rs
+++ b/cumulus/parachains/runtimes/bridge-hubs/bridge-hub-rococo/src/weights/pallet_bridge_parachains_bridge_parachains_bench_runtime_bridge_parachain_wococo_instance.rs
@@ -1,4 +1,4 @@
-// Copyright Parity Technologies (UK) Ltd.
+// Copyright (C) Parity Technologies (UK) Ltd.
 // This file is part of Cumulus.
 
 // Cumulus is free software: you can redistribute it and/or modify
diff --git a/cumulus/parachains/runtimes/bridge-hubs/bridge-hub-rococo/src/weights/pallet_bridge_relayers.rs b/cumulus/parachains/runtimes/bridge-hubs/bridge-hub-rococo/src/weights/pallet_bridge_relayers.rs
index 426b098d54e3676d84ec7777d2fe049e69fc58d2..a934a1be58271fa610733c597d1fce9bc97f588d 100644
--- a/cumulus/parachains/runtimes/bridge-hubs/bridge-hub-rococo/src/weights/pallet_bridge_relayers.rs
+++ b/cumulus/parachains/runtimes/bridge-hubs/bridge-hub-rococo/src/weights/pallet_bridge_relayers.rs
@@ -1,4 +1,4 @@
-// Copyright Parity Technologies (UK) Ltd.
+// Copyright (C) Parity Technologies (UK) Ltd.
 // This file is part of Cumulus.
 
 // Cumulus is free software: you can redistribute it and/or modify
diff --git a/cumulus/parachains/runtimes/bridge-hubs/bridge-hub-rococo/src/weights/pallet_collator_selection.rs b/cumulus/parachains/runtimes/bridge-hubs/bridge-hub-rococo/src/weights/pallet_collator_selection.rs
index 956b7b7b43cdcf161c8f93182857124752a815f0..9cbfa6ce80e3e4b45338786c3705500bf27a220f 100644
--- a/cumulus/parachains/runtimes/bridge-hubs/bridge-hub-rococo/src/weights/pallet_collator_selection.rs
+++ b/cumulus/parachains/runtimes/bridge-hubs/bridge-hub-rococo/src/weights/pallet_collator_selection.rs
@@ -1,4 +1,4 @@
-// Copyright Parity Technologies (UK) Ltd.
+// Copyright (C) Parity Technologies (UK) Ltd.
 // This file is part of Cumulus.
 
 // Cumulus is free software: you can redistribute it and/or modify
diff --git a/cumulus/parachains/runtimes/bridge-hubs/bridge-hub-rococo/src/weights/pallet_multisig.rs b/cumulus/parachains/runtimes/bridge-hubs/bridge-hub-rococo/src/weights/pallet_multisig.rs
index f3a2e7f0268b50b678c2cd8a18c35c2361d2085c..91840ae0c6d77cfb4507d5f7d7b8f2aca7c84b35 100644
--- a/cumulus/parachains/runtimes/bridge-hubs/bridge-hub-rococo/src/weights/pallet_multisig.rs
+++ b/cumulus/parachains/runtimes/bridge-hubs/bridge-hub-rococo/src/weights/pallet_multisig.rs
@@ -1,4 +1,4 @@
-// Copyright Parity Technologies (UK) Ltd.
+// Copyright (C) Parity Technologies (UK) Ltd.
 // This file is part of Cumulus.
 
 // Cumulus is free software: you can redistribute it and/or modify
diff --git a/cumulus/parachains/runtimes/bridge-hubs/bridge-hub-rococo/src/weights/pallet_session.rs b/cumulus/parachains/runtimes/bridge-hubs/bridge-hub-rococo/src/weights/pallet_session.rs
index afa64ae7537c2755a1e44b688f344d1a83dc7ec9..c9d04f9c6df65892243220531ac9d42dc885702d 100644
--- a/cumulus/parachains/runtimes/bridge-hubs/bridge-hub-rococo/src/weights/pallet_session.rs
+++ b/cumulus/parachains/runtimes/bridge-hubs/bridge-hub-rococo/src/weights/pallet_session.rs
@@ -1,4 +1,4 @@
-// Copyright Parity Technologies (UK) Ltd.
+// Copyright (C) Parity Technologies (UK) Ltd.
 // This file is part of Cumulus.
 
 // Cumulus is free software: you can redistribute it and/or modify
diff --git a/cumulus/parachains/runtimes/bridge-hubs/bridge-hub-rococo/src/weights/pallet_timestamp.rs b/cumulus/parachains/runtimes/bridge-hubs/bridge-hub-rococo/src/weights/pallet_timestamp.rs
index 61742f36995077bd0730b5b2c3c6e47210fb88e7..0a5bf9b9f9c1f8c483c2e2f86ae471b28e7f609a 100644
--- a/cumulus/parachains/runtimes/bridge-hubs/bridge-hub-rococo/src/weights/pallet_timestamp.rs
+++ b/cumulus/parachains/runtimes/bridge-hubs/bridge-hub-rococo/src/weights/pallet_timestamp.rs
@@ -1,4 +1,4 @@
-// Copyright Parity Technologies (UK) Ltd.
+// Copyright (C) Parity Technologies (UK) Ltd.
 // This file is part of Cumulus.
 
 // Cumulus is free software: you can redistribute it and/or modify
diff --git a/cumulus/parachains/runtimes/bridge-hubs/bridge-hub-rococo/src/weights/pallet_utility.rs b/cumulus/parachains/runtimes/bridge-hubs/bridge-hub-rococo/src/weights/pallet_utility.rs
index 4941bd661544940ac4bb4989a7b7ec8c753cbbb6..44cd0cf91e7998cb504587c481d13b110c9db072 100644
--- a/cumulus/parachains/runtimes/bridge-hubs/bridge-hub-rococo/src/weights/pallet_utility.rs
+++ b/cumulus/parachains/runtimes/bridge-hubs/bridge-hub-rococo/src/weights/pallet_utility.rs
@@ -1,4 +1,4 @@
-// Copyright Parity Technologies (UK) Ltd.
+// Copyright (C) Parity Technologies (UK) Ltd.
 // This file is part of Cumulus.
 
 // Cumulus is free software: you can redistribute it and/or modify
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 f6d61f9e6c29d9984c3dabc687eab4d1136f1dbd..72bdb282585dec0533662bad5620f2434bcc15b1 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
@@ -1,4 +1,4 @@
-// Copyright Parity Technologies (UK) Ltd.
+// Copyright (C) Parity Technologies (UK) Ltd.
 // This file is part of Cumulus.
 
 // Cumulus is free software: you can redistribute it and/or modify
diff --git a/cumulus/parachains/runtimes/bridge-hubs/bridge-hub-rococo/src/weights/paritydb_weights.rs b/cumulus/parachains/runtimes/bridge-hubs/bridge-hub-rococo/src/weights/paritydb_weights.rs
index 4338d928d807a41cc60ec91d86e91c81bb253631..25679703831a13b8d1bb7fb7dd4d92fa84b1f255 100644
--- a/cumulus/parachains/runtimes/bridge-hubs/bridge-hub-rococo/src/weights/paritydb_weights.rs
+++ b/cumulus/parachains/runtimes/bridge-hubs/bridge-hub-rococo/src/weights/paritydb_weights.rs
@@ -1,6 +1,6 @@
 // This file is part of Substrate.
 
-// Copyright (C) 2022 Parity Technologies (UK) Ltd.
+// Copyright (C) Parity Technologies (UK) Ltd.
 // SPDX-License-Identifier: Apache-2.0
 
 // Licensed under the Apache License, Version 2.0 (the "License");
diff --git a/cumulus/parachains/runtimes/bridge-hubs/bridge-hub-rococo/src/weights/rocksdb_weights.rs b/cumulus/parachains/runtimes/bridge-hubs/bridge-hub-rococo/src/weights/rocksdb_weights.rs
index 1d115d963facb39fe29d6258918fda3bc8d94900..3dd817aa6f137085b0e5fdf2b11b7f50e5c8b002 100644
--- a/cumulus/parachains/runtimes/bridge-hubs/bridge-hub-rococo/src/weights/rocksdb_weights.rs
+++ b/cumulus/parachains/runtimes/bridge-hubs/bridge-hub-rococo/src/weights/rocksdb_weights.rs
@@ -1,6 +1,6 @@
 // This file is part of Substrate.
 
-// Copyright (C) 2022 Parity Technologies (UK) Ltd.
+// Copyright (C) Parity Technologies (UK) Ltd.
 // SPDX-License-Identifier: Apache-2.0
 
 // Licensed under the Apache License, Version 2.0 (the "License");
diff --git a/cumulus/parachains/runtimes/bridge-hubs/bridge-hub-rococo/src/weights/xcm/mod.rs b/cumulus/parachains/runtimes/bridge-hubs/bridge-hub-rococo/src/weights/xcm/mod.rs
index a5c6bf858f649d847273331304f98880c39c83df..78a0eed91740d645e0c292d86ae1f5909fa395c9 100644
--- a/cumulus/parachains/runtimes/bridge-hubs/bridge-hub-rococo/src/weights/xcm/mod.rs
+++ b/cumulus/parachains/runtimes/bridge-hubs/bridge-hub-rococo/src/weights/xcm/mod.rs
@@ -1,4 +1,4 @@
-// Copyright 2022 Parity Technologies (UK) Ltd.
+// Copyright (C) Parity Technologies (UK) Ltd.
 // This file is part of Cumulus.
 
 // Cumulus is free software: you can redistribute it and/or modify
@@ -62,16 +62,8 @@ impl<Call> XcmWeightInfo<Call> for BridgeHubRococoXcmWeight<Call> {
 	fn withdraw_asset(assets: &MultiAssets) -> Weight {
 		assets.weigh_multi_assets(XcmFungibleWeight::<Runtime>::withdraw_asset())
 	}
-	// Currently there is no trusted reserve (`IsReserve = ()`),
-	// but we need this hack for `pallet_xcm::reserve_transfer_assets`
-	// (TODO) fix https://github.com/paritytech/polkadot/pull/7424
-	// (TODO) fix https://github.com/paritytech/polkadot/pull/7546
-	fn reserve_asset_deposited(_assets: &MultiAssets) -> Weight {
-		// TODO: if we change `IsReserve = ...` then use this line...
-		// TODO: or if remote weight estimation is fixed, then remove
-		// TODO: hardcoded - fix https://github.com/paritytech/cumulus/issues/1974
-		let hardcoded_weight = Weight::from_parts(1_000_000_000_u64, 0);
-		hardcoded_weight.min(XcmFungibleWeight::<Runtime>::reserve_asset_deposited())
+	fn reserve_asset_deposited(assets: &MultiAssets) -> Weight {
+		assets.weigh_multi_assets(XcmFungibleWeight::<Runtime>::reserve_asset_deposited())
 	}
 	fn receive_teleported_asset(assets: &MultiAssets) -> Weight {
 		assets.weigh_multi_assets(XcmFungibleWeight::<Runtime>::receive_teleported_asset())
@@ -128,10 +120,7 @@ impl<Call> XcmWeightInfo<Call> for BridgeHubRococoXcmWeight<Call> {
 	}
 
 	fn deposit_asset(assets: &MultiAssetFilter, _dest: &MultiLocation) -> Weight {
-		// Hardcoded till the XCM pallet is fixed
-		let hardcoded_weight = Weight::from_parts(1_000_000_000_u64, 0);
-		let weight = assets.weigh_multi_assets(XcmFungibleWeight::<Runtime>::deposit_asset());
-		hardcoded_weight.min(weight)
+		assets.weigh_multi_assets(XcmFungibleWeight::<Runtime>::deposit_asset())
 	}
 	fn deposit_reserve_asset(
 		assets: &MultiAssetFilter,
diff --git a/cumulus/parachains/runtimes/bridge-hubs/bridge-hub-rococo/src/weights/xcm/pallet_xcm_benchmarks_fungible.rs b/cumulus/parachains/runtimes/bridge-hubs/bridge-hub-rococo/src/weights/xcm/pallet_xcm_benchmarks_fungible.rs
index 25ec8777cd3cb73f05e9f7dfb37e1314f1013cd0..cd1a673cb53979843ecf191e636865b54b035a3d 100644
--- a/cumulus/parachains/runtimes/bridge-hubs/bridge-hub-rococo/src/weights/xcm/pallet_xcm_benchmarks_fungible.rs
+++ b/cumulus/parachains/runtimes/bridge-hubs/bridge-hub-rococo/src/weights/xcm/pallet_xcm_benchmarks_fungible.rs
@@ -1,4 +1,4 @@
-// Copyright Parity Technologies (UK) Ltd.
+// Copyright (C) Parity Technologies (UK) Ltd.
 // This file is part of Cumulus.
 
 // Cumulus is free software: you can redistribute it and/or modify
@@ -17,28 +17,26 @@
 //! Autogenerated weights for `pallet_xcm_benchmarks::fungible`
 //!
 //! THIS FILE WAS AUTO-GENERATED USING THE SUBSTRATE BENCHMARK CLI VERSION 4.0.0-dev
-//! DATE: 2023-07-31, STEPS: `50`, REPEAT: `20`, LOW RANGE: `[]`, HIGH RANGE: `[]`
+//! DATE: 2023-09-28, STEPS: `50`, REPEAT: `20`, LOW RANGE: `[]`, HIGH RANGE: `[]`
 //! WORST CASE MAP SIZE: `1000000`
-//! HOSTNAME: `runner-ynta1nyy-project-238-concurrent-0`, CPU: `Intel(R) Xeon(R) CPU @ 2.60GHz`
-//! EXECUTION: , WASM-EXECUTION: Compiled, CHAIN: Some("bridge-hub-rococo-dev"), DB CACHE: 1024
+//! HOSTNAME: `runner-nbnwcyh-project-674-concurrent-0`, 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
+// target/production/polkadot-parachain
 // benchmark
 // pallet
-// --template=./templates/xcm-bench-template.hbs
-// --chain=bridge-hub-rococo-dev
-// --wasm-execution=compiled
-// --pallet=pallet_xcm_benchmarks::fungible
-// --no-storage-info
-// --no-median-slopes
-// --no-min-squares
-// --extrinsic=*
 // --steps=50
 // --repeat=20
-// --json
-// --header=./file_header.txt
-// --output=./parachains/runtimes/bridge-hubs/bridge-hub-rococo/src/weights/xcm/pallet_xcm_benchmarks_fungible.rs
+// --extrinsic=*
+// --wasm-execution=compiled
+// --heap-pages=4096
+// --json-file=/builds/parity/mirrors/polkadot-sdk/.git/.artifacts/bench.json
+// --pallet=pallet_xcm_benchmarks::fungible
+// --chain=bridge-hub-rococo-dev
+// --header=./cumulus/file_header.txt
+// --template=./cumulus/templates/xcm-bench-template.hbs
+// --output=./cumulus/parachains/runtimes/bridge-hubs/bridge-hub-rococo/src/weights/xcm/
 
 #![cfg_attr(rustfmt, rustfmt_skip)]
 #![allow(unused_parens)]
@@ -56,8 +54,8 @@ impl<T: frame_system::Config> WeightInfo<T> {
 		// Proof Size summary in bytes:
 		//  Measured:  `101`
 		//  Estimated: `3593`
-		// Minimum execution time: 24_521_000 picoseconds.
-		Weight::from_parts(25_005_000, 3593)
+		// Minimum execution time: 23_601_000 picoseconds.
+		Weight::from_parts(24_226_000, 3593)
 			.saturating_add(T::DbWeight::get().reads(1))
 			.saturating_add(T::DbWeight::get().writes(1))
 	}
@@ -67,8 +65,8 @@ impl<T: frame_system::Config> WeightInfo<T> {
 		// Proof Size summary in bytes:
 		//  Measured:  `153`
 		//  Estimated: `6196`
-		// Minimum execution time: 52_274_000 picoseconds.
-		Weight::from_parts(53_374_000, 6196)
+		// Minimum execution time: 51_043_000 picoseconds.
+		Weight::from_parts(52_326_000, 6196)
 			.saturating_add(T::DbWeight::get().reads(2))
 			.saturating_add(T::DbWeight::get().writes(2))
 	}
@@ -90,8 +88,8 @@ impl<T: frame_system::Config> WeightInfo<T> {
 		// Proof Size summary in bytes:
 		//  Measured:  `260`
 		//  Estimated: `6196`
-		// Minimum execution time: 77_625_000 picoseconds.
-		Weight::from_parts(78_530_000, 6196)
+		// Minimum execution time: 75_639_000 picoseconds.
+		Weight::from_parts(76_736_000, 6196)
 			.saturating_add(T::DbWeight::get().reads(8))
 			.saturating_add(T::DbWeight::get().writes(4))
 	}
@@ -101,8 +99,8 @@ impl<T: frame_system::Config> WeightInfo<T> {
 		// Proof Size summary in bytes:
 		//  Measured:  `0`
 		//  Estimated: `0`
-		// Minimum execution time: 500_000_000_000 picoseconds.
-		Weight::from_parts(500_000_000_000, 0)
+		// Minimum execution time: 18_446_744_073_709_551_000 picoseconds.
+		Weight::from_parts(18_446_744_073_709_551_000, 0)
 	}
 	// Storage: `ParachainInfo::ParachainId` (r:1 w:0)
 	// Proof: `ParachainInfo::ParachainId` (`max_values`: Some(1), `max_size`: Some(4), added: 499, mode: `MaxEncodedLen`)
@@ -120,8 +118,8 @@ impl<T: frame_system::Config> WeightInfo<T> {
 		// Proof Size summary in bytes:
 		//  Measured:  `107`
 		//  Estimated: `3572`
-		// Minimum execution time: 32_804_000 picoseconds.
-		Weight::from_parts(33_462_000, 3572)
+		// Minimum execution time: 31_190_000 picoseconds.
+		Weight::from_parts(32_150_000, 3572)
 			.saturating_add(T::DbWeight::get().reads(6))
 			.saturating_add(T::DbWeight::get().writes(2))
 	}
@@ -129,8 +127,8 @@ impl<T: frame_system::Config> WeightInfo<T> {
 		// Proof Size summary in bytes:
 		//  Measured:  `0`
 		//  Estimated: `0`
-		// Minimum execution time: 3_921_000 picoseconds.
-		Weight::from_parts(4_050_000, 0)
+		// Minimum execution time: 3_603_000 picoseconds.
+		Weight::from_parts(3_721_000, 0)
 	}
 	// Storage: `System::Account` (r:1 w:1)
 	// Proof: `System::Account` (`max_values`: None, `max_size`: Some(128), added: 2603, mode: `MaxEncodedLen`)
@@ -138,8 +136,8 @@ impl<T: frame_system::Config> WeightInfo<T> {
 		// Proof Size summary in bytes:
 		//  Measured:  `52`
 		//  Estimated: `3593`
-		// Minimum execution time: 25_436_000 picoseconds.
-		Weight::from_parts(25_789_000, 3593)
+		// Minimum execution time: 24_265_000 picoseconds.
+		Weight::from_parts(25_004_000, 3593)
 			.saturating_add(T::DbWeight::get().reads(1))
 			.saturating_add(T::DbWeight::get().writes(1))
 	}
@@ -161,8 +159,8 @@ impl<T: frame_system::Config> WeightInfo<T> {
 		// Proof Size summary in bytes:
 		//  Measured:  `159`
 		//  Estimated: `3624`
-		// Minimum execution time: 53_846_000 picoseconds.
-		Weight::from_parts(54_684_000, 3624)
+		// Minimum execution time: 51_882_000 picoseconds.
+		Weight::from_parts(53_228_000, 3624)
 			.saturating_add(T::DbWeight::get().reads(7))
 			.saturating_add(T::DbWeight::get().writes(3))
 	}
@@ -182,8 +180,8 @@ impl<T: frame_system::Config> WeightInfo<T> {
 		// Proof Size summary in bytes:
 		//  Measured:  `107`
 		//  Estimated: `3572`
-		// Minimum execution time: 33_052_000 picoseconds.
-		Weight::from_parts(33_897_000, 3572)
+		// Minimum execution time: 32_195_000 picoseconds.
+		Weight::from_parts(33_206_000, 3572)
 			.saturating_add(T::DbWeight::get().reads(6))
 			.saturating_add(T::DbWeight::get().writes(2))
 	}
diff --git a/cumulus/parachains/runtimes/bridge-hubs/bridge-hub-rococo/src/weights/xcm/pallet_xcm_benchmarks_generic.rs b/cumulus/parachains/runtimes/bridge-hubs/bridge-hub-rococo/src/weights/xcm/pallet_xcm_benchmarks_generic.rs
index 3cb066bc53df6e453227af12a4ecf58dab831394..da3404909f31ca9418a9f2d21117178833bb1a11 100644
--- a/cumulus/parachains/runtimes/bridge-hubs/bridge-hub-rococo/src/weights/xcm/pallet_xcm_benchmarks_generic.rs
+++ b/cumulus/parachains/runtimes/bridge-hubs/bridge-hub-rococo/src/weights/xcm/pallet_xcm_benchmarks_generic.rs
@@ -1,4 +1,4 @@
-// Copyright Parity Technologies (UK) Ltd.
+// Copyright (C) Parity Technologies (UK) Ltd.
 // This file is part of Cumulus.
 
 // Cumulus is free software: you can redistribute it and/or modify
diff --git a/cumulus/parachains/runtimes/bridge-hubs/bridge-hub-rococo/src/xcm_config.rs b/cumulus/parachains/runtimes/bridge-hubs/bridge-hub-rococo/src/xcm_config.rs
index 170382fe5834c4a5d8a7b4352337ecc666a3c9a9..1639a507091d1b30ae8d58a0df9e77f983b46694 100644
--- a/cumulus/parachains/runtimes/bridge-hubs/bridge-hub-rococo/src/xcm_config.rs
+++ b/cumulus/parachains/runtimes/bridge-hubs/bridge-hub-rococo/src/xcm_config.rs
@@ -1,4 +1,4 @@
-// Copyright 2022 Parity Technologies (UK) Ltd.
+// Copyright (C) Parity Technologies (UK) Ltd.
 // This file is part of Cumulus.
 
 // Cumulus is free software: you can redistribute it and/or modify
@@ -30,8 +30,8 @@ use frame_support::{
 };
 use frame_system::EnsureRoot;
 use pallet_xcm::XcmPassthrough;
-use parachains_common::{impls::ToStakingPot, xcm_config::ConcreteNativeAssetFrom};
-use polkadot_parachain::primitives::Sibling;
+use parachains_common::{impls::ToStakingPot, xcm_config::ConcreteAssetFromSystem};
+use polkadot_parachain_primitives::primitives::Sibling;
 use sp_core::Get;
 use xcm::latest::prelude::*;
 use xcm_builder::{
@@ -224,6 +224,10 @@ pub type Barrier = TrailingSetTopicAsId<
 	>,
 >;
 
+/// Cases where a remote origin is accepted as trusted Teleporter for a given asset:
+/// - NativeToken with the parent Relay Chain and sibling parachains.
+pub type TrustedTeleporters = ConcreteAssetFromSystem<RelayLocation>;
+
 pub struct XcmConfig;
 impl xcm_executor::Config for XcmConfig {
 	type RuntimeCall = RuntimeCall;
@@ -233,8 +237,7 @@ impl xcm_executor::Config for XcmConfig {
 	// BridgeHub does not recognize a reserve location for any asset. Users must teleport Native
 	// token where allowed (e.g. with the Relay Chain).
 	type IsReserve = ();
-	/// Only allow teleportation of NativeToken of relay chain.
-	type IsTeleporter = ConcreteNativeAssetFrom<RelayLocation>;
+	type IsTeleporter = TrustedTeleporters;
 	type UniversalLocation = UniversalLocation;
 	type Barrier = Barrier;
 	type Weigher = WeightInfoBounds<
diff --git a/cumulus/parachains/runtimes/bridge-hubs/bridge-hub-rococo/tests/tests.rs b/cumulus/parachains/runtimes/bridge-hubs/bridge-hub-rococo/tests/tests.rs
index 1d8439d23e0d7c273cc6d5cc1ded6763ea619c7e..e5fe67f2a8e5b29a46adcf2a133ce9e956df9d5b 100644
--- a/cumulus/parachains/runtimes/bridge-hubs/bridge-hub-rococo/tests/tests.rs
+++ b/cumulus/parachains/runtimes/bridge-hubs/bridge-hub-rococo/tests/tests.rs
@@ -1,4 +1,4 @@
-// Copyright 2023 Parity Technologies (UK) Ltd.
+// Copyright (C) Parity Technologies (UK) Ltd.
 // This file is part of Cumulus.
 
 // Cumulus is free software: you can redistribute it and/or modify
@@ -19,7 +19,6 @@
 use bp_polkadot_core::Signature;
 use bridge_hub_rococo_runtime::{
 	bridge_hub_rococo_config, bridge_hub_wococo_config,
-	constants::fee::WeightToFee,
 	xcm_config::{RelayNetwork, XcmConfig},
 	AllPalletsWithoutSystem, BridgeRejectObsoleteHeadersAndMessages, DeliveryRewardInBalance,
 	Executive, ExistentialDeposit, ParachainSystem, PolkadotXcm, RequiredStakeForStakeAndSlash,
@@ -28,7 +27,7 @@ use bridge_hub_rococo_runtime::{
 use codec::{Decode, Encode};
 use frame_support::parameter_types;
 use frame_system::pallet_prelude::HeaderFor;
-use parachains_common::{AccountId, AuraId, Balance};
+use parachains_common::{rococo::fee::WeightToFee, AccountId, AuraId, Balance};
 use sp_keyring::AccountKeyring::Alice;
 use sp_runtime::{
 	generic::{Era, SignedPayload},
diff --git a/cumulus/parachains/runtimes/bridge-hubs/test-utils/Cargo.toml b/cumulus/parachains/runtimes/bridge-hubs/test-utils/Cargo.toml
index 1efa805d6099f17b3420ab02afb3c42348888a4d..d56c32d8afabb3c40eb861f028c5f954889cf60d 100644
--- a/cumulus/parachains/runtimes/bridge-hubs/test-utils/Cargo.toml
+++ b/cumulus/parachains/runtimes/bridge-hubs/test-utils/Cargo.toml
@@ -1,8 +1,8 @@
 [package]
 name = "bridge-hub-test-utils"
 version = "0.1.0"
-authors = ["Parity Technologies <admin@parity.io>"]
-edition = "2021"
+authors.workspace = true
+edition.workspace = true
 description = "Utils for BridgeHub testing"
 
 [dependencies]
@@ -36,25 +36,25 @@ parachains-runtimes-test-utils = { path = "../../test-utils", default-features =
 # Polkadot
 pallet-xcm = { path = "../../../../../polkadot/xcm/pallet-xcm", default-features = false}
 pallet-xcm-benchmarks = { path = "../../../../../polkadot/xcm/pallet-xcm-benchmarks", default-features = false, optional = true }
-xcm = { path = "../../../../../polkadot/xcm", default-features = false}
-xcm-builder = { path = "../../../../../polkadot/xcm/xcm-builder", default-features = false}
-xcm-executor = { path = "../../../../../polkadot/xcm/xcm-executor", default-features = false}
+xcm = { package = "staging-xcm", path = "../../../../../polkadot/xcm", default-features = false}
+xcm-builder = { package = "staging-xcm-builder", path = "../../../../../polkadot/xcm/xcm-builder", default-features = false}
+xcm-executor = { package = "staging-xcm-executor", path = "../../../../../polkadot/xcm/xcm-executor", default-features = false}
 
 # Bridges
-bp-bridge-hub-rococo = { path = "../../../../bridges/primitives/chain-bridge-hub-rococo", default-features = false }
-bp-bridge-hub-wococo = { path = "../../../../bridges/primitives/chain-bridge-hub-wococo", default-features = false }
-bp-header-chain = { path = "../../../../bridges/primitives/header-chain", default-features = false }
-bp-messages = { path = "../../../../bridges/primitives/messages", default-features = false }
-bp-parachains = { path = "../../../../bridges/primitives/parachains", default-features = false }
-bp-polkadot-core = { path = "../../../../bridges/primitives/polkadot-core", default-features = false }
-bp-relayers = { path = "../../../../bridges/primitives/relayers", default-features = false }
-bp-runtime = { path = "../../../../bridges/primitives/runtime", default-features = false }
-bp-test-utils = { path = "../../../../bridges/primitives/test-utils", default-features = false }
-pallet-bridge-grandpa = { path = "../../../../bridges/modules/grandpa", default-features = false }
-pallet-bridge-parachains = { path = "../../../../bridges/modules/parachains", default-features = false }
-pallet-bridge-messages = { path = "../../../../bridges/modules/messages", default-features = false }
-pallet-bridge-relayers = { path = "../../../../bridges/modules/relayers", default-features = false }
-bridge-runtime-common = { path = "../../../../bridges/bin/runtime-common", default-features = false }
+bp-bridge-hub-rococo = { path = "../../../../../bridges/primitives/chain-bridge-hub-rococo", default-features = false }
+bp-bridge-hub-wococo = { path = "../../../../../bridges/primitives/chain-bridge-hub-wococo", default-features = false }
+bp-header-chain = { path = "../../../../../bridges/primitives/header-chain", default-features = false }
+bp-messages = { path = "../../../../../bridges/primitives/messages", default-features = false }
+bp-parachains = { path = "../../../../../bridges/primitives/parachains", default-features = false }
+bp-polkadot-core = { path = "../../../../../bridges/primitives/polkadot-core", default-features = false }
+bp-relayers = { path = "../../../../../bridges/primitives/relayers", default-features = false }
+bp-runtime = { path = "../../../../../bridges/primitives/runtime", default-features = false }
+bp-test-utils = { path = "../../../../../bridges/primitives/test-utils", default-features = false }
+pallet-bridge-grandpa = { path = "../../../../../bridges/modules/grandpa", default-features = false }
+pallet-bridge-parachains = { path = "../../../../../bridges/modules/parachains", default-features = false }
+pallet-bridge-messages = { path = "../../../../../bridges/modules/messages", default-features = false }
+pallet-bridge-relayers = { path = "../../../../../bridges/modules/relayers", default-features = false }
+bridge-runtime-common = { path = "../../../../../bridges/bin/runtime-common", default-features = false }
 
 [features]
 default = [ "std" ]
@@ -84,8 +84,10 @@ std = [
 	"pallet-bridge-messages/std",
 	"pallet-bridge-parachains/std",
 	"pallet-bridge-relayers/std",
+	"pallet-collator-selection/std",
 	"pallet-session/std",
 	"pallet-utility/std",
+	"pallet-xcm-benchmarks?/std",
 	"pallet-xcm/std",
 	"parachain-info/std",
 	"parachains-common/std",
diff --git a/cumulus/parachains/runtimes/bridge-hubs/test-utils/src/lib.rs b/cumulus/parachains/runtimes/bridge-hubs/test-utils/src/lib.rs
index 289d3f5b4d31affa08bb444849842d1c81701895..26eb09b73fa6c9755ee613ae6bf4ff776c541ec6 100644
--- a/cumulus/parachains/runtimes/bridge-hubs/test-utils/src/lib.rs
+++ b/cumulus/parachains/runtimes/bridge-hubs/test-utils/src/lib.rs
@@ -1,4 +1,4 @@
-// Copyright Parity Technologies (UK) Ltd.
+// Copyright (C) Parity Technologies (UK) Ltd.
 // This file is part of Cumulus.
 
 // Cumulus is free software: you can redistribute it and/or modify
diff --git a/cumulus/parachains/runtimes/bridge-hubs/test-utils/src/test_cases.rs b/cumulus/parachains/runtimes/bridge-hubs/test-utils/src/test_cases.rs
index bd0f070f9dcd375081890c83a86ca2d237821912..aa7fa16a9791c626eaa4473f6de5914e6f5867ca 100644
--- a/cumulus/parachains/runtimes/bridge-hubs/test-utils/src/test_cases.rs
+++ b/cumulus/parachains/runtimes/bridge-hubs/test-utils/src/test_cases.rs
@@ -1,4 +1,4 @@
-// Copyright 2023 Parity Technologies (UK) Ltd.
+// Copyright (C) Parity Technologies (UK) Ltd.
 // This file is part of Cumulus.
 
 // Cumulus is free software: you can redistribute it and/or modify
diff --git a/cumulus/parachains/runtimes/collectives/collectives-polkadot/Cargo.toml b/cumulus/parachains/runtimes/collectives/collectives-polkadot/Cargo.toml
index 3d2f6e6ee2a136a68f160556ca6ff5a0b9ba3951..e66cef31e56f4817fa31def359d5c7e132ea9c49 100644
--- a/cumulus/parachains/runtimes/collectives/collectives-polkadot/Cargo.toml
+++ b/cumulus/parachains/runtimes/collectives/collectives-polkadot/Cargo.toml
@@ -1,8 +1,8 @@
 [package]
 name = "collectives-polkadot-runtime"
 version = "1.0.0"
-authors = ["Parity Technologies <admin@parity.io>"]
-edition = "2021"
+authors.workspace = true
+edition.workspace = true
 description = "Polkadot Collectives Parachain Runtime"
 
 [dependencies]
@@ -43,6 +43,7 @@ sp-arithmetic = { path = "../../../../../substrate/primitives/arithmetic", defau
 sp-block-builder = { path = "../../../../../substrate/primitives/block-builder", default-features = false}
 sp-consensus-aura = { path = "../../../../../substrate/primitives/consensus/aura", default-features = false}
 sp-core = { path = "../../../../../substrate/primitives/core", default-features = false}
+sp-genesis-builder = { path = "../../../../../substrate/primitives/genesis-builder", default-features = false }
 sp-inherents = { path = "../../../../../substrate/primitives/inherents", default-features = false}
 sp-offchain = { path = "../../../../../substrate/primitives/offchain", default-features = false}
 sp-runtime = { path = "../../../../../substrate/primitives/runtime", default-features = false}
@@ -55,12 +56,11 @@ sp-version = { path = "../../../../../substrate/primitives/version", default-fea
 # Polkadot
 pallet-xcm = { path = "../../../../../polkadot/xcm/pallet-xcm", default-features = false}
 polkadot-core-primitives = { path = "../../../../../polkadot/core-primitives", default-features = false}
-polkadot-parachain = { path = "../../../../../polkadot/parachain", default-features = false}
+polkadot-parachain-primitives = { path = "../../../../../polkadot/parachain", default-features = false}
 polkadot-runtime-common = { path = "../../../../../polkadot/runtime/common", default-features = false}
-polkadot-runtime-constants = { path = "../../../../../polkadot/runtime/polkadot/constants", default-features = false}
-xcm = { path = "../../../../../polkadot/xcm", default-features = false}
-xcm-builder = { path = "../../../../../polkadot/xcm/xcm-builder", default-features = false}
-xcm-executor = { path = "../../../../../polkadot/xcm/xcm-executor", default-features = false}
+xcm = { package = "staging-xcm", path = "../../../../../polkadot/xcm", default-features = false}
+xcm-builder = { package = "staging-xcm-builder", path = "../../../../../polkadot/xcm/xcm-builder", default-features = false}
+xcm-executor = { package = "staging-xcm-executor", path = "../../../../../polkadot/xcm/xcm-executor", default-features = false}
 
 # Cumulus
 cumulus-pallet-aura-ext = { path = "../../../../pallets/aura-ext", default-features = false }
@@ -72,6 +72,7 @@ cumulus-pallet-xcmp-queue = { path = "../../../../pallets/xcmp-queue", default-f
 cumulus-primitives-core = { path = "../../../../primitives/core", default-features = false }
 cumulus-primitives-utility = { path = "../../../../primitives/utility", default-features = false }
 pallet-collator-selection = { path = "../../../../pallets/collator-selection", default-features = false }
+pallet-collective-content = { path = "../../../pallets/collective-content", default-features = false }
 parachain-info = { path = "../../../pallets/parachain-info", default-features = false }
 parachains-common = { path = "../../../common", default-features = false }
 
@@ -87,6 +88,7 @@ runtime-benchmarks = [
 	"cumulus-pallet-parachain-system/runtime-benchmarks",
 	"cumulus-pallet-session-benchmarking/runtime-benchmarks",
 	"cumulus-pallet-xcmp-queue/runtime-benchmarks",
+	"cumulus-primitives-utility/runtime-benchmarks",
 	"frame-benchmarking/runtime-benchmarks",
 	"frame-support/runtime-benchmarks",
 	"frame-system-benchmarking/runtime-benchmarks",
@@ -94,6 +96,7 @@ runtime-benchmarks = [
 	"pallet-alliance/runtime-benchmarks",
 	"pallet-balances/runtime-benchmarks",
 	"pallet-collator-selection/runtime-benchmarks",
+	"pallet-collective-content/runtime-benchmarks",
 	"pallet-collective/runtime-benchmarks",
 	"pallet-core-fellowship/runtime-benchmarks",
 	"pallet-multisig/runtime-benchmarks",
@@ -106,8 +109,12 @@ runtime-benchmarks = [
 	"pallet-timestamp/runtime-benchmarks",
 	"pallet-utility/runtime-benchmarks",
 	"pallet-xcm/runtime-benchmarks",
+	"parachains-common/runtime-benchmarks",
+	"polkadot-parachain-primitives/runtime-benchmarks",
+	"polkadot-runtime-common/runtime-benchmarks",
 	"sp-runtime/runtime-benchmarks",
 	"xcm-builder/runtime-benchmarks",
+	"xcm-executor/runtime-benchmarks",
 ]
 try-runtime = [
 	"cumulus-pallet-aura-ext/try-runtime",
@@ -116,6 +123,7 @@ try-runtime = [
 	"cumulus-pallet-xcm/try-runtime",
 	"cumulus-pallet-xcmp-queue/try-runtime",
 	"frame-executive/try-runtime",
+	"frame-support/try-runtime",
 	"frame-system/try-runtime",
 	"frame-try-runtime/try-runtime",
 	"pallet-alliance/try-runtime",
@@ -123,6 +131,7 @@ try-runtime = [
 	"pallet-authorship/try-runtime",
 	"pallet-balances/try-runtime",
 	"pallet-collator-selection/try-runtime",
+	"pallet-collective-content/try-runtime",
 	"pallet-collective/try-runtime",
 	"pallet-core-fellowship/try-runtime",
 	"pallet-multisig/try-runtime",
@@ -138,26 +147,33 @@ try-runtime = [
 	"pallet-utility/try-runtime",
 	"pallet-xcm/try-runtime",
 	"parachain-info/try-runtime",
+	"polkadot-runtime-common/try-runtime",
+	"sp-runtime/try-runtime",
 ]
 std = [
 	"codec/std",
 	"cumulus-pallet-aura-ext/std",
 	"cumulus-pallet-dmp-queue/std",
 	"cumulus-pallet-parachain-system/std",
+	"cumulus-pallet-session-benchmarking/std",
 	"cumulus-pallet-xcm/std",
 	"cumulus-pallet-xcmp-queue/std",
 	"cumulus-primitives-core/std",
 	"cumulus-primitives-utility/std",
+	"frame-benchmarking?/std",
 	"frame-executive/std",
 	"frame-support/std",
+	"frame-system-benchmarking?/std",
 	"frame-system-rpc-runtime-api/std",
 	"frame-system/std",
+	"frame-try-runtime?/std",
 	"log/std",
 	"pallet-alliance/std",
 	"pallet-aura/std",
 	"pallet-authorship/std",
 	"pallet-balances/std",
 	"pallet-collator-selection/std",
+	"pallet-collective-content/std",
 	"pallet-collective/std",
 	"pallet-core-fellowship/std",
 	"pallet-multisig/std",
@@ -176,19 +192,22 @@ std = [
 	"parachain-info/std",
 	"parachains-common/std",
 	"polkadot-core-primitives/std",
-	"polkadot-parachain/std",
+	"polkadot-parachain-primitives/std",
 	"polkadot-runtime-common/std",
-	"polkadot-runtime-constants/std",
 	"scale-info/std",
 	"sp-api/std",
+	"sp-arithmetic/std",
 	"sp-block-builder/std",
 	"sp-consensus-aura/std",
 	"sp-core/std",
+	"sp-genesis-builder/std",
 	"sp-inherents/std",
+	"sp-io/std",
 	"sp-offchain/std",
 	"sp-runtime/std",
 	"sp-session/std",
 	"sp-std/std",
+	"sp-storage/std",
 	"sp-transaction-pool/std",
 	"sp-version/std",
 	"substrate-wasm-builder",
diff --git a/cumulus/parachains/runtimes/collectives/collectives-polkadot/src/ambassador/mod.rs b/cumulus/parachains/runtimes/collectives/collectives-polkadot/src/ambassador/mod.rs
new file mode 100644
index 0000000000000000000000000000000000000000..b055ffc8abf1337e1260156cd149fe21b0573ba0
--- /dev/null
+++ b/cumulus/parachains/runtimes/collectives/collectives-polkadot/src/ambassador/mod.rs
@@ -0,0 +1,255 @@
+// Copyright (C) 2022 Parity Technologies (UK) Ltd.
+// SPDX-License-Identifier: Apache-2.0
+
+// Licensed under the Apache License, Version 2.0 (the "License");
+// you may not use this file except in compliance with the License.
+// You may obtain a copy of the License at
+//
+// 	http://www.apache.org/licenses/LICENSE-2.0
+//
+// Unless required by applicable law or agreed to in writing, software
+// distributed under the License is distributed on an "AS IS" BASIS,
+// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+// See the License for the specific language governing permissions and
+// limitations under the License.
+
+//! The Ambassador Program.
+//!
+//! The module defines the following on-chain functionality of the Ambassador Program:
+//!
+//! - Managed set of program members, where every member has a [rank](ranks)
+//! (via [AmbassadorCollective](pallet_ranked_collective)).
+//! - Referendum functionality for the program members to propose, vote on, and execute
+//! proposals on behalf of the members of a certain [rank](Origin)
+//! (via [AmbassadorReferenda](pallet_referenda)).
+//! - Managed content (charter, announcements) (via [pallet_collective_content]).
+//! - Promotion and demotion periods, register of members' activity, and rank based salaries
+//! (via [AmbassadorCore](pallet_core_fellowship)).
+//! - Members' salaries (via [AmbassadorSalary](pallet_salary), requiring a member to be
+//! imported or inducted into [AmbassadorCore](pallet_core_fellowship)).
+
+pub mod origins;
+mod tracks;
+
+use super::*;
+use crate::xcm_config::{DotAssetHub, FellowshipAdminBodyId};
+use frame_support::traits::{EitherOf, MapSuccess, TryMapSuccess};
+pub use origins::pallet_origins as pallet_ambassador_origins;
+use origins::pallet_origins::{
+	EnsureAmbassadorsVoice, EnsureAmbassadorsVoiceFrom, EnsureHeadAmbassadorsVoice, Origin,
+};
+use parachains_common::polkadot::account;
+use sp_core::ConstU128;
+use sp_runtime::traits::{CheckedReduceBy, ConstU16, ConvertToValue, Replace};
+use xcm::prelude::*;
+use xcm_builder::{AliasesIntoAccountId32, PayOverXcm};
+
+/// The Ambassador Program's member ranks.
+pub mod ranks {
+	use pallet_ranked_collective::Rank;
+
+	#[allow(dead_code)]
+	pub const CANDIDATE: Rank = 0;
+	pub const AMBASSADOR_TIER_1: Rank = 1;
+	pub const AMBASSADOR_TIER_2: Rank = 2;
+	pub const SENIOR_AMBASSADOR_TIER_3: Rank = 3;
+	pub const SENIOR_AMBASSADOR_TIER_4: Rank = 4;
+	pub const HEAD_AMBASSADOR_TIER_5: Rank = 5;
+	pub const HEAD_AMBASSADOR_TIER_6: Rank = 6;
+	pub const HEAD_AMBASSADOR_TIER_7: Rank = 7;
+	pub const MASTER_AMBASSADOR_TIER_8: Rank = 8;
+	pub const MASTER_AMBASSADOR_TIER_9: Rank = 9;
+}
+
+impl pallet_ambassador_origins::Config for Runtime {}
+
+pub type AmbassadorCollectiveInstance = pallet_ranked_collective::Instance2;
+
+/// Demotion is by any of:
+/// - Root can promote arbitrarily.
+/// - the FellowshipAdmin origin (i.e. token holder referendum);
+/// - a senior members vote by the rank two above the current rank.
+pub type DemoteOrigin = EitherOf<
+	frame_system::EnsureRootWithSuccess<AccountId, ConstU16<65535>>,
+	EitherOf<
+		MapSuccess<
+			EnsureXcm<IsVoiceOfBody<GovernanceLocation, FellowshipAdminBodyId>>,
+			Replace<ConstU16<{ ranks::MASTER_AMBASSADOR_TIER_9 }>>,
+		>,
+		TryMapSuccess<
+			EnsureAmbassadorsVoiceFrom<ConstU16<{ ranks::SENIOR_AMBASSADOR_TIER_3 }>>,
+			CheckedReduceBy<ConstU16<2>>,
+		>,
+	>,
+>;
+
+/// Promotion and approval (rank-retention) is by any of:
+/// - Root can promote arbitrarily.
+/// - the FellowshipAdmin origin (i.e. token holder referendum);
+/// - a senior members vote by the rank two above the new/current rank.
+/// - a member of rank `5` or above can add a candidate (rank `0`).
+pub type PromoteOrigin = EitherOf<
+	DemoteOrigin,
+	TryMapSuccess<
+		pallet_ranked_collective::EnsureMember<
+			Runtime,
+			AmbassadorCollectiveInstance,
+			{ ranks::HEAD_AMBASSADOR_TIER_5 },
+		>,
+		Replace<ConstU16<0>>,
+	>,
+>;
+
+impl pallet_ranked_collective::Config<AmbassadorCollectiveInstance> for Runtime {
+	type WeightInfo = weights::pallet_ranked_collective_ambassador_collective::WeightInfo<Runtime>;
+	type RuntimeEvent = RuntimeEvent;
+	type PromoteOrigin = PromoteOrigin;
+	type DemoteOrigin = DemoteOrigin;
+	type Polls = AmbassadorReferenda;
+	type MinRankOfClass = sp_runtime::traits::Identity;
+	type VoteWeight = pallet_ranked_collective::Linear;
+}
+
+parameter_types! {
+	pub const AlarmInterval: BlockNumber = 1;
+	pub const SubmissionDeposit: Balance = 0;
+	pub const UndecidingTimeout: BlockNumber = 7 * DAYS;
+	// The Ambassador Referenda pallet account, used as a temporarily place to deposit a slashed imbalance before teleport to the treasury.
+	pub AmbassadorPalletAccount: AccountId = account::AMBASSADOR_REFERENDA_PALLET_ID.into_account_truncating();
+}
+
+pub type AmbassadorReferendaInstance = pallet_referenda::Instance2;
+
+impl pallet_referenda::Config<AmbassadorReferendaInstance> for Runtime {
+	type WeightInfo = weights::pallet_referenda_ambassador_referenda::WeightInfo<Runtime>;
+	type RuntimeCall = RuntimeCall;
+	type RuntimeEvent = RuntimeEvent;
+	type Scheduler = Scheduler;
+	type Currency = Balances;
+	// A proposal can be submitted by a member of the Ambassador Program of
+	// [ranks::SENIOR_AMBASSADOR_TIER_3] rank or higher.
+	type SubmitOrigin = pallet_ranked_collective::EnsureMember<
+		Runtime,
+		AmbassadorCollectiveInstance,
+		{ ranks::SENIOR_AMBASSADOR_TIER_3 },
+	>;
+	type CancelOrigin = EitherOf<EnsureRoot<AccountId>, EnsureHeadAmbassadorsVoice>;
+	type KillOrigin = EitherOf<EnsureRoot<AccountId>, EnsureHeadAmbassadorsVoice>;
+	type Slash = ToParentTreasury<PolkadotTreasuryAccount, AmbassadorPalletAccount, Runtime>;
+	type Votes = pallet_ranked_collective::Votes;
+	type Tally = pallet_ranked_collective::TallyOf<Runtime, AmbassadorCollectiveInstance>;
+	type SubmissionDeposit = SubmissionDeposit;
+	type MaxQueued = ConstU32<20>;
+	type UndecidingTimeout = UndecidingTimeout;
+	type AlarmInterval = AlarmInterval;
+	type Tracks = tracks::TracksInfo;
+	type Preimages = Preimage;
+}
+
+parameter_types! {
+	pub const AnnouncementLifetime: BlockNumber = 180 * DAYS;
+	pub const MaxAnnouncements: u32 = 50;
+}
+
+pub type AmbassadorContentInstance = pallet_collective_content::Instance1;
+
+impl pallet_collective_content::Config<AmbassadorContentInstance> for Runtime {
+	type RuntimeEvent = RuntimeEvent;
+	type CharterOrigin = EitherOf<EnsureRoot<AccountId>, EnsureHeadAmbassadorsVoice>;
+	type AnnouncementLifetime = AnnouncementLifetime;
+	// An announcement can be submitted by a Senior Ambassador member or an ambassador plurality
+	// voice taken via referendum.
+	type AnnouncementOrigin = EitherOfDiverse<
+		pallet_ranked_collective::EnsureMember<
+			Runtime,
+			AmbassadorCollectiveInstance,
+			{ ranks::SENIOR_AMBASSADOR_TIER_3 },
+		>,
+		EnsureAmbassadorsVoice,
+	>;
+	type MaxAnnouncements = MaxAnnouncements;
+	type WeightInfo = weights::pallet_collective_content::WeightInfo<Runtime>;
+}
+
+pub type AmbassadorCoreInstance = pallet_core_fellowship::Instance2;
+
+impl pallet_core_fellowship::Config<AmbassadorCoreInstance> for Runtime {
+	type WeightInfo = weights::pallet_core_fellowship_ambassador_core::WeightInfo<Runtime>;
+	type RuntimeEvent = RuntimeEvent;
+	type Members = pallet_ranked_collective::Pallet<Runtime, AmbassadorCollectiveInstance>;
+	type Balance = Balance;
+	// Parameters are set by any of:
+	// - Root;
+	// - the FellowshipAdmin origin (i.e. token holder referendum);
+	// - a vote among all Head Ambassadors.
+	type ParamsOrigin = EitherOfDiverse<
+		EnsureXcm<IsVoiceOfBody<GovernanceLocation, FellowshipAdminBodyId>>,
+		EnsureHeadAmbassadorsVoice,
+	>;
+	// Induction (creating a candidate) is by any of:
+	// - Root;
+	// - the FellowshipAdmin origin (i.e. token holder referendum);
+	// - a single Head Ambassador;
+	// - a vote among all senior members.
+	type InductOrigin = EitherOfDiverse<
+		EnsureXcm<IsVoiceOfBody<GovernanceLocation, FellowshipAdminBodyId>>,
+		EitherOfDiverse<
+			pallet_ranked_collective::EnsureMember<
+				Runtime,
+				AmbassadorCollectiveInstance,
+				{ ranks::HEAD_AMBASSADOR_TIER_5 },
+			>,
+			EnsureAmbassadorsVoiceFrom<ConstU16<{ ranks::SENIOR_AMBASSADOR_TIER_3 }>>,
+		>,
+	>;
+	type ApproveOrigin = PromoteOrigin;
+	type PromoteOrigin = PromoteOrigin;
+	type EvidenceSize = ConstU32<65536>;
+}
+
+pub type AmbassadorSalaryInstance = pallet_salary::Instance2;
+
+parameter_types! {
+	// The interior location on AssetHub for the paying account. This is the Ambassador Salary
+	// pallet instance (which sits at index 74). This sovereign account will need funding.
+	pub AmbassadorSalaryLocation: InteriorMultiLocation = PalletInstance(74).into();
+}
+
+/// [`PayOverXcm`] setup to pay the Ambassador salary on the AssetHub in DOT.
+pub type AmbassadorSalaryPaymaster = PayOverXcm<
+	AmbassadorSalaryLocation,
+	crate::xcm_config::XcmRouter,
+	crate::PolkadotXcm,
+	ConstU32<{ 6 * HOURS }>,
+	AccountId,
+	(),
+	ConvertToValue<DotAssetHub>,
+	AliasesIntoAccountId32<(), AccountId>,
+>;
+
+impl pallet_salary::Config<AmbassadorSalaryInstance> for Runtime {
+	type WeightInfo = weights::pallet_salary_ambassador_salary::WeightInfo<Runtime>;
+	type RuntimeEvent = RuntimeEvent;
+
+	#[cfg(not(feature = "runtime-benchmarks"))]
+	type Paymaster = AmbassadorSalaryPaymaster;
+	#[cfg(feature = "runtime-benchmarks")]
+	type Paymaster = crate::impls::benchmarks::PayWithEnsure<
+		AmbassadorSalaryPaymaster,
+		crate::impls::benchmarks::OpenHrmpChannel<ConstU32<1000>>,
+	>;
+	type Members = pallet_ranked_collective::Pallet<Runtime, AmbassadorCollectiveInstance>;
+
+	#[cfg(not(feature = "runtime-benchmarks"))]
+	type Salary = pallet_core_fellowship::Pallet<Runtime, AmbassadorCoreInstance>;
+	#[cfg(feature = "runtime-benchmarks")]
+	type Salary = frame_support::traits::tokens::ConvertRank<
+		crate::impls::benchmarks::RankToSalary<Balances>,
+	>;
+	// 15 days to register for a salary payment.
+	type RegistrationPeriod = ConstU32<{ 15 * DAYS }>;
+	// 15 days to claim the salary payment.
+	type PayoutPeriod = ConstU32<{ 15 * DAYS }>;
+	// Total monthly salary budget.
+	type Budget = ConstU128<{ 10_000 * DOLLARS }>;
+}
diff --git a/cumulus/parachains/runtimes/collectives/collectives-polkadot/src/ambassador/origins.rs b/cumulus/parachains/runtimes/collectives/collectives-polkadot/src/ambassador/origins.rs
new file mode 100644
index 0000000000000000000000000000000000000000..3ce8a6b9e5d1bf7f70dda395f1998fd66d20cbeb
--- /dev/null
+++ b/cumulus/parachains/runtimes/collectives/collectives-polkadot/src/ambassador/origins.rs
@@ -0,0 +1,135 @@
+// Copyright (C) 2022 Parity Technologies (UK) Ltd.
+// SPDX-License-Identifier: Apache-2.0
+
+// Licensed under the Apache License, Version 2.0 (the "License");
+// you may not use this file except in compliance with the License.
+// You may obtain a copy of the License at
+//
+// 	http://www.apache.org/licenses/LICENSE-2.0
+//
+// Unless required by applicable law or agreed to in writing, software
+// distributed under the License is distributed on an "AS IS" BASIS,
+// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+// See the License for the specific language governing permissions and
+// limitations under the License.
+
+//! The Ambassador Program's origins.
+
+#[frame_support::pallet]
+pub mod pallet_origins {
+	use crate::ambassador::ranks;
+	use frame_support::pallet_prelude::*;
+	use pallet_ranked_collective::Rank;
+
+	#[pallet::pallet]
+	pub struct Pallet<T>(PhantomData<T>);
+
+	/// The pallet configuration trait.
+	#[pallet::config]
+	pub trait Config: frame_system::Config {}
+
+	#[derive(PartialEq, Eq, Clone, MaxEncodedLen, Encode, Decode, TypeInfo, RuntimeDebug)]
+	#[pallet::origin]
+	pub enum Origin {
+		/// Plurality voice of the [ranks::AMBASSADOR_TIER_1] members or above given via
+		/// referendum.
+		Ambassadors,
+		/// Plurality voice of the [ranks::AMBASSADOR_TIER_2] members or above given via
+		/// referendum.
+		AmbassadorsTier2,
+		/// Plurality voice of the [ranks::SENIOR_AMBASSADOR_TIER_3] members or above given via
+		/// referendum.
+		SeniorAmbassadors,
+		/// Plurality voice of the [ranks::SENIOR_AMBASSADOR_TIER_4] members or above given via
+		/// referendum.
+		SeniorAmbassadorsTier4,
+		/// Plurality voice of the [ranks::HEAD_AMBASSADOR_TIER_5] members or above given via
+		/// referendum.
+		HeadAmbassadors,
+		/// Plurality voice of the [ranks::HEAD_AMBASSADOR_TIER_6] members or above given via
+		/// referendum.
+		HeadAmbassadorsTier6,
+		/// Plurality voice of the [ranks::HEAD_AMBASSADOR_TIER_7] members or above given via
+		/// referendum.
+		HeadAmbassadorsTier7,
+		/// Plurality voice of the [ranks::MASTER_AMBASSADOR_TIER_8] members or above given via
+		/// referendum.
+		MasterAmbassadors,
+		/// Plurality voice of the [ranks::MASTER_AMBASSADOR_TIER_9] members or above given via
+		/// referendum.
+		MasterAmbassadorsTier9,
+	}
+
+	impl Origin {
+		/// Returns the rank that the origin `self` speaks for, or `None` if it doesn't speak for
+		/// any.
+		pub fn as_voice(&self) -> Option<Rank> {
+			Some(match &self {
+				Origin::Ambassadors => ranks::AMBASSADOR_TIER_1,
+				Origin::AmbassadorsTier2 => ranks::AMBASSADOR_TIER_2,
+				Origin::SeniorAmbassadors => ranks::SENIOR_AMBASSADOR_TIER_3,
+				Origin::SeniorAmbassadorsTier4 => ranks::SENIOR_AMBASSADOR_TIER_4,
+				Origin::HeadAmbassadors => ranks::HEAD_AMBASSADOR_TIER_5,
+				Origin::HeadAmbassadorsTier6 => ranks::HEAD_AMBASSADOR_TIER_6,
+				Origin::HeadAmbassadorsTier7 => ranks::HEAD_AMBASSADOR_TIER_7,
+				Origin::MasterAmbassadors => ranks::MASTER_AMBASSADOR_TIER_8,
+				Origin::MasterAmbassadorsTier9 => ranks::MASTER_AMBASSADOR_TIER_9,
+			})
+		}
+	}
+
+	/// Implementation of the [EnsureOrigin] trait for the [Origin::HeadAmbassadors] origin.
+	pub struct EnsureHeadAmbassadorsVoice;
+	impl<O: Into<Result<Origin, O>> + From<Origin>> EnsureOrigin<O> for EnsureHeadAmbassadorsVoice {
+		type Success = ();
+		fn try_origin(o: O) -> Result<Self::Success, O> {
+			o.into().and_then(|o| match o {
+				Origin::HeadAmbassadors => Ok(()),
+				r => Err(O::from(r)),
+			})
+		}
+
+		#[cfg(feature = "runtime-benchmarks")]
+		fn try_successful_origin() -> Result<O, ()> {
+			Ok(O::from(Origin::HeadAmbassadors))
+		}
+	}
+
+	/// Implementation of the [EnsureOrigin] trait for the plurality voice [Origin]s
+	/// from a given rank `R` with the success result of the corresponding [Rank].
+	pub struct EnsureAmbassadorsVoiceFrom<R>(PhantomData<R>);
+	impl<R: Get<Rank>, O: Into<Result<Origin, O>> + From<Origin>> EnsureOrigin<O>
+		for EnsureAmbassadorsVoiceFrom<R>
+	{
+		type Success = Rank;
+		fn try_origin(o: O) -> Result<Self::Success, O> {
+			o.into().and_then(|o| match Origin::as_voice(&o) {
+				Some(r) if r >= R::get() => Ok(r),
+				_ => Err(O::from(o)),
+			})
+		}
+
+		#[cfg(feature = "runtime-benchmarks")]
+		fn try_successful_origin() -> Result<O, ()> {
+			ranks::MASTER_AMBASSADOR_TIER_9
+				.ge(&R::get())
+				.then(|| O::from(Origin::MasterAmbassadorsTier9))
+				.ok_or(())
+		}
+	}
+
+	/// Implementation of the [EnsureOrigin] trait for the plurality voice [Origin]s with the
+	/// success result of the corresponding [Rank].
+	pub struct EnsureAmbassadorsVoice;
+	impl<O: Into<Result<Origin, O>> + From<Origin>> EnsureOrigin<O> for EnsureAmbassadorsVoice {
+		type Success = Rank;
+		fn try_origin(o: O) -> Result<Self::Success, O> {
+			o.into().and_then(|o| Origin::as_voice(&o).ok_or(O::from(o)))
+		}
+
+		#[cfg(feature = "runtime-benchmarks")]
+		fn try_successful_origin() -> Result<O, ()> {
+			Ok(O::from(Origin::MasterAmbassadorsTier9))
+		}
+	}
+}
diff --git a/cumulus/parachains/runtimes/collectives/collectives-polkadot/src/ambassador/tracks.rs b/cumulus/parachains/runtimes/collectives/collectives-polkadot/src/ambassador/tracks.rs
new file mode 100644
index 0000000000000000000000000000000000000000..073d8e6ee362ad97f9fa66c612fca5e1a8123ab2
--- /dev/null
+++ b/cumulus/parachains/runtimes/collectives/collectives-polkadot/src/ambassador/tracks.rs
@@ -0,0 +1,282 @@
+// Copyright (C) 2022 Parity Technologies (UK) Ltd.
+// SPDX-License-Identifier: Apache-2.0
+
+// Licensed under the Apache License, Version 2.0 (the "License");
+// you may not use this file except in compliance with the License.
+// You may obtain a copy of the License at
+//
+// 	http://www.apache.org/licenses/LICENSE-2.0
+//
+// Unless required by applicable law or agreed to in writing, software
+// distributed under the License is distributed on an "AS IS" BASIS,
+// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+// See the License for the specific language governing permissions and
+// limitations under the License.
+
+//! The Ambassador Program's referenda voting tracks.
+
+use super::Origin;
+use crate::{Balance, BlockNumber, RuntimeOrigin, DAYS, DOLLARS, HOURS};
+use sp_runtime::Perbill;
+
+/// Referendum `TrackId` type.
+pub type TrackId = u16;
+
+/// Referendum track IDs.
+pub mod constants {
+	use super::TrackId;
+
+	pub const AMBASSADOR_TIER_1: TrackId = 1;
+	pub const AMBASSADOR_TIER_2: TrackId = 2;
+	pub const SENIOR_AMBASSADOR_TIER_3: TrackId = 3;
+	pub const SENIOR_AMBASSADOR_TIER_4: TrackId = 4;
+	pub const HEAD_AMBASSADOR_TIER_5: TrackId = 5;
+	pub const HEAD_AMBASSADOR_TIER_6: TrackId = 6;
+	pub const HEAD_AMBASSADOR_TIER_7: TrackId = 7;
+	pub const MASTER_AMBASSADOR_TIER_8: TrackId = 8;
+	pub const MASTER_AMBASSADOR_TIER_9: TrackId = 9;
+}
+
+/// The type implementing the [`pallet_referenda::TracksInfo`] trait for referenda pallet.
+pub struct TracksInfo;
+
+/// Information on the voting tracks.
+impl pallet_referenda::TracksInfo<Balance, BlockNumber> for TracksInfo {
+	type Id = TrackId;
+
+	type RuntimeOrigin = <RuntimeOrigin as frame_support::traits::OriginTrait>::PalletsOrigin;
+
+	/// Return the array of available tracks and their information.
+	fn tracks() -> &'static [(Self::Id, pallet_referenda::TrackInfo<Balance, BlockNumber>)] {
+		static DATA: [(TrackId, pallet_referenda::TrackInfo<Balance, BlockNumber>); 9] = [
+			(
+				constants::AMBASSADOR_TIER_1,
+				pallet_referenda::TrackInfo {
+					name: "ambassador tier 1",
+					max_deciding: 10,
+					decision_deposit: 5 * DOLLARS,
+					prepare_period: 24 * HOURS,
+					decision_period: 7 * DAYS,
+					confirm_period: 24 * HOURS,
+					min_enactment_period: 1 * HOURS,
+					min_approval: pallet_referenda::Curve::LinearDecreasing {
+						length: Perbill::from_percent(100),
+						floor: Perbill::from_percent(50),
+						ceil: Perbill::from_percent(100),
+					},
+					min_support: pallet_referenda::Curve::LinearDecreasing {
+						length: Perbill::from_percent(100),
+						floor: Perbill::from_percent(10),
+						ceil: Perbill::from_percent(50),
+					},
+				},
+			),
+			(
+				constants::AMBASSADOR_TIER_2,
+				pallet_referenda::TrackInfo {
+					name: "ambassador tier 2",
+					max_deciding: 10,
+					decision_deposit: 5 * DOLLARS,
+					prepare_period: 24 * HOURS,
+					decision_period: 7 * DAYS,
+					confirm_period: 24 * HOURS,
+					min_enactment_period: 1 * HOURS,
+					min_approval: pallet_referenda::Curve::LinearDecreasing {
+						length: Perbill::from_percent(100),
+						floor: Perbill::from_percent(50),
+						ceil: Perbill::from_percent(100),
+					},
+					min_support: pallet_referenda::Curve::LinearDecreasing {
+						length: Perbill::from_percent(100),
+						floor: Perbill::from_percent(10),
+						ceil: Perbill::from_percent(50),
+					},
+				},
+			),
+			(
+				constants::SENIOR_AMBASSADOR_TIER_3,
+				pallet_referenda::TrackInfo {
+					name: "senior ambassador tier 3",
+					max_deciding: 10,
+					decision_deposit: 5 * DOLLARS,
+					prepare_period: 24 * HOURS,
+					decision_period: 7 * DAYS,
+					confirm_period: 24 * HOURS,
+					min_enactment_period: 1 * HOURS,
+					min_approval: pallet_referenda::Curve::LinearDecreasing {
+						length: Perbill::from_percent(100),
+						floor: Perbill::from_percent(50),
+						ceil: Perbill::from_percent(100),
+					},
+					min_support: pallet_referenda::Curve::LinearDecreasing {
+						length: Perbill::from_percent(100),
+						floor: Perbill::from_percent(10),
+						ceil: Perbill::from_percent(50),
+					},
+				},
+			),
+			(
+				constants::SENIOR_AMBASSADOR_TIER_4,
+				pallet_referenda::TrackInfo {
+					name: "senior ambassador tier 4",
+					max_deciding: 10,
+					decision_deposit: 5 * DOLLARS,
+					prepare_period: 24 * HOURS,
+					decision_period: 7 * DAYS,
+					confirm_period: 24 * HOURS,
+					min_enactment_period: 1 * HOURS,
+					min_approval: pallet_referenda::Curve::LinearDecreasing {
+						length: Perbill::from_percent(100),
+						floor: Perbill::from_percent(50),
+						ceil: Perbill::from_percent(100),
+					},
+					min_support: pallet_referenda::Curve::LinearDecreasing {
+						length: Perbill::from_percent(100),
+						floor: Perbill::from_percent(10),
+						ceil: Perbill::from_percent(50),
+					},
+				},
+			),
+			(
+				constants::HEAD_AMBASSADOR_TIER_5,
+				pallet_referenda::TrackInfo {
+					name: "head ambassador tier 5",
+					max_deciding: 10,
+					decision_deposit: 5 * DOLLARS,
+					prepare_period: 24 * HOURS,
+					decision_period: 7 * DAYS,
+					confirm_period: 24 * HOURS,
+					min_enactment_period: 1 * HOURS,
+					min_approval: pallet_referenda::Curve::LinearDecreasing {
+						length: Perbill::from_percent(100),
+						floor: Perbill::from_percent(50),
+						ceil: Perbill::from_percent(100),
+					},
+					min_support: pallet_referenda::Curve::LinearDecreasing {
+						length: Perbill::from_percent(100),
+						floor: Perbill::from_percent(10),
+						ceil: Perbill::from_percent(50),
+					},
+				},
+			),
+			(
+				constants::HEAD_AMBASSADOR_TIER_6,
+				pallet_referenda::TrackInfo {
+					name: "head ambassador tier 6",
+					max_deciding: 10,
+					decision_deposit: 5 * DOLLARS,
+					prepare_period: 24 * HOURS,
+					decision_period: 7 * DAYS,
+					confirm_period: 24 * HOURS,
+					min_enactment_period: 1 * HOURS,
+					min_approval: pallet_referenda::Curve::LinearDecreasing {
+						length: Perbill::from_percent(100),
+						floor: Perbill::from_percent(50),
+						ceil: Perbill::from_percent(100),
+					},
+					min_support: pallet_referenda::Curve::LinearDecreasing {
+						length: Perbill::from_percent(100),
+						floor: Perbill::from_percent(10),
+						ceil: Perbill::from_percent(50),
+					},
+				},
+			),
+			(
+				constants::HEAD_AMBASSADOR_TIER_7,
+				pallet_referenda::TrackInfo {
+					name: "head ambassador tier 7",
+					max_deciding: 10,
+					decision_deposit: 5 * DOLLARS,
+					prepare_period: 24 * HOURS,
+					decision_period: 7 * DAYS,
+					confirm_period: 24 * HOURS,
+					min_enactment_period: 1 * HOURS,
+					min_approval: pallet_referenda::Curve::LinearDecreasing {
+						length: Perbill::from_percent(100),
+						floor: Perbill::from_percent(50),
+						ceil: Perbill::from_percent(100),
+					},
+					min_support: pallet_referenda::Curve::LinearDecreasing {
+						length: Perbill::from_percent(100),
+						floor: Perbill::from_percent(10),
+						ceil: Perbill::from_percent(50),
+					},
+				},
+			),
+			(
+				constants::MASTER_AMBASSADOR_TIER_8,
+				pallet_referenda::TrackInfo {
+					name: "master ambassador tier 8",
+					max_deciding: 10,
+					decision_deposit: 5 * DOLLARS,
+					prepare_period: 24 * HOURS,
+					decision_period: 7 * DAYS,
+					confirm_period: 24 * HOURS,
+					min_enactment_period: 1 * HOURS,
+					min_approval: pallet_referenda::Curve::LinearDecreasing {
+						length: Perbill::from_percent(100),
+						floor: Perbill::from_percent(50),
+						ceil: Perbill::from_percent(100),
+					},
+					min_support: pallet_referenda::Curve::LinearDecreasing {
+						length: Perbill::from_percent(100),
+						floor: Perbill::from_percent(10),
+						ceil: Perbill::from_percent(50),
+					},
+				},
+			),
+			(
+				constants::MASTER_AMBASSADOR_TIER_9,
+				pallet_referenda::TrackInfo {
+					name: "master ambassador tier 9",
+					max_deciding: 10,
+					decision_deposit: 5 * DOLLARS,
+					prepare_period: 24 * HOURS,
+					decision_period: 7 * DAYS,
+					confirm_period: 24 * HOURS,
+					min_enactment_period: 1 * HOURS,
+					min_approval: pallet_referenda::Curve::LinearDecreasing {
+						length: Perbill::from_percent(100),
+						floor: Perbill::from_percent(50),
+						ceil: Perbill::from_percent(100),
+					},
+					min_support: pallet_referenda::Curve::LinearDecreasing {
+						length: Perbill::from_percent(100),
+						floor: Perbill::from_percent(10),
+						ceil: Perbill::from_percent(50),
+					},
+				},
+			),
+		];
+		&DATA[..]
+	}
+
+	/// Determine the voting track for the given `origin`.
+	fn track_for(id: &Self::RuntimeOrigin) -> Result<Self::Id, ()> {
+		#[cfg(feature = "runtime-benchmarks")]
+		{
+			// For benchmarks, we enable a root origin.
+			// It is important that this is not available in production!
+			let root: Self::RuntimeOrigin = frame_system::RawOrigin::Root.into();
+			if &root == id {
+				return Ok(constants::MASTER_AMBASSADOR_TIER_9)
+			}
+		}
+
+		match Origin::try_from(id.clone()) {
+			Ok(Origin::Ambassadors) => Ok(constants::AMBASSADOR_TIER_1),
+			Ok(Origin::AmbassadorsTier2) => Ok(constants::AMBASSADOR_TIER_2),
+			Ok(Origin::SeniorAmbassadors) => Ok(constants::SENIOR_AMBASSADOR_TIER_3),
+			Ok(Origin::SeniorAmbassadorsTier4) => Ok(constants::SENIOR_AMBASSADOR_TIER_4),
+			Ok(Origin::HeadAmbassadors) => Ok(constants::HEAD_AMBASSADOR_TIER_5),
+			Ok(Origin::HeadAmbassadorsTier6) => Ok(constants::HEAD_AMBASSADOR_TIER_6),
+			Ok(Origin::HeadAmbassadorsTier7) => Ok(constants::HEAD_AMBASSADOR_TIER_7),
+			Ok(Origin::MasterAmbassadors) => Ok(constants::MASTER_AMBASSADOR_TIER_8),
+			Ok(Origin::MasterAmbassadorsTier9) => Ok(constants::MASTER_AMBASSADOR_TIER_9),
+			_ => Err(()),
+		}
+	}
+}
+
+// implements [`frame_support::traits::Get`] for [`TracksInfo`]
+pallet_referenda::impl_tracksinfo_get!(TracksInfo, Balance, BlockNumber);
diff --git a/cumulus/parachains/runtimes/collectives/collectives-polkadot/src/fellowship/migration.rs b/cumulus/parachains/runtimes/collectives/collectives-polkadot/src/fellowship/migration.rs
index 6f5b8aff8d4a059a36b25f90bf0bafd2cd608a7f..9350d03a2c9fbdd0806a80d94f2ccfa080e34848 100644
--- a/cumulus/parachains/runtimes/collectives/collectives-polkadot/src/fellowship/migration.rs
+++ b/cumulus/parachains/runtimes/collectives/collectives-polkadot/src/fellowship/migration.rs
@@ -1,4 +1,4 @@
-// Copyright 2023 Parity Technologies (UK) Ltd.
+// Copyright (C) Parity Technologies (UK) Ltd.
 // This file is part of Cumulus.
 
 // Cumulus is free software: you can redistribute it and/or modify
diff --git a/cumulus/parachains/runtimes/collectives/collectives-polkadot/src/fellowship/mod.rs b/cumulus/parachains/runtimes/collectives/collectives-polkadot/src/fellowship/mod.rs
index 489b868eff347ecd866002c587b18e95eb3862ab..2a2757ea5cebc28a1f85bbc28d50e0c523b54d90 100644
--- a/cumulus/parachains/runtimes/collectives/collectives-polkadot/src/fellowship/mod.rs
+++ b/cumulus/parachains/runtimes/collectives/collectives-polkadot/src/fellowship/mod.rs
@@ -1,4 +1,4 @@
-// Copyright 2023 Parity Technologies (UK) Ltd.
+// Copyright (C) Parity Technologies (UK) Ltd.
 // This file is part of Cumulus.
 
 // Cumulus is free software: you can redistribute it and/or modify
@@ -20,11 +20,12 @@ pub(crate) mod migration;
 mod origins;
 mod tracks;
 use crate::{
-	constants, impls::ToParentTreasury, weights, AccountId, Balance, Balances, FellowshipReferenda,
-	GovernanceLocation, PolkadotTreasuryAccount, Preimage, Runtime, RuntimeCall, RuntimeEvent,
-	RuntimeOrigin, Scheduler, DAYS,
+	impls::ToParentTreasury,
+	weights,
+	xcm_config::{FellowshipAdminBodyId, UsdtAssetHub},
+	AccountId, Balance, Balances, FellowshipReferenda, GovernanceLocation, PolkadotTreasuryAccount,
+	Preimage, Runtime, RuntimeCall, RuntimeEvent, RuntimeOrigin, Scheduler, DAYS,
 };
-use cumulus_primitives_core::Junction::GeneralIndex;
 use frame_support::{
 	parameter_types,
 	traits::{EitherOf, EitherOfDiverse, MapSuccess, OriginTrait, TryWithMorphedArg},
@@ -36,11 +37,10 @@ pub use origins::{
 };
 use pallet_ranked_collective::EnsureOfRank;
 use pallet_xcm::{EnsureXcm, IsVoiceOfBody};
-use polkadot_runtime_constants::{time::HOURS, xcm::body::FELLOWSHIP_ADMIN_INDEX};
+use parachains_common::{polkadot::account, HOURS};
 use sp_core::{ConstU128, ConstU32};
 use sp_runtime::traits::{AccountIdConversion, ConstU16, ConvertToValue, Replace, TakeFirst};
-use xcm::latest::BodyId;
-use xcm_builder::{AliasesIntoAccountId32, LocatableAssetId, PayOverXcm};
+use xcm_builder::{AliasesIntoAccountId32, PayOverXcm};
 
 #[cfg(feature = "runtime-benchmarks")]
 use crate::impls::benchmarks::{OpenHrmpChannel, PayWithEnsure};
@@ -62,8 +62,7 @@ pub mod ranks {
 
 parameter_types! {
 	// Referenda pallet account, used to temporarily deposit slashed imbalance before teleporting.
-	pub ReferendaPalletAccount: AccountId = constants::account::REFERENDA_PALLET_ID.into_account_truncating();
-	pub const FellowshipAdminBodyId: BodyId = BodyId::Index(FELLOWSHIP_ADMIN_INDEX);
+	pub ReferendaPalletAccount: AccountId = account::REFERENDA_PALLET_ID.into_account_truncating();
 }
 
 impl pallet_fellowship_origins::Config for Runtime {}
@@ -71,7 +70,7 @@ impl pallet_fellowship_origins::Config for Runtime {}
 pub type FellowshipReferendaInstance = pallet_referenda::Instance1;
 
 impl pallet_referenda::Config<FellowshipReferendaInstance> for Runtime {
-	type WeightInfo = weights::pallet_referenda::WeightInfo<Runtime>;
+	type WeightInfo = weights::pallet_referenda_fellowship_referenda::WeightInfo<Runtime>;
 	type RuntimeCall = RuntimeCall;
 	type RuntimeEvent = RuntimeEvent;
 	type Scheduler = Scheduler;
@@ -106,7 +105,7 @@ impl pallet_referenda::Config<FellowshipReferendaInstance> for Runtime {
 pub type FellowshipCollectiveInstance = pallet_ranked_collective::Instance1;
 
 impl pallet_ranked_collective::Config<FellowshipCollectiveInstance> for Runtime {
-	type WeightInfo = weights::pallet_ranked_collective::WeightInfo<Runtime>;
+	type WeightInfo = weights::pallet_ranked_collective_fellowship_collective::WeightInfo<Runtime>;
 	type RuntimeEvent = RuntimeEvent;
 
 	#[cfg(not(feature = "runtime-benchmarks"))]
@@ -138,7 +137,7 @@ impl pallet_ranked_collective::Config<FellowshipCollectiveInstance> for Runtime
 pub type FellowshipCoreInstance = pallet_core_fellowship::Instance1;
 
 impl pallet_core_fellowship::Config<FellowshipCoreInstance> for Runtime {
-	type WeightInfo = weights::pallet_core_fellowship::WeightInfo<Runtime>;
+	type WeightInfo = weights::pallet_core_fellowship_fellowship_core::WeightInfo<Runtime>;
 	type RuntimeEvent = RuntimeEvent;
 	type Members = pallet_ranked_collective::Pallet<Runtime, FellowshipCollectiveInstance>;
 	type Balance = Balance;
@@ -196,12 +195,6 @@ pub type FellowshipSalaryInstance = pallet_salary::Instance1;
 use xcm::prelude::*;
 
 parameter_types! {
-	pub AssetHub: MultiLocation = (Parent, Parachain(1000)).into();
-	pub AssetHubUsdtId: AssetId = (PalletInstance(50), GeneralIndex(1984)).into();
-	pub UsdtAsset: LocatableAssetId = LocatableAssetId {
-		location: AssetHub::get(),
-		asset_id: AssetHubUsdtId::get(),
-	};
 	// The interior location on AssetHub for the paying account. This is the Fellowship Salary
 	// pallet instance (which sits at index 64). This sovereign account will need funding.
 	pub Interior: InteriorMultiLocation = PalletInstance(64).into();
@@ -217,12 +210,12 @@ pub type FellowshipSalaryPaymaster = PayOverXcm<
 	ConstU32<{ 6 * HOURS }>,
 	AccountId,
 	(),
-	ConvertToValue<UsdtAsset>,
+	ConvertToValue<UsdtAssetHub>,
 	AliasesIntoAccountId32<(), AccountId>,
 >;
 
 impl pallet_salary::Config<FellowshipSalaryInstance> for Runtime {
-	type WeightInfo = weights::pallet_salary::WeightInfo<Runtime>;
+	type WeightInfo = weights::pallet_salary_fellowship_salary::WeightInfo<Runtime>;
 	type RuntimeEvent = RuntimeEvent;
 
 	#[cfg(not(feature = "runtime-benchmarks"))]
diff --git a/cumulus/parachains/runtimes/collectives/collectives-polkadot/src/fellowship/origins.rs b/cumulus/parachains/runtimes/collectives/collectives-polkadot/src/fellowship/origins.rs
index 04663aeecf3b7894a44b1d173b0d53e07f246937..5ed2c19f79e6464fc09a349d8dce3c09afad2d55 100644
--- a/cumulus/parachains/runtimes/collectives/collectives-polkadot/src/fellowship/origins.rs
+++ b/cumulus/parachains/runtimes/collectives/collectives-polkadot/src/fellowship/origins.rs
@@ -1,4 +1,4 @@
-// Copyright 2023 Parity Technologies (UK) Ltd.
+// Copyright (C) Parity Technologies (UK) Ltd.
 // This file is part of Cumulus.
 
 // Cumulus is free software: you can redistribute it and/or modify
diff --git a/cumulus/parachains/runtimes/collectives/collectives-polkadot/src/fellowship/tracks.rs b/cumulus/parachains/runtimes/collectives/collectives-polkadot/src/fellowship/tracks.rs
index fc53efdd7e8caf7622a06b766773f9683e66c376..f4ba4e05ec166d9d9b7e5e5ed9b679042067ba13 100644
--- a/cumulus/parachains/runtimes/collectives/collectives-polkadot/src/fellowship/tracks.rs
+++ b/cumulus/parachains/runtimes/collectives/collectives-polkadot/src/fellowship/tracks.rs
@@ -1,4 +1,4 @@
-// Copyright 2023 Parity Technologies (UK) Ltd.
+// Copyright (C) Parity Technologies (UK) Ltd.
 // This file is part of Cumulus.
 
 // Cumulus is free software: you can redistribute it and/or modify
diff --git a/cumulus/parachains/runtimes/collectives/collectives-polkadot/src/impls.rs b/cumulus/parachains/runtimes/collectives/collectives-polkadot/src/impls.rs
index c28b4e2dc1e6b20d0bb18dd9ec18de2e23eeb33a..9f4c2a6a4c94a5d28fce09dbe800b2d7226723cf 100644
--- a/cumulus/parachains/runtimes/collectives/collectives-polkadot/src/impls.rs
+++ b/cumulus/parachains/runtimes/collectives/collectives-polkadot/src/impls.rs
@@ -1,4 +1,4 @@
-// Copyright (C) 2021 Parity Technologies (UK) Ltd.
+// Copyright (C) Parity Technologies (UK) Ltd.
 // SPDX-License-Identifier: Apache-2.0
 
 // Licensed under the Apache License, Version 2.0 (the "License");
@@ -15,13 +15,14 @@
 
 use crate::OriginCaller;
 use frame_support::{
-	dispatch::{DispatchError, DispatchResultWithPostInfo},
+	dispatch::DispatchResultWithPostInfo,
 	traits::{Currency, Get, Imbalance, OnUnbalanced, OriginTrait, PrivilegeCmp},
 	weights::Weight,
 };
 use log;
 use pallet_alliance::{ProposalIndex, ProposalProvider};
 use parachains_common::impls::NegativeImbalance;
+use sp_runtime::DispatchError;
 use sp_std::{cmp::Ordering, marker::PhantomData, prelude::*};
 use xcm::latest::{Fungibility, Junction, Parent};
 
@@ -183,7 +184,7 @@ pub mod benchmarks {
 	impl<I: Get<u32>> EnsureSuccessful for OpenHrmpChannel<I> {
 		fn ensure_successful() {
 			if let ChannelStatus::Closed = ParachainSystem::get_channel_status(I::get().into()) {
-				ParachainSystem::open_outbound_hrmp_channel_for_benchmarks(I::get().into())
+				ParachainSystem::open_outbound_hrmp_channel_for_benchmarks_or_tests(I::get().into())
 			}
 		}
 	}
diff --git a/cumulus/parachains/runtimes/collectives/collectives-polkadot/src/lib.rs b/cumulus/parachains/runtimes/collectives/collectives-polkadot/src/lib.rs
index a9af3b0f29fc7fe750002b132bf6d13378305a29..ff16f93d8f54b39be8a553883949165acf653521 100644
--- a/cumulus/parachains/runtimes/collectives/collectives-polkadot/src/lib.rs
+++ b/cumulus/parachains/runtimes/collectives/collectives-polkadot/src/lib.rs
@@ -1,4 +1,4 @@
-// Copyright (C) 2022 Parity Technologies (UK) Ltd.
+// Copyright (C) Parity Technologies (UK) Ltd.
 // SPDX-License-Identifier: Apache-2.0
 
 // Licensed under the Apache License, Version 2.0 (the "License");
@@ -20,7 +20,7 @@
 //!
 //! ### Governance
 //!
-//! As a common good parachain, Collectives defers its governance (namely, its `Root` origin), to
+//! As a system parachain, Collectives defers its governance (namely, its `Root` origin), to
 //! its Relay Chain parent, Polkadot.
 //!
 //! ### Collator Selection
@@ -36,12 +36,13 @@
 #[cfg(feature = "std")]
 include!(concat!(env!("OUT_DIR"), "/wasm_binary.rs"));
 
-pub mod constants;
+pub mod ambassador;
 pub mod impls;
 mod weights;
 pub mod xcm_config;
 // Fellowship configurations.
 pub mod fellowship;
+pub use ambassador::pallet_ambassador_origins;
 
 use cumulus_pallet_parachain_system::RelayNumberStrictlyIncreases;
 use fellowship::{
@@ -64,12 +65,15 @@ use sp_version::NativeVersion;
 use sp_version::RuntimeVersion;
 
 use codec::{Decode, Encode, MaxEncodedLen};
-use constants::{consensus::*, currency::*, fee::WeightToFee};
 use frame_support::{
 	construct_runtime,
 	dispatch::DispatchClass,
+	genesis_builder_helper::{build_config, create_default_config},
 	parameter_types,
-	traits::{ConstBool, ConstU16, ConstU32, ConstU64, ConstU8, EitherOfDiverse, InstanceFilter},
+	traits::{
+		fungible::HoldConsideration, ConstBool, ConstU16, ConstU32, ConstU64, ConstU8,
+		EitherOfDiverse, InstanceFilter, LinearStoragePrice,
+	},
 	weights::{ConstantMultiplier, Weight},
 	PalletId,
 };
@@ -79,7 +83,9 @@ use frame_system::{
 };
 pub use parachains_common as common;
 use parachains_common::{
-	impls::DealWithFees, AccountId, AuraId, Balance, BlockNumber, Hash, Header, Nonce, Signature,
+	impls::DealWithFees,
+	polkadot::{account::*, consensus::*, currency::*, fee::WeightToFee},
+	AccountId, AuraId, Balance, BlockNumber, Hash, Header, Nonce, Signature,
 	AVERAGE_ON_INITIALIZE_RATIO, DAYS, HOURS, MAXIMUM_BLOCK_WEIGHT, MINUTES, NORMAL_DISPATCH_RATIO,
 	SLOT_DURATION,
 };
@@ -209,7 +215,7 @@ impl pallet_balances::Config for Runtime {
 	type ReserveIdentifier = [u8; 8];
 	type RuntimeHoldReason = RuntimeHoldReason;
 	type FreezeIdentifier = ();
-	type MaxHolds = ConstU32<0>;
+	type MaxHolds = ConstU32<1>;
 	type MaxFreezes = ConstU32<0>;
 }
 
@@ -289,6 +295,8 @@ pub enum ProxyType {
 	Alliance,
 	/// Fellowship proxy. Allows calls related to the Fellowship.
 	Fellowship,
+	/// Ambassador proxy. Allows calls related to the Ambassador Program.
+	Ambassador,
 }
 impl Default for ProxyType {
 	fn default() -> Self {
@@ -323,6 +331,18 @@ impl InstanceFilter<RuntimeCall> for ProxyType {
 				c,
 				RuntimeCall::FellowshipCollective { .. } |
 					RuntimeCall::FellowshipReferenda { .. } |
+					RuntimeCall::FellowshipCore { .. } |
+					RuntimeCall::FellowshipSalary { .. } |
+					RuntimeCall::Utility { .. } |
+					RuntimeCall::Multisig { .. }
+			),
+			ProxyType::Ambassador => matches!(
+				c,
+				RuntimeCall::AmbassadorCollective { .. } |
+					RuntimeCall::AmbassadorReferenda { .. } |
+					RuntimeCall::AmbassadorContent { .. } |
+					RuntimeCall::AmbassadorCore { .. } |
+					RuntimeCall::AmbassadorSalary { .. } |
 					RuntimeCall::Utility { .. } |
 					RuntimeCall::Multisig { .. }
 			),
@@ -484,8 +504,8 @@ parameter_types! {
 	pub const AllyDeposit: Balance = 1_000 * UNITS; // 1,000 DOT bond to join as an Ally
 	// The Alliance pallet account, used as a temporary place to deposit a slashed imbalance
 	// before the teleport to the Treasury.
-	pub AlliancePalletAccount: AccountId = constants::account::ALLIANCE_PALLET_ID.into_account_truncating();
-	pub PolkadotTreasuryAccount: AccountId = constants::account::POLKADOT_TREASURY_PALLET_ID.into_account_truncating();
+	pub AlliancePalletAccount: AccountId = ALLIANCE_PALLET_ID.into_account_truncating();
+	pub PolkadotTreasuryAccount: AccountId = POLKADOT_TREASURY_PALLET_ID.into_account_truncating();
 	// The number of blocks a member must wait between giving a retirement notice and retiring.
 	// Supposed to be greater than time required to `kick_member` with alliance motion.
 	pub const AllianceRetirementPeriod: BlockNumber = (90 * DAYS) + ALLIANCE_MOTION_DURATION;
@@ -545,6 +565,7 @@ impl pallet_scheduler::Config for Runtime {
 parameter_types! {
 	pub const PreimageBaseDeposit: Balance = deposit(2, 64);
 	pub const PreimageByteDeposit: Balance = deposit(0, 1);
+	pub const PreimageHoldReason: RuntimeHoldReason = RuntimeHoldReason::Preimage(pallet_preimage::HoldReason::Preimage);
 }
 
 impl pallet_preimage::Config for Runtime {
@@ -552,8 +573,12 @@ impl pallet_preimage::Config for Runtime {
 	type RuntimeEvent = RuntimeEvent;
 	type Currency = Balances;
 	type ManagerOrigin = EnsureRoot<AccountId>;
-	type BaseDeposit = PreimageBaseDeposit;
-	type ByteDeposit = PreimageByteDeposit;
+	type Consideration = HoldConsideration<
+		AccountId,
+		Balances,
+		PreimageHoldReason,
+		LinearStoragePrice<PreimageBaseDeposit, PreimageByteDeposit, Balance>,
+	>;
 }
 
 // Create the runtime by composing the FRAME pallets that were previously configured.
@@ -589,7 +614,7 @@ construct_runtime!(
 		Utility: pallet_utility::{Pallet, Call, Event} = 40,
 		Multisig: pallet_multisig::{Pallet, Call, Storage, Event<T>} = 41,
 		Proxy: pallet_proxy::{Pallet, Call, Storage, Event<T>} = 42,
-		Preimage: pallet_preimage::{Pallet, Call, Storage, Event<T>} = 43,
+		Preimage: pallet_preimage::{Pallet, Call, Storage, Event<T>, HoldReason} = 43,
 		Scheduler: pallet_scheduler::{Pallet, Call, Storage, Event<T>} = 44,
 
 		// The main stage.
@@ -608,6 +633,14 @@ construct_runtime!(
 		FellowshipCore: pallet_core_fellowship::<Instance1>::{Pallet, Call, Storage, Event<T>} = 63,
 		// pub type FellowshipSalaryInstance = pallet_salary::Instance1;
 		FellowshipSalary: pallet_salary::<Instance1>::{Pallet, Call, Storage, Event<T>} = 64,
+
+		// Ambassador Program.
+		AmbassadorCollective: pallet_ranked_collective::<Instance2>::{Pallet, Call, Storage, Event<T>} = 70,
+		AmbassadorReferenda: pallet_referenda::<Instance2>::{Pallet, Call, Storage, Event<T>} = 71,
+		AmbassadorOrigins: pallet_ambassador_origins::{Origin} = 72,
+		AmbassadorCore: pallet_core_fellowship::<Instance2>::{Pallet, Call, Storage, Event<T>} = 73,
+		AmbassadorSalary: pallet_salary::<Instance2>::{Pallet, Call, Storage, Event<T>} = 74,
+		AmbassadorContent: pallet_collective_content::<Instance1>::{Pallet, Call, Storage, Event<T>} = 75,
 	}
 );
 
@@ -676,6 +709,11 @@ mod benches {
 		[pallet_ranked_collective, FellowshipCollective]
 		[pallet_core_fellowship, FellowshipCore]
 		[pallet_salary, FellowshipSalary]
+		[pallet_referenda, AmbassadorReferenda]
+		[pallet_ranked_collective, AmbassadorCollective]
+		[pallet_collective_content, AmbassadorContent]
+		[pallet_core_fellowship, AmbassadorCore]
+		[pallet_salary, AmbassadorSalary]
 	);
 }
 
@@ -902,6 +940,16 @@ impl_runtime_apis! {
 			Ok(batches)
 		}
 	}
+
+	impl sp_genesis_builder::GenesisBuilder<Block> for Runtime {
+		fn create_default_config() -> Vec<u8> {
+			create_default_config::<RuntimeGenesisConfig>()
+		}
+
+		fn build_config(config: Vec<u8>) -> sp_genesis_builder::Result {
+			build_config::<RuntimeGenesisConfig>(config)
+		}
+	}
 }
 
 cumulus_pallet_parachain_system::register_validate_block! {
diff --git a/cumulus/parachains/runtimes/collectives/collectives-polkadot/src/weights/block_weights.rs b/cumulus/parachains/runtimes/collectives/collectives-polkadot/src/weights/block_weights.rs
index b2092d875c8328210667da4cbb95de0642e60ae3..e7fdb2aae2a01ec06076de83d94817e540e205dd 100644
--- a/cumulus/parachains/runtimes/collectives/collectives-polkadot/src/weights/block_weights.rs
+++ b/cumulus/parachains/runtimes/collectives/collectives-polkadot/src/weights/block_weights.rs
@@ -1,6 +1,6 @@
 // This file is part of Substrate.
 
-// Copyright (C) 2022 Parity Technologies (UK) Ltd.
+// Copyright (C) Parity Technologies (UK) Ltd.
 // SPDX-License-Identifier: Apache-2.0
 
 // Licensed under the Apache License, Version 2.0 (the "License");
diff --git a/cumulus/parachains/runtimes/collectives/collectives-polkadot/src/weights/cumulus_pallet_xcmp_queue.rs b/cumulus/parachains/runtimes/collectives/collectives-polkadot/src/weights/cumulus_pallet_xcmp_queue.rs
index 28e1cd902b503075e701742db6159bc87fd65e0d..ccd9478bf10eab85eef8b80c0354b59e33e08d3d 100644
--- a/cumulus/parachains/runtimes/collectives/collectives-polkadot/src/weights/cumulus_pallet_xcmp_queue.rs
+++ b/cumulus/parachains/runtimes/collectives/collectives-polkadot/src/weights/cumulus_pallet_xcmp_queue.rs
@@ -1,4 +1,4 @@
-// Copyright Parity Technologies (UK) Ltd.
+// Copyright (C) Parity Technologies (UK) Ltd.
 // This file is part of Cumulus.
 
 // Cumulus is free software: you can redistribute it and/or modify
diff --git a/cumulus/parachains/runtimes/collectives/collectives-polkadot/src/weights/extrinsic_weights.rs b/cumulus/parachains/runtimes/collectives/collectives-polkadot/src/weights/extrinsic_weights.rs
index 332c3b324bb9c1b386257bf7953d37aba8f5af13..1a4adb968bb7195428ea00d59cd92dcd3b6eea5f 100644
--- a/cumulus/parachains/runtimes/collectives/collectives-polkadot/src/weights/extrinsic_weights.rs
+++ b/cumulus/parachains/runtimes/collectives/collectives-polkadot/src/weights/extrinsic_weights.rs
@@ -1,6 +1,6 @@
 // This file is part of Substrate.
 
-// Copyright (C) 2022 Parity Technologies (UK) Ltd.
+// Copyright (C) Parity Technologies (UK) Ltd.
 // SPDX-License-Identifier: Apache-2.0
 
 // Licensed under the Apache License, Version 2.0 (the "License");
diff --git a/cumulus/parachains/runtimes/collectives/collectives-polkadot/src/weights/frame_system.rs b/cumulus/parachains/runtimes/collectives/collectives-polkadot/src/weights/frame_system.rs
index 75cc6580a39d52f9ae0c78746c634dc98d70b85c..31cd502d1927b0cfeac64774567c937d7ee33050 100644
--- a/cumulus/parachains/runtimes/collectives/collectives-polkadot/src/weights/frame_system.rs
+++ b/cumulus/parachains/runtimes/collectives/collectives-polkadot/src/weights/frame_system.rs
@@ -1,4 +1,4 @@
-// Copyright Parity Technologies (UK) Ltd.
+// Copyright (C) Parity Technologies (UK) Ltd.
 // This file is part of Cumulus.
 
 // Cumulus is free software: you can redistribute it and/or modify
diff --git a/cumulus/parachains/runtimes/collectives/collectives-polkadot/src/weights/mod.rs b/cumulus/parachains/runtimes/collectives/collectives-polkadot/src/weights/mod.rs
index b0e49549914286ad7615cf056681ae6bca832816..b5a3a892f79a56f034b60cbb3c4e142a5ff6ef16 100644
--- a/cumulus/parachains/runtimes/collectives/collectives-polkadot/src/weights/mod.rs
+++ b/cumulus/parachains/runtimes/collectives/collectives-polkadot/src/weights/mod.rs
@@ -1,3 +1,19 @@
+// 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/>.
+
 pub mod block_weights;
 pub mod cumulus_pallet_xcmp_queue;
 pub mod extrinsic_weights;
@@ -6,13 +22,18 @@ pub mod pallet_alliance;
 pub mod pallet_balances;
 pub mod pallet_collator_selection;
 pub mod pallet_collective;
-pub mod pallet_core_fellowship;
+pub mod pallet_collective_content;
+pub mod pallet_core_fellowship_ambassador_core;
+pub mod pallet_core_fellowship_fellowship_core;
 pub mod pallet_multisig;
 pub mod pallet_preimage;
 pub mod pallet_proxy;
-pub mod pallet_ranked_collective;
-pub mod pallet_referenda;
-pub mod pallet_salary;
+pub mod pallet_ranked_collective_ambassador_collective;
+pub mod pallet_ranked_collective_fellowship_collective;
+pub mod pallet_referenda_ambassador_referenda;
+pub mod pallet_referenda_fellowship_referenda;
+pub mod pallet_salary_ambassador_salary;
+pub mod pallet_salary_fellowship_salary;
 pub mod pallet_scheduler;
 pub mod pallet_session;
 pub mod pallet_timestamp;
diff --git a/cumulus/parachains/runtimes/collectives/collectives-polkadot/src/weights/pallet_alliance.rs b/cumulus/parachains/runtimes/collectives/collectives-polkadot/src/weights/pallet_alliance.rs
index c822a0c85cd8fb38c4a3e9f232dc743a11fa470a..9e3acac46a4c9e7bc39d55cc5d928150aab3aaad 100644
--- a/cumulus/parachains/runtimes/collectives/collectives-polkadot/src/weights/pallet_alliance.rs
+++ b/cumulus/parachains/runtimes/collectives/collectives-polkadot/src/weights/pallet_alliance.rs
@@ -1,4 +1,4 @@
-// Copyright Parity Technologies (UK) Ltd.
+// Copyright (C) Parity Technologies (UK) Ltd.
 // This file is part of Cumulus.
 
 // Cumulus is free software: you can redistribute it and/or modify
diff --git a/cumulus/parachains/runtimes/collectives/collectives-polkadot/src/weights/pallet_balances.rs b/cumulus/parachains/runtimes/collectives/collectives-polkadot/src/weights/pallet_balances.rs
index 80b90aadc0db56d1bee6b607f03719be78e753a2..dd0c02ab87306ac8d311c223a0c4b297b67552c4 100644
--- a/cumulus/parachains/runtimes/collectives/collectives-polkadot/src/weights/pallet_balances.rs
+++ b/cumulus/parachains/runtimes/collectives/collectives-polkadot/src/weights/pallet_balances.rs
@@ -1,4 +1,4 @@
-// Copyright Parity Technologies (UK) Ltd.
+// Copyright (C) Parity Technologies (UK) Ltd.
 // This file is part of Cumulus.
 
 // Cumulus is free software: you can redistribute it and/or modify
diff --git a/cumulus/parachains/runtimes/collectives/collectives-polkadot/src/weights/pallet_collator_selection.rs b/cumulus/parachains/runtimes/collectives/collectives-polkadot/src/weights/pallet_collator_selection.rs
index 8376006e30c9da1c2393646dfc3e998720a03aa6..ea237d602a9b5a1190b89aaf4fdf955bdbc9df58 100644
--- a/cumulus/parachains/runtimes/collectives/collectives-polkadot/src/weights/pallet_collator_selection.rs
+++ b/cumulus/parachains/runtimes/collectives/collectives-polkadot/src/weights/pallet_collator_selection.rs
@@ -1,4 +1,4 @@
-// Copyright Parity Technologies (UK) Ltd.
+// Copyright (C) Parity Technologies (UK) Ltd.
 // This file is part of Cumulus.
 
 // Cumulus is free software: you can redistribute it and/or modify
diff --git a/cumulus/parachains/runtimes/collectives/collectives-polkadot/src/weights/pallet_collective.rs b/cumulus/parachains/runtimes/collectives/collectives-polkadot/src/weights/pallet_collective.rs
index 013cfee7ba9dbc41b618d70b5cf8630f38f4d6e2..2d344ad0db7ba9e7b98303624e4f3f4a11c4087a 100644
--- a/cumulus/parachains/runtimes/collectives/collectives-polkadot/src/weights/pallet_collective.rs
+++ b/cumulus/parachains/runtimes/collectives/collectives-polkadot/src/weights/pallet_collective.rs
@@ -1,4 +1,4 @@
-// Copyright Parity Technologies (UK) Ltd.
+// Copyright (C) Parity Technologies (UK) Ltd.
 // This file is part of Cumulus.
 
 // Cumulus is free software: you can redistribute it and/or modify
diff --git a/cumulus/parachains/runtimes/collectives/collectives-polkadot/src/weights/pallet_collective_content.rs b/cumulus/parachains/runtimes/collectives/collectives-polkadot/src/weights/pallet_collective_content.rs
new file mode 100644
index 0000000000000000000000000000000000000000..e66907b9453060a29b5e6635fa03a31e0dc782ad
--- /dev/null
+++ b/cumulus/parachains/runtimes/collectives/collectives-polkadot/src/weights/pallet_collective_content.rs
@@ -0,0 +1,94 @@
+// 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/>.
+
+//! Autogenerated weights for `pallet_collective_content`
+//!
+//! THIS FILE WAS AUTO-GENERATED USING THE SUBSTRATE BENCHMARK CLI VERSION 4.0.0-dev
+//! DATE: 2023-08-18, STEPS: `10`, REPEAT: `3`, LOW RANGE: `[]`, HIGH RANGE: `[]`
+//! WORST CASE MAP SIZE: `1000000`
+//! HOSTNAME: `cob`, CPU: `<UNKNOWN>`
+//! WASM-EXECUTION: `Compiled`, CHAIN: `Some("collectives-polkadot-dev")`, DB CACHE: 1024
+
+// Executed Command:
+// ./target/debug/polkadot-parachain
+// benchmark
+// pallet
+// --chain=collectives-polkadot-dev
+// --steps=10
+// --repeat=3
+// --pallet=pallet_collective_content
+// --extrinsic=*
+// --wasm-execution=compiled
+// --heap-pages=4096
+// --output=./parachains/runtimes/collectives/collectives-polkadot/src/weights/
+
+#![cfg_attr(rustfmt, rustfmt_skip)]
+#![allow(unused_parens)]
+#![allow(unused_imports)]
+#![allow(missing_docs)]
+
+use frame_support::{traits::Get, weights::Weight};
+use core::marker::PhantomData;
+
+/// Weight functions for `pallet_collective_content`.
+pub struct WeightInfo<T>(PhantomData<T>);
+impl<T: frame_system::Config> pallet_collective_content::WeightInfo for WeightInfo<T> {
+	/// Storage: `AmbassadorContent::Charter` (r:0 w:1)
+	/// Proof: `AmbassadorContent::Charter` (`max_values`: Some(1), `max_size`: Some(70), added: 565, mode: `MaxEncodedLen`)
+	fn set_charter() -> Weight {
+		// Proof Size summary in bytes:
+		//  Measured:  `0`
+		//  Estimated: `0`
+		// Minimum execution time: 99_000_000 picoseconds.
+		Weight::from_parts(99_000_000, 0)
+			.saturating_add(Weight::from_parts(0, 0))
+			.saturating_add(T::DbWeight::get().writes(1))
+	}
+	/// Storage: `AmbassadorCollective::Members` (r:1 w:0)
+	/// Proof: `AmbassadorCollective::Members` (`max_values`: None, `max_size`: Some(42), added: 2517, mode: `MaxEncodedLen`)
+	/// Storage: `AmbassadorContent::AnnouncementsCount` (r:1 w:1)
+	/// Proof: `AmbassadorContent::AnnouncementsCount` (`max_values`: Some(1), `max_size`: Some(4), added: 499, mode: `MaxEncodedLen`)
+	/// Storage: `AmbassadorContent::NextAnnouncementExpireAt` (r:1 w:1)
+	/// Proof: `AmbassadorContent::NextAnnouncementExpireAt` (`max_values`: Some(1), `max_size`: Some(4), added: 499, mode: `MaxEncodedLen`)
+	/// Storage: `AmbassadorContent::Announcements` (r:0 w:1)
+	/// Proof: `AmbassadorContent::Announcements` (`max_values`: None, `max_size`: Some(90), added: 2565, mode: `MaxEncodedLen`)
+	fn announce() -> Weight {
+		// Proof Size summary in bytes:
+		//  Measured:  `285`
+		//  Estimated: `3507`
+		// Minimum execution time: 273_000_000 picoseconds.
+		Weight::from_parts(278_000_000, 0)
+			.saturating_add(Weight::from_parts(0, 3507))
+			.saturating_add(T::DbWeight::get().reads(3))
+			.saturating_add(T::DbWeight::get().writes(3))
+	}
+	/// Storage: `AmbassadorCollective::Members` (r:1 w:0)
+	/// Proof: `AmbassadorCollective::Members` (`max_values`: None, `max_size`: Some(42), added: 2517, mode: `MaxEncodedLen`)
+	/// Storage: `AmbassadorContent::Announcements` (r:1 w:1)
+	/// Proof: `AmbassadorContent::Announcements` (`max_values`: None, `max_size`: Some(90), added: 2565, mode: `MaxEncodedLen`)
+	/// Storage: `AmbassadorContent::AnnouncementsCount` (r:1 w:1)
+	/// Proof: `AmbassadorContent::AnnouncementsCount` (`max_values`: Some(1), `max_size`: Some(4), added: 499, mode: `MaxEncodedLen`)
+	fn remove_announcement() -> Weight {
+		// Proof Size summary in bytes:
+		//  Measured:  `450`
+		//  Estimated: `3555`
+		// Minimum execution time: 326_000_000 picoseconds.
+		Weight::from_parts(338_000_000, 0)
+			.saturating_add(Weight::from_parts(0, 3555))
+			.saturating_add(T::DbWeight::get().reads(3))
+			.saturating_add(T::DbWeight::get().writes(2))
+	}
+}
diff --git a/cumulus/parachains/runtimes/collectives/collectives-polkadot/src/weights/pallet_core_fellowship_ambassador_core.rs b/cumulus/parachains/runtimes/collectives/collectives-polkadot/src/weights/pallet_core_fellowship_ambassador_core.rs
new file mode 100644
index 0000000000000000000000000000000000000000..f40940a8b25faa7c441b1ac9b237cb34e671cf17
--- /dev/null
+++ b/cumulus/parachains/runtimes/collectives/collectives-polkadot/src/weights/pallet_core_fellowship_ambassador_core.rs
@@ -0,0 +1,223 @@
+// Copyright 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/>.
+
+//! Autogenerated weights for `pallet_core_fellowship`
+//!
+//! THIS FILE WAS AUTO-GENERATED USING THE SUBSTRATE BENCHMARK CLI VERSION 4.0.0-dev
+//! DATE: 2023-08-11, STEPS: `2`, REPEAT: `2`, LOW RANGE: `[]`, HIGH RANGE: `[]`
+//! WORST CASE MAP SIZE: `1000000`
+//! HOSTNAME: `cob`, CPU: `<UNKNOWN>`
+//! WASM-EXECUTION: `Compiled`, CHAIN: `Some("collectives-polkadot-dev")`, DB CACHE: 1024
+
+// Executed Command:
+// target/release/polkadot-parachain
+// benchmark
+// pallet
+// --chain=collectives-polkadot-dev
+// --wasm-execution=compiled
+// --pallet=pallet_core_fellowship
+// --extrinsic=*
+// --steps=2
+// --repeat=2
+// --json
+// --header=./file_header.txt
+// --output=./parachains/runtimes/collectives/collectives-polkadot/src/weights/
+
+#![cfg_attr(rustfmt, rustfmt_skip)]
+#![allow(unused_parens)]
+#![allow(unused_imports)]
+#![allow(missing_docs)]
+
+use frame_support::{traits::Get, weights::Weight};
+use core::marker::PhantomData;
+
+/// Weight functions for `pallet_core_fellowship`.
+pub struct WeightInfo<T>(PhantomData<T>);
+impl<T: frame_system::Config> pallet_core_fellowship::WeightInfo for WeightInfo<T> {
+	/// Storage: `AmbassadorCore::Params` (r:0 w:1)
+	/// Proof: `AmbassadorCore::Params` (`max_values`: Some(1), `max_size`: Some(364), added: 859, mode: `MaxEncodedLen`)
+	fn set_params() -> Weight {
+		// Proof Size summary in bytes:
+		//  Measured:  `0`
+		//  Estimated: `0`
+		// Minimum execution time: 11_000_000 picoseconds.
+		Weight::from_parts(11_000_000, 0)
+			.saturating_add(Weight::from_parts(0, 0))
+			.saturating_add(T::DbWeight::get().writes(1))
+	}
+	/// Storage: `AmbassadorCore::Member` (r:1 w:1)
+	/// Proof: `AmbassadorCore::Member` (`max_values`: None, `max_size`: Some(49), added: 2524, mode: `MaxEncodedLen`)
+	/// Storage: `AmbassadorCollective::Members` (r:1 w:1)
+	/// Proof: `AmbassadorCollective::Members` (`max_values`: None, `max_size`: Some(42), added: 2517, mode: `MaxEncodedLen`)
+	/// Storage: `AmbassadorCore::Params` (r:1 w:0)
+	/// Proof: `AmbassadorCore::Params` (`max_values`: Some(1), `max_size`: Some(364), added: 859, mode: `MaxEncodedLen`)
+	/// Storage: `AmbassadorCollective::MemberCount` (r:1 w:1)
+	/// Proof: `AmbassadorCollective::MemberCount` (`max_values`: None, `max_size`: Some(14), added: 2489, mode: `MaxEncodedLen`)
+	/// Storage: `AmbassadorCollective::IdToIndex` (r:1 w:0)
+	/// Proof: `AmbassadorCollective::IdToIndex` (`max_values`: None, `max_size`: Some(54), added: 2529, mode: `MaxEncodedLen`)
+	/// Storage: `AmbassadorCore::MemberEvidence` (r:1 w:1)
+	/// Proof: `AmbassadorCore::MemberEvidence` (`max_values`: None, `max_size`: Some(65581), added: 68056, mode: `MaxEncodedLen`)
+	fn bump_offboard() -> Weight {
+		// Proof Size summary in bytes:
+		//  Measured:  `66011`
+		//  Estimated: `69046`
+		// Minimum execution time: 96_000_000 picoseconds.
+		Weight::from_parts(111_000_000, 0)
+			.saturating_add(Weight::from_parts(0, 69046))
+			.saturating_add(T::DbWeight::get().reads(6))
+			.saturating_add(T::DbWeight::get().writes(4))
+	}
+	/// Storage: `AmbassadorCore::Member` (r:1 w:1)
+	/// Proof: `AmbassadorCore::Member` (`max_values`: None, `max_size`: Some(49), added: 2524, mode: `MaxEncodedLen`)
+	/// Storage: `AmbassadorCollective::Members` (r:1 w:1)
+	/// Proof: `AmbassadorCollective::Members` (`max_values`: None, `max_size`: Some(42), added: 2517, mode: `MaxEncodedLen`)
+	/// Storage: `AmbassadorCore::Params` (r:1 w:0)
+	/// Proof: `AmbassadorCore::Params` (`max_values`: Some(1), `max_size`: Some(364), added: 859, mode: `MaxEncodedLen`)
+	/// Storage: `AmbassadorCollective::MemberCount` (r:1 w:1)
+	/// Proof: `AmbassadorCollective::MemberCount` (`max_values`: None, `max_size`: Some(14), added: 2489, mode: `MaxEncodedLen`)
+	/// Storage: `AmbassadorCollective::IdToIndex` (r:1 w:0)
+	/// Proof: `AmbassadorCollective::IdToIndex` (`max_values`: None, `max_size`: Some(54), added: 2529, mode: `MaxEncodedLen`)
+	/// Storage: `AmbassadorCore::MemberEvidence` (r:1 w:1)
+	/// Proof: `AmbassadorCore::MemberEvidence` (`max_values`: None, `max_size`: Some(65581), added: 68056, mode: `MaxEncodedLen`)
+	fn bump_demote() -> Weight {
+		// Proof Size summary in bytes:
+		//  Measured:  `66121`
+		//  Estimated: `69046`
+		// Minimum execution time: 99_000_000 picoseconds.
+		Weight::from_parts(116_000_000, 0)
+			.saturating_add(Weight::from_parts(0, 69046))
+			.saturating_add(T::DbWeight::get().reads(6))
+			.saturating_add(T::DbWeight::get().writes(4))
+	}
+	/// Storage: `AmbassadorCollective::Members` (r:1 w:0)
+	/// Proof: `AmbassadorCollective::Members` (`max_values`: None, `max_size`: Some(42), added: 2517, mode: `MaxEncodedLen`)
+	/// Storage: `AmbassadorCore::Member` (r:1 w:1)
+	/// Proof: `AmbassadorCore::Member` (`max_values`: None, `max_size`: Some(49), added: 2524, mode: `MaxEncodedLen`)
+	fn set_active() -> Weight {
+		// Proof Size summary in bytes:
+		//  Measured:  `360`
+		//  Estimated: `3514`
+		// Minimum execution time: 21_000_000 picoseconds.
+		Weight::from_parts(22_000_000, 0)
+			.saturating_add(Weight::from_parts(0, 3514))
+			.saturating_add(T::DbWeight::get().reads(2))
+			.saturating_add(T::DbWeight::get().writes(1))
+	}
+	/// Storage: `AmbassadorCore::Member` (r:1 w:1)
+	/// Proof: `AmbassadorCore::Member` (`max_values`: None, `max_size`: Some(49), added: 2524, mode: `MaxEncodedLen`)
+	/// Storage: `AmbassadorCollective::Members` (r:1 w:1)
+	/// Proof: `AmbassadorCollective::Members` (`max_values`: None, `max_size`: Some(42), added: 2517, mode: `MaxEncodedLen`)
+	/// Storage: `AmbassadorCollective::MemberCount` (r:1 w:1)
+	/// Proof: `AmbassadorCollective::MemberCount` (`max_values`: None, `max_size`: Some(14), added: 2489, mode: `MaxEncodedLen`)
+	/// Storage: `AmbassadorCollective::IndexToId` (r:0 w:1)
+	/// Proof: `AmbassadorCollective::IndexToId` (`max_values`: None, `max_size`: Some(54), added: 2529, mode: `MaxEncodedLen`)
+	/// Storage: `AmbassadorCollective::IdToIndex` (r:0 w:1)
+	/// Proof: `AmbassadorCollective::IdToIndex` (`max_values`: None, `max_size`: Some(54), added: 2529, mode: `MaxEncodedLen`)
+	fn induct() -> Weight {
+		// Proof Size summary in bytes:
+		//  Measured:  `118`
+		//  Estimated: `3514`
+		// Minimum execution time: 36_000_000 picoseconds.
+		Weight::from_parts(36_000_000, 0)
+			.saturating_add(Weight::from_parts(0, 3514))
+			.saturating_add(T::DbWeight::get().reads(3))
+			.saturating_add(T::DbWeight::get().writes(5))
+	}
+	/// Storage: `AmbassadorCollective::Members` (r:1 w:1)
+	/// Proof: `AmbassadorCollective::Members` (`max_values`: None, `max_size`: Some(42), added: 2517, mode: `MaxEncodedLen`)
+	/// Storage: `AmbassadorCore::Member` (r:1 w:1)
+	/// Proof: `AmbassadorCore::Member` (`max_values`: None, `max_size`: Some(49), added: 2524, mode: `MaxEncodedLen`)
+	/// Storage: `AmbassadorCore::Params` (r:1 w:0)
+	/// Proof: `AmbassadorCore::Params` (`max_values`: Some(1), `max_size`: Some(364), added: 859, mode: `MaxEncodedLen`)
+	/// Storage: `AmbassadorCollective::MemberCount` (r:1 w:1)
+	/// Proof: `AmbassadorCollective::MemberCount` (`max_values`: None, `max_size`: Some(14), added: 2489, mode: `MaxEncodedLen`)
+	/// Storage: `AmbassadorCore::MemberEvidence` (r:1 w:1)
+	/// Proof: `AmbassadorCore::MemberEvidence` (`max_values`: None, `max_size`: Some(65581), added: 68056, mode: `MaxEncodedLen`)
+	/// Storage: `AmbassadorCollective::IndexToId` (r:0 w:1)
+	/// Proof: `AmbassadorCollective::IndexToId` (`max_values`: None, `max_size`: Some(54), added: 2529, mode: `MaxEncodedLen`)
+	/// Storage: `AmbassadorCollective::IdToIndex` (r:0 w:1)
+	/// Proof: `AmbassadorCollective::IdToIndex` (`max_values`: None, `max_size`: Some(54), added: 2529, mode: `MaxEncodedLen`)
+	fn promote() -> Weight {
+		// Proof Size summary in bytes:
+		//  Measured:  `65989`
+		//  Estimated: `69046`
+		// Minimum execution time: 95_000_000 picoseconds.
+		Weight::from_parts(110_000_000, 0)
+			.saturating_add(Weight::from_parts(0, 69046))
+			.saturating_add(T::DbWeight::get().reads(5))
+			.saturating_add(T::DbWeight::get().writes(6))
+	}
+	/// Storage: `AmbassadorCollective::Members` (r:1 w:0)
+	/// Proof: `AmbassadorCollective::Members` (`max_values`: None, `max_size`: Some(42), added: 2517, mode: `MaxEncodedLen`)
+	/// Storage: `AmbassadorCore::Member` (r:1 w:1)
+	/// Proof: `AmbassadorCore::Member` (`max_values`: None, `max_size`: Some(49), added: 2524, mode: `MaxEncodedLen`)
+	/// Storage: `AmbassadorCore::MemberEvidence` (r:0 w:1)
+	/// Proof: `AmbassadorCore::MemberEvidence` (`max_values`: None, `max_size`: Some(65581), added: 68056, mode: `MaxEncodedLen`)
+	fn offboard() -> Weight {
+		// Proof Size summary in bytes:
+		//  Measured:  `331`
+		//  Estimated: `3514`
+		// Minimum execution time: 21_000_000 picoseconds.
+		Weight::from_parts(22_000_000, 0)
+			.saturating_add(Weight::from_parts(0, 3514))
+			.saturating_add(T::DbWeight::get().reads(2))
+			.saturating_add(T::DbWeight::get().writes(2))
+	}
+	/// Storage: `AmbassadorCore::Member` (r:1 w:1)
+	/// Proof: `AmbassadorCore::Member` (`max_values`: None, `max_size`: Some(49), added: 2524, mode: `MaxEncodedLen`)
+	/// Storage: `AmbassadorCollective::Members` (r:1 w:0)
+	/// Proof: `AmbassadorCollective::Members` (`max_values`: None, `max_size`: Some(42), added: 2517, mode: `MaxEncodedLen`)
+	fn import() -> Weight {
+		// Proof Size summary in bytes:
+		//  Measured:  `285`
+		//  Estimated: `3514`
+		// Minimum execution time: 20_000_000 picoseconds.
+		Weight::from_parts(21_000_000, 0)
+			.saturating_add(Weight::from_parts(0, 3514))
+			.saturating_add(T::DbWeight::get().reads(2))
+			.saturating_add(T::DbWeight::get().writes(1))
+	}
+	/// Storage: `AmbassadorCollective::Members` (r:1 w:0)
+	/// Proof: `AmbassadorCollective::Members` (`max_values`: None, `max_size`: Some(42), added: 2517, mode: `MaxEncodedLen`)
+	/// Storage: `AmbassadorCore::Member` (r:1 w:1)
+	/// Proof: `AmbassadorCore::Member` (`max_values`: None, `max_size`: Some(49), added: 2524, mode: `MaxEncodedLen`)
+	/// Storage: `AmbassadorCore::MemberEvidence` (r:1 w:1)
+	/// Proof: `AmbassadorCore::MemberEvidence` (`max_values`: None, `max_size`: Some(65581), added: 68056, mode: `MaxEncodedLen`)
+	fn approve() -> Weight {
+		// Proof Size summary in bytes:
+		//  Measured:  `65967`
+		//  Estimated: `69046`
+		// Minimum execution time: 78_000_000 picoseconds.
+		Weight::from_parts(104_000_000, 0)
+			.saturating_add(Weight::from_parts(0, 69046))
+			.saturating_add(T::DbWeight::get().reads(3))
+			.saturating_add(T::DbWeight::get().writes(2))
+	}
+	/// Storage: `AmbassadorCore::Member` (r:1 w:0)
+	/// Proof: `AmbassadorCore::Member` (`max_values`: None, `max_size`: Some(49), added: 2524, mode: `MaxEncodedLen`)
+	/// Storage: `AmbassadorCore::MemberEvidence` (r:1 w:1)
+	/// Proof: `AmbassadorCore::MemberEvidence` (`max_values`: None, `max_size`: Some(65581), added: 68056, mode: `MaxEncodedLen`)
+	fn submit_evidence() -> Weight {
+		// Proof Size summary in bytes:
+		//  Measured:  `151`
+		//  Estimated: `69046`
+		// Minimum execution time: 43_000_000 picoseconds.
+		Weight::from_parts(44_000_000, 0)
+			.saturating_add(Weight::from_parts(0, 69046))
+			.saturating_add(T::DbWeight::get().reads(2))
+			.saturating_add(T::DbWeight::get().writes(1))
+	}
+}
diff --git a/cumulus/parachains/runtimes/collectives/collectives-polkadot/src/weights/pallet_core_fellowship.rs b/cumulus/parachains/runtimes/collectives/collectives-polkadot/src/weights/pallet_core_fellowship_fellowship_core.rs
similarity index 86%
rename from cumulus/parachains/runtimes/collectives/collectives-polkadot/src/weights/pallet_core_fellowship.rs
rename to cumulus/parachains/runtimes/collectives/collectives-polkadot/src/weights/pallet_core_fellowship_fellowship_core.rs
index 50a8bcea50004ed2266d85bdc6c7cdb2b961c2ae..434986b03bba84c8ef43250c2192a946de09b286 100644
--- a/cumulus/parachains/runtimes/collectives/collectives-polkadot/src/weights/pallet_core_fellowship.rs
+++ b/cumulus/parachains/runtimes/collectives/collectives-polkadot/src/weights/pallet_core_fellowship_fellowship_core.rs
@@ -1,4 +1,4 @@
-// Copyright Parity Technologies (UK) Ltd.
+// Copyright (C) Parity Technologies (UK) Ltd.
 // This file is part of Cumulus.
 
 // Cumulus is free software: you can redistribute it and/or modify
@@ -17,24 +17,21 @@
 //! Autogenerated weights for `pallet_core_fellowship`
 //!
 //! THIS FILE WAS AUTO-GENERATED USING THE SUBSTRATE BENCHMARK CLI VERSION 4.0.0-dev
-//! DATE: 2023-07-31, STEPS: `50`, REPEAT: `20`, LOW RANGE: `[]`, HIGH RANGE: `[]`
+//! DATE: 2023-08-11, STEPS: `2`, REPEAT: `2`, LOW RANGE: `[]`, HIGH RANGE: `[]`
 //! WORST CASE MAP SIZE: `1000000`
-//! HOSTNAME: `runner-ynta1nyy-project-238-concurrent-0`, CPU: `Intel(R) Xeon(R) CPU @ 2.60GHz`
-//! EXECUTION: ``, WASM-EXECUTION: `Compiled`, CHAIN: `Some("collectives-polkadot-dev")`, DB CACHE: 1024
+//! HOSTNAME: `cob`, CPU: `<UNKNOWN>`
+//! WASM-EXECUTION: `Compiled`, CHAIN: `Some("collectives-polkadot-dev")`, DB CACHE: 1024
 
 // Executed Command:
-// ./target/production/polkadot-parachain
+// target/release/polkadot-parachain
 // benchmark
 // pallet
 // --chain=collectives-polkadot-dev
 // --wasm-execution=compiled
 // --pallet=pallet_core_fellowship
-// --no-storage-info
-// --no-median-slopes
-// --no-min-squares
 // --extrinsic=*
-// --steps=50
-// --repeat=20
+// --steps=2
+// --repeat=2
 // --json
 // --header=./file_header.txt
 // --output=./parachains/runtimes/collectives/collectives-polkadot/src/weights/
@@ -56,8 +53,8 @@ impl<T: frame_system::Config> pallet_core_fellowship::WeightInfo for WeightInfo<
 		// Proof Size summary in bytes:
 		//  Measured:  `0`
 		//  Estimated: `0`
-		// Minimum execution time: 9_077_000 picoseconds.
-		Weight::from_parts(9_356_000, 0)
+		// Minimum execution time: 11_000_000 picoseconds.
+		Weight::from_parts(12_000_000, 0)
 			.saturating_add(Weight::from_parts(0, 0))
 			.saturating_add(T::DbWeight::get().writes(1))
 	}
@@ -75,10 +72,10 @@ impl<T: frame_system::Config> pallet_core_fellowship::WeightInfo for WeightInfo<
 	/// Proof: `FellowshipCore::MemberEvidence` (`max_values`: None, `max_size`: Some(65581), added: 68056, mode: `MaxEncodedLen`)
 	fn bump_offboard() -> Weight {
 		// Proof Size summary in bytes:
-		//  Measured:  `66111`
+		//  Measured:  `66144`
 		//  Estimated: `69046`
-		// Minimum execution time: 128_419_000 picoseconds.
-		Weight::from_parts(149_318_000, 0)
+		// Minimum execution time: 109_000_000 picoseconds.
+		Weight::from_parts(125_000_000, 0)
 			.saturating_add(Weight::from_parts(0, 69046))
 			.saturating_add(T::DbWeight::get().reads(6))
 			.saturating_add(T::DbWeight::get().writes(4))
@@ -97,10 +94,10 @@ impl<T: frame_system::Config> pallet_core_fellowship::WeightInfo for WeightInfo<
 	/// Proof: `FellowshipCore::MemberEvidence` (`max_values`: None, `max_size`: Some(65581), added: 68056, mode: `MaxEncodedLen`)
 	fn bump_demote() -> Weight {
 		// Proof Size summary in bytes:
-		//  Measured:  `66221`
+		//  Measured:  `66254`
 		//  Estimated: `69046`
-		// Minimum execution time: 127_629_000 picoseconds.
-		Weight::from_parts(130_928_000, 0)
+		// Minimum execution time: 112_000_000 picoseconds.
+		Weight::from_parts(114_000_000, 0)
 			.saturating_add(Weight::from_parts(0, 69046))
 			.saturating_add(T::DbWeight::get().reads(6))
 			.saturating_add(T::DbWeight::get().writes(4))
@@ -111,10 +108,10 @@ impl<T: frame_system::Config> pallet_core_fellowship::WeightInfo for WeightInfo<
 	/// Proof: `FellowshipCore::Member` (`max_values`: None, `max_size`: Some(49), added: 2524, mode: `MaxEncodedLen`)
 	fn set_active() -> Weight {
 		// Proof Size summary in bytes:
-		//  Measured:  `460`
+		//  Measured:  `493`
 		//  Estimated: `3514`
-		// Minimum execution time: 18_655_000 picoseconds.
-		Weight::from_parts(19_331_000, 0)
+		// Minimum execution time: 22_000_000 picoseconds.
+		Weight::from_parts(27_000_000, 0)
 			.saturating_add(Weight::from_parts(0, 3514))
 			.saturating_add(T::DbWeight::get().reads(2))
 			.saturating_add(T::DbWeight::get().writes(1))
@@ -131,10 +128,10 @@ impl<T: frame_system::Config> pallet_core_fellowship::WeightInfo for WeightInfo<
 	/// Proof: `FellowshipCollective::IdToIndex` (`max_values`: None, `max_size`: Some(54), added: 2529, mode: `MaxEncodedLen`)
 	fn induct() -> Weight {
 		// Proof Size summary in bytes:
-		//  Measured:  `218`
+		//  Measured:  `251`
 		//  Estimated: `3514`
-		// Minimum execution time: 28_764_000 picoseconds.
-		Weight::from_parts(29_385_000, 0)
+		// Minimum execution time: 35_000_000 picoseconds.
+		Weight::from_parts(36_000_000, 0)
 			.saturating_add(Weight::from_parts(0, 3514))
 			.saturating_add(T::DbWeight::get().reads(3))
 			.saturating_add(T::DbWeight::get().writes(5))
@@ -155,10 +152,10 @@ impl<T: frame_system::Config> pallet_core_fellowship::WeightInfo for WeightInfo<
 	/// Proof: `FellowshipCollective::IdToIndex` (`max_values`: None, `max_size`: Some(54), added: 2529, mode: `MaxEncodedLen`)
 	fn promote() -> Weight {
 		// Proof Size summary in bytes:
-		//  Measured:  `66089`
+		//  Measured:  `66122`
 		//  Estimated: `69046`
-		// Minimum execution time: 123_179_000 picoseconds.
-		Weight::from_parts(125_302_000, 0)
+		// Minimum execution time: 97_000_000 picoseconds.
+		Weight::from_parts(129_000_000, 0)
 			.saturating_add(Weight::from_parts(0, 69046))
 			.saturating_add(T::DbWeight::get().reads(5))
 			.saturating_add(T::DbWeight::get().writes(6))
@@ -171,10 +168,10 @@ impl<T: frame_system::Config> pallet_core_fellowship::WeightInfo for WeightInfo<
 	/// Proof: `FellowshipCore::MemberEvidence` (`max_values`: None, `max_size`: Some(65581), added: 68056, mode: `MaxEncodedLen`)
 	fn offboard() -> Weight {
 		// Proof Size summary in bytes:
-		//  Measured:  `431`
+		//  Measured:  `464`
 		//  Estimated: `3514`
-		// Minimum execution time: 19_700_000 picoseconds.
-		Weight::from_parts(20_319_000, 0)
+		// Minimum execution time: 22_000_000 picoseconds.
+		Weight::from_parts(22_000_000, 0)
 			.saturating_add(Weight::from_parts(0, 3514))
 			.saturating_add(T::DbWeight::get().reads(2))
 			.saturating_add(T::DbWeight::get().writes(2))
@@ -185,10 +182,10 @@ impl<T: frame_system::Config> pallet_core_fellowship::WeightInfo for WeightInfo<
 	/// Proof: `FellowshipCollective::Members` (`max_values`: None, `max_size`: Some(42), added: 2517, mode: `MaxEncodedLen`)
 	fn import() -> Weight {
 		// Proof Size summary in bytes:
-		//  Measured:  `385`
+		//  Measured:  `418`
 		//  Estimated: `3514`
-		// Minimum execution time: 18_048_000 picoseconds.
-		Weight::from_parts(18_345_000, 0)
+		// Minimum execution time: 20_000_000 picoseconds.
+		Weight::from_parts(24_000_000, 0)
 			.saturating_add(Weight::from_parts(0, 3514))
 			.saturating_add(T::DbWeight::get().reads(2))
 			.saturating_add(T::DbWeight::get().writes(1))
@@ -201,10 +198,10 @@ impl<T: frame_system::Config> pallet_core_fellowship::WeightInfo for WeightInfo<
 	/// Proof: `FellowshipCore::MemberEvidence` (`max_values`: None, `max_size`: Some(65581), added: 68056, mode: `MaxEncodedLen`)
 	fn approve() -> Weight {
 		// Proof Size summary in bytes:
-		//  Measured:  `66067`
+		//  Measured:  `66100`
 		//  Estimated: `69046`
-		// Minimum execution time: 108_578_000 picoseconds.
-		Weight::from_parts(111_311_000, 0)
+		// Minimum execution time: 89_000_000 picoseconds.
+		Weight::from_parts(119_000_000, 0)
 			.saturating_add(Weight::from_parts(0, 69046))
 			.saturating_add(T::DbWeight::get().reads(3))
 			.saturating_add(T::DbWeight::get().writes(2))
@@ -215,10 +212,10 @@ impl<T: frame_system::Config> pallet_core_fellowship::WeightInfo for WeightInfo<
 	/// Proof: `FellowshipCore::MemberEvidence` (`max_values`: None, `max_size`: Some(65581), added: 68056, mode: `MaxEncodedLen`)
 	fn submit_evidence() -> Weight {
 		// Proof Size summary in bytes:
-		//  Measured:  `151`
+		//  Measured:  `184`
 		//  Estimated: `69046`
-		// Minimum execution time: 94_484_000 picoseconds.
-		Weight::from_parts(97_930_000, 0)
+		// Minimum execution time: 43_000_000 picoseconds.
+		Weight::from_parts(52_000_000, 0)
 			.saturating_add(Weight::from_parts(0, 69046))
 			.saturating_add(T::DbWeight::get().reads(2))
 			.saturating_add(T::DbWeight::get().writes(1))
diff --git a/cumulus/parachains/runtimes/collectives/collectives-polkadot/src/weights/pallet_multisig.rs b/cumulus/parachains/runtimes/collectives/collectives-polkadot/src/weights/pallet_multisig.rs
index b2e36af383b8aa61a04f090fd60bedba242ee12e..a8dd58320cc204382c0160f9629e386ddd7851fb 100644
--- a/cumulus/parachains/runtimes/collectives/collectives-polkadot/src/weights/pallet_multisig.rs
+++ b/cumulus/parachains/runtimes/collectives/collectives-polkadot/src/weights/pallet_multisig.rs
@@ -1,4 +1,4 @@
-// Copyright Parity Technologies (UK) Ltd.
+// Copyright (C) Parity Technologies (UK) Ltd.
 // This file is part of Cumulus.
 
 // Cumulus is free software: you can redistribute it and/or modify
diff --git a/cumulus/parachains/runtimes/collectives/collectives-polkadot/src/weights/pallet_preimage.rs b/cumulus/parachains/runtimes/collectives/collectives-polkadot/src/weights/pallet_preimage.rs
index ef2406230b20d2564fb12c684157d6ec55a273a3..e9f565d9387da08f35419baa196ce7ef77e265be 100644
--- a/cumulus/parachains/runtimes/collectives/collectives-polkadot/src/weights/pallet_preimage.rs
+++ b/cumulus/parachains/runtimes/collectives/collectives-polkadot/src/weights/pallet_preimage.rs
@@ -1,4 +1,4 @@
-// Copyright Parity Technologies (UK) Ltd.
+// Copyright (C) Parity Technologies (UK) Ltd.
 // This file is part of Cumulus.
 
 // Cumulus is free software: you can redistribute it and/or modify
@@ -50,6 +50,21 @@ use core::marker::PhantomData;
 /// Weight functions for `pallet_preimage`.
 pub struct WeightInfo<T>(PhantomData<T>);
 impl<T: frame_system::Config> pallet_preimage::WeightInfo for WeightInfo<T> {
+	fn ensure_updated(n: u32, ) -> Weight {
+		// Proof Size summary in bytes:
+		//  Measured:  `193 + n * (91 ±0)`
+		//  Estimated: `3593 + n * (2566 ±0)`
+		// Minimum execution time: 2_000_000 picoseconds.
+		Weight::from_parts(2_000_000, 3593)
+			// Standard Error: 13_720
+			.saturating_add(Weight::from_parts(17_309_199, 0).saturating_mul(n.into()))
+			.saturating_add(T::DbWeight::get().reads(1_u64))
+			.saturating_add(T::DbWeight::get().reads((1_u64).saturating_mul(n.into())))
+			.saturating_add(T::DbWeight::get().writes(1_u64))
+			.saturating_add(T::DbWeight::get().writes((2_u64).saturating_mul(n.into())))
+			.saturating_add(Weight::from_parts(0, 2566).saturating_mul(n.into()))
+	}
+
 	/// Storage: `Preimage::StatusFor` (r:1 w:1)
 	/// Proof: `Preimage::StatusFor` (`max_values`: None, `max_size`: Some(91), added: 2566, mode: `MaxEncodedLen`)
 	/// Storage: `Preimage::PreimageFor` (r:0 w:1)
diff --git a/cumulus/parachains/runtimes/collectives/collectives-polkadot/src/weights/pallet_proxy.rs b/cumulus/parachains/runtimes/collectives/collectives-polkadot/src/weights/pallet_proxy.rs
index 9732251e5aae026eb0ab40baccf25e7dd94e583d..faf100d23bb0d5c68b1da4d4421b05315ddfd3de 100644
--- a/cumulus/parachains/runtimes/collectives/collectives-polkadot/src/weights/pallet_proxy.rs
+++ b/cumulus/parachains/runtimes/collectives/collectives-polkadot/src/weights/pallet_proxy.rs
@@ -1,4 +1,4 @@
-// Copyright Parity Technologies (UK) Ltd.
+// Copyright (C) Parity Technologies (UK) Ltd.
 // This file is part of Cumulus.
 
 // Cumulus is free software: you can redistribute it and/or modify
diff --git a/cumulus/parachains/runtimes/collectives/collectives-polkadot/src/weights/pallet_ranked_collective_ambassador_collective.rs b/cumulus/parachains/runtimes/collectives/collectives-polkadot/src/weights/pallet_ranked_collective_ambassador_collective.rs
new file mode 100644
index 0000000000000000000000000000000000000000..a6372c4b89dc222ca6a5a6acd36306d79ea3ffb2
--- /dev/null
+++ b/cumulus/parachains/runtimes/collectives/collectives-polkadot/src/weights/pallet_ranked_collective_ambassador_collective.rs
@@ -0,0 +1,177 @@
+// Copyright 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/>.
+
+//! Autogenerated weights for `pallet_ranked_collective`
+//!
+//! THIS FILE WAS AUTO-GENERATED USING THE SUBSTRATE BENCHMARK CLI VERSION 4.0.0-dev
+//! DATE: 2023-08-11, STEPS: `2`, REPEAT: `2`, LOW RANGE: `[]`, HIGH RANGE: `[]`
+//! WORST CASE MAP SIZE: `1000000`
+//! HOSTNAME: `cob`, CPU: `<UNKNOWN>`
+//! WASM-EXECUTION: `Compiled`, CHAIN: `Some("collectives-polkadot-dev")`, DB CACHE: 1024
+
+// Executed Command:
+// target/release/polkadot-parachain
+// benchmark
+// pallet
+// --chain=collectives-polkadot-dev
+// --wasm-execution=compiled
+// --pallet=pallet_ranked_collective
+// --extrinsic=*
+// --steps=2
+// --repeat=2
+// --json
+// --header=./file_header.txt
+// --output=./parachains/runtimes/collectives/collectives-polkadot/src/weights/
+
+#![cfg_attr(rustfmt, rustfmt_skip)]
+#![allow(unused_parens)]
+#![allow(unused_imports)]
+#![allow(missing_docs)]
+
+use frame_support::{traits::Get, weights::Weight};
+use core::marker::PhantomData;
+
+/// Weight functions for `pallet_ranked_collective`.
+pub struct WeightInfo<T>(PhantomData<T>);
+impl<T: frame_system::Config> pallet_ranked_collective::WeightInfo for WeightInfo<T> {
+	/// Storage: `AmbassadorCollective::Members` (r:1 w:1)
+	/// Proof: `AmbassadorCollective::Members` (`max_values`: None, `max_size`: Some(42), added: 2517, mode: `MaxEncodedLen`)
+	/// Storage: `AmbassadorCollective::MemberCount` (r:1 w:1)
+	/// Proof: `AmbassadorCollective::MemberCount` (`max_values`: None, `max_size`: Some(14), added: 2489, mode: `MaxEncodedLen`)
+	/// Storage: `AmbassadorCollective::IndexToId` (r:0 w:1)
+	/// Proof: `AmbassadorCollective::IndexToId` (`max_values`: None, `max_size`: Some(54), added: 2529, mode: `MaxEncodedLen`)
+	/// Storage: `AmbassadorCollective::IdToIndex` (r:0 w:1)
+	/// Proof: `AmbassadorCollective::IdToIndex` (`max_values`: None, `max_size`: Some(54), added: 2529, mode: `MaxEncodedLen`)
+	fn add_member() -> Weight {
+		// Proof Size summary in bytes:
+		//  Measured:  `42`
+		//  Estimated: `3507`
+		// Minimum execution time: 21_000_000 picoseconds.
+		Weight::from_parts(23_000_000, 0)
+			.saturating_add(Weight::from_parts(0, 3507))
+			.saturating_add(T::DbWeight::get().reads(2))
+			.saturating_add(T::DbWeight::get().writes(4))
+	}
+	/// Storage: `AmbassadorCollective::Members` (r:1 w:1)
+	/// Proof: `AmbassadorCollective::Members` (`max_values`: None, `max_size`: Some(42), added: 2517, mode: `MaxEncodedLen`)
+	/// Storage: `AmbassadorCollective::MemberCount` (r:11 w:11)
+	/// Proof: `AmbassadorCollective::MemberCount` (`max_values`: None, `max_size`: Some(14), added: 2489, mode: `MaxEncodedLen`)
+	/// Storage: `AmbassadorCollective::IdToIndex` (r:11 w:11)
+	/// Proof: `AmbassadorCollective::IdToIndex` (`max_values`: None, `max_size`: Some(54), added: 2529, mode: `MaxEncodedLen`)
+	/// Storage: `AmbassadorCollective::IndexToId` (r:11 w:11)
+	/// Proof: `AmbassadorCollective::IndexToId` (`max_values`: None, `max_size`: Some(54), added: 2529, mode: `MaxEncodedLen`)
+	/// The range of component `r` is `[0, 10]`.
+	/// The range of component `r` is `[0, 10]`.
+	fn remove_member(r: u32, ) -> Weight {
+		// Proof Size summary in bytes:
+		//  Measured:  `508 + r * (281 ±0)`
+		//  Estimated: `3519 + r * (2529 ±0)`
+		// Minimum execution time: 34_000_000 picoseconds.
+		Weight::from_parts(36_500_000, 0)
+			.saturating_add(Weight::from_parts(0, 3519))
+			// Standard Error: 158_113
+			.saturating_add(Weight::from_parts(16_000_000, 0).saturating_mul(r.into()))
+			.saturating_add(T::DbWeight::get().reads(4))
+			.saturating_add(T::DbWeight::get().reads((3_u64).saturating_mul(r.into())))
+			.saturating_add(T::DbWeight::get().writes(4))
+			.saturating_add(T::DbWeight::get().writes((3_u64).saturating_mul(r.into())))
+			.saturating_add(Weight::from_parts(0, 2529).saturating_mul(r.into()))
+	}
+	/// Storage: `AmbassadorCollective::Members` (r:1 w:1)
+	/// Proof: `AmbassadorCollective::Members` (`max_values`: None, `max_size`: Some(42), added: 2517, mode: `MaxEncodedLen`)
+	/// Storage: `AmbassadorCollective::MemberCount` (r:1 w:1)
+	/// Proof: `AmbassadorCollective::MemberCount` (`max_values`: None, `max_size`: Some(14), added: 2489, mode: `MaxEncodedLen`)
+	/// Storage: `AmbassadorCollective::IndexToId` (r:0 w:1)
+	/// Proof: `AmbassadorCollective::IndexToId` (`max_values`: None, `max_size`: Some(54), added: 2529, mode: `MaxEncodedLen`)
+	/// Storage: `AmbassadorCollective::IdToIndex` (r:0 w:1)
+	/// Proof: `AmbassadorCollective::IdToIndex` (`max_values`: None, `max_size`: Some(54), added: 2529, mode: `MaxEncodedLen`)
+	/// The range of component `r` is `[0, 10]`.
+	/// The range of component `r` is `[0, 10]`.
+	fn promote_member(r: u32, ) -> Weight {
+		// Proof Size summary in bytes:
+		//  Measured:  `210 + r * (17 ±0)`
+		//  Estimated: `3507`
+		// Minimum execution time: 25_000_000 picoseconds.
+		Weight::from_parts(26_000_000, 0)
+			.saturating_add(Weight::from_parts(0, 3507))
+			// Standard Error: 180_277
+			.saturating_add(Weight::from_parts(650_000, 0).saturating_mul(r.into()))
+			.saturating_add(T::DbWeight::get().reads(2))
+			.saturating_add(T::DbWeight::get().writes(4))
+	}
+	/// Storage: `AmbassadorCollective::Members` (r:1 w:1)
+	/// Proof: `AmbassadorCollective::Members` (`max_values`: None, `max_size`: Some(42), added: 2517, mode: `MaxEncodedLen`)
+	/// Storage: `AmbassadorCollective::MemberCount` (r:1 w:1)
+	/// Proof: `AmbassadorCollective::MemberCount` (`max_values`: None, `max_size`: Some(14), added: 2489, mode: `MaxEncodedLen`)
+	/// Storage: `AmbassadorCollective::IdToIndex` (r:1 w:1)
+	/// Proof: `AmbassadorCollective::IdToIndex` (`max_values`: None, `max_size`: Some(54), added: 2529, mode: `MaxEncodedLen`)
+	/// Storage: `AmbassadorCollective::IndexToId` (r:1 w:1)
+	/// Proof: `AmbassadorCollective::IndexToId` (`max_values`: None, `max_size`: Some(54), added: 2529, mode: `MaxEncodedLen`)
+	/// The range of component `r` is `[0, 10]`.
+	/// The range of component `r` is `[0, 10]`.
+	fn demote_member(r: u32, ) -> Weight {
+		// Proof Size summary in bytes:
+		//  Measured:  `508 + r * (71 ±0)`
+		//  Estimated: `3519`
+		// Minimum execution time: 34_000_000 picoseconds.
+		Weight::from_parts(36_500_000, 0)
+			.saturating_add(Weight::from_parts(0, 3519))
+			// Standard Error: 335_410
+			.saturating_add(Weight::from_parts(550_000, 0).saturating_mul(r.into()))
+			.saturating_add(T::DbWeight::get().reads(4))
+			.saturating_add(T::DbWeight::get().writes(4))
+	}
+	/// Storage: `AmbassadorCollective::Members` (r:1 w:0)
+	/// Proof: `AmbassadorCollective::Members` (`max_values`: None, `max_size`: Some(42), added: 2517, mode: `MaxEncodedLen`)
+	/// Storage: `AmbassadorReferenda::ReferendumInfoFor` (r:1 w:1)
+	/// Proof: `AmbassadorReferenda::ReferendumInfoFor` (`max_values`: None, `max_size`: Some(900), added: 3375, mode: `MaxEncodedLen`)
+	/// Storage: `AmbassadorCollective::Voting` (r:1 w:1)
+	/// Proof: `AmbassadorCollective::Voting` (`max_values`: None, `max_size`: Some(65), added: 2540, mode: `MaxEncodedLen`)
+	/// Storage: `Scheduler::Agenda` (r:2 w:2)
+	/// Proof: `Scheduler::Agenda` (`max_values`: None, `max_size`: Some(155814), added: 158289, mode: `MaxEncodedLen`)
+	fn vote() -> Weight {
+		// Proof Size summary in bytes:
+		//  Measured:  `566`
+		//  Estimated: `317568`
+		// Minimum execution time: 57_000_000 picoseconds.
+		Weight::from_parts(60_000_000, 0)
+			.saturating_add(Weight::from_parts(0, 317568))
+			.saturating_add(T::DbWeight::get().reads(5))
+			.saturating_add(T::DbWeight::get().writes(4))
+	}
+	/// Storage: `AmbassadorReferenda::ReferendumInfoFor` (r:1 w:0)
+	/// Proof: `AmbassadorReferenda::ReferendumInfoFor` (`max_values`: None, `max_size`: Some(900), added: 3375, mode: `MaxEncodedLen`)
+	/// Storage: `AmbassadorCollective::VotingCleanup` (r:1 w:0)
+	/// Proof: `AmbassadorCollective::VotingCleanup` (`max_values`: None, `max_size`: Some(114), added: 2589, mode: `MaxEncodedLen`)
+	/// Storage: `AmbassadorCollective::Voting` (r:100 w:100)
+	/// Proof: `AmbassadorCollective::Voting` (`max_values`: None, `max_size`: Some(65), added: 2540, mode: `MaxEncodedLen`)
+	/// The range of component `n` is `[0, 100]`.
+	/// The range of component `n` is `[0, 100]`.
+	fn cleanup_poll(n: u32, ) -> Weight {
+		// Proof Size summary in bytes:
+		//  Measured:  `209 + n * (52 ±0)`
+		//  Estimated: `4365 + n * (2550 ±0)`
+		// Minimum execution time: 18_000_000 picoseconds.
+		Weight::from_parts(18_500_000, 0)
+			.saturating_add(Weight::from_parts(0, 4365))
+			// Standard Error: 11_180
+			.saturating_add(Weight::from_parts(1_335_000, 0).saturating_mul(n.into()))
+			.saturating_add(T::DbWeight::get().reads(2))
+			.saturating_add(T::DbWeight::get().reads((1_u64).saturating_mul(n.into())))
+			.saturating_add(T::DbWeight::get().writes((1_u64).saturating_mul(n.into())))
+			.saturating_add(Weight::from_parts(0, 2550).saturating_mul(n.into()))
+	}
+}
diff --git a/cumulus/parachains/runtimes/collectives/collectives-polkadot/src/weights/pallet_ranked_collective.rs b/cumulus/parachains/runtimes/collectives/collectives-polkadot/src/weights/pallet_ranked_collective_fellowship_collective.rs
similarity index 82%
rename from cumulus/parachains/runtimes/collectives/collectives-polkadot/src/weights/pallet_ranked_collective.rs
rename to cumulus/parachains/runtimes/collectives/collectives-polkadot/src/weights/pallet_ranked_collective_fellowship_collective.rs
index 0ce5de87c8f28304d85ac7e03fc3f75f7ba8dc21..7515aecbb525a4b4de59bd05e8329166a5515ff1 100644
--- a/cumulus/parachains/runtimes/collectives/collectives-polkadot/src/weights/pallet_ranked_collective.rs
+++ b/cumulus/parachains/runtimes/collectives/collectives-polkadot/src/weights/pallet_ranked_collective_fellowship_collective.rs
@@ -1,4 +1,4 @@
-// Copyright Parity Technologies (UK) Ltd.
+// Copyright (C) Parity Technologies (UK) Ltd.
 // This file is part of Cumulus.
 
 // Cumulus is free software: you can redistribute it and/or modify
@@ -17,24 +17,21 @@
 //! Autogenerated weights for `pallet_ranked_collective`
 //!
 //! THIS FILE WAS AUTO-GENERATED USING THE SUBSTRATE BENCHMARK CLI VERSION 4.0.0-dev
-//! DATE: 2023-07-31, STEPS: `50`, REPEAT: `20`, LOW RANGE: `[]`, HIGH RANGE: `[]`
+//! DATE: 2023-08-11, STEPS: `2`, REPEAT: `2`, LOW RANGE: `[]`, HIGH RANGE: `[]`
 //! WORST CASE MAP SIZE: `1000000`
-//! HOSTNAME: `runner-ynta1nyy-project-238-concurrent-0`, CPU: `Intel(R) Xeon(R) CPU @ 2.60GHz`
-//! EXECUTION: ``, WASM-EXECUTION: `Compiled`, CHAIN: `Some("collectives-polkadot-dev")`, DB CACHE: 1024
+//! HOSTNAME: `cob`, CPU: `<UNKNOWN>`
+//! WASM-EXECUTION: `Compiled`, CHAIN: `Some("collectives-polkadot-dev")`, DB CACHE: 1024
 
 // Executed Command:
-// ./target/production/polkadot-parachain
+// target/release/polkadot-parachain
 // benchmark
 // pallet
 // --chain=collectives-polkadot-dev
 // --wasm-execution=compiled
 // --pallet=pallet_ranked_collective
-// --no-storage-info
-// --no-median-slopes
-// --no-min-squares
 // --extrinsic=*
-// --steps=50
-// --repeat=20
+// --steps=2
+// --repeat=2
 // --json
 // --header=./file_header.txt
 // --output=./parachains/runtimes/collectives/collectives-polkadot/src/weights/
@@ -62,8 +59,8 @@ impl<T: frame_system::Config> pallet_ranked_collective::WeightInfo for WeightInf
 		// Proof Size summary in bytes:
 		//  Measured:  `142`
 		//  Estimated: `3507`
-		// Minimum execution time: 16_027_000 picoseconds.
-		Weight::from_parts(16_501_000, 0)
+		// Minimum execution time: 21_000_000 picoseconds.
+		Weight::from_parts(22_000_000, 0)
 			.saturating_add(Weight::from_parts(0, 3507))
 			.saturating_add(T::DbWeight::get().reads(2))
 			.saturating_add(T::DbWeight::get().writes(4))
@@ -77,15 +74,16 @@ impl<T: frame_system::Config> pallet_ranked_collective::WeightInfo for WeightInf
 	/// Storage: `FellowshipCollective::IndexToId` (r:11 w:11)
 	/// Proof: `FellowshipCollective::IndexToId` (`max_values`: None, `max_size`: Some(54), added: 2529, mode: `MaxEncodedLen`)
 	/// The range of component `r` is `[0, 10]`.
+	/// The range of component `r` is `[0, 10]`.
 	fn remove_member(r: u32, ) -> Weight {
 		// Proof Size summary in bytes:
-		//  Measured:  `617 + r * (281 ±0)`
+		//  Measured:  `608 + r * (281 ±0)`
 		//  Estimated: `3519 + r * (2529 ±0)`
-		// Minimum execution time: 27_829_000 picoseconds.
-		Weight::from_parts(30_053_705, 0)
+		// Minimum execution time: 35_000_000 picoseconds.
+		Weight::from_parts(36_500_000, 0)
 			.saturating_add(Weight::from_parts(0, 3519))
-			// Standard Error: 26_813
-			.saturating_add(Weight::from_parts(13_088_861, 0).saturating_mul(r.into()))
+			// Standard Error: 254_950
+			.saturating_add(Weight::from_parts(15_900_000, 0).saturating_mul(r.into()))
 			.saturating_add(T::DbWeight::get().reads(4))
 			.saturating_add(T::DbWeight::get().reads((3_u64).saturating_mul(r.into())))
 			.saturating_add(T::DbWeight::get().writes(4))
@@ -101,15 +99,16 @@ impl<T: frame_system::Config> pallet_ranked_collective::WeightInfo for WeightInf
 	/// Storage: `FellowshipCollective::IdToIndex` (r:0 w:1)
 	/// Proof: `FellowshipCollective::IdToIndex` (`max_values`: None, `max_size`: Some(54), added: 2529, mode: `MaxEncodedLen`)
 	/// The range of component `r` is `[0, 10]`.
+	/// The range of component `r` is `[0, 10]`.
 	fn promote_member(r: u32, ) -> Weight {
 		// Proof Size summary in bytes:
-		//  Measured:  `314 + r * (17 ±0)`
+		//  Measured:  `310 + r * (17 ±0)`
 		//  Estimated: `3507`
-		// Minimum execution time: 19_762_000 picoseconds.
-		Weight::from_parts(20_493_905, 0)
+		// Minimum execution time: 25_000_000 picoseconds.
+		Weight::from_parts(25_500_000, 0)
 			.saturating_add(Weight::from_parts(0, 3507))
-			// Standard Error: 5_519
-			.saturating_add(Weight::from_parts(349_033, 0).saturating_mul(r.into()))
+			// Standard Error: 70_710
+			.saturating_add(Weight::from_parts(400_000, 0).saturating_mul(r.into()))
 			.saturating_add(T::DbWeight::get().reads(2))
 			.saturating_add(T::DbWeight::get().writes(4))
 	}
@@ -122,15 +121,16 @@ impl<T: frame_system::Config> pallet_ranked_collective::WeightInfo for WeightInf
 	/// Storage: `FellowshipCollective::IndexToId` (r:1 w:1)
 	/// Proof: `FellowshipCollective::IndexToId` (`max_values`: None, `max_size`: Some(54), added: 2529, mode: `MaxEncodedLen`)
 	/// The range of component `r` is `[0, 10]`.
+	/// The range of component `r` is `[0, 10]`.
 	fn demote_member(r: u32, ) -> Weight {
 		// Proof Size summary in bytes:
-		//  Measured:  `632 + r * (72 ±0)`
+		//  Measured:  `608 + r * (71 ±0)`
 		//  Estimated: `3519`
-		// Minimum execution time: 28_092_000 picoseconds.
-		Weight::from_parts(30_800_398, 0)
+		// Minimum execution time: 35_000_000 picoseconds.
+		Weight::from_parts(37_500_000, 0)
 			.saturating_add(Weight::from_parts(0, 3519))
-			// Standard Error: 17_223
-			.saturating_add(Weight::from_parts(615_330, 0).saturating_mul(r.into()))
+			// Standard Error: 150_000
+			.saturating_add(Weight::from_parts(350_000, 0).saturating_mul(r.into()))
 			.saturating_add(T::DbWeight::get().reads(4))
 			.saturating_add(T::DbWeight::get().writes(4))
 	}
@@ -144,10 +144,10 @@ impl<T: frame_system::Config> pallet_ranked_collective::WeightInfo for WeightInf
 	/// Proof: `Scheduler::Agenda` (`max_values`: None, `max_size`: Some(155814), added: 158289, mode: `MaxEncodedLen`)
 	fn vote() -> Weight {
 		// Proof Size summary in bytes:
-		//  Measured:  `666`
+		//  Measured:  `700`
 		//  Estimated: `317568`
-		// Minimum execution time: 46_255_000 picoseconds.
-		Weight::from_parts(47_590_000, 0)
+		// Minimum execution time: 57_000_000 picoseconds.
+		Weight::from_parts(57_000_000, 0)
 			.saturating_add(Weight::from_parts(0, 317568))
 			.saturating_add(T::DbWeight::get().reads(5))
 			.saturating_add(T::DbWeight::get().writes(4))
@@ -159,18 +159,19 @@ impl<T: frame_system::Config> pallet_ranked_collective::WeightInfo for WeightInf
 	/// Storage: `FellowshipCollective::Voting` (r:100 w:100)
 	/// Proof: `FellowshipCollective::Voting` (`max_values`: None, `max_size`: Some(65), added: 2540, mode: `MaxEncodedLen`)
 	/// The range of component `n` is `[0, 100]`.
+	/// The range of component `n` is `[0, 100]`.
 	fn cleanup_poll(n: u32, ) -> Weight {
 		// Proof Size summary in bytes:
-		//  Measured:  `500 + n * (50 ±0)`
-		//  Estimated: `4365 + n * (2540 ±0)`
-		// Minimum execution time: 14_975_000 picoseconds.
-		Weight::from_parts(17_408_362, 0)
+		//  Measured:  `343 + n * (52 ±0)`
+		//  Estimated: `4365 + n * (2550 ±0)`
+		// Minimum execution time: 18_000_000 picoseconds.
+		Weight::from_parts(19_000_000, 0)
 			.saturating_add(Weight::from_parts(0, 4365))
-			// Standard Error: 3_134
-			.saturating_add(Weight::from_parts(1_222_024, 0).saturating_mul(n.into()))
+			// Standard Error: 25_000
+			.saturating_add(Weight::from_parts(1_395_000, 0).saturating_mul(n.into()))
 			.saturating_add(T::DbWeight::get().reads(2))
 			.saturating_add(T::DbWeight::get().reads((1_u64).saturating_mul(n.into())))
 			.saturating_add(T::DbWeight::get().writes((1_u64).saturating_mul(n.into())))
-			.saturating_add(Weight::from_parts(0, 2540).saturating_mul(n.into()))
+			.saturating_add(Weight::from_parts(0, 2550).saturating_mul(n.into()))
 	}
 }
diff --git a/cumulus/parachains/runtimes/collectives/collectives-polkadot/src/weights/pallet_referenda_ambassador_referenda.rs b/cumulus/parachains/runtimes/collectives/collectives-polkadot/src/weights/pallet_referenda_ambassador_referenda.rs
new file mode 100644
index 0000000000000000000000000000000000000000..fdc451c5d31ccae8a1195482ef32e99163c22442
--- /dev/null
+++ b/cumulus/parachains/runtimes/collectives/collectives-polkadot/src/weights/pallet_referenda_ambassador_referenda.rs
@@ -0,0 +1,536 @@
+// Copyright 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/>.
+
+//! Autogenerated weights for `pallet_referenda`
+//!
+//! THIS FILE WAS AUTO-GENERATED USING THE SUBSTRATE BENCHMARK CLI VERSION 4.0.0-dev
+//! DATE: 2023-08-11, STEPS: `2`, REPEAT: `2`, LOW RANGE: `[]`, HIGH RANGE: `[]`
+//! WORST CASE MAP SIZE: `1000000`
+//! HOSTNAME: `cob`, CPU: `<UNKNOWN>`
+//! WASM-EXECUTION: `Compiled`, CHAIN: `Some("collectives-polkadot-dev")`, DB CACHE: 1024
+
+// Executed Command:
+// target/release/polkadot-parachain
+// benchmark
+// pallet
+// --chain=collectives-polkadot-dev
+// --wasm-execution=compiled
+// --pallet=pallet_referenda
+// --extrinsic=*
+// --steps=2
+// --repeat=2
+// --json
+// --header=./file_header.txt
+// --output=./parachains/runtimes/collectives/collectives-polkadot/src/weights/
+
+#![cfg_attr(rustfmt, rustfmt_skip)]
+#![allow(unused_parens)]
+#![allow(unused_imports)]
+#![allow(missing_docs)]
+
+use frame_support::{traits::Get, weights::Weight};
+use core::marker::PhantomData;
+
+/// Weight functions for `pallet_referenda`.
+pub struct WeightInfo<T>(PhantomData<T>);
+impl<T: frame_system::Config> pallet_referenda::WeightInfo for WeightInfo<T> {
+	/// Storage: `AmbassadorCollective::Members` (r:1 w:0)
+	/// Proof: `AmbassadorCollective::Members` (`max_values`: None, `max_size`: Some(42), added: 2517, mode: `MaxEncodedLen`)
+	/// Storage: `AmbassadorReferenda::ReferendumCount` (r:1 w:1)
+	/// Proof: `AmbassadorReferenda::ReferendumCount` (`max_values`: Some(1), `max_size`: Some(4), added: 499, mode: `MaxEncodedLen`)
+	/// Storage: `Scheduler::Agenda` (r:1 w:1)
+	/// Proof: `Scheduler::Agenda` (`max_values`: None, `max_size`: Some(155814), added: 158289, mode: `MaxEncodedLen`)
+	/// Storage: `AmbassadorReferenda::ReferendumInfoFor` (r:0 w:1)
+	/// Proof: `AmbassadorReferenda::ReferendumInfoFor` (`max_values`: None, `max_size`: Some(900), added: 3375, mode: `MaxEncodedLen`)
+	fn submit() -> Weight {
+		// Proof Size summary in bytes:
+		//  Measured:  `255`
+		//  Estimated: `159279`
+		// Minimum execution time: 32_000_000 picoseconds.
+		Weight::from_parts(34_000_000, 0)
+			.saturating_add(Weight::from_parts(0, 159279))
+			.saturating_add(T::DbWeight::get().reads(3))
+			.saturating_add(T::DbWeight::get().writes(3))
+	}
+	/// Storage: `AmbassadorReferenda::ReferendumInfoFor` (r:1 w:1)
+	/// Proof: `AmbassadorReferenda::ReferendumInfoFor` (`max_values`: None, `max_size`: Some(900), added: 3375, mode: `MaxEncodedLen`)
+	/// Storage: `Scheduler::Agenda` (r:2 w:2)
+	/// Proof: `Scheduler::Agenda` (`max_values`: None, `max_size`: Some(155814), added: 158289, mode: `MaxEncodedLen`)
+	fn place_decision_deposit_preparing() -> Weight {
+		// Proof Size summary in bytes:
+		//  Measured:  `366`
+		//  Estimated: `317568`
+		// Minimum execution time: 63_000_000 picoseconds.
+		Weight::from_parts(68_000_000, 0)
+			.saturating_add(Weight::from_parts(0, 317568))
+			.saturating_add(T::DbWeight::get().reads(3))
+			.saturating_add(T::DbWeight::get().writes(3))
+	}
+	/// Storage: `AmbassadorReferenda::ReferendumInfoFor` (r:1 w:1)
+	/// Proof: `AmbassadorReferenda::ReferendumInfoFor` (`max_values`: None, `max_size`: Some(900), added: 3375, mode: `MaxEncodedLen`)
+	/// Storage: `AmbassadorReferenda::DecidingCount` (r:1 w:0)
+	/// Proof: `AmbassadorReferenda::DecidingCount` (`max_values`: None, `max_size`: Some(14), added: 2489, mode: `MaxEncodedLen`)
+	/// Storage: `AmbassadorReferenda::TrackQueue` (r:1 w:1)
+	/// Proof: `AmbassadorReferenda::TrackQueue` (`max_values`: None, `max_size`: Some(171), added: 2646, mode: `MaxEncodedLen`)
+	/// Storage: `Scheduler::Agenda` (r:1 w:1)
+	/// Proof: `Scheduler::Agenda` (`max_values`: None, `max_size`: Some(155814), added: 158289, mode: `MaxEncodedLen`)
+	fn place_decision_deposit_queued() -> Weight {
+		// Proof Size summary in bytes:
+		//  Measured:  `1165`
+		//  Estimated: `159279`
+		// Minimum execution time: 97_000_000 picoseconds.
+		Weight::from_parts(123_000_000, 0)
+			.saturating_add(Weight::from_parts(0, 159279))
+			.saturating_add(T::DbWeight::get().reads(4))
+			.saturating_add(T::DbWeight::get().writes(3))
+	}
+	/// Storage: `AmbassadorReferenda::ReferendumInfoFor` (r:1 w:1)
+	/// Proof: `AmbassadorReferenda::ReferendumInfoFor` (`max_values`: None, `max_size`: Some(900), added: 3375, mode: `MaxEncodedLen`)
+	/// Storage: `AmbassadorReferenda::DecidingCount` (r:1 w:0)
+	/// Proof: `AmbassadorReferenda::DecidingCount` (`max_values`: None, `max_size`: Some(14), added: 2489, mode: `MaxEncodedLen`)
+	/// Storage: `AmbassadorReferenda::TrackQueue` (r:1 w:1)
+	/// Proof: `AmbassadorReferenda::TrackQueue` (`max_values`: None, `max_size`: Some(171), added: 2646, mode: `MaxEncodedLen`)
+	/// Storage: `Scheduler::Agenda` (r:1 w:1)
+	/// Proof: `Scheduler::Agenda` (`max_values`: None, `max_size`: Some(155814), added: 158289, mode: `MaxEncodedLen`)
+	fn place_decision_deposit_not_queued() -> Weight {
+		// Proof Size summary in bytes:
+		//  Measured:  `1173`
+		//  Estimated: `159279`
+		// Minimum execution time: 104_000_000 picoseconds.
+		Weight::from_parts(111_000_000, 0)
+			.saturating_add(Weight::from_parts(0, 159279))
+			.saturating_add(T::DbWeight::get().reads(4))
+			.saturating_add(T::DbWeight::get().writes(3))
+	}
+	/// Storage: `AmbassadorReferenda::ReferendumInfoFor` (r:1 w:1)
+	/// Proof: `AmbassadorReferenda::ReferendumInfoFor` (`max_values`: None, `max_size`: Some(900), added: 3375, mode: `MaxEncodedLen`)
+	/// Storage: `AmbassadorReferenda::DecidingCount` (r:1 w:1)
+	/// Proof: `AmbassadorReferenda::DecidingCount` (`max_values`: None, `max_size`: Some(14), added: 2489, mode: `MaxEncodedLen`)
+	/// Storage: `AmbassadorCollective::MemberCount` (r:1 w:0)
+	/// Proof: `AmbassadorCollective::MemberCount` (`max_values`: None, `max_size`: Some(14), added: 2489, mode: `MaxEncodedLen`)
+	/// Storage: `Scheduler::Agenda` (r:2 w:2)
+	/// Proof: `Scheduler::Agenda` (`max_values`: None, `max_size`: Some(155814), added: 158289, mode: `MaxEncodedLen`)
+	fn place_decision_deposit_passing() -> Weight {
+		// Proof Size summary in bytes:
+		//  Measured:  `702`
+		//  Estimated: `317568`
+		// Minimum execution time: 140_000_000 picoseconds.
+		Weight::from_parts(150_000_000, 0)
+			.saturating_add(Weight::from_parts(0, 317568))
+			.saturating_add(T::DbWeight::get().reads(5))
+			.saturating_add(T::DbWeight::get().writes(4))
+	}
+	/// Storage: `AmbassadorReferenda::ReferendumInfoFor` (r:1 w:1)
+	/// Proof: `AmbassadorReferenda::ReferendumInfoFor` (`max_values`: None, `max_size`: Some(900), added: 3375, mode: `MaxEncodedLen`)
+	/// Storage: `AmbassadorReferenda::DecidingCount` (r:1 w:1)
+	/// Proof: `AmbassadorReferenda::DecidingCount` (`max_values`: None, `max_size`: Some(14), added: 2489, mode: `MaxEncodedLen`)
+	/// Storage: `AmbassadorCollective::MemberCount` (r:1 w:0)
+	/// Proof: `AmbassadorCollective::MemberCount` (`max_values`: None, `max_size`: Some(14), added: 2489, mode: `MaxEncodedLen`)
+	/// Storage: `Scheduler::Agenda` (r:2 w:2)
+	/// Proof: `Scheduler::Agenda` (`max_values`: None, `max_size`: Some(155814), added: 158289, mode: `MaxEncodedLen`)
+	fn place_decision_deposit_failing() -> Weight {
+		// Proof Size summary in bytes:
+		//  Measured:  `601`
+		//  Estimated: `317568`
+		// Minimum execution time: 81_000_000 picoseconds.
+		Weight::from_parts(82_000_000, 0)
+			.saturating_add(Weight::from_parts(0, 317568))
+			.saturating_add(T::DbWeight::get().reads(5))
+			.saturating_add(T::DbWeight::get().writes(4))
+	}
+	/// Storage: `AmbassadorReferenda::ReferendumInfoFor` (r:1 w:1)
+	/// Proof: `AmbassadorReferenda::ReferendumInfoFor` (`max_values`: None, `max_size`: Some(900), added: 3375, mode: `MaxEncodedLen`)
+	fn refund_decision_deposit() -> Weight {
+		// Proof Size summary in bytes:
+		//  Measured:  `317`
+		//  Estimated: `4365`
+		// Minimum execution time: 38_000_000 picoseconds.
+		Weight::from_parts(38_000_000, 0)
+			.saturating_add(Weight::from_parts(0, 4365))
+			.saturating_add(T::DbWeight::get().reads(1))
+			.saturating_add(T::DbWeight::get().writes(1))
+	}
+	/// Storage: `AmbassadorReferenda::ReferendumInfoFor` (r:1 w:1)
+	/// Proof: `AmbassadorReferenda::ReferendumInfoFor` (`max_values`: None, `max_size`: Some(900), added: 3375, mode: `MaxEncodedLen`)
+	fn refund_submission_deposit() -> Weight {
+		// Proof Size summary in bytes:
+		//  Measured:  `167`
+		//  Estimated: `4365`
+		// Minimum execution time: 17_000_000 picoseconds.
+		Weight::from_parts(18_000_000, 0)
+			.saturating_add(Weight::from_parts(0, 4365))
+			.saturating_add(T::DbWeight::get().reads(1))
+			.saturating_add(T::DbWeight::get().writes(1))
+	}
+	/// Storage: `AmbassadorReferenda::ReferendumInfoFor` (r:1 w:1)
+	/// Proof: `AmbassadorReferenda::ReferendumInfoFor` (`max_values`: None, `max_size`: Some(900), added: 3375, mode: `MaxEncodedLen`)
+	/// Storage: `Scheduler::Agenda` (r:2 w:2)
+	/// Proof: `Scheduler::Agenda` (`max_values`: None, `max_size`: Some(155814), added: 158289, mode: `MaxEncodedLen`)
+	fn cancel() -> Weight {
+		// Proof Size summary in bytes:
+		//  Measured:  `311`
+		//  Estimated: `317568`
+		// Minimum execution time: 44_000_000 picoseconds.
+		Weight::from_parts(45_000_000, 0)
+			.saturating_add(Weight::from_parts(0, 317568))
+			.saturating_add(T::DbWeight::get().reads(3))
+			.saturating_add(T::DbWeight::get().writes(3))
+	}
+	/// Storage: `AmbassadorReferenda::ReferendumInfoFor` (r:1 w:1)
+	/// Proof: `AmbassadorReferenda::ReferendumInfoFor` (`max_values`: None, `max_size`: Some(900), added: 3375, mode: `MaxEncodedLen`)
+	/// Storage: `Scheduler::Agenda` (r:2 w:2)
+	/// Proof: `Scheduler::Agenda` (`max_values`: None, `max_size`: Some(155814), added: 158289, mode: `MaxEncodedLen`)
+	/// Storage: `System::Account` (r:1 w:1)
+	/// Proof: `System::Account` (`max_values`: None, `max_size`: Some(128), added: 2603, mode: `MaxEncodedLen`)
+	/// 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)
+	/// Proof: `PolkadotXcm::VersionDiscoveryQueue` (`max_values`: Some(1), `max_size`: None, mode: `Measured`)
+	/// Storage: `PolkadotXcm::SafeXcmVersion` (r:1 w:0)
+	/// Proof: `PolkadotXcm::SafeXcmVersion` (`max_values`: Some(1), `max_size`: None, mode: `Measured`)
+	/// Storage: `ParachainSystem::HostConfiguration` (r:1 w:0)
+	/// Proof: `ParachainSystem::HostConfiguration` (`max_values`: Some(1), `max_size`: None, mode: `Measured`)
+	/// Storage: `ParachainSystem::PendingUpwardMessages` (r:1 w:1)
+	/// Proof: `ParachainSystem::PendingUpwardMessages` (`max_values`: Some(1), `max_size`: None, mode: `Measured`)
+	/// Storage: `AmbassadorReferenda::MetadataOf` (r:1 w:0)
+	/// Proof: `AmbassadorReferenda::MetadataOf` (`max_values`: None, `max_size`: Some(52), added: 2527, mode: `MaxEncodedLen`)
+	fn kill() -> Weight {
+		// Proof Size summary in bytes:
+		//  Measured:  `626`
+		//  Estimated: `317568`
+		// Minimum execution time: 183_000_000 picoseconds.
+		Weight::from_parts(187_000_000, 0)
+			.saturating_add(Weight::from_parts(0, 317568))
+			.saturating_add(T::DbWeight::get().reads(11))
+			.saturating_add(T::DbWeight::get().writes(6))
+	}
+	/// Storage: `AmbassadorReferenda::TrackQueue` (r:1 w:0)
+	/// Proof: `AmbassadorReferenda::TrackQueue` (`max_values`: None, `max_size`: Some(171), added: 2646, mode: `MaxEncodedLen`)
+	/// Storage: `AmbassadorReferenda::DecidingCount` (r:1 w:1)
+	/// Proof: `AmbassadorReferenda::DecidingCount` (`max_values`: None, `max_size`: Some(14), added: 2489, mode: `MaxEncodedLen`)
+	fn one_fewer_deciding_queue_empty() -> Weight {
+		// Proof Size summary in bytes:
+		//  Measured:  `140`
+		//  Estimated: `3636`
+		// Minimum execution time: 12_000_000 picoseconds.
+		Weight::from_parts(12_000_000, 0)
+			.saturating_add(Weight::from_parts(0, 3636))
+			.saturating_add(T::DbWeight::get().reads(2))
+			.saturating_add(T::DbWeight::get().writes(1))
+	}
+	/// Storage: `AmbassadorReferenda::TrackQueue` (r:1 w:1)
+	/// Proof: `AmbassadorReferenda::TrackQueue` (`max_values`: None, `max_size`: Some(171), added: 2646, mode: `MaxEncodedLen`)
+	/// Storage: `AmbassadorReferenda::ReferendumInfoFor` (r:1 w:1)
+	/// Proof: `AmbassadorReferenda::ReferendumInfoFor` (`max_values`: None, `max_size`: Some(900), added: 3375, mode: `MaxEncodedLen`)
+	/// Storage: `AmbassadorCollective::MemberCount` (r:1 w:0)
+	/// Proof: `AmbassadorCollective::MemberCount` (`max_values`: None, `max_size`: Some(14), added: 2489, mode: `MaxEncodedLen`)
+	/// Storage: `Scheduler::Agenda` (r:1 w:1)
+	/// Proof: `Scheduler::Agenda` (`max_values`: None, `max_size`: Some(155814), added: 158289, mode: `MaxEncodedLen`)
+	fn one_fewer_deciding_failing() -> Weight {
+		// Proof Size summary in bytes:
+		//  Measured:  `1412`
+		//  Estimated: `159279`
+		// Minimum execution time: 88_000_000 picoseconds.
+		Weight::from_parts(97_000_000, 0)
+			.saturating_add(Weight::from_parts(0, 159279))
+			.saturating_add(T::DbWeight::get().reads(4))
+			.saturating_add(T::DbWeight::get().writes(3))
+	}
+	/// Storage: `AmbassadorReferenda::TrackQueue` (r:1 w:1)
+	/// Proof: `AmbassadorReferenda::TrackQueue` (`max_values`: None, `max_size`: Some(171), added: 2646, mode: `MaxEncodedLen`)
+	/// Storage: `AmbassadorReferenda::ReferendumInfoFor` (r:1 w:1)
+	/// Proof: `AmbassadorReferenda::ReferendumInfoFor` (`max_values`: None, `max_size`: Some(900), added: 3375, mode: `MaxEncodedLen`)
+	/// Storage: `AmbassadorCollective::MemberCount` (r:1 w:0)
+	/// Proof: `AmbassadorCollective::MemberCount` (`max_values`: None, `max_size`: Some(14), added: 2489, mode: `MaxEncodedLen`)
+	/// Storage: `Scheduler::Agenda` (r:1 w:1)
+	/// Proof: `Scheduler::Agenda` (`max_values`: None, `max_size`: Some(155814), added: 158289, mode: `MaxEncodedLen`)
+	fn one_fewer_deciding_passing() -> Weight {
+		// Proof Size summary in bytes:
+		//  Measured:  `1412`
+		//  Estimated: `159279`
+		// Minimum execution time: 87_000_000 picoseconds.
+		Weight::from_parts(92_000_000, 0)
+			.saturating_add(Weight::from_parts(0, 159279))
+			.saturating_add(T::DbWeight::get().reads(4))
+			.saturating_add(T::DbWeight::get().writes(3))
+	}
+	/// Storage: `AmbassadorReferenda::ReferendumInfoFor` (r:1 w:0)
+	/// Proof: `AmbassadorReferenda::ReferendumInfoFor` (`max_values`: None, `max_size`: Some(900), added: 3375, mode: `MaxEncodedLen`)
+	/// Storage: `AmbassadorReferenda::TrackQueue` (r:1 w:1)
+	/// Proof: `AmbassadorReferenda::TrackQueue` (`max_values`: None, `max_size`: Some(171), added: 2646, mode: `MaxEncodedLen`)
+	fn nudge_referendum_requeued_insertion() -> Weight {
+		// Proof Size summary in bytes:
+		//  Measured:  `935`
+		//  Estimated: `4365`
+		// Minimum execution time: 43_000_000 picoseconds.
+		Weight::from_parts(46_000_000, 0)
+			.saturating_add(Weight::from_parts(0, 4365))
+			.saturating_add(T::DbWeight::get().reads(2))
+			.saturating_add(T::DbWeight::get().writes(1))
+	}
+	/// Storage: `AmbassadorReferenda::ReferendumInfoFor` (r:1 w:0)
+	/// Proof: `AmbassadorReferenda::ReferendumInfoFor` (`max_values`: None, `max_size`: Some(900), added: 3375, mode: `MaxEncodedLen`)
+	/// Storage: `AmbassadorReferenda::TrackQueue` (r:1 w:1)
+	/// Proof: `AmbassadorReferenda::TrackQueue` (`max_values`: None, `max_size`: Some(171), added: 2646, mode: `MaxEncodedLen`)
+	fn nudge_referendum_requeued_slide() -> Weight {
+		// Proof Size summary in bytes:
+		//  Measured:  `935`
+		//  Estimated: `4365`
+		// Minimum execution time: 39_000_000 picoseconds.
+		Weight::from_parts(43_000_000, 0)
+			.saturating_add(Weight::from_parts(0, 4365))
+			.saturating_add(T::DbWeight::get().reads(2))
+			.saturating_add(T::DbWeight::get().writes(1))
+	}
+	/// Storage: `AmbassadorReferenda::ReferendumInfoFor` (r:1 w:1)
+	/// Proof: `AmbassadorReferenda::ReferendumInfoFor` (`max_values`: None, `max_size`: Some(900), added: 3375, mode: `MaxEncodedLen`)
+	/// Storage: `AmbassadorReferenda::DecidingCount` (r:1 w:0)
+	/// Proof: `AmbassadorReferenda::DecidingCount` (`max_values`: None, `max_size`: Some(14), added: 2489, mode: `MaxEncodedLen`)
+	/// Storage: `AmbassadorReferenda::TrackQueue` (r:1 w:1)
+	/// Proof: `AmbassadorReferenda::TrackQueue` (`max_values`: None, `max_size`: Some(171), added: 2646, mode: `MaxEncodedLen`)
+	fn nudge_referendum_queued() -> Weight {
+		// Proof Size summary in bytes:
+		//  Measured:  `951`
+		//  Estimated: `4365`
+		// Minimum execution time: 48_000_000 picoseconds.
+		Weight::from_parts(50_000_000, 0)
+			.saturating_add(Weight::from_parts(0, 4365))
+			.saturating_add(T::DbWeight::get().reads(3))
+			.saturating_add(T::DbWeight::get().writes(2))
+	}
+	/// Storage: `AmbassadorReferenda::ReferendumInfoFor` (r:1 w:1)
+	/// Proof: `AmbassadorReferenda::ReferendumInfoFor` (`max_values`: None, `max_size`: Some(900), added: 3375, mode: `MaxEncodedLen`)
+	/// Storage: `AmbassadorReferenda::DecidingCount` (r:1 w:0)
+	/// Proof: `AmbassadorReferenda::DecidingCount` (`max_values`: None, `max_size`: Some(14), added: 2489, mode: `MaxEncodedLen`)
+	/// Storage: `AmbassadorReferenda::TrackQueue` (r:1 w:1)
+	/// Proof: `AmbassadorReferenda::TrackQueue` (`max_values`: None, `max_size`: Some(171), added: 2646, mode: `MaxEncodedLen`)
+	fn nudge_referendum_not_queued() -> Weight {
+		// Proof Size summary in bytes:
+		//  Measured:  `959`
+		//  Estimated: `4365`
+		// Minimum execution time: 42_000_000 picoseconds.
+		Weight::from_parts(48_000_000, 0)
+			.saturating_add(Weight::from_parts(0, 4365))
+			.saturating_add(T::DbWeight::get().reads(3))
+			.saturating_add(T::DbWeight::get().writes(2))
+	}
+	/// Storage: `AmbassadorReferenda::ReferendumInfoFor` (r:1 w:1)
+	/// Proof: `AmbassadorReferenda::ReferendumInfoFor` (`max_values`: None, `max_size`: Some(900), added: 3375, mode: `MaxEncodedLen`)
+	/// Storage: `Scheduler::Agenda` (r:1 w:1)
+	/// Proof: `Scheduler::Agenda` (`max_values`: None, `max_size`: Some(155814), added: 158289, mode: `MaxEncodedLen`)
+	fn nudge_referendum_no_deposit() -> Weight {
+		// Proof Size summary in bytes:
+		//  Measured:  `263`
+		//  Estimated: `159279`
+		// Minimum execution time: 28_000_000 picoseconds.
+		Weight::from_parts(30_000_000, 0)
+			.saturating_add(Weight::from_parts(0, 159279))
+			.saturating_add(T::DbWeight::get().reads(2))
+			.saturating_add(T::DbWeight::get().writes(2))
+	}
+	/// Storage: `AmbassadorReferenda::ReferendumInfoFor` (r:1 w:1)
+	/// Proof: `AmbassadorReferenda::ReferendumInfoFor` (`max_values`: None, `max_size`: Some(900), added: 3375, mode: `MaxEncodedLen`)
+	/// Storage: `Scheduler::Agenda` (r:1 w:1)
+	/// Proof: `Scheduler::Agenda` (`max_values`: None, `max_size`: Some(155814), added: 158289, mode: `MaxEncodedLen`)
+	fn nudge_referendum_preparing() -> Weight {
+		// Proof Size summary in bytes:
+		//  Measured:  `311`
+		//  Estimated: `159279`
+		// Minimum execution time: 26_000_000 picoseconds.
+		Weight::from_parts(28_000_000, 0)
+			.saturating_add(Weight::from_parts(0, 159279))
+			.saturating_add(T::DbWeight::get().reads(2))
+			.saturating_add(T::DbWeight::get().writes(2))
+	}
+	/// Storage: `AmbassadorReferenda::ReferendumInfoFor` (r:1 w:1)
+	/// Proof: `AmbassadorReferenda::ReferendumInfoFor` (`max_values`: None, `max_size`: Some(900), added: 3375, mode: `MaxEncodedLen`)
+	fn nudge_referendum_timed_out() -> Weight {
+		// Proof Size summary in bytes:
+		//  Measured:  `208`
+		//  Estimated: `4365`
+		// Minimum execution time: 19_000_000 picoseconds.
+		Weight::from_parts(20_000_000, 0)
+			.saturating_add(Weight::from_parts(0, 4365))
+			.saturating_add(T::DbWeight::get().reads(1))
+			.saturating_add(T::DbWeight::get().writes(1))
+	}
+	/// Storage: `AmbassadorReferenda::ReferendumInfoFor` (r:1 w:1)
+	/// Proof: `AmbassadorReferenda::ReferendumInfoFor` (`max_values`: None, `max_size`: Some(900), added: 3375, mode: `MaxEncodedLen`)
+	/// Storage: `AmbassadorReferenda::DecidingCount` (r:1 w:1)
+	/// Proof: `AmbassadorReferenda::DecidingCount` (`max_values`: None, `max_size`: Some(14), added: 2489, mode: `MaxEncodedLen`)
+	/// Storage: `AmbassadorCollective::MemberCount` (r:1 w:0)
+	/// Proof: `AmbassadorCollective::MemberCount` (`max_values`: None, `max_size`: Some(14), added: 2489, mode: `MaxEncodedLen`)
+	/// Storage: `Scheduler::Agenda` (r:1 w:1)
+	/// Proof: `Scheduler::Agenda` (`max_values`: None, `max_size`: Some(155814), added: 158289, mode: `MaxEncodedLen`)
+	fn nudge_referendum_begin_deciding_failing() -> Weight {
+		// Proof Size summary in bytes:
+		//  Measured:  `546`
+		//  Estimated: `159279`
+		// Minimum execution time: 42_000_000 picoseconds.
+		Weight::from_parts(46_000_000, 0)
+			.saturating_add(Weight::from_parts(0, 159279))
+			.saturating_add(T::DbWeight::get().reads(4))
+			.saturating_add(T::DbWeight::get().writes(3))
+	}
+	/// Storage: `AmbassadorReferenda::ReferendumInfoFor` (r:1 w:1)
+	/// Proof: `AmbassadorReferenda::ReferendumInfoFor` (`max_values`: None, `max_size`: Some(900), added: 3375, mode: `MaxEncodedLen`)
+	/// Storage: `AmbassadorReferenda::DecidingCount` (r:1 w:1)
+	/// Proof: `AmbassadorReferenda::DecidingCount` (`max_values`: None, `max_size`: Some(14), added: 2489, mode: `MaxEncodedLen`)
+	/// Storage: `AmbassadorCollective::MemberCount` (r:1 w:0)
+	/// Proof: `AmbassadorCollective::MemberCount` (`max_values`: None, `max_size`: Some(14), added: 2489, mode: `MaxEncodedLen`)
+	/// Storage: `Scheduler::Agenda` (r:1 w:1)
+	/// Proof: `Scheduler::Agenda` (`max_values`: None, `max_size`: Some(155814), added: 158289, mode: `MaxEncodedLen`)
+	fn nudge_referendum_begin_deciding_passing() -> Weight {
+		// Proof Size summary in bytes:
+		//  Measured:  `647`
+		//  Estimated: `159279`
+		// Minimum execution time: 87_000_000 picoseconds.
+		Weight::from_parts(93_000_000, 0)
+			.saturating_add(Weight::from_parts(0, 159279))
+			.saturating_add(T::DbWeight::get().reads(4))
+			.saturating_add(T::DbWeight::get().writes(3))
+	}
+	/// Storage: `AmbassadorReferenda::ReferendumInfoFor` (r:1 w:1)
+	/// Proof: `AmbassadorReferenda::ReferendumInfoFor` (`max_values`: None, `max_size`: Some(900), added: 3375, mode: `MaxEncodedLen`)
+	/// Storage: `AmbassadorCollective::MemberCount` (r:1 w:0)
+	/// Proof: `AmbassadorCollective::MemberCount` (`max_values`: None, `max_size`: Some(14), added: 2489, mode: `MaxEncodedLen`)
+	/// Storage: `Scheduler::Agenda` (r:1 w:1)
+	/// Proof: `Scheduler::Agenda` (`max_values`: None, `max_size`: Some(155814), added: 158289, mode: `MaxEncodedLen`)
+	fn nudge_referendum_begin_confirming() -> Weight {
+		// Proof Size summary in bytes:
+		//  Measured:  `700`
+		//  Estimated: `159279`
+		// Minimum execution time: 100_000_000 picoseconds.
+		Weight::from_parts(120_000_000, 0)
+			.saturating_add(Weight::from_parts(0, 159279))
+			.saturating_add(T::DbWeight::get().reads(3))
+			.saturating_add(T::DbWeight::get().writes(2))
+	}
+	/// Storage: `AmbassadorReferenda::ReferendumInfoFor` (r:1 w:1)
+	/// Proof: `AmbassadorReferenda::ReferendumInfoFor` (`max_values`: None, `max_size`: Some(900), added: 3375, mode: `MaxEncodedLen`)
+	/// Storage: `AmbassadorCollective::MemberCount` (r:1 w:0)
+	/// Proof: `AmbassadorCollective::MemberCount` (`max_values`: None, `max_size`: Some(14), added: 2489, mode: `MaxEncodedLen`)
+	/// Storage: `Scheduler::Agenda` (r:1 w:1)
+	/// Proof: `Scheduler::Agenda` (`max_values`: None, `max_size`: Some(155814), added: 158289, mode: `MaxEncodedLen`)
+	fn nudge_referendum_end_confirming() -> Weight {
+		// Proof Size summary in bytes:
+		//  Measured:  `683`
+		//  Estimated: `159279`
+		// Minimum execution time: 90_000_000 picoseconds.
+		Weight::from_parts(100_000_000, 0)
+			.saturating_add(Weight::from_parts(0, 159279))
+			.saturating_add(T::DbWeight::get().reads(3))
+			.saturating_add(T::DbWeight::get().writes(2))
+	}
+	/// Storage: `AmbassadorReferenda::ReferendumInfoFor` (r:1 w:1)
+	/// Proof: `AmbassadorReferenda::ReferendumInfoFor` (`max_values`: None, `max_size`: Some(900), added: 3375, mode: `MaxEncodedLen`)
+	/// Storage: `AmbassadorCollective::MemberCount` (r:1 w:0)
+	/// Proof: `AmbassadorCollective::MemberCount` (`max_values`: None, `max_size`: Some(14), added: 2489, mode: `MaxEncodedLen`)
+	/// Storage: `Scheduler::Agenda` (r:1 w:1)
+	/// Proof: `Scheduler::Agenda` (`max_values`: None, `max_size`: Some(155814), added: 158289, mode: `MaxEncodedLen`)
+	fn nudge_referendum_continue_not_confirming() -> Weight {
+		// Proof Size summary in bytes:
+		//  Measured:  `700`
+		//  Estimated: `159279`
+		// Minimum execution time: 77_000_000 picoseconds.
+		Weight::from_parts(82_000_000, 0)
+			.saturating_add(Weight::from_parts(0, 159279))
+			.saturating_add(T::DbWeight::get().reads(3))
+			.saturating_add(T::DbWeight::get().writes(2))
+	}
+	/// Storage: `AmbassadorReferenda::ReferendumInfoFor` (r:1 w:1)
+	/// Proof: `AmbassadorReferenda::ReferendumInfoFor` (`max_values`: None, `max_size`: Some(900), added: 3375, mode: `MaxEncodedLen`)
+	/// Storage: `AmbassadorCollective::MemberCount` (r:1 w:0)
+	/// Proof: `AmbassadorCollective::MemberCount` (`max_values`: None, `max_size`: Some(14), added: 2489, mode: `MaxEncodedLen`)
+	/// Storage: `Scheduler::Agenda` (r:1 w:1)
+	/// Proof: `Scheduler::Agenda` (`max_values`: None, `max_size`: Some(155814), added: 158289, mode: `MaxEncodedLen`)
+	fn nudge_referendum_continue_confirming() -> Weight {
+		// Proof Size summary in bytes:
+		//  Measured:  `704`
+		//  Estimated: `159279`
+		// Minimum execution time: 68_000_000 picoseconds.
+		Weight::from_parts(77_000_000, 0)
+			.saturating_add(Weight::from_parts(0, 159279))
+			.saturating_add(T::DbWeight::get().reads(3))
+			.saturating_add(T::DbWeight::get().writes(2))
+	}
+	/// Storage: `AmbassadorReferenda::ReferendumInfoFor` (r:1 w:1)
+	/// Proof: `AmbassadorReferenda::ReferendumInfoFor` (`max_values`: None, `max_size`: Some(900), added: 3375, mode: `MaxEncodedLen`)
+	/// Storage: `AmbassadorCollective::MemberCount` (r:1 w:0)
+	/// Proof: `AmbassadorCollective::MemberCount` (`max_values`: None, `max_size`: Some(14), added: 2489, mode: `MaxEncodedLen`)
+	/// Storage: `Scheduler::Agenda` (r:2 w:2)
+	/// Proof: `Scheduler::Agenda` (`max_values`: None, `max_size`: Some(155814), added: 158289, mode: `MaxEncodedLen`)
+	/// Storage: `Scheduler::Lookup` (r:1 w:1)
+	/// Proof: `Scheduler::Lookup` (`max_values`: None, `max_size`: Some(48), added: 2523, mode: `MaxEncodedLen`)
+	fn nudge_referendum_approved() -> Weight {
+		// Proof Size summary in bytes:
+		//  Measured:  `704`
+		//  Estimated: `317568`
+		// Minimum execution time: 99_000_000 picoseconds.
+		Weight::from_parts(104_000_000, 0)
+			.saturating_add(Weight::from_parts(0, 317568))
+			.saturating_add(T::DbWeight::get().reads(5))
+			.saturating_add(T::DbWeight::get().writes(4))
+	}
+	/// Storage: `AmbassadorReferenda::ReferendumInfoFor` (r:1 w:1)
+	/// Proof: `AmbassadorReferenda::ReferendumInfoFor` (`max_values`: None, `max_size`: Some(900), added: 3375, mode: `MaxEncodedLen`)
+	/// Storage: `AmbassadorCollective::MemberCount` (r:1 w:0)
+	/// Proof: `AmbassadorCollective::MemberCount` (`max_values`: None, `max_size`: Some(14), added: 2489, mode: `MaxEncodedLen`)
+	/// Storage: `Scheduler::Agenda` (r:1 w:1)
+	/// Proof: `Scheduler::Agenda` (`max_values`: None, `max_size`: Some(155814), added: 158289, mode: `MaxEncodedLen`)
+	fn nudge_referendum_rejected() -> Weight {
+		// Proof Size summary in bytes:
+		//  Measured:  `700`
+		//  Estimated: `159279`
+		// Minimum execution time: 87_000_000 picoseconds.
+		Weight::from_parts(100_000_000, 0)
+			.saturating_add(Weight::from_parts(0, 159279))
+			.saturating_add(T::DbWeight::get().reads(3))
+			.saturating_add(T::DbWeight::get().writes(2))
+	}
+	/// Storage: `AmbassadorReferenda::ReferendumInfoFor` (r:1 w:0)
+	/// Proof: `AmbassadorReferenda::ReferendumInfoFor` (`max_values`: None, `max_size`: Some(900), added: 3375, mode: `MaxEncodedLen`)
+	/// Storage: `Preimage::StatusFor` (r:1 w:0)
+	/// Proof: `Preimage::StatusFor` (`max_values`: None, `max_size`: Some(91), added: 2566, mode: `MaxEncodedLen`)
+	/// Storage: `AmbassadorReferenda::MetadataOf` (r:0 w:1)
+	/// Proof: `AmbassadorReferenda::MetadataOf` (`max_values`: None, `max_size`: Some(52), added: 2527, mode: `MaxEncodedLen`)
+	fn set_some_metadata() -> Weight {
+		// Proof Size summary in bytes:
+		//  Measured:  `419`
+		//  Estimated: `4365`
+		// Minimum execution time: 23_000_000 picoseconds.
+		Weight::from_parts(25_000_000, 0)
+			.saturating_add(Weight::from_parts(0, 4365))
+			.saturating_add(T::DbWeight::get().reads(2))
+			.saturating_add(T::DbWeight::get().writes(1))
+	}
+	/// Storage: `AmbassadorReferenda::ReferendumInfoFor` (r:1 w:0)
+	/// Proof: `AmbassadorReferenda::ReferendumInfoFor` (`max_values`: None, `max_size`: Some(900), added: 3375, mode: `MaxEncodedLen`)
+	/// Storage: `AmbassadorReferenda::MetadataOf` (r:1 w:1)
+	/// Proof: `AmbassadorReferenda::MetadataOf` (`max_values`: None, `max_size`: Some(52), added: 2527, mode: `MaxEncodedLen`)
+	fn clear_metadata() -> Weight {
+		// Proof Size summary in bytes:
+		//  Measured:  `285`
+		//  Estimated: `4365`
+		// Minimum execution time: 20_000_000 picoseconds.
+		Weight::from_parts(21_000_000, 0)
+			.saturating_add(Weight::from_parts(0, 4365))
+			.saturating_add(T::DbWeight::get().reads(2))
+			.saturating_add(T::DbWeight::get().writes(1))
+	}
+}
diff --git a/cumulus/parachains/runtimes/collectives/collectives-polkadot/src/weights/pallet_referenda.rs b/cumulus/parachains/runtimes/collectives/collectives-polkadot/src/weights/pallet_referenda_fellowship_referenda.rs
similarity index 87%
rename from cumulus/parachains/runtimes/collectives/collectives-polkadot/src/weights/pallet_referenda.rs
rename to cumulus/parachains/runtimes/collectives/collectives-polkadot/src/weights/pallet_referenda_fellowship_referenda.rs
index 1e8b3ecae2e2c6e66de57ff0d865c9245e17e9f1..5b4aed06899fcca022895488477ffb058ae76399 100644
--- a/cumulus/parachains/runtimes/collectives/collectives-polkadot/src/weights/pallet_referenda.rs
+++ b/cumulus/parachains/runtimes/collectives/collectives-polkadot/src/weights/pallet_referenda_fellowship_referenda.rs
@@ -1,4 +1,4 @@
-// Copyright Parity Technologies (UK) Ltd.
+// Copyright (C) Parity Technologies (UK) Ltd.
 // This file is part of Cumulus.
 
 // Cumulus is free software: you can redistribute it and/or modify
@@ -17,24 +17,21 @@
 //! Autogenerated weights for `pallet_referenda`
 //!
 //! THIS FILE WAS AUTO-GENERATED USING THE SUBSTRATE BENCHMARK CLI VERSION 4.0.0-dev
-//! DATE: 2023-07-31, STEPS: `50`, REPEAT: `20`, LOW RANGE: `[]`, HIGH RANGE: `[]`
+//! DATE: 2023-08-11, STEPS: `2`, REPEAT: `2`, LOW RANGE: `[]`, HIGH RANGE: `[]`
 //! WORST CASE MAP SIZE: `1000000`
-//! HOSTNAME: `runner-ynta1nyy-project-238-concurrent-0`, CPU: `Intel(R) Xeon(R) CPU @ 2.60GHz`
-//! EXECUTION: ``, WASM-EXECUTION: `Compiled`, CHAIN: `Some("collectives-polkadot-dev")`, DB CACHE: 1024
+//! HOSTNAME: `cob`, CPU: `<UNKNOWN>`
+//! WASM-EXECUTION: `Compiled`, CHAIN: `Some("collectives-polkadot-dev")`, DB CACHE: 1024
 
 // Executed Command:
-// ./target/production/polkadot-parachain
+// target/release/polkadot-parachain
 // benchmark
 // pallet
 // --chain=collectives-polkadot-dev
 // --wasm-execution=compiled
 // --pallet=pallet_referenda
-// --no-storage-info
-// --no-median-slopes
-// --no-min-squares
 // --extrinsic=*
-// --steps=50
-// --repeat=20
+// --steps=2
+// --repeat=2
 // --json
 // --header=./file_header.txt
 // --output=./parachains/runtimes/collectives/collectives-polkadot/src/weights/
@@ -60,10 +57,10 @@ impl<T: frame_system::Config> pallet_referenda::WeightInfo for WeightInfo<T> {
 	/// Proof: `FellowshipReferenda::ReferendumInfoFor` (`max_values`: None, `max_size`: Some(900), added: 3375, mode: `MaxEncodedLen`)
 	fn submit() -> Weight {
 		// Proof Size summary in bytes:
-		//  Measured:  `355`
+		//  Measured:  `389`
 		//  Estimated: `159279`
-		// Minimum execution time: 29_271_000 picoseconds.
-		Weight::from_parts(30_285_000, 0)
+		// Minimum execution time: 34_000_000 picoseconds.
+		Weight::from_parts(36_000_000, 0)
 			.saturating_add(Weight::from_parts(0, 159279))
 			.saturating_add(T::DbWeight::get().reads(3))
 			.saturating_add(T::DbWeight::get().writes(3))
@@ -74,10 +71,10 @@ impl<T: frame_system::Config> pallet_referenda::WeightInfo for WeightInfo<T> {
 	/// Proof: `Scheduler::Agenda` (`max_values`: None, `max_size`: Some(155814), added: 158289, mode: `MaxEncodedLen`)
 	fn place_decision_deposit_preparing() -> Weight {
 		// Proof Size summary in bytes:
-		//  Measured:  `366`
+		//  Measured:  `400`
 		//  Estimated: `317568`
-		// Minimum execution time: 52_128_000 picoseconds.
-		Weight::from_parts(53_504_000, 0)
+		// Minimum execution time: 64_000_000 picoseconds.
+		Weight::from_parts(67_000_000, 0)
 			.saturating_add(Weight::from_parts(0, 317568))
 			.saturating_add(T::DbWeight::get().reads(3))
 			.saturating_add(T::DbWeight::get().writes(3))
@@ -92,10 +89,10 @@ impl<T: frame_system::Config> pallet_referenda::WeightInfo for WeightInfo<T> {
 	/// Proof: `Scheduler::Agenda` (`max_values`: None, `max_size`: Some(155814), added: 158289, mode: `MaxEncodedLen`)
 	fn place_decision_deposit_queued() -> Weight {
 		// Proof Size summary in bytes:
-		//  Measured:  `2004`
+		//  Measured:  `2038`
 		//  Estimated: `159279`
-		// Minimum execution time: 110_018_000 picoseconds.
-		Weight::from_parts(114_369_000, 0)
+		// Minimum execution time: 99_000_000 picoseconds.
+		Weight::from_parts(109_000_000, 0)
 			.saturating_add(Weight::from_parts(0, 159279))
 			.saturating_add(T::DbWeight::get().reads(4))
 			.saturating_add(T::DbWeight::get().writes(3))
@@ -110,10 +107,10 @@ impl<T: frame_system::Config> pallet_referenda::WeightInfo for WeightInfo<T> {
 	/// Proof: `Scheduler::Agenda` (`max_values`: None, `max_size`: Some(155814), added: 158289, mode: `MaxEncodedLen`)
 	fn place_decision_deposit_not_queued() -> Weight {
 		// Proof Size summary in bytes:
-		//  Measured:  `2045`
+		//  Measured:  `2079`
 		//  Estimated: `159279`
-		// Minimum execution time: 110_231_000 picoseconds.
-		Weight::from_parts(114_517_000, 0)
+		// Minimum execution time: 101_000_000 picoseconds.
+		Weight::from_parts(111_000_000, 0)
 			.saturating_add(Weight::from_parts(0, 159279))
 			.saturating_add(T::DbWeight::get().reads(4))
 			.saturating_add(T::DbWeight::get().writes(3))
@@ -128,10 +125,10 @@ impl<T: frame_system::Config> pallet_referenda::WeightInfo for WeightInfo<T> {
 	/// Proof: `Scheduler::Agenda` (`max_values`: None, `max_size`: Some(155814), added: 158289, mode: `MaxEncodedLen`)
 	fn place_decision_deposit_passing() -> Weight {
 		// Proof Size summary in bytes:
-		//  Measured:  `802`
+		//  Measured:  `836`
 		//  Estimated: `317568`
-		// Minimum execution time: 195_619_000 picoseconds.
-		Weight::from_parts(207_157_000, 0)
+		// Minimum execution time: 135_000_000 picoseconds.
+		Weight::from_parts(153_000_000, 0)
 			.saturating_add(Weight::from_parts(0, 317568))
 			.saturating_add(T::DbWeight::get().reads(5))
 			.saturating_add(T::DbWeight::get().writes(4))
@@ -146,10 +143,10 @@ impl<T: frame_system::Config> pallet_referenda::WeightInfo for WeightInfo<T> {
 	/// Proof: `Scheduler::Agenda` (`max_values`: None, `max_size`: Some(155814), added: 158289, mode: `MaxEncodedLen`)
 	fn place_decision_deposit_failing() -> Weight {
 		// Proof Size summary in bytes:
-		//  Measured:  `701`
+		//  Measured:  `735`
 		//  Estimated: `317568`
-		// Minimum execution time: 64_020_000 picoseconds.
-		Weight::from_parts(65_463_000, 0)
+		// Minimum execution time: 78_000_000 picoseconds.
+		Weight::from_parts(82_000_000, 0)
 			.saturating_add(Weight::from_parts(0, 317568))
 			.saturating_add(T::DbWeight::get().reads(5))
 			.saturating_add(T::DbWeight::get().writes(4))
@@ -158,10 +155,10 @@ impl<T: frame_system::Config> pallet_referenda::WeightInfo for WeightInfo<T> {
 	/// Proof: `FellowshipReferenda::ReferendumInfoFor` (`max_values`: None, `max_size`: Some(900), added: 3375, mode: `MaxEncodedLen`)
 	fn refund_decision_deposit() -> Weight {
 		// Proof Size summary in bytes:
-		//  Measured:  `317`
+		//  Measured:  `351`
 		//  Estimated: `4365`
-		// Minimum execution time: 30_701_000 picoseconds.
-		Weight::from_parts(31_528_000, 0)
+		// Minimum execution time: 38_000_000 picoseconds.
+		Weight::from_parts(39_000_000, 0)
 			.saturating_add(Weight::from_parts(0, 4365))
 			.saturating_add(T::DbWeight::get().reads(1))
 			.saturating_add(T::DbWeight::get().writes(1))
@@ -170,10 +167,10 @@ impl<T: frame_system::Config> pallet_referenda::WeightInfo for WeightInfo<T> {
 	/// Proof: `FellowshipReferenda::ReferendumInfoFor` (`max_values`: None, `max_size`: Some(900), added: 3375, mode: `MaxEncodedLen`)
 	fn refund_submission_deposit() -> Weight {
 		// Proof Size summary in bytes:
-		//  Measured:  `167`
+		//  Measured:  `201`
 		//  Estimated: `4365`
-		// Minimum execution time: 15_173_000 picoseconds.
-		Weight::from_parts(15_787_000, 0)
+		// Minimum execution time: 18_000_000 picoseconds.
+		Weight::from_parts(19_000_000, 0)
 			.saturating_add(Weight::from_parts(0, 4365))
 			.saturating_add(T::DbWeight::get().reads(1))
 			.saturating_add(T::DbWeight::get().writes(1))
@@ -184,10 +181,10 @@ impl<T: frame_system::Config> pallet_referenda::WeightInfo for WeightInfo<T> {
 	/// Proof: `Scheduler::Agenda` (`max_values`: None, `max_size`: Some(155814), added: 158289, mode: `MaxEncodedLen`)
 	fn cancel() -> Weight {
 		// Proof Size summary in bytes:
-		//  Measured:  `311`
+		//  Measured:  `345`
 		//  Estimated: `317568`
-		// Minimum execution time: 37_886_000 picoseconds.
-		Weight::from_parts(38_679_000, 0)
+		// Minimum execution time: 45_000_000 picoseconds.
+		Weight::from_parts(46_000_000, 0)
 			.saturating_add(Weight::from_parts(0, 317568))
 			.saturating_add(T::DbWeight::get().reads(3))
 			.saturating_add(T::DbWeight::get().writes(3))
@@ -214,10 +211,10 @@ impl<T: frame_system::Config> pallet_referenda::WeightInfo for WeightInfo<T> {
 	/// Proof: `FellowshipReferenda::MetadataOf` (`max_values`: None, `max_size`: Some(52), added: 2527, mode: `MaxEncodedLen`)
 	fn kill() -> Weight {
 		// Proof Size summary in bytes:
-		//  Measured:  `517`
+		//  Measured:  `587`
 		//  Estimated: `317568`
-		// Minimum execution time: 152_111_000 picoseconds.
-		Weight::from_parts(155_738_000, 0)
+		// Minimum execution time: 185_000_000 picoseconds.
+		Weight::from_parts(196_000_000, 0)
 			.saturating_add(Weight::from_parts(0, 317568))
 			.saturating_add(T::DbWeight::get().reads(11))
 			.saturating_add(T::DbWeight::get().writes(6))
@@ -228,10 +225,10 @@ impl<T: frame_system::Config> pallet_referenda::WeightInfo for WeightInfo<T> {
 	/// Proof: `FellowshipReferenda::DecidingCount` (`max_values`: None, `max_size`: Some(14), added: 2489, mode: `MaxEncodedLen`)
 	fn one_fewer_deciding_queue_empty() -> Weight {
 		// Proof Size summary in bytes:
-		//  Measured:  `140`
+		//  Measured:  `174`
 		//  Estimated: `4277`
-		// Minimum execution time: 10_712_000 picoseconds.
-		Weight::from_parts(10_976_000, 0)
+		// Minimum execution time: 12_000_000 picoseconds.
+		Weight::from_parts(15_000_000, 0)
 			.saturating_add(Weight::from_parts(0, 4277))
 			.saturating_add(T::DbWeight::get().reads(2))
 			.saturating_add(T::DbWeight::get().writes(1))
@@ -246,10 +243,10 @@ impl<T: frame_system::Config> pallet_referenda::WeightInfo for WeightInfo<T> {
 	/// Proof: `Scheduler::Agenda` (`max_values`: None, `max_size`: Some(155814), added: 158289, mode: `MaxEncodedLen`)
 	fn one_fewer_deciding_failing() -> Weight {
 		// Proof Size summary in bytes:
-		//  Measured:  `2418`
+		//  Measured:  `2452`
 		//  Estimated: `159279`
-		// Minimum execution time: 97_671_000 picoseconds.
-		Weight::from_parts(104_911_000, 0)
+		// Minimum execution time: 82_000_000 picoseconds.
+		Weight::from_parts(90_000_000, 0)
 			.saturating_add(Weight::from_parts(0, 159279))
 			.saturating_add(T::DbWeight::get().reads(4))
 			.saturating_add(T::DbWeight::get().writes(3))
@@ -264,10 +261,10 @@ impl<T: frame_system::Config> pallet_referenda::WeightInfo for WeightInfo<T> {
 	/// Proof: `Scheduler::Agenda` (`max_values`: None, `max_size`: Some(155814), added: 158289, mode: `MaxEncodedLen`)
 	fn one_fewer_deciding_passing() -> Weight {
 		// Proof Size summary in bytes:
-		//  Measured:  `2418`
+		//  Measured:  `2452`
 		//  Estimated: `159279`
-		// Minimum execution time: 104_019_000 picoseconds.
-		Weight::from_parts(108_208_000, 0)
+		// Minimum execution time: 91_000_000 picoseconds.
+		Weight::from_parts(99_000_000, 0)
 			.saturating_add(Weight::from_parts(0, 159279))
 			.saturating_add(T::DbWeight::get().reads(4))
 			.saturating_add(T::DbWeight::get().writes(3))
@@ -278,10 +275,10 @@ impl<T: frame_system::Config> pallet_referenda::WeightInfo for WeightInfo<T> {
 	/// Proof: `FellowshipReferenda::TrackQueue` (`max_values`: None, `max_size`: Some(812), added: 3287, mode: `MaxEncodedLen`)
 	fn nudge_referendum_requeued_insertion() -> Weight {
 		// Proof Size summary in bytes:
-		//  Measured:  `1807`
+		//  Measured:  `1841`
 		//  Estimated: `4365`
-		// Minimum execution time: 50_199_000 picoseconds.
-		Weight::from_parts(54_350_000, 0)
+		// Minimum execution time: 41_000_000 picoseconds.
+		Weight::from_parts(44_000_000, 0)
 			.saturating_add(Weight::from_parts(0, 4365))
 			.saturating_add(T::DbWeight::get().reads(2))
 			.saturating_add(T::DbWeight::get().writes(1))
@@ -292,10 +289,10 @@ impl<T: frame_system::Config> pallet_referenda::WeightInfo for WeightInfo<T> {
 	/// Proof: `FellowshipReferenda::TrackQueue` (`max_values`: None, `max_size`: Some(812), added: 3287, mode: `MaxEncodedLen`)
 	fn nudge_referendum_requeued_slide() -> Weight {
 		// Proof Size summary in bytes:
-		//  Measured:  `1774`
+		//  Measured:  `1808`
 		//  Estimated: `4365`
-		// Minimum execution time: 52_459_000 picoseconds.
-		Weight::from_parts(54_382_000, 0)
+		// Minimum execution time: 46_000_000 picoseconds.
+		Weight::from_parts(55_000_000, 0)
 			.saturating_add(Weight::from_parts(0, 4365))
 			.saturating_add(T::DbWeight::get().reads(2))
 			.saturating_add(T::DbWeight::get().writes(1))
@@ -308,10 +305,10 @@ impl<T: frame_system::Config> pallet_referenda::WeightInfo for WeightInfo<T> {
 	/// Proof: `FellowshipReferenda::TrackQueue` (`max_values`: None, `max_size`: Some(812), added: 3287, mode: `MaxEncodedLen`)
 	fn nudge_referendum_queued() -> Weight {
 		// Proof Size summary in bytes:
-		//  Measured:  `1790`
+		//  Measured:  `1824`
 		//  Estimated: `4365`
-		// Minimum execution time: 57_810_000 picoseconds.
-		Weight::from_parts(63_690_000, 0)
+		// Minimum execution time: 49_000_000 picoseconds.
+		Weight::from_parts(53_000_000, 0)
 			.saturating_add(Weight::from_parts(0, 4365))
 			.saturating_add(T::DbWeight::get().reads(3))
 			.saturating_add(T::DbWeight::get().writes(2))
@@ -324,10 +321,10 @@ impl<T: frame_system::Config> pallet_referenda::WeightInfo for WeightInfo<T> {
 	/// Proof: `FellowshipReferenda::TrackQueue` (`max_values`: None, `max_size`: Some(812), added: 3287, mode: `MaxEncodedLen`)
 	fn nudge_referendum_not_queued() -> Weight {
 		// Proof Size summary in bytes:
-		//  Measured:  `1831`
+		//  Measured:  `1865`
 		//  Estimated: `4365`
-		// Minimum execution time: 56_778_000 picoseconds.
-		Weight::from_parts(59_556_000, 0)
+		// Minimum execution time: 51_000_000 picoseconds.
+		Weight::from_parts(54_000_000, 0)
 			.saturating_add(Weight::from_parts(0, 4365))
 			.saturating_add(T::DbWeight::get().reads(3))
 			.saturating_add(T::DbWeight::get().writes(2))
@@ -338,10 +335,10 @@ impl<T: frame_system::Config> pallet_referenda::WeightInfo for WeightInfo<T> {
 	/// Proof: `Scheduler::Agenda` (`max_values`: None, `max_size`: Some(155814), added: 158289, mode: `MaxEncodedLen`)
 	fn nudge_referendum_no_deposit() -> Weight {
 		// Proof Size summary in bytes:
-		//  Measured:  `263`
+		//  Measured:  `297`
 		//  Estimated: `159279`
-		// Minimum execution time: 24_377_000 picoseconds.
-		Weight::from_parts(27_031_000, 0)
+		// Minimum execution time: 28_000_000 picoseconds.
+		Weight::from_parts(30_000_000, 0)
 			.saturating_add(Weight::from_parts(0, 159279))
 			.saturating_add(T::DbWeight::get().reads(2))
 			.saturating_add(T::DbWeight::get().writes(2))
@@ -352,10 +349,10 @@ impl<T: frame_system::Config> pallet_referenda::WeightInfo for WeightInfo<T> {
 	/// Proof: `Scheduler::Agenda` (`max_values`: None, `max_size`: Some(155814), added: 158289, mode: `MaxEncodedLen`)
 	fn nudge_referendum_preparing() -> Weight {
 		// Proof Size summary in bytes:
-		//  Measured:  `311`
+		//  Measured:  `345`
 		//  Estimated: `159279`
-		// Minimum execution time: 24_717_000 picoseconds.
-		Weight::from_parts(25_578_000, 0)
+		// Minimum execution time: 28_000_000 picoseconds.
+		Weight::from_parts(29_000_000, 0)
 			.saturating_add(Weight::from_parts(0, 159279))
 			.saturating_add(T::DbWeight::get().reads(2))
 			.saturating_add(T::DbWeight::get().writes(2))
@@ -364,10 +361,10 @@ impl<T: frame_system::Config> pallet_referenda::WeightInfo for WeightInfo<T> {
 	/// Proof: `FellowshipReferenda::ReferendumInfoFor` (`max_values`: None, `max_size`: Some(900), added: 3375, mode: `MaxEncodedLen`)
 	fn nudge_referendum_timed_out() -> Weight {
 		// Proof Size summary in bytes:
-		//  Measured:  `208`
+		//  Measured:  `242`
 		//  Estimated: `4365`
-		// Minimum execution time: 17_280_000 picoseconds.
-		Weight::from_parts(17_845_000, 0)
+		// Minimum execution time: 20_000_000 picoseconds.
+		Weight::from_parts(21_000_000, 0)
 			.saturating_add(Weight::from_parts(0, 4365))
 			.saturating_add(T::DbWeight::get().reads(1))
 			.saturating_add(T::DbWeight::get().writes(1))
@@ -382,10 +379,10 @@ impl<T: frame_system::Config> pallet_referenda::WeightInfo for WeightInfo<T> {
 	/// Proof: `Scheduler::Agenda` (`max_values`: None, `max_size`: Some(155814), added: 158289, mode: `MaxEncodedLen`)
 	fn nudge_referendum_begin_deciding_failing() -> Weight {
 		// Proof Size summary in bytes:
-		//  Measured:  `646`
+		//  Measured:  `680`
 		//  Estimated: `159279`
-		// Minimum execution time: 36_996_000 picoseconds.
-		Weight::from_parts(37_970_000, 0)
+		// Minimum execution time: 42_000_000 picoseconds.
+		Weight::from_parts(47_000_000, 0)
 			.saturating_add(Weight::from_parts(0, 159279))
 			.saturating_add(T::DbWeight::get().reads(4))
 			.saturating_add(T::DbWeight::get().writes(3))
@@ -400,10 +397,10 @@ impl<T: frame_system::Config> pallet_referenda::WeightInfo for WeightInfo<T> {
 	/// Proof: `Scheduler::Agenda` (`max_values`: None, `max_size`: Some(155814), added: 158289, mode: `MaxEncodedLen`)
 	fn nudge_referendum_begin_deciding_passing() -> Weight {
 		// Proof Size summary in bytes:
-		//  Measured:  `747`
+		//  Measured:  `781`
 		//  Estimated: `159279`
-		// Minimum execution time: 91_681_000 picoseconds.
-		Weight::from_parts(98_640_000, 0)
+		// Minimum execution time: 90_000_000 picoseconds.
+		Weight::from_parts(95_000_000, 0)
 			.saturating_add(Weight::from_parts(0, 159279))
 			.saturating_add(T::DbWeight::get().reads(4))
 			.saturating_add(T::DbWeight::get().writes(3))
@@ -416,10 +413,10 @@ impl<T: frame_system::Config> pallet_referenda::WeightInfo for WeightInfo<T> {
 	/// Proof: `Scheduler::Agenda` (`max_values`: None, `max_size`: Some(155814), added: 158289, mode: `MaxEncodedLen`)
 	fn nudge_referendum_begin_confirming() -> Weight {
 		// Proof Size summary in bytes:
-		//  Measured:  `800`
+		//  Measured:  `834`
 		//  Estimated: `159279`
-		// Minimum execution time: 149_940_000 picoseconds.
-		Weight::from_parts(167_561_000, 0)
+		// Minimum execution time: 84_000_000 picoseconds.
+		Weight::from_parts(93_000_000, 0)
 			.saturating_add(Weight::from_parts(0, 159279))
 			.saturating_add(T::DbWeight::get().reads(3))
 			.saturating_add(T::DbWeight::get().writes(2))
@@ -432,10 +429,10 @@ impl<T: frame_system::Config> pallet_referenda::WeightInfo for WeightInfo<T> {
 	/// Proof: `Scheduler::Agenda` (`max_values`: None, `max_size`: Some(155814), added: 158289, mode: `MaxEncodedLen`)
 	fn nudge_referendum_end_confirming() -> Weight {
 		// Proof Size summary in bytes:
-		//  Measured:  `783`
+		//  Measured:  `817`
 		//  Estimated: `159279`
-		// Minimum execution time: 157_443_000 picoseconds.
-		Weight::from_parts(168_023_000, 0)
+		// Minimum execution time: 88_000_000 picoseconds.
+		Weight::from_parts(98_000_000, 0)
 			.saturating_add(Weight::from_parts(0, 159279))
 			.saturating_add(T::DbWeight::get().reads(3))
 			.saturating_add(T::DbWeight::get().writes(2))
@@ -448,10 +445,10 @@ impl<T: frame_system::Config> pallet_referenda::WeightInfo for WeightInfo<T> {
 	/// Proof: `Scheduler::Agenda` (`max_values`: None, `max_size`: Some(155814), added: 158289, mode: `MaxEncodedLen`)
 	fn nudge_referendum_continue_not_confirming() -> Weight {
 		// Proof Size summary in bytes:
-		//  Measured:  `800`
+		//  Measured:  `834`
 		//  Estimated: `159279`
-		// Minimum execution time: 155_539_000 picoseconds.
-		Weight::from_parts(161_877_000, 0)
+		// Minimum execution time: 81_000_000 picoseconds.
+		Weight::from_parts(93_000_000, 0)
 			.saturating_add(Weight::from_parts(0, 159279))
 			.saturating_add(T::DbWeight::get().reads(3))
 			.saturating_add(T::DbWeight::get().writes(2))
@@ -464,10 +461,10 @@ impl<T: frame_system::Config> pallet_referenda::WeightInfo for WeightInfo<T> {
 	/// Proof: `Scheduler::Agenda` (`max_values`: None, `max_size`: Some(155814), added: 158289, mode: `MaxEncodedLen`)
 	fn nudge_referendum_continue_confirming() -> Weight {
 		// Proof Size summary in bytes:
-		//  Measured:  `804`
+		//  Measured:  `838`
 		//  Estimated: `159279`
-		// Minimum execution time: 82_000_000 picoseconds.
-		Weight::from_parts(87_101_000, 0)
+		// Minimum execution time: 74_000_000 picoseconds.
+		Weight::from_parts(77_000_000, 0)
 			.saturating_add(Weight::from_parts(0, 159279))
 			.saturating_add(T::DbWeight::get().reads(3))
 			.saturating_add(T::DbWeight::get().writes(2))
@@ -482,10 +479,10 @@ impl<T: frame_system::Config> pallet_referenda::WeightInfo for WeightInfo<T> {
 	/// Proof: `Scheduler::Lookup` (`max_values`: None, `max_size`: Some(48), added: 2523, mode: `MaxEncodedLen`)
 	fn nudge_referendum_approved() -> Weight {
 		// Proof Size summary in bytes:
-		//  Measured:  `804`
+		//  Measured:  `838`
 		//  Estimated: `317568`
-		// Minimum execution time: 154_590_000 picoseconds.
-		Weight::from_parts(186_418_000, 0)
+		// Minimum execution time: 105_000_000 picoseconds.
+		Weight::from_parts(123_000_000, 0)
 			.saturating_add(Weight::from_parts(0, 317568))
 			.saturating_add(T::DbWeight::get().reads(5))
 			.saturating_add(T::DbWeight::get().writes(4))
@@ -498,10 +495,10 @@ impl<T: frame_system::Config> pallet_referenda::WeightInfo for WeightInfo<T> {
 	/// Proof: `Scheduler::Agenda` (`max_values`: None, `max_size`: Some(155814), added: 158289, mode: `MaxEncodedLen`)
 	fn nudge_referendum_rejected() -> Weight {
 		// Proof Size summary in bytes:
-		//  Measured:  `800`
+		//  Measured:  `834`
 		//  Estimated: `159279`
-		// Minimum execution time: 149_822_000 picoseconds.
-		Weight::from_parts(164_866_000, 0)
+		// Minimum execution time: 90_000_000 picoseconds.
+		Weight::from_parts(100_000_000, 0)
 			.saturating_add(Weight::from_parts(0, 159279))
 			.saturating_add(T::DbWeight::get().reads(3))
 			.saturating_add(T::DbWeight::get().writes(2))
@@ -514,10 +511,10 @@ impl<T: frame_system::Config> pallet_referenda::WeightInfo for WeightInfo<T> {
 	/// Proof: `FellowshipReferenda::MetadataOf` (`max_values`: None, `max_size`: Some(52), added: 2527, mode: `MaxEncodedLen`)
 	fn set_some_metadata() -> Weight {
 		// Proof Size summary in bytes:
-		//  Measured:  `386`
+		//  Measured:  `453`
 		//  Estimated: `4365`
-		// Minimum execution time: 21_413_000 picoseconds.
-		Weight::from_parts(21_938_000, 0)
+		// Minimum execution time: 24_000_000 picoseconds.
+		Weight::from_parts(24_000_000, 0)
 			.saturating_add(Weight::from_parts(0, 4365))
 			.saturating_add(T::DbWeight::get().reads(2))
 			.saturating_add(T::DbWeight::get().writes(1))
@@ -528,10 +525,10 @@ impl<T: frame_system::Config> pallet_referenda::WeightInfo for WeightInfo<T> {
 	/// Proof: `FellowshipReferenda::MetadataOf` (`max_values`: None, `max_size`: Some(52), added: 2527, mode: `MaxEncodedLen`)
 	fn clear_metadata() -> Weight {
 		// Proof Size summary in bytes:
-		//  Measured:  `285`
+		//  Measured:  `319`
 		//  Estimated: `4365`
-		// Minimum execution time: 18_927_000 picoseconds.
-		Weight::from_parts(19_423_000, 0)
+		// Minimum execution time: 21_000_000 picoseconds.
+		Weight::from_parts(23_000_000, 0)
 			.saturating_add(Weight::from_parts(0, 4365))
 			.saturating_add(T::DbWeight::get().reads(2))
 			.saturating_add(T::DbWeight::get().writes(1))
diff --git a/cumulus/parachains/runtimes/collectives/collectives-polkadot/src/weights/pallet_salary_ambassador_salary.rs b/cumulus/parachains/runtimes/collectives/collectives-polkadot/src/weights/pallet_salary_ambassador_salary.rs
new file mode 100644
index 0000000000000000000000000000000000000000..0522420f2f5172ecc2840b70ecb9c74796bbddc3
--- /dev/null
+++ b/cumulus/parachains/runtimes/collectives/collectives-polkadot/src/weights/pallet_salary_ambassador_salary.rs
@@ -0,0 +1,190 @@
+// Copyright 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/>.
+
+//! Autogenerated weights for `pallet_salary`
+//!
+//! THIS FILE WAS AUTO-GENERATED USING THE SUBSTRATE BENCHMARK CLI VERSION 4.0.0-dev
+//! DATE: 2023-08-11, STEPS: `2`, REPEAT: `2`, LOW RANGE: `[]`, HIGH RANGE: `[]`
+//! WORST CASE MAP SIZE: `1000000`
+//! HOSTNAME: `cob`, CPU: `<UNKNOWN>`
+//! WASM-EXECUTION: `Compiled`, CHAIN: `Some("collectives-polkadot-dev")`, DB CACHE: 1024
+
+// Executed Command:
+// target/release/polkadot-parachain
+// benchmark
+// pallet
+// --chain=collectives-polkadot-dev
+// --wasm-execution=compiled
+// --pallet=pallet_salary
+// --extrinsic=*
+// --steps=2
+// --repeat=2
+// --json
+// --header=./file_header.txt
+// --output=./parachains/runtimes/collectives/collectives-polkadot/src/weights/
+
+#![cfg_attr(rustfmt, rustfmt_skip)]
+#![allow(unused_parens)]
+#![allow(unused_imports)]
+#![allow(missing_docs)]
+
+use frame_support::{traits::Get, weights::Weight};
+use core::marker::PhantomData;
+
+/// Weight functions for `pallet_salary`.
+pub struct WeightInfo<T>(PhantomData<T>);
+impl<T: frame_system::Config> pallet_salary::WeightInfo for WeightInfo<T> {
+	/// Storage: `AmbassadorSalary::Status` (r:1 w:1)
+	/// Proof: `AmbassadorSalary::Status` (`max_values`: Some(1), `max_size`: Some(56), added: 551, mode: `MaxEncodedLen`)
+	fn init() -> Weight {
+		// Proof Size summary in bytes:
+		//  Measured:  `109`
+		//  Estimated: `1541`
+		// Minimum execution time: 12_000_000 picoseconds.
+		Weight::from_parts(14_000_000, 0)
+			.saturating_add(Weight::from_parts(0, 1541))
+			.saturating_add(T::DbWeight::get().reads(1))
+			.saturating_add(T::DbWeight::get().writes(1))
+	}
+	/// Storage: `AmbassadorSalary::Status` (r:1 w:1)
+	/// Proof: `AmbassadorSalary::Status` (`max_values`: Some(1), `max_size`: Some(56), added: 551, mode: `MaxEncodedLen`)
+	fn bump() -> Weight {
+		// Proof Size summary in bytes:
+		//  Measured:  `191`
+		//  Estimated: `1541`
+		// Minimum execution time: 15_000_000 picoseconds.
+		Weight::from_parts(16_000_000, 0)
+			.saturating_add(Weight::from_parts(0, 1541))
+			.saturating_add(T::DbWeight::get().reads(1))
+			.saturating_add(T::DbWeight::get().writes(1))
+	}
+	/// Storage: `AmbassadorSalary::Status` (r:1 w:0)
+	/// Proof: `AmbassadorSalary::Status` (`max_values`: Some(1), `max_size`: Some(56), added: 551, mode: `MaxEncodedLen`)
+	/// Storage: `AmbassadorCollective::Members` (r:1 w:0)
+	/// Proof: `AmbassadorCollective::Members` (`max_values`: None, `max_size`: Some(42), added: 2517, mode: `MaxEncodedLen`)
+	/// Storage: `AmbassadorSalary::Claimant` (r:1 w:1)
+	/// Proof: `AmbassadorSalary::Claimant` (`max_values`: None, `max_size`: Some(86), added: 2561, mode: `MaxEncodedLen`)
+	fn induct() -> Weight {
+		// Proof Size summary in bytes:
+		//  Measured:  `400`
+		//  Estimated: `3551`
+		// Minimum execution time: 23_000_000 picoseconds.
+		Weight::from_parts(23_000_000, 0)
+			.saturating_add(Weight::from_parts(0, 3551))
+			.saturating_add(T::DbWeight::get().reads(3))
+			.saturating_add(T::DbWeight::get().writes(1))
+	}
+	/// Storage: `AmbassadorCollective::Members` (r:1 w:0)
+	/// Proof: `AmbassadorCollective::Members` (`max_values`: None, `max_size`: Some(42), added: 2517, mode: `MaxEncodedLen`)
+	/// Storage: `AmbassadorSalary::Status` (r:1 w:1)
+	/// Proof: `AmbassadorSalary::Status` (`max_values`: Some(1), `max_size`: Some(56), added: 551, mode: `MaxEncodedLen`)
+	/// Storage: `AmbassadorSalary::Claimant` (r:1 w:1)
+	/// Proof: `AmbassadorSalary::Claimant` (`max_values`: None, `max_size`: Some(86), added: 2561, mode: `MaxEncodedLen`)
+	fn register() -> Weight {
+		// Proof Size summary in bytes:
+		//  Measured:  `467`
+		//  Estimated: `3551`
+		// Minimum execution time: 27_000_000 picoseconds.
+		Weight::from_parts(28_000_000, 0)
+			.saturating_add(Weight::from_parts(0, 3551))
+			.saturating_add(T::DbWeight::get().reads(3))
+			.saturating_add(T::DbWeight::get().writes(2))
+	}
+	/// Storage: `AmbassadorSalary::Status` (r:1 w:1)
+	/// Proof: `AmbassadorSalary::Status` (`max_values`: Some(1), `max_size`: Some(56), added: 551, mode: `MaxEncodedLen`)
+	/// Storage: `AmbassadorSalary::Claimant` (r:1 w:1)
+	/// Proof: `AmbassadorSalary::Claimant` (`max_values`: None, `max_size`: Some(86), added: 2561, mode: `MaxEncodedLen`)
+	/// Storage: `AmbassadorCollective::Members` (r:1 w:0)
+	/// Proof: `AmbassadorCollective::Members` (`max_values`: None, `max_size`: Some(42), added: 2517, mode: `MaxEncodedLen`)
+	/// Storage: `ParachainInfo::ParachainId` (r:1 w:0)
+	/// Proof: `ParachainInfo::ParachainId` (`max_values`: Some(1), `max_size`: Some(4), added: 499, mode: `MaxEncodedLen`)
+	/// Storage: `PolkadotXcm::QueryCounter` (r:1 w:1)
+	/// Proof: `PolkadotXcm::QueryCounter` (`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)
+	/// Proof: `PolkadotXcm::VersionDiscoveryQueue` (`max_values`: Some(1), `max_size`: None, mode: `Measured`)
+	/// Storage: `PolkadotXcm::SafeXcmVersion` (r:1 w:0)
+	/// Proof: `PolkadotXcm::SafeXcmVersion` (`max_values`: Some(1), `max_size`: None, mode: `Measured`)
+	/// 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`)
+	/// Storage: `XcmpQueue::OutboundXcmpMessages` (r:0 w:1)
+	/// Proof: `XcmpQueue::OutboundXcmpMessages` (`max_values`: None, `max_size`: None, mode: `Measured`)
+	/// Storage: `PolkadotXcm::Queries` (r:0 w:1)
+	/// Proof: `PolkadotXcm::Queries` (`max_values`: None, `max_size`: None, mode: `Measured`)
+	fn payout() -> Weight {
+		// Proof Size summary in bytes:
+		//  Measured:  `879`
+		//  Estimated: `4344`
+		// Minimum execution time: 68_000_000 picoseconds.
+		Weight::from_parts(72_000_000, 0)
+			.saturating_add(Weight::from_parts(0, 4344))
+			.saturating_add(T::DbWeight::get().reads(10))
+			.saturating_add(T::DbWeight::get().writes(7))
+	}
+	/// Storage: `AmbassadorSalary::Status` (r:1 w:1)
+	/// Proof: `AmbassadorSalary::Status` (`max_values`: Some(1), `max_size`: Some(56), added: 551, mode: `MaxEncodedLen`)
+	/// Storage: `AmbassadorSalary::Claimant` (r:1 w:1)
+	/// Proof: `AmbassadorSalary::Claimant` (`max_values`: None, `max_size`: Some(86), added: 2561, mode: `MaxEncodedLen`)
+	/// Storage: `AmbassadorCollective::Members` (r:1 w:0)
+	/// Proof: `AmbassadorCollective::Members` (`max_values`: None, `max_size`: Some(42), added: 2517, mode: `MaxEncodedLen`)
+	/// Storage: `ParachainInfo::ParachainId` (r:1 w:0)
+	/// Proof: `ParachainInfo::ParachainId` (`max_values`: Some(1), `max_size`: Some(4), added: 499, mode: `MaxEncodedLen`)
+	/// Storage: `PolkadotXcm::QueryCounter` (r:1 w:1)
+	/// Proof: `PolkadotXcm::QueryCounter` (`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)
+	/// Proof: `PolkadotXcm::VersionDiscoveryQueue` (`max_values`: Some(1), `max_size`: None, mode: `Measured`)
+	/// Storage: `PolkadotXcm::SafeXcmVersion` (r:1 w:0)
+	/// Proof: `PolkadotXcm::SafeXcmVersion` (`max_values`: Some(1), `max_size`: None, mode: `Measured`)
+	/// 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`)
+	/// Storage: `XcmpQueue::OutboundXcmpMessages` (r:0 w:1)
+	/// Proof: `XcmpQueue::OutboundXcmpMessages` (`max_values`: None, `max_size`: None, mode: `Measured`)
+	/// Storage: `PolkadotXcm::Queries` (r:0 w:1)
+	/// Proof: `PolkadotXcm::Queries` (`max_values`: None, `max_size`: None, mode: `Measured`)
+	fn payout_other() -> Weight {
+		// Proof Size summary in bytes:
+		//  Measured:  `879`
+		//  Estimated: `4344`
+		// Minimum execution time: 69_000_000 picoseconds.
+		Weight::from_parts(70_000_000, 0)
+			.saturating_add(Weight::from_parts(0, 4344))
+			.saturating_add(T::DbWeight::get().reads(10))
+			.saturating_add(T::DbWeight::get().writes(7))
+	}
+	/// Storage: `AmbassadorSalary::Status` (r:1 w:1)
+	/// Proof: `AmbassadorSalary::Status` (`max_values`: Some(1), `max_size`: Some(56), added: 551, mode: `MaxEncodedLen`)
+	/// Storage: `AmbassadorSalary::Claimant` (r:1 w:1)
+	/// Proof: `AmbassadorSalary::Claimant` (`max_values`: None, `max_size`: Some(86), added: 2561, mode: `MaxEncodedLen`)
+	/// Storage: `PolkadotXcm::Queries` (r:1 w:1)
+	/// Proof: `PolkadotXcm::Queries` (`max_values`: None, `max_size`: None, mode: `Measured`)
+	fn check_payment() -> Weight {
+		// Proof Size summary in bytes:
+		//  Measured:  `479`
+		//  Estimated: `3944`
+		// Minimum execution time: 27_000_000 picoseconds.
+		Weight::from_parts(28_000_000, 0)
+			.saturating_add(Weight::from_parts(0, 3944))
+			.saturating_add(T::DbWeight::get().reads(3))
+			.saturating_add(T::DbWeight::get().writes(3))
+	}
+}
diff --git a/cumulus/parachains/runtimes/collectives/collectives-polkadot/src/weights/pallet_salary.rs b/cumulus/parachains/runtimes/collectives/collectives-polkadot/src/weights/pallet_salary_fellowship_salary.rs
similarity index 86%
rename from cumulus/parachains/runtimes/collectives/collectives-polkadot/src/weights/pallet_salary.rs
rename to cumulus/parachains/runtimes/collectives/collectives-polkadot/src/weights/pallet_salary_fellowship_salary.rs
index 351834c5e3adab42a7448cfe8d4a600ddf532a3a..9bb7e68d3145c339505f9c6a729eca1217c02537 100644
--- a/cumulus/parachains/runtimes/collectives/collectives-polkadot/src/weights/pallet_salary.rs
+++ b/cumulus/parachains/runtimes/collectives/collectives-polkadot/src/weights/pallet_salary_fellowship_salary.rs
@@ -1,4 +1,4 @@
-// Copyright Parity Technologies (UK) Ltd.
+// Copyright (C) Parity Technologies (UK) Ltd.
 // This file is part of Cumulus.
 
 // Cumulus is free software: you can redistribute it and/or modify
@@ -17,24 +17,21 @@
 //! Autogenerated weights for `pallet_salary`
 //!
 //! THIS FILE WAS AUTO-GENERATED USING THE SUBSTRATE BENCHMARK CLI VERSION 4.0.0-dev
-//! DATE: 2023-07-31, STEPS: `50`, REPEAT: `20`, LOW RANGE: `[]`, HIGH RANGE: `[]`
+//! DATE: 2023-08-11, STEPS: `2`, REPEAT: `2`, LOW RANGE: `[]`, HIGH RANGE: `[]`
 //! WORST CASE MAP SIZE: `1000000`
-//! HOSTNAME: `runner-ynta1nyy-project-238-concurrent-0`, CPU: `Intel(R) Xeon(R) CPU @ 2.60GHz`
-//! EXECUTION: ``, WASM-EXECUTION: `Compiled`, CHAIN: `Some("collectives-polkadot-dev")`, DB CACHE: 1024
+//! HOSTNAME: `cob`, CPU: `<UNKNOWN>`
+//! WASM-EXECUTION: `Compiled`, CHAIN: `Some("collectives-polkadot-dev")`, DB CACHE: 1024
 
 // Executed Command:
-// ./target/production/polkadot-parachain
+// target/release/polkadot-parachain
 // benchmark
 // pallet
 // --chain=collectives-polkadot-dev
 // --wasm-execution=compiled
 // --pallet=pallet_salary
-// --no-storage-info
-// --no-median-slopes
-// --no-min-squares
 // --extrinsic=*
-// --steps=50
-// --repeat=20
+// --steps=2
+// --repeat=2
 // --json
 // --header=./file_header.txt
 // --output=./parachains/runtimes/collectives/collectives-polkadot/src/weights/
@@ -56,8 +53,8 @@ impl<T: frame_system::Config> pallet_salary::WeightInfo for WeightInfo<T> {
 		// Proof Size summary in bytes:
 		//  Measured:  `142`
 		//  Estimated: `1541`
-		// Minimum execution time: 10_579_000 picoseconds.
-		Weight::from_parts(10_898_000, 0)
+		// Minimum execution time: 13_000_000 picoseconds.
+		Weight::from_parts(17_000_000, 0)
 			.saturating_add(Weight::from_parts(0, 1541))
 			.saturating_add(T::DbWeight::get().reads(1))
 			.saturating_add(T::DbWeight::get().writes(1))
@@ -68,8 +65,8 @@ impl<T: frame_system::Config> pallet_salary::WeightInfo for WeightInfo<T> {
 		// Proof Size summary in bytes:
 		//  Measured:  `224`
 		//  Estimated: `1541`
-		// Minimum execution time: 12_723_000 picoseconds.
-		Weight::from_parts(13_221_000, 0)
+		// Minimum execution time: 15_000_000 picoseconds.
+		Weight::from_parts(18_000_000, 0)
 			.saturating_add(Weight::from_parts(0, 1541))
 			.saturating_add(T::DbWeight::get().reads(1))
 			.saturating_add(T::DbWeight::get().writes(1))
@@ -84,8 +81,8 @@ impl<T: frame_system::Config> pallet_salary::WeightInfo for WeightInfo<T> {
 		// Proof Size summary in bytes:
 		//  Measured:  `395`
 		//  Estimated: `3551`
-		// Minimum execution time: 18_522_000 picoseconds.
-		Weight::from_parts(19_120_000, 0)
+		// Minimum execution time: 22_000_000 picoseconds.
+		Weight::from_parts(25_000_000, 0)
 			.saturating_add(Weight::from_parts(0, 3551))
 			.saturating_add(T::DbWeight::get().reads(3))
 			.saturating_add(T::DbWeight::get().writes(1))
@@ -100,8 +97,8 @@ impl<T: frame_system::Config> pallet_salary::WeightInfo for WeightInfo<T> {
 		// Proof Size summary in bytes:
 		//  Measured:  `462`
 		//  Estimated: `3551`
-		// Minimum execution time: 22_270_000 picoseconds.
-		Weight::from_parts(23_325_000, 0)
+		// Minimum execution time: 26_000_000 picoseconds.
+		Weight::from_parts(29_000_000, 0)
 			.saturating_add(Weight::from_parts(0, 3551))
 			.saturating_add(T::DbWeight::get().reads(3))
 			.saturating_add(T::DbWeight::get().writes(2))
@@ -132,11 +129,11 @@ impl<T: frame_system::Config> pallet_salary::WeightInfo for WeightInfo<T> {
 	/// Proof: `PolkadotXcm::Queries` (`max_values`: None, `max_size`: None, mode: `Measured`)
 	fn payout() -> Weight {
 		// Proof Size summary in bytes:
-		//  Measured:  `703`
-		//  Estimated: `4168`
-		// Minimum execution time: 54_436_000 picoseconds.
-		Weight::from_parts(56_347_000, 0)
-			.saturating_add(Weight::from_parts(0, 4168))
+		//  Measured:  `774`
+		//  Estimated: `4239`
+		// Minimum execution time: 67_000_000 picoseconds.
+		Weight::from_parts(74_000_000, 0)
+			.saturating_add(Weight::from_parts(0, 4239))
 			.saturating_add(T::DbWeight::get().reads(10))
 			.saturating_add(T::DbWeight::get().writes(7))
 	}
@@ -166,11 +163,11 @@ impl<T: frame_system::Config> pallet_salary::WeightInfo for WeightInfo<T> {
 	/// Proof: `PolkadotXcm::Queries` (`max_values`: None, `max_size`: None, mode: `Measured`)
 	fn payout_other() -> Weight {
 		// Proof Size summary in bytes:
-		//  Measured:  `703`
-		//  Estimated: `4168`
-		// Minimum execution time: 54_140_000 picoseconds.
-		Weight::from_parts(56_312_000, 0)
-			.saturating_add(Weight::from_parts(0, 4168))
+		//  Measured:  `774`
+		//  Estimated: `4239`
+		// Minimum execution time: 66_000_000 picoseconds.
+		Weight::from_parts(71_000_000, 0)
+			.saturating_add(Weight::from_parts(0, 4239))
 			.saturating_add(T::DbWeight::get().reads(10))
 			.saturating_add(T::DbWeight::get().writes(7))
 	}
@@ -182,11 +179,11 @@ impl<T: frame_system::Config> pallet_salary::WeightInfo for WeightInfo<T> {
 	/// Proof: `PolkadotXcm::Queries` (`max_values`: None, `max_size`: None, mode: `Measured`)
 	fn check_payment() -> Weight {
 		// Proof Size summary in bytes:
-		//  Measured:  `478`
-		//  Estimated: `3943`
-		// Minimum execution time: 24_650_000 picoseconds.
-		Weight::from_parts(25_242_000, 0)
-			.saturating_add(Weight::from_parts(0, 3943))
+		//  Measured:  `512`
+		//  Estimated: `3977`
+		// Minimum execution time: 26_000_000 picoseconds.
+		Weight::from_parts(27_000_000, 0)
+			.saturating_add(Weight::from_parts(0, 3977))
 			.saturating_add(T::DbWeight::get().reads(3))
 			.saturating_add(T::DbWeight::get().writes(3))
 	}
diff --git a/cumulus/parachains/runtimes/collectives/collectives-polkadot/src/weights/pallet_scheduler.rs b/cumulus/parachains/runtimes/collectives/collectives-polkadot/src/weights/pallet_scheduler.rs
index b647f7eba87357d61e298c83951e079492a6eec3..d30ac82bf059bc8a2c75b1e8bce75024da38bea3 100644
--- a/cumulus/parachains/runtimes/collectives/collectives-polkadot/src/weights/pallet_scheduler.rs
+++ b/cumulus/parachains/runtimes/collectives/collectives-polkadot/src/weights/pallet_scheduler.rs
@@ -1,4 +1,4 @@
-// Copyright Parity Technologies (UK) Ltd.
+// Copyright (C) Parity Technologies (UK) Ltd.
 // This file is part of Cumulus.
 
 // Cumulus is free software: you can redistribute it and/or modify
diff --git a/cumulus/parachains/runtimes/collectives/collectives-polkadot/src/weights/pallet_session.rs b/cumulus/parachains/runtimes/collectives/collectives-polkadot/src/weights/pallet_session.rs
index 909f9a64f5aabfa3ae5abdc9c65690a51fce5e2c..2af8ce29a196ef21d8f203ccb5d62a1bfeb9a6b6 100644
--- a/cumulus/parachains/runtimes/collectives/collectives-polkadot/src/weights/pallet_session.rs
+++ b/cumulus/parachains/runtimes/collectives/collectives-polkadot/src/weights/pallet_session.rs
@@ -1,4 +1,4 @@
-// Copyright Parity Technologies (UK) Ltd.
+// Copyright (C) Parity Technologies (UK) Ltd.
 // This file is part of Cumulus.
 
 // Cumulus is free software: you can redistribute it and/or modify
diff --git a/cumulus/parachains/runtimes/collectives/collectives-polkadot/src/weights/pallet_timestamp.rs b/cumulus/parachains/runtimes/collectives/collectives-polkadot/src/weights/pallet_timestamp.rs
index bb8f0e0b37690fcc8e88509d889bf7d8b944554e..bc149ec63a176f09e226988d3344f29f9cf3e530 100644
--- a/cumulus/parachains/runtimes/collectives/collectives-polkadot/src/weights/pallet_timestamp.rs
+++ b/cumulus/parachains/runtimes/collectives/collectives-polkadot/src/weights/pallet_timestamp.rs
@@ -1,4 +1,4 @@
-// Copyright Parity Technologies (UK) Ltd.
+// Copyright (C) Parity Technologies (UK) Ltd.
 // This file is part of Cumulus.
 
 // Cumulus is free software: you can redistribute it and/or modify
diff --git a/cumulus/parachains/runtimes/collectives/collectives-polkadot/src/weights/pallet_utility.rs b/cumulus/parachains/runtimes/collectives/collectives-polkadot/src/weights/pallet_utility.rs
index f16ffc4c0c3b0b49476b19f6b44db9da7468854d..5d6b0cb8285c91a98c99e97c7eb948086d1fb2b8 100644
--- a/cumulus/parachains/runtimes/collectives/collectives-polkadot/src/weights/pallet_utility.rs
+++ b/cumulus/parachains/runtimes/collectives/collectives-polkadot/src/weights/pallet_utility.rs
@@ -1,4 +1,4 @@
-// Copyright Parity Technologies (UK) Ltd.
+// Copyright (C) Parity Technologies (UK) Ltd.
 // This file is part of Cumulus.
 
 // Cumulus is free software: you can redistribute it and/or modify
diff --git a/cumulus/parachains/runtimes/collectives/collectives-polkadot/src/weights/pallet_xcm.rs b/cumulus/parachains/runtimes/collectives/collectives-polkadot/src/weights/pallet_xcm.rs
index 030d754ec4ce5ff7a0eb59acf761f271d73f14d6..738742b6108b79bb11520fdca1d191735cee1a0c 100644
--- a/cumulus/parachains/runtimes/collectives/collectives-polkadot/src/weights/pallet_xcm.rs
+++ b/cumulus/parachains/runtimes/collectives/collectives-polkadot/src/weights/pallet_xcm.rs
@@ -1,4 +1,4 @@
-// Copyright Parity Technologies (UK) Ltd.
+// Copyright (C) Parity Technologies (UK) Ltd.
 // This file is part of Cumulus.
 
 // Cumulus is free software: you can redistribute it and/or modify
diff --git a/cumulus/parachains/runtimes/collectives/collectives-polkadot/src/weights/paritydb_weights.rs b/cumulus/parachains/runtimes/collectives/collectives-polkadot/src/weights/paritydb_weights.rs
index 4338d928d807a41cc60ec91d86e91c81bb253631..25679703831a13b8d1bb7fb7dd4d92fa84b1f255 100644
--- a/cumulus/parachains/runtimes/collectives/collectives-polkadot/src/weights/paritydb_weights.rs
+++ b/cumulus/parachains/runtimes/collectives/collectives-polkadot/src/weights/paritydb_weights.rs
@@ -1,6 +1,6 @@
 // This file is part of Substrate.
 
-// Copyright (C) 2022 Parity Technologies (UK) Ltd.
+// Copyright (C) Parity Technologies (UK) Ltd.
 // SPDX-License-Identifier: Apache-2.0
 
 // Licensed under the Apache License, Version 2.0 (the "License");
diff --git a/cumulus/parachains/runtimes/collectives/collectives-polkadot/src/weights/rocksdb_weights.rs b/cumulus/parachains/runtimes/collectives/collectives-polkadot/src/weights/rocksdb_weights.rs
index 1d115d963facb39fe29d6258918fda3bc8d94900..3dd817aa6f137085b0e5fdf2b11b7f50e5c8b002 100644
--- a/cumulus/parachains/runtimes/collectives/collectives-polkadot/src/weights/rocksdb_weights.rs
+++ b/cumulus/parachains/runtimes/collectives/collectives-polkadot/src/weights/rocksdb_weights.rs
@@ -1,6 +1,6 @@
 // This file is part of Substrate.
 
-// Copyright (C) 2022 Parity Technologies (UK) Ltd.
+// Copyright (C) Parity Technologies (UK) Ltd.
 // SPDX-License-Identifier: Apache-2.0
 
 // Licensed under the Apache License, Version 2.0 (the "License");
diff --git a/cumulus/parachains/runtimes/collectives/collectives-polkadot/src/xcm_config.rs b/cumulus/parachains/runtimes/collectives/collectives-polkadot/src/xcm_config.rs
index e9b5c1b165a80c82157b0994ac1cc647b7de6343..a170cd6ba5151e32d5633d0d3c3acc67b7685485 100644
--- a/cumulus/parachains/runtimes/collectives/collectives-polkadot/src/xcm_config.rs
+++ b/cumulus/parachains/runtimes/collectives/collectives-polkadot/src/xcm_config.rs
@@ -1,4 +1,4 @@
-// Copyright (C) 2022 Parity Technologies (UK) Ltd.
+// Copyright (C) Parity Technologies (UK) Ltd.
 // SPDX-License-Identifier: Apache-2.0
 
 // Licensed under the Apache License, Version 2.0 (the "License");
@@ -24,20 +24,22 @@ use frame_support::{
 };
 use frame_system::EnsureRoot;
 use pallet_xcm::XcmPassthrough;
-use parachains_common::{impls::ToStakingPot, xcm_config::ConcreteNativeAssetFrom};
-use polkadot_parachain::primitives::Sibling;
+use parachains_common::{impls::ToStakingPot, xcm_config::ConcreteAssetFromSystem};
+use polkadot_parachain_primitives::primitives::Sibling;
 use xcm::latest::prelude::*;
 use xcm_builder::{
 	AccountId32Aliases, AllowExplicitUnpaidExecutionFrom, AllowKnownQueryResponses,
 	AllowSubscriptionsFrom, AllowTopLevelPaidExecutionFrom, CurrencyAdapter,
 	DenyReserveTransferToRelayChain, DenyThenTry, EnsureXcmOrigin, FixedWeightBounds, IsConcrete,
-	OriginToPluralityVoice, ParentAsSuperuser, ParentIsPreset, RelayChainAsNative,
-	SiblingParachainAsNative, SiblingParachainConvertsVia, SignedAccountId32AsNative,
-	SignedToAccountId32, SovereignSignedViaLocation, TakeWeightCredit, TrailingSetTopicAsId,
-	UsingComponents, WithComputedOrigin, WithUniqueTopic,
+	LocatableAssetId, OriginToPluralityVoice, ParentAsSuperuser, ParentIsPreset,
+	RelayChainAsNative, SiblingParachainAsNative, SiblingParachainConvertsVia,
+	SignedAccountId32AsNative, SignedToAccountId32, SovereignSignedViaLocation, TakeWeightCredit,
+	TrailingSetTopicAsId, UsingComponents, WithComputedOrigin, WithUniqueTopic,
 };
 use xcm_executor::{traits::WithOriginFilter, XcmExecutor};
 
+const FELLOWSHIP_ADMIN_INDEX: u32 = 1;
+
 parameter_types! {
 	pub const DotLocation: MultiLocation = MultiLocation::parent();
 	pub const RelayNetwork: Option<NetworkId> = Some(NetworkId::Polkadot);
@@ -46,6 +48,17 @@ parameter_types! {
 		X2(GlobalConsensus(RelayNetwork::get().unwrap()), Parachain(ParachainInfo::parachain_id().into()));
 	pub CheckingAccount: AccountId = PolkadotXcm::check_account();
 	pub const GovernanceLocation: MultiLocation = MultiLocation::parent();
+	pub const FellowshipAdminBodyId: BodyId = BodyId::Index(FELLOWSHIP_ADMIN_INDEX);
+	pub AssetHub: MultiLocation = (Parent, Parachain(1000)).into();
+	pub AssetHubUsdtId: AssetId = (PalletInstance(50), GeneralIndex(1984)).into();
+	pub UsdtAssetHub: LocatableAssetId = LocatableAssetId {
+		location: AssetHub::get(),
+		asset_id: AssetHubUsdtId::get(),
+	};
+	pub DotAssetHub: LocatableAssetId = LocatableAssetId {
+		location: AssetHub::get(),
+		asset_id: DotLocation::get().into(),
+	};
 }
 
 /// Type for specifying how a `MultiLocation` can be converted into an `AccountId`. This is used
@@ -227,6 +240,10 @@ pub type Barrier = TrailingSetTopicAsId<
 	>,
 >;
 
+/// Cases where a remote origin is accepted as trusted Teleporter for a given asset:
+/// - DOT with the parent Relay Chain and sibling parachains.
+pub type TrustedTeleporters = ConcreteAssetFromSystem<DotLocation>;
+
 pub struct XcmConfig;
 impl xcm_executor::Config for XcmConfig {
 	type RuntimeCall = RuntimeCall;
@@ -236,8 +253,7 @@ impl xcm_executor::Config for XcmConfig {
 	// Collectives does not recognize a reserve location for any asset. Users must teleport DOT
 	// where allowed (e.g. with the Relay Chain).
 	type IsReserve = ();
-	/// Only allow teleportation of DOT.
-	type IsTeleporter = ConcreteNativeAssetFrom<DotLocation>;
+	type IsTeleporter = TrustedTeleporters;
 	type UniversalLocation = UniversalLocation;
 	type Barrier = Barrier;
 	type Weigher = FixedWeightBounds<TempFixedXcmWeight, RuntimeCall, MaxInstructions>;
diff --git a/cumulus/parachains/runtimes/contracts/contracts-rococo/Cargo.toml b/cumulus/parachains/runtimes/contracts/contracts-rococo/Cargo.toml
index 67885ded60751be7cc43818f4ccbc5e88eb1b715..414c7ad9d9423ec880cabe582eb25ec35bd92f10 100644
--- a/cumulus/parachains/runtimes/contracts/contracts-rococo/Cargo.toml
+++ b/cumulus/parachains/runtimes/contracts/contracts-rococo/Cargo.toml
@@ -1,8 +1,8 @@
 [package]
 name = "contracts-rococo-runtime"
 version = "0.2.0"
-authors = ["Parity Technologies <admin@parity.io>"]
-edition = "2021"
+authors.workspace = true
+edition.workspace = true
 
 [package.metadata.docs.rs]
 targets = ["x86_64-unknown-linux-gnu"]
@@ -22,6 +22,7 @@ sp-api = { path = "../../../../../substrate/primitives/api", default-features =
 sp-block-builder = { path = "../../../../../substrate/primitives/block-builder", default-features = false}
 sp-consensus-aura = { path = "../../../../../substrate/primitives/consensus/aura", default-features = false}
 sp-core = { path = "../../../../../substrate/primitives/core", default-features = false}
+sp-genesis-builder = { path = "../../../../../substrate/primitives/genesis-builder", default-features = false }
 sp-inherents = { path = "../../../../../substrate/primitives/inherents", default-features = false}
 sp-offchain = { path = "../../../../../substrate/primitives/offchain", default-features = false}
 sp-runtime = { path = "../../../../../substrate/primitives/runtime", default-features = false}
@@ -52,14 +53,13 @@ pallet-contracts = { path = "../../../../../substrate/frame/contracts", default-
 pallet-contracts-primitives = { path = "../../../../../substrate/frame/contracts/primitives", default-features = false}
 
 # Polkadot
-kusama-runtime-constants = { path = "../../../../../polkadot/runtime/kusama/constants", default-features = false}
 pallet-xcm = { path = "../../../../../polkadot/xcm/pallet-xcm", default-features = false}
 polkadot-core-primitives = { path = "../../../../../polkadot/core-primitives", default-features = false}
-polkadot-parachain = { path = "../../../../../polkadot/parachain", default-features = false}
+polkadot-parachain-primitives = { path = "../../../../../polkadot/parachain", default-features = false}
 polkadot-runtime-common = { path = "../../../../../polkadot/runtime/common", default-features = false}
-xcm = { path = "../../../../../polkadot/xcm", default-features = false}
-xcm-builder = { path = "../../../../../polkadot/xcm/xcm-builder", default-features = false}
-xcm-executor = { path = "../../../../../polkadot/xcm/xcm-executor", default-features = false}
+xcm = { package = "staging-xcm", path = "../../../../../polkadot/xcm", default-features = false}
+xcm-builder = { package = "staging-xcm-builder", path = "../../../../../polkadot/xcm/xcm-builder", default-features = false}
+xcm-executor = { package = "staging-xcm-executor", path = "../../../../../polkadot/xcm/xcm-executor", default-features = false}
 
 # Cumulus
 cumulus-pallet-aura-ext = { path = "../../../../pallets/aura-ext", default-features = false }
@@ -81,16 +81,18 @@ std = [
 	"cumulus-pallet-aura-ext/std",
 	"cumulus-pallet-dmp-queue/std",
 	"cumulus-pallet-parachain-system/std",
+	"cumulus-pallet-session-benchmarking/std",
 	"cumulus-pallet-xcm/std",
 	"cumulus-pallet-xcmp-queue/std",
 	"cumulus-primitives-core/std",
 	"cumulus-primitives-utility/std",
+	"frame-benchmarking?/std",
 	"frame-executive/std",
 	"frame-support/std",
+	"frame-system-benchmarking?/std",
 	"frame-system-rpc-runtime-api/std",
 	"frame-system/std",
 	"frame-try-runtime/std",
-	"kusama-runtime-constants/std",
 	"log/std",
 	"pallet-aura/std",
 	"pallet-authorship/std",
@@ -110,18 +112,20 @@ std = [
 	"parachain-info/std",
 	"parachains-common/std",
 	"polkadot-core-primitives/std",
-	"polkadot-parachain/std",
+	"polkadot-parachain-primitives/std",
 	"polkadot-runtime-common/std",
 	"scale-info/std",
 	"sp-api/std",
 	"sp-block-builder/std",
 	"sp-consensus-aura/std",
 	"sp-core/std",
+	"sp-genesis-builder/std",
 	"sp-inherents/std",
 	"sp-offchain/std",
 	"sp-runtime/std",
 	"sp-session/std",
 	"sp-std/std",
+	"sp-storage/std",
 	"sp-transaction-pool/std",
 	"sp-version/std",
 	"substrate-wasm-builder",
@@ -133,6 +137,8 @@ std = [
 runtime-benchmarks = [
 	"cumulus-pallet-parachain-system/runtime-benchmarks",
 	"cumulus-pallet-session-benchmarking/runtime-benchmarks",
+	"cumulus-pallet-xcmp-queue/runtime-benchmarks",
+	"cumulus-primitives-utility/runtime-benchmarks",
 	"frame-benchmarking/runtime-benchmarks",
 	"frame-support/runtime-benchmarks",
 	"frame-system-benchmarking/runtime-benchmarks",
@@ -146,8 +152,12 @@ runtime-benchmarks = [
 	"pallet-timestamp/runtime-benchmarks",
 	"pallet-utility/runtime-benchmarks",
 	"pallet-xcm/runtime-benchmarks",
+	"parachains-common/runtime-benchmarks",
+	"polkadot-parachain-primitives/runtime-benchmarks",
+	"polkadot-runtime-common/runtime-benchmarks",
 	"sp-runtime/runtime-benchmarks",
 	"xcm-builder/runtime-benchmarks",
+	"xcm-executor/runtime-benchmarks",
 ]
 
 try-runtime = [
@@ -157,6 +167,7 @@ try-runtime = [
 	"cumulus-pallet-xcm/try-runtime",
 	"cumulus-pallet-xcmp-queue/try-runtime",
 	"frame-executive/try-runtime",
+	"frame-support/try-runtime",
 	"frame-system/try-runtime",
 	"frame-try-runtime/try-runtime",
 	"pallet-aura/try-runtime",
@@ -173,6 +184,8 @@ try-runtime = [
 	"pallet-utility/try-runtime",
 	"pallet-xcm/try-runtime",
 	"parachain-info/try-runtime",
+	"polkadot-runtime-common/try-runtime",
+	"sp-runtime/try-runtime",
 ]
 
 experimental = [ "pallet-aura/experimental" ]
diff --git a/cumulus/parachains/runtimes/contracts/contracts-rococo/README.md b/cumulus/parachains/runtimes/contracts/contracts-rococo/README.md
index e4f15ccf92d655d8358ba460a4c7e02ae262a6fd..10df15ba72779f5ef70690da74e72648583b571d 100644
--- a/cumulus/parachains/runtimes/contracts/contracts-rococo/README.md
+++ b/cumulus/parachains/runtimes/contracts/contracts-rococo/README.md
@@ -1,7 +1,7 @@
 # Contracts 📝
 
 This is a parachain node for smart contracts; it contains a default configuration of
-Substrate's module for smart contracts ‒ the [`pallet-contracts`](https://github.com/paritytech/substrate/tree/master/frame/contracts).
+Substrate's module for smart contracts ‒ the [`pallet-contracts`](https://github.com/paritytech/polkadot-sdk/tree/master/substrate/frame/contracts).
 
 The node is only available on Rococo, a testnet for Polkadot and Kusama parachains.
 It has been configured as a common good parachain, as such it uses the Rococo relay
@@ -16,7 +16,7 @@ If you have any questions, it's best to ask in the
 ![Contracts Overview](./contracts-overview.svg)
 
 This node contains Substrate's smart contracts module ‒ the
-[`pallet-contracts`](https://github.com/paritytech/substrate/tree/master/frame/contracts).
+[`pallet-contracts`](https://github.com/paritytech/polkadot-sdk/tree/master/substrate/frame/contracts).
 This pallet takes smart contracts as WebAssembly blobs and defines an API
 for everything a smart contract needs (storage access, …).
 As long as a programming language compiles to WebAssembly and there exists an implementation
@@ -33,8 +33,8 @@ There are also different user interfaces and command-line tools you can use to d
 or interact with contracts:
 
 * [Contracts UI](https://paritytech.github.io/contracts-ui/) ‒ a beginner-friendly UI for smart contract developers.
-* [polkadot-js](https://polkadot.js.org/apps/) ‒ the go-to expert UI for smart contract developers.
-* [cargo-contract](https://github.com/paritytech/cargo-contract) ‒ a CLI tool, ideal for scripting or your terminal workflow.
+* [`polkadot-js`](https://polkadot.js.org/apps/) ‒ the go-to expert UI for smart contract developers.
+* [`cargo-contract`](https://github.com/paritytech/cargo-contract) ‒ a CLI tool, ideal for scripting or your terminal workflow.
 
 If you are looking for a quickstart, we can recommend
 [ink!'s Guided Tutorial for Beginners](https://docs.substrate.io/tutorials/v3/ink-workshop/pt1/).
@@ -54,7 +54,8 @@ Once the executable is built, launch the parachain node via:
 ./target/release/polkadot-parachain --chain contracts-rococo
 ```
 
-Refer to the [setup instructions](https://github.com/paritytech/cumulus#manual-setup) to run a local network for development.
+Refer to the [setup instructions](https://github.com/paritytech/polkadot-sdk/tree/master/cumulus#manual-setup) to run a
+local network for development.
 
 ### Rococo Deployment
 
diff --git a/cumulus/parachains/runtimes/contracts/contracts-rococo/src/contracts.rs b/cumulus/parachains/runtimes/contracts/contracts-rococo/src/contracts.rs
index 1c2b24d88a874de13ac7613ca8f571749b978aec..1c99393d5e52fccf427b40f232d55a833d082c9e 100644
--- a/cumulus/parachains/runtimes/contracts/contracts-rococo/src/contracts.rs
+++ b/cumulus/parachains/runtimes/contracts/contracts-rococo/src/contracts.rs
@@ -1,6 +1,21 @@
+// 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.
+
 use crate::{
-	constants::currency::deposit, Balance, Balances, RandomnessCollectiveFlip, Runtime,
-	RuntimeCall, RuntimeEvent, RuntimeHoldReason, Timestamp,
+	Balance, Balances, RandomnessCollectiveFlip, Runtime, RuntimeCall, RuntimeEvent,
+	RuntimeHoldReason, Timestamp,
 };
 use frame_support::{
 	parameter_types,
@@ -13,7 +28,7 @@ use pallet_contracts::{
 };
 use sp_runtime::Perbill;
 
-pub use parachains_common::AVERAGE_ON_INITIALIZE_RATIO;
+pub use parachains_common::{rococo::currency::deposit, AVERAGE_ON_INITIALIZE_RATIO};
 
 // Prints debug output of the `contracts` pallet to stdout if the node is
 // started with `-lruntime::contracts=debug`.
diff --git a/cumulus/parachains/runtimes/contracts/contracts-rococo/src/lib.rs b/cumulus/parachains/runtimes/contracts/contracts-rococo/src/lib.rs
index 9f381d4417a076bacb68fe0543989f5a988d73f2..70392c5ecbcc2baf012fb9925ff405a7636fa1db 100644
--- a/cumulus/parachains/runtimes/contracts/contracts-rococo/src/lib.rs
+++ b/cumulus/parachains/runtimes/contracts/contracts-rococo/src/lib.rs
@@ -1,4 +1,4 @@
-// Copyright (C) 2018-2022 Parity Technologies (UK) Ltd.
+// Copyright (C) Parity Technologies (UK) Ltd.
 // SPDX-License-Identifier: GPL-3.0-or-later WITH Classpath-exception-2.0
 //
 // This program is free software: you can redistribute it and/or modify
@@ -25,7 +25,6 @@
 #[cfg(feature = "std")]
 include!(concat!(env!("OUT_DIR"), "/wasm_binary.rs"));
 
-pub mod constants;
 mod contracts;
 mod weights;
 mod xcm_config;
@@ -45,10 +44,10 @@ use sp_std::prelude::*;
 use sp_version::NativeVersion;
 use sp_version::RuntimeVersion;
 
-use constants::{consensus::*, currency::*, fee::WeightToFee};
 use frame_support::{
 	construct_runtime,
 	dispatch::DispatchClass,
+	genesis_builder_helper::{build_config, create_default_config},
 	parameter_types,
 	traits::{ConstBool, ConstU128, ConstU16, ConstU32, ConstU64, ConstU8, Everything},
 	weights::{ConstantMultiplier, Weight},
@@ -57,9 +56,10 @@ use frame_support::{
 use frame_system::limits::{BlockLength, BlockWeights};
 pub use parachains_common as common;
 use parachains_common::{
-	impls::DealWithFees, AccountId, BlockNumber, Hash, Header, Nonce, Signature,
-	AVERAGE_ON_INITIALIZE_RATIO, MAXIMUM_BLOCK_WEIGHT, MINUTES, NORMAL_DISPATCH_RATIO,
-	SLOT_DURATION,
+	impls::DealWithFees,
+	rococo::{consensus::*, currency::*, fee::WeightToFee},
+	AccountId, BlockNumber, Hash, Header, Nonce, Signature, AVERAGE_ON_INITIALIZE_RATIO,
+	MAXIMUM_BLOCK_WEIGHT, MINUTES, NORMAL_DISPATCH_RATIO, SLOT_DURATION,
 };
 pub use parachains_common::{AuraId, Balance};
 use xcm_config::CollatorSelectionUpdateOrigin;
@@ -695,6 +695,16 @@ impl_runtime_apis! {
 			Ok(batches)
 		}
 	}
+
+	impl sp_genesis_builder::GenesisBuilder<Block> for Runtime {
+		fn create_default_config() -> Vec<u8> {
+			create_default_config::<RuntimeGenesisConfig>()
+		}
+
+		fn build_config(config: Vec<u8>) -> sp_genesis_builder::Result {
+			build_config::<RuntimeGenesisConfig>(config)
+		}
+	}
 }
 
 cumulus_pallet_parachain_system::register_validate_block! {
diff --git a/cumulus/parachains/runtimes/contracts/contracts-rococo/src/weights/block_weights.rs b/cumulus/parachains/runtimes/contracts/contracts-rococo/src/weights/block_weights.rs
index b2092d875c8328210667da4cbb95de0642e60ae3..e7fdb2aae2a01ec06076de83d94817e540e205dd 100644
--- a/cumulus/parachains/runtimes/contracts/contracts-rococo/src/weights/block_weights.rs
+++ b/cumulus/parachains/runtimes/contracts/contracts-rococo/src/weights/block_weights.rs
@@ -1,6 +1,6 @@
 // This file is part of Substrate.
 
-// Copyright (C) 2022 Parity Technologies (UK) Ltd.
+// Copyright (C) Parity Technologies (UK) Ltd.
 // SPDX-License-Identifier: Apache-2.0
 
 // Licensed under the Apache License, Version 2.0 (the "License");
diff --git a/cumulus/parachains/runtimes/contracts/contracts-rococo/src/weights/extrinsic_weights.rs b/cumulus/parachains/runtimes/contracts/contracts-rococo/src/weights/extrinsic_weights.rs
index 332c3b324bb9c1b386257bf7953d37aba8f5af13..1a4adb968bb7195428ea00d59cd92dcd3b6eea5f 100644
--- a/cumulus/parachains/runtimes/contracts/contracts-rococo/src/weights/extrinsic_weights.rs
+++ b/cumulus/parachains/runtimes/contracts/contracts-rococo/src/weights/extrinsic_weights.rs
@@ -1,6 +1,6 @@
 // This file is part of Substrate.
 
-// Copyright (C) 2022 Parity Technologies (UK) Ltd.
+// Copyright (C) Parity Technologies (UK) Ltd.
 // SPDX-License-Identifier: Apache-2.0
 
 // Licensed under the Apache License, Version 2.0 (the "License");
diff --git a/cumulus/parachains/runtimes/contracts/contracts-rococo/src/weights/mod.rs b/cumulus/parachains/runtimes/contracts/contracts-rococo/src/weights/mod.rs
index ed0b4dbcd47fbffb125bda4b337099ae69e51ce2..30fa2c4060689ff98cc427c84f81866172845e52 100644
--- a/cumulus/parachains/runtimes/contracts/contracts-rococo/src/weights/mod.rs
+++ b/cumulus/parachains/runtimes/contracts/contracts-rococo/src/weights/mod.rs
@@ -1,6 +1,6 @@
 // This file is part of Substrate.
 
-// Copyright (C) 2022 Parity Technologies (UK) Ltd.
+// Copyright (C) Parity Technologies (UK) Ltd.
 // SPDX-License-Identifier: Apache-2.0
 
 // Licensed under the Apache License, Version 2.0 (the "License");
diff --git a/cumulus/parachains/runtimes/contracts/contracts-rococo/src/weights/paritydb_weights.rs b/cumulus/parachains/runtimes/contracts/contracts-rococo/src/weights/paritydb_weights.rs
index 4338d928d807a41cc60ec91d86e91c81bb253631..25679703831a13b8d1bb7fb7dd4d92fa84b1f255 100644
--- a/cumulus/parachains/runtimes/contracts/contracts-rococo/src/weights/paritydb_weights.rs
+++ b/cumulus/parachains/runtimes/contracts/contracts-rococo/src/weights/paritydb_weights.rs
@@ -1,6 +1,6 @@
 // This file is part of Substrate.
 
-// Copyright (C) 2022 Parity Technologies (UK) Ltd.
+// Copyright (C) Parity Technologies (UK) Ltd.
 // SPDX-License-Identifier: Apache-2.0
 
 // Licensed under the Apache License, Version 2.0 (the "License");
diff --git a/cumulus/parachains/runtimes/contracts/contracts-rococo/src/weights/rocksdb_weights.rs b/cumulus/parachains/runtimes/contracts/contracts-rococo/src/weights/rocksdb_weights.rs
index 1d115d963facb39fe29d6258918fda3bc8d94900..3dd817aa6f137085b0e5fdf2b11b7f50e5c8b002 100644
--- a/cumulus/parachains/runtimes/contracts/contracts-rococo/src/weights/rocksdb_weights.rs
+++ b/cumulus/parachains/runtimes/contracts/contracts-rococo/src/weights/rocksdb_weights.rs
@@ -1,6 +1,6 @@
 // This file is part of Substrate.
 
-// Copyright (C) 2022 Parity Technologies (UK) Ltd.
+// Copyright (C) Parity Technologies (UK) Ltd.
 // SPDX-License-Identifier: Apache-2.0
 
 // Licensed under the Apache License, Version 2.0 (the "License");
diff --git a/cumulus/parachains/runtimes/contracts/contracts-rococo/src/xcm_config.rs b/cumulus/parachains/runtimes/contracts/contracts-rococo/src/xcm_config.rs
index 3857c07fd03f8af7cb99d81fcca60d6c627e4822..aafb61132b95778964b23b28dee2e72461b68481 100644
--- a/cumulus/parachains/runtimes/contracts/contracts-rococo/src/xcm_config.rs
+++ b/cumulus/parachains/runtimes/contracts/contracts-rococo/src/xcm_config.rs
@@ -1,4 +1,4 @@
-// Copyright (C) 2022 Parity Technologies (UK) Ltd.
+// Copyright (C) Parity Technologies (UK) Ltd.
 // SPDX-License-Identifier: Apache-2.0
 
 // Licensed under the Apache License, Version 2.0 (the "License");
@@ -24,7 +24,8 @@ use frame_support::{
 };
 use frame_system::EnsureRoot;
 use pallet_xcm::{EnsureXcm, IsMajorityOfBody, XcmPassthrough};
-use polkadot_parachain::primitives::Sibling;
+use parachains_common::xcm_config::ConcreteAssetFromSystem;
+use polkadot_parachain_primitives::primitives::Sibling;
 use xcm::latest::prelude::*;
 use xcm_builder::{
 	AccountId32Aliases, AllowExplicitUnpaidExecutionFrom, AllowKnownQueryResponses,
@@ -144,6 +145,8 @@ pub type Barrier = TrailingSetTopicAsId<
 	>,
 >;
 
+pub type TrustedTeleporter = ConcreteAssetFromSystem<RelayLocation>;
+
 pub struct XcmConfig;
 impl xcm_executor::Config for XcmConfig {
 	type RuntimeCall = RuntimeCall;
@@ -151,7 +154,7 @@ impl xcm_executor::Config for XcmConfig {
 	type AssetTransactor = CurrencyTransactor;
 	type OriginConverter = XcmOriginToTransactDispatchOrigin;
 	type IsReserve = NativeAsset;
-	type IsTeleporter = NativeAsset;
+	type IsTeleporter = TrustedTeleporter;
 	type UniversalLocation = UniversalLocation;
 	type Barrier = Barrier;
 	type Weigher = FixedWeightBounds<UnitWeightCost, RuntimeCall, MaxInstructions>;
diff --git a/cumulus/parachains/runtimes/glutton/glutton-kusama/Cargo.toml b/cumulus/parachains/runtimes/glutton/glutton-kusama/Cargo.toml
index 43bf468c7954543ca383123477ab6bdfcc2fe67b..ad13bf05a3eccb750b922d0b20398e09cba7efbb 100644
--- a/cumulus/parachains/runtimes/glutton/glutton-kusama/Cargo.toml
+++ b/cumulus/parachains/runtimes/glutton/glutton-kusama/Cargo.toml
@@ -1,8 +1,8 @@
 [package]
 name = "glutton-runtime"
 version = "1.0.0"
-authors = ["Parity Technologies <admin@parity.io>"]
-edition = "2021"
+authors.workspace = true
+edition.workspace = true
 
 [dependencies]
 codec = { package = "parity-scale-codec", version = "3.0.0", default-features = false, features = ["derive"] }
@@ -16,11 +16,15 @@ frame-system = { path = "../../../../../substrate/frame/system", default-feature
 frame-system-rpc-runtime-api = { path = "../../../../../substrate/frame/system/rpc/runtime-api", default-features = false}
 frame-system-benchmarking = { path = "../../../../../substrate/frame/system/benchmarking", default-features = false, optional = true}
 frame-try-runtime = { path = "../../../../../substrate/frame/try-runtime", default-features = false, optional = true}
+pallet-aura = { path = "../../../../../substrate/frame/aura", default-features = false}
 pallet-glutton = { path = "../../../../../substrate/frame/glutton", default-features = false, optional = true}
 pallet-sudo = { path = "../../../../../substrate/frame/sudo", default-features = false, optional = true}
+pallet-timestamp = { path = "../../../../../substrate/frame/timestamp", default-features = false }
 sp-api = { path = "../../../../../substrate/primitives/api", default-features = false}
 sp-block-builder = { path = "../../../../../substrate/primitives/block-builder", default-features = false}
+sp-consensus-aura = { path = "../../../../../substrate/primitives/consensus/aura", default-features = false }
 sp-core = { path = "../../../../../substrate/primitives/core", default-features = false}
+sp-genesis-builder = { path = "../../../../../substrate/primitives/genesis-builder", default-features = false }
 sp-inherents = { path = "../../../../../substrate/primitives/inherents", default-features = false}
 sp-offchain = { path = "../../../../../substrate/primitives/offchain", default-features = false}
 sp-runtime = { path = "../../../../../substrate/primitives/runtime", default-features = false}
@@ -31,14 +35,17 @@ sp-transaction-pool = { path = "../../../../../substrate/primitives/transaction-
 sp-version = { path = "../../../../../substrate/primitives/version", default-features = false}
 
 # Polkadot
-xcm = { path = "../../../../../polkadot/xcm", default-features = false}
-xcm-builder = { path = "../../../../../polkadot/xcm/xcm-builder", default-features = false}
-xcm-executor = { path = "../../../../../polkadot/xcm/xcm-executor", default-features = false}
+xcm = { package = "staging-xcm", path = "../../../../../polkadot/xcm", default-features = false}
+xcm-builder = { package = "staging-xcm-builder", path = "../../../../../polkadot/xcm/xcm-builder", default-features = false}
+xcm-executor = { package = "staging-xcm-executor", path = "../../../../../polkadot/xcm/xcm-executor", default-features = false}
 
 # Cumulus
+cumulus-pallet-aura-ext = { path = "../../../../pallets/aura-ext", default-features = false }
 cumulus-pallet-parachain-system = { path = "../../../../pallets/parachain-system", default-features = false, features = ["parameterized-consensus-hook",] }
 cumulus-pallet-xcm = { path = "../../../../pallets/xcm", default-features = false }
+cumulus-primitives-aura = { path = "../../../../primitives/aura", default-features = false }
 cumulus-primitives-core = { path = "../../../../primitives/core", default-features = false }
+cumulus-primitives-timestamp = { path = "../../../../primitives/timestamp", default-features = false }
 parachain-info = { path = "../../../pallets/parachain-info", default-features = false }
 parachains-common = { path = "../../../common", default-features = false }
 
@@ -54,30 +61,46 @@ runtime-benchmarks = [
 	"frame-system-benchmarking/runtime-benchmarks",
 	"frame-system/runtime-benchmarks",
 	"pallet-glutton/runtime-benchmarks",
+	"pallet-sudo?/runtime-benchmarks",
+	"pallet-timestamp/runtime-benchmarks",
+	"parachains-common/runtime-benchmarks",
+	"sp-runtime/runtime-benchmarks",
 	"xcm-builder/runtime-benchmarks",
+	"xcm-executor/runtime-benchmarks",
 ]
 std = [
 	"codec/std",
+	"cumulus-pallet-aura-ext/std",
 	"cumulus-pallet-parachain-system/std",
 	"cumulus-pallet-xcm/std",
+	"cumulus-primitives-aura/std",
 	"cumulus-primitives-core/std",
+	"cumulus-primitives-timestamp/std",
+	"frame-benchmarking?/std",
 	"frame-executive/std",
 	"frame-support/std",
+	"frame-system-benchmarking?/std",
 	"frame-system-rpc-runtime-api/std",
 	"frame-system/std",
+	"frame-try-runtime?/std",
+	"pallet-aura/std",
 	"pallet-glutton/std",
 	"pallet-sudo/std",
+	"pallet-timestamp/std",
 	"parachain-info/std",
 	"parachains-common/std",
 	"scale-info/std",
 	"sp-api/std",
 	"sp-block-builder/std",
+	"sp-consensus-aura/std",
 	"sp-core/std",
+	"sp-genesis-builder/std",
 	"sp-inherents/std",
 	"sp-offchain/std",
 	"sp-runtime/std",
 	"sp-session/std",
 	"sp-std/std",
+	"sp-storage/std",
 	"sp-transaction-pool/std",
 	"sp-version/std",
 	"xcm-builder/std",
@@ -85,8 +108,19 @@ std = [
 	"xcm/std",
 ]
 try-runtime = [
+	"cumulus-pallet-aura-ext/try-runtime",
+	"cumulus-pallet-parachain-system/try-runtime",
+	"cumulus-pallet-xcm/try-runtime",
 	"frame-executive/try-runtime",
+	"frame-support/try-runtime",
+	"frame-system/try-runtime",
 	"frame-try-runtime/try-runtime",
+	"pallet-aura/try-runtime",
 	"pallet-glutton/try-runtime",
 	"pallet-sudo/try-runtime",
+	"pallet-timestamp/try-runtime",
+	"parachain-info/try-runtime",
+	"sp-runtime/try-runtime",
 ]
+
+experimental = [ "pallet-aura/experimental" ]
diff --git a/cumulus/parachains/runtimes/glutton/glutton-kusama/build.rs b/cumulus/parachains/runtimes/glutton/glutton-kusama/build.rs
index 9b53d2457dffdc09ea4789b644e6d2b2a3cfc0f5..1580e6f07bec466c644ccab1f4591d384632135e 100644
--- a/cumulus/parachains/runtimes/glutton/glutton-kusama/build.rs
+++ b/cumulus/parachains/runtimes/glutton/glutton-kusama/build.rs
@@ -1,3 +1,18 @@
+// 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.
+
 use substrate_wasm_builder::WasmBuilder;
 
 fn main() {
diff --git a/cumulus/parachains/runtimes/glutton/glutton-kusama/src/lib.rs b/cumulus/parachains/runtimes/glutton/glutton-kusama/src/lib.rs
index cd9d31a4d989f40cc78b35ae4dfc786d60f9118c..f5d52239e54374a0274289a896a5c3c472c4e615 100644
--- a/cumulus/parachains/runtimes/glutton/glutton-kusama/src/lib.rs
+++ b/cumulus/parachains/runtimes/glutton/glutton-kusama/src/lib.rs
@@ -1,4 +1,4 @@
-// Copyright (C) 2023 Parity Technologies (UK) Ltd.
+// Copyright (C) Parity Technologies (UK) Ltd.
 // SPDX-License-Identifier: Apache-2.0
 
 // Licensed under the Apache License, Version 2.0 (the "License");
@@ -46,11 +46,12 @@ include!(concat!(env!("OUT_DIR"), "/wasm_binary.rs"));
 pub mod weights;
 pub mod xcm_config;
 
-use cumulus_pallet_parachain_system::RelayNumberStrictlyIncreases;
+use cumulus_pallet_parachain_system::RelayNumberMonotonicallyIncreases;
 use sp_api::impl_runtime_apis;
-use sp_core::OpaqueMetadata;
+pub use sp_consensus_aura::sr25519::AuthorityId as AuraId;
+use sp_core::{crypto::KeyTypeId, OpaqueMetadata};
 use sp_runtime::{
-	create_runtime_str, generic,
+	create_runtime_str, generic, impl_opaque_keys,
 	traits::{AccountIdLookup, BlakeTwo256, Block as BlockT},
 	transaction_validity::{TransactionSource, TransactionValidity},
 	ApplyExtrinsicResult,
@@ -63,15 +64,18 @@ use sp_version::RuntimeVersion;
 pub use frame_support::{
 	construct_runtime,
 	dispatch::DispatchClass,
+	genesis_builder_helper::{build_config, create_default_config},
 	parameter_types,
-	traits::{Everything, IsInVec, Randomness},
+	traits::{
+		ConstBool, ConstU32, ConstU64, ConstU8, EitherOfDiverse, Everything, IsInVec, Randomness,
+	},
 	weights::{
 		constants::{
 			BlockExecutionWeight, ExtrinsicBaseWeight, RocksDbWeight, WEIGHT_REF_TIME_PER_SECOND,
 		},
 		IdentityFee, Weight,
 	},
-	StorageValue,
+	PalletId, StorageValue,
 };
 use frame_system::{
 	limits::{BlockLength, BlockWeights},
@@ -82,6 +86,12 @@ use parachains_common::{AccountId, Signature};
 pub use sp_runtime::BuildStorage;
 pub use sp_runtime::{Perbill, Permill};
 
+impl_opaque_keys! {
+	pub struct SessionKeys {
+		pub aura: Aura,
+	}
+}
+
 #[sp_version::runtime_version]
 pub const VERSION: RuntimeVersion = RuntimeVersion {
 	spec_name: create_runtime_str!("glutton"),
@@ -108,10 +118,28 @@ const AVERAGE_ON_INITIALIZE_RATIO: Perbill = Perbill::from_percent(10);
 const NORMAL_DISPATCH_RATIO: Perbill = Perbill::from_percent(75);
 /// We allow for .5 seconds of compute with a 12 second average block time.
 const MAXIMUM_BLOCK_WEIGHT: Weight = Weight::from_parts(
-	WEIGHT_REF_TIME_PER_SECOND.saturating_div(2),
+	WEIGHT_REF_TIME_PER_SECOND.saturating_mul(2),
 	cumulus_primitives_core::relay_chain::MAX_POV_SIZE as u64,
 );
 
+/// Maximum number of blocks simultaneously accepted by the Runtime, not yet included
+/// into the relay chain.
+const UNINCLUDED_SEGMENT_CAPACITY: u32 = 3;
+/// How many parachain blocks are processed by the relay chain per parent. Limits the
+/// number of blocks authored per slot.
+const BLOCK_PROCESSING_VELOCITY: u32 = 2;
+/// Relay chain slot duration, in milliseconds.
+const RELAY_CHAIN_SLOT_DURATION_MILLIS: u32 = 6000;
+
+/// This determines the average expected block time that we are targeting.
+/// Blocks will be produced at a minimum duration defined by `SLOT_DURATION`.
+/// `SLOT_DURATION` is picked up by `pallet_timestamp` which is in turn picked
+/// up by `pallet_aura` to implement `fn slot_duration()`.
+///
+/// Change this to adjust the block time.
+pub const MILLISECS_PER_BLOCK: u64 = 6000;
+pub const SLOT_DURATION: u64 = MILLISECS_PER_BLOCK;
+
 parameter_types! {
 	pub const BlockHashCount: BlockNumber = 4096;
 	pub const Version: RuntimeVersion = VERSION;
@@ -169,6 +197,13 @@ parameter_types! {
 	pub const ReservedDmpWeight: Weight = MAXIMUM_BLOCK_WEIGHT.saturating_div(2);
 }
 
+type ConsensusHook = cumulus_pallet_aura_ext::FixedVelocityConsensusHook<
+	Runtime,
+	RELAY_CHAIN_SLOT_DURATION_MILLIS,
+	BLOCK_PROCESSING_VELOCITY,
+	UNINCLUDED_SEGMENT_CAPACITY,
+>;
+
 impl cumulus_pallet_parachain_system::Config for Runtime {
 	type RuntimeEvent = RuntimeEvent;
 	type OnSystemEvent = ();
@@ -178,12 +213,30 @@ impl cumulus_pallet_parachain_system::Config for Runtime {
 	type ReservedDmpWeight = ReservedDmpWeight;
 	type XcmpMessageHandler = ();
 	type ReservedXcmpWeight = ();
-	type CheckAssociatedRelayNumber = RelayNumberStrictlyIncreases;
-	type ConsensusHook = cumulus_pallet_parachain_system::consensus_hook::ExpectParentIncluded;
+	type CheckAssociatedRelayNumber = RelayNumberMonotonicallyIncreases;
+	type ConsensusHook = ConsensusHook;
 }
 
 impl parachain_info::Config for Runtime {}
 
+impl cumulus_pallet_aura_ext::Config for Runtime {}
+
+impl pallet_timestamp::Config for Runtime {
+	type Moment = u64;
+	type OnTimestampSet = Aura;
+	type MinimumPeriod = ConstU64<0>;
+	type WeightInfo = weights::pallet_timestamp::WeightInfo<Runtime>;
+}
+
+impl pallet_aura::Config for Runtime {
+	type AuthorityId = AuraId;
+	type DisabledValidators = ();
+	type MaxAuthorities = ConstU32<100_000>;
+	type AllowMultipleBlocksPerSlot = ConstBool<true>;
+	#[cfg(feature = "experimental")]
+	type SlotDuration = ConstU64<SLOT_DURATION>;
+}
+
 impl pallet_glutton::Config for Runtime {
 	type RuntimeEvent = RuntimeEvent;
 	type WeightInfo = weights::pallet_glutton::WeightInfo<Runtime>;
@@ -204,6 +257,7 @@ construct_runtime! {
 			Pallet, Call, Config<T>, Storage, Inherent, Event<T>, ValidateUnsigned,
 		} = 1,
 		ParachainInfo: parachain_info::{Pallet, Storage, Config<T>} = 2,
+		Timestamp: pallet_timestamp::{Pallet, Call, Storage, Inherent} = 3,
 
 		// DMP handler.
 		CumulusXcm: cumulus_pallet_xcm::{Pallet, Call, Storage, Event<T>, Origin} = 10,
@@ -211,6 +265,10 @@ construct_runtime! {
 		// The main stage.
 		Glutton: pallet_glutton::{Pallet, Call, Storage, Event, Config<T>} = 20,
 
+		// Collator support
+		Aura: pallet_aura::{Pallet, Storage, Config<T>} = 30,
+		AuraExt: cumulus_pallet_aura_ext::{Pallet, Storage, Config<T>} = 31,
+
 		// Sudo.
 		Sudo: pallet_sudo::{Pallet, Call, Storage, Event<T>, Config<T>} = 255,
 	}
@@ -295,6 +353,25 @@ impl_runtime_apis! {
 		}
 	}
 
+	impl sp_consensus_aura::AuraApi<Block, AuraId> for Runtime {
+		fn slot_duration() -> sp_consensus_aura::SlotDuration {
+			sp_consensus_aura::SlotDuration::from_millis(SLOT_DURATION)
+		}
+
+		fn authorities() -> Vec<AuraId> {
+			Aura::authorities().into_inner()
+		}
+	}
+
+	impl cumulus_primitives_aura::AuraUnincludedSegmentApi<Block> for Runtime {
+		fn can_build_upon(
+			included_hash: <Block as BlockT>::Hash,
+			slot: cumulus_primitives_aura::Slot,
+		) -> bool {
+			ConsensusHook::can_build_upon(included_hash, slot)
+		}
+	}
+
 	impl sp_block_builder::BlockBuilder<Block> for Runtime {
 		fn apply_extrinsic(
 			extrinsic: <Block as BlockT>::Extrinsic,
@@ -332,12 +409,14 @@ impl_runtime_apis! {
 	}
 
 	impl sp_session::SessionKeys<Block> for Runtime {
-		fn decode_session_keys(_: Vec<u8>) -> Option<Vec<(Vec<u8>, sp_core::crypto::KeyTypeId)>> {
-			Some(Vec::new())
+		fn generate_session_keys(seed: Option<Vec<u8>>) -> Vec<u8> {
+			SessionKeys::generate(seed)
 		}
 
-		fn generate_session_keys(_: Option<Vec<u8>>) -> Vec<u8> {
-			Vec::new()
+		fn decode_session_keys(
+			encoded: Vec<u8>,
+		) -> Option<Vec<(Vec<u8>, KeyTypeId)>> {
+			SessionKeys::decode_into_raw_public_keys(&encoded)
 		}
 	}
 
@@ -398,9 +477,19 @@ impl_runtime_apis! {
 			Ok(batches)
 		}
 	}
+
+	impl sp_genesis_builder::GenesisBuilder<Block> for Runtime {
+		fn create_default_config() -> Vec<u8> {
+			create_default_config::<RuntimeGenesisConfig>()
+		}
+
+		fn build_config(config: Vec<u8>) -> sp_genesis_builder::Result {
+			build_config::<RuntimeGenesisConfig>(config)
+		}
+	}
 }
 
 cumulus_pallet_parachain_system::register_validate_block! {
 	Runtime = Runtime,
-	BlockExecutor = Executive,
+	BlockExecutor = cumulus_pallet_aura_ext::BlockExecutor::<Runtime, Executive>,
 }
diff --git a/cumulus/parachains/runtimes/glutton/glutton-kusama/src/weights/frame_system.rs b/cumulus/parachains/runtimes/glutton/glutton-kusama/src/weights/frame_system.rs
index 1aff76714bb35d9e5879b56fcef54c8b59d54849..36c4abc400634fd9ec857675031b11b3c33d3fd2 100644
--- a/cumulus/parachains/runtimes/glutton/glutton-kusama/src/weights/frame_system.rs
+++ b/cumulus/parachains/runtimes/glutton/glutton-kusama/src/weights/frame_system.rs
@@ -1,4 +1,4 @@
-// Copyright Parity Technologies (UK) Ltd.
+// Copyright (C) Parity Technologies (UK) Ltd.
 // This file is part of Cumulus.
 
 // Cumulus is free software: you can redistribute it and/or modify
diff --git a/cumulus/parachains/runtimes/glutton/glutton-kusama/src/weights/mod.rs b/cumulus/parachains/runtimes/glutton/glutton-kusama/src/weights/mod.rs
index 234ce34bf420bcf7484fc537760a699ad2f304db..955010505d310cffe1660fcec0dace4c2d613181 100644
--- a/cumulus/parachains/runtimes/glutton/glutton-kusama/src/weights/mod.rs
+++ b/cumulus/parachains/runtimes/glutton/glutton-kusama/src/weights/mod.rs
@@ -1 +1,18 @@
+// 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/>.
+
 pub mod pallet_glutton;
+pub mod pallet_timestamp;
diff --git a/cumulus/parachains/runtimes/glutton/glutton-kusama/src/weights/pallet_glutton.rs b/cumulus/parachains/runtimes/glutton/glutton-kusama/src/weights/pallet_glutton.rs
index f43a487826568839f4ec0c6171371e21770941b3..f278d246b33b1b4f0854b943fef8a1da22122e93 100644
--- a/cumulus/parachains/runtimes/glutton/glutton-kusama/src/weights/pallet_glutton.rs
+++ b/cumulus/parachains/runtimes/glutton/glutton-kusama/src/weights/pallet_glutton.rs
@@ -1,4 +1,4 @@
-// Copyright Parity Technologies (UK) Ltd.
+// Copyright (C) Parity Technologies (UK) Ltd.
 // This file is part of Cumulus.
 
 // Cumulus is free software: you can redistribute it and/or modify
diff --git a/polkadot/runtime/kusama/src/weights/pallet_timestamp.rs b/cumulus/parachains/runtimes/glutton/glutton-kusama/src/weights/pallet_timestamp.rs
similarity index 57%
rename from polkadot/runtime/kusama/src/weights/pallet_timestamp.rs
rename to cumulus/parachains/runtimes/glutton/glutton-kusama/src/weights/pallet_timestamp.rs
index ab127fd9606466fc5a1ec0a8c6b5435c17115d26..8edae065f1b9173a3767a037c167f05420b95a70 100644
--- a/polkadot/runtime/kusama/src/weights/pallet_timestamp.rs
+++ b/cumulus/parachains/runtimes/glutton/glutton-kusama/src/weights/pallet_timestamp.rs
@@ -1,43 +1,43 @@
-// Copyright (C) Parity Technologies (UK) Ltd.
-// This file is part of Polkadot.
+// Copyright Parity Technologies (UK) Ltd.
+// This file is part of Cumulus.
 
-// Polkadot is free software: you can redistribute it and/or modify
+// 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.
 
-// Polkadot is distributed in the hope that it will be useful,
+// 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 Polkadot.  If not, see <http://www.gnu.org/licenses/>.
+// along with Cumulus.  If not, see <http://www.gnu.org/licenses/>.
 
 //! Autogenerated weights for `pallet_timestamp`
 //!
 //! THIS FILE WAS AUTO-GENERATED USING THE SUBSTRATE BENCHMARK CLI VERSION 4.0.0-dev
-//! DATE: 2023-06-19, STEPS: `50`, REPEAT: `20`, LOW RANGE: `[]`, HIGH RANGE: `[]`
+//! DATE: 2023-07-31, STEPS: `50`, REPEAT: `20`, LOW RANGE: `[]`, HIGH RANGE: `[]`
 //! WORST CASE MAP SIZE: `1000000`
-//! HOSTNAME: `runner-e8ezs4ez-project-163-concurrent-0`, CPU: `Intel(R) Xeon(R) CPU @ 2.60GHz`
-//! EXECUTION: Some(Wasm), WASM-EXECUTION: Compiled, CHAIN: Some("kusama-dev"), DB CACHE: 1024
+//! HOSTNAME: `runner-ynta1nyy-project-238-concurrent-0`, CPU: `Intel(R) Xeon(R) CPU @ 2.60GHz`
+//! EXECUTION: ``, WASM-EXECUTION: `Compiled`, CHAIN: `Some("asset-hub-kusama-dev")`, DB CACHE: 1024
 
 // Executed Command:
-// ./target/production/polkadot
+// ./target/production/polkadot-parachain
 // benchmark
 // pallet
-// --chain=kusama-dev
-// --steps=50
-// --repeat=20
+// --chain=asset-hub-kusama-dev
+// --wasm-execution=compiled
+// --pallet=pallet_timestamp
 // --no-storage-info
 // --no-median-slopes
 // --no-min-squares
-// --pallet=pallet_timestamp
 // --extrinsic=*
-// --execution=wasm
-// --wasm-execution=compiled
+// --steps=50
+// --repeat=20
+// --json
 // --header=./file_header.txt
-// --output=./runtime/kusama/src/weights/
+// --output=./parachains/runtimes/assets/asset-hub-kusama/src/weights/
 
 #![cfg_attr(rustfmt, rustfmt_skip)]
 #![allow(unused_parens)]
@@ -50,26 +50,26 @@ use core::marker::PhantomData;
 /// Weight functions for `pallet_timestamp`.
 pub struct WeightInfo<T>(PhantomData<T>);
 impl<T: frame_system::Config> pallet_timestamp::WeightInfo for WeightInfo<T> {
-	/// Storage: Timestamp Now (r:1 w:1)
-	/// Proof: Timestamp Now (max_values: Some(1), max_size: Some(8), added: 503, mode: MaxEncodedLen)
-	/// Storage: Babe CurrentSlot (r:1 w:0)
-	/// Proof: Babe CurrentSlot (max_values: Some(1), max_size: Some(8), added: 503, mode: MaxEncodedLen)
+	/// Storage: `Timestamp::Now` (r:1 w:1)
+	/// Proof: `Timestamp::Now` (`max_values`: Some(1), `max_size`: Some(8), added: 503, mode: `MaxEncodedLen`)
+	/// Storage: `Aura::CurrentSlot` (r:1 w:0)
+	/// Proof: `Aura::CurrentSlot` (`max_values`: Some(1), `max_size`: Some(8), added: 503, mode: `MaxEncodedLen`)
 	fn set() -> Weight {
 		// Proof Size summary in bytes:
-		//  Measured:  `311`
+		//  Measured:  `86`
 		//  Estimated: `1493`
-		// Minimum execution time: 9_183_000 picoseconds.
-		Weight::from_parts(9_579_000, 0)
+		// Minimum execution time: 9_313_000 picoseconds.
+		Weight::from_parts(9_775_000, 0)
 			.saturating_add(Weight::from_parts(0, 1493))
 			.saturating_add(T::DbWeight::get().reads(2))
 			.saturating_add(T::DbWeight::get().writes(1))
 	}
 	fn on_finalize() -> Weight {
 		// Proof Size summary in bytes:
-		//  Measured:  `94`
+		//  Measured:  `57`
 		//  Estimated: `0`
-		// Minimum execution time: 3_897_000 picoseconds.
-		Weight::from_parts(4_053_000, 0)
+		// Minimum execution time: 3_322_000 picoseconds.
+		Weight::from_parts(3_577_000, 0)
 			.saturating_add(Weight::from_parts(0, 0))
 	}
 }
diff --git a/cumulus/parachains/runtimes/glutton/glutton-kusama/src/xcm_config.rs b/cumulus/parachains/runtimes/glutton/glutton-kusama/src/xcm_config.rs
index a09880f8cdc963711a3004d25b1274fee9ac1ddf..fb7b78b79d2a808021c5d0a8494e760c66417057 100644
--- a/cumulus/parachains/runtimes/glutton/glutton-kusama/src/xcm_config.rs
+++ b/cumulus/parachains/runtimes/glutton/glutton-kusama/src/xcm_config.rs
@@ -1,4 +1,4 @@
-// Copyright (C) 2023 Parity Technologies (UK) Ltd.
+// Copyright (C) Parity Technologies (UK) Ltd.
 // SPDX-License-Identifier: Apache-2.0
 
 // Licensed under the Apache License, Version 2.0 (the "License");
diff --git a/cumulus/parachains/runtimes/starters/seedling/Cargo.toml b/cumulus/parachains/runtimes/starters/seedling/Cargo.toml
index 1dfad06616ad7ed019cfc88d9ef20b69e408d1c3..d9711b57b3770355474b43245366cf6adb8c6e98 100644
--- a/cumulus/parachains/runtimes/starters/seedling/Cargo.toml
+++ b/cumulus/parachains/runtimes/starters/seedling/Cargo.toml
@@ -1,8 +1,8 @@
 [package]
 name = "seedling-runtime"
 version = "0.1.0"
-authors = ["Parity Technologies <admin@parity.io>"]
-edition = "2021"
+authors.workspace = true
+edition.workspace = true
 
 [dependencies]
 codec = { package = "parity-scale-codec", version = "3.0.0", default-features = false, features = ["derive"] }
@@ -12,11 +12,15 @@ scale-info = { version = "2.9.0", default-features = false, features = ["derive"
 frame-executive = { path = "../../../../../substrate/frame/executive", default-features = false}
 frame-support = { path = "../../../../../substrate/frame/support", default-features = false}
 frame-system = { path = "../../../../../substrate/frame/system", default-features = false}
+pallet-aura = { path = "../../../../../substrate/frame/aura", default-features = false}
 pallet-balances = { path = "../../../../../substrate/frame/balances", default-features = false}
 pallet-sudo = { path = "../../../../../substrate/frame/sudo", default-features = false}
+pallet-timestamp = { path = "../../../../../substrate/frame/timestamp", default-features = false }
 sp-api = { path = "../../../../../substrate/primitives/api", default-features = false}
 sp-block-builder = { path = "../../../../../substrate/primitives/block-builder", default-features = false}
+sp-consensus-aura = { path = "../../../../../substrate/primitives/consensus/aura", default-features = false }
 sp-core = { path = "../../../../../substrate/primitives/core", default-features = false}
+sp-genesis-builder = { path = "../../../../../substrate/primitives/genesis-builder", default-features = false }
 sp-inherents = { path = "../../../../../substrate/primitives/inherents", default-features = false}
 sp-offchain = { path = "../../../../../substrate/primitives/offchain", default-features = false}
 sp-runtime = { path = "../../../../../substrate/primitives/runtime", default-features = false}
@@ -26,11 +30,13 @@ sp-transaction-pool = { path = "../../../../../substrate/primitives/transaction-
 sp-version = { path = "../../../../../substrate/primitives/version", default-features = false}
 
 # Cumulus
+cumulus-pallet-aura-ext = { path = "../../../../pallets/aura-ext", default-features = false }
 cumulus-pallet-parachain-system = { path = "../../../../pallets/parachain-system", default-features = false, features = ["parameterized-consensus-hook",] }
 cumulus-pallet-solo-to-para = { path = "../../../../pallets/solo-to-para", default-features = false }
+cumulus-primitives-core = { path = "../../../../primitives/core", default-features = false }
+cumulus-primitives-timestamp = { path = "../../../../primitives/timestamp", default-features = false }
 parachain-info = { path = "../../../pallets/parachain-info", default-features = false }
 parachains-common = { path = "../../../common", default-features = false }
-cumulus-primitives-core = { path = "../../../../primitives/core", default-features = false }
 
 [build-dependencies]
 substrate-wasm-builder = { path = "../../../../../substrate/utils/wasm-builder", optional = true }
@@ -39,20 +45,26 @@ substrate-wasm-builder = { path = "../../../../../substrate/utils/wasm-builder",
 default = [ "std" ]
 std = [
 	"codec/std",
+	"cumulus-pallet-aura-ext/std",
 	"cumulus-pallet-parachain-system/std",
 	"cumulus-pallet-solo-to-para/std",
 	"cumulus-primitives-core/std",
+	"cumulus-primitives-timestamp/std",
 	"frame-executive/std",
 	"frame-support/std",
 	"frame-system/std",
+	"pallet-aura/std",
 	"pallet-balances/std",
 	"pallet-sudo/std",
+	"pallet-timestamp/std",
 	"parachain-info/std",
 	"parachains-common/std",
 	"scale-info/std",
 	"sp-api/std",
 	"sp-block-builder/std",
+	"sp-consensus-aura/std",
 	"sp-core/std",
+	"sp-genesis-builder/std",
 	"sp-inherents/std",
 	"sp-offchain/std",
 	"sp-runtime/std",
@@ -62,3 +74,5 @@ std = [
 	"sp-version/std",
 	"substrate-wasm-builder",
 ]
+
+experimental = [ "pallet-aura/experimental" ]
diff --git a/cumulus/parachains/runtimes/starters/seedling/src/lib.rs b/cumulus/parachains/runtimes/starters/seedling/src/lib.rs
index edca2b093948c2c41917201e23e2bde79029323f..c2bcaf8a1266702a0d5c8d6fbbd6463a5d46dc34 100644
--- a/cumulus/parachains/runtimes/starters/seedling/src/lib.rs
+++ b/cumulus/parachains/runtimes/starters/seedling/src/lib.rs
@@ -1,4 +1,4 @@
-// Copyright 2019-2022 Parity Technologies (UK) Ltd.
+// Copyright (C) Parity Technologies (UK) Ltd.
 // This file is part of Cumulus.
 
 // Cumulus is free software: you can redistribute it and/or modify
@@ -27,11 +27,12 @@
 #[cfg(feature = "std")]
 include!(concat!(env!("OUT_DIR"), "/wasm_binary.rs"));
 
-use cumulus_pallet_parachain_system::RelayNumberStrictlyIncreases;
+use cumulus_pallet_parachain_system::RelayNumberMonotonicallyIncreases;
 use sp_api::impl_runtime_apis;
-use sp_core::OpaqueMetadata;
+pub use sp_consensus_aura::sr25519::AuthorityId as AuraId;
+use sp_core::{crypto::KeyTypeId, OpaqueMetadata};
 use sp_runtime::{
-	create_runtime_str, generic,
+	create_runtime_str, generic, impl_opaque_keys,
 	traits::{AccountIdLookup, BlakeTwo256, Block as BlockT},
 	transaction_validity::{TransactionSource, TransactionValidity},
 	ApplyExtrinsicResult,
@@ -45,8 +46,9 @@ use sp_version::RuntimeVersion;
 pub use frame_support::{
 	construct_runtime,
 	dispatch::DispatchClass,
+	genesis_builder_helper::{build_config, create_default_config},
 	parameter_types,
-	traits::{IsInVec, Randomness},
+	traits::{ConstBool, ConstU32, ConstU64, ConstU8, EitherOfDiverse, IsInVec, Randomness},
 	weights::{
 		constants::{
 			BlockExecutionWeight, ExtrinsicBaseWeight, RocksDbWeight, WEIGHT_REF_TIME_PER_SECOND,
@@ -61,6 +63,12 @@ use parachains_common::{AccountId, Signature};
 pub use sp_runtime::BuildStorage;
 pub use sp_runtime::{Perbill, Permill};
 
+impl_opaque_keys! {
+	pub struct SessionKeys {
+		pub aura: Aura,
+	}
+}
+
 /// This runtime version.
 #[sp_version::runtime_version]
 pub const VERSION: RuntimeVersion = RuntimeVersion {
@@ -80,6 +88,15 @@ pub fn native_version() -> NativeVersion {
 	NativeVersion { runtime_version: VERSION, can_author_with: Default::default() }
 }
 
+/// Maximum number of blocks simultaneously accepted by the Runtime, not yet included
+/// into the relay chain.
+const UNINCLUDED_SEGMENT_CAPACITY: u32 = 1;
+/// How many parachain blocks are processed by the relay chain per parent. Limits the
+/// number of blocks authored per slot.
+const BLOCK_PROCESSING_VELOCITY: u32 = 1;
+/// Relay chain slot duration, in milliseconds.
+const RELAY_CHAIN_SLOT_DURATION_MILLIS: u32 = 6000;
+
 /// We assume that ~10% of the block weight is consumed by `on_initialize` handlers.
 /// This is used to limit the maximal weight of a single extrinsic.
 const AVERAGE_ON_INITIALIZE_RATIO: Perbill = Perbill::from_percent(10);
@@ -174,23 +191,49 @@ impl cumulus_pallet_parachain_system::Config for Runtime {
 	type ReservedDmpWeight = ();
 	type XcmpMessageHandler = ();
 	type ReservedXcmpWeight = ();
-	type CheckAssociatedRelayNumber = RelayNumberStrictlyIncreases;
-	type ConsensusHook = cumulus_pallet_parachain_system::consensus_hook::ExpectParentIncluded;
+	type CheckAssociatedRelayNumber = RelayNumberMonotonicallyIncreases;
+	type ConsensusHook = cumulus_pallet_aura_ext::FixedVelocityConsensusHook<
+		Runtime,
+		RELAY_CHAIN_SLOT_DURATION_MILLIS,
+		BLOCK_PROCESSING_VELOCITY,
+		UNINCLUDED_SEGMENT_CAPACITY,
+	>;
 }
 
 impl parachain_info::Config for Runtime {}
 
+impl cumulus_pallet_aura_ext::Config for Runtime {}
+
+impl pallet_aura::Config for Runtime {
+	type AuthorityId = AuraId;
+	type DisabledValidators = ();
+	type MaxAuthorities = ConstU32<100_000>;
+	type AllowMultipleBlocksPerSlot = ConstBool<false>;
+	#[cfg(feature = "experimental")]
+	type SlotDuration = pallet_aura::MinimumPeriodTimesTwo<Self>;
+}
+
+impl pallet_timestamp::Config for Runtime {
+	type Moment = u64;
+	type OnTimestampSet = Aura;
+	type MinimumPeriod = ConstU64<0>;
+	type WeightInfo = ();
+}
+
 construct_runtime! {
 	pub enum Runtime
 	{
 		System: frame_system::{Pallet, Call, Storage, Config<T>, Event<T>},
 		Sudo: pallet_sudo::{Pallet, Call, Storage, Config<T>, Event<T>},
+		Timestamp: pallet_timestamp::{Pallet, Call, Storage, Inherent},
 
 		ParachainSystem: cumulus_pallet_parachain_system::{
 			Pallet, Call, Config<T>, Storage, Inherent, Event<T>, ValidateUnsigned,
 		},
 		ParachainInfo: parachain_info::{Pallet, Storage, Config<T>},
 		SoloToPara: cumulus_pallet_solo_to_para::{Pallet, Call, Storage, Event},
+		Aura: pallet_aura::{Pallet, Storage, Config<T>},
+		AuraExt: cumulus_pallet_aura_ext::{Pallet, Storage, Config<T>},
 	}
 }
 
@@ -233,6 +276,16 @@ pub type Executive = frame_executive::Executive<
 >;
 
 impl_runtime_apis! {
+	impl sp_consensus_aura::AuraApi<Block, AuraId> for Runtime {
+		fn slot_duration() -> sp_consensus_aura::SlotDuration {
+			sp_consensus_aura::SlotDuration::from_millis(Aura::slot_duration())
+		}
+
+		fn authorities() -> Vec<AuraId> {
+			Aura::authorities().into_inner()
+		}
+	}
+
 	impl sp_api::Core<Block> for Runtime {
 		fn version() -> RuntimeVersion {
 			VERSION
@@ -298,12 +351,14 @@ impl_runtime_apis! {
 	}
 
 	impl sp_session::SessionKeys<Block> for Runtime {
-		fn decode_session_keys(_: Vec<u8>) -> Option<Vec<(Vec<u8>, sp_core::crypto::KeyTypeId)>> {
-			Some(Vec::new())
+		fn generate_session_keys(seed: Option<Vec<u8>>) -> Vec<u8> {
+			SessionKeys::generate(seed)
 		}
 
-		fn generate_session_keys(_: Option<Vec<u8>>) -> Vec<u8> {
-			Vec::new()
+		fn decode_session_keys(
+			encoded: Vec<u8>,
+		) -> Option<Vec<(Vec<u8>, KeyTypeId)>> {
+			SessionKeys::decode_into_raw_public_keys(&encoded)
 		}
 	}
 
@@ -312,9 +367,19 @@ impl_runtime_apis! {
 			ParachainSystem::collect_collation_info(header)
 		}
 	}
+
+	impl sp_genesis_builder::GenesisBuilder<Block> for Runtime {
+		fn create_default_config() -> Vec<u8> {
+			create_default_config::<RuntimeGenesisConfig>()
+		}
+
+		fn build_config(config: Vec<u8>) -> sp_genesis_builder::Result {
+			build_config::<RuntimeGenesisConfig>(config)
+		}
+	}
 }
 
 cumulus_pallet_parachain_system::register_validate_block! {
 	Runtime = Runtime,
-	BlockExecutor = Executive,
+	BlockExecutor = cumulus_pallet_aura_ext::BlockExecutor::<Runtime, Executive>,
 }
diff --git a/cumulus/parachains/runtimes/starters/shell/Cargo.toml b/cumulus/parachains/runtimes/starters/shell/Cargo.toml
index d15270482096ef41fcc01c9ba03be56eea0366a6..675abc07b77359a65f78b21a90ced4978eafede5 100644
--- a/cumulus/parachains/runtimes/starters/shell/Cargo.toml
+++ b/cumulus/parachains/runtimes/starters/shell/Cargo.toml
@@ -1,8 +1,8 @@
 [package]
 name = "shell-runtime"
 version = "0.1.0"
-authors = ["Parity Technologies <admin@parity.io>"]
-edition = "2021"
+authors.workspace = true
+edition.workspace = true
 
 [dependencies]
 codec = { package = "parity-scale-codec", version = "3.0.0", default-features = false, features = ["derive"] }
@@ -13,9 +13,13 @@ frame-executive = { path = "../../../../../substrate/frame/executive", default-f
 frame-support = { path = "../../../../../substrate/frame/support", default-features = false}
 frame-system = { path = "../../../../../substrate/frame/system", default-features = false}
 frame-try-runtime = { path = "../../../../../substrate/frame/try-runtime", default-features = false, optional = true }
+pallet-aura = { path = "../../../../../substrate/frame/aura", default-features = false}
+pallet-timestamp = { path = "../../../../../substrate/frame/timestamp", default-features = false }
 sp-api = { path = "../../../../../substrate/primitives/api", default-features = false}
 sp-block-builder = { path = "../../../../../substrate/primitives/block-builder", default-features = false}
+sp-consensus-aura = { path = "../../../../../substrate/primitives/consensus/aura", default-features = false }
 sp-core = { path = "../../../../../substrate/primitives/core", default-features = false}
+sp-genesis-builder = { path = "../../../../../substrate/primitives/genesis-builder", default-features = false }
 sp-inherents = { path = "../../../../../substrate/primitives/inherents", default-features = false}
 sp-offchain = { path = "../../../../../substrate/primitives/offchain", default-features = false}
 sp-runtime = { path = "../../../../../substrate/primitives/runtime", default-features = false}
@@ -25,11 +29,12 @@ sp-transaction-pool = { path = "../../../../../substrate/primitives/transaction-
 sp-version = { path = "../../../../../substrate/primitives/version", default-features = false}
 
 # Polkadot
-xcm = { path = "../../../../../polkadot/xcm", default-features = false}
-xcm-builder = { path = "../../../../../polkadot/xcm/xcm-builder", default-features = false}
-xcm-executor = { path = "../../../../../polkadot/xcm/xcm-executor", default-features = false}
+xcm = { package = "staging-xcm", path = "../../../../../polkadot/xcm", default-features = false}
+xcm-builder = { package = "staging-xcm-builder", path = "../../../../../polkadot/xcm/xcm-builder", default-features = false}
+xcm-executor = { package = "staging-xcm-executor", path = "../../../../../polkadot/xcm/xcm-executor", default-features = false}
 
 # Cumulus
+cumulus-pallet-aura-ext = { path = "../../../../pallets/aura-ext", default-features = false }
 cumulus-pallet-parachain-system = { path = "../../../../pallets/parachain-system", default-features = false, features = ["parameterized-consensus-hook",] }
 cumulus-pallet-xcm = { path = "../../../../pallets/xcm", default-features = false }
 cumulus-primitives-core = { path = "../../../../primitives/core", default-features = false }
@@ -43,18 +48,24 @@ substrate-wasm-builder = { path = "../../../../../substrate/utils/wasm-builder",
 default = [ "std" ]
 std = [
 	"codec/std",
+	"cumulus-pallet-aura-ext/std",
 	"cumulus-pallet-parachain-system/std",
 	"cumulus-pallet-xcm/std",
 	"cumulus-primitives-core/std",
 	"frame-executive/std",
 	"frame-support/std",
 	"frame-system/std",
+	"frame-try-runtime?/std",
+	"pallet-aura/std",
+	"pallet-timestamp/std",
 	"parachain-info/std",
 	"parachains-common/std",
 	"scale-info/std",
 	"sp-api/std",
 	"sp-block-builder/std",
+	"sp-consensus-aura/std",
 	"sp-core/std",
+	"sp-genesis-builder/std",
 	"sp-inherents/std",
 	"sp-offchain/std",
 	"sp-runtime/std",
@@ -67,4 +78,18 @@ std = [
 	"xcm-executor/std",
 	"xcm/std",
 ]
-try-runtime = [ "frame-executive/try-runtime", "frame-try-runtime/try-runtime" ]
+try-runtime = [
+	"cumulus-pallet-aura-ext/try-runtime",
+	"cumulus-pallet-parachain-system/try-runtime",
+	"cumulus-pallet-xcm/try-runtime",
+	"frame-executive/try-runtime",
+	"frame-support/try-runtime",
+	"frame-system/try-runtime",
+	"frame-try-runtime/try-runtime",
+	"pallet-aura/try-runtime",
+	"pallet-timestamp/try-runtime",
+	"parachain-info/try-runtime",
+	"sp-runtime/try-runtime",
+]
+
+experimental = [ "pallet-aura/experimental" ]
diff --git a/cumulus/parachains/runtimes/starters/shell/build.rs b/cumulus/parachains/runtimes/starters/shell/build.rs
index 256e9fb765b7c6a152bbb229e9318e16d81b9ea7..9c9cde9a25a1a8ab1780b7df7e068264459a31af 100644
--- a/cumulus/parachains/runtimes/starters/shell/build.rs
+++ b/cumulus/parachains/runtimes/starters/shell/build.rs
@@ -1,4 +1,4 @@
-// Copyright 2019-2021 Parity Technologies (UK) Ltd.
+// Copyright (C) Parity Technologies (UK) Ltd.
 // This file is part of Cumulus.
 
 // Substrate is free software: you can redistribute it and/or modify
diff --git a/cumulus/parachains/runtimes/starters/shell/src/lib.rs b/cumulus/parachains/runtimes/starters/shell/src/lib.rs
index 205462fac39baffc707bfad5693b262045056592..4aad553e6a3baf78667cad1271965d223ca3ea2d 100644
--- a/cumulus/parachains/runtimes/starters/shell/src/lib.rs
+++ b/cumulus/parachains/runtimes/starters/shell/src/lib.rs
@@ -1,4 +1,4 @@
-// Copyright 2019-2022 Parity Technologies (UK) Ltd.
+// Copyright (C) Parity Technologies (UK) Ltd.
 // This file is part of Cumulus.
 
 // Cumulus is free software: you can redistribute it and/or modify
@@ -32,13 +32,14 @@ include!(concat!(env!("OUT_DIR"), "/wasm_binary.rs"));
 pub mod xcm_config;
 
 use codec::{Decode, Encode};
-use cumulus_pallet_parachain_system::RelayNumberStrictlyIncreases;
+use cumulus_pallet_parachain_system::RelayNumberMonotonicallyIncreases;
 use frame_support::unsigned::TransactionValidityError;
 use scale_info::TypeInfo;
 use sp_api::impl_runtime_apis;
-use sp_core::OpaqueMetadata;
+pub use sp_consensus_aura::sr25519::AuthorityId as AuraId;
+use sp_core::{crypto::KeyTypeId, OpaqueMetadata};
 use sp_runtime::{
-	create_runtime_str, generic,
+	create_runtime_str, generic, impl_opaque_keys,
 	traits::{AccountIdLookup, BlakeTwo256, Block as BlockT, DispatchInfoOf},
 	transaction_validity::{TransactionSource, TransactionValidity},
 	ApplyExtrinsicResult,
@@ -52,8 +53,9 @@ use sp_version::RuntimeVersion;
 pub use frame_support::{
 	construct_runtime,
 	dispatch::DispatchClass,
+	genesis_builder_helper::{build_config, create_default_config},
 	parameter_types,
-	traits::{Everything, IsInVec, Randomness},
+	traits::{ConstBool, ConstU32, ConstU64, ConstU8, EitherOfDiverse, IsInVec, Randomness},
 	weights::{
 		constants::{
 			BlockExecutionWeight, ExtrinsicBaseWeight, RocksDbWeight, WEIGHT_REF_TIME_PER_SECOND,
@@ -68,6 +70,12 @@ use parachains_common::{AccountId, Signature};
 pub use sp_runtime::BuildStorage;
 pub use sp_runtime::{Perbill, Permill};
 
+impl_opaque_keys! {
+	pub struct SessionKeys {
+		pub aura: Aura,
+	}
+}
+
 /// This runtime version.
 #[sp_version::runtime_version]
 pub const VERSION: RuntimeVersion = RuntimeVersion {
@@ -87,6 +95,15 @@ pub fn native_version() -> NativeVersion {
 	NativeVersion { runtime_version: VERSION, can_author_with: Default::default() }
 }
 
+/// Maximum number of blocks simultaneously accepted by the Runtime, not yet included
+/// into the relay chain.
+const UNINCLUDED_SEGMENT_CAPACITY: u32 = 1;
+/// How many parachain blocks are processed by the relay chain per parent. Limits the
+/// number of blocks authored per slot.
+const BLOCK_PROCESSING_VELOCITY: u32 = 1;
+/// Relay chain slot duration, in milliseconds.
+const RELAY_CHAIN_SLOT_DURATION_MILLIS: u32 = 6000;
+
 /// We assume that ~10% of the block weight is consumed by `on_initialize` handlers.
 /// This is used to limit the maximal weight of a single extrinsic.
 const AVERAGE_ON_INITIALIZE_RATIO: Perbill = Perbill::from_percent(10);
@@ -177,16 +194,41 @@ impl cumulus_pallet_parachain_system::Config for Runtime {
 	type ReservedDmpWeight = ReservedDmpWeight;
 	type XcmpMessageHandler = ();
 	type ReservedXcmpWeight = ();
-	type CheckAssociatedRelayNumber = RelayNumberStrictlyIncreases;
-	type ConsensusHook = cumulus_pallet_parachain_system::consensus_hook::ExpectParentIncluded;
+	type CheckAssociatedRelayNumber = RelayNumberMonotonicallyIncreases;
+	type ConsensusHook = cumulus_pallet_aura_ext::FixedVelocityConsensusHook<
+		Runtime,
+		RELAY_CHAIN_SLOT_DURATION_MILLIS,
+		BLOCK_PROCESSING_VELOCITY,
+		UNINCLUDED_SEGMENT_CAPACITY,
+	>;
 }
 
 impl parachain_info::Config for Runtime {}
 
+impl cumulus_pallet_aura_ext::Config for Runtime {}
+
+impl pallet_aura::Config for Runtime {
+	type AuthorityId = AuraId;
+	type DisabledValidators = ();
+	type MaxAuthorities = ConstU32<100_000>;
+	type AllowMultipleBlocksPerSlot = ConstBool<false>;
+	#[cfg(feature = "experimental")]
+	type SlotDuration = pallet_aura::MinimumPeriodTimesTwo<Self>;
+}
+
+impl pallet_timestamp::Config for Runtime {
+	type Moment = u64;
+	type OnTimestampSet = Aura;
+	type MinimumPeriod = ConstU64<0>;
+	type WeightInfo = ();
+}
+
 construct_runtime! {
 	pub enum Runtime
 	{
 		System: frame_system::{Pallet, Call, Storage, Config<T>, Event<T>},
+		Timestamp: pallet_timestamp::{Pallet, Call, Storage, Inherent},
+
 		ParachainSystem: cumulus_pallet_parachain_system::{
 			Pallet, Call, Config<T>, Storage, Inherent, Event<T>, ValidateUnsigned,
 		},
@@ -194,6 +236,9 @@ construct_runtime! {
 
 		// DMP handler.
 		CumulusXcm: cumulus_pallet_xcm::{Pallet, Call, Storage, Event<T>, Origin},
+
+		Aura: pallet_aura::{Pallet, Storage, Config<T>},
+		AuraExt: cumulus_pallet_aura_ext::{Pallet, Storage, Config<T>},
 	}
 }
 
@@ -263,6 +308,16 @@ pub type Executive = frame_executive::Executive<
 >;
 
 impl_runtime_apis! {
+	impl sp_consensus_aura::AuraApi<Block, AuraId> for Runtime {
+		fn slot_duration() -> sp_consensus_aura::SlotDuration {
+			sp_consensus_aura::SlotDuration::from_millis(Aura::slot_duration())
+		}
+
+		fn authorities() -> Vec<AuraId> {
+			Aura::authorities().into_inner()
+		}
+	}
+
 	impl sp_api::Core<Block> for Runtime {
 		fn version() -> RuntimeVersion {
 			VERSION
@@ -328,12 +383,14 @@ impl_runtime_apis! {
 	}
 
 	impl sp_session::SessionKeys<Block> for Runtime {
-		fn decode_session_keys(_: Vec<u8>) -> Option<Vec<(Vec<u8>, sp_core::crypto::KeyTypeId)>> {
-			Some(Vec::new())
+		fn generate_session_keys(seed: Option<Vec<u8>>) -> Vec<u8> {
+			SessionKeys::generate(seed)
 		}
 
-		fn generate_session_keys(_: Option<Vec<u8>>) -> Vec<u8> {
-			Vec::new()
+		fn decode_session_keys(
+			encoded: Vec<u8>,
+		) -> Option<Vec<(Vec<u8>, KeyTypeId)>> {
+			SessionKeys::decode_into_raw_public_keys(&encoded)
 		}
 	}
 
@@ -342,9 +399,19 @@ impl_runtime_apis! {
 			ParachainSystem::collect_collation_info(header)
 		}
 	}
+
+	impl sp_genesis_builder::GenesisBuilder<Block> for Runtime {
+		fn create_default_config() -> Vec<u8> {
+			create_default_config::<RuntimeGenesisConfig>()
+		}
+
+		fn build_config(config: Vec<u8>) -> sp_genesis_builder::Result {
+			build_config::<RuntimeGenesisConfig>(config)
+		}
+	}
 }
 
 cumulus_pallet_parachain_system::register_validate_block! {
 	Runtime = Runtime,
-	BlockExecutor = Executive,
+	BlockExecutor = cumulus_pallet_aura_ext::BlockExecutor::<Runtime, Executive>,
 }
diff --git a/cumulus/parachains/runtimes/starters/shell/src/xcm_config.rs b/cumulus/parachains/runtimes/starters/shell/src/xcm_config.rs
index b1fcfc5c8f664ecb708526359ce779511846347e..ff773ca781612df1e757e343bff49facdad02f41 100644
--- a/cumulus/parachains/runtimes/starters/shell/src/xcm_config.rs
+++ b/cumulus/parachains/runtimes/starters/shell/src/xcm_config.rs
@@ -1,4 +1,4 @@
-// Copyright (C) 2022 Parity Technologies (UK) Ltd.
+// Copyright (C) Parity Technologies (UK) Ltd.
 // SPDX-License-Identifier: Apache-2.0
 
 // Licensed under the Apache License, Version 2.0 (the "License");
diff --git a/cumulus/parachains/runtimes/test-utils/Cargo.toml b/cumulus/parachains/runtimes/test-utils/Cargo.toml
index 6fbda857afd584225582bd031ac19a69354ae221..378d9ea4c42ce27d0541b2c5ef567801d2e32bd3 100644
--- a/cumulus/parachains/runtimes/test-utils/Cargo.toml
+++ b/cumulus/parachains/runtimes/test-utils/Cargo.toml
@@ -1,8 +1,8 @@
 [package]
 name = "parachains-runtimes-test-utils"
 version = "1.0.0"
-authors = ["Parity Technologies <admin@parity.io>"]
-edition = "2021"
+authors.workspace = true
+edition.workspace = true
 description = "Utils for Runtimes testing"
 
 [dependencies]
@@ -34,10 +34,10 @@ cumulus-test-relay-sproof-builder = { path = "../../../test/relay-sproof-builder
 parachain-info = { path = "../../pallets/parachain-info", default-features = false }
 
 # Polkadot
-xcm = { path = "../../../../polkadot/xcm", default-features = false}
-xcm-executor = { path = "../../../../polkadot/xcm/xcm-executor", default-features = false}
+xcm = { package = "staging-xcm", path = "../../../../polkadot/xcm", default-features = false}
+xcm-executor = { package = "staging-xcm-executor", path = "../../../../polkadot/xcm/xcm-executor", default-features = false}
 pallet-xcm = { path = "../../../../polkadot/xcm/pallet-xcm", default-features = false}
-polkadot-parachain = { path = "../../../../polkadot/parachain", default-features = false}
+polkadot-parachain-primitives = { path = "../../../../polkadot/parachain", default-features = false}
 
 [dev-dependencies]
 hex-literal = "0.4.1"
@@ -51,7 +51,6 @@ std = [
 	"assets-common/std",
 	"cumulus-pallet-dmp-queue/std",
 	"cumulus-pallet-parachain-system/std",
-	"cumulus-pallet-parachain-system/std",
 	"cumulus-pallet-xcmp-queue/std",
 	"cumulus-primitives-core/std",
 	"cumulus-primitives-parachain-inherent/std",
@@ -65,8 +64,9 @@ std = [
 	"pallet-xcm/std",
 	"parachain-info/std",
 	"parachains-common/std",
-	"polkadot-parachain/std",
+	"polkadot-parachain-primitives/std",
 	"sp-consensus-aura/std",
+	"sp-core/std",
 	"sp-io/std",
 	"sp-runtime/std",
 	"sp-std/std",
diff --git a/cumulus/parachains/runtimes/test-utils/src/lib.rs b/cumulus/parachains/runtimes/test-utils/src/lib.rs
index 93183a73c22e4753bb3c3eb404fb771a178bf107..8289a80baa11a8542210b7b691765bed05a9a0ae 100644
--- a/cumulus/parachains/runtimes/test-utils/src/lib.rs
+++ b/cumulus/parachains/runtimes/test-utils/src/lib.rs
@@ -22,14 +22,14 @@ use cumulus_primitives_core::{
 use cumulus_primitives_parachain_inherent::ParachainInherentData;
 use cumulus_test_relay_sproof_builder::RelayStateSproofBuilder;
 use frame_support::{
-	dispatch::{DispatchResult, RawOrigin, UnfilteredDispatchable},
+	dispatch::{DispatchResult, RawOrigin},
 	inherent::{InherentData, ProvideInherent},
-	traits::{OnFinalize, OnInitialize, OriginTrait},
+	traits::{OnFinalize, OnInitialize, OriginTrait, UnfilteredDispatchable},
 	weights::Weight,
 };
 use frame_system::pallet_prelude::{BlockNumberFor, HeaderFor};
 use parachains_common::{AccountId, SLOT_DURATION};
-use polkadot_parachain::primitives::{
+use polkadot_parachain_primitives::primitives::{
 	HeadData, HrmpChannelId, RelayChainBlockNumber, XcmpMessageFormat,
 };
 use sp_consensus_aura::{SlotDuration, AURA_ENGINE_ID};
diff --git a/cumulus/parachains/runtimes/testing/penpal/Cargo.toml b/cumulus/parachains/runtimes/testing/penpal/Cargo.toml
index dc945abe79f122b87c0d26a1609219f1554b7175..6c4f8c3895a884010a6018623e98dd3f667c586d 100644
--- a/cumulus/parachains/runtimes/testing/penpal/Cargo.toml
+++ b/cumulus/parachains/runtimes/testing/penpal/Cargo.toml
@@ -5,8 +5,9 @@ authors = ["Anonymous"]
 description = "A parachain for communication back and forth with XCM of assets and uniques."
 license = "Unlicense"
 homepage = "https://substrate.io"
-repository = "https://github.com/paritytech/cumulus/"
-edition = "2021"
+repository.workspace = true
+edition.workspace = true
+publish = false
 
 [package.metadata.docs.rs]
 targets = ["x86_64-unknown-linux-gnu"]
@@ -43,6 +44,7 @@ sp-api = { path = "../../../../../substrate/primitives/api", default-features =
 sp-block-builder = { path = "../../../../../substrate/primitives/block-builder", default-features = false}
 sp-consensus-aura = { path = "../../../../../substrate/primitives/consensus/aura", default-features = false}
 sp-core = { path = "../../../../../substrate/primitives/core", default-features = false}
+sp-genesis-builder = { path = "../../../../../substrate/primitives/genesis-builder", default-features = false }
 sp-inherents = { path = "../../../../../substrate/primitives/inherents", default-features = false}
 sp-offchain = { path = "../../../../../substrate/primitives/offchain", default-features = false}
 sp-runtime = { path = "../../../../../substrate/primitives/runtime", default-features = false}
@@ -55,11 +57,11 @@ sp-version = { path = "../../../../../substrate/primitives/version", default-fea
 # Polkadot
 polkadot-primitives = { path = "../../../../../polkadot/primitives", default-features = false}
 pallet-xcm = { path = "../../../../../polkadot/xcm/pallet-xcm", default-features = false}
-polkadot-parachain = { path = "../../../../../polkadot/parachain", default-features = false}
+polkadot-parachain-primitives = { path = "../../../../../polkadot/parachain", default-features = false}
 polkadot-runtime-common = { path = "../../../../../polkadot/runtime/common", default-features = false}
-xcm = { path = "../../../../../polkadot/xcm", default-features = false}
-xcm-builder = { path = "../../../../../polkadot/xcm/xcm-builder", default-features = false}
-xcm-executor = { path = "../../../../../polkadot/xcm/xcm-executor", default-features = false}
+xcm = { package = "staging-xcm", path = "../../../../../polkadot/xcm", default-features = false}
+xcm-builder = { package = "staging-xcm-builder", path = "../../../../../polkadot/xcm/xcm-builder", default-features = false}
+xcm-executor = { package = "staging-xcm-executor", path = "../../../../../polkadot/xcm/xcm-executor", default-features = false}
 
 # Cumulus
 cumulus-pallet-aura-ext = { path = "../../../../pallets/aura-ext", default-features = false }
@@ -81,14 +83,18 @@ std = [
 	"cumulus-pallet-aura-ext/std",
 	"cumulus-pallet-dmp-queue/std",
 	"cumulus-pallet-parachain-system/std",
+	"cumulus-pallet-session-benchmarking/std",
 	"cumulus-pallet-xcm/std",
 	"cumulus-pallet-xcmp-queue/std",
 	"cumulus-primitives-core/std",
 	"cumulus-primitives-utility/std",
+	"frame-benchmarking?/std",
 	"frame-executive/std",
 	"frame-support/std",
+	"frame-system-benchmarking?/std",
 	"frame-system-rpc-runtime-api/std",
 	"frame-system/std",
+	"frame-try-runtime?/std",
 	"log/std",
 	"pallet-asset-tx-payment/std",
 	"pallet-assets/std",
@@ -104,7 +110,7 @@ std = [
 	"pallet-xcm/std",
 	"parachain-info/std",
 	"parachains-common/std",
-	"polkadot-parachain/std",
+	"polkadot-parachain-primitives/std",
 	"polkadot-primitives/std",
 	"polkadot-runtime-common/std",
 	"scale-info/std",
@@ -112,11 +118,13 @@ std = [
 	"sp-block-builder/std",
 	"sp-consensus-aura/std",
 	"sp-core/std",
+	"sp-genesis-builder/std",
 	"sp-inherents/std",
 	"sp-offchain/std",
 	"sp-runtime/std",
 	"sp-session/std",
 	"sp-std/std",
+	"sp-storage/std",
 	"sp-transaction-pool/std",
 	"sp-version/std",
 	"substrate-wasm-builder",
@@ -126,21 +134,29 @@ std = [
 ]
 
 runtime-benchmarks = [
+	"cumulus-pallet-parachain-system/runtime-benchmarks",
 	"cumulus-pallet-session-benchmarking/runtime-benchmarks",
 	"cumulus-pallet-xcmp-queue/runtime-benchmarks",
+	"cumulus-primitives-utility/runtime-benchmarks",
 	"frame-benchmarking/runtime-benchmarks",
 	"frame-support/runtime-benchmarks",
 	"frame-system-benchmarking/runtime-benchmarks",
 	"frame-system/runtime-benchmarks",
 	"hex-literal",
+	"pallet-asset-tx-payment/runtime-benchmarks",
 	"pallet-assets/runtime-benchmarks",
 	"pallet-balances/runtime-benchmarks",
 	"pallet-collator-selection/runtime-benchmarks",
 	"pallet-sudo/runtime-benchmarks",
 	"pallet-timestamp/runtime-benchmarks",
 	"pallet-xcm/runtime-benchmarks",
+	"parachains-common/runtime-benchmarks",
+	"polkadot-parachain-primitives/runtime-benchmarks",
+	"polkadot-primitives/runtime-benchmarks",
+	"polkadot-runtime-common/runtime-benchmarks",
 	"sp-runtime/runtime-benchmarks",
 	"xcm-builder/runtime-benchmarks",
+	"xcm-executor/runtime-benchmarks",
 ]
 
 try-runtime = [
@@ -150,6 +166,7 @@ try-runtime = [
 	"cumulus-pallet-xcm/try-runtime",
 	"cumulus-pallet-xcmp-queue/try-runtime",
 	"frame-executive/try-runtime",
+	"frame-support/try-runtime",
 	"frame-system/try-runtime",
 	"frame-try-runtime/try-runtime",
 	"pallet-asset-tx-payment/try-runtime",
@@ -164,6 +181,8 @@ try-runtime = [
 	"pallet-transaction-payment/try-runtime",
 	"pallet-xcm/try-runtime",
 	"parachain-info/try-runtime",
+	"polkadot-runtime-common/try-runtime",
+	"sp-runtime/try-runtime",
 ]
 
 experimental = [ "pallet-aura/experimental" ]
diff --git a/cumulus/parachains/runtimes/testing/penpal/build.rs b/cumulus/parachains/runtimes/testing/penpal/build.rs
index 256e9fb765b7c6a152bbb229e9318e16d81b9ea7..9c9cde9a25a1a8ab1780b7df7e068264459a31af 100644
--- a/cumulus/parachains/runtimes/testing/penpal/build.rs
+++ b/cumulus/parachains/runtimes/testing/penpal/build.rs
@@ -1,4 +1,4 @@
-// Copyright 2019-2021 Parity Technologies (UK) Ltd.
+// Copyright (C) Parity Technologies (UK) Ltd.
 // This file is part of Cumulus.
 
 // Substrate is free software: you can redistribute it and/or modify
diff --git a/cumulus/parachains/runtimes/testing/penpal/src/lib.rs b/cumulus/parachains/runtimes/testing/penpal/src/lib.rs
index 4bc7dfacc053c422b1a56c8c520d9f783575db78..fe0f19c306321e8c8f22d1225611ac6281f44340 100644
--- a/cumulus/parachains/runtimes/testing/penpal/src/lib.rs
+++ b/cumulus/parachains/runtimes/testing/penpal/src/lib.rs
@@ -1,4 +1,4 @@
-// Copyright 2019-2023 Parity Technologies (UK) Ltd.
+// Copyright (C) Parity Technologies (UK) Ltd.
 // This file is part of Cumulus.
 
 // Cumulus is free software: you can redistribute it and/or modify
@@ -36,6 +36,7 @@ use cumulus_pallet_parachain_system::RelayNumberStrictlyIncreases;
 use frame_support::{
 	construct_runtime,
 	dispatch::DispatchClass,
+	genesis_builder_helper::{build_config, create_default_config},
 	pallet_prelude::Weight,
 	parameter_types,
 	traits::{AsEnsureOriginWithArg, ConstBool, ConstU32, ConstU64, ConstU8, Everything},
@@ -832,6 +833,16 @@ impl_runtime_apis! {
 			Ok(batches)
 		}
 	}
+
+	impl sp_genesis_builder::GenesisBuilder<Block> for Runtime {
+		fn create_default_config() -> Vec<u8> {
+			create_default_config::<RuntimeGenesisConfig>()
+		}
+
+		fn build_config(config: Vec<u8>) -> sp_genesis_builder::Result {
+			build_config::<RuntimeGenesisConfig>(config)
+		}
+	}
 }
 
 cumulus_pallet_parachain_system::register_validate_block! {
diff --git a/cumulus/parachains/runtimes/testing/penpal/src/weights/block_weights.rs b/cumulus/parachains/runtimes/testing/penpal/src/weights/block_weights.rs
index b2092d875c8328210667da4cbb95de0642e60ae3..e7fdb2aae2a01ec06076de83d94817e540e205dd 100644
--- a/cumulus/parachains/runtimes/testing/penpal/src/weights/block_weights.rs
+++ b/cumulus/parachains/runtimes/testing/penpal/src/weights/block_weights.rs
@@ -1,6 +1,6 @@
 // This file is part of Substrate.
 
-// Copyright (C) 2022 Parity Technologies (UK) Ltd.
+// Copyright (C) Parity Technologies (UK) Ltd.
 // SPDX-License-Identifier: Apache-2.0
 
 // Licensed under the Apache License, Version 2.0 (the "License");
diff --git a/cumulus/parachains/runtimes/testing/penpal/src/weights/extrinsic_weights.rs b/cumulus/parachains/runtimes/testing/penpal/src/weights/extrinsic_weights.rs
index 332c3b324bb9c1b386257bf7953d37aba8f5af13..1a4adb968bb7195428ea00d59cd92dcd3b6eea5f 100644
--- a/cumulus/parachains/runtimes/testing/penpal/src/weights/extrinsic_weights.rs
+++ b/cumulus/parachains/runtimes/testing/penpal/src/weights/extrinsic_weights.rs
@@ -1,6 +1,6 @@
 // This file is part of Substrate.
 
-// Copyright (C) 2022 Parity Technologies (UK) Ltd.
+// Copyright (C) Parity Technologies (UK) Ltd.
 // SPDX-License-Identifier: Apache-2.0
 
 // Licensed under the Apache License, Version 2.0 (the "License");
diff --git a/cumulus/parachains/runtimes/testing/penpal/src/weights/mod.rs b/cumulus/parachains/runtimes/testing/penpal/src/weights/mod.rs
index ed0b4dbcd47fbffb125bda4b337099ae69e51ce2..30fa2c4060689ff98cc427c84f81866172845e52 100644
--- a/cumulus/parachains/runtimes/testing/penpal/src/weights/mod.rs
+++ b/cumulus/parachains/runtimes/testing/penpal/src/weights/mod.rs
@@ -1,6 +1,6 @@
 // This file is part of Substrate.
 
-// Copyright (C) 2022 Parity Technologies (UK) Ltd.
+// Copyright (C) Parity Technologies (UK) Ltd.
 // SPDX-License-Identifier: Apache-2.0
 
 // Licensed under the Apache License, Version 2.0 (the "License");
diff --git a/cumulus/parachains/runtimes/testing/penpal/src/weights/paritydb_weights.rs b/cumulus/parachains/runtimes/testing/penpal/src/weights/paritydb_weights.rs
index 4338d928d807a41cc60ec91d86e91c81bb253631..25679703831a13b8d1bb7fb7dd4d92fa84b1f255 100644
--- a/cumulus/parachains/runtimes/testing/penpal/src/weights/paritydb_weights.rs
+++ b/cumulus/parachains/runtimes/testing/penpal/src/weights/paritydb_weights.rs
@@ -1,6 +1,6 @@
 // This file is part of Substrate.
 
-// Copyright (C) 2022 Parity Technologies (UK) Ltd.
+// Copyright (C) Parity Technologies (UK) Ltd.
 // SPDX-License-Identifier: Apache-2.0
 
 // Licensed under the Apache License, Version 2.0 (the "License");
diff --git a/cumulus/parachains/runtimes/testing/penpal/src/weights/rocksdb_weights.rs b/cumulus/parachains/runtimes/testing/penpal/src/weights/rocksdb_weights.rs
index 1d115d963facb39fe29d6258918fda3bc8d94900..3dd817aa6f137085b0e5fdf2b11b7f50e5c8b002 100644
--- a/cumulus/parachains/runtimes/testing/penpal/src/weights/rocksdb_weights.rs
+++ b/cumulus/parachains/runtimes/testing/penpal/src/weights/rocksdb_weights.rs
@@ -1,6 +1,6 @@
 // This file is part of Substrate.
 
-// Copyright (C) 2022 Parity Technologies (UK) Ltd.
+// Copyright (C) Parity Technologies (UK) Ltd.
 // SPDX-License-Identifier: Apache-2.0
 
 // Licensed under the Apache License, Version 2.0 (the "License");
diff --git a/cumulus/parachains/runtimes/testing/penpal/src/xcm_config.rs b/cumulus/parachains/runtimes/testing/penpal/src/xcm_config.rs
index 1825bea425d2abf4c1fb9abc9d0259d0dc9b9f18..f2ffc451b10ef2f2b0f37983bb3fc633a020193f 100644
--- a/cumulus/parachains/runtimes/testing/penpal/src/xcm_config.rs
+++ b/cumulus/parachains/runtimes/testing/penpal/src/xcm_config.rs
@@ -1,4 +1,4 @@
-// Copyright 2019-2022 Parity Technologies (UK) Ltd.
+// Copyright (C) Parity Technologies (UK) Ltd.
 // This file is part of Cumulus.
 
 // Cumulus is free software: you can redistribute it and/or modify
@@ -39,7 +39,7 @@ use frame_support::{
 use frame_system::EnsureRoot;
 use pallet_asset_tx_payment::HandleCredit;
 use pallet_xcm::XcmPassthrough;
-use polkadot_parachain::primitives::Sibling;
+use polkadot_parachain_primitives::primitives::Sibling;
 use polkadot_runtime_common::impls::ToAuthor;
 use sp_runtime::traits::Zero;
 use xcm::latest::prelude::*;
@@ -163,7 +163,7 @@ pub type Barrier = TrailingSetTopicAsId<
 					// If the message is one that immediately attemps to pay for execution, then
 					// allow it.
 					AllowTopLevelPaidExecutionFrom<Everything>,
-					// Common Good Assets parachain, parent and its exec plurality get free
+					// System Assets parachain, parent and its exec plurality get free
 					// execution
 					AllowExplicitUnpaidExecutionFrom<(
 						CommonGoodAssetsParachain,
diff --git a/cumulus/parachains/runtimes/testing/rococo-parachain/Cargo.toml b/cumulus/parachains/runtimes/testing/rococo-parachain/Cargo.toml
index 9a16d3d9e69291da6925380e4c0af43b7c5d3ddb..029d5d10f98684d20f8917af3d90a4df29f3410e 100644
--- a/cumulus/parachains/runtimes/testing/rococo-parachain/Cargo.toml
+++ b/cumulus/parachains/runtimes/testing/rococo-parachain/Cargo.toml
@@ -1,9 +1,10 @@
 [package]
 name = "rococo-parachain-runtime"
 version = "0.1.0"
-authors = ["Parity Technologies <admin@parity.io>"]
-edition = "2021"
+authors.workspace = true
+edition.workspace = true
 description = "Simple runtime used by the rococo parachain(s)"
+publish = false
 
 [dependencies]
 codec = { package = "parity-scale-codec", version = "3.0.0", default-features = false, features = ["derive"] }
@@ -26,6 +27,7 @@ sp-api = { path = "../../../../../substrate/primitives/api", default-features =
 sp-block-builder = { path = "../../../../../substrate/primitives/block-builder", default-features = false}
 sp-consensus-aura = { path = "../../../../../substrate/primitives/consensus/aura", default-features = false}
 sp-core = { path = "../../../../../substrate/primitives/core", default-features = false}
+sp-genesis-builder = { path = "../../../../../substrate/primitives/genesis-builder", default-features = false }
 sp-inherents = { path = "../../../../../substrate/primitives/inherents", default-features = false}
 sp-offchain = { path = "../../../../../substrate/primitives/offchain", default-features = false}
 sp-runtime = { path = "../../../../../substrate/primitives/runtime", default-features = false}
@@ -36,10 +38,10 @@ sp-version = { path = "../../../../../substrate/primitives/version", default-fea
 
 # Polkadot
 pallet-xcm = { path = "../../../../../polkadot/xcm/pallet-xcm", default-features = false}
-polkadot-parachain = { path = "../../../../../polkadot/parachain", default-features = false}
-xcm = { path = "../../../../../polkadot/xcm", default-features = false}
-xcm-builder = { path = "../../../../../polkadot/xcm/xcm-builder", default-features = false}
-xcm-executor = { path = "../../../../../polkadot/xcm/xcm-executor", default-features = false}
+polkadot-parachain-primitives = { path = "../../../../../polkadot/parachain", default-features = false}
+xcm = { package = "staging-xcm", path = "../../../../../polkadot/xcm", default-features = false}
+xcm-builder = { package = "staging-xcm-builder", path = "../../../../../polkadot/xcm/xcm-builder", default-features = false}
+xcm-executor = { package = "staging-xcm-executor", path = "../../../../../polkadot/xcm/xcm-executor", default-features = false}
 
 # Cumulus
 cumulus-pallet-aura-ext = { path = "../../../../pallets/aura-ext", default-features = false }
@@ -68,6 +70,7 @@ std = [
 	"cumulus-ping/std",
 	"cumulus-primitives-core/std",
 	"cumulus-primitives-utility/std",
+	"frame-benchmarking?/std",
 	"frame-executive/std",
 	"frame-support/std",
 	"frame-system-rpc-runtime-api/std",
@@ -82,11 +85,13 @@ std = [
 	"pallet-xcm/std",
 	"parachain-info/std",
 	"parachains-common/std",
+	"polkadot-parachain-primitives/std",
 	"scale-info/std",
 	"sp-api/std",
 	"sp-block-builder/std",
 	"sp-consensus-aura/std",
 	"sp-core/std",
+	"sp-genesis-builder/std",
 	"sp-inherents/std",
 	"sp-offchain/std",
 	"sp-runtime/std",
@@ -100,10 +105,22 @@ std = [
 	"xcm/std",
 ]
 runtime-benchmarks = [
+	"cumulus-pallet-parachain-system/runtime-benchmarks",
+	"cumulus-pallet-xcmp-queue/runtime-benchmarks",
+	"cumulus-primitives-utility/runtime-benchmarks",
 	"frame-benchmarking/runtime-benchmarks",
+	"frame-support/runtime-benchmarks",
+	"frame-system/runtime-benchmarks",
 	"pallet-assets/runtime-benchmarks",
+	"pallet-balances/runtime-benchmarks",
+	"pallet-sudo/runtime-benchmarks",
+	"pallet-timestamp/runtime-benchmarks",
 	"pallet-xcm/runtime-benchmarks",
+	"parachains-common/runtime-benchmarks",
+	"polkadot-parachain-primitives/runtime-benchmarks",
+	"sp-runtime/runtime-benchmarks",
 	"xcm-builder/runtime-benchmarks",
+	"xcm-executor/runtime-benchmarks",
 ]
 
 experimental = [ "pallet-aura/experimental" ]
diff --git a/cumulus/parachains/runtimes/testing/rococo-parachain/src/lib.rs b/cumulus/parachains/runtimes/testing/rococo-parachain/src/lib.rs
index d01c66e772d79f65879e51d6d87bb0bfd449d1c4..50c5a445c25fe0c2c0e09b4979539e9a5f0146c0 100644
--- a/cumulus/parachains/runtimes/testing/rococo-parachain/src/lib.rs
+++ b/cumulus/parachains/runtimes/testing/rococo-parachain/src/lib.rs
@@ -1,4 +1,4 @@
-// Copyright 2019-2022 Parity Technologies (UK) Ltd.
+// Copyright (C) Parity Technologies (UK) Ltd.
 // This file is part of Cumulus.
 
 // Cumulus is free software: you can redistribute it and/or modify
@@ -40,6 +40,7 @@ use sp_version::RuntimeVersion;
 pub use frame_support::{
 	construct_runtime,
 	dispatch::DispatchClass,
+	genesis_builder_helper::{build_config, create_default_config},
 	match_types, parameter_types,
 	traits::{
 		AsEnsureOriginWithArg, ConstBool, ConstU32, ConstU64, ConstU8, EitherOfDiverse, Everything,
@@ -76,7 +77,7 @@ use xcm_executor::traits::JustTry;
 
 // XCM imports
 use pallet_xcm::{EnsureXcm, IsMajorityOfBody, XcmPassthrough};
-use polkadot_parachain::primitives::Sibling;
+use polkadot_parachain_primitives::primitives::Sibling;
 use xcm::latest::prelude::*;
 use xcm_builder::{
 	AccountId32Aliases, AllowExplicitUnpaidExecutionFrom, AllowTopLevelPaidExecutionFrom,
@@ -796,6 +797,16 @@ impl_runtime_apis! {
 			ParachainSystem::collect_collation_info(header)
 		}
 	}
+
+	impl sp_genesis_builder::GenesisBuilder<Block> for Runtime {
+		fn create_default_config() -> Vec<u8> {
+			create_default_config::<RuntimeGenesisConfig>()
+		}
+
+		fn build_config(config: Vec<u8>) -> sp_genesis_builder::Result {
+			build_config::<RuntimeGenesisConfig>(config)
+		}
+	}
 }
 
 cumulus_pallet_parachain_system::register_validate_block! {
diff --git a/cumulus/polkadot-parachain/Cargo.toml b/cumulus/polkadot-parachain/Cargo.toml
index ad7c6e19ac355bec5e05c9ddd3842edc08ff9f77..778b056b89d15b79d4da045e94c660f7960ba102 100644
--- a/cumulus/polkadot-parachain/Cargo.toml
+++ b/cumulus/polkadot-parachain/Cargo.toml
@@ -1,9 +1,9 @@
 [package]
 name = "polkadot-parachain-bin"
-version = "1.0.0"
-authors = ["Parity Technologies <admin@parity.io>"]
+version = "1.1.0"
+authors.workspace = true
 build = "build.rs"
-edition = "2021"
+edition.workspace = true
 description = "Runs a polkadot parachain node which could be a collator."
 
 [[bin]]
@@ -12,13 +12,13 @@ path = "src/main.rs"
 
 [dependencies]
 async-trait = "0.1.73"
-clap = { version = "4.3.24", features = ["derive"] }
+clap = { version = "4.4.6", features = ["derive"] }
 codec = { package = "parity-scale-codec", version = "3.0.0" }
 futures = "0.3.28"
 hex-literal = "0.4.1"
 log = "0.4.20"
-serde = { version = "1.0.183", features = ["derive"] }
-serde_json = "1.0.105"
+serde = { version = "1.0.188", features = ["derive"] }
+serde_json = "1.0.107"
 
 # Local
 rococo-parachain-runtime = { path = "../parachains/runtimes/testing/rococo-parachain" }
@@ -77,7 +77,7 @@ substrate-state-trie-migration-rpc = { path = "../../substrate/utils/frame/rpc/s
 polkadot-cli = { path = "../../polkadot/cli", features = ["rococo-native"] }
 polkadot-primitives = { path = "../../polkadot/primitives" }
 polkadot-service = { path = "../../polkadot/node/service" }
-xcm = { path = "../../polkadot/xcm" }
+xcm = { package = "staging-xcm", path = "../../polkadot/xcm" }
 
 # Cumulus
 cumulus-client-cli = { path = "../client/cli" }
@@ -87,6 +87,7 @@ cumulus-client-consensus-relay-chain = { path = "../client/consensus/relay-chain
 cumulus-client-consensus-common = { path = "../client/consensus/common" }
 cumulus-client-consensus-proposer = { path = "../client/consensus/proposer" }
 cumulus-client-service = { path = "../client/service" }
+cumulus-primitives-aura = { path = "../primitives/aura" }
 cumulus-primitives-core = { path = "../primitives/core" }
 cumulus-primitives-parachain-inherent = { path = "../primitives/parachain-inherent" }
 cumulus-relay-chain-interface = { path = "../client/relay-chain-interface" }
@@ -113,14 +114,31 @@ runtime-benchmarks = [
 	"bridge-hub-rococo-runtime/runtime-benchmarks",
 	"collectives-polkadot-runtime/runtime-benchmarks",
 	"contracts-rococo-runtime/runtime-benchmarks",
-	"contracts-rococo-runtime/runtime-benchmarks",
+	"frame-benchmarking-cli/runtime-benchmarks",
+	"frame-benchmarking/runtime-benchmarks",
+	"glutton-runtime/runtime-benchmarks",
+	"parachains-common/runtime-benchmarks",
 	"penpal-runtime/runtime-benchmarks",
+	"polkadot-cli/runtime-benchmarks",
+	"polkadot-primitives/runtime-benchmarks",
 	"polkadot-service/runtime-benchmarks",
 	"rococo-parachain-runtime/runtime-benchmarks",
+	"sc-service/runtime-benchmarks",
+	"sp-runtime/runtime-benchmarks",
 ]
 try-runtime = [
 	"asset-hub-kusama-runtime/try-runtime",
 	"asset-hub-polkadot-runtime/try-runtime",
 	"asset-hub-westend-runtime/try-runtime",
+	"bridge-hub-kusama-runtime/try-runtime",
+	"bridge-hub-polkadot-runtime/try-runtime",
+	"bridge-hub-rococo-runtime/try-runtime",
+	"collectives-polkadot-runtime/try-runtime",
+	"contracts-rococo-runtime/try-runtime",
+	"glutton-runtime/try-runtime",
+	"penpal-runtime/try-runtime",
+	"polkadot-cli/try-runtime",
+	"polkadot-service/try-runtime",
 	"shell-runtime/try-runtime",
+	"sp-runtime/try-runtime",
 ]
diff --git a/cumulus/polkadot-parachain/build.rs b/cumulus/polkadot-parachain/build.rs
index ae164d6cb0f4264a96e264c61de8b4cf00b909bc..dd0d112bca7018bac1ca250d9efc3a3972b6ca41 100644
--- a/cumulus/polkadot-parachain/build.rs
+++ b/cumulus/polkadot-parachain/build.rs
@@ -1,4 +1,4 @@
-// Copyright 2019-2021 Parity Technologies (UK) Ltd.
+// Copyright (C) Parity Technologies (UK) Ltd.
 // This file is part of Cumulus.
 
 // Substrate is free software: you can redistribute it and/or modify
diff --git a/cumulus/polkadot-parachain/chain-specs/asset-hub-kusama.json b/cumulus/polkadot-parachain/chain-specs/asset-hub-kusama.json
new file mode 120000
index 0000000000000000000000000000000000000000..89a3015b50aad9f65910327732c3cee6f5ed837a
--- /dev/null
+++ b/cumulus/polkadot-parachain/chain-specs/asset-hub-kusama.json
@@ -0,0 +1 @@
+../../parachains/chain-specs/asset-hub-kusama.json
\ No newline at end of file
diff --git a/cumulus/polkadot-parachain/chain-specs/asset-hub-polkadot.json b/cumulus/polkadot-parachain/chain-specs/asset-hub-polkadot.json
new file mode 120000
index 0000000000000000000000000000000000000000..43a1cb41131af77676d78a2ec71b95c59fd46eda
--- /dev/null
+++ b/cumulus/polkadot-parachain/chain-specs/asset-hub-polkadot.json
@@ -0,0 +1 @@
+../../parachains/chain-specs/asset-hub-polkadot.json
\ No newline at end of file
diff --git a/cumulus/polkadot-parachain/chain-specs/asset-hub-westend.json b/cumulus/polkadot-parachain/chain-specs/asset-hub-westend.json
new file mode 120000
index 0000000000000000000000000000000000000000..03742c401622a34c444b57433e31cfdfd4ee75a8
--- /dev/null
+++ b/cumulus/polkadot-parachain/chain-specs/asset-hub-westend.json
@@ -0,0 +1 @@
+../../parachains/chain-specs/asset-hub-westend.json
\ No newline at end of file
diff --git a/cumulus/polkadot-parachain/chain-specs/bridge-hub-kusama.json b/cumulus/polkadot-parachain/chain-specs/bridge-hub-kusama.json
new file mode 120000
index 0000000000000000000000000000000000000000..fc91654c6ff4098675485eb6a114fd5f636b04b9
--- /dev/null
+++ b/cumulus/polkadot-parachain/chain-specs/bridge-hub-kusama.json
@@ -0,0 +1 @@
+../../parachains/chain-specs/bridge-hub-kusama.json
\ No newline at end of file
diff --git a/cumulus/polkadot-parachain/chain-specs/bridge-hub-polkadot.json b/cumulus/polkadot-parachain/chain-specs/bridge-hub-polkadot.json
new file mode 120000
index 0000000000000000000000000000000000000000..df22d3e8800157c5dfbedca008cac4c971b83ef6
--- /dev/null
+++ b/cumulus/polkadot-parachain/chain-specs/bridge-hub-polkadot.json
@@ -0,0 +1 @@
+../../parachains/chain-specs/bridge-hub-polkadot.json
\ No newline at end of file
diff --git a/cumulus/polkadot-parachain/chain-specs/bridge-hub-rococo.json b/cumulus/polkadot-parachain/chain-specs/bridge-hub-rococo.json
new file mode 120000
index 0000000000000000000000000000000000000000..8970d92bcf5135e7578fe50b5c2af2e257131669
--- /dev/null
+++ b/cumulus/polkadot-parachain/chain-specs/bridge-hub-rococo.json
@@ -0,0 +1 @@
+../../parachains/chain-specs/bridge-hub-rococo.json
\ No newline at end of file
diff --git a/cumulus/polkadot-parachain/chain-specs/bridge-hub-westend.json b/cumulus/polkadot-parachain/chain-specs/bridge-hub-westend.json
new file mode 120000
index 0000000000000000000000000000000000000000..9f9e4dad5c18510904dc3cff01d27978575b9e6c
--- /dev/null
+++ b/cumulus/polkadot-parachain/chain-specs/bridge-hub-westend.json
@@ -0,0 +1 @@
+../../parachains/chain-specs/bridge-hub-westend.json
\ No newline at end of file
diff --git a/cumulus/polkadot-parachain/chain-specs/bridge-hub-wococo.json b/cumulus/polkadot-parachain/chain-specs/bridge-hub-wococo.json
new file mode 120000
index 0000000000000000000000000000000000000000..e13ab77265d59d31fcf822420413d3b5240bf574
--- /dev/null
+++ b/cumulus/polkadot-parachain/chain-specs/bridge-hub-wococo.json
@@ -0,0 +1 @@
+../../parachains/chain-specs/bridge-hub-wococo.json
\ No newline at end of file
diff --git a/cumulus/polkadot-parachain/chain-specs/collectives-polkadot.json b/cumulus/polkadot-parachain/chain-specs/collectives-polkadot.json
new file mode 120000
index 0000000000000000000000000000000000000000..afece75567be9a10e4beed8799e5acd854d923bb
--- /dev/null
+++ b/cumulus/polkadot-parachain/chain-specs/collectives-polkadot.json
@@ -0,0 +1 @@
+../../parachains/chain-specs/collectives-polkadot.json
\ No newline at end of file
diff --git a/cumulus/polkadot-parachain/chain-specs/collectives-westend.json b/cumulus/polkadot-parachain/chain-specs/collectives-westend.json
new file mode 120000
index 0000000000000000000000000000000000000000..84e23b06fb4c5f44990b22922403c9f6ac5d6fb6
--- /dev/null
+++ b/cumulus/polkadot-parachain/chain-specs/collectives-westend.json
@@ -0,0 +1 @@
+../../parachains/chain-specs/collectives-westend.json
\ No newline at end of file
diff --git a/cumulus/polkadot-parachain/chain-specs/contracts-rococo.json b/cumulus/polkadot-parachain/chain-specs/contracts-rococo.json
new file mode 120000
index 0000000000000000000000000000000000000000..b9f8e8f31e84587c8bb148b96eefff3d7f87d682
--- /dev/null
+++ b/cumulus/polkadot-parachain/chain-specs/contracts-rococo.json
@@ -0,0 +1 @@
+../../parachains/chain-specs/contracts-rococo.json
\ No newline at end of file
diff --git a/cumulus/polkadot-parachain/chain-specs/tick.json b/cumulus/polkadot-parachain/chain-specs/tick.json
new file mode 120000
index 0000000000000000000000000000000000000000..47c93a98405349f8aad7bd45e60edd4f2bc33da5
--- /dev/null
+++ b/cumulus/polkadot-parachain/chain-specs/tick.json
@@ -0,0 +1 @@
+../../parachains/chain-specs/tick.json
\ No newline at end of file
diff --git a/cumulus/polkadot-parachain/chain-specs/track.json b/cumulus/polkadot-parachain/chain-specs/track.json
new file mode 120000
index 0000000000000000000000000000000000000000..9474c223a9469113a58b0a3e601df43397897638
--- /dev/null
+++ b/cumulus/polkadot-parachain/chain-specs/track.json
@@ -0,0 +1 @@
+../../parachains/chain-specs/track.json
\ No newline at end of file
diff --git a/cumulus/polkadot-parachain/chain-specs/trick.json b/cumulus/polkadot-parachain/chain-specs/trick.json
new file mode 120000
index 0000000000000000000000000000000000000000..de1fb9edf3070fd167ccc3ea866e3cc1cc652a5d
--- /dev/null
+++ b/cumulus/polkadot-parachain/chain-specs/trick.json
@@ -0,0 +1 @@
+../../parachains/chain-specs/trick.json
\ No newline at end of file
diff --git a/cumulus/polkadot-parachain/src/chain_spec/asset_hubs.rs b/cumulus/polkadot-parachain/src/chain_spec/asset_hubs.rs
index 0523c3b7e65fb0037ceda16ae6066ba8d82c70a8..c1edeb98cd0aa3b50e1c8efbe47085144f70900e 100644
--- a/cumulus/polkadot-parachain/src/chain_spec/asset_hubs.rs
+++ b/cumulus/polkadot-parachain/src/chain_spec/asset_hubs.rs
@@ -1,4 +1,4 @@
-// Copyright 2019-2022 Parity Technologies (UK) Ltd.
+// Copyright (C) Parity Technologies (UK) Ltd.
 // This file is part of Cumulus.
 
 // Cumulus is free software: you can redistribute it and/or modify
@@ -32,11 +32,11 @@ pub type AssetHubWestendChainSpec =
 	sc_service::GenericChainSpec<asset_hub_westend_runtime::RuntimeGenesisConfig, Extensions>;
 
 const ASSET_HUB_POLKADOT_ED: AssetHubBalance =
-	asset_hub_polkadot_runtime::constants::currency::EXISTENTIAL_DEPOSIT;
+	parachains_common::polkadot::currency::EXISTENTIAL_DEPOSIT;
 const ASSET_HUB_KUSAMA_ED: AssetHubBalance =
-	asset_hub_kusama_runtime::constants::currency::EXISTENTIAL_DEPOSIT;
+	parachains_common::kusama::currency::EXISTENTIAL_DEPOSIT;
 const ASSET_HUB_WESTEND_ED: AssetHubBalance =
-	asset_hub_westend_runtime::constants::currency::EXISTENTIAL_DEPOSIT;
+	parachains_common::westend::currency::EXISTENTIAL_DEPOSIT;
 
 /// Generate the session keys from individual elements.
 ///
diff --git a/cumulus/polkadot-parachain/src/chain_spec/bridge_hubs.rs b/cumulus/polkadot-parachain/src/chain_spec/bridge_hubs.rs
index 911368073d59e3c8626226cf065cff690111ae24..5de4a49f8275122c3c86fbf18409068a653ce054 100644
--- a/cumulus/polkadot-parachain/src/chain_spec/bridge_hubs.rs
+++ b/cumulus/polkadot-parachain/src/chain_spec/bridge_hubs.rs
@@ -1,4 +1,4 @@
-// Copyright 2022 Parity Technologies (UK) Ltd.
+// Copyright (C) Parity Technologies (UK) Ltd.
 // This file is part of Cumulus.
 
 // Cumulus is free software: you can redistribute it and/or modify
@@ -97,7 +97,7 @@ impl BridgeHubRuntimeType {
 		match self {
 			BridgeHubRuntimeType::Polkadot =>
 				Ok(Box::new(polkadot::BridgeHubChainSpec::from_json_bytes(
-					&include_bytes!("../../../parachains/chain-specs/bridge-hub-polkadot.json")[..],
+					&include_bytes!("../../chain-specs/bridge-hub-polkadot.json")[..],
 				)?)),
 			BridgeHubRuntimeType::PolkadotLocal => Ok(Box::new(polkadot::local_config(
 				polkadot::BRIDGE_HUB_POLKADOT_LOCAL,
@@ -113,7 +113,7 @@ impl BridgeHubRuntimeType {
 			))),
 			BridgeHubRuntimeType::Kusama =>
 				Ok(Box::new(kusama::BridgeHubChainSpec::from_json_bytes(
-					&include_bytes!("../../../parachains/chain-specs/bridge-hub-kusama.json")[..],
+					&include_bytes!("../../chain-specs/bridge-hub-kusama.json")[..],
 				)?)),
 			BridgeHubRuntimeType::KusamaLocal => Ok(Box::new(kusama::local_config(
 				kusama::BRIDGE_HUB_KUSAMA_LOCAL,
@@ -129,11 +129,11 @@ impl BridgeHubRuntimeType {
 			))),
 			BridgeHubRuntimeType::Westend =>
 				Ok(Box::new(westend::BridgeHubChainSpec::from_json_bytes(
-					&include_bytes!("../../../parachains/chain-specs/bridge-hub-westend.json")[..],
+					&include_bytes!("../../chain-specs/bridge-hub-westend.json")[..],
 				)?)),
 			BridgeHubRuntimeType::Rococo =>
 				Ok(Box::new(rococo::BridgeHubChainSpec::from_json_bytes(
-					&include_bytes!("../../../parachains/chain-specs/bridge-hub-rococo.json")[..],
+					&include_bytes!("../../chain-specs/bridge-hub-rococo.json")[..],
 				)?)),
 			BridgeHubRuntimeType::RococoLocal => Ok(Box::new(rococo::local_config(
 				rococo::BRIDGE_HUB_ROCOCO_LOCAL,
@@ -153,7 +153,7 @@ impl BridgeHubRuntimeType {
 			))),
 			BridgeHubRuntimeType::Wococo =>
 				Ok(Box::new(wococo::BridgeHubChainSpec::from_json_bytes(
-					&include_bytes!("../../../parachains/chain-specs/bridge-hub-wococo.json")[..],
+					&include_bytes!("../../chain-specs/bridge-hub-wococo.json")[..],
 				)?)),
 			BridgeHubRuntimeType::WococoLocal => Ok(Box::new(wococo::local_config(
 				wococo::BRIDGE_HUB_WOCOCO_LOCAL,
@@ -192,7 +192,7 @@ pub mod rococo {
 	pub(crate) const BRIDGE_HUB_ROCOCO_LOCAL: &str = "bridge-hub-rococo-local";
 	pub(crate) const BRIDGE_HUB_ROCOCO_DEVELOPMENT: &str = "bridge-hub-rococo-dev";
 	const BRIDGE_HUB_ROCOCO_ED: BridgeHubBalance =
-		bridge_hub_rococo_runtime::constants::currency::EXISTENTIAL_DEPOSIT;
+		parachains_common::rococo::currency::EXISTENTIAL_DEPOSIT;
 
 	/// Specialized `ChainSpec` for the normal parachain runtime.
 	pub type BridgeHubChainSpec =
@@ -372,7 +372,7 @@ pub mod kusama {
 	pub(crate) const BRIDGE_HUB_KUSAMA_LOCAL: &str = "bridge-hub-kusama-local";
 	pub(crate) const BRIDGE_HUB_KUSAMA_DEVELOPMENT: &str = "bridge-hub-kusama-dev";
 	const BRIDGE_HUB_KUSAMA_ED: BridgeHubBalance =
-		bridge_hub_kusama_runtime::constants::currency::EXISTENTIAL_DEPOSIT;
+		parachains_common::kusama::currency::EXISTENTIAL_DEPOSIT;
 
 	/// Specialized `ChainSpec` for the normal parachain runtime.
 	pub type BridgeHubChainSpec =
@@ -509,7 +509,7 @@ pub mod polkadot {
 	pub(crate) const BRIDGE_HUB_POLKADOT_LOCAL: &str = "bridge-hub-polkadot-local";
 	pub(crate) const BRIDGE_HUB_POLKADOT_DEVELOPMENT: &str = "bridge-hub-polkadot-dev";
 	const BRIDGE_HUB_POLKADOT_ED: BridgeHubBalance =
-		bridge_hub_polkadot_runtime::constants::currency::EXISTENTIAL_DEPOSIT;
+		parachains_common::polkadot::currency::EXISTENTIAL_DEPOSIT;
 
 	/// Specialized `ChainSpec` for the normal parachain runtime.
 	pub type BridgeHubChainSpec =
diff --git a/cumulus/polkadot-parachain/src/chain_spec/collectives.rs b/cumulus/polkadot-parachain/src/chain_spec/collectives.rs
index 82c925c5d493b0d5234a59a582e03db9f0d14560..fbf49b9535a42f632df29931e7515745414eb9c6 100644
--- a/cumulus/polkadot-parachain/src/chain_spec/collectives.rs
+++ b/cumulus/polkadot-parachain/src/chain_spec/collectives.rs
@@ -1,4 +1,4 @@
-// Copyright 2022 Parity Technologies (UK) Ltd.
+// Copyright (C) Parity Technologies (UK) Ltd.
 // This file is part of Cumulus.
 
 // Cumulus is free software: you can redistribute it and/or modify
@@ -26,7 +26,7 @@ pub type CollectivesPolkadotChainSpec =
 	sc_service::GenericChainSpec<collectives_polkadot_runtime::RuntimeGenesisConfig, Extensions>;
 
 const COLLECTIVES_POLKADOT_ED: CollectivesBalance =
-	collectives_polkadot_runtime::constants::currency::EXISTENTIAL_DEPOSIT;
+	parachains_common::polkadot::currency::EXISTENTIAL_DEPOSIT;
 
 /// Generate the session keys from individual elements.
 ///
diff --git a/cumulus/polkadot-parachain/src/chain_spec/contracts.rs b/cumulus/polkadot-parachain/src/chain_spec/contracts.rs
index b8af83a0d70edc8cb508d1f99360edba3f589dcf..0d5012858edc6f81a1554996fbafe4a1f6973072 100644
--- a/cumulus/polkadot-parachain/src/chain_spec/contracts.rs
+++ b/cumulus/polkadot-parachain/src/chain_spec/contracts.rs
@@ -1,4 +1,4 @@
-// Copyright 2019-2021 Parity Technologies (UK) Ltd.
+// Copyright (C) Parity Technologies (UK) Ltd.
 // This file is part of Cumulus.
 
 // Cumulus is free software: you can redistribute it and/or modify
@@ -31,7 +31,7 @@ const CONTRACTS_PARACHAIN_ID: u32 = 1002;
 
 /// The existential deposit is determined by the runtime "contracts-rococo".
 const CONTRACTS_ROCOCO_ED: contracts_rococo_runtime::Balance =
-	contracts_rococo_runtime::constants::currency::EXISTENTIAL_DEPOSIT;
+	parachains_common::rococo::currency::EXISTENTIAL_DEPOSIT;
 
 pub fn contracts_rococo_development_config() -> ContractsRococoChainSpec {
 	let mut properties = sc_chain_spec::Properties::new();
diff --git a/cumulus/polkadot-parachain/src/chain_spec/glutton.rs b/cumulus/polkadot-parachain/src/chain_spec/glutton.rs
index 5ea51c3a918196d39cae5397181d4e31e6c8265c..881fae398827a6adc1fd6195f9d69997a3a6e6af 100644
--- a/cumulus/polkadot-parachain/src/chain_spec/glutton.rs
+++ b/cumulus/polkadot-parachain/src/chain_spec/glutton.rs
@@ -1,4 +1,4 @@
-// Copyright Parity Technologies (UK) Ltd.
+// Copyright (C) Parity Technologies (UK) Ltd.
 // This file is part of Cumulus.
 
 // Cumulus is free software: you can redistribute it and/or modify
@@ -16,9 +16,12 @@
 
 use crate::chain_spec::{get_account_id_from_seed, Extensions};
 use cumulus_primitives_core::ParaId;
+use parachains_common::AuraId;
 use sc_service::ChainType;
 use sp_core::sr25519;
 
+use super::get_collator_keys_from_seed;
+
 /// Specialized `ChainSpec` for the Glutton parachain runtime.
 pub type GluttonChainSpec =
 	sc_service::GenericChainSpec<glutton_runtime::RuntimeGenesisConfig, Extensions>;
@@ -30,7 +33,7 @@ pub fn glutton_development_config(para_id: ParaId) -> GluttonChainSpec {
 		// ID
 		"glutton_dev",
 		ChainType::Local,
-		move || glutton_genesis(para_id),
+		move || glutton_genesis(para_id, vec![get_collator_keys_from_seed::<AuraId>("Alice")]),
 		Vec::new(),
 		None,
 		None,
@@ -47,7 +50,15 @@ pub fn glutton_local_config(para_id: ParaId) -> GluttonChainSpec {
 		// ID
 		"glutton_local",
 		ChainType::Local,
-		move || glutton_genesis(para_id),
+		move || {
+			glutton_genesis(
+				para_id,
+				vec![
+					get_collator_keys_from_seed::<AuraId>("Alice"),
+					get_collator_keys_from_seed::<AuraId>("Bob"),
+				],
+			)
+		},
 		Vec::new(),
 		None,
 		None,
@@ -67,7 +78,15 @@ pub fn glutton_config(para_id: ParaId) -> GluttonChainSpec {
 		// ID
 		format!("glutton-kusama-{}", para_id).as_str(),
 		ChainType::Live,
-		move || glutton_genesis(para_id),
+		move || {
+			glutton_genesis(
+				para_id,
+				vec![
+					get_collator_keys_from_seed::<AuraId>("Alice"),
+					get_collator_keys_from_seed::<AuraId>("Bob"),
+				],
+			)
+		},
 		Vec::new(),
 		None,
 		// Protocol ID
@@ -78,7 +97,10 @@ pub fn glutton_config(para_id: ParaId) -> GluttonChainSpec {
 	)
 }
 
-fn glutton_genesis(parachain_id: ParaId) -> glutton_runtime::RuntimeGenesisConfig {
+fn glutton_genesis(
+	parachain_id: ParaId,
+	collators: Vec<AuraId>,
+) -> glutton_runtime::RuntimeGenesisConfig {
 	glutton_runtime::RuntimeGenesisConfig {
 		system: glutton_runtime::SystemConfig {
 			code: glutton_runtime::WASM_BINARY
@@ -94,6 +116,8 @@ fn glutton_genesis(parachain_id: ParaId) -> glutton_runtime::RuntimeGenesisConfi
 			trash_data_count: Default::default(),
 			..Default::default()
 		},
+		aura: glutton_runtime::AuraConfig { authorities: collators },
+		aura_ext: Default::default(),
 		sudo: glutton_runtime::SudoConfig {
 			key: Some(get_account_id_from_seed::<sr25519::Public>("Alice")),
 		},
diff --git a/cumulus/polkadot-parachain/src/chain_spec/mod.rs b/cumulus/polkadot-parachain/src/chain_spec/mod.rs
index d7014a9f43cd9d906f79f17054b4695c8c0a32a7..9cd0a37ad633ba069cdf8beae71d3324af4485c5 100644
--- a/cumulus/polkadot-parachain/src/chain_spec/mod.rs
+++ b/cumulus/polkadot-parachain/src/chain_spec/mod.rs
@@ -1,4 +1,4 @@
-// Copyright 2019-2021 Parity Technologies (UK) Ltd.
+// Copyright (C) Parity Technologies (UK) Ltd.
 // This file is part of Cumulus.
 
 // Cumulus is free software: you can redistribute it and/or modify
diff --git a/cumulus/polkadot-parachain/src/chain_spec/penpal.rs b/cumulus/polkadot-parachain/src/chain_spec/penpal.rs
index 264898991eb84e1c8aff0327140c4a1c6a48c129..479d1701e379ea4b2ce9d3520205365c1b07201f 100644
--- a/cumulus/polkadot-parachain/src/chain_spec/penpal.rs
+++ b/cumulus/polkadot-parachain/src/chain_spec/penpal.rs
@@ -1,4 +1,4 @@
-// Copyright 2019-2021 Parity Technologies (UK) Ltd.
+// Copyright (C) Parity Technologies (UK) Ltd.
 // This file is part of Cumulus.
 
 // Cumulus is free software: you can redistribute it and/or modify
diff --git a/cumulus/polkadot-parachain/src/chain_spec/rococo_parachain.rs b/cumulus/polkadot-parachain/src/chain_spec/rococo_parachain.rs
index 1ed1a3e35fba4a001cb3e9da2a21324931789bab..fb66efbf9ae1c68eedcc42b8ef6436b979885272 100644
--- a/cumulus/polkadot-parachain/src/chain_spec/rococo_parachain.rs
+++ b/cumulus/polkadot-parachain/src/chain_spec/rococo_parachain.rs
@@ -1,4 +1,4 @@
-// Copyright 2022 Parity Technologies (UK) Ltd.
+// Copyright (C) Parity Technologies (UK) Ltd.
 // This file is part of Cumulus.
 
 // Cumulus is free software: you can redistribute it and/or modify
diff --git a/cumulus/polkadot-parachain/src/chain_spec/seedling.rs b/cumulus/polkadot-parachain/src/chain_spec/seedling.rs
index 4a43b4cf476483b618f4c41055185c68a78581cc..6a5842320976c3794557a38deffe4105af4245c5 100644
--- a/cumulus/polkadot-parachain/src/chain_spec/seedling.rs
+++ b/cumulus/polkadot-parachain/src/chain_spec/seedling.rs
@@ -1,4 +1,4 @@
-// Copyright 2019-2021 Parity Technologies (UK) Ltd.
+// Copyright (C) Parity Technologies (UK) Ltd.
 // This file is part of Cumulus.
 
 // Cumulus is free software: you can redistribute it and/or modify
@@ -16,10 +16,12 @@
 
 use crate::chain_spec::{get_account_id_from_seed, Extensions};
 use cumulus_primitives_core::ParaId;
-use parachains_common::AccountId;
+use parachains_common::{AccountId, AuraId};
 use sc_service::ChainType;
 use sp_core::sr25519;
 
+use super::get_collator_keys_from_seed;
+
 /// Specialized `ChainSpec` for the seedling parachain runtime.
 pub type SeedlingChainSpec =
 	sc_service::GenericChainSpec<seedling_runtime::RuntimeGenesisConfig, Extensions>;
@@ -33,6 +35,7 @@ pub fn get_seedling_chain_spec() -> SeedlingChainSpec {
 			seedling_testnet_genesis(
 				get_account_id_from_seed::<sr25519::Public>("Alice"),
 				2000.into(),
+				vec![get_collator_keys_from_seed::<AuraId>("Alice")],
 			)
 		},
 		Vec::new(),
@@ -47,6 +50,7 @@ pub fn get_seedling_chain_spec() -> SeedlingChainSpec {
 fn seedling_testnet_genesis(
 	root_key: AccountId,
 	parachain_id: ParaId,
+	collators: Vec<AuraId>,
 ) -> seedling_runtime::RuntimeGenesisConfig {
 	seedling_runtime::RuntimeGenesisConfig {
 		system: seedling_runtime::SystemConfig {
@@ -61,5 +65,7 @@ fn seedling_testnet_genesis(
 			..Default::default()
 		},
 		parachain_system: Default::default(),
+		aura: seedling_runtime::AuraConfig { authorities: collators },
+		aura_ext: Default::default(),
 	}
 }
diff --git a/cumulus/polkadot-parachain/src/chain_spec/shell.rs b/cumulus/polkadot-parachain/src/chain_spec/shell.rs
index eca605b10df032bfd2b3f25ac9ef60b57ee317dc..0899c1af3b4d238262191436c0bacf80f557882b 100644
--- a/cumulus/polkadot-parachain/src/chain_spec/shell.rs
+++ b/cumulus/polkadot-parachain/src/chain_spec/shell.rs
@@ -1,4 +1,4 @@
-// Copyright 2019-2021 Parity Technologies (UK) Ltd.
+// Copyright (C) Parity Technologies (UK) Ltd.
 // This file is part of Cumulus.
 
 // Cumulus is free software: you can redistribute it and/or modify
@@ -16,8 +16,11 @@
 
 use crate::chain_spec::Extensions;
 use cumulus_primitives_core::ParaId;
+use parachains_common::AuraId;
 use sc_service::ChainType;
 
+use super::get_collator_keys_from_seed;
+
 /// Specialized `ChainSpec` for the shell parachain runtime.
 pub type ShellChainSpec =
 	sc_service::GenericChainSpec<shell_runtime::RuntimeGenesisConfig, Extensions>;
@@ -27,7 +30,9 @@ pub fn get_shell_chain_spec() -> ShellChainSpec {
 		"Shell Local Testnet",
 		"shell_local_testnet",
 		ChainType::Local,
-		move || shell_testnet_genesis(1000.into()),
+		move || {
+			shell_testnet_genesis(1000.into(), vec![get_collator_keys_from_seed::<AuraId>("Alice")])
+		},
 		Vec::new(),
 		None,
 		None,
@@ -37,7 +42,10 @@ pub fn get_shell_chain_spec() -> ShellChainSpec {
 	)
 }
 
-fn shell_testnet_genesis(parachain_id: ParaId) -> shell_runtime::RuntimeGenesisConfig {
+fn shell_testnet_genesis(
+	parachain_id: ParaId,
+	collators: Vec<AuraId>,
+) -> shell_runtime::RuntimeGenesisConfig {
 	shell_runtime::RuntimeGenesisConfig {
 		system: shell_runtime::SystemConfig {
 			code: shell_runtime::WASM_BINARY
@@ -47,5 +55,7 @@ fn shell_testnet_genesis(parachain_id: ParaId) -> shell_runtime::RuntimeGenesisC
 		},
 		parachain_info: shell_runtime::ParachainInfoConfig { parachain_id, ..Default::default() },
 		parachain_system: Default::default(),
+		aura: shell_runtime::AuraConfig { authorities: collators },
+		aura_ext: Default::default(),
 	}
 }
diff --git a/cumulus/polkadot-parachain/src/cli.rs b/cumulus/polkadot-parachain/src/cli.rs
index 11b2e105ecbb98443c1c0613b18c7e517501b55e..63e4baf27aeb24bbf0d0647c5b2fda5ff34f0fa8 100644
--- a/cumulus/polkadot-parachain/src/cli.rs
+++ b/cumulus/polkadot-parachain/src/cli.rs
@@ -1,4 +1,4 @@
-// Copyright 2019-2021 Parity Technologies (UK) Ltd.
+// Copyright (C) Parity Technologies (UK) Ltd.
 // This file is part of Cumulus.
 
 // Cumulus is free software: you can redistribute it and/or modify
diff --git a/cumulus/polkadot-parachain/src/command.rs b/cumulus/polkadot-parachain/src/command.rs
index 008e5435f0b11d91f3ec12daf1fa1368e2111d7f..c47555a32168a7f5f78cac7ba064b477225a4527 100644
--- a/cumulus/polkadot-parachain/src/command.rs
+++ b/cumulus/polkadot-parachain/src/command.rs
@@ -1,4 +1,4 @@
-// Copyright 2019-2021 Parity Technologies (UK) Ltd.
+// Copyright (C) Parity Technologies (UK) Ltd.
 // This file is part of Cumulus.
 
 // Cumulus is free software: you can redistribute it and/or modify
@@ -121,15 +121,15 @@ fn load_spec(id: &str) -> std::result::Result<Box<dyn ChainSpec>, String> {
 			Box::new(chain_spec::rococo_parachain::staging_rococo_parachain_local_config()),
 		"tick" =>
 			Box::new(chain_spec::rococo_parachain::RococoParachainChainSpec::from_json_bytes(
-				&include_bytes!("../../parachains/chain-specs/tick.json")[..],
+				&include_bytes!("../chain-specs/tick.json")[..],
 			)?),
 		"trick" =>
 			Box::new(chain_spec::rococo_parachain::RococoParachainChainSpec::from_json_bytes(
-				&include_bytes!("../../parachains/chain-specs/trick.json")[..],
+				&include_bytes!("../chain-specs/trick.json")[..],
 			)?),
 		"track" =>
 			Box::new(chain_spec::rococo_parachain::RococoParachainChainSpec::from_json_bytes(
-				&include_bytes!("../../parachains/chain-specs/track.json")[..],
+				&include_bytes!("../chain-specs/track.json")[..],
 			)?),
 
 		// -- Starters
@@ -147,7 +147,7 @@ fn load_spec(id: &str) -> std::result::Result<Box<dyn ChainSpec>, String> {
 		// the shell-based chain spec as used for syncing
 		"asset-hub-polkadot" | "statemint" =>
 			Box::new(chain_spec::asset_hubs::AssetHubPolkadotChainSpec::from_json_bytes(
-				&include_bytes!("../../parachains/chain-specs/asset-hub-polkadot.json")[..],
+				&include_bytes!("../chain-specs/asset-hub-polkadot.json")[..],
 			)?),
 
 		// -- Asset Hub Kusama
@@ -161,7 +161,7 @@ fn load_spec(id: &str) -> std::result::Result<Box<dyn ChainSpec>, String> {
 		// the shell-based chain spec as used for syncing
 		"asset-hub-kusama" | "statemine" =>
 			Box::new(chain_spec::asset_hubs::AssetHubKusamaChainSpec::from_json_bytes(
-				&include_bytes!("../../parachains/chain-specs/asset-hub-kusama.json")[..],
+				&include_bytes!("../chain-specs/asset-hub-kusama.json")[..],
 			)?),
 
 		// -- Asset Hub Westend
@@ -175,7 +175,7 @@ fn load_spec(id: &str) -> std::result::Result<Box<dyn ChainSpec>, String> {
 		// the shell-based chain spec as used for syncing
 		"asset-hub-westend" | "westmint" =>
 			Box::new(chain_spec::asset_hubs::AssetHubWestendChainSpec::from_json_bytes(
-				&include_bytes!("../../parachains/chain-specs/asset-hub-westend.json")[..],
+				&include_bytes!("../chain-specs/asset-hub-westend.json")[..],
 			)?),
 
 		// -- Polkadot Collectives
@@ -185,11 +185,11 @@ fn load_spec(id: &str) -> std::result::Result<Box<dyn ChainSpec>, String> {
 			Box::new(chain_spec::collectives::collectives_polkadot_local_config()),
 		"collectives-polkadot" =>
 			Box::new(chain_spec::collectives::CollectivesPolkadotChainSpec::from_json_bytes(
-				&include_bytes!("../../parachains/chain-specs/collectives-polkadot.json")[..],
+				&include_bytes!("../chain-specs/collectives-polkadot.json")[..],
 			)?),
 		"collectives-westend" =>
 			Box::new(chain_spec::collectives::CollectivesPolkadotChainSpec::from_json_bytes(
-				&include_bytes!("../../parachains/chain-specs/collectives-westend.json")[..],
+				&include_bytes!("../chain-specs/collectives-westend.json")[..],
 			)?),
 
 		// -- Contracts on Rococo
@@ -200,7 +200,7 @@ fn load_spec(id: &str) -> std::result::Result<Box<dyn ChainSpec>, String> {
 		"contracts-rococo-genesis" => Box::new(chain_spec::contracts::contracts_rococo_config()),
 		"contracts-rococo" =>
 			Box::new(chain_spec::contracts::ContractsRococoChainSpec::from_json_bytes(
-				&include_bytes!("../../parachains/chain-specs/contracts-rococo.json")[..],
+				&include_bytes!("../chain-specs/contracts-rococo.json")[..],
 			)?),
 
 		// -- BridgeHub
@@ -332,7 +332,7 @@ impl SubstrateCli for Cli {
 	}
 
 	fn support_url() -> String {
-		"https://github.com/paritytech/cumulus/issues/new".into()
+		"https://github.com/paritytech/polkadot-sdk/issues/new".into()
 	}
 
 	fn copyright_start_year() -> i32 {
@@ -368,7 +368,7 @@ impl SubstrateCli for RelayChainCli {
 	}
 
 	fn support_url() -> String {
-		"https://github.com/paritytech/cumulus/issues/new".into()
+		"https://github.com/paritytech/polkadot-sdk/issues/new".into()
 	}
 
 	fn copyright_start_year() -> i32 {
@@ -381,7 +381,7 @@ impl SubstrateCli for RelayChainCli {
 }
 
 /// Creates partial components for the runtimes that are supported by the benchmarks.
-macro_rules! construct_benchmark_partials {
+macro_rules! construct_partials {
 	($config:expr, |$partials:ident| $code:expr) => {
 		match $config.chain_spec.runtime() {
 			Runtime::AssetHubKusama => {
@@ -456,7 +456,41 @@ macro_rules! construct_benchmark_partials {
 				)?;
 				$code
 			},
-			_ => Err("The chain is not supported".into()),
+			Runtime::Shell => {
+				let $partials = new_partial::<shell_runtime::RuntimeApi, _>(
+					&$config,
+					crate::service::shell_build_import_queue,
+				)?;
+				$code
+			},
+			Runtime::Seedling => {
+				let $partials = new_partial::<seedling_runtime::RuntimeApi, _>(
+					&$config,
+					crate::service::shell_build_import_queue,
+				)?;
+				$code
+			},
+			Runtime::ContractsRococo => {
+				let $partials = new_partial::<contracts_rococo_runtime::RuntimeApi, _>(
+					&$config,
+					crate::service::contracts_rococo_build_import_queue,
+				)?;
+				$code
+			},
+			Runtime::Penpal(_) | Runtime::Default => {
+				let $partials = new_partial::<rococo_parachain_runtime::RuntimeApi, _>(
+					&$config,
+					crate::service::rococo_parachain_build_import_queue,
+				)?;
+				$code
+			},
+			Runtime::Glutton => {
+				let $partials = new_partial::<glutton_runtime::RuntimeApi, _>(
+					&$config,
+					crate::service::shell_build_import_queue,
+				)?;
+				$code
+			},
 		}
 	};
 }
@@ -679,10 +713,12 @@ pub fn run() -> Result<()> {
 				cmd.run(config, polkadot_config)
 			})
 		},
-		Some(Subcommand::ExportGenesisState(cmd)) =>
-			construct_async_run!(|components, cli, cmd, config| {
-				Ok(async move { cmd.run(&*config.chain_spec, &*components.client) })
-			}),
+		Some(Subcommand::ExportGenesisState(cmd)) => {
+			let runner = cli.create_runner(cmd)?;
+			runner.sync_run(|config| {
+				construct_partials!(config, |partials| cmd.run(&*config.chain_spec, &*partials.client))
+			})
+		},
 		Some(Subcommand::ExportGenesisWasm(cmd)) => {
 			let runner = cli.create_runner(cmd)?;
 			runner.sync_run(|_config| {
@@ -704,7 +740,7 @@ pub fn run() -> Result<()> {
 							.into())
 					},
 				BenchmarkCmd::Block(cmd) => runner.sync_run(|config| {
-					construct_benchmark_partials!(config, |partials| cmd.run(partials.client))
+					construct_partials!(config, |partials| cmd.run(partials.client))
 				}),
 				#[cfg(not(feature = "runtime-benchmarks"))]
 				BenchmarkCmd::Storage(_) =>
@@ -716,7 +752,7 @@ pub fn run() -> Result<()> {
 					.into()),
 				#[cfg(feature = "runtime-benchmarks")]
 				BenchmarkCmd::Storage(cmd) => runner.sync_run(|config| {
-					construct_benchmark_partials!(config, |partials| {
+					construct_partials!(config, |partials| {
 						let db = partials.backend.expose_db();
 						let storage = partials.backend.expose_storage();
 
@@ -800,21 +836,21 @@ pub fn run() -> Result<()> {
 				info!("Is collating: {}", if config.role.is_authority() { "yes" } else { "no" });
 
 				match config.chain_spec.runtime() {
-					Runtime::AssetHubPolkadot => crate::service::start_generic_aura_node::<
+					Runtime::AssetHubPolkadot => crate::service::start_asset_hub_node::<
 						asset_hub_polkadot_runtime::RuntimeApi,
 						AssetHubPolkadotAuraId,
 					>(config, polkadot_config, collator_options, id, hwbench)
 					.await
 					.map(|r| r.0)
 					.map_err(Into::into),
-					Runtime::AssetHubKusama => crate::service::start_generic_aura_node::<
+					Runtime::AssetHubKusama => crate::service::start_asset_hub_node::<
 						asset_hub_kusama_runtime::RuntimeApi,
 						AuraId,
 					>(config, polkadot_config, collator_options, id, hwbench)
 					.await
 					.map(|r| r.0)
 					.map_err(Into::into),
-					Runtime::AssetHubWestend => crate::service::start_generic_aura_node::<
+					Runtime::AssetHubWestend => crate::service::start_asset_hub_node::<
 						asset_hub_westend_runtime::RuntimeApi,
 						AuraId,
 					>(config, polkadot_config, collator_options, id, hwbench)
@@ -840,12 +876,17 @@ pub fn run() -> Result<()> {
 						.await
 						.map(|r| r.0)
 						.map_err(Into::into),
-					Runtime::Seedling => crate::service::start_shell_node::<
-						seedling_runtime::RuntimeApi,
-					>(config, polkadot_config, collator_options, id, hwbench)
-					.await
-					.map(|r| r.0)
-					.map_err(Into::into),
+					Runtime::Seedling =>
+						crate::service::start_shell_node::<seedling_runtime::RuntimeApi>(
+							config,
+							polkadot_config,
+							collator_options,
+							id,
+							hwbench
+						)
+						.await
+						.map(|r| r.0)
+						.map_err(Into::into),
 					Runtime::ContractsRococo => crate::service::start_contracts_rococo_node(
 						config,
 						polkadot_config,
@@ -913,13 +954,10 @@ pub fn run() -> Result<()> {
 						.map(|r| r.0)
 						.map_err(Into::into),
 					Runtime::Glutton =>
-						crate::service::start_shell_node::<glutton_runtime::RuntimeApi>(
-							config,
-							polkadot_config,
-							collator_options,
-							id,
-							hwbench,
-						)
+						crate::service::start_basic_lookahead_node::<
+							glutton_runtime::RuntimeApi,
+							AuraId,
+						>(config, polkadot_config, collator_options, id, hwbench)
 						.await
 						.map(|r| r.0)
 						.map_err(Into::into),
diff --git a/cumulus/polkadot-parachain/src/main.rs b/cumulus/polkadot-parachain/src/main.rs
index d114d2f5f2c8a3208b0bf572fbdce59630377178..e40af8128f7166697a7e4f7571dd541a11d626a8 100644
--- a/cumulus/polkadot-parachain/src/main.rs
+++ b/cumulus/polkadot-parachain/src/main.rs
@@ -1,4 +1,4 @@
-// Copyright 2019-2021 Parity Technologies (UK) Ltd.
+// Copyright (C) Parity Technologies (UK) Ltd.
 // This file is part of Cumulus.
 
 // Cumulus is free software: you can redistribute it and/or modify
diff --git a/cumulus/polkadot-parachain/src/rpc.rs b/cumulus/polkadot-parachain/src/rpc.rs
index df6283388f9deafb6c00fbb8a2ee0854955c84d2..d106c52a364290dad54d3d278ce76dad8ef55c26 100644
--- a/cumulus/polkadot-parachain/src/rpc.rs
+++ b/cumulus/polkadot-parachain/src/rpc.rs
@@ -1,4 +1,4 @@
-// Copyright 2021 Parity Technologies (UK) Ltd.
+// Copyright (C) Parity Technologies (UK) Ltd.
 // This file is part of Cumulus.
 
 // Cumulus is free software: you can redistribute it and/or modify
diff --git a/cumulus/polkadot-parachain/src/service.rs b/cumulus/polkadot-parachain/src/service.rs
index 3899814cb0e8c0c0de564d1ce2a8fb959555b67c..fa61f534784e0705bf1df9b0eed6dad967a268dd 100644
--- a/cumulus/polkadot-parachain/src/service.rs
+++ b/cumulus/polkadot-parachain/src/service.rs
@@ -1,4 +1,4 @@
-// Copyright 2019-2021 Parity Technologies (UK) Ltd.
+// Copyright (C) Parity Technologies (UK) Ltd.
 // This file is part of Cumulus.
 
 // Cumulus is free software: you can redistribute it and/or modify
@@ -14,11 +14,12 @@
 // You should have received a copy of the GNU General Public License
 // along with Cumulus.  If not, see <http://www.gnu.org/licenses/>.
 
-use codec::Codec;
+use codec::{Codec, Decode};
 use cumulus_client_cli::CollatorOptions;
 use cumulus_client_collator::service::CollatorService;
-use cumulus_client_consensus_aura::collators::basic::{
-	self as basic_aura, Params as BasicAuraParams,
+use cumulus_client_consensus_aura::collators::{
+	basic::{self as basic_aura, Params as BasicAuraParams},
+	lookahead::{self as aura, Params as AuraParams},
 };
 use cumulus_client_consensus_common::{
 	ParachainBlockImport as TParachainBlockImport, ParachainCandidate, ParachainConsensus,
@@ -31,7 +32,7 @@ use cumulus_client_service::{
 	BuildNetworkParams, CollatorSybilResistance, DARecoveryProfile, StartRelayChainTasksParams,
 };
 use cumulus_primitives_core::{
-	relay_chain::{Hash as PHash, PersistedValidationData},
+	relay_chain::{Hash as PHash, PersistedValidationData, ValidationCode},
 	ParaId,
 };
 use cumulus_relay_chain_interface::{OverseerHandle, RelayChainInterface};
@@ -43,7 +44,7 @@ use crate::rpc;
 pub use parachains_common::{AccountId, Balance, Block, BlockNumber, Hash, Header, Nonce};
 
 use cumulus_client_consensus_relay_chain::Verifier as RelayChainVerifier;
-use futures::lock::Mutex;
+use futures::{lock::Mutex, prelude::*};
 use sc_consensus::{
 	import_queue::{BasicQueue, Verifier as VerifierT},
 	BlockImportParams, ImportQueue,
@@ -53,10 +54,14 @@ use sc_network::{config::FullNetworkConfiguration, NetworkBlock};
 use sc_network_sync::SyncingService;
 use sc_service::{Configuration, PartialComponents, TFullBackend, TFullClient, TaskManager};
 use sc_telemetry::{Telemetry, TelemetryHandle, TelemetryWorker, TelemetryWorkerHandle};
-use sp_api::{ApiExt, ConstructRuntimeApi};
+use sp_api::{ApiExt, ConstructRuntimeApi, ProvideRuntimeApi};
 use sp_consensus_aura::AuraApi;
+use sp_core::traits::SpawnEssentialNamed;
 use sp_keystore::KeystorePtr;
-use sp_runtime::{app_crypto::AppCrypto, traits::Header as HeaderT};
+use sp_runtime::{
+	app_crypto::AppCrypto,
+	traits::{Block as BlockT, Header as HeaderT},
+};
 use std::{marker::PhantomData, sync::Arc, time::Duration};
 use substrate_prometheus_endpoint::Registry;
 
@@ -696,6 +701,188 @@ where
 	Ok((task_manager, client))
 }
 
+/// Start a node with the given parachain `Configuration` and relay chain `Configuration`.
+///
+/// This is the actual implementation that is abstract over the executor and the runtime api.
+///
+/// This node is basic in the sense that it doesn't support functionality like transaction
+/// payment. Intended to replace start_shell_node in use for glutton, shell, and seedling.
+#[sc_tracing::logging::prefix_logs_with("Parachain")]
+async fn start_basic_lookahead_node_impl<RuntimeApi, RB, BIQ, SC>(
+	parachain_config: Configuration,
+	polkadot_config: Configuration,
+	collator_options: CollatorOptions,
+	sybil_resistance_level: CollatorSybilResistance,
+	para_id: ParaId,
+	rpc_ext_builder: RB,
+	build_import_queue: BIQ,
+	start_consensus: SC,
+	hwbench: Option<sc_sysinfo::HwBench>,
+) -> sc_service::error::Result<(TaskManager, Arc<ParachainClient<RuntimeApi>>)>
+where
+	RuntimeApi: ConstructRuntimeApi<Block, ParachainClient<RuntimeApi>> + Send + Sync + 'static,
+	RuntimeApi::RuntimeApi: sp_transaction_pool::runtime_api::TaggedTransactionQueue<Block>
+		+ sp_api::Metadata<Block>
+		+ sp_session::SessionKeys<Block>
+		+ sp_api::ApiExt<Block>
+		+ sp_offchain::OffchainWorkerApi<Block>
+		+ sp_block_builder::BlockBuilder<Block>
+		+ cumulus_primitives_core::CollectCollationInfo<Block>
+		+ frame_rpc_system::AccountNonceApi<Block, AccountId, Nonce>,
+	RB: Fn(Arc<ParachainClient<RuntimeApi>>) -> Result<jsonrpsee::RpcModule<()>, sc_service::Error>
+		+ 'static,
+	BIQ: FnOnce(
+		Arc<ParachainClient<RuntimeApi>>,
+		ParachainBlockImport<RuntimeApi>,
+		&Configuration,
+		Option<TelemetryHandle>,
+		&TaskManager,
+	) -> Result<sc_consensus::DefaultImportQueue<Block>, sc_service::Error>,
+	SC: FnOnce(
+		Arc<ParachainClient<RuntimeApi>>,
+		ParachainBlockImport<RuntimeApi>,
+		Option<&Registry>,
+		Option<TelemetryHandle>,
+		&TaskManager,
+		Arc<dyn RelayChainInterface>,
+		Arc<sc_transaction_pool::FullPool<Block, ParachainClient<RuntimeApi>>>,
+		Arc<SyncingService<Block>>,
+		KeystorePtr,
+		Duration,
+		ParaId,
+		CollatorPair,
+		OverseerHandle,
+		Arc<dyn Fn(Hash, Option<Vec<u8>>) + Send + Sync>,
+		Arc<ParachainBackend>,
+	) -> Result<(), sc_service::Error>,
+{
+	let parachain_config = prepare_node_config(parachain_config);
+
+	let params = new_partial::<RuntimeApi, BIQ>(&parachain_config, build_import_queue)?;
+	let (block_import, mut telemetry, telemetry_worker_handle) = params.other;
+
+	let client = params.client.clone();
+	let backend = params.backend.clone();
+
+	let mut task_manager = params.task_manager;
+	let (relay_chain_interface, collator_key) = build_relay_chain_interface(
+		polkadot_config,
+		&parachain_config,
+		telemetry_worker_handle,
+		&mut task_manager,
+		collator_options.clone(),
+		hwbench.clone(),
+	)
+	.await
+	.map_err(|e| sc_service::Error::Application(Box::new(e) as Box<_>))?;
+
+	let validator = parachain_config.role.is_authority();
+	let prometheus_registry = parachain_config.prometheus_registry().cloned();
+	let transaction_pool = params.transaction_pool.clone();
+	let import_queue_service = params.import_queue.service();
+	let net_config = FullNetworkConfiguration::new(&parachain_config.network);
+
+	let (network, system_rpc_tx, tx_handler_controller, start_network, sync_service) =
+		build_network(BuildNetworkParams {
+			parachain_config: &parachain_config,
+			net_config,
+			client: client.clone(),
+			transaction_pool: transaction_pool.clone(),
+			para_id,
+			spawn_handle: task_manager.spawn_handle(),
+			relay_chain_interface: relay_chain_interface.clone(),
+			import_queue: params.import_queue,
+			sybil_resistance_level,
+		})
+		.await?;
+
+	let rpc_client = client.clone();
+	let rpc_builder = Box::new(move |_, _| rpc_ext_builder(rpc_client.clone()));
+
+	sc_service::spawn_tasks(sc_service::SpawnTasksParams {
+		rpc_builder,
+		client: client.clone(),
+		transaction_pool: transaction_pool.clone(),
+		task_manager: &mut task_manager,
+		config: parachain_config,
+		keystore: params.keystore_container.keystore(),
+		backend: backend.clone(),
+		network: network.clone(),
+		sync_service: sync_service.clone(),
+		system_rpc_tx,
+		tx_handler_controller,
+		telemetry: telemetry.as_mut(),
+	})?;
+
+	if let Some(hwbench) = hwbench {
+		sc_sysinfo::print_hwbench(&hwbench);
+		if validator {
+			warn_if_slow_hardware(&hwbench);
+		}
+
+		if let Some(ref mut telemetry) = telemetry {
+			let telemetry_handle = telemetry.handle();
+			task_manager.spawn_handle().spawn(
+				"telemetry_hwbench",
+				None,
+				sc_sysinfo::initialize_hwbench_telemetry(telemetry_handle, hwbench),
+			);
+		}
+	}
+
+	let announce_block = {
+		let sync_service = sync_service.clone();
+		Arc::new(move |hash, data| sync_service.announce_block(hash, data))
+	};
+
+	let relay_chain_slot_duration = Duration::from_secs(6);
+
+	let overseer_handle = relay_chain_interface
+		.overseer_handle()
+		.map_err(|e| sc_service::Error::Application(Box::new(e)))?;
+
+	start_relay_chain_tasks(StartRelayChainTasksParams {
+		client: client.clone(),
+		announce_block: announce_block.clone(),
+		para_id,
+		relay_chain_interface: relay_chain_interface.clone(),
+		task_manager: &mut task_manager,
+		da_recovery_profile: if validator {
+			DARecoveryProfile::Collator
+		} else {
+			DARecoveryProfile::FullNode
+		},
+		import_queue: import_queue_service,
+		relay_chain_slot_duration,
+		recovery_handle: Box::new(overseer_handle.clone()),
+		sync_service: sync_service.clone(),
+	})?;
+
+	if validator {
+		start_consensus(
+			client.clone(),
+			block_import,
+			prometheus_registry.as_ref(),
+			telemetry.as_ref().map(|t| t.handle()),
+			&task_manager,
+			relay_chain_interface.clone(),
+			transaction_pool,
+			sync_service.clone(),
+			params.keystore_container.keystore(),
+			relay_chain_slot_duration,
+			para_id,
+			collator_key.expect("Command line arguments do not allow this. qed"),
+			overseer_handle,
+			announce_block,
+			backend.clone(),
+		)?;
+	}
+
+	start_network.start_network();
+
+	Ok((task_manager, client))
+}
+
 /// Build the import queue for the rococo parachain runtime.
 pub fn rococo_parachain_build_import_queue(
 	client: Arc<ParachainClient<rococo_parachain_runtime::RuntimeApi>>,
@@ -1206,6 +1393,247 @@ where
 	.await
 }
 
+/// Start a shell node which should later transition into an Aura powered parachain node. Asset Hub
+/// uses this because at genesis, Asset Hub was on the `shell` runtime which didn't have Aura and
+/// needs to sync and upgrade before it can run `AuraApi` functions.
+pub async fn start_asset_hub_node<RuntimeApi, AuraId: AppCrypto + Send + Codec + Sync>(
+	parachain_config: Configuration,
+	polkadot_config: Configuration,
+	collator_options: CollatorOptions,
+	para_id: ParaId,
+	hwbench: Option<sc_sysinfo::HwBench>,
+) -> sc_service::error::Result<(TaskManager, Arc<ParachainClient<RuntimeApi>>)>
+where
+	RuntimeApi: ConstructRuntimeApi<Block, ParachainClient<RuntimeApi>> + Send + Sync + 'static,
+	RuntimeApi::RuntimeApi: sp_transaction_pool::runtime_api::TaggedTransactionQueue<Block>
+		+ sp_api::Metadata<Block>
+		+ sp_session::SessionKeys<Block>
+		+ sp_api::ApiExt<Block>
+		+ sp_offchain::OffchainWorkerApi<Block>
+		+ sp_block_builder::BlockBuilder<Block>
+		+ cumulus_primitives_core::CollectCollationInfo<Block>
+		+ sp_consensus_aura::AuraApi<Block, <<AuraId as AppCrypto>::Pair as Pair>::Public>
+		+ pallet_transaction_payment_rpc::TransactionPaymentRuntimeApi<Block, Balance>
+		+ frame_rpc_system::AccountNonceApi<Block, AccountId, Nonce>,
+	<<AuraId as AppCrypto>::Pair as Pair>::Signature:
+		TryFrom<Vec<u8>> + std::hash::Hash + sp_runtime::traits::Member + Codec,
+{
+	start_node_impl::<RuntimeApi, _, _, _>(
+		parachain_config,
+		polkadot_config,
+		collator_options,
+		CollatorSybilResistance::Resistant, // Aura
+		para_id,
+		|_| Ok(RpcModule::new(())),
+		aura_build_import_queue::<_, AuraId>,
+		|client,
+		 block_import,
+		 prometheus_registry,
+		 telemetry,
+		 task_manager,
+		 relay_chain_interface,
+		 transaction_pool,
+		 sync_oracle,
+		 keystore,
+		 relay_chain_slot_duration,
+		 para_id,
+		 collator_key,
+		 overseer_handle,
+		 announce_block| {
+			let relay_chain_interface2 = relay_chain_interface.clone();
+
+			let collator_service = CollatorService::new(
+				client.clone(),
+				Arc::new(task_manager.spawn_handle()),
+				announce_block,
+				client.clone(),
+			);
+
+			let spawner = task_manager.spawn_handle();
+
+			let proposer_factory = sc_basic_authorship::ProposerFactory::with_proof_recording(
+				spawner,
+				client.clone(),
+				transaction_pool,
+				prometheus_registry,
+				telemetry.clone(),
+			);
+
+			let collation_future = Box::pin(async move {
+				// Start collating with the `shell` runtime while waiting for an upgrade to an Aura
+				// compatible runtime.
+				let mut request_stream = cumulus_client_collator::relay_chain_driven::init(
+					collator_key.clone(),
+					para_id,
+					overseer_handle.clone(),
+				)
+				.await;
+				while let Some(request) = request_stream.next().await {
+					let pvd = request.persisted_validation_data().clone();
+					let last_head_hash =
+						match <Block as BlockT>::Header::decode(&mut &pvd.parent_head.0[..]) {
+							Ok(header) => header.hash(),
+							Err(e) => {
+								log::error!("Could not decode the head data: {e}");
+								request.complete(None);
+								continue
+							},
+						};
+
+					// Check if we have upgraded to an Aura compatible runtime and transition if
+					// necessary.
+					if client
+						.runtime_api()
+						.has_api::<dyn AuraApi<Block, AuraId>>(last_head_hash)
+						.unwrap_or(false)
+					{
+						// Respond to this request before transitioning to Aura.
+						request.complete(None);
+						break
+					}
+				}
+
+				// Move to Aura consensus.
+				let slot_duration = match cumulus_client_consensus_aura::slot_duration(&*client) {
+					Ok(d) => d,
+					Err(e) => {
+						log::error!("Could not get Aura slot duration: {e}");
+						return
+					},
+				};
+
+				let proposer = Proposer::new(proposer_factory);
+
+				let params = BasicAuraParams {
+					create_inherent_data_providers: move |_, ()| async move { Ok(()) },
+					block_import,
+					para_client: client,
+					relay_client: relay_chain_interface2,
+					sync_oracle,
+					keystore,
+					collator_key,
+					para_id,
+					overseer_handle,
+					slot_duration,
+					relay_chain_slot_duration,
+					proposer,
+					collator_service,
+					// Very limited proposal time.
+					authoring_duration: Duration::from_millis(500),
+				};
+
+				basic_aura::run::<Block, <AuraId as AppCrypto>::Pair, _, _, _, _, _, _, _>(params)
+					.await
+			});
+
+			let spawner = task_manager.spawn_essential_handle();
+			spawner.spawn_essential("cumulus-asset-hub-collator", None, collation_future);
+
+			Ok(())
+		},
+		hwbench,
+	)
+	.await
+}
+
+/// Start an aura powered parachain node which uses the lookahead collator to support async backing.
+/// This node is basic in the sense that its runtime api doesn't include common contents such as
+/// transaction payment. Used for aura glutton.
+pub async fn start_basic_lookahead_node<RuntimeApi, AuraId: AppCrypto>(
+	parachain_config: Configuration,
+	polkadot_config: Configuration,
+	collator_options: CollatorOptions,
+	para_id: ParaId,
+	hwbench: Option<sc_sysinfo::HwBench>,
+) -> sc_service::error::Result<(TaskManager, Arc<ParachainClient<RuntimeApi>>)>
+where
+	RuntimeApi: ConstructRuntimeApi<Block, ParachainClient<RuntimeApi>> + Send + Sync + 'static,
+	RuntimeApi::RuntimeApi: sp_transaction_pool::runtime_api::TaggedTransactionQueue<Block>
+		+ sp_api::Metadata<Block>
+		+ sp_session::SessionKeys<Block>
+		+ sp_api::ApiExt<Block>
+		+ sp_offchain::OffchainWorkerApi<Block>
+		+ sp_block_builder::BlockBuilder<Block>
+		+ cumulus_primitives_core::CollectCollationInfo<Block>
+		+ sp_consensus_aura::AuraApi<Block, <<AuraId as AppCrypto>::Pair as Pair>::Public>
+		+ frame_rpc_system::AccountNonceApi<Block, AccountId, Nonce>
+		+ cumulus_primitives_aura::AuraUnincludedSegmentApi<Block>,
+	<<AuraId as AppCrypto>::Pair as Pair>::Signature:
+		TryFrom<Vec<u8>> + std::hash::Hash + sp_runtime::traits::Member + Codec,
+{
+	start_basic_lookahead_node_impl::<RuntimeApi, _, _, _>(
+		parachain_config,
+		polkadot_config,
+		collator_options,
+		CollatorSybilResistance::Resistant, // Aura
+		para_id,
+		|_| Ok(RpcModule::new(())),
+		aura_build_import_queue::<_, AuraId>,
+		|client,
+		 block_import,
+		 prometheus_registry,
+		 telemetry,
+		 task_manager,
+		 relay_chain_interface,
+		 transaction_pool,
+		 sync_oracle,
+		 keystore,
+		 relay_chain_slot_duration,
+		 para_id,
+		 collator_key,
+		 overseer_handle,
+		 announce_block,
+		 backend| {
+			let slot_duration = cumulus_client_consensus_aura::slot_duration(&*client)?;
+
+			let proposer_factory = sc_basic_authorship::ProposerFactory::with_proof_recording(
+				task_manager.spawn_handle(),
+				client.clone(),
+				transaction_pool,
+				prometheus_registry,
+				telemetry.clone(),
+			);
+			let proposer = Proposer::new(proposer_factory);
+
+			let collator_service = CollatorService::new(
+				client.clone(),
+				Arc::new(task_manager.spawn_handle()),
+				announce_block,
+				client.clone(),
+			);
+
+			let params = AuraParams {
+				create_inherent_data_providers: move |_, ()| async move { Ok(()) },
+				block_import,
+				para_client: client.clone(),
+				para_backend: backend.clone(),
+				relay_client: relay_chain_interface,
+				code_hash_provider: move |block_hash| {
+					client.code_at(block_hash).ok().map(ValidationCode).map(|c| c.hash())
+				},
+				sync_oracle,
+				keystore,
+				collator_key,
+				para_id,
+				overseer_handle,
+				slot_duration,
+				relay_chain_slot_duration,
+				proposer,
+				collator_service,
+				authoring_duration: Duration::from_millis(1500),
+			};
+
+			let fut =
+				aura::run::<Block, <AuraId as AppCrypto>::Pair, _, _, _, _, _, _, _, _, _>(params);
+			task_manager.spawn_essential_handle().spawn("aura", None, fut);
+
+			Ok(())
+		},
+		hwbench,
+	)
+	.await
+}
+
 #[sc_tracing::logging::prefix_logs_with("Parachain")]
 async fn start_contracts_rococo_node_impl<RuntimeApi, RB, BIQ, SC>(
 	parachain_config: Configuration,
diff --git a/cumulus/polkadot-parachain/tests/benchmark_storage_works.rs b/cumulus/polkadot-parachain/tests/benchmark_storage_works.rs
index df3078b4dab82f8853b349cd2ae338ae5c801a06..c2850b64e458adca9bb0918667cf912eb16796df 100644
--- a/cumulus/polkadot-parachain/tests/benchmark_storage_works.rs
+++ b/cumulus/polkadot-parachain/tests/benchmark_storage_works.rs
@@ -1,3 +1,19 @@
+// Copyright (C) Parity Technologies (UK) Ltd.
+// This file is part of Substrate.
+
+// Substrate 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.
+
+// Substrate 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/>.
+
 #![cfg(feature = "runtime-benchmarks")]
 
 use assert_cmd::cargo::cargo_bin;
diff --git a/cumulus/polkadot-parachain/tests/common.rs b/cumulus/polkadot-parachain/tests/common.rs
index d8ecfe9bcbe5adbb8cfc5b2d18263ccbef489845..20926ddd91db53de52d32fb952ded38f8f868b97 100644
--- a/cumulus/polkadot-parachain/tests/common.rs
+++ b/cumulus/polkadot-parachain/tests/common.rs
@@ -1,4 +1,4 @@
-// Copyright 2020-2021 Parity Technologies (UK) Ltd.
+// Copyright (C) Parity Technologies (UK) Ltd.
 // This file is part of Substrate.
 
 // Substrate is free software: you can redistribute it and/or modify
@@ -12,7 +12,7 @@
 // GNU General Public License for more details.
 
 // You should have received a copy of the GNU General Public License
-// along with Substrate.  If not, see <http://www.gnu.org/licenses/>.
+// along with Cumulus.  If not, see <http://www.gnu.org/licenses/>.
 
 #![cfg(unix)]
 
diff --git a/cumulus/polkadot-parachain/tests/polkadot_argument_parsing.rs b/cumulus/polkadot-parachain/tests/polkadot_argument_parsing.rs
index 0538a47aa93ac02c951143ce2806cec3cac6878e..9337da85d74b16f594aa7baacf3e76a35b1bb976 100644
--- a/cumulus/polkadot-parachain/tests/polkadot_argument_parsing.rs
+++ b/cumulus/polkadot-parachain/tests/polkadot_argument_parsing.rs
@@ -1,4 +1,4 @@
-// Copyright 2020-2021 Parity Technologies (UK) Ltd.
+// Copyright (C) Parity Technologies (UK) Ltd.
 // This file is part of Substrate.
 
 // Substrate is free software: you can redistribute it and/or modify
@@ -12,7 +12,7 @@
 // GNU General Public License for more details.
 
 // You should have received a copy of the GNU General Public License
-// along with Substrate.  If not, see <http://www.gnu.org/licenses/>.
+// along with Cumulus.  If not, see <http://www.gnu.org/licenses/>.
 
 use tempfile::tempdir;
 
diff --git a/cumulus/polkadot-parachain/tests/polkadot_mdns_issue.rs b/cumulus/polkadot-parachain/tests/polkadot_mdns_issue.rs
index c88c81230b04c03987c60a1c8450f70dd69fee32..e3ccb7fe0fbdc2a7de5e04553985657b8b87733d 100644
--- a/cumulus/polkadot-parachain/tests/polkadot_mdns_issue.rs
+++ b/cumulus/polkadot-parachain/tests/polkadot_mdns_issue.rs
@@ -1,4 +1,4 @@
-// Copyright 2020-2021 Parity Technologies (UK) Ltd.
+// Copyright (C) Parity Technologies (UK) Ltd.
 // This file is part of Substrate.
 
 // Substrate is free software: you can redistribute it and/or modify
@@ -12,7 +12,7 @@
 // GNU General Public License for more details.
 
 // You should have received a copy of the GNU General Public License
-// along with Substrate.  If not, see <http://www.gnu.org/licenses/>.
+// along with Cumulus.  If not, see <http://www.gnu.org/licenses/>.
 
 use tempfile::tempdir;
 
diff --git a/cumulus/polkadot-parachain/tests/purge_chain_works.rs b/cumulus/polkadot-parachain/tests/purge_chain_works.rs
index 8a41ee780c5607234019d8eac608896f7c7cb13d..6415a914c7a3c8e1f381a08c29eef9cb3c1ebe55 100644
--- a/cumulus/polkadot-parachain/tests/purge_chain_works.rs
+++ b/cumulus/polkadot-parachain/tests/purge_chain_works.rs
@@ -1,4 +1,4 @@
-// Copyright 2020-2021 Parity Technologies (UK) Ltd.
+// Copyright (C) Parity Technologies (UK) Ltd.
 // This file is part of Substrate.
 
 // Substrate is free software: you can redistribute it and/or modify
@@ -12,7 +12,7 @@
 // GNU General Public License for more details.
 
 // You should have received a copy of the GNU General Public License
-// along with Substrate.  If not, see <http://www.gnu.org/licenses/>.
+// along with Cumulus.  If not, see <http://www.gnu.org/licenses/>.
 
 use assert_cmd::cargo::cargo_bin;
 use nix::sys::signal::SIGINT;
diff --git a/cumulus/polkadot-parachain/tests/running_the_node_and_interrupt.rs b/cumulus/polkadot-parachain/tests/running_the_node_and_interrupt.rs
index 254602a21844b9aa7d5cce3d4c861febb9fe379e..0f4ae6992382c7a8a58da25ac110b97b6db72f62 100644
--- a/cumulus/polkadot-parachain/tests/running_the_node_and_interrupt.rs
+++ b/cumulus/polkadot-parachain/tests/running_the_node_and_interrupt.rs
@@ -1,4 +1,4 @@
-// Copyright 2020-2021 Parity Technologies (UK) Ltd.
+// Copyright (C) Parity Technologies (UK) Ltd.
 // This file is part of Substrate.
 
 // Substrate is free software: you can redistribute it and/or modify
@@ -12,7 +12,7 @@
 // GNU General Public License for more details.
 
 // You should have received a copy of the GNU General Public License
-// along with Substrate.  If not, see <http://www.gnu.org/licenses/>.
+// along with Cumulus.  If not, see <http://www.gnu.org/licenses/>.
 
 use tempfile::tempdir;
 
diff --git a/cumulus/primitives/aura/Cargo.toml b/cumulus/primitives/aura/Cargo.toml
index f03495c19060645afc4c9971a4230256b4986d35..791ec17378a803b4ef5945082a2333a3d7df7952 100644
--- a/cumulus/primitives/aura/Cargo.toml
+++ b/cumulus/primitives/aura/Cargo.toml
@@ -1,8 +1,8 @@
 [package]
 name = "cumulus-primitives-aura"
 version = "0.1.0"
-authors = ["Parity Technologies <admin@parity.io>"]
-edition = "2021"
+authors.workspace = true
+edition.workspace = true
 
 [dependencies]
 codec = { package = "parity-scale-codec", version = "3.0.0", default-features = false, features = [ "derive" ] }
diff --git a/cumulus/primitives/aura/src/lib.rs b/cumulus/primitives/aura/src/lib.rs
index a0d7a0206a632191f366f966f08bd2715ea44201..826b65fddd2c695f0c0a1c63d77e9eab68fe0f30 100644
--- a/cumulus/primitives/aura/src/lib.rs
+++ b/cumulus/primitives/aura/src/lib.rs
@@ -1,4 +1,4 @@
-// Copyright 2023 Parity Technologies (UK) Ltd.
+// Copyright (C) Parity Technologies (UK) Ltd.
 // This file is part of Cumulus.
 
 // Substrate is free software: you can redistribute it and/or modify
diff --git a/cumulus/primitives/core/Cargo.toml b/cumulus/primitives/core/Cargo.toml
index 872278ad295e3e723c49be2b317619ca61c8bdaa..fc7573be138357bab6757b59119e0891c37953fb 100644
--- a/cumulus/primitives/core/Cargo.toml
+++ b/cumulus/primitives/core/Cargo.toml
@@ -1,8 +1,8 @@
 [package]
 name = "cumulus-primitives-core"
 version = "0.1.0"
-authors = ["Parity Technologies <admin@parity.io>"]
-edition = "2021"
+authors.workspace = true
+edition.workspace = true
 
 [dependencies]
 codec = { package = "parity-scale-codec", version = "3.0.0", default-features = false, features = [ "derive" ] }
@@ -16,20 +16,21 @@ sp-trie = { path = "../../../substrate/primitives/trie", default-features = fals
 
 # Polkadot
 polkadot-core-primitives = { path = "../../../polkadot/core-primitives", default-features = false}
-polkadot-parachain = { path = "../../../polkadot/parachain", default-features = false}
+polkadot-parachain-primitives = { path = "../../../polkadot/parachain", default-features = false}
 polkadot-primitives = { path = "../../../polkadot/primitives", default-features = false}
-xcm = { path = "../../../polkadot/xcm", default-features = false}
+xcm = { package = "staging-xcm", path = "../../../polkadot/xcm", default-features = false}
 
 [features]
 default = [ "std" ]
 std = [
 	"codec/std",
 	"polkadot-core-primitives/std",
-	"polkadot-parachain/std",
+	"polkadot-parachain-primitives/std",
 	"polkadot-primitives/std",
 	"scale-info/std",
 	"sp-api/std",
 	"sp-runtime/std",
 	"sp-std/std",
 	"sp-trie/std",
+	"xcm/std",
 ]
diff --git a/cumulus/primitives/core/src/lib.rs b/cumulus/primitives/core/src/lib.rs
index 19cc69ea3013175d6de28ad7dc7093d35ad241b7..faaef09b26e174c151144e8a52bb76d8a495c285 100644
--- a/cumulus/primitives/core/src/lib.rs
+++ b/cumulus/primitives/core/src/lib.rs
@@ -1,4 +1,4 @@
-// Copyright 2020-2021 Parity Technologies (UK) Ltd.
+// Copyright (C) Parity Technologies (UK) Ltd.
 // This file is part of Cumulus.
 
 // Substrate is free software: you can redistribute it and/or modify
@@ -19,13 +19,13 @@
 #![cfg_attr(not(feature = "std"), no_std)]
 
 use codec::{Decode, Encode};
-use polkadot_parachain::primitives::HeadData;
+use polkadot_parachain_primitives::primitives::HeadData;
 use scale_info::TypeInfo;
 use sp_runtime::RuntimeDebug;
 use sp_std::prelude::*;
 
 pub use polkadot_core_primitives::InboundDownwardMessage;
-pub use polkadot_parachain::primitives::{
+pub use polkadot_parachain_primitives::primitives::{
 	DmpMessageHandler, Id as ParaId, IsSystem, UpwardMessage, ValidationParams, XcmpMessageFormat,
 	XcmpMessageHandler,
 };
diff --git a/cumulus/primitives/parachain-inherent/Cargo.toml b/cumulus/primitives/parachain-inherent/Cargo.toml
index ffcc0a47cc2b8fc4304d493484aab13e7d824ab8..39b70f20a97ff99587a63a6de816de8ce8b15964 100644
--- a/cumulus/primitives/parachain-inherent/Cargo.toml
+++ b/cumulus/primitives/parachain-inherent/Cargo.toml
@@ -1,8 +1,8 @@
 [package]
 name = "cumulus-primitives-parachain-inherent"
 version = "0.1.0"
-authors = ["Parity Technologies <admin@parity.io>"]
-edition = "2021"
+authors.workspace = true
+edition.workspace = true
 
 [dependencies]
 async-trait = { version = "0.1.73", optional = true }
diff --git a/cumulus/primitives/parachain-inherent/src/client_side.rs b/cumulus/primitives/parachain-inherent/src/client_side.rs
index 1d936239104d06fa0c62756ea01125ce287ed360..52987d2da44ceee275b88a441f5a64951cf245f2 100644
--- a/cumulus/primitives/parachain-inherent/src/client_side.rs
+++ b/cumulus/primitives/parachain-inherent/src/client_side.rs
@@ -1,4 +1,4 @@
-// Copyright 2021 Parity Technologies (UK) Ltd.
+// Copyright (C) Parity Technologies (UK) Ltd.
 // This file is part of Cumulus.
 
 // Substrate is free software: you can redistribute it and/or modify
diff --git a/cumulus/primitives/parachain-inherent/src/lib.rs b/cumulus/primitives/parachain-inherent/src/lib.rs
index 34b9064090c2d0ba4b227421eefb8e8058d5104b..08407023bb4604933ff4de97a6669e45b85d6bc5 100644
--- a/cumulus/primitives/parachain-inherent/src/lib.rs
+++ b/cumulus/primitives/parachain-inherent/src/lib.rs
@@ -1,4 +1,4 @@
-// Copyright 2021 Parity Technologies (UK) Ltd.
+// Copyright (C) Parity Technologies (UK) Ltd.
 // This file is part of Cumulus.
 
 // Substrate is free software: you can redistribute it and/or modify
diff --git a/cumulus/primitives/parachain-inherent/src/mock.rs b/cumulus/primitives/parachain-inherent/src/mock.rs
index 18e23ba23af09c29b709ac3079429c80edd07497..5168b46a14d03def1ccfe72c9244e71bfb202d84 100644
--- a/cumulus/primitives/parachain-inherent/src/mock.rs
+++ b/cumulus/primitives/parachain-inherent/src/mock.rs
@@ -1,4 +1,4 @@
-// Copyright 2021 Parity Technologies (UK) Ltd.
+// Copyright (C) Parity Technologies (UK) Ltd.
 // This file is part of Cumulus.
 
 // Cumulus is free software: you can redistribute it and/or modify
diff --git a/cumulus/primitives/timestamp/Cargo.toml b/cumulus/primitives/timestamp/Cargo.toml
index e26c02f2b076106ffcb5dc5253058af1ca503471..6b0d3d4a4dc6b3b755f0a822ecb0fa1062f1fc9a 100644
--- a/cumulus/primitives/timestamp/Cargo.toml
+++ b/cumulus/primitives/timestamp/Cargo.toml
@@ -1,8 +1,8 @@
 [package]
 name = "cumulus-primitives-timestamp"
 version = "0.1.0"
-authors = ["Parity Technologies <admin@parity.io>"]
-edition = "2021"
+authors.workspace = true
+edition.workspace = true
 description = "Provides timestamp related functionality for parachains."
 
 [dependencies]
diff --git a/cumulus/primitives/timestamp/src/lib.rs b/cumulus/primitives/timestamp/src/lib.rs
index c8030fb09c4d5acfb319bb5ceecf9745578cafc9..535c4a2a7268b9df053021d824fd0fbb0599845b 100644
--- a/cumulus/primitives/timestamp/src/lib.rs
+++ b/cumulus/primitives/timestamp/src/lib.rs
@@ -1,4 +1,4 @@
-// Copyright 2021 Parity Technologies (UK) Ltd.
+// Copyright (C) Parity Technologies (UK) Ltd.
 // This file is part of Cumulus.
 
 // Cumulus is free software: you can redistribute it and/or modify
diff --git a/cumulus/primitives/utility/Cargo.toml b/cumulus/primitives/utility/Cargo.toml
index 7302d28f02491ad8144adf31d22e56bafe772221..9ed1e664ac217e7504d2ca6915c588b5c9c82c10 100644
--- a/cumulus/primitives/utility/Cargo.toml
+++ b/cumulus/primitives/utility/Cargo.toml
@@ -1,8 +1,8 @@
 [package]
 name = "cumulus-primitives-utility"
 version = "0.1.0"
-authors = ["Parity Technologies <admin@parity.io>"]
-edition = "2021"
+authors.workspace = true
+edition.workspace = true
 
 [dependencies]
 codec = { package = "parity-scale-codec", version = "3.0.0", default-features = false, features = [ "derive" ] }
@@ -16,9 +16,9 @@ sp-std = { path = "../../../substrate/primitives/std", default-features = false}
 
 # Polkadot
 polkadot-runtime-common = { path = "../../../polkadot/runtime/common", default-features = false}
-xcm = { path = "../../../polkadot/xcm", default-features = false}
-xcm-executor = { path = "../../../polkadot/xcm/xcm-executor", default-features = false}
-xcm-builder = { path = "../../../polkadot/xcm/xcm-builder", default-features = false}
+xcm = { package = "staging-xcm", path = "../../../polkadot/xcm", default-features = false}
+xcm-executor = { package = "staging-xcm-executor", path = "../../../polkadot/xcm/xcm-executor", default-features = false}
+xcm-builder = { package = "staging-xcm-builder", path = "../../../polkadot/xcm/xcm-builder", default-features = false}
 
 
 # Cumulus
@@ -38,3 +38,11 @@ std = [
 	"xcm-executor/std",
 	"xcm/std",
 ]
+
+runtime-benchmarks = [
+	"frame-support/runtime-benchmarks",
+	"polkadot-runtime-common/runtime-benchmarks",
+	"sp-runtime/runtime-benchmarks",
+	"xcm-builder/runtime-benchmarks",
+	"xcm-executor/runtime-benchmarks",
+]
diff --git a/cumulus/primitives/utility/src/lib.rs b/cumulus/primitives/utility/src/lib.rs
index 87be029163d668afdb17f713d9e7517faa63b2d6..7d07bc329ed4cc0fdfcb08ec5281e1c7f3f378d2 100644
--- a/cumulus/primitives/utility/src/lib.rs
+++ b/cumulus/primitives/utility/src/lib.rs
@@ -1,4 +1,4 @@
-// Copyright 2020-2021 Parity Technologies (UK) Ltd.
+// Copyright (C) Parity Technologies (UK) Ltd.
 // This file is part of Cumulus.
 
 // Substrate is free software: you can redistribute it and/or modify
@@ -315,11 +315,11 @@ mod tests {
 	use cumulus_primitives_core::UpwardMessage;
 	use frame_support::{
 		assert_ok,
-		dispatch::DispatchError,
 		traits::tokens::{
 			DepositConsequence, Fortitude, Preservation, Provenance, WithdrawConsequence,
 		},
 	};
+	use sp_runtime::DispatchError;
 	use xcm_executor::{traits::Error, Assets};
 
 	/// Validates [`validate`] for required Some(destination) and Some(message)
diff --git a/cumulus/scripts/ci/changelog/.gitignore b/cumulus/scripts/ci/changelog/.gitignore
deleted file mode 100644
index 4fbcc523b04cf0aba6c866a38250a83c16deb8d8..0000000000000000000000000000000000000000
--- a/cumulus/scripts/ci/changelog/.gitignore
+++ /dev/null
@@ -1,4 +0,0 @@
-changelog.md
-*.json
-release*.md
-.env
diff --git a/cumulus/scripts/ci/changelog/Gemfile b/cumulus/scripts/ci/changelog/Gemfile
deleted file mode 100644
index 46b058e3c5004c85f4ef79b867d2a6638a7e8cd4..0000000000000000000000000000000000000000
--- a/cumulus/scripts/ci/changelog/Gemfile
+++ /dev/null
@@ -1,23 +0,0 @@
-# frozen_string_literal: true
-
-source 'https://rubygems.org'
-
-git_source(:github) { |repo_name| "https://github.com/#{repo_name}" }
-
-gem 'octokit', '~> 4'
-
-gem 'git_diff_parser', '~> 3'
-
-gem 'toml', '~> 0.3.0'
-
-gem 'rake', group: :dev
-
-gem 'optparse', '~> 0.1.1'
-
-gem 'logger', '~> 1.4'
-
-gem 'changelogerator', '0.10.1'
-
-gem 'test-unit', group: :dev
-
-gem 'rubocop', group: :dev, require: false
diff --git a/cumulus/scripts/ci/changelog/Gemfile.lock b/cumulus/scripts/ci/changelog/Gemfile.lock
deleted file mode 100644
index 893bec54919513e84cdda9313ea4f02edb4b51bf..0000000000000000000000000000000000000000
--- a/cumulus/scripts/ci/changelog/Gemfile.lock
+++ /dev/null
@@ -1,84 +0,0 @@
-GEM
-  remote: https://rubygems.org/
-  specs:
-    addressable (2.8.0)
-      public_suffix (>= 2.0.2, < 5.0)
-    ast (2.4.2)
-    changelogerator (0.10.1)
-      git_diff_parser (~> 3)
-      octokit (~> 4)
-    faraday (1.8.0)
-      faraday-em_http (~> 1.0)
-      faraday-em_synchrony (~> 1.0)
-      faraday-excon (~> 1.1)
-      faraday-httpclient (~> 1.0.1)
-      faraday-net_http (~> 1.0)
-      faraday-net_http_persistent (~> 1.1)
-      faraday-patron (~> 1.0)
-      faraday-rack (~> 1.0)
-      multipart-post (>= 1.2, < 3)
-      ruby2_keywords (>= 0.0.4)
-    faraday-em_http (1.0.0)
-    faraday-em_synchrony (1.0.0)
-    faraday-excon (1.1.0)
-    faraday-httpclient (1.0.1)
-    faraday-net_http (1.0.1)
-    faraday-net_http_persistent (1.2.0)
-    faraday-patron (1.0.0)
-    faraday-rack (1.0.0)
-    git_diff_parser (3.2.0)
-    logger (1.4.4)
-    multipart-post (2.1.1)
-    octokit (4.21.0)
-      faraday (>= 0.9)
-      sawyer (~> 0.8.0, >= 0.5.3)
-    optparse (0.1.1)
-    parallel (1.21.0)
-    parser (3.0.2.0)
-      ast (~> 2.4.1)
-    parslet (2.0.0)
-    power_assert (2.0.1)
-    public_suffix (4.0.6)
-    rainbow (3.0.0)
-    rake (13.0.6)
-    regexp_parser (2.1.1)
-    rexml (3.2.5)
-    rubocop (1.23.0)
-      parallel (~> 1.10)
-      parser (>= 3.0.0.0)
-      rainbow (>= 2.2.2, < 4.0)
-      regexp_parser (>= 1.8, < 3.0)
-      rexml
-      rubocop-ast (>= 1.12.0, < 2.0)
-      ruby-progressbar (~> 1.7)
-      unicode-display_width (>= 1.4.0, < 3.0)
-    rubocop-ast (1.13.0)
-      parser (>= 3.0.1.1)
-    ruby-progressbar (1.11.0)
-    ruby2_keywords (0.0.5)
-    sawyer (0.8.2)
-      addressable (>= 2.3.5)
-      faraday (> 0.8, < 2.0)
-    test-unit (3.5.1)
-      power_assert
-    toml (0.3.0)
-      parslet (>= 1.8.0, < 3.0.0)
-    unicode-display_width (2.1.0)
-
-PLATFORMS
-  x86_64-darwin-20
-  x86_64-darwin-22
-
-DEPENDENCIES
-  changelogerator (= 0.10.1)
-  git_diff_parser (~> 3)
-  logger (~> 1.4)
-  octokit (~> 4)
-  optparse (~> 0.1.1)
-  rake
-  rubocop
-  test-unit
-  toml (~> 0.3.0)
-
-BUNDLED WITH
-   2.2.22
diff --git a/cumulus/scripts/ci/changelog/README.md b/cumulus/scripts/ci/changelog/README.md
deleted file mode 100644
index 478e0b56d9ca317895b2430afdb8e19fbff87ebe..0000000000000000000000000000000000000000
--- a/cumulus/scripts/ci/changelog/README.md
+++ /dev/null
@@ -1,78 +0,0 @@
-# Changelog
-
-Currently, the changelog is built locally. It will be moved to CI once labels stabilize.
-
-For now, a bit of preparation is required before you can run the script:
-- fetch the srtool digests
-- store them under the `digests` folder as `<chain>-srtool-digest.json`
-- ensure the `.env` file is up to date with correct information
-
-The content of the release notes is generated from the template files under the `scripts/ci/changelog/templates` folder. For readability and maintenance, the template is split into several small snippets.
-
-Run:
-```
-./bin/changelog <ref_since> [<ref_until>=HEAD]
-```
-
-For instance:
-```
-./bin/changelog parachains-v7.0.0-rc8
-```
-
-A file called `release-notes.md` will be generated and can be used for the release.
-
-## ENV
-
-You may use the following ENV for testing:
-
-```
-RUSTC_STABLE="rustc 1.56.1 (59eed8a2a 2021-11-01)"
-RUSTC_NIGHTLY="rustc 1.57.0-nightly (51e514c0f 2021-09-12)"
-PRE_RELEASE=true
-HIDE_SRTOOL_ROCOCO=true
-HIDE_SRTOOL_SHELL=true
-REF1=statemine-v5.0.0
-REF2=HEAD
-DEBUG=1
-NO_CACHE=1
-```
-
-By default, the template will include all the information, including the runtime data.
-For clients releases, we don't need those and they can be skipped by setting the following env:
-```
-RELEASE_TYPE=client
-```
-
-## Considered labels
-
-The following list will likely evolve over time and it will be hard to keep it in sync.
-In any case, if you want to find all the labels that are used, search for `meta` in the templates.
-Currently, the considered labels are:
-
-- Priority: C<N> labels
-- Audit: D<N> labels
-- E4 => new host function
-- B0 => silent, not showing up
-- B1-releasenotes (misc unless other labels)
-- B5-client (client changes)
-- B7-runtimenoteworthy (runtime changes)
-- T6-XCM
-
-Note that labels with the same letter are mutually exclusive.
-A PR should not have both `B0` and `B5`, or both `C1` and `C9`. In case of conflicts, the template will
-decide which label will be considered.
-
-## Dev and debuggin
-
-### Hot Reload
-
-The following command allows **Hot Reload**:
-```
-fswatch templates -e ".*\.md$" | xargs -n1 -I{} ./bin/changelog statemine-v5.0.0
-```
-### Caching
-
-By default, if the changelog data from Github is already present, the calls to the Github API will be skipped
-and the local version of the data will be used. This is much faster.
-If you know that some labels have changed in Github, you probably want to refresh the data.
-You can then either delete manually the `cumulus.json` file or `export NO_CACHE=1` to force refreshing the data.
diff --git a/cumulus/scripts/ci/changelog/bin/changelog b/cumulus/scripts/ci/changelog/bin/changelog
deleted file mode 100755
index 6cd012a29edb791334a80b4cc830d6757c4416b6..0000000000000000000000000000000000000000
--- a/cumulus/scripts/ci/changelog/bin/changelog
+++ /dev/null
@@ -1,164 +0,0 @@
-#!/usr/bin/env ruby
-
-# frozen_string_literal: true
-
-# call for instance as:
-# ./bin/changelog statemine-v5.0.0
-#
-# You may set the ENV NO_CACHE to force fetching from Github
-# You should also ensure you set the ENV: GITHUB_TOKEN
-
-require_relative '../lib/changelog'
-require 'logger'
-
-logger = Logger.new($stdout)
-logger.level = Logger::DEBUG
-logger.debug('Starting')
-
-changelogerator_version = `changelogerator --version`
-logger.debug(changelogerator_version)
-
-owner = 'paritytech'
-repo = 'cumulus'
-ref1 = ARGV[0]
-ref2 = ARGV[1] || 'HEAD'
-output = ARGV[2] || 'release-notes.md'
-
-ENV['REF1'] = ref1
-ENV['REF2'] = ref2
-
-gh_cumulus = SubRef.new(format('%<owner>s/%<repo>s', { owner: owner, repo: repo }))
-
-polkadot_ref1 = gh_cumulus.get_dependency_reference(ref1, 'polkadot-primitives')
-polkadot_ref2 = gh_cumulus.get_dependency_reference(ref2, 'polkadot-primitives')
-
-substrate_ref1 = gh_cumulus.get_dependency_reference(ref1, 'sp-io')
-substrate_ref2 = gh_cumulus.get_dependency_reference(ref2, 'sp-io')
-
-logger.debug("Cumulus from:    #{ref1}")
-logger.debug("Cumulus to:      #{ref2}")
-
-logger.debug("Polkadot from:   #{polkadot_ref1}")
-logger.debug("Polkadot to:     #{polkadot_ref2}")
-
-logger.debug("Substrate from:  #{substrate_ref1}")
-logger.debug("Substrate to:    #{substrate_ref2}")
-
-cumulus_data = 'cumulus.json'
-substrate_data = 'substrate.json'
-polkadot_data = 'polkadot.json'
-
-logger.debug("Using CUMULUS:   #{cumulus_data}")
-logger.debug("Using SUBSTRATE: #{substrate_data}")
-logger.debug("Using POLKADOT:  #{polkadot_data}")
-
-logger.warn('NO_CACHE set') if ENV['NO_CACHE']
-
-# This is acting as cache so we don't spend time querying while testing
-if ENV['NO_CACHE'] || !File.file?(cumulus_data)
-  logger.debug(format('Fetching data for Cumulus into %s', cumulus_data))
-  cmd = format('changelogerator %<owner>s/%<repo>s -f %<from>s -t %<to>s > %<output>s',
-               { owner: owner, repo: repo, from: ref1, to: ref2, output: cumulus_data })
-  system(cmd)
-else
-  logger.debug("Re-using:#{cumulus_data}")
-end
-
-if ENV['NO_CACHE'] || !File.file?(polkadot_data)
-  logger.debug(format('Fetching data for Polkadot into %s', polkadot_data))
-  cmd = format('changelogerator %<owner>s/%<repo>s -f %<from>s -t %<to>s > %<output>s',
-               { owner: owner, repo: 'polkadot', from: polkadot_ref1, to: polkadot_ref2, output: polkadot_data })
-  system(cmd)
-else
-  logger.debug("Re-using:#{polkadot_data}")
-end
-
-if ENV['NO_CACHE'] || !File.file?(substrate_data)
-  logger.debug(format('Fetching data for Substrate into %s', substrate_data))
-  cmd = format('changelogerator %<owner>s/%<repo>s -f %<from>s -t %<to>s > %<output>s',
-               { owner: owner, repo: 'substrate', from: substrate_ref1, to: substrate_ref2, output: substrate_data })
-  system(cmd)
-else
-  logger.debug("Re-using:#{substrate_data}")
-end
-
-POLKADOT_COLLECTIVES_DIGEST = ENV['COLLECTIVES_POLKADOT_DIGEST'] || 'digests/collectives-polkadot-srtool-digest.json'
-SHELL_DIGEST = ENV['SHELL_DIGEST'] || 'digests/shell-srtool-digest.json'
-ASSET_HUB_WESTEND_DIGEST = ENV['ASSET_HUB_WESTEND_DIGEST'] || 'digests/asset-hub-westend-srtool-digest.json'
-ASSET_HUB_KUSAMA_DIGEST = ENV['ASSET_HUB_KUSAMA_DIGEST'] || 'digests/asset-hub-kusama-srtool-digest.json'
-ASSET_HUB_POLKADOT_DIGEST = ENV['ASSET_HUB_POLKADOT_DIGEST'] || 'digests/asset-hub-westend-srtool-digest.json'
-BRIDGE_HUB_ROCOCO_DIGEST = ENV['BRIDGE_HUB_ROCOCO_DIGEST'] || 'digests/bridge-hub-rococo-srtool-digest.json'
-BRIDGE_HUB_KUSAMA_DIGEST = ENV['BRIDGE_HUB_KUSAMA_DIGEST'] || 'digests/bridge-hub-kusama-srtool-digest.json'
-BRIDGE_HUB_POLKADOT_DIGEST = ENV['BRIDGE_HUB_POLKADOT_DIGEST'] || 'digests/bridge-hub-polkadot-srtool-digest.json'
-ROCOCO_PARA_DIGEST = ENV['ROCOCO_PARA_DIGEST'] || 'digests/rococo-parachain-srtool-digest.json'
-CANVAS_KUSAMA_DIGEST = ENV['CANVAS_KUSAMA_DIGEST'] || 'digests/contracts-rococo-srtool-digest.json'
-
-logger.debug("Release type: #{ENV['RELEASE_TYPE']}")
-
-if ENV['RELEASE_TYPE'] && ENV['RELEASE_TYPE'] == 'client'
-  logger.debug('Building changelog without runtimes')
-  cmd = format('jq \
-    --slurpfile cumulus %s \
-    --slurpfile substrate %s \
-    --slurpfile polkadot %s \
-    -n \'{
-            cumulus: $cumulus[0],
-            substrate: $substrate[0],
-            polkadot: $polkadot[0],
-          }\' > context.json', cumulus_data, substrate_data, polkadot_data,
-  )
-else
-  logger.debug('Building changelog with runtimes')
-
-  # Here we compose all the pieces together into one
-  # single big json file.
-  cmd = format('jq \
-      --slurpfile cumulus %s \
-      --slurpfile substrate %s \
-      --slurpfile polkadot %s \
-      --slurpfile srtool_shell %s \
-      --slurpfile srtool_westmint %s \
-      --slurpfile srtool_statemine %s \
-      --slurpfile srtool_statemint %s \
-      --slurpfile srtool_rococo_parachain %s \
-      --slurpfile srtool_contracts_rococo %s \
-      --slurpfile srtool_polkadot_collectives %s \
-      --slurpfile srtool_bridge_hub_rococo %s \
-      --slurpfile srtool_bridge_hub_kusama %s \
-      --slurpfile srtool_bridge_hub_polkadot %s \
-      -n \'{
-            cumulus: $cumulus[0],
-            substrate: $substrate[0],
-            polkadot: $polkadot[0],
-          srtool: [
-            { order: 10, name: "asset-hub-polkadot", note: " (Former Statemint)", data: $srtool_statemint[0] },
-            { order: 11, name: "bridge-hub-polkadot", data: $srtool_bridge_hub_polkadot[0] },
-            { order: 20, name: "asset-hub-kusama", note: " (Former Statemine)", data: $srtool_statemine[0] },
-            { order: 21, name: "bridge-hub-kusama", data: $srtool_bridge_hub_kusama[0] },
-            { order: 30, name: "asset-hub-westend", note: " (Former Westmint)", data: $srtool_westmint[0] },
-            { order: 40, name: "rococo", data: $srtool_rococo_parachain[0] },
-            { order: 41, name: "bridge-hub-rococo", data: $srtool_bridge_hub_rococo[0] },
-            { order: 50, name: "polkadot-collectives", data: $srtool_polkadot_collectives[0] },
-            { order: 60, name: "contracts", data: $srtool_contracts_rococo[0] },
-            { order: 90, name: "shell", data: $srtool_shell[0] }
-      ] }\' > context.json',
-        cumulus_data,
-        substrate_data,
-        polkadot_data,
-        SHELL_DIGEST,
-        ASSET_HUB_WESTEND_DIGEST,
-        ASSET_HUB_KUSAMA_DIGEST,
-        ASSET_HUB_POLKADOT_DIGEST,
-        ROCOCO_PARA_DIGEST,
-        CANVAS_KUSAMA_DIGEST,
-        POLKADOT_COLLECTIVES_DIGEST,
-        BRIDGE_HUB_ROCOCO_DIGEST,
-        BRIDGE_HUB_KUSAMA_DIGEST,
-        BRIDGE_HUB_POLKADOT_DIGEST
-  )
-end
-system(cmd)
-
-cmd = format('tera --env --env-key env --include-path templates \
-        --template templates/template.md.tera context.json > %s', output)
-system(cmd)
diff --git a/cumulus/scripts/ci/changelog/digests/.gitignore b/cumulus/scripts/ci/changelog/digests/.gitignore
deleted file mode 100644
index a6c57f5fb2ffba0a6af4278619c2983394d237cc..0000000000000000000000000000000000000000
--- a/cumulus/scripts/ci/changelog/digests/.gitignore
+++ /dev/null
@@ -1 +0,0 @@
-*.json
diff --git a/cumulus/scripts/ci/changelog/lib/changelog.rb b/cumulus/scripts/ci/changelog/lib/changelog.rb
deleted file mode 100644
index 2d9ee29a8c89e3397b7ad8eeeee17e2e61ec4dd8..0000000000000000000000000000000000000000
--- a/cumulus/scripts/ci/changelog/lib/changelog.rb
+++ /dev/null
@@ -1,32 +0,0 @@
-# frozen_string_literal: true
-
-# A Class to find Substrate references
-class SubRef
-  require 'octokit'
-  require 'toml'
-
-  attr_reader :client, :repository
-
-  def initialize(github_repo)
-    @client = Octokit::Client.new(
-      access_token: ENV['GITHUB_TOKEN']
-    )
-    @repository = @client.repository(github_repo)
-  end
-
-  # This function checks the Cargo.lock of a given
-  # Rust project, for a given package, and fetches
-  # the dependency git ref.
-  def get_dependency_reference(ref, package)
-    cargo = TOML::Parser.new(
-      Base64.decode64(
-        @client.contents(
-          @repository.full_name,
-          path: 'Cargo.lock',
-          query: { ref: ref.to_s }
-        ).content
-      )
-    ).parsed
-    cargo['package'].find { |p| p['name'] == package }['source'].split('#').last
-  end
-end
diff --git a/cumulus/scripts/ci/changelog/templates/change.md.tera b/cumulus/scripts/ci/changelog/templates/change.md.tera
deleted file mode 100644
index 609a038789ac79a37be2413da24b2f22ef72d95d..0000000000000000000000000000000000000000
--- a/cumulus/scripts/ci/changelog/templates/change.md.tera
+++ /dev/null
@@ -1,44 +0,0 @@
-{# This macro shows ONE change #}
-{%- macro change(c, cml="[C]", dot="[P]", sub="[S]") -%}
-
-{%- if c.meta.C and c.meta.C.agg.max >= 5 -%}
-{%- set prio = " ‼️ HIGH" -%}
-{%- elif c.meta.C and c.meta.C.agg.max >= 3 -%}
-{%- set prio = " ❗️ Medium" -%}
-{%- elif c.meta.C and c.meta.C.agg.max < 3 -%}
-{%- set prio = " Low" -%}
-{%- else -%}
-{%- set prio = "" -%}
-{%- endif -%}
-
-{%- set audit = "" -%}
-{#
-{%- if c.meta.D and c.meta.D.D1 -%}
-{%- set audit = "✅ audited " -%}
-{%- elif c.meta.D and c.meta.D.D2 -%}
-{%- set audit = "✅ trivial " -%}
-{%- elif c.meta.D and c.meta.D.D3 -%}
-{%- set audit = "✅ trivial " -%}
-{%- elif c.meta.D and c.meta.D.D5 -%}
-{%- set audit = "⏳ pending non-critical audit " -%}
-{%- else -%}
-{%- set audit = "" -%}
-{%- endif -%}
-#}
-{%- if c.html_url is containing("polkadot") -%}
-{%- set repo = dot -%}
-{%- elif c.html_url is containing("cumulus") -%}
-{%- set repo = cml -%}
-{%- elif c.html_url is containing("substrate") -%}
-{%- set repo = sub -%}
-{%- else -%}
-{%- set repo = "   " -%}
-{%- endif -%}
-{# #}
-{%- if c.meta.T and c.meta.T.T6 -%}
-{%- set xcm = " [✉️ XCM]" -%}
-{%- else -%}
-{%- set xcm = "" -%}
-{%- endif -%}
-{{- repo }} {{ audit }}[`#{{c.number}}`]({{c.html_url}}) {{- prio }} - {{ c.title | capitalize | truncate(length=60, end="…") }}{{xcm }}
-{%- endmacro change %}
diff --git a/cumulus/scripts/ci/changelog/templates/changes.md.tera b/cumulus/scripts/ci/changelog/templates/changes.md.tera
deleted file mode 100644
index f1704546b0a7e62b0cb155900d22fb992245784c..0000000000000000000000000000000000000000
--- a/cumulus/scripts/ci/changelog/templates/changes.md.tera
+++ /dev/null
@@ -1,21 +0,0 @@
-{# This include generates the section showing the changes #}
-## Changes
-
-### Legend
-
-- {{ CML }} Cumulus
-- {{ DOT }} Polkadot
-- {{ SUB }} Substrate
-
-{% if env.RELEASE_TYPE and env.RELEASE_TYPE == "client" %}
-{% include "changes_client.md.tera" %}
-{% else %}
-{% include "migrations-runtime.md.tera" -%}
-
-{% include "changes_runtime.md.tera" %}
-
-{% endif %}
-
-{% include "changes_api.md.tera" %}
-
-{% include "changes_misc.md.tera" %}
diff --git a/cumulus/scripts/ci/changelog/templates/changes_api.md.tera b/cumulus/scripts/ci/changelog/templates/changes_api.md.tera
deleted file mode 100644
index 2379c178c0314f6af4f529c94a9823c1fc8c8eab..0000000000000000000000000000000000000000
--- a/cumulus/scripts/ci/changelog/templates/changes_api.md.tera
+++ /dev/null
@@ -1,19 +0,0 @@
-{%- import "change.md.tera" as m_c -%}
-
-### API
-
-{#- The changes are sorted by merge date -#}
-{% for pr in changes | sort(attribute="merged_at") -%}
-
-{%- if pr.meta.B -%}
-{%- if pr.meta.B.B0 -%}
-{#- We skip silent ones -#}
-{%- else -%}
-
-{%- if pr.meta.B.B1 and pr.meta.T.T2 and not pr.title is containing("ompanion") %}
-- {{ m_c::change(c=pr) }}
-{%- endif -%}
-{%- endif -%}
-
-{%- endif -%}
-{%- endfor %}
diff --git a/cumulus/scripts/ci/changelog/templates/changes_client.md.tera b/cumulus/scripts/ci/changelog/templates/changes_client.md.tera
deleted file mode 100644
index 05a521d6870b62d6a75ef2cd6b48d11d471fd8f0..0000000000000000000000000000000000000000
--- a/cumulus/scripts/ci/changelog/templates/changes_client.md.tera
+++ /dev/null
@@ -1,17 +0,0 @@
-{% import "change.md.tera" as m_c -%}
-### Client
-
-{#- The changes are sorted by merge date #}
-{%- for pr in changes | sort(attribute="merged_at") %}
-
-{%- if pr.meta.B %}
-    {%- if pr.meta.B.B0 %}
-    {#- We skip silent ones -#}
-    {%- else -%}
-
-        {%- if pr.meta.B.B1 and pr.meta.T and pr.meta.T.T0 and not pr.title is containing("ompanion") %}
-- {{ m_c::change(c=pr) }}
-        {%- endif -%}
-    {% endif -%}
-    {% endif -%}
-{% endfor %}
diff --git a/cumulus/scripts/ci/changelog/templates/changes_misc.md.tera b/cumulus/scripts/ci/changelog/templates/changes_misc.md.tera
deleted file mode 100644
index b36595bc5d6adbef33271d229e879264ea0d5a2c..0000000000000000000000000000000000000000
--- a/cumulus/scripts/ci/changelog/templates/changes_misc.md.tera
+++ /dev/null
@@ -1,39 +0,0 @@
-{%- import "change.md.tera" as m_c -%}
-
-{%- set_global misc_count = 0 -%}
-{#- First pass to count #}
-{%- for pr in changes -%}
-    {%- if pr.meta.B %}
-        {%- if pr.meta.B.B0 -%}
-        {#- We skip silent ones -#}
-        {%- else -%}
-             {%- if pr.meta.T and pr.meta.T.agg.max > 2 %}
-{%- set_global misc_count = misc_count + 1 -%}
-            {%- endif -%}
-        {% endif -%}
-    {% endif -%}
-{% endfor %}
-
-### Misc
-
-{% if misc_count > 10 %}
-There are other misc. changes. You can expand the list below to view them all.
-<details><summary>Other misc. changes</summary>
-{% endif -%}
-
-{#- The changes are sorted by merge date #}
-{%- for pr in changes | sort(attribute="merged_at") %}
-    {%- if pr.meta.B and not pr.title is containing("ompanion") %}
-        {%- if pr.meta.B.B0 %}
-        {#- We skip silent ones -#}
-        {%- else -%}
-            {%- if pr.meta.T and pr.meta.T.agg.max > 2 %}
-- {{ m_c::change(c=pr) }}
-            {%- endif -%}
-        {% endif -%}
-    {% endif -%}
-{% endfor %}
-
-{% if misc_count > 10 %}
-</details>
-{% endif -%}
diff --git a/cumulus/scripts/ci/changelog/templates/changes_runtime.md.tera b/cumulus/scripts/ci/changelog/templates/changes_runtime.md.tera
deleted file mode 100644
index 39c27263765532e5f636df60b64abf197b954ad8..0000000000000000000000000000000000000000
--- a/cumulus/scripts/ci/changelog/templates/changes_runtime.md.tera
+++ /dev/null
@@ -1,19 +0,0 @@
-{%- import "change.md.tera" as m_c -%}
-
-### Runtime
-
-{#- The changes are sorted by merge date -#}
-{% for pr in changes | sort(attribute="merged_at") -%}
-
-{%- if pr.meta.B -%}
-{%- if pr.meta.B.B0 -%}
-{#- We skip silent ones -#}
-{%- else -%}
-
-{%- if pr.meta.B.B1 and pr.meta.T.T1 and not pr.title is containing("ompanion") %}
-- {{ m_c::change(c=pr) }}
-{%- endif -%}
-{%- endif -%}
-
-{%- endif -%}
-{%- endfor %}
diff --git a/cumulus/scripts/ci/changelog/templates/compiler.md.tera b/cumulus/scripts/ci/changelog/templates/compiler.md.tera
deleted file mode 100644
index 0420a88c396536a6555938f7abb02992038b9873..0000000000000000000000000000000000000000
--- a/cumulus/scripts/ci/changelog/templates/compiler.md.tera
+++ /dev/null
@@ -1,6 +0,0 @@
-## Rust compiler versions
-
-This release was tested against the following versions of `rustc`. Other versions may work.
-
-- Rust Stable: `{{ env.RUSTC_STABLE }}`
-- Rust Nightly: `{{ env.RUSTC_NIGHTLY }}`
diff --git a/cumulus/scripts/ci/changelog/templates/debug.md.tera b/cumulus/scripts/ci/changelog/templates/debug.md.tera
deleted file mode 100644
index 4f0b14c00f120f0fe367c42631bbce0667d0f060..0000000000000000000000000000000000000000
--- a/cumulus/scripts/ci/changelog/templates/debug.md.tera
+++ /dev/null
@@ -1,9 +0,0 @@
-{%- set to_ignore = changes | filter(attribute="meta.B.B0") %}
-<!--
-## Debug
-
-changes:
- - total: {{ changes | length }}
- - silent: {{ to_ignore | length }}
- - remaining: {{ changes | length - to_ignore | length }}
--->
diff --git a/cumulus/scripts/ci/changelog/templates/docker_image.md.tera b/cumulus/scripts/ci/changelog/templates/docker_image.md.tera
deleted file mode 100644
index cb0c619f3a708e8c120f664bbea5990ae7a8b80c..0000000000000000000000000000000000000000
--- a/cumulus/scripts/ci/changelog/templates/docker_image.md.tera
+++ /dev/null
@@ -1,11 +0,0 @@
-
-## Docker images
-
-The docker image for this release can be found in [Docker hub](https://hub.docker.com/r/parity/polkadot-parachain/tags?page=1&ordering=last_updated).
-(It will be available a few minutes after the release has been published).
-
-You may also pull it with:
-
-```
-docker pull parity/polkadot-parachain:latest
-```
diff --git a/cumulus/scripts/ci/changelog/templates/global_priority.md.tera b/cumulus/scripts/ci/changelog/templates/global_priority.md.tera
deleted file mode 100644
index 3d8a507ed1fe196878ccad168ec46d479f74389c..0000000000000000000000000000000000000000
--- a/cumulus/scripts/ci/changelog/templates/global_priority.md.tera
+++ /dev/null
@@ -1,35 +0,0 @@
-{%- import "high_priority.md.tera" as m_p -%}
-## Global Priority
-
-{%- set cumulus_prio = 0 -%}
-{%- set polkadot_prio = 0 -%}
-{%- set substrate_prio = 0 -%}
-
-{# We fetch the various priorities #}
-{%- if cumulus.meta.C -%}
-    {%- set cumulus_prio = cumulus.meta.C.max -%}
-{%- endif -%}
-{%- if polkadot.meta.C -%}
-    {%- set polkadot_prio = polkadot.meta.C.max -%}
-{%- endif -%}
-{%- if substrate.meta.C -%}
-    {%- set substrate_prio = substrate.meta.C.max -%}
-{%- endif -%}
-
-{# We compute the global priority #}
-{%- set global_prio = cumulus_prio -%}
-{%- if polkadot_prio > global_prio -%}
-    {% set global_prio = polkadot_prio -%}
-{%- endif -%}
-{%- if substrate_prio > global_prio -%}
-    {%- set global_prio = substrate_prio -%}
-{%- endif %}
-
-<!--
-- Cumulus: {{ cumulus_prio }}
-- Polkadot: {{ polkadot_prio }}
-- Substrate: {{ substrate_prio }}
--->
-
-{# We show the result #}
-{{ m_p::high_priority(p=global_prio, changes=changes) }}
diff --git a/cumulus/scripts/ci/changelog/templates/high_priority.md.tera b/cumulus/scripts/ci/changelog/templates/high_priority.md.tera
deleted file mode 100644
index 21e331892b8f12e9474a18a3114030d948cd24fb..0000000000000000000000000000000000000000
--- a/cumulus/scripts/ci/changelog/templates/high_priority.md.tera
+++ /dev/null
@@ -1,56 +0,0 @@
-{%- import "change.md.tera" as m_c -%}
-
-{# This macro convert a priority level into readable output #}
-{%- macro high_priority(p, changes) -%}
-
-{# real globals don't work so we count the number of host functions here as well #}
-{# unfortunately, the next snippet is duplicated in the host_functions.md.tera template #}
-{# as well #}
-{%- set_global host_fn_count = 0 -%}
-
-{# We loop first to count the number of host functions but we do not display anything yet #}
-{%- for pr in changes -%}
-{%- if pr.meta.B and pr.meta.B.B0 -%}
-{#- We skip silent ones -#}
-{%- else -%}
-    {%- if pr.meta.E and pr.meta.E.E4 -%}
-        {%- set_global host_fn_count = host_fn_count + 1 -%}
-    {%- endif -%}
-{%- endif -%}
-{%- endfor -%}
-
-{%- if p >= 5 or host_fn_count > 0 -%}
-    {%- set prio = "‼️ HIGH" -%}
-    {%- set text = "This is a **high priority** release and you must upgrade as as soon as possible." -%}
-{%- elif p >= 3 -%}
-    {%- set prio = "❗️ Medium" -%}
-    {%- set text = "This is a medium priority release and you should upgrade in a timely manner." -%}
-{%- else -%}
-    {%- set prio = "Low" -%}
-    {%- set text = "This is a low priority release and you may upgrade at your convenience." -%}
-{%- endif -%}
-
-<!-- detected max prio is: {{p}} -->
-{% if prio -%}
-{{prio}}: {{text}}
-{%- else -%}
-<!-- No relevant Priority label as been detected -->
-{%- endif %}
-
-{# We only show details if Medium or High #}
-{%- if p >= 5 -%}
-The changes motivating this priority level are:
-{% for pr in changes | sort(attribute="merged_at") -%}
-    {%- if pr.meta.C -%}
-        {%- if pr.meta.C.agg.max >= p %}
-- {{ m_c::change(c=pr) }}
-{%- if pr.meta.B and pr.meta.B.B1 and pr.meta.T and pr.meta.T.T1 %}
-(RUNTIME)
-{% endif %}
-
-        {%- endif -%}
-    {%- endif -%}
-{%- endfor %}
-{%- endif %}
-
-{%- endmacro priority -%}
diff --git a/cumulus/scripts/ci/changelog/templates/host_functions.md.tera b/cumulus/scripts/ci/changelog/templates/host_functions.md.tera
deleted file mode 100644
index 2a9b26e8090c0574b1c2655587707c1b09ee9fbe..0000000000000000000000000000000000000000
--- a/cumulus/scripts/ci/changelog/templates/host_functions.md.tera
+++ /dev/null
@@ -1,38 +0,0 @@
-{%- import "change.md.tera" as m_c -%}
-
-{%- set_global host_fn_count = 0 -%}
-
-{# We loop first to count the number of host functions but we do not display anything yet #}
-{%- for pr in changes -%}
-{%- if pr.meta.B and pr.meta.B.B0 -%}
-{#- We skip silent ones -#}
-{%- else -%}
-    {%- if pr.meta.E and pr.meta.E.E4 -%}
-        {%- set_global host_fn_count = host_fn_count + 1 -%}
-    {% endif -%}
-{%- endif -%}
-{%- endfor -%}
-
-<!-- {{ host_fn_count }} host functions were detected -->
-
-{% if host_fn_count == 0 -%}
-<!-- ℹ️ This release does not contain any new host functions. -->
-{%- else -%}
-## Host functions
-
-⚠️ The runtimes in this release contain {{ host_fn_count }} new **host function{{ host_fn_count | pluralize }}**.
-
-⚠️ It is critical that you update your client before the chain switches to the new runtimes.
-
-{% for pr in changes | sort(attribute="merged_at") -%}
-
-{%- if pr.meta.B and pr.meta.B.B0 -%}
-{#- We skip silent ones -#}
-{%- else -%}
-    {%- if pr.meta.E and pr.meta.E.E4 -%}
-            - {{ m_c::change(c=pr) }}
-        {% endif -%}
-    {% endif -%}
-{%- endfor -%}
-
-{%- endif %}
diff --git a/cumulus/scripts/ci/changelog/templates/migrations-db.md.tera b/cumulus/scripts/ci/changelog/templates/migrations-db.md.tera
deleted file mode 100644
index e840d991d9a81303d2921275db657ecbc7079e4e..0000000000000000000000000000000000000000
--- a/cumulus/scripts/ci/changelog/templates/migrations-db.md.tera
+++ /dev/null
@@ -1,26 +0,0 @@
-{%- import "change.md.tera" as m_c %}
-{%- set_global db_migration_count = 0 -%}
-
-## Database Migrations
-
-{% for pr in changes | sort(attribute="merged_at") -%}
-
-{%- if pr.meta.B and pr.meta.B.B0 %}
-{#- We skip silent ones -#}
-{%- else -%}
-{%- if pr.meta.E and pr.meta.E.E2 -%}
-{%- set_global db_migration_count = db_migration_count + 1 -%}
-- {{ m_c::change(c=pr) }}
-{% endif -%}
-{% endif -%}
-{% endfor -%}
-
-{%- if db_migration_count == 0 -%}
-No Database migration detected in this release.
-{% else  %}
-
-There is {{ db_migration_count }} database migration(s) in this release.
-
-Database migrations are operations bringing your database to the latest stand.
-Some migrations may break compatibility and making a backup of your database is highly recommended.
-{%- endif %}
diff --git a/cumulus/scripts/ci/changelog/templates/migrations-runtime.md.tera b/cumulus/scripts/ci/changelog/templates/migrations-runtime.md.tera
deleted file mode 100644
index f02499a84d747dbe45f162c785239d947fa40a19..0000000000000000000000000000000000000000
--- a/cumulus/scripts/ci/changelog/templates/migrations-runtime.md.tera
+++ /dev/null
@@ -1,14 +0,0 @@
-{%- import "change.md.tera" as m_c %}
-
-## Runtime Migrations
-
-{% for pr in changes | sort(attribute="merged_at") -%}
-
-{%- if pr.meta.B and pr.meta.B.B0 %}
-{#- We skip silent ones -#}
-{%- else -%}
-{%- if pr.meta.E and pr.meta.E.E1 -%}
-- {{ m_c::change(c=pr) }}
-{% endif -%}
-{% endif -%}
-{% endfor -%}
diff --git a/cumulus/scripts/ci/changelog/templates/pre_release.md.tera b/cumulus/scripts/ci/changelog/templates/pre_release.md.tera
deleted file mode 100644
index 53a0e906541274735d50e9ef8df33e25aab97549..0000000000000000000000000000000000000000
--- a/cumulus/scripts/ci/changelog/templates/pre_release.md.tera
+++ /dev/null
@@ -1,11 +0,0 @@
-{%- if env.PRE_RELEASE == "true" -%}
-<details><summary>⚠️ This is a pre-release</summary>
-
-**Release candidates** are **pre-releases** may not be final.
-Although they are reasonably tested, there may be additional changes or issues
-before an official release is tagged. Use at your own discretion, and consider
-only using published releases on critical production infrastructure.
-</details>
-{% else -%}
-<!-- NOT a pre-release-->
-{%- endif %}
diff --git a/cumulus/scripts/ci/changelog/templates/runtime.md.tera b/cumulus/scripts/ci/changelog/templates/runtime.md.tera
deleted file mode 100644
index d2070245838550d82fbbcc5f1adac5e7b930da7e..0000000000000000000000000000000000000000
--- a/cumulus/scripts/ci/changelog/templates/runtime.md.tera
+++ /dev/null
@@ -1,28 +0,0 @@
-{# This macro shows one runtime #}
-{%- macro runtime(runtime) -%}
-
-### {{ runtime.name | replace(from="-", to=" ") | title }} {%- if runtime.note -%} {{ runtime.note }} {%- endif -%}
-
-{%- if runtime.data.runtimes.compressed.subwasm.compression.compressed %}
-{%- set compressed = "Yes" %}
-{%- else %}
-{%- set compressed = "No" %}
-{%- endif %}
-
-{%- set comp_ratio = 100 - (runtime.data.runtimes.compressed.subwasm.compression.size_compressed / runtime.data.runtimes.compressed.subwasm.compression.size_decompressed *100) %}
-<!-- commit             : {{ runtime.data.commit }} -->
-<!-- tag                : {{ runtime.data.tag }} -->
-<!-- branch             : {{ runtime.data.branch }} -->
-<!-- pkg                : {{ runtime.data.pkg }} -->
-<!-- system.setCode     : {{ runtime.data.runtimes.compressed.subwasm.proposal_hash }} -->
-<!-- authorizeUpgrade   : {{ runtime.data.runtimes.compressed.subwasm.parachain_authorize_upgrade_hash }} -->
-
-```
-🏋️ Runtime Size:		{{ runtime.data.runtimes.compressed.subwasm.size | filesizeformat }} ({{ runtime.data.runtimes.compressed.subwasm.size }} bytes)
-🔥 Core Version:		{{ runtime.data.runtimes.compressed.subwasm.core_version.specName }}-{{ runtime.data.runtimes.compressed.subwasm.core_version.specVersion }} ({{ runtime.data.runtimes.compressed.subwasm.core_version.implName }}-{{ runtime.data.runtimes.compressed.subwasm.core_version.implVersion }}.tx{{ runtime.data.runtimes.compressed.subwasm.core_version.transactionVersion }}.au{{ runtime.data.runtimes.compressed.subwasm.core_version.authoringVersion }})
-🗜 Compressed:			{{ compressed }}: {{ comp_ratio | round(method="ceil", precision=2) }}%
-🎁 Metadata version:		V{{ runtime.data.runtimes.compressed.subwasm.metadata_version }}
-🗳️ Blake2-256 hash:		{{ runtime.data.runtimes.compressed.subwasm.blake2_256 }}
-📦 IPFS:			{{ runtime.data.runtimes.compressed.subwasm.ipfs_hash }}
-```
-{%- endmacro runtime %}
diff --git a/cumulus/scripts/ci/changelog/templates/runtimes.md.tera b/cumulus/scripts/ci/changelog/templates/runtimes.md.tera
deleted file mode 100644
index fe2e16aa9c2816352e773ce727bf1666ec476771..0000000000000000000000000000000000000000
--- a/cumulus/scripts/ci/changelog/templates/runtimes.md.tera
+++ /dev/null
@@ -1,17 +0,0 @@
-{# This include shows the list and details of the runtimes #}
-{%- import "runtime.md.tera" as m_r -%}
-
-## Runtimes
-
-{% set rtm = srtool[0] -%}
-
-The information about the runtimes included in this release can be found below.
-The runtimes have been built using [{{ rtm.data.gen }}](https://github.com/paritytech/srtool) and `{{ rtm.data.rustc }}`.
-
-{%- for runtime in srtool | sort(attribute="order") %}
-{%- set HIDE_VAR = "HIDE_SRTOOL_" ~ runtime.name | upper %}
-{%- if not env is containing(HIDE_VAR) %}
-
-{{ m_r::runtime(runtime=runtime) }}
-{%- endif %}
-{%- endfor %}
diff --git a/cumulus/scripts/ci/changelog/templates/template.md.tera b/cumulus/scripts/ci/changelog/templates/template.md.tera
deleted file mode 100644
index 8b14db43fe281be263d2313833241b175eb948cf..0000000000000000000000000000000000000000
--- a/cumulus/scripts/ci/changelog/templates/template.md.tera
+++ /dev/null
@@ -1,38 +0,0 @@
-{# This is the entry point of the template for the parachains-* releases-#}
-<!-- repository: {{ cumulus.repository.name }} -->
-{% include "pre_release.md.tera" -%}
-
-{% if env.PRE_RELEASE == "true" -%}
-This pre-release contains the changes from `{{ env.REF1 }}` to `{{ env.REF2 }}`.
-{% else -%}
-This release contains the changes from `{{ env.REF1 }}` to `{{ env.REF2 }}`.
-{% endif -%}
-
-{%- set changes = cumulus.changes | concat(with=substrate.changes) -%}
-{%- set changes = changes | concat(with=polkadot.changes) -%}
-{%- include "debug.md.tera" -%}
-
-{%- set CML = "[C]" -%}
-{%- set DOT = "[P]" -%}
-{%- set SUB = "[S]" -%}
-
-{# We check for host function first because no matter what the priority is, #}
-{# we will force it to HIGH if at least one host function was detected. #}
-
-{% include "host_functions.md.tera" -%}
-
-{% if env.RELEASE_TYPE and env.RELEASE_TYPE == "client" -%}
-{% include "global_priority.md.tera" -%}
-{% include "compiler.md.tera" -%}
-{% include "migrations-db.md.tera" %}
-<!-- skipping runtime data for RELEASE_TYPE = {{ env.RELEASE_TYPE }} -->
-{% else %}
-{% include "migrations-runtime.md.tera" %}
-{% include "runtimes.md.tera" -%}
-{% endif %}
-
-{% include "changes.md.tera" -%}
-
-{% if env.RELEASE_TYPE and env.RELEASE_TYPE == "client" -%}
-{% include "docker_image.md.tera" -%}
-{% endif %}
diff --git a/cumulus/scripts/ci/changelog/test/test_basic.rb b/cumulus/scripts/ci/changelog/test/test_basic.rb
deleted file mode 100755
index d099fadca43328d034cf753046274414b141888b..0000000000000000000000000000000000000000
--- a/cumulus/scripts/ci/changelog/test/test_basic.rb
+++ /dev/null
@@ -1,23 +0,0 @@
-# frozen_string_literal: true
-
-require_relative '../lib/changelog'
-require 'test/unit'
-
-class TestChangelog < Test::Unit::TestCase
-  def test_get_dep_ref_polkadot
-    c = SubRef.new('paritytech/polkadot')
-    ref = '13c2695'
-    package = 'sc-cli'
-    result = c.get_dependency_reference(ref, package)
-    assert_equal('7db0768a85dc36a3f2a44d042b32f3715c00a90d', result)
-  end
-
-  def test_get_dep_ref_invalid_ref
-    c = SubRef.new('paritytech/polkadot')
-    ref = '9999999'
-    package = 'sc-cli'
-    assert_raise do
-      c.get_dependency_reference(ref, package)
-    end
-  end
-end
diff --git a/cumulus/scripts/ci/common/lib.sh b/cumulus/scripts/ci/common/lib.sh
deleted file mode 100644
index 93e0392b3e29d6ef7bfff49558e0de6383aacbbe..0000000000000000000000000000000000000000
--- a/cumulus/scripts/ci/common/lib.sh
+++ /dev/null
@@ -1,141 +0,0 @@
-#!/bin/sh
-
-api_base="https://api.github.com/repos"
-
-# Function to take 2 git tags/commits and get any lines from commit messages
-# that contain something that looks like a PR reference: e.g., (#1234)
-sanitised_git_logs(){
-  git --no-pager log --pretty=format:"%s" "$1...$2" |
-  # Only find messages referencing a PR
-  grep -E '\(#[0-9]+\)' |
-  # Strip any asterisks
-  sed 's/^* //g'
-}
-
-# Checks whether a tag on github has been verified
-# repo: 'organization/repo'
-# tagver: 'v1.2.3'
-# Usage: check_tag $repo $tagver
-check_tag () {
-  repo=$1
-  tagver=$2
-  if [ -n "$GITHUB_RELEASE_TOKEN" ]; then
-    echo '[+] Fetching tag using privileged token'
-    tag_out=$(curl -H "Authorization: token $GITHUB_RELEASE_TOKEN" -s "$api_base/$repo/git/refs/tags/$tagver")
-  else
-    echo '[+] Fetching tag using unprivileged token'
-    tag_out=$(curl -H "Authorization: token $GITHUB_PR_TOKEN" -s "$api_base/$repo/git/refs/tags/$tagver")
-  fi
-  tag_sha=$(echo "$tag_out" | jq -r .object.sha)
-  object_url=$(echo "$tag_out" | jq -r .object.url)
-  if [ "$tag_sha" = "null" ]; then
-    return 2
-  fi
-  echo "[+] Tag object SHA: $tag_sha"
-  verified_str=$(curl -H "Authorization: token $GITHUB_RELEASE_TOKEN" -s "$object_url" | jq -r .verification.verified)
-  if [ "$verified_str" = "true" ]; then
-    # Verified, everything is good
-    return 0
-  else
-    # Not verified. Bad juju.
-    return 1
-  fi
-}
-
-# Checks whether a given PR has a given label.
-# repo: 'organization/repo'
-# pr_id: 12345
-# label: B1-silent
-# Usage: has_label $repo $pr_id $label
-has_label(){
-  repo="$1"
-  pr_id="$2"
-  label="$3"
-
-  # These will exist if the function is called in Gitlab.
-  # If the function's called in Github, we should have GITHUB_ACCESS_TOKEN set
-  # already.
-  if [ -n "$GITHUB_RELEASE_TOKEN" ]; then
-    GITHUB_TOKEN="$GITHUB_RELEASE_TOKEN"
-  elif [ -n "$GITHUB_PR_TOKEN" ]; then
-    GITHUB_TOKEN="$GITHUB_PR_TOKEN"
-  fi
-
-  out=$(curl -H "Authorization: token $GITHUB_TOKEN" -s "$api_base/$repo/pulls/$pr_id")
-  [ -n "$(echo "$out" | tr -d '\r\n' | jq ".labels | .[] | select(.name==\"$label\")")" ]
-}
-
-github_label () {
-  echo
-  echo "# run github-api job for labeling it ${1}"
-  curl -sS -X POST \
-    -F "token=${CI_JOB_TOKEN}" \
-    -F "ref=master" \
-    -F "variables[LABEL]=${1}" \
-    -F "variables[PRNO]=${CI_COMMIT_REF_NAME}" \
-    -F "variables[PROJECT]=paritytech/polkadot" \
-    "${GITLAB_API}/projects/${GITHUB_API_PROJECT}/trigger/pipeline"
-}
-
-# Formats a message into a JSON string for posting to Matrix
-# message: 'any plaintext message'
-# formatted_message: '<strong>optional message formatted in <em>html</em></strong>'
-# Usage: structure_message $content $formatted_content (optional)
-structure_message() {
-  if [ -z "$2" ]; then
-    body=$(jq -Rs --arg body "$1" '{"msgtype": "m.text", $body}' < /dev/null)
-  else
-    body=$(jq -Rs --arg body "$1" --arg formatted_body "$2" '{"msgtype": "m.text", $body, "format": "org.matrix.custom.html", $formatted_body}' < /dev/null)
-  fi
-  echo "$body"
-}
-
-# Post a message to a matrix room
-# body: '{body: "JSON string produced by structure_message"}'
-# room_id: !fsfSRjgjBWEWffws:matrix.parity.io
-# access_token: see https://matrix.org/docs/guides/client-server-api/
-# Usage: send_message $body (json formatted) $room_id $access_token
-send_message() {
-curl -XPOST -d "$1" "https://matrix.parity.io/_matrix/client/r0/rooms/$2/send/m.room.message?access_token=$3"
-}
-
-# Pretty-printing functions
-boldprint () { printf "|\n| \033[1m%s\033[0m\n|\n" "${@}"; }
-boldcat () { printf "|\n"; while read -r l; do printf "| \033[1m%s\033[0m\n" "${l}"; done; printf "|\n" ; }
-
-skip_if_companion_pr() {
-  url="https://api.github.com/repos/paritytech/polkadot/pulls/${CI_COMMIT_REF_NAME}"
-  echo "[+] API URL: $url"
-
-  pr_title=$(curl -sSL -H "Authorization: token ${GITHUB_PR_TOKEN}" "$url" | jq -r .title)
-  echo "[+] PR title: $pr_title"
-
-  if echo "$pr_title" | grep -qi '^companion'; then
-    echo "[!] PR is a companion PR. Build is already done in substrate"
-    exit 0
-  else
-    echo "[+] PR is not a companion PR. Proceeding test"
-  fi
-}
-
-# Fetches the tag name of the latest release from a repository
-# repo: 'organisation/repo'
-# Usage: latest_release 'paritytech/polkadot'
-latest_release() {
-  curl -s "$api_base/$1/releases/latest" | jq -r '.tag_name'
-}
-
-# Check for runtime changes between two commits. This is defined as any changes
-# to /primitives/src/* and any *production* chains under /runtime
-has_runtime_changes() {
-  from=$1
-  to=$2
-
-  if git diff --name-only "${from}...${to}" \
-    | grep -q -e '^runtime/polkadot' -e '^runtime/kusama' -e '^primitives/src/' -e '^runtime/common'
-  then
-    return 0
-  else
-    return 1
-  fi
-}
diff --git a/cumulus/scripts/ci/create-benchmark-pr.sh b/cumulus/scripts/ci/create-benchmark-pr.sh
deleted file mode 100755
index 46927f24b8089b2863253240f6f7a83e9f9cab7d..0000000000000000000000000000000000000000
--- a/cumulus/scripts/ci/create-benchmark-pr.sh
+++ /dev/null
@@ -1,53 +0,0 @@
-#!/usr/bin/env bash
-
-set -Eeu -o pipefail
-shopt -s inherit_errexit
-
-PR_TITLE="$1"
-HEAD_REF="$2"
-
-ORG="paritytech"
-REPO="$CI_PROJECT_NAME"
-BASE_REF="$CI_COMMIT_BRANCH"
-# Change threshold in %. Bigger values excludes the small changes.
-THRESHOLD=${THRESHOLD:-30}
-
-WEIGHTS_COMPARISON_URL_PARTS=(
-  "https://weights.tasty.limo/compare?"
-  "repo=$REPO&"
-  "threshold=$THRESHOLD&"
-  "path_pattern=**%2Fweights%2F*.rs&"
-  "method=guess-worst&"
-  "ignore_errors=true&"
-  "unit=time&"
-  "old=$BASE_REF&"
-  "new=$HEAD_REF"
-)
-printf -v WEIGHTS_COMPARISON_URL %s "${WEIGHTS_COMPARISON_URL_PARTS[@]}"
-
-PAYLOAD="$(jq -n \
-  --arg title "$PR_TITLE" \
-  --arg body "
-This PR is generated automatically by CI.
-
-Compare the weights with \`$BASE_REF\`: $WEIGHTS_COMPARISON_URL
-
-- [ ] Backport to master and node release branch once merged
-" \
-  --arg base "$BASE_REF" \
-  --arg head "$HEAD_REF" \
-  '{
-      title: $title,
-      body: $body,
-      head: $head,
-      base: $base
-   }'
-)"
-
-echo "PAYLOAD: $PAYLOAD"
-
-curl \
-  -H "Authorization: token $GITHUB_TOKEN" \
-  -X POST \
-  -d "$PAYLOAD" \
-  "https://api.github.com/repos/$ORG/$REPO/pulls"
diff --git a/cumulus/scripts/ci/github/check-rel-br b/cumulus/scripts/ci/github/check-rel-br
deleted file mode 100755
index 1b49ae621722a42d9adbb7f018ff66ee0e935762..0000000000000000000000000000000000000000
--- a/cumulus/scripts/ci/github/check-rel-br
+++ /dev/null
@@ -1,127 +0,0 @@
-#!/usr/bin/env bash
-
-# This script helps running sanity checks on a release branch
-# It is intended to be ran from the repo and from the release branch
-
-# NOTE: The diener runs do take time and are not really required because
-# if we missed the diener runs, the Cargo.lock that we check won't pass
-# the tests. See https://github.com/bkchr/diener/issues/17
-
-grv=$(git remote --verbose | grep push)
-export RUST_LOG=none
-REPO=$(echo "$grv" | cut -d ' ' -f1 | cut -d$'\t' -f2 | sed 's/.*github.com\/\(.*\)/\1/g' | cut -d '/' -f2 | cut -d '.' -f1 | sort | uniq)
-echo "[+] Detected repo: $REPO"
-
-BRANCH=$(git branch --show-current)
-if ! [[ "$BRANCH" =~ ^release.*$ || "$BRANCH" =~ ^polkadot.*$ ]]; then
-    echo "This script is meant to run only on a RELEASE branch."
-    echo "Try one of the following branch:"
-    git branch -r --format "%(refname:short)" --sort=-committerdate | grep -Ei '/?release' | head
-    exit 1
-fi
-echo "[+] Working on $BRANCH"
-
-# Tried to get the version of the release from the branch
-# input: release-foo-v0.9.22 or release-bar-v9220 or release-foo-v0.9.220
-# output: 0.9.22
-get_version() {
-    branch=$1
-    [[ $branch =~ -v(.*) ]]
-    version=${BASH_REMATCH[1]}
-    if [[ $version =~ \. ]]; then
-        MAJOR=$(($(echo $version | cut -d '.' -f1)))
-        MINOR=$(($(echo $version | cut -d '.' -f2)))
-        PATCH=$(($(echo $version | cut -d '.' -f3)))
-        echo $MAJOR.$MINOR.${PATCH:0:2}
-    else
-        MAJOR=$(echo $(($version / 100000)))
-        remainer=$(($version - $MAJOR * 100000))
-        MINOR=$(echo $(($remainer / 1000)))
-        remainer=$(($remainer - $MINOR * 1000))
-        PATCH=$(echo $(($remainer / 10)))
-        echo $MAJOR.$MINOR.$PATCH
-    fi
-}
-
-# return the name of the release branch for a given repo and version
-get_release_branch() {
-    repo=$1
-    version=$2
-    case $repo in
-        polkadot)
-            echo "release-v$version"
-            ;;
-
-        substrate)
-            echo "polkadot-v$version"
-            ;;
-
-        *)
-            echo "Repo $repo is not supported, exiting"
-            exit 1
-            ;;
-    esac
-}
-
-# repo = substrate / polkadot
-check_release_branch_repo() {
-    repo=$1
-    branch=$2
-
-    echo "[+] Checking deps for $repo=$branch"
-
-    POSTIVE=$(cat Cargo.lock | grep "$repo?branch=$branch" | sort | uniq | wc -l)
-    NEGATIVE=$(cat Cargo.lock | grep "$repo?branch=" | grep -v $branch | sort | uniq | wc -l)
-
-    if [[ $POSTIVE -eq 1 && $NEGATIVE -eq 0 ]]; then
-        echo -e "[+] ✅ Looking good"
-        cat Cargo.lock | grep "$repo?branch=" | sort | uniq | sed 's/^/\t - /'
-        return 0
-    else
-        echo -e "[+] ❌ Something seems to be wrong, we want 1 unique match and 0 non match (1, 0) and we got ($(($POSTIVE)), $(($NEGATIVE)))"
-        cat Cargo.lock | grep "$repo?branch=" | sort | uniq | sed 's/^/\t - /'
-        return 1
-    fi
-}
-
-# Check a release branch
-check_release_branches() {
-    SUBSTRATE_BRANCH=$1
-    POLKADOT_BRANCH=$2
-
-    check_release_branch_repo substrate $SUBSTRATE_BRANCH
-    ret_a1=$?
-
-    ret_b1=0
-    if [ $POLKADOT_BRANCH ]; then
-        check_release_branch_repo polkadot $POLKADOT_BRANCH
-        ret_b1=$?
-    fi
-
-    STATUS=$(($ret_a1 + $ret_b1))
-
-    return $STATUS
-}
-
-VERSION=$(get_version $BRANCH)
-echo "[+] Target version: v$VERSION"
-
-case $REPO in
-    polkadot)
-        substrate=$(get_release_branch substrate $VERSION)
-
-        check_release_branches $substrate
-        ;;
-
-    cumulus)
-        polkadot=$(get_release_branch polkadot $VERSION)
-        substrate=$(get_release_branch substrate $VERSION)
-
-        check_release_branches $substrate $polkadot
-        ;;
-
-    *)
-        echo "REPO $REPO is not supported, exiting"
-        exit 1
-        ;;
-esac
diff --git a/cumulus/scripts/ci/github/check_labels.sh b/cumulus/scripts/ci/github/check_labels.sh
deleted file mode 100755
index 102b1a4b06661c7686df56ea530c54a0ebc92343..0000000000000000000000000000000000000000
--- a/cumulus/scripts/ci/github/check_labels.sh
+++ /dev/null
@@ -1,91 +0,0 @@
-#!/usr/bin/env bash
-
-#shellcheck source=../common/lib.sh
-source "$( cd "$( dirname "${BASH_SOURCE[0]}" )" >/dev/null 2>&1 && pwd )/../common/lib.sh"
-
-repo="$GITHUB_REPOSITORY"
-pr="$GITHUB_PR"
-
-ensure_labels() {
-  for label in "$@"; do
-    if has_label "$repo" "$pr" "$label"; then
-      return 0
-    fi
-  done
-  return 1
-}
-
-# Must have one of the following labels
-releasenotes_labels=(
-  'B0-silent'
-  'B1-note_worthy'
-)
-
-# Must be an ordered list of priorities, lowest first
-priority_labels=(
-  'C1-low'
-  'C3-medium'
-  'C5-high'
-  'C7-critical'
-)
-
-audit_labels=(
-  'D1-audited 👍'
-  'D2-notlive 💤'
-  'D3-trivial 🧸'
-  'D5-nicetohaveaudit ⚠️'
-  'D9-needsaudit 👮'
-)
-
-x_labels=(
-  'X0-node'
-  'X1-runtime'
-  'X2-API'
-  'X9-misc'
-)
-
-echo "[+] Checking release notes (B) labels for $CI_COMMIT_BRANCH"
-if ensure_labels "${releasenotes_labels[@]}";  then
-  echo "[+] Release notes label detected. All is well."
-else
-  echo "[!] Release notes label not detected. Please add one of: ${releasenotes_labels[*]}"
-  exit 1
-fi
-
-if has_label  "$repo" "$pr" 'B1-note_worthy'; then
-  echo "[+] B1-note_worthy is chosen. Checking that there X-labels for $CI_COMMIT_BRANCH"
-  if ensure_labels "${x_labels[@]}";  then
-    echo "[+] X-label detected. All is well."
-  else
-    echo "[!] X-label not detected. Please add one of: ${x_labels[*]}"
-    exit 1
-  fi
-fi
-
-echo "[+] Checking release priority (C) labels for $CI_COMMIT_BRANCH"
-if ensure_labels "${priority_labels[@]}";  then
-  echo "[+] Release priority label detected. All is well."
-else
-  echo "[!] Release priority label not detected. Please add one of: ${priority_labels[*]}"
-  exit 1
-fi
-
-if has_runtime_changes "${BASE_SHA}" "${HEAD_SHA}"; then
-  echo "[+] Runtime changes detected. Checking audit (D) labels"
-  if ensure_labels "${audit_labels[@]}";  then
-    echo "[+] Release audit label detected. All is well."
-  else
-    echo "[!] Release audit label not detected. Please add one of: ${audit_labels[*]}"
-    exit 1
-  fi
-fi
-
-# If the priority is anything other than the lowest, we *must not* have a B0-silent
-# label
-if has_label "$repo" "$GITHUB_PR" 'B0-silent' &&
-  ! has_label "$repo" "$GITHUB_PR" "${priority_labels[0]}"; then
-  echo "[!] Changes with a priority higher than C1-low *MUST* have a B- label that is not B0-Silent"
-  exit 1
-fi
-
-exit 0
diff --git a/cumulus/scripts/ci/github/extrinsic-ordering-filter.sh b/cumulus/scripts/ci/github/extrinsic-ordering-filter.sh
deleted file mode 100755
index 4fd3337f64a6e9ea93848685cdf2fbac8b0340e7..0000000000000000000000000000000000000000
--- a/cumulus/scripts/ci/github/extrinsic-ordering-filter.sh
+++ /dev/null
@@ -1,55 +0,0 @@
-#!/usr/bin/env bash
-# This script is used in a Github Workflow. It helps filtering out what is interesting
-# when comparing metadata and spot what would require a tx version bump.
-
-# shellcheck disable=SC2002,SC2086
-
-FILE=$1
-
-# Higlight indexes that were deleted
-function find_deletions() {
-    echo "\n## Deletions\n"
-    RES=$(cat "$FILE" | grep -n '\[\-\]' | tr -s " ")
-    if [ "$RES" ]; then
-        echo "$RES" | awk '{ printf "%s\\n", $0 }'
-    else
-        echo "n/a"
-    fi
-}
-
-# Highlight indexes that have been deleted
-function find_index_changes() {
-    echo "\n## Index changes\n"
-    RES=$(cat "$FILE" | grep -E -n -i 'idx:\s*([0-9]+)\s*(->)\s*([0-9]+)' | tr -s " ")
-    if [ "$RES" ]; then
-        echo "$RES" | awk '{ printf "%s\\n", $0 }'
-    else
-        echo "n/a"
-    fi
-}
-
-# Highlight values that decreased
-function find_decreases() {
-    echo "\n## Decreases\n"
-    OUT=$(cat "$FILE" | grep -E -i -o '([0-9]+)\s*(->)\s*([0-9]+)' | awk '$1 > $3 { printf "%s;", $0 }')
-    IFS=$';' LIST=("$OUT")
-    unset RES
-    for line in "${LIST[@]}"; do
-        RES="$RES\n$(cat "$FILE" | grep -E -i -n \"$line\" | tr -s " ")"
-    done
-
-    if [ "$RES" ]; then
-        echo "$RES" | awk '{ printf "%s\\n", $0 }' | sort -u -g | uniq
-    else
-        echo "n/a"
-    fi
-}
-
-echo "\n------------------------------ SUMMARY -------------------------------"
-echo "\n⚠️ This filter is here to help spotting changes that should be reviewed carefully."
-echo "\n⚠️ It catches only index changes, deletions and value decreases".
-
-find_deletions "$FILE"
-find_index_changes "$FILE"
-find_decreases "$FILE"
-echo "\n----------------------------------------------------------------------\n"
diff --git a/cumulus/scripts/ci/github/runtime-version.rb b/cumulus/scripts/ci/github/runtime-version.rb
deleted file mode 100644
index 14663acaf31a32c739243c445d41a7f3d3774074..0000000000000000000000000000000000000000
--- a/cumulus/scripts/ci/github/runtime-version.rb
+++ /dev/null
@@ -1,10 +0,0 @@
-# frozen_string_literal: true
-
-# Gets the runtime version for a given runtime from the filesystem.
-# Optionally accepts a path that is the root of the project which defaults to
-# the current working directory
-def get_runtime(runtime: nil, path: '.', runtime_dir: 'runtime')
-  File.open(path + "/#{runtime_dir}/#{runtime}/src/lib.rs") do |f|
-    f.find { |l| l =~ /spec_version/ }.match(/[0-9]+/)[0]
-  end
-end
diff --git a/cumulus/scripts/ci/gitlab/pipeline/benchmarks.yml b/cumulus/scripts/ci/gitlab/pipeline/benchmarks.yml
deleted file mode 100644
index 0cbc42aabae6091d6271ac78c6c26ea12fa9e5d0..0000000000000000000000000000000000000000
--- a/cumulus/scripts/ci/gitlab/pipeline/benchmarks.yml
+++ /dev/null
@@ -1,84 +0,0 @@
-# This file is part of .gitlab-ci.yml
-# Here are all jobs that are executed during "benchmarks" stage
-# Work only on release-parachains-v* branches
-
-benchmarks-build:
-  stage: benchmarks-build
-  extends:
-    - .docker-env
-    - .collect-artifacts
-    - .benchmarks-manual-refs
-  script:
-    - time cargo build --profile production --locked --features runtime-benchmarks
-    - mkdir -p artifacts
-    - cp target/production/polkadot-parachain ./artifacts/
-
-benchmarks-assets:
-  stage: benchmarks-run
-  timeout: 1d
-  extends:
-    - .docker-env
-    - .collect-artifacts
-    - .benchmarks-refs
-  before_script:
-    - !reference [.docker-env, before_script]
-  script:
-    - ./scripts/benchmarks-ci.sh assets asset-hub-kusama ./artifacts
-    - ./scripts/benchmarks-ci.sh assets asset-hub-polkadot ./artifacts
-    - ./scripts/benchmarks-ci.sh assets asset-hub-westend ./artifacts
-    - export CURRENT_TIME=$(date '+%s')
-    - export BRANCHNAME="weights-asset-hub-polkadot-${CI_COMMIT_BRANCH}-${CURRENT_TIME}"
-    - !reference [.git-commit-push, script]
-    - ./scripts/ci/create-benchmark-pr.sh "[benchmarks] Update weights for asset-hub-kusama/-polkadot" "$BRANCHNAME"
-    - rm -f ./artifacts/polkadot-parachain
-    - rm -f ./artifacts/test-parachain
-  after_script:
-    - rm -rf .git/config
-  tags:
-    - weights-vm
-
-benchmarks-collectives:
-  stage: benchmarks-run
-  timeout: 1d
-  extends:
-    - .docker-env
-    - .collect-artifacts
-    - .benchmarks-refs
-  before_script:
-    - !reference [.docker-env, before_script]
-  script:
-    - ./scripts/benchmarks-ci.sh collectives collectives-polkadot ./artifacts
-    - export CURRENT_TIME=$(date '+%s')
-    - export BRANCHNAME="weights-collectives-${CI_COMMIT_BRANCH}-${CURRENT_TIME}"
-    - !reference [.git-commit-push, script]
-    - ./scripts/ci/create-benchmark-pr.sh "[benchmarks] Update weights for collectives" "$BRANCHNAME"
-    - rm -f ./artifacts/polkadot-parachain
-    - rm -f ./artifacts/test-parachain
-  after_script:
-    - rm -rf .git/config
-  tags:
-    - weights-vm
-
-benchmarks-bridge-hubs:
-  stage: benchmarks-run
-  timeout: 1d
-  extends:
-    - .docker-env
-    - .collect-artifacts
-    - .benchmarks-refs
-  before_script:
-    - !reference [.docker-env, before_script]
-  script:
-    - ./scripts/benchmarks-ci.sh bridge-hubs bridge-hub-polkadot ./artifacts
-    - ./scripts/benchmarks-ci.sh bridge-hubs bridge-hub-kusama ./artifacts
-    - ./scripts/benchmarks-ci.sh bridge-hubs bridge-hub-rococo ./artifacts
-    - export CURRENT_TIME=$(date '+%s')
-    - export BRANCHNAME="weights-bridge-hubs-${CI_COMMIT_BRANCH}-${CURRENT_TIME}"
-    - !reference [.git-commit-push, script]
-    - ./scripts/ci/create-benchmark-pr.sh "[benchmarks] Update weights for bridge-hubs" "$BRANCHNAME"
-    - rm -f ./artifacts/polkadot-parachain
-    - rm -f ./artifacts/test-parachain
-  after_script:
-    - rm -rf .git/config
-  tags:
-    - weights-vm
diff --git a/cumulus/scripts/ci/gitlab/pipeline/build.yml b/cumulus/scripts/ci/gitlab/pipeline/build.yml
deleted file mode 100644
index b47dd9fe30df439d77a729fe7b663e37f1b92273..0000000000000000000000000000000000000000
--- a/cumulus/scripts/ci/gitlab/pipeline/build.yml
+++ /dev/null
@@ -1,138 +0,0 @@
-# This file is part of .gitlab-ci.yml
-# Here are all jobs that are executed during "build" stage
-
-build-linux-stable:
-  stage: build
-  extends:
-    - .docker-env
-    - .common-refs
-    - .collect-artifacts
-  variables:
-    # Enable debug assertions since we are running optimized builds for testing
-    # but still want to have debug assertions.
-    RUSTFLAGS: "-Cdebug-assertions=y -Dwarnings"
-  # this is an artificial job dependency, for pipeline optimization using GitLab's DAGs
-  needs:
-    - job: check-rustdoc
-      artifacts: false
-  script:
-    - echo "___Building a binary, please refrain from using it in production since it goes with the debug assertions.___"
-    - time cargo build --release --locked --bin polkadot-parachain
-    - echo "___Packing the artifacts___"
-    - mkdir -p ./artifacts
-    - mv ./target/release/polkadot-parachain ./artifacts/.
-    - echo "___The VERSION is either a tag name or the curent branch if triggered not by a tag___"
-    - echo ${CI_COMMIT_REF_NAME} | tee ./artifacts/VERSION
-
-build-test-parachain:
-  stage: build
-  extends:
-    - .docker-env
-    - .common-refs
-    - .collect-artifacts
-  variables:
-    # Enable debug assertions since we are running optimized builds for testing
-    # but still want to have debug assertions.
-    RUSTFLAGS: "-Cdebug-assertions=y -Dwarnings"
-  # this is an artificial job dependency, for pipeline optimization using GitLab's DAGs
-  needs:
-    - job: check-rustdoc
-      artifacts: false
-  script:
-    - echo "___Building a binary, please refrain from using it in production since it goes with the debug assertions.___"
-    - time cargo build --release --locked --bin test-parachain
-    - echo "___Packing the artifacts___"
-    - mkdir -p ./artifacts
-    - mv ./target/release/test-parachain ./artifacts/.
-    - mkdir -p ./artifacts/zombienet
-    - mv ./target/release/wbuild/cumulus-test-runtime/wasm_binary_spec_version_incremented.rs.compact.compressed.wasm ./artifacts/zombienet/.
-
-# build runtime only if files in $RUNTIME_PATH/$RUNTIME_NAME were changed
-.build-runtime-template: &build-runtime-template
-  stage: build
-  extends:
-    - .docker-env
-    - .pr-refs
-  # this is an artificial job dependency, for pipeline optimization using GitLab's DAGs
-  needs:
-    - job: check-rustdoc
-      artifacts: false
-  variables:
-    RUNTIME_PATH: "parachains/runtimes/assets"
-  script:
-    - cd ${RUNTIME_PATH}
-    - for directory in $(echo */); do
-      echo "_____Running cargo check for ${directory} ______";
-      cd ${directory};
-      pwd;
-      SKIP_WASM_BUILD=1 cargo check --locked;
-      cd ..;
-      done
-
-# DAG: build-runtime-assets -> build-runtime-collectives -> build-runtime-bridge-hubs
-# DAG: build-runtime-assets -> build-runtime-collectives -> build-runtime-contracts
-# DAG: build-runtime-assets -> build-runtime-starters -> build-runtime-testing
-build-runtime-assets:
-  <<: *build-runtime-template
-  variables:
-    RUNTIME_PATH: "parachains/runtimes/assets"
-
-build-runtime-collectives:
-  <<: *build-runtime-template
-  variables:
-    RUNTIME_PATH: "parachains/runtimes/collectives"
-  # this is an artificial job dependency, for pipeline optimization using GitLab's DAGs
-  needs:
-    - job: build-runtime-assets
-      artifacts: false
-
-build-runtime-bridge-hubs:
-  <<: *build-runtime-template
-  variables:
-    RUNTIME_PATH: "parachains/runtimes/bridge-hubs"
-  # this is an artificial job dependency, for pipeline optimization using GitLab's DAGs
-  needs:
-    - job: build-runtime-collectives
-      artifacts: false
-
-build-runtime-contracts:
-  <<: *build-runtime-template
-  variables:
-    RUNTIME_PATH: "parachains/runtimes/contracts"
-  # this is an artificial job dependency, for pipeline optimization using GitLab's DAGs
-  needs:
-    - job: build-runtime-collectives
-      artifacts: false
-
-build-runtime-starters:
-  <<: *build-runtime-template
-  variables:
-    RUNTIME_PATH: "parachains/runtimes/starters"
-  # this is an artificial job dependency, for pipeline optimization using GitLab's DAGs
-  needs:
-    - job: build-runtime-assets
-      artifacts: false
-
-build-runtime-testing:
-  <<: *build-runtime-template
-  variables:
-    RUNTIME_PATH: "parachains/runtimes/testing"
-  # this is an artificial job dependency, for pipeline optimization using GitLab's DAGs
-  needs:
-    - job: build-runtime-starters
-      artifacts: false
-
-build-short-benchmark:
-  stage: build
-  extends:
-    - .docker-env
-    - .common-refs
-    - .collect-artifacts
-  # this is an artificial job dependency, for pipeline optimization using GitLab's DAGs
-  needs:
-    - job: check-rustdoc
-      artifacts: false
-  script:
-    - cargo build --profile release --locked --features=runtime-benchmarks --bin polkadot-parachain
-    - mkdir -p ./artifacts
-    - cp ./target/release/polkadot-parachain ./artifacts/
diff --git a/cumulus/scripts/ci/gitlab/pipeline/integration_tests.yml b/cumulus/scripts/ci/gitlab/pipeline/integration_tests.yml
deleted file mode 100644
index a884361aa7cd397cb945c19bdb9e0b4b126388fb..0000000000000000000000000000000000000000
--- a/cumulus/scripts/ci/gitlab/pipeline/integration_tests.yml
+++ /dev/null
@@ -1,2 +0,0 @@
-# This file is part of .gitlab-ci.yml
-# Here are all jobs that are executed during "integration_stage" stage
diff --git a/cumulus/scripts/ci/gitlab/pipeline/publish.yml b/cumulus/scripts/ci/gitlab/pipeline/publish.yml
deleted file mode 100644
index e59ff167698180057823374c481a2ad4ab7409c0..0000000000000000000000000000000000000000
--- a/cumulus/scripts/ci/gitlab/pipeline/publish.yml
+++ /dev/null
@@ -1,105 +0,0 @@
-# This file is part of .gitlab-ci.yml
-# Here are all jobs that are executed during "publish" stage
-
-.build-push-image:
-  image: $BUILDAH_IMAGE
-  variables:
-    DOCKERFILE: "" # docker/path-to.Dockerfile
-    IMAGE_NAME: "" # docker.io/paritypr/image_name
-    VERSION: "${CI_COMMIT_REF_NAME}-${CI_COMMIT_SHORT_SHA}"
-  script:
-    - test "$PARITYPR_USER" -a "$PARITYPR_PASS" ||
-      ( echo "no docker credentials provided"; exit 1 )
-    - $BUILDAH_COMMAND build
-      --format=docker
-      --build-arg VCS_REF="${CI_COMMIT_SHA}"
-      --build-arg BUILD_DATE="$(date -u '+%Y-%m-%dT%H:%M:%SZ')"
-      --build-arg IMAGE_NAME="${IMAGE_NAME}"
-      --tag "$IMAGE_NAME:$VERSION"
-      --file ${DOCKERFILE} .
-    - echo "$PARITYPR_PASS" |
-      buildah login --username "$PARITYPR_USER" --password-stdin docker.io
-    - $BUILDAH_COMMAND info
-    - $BUILDAH_COMMAND push --format=v2s2 "$IMAGE_NAME:$VERSION"
-  after_script:
-    - buildah logout --all
-
-build-push-image-polkadot-parachain-debug:
-  stage: publish
-  extends:
-    - .kubernetes-env
-    - .common-refs
-    - .build-push-image
-  needs:
-    - job: build-linux-stable
-      artifacts: true
-  variables:
-    DOCKERFILE: "docker/polkadot-parachain-debug_unsigned_injected.Dockerfile"
-    IMAGE_NAME: "docker.io/paritypr/polkadot-parachain-debug"
-    VERSION: "${CI_COMMIT_REF_NAME}-${CI_COMMIT_SHORT_SHA}"
-
-build-push-image-test-parachain:
-  stage: publish
-  extends:
-    - .kubernetes-env
-    - .common-refs
-    - .build-push-image
-  needs:
-    - job: build-test-parachain
-      artifacts: true
-  variables:
-    DOCKERFILE: "docker/test-parachain_injected.Dockerfile"
-    IMAGE_NAME: "docker.io/paritypr/test-parachain"
-    VERSION: "${CI_COMMIT_REF_NAME}-${CI_COMMIT_SHORT_SHA}"
-
-publish-s3:
-  stage: publish
-  extends:
-    - .kubernetes-env
-    - .publish-refs
-  image: paritytech/awscli:latest
-  needs:
-    - job: build-linux-stable
-      artifacts: true
-  variables:
-    GIT_STRATEGY: none
-    BUCKET: "releases.parity.io"
-    PREFIX: "cumulus/${ARCH}-${DOCKER_OS}"
-  script:
-    - echo "___Publishing a binary with debug assertions!___"
-    - echo "___VERSION = $(cat ./artifacts/VERSION) ___"
-    - aws s3 sync ./artifacts/ s3://${BUCKET}/${PREFIX}/$(cat ./artifacts/VERSION)/
-    - echo "___Updating objects in latest path___"
-    - aws s3 sync s3://${BUCKET}/${PREFIX}/$(cat ./artifacts/VERSION)/ s3://${BUCKET}/${PREFIX}/latest/
-  after_script:
-    - aws s3 ls s3://${BUCKET}/${PREFIX}/latest/
-      --recursive --human-readable --summarize
-
-publish-benchmarks-assets-s3: &publish-benchmarks
-  stage: publish
-  extends:
-    - .kubernetes-env
-    - .benchmarks-refs
-  image: paritytech/awscli:latest
-  needs:
-    - job: benchmarks-assets
-      artifacts: true
-  variables:
-    GIT_STRATEGY: none
-    BUCKET: "releases.parity.io"
-    PREFIX: "cumulus/$CI_COMMIT_REF_NAME/benchmarks-assets"
-  script:
-    - echo "___Publishing benchmark results___"
-    - aws s3 sync ./artifacts/ s3://${BUCKET}/${PREFIX}/
-  after_script:
-    - aws s3 ls s3://${BUCKET}/${PREFIX}/ --recursive --human-readable --summarize
-
-publish-benchmarks-collectives-s3:
-  <<: *publish-benchmarks
-  variables:
-    GIT_STRATEGY: none
-    BUCKET: "releases.parity.io"
-    PREFIX: "cumulus/$CI_COMMIT_REF_NAME/benchmarks-collectives"
-  needs:
-    - job: benchmarks-collectives
-      artifacts: true
diff --git a/cumulus/scripts/ci/gitlab/pipeline/short-benchmarks.yml b/cumulus/scripts/ci/gitlab/pipeline/short-benchmarks.yml
deleted file mode 100644
index f63ad1e0d045518090d37e308bee83affa2d8c46..0000000000000000000000000000000000000000
--- a/cumulus/scripts/ci/gitlab/pipeline/short-benchmarks.yml
+++ /dev/null
@@ -1,56 +0,0 @@
-# This file is part of .gitlab-ci.yml
-# Here are all jobs that are executed during "short-benchmarks" stage
-
-# Run all pallet benchmarks only once to check if there are any errors
-.short-benchmark-template: &short-bench
-  stage: short-benchmarks
-  extends:
-    - .common-refs
-    - .docker-env
-  needs:
-    - job: build-short-benchmark
-      artifacts: true
-  variables:
-    RUNTIME_CHAIN: benchmarked-runtime-chain
-  script:
-    - ./artifacts/polkadot-parachain benchmark pallet --wasm-execution compiled --chain $RUNTIME_CHAIN --pallet "*" --extrinsic "*" --steps 2 --repeat 1
-
-short-benchmark-asset-hub-polkadot:
-  <<: *short-bench
-  variables:
-    RUNTIME_CHAIN: asset-hub-polkadot-dev
-
-short-benchmark-asset-hub-kusama:
-  <<: *short-bench
-  variables:
-    RUNTIME_CHAIN: asset-hub-kusama-dev
-
-short-benchmark-asset-hub-westend:
-  <<: *short-bench
-  variables:
-    RUNTIME_CHAIN: asset-hub-westend-dev
-
-short-benchmark-bridge-hub-polkadot:
-  <<: *short-bench
-  variables:
-    RUNTIME_CHAIN: bridge-hub-polkadot-dev
-
-short-benchmark-bridge-hub-kusama:
-  <<: *short-bench
-  variables:
-    RUNTIME_CHAIN: bridge-hub-kusama-dev
-
-short-benchmark-bridge-hub-rococo:
-  <<: *short-bench
-  variables:
-    RUNTIME_CHAIN: bridge-hub-rococo-dev
-
-short-benchmark-collectives-polkadot :
-  <<: *short-bench
-  variables:
-    RUNTIME_CHAIN: collectives-polkadot-dev
-
-short-benchmark-glutton-kusama :
-  <<: *short-bench
-  variables:
-    RUNTIME_CHAIN: glutton-kusama-dev-1300
diff --git a/cumulus/scripts/ci/gitlab/pipeline/test.yml b/cumulus/scripts/ci/gitlab/pipeline/test.yml
deleted file mode 100644
index 2d84010cb74ea5b5c26cf9bd543990e28c0b9e92..0000000000000000000000000000000000000000
--- a/cumulus/scripts/ci/gitlab/pipeline/test.yml
+++ /dev/null
@@ -1,111 +0,0 @@
-# This file is part of .gitlab-ci.yml
-# Here are all jobs that are executed during "test" stage
-
-# It's more like a check, but we want to run this job with real tests in parallel
-find-fail-ci-phrase:
-  stage: test
-  variables:
-    CI_IMAGE: "paritytech/tools:latest"
-    ASSERT_REGEX: "FAIL-CI"
-    GIT_DEPTH: 1
-  extends:
-    - .kubernetes-env
-  script:
-    - set +e
-    - rg --line-number --hidden --type rust --glob '!{.git,target}' "$ASSERT_REGEX" .; exit_status=$?
-    - if [ $exit_status -eq 0 ]; then
-      echo "$ASSERT_REGEX was found, exiting with 1";
-      exit 1;
-      else
-      echo "No $ASSERT_REGEX was found, exiting with 0";
-      exit 0;
-      fi
-
-test-linux-stable:
-  stage: test
-  extends:
-    - .docker-env
-    - .common-refs
-    - .pipeline-stopper-artifacts
-  before_script:
-    - !reference [.docker-env, before_script]
-    - !reference [.pipeline-stopper-vars, before_script]
-  variables:
-    # Enable debug assertions since we are running optimized builds for testing
-    # but still want to have debug assertions.
-    RUSTFLAGS: "-Cdebug-assertions=y -Dwarnings"
-  script:
-    - time cargo nextest run --all --release --locked --run-ignored all
-
-test-doc:
-  stage: test
-  extends:
-    - .docker-env
-    - .common-refs
-  variables:
-    # Enable debug assertions since we are running optimized builds for testing
-    # but still want to have debug assertions.
-    RUSTFLAGS: "-Cdebug-assertions=y -Dwarnings"
-  script:
-    - time cargo test --doc
-
-check-runtime-benchmarks:
-  stage: test
-  extends:
-    - .docker-env
-    - .common-refs
-  script:
-    # Check that the node will compile with `runtime-benchmarks` feature flag.
-    - time cargo check --locked --all --features runtime-benchmarks
-    # Check that parachain-template will compile with `runtime-benchmarks` feature flag.
-    - time cargo check --locked -p parachain-template-node --features runtime-benchmarks
-
-cargo-check-try-runtime:
-  stage: test
-  extends:
-    - .docker-env
-    - .common-refs
-  variables:
-    RUSTFLAGS: "-D warnings"
-  # this is an artificial job dependency, for pipeline optimization using GitLab's DAGs
-  needs:
-    - job: check-runtime-benchmarks
-      artifacts: false
-  script:
-    # Check that the node will compile with `try-runtime` feature flag.
-    - time cargo check --locked --all --features try-runtime
-    # Check that parachain-template will compile with `try-runtime` feature flag.
-    - time cargo check --locked -p parachain-template-node --features try-runtime
-
-check-rustdoc:
-  stage: test
-  extends:
-    - .docker-env
-    - .common-refs
-  variables:
-    SKIP_WASM_BUILD: 1
-    RUSTDOCFLAGS: "-Dwarnings"
-  script:
-    - time cargo doc --workspace --all-features --verbose --no-deps
-
-cargo-check-benches:
-  stage: test
-  extends:
-    - .docker-env
-    - .common-refs
-  # this is an artificial job dependency, for pipeline optimization using GitLab's DAGs
-  needs:
-    - job: check-rustdoc
-      artifacts: false
-  script:
-    - time cargo check --all --benches
-
-cargo-clippy:
-  stage: test
-  extends:
-    - .docker-env
-    - .common-refs
-  script:
-    - echo $RUSTFLAGS
-    - cargo version && cargo clippy --version
-    - SKIP_WASM_BUILD=1 env -u RUSTFLAGS cargo clippy --locked --all-targets --workspace
diff --git a/cumulus/scripts/ci/gitlab/pipeline/zombienet.yml b/cumulus/scripts/ci/gitlab/pipeline/zombienet.yml
deleted file mode 100644
index d5ab3e13d42e24112c8e21be834c959fa56888a4..0000000000000000000000000000000000000000
--- a/cumulus/scripts/ci/gitlab/pipeline/zombienet.yml
+++ /dev/null
@@ -1,141 +0,0 @@
-# This file is part of .gitlab-ci.yml
-# Here are all jobs that are executed during "zombienet" stage
-
-.zombienet-before-script:
-  before_script:
-    - echo "Zombie-net Tests Config"
-    - echo "${ZOMBIENET_IMAGE}"
-    - echo "${RELAY_IMAGE}"
-    - echo "${COL_IMAGE}"
-    - echo "${GH_DIR}"
-    - export DEBUG=zombie
-    - export RELAY_IMAGE=${POLKADOT_IMAGE}
-    - export COL_IMAGE=${COL_IMAGE}
-
-.zombienet-after-script:
-  after_script:
-    - mkdir -p ./zombienet-logs
-    - cp /tmp/zombie*/logs/* ./zombienet-logs/
-
-# common settings for all zombienet jobs
-.zombienet-common:
-  stage: zombienet
-  image: "${ZOMBIENET_IMAGE}"
-  needs:
-    - job: build-push-image-test-parachain
-      artifacts: true
-  variables:
-    POLKADOT_IMAGE: "docker.io/paritypr/polkadot-debug:master"
-    GH_DIR: "https://github.com/paritytech/cumulus/tree/${CI_COMMIT_SHORT_SHA}/zombienet/tests"
-    COL_IMAGE: "docker.io/paritypr/test-parachain:${CI_COMMIT_REF_NAME}-${CI_COMMIT_SHORT_SHA}"
-    FF_DISABLE_UMASK_FOR_DOCKER_EXECUTOR: 1
-  artifacts:
-    name: "${CI_JOB_NAME}_${CI_COMMIT_REF_NAME}"
-    when: always
-    expire_in: 2 days
-    paths:
-      - ./zombienet-logs
-  allow_failure: false
-  retry: 2
-  tags:
-    - zombienet-polkadot-integration-test
-
-zombienet-0001-sync_blocks_from_tip_without_connected_collator:
-  extends:
-    - .zombienet-common
-    - .zombienet-refs
-    - .zombienet-before-script
-    - .zombienet-after-script
-  script:
-    - /home/nonroot/zombie-net/scripts/ci/run-test-env-manager.sh
-      --github-remote-dir="${GH_DIR}"
-      --concurrency=1
-      --test="0001-sync_blocks_from_tip_without_connected_collator.zndsl"
-
-zombienet-0002-pov_recovery:
-  extends:
-    - .zombienet-common
-    - .zombienet-refs
-    - .zombienet-before-script
-    - .zombienet-after-script
-  script:
-    - /home/nonroot/zombie-net/scripts/ci/run-test-env-manager.sh
-      --github-remote-dir="${GH_DIR}"
-      --concurrency=1
-      --test="0002-pov_recovery.zndsl"
-
-zombienet-0003-full_node_catching_up:
-  extends:
-    - .zombienet-common
-    - .zombienet-refs
-    - .zombienet-before-script
-    - .zombienet-after-script
-  script:
-    - /home/nonroot/zombie-net/scripts/ci/run-test-env-manager.sh
-      --github-remote-dir="${GH_DIR}"
-      --concurrency=1
-      --test="0003-full_node_catching_up.zndsl"
-
-zombienet-0004-runtime_upgrade:
-  extends:
-    - .zombienet-common
-    - .zombienet-refs
-    - .zombienet-before-script
-    - .zombienet-after-script
-  needs:
-    - !reference [.zombienet-common, needs]
-    - job: build-test-parachain
-      artifacts: true
-  before_script:
-    - ls -ltr *
-    - cp ./artifacts/zombienet/wasm_binary_spec_version_incremented.rs.compact.compressed.wasm /tmp/
-    - ls /tmp
-    - !reference [.zombienet-before-script, before_script]
-  script:
-    - /home/nonroot/zombie-net/scripts/ci/run-test-env-manager.sh
-      --github-remote-dir="${GH_DIR}"
-      --concurrency=1
-      --test="0004-runtime_upgrade.zndsl"
-
-zombienet-0005-migrate_solo_to_para:
-  extends:
-    - .zombienet-common
-    - .zombienet-refs
-    - .zombienet-before-script
-    - .zombienet-after-script
-  needs:
-    - !reference [.zombienet-common, needs]
-    - job: build-test-parachain
-      artifacts: true
-  before_script:
-    - ls -ltr *
-    - !reference [.zombienet-before-script, before_script]
-  script:
-    - /home/nonroot/zombie-net/scripts/ci/run-test-env-manager.sh
-      --github-remote-dir="${GH_DIR}"
-      --concurrency=1
-      --test="0005-migrate_solo_to_para.zndsl"
-
-zombienet-0006-rpc_collator_builds_blocks:
-  extends:
-    - .zombienet-common
-    - .zombienet-refs
-    - .zombienet-before-script
-    - .zombienet-after-script
-  script:
-    - /home/nonroot/zombie-net/scripts/ci/run-test-env-manager.sh
-      --github-remote-dir="${GH_DIR}"
-      --concurrency=1
-      --test="0006-rpc_collator_builds_blocks.zndsl"
-
-zombienet-0007-full_node_warp_sync:
-  extends:
-    - .zombienet-common
-    - .zombienet-refs
-    - .zombienet-before-script
-    - .zombienet-after-script
-  script:
-    - /home/nonroot/zombie-net/scripts/ci/run-test-env-manager.sh
-      --github-remote-dir="${GH_DIR}"
-      --concurrency=1
-      --test="0007-full_node_warp_sync.zndsl"
diff --git a/cumulus/scripts/ci/gitlab/prettier.sh b/cumulus/scripts/ci/gitlab/prettier.sh
deleted file mode 100755
index 299bbee179dcaeff3fbadffd89fb4548ac878555..0000000000000000000000000000000000000000
--- a/cumulus/scripts/ci/gitlab/prettier.sh
+++ /dev/null
@@ -1,6 +0,0 @@
-#!/bin/sh
-
-# meant to be installed via
-#   git config filter.ci-prettier.clean "scripts/ci/gitlab/prettier.sh"
-
-prettier --parser yaml
diff --git a/cumulus/test/client/Cargo.toml b/cumulus/test/client/Cargo.toml
index 07df643a20ed541ee577ca1a9d6371807f52b7c2..290cfd7e4d899a84dc3d4392f4c2c1e6ae671b18 100644
--- a/cumulus/test/client/Cargo.toml
+++ b/cumulus/test/client/Cargo.toml
@@ -1,8 +1,9 @@
 [package]
 name = "cumulus-test-client"
 version = "0.1.0"
-authors = ["Parity Technologies <admin@parity.io>"]
-edition = "2021"
+authors.workspace = true
+edition.workspace = true
+publish = false
 
 [dependencies]
 codec = { package = "parity-scale-codec", version = "3.0.0", default-features = false, features = [ "derive" ] }
@@ -28,7 +29,7 @@ pallet-balances = { path = "../../../substrate/frame/balances" }
 
 # Polkadot
 polkadot-primitives = { path = "../../../polkadot/primitives" }
-polkadot-parachain = { path = "../../../polkadot/parachain" }
+polkadot-parachain-primitives = { path = "../../../polkadot/parachain" }
 
 # Cumulus
 cumulus-test-runtime = { path = "../runtime" }
diff --git a/cumulus/test/client/src/block_builder.rs b/cumulus/test/client/src/block_builder.rs
index 06c7416be67fb8acd068bb2b48f616b959a5dbc2..2d930d1be59774daf6ab1cd97ef62be88bf1bfe2 100644
--- a/cumulus/test/client/src/block_builder.rs
+++ b/cumulus/test/client/src/block_builder.rs
@@ -1,4 +1,4 @@
-// Copyright 2020-2021 Parity Technologies (UK) Ltd.
+// Copyright (C) Parity Technologies (UK) Ltd.
 // This file is part of Cumulus.
 
 // Cumulus is free software: you can redistribute it and/or modify
diff --git a/cumulus/test/client/src/lib.rs b/cumulus/test/client/src/lib.rs
index 9660a99c3594967ab166b40319b58f5830fad70a..61249bdb066ad06a0dfbecfa09ac046aca2b0889 100644
--- a/cumulus/test/client/src/lib.rs
+++ b/cumulus/test/client/src/lib.rs
@@ -1,4 +1,4 @@
-// Copyright 2019-2021 Parity Technologies (UK) Ltd.
+// Copyright (C) Parity Technologies (UK) Ltd.
 // This file is part of Cumulus.
 
 // Cumulus is free software: you can redistribute it and/or modify
@@ -31,7 +31,9 @@ use sp_runtime::{generic::Era, BuildStorage, SaturatedConversion};
 
 pub use block_builder::*;
 pub use cumulus_test_runtime as runtime;
-pub use polkadot_parachain::primitives::{BlockData, HeadData, ValidationParams, ValidationResult};
+pub use polkadot_parachain_primitives::primitives::{
+	BlockData, HeadData, ValidationParams, ValidationResult,
+};
 pub use sc_executor::error::Result as ExecutorResult;
 pub use substrate_test_client::*;
 
diff --git a/cumulus/test/relay-sproof-builder/Cargo.toml b/cumulus/test/relay-sproof-builder/Cargo.toml
index 1f7aaf4d584d603a88a866b013051041c6554421..e044b92f7c4af4d297c8996c404a479e2d73ec8b 100644
--- a/cumulus/test/relay-sproof-builder/Cargo.toml
+++ b/cumulus/test/relay-sproof-builder/Cargo.toml
@@ -1,8 +1,8 @@
 [package]
 name = "cumulus-test-relay-sproof-builder"
 version = "0.1.0"
-authors = ["Parity Technologies <admin@parity.io>"]
-edition = "2021"
+authors.workspace = true
+edition.workspace = true
 
 [dependencies]
 codec = { package = "parity-scale-codec", version = "3.0.0", default-features = false, features = [ "derive" ] }
@@ -24,6 +24,7 @@ default = [ "std" ]
 std = [
 	"codec/std",
 	"cumulus-primitives-core/std",
+	"polkadot-primitives/std",
 	"sp-runtime/std",
 	"sp-state-machine/std",
 	"sp-std/std",
diff --git a/cumulus/test/relay-sproof-builder/src/lib.rs b/cumulus/test/relay-sproof-builder/src/lib.rs
index a17e5df13d0c62d9477e2b0479592c8213ef05d2..fbd2692a36b466827376e0917adfc93aac10a739 100644
--- a/cumulus/test/relay-sproof-builder/src/lib.rs
+++ b/cumulus/test/relay-sproof-builder/src/lib.rs
@@ -1,4 +1,4 @@
-// Copyright 2021 Parity Technologies (UK) Ltd.
+// Copyright (C) Parity Technologies (UK) Ltd.
 // This file is part of Cumulus.
 
 // Cumulus is free software: you can redistribute it and/or modify
@@ -63,7 +63,7 @@ impl Default for RelayStateSproofBuilder {
 				hrmp_max_message_num_per_candidate: 5,
 				validation_upgrade_cooldown: 6,
 				validation_upgrade_delay: 6,
-				async_backing_params: relay_chain::vstaging::AsyncBackingParams {
+				async_backing_params: relay_chain::AsyncBackingParams {
 					allowed_ancestry_len: 0,
 					max_candidate_depth: 0,
 				},
diff --git a/cumulus/test/relay-validation-worker-provider/Cargo.toml b/cumulus/test/relay-validation-worker-provider/Cargo.toml
deleted file mode 100644
index 4ae5f230126619256fe0b4d9dd29be287b7d723a..0000000000000000000000000000000000000000
--- a/cumulus/test/relay-validation-worker-provider/Cargo.toml
+++ /dev/null
@@ -1,14 +0,0 @@
-[package]
-name = "cumulus-test-relay-validation-worker-provider"
-version = "0.1.0"
-authors = ["Parity Technologies <admin@parity.io>"]
-edition = "2021"
-build = "build.rs"
-
-[dependencies]
-
-# Polkadot
-polkadot-node-core-pvf = { path = "../../../polkadot/node/core/pvf", features = ["test-utils"] }
-
-[build-dependencies]
-toml = "0.7.6"
diff --git a/cumulus/test/relay-validation-worker-provider/build.rs b/cumulus/test/relay-validation-worker-provider/build.rs
deleted file mode 100644
index a0a476b0195e9c5f3a991ef9113c343b64743968..0000000000000000000000000000000000000000
--- a/cumulus/test/relay-validation-worker-provider/build.rs
+++ /dev/null
@@ -1,169 +0,0 @@
-// Copyright 2021 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/>.
-
-use std::{
-	env, fs,
-	path::{Path, PathBuf},
-	process::{self, Command},
-};
-use toml::value::Table;
-
-/// The name of the project we will building.
-const PROJECT_NAME: &str = "validation-worker";
-/// The env variable that instructs us to skip the build.
-const SKIP_ENV: &str = "SKIP_BUILD";
-
-fn main() {
-	if env::var(SKIP_ENV).is_ok() {
-		return
-	}
-
-	let out_dir = PathBuf::from(env::var("OUT_DIR").expect("`OUT_DIR` is set by cargo"));
-
-	let project = create_project(&out_dir);
-	build_project(&project.join("Cargo.toml"));
-
-	fs::copy(project.join("target/release").join(PROJECT_NAME), out_dir.join(PROJECT_NAME))
-		.expect("Copies validation worker");
-}
-
-fn find_cargo_lock() -> PathBuf {
-	let mut path = PathBuf::from(
-		env::var("CARGO_MANIFEST_DIR").expect("`CARGO_MANIFEST_DIR` is set by cargo"),
-	);
-
-	loop {
-		if path.join("Cargo.lock").exists() {
-			return path.join("Cargo.lock")
-		}
-
-		if !path.pop() {
-			panic!("Could not find `Cargo.lock`")
-		}
-	}
-}
-
-fn create_project(out_dir: &Path) -> PathBuf {
-	let project_dir = out_dir.join(format!("{}-project", PROJECT_NAME));
-	fs::create_dir_all(project_dir.join("src")).expect("Creates project dir and project src dir");
-
-	let mut project_toml = Table::new();
-
-	let mut package = Table::new();
-	package.insert("name".into(), PROJECT_NAME.into());
-	package.insert("version".into(), "1.0.0".into());
-	package.insert("edition".into(), "2021".into());
-
-	project_toml.insert("package".into(), package.into());
-
-	project_toml.insert("workspace".into(), Table::new().into());
-
-	let mut dependencies = Table::new();
-
-	let mut dependency_project = Table::new();
-	dependency_project.insert(
-		"path".into(),
-		env::var("CARGO_MANIFEST_DIR")
-			.expect("`CARGO_MANIFEST_DIR` is set by cargo")
-			.into(),
-	);
-
-	dependencies
-		.insert("cumulus-test-relay-validation-worker-provider".into(), dependency_project.into());
-
-	project_toml.insert("dependencies".into(), dependencies.into());
-
-	add_patches(&mut project_toml);
-
-	fs::write(
-		project_dir.join("Cargo.toml"),
-		toml::to_string_pretty(&project_toml).expect("Wasm workspace toml is valid; qed"),
-	)
-	.expect("Writes project `Cargo.toml`");
-
-	fs::write(
-		project_dir.join("src").join("main.rs"),
-		r#"
-			cumulus_test_relay_validation_worker_provider::polkadot_node_core_pvf::decl_puppet_worker_main!();
-		"#,
-	)
-	.expect("Writes `main.rs`");
-
-	let cargo_lock = find_cargo_lock();
-	fs::copy(&cargo_lock, project_dir.join("Cargo.lock")).expect("Copies `Cargo.lock`");
-	println!("cargo:rerun-if-changed={}", cargo_lock.display());
-
-	project_dir
-}
-
-fn add_patches(project_toml: &mut Table) {
-	let workspace_toml_path = PathBuf::from(
-		env::var("CARGO_MANIFEST_DIR").expect("`CARGO_MANIFEST_DIR` is set by cargo"),
-	)
-	.join("../../../Cargo.toml");
-
-	let mut workspace_toml: Table = toml::from_str(
-		&fs::read_to_string(&workspace_toml_path).expect("Workspace root `Cargo.toml` exists; qed"),
-	)
-	.expect("Workspace root `Cargo.toml` is a valid toml file; qed");
-
-	let mut workspace_path = workspace_toml_path;
-	workspace_path.pop();
-
-	while let Some(mut patch) =
-		workspace_toml.remove("patch").and_then(|p| p.try_into::<Table>().ok())
-	{
-		// Iterate over all patches and make the patch path absolute from the workspace root path.
-		patch
-			.iter_mut()
-			.filter_map(|p| {
-				p.1.as_table_mut().map(|t| t.iter_mut().filter_map(|t| t.1.as_table_mut()))
-			})
-			.flatten()
-			.for_each(|p| {
-				p.iter_mut().filter(|(k, _)| k == &"path").for_each(|(_, v)| {
-					if let Some(path) = v.as_str().map(PathBuf::from) {
-						if path.is_relative() {
-							*v = workspace_path.join(path).display().to_string().into();
-						}
-					}
-				})
-			});
-
-		project_toml.insert("patch".into(), patch.into());
-	}
-}
-
-fn build_project(cargo_toml: &Path) {
-	let cargo = env::var("CARGO").expect("`CARGO` env variable is always set by cargo");
-
-	let status = Command::new(cargo)
-		.arg("build")
-		.arg("--release")
-		.arg(format!("--manifest-path={}", cargo_toml.display()))
-		// Unset the `CARGO_TARGET_DIR` to prevent a cargo deadlock (cargo locks a target dir
-		// exclusive).
-		.env_remove("CARGO_TARGET_DIR")
-		// Do not call us recursively.
-		.env(SKIP_ENV, "1")
-		.status();
-
-	match status.map(|s| s.success()) {
-		Ok(true) => {},
-		// Use `process.exit(1)` to have a clean error output.
-		_ => process::exit(1),
-	}
-}
diff --git a/cumulus/test/relay-validation-worker-provider/src/lib.rs b/cumulus/test/relay-validation-worker-provider/src/lib.rs
deleted file mode 100644
index 840214eb3c05e517994f818ab17abb28d566fd2b..0000000000000000000000000000000000000000
--- a/cumulus/test/relay-validation-worker-provider/src/lib.rs
+++ /dev/null
@@ -1,27 +0,0 @@
-// Copyright 2021 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/>.
-
-//! Provides the [`VALIDATION_WORKER`] for integration tests in Cumulus.
-//!
-//! The validation worker is used by the relay chain to validate parachains. This worker is placed
-//! in an extra process to provide better security and to ensure that a worker can be killed etc.
-//!
-//! !!This should only be used for tests!!
-
-pub use polkadot_node_core_pvf;
-
-/// The path to the validation worker.
-pub const VALIDATION_WORKER: &str = concat!(env!("OUT_DIR"), "/validation-worker");
diff --git a/cumulus/test/runtime/Cargo.toml b/cumulus/test/runtime/Cargo.toml
index fd372835f1fcddb42727bb792b53097ed94c207b..dbfe9f46b1bd2e1dd9c57a79836b5a3065b03d25 100644
--- a/cumulus/test/runtime/Cargo.toml
+++ b/cumulus/test/runtime/Cargo.toml
@@ -1,8 +1,9 @@
 [package]
 name = "cumulus-test-runtime"
 version = "0.1.0"
-authors = ["Parity Technologies <admin@parity.io>"]
-edition = "2021"
+authors.workspace = true
+edition.workspace = true
+publish = false
 
 [dependencies]
 codec = { package = "parity-scale-codec", version = "3.0.0", default-features = false, features = ["derive"] }
@@ -49,7 +50,6 @@ std = [
 	"frame-system/std",
 	"pallet-balances/std",
 	"pallet-glutton/std",
-	"pallet-glutton/std",
 	"pallet-sudo/std",
 	"pallet-timestamp/std",
 	"pallet-transaction-payment/std",
diff --git a/cumulus/test/runtime/build.rs b/cumulus/test/runtime/build.rs
index 77631afefe615ca7290f8f1a7221930623ec4b10..5e5f6a35a505a957a3494285b7b649e6ee4e61f7 100644
--- a/cumulus/test/runtime/build.rs
+++ b/cumulus/test/runtime/build.rs
@@ -1,4 +1,4 @@
-// Copyright 2019-2021 Parity Technologies (UK) Ltd.
+// Copyright (C) Parity Technologies (UK) Ltd.
 // This file is part of Cumulus.
 
 // Substrate is free software: you can redistribute it and/or modify
diff --git a/cumulus/test/runtime/src/lib.rs b/cumulus/test/runtime/src/lib.rs
index 4c213ad4054ac9976310d229be80aa36badff747..ccf624c0ffa4ef85307fcd3c8a0ff24621b5bf5c 100644
--- a/cumulus/test/runtime/src/lib.rs
+++ b/cumulus/test/runtime/src/lib.rs
@@ -1,4 +1,4 @@
-// Copyright 2019-2021 Parity Technologies (UK) Ltd.
+// Copyright (C) Parity Technologies (UK) Ltd.
 // This file is part of Cumulus.
 
 // Cumulus is free software: you can redistribute it and/or modify
diff --git a/cumulus/test/runtime/src/test_pallet.rs b/cumulus/test/runtime/src/test_pallet.rs
index bc72ef19505de429bb78fbe3d19551719b890c6d..0af23797dad6dd13561584f9d1d608f23f1a6bc2 100644
--- a/cumulus/test/runtime/src/test_pallet.rs
+++ b/cumulus/test/runtime/src/test_pallet.rs
@@ -1,4 +1,4 @@
-// Copyright 2021 Parity Technologies (UK) Ltd.
+// Copyright (C) Parity Technologies (UK) Ltd.
 // This file is part of Cumulus.
 
 // Cumulus is free software: you can redistribute it and/or modify
diff --git a/cumulus/test/service/Cargo.toml b/cumulus/test/service/Cargo.toml
index 70d6e94cab3d9e260e23c7557f3b4279d7524faf..c996a01a12ed13003939f38b106a0a2f56c57716 100644
--- a/cumulus/test/service/Cargo.toml
+++ b/cumulus/test/service/Cargo.toml
@@ -1,8 +1,9 @@
 [package]
 name = "cumulus-test-service"
 version = "0.1.0"
-authors = ["Parity Technologies <admin@parity.io>"]
-edition = "2021"
+authors.workspace = true
+edition.workspace = true
+publish = false
 
 [[bin]]
 name = "test-parachain"
@@ -10,12 +11,12 @@ path = "src/main.rs"
 
 [dependencies]
 async-trait = "0.1.73"
-clap = { version = "4.3.24", features = ["derive"] }
+clap = { version = "4.4.6", features = ["derive"] }
 codec = { package = "parity-scale-codec", version = "3.0.0" }
 criterion = { version = "0.5.1", features = [ "async_tokio" ] }
 jsonrpsee = { version = "0.16.2", features = ["server"] }
 rand = "0.8.5"
-serde = { version = "1.0.183", features = ["derive"] }
+serde = { version = "1.0.188", features = ["derive"] }
 tokio = { version = "1.32.0", features = ["macros"] }
 tracing = "0.1.37"
 url = "2.4.0"
@@ -71,7 +72,6 @@ cumulus-primitives-core = { path = "../../primitives/core" }
 cumulus-primitives-parachain-inherent = { path = "../../primitives/parachain-inherent" }
 cumulus-relay-chain-inprocess-interface = { path = "../../client/relay-chain-inprocess-interface" }
 cumulus-relay-chain-interface = { path = "../../client/relay-chain-interface" }
-cumulus-test-relay-validation-worker-provider = { path = "../relay-validation-worker-provider" }
 cumulus-test-runtime = { path = "../runtime" }
 cumulus-relay-chain-minimal-node = { path = "../../client/relay-chain-minimal-node" }
 cumulus-client-pov-recovery = { path = "../../client/pov-recovery" }
@@ -96,7 +96,20 @@ sc-cli = { path = "../../../substrate/client/cli" }
 substrate-test-utils = { path = "../../../substrate/test-utils" }
 
 [features]
-runtime-benchmarks = [ "polkadot-test-service/runtime-benchmarks" ]
+runtime-benchmarks = [
+	"cumulus-pallet-parachain-system/runtime-benchmarks",
+	"frame-system/runtime-benchmarks",
+	"pallet-im-online/runtime-benchmarks",
+	"pallet-timestamp/runtime-benchmarks",
+	"parachains-common/runtime-benchmarks",
+	"polkadot-cli/runtime-benchmarks",
+	"polkadot-primitives/runtime-benchmarks",
+	"polkadot-service/runtime-benchmarks",
+	"polkadot-test-service/runtime-benchmarks",
+	"rococo-parachain-runtime/runtime-benchmarks",
+	"sc-service/runtime-benchmarks",
+	"sp-runtime/runtime-benchmarks",
+]
 
 [[bench]]
 name = "transaction_throughput"
diff --git a/cumulus/test/service/benches/transaction_throughput.rs b/cumulus/test/service/benches/transaction_throughput.rs
index 48bf49487e64055e9c522ff78e71c54cc26d4da1..81ecc84db7bf211d5d684f7c24bfd9a4abf10c6e 100644
--- a/cumulus/test/service/benches/transaction_throughput.rs
+++ b/cumulus/test/service/benches/transaction_throughput.rs
@@ -1,6 +1,6 @@
 // This file is part of Cumulus.
 
-// Copyright (C) 2021 Parity Technologies (UK) Ltd.
+// Copyright (C) Parity Technologies (UK) Ltd.
 // SPDX-License-Identifier: GPL-3.0-or-later WITH Classpath-exception-2.0
 
 // This program is free software: you can redistribute it and/or modify
@@ -21,7 +21,7 @@ use cumulus_test_runtime::{AccountId, BalancesCall, ExistentialDeposit, SudoCall
 use futures::{future, StreamExt};
 use sc_transaction_pool_api::{TransactionPool as _, TransactionSource, TransactionStatus};
 use sp_core::{crypto::Pair, sr25519};
-use sp_runtime::{generic::BlockId, OpaqueExtrinsic};
+use sp_runtime::OpaqueExtrinsic;
 
 use cumulus_primitives_core::ParaId;
 use cumulus_test_service::{
@@ -117,7 +117,7 @@ async fn submit_tx_and_wait_for_inclusion(
 	let best_hash = client.chain_info().best_hash;
 
 	let mut watch = tx_pool
-		.submit_and_watch(&BlockId::Hash(best_hash), TransactionSource::External, tx.clone())
+		.submit_and_watch(best_hash, TransactionSource::External, tx.clone())
 		.await
 		.expect("Submits tx to pool")
 		.fuse();
diff --git a/cumulus/test/service/src/chain_spec.rs b/cumulus/test/service/src/chain_spec.rs
index 3d72d0db3ab5753ea178193f34be77381434f55d..7c8c984c2b207bb1ae86bad5042ee469bc622d4f 100644
--- a/cumulus/test/service/src/chain_spec.rs
+++ b/cumulus/test/service/src/chain_spec.rs
@@ -1,4 +1,4 @@
-// Copyright 2020-2021 Parity Technologies (UK) Ltd.
+// Copyright (C) Parity Technologies (UK) Ltd.
 // This file is part of Cumulus.
 
 // Cumulus is free software: you can redistribute it and/or modify
diff --git a/cumulus/test/service/src/cli.rs b/cumulus/test/service/src/cli.rs
index 4c86094f81dd05272c43381752882d814a205e9e..9235a0c45c58638f3966c28b031c39382d157396 100644
--- a/cumulus/test/service/src/cli.rs
+++ b/cumulus/test/service/src/cli.rs
@@ -1,4 +1,4 @@
-// Copyright 2022 Parity Technologies (UK) Ltd.
+// Copyright (C) Parity Technologies (UK) Ltd.
 // This file is part of Cumulus.
 
 // Cumulus is free software: you can redistribute it and/or modify
@@ -278,7 +278,7 @@ impl SubstrateCli for TestCollatorCli {
 	}
 
 	fn support_url() -> String {
-		"https://github.com/paritytech/cumulus/issues/new".into()
+		"https://github.com/paritytech/polkadot-sdk/issues/new".into()
 	}
 
 	fn copyright_start_year() -> i32 {
@@ -322,7 +322,7 @@ impl SubstrateCli for RelayChainCli {
 	}
 
 	fn support_url() -> String {
-		"https://github.com/paritytech/cumulus/issues/new".into()
+		"https://github.com/paritytech/polkadot-sdk/issues/new".into()
 	}
 
 	fn copyright_start_year() -> i32 {
diff --git a/cumulus/test/service/src/genesis.rs b/cumulus/test/service/src/genesis.rs
index fb1825cfbdd30286ca918ed686a8314f3264e3ff..9dba57ba9fbc1ff00059284ed1c92e1c7669d208 100644
--- a/cumulus/test/service/src/genesis.rs
+++ b/cumulus/test/service/src/genesis.rs
@@ -1,4 +1,4 @@
-// Copyright 2020-2021 Parity Technologies (UK) Ltd.
+// Copyright (C) Parity Technologies (UK) Ltd.
 // This file is part of Cumulus.
 
 // Cumulus is free software: you can redistribute it and/or modify
diff --git a/cumulus/test/service/src/lib.rs b/cumulus/test/service/src/lib.rs
index 7dcab7c5076cf664cec2216c756a524ffed411ff..a721645546af7417200a7768242573abbe252397 100644
--- a/cumulus/test/service/src/lib.rs
+++ b/cumulus/test/service/src/lib.rs
@@ -1,4 +1,4 @@
-// Copyright 2019-2021 Parity Technologies (UK) Ltd.
+// Copyright (C) Parity Technologies (UK) Ltd.
 // This file is part of Cumulus.
 
 // Cumulus is free software: you can redistribute it and/or modify
@@ -903,8 +903,9 @@ pub fn run_relay_chain_validator_node(
 		config.rpc_addr = Some(SocketAddr::new(IpAddr::V4(Ipv4Addr::new(127, 0, 0, 1)), port));
 	}
 
-	polkadot_test_service::run_validator_node(
-		config,
-		Some(cumulus_test_relay_validation_worker_provider::VALIDATION_WORKER.into()),
-	)
+	let mut workers_path = std::env::current_exe().unwrap();
+	workers_path.pop();
+	workers_path.pop();
+
+	polkadot_test_service::run_validator_node(config, Some(workers_path))
 }
diff --git a/cumulus/test/service/src/main.rs b/cumulus/test/service/src/main.rs
index a2b177db251c9dcc268e3facf65758113c61d883..5946e9cc3506e220672cb58561d52b93bcad2d8a 100644
--- a/cumulus/test/service/src/main.rs
+++ b/cumulus/test/service/src/main.rs
@@ -1,4 +1,4 @@
-// Copyright 2022 Parity Technologies (UK) Ltd.
+// Copyright (C) Parity Technologies (UK) Ltd.
 // This file is part of Cumulus.
 
 // Cumulus is free software: you can redistribute it and/or modify
diff --git a/cumulus/xcm/xcm-emulator/Cargo.toml b/cumulus/xcm/xcm-emulator/Cargo.toml
index 4d6bf1422b0a036393683f72a23710d4f946856d..c77d350bdfef6b81532496d1d3a8878b66c3aae5 100644
--- a/cumulus/xcm/xcm-emulator/Cargo.toml
+++ b/cumulus/xcm/xcm-emulator/Cargo.toml
@@ -2,8 +2,8 @@
 name = "xcm-emulator"
 description = "Test kit to emulate XCM program execution."
 version = "0.1.0"
-authors = ["Parity Technologies <admin@parity.io>"]
-edition = "2021"
+authors.workspace = true
+edition.workspace = true
 
 [dependencies]
 codec = { package = "parity-scale-codec", version = "3.0.0" }
@@ -20,22 +20,20 @@ sp-core = { path = "../../../substrate/primitives/core" }
 sp-std = { path = "../../../substrate/primitives/std" }
 sp-runtime = { path = "../../../substrate/primitives/runtime" }
 sp-arithmetic = { path = "../../../substrate/primitives/arithmetic" }
-sp-trie = { path = "../../../substrate/primitives/trie" }
+sp-tracing = { path = "../../../substrate/primitives/tracing" }
 pallet-balances = { path = "../../../substrate/frame/balances" }
 pallet-message-queue = { path = "../../../substrate/frame/message-queue" }
 
 # Cumulus
 cumulus-primitives-core = { path = "../../primitives/core" }
-cumulus-pallet-xcmp-queue = { path = "../../pallets/xcmp-queue" }
-cumulus-pallet-dmp-queue = { path = "../../pallets/dmp-queue" }
 cumulus-pallet-parachain-system = { path = "../../pallets/parachain-system" }
-parachain-info = { path = "../../parachains/pallets/parachain-info" }
 cumulus-primitives-parachain-inherent = { path = "../../primitives/parachain-inherent" }
 cumulus-test-relay-sproof-builder = { path = "../../test/relay-sproof-builder" }
 parachains-common = { path = "../../parachains/common" }
 
 # Polkadot
-xcm = { path = "../../../polkadot/xcm" }
-xcm-executor = { path = "../../../polkadot/xcm/xcm-executor" }
+xcm = { package = "staging-xcm", path = "../../../polkadot/xcm" }
+xcm-executor = { package = "staging-xcm-executor", path = "../../../polkadot/xcm/xcm-executor" }
 polkadot-primitives = { path = "../../../polkadot/primitives" }
+polkadot-parachain-primitives = { path = "../../../polkadot/parachain" }
 polkadot-runtime-parachains = { path = "../../../polkadot/runtime/parachains" }
diff --git a/cumulus/xcm/xcm-emulator/README.md b/cumulus/xcm/xcm-emulator/README.md
index d188c99eecfcbffa9c79f56651736bd009168694..2a861a9d269be18e85d967e6dfc21904665f7dd5 100644
--- a/cumulus/xcm/xcm-emulator/README.md
+++ b/cumulus/xcm/xcm-emulator/README.md
@@ -13,11 +13,11 @@ As the messages do not physically go through the same messaging infrastructure
 there is some code that is not being tested compared to using slower E2E tests.
 In future it may be possible to run these XCM emulated tests as E2E tests (without changes).
 
-As well as the XCM message transport being mocked out, so too are areas around consensus, 
+As well as the XCM message transport being mocked out, so too are areas around consensus,
 in particular things like disputes, staking and iamonline events can't be tested.
 
 ## Alternatives
 
 If you just wish to test execution of various XCM instructions
-against the XCM VM then the `xcm-simulator` (in the polkadot
+against the XCM VM then the `xcm-simulator` (in the Polkadot
 repo) is the perfect tool for this.
diff --git a/cumulus/xcm/xcm-emulator/src/lib.rs b/cumulus/xcm/xcm-emulator/src/lib.rs
index 72f88ee7fa975f3d9f9cb9f0fe56f7602bb270c8..caf73ae1e41ca52b5e6645060c9ab72e26b3d38b 100644
--- a/cumulus/xcm/xcm-emulator/src/lib.rs
+++ b/cumulus/xcm/xcm-emulator/src/lib.rs
@@ -1,4 +1,4 @@
-// Copyright 2023 Parity Technologies (UK) Ltd.
+// Copyright (C) Parity Technologies (UK) Ltd.
 // This file is part of Polkadot.
 
 // Polkadot is free software: you can redistribute it and/or modify
@@ -14,70 +14,55 @@
 // You should have received a copy of the GNU General Public License
 // along with Polkadot.  If not, see <http://www.gnu.org/licenses/>.
 
-pub use codec::{Decode, Encode};
+pub use codec::{Decode, Encode, EncodeLike};
 pub use lazy_static::lazy_static;
 pub use log;
 pub use paste;
 pub use std::{
-	any::type_name,
-	collections::HashMap,
-	error::Error,
-	fmt,
-	marker::PhantomData,
-	ops::Deref,
-	sync::{Condvar, Mutex},
-	thread::LocalKey,
+	any::type_name, collections::HashMap, error::Error, fmt, marker::PhantomData, ops::Deref,
+	sync::Mutex,
 };
 
 // Substrate
 pub use frame_support::{
 	assert_ok,
-	dispatch::EncodeLike,
-	sp_runtime::{AccountId32, DispatchResult},
+	sp_runtime::{traits::Header as HeaderT, DispatchResult},
 	traits::{
-		tokens::currency::Currency, EnqueueMessage, Get, Hooks, OriginTrait, ProcessMessage,
-		ProcessMessageError, ServiceQueues,
+		EnqueueMessage, Get, Hooks, OriginTrait, ProcessMessage, ProcessMessageError, ServiceQueues,
 	},
 	weights::{Weight, WeightMeter},
-	StorageHasher,
 };
-pub use frame_system::{AccountInfo, Config as SystemConfig, Pallet as SystemPallet};
+pub use frame_system::{Config as SystemConfig, Pallet as SystemPallet};
 pub use pallet_balances::AccountData;
 pub use sp_arithmetic::traits::Bounded;
-pub use sp_core::{sr25519, storage::Storage, Pair, H256};
+pub use sp_core::{blake2_256, parameter_types, sr25519, storage::Storage, Pair};
 pub use sp_io::TestExternalities;
 pub use sp_std::{cell::RefCell, collections::vec_deque::VecDeque, fmt::Debug};
-pub use sp_trie::StorageProof;
+pub use sp_tracing;
 
-//Cumulus
-pub use cumulus_pallet_dmp_queue;
-pub use cumulus_pallet_parachain_system::{self, Pallet as ParachainSystemPallet};
-pub use cumulus_pallet_xcmp_queue::{Config as XcmpQueueConfig, Pallet as XcmpQueuePallet};
+// Cumulus
+pub use cumulus_pallet_parachain_system::Pallet as ParachainSystemPallet;
 pub use cumulus_primitives_core::{
-	self,
-	relay_chain::{BlockNumber as RelayBlockNumber, HeadData},
-	DmpMessageHandler, ParaId, PersistedValidationData, XcmpMessageHandler,
+	relay_chain::{BlockNumber as RelayBlockNumber, HeadData, HrmpChannelId},
+	AbridgedHrmpChannel, DmpMessageHandler, ParaId, PersistedValidationData, XcmpMessageHandler,
 };
 pub use cumulus_primitives_parachain_inherent::ParachainInherentData;
 pub use cumulus_test_relay_sproof_builder::RelayStateSproofBuilder;
-pub use pallet_message_queue::{
-	Config as MessageQueueConfig, Event as MessageQueueEvent, Pallet as MessageQueuePallet,
-};
-pub use parachain_info;
+pub use pallet_message_queue::{Config as MessageQueueConfig, Pallet as MessageQueuePallet};
 pub use parachains_common::{AccountId, Balance, BlockNumber};
 pub use polkadot_primitives;
-pub use polkadot_runtime_parachains::{
-	dmp,
-	inclusion::{AggregateMessageOrigin, UmpQueueId},
-};
+pub use polkadot_runtime_parachains::inclusion::{AggregateMessageOrigin, UmpQueueId};
 
 // Polkadot
-pub use xcm::{
-	v3::prelude::{AccountId32 as AccountId32Junction, Parachain as ParachainJunction, *},
-	VersionedMultiAssets, VersionedMultiLocation,
+pub use polkadot_parachain_primitives::primitives::RelayChainBlockNumber;
+pub use xcm::v3::prelude::{
+	Ancestor, MultiAssets, MultiLocation, Parachain as ParachainJunction, Parent, WeightLimit,
+	XcmHash, X1,
 };
 pub use xcm_executor::traits::ConvertLocation;
 
+pub type AccountIdOf<T> = <T as frame_system::Config>::AccountId;
+
 thread_local! {
 	/// Downward messages, each message is: `(to_para_id, [(relay_block_number, msg)])`
 	#[allow(clippy::type_complexity)]
@@ -107,8 +92,8 @@ pub trait CheckAssertion<Origin, Destination, Hops, Args>
 where
 	Origin: Chain + Clone,
 	Destination: Chain + Clone,
-	Origin::RuntimeOrigin: OriginTrait<AccountId = AccountId32> + Clone,
-	Destination::RuntimeOrigin: OriginTrait<AccountId = AccountId32> + Clone,
+	Origin::RuntimeOrigin: OriginTrait<AccountId = AccountIdOf<Origin::Runtime>> + Clone,
+	Destination::RuntimeOrigin: OriginTrait<AccountId = AccountIdOf<Destination::Runtime>> + Clone,
 	Hops: Clone,
 	Args: Clone,
 {
@@ -120,8 +105,8 @@ impl<Origin, Destination, Hops, Args> CheckAssertion<Origin, Destination, Hops,
 where
 	Origin: Chain + Clone,
 	Destination: Chain + Clone,
-	Origin::RuntimeOrigin: OriginTrait<AccountId = AccountId32> + Clone,
-	Destination::RuntimeOrigin: OriginTrait<AccountId = AccountId32> + Clone,
+	Origin::RuntimeOrigin: OriginTrait<AccountId = AccountIdOf<Origin::Runtime>> + Clone,
+	Destination::RuntimeOrigin: OriginTrait<AccountId = AccountIdOf<Destination::Runtime>> + Clone,
 	Hops: Clone,
 	Args: Clone,
 {
@@ -236,24 +221,24 @@ pub trait Chain: TestExt + NetworkComponent {
 		helpers::get_account_id_from_seed::<sr25519::Public>(seed)
 	}
 
-	fn account_data_of(account: AccountId) -> AccountData<Balance>;
+	fn account_data_of(account: AccountIdOf<Self::Runtime>) -> AccountData<Balance>;
 
 	fn events() -> Vec<<Self as Chain>::RuntimeEvent>;
 }
 
 pub trait RelayChain: Chain {
 	type MessageProcessor: ProcessMessage;
-	type SovereignAccountOf: ConvertLocation<AccountId>;
+	type SovereignAccountOf: ConvertLocation<AccountIdOf<Self::Runtime>>;
 
 	fn child_location_of(id: ParaId) -> MultiLocation {
 		(Ancestor(0), ParachainJunction(id.into())).into()
 	}
 
-	fn sovereign_account_id_of(location: MultiLocation) -> AccountId {
+	fn sovereign_account_id_of(location: MultiLocation) -> AccountIdOf<Self::Runtime> {
 		Self::SovereignAccountOf::convert_location(&location).unwrap()
 	}
 
-	fn sovereign_account_id_of_child_para(id: ParaId) -> AccountId {
+	fn sovereign_account_id_of_child_para(id: ParaId) -> AccountIdOf<Self::Runtime> {
 		Self::sovereign_account_id_of(Self::child_location_of(id))
 	}
 }
@@ -261,10 +246,18 @@ pub trait RelayChain: Chain {
 pub trait Parachain: Chain {
 	type XcmpMessageHandler: XcmpMessageHandler;
 	type DmpMessageHandler: DmpMessageHandler;
-	type LocationToAccountId: ConvertLocation<AccountId>;
+	type LocationToAccountId: ConvertLocation<AccountIdOf<Self::Runtime>>;
 	type ParachainInfo: Get<ParaId>;
 	type ParachainSystem;
 
+	fn init();
+
+	fn new_block();
+
+	fn finalize_block();
+
+	fn set_last_head();
+
 	fn para_id() -> ParaId {
 		Self::ext_wrapper(|| Self::ParachainInfo::get())
 	}
@@ -277,11 +270,9 @@ pub trait Parachain: Chain {
 		(Parent, X1(ParachainJunction(para_id.into()))).into()
 	}
 
-	fn sovereign_account_id_of(location: MultiLocation) -> AccountId {
+	fn sovereign_account_id_of(location: MultiLocation) -> AccountIdOf<Self::Runtime> {
 		Self::LocationToAccountId::convert_location(&location).unwrap()
 	}
-
-	fn init();
 }
 
 pub trait Bridge {
@@ -363,23 +354,24 @@ macro_rules! decl_test_relay_chains {
 			}
 		),
 		+
+		$(,)?
 	) => {
 		$(
 			#[derive(Clone)]
 			pub struct $name;
 
-			impl Chain for $name {
+			impl $crate::Chain for $name {
 				type Runtime = $runtime::Runtime;
 				type RuntimeCall = $runtime::RuntimeCall;
 				type RuntimeOrigin = $runtime::RuntimeOrigin;
 				type RuntimeEvent = $runtime::RuntimeEvent;
 				type System = $crate::SystemPallet::<Self::Runtime>;
 
-				fn account_data_of(account: AccountId) -> $crate::AccountData<Balance> {
-					Self::ext_wrapper(|| $crate::SystemPallet::<Self::Runtime>::account(account).data.into())
+				fn account_data_of(account: $crate::AccountIdOf<Self::Runtime>) -> $crate::AccountData<$crate::Balance> {
+					<Self as $crate::TestExt>::ext_wrapper(|| $crate::SystemPallet::<Self::Runtime>::account(account).data.into())
 				}
 
-				fn events() -> Vec<<Self as Chain>::RuntimeEvent> {
+				fn events() -> Vec<<Self as $crate::Chain>::RuntimeEvent> {
 					Self::System::events()
 						.iter()
 						.map(|record| record.event.clone())
@@ -387,7 +379,7 @@ macro_rules! decl_test_relay_chains {
 				}
 			}
 
-			impl RelayChain for $name {
+			impl $crate::RelayChain for $name {
 				type SovereignAccountOf = $sovereign_acc_of;
 				type MessageProcessor = $mp;
 			}
@@ -431,7 +423,7 @@ macro_rules! __impl_test_ext_for_relay_chain {
 	(@impl $name:ident, $genesis:expr, $on_init:expr, $api_version:ident, $local_ext:ident, $global_ext:ident) => {
 		thread_local! {
 			pub static $local_ext: $crate::RefCell<$crate::TestExternalities>
-				= $crate::RefCell::new(<$name>::build_new_ext($genesis));
+				= $crate::RefCell::new(<$name as $crate::TestExt>::build_new_ext($genesis));
 		}
 
 		$crate::lazy_static! {
@@ -439,11 +431,11 @@ macro_rules! __impl_test_ext_for_relay_chain {
 				= $crate::Mutex::new($crate::RefCell::new($crate::HashMap::new()));
 		}
 
-		impl TestExt for $name {
+		impl $crate::TestExt for $name {
 			fn build_new_ext(storage: $crate::Storage) -> $crate::TestExternalities {
-				use $crate::{NetworkComponent, Network, Chain};
+				use $crate::{sp_tracing, NetworkComponent, Network, Chain, TestExternalities};
 
-				let mut ext = $crate::TestExternalities::new(storage);
+				let mut ext = TestExternalities::new(storage);
 
 				ext.execute_with(|| {
 					#[allow(clippy::no_effect)]
@@ -513,7 +505,7 @@ macro_rules! __impl_test_ext_for_relay_chain {
 			}
 
 			fn execute_with<R>(execute: impl FnOnce() -> R) -> R {
-				use $crate::{NetworkComponent, Network};
+				use $crate::{Chain, NetworkComponent, Network};
 				// Make sure the Network is initialized
 				<$name as NetworkComponent>::Network::init();
 
@@ -528,7 +520,7 @@ macro_rules! __impl_test_ext_for_relay_chain {
 						//TODO: mark sent count & filter out sent msg
 						for para_id in<$name as NetworkComponent>::Network::para_ids() {
 							// downward messages
-							let downward_messages = <Self as Chain>::Runtime::dmq_contents(para_id.into())
+							let downward_messages = <Self as $crate::Chain>::Runtime::dmq_contents(para_id.into())
 								.into_iter()
 								.map(|inbound| (inbound.sent_at, inbound.msg));
 							if downward_messages.len() == 0 {
@@ -587,23 +579,24 @@ macro_rules! decl_test_parachains {
 			}
 		),
 		+
+		$(,)?
 	) => {
 		$(
 			#[derive(Clone)]
 			pub struct $name;
 
-			impl Chain for $name {
+			impl $crate::Chain for $name {
 				type Runtime = $runtime::Runtime;
 				type RuntimeCall = $runtime::RuntimeCall;
 				type RuntimeOrigin = $runtime::RuntimeOrigin;
 				type RuntimeEvent = $runtime::RuntimeEvent;
 				type System = $crate::SystemPallet::<Self::Runtime>;
 
-				fn account_data_of(account: AccountId) -> $crate::AccountData<Balance> {
-					Self::ext_wrapper(|| $crate::SystemPallet::<Self::Runtime>::account(account).data.into())
+				fn account_data_of(account: $crate::AccountIdOf<Self::Runtime>) -> $crate::AccountData<$crate::Balance> {
+					<Self as $crate::TestExt>::ext_wrapper(|| $crate::SystemPallet::<Self::Runtime>::account(account).data.into())
 				}
 
-				fn events() -> Vec<<Self as Chain>::RuntimeEvent> {
+				fn events() -> Vec<<Self as $crate::Chain>::RuntimeEvent> {
 					Self::System::events()
 						.iter()
 						.map(|record| record.event.clone())
@@ -611,35 +604,81 @@ macro_rules! decl_test_parachains {
 				}
 			}
 
-			impl Parachain for $name {
+			impl $crate::Parachain for $name {
 				type XcmpMessageHandler = $xcmp_message_handler;
 				type DmpMessageHandler = $dmp_message_handler;
 				type LocationToAccountId = $location_to_account;
-				type ParachainSystem = $crate::ParachainSystemPallet<<Self as Chain>::Runtime>;
+				type ParachainSystem = $crate::ParachainSystemPallet<<Self as $crate::Chain>::Runtime>;
 				type ParachainInfo = $parachain_info;
 
+				// We run an empty block during initialisation to open HRMP channels
+				// and have them ready for the next block
 				fn init() {
-					use $crate::{Network, NetworkComponent, Hooks};
+					use $crate::{Chain, HeadData, Network, NetworkComponent, Hooks, Encode, Parachain, TestExt};
+					// Set the last block head for later use in the next block
+					Self::set_last_head();
+					// Initialize a new block
+					Self::new_block();
+					// Finalize the new block
+					Self::finalize_block();
+				}
+
+				fn new_block() {
+					use $crate::{Chain, HeadData, Network, NetworkComponent, Hooks, Encode, Parachain, TestExt};
+
+					let para_id = Self::para_id().into();
+
+					Self::ext_wrapper(|| {
+						// Increase Relay Chain block number
+						let mut relay_block_number = <$name as NetworkComponent>::Network::relay_block_number();
+						relay_block_number += 1;
+						<$name as NetworkComponent>::Network::set_relay_block_number(relay_block_number);
+
+						// Initialize a new Parachain block
+						let mut block_number = <Self as Chain>::System::block_number();
+						block_number += 1;
+						let parent_head_data = $crate::LAST_HEAD.with(|b| b.borrow_mut()
+							.get_mut(<Self as NetworkComponent>::Network::name())
+							.expect("network not initialized?")
+							.get(&para_id)
+							.expect("network not initialized?")
+							.clone()
+						);
+						<Self as Chain>::System::initialize(&block_number, &parent_head_data.hash(), &Default::default());
+						<<Self as Parachain>::ParachainSystem as Hooks<$crate::BlockNumber>>::on_initialize(block_number);
+
+						let _ = <Self as Parachain>::ParachainSystem::set_validation_data(
+							<Self as Chain>::RuntimeOrigin::none(),
+							<$name as NetworkComponent>::Network::hrmp_channel_parachain_inherent_data(para_id, relay_block_number, parent_head_data),
+						);
+					});
+				}
 
-					let para_id = Self::para_id();
+				fn finalize_block() {
+					use $crate::{Chain, Encode, Hooks, Network, NetworkComponent, Parachain, TestExt};
 
-					<Self as TestExt>::ext_wrapper(|| {
+					Self::ext_wrapper(|| {
 						let block_number = <Self as Chain>::System::block_number();
-						let mut relay_block_number = <Self as NetworkComponent>::Network::relay_block_number();
+						<Self as Parachain>::ParachainSystem::on_finalize(block_number);
+					});
 
-						// Get parent head data
-						let header = <Self as Chain>::System::finalize();
-						let parent_head_data = $crate::HeadData(header.encode());
+					Self::set_last_head();
+				}
+
+
+				fn set_last_head() {
+					use $crate::{Chain, Encode, HeadData, Network, NetworkComponent, Parachain, TestExt};
 
+					let para_id = Self::para_id().into();
+
+					Self::ext_wrapper(|| {
+						// Store parent head data for use later.
+						let created_header = <Self as Chain>::System::finalize();
 						$crate::LAST_HEAD.with(|b| b.borrow_mut()
 							.get_mut(<Self as NetworkComponent>::Network::name())
 							.expect("network not initialized?")
-							.insert(para_id.into(), parent_head_data.clone())
+							.insert(para_id, HeadData(created_header.encode()))
 						);
-
-						let next_block_number = block_number + 1;
-						<Self as Chain>::System::initialize(&next_block_number, &header.hash(), &Default::default());
-						<Self as Parachain>::ParachainSystem::on_initialize(next_block_number);
 					});
 				}
 			}
@@ -676,7 +715,7 @@ macro_rules! __impl_test_ext_for_parachain {
 	(@impl $name:ident, $genesis:expr, $on_init:expr, $local_ext:ident, $global_ext:ident) => {
 		thread_local! {
 			pub static $local_ext: $crate::RefCell<$crate::TestExternalities>
-				= $crate::RefCell::new(<$name>::build_new_ext($genesis));
+				= $crate::RefCell::new(<$name as $crate::TestExt>::build_new_ext($genesis));
 		}
 
 		$crate::lazy_static! {
@@ -684,20 +723,18 @@ macro_rules! __impl_test_ext_for_parachain {
 				= $crate::Mutex::new($crate::RefCell::new($crate::HashMap::new()));
 		}
 
-		impl TestExt for $name {
+		impl $crate::TestExt for $name {
 			fn build_new_ext(storage: $crate::Storage) -> $crate::TestExternalities {
-				use $crate::{NetworkComponent, Network, Chain};
-
 				let mut ext = $crate::TestExternalities::new(storage);
 
 				ext.execute_with(|| {
 					#[allow(clippy::no_effect)]
 					$on_init;
-					sp_tracing::try_init_simple();
+					$crate::sp_tracing::try_init_simple();
 
-					let mut block_number = <Self as Chain>::System::block_number();
+					let mut block_number = <Self as $crate::Chain>::System::block_number();
 					block_number = std::cmp::max(1, block_number);
-					<Self as Chain>::System::set_block_number(block_number);
+					<Self as $crate::Chain>::System::set_block_number(block_number);
 				});
 				ext
 			}
@@ -758,54 +795,26 @@ macro_rules! __impl_test_ext_for_parachain {
 			}
 
 			fn execute_with<R>(execute: impl FnOnce() -> R) -> R {
-				use $crate::{Get, Hooks, NetworkComponent, Network, Bridge};
-				use sp_core::Encode;
-				use sp_runtime::traits::BlakeTwo256;
-				use polkadot_primitives::HashT;
+				use $crate::{Chain, Get, Hooks, NetworkComponent, Network, Parachain, Encode};
 
 				// Make sure the Network is initialized
 				<$name as NetworkComponent>::Network::init();
 
-				let para_id = <$name>::para_id().into();
-
-				// Initialize block
-				$local_ext.with(|v| {
-					v.borrow_mut().execute_with(|| {
-						let parent_head_data = $crate::LAST_HEAD.with(|b| b.borrow_mut()
-							.get_mut(<Self as NetworkComponent>::Network::name())
-							.expect("network not initialized?")
-							.get(&para_id)
-							.expect("network not initialized?")
-							.clone()
-						);
-
-						// Increase block number
-						let mut relay_block_number = <$name as NetworkComponent>::Network::relay_block_number();
-						relay_block_number += 1;
-						<$name as NetworkComponent>::Network::set_relay_block_number(relay_block_number);
-
-						let _ = <Self as Parachain>::ParachainSystem::set_validation_data(
-							<Self as Chain>::RuntimeOrigin::none(),
-							<$name as NetworkComponent>::Network::hrmp_channel_parachain_inherent_data(para_id, relay_block_number, parent_head_data),
-						);
-					})
-				});
+				// Initialize a new block
+				Self::new_block();
 
 				// Execute
 				let r = $local_ext.with(|v| v.borrow_mut().execute_with(execute));
 
-				// provide inbound DMP/HRMP messages through a side-channel.
-				// normally this would come through the `set_validation_data`,
-				// but we go around that.
-				<$name as NetworkComponent>::Network::process_messages();
+				// Finalize the block
+				Self::finalize_block();
 
-				// Finalize block and send messages if needed
+				let para_id = <$name>::para_id().into();
+
+				// Send messages if needed
 				$local_ext.with(|v| {
 					v.borrow_mut().execute_with(|| {
-						use sp_runtime::traits::Header as HeaderT;
-
-						let block_number = <Self as Chain>::System::block_number();
-						let mock_header = HeaderT::new(
+						let mock_header = $crate::HeaderT::new(
 							0,
 							Default::default(),
 							Default::default(),
@@ -813,16 +822,6 @@ macro_rules! __impl_test_ext_for_parachain {
 							Default::default(),
 						);
 
-						// Finalize to get xcmp messages.
-						<Self as Parachain>::ParachainSystem::on_finalize(block_number);
-						// Store parent head data for use later.
-						let created_header = <Self as Chain>::System::finalize();
-						$crate::LAST_HEAD.with(|b| b.borrow_mut()
-							.get_mut(<Self as NetworkComponent>::Network::name())
-							.expect("network not initialized?")
-							.insert(para_id.into(), $crate::HeadData(created_header.encode()))
-						);
-
 						let collation_info = <Self as Parachain>::ParachainSystem::collect_collation_info(&mock_header);
 
 						// send upward messages
@@ -840,9 +839,9 @@ macro_rules! __impl_test_ext_for_parachain {
 						}
 
 						// get bridge messages
-						type NetworkBridge = <<$name as NetworkComponent>::Network as Network>::Bridge;
+						type NetworkBridge = <<$name as NetworkComponent>::Network as $crate::Network>::Bridge;
 
-						let bridge_messages = <NetworkBridge as Bridge>::Handler::get_source_outbound_messages();
+						let bridge_messages = <<NetworkBridge as $crate::Bridge>::Handler as $crate::BridgeMessageHandler>::get_source_outbound_messages();
 
 						// send bridged messages
 						for msg in bridge_messages {
@@ -850,17 +849,12 @@ macro_rules! __impl_test_ext_for_parachain {
 						}
 
 						// log events
-						Self::events().iter().for_each(|event| {
+						<Self as $crate::Chain>::events().iter().for_each(|event| {
 							$crate::log::debug!(target: concat!("events::", stringify!($name)), "{:?}", event);
 						});
 
 						// clean events
-						<Self as Chain>::System::reset_events();
-
-						// reinitialize before next call.
-						let next_block_number = block_number + 1;
-						<Self as Chain>::System::initialize(&next_block_number, &created_header.hash(), &Default::default());
-						<Self as Parachain>::ParachainSystem::on_initialize(next_block_number);
+						<Self as $crate::Chain>::System::reset_events();
 					})
 				});
 
@@ -895,6 +889,7 @@ macro_rules! decl_test_networks {
 			}
 		),
 		+
+		$(,)?
 	) => {
 		$(
 			pub struct $name;
@@ -908,7 +903,7 @@ macro_rules! decl_test_networks {
 				}
 
 				fn reset() {
-					use $crate::{TestExt, VecDeque};
+					use $crate::{TestExt};
 
 					$crate::INITIALIZED.with(|b| b.borrow_mut().remove(Self::name()));
 					$crate::DOWNWARD_MESSAGES.with(|b| b.borrow_mut().remove(Self::name()));
@@ -934,25 +929,25 @@ macro_rules! decl_test_networks {
 						$crate::PARA_IDS.with(|b| b.borrow_mut().insert(Self::name().to_string(), Self::para_ids()));
 						$crate::LAST_HEAD.with(|b| b.borrow_mut().insert(Self::name().to_string(), $crate::HashMap::new()));
 
-						$( <$parachain>::init(); )*
+						$( <$parachain as $crate::Parachain>::init(); )*
 					}
 				}
 
 				fn para_ids() -> Vec<u32> {
 					vec![$(
-						<$parachain>::para_id().into(),
+						<$parachain as $crate::Parachain>::para_id().into(),
 					)*]
 				}
 
 				fn relay_block_number() -> u32 {
-					Self::Relay::ext_wrapper(|| {
-						<Self::Relay as Chain>::System::block_number()
+					<Self::Relay as $crate::TestExt>::ext_wrapper(|| {
+						<Self::Relay as $crate::Chain>::System::block_number()
 					})
 				}
 
 				fn set_relay_block_number(number: u32) {
-					Self::Relay::ext_wrapper(|| {
-						<Self::Relay as Chain>::System::set_block_number(number);
+					<Self::Relay as $crate::TestExt>::ext_wrapper(|| {
+						<Self::Relay as $crate::Chain>::System::set_block_number(number);
 					})
 				}
 
@@ -973,8 +968,7 @@ macro_rules! decl_test_networks {
 				}
 
 				fn process_downward_messages() {
-					use $crate::{DmpMessageHandler, Bounded};
-					use polkadot_parachain::primitives::RelayChainBlockNumber;
+					use $crate::{DmpMessageHandler, Bounded, Parachain, RelayChainBlockNumber, TestExt};
 
 					while let Some((to_para_id, messages))
 						= $crate::DOWNWARD_MESSAGES.with(|b| b.borrow_mut().get_mut(Self::name()).unwrap().pop_front()) {
@@ -1006,7 +1000,7 @@ macro_rules! decl_test_networks {
 				}
 
 				fn process_horizontal_messages() {
-					use $crate::{XcmpMessageHandler, Bounded};
+					use $crate::{XcmpMessageHandler, Bounded, Parachain, TestExt};
 
 					while let Some((to_para_id, messages))
 						= $crate::HORIZONTAL_MESSAGES.with(|b| b.borrow_mut().get_mut(Self::name()).unwrap().pop_front()) {
@@ -1025,16 +1019,16 @@ macro_rules! decl_test_networks {
 				}
 
 				fn process_upward_messages() {
-					use $crate::{Bounded, ProcessMessage, WeightMeter};
-					use sp_core::Encode;
+					use $crate::{Encode, ProcessMessage, TestExt};
+
 					while let Some((from_para_id, msg)) = $crate::UPWARD_MESSAGES.with(|b| b.borrow_mut().get_mut(Self::name()).unwrap().pop_front()) {
-						let mut weight_meter = WeightMeter::max_limit();
+						let mut weight_meter = $crate::WeightMeter::new();
 						<$relay_chain>::ext_wrapper(|| {
-							let _ =  <$relay_chain as RelayChain>::MessageProcessor::process_message(
+							let _ =  <$relay_chain as $crate::RelayChain>::MessageProcessor::process_message(
 								&msg[..],
 								from_para_id.into(),
 								&mut weight_meter,
-								&mut msg.using_encoded(sp_core::blake2_256),
+								&mut msg.using_encoded($crate::blake2_256),
 							);
 						});
 						$crate::log::debug!(target: concat!("ump::", stringify!($name)) , "Upward message processed {:?} from para_id {:?}", &msg, &from_para_id);
@@ -1042,19 +1036,19 @@ macro_rules! decl_test_networks {
 				}
 
 				fn process_bridged_messages() {
-					use $crate::Bridge;
+					use $crate::{Bridge, BridgeMessageHandler, TestExt};
 					// Make sure both, including the target `Network` are initialized
 					<Self::Bridge as Bridge>::init();
 
 					while let Some(msg) = $crate::BRIDGED_MESSAGES.with(|b| b.borrow_mut().get_mut(Self::name()).unwrap().pop_front()) {
-						let dispatch_result = <<Self::Bridge as $crate::Bridge>::Target as TestExt>::ext_wrapper(|| {
+						let dispatch_result = <<Self::Bridge as Bridge>::Target as TestExt>::ext_wrapper(|| {
 							<<Self::Bridge as Bridge>::Handler as BridgeMessageHandler>::dispatch_target_inbound_message(msg.clone())
 						});
 
 						match dispatch_result {
 							Err(e) => panic!("Error {:?} processing bridged message: {:?}", e, msg.clone()),
 							Ok(()) => {
-								<<Self::Bridge as $crate::Bridge>::Source as TestExt>::ext_wrapper(|| {
+								<<Self::Bridge as Bridge>::Source as TestExt>::ext_wrapper(|| {
 									<<Self::Bridge as Bridge>::Handler as BridgeMessageHandler>::notify_source_message_delivery(msg.id);
 								});
 								$crate::log::debug!(target: concat!("bridge::", stringify!($name)) , "Bridged message processed {:?}", msg.clone());
@@ -1068,8 +1062,6 @@ macro_rules! decl_test_networks {
 					relay_parent_number: u32,
 					parent_head_data: $crate::HeadData,
 				) -> $crate::ParachainInherentData {
-					use $crate::cumulus_primitives_core::{relay_chain::{HeadData, HrmpChannelId}, AbridgedHrmpChannel};
-
 					let mut sproof = $crate::RelayStateSproofBuilder::default();
 					sproof.para_id = para_id.into();
 
@@ -1085,11 +1077,11 @@ macro_rules! decl_test_networks {
 
 						sproof
 							.hrmp_channels
-							.entry(HrmpChannelId {
+							.entry($crate::HrmpChannelId {
 								sender: sproof.para_id,
 								recipient: recipient_para_id,
 							})
-							.or_insert_with(|| AbridgedHrmpChannel {
+							.or_insert_with(|| $crate::AbridgedHrmpChannel {
 								max_capacity: 1024,
 								max_total_size: 1024 * 1024,
 								max_message_size: 1024 * 1024,
@@ -1139,6 +1131,7 @@ macro_rules! decl_test_bridges {
 			}
 		),
 		+
+		$(,)?
 	) => {
 		$(
 			#[derive(Debug)]
@@ -1166,15 +1159,18 @@ macro_rules! __impl_check_assertion {
 		impl<Origin, Destination, Hops, Args>
 			$crate::CheckAssertion<Origin, Destination, Hops, Args> for $chain
 		where
-			Origin: Chain + Clone,
-			Destination: Chain + Clone,
-			Origin::RuntimeOrigin: $crate::OriginTrait<AccountId = $crate::AccountId32> + Clone,
+			Origin: $crate::Chain + Clone,
+			Destination: $crate::Chain + Clone,
+			Origin::RuntimeOrigin:
+				$crate::OriginTrait<AccountId = $crate::AccountIdOf<Origin::Runtime>> + Clone,
 			Destination::RuntimeOrigin:
-				$crate::OriginTrait<AccountId = $crate::AccountId32> + Clone,
+				$crate::OriginTrait<AccountId = $crate::AccountIdOf<Destination::Runtime>> + Clone,
 			Hops: Clone,
 			Args: Clone,
 		{
 			fn check_assertion(test: $crate::Test<Origin, Destination, Hops, Args>) {
+				use $crate::TestExt;
+
 				let chain_name = std::any::type_name::<$chain>();
 
 				<$chain>::execute_with(|| {
@@ -1194,7 +1190,7 @@ macro_rules! __impl_check_assertion {
 macro_rules! assert_expected_events {
 	( $chain:ident, vec![$( $event_pat:pat => { $($attr:ident : $condition:expr, )* }, )*] ) => {
 		let mut message: Vec<String> = Vec::new();
-		let mut events = <$chain>::events();
+		let mut events = <$chain as $crate::Chain>::events();
 
 		$(
 			let mut event_received = false;
@@ -1257,7 +1253,7 @@ macro_rules! assert_expected_events {
 
 		if !message.is_empty() {
 			// Log events as they will not be logged after the panic
-			<$chain>::events().iter().for_each(|event| {
+			<$chain as $crate::Chain>::events().iter().for_each(|event| {
 				$crate::log::debug!(target: concat!("events::", stringify!($chain)), "{:?}", event);
 			});
 			panic!("{}", message.concat())
@@ -1276,10 +1272,10 @@ macro_rules! bx {
 macro_rules! decl_test_sender_receiver_accounts_parameter_types {
 	( $( $chain:ident { sender: $sender:expr, receiver: $receiver:expr }),+ ) => {
 		$crate::paste::paste! {
-			parameter_types! {
+			$crate::parameter_types! {
 				$(
-					pub [<$chain Sender>]: $crate::AccountId = <$chain>::account_id_of($sender);
-					pub [<$chain Receiver>]: $crate::AccountId = <$chain>::account_id_of($receiver);
+					pub [<$chain Sender>]: $crate::AccountId = <$chain as $crate::Chain>::account_id_of($sender);
+					pub [<$chain Receiver>]: $crate::AccountId = <$chain as $crate::Chain>::account_id_of($receiver);
 				)+
 			}
 		}
@@ -1315,8 +1311,8 @@ where
 
 /// Struct that keeps account's id and balance
 #[derive(Clone)]
-pub struct TestAccount {
-	pub account_id: AccountId,
+pub struct TestAccount<R: Chain> {
+	pub account_id: AccountIdOf<R::Runtime>,
 	pub balance: Balance,
 }
 
@@ -1333,9 +1329,9 @@ pub struct TestArgs {
 }
 
 /// Auxiliar struct to help creating a new `Test` instance
-pub struct TestContext<T> {
-	pub sender: AccountId,
-	pub receiver: AccountId,
+pub struct TestContext<T, Origin: Chain, Destination: Chain> {
+	pub sender: AccountIdOf<Origin::Runtime>,
+	pub receiver: AccountIdOf<Destination::Runtime>,
 	pub args: T,
 }
 
@@ -1352,12 +1348,12 @@ pub struct Test<Origin, Destination, Hops = (), Args = TestArgs>
 where
 	Origin: Chain + Clone,
 	Destination: Chain + Clone,
-	Origin::RuntimeOrigin: OriginTrait<AccountId = AccountId32> + Clone,
-	Destination::RuntimeOrigin: OriginTrait<AccountId = AccountId32> + Clone,
+	Origin::RuntimeOrigin: OriginTrait<AccountId = AccountIdOf<Origin::Runtime>> + Clone,
+	Destination::RuntimeOrigin: OriginTrait<AccountId = AccountIdOf<Destination::Runtime>> + Clone,
 	Hops: Clone,
 {
-	pub sender: TestAccount,
-	pub receiver: TestAccount,
+	pub sender: TestAccount<Origin>,
+	pub receiver: TestAccount<Destination>,
 	pub signed_origin: Origin::RuntimeOrigin,
 	pub root_origin: Origin::RuntimeOrigin,
 	pub hops_assertion: HashMap<String, fn(Self)>,
@@ -1372,12 +1368,12 @@ where
 	Args: Clone,
 	Origin: Chain + Clone + CheckAssertion<Origin, Destination, Hops, Args>,
 	Destination: Chain + Clone + CheckAssertion<Origin, Destination, Hops, Args>,
-	Origin::RuntimeOrigin: OriginTrait<AccountId = AccountId32> + Clone,
-	Destination::RuntimeOrigin: OriginTrait<AccountId = AccountId32> + Clone,
+	Origin::RuntimeOrigin: OriginTrait<AccountId = AccountIdOf<Origin::Runtime>> + Clone,
+	Destination::RuntimeOrigin: OriginTrait<AccountId = AccountIdOf<Destination::Runtime>> + Clone,
 	Hops: Clone + CheckAssertion<Origin, Destination, Hops, Args>,
 {
 	/// Creates a new `Test` instance
-	pub fn new(test_args: TestContext<Args>) -> Self {
+	pub fn new(test_args: TestContext<Args, Origin, Destination>) -> Self {
 		Test {
 			sender: TestAccount {
 				account_id: test_args.sender.clone(),
diff --git a/cumulus/zombienet/tests/0007-full_node_warp_sync.toml b/cumulus/zombienet/tests/0007-full_node_warp_sync.toml
index 937c0b83683f19f08be2fcb4344360873cf901c7..524ce6643ce18bd1df4f402a844275198d39f645 100644
--- a/cumulus/zombienet/tests/0007-full_node_warp_sync.toml
+++ b/cumulus/zombienet/tests/0007-full_node_warp_sync.toml
@@ -3,7 +3,7 @@ default_image = "{{RELAY_IMAGE}}"
 default_command = "polkadot"
 default_args = [ "-lparachain=debug" ]
 chain = "rococo-local"
-chain_spec_path = "zombienet/tests/0007-warp-sync-relaychain-spec.json"
+chain_spec_path = "0007-warp-sync-relaychain-spec.json"
 
   [[relaychain.nodes]]
   name = "alice"
@@ -23,12 +23,12 @@ chain_spec_path = "zombienet/tests/0007-warp-sync-relaychain-spec.json"
   [[relaychain.nodes]]
   name = "dave"
   validator = true
-  args = ["--sync warp", "--reserved-only", "--reserved-nodes {{'alice'|zombie('multiAddress')}} {{'bob'|zombie('multiAddress')}} {{'charlie'|zombie('multiAddress')}}"]
+  args = ["--no-beefy", "--sync warp", "--reserved-only", "--reserved-nodes {{'alice'|zombie('multiAddress')}} {{'bob'|zombie('multiAddress')}} {{'charlie'|zombie('multiAddress')}}"]
 
 [[parachains]]
 id = 2000
 cumulus_based = true
-chain_spec_path = "zombienet/tests/0007-warp-sync-parachain-spec.json"
+chain_spec_path = "0007-warp-sync-parachain-spec.json"
 add_to_genesis = false
 
   # Run 'dave' as parachain collator.
diff --git a/cumulus/zombienet/tests/0007-prepare-warp-sync-db-snapshot.md b/cumulus/zombienet/tests/0007-prepare-warp-sync-db-snapshot.md
index 7885dd0c0269d5772a344ba447fafd933b686563..373e480723803cf51585e38242bb1b37e41c8e15 100644
--- a/cumulus/zombienet/tests/0007-prepare-warp-sync-db-snapshot.md
+++ b/cumulus/zombienet/tests/0007-prepare-warp-sync-db-snapshot.md
@@ -1,22 +1,24 @@
 # Database snapshot guide
 
-For this guide we will be taking a snapshot of a parachain and relay chain. Please note we are using a local chain here `rococo_local_testnet` and `local_testnet`. Live chains will have different values
+For this guide we will be taking a snapshot of a parachain and relay chain. Please note we are using a local chain here
+`rococo_local_testnet` and `local_testnet`. Live chains will have different values
 
 *Please ensure that the database is not in current use, i.e no nodes are writing to it*
 
 # How to prepare database for a relaychain
-To prepare snapshot for a relay chain we need to copy the database. 
+To prepare snapshot for a relay chain we need to copy the database.
 
 ```
 mkdir -p relaychain-snapshot/alice/data/chains/rococo_local_testnet/db/
 
-cp -r chain-data/alice/data/chains/rococo_local_testnet/db/. relaychain-snapshot/alice/data/chains/rococo_local_testnet/db/ 
+cp -r chain-data/alice/data/chains/rococo_local_testnet/db/. relaychain-snapshot/alice/data/chains/rococo_local_testnet/db/
 
 tar -C relaychain-snapshot/alice/ -czf relaychain.tgz data
 ```
 # How to prepare database for a parachain
 
-To prepare snapshot for a parachain we need to copy the database for both the collator node (parachain data) and validator (relay data)
+To prepare snapshot for a parachain we need to copy the database for both the collator node (parachain data) and
+validator (relay data)
 
 ```
 #Parachain data
@@ -33,5 +35,6 @@ tar -C parachain-snapshot/charlie/ -czf parachain.tgz data relay-data
 ```
 
 # Restoring a snapshot
-Zombienet will automatically download the `*.tgz` file to the respective folder for a run. However you can also download it manually, just ensure you extract the tar file in the correct directory, i.e. the root directory
-`chain-data/charlie/`
\ No newline at end of file
+Zombienet will automatically download the `*.tgz` file to the respective folder for a run. However you can also download
+it manually, just ensure you extract the tar file in the correct directory, i.e. the root directory
+`chain-data/charlie/`
diff --git a/docker/docker-compose.yml b/docker/docker-compose.yml
deleted file mode 100644
index 8344ad43bb4cbac17b5b3f1d7cc5de9264f36050..0000000000000000000000000000000000000000
--- a/docker/docker-compose.yml
+++ /dev/null
@@ -1,129 +0,0 @@
-version: '3.7'
-services:
-  node_alice:
-    image: "polkadot:${BRANCH:-cumulus-branch}"
-    ports:
-      - "30333:30333"
-      - "9933:9933"
-      - "9944:9944"
-    volumes:
-      - "polkadot-data-alice:/data"
-      - type: bind
-        source: ./test/parachain/chain-specs/polkadot_chainspec.json
-        target: /chainspec.json
-        read_only: true
-    command: >
-      polkadot
-      --chain=/chainspec.json
-      --base-path=/data
-      --port 30333
-      --rpc-port 9933
-      --ws-port 9944
-      --rpc-external
-      --rpc-cors all
-      --ws-external
-      --alice
-    networks:
-      testing_net:
-        ipv4_address: 172.28.1.1
-        aliases:
-          - alice
-
-  node_bob:
-    image: "polkadot:${BRANCH:-cumulus-branch}"
-    ports:
-      - "30344:30333"
-      - "9935:9933"
-      - "9945:9944"
-    volumes:
-      - "polkadot-data-bob:/data"
-      - type: bind
-        source: ./test/parachain/chain-specs/polkadot_chainspec.json
-        target: /chainspec.json
-        read_only: true
-    command: >
-      polkadot
-      --chain=/chainspec.json
-      --base-path=/data
-      --port 30333
-      --rpc-port 9933
-      --ws-port 9944
-      --rpc-external
-      --ws-external
-      --rpc-cors all
-      --bob
-    networks:
-      testing_net:
-        ipv4_address: 172.28.1.2
-        aliases:
-          - bob
-
-  genesis_state:
-    build:
-      context: .
-      dockerfile: ./docker/test-parachain-collator.dockerfile
-    image: "ctpc:latest"
-    volumes:
-      - "genesis-state:/data"
-    command: >
-      polkadot-parachain
-      export-genesis-state
-      /data/genesis-state
-
-  collator:
-    build:
-      context: .
-      dockerfile: ./docker/test-parachain-collator.dockerfile
-      target: collator
-    image: "ctpc:collator"
-    volumes:
-      - "collator-data:/data"
-    depends_on:
-      - node_alice
-      - node_bob
-    command: >
-      inject_bootnodes.sh
-      --base-path=/data
-    networks:
-      testing_net:
-
-  runtime:
-    build:
-      context: .
-      dockerfile: ./docker/test-parachain-collator.dockerfile
-      target: runtime
-    image: "ctpc:runtime"
-    volumes:
-      - "parachain-runtime:/runtime"
-
-
-  registrar:
-    build:
-      context: .
-      dockerfile: ./docker/parachain-registrar.dockerfile
-    image: para-reg:latest
-    volumes:
-      - "genesis-state:/genesis"
-      - "parachain-runtime:/runtime"
-    depends_on:
-      - node_alice
-      - runtime
-      - genesis_state
-    networks:
-      testing_net:
-
-
-volumes:
-  polkadot-data-alice:
-  polkadot-data-bob:
-  collator-data:
-  genesis-state:
-  parachain-runtime:
-
-
-networks:
-  testing_net:
-    ipam:
-      driver: default
-      config:
-        - subnet: 172.28.0.0/16
diff --git a/polkadot/scripts/ci/dockerfiles/binary_injected.Dockerfile b/docker/dockerfiles/binary_injected.Dockerfile
similarity index 86%
rename from polkadot/scripts/ci/dockerfiles/binary_injected.Dockerfile
rename to docker/dockerfiles/binary_injected.Dockerfile
index cee81a2eb8ae06412109d942b5ca3d322c0cdf1e..ac1fd5317c67cb4cbef1044a6e2e3379f8ff4662 100644
--- a/polkadot/scripts/ci/dockerfiles/binary_injected.Dockerfile
+++ b/docker/dockerfiles/binary_injected.Dockerfile
@@ -15,7 +15,7 @@ ARG IMAGE_NAME
 ARG BINARY=polkadot
 
 ARG BIN_FOLDER=.
-ARG DOC_URL=https://github.com/paritytech/polkadot
+ARG DOC_URL=https://github.com/paritytech/polkadot-sdk
 ARG DESCRIPTION="Polkadot: a platform for web3"
 ARG AUTHORS="devops-team@parity.io"
 ARG VENDOR="Parity Technologies"
@@ -27,7 +27,7 @@ LABEL io.parity.image.authors=${AUTHORS} \
 	io.parity.image.created="${BUILD_DATE}" \
 	io.parity.image.documentation="${DOC_URL}" \
 	io.parity.image.description="${DESCRIPTION}" \
-	io.parity.image.source="https://github.com/paritytech/polkadot/blob/${VCS_REF}/scripts/ci/dockerfiles/binary_injected.Dockerfile"
+	io.parity.image.source="https://github.com/paritytech/polkadot-sdk/blob/${VCS_REF}/docker/dockerfiles/binary_injected.Dockerfile"
 
 USER root
 WORKDIR /app
diff --git a/docker/collator_injected.Dockerfile b/docker/dockerfiles/collator_injected.Dockerfile
similarity index 91%
rename from docker/collator_injected.Dockerfile
rename to docker/dockerfiles/collator_injected.Dockerfile
index 6472c240f3322a667e49ff1a1a952c90a4cd85c7..999203b93f0ac593aea3b8b9a5c260890f569097 100644
--- a/docker/collator_injected.Dockerfile
+++ b/docker/dockerfiles/collator_injected.Dockerfile
@@ -10,10 +10,10 @@ LABEL io.parity.image.authors="devops-team@parity.io" \
 	io.parity.image.vendor="Parity Technologies" \
 	io.parity.image.title="${IMAGE_NAME}" \
 	io.parity.image.description="Injected adder-collator Docker image" \
-	io.parity.image.source="https://github.com/paritytech/polkadot/blob/${VCS_REF}/scripts/ci/dockerfiles/collator_injected.Dockerfile" \
+	io.parity.image.source="https://github.com/paritytech/polkadot-sdk/blob/${VCS_REF}/docker/dockerfiles/collator_injected.Dockerfile" \
 	io.parity.image.revision="${VCS_REF}" \
 	io.parity.image.created="${BUILD_DATE}" \
-	io.parity.image.documentation="https://github.com/paritytech/polkadot/"
+	io.parity.image.documentation="https://github.com/paritytech/polkadot-sdk/"
 
 # show backtraces
 ENV RUST_BACKTRACE 1
diff --git a/cumulus/docker/docker-compose.yml b/docker/dockerfiles/docker-compose.yml
similarity index 89%
rename from cumulus/docker/docker-compose.yml
rename to docker/dockerfiles/docker-compose.yml
index 8344ad43bb4cbac17b5b3f1d7cc5de9264f36050..0e34e54562aee333130b1d6b0210f49391a72ebd 100644
--- a/cumulus/docker/docker-compose.yml
+++ b/docker/dockerfiles/docker-compose.yml
@@ -61,7 +61,7 @@ services:
   genesis_state:
     build:
       context: .
-      dockerfile: ./docker/test-parachain-collator.dockerfile
+      dockerfile: ./docker/dockerfiles/test-parachain-collator.Dockerfile
     image: "ctpc:latest"
     volumes:
       - "genesis-state:/data"
@@ -73,7 +73,7 @@ services:
   collator:
     build:
       context: .
-      dockerfile: ./docker/test-parachain-collator.dockerfile
+      dockerfile: ./docker/dockerfiles/test-parachain-collator.Dockerfile
       target: collator
     image: "ctpc:collator"
     volumes:
@@ -90,7 +90,7 @@ services:
   runtime:
     build:
       context: .
-      dockerfile: ./docker/test-parachain-collator.dockerfile
+      dockerfile: ./docker/dockerfiles/test-parachain-collator.Dockerfile
       target: runtime
     image: "ctpc:runtime"
     volumes:
@@ -100,7 +100,7 @@ services:
   registrar:
     build:
       context: .
-      dockerfile: ./docker/parachain-registrar.dockerfile
+      dockerfile: ./docker/dockerfiles/parachain-registrar.Dockerfile
     image: para-reg:latest
     volumes:
       - "genesis-state:/genesis"
diff --git a/docker/malus_injected.Dockerfile b/docker/dockerfiles/malus_injected.Dockerfile
similarity index 83%
rename from docker/malus_injected.Dockerfile
rename to docker/dockerfiles/malus_injected.Dockerfile
index ecffd2c4f9b48fa624a1cb56eee509e3e6b6ded1..dd8702ea101b5b53e568a6933a08397ce81ce5aa 100644
--- a/docker/malus_injected.Dockerfile
+++ b/docker/dockerfiles/malus_injected.Dockerfile
@@ -9,10 +9,10 @@ LABEL io.parity.image.authors="devops-team@parity.io" \
 	io.parity.image.vendor="Parity Technologies" \
 	io.parity.image.title="${IMAGE_NAME}" \
 	io.parity.image.description="Malus - the nemesis of polkadot" \
-	io.parity.image.source="https://github.com/paritytech/polkadot/blob/${VCS_REF}/scripts/ci/dockerfiles/malus.Dockerfile" \
+	io.parity.image.source="https://github.com/paritytech/polkadot-sdk/blob/${VCS_REF}/docker/dockerfiles/malus_injected.Dockerfile" \
 	io.parity.image.revision="${VCS_REF}" \
 	io.parity.image.created="${BUILD_DATE}" \
-	io.parity.image.documentation="https://github.com/paritytech/polkadot/"
+	io.parity.image.documentation="https://github.com/paritytech/polkadot-sdk/"
 
 # show backtraces
 ENV RUST_BACKTRACE 1
@@ -39,7 +39,7 @@ RUN apt-get update && \
 
 
 # add adder-collator binary to docker image
-COPY ./artifacts/malus /usr/local/bin
+COPY ./artifacts/malus ./artifacts/polkadot-execute-worker ./artifacts/polkadot-prepare-worker /usr/local/bin
 
 USER nonroot
 
diff --git a/cumulus/docker/parachain-registrar.dockerfile b/docker/dockerfiles/parachain-registrar.Dockerfile
similarity index 89%
rename from cumulus/docker/parachain-registrar.dockerfile
rename to docker/dockerfiles/parachain-registrar.Dockerfile
index f7d77454a2b9d37080047f1351c564c87f91824d..594bff44906dec6fc871ab9318c34b290f5a15b8 100644
--- a/cumulus/docker/parachain-registrar.dockerfile
+++ b/docker/dockerfiles/parachain-registrar.Dockerfile
@@ -9,7 +9,7 @@ CMD [ "--version" ]
 
 # To use the pjs build stage to access the blockchain from the host machine:
 #
-#   docker build -f docker/parachain-registrar.dockerfile --target pjs -t parachain-registrar:pjs .
+#   docker build -f docker/dockerfiles/parachain-registrar.Dockerfile --target pjs -t parachain-registrar:pjs .
 #   alias pjs='docker run --rm --net cumulus_testing_net parachain-registrar:pjs --ws ws://172.28.1.1:9944'
 #
 # Then, as long as the chain is running, you can use the polkadot-js-api CLI like:
diff --git a/docker/polkadot-parachain-debug_unsigned_injected.Dockerfile b/docker/dockerfiles/polkadot-parachain/polkadot-parachain-debug_unsigned_injected.Dockerfile
similarity index 79%
rename from docker/polkadot-parachain-debug_unsigned_injected.Dockerfile
rename to docker/dockerfiles/polkadot-parachain/polkadot-parachain-debug_unsigned_injected.Dockerfile
index e77563b8ebf2466a7935341041fc04bb07bbce24..f249612e776419edf78304351656e6b234f5b9db 100644
--- a/docker/polkadot-parachain-debug_unsigned_injected.Dockerfile
+++ b/docker/dockerfiles/polkadot-parachain/polkadot-parachain-debug_unsigned_injected.Dockerfile
@@ -9,10 +9,10 @@ LABEL io.parity.image.authors="devops-team@parity.io" \
 	io.parity.image.vendor="Parity Technologies" \
 	io.parity.image.title="${IMAGE_NAME}" \
 	io.parity.image.description="Cumulus, the Polkadot collator." \
-	io.parity.image.source="https://github.com/paritytech/cumulus/blob/${VCS_REF}/scripts/docker/polkadot-parachain-debug_unsigned_injected.Dockerfile" \
+	io.parity.image.source="https://github.com/paritytech/polkadot-sdk/blob/${VCS_REF}/docker/dockerfiles/polkadot-parachain/polkadot-parachain-debug_unsigned_injected.Dockerfile" \
 	io.parity.image.revision="${VCS_REF}" \
 	io.parity.image.created="${BUILD_DATE}" \
-	io.parity.image.documentation="https://github.com/paritytech/cumulus/"
+	io.parity.image.documentation="https://github.com/paritytech/polkadot-sdk/tree/master/cumulus"
 
 # show backtraces
 ENV RUST_BACKTRACE 1
@@ -28,7 +28,7 @@ RUN apt-get update && \
 	apt-get clean && \
 	find /var/lib/apt/lists/ -type f -not -name lock -delete; \
 	# add user and link ~/.local/share/polkadot-parachain to /data
-	useradd -m -u 10000 -U -s /bin/sh -d /polkadot-parachain polkadot-parachain && \
+	useradd -m -u 1000 -U -s /bin/sh -d /polkadot-parachain polkadot-parachain && \
 	mkdir -p /data /polkadot-parachain/.local/share && \
 	chown -R polkadot-parachain:polkadot-parachain /data && \
 	ln -s /data /polkadot-parachain/.local/share/polkadot-parachain && \
diff --git a/docker/polkadot-parachain_builder.Containerfile b/docker/dockerfiles/polkadot-parachain/polkadot-parachain_builder.Dockerfile
similarity index 85%
rename from docker/polkadot-parachain_builder.Containerfile
rename to docker/dockerfiles/polkadot-parachain/polkadot-parachain_builder.Dockerfile
index 159bcb323693865d924b93d674af770f8a6bdf41..b56b8c1a1ef8fc50548aa2c21431cf865e62c4c4 100644
--- a/docker/polkadot-parachain_builder.Containerfile
+++ b/docker/dockerfiles/polkadot-parachain/polkadot-parachain_builder.Dockerfile
@@ -1,4 +1,4 @@
-# This file is sourced from https://github.com/paritytech/polkadot/blob/master/scripts/ci/dockerfiles/polkadot/polkadot_builder.Dockerfile
+# This file is sourced from https://github.com/paritytech/polkadot-sdk/blob/master/docker/dockerfiles/polkadot-parachain/polkadot-parachain_builder.Dockerfile
 # This is the build stage for polkadot-parachain. Here we create the binary in a temporary image.
 FROM docker.io/paritytech/ci-linux:production as builder
 
@@ -14,8 +14,8 @@ LABEL io.parity.image.type="builder" \
     io.parity.image.authors="devops-team@parity.io" \
     io.parity.image.vendor="Parity Technologies" \
     io.parity.image.description="Multistage Docker image for polkadot-parachain" \
-    io.parity.image.source="https://github.com/paritytech/polkadot/blob/${VCS_REF}/scripts/ci/dockerfiles/polkadot/polkadot-parachain_builder.Dockerfile" \
-    io.parity.image.documentation="https://github.com/paritytech/cumulus"
+    io.parity.image.source="https://github.com/paritytech/polkadot-sdk/blob/${VCS_REF}/docker/dockerfiles/polkadot-parachain/polkadot-parachain_builder.Dockerfile" \
+    io.parity.image.documentation="https://github.com/paritytech/polkadot-sdk/tree/master/cumulus"
 
 COPY --from=builder /cumulus/target/release/polkadot-parachain /usr/local/bin
 
diff --git a/cumulus/docker/injected.Dockerfile b/docker/dockerfiles/polkadot-parachain/polkadot-parachain_injected.Dockerfile
similarity index 68%
rename from cumulus/docker/injected.Dockerfile
rename to docker/dockerfiles/polkadot-parachain/polkadot-parachain_injected.Dockerfile
index f9b11f022e75bc6ec81400b42ae8acac2385424f..16bd0f4cf3c55f521cc546655a38f709ad094c41 100644
--- a/cumulus/docker/injected.Dockerfile
+++ b/docker/dockerfiles/polkadot-parachain/polkadot-parachain_injected.Dockerfile
@@ -9,10 +9,10 @@ LABEL io.parity.image.authors="devops-team@parity.io" \
 	io.parity.image.vendor="Parity Technologies" \
 	io.parity.image.title="${IMAGE_NAME}" \
 	io.parity.image.description="Cumulus, the Polkadot collator." \
-	io.parity.image.source="https://github.com/paritytech/polkadot/blob/${VCS_REF}/scripts/docker/Dockerfile" \
+	io.parity.image.source="https://github.com/paritytech/polkadot-sdk/blob/${VCS_REF}/docker/dockerfiles/polkadot-parachain/polkadot-parachain_injected.Dockerfile" \
 	io.parity.image.revision="${VCS_REF}" \
 	io.parity.image.created="${BUILD_DATE}" \
-	io.parity.image.documentation="https://github.com/paritytech/cumulus/"
+	io.parity.image.documentation="https://github.com/paritytech/polkadot-sdk/"
 
 # show backtraces
 ENV RUST_BACKTRACE 1
@@ -22,8 +22,10 @@ USER root
 RUN	mkdir -p /specs
 
 # add polkadot-parachain binary to the docker image
-COPY ./release-artifacts/* /usr/local/bin
-COPY ./parachains/chain-specs/*.json /specs/
+COPY bin/* /usr/local/bin/
+COPY specs/* /specs/
+
+RUN chmod -R a+rx "/usr/local/bin"
 
 USER parity
 
diff --git a/polkadot/scripts/ci/dockerfiles/polkadot/README.md b/docker/dockerfiles/polkadot/README.md
similarity index 100%
rename from polkadot/scripts/ci/dockerfiles/polkadot/README.md
rename to docker/dockerfiles/polkadot/README.md
diff --git a/polkadot/scripts/ci/dockerfiles/polkadot/docker-compose-local.yml b/docker/dockerfiles/polkadot/docker-compose-local.yml
similarity index 100%
rename from polkadot/scripts/ci/dockerfiles/polkadot/docker-compose-local.yml
rename to docker/dockerfiles/polkadot/docker-compose-local.yml
diff --git a/polkadot/scripts/ci/dockerfiles/polkadot/docker-compose.yml b/docker/dockerfiles/polkadot/docker-compose.yml
similarity index 100%
rename from polkadot/scripts/ci/dockerfiles/polkadot/docker-compose.yml
rename to docker/dockerfiles/polkadot/docker-compose.yml
diff --git a/polkadot/scripts/ci/dockerfiles/polkadot/polkadot_Dockerfile.README.md b/docker/dockerfiles/polkadot/polkadot_Dockerfile.README.md
similarity index 100%
rename from polkadot/scripts/ci/dockerfiles/polkadot/polkadot_Dockerfile.README.md
rename to docker/dockerfiles/polkadot/polkadot_Dockerfile.README.md
diff --git a/polkadot/scripts/ci/dockerfiles/polkadot/polkadot_builder.Dockerfile b/docker/dockerfiles/polkadot/polkadot_builder.Dockerfile
similarity index 89%
rename from polkadot/scripts/ci/dockerfiles/polkadot/polkadot_builder.Dockerfile
rename to docker/dockerfiles/polkadot/polkadot_builder.Dockerfile
index f263c836bbfe780820b0da1a0387f1b6e72be46f..7e460bb22e892a30d360a69815e43b8c197d0fda 100644
--- a/polkadot/scripts/ci/dockerfiles/polkadot/polkadot_builder.Dockerfile
+++ b/docker/dockerfiles/polkadot/polkadot_builder.Dockerfile
@@ -14,8 +14,8 @@ LABEL description="Multistage Docker image for Polkadot: a platform for web3" \
 	io.parity.image.authors="chevdor@gmail.com, devops-team@parity.io" \
 	io.parity.image.vendor="Parity Technologies" \
 	io.parity.image.description="Polkadot: a platform for web3" \
-	io.parity.image.source="https://github.com/paritytech/polkadot/blob/${VCS_REF}/scripts/ci/dockerfiles/polkadot/polkadot_builder.Dockerfile" \
-	io.parity.image.documentation="https://github.com/paritytech/polkadot/"
+	io.parity.image.source="https://github.com/paritytech/polkadot-sdk/blob/${VCS_REF}/docker/dockerfiles/polkadot/polkadot_builder.Dockerfile" \
+	io.parity.image.documentation="https://github.com/paritytech/polkadot-sdk/"
 
 COPY --from=builder /polkadot/target/release/polkadot /usr/local/bin
 
diff --git a/polkadot/scripts/ci/dockerfiles/polkadot/polkadot_injected_debian.Dockerfile b/docker/dockerfiles/polkadot/polkadot_injected_debian.Dockerfile
similarity index 51%
rename from polkadot/scripts/ci/dockerfiles/polkadot/polkadot_injected_debian.Dockerfile
rename to docker/dockerfiles/polkadot/polkadot_injected_debian.Dockerfile
index e2c72dcfe2e92411317ce86c0fb965b6246f52ea..529c82e6af69db7fdbf82bf1d0292904f362e731 100644
--- a/polkadot/scripts/ci/dockerfiles/polkadot/polkadot_injected_debian.Dockerfile
+++ b/docker/dockerfiles/polkadot/polkadot_injected_debian.Dockerfile
@@ -1,4 +1,4 @@
-FROM docker.io/library/ubuntu:20.04
+FROM docker.io/parity/base-bin
 
 # metadata
 ARG VCS_REF
@@ -11,43 +11,34 @@ LABEL io.parity.image.authors="devops-team@parity.io" \
 	io.parity.image.vendor="Parity Technologies" \
 	io.parity.image.title="parity/polkadot" \
 	io.parity.image.description="Polkadot: a platform for web3. This is the official Parity image with an injected binary." \
-	io.parity.image.source="https://github.com/paritytech/polkadot/blob/${VCS_REF}/scripts/ci/dockerfiles/polkadot/polkadot_injected_debian.Dockerfile" \
+	io.parity.image.source="https://github.com/paritytech/polkadot-sdk/blob/${VCS_REF}/scripts/ci/dockerfiles/polkadot/polkadot_injected_debian.Dockerfile" \
 	io.parity.image.revision="${VCS_REF}" \
 	io.parity.image.created="${BUILD_DATE}" \
-	io.parity.image.documentation="https://github.com/paritytech/polkadot/"
+	io.parity.image.documentation="https://github.com/paritytech/polkadot-sdk/"
+
+USER root
 
 # show backtraces
 ENV RUST_BACKTRACE 1
 
-# install tools and dependencies
-RUN apt-get update && \
-	DEBIAN_FRONTEND=noninteractive apt-get install -y --no-install-recommends \
-		libssl1.1 \
-		ca-certificates \
-		gnupg && \
-	useradd -m -u 1000 -U -s /bin/sh -d /polkadot polkadot && \
-# add repo's gpg keys and install the published polkadot binary
-	gpg --keyserver ${GPG_KEYSERVER} --recv-keys ${POLKADOT_GPGKEY} && \
-	gpg --export ${POLKADOT_GPGKEY} > /usr/share/keyrings/parity.gpg && \
-	echo 'deb [signed-by=/usr/share/keyrings/parity.gpg] https://releases.parity.io/deb release main' > /etc/apt/sources.list.d/parity.list && \
+RUN \
 	apt-get update && \
 	apt-get install -y --no-install-recommends polkadot=${POLKADOT_VERSION#?} && \
-# apt cleanup
 	apt-get autoremove -y && \
 	apt-get clean && \
 	rm -rf /var/lib/apt/lists/* ; \
 	mkdir -p /data /polkadot/.local/share && \
-	chown -R polkadot:polkadot /data && \
+	chown -R parity:parity /data && \
 	ln -s /data /polkadot/.local/share/polkadot
 
-USER polkadot
+USER parity
 
 # check if executable works in this container
 RUN /usr/bin/polkadot --version
-RUN /usr/bin/polkadot-execute-worker --version
-RUN /usr/bin/polkadot-prepare-worker --version
+RUN /usr/lib/polkadot/polkadot-execute-worker --version
+RUN /usr/lib/polkadot/polkadot-prepare-worker --version
 
-EXPOSE 30333 9933 9944
+EXPOSE 30333 9933 9944 9615
 VOLUME ["/polkadot"]
 
 ENTRYPOINT ["/usr/bin/polkadot"]
diff --git a/docker/polkadot_injected_debug.Dockerfile b/docker/dockerfiles/polkadot/polkadot_injected_debug.Dockerfile
similarity index 66%
rename from docker/polkadot_injected_debug.Dockerfile
rename to docker/dockerfiles/polkadot/polkadot_injected_debug.Dockerfile
index 3dd62f7ba56f4dec5e2444a0cc93fecfa3fef70e..55d23f3a80529db9e6ba62977ec6b7e679ff7cbf 100644
--- a/docker/polkadot_injected_debug.Dockerfile
+++ b/docker/dockerfiles/polkadot/polkadot_injected_debug.Dockerfile
@@ -9,10 +9,10 @@ LABEL io.parity.image.authors="devops-team@parity.io" \
 	io.parity.image.vendor="Parity Technologies" \
 	io.parity.image.title="${IMAGE_NAME}" \
 	io.parity.image.description="Polkadot: a platform for web3" \
-	io.parity.image.source="https://github.com/paritytech/polkadot/blob/${VCS_REF}/scripts/ci/dockerfiles/polkadot_injected_debug.Dockerfile" \
+	io.parity.image.source="https://github.com/paritytech/polkadot-sdk/blob/${VCS_REF}/docker/dockerfiles/polkadot/polkadot_injected_debug.Dockerfile" \
 	io.parity.image.revision="${VCS_REF}" \
 	io.parity.image.created="${BUILD_DATE}" \
-	io.parity.image.documentation="https://github.com/paritytech/polkadot/"
+	io.parity.image.documentation="https://github.com/paritytech/polkadot-sdk"
 
 # show backtraces
 ENV RUST_BACKTRACE 1
@@ -28,17 +28,22 @@ RUN apt-get update && \
 	find /var/lib/apt/lists/ -type f -not -name lock -delete; \
 	# add user and link ~/.local/share/polkadot to /data
 	useradd -m -u 1000 -U -s /bin/sh -d /polkadot polkadot && \
-	mkdir -p /data /polkadot/.local/share && \
+	mkdir -p /data /polkadot/.local/share /polkdot/runtimes && \
 	chown -R polkadot:polkadot /data && \
 	ln -s /data /polkadot/.local/share/polkadot
 
-# add polkadot binary to docker image
-COPY ./artifacts/polkadot /usr/local/bin
+# add polkadot binaries to docker image
+COPY ./artifacts/polkadot ./artifacts/polkadot-execute-worker ./artifacts/polkadot-prepare-worker /usr/local/bin
+
+# add runtime binaries to docker image
+COPY ./artifacts/runtimes /polkadot/runtimes/
 
 USER polkadot
 
 # check if executable works in this container
 RUN /usr/local/bin/polkadot --version
+RUN /usr/local/bin/polkadot-execute-worker --version
+RUN /usr/local/bin/polkadot-prepare-worker --version
 
 EXPOSE 30333 9933 9944
 VOLUME ["/polkadot"]
diff --git a/docker/polkadot_injected_release.Dockerfile b/docker/dockerfiles/polkadot/polkadot_injected_release.Dockerfile
similarity index 86%
rename from docker/polkadot_injected_release.Dockerfile
rename to docker/dockerfiles/polkadot/polkadot_injected_release.Dockerfile
index ba0a79e781871d08bb4487528bb189ee1604dd0d..2632968f8a2b07dc41639a5795ecbcedb74d1ebf 100644
--- a/docker/polkadot_injected_release.Dockerfile
+++ b/docker/dockerfiles/polkadot/polkadot_injected_release.Dockerfile
@@ -11,10 +11,10 @@ LABEL io.parity.image.authors="devops-team@parity.io" \
 	io.parity.image.vendor="Parity Technologies" \
 	io.parity.image.title="parity/polkadot" \
 	io.parity.image.description="Polkadot: a platform for web3. This is the official Parity image with an injected binary." \
-	io.parity.image.source="https://github.com/paritytech/polkadot/blob/${VCS_REF}/scripts/ci/dockerfiles/polkadot_injected_release.Dockerfile" \
+	io.parity.image.source="https://github.com/paritytech/polkadot-sdk/blob/${VCS_REF}/docker/dockerfiles/polkadot/polkadot_injected_release.Dockerfile" \
 	io.parity.image.revision="${VCS_REF}" \
 	io.parity.image.created="${BUILD_DATE}" \
-	io.parity.image.documentation="https://github.com/paritytech/polkadot/"
+	io.parity.image.documentation="https://github.com/paritytech/polkadot-sdk/"
 
 # show backtraces
 ENV RUST_BACKTRACE 1
@@ -44,6 +44,8 @@ USER polkadot
 
 # check if executable works in this container
 RUN /usr/bin/polkadot --version
+RUN /usr/local/bin/polkadot-execute-worker --version
+RUN /usr/local/bin/polkadot-prepare-worker --version
 
 EXPOSE 30333 9933 9944
 VOLUME ["/polkadot"]
diff --git a/docker/substrate_injected.Dockerfile b/docker/dockerfiles/substrate_injected.Dockerfile
similarity index 89%
rename from docker/substrate_injected.Dockerfile
rename to docker/dockerfiles/substrate_injected.Dockerfile
index 2d825f5c6bb34c22665db78150650e0504f3ce8d..47a917013a8b530e25255842a02802727cd8e93c 100644
--- a/docker/substrate_injected.Dockerfile
+++ b/docker/dockerfiles/substrate_injected.Dockerfile
@@ -9,7 +9,7 @@ LABEL io.parity.image.authors="devops-team@parity.io" \
 	io.parity.image.vendor="Parity Technologies" \
 	io.parity.image.title="${IMAGE_NAME}" \
 	io.parity.image.description="Substrate: The platform for blockchain innovators." \
-	io.parity.image.source="https://github.com/paritytech/substrate/blob/${VCS_REF}/scripts/ci/docker/Dockerfile" \
+	io.parity.image.source="https://github.com/paritytech/polkadot-sdk/blob/${VCS_REF}/docker/dockerfiles/substrate_injected.Dockerfile" \
 	io.parity.image.revision="${VCS_REF}" \
 	io.parity.image.created="${BUILD_DATE}" \
 	io.parity.image.documentation="https://wiki.parity.io/Parity-Substrate"
diff --git a/docker/test-parachain-collator.dockerfile b/docker/dockerfiles/test-parachain-collator.Dockerfile
similarity index 96%
rename from docker/test-parachain-collator.dockerfile
rename to docker/dockerfiles/test-parachain-collator.Dockerfile
index 9c2d8fbe5818fe241da70a401968aa45a39fbf44..116520284dd34b1488f218c7c5ba34035260202c 100644
--- a/docker/test-parachain-collator.dockerfile
+++ b/docker/dockerfiles/test-parachain-collator.Dockerfile
@@ -1,4 +1,4 @@
-# This file is sourced from https://github.com/paritytech/polkadot/blob/master/scripts/ci/dockerfiles/polkadot/polkadot_builder.Dockerfile
+# This file is sourced from https://github.com/paritytech/polkadot-sdk/blob/master/docker/dockerfiles/test-parachain-collator.Dockerfile
 FROM docker.io/paritytech/ci-linux:production as builder
 
 WORKDIR /cumulus
diff --git a/docker/test-parachain_injected.Dockerfile b/docker/dockerfiles/test-parachain_injected.Dockerfile
similarity index 85%
rename from docker/test-parachain_injected.Dockerfile
rename to docker/dockerfiles/test-parachain_injected.Dockerfile
index 0b345e16e4af572098fb4d5c062859bb42789cdc..317312a18bf14e37fd726914db9bb227577dc2ec 100644
--- a/docker/test-parachain_injected.Dockerfile
+++ b/docker/dockerfiles/test-parachain_injected.Dockerfile
@@ -9,10 +9,10 @@ LABEL io.parity.image.authors="devops-team@parity.io" \
 	io.parity.image.vendor="Parity Technologies" \
 	io.parity.image.title="${IMAGE_NAME}" \
 	io.parity.image.description="Test parachain for Zombienet" \
-	io.parity.image.source="https://github.com/paritytech/cumulus/blob/${VCS_REF}/docker/test-parachain_injected.Dockerfile" \
+	io.parity.image.source="https://github.com/paritytech/polkadot-sdk/blob/${VCS_REF}/docker/dockerfiles/test-parachain_injected.Dockerfile" \
 	io.parity.image.revision="${VCS_REF}" \
 	io.parity.image.created="${BUILD_DATE}" \
-	io.parity.image.documentation="https://github.com/paritytech/cumulus/"
+	io.parity.image.documentation="https://github.com/paritytech/polkadot-sdk/tree/master/cumulus"
 
 # show backtraces
 ENV RUST_BACKTRACE 1
diff --git a/docker/injected.Dockerfile b/docker/injected.Dockerfile
deleted file mode 100644
index 93d0561ca87755052fc45f965becd76ee244065b..0000000000000000000000000000000000000000
--- a/docker/injected.Dockerfile
+++ /dev/null
@@ -1,51 +0,0 @@
-FROM docker.io/library/ubuntu:20.04
-
-# metadata
-ARG VCS_REF
-ARG BUILD_DATE
-ARG IMAGE_NAME
-
-LABEL io.parity.image.authors="devops-team@parity.io" \
-	io.parity.image.vendor="Parity Technologies" \
-	io.parity.image.title="${IMAGE_NAME}" \
-	io.parity.image.description="Cumulus, the Polkadot collator." \
-	io.parity.image.source="https://github.com/paritytech/polkadot/blob/${VCS_REF}/scripts/docker/Dockerfile" \
-	io.parity.image.revision="${VCS_REF}" \
-	io.parity.image.created="${BUILD_DATE}" \
-	io.parity.image.documentation="https://github.com/paritytech/cumulus/"
-
-# show backtraces
-ENV RUST_BACKTRACE 1
-
-# install tools and dependencies
-RUN apt-get update && \
-	DEBIAN_FRONTEND=noninteractive apt-get install -y \
-		libssl1.1 \
-		ca-certificates \
-		curl && \
-# apt cleanup
-	apt-get autoremove -y && \
-	apt-get clean && \
-	find /var/lib/apt/lists/ -type f -not -name lock -delete; \
-# add user and link ~/.local/share/polkadot to /data
-	useradd -m -u 1000 -U -s /bin/sh -d /polkadot polkadot && \
-	mkdir -p /data /polkadot/.local/share && \
-	chown -R polkadot:polkadot /data && \
-	ln -s /data /polkadot/.local/share/polkadot && \
-	mkdir -p /specs
-
-# add polkadot-parachain binary to the docker image
-COPY ./target/release/polkadot-parachain /usr/local/bin
-COPY ./target/release/polkadot-parachain.asc /usr/local/bin
-COPY ./target/release/polkadot-parachain.sha256 /usr/local/bin
-COPY ./parachains/chain-specs/*.json /specs/
-
-USER polkadot
-
-# check if executable works in this container
-RUN /usr/local/bin/polkadot-parachain --version
-
-EXPOSE 30333 9933 9944
-VOLUME ["/polkadot"]
-
-ENTRYPOINT ["/usr/local/bin/polkadot-parachain"]
diff --git a/docker/parachain-registrar.dockerfile b/docker/parachain-registrar.dockerfile
deleted file mode 100644
index f7d77454a2b9d37080047f1351c564c87f91824d..0000000000000000000000000000000000000000
--- a/docker/parachain-registrar.dockerfile
+++ /dev/null
@@ -1,27 +0,0 @@
-FROM node:latest AS pjs
-
-# It would be great to depend on a more stable tag, but we need some
-# as-yet-unreleased features.
-RUN yarn global add @polkadot/api-cli@0.10.0-beta.14
-
-ENTRYPOINT [ "polkadot-js-api" ]
-CMD [ "--version" ]
-
-# To use the pjs build stage to access the blockchain from the host machine:
-#
-#   docker build -f docker/parachain-registrar.dockerfile --target pjs -t parachain-registrar:pjs .
-#   alias pjs='docker run --rm --net cumulus_testing_net parachain-registrar:pjs --ws ws://172.28.1.1:9944'
-#
-# Then, as long as the chain is running, you can use the polkadot-js-api CLI like:
-#
-#   pjs query.sudo.key
-
-FROM pjs
-RUN apt-get update && apt-get install curl netcat -y && \
-    curl -sSo /wait-for-it.sh https://raw.githubusercontent.com/vishnubob/wait-for-it/master/wait-for-it.sh && \
-    chmod +x /wait-for-it.sh
-# the only thing left to do is to actually run the transaction.
-COPY ./docker/scripts/register_para.sh /usr/bin
-# unset the previous stage's entrypoint
-ENTRYPOINT []
-CMD [ "/usr/bin/register_para.sh" ]
diff --git a/polkadot/scripts/ci/dockerfiles/adder-collator/build-injected.sh b/docker/scripts/adder-collator/build-injected.sh
similarity index 78%
rename from polkadot/scripts/ci/dockerfiles/adder-collator/build-injected.sh
rename to docker/scripts/adder-collator/build-injected.sh
index 9a1857bc7ab4714d01d5cc337d5444bf85916449..3a2d497413747628f3a7ab1f3bffc3502d85a3d8 100755
--- a/polkadot/scripts/ci/dockerfiles/adder-collator/build-injected.sh
+++ b/docker/scripts/adder-collator/build-injected.sh
@@ -8,6 +8,6 @@
 PROJECT_ROOT=`git rev-parse --show-toplevel`
 
 export BINARY=adder-collator,undying-collator
-export BIN_FOLDER=$1
+export ARTIFACTS_FOLDER=$1
 
-$PROJECT_ROOT/scripts/ci/dockerfiles/build-injected.sh
+$PROJECT_ROOT/docker/scripts/build-injected.sh
diff --git a/polkadot/scripts/ci/dockerfiles/adder-collator/test-build.sh b/docker/scripts/adder-collator/test-build.sh
similarity index 100%
rename from polkadot/scripts/ci/dockerfiles/adder-collator/test-build.sh
rename to docker/scripts/adder-collator/test-build.sh
diff --git a/polkadot/scripts/ci/dockerfiles/build-injected.sh b/docker/scripts/build-injected.sh
similarity index 73%
rename from polkadot/scripts/ci/dockerfiles/build-injected.sh
rename to docker/scripts/build-injected.sh
index d0e7fee3646e439343767b8d5ee4645f0061412f..f415cf43c0eeefecbe0fe2a0649bbe9df0e2f960 100755
--- a/polkadot/scripts/ci/dockerfiles/build-injected.sh
+++ b/docker/scripts/build-injected.sh
@@ -1,5 +1,5 @@
 #!/usr/bin/env bash
-set -e
+#set -e
 
 # This script allows building a Container Image from a Linux
 # binary that is injected into a base-image.
@@ -17,7 +17,7 @@ REGISTRY=${REGISTRY:-docker.io}
 
 # The following line ensure we know the project root
 PROJECT_ROOT=${PROJECT_ROOT:-$(git rev-parse --show-toplevel)}
-DOCKERFILE=${DOCKERFILE:-$PROJECT_ROOT/scripts/ci/dockerfiles/binary_injected.Dockerfile}
+DOCKERFILE=${DOCKERFILE:-docker/dockerfiles/binary_injected.Dockerfile}
 VERSION_TOML=$(grep "^version " $PROJECT_ROOT/Cargo.toml | grep -oE "([0-9\.]+-?[0-9]+)")
 
 #n The following VAR have default that can be overriden
@@ -28,7 +28,7 @@ BINARY=${BINARY:-polkadot}
 IFS=',' read -r -a BINARIES <<< "$BINARY"
 
 VERSION=${VERSION:-$VERSION_TOML}
-BIN_FOLDER=${BIN_FOLDER:-.}
+ARTIFACTS_FOLDER=${ARTIFACTS_FOLDER:-.}
 
 IMAGE=${IMAGE:-${REGISTRY}/${DOCKER_OWNER}/${BINARIES[0]}}
 DESCRIPTION_DEFAULT="Injected Container image built for ${BINARY}"
@@ -40,19 +40,27 @@ VCS_REF=${VCS_REF:-01234567}
 echo "Using engine: $ENGINE"
 echo "Using Dockerfile: $DOCKERFILE"
 echo "Using context: $CONTEXT"
-echo "Building ${IMAGE}:latest container image for ${BINARY} v${VERSION} from ${BIN_FOLDER} hang on!"
-echo "BIN_FOLDER=$BIN_FOLDER"
+echo "Building ${IMAGE}:latest container image for ${BINARY} v${VERSION} from ${ARTIFACTS_FOLDER} hang on!"
+echo "ARTIFACTS_FOLDER=$ARTIFACTS_FOLDER"
 echo "CONTEXT=$CONTEXT"
 
 # We need all binaries and resources available in the Container build "CONTEXT"
 mkdir -p $CONTEXT/bin
 for bin in "${BINARIES[@]}"
 do
-  echo "Copying $BIN_FOLDER/$bin to context: $CONTEXT/bin"
-  cp "$BIN_FOLDER/$bin" "$CONTEXT/bin"
+  echo "Copying $ARTIFACTS_FOLDER/$bin to context: $CONTEXT/bin"
+  ls -al "$ARTIFACTS_FOLDER/$bin"
+  cp -r "$ARTIFACTS_FOLDER/$bin" "$CONTEXT/bin"
 done
 
-cp "$PROJECT_ROOT/scripts/ci/dockerfiles/entrypoint.sh" "$CONTEXT"
+cp "$PROJECT_ROOT/docker/scripts/entrypoint.sh" "$CONTEXT"
+
+if [[ "$BINARY" == "polkadot-parachain" ]]; then
+  mkdir -p "$CONTEXT/specs"
+  echo "Copying parachains chain-specs from $ARTIFACTS_FOLDER/specs to context: $CONTEXT/specs"
+  ls -al "$ARTIFACTS_FOLDER/specs"
+  cp -r "$ARTIFACTS_FOLDER/specs" "$CONTEXT/specs"
+fi
 
 echo "Building image: ${IMAGE}"
 
@@ -74,10 +82,10 @@ $ENGINE build \
     --build-arg BUILD_DATE=$(date -u '+%Y-%m-%dT%H:%M:%SZ') \
     --build-arg IMAGE_NAME="${IMAGE}" \
     --build-arg BINARY="${BINARY}" \
-    --build-arg BIN_FOLDER="${BIN_FOLDER}" \
+    --build-arg ARTIFACTS_FOLDER="${ARTIFACTS_FOLDER}" \
     --build-arg DESCRIPTION="${DESCRIPTION}" \
     ${TAG_ARGS} \
-    -f "${DOCKERFILE}" \
+    -f "${PROJECT_ROOT}/${DOCKERFILE}" \
     ${CONTEXT}
 
 echo "Your Container image for ${IMAGE} is ready"
@@ -88,5 +96,5 @@ if [[ -z "${SKIP_IMAGE_VALIDATION}" ]]; then
   $ENGINE run --rm -i "${IMAGE}:${TAG_ARRAY[0]}" --version
 
   echo "Query binaries"
-  $ENGINE run --rm -i --entrypoint /bin/bash "${IMAGE}:${TAG_ARRAY[0]}" -c 'echo BINARY: $BINARY'
+  $ENGINE run --rm -i --entrypoint /bin/bash "${IMAGE}:${TAG_ARRAY[0]}" -c "echo BINARY: ${BINARY}"
 fi
diff --git a/polkadot/scripts/ci/dockerfiles/entrypoint.sh b/docker/scripts/entrypoint.sh
similarity index 100%
rename from polkadot/scripts/ci/dockerfiles/entrypoint.sh
rename to docker/scripts/entrypoint.sh
diff --git a/polkadot/scripts/ci/dockerfiles/malus/build-injected.sh b/docker/scripts/malus/build-injected.sh
similarity index 80%
rename from polkadot/scripts/ci/dockerfiles/malus/build-injected.sh
rename to docker/scripts/malus/build-injected.sh
index 99bd5fde1d5a87dec433a9662575eaf31f1ccf54..83e30e178500fe1ec83351ab5f6c427c28f6290a 100755
--- a/polkadot/scripts/ci/dockerfiles/malus/build-injected.sh
+++ b/docker/scripts/malus/build-injected.sh
@@ -8,7 +8,7 @@
 PROJECT_ROOT=`git rev-parse --show-toplevel`
 
 export BINARY=malus,polkadot-execute-worker,polkadot-prepare-worker
-export BIN_FOLDER=$1
+export ARTIFACTS_FOLDER=$1
 # export TAGS=...
 
-$PROJECT_ROOT/scripts/ci/dockerfiles/build-injected.sh
+$PROJECT_ROOT/docker/scripts/build-injected.sh
diff --git a/polkadot/scripts/ci/dockerfiles/malus/test-build.sh b/docker/scripts/malus/test-build.sh
similarity index 100%
rename from polkadot/scripts/ci/dockerfiles/malus/test-build.sh
rename to docker/scripts/malus/test-build.sh
diff --git a/docker/scripts/polkadot-parachain/build-injected.sh b/docker/scripts/polkadot-parachain/build-injected.sh
new file mode 100755
index 0000000000000000000000000000000000000000..f5c86a0351772801ea306031bc028d3eb4738c9d
--- /dev/null
+++ b/docker/scripts/polkadot-parachain/build-injected.sh
@@ -0,0 +1,15 @@
+#!/usr/bin/env bash
+
+# Sample call:
+# $0 /path/to/folder_with_binary
+# This script replace the former dedicated Dockerfile
+# and shows how to use the generic binary_injected.dockerfile
+
+PROJECT_ROOT=`git rev-parse --show-toplevel`
+
+export BINARY=polkadot-parachain
+export ARTIFACTS_FOLDER=$1
+export DOCKERFILE="docker/dockerfiles/polkadot-parachain/polkadot-parachain_injected.Dockerfile"
+# export TAGS=...
+
+$PROJECT_ROOT/docker/scripts/build-injected.sh
diff --git a/polkadot/scripts/ci/dockerfiles/staking-miner/test-build.sh b/docker/scripts/polkadot-parachain/test-build.sh
similarity index 62%
rename from polkadot/scripts/ci/dockerfiles/staking-miner/test-build.sh
rename to docker/scripts/polkadot-parachain/test-build.sh
index 0ce74e2df296d267bdc1f4daba701ca57acdbaa1..1dc53bd0d0b7b7afa0e8506b49042d25db662797 100755
--- a/polkadot/scripts/ci/dockerfiles/staking-miner/test-build.sh
+++ b/docker/scripts/polkadot-parachain/test-build.sh
@@ -3,16 +3,17 @@
 TMP=$(mktemp -d)
 ENGINE=${ENGINE:-podman}
 
-# You need to build an injected image first
+export TAGS=latest,beta,7777,1.0.2-rc23
 
 # Fetch some binaries
 $ENGINE run --user root --rm -i \
+  --pull always \
   -v "$TMP:/export" \
   --entrypoint /bin/bash \
-  parity/staking-miner -c \
-  'cp "$(which staking-miner)" /export'
+  parity/polkadot-parachain:7217 -c \
+  'cp "$(which malus)" /export'
 
 echo "Checking binaries we got:"
-tree $TMP
+ls -al $TMP
 
 ./build-injected.sh $TMP
diff --git a/cumulus/docker/scripts/build-injected-image.sh b/docker/scripts/polkadot-parachain_build-injected-image.sh
similarity index 70%
rename from cumulus/docker/scripts/build-injected-image.sh
rename to docker/scripts/polkadot-parachain_build-injected-image.sh
index b8bb0dd7dd2c11fe6bd7a755b8abe8b8c9ff0af6..bb6909dd3b7b78763763509c9dc6a324d84ca347 100755
--- a/cumulus/docker/scripts/build-injected-image.sh
+++ b/docker/scripts/polkadot-parachain_build-injected-image.sh
@@ -6,5 +6,5 @@ IMAGE_NAME=${IMAGE_NAME:-polkadot-parachain}
 docker build --no-cache \
     --build-arg IMAGE_NAME=$IMAGE_NAME \
     -t $OWNER/$IMAGE_NAME \
-    -f ./docker/injected.Dockerfile \
+    -f ./docker/dockerfiles/polkadot-parachain/polkadot-parachain_injected.Dockerfile \
     . && docker images
diff --git a/polkadot/scripts/ci/dockerfiles/polkadot/build-injected.sh b/docker/scripts/polkadot/build-injected.sh
similarity index 80%
rename from polkadot/scripts/ci/dockerfiles/polkadot/build-injected.sh
rename to docker/scripts/polkadot/build-injected.sh
index 22774c7b712244a79503ae96ae87a5fffb7315fd..7cc6db43a54a6b1a54fa4e917ed82185d28e93d0 100755
--- a/polkadot/scripts/ci/dockerfiles/polkadot/build-injected.sh
+++ b/docker/scripts/polkadot/build-injected.sh
@@ -8,6 +8,6 @@
 PROJECT_ROOT=`git rev-parse --show-toplevel`
 
 export BINARY=polkadot,polkadot-execute-worker,polkadot-prepare-worker
-export BIN_FOLDER=$1
+export ARTIFACTS_FOLDER=$1
 
-$PROJECT_ROOT/scripts/ci/dockerfiles/build-injected.sh
+$PROJECT_ROOT/docker/scripts/build-injected.sh
diff --git a/polkadot/scripts/ci/dockerfiles/polkadot/test-build.sh b/docker/scripts/polkadot/test-build.sh
similarity index 100%
rename from polkadot/scripts/ci/dockerfiles/polkadot/test-build.sh
rename to docker/scripts/polkadot/test-build.sh
diff --git a/docker/staking-miner/staking-miner_builder.Dockerfile b/docker/staking-miner/staking-miner_builder.Dockerfile
deleted file mode 100644
index a1932095fd4cab0130009ebf00953fbf09955142..0000000000000000000000000000000000000000
--- a/docker/staking-miner/staking-miner_builder.Dockerfile
+++ /dev/null
@@ -1,46 +0,0 @@
-FROM paritytech/ci-linux:production as builder
-
-# metadata
-ARG VCS_REF
-ARG BUILD_DATE
-ARG IMAGE_NAME="staking-miner"
-ARG PROFILE=release
-
-LABEL description="This is the build stage. Here we create the binary."
-
-WORKDIR /app
-COPY . /app
-RUN cargo build --locked --$PROFILE --package staking-miner
-
-# ===== SECOND STAGE ======
-
-FROM docker.io/library/ubuntu:20.04
-LABEL description="This is the 2nd stage: a very small image where we copy the binary."
-LABEL io.parity.image.authors="devops-team@parity.io" \
-	io.parity.image.vendor="Parity Technologies" \
-	io.parity.image.title="${IMAGE_NAME}" \
-	io.parity.image.description="${IMAGE_NAME} for substrate based chains" \
-	io.parity.image.source="https://github.com/paritytech/polkadot/blob/${VCS_REF}/scripts/ci/dockerfiles/${IMAGE_NAME}/${IMAGE_NAME}_builder.Dockerfile" \
-	io.parity.image.revision="${VCS_REF}" \
-	io.parity.image.created="${BUILD_DATE}" \
-	io.parity.image.documentation="https://github.com/paritytech/polkadot/"
-
-ARG PROFILE=release
-COPY --from=builder /app/target/$PROFILE/staking-miner /usr/local/bin
-
-RUN useradd -u 1000 -U -s /bin/sh miner && \
-	rm -rf /usr/bin /usr/sbin
-
-# show backtraces
-ENV RUST_BACKTRACE 1
-
-USER miner
-
-ENV SEED=""
-ENV URI="wss://rpc.polkadot.io"
-ENV RUST_LOG="info"
-
-# check if the binary works in this container
-RUN /usr/local/bin/staking-miner --version
-
-ENTRYPOINT [ "/usr/local/bin/staking-miner" ]
diff --git a/docker/staking-miner/staking-miner_injected.Dockerfile b/docker/staking-miner/staking-miner_injected.Dockerfile
deleted file mode 100644
index 4901ab4a3736ea6fa1622ae6b8bb3216e95bb1b5..0000000000000000000000000000000000000000
--- a/docker/staking-miner/staking-miner_injected.Dockerfile
+++ /dev/null
@@ -1,43 +0,0 @@
-FROM docker.io/library/ubuntu:20.04
-
-# metadata
-ARG VCS_REF
-ARG BUILD_DATE
-ARG IMAGE_NAME="staking-miner"
-
-LABEL io.parity.image.authors="devops-team@parity.io" \
-	io.parity.image.vendor="Parity Technologies" \
-	io.parity.image.title="${IMAGE_NAME}" \
-	io.parity.image.description="${IMAGE_NAME} for substrate based chains" \
-	io.parity.image.source="https://github.com/paritytech/polkadot/blob/${VCS_REF}/scripts/ci/dockerfiles/${IMAGE_NAME}/${IMAGE_NAME}_injected.Dockerfile" \
-	io.parity.image.revision="${VCS_REF}" \
-	io.parity.image.created="${BUILD_DATE}" \
-	io.parity.image.documentation="https://github.com/paritytech/polkadot/"
-
-# show backtraces
-ENV RUST_BACKTRACE 1
-
-# install tools and dependencies
-RUN apt-get update && \
-	DEBIAN_FRONTEND=noninteractive apt-get install -y \
-		libssl1.1 \
-		ca-certificates && \
-# apt cleanup
-	apt-get autoremove -y && \
-	apt-get clean && \
-	find /var/lib/apt/lists/ -type f -not -name lock -delete; \
-	useradd -u 1000 -U -s /bin/sh miner
-
-# add binary to docker image
-COPY ./staking-miner /usr/local/bin
-
-USER miner
-
-ENV SEED=""
-ENV URI="wss://rpc.polkadot.io"
-ENV RUST_LOG="info"
-
-# check if the binary works in this container
-RUN /usr/local/bin/staking-miner --version
-
-ENTRYPOINT [ "/usr/local/bin/staking-miner" ]
diff --git a/docs/CODE_OF_CONDUCT.md b/docs/CODE_OF_CONDUCT.md
new file mode 100644
index 0000000000000000000000000000000000000000..1a9f21de775c1e4cb18428b985aa4e6c5254f843
--- /dev/null
+++ b/docs/CODE_OF_CONDUCT.md
@@ -0,0 +1,76 @@
+# Contributor Covenant Code of Conduct
+
+## Our Pledge
+
+In the interest of fostering an open and welcoming environment, we as contributors and maintainers
+pledge to making participation in our project and our community a harassment-free experience for
+everyone, regardless of age, body size, disability, ethnicity, gender identity and expression, level
+of experience, nationality, personal appearance, race, religion, or sexual identity and orientation.
+
+## Our Standards
+
+Examples of behavior that contributes to creating a positive environment include:
+
+* Using welcoming and inclusive language
+* Being respectful of differing viewpoints and experiences
+* Gracefully accepting constructive criticism
+* Focusing on what is best for the community
+* Showing empathy towards other community members
+
+Examples of unacceptable behavior by participants include:
+
+* The use of sexualized language or imagery and unwelcome sexual attention or advances
+* Trolling, insulting/derogatory comments, and personal or political attacks
+* Public or private harassment
+* Publishing others' private information, such as a physical or electronic address, without explicit
+  permission
+* Other conduct which could reasonably be considered inappropriate in a professional setting
+
+### Facilitation, Not Strongarming
+
+We recognize that this software is merely a tool for users to create and maintain their blockchain
+of preference. We see that blockchains are naturally community platforms with users being the
+ultimate decision makers. We assert that good software will maximize user agency by facilitating
+user-expression on the network. As such:
+
+* This project will strive to give users as much choice as is both reasonable and possible over what
+  protocol they adhere to; but
+* Use of the project's technical forums, commenting systems, pull requests and issue trackers as a
+  means to express individual protocol preferences is forbidden.
+
+## Our Responsibilities
+
+Project maintainers are responsible for clarifying the standards of acceptable behavior and are
+expected to take appropriate and fair corrective action in response to any instances of unacceptable
+behavior.
+
+Project maintainers have the right and responsibility to remove, edit, or reject comments, commits,
+code, wiki edits, issues, and other contributions that are not aligned to this Code of Conduct, or to
+ban temporarily or permanently any contributor for other behaviors that they deem inappropriate,
+threatening, offensive, or harmful.
+
+## Scope
+
+This Code of Conduct applies both within project spaces and in public spaces when an individual is
+representing the project or its community. Examples of representing a project or community include
+using an official project e-mail address, posting via an official social media account, or acting as
+an appointed representative at an online or offline event. Representation of a project may be further
+defined and clarified by project maintainers.
+
+## Enforcement
+
+Instances of abusive, harassing, or otherwise unacceptable behavior may be reported by contacting
+the project team at <admin@parity.io>. The project team will review and investigate all complaints,
+and will respond in a way that it deems appropriate to the circumstances. The project team is
+obligated to maintain confidentiality with regard to the reporter of an incident. Further details of
+specific enforcement policies may be posted separately.
+
+Project maintainers who do not follow or enforce the Code of Conduct in good faith may face temporary
+or permanent repercussions as determined by other members of the project's leadership.
+
+## Attribution
+
+This Code of Conduct is adapted from the [Contributor Covenant][homepage], version 1.4, available at
+https://contributor-covenant.org/version/1/4
+
+[homepage]: https://contributor-covenant.org
diff --git a/docs/CONTRIBUTING.md b/docs/CONTRIBUTING.md
new file mode 100644
index 0000000000000000000000000000000000000000..1e05755a9b8338c5769a48c5e8f477670eb92e25
--- /dev/null
+++ b/docs/CONTRIBUTING.md
@@ -0,0 +1,160 @@
+# Contributing
+
+The `Polkadot SDK` project is an **OPENISH Open Source Project**
+
+## What?
+
+Individuals making significant and valuable contributions are given commit-access to the project.
+Contributions are done via pull-requests and need to be approved by the maintainers.
+
+## Rules
+
+There are a few basic ground-rules for contributors (including the maintainer(s) of the project):
+
+1. **No `--force` pushes** or modifying the master branch history in any way.
+   If you need to rebase, ensure you do it in your own repo. No rewriting of the history
+   after the code has been shared (e.g. through a Pull-Request).
+2. **Non-master branches**, prefixed with a short name moniker (e.g. `gav-my-feature`) must be
+   used for ongoing work.
+3. **All modifications** must be made in a **pull-request** to solicit feedback from other contributors.
+4. A pull-request **must not be merged until CI** has finished successfully.
+5. Contributors should adhere to the [house coding style](./STYLE_GUIDE.md).
+6. Contributors should adhere to the [house documenting style](./DOCUMENTATION_GUIDELINES.md), when applicable.
+
+## Merge Process
+
+### In General
+
+A Pull Request (PR) needs to be reviewed and approved by project maintainers.
+If a change does not alter any logic (e.g. comments, dependencies, docs), then it may be tagged
+`A1-insubstantial` and merged faster.
+If it is an urgent fix with no large change to logic, then it may be merged after a non-author
+contributor has reviewed it well and approved the review once CI is complete.
+No PR should be merged until all reviews' comments are addressed.
+
+### Labels
+
+The set of labels and their description can be found [here](https://paritytech.github.io/labels/doc_polkadot-sdk.html).
+
+### Process
+
+1. Please use our [Pull Request Template](./PULL_REQUEST_TEMPLATE.md) and make sure all relevant
+   information is reflected in your PR.
+2. Please tag each PR with minimum one `T*` label. The respective `T*` labels should signal the
+   component that was changed, they are also used by downstream users to track changes and to
+   include these changes properly into their own releases.
+3. If you’re still working on your PR, please submit as “Draft”. Once a PR is ready for review change
+   the status to “Open”, so that the maintainers get to review your PR. Generally PRs should sit for
+   48 hours in order to garner feedback. It may be merged before if all relevant parties had a look at it.
+4. If you’re introducing a major change, that might impact the documentation please add the label
+   `T13-documentation`. The docs team will get in touch.
+5. If your PR changes files in these paths:
+
+   `polkadot` : `^runtime/polkadot`
+   `polkadot` : `^runtime/kusama`
+   `polkadot` : `^primitives/src/`
+   `polkadot` : `^runtime/common`
+   `substrate` : `^frame/`
+   `substrate` : `^primitives/`
+
+   It should be added to the [security audit board](https://github.com/orgs/paritytech/projects/103)
+   and will need to undergo an audit before merge.
+6. PRs will be able to be merged once all reviewers' comments are addressed and CI is successful.
+
+**Noting breaking changes:**
+When breaking APIs, the PR description should mention what was changed alongside some examples on how
+to change the code to make it work/compile.
+It should also mention potential storage migrations and if they require some special setup aside adding
+it to the list of migrations in the runtime.
+
+## Reviewing pull requests
+
+When reviewing a pull request, the end-goal is to suggest useful changes to the author.
+Reviews should finish with approval unless there are issues that would result in:
+1. Buggy behavior.
+2. Undue maintenance burden.
+3. Breaking with house coding style.
+4. Pessimization (i.e. reduction of speed as measured in the projects benchmarks).
+5. Feature reduction (i.e. it removes some aspect of functionality that a significant minority of users rely on).
+6. Uselessness (i.e. it does not strictly add a feature or fix a known issue).
+
+The reviewers are also responsible to check:
+
+1. if a changelog is necessary and attached
+1. the quality of information in the changelog file
+1. the PR has an impact on docs
+1. that the docs team was included in the review process of a docs update
+
+**Reviews may not be used as an effective veto for a PR because**:
+1. There exists a somewhat cleaner/better/faster way of accomplishing the same feature/fix.
+2. It does not fit well with some other contributors' longer-term vision for the project.
+
+## Documentation
+
+All Pull Requests must contain proper title & description.
+
+Some Pull Requests can be exempt of `prdoc` documentation, those
+must be labelled with
+[`R0-silent`](https://github.com/paritytech/labels/blob/main/ruled_labels/specs_polkadot-sdk.yaml#L89-L91).
+
+Non "silent" PRs must come with documentation in the form of a `.prdoc` file.
+A `.prdoc` documentation is made of a text file (YAML) named `/prdoc/pr_NNNN.prdoc` where `NNNN` is the PR number.
+For convenience, those file can also contain a short description/title: `/prdoc/pr_NNNN_pr-foobar.prdoc`.
+
+The CI automation checks for the presence and validity of a `prdoc` in the `/prdoc` folder.
+Those files need to comply with a specific [schema](https://github.com/paritytech/prdoc/blob/master/schema_user.json). It
+is highly recommended to [make your editor aware](https://github.com/paritytech/prdoc#schemas) of the schema as it is
+self-described and will assist you in writing correct content.
+
+This schema is also embedded in the
+[prdoc](https://github.com/paritytech/prdoc) utility that can also be used to generate and check the validity of a
+`prdoc` locally.
+
+## Helping out
+
+We use [labels](https://github.com/paritytech/polkadot-sdk/labels) to manage PRs and issues and communicate
+state of a PR. Please familiarise yourself with them. Best way to get started is to a pick a ticket tagged
+[easy](https://github.com/paritytech/polkadot-sdk/issues?q=is%3Aopen+is%3Aissue+label%3AD0-easy)
+or [medium](https://github.com/paritytech/polkadot-sdk/issues?q=is%3Aopen+is%3Aissue+label%3AD1-medium)
+and get going. Alternatively, look out for issues tagged [mentor](https://github.com/paritytech/polkadot-sdk/issues?q=is%3Aopen+is%3Aissue+label%3AC1-mentor)
+and get in contact with the mentor offering their support on that larger task.
+
+****
+
+### Issues
+
+If what you are looking for is an answer rather than proposing a new feature or fix, search
+[https://substrate.stackexchange.com](https://substrate.stackexchange.com/) to see if an post already
+exists, and ask if not. Please do not file support issues here.
+Before opening a new issue search to see if a similar one already exists and leave a comment that you
+also experienced this issue or add your specifics that are related to an existing issue.
+Please label issues with the following labels:
+1. `I*`  issue severity and type. EXACTLY ONE REQUIRED.
+2. `D*`  issue difficulty, suggesting the level of complexity this issue has. AT MOST ONE ALLOWED.
+3. `T*`  Issue topic. MULTIPLE ALLOWED.
+
+## Releases
+
+Declaring formal releases remains the prerogative of the project maintainer(s).
+
+## UI tests
+
+UI tests are used for macros to ensure that the output of a macro doesn’t change and is in the expected format.
+These UI tests are sensible to any changes in the macro generated code or to switching the rust stable version.
+The tests are only run when the `RUN_UI_TESTS` environment variable is set. So, when the CI is for example complaining
+about failing UI tests and it is expected that they fail these tests need to be executed locally.
+To simplify the updating of the UI test output there is a script
+- `./scripts/update-ui-tests.sh`   to update the tests for a current rust version locally
+- `./scripts/update-ui-tests.sh 1.70` # to update the tests for a specific rust version locally
+
+Or if you have opened PR and you're member of `paritytech` - you can use command-bot to run the tests for you in CI:
+- `bot update-ui` - will run the tests for the current rust version
+- `bot update-ui latest --rust_version=1.70.0` - will run the tests for the specified rust version
+- `bot update-ui latest -v CMD_IMAGE=paritytech/ci-unified:bullseye-1.70.0-2023-05-23 --rust_version=1.70.0` -
+will run the tests for the specified rust version and specified image
+
+## Command Bot
+
+If you're member of **paritytech** org - you can use command-bot to run various of common commands in CI:
+
+Start with comment in PR: `bot help` to see the list of available commands.
diff --git a/docs/DOCUMENTATION_GUIDELINES.md b/docs/DOCUMENTATION_GUIDELINES.md
new file mode 100644
index 0000000000000000000000000000000000000000..5d1164e8ca89f8eefea71ad96318b9347ca29c89
--- /dev/null
+++ b/docs/DOCUMENTATION_GUIDELINES.md
@@ -0,0 +1,351 @@
+# Substrate Documentation Guidelines
+
+This document is focused on documenting parts of Substrate that relate to its external API. The list of such crates can
+be found in [CODEOWNERS](./CODEOWNERS). Search for the crates auto-assigned to the `docs-audit` team.
+
+These crates are used by external developers and need thorough documentation. They are the most concerned with FRAME
+development.
+
+- [Substrate Documentation Guidelines](#substrate-documentation-guidelines)
+  - [General/Non-Pallet Crates](#generalnon-pallet-crates)
+    - [What to Document?](#what-to-document)
+      - [Rust Docs vs. Code Comments](#rust-docs-vs-code-comments)
+    - [How to Document?](#how-to-document)
+      - [TLDR](#tldr)
+      - [Proc-Macros](#proc-macros)
+    - [Other Guidelines](#other-guidelines)
+      - [Document Through Code](#document-through-code)
+      - [Formatting Matters](#formatting-matters)
+  - [Pallet Crates](#pallet-crates)
+    - [Top Level Pallet Docs (`lib.rs`)](#top-level-pallet-docs-librs)
+      - [Polkadot and Substrate](#polkadot-and-substrate)
+    - [Dispatchables](#dispatchables)
+    - [Storage Items](#storage-items)
+    - [Errors and Events](#errors-and-events)
+
+---
+
+## General/Non-Pallet Crates
+
+First, consider the case for all such crates, except for those that are pallets.
+
+### What to Document?
+
+The first question is, what should you document? Use this filter:
+
+1. In the crates assigned to `docs-audit` in [CODEOWNERS](./CODEOWNERS),
+2. All `pub` items need to be documented. If not `pub`, it doesn't appear in the rust-docs, and is not public facing.
+
+   - Within `pub` items, sometimes they are only `pub` to be used by another internal crate, and you can foresee that
+   this won't be used by anyone else. These need **not** be documented thoroughly.
+
+   - Reminder: `trait` items are public by definition if the trait is public.
+
+3. All public modules (`mod`) should have reasonable module-level documentation (`//!`).
+
+#### Rust Docs vs. Code Comments
+
+Note that anything starting with `///` is an external rust-doc, and everything starting with `//` does not appear in the
+rust-docs. It's important to not confuse the two in your documentation.
+
+```rust
+/// Computes the square root of the input, returning `Ok(_)` if successful.
+///
+/// # Errors
+/// ...
+///
+// Details about the complexity, how you implemented this, and some quirks that
+// are NOT relevant to the external interface, so it starts with '//'.
+// This can also be moved inside the function.
+pub fn sqrt(x: u32) -> Result<u32, ()> {
+    todo!();
+}
+```
+
+---
+
+### How to Document?
+
+There are good sources to look into:
+
+- [Rust Documentation Guide](https://doc.rust-lang.org/rustdoc/how-to-write-documentation.html)
+- [Documentation in Rust
+  Book](https://doc.rust-lang.org/book/ch14-02-publishing-to-crates-io.html#making-useful-documentation-comments)
+- [Guide on Writing Documentation for a Rust
+  Crate](https://blog.guillaume-gomez.fr/articles/2020-03-12+Guide+on+how+to+write+documentation+for+a+Rust+crate)
+
+As mentioned
+[here](https://web.mit.edu/rust-lang_v1.25/arch/amd64_ubuntu1404/share/doc/rust/html/book/first-edition/documentation.html#writing-documentation-comments)
+and [here](https://blog.guillaume-gomez.fr/articles/2020-03-12+Guide+on+how+to+write+documentation+for+a+Rust+crate),
+always start with a **single sentence** demonstrating what is documented. All additional documentation should be added
+*after a newline*. Strive to make the first sentence succinct and short.The reason for this is the first paragraph of
+docs about an item (everything before the first newline) is used as the excerpt that rust doc displays about this item
+when it appears in tables, such as the table listing all functions in a module. If this excerpt is too long, the module
+docs will be very difficult to read.
+
+About [special
+sections](https://web.mit.edu/rust-lang_v1.25/arch/amd64_ubuntu1404/share/doc/rust/html/book/first-edition/documentation.html#special-sections),
+we will most likely not need to think about panic and safety in any runtime related code. Our code is never `unsafe`,
+and will (almost) never panic.
+
+Use `# Examples as much as possible. These are great ways to further demonstrate what your APIs are doing, and add free
+test coverage. As an additional benefit, any code in rust-docs is treated as an "integration tests", not unit tests,
+which tests your crate in a different way than unit tests. So, it is both a win for "more documentation" and a win for
+"more test coverage".
+
+You can also consider having an `# Error` section optionally. Of course, this only applies if there is a `Result` being
+returned, and if the `Error` variants are overly complicated.
+
+Strive to include correct links to other items in your written docs as much as possible. In other words, avoid
+\`some_func\` and instead use \[\`some_fund\`\]. Read more about how to correctly use links in your rust-docs
+[here](https://doc.rust-lang.org/rustdoc/write-documentation/linking-to-items-by-name.html#valid-links) and
+[here](https://rust-lang.github.io/rfcs/1946-intra-rustdoc-links.html#additions-to-the-documentation-syntax). Strive to
+include correct links to other items in your written docs as much as possible. In other words, avoid `` `some_func` ``
+and instead use ``[`some_func`]``.
+
+> While you are linking, you might become conscious of the fact that you are in need of linking to (too many) foreign
+items in order to explain your API. This is leaning more towards API-Design rather than documentation, but it is a
+warning that the subject API might be slightly wrong. For example, most "glue" traits[^1] in `frame/support` should be
+designed and documented without making hard assumptions about particular pallets that implement them.
+
+---
+
+#### TLDR
+
+0. Have the goal of enforcing `#![deny(missing_docs)]` mentally, even if it is not enforced by the compiler 🙈.
+1. Start with a single, clear and concise sentence. Follow up with more context, after a newline, if needed.
+2. Use examples as much as reasonably possible.
+3. Use links as much as possible.
+4. Think about context. If you are explaining a lot of foreign topics while documenting a trait that should not
+explicitly depend on them, you have likely not designed it properly.
+
+---
+
+#### Proc-Macros
+
+Note that there are special considerations when documenting proc macros. Doc links will appear to function *within* your
+proc macro crate, but often will no longer function when these proc macros are re-exported elsewhere in your project.
+The exception is doc links to *other proc macros* which will function just fine if they are also being re-exported. It
+is also often necessary to disambiguate between a proc macro and a function of the same name, which can be done using
+the `macro@my_macro_name` syntax in your link. Read more about how to correctly use links in your rust-docs
+[here](https://doc.rust-lang.org/rustdoc/write-documentation/linking-to-items-by-name.html#valid-links) and
+[here](https://rust-lang.github.io/rfcs/1946-intra-rustdoc-links.html#additions-to-the-documentation-syntax).
+
+---
+
+### Other Guidelines
+
+The above five guidelines must always be reasonably respected in the documentation.
+
+The following are a set of notes that may not necessarily hold in all circumstances:
+
+---
+
+#### Document Through Code
+
+You should make sure that your code is properly-named and well-organized so that your code functions as a form of
+documentation. However, within the complexity of our projects in Polkadot/Substrate that is not enough. Particularly,
+things like examples, errors and panics cannot be documented only through properly- named and well-organized code.
+
+> Our north star is self-documenting code that also happens to be well-documented and littered with examples.
+
+- Your written documents should *complement* the code, not *repeat* it. As an example, a documentation on top of a code
+example should never look like the following:
+
+```rust
+ /// Sends request and handles the response.
+ trait SendRequestAndHandleResponse {
+
+ }
+ ```
+
+In the above example, the documentation has added no useful information not already contained within the properly-named
+trait and is redundant.
+
+---
+
+#### Formatting Matters
+
+The way you format your documents (newlines, heading and so on) makes a difference. Consider the below examples:
+
+```rust
+/// This function works with input u32 x and multiplies it by two. If
+/// we optimize the other variant of it, we would be able to achieve more
+/// efficiency but I have to think about it. Probably can panic if the input
+/// overflows u32.
+fn multiply_by_2(x: u32) -> u32 { .. }
+```
+
+```rust
+/// Multiplies an input of type [`u32`] by two.
+///
+/// # Panics
+///
+/// Panics if the input overflows.
+///
+/// # Complexity
+///
+/// Is implemented using some algorithm that yields complexity of O(1).
+// More efficiency can be achieved if we improve this via such and such.
+fn multiply_by_2(x: u32) -> u32 { .. }
+```
+
+They are both roughly conveying the same set of facts, but one is easier to follow because it was formatted cleanly.
+Especially for traits and types that you can foresee will be seen and used a lot, try and write a well formatted
+version.
+
+Similarly, make sure your comments are wrapped at 100 characters line-width (as defined by our
+[`rustfmt.toml`](../rustfmt.toml)), no **more and no less**! The more is fixed by `rustfmt` and our CI, but if you (for
+some unknown reason) wrap your lines at 59 characters, it will pass the CI, and it will not look good 🫣. Consider using
+a plugin like [rewrap](https://marketplace.visualstudio.com/items?itemName=stkb.rewrap) (for Visual Studio Code) to
+properly do this.
+
+[^1]: Those that help two pallets talk to each other.
+
+---
+
+## Pallet Crates
+
+The guidelines so far have been general in nature, and are applicable to crates that are pallets and crates that're not
+pallets.
+
+The following is relevant to how to document parts of a crate that is a pallet. See
+[`pallet-fast-unstake`](../substrate/frame/fast-unstake/src/lib.rs) as one example of adhering these guidelines.
+
+---
+
+### Top Level Pallet Docs (`lib.rs`)
+
+For the top-level pallet docs, consider the following template:
+
+```
+//! # <Pallet Name>
+//!
+//! <single-liner about the pallet>.
+//!
+//! ## Pallet API
+//!
+//! <Reminder: inside the [`pallet`] module, a template that leads the reader to the relevant items is auto-generated. There is no need to repeat 
+//! things like "See Config trait for ...", which are generated inside [`pallet`] here anyways. You can use the line below as-is:>
+//!
+//! See the [`pallet`] module for more information about the interfaces this pallet exposes, including its
+//! configuration trait, dispatchables, storage items, events and errors.
+//!
+//! ## Overview
+//!
+//! <should be high-level details that are relevant to the most broad audience>
+//!
+//! <The audience here is potentially non-coders who just want to know what this pallet does, not how it does it>
+//!
+//! <potentially a few paragraphs, focus on what external folks should know about the pallet>
+//!
+//! ### Example
+//!
+//! <Your pallet must have a few tests that cover important user journeys. Use https://crates.io/crates/docify to
+//! reuse these as examples.>
+//!
+//! <The audience of this is those who want to know how this pallet works, to the extent of being able to build
+//! something on top of it, like a DApp or another pallet. In some cases, you might want to add an example of how to
+//! use this pallet in other pallets.>
+//!
+//! This section can most often be left as-is.
+//!
+//! ## Low Level / Implementation Details
+//!
+//! <The format of this section is up to you, but we suggest the Design-oriented approach that follows>
+//!
+//! <The audience of this would be your future self, or anyone who wants to gain a deep understanding of how the pallet
+//! works so that they can eventually propose optimizations to it>
+//!
+//! ### Design Goals (optional)
+//!
+//! <Describe your goals with the pallet design.>
+//!
+//! ### Design (optional)
+//!
+//! <Describe how you've reached those goals. This should describe the storage layout of your pallet and what was your
+//! approach in designing it that way.>
+//!
+//! ### Terminology (optional)
+//!
+//! <Optionally, explain any non-obvious terminology here. You can link to it if you want to use the terminology further
+//! up>
+```
+
+This template's details (heading 3s and beyond) are left flexible, and at the discretion of the developer to make the
+best final choice about. For example, you might want to include `### Terminology` or not. Moreover, you might find it
+more useful to include it in `## Overview`.
+
+Nonetheless, the high level flow of going from the most high level explanation to the most low level explanation is
+important to follow.
+
+As a rule of thumb, the Heading 2s (`##`) in this template can be considered a strict rule, while the Heading 3s (`###`)
+and beyond are flexible.
+
+---
+
+#### Polkadot and Substrate
+
+Optionally, in order to demonstrate the relation between the two, you can start the pallet documentation with:
+
+```
+//! > Made with *Substrate*, for *Polkadot*.
+//!
+//! [![github]](https://github.com/paritytech/polkadot-sdk/tree/master/substrate/frame/fast-unstake) -
+//! [![polkadot]](https://polkadot.network)
+//!
+//! [polkadot]: https://img.shields.io/badge/polkadot-E6007A?style=for-the-badge&logo=polkadot&logoColor=white
+//! [github]: https://img.shields.io/badge/github-8da0cb?style=for-the-badge&labelColor=555555&logo=github
+```
+
+---
+
+### Dispatchables
+
+For each dispatchable (`fn` item inside `#[pallet::call]`), consider the following template:
+
+```
+/// <One-liner explaining what the dispatchable does>
+///
+/// ## Dispatch Origin
+///
+/// The dispatch origin of this call must be <details (e.g. Root, Signed, Unsigned)>
+///
+/// ## Details
+///
+/// <All other details, namely any errors that could occur within this dispatch and the events this dispatch could emit>
+///
+/// ## Errors (optional)
+///
+/// <If an extensive list of errors can be returned, list them individually instead of mentioning them in the section
+/// above>
+///
+/// ## Events (optional)
+///
+/// <Events are akin to the "return type" of dispatchables, optionally mention them>
+pub fn name_of_dispatchable(origin: OriginFor<T>, ...) -> DispatchResult {}
+```
+
+Consider the fact that these docs will be part of the metadata of the associated dispatchable, and might be used by
+wallets and explorers.
+
+---
+
+### Storage Items
+
+1. If a map-like type is being used, always note the choice of your hashers as private code docs (`// Hasher X chosen
+because ...`). Recall that this is not relevant information to external people, so it must be documented as `//`.
+
+2. Consider explaining the crypto-economics of how a deposit is being taken in return of the storage being used.
+
+3. Consider explaining why it is safe for the storage item to be unbounded, if `#[pallet::unbounded]` or
+`#[pallet::without_storage_info]` is being used.
+
+---
+
+### Errors and Events
+
+Consider the fact that, similar to dispatchables, these docs will be part of the metadata of the associated event/error,
+and might be used by wallets and explorers.
+
+Specifically for `error`, explain why the error has happened, and what can be done in order to avoid it.
diff --git a/docs/PULL_REQUEST_TEMPLATE.md b/docs/PULL_REQUEST_TEMPLATE.md
new file mode 100644
index 0000000000000000000000000000000000000000..c93ac90c7e32e1c6c33d4409920eaa85a1aea814
--- /dev/null
+++ b/docs/PULL_REQUEST_TEMPLATE.md
@@ -0,0 +1,37 @@
+
+
+✄ -----------------------------------------------------------------------------
+
+Thank you for your Pull Request! 🙏 Please make sure it follows the contribution guidelines outlined in
+[this document](https://github.com/paritytech/polkadot-sdk/blob/master/docs/CONTRIBUTING.md) and fill
+out the sections below. Once you're ready to submit your PR for review, please
+delete this section and leave only the text under the "Description" heading.
+
+# Description
+
+*Please include a summary of the changes and the related issue. Please also include relevant motivation and context,
+including:*
+
+- What does this PR do?
+- Why are these changes needed?
+- How were these changes implemented and what do they affect?
+
+*Use [Github semantic
+linking](https://docs.github.com/en/issues/tracking-your-work-with-issues/linking-a-pull-request-to-an-issue#linking-a-pull-request-to-an-issue-using-a-keyword)
+to address any open issues this PR relates to or closes.*
+
+Fixes # (issue number, *if applicable*)
+
+Closes # (issue number, *if applicable*)
+
+# Checklist
+
+- [ ] My PR includes a detailed description as outlined in the "Description" section above
+- [ ] My PR follows the [labeling requirements](CONTRIBUTING.md#Process) of this project (at minimum one label for `T`
+  required)
+- [ ] I have made corresponding changes to the documentation (if applicable)
+- [ ] I have added tests that prove my fix is effective or that my feature works (if applicable)
+
+You can remove the "Checklist" section once all have been checked. Thank you for your contribution!
+
+✄ -----------------------------------------------------------------------------
diff --git a/polkadot/SECURITY.md b/docs/SECURITY.md
similarity index 69%
rename from polkadot/SECURITY.md
rename to docs/SECURITY.md
index db81bcaab4d0474a5ee635399b2a594d094224bd..b6559efdf9766e2c6e4576ba4c69ed9d984168b7 100644
--- a/polkadot/SECURITY.md
+++ b/docs/SECURITY.md
@@ -1,10 +1,17 @@
+<!-- markdown-link-check-disable -->
+
 # Security Policy
 
-Parity Technologies is committed to resolving security vulnerabilities in our software quickly and carefully. We take the necessary steps to minimize risk, provide timely information, and deliver vulnerability fixes and mitigations required to address security issues.
+Parity Technologies is committed to resolving security vulnerabilities in our
+software quickly and carefully. We take the necessary steps to minimize risk,
+provide timely information, and deliver vulnerability fixes and mitigations
+required to address security issues.
 
 ## Reporting a Vulnerability
 
-Security vulnerabilities in Parity software should be reported by email to security@parity.io. If you think your report might be eligible for the Parity Bug Bounty Program, your email should be sent to bugbounty@parity.io. 
+Security vulnerabilities in Parity software should be reported by email to
+security@parity.io. If you think your report might be eligible for the Parity
+Bug Bounty Program, your email should be sent to bugbounty@parity.io.
 
 Your report should include the following:
 
@@ -15,33 +22,49 @@ Your report should include the following:
 - reproduction
 - other details
 
-Try to include as much information in your report as you can, including a description of the vulnerability, its potential impact, and steps for reproducing it. Be sure to use a descriptive subject line.
+Try to include as much information in your report as you can, including a
+description of the vulnerability, its potential impact, and steps for
+reproducing it. Be sure to use a descriptive subject line.
 
-You'll receive a response to your email within two business days indicating the next steps in handling your report. We encourage finders to use encrypted communication channels to protect the confidentiality of vulnerability reports. You can encrypt your report using our public key. This key is [on MIT's key server](https://pgp.mit.edu/pks/lookup?op=get&search=0x5D0F03018D07DE73) server and reproduced below.
+You'll receive a response to your email within two business days indicating
+the next steps in handling your report. We encourage finders to use encrypted
+communication channels to protect the confidentiality of vulnerability reports.
+You can encrypt your report using our public key. This key is [on MIT's key server](https://pgp.mit.edu/pks/lookup?op=get&search=0x5D0F03018D07DE73)
+server and reproduced below.
 
-After the initial reply to your report, our team will endeavor to keep you informed of the progress being made towards a fix. These updates will be sent at least every five business days. 
+After the initial reply to your report, our team will endeavor to keep you
+informed of the progress being made towards a fix. These updates will be sent
+at least every five business days.
 
 Thank you for taking the time to responsibly disclose any vulnerabilities you find.
 
 ## Responsible Investigation and Reporting
 
-Responsible investigation and reporting includes, but isn't limited to, the following:
+Responsible investigation and reporting includes, but isn't limited to, the
+following:
 
 - Don't violate the privacy of other users, destroy data, etc.
-- Don’t defraud or harm Parity Technologies Ltd or its users during your research; you should make a good faith effort to not interrupt or degrade our services.
-- Don't target our physical security measures, or attempt to use social engineering, spam, distributed denial of service (DDOS) attacks, etc.
+- Don’t defraud or harm Parity Technologies Ltd or its users during your
+  research; you should make a good faith effort to not interrupt or degrade our
+  services.
+- Don't target our physical security measures, or attempt to use social
+  engineering, spam, distributed denial of service (DDOS) attacks, etc.
 - Initially report the bug only to us and not to anyone else.
-- Give us a reasonable amount of time to fix the bug before disclosing it to anyone else, and give us adequate written warning before disclosing it to anyone else.
-- In general, please investigate and report bugs in a way that makes a reasonable, good faith effort not to be disruptive or harmful to us or our users. Otherwise your actions might be interpreted as an attack rather than an effort to be helpful.
+- Give us a reasonable amount of time to fix the bug before disclosing it to
+  anyone else, and give us adequate written warning before disclosing it to
+  anyone else.
+- In general, please investigate and report bugs in a way that makes a
+  reasonable, good faith effort not to be disruptive or harmful to us or our
+  users. Otherwise your actions might be interpreted as an attack rather than
+  an effort to be helpful.
 
 ## Bug Bounty Program
 
-Our Bug Bounty Program allows us to recognise and reward members of the Parity community for helping us find and address significant bugs, in accordance with the terms of the Parity Bug Bounty Program. A detailed description on eligibility, rewards, legal information and terms & conditions for contributors can be found on [our website](https://paritytech.io/bug-bounty.html). 
-
-
-
-
-
+Our Bug Bounty Program allows us to recognize and reward members of the Parity
+community for helping us find and address significant bugs, in accordance with
+the terms of the Parity Bug Bounty Program. A detailed description on
+eligibility, rewards, legal information and terms & conditions for contributors
+can be found on [our website](https://paritytech.io/bug-bounty.html).
 
 ## Plaintext PGP Key
 
diff --git a/docs/STYLE_GUIDE.md b/docs/STYLE_GUIDE.md
new file mode 100644
index 0000000000000000000000000000000000000000..a9ac4a5910b3547c44612313bbc9745e02febf1d
--- /dev/null
+++ b/docs/STYLE_GUIDE.md
@@ -0,0 +1,180 @@
+---
+title: Style Guide for Rust in the Polkadot-SDK
+---
+
+Where possible these styles are enforced by settings in `rustfmt.toml` so if you run `cargo fmt`
+then you will adhere to most of these style guidelines automatically.
+
+# Formatting
+
+- Indent using tabs.
+- Lines should be longer than 100 characters long only in exceptional circumstances and certainly
+    no longer than 120. For this purpose, tabs are considered 4 characters wide.
+- Indent levels should be greater than 5 only in exceptional circumstances and certainly no
+    greater than 8. If they are greater than 5, then consider using `let` or auxiliary functions in
+    order to strip out complex inline expressions.
+- Never have spaces on a line prior to a non-whitespace character
+- Follow-on lines are only ever a single indent from the original line.
+
+```rust
+fn calculation(some_long_variable_a: i8, some_long_variable_b: i8) -> bool {
+	let x = some_long_variable_a * some_long_variable_b
+		- some_long_variable_b / some_long_variable_a
+		+ sqrt(some_long_variable_a) - sqrt(some_long_variable_b);
+	x > 10
+}
+```
+
+- Indent level should follow open parens/brackets, but should be collapsed to the smallest number
+    of levels actually used:
+
+```rust
+fn calculate(
+	some_long_variable_a: f32,
+	some_long_variable_b: f32,
+	some_long_variable_c: f32,
+) -> f32 {
+	(-some_long_variable_b + sqrt(
+		// two parens open, but since we open & close them both on the
+		// same line, only one indent level is used
+		some_long_variable_b * some_long_variable_b
+		- 4 * some_long_variable_a * some_long_variable_c
+	// both closed here at beginning of line, so back to the original indent
+	// level
+	)) / (2 * some_long_variable_a)
+}
+```
+
+- `where` is indented, and its items are indented one further.
+- Argument lists or function invocations that are too long to fit on one line are indented
+    similarly to code blocks, and once one param is indented in such a way, all others should be,
+    too. Run-on parameter lists are also acceptable for single-line run-ons of basic function calls.
+
+```rust
+// OK
+fn foo(
+	really_long_parameter_name_1: SomeLongTypeName,
+	really_long_parameter_name_2: SomeLongTypeName,
+	shrt_nm_1: u8,
+	shrt_nm_2: u8,
+) {
+   ...
+}
+
+// NOT OK
+fn foo(really_long_parameter_name_1: SomeLongTypeName, really_long_parameter_name_2: SomeLongTypeName,
+	shrt_nm_1: u8, shrt_nm_2: u8) {
+	...
+}
+```
+
+```rust
+{
+	// Complex line (not just a function call, also a let statement). Full
+	// structure.
+	let (a, b) = bar(
+		really_long_parameter_name_1,
+		really_long_parameter_name_2,
+		shrt_nm_1,
+		shrt_nm_2,
+	);
+
+	// Long, simple function call.
+	waz(
+		really_long_parameter_name_1,
+		really_long_parameter_name_2,
+		shrt_nm_1,
+		shrt_nm_2,
+	);
+
+	// Short function call. Inline.
+	baz(a, b);
+}
+```
+
+- Always end last item of a multi-line comma-delimited set with `,` when legal:
+
+```rust
+struct Point<T> {
+	x: T,
+	y: T,    // <-- Multiline comma-delimited lists end with a trailing ,
+}
+
+// Single line comma-delimited items do not have a trailing `,`
+enum Meal { Breakfast, Lunch, Dinner };
+```
+
+- Avoid trailing `;`s where unneeded.
+
+```rust
+if condition {
+	return 1    // <-- no ; here
+}
+```
+
+- `match` arms may be either blocks or have a trailing `,` but not both.
+- Blocks should not be used unnecessarily.
+
+```rust
+match meal {
+	Meal::Breakfast => "eggs",
+	Meal::Lunch => { check_diet(); recipe() },
+//	Meal::Dinner => { return Err("Fasting") }   // WRONG
+	Meal::Dinner => return Err("Fasting"),
+}
+```
+
+# Style
+
+- Panickers require explicit proofs they don't trigger. Calling `unwrap` is discouraged. The
+    exception to this rule is test code. Avoiding panickers by restructuring code is preferred if
+    feasible.
+
+```rust
+let mut target_path =
+	self.path().expect(
+		"self is instance of DiskDirectory;\
+		DiskDirectory always returns path;\
+		qed"
+	);
+```
+
+- Unsafe code requires explicit proofs just as panickers do. When introducing unsafe code,
+    consider trade-offs between efficiency on one hand and reliability, maintenance costs, and
+    security on the other. Here is a list of questions that may help evaluating the trade-off while
+    preparing or reviewing a PR:
+    - how much more performant or compact the resulting code will be using unsafe code,
+    - how likely is it that invariants could be violated,
+    - are issues stemming from the use of unsafe code caught by existing tests/tooling,
+    - what are the consequences if the problems slip into production.
+
+# Manifest Formatting
+
+> **TLDR**
+> You can use the CLI tool [Zepter](https://crates.io/crates/zepter) to
+> format the files: `zepter format features`
+
+Rust `Cargo.toml` files need to respect certain formatting rules. All entries
+need to be alphabetically sorted. This makes it easier to read them and insert
+new entries. The exhaustive list of rules is enforced by the CI. The general
+format looks like this:
+
+- The feature is written as a single line if it fits within 80 chars:
+
+```toml
+[features]
+default = [ "std" ]
+```
+
+- Otherwise the feature is broken down into multiple lines with one entry per
+  line. Each line is padded with one tab and no trailing spaces but a trailing
+  comma.
+
+```toml
+[features]
+default = [
+	"loooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooong",
+	# Comments go here as well ;)
+	"std",
+]
+```
diff --git a/docs/container.md b/docs/container.md
new file mode 100644
index 0000000000000000000000000000000000000000..dd44b31bfe96994ed54e3eca8610e7d8778f5261
--- /dev/null
+++ b/docs/container.md
@@ -0,0 +1,66 @@
+# Using Containers
+
+Using containers via **Podman** or **Docker** brings benefit, whether it is to build a container image or run a node
+while keeping a minimum footprint on your local system.
+
+This document mentions using `podman` or `docker`. Those are usually interchangeable and it is encouraged using
+preferably **Podman**. If you have podman installed and want to use all the commands mentioned below, you can simply
+create an alias with `alias docker=podman`.
+
+There are a few options to build a node within a container and inject a binary inside an image.
+
+## Parity built container image
+
+Parity builds and publishes a container image that can be found as `docker.io/parity/polkadot-parachain`.
+
+## Parity CI image
+
+Parity maintains and uses internally a generic "CI" image that can be used as a base to build binaries: [Parity CI
+container image](https://github.com/paritytech/scripts/tree/master/dockerfiles/ci-linux):
+
+The command below allows building a Linux binary without having to even install Rust or any dependency locally:
+
+```bash
+docker run --rm -it \
+    -w /polkadot-sdk \
+    -v $(pwd):/polkadot-sdk \
+    paritytech/ci-linux:production \
+    cargo build --release --locked -p polkadot-parachain-bin --bin polkadot-parachain
+sudo chown -R $(id -u):$(id -g) target/
+```
+
+If you want to reproduce other steps of CI process you can use the following
+[guide](https://github.com/paritytech/scripts#gitlab-ci-for-building-docker-images).
+
+## Injected image
+
+Injecting a binary inside a base image is the quickest option to get a working container image. This only works if you
+were able to build a Linux binary, either locally, or using a container as described above.
+
+After building a Linux binary (`polkadot-parachain`) with cargo or with Parity CI image as documented above, the
+following command allows producing a new container image where the compiled binary is injected:
+
+```bash
+ARTIFACTS_FOLDER=./target/release /docker/scripts/build-injected.sh
+```
+
+## Container build
+
+Alternatively, you can build an image with a builder pattern. This options takes a while but offers a simple method for
+anyone to get a working container image without requiring any of the Rust toolchain installed locally.
+
+```bash
+docker build \
+	--tag $OWNER/$IMAGE_NAME \
+ --file ./docker/dockerfiles/polkadot-parachain/polkadot-parachain_builder.Dockerfile .
+```
+
+You may then run your new container:
+
+```bash
+docker run --rm -it \
+	$OWNER/$IMAGE_NAME \
+		--collator --tmp \
+		--execution wasm \
+		--chain /specs/asset-hub-westend.json
+```
diff --git a/polkadot/doc/docker.md b/docs/docker.md
similarity index 56%
rename from polkadot/doc/docker.md
rename to docs/docker.md
index f20c2d001edd4b9a75261573b7955e5146b28002..53619ca1a9717c500f0ac8ee6e63291018d96806 100644
--- a/polkadot/doc/docker.md
+++ b/docs/docker.md
@@ -1,6 +1,8 @@
 # Using Containers
 
-The following commands should work no matter if you use Docker or Podman. In general, Podman is recommended. All commands are "engine neutral" so you can use the container engine of your choice while still being able to copy/paste the commands below.
+The following commands should work no matter if you use Docker or Podman. In general, Podman is recommended. All
+commands are "engine neutral" so you can use the container engine of your choice while still being able to copy/paste
+the commands below.
 
 Let's start defining Podman as our engine:
 ```
@@ -14,11 +16,15 @@ ENGINE=docker
 
 ## The easiest way
 
-The easiest/faster option to run Polkadot in Docker is to use the latest release images. These are small images that use the latest official release of the Polkadot binary, pulled from our Debian package.
+The easiest/faster option to run Polkadot in Docker is to use the latest release images. These are small images that use
+the latest official release of the Polkadot binary, pulled from our Debian package.
 
-**_The following examples are running on westend chain and without SSL. They can be used to quick start and learn how Polkadot needs to be configured. Please find out how to secure your node, if you want to operate it on the internet. Do not expose RPC and WS ports, if they are not correctly configured._**
+**_The following examples are running on westend chain and without SSL. They can be used to quick start and learn how
+Polkadot needs to be configured. Please find out how to secure your node, if you want to operate it on the internet. Do
+not expose RPC and WS ports, if they are not correctly configured._**
 
-Let's first check the version we have. The first time you run this command, the Polkadot docker image will be downloaded. This takes a bit of time and bandwidth, be patient:
+Let's first check the version we have. The first time you run this command, the Polkadot docker image will be
+downloaded. This takes a bit of time and bandwidth, be patient:
 
 ```bash
 $ENGINE run --rm -it parity/polkadot:latest --version
@@ -32,11 +38,14 @@ $ENGINE run --rm -it parity/polkadot:latest --chain westend --name "PolkaDocker"
 
 ## Examples
 
-Once you are done experimenting and picking the best node name :) you can start Polkadot as daemon, exposes the Polkadot ports and mount a volume that will keep your blockchain data locally. Make sure that you set the ownership of your local directory to the Polkadot user that is used by the container.
+Once you are done experimenting and picking the best node name :) you can start Polkadot as daemon, exposes the Polkadot
+ports and mount a volume that will keep your blockchain data locally. Make sure that you set the ownership of your local
+directory to the Polkadot user that is used by the container.
 
 Set user id 1000 and group id 1000, by running `chown 1000.1000 /my/local/folder -R` if you use a bind mount.
 
-To start a Polkadot node on default rpc port 9933 and default p2p port 30333 use the following command. If you want to connect to rpc port 9933, then must add Polkadot startup parameter: `--rpc-external`.
+To start a Polkadot node on default rpc port 9933 and default p2p port 30333 use the following command. If you want to
+connect to rpc port 9933, then must add Polkadot startup parameter: `--rpc-external`.
 
 ```bash
 $ENGINE run -d -p 30333:30333 -p 9933:9933 \
@@ -82,7 +91,8 @@ services:
     ]
 ```
 
-With following `docker-compose.yml` you can set up a node and use polkadot-js-apps as the front end on port 80. After starting the node use a browser and enter your Docker host IP in the URL field: _<http://[YOUR_DOCKER_HOST_IP]>_
+With following `docker-compose.yml` you can set up a node and use `polkadot-js-apps` as the front end on port 80. After
+starting the node use a browser and enter your Docker host IP in the URL field: _<http://[YOUR_DOCKER_HOST_IP]>_
 
 ```bash
 version: '2'
@@ -117,12 +127,14 @@ services:
 
 Chain syncing will utilize all available memory and CPU power your server has to offer, which can lead to crashing.
 
-If running on a low resource VPS, use `--memory` and `--cpus` to limit the resources used. E.g. To allow a maximum of 512MB memory and 50% of 1 CPU, use `--cpus=".5" --memory="512m"`. Read more about limiting a container's resources [here](https://docs.docker.com/config/containers/resource_constraints).
+If running on a low resource VPS, use `--memory` and `--cpus` to limit the resources used. E.g. To allow a maximum of
+512MB memory and 50% of 1 CPU, use `--cpus=".5" --memory="512m"`. Read more about limiting a container's resources
+[here](https://docs.docker.com/config/containers/resource_constraints).
 
 
 ## Build your own image
 
-There are 3 options to build a polkadot container image:
+There are 3 options to build a Polkadot container image:
 - using the builder image
 - using the injected "Debian" image
 - using the generic injected image
@@ -131,27 +143,31 @@ There are 3 options to build a polkadot container image:
 
 To get up and running with the smallest footprint on your system, you may use an existing Polkadot Container image.
 
-You may also build a polkadot container image yourself (it takes a while...) using the container specs `scripts/ci/dockerfiles/polkadot/polkadot_builder.Dockerfile`.
+You may also build a Polkadot container image yourself (it takes a while...) using the container specs
+`docker/dockerfiles/polkadot/polkadot_builder.Dockerfile`.
 
 ### Debian injected
 
-The Debian injected image is how the official polkadot container image is produced. It relies on the Debian package that is published upon each release. The Debian injected image is usually available a few minutes after a new release is published.
-It has the benefit of relying on the GPG signatures embedded in the Debian package.
+The Debian injected image is how the official Polkadot container image is produced. It relies on the Debian package that
+is published upon each release. The Debian injected image is usually available a few minutes after a new release is
+published. It has the benefit of relying on the GPG signatures embedded in the Debian package.
 
 ### Generic injected
 
-For simple testing purposes, the easiest option for polkadot and also random binaries, is to use the `binary_injected.Dockerfile` container spec. This option is less secure since the injected binary is not checked at all but it has the benefit to be simple. This option requires to already have a valid `polkadot` binary, compiled for Linux.
+For simple testing purposes, the easiest option for Polkadot and also random binaries, is to use the
+`binary_injected.Dockerfile` container spec. This option is less secure since the injected binary is not checked at all
+but it has the benefit to be simple. This option requires to already have a valid `polkadot` binary, compiled for Linux.
 
 This binary is then simply copied inside the `parity/base-bin` image.
 
 ## Reporting issues
 
-If you run into issues with Polkadot when using docker, please run the following command
-(replace the tag with the appropriate one if you do not use latest):
+If you run into issues with Polkadot when using docker, please run the following command (replace the tag with the
+appropriate one if you do not use latest):
 
 ```bash
 $ENGINE run --rm -it parity/polkadot:latest --version
 ```
 
-This will show you the Polkadot version as well as the git commit ref that was used to build your container.
-You can now paste the version information in a [new issue](https://github.com/paritytech/polkadot/issues/new/choose).
+This will show you the Polkadot version as well as the git commit ref that was used to build your container. You can now
+paste the version information in a [new issue](https://github.com/paritytech/polkadot/issues/new/choose).
diff --git a/docs/markdown_linting.md b/docs/markdown_linting.md
new file mode 100644
index 0000000000000000000000000000000000000000..d916b86ba54489265d59568a798c309d27d655b6
--- /dev/null
+++ b/docs/markdown_linting.md
@@ -0,0 +1,20 @@
+# Markdown linting
+
+Since the introduction of [PR #1309](https://github.com/paritytech/polkadot-sdk/pull/1309), the markdown
+files in this repository are checked by a linter for formatting and consistency.
+
+The linter used is [`markdownlint`](https://github.com/DavidAnson/markdownlint) and can be installed locally on your
+machine. It can also be setup as [pre-commit hook](https://github.com/igorshubovych/markdownlint-cli#use-with-pre-commit)
+to ensure that your markdown is passing all the tests.
+
+The rules in place are defined
+[here](https://github.com/paritytech/polkadot-sdk/blob/master/.github/.markdownlint.yaml).
+
+You may run `markdownlint` locally using:
+```
+markdownlint --config .github/.markdownlint.yaml --ignore target .
+```
+
+There are also plugins for your favorite editor, that can ensure that most
+of the rules will pass and fix typical issues (such as trailing spaces,
+missing eof new line, long lines, etc...)
diff --git a/polkadot/.cargo/config.toml b/polkadot/.cargo/config.toml
deleted file mode 100644
index 4796a2c26965c1021d14c6acc854bca1aea76941..0000000000000000000000000000000000000000
--- a/polkadot/.cargo/config.toml
+++ /dev/null
@@ -1,33 +0,0 @@
-#
-# An auto defined `clippy` feature was introduced,
-# but it was found to clash with user defined features,
-# so was renamed to `cargo-clippy`.
-#
-# If you want standard clippy run:
-# RUSTFLAGS= cargo clippy
-[target.'cfg(feature = "cargo-clippy")']
-rustflags = [
-  "-Aclippy::all",
-  "-Dclippy::correctness",
-  "-Aclippy::if-same-then-else",
-  "-Aclippy::clone-double-ref",
-  "-Dclippy::complexity",
-  "-Aclippy::zero-prefixed-literal",     # 00_1000_000
-  "-Aclippy::type_complexity",           # raison d'etre
-  "-Aclippy::nonminimal-bool",           # maybe
-  "-Aclippy::borrowed-box",              # Reasonable to fix this one
-  "-Aclippy::too-many-arguments",        # (Turning this on would lead to)
-  "-Aclippy::unnecessary_cast",          # Types may change
-  "-Aclippy::identity-op",               # One case where we do 0 +
-  "-Aclippy::useless_conversion",        # Types may change
-  "-Aclippy::unit_arg",                  # styalistic.
-  "-Aclippy::option-map-unit-fn",        # styalistic
-  "-Aclippy::bind_instead_of_map",       # styalistic
-  "-Aclippy::erasing_op",                # E.g. 0 * DOLLARS
-  "-Aclippy::eq_op",                     # In tests we test equality.
-  "-Aclippy::while_immutable_condition", # false positives
-  "-Aclippy::needless_option_as_deref",  # false positives
-  "-Aclippy::derivable_impls",           # false positives
-  "-Aclippy::stable_sort_primitive",     # prefer stable sort
-  "-Aclippy::extra-unused-type-parameters", # stylistic
-]
diff --git a/polkadot/.gitattributes b/polkadot/.gitattributes
deleted file mode 100644
index 2ea1ab2d6b9cff5f075666eb5a780575870c221e..0000000000000000000000000000000000000000
--- a/polkadot/.gitattributes
+++ /dev/null
@@ -1,2 +0,0 @@
-/.gitlab-ci.yml filter=ci-prettier
-/scripts/ci/gitlab/pipeline/*.yml filter=ci-prettier
diff --git a/polkadot/.github/CODEOWNERS b/polkadot/.github/CODEOWNERS
deleted file mode 100644
index a92dc0bb006cb377d2c4a6b0075fca882b820647..0000000000000000000000000000000000000000
--- a/polkadot/.github/CODEOWNERS
+++ /dev/null
@@ -1,6 +0,0 @@
-# CI
-/.github/ @paritytech/ci @chevdor
-/scripts/ci/ @paritytech/ci @chevdor
-/.gitlab-ci.yml @paritytech/ci
-# lingua.dic is not managed by CI team
-/scripts/ci/gitlab/lingua.dic
diff --git a/polkadot/.github/ISSUE_TEMPLATE/bug_report.md b/polkadot/.github/ISSUE_TEMPLATE/bug_report.md
deleted file mode 100644
index c2214ab7d93276beb1422f043992ddc620b44f61..0000000000000000000000000000000000000000
--- a/polkadot/.github/ISSUE_TEMPLATE/bug_report.md
+++ /dev/null
@@ -1,13 +0,0 @@
----
-name: Bug report
-about: Create a report to help us improve
-title: ''
-labels: ''
-assignees: ''
-
----
-
-- It would help if you submit info about the system you are running, e.g.: operating system, kernel version, amount of available memory and swap, etc.
-- Logs could be very helpful. If possible, submit the whole log. Please format it as ```code blocks```.
-- Describe the role your node plays, e.g. validator, full node or light client.
-- Any command-line options were passed?
diff --git a/polkadot/.github/ISSUE_TEMPLATE/release.md b/polkadot/.github/ISSUE_TEMPLATE/release.md
deleted file mode 100644
index 37b422a9b3ecceef31a6bb4f06ca37c6e46151aa..0000000000000000000000000000000000000000
--- a/polkadot/.github/ISSUE_TEMPLATE/release.md
+++ /dev/null
@@ -1,52 +0,0 @@
----
-name: Release issue template
-about: Tracking issue for new releases
-title: Polkadot {{ env.VERSION }} Release checklist
----
-# Release Checklist
-
-This is the release checklist for Polkadot {{ env.VERSION }}. **All** following
-checks should be completed before publishing a new release of the
-Polkadot/Kusama/Westend/Rococo runtime or client. The current release candidate can be
-checked out with `git checkout release-{{ env.VERSION }}`
-
-### Runtime Releases
-
-These checks should be performed on the codebase prior to forking to a release-
-candidate branch.
-
-- [ ] Verify [`spec_version`](https://github.com/paritytech/polkadot/blob/master/doc/release-checklist.md#spec-version) has been incremented since the
-    last release for any native runtimes from any existing use on public
-    (non-private) networks. If the runtime was published (release or pre-release), either
-    the `spec_version` or `impl` must be bumped.
-- [ ] Verify previously [completed migrations](https://github.com/paritytech/polkadot/blob/master/doc/release-checklist.md#old-migrations-removed) are
-    removed for any public (non-private/test) networks.
-- [ ] Verify pallet and [extrinsic ordering](https://github.com/paritytech/polkadot/blob/master/doc/release-checklist.md#extrinsic-ordering) has stayed
-    the same. Bump `transaction_version` if not.
-- [ ] Verify new extrinsics have been correctly whitelisted/blacklisted for
-    [proxy filters](https://github.com/paritytech/polkadot/blob/master/doc/release-checklist.md#proxy-filtering).
-- [ ] Verify [benchmarks](https://github.com/paritytech/polkadot/blob/master/doc/release-checklist.md#benchmarks) have been updated for any modified
-    runtime logic.
-
-The following checks can be performed after we have forked off to the release-
-candidate branch or started an additional release candidate branch (rc-2, rc-3, etc)
-
-- [ ] Verify [new migrations](https://github.com/paritytech/polkadot/blob/master/doc/release-checklist.md#new-migrations) complete successfully, and the
-    runtime state is correctly updated for any public (non-private/test)
-    networks.
-- [ ] Verify [Polkadot JS API](https://github.com/paritytech/polkadot/blob/master/doc/release-checklist.md#polkadot-js) are up to date with the latest
-    runtime changes.
-- [ ] Check with the Signer's team to make sure metadata update QR are lined up
-- [ ] Push runtime upgrade to Westend and verify network stability.
-
-### All Releases
-
-- [ ] Check that the new client versions have [run on the network](https://github.com/paritytech/polkadot/blob/master/doc/release-checklist.md#burn-in)
-    without issue for 12+ hours on >75% of our validator nodes.
-- [ ] Check that a draft release has been created at
-    https://github.com/paritytech/polkadot/releases with relevant [release
-    notes](https://github.com/paritytech/polkadot/blob/master/doc/release-checklist.md#release-notes)
-- [ ] Check that [build artifacts](https://github.com/paritytech/polkadot/blob/master/doc/release-checklist.md#build-artifacts) have been added to the
-    draft-release
-- [ ] Check that all items listed in the [milestone](https://github.com/paritytech/polkadot/milestones) are included in the release.
-- [ ] Ensure that no `freenotes` were added into the release branch after the latest generated RC
diff --git a/polkadot/.github/dependabot.yml b/polkadot/.github/dependabot.yml
deleted file mode 100644
index a1fa925970bbb088349d610bd81284f1129cb154..0000000000000000000000000000000000000000
--- a/polkadot/.github/dependabot.yml
+++ /dev/null
@@ -1,26 +0,0 @@
-version: 2
-updates:
-  - package-ecosystem: "cargo"
-    directory: "/"
-    labels: ["A2-insubstantial", "B0-silent", "C1-low", "E2-dependencies"]
-    # Handle updates for crates from github.com/paritytech/substrate manually.
-    ignore:
-      - dependency-name: "substrate-*"
-      - dependency-name: "sc-*"
-      - dependency-name: "sp-*"
-      - dependency-name: "frame-*"
-      - dependency-name: "fork-tree"
-      - dependency-name: "frame-remote-externalities"
-      - dependency-name: "pallet-*"
-      - dependency-name: "beefy-*"
-      - dependency-name: "try-runtime-*"
-      - dependency-name: "test-runner"
-      - dependency-name: "generate-bags"
-      - dependency-name: "sub-tokens"
-    schedule:
-      interval: "daily"
-  - package-ecosystem: github-actions
-    directory: '/'
-    labels: ["A2-insubstantial", "B0-silent", "C1-low", "E2-dependencies"]
-    schedule:
-      interval: daily
diff --git a/polkadot/.github/pr-custom-review.yml b/polkadot/.github/pr-custom-review.yml
deleted file mode 100644
index 136c9e75ff2deca5a031e41f065aec74a264ab1f..0000000000000000000000000000000000000000
--- a/polkadot/.github/pr-custom-review.yml
+++ /dev/null
@@ -1,42 +0,0 @@
-# 🔒 PROTECTED: Changes to locks-review-team should be approved by the current locks-review-team
-locks-review-team: locks-review
-team-leads-team: polkadot-review
-action-review-team: ci
-
-rules:
-  - name: Runtime files
-    check_type: changed_files
-    condition:
-      include: ^runtime\/(kusama|polkadot)\/src\/.+\.rs$
-      exclude: ^runtime\/(kusama|polkadot)\/src\/weights\/.+\.rs$
-    all_distinct:
-      - min_approvals: 1
-        teams:
-          - locks-review
-      - min_approvals: 1
-        teams:
-          - polkadot-review
-
-  - name: Core developers
-    check_type: changed_files
-    condition:
-      include: .*
-      # excluding files from 'Runtime files' and 'CI files' rules
-      exclude: ^runtime/(kusama|polkadot)/src/[^/]+\.rs$|^\.gitlab-ci\.yml|^(?!.*\.dic$|.*spellcheck\.toml$)scripts/ci/.*|^\.github/.*
-    min_approvals: 3
-    teams:
-      - core-devs
-
-  - name: CI files
-    check_type: changed_files
-    condition:
-      # dictionary files are excluded
-      include: ^\.gitlab-ci\.yml|^(?!.*\.dic$|.*spellcheck\.toml$)scripts/ci/.*|^\.github/.*
-    min_approvals: 2
-    teams:
-      - ci
-      - release-engineering
-
-prevent-review-request:
-  teams:
-    - core-devs
diff --git a/polkadot/.github/workflows/burnin-label-notification.yml b/polkadot/.github/workflows/burnin-label-notification.yml
deleted file mode 100644
index 536f8fa2a3f6571a3643db62ee41e08bf3fec5da..0000000000000000000000000000000000000000
--- a/polkadot/.github/workflows/burnin-label-notification.yml
+++ /dev/null
@@ -1,24 +0,0 @@
-name: Notify devops when burn-in label applied
-on:
-  pull_request:
-    types: [labeled]
-
-jobs:
-  notify-devops:
-    runs-on: ubuntu-latest
-    strategy:
-      matrix:
-        channel:
-          - name: 'Team: DevOps'
-            room: '!lUslSijLMgNcEKcAiE:parity.io'
-
-    steps:
-      - name: Send Matrix message to ${{ matrix.channel.name }}
-        if: startsWith(github.event.label.name, 'A1-')
-        uses: s3krit/matrix-message-action@70ad3fb812ee0e45ff8999d6af11cafad11a6ecf # v0.0.3
-        with:
-          room_id: ${{ matrix.channel.room }}
-          access_token: ${{ secrets.RELEASENOTES_MATRIX_V2_ACCESS_TOKEN }}
-          server: m.parity.io
-          message: |
-            @room Burn-in request received for the following PR: ${{ github.event.pull_request.html_url }}
diff --git a/polkadot/.github/workflows/check-D-labels.yml b/polkadot/.github/workflows/check-D-labels.yml
deleted file mode 100644
index 9abefaa6fa10034c56432709ede371309a77df2b..0000000000000000000000000000000000000000
--- a/polkadot/.github/workflows/check-D-labels.yml
+++ /dev/null
@@ -1,50 +0,0 @@
-name: Check D labels
-
-on:
-  pull_request:
-    types: [labeled, opened, synchronize, unlabeled]
-    paths:
-      - runtime/polkadot/**
-      - runtime/kusama/**
-      - runtime/common/**
-      - primitives/src/**
-
-jobs:
-  check-labels:
-    runs-on: ubuntu-latest
-    steps:
-      - name: Pull image
-        env:
-          IMAGE: paritytech/ruled_labels:0.4.0
-        run: docker pull $IMAGE
-
-      - name: Check labels
-        env:
-          IMAGE: paritytech/ruled_labels:0.4.0
-          MOUNT: /work
-          GITHUB_PR: ${{ github.event.pull_request.number }}
-          GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
-          API_BASE: https://api.github.com/repos
-          REPO: ${{ github.repository }}
-          RULES_PATH: labels/ruled_labels
-          CHECK_SPECS: specs_polkadot.yaml
-        run: |
-          echo "REPO: ${REPO}"
-          echo "GITHUB_PR: ${GITHUB_PR}"
-          # Clone repo with labels specs
-          git clone https://github.com/paritytech/labels
-          # Fetch the labels for the PR under test
-          labels=$( curl -H "Authorization: token ${GITHUB_TOKEN}" -s "$API_BASE/${REPO}/pulls/${GITHUB_PR}" | jq '.labels | .[] | .name' | tr "\n" ",")
-
-          if [ -z "${labels}" ]; then
-            docker run --rm -i -v $PWD/${RULES_PATH}/:$MOUNT $IMAGE check $MOUNT/$CHECK_SPECS --tags audit --no-label
-          fi
-
-          labels_args=${labels: :-1}
-          printf "Checking labels: %s\n" "${labels_args}"
-
-          # Prevent the shell from splitting labels with spaces
-          IFS=","
-
-          # --dev is more useful to debug mode to debug
-          docker run --rm -i -v $PWD/${RULES_PATH}/:$MOUNT $IMAGE check $MOUNT/$CHECK_SPECS --labels ${labels_args} --dev --tags audit
diff --git a/polkadot/.github/workflows/check-bootnodes.yml b/polkadot/.github/workflows/check-bootnodes.yml
deleted file mode 100644
index 897a90d3ae928336688d6fdcbc2a6f80036e11a3..0000000000000000000000000000000000000000
--- a/polkadot/.github/workflows/check-bootnodes.yml
+++ /dev/null
@@ -1,31 +0,0 @@
-# checks all networks we care about (kusama, polkadot, westend) and ensures
-# the bootnodes in their respective chainspecs are contactable
-
-name: Check all bootnodes
-on:
-  push:
-    branches:
-      # Catches v1.2.3 and v1.2.3-rc1
-      - release-v[0-9]+.[0-9]+.[0-9]+*
-
-jobs:
-  check_bootnodes:
-    strategy:
-      fail-fast: false
-      matrix:
-        runtime: [westend, kusama, polkadot]
-    runs-on: ubuntu-latest
-    steps:
-      - name: Checkout sources
-        uses: actions/checkout@v3
-      - name: Install polkadot
-        shell: bash
-        run: |
-          curl -L "$(curl -s https://api.github.com/repos/paritytech/polkadot/releases/latest \
-          | jq -r '.assets | .[] | select(.name == "polkadot").browser_download_url')" \
-          | sudo tee /usr/local/bin/polkadot > /dev/null
-          sudo chmod +x /usr/local/bin/polkadot
-          polkadot --version
-      - name: Check ${{ matrix.runtime }} bootnodes
-        shell: bash
-        run: scripts/ci/github/check_bootnodes.sh node/service/chain-specs/${{ matrix.runtime }}.json
diff --git a/polkadot/.github/workflows/check-labels.yml b/polkadot/.github/workflows/check-labels.yml
deleted file mode 100644
index df0a0e9cf02dd182492f7ecbf5a8bf9c4ebbf254..0000000000000000000000000000000000000000
--- a/polkadot/.github/workflows/check-labels.yml
+++ /dev/null
@@ -1,45 +0,0 @@
-name: Check labels
-
-on:
-  pull_request:
-    types: [labeled, opened, synchronize, unlabeled]
-
-jobs:
-  check-labels:
-    runs-on: ubuntu-latest
-    steps:
-      - name: Pull image
-        env:
-          IMAGE: paritytech/ruled_labels:0.4.0
-        run: docker pull $IMAGE
-
-      - name: Check labels
-        env:
-          IMAGE: paritytech/ruled_labels:0.4.0
-          MOUNT: /work
-          GITHUB_PR: ${{ github.event.pull_request.number }}
-          GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
-          API_BASE: https://api.github.com/repos
-          REPO: ${{ github.repository }}
-          RULES_PATH: labels/ruled_labels
-          CHECK_SPECS: specs_polkadot.yaml
-        run: |
-          echo "REPO: ${REPO}"
-          echo "GITHUB_PR: ${GITHUB_PR}"
-          # Clone repo with labels specs
-          git clone https://github.com/paritytech/labels
-          # Fetch the labels for the PR under test
-          labels=$( curl -H "Authorization: token ${GITHUB_TOKEN}" -s "$API_BASE/${REPO}/pulls/${GITHUB_PR}" | jq '.labels | .[] | .name' | tr "\n" ",")
-
-          if [ -z "${labels}" ]; then
-            docker run --rm -i -v $PWD/${RULES_PATH}/:$MOUNT $IMAGE check $MOUNT/$CHECK_SPECS --tags PR --no-label
-          fi
-
-          labels_args=${labels: :-1}
-          printf "Checking labels: %s\n" "${labels_args}"
-
-          # Prevent the shell from splitting labels with spaces
-          IFS=","
-
-          # --dev is more useful to debug mode to debug
-          docker run --rm -i -v $PWD/${RULES_PATH}/:$MOUNT $IMAGE check $MOUNT/$CHECK_SPECS --labels ${labels_args} --dev --tags PR
diff --git a/polkadot/.github/workflows/check-licenses.yml b/polkadot/.github/workflows/check-licenses.yml
deleted file mode 100644
index 1e654f7b30705751b3877ccdf93c76ac12723682..0000000000000000000000000000000000000000
--- a/polkadot/.github/workflows/check-licenses.yml
+++ /dev/null
@@ -1,26 +0,0 @@
-name: Check licenses
-
-on:
-  pull_request:
-
-jobs:
-  check-licenses:
-    runs-on: ubuntu-22.04
-    steps:
-      - name: Checkout sources
-        uses: actions/checkout@v3
-      - uses: actions/setup-node@v3.8.1
-        with:
-          node-version: '18.x'
-          registry-url: 'https://npm.pkg.github.com'
-          scope: '@paritytech'
-      - name: Check the licenses
-        run: |
-          shopt -s globstar
-
-          npx @paritytech/license-scanner@0.0.5 scan \
-            --ensure-licenses=Apache-2.0 \
-            --ensure-licenses=GPL-3.0-only \
-            ./**/*.rs
-        env:
-          NODE_AUTH_TOKEN: ${{ secrets.GITHUB_TOKEN }}
diff --git a/polkadot/.github/workflows/check-new-bootnodes.yml b/polkadot/.github/workflows/check-new-bootnodes.yml
deleted file mode 100644
index 25b2a0a56fe5f8f93854e38ea4b20416a35064a9..0000000000000000000000000000000000000000
--- a/polkadot/.github/workflows/check-new-bootnodes.yml
+++ /dev/null
@@ -1,28 +0,0 @@
-# If a chainspec file is updated with new bootnodes, we check to make sure those bootnodes are contactable
-
-name: Check new bootnodes
-on:
-  pull_request:
-    paths:
-      - 'node/service/chain-specs/*.json'
-
-jobs:
-  check_bootnodes:
-    runs-on: ubuntu-latest
-    steps:
-      - name: Checkout sources
-        uses: actions/checkout@v3
-        with:
-          fetch-depth: 0
-      - name: Install polkadot
-        shell: bash
-        run: |
-          curl -L "$(curl -s https://api.github.com/repos/paritytech/polkadot/releases/latest \
-          | jq -r '.assets | .[] | select(.name == "polkadot").browser_download_url')" \
-          | sudo tee /usr/local/bin/polkadot > /dev/null
-          sudo chmod +x /usr/local/bin/polkadot
-          polkadot --version
-      - name: Check new bootnodes
-        shell: bash
-        run: |
-          scripts/ci/github/check_new_bootnodes.sh
diff --git a/polkadot/.github/workflows/check-weights.yml b/polkadot/.github/workflows/check-weights.yml
deleted file mode 100644
index e6a6c43e0a6a9b76448d448685d63672d8288a3f..0000000000000000000000000000000000000000
--- a/polkadot/.github/workflows/check-weights.yml
+++ /dev/null
@@ -1,49 +0,0 @@
-name: Check updated weights
-
-on:
-  pull_request:
-    paths:
-      - 'runtime/*/src/weights/**'
-
-jobs:
-  check_weights_files:
-    strategy:
-      fail-fast: false
-      matrix:
-        runtime: [westend, kusama, polkadot, rococo]
-    runs-on: ubuntu-latest
-    steps:
-      - name: Checkout sources
-        uses: actions/checkout@v3
-      - name: Check weights files
-        shell: bash
-        run: |
-          scripts/ci/github/verify_updated_weights.sh ${{ matrix.runtime }}
-
-  # This job uses https://github.com/ggwpez/substrate-weight-compare to compare the weights of the current
-  # release with the last release, then adds them as a comment to the PR.
-  check_weight_changes:
-    strategy:
-      fail-fast: false
-      matrix:
-        runtime: [westend, kusama, polkadot, rococo]
-    runs-on: ubuntu-latest
-    steps:
-      - name: Get latest release
-        run: |
-          LAST_RELEASE=$(curl -s https://api.github.com/repos/paritytech/polkadot/releases/latest | jq -r .tag_name)
-          echo "LAST_RELEASE=$LAST_RELEASE" >> $GITHUB_ENV
-      - name: Checkout current sources
-        uses: actions/checkout@v3
-        with:
-          fetch-depth: 0
-      - name: Check weight changes
-        shell: bash
-        run: |
-          cargo install --git https://github.com/ggwpez/substrate-weight-compare swc
-          ./scripts/ci/github/check_weights_swc.sh ${{ matrix.runtime }} "$LAST_RELEASE" | tee swc_output_${{ matrix.runtime }}.md
-      - name: Add comment
-        uses: thollander/actions-comment-pull-request@v2
-        with:
-          filePath: ./swc_output_${{ matrix.runtime }}.md
-          GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
\ No newline at end of file
diff --git a/polkadot/.github/workflows/honggfuzz.yml b/polkadot/.github/workflows/honggfuzz.yml
deleted file mode 100644
index 27fa0d9967f3b062e75266364092ec9e2cb7c306..0000000000000000000000000000000000000000
--- a/polkadot/.github/workflows/honggfuzz.yml
+++ /dev/null
@@ -1,137 +0,0 @@
-name: Run nightly fuzzer jobs
-
-on:
-  schedule:
-    - cron: '0 0 * * *'
-
-jobs:
-  xcm-fuzzer:
-    runs-on: ubuntu-latest
-    steps:
-      - name: Checkout sources
-        uses: actions/checkout@v3
-        with:
-          fetch-depth: 1
-
-      - name: Install minimal stable Rust
-        uses: actions-rs/toolchain@v1
-        with:
-          profile: minimal
-          toolchain: stable
-          override: true
-
-      - name: Install minimal nightly Rust
-        uses: actions-rs/toolchain@v1
-        with:
-          profile: minimal
-          toolchain: nightly
-          target: wasm32-unknown-unknown
-
-      - name: Install honggfuzz deps
-        run: sudo apt-get install --no-install-recommends binutils-dev libunwind8-dev
-
-      - name: Install honggfuzz
-        uses: actions-rs/cargo@v1
-        with:
-          command: install
-          args: honggfuzz --version "0.5.54"
-
-      - name: Build fuzzer binaries
-        working-directory: xcm/xcm-simulator/fuzzer/
-        run: cargo hfuzz build
-
-      - name: Run fuzzer
-        working-directory: xcm/xcm-simulator/fuzzer/
-        run: bash $GITHUB_WORKSPACE/scripts/ci/github/run_fuzzer.sh xcm-fuzzer
-
-  erasure-coding-round-trip:
-    runs-on: ubuntu-latest
-    steps:
-      - name: Checkout sources
-        uses: actions/checkout@v3
-        with:
-          fetch-depth: 1
-
-      - name: Cache Seed
-        id: cache-seed-round-trip
-        uses: actions/cache@v3
-        with:
-          path: erasure-coding/fuzzer/hfuzz_workspace
-          key: ${{ runner.os }}-erasure-coding
-
-      - name: Install minimal stable Rust
-        uses: actions-rs/toolchain@v1
-        with:
-          profile: minimal
-          toolchain: stable
-          override: true
-
-      - name: Install minimal nightly Rust
-        uses: actions-rs/toolchain@v1
-        with:
-          profile: minimal
-          toolchain: nightly
-          target: wasm32-unknown-unknown
-
-      - name: Install honggfuzz deps
-        run: sudo apt-get install --no-install-recommends binutils-dev libunwind8-dev
-
-      - name: Install honggfuzz
-        uses: actions-rs/cargo@v1
-        with:
-          command: install
-          args: honggfuzz --version "0.5.54"
-
-      - name: Build fuzzer binaries
-        working-directory: erasure-coding/fuzzer
-        run: cargo hfuzz build
-
-      - name: Run fuzzer
-        working-directory: erasure-coding/fuzzer
-        run: bash $GITHUB_WORKSPACE/scripts/ci/github/run_fuzzer.sh round_trip
-
-  erasure-coding-reconstruct:
-    runs-on: ubuntu-latest
-    steps:
-      - name: Checkout sources
-        uses: actions/checkout@v3
-        with:
-          fetch-depth: 1
-
-      - name: Cache Seed
-        id: cache-seed-reconstruct
-        uses: actions/cache@v3
-        with:
-          path: erasure-coding/fuzzer/hfuzz_workspace
-          key: ${{ runner.os }}-erasure-coding
-
-      - name: Install minimal stable Rust
-        uses: actions-rs/toolchain@v1
-        with:
-          profile: minimal
-          toolchain: stable
-          override: true
-
-      - name: Install minimal nightly Rust
-        uses: actions-rs/toolchain@v1
-        with:
-          profile: minimal
-          toolchain: nightly
-          target: wasm32-unknown-unknown
-
-      - name: Install honggfuzz deps
-        run: sudo apt-get install --no-install-recommends binutils-dev libunwind8-dev
-
-      - name: Install honggfuzz
-        uses: actions-rs/cargo@v1
-        with:
-          command: install
-          args: honggfuzz --version "0.5.54"
-
-      - name: Build fuzzer binaries
-        working-directory: erasure-coding/fuzzer
-        run: cargo hfuzz build
-
-      - name: Run fuzzer
-        working-directory: erasure-coding/fuzzer
-        run: bash $GITHUB_WORKSPACE/scripts/ci/github/run_fuzzer.sh reconstruct
diff --git a/polkadot/.github/workflows/pr-custom-review.yml b/polkadot/.github/workflows/pr-custom-review.yml
deleted file mode 100644
index 8e40c9ee72989d9ef244247456aa578d3836f8c6..0000000000000000000000000000000000000000
--- a/polkadot/.github/workflows/pr-custom-review.yml
+++ /dev/null
@@ -1,42 +0,0 @@
-name: Assign reviewers
-
-on:
-  pull_request:
-    branches:
-      - master
-      - main
-    types:
-      - opened
-      - reopened
-      - synchronize
-      - review_requested
-      - review_request_removed
-      - ready_for_review
-      - converted_to_draft
-  pull_request_review:
-
-jobs:
-  pr-custom-review:
-    runs-on: ubuntu-latest
-    steps:
-      - name: Skip if pull request is in Draft
-        # `if: github.event.pull_request.draft == true` should be kept here, at
-        # the step level, rather than at the job level. The latter is not
-        # recommended because when the PR is moved from "Draft" to "Ready to
-        # review" the workflow will immediately be passing (since it was skipped),
-        # even though it hasn't actually ran, since it takes a few seconds for
-        # the workflow to start. This is also disclosed in:
-        # https://github.community/t/dont-run-actions-on-draft-pull-requests/16817/17
-        # That scenario would open an opportunity for the check to be bypassed:
-        # 1. Get your PR approved
-        # 2. Move it to Draft
-        # 3. Push whatever commits you want
-        # 4. Move it to "Ready for review"; now the workflow is passing (it was
-        #    skipped) and "Check reviews" is also passing (it won't be updated
-        #    until the workflow is finished)
-        if: github.event.pull_request.draft == true
-        run: exit 1
-      - name: pr-custom-review
-        uses: paritytech/pr-custom-review@action-v3
-        with:
-          checks-reviews-api: http://pcr.parity-prod.parity.io/api/v1/check_reviews
diff --git a/polkadot/.github/workflows/release-01_branch-check.yml b/polkadot/.github/workflows/release-01_branch-check.yml
deleted file mode 100644
index f2b559b7c176bb52b5668e1ce9a3ac217a388f69..0000000000000000000000000000000000000000
--- a/polkadot/.github/workflows/release-01_branch-check.yml
+++ /dev/null
@@ -1,21 +0,0 @@
-name: Release - Branch check
-on:
-  push:
-    branches:
-      # Catches v1.2.3 and v1.2.3-rc1
-      - release-v[0-9]+.[0-9]+.[0-9]+*
-
-  workflow_dispatch:
-
-jobs:
-  check_branch:
-    runs-on: ubuntu-latest
-    steps:
-      - name: Checkout sources
-        uses: actions/checkout@v3
-        with:
-          fetch-depth: 0
-
-      - name: Run check
-        shell: bash
-        run: ./scripts/ci/github/check-rel-br
diff --git a/polkadot/.github/workflows/release-10_candidate.yml b/polkadot/.github/workflows/release-10_candidate.yml
deleted file mode 100644
index 54a937a7819a155346aca1405399bdcacaf5f0e3..0000000000000000000000000000000000000000
--- a/polkadot/.github/workflows/release-10_candidate.yml
+++ /dev/null
@@ -1,71 +0,0 @@
-name: Release - RC automation
-on:
-  push:
-    branches:
-      # Catches v1.2.3 and v1.2.3-rc1
-      - release-v[0-9]+.[0-9]+.[0-9]+*
-jobs:
-  tag_rc:
-    runs-on: ubuntu-latest
-    strategy:
-      matrix:
-        channel:
-          - name: "RelEng: Polkadot Release Coordination"
-            room: '!cqAmzdIcbOFwrdrubV:parity.io'
-
-    steps:
-      - name: Checkout sources
-        uses: actions/checkout@v3
-        with:
-          fetch-depth: 0
-      - id: compute_tag
-        name: Compute next rc tag
-        shell: bash
-        run: |
-          # Get last rc tag if exists, else set it to {version}-rc1
-          version=${GITHUB_REF#refs/heads/release-}
-          echo "$version"
-          echo "version=$version" >> $GITHUB_OUTPUT
-          git tag -l
-          last_rc=$(git tag -l "$version-rc*" | sort -V | tail -n 1)
-          if [ -n "$last_rc" ]; then
-            suffix=$(echo "$last_rc" | grep -Eo '[0-9]+$')
-            echo $suffix
-            ((suffix++))
-            echo $suffix
-            echo "new_tag=$version-rc$suffix" >> $GITHUB_OUTPUT
-            echo "first_rc=false" >> $GITHUB_OUTPUT
-          else
-            echo "new_tag=$version-rc1" >> $GITHUB_OUTPUT
-            echo "first_rc=true" >> $GITHUB_OUTPUT
-          fi
-
-      - name: Apply new tag
-        uses: tvdias/github-tagger@ed7350546e3e503b5e942dffd65bc8751a95e49d # v0.0.2
-        with:
-          # We can't use the normal GITHUB_TOKEN for the following reason:
-          # https://docs.github.com/en/actions/reference/events-that-trigger-workflows#triggering-new-workflows-using-a-personal-access-token
-          # RELEASE_BRANCH_TOKEN requires public_repo OAuth scope
-          repo-token: "${{ secrets.RELEASE_BRANCH_TOKEN }}"
-          tag: ${{ steps.compute_tag.outputs.new_tag }}
-
-      - id: create-issue
-        uses: JasonEtco/create-an-issue@e27dddc79c92bc6e4562f268fffa5ed752639abd # v2.9.1
-        # Only create the issue if it's the first release candidate
-        if: steps.compute_tag.outputs.first_rc == 'true'
-        env:
-          GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
-          VERSION: ${{ steps.compute_tag.outputs.version }}
-        with:
-          filename: .github/ISSUE_TEMPLATE/release.md
-
-      - name: Send Matrix message to ${{ matrix.channel.name }}
-        uses: s3krit/matrix-message-action@70ad3fb812ee0e45ff8999d6af11cafad11a6ecf # v0.0.3
-        if: steps.create-issue.outputs.url != ''
-        with:
-          room_id: ${{ matrix.channel.room }}
-          access_token: ${{ secrets.RELEASENOTES_MATRIX_V2_ACCESS_TOKEN }}
-          server: m.parity.io
-          message: |
-            Release process for polkadot ${{ steps.compute_tag.outputs.version }} has been started.<br/>
-            Tracking issue: ${{ steps.create-issue.outputs.url }}
diff --git a/polkadot/.github/workflows/release-20_extrinsic-ordering-check-from-bin.yml b/polkadot/.github/workflows/release-20_extrinsic-ordering-check-from-bin.yml
deleted file mode 100644
index 0613ed04d35a93f16b0e0f7be3557216a665d0fc..0000000000000000000000000000000000000000
--- a/polkadot/.github/workflows/release-20_extrinsic-ordering-check-from-bin.yml
+++ /dev/null
@@ -1,81 +0,0 @@
-# This workflow performs the Extrinsic Ordering Check on demand using a binary
-
-name: Release - Extrinsic Ordering Check
-on:
-  workflow_dispatch:
-    inputs:
-      reference_url:
-        description: The WebSocket url of the reference node
-        default: wss://kusama-rpc.polkadot.io
-        required: true
-      binary_url:
-        description: A url to a Linux binary for the node containing the runtime to test
-        default: https://releases.parity.io/polkadot/x86_64-debian:stretch/v0.9.10/polkadot
-        required: true
-      chain:
-        description: The name of the chain under test. Usually, you would pass a local chain
-        default: kusama-local
-        required: true
-
-jobs:
-  check:
-    name: Run check
-    runs-on: ubuntu-latest
-    env:
-      CHAIN: ${{github.event.inputs.chain}}
-      BIN_URL: ${{github.event.inputs.binary_url}}
-      REF_URL: ${{github.event.inputs.reference_url}}
-
-    steps:
-      - name: Checkout sources
-        uses: actions/checkout@v3
-
-      - name: Fetch binary
-        run: |
-          echo Fetching $BIN_URL
-          wget $BIN_URL
-          chmod a+x polkadot
-          ./polkadot --version
-
-      - name: Start local node
-        run: |
-          echo Running on $CHAIN
-          ./polkadot --chain=$CHAIN &
-
-      - name: Prepare output
-        run: |
-          VERSION=$(./polkadot --version)
-          echo "Metadata comparison:" >> output.txt
-          echo "Date: $(date)" >> output.txt
-          echo "Reference: $REF_URL" >> output.txt
-          echo "Target version: $VERSION" >> output.txt
-          echo "Chain: $CHAIN" >> output.txt
-          echo "----------------------------------------------------------------------" >> output.txt
-
-      - name: Pull polkadot-js-tools image
-        run: docker pull jacogr/polkadot-js-tools
-
-      - name: Compare the metadata
-        run: |
-          CMD="docker run --pull always --network host jacogr/polkadot-js-tools metadata $REF_URL ws://localhost:9944"
-          echo -e "Running:\n$CMD"
-          $CMD >> output.txt
-          sed -z -i 's/\n\n/\n/g' output.txt
-          cat output.txt | egrep -n -i ''
-          SUMMARY=$(./scripts/ci/github/extrinsic-ordering-filter.sh output.txt)
-          echo -e $SUMMARY
-          echo -e $SUMMARY >> output.txt
-
-      - name: Show result
-        run: |
-          cat output.txt
-
-      - name: Stop our local node
-        run: pkill polkadot
-
-      - name: Save output as artifact
-        uses: actions/upload-artifact@v3
-        with:
-          name: ${{ env.CHAIN }}
-          path: |
-            output.txt
diff --git a/polkadot/.github/workflows/release-21_extrinsic-ordering-check-from-two.yml b/polkadot/.github/workflows/release-21_extrinsic-ordering-check-from-two.yml
deleted file mode 100644
index 6513897f4a13451a1ea8ffa4ea68d51f722c9513..0000000000000000000000000000000000000000
--- a/polkadot/.github/workflows/release-21_extrinsic-ordering-check-from-two.yml
+++ /dev/null
@@ -1,97 +0,0 @@
-# This workflow performs the Extrinsic Ordering Check on demand using two reference binaries
-
-name: Release - Extrinsic API Check with reference bins
-on:
-  workflow_dispatch:
-    inputs:
-      reference_binary_url:
-        description: A url to a Linux binary for the node containing the reference runtime to test against
-        default: https://releases.parity.io/polkadot/x86_64-debian:stretch/v0.9.26/polkadot
-        required: true
-      binary_url:
-        description: A url to a Linux binary for the node containing the runtime to test
-        default: https://releases.parity.io/polkadot/x86_64-debian:stretch/v0.9.27-rc1/polkadot
-        required: true
-
-jobs:
-  check:
-    name: Run check
-    runs-on: ubuntu-latest
-    env:
-      BIN_URL: ${{github.event.inputs.binary_url}}
-      REF_URL: ${{github.event.inputs.reference_binary_url}}
-    strategy:
-      fail-fast: false
-      matrix:
-        chain: [polkadot, kusama, westend, rococo]
-
-    steps:
-      - name: Checkout sources
-        uses: actions/checkout@v3
-
-      - name: Fetch reference binary
-        run: |
-          echo Fetching $REF_URL
-          curl $REF_URL -o polkadot-ref
-          chmod a+x polkadot-ref
-          ./polkadot-ref --version
-
-      - name: Fetch test binary
-        run: |
-          echo Fetching $BIN_URL
-          curl $BIN_URL -o polkadot
-          chmod a+x polkadot
-          ./polkadot --version
-
-      - name: Start local reference node
-        run: |
-          echo Running reference on ${{ matrix.chain }}-local
-          ./polkadot-ref --chain=${{ matrix.chain }}-local --rpc-port=9934 --ws-port=9945 --base-path=polkadot-ref-base/ &
-
-      - name: Start local test node
-        run: |
-          echo Running test on ${{ matrix.chain }}-local
-          ./polkadot --chain=${{ matrix.chain }}-local &
-
-      - name: Prepare output
-        run: |
-          REF_VERSION=$(./polkadot-ref --version)
-          BIN_VERSION=$(./polkadot --version)
-          echo "Metadata comparison:" >> output.txt
-          echo "Date: $(date)" >> output.txt
-          echo "Ref. binary: $REF_URL" >> output.txt
-          echo "Test binary: $BIN_URL" >> output.txt
-          echo "Ref. version: $REF_VERSION" >> output.txt
-          echo "Test version: $BIN_VERSION" >> output.txt
-          echo "Chain: ${{ matrix.chain }}-local" >> output.txt
-          echo "----------------------------------------------------------------------" >> output.txt
-
-      - name: Pull polkadot-js-tools image
-        run: docker pull jacogr/polkadot-js-tools
-
-      - name: Compare the metadata
-        run: |
-          CMD="docker run --pull always --network host jacogr/polkadot-js-tools metadata ws://localhost:9945 ws://localhost:9944"
-          echo -e "Running:\n$CMD"
-          $CMD >> output.txt
-          sed -z -i 's/\n\n/\n/g' output.txt
-          cat output.txt | egrep -n -i ''
-          SUMMARY=$(./scripts/ci/github/extrinsic-ordering-filter.sh output.txt)
-          echo -e $SUMMARY
-          echo -e $SUMMARY >> output.txt
-
-      - name: Show result
-        run: |
-          cat output.txt
-
-      - name: Save output as artifact
-        uses: actions/upload-artifact@v3
-        with:
-          name: ${{ matrix.chain }}
-          path: |
-            output.txt
-
-      - name: Stop our local nodes
-        run: |
-          pkill polkadot-ref
-          pkill polkadot
diff --git a/polkadot/.github/workflows/release-30_publish-draft-release.yml b/polkadot/.github/workflows/release-30_publish-draft-release.yml
deleted file mode 100644
index 206b1871d80a48672ab89434f90b33b99492dd74..0000000000000000000000000000000000000000
--- a/polkadot/.github/workflows/release-30_publish-draft-release.yml
+++ /dev/null
@@ -1,199 +0,0 @@
-name: Release - Publish draft
-
-on:
-  push:
-    tags:
-      # Catches v1.2.3 and v1.2.3-rc1
-      - v[0-9]+.[0-9]+.[0-9]+*
-
-jobs:
-  get-rust-versions:
-    runs-on: ubuntu-latest
-    container:
-      image: paritytech/ci-linux:production
-    outputs:
-      rustc-stable: ${{ steps.get-rust-versions.outputs.stable }}
-      rustc-nightly: ${{ steps.get-rust-versions.outputs.nightly }}
-    steps:
-      - id: get-rust-versions
-        run: |
-          echo "stable=$(rustc +stable --version)" >> $GITHUB_OUTPUT
-          echo "nightly=$(rustc +nightly --version)" >> $GITHUB_OUTPUT
-
-  build-runtimes:
-    runs-on: ubuntu-latest
-    strategy:
-      matrix:
-        runtime: ["polkadot", "kusama", "westend", "rococo"]
-    steps:
-      - name: Checkout sources
-        uses: actions/checkout@v3
-
-      - name: Cache target dir
-        uses: actions/cache@v3
-        with:
-          path: "${{ github.workspace }}/runtime/${{ matrix.runtime }}/target"
-          key: srtool-target-${{ matrix.runtime }}-${{ github.sha }}
-          restore-keys: |
-            srtool-target-${{ matrix.runtime }}-
-            srtool-target-
-
-      - name: Build ${{ matrix.runtime }} runtime
-        id: srtool_build
-        uses: chevdor/srtool-actions@v0.8.0
-        with:
-          image: paritytech/srtool
-          chain: ${{ matrix.runtime }}
-
-      - name: Store srtool digest to disk
-        run: |
-          echo '${{ steps.srtool_build.outputs.json }}' | jq > ${{ matrix.runtime }}_srtool_output.json
-
-      - name: Upload ${{ matrix.runtime }} srtool json
-        uses: actions/upload-artifact@v3
-        with:
-          name: ${{ matrix.runtime }}-srtool-json
-          path: ${{ matrix.runtime }}_srtool_output.json
-
-      - name: Upload ${{ matrix.runtime }} runtime
-        uses: actions/upload-artifact@v3
-        with:
-          name: ${{ matrix.runtime }}-runtime
-          path: |
-            ${{ steps.srtool_build.outputs.wasm_compressed }}
-
-  publish-draft-release:
-    runs-on: ubuntu-latest
-    needs: ["get-rust-versions", "build-runtimes"]
-    outputs:
-      release_url: ${{ steps.create-release.outputs.html_url }}
-      asset_upload_url: ${{ steps.create-release.outputs.upload_url }}
-    steps:
-      - name: Checkout sources
-        uses: actions/checkout@v3
-        with:
-          fetch-depth: 0
-          path: polkadot
-
-      - name: Set up Ruby
-        uses: ruby/setup-ruby@v1
-        with:
-          ruby-version: 3.0.0
-
-      - name: Download srtool json output
-        uses: actions/download-artifact@v3
-
-      - name: Prepare tooling
-        run: |
-          cd polkadot/scripts/ci/changelog
-          gem install bundler changelogerator:0.9.1
-          bundle install
-          changelogerator --help
-
-          URL=https://github.com/chevdor/tera-cli/releases/download/v0.2.1/tera-cli_linux_amd64.deb
-          wget $URL -O tera.deb
-          sudo dpkg -i tera.deb
-          tera --version
-
-      - name: Generate release notes
-        env:
-          RUSTC_STABLE: ${{ needs.get-rust-versions.outputs.rustc-stable }}
-          RUSTC_NIGHTLY: ${{ needs.get-rust-versions.outputs.rustc-nightly }}
-          GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
-          NO_CACHE: 1
-          DEBUG: 1
-          ROCOCO_DIGEST: ${{ github.workspace}}/rococo-srtool-json/rococo_srtool_output.json
-          WESTEND_DIGEST: ${{ github.workspace}}/westend-srtool-json/westend_srtool_output.json
-          KUSAMA_DIGEST: ${{ github.workspace}}/kusama-srtool-json/kusama_srtool_output.json
-          POLKADOT_DIGEST: ${{ github.workspace}}/polkadot-srtool-json/polkadot_srtool_output.json
-          PRE_RELEASE: ${{ github.event.inputs.pre_release }}
-        run: |
-          find ${{env.GITHUB_WORKSPACE}} -type f -name "*_srtool_output.json"
-          ls -al $ROCOCO_DIGEST
-          ls -al $WESTEND_DIGEST
-          ls -al $KUSAMA_DIGEST
-          ls -al $POLKADOT_DIGEST
-
-          cd polkadot/scripts/ci/changelog
-
-          ./bin/changelog ${GITHUB_REF}
-          ls -al release-notes.md
-          ls -al context.json
-
-      - name: Archive artifact context.json
-        uses: actions/upload-artifact@v3
-        with:
-          name: release-notes-context
-          path: |
-            polkadot/scripts/ci/changelog/context.json
-            **/*_srtool_output.json
-
-      - name: Create draft release
-        id: create-release
-        uses: actions/create-release@v1
-        env:
-          GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
-        with:
-          tag_name: ${{ github.ref }}
-          release_name: Polkadot ${{ github.ref }}
-          body_path: ./polkadot/scripts/ci/changelog/release-notes.md
-          draft: true
-
-  publish-runtimes:
-    runs-on: ubuntu-latest
-    needs: ["publish-draft-release"]
-    env:
-      RUNTIME_DIR: runtime
-    strategy:
-      matrix:
-        runtime: ["polkadot", "kusama", "westend", "rococo"]
-    steps:
-      - name: Checkout sources
-        uses: actions/checkout@v3
-      - name: Download artifacts
-        uses: actions/download-artifact@v3
-      - name: Set up Ruby
-        uses: ruby/setup-ruby@v1
-        with:
-          ruby-version: 3.0.0
-      - name: Get runtime version
-        id: get-runtime-ver
-        run: |
-          echo "require './scripts/ci/github/lib.rb'" > script.rb
-          echo "puts get_runtime(runtime: \"${{ matrix.runtime }}\", runtime_dir: \"$RUNTIME_DIR\")" >> script.rb
-
-          echo "Current folder: $PWD"
-          ls "$RUNTIME_DIR/${{ matrix.runtime }}"
-          runtime_ver=$(ruby script.rb)
-          echo "Found version: >$runtime_ver<"
-          echo "runtime_ver=$runtime_ver" >> $GITHUB_OUTPUT
-
-      - name: Upload compressed ${{ matrix.runtime }} wasm
-        uses: actions/upload-release-asset@v1
-        env:
-          GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
-        with:
-          upload_url: ${{ needs.publish-draft-release.outputs.asset_upload_url }}
-          asset_path: "${{ matrix.runtime }}-runtime/${{ matrix.runtime }}_runtime.compact.compressed.wasm"
-          asset_name: ${{ matrix.runtime }}_runtime-v${{ steps.get-runtime-ver.outputs.runtime_ver }}.compact.compressed.wasm
-          asset_content_type: application/wasm
-
-  post_to_matrix:
-    runs-on: ubuntu-latest
-    needs: publish-draft-release
-    strategy:
-      matrix:
-        channel:
-          - name: "RelEng: Polkadot Release Coordination"
-            room: '!cqAmzdIcbOFwrdrubV:parity.io'
-
-    steps:
-      - name: Send Matrix message to ${{ matrix.channel.name }}
-        uses: s3krit/matrix-message-action@70ad3fb812ee0e45ff8999d6af11cafad11a6ecf # v0.0.3
-        with:
-          room_id: ${{ matrix.channel.room }}
-          access_token: ${{ secrets.RELEASENOTES_MATRIX_V2_ACCESS_TOKEN }}
-          server: m.parity.io
-          message: |
-            **New version of polkadot tagged**: ${{ github.ref }}<br/>
-            Draft release created: ${{ needs.publish-draft-release.outputs.release_url }}
diff --git a/polkadot/.github/workflows/release-40_publish-rc-image.yml b/polkadot/.github/workflows/release-40_publish-rc-image.yml
deleted file mode 100644
index 3d91c5b8c682b85d3ae937ff0b98690394b41114..0000000000000000000000000000000000000000
--- a/polkadot/.github/workflows/release-40_publish-rc-image.yml
+++ /dev/null
@@ -1,132 +0,0 @@
-name: Release - Publish RC Container image
-# see https://github.com/paritytech/release-engineering/issues/97#issuecomment-1651372277
-
-on:
-  workflow_dispatch:
-    inputs:
-      release_id:
-        description: |
-          Release ID.
-          You can find it using the command:
-            curl -s \
-              -H "Authorization: Bearer ${GITHUB_TOKEN}" https://api.github.com/repos/$OWNER/$REPO/releases | \
-              jq '.[] | { name: .name, id: .id }'
-        required: true
-        type: string
-      registry:
-        description: "Container registry"
-        required: true
-        type: string
-        default: docker.io
-      owner:
-        description: Owner of the container image repo
-        required: true
-        type: string
-        default: parity
-
-env:
-  RELEASE_ID: ${{ inputs.release_id }}
-  ENGINE: docker
-  REGISTRY: ${{ inputs.registry }}
-  GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
-  DOCKER_OWNER: ${{ inputs.owner || github.repository_owner }}
-  REPO: ${{ github.repository }}
-
-jobs:
-  fetch-artifacts:
-    runs-on: ubuntu-latest
-
-    steps:
-      - name: Checkout sources
-        uses: actions/checkout@v3
-
-      - name: Fetch all artifacts
-        run: |
-          . ./scripts/ci/common/lib.sh
-          fetch_release_artifacts
-
-      - name: Cache the artifacts
-        uses: actions/cache@88522ab9f39a2ea568f7027eddc7d8d8bc9d59c8 # v3.3.1
-        with:
-          key: artifacts-${{ github.sha }}
-          path: |
-            ./release-artifacts/**/*
-
-  build-container:
-    runs-on: ubuntu-latest
-    needs: fetch-artifacts
-
-    strategy:
-      matrix:
-        binary: ["polkadot", "staking-miner"]
-
-    steps:
-      - name: Checkout sources
-        uses: actions/checkout@v3
-
-      - name: Get artifacts from cache
-        uses: actions/cache@88522ab9f39a2ea568f7027eddc7d8d8bc9d59c8 # v3.3.1
-        with:
-          key: artifacts-${{ github.sha }}
-          fail-on-cache-miss: true
-          path: |
-            ./release-artifacts/**/*
-
-      - name: Check sha256 ${{ matrix.binary }}
-        working-directory: ./release-artifacts
-        run: |
-          . ../scripts/ci/common/lib.sh
-
-          echo "Checking binary ${{ matrix.binary }}"
-          check_sha256 ${{ matrix.binary }} && echo "OK" || echo "ERR"
-
-      - name: Check GPG ${{ matrix.binary }}
-        working-directory: ./release-artifacts
-        run: |
-          . ../scripts/ci/common/lib.sh
-          import_gpg_keys
-          check_gpg ${{ matrix.binary }}
-
-      - name: Fetch commit and tag
-        id: fetch_refs
-        run: |
-          release=release-${{ inputs.release_id }} && \
-          echo "release=${release}" >> $GITHUB_OUTPUT
-
-          commit=$(git rev-parse --short HEAD) && \
-          echo "commit=${commit}" >> $GITHUB_OUTPUT
-
-          tag=$(git name-rev --tags --name-only $(git rev-parse HEAD)) && \
-          [ "${tag}" != "undefined" ] && echo "tag=${tag}" >> $GITHUB_OUTPUT || \
-          echo "No tag, doing without"
-
-      - name: Build Injected Container image for ${{ matrix.binary }}
-        env:
-            BIN_FOLDER: ./release-artifacts
-            BINARY: ${{ matrix.binary }}
-            TAGS: ${{join(steps.fetch_refs.outputs.*, ',')}}
-        run: |
-          echo "Building container for ${{ matrix.binary }}"
-          ./scripts/ci/dockerfiles/build-injected.sh
-
-      - name: Login to Dockerhub
-        uses: docker/login-action@v2
-        with:
-          username: ${{ secrets.DOCKERHUB_USERNAME }}
-          password: ${{ secrets.DOCKERHUB_TOKEN }}
-
-      - name: Push Container image for ${{ matrix.binary }}
-        id: docker_push
-        env:
-          BINARY: ${{ matrix.binary }}
-        run: |
-          $ENGINE images | grep ${BINARY}
-          $ENGINE push --all-tags ${REGISTRY}/${DOCKER_OWNER}/${BINARY}
-
-      - name: Check version for the published image for ${{ matrix.binary }}
-        env:
-          BINARY: ${{ matrix.binary }}
-          RELEASE_TAG: ${{ steps.fetch_refs.outputs.release }}
-        run: |
-          echo "Checking tag ${RELEASE_TAG} for image ${REGISTRY}/${DOCKER_OWNER}/${BINARY}"
-          $ENGINE run -i ${REGISTRY}/${DOCKER_OWNER}/${BINARY}:${RELEASE_TAG} --version
diff --git a/polkadot/.github/workflows/release-50_publish-docker-release.yml b/polkadot/.github/workflows/release-50_publish-docker-release.yml
deleted file mode 100644
index 81e5caa718f3e251f8eeded4210d2d4448ecb036..0000000000000000000000000000000000000000
--- a/polkadot/.github/workflows/release-50_publish-docker-release.yml
+++ /dev/null
@@ -1,44 +0,0 @@
-name: Release - Publish Docker image for new releases
-
-on:
-  release:
-    types:
-      - published
-
-jobs:
-  main:
-    runs-on: ubuntu-latest
-    steps:
-      - name: Checkout sources
-        uses: actions/checkout@v3
-      - name: Set up Docker Buildx
-        uses: docker/setup-buildx-action@95cb08cb2672c73d4ffd2f422e6d11953d2a9c70 # v2.1.0
-      - name: Cache Docker layers
-        uses: actions/cache@v3
-        with:
-         path: /tmp/.buildx-cache
-         key: ${{ runner.os }}-buildx-${{ github.sha }}
-         restore-keys: |
-           ${{ runner.os }}-buildx-
-      - name: Login to Dockerhub
-        uses: docker/login-action@v2
-        with:
-          username: ${{ secrets.DOCKERHUB_USERNAME }}
-          password: ${{ secrets.DOCKERHUB_TOKEN }}
-      - name: Build and push
-        id:   docker_build
-        uses: docker/build-push-action@v4
-        with:
-          push: true
-          file: scripts/ci/dockerfiles/polkadot/polkadot_injected_debian.Dockerfile
-          tags: |
-            parity/polkadot:latest
-            parity/polkadot:${{ github.event.release.tag_name }}
-          build-args: |
-            POLKADOT_VERSION=${{ github.event.release.tag_name }}
-            VCS_REF=${{ github.ref }}
-            BUILD_DATE=${{ github.event.release.published_at }}
-          cache-from: type=local,src=/tmp/.buildx-cache
-          cache-to: type=local,dest=/tmp/.buildx-cache
-      - name: Image digest
-        run: echo ${{ steps.docker_build.outputs.digest }}
diff --git a/polkadot/.github/workflows/release-51_publish-docker-manual.yml b/polkadot/.github/workflows/release-51_publish-docker-manual.yml
deleted file mode 100644
index 919769f8700d1ac70f0d831a5f6645aff86f42f2..0000000000000000000000000000000000000000
--- a/polkadot/.github/workflows/release-51_publish-docker-manual.yml
+++ /dev/null
@@ -1,51 +0,0 @@
-name: Release - Publish Docker image (manual dispatch)
-
-on:
-  workflow_dispatch:
-    inputs:
-      version:
-        description: version to build/release
-        default: v0.9.18
-        required: true
-      date:
-        description: release date of version
-        default: "2022-02-23T19:11:58Z"
-        required: true
-
-jobs:
-  main:
-    runs-on: ubuntu-latest
-    steps:
-      - name: Checkout sources
-        uses: actions/checkout@v3
-      - name: Set up Docker Buildx
-        uses: docker/setup-buildx-action@95cb08cb2672c73d4ffd2f422e6d11953d2a9c70 # v2.1.0
-      - name: Cache Docker layers
-        uses: actions/cache@v3
-        with:
-         path: /tmp/.buildx-cache
-         key: ${{ runner.os }}-buildx-${{ github.sha }}
-         restore-keys: |
-           ${{ runner.os }}-buildx-
-      - name: Login to Dockerhub
-        uses: docker/login-action@v2
-        with:
-          username: ${{ secrets.DOCKERHUB_USERNAME }}
-          password: ${{ secrets.DOCKERHUB_TOKEN }}
-      - name: Build and push
-        id:   docker_build
-        uses: docker/build-push-action@v4
-        with:
-          push: true
-          file: scripts/ci/dockerfiles/polkadot/polkadot_injected_debian.Dockerfile
-          tags: |
-            parity/polkadot:latest
-            parity/polkadot:${{ github.event.inputs.version }}
-          build-args: |
-            POLKADOT_VERSION=${{ github.event.inputs.version }}
-            VCS_REF=${{ github.ref }}
-            BUILD_DATE=${{ github.event.inputs.date }}
-          cache-from: type=local,src=/tmp/.buildx-cache
-          cache-to: type=local,dest=/tmp/.buildx-cache
-      - name: Image digest
-        run: echo ${{ steps.docker_build.outputs.digest }}
diff --git a/polkadot/.github/workflows/release-99_bot.yml b/polkadot/.github/workflows/release-99_bot.yml
deleted file mode 100644
index 5d45c0d44eda3d43e77ce6cc2272b79cc35f5c7e..0000000000000000000000000000000000000000
--- a/polkadot/.github/workflows/release-99_bot.yml
+++ /dev/null
@@ -1,49 +0,0 @@
-name: Release - Send new release notification to matrix channels
-on:
-  release:
-    types:
-      - published
-
-jobs:
-  ping_matrix:
-    strategy:
-      matrix:
-        channel:
-          - name: '#KusamaValidatorLounge:polkadot.builders'
-            room: '!LhjZccBOqFNYKLdmbb:polkadot.builders'
-            pre-releases: false
-          - name: '#kusama-announcements:matrix.parity.io'
-            room: '!FMwxpQnYhRCNDRsYGI:matrix.parity.io'
-            pre-release: false
-          - name: '#polkadotvalidatorlounge:web3.foundation'
-            room: '!NZrbtteFeqYKCUGQtr:matrix.parity.io'
-            pre-release: false
-          - name: '#polkadot-announcements:matrix.parity.io'
-            room: '!UqHPWiCBGZWxrmYBkF:matrix.parity.io'
-            pre-release: false
-          - name: "RelEng: Polkadot Release Coordination"
-            room: '!cqAmzdIcbOFwrdrubV:parity.io'
-            pre-release: true
-          - name: 'Ledger <> Polkadot Coordination'
-            room: '!EoIhaKfGPmFOBrNSHT:web3.foundation'
-            pre-release: true
-          - name: 'General: Rust, Polkadot, Substrate'
-            room: '!aJymqQYtCjjqImFLSb:parity.io'
-            pre-release: false
-          - name: 'Team: DevOps'
-            room: '!lUslSijLMgNcEKcAiE:parity.io'
-            pre-release: true
-
-    runs-on: ubuntu-latest
-    steps:
-      - name: Send Matrix message to ${{ matrix.channel.name }}
-        if: github.event.release.prerelease == false || matrix.channel.pre-release
-        uses: s3krit/matrix-message-action@70ad3fb812ee0e45ff8999d6af11cafad11a6ecf # v0.0.3
-        with:
-          room_id: ${{ matrix.channel.room }}
-          access_token: ${{ secrets.RELEASENOTES_MATRIX_V2_ACCESS_TOKEN }}
-          server: m.parity.io
-          message: |
-            ***Polkadot ${{github.event.release.tag_name}} has been released!***<br/>
-            ${{github.event.release.html_url}}<br/><br/>
-            ${{github.event.release.body}}<br/>
diff --git a/polkadot/.gitignore b/polkadot/.gitignore
deleted file mode 100644
index 61ef9e91a55e7007926b35e3cba2aea95788830b..0000000000000000000000000000000000000000
--- a/polkadot/.gitignore
+++ /dev/null
@@ -1,16 +0,0 @@
-**/target/
-**/*.rs.bk
-*.swp
-.wasm-binaries
-runtime/wasm/target/
-**/._*
-.idea
-.vscode
-polkadot.*
-!polkadot.service
-.DS_Store
-.env
-
-artifacts
-release-artifacts
-release.json
diff --git a/polkadot/.gitlab-ci.yml b/polkadot/.gitlab-ci.yml
deleted file mode 100644
index b2d91e61da94a53a791cd1085357eb986ef67c12..0000000000000000000000000000000000000000
--- a/polkadot/.gitlab-ci.yml
+++ /dev/null
@@ -1,287 +0,0 @@
-# .gitlab-ci.yml
-#
-# polkadot
-#
-# Pipelines can be triggered manually in the web.
-#
-# Please do not add new jobs without "rules:" and "*-env". There are &test-refs for everything,
-# "docker-env" is used for Rust jobs.
-# And "kubernetes-env" for everything else. Please mention "image:" container name to be used
-# with it, as there's no default one.
-
-# All jobs are sorted according to their duration using DAG mechanism
-# Currently, test-linux-stable job is the longest one and other jobs are
-# sorted in order to complete during this job and occupy less runners in one
-# moment of time.
-
-stages:
-  - .pre
-  - weights
-  - check
-  - test
-  - build
-  - publish
-  - zombienet
-  - short-benchmarks
-
-workflow:
-  rules:
-    - if: $CI_COMMIT_TAG
-    - if: $CI_COMMIT_BRANCH
-
-variables:
-  GIT_STRATEGY: fetch
-  GIT_DEPTH: 100
-  CI_SERVER_NAME: "GitLab CI"
-  CI_IMAGE: !reference [.ci-unified, variables, CI_IMAGE]
-  BUILDAH_IMAGE: "quay.io/buildah/stable:v1.29"
-  BUILDAH_COMMAND: "buildah --storage-driver overlay2"
-  DOCKER_OS: "debian:stretch"
-  ARCH: "x86_64"
-  ZOMBIENET_IMAGE: "docker.io/paritytech/zombienet:v1.3.65"
-
-default:
-  cache: {}
-  retry:
-    max: 2
-    when:
-      - runner_system_failure
-      - unknown_failure
-      - api_failure
-  interruptible: true
-
-.common-before-script:
-  before_script:
-    - !reference [.job-switcher, before_script]
-    - !reference [.timestamp, before_script]
-
-.collect-artifacts:
-  artifacts:
-    name: "${CI_JOB_NAME}_${CI_COMMIT_REF_NAME}"
-    when: on_success
-    expire_in: 7 days
-    paths:
-      - ./artifacts/
-
-.collect-artifacts-short:
-  artifacts:
-    name: "${CI_JOB_NAME}_${CI_COMMIT_REF_NAME}"
-    when: on_success
-    expire_in: 1 days
-    paths:
-      - ./artifacts/
-
-# collecting vars for pipeline stopper
-# they will be used if the job fails
-.pipeline-stopper-vars:
-  before_script:
-    - echo "FAILED_JOB_URL=${CI_JOB_URL}" > pipeline-stopper.env
-    - echo "FAILED_JOB_NAME=${CI_JOB_NAME}" >> pipeline-stopper.env
-    - echo "FAILED_JOB_NAME=${CI_JOB_NAME}" >> pipeline-stopper.env
-    - echo "PR_NUM=${CI_COMMIT_REF_NAME}" >> pipeline-stopper.env
-
-.pipeline-stopper-artifacts:
-  artifacts:
-    reports:
-      dotenv: pipeline-stopper.env
-
-.job-switcher:
-  before_script:
-    - if echo "$CI_DISABLED_JOBS" | grep -xF "$CI_JOB_NAME"; then echo "The job has been cancelled in CI settings"; exit 0; fi
-
-.kubernetes-env:
-  image: "${CI_IMAGE}"
-  before_script:
-    - !reference [.common-before-script, before_script]
-  tags:
-    - kubernetes-parity-build
-
-.docker-env:
-  image: "${CI_IMAGE}"
-  before_script:
-    - !reference [.common-before-script, before_script]
-  tags:
-    - linux-docker-vm-c2
-
-.compiler-info:
-  before_script:
-    - !reference [.common-before-script, before_script]
-    - rustup show
-    - cargo --version
-
-.test-refs:
-  rules:
-    - if: $CI_PIPELINE_SOURCE == "web"
-    - if: $CI_PIPELINE_SOURCE == "schedule"
-    - if: $CI_COMMIT_REF_NAME == "master"
-    - if: $CI_COMMIT_REF_NAME =~ /^[0-9]+$/ # PRs
-
-.common-refs:
-  # these jobs run always*
-  rules:
-    - if: $CI_PIPELINE_SOURCE == "web"
-    - if: $CI_PIPELINE_SOURCE == "schedule"
-    - if: $CI_COMMIT_REF_NAME == "master"
-    - if: $CI_COMMIT_REF_NAME =~ /^[0-9]+$/ # PRs
-    - if: $CI_COMMIT_REF_NAME =~ /^v[0-9]+\.[0-9]+.*$/ # i.e. v1.0, v2.1rc1
-    - if: $CI_COMMIT_REF_NAME =~ /^release-v[0-9]+\.[0-9]+.*$/ # i.e. release-v0.9.27
-
-.test-pr-refs:
-  rules:
-    - if: $CI_PIPELINE_SOURCE == "pipeline"
-      when: never
-    - if: $CI_COMMIT_REF_NAME =~ /^[0-9]+$/ # PRs
-
-.zombienet-refs:
-  rules:
-    - if: $CI_PIPELINE_SOURCE == "pipeline"
-      when: never
-    - if: $CI_PIPELINE_SOURCE == "schedule"
-      when: never
-    - if: $CI_COMMIT_REF_NAME == "master"
-    - if: $CI_COMMIT_REF_NAME =~ /^[0-9]+$/ # PRs
-
-.deploy-testnet-refs:
-  rules:
-    - if: $CI_PIPELINE_SOURCE == "pipeline"
-      when: never
-    - if: $CI_PIPELINE_SOURCE == "schedule"
-    - if: $CI_COMMIT_REF_NAME == "master"
-
-.publish-refs:
-  rules:
-    - if: $CI_PIPELINE_SOURCE == "pipeline"
-      when: never
-    - if: $CI_PIPELINE_SOURCE == "schedule"
-    - if: $CI_PIPELINE_SOURCE == "web" &&
-        $CI_COMMIT_REF_NAME == "master"
-    - if: $CI_COMMIT_REF_NAME == "master"
-    - if: $CI_COMMIT_REF_NAME =~ /^v[0-9]+\.[0-9]+.*$/ # i.e. v1.0, v2.1rc1
-
-.build-push-image:
-  variables:
-    CI_IMAGE: "${BUILDAH_IMAGE}"
-
-    REGISTRY: "docker.io"
-    DOCKER_OWNER: "paritypr"
-    DOCKER_USER: "${PARITYPR_USER}"
-    DOCKER_PASS: "${PARITYPR_PASS}"
-    IMAGE: "${REGISTRY}/${DOCKER_OWNER}/${IMAGE_NAME}"
-
-    ENGINE: "${BUILDAH_COMMAND}"
-    BUILDAH_FORMAT: "docker"
-    SKIP_IMAGE_VALIDATION: 1
-
-    PROJECT_ROOT: "."
-    BIN_FOLDER: "./artifacts"
-    VCS_REF: "${CI_COMMIT_SHA}"
-
-  before_script:
-    - !reference [.common-before-script, before_script]
-    - test -s ./artifacts/VERSION || exit 1
-    - test -s ./artifacts/EXTRATAG || exit 1
-    - export VERSION="$(cat ./artifacts/VERSION)"
-    - EXTRATAG="$(cat ./artifacts/EXTRATAG)"
-    - echo "Polkadot version = ${VERSION} (EXTRATAG = ${EXTRATAG})"
-  script:
-    - test "$DOCKER_USER" -a "$DOCKER_PASS" ||
-      ( echo "no docker credentials provided"; exit 1 )
-    - TAGS="${VERSION},${EXTRATAG}" scripts/ci/dockerfiles/build-injected.sh
-    - echo "$DOCKER_PASS" |
-      buildah login --username "$DOCKER_USER" --password-stdin "${REGISTRY}"
-    - $BUILDAH_COMMAND info
-    - $BUILDAH_COMMAND push --format=v2s2 "$IMAGE:$VERSION"
-    - $BUILDAH_COMMAND push --format=v2s2 "$IMAGE:$EXTRATAG"
-  after_script:
-    - buildah logout --all
-
-#### stage:                       .pre
-
-# By default our pipelines are interruptible, but some special pipelines shouldn't be interrupted:
-# * multi-project pipelines such as the ones triggered by the scripts repo
-#
-# In those cases, we add an uninterruptible .pre job; once that one has started,
-# the entire pipeline becomes uninterruptible.
-uninterruptible-pipeline:
-  extends: .kubernetes-env
-  variables:
-    CI_IMAGE: "paritytech/tools:latest"
-  stage: .pre
-  interruptible: false
-  rules:
-    - if: $CI_PIPELINE_SOURCE == "pipeline"
-  script: "true"
-
-include:
-  # weights jobs
-  - scripts/ci/gitlab/pipeline/weights.yml
-  # check jobs
-  - scripts/ci/gitlab/pipeline/check.yml
-  # test jobs
-  - scripts/ci/gitlab/pipeline/test.yml
-  # build jobs
-  - scripts/ci/gitlab/pipeline/build.yml
-  # short-benchmarks jobs
-  - scripts/ci/gitlab/pipeline/short-benchmarks.yml
-  # publish jobs
-  - scripts/ci/gitlab/pipeline/publish.yml
-  # zombienet jobs
-  - scripts/ci/gitlab/pipeline/zombienet.yml
-  # timestamp handler
-  - project: parity/infrastructure/ci_cd/shared
-    ref: main
-    file: /common/timestamp.yml
-  - project: parity/infrastructure/ci_cd/shared
-    ref: main
-    file: /common/ci-unified.yml
-
-
-#### stage:                        .post
-
-deploy-parity-testnet:
-  stage: .post
-  extends:
-    - .deploy-testnet-refs
-  variables:
-    POLKADOT_CI_COMMIT_NAME: "${CI_COMMIT_REF_NAME}"
-    POLKADOT_CI_COMMIT_REF: "${CI_COMMIT_SHORT_SHA}"
-  allow_failure: false
-  trigger: "parity/infrastructure/parity-testnet"
-
-# This job cancels the whole pipeline if any of provided jobs fail.
-# In a DAG, every jobs chain is executed independently of others. The `fail_fast` principle suggests
-# to fail the pipeline as soon as possible to shorten the feedback loop.
-.cancel-pipeline-template:
-  stage: .post
-  rules:
-    - if: $CI_COMMIT_REF_NAME =~ /^[0-9]+$/ # PRs
-      when: on_failure
-  variables:
-    PROJECT_ID: "${CI_PROJECT_ID}"
-    PROJECT_NAME: "${CI_PROJECT_NAME}"
-    PIPELINE_ID: "${CI_PIPELINE_ID}"
-    FAILED_JOB_URL: "${FAILED_JOB_URL}"
-    FAILED_JOB_NAME: "${FAILED_JOB_NAME}"
-    PR_NUM: "${PR_NUM}"
-  trigger:
-    project: "parity/infrastructure/ci_cd/pipeline-stopper"
-    branch: "as-improve"
-
-remove-cancel-pipeline-message:
-  stage: .post
-  rules:
-    - if: $CI_COMMIT_REF_NAME =~ /^[0-9]+$/ # PRs
-  variables:
-    PROJECT_ID: "${CI_PROJECT_ID}"
-    PROJECT_NAME: "${CI_PROJECT_NAME}"
-    PIPELINE_ID: "${CI_PIPELINE_ID}"
-    FAILED_JOB_URL: "https://gitlab.com"
-    FAILED_JOB_NAME: "nope"
-    PR_NUM: "${CI_COMMIT_REF_NAME}"
-  trigger:
-    project: "parity/infrastructure/ci_cd/pipeline-stopper"
-
-cancel-pipeline-test-linux-stable:
-  extends: .cancel-pipeline-template
-  needs:
-    - job: test-linux-stable
diff --git a/polkadot/CODE_OF_CONDUCT.md b/polkadot/CODE_OF_CONDUCT.md
deleted file mode 100644
index 400c9b3901e26a7e5a1840816897ed31927156f5..0000000000000000000000000000000000000000
--- a/polkadot/CODE_OF_CONDUCT.md
+++ /dev/null
@@ -1,52 +0,0 @@
-# Contributor Covenant Code of Conduct
-
-## Our Pledge
-
-In the interest of fostering an open and welcoming environment, we as contributors and maintainers pledge to making participation in our project and our community a harassment-free experience for everyone, regardless of age, body size, disability, ethnicity, gender identity and expression, level of experience, nationality, personal appearance, race, religion, or sexual identity and orientation.
-
-## Our Standards
-
-Examples of behavior that contributes to creating a positive environment include:
-
-* Using welcoming and inclusive language
-* Being respectful of differing viewpoints and experiences
-* Gracefully accepting constructive criticism
-* Focusing on what is best for the community
-* Showing empathy towards other community members
-
-Examples of unacceptable behavior by participants include:
-
-* The use of sexualized language or imagery and unwelcome sexual attention or advances
-* Trolling, insulting/derogatory comments, and personal or political attacks
-* Public or private harassment
-* Publishing others' private information, such as a physical or electronic address, without explicit permission
-* Other conduct which could reasonably be considered inappropriate in a professional setting
-
-### Facilitation, Not Strongarming
-
-We recognise that this software is merely a tool for users to create and maintain their blockchain of preference. We see that blockchains are naturally community platforms with users being the ultimate decision makers. We assert that good software will maximise user agency by facilitate user-expression on the network. As such:
-
-* This project will strive to give users as much choice as is both reasonable and possible over what protocol they adhere to; but
-* use of the project's technical forums, commenting systems, pull requests and issue trackers as a means to express individual protocol preferences is forbidden.
-
-## Our Responsibilities
-
-Project maintainers are responsible for clarifying the standards of acceptable behavior and are expected to take appropriate and fair corrective action in response to any instances of unacceptable behavior.
-
-Project maintainers have the right and responsibility to remove, edit, or reject comments, commits, code, wiki edits, issues, and other contributions that are not aligned to this Code of Conduct, or to ban temporarily or permanently any contributor for other behaviors that they deem inappropriate, threatening, offensive, or harmful.
-
-## Scope
-
-This Code of Conduct applies both within project spaces and in public spaces when an individual is representing the project or its community. Examples of representing a project or community include using an official project e-mail address, posting via an official social media account, or acting as an appointed representative at an online or offline event. Representation of a project may be further defined and clarified by project maintainers.
-
-## Enforcement
-
-Instances of abusive, harassing, or otherwise unacceptable behavior may be reported by contacting the project team at <admin@parity.io>. The project team will review and investigate all complaints, and will respond in a way that it deems appropriate to the circumstances. The project team is obligated to maintain confidentiality with regard to the reporter of an incident. Further details of specific enforcement policies may be posted separately.
-
-Project maintainers who do not follow or enforce the Code of Conduct in good faith may face temporary or permanent repercussions as determined by other members of the project's leadership.
-
-## Attribution
-
-This Code of Conduct is adapted from the [Contributor Covenant][homepage], version 1.4, available at https://contributor-covenant.org/version/1/4
-
-[homepage]: https://contributor-covenant.org
diff --git a/polkadot/CONTRIBUTING.md b/polkadot/CONTRIBUTING.md
deleted file mode 100644
index d82b80bd8d2ecb303595cd3df14df2817b4cbc86..0000000000000000000000000000000000000000
--- a/polkadot/CONTRIBUTING.md
+++ /dev/null
@@ -1,46 +0,0 @@
-# Contributing
-
-## Rules
-
-There are a few basic ground-rules for contributors (including the maintainer(s) of the project):
-
-- **No `--force` pushes** or modifying the Git history in any way. If you need to rebase, ensure you do it in your own repo.
-- **Non-master branches**, prefixed with a short name moniker (e.g. `gav-my-feature`) must be used for ongoing work.
-- **All modifications** must be made in a **pull-request** to solicit feedback from other contributors.
-- A pull-request _must not be merged until CI_ has finished successfully.
-- Contributors should adhere to the [house coding style](https://github.com/paritytech/substrate/blob/master/docs/STYLE_GUIDE.md).
-
-### Merging pull requests once CI is successful
-
-- A pull request that does not alter any logic (e.g. comments, dependencies, docs) may be tagged [`insubstantial`](https://github.com/paritytech/polkadot/pulls?utf8=%E2%9C%93&q=is%3Apr+is%3Aopen+label%3AA2-insubstantial) and merged by its author.
-- A pull request with no large change to logic that is an urgent fix may be merged after a non-author contributor has reviewed it well.
-- All other PRs should sit for 48 hours with the [`pleasereview`](https://github.com/paritytech/polkadot/pulls?q=is:pr+is:open+label:A0-pleasereview) tag in order to garner feedback.
-- No PR should be merged until all reviews' comments are addressed.
-
-### Reviewing pull requests
-
-When reviewing a pull request, the end-goal is to suggest useful changes to the author. Reviews should finish with approval unless there are issues that would result in:
-
-- Buggy behavior.
-- Undue maintenance burden.
-- Breaking with house coding style.
-- Pessimization (i.e. reduction of speed as measured in the projects benchmarks).
-- Feature reduction (i.e. it removes some aspect of functionality that a significant minority of users rely on).
-- Uselessness (i.e. it does not strictly add a feature or fix a known issue).
-
-### Reviews may not be used as an effective veto for a PR because
-
-- There exists a somewhat cleaner/better/faster way of accomplishing the same feature/fix.
-- It does not fit well with some other contributors' longer-term vision for the project.
-
-## Releases
-
-Declaring formal releases remains the prerogative of the project maintainer(s).
-
-## Changes to this arrangement
-
-This is an experiment and feedback is welcome! This document may also be subject to pull-requests or changes by contributors where you believe you have something valuable to add or change.
-
-## Heritage
-
-These contributing guidelines are modified from the "OPEN Open Source Project" guidelines for the Level project: <https://github.com/Level/community/blob/master/CONTRIBUTING.md>
diff --git a/polkadot/Cargo.toml b/polkadot/Cargo.toml
index 561b49ab42041e37b90423105d7e799c335c5ecd..6e82cb69f6ecd6c4db535c9797a4ea7fde9d67c1 100644
--- a/polkadot/Cargo.toml
+++ b/polkadot/Cargo.toml
@@ -14,22 +14,19 @@ path = "src/bin/prepare-worker.rs"
 name = "polkadot"
 description = "Implementation of a `https://polkadot.network` node in Rust based on the Substrate framework."
 license = "GPL-3.0-only"
-rust-version = "1.64.0"                                                                                       # workspace properties
+rust-version = "1.64.0"
 readme = "README.md"
 authors.workspace = true
 edition.workspace = true
-version.workspace = true
+version = "1.1.0"
+default-run = "polkadot"
 
 [dependencies]
 color-eyre = { version = "0.6.1", default-features = false }
-tikv-jemallocator = "0.5.0"
+tikv-jemallocator = { version = "0.5.0", optional = true }
 
 # Crates in our workspace, defined as dependencies so we can pass them feature flags.
-polkadot-cli = { path = "cli", features = [
-	"kusama-native",
-	"westend-native",
-	"rococo-native",
-] }
+polkadot-cli = { path = "cli", features = [ "westend-native", "rococo-native" ]  }
 polkadot-node-core-pvf = { path = "node/core/pvf" }
 polkadot-node-core-pvf-prepare-worker = { path = "node/core/pvf/prepare-worker" }
 polkadot-overseer = { path = "node/overseer" }
@@ -38,6 +35,9 @@ polkadot-overseer = { path = "node/overseer" }
 polkadot-node-core-pvf-common = { path = "node/core/pvf/common" }
 polkadot-node-core-pvf-execute-worker = { path = "node/core/pvf/execute-worker" }
 
+[target.'cfg(target_os = "linux")'.dependencies]
+tikv-jemallocator = "0.5.0"
+
 [dev-dependencies]
 assert_cmd = "2.0.4"
 nix = { version = "0.26.1", features = ["signal"] }
@@ -49,86 +49,9 @@ polkadot-core-primitives = { path = "core-primitives" }
 [build-dependencies]
 substrate-build-script-utils = { path = "../substrate/utils/build-script-utils" }
 
-
 [badges]
 maintenance = { status = "actively-developed" }
 
-# The list of dependencies below (which can be both direct and indirect dependencies) are crates
-# that are suspected to be CPU-intensive, and that are unlikely to require debugging (as some of
-# their debug info might be missing) or to require to be frequently recompiled. We compile these
-# dependencies with `opt-level=3` even in "dev" mode in order to make "dev" mode more usable.
-# The majority of these crates are cryptographic libraries.
-#
-# If you see an error mentioning "profile package spec ... did not match any packages", it
-# probably concerns this list.
-#
-# This list is ordered alphabetically.
-[profile.dev.package]
-blake2 = { opt-level = 3 }
-blake2b_simd = { opt-level = 3 }
-chacha20poly1305 = { opt-level = 3 }
-cranelift-codegen = { opt-level = 3 }
-cranelift-wasm = { opt-level = 3 }
-crc32fast = { opt-level = 3 }
-crossbeam-deque = { opt-level = 3 }
-crypto-mac = { opt-level = 3 }
-curve25519-dalek = { opt-level = 3 }
-ed25519-dalek = { opt-level = 3 }
-flate2 = { opt-level = 3 }
-futures-channel = { opt-level = 3 }
-hash-db = { opt-level = 3 }
-hashbrown = { opt-level = 3 }
-hmac = { opt-level = 3 }
-httparse = { opt-level = 3 }
-integer-sqrt = { opt-level = 3 }
-keccak = { opt-level = 3 }
-libm = { opt-level = 3 }
-librocksdb-sys = { opt-level = 3 }
-libsecp256k1 = { opt-level = 3 }
-libz-sys = { opt-level = 3 }
-mio = { opt-level = 3 }
-nalgebra = { opt-level = 3 }
-num-bigint = { opt-level = 3 }
-parking_lot = { opt-level = 3 }
-parking_lot_core = { opt-level = 3 }
-percent-encoding = { opt-level = 3 }
-primitive-types = { opt-level = 3 }
-reed-solomon-novelpoly = { opt-level = 3 }
-ring = { opt-level = 3 }
-rustls = { opt-level = 3 }
-sha2 = { opt-level = 3 }
-sha3 = { opt-level = 3 }
-smallvec = { opt-level = 3 }
-snow = { opt-level = 3 }
-substrate-bip39 = { opt-level = 3 }
-twox-hash = { opt-level = 3 }
-uint = { opt-level = 3 }
-wasmi = { opt-level = 3 }
-x25519-dalek = { opt-level = 3 }
-yamux = { opt-level = 3 }
-zeroize = { opt-level = 3 }
-
-[profile.release]
-# Polkadot runtime requires unwinding.
-panic = "unwind"
-opt-level = 3
-
-# make sure dev builds with backtrace do
-# not slow us down
-[profile.dev.package.backtrace]
-inherits = "release"
-
-[profile.production]
-inherits = "release"
-lto = true
-codegen-units = 1
-
-[profile.testnet]
-inherits = "release"
-debug = 1               # debug symbols are useful for profilers
-debug-assertions = true
-overflow-checks = true
-
 [features]
 runtime-benchmarks = [ "polkadot-cli/runtime-benchmarks" ]
 try-runtime = [ "polkadot-cli/try-runtime" ]
@@ -136,7 +59,9 @@ fast-runtime = [ "polkadot-cli/fast-runtime" ]
 runtime-metrics = [ "polkadot-cli/runtime-metrics" ]
 pyroscope = [ "polkadot-cli/pyroscope" ]
 jemalloc-allocator = [
+	"dep:tikv-jemallocator",
 	"polkadot-node-core-pvf-prepare-worker/jemalloc-allocator",
+	"polkadot-node-core-pvf/jemalloc-allocator",
 	"polkadot-overseer/jemalloc-allocator",
 ]
 
@@ -159,6 +84,16 @@ assets = [
 		"/usr/bin/",
 		"755",
 	],
+	[
+		"target/release/polkadot-prepare-worker",
+		"/usr/lib/polkadot/",
+		"755"
+	],
+	[
+		"target/release/polkadot-execute-worker",
+		"/usr/lib/polkadot/",
+		"755"
+	],
 	[
 		"scripts/packaging/polkadot.service",
 		"/lib/systemd/system/",
diff --git a/polkadot/README.md b/polkadot/README.md
index 59e0cff015d39c5d3bdbdb83668b81ab019a4112..3c234bb8e3f4d3bed19331047f42c9afa2658053 100644
--- a/polkadot/README.md
+++ b/polkadot/README.md
@@ -1,13 +1,234 @@
-Dear contributors and users,
+# Polkadot
 
-We would like to inform you that we have recently made significant changes to our repository structure. In order to streamline our development process and foster better contributions, we have merged three separate repositories Cumulus, Substrate and Polkadot into a single new repository: [the Polkadot SDK](https://github.com/paritytech/polkadot-sdk). Go ahead and make sure to support us by giving a star ⭐️ to the new repo.
+Implementation of a <https://polkadot.network> node in Rust based on the Substrate framework.
 
-By consolidating our codebase, we aim to enhance collaboration and provide a more efficient platform for future development.
+The README provides information about installing the `polkadot` binary and developing on the codebase. For more specific
+guides, like how to run a validator node, see the [Polkadot Wiki](https://wiki.polkadot.network/docs/getting-started).
 
-If you currently have an open pull request in any of the merged repositories, we kindly request that you resubmit your PR in the new repository. This will ensure that your contributions are considered within the updated context and enable us to review and merge them more effectively.
+## Installation
 
-We appreciate your understanding and ongoing support throughout this transition. Should you have any questions or require further assistance, please don't hesitate to [reach out to us](https://forum.polkadot.network/t/psa-parity-is-currently-working-on-merging-the-polkadot-stack-repositories-into-one-single-repository/2883).
+### Using a pre-compiled binary
 
-Best Regards,
+If you just wish to run a Polkadot node without compiling it yourself, you may either run the latest
+binary from our [releases](https://github.com/paritytech/polkadot-sdk/releases) page, or install
+Polkadot from one of our package repositories.
 
-Parity Technologies
\ No newline at end of file
+### Debian-based (Debian, Ubuntu)
+
+Currently supports Debian 10 (Buster) and Ubuntu 20.04 (Focal), and derivatives. Run the following
+commands as the `root` user.
+
+```bash
+# Import the security@parity.io GPG key
+gpg --recv-keys --keyserver hkps://keys.mailvelope.com 9D4B2B6EB8F97156D19669A9FF0812D491B96798
+gpg --export 9D4B2B6EB8F97156D19669A9FF0812D491B96798 > /usr/share/keyrings/parity.gpg
+# Add the Parity repository and update the package index
+echo 'deb [signed-by=/usr/share/keyrings/parity.gpg] https://releases.parity.io/deb release main' > /etc/apt/sources.list.d/parity.list
+apt update
+# Install the `parity-keyring` package - This will ensure the GPG key
+# used by APT remains up-to-date
+apt install parity-keyring
+# Install polkadot
+apt install polkadot
+
+```
+
+Installation from the Debian repository will create a `systemd` service that can be used to run a
+Polkadot node. This is disabled by default, and can be started by running `systemctl start polkadot`
+on demand (use `systemctl enable polkadot` to make it auto-start after reboot). By default, it will
+run as the `polkadot` user.  Command-line flags passed to the binary can be customized by editing
+`/etc/default/polkadot`. This file will not be overwritten on updating Polkadot. You may also just
+run the node directly from the command-line.
+
+## Building
+
+Since the Polkadot node is based on Substrate, first set up your build environment according to the
+[Substrate installation instructions](https://docs.substrate.io/install/).
+
+### Install via Cargo
+
+Make sure you have the support software installed from the **Build from Source** section below this
+section.
+
+If you want to install Polkadot in your PATH, you can do so with:
+
+```bash
+cargo install --git https://github.com/paritytech/polkadot-sdk --tag <version> polkadot --locked
+```
+
+### Build from Source
+
+Build the client by cloning this repository and running the following commands from the root
+directory of the repo:
+
+```bash
+git checkout <latest tagged release>
+./scripts/init.sh
+cargo build --release
+```
+
+**Note:** if you want to move the built `polkadot` binary somewhere (e.g. into $PATH) you will also
+need to move `polkadot-execute-worker` and `polkadot-prepare-worker`. You can let cargo do all this
+for you by running:
+
+```sh
+cargo install --path . --locked
+```
+
+#### Build from Source with Docker
+
+You can also build from source using [Parity CI docker image](https://github.com/paritytech/scripts/tree/master/dockerfiles/ci-linux):
+
+```bash
+git checkout <latest tagged release>
+docker run --rm -it -w /shellhere/polkadot \
+                    -v $(pwd):/shellhere/polkadot \
+                    paritytech/ci-linux:production cargo build --release
+sudo chown -R $(id -u):$(id -g) target/
+```
+
+If you want to reproduce other steps of CI process you can use the following
+[guide](https://github.com/paritytech/scripts#gitlab-ci-for-building-docker-images).
+
+## Networks
+
+This repo supports runtimes for Polkadot, Kusama, and Westend.
+
+### Connect to Polkadot Mainnet
+
+Connect to the global Polkadot Mainnet network by running:
+
+```bash
+../target/release/polkadot --chain=polkadot
+```
+
+You can see your node on [telemetry] (set a custom name with `--name "my custom name"`).
+
+[telemetry](https://telemetry.polkadot.io/#list/Polkadot): https://telemetry.polkadot.io/#list/Polkadot
+
+### Connect to the "Kusama" Canary Network
+
+Connect to the global Kusama canary network by running:
+
+```bash
+../target/release/polkadot --chain=kusama
+```
+
+You can see your node on [telemetry] (set a custom name with `--name "my custom name"`).
+
+[telemetry](https://telemetry.polkadot.io/#list/Kusama): https://telemetry.polkadot.io/#list/Kusama
+
+### Connect to the Westend Testnet
+
+Connect to the global Westend testnet by running:
+
+```bash
+../target/release/polkadot --chain=westend
+```
+
+You can see your node on [telemetry] (set a custom name with `--name "my custom name"`).
+
+[telemetry](https://telemetry.polkadot.io/#list/Westend): https://telemetry.polkadot.io/#list/Westend
+
+### Obtaining DOTs
+
+If you want to do anything on Polkadot, Kusama, or Westend, then you'll need to get an account and
+some DOT, KSM, or WND tokens, respectively. Follow the
+[instructions](https://wiki.polkadot.network/docs/learn-DOT#obtaining-testnet-tokens) on the Wiki to obtain tokens for
+your testnet of choice.
+
+## Hacking on Polkadot
+
+If you'd actually like to hack on Polkadot, you can grab the source code and build it. Ensure you
+have Rust and the support software installed.
+
+Then, grab the Polkadot source code:
+
+```bash
+git clone https://github.com/paritytech/polkadot-sdk.git
+cd polkadot
+```
+
+Then build the code. You will need to build in release mode (`--release`) to start a network. Only
+use debug mode for development (faster compile times for development and testing).
+
+```bash
+cargo build
+```
+
+You can run the tests if you like:
+
+```bash
+cargo test --workspace --profile testnet
+# Or run only the tests for specified crated
+cargo test -p <crate-name> --profile testnet
+```
+
+You can start a development chain with:
+
+```bash
+cargo run --bin polkadot -- --dev
+```
+
+Detailed logs may be shown by running the node with the following environment variables set:
+
+```bash
+RUST_LOG=debug RUST_BACKTRACE=1 cargo run --bin polkadot -- --dev
+```
+
+### Development
+
+You can run a simple single-node development "network" on your machine by running:
+
+```bash
+cargo run --bin polkadot --release -- --dev
+```
+
+You can muck around by heading to <https://polkadot.js.org/apps> and choose "Local Node" from the
+Settings menu.
+
+### Local Two-node Testnet
+
+If you want to see the multi-node consensus algorithm in action locally, then you can create a local
+testnet. You'll need two terminals open. In one, run:
+
+```bash
+polkadot --dev --alice -d /tmp/alice
+```
+
+And in the other, run:
+
+```bash
+polkadot --dev --bob -d /tmp/bob --bootnodes '/ip4/127.0.0.1/tcp/30333/p2p/ALICE_BOOTNODE_ID_HERE'
+```
+
+Ensure you replace `ALICE_BOOTNODE_ID_HERE` with the node ID from the output of the first terminal.
+
+### Monitoring
+
+[Setup Prometheus and Grafana](https://wiki.polkadot.network/docs/maintain-guides-how-to-monitor-your-node).
+
+Once you set this up you can take a look at the [Polkadot Grafana dashboards](grafana/README.md)
+that we currently maintain.
+
+### Using Docker
+
+[Using Docker](../docs/docker.md)
+
+### Shell Completion
+
+[Shell Completion](doc/shell-completion.md)
+
+## Contributing
+
+### Contributing Guidelines
+
+[Contribution Guidelines](https://github.com/paritytech/polkadot-sdk/blob/master/docs/CONTRIBUTING.md)
+
+### Contributor Code of Conduct
+
+[Code of Conduct](https://github.com/paritytech/polkadot-sdk/blob/master/docs/CODE_OF_CONDUCT.md)
+
+## License
+
+Polkadot is [GPL 3.0 licensed](LICENSE).
diff --git a/polkadot/RELEASE.md b/polkadot/RELEASE.md
deleted file mode 100644
index 937c1e6e515fba0c523fec02b845365934a105fe..0000000000000000000000000000000000000000
--- a/polkadot/RELEASE.md
+++ /dev/null
@@ -1,57 +0,0 @@
-Polkadot Release Process
-------------------------
-
-### Branches
-* release-candidate branch: The branch used for staging of the next release.
-  Named like `release-v0.8.26`
-  
-### Notes
-* The release-candidate branch *must* be made in the paritytech/polkadot repo in
-order for release automation to work correctly
-* Any new pushes/merges to the release-candidate branch (for example,
-refs/heads/release-v0.8.26) will result in the rc index being bumped (e.g., v0.8.26-rc1
-to v0.8.26-rc2) and new wasms built.
-
-### Release workflow
-
-Below are the steps of the release workflow. Steps prefixed with NOACTION are
-automated and require no human action.
-
-1. To initiate the release process:
-  1. branch master off to a release candidate branch:
-  - `git checkout master; git pull; git checkout -b release-v0.8.26`
-  2. In the [substrate](https://github.com/paritytech/substrate) repo, check out the commit used by polkadot (this can be found using the following command in the *polkadot* repo: `grep 'paritytech/substrate' Cargo.lock | grep -E '[0-9a-f]{40}' | sort | uniq `
-  3. Branch off this **substrate** commit into its own branch: `git branch -b polkadot-v0.8.26; git push origin refs/heads/polkadot-v0.8.26`
-  4. In the **polkadot** repository, use [diener](https://github.com/bkchr/diener/) to switch to this branch: `diener update --branch "polkadot-v0.8.26" --substrate`. Update Cargo.lock (to do this, you can run `cargo build` and then ctrl+c once it finishes fetching and begins compiling)
-  5. Push the **polkadot** `release-v0.8.26` branch to Github: `git push origin refs/heads/release-v0.8.26`
-2. NOACTION: The current HEAD of the release-candidate branch is tagged `v0.8.26-rc1`
-3. NOACTION: A draft release and runtime WASMs are created for this
-  release-candidate automatically. A link to the draft release will be linked in
-  the internal polkadot matrix channel.
-4. NOACTION: A new Github issue is created containing a checklist of manual
-  steps to be completed before we are confident with the release. This will be
-  linked in Matrix.
-5. Complete the steps in the issue created in step 4, signing them off as
-  completed
-6. (optional) If a fix is required to the release-candidate:
-  1. Merge the fix with `master` first
-  2. Cherry-pick the commit from `master` to `release-v0.8.26`, fixing any
-  merge conflicts. Try to avoid unnecessarily bumping crates.
-  3. Push the release-candidate branch to Github - this is now the new release-
-  candidate
-  4. Depending on the cherry-picked changes, it may be necessary to perform some
-  or all of the manual tests again.
-  5. If there are **substrate** changes required, these should be cherry-picked to the substrate `polkadot-v0.8.26` branch and pushed, and the version of substrate used in **polkadot** updated using `cargo update -p sp-io`
-7. Once happy with the release-candidate, tag the current top commit in the release candidate branch and push to Github: `git tag -s -m 'v0.8.26' v0.8.26; git push --tags`
-9. NOACTION: The HEAD of the `release` branch will be tagged with `v0.8.26`,
-  and a final draft release will be created on Github.
-
-### Security releases
-
-Occasionally there may be changes that need to be made to the most recently
-released version of Polkadot, without taking *every* change to `master` since
-the last release. For example, in the event of a security vulnerability being
-found, where releasing a fixed version is a matter of some expediency. In cases
-like this, the fix should first be merged with master, cherry-picked to a branch
-forked from `release`, tested, and then finally merged with `release`. A
-sensible versioning scheme for changes like this is `vX.Y.Z-1`.
diff --git a/polkadot/cli/Cargo.toml b/polkadot/cli/Cargo.toml
index d6db9704062f3b339782fa981ba0ace800d735d7..9cad7e88dfe92fd5587b71ffc030ffa56c5cf007 100644
--- a/polkadot/cli/Cargo.toml
+++ b/polkadot/cli/Cargo.toml
@@ -1,7 +1,7 @@
 [package]
 name = "polkadot-cli"
 description = "Polkadot Relay-chain Client Node"
-version.workspace = true
+version = "1.1.0"
 authors.workspace = true
 edition.workspace = true
 license.workspace = true
@@ -15,15 +15,14 @@ wasm-opt = false
 crate-type = ["cdylib", "rlib"]
 
 [dependencies]
-clap = { version = "4.0.9", features = ["derive"], optional = true }
+clap = { version = "4.4.6", features = ["derive"], optional = true }
 log = "0.4.17"
-thiserror = "1.0.31"
+thiserror = "1.0.48"
 futures = "0.3.21"
 pyro = { package = "pyroscope", version = "0.5.3", optional = true }
 pyroscope_pprofrs = { version = "0.2", optional = true }
 
 service = { package = "polkadot-service", path = "../node/service", default-features = false, optional = true }
-polkadot-performance-test = { path = "../node/test/performance-test", optional = true }
 
 sp-core = { path = "../../substrate/primitives/core" }
 sp-io = { path = "../../substrate/primitives/io" }
@@ -34,6 +33,7 @@ try-runtime-cli = { path = "../../substrate/utils/frame/try-runtime/cli", option
 sc-cli = { path = "../../substrate/client/cli", optional = true }
 sc-service = { path = "../../substrate/client/service", optional = true }
 polkadot-node-metrics = { path = "../node/metrics" }
+polkadot-node-primitives = { path = "../node/primitives" }
 sc-tracing = { path = "../../substrate/client/tracing", optional = true }
 sc-sysinfo = { path = "../../substrate/client/sysinfo" }
 sc-executor = { path = "../../substrate/client/executor" }
@@ -55,21 +55,17 @@ cli = [
 	"try-runtime-cli",
 ]
 runtime-benchmarks = [
+	"frame-benchmarking-cli?/runtime-benchmarks",
 	"polkadot-node-metrics/runtime-benchmarks",
-	"polkadot-performance-test?/runtime-benchmarks",
+	"sc-service?/runtime-benchmarks",
 	"service/runtime-benchmarks",
 ]
 full-node = [ "service/full-node" ]
 try-runtime = [ "service/try-runtime", "try-runtime-cli/try-runtime" ]
 fast-runtime = [ "service/fast-runtime" ]
 pyroscope = [ "pyro", "pyroscope_pprofrs" ]
-hostperfcheck = [ "polkadot-performance-test" ]
 
-# Configure the native runtimes to use. Polkadot is enabled by default.
-#
-# Validators require the native runtime currently
-polkadot-native = [ "service/polkadot-native" ]
-kusama-native = [ "service/kusama-native" ]
+# Configure the native runtimes to use.
 westend-native = [ "service/westend-native" ]
 rococo-native = [ "service/rococo-native" ]
 
@@ -78,4 +74,3 @@ runtime-metrics = [
 	"polkadot-node-metrics/runtime-metrics",
 	"service/runtime-metrics",
 ]
-network-protocol-staging = [ "service/network-protocol-staging" ]
diff --git a/polkadot/cli/src/cli.rs b/polkadot/cli/src/cli.rs
index 66205902b79dfd26e2ccb3a615c52c7ad0d72738..bc060c21fba70b55e0652bb853b8e40d50f15a52 100644
--- a/polkadot/cli/src/cli.rs
+++ b/polkadot/cli/src/cli.rs
@@ -16,12 +16,11 @@
 
 //! Polkadot CLI library.
 
+pub use polkadot_node_primitives::NODE_VERSION;
+
 use clap::Parser;
 use std::path::PathBuf;
 
-/// The version of the node. The passed-in version of the workers should match this.
-pub const NODE_VERSION: &'static str = env!("SUBSTRATE_CLI_IMPL_VERSION");
-
 #[allow(missing_docs)]
 #[derive(Debug, Parser)]
 pub enum Subcommand {
@@ -51,10 +50,6 @@ pub enum Subcommand {
 	#[command(subcommand)]
 	Benchmark(frame_benchmarking_cli::BenchmarkCmd),
 
-	/// Runs performance checks such as PVF compilation in order to measure machine
-	/// capabilities of running a validator.
-	HostPerfCheck,
-
 	/// Try-runtime has migrated to a standalone CLI
 	/// (<https://github.com/paritytech/try-runtime-cli>). The subcommand exists as a stub and
 	/// deprecation notice. It will be removed entirely some time after Janurary 2024.
diff --git a/polkadot/cli/src/command.rs b/polkadot/cli/src/command.rs
index a2a00d0ebd3f87939f94a1f22b2201d6e74d683d..11c9014d1d6e3dbd4afd2ea44416bbc3fa436b47 100644
--- a/polkadot/cli/src/command.rs
+++ b/polkadot/cli/src/command.rs
@@ -34,12 +34,6 @@ pub use polkadot_performance_test::PerfCheckError;
 #[cfg(feature = "pyroscope")]
 use pyroscope_pprofrs::{pprof_backend, PprofConfig};
 
-impl From<String> for Error {
-	fn from(s: String) -> Self {
-		Self::Other(s)
-	}
-}
-
 type Result<T> = std::result::Result<T, Error>;
 
 fn get_exec_name() -> Option<String> {
@@ -55,7 +49,8 @@ impl SubstrateCli for Cli {
 	}
 
 	fn impl_version() -> String {
-		NODE_VERSION.into()
+		let commit_hash = env!("SUBSTRATE_CLI_COMMIT_HASH");
+		format!("{NODE_VERSION}-{commit_hash}")
 	}
 
 	fn description() -> String {
@@ -67,7 +62,7 @@ impl SubstrateCli for Cli {
 	}
 
 	fn support_url() -> String {
-		"https://github.com/paritytech/polkadot/issues/new".into()
+		"https://github.com/paritytech/polkadot-sdk/issues/new".into()
 	}
 
 	fn copyright_start_year() -> i32 {
@@ -91,29 +86,20 @@ impl SubstrateCli for Cli {
 		};
 		Ok(match id {
 			"kusama" => Box::new(service::chain_spec::kusama_config()?),
-			#[cfg(feature = "kusama-native")]
-			"kusama-dev" => Box::new(service::chain_spec::kusama_development_config()?),
-			#[cfg(feature = "kusama-native")]
-			"kusama-local" => Box::new(service::chain_spec::kusama_local_testnet_config()?),
-			#[cfg(feature = "kusama-native")]
-			"kusama-staging" => Box::new(service::chain_spec::kusama_staging_testnet_config()?),
-			#[cfg(not(feature = "kusama-native"))]
 			name if name.starts_with("kusama-") && !name.ends_with(".json") =>
-				Err(format!("`{}` only supported with `kusama-native` feature enabled.", name))?,
+				Err(format!("`{name}` is not supported anymore as the kusama native runtime no longer part of the node."))?,
 			"polkadot" => Box::new(service::chain_spec::polkadot_config()?),
-			#[cfg(feature = "polkadot-native")]
-			"polkadot-dev" | "dev" => Box::new(service::chain_spec::polkadot_development_config()?),
-			#[cfg(feature = "polkadot-native")]
-			"polkadot-local" => Box::new(service::chain_spec::polkadot_local_testnet_config()?),
+			name if name.starts_with("polkadot-") && !name.ends_with(".json") =>
+				Err(format!("`{name}` is not supported anymore as the polkadot native runtime no longer part of the node."))?,
 			"rococo" => Box::new(service::chain_spec::rococo_config()?),
 			#[cfg(feature = "rococo-native")]
-			"rococo-dev" => Box::new(service::chain_spec::rococo_development_config()?),
+			"dev" | "rococo-dev" => Box::new(service::chain_spec::rococo_development_config()?),
 			#[cfg(feature = "rococo-native")]
 			"rococo-local" => Box::new(service::chain_spec::rococo_local_testnet_config()?),
 			#[cfg(feature = "rococo-native")]
 			"rococo-staging" => Box::new(service::chain_spec::rococo_staging_testnet_config()?),
 			#[cfg(not(feature = "rococo-native"))]
-			name if name.starts_with("rococo-") && !name.ends_with(".json") =>
+			name if name.starts_with("rococo-") && !name.ends_with(".json") || name == "dev" =>
 				Err(format!("`{}` only supported with `rococo-native` feature enabled.", name))?,
 			"westend" => Box::new(service::chain_spec::westend_config()?),
 			#[cfg(feature = "westend-native")]
@@ -145,7 +131,7 @@ impl SubstrateCli for Cli {
 			path => {
 				let path = std::path::PathBuf::from(path);
 
-				let chain_spec = Box::new(service::PolkadotChainSpec::from_json_file(path.clone())?)
+				let chain_spec = Box::new(service::GenericChainSpec::from_json_file(path.clone())?)
 					as Box<dyn service::ChainSpec>;
 
 				// When `force_*` is given or the file name starts with the name of one of the known
@@ -157,7 +143,7 @@ impl SubstrateCli for Cli {
 				{
 					Box::new(service::RococoChainSpec::from_json_file(path)?)
 				} else if self.run.force_kusama || chain_spec.is_kusama() {
-					Box::new(service::KusamaChainSpec::from_json_file(path)?)
+					Box::new(service::GenericChainSpec::from_json_file(path)?)
 				} else if self.run.force_westend || chain_spec.is_westend() {
 					Box::new(service::WestendChainSpec::from_json_file(path)?)
 				} else {
@@ -181,37 +167,6 @@ fn set_default_ss58_version(spec: &Box<dyn service::ChainSpec>) {
 	sp_core::crypto::set_default_ss58_version(ss58_version);
 }
 
-const DEV_ONLY_ERROR_PATTERN: &'static str =
-	"can only use subcommand with --chain [polkadot-dev, kusama-dev, westend-dev, rococo-dev, wococo-dev], got ";
-
-fn ensure_dev(spec: &Box<dyn service::ChainSpec>) -> std::result::Result<(), String> {
-	if spec.is_dev() {
-		Ok(())
-	} else {
-		Err(format!("{}{}", DEV_ONLY_ERROR_PATTERN, spec.id()))
-	}
-}
-
-/// Runs performance checks.
-/// Should only be used in release build since the check would take too much time otherwise.
-fn host_perf_check() -> Result<()> {
-	#[cfg(not(feature = "hostperfcheck"))]
-	{
-		return Err(Error::FeatureNotEnabled { feature: "hostperfcheck" }.into())
-	}
-
-	#[cfg(all(not(build_type = "release"), feature = "hostperfcheck"))]
-	{
-		return Err(PerfCheckError::WrongBuildType.into())
-	}
-
-	#[cfg(all(feature = "hostperfcheck", build_type = "release"))]
-	{
-		crate::host_perf_check::host_perf_check()?;
-		return Ok(())
-	}
-}
-
 /// Launch a node, accepting arguments just like a regular node,
 /// accepts an alternative overseer generator, to adjust behavior
 /// for integration tests as needed.
@@ -470,8 +425,7 @@ pub fn run() -> Result<()> {
 					cmd.run(client.clone()).map_err(Error::SubstrateCli)
 				}),
 				// These commands are very similar and can be handled in nearly the same way.
-				BenchmarkCmd::Extrinsic(_) | BenchmarkCmd::Overhead(_) => {
-					ensure_dev(chain_spec).map_err(Error::Other)?;
+				BenchmarkCmd::Extrinsic(_) | BenchmarkCmd::Overhead(_) =>
 					runner.sync_run(|mut config| {
 						let (client, _, _, _) = service::new_chain_ops(&mut config, None)?;
 						let header = client.header(client.info().genesis_hash).unwrap().unwrap();
@@ -507,11 +461,9 @@ pub fn run() -> Result<()> {
 								.map_err(Error::SubstrateCli),
 							_ => unreachable!("Ensured by the outside match; qed"),
 						}
-					})
-				},
+					}),
 				BenchmarkCmd::Pallet(cmd) => {
 					set_default_ss58_version(chain_spec);
-					ensure_dev(chain_spec).map_err(Error::Other)?;
 
 					if cfg!(feature = "runtime-benchmarks") {
 						runner.sync_run(|config| {
@@ -537,13 +489,6 @@ pub fn run() -> Result<()> {
 				_ => Err(Error::CommandNotImplemented),
 			}
 		},
-		Some(Subcommand::HostPerfCheck) => {
-			let mut builder = sc_cli::LoggerBuilder::new("");
-			builder.with_colors(true);
-			builder.init()?;
-
-			host_perf_check()
-		},
 		Some(Subcommand::Key(cmd)) => Ok(cmd.run(&cli)?),
 		#[cfg(feature = "try-runtime")]
 		Some(Subcommand::TryRuntime) => Err(try_runtime_cli::DEPRECATION_NOTICE.to_owned().into()),
diff --git a/polkadot/cli/src/error.rs b/polkadot/cli/src/error.rs
index a4591e2508c9796764d09296405bdb05fb834a3c..219289796522e495db1b7170a8efcec9b95a3530 100644
--- a/polkadot/cli/src/error.rs
+++ b/polkadot/cli/src/error.rs
@@ -28,10 +28,6 @@ pub enum Error {
 	#[error(transparent)]
 	SubstrateTracing(#[from] sc_tracing::logging::Error),
 
-	#[error(transparent)]
-	#[cfg(feature = "hostperfcheck")]
-	PerfCheck(#[from] polkadot_performance_test::PerfCheckError),
-
 	#[cfg(not(feature = "pyroscope"))]
 	#[error("Binary was not compiled with `--feature=pyroscope`")]
 	PyroscopeNotCompiledIn,
@@ -58,3 +54,9 @@ pub enum Error {
 	#[error("This subcommand is only available when compiled with `{feature}`")]
 	FeatureNotEnabled { feature: &'static str },
 }
+
+impl From<String> for Error {
+	fn from(s: String) -> Self {
+		Self::Other(s)
+	}
+}
diff --git a/polkadot/cli/src/host_perf_check.rs b/polkadot/cli/src/host_perf_check.rs
deleted file mode 100644
index adfdebce6779bd2d0cd18ad09141bcfa514d2631..0000000000000000000000000000000000000000
--- a/polkadot/cli/src/host_perf_check.rs
+++ /dev/null
@@ -1,74 +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/>.
-
-use log::info;
-use polkadot_performance_test::{
-	measure_erasure_coding, measure_pvf_prepare, PerfCheckError, ERASURE_CODING_N_VALIDATORS,
-	ERASURE_CODING_TIME_LIMIT, PVF_PREPARE_TIME_LIMIT, VALIDATION_CODE_BOMB_LIMIT,
-};
-use std::time::Duration;
-
-pub fn host_perf_check() -> Result<(), PerfCheckError> {
-	let pvf_prepare_time_limit = time_limit_from_baseline(PVF_PREPARE_TIME_LIMIT);
-	let erasure_coding_time_limit = time_limit_from_baseline(ERASURE_CODING_TIME_LIMIT);
-	let wasm_code =
-		polkadot_performance_test::WASM_BINARY.ok_or(PerfCheckError::WasmBinaryMissing)?;
-
-	// Decompress the code before running checks.
-	let code = sp_maybe_compressed_blob::decompress(wasm_code, VALIDATION_CODE_BOMB_LIMIT)
-		.or(Err(PerfCheckError::CodeDecompressionFailed))?;
-
-	info!("Running the performance checks...");
-
-	perf_check("PVF-prepare", pvf_prepare_time_limit, || measure_pvf_prepare(code.as_ref()))?;
-
-	perf_check("Erasure-coding", erasure_coding_time_limit, || {
-		measure_erasure_coding(ERASURE_CODING_N_VALIDATORS, code.as_ref())
-	})?;
-
-	Ok(())
-}
-
-/// Returns a no-warning threshold for the given time limit.
-fn green_threshold(duration: Duration) -> Duration {
-	duration * 4 / 5
-}
-
-/// Returns an extended time limit to be used for the actual check.
-fn time_limit_from_baseline(duration: Duration) -> Duration {
-	duration * 3 / 2
-}
-
-fn perf_check(
-	test_name: &str,
-	time_limit: Duration,
-	test: impl Fn() -> Result<Duration, PerfCheckError>,
-) -> Result<(), PerfCheckError> {
-	let elapsed = test()?;
-
-	if elapsed < green_threshold(time_limit) {
-		info!("🟢 {} performance check passed, elapsed: {:?}", test_name, elapsed);
-		Ok(())
-	} else if elapsed <= time_limit {
-		info!(
-			"🟡 {} performance check passed, {:?} limit almost exceeded, elapsed: {:?}",
-			test_name, time_limit, elapsed
-		);
-		Ok(())
-	} else {
-		Err(PerfCheckError::TimeOut { elapsed, limit: time_limit })
-	}
-}
diff --git a/polkadot/cli/src/lib.rs b/polkadot/cli/src/lib.rs
index 057592fa8a10ea79939b66bad8f6adc2e7476059..35a467146b428e60462ef36f86d65651b03c40ed 100644
--- a/polkadot/cli/src/lib.rs
+++ b/polkadot/cli/src/lib.rs
@@ -24,8 +24,6 @@ mod cli;
 mod command;
 #[cfg(feature = "cli")]
 mod error;
-#[cfg(all(feature = "hostperfcheck", build_type = "release"))]
-mod host_perf_check;
 
 #[cfg(feature = "service")]
 pub use service::{self, Block, CoreApi, IdentifyVariant, ProvideRuntimeApi, TFullClient};
diff --git a/polkadot/core-primitives/Cargo.toml b/polkadot/core-primitives/Cargo.toml
index 0b37414a19d2529fde443b86e24b5b805b253a63..29c6be44454b9429cefa649a72678d8b5d9ad7f2 100644
--- a/polkadot/core-primitives/Cargo.toml
+++ b/polkadot/core-primitives/Cargo.toml
@@ -1,6 +1,6 @@
 [package]
 name = "polkadot-core-primitives"
-version.workspace = true
+version = "1.0.0"
 authors.workspace = true
 edition.workspace = true
 license.workspace = true
@@ -17,7 +17,6 @@ default = [ "std" ]
 std = [
 	"parity-scale-codec/std",
 	"scale-info/std",
-	"scale-info/std",
 	"sp-core/std",
 	"sp-runtime/std",
 	"sp-std/std",
diff --git a/polkadot/core-primitives/src/lib.rs b/polkadot/core-primitives/src/lib.rs
index aa01cf8dfc4594d711d6d233332c412ec37961d2..a74cdef3ad763a552fcb33586eb3e1956006ee47 100644
--- a/polkadot/core-primitives/src/lib.rs
+++ b/polkadot/core-primitives/src/lib.rs
@@ -60,7 +60,7 @@ pub type Hash = sp_core::H256;
 
 /// Unit type wrapper around [`type@Hash`] that represents a candidate hash.
 ///
-/// This type is produced by [`CandidateReceipt::hash`].
+/// This type is produced by `CandidateReceipt::hash`.
 ///
 /// This type makes it easy to enforce that a hash is a candidate hash on the type level.
 #[derive(Clone, Copy, Encode, Decode, Hash, Eq, PartialEq, Default, PartialOrd, Ord, TypeInfo)]
diff --git a/polkadot/doc/release-checklist.md b/polkadot/doc/release-checklist.md
deleted file mode 100644
index 4be7c9bcd5df87e8a183f1bfbea43b83cc754eb0..0000000000000000000000000000000000000000
--- a/polkadot/doc/release-checklist.md
+++ /dev/null
@@ -1,98 +0,0 @@
-
-## Notes
-
-### Burn In
-
-Ensure that Parity DevOps has run the new release on Westend, Kusama, and
-Polkadot validators for at least 12 hours prior to publishing the release.
-
-### Build Artifacts
-
-Add any necessary assets to the release. They should include:
-
-- Linux binary
-- GPG signature of the Linux binary
-- SHA256 of binary
-- Source code
-- Wasm binaries of any runtimes
-
-### Release notes
-
-The release notes should list:
-
-- The priority of the release (i.e., how quickly users should upgrade) - this is
-    based on the max priority of any *client* changes.
-- Which native runtimes and their versions are included
-- The proposal hashes of the runtimes as built with
-    [srtool](https://gitlab.com/chevdor/srtool)
-- Any changes in this release that are still awaiting audit
-
-The release notes may also list:
-
-- Free text at the beginning of the notes mentioning anything important
-    regarding this release
-- Notable changes (those labelled with B[1-9]-* labels) separated into sections
-
-### Spec Version
-
-A runtime upgrade must bump the spec number. This may follow a pattern with the
-client release (e.g. runtime v12 corresponds to v0.8.12, even if the current
-runtime is not v11).
-
-### Old Migrations Removed
-
-Any previous `on_runtime_upgrade` functions from old upgrades must be removed
-to prevent them from executing a second time. The `on_runtime_upgrade` function
-can be found in `runtime/<runtime>/src/lib.rs`.
-
-### New Migrations
-
-Ensure that any migrations that are required due to storage or logic changes
-are included in the `on_runtime_upgrade` function of the appropriate pallets.
-
-### Extrinsic Ordering
-
-Offline signing libraries depend on a consistent ordering of call indices and
-functions. Compare the metadata of the current and new runtimes and ensure that
-the `module index, call index` tuples map to the same set of functions. In case
-of a breaking change, increase `transaction_version`.
-
-To verify the order has not changed, you may manually start the following [Github Action](https://github.com/paritytech/polkadot/actions/workflows/extrinsic-ordering-check-from-bin.yml). It takes around a minute to run and will produce the report as artifact you need to manually check.
-
-The things to look for in the output are lines like:
-  - `[Identity] idx 28 -> 25 (calls 15)` - indicates the index for `Identity` has changed
-  - `[+] Society, Recovery` - indicates the new version includes 2 additional modules/pallets.
-  - If no indices have changed, every modules line should look something like `[Identity] idx 25 (calls 15)`
-
-Note: Adding new functions to the runtime does not constitute a breaking change
-as long as the indexes did not change.
-
-### Proxy Filtering
-
-The runtime contains proxy filters that map proxy types to allowable calls. If
-the new runtime contains any new calls, verify that the proxy filters are up to
-date to include them.
-
-### Benchmarks
-
-There are three benchmarking machines reserved for updating the weights at
-release-time. To initialise a benchmark run for each production runtime
-(westend, kusama, polkadot):
-* Go to https://gitlab.parity.io/parity/polkadot/-/pipelines?page=1&scope=branches&ref=master
-* Click the link to the last pipeline run for master
-* Start each of the manual jobs:
-  * 'update_westend_weights'
-  * 'update_polkadot_weights'
-  * 'update_kusama_weights'
-* When these jobs have completed (it takes a few hours), a git PATCH file will
-    be available to download as an artifact. 
-* On your local machine, branch off master
-* Download the patch file and apply it to your branch with `git patch patchfile.patch`
-* Commit the changes to your branch and submit a PR against master
-* The weights should be (Currently manually) checked to make sure there are no
-    big outliers (i.e., twice or half the weight).
-
-### Polkadot JS
-
-Ensure that a release of [Polkadot JS API]() contains any new types or
-interfaces necessary to interact with the new runtime.
diff --git a/polkadot/doc/shell-completion.md b/polkadot/doc/shell-completion.md
index 9c53cf43a10ff7ddc4f438872a6cdd773a51fff6..9761c153d5be307cfed590f421a12530d34864e3 100644
--- a/polkadot/doc/shell-completion.md
+++ b/polkadot/doc/shell-completion.md
@@ -1,6 +1,7 @@
 # Shell completion
 
-The Polkadot CLI command supports shell auto-completion. For this to work, you will need to run the completion script matching you build and system.
+The Polkadot CLI command supports shell auto-completion. For this to work, you will need to run the completion script
+matching you build and system.
 
 Assuming you built a release version using `cargo build --release` and use `bash` run the following:
 
@@ -30,7 +31,8 @@ source $HOME/.bash_profile
 
 ## Update
 
-When you build a new version of Polkadot, the following will ensure you auto-completion script matches the current binary:
+When you build a new version of Polkadot, the following will ensure you auto-completion script matches the current
+binary:
 
 ```bash
 COMPL_DIR=$HOME/.completion
diff --git a/polkadot/doc/testing.md b/polkadot/doc/testing.md
index 78ad77e0e0fda7230cbe4f7f6a6890ed3362c68f..1045303baf0df1e757cefa374ca2396b99984504 100644
--- a/polkadot/doc/testing.md
+++ b/polkadot/doc/testing.md
@@ -4,7 +4,7 @@ Automated testing is an essential tool to assure correctness.
 
 ## Scopes
 
-The testing strategy for polkadot is 4-fold:
+The testing strategy for Polkadot is 4-fold:
 
 ### Unit testing (1)
 
@@ -16,18 +16,15 @@ There are two variants of integration tests:
 
 #### Subsystem tests (2)
 
-One particular subsystem (subsystem under test) interacts with a
-mocked overseer that is made to assert incoming and outgoing messages
-of the subsystem under test.
-This is largely present today, but has some fragmentation in the evolved
-integration test implementation. A `proc-macro`/`macro_rules` would allow
-for more consistent implementation and structure.
+One particular subsystem (subsystem under test) interacts with a mocked overseer that is made to assert incoming and
+outgoing messages of the subsystem under test. This is largely present today, but has some fragmentation in the evolved
+integration test implementation. A `proc-macro`/`macro_rules` would allow for more consistent implementation and
+structure.
 
 #### Behavior tests (3)
 
-Launching small scale networks, with multiple adversarial nodes without any further tooling required.
-This should include tests around the thresholds in order to evaluate the error handling once certain
-assumed invariants fail.
+Launching small scale networks, with multiple adversarial nodes without any further tooling required. This should
+include tests around the thresholds in order to evaluate the error handling once certain assumed invariants fail.
 
 For this purpose based on `AllSubsystems` and `proc-macro` `AllSubsystemsGen`.
 
@@ -35,18 +32,14 @@ This assumes a simplistic test runtime.
 
 #### Testing at scale (4)
 
-Launching many nodes with configurable network speed and node features in a cluster of nodes.
-At this scale the [Simnet][simnet] comes into play which launches a full cluster of nodes.
-The scale is handled by spawning a kubernetes cluster and the meta description
-is covered by [Gurke][Gurke].
-Asserts are made using Grafana rules, based on the existing prometheus metrics. This can
-be extended by adding an additional service translating `jaeger` spans into addition
-prometheus avoiding additional polkadot source changes.
+Launching many nodes with configurable network speed and node features in a cluster of nodes. At this scale the
+[Simnet][simnet] comes into play which launches a full cluster of nodes. The scale is handled by spawning a kubernetes
+cluster and the meta description is covered by [Gurke][Gurke]. Asserts are made using Grafana rules, based on the
+existing prometheus metrics. This can be extended by adding an additional service translating `jaeger` spans into
+addition prometheus avoiding additional Polkadot source changes.
 
-_Behavior tests_ and _testing at scale_ have naturally soft boundary.
-The most significant difference is the presence of a real network and
-the number of nodes, since a single host often not capable to run
-multiple nodes at once.
+_Behavior tests_ and _testing at scale_ have naturally soft boundary. The most significant difference is the presence of
+a real network and the number of nodes, since a single host often not capable to run multiple nodes at once.
 
 ---
 
@@ -54,8 +47,8 @@ multiple nodes at once.
 
 Coverage gives a _hint_ of the actually covered source lines by tests and test applications.
 
-The state of the art is currently [tarpaulin][tarpaulin] which unfortunately yields a
-lot of false negatives. Lines that are in fact covered, marked as uncovered due to a mere linebreak in a statement can cause these artifacts. This leads to
+The state of the art is currently [tarpaulin][tarpaulin] which unfortunately yields a lot of false negatives. Lines that
+are in fact covered, marked as uncovered due to a mere linebreak in a statement can cause these artifacts. This leads to
 lower coverage percentages than there actually is.
 
 Since late 2020 rust has gained [MIR based coverage tooling](
@@ -97,9 +90,11 @@ The test coverage in `lcov` can the be published to <https://codecov.io>.
 bash <(curl -s https://codecov.io/bash) -f lcov.info
 ```
 
-or just printed as part of the PR using a github action i.e. [`jest-lcov-reporter`](https://github.com/marketplace/actions/jest-lcov-reporter).
+or just printed as part of the PR using a github action i.e.
+[`jest-lcov-reporter`](https://github.com/marketplace/actions/jest-lcov-reporter).
 
-For full examples on how to use [`grcov` /w polkadot specifics see the github repo](https://github.com/mozilla/grcov#coverallscodecov-output).
+For full examples on how to use [`grcov` /w Polkadot specifics see the github
+repo](https://github.com/mozilla/grcov#coverallscodecov-output).
 
 ## Fuzzing
 
@@ -109,11 +104,12 @@ Currently implemented fuzzing targets:
 
 * `erasure-coding`
 
-The tooling of choice here is `honggfuzz-rs` as it allows _fastest_ coverage according to "some paper" which is a positive feature when run as part of PRs.
+The tooling of choice here is `honggfuzz-rs` as it allows _fastest_ coverage according to "some paper" which is a
+positive feature when run as part of PRs.
 
-Fuzzing is generally not applicable for data secured by cryptographic hashes or signatures. Either the input has to be specifically crafted, such that the discarded input
-percentage stays in an acceptable range.
-System level fuzzing is hence simply not feasible due to the amount of state that is required.
+Fuzzing is generally not applicable for data secured by cryptographic hashes or signatures. Either the input has to be
+specifically crafted, such that the discarded input percentage stays in an acceptable range. System level fuzzing is
+hence simply not feasible due to the amount of state that is required.
 
 Other candidates to implement fuzzing are:
 
@@ -128,14 +124,17 @@ There are various ways of performance metrics.
 * cache hits/misses w/ `iai` harness or `criterion-perf`
 * `coz` a performance based compiler
 
-Most of them are standard tools to aid in the creation of statistical tests regarding change in time of certain unit tests.
+Most of them are standard tools to aid in the creation of statistical tests regarding change in time of certain unit
+tests.
 
-`coz` is meant for runtime. In our case, the system is far too large to yield a sufficient number of measurements in finite time.
-An alternative approach could be to record incoming package streams per subsystem and store dumps of them, which in return could be replayed repeatedly at an
-accelerated speed, with which enough metrics could be obtained to yield
-information on which areas would improve the metrics.
-This unfortunately will not yield much information, since most if not all of the subsystem code is linear based on the input to generate one or multiple output messages, it is unlikely to get any useful metrics without mocking a sufficiently large part of the other subsystem which overlaps with [#Integration tests] which is unfortunately not repeatable as of now.
-As such the effort gain seems low and this is not pursued at the current time.
+`coz` is meant for runtime. In our case, the system is far too large to yield a sufficient number of measurements in
+finite time. An alternative approach could be to record incoming package streams per subsystem and store dumps of them,
+which in return could be replayed repeatedly at an accelerated speed, with which enough metrics could be obtained to
+yield information on which areas would improve the metrics. This unfortunately will not yield much information, since
+most if not all of the subsystem code is linear based on the input to generate one or multiple output messages, it is
+unlikely to get any useful metrics without mocking a sufficiently large part of the other subsystem which overlaps with
+[#Integration tests] which is unfortunately not repeatable as of now. As such the effort gain seems low and this is not
+pursued at the current time.
 
 ## Writing small scope integration tests with preconfigured workers
 
@@ -152,29 +151,25 @@ Requirements:
 
 ### Goals
 
-The main goals are is to allow creating a test node which
-exhibits a certain behavior by utilizing a subset of _wrapped_ or _replaced_ subsystems easily.
-The runtime must not matter at all for these tests and should be simplistic.
-The execution must be fast, this mostly means to assure a close to zero network latency as
-well as shorting the block time and epoch times down to a few `100ms` and a few dozend blocks per epoch.
+The main goals are is to allow creating a test node which exhibits a certain behavior by utilizing a subset of _wrapped_
+or _replaced_ subsystems easily. The runtime must not matter at all for these tests and should be simplistic. The
+execution must be fast, this mostly means to assure a close to zero network latency as well as shorting the block time
+and epoch times down to a few `100ms` and a few dozend blocks per epoch.
 
 ### Approach
 
 #### MVP
 
-A simple small scale builder pattern would suffice for stage one implementation of allowing to
-replace individual subsystems.
-An alternative would be to harness the existing `AllSubsystems` type
-and replace the subsystems as needed.
+A simple small scale builder pattern would suffice for stage one implementation of allowing to replace individual
+subsystems. An alternative would be to harness the existing `AllSubsystems` type and replace the subsystems as needed.
 
 #### Full `proc-macro` implementation
 
-`Overseer` is a common pattern.
-It could be extracted as `proc` macro and generative `proc-macro`.
-This would replace the `AllSubsystems` type as well as implicitly create
-the `AllMessages` enum as  `AllSubsystemsGen` does today.
+`Overseer` is a common pattern. It could be extracted as `proc` macro and generative `proc-macro`. This would replace
+the `AllSubsystems` type as well as implicitly create the `AllMessages` enum as  `AllSubsystemsGen` does today.
 
-The implementation is yet to be completed, see the [implementation PR](https://github.com/paritytech/polkadot/pull/2962) for details.
+The implementation is yet to be completed, see the [implementation PR](https://github.com/paritytech/polkadot/pull/2962)
+for details.
 
 ##### Declare an overseer implementation
 
@@ -233,19 +228,16 @@ fn main() -> eyre::Result<()> {
 
 #### Simnet
 
-Spawn a kubernetes cluster based on a meta description using [Gurke] with the
-[Simnet] scripts.
+Spawn a kubernetes cluster based on a meta description using [Gurke] with the [Simnet] scripts.
 
-Coordinated attacks of multiple nodes or subsystems must be made possible via
-a side-channel, that is out of scope for this document.
+Coordinated attacks of multiple nodes or subsystems must be made possible via a side-channel, that is out of scope for
+this document.
 
-The individual node configurations are done as targets with a particular
-builder configuration.
+The individual node configurations are done as targets with a particular builder configuration.
 
 #### Behavior tests w/o Simnet
 
-Commonly this will require multiple nodes, and most machines are limited to
-running two or three nodes concurrently.
+Commonly this will require multiple nodes, and most machines are limited to running two or three nodes concurrently.
 Hence, this is not the common case and is just an implementation _idea_.
 
 ```rust
diff --git a/polkadot/erasure-coding/Cargo.toml b/polkadot/erasure-coding/Cargo.toml
index 867b1c3bf8b70c889130825224317d50167681fd..d07b77ec4ddf5574bf29cef0113c1dc1ebf8b32d 100644
--- a/polkadot/erasure-coding/Cargo.toml
+++ b/polkadot/erasure-coding/Cargo.toml
@@ -1,6 +1,6 @@
 [package]
 name = "polkadot-erasure-coding"
-version.workspace = true
+version = "1.0.0"
 authors.workspace = true
 edition.workspace = true
 license.workspace = true
@@ -12,7 +12,7 @@ novelpoly = { package = "reed-solomon-novelpoly", version = "1.0.0" }
 parity-scale-codec = { version = "3.6.1", default-features = false, features = ["std", "derive"] }
 sp-core = { path = "../../substrate/primitives/core" }
 sp-trie = { path = "../../substrate/primitives/trie" }
-thiserror = "1.0.31"
+thiserror = "1.0.48"
 
 [dev-dependencies]
 criterion = { version = "0.4.0", default-features = false, features = ["cargo_bench_support"] }
diff --git a/polkadot/erasure-coding/benches/README.md b/polkadot/erasure-coding/benches/README.md
index e643643229e882bee30c5a6c727e239a17794c02..94fca5400c610636831c08b5282d6d47f4199878 100644
--- a/polkadot/erasure-coding/benches/README.md
+++ b/polkadot/erasure-coding/benches/README.md
@@ -1,10 +1,10 @@
-### Run benches
+# Run benches
 ```
-$ cd erasure-coding # ensure you are in the right directory
-$ cargo bench
+cd erasure-coding # ensure you are in the right directory
+cargo bench
 ```
 
-### `scaling_with_validators`
+## `scaling_with_validators`
 
 This benchmark evaluates the performance of constructing the chunks and the erasure root from PoV and
 reconstructing the PoV from chunks. You can see the results of running this bench on 5950x below.
diff --git a/polkadot/erasure-coding/fuzzer/Cargo.toml b/polkadot/erasure-coding/fuzzer/Cargo.toml
index 21b579e6752847efdcba870a0571c185d948ee8d..862b148cc5b136528af1bce8df5c5fccb903b0d9 100644
--- a/polkadot/erasure-coding/fuzzer/Cargo.toml
+++ b/polkadot/erasure-coding/fuzzer/Cargo.toml
@@ -1,6 +1,6 @@
 [package]
 name = "erasure_coding_fuzzer"
-version.workspace = true
+version = "1.0.0"
 authors.workspace = true
 edition.workspace = true
 license.workspace = true
diff --git a/polkadot/grafana/README.md b/polkadot/grafana/README.md
index 73c5b6feacf2e1b51f19f991343382089208cd4b..7350001bfa1fcebe367799cc36426522c4cf4f97 100644
--- a/polkadot/grafana/README.md
+++ b/polkadot/grafana/README.md
@@ -1,35 +1,35 @@
 # Do I need this ?
 
-Polkadot nodes collect and produce Prometheus metrics and logs. These include health, performance and debug 
-information such as last finalized block, height of the chain, and many other deeper implementation details 
-of the Polkadot/Substrate node subsystems. These are crucial pieces of information that one needs to successfully 
+Polkadot nodes collect and produce Prometheus metrics and logs. These include health, performance and debug
+information such as last finalized block, height of the chain, and many other deeper implementation details
+of the Polkadot/Substrate node subsystems. These are crucial pieces of information that one needs to successfully
 monitor the liveliness and performance of a network and its validators.
 
 # How does it work ?
 
-Just import the dashboard JSON files from this folder in your Grafana installation. All dashboards are grouped in 
+Just import the dashboard JSON files from this folder in your Grafana installation. All dashboards are grouped in
 folder percategory (like for example `parachains`). The files have been created by Grafana export functionality and
 follow the data model specified [here](https://grafana.com/docs/grafana/latest/dashboards/json-model/).
 
-We aim to keep the dashboards here in sync with the implementation, except dashboards for development and 
+We aim to keep the dashboards here in sync with the implementation, except dashboards for development and
 testing.
 
 # Contributing
 
-**Your contributions are most welcome!** 
+**Your contributions are most welcome!**
 
 Please make sure to follow the following design guidelines:
 - Add a new entry in this file and describe the usecase and key metrics
-- Ensure proper names and descriptions for dashboard panels and add relevant documentation when needed. 
-This is very important as not all users have similar depth of understanding of the implementation 
+- Ensure proper names and descriptions for dashboard panels and add relevant documentation when needed.
+This is very important as not all users have similar depth of understanding of the implementation
 - Have labels for axis
 - All values have proper units of measurement
 - A crisp and clear color scheme is used
 
 # Prerequisites
 
-Before you continue make sure you have Grafana set up, or otherwise follow this 
-[guide](https://wiki.polkadot.network/docs/maintain-guides-how-to-monitor-your-node). 
+Before you continue make sure you have Grafana set up, or otherwise follow this
+[guide](https://wiki.polkadot.network/docs/maintain-guides-how-to-monitor-your-node).
 
 You might also need to [setup Loki](https://grafana.com/go/webinar/loki-getting-started/).
 
@@ -44,7 +44,7 @@ This section is a list of dashboards, their use case as well as the key metrics
 
 ## Node Versions
 
-Useful for monitoring versions and logs of validator nodes. Includes time series panels that 
+Useful for monitoring versions and logs of validator nodes. Includes time series panels that
 track node warning and error log rates. These can be further investigated in Grafana Loki.
 
 Requires Loki for log aggregation and querying.
@@ -64,30 +64,30 @@ It includes panels covering key subsystems of the parachain node side implementa
 - Disputes coordinator
 - Chain selection
 
-It is important to note that this dashboard applies only for validator nodes. The prometheus 
-queries assume the `instance` label value contains the string `validator` only for validator nodes. 
+It is important to note that this dashboard applies only for validator nodes. The prometheus
+queries assume the `instance` label value contains the string `validator` only for validator nodes.
 
 [Dashboard JSON](parachains/status.json)
 
 ### Key liveliness indicators
 - **Relay chain finality lag**. How far behind finality is compared to the current best block. By design,
  GRANDPA never finalizes past last 2 blocks, so this value is always >=2 blocks.
-- **Approval checking finality lag**. The distance (in blocks) between the chain head and the last block 
-on which Approval voting is happening. The block is generally the highest approved ancestor of the head 
+- **Approval checking finality lag**. The distance (in blocks) between the chain head and the last block
+on which Approval voting is happening. The block is generally the highest approved ancestor of the head
 block and the metric is computed during relay chain selection.
-- **Disputes finality lag**. How far behind the chain head is the last approved and non disputed block. 
-This value is always higher than approval checking lag as it further restricts finality to only undisputed 
+- **Disputes finality lag**. How far behind the chain head is the last approved and non disputed block.
+This value is always higher than approval checking lag as it further restricts finality to only undisputed
 chains.
-- **PVF preparation and execution time**. Each parachain has it's own PVF (parachain validation function): 
-a wasm blob that is executed by validators during backing, approval checking and disputing. The PVF 
-preparation time refers to the time it takes for the PVF wasm to be compiled. This step is done once and 
-then result cached. PVF execution will use the resulting artifact to execute the PVF for a given candidate. 
-PVFs are expected to have a limited execution time to ensure there is enough time left for the parachain 
+- **PVF preparation and execution time**. Each parachain has it's own PVF (parachain validation function):
+a wasm blob that is executed by validators during backing, approval checking and disputing. The PVF
+preparation time refers to the time it takes for the PVF wasm to be compiled. This step is done once and
+then result cached. PVF execution will use the resulting artifact to execute the PVF for a given candidate.
+PVFs are expected to have a limited execution time to ensure there is enough time left for the parachain
 block to be included in the relay block.
-- **Time to recover and check candidate**. This is part of approval voting and covers the time it takes 
+- **Time to recover and check candidate**. This is part of approval voting and covers the time it takes
 to recover the candidate block available data from other validators, check it (includes PVF execution time)
 and issue statement or initiate dispute.
-- **Assignment delay tranches**. Approval voting is designed such that validators assigned to check a specific 
-candidate are split up into equal delay tranches (0.5 seconds each). All validators checks are ordered by the delay 
-tranche index. Early tranches of validators have the opportunity to check the candidate first before later tranches 
+- **Assignment delay tranches**. Approval voting is designed such that validators assigned to check a specific
+candidate are split up into equal delay tranches (0.5 seconds each). All validators checks are ordered by the delay
+tranche index. Early tranches of validators have the opportunity to check the candidate first before later tranches
 that act as as backups in case of no shows.
diff --git a/polkadot/node/collation-generation/Cargo.toml b/polkadot/node/collation-generation/Cargo.toml
index 590b5a7114c0150f2fb95237c96e128770273d0b..b110540140f958b0624738c38fde3aad417bc85e 100644
--- a/polkadot/node/collation-generation/Cargo.toml
+++ b/polkadot/node/collation-generation/Cargo.toml
@@ -1,6 +1,6 @@
 [package]
 name = "polkadot-node-collation-generation"
-version.workspace = true
+version = "1.0.0"
 authors.workspace = true
 edition.workspace = true
 license.workspace = true
@@ -15,7 +15,7 @@ polkadot-node-subsystem-util = { path = "../subsystem-util" }
 polkadot-primitives = { path = "../../primitives" }
 sp-core = { path = "../../../substrate/primitives/core" }
 sp-maybe-compressed-blob  = { path = "../../../substrate/primitives/maybe-compressed-blob" }
-thiserror = "1.0.31"
+thiserror = "1.0.48"
 parity-scale-codec = { version = "3.6.1", default-features = false, features = ["bit-vec", "derive"] }
 
 [dev-dependencies]
diff --git a/polkadot/node/collation-generation/src/lib.rs b/polkadot/node/collation-generation/src/lib.rs
index 27779f3d1acbb8bd05a1b3f63f1d7ebdc92bd895..b8c9c1a36e46b9f4b2e7fcc7d40e2ea68ce8cc7e 100644
--- a/polkadot/node/collation-generation/src/lib.rs
+++ b/polkadot/node/collation-generation/src/lib.rs
@@ -43,9 +43,8 @@ use polkadot_node_subsystem::{
 	SubsystemContext, SubsystemError, SubsystemResult,
 };
 use polkadot_node_subsystem_util::{
-	request_availability_cores, request_persisted_validation_data,
-	request_staging_async_backing_params, request_validation_code, request_validation_code_hash,
-	request_validators,
+	request_async_backing_params, request_availability_cores, request_persisted_validation_data,
+	request_validation_code, request_validation_code_hash, request_validators,
 };
 use polkadot_primitives::{
 	collator_signature_payload, CandidateCommitments, CandidateDescriptor, CandidateReceipt,
@@ -194,7 +193,7 @@ async fn handle_new_activations<Context>(
 	metrics: Metrics,
 ) -> crate::error::Result<()> {
 	// follow the procedure from the guide:
-	// https://paritytech.github.io/polkadot/book/node/collators/collation-generation.html
+	// https://paritytech.github.io/polkadot-sdk/book/node/collators/collation-generation.html
 
 	if config.collator.is_none() {
 		return Ok(())
@@ -208,7 +207,7 @@ async fn handle_new_activations<Context>(
 		let (availability_cores, validators, async_backing_params) = join!(
 			request_availability_cores(relay_parent, ctx.sender()).await,
 			request_validators(relay_parent, ctx.sender()).await,
-			request_staging_async_backing_params(relay_parent, ctx.sender()).await,
+			request_async_backing_params(relay_parent, ctx.sender()).await,
 		);
 
 		let availability_cores = availability_cores??;
diff --git a/polkadot/node/collation-generation/src/tests.rs b/polkadot/node/collation-generation/src/tests.rs
index da6b343e6aee4715e9bf45eb1a7b25aa056fca3a..9094f40cca8419b608d451c1dc6f09854f53f07c 100644
--- a/polkadot/node/collation-generation/src/tests.rs
+++ b/polkadot/node/collation-generation/src/tests.rs
@@ -153,7 +153,7 @@ fn requests_availability_per_relay_parent() {
 				}
 				Some(AllMessages::RuntimeApi(RuntimeApiMessage::Request(
 					_hash,
-					RuntimeApiRequest::StagingAsyncBackingParams(
+					RuntimeApiRequest::AsyncBackingParams(
 						tx,
 					),
 				))) => {
@@ -235,7 +235,7 @@ fn requests_validation_data_for_scheduled_matches() {
 				},
 				Some(AllMessages::RuntimeApi(RuntimeApiMessage::Request(
 					_hash,
-					RuntimeApiRequest::StagingAsyncBackingParams(tx),
+					RuntimeApiRequest::AsyncBackingParams(tx),
 				))) => {
 					tx.send(Err(RuntimeApiError::NotSupported {
 						runtime_api_name: "doesnt_matter",
@@ -332,7 +332,7 @@ fn sends_distribute_collation_message() {
 				},
 				Some(AllMessages::RuntimeApi(RuntimeApiMessage::Request(
 					_hash,
-					RuntimeApiRequest::StagingAsyncBackingParams(tx),
+					RuntimeApiRequest::AsyncBackingParams(tx),
 				))) => {
 					tx.send(Err(RuntimeApiError::NotSupported {
 						runtime_api_name: "doesnt_matter",
@@ -494,7 +494,7 @@ fn fallback_when_no_validation_code_hash_api() {
 				},
 				Some(AllMessages::RuntimeApi(RuntimeApiMessage::Request(
 					_hash,
-					RuntimeApiRequest::StagingAsyncBackingParams(tx),
+					RuntimeApiRequest::AsyncBackingParams(tx),
 				))) => {
 					tx.send(Err(RuntimeApiError::NotSupported {
 						runtime_api_name: "doesnt_matter",
diff --git a/polkadot/node/core/approval-voting/Cargo.toml b/polkadot/node/core/approval-voting/Cargo.toml
index 5ae99d44d0a549e087a342d0d49889fca707e847..acad0d1fa4e4f5c6286fde17181d582298ed2922 100644
--- a/polkadot/node/core/approval-voting/Cargo.toml
+++ b/polkadot/node/core/approval-voting/Cargo.toml
@@ -1,6 +1,6 @@
 [package]
 name = "polkadot-node-core-approval-voting"
-version.workspace = true
+version = "1.0.0"
 authors.workspace = true
 edition.workspace = true
 license.workspace = true
@@ -11,12 +11,12 @@ futures-timer = "3.0.2"
 parity-scale-codec = { version = "3.6.1", default-features = false, features = ["bit-vec", "derive"] }
 gum = { package = "tracing-gum", path = "../../gum" }
 bitvec = { version = "1.0.0", default-features = false, features = ["alloc"] }
-lru = "0.11.0"
+schnellru = "0.2.1"
 merlin = "2.0"
 schnorrkel = "0.9.1"
 kvdb = "0.13.0"
 derive_more = "0.99.17"
-thiserror = "1.0.31"
+thiserror = "1.0.48"
 
 polkadot-node-subsystem = { path = "../../subsystem" }
 polkadot-node-subsystem-util = { path = "../../subsystem-util" }
diff --git a/polkadot/node/core/approval-voting/src/import.rs b/polkadot/node/core/approval-voting/src/import.rs
index c504ba71b3c2d801a8f97b3920404a6cc99d7776..df712fc45a53d4cd21266e348247ec7f99ec09b8 100644
--- a/polkadot/node/core/approval-voting/src/import.rs
+++ b/polkadot/node/core/approval-voting/src/import.rs
@@ -598,7 +598,9 @@ pub(crate) mod tests {
 	use polkadot_node_subsystem::messages::{AllMessages, ApprovalVotingMessage};
 	use polkadot_node_subsystem_test_helpers::make_subsystem_context;
 	use polkadot_node_subsystem_util::database::Database;
-	use polkadot_primitives::{Id as ParaId, IndexedVec, SessionInfo, ValidatorId, ValidatorIndex};
+	use polkadot_primitives::{
+		ExecutorParams, Id as ParaId, IndexedVec, SessionInfo, ValidatorId, ValidatorIndex,
+	};
 	pub(crate) use sp_consensus_babe::{
 		digests::{CompatibleDigestItem, PreDigest, SecondaryVRFPreDigest},
 		AllowedSlots, BabeEpochConfiguration, Epoch as BabeEpoch,
@@ -643,7 +645,7 @@ pub(crate) mod tests {
 			blank_state(),
 			RuntimeInfo::new_with_config(RuntimeInfoConfig {
 				keystore: None,
-				session_cache_lru_size: DISPUTE_WINDOW.into(),
+				session_cache_lru_size: DISPUTE_WINDOW.get(),
 			}),
 		)
 	}
@@ -755,7 +757,7 @@ pub(crate) mod tests {
 
 			let mut runtime_info = RuntimeInfo::new_with_config(RuntimeInfoConfig {
 				keystore: None,
-				session_cache_lru_size: DISPUTE_WINDOW.into(),
+				session_cache_lru_size: DISPUTE_WINDOW.get(),
 			});
 
 			let header = header.clone();
@@ -835,6 +837,20 @@ pub(crate) mod tests {
 					si_tx.send(Ok(Some(session_info.clone()))).unwrap();
 				}
 			);
+
+			assert_matches!(
+				handle.recv().await,
+				AllMessages::RuntimeApi(
+					RuntimeApiMessage::Request(
+						req_block_hash,
+						RuntimeApiRequest::SessionExecutorParams(idx, si_tx),
+					)
+				) => {
+					assert_eq!(session, idx);
+					assert_eq!(req_block_hash, hash);
+					si_tx.send(Ok(Some(ExecutorParams::default()))).unwrap();
+				}
+			);
 		});
 
 		futures::executor::block_on(futures::future::join(test_fut, aux_fut));
@@ -878,7 +894,7 @@ pub(crate) mod tests {
 		let test_fut = {
 			let mut runtime_info = RuntimeInfo::new_with_config(RuntimeInfoConfig {
 				keystore: None,
-				session_cache_lru_size: DISPUTE_WINDOW.into(),
+				session_cache_lru_size: DISPUTE_WINDOW.get(),
 			});
 
 			let header = header.clone();
@@ -952,6 +968,20 @@ pub(crate) mod tests {
 					si_tx.send(Ok(Some(session_info.clone()))).unwrap();
 				}
 			);
+
+			assert_matches!(
+				handle.recv().await,
+				AllMessages::RuntimeApi(
+					RuntimeApiMessage::Request(
+						req_block_hash,
+						RuntimeApiRequest::SessionExecutorParams(idx, si_tx),
+					)
+				) => {
+					assert_eq!(session, idx);
+					assert_eq!(req_block_hash, hash);
+					si_tx.send(Ok(Some(ExecutorParams::default()))).unwrap();
+				}
+			);
 		});
 
 		futures::executor::block_on(futures::future::join(test_fut, aux_fut));
@@ -994,7 +1024,7 @@ pub(crate) mod tests {
 		let test_fut = {
 			let mut runtime_info = RuntimeInfo::new_with_config(RuntimeInfoConfig {
 				keystore: None,
-				session_cache_lru_size: DISPUTE_WINDOW.into(),
+				session_cache_lru_size: DISPUTE_WINDOW.get(),
 			});
 
 			let header = header.clone();
@@ -1092,7 +1122,7 @@ pub(crate) mod tests {
 
 			let mut runtime_info = RuntimeInfo::new_with_config(RuntimeInfoConfig {
 				keystore: None,
-				session_cache_lru_size: DISPUTE_WINDOW.into(),
+				session_cache_lru_size: DISPUTE_WINDOW.get(),
 			});
 
 			let header = header.clone();
@@ -1172,6 +1202,20 @@ pub(crate) mod tests {
 					si_tx.send(Ok(Some(session_info.clone()))).unwrap();
 				}
 			);
+
+			assert_matches!(
+				handle.recv().await,
+				AllMessages::RuntimeApi(
+					RuntimeApiMessage::Request(
+						req_block_hash,
+						RuntimeApiRequest::SessionExecutorParams(idx, si_tx),
+					)
+				) => {
+					assert_eq!(session, idx);
+					assert_eq!(req_block_hash, hash);
+					si_tx.send(Ok(Some(ExecutorParams::default()))).unwrap();
+				}
+			);
 		});
 
 		futures::executor::block_on(futures::future::join(test_fut, aux_fut));
@@ -1374,6 +1418,20 @@ pub(crate) mod tests {
 				}
 			);
 
+			assert_matches!(
+				handle.recv().await,
+				AllMessages::RuntimeApi(
+					RuntimeApiMessage::Request(
+						req_block_hash,
+						RuntimeApiRequest::SessionExecutorParams(idx, si_tx),
+					)
+				) => {
+					assert_eq!(session, idx);
+					assert_eq!(req_block_hash, hash);
+					si_tx.send(Ok(Some(ExecutorParams::default()))).unwrap();
+				}
+			);
+
 			assert_matches!(
 				handle.recv().await,
 				AllMessages::ApprovalDistribution(ApprovalDistributionMessage::NewBlocks(
diff --git a/polkadot/node/core/approval-voting/src/lib.rs b/polkadot/node/core/approval-voting/src/lib.rs
index b29e47b4c4354f559ba9daaa0f56e7effdede9a9..ddef736feab7c9cdc5b79e3508efef47e7bf76af 100644
--- a/polkadot/node/core/approval-voting/src/lib.rs
+++ b/polkadot/node/core/approval-voting/src/lib.rs
@@ -45,13 +45,13 @@ use polkadot_node_subsystem_util::{
 	self,
 	database::Database,
 	metrics::{self, prometheus},
-	runtime::{Config as RuntimeInfoConfig, RuntimeInfo},
+	runtime::{Config as RuntimeInfoConfig, ExtendedSessionInfo, RuntimeInfo},
 	TimeoutExt,
 };
 use polkadot_primitives::{
 	ApprovalVote, BlockNumber, CandidateHash, CandidateIndex, CandidateReceipt, DisputeStatement,
-	GroupIndex, Hash, PvfExecTimeoutKind, SessionIndex, SessionInfo, ValidDisputeStatementKind,
-	ValidatorId, ValidatorIndex, ValidatorPair, ValidatorSignature,
+	ExecutorParams, GroupIndex, Hash, PvfExecTimeoutKind, SessionIndex, SessionInfo,
+	ValidDisputeStatementKind, ValidatorId, ValidatorIndex, ValidatorPair, ValidatorSignature,
 };
 use sc_keystore::LocalKeystore;
 use sp_application_crypto::Pair;
@@ -69,11 +69,12 @@ use std::{
 	collections::{
 		btree_map::Entry as BTMEntry, hash_map::Entry as HMEntry, BTreeMap, HashMap, HashSet,
 	},
-	num::NonZeroUsize,
 	sync::Arc,
 	time::Duration,
 };
 
+use schnellru::{ByLength, LruMap};
+
 use approval_checking::RequiredTranches;
 use criteria::{AssignmentCriteria, RealAssignmentCriteria};
 use persisted_entries::{ApprovalEntry, BlockEntry, CandidateEntry};
@@ -102,10 +103,7 @@ const APPROVAL_CHECKING_TIMEOUT: Duration = Duration::from_secs(120);
 /// Value rather arbitrarily: Should not be hit in practice, it exists to more easily diagnose dead
 /// lock issues for example.
 const WAIT_FOR_SIGS_TIMEOUT: Duration = Duration::from_millis(500);
-const APPROVAL_CACHE_SIZE: NonZeroUsize = match NonZeroUsize::new(1024) {
-	Some(cap) => cap,
-	None => panic!("Approval cache size must be non-zero."),
-};
+const APPROVAL_CACHE_SIZE: u32 = 1024;
 
 const TICK_TOO_FAR_IN_FUTURE: Tick = 20; // 10 seconds.
 const APPROVAL_DELAY: Tick = 2;
@@ -627,7 +625,7 @@ impl CurrentlyCheckingSet {
 
 	pub async fn next(
 		&mut self,
-		approvals_cache: &mut lru::LruCache<CandidateHash, ApprovalOutcome>,
+		approvals_cache: &mut LruMap<CandidateHash, ApprovalOutcome>,
 	) -> (HashSet<Hash>, ApprovalState) {
 		if !self.currently_checking.is_empty() {
 			if let Some(approval_state) = self.currently_checking.next().await {
@@ -635,7 +633,8 @@ impl CurrentlyCheckingSet {
 					.candidate_hash_map
 					.remove(&approval_state.candidate_hash)
 					.unwrap_or_default();
-				approvals_cache.put(approval_state.candidate_hash, approval_state.approval_outcome);
+				approvals_cache
+					.insert(approval_state.candidate_hash, approval_state.approval_outcome);
 				return (out, approval_state)
 			}
 		}
@@ -644,12 +643,12 @@ impl CurrentlyCheckingSet {
 	}
 }
 
-async fn get_session_info<'a, Sender>(
+async fn get_extended_session_info<'a, Sender>(
 	runtime_info: &'a mut RuntimeInfo,
 	sender: &mut Sender,
 	relay_parent: Hash,
 	session_index: SessionIndex,
-) -> Option<&'a SessionInfo>
+) -> Option<&'a ExtendedSessionInfo>
 where
 	Sender: SubsystemSender<RuntimeApiMessage>,
 {
@@ -657,19 +656,33 @@ where
 		.get_session_info_by_index(sender, relay_parent, session_index)
 		.await
 	{
-		Ok(extended_info) => Some(&extended_info.session_info),
+		Ok(extended_info) => Some(&extended_info),
 		Err(_) => {
 			gum::debug!(
 				target: LOG_TARGET,
 				session = session_index,
 				?relay_parent,
-				"Can't obtain SessionInfo"
+				"Can't obtain SessionInfo or ExecutorParams"
 			);
 			None
 		},
 	}
 }
 
+async fn get_session_info<'a, Sender>(
+	runtime_info: &'a mut RuntimeInfo,
+	sender: &mut Sender,
+	relay_parent: Hash,
+	session_index: SessionIndex,
+) -> Option<&'a SessionInfo>
+where
+	Sender: SubsystemSender<RuntimeApiMessage>,
+{
+	get_extended_session_info(runtime_info, sender, relay_parent, session_index)
+		.await
+		.map(|extended_info| &extended_info.session_info)
+}
+
 struct State {
 	keystore: Arc<LocalKeystore>,
 	slot_duration_millis: u64,
@@ -747,6 +760,7 @@ enum Action {
 		relay_block_hash: Hash,
 		candidate_index: CandidateIndex,
 		session: SessionIndex,
+		executor_params: ExecutorParams,
 		candidate: CandidateReceipt,
 		backing_group: GroupIndex,
 	},
@@ -782,11 +796,11 @@ where
 	// `None` on start-up. Gets initialized/updated on leaf update
 	let mut session_info_provider = RuntimeInfo::new_with_config(RuntimeInfoConfig {
 		keystore: None,
-		session_cache_lru_size: DISPUTE_WINDOW.into(),
+		session_cache_lru_size: DISPUTE_WINDOW.get(),
 	});
 	let mut wakeups = Wakeups::default();
 	let mut currently_checking_set = CurrentlyCheckingSet::default();
-	let mut approvals_cache = lru::LruCache::new(APPROVAL_CACHE_SIZE);
+	let mut approvals_cache = LruMap::new(ByLength::new(APPROVAL_CACHE_SIZE));
 
 	let mut last_finalized_height: Option<BlockNumber> = {
 		let (tx, rx) = oneshot::channel();
@@ -922,7 +936,7 @@ async fn handle_actions<Context>(
 	metrics: &Metrics,
 	wakeups: &mut Wakeups,
 	currently_checking_set: &mut CurrentlyCheckingSet,
-	approvals_cache: &mut lru::LruCache<CandidateHash, ApprovalOutcome>,
+	approvals_cache: &mut LruMap<CandidateHash, ApprovalOutcome>,
 	mode: &mut Mode,
 	actions: Vec<Action>,
 ) -> SubsystemResult<bool> {
@@ -969,6 +983,7 @@ async fn handle_actions<Context>(
 				relay_block_hash,
 				candidate_index,
 				session,
+				executor_params,
 				candidate,
 				backing_group,
 			} => {
@@ -1009,6 +1024,7 @@ async fn handle_actions<Context>(
 					},
 					None => {
 						let ctx = &mut *ctx;
+
 						currently_checking_set
 							.insert_relay_block_hash(
 								candidate_hash,
@@ -1023,6 +1039,7 @@ async fn handle_actions<Context>(
 										validator_index,
 										block_hash,
 										backing_group,
+										executor_params,
 										&launch_approval_span,
 									)
 									.await
@@ -2329,17 +2346,18 @@ async fn process_wakeup<Context>(
 		_ => return Ok(Vec::new()),
 	};
 
-	let session_info = match get_session_info(
-		session_info_provider,
-		ctx.sender(),
-		block_entry.parent_hash(),
-		block_entry.session(),
-	)
-	.await
-	{
-		Some(i) => i,
-		None => return Ok(Vec::new()),
-	};
+	let ExtendedSessionInfo { ref session_info, ref executor_params, .. } =
+		match get_extended_session_info(
+			session_info_provider,
+			ctx.sender(),
+			block_entry.block_hash(),
+			block_entry.session(),
+		)
+		.await
+		{
+			Some(i) => i,
+			None => return Ok(Vec::new()),
+		};
 
 	let block_tick = slot_number_to_tick(state.slot_duration_millis, block_entry.slot());
 	let no_show_duration = slot_number_to_tick(
@@ -2426,6 +2444,7 @@ async fn process_wakeup<Context>(
 				relay_block_hash: relay_block,
 				candidate_index: i as _,
 				session: block_entry.session(),
+				executor_params: executor_params.clone(),
 				candidate: candidate_receipt,
 				backing_group,
 			});
@@ -2467,6 +2486,7 @@ async fn launch_approval<Context>(
 	validator_index: ValidatorIndex,
 	block_hash: Hash,
 	backing_group: GroupIndex,
+	executor_params: ExecutorParams,
 	span: &jaeger::Span,
 ) -> SubsystemResult<RemoteHandle<ApprovalState>> {
 	let (a_tx, a_rx) = oneshot::channel();
@@ -2612,6 +2632,7 @@ async fn launch_approval<Context>(
 				validation_code,
 				candidate.clone(),
 				available_data.pov,
+				executor_params,
 				PvfExecTimeoutKind::Approval,
 				val_tx,
 			))
diff --git a/polkadot/node/core/approval-voting/src/tests.rs b/polkadot/node/core/approval-voting/src/tests.rs
index f58e60c6a4879f320a850b0058e6aeb07a6d0e68..0b98f28fbbf0439cd0e9eee4aae537a6956a7cab 100644
--- a/polkadot/node/core/approval-voting/src/tests.rs
+++ b/polkadot/node/core/approval-voting/src/tests.rs
@@ -14,6 +14,7 @@
 // You should have received a copy of the GNU General Public License
 // along with Polkadot.  If not, see <http://www.gnu.org/licenses/>.
 
+use self::test_helpers::mock::new_leaf;
 use super::*;
 use polkadot_node_primitives::{
 	approval::{
@@ -26,7 +27,7 @@ use polkadot_node_subsystem::{
 	messages::{
 		AllMessages, ApprovalVotingMessage, AssignmentCheckResult, AvailabilityRecoveryMessage,
 	},
-	ActivatedLeaf, ActiveLeavesUpdate, LeafStatus,
+	ActiveLeavesUpdate,
 };
 use polkadot_node_subsystem_test_helpers as test_helpers;
 use polkadot_node_subsystem_util::TimeoutExt;
@@ -777,12 +778,7 @@ async fn import_block(
 	overseer_send(
 		overseer,
 		FromOrchestra::Signal(OverseerSignal::ActiveLeaves(ActiveLeavesUpdate::start_work(
-			ActivatedLeaf {
-				hash: *new_head,
-				number,
-				status: LeafStatus::Fresh,
-				span: Arc::new(jaeger::Span::Disabled),
-			},
+			new_leaf(*new_head, number),
 		))),
 	)
 	.await;
@@ -910,6 +906,19 @@ async fn import_block(
 					si_tx.send(Ok(Some(session_info.clone()))).unwrap();
 				}
 			);
+			assert_matches!(
+				overseer_recv(overseer).await,
+				AllMessages::RuntimeApi(
+					RuntimeApiMessage::Request(
+						req_block_hash,
+						RuntimeApiRequest::SessionExecutorParams(_, si_tx),
+					)
+				) => {
+					// Make sure all SessionExecutorParams calls are not made for the leaf (but for its relay parent)
+					assert_ne!(req_block_hash, hashes[(number-1) as usize].0);
+					si_tx.send(Ok(Some(ExecutorParams::default()))).unwrap();
+				}
+			);
 		}
 
 		assert_matches!(
@@ -2376,7 +2385,7 @@ async fn handle_double_assignment_import(
 
 	assert_matches!(
 		overseer_recv(virtual_overseer).await,
-		AllMessages::CandidateValidation(CandidateValidationMessage::ValidateFromExhaustive(_, _, _, _, timeout, tx)) if timeout == PvfExecTimeoutKind::Approval => {
+		AllMessages::CandidateValidation(CandidateValidationMessage::ValidateFromExhaustive(_, _, _, _, _, timeout, tx)) if timeout == PvfExecTimeoutKind::Approval => {
 			tx.send(Ok(ValidationResult::Valid(Default::default(), Default::default())))
 				.unwrap();
 		}
diff --git a/polkadot/node/core/av-store/Cargo.toml b/polkadot/node/core/av-store/Cargo.toml
index fc4b3226369dfe423e1a1ca32022786d110c4de2..955fe37d7c39e0cc4a840fe7bdd8e2a98be364db 100644
--- a/polkadot/node/core/av-store/Cargo.toml
+++ b/polkadot/node/core/av-store/Cargo.toml
@@ -1,6 +1,6 @@
 [package]
 name = "polkadot-node-core-av-store"
-version.workspace = true
+version = "1.0.0"
 authors.workspace = true
 edition.workspace = true
 license.workspace = true
@@ -9,7 +9,7 @@ license.workspace = true
 futures = "0.3.21"
 futures-timer = "3.0.2"
 kvdb = "0.13.0"
-thiserror = "1.0.31"
+thiserror = "1.0.48"
 gum = { package = "tracing-gum", path = "../../gum" }
 bitvec = "1.0.0"
 
diff --git a/polkadot/node/core/av-store/src/tests.rs b/polkadot/node/core/av-store/src/tests.rs
index dbccf1401582270cadab9c4078dacc864f31a2d1..652bf2a3fda4822fdae0020bcd48993ed8e771ed 100644
--- a/polkadot/node/core/av-store/src/tests.rs
+++ b/polkadot/node/core/av-store/src/tests.rs
@@ -19,14 +19,14 @@ use super::*;
 use assert_matches::assert_matches;
 use futures::{channel::oneshot, executor, future, Future};
 
+use self::test_helpers::mock::new_leaf;
 use ::test_helpers::TestCandidateBuilder;
 use parking_lot::Mutex;
 use polkadot_node_primitives::{AvailableData, BlockData, PoV, Proof};
 use polkadot_node_subsystem::{
 	errors::RuntimeApiError,
-	jaeger,
 	messages::{AllMessages, RuntimeApiMessage, RuntimeApiRequest},
-	ActivatedLeaf, ActiveLeavesUpdate, LeafStatus,
+	ActiveLeavesUpdate,
 };
 use polkadot_node_subsystem_test_helpers as test_helpers;
 use polkadot_node_subsystem_util::{database::Database, TimeoutExt};
@@ -219,16 +219,11 @@ fn runtime_api_error_does_not_stop_the_subsystem() {
 	let store = test_store();
 
 	test_harness(TestState::default(), store, |mut virtual_overseer| async move {
-		let new_leaf = Hash::repeat_byte(0x01);
+		let a_leaf = Hash::repeat_byte(0x01);
 
 		overseer_signal(
 			&mut virtual_overseer,
-			OverseerSignal::ActiveLeaves(ActiveLeavesUpdate::start_work(ActivatedLeaf {
-				hash: new_leaf,
-				number: 1,
-				status: LeafStatus::Fresh,
-				span: Arc::new(jaeger::Span::Disabled),
-			})),
+			OverseerSignal::ActiveLeaves(ActiveLeavesUpdate::start_work(new_leaf(a_leaf, 1))),
 		)
 		.await;
 
@@ -246,7 +241,7 @@ fn runtime_api_error_does_not_stop_the_subsystem() {
 				relay_parent,
 				tx,
 			)) => {
-				assert_eq!(relay_parent, new_leaf);
+				assert_eq!(relay_parent, a_leaf);
 				tx.send(Ok(Some(header))).unwrap();
 			}
 		);
@@ -258,7 +253,7 @@ fn runtime_api_error_does_not_stop_the_subsystem() {
 				relay_parent,
 				RuntimeApiRequest::CandidateEvents(tx),
 			)) => {
-				assert_eq!(relay_parent, new_leaf);
+				assert_eq!(relay_parent, a_leaf);
 				#[derive(Debug)]
 				struct FauxError;
 				impl std::error::Error for FauxError {}
@@ -741,7 +736,7 @@ fn stored_data_kept_until_finalized() {
 			available_data,
 		);
 
-		let new_leaf = import_leaf(
+		let a_leaf = import_leaf(
 			&mut virtual_overseer,
 			parent,
 			block_number,
@@ -764,7 +759,7 @@ fn stored_data_kept_until_finalized() {
 
 		overseer_signal(
 			&mut virtual_overseer,
-			OverseerSignal::BlockFinalized(new_leaf, block_number),
+			OverseerSignal::BlockFinalized(a_leaf, block_number),
 		)
 		.await;
 
@@ -849,16 +844,11 @@ fn we_dont_miss_anything_if_import_notifications_are_missed() {
 			extrinsics_root: Hash::zero(),
 			digest: Default::default(),
 		};
-		let new_leaf = Hash::repeat_byte(4);
+		let a_leaf = Hash::repeat_byte(4);
 
 		overseer_signal(
 			&mut virtual_overseer,
-			OverseerSignal::ActiveLeaves(ActiveLeavesUpdate::start_work(ActivatedLeaf {
-				hash: new_leaf,
-				number: 4,
-				status: LeafStatus::Fresh,
-				span: Arc::new(jaeger::Span::Disabled),
-			})),
+			OverseerSignal::ActiveLeaves(ActiveLeavesUpdate::start_work(new_leaf(a_leaf, 4))),
 		)
 		.await;
 
@@ -868,7 +858,7 @@ fn we_dont_miss_anything_if_import_notifications_are_missed() {
 				relay_parent,
 				tx,
 			)) => {
-				assert_eq!(relay_parent, new_leaf);
+				assert_eq!(relay_parent, a_leaf);
 				tx.send(Ok(Some(header))).unwrap();
 			}
 		);
@@ -886,7 +876,7 @@ fn we_dont_miss_anything_if_import_notifications_are_missed() {
 				k,
 				response_channel: tx,
 			}) => {
-				assert_eq!(hash, new_leaf);
+				assert_eq!(hash, a_leaf);
 				assert_eq!(k, 2);
 				let _ = tx.send(Ok(vec![
 					Hash::repeat_byte(3),
@@ -1166,16 +1156,11 @@ async fn import_leaf(
 		extrinsics_root: Hash::zero(),
 		digest: Default::default(),
 	};
-	let new_leaf = header.hash();
+	let a_leaf = header.hash();
 
 	overseer_signal(
 		virtual_overseer,
-		OverseerSignal::ActiveLeaves(ActiveLeavesUpdate::start_work(ActivatedLeaf {
-			hash: new_leaf,
-			number: 1,
-			status: LeafStatus::Fresh,
-			span: Arc::new(jaeger::Span::Disabled),
-		})),
+		OverseerSignal::ActiveLeaves(ActiveLeavesUpdate::start_work(new_leaf(a_leaf, 1))),
 	)
 	.await;
 
@@ -1185,7 +1170,7 @@ async fn import_leaf(
 			relay_parent,
 			tx,
 		)) => {
-			assert_eq!(relay_parent, new_leaf);
+			assert_eq!(relay_parent, a_leaf);
 			tx.send(Ok(Some(header))).unwrap();
 		}
 	);
@@ -1196,7 +1181,7 @@ async fn import_leaf(
 			relay_parent,
 			RuntimeApiRequest::CandidateEvents(tx),
 		)) => {
-			assert_eq!(relay_parent, new_leaf);
+			assert_eq!(relay_parent, a_leaf);
 			tx.send(Ok(events)).unwrap();
 		}
 	);
@@ -1212,7 +1197,7 @@ async fn import_leaf(
 		}
 	);
 
-	new_leaf
+	a_leaf
 }
 
 #[test]
diff --git a/polkadot/node/core/backing/Cargo.toml b/polkadot/node/core/backing/Cargo.toml
index cb9fdd88bcc4c665d4cc856484b94d4fdbad6b65..e7e6358e8a46ea546fe1f97d4e01a094db7fce63 100644
--- a/polkadot/node/core/backing/Cargo.toml
+++ b/polkadot/node/core/backing/Cargo.toml
@@ -1,6 +1,6 @@
 [package]
 name = "polkadot-node-core-backing"
-version.workspace = true
+version = "1.0.0"
 authors.workspace = true
 edition.workspace = true
 license.workspace = true
@@ -16,7 +16,7 @@ erasure-coding = { package = "polkadot-erasure-coding", path = "../../../erasure
 statement-table = { package = "polkadot-statement-table", path = "../../../statement-table" }
 bitvec = { version = "1.0.0", default-features = false, features = ["alloc"] }
 gum = { package = "tracing-gum", path = "../../gum" }
-thiserror = "1.0.31"
+thiserror = "1.0.48"
 fatality = "0.0.6"
 
 [dev-dependencies]
diff --git a/polkadot/node/core/backing/src/error.rs b/polkadot/node/core/backing/src/error.rs
index d8f9e82d8f4828f7f65c6910f88065a153e32b16..1b00a62510b7c634b3135a56ca6412c0948ef6a0 100644
--- a/polkadot/node/core/backing/src/error.rs
+++ b/polkadot/node/core/backing/src/error.rs
@@ -79,6 +79,7 @@ pub enum Error {
 	RuntimeApiUnavailable(#[source] oneshot::Canceled),
 
 	#[error("a channel was closed before receipt in try_join!")]
+	#[fatal]
 	JoinMultiple(#[source] oneshot::Canceled),
 
 	#[error("Obtaining erasure chunks failed")]
diff --git a/polkadot/node/core/backing/src/lib.rs b/polkadot/node/core/backing/src/lib.rs
index 58763e6d80cc1ad31ea07cd2cedb0b4d1d9076c2..97efb3ba8089fc9ece8a53b5e8c705dd66c5dd1e 100644
--- a/polkadot/node/core/backing/src/lib.rs
+++ b/polkadot/node/core/backing/src/lib.rs
@@ -80,8 +80,8 @@ use futures::{
 
 use error::{Error, FatalResult};
 use polkadot_node_primitives::{
-	minimum_votes, AvailableData, InvalidCandidate, PoV, SignedFullStatementWithPVD,
-	StatementWithPVD, ValidationResult,
+	AvailableData, InvalidCandidate, PoV, SignedFullStatementWithPVD, StatementWithPVD,
+	ValidationResult,
 };
 use polkadot_node_subsystem::{
 	messages::{
@@ -96,16 +96,18 @@ use polkadot_node_subsystem::{
 use polkadot_node_subsystem_util::{
 	self as util,
 	backing_implicit_view::{FetchError as ImplicitViewFetchError, View as ImplicitView},
-	request_from_runtime, request_session_index_for_child, request_validator_groups,
-	request_validators,
-	runtime::{prospective_parachains_mode, ProspectiveParachainsMode},
+	executor_params_at_relay_parent, request_from_runtime, request_session_index_for_child,
+	request_validator_groups, request_validators,
+	runtime::{
+		self, prospective_parachains_mode, request_min_backing_votes, ProspectiveParachainsMode,
+	},
 	Validator,
 };
 use polkadot_primitives::{
 	BackedCandidate, CandidateCommitments, CandidateHash, CandidateReceipt,
-	CommittedCandidateReceipt, CoreIndex, CoreState, Hash, Id as ParaId, PersistedValidationData,
-	PvfExecTimeoutKind, SigningContext, ValidationCode, ValidatorId, ValidatorIndex,
-	ValidatorSignature, ValidityAttestation,
+	CommittedCandidateReceipt, CoreIndex, CoreState, ExecutorParams, Hash, Id as ParaId,
+	PersistedValidationData, PvfExecTimeoutKind, SigningContext, ValidationCode, ValidatorId,
+	ValidatorIndex, ValidatorSignature, ValidityAttestation,
 };
 use sp_keystore::KeystorePtr;
 use statement_table::{
@@ -219,6 +221,8 @@ struct PerRelayParentState {
 	awaiting_validation: HashSet<CandidateHash>,
 	/// Data needed for retrying in case of `ValidatedCandidateCommand::AttestNoPoV`.
 	fallbacks: HashMap<CandidateHash, AttestingData>,
+	/// The minimum backing votes threshold.
+	minimum_backing_votes: u32,
 }
 
 struct PerCandidateState {
@@ -400,8 +404,8 @@ impl TableContextTrait for TableContext {
 		self.groups.get(group).map_or(false, |g| g.iter().any(|a| a == authority))
 	}
 
-	fn requisite_votes(&self, group: &ParaId) -> usize {
-		self.groups.get(group).map_or(usize::MAX, |g| minimum_votes(g.len()))
+	fn get_group_size(&self, group: &ParaId) -> Option<usize> {
+		self.groups.get(group).map(|g| g.len())
 	}
 }
 
@@ -551,6 +555,7 @@ async fn request_candidate_validation(
 	code: ValidationCode,
 	candidate_receipt: CandidateReceipt,
 	pov: Arc<PoV>,
+	executor_params: ExecutorParams,
 ) -> Result<ValidationResult, Error> {
 	let (tx, rx) = oneshot::channel();
 
@@ -560,6 +565,7 @@ async fn request_candidate_validation(
 			code,
 			candidate_receipt,
 			pov,
+			executor_params,
 			PvfExecTimeoutKind::Backing,
 			tx,
 		))
@@ -626,6 +632,11 @@ async fn validate_and_make_available(
 		}
 	};
 
+	let executor_params = match executor_params_at_relay_parent(relay_parent, &mut sender).await {
+		Ok(ep) => ep,
+		Err(e) => return Err(Error::UtilError(e)),
+	};
+
 	let pov = match pov {
 		PoVData::Ready(pov) => pov,
 		PoVData::FetchFromValidator { from_validator, candidate_hash, pov_hash } =>
@@ -661,6 +672,7 @@ async fn validate_and_make_available(
 			validation_code,
 			candidate.clone(),
 			pov.clone(),
+			executor_params,
 		)
 		.await?
 	};
@@ -965,28 +977,25 @@ async fn construct_per_relay_parent_state<Context>(
 		($x: expr) => {
 			match $x {
 				Ok(x) => x,
-				Err(e) => {
-					gum::warn!(
-						target: LOG_TARGET,
-						err = ?e,
-						"Failed to fetch runtime API data for job",
-					);
+				Err(err) => {
+					// Only bubble up fatal errors.
+					error::log_error(Err(Into::<runtime::Error>::into(err).into()))?;
 
 					// We can't do candidate validation work if we don't have the
 					// requisite runtime API data. But these errors should not take
 					// down the node.
-					return Ok(None);
-				}
+					return Ok(None)
+				},
 			}
-		}
+		};
 	}
 
 	let parent = relay_parent;
 
-	let (validators, groups, session_index, cores) = futures::try_join!(
+	let (session_index, validators, groups, cores) = futures::try_join!(
+		request_session_index_for_child(parent, ctx.sender()).await,
 		request_validators(parent, ctx.sender()).await,
 		request_validator_groups(parent, ctx.sender()).await,
-		request_session_index_for_child(parent, ctx.sender()).await,
 		request_from_runtime(parent, ctx.sender(), |tx| {
 			RuntimeApiRequest::AvailabilityCores(tx)
 		},)
@@ -994,10 +1003,12 @@ async fn construct_per_relay_parent_state<Context>(
 	)
 	.map_err(Error::JoinMultiple)?;
 
+	let session_index = try_runtime_api!(session_index);
 	let validators: Vec<_> = try_runtime_api!(validators);
 	let (validator_groups, group_rotation_info) = try_runtime_api!(groups);
-	let session_index = try_runtime_api!(session_index);
 	let cores = try_runtime_api!(cores);
+	let minimum_backing_votes =
+		try_runtime_api!(request_min_backing_votes(parent, session_index, ctx.sender()).await);
 
 	let signing_context = SigningContext { parent_hash: parent, session_index };
 	let validator =
@@ -1061,6 +1072,7 @@ async fn construct_per_relay_parent_state<Context>(
 		issued_statements: HashSet::new(),
 		awaiting_validation: HashSet::new(),
 		fallbacks: HashMap::new(),
+		minimum_backing_votes,
 	}))
 }
 
@@ -1563,10 +1575,13 @@ async fn post_import_statement_actions<Context>(
 	rp_state: &mut PerRelayParentState,
 	summary: Option<&TableSummary>,
 ) -> Result<(), Error> {
-	if let Some(attested) = summary
-		.as_ref()
-		.and_then(|s| rp_state.table.attested_candidate(&s.candidate, &rp_state.table_context))
-	{
+	if let Some(attested) = summary.as_ref().and_then(|s| {
+		rp_state.table.attested_candidate(
+			&s.candidate,
+			&rp_state.table_context,
+			rp_state.minimum_backing_votes,
+		)
+	}) {
 		let candidate_hash = attested.candidate.hash();
 
 		// `HashSet::insert` returns true if the thing wasn't in there already.
@@ -2009,7 +2024,11 @@ fn handle_get_backed_candidates_message(
 			};
 			rp_state
 				.table
-				.attested_candidate(&candidate_hash, &rp_state.table_context)
+				.attested_candidate(
+					&candidate_hash,
+					&rp_state.table_context,
+					rp_state.minimum_backing_votes,
+				)
 				.and_then(|attested| table_attested_to_backed(attested, &rp_state.table_context))
 		})
 		.collect();
diff --git a/polkadot/node/core/backing/src/tests/mod.rs b/polkadot/node/core/backing/src/tests/mod.rs
index 054337669c07781f85514299e93c9ac8886cc5f5..35d17f3d905e4f342d32cbf195a61cc6feb371fd 100644
--- a/polkadot/node/core/backing/src/tests/mod.rs
+++ b/polkadot/node/core/backing/src/tests/mod.rs
@@ -14,27 +14,27 @@
 // You should have received a copy of the GNU General Public License
 // along with Polkadot.  If not, see <http://www.gnu.org/licenses/>.
 
+use self::test_helpers::mock::new_leaf;
 use super::*;
 use ::test_helpers::{
 	dummy_candidate_receipt_bad_sig, dummy_collator, dummy_collator_signature,
-	dummy_committed_candidate_receipt, dummy_hash,
+	dummy_committed_candidate_receipt, dummy_hash, validator_pubkeys,
 };
 use assert_matches::assert_matches;
 use futures::{future, Future};
 use polkadot_node_primitives::{BlockData, InvalidCandidate, SignedFullStatement, Statement};
 use polkadot_node_subsystem::{
 	errors::RuntimeApiError,
-	jaeger,
 	messages::{
 		AllMessages, CollatorProtocolMessage, RuntimeApiMessage, RuntimeApiRequest,
 		ValidationFailed,
 	},
-	ActivatedLeaf, ActiveLeavesUpdate, FromOrchestra, LeafStatus, OverseerSignal, TimeoutExt,
+	ActiveLeavesUpdate, FromOrchestra, OverseerSignal, TimeoutExt,
 };
 use polkadot_node_subsystem_test_helpers as test_helpers;
 use polkadot_primitives::{
 	CandidateDescriptor, GroupRotationInfo, HeadData, PersistedValidationData, PvfExecTimeoutKind,
-	ScheduledCore, SessionIndex,
+	ScheduledCore, SessionIndex, LEGACY_MIN_BACKING_VOTES,
 };
 use sp_application_crypto::AppCrypto;
 use sp_keyring::Sr25519Keyring;
@@ -48,10 +48,6 @@ mod prospective_parachains;
 const ASYNC_BACKING_DISABLED_ERROR: RuntimeApiError =
 	RuntimeApiError::NotSupported { runtime_api_name: "test-runtime" };
 
-fn validator_pubkeys(val_ids: &[Sr25519Keyring]) -> Vec<ValidatorId> {
-	val_ids.iter().map(|v| v.public().into()).collect()
-}
-
 fn table_statement_to_primitive(statement: TableStatement) -> Statement {
 	match statement {
 		TableStatement::Seconded(committed_candidate_receipt) =>
@@ -80,6 +76,7 @@ struct TestState {
 	head_data: HashMap<ParaId, HeadData>,
 	signing_context: SigningContext,
 	relay_parent: Hash,
+	minimum_backing_votes: u32,
 }
 
 impl TestState {
@@ -150,6 +147,7 @@ impl Default for TestState {
 			validation_data,
 			signing_context,
 			relay_parent,
+			minimum_backing_votes: LEGACY_MIN_BACKING_VOTES,
 		}
 	}
 }
@@ -232,24 +230,29 @@ async fn test_startup(virtual_overseer: &mut VirtualOverseer, test_state: &TestS
 	// Start work on some new parent.
 	virtual_overseer
 		.send(FromOrchestra::Signal(OverseerSignal::ActiveLeaves(ActiveLeavesUpdate::start_work(
-			ActivatedLeaf {
-				hash: test_state.relay_parent,
-				number: 1,
-				status: LeafStatus::Fresh,
-				span: Arc::new(jaeger::Span::Disabled),
-			},
+			new_leaf(test_state.relay_parent, 1),
 		))))
 		.await;
 
 	assert_matches!(
 		virtual_overseer.recv().await,
 		AllMessages::RuntimeApi(
-			RuntimeApiMessage::Request(parent, RuntimeApiRequest::StagingAsyncBackingParams(tx))
+			RuntimeApiMessage::Request(parent, RuntimeApiRequest::AsyncBackingParams(tx))
 		) if parent == test_state.relay_parent => {
 			tx.send(Err(ASYNC_BACKING_DISABLED_ERROR)).unwrap();
 		}
 	);
 
+	// Check that subsystem job issues a request for the session index for child.
+	assert_matches!(
+		virtual_overseer.recv().await,
+		AllMessages::RuntimeApi(
+			RuntimeApiMessage::Request(parent, RuntimeApiRequest::SessionIndexForChild(tx))
+		) if parent == test_state.relay_parent => {
+			tx.send(Ok(test_state.signing_context.session_index)).unwrap();
+		}
+	);
+
 	// Check that subsystem job issues a request for a validator set.
 	assert_matches!(
 		virtual_overseer.recv().await,
@@ -270,23 +273,99 @@ async fn test_startup(virtual_overseer: &mut VirtualOverseer, test_state: &TestS
 		}
 	);
 
-	// Check that subsystem job issues a request for the session index for child.
+	// Check that subsystem job issues a request for the availability cores.
 	assert_matches!(
 		virtual_overseer.recv().await,
 		AllMessages::RuntimeApi(
-			RuntimeApiMessage::Request(parent, RuntimeApiRequest::SessionIndexForChild(tx))
+			RuntimeApiMessage::Request(parent, RuntimeApiRequest::AvailabilityCores(tx))
 		) if parent == test_state.relay_parent => {
-			tx.send(Ok(test_state.signing_context.session_index)).unwrap();
+			tx.send(Ok(test_state.availability_cores.clone())).unwrap();
 		}
 	);
 
-	// Check that subsystem job issues a request for the availability cores.
+	// Check if subsystem job issues a request for the minimum backing votes.
+	assert_matches!(
+		virtual_overseer.recv().await,
+		AllMessages::RuntimeApi(RuntimeApiMessage::Request(
+			parent,
+			RuntimeApiRequest::MinimumBackingVotes(session_index, tx),
+		)) if parent == test_state.relay_parent && session_index == test_state.signing_context.session_index => {
+			tx.send(Ok(test_state.minimum_backing_votes)).unwrap();
+		}
+	);
+}
+
+async fn assert_validation_requests(
+	virtual_overseer: &mut VirtualOverseer,
+	validation_code: ValidationCode,
+) {
 	assert_matches!(
 		virtual_overseer.recv().await,
 		AllMessages::RuntimeApi(
-			RuntimeApiMessage::Request(parent, RuntimeApiRequest::AvailabilityCores(tx))
-		) if parent == test_state.relay_parent => {
-			tx.send(Ok(test_state.availability_cores.clone())).unwrap();
+			RuntimeApiMessage::Request(_, RuntimeApiRequest::ValidationCodeByHash(hash, tx))
+		) if hash == validation_code.hash() => {
+			tx.send(Ok(Some(validation_code))).unwrap();
+		}
+	);
+
+	assert_matches!(
+		virtual_overseer.recv().await,
+		AllMessages::RuntimeApi(
+			RuntimeApiMessage::Request(_, RuntimeApiRequest::SessionIndexForChild(tx))
+		) => {
+			tx.send(Ok(1u32.into())).unwrap();
+		}
+	);
+
+	assert_matches!(
+		virtual_overseer.recv().await,
+		AllMessages::RuntimeApi(
+			RuntimeApiMessage::Request(_, RuntimeApiRequest::SessionExecutorParams(sess_idx, tx))
+		) if sess_idx == 1 => {
+			tx.send(Ok(Some(ExecutorParams::default()))).unwrap();
+		}
+	);
+}
+
+async fn assert_validate_from_exhaustive(
+	virtual_overseer: &mut VirtualOverseer,
+	pvd: &PersistedValidationData,
+	pov: &PoV,
+	validation_code: &ValidationCode,
+	candidate: &CommittedCandidateReceipt,
+	expected_head_data: &HeadData,
+	result_validation_data: PersistedValidationData,
+) {
+	assert_matches!(
+		virtual_overseer.recv().await,
+		AllMessages::CandidateValidation(
+			CandidateValidationMessage::ValidateFromExhaustive(
+				_pvd,
+				_validation_code,
+				candidate_receipt,
+				_pov,
+				_,
+				timeout,
+				tx,
+			),
+		) if _pvd == *pvd &&
+			_validation_code == *validation_code &&
+			*_pov == *pov && &candidate_receipt.descriptor == candidate.descriptor() &&
+			timeout == PvfExecTimeoutKind::Backing &&
+			candidate.commitments.hash() == candidate_receipt.commitments_hash =>
+		{
+			tx.send(Ok(ValidationResult::Valid(
+				CandidateCommitments {
+					head_data: expected_head_data.clone(),
+					horizontal_messages: Default::default(),
+					upward_messages: Default::default(),
+					new_validation_code: None,
+					processed_downward_messages: 0,
+					hrmp_watermark: 0,
+				},
+				result_validation_data,
+			)))
+			.unwrap();
 		}
 	);
 }
@@ -326,46 +405,18 @@ fn backing_second_works() {
 
 		virtual_overseer.send(FromOrchestra::Communication { msg: second }).await;
 
-		assert_matches!(
-			virtual_overseer.recv().await,
-			AllMessages::RuntimeApi(
-				RuntimeApiMessage::Request(_, RuntimeApiRequest::ValidationCodeByHash(hash, tx))
-			) if hash == validation_code.hash() => {
-				tx.send(Ok(Some(validation_code.clone()))).unwrap();
-			}
-		);
+		assert_validation_requests(&mut virtual_overseer, validation_code.clone()).await;
 
-		assert_matches!(
-			virtual_overseer.recv().await,
-			AllMessages::CandidateValidation(
-				CandidateValidationMessage::ValidateFromExhaustive(
-					_pvd,
-					_validation_code,
-					candidate_receipt,
-					_pov,
-					timeout,
-					tx,
-				),
-			) if _pvd == pvd &&
-				_validation_code == validation_code &&
-				*_pov == pov && &candidate_receipt.descriptor == candidate.descriptor() &&
-				timeout == PvfExecTimeoutKind::Backing &&
-				candidate.commitments.hash() == candidate_receipt.commitments_hash =>
-			{
-				tx.send(Ok(ValidationResult::Valid(
-					CandidateCommitments {
-						head_data: expected_head_data.clone(),
-						horizontal_messages: Default::default(),
-						upward_messages: Default::default(),
-						new_validation_code: None,
-						processed_downward_messages: 0,
-						hrmp_watermark: 0,
-					},
-					test_state.validation_data.clone(),
-				)))
-				.unwrap();
-			}
-		);
+		assert_validate_from_exhaustive(
+			&mut virtual_overseer,
+			&pvd,
+			&pov,
+			&validation_code,
+			&candidate,
+			expected_head_data,
+			test_state.validation_data.clone(),
+		)
+		.await;
 
 		assert_matches!(
 			virtual_overseer.recv().await,
@@ -472,14 +523,7 @@ fn backing_works() {
 
 		virtual_overseer.send(FromOrchestra::Communication { msg: statement }).await;
 
-		assert_matches!(
-			virtual_overseer.recv().await,
-			AllMessages::RuntimeApi(
-				RuntimeApiMessage::Request(_, RuntimeApiRequest::ValidationCodeByHash(hash, tx))
-			) if hash == validation_code.hash() => {
-				tx.send(Ok(Some(validation_code.clone()))).unwrap();
-			}
-		);
+		assert_validation_requests(&mut virtual_overseer, validation_code.clone()).await;
 
 		// Sending a `Statement::Seconded` for our assignment will start
 		// validation process. The first thing requested is the PoV.
@@ -506,6 +550,7 @@ fn backing_works() {
 					_validation_code,
 					candidate_receipt,
 					_pov,
+					_,
 					timeout,
 					tx,
 				),
@@ -656,14 +701,7 @@ fn backing_works_while_validation_ongoing() {
 			CandidateBackingMessage::Statement(test_state.relay_parent, signed_a.clone());
 		virtual_overseer.send(FromOrchestra::Communication { msg: statement }).await;
 
-		assert_matches!(
-			virtual_overseer.recv().await,
-			AllMessages::RuntimeApi(
-				RuntimeApiMessage::Request(_, RuntimeApiRequest::ValidationCodeByHash(hash, tx))
-			) if hash == validation_code.hash() => {
-				tx.send(Ok(Some(validation_code.clone()))).unwrap();
-			}
-		);
+		assert_validation_requests(&mut virtual_overseer, validation_code.clone()).await;
 
 		// Sending a `Statement::Seconded` for our assignment will start
 		// validation process. The first thing requested is PoV from the
@@ -691,6 +729,7 @@ fn backing_works_while_validation_ongoing() {
 					_validation_code,
 					candidate_receipt,
 					_pov,
+					_,
 					timeout,
 					tx,
 				),
@@ -828,14 +867,7 @@ fn backing_misbehavior_works() {
 
 		virtual_overseer.send(FromOrchestra::Communication { msg: statement }).await;
 
-		assert_matches!(
-			virtual_overseer.recv().await,
-			AllMessages::RuntimeApi(
-				RuntimeApiMessage::Request(_, RuntimeApiRequest::ValidationCodeByHash(hash, tx))
-			) if hash == validation_code.hash() => {
-				tx.send(Ok(Some(validation_code.clone()))).unwrap();
-			}
-		);
+		assert_validation_requests(&mut virtual_overseer, validation_code.clone()).await;
 
 		assert_matches!(
 			virtual_overseer.recv().await,
@@ -858,6 +890,7 @@ fn backing_misbehavior_works() {
 					_validation_code,
 					candidate_receipt,
 					_pov,
+					_,
 					timeout,
 					tx,
 				),
@@ -1014,14 +1047,7 @@ fn backing_dont_second_invalid() {
 
 		virtual_overseer.send(FromOrchestra::Communication { msg: second }).await;
 
-		assert_matches!(
-			virtual_overseer.recv().await,
-			AllMessages::RuntimeApi(
-				RuntimeApiMessage::Request(_, RuntimeApiRequest::ValidationCodeByHash(hash, tx))
-			) if hash == validation_code_a.hash() => {
-				tx.send(Ok(Some(validation_code_a.clone()))).unwrap();
-			}
-		);
+		assert_validation_requests(&mut virtual_overseer, validation_code_a.clone()).await;
 
 		assert_matches!(
 			virtual_overseer.recv().await,
@@ -1031,6 +1057,7 @@ fn backing_dont_second_invalid() {
 					_validation_code,
 					candidate_receipt,
 					_pov,
+					_,
 					timeout,
 					tx,
 				),
@@ -1060,14 +1087,7 @@ fn backing_dont_second_invalid() {
 
 		virtual_overseer.send(FromOrchestra::Communication { msg: second }).await;
 
-		assert_matches!(
-			virtual_overseer.recv().await,
-			AllMessages::RuntimeApi(
-				RuntimeApiMessage::Request(_, RuntimeApiRequest::ValidationCodeByHash(hash, tx))
-			) if hash == validation_code_b.hash() => {
-				tx.send(Ok(Some(validation_code_b.clone()))).unwrap();
-			}
-		);
+		assert_validation_requests(&mut virtual_overseer, validation_code_b.clone()).await;
 
 		assert_matches!(
 			virtual_overseer.recv().await,
@@ -1077,6 +1097,7 @@ fn backing_dont_second_invalid() {
 					_validation_code,
 					candidate_receipt,
 					_pov,
+					_,
 					timeout,
 					tx,
 				),
@@ -1178,14 +1199,7 @@ fn backing_second_after_first_fails_works() {
 
 		virtual_overseer.send(FromOrchestra::Communication { msg: statement }).await;
 
-		assert_matches!(
-			virtual_overseer.recv().await,
-			AllMessages::RuntimeApi(
-				RuntimeApiMessage::Request(_, RuntimeApiRequest::ValidationCodeByHash(hash, tx))
-			) if hash == validation_code.hash() => {
-				tx.send(Ok(Some(validation_code.clone()))).unwrap();
-			}
-		);
+		assert_validation_requests(&mut virtual_overseer, validation_code.clone()).await;
 
 		// Subsystem requests PoV and requests validation.
 		assert_matches!(
@@ -1210,6 +1224,7 @@ fn backing_second_after_first_fails_works() {
 					_validation_code,
 					candidate_receipt,
 					_pov,
+					_,
 					timeout,
 					tx,
 				),
@@ -1267,14 +1282,7 @@ fn backing_second_after_first_fails_works() {
 		// triggered on the prev step.
 		virtual_overseer.send(FromOrchestra::Communication { msg: second }).await;
 
-		assert_matches!(
-			virtual_overseer.recv().await,
-			AllMessages::RuntimeApi(
-				RuntimeApiMessage::Request(_, RuntimeApiRequest::ValidationCodeByHash(hash, tx))
-			) if hash == validation_code_to_second.hash() => {
-				tx.send(Ok(Some(validation_code_to_second.clone()))).unwrap();
-			}
-		);
+		assert_validation_requests(&mut virtual_overseer, validation_code_to_second.clone()).await;
 
 		assert_matches!(
 			virtual_overseer.recv().await,
@@ -1335,14 +1343,7 @@ fn backing_works_after_failed_validation() {
 
 		virtual_overseer.send(FromOrchestra::Communication { msg: statement }).await;
 
-		assert_matches!(
-			virtual_overseer.recv().await,
-			AllMessages::RuntimeApi(
-				RuntimeApiMessage::Request(_, RuntimeApiRequest::ValidationCodeByHash(hash, tx))
-			) if hash == validation_code.hash() => {
-				tx.send(Ok(Some(validation_code.clone()))).unwrap();
-			}
-		);
+		assert_validation_requests(&mut virtual_overseer, validation_code.clone()).await;
 
 		// Subsystem requests PoV and requests validation.
 		assert_matches!(
@@ -1367,6 +1368,7 @@ fn backing_works_after_failed_validation() {
 					_validation_code,
 					candidate_receipt,
 					_pov,
+					_,
 					timeout,
 					tx,
 				),
@@ -1544,14 +1546,7 @@ fn retry_works() {
 			CandidateBackingMessage::Statement(test_state.relay_parent, signed_a.clone());
 		virtual_overseer.send(FromOrchestra::Communication { msg: statement }).await;
 
-		assert_matches!(
-			virtual_overseer.recv().await,
-			AllMessages::RuntimeApi(
-				RuntimeApiMessage::Request(_, RuntimeApiRequest::ValidationCodeByHash(hash, tx))
-			) if hash == validation_code.hash() => {
-				tx.send(Ok(Some(validation_code.clone()))).unwrap();
-			}
-		);
+		assert_validation_requests(&mut virtual_overseer, validation_code.clone()).await;
 
 		// Subsystem requests PoV and requests validation.
 		// We cancel - should mean retry on next backing statement.
@@ -1573,7 +1568,7 @@ fn retry_works() {
 		virtual_overseer.send(FromOrchestra::Communication { msg: statement }).await;
 
 		// Not deterministic which message comes first:
-		for _ in 0u32..3 {
+		for _ in 0u32..5 {
 			match virtual_overseer.recv().await {
 				AllMessages::Provisioner(ProvisionerMessage::ProvisionableData(
 					_,
@@ -1592,6 +1587,18 @@ fn retry_works() {
 				)) if hash == validation_code.hash() => {
 					tx.send(Ok(Some(validation_code.clone()))).unwrap();
 				},
+				AllMessages::RuntimeApi(RuntimeApiMessage::Request(
+					_,
+					RuntimeApiRequest::SessionIndexForChild(tx),
+				)) => {
+					tx.send(Ok(1u32.into())).unwrap();
+				},
+				AllMessages::RuntimeApi(RuntimeApiMessage::Request(
+					_,
+					RuntimeApiRequest::SessionExecutorParams(1, tx),
+				)) => {
+					tx.send(Ok(Some(ExecutorParams::default()))).unwrap();
+				},
 				msg => {
 					assert!(false, "Unexpected message: {:?}", msg);
 				},
@@ -1602,14 +1609,7 @@ fn retry_works() {
 			CandidateBackingMessage::Statement(test_state.relay_parent, signed_c.clone());
 		virtual_overseer.send(FromOrchestra::Communication { msg: statement }).await;
 
-		assert_matches!(
-			virtual_overseer.recv().await,
-			AllMessages::RuntimeApi(
-				RuntimeApiMessage::Request(_, RuntimeApiRequest::ValidationCodeByHash(hash, tx))
-			) if hash == validation_code.hash() => {
-				tx.send(Ok(Some(validation_code.clone()))).unwrap();
-			}
-		);
+		assert_validation_requests(&mut virtual_overseer, validation_code.clone()).await;
 
 		assert_matches!(
 			virtual_overseer.recv().await,
@@ -1634,6 +1634,7 @@ fn retry_works() {
 					_validation_code,
 					candidate_receipt,
 					_pov,
+					_,
 					timeout,
 					..
 				),
@@ -1799,46 +1800,18 @@ fn cannot_second_multiple_candidates_per_parent() {
 
 		virtual_overseer.send(FromOrchestra::Communication { msg: second }).await;
 
-		assert_matches!(
-			virtual_overseer.recv().await,
-			AllMessages::RuntimeApi(
-				RuntimeApiMessage::Request(_, RuntimeApiRequest::ValidationCodeByHash(hash, tx))
-			) if hash == validation_code.hash() => {
-				tx.send(Ok(Some(validation_code.clone()))).unwrap();
-			}
-		);
+		assert_validation_requests(&mut virtual_overseer, validation_code.clone()).await;
 
-		assert_matches!(
-			virtual_overseer.recv().await,
-			AllMessages::CandidateValidation(
-				CandidateValidationMessage::ValidateFromExhaustive(
-					_pvd,
-					_validation_code,
-					candidate_receipt,
-					_pov,
-					timeout,
-					tx,
-				),
-			) if _pvd == pvd &&
-				_validation_code == validation_code &&
-				*_pov == pov && &candidate_receipt.descriptor == candidate.descriptor() &&
-				timeout == PvfExecTimeoutKind::Backing &&
-				candidate.commitments.hash() == candidate_receipt.commitments_hash =>
-			{
-				tx.send(Ok(ValidationResult::Valid(
-					CandidateCommitments {
-						head_data: expected_head_data.clone(),
-						horizontal_messages: Default::default(),
-						upward_messages: Default::default(),
-						new_validation_code: None,
-						processed_downward_messages: 0,
-						hrmp_watermark: 0,
-					},
-					test_state.validation_data.clone(),
-				)))
-				.unwrap();
-			}
-		);
+		assert_validate_from_exhaustive(
+			&mut virtual_overseer,
+			&pvd,
+			&pov,
+			&validation_code,
+			&candidate,
+			expected_head_data,
+			test_state.validation_data.clone(),
+		)
+		.await;
 
 		assert_matches!(
 			virtual_overseer.recv().await,
@@ -1885,14 +1858,7 @@ fn cannot_second_multiple_candidates_per_parent() {
 		virtual_overseer.send(FromOrchestra::Communication { msg: second }).await;
 
 		// The validation is still requested.
-		assert_matches!(
-			virtual_overseer.recv().await,
-			AllMessages::RuntimeApi(
-				RuntimeApiMessage::Request(_, RuntimeApiRequest::ValidationCodeByHash(hash, tx))
-			) if hash == validation_code.hash() => {
-				tx.send(Ok(Some(validation_code.clone()))).unwrap();
-			}
-		);
+		assert_validation_requests(&mut virtual_overseer, validation_code.clone()).await;
 
 		assert_matches!(
 			virtual_overseer.recv().await,
diff --git a/polkadot/node/core/backing/src/tests/prospective_parachains.rs b/polkadot/node/core/backing/src/tests/prospective_parachains.rs
index 7c2773c8e3b6b1a4c6af62ef44af7edb95d1e498..b79515ed37a6ef590680fb834402f6ed3bef73be 100644
--- a/polkadot/node/core/backing/src/tests/prospective_parachains.rs
+++ b/polkadot/node/core/backing/src/tests/prospective_parachains.rs
@@ -1,4 +1,4 @@
-// Copyright 2022 Parity Technologies (UK) Ltd.
+// Copyright (C) Parity Technologies (UK) Ltd.
 // This file is part of Polkadot.
 
 // Polkadot is free software: you can redistribute it and/or modify
@@ -18,14 +18,14 @@
 
 use polkadot_node_subsystem::{
 	messages::{ChainApiMessage, FragmentTreeMembership},
-	TimeoutExt,
+	ActivatedLeaf, TimeoutExt,
 };
-use polkadot_primitives::{vstaging as vstaging_primitives, BlockNumber, Header, OccupiedCore};
+use polkadot_primitives::{AsyncBackingParams, BlockNumber, Header, OccupiedCore};
 
 use super::*;
 
-const ASYNC_BACKING_PARAMETERS: vstaging_primitives::AsyncBackingParams =
-	vstaging_primitives::AsyncBackingParams { max_candidate_depth: 4, allowed_ancestry_len: 3 };
+const ASYNC_BACKING_PARAMETERS: AsyncBackingParams =
+	AsyncBackingParams { max_candidate_depth: 4, allowed_ancestry_len: 3 };
 
 struct TestLeaf {
 	activated: ActivatedLeaf,
@@ -56,7 +56,7 @@ async fn activate_leaf(
 	assert_matches!(
 		virtual_overseer.recv().await,
 		AllMessages::RuntimeApi(
-			RuntimeApiMessage::Request(parent, RuntimeApiRequest::StagingAsyncBackingParams(tx))
+			RuntimeApiMessage::Request(parent, RuntimeApiRequest::AsyncBackingParams(tx))
 		) if parent == leaf_hash => {
 			tx.send(Ok(ASYNC_BACKING_PARAMETERS)).unwrap();
 		}
@@ -138,13 +138,24 @@ async fn activate_leaf(
 	}
 
 	for (hash, number) in ancestry_iter.take(requested_len) {
-		// Check that subsystem job issues a request for a validator set.
 		let msg = match next_overseer_message.take() {
 			Some(msg) => msg,
 			None => virtual_overseer.recv().await,
 		};
+
+		// Check that subsystem job issues a request for the session index for child.
 		assert_matches!(
 			msg,
+			AllMessages::RuntimeApi(
+				RuntimeApiMessage::Request(parent, RuntimeApiRequest::SessionIndexForChild(tx))
+			) if parent == hash => {
+				tx.send(Ok(test_state.signing_context.session_index)).unwrap();
+			}
+		);
+
+		// Check that subsystem job issues a request for a validator set.
+		assert_matches!(
+			virtual_overseer.recv().await,
 			AllMessages::RuntimeApi(
 				RuntimeApiMessage::Request(parent, RuntimeApiRequest::Validators(tx))
 			) if parent == hash => {
@@ -164,23 +175,24 @@ async fn activate_leaf(
 			}
 		);
 
-		// Check that subsystem job issues a request for the session index for child.
+		// Check that subsystem job issues a request for the availability cores.
 		assert_matches!(
 			virtual_overseer.recv().await,
 			AllMessages::RuntimeApi(
-				RuntimeApiMessage::Request(parent, RuntimeApiRequest::SessionIndexForChild(tx))
+				RuntimeApiMessage::Request(parent, RuntimeApiRequest::AvailabilityCores(tx))
 			) if parent == hash => {
-				tx.send(Ok(test_state.signing_context.session_index)).unwrap();
+				tx.send(Ok(test_state.availability_cores.clone())).unwrap();
 			}
 		);
 
-		// Check that subsystem job issues a request for the availability cores.
+		// Check if subsystem job issues a request for the minimum backing votes.
 		assert_matches!(
 			virtual_overseer.recv().await,
-			AllMessages::RuntimeApi(
-				RuntimeApiMessage::Request(parent, RuntimeApiRequest::AvailabilityCores(tx))
-			) if parent == hash => {
-				tx.send(Ok(test_state.availability_cores.clone())).unwrap();
+			AllMessages::RuntimeApi(RuntimeApiMessage::Request(
+				parent,
+				RuntimeApiRequest::MinimumBackingVotes(session_index, tx),
+			)) if parent == hash && session_index == test_state.signing_context.session_index => {
+				tx.send(Ok(test_state.minimum_backing_votes)).unwrap();
 			}
 		);
 	}
@@ -196,14 +208,7 @@ async fn assert_validate_seconded_candidate(
 	expected_head_data: &HeadData,
 	fetch_pov: bool,
 ) {
-	assert_matches!(
-		virtual_overseer.recv().await,
-		AllMessages::RuntimeApi(
-			RuntimeApiMessage::Request(parent, RuntimeApiRequest::ValidationCodeByHash(hash, tx))
-		) if parent == relay_parent && hash == validation_code.hash() => {
-			tx.send(Ok(Some(validation_code.clone()))).unwrap();
-		}
-	);
+	assert_validation_requests(virtual_overseer, validation_code.clone()).await;
 
 	if fetch_pov {
 		assert_matches!(
@@ -227,6 +232,7 @@ async fn assert_validate_seconded_candidate(
 			_validation_code,
 			candidate_receipt,
 			_pov,
+			_,
 			timeout,
 			tx,
 		)) if &_pvd == pvd &&
@@ -315,12 +321,7 @@ fn seconding_sanity_check_allowed() {
 		// `a` is grandparent of `b`.
 		let leaf_a_hash = Hash::from_low_u64_be(130);
 		let leaf_a_parent = get_parent_hash(leaf_a_hash);
-		let activated = ActivatedLeaf {
-			hash: leaf_a_hash,
-			number: LEAF_A_BLOCK_NUMBER,
-			status: LeafStatus::Fresh,
-			span: Arc::new(jaeger::Span::Disabled),
-		};
+		let activated = new_leaf(leaf_a_hash, LEAF_A_BLOCK_NUMBER);
 		let min_relay_parents = vec![(para_id, LEAF_A_BLOCK_NUMBER - LEAF_A_ANCESTRY_LEN)];
 		let test_leaf_a = TestLeaf { activated, min_relay_parents };
 
@@ -328,12 +329,7 @@ fn seconding_sanity_check_allowed() {
 		const LEAF_B_ANCESTRY_LEN: BlockNumber = 4;
 
 		let leaf_b_hash = Hash::from_low_u64_be(128);
-		let activated = ActivatedLeaf {
-			hash: leaf_b_hash,
-			number: LEAF_B_BLOCK_NUMBER,
-			status: LeafStatus::Fresh,
-			span: Arc::new(jaeger::Span::Disabled),
-		};
+		let activated = new_leaf(leaf_b_hash, LEAF_B_BLOCK_NUMBER);
 		let min_relay_parents = vec![(para_id, LEAF_B_BLOCK_NUMBER - LEAF_B_ANCESTRY_LEN)];
 		let test_leaf_b = TestLeaf { activated, min_relay_parents };
 
@@ -472,24 +468,14 @@ fn seconding_sanity_check_disallowed() {
 		// `a` is grandparent of `b`.
 		let leaf_a_hash = Hash::from_low_u64_be(130);
 		let leaf_a_parent = get_parent_hash(leaf_a_hash);
-		let activated = ActivatedLeaf {
-			hash: leaf_a_hash,
-			number: LEAF_A_BLOCK_NUMBER,
-			status: LeafStatus::Fresh,
-			span: Arc::new(jaeger::Span::Disabled),
-		};
+		let activated = new_leaf(leaf_a_hash, LEAF_A_BLOCK_NUMBER);
 		let min_relay_parents = vec![(para_id, LEAF_A_BLOCK_NUMBER - LEAF_A_ANCESTRY_LEN)];
 		let test_leaf_a = TestLeaf { activated, min_relay_parents };
 
 		const LEAF_B_BLOCK_NUMBER: BlockNumber = LEAF_A_BLOCK_NUMBER + 2;
 		const LEAF_B_ANCESTRY_LEN: BlockNumber = 4;
 
-		let activated = ActivatedLeaf {
-			hash: leaf_b_hash,
-			number: LEAF_B_BLOCK_NUMBER,
-			status: LeafStatus::Fresh,
-			span: Arc::new(jaeger::Span::Disabled),
-		};
+		let activated = new_leaf(leaf_b_hash, LEAF_B_BLOCK_NUMBER);
 		let min_relay_parents = vec![(para_id, LEAF_B_BLOCK_NUMBER - LEAF_B_ANCESTRY_LEN)];
 		let test_leaf_b = TestLeaf { activated, min_relay_parents };
 
@@ -691,12 +677,7 @@ fn prospective_parachains_reject_candidate() {
 
 		let leaf_a_hash = Hash::from_low_u64_be(130);
 		let leaf_a_parent = get_parent_hash(leaf_a_hash);
-		let activated = ActivatedLeaf {
-			hash: leaf_a_hash,
-			number: LEAF_A_BLOCK_NUMBER,
-			status: LeafStatus::Fresh,
-			span: Arc::new(jaeger::Span::Disabled),
-		};
+		let activated = new_leaf(leaf_a_hash, LEAF_A_BLOCK_NUMBER);
 		let min_relay_parents = vec![(para_id, LEAF_A_BLOCK_NUMBER - LEAF_A_ANCESTRY_LEN)];
 		let test_leaf_a = TestLeaf { activated, min_relay_parents };
 
@@ -874,12 +855,7 @@ fn second_multiple_candidates_per_relay_parent() {
 		let leaf_hash = Hash::from_low_u64_be(130);
 		let leaf_parent = get_parent_hash(leaf_hash);
 		let leaf_grandparent = get_parent_hash(leaf_parent);
-		let activated = ActivatedLeaf {
-			hash: leaf_hash,
-			number: LEAF_BLOCK_NUMBER,
-			status: LeafStatus::Fresh,
-			span: Arc::new(jaeger::Span::Disabled),
-		};
+		let activated = new_leaf(leaf_hash, LEAF_BLOCK_NUMBER);
 		let min_relay_parents = vec![(para_id, LEAF_BLOCK_NUMBER - LEAF_ANCESTRY_LEN)];
 		let test_leaf_a = TestLeaf { activated, min_relay_parents };
 
@@ -1015,12 +991,7 @@ fn backing_works() {
 
 		let leaf_hash = Hash::from_low_u64_be(130);
 		let leaf_parent = get_parent_hash(leaf_hash);
-		let activated = ActivatedLeaf {
-			hash: leaf_hash,
-			number: LEAF_BLOCK_NUMBER,
-			status: LeafStatus::Fresh,
-			span: Arc::new(jaeger::Span::Disabled),
-		};
+		let activated = new_leaf(leaf_hash, LEAF_BLOCK_NUMBER);
 		let min_relay_parents = vec![(para_id, LEAF_BLOCK_NUMBER - LEAF_ANCESTRY_LEN)];
 		let test_leaf_a = TestLeaf { activated, min_relay_parents };
 
@@ -1181,12 +1152,7 @@ fn concurrent_dependent_candidates() {
 		let leaf_hash = Hash::from_low_u64_be(130);
 		let leaf_parent = get_parent_hash(leaf_hash);
 		let leaf_grandparent = get_parent_hash(leaf_parent);
-		let activated = ActivatedLeaf {
-			hash: leaf_hash,
-			number: LEAF_BLOCK_NUMBER,
-			status: LeafStatus::Fresh,
-			span: Arc::new(jaeger::Span::Disabled),
-		};
+		let activated = new_leaf(leaf_hash, LEAF_BLOCK_NUMBER);
 		let min_relay_parents = vec![(para_id, LEAF_BLOCK_NUMBER - LEAF_ANCESTRY_LEN)];
 		let test_leaf_a = TestLeaf { activated, min_relay_parents };
 
@@ -1327,7 +1293,7 @@ fn concurrent_dependent_candidates() {
 					tx.send(pov.clone()).unwrap();
 				},
 				AllMessages::CandidateValidation(
-					CandidateValidationMessage::ValidateFromExhaustive(.., candidate, _, _, tx),
+					CandidateValidationMessage::ValidateFromExhaustive(.., candidate, _, _, _, tx),
 				) => {
 					let candidate_hash = candidate.hash();
 					let (head_data, pvd) = if candidate_hash == candidate_a_hash {
@@ -1384,6 +1350,20 @@ fn concurrent_dependent_candidates() {
 						break
 					}
 				},
+				AllMessages::RuntimeApi(RuntimeApiMessage::Request(
+					_,
+					RuntimeApiRequest::SessionIndexForChild(tx),
+				)) => {
+					tx.send(Ok(1u32.into())).unwrap();
+				},
+				AllMessages::RuntimeApi(RuntimeApiMessage::Request(
+					_,
+					RuntimeApiRequest::SessionExecutorParams(sess_idx, tx),
+				)) => {
+					assert_eq!(sess_idx, 1);
+					tx.send(Ok(Some(ExecutorParams::default()))).unwrap();
+				},
+
 				_ => panic!("unexpected message received from overseer: {:?}", msg),
 			}
 		}
@@ -1413,12 +1393,7 @@ fn seconding_sanity_check_occupy_same_depth() {
 		let leaf_hash = Hash::from_low_u64_be(130);
 		let leaf_parent = get_parent_hash(leaf_hash);
 
-		let activated = ActivatedLeaf {
-			hash: leaf_hash,
-			number: LEAF_BLOCK_NUMBER,
-			status: LeafStatus::Fresh,
-			span: Arc::new(jaeger::Span::Disabled),
-		};
+		let activated = new_leaf(leaf_hash, LEAF_BLOCK_NUMBER);
 
 		let min_block_number = LEAF_BLOCK_NUMBER - LEAF_ANCESTRY_LEN;
 		let min_relay_parents = vec![(para_id_a, min_block_number), (para_id_b, min_block_number)];
@@ -1572,12 +1547,7 @@ fn occupied_core_assignment() {
 
 		let leaf_a_hash = Hash::from_low_u64_be(130);
 		let leaf_a_parent = get_parent_hash(leaf_a_hash);
-		let activated = ActivatedLeaf {
-			hash: leaf_a_hash,
-			number: LEAF_A_BLOCK_NUMBER,
-			status: LeafStatus::Fresh,
-			span: Arc::new(jaeger::Span::Disabled),
-		};
+		let activated = new_leaf(leaf_a_hash, LEAF_A_BLOCK_NUMBER);
 		let min_relay_parents = vec![(para_id, LEAF_A_BLOCK_NUMBER - LEAF_A_ANCESTRY_LEN)];
 		let test_leaf_a = TestLeaf { activated, min_relay_parents };
 
diff --git a/polkadot/node/core/bitfield-signing/Cargo.toml b/polkadot/node/core/bitfield-signing/Cargo.toml
index de2d7622e815b7720c5364ca409b9e4be61888e0..de38d18d970623dd6dc14fdcecb5dd4447232481 100644
--- a/polkadot/node/core/bitfield-signing/Cargo.toml
+++ b/polkadot/node/core/bitfield-signing/Cargo.toml
@@ -1,6 +1,6 @@
 [package]
 name = "polkadot-node-core-bitfield-signing"
-version.workspace = true
+version = "1.0.0"
 authors.workspace = true
 edition.workspace = true
 license.workspace = true
@@ -13,7 +13,7 @@ polkadot-node-subsystem = { path = "../../subsystem" }
 polkadot-node-subsystem-util = { path = "../../subsystem-util" }
 sp-keystore = { path = "../../../../substrate/primitives/keystore" }
 wasm-timer = "0.2.5"
-thiserror = "1.0.31"
+thiserror = "1.0.48"
 
 [dev-dependencies]
 polkadot-node-subsystem-test-helpers = { path = "../../subsystem-test-helpers" }
diff --git a/polkadot/node/core/candidate-validation/Cargo.toml b/polkadot/node/core/candidate-validation/Cargo.toml
index 6c93f912271e2298dc39bd70d5f3dcac824e54e0..a2e88778532f754cd429c5c156fe27cf5dd88d75 100644
--- a/polkadot/node/core/candidate-validation/Cargo.toml
+++ b/polkadot/node/core/candidate-validation/Cargo.toml
@@ -1,7 +1,7 @@
 [package]
 name = "polkadot-node-core-candidate-validation"
 description = "Polkadot crate that implements the Candidate Validation subsystem. Handles requests to validate candidates according to a PVF."
-version.workspace = true
+version = "1.0.0"
 authors.workspace = true
 edition.workspace = true
 license.workspace = true
@@ -16,7 +16,7 @@ sp-maybe-compressed-blob = { package = "sp-maybe-compressed-blob", path = "../..
 parity-scale-codec = { version = "3.6.1", default-features = false, features = ["bit-vec", "derive"] }
 
 polkadot-primitives = { path = "../../../primitives" }
-polkadot-parachain = { path = "../../../parachain" }
+polkadot-parachain-primitives = { path = "../../../parachain" }
 polkadot-node-primitives = { path = "../../primitives" }
 polkadot-node-subsystem = { path = "../../subsystem" }
 polkadot-node-subsystem-util = { path = "../../subsystem-util" }
diff --git a/polkadot/node/core/candidate-validation/src/lib.rs b/polkadot/node/core/candidate-validation/src/lib.rs
index f53f2a6aee066c236827001ad8149cf67b74cf7f..21a7121d47bd005b428a4b969f535e0c9f1c7c04 100644
--- a/polkadot/node/core/candidate-validation/src/lib.rs
+++ b/polkadot/node/core/candidate-validation/src/lib.rs
@@ -40,8 +40,14 @@ use polkadot_node_subsystem::{
 	SubsystemSender,
 };
 use polkadot_node_subsystem_util::executor_params_at_relay_parent;
-use polkadot_parachain::primitives::{ValidationParams, ValidationResult as WasmValidationResult};
+use polkadot_parachain_primitives::primitives::{
+	ValidationParams, ValidationResult as WasmValidationResult,
+};
 use polkadot_primitives::{
+	executor_params::{
+		DEFAULT_APPROVAL_EXECUTION_TIMEOUT, DEFAULT_BACKING_EXECUTION_TIMEOUT,
+		DEFAULT_LENIENT_PREPARATION_TIMEOUT, DEFAULT_PRECHECK_PREPARATION_TIMEOUT,
+	},
 	CandidateCommitments, CandidateDescriptor, CandidateReceipt, ExecutorParams, Hash,
 	OccupiedCoreAssumption, PersistedValidationData, PvfExecTimeoutKind, PvfPrepTimeoutKind,
 	ValidationCode, ValidationCodeHash,
@@ -81,13 +87,6 @@ const PVF_APPROVAL_EXECUTION_RETRY_DELAY: Duration = Duration::from_secs(3);
 #[cfg(test)]
 const PVF_APPROVAL_EXECUTION_RETRY_DELAY: Duration = Duration::from_millis(200);
 
-// Default PVF timeouts. Must never be changed! Use executor environment parameters in
-// `session_info` pallet to adjust them. See also `PvfTimeoutKind` docs.
-const DEFAULT_PRECHECK_PREPARATION_TIMEOUT: Duration = Duration::from_secs(60);
-const DEFAULT_LENIENT_PREPARATION_TIMEOUT: Duration = Duration::from_secs(360);
-const DEFAULT_BACKING_EXECUTION_TIMEOUT: Duration = Duration::from_secs(2);
-const DEFAULT_APPROVAL_EXECUTION_TIMEOUT: Duration = Duration::from_secs(12);
-
 /// Configuration for the candidate validation subsystem
 #[derive(Clone)]
 pub struct Config {
@@ -111,10 +110,7 @@ pub struct CandidateValidationSubsystem {
 }
 
 impl CandidateValidationSubsystem {
-	/// Create a new `CandidateValidationSubsystem` with the given task spawner and isolation
-	/// strategy.
-	///
-	/// Check out [`IsolationStrategy`] to get more details.
+	/// Create a new `CandidateValidationSubsystem`.
 	pub fn with_config(
 		config: Option<Config>,
 		metrics: Metrics,
@@ -165,6 +161,7 @@ async fn run<Context>(
 				CandidateValidationMessage::ValidateFromChainState(
 					candidate_receipt,
 					pov,
+					executor_params,
 					timeout,
 					response_sender,
 				) => {
@@ -180,6 +177,7 @@ async fn run<Context>(
 								validation_host,
 								candidate_receipt,
 								pov,
+								executor_params,
 								timeout,
 								&metrics,
 							)
@@ -197,23 +195,23 @@ async fn run<Context>(
 					validation_code,
 					candidate_receipt,
 					pov,
+					executor_params,
 					timeout,
 					response_sender,
 				) => {
 					let bg = {
-						let mut sender = ctx.sender().clone();
 						let metrics = metrics.clone();
 						let validation_host = validation_host.clone();
 
 						async move {
 							let _timer = metrics.time_validate_from_exhaustive();
 							let res = validate_candidate_exhaustive(
-								&mut sender,
 								validation_host,
 								persisted_validation_data,
 								validation_code,
 								candidate_receipt,
 								pov,
+								executor_params,
 								timeout,
 								&metrics,
 							)
@@ -498,6 +496,7 @@ async fn validate_from_chain_state<Sender>(
 	validation_host: ValidationHost,
 	candidate_receipt: CandidateReceipt,
 	pov: Arc<PoV>,
+	executor_params: ExecutorParams,
 	exec_timeout_kind: PvfExecTimeoutKind,
 	metrics: &Metrics,
 ) -> Result<ValidationResult, ValidationFailed>
@@ -512,12 +511,12 @@ where
 		};
 
 	let validation_result = validate_candidate_exhaustive(
-		sender,
 		validation_host,
 		validation_data,
 		validation_code,
 		candidate_receipt.clone(),
 		pov,
+		executor_params,
 		exec_timeout_kind,
 		metrics,
 	)
@@ -547,19 +546,16 @@ where
 	validation_result
 }
 
-async fn validate_candidate_exhaustive<Sender>(
-	sender: &mut Sender,
+async fn validate_candidate_exhaustive(
 	mut validation_backend: impl ValidationBackend + Send,
 	persisted_validation_data: PersistedValidationData,
 	validation_code: ValidationCode,
 	candidate_receipt: CandidateReceipt,
 	pov: Arc<PoV>,
+	executor_params: ExecutorParams,
 	exec_timeout_kind: PvfExecTimeoutKind,
 	metrics: &Metrics,
-) -> Result<ValidationResult, ValidationFailed>
-where
-	Sender: SubsystemSender<RuntimeApiMessage>,
-{
+) -> Result<ValidationResult, ValidationFailed> {
 	let _timer = metrics.time_validate_candidate_exhaustive();
 
 	let validation_code_hash = validation_code.hash();
@@ -616,27 +612,6 @@ where
 		relay_parent_storage_root: persisted_validation_data.relay_parent_storage_root,
 	};
 
-	let executor_params = if let Ok(executor_params) =
-		executor_params_at_relay_parent(candidate_receipt.descriptor.relay_parent, sender).await
-	{
-		gum::debug!(
-			target: LOG_TARGET,
-			?validation_code_hash,
-			?para_id,
-			"Acquired executor params for the session: {:?}",
-			executor_params,
-		);
-		executor_params
-	} else {
-		gum::warn!(
-			target: LOG_TARGET,
-			?validation_code_hash,
-			?para_id,
-			"Failed to acquire executor params for the session",
-		);
-		return Ok(ValidationResult::Invalid(InvalidCandidate::BadParent))
-	};
-
 	let result = validation_backend
 		.validate_candidate_with_retry(
 			raw_validation_code.to_vec(),
diff --git a/polkadot/node/core/candidate-validation/src/tests.rs b/polkadot/node/core/candidate-validation/src/tests.rs
index 2dcead4db466510001f732e61ab542c78b8829e5..af530a20c4e0ca61fcf44f4ce0e3121ffeab1363 100644
--- a/polkadot/node/core/candidate-validation/src/tests.rs
+++ b/polkadot/node/core/candidate-validation/src/tests.rs
@@ -26,37 +26,6 @@ use polkadot_primitives::{HeadData, Id as ParaId, UpwardMessage};
 use sp_core::testing::TaskExecutor;
 use sp_keyring::Sr25519Keyring;
 
-fn test_with_executor_params<T: futures::Future<Output = R>, R, M>(
-	mut ctx_handle: test_helpers::TestSubsystemContextHandle<M>,
-	test: impl FnOnce() -> T,
-) -> R {
-	let test_fut = test();
-
-	let overseer = async move {
-		assert_matches!(
-			ctx_handle.recv().await,
-			AllMessages::RuntimeApi(
-				RuntimeApiMessage::Request(_, RuntimeApiRequest::SessionIndexForChild(tx))
-			) => {
-				tx.send(Ok(1u32.into())).unwrap();
-			}
-		);
-		assert_matches!(
-			ctx_handle.recv().await,
-			AllMessages::RuntimeApi(
-				RuntimeApiMessage::Request(_, RuntimeApiRequest::SessionExecutorParams(_, tx))
-			) => {
-				tx.send(Ok(Some(ExecutorParams::default()))).unwrap();
-			}
-		);
-	};
-
-	futures::pin_mut!(test_fut);
-	futures::pin_mut!(overseer);
-	let v = executor::block_on(future::join(test_fut, overseer));
-	v.0
-}
-
 #[test]
 fn correctly_checks_included_assumption() {
 	let validation_data: PersistedValidationData = Default::default();
@@ -460,23 +429,16 @@ fn candidate_validation_ok_is_ok() {
 
 	let candidate_receipt = CandidateReceipt { descriptor, commitments_hash: commitments.hash() };
 
-	let pool = TaskExecutor::new();
-	let (mut ctx, ctx_handle) =
-		test_helpers::make_subsystem_context::<AllMessages, _>(pool.clone());
-	let metrics = Metrics::default();
-
-	let v = test_with_executor_params(ctx_handle, || {
-		validate_candidate_exhaustive(
-			ctx.sender(),
-			MockValidateCandidateBackend::with_hardcoded_result(Ok(validation_result)),
-			validation_data.clone(),
-			validation_code,
-			candidate_receipt,
-			Arc::new(pov),
-			PvfExecTimeoutKind::Backing,
-			&metrics,
-		)
-	})
+	let v = executor::block_on(validate_candidate_exhaustive(
+		MockValidateCandidateBackend::with_hardcoded_result(Ok(validation_result)),
+		validation_data.clone(),
+		validation_code,
+		candidate_receipt,
+		Arc::new(pov),
+		ExecutorParams::default(),
+		PvfExecTimeoutKind::Backing,
+		&Default::default(),
+	))
 	.unwrap();
 
 	assert_matches!(v, ValidationResult::Valid(outputs, used_validation_data) => {
@@ -517,27 +479,21 @@ fn candidate_validation_bad_return_is_invalid() {
 
 	let candidate_receipt = CandidateReceipt { descriptor, commitments_hash: Hash::zero() };
 
-	let pool = TaskExecutor::new();
-	let (mut ctx, ctx_handle) =
-		test_helpers::make_subsystem_context::<AllMessages, _>(pool.clone());
-	let metrics = Metrics::default();
-
-	let v = test_with_executor_params(ctx_handle, || {
-		validate_candidate_exhaustive(
-			ctx.sender(),
-			MockValidateCandidateBackend::with_hardcoded_result(Err(
-				ValidationError::InvalidCandidate(WasmInvalidCandidate::HardTimeout),
-			)),
-			validation_data,
-			validation_code,
-			candidate_receipt,
-			Arc::new(pov),
-			PvfExecTimeoutKind::Backing,
-			&metrics,
-		)
-	});
+	let v = executor::block_on(validate_candidate_exhaustive(
+		MockValidateCandidateBackend::with_hardcoded_result(Err(
+			ValidationError::InvalidCandidate(WasmInvalidCandidate::HardTimeout),
+		)),
+		validation_data,
+		validation_code,
+		candidate_receipt,
+		Arc::new(pov),
+		ExecutorParams::default(),
+		PvfExecTimeoutKind::Backing,
+		&Default::default(),
+	))
+	.unwrap();
 
-	assert_matches!(v, Ok(ValidationResult::Invalid(InvalidCandidate::Timeout)));
+	assert_matches!(v, ValidationResult::Invalid(InvalidCandidate::Timeout));
 }
 
 // Test that we vote valid if we get `AmbiguousWorkerDeath`, retry, and then succeed.
@@ -588,26 +544,19 @@ fn candidate_validation_one_ambiguous_error_is_valid() {
 
 	let candidate_receipt = CandidateReceipt { descriptor, commitments_hash: commitments.hash() };
 
-	let pool = TaskExecutor::new();
-	let (mut ctx, ctx_handle) =
-		test_helpers::make_subsystem_context::<AllMessages, _>(pool.clone());
-	let metrics = Metrics::default();
-
-	let v = test_with_executor_params(ctx_handle, || {
-		validate_candidate_exhaustive(
-			ctx.sender(),
-			MockValidateCandidateBackend::with_hardcoded_result_list(vec![
-				Err(ValidationError::InvalidCandidate(WasmInvalidCandidate::AmbiguousWorkerDeath)),
-				Ok(validation_result),
-			]),
-			validation_data.clone(),
-			validation_code,
-			candidate_receipt,
-			Arc::new(pov),
-			PvfExecTimeoutKind::Backing,
-			&metrics,
-		)
-	})
+	let v = executor::block_on(validate_candidate_exhaustive(
+		MockValidateCandidateBackend::with_hardcoded_result_list(vec![
+			Err(ValidationError::InvalidCandidate(WasmInvalidCandidate::AmbiguousWorkerDeath)),
+			Ok(validation_result),
+		]),
+		validation_data.clone(),
+		validation_code,
+		candidate_receipt,
+		Arc::new(pov),
+		ExecutorParams::default(),
+		PvfExecTimeoutKind::Backing,
+		&Default::default(),
+	))
 	.unwrap();
 
 	assert_matches!(v, ValidationResult::Valid(outputs, used_validation_data) => {
@@ -648,26 +597,19 @@ fn candidate_validation_multiple_ambiguous_errors_is_invalid() {
 
 	let candidate_receipt = CandidateReceipt { descriptor, commitments_hash: Hash::zero() };
 
-	let pool = TaskExecutor::new();
-	let (mut ctx, ctx_handle) =
-		test_helpers::make_subsystem_context::<AllMessages, _>(pool.clone());
-	let metrics = Metrics::default();
-
-	let v = test_with_executor_params(ctx_handle, || {
-		validate_candidate_exhaustive(
-			ctx.sender(),
-			MockValidateCandidateBackend::with_hardcoded_result_list(vec![
-				Err(ValidationError::InvalidCandidate(WasmInvalidCandidate::AmbiguousWorkerDeath)),
-				Err(ValidationError::InvalidCandidate(WasmInvalidCandidate::AmbiguousWorkerDeath)),
-			]),
-			validation_data,
-			validation_code,
-			candidate_receipt,
-			Arc::new(pov),
-			PvfExecTimeoutKind::Backing,
-			&metrics,
-		)
-	})
+	let v = executor::block_on(validate_candidate_exhaustive(
+		MockValidateCandidateBackend::with_hardcoded_result_list(vec![
+			Err(ValidationError::InvalidCandidate(WasmInvalidCandidate::AmbiguousWorkerDeath)),
+			Err(ValidationError::InvalidCandidate(WasmInvalidCandidate::AmbiguousWorkerDeath)),
+		]),
+		validation_data,
+		validation_code,
+		candidate_receipt,
+		Arc::new(pov),
+		ExecutorParams::default(),
+		PvfExecTimeoutKind::Backing,
+		&Default::default(),
+	))
 	.unwrap();
 
 	assert_matches!(v, ValidationResult::Invalid(InvalidCandidate::ExecutionError(_)));
@@ -702,29 +644,22 @@ fn candidate_validation_retry_internal_errors() {
 
 	let candidate_receipt = CandidateReceipt { descriptor, commitments_hash: Hash::zero() };
 
-	let pool = TaskExecutor::new();
-	let (mut ctx, ctx_handle) =
-		test_helpers::make_subsystem_context::<AllMessages, _>(pool.clone());
-	let metrics = Metrics::default();
-
-	let v = test_with_executor_params(ctx_handle, || {
-		validate_candidate_exhaustive(
-			ctx.sender(),
-			MockValidateCandidateBackend::with_hardcoded_result_list(vec![
-				Err(InternalValidationError::HostCommunication("foo".into()).into()),
-				// Throw an AWD error, we should still retry again.
-				Err(ValidationError::InvalidCandidate(WasmInvalidCandidate::AmbiguousWorkerDeath)),
-				// Throw another internal error.
-				Err(InternalValidationError::HostCommunication("bar".into()).into()),
-			]),
-			validation_data,
-			validation_code,
-			candidate_receipt,
-			Arc::new(pov),
-			PvfExecTimeoutKind::Backing,
-			&metrics,
-		)
-	});
+	let v = executor::block_on(validate_candidate_exhaustive(
+		MockValidateCandidateBackend::with_hardcoded_result_list(vec![
+			Err(InternalValidationError::HostCommunication("foo".into()).into()),
+			// Throw an AWD error, we should still retry again.
+			Err(ValidationError::InvalidCandidate(WasmInvalidCandidate::AmbiguousWorkerDeath)),
+			// Throw another internal error.
+			Err(InternalValidationError::HostCommunication("bar".into()).into()),
+		]),
+		validation_data,
+		validation_code,
+		candidate_receipt,
+		Arc::new(pov),
+		ExecutorParams::default(),
+		PvfExecTimeoutKind::Backing,
+		&Default::default(),
+	));
 
 	assert_matches!(v, Err(ValidationFailed(s)) if s.contains("bar"));
 }
@@ -758,29 +693,22 @@ fn candidate_validation_retry_panic_errors() {
 
 	let candidate_receipt = CandidateReceipt { descriptor, commitments_hash: Hash::zero() };
 
-	let pool = TaskExecutor::new();
-	let (mut ctx, ctx_handle) =
-		test_helpers::make_subsystem_context::<AllMessages, _>(pool.clone());
-	let metrics = Metrics::default();
-
-	let v = test_with_executor_params(ctx_handle, || {
-		validate_candidate_exhaustive(
-			ctx.sender(),
-			MockValidateCandidateBackend::with_hardcoded_result_list(vec![
-				Err(ValidationError::InvalidCandidate(WasmInvalidCandidate::Panic("foo".into()))),
-				// Throw an AWD error, we should still retry again.
-				Err(ValidationError::InvalidCandidate(WasmInvalidCandidate::AmbiguousWorkerDeath)),
-				// Throw another panic error.
-				Err(ValidationError::InvalidCandidate(WasmInvalidCandidate::Panic("bar".into()))),
-			]),
-			validation_data,
-			validation_code,
-			candidate_receipt,
-			Arc::new(pov),
-			PvfExecTimeoutKind::Backing,
-			&metrics,
-		)
-	});
+	let v = executor::block_on(validate_candidate_exhaustive(
+		MockValidateCandidateBackend::with_hardcoded_result_list(vec![
+			Err(ValidationError::InvalidCandidate(WasmInvalidCandidate::Panic("foo".into()))),
+			// Throw an AWD error, we should still retry again.
+			Err(ValidationError::InvalidCandidate(WasmInvalidCandidate::AmbiguousWorkerDeath)),
+			// Throw another panic error.
+			Err(ValidationError::InvalidCandidate(WasmInvalidCandidate::Panic("bar".into()))),
+		]),
+		validation_data,
+		validation_code,
+		candidate_receipt,
+		Arc::new(pov),
+		ExecutorParams::default(),
+		PvfExecTimeoutKind::Backing,
+		&Default::default(),
+	));
 
 	assert_matches!(v, Ok(ValidationResult::Invalid(InvalidCandidate::ExecutionError(s))) if s == "bar".to_string());
 }
@@ -813,25 +741,18 @@ fn candidate_validation_timeout_is_internal_error() {
 
 	let candidate_receipt = CandidateReceipt { descriptor, commitments_hash: Hash::zero() };
 
-	let pool = TaskExecutor::new();
-	let (mut ctx, ctx_handle) =
-		test_helpers::make_subsystem_context::<AllMessages, _>(pool.clone());
-	let metrics = Metrics::default();
-
-	let v = test_with_executor_params(ctx_handle, || {
-		validate_candidate_exhaustive(
-			ctx.sender(),
-			MockValidateCandidateBackend::with_hardcoded_result(Err(
-				ValidationError::InvalidCandidate(WasmInvalidCandidate::HardTimeout),
-			)),
-			validation_data,
-			validation_code,
-			candidate_receipt,
-			Arc::new(pov),
-			PvfExecTimeoutKind::Backing,
-			&metrics,
-		)
-	});
+	let v = executor::block_on(validate_candidate_exhaustive(
+		MockValidateCandidateBackend::with_hardcoded_result(Err(
+			ValidationError::InvalidCandidate(WasmInvalidCandidate::HardTimeout),
+		)),
+		validation_data,
+		validation_code,
+		candidate_receipt,
+		Arc::new(pov),
+		ExecutorParams::default(),
+		PvfExecTimeoutKind::Backing,
+		&Default::default(),
+	));
 
 	assert_matches!(v, Ok(ValidationResult::Invalid(InvalidCandidate::Timeout)));
 }
@@ -867,23 +788,16 @@ fn candidate_validation_commitment_hash_mismatch_is_invalid() {
 		hrmp_watermark: 12345,
 	};
 
-	let pool = TaskExecutor::new();
-	let (mut ctx, ctx_handle) =
-		test_helpers::make_subsystem_context::<AllMessages, _>(pool.clone());
-	let metrics = Metrics::default();
-
-	let result = test_with_executor_params(ctx_handle, || {
-		validate_candidate_exhaustive(
-			ctx.sender(),
-			MockValidateCandidateBackend::with_hardcoded_result(Ok(validation_result)),
-			validation_data,
-			validation_code,
-			candidate_receipt,
-			Arc::new(pov),
-			PvfExecTimeoutKind::Backing,
-			&metrics,
-		)
-	})
+	let result = executor::block_on(validate_candidate_exhaustive(
+		MockValidateCandidateBackend::with_hardcoded_result(Ok(validation_result)),
+		validation_data,
+		validation_code,
+		candidate_receipt,
+		Arc::new(pov),
+		ExecutorParams::default(),
+		PvfExecTimeoutKind::Backing,
+		&Default::default(),
+	))
 	.unwrap();
 
 	// Ensure `post validation` check on the commitments hash works as expected.
@@ -919,11 +833,9 @@ fn candidate_validation_code_mismatch_is_invalid() {
 	let candidate_receipt = CandidateReceipt { descriptor, commitments_hash: Hash::zero() };
 
 	let pool = TaskExecutor::new();
-	let (mut ctx, _ctx_handle) =
-		test_helpers::make_subsystem_context::<AllMessages, _>(pool.clone());
+	let (_ctx, _ctx_handle) = test_helpers::make_subsystem_context::<AllMessages, _>(pool.clone());
 
 	let v = executor::block_on(validate_candidate_exhaustive(
-		ctx.sender(),
 		MockValidateCandidateBackend::with_hardcoded_result(Err(
 			ValidationError::InvalidCandidate(WasmInvalidCandidate::HardTimeout),
 		)),
@@ -931,6 +843,7 @@ fn candidate_validation_code_mismatch_is_invalid() {
 		validation_code,
 		candidate_receipt,
 		Arc::new(pov),
+		ExecutorParams::default(),
 		PvfExecTimeoutKind::Backing,
 		&Default::default(),
 	))
@@ -981,23 +894,16 @@ fn compressed_code_works() {
 
 	let candidate_receipt = CandidateReceipt { descriptor, commitments_hash: commitments.hash() };
 
-	let pool = TaskExecutor::new();
-	let (mut ctx, ctx_handle) =
-		test_helpers::make_subsystem_context::<AllMessages, _>(pool.clone());
-	let metrics = Metrics::default();
-
-	let v = test_with_executor_params(ctx_handle, || {
-		validate_candidate_exhaustive(
-			ctx.sender(),
-			MockValidateCandidateBackend::with_hardcoded_result(Ok(validation_result)),
-			validation_data,
-			validation_code,
-			candidate_receipt,
-			Arc::new(pov),
-			PvfExecTimeoutKind::Backing,
-			&metrics,
-		)
-	});
+	let v = executor::block_on(validate_candidate_exhaustive(
+		MockValidateCandidateBackend::with_hardcoded_result(Ok(validation_result)),
+		validation_data,
+		validation_code,
+		candidate_receipt,
+		Arc::new(pov),
+		ExecutorParams::default(),
+		PvfExecTimeoutKind::Backing,
+		&Default::default(),
+	));
 
 	assert_matches!(v, Ok(ValidationResult::Valid(_, _)));
 }
@@ -1037,16 +943,15 @@ fn code_decompression_failure_is_error() {
 	let candidate_receipt = CandidateReceipt { descriptor, commitments_hash: Hash::zero() };
 
 	let pool = TaskExecutor::new();
-	let (mut ctx, _ctx_handle) =
-		test_helpers::make_subsystem_context::<AllMessages, _>(pool.clone());
+	let (_ctx, _ctx_handle) = test_helpers::make_subsystem_context::<AllMessages, _>(pool.clone());
 
 	let v = executor::block_on(validate_candidate_exhaustive(
-		ctx.sender(),
 		MockValidateCandidateBackend::with_hardcoded_result(Ok(validation_result)),
 		validation_data,
 		validation_code,
 		candidate_receipt,
 		Arc::new(pov),
+		ExecutorParams::default(),
 		PvfExecTimeoutKind::Backing,
 		&Default::default(),
 	));
@@ -1090,16 +995,15 @@ fn pov_decompression_failure_is_invalid() {
 	let candidate_receipt = CandidateReceipt { descriptor, commitments_hash: Hash::zero() };
 
 	let pool = TaskExecutor::new();
-	let (mut ctx, _ctx_handle) =
-		test_helpers::make_subsystem_context::<AllMessages, _>(pool.clone());
+	let (_ctx, _ctx_handle) = test_helpers::make_subsystem_context::<AllMessages, _>(pool.clone());
 
 	let v = executor::block_on(validate_candidate_exhaustive(
-		ctx.sender(),
 		MockValidateCandidateBackend::with_hardcoded_result(Ok(validation_result)),
 		validation_data,
 		validation_code,
 		candidate_receipt,
 		Arc::new(pov),
+		ExecutorParams::default(),
 		PvfExecTimeoutKind::Backing,
 		&Default::default(),
 	));
diff --git a/polkadot/node/core/chain-api/Cargo.toml b/polkadot/node/core/chain-api/Cargo.toml
index 36e9236fe7455a040a826cba9c81ba870a0d7cff..2178be028bd408297613b75730f35fde7277603a 100644
--- a/polkadot/node/core/chain-api/Cargo.toml
+++ b/polkadot/node/core/chain-api/Cargo.toml
@@ -1,6 +1,6 @@
 [package]
 name = "polkadot-node-core-chain-api"
-version.workspace = true
+version = "1.0.0"
 authors.workspace = true
 edition.workspace = true
 license.workspace = true
diff --git a/polkadot/node/core/chain-selection/Cargo.toml b/polkadot/node/core/chain-selection/Cargo.toml
index 3bff1b875b0546849a0b02f161c42b692dfc09d0..7678379870e0371de28eeb3d3807b90820504b87 100644
--- a/polkadot/node/core/chain-selection/Cargo.toml
+++ b/polkadot/node/core/chain-selection/Cargo.toml
@@ -1,7 +1,7 @@
 [package]
 name = "polkadot-node-core-chain-selection"
 description = "Chain Selection Subsystem"
-version.workspace = true
+version = "1.0.0"
 authors.workspace = true
 edition.workspace = true
 license.workspace = true
@@ -15,7 +15,7 @@ polkadot-node-primitives = { path = "../../primitives" }
 polkadot-node-subsystem = { path = "../../subsystem" }
 polkadot-node-subsystem-util = { path = "../../subsystem-util" }
 kvdb = "0.13.0"
-thiserror = "1.0.31"
+thiserror = "1.0.48"
 parity-scale-codec = "3.6.1"
 
 [dev-dependencies]
diff --git a/polkadot/node/core/chain-selection/src/tests.rs b/polkadot/node/core/chain-selection/src/tests.rs
index c04f9aaf66063d6f9d7e16d8b2a4e020c0c75b70..cf021c0efeb0638b5fe1db4ef5dbe9dd4c7766f6 100644
--- a/polkadot/node/core/chain-selection/src/tests.rs
+++ b/polkadot/node/core/chain-selection/src/tests.rs
@@ -35,11 +35,10 @@ use parity_scale_codec::Encode;
 use parking_lot::Mutex;
 use sp_core::testing::TaskExecutor;
 
-use polkadot_node_subsystem::{
-	jaeger, messages::AllMessages, ActivatedLeaf, ActiveLeavesUpdate, LeafStatus,
-};
+use polkadot_node_subsystem::{messages::AllMessages, ActiveLeavesUpdate};
 use polkadot_node_subsystem_test_helpers as test_helpers;
 use polkadot_primitives::{BlakeTwo256, ConsensusLog, HashT};
+use test_helpers::mock::new_leaf;
 
 #[derive(Default)]
 struct TestBackendInner {
@@ -367,12 +366,10 @@ async fn import_blocks_into(
 		let hash = header.hash();
 		virtual_overseer
 			.send(
-				OverseerSignal::ActiveLeaves(ActiveLeavesUpdate::start_work(ActivatedLeaf {
+				OverseerSignal::ActiveLeaves(ActiveLeavesUpdate::start_work(new_leaf(
 					hash,
-					number: header.number,
-					status: LeafStatus::Fresh,
-					span: Arc::new(jaeger::Span::Disabled),
-				}))
+					header.number,
+				)))
 				.into(),
 			)
 			.await;
@@ -425,12 +422,10 @@ async fn import_all_blocks_into(
 	let (_, write_rx) = backend.await_next_write();
 	virtual_overseer
 		.send(
-			OverseerSignal::ActiveLeaves(ActiveLeavesUpdate::start_work(ActivatedLeaf {
-				hash: head_hash,
-				number: head.number,
-				status: LeafStatus::Fresh,
-				span: Arc::new(jaeger::Span::Disabled),
-			}))
+			OverseerSignal::ActiveLeaves(ActiveLeavesUpdate::start_work(new_leaf(
+				head_hash,
+				head.number,
+			)))
 			.into(),
 		)
 		.await;
diff --git a/polkadot/node/core/dispute-coordinator/Cargo.toml b/polkadot/node/core/dispute-coordinator/Cargo.toml
index 465c108211e333ce9bd732806cfbd0bc95a5403f..6061c52b7e810e75cd810dd76287ea1337166ed2 100644
--- a/polkadot/node/core/dispute-coordinator/Cargo.toml
+++ b/polkadot/node/core/dispute-coordinator/Cargo.toml
@@ -1,6 +1,6 @@
 [package]
 name = "polkadot-node-core-dispute-coordinator"
-version.workspace = true
+version = "1.0.0"
 authors.workspace = true
 edition.workspace = true
 license.workspace = true
@@ -10,8 +10,8 @@ futures = "0.3.21"
 gum = { package = "tracing-gum", path = "../../gum" }
 parity-scale-codec = "3.6.1"
 kvdb = "0.13.0"
-thiserror = "1.0.31"
-lru = "0.11.0"
+thiserror = "1.0.48"
+schnellru = "0.2.1"
 fatality = "0.0.6"
 
 polkadot-primitives = { path = "../../../primitives" }
diff --git a/polkadot/node/core/dispute-coordinator/src/import.rs b/polkadot/node/core/dispute-coordinator/src/import.rs
index 0da3723ebf229cadf88969f8db9ba54daf863742..cf51ae4d3655e935859878fbc67564dfafbf1a9e 100644
--- a/polkadot/node/core/dispute-coordinator/src/import.rs
+++ b/polkadot/node/core/dispute-coordinator/src/import.rs
@@ -34,8 +34,9 @@ use polkadot_node_primitives::{
 use polkadot_node_subsystem::overseer;
 use polkadot_node_subsystem_util::runtime::RuntimeInfo;
 use polkadot_primitives::{
-	CandidateReceipt, DisputeStatement, Hash, IndexedVec, SessionIndex, SessionInfo,
-	ValidDisputeStatementKind, ValidatorId, ValidatorIndex, ValidatorPair, ValidatorSignature,
+	CandidateReceipt, DisputeStatement, ExecutorParams, Hash, IndexedVec, SessionIndex,
+	SessionInfo, ValidDisputeStatementKind, ValidatorId, ValidatorIndex, ValidatorPair,
+	ValidatorSignature,
 };
 use sc_keystore::LocalKeystore;
 
@@ -47,6 +48,8 @@ pub struct CandidateEnvironment<'a> {
 	session_index: SessionIndex,
 	/// Session for above index.
 	session: &'a SessionInfo,
+	/// Executor parameters for the session.
+	executor_params: &'a ExecutorParams,
 	/// Validator indices controlled by this node.
 	controlled_indices: HashSet<ValidatorIndex>,
 }
@@ -63,17 +66,17 @@ impl<'a> CandidateEnvironment<'a> {
 		session_index: SessionIndex,
 		relay_parent: Hash,
 	) -> Option<CandidateEnvironment<'a>> {
-		let session_info = match runtime_info
+		let (session, executor_params) = match runtime_info
 			.get_session_info_by_index(ctx.sender(), relay_parent, session_index)
 			.await
 		{
-			Ok(extended_session_info) => &extended_session_info.session_info,
+			Ok(extended_session_info) =>
+				(&extended_session_info.session_info, &extended_session_info.executor_params),
 			Err(_) => return None,
 		};
 
-		let controlled_indices =
-			find_controlled_validator_indices(keystore, &session_info.validators);
-		Some(Self { session_index, session: session_info, controlled_indices })
+		let controlled_indices = find_controlled_validator_indices(keystore, &session.validators);
+		Some(Self { session_index, session, executor_params, controlled_indices })
 	}
 
 	/// Validators in the candidate's session.
@@ -86,6 +89,11 @@ impl<'a> CandidateEnvironment<'a> {
 		&self.session
 	}
 
+	/// Executor parameters for the candidate's session
+	pub fn executor_params(&self) -> &ExecutorParams {
+		&self.executor_params
+	}
+
 	/// Retrieve `SessionIndex` for this environment.
 	pub fn session_index(&self) -> SessionIndex {
 		self.session_index
diff --git a/polkadot/node/core/dispute-coordinator/src/initialized.rs b/polkadot/node/core/dispute-coordinator/src/initialized.rs
index c1d02ef976cb666f056ffa24602fd1affb9971d1..e44530b3f1bbab0995f850af7e951984bd1dc55b 100644
--- a/polkadot/node/core/dispute-coordinator/src/initialized.rs
+++ b/polkadot/node/core/dispute-coordinator/src/initialized.rs
@@ -43,7 +43,7 @@ use polkadot_node_subsystem_util::runtime::{
 	self, key_ownership_proof, submit_report_dispute_lost, RuntimeInfo,
 };
 use polkadot_primitives::{
-	vstaging, BlockNumber, CandidateHash, CandidateReceipt, CompactStatement, DisputeStatement,
+	slashing, BlockNumber, CandidateHash, CandidateReceipt, CompactStatement, DisputeStatement,
 	DisputeStatementSet, Hash, ScrapedOnChainVotes, SessionIndex, ValidDisputeStatementKind,
 	ValidatorId, ValidatorIndex,
 };
@@ -301,6 +301,13 @@ impl Initialized {
 		self.participation.process_active_leaves_update(ctx, &update).await?;
 
 		if let Some(new_leaf) = update.activated {
+			gum::trace!(
+				target: LOG_TARGET,
+				leaf_hash = ?new_leaf.hash,
+				block_number = new_leaf.number,
+				"Processing ActivatedLeaf"
+			);
+
 			let session_idx =
 				self.runtime_info.get_session_index_for_child(ctx.sender(), new_leaf.hash).await;
 
@@ -308,6 +315,8 @@ impl Initialized {
 				Ok(session_idx)
 					if self.gaps_in_cache || session_idx > self.highest_session_seen =>
 				{
+					// Pin the block from the new session.
+					self.runtime_info.pin_block(session_idx, new_leaf.unpin_handle);
 					// Fetch the last `DISPUTE_WINDOW` number of sessions unless there are no gaps
 					// in cache and we are not missing too many `SessionInfo`s
 					let mut lower_bound = session_idx.saturating_sub(DISPUTE_WINDOW.get() - 1);
@@ -376,7 +385,7 @@ impl Initialized {
 		&mut self,
 		ctx: &mut Context,
 		relay_parent: Hash,
-		unapplied_slashes: Vec<(SessionIndex, CandidateHash, vstaging::slashing::PendingSlashes)>,
+		unapplied_slashes: Vec<(SessionIndex, CandidateHash, slashing::PendingSlashes)>,
 	) {
 		for (session_index, candidate_hash, pending) in unapplied_slashes {
 			gum::info!(
@@ -387,35 +396,35 @@ impl Initialized {
 				"Processing unapplied validator slashes",
 			);
 
+			let pinned_hash = self.runtime_info.get_block_in_session(session_index);
 			let inclusions = self.scraper.get_blocks_including_candidate(&candidate_hash);
-			if inclusions.is_empty() {
+			if pinned_hash.is_none() && inclusions.is_empty() {
 				gum::info!(
 					target: LOG_TARGET,
-					"Couldn't find inclusion parent for an unapplied slash",
+					?session_index,
+					"Couldn't find blocks in the session for an unapplied slash",
 				);
 				return
 			}
 
-			// Find the first inclusion parent that we can use
+			// Find a relay block that we can use
 			// to generate key ownership proof on.
-			// We use inclusion parents because of the proper session index.
+			// We use inclusion parents as a fallback.
 			let mut key_ownership_proofs = Vec::new();
 			let mut dispute_proofs = Vec::new();
 
-			for (_height, inclusion_parent) in inclusions {
+			let blocks_in_the_session =
+				pinned_hash.into_iter().chain(inclusions.into_iter().map(|(_n, h)| h));
+			for hash in blocks_in_the_session {
 				for (validator_index, validator_id) in pending.keys.iter() {
-					let res =
-						key_ownership_proof(ctx.sender(), inclusion_parent, validator_id.clone())
-							.await;
+					let res = key_ownership_proof(ctx.sender(), hash, validator_id.clone()).await;
 
 					match res {
 						Ok(Some(key_ownership_proof)) => {
 							key_ownership_proofs.push(key_ownership_proof);
-							let time_slot = vstaging::slashing::DisputesTimeSlot::new(
-								session_index,
-								candidate_hash,
-							);
-							let dispute_proof = vstaging::slashing::DisputeProof {
+							let time_slot =
+								slashing::DisputesTimeSlot::new(session_index, candidate_hash);
+							let dispute_proof = slashing::DisputeProof {
 								time_slot,
 								kind: pending.kind,
 								validator_index: *validator_index,
@@ -1160,6 +1169,7 @@ impl Initialized {
 					ParticipationRequest::new(
 						new_state.candidate_receipt().clone(),
 						session,
+						env.executor_params().clone(),
 						request_timer,
 					),
 				)
@@ -1270,7 +1280,7 @@ impl Initialized {
 		if import_result.has_fresh_byzantine_threshold_against() {
 			let blocks_including = self.scraper.get_blocks_including_candidate(&candidate_hash);
 			for (parent_block_number, parent_block_hash) in &blocks_including {
-				gum::trace!(
+				gum::warn!(
 					target: LOG_TARGET,
 					?candidate_hash,
 					?parent_block_number,
@@ -1281,7 +1291,7 @@ impl Initialized {
 			if blocks_including.len() > 0 {
 				ctx.send_message(ChainSelectionMessage::RevertBlocks(blocks_including)).await;
 			} else {
-				gum::debug!(
+				gum::warn!(
 					target: LOG_TARGET,
 					?candidate_hash,
 					?session,
diff --git a/polkadot/node/core/dispute-coordinator/src/lib.rs b/polkadot/node/core/dispute-coordinator/src/lib.rs
index a2c500e08e283fdd3256ab46bef7d3550bcf3d92..3f0fd4013141925fb57e462934b0312698c89291 100644
--- a/polkadot/node/core/dispute-coordinator/src/lib.rs
+++ b/polkadot/node/core/dispute-coordinator/src/lib.rs
@@ -25,7 +25,7 @@
 //! When importing a dispute vote from another node, this will trigger dispute participation to
 //! recover and validate the block.
 
-use std::{num::NonZeroUsize, sync::Arc};
+use std::sync::Arc;
 
 use futures::FutureExt;
 
@@ -222,8 +222,7 @@ impl DisputeCoordinatorSubsystem {
 			// keep all sessions for a dispute window
 			let mut runtime_info = RuntimeInfo::new_with_config(RuntimeInfoConfig {
 				keystore: None,
-				session_cache_lru_size: NonZeroUsize::new(DISPUTE_WINDOW.get() as usize)
-					.expect("DISPUTE_WINDOW can't be 0; qed."),
+				session_cache_lru_size: DISPUTE_WINDOW.get(),
 			});
 			let mut overlay_db = OverlayedBackend::new(&mut backend);
 			let (
@@ -399,6 +398,7 @@ impl DisputeCoordinatorSubsystem {
 						ParticipationRequest::new(
 							vote_state.votes().candidate_receipt.clone(),
 							session,
+							env.executor_params().clone(),
 							request_timer,
 						),
 					));
diff --git a/polkadot/node/core/dispute-coordinator/src/participation/mod.rs b/polkadot/node/core/dispute-coordinator/src/participation/mod.rs
index 25b7352807f6b540c0de0973800ecb6ce983804e..35d07b411e8f644ed5491a2e6344fd8f99a71c60 100644
--- a/polkadot/node/core/dispute-coordinator/src/participation/mod.rs
+++ b/polkadot/node/core/dispute-coordinator/src/participation/mod.rs
@@ -260,6 +260,13 @@ impl Participation {
 		req: ParticipationRequest,
 		recent_head: Hash,
 	) -> FatalResult<()> {
+		gum::trace!(
+			target: LOG_TARGET,
+			candidate_hash = ?req.candidate_hash(),
+			session = req.session(),
+			"Forking participation"
+		);
+
 		let participation_timer = self.metrics.time_participation();
 		if self.running_participations.insert(*req.candidate_hash()) {
 			let sender = ctx.sender().clone();
@@ -314,12 +321,24 @@ async fn participate(
 		},
 		Ok(Ok(data)) => data,
 		Ok(Err(RecoveryError::Invalid)) => {
+			gum::debug!(
+				target: LOG_TARGET,
+				candidate_hash = ?req.candidate_hash(),
+				session = req.session(),
+				"Invalid availability data during participation"
+			);
 			// the available data was recovered but it is invalid, therefore we'll
 			// vote negatively for the candidate dispute
 			send_result(&mut result_sender, req, ParticipationOutcome::Invalid).await;
 			return
 		},
 		Ok(Err(RecoveryError::Unavailable)) | Ok(Err(RecoveryError::ChannelClosed)) => {
+			gum::debug!(
+				target: LOG_TARGET,
+				candidate_hash = ?req.candidate_hash(),
+				session = req.session(),
+				"Can't fetch availability data in participation"
+			);
 			send_result(&mut result_sender, req, ParticipationOutcome::Unavailable).await;
 			return
 		},
@@ -366,6 +385,7 @@ async fn participate(
 			validation_code,
 			req.candidate_receipt().clone(),
 			available_data.pov,
+			req.executor_params(),
 			PvfExecTimeoutKind::Approval,
 			validation_tx,
 		))
diff --git a/polkadot/node/core/dispute-coordinator/src/participation/queues/mod.rs b/polkadot/node/core/dispute-coordinator/src/participation/queues/mod.rs
index 8a4374999f88392c58eb60d5120a5b957090f9c9..d9e86def168c97812fb7bcfb462b49ef7c75548d 100644
--- a/polkadot/node/core/dispute-coordinator/src/participation/queues/mod.rs
+++ b/polkadot/node/core/dispute-coordinator/src/participation/queues/mod.rs
@@ -21,7 +21,9 @@ use std::{
 
 use futures::channel::oneshot;
 use polkadot_node_subsystem::{messages::ChainApiMessage, overseer};
-use polkadot_primitives::{BlockNumber, CandidateHash, CandidateReceipt, Hash, SessionIndex};
+use polkadot_primitives::{
+	BlockNumber, CandidateHash, CandidateReceipt, ExecutorParams, Hash, SessionIndex,
+};
 
 use crate::{
 	error::{FatalError, FatalResult, Result},
@@ -73,6 +75,7 @@ pub struct ParticipationRequest {
 	candidate_hash: CandidateHash,
 	candidate_receipt: CandidateReceipt,
 	session: SessionIndex,
+	executor_params: ExecutorParams,
 	request_timer: Option<prometheus::HistogramTimer>, // Sends metric data when request is dropped
 }
 
@@ -120,9 +123,16 @@ impl ParticipationRequest {
 	pub fn new(
 		candidate_receipt: CandidateReceipt,
 		session: SessionIndex,
+		executor_params: ExecutorParams,
 		request_timer: Option<prometheus::HistogramTimer>,
 	) -> Self {
-		Self { candidate_hash: candidate_receipt.hash(), candidate_receipt, session, request_timer }
+		Self {
+			candidate_hash: candidate_receipt.hash(),
+			candidate_receipt,
+			session,
+			executor_params,
+			request_timer,
+		}
 	}
 
 	pub fn candidate_receipt(&'_ self) -> &'_ CandidateReceipt {
@@ -134,6 +144,9 @@ impl ParticipationRequest {
 	pub fn session(&self) -> SessionIndex {
 		self.session
 	}
+	pub fn executor_params(&self) -> ExecutorParams {
+		self.executor_params.clone()
+	}
 	pub fn discard_timer(&mut self) {
 		if let Some(timer) = self.request_timer.take() {
 			timer.stop_and_discard();
@@ -150,11 +163,17 @@ impl ParticipationRequest {
 #[cfg(test)]
 impl PartialEq for ParticipationRequest {
 	fn eq(&self, other: &Self) -> bool {
-		let ParticipationRequest { candidate_receipt, candidate_hash, session, request_timer: _ } =
-			self;
+		let ParticipationRequest {
+			candidate_receipt,
+			candidate_hash,
+			session,
+			executor_params,
+			request_timer: _,
+		} = self;
 		candidate_receipt == other.candidate_receipt() &&
 			candidate_hash == other.candidate_hash() &&
-			*session == other.session()
+			*session == other.session() &&
+			executor_params.hash() == other.executor_params.hash()
 	}
 }
 #[cfg(test)]
@@ -258,6 +277,11 @@ impl Queues {
 			match self.priority.entry(comparator) {
 				Entry::Occupied(_) => req.discard_timer(),
 				Entry::Vacant(vac) => {
+					gum::trace!(
+						target: LOG_TARGET,
+						candidate_hash = ?req.candidate_hash(),
+						"Added to priority participation queue"
+					);
 					vac.insert(req);
 				},
 			}
@@ -276,6 +300,11 @@ impl Queues {
 			match self.best_effort.entry(comparator) {
 				Entry::Occupied(_) => req.discard_timer(),
 				Entry::Vacant(vac) => {
+					gum::trace!(
+						target: LOG_TARGET,
+						candidate_hash = ?req.candidate_hash(),
+						"Added to best effort participation queue"
+					);
 					vac.insert(req);
 				},
 			}
diff --git a/polkadot/node/core/dispute-coordinator/src/participation/queues/tests.rs b/polkadot/node/core/dispute-coordinator/src/participation/queues/tests.rs
index d4f43639ce87f9091c5d4b5493c3e617850dbbb3..63bfc1d7d026cc7ae406f138d332d42b56fb5949 100644
--- a/polkadot/node/core/dispute-coordinator/src/participation/queues/tests.rs
+++ b/polkadot/node/core/dispute-coordinator/src/participation/queues/tests.rs
@@ -27,7 +27,7 @@ fn make_participation_request(hash: Hash) -> ParticipationRequest {
 	// make it differ:
 	receipt.commitments_hash = hash;
 	let request_timer = Metrics::default().time_participation_pipeline();
-	ParticipationRequest::new(receipt, 1, request_timer)
+	ParticipationRequest::new(receipt, 1, Default::default(), request_timer)
 }
 
 /// Make dummy comparator for request, based on the given block number.
@@ -46,6 +46,7 @@ fn clone_request(request: &ParticipationRequest) -> ParticipationRequest {
 		candidate_receipt: request.candidate_receipt.clone(),
 		candidate_hash: request.candidate_hash,
 		session: request.session,
+		executor_params: request.executor_params.clone(),
 		request_timer: None,
 	}
 }
diff --git a/polkadot/node/core/dispute-coordinator/src/participation/tests.rs b/polkadot/node/core/dispute-coordinator/src/participation/tests.rs
index 32725a3ac658df73bc25536b99a89a712f82833b..ee6b950720e5f672d2e33a1f22e367b08d829d6f 100644
--- a/polkadot/node/core/dispute-coordinator/src/participation/tests.rs
+++ b/polkadot/node/core/dispute-coordinator/src/participation/tests.rs
@@ -28,15 +28,14 @@ use ::test_helpers::{
 use parity_scale_codec::Encode;
 use polkadot_node_primitives::{AvailableData, BlockData, InvalidCandidate, PoV};
 use polkadot_node_subsystem::{
-	jaeger,
 	messages::{
 		AllMessages, ChainApiMessage, DisputeCoordinatorMessage, RuntimeApiMessage,
 		RuntimeApiRequest,
 	},
-	ActivatedLeaf, ActiveLeavesUpdate, LeafStatus, SpawnGlue,
+	ActiveLeavesUpdate, SpawnGlue,
 };
 use polkadot_node_subsystem_test_helpers::{
-	make_subsystem_context, TestSubsystemContext, TestSubsystemContextHandle,
+	make_subsystem_context, mock::new_leaf, TestSubsystemContext, TestSubsystemContextHandle,
 };
 use polkadot_primitives::{
 	BlakeTwo256, CandidateCommitments, HashT, Header, PersistedValidationData, ValidationCode,
@@ -73,7 +72,8 @@ async fn participate_with_commitments_hash<Context>(
 	let session = 1;
 
 	let request_timer = participation.metrics.time_participation_pipeline();
-	let req = ParticipationRequest::new(candidate_receipt, session, request_timer);
+	let req =
+		ParticipationRequest::new(candidate_receipt, session, Default::default(), request_timer);
 
 	participation
 		.queue_participation(ctx, ParticipationPriority::BestEffort, req)
@@ -99,12 +99,7 @@ async fn activate_leaf<Context>(
 	participation
 		.process_active_leaves_update(
 			ctx,
-			&ActiveLeavesUpdate::start_work(ActivatedLeaf {
-				hash: block_hash,
-				span: Arc::new(jaeger::Span::Disabled),
-				number: block_number,
-				status: LeafStatus::Fresh,
-			}),
+			&ActiveLeavesUpdate::start_work(new_leaf(block_hash, block_number)),
 		)
 		.await
 }
@@ -120,7 +115,7 @@ pub async fn participation_full_happy_path(
 	assert_matches!(
 	ctx_handle.recv().await,
 	AllMessages::CandidateValidation(
-		CandidateValidationMessage::ValidateFromExhaustive(_, _, candidate_receipt, _, timeout, tx)
+		CandidateValidationMessage::ValidateFromExhaustive(_, _, candidate_receipt, _, _, timeout, tx)
 		) if timeout == PvfExecTimeoutKind::Approval => {
 			if expected_commitments_hash != candidate_receipt.commitments_hash {
 				tx.send(Ok(ValidationResult::Invalid(InvalidCandidate::CommitmentsHashMismatch))).unwrap();
@@ -455,7 +450,7 @@ fn cast_invalid_vote_if_validation_fails_or_is_invalid() {
 		assert_matches!(
 			ctx_handle.recv().await,
 			AllMessages::CandidateValidation(
-				CandidateValidationMessage::ValidateFromExhaustive(_, _, _, _, timeout, tx)
+				CandidateValidationMessage::ValidateFromExhaustive(_, _, _, _, _, timeout, tx)
 			) if timeout == PvfExecTimeoutKind::Approval => {
 				tx.send(Ok(ValidationResult::Invalid(InvalidCandidate::Timeout))).unwrap();
 			},
@@ -492,7 +487,7 @@ fn cast_invalid_vote_if_commitments_dont_match() {
 		assert_matches!(
 			ctx_handle.recv().await,
 			AllMessages::CandidateValidation(
-				CandidateValidationMessage::ValidateFromExhaustive(_, _, _, _, timeout, tx)
+				CandidateValidationMessage::ValidateFromExhaustive(_, _, _, _, _, timeout, tx)
 			) if timeout == PvfExecTimeoutKind::Approval => {
 				tx.send(Ok(ValidationResult::Invalid(InvalidCandidate::CommitmentsHashMismatch))).unwrap();
 			},
@@ -529,7 +524,7 @@ fn cast_valid_vote_if_validation_passes() {
 		assert_matches!(
 			ctx_handle.recv().await,
 			AllMessages::CandidateValidation(
-				CandidateValidationMessage::ValidateFromExhaustive(_, _, _, _, timeout, tx)
+				CandidateValidationMessage::ValidateFromExhaustive(_, _, _, _, _, timeout, tx)
 			) if timeout == PvfExecTimeoutKind::Approval => {
 				tx.send(Ok(ValidationResult::Valid(dummy_candidate_commitments(None), PersistedValidationData::default()))).unwrap();
 			},
diff --git a/polkadot/node/core/dispute-coordinator/src/scraping/candidates.rs b/polkadot/node/core/dispute-coordinator/src/scraping/candidates.rs
index 38956700545cd46971120a415310880c2b6c3b9f..c7c9c519916e7c8081df0b48554642f0c2c0ac02 100644
--- a/polkadot/node/core/dispute-coordinator/src/scraping/candidates.rs
+++ b/polkadot/node/core/dispute-coordinator/src/scraping/candidates.rs
@@ -120,26 +120,24 @@ impl ScrapedCandidates {
 
 	// Removes all candidates up to a given height. The candidates at the block height are NOT
 	// removed.
-	pub fn remove_up_to_height(&mut self, height: &BlockNumber) -> HashSet<CandidateHash> {
-		let mut candidates_modified: HashSet<CandidateHash> = HashSet::new();
+	pub fn remove_up_to_height(&mut self, height: &BlockNumber) {
 		let not_stale = self.candidates_by_block_number.split_off(&height);
 		let stale = std::mem::take(&mut self.candidates_by_block_number);
 		self.candidates_by_block_number = not_stale;
-		for candidates in stale.values() {
-			for c in candidates {
-				self.candidates.remove(c);
-				candidates_modified.insert(*c);
-			}
+		for candidate in stale.values().flatten() {
+			self.candidates.remove(candidate);
 		}
-		candidates_modified
 	}
 
 	pub fn insert(&mut self, block_number: BlockNumber, candidate_hash: CandidateHash) {
-		self.candidates.insert(candidate_hash);
-		self.candidates_by_block_number
+		if self
+			.candidates_by_block_number
 			.entry(block_number)
 			.or_default()
-			.insert(candidate_hash);
+			.insert(candidate_hash)
+		{
+			self.candidates.insert(candidate_hash);
+		}
 	}
 
 	// Used only for tests to verify the pruning doesn't leak data.
@@ -159,6 +157,8 @@ mod scraped_candidates_tests {
 		let mut candidates = ScrapedCandidates::new();
 		let target = CandidateHash(BlakeTwo256::hash(&vec![1, 2, 3]));
 		candidates.insert(1, target);
+		// Repeated inserts at same height should be fine:
+		candidates.insert(1, target);
 
 		assert!(candidates.contains(&target));
 
diff --git a/polkadot/node/core/dispute-coordinator/src/scraping/mod.rs b/polkadot/node/core/dispute-coordinator/src/scraping/mod.rs
index f93ad0abab91efccabf48f2d8eece0d621ea81a4..fdf39cff0f2ef9b44f9f3d047cbab484a93ce5c5 100644
--- a/polkadot/node/core/dispute-coordinator/src/scraping/mod.rs
+++ b/polkadot/node/core/dispute-coordinator/src/scraping/mod.rs
@@ -14,13 +14,10 @@
 // You should have received a copy of the GNU General Public License
 // along with Polkadot.  If not, see <http://www.gnu.org/licenses/>.
 
-use std::{
-	collections::{BTreeMap, HashSet},
-	num::NonZeroUsize,
-};
+use std::collections::{btree_map::Entry, BTreeMap, HashSet};
 
 use futures::channel::oneshot;
-use lru::LruCache;
+use schnellru::{ByLength, LruMap};
 
 use polkadot_node_primitives::{DISPUTE_CANDIDATE_LIFETIME_AFTER_FINALIZATION, MAX_FINALITY_LAG};
 use polkadot_node_subsystem::{
@@ -52,10 +49,7 @@ mod candidates;
 /// `last_observed_blocks` LRU. This means, this value should the very least be as large as the
 /// number of expected forks for keeping chain scraping efficient. Making the LRU much larger than
 /// that has very limited use.
-const LRU_OBSERVED_BLOCKS_CAPACITY: NonZeroUsize = match NonZeroUsize::new(20) {
-	Some(cap) => cap,
-	None => panic!("Observed blocks cache size must be non-zero"),
-};
+const LRU_OBSERVED_BLOCKS_CAPACITY: u32 = 20;
 
 /// `ScrapedUpdates`
 ///
@@ -84,49 +78,64 @@ impl ScrapedUpdates {
 /// concluding against a candidate. Each candidate hash maps to a number of
 /// block heights, which in turn map to vectors of blocks at those heights.
 pub struct Inclusions {
-	inclusions_inner: BTreeMap<CandidateHash, BTreeMap<BlockNumber, Vec<Hash>>>,
+	inclusions_inner: BTreeMap<CandidateHash, BTreeMap<BlockNumber, HashSet<Hash>>>,
+	/// Keeps track at which block number a candidate was inserted. Used in `remove_up_to_height`.
+	/// Without this tracking we won't be able to remove all candidates before block X.
+	candidates_by_block_number: BTreeMap<BlockNumber, HashSet<CandidateHash>>,
 }
 
 impl Inclusions {
 	pub fn new() -> Self {
-		Self { inclusions_inner: BTreeMap::new() }
+		Self { inclusions_inner: BTreeMap::new(), candidates_by_block_number: BTreeMap::new() }
 	}
 
-	// Add parent block to the vector which has CandidateHash as an outer key and
-	// BlockNumber as an inner key
 	pub fn insert(
 		&mut self,
 		candidate_hash: CandidateHash,
 		block_number: BlockNumber,
 		block_hash: Hash,
 	) {
-		if let Some(blocks_including) = self.inclusions_inner.get_mut(&candidate_hash) {
-			if let Some(blocks_at_height) = blocks_including.get_mut(&block_number) {
-				blocks_at_height.push(block_hash);
-			} else {
-				blocks_including.insert(block_number, Vec::from([block_hash]));
-			}
-		} else {
-			let mut blocks_including: BTreeMap<BlockNumber, Vec<Hash>> = BTreeMap::new();
-			blocks_including.insert(block_number, Vec::from([block_hash]));
-			self.inclusions_inner.insert(candidate_hash, blocks_including);
-		}
+		self.inclusions_inner
+			.entry(candidate_hash)
+			.or_default()
+			.entry(block_number)
+			.or_default()
+			.insert(block_hash);
+
+		self.candidates_by_block_number
+			.entry(block_number)
+			.or_default()
+			.insert(candidate_hash);
 	}
 
-	pub fn remove_up_to_height(
-		&mut self,
-		height: &BlockNumber,
-		candidates_modified: HashSet<CandidateHash>,
-	) {
-		for candidate in candidates_modified {
-			if let Some(blocks_including) = self.inclusions_inner.get_mut(&candidate) {
-				// Returns everything after the given key, including the key. This works because the
-				// blocks are sorted in ascending order.
-				*blocks_including = blocks_including.split_off(height);
+	/// Removes all candidates up to a given height.
+	///
+	/// The candidates at the block height are NOT removed.
+	pub fn remove_up_to_height(&mut self, height: &BlockNumber) {
+		let not_stale = self.candidates_by_block_number.split_off(&height);
+		let stale = std::mem::take(&mut self.candidates_by_block_number);
+		self.candidates_by_block_number = not_stale;
+
+		for candidate in stale.into_values().flatten() {
+			match self.inclusions_inner.entry(candidate) {
+				Entry::Vacant(_) => {
+					// Rare case where same candidate was present on multiple heights, but all are
+					// pruned at the same time. This candidate was already pruned in the previous
+					// occurence so it is skipped now.
+				},
+				Entry::Occupied(mut e) => {
+					let mut blocks_including = std::mem::take(e.get_mut());
+					// Returns everything after the given key, including the key. This works because
+					// the blocks are sorted in ascending order.
+					blocks_including = blocks_including.split_off(&height);
+					if blocks_including.is_empty() {
+						e.remove_entry();
+					} else {
+						*e.get_mut() = blocks_including;
+					}
+				},
 			}
 		}
-		self.inclusions_inner
-			.retain(|_, blocks_including| blocks_including.keys().len() > 0);
 	}
 
 	pub fn get(&self, candidate: &CandidateHash) -> Vec<(BlockNumber, Hash)> {
@@ -140,6 +149,10 @@ impl Inclusions {
 		}
 		inclusions_as_vec
 	}
+
+	pub fn contains(&self, candidate: &CandidateHash) -> bool {
+		self.inclusions_inner.get(candidate).is_some()
+	}
 }
 
 /// Chain scraper
@@ -165,20 +178,20 @@ impl Inclusions {
 /// another precaution to have their `CandidateReceipts` available in case a dispute is raised on
 /// them,
 pub struct ChainScraper {
-	/// All candidates we have seen included, which not yet have been finalized.
-	included_candidates: candidates::ScrapedCandidates,
-	/// All candidates we have seen backed
+	/// All candidates we have seen backed.
 	backed_candidates: candidates::ScrapedCandidates,
-	/// Latest relay blocks observed by the provider.
-	///
-	/// We assume that ancestors of cached blocks are already processed, i.e. we have saved
-	/// corresponding included candidates.
-	last_observed_blocks: LruCache<Hash, ()>,
+
 	/// Maps included candidate hashes to one or more relay block heights and hashes.
 	/// These correspond to all the relay blocks which marked a candidate as included,
 	/// and are needed to apply reversions in case a dispute is concluded against the
 	/// candidate.
 	inclusions: Inclusions,
+
+	/// Latest relay blocks observed by the provider.
+	///
+	/// This is used to avoid redundant scraping of ancestry. We assume that ancestors of cached
+	/// blocks are already processed, i.e. we have saved corresponding included candidates.
+	last_observed_blocks: LruMap<Hash, ()>,
 }
 
 impl ChainScraper {
@@ -200,10 +213,9 @@ impl ChainScraper {
 		Sender: overseer::DisputeCoordinatorSenderTrait,
 	{
 		let mut s = Self {
-			included_candidates: candidates::ScrapedCandidates::new(),
 			backed_candidates: candidates::ScrapedCandidates::new(),
-			last_observed_blocks: LruCache::new(LRU_OBSERVED_BLOCKS_CAPACITY),
 			inclusions: Inclusions::new(),
+			last_observed_blocks: LruMap::new(ByLength::new(LRU_OBSERVED_BLOCKS_CAPACITY)),
 		};
 		let update =
 			ActiveLeavesUpdate { activated: Some(initial_head), deactivated: Default::default() };
@@ -213,7 +225,7 @@ impl ChainScraper {
 
 	/// Check whether we have seen a candidate included on any chain.
 	pub fn is_candidate_included(&self, candidate_hash: &CandidateHash) -> bool {
-		self.included_candidates.contains(candidate_hash)
+		self.inclusions.contains(candidate_hash)
 	}
 
 	/// Check whether the candidate is backed
@@ -288,7 +300,7 @@ impl ChainScraper {
 			},
 		}
 
-		self.last_observed_blocks.put(activated.hash, ());
+		self.last_observed_blocks.insert(activated.hash, ());
 
 		Ok(scraped_updates)
 	}
@@ -304,9 +316,7 @@ impl ChainScraper {
 		{
 			Some(key_to_prune) => {
 				self.backed_candidates.remove_up_to_height(&key_to_prune);
-				let candidates_modified =
-					self.included_candidates.remove_up_to_height(&key_to_prune);
-				self.inclusions.remove_up_to_height(&key_to_prune, candidates_modified);
+				self.inclusions.remove_up_to_height(&key_to_prune);
 			},
 			None => {
 				// Nothing to prune. We are still in the beginning of the chain and there are not
@@ -343,7 +353,6 @@ impl ChainScraper {
 						?block_number,
 						"Processing included event"
 					);
-					self.included_candidates.insert(block_number, candidate_hash);
 					self.inclusions.insert(candidate_hash, block_number, block_hash);
 					included_receipts.push(receipt);
 				},
diff --git a/polkadot/node/core/dispute-coordinator/src/scraping/tests.rs b/polkadot/node/core/dispute-coordinator/src/scraping/tests.rs
index 3dd58a060d709459bcf612a7958df3165eec4cb2..748f9a16f493e2bce191091638771aa5be57fa9f 100644
--- a/polkadot/node/core/dispute-coordinator/src/scraping/tests.rs
+++ b/polkadot/node/core/dispute-coordinator/src/scraping/tests.rs
@@ -14,7 +14,7 @@
 // You should have received a copy of the GNU General Public License
 // along with Polkadot.  If not, see <http://www.gnu.org/licenses/>.
 
-use std::{sync::Arc, time::Duration};
+use std::time::Duration;
 
 use assert_matches::assert_matches;
 
@@ -25,15 +25,15 @@ use sp_core::testing::TaskExecutor;
 use ::test_helpers::{dummy_collator, dummy_collator_signature, dummy_hash};
 use polkadot_node_primitives::DISPUTE_CANDIDATE_LIFETIME_AFTER_FINALIZATION;
 use polkadot_node_subsystem::{
-	jaeger,
 	messages::{
 		AllMessages, ChainApiMessage, DisputeCoordinatorMessage, RuntimeApiMessage,
 		RuntimeApiRequest,
 	},
-	ActivatedLeaf, ActiveLeavesUpdate, LeafStatus, SpawnGlue,
+	ActivatedLeaf, ActiveLeavesUpdate, SpawnGlue,
 };
 use polkadot_node_subsystem_test_helpers::{
-	make_subsystem_context, TestSubsystemContext, TestSubsystemContextHandle, TestSubsystemSender,
+	make_subsystem_context, mock::new_leaf, TestSubsystemContext, TestSubsystemContextHandle,
+	TestSubsystemSender,
 };
 use polkadot_node_subsystem_util::{reexports::SubsystemContext, TimeoutExt};
 use polkadot_primitives::{
@@ -41,7 +41,7 @@ use polkadot_primitives::{
 	GroupIndex, Hash, HashT, HeadData, Id as ParaId,
 };
 
-use crate::LOG_TARGET;
+use crate::{scraping::Inclusions, LOG_TARGET};
 
 use super::ChainScraper;
 
@@ -141,12 +141,7 @@ fn make_candidate_receipt(relay_parent: Hash) -> CandidateReceipt {
 
 /// Get a dummy `ActivatedLeaf` for a given block number.
 fn get_activated_leaf(n: BlockNumber) -> ActivatedLeaf {
-	ActivatedLeaf {
-		hash: get_block_number_hash(n),
-		number: n,
-		status: LeafStatus::Fresh,
-		span: Arc::new(jaeger::Span::Disabled),
-	}
+	new_leaf(get_block_number_hash(n), n)
 }
 
 /// Get a dummy relay parent hash for dummy block number.
@@ -154,6 +149,11 @@ fn get_block_number_hash(n: BlockNumber) -> Hash {
 	BlakeTwo256::hash(&n.encode())
 }
 
+// Creates a dummy relay chain block hash with the convention of hash(b<block_number><fork>).
+fn get_relay_block_hash(height: BlockNumber, fork: u32) -> Hash {
+	BlakeTwo256::hash(&format!("b_{}_{}", height, fork).encode())
+}
+
 /// Get a dummy event that corresponds to candidate inclusion for the given block number.
 fn get_backed_and_included_candidate_events(block_number: BlockNumber) -> Vec<CandidateEvent> {
 	let candidate_receipt = make_candidate_receipt(get_block_number_hash(block_number));
@@ -667,3 +667,594 @@ fn inclusions_per_candidate_properly_adds_and_prunes() {
 		assert!(scraper.get_blocks_including_candidate(&candidate.hash()).len() == 0);
 	});
 }
+
+// ----- Inclusions tests -----
+
+#[test]
+fn inclusions_initialization() {
+	let inclusions = Inclusions::new();
+
+	assert!(inclusions.inclusions_inner.is_empty(), "Expected inclusions_inner to be empty");
+	assert!(
+		inclusions.candidates_by_block_number.is_empty(),
+		"Expected candidates_by_block_number to be empty"
+	);
+}
+#[test]
+fn inclusions_insertion() {
+	let mut inclusions = Inclusions::new();
+	let candidate_receipt = make_candidate_receipt(get_magic_candidate_hash());
+	let candidate_hash = candidate_receipt.hash();
+	let block_number = 0;
+	let block_hash = get_block_number_hash(block_number);
+
+	inclusions.insert(candidate_hash, block_number, block_hash);
+
+	// Check inclusions_inner
+	assert!(inclusions.inclusions_inner.len() == 1, "Expected inclusions_inner to have length 1");
+	assert!(
+		inclusions.inclusions_inner.contains_key(&candidate_hash),
+		"Expected candidate_hash to be present in inclusions_inner"
+	);
+	let inner_map = inclusions.inclusions_inner.get(&candidate_hash).unwrap();
+	assert!(inner_map.len() == 1, "Expected inner_map to have length 1");
+	assert!(
+		inner_map.contains_key(&block_number),
+		"Expected block_number to be present for the candidate_hash in inclusions_inner"
+	);
+	let hash_set = inner_map.get(&block_number).unwrap();
+	assert!(hash_set.len() == 1, "Expected hash_map to have length 1");
+	assert!(
+		hash_set.contains(&block_hash),
+		"Expected block_hash to be present for the block_number in inclusions_inner"
+	);
+
+	// Check candidates_by_block_number
+	assert!(
+		inclusions.candidates_by_block_number.len() == 1,
+		"Expected candidates_by_block_number to have length 1"
+	);
+	assert!(
+		inclusions.candidates_by_block_number.contains_key(&block_number),
+		"Expected block_number to be present in candidates_by_block_number"
+	);
+	let candidate_set = inclusions.candidates_by_block_number.get(&block_number).unwrap();
+	assert!(
+		candidate_set.len() == 1,
+		"Expected candidate_set to have length 1 for the block_number in candidates_by_block_number"
+	);
+	assert!(
+		candidate_set.contains(&candidate_hash),
+		"Expected candidate_hash to be present for the block_number in candidates_by_block_number"
+	);
+}
+
+#[test]
+fn inclusions_get() {
+	let mut inclusions = Inclusions::new();
+	let candidate_receipt = make_candidate_receipt(get_magic_candidate_hash());
+	let candidate_hash = candidate_receipt.hash();
+
+	// Insert the candidate with multiple block numbers and block hashes
+	let block_numbers = [0, 1, 2];
+	let block_hashes: Vec<_> =
+		block_numbers.iter().map(|&num| get_block_number_hash(num)).collect();
+
+	for (&block_number, &block_hash) in block_numbers.iter().zip(&block_hashes) {
+		inclusions.insert(candidate_hash, block_number, block_hash);
+	}
+
+	// Call the get method for that candidate
+	let result = inclusions.get(&candidate_hash);
+
+	// Verify that the method returns the correct list of block numbers and hashes associated with
+	// that candidate
+	assert_eq!(
+		result.len(),
+		block_numbers.len(),
+		"Expected the same number of results as inserted block numbers"
+	);
+
+	for (&block_number, &block_hash) in block_numbers.iter().zip(&block_hashes) {
+		assert!(
+			result.contains(&(block_number, block_hash)),
+			"Expected to find ({}, {}) in the result",
+			block_number,
+			block_hash
+		);
+	}
+}
+
+#[test]
+fn inclusions_duplicate_insertion_same_height_and_block() {
+	let mut inclusions = Inclusions::new();
+
+	// Insert a candidate
+	let candidate1 = make_candidate_receipt(get_magic_candidate_hash()).hash();
+	let block_number = 0;
+	let block_hash = get_block_number_hash(block_number);
+
+	// Insert the candidate once
+	inclusions.insert(candidate1, block_number, block_hash);
+
+	// Insert the same candidate again at the same height and block
+	inclusions.insert(candidate1, block_number, block_hash);
+
+	// Check inclusions_inner
+	assert!(
+		inclusions.inclusions_inner.contains_key(&candidate1),
+		"Expected candidate1 to be present in inclusions_inner"
+	);
+	let inner_map = inclusions.inclusions_inner.get(&candidate1).unwrap();
+	assert!(
+		inner_map.contains_key(&block_number),
+		"Expected block_number to be present for the candidate1 in inclusions_inner"
+	);
+	let hash_set = inner_map.get(&block_number).unwrap();
+	assert_eq!(
+		hash_set.len(),
+		1,
+		"Expected only one block_hash for the block_number in inclusions_inner"
+	);
+	assert!(
+		hash_set.contains(&block_hash),
+		"Expected block_hash to be present for the block_number in inclusions_inner"
+	);
+
+	// Check candidates_by_block_number
+	assert!(
+		inclusions.candidates_by_block_number.contains_key(&block_number),
+		"Expected block_number to be present in candidates_by_block_number"
+	);
+	let candidate_set = inclusions.candidates_by_block_number.get(&block_number).unwrap();
+	assert_eq!(
+		candidate_set.len(),
+		1,
+		"Expected only one candidate for the block_number in candidates_by_block_number"
+	);
+	assert!(
+		candidate_set.contains(&candidate1),
+		"Expected candidate1 to be present for the block_number in candidates_by_block_number"
+	);
+}
+
+#[test]
+fn test_duplicate_insertion_same_height_different_blocks() {
+	let mut inclusions = Inclusions::new();
+
+	// Insert a candidate
+	let candidate1 = make_candidate_receipt(get_magic_candidate_hash()).hash();
+	let block_number = 0;
+	let block_hash1 = BlakeTwo256::hash(&"b1".encode());
+	let block_hash2 = BlakeTwo256::hash(&"b2".encode()); // Different block hash for the same height
+	inclusions.insert(candidate1, block_number, block_hash1);
+	inclusions.insert(candidate1, block_number, block_hash2);
+
+	// Check inclusions_inner
+	assert!(
+		inclusions.inclusions_inner.contains_key(&candidate1),
+		"Expected candidate1 to be present in inclusions_inner"
+	);
+	let inner_map = inclusions.inclusions_inner.get(&candidate1).unwrap();
+	assert!(
+		inner_map.contains_key(&block_number),
+		"Expected block_number to be present for the candidate1 in inclusions_inner"
+	);
+	let hash_set = inner_map.get(&block_number).unwrap();
+	assert_eq!(
+		hash_set.len(),
+		2,
+		"Expected two block_hashes for the block_number in inclusions_inner"
+	);
+	assert!(
+		hash_set.contains(&block_hash1),
+		"Expected block_hash1 to be present for the block_number in inclusions_inner"
+	);
+	assert!(
+		hash_set.contains(&block_hash2),
+		"Expected block_hash2 to be present for the block_number in inclusions_inner"
+	);
+
+	// Check candidates_by_block_number
+	assert!(
+		inclusions.candidates_by_block_number.contains_key(&block_number),
+		"Expected block_number to be present in candidates_by_block_number"
+	);
+	let candidate_set = inclusions.candidates_by_block_number.get(&block_number).unwrap();
+	assert_eq!(
+		candidate_set.len(),
+		1,
+		"Expected only one candidate for the block_number in candidates_by_block_number"
+	);
+	assert!(
+		candidate_set.contains(&candidate1),
+		"Expected candidate1 to be present for the block_number in candidates_by_block_number"
+	);
+}
+
+// ----- Inclusions removal tests -----
+// inclusions_removal_null_case
+//
+// inclusions_removal_one_candidate_one_height_one_branch
+//
+// inclusions_removal_one_candidate_one_height_multi_branch
+// inclusions_removal_one_candidate_multi_height_one_branch
+// inclusions_removal_multi_candidate_one_height_one_branch
+//
+// inclusions_removal_multi_candidate_multi_height_one_branch
+// inclusions_removal_one_candidate_multi_height_multi_branch
+// inclusions_removal_multi_candidate_one_height_multi_branch
+//
+// inclusions_removal_multi_candidate_multi_height_multi_branch
+#[test]
+fn inclusions_removal_null_case() {
+	let mut inclusions = Inclusions::new();
+	let height = 5;
+
+	// Ensure both maps are empty before the operation
+	assert!(inclusions.inclusions_inner.is_empty(), "Expected inclusions_inner to be empty");
+	assert!(
+		inclusions.candidates_by_block_number.is_empty(),
+		"Expected candidates_by_block_number to be empty"
+	);
+
+	inclusions.remove_up_to_height(&height);
+
+	// Ensure both maps remain empty after the operation
+	assert!(inclusions.inclusions_inner.is_empty(), "Expected inclusions_inner to be empty");
+	assert!(
+		inclusions.candidates_by_block_number.is_empty(),
+		"Expected candidates_by_block_number to be empty"
+	);
+}
+
+#[test]
+fn inclusions_removal_one_candidate_one_height_one_branch() {
+	let mut inclusions = Inclusions::new();
+
+	let candidate1 = make_candidate_receipt(BlakeTwo256::hash(&"c1".encode())).hash();
+
+	// B	0
+	// C1	0
+	inclusions.insert(candidate1, 0, get_relay_block_hash(0, 0));
+
+	// No prune case
+	inclusions.remove_up_to_height(&0);
+	assert!(inclusions.contains(&candidate1), "Expected candidate1 to remain");
+	assert!(inclusions.inclusions_inner.len() == 1);
+	assert!(inclusions.candidates_by_block_number.len() == 1);
+
+	// Prune case up to height 1
+	inclusions.remove_up_to_height(&1);
+	assert!(inclusions.inclusions_inner.is_empty(), "Expected inclusions_inner to be empty");
+	assert!(
+		inclusions.candidates_by_block_number.is_empty(),
+		"Expected candidates_by_block_number to be empty"
+	);
+}
+
+#[test]
+fn inclusions_removal_one_candidate_one_height_multi_branch() {
+	let mut inclusions = Inclusions::new();
+
+	let candidate1 = make_candidate_receipt(BlakeTwo256::hash(&"c1".encode())).hash();
+
+	// B	0
+	// C1	0&1
+	inclusions.insert(candidate1, 0, get_relay_block_hash(0, 0));
+	inclusions.insert(candidate1, 0, get_relay_block_hash(0, 1));
+
+	// No prune case
+	inclusions.remove_up_to_height(&0);
+	assert!(inclusions.contains(&candidate1), "Expected candidate1 to remain");
+	assert!(inclusions.inclusions_inner.len() == 1);
+	assert!(inclusions.inclusions_inner.get(&candidate1).unwrap().get(&0).unwrap().len() == 2);
+	assert!(inclusions.candidates_by_block_number.len() == 1);
+
+	// Prune case up to height 1
+	inclusions.remove_up_to_height(&1);
+	assert!(inclusions.inclusions_inner.is_empty(), "Expected inclusions_inner to be empty");
+	assert!(
+		inclusions.candidates_by_block_number.is_empty(),
+		"Expected candidates_by_block_number to be empty"
+	);
+}
+
+#[test]
+fn inclusions_removal_one_candidate_multi_height_one_branch() {
+	let mut inclusions = Inclusions::new();
+
+	let candidate1 = make_candidate_receipt(BlakeTwo256::hash(&"c1".encode())).hash();
+
+	// B	0	1	2	3	4
+	// C1		0		0
+	inclusions.insert(candidate1, 1, get_relay_block_hash(1, 0));
+	inclusions.insert(candidate1, 3, get_relay_block_hash(3, 0));
+
+	// No prune case
+	inclusions.remove_up_to_height(&1);
+	assert!(inclusions.contains(&candidate1), "Expected candidate1 to remain");
+	assert!(inclusions.inclusions_inner.len() == 1);
+	assert!(inclusions.candidates_by_block_number.len() == 2);
+
+	// Prune case up to height 2
+	inclusions.remove_up_to_height(&2);
+	assert!(inclusions.contains(&candidate1), "Expected candidate1 to remain");
+	assert!(inclusions.inclusions_inner.len() == 1);
+	assert!(inclusions.candidates_by_block_number.len() == 1);
+
+	// Prune case up to height 3
+	inclusions.remove_up_to_height(&3);
+	assert!(inclusions.contains(&candidate1), "Expected candidate1 to remain");
+	assert!(inclusions.inclusions_inner.len() == 1);
+	assert!(inclusions.candidates_by_block_number.len() == 1);
+
+	// Prune case up to height 20 (overshot)
+	inclusions.remove_up_to_height(&20);
+	assert!(inclusions.inclusions_inner.is_empty(), "Expected inclusions_inner to be empty");
+	assert!(
+		inclusions.candidates_by_block_number.is_empty(),
+		"Expected candidates_by_block_number to be empty"
+	);
+}
+
+#[test]
+fn inclusions_removal_multi_candidate_one_height_one_branch() {
+	let mut inclusions = Inclusions::new();
+
+	let candidate1 = make_candidate_receipt(BlakeTwo256::hash(&"c1".encode())).hash();
+	let candidate2 = make_candidate_receipt(BlakeTwo256::hash(&"c2".encode())).hash();
+	let candidate3 = make_candidate_receipt(BlakeTwo256::hash(&"c3".encode())).hash();
+
+	// B	0
+	// C1	0
+	// C2	0
+	// C3	0
+	inclusions.insert(candidate1, 0, get_relay_block_hash(0, 0));
+	inclusions.insert(candidate2, 0, get_relay_block_hash(0, 0));
+	inclusions.insert(candidate3, 0, get_relay_block_hash(0, 0));
+
+	// No prune case
+	inclusions.remove_up_to_height(&0);
+	assert!(inclusions.contains(&candidate1), "Expected candidate1 to remain");
+	assert!(inclusions.contains(&candidate2), "Expected candidate2 to remain");
+	assert!(inclusions.contains(&candidate3), "Expected candidate3 to remain");
+	assert!(inclusions.inclusions_inner.len() == 3);
+	assert!(inclusions.candidates_by_block_number.len() == 1);
+
+	// Prune case up to height 1
+	inclusions.remove_up_to_height(&1);
+	assert!(inclusions.inclusions_inner.is_empty(), "Expected inclusions_inner to be empty");
+	assert!(
+		inclusions.candidates_by_block_number.is_empty(),
+		"Expected candidates_by_block_number to be empty"
+	);
+}
+
+#[test]
+fn inclusions_removal_multi_candidate_multi_height_one_branch() {
+	let mut inclusions = Inclusions::new();
+
+	let candidate1 = make_candidate_receipt(BlakeTwo256::hash(&"c1".encode())).hash();
+	let candidate2 = make_candidate_receipt(BlakeTwo256::hash(&"c2".encode())).hash();
+	let candidate3 = make_candidate_receipt(BlakeTwo256::hash(&"c3".encode())).hash();
+
+	// B	0	1	2	3
+	// C1	0		0
+	// C2	0
+	// C3			0
+	inclusions.insert(candidate1, 0, get_relay_block_hash(0, 0));
+	inclusions.insert(candidate1, 2, get_relay_block_hash(2, 0));
+	inclusions.insert(candidate2, 0, get_relay_block_hash(0, 0));
+	inclusions.insert(candidate3, 2, get_relay_block_hash(2, 0));
+
+	// No prune case
+	inclusions.remove_up_to_height(&0);
+	assert!(inclusions.contains(&candidate1), "Expected candidate1 to remain");
+	assert!(inclusions.contains(&candidate2), "Expected candidate2 to remain");
+	assert!(inclusions.contains(&candidate3), "Expected candidate3 to remain");
+	assert!(inclusions.inclusions_inner.len() == 3);
+	assert!(inclusions.candidates_by_block_number.len() == 2);
+
+	// Prune case up to height 1
+	inclusions.remove_up_to_height(&1);
+	assert!(inclusions.contains(&candidate1), "Expected candidate1 to remain");
+	assert!(!inclusions.contains(&candidate2), "Expected candidate2 to be removed");
+	assert!(inclusions.contains(&candidate3), "Expected candidate3 to remain");
+	assert!(inclusions.inclusions_inner.len() == 2);
+	assert!(inclusions.candidates_by_block_number.len() == 1);
+
+	// Prune case up to height 2
+	inclusions.remove_up_to_height(&2);
+	assert!(inclusions.contains(&candidate1), "Expected candidate1 to remain");
+	assert!(!inclusions.contains(&candidate2), "Expected candidate2 to be removed");
+	assert!(inclusions.contains(&candidate3), "Expected candidate3 to remain");
+	assert!(inclusions.inclusions_inner.len() == 2);
+	assert!(inclusions.candidates_by_block_number.len() == 1);
+
+	// Prune case up to height 3
+	inclusions.remove_up_to_height(&3);
+	assert!(inclusions.inclusions_inner.is_empty(), "Expected inclusions_inner to be empty");
+	assert!(
+		inclusions.candidates_by_block_number.is_empty(),
+		"Expected candidates_by_block_number to be empty"
+	);
+}
+
+#[test]
+fn inclusions_removal_one_candidate_multi_height_multi_branch() {
+	let mut inclusions = Inclusions::new();
+
+	let candidate1 = make_candidate_receipt(BlakeTwo256::hash(&"c1".encode())).hash();
+
+	// B	0	1	2
+	// C1	0	0&1	1
+	inclusions.insert(candidate1, 0, get_relay_block_hash(0, 0));
+	inclusions.insert(candidate1, 1, get_relay_block_hash(1, 0));
+	inclusions.insert(candidate1, 1, get_relay_block_hash(1, 1));
+	inclusions.insert(candidate1, 2, get_relay_block_hash(2, 1));
+
+	// No prune case
+	inclusions.remove_up_to_height(&0);
+	assert!(inclusions.contains(&candidate1), "Expected candidate1 to remain");
+	assert!(inclusions.inclusions_inner.len() == 1);
+	assert!(inclusions.candidates_by_block_number.len() == 3);
+
+	// Prune case up to height 1
+	inclusions.remove_up_to_height(&1);
+	assert!(inclusions.contains(&candidate1), "Expected candidate1 to remain");
+	assert!(inclusions.inclusions_inner.len() == 1);
+	assert!(inclusions.candidates_by_block_number.len() == 2);
+
+	// Prune case up to height 2
+	inclusions.remove_up_to_height(&2);
+	assert!(inclusions.contains(&candidate1), "Expected candidate1 to remain");
+	assert!(inclusions.inclusions_inner.len() == 1);
+	assert!(inclusions.candidates_by_block_number.len() == 1);
+
+	// Prune case up to height 3
+	inclusions.remove_up_to_height(&3);
+	assert!(inclusions.inclusions_inner.is_empty(), "Expected inclusions_inner to be empty");
+	assert!(
+		inclusions.candidates_by_block_number.is_empty(),
+		"Expected candidates_by_block_number to be empty"
+	);
+}
+
+#[test]
+fn inclusions_removal_multi_candidate_one_height_multi_branch() {
+	let mut inclusions = Inclusions::new();
+
+	let candidate1 = make_candidate_receipt(BlakeTwo256::hash(&"c1".encode())).hash();
+	let candidate2 = make_candidate_receipt(BlakeTwo256::hash(&"c2".encode())).hash();
+	let candidate3 = make_candidate_receipt(BlakeTwo256::hash(&"c3".encode())).hash();
+
+	// B	0
+	// C1	0
+	// C2	0&1
+	// C3	1
+	inclusions.insert(candidate1, 0, get_relay_block_hash(0, 0));
+	inclusions.insert(candidate2, 0, get_relay_block_hash(0, 0));
+	inclusions.insert(candidate2, 0, get_relay_block_hash(0, 1));
+	inclusions.insert(candidate3, 0, get_relay_block_hash(0, 1));
+
+	// No prune case
+	inclusions.remove_up_to_height(&0);
+	assert!(inclusions.contains(&candidate1), "Expected candidate1 to remain");
+	assert!(inclusions.contains(&candidate2), "Expected candidate2 to remain");
+	assert!(inclusions.contains(&candidate3), "Expected candidate3 to remain");
+	assert!(inclusions.inclusions_inner.len() == 3);
+	assert!(inclusions.candidates_by_block_number.len() == 1);
+
+	// Prune case up to height 1
+	inclusions.remove_up_to_height(&1);
+	assert!(inclusions.inclusions_inner.is_empty(), "Expected inclusions_inner to be empty");
+	assert!(
+		inclusions.candidates_by_block_number.is_empty(),
+		"Expected candidates_by_block_number to be empty"
+	);
+}
+
+#[test]
+fn inclusions_removal_multi_candidate_multi_height_multi_branch() {
+	let mut inclusions = Inclusions::new();
+
+	let candidate1 = make_candidate_receipt(BlakeTwo256::hash(&"c1".encode())).hash();
+	let candidate2 = make_candidate_receipt(BlakeTwo256::hash(&"c2".encode())).hash();
+	let candidate3 = make_candidate_receipt(BlakeTwo256::hash(&"c3".encode())).hash();
+	let candidate4 = make_candidate_receipt(BlakeTwo256::hash(&"c4".encode())).hash();
+
+	// B	0	1	2
+	// C1	0&1	0	0	//shouldn't get pruned as long as one of the forks need it
+	// C2		1	1
+	// C3	0	1
+	// C4		0&1
+	inclusions.insert(candidate1, 0, get_relay_block_hash(0, 0));
+	inclusions.insert(candidate1, 0, get_relay_block_hash(0, 1));
+	inclusions.insert(candidate1, 1, get_relay_block_hash(1, 0));
+	inclusions.insert(candidate1, 2, get_relay_block_hash(2, 0));
+	inclusions.insert(candidate2, 1, get_relay_block_hash(1, 1));
+	inclusions.insert(candidate2, 2, get_relay_block_hash(2, 1));
+	inclusions.insert(candidate3, 0, get_relay_block_hash(0, 0));
+	inclusions.insert(candidate3, 1, get_relay_block_hash(1, 1));
+	inclusions.insert(candidate4, 1, get_relay_block_hash(1, 0));
+	inclusions.insert(candidate4, 1, get_relay_block_hash(1, 1));
+
+	// No prune case
+	inclusions.remove_up_to_height(&0);
+	assert!(inclusions.contains(&candidate1), "Expected candidate1 to remain");
+	assert!(inclusions.contains(&candidate2), "Expected candidate2 to remain");
+	assert!(inclusions.contains(&candidate3), "Expected candidate3 to remain");
+	assert!(inclusions.contains(&candidate4), "Expected candidate4 to remain");
+	assert!(inclusions.inclusions_inner.len() == 4);
+	assert!(inclusions.candidates_by_block_number.len() == 3);
+
+	// Prune case up to height 1
+	inclusions.remove_up_to_height(&1);
+	assert!(inclusions.contains(&candidate1), "Expected candidate1 to remain");
+	assert!(inclusions.contains(&candidate2), "Expected candidate2 to remain");
+	assert!(inclusions.contains(&candidate3), "Expected candidate3 to remain");
+	assert!(inclusions.contains(&candidate4), "Expected candidate4 to remain");
+	assert!(inclusions.inclusions_inner.len() == 4);
+	assert!(inclusions.candidates_by_block_number.len() == 2);
+
+	// Prune case up to height 2
+	inclusions.remove_up_to_height(&2);
+	assert!(inclusions.contains(&candidate1), "Expected candidate1 to remain");
+	assert!(inclusions.contains(&candidate2), "Expected candidate2 to remain");
+	assert!(!inclusions.contains(&candidate3), "Expected candidate3 to be removed");
+	assert!(!inclusions.contains(&candidate4), "Expected candidate4 to be removed");
+	assert!(inclusions.inclusions_inner.len() == 2);
+	assert!(inclusions.candidates_by_block_number.len() == 1);
+
+	// Prune case up to height 3
+	inclusions.remove_up_to_height(&3);
+	assert!(inclusions.inclusions_inner.is_empty(), "Expected inclusions_inner to be empty");
+	assert!(
+		inclusions.candidates_by_block_number.is_empty(),
+		"Expected candidates_by_block_number to be empty"
+	);
+}
+
+#[test]
+fn inclusions_removal_multi_candidate_multi_height_multi_branch_multi_height_prune() {
+	let mut inclusions = Inclusions::new();
+
+	let candidate1 = make_candidate_receipt(BlakeTwo256::hash(&"c1".encode())).hash();
+	let candidate2 = make_candidate_receipt(BlakeTwo256::hash(&"c2".encode())).hash();
+	let candidate3 = make_candidate_receipt(BlakeTwo256::hash(&"c3".encode())).hash();
+	let candidate4 = make_candidate_receipt(BlakeTwo256::hash(&"c4".encode())).hash();
+
+	// B	0	1	2
+	// C1	0&1	0	0
+	// C2		1	1
+	// C3	0	1
+	// C4		0&1
+	inclusions.insert(candidate1, 0, get_relay_block_hash(0, 0));
+	inclusions.insert(candidate1, 0, get_relay_block_hash(0, 1));
+	inclusions.insert(candidate1, 1, get_relay_block_hash(1, 0));
+	inclusions.insert(candidate1, 2, get_relay_block_hash(2, 0));
+	inclusions.insert(candidate2, 1, get_relay_block_hash(1, 1));
+	inclusions.insert(candidate2, 2, get_relay_block_hash(2, 1));
+	inclusions.insert(candidate3, 0, get_relay_block_hash(0, 0));
+	inclusions.insert(candidate3, 1, get_relay_block_hash(1, 1));
+	inclusions.insert(candidate4, 1, get_relay_block_hash(1, 0));
+	inclusions.insert(candidate4, 1, get_relay_block_hash(1, 1));
+
+	// Prune case up to height 2
+	inclusions.remove_up_to_height(&2);
+	assert!(inclusions.contains(&candidate1), "Expected candidate1 to remain");
+	assert!(inclusions.contains(&candidate2), "Expected candidate2 to remain");
+	assert!(!inclusions.contains(&candidate3), "Expected candidate3 to be removed");
+	assert!(!inclusions.contains(&candidate4), "Expected candidate4 to be removed");
+	assert!(inclusions.inclusions_inner.len() == 2);
+	assert!(inclusions.candidates_by_block_number.len() == 1);
+
+	// Prune case up to height 20
+	inclusions.remove_up_to_height(&20);
+	assert!(inclusions.inclusions_inner.is_empty(), "Expected inclusions_inner to be empty");
+	assert!(
+		inclusions.candidates_by_block_number.is_empty(),
+		"Expected candidates_by_block_number to be empty"
+	);
+}
diff --git a/polkadot/node/core/dispute-coordinator/src/tests.rs b/polkadot/node/core/dispute-coordinator/src/tests.rs
index 75eae8200dc6afa0ea5b5446b0ecc78564602d1f..9254c2a851cea502ed8daccf434a68f48863de94 100644
--- a/polkadot/node/core/dispute-coordinator/src/tests.rs
+++ b/polkadot/node/core/dispute-coordinator/src/tests.rs
@@ -54,18 +54,17 @@ use sp_keystore::{Keystore, KeystorePtr};
 use ::test_helpers::{dummy_candidate_receipt_bad_sig, dummy_digest, dummy_hash};
 use polkadot_node_primitives::{Timestamp, ACTIVE_DURATION_SECS};
 use polkadot_node_subsystem::{
-	jaeger,
 	messages::{AllMessages, BlockDescription, RuntimeApiMessage, RuntimeApiRequest},
-	ActivatedLeaf, ActiveLeavesUpdate, LeafStatus,
+	ActiveLeavesUpdate,
 };
 use polkadot_node_subsystem_test_helpers::{
-	make_buffered_subsystem_context, TestSubsystemContextHandle,
+	make_buffered_subsystem_context, mock::new_leaf, TestSubsystemContextHandle,
 };
 use polkadot_primitives::{
 	ApprovalVote, BlockNumber, CandidateCommitments, CandidateEvent, CandidateHash,
-	CandidateReceipt, CoreIndex, DisputeStatement, GroupIndex, Hash, HeadData, Header, IndexedVec,
-	MultiDisputeStatementSet, ScrapedOnChainVotes, SessionIndex, SessionInfo, SigningContext,
-	ValidDisputeStatementKind, ValidatorId, ValidatorIndex, ValidatorSignature,
+	CandidateReceipt, CoreIndex, DisputeStatement, ExecutorParams, GroupIndex, Hash, HeadData,
+	Header, IndexedVec, MultiDisputeStatementSet, ScrapedOnChainVotes, SessionIndex, SessionInfo,
+	SigningContext, ValidDisputeStatementKind, ValidatorId, ValidatorIndex, ValidatorSignature,
 };
 
 use crate::{
@@ -276,12 +275,7 @@ impl TestState {
 		gum::debug!(?block_number, "Activating block in activate_leaf_at_session.");
 		virtual_overseer
 			.send(FromOrchestra::Signal(OverseerSignal::ActiveLeaves(
-				ActiveLeavesUpdate::start_work(ActivatedLeaf {
-					hash: block_hash,
-					span: Arc::new(jaeger::Span::Disabled),
-					number: block_number,
-					status: LeafStatus::Fresh,
-				}),
+				ActiveLeavesUpdate::start_work(new_leaf(block_hash, block_number)),
 			)))
 			.await;
 
@@ -347,6 +341,17 @@ impl TestState {
 									let _ = tx.send(Ok(Some(self.session_info())));
 								}
 							);
+							assert_matches!(
+								overseer_recv(virtual_overseer).await,
+								AllMessages::RuntimeApi(RuntimeApiMessage::Request(
+									h,
+									RuntimeApiRequest::SessionExecutorParams(session_index, tx),
+								)) => {
+									assert_eq!(h, block_hash);
+									assert_eq!(session_index, i);
+									let _ = tx.send(Ok(Some(ExecutorParams::default())));
+								}
+							);
 						}
 					}
 
@@ -438,12 +443,7 @@ impl TestState {
 			);
 			virtual_overseer
 				.send(FromOrchestra::Signal(OverseerSignal::ActiveLeaves(
-					ActiveLeavesUpdate::start_work(ActivatedLeaf {
-						hash: *leaf,
-						number: n as u32,
-						span: Arc::new(jaeger::Span::Disabled),
-						status: LeafStatus::Fresh,
-					}),
+					ActiveLeavesUpdate::start_work(new_leaf(*leaf, n as u32)),
 				)))
 				.await;
 
@@ -3482,6 +3482,16 @@ fn session_info_is_requested_only_once() {
 					let _ = tx.send(Ok(Some(test_state.session_info())));
 				}
 			);
+			assert_matches!(
+				virtual_overseer.recv().await,
+				AllMessages::RuntimeApi(RuntimeApiMessage::Request(
+					_,
+					RuntimeApiRequest::SessionExecutorParams(session_index, tx),
+				)) => {
+					assert_eq!(session_index, 2);
+					let _ = tx.send(Ok(Some(ExecutorParams::default())));
+				}
+			);
 			test_state
 		})
 	});
@@ -3532,6 +3542,16 @@ fn session_info_big_jump_works() {
 						let _ = tx.send(Ok(Some(test_state.session_info())));
 					}
 				);
+				assert_matches!(
+					virtual_overseer.recv().await,
+					AllMessages::RuntimeApi(RuntimeApiMessage::Request(
+						_,
+						RuntimeApiRequest::SessionExecutorParams(session_index, tx),
+					)) => {
+						assert_eq!(session_index, expected_idx);
+						let _ = tx.send(Ok(Some(ExecutorParams::default())));
+					}
+				);
 			}
 			test_state
 		})
@@ -3582,6 +3602,16 @@ fn session_info_small_jump_works() {
 						let _ = tx.send(Ok(Some(test_state.session_info())));
 					}
 				);
+				assert_matches!(
+					virtual_overseer.recv().await,
+					AllMessages::RuntimeApi(RuntimeApiMessage::Request(
+						_,
+						RuntimeApiRequest::SessionExecutorParams(session_index, tx),
+					)) => {
+						assert_eq!(session_index, expected_idx);
+						let _ = tx.send(Ok(Some(ExecutorParams::default())));
+					}
+				);
 			}
 			test_state
 		})
diff --git a/polkadot/node/core/parachains-inherent/Cargo.toml b/polkadot/node/core/parachains-inherent/Cargo.toml
index 19b5d7acb874fea2a5de49b4e8f3149865a54bac..18d91dcfb565abcc0011777d18b881966013701a 100644
--- a/polkadot/node/core/parachains-inherent/Cargo.toml
+++ b/polkadot/node/core/parachains-inherent/Cargo.toml
@@ -1,6 +1,6 @@
 [package]
 name = "polkadot-node-core-parachains-inherent"
-version.workspace = true
+version = "1.0.0"
 authors.workspace = true
 edition.workspace = true
 license.workspace = true
@@ -9,7 +9,7 @@ license.workspace = true
 futures = "0.3.21"
 futures-timer = "3.0.2"
 gum = { package = "tracing-gum", path = "../../gum" }
-thiserror = "1.0.31"
+thiserror = "1.0.48"
 async-trait = "0.1.57"
 polkadot-node-subsystem = { path = "../../subsystem" }
 polkadot-overseer = { path = "../../overseer" }
diff --git a/polkadot/node/core/parachains-inherent/src/lib.rs b/polkadot/node/core/parachains-inherent/src/lib.rs
index 3063147fb1360ad87f76c7a2605104677e893104..1de3cab32bed1678822438b22b95b43028a01784 100644
--- a/polkadot/node/core/parachains-inherent/src/lib.rs
+++ b/polkadot/node/core/parachains-inherent/src/lib.rs
@@ -19,7 +19,7 @@
 //! Parachain backing and approval is an off-chain process, but the parachain needs to progress on
 //! chain as well. To make it progress on chain a block producer needs to forward information about
 //! the state of a parachain to the runtime. This information is forwarded through an inherent to
-//! the runtime. Here we provide the [`ParachainInherentDataProvider`] that requests the relevant
+//! the runtime. Here we provide the [`ParachainsInherentDataProvider`] that requests the relevant
 //! data from the provisioner subsystem and creates the the inherent data that the runtime will use
 //! to create an inherent.
 
diff --git a/polkadot/node/core/prospective-parachains/Cargo.toml b/polkadot/node/core/prospective-parachains/Cargo.toml
index 5166534cf6fb0675015f14e44657c56df6ff0a39..77a59d87f3fa77a42347550e7538d21b8ceda5b0 100644
--- a/polkadot/node/core/prospective-parachains/Cargo.toml
+++ b/polkadot/node/core/prospective-parachains/Cargo.toml
@@ -1,6 +1,6 @@
 [package]
 name = "polkadot-node-core-prospective-parachains"
-version.workspace = true
+version = "1.0.0"
 authors.workspace = true
 edition.workspace = true
 license.workspace = true
@@ -9,7 +9,7 @@ license.workspace = true
 futures = "0.3.19"
 gum = { package = "tracing-gum", path = "../../gum" }
 parity-scale-codec = "3.6.4"
-thiserror = "1.0.30"
+thiserror = "1.0.48"
 fatality = "0.0.6"
 bitvec = "1"
 
diff --git a/polkadot/node/core/prospective-parachains/src/error.rs b/polkadot/node/core/prospective-parachains/src/error.rs
index 0ad98d1ff9088087dc096d14d20e432dba85264a..2b0933ab1c7e03e1a020d3cdc2c4953dfd9d294a 100644
--- a/polkadot/node/core/prospective-parachains/src/error.rs
+++ b/polkadot/node/core/prospective-parachains/src/error.rs
@@ -1,4 +1,4 @@
-// Copyright 2022 Parity Technologies (UK) Ltd.
+// Copyright (C) Parity Technologies (UK) Ltd.
 // This file is part of Polkadot.
 
 // Polkadot is free software: you can redistribute it and/or modify
diff --git a/polkadot/node/core/prospective-parachains/src/fragment_tree.rs b/polkadot/node/core/prospective-parachains/src/fragment_tree.rs
index ec06f2d6070e58139365ef558c9464195f0367c6..292e4ebe5282b4344853ca5f3247caf1d9af6cc7 100644
--- a/polkadot/node/core/prospective-parachains/src/fragment_tree.rs
+++ b/polkadot/node/core/prospective-parachains/src/fragment_tree.rs
@@ -1,4 +1,4 @@
-// Copyright 2022 Parity Technologies (UK) Ltd.
+// Copyright (C) Parity Technologies (UK) Ltd.
 // This file is part of Polkadot.
 
 // Polkadot is free software: you can redistribute it and/or modify
@@ -96,10 +96,10 @@ use std::{
 
 use super::LOG_TARGET;
 use bitvec::prelude::*;
-use polkadot_node_subsystem_util::inclusion_emulator::staging::{
+use polkadot_node_subsystem_util::inclusion_emulator::{
 	ConstraintModifications, Constraints, Fragment, ProspectiveCandidate, RelayChainBlockInfo,
 };
-use polkadot_primitives::vstaging::{
+use polkadot_primitives::{
 	BlockNumber, CandidateHash, CommittedCandidateReceipt, Hash, HeadData, Id as ParaId,
 	PersistedValidationData,
 };
@@ -981,10 +981,8 @@ impl FragmentNode {
 mod tests {
 	use super::*;
 	use assert_matches::assert_matches;
-	use polkadot_node_subsystem_util::inclusion_emulator::staging::InboundHrmpLimitations;
-	use polkadot_primitives::vstaging::{
-		BlockNumber, CandidateCommitments, CandidateDescriptor, HeadData,
-	};
+	use polkadot_node_subsystem_util::inclusion_emulator::InboundHrmpLimitations;
+	use polkadot_primitives::{BlockNumber, CandidateCommitments, CandidateDescriptor, HeadData};
 	use polkadot_primitives_test_helpers as test_helpers;
 
 	fn make_constraints(
diff --git a/polkadot/node/core/prospective-parachains/src/lib.rs b/polkadot/node/core/prospective-parachains/src/lib.rs
index a7f37d873d6a84525a8dc6ab3cf0aac886e3e09e..fcca0dd0b536ba69d27805ae1cf37b54d834fd02 100644
--- a/polkadot/node/core/prospective-parachains/src/lib.rs
+++ b/polkadot/node/core/prospective-parachains/src/lib.rs
@@ -1,4 +1,4 @@
-// Copyright 2022-2023 Parity Technologies (UK) Ltd.
+// Copyright (C) Parity Technologies (UK) Ltd.
 // This file is part of Polkadot.
 
 // Polkadot is free software: you can redistribute it and/or modify
@@ -22,7 +22,7 @@
 //! backing phases of parachain consensus.
 //!
 //! This is primarily an implementation of "Fragment Trees", as described in
-//! [`polkadot_node_subsystem_util::inclusion_emulator::staging`].
+//! [`polkadot_node_subsystem_util::inclusion_emulator`].
 //!
 //! This subsystem also handles concerns such as the relay-chain being forkful and session changes.
 
@@ -42,13 +42,14 @@ use polkadot_node_subsystem::{
 	overseer, ActiveLeavesUpdate, FromOrchestra, OverseerSignal, SpawnedSubsystem, SubsystemError,
 };
 use polkadot_node_subsystem_util::{
-	inclusion_emulator::staging::{Constraints, RelayChainBlockInfo},
+	inclusion_emulator::{Constraints, RelayChainBlockInfo},
 	request_session_index_for_child,
 	runtime::{prospective_parachains_mode, ProspectiveParachainsMode},
 };
-use polkadot_primitives::vstaging::{
-	BlockNumber, CandidateHash, CandidatePendingAvailability, CommittedCandidateReceipt, CoreState,
-	Hash, HeadData, Header, Id as ParaId, PersistedValidationData,
+use polkadot_primitives::{
+	async_backing::CandidatePendingAvailability, BlockNumber, CandidateHash,
+	CommittedCandidateReceipt, CoreState, Hash, HeadData, Header, Id as ParaId,
+	PersistedValidationData,
 };
 
 use crate::{
@@ -792,7 +793,7 @@ async fn fetch_backing_state<Context>(
 	let (tx, rx) = oneshot::channel();
 	ctx.send_message(RuntimeApiMessage::Request(
 		relay_parent,
-		RuntimeApiRequest::StagingParaBackingState(para_id, tx),
+		RuntimeApiRequest::ParaBackingState(para_id, tx),
 	))
 	.await;
 
diff --git a/polkadot/node/core/prospective-parachains/src/metrics.rs b/polkadot/node/core/prospective-parachains/src/metrics.rs
index d7a1760bb4597e18eb49d1f5efcbde374f1443a2..57061497a1c0d2923dedeea341a4cf4cf2ed8807 100644
--- a/polkadot/node/core/prospective-parachains/src/metrics.rs
+++ b/polkadot/node/core/prospective-parachains/src/metrics.rs
@@ -1,4 +1,4 @@
-// Copyright 2023 Parity Technologies (UK) Ltd.
+// Copyright (C) Parity Technologies (UK) Ltd.
 // This file is part of Polkadot.
 
 // Polkadot is free software: you can redistribute it and/or modify
diff --git a/polkadot/node/core/prospective-parachains/src/tests.rs b/polkadot/node/core/prospective-parachains/src/tests.rs
index de7a84d9a608a98efa0baf7fd38eccb6458a5827..d2cd23fe95fc1d8638238c8e30b5227da7e883a0 100644
--- a/polkadot/node/core/prospective-parachains/src/tests.rs
+++ b/polkadot/node/core/prospective-parachains/src/tests.rs
@@ -1,4 +1,4 @@
-// Copyright 2022 Parity Technologies (UK) Ltd.
+// Copyright (C) Parity Technologies (UK) Ltd.
 // This file is part of Polkadot.
 
 // Polkadot is free software: you can redistribute it and/or modify
@@ -24,14 +24,14 @@ use polkadot_node_subsystem::{
 	},
 };
 use polkadot_node_subsystem_test_helpers as test_helpers;
-use polkadot_node_subsystem_types::{jaeger, ActivatedLeaf, LeafStatus};
 use polkadot_primitives::{
-	vstaging::{AsyncBackingParams, BackingState, Constraints, InboundHrmpLimitations},
+	async_backing::{AsyncBackingParams, BackingState, Constraints, InboundHrmpLimitations},
 	CommittedCandidateReceipt, HeadData, Header, PersistedValidationData, ScheduledCore,
 	ValidationCodeHash,
 };
 use polkadot_primitives_test_helpers::make_candidate;
 use std::sync::Arc;
+use test_helpers::mock::new_leaf;
 
 const ALLOWED_ANCESTRY_LEN: u32 = 3;
 const ASYNC_BACKING_PARAMETERS: AsyncBackingParams =
@@ -197,12 +197,7 @@ async fn activate_leaf_with_params(
 ) {
 	let TestLeaf { number, hash, .. } = leaf;
 
-	let activated = ActivatedLeaf {
-		hash: *hash,
-		number: *number,
-		status: LeafStatus::Fresh,
-		span: Arc::new(jaeger::Span::Disabled),
-	};
+	let activated = new_leaf(*hash, *number);
 
 	virtual_overseer
 		.send(FromOrchestra::Signal(OverseerSignal::ActiveLeaves(ActiveLeavesUpdate::start_work(
@@ -224,7 +219,7 @@ async fn handle_leaf_activation(
 	assert_matches!(
 		virtual_overseer.recv().await,
 		AllMessages::RuntimeApi(
-			RuntimeApiMessage::Request(parent, RuntimeApiRequest::StagingAsyncBackingParams(tx))
+			RuntimeApiMessage::Request(parent, RuntimeApiRequest::AsyncBackingParams(tx))
 		) if parent == *hash => {
 			tx.send(Ok(async_backing_params)).unwrap();
 		}
@@ -289,7 +284,7 @@ async fn handle_leaf_activation(
 		let para_id = match message {
 			AllMessages::RuntimeApi(RuntimeApiMessage::Request(
 				_,
-				RuntimeApiRequest::StagingParaBackingState(p_id, _),
+				RuntimeApiRequest::ParaBackingState(p_id, _),
 			)) => p_id,
 			_ => panic!("received unexpected message {:?}", message),
 		};
@@ -308,7 +303,7 @@ async fn handle_leaf_activation(
 		assert_matches!(
 			message,
 			AllMessages::RuntimeApi(
-				RuntimeApiMessage::Request(parent, RuntimeApiRequest::StagingParaBackingState(p_id, tx))
+				RuntimeApiMessage::Request(parent, RuntimeApiRequest::ParaBackingState(p_id, tx))
 			) if parent == *hash && p_id == para_id => {
 				tx.send(Ok(Some(backing_state))).unwrap();
 			}
@@ -497,19 +492,14 @@ fn should_do_no_work_if_async_backing_disabled_for_leaf() {
 		// Start work on some new parent.
 		virtual_overseer
 			.send(FromOrchestra::Signal(OverseerSignal::ActiveLeaves(
-				ActiveLeavesUpdate::start_work(ActivatedLeaf {
-					hash,
-					number: 1,
-					status: LeafStatus::Fresh,
-					span: Arc::new(jaeger::Span::Disabled),
-				}),
+				ActiveLeavesUpdate::start_work(new_leaf(hash, 1)),
 			)))
 			.await;
 
 		assert_matches!(
 			virtual_overseer.recv().await,
 			AllMessages::RuntimeApi(
-				RuntimeApiMessage::Request(parent, RuntimeApiRequest::StagingAsyncBackingParams(tx))
+				RuntimeApiMessage::Request(parent, RuntimeApiRequest::AsyncBackingParams(tx))
 			) if parent == hash => {
 				tx.send(Err(ASYNC_BACKING_DISABLED_ERROR)).unwrap();
 			}
@@ -1318,12 +1308,7 @@ fn correctly_updates_leaves() {
 			.await;
 
 		// Activate a leaf and remove one at the same time.
-		let activated = ActivatedLeaf {
-			hash: leaf_c.hash,
-			number: leaf_c.number,
-			span: Arc::new(jaeger::Span::Disabled),
-			status: LeafStatus::Fresh,
-		};
+		let activated = new_leaf(leaf_c.hash, leaf_c.number);
 		let update = ActiveLeavesUpdate {
 			activated: Some(activated),
 			deactivated: [leaf_b.hash][..].into(),
@@ -1349,12 +1334,7 @@ fn correctly_updates_leaves() {
 			.await;
 
 		// Activate and deactivate the same leaf.
-		let activated = ActivatedLeaf {
-			hash: leaf_a.hash,
-			number: leaf_a.number,
-			span: Arc::new(jaeger::Span::Disabled),
-			status: LeafStatus::Fresh,
-		};
+		let activated = new_leaf(leaf_a.hash, leaf_a.number);
 		let update = ActiveLeavesUpdate {
 			activated: Some(activated),
 			deactivated: [leaf_a.hash][..].into(),
@@ -1578,12 +1558,7 @@ fn uses_ancestry_only_within_session() {
 			vec![Hash::repeat_byte(4), Hash::repeat_byte(3), Hash::repeat_byte(2)];
 		let session_change_hash = Hash::repeat_byte(3);
 
-		let activated = ActivatedLeaf {
-			hash,
-			number,
-			status: LeafStatus::Fresh,
-			span: Arc::new(jaeger::Span::Disabled),
-		};
+		let activated = new_leaf(hash, number);
 
 		virtual_overseer
 			.send(FromOrchestra::Signal(OverseerSignal::ActiveLeaves(
@@ -1594,7 +1569,7 @@ fn uses_ancestry_only_within_session() {
 		assert_matches!(
 			virtual_overseer.recv().await,
 			AllMessages::RuntimeApi(
-				RuntimeApiMessage::Request(parent, RuntimeApiRequest::StagingAsyncBackingParams(tx))
+				RuntimeApiMessage::Request(parent, RuntimeApiRequest::AsyncBackingParams(tx))
 			) if parent == hash => {
 				tx.send(Ok(AsyncBackingParams { max_candidate_depth: 0, allowed_ancestry_len: ancestry_len })).unwrap();
 			}
diff --git a/polkadot/node/core/provisioner/Cargo.toml b/polkadot/node/core/provisioner/Cargo.toml
index 25d624aa3f75674c859b28798d9a15b9ec3b8f83..05ea92caa976d99c9274313821cfdce212d74b4b 100644
--- a/polkadot/node/core/provisioner/Cargo.toml
+++ b/polkadot/node/core/provisioner/Cargo.toml
@@ -1,6 +1,6 @@
 [package]
 name = "polkadot-node-core-provisioner"
-version.workspace = true
+version = "1.0.0"
 authors.workspace = true
 edition.workspace = true
 license.workspace = true
@@ -9,7 +9,7 @@ license.workspace = true
 bitvec = { version = "1.0.0", default-features = false, features = ["alloc"] }
 futures = "0.3.21"
 gum = { package = "tracing-gum", path = "../../gum" }
-thiserror = "1.0.31"
+thiserror = "1.0.48"
 polkadot-primitives = { path = "../../../primitives" }
 polkadot-node-primitives = { path = "../../primitives" }
 polkadot-node-subsystem = { path = "../../subsystem" }
diff --git a/polkadot/node/core/provisioner/src/disputes/prioritized_selection/tests.rs b/polkadot/node/core/provisioner/src/disputes/prioritized_selection/tests.rs
index 2fdeadb2f4f0e532be1e460507d428a07e1cbc1a..f6c49e52eeb981d6a6a22a6d9a85301933d3fde4 100644
--- a/polkadot/node/core/provisioner/src/disputes/prioritized_selection/tests.rs
+++ b/polkadot/node/core/provisioner/src/disputes/prioritized_selection/tests.rs
@@ -24,12 +24,11 @@ use polkadot_node_primitives::{CandidateVotes, DisputeStatus, ACTIVE_DURATION_SE
 use polkadot_node_subsystem::messages::{
 	AllMessages, DisputeCoordinatorMessage, RuntimeApiMessage, RuntimeApiRequest,
 };
-use polkadot_node_subsystem_test_helpers::TestSubsystemSender;
+use polkadot_node_subsystem_test_helpers::{mock::new_leaf, TestSubsystemSender};
 use polkadot_primitives::{
 	CandidateHash, DisputeState, InvalidDisputeStatementKind, SessionIndex,
 	ValidDisputeStatementKind, ValidatorSignature,
 };
-use std::sync::Arc;
 use test_helpers;
 
 //
@@ -353,12 +352,7 @@ async fn mock_overseer(
 }
 
 fn leaf() -> ActivatedLeaf {
-	ActivatedLeaf {
-		hash: Hash::repeat_byte(0xAA),
-		number: 0xAA,
-		status: LeafStatus::Fresh,
-		span: Arc::new(jaeger::Span::Disabled),
-	}
+	new_leaf(Hash::repeat_byte(0xAA), 0xAA)
 }
 
 struct TestDisputes {
diff --git a/polkadot/node/core/pvf-checker/Cargo.toml b/polkadot/node/core/pvf-checker/Cargo.toml
index 9d2fe6c8b6eb2025e572492985f8136011a71341..0326a20e5a52e7a07fe96a8c721af1c6ac86e5ef 100644
--- a/polkadot/node/core/pvf-checker/Cargo.toml
+++ b/polkadot/node/core/pvf-checker/Cargo.toml
@@ -1,14 +1,14 @@
 [package]
 name = "polkadot-node-core-pvf-checker"
 description = "Polkadot crate that implements the PVF pre-checking subsystem. Responsible for checking and voting for PVFs that are pending approval."
-version.workspace = true
+version = "1.0.0"
 authors.workspace = true
 edition.workspace = true
 license.workspace = true
 
 [dependencies]
 futures = "0.3.21"
-thiserror = "1.0.31"
+thiserror = "1.0.48"
 gum = { package = "tracing-gum", path = "../../gum" }
 
 polkadot-node-primitives = { path = "../../primitives" }
diff --git a/polkadot/node/core/pvf-checker/src/tests.rs b/polkadot/node/core/pvf-checker/src/tests.rs
index d1daa7a5813586675e85b4416516a41cd2db0ac9..4ac6e5eba31d7a98b24b4acc69d645147f107bc8 100644
--- a/polkadot/node/core/pvf-checker/src/tests.rs
+++ b/polkadot/node/core/pvf-checker/src/tests.rs
@@ -14,17 +14,18 @@
 // You should have received a copy of the GNU General Public License
 // along with Polkadot.  If not, see <http://www.gnu.org/licenses/>.
 
-use ::test_helpers::{dummy_digest, dummy_hash};
+use ::test_helpers::{dummy_digest, dummy_hash, validator_pubkeys};
 use futures::{channel::oneshot, future::BoxFuture, prelude::*};
 use polkadot_node_subsystem::{
-	jaeger,
 	messages::{
 		AllMessages, CandidateValidationMessage, PreCheckOutcome, PvfCheckerMessage,
 		RuntimeApiMessage, RuntimeApiRequest,
 	},
-	ActivatedLeaf, ActiveLeavesUpdate, FromOrchestra, LeafStatus, OverseerSignal, RuntimeApiError,
+	ActiveLeavesUpdate, FromOrchestra, OverseerSignal, RuntimeApiError,
+};
+use polkadot_node_subsystem_test_helpers::{
+	make_subsystem_context, mock::new_leaf, TestSubsystemContextHandle,
 };
-use polkadot_node_subsystem_test_helpers::{make_subsystem_context, TestSubsystemContextHandle};
 use polkadot_primitives::{
 	BlockNumber, Hash, Header, PvfCheckStatement, SessionIndex, ValidationCode, ValidationCodeHash,
 	ValidatorId,
@@ -93,10 +94,6 @@ struct TestState {
 
 const OUR_VALIDATOR: Sr25519Keyring = Sr25519Keyring::Alice;
 
-fn validator_pubkeys(val_ids: &[Sr25519Keyring]) -> Vec<ValidatorId> {
-	val_ids.iter().map(|v| v.public().into()).collect()
-}
-
 impl TestState {
 	fn new() -> Self {
 		// Initialize the default session 1. No validators are present there.
@@ -195,12 +192,7 @@ impl TestState {
 				},
 			);
 
-			Some(ActivatedLeaf {
-				hash: activated_leaf.block_hash,
-				span: Arc::new(jaeger::Span::Disabled),
-				number: activated_leaf.block_number,
-				status: LeafStatus::Fresh,
-			})
+			Some(new_leaf(activated_leaf.block_hash, activated_leaf.block_number))
 		} else {
 			None
 		};
diff --git a/polkadot/node/core/pvf/Cargo.toml b/polkadot/node/core/pvf/Cargo.toml
index 872ab0107cb8a1fed35485c669830098cbdcbfd7..27f4df117e578ebb8f86dd5eb6570af0b247492b 100644
--- a/polkadot/node/core/pvf/Cargo.toml
+++ b/polkadot/node/core/pvf/Cargo.toml
@@ -1,18 +1,14 @@
 [package]
 name = "polkadot-node-core-pvf"
 description = "Polkadot crate that implements the PVF validation host. Responsible for coordinating preparation and execution of PVFs."
-version.workspace = true
+version = "1.0.0"
 authors.workspace = true
 edition.workspace = true
 license.workspace = true
 
-[[bin]]
-name = "puppet_worker"
-path = "bin/puppet_worker.rs"
-required-features = ["test-utils"]
-
 [dependencies]
 always-assert = "0.1"
+cfg-if = "1.0"
 futures = "0.3.21"
 futures-timer = "3.0.2"
 gum = { package = "tracing-gum", path = "../../gum" }
@@ -25,7 +21,7 @@ tokio = { version = "1.24.2", features = ["fs", "process"] }
 
 parity-scale-codec = { version = "3.6.1", default-features = false, features = ["derive"] }
 
-polkadot-parachain = { path = "../../../parachain" }
+polkadot-parachain-primitives = { path = "../../../parachain" }
 polkadot-core-primitives = { path = "../../../core-primitives" }
 polkadot-node-core-pvf-common = { path = "common" }
 polkadot-node-metrics = { path = "../../metrics" }
@@ -35,7 +31,6 @@ polkadot-primitives = { path = "../../../primitives" }
 sp-core = { path = "../../../../substrate/primitives/core" }
 sp-wasm-interface = { path = "../../../../substrate/primitives/wasm-interface" }
 sp-maybe-compressed-blob = { path = "../../../../substrate/primitives/maybe-compressed-blob" }
-sp-tracing = { path = "../../../../substrate/primitives/tracing", optional = true }
 polkadot-node-core-pvf-prepare-worker = { path = "prepare-worker", optional = true }
 polkadot-node-core-pvf-execute-worker = { path = "execute-worker", optional = true }
 
@@ -44,20 +39,19 @@ substrate-build-script-utils = { path = "../../../../substrate/utils/build-scrip
 
 [dev-dependencies]
 assert_matches = "1.4.0"
-hex-literal = "0.3.4"
+hex-literal = "0.4.1"
 polkadot-node-core-pvf-common = { path = "common", features = ["test-utils"] }
 # For the puppet worker, depend on ourselves with the test-utils feature.
-polkadot-node-core-pvf = { path = "", features = ["test-utils"] }
+polkadot-node-core-pvf = { path = ".", features = ["test-utils"] }
 
 adder = { package = "test-parachain-adder", path = "../../../parachain/test-parachains/adder" }
 halt = { package = "test-parachain-halt", path = "../../../parachain/test-parachains/halt" }
 
 [features]
 ci-only-tests = []
+jemalloc-allocator = [ "polkadot-node-core-pvf-common/jemalloc-allocator" ]
 # This feature is used to export test code to other crates without putting it in the production build.
-# This is also used by the `puppet_worker` binary.
 test-utils = [
 	"polkadot-node-core-pvf-execute-worker",
 	"polkadot-node-core-pvf-prepare-worker",
-	"sp-tracing",
 ]
diff --git a/polkadot/node/core/pvf/common/Cargo.toml b/polkadot/node/core/pvf/common/Cargo.toml
index f9f900a0fec09ad8ff25f0f42fad0f4df7755365..4bdacca72f4208079bd4f810f71c2af15991cb3a 100644
--- a/polkadot/node/core/pvf/common/Cargo.toml
+++ b/polkadot/node/core/pvf/common/Cargo.toml
@@ -1,12 +1,13 @@
 [package]
 name = "polkadot-node-core-pvf-common"
 description = "Polkadot crate that contains functionality related to PVFs that is shared by the PVF host and the PVF workers."
-version.workspace = true
+version = "1.0.0"
 authors.workspace = true
 edition.workspace = true
 license.workspace = true
 
 [dependencies]
+cfg-if = "1.0"
 cpu-time = "1.0.0"
 futures = "0.3.21"
 gum = { package = "tracing-gum", path = "../../../gum" }
@@ -15,7 +16,7 @@ tokio = { version = "1.24.2", features = ["fs", "process", "io-util"] }
 
 parity-scale-codec = { version = "3.6.1", default-features = false, features = ["derive"] }
 
-polkadot-parachain = { path = "../../../../parachain" }
+polkadot-parachain-primitives = { path = "../../../../parachain" }
 polkadot-primitives = { path = "../../../../primitives" }
 
 sc-executor = { path = "../../../../../substrate/client/executor" }
@@ -28,7 +29,7 @@ sp-io = { path = "../../../../../substrate/primitives/io" }
 sp-tracing = { path = "../../../../../substrate/primitives/tracing" }
 
 [target.'cfg(target_os = "linux")'.dependencies]
-landlock = "0.2.0"
+landlock = "0.3.0"
 
 [dev-dependencies]
 assert_matches = "1.4.0"
@@ -38,3 +39,4 @@ tempfile = "3.3.0"
 # This feature is used to export test code to other crates without putting it in the production build.
 # Also used for building the puppet worker.
 test-utils = []
+jemalloc-allocator = []
diff --git a/polkadot/node/core/pvf/common/src/error.rs b/polkadot/node/core/pvf/common/src/error.rs
index 6eb0d9b7df42f7a25414d5d834a2b3e10d1bfa3a..6fdd06057c8b021cc89b29eb0265c78e316eed02 100644
--- a/polkadot/node/core/pvf/common/src/error.rs
+++ b/polkadot/node/core/pvf/common/src/error.rs
@@ -44,7 +44,17 @@ pub enum PrepareError {
 	/// The response from the worker is received, but the file cannot be renamed (moved) to the
 	/// final destination location. This state is reported by the validation host (not by the
 	/// worker).
-	RenameTmpFileErr(String),
+	RenameTmpFileErr {
+		err: String,
+		// Unfortunately `PathBuf` doesn't implement `Encode`/`Decode`, so we do a fallible
+		// conversion to `Option<String>`.
+		src: Option<String>,
+		dest: Option<String>,
+	},
+	/// The response from the worker is received, but the worker cache could not be cleared. The
+	/// worker has to be killed to avoid jobs having access to data from other jobs. This state is
+	/// reported by the validation host (not by the worker).
+	ClearWorkerDir(String),
 }
 
 impl PrepareError {
@@ -58,7 +68,11 @@ impl PrepareError {
 		use PrepareError::*;
 		match self {
 			Prevalidation(_) | Preparation(_) | Panic(_) => true,
-			TimedOut | IoErr(_) | CreateTmpFileErr(_) | RenameTmpFileErr(_) => false,
+			TimedOut |
+			IoErr(_) |
+			CreateTmpFileErr(_) |
+			RenameTmpFileErr { .. } |
+			ClearWorkerDir(_) => false,
 			// Can occur due to issues with the PVF, but also due to local errors.
 			RuntimeConstruction(_) => false,
 		}
@@ -76,7 +90,9 @@ impl fmt::Display for PrepareError {
 			TimedOut => write!(f, "prepare: timeout"),
 			IoErr(err) => write!(f, "prepare: io error while receiving response: {}", err),
 			CreateTmpFileErr(err) => write!(f, "prepare: error creating tmp file: {}", err),
-			RenameTmpFileErr(err) => write!(f, "prepare: error renaming tmp file: {}", err),
+			RenameTmpFileErr { err, src, dest } =>
+				write!(f, "prepare: error renaming tmp file ({:?} -> {:?}): {}", src, dest, err),
+			ClearWorkerDir(err) => write!(f, "prepare: error clearing worker cache: {}", err),
 		}
 	}
 }
@@ -89,8 +105,17 @@ impl fmt::Display for PrepareError {
 pub enum InternalValidationError {
 	/// Some communication error occurred with the host.
 	HostCommunication(String),
+	/// Host could not create a hard link to the artifact path.
+	CouldNotCreateLink(String),
 	/// Could not find or open compiled artifact file.
 	CouldNotOpenFile(String),
+	/// Host could not clear the worker cache after a job.
+	CouldNotClearWorkerDir {
+		err: String,
+		// Unfortunately `PathBuf` doesn't implement `Encode`/`Decode`, so we do a fallible
+		// conversion to `Option<String>`.
+		path: Option<String>,
+	},
 	/// An error occurred in the CPU time monitor thread. Should be totally unrelated to
 	/// validation.
 	CpuTimeMonitorThread(String),
@@ -104,8 +129,18 @@ impl fmt::Display for InternalValidationError {
 		match self {
 			HostCommunication(err) =>
 				write!(f, "validation: some communication error occurred with the host: {}", err),
+			CouldNotCreateLink(err) => write!(
+				f,
+				"validation: host could not create a hard link to the artifact path: {}",
+				err
+			),
 			CouldNotOpenFile(err) =>
 				write!(f, "validation: could not find or open compiled artifact file: {}", err),
+			CouldNotClearWorkerDir { err, path } => write!(
+				f,
+				"validation: host could not clear the worker cache ({:?}) after a job: {}",
+				path, err
+			),
 			CpuTimeMonitorThread(err) =>
 				write!(f, "validation: an error occurred in the CPU time monitor thread: {}", err),
 			NonDeterministicPrepareError(err) => write!(f, "validation: prepare: {}", err),
diff --git a/polkadot/node/core/pvf/common/src/execute.rs b/polkadot/node/core/pvf/common/src/execute.rs
index de5ce39f78381dc87156dcbcd8fa0d68fb3b3c52..b89ab089af1c02eba401517e8248c292dd7040f8 100644
--- a/polkadot/node/core/pvf/common/src/execute.rs
+++ b/polkadot/node/core/pvf/common/src/execute.rs
@@ -16,7 +16,7 @@
 
 use crate::error::InternalValidationError;
 use parity_scale_codec::{Decode, Encode};
-use polkadot_parachain::primitives::ValidationResult;
+use polkadot_parachain_primitives::primitives::ValidationResult;
 use polkadot_primitives::ExecutorParams;
 use std::time::Duration;
 
@@ -29,7 +29,7 @@ pub struct Handshake {
 }
 
 /// The response from an execution job on the worker.
-#[derive(Encode, Decode)]
+#[derive(Debug, Encode, Decode)]
 pub enum Response {
 	/// The job completed successfully.
 	Ok {
diff --git a/polkadot/node/core/pvf/common/src/executor_intf.rs b/polkadot/node/core/pvf/common/src/executor_intf.rs
index 42ed4b79c76120320c1e6c823d236f30b40f1875..58d2a90371cf42508a98501d11be15453ba52db9 100644
--- a/polkadot/node/core/pvf/common/src/executor_intf.rs
+++ b/polkadot/node/core/pvf/common/src/executor_intf.rs
@@ -16,7 +16,10 @@
 
 //! Interface to the Substrate Executor
 
-use polkadot_primitives::{ExecutorParam, ExecutorParams};
+use polkadot_primitives::{
+	executor_params::{DEFAULT_LOGICAL_STACK_MAX, DEFAULT_NATIVE_STACK_MAX},
+	ExecutorParam, ExecutorParams,
+};
 use sc_executor_common::{
 	error::WasmError,
 	runtime_blob::RuntimeBlob,
@@ -42,9 +45,6 @@ use std::any::{Any, TypeId};
 const DEFAULT_HEAP_PAGES_ESTIMATE: u32 = 32;
 const EXTRA_HEAP_PAGES: u32 = 2048;
 
-/// The number of bytes devoted for the stack during wasm execution of a PVF.
-pub const NATIVE_STACK_MAX: u32 = 256 * 1024 * 1024;
-
 // VALUES OF THE DEFAULT CONFIGURATION SHOULD NEVER BE CHANGED
 // They are used as base values for the execution environment parametrization.
 // To overwrite them, add new ones to `EXECUTOR_PARAMS` in the `session_info` pallet and perform
@@ -73,8 +73,8 @@ pub const DEFAULT_CONFIG: Config = Config {
 		// also increase the native 256x. This hopefully should preclude wasm code from reaching
 		// the stack limit set by the wasmtime.
 		deterministic_stack_limit: Some(DeterministicStackLimit {
-			logical_max: 65536,
-			native_stack_max: NATIVE_STACK_MAX,
+			logical_max: DEFAULT_LOGICAL_STACK_MAX,
+			native_stack_max: DEFAULT_NATIVE_STACK_MAX,
 		}),
 		canonicalize_nans: true,
 		// Rationale for turning the multi-threaded compilation off is to make the preparation time
@@ -95,6 +95,60 @@ pub const DEFAULT_CONFIG: Config = Config {
 	},
 };
 
+/// Executes the given PVF in the form of a compiled artifact and returns the result of
+/// execution upon success.
+///
+/// # Safety
+///
+/// The caller must ensure that the compiled artifact passed here was:
+///   1) produced by `prepare`,
+///   2) was not modified,
+///
+/// Failure to adhere to these requirements might lead to crashes and arbitrary code execution.
+pub unsafe fn execute_artifact(
+	compiled_artifact_blob: &[u8],
+	executor_params: &ExecutorParams,
+	params: &[u8],
+) -> Result<Vec<u8>, String> {
+	let mut extensions = sp_externalities::Extensions::new();
+
+	extensions.register(sp_core::traits::ReadRuntimeVersionExt::new(ReadRuntimeVersion));
+
+	let mut ext = ValidationExternalities(extensions);
+
+	match sc_executor::with_externalities_safe(&mut ext, || {
+		let runtime = create_runtime_from_artifact_bytes(compiled_artifact_blob, executor_params)?;
+		runtime.new_instance()?.call(InvokeMethod::Export("validate_block"), params)
+	}) {
+		Ok(Ok(ok)) => Ok(ok),
+		Ok(Err(err)) | Err(err) => Err(err),
+	}
+	.map_err(|err| format!("execute error: {:?}", err))
+}
+
+/// Constructs the runtime for the given PVF, given the artifact bytes.
+///
+/// # Safety
+///
+/// The caller must ensure that the compiled artifact passed here was:
+///   1) produced by `prepare`,
+///   2) was not modified,
+///
+/// Failure to adhere to these requirements might lead to crashes and arbitrary code execution.
+pub unsafe fn create_runtime_from_artifact_bytes(
+	compiled_artifact_blob: &[u8],
+	executor_params: &ExecutorParams,
+) -> Result<WasmtimeRuntime, WasmError> {
+	let mut config = DEFAULT_CONFIG.clone();
+	config.semantics =
+		params_to_wasmtime_semantics(executor_params).map_err(|err| WasmError::Other(err))?;
+
+	sc_executor_wasmtime::create_runtime_from_artifact_bytes::<HostFunctions>(
+		compiled_artifact_blob,
+		config,
+	)
+}
+
 pub fn params_to_wasmtime_semantics(par: &ExecutorParams) -> Result<Semantics, String> {
 	let mut sem = DEFAULT_CONFIG.semantics.clone();
 	let mut stack_limit = if let Some(stack_limit) = sem.deterministic_stack_limit.clone() {
@@ -106,8 +160,9 @@ pub fn params_to_wasmtime_semantics(par: &ExecutorParams) -> Result<Semantics, S
 	for p in par.iter() {
 		match p {
 			ExecutorParam::MaxMemoryPages(max_pages) =>
-				sem.heap_alloc_strategy =
-					HeapAllocStrategy::Dynamic { maximum_pages: Some(*max_pages) },
+				sem.heap_alloc_strategy = HeapAllocStrategy::Dynamic {
+					maximum_pages: Some((*max_pages).saturating_add(DEFAULT_HEAP_PAGES_ESTIMATE)),
+				},
 			ExecutorParam::StackLogicalMax(slm) => stack_limit.logical_max = *slm,
 			ExecutorParam::StackNativeMax(snm) => stack_limit.native_stack_max = *snm,
 			ExecutorParam::WasmExtBulkMemory => sem.wasm_bulk_memory = true,
@@ -120,72 +175,6 @@ pub fn params_to_wasmtime_semantics(par: &ExecutorParams) -> Result<Semantics, S
 	Ok(sem)
 }
 
-/// A WASM executor with a given configuration. It is instantiated once per execute worker and is
-/// specific to that worker.
-#[derive(Clone)]
-pub struct Executor {
-	config: Config,
-}
-
-impl Executor {
-	pub fn new(params: ExecutorParams) -> Result<Self, String> {
-		let mut config = DEFAULT_CONFIG.clone();
-		config.semantics = params_to_wasmtime_semantics(&params)?;
-
-		Ok(Self { config })
-	}
-
-	/// Executes the given PVF in the form of a compiled artifact and returns the result of
-	/// execution upon success.
-	///
-	/// # Safety
-	///
-	/// The caller must ensure that the compiled artifact passed here was:
-	///   1) produced by [`prepare`],
-	///   2) was not modified,
-	///
-	/// Failure to adhere to these requirements might lead to crashes and arbitrary code execution.
-	pub unsafe fn execute(
-		&self,
-		compiled_artifact_blob: &[u8],
-		params: &[u8],
-	) -> Result<Vec<u8>, String> {
-		let mut extensions = sp_externalities::Extensions::new();
-
-		extensions.register(sp_core::traits::ReadRuntimeVersionExt::new(ReadRuntimeVersion));
-
-		let mut ext = ValidationExternalities(extensions);
-
-		match sc_executor::with_externalities_safe(&mut ext, || {
-			let runtime = self.create_runtime_from_bytes(compiled_artifact_blob)?;
-			runtime.new_instance()?.call(InvokeMethod::Export("validate_block"), params)
-		}) {
-			Ok(Ok(ok)) => Ok(ok),
-			Ok(Err(err)) | Err(err) => Err(err),
-		}
-		.map_err(|err| format!("execute error: {:?}", err))
-	}
-
-	/// Constructs the runtime for the given PVF, given the artifact bytes.
-	///
-	/// # Safety
-	///
-	/// The caller must ensure that the compiled artifact passed here was:
-	///   1) produced by [`prepare`],
-	///   2) was not modified,
-	///
-	/// Failure to adhere to these requirements might lead to crashes and arbitrary code execution.
-	pub unsafe fn create_runtime_from_bytes(
-		&self,
-		compiled_artifact_blob: &[u8],
-	) -> Result<WasmtimeRuntime, WasmError> {
-		sc_executor_wasmtime::create_runtime_from_artifact_bytes::<HostFunctions>(
-			compiled_artifact_blob,
-			self.config.clone(),
-		)
-	}
-}
-
 /// Available host functions. We leave out:
 ///
 /// 1. storage related stuff (PVF doesn't have a notion of a persistent storage/trie)
diff --git a/polkadot/node/core/pvf/common/src/lib.rs b/polkadot/node/core/pvf/common/src/lib.rs
index 2cc9c72e182c1b6e886c1d2efb234d37a56b7460..53c287ea970907cb8884ec47c74bd4e03e38d7e7 100644
--- a/polkadot/node/core/pvf/common/src/lib.rs
+++ b/polkadot/node/core/pvf/common/src/lib.rs
@@ -22,19 +22,20 @@ pub mod executor_intf;
 pub mod prepare;
 pub mod pvf;
 pub mod worker;
+pub mod worker_dir;
 
 pub use cpu_time::ProcessTime;
 
-/// DO NOT USE - internal for macros only.
-#[doc(hidden)]
-pub mod __private {
-	pub use sp_tracing::try_init_simple;
-}
+// Used by `decl_worker_main!`.
+pub use sp_tracing;
 
 const LOG_TARGET: &str = "parachain::pvf-common";
 
-use std::mem;
-use tokio::io::{self, AsyncRead, AsyncReadExt as _, AsyncWrite, AsyncWriteExt as _};
+use std::{
+	io::{Read, Write},
+	mem,
+};
+use tokio::io;
 
 #[cfg(feature = "test-utils")]
 pub mod tests {
@@ -44,20 +45,31 @@ pub mod tests {
 	pub const TEST_PREPARATION_TIMEOUT: Duration = Duration::from_secs(30);
 }
 
-/// Write some data prefixed by its length into `w`.
-pub async fn framed_send(w: &mut (impl AsyncWrite + Unpin), buf: &[u8]) -> io::Result<()> {
+/// Status of security features on the current system.
+#[derive(Debug, Clone, Default)]
+pub struct SecurityStatus {
+	/// Whether the landlock features we use are fully available on this system.
+	pub can_enable_landlock: bool,
+	// Whether we are able to unshare the user namespace and change the filesystem root.
+	pub can_unshare_user_namespace_and_change_root: bool,
+}
+
+/// Write some data prefixed by its length into `w`. Sync version of `framed_send` to avoid
+/// dependency on tokio.
+pub fn framed_send_blocking(w: &mut (impl Write + Unpin), buf: &[u8]) -> io::Result<()> {
 	let len_buf = buf.len().to_le_bytes();
-	w.write_all(&len_buf).await?;
-	w.write_all(buf).await?;
+	w.write_all(&len_buf)?;
+	w.write_all(buf)?;
 	Ok(())
 }
 
-/// Read some data prefixed by its length from `r`.
-pub async fn framed_recv(r: &mut (impl AsyncRead + Unpin)) -> io::Result<Vec<u8>> {
+/// Read some data prefixed by its length from `r`. Sync version of `framed_recv` to avoid
+/// dependency on tokio.
+pub fn framed_recv_blocking(r: &mut (impl Read + Unpin)) -> io::Result<Vec<u8>> {
 	let mut len_buf = [0u8; mem::size_of::<usize>()];
-	r.read_exact(&mut len_buf).await?;
+	r.read_exact(&mut len_buf)?;
 	let len = usize::from_le_bytes(len_buf);
 	let mut buf = vec![0; len];
-	r.read_exact(&mut buf).await?;
+	r.read_exact(&mut buf)?;
 	Ok(buf)
 }
diff --git a/polkadot/node/core/pvf/common/src/pvf.rs b/polkadot/node/core/pvf/common/src/pvf.rs
index e31264713a571587f718e049c56b06a4e4a6b54b..0cc86434c19526396b67565bee30c3a38dae9ac6 100644
--- a/polkadot/node/core/pvf/common/src/pvf.rs
+++ b/polkadot/node/core/pvf/common/src/pvf.rs
@@ -16,7 +16,7 @@
 
 use crate::prepare::PrepareJobKind;
 use parity_scale_codec::{Decode, Encode};
-use polkadot_parachain::primitives::ValidationCodeHash;
+use polkadot_parachain_primitives::primitives::ValidationCodeHash;
 use polkadot_primitives::ExecutorParams;
 use sp_core::blake2_256;
 use std::{
diff --git a/polkadot/node/core/pvf/common/src/worker/mod.rs b/polkadot/node/core/pvf/common/src/worker/mod.rs
index 4ea0e5aa1a9a68c14a8cbe3a18d40eefac2bfa6c..d0bd5b6bd7c56495efa8fe64730e9fadba9c066b 100644
--- a/polkadot/node/core/pvf/common/src/worker/mod.rs
+++ b/polkadot/node/core/pvf/common/src/worker/mod.rs
@@ -18,22 +18,24 @@
 
 pub mod security;
 
-use crate::LOG_TARGET;
+use crate::{SecurityStatus, LOG_TARGET};
 use cpu_time::ProcessTime;
 use futures::never::Never;
 use std::{
 	any::Any,
+	fmt,
+	os::unix::net::UnixStream,
 	path::PathBuf,
 	sync::mpsc::{Receiver, RecvTimeoutError},
 	time::Duration,
 };
-use tokio::{io, net::UnixStream, runtime::Runtime};
+use tokio::{io, runtime::Runtime};
 
 /// Use this macro to declare a `fn main() {}` that will create an executable that can be used for
 /// spawning the desired worker.
 #[macro_export]
 macro_rules! decl_worker_main {
-	($expected_command:expr, $entrypoint:expr, $worker_version:expr) => {
+	($expected_command:expr, $entrypoint:expr, $worker_version:expr $(,)*) => {
 		fn print_help(expected_command: &str) {
 			println!("{} {}", expected_command, $worker_version);
 			println!();
@@ -41,7 +43,14 @@ macro_rules! decl_worker_main {
 		}
 
 		fn main() {
-			$crate::__private::try_init_simple();
+			#[cfg(target_os = "linux")]
+			use $crate::worker::security;
+
+			// TODO: Remove this dependency, and `pub use sp_tracing` in `lib.rs`.
+			// See <https://github.com/paritytech/polkadot/issues/7117>.
+			$crate::sp_tracing::try_init_simple();
+
+			let worker_pid = std::process::id();
 
 			let args = std::env::args().collect::<Vec<_>>();
 			if args.len() == 1 {
@@ -58,6 +67,43 @@ macro_rules! decl_worker_main {
 					println!("{}", $worker_version);
 					return
 				},
+
+				"--check-can-enable-landlock" => {
+					#[cfg(target_os = "linux")]
+					let status = if security::landlock::check_is_fully_enabled() { 0 } else { -1 };
+					#[cfg(not(target_os = "linux"))]
+					let status = -1;
+					std::process::exit(status)
+				},
+				"--check-can-unshare-user-namespace-and-change-root" => {
+					#[cfg(target_os = "linux")]
+					let status = if let Err(err) = security::unshare_user_namespace_and_change_root(
+						$crate::worker::WorkerKind::CheckPivotRoot,
+						worker_pid,
+						// We're not accessing any files, so we can try to pivot_root in the temp
+						// dir without conflicts with other processes.
+						&std::env::temp_dir(),
+					) {
+						// Write the error to stderr, log it on the host-side.
+						eprintln!("{}", err);
+						-1
+					} else {
+						0
+					};
+					#[cfg(not(target_os = "linux"))]
+					let status = {
+						// Write the error to stderr, log it on the host-side.
+						eprintln!("not available on macos");
+						-1
+					};
+					std::process::exit(status)
+				},
+
+				"test-sleep" => {
+					std::thread::sleep(std::time::Duration::from_secs(5));
+					return
+				},
+
 				subcommand => {
 					// Must be passed for compatibility with the single-binary test workers.
 					if subcommand != $expected_command {
@@ -69,18 +115,52 @@ macro_rules! decl_worker_main {
 				},
 			}
 
+			let mut socket_path = None;
+			let mut worker_dir_path = None;
 			let mut node_version = None;
-			let mut socket_path: &str = "";
+			let mut can_enable_landlock = false;
+			let mut can_unshare_user_namespace_and_change_root = false;
 
-			for i in (2..args.len()).step_by(2) {
+			let mut i = 2;
+			while i < args.len() {
 				match args[i].as_ref() {
-					"--socket-path" => socket_path = args[i + 1].as_str(),
-					"--node-impl-version" => node_version = Some(args[i + 1].as_str()),
+					"--socket-path" => {
+						socket_path = Some(args[i + 1].as_str());
+						i += 1
+					},
+					"--worker-dir-path" => {
+						worker_dir_path = Some(args[i + 1].as_str());
+						i += 1
+					},
+					"--node-impl-version" => {
+						node_version = Some(args[i + 1].as_str());
+						i += 1
+					},
+					"--can-enable-landlock" => can_enable_landlock = true,
+					"--can-unshare-user-namespace-and-change-root" =>
+						can_unshare_user_namespace_and_change_root = true,
 					arg => panic!("Unexpected argument found: {}", arg),
 				}
+				i += 1;
 			}
-
-			$entrypoint(&socket_path, node_version, Some($worker_version));
+			let socket_path = socket_path.expect("the --socket-path argument is required");
+			let worker_dir_path =
+				worker_dir_path.expect("the --worker-dir-path argument is required");
+
+			let socket_path = std::path::Path::new(socket_path).to_owned();
+			let worker_dir_path = std::path::Path::new(worker_dir_path).to_owned();
+			let security_status = $crate::SecurityStatus {
+				can_enable_landlock,
+				can_unshare_user_namespace_and_change_root,
+			};
+
+			$entrypoint(
+				socket_path,
+				worker_dir_path,
+				node_version,
+				Some($worker_version),
+				security_status,
+			);
 		}
 	};
 }
@@ -89,61 +169,180 @@ macro_rules! decl_worker_main {
 /// child process.
 pub const JOB_TIMEOUT_OVERHEAD: Duration = Duration::from_millis(50);
 
-/// Interprets the given bytes as a path. Returns `None` if the given bytes do not constitute a
-/// a proper utf-8 string.
-pub fn bytes_to_path(bytes: &[u8]) -> Option<PathBuf> {
-	std::str::from_utf8(bytes).ok().map(PathBuf::from)
+#[derive(Debug, Clone, Copy)]
+pub enum WorkerKind {
+	Prepare,
+	Execute,
+	CheckPivotRoot,
+}
+
+impl fmt::Display for WorkerKind {
+	fn fmt(&self, f: &mut fmt::Formatter<'_>) -> fmt::Result {
+		match self {
+			Self::Prepare => write!(f, "prepare"),
+			Self::Execute => write!(f, "execute"),
+			Self::CheckPivotRoot => write!(f, "check pivot root"),
+		}
+	}
 }
 
 // The worker version must be passed in so that we accurately get the version of the worker, and not
 // the version that this crate was compiled with.
 pub fn worker_event_loop<F, Fut>(
-	debug_id: &'static str,
-	socket_path: &str,
+	worker_kind: WorkerKind,
+	socket_path: PathBuf,
+	#[cfg_attr(not(target_os = "linux"), allow(unused_mut))] mut worker_dir_path: PathBuf,
 	node_version: Option<&str>,
 	worker_version: Option<&str>,
+	#[cfg_attr(not(target_os = "linux"), allow(unused_variables))] security_status: &SecurityStatus,
 	mut event_loop: F,
 ) where
-	F: FnMut(UnixStream) -> Fut,
+	F: FnMut(UnixStream, PathBuf) -> Fut,
 	Fut: futures::Future<Output = io::Result<Never>>,
 {
 	let worker_pid = std::process::id();
-	gum::debug!(target: LOG_TARGET, %worker_pid, "starting pvf worker ({})", debug_id);
+	gum::debug!(
+		target: LOG_TARGET,
+		%worker_pid,
+		?socket_path,
+		?worker_dir_path,
+		?security_status,
+		"starting pvf worker ({})",
+		worker_kind
+	);
 
 	// Check for a mismatch between the node and worker versions.
 	if let (Some(node_version), Some(worker_version)) = (node_version, worker_version) {
 		if node_version != worker_version {
 			gum::error!(
 				target: LOG_TARGET,
+				%worker_kind,
 				%worker_pid,
 				%node_version,
 				%worker_version,
 				"Node and worker version mismatch, node needs restarting, forcing shutdown",
 			);
 			kill_parent_node_in_emergency();
-			let err = io::Error::new(io::ErrorKind::Unsupported, "Version mismatch");
-			worker_shutdown_message(debug_id, worker_pid, err);
+			worker_shutdown_message(worker_kind, worker_pid, "Version mismatch");
 			return
 		}
 	}
 
-	remove_env_vars(debug_id);
+	// Make sure that we can read the worker dir path, and log its contents.
+	let entries = || -> Result<Vec<_>, io::Error> {
+		std::fs::read_dir(&worker_dir_path)?
+			.map(|res| res.map(|e| e.file_name()))
+			.collect()
+	}();
+	match entries {
+		Ok(entries) =>
+			gum::trace!(target: LOG_TARGET, %worker_pid, ?worker_dir_path, "content of worker dir: {:?}", entries),
+		Err(err) => {
+			gum::error!(
+				target: LOG_TARGET,
+				%worker_kind,
+				%worker_pid,
+				?worker_dir_path,
+				"Could not read worker dir: {}",
+				err.to_string()
+			);
+			worker_shutdown_message(worker_kind, worker_pid, &err.to_string());
+			return
+		},
+	}
+
+	// Connect to the socket.
+	let stream = || -> std::io::Result<UnixStream> {
+		let stream = UnixStream::connect(&socket_path)?;
+		let _ = std::fs::remove_file(&socket_path);
+		Ok(stream)
+	}();
+	let stream = match stream {
+		Ok(s) => s,
+		Err(err) => {
+			gum::error!(
+				target: LOG_TARGET,
+				%worker_kind,
+				%worker_pid,
+				"{}",
+				err
+			);
+			worker_shutdown_message(worker_kind, worker_pid, &err.to_string());
+			return
+		},
+	};
+
+	// Enable some security features.
+	{
+		// Call based on whether we can change root. Error out if it should work but fails.
+		//
+		// NOTE: This should not be called in a multi-threaded context (i.e. inside the tokio
+		// runtime). `unshare(2)`:
+		//
+		//       > CLONE_NEWUSER requires that the calling process is not threaded.
+		#[cfg(target_os = "linux")]
+		if security_status.can_unshare_user_namespace_and_change_root {
+			if let Err(err) = security::unshare_user_namespace_and_change_root(
+				worker_kind,
+				worker_pid,
+				&worker_dir_path,
+			) {
+				// The filesystem may be in an inconsistent state, bail out.
+				gum::error!(
+					target: LOG_TARGET,
+					%worker_kind,
+					%worker_pid,
+					?worker_dir_path,
+					"Could not change root to be the worker cache path: {}",
+					err
+				);
+				worker_shutdown_message(worker_kind, worker_pid, &err);
+				return
+			}
+			worker_dir_path = std::path::Path::new("/").to_owned();
+		}
+
+		#[cfg(target_os = "linux")]
+		if security_status.can_enable_landlock {
+			let landlock_status =
+				security::landlock::enable_for_worker(worker_kind, worker_pid, &worker_dir_path);
+			if !matches!(landlock_status, Ok(landlock::RulesetStatus::FullyEnforced)) {
+				// We previously were able to enable, so this should never happen.
+				//
+				// TODO: Make this a real error in secure-mode. See:
+				// <https://github.com/paritytech/polkadot-sdk/issues/1444>
+				gum::error!(
+					target: LOG_TARGET,
+					%worker_kind,
+					%worker_pid,
+					"could not fully enable landlock: {:?}. This should not happen, please report to the Polkadot devs",
+					landlock_status
+				);
+			}
+		}
+
+		if !security::check_env_vars_were_cleared(worker_kind, worker_pid) {
+			let err = "not all env vars were cleared when spawning the process";
+			gum::error!(
+				target: LOG_TARGET,
+				%worker_kind,
+				%worker_pid,
+				"{}",
+				err
+			);
+			worker_shutdown_message(worker_kind, worker_pid, err);
+			return
+		}
+	}
 
 	// Run the main worker loop.
 	let rt = Runtime::new().expect("Creates tokio runtime. If this panics the worker will die and the host will detect that and deal with it.");
 	let err = rt
-		.block_on(async move {
-			let stream = UnixStream::connect(socket_path).await?;
-			let _ = tokio::fs::remove_file(socket_path).await;
-
-			let result = event_loop(stream).await;
-
-			result
-		})
+		.block_on(event_loop(stream, worker_dir_path))
 		// It's never `Ok` because it's `Ok(Never)`.
 		.unwrap_err();
 
-	worker_shutdown_message(debug_id, worker_pid, err);
+	worker_shutdown_message(worker_kind, worker_pid, &err.to_string());
 
 	// We don't want tokio to wait for the tasks to finish. We want to bring down the worker as fast
 	// as possible and not wait for stalled validation to finish. This isn't strictly necessary now,
@@ -151,51 +350,9 @@ pub fn worker_event_loop<F, Fut>(
 	rt.shutdown_background();
 }
 
-/// Delete all env vars to prevent malicious code from accessing them.
-fn remove_env_vars(debug_id: &'static str) {
-	for (key, value) in std::env::vars_os() {
-		// TODO: *theoretically* the value (or mere presence) of `RUST_LOG` can be a source of
-		// randomness for malicious code. In the future we can remove it also and log in the host;
-		// see <https://github.com/paritytech/polkadot/issues/7117>.
-		if key == "RUST_LOG" {
-			continue
-		}
-
-		// In case of a key or value that would cause [`env::remove_var` to
-		// panic](https://doc.rust-lang.org/std/env/fn.remove_var.html#panics), we first log a
-		// warning and then proceed to attempt to remove the env var.
-		let mut err_reasons = vec![];
-		let (key_str, value_str) = (key.to_str(), value.to_str());
-		if key.is_empty() {
-			err_reasons.push("key is empty");
-		}
-		if key_str.is_some_and(|s| s.contains('=')) {
-			err_reasons.push("key contains '='");
-		}
-		if key_str.is_some_and(|s| s.contains('\0')) {
-			err_reasons.push("key contains null character");
-		}
-		if value_str.is_some_and(|s| s.contains('\0')) {
-			err_reasons.push("value contains null character");
-		}
-		if !err_reasons.is_empty() {
-			gum::warn!(
-				target: LOG_TARGET,
-				%debug_id,
-				?key,
-				?value,
-				"Attempting to remove badly-formatted env var, this may cause the PVF worker to crash. Please remove it yourself. Reasons: {:?}",
-				err_reasons
-			);
-		}
-
-		std::env::remove_var(key);
-	}
-}
-
 /// Provide a consistent message on worker shutdown.
-fn worker_shutdown_message(debug_id: &'static str, worker_pid: u32, err: io::Error) {
-	gum::debug!(target: LOG_TARGET, %worker_pid, "quitting pvf worker ({}): {:?}", debug_id, err);
+fn worker_shutdown_message(worker_kind: WorkerKind, worker_pid: u32, err: &str) {
+	gum::debug!(target: LOG_TARGET, %worker_pid, "quitting pvf worker ({}): {}", worker_kind, err);
 }
 
 /// Loop that runs in the CPU time monitor thread on prepare and execute jobs. Continuously wakes up
@@ -299,7 +456,7 @@ pub mod thread {
 		Arc::new((Mutex::new(WaitOutcome::Pending), Condvar::new()))
 	}
 
-	/// Runs a worker thread. Will first enable security features, and afterwards notify the threads
+	/// Runs a worker thread. Will run the requested function, and afterwards notify the threads
 	/// waiting on the condvar. Catches panics during execution and resumes the panics after
 	/// triggering the condvar, so that the waiting thread is notified on panics.
 	///
diff --git a/polkadot/node/core/pvf/common/src/worker/security.rs b/polkadot/node/core/pvf/common/src/worker/security.rs
index 6c5f96e0b5dbb3289dc237c91cc003e3b2aa37c5..1b7614177448539f4263022c757d3eba4557ecac 100644
--- a/polkadot/node/core/pvf/common/src/worker/security.rs
+++ b/polkadot/node/core/pvf/common/src/worker/security.rs
@@ -17,30 +17,189 @@
 //! Functionality for securing workers.
 //!
 //! This is needed because workers are used to compile and execute untrusted code (PVFs).
+//!
+//! We currently employ the following security measures:
+//!
+//! - Restrict filesystem
+//!   - Use Landlock to remove all unnecessary FS access rights.
+//!   - Unshare the user and mount namespaces.
+//!   - Change the root directory to a worker-specific temporary directory.
+//! - Remove env vars
+
+use crate::{worker::WorkerKind, LOG_TARGET};
+
+/// Unshare the user namespace and change root to be the artifact directory.
+///
+/// NOTE: This should not be called in a multi-threaded context. `unshare(2)`:
+///       "CLONE_NEWUSER requires that the calling process is not threaded."
+#[cfg(target_os = "linux")]
+pub fn unshare_user_namespace_and_change_root(
+	worker_kind: WorkerKind,
+	worker_pid: u32,
+	worker_dir_path: &std::path::Path,
+) -> Result<(), String> {
+	use std::{env, ffi::CString, os::unix::ffi::OsStrExt, path::Path, ptr};
+
+	// The following was copied from the `cstr_core` crate.
+	//
+	// TODO: Remove this once this is stable: https://github.com/rust-lang/rust/issues/105723
+	#[inline]
+	#[doc(hidden)]
+	const fn cstr_is_valid(bytes: &[u8]) -> bool {
+		if bytes.is_empty() || bytes[bytes.len() - 1] != 0 {
+			return false
+		}
+
+		let mut index = 0;
+		while index < bytes.len() - 1 {
+			if bytes[index] == 0 {
+				return false
+			}
+			index += 1;
+		}
+		true
+	}
+
+	macro_rules! cstr {
+		($e:expr) => {{
+			const STR: &[u8] = concat!($e, "\0").as_bytes();
+			const STR_VALID: bool = cstr_is_valid(STR);
+			let _ = [(); 0 - (!(STR_VALID) as usize)];
+			#[allow(unused_unsafe)]
+			unsafe {
+				core::ffi::CStr::from_bytes_with_nul_unchecked(STR)
+			}
+		}}
+	}
+
+	gum::debug!(
+		target: LOG_TARGET,
+		%worker_kind,
+		%worker_pid,
+		?worker_dir_path,
+		"unsharing the user namespace and calling pivot_root",
+	);
+
+	let worker_dir_path_c = CString::new(worker_dir_path.as_os_str().as_bytes())
+		.expect("on unix; the path will never contain 0 bytes; qed");
+
+	// Wrapper around all the work to prevent repetitive error handling.
+	//
+	// # Errors
+	//
+	// It's the caller's responsibility to call `Error::last_os_error`. Note that that alone does
+	// not give the context of which call failed, so we return a &str error.
+	|| -> Result<(), &'static str> {
+		// SAFETY: We pass null-terminated C strings and use the APIs as documented. In fact, steps
+		//         (2) and (3) are adapted from the example in pivot_root(2), with the additional
+		//         change described in the `pivot_root(".", ".")` section.
+		unsafe {
+			// 1. `unshare` the user and the mount namespaces.
+			if libc::unshare(libc::CLONE_NEWUSER | libc::CLONE_NEWNS) < 0 {
+				return Err("unshare user and mount namespaces")
+			}
+
+			// 2. Setup mounts.
+			//
+			// Ensure that new root and its parent mount don't have shared propagation (which would
+			// cause pivot_root() to return an error), and prevent propagation of mount events to
+			// the initial mount namespace.
+			if libc::mount(
+				ptr::null(),
+				cstr!("/").as_ptr(),
+				ptr::null(),
+				libc::MS_REC | libc::MS_PRIVATE,
+				ptr::null(),
+			) < 0
+			{
+				return Err("mount MS_PRIVATE")
+			}
+			// Ensure that the new root is a mount point.
+			let additional_flags =
+				if let WorkerKind::Execute | WorkerKind::CheckPivotRoot = worker_kind {
+					libc::MS_RDONLY
+				} else {
+					0
+				};
+			if libc::mount(
+				worker_dir_path_c.as_ptr(),
+				worker_dir_path_c.as_ptr(),
+				ptr::null(), // ignored when MS_BIND is used
+				libc::MS_BIND |
+					libc::MS_REC | libc::MS_NOEXEC |
+					libc::MS_NODEV | libc::MS_NOSUID |
+					libc::MS_NOATIME | additional_flags,
+				ptr::null(), // ignored when MS_BIND is used
+			) < 0
+			{
+				return Err("mount MS_BIND")
+			}
 
-/// To what degree landlock is enabled. It's a separate struct from `RulesetStatus` because that is
-/// only available on Linux, plus this has a nicer name.
-pub enum LandlockStatus {
-	FullyEnforced,
-	PartiallyEnforced,
-	NotEnforced,
-	/// Thread panicked, we don't know what the status is.
-	Unavailable,
+			// 3. `pivot_root` to the artifact directory.
+			if libc::chdir(worker_dir_path_c.as_ptr()) < 0 {
+				return Err("chdir to worker dir path")
+			}
+			if libc::syscall(libc::SYS_pivot_root, cstr!(".").as_ptr(), cstr!(".").as_ptr()) < 0 {
+				return Err("pivot_root")
+			}
+			if libc::umount2(cstr!(".").as_ptr(), libc::MNT_DETACH) < 0 {
+				return Err("umount the old root mount point")
+			}
+		}
+
+		Ok(())
+	}()
+	.map_err(|err_ctx| {
+		let err = std::io::Error::last_os_error();
+		format!("{}: {}", err_ctx, err)
+	})?;
+
+	// Do some assertions.
+	if env::current_dir().map_err(|err| err.to_string())? != Path::new("/") {
+		return Err("expected current dir after pivot_root to be `/`".into())
+	}
+	env::set_current_dir("..").map_err(|err| err.to_string())?;
+	if env::current_dir().map_err(|err| err.to_string())? != Path::new("/") {
+		return Err("expected not to be able to break out of new root by doing `..`".into())
+	}
+
+	Ok(())
 }
 
-impl LandlockStatus {
-	#[cfg(target_os = "linux")]
-	pub fn from_ruleset_status(ruleset_status: ::landlock::RulesetStatus) -> Self {
-		use ::landlock::RulesetStatus::*;
-		match ruleset_status {
-			FullyEnforced => LandlockStatus::FullyEnforced,
-			PartiallyEnforced => LandlockStatus::PartiallyEnforced,
-			NotEnforced => LandlockStatus::NotEnforced,
+/// Require env vars to have been removed when spawning the process, to prevent malicious code from
+/// accessing them.
+pub fn check_env_vars_were_cleared(worker_kind: WorkerKind, worker_pid: u32) -> bool {
+	let mut ok = true;
+
+	for (key, value) in std::env::vars_os() {
+		// TODO: *theoretically* the value (or mere presence) of `RUST_LOG` can be a source of
+		// randomness for malicious code. In the future we can remove it also and log in the host;
+		// see <https://github.com/paritytech/polkadot/issues/7117>.
+		if key == "RUST_LOG" {
+			continue
+		}
+		// An exception for MacOS. This is not a secure platform anyway, so we let it slide.
+		#[cfg(target_os = "macos")]
+		if key == "__CF_USER_TEXT_ENCODING" {
+			continue
 		}
+
+		gum::error!(
+			target: LOG_TARGET,
+			%worker_kind,
+			%worker_pid,
+			?key,
+			?value,
+			"env var was present that should have been removed",
+		);
+
+		ok = false;
 	}
+
+	ok
 }
 
-/// The	[landlock] docs say it best:
+/// The [landlock] docs say it best:
 ///
 /// > "Landlock is a security feature available since Linux 5.13. The goal is to enable to restrict
 /// ambient rights (e.g., global filesystem access) for a set of processes by creating safe security
@@ -52,18 +211,34 @@ impl LandlockStatus {
 /// [landlock]: https://docs.rs/landlock/latest/landlock/index.html
 #[cfg(target_os = "linux")]
 pub mod landlock {
-	use landlock::{Access, AccessFs, Ruleset, RulesetAttr, RulesetError, RulesetStatus, ABI};
+	pub use landlock::RulesetStatus;
+
+	use crate::{worker::WorkerKind, LOG_TARGET};
+	use landlock::*;
+	use std::{
+		fmt,
+		path::{Path, PathBuf},
+	};
 
 	/// Landlock ABI version. We use ABI V1 because:
 	///
 	/// 1. It is supported by our reference kernel version.
-	/// 2. Later versions do not (yet) provide additional security.
+	/// 2. Later versions do not (yet) provide additional security that would benefit us.
 	///
-	/// # Versions (June 2023)
+	/// # Versions (as of October 2023)
 	///
 	/// - Polkadot reference kernel version: 5.16+
-	/// - ABI V1: 5.13 - introduces	landlock, including full restrictions on file reads
-	/// - ABI V2: 5.19 - adds ability to configure file renaming (not used by us)
+	///
+	/// - ABI V1: kernel 5.13 - Introduces landlock, including full restrictions on file reads.
+	///
+	/// - ABI V2: kernel 5.19 - Adds ability to prevent file renaming. Does not help us. During
+	///   execution an attacker can only affect the name of a symlinked artifact and not the
+	///   original one.
+	///
+	/// - ABI V3: kernel 6.2 - Adds ability to prevent file truncation. During execution, can
+	///   prevent attackers from affecting a symlinked artifact. We don't strictly need this as we
+	///   plan to check for file integrity anyway; see
+	///   <https://github.com/paritytech/polkadot-sdk/issues/677>.
 	///
 	/// # Determinism
 	///
@@ -83,46 +258,103 @@ pub mod landlock {
 	/// supports it or if it introduces some new feature that is beneficial to security.
 	pub const LANDLOCK_ABI: ABI = ABI::V1;
 
-	// TODO: <https://github.com/landlock-lsm/rust-landlock/issues/36>
-	/// Returns to what degree landlock is enabled with the given ABI on the current Linux
-	/// environment.
-	pub fn get_status() -> Result<RulesetStatus, Box<dyn std::error::Error>> {
-		match std::thread::spawn(|| try_restrict_thread()).join() {
-			Ok(Ok(status)) => Ok(status),
-			Ok(Err(ruleset_err)) => Err(ruleset_err.into()),
-			Err(_err) => Err("a panic occurred in try_restrict_thread".into()),
+	#[derive(Debug)]
+	pub enum TryRestrictError {
+		InvalidExceptionPath(PathBuf),
+		RulesetError(RulesetError),
+	}
+
+	impl From<RulesetError> for TryRestrictError {
+		fn from(err: RulesetError) -> Self {
+			Self::RulesetError(err)
 		}
 	}
 
-	/// Based on the given `status`, returns a single bool indicating whether the given landlock
-	/// ABI is fully enabled on the current Linux environment.
-	pub fn status_is_fully_enabled(
-		status: &Result<RulesetStatus, Box<dyn std::error::Error>>,
-	) -> bool {
-		matches!(status, Ok(RulesetStatus::FullyEnforced))
+	impl fmt::Display for TryRestrictError {
+		fn fmt(&self, f: &mut fmt::Formatter<'_>) -> fmt::Result {
+			match self {
+				Self::InvalidExceptionPath(path) => write!(f, "invalid exception path: {:?}", path),
+				Self::RulesetError(err) => write!(f, "ruleset error: {}", err.to_string()),
+			}
+		}
 	}
 
+	impl std::error::Error for TryRestrictError {}
+
+	/// Try to enable landlock for the given kind of worker.
+	pub fn enable_for_worker(
+		worker_kind: WorkerKind,
+		worker_pid: u32,
+		worker_dir_path: &Path,
+	) -> Result<RulesetStatus, Box<dyn std::error::Error>> {
+		let exceptions: Vec<(PathBuf, BitFlags<AccessFs>)> = match worker_kind {
+			WorkerKind::Prepare => {
+				vec![(worker_dir_path.to_owned(), AccessFs::WriteFile.into())]
+			},
+			WorkerKind::Execute => {
+				vec![(worker_dir_path.to_owned(), AccessFs::ReadFile.into())]
+			},
+			WorkerKind::CheckPivotRoot =>
+				panic!("this should only be passed for checking pivot_root; qed"),
+		};
+
+		gum::debug!(
+			target: LOG_TARGET,
+			%worker_kind,
+			%worker_pid,
+			?worker_dir_path,
+			"enabling landlock with exceptions: {:?}",
+			exceptions,
+		);
+
+		Ok(try_restrict(exceptions)?)
+	}
+
+	// TODO: <https://github.com/landlock-lsm/rust-landlock/issues/36>
 	/// Runs a check for landlock and returns a single bool indicating whether the given landlock
 	/// ABI is fully enabled on the current Linux environment.
 	pub fn check_is_fully_enabled() -> bool {
-		status_is_fully_enabled(&get_status())
+		let status_from_thread: Result<RulesetStatus, Box<dyn std::error::Error>> =
+			match std::thread::spawn(|| try_restrict(std::iter::empty::<(PathBuf, AccessFs)>()))
+				.join()
+			{
+				Ok(Ok(status)) => Ok(status),
+				Ok(Err(ruleset_err)) => Err(ruleset_err.into()),
+				Err(_err) => Err("a panic occurred in try_restrict".into()),
+			};
+
+		matches!(status_from_thread, Ok(RulesetStatus::FullyEnforced))
 	}
 
-	/// Tries to restrict the current thread with the following landlock access controls:
+	/// Tries to restrict the current thread (should only be called in a process' main thread) with
+	/// the following landlock access controls:
 	///
-	/// 1. all global filesystem access
-	/// 2. ... more may be supported in the future.
+	/// 1. all global filesystem access restricted, with optional exceptions
+	/// 2. ... more sandbox types (e.g. networking) may be supported in the future.
 	///
 	/// If landlock is not supported in the current environment this is simply a noop.
 	///
 	/// # Returns
 	///
 	/// The status of the restriction (whether it was fully, partially, or not-at-all enforced).
-	pub fn try_restrict_thread() -> Result<RulesetStatus, RulesetError> {
-		let status = Ruleset::new()
-			.handle_access(AccessFs::from_all(LANDLOCK_ABI))?
-			.create()?
-			.restrict_self()?;
+	fn try_restrict<I, P, A>(fs_exceptions: I) -> Result<RulesetStatus, TryRestrictError>
+	where
+		I: IntoIterator<Item = (P, A)>,
+		P: AsRef<Path>,
+		A: Into<BitFlags<AccessFs>>,
+	{
+		let mut ruleset =
+			Ruleset::default().handle_access(AccessFs::from_all(LANDLOCK_ABI))?.create()?;
+		for (fs_path, access_bits) in fs_exceptions {
+			let paths = &[fs_path.as_ref().to_owned()];
+			let mut rules = path_beneath_rules(paths, access_bits).peekable();
+			if rules.peek().is_none() {
+				// `path_beneath_rules` silently ignores missing paths, so check for it manually.
+				return Err(TryRestrictError::InvalidExceptionPath(fs_path.as_ref().to_owned()))
+			}
+			ruleset = ruleset.add_rules(rules)?;
+		}
+		let status = ruleset.restrict_self()?;
 		Ok(status.ruleset)
 	}
 
@@ -132,55 +364,147 @@ pub mod landlock {
 		use std::{fs, io::ErrorKind, thread};
 
 		#[test]
-		fn restricted_thread_cannot_access_fs() {
+		fn restricted_thread_cannot_read_file() {
 			// TODO: This would be nice: <https://github.com/rust-lang/rust/issues/68007>.
 			if !check_is_fully_enabled() {
 				return
 			}
 
 			// Restricted thread cannot read from FS.
-			let handle = thread::spawn(|| {
-				// Write to a tmp file, this should succeed before landlock is applied.
-				let text = "foo";
-				let tmpfile = tempfile::NamedTempFile::new().unwrap();
-				let path = tmpfile.path();
-				fs::write(path, text).unwrap();
-				let s = fs::read_to_string(path).unwrap();
-				assert_eq!(s, text);
-
-				let status = try_restrict_thread().unwrap();
-				if !matches!(status, RulesetStatus::FullyEnforced) {
-					panic!("Ruleset should be enforced since we checked if landlock is enabled");
-				}
-
-				// Try to read from the tmp file after landlock.
-				let result = fs::read_to_string(path);
-				assert!(matches!(
-					result,
-					Err(err) if matches!(err.kind(), ErrorKind::PermissionDenied)
-				));
-			});
+			let handle =
+				thread::spawn(|| {
+					// Create, write, and read two tmp files. This should succeed before any
+					// landlock restrictions are applied.
+					const TEXT: &str = "foo";
+					let tmpfile1 = tempfile::NamedTempFile::new().unwrap();
+					let path1 = tmpfile1.path();
+					let tmpfile2 = tempfile::NamedTempFile::new().unwrap();
+					let path2 = tmpfile2.path();
+
+					fs::write(path1, TEXT).unwrap();
+					let s = fs::read_to_string(path1).unwrap();
+					assert_eq!(s, TEXT);
+					fs::write(path2, TEXT).unwrap();
+					let s = fs::read_to_string(path2).unwrap();
+					assert_eq!(s, TEXT);
+
+					// Apply Landlock with a read exception for only one of the files.
+					let status = try_restrict(vec![(path1, AccessFs::ReadFile)]);
+					if !matches!(status, Ok(RulesetStatus::FullyEnforced)) {
+						panic!("Ruleset should be enforced since we checked if landlock is enabled: {:?}", status);
+					}
+
+					// Try to read from both files, only tmpfile1 should succeed.
+					let result = fs::read_to_string(path1);
+					assert!(matches!(
+						result,
+						Ok(s) if s == TEXT
+					));
+					let result = fs::read_to_string(path2);
+					assert!(matches!(
+						result,
+						Err(err) if matches!(err.kind(), ErrorKind::PermissionDenied)
+					));
+
+					// Apply Landlock for all files.
+					let status = try_restrict(std::iter::empty::<(PathBuf, AccessFs)>());
+					if !matches!(status, Ok(RulesetStatus::FullyEnforced)) {
+						panic!("Ruleset should be enforced since we checked if landlock is enabled: {:?}", status);
+					}
+
+					// Try to read from tmpfile1 after landlock, it should fail.
+					let result = fs::read_to_string(path1);
+					assert!(matches!(
+						result,
+						Err(err) if matches!(err.kind(), ErrorKind::PermissionDenied)
+					));
+				});
 
 			assert!(handle.join().is_ok());
+		}
+
+		#[test]
+		fn restricted_thread_cannot_write_file() {
+			// TODO: This would be nice: <https://github.com/rust-lang/rust/issues/68007>.
+			if !check_is_fully_enabled() {
+				return
+			}
 
 			// Restricted thread cannot write to FS.
-			let handle = thread::spawn(|| {
-				let text = "foo";
-				let tmpfile = tempfile::NamedTempFile::new().unwrap();
-				let path = tmpfile.path();
-
-				let status = try_restrict_thread().unwrap();
-				if !matches!(status, RulesetStatus::FullyEnforced) {
-					panic!("Ruleset should be enforced since we checked if landlock is enabled");
-				}
-
-				// Try to write to the tmp file after landlock.
-				let result = fs::write(path, text);
-				assert!(matches!(
-					result,
-					Err(err) if matches!(err.kind(), ErrorKind::PermissionDenied)
-				));
-			});
+			let handle =
+				thread::spawn(|| {
+					// Create and write two tmp files. This should succeed before any landlock
+					// restrictions are applied.
+					const TEXT: &str = "foo";
+					let tmpfile1 = tempfile::NamedTempFile::new().unwrap();
+					let path1 = tmpfile1.path();
+					let tmpfile2 = tempfile::NamedTempFile::new().unwrap();
+					let path2 = tmpfile2.path();
+
+					fs::write(path1, TEXT).unwrap();
+					fs::write(path2, TEXT).unwrap();
+
+					// Apply Landlock with a write exception for only one of the files.
+					let status = try_restrict(vec![(path1, AccessFs::WriteFile)]);
+					if !matches!(status, Ok(RulesetStatus::FullyEnforced)) {
+						panic!("Ruleset should be enforced since we checked if landlock is enabled: {:?}", status);
+					}
+
+					// Try to write to both files, only tmpfile1 should succeed.
+					let result = fs::write(path1, TEXT);
+					assert!(matches!(result, Ok(_)));
+					let result = fs::write(path2, TEXT);
+					assert!(matches!(
+						result,
+						Err(err) if matches!(err.kind(), ErrorKind::PermissionDenied)
+					));
+
+					// Apply Landlock for all files.
+					let status = try_restrict(std::iter::empty::<(PathBuf, AccessFs)>());
+					if !matches!(status, Ok(RulesetStatus::FullyEnforced)) {
+						panic!("Ruleset should be enforced since we checked if landlock is enabled: {:?}", status);
+					}
+
+					// Try to write to tmpfile1 after landlock, it should fail.
+					let result = fs::write(path1, TEXT);
+					assert!(matches!(
+						result,
+						Err(err) if matches!(err.kind(), ErrorKind::PermissionDenied)
+					));
+				});
+
+			assert!(handle.join().is_ok());
+		}
+
+		// Test that checks whether landlock under our ABI version is able to truncate files.
+		#[test]
+		fn restricted_thread_can_truncate_file() {
+			// TODO: This would be nice: <https://github.com/rust-lang/rust/issues/68007>.
+			if !check_is_fully_enabled() {
+				return
+			}
+
+			// Restricted thread can truncate file.
+			let handle =
+				thread::spawn(|| {
+					// Create and write a file. This should succeed before any landlock
+					// restrictions are applied.
+					const TEXT: &str = "foo";
+					let tmpfile = tempfile::NamedTempFile::new().unwrap();
+					let path = tmpfile.path();
+
+					fs::write(path, TEXT).unwrap();
+
+					// Apply Landlock with all exceptions under the current ABI.
+					let status = try_restrict(vec![(path, AccessFs::from_all(LANDLOCK_ABI))]);
+					if !matches!(status, Ok(RulesetStatus::FullyEnforced)) {
+						panic!("Ruleset should be enforced since we checked if landlock is enabled: {:?}", status);
+					}
+
+					// Try to truncate the file.
+					let result = tmpfile.as_file().set_len(0);
+					assert!(result.is_ok());
+				});
 
 			assert!(handle.join().is_ok());
 		}
diff --git a/polkadot/runtime/kusama/build.rs b/polkadot/node/core/pvf/common/src/worker_dir.rs
similarity index 61%
rename from polkadot/runtime/kusama/build.rs
rename to polkadot/node/core/pvf/common/src/worker_dir.rs
index 404ba3f2fdbdfdc68d35d0dd08958448f30d90c6..1cdf43a61e48bafbd3423a13cc8adcc46b3c96c7 100644
--- a/polkadot/runtime/kusama/build.rs
+++ b/polkadot/node/core/pvf/common/src/worker_dir.rs
@@ -14,12 +14,17 @@
 // You should have received a copy of the GNU General Public License
 // along with Polkadot.  If not, see <http://www.gnu.org/licenses/>.
 
-use substrate_wasm_builder::WasmBuilder;
-
-fn main() {
-	WasmBuilder::new()
-		.with_current_project()
-		.import_memory()
-		.export_heap_base()
-		.build()
+//! Shared functions for getting the known worker files.
+
+use std::path::{Path, PathBuf};
+
+const WORKER_EXECUTE_ARTIFACT_NAME: &str = "artifact";
+const WORKER_PREPARE_TMP_ARTIFACT_NAME: &str = "tmp-artifact";
+
+pub fn execute_artifact(worker_dir_path: &Path) -> PathBuf {
+	worker_dir_path.join(WORKER_EXECUTE_ARTIFACT_NAME)
+}
+
+pub fn prepare_tmp_artifact(worker_dir_path: &Path) -> PathBuf {
+	worker_dir_path.join(WORKER_PREPARE_TMP_ARTIFACT_NAME)
 }
diff --git a/polkadot/node/core/pvf/execute-worker/Cargo.toml b/polkadot/node/core/pvf/execute-worker/Cargo.toml
index 2bc62863ab5e51d9baf360af47f62f59a8923c67..23678d95696e7ec10f7ac9a69a6d433b5e9275bb 100644
--- a/polkadot/node/core/pvf/execute-worker/Cargo.toml
+++ b/polkadot/node/core/pvf/execute-worker/Cargo.toml
@@ -1,7 +1,7 @@
 [package]
 name = "polkadot-node-core-pvf-execute-worker"
 description = "Polkadot crate that contains the logic for executing PVFs. Used by the polkadot-execute-worker binary."
-version.workspace = true
+version = "1.0.0"
 authors.workspace = true
 edition.workspace = true
 license.workspace = true
@@ -11,21 +11,17 @@ cpu-time = "1.0.0"
 futures = "0.3.21"
 gum = { package = "tracing-gum", path = "../../../gum" }
 rayon = "1.5.1"
-tikv-jemalloc-ctl = { version = "0.5.0", optional = true }
 tokio = { version = "1.24.2", features = ["fs", "process"] }
 
 parity-scale-codec = { version = "3.6.1", default-features = false, features = ["derive"] }
 
 polkadot-node-core-pvf-common = { path = "../common" }
-polkadot-parachain = { path = "../../../../parachain" }
+polkadot-parachain-primitives = { path = "../../../../parachain" }
 polkadot-primitives = { path = "../../../../primitives" }
 
 sp-core = { path = "../../../../../substrate/primitives/core" }
 sp-maybe-compressed-blob = { path = "../../../../../substrate/primitives/maybe-compressed-blob" }
 sp-tracing = { path = "../../../../../substrate/primitives/tracing" }
 
-[target.'cfg(target_os = "linux")'.dependencies]
-tikv-jemalloc-ctl = "0.5.0"
-
 [features]
 builder = []
diff --git a/polkadot/node/core/pvf/execute-worker/src/lib.rs b/polkadot/node/core/pvf/execute-worker/src/lib.rs
index 7a14de18a82fa392e55e91897bc9e49cc4fb7ca4..af73eb16e685a153330ab81353959ecf07a4a2e8 100644
--- a/polkadot/node/core/pvf/execute-worker/src/lib.rs
+++ b/polkadot/node/core/pvf/execute-worker/src/lib.rs
@@ -16,7 +16,9 @@
 
 //! Contains the logic for executing PVFs. Used by the polkadot-execute-worker binary.
 
-pub use polkadot_node_core_pvf_common::executor_intf::Executor;
+pub use polkadot_node_core_pvf_common::{
+	executor_intf::execute_artifact, worker_dir, SecurityStatus,
+};
 
 // NOTE: Initializing logging in e.g. tests will not have an effect in the workers, as they are
 //       separate spawned processes. Run with e.g. `RUST_LOG=parachain::pvf-execute-worker=trace`.
@@ -27,23 +29,22 @@ use parity_scale_codec::{Decode, Encode};
 use polkadot_node_core_pvf_common::{
 	error::InternalValidationError,
 	execute::{Handshake, Response},
-	executor_intf::NATIVE_STACK_MAX,
-	framed_recv, framed_send,
+	framed_recv_blocking, framed_send_blocking,
 	worker::{
-		bytes_to_path, cpu_time_monitor_loop,
-		security::LandlockStatus,
-		stringify_panic_payload,
+		cpu_time_monitor_loop, stringify_panic_payload,
 		thread::{self, WaitOutcome},
-		worker_event_loop,
+		worker_event_loop, WorkerKind,
 	},
 };
-use polkadot_parachain::primitives::ValidationResult;
+use polkadot_parachain_primitives::primitives::ValidationResult;
+use polkadot_primitives::{executor_params::DEFAULT_NATIVE_STACK_MAX, ExecutorParams};
 use std::{
+	os::unix::net::UnixStream,
 	path::PathBuf,
 	sync::{mpsc::channel, Arc},
 	time::Duration,
 };
-use tokio::{io, net::UnixStream};
+use tokio::io;
 
 // Wasmtime powers the Substrate Executor. It compiles the wasm bytecode into native code.
 // That native code does not create any stacks and just reuses the stack of the thread that
@@ -70,7 +71,7 @@ use tokio::{io, net::UnixStream};
 //
 // Typically on Linux the main thread gets the stack size specified by the `ulimit` and
 // typically it's configured to 8 MiB. Rust's spawned threads are 2 MiB. OTOH, the
-// NATIVE_STACK_MAX is set to 256 MiB. Not nearly enough.
+// DEFAULT_NATIVE_STACK_MAX is set to 256 MiB. Not nearly enough.
 //
 // Hence we need to increase it. The simplest way to fix that is to spawn a thread with the desired
 // stack limit.
@@ -79,10 +80,10 @@ use tokio::{io, net::UnixStream};
 //
 // The default Rust thread stack limit 2 MiB + 256 MiB wasm stack.
 /// The stack size for the execute thread.
-pub const EXECUTE_THREAD_STACK_SIZE: usize = 2 * 1024 * 1024 + NATIVE_STACK_MAX as usize;
+pub const EXECUTE_THREAD_STACK_SIZE: usize = 2 * 1024 * 1024 + DEFAULT_NATIVE_STACK_MAX as usize;
 
-async fn recv_handshake(stream: &mut UnixStream) -> io::Result<Handshake> {
-	let handshake_enc = framed_recv(stream).await?;
+fn recv_handshake(stream: &mut UnixStream) -> io::Result<Handshake> {
+	let handshake_enc = framed_recv_blocking(stream)?;
 	let handshake = Handshake::decode(&mut &handshake_enc[..]).map_err(|_| {
 		io::Error::new(
 			io::ErrorKind::Other,
@@ -92,57 +93,59 @@ async fn recv_handshake(stream: &mut UnixStream) -> io::Result<Handshake> {
 	Ok(handshake)
 }
 
-async fn recv_request(stream: &mut UnixStream) -> io::Result<(PathBuf, Vec<u8>, Duration)> {
-	let artifact_path = framed_recv(stream).await?;
-	let artifact_path = bytes_to_path(&artifact_path).ok_or_else(|| {
-		io::Error::new(
-			io::ErrorKind::Other,
-			"execute pvf recv_request: non utf-8 artifact path".to_string(),
-		)
-	})?;
-	let params = framed_recv(stream).await?;
-	let execution_timeout = framed_recv(stream).await?;
+fn recv_request(stream: &mut UnixStream) -> io::Result<(Vec<u8>, Duration)> {
+	let params = framed_recv_blocking(stream)?;
+	let execution_timeout = framed_recv_blocking(stream)?;
 	let execution_timeout = Duration::decode(&mut &execution_timeout[..]).map_err(|_| {
 		io::Error::new(
 			io::ErrorKind::Other,
 			"execute pvf recv_request: failed to decode duration".to_string(),
 		)
 	})?;
-	Ok((artifact_path, params, execution_timeout))
+	Ok((params, execution_timeout))
 }
 
-async fn send_response(stream: &mut UnixStream, response: Response) -> io::Result<()> {
-	framed_send(stream, &response.encode()).await
+fn send_response(stream: &mut UnixStream, response: Response) -> io::Result<()> {
+	framed_send_blocking(stream, &response.encode())
 }
 
 /// The entrypoint that the spawned execute worker should start with.
 ///
 /// # Parameters
 ///
-/// The `socket_path` specifies the path to the socket used to communicate with the host. The
-/// `node_version`, if `Some`, is checked against the worker version. A mismatch results in
-/// immediate worker termination. `None` is used for tests and in other situations when version
-/// check is not necessary.
+/// - `socket_path`: specifies the path to the socket used to communicate with the host.
+///
+/// - `worker_dir_path`: specifies the path to the worker-specific temporary directory.
+///
+/// - `node_version`: if `Some`, is checked against the `worker_version`. A mismatch results in
+///   immediate worker termination. `None` is used for tests and in other situations when version
+///   check is not necessary.
+///
+/// - `worker_version`: see above
+///
+/// - `security_status`: contains the detected status of security features.
 pub fn worker_entrypoint(
-	socket_path: &str,
+	socket_path: PathBuf,
+	worker_dir_path: PathBuf,
 	node_version: Option<&str>,
 	worker_version: Option<&str>,
+	security_status: SecurityStatus,
 ) {
 	worker_event_loop(
-		"execute",
+		WorkerKind::Execute,
 		socket_path,
+		worker_dir_path,
 		node_version,
 		worker_version,
-		|mut stream| async move {
+		&security_status,
+		|mut stream, worker_dir_path| async move {
 			let worker_pid = std::process::id();
+			let artifact_path = worker_dir::execute_artifact(&worker_dir_path);
 
-			let handshake = recv_handshake(&mut stream).await?;
-			let executor = Executor::new(handshake.executor_params).map_err(|e| {
-				io::Error::new(io::ErrorKind::Other, format!("cannot create executor: {}", e))
-			})?;
+			let Handshake { executor_params } = recv_handshake(&mut stream)?;
 
 			loop {
-				let (artifact_path, params, execution_timeout) = recv_request(&mut stream).await?;
+				let (params, execution_timeout) = recv_request(&mut stream)?;
 				gum::debug!(
 					target: LOG_TARGET,
 					%worker_pid,
@@ -151,15 +154,13 @@ pub fn worker_entrypoint(
 				);
 
 				// Get the artifact bytes.
-				//
-				// We do this outside the thread so that we can lock down filesystem access there.
-				let compiled_artifact_blob = match std::fs::read(artifact_path) {
+				let compiled_artifact_blob = match std::fs::read(&artifact_path) {
 					Ok(bytes) => bytes,
 					Err(err) => {
 						let response = Response::InternalError(
 							InternalValidationError::CouldNotOpenFile(err.to_string()),
 						);
-						send_response(&mut stream, response).await?;
+						send_response(&mut stream, response)?;
 						continue
 					},
 				};
@@ -183,26 +184,16 @@ pub fn worker_entrypoint(
 					Arc::clone(&condvar),
 					WaitOutcome::TimedOut,
 				)?;
-				let executor_2 = executor.clone();
+
+				let executor_params_2 = executor_params.clone();
 				let execute_thread = thread::spawn_worker_thread_with_stack_size(
 					"execute thread",
 					move || {
-						// Try to enable landlock.
-						#[cfg(target_os = "linux")]
-					let landlock_status = polkadot_node_core_pvf_common::worker::security::landlock::try_restrict_thread()
-						.map(LandlockStatus::from_ruleset_status)
-						.map_err(|e| e.to_string());
-						#[cfg(not(target_os = "linux"))]
-						let landlock_status: Result<LandlockStatus, String> = Ok(LandlockStatus::NotEnforced);
-
-						(
-							validate_using_artifact(
-								&compiled_artifact_blob,
-								&params,
-								executor_2,
-								cpu_time_start,
-							),
-							landlock_status,
+						validate_using_artifact(
+							&compiled_artifact_blob,
+							&executor_params_2,
+							&params,
+							cpu_time_start,
 						)
 					},
 					Arc::clone(&condvar),
@@ -215,24 +206,9 @@ pub fn worker_entrypoint(
 				let response = match outcome {
 					WaitOutcome::Finished => {
 						let _ = cpu_time_monitor_tx.send(());
-						let (result, landlock_status) = execute_thread.join().unwrap_or_else(|e| {
-							(
-								Response::Panic(stringify_panic_payload(e)),
-								Ok(LandlockStatus::Unavailable),
-							)
-						});
-
-						// Log if landlock threw an error.
-						if let Err(err) = landlock_status {
-							gum::warn!(
-								target: LOG_TARGET,
-								%worker_pid,
-								"error enabling landlock: {}",
-								err
-							);
-						}
-
-						result
+						execute_thread
+							.join()
+							.unwrap_or_else(|e| Response::Panic(stringify_panic_payload(e)))
 					},
 					// If the CPU thread is not selected, we signal it to end, the join handle is
 					// dropped and the thread will finish in the background.
@@ -267,7 +243,13 @@ pub fn worker_entrypoint(
 					),
 				};
 
-				send_response(&mut stream, response).await?;
+				gum::trace!(
+					target: LOG_TARGET,
+					%worker_pid,
+					"worker: sending response to host: {:?}",
+					response
+				);
+				send_response(&mut stream, response)?;
 			}
 		},
 	);
@@ -275,15 +257,15 @@ pub fn worker_entrypoint(
 
 fn validate_using_artifact(
 	compiled_artifact_blob: &[u8],
+	executor_params: &ExecutorParams,
 	params: &[u8],
-	executor: Executor,
 	cpu_time_start: ProcessTime,
 ) -> Response {
 	let descriptor_bytes = match unsafe {
 		// SAFETY: this should be safe since the compiled artifact passed here comes from the
 		//         file created by the prepare workers. These files are obtained by calling
 		//         [`executor_intf::prepare`].
-		executor.execute(compiled_artifact_blob, params)
+		execute_artifact(compiled_artifact_blob, executor_params, params)
 	} {
 		Err(err) => return Response::format_invalid("execute", &err),
 		Ok(d) => d,
diff --git a/polkadot/node/core/pvf/prepare-worker/Cargo.toml b/polkadot/node/core/pvf/prepare-worker/Cargo.toml
index 61d2fd97156422648ae0ae05796c708ca3ae1e01..886209b78c329f062e674a96992509d0390a4220 100644
--- a/polkadot/node/core/pvf/prepare-worker/Cargo.toml
+++ b/polkadot/node/core/pvf/prepare-worker/Cargo.toml
@@ -1,12 +1,13 @@
 [package]
 name = "polkadot-node-core-pvf-prepare-worker"
 description = "Polkadot crate that contains the logic for preparing PVFs. Used by the polkadot-prepare-worker binary."
-version.workspace = true
+version = "1.0.0"
 authors.workspace = true
 edition.workspace = true
 license.workspace = true
 
 [dependencies]
+cfg-if = "1.0"
 futures = "0.3.21"
 gum = { package = "tracing-gum", path = "../../../gum" }
 libc = "0.2.139"
@@ -17,7 +18,7 @@ tokio = { version = "1.24.2", features = ["fs", "process"] }
 parity-scale-codec = { version = "3.6.1", default-features = false, features = ["derive"] }
 
 polkadot-node-core-pvf-common = { path = "../common" }
-polkadot-parachain = { path = "../../../../parachain" }
+polkadot-parachain-primitives = { path = "../../../../parachain" }
 polkadot-primitives = { path = "../../../../primitives" }
 
 sc-executor = { path = "../../../../../substrate/client/executor" }
@@ -32,4 +33,7 @@ tikv-jemalloc-ctl = "0.5.0"
 
 [features]
 builder = []
-jemalloc-allocator = [ "dep:tikv-jemalloc-ctl" ]
+jemalloc-allocator = [
+	"dep:tikv-jemalloc-ctl",
+	"polkadot-node-core-pvf-common/jemalloc-allocator",
+]
diff --git a/polkadot/node/core/pvf/prepare-worker/src/lib.rs b/polkadot/node/core/pvf/prepare-worker/src/lib.rs
index caa7d33df12adfc67440caf3a9d68a65257edf99..fa5d3656a35e69fb0d738db82ed8f5ca54a75a9e 100644
--- a/polkadot/node/core/pvf/prepare-worker/src/lib.rs
+++ b/polkadot/node/core/pvf/prepare-worker/src/lib.rs
@@ -32,26 +32,25 @@ use crate::memory_stats::memory_tracker::{get_memory_tracker_loop_stats, memory_
 use parity_scale_codec::{Decode, Encode};
 use polkadot_node_core_pvf_common::{
 	error::{PrepareError, PrepareResult},
-	executor_intf::Executor,
-	framed_recv, framed_send,
+	executor_intf::create_runtime_from_artifact_bytes,
+	framed_recv_blocking, framed_send_blocking,
 	prepare::{MemoryStats, PrepareJobKind, PrepareStats},
 	pvf::PvfPrepData,
 	worker::{
-		bytes_to_path, cpu_time_monitor_loop,
-		security::LandlockStatus,
-		stringify_panic_payload,
+		cpu_time_monitor_loop, stringify_panic_payload,
 		thread::{self, WaitOutcome},
-		worker_event_loop,
+		worker_event_loop, WorkerKind,
 	},
-	ProcessTime,
+	worker_dir, ProcessTime, SecurityStatus,
 };
 use polkadot_primitives::ExecutorParams;
 use std::{
+	os::unix::net::UnixStream,
 	path::PathBuf,
 	sync::{mpsc::channel, Arc},
 	time::Duration,
 };
-use tokio::{io, net::UnixStream};
+use tokio::io;
 
 /// Contains the bytes for a successfully compiled artifact.
 pub struct CompiledArtifact(Vec<u8>);
@@ -69,36 +68,36 @@ impl AsRef<[u8]> for CompiledArtifact {
 	}
 }
 
-async fn recv_request(stream: &mut UnixStream) -> io::Result<(PvfPrepData, PathBuf)> {
-	let pvf = framed_recv(stream).await?;
+fn recv_request(stream: &mut UnixStream) -> io::Result<PvfPrepData> {
+	let pvf = framed_recv_blocking(stream)?;
 	let pvf = PvfPrepData::decode(&mut &pvf[..]).map_err(|e| {
 		io::Error::new(
 			io::ErrorKind::Other,
 			format!("prepare pvf recv_request: failed to decode PvfPrepData: {}", e),
 		)
 	})?;
-	let tmp_file = framed_recv(stream).await?;
-	let tmp_file = bytes_to_path(&tmp_file).ok_or_else(|| {
-		io::Error::new(
-			io::ErrorKind::Other,
-			"prepare pvf recv_request: non utf-8 artifact path".to_string(),
-		)
-	})?;
-	Ok((pvf, tmp_file))
+	Ok(pvf)
 }
 
-async fn send_response(stream: &mut UnixStream, result: PrepareResult) -> io::Result<()> {
-	framed_send(stream, &result.encode()).await
+fn send_response(stream: &mut UnixStream, result: PrepareResult) -> io::Result<()> {
+	framed_send_blocking(stream, &result.encode())
 }
 
 /// The entrypoint that the spawned prepare worker should start with.
 ///
 /// # Parameters
 ///
-/// The `socket_path` specifies the path to the socket used to communicate with the host. The
-/// `node_version`, if `Some`, is checked against the worker version. A mismatch results in
-/// immediate worker termination. `None` is used for tests and in other situations when version
-/// check is not necessary.
+/// - `socket_path`: specifies the path to the socket used to communicate with the host.
+///
+/// - `worker_dir_path`: specifies the path to the worker-specific temporary directory.
+///
+/// - `node_version`: if `Some`, is checked against the `worker_version`. A mismatch results in
+///   immediate worker termination. `None` is used for tests and in other situations when version
+///   check is not necessary.
+///
+/// - `worker_version`: see above
+///
+/// - `security_status`: contains the detected status of security features.
 ///
 /// # Flow
 ///
@@ -119,20 +118,25 @@ async fn send_response(stream: &mut UnixStream, result: PrepareResult) -> io::Re
 /// 7. Send the result of preparation back to the host. If any error occurred in the above steps, we
 ///    send that in the `PrepareResult`.
 pub fn worker_entrypoint(
-	socket_path: &str,
+	socket_path: PathBuf,
+	worker_dir_path: PathBuf,
 	node_version: Option<&str>,
 	worker_version: Option<&str>,
+	security_status: SecurityStatus,
 ) {
 	worker_event_loop(
-		"prepare",
+		WorkerKind::Prepare,
 		socket_path,
+		worker_dir_path,
 		node_version,
 		worker_version,
-		|mut stream| async move {
+		&security_status,
+		|mut stream, worker_dir_path| async move {
 			let worker_pid = std::process::id();
+			let temp_artifact_dest = worker_dir::prepare_tmp_artifact(&worker_dir_path);
 
 			loop {
-				let (pvf, temp_artifact_dest) = recv_request(&mut stream).await?;
+				let pvf = recv_request(&mut stream)?;
 				gum::debug!(
 					target: LOG_TARGET,
 					%worker_pid,
@@ -141,7 +145,7 @@ pub fn worker_entrypoint(
 
 				let preparation_timeout = pvf.prep_timeout();
 				let prepare_job_kind = pvf.prep_kind();
-				let executor_params = (*pvf.executor_params()).clone();
+				let executor_params = pvf.executor_params();
 
 				// Conditional variable to notify us when a thread is done.
 				let condvar = thread::get_condvar();
@@ -172,14 +176,6 @@ pub fn worker_entrypoint(
 				let prepare_thread = thread::spawn_worker_thread(
 					"prepare thread",
 					move || {
-						// Try to enable landlock.
-						#[cfg(target_os = "linux")]
-					let landlock_status = polkadot_node_core_pvf_common::worker::security::landlock::try_restrict_thread()
-						.map(LandlockStatus::from_ruleset_status)
-						.map_err(|e| e.to_string());
-						#[cfg(not(target_os = "linux"))]
-						let landlock_status: Result<LandlockStatus, String> = Ok(LandlockStatus::NotEnforced);
-
 						#[allow(unused_mut)]
 						let mut result = prepare_artifact(pvf, cpu_time_start);
 
@@ -195,12 +191,15 @@ pub fn worker_entrypoint(
 						// anyway.
 						if let PrepareJobKind::Prechecking = prepare_job_kind {
 							result = result.and_then(|output| {
-								runtime_construction_check(output.0.as_ref(), executor_params)?;
+								runtime_construction_check(
+									output.0.as_ref(),
+									executor_params.as_ref(),
+								)?;
 								Ok(output)
 							});
 						}
 
-						(result, landlock_status)
+						result
 					},
 					Arc::clone(&condvar),
 					WaitOutcome::Finished,
@@ -213,20 +212,20 @@ pub fn worker_entrypoint(
 						let _ = cpu_time_monitor_tx.send(());
 
 						match prepare_thread.join().unwrap_or_else(|err| {
-							(
-								Err(PrepareError::Panic(stringify_panic_payload(err))),
-								Ok(LandlockStatus::Unavailable),
-							)
+							Err(PrepareError::Panic(stringify_panic_payload(err)))
 						}) {
-							(Err(err), _) => {
+							Err(err) => {
 								// Serialized error will be written into the socket.
 								Err(err)
 							},
-							(Ok(ok), landlock_status) => {
-								#[cfg(not(target_os = "linux"))]
-								let (artifact, cpu_time_elapsed) = ok;
-								#[cfg(target_os = "linux")]
-								let (artifact, cpu_time_elapsed, max_rss) = ok;
+							Ok(ok) => {
+								cfg_if::cfg_if! {
+									if #[cfg(target_os = "linux")] {
+										let (artifact, cpu_time_elapsed, max_rss) = ok;
+									} else {
+										let (artifact, cpu_time_elapsed) = ok;
+									}
+								}
 
 								// Stop the memory stats worker and get its observed memory stats.
 								#[cfg(any(target_os = "linux", feature = "jemalloc-allocator"))]
@@ -242,16 +241,6 @@ pub fn worker_entrypoint(
 									max_rss: extract_max_rss_stat(max_rss, worker_pid),
 								};
 
-								// Log if landlock threw an error.
-								if let Err(err) = landlock_status {
-									gum::warn!(
-										target: LOG_TARGET,
-										%worker_pid,
-										"error enabling landlock: {}",
-										err
-									);
-								}
-
 								// Write the serialized artifact into a temp file.
 								//
 								// PVF host only keeps artifacts statuses in its memory,
@@ -300,7 +289,13 @@ pub fn worker_entrypoint(
 					),
 				};
 
-				send_response(&mut stream, result).await?;
+				gum::trace!(
+					target: LOG_TARGET,
+					%worker_pid,
+					"worker: sending response to host: {:?}",
+					result
+				);
+				send_response(&mut stream, result)?;
 			}
 		},
 	);
@@ -325,13 +320,10 @@ fn prepare_artifact(
 /// Try constructing the runtime to catch any instantiation errors during pre-checking.
 fn runtime_construction_check(
 	artifact_bytes: &[u8],
-	executor_params: ExecutorParams,
+	executor_params: &ExecutorParams,
 ) -> Result<(), PrepareError> {
-	let executor = Executor::new(executor_params)
-		.map_err(|e| PrepareError::RuntimeConstruction(format!("cannot create executor: {}", e)))?;
-
 	// SAFETY: We just compiled this artifact.
-	let result = unsafe { executor.create_runtime_from_bytes(&artifact_bytes) };
+	let result = unsafe { create_runtime_from_artifact_bytes(artifact_bytes, executor_params) };
 	result
 		.map(|_runtime| ())
 		.map_err(|err| PrepareError::RuntimeConstruction(format!("{:?}", err)))
diff --git a/polkadot/node/core/pvf/prepare-worker/src/memory_stats.rs b/polkadot/node/core/pvf/prepare-worker/src/memory_stats.rs
index 7904dfa9cb8857d34c1d0f84040caec3692e16bf..c70ff56fc84dbb00439d0c461179425809749739 100644
--- a/polkadot/node/core/pvf/prepare-worker/src/memory_stats.rs
+++ b/polkadot/node/core/pvf/prepare-worker/src/memory_stats.rs
@@ -151,7 +151,7 @@ pub mod memory_tracker {
 /// Module for dealing with the `ru_maxrss` (peak resident memory) stat from `getrusage`.
 ///
 /// NOTE: `getrusage` with the `RUSAGE_THREAD` parameter is only supported on Linux. `RUSAGE_SELF`
-/// works on MacOS, but we need to get the max rss only for the preparation thread. Gettng it for
+/// works on MacOS, but we need to get the max rss only for the preparation thread. Getting it for
 /// the current process would conflate the stats of previous jobs run by the process.
 #[cfg(target_os = "linux")]
 pub mod max_rss_stat {
diff --git a/polkadot/node/core/pvf/src/artifacts.rs b/polkadot/node/core/pvf/src/artifacts.rs
index a180af15db27763542e318753f016a9645a2726a..d7b15ece7b29457bde9c862f6720a7ad505b6dbe 100644
--- a/polkadot/node/core/pvf/src/artifacts.rs
+++ b/polkadot/node/core/pvf/src/artifacts.rs
@@ -58,7 +58,8 @@
 use crate::host::PrepareResultSender;
 use always_assert::always;
 use polkadot_node_core_pvf_common::{error::PrepareError, prepare::PrepareStats, pvf::PvfPrepData};
-use polkadot_parachain::primitives::ValidationCodeHash;
+use polkadot_node_primitives::NODE_VERSION;
+use polkadot_parachain_primitives::primitives::ValidationCodeHash;
 use polkadot_primitives::ExecutorParamsHash;
 use std::{
 	collections::HashMap,
@@ -75,6 +76,7 @@ pub struct ArtifactId {
 
 impl ArtifactId {
 	const PREFIX: &'static str = "wasmtime_";
+	const NODE_VERSION_PREFIX: &'static str = "polkadot_v";
 
 	/// Creates a new artifact ID with the given hash.
 	pub fn new(code_hash: ValidationCodeHash, executor_params_hash: ExecutorParamsHash) -> Self {
@@ -92,8 +94,13 @@ impl ArtifactId {
 		use polkadot_core_primitives::Hash;
 		use std::str::FromStr as _;
 
-		let file_name = file_name.strip_prefix(Self::PREFIX)?;
-		let (code_hash_str, executor_params_hash_str) = file_name.split_once('_')?;
+		let file_name =
+			file_name.strip_prefix(Self::PREFIX)?.strip_prefix(Self::NODE_VERSION_PREFIX)?;
+
+		// [ node version | code hash | param hash ]
+		let parts: Vec<&str> = file_name.split('_').collect();
+		let (_node_ver, code_hash_str, executor_params_hash_str) = (parts[0], parts[1], parts[2]);
+
 		let code_hash = Hash::from_str(code_hash_str).ok()?.into();
 		let executor_params_hash =
 			ExecutorParamsHash::from_hash(Hash::from_str(executor_params_hash_str).ok()?);
@@ -103,8 +110,14 @@ impl ArtifactId {
 
 	/// Returns the expected path to this artifact given the root of the cache.
 	pub fn path(&self, cache_path: &Path) -> PathBuf {
-		let file_name =
-			format!("{}{:#x}_{:#x}", Self::PREFIX, self.code_hash, self.executor_params_hash);
+		let file_name = format!(
+			"{}{}{}_{:#x}_{:#x}",
+			Self::PREFIX,
+			Self::NODE_VERSION_PREFIX,
+			NODE_VERSION,
+			self.code_hash,
+			self.executor_params_hash
+		);
 		cache_path.join(file_name)
 	}
 }
@@ -172,9 +185,10 @@ impl Artifacts {
 	///
 	/// The recognized artifacts will be filled in the table and unrecognized will be removed.
 	pub async fn new(cache_path: &Path) -> Self {
-		// Make sure that the cache path directory and all its parents are created.
-		// First delete the entire cache. Nodes are long-running so this should populate shortly.
+		// First delete the entire cache. This includes artifacts and any leftover worker dirs (see
+		// [`WorkerDir`]). Nodes are long-running so this should populate shortly.
 		let _ = tokio::fs::remove_dir_all(cache_path).await;
+		// Make sure that the cache path directory and all its parents are created.
 		let _ = tokio::fs::create_dir_all(cache_path).await;
 
 		Self { artifacts: HashMap::new() }
@@ -252,20 +266,27 @@ impl Artifacts {
 
 #[cfg(test)]
 mod tests {
-	use super::{ArtifactId, Artifacts};
+	use super::{ArtifactId, Artifacts, NODE_VERSION};
 	use polkadot_primitives::ExecutorParamsHash;
 	use sp_core::H256;
 	use std::{path::Path, str::FromStr};
 
+	fn file_name(code_hash: &str, param_hash: &str) -> String {
+		format!("wasmtime_polkadot_v{}_0x{}_0x{}", NODE_VERSION, code_hash, param_hash)
+	}
+
 	#[test]
 	fn from_file_name() {
 		assert!(ArtifactId::from_file_name("").is_none());
 		assert!(ArtifactId::from_file_name("junk").is_none());
 
+		let file_name = file_name(
+			"0022800000000000000000000000000000000000000000000000000000000000",
+			"0033900000000000000000000000000000000000000000000000000000000000",
+		);
+
 		assert_eq!(
-			ArtifactId::from_file_name(
-				"wasmtime_0x0022800000000000000000000000000000000000000000000000000000000000_0x0033900000000000000000000000000000000000000000000000000000000000"
-			),
+			ArtifactId::from_file_name(&file_name),
 			Some(ArtifactId::new(
 				hex_literal::hex![
 					"0022800000000000000000000000000000000000000000000000000000000000"
@@ -280,22 +301,25 @@ mod tests {
 
 	#[test]
 	fn path() {
-		let path = Path::new("/test");
-		let hash =
-			H256::from_str("1234567890123456789012345678901234567890123456789012345678901234")
-				.unwrap();
+		let dir = Path::new("/test");
+		let code_hash = "1234567890123456789012345678901234567890123456789012345678901234";
+		let params_hash = "4321098765432109876543210987654321098765432109876543210987654321";
+		let file_name = file_name(code_hash, params_hash);
+
+		let code_hash = H256::from_str(code_hash).unwrap();
+		let params_hash = H256::from_str(params_hash).unwrap();
 
 		assert_eq!(
-			ArtifactId::new(hash.into(), ExecutorParamsHash::from_hash(hash)).path(path).to_str(),
-			Some(
-				"/test/wasmtime_0x1234567890123456789012345678901234567890123456789012345678901234_0x1234567890123456789012345678901234567890123456789012345678901234"
-			),
+			ArtifactId::new(code_hash.into(), ExecutorParamsHash::from_hash(params_hash))
+				.path(dir)
+				.to_str(),
+			Some(format!("/test/{}", file_name).as_str()),
 		);
 	}
 
 	#[tokio::test]
 	async fn artifacts_removes_cache_on_startup() {
-		let fake_cache_path = crate::worker_intf::tmpfile("test-cache").await.unwrap();
+		let fake_cache_path = crate::worker_intf::tmppath("test-cache").await.unwrap();
 		let fake_artifact_path = {
 			let mut p = fake_cache_path.clone();
 			p.push("wasmtime_0x1234567890123456789012345678901234567890123456789012345678901234");
diff --git a/polkadot/node/core/pvf/src/error.rs b/polkadot/node/core/pvf/src/error.rs
index cb35ec9e9d9a4d360513869279d8b6d032e3e0a6..87ef0b54a0406776b865ea143185fd8012ef82e1 100644
--- a/polkadot/node/core/pvf/src/error.rs
+++ b/polkadot/node/core/pvf/src/error.rs
@@ -28,7 +28,7 @@ pub enum ValidationError {
 }
 
 /// A description of an error raised during executing a PVF and can be attributed to the combination
-/// of the candidate [`polkadot_parachain::primitives::ValidationParams`] and the PVF.
+/// of the candidate [`polkadot_parachain_primitives::primitives::ValidationParams`] and the PVF.
 #[derive(Debug, Clone)]
 pub enum InvalidCandidate {
 	/// PVF preparation ended up with a deterministic error.
diff --git a/polkadot/node/core/pvf/src/execute/queue.rs b/polkadot/node/core/pvf/src/execute/queue.rs
index acb260e256931686c15dadb64341e2155b56ee2e..aca604f0de21dd805e10c68c1a8d80c202010e9b 100644
--- a/polkadot/node/core/pvf/src/execute/queue.rs
+++ b/polkadot/node/core/pvf/src/execute/queue.rs
@@ -30,6 +30,7 @@ use futures::{
 	stream::{FuturesUnordered, StreamExt as _},
 	Future, FutureExt,
 };
+use polkadot_node_core_pvf_common::SecurityStatus;
 use polkadot_primitives::{ExecutorParams, ExecutorParamsHash};
 use slotmap::HopSlotMap;
 use std::{
@@ -139,8 +140,10 @@ struct Queue {
 
 	// Some variables related to the current session.
 	program_path: PathBuf,
+	cache_path: PathBuf,
 	spawn_timeout: Duration,
 	node_version: Option<String>,
+	security_status: SecurityStatus,
 
 	/// The queue of jobs that are waiting for a worker to pick up.
 	queue: VecDeque<ExecuteJob>,
@@ -152,16 +155,20 @@ impl Queue {
 	fn new(
 		metrics: Metrics,
 		program_path: PathBuf,
+		cache_path: PathBuf,
 		worker_capacity: usize,
 		spawn_timeout: Duration,
 		node_version: Option<String>,
+		security_status: SecurityStatus,
 		to_queue_rx: mpsc::Receiver<ToQueue>,
 	) -> Self {
 		Self {
 			metrics,
 			program_path,
+			cache_path,
 			spawn_timeout,
 			node_version,
+			security_status,
 			to_queue_rx,
 			queue: VecDeque::new(),
 			mux: Mux::new(),
@@ -405,9 +412,11 @@ fn spawn_extra_worker(queue: &mut Queue, job: ExecuteJob) {
 	queue.mux.push(
 		spawn_worker_task(
 			queue.program_path.clone(),
+			queue.cache_path.clone(),
 			job,
 			queue.spawn_timeout,
 			queue.node_version.clone(),
+			queue.security_status.clone(),
 		)
 		.boxed(),
 	);
@@ -423,18 +432,22 @@ fn spawn_extra_worker(queue: &mut Queue, job: ExecuteJob) {
 /// execute other jobs with a compatible execution environment.
 async fn spawn_worker_task(
 	program_path: PathBuf,
+	cache_path: PathBuf,
 	job: ExecuteJob,
 	spawn_timeout: Duration,
 	node_version: Option<String>,
+	security_status: SecurityStatus,
 ) -> QueueEvent {
 	use futures_timer::Delay;
 
 	loop {
 		match super::worker_intf::spawn(
 			&program_path,
+			&cache_path,
 			job.executor_params.clone(),
 			spawn_timeout,
 			node_version.as_deref(),
+			security_status.clone(),
 		)
 		.await
 		{
@@ -496,17 +509,21 @@ fn assign(queue: &mut Queue, worker: Worker, job: ExecuteJob) {
 pub fn start(
 	metrics: Metrics,
 	program_path: PathBuf,
+	cache_path: PathBuf,
 	worker_capacity: usize,
 	spawn_timeout: Duration,
 	node_version: Option<String>,
+	security_status: SecurityStatus,
 ) -> (mpsc::Sender<ToQueue>, impl Future<Output = ()>) {
 	let (to_queue_tx, to_queue_rx) = mpsc::channel(20);
 	let run = Queue::new(
 		metrics,
 		program_path,
+		cache_path,
 		worker_capacity,
 		spawn_timeout,
 		node_version,
+		security_status,
 		to_queue_rx,
 	)
 	.run();
diff --git a/polkadot/node/core/pvf/src/execute/worker_intf.rs b/polkadot/node/core/pvf/src/execute/worker_intf.rs
index 948abd2261d720e14e4f691d626febdf48dbf743..783c7c7abbc8c7526819d85e3e06bd1ae6e9209c 100644
--- a/polkadot/node/core/pvf/src/execute/worker_intf.rs
+++ b/polkadot/node/core/pvf/src/execute/worker_intf.rs
@@ -19,8 +19,8 @@
 use crate::{
 	artifacts::ArtifactPathId,
 	worker_intf::{
-		path_to_bytes, spawn_with_program_path, IdleWorker, SpawnErr, WorkerHandle,
-		JOB_TIMEOUT_WALL_CLOCK_FACTOR,
+		clear_worker_dir_path, framed_recv, framed_send, spawn_with_program_path, IdleWorker,
+		SpawnErr, WorkerDir, WorkerHandle, JOB_TIMEOUT_WALL_CLOCK_FACTOR,
 	},
 	LOG_TARGET,
 };
@@ -30,29 +30,38 @@ use parity_scale_codec::{Decode, Encode};
 use polkadot_node_core_pvf_common::{
 	error::InternalValidationError,
 	execute::{Handshake, Response},
-	framed_recv, framed_send,
+	worker_dir, SecurityStatus,
 };
-use polkadot_parachain::primitives::ValidationResult;
+use polkadot_parachain_primitives::primitives::ValidationResult;
 use polkadot_primitives::ExecutorParams;
 use std::{path::Path, time::Duration};
 use tokio::{io, net::UnixStream};
 
 /// Spawns a new worker with the given program path that acts as the worker and the spawn timeout.
-/// Sends a handshake message to the worker as soon as it is spawned.
 ///
-/// The program should be able to handle `<program-path> execute-worker <socket-path>` invocation.
+/// Sends a handshake message to the worker as soon as it is spawned.
 pub async fn spawn(
 	program_path: &Path,
+	cache_path: &Path,
 	executor_params: ExecutorParams,
 	spawn_timeout: Duration,
 	node_version: Option<&str>,
+	security_status: SecurityStatus,
 ) -> Result<(IdleWorker, WorkerHandle), SpawnErr> {
 	let mut extra_args = vec!["execute-worker"];
 	if let Some(node_version) = node_version {
 		extra_args.extend_from_slice(&["--node-impl-version", node_version]);
 	}
-	let (mut idle_worker, worker_handle) =
-		spawn_with_program_path("execute", program_path, &extra_args, spawn_timeout).await?;
+
+	let (mut idle_worker, worker_handle) = spawn_with_program_path(
+		"execute",
+		program_path,
+		cache_path,
+		&extra_args,
+		spawn_timeout,
+		security_status,
+	)
+	.await?;
 	send_handshake(&mut idle_worker.stream, Handshake { executor_params })
 		.await
 		.map_err(|error| {
@@ -104,89 +113,151 @@ pub async fn start_work(
 	execution_timeout: Duration,
 	validation_params: Vec<u8>,
 ) -> Outcome {
-	let IdleWorker { mut stream, pid } = worker;
+	let IdleWorker { mut stream, pid, worker_dir } = worker;
 
 	gum::debug!(
 		target: LOG_TARGET,
 		worker_pid = %pid,
+		?worker_dir,
 		validation_code_hash = ?artifact.id.code_hash,
 		"starting execute for {}",
 		artifact.path.display(),
 	);
 
-	if let Err(error) =
-		send_request(&mut stream, &artifact.path, &validation_params, execution_timeout).await
-	{
+	with_worker_dir_setup(worker_dir, pid, &artifact.path, |worker_dir| async move {
+		if let Err(error) = send_request(&mut stream, &validation_params, execution_timeout).await {
+			gum::warn!(
+				target: LOG_TARGET,
+				worker_pid = %pid,
+				validation_code_hash = ?artifact.id.code_hash,
+				?error,
+				"failed to send an execute request",
+			);
+			return Outcome::IoErr
+		}
+
+		// We use a generous timeout here. This is in addition to the one in the child process, in
+		// case the child stalls. We have a wall clock timeout here in the host, but a CPU timeout
+		// in the child. We want to use CPU time because it varies less than wall clock time under
+		// load, but the CPU resources of the child can only be measured from the parent after the
+		// child process terminates.
+		let timeout = execution_timeout * JOB_TIMEOUT_WALL_CLOCK_FACTOR;
+		let response = futures::select! {
+			response = recv_response(&mut stream).fuse() => {
+				match response {
+					Err(error) => {
+						gum::warn!(
+							target: LOG_TARGET,
+							worker_pid = %pid,
+							validation_code_hash = ?artifact.id.code_hash,
+							?error,
+							"failed to recv an execute response",
+						);
+						return Outcome::IoErr
+					},
+					Ok(response) => {
+						if let Response::Ok{duration, ..} = response {
+							if duration > execution_timeout {
+								// The job didn't complete within the timeout.
+								gum::warn!(
+									target: LOG_TARGET,
+									worker_pid = %pid,
+									"execute job took {}ms cpu time, exceeded execution timeout {}ms.",
+									duration.as_millis(),
+									execution_timeout.as_millis(),
+								);
+
+								// Return a timeout error.
+								return Outcome::HardTimeout;
+							}
+						}
+
+						response
+					},
+				}
+			},
+			_ = Delay::new(timeout).fuse() => {
+				gum::warn!(
+					target: LOG_TARGET,
+					worker_pid = %pid,
+					validation_code_hash = ?artifact.id.code_hash,
+					"execution worker exceeded lenient timeout for execution, child worker likely stalled",
+				);
+				Response::TimedOut
+			},
+		};
+
+		match response {
+			Response::Ok { result_descriptor, duration } => Outcome::Ok {
+				result_descriptor,
+				duration,
+				idle_worker: IdleWorker { stream, pid, worker_dir },
+			},
+			Response::InvalidCandidate(err) => Outcome::InvalidCandidate {
+				err,
+				idle_worker: IdleWorker { stream, pid, worker_dir },
+			},
+			Response::TimedOut => Outcome::HardTimeout,
+			Response::Panic(err) => Outcome::Panic { err },
+			Response::InternalError(err) => Outcome::InternalError { err },
+		}
+	})
+	.await
+}
+
+/// Create a temporary file for an artifact in the worker cache, execute the given future/closure
+/// passing the file path in, and clean up the worker cache.
+///
+/// Failure to clean up the worker cache results in an error - leaving any files here could be a
+/// security issue, and we should shut down the worker. This should be very rare.
+async fn with_worker_dir_setup<F, Fut>(
+	worker_dir: WorkerDir,
+	pid: u32,
+	artifact_path: &Path,
+	f: F,
+) -> Outcome
+where
+	Fut: futures::Future<Output = Outcome>,
+	F: FnOnce(WorkerDir) -> Fut,
+{
+	// Cheaply create a hard link to the artifact. The artifact is always at a known location in the
+	// worker cache, and the child can't access any other artifacts or gain any information from the
+	// original filename.
+	let link_path = worker_dir::execute_artifact(&worker_dir.path);
+	if let Err(err) = tokio::fs::hard_link(artifact_path, link_path).await {
 		gum::warn!(
 			target: LOG_TARGET,
 			worker_pid = %pid,
-			validation_code_hash = ?artifact.id.code_hash,
-			?error,
-			"failed to send an execute request",
+			?worker_dir,
+			"failed to clear worker cache after the job: {:?}",
+			err,
 		);
-		return Outcome::IoErr
+		return Outcome::InternalError {
+			err: InternalValidationError::CouldNotCreateLink(format!("{:?}", err)),
+		}
 	}
 
-	// We use a generous timeout here. This is in addition to the one in the child process, in
-	// case the child stalls. We have a wall clock timeout here in the host, but a CPU timeout
-	// in the child. We want to use CPU time because it varies less than wall clock time under
-	// load, but the CPU resources of the child can only be measured from the parent after the
-	// child process terminates.
-	let timeout = execution_timeout * JOB_TIMEOUT_WALL_CLOCK_FACTOR;
-	let response = futures::select! {
-		response = recv_response(&mut stream).fuse() => {
-			match response {
-				Err(error) => {
-					gum::warn!(
-						target: LOG_TARGET,
-						worker_pid = %pid,
-						validation_code_hash = ?artifact.id.code_hash,
-						?error,
-						"failed to recv an execute response",
-					);
-					return Outcome::IoErr
-				},
-				Ok(response) => {
-					if let Response::Ok{duration, ..} = response {
-						if duration > execution_timeout {
-							// The job didn't complete within the timeout.
-							gum::warn!(
-								target: LOG_TARGET,
-								worker_pid = %pid,
-								"execute job took {}ms cpu time, exceeded execution timeout {}ms.",
-								duration.as_millis(),
-								execution_timeout.as_millis(),
-							);
-
-							// Return a timeout error.
-							return Outcome::HardTimeout;
-						}
-					}
+	let worker_dir_path = worker_dir.path.clone();
+	let outcome = f(worker_dir).await;
 
-					response
-				},
-			}
-		},
-		_ = Delay::new(timeout).fuse() => {
-			gum::warn!(
-				target: LOG_TARGET,
-				worker_pid = %pid,
-				validation_code_hash = ?artifact.id.code_hash,
-				"execution worker exceeded lenient timeout for execution, child worker likely stalled",
-			);
-			Response::TimedOut
-		},
-	};
-
-	match response {
-		Response::Ok { result_descriptor, duration } =>
-			Outcome::Ok { result_descriptor, duration, idle_worker: IdleWorker { stream, pid } },
-		Response::InvalidCandidate(err) =>
-			Outcome::InvalidCandidate { err, idle_worker: IdleWorker { stream, pid } },
-		Response::TimedOut => Outcome::HardTimeout,
-		Response::Panic(err) => Outcome::Panic { err },
-		Response::InternalError(err) => Outcome::InternalError { err },
+	// Try to clear the worker dir.
+	if let Err(err) = clear_worker_dir_path(&worker_dir_path) {
+		gum::warn!(
+			target: LOG_TARGET,
+			worker_pid = %pid,
+			?worker_dir_path,
+			"failed to clear worker cache after the job: {:?}",
+			err,
+		);
+		return Outcome::InternalError {
+			err: InternalValidationError::CouldNotClearWorkerDir {
+				err: format!("{:?}", err),
+				path: worker_dir_path.to_str().map(String::from),
+			},
+		}
 	}
+
+	outcome
 }
 
 async fn send_handshake(stream: &mut UnixStream, handshake: Handshake) -> io::Result<()> {
@@ -195,11 +266,9 @@ async fn send_handshake(stream: &mut UnixStream, handshake: Handshake) -> io::Re
 
 async fn send_request(
 	stream: &mut UnixStream,
-	artifact_path: &Path,
 	validation_params: &[u8],
 	execution_timeout: Duration,
 ) -> io::Result<()> {
-	framed_send(stream, path_to_bytes(artifact_path)).await?;
 	framed_send(stream, validation_params).await?;
 	framed_send(stream, &execution_timeout.encode()).await
 }
diff --git a/polkadot/node/core/pvf/src/host.rs b/polkadot/node/core/pvf/src/host.rs
index 9f3b7e23fd89e419350329bd2226242a51b5628e..81695829122b9d3ba03307f1c597ac5877dc7023 100644
--- a/polkadot/node/core/pvf/src/host.rs
+++ b/polkadot/node/core/pvf/src/host.rs
@@ -34,8 +34,9 @@ use futures::{
 use polkadot_node_core_pvf_common::{
 	error::{PrepareError, PrepareResult},
 	pvf::PvfPrepData,
+	SecurityStatus,
 };
-use polkadot_parachain::primitives::ValidationResult;
+use polkadot_parachain_primitives::primitives::ValidationResult;
 use std::{
 	collections::HashMap,
 	path::{Path, PathBuf},
@@ -202,8 +203,13 @@ impl Config {
 pub fn start(config: Config, metrics: Metrics) -> (ValidationHost, impl Future<Output = ()>) {
 	gum::debug!(target: LOG_TARGET, ?config, "starting PVF validation host");
 
-	// Run checks for supported security features once per host startup.
-	warn_if_no_landlock();
+	// Run checks for supported security features once per host startup. Warn here if not enabled.
+	let security_status = {
+		let can_enable_landlock = check_landlock(&config.prepare_worker_program_path);
+		let can_unshare_user_namespace_and_change_root =
+			check_can_unshare_user_namespace_and_change_root(&config.prepare_worker_program_path);
+		SecurityStatus { can_enable_landlock, can_unshare_user_namespace_and_change_root }
+	};
 
 	let (to_host_tx, to_host_rx) = mpsc::channel(10);
 
@@ -215,6 +221,7 @@ pub fn start(config: Config, metrics: Metrics) -> (ValidationHost, impl Future<O
 		config.cache_path.clone(),
 		config.prepare_worker_spawn_timeout,
 		config.node_version.clone(),
+		security_status.clone(),
 	);
 
 	let (to_prepare_queue_tx, from_prepare_queue_rx, run_prepare_queue) = prepare::start_queue(
@@ -229,9 +236,11 @@ pub fn start(config: Config, metrics: Metrics) -> (ValidationHost, impl Future<O
 	let (to_execute_queue_tx, run_execute_queue) = execute::start(
 		metrics,
 		config.execute_worker_program_path.to_owned(),
+		config.cache_path.clone(),
 		config.execute_workers_max_num,
 		config.execute_worker_spawn_timeout,
 		config.node_version,
+		security_status,
 	);
 
 	let (to_sweeper_tx, to_sweeper_rx) = mpsc::channel(100);
@@ -873,28 +882,103 @@ fn pulse_every(interval: std::time::Duration) -> impl futures::Stream<Item = ()>
 	.map(|_| ())
 }
 
-/// Check if landlock is supported and emit a warning if not.
-fn warn_if_no_landlock() {
-	#[cfg(target_os = "linux")]
-	{
-		use polkadot_node_core_pvf_common::worker::security::landlock;
-		let status = landlock::get_status();
-		if !landlock::status_is_fully_enabled(&status) {
-			let abi = landlock::LANDLOCK_ABI as u8;
+/// Check if we can sandbox the root and emit a warning if not.
+///
+/// We do this check by spawning a new process and trying to sandbox it. To get as close as possible
+/// to running the check in a worker, we try it... in a worker. The expected return status is 0 on
+/// success and -1 on failure.
+fn check_can_unshare_user_namespace_and_change_root(
+	#[cfg_attr(not(target_os = "linux"), allow(unused_variables))]
+	prepare_worker_program_path: &Path,
+) -> bool {
+	cfg_if::cfg_if! {
+		if #[cfg(target_os = "linux")] {
+			let output = std::process::Command::new(prepare_worker_program_path)
+				.arg("--check-can-unshare-user-namespace-and-change-root")
+				.output();
+
+			match output {
+				Ok(output) if output.status.success() => true,
+				Ok(output) => {
+					let stderr = std::str::from_utf8(&output.stderr)
+						.expect("child process writes a UTF-8 string to stderr; qed")
+						.trim();
+					gum::warn!(
+						target: LOG_TARGET,
+						?prepare_worker_program_path,
+						// Docs say to always print status using `Display` implementation.
+						status = %output.status,
+						%stderr,
+						"Cannot unshare user namespace and change root, which are Linux-specific kernel security features. Running validation of malicious PVF code has a higher risk of compromising this machine. Consider running with support for unsharing user namespaces for maximum security."
+					);
+					false
+				},
+				Err(err) => {
+					gum::warn!(
+						target: LOG_TARGET,
+						?prepare_worker_program_path,
+						"Could not start child process: {}",
+						err
+					);
+					false
+				},
+			}
+		} else {
 			gum::warn!(
 				target: LOG_TARGET,
-				?status,
-				%abi,
-				"Cannot fully enable landlock, a Linux kernel security feature. Running validation of malicious PVF code has a higher risk of compromising this machine. Consider upgrading the kernel version for maximum security."
+				"Cannot unshare user namespace and change root, which are Linux-specific kernel security features. Running validation of malicious PVF code has a higher risk of compromising this machine. Consider running on Linux with support for unsharing user namespaces for maximum security."
 			);
+			false
 		}
 	}
+}
 
-	#[cfg(not(target_os = "linux"))]
-	gum::warn!(
-		target: LOG_TARGET,
-		"Cannot enable landlock, a Linux kernel security feature. Running validation of malicious PVF code has a higher risk of compromising this machine. Consider running on Linux with landlock support for maximum security."
-	);
+/// Check if landlock is supported and emit a warning if not.
+///
+/// We do this check by spawning a new process and trying to sandbox it. To get as close as possible
+/// to running the check in a worker, we try it... in a worker. The expected return status is 0 on
+/// success and -1 on failure.
+fn check_landlock(
+	#[cfg_attr(not(target_os = "linux"), allow(unused_variables))]
+	prepare_worker_program_path: &Path,
+) -> bool {
+	cfg_if::cfg_if! {
+		if #[cfg(target_os = "linux")] {
+			match std::process::Command::new(prepare_worker_program_path)
+				.arg("--check-can-enable-landlock")
+				.status()
+			{
+				Ok(status) if status.success() => true,
+				Ok(status) => {
+					let abi =
+						polkadot_node_core_pvf_common::worker::security::landlock::LANDLOCK_ABI as u8;
+					gum::warn!(
+						target: LOG_TARGET,
+						?prepare_worker_program_path,
+						?status,
+						%abi,
+						"Cannot fully enable landlock, a Linux-specific kernel security feature. Running validation of malicious PVF code has a higher risk of compromising this machine. Consider upgrading the kernel version for maximum security."
+					);
+					false
+				},
+				Err(err) => {
+					gum::warn!(
+						target: LOG_TARGET,
+						?prepare_worker_program_path,
+						"Could not start child process: {}",
+						err
+					);
+					false
+				},
+			}
+		} else {
+			gum::warn!(
+				target: LOG_TARGET,
+				"Cannot enable landlock, a Linux-specific kernel security feature. Running validation of malicious PVF code has a higher risk of compromising this machine. Consider running on Linux with landlock support for maximum security."
+			);
+			false
+		}
+	}
 }
 
 #[cfg(test)]
diff --git a/polkadot/node/core/pvf/src/lib.rs b/polkadot/node/core/pvf/src/lib.rs
index 1da0593835fb403b36d126cb948fd41247a71742..e3c6da9c4c6ba80ee94658921e975610d3b2d58f 100644
--- a/polkadot/node/core/pvf/src/lib.rs
+++ b/polkadot/node/core/pvf/src/lib.rs
@@ -19,8 +19,10 @@
 //! The PVF validation host. Responsible for coordinating preparation and execution of PVFs.
 //!
 //! For more background, refer to the Implementer's Guide: [PVF
-//! Pre-checking](https://paritytech.github.io/polkadot/book/pvf-prechecking.html) and [Candidate
-//! Validation](https://paritytech.github.io/polkadot/book/node/utility/candidate-validation.html#pvf-host).
+//! Pre-checking](https://paritytech.github.io/polkadot-sdk/book/pvf-prechecking.html), [Candidate
+//! Validation](https://paritytech.github.io/polkadot-sdk/book/node/utility/candidate-validation.html)
+//! and [PVF Host and Workers](https://paritytech.github.io/polkadot-sdk/book/node/utility/pvf-host-and-workers.html).
+//!
 //!
 //! # Entrypoint
 //!
@@ -33,8 +35,8 @@
 //! compile) in order to pre-check its validity.
 //!
 //! (b) PVF execution. This accepts the PVF
-//! [`params`][`polkadot_parachain::primitives::ValidationParams`]     and the `Pvf` code, prepares
-//! (verifies and compiles) the code, and then executes PVF     with the `params`.
+//! [`params`][`polkadot_parachain_primitives::primitives::ValidationParams`]     and the `Pvf`
+//! code, prepares (verifies and compiles) the code, and then executes PVF     with the `params`.
 //!
 //! (c) Heads up. This request allows to signal that the given PVF may be needed soon and that it
 //!     should be prepared for execution.
@@ -86,7 +88,7 @@
 //!
 //! The execute workers will be fed by the requests from the execution queue, which is basically a
 //! combination of a path to the compiled artifact and the
-//! [`params`][`polkadot_parachain::primitives::ValidationParams`].
+//! [`params`][`polkadot_parachain_primitives::primitives::ValidationParams`].
 
 mod artifacts;
 mod error;
@@ -100,10 +102,6 @@ mod worker_intf;
 #[cfg(feature = "test-utils")]
 pub mod testing;
 
-// Used by `decl_puppet_worker_main!`.
-#[cfg(feature = "test-utils")]
-pub use sp_tracing;
-
 pub use error::{InvalidCandidate, ValidationError};
 pub use host::{start, Config, ValidationHost, EXECUTE_BINARY_NAME, PREPARE_BINARY_NAME};
 pub use metrics::Metrics;
@@ -115,13 +113,8 @@ pub use polkadot_node_core_pvf_common::{
 	error::{InternalValidationError, PrepareError},
 	prepare::{PrepareJobKind, PrepareStats},
 	pvf::PvfPrepData,
+	SecurityStatus,
 };
 
-// Re-export worker entrypoints.
-#[cfg(feature = "test-utils")]
-pub use polkadot_node_core_pvf_execute_worker::worker_entrypoint as execute_worker_entrypoint;
-#[cfg(feature = "test-utils")]
-pub use polkadot_node_core_pvf_prepare_worker::worker_entrypoint as prepare_worker_entrypoint;
-
 /// The log target for this crate.
 pub const LOG_TARGET: &str = "parachain::pvf";
diff --git a/polkadot/node/core/pvf/src/prepare/pool.rs b/polkadot/node/core/pvf/src/prepare/pool.rs
index 92aa4896c263ce5c4e6aac507ed2eee61a3cdd3b..7933b0319a6f9fcd9fe83cad9f47950827a6ecc9 100644
--- a/polkadot/node/core/pvf/src/prepare/pool.rs
+++ b/polkadot/node/core/pvf/src/prepare/pool.rs
@@ -27,6 +27,7 @@ use futures::{
 use polkadot_node_core_pvf_common::{
 	error::{PrepareError, PrepareResult},
 	pvf::PvfPrepData,
+	SecurityStatus,
 };
 use slotmap::HopSlotMap;
 use std::{
@@ -110,10 +111,12 @@ enum PoolEvent {
 type Mux = FuturesUnordered<BoxFuture<'static, PoolEvent>>;
 
 struct Pool {
+	// Some variables related to the current session.
 	program_path: PathBuf,
 	cache_path: PathBuf,
 	spawn_timeout: Duration,
 	node_version: Option<String>,
+	security_status: SecurityStatus,
 
 	to_pool: mpsc::Receiver<ToPool>,
 	from_pool: mpsc::UnboundedSender<FromPool>,
@@ -132,6 +135,7 @@ async fn run(
 		cache_path,
 		spawn_timeout,
 		node_version,
+		security_status,
 		to_pool,
 		mut from_pool,
 		mut spawned,
@@ -160,6 +164,7 @@ async fn run(
 					&cache_path,
 					spawn_timeout,
 					node_version.clone(),
+					security_status.clone(),
 					&mut spawned,
 					&mut mux,
 					to_pool,
@@ -207,6 +212,7 @@ fn handle_to_pool(
 	cache_path: &Path,
 	spawn_timeout: Duration,
 	node_version: Option<String>,
+	security_status: SecurityStatus,
 	spawned: &mut HopSlotMap<Worker, WorkerData>,
 	mux: &mut Mux,
 	to_pool: ToPool,
@@ -216,7 +222,14 @@ fn handle_to_pool(
 			gum::debug!(target: LOG_TARGET, "spawning a new prepare worker");
 			metrics.prepare_worker().on_begin_spawn();
 			mux.push(
-				spawn_worker_task(program_path.to_owned(), spawn_timeout, node_version).boxed(),
+				spawn_worker_task(
+					program_path.to_owned(),
+					cache_path.to_owned(),
+					spawn_timeout,
+					node_version,
+					security_status,
+				)
+				.boxed(),
 			);
 		},
 		ToPool::StartWork { worker, pvf, artifact_path } => {
@@ -229,7 +242,6 @@ fn handle_to_pool(
 							worker,
 							idle,
 							pvf,
-							cache_path.to_owned(),
 							artifact_path,
 							preparation_timer,
 						)
@@ -258,13 +270,23 @@ fn handle_to_pool(
 
 async fn spawn_worker_task(
 	program_path: PathBuf,
+	cache_path: PathBuf,
 	spawn_timeout: Duration,
 	node_version: Option<String>,
+	security_status: SecurityStatus,
 ) -> PoolEvent {
 	use futures_timer::Delay;
 
 	loop {
-		match worker_intf::spawn(&program_path, spawn_timeout, node_version.as_deref()).await {
+		match worker_intf::spawn(
+			&program_path,
+			&cache_path,
+			spawn_timeout,
+			node_version.as_deref(),
+			security_status.clone(),
+		)
+		.await
+		{
 			Ok((idle, handle)) => break PoolEvent::Spawn(idle, handle),
 			Err(err) => {
 				gum::warn!(target: LOG_TARGET, "failed to spawn a prepare worker: {:?}", err);
@@ -281,11 +303,10 @@ async fn start_work_task<Timer>(
 	worker: Worker,
 	idle: IdleWorker,
 	pvf: PvfPrepData,
-	cache_path: PathBuf,
 	artifact_path: PathBuf,
 	_preparation_timer: Option<Timer>,
 ) -> PoolEvent {
-	let outcome = worker_intf::start_work(&metrics, idle, pvf, &cache_path, artifact_path).await;
+	let outcome = worker_intf::start_work(&metrics, idle, pvf, artifact_path).await;
 	PoolEvent::StartWork(worker, outcome)
 }
 
@@ -322,14 +343,29 @@ fn handle_mux(
 				),
 				// Return `Concluded`, but do not kill the worker since the error was on the host
 				// side.
-				Outcome::RenameTmpFileErr { worker: idle, result: _, err } =>
+				Outcome::RenameTmpFileErr { worker: idle, result: _, err, src, dest } =>
 					handle_concluded_no_rip(
 						from_pool,
 						spawned,
 						worker,
 						idle,
-						Err(PrepareError::RenameTmpFileErr(err)),
+						Err(PrepareError::RenameTmpFileErr { err, src, dest }),
 					),
+				// Could not clear worker cache. Kill the worker so other jobs can't see the data.
+				Outcome::ClearWorkerDir { err } => {
+					if attempt_retire(metrics, spawned, worker) {
+						reply(
+							from_pool,
+							FromPool::Concluded {
+								worker,
+								rip: true,
+								result: Err(PrepareError::ClearWorkerDir(err)),
+							},
+						)?;
+					}
+
+					Ok(())
+				},
 				Outcome::Unreachable => {
 					if attempt_retire(metrics, spawned, worker) {
 						reply(from_pool, FromPool::Rip(worker))?;
@@ -434,6 +470,7 @@ pub fn start(
 	cache_path: PathBuf,
 	spawn_timeout: Duration,
 	node_version: Option<String>,
+	security_status: SecurityStatus,
 ) -> (mpsc::Sender<ToPool>, mpsc::UnboundedReceiver<FromPool>, impl Future<Output = ()>) {
 	let (to_pool_tx, to_pool_rx) = mpsc::channel(10);
 	let (from_pool_tx, from_pool_rx) = mpsc::unbounded();
@@ -444,6 +481,7 @@ pub fn start(
 		cache_path,
 		spawn_timeout,
 		node_version,
+		security_status,
 		to_pool: to_pool_rx,
 		from_pool: from_pool_tx,
 		spawned: HopSlotMap::with_capacity_and_key(20),
diff --git a/polkadot/node/core/pvf/src/prepare/worker_intf.rs b/polkadot/node/core/pvf/src/prepare/worker_intf.rs
index 5280ab6b42a235b441fe9d9e25bc415b46ecfa2f..b66c3604434363cdffefaaddf9091397c25b49a0 100644
--- a/polkadot/node/core/pvf/src/prepare/worker_intf.rs
+++ b/polkadot/node/core/pvf/src/prepare/worker_intf.rs
@@ -19,17 +19,17 @@
 use crate::{
 	metrics::Metrics,
 	worker_intf::{
-		path_to_bytes, spawn_with_program_path, tmpfile_in, IdleWorker, SpawnErr, WorkerHandle,
-		JOB_TIMEOUT_WALL_CLOCK_FACTOR,
+		clear_worker_dir_path, framed_recv, framed_send, spawn_with_program_path, IdleWorker,
+		SpawnErr, WorkerDir, WorkerHandle, JOB_TIMEOUT_WALL_CLOCK_FACTOR,
 	},
 	LOG_TARGET,
 };
 use parity_scale_codec::{Decode, Encode};
 use polkadot_node_core_pvf_common::{
 	error::{PrepareError, PrepareResult},
-	framed_recv, framed_send,
 	prepare::PrepareStats,
 	pvf::PvfPrepData,
+	worker_dir, SecurityStatus,
 };
 
 use sp_core::hexdisplay::HexDisplay;
@@ -41,19 +41,33 @@ use tokio::{io, net::UnixStream};
 
 /// Spawns a new worker with the given program path that acts as the worker and the spawn timeout.
 ///
-/// The program should be able to handle `<program-path> prepare-worker <socket-path>` invocation.
+/// Sends a handshake message to the worker as soon as it is spawned.
 pub async fn spawn(
 	program_path: &Path,
+	cache_path: &Path,
 	spawn_timeout: Duration,
 	node_version: Option<&str>,
+	security_status: SecurityStatus,
 ) -> Result<(IdleWorker, WorkerHandle), SpawnErr> {
 	let mut extra_args = vec!["prepare-worker"];
 	if let Some(node_version) = node_version {
 		extra_args.extend_from_slice(&["--node-impl-version", node_version]);
 	}
-	spawn_with_program_path("prepare", program_path, &extra_args, spawn_timeout).await
+
+	spawn_with_program_path(
+		"prepare",
+		program_path,
+		cache_path,
+		&extra_args,
+		spawn_timeout,
+		security_status,
+	)
+	.await
 }
 
+/// Outcome of PVF preparation.
+///
+/// If the idle worker token is not returned, it means the worker must be terminated.
 pub enum Outcome {
 	/// The worker has finished the work assigned to it.
 	Concluded { worker: IdleWorker, result: PrepareResult },
@@ -62,9 +76,19 @@ pub enum Outcome {
 	Unreachable,
 	/// The temporary file for the artifact could not be created at the given cache path.
 	CreateTmpFileErr { worker: IdleWorker, err: String },
-	/// The response from the worker is received, but the file cannot be renamed (moved) to the
+	/// The response from the worker is received, but the tmp file cannot be renamed (moved) to the
 	/// final destination location.
-	RenameTmpFileErr { worker: IdleWorker, result: PrepareResult, err: String },
+	RenameTmpFileErr {
+		worker: IdleWorker,
+		result: PrepareResult,
+		err: String,
+		// Unfortunately `PathBuf` doesn't implement `Encode`/`Decode`, so we do a fallible
+		// conversion to `Option<String>`.
+		src: Option<String>,
+		dest: Option<String>,
+	},
+	/// The worker cache could not be cleared for the given reason.
+	ClearWorkerDir { err: String },
 	/// The worker failed to finish the job until the given deadline.
 	///
 	/// The worker is no longer usable and should be killed.
@@ -84,83 +108,88 @@ pub async fn start_work(
 	metrics: &Metrics,
 	worker: IdleWorker,
 	pvf: PvfPrepData,
-	cache_path: &Path,
 	artifact_path: PathBuf,
 ) -> Outcome {
-	let IdleWorker { stream, pid } = worker;
+	let IdleWorker { stream, pid, worker_dir } = worker;
 
 	gum::debug!(
 		target: LOG_TARGET,
 		worker_pid = %pid,
+		?worker_dir,
 		"starting prepare for {}",
 		artifact_path.display(),
 	);
 
-	with_tmp_file(stream, pid, cache_path, |tmp_file, mut stream| async move {
-		let preparation_timeout = pvf.prep_timeout();
-		if let Err(err) = send_request(&mut stream, pvf, &tmp_file).await {
-			gum::warn!(
-				target: LOG_TARGET,
-				worker_pid = %pid,
-				"failed to send a prepare request: {:?}",
-				err,
-			);
-			return Outcome::Unreachable
-		}
-
-		// Wait for the result from the worker, keeping in mind that there may be a timeout, the
-		// worker may get killed, or something along these lines. In that case we should propagate
-		// the error to the pool.
-		//
-		// We use a generous timeout here. This is in addition to the one in the child process, in
-		// case the child stalls. We have a wall clock timeout here in the host, but a CPU timeout
-		// in the child. We want to use CPU time because it varies less than wall clock time under
-		// load, but the CPU resources of the child can only be measured from the parent after the
-		// child process terminates.
-		let timeout = preparation_timeout * JOB_TIMEOUT_WALL_CLOCK_FACTOR;
-		let result = tokio::time::timeout(timeout, recv_response(&mut stream, pid)).await;
-
-		match result {
-			// Received bytes from worker within the time limit.
-			Ok(Ok(prepare_result)) =>
-				handle_response(
-					metrics,
-					IdleWorker { stream, pid },
-					prepare_result,
-					pid,
-					tmp_file,
-					artifact_path,
-					preparation_timeout,
-				)
-				.await,
-			Ok(Err(err)) => {
-				// Communication error within the time limit.
+	with_worker_dir_setup(
+		worker_dir,
+		stream,
+		pid,
+		|tmp_artifact_file, mut stream, worker_dir| async move {
+			let preparation_timeout = pvf.prep_timeout();
+			if let Err(err) = send_request(&mut stream, pvf).await {
 				gum::warn!(
 					target: LOG_TARGET,
 					worker_pid = %pid,
-					"failed to recv a prepare response: {:?}",
+					"failed to send a prepare request: {:?}",
 					err,
 				);
-				Outcome::IoErr(err.to_string())
-			},
-			Err(_) => {
-				// Timed out here on the host.
-				gum::warn!(
-					target: LOG_TARGET,
-					worker_pid = %pid,
-					"did not recv a prepare response within the time limit",
-				);
-				Outcome::TimedOut
-			},
-		}
-	})
+				return Outcome::Unreachable
+			}
+
+			// Wait for the result from the worker, keeping in mind that there may be a timeout, the
+			// worker may get killed, or something along these lines. In that case we should
+			// propagate the error to the pool.
+			//
+			// We use a generous timeout here. This is in addition to the one in the child process,
+			// in case the child stalls. We have a wall clock timeout here in the host, but a CPU
+			// timeout in the child. We want to use CPU time because it varies less than wall clock
+			// time under load, but the CPU resources of the child can only be measured from the
+			// parent after the child process terminates.
+			let timeout = preparation_timeout * JOB_TIMEOUT_WALL_CLOCK_FACTOR;
+			let result = tokio::time::timeout(timeout, recv_response(&mut stream, pid)).await;
+
+			match result {
+				// Received bytes from worker within the time limit.
+				Ok(Ok(prepare_result)) =>
+					handle_response(
+						metrics,
+						IdleWorker { stream, pid, worker_dir },
+						prepare_result,
+						pid,
+						tmp_artifact_file,
+						artifact_path,
+						preparation_timeout,
+					)
+					.await,
+				Ok(Err(err)) => {
+					// Communication error within the time limit.
+					gum::warn!(
+						target: LOG_TARGET,
+						worker_pid = %pid,
+						"failed to recv a prepare response: {:?}",
+						err,
+					);
+					Outcome::IoErr(err.to_string())
+				},
+				Err(_) => {
+					// Timed out here on the host.
+					gum::warn!(
+						target: LOG_TARGET,
+						worker_pid = %pid,
+						"did not recv a prepare response within the time limit",
+					);
+					Outcome::TimedOut
+				},
+			}
+		},
+	)
 	.await
 }
 
 /// Handles the case where we successfully received response bytes on the host from the child.
 ///
-/// NOTE: Here we know the artifact exists, but is still located in a temporary file which will be
-/// cleared by `with_tmp_file`.
+/// Here we know the artifact exists, but is still located in a temporary file which will be cleared
+/// by [`with_worker_dir_setup`].
 async fn handle_response(
 	metrics: &Metrics,
 	worker: IdleWorker,
@@ -209,7 +238,13 @@ async fn handle_response(
 				artifact_path.display(),
 				err,
 			);
-			Outcome::RenameTmpFileErr { worker, result, err: format!("{:?}", err) }
+			Outcome::RenameTmpFileErr {
+				worker,
+				result,
+				err: format!("{:?}", err),
+				src: tmp_file.to_str().map(String::from),
+				dest: artifact_path.to_str().map(String::from),
+			}
 		},
 	};
 
@@ -220,61 +255,58 @@ async fn handle_response(
 	outcome
 }
 
-/// Create a temporary file for an artifact at the given cache path and execute the given
-/// future/closure passing the file path in.
+/// Create a temporary file for an artifact in the worker cache, execute the given future/closure
+/// passing the file path in, and clean up the worker cache.
 ///
-/// The function will try best effort to not leave behind the temporary file.
-async fn with_tmp_file<F, Fut>(stream: UnixStream, pid: u32, cache_path: &Path, f: F) -> Outcome
+/// Failure to clean up the worker cache results in an error - leaving any files here could be a
+/// security issue, and we should shut down the worker. This should be very rare.
+async fn with_worker_dir_setup<F, Fut>(
+	worker_dir: WorkerDir,
+	stream: UnixStream,
+	pid: u32,
+	f: F,
+) -> Outcome
 where
 	Fut: futures::Future<Output = Outcome>,
-	F: FnOnce(PathBuf, UnixStream) -> Fut,
+	F: FnOnce(PathBuf, UnixStream, WorkerDir) -> Fut,
 {
-	let tmp_file = match tmpfile_in("prepare-artifact-", cache_path).await {
-		Ok(f) => f,
-		Err(err) => {
-			gum::warn!(
-				target: LOG_TARGET,
-				worker_pid = %pid,
-				"failed to create a temp file for the artifact: {:?}",
-				err,
-			);
-			return Outcome::CreateTmpFileErr {
-				worker: IdleWorker { stream, pid },
-				err: format!("{:?}", err),
-			}
-		},
+	// Create the tmp file here so that the child doesn't need any file creation rights. This will
+	// be cleared at the end of this function.
+	let tmp_file = worker_dir::prepare_tmp_artifact(&worker_dir.path);
+	if let Err(err) = tokio::fs::File::create(&tmp_file).await {
+		gum::warn!(
+			target: LOG_TARGET,
+			worker_pid = %pid,
+			?worker_dir,
+			"failed to create a temp file for the artifact: {:?}",
+			err,
+		);
+		return Outcome::CreateTmpFileErr {
+			worker: IdleWorker { stream, pid, worker_dir },
+			err: format!("{:?}", err),
+		}
 	};
 
-	let outcome = f(tmp_file.clone(), stream).await;
+	let worker_dir_path = worker_dir.path.clone();
+	let outcome = f(tmp_file, stream, worker_dir).await;
 
-	// The function called above is expected to move `tmp_file` to a new location upon success.
-	// However, the function may as well fail and in that case we should remove the tmp file here.
-	//
-	// In any case, we try to remove the file here so that there are no leftovers. We only report
-	// errors that are different from the `NotFound`.
-	match tokio::fs::remove_file(tmp_file).await {
-		Ok(()) => (),
-		Err(err) if err.kind() == std::io::ErrorKind::NotFound => (),
-		Err(err) => {
-			gum::warn!(
-				target: LOG_TARGET,
-				worker_pid = %pid,
-				"failed to remove the tmp file: {:?}",
-				err,
-			);
-		},
+	// Try to clear the worker dir.
+	if let Err(err) = clear_worker_dir_path(&worker_dir_path) {
+		gum::warn!(
+			target: LOG_TARGET,
+			worker_pid = %pid,
+			?worker_dir_path,
+			"failed to clear worker cache after the job: {:?}",
+			err,
+		);
+		return Outcome::ClearWorkerDir { err: format!("{:?}", err) }
 	}
 
 	outcome
 }
 
-async fn send_request(
-	stream: &mut UnixStream,
-	pvf: PvfPrepData,
-	tmp_file: &Path,
-) -> io::Result<()> {
+async fn send_request(stream: &mut UnixStream, pvf: PvfPrepData) -> io::Result<()> {
 	framed_send(stream, &pvf.encode()).await?;
-	framed_send(stream, path_to_bytes(tmp_file)).await?;
 	Ok(())
 }
 
diff --git a/polkadot/node/core/pvf/src/testing.rs b/polkadot/node/core/pvf/src/testing.rs
index 980a28c01566ce7e5b79af5200989b399af654c3..ca69ef9e4d047d61590c3a0ff362ab43d8e4de6f 100644
--- a/polkadot/node/core/pvf/src/testing.rs
+++ b/polkadot/node/core/pvf/src/testing.rs
@@ -29,63 +29,21 @@ pub fn validate_candidate(
 	code: &[u8],
 	params: &[u8],
 ) -> Result<Vec<u8>, Box<dyn std::error::Error>> {
-	use polkadot_node_core_pvf_execute_worker::Executor;
+	use polkadot_node_core_pvf_execute_worker::execute_artifact;
 	use polkadot_node_core_pvf_prepare_worker::{prepare, prevalidate};
 
 	let code = sp_maybe_compressed_blob::decompress(code, 10 * 1024 * 1024)
 		.expect("Decompressing code failed");
 
 	let blob = prevalidate(&code)?;
-	let compiled_artifact_blob = prepare(blob, &ExecutorParams::default())?;
+	let executor_params = ExecutorParams::default();
+	let compiled_artifact_blob = prepare(blob, &executor_params)?;
 
-	let executor = Executor::new(ExecutorParams::default())?;
 	let result = unsafe {
 		// SAFETY: This is trivially safe since the artifact is obtained by calling `prepare`
 		//         and is written into a temporary directory in an unmodified state.
-		executor.execute(&compiled_artifact_blob, params)?
+		execute_artifact(&compiled_artifact_blob, &executor_params, params)?
 	};
 
 	Ok(result)
 }
-
-/// Use this macro to declare a `fn main() {}` that will check the arguments and dispatch them to
-/// the appropriate worker, making the executable that can be used for spawning workers.
-#[macro_export]
-macro_rules! decl_puppet_worker_main {
-	() => {
-		fn main() {
-			$crate::sp_tracing::try_init_simple();
-
-			let args = std::env::args().collect::<Vec<_>>();
-			if args.len() == 1 {
-				panic!("wrong number of arguments");
-			}
-
-			let entrypoint = match args[1].as_ref() {
-				"exit" => {
-					std::process::exit(1);
-				},
-				"sleep" => {
-					std::thread::sleep(std::time::Duration::from_secs(5));
-					return
-				},
-				"prepare-worker" => $crate::prepare_worker_entrypoint,
-				"execute-worker" => $crate::execute_worker_entrypoint,
-				other => panic!("unknown subcommand: {}", other),
-			};
-
-			let mut node_version = None;
-			let mut socket_path: &str = "";
-
-			for i in (2..args.len()).step_by(2) {
-				match args[i].as_ref() {
-					"--socket-path" => socket_path = args[i + 1].as_str(),
-					"--node-impl-version" => node_version = Some(args[i + 1].as_str()),
-					arg => panic!("Unexpected argument found: {}", arg),
-				}
-			}
-
-			entrypoint(&socket_path, node_version, None);
-		}
-	};
-}
diff --git a/polkadot/node/core/pvf/src/worker_intf.rs b/polkadot/node/core/pvf/src/worker_intf.rs
index 795ad4524443bcf1032a40d5931520c110219055..bd85d84055ce5e6136a97fac329ee20a39744137 100644
--- a/polkadot/node/core/pvf/src/worker_intf.rs
+++ b/polkadot/node/core/pvf/src/worker_intf.rs
@@ -20,6 +20,7 @@ use crate::LOG_TARGET;
 use futures::FutureExt as _;
 use futures_timer::Delay;
 use pin_project::pin_project;
+use polkadot_node_core_pvf_common::SecurityStatus;
 use rand::Rng;
 use std::{
 	fmt, mem,
@@ -39,17 +40,37 @@ use tokio::{
 pub const JOB_TIMEOUT_WALL_CLOCK_FACTOR: u32 = 4;
 
 /// This is publicly exposed only for integration tests.
+///
+/// # Parameters
+///
+/// - `debug_id`: An identifier for the process (e.g. "execute" or "prepare").
+///
+/// - `program_path`: The path to the program.
+///
+/// - `cache_path`: The path to the artifact cache.
+///
+/// - `extra_args`: Optional extra CLI arguments to the program. NOTE: Should only contain data
+///   required before the handshake, like node/worker versions for the version check. Other data
+///   should go through the handshake.
+///
+/// - `spawn_timeout`: The amount of time to wait for the child process to spawn.
+///
+/// - `security_status`: contains the detected status of security features.
 #[doc(hidden)]
 pub async fn spawn_with_program_path(
 	debug_id: &'static str,
 	program_path: impl Into<PathBuf>,
+	cache_path: &Path,
 	extra_args: &[&str],
 	spawn_timeout: Duration,
+	security_status: SecurityStatus,
 ) -> Result<(IdleWorker, WorkerHandle), SpawnErr> {
 	let program_path = program_path.into();
+	let worker_dir = WorkerDir::new(debug_id, cache_path).await?;
+	let extra_args: Vec<String> = extra_args.iter().map(|arg| arg.to_string()).collect();
+
 	with_transient_socket_path(debug_id, |socket_path| {
 		let socket_path = socket_path.to_owned();
-		let extra_args: Vec<String> = extra_args.iter().map(|arg| arg.to_string()).collect();
 
 		async move {
 			let listener = UnixListener::bind(&socket_path).map_err(|err| {
@@ -58,25 +79,36 @@ pub async fn spawn_with_program_path(
 					%debug_id,
 					?program_path,
 					?extra_args,
+					?worker_dir,
+					?socket_path,
 					"cannot bind unix socket: {:?}",
 					err,
 				);
 				SpawnErr::Bind
 			})?;
 
-			let handle =
-				WorkerHandle::spawn(&program_path, &extra_args, socket_path).map_err(|err| {
-					gum::warn!(
-						target: LOG_TARGET,
-						%debug_id,
-						?program_path,
-						?extra_args,
-						"cannot spawn a worker: {:?}",
-						err,
-					);
-					SpawnErr::ProcessSpawn
-				})?;
+			let handle = WorkerHandle::spawn(
+				&program_path,
+				&extra_args,
+				&socket_path,
+				&worker_dir.path,
+				security_status,
+			)
+			.map_err(|err| {
+				gum::warn!(
+					target: LOG_TARGET,
+					%debug_id,
+					?program_path,
+					?extra_args,
+					?worker_dir.path,
+					?socket_path,
+					"cannot spawn a worker: {:?}",
+					err,
+				);
+				SpawnErr::ProcessSpawn
+			})?;
 
+			let worker_dir_path = worker_dir.path.clone();
 			futures::select! {
 				accept_result = listener.accept().fuse() => {
 					let (stream, _) = accept_result.map_err(|err| {
@@ -85,12 +117,14 @@ pub async fn spawn_with_program_path(
 							%debug_id,
 							?program_path,
 							?extra_args,
+							?worker_dir_path,
+							?socket_path,
 							"cannot accept a worker: {:?}",
 							err,
 						);
 						SpawnErr::Accept
 					})?;
-					Ok((IdleWorker { stream, pid: handle.id() }, handle))
+					Ok((IdleWorker { stream, pid: handle.id(), worker_dir }, handle))
 				}
 				_ = Delay::new(spawn_timeout).fuse() => {
 					gum::warn!(
@@ -98,6 +132,8 @@ pub async fn spawn_with_program_path(
 						%debug_id,
 						?program_path,
 						?extra_args,
+						?worker_dir_path,
+						?socket_path,
 						?spawn_timeout,
 						"spawning and connecting to socket timed out",
 					);
@@ -114,9 +150,9 @@ where
 	F: FnOnce(&Path) -> Fut,
 	Fut: futures::Future<Output = Result<T, SpawnErr>> + 'static,
 {
-	let socket_path = tmpfile(&format!("pvf-host-{}", debug_id))
+	let socket_path = tmppath(&format!("pvf-host-{}", debug_id))
 		.await
-		.map_err(|_| SpawnErr::TmpFile)?;
+		.map_err(|_| SpawnErr::TmpPath)?;
 	let result = f(&socket_path).await;
 
 	// Best effort to remove the socket file. Under normal circumstances the socket will be removed
@@ -126,12 +162,12 @@ where
 	result
 }
 
-/// Returns a path under the given `dir`. The file name will start with the given prefix.
+/// Returns a path under the given `dir`. The path name will start with the given prefix.
 ///
 /// There is only a certain number of retries. If exceeded this function will give up and return an
 /// error.
-pub async fn tmpfile_in(prefix: &str, dir: &Path) -> io::Result<PathBuf> {
-	fn tmppath(prefix: &str, dir: &Path) -> PathBuf {
+pub async fn tmppath_in(prefix: &str, dir: &Path) -> io::Result<PathBuf> {
+	fn make_tmppath(prefix: &str, dir: &Path) -> PathBuf {
 		use rand::distributions::Alphanumeric;
 
 		const DESCRIMINATOR_LEN: usize = 10;
@@ -143,27 +179,27 @@ pub async fn tmpfile_in(prefix: &str, dir: &Path) -> io::Result<PathBuf> {
 		let s = std::str::from_utf8(&buf)
 			.expect("the string is collected from a valid utf-8 sequence; qed");
 
-		let mut file = dir.to_owned();
-		file.push(s);
-		file
+		let mut path = dir.to_owned();
+		path.push(s);
+		path
 	}
 
 	const NUM_RETRIES: usize = 50;
 
 	for _ in 0..NUM_RETRIES {
-		let candidate_path = tmppath(prefix, dir);
-		if !candidate_path.exists() {
-			return Ok(candidate_path)
+		let tmp_path = make_tmppath(prefix, dir);
+		if !tmp_path.exists() {
+			return Ok(tmp_path)
 		}
 	}
 
-	Err(io::Error::new(io::ErrorKind::Other, "failed to create a temporary file"))
+	Err(io::Error::new(io::ErrorKind::Other, "failed to create a temporary path"))
 }
 
-/// The same as [`tmpfile_in`], but uses [`std::env::temp_dir`] as the directory.
-pub async fn tmpfile(prefix: &str) -> io::Result<PathBuf> {
+/// The same as [`tmppath_in`], but uses [`std::env::temp_dir`] as the directory.
+pub async fn tmppath(prefix: &str) -> io::Result<PathBuf> {
 	let temp_dir = PathBuf::from(std::env::temp_dir());
-	tmpfile_in(prefix, &temp_dir).await
+	tmppath_in(prefix, &temp_dir).await
 }
 
 /// A struct that represents an idle worker.
@@ -177,13 +213,19 @@ pub struct IdleWorker {
 
 	/// The identifier of this process. Used to reset the niceness.
 	pub pid: u32,
+
+	/// The temporary per-worker path. We clean up the worker dir between jobs and delete it when
+	/// the worker dies.
+	pub worker_dir: WorkerDir,
 }
 
 /// An error happened during spawning a worker process.
 #[derive(Clone, Debug)]
 pub enum SpawnErr {
-	/// Cannot obtain a temporary file location.
-	TmpFile,
+	/// Cannot obtain a temporary path location.
+	TmpPath,
+	/// An FS error occurred.
+	Fs(String),
 	/// Cannot bind the socket to the given path.
 	Bind,
 	/// An error happened during accepting a connection to the socket.
@@ -220,11 +262,34 @@ impl WorkerHandle {
 		program: impl AsRef<Path>,
 		extra_args: &[String],
 		socket_path: impl AsRef<Path>,
+		worker_dir_path: impl AsRef<Path>,
+		security_status: SecurityStatus,
 	) -> io::Result<Self> {
-		let mut child = process::Command::new(program.as_ref())
+		let security_args = {
+			let mut args = vec![];
+			if security_status.can_enable_landlock {
+				args.push("--can-enable-landlock".to_string());
+			}
+			if security_status.can_unshare_user_namespace_and_change_root {
+				args.push("--can-unshare-user-namespace-and-change-root".to_string());
+			}
+			args
+		};
+
+		// Clear all env vars from the spawned process.
+		let mut command = process::Command::new(program.as_ref());
+		command.env_clear();
+		// Add back any env vars we want to keep.
+		if let Ok(value) = std::env::var("RUST_LOG") {
+			command.env("RUST_LOG", value);
+		}
+		let mut child = command
 			.args(extra_args)
 			.arg("--socket-path")
 			.arg(socket_path.as_ref().as_os_str())
+			.arg("--worker-dir-path")
+			.arg(worker_dir_path.as_ref().as_os_str())
+			.args(&security_args)
 			.stdout(std::process::Stdio::piped())
 			.kill_on_drop(true)
 			.spawn()?;
@@ -306,16 +371,6 @@ impl fmt::Debug for WorkerHandle {
 	}
 }
 
-/// Convert the given path into a byte buffer.
-pub fn path_to_bytes(path: &Path) -> &[u8] {
-	// Ideally, we take the `OsStr` of the path, send that and reconstruct this on the other side.
-	// However, libstd doesn't provide us with such an option. There are crates out there that
-	// allow for extraction of a path, but TBH it doesn't seem to be a real issue.
-	//
-	// However, should be there reports we can incorporate such a crate here.
-	path.to_str().expect("non-UTF-8 path").as_bytes()
-}
-
 /// Write some data prefixed by its length into `w`.
 pub async fn framed_send(w: &mut (impl AsyncWrite + Unpin), buf: &[u8]) -> io::Result<()> {
 	let len_buf = buf.len().to_le_bytes();
@@ -333,3 +388,84 @@ pub async fn framed_recv(r: &mut (impl AsyncRead + Unpin)) -> io::Result<Vec<u8>
 	r.read_exact(&mut buf).await?;
 	Ok(buf)
 }
+
+/// A temporary worker dir that contains only files needed by the worker. The worker will change its
+/// root (the `/` directory) to this directory; it should have access to no other paths on its
+/// filesystem.
+///
+/// NOTE: This struct cleans up its associated directory when it is dropped. Therefore it should not
+/// implement `Clone`.
+///
+/// # File structure
+///
+/// The overall file structure for the PVF system is as follows. The `worker-dir-X`s are managed by
+/// this struct.
+///
+/// ```nocompile
+/// + /<cache_path>/
+///   - artifact-1
+///   - artifact-2
+///   - [...]
+///   - worker-dir-1/  (new `/` for worker-1)
+///     + socket                            (created by host)
+///     + tmp-artifact                      (created by host) (prepare-only)
+///     + artifact     (link -> artifact-1) (created by host) (execute-only)
+///   - worker-dir-2/  (new `/` for worker-2)
+///     + [...]
+/// ```
+#[derive(Debug)]
+pub struct WorkerDir {
+	pub path: PathBuf,
+}
+
+impl WorkerDir {
+	/// Creates a new, empty worker dir with a random name in the given cache dir.
+	pub async fn new(debug_id: &'static str, cache_dir: &Path) -> Result<Self, SpawnErr> {
+		let prefix = format!("worker-dir-{}-", debug_id);
+		let path = tmppath_in(&prefix, cache_dir).await.map_err(|_| SpawnErr::TmpPath)?;
+		tokio::fs::create_dir(&path)
+			.await
+			.map_err(|err| SpawnErr::Fs(err.to_string()))?;
+		Ok(Self { path })
+	}
+}
+
+// Try to clean up the temporary worker dir at the end of the worker's lifetime. It should be wiped
+// on startup, but we make a best effort not to leave it around.
+impl Drop for WorkerDir {
+	fn drop(&mut self) {
+		let _ = std::fs::remove_dir_all(&self.path);
+	}
+}
+
+// Not async since Rust has trouble with async recursion. There should be few files here anyway.
+//
+// TODO: A lingering malicious job can still access future files in this dir. See
+// <https://github.com/paritytech/polkadot-sdk/issues/574> for how to fully secure this.
+/// Clear the temporary worker dir without deleting it. Not deleting is important because the worker
+/// has mounted its own separate filesystem here.
+///
+/// Should be called right after a job has finished. We don't want jobs to have access to
+/// artifacts from previous jobs.
+pub fn clear_worker_dir_path(worker_dir_path: &Path) -> io::Result<()> {
+	fn remove_dir_contents(path: &Path) -> io::Result<()> {
+		for entry in std::fs::read_dir(&path)? {
+			let entry = entry?;
+			let path = entry.path();
+
+			if entry.file_type()?.is_dir() {
+				remove_dir_contents(&path)?;
+				std::fs::remove_dir(path)?;
+			} else {
+				std::fs::remove_file(path)?;
+			}
+		}
+		Ok(())
+	}
+
+	// Note the worker dir may not exist anymore because of the worker dying and being cleaned up.
+	match remove_dir_contents(worker_dir_path) {
+		Err(err) if matches!(err.kind(), io::ErrorKind::NotFound) => Ok(()),
+		result => result,
+	}
+}
diff --git a/polkadot/node/core/pvf/tests/README.md b/polkadot/node/core/pvf/tests/README.md
new file mode 100644
index 0000000000000000000000000000000000000000..27385e190250df9baa0d14cea7afc9e00f973a98
--- /dev/null
+++ b/polkadot/node/core/pvf/tests/README.md
@@ -0,0 +1,9 @@
+# PVF host integration tests
+
+## Testing
+
+Before running these tests, make sure the worker binaries are built first. This can be done with:
+
+```sh
+cargo build --bin polkadot-execute-worker --bin polkadot-prepare-worker
+```
diff --git a/polkadot/node/core/pvf/tests/it/adder.rs b/polkadot/node/core/pvf/tests/it/adder.rs
index a4c2e21bdeaa7638dcdfa52ae00e128c789d654f..8bdd09db208a92f5510f0c60856bab6a1c3103e0 100644
--- a/polkadot/node/core/pvf/tests/it/adder.rs
+++ b/polkadot/node/core/pvf/tests/it/adder.rs
@@ -17,7 +17,7 @@
 use super::TestHost;
 use adder::{hash_state, BlockData, HeadData};
 use parity_scale_codec::{Decode, Encode};
-use polkadot_parachain::primitives::{
+use polkadot_parachain_primitives::primitives::{
 	BlockData as GenericBlockData, HeadData as GenericHeadData, RelayChainBlockNumber,
 	ValidationParams,
 };
@@ -100,7 +100,7 @@ async fn execute_bad_block_on_parent() {
 
 	let host = TestHost::new();
 
-	let _ret = host
+	let _err = host
 		.validate_candidate(
 			adder::wasm_binary_unwrap(),
 			ValidationParams {
@@ -145,3 +145,37 @@ async fn stress_spawn() {
 
 	futures::future::join_all((0..100).map(|_| execute(host.clone()))).await;
 }
+
+// With one worker, run multiple execution jobs serially. They should not conflict.
+#[tokio::test]
+async fn execute_can_run_serially() {
+	let host = std::sync::Arc::new(TestHost::new_with_config(|cfg| {
+		cfg.execute_workers_max_num = 1;
+	}));
+
+	async fn execute(host: std::sync::Arc<TestHost>) {
+		let parent_head = HeadData { number: 0, parent_hash: [0; 32], post_state: hash_state(0) };
+		let block_data = BlockData { state: 0, add: 512 };
+		let ret = host
+			.validate_candidate(
+				adder::wasm_binary_unwrap(),
+				ValidationParams {
+					parent_head: GenericHeadData(parent_head.encode()),
+					block_data: GenericBlockData(block_data.encode()),
+					relay_parent_number: 1,
+					relay_parent_storage_root: Default::default(),
+				},
+				Default::default(),
+			)
+			.await
+			.unwrap();
+
+		let new_head = HeadData::decode(&mut &ret.head_data.0[..]).unwrap();
+
+		assert_eq!(new_head.number, 1);
+		assert_eq!(new_head.parent_hash, parent_head.hash());
+		assert_eq!(new_head.post_state, hash_state(512));
+	}
+
+	futures::future::join_all((0..5).map(|_| execute(host.clone()))).await;
+}
diff --git a/polkadot/node/core/pvf/tests/it/main.rs b/polkadot/node/core/pvf/tests/it/main.rs
index 72c459c2f63214cd1ab5c9708fc9f87cb46dcc5b..f699b5840d8faa7e0a51e859b735caed02f3e621 100644
--- a/polkadot/node/core/pvf/tests/it/main.rs
+++ b/polkadot/node/core/pvf/tests/it/main.rs
@@ -18,10 +18,10 @@
 use assert_matches::assert_matches;
 use parity_scale_codec::Encode as _;
 use polkadot_node_core_pvf::{
-	start, Config, InvalidCandidate, Metrics, PrepareJobKind, PvfPrepData, ValidationError,
-	ValidationHost, JOB_TIMEOUT_WALL_CLOCK_FACTOR,
+	start, Config, InvalidCandidate, Metrics, PrepareError, PrepareJobKind, PrepareStats,
+	PvfPrepData, ValidationError, ValidationHost, JOB_TIMEOUT_WALL_CLOCK_FACTOR,
 };
-use polkadot_parachain::primitives::{BlockData, ValidationParams, ValidationResult};
+use polkadot_parachain_primitives::primitives::{BlockData, ValidationParams, ValidationResult};
 use polkadot_primitives::ExecutorParams;
 
 #[cfg(feature = "ci-only-tests")]
@@ -33,7 +33,6 @@ use tokio::sync::Mutex;
 mod adder;
 mod worker_common;
 
-const PUPPET_EXE: &str = env!("CARGO_BIN_EXE_puppet_worker");
 const TEST_EXECUTION_TIMEOUT: Duration = Duration::from_secs(3);
 const TEST_PREPARATION_TIMEOUT: Duration = Duration::from_secs(3);
 
@@ -51,16 +50,53 @@ impl TestHost {
 	where
 		F: FnOnce(&mut Config),
 	{
+		let mut workers_path = std::env::current_exe().unwrap();
+		workers_path.pop();
+		workers_path.pop();
+		let mut prepare_worker_path = workers_path.clone();
+		prepare_worker_path.push("polkadot-prepare-worker");
+		let mut execute_worker_path = workers_path.clone();
+		execute_worker_path.push("polkadot-execute-worker");
 		let cache_dir = tempfile::tempdir().unwrap();
-		let program_path = std::path::PathBuf::from(PUPPET_EXE);
-		let mut config =
-			Config::new(cache_dir.path().to_owned(), None, program_path.clone(), program_path);
+		let mut config = Config::new(
+			cache_dir.path().to_owned(),
+			None,
+			prepare_worker_path,
+			execute_worker_path,
+		);
 		f(&mut config);
 		let (host, task) = start(config, Metrics::default());
 		let _ = tokio::task::spawn(task);
 		Self { cache_dir, host: Mutex::new(host) }
 	}
 
+	async fn precheck_pvf(
+		&self,
+		code: &[u8],
+		executor_params: ExecutorParams,
+	) -> Result<PrepareStats, PrepareError> {
+		let (result_tx, result_rx) = futures::channel::oneshot::channel();
+
+		let code = sp_maybe_compressed_blob::decompress(code, 16 * 1024 * 1024)
+			.expect("Compression works");
+
+		self.host
+			.lock()
+			.await
+			.precheck_pvf(
+				PvfPrepData::from_code(
+					code.into(),
+					executor_params,
+					TEST_PREPARATION_TIMEOUT,
+					PrepareJobKind::Prechecking,
+				),
+				result_tx,
+			)
+			.await
+			.unwrap();
+		result_rx.await.unwrap()
+	}
+
 	async fn validate_candidate(
 		&self,
 		code: &[u8],
@@ -258,7 +294,7 @@ async fn execute_queue_doesnt_stall_with_varying_executor_params() {
 #[tokio::test]
 async fn deleting_prepared_artifact_does_not_dispute() {
 	let host = TestHost::new();
-	let cache_dir = host.cache_dir.path().clone();
+	let cache_dir = host.cache_dir.path();
 
 	let result = host
 		.validate_candidate(
@@ -282,8 +318,12 @@ async fn deleting_prepared_artifact_does_not_dispute() {
 	{
 		// Get the artifact path (asserting it exists).
 		let mut cache_dir: Vec<_> = std::fs::read_dir(cache_dir).unwrap().collect();
-		assert_eq!(cache_dir.len(), 1);
-		let artifact_path = cache_dir.pop().unwrap().unwrap();
+		// Should contain the artifact and the worker dir.
+		assert_eq!(cache_dir.len(), 2);
+		let mut artifact_path = cache_dir.pop().unwrap().unwrap();
+		if artifact_path.path().is_dir() {
+			artifact_path = cache_dir.pop().unwrap().unwrap();
+		}
 
 		// Delete the artifact.
 		std::fs::remove_file(artifact_path.path()).unwrap();
@@ -308,3 +348,19 @@ async fn deleting_prepared_artifact_does_not_dispute() {
 		r => panic!("{:?}", r),
 	}
 }
+
+// With one worker, run multiple preparation jobs serially. They should not conflict.
+#[tokio::test]
+async fn prepare_can_run_serially() {
+	let host = TestHost::new_with_config(|cfg| {
+		cfg.prepare_workers_hard_max_num = 1;
+	});
+
+	let _stats = host
+		.precheck_pvf(::adder::wasm_binary_unwrap(), Default::default())
+		.await
+		.unwrap();
+
+	// Prepare a different wasm blob to prevent skipping work.
+	let _stats = host.precheck_pvf(halt::wasm_binary_unwrap(), Default::default()).await.unwrap();
+}
diff --git a/polkadot/node/core/pvf/tests/it/worker_common.rs b/polkadot/node/core/pvf/tests/it/worker_common.rs
index a3bf552e894a5321b6755ccb3f70dc2385df5bf1..5379d29556c76aff3a489d7d0a967d4b6a503637 100644
--- a/polkadot/node/core/pvf/tests/it/worker_common.rs
+++ b/polkadot/node/core/pvf/tests/it/worker_common.rs
@@ -14,26 +14,48 @@
 // You should have received a copy of the GNU General Public License
 // along with Polkadot.  If not, see <http://www.gnu.org/licenses/>.
 
-use std::time::Duration;
+use polkadot_node_core_pvf::{
+	testing::{spawn_with_program_path, SpawnErr},
+	SecurityStatus,
+};
+use std::{env, time::Duration};
 
-use polkadot_node_core_pvf::testing::{spawn_with_program_path, SpawnErr};
-
-use crate::PUPPET_EXE;
+fn worker_path(name: &str) -> std::path::PathBuf {
+	let mut worker_path = std::env::current_exe().unwrap();
+	worker_path.pop();
+	worker_path.pop();
+	worker_path.push(name);
+	worker_path
+}
 
 // Test spawning a program that immediately exits with a failure code.
 #[tokio::test]
 async fn spawn_immediate_exit() {
-	let result =
-		spawn_with_program_path("integration-test", PUPPET_EXE, &["exit"], Duration::from_secs(2))
-			.await;
+	// There's no explicit `exit` subcommand in the worker; it will panic on an unknown
+	// subcommand anyway
+	let result = spawn_with_program_path(
+		"integration-test",
+		worker_path("polkadot-prepare-worker"),
+		&env::temp_dir(),
+		&["exit"],
+		Duration::from_secs(2),
+		SecurityStatus::default(),
+	)
+	.await;
 	assert!(matches!(result, Err(SpawnErr::AcceptTimeout)));
 }
 
 #[tokio::test]
 async fn spawn_timeout() {
-	let result =
-		spawn_with_program_path("integration-test", PUPPET_EXE, &["sleep"], Duration::from_secs(2))
-			.await;
+	let result = spawn_with_program_path(
+		"integration-test",
+		worker_path("polkadot-execute-worker"),
+		&env::temp_dir(),
+		&["test-sleep"],
+		Duration::from_secs(2),
+		SecurityStatus::default(),
+	)
+	.await;
 	assert!(matches!(result, Err(SpawnErr::AcceptTimeout)));
 }
 
@@ -41,9 +63,11 @@ async fn spawn_timeout() {
 async fn should_connect() {
 	let _ = spawn_with_program_path(
 		"integration-test",
-		PUPPET_EXE,
+		worker_path("polkadot-prepare-worker"),
+		&env::temp_dir(),
 		&["prepare-worker"],
 		Duration::from_secs(2),
+		SecurityStatus::default(),
 	)
 	.await
 	.unwrap();
diff --git a/polkadot/node/core/runtime-api/Cargo.toml b/polkadot/node/core/runtime-api/Cargo.toml
index 1a74ccdf73dfd5d5b70fc629021828f34584d5b5..b16a501686d3503ae476e807d859f58bdf88fbb5 100644
--- a/polkadot/node/core/runtime-api/Cargo.toml
+++ b/polkadot/node/core/runtime-api/Cargo.toml
@@ -1,6 +1,6 @@
 [package]
 name = "polkadot-node-core-runtime-api"
-version.workspace = true
+version = "1.0.0"
 authors.workspace = true
 edition.workspace = true
 license.workspace = true
@@ -8,7 +8,7 @@ license.workspace = true
 [dependencies]
 futures = "0.3.21"
 gum = { package = "tracing-gum", path = "../../gum" }
-lru = "0.11.0"
+schnellru = "0.2.1"
 
 sp-consensus-babe = { path = "../../../../substrate/primitives/consensus/babe" }
 
diff --git a/polkadot/node/core/runtime-api/src/cache.rs b/polkadot/node/core/runtime-api/src/cache.rs
index 26aaf3fb6ec891b77b6d714dbf5c680a9c33b7a1..69eea22b23bda4d8c67543c535c5f80afd81703d 100644
--- a/polkadot/node/core/runtime-api/src/cache.rs
+++ b/polkadot/node/core/runtime-api/src/cache.rs
@@ -14,95 +14,92 @@
 // You should have received a copy of the GNU General Public License
 // along with Polkadot.  If not, see <http://www.gnu.org/licenses/>.
 
-use std::{collections::btree_map::BTreeMap, num::NonZeroUsize};
+use std::collections::btree_map::BTreeMap;
 
-use lru::LruCache;
+use schnellru::{ByLength, LruMap};
 use sp_consensus_babe::Epoch;
 
 use polkadot_primitives::{
-	vstaging, AuthorityDiscoveryId, BlockNumber, CandidateCommitments, CandidateEvent,
-	CandidateHash, CommittedCandidateReceipt, CoreState, DisputeState, ExecutorParams,
-	GroupRotationInfo, Hash, Id as ParaId, InboundDownwardMessage, InboundHrmpMessage,
-	OccupiedCoreAssumption, PersistedValidationData, PvfCheckStatement, ScrapedOnChainVotes,
-	SessionIndex, SessionInfo, ValidationCode, ValidationCodeHash, ValidatorId, ValidatorIndex,
-	ValidatorSignature,
+	async_backing, slashing, AuthorityDiscoveryId, BlockNumber, CandidateCommitments,
+	CandidateEvent, CandidateHash, CommittedCandidateReceipt, CoreState, DisputeState,
+	ExecutorParams, GroupRotationInfo, Hash, Id as ParaId, InboundDownwardMessage,
+	InboundHrmpMessage, OccupiedCoreAssumption, PersistedValidationData, PvfCheckStatement,
+	ScrapedOnChainVotes, SessionIndex, SessionInfo, ValidationCode, ValidationCodeHash,
+	ValidatorId, ValidatorIndex, ValidatorSignature,
 };
 
 /// For consistency we have the same capacity for all caches. We use 128 as we'll only need that
 /// much if finality stalls (we only query state for unfinalized blocks + maybe latest finalized).
 /// In any case, a cache is an optimization. We should avoid a situation where having a large cache
 /// leads to OOM or puts pressure on other important stuff like PVF execution/preparation.
-const DEFAULT_CACHE_CAP: NonZeroUsize = match NonZeroUsize::new(128) {
-	Some(cap) => cap,
-	None => panic!("lru capacity must be non-zero"),
-};
+const DEFAULT_CACHE_CAP: u32 = 128;
 
 pub(crate) struct RequestResultCache {
-	authorities: LruCache<Hash, Vec<AuthorityDiscoveryId>>,
-	validators: LruCache<Hash, Vec<ValidatorId>>,
-	validator_groups: LruCache<Hash, (Vec<Vec<ValidatorIndex>>, GroupRotationInfo)>,
-	availability_cores: LruCache<Hash, Vec<CoreState>>,
+	authorities: LruMap<Hash, Vec<AuthorityDiscoveryId>>,
+	validators: LruMap<Hash, Vec<ValidatorId>>,
+	validator_groups: LruMap<Hash, (Vec<Vec<ValidatorIndex>>, GroupRotationInfo)>,
+	availability_cores: LruMap<Hash, Vec<CoreState>>,
 	persisted_validation_data:
-		LruCache<(Hash, ParaId, OccupiedCoreAssumption), Option<PersistedValidationData>>,
+		LruMap<(Hash, ParaId, OccupiedCoreAssumption), Option<PersistedValidationData>>,
 	assumed_validation_data:
-		LruCache<(ParaId, Hash), Option<(PersistedValidationData, ValidationCodeHash)>>,
-	check_validation_outputs: LruCache<(Hash, ParaId, CandidateCommitments), bool>,
-	session_index_for_child: LruCache<Hash, SessionIndex>,
-	validation_code: LruCache<(Hash, ParaId, OccupiedCoreAssumption), Option<ValidationCode>>,
-	validation_code_by_hash: LruCache<ValidationCodeHash, Option<ValidationCode>>,
-	candidate_pending_availability: LruCache<(Hash, ParaId), Option<CommittedCandidateReceipt>>,
-	candidate_events: LruCache<Hash, Vec<CandidateEvent>>,
-	session_executor_params: LruCache<SessionIndex, Option<ExecutorParams>>,
-	session_info: LruCache<SessionIndex, SessionInfo>,
-	dmq_contents: LruCache<(Hash, ParaId), Vec<InboundDownwardMessage<BlockNumber>>>,
+		LruMap<(ParaId, Hash), Option<(PersistedValidationData, ValidationCodeHash)>>,
+	check_validation_outputs: LruMap<(Hash, ParaId, CandidateCommitments), bool>,
+	session_index_for_child: LruMap<Hash, SessionIndex>,
+	validation_code: LruMap<(Hash, ParaId, OccupiedCoreAssumption), Option<ValidationCode>>,
+	validation_code_by_hash: LruMap<ValidationCodeHash, Option<ValidationCode>>,
+	candidate_pending_availability: LruMap<(Hash, ParaId), Option<CommittedCandidateReceipt>>,
+	candidate_events: LruMap<Hash, Vec<CandidateEvent>>,
+	session_executor_params: LruMap<SessionIndex, Option<ExecutorParams>>,
+	session_info: LruMap<SessionIndex, SessionInfo>,
+	dmq_contents: LruMap<(Hash, ParaId), Vec<InboundDownwardMessage<BlockNumber>>>,
 	inbound_hrmp_channels_contents:
-		LruCache<(Hash, ParaId), BTreeMap<ParaId, Vec<InboundHrmpMessage<BlockNumber>>>>,
-	current_babe_epoch: LruCache<Hash, Epoch>,
-	on_chain_votes: LruCache<Hash, Option<ScrapedOnChainVotes>>,
-	pvfs_require_precheck: LruCache<Hash, Vec<ValidationCodeHash>>,
+		LruMap<(Hash, ParaId), BTreeMap<ParaId, Vec<InboundHrmpMessage<BlockNumber>>>>,
+	current_babe_epoch: LruMap<Hash, Epoch>,
+	on_chain_votes: LruMap<Hash, Option<ScrapedOnChainVotes>>,
+	pvfs_require_precheck: LruMap<Hash, Vec<ValidationCodeHash>>,
 	validation_code_hash:
-		LruCache<(Hash, ParaId, OccupiedCoreAssumption), Option<ValidationCodeHash>>,
-	version: LruCache<Hash, u32>,
-	disputes: LruCache<Hash, Vec<(SessionIndex, CandidateHash, DisputeState<BlockNumber>)>>,
-	unapplied_slashes:
-		LruCache<Hash, Vec<(SessionIndex, CandidateHash, vstaging::slashing::PendingSlashes)>>,
-	key_ownership_proof:
-		LruCache<(Hash, ValidatorId), Option<vstaging::slashing::OpaqueKeyOwnershipProof>>,
-
-	staging_para_backing_state: LruCache<(Hash, ParaId), Option<vstaging::BackingState>>,
-	staging_async_backing_params: LruCache<Hash, vstaging::AsyncBackingParams>,
+		LruMap<(Hash, ParaId, OccupiedCoreAssumption), Option<ValidationCodeHash>>,
+	version: LruMap<Hash, u32>,
+	disputes: LruMap<Hash, Vec<(SessionIndex, CandidateHash, DisputeState<BlockNumber>)>>,
+	unapplied_slashes: LruMap<Hash, Vec<(SessionIndex, CandidateHash, slashing::PendingSlashes)>>,
+	key_ownership_proof: LruMap<(Hash, ValidatorId), Option<slashing::OpaqueKeyOwnershipProof>>,
+	minimum_backing_votes: LruMap<SessionIndex, u32>,
+	disabled_validators: LruMap<Hash, Vec<ValidatorIndex>>,
+	para_backing_state: LruMap<(Hash, ParaId), Option<async_backing::BackingState>>,
+	async_backing_params: LruMap<Hash, async_backing::AsyncBackingParams>,
 }
 
 impl Default for RequestResultCache {
 	fn default() -> Self {
 		Self {
-			authorities: LruCache::new(DEFAULT_CACHE_CAP),
-			validators: LruCache::new(DEFAULT_CACHE_CAP),
-			validator_groups: LruCache::new(DEFAULT_CACHE_CAP),
-			availability_cores: LruCache::new(DEFAULT_CACHE_CAP),
-			persisted_validation_data: LruCache::new(DEFAULT_CACHE_CAP),
-			assumed_validation_data: LruCache::new(DEFAULT_CACHE_CAP),
-			check_validation_outputs: LruCache::new(DEFAULT_CACHE_CAP),
-			session_index_for_child: LruCache::new(DEFAULT_CACHE_CAP),
-			validation_code: LruCache::new(DEFAULT_CACHE_CAP),
-			validation_code_by_hash: LruCache::new(DEFAULT_CACHE_CAP),
-			candidate_pending_availability: LruCache::new(DEFAULT_CACHE_CAP),
-			candidate_events: LruCache::new(DEFAULT_CACHE_CAP),
-			session_executor_params: LruCache::new(DEFAULT_CACHE_CAP),
-			session_info: LruCache::new(DEFAULT_CACHE_CAP),
-			dmq_contents: LruCache::new(DEFAULT_CACHE_CAP),
-			inbound_hrmp_channels_contents: LruCache::new(DEFAULT_CACHE_CAP),
-			current_babe_epoch: LruCache::new(DEFAULT_CACHE_CAP),
-			on_chain_votes: LruCache::new(DEFAULT_CACHE_CAP),
-			pvfs_require_precheck: LruCache::new(DEFAULT_CACHE_CAP),
-			validation_code_hash: LruCache::new(DEFAULT_CACHE_CAP),
-			version: LruCache::new(DEFAULT_CACHE_CAP),
-			disputes: LruCache::new(DEFAULT_CACHE_CAP),
-			unapplied_slashes: LruCache::new(DEFAULT_CACHE_CAP),
-			key_ownership_proof: LruCache::new(DEFAULT_CACHE_CAP),
-
-			staging_para_backing_state: LruCache::new(DEFAULT_CACHE_CAP),
-			staging_async_backing_params: LruCache::new(DEFAULT_CACHE_CAP),
+			authorities: LruMap::new(ByLength::new(DEFAULT_CACHE_CAP)),
+			validators: LruMap::new(ByLength::new(DEFAULT_CACHE_CAP)),
+			validator_groups: LruMap::new(ByLength::new(DEFAULT_CACHE_CAP)),
+			availability_cores: LruMap::new(ByLength::new(DEFAULT_CACHE_CAP)),
+			persisted_validation_data: LruMap::new(ByLength::new(DEFAULT_CACHE_CAP)),
+			assumed_validation_data: LruMap::new(ByLength::new(DEFAULT_CACHE_CAP)),
+			check_validation_outputs: LruMap::new(ByLength::new(DEFAULT_CACHE_CAP)),
+			session_index_for_child: LruMap::new(ByLength::new(DEFAULT_CACHE_CAP)),
+			validation_code: LruMap::new(ByLength::new(DEFAULT_CACHE_CAP)),
+			validation_code_by_hash: LruMap::new(ByLength::new(DEFAULT_CACHE_CAP)),
+			candidate_pending_availability: LruMap::new(ByLength::new(DEFAULT_CACHE_CAP)),
+			candidate_events: LruMap::new(ByLength::new(DEFAULT_CACHE_CAP)),
+			session_executor_params: LruMap::new(ByLength::new(DEFAULT_CACHE_CAP)),
+			session_info: LruMap::new(ByLength::new(DEFAULT_CACHE_CAP)),
+			dmq_contents: LruMap::new(ByLength::new(DEFAULT_CACHE_CAP)),
+			inbound_hrmp_channels_contents: LruMap::new(ByLength::new(DEFAULT_CACHE_CAP)),
+			current_babe_epoch: LruMap::new(ByLength::new(DEFAULT_CACHE_CAP)),
+			on_chain_votes: LruMap::new(ByLength::new(DEFAULT_CACHE_CAP)),
+			pvfs_require_precheck: LruMap::new(ByLength::new(DEFAULT_CACHE_CAP)),
+			validation_code_hash: LruMap::new(ByLength::new(DEFAULT_CACHE_CAP)),
+			version: LruMap::new(ByLength::new(DEFAULT_CACHE_CAP)),
+			disputes: LruMap::new(ByLength::new(DEFAULT_CACHE_CAP)),
+			unapplied_slashes: LruMap::new(ByLength::new(DEFAULT_CACHE_CAP)),
+			key_ownership_proof: LruMap::new(ByLength::new(DEFAULT_CACHE_CAP)),
+			minimum_backing_votes: LruMap::new(ByLength::new(DEFAULT_CACHE_CAP)),
+			disabled_validators: LruMap::new(ByLength::new(DEFAULT_CACHE_CAP)),
+			para_backing_state: LruMap::new(ByLength::new(DEFAULT_CACHE_CAP)),
+			async_backing_params: LruMap::new(ByLength::new(DEFAULT_CACHE_CAP)),
 		}
 	}
 }
@@ -112,7 +109,7 @@ impl RequestResultCache {
 		&mut self,
 		relay_parent: &Hash,
 	) -> Option<&Vec<AuthorityDiscoveryId>> {
-		self.authorities.get(relay_parent)
+		self.authorities.get(relay_parent).map(|v| &*v)
 	}
 
 	pub(crate) fn cache_authorities(
@@ -120,22 +117,22 @@ impl RequestResultCache {
 		relay_parent: Hash,
 		authorities: Vec<AuthorityDiscoveryId>,
 	) {
-		self.authorities.put(relay_parent, authorities);
+		self.authorities.insert(relay_parent, authorities);
 	}
 
 	pub(crate) fn validators(&mut self, relay_parent: &Hash) -> Option<&Vec<ValidatorId>> {
-		self.validators.get(relay_parent)
+		self.validators.get(relay_parent).map(|v| &*v)
 	}
 
 	pub(crate) fn cache_validators(&mut self, relay_parent: Hash, validators: Vec<ValidatorId>) {
-		self.validators.put(relay_parent, validators);
+		self.validators.insert(relay_parent, validators);
 	}
 
 	pub(crate) fn validator_groups(
 		&mut self,
 		relay_parent: &Hash,
 	) -> Option<&(Vec<Vec<ValidatorIndex>>, GroupRotationInfo)> {
-		self.validator_groups.get(relay_parent)
+		self.validator_groups.get(relay_parent).map(|v| &*v)
 	}
 
 	pub(crate) fn cache_validator_groups(
@@ -143,22 +140,22 @@ impl RequestResultCache {
 		relay_parent: Hash,
 		groups: (Vec<Vec<ValidatorIndex>>, GroupRotationInfo),
 	) {
-		self.validator_groups.put(relay_parent, groups);
+		self.validator_groups.insert(relay_parent, groups);
 	}
 
 	pub(crate) fn availability_cores(&mut self, relay_parent: &Hash) -> Option<&Vec<CoreState>> {
-		self.availability_cores.get(relay_parent)
+		self.availability_cores.get(relay_parent).map(|v| &*v)
 	}
 
 	pub(crate) fn cache_availability_cores(&mut self, relay_parent: Hash, cores: Vec<CoreState>) {
-		self.availability_cores.put(relay_parent, cores);
+		self.availability_cores.insert(relay_parent, cores);
 	}
 
 	pub(crate) fn persisted_validation_data(
 		&mut self,
 		key: (Hash, ParaId, OccupiedCoreAssumption),
 	) -> Option<&Option<PersistedValidationData>> {
-		self.persisted_validation_data.get(&key)
+		self.persisted_validation_data.get(&key).map(|v| &*v)
 	}
 
 	pub(crate) fn cache_persisted_validation_data(
@@ -166,14 +163,14 @@ impl RequestResultCache {
 		key: (Hash, ParaId, OccupiedCoreAssumption),
 		data: Option<PersistedValidationData>,
 	) {
-		self.persisted_validation_data.put(key, data);
+		self.persisted_validation_data.insert(key, data);
 	}
 
 	pub(crate) fn assumed_validation_data(
 		&mut self,
 		key: (Hash, ParaId, Hash),
 	) -> Option<&Option<(PersistedValidationData, ValidationCodeHash)>> {
-		self.assumed_validation_data.get(&(key.1, key.2))
+		self.assumed_validation_data.get(&(key.1, key.2)).map(|v| &*v)
 	}
 
 	pub(crate) fn cache_assumed_validation_data(
@@ -181,14 +178,14 @@ impl RequestResultCache {
 		key: (ParaId, Hash),
 		data: Option<(PersistedValidationData, ValidationCodeHash)>,
 	) {
-		self.assumed_validation_data.put(key, data);
+		self.assumed_validation_data.insert(key, data);
 	}
 
 	pub(crate) fn check_validation_outputs(
 		&mut self,
 		key: (Hash, ParaId, CandidateCommitments),
 	) -> Option<&bool> {
-		self.check_validation_outputs.get(&key)
+		self.check_validation_outputs.get(&key).map(|v| &*v)
 	}
 
 	pub(crate) fn cache_check_validation_outputs(
@@ -196,11 +193,11 @@ impl RequestResultCache {
 		key: (Hash, ParaId, CandidateCommitments),
 		value: bool,
 	) {
-		self.check_validation_outputs.put(key, value);
+		self.check_validation_outputs.insert(key, value);
 	}
 
 	pub(crate) fn session_index_for_child(&mut self, relay_parent: &Hash) -> Option<&SessionIndex> {
-		self.session_index_for_child.get(relay_parent)
+		self.session_index_for_child.get(relay_parent).map(|v| &*v)
 	}
 
 	pub(crate) fn cache_session_index_for_child(
@@ -208,14 +205,14 @@ impl RequestResultCache {
 		relay_parent: Hash,
 		index: SessionIndex,
 	) {
-		self.session_index_for_child.put(relay_parent, index);
+		self.session_index_for_child.insert(relay_parent, index);
 	}
 
 	pub(crate) fn validation_code(
 		&mut self,
 		key: (Hash, ParaId, OccupiedCoreAssumption),
 	) -> Option<&Option<ValidationCode>> {
-		self.validation_code.get(&key)
+		self.validation_code.get(&key).map(|v| &*v)
 	}
 
 	pub(crate) fn cache_validation_code(
@@ -223,7 +220,7 @@ impl RequestResultCache {
 		key: (Hash, ParaId, OccupiedCoreAssumption),
 		value: Option<ValidationCode>,
 	) {
-		self.validation_code.put(key, value);
+		self.validation_code.insert(key, value);
 	}
 
 	// the actual key is `ValidationCodeHash` (`Hash` is ignored),
@@ -232,7 +229,7 @@ impl RequestResultCache {
 		&mut self,
 		key: (Hash, ValidationCodeHash),
 	) -> Option<&Option<ValidationCode>> {
-		self.validation_code_by_hash.get(&key.1)
+		self.validation_code_by_hash.get(&key.1).map(|v| &*v)
 	}
 
 	pub(crate) fn cache_validation_code_by_hash(
@@ -240,14 +237,14 @@ impl RequestResultCache {
 		key: ValidationCodeHash,
 		value: Option<ValidationCode>,
 	) {
-		self.validation_code_by_hash.put(key, value);
+		self.validation_code_by_hash.insert(key, value);
 	}
 
 	pub(crate) fn candidate_pending_availability(
 		&mut self,
 		key: (Hash, ParaId),
 	) -> Option<&Option<CommittedCandidateReceipt>> {
-		self.candidate_pending_availability.get(&key)
+		self.candidate_pending_availability.get(&key).map(|v| &*v)
 	}
 
 	pub(crate) fn cache_candidate_pending_availability(
@@ -255,11 +252,11 @@ impl RequestResultCache {
 		key: (Hash, ParaId),
 		value: Option<CommittedCandidateReceipt>,
 	) {
-		self.candidate_pending_availability.put(key, value);
+		self.candidate_pending_availability.insert(key, value);
 	}
 
 	pub(crate) fn candidate_events(&mut self, relay_parent: &Hash) -> Option<&Vec<CandidateEvent>> {
-		self.candidate_events.get(relay_parent)
+		self.candidate_events.get(relay_parent).map(|v| &*v)
 	}
 
 	pub(crate) fn cache_candidate_events(
@@ -267,22 +264,22 @@ impl RequestResultCache {
 		relay_parent: Hash,
 		events: Vec<CandidateEvent>,
 	) {
-		self.candidate_events.put(relay_parent, events);
+		self.candidate_events.insert(relay_parent, events);
 	}
 
 	pub(crate) fn session_info(&mut self, key: SessionIndex) -> Option<&SessionInfo> {
-		self.session_info.get(&key)
+		self.session_info.get(&key).map(|v| &*v)
 	}
 
 	pub(crate) fn cache_session_info(&mut self, key: SessionIndex, value: SessionInfo) {
-		self.session_info.put(key, value);
+		self.session_info.insert(key, value);
 	}
 
 	pub(crate) fn session_executor_params(
 		&mut self,
 		session_index: SessionIndex,
 	) -> Option<&Option<ExecutorParams>> {
-		self.session_executor_params.get(&session_index)
+		self.session_executor_params.get(&session_index).map(|v| &*v)
 	}
 
 	pub(crate) fn cache_session_executor_params(
@@ -290,14 +287,14 @@ impl RequestResultCache {
 		session_index: SessionIndex,
 		value: Option<ExecutorParams>,
 	) {
-		self.session_executor_params.put(session_index, value);
+		self.session_executor_params.insert(session_index, value);
 	}
 
 	pub(crate) fn dmq_contents(
 		&mut self,
 		key: (Hash, ParaId),
 	) -> Option<&Vec<InboundDownwardMessage<BlockNumber>>> {
-		self.dmq_contents.get(&key)
+		self.dmq_contents.get(&key).map(|v| &*v)
 	}
 
 	pub(crate) fn cache_dmq_contents(
@@ -305,14 +302,14 @@ impl RequestResultCache {
 		key: (Hash, ParaId),
 		value: Vec<InboundDownwardMessage<BlockNumber>>,
 	) {
-		self.dmq_contents.put(key, value);
+		self.dmq_contents.insert(key, value);
 	}
 
 	pub(crate) fn inbound_hrmp_channels_contents(
 		&mut self,
 		key: (Hash, ParaId),
 	) -> Option<&BTreeMap<ParaId, Vec<InboundHrmpMessage<BlockNumber>>>> {
-		self.inbound_hrmp_channels_contents.get(&key)
+		self.inbound_hrmp_channels_contents.get(&key).map(|v| &*v)
 	}
 
 	pub(crate) fn cache_inbound_hrmp_channel_contents(
@@ -320,22 +317,22 @@ impl RequestResultCache {
 		key: (Hash, ParaId),
 		value: BTreeMap<ParaId, Vec<InboundHrmpMessage<BlockNumber>>>,
 	) {
-		self.inbound_hrmp_channels_contents.put(key, value);
+		self.inbound_hrmp_channels_contents.insert(key, value);
 	}
 
 	pub(crate) fn current_babe_epoch(&mut self, relay_parent: &Hash) -> Option<&Epoch> {
-		self.current_babe_epoch.get(relay_parent)
+		self.current_babe_epoch.get(relay_parent).map(|v| &*v)
 	}
 
 	pub(crate) fn cache_current_babe_epoch(&mut self, relay_parent: Hash, epoch: Epoch) {
-		self.current_babe_epoch.put(relay_parent, epoch);
+		self.current_babe_epoch.insert(relay_parent, epoch);
 	}
 
 	pub(crate) fn on_chain_votes(
 		&mut self,
 		relay_parent: &Hash,
 	) -> Option<&Option<ScrapedOnChainVotes>> {
-		self.on_chain_votes.get(relay_parent)
+		self.on_chain_votes.get(relay_parent).map(|v| &*v)
 	}
 
 	pub(crate) fn cache_on_chain_votes(
@@ -343,14 +340,14 @@ impl RequestResultCache {
 		relay_parent: Hash,
 		scraped: Option<ScrapedOnChainVotes>,
 	) {
-		self.on_chain_votes.put(relay_parent, scraped);
+		self.on_chain_votes.insert(relay_parent, scraped);
 	}
 
 	pub(crate) fn pvfs_require_precheck(
 		&mut self,
 		relay_parent: &Hash,
 	) -> Option<&Vec<ValidationCodeHash>> {
-		self.pvfs_require_precheck.get(relay_parent)
+		self.pvfs_require_precheck.get(relay_parent).map(|v| &*v)
 	}
 
 	pub(crate) fn cache_pvfs_require_precheck(
@@ -358,14 +355,14 @@ impl RequestResultCache {
 		relay_parent: Hash,
 		pvfs: Vec<ValidationCodeHash>,
 	) {
-		self.pvfs_require_precheck.put(relay_parent, pvfs);
+		self.pvfs_require_precheck.insert(relay_parent, pvfs);
 	}
 
 	pub(crate) fn validation_code_hash(
 		&mut self,
 		key: (Hash, ParaId, OccupiedCoreAssumption),
 	) -> Option<&Option<ValidationCodeHash>> {
-		self.validation_code_hash.get(&key)
+		self.validation_code_hash.get(&key).map(|v| &*v)
 	}
 
 	pub(crate) fn cache_validation_code_hash(
@@ -373,22 +370,22 @@ impl RequestResultCache {
 		key: (Hash, ParaId, OccupiedCoreAssumption),
 		value: Option<ValidationCodeHash>,
 	) {
-		self.validation_code_hash.put(key, value);
+		self.validation_code_hash.insert(key, value);
 	}
 
 	pub(crate) fn version(&mut self, relay_parent: &Hash) -> Option<&u32> {
-		self.version.get(relay_parent)
+		self.version.get(relay_parent).map(|v| &*v)
 	}
 
 	pub(crate) fn cache_version(&mut self, key: Hash, value: u32) {
-		self.version.put(key, value);
+		self.version.insert(key, value);
 	}
 
 	pub(crate) fn disputes(
 		&mut self,
 		relay_parent: &Hash,
 	) -> Option<&Vec<(SessionIndex, CandidateHash, DisputeState<BlockNumber>)>> {
-		self.disputes.get(relay_parent)
+		self.disputes.get(relay_parent).map(|v| &*v)
 	}
 
 	pub(crate) fn cache_disputes(
@@ -396,75 +393,102 @@ impl RequestResultCache {
 		relay_parent: Hash,
 		value: Vec<(SessionIndex, CandidateHash, DisputeState<BlockNumber>)>,
 	) {
-		self.disputes.put(relay_parent, value);
+		self.disputes.insert(relay_parent, value);
 	}
 
 	pub(crate) fn unapplied_slashes(
 		&mut self,
 		relay_parent: &Hash,
-	) -> Option<&Vec<(SessionIndex, CandidateHash, vstaging::slashing::PendingSlashes)>> {
-		self.unapplied_slashes.get(relay_parent)
+	) -> Option<&Vec<(SessionIndex, CandidateHash, slashing::PendingSlashes)>> {
+		self.unapplied_slashes.get(relay_parent).map(|v| &*v)
 	}
 
 	pub(crate) fn cache_unapplied_slashes(
 		&mut self,
 		relay_parent: Hash,
-		value: Vec<(SessionIndex, CandidateHash, vstaging::slashing::PendingSlashes)>,
+		value: Vec<(SessionIndex, CandidateHash, slashing::PendingSlashes)>,
 	) {
-		self.unapplied_slashes.put(relay_parent, value);
+		self.unapplied_slashes.insert(relay_parent, value);
 	}
 
 	pub(crate) fn key_ownership_proof(
 		&mut self,
 		key: (Hash, ValidatorId),
-	) -> Option<&Option<vstaging::slashing::OpaqueKeyOwnershipProof>> {
-		self.key_ownership_proof.get(&key)
+	) -> Option<&Option<slashing::OpaqueKeyOwnershipProof>> {
+		self.key_ownership_proof.get(&key).map(|v| &*v)
 	}
 
 	pub(crate) fn cache_key_ownership_proof(
 		&mut self,
 		key: (Hash, ValidatorId),
-		value: Option<vstaging::slashing::OpaqueKeyOwnershipProof>,
+		value: Option<slashing::OpaqueKeyOwnershipProof>,
 	) {
-		self.key_ownership_proof.put(key, value);
+		self.key_ownership_proof.insert(key, value);
 	}
 
 	// This request is never cached, hence always returns `None`.
 	pub(crate) fn submit_report_dispute_lost(
 		&mut self,
-		_key: (Hash, vstaging::slashing::DisputeProof, vstaging::slashing::OpaqueKeyOwnershipProof),
+		_key: (Hash, slashing::DisputeProof, slashing::OpaqueKeyOwnershipProof),
 	) -> Option<&Option<()>> {
 		None
 	}
 
-	pub(crate) fn staging_para_backing_state(
+	pub(crate) fn minimum_backing_votes(&mut self, session_index: SessionIndex) -> Option<u32> {
+		self.minimum_backing_votes.get(&session_index).copied()
+	}
+
+	pub(crate) fn cache_minimum_backing_votes(
+		&mut self,
+		session_index: SessionIndex,
+		minimum_backing_votes: u32,
+	) {
+		self.minimum_backing_votes.insert(session_index, minimum_backing_votes);
+	}
+
+	pub(crate) fn disabled_validators(
+		&mut self,
+		relay_parent: &Hash,
+	) -> Option<&Vec<ValidatorIndex>> {
+		self.disabled_validators.get(relay_parent).map(|v| &*v)
+	}
+
+	pub(crate) fn cache_disabled_validators(
+		&mut self,
+		relay_parent: Hash,
+		disabled_validators: Vec<ValidatorIndex>,
+	) {
+		self.disabled_validators.insert(relay_parent, disabled_validators);
+	}
+
+	pub(crate) fn para_backing_state(
 		&mut self,
 		key: (Hash, ParaId),
-	) -> Option<&Option<vstaging::BackingState>> {
-		self.staging_para_backing_state.get(&key)
+	) -> Option<&Option<async_backing::BackingState>> {
+		self.para_backing_state.get(&key).map(|v| &*v)
 	}
 
-	pub(crate) fn cache_staging_para_backing_state(
+	pub(crate) fn cache_para_backing_state(
 		&mut self,
 		key: (Hash, ParaId),
-		value: Option<vstaging::BackingState>,
+		value: Option<async_backing::BackingState>,
 	) {
-		self.staging_para_backing_state.put(key, value);
+		self.para_backing_state.insert(key, value);
 	}
 
-	pub(crate) fn staging_async_backing_params(
+	pub(crate) fn async_backing_params(
 		&mut self,
 		key: &Hash,
-	) -> Option<&vstaging::AsyncBackingParams> {
-		self.staging_async_backing_params.get(key)
+	) -> Option<&async_backing::AsyncBackingParams> {
+		self.async_backing_params.get(key).map(|v| &*v)
 	}
 
-	pub(crate) fn cache_staging_async_backing_params(
+	pub(crate) fn cache_async_backing_params(
 		&mut self,
 		key: Hash,
-		value: vstaging::AsyncBackingParams,
+		value: async_backing::AsyncBackingParams,
 	) {
-		self.staging_async_backing_params.put(key, value);
+		self.async_backing_params.insert(key, value);
 	}
 }
 
@@ -472,6 +496,7 @@ pub(crate) enum RequestResult {
 	// The structure of each variant is (relay_parent, [params,]*, result)
 	Authorities(Hash, Vec<AuthorityDiscoveryId>),
 	Validators(Hash, Vec<ValidatorId>),
+	MinimumBackingVotes(Hash, SessionIndex, u32),
 	ValidatorGroups(Hash, (Vec<Vec<ValidatorIndex>>, GroupRotationInfo)),
 	AvailabilityCores(Hash, Vec<CoreState>),
 	PersistedValidationData(Hash, ParaId, OccupiedCoreAssumption, Option<PersistedValidationData>),
@@ -503,16 +528,16 @@ pub(crate) enum RequestResult {
 	ValidationCodeHash(Hash, ParaId, OccupiedCoreAssumption, Option<ValidationCodeHash>),
 	Version(Hash, u32),
 	Disputes(Hash, Vec<(SessionIndex, CandidateHash, DisputeState<BlockNumber>)>),
-	UnappliedSlashes(Hash, Vec<(SessionIndex, CandidateHash, vstaging::slashing::PendingSlashes)>),
-	KeyOwnershipProof(Hash, ValidatorId, Option<vstaging::slashing::OpaqueKeyOwnershipProof>),
+	UnappliedSlashes(Hash, Vec<(SessionIndex, CandidateHash, slashing::PendingSlashes)>),
+	KeyOwnershipProof(Hash, ValidatorId, Option<slashing::OpaqueKeyOwnershipProof>),
 	// This is a request with side-effects.
 	SubmitReportDisputeLost(
 		Hash,
-		vstaging::slashing::DisputeProof,
-		vstaging::slashing::OpaqueKeyOwnershipProof,
+		slashing::DisputeProof,
+		slashing::OpaqueKeyOwnershipProof,
 		Option<()>,
 	),
-
-	StagingParaBackingState(Hash, ParaId, Option<vstaging::BackingState>),
-	StagingAsyncBackingParams(Hash, vstaging::AsyncBackingParams),
+	DisabledValidators(Hash, Vec<ValidatorIndex>),
+	ParaBackingState(Hash, ParaId, Option<async_backing::BackingState>),
+	AsyncBackingParams(Hash, async_backing::AsyncBackingParams),
 }
diff --git a/polkadot/node/core/runtime-api/src/lib.rs b/polkadot/node/core/runtime-api/src/lib.rs
index 78531d41272b58483661a5fd628d49347939aa43..bdcca08b10dda6fed122e482e5ac015beb2a29bb 100644
--- a/polkadot/node/core/runtime-api/src/lib.rs
+++ b/polkadot/node/core/runtime-api/src/lib.rs
@@ -101,6 +101,9 @@ where
 				self.requests_cache.cache_authorities(relay_parent, authorities),
 			Validators(relay_parent, validators) =>
 				self.requests_cache.cache_validators(relay_parent, validators),
+			MinimumBackingVotes(_, session_index, minimum_backing_votes) => self
+				.requests_cache
+				.cache_minimum_backing_votes(session_index, minimum_backing_votes),
 			ValidatorGroups(relay_parent, groups) =>
 				self.requests_cache.cache_validator_groups(relay_parent, groups),
 			AvailabilityCores(relay_parent, cores) =>
@@ -163,12 +166,13 @@ where
 				.requests_cache
 				.cache_key_ownership_proof((relay_parent, validator_id), key_ownership_proof),
 			SubmitReportDisputeLost(_, _, _, _) => {},
-
-			StagingParaBackingState(relay_parent, para_id, constraints) => self
+			DisabledValidators(relay_parent, disabled_validators) =>
+				self.requests_cache.cache_disabled_validators(relay_parent, disabled_validators),
+			ParaBackingState(relay_parent, para_id, constraints) => self
 				.requests_cache
-				.cache_staging_para_backing_state((relay_parent, para_id), constraints),
-			StagingAsyncBackingParams(relay_parent, params) =>
-				self.requests_cache.cache_staging_async_backing_params(relay_parent, params),
+				.cache_para_backing_state((relay_parent, para_id), constraints),
+			AsyncBackingParams(relay_parent, params) =>
+				self.requests_cache.cache_async_backing_params(relay_parent, params),
 		}
 	}
 
@@ -294,13 +298,21 @@ where
 						Request::SubmitReportDisputeLost(dispute_proof, key_ownership_proof, sender)
 					},
 				),
-
-			Request::StagingParaBackingState(para, sender) =>
-				query!(staging_para_backing_state(para), sender)
-					.map(|sender| Request::StagingParaBackingState(para, sender)),
-			Request::StagingAsyncBackingParams(sender) =>
-				query!(staging_async_backing_params(), sender)
-					.map(|sender| Request::StagingAsyncBackingParams(sender)),
+			Request::DisabledValidators(sender) => query!(disabled_validators(), sender)
+				.map(|sender| Request::DisabledValidators(sender)),
+			Request::ParaBackingState(para, sender) => query!(para_backing_state(para), sender)
+				.map(|sender| Request::ParaBackingState(para, sender)),
+			Request::AsyncBackingParams(sender) => query!(async_backing_params(), sender)
+				.map(|sender| Request::AsyncBackingParams(sender)),
+			Request::MinimumBackingVotes(index, sender) => {
+				if let Some(value) = self.requests_cache.minimum_backing_votes(index) {
+					self.metrics.on_cached_request();
+					let _ = sender.send(Ok(value));
+					None
+				} else {
+					Some(Request::MinimumBackingVotes(index, sender))
+				}
+			},
 		}
 	}
 
@@ -551,20 +563,31 @@ where
 			ver = Request::SUBMIT_REPORT_DISPUTE_LOST_RUNTIME_REQUIREMENT,
 			sender
 		),
-
-		Request::StagingParaBackingState(para, sender) => {
+		Request::MinimumBackingVotes(index, sender) => query!(
+			MinimumBackingVotes,
+			minimum_backing_votes(index),
+			ver = Request::MINIMUM_BACKING_VOTES_RUNTIME_REQUIREMENT,
+			sender
+		),
+		Request::DisabledValidators(sender) => query!(
+			DisabledValidators,
+			disabled_validators(),
+			ver = Request::DISABLED_VALIDATORS_RUNTIME_REQUIREMENT,
+			sender
+		),
+		Request::ParaBackingState(para, sender) => {
 			query!(
-				StagingParaBackingState,
-				staging_para_backing_state(para),
-				ver = Request::STAGING_BACKING_STATE,
+				ParaBackingState,
+				para_backing_state(para),
+				ver = Request::ASYNC_BACKING_STATE_RUNTIME_REQUIREMENT,
 				sender
 			)
 		},
-		Request::StagingAsyncBackingParams(sender) => {
+		Request::AsyncBackingParams(sender) => {
 			query!(
-				StagingAsyncBackingParams,
-				staging_async_backing_params(),
-				ver = Request::STAGING_BACKING_STATE,
+				AsyncBackingParams,
+				async_backing_params(),
+				ver = Request::ASYNC_BACKING_STATE_RUNTIME_REQUIREMENT,
 				sender
 			)
 		},
diff --git a/polkadot/node/core/runtime-api/src/tests.rs b/polkadot/node/core/runtime-api/src/tests.rs
index c3f8108312be13508fff8abcfe80d44ea17b8577..979b3587d2692149d0d5927e80fea79f2618b0a0 100644
--- a/polkadot/node/core/runtime-api/src/tests.rs
+++ b/polkadot/node/core/runtime-api/src/tests.rs
@@ -20,9 +20,9 @@ use polkadot_node_primitives::{BabeAllowedSlots, BabeEpoch, BabeEpochConfigurati
 use polkadot_node_subsystem::SpawnGlue;
 use polkadot_node_subsystem_test_helpers::make_subsystem_context;
 use polkadot_primitives::{
-	vstaging, AuthorityDiscoveryId, BlockNumber, CandidateCommitments, CandidateEvent,
-	CandidateHash, CommittedCandidateReceipt, CoreState, DisputeState, ExecutorParams,
-	GroupRotationInfo, Id as ParaId, InboundDownwardMessage, InboundHrmpMessage,
+	async_backing, slashing, AuthorityDiscoveryId, BlockNumber, CandidateCommitments,
+	CandidateEvent, CandidateHash, CommittedCandidateReceipt, CoreState, DisputeState,
+	ExecutorParams, GroupRotationInfo, Id as ParaId, InboundDownwardMessage, InboundHrmpMessage,
 	OccupiedCoreAssumption, PersistedValidationData, PvfCheckStatement, ScrapedOnChainVotes,
 	SessionIndex, SessionInfo, Slot, ValidationCode, ValidationCodeHash, ValidatorId,
 	ValidatorIndex, ValidatorSignature,
@@ -213,7 +213,7 @@ impl RuntimeApiSubsystemClient for MockSubsystemClient {
 	async fn unapplied_slashes(
 		&self,
 		_: Hash,
-	) -> Result<Vec<(SessionIndex, CandidateHash, vstaging::slashing::PendingSlashes)>, ApiError> {
+	) -> Result<Vec<(SessionIndex, CandidateHash, slashing::PendingSlashes)>, ApiError> {
 		todo!("Not required for tests")
 	}
 
@@ -221,15 +221,15 @@ impl RuntimeApiSubsystemClient for MockSubsystemClient {
 		&self,
 		_: Hash,
 		_: ValidatorId,
-	) -> Result<Option<vstaging::slashing::OpaqueKeyOwnershipProof>, ApiError> {
+	) -> Result<Option<slashing::OpaqueKeyOwnershipProof>, ApiError> {
 		todo!("Not required for tests")
 	}
 
 	async fn submit_report_dispute_lost(
 		&self,
 		_: Hash,
-		_: vstaging::slashing::DisputeProof,
-		_: vstaging::slashing::OpaqueKeyOwnershipProof,
+		_: slashing::DisputeProof,
+		_: slashing::OpaqueKeyOwnershipProof,
 	) -> Result<Option<()>, ApiError> {
 		todo!("Not required for tests")
 	}
@@ -250,18 +250,26 @@ impl RuntimeApiSubsystemClient for MockSubsystemClient {
 		Ok(self.authorities.clone())
 	}
 
-	async fn staging_async_backing_params(
+	async fn async_backing_params(
 		&self,
 		_: Hash,
-	) -> Result<vstaging::AsyncBackingParams, ApiError> {
+	) -> Result<async_backing::AsyncBackingParams, ApiError> {
 		todo!("Not required for tests")
 	}
 
-	async fn staging_para_backing_state(
+	async fn para_backing_state(
 		&self,
 		_: Hash,
 		_: ParaId,
-	) -> Result<Option<vstaging::BackingState>, ApiError> {
+	) -> Result<Option<async_backing::BackingState>, ApiError> {
+		todo!("Not required for tests")
+	}
+
+	async fn minimum_backing_votes(&self, _: Hash, _: SessionIndex) -> Result<u32, ApiError> {
+		todo!("Not required for tests")
+	}
+
+	async fn disabled_validators(&self, _: Hash) -> Result<Vec<ValidatorIndex>, ApiError> {
 		todo!("Not required for tests")
 	}
 }
diff --git a/polkadot/node/gum/Cargo.toml b/polkadot/node/gum/Cargo.toml
index 1bd0026b4f45e933b98e2ff6e2c8e913b13cef60..01ed34f7a7309e01dd7a836984ddc0871c2f894c 100644
--- a/polkadot/node/gum/Cargo.toml
+++ b/polkadot/node/gum/Cargo.toml
@@ -1,6 +1,6 @@
 [package]
 name = "tracing-gum"
-version.workspace = true
+version = "1.0.0"
 authors.workspace = true
 edition.workspace = true
 license.workspace = true
diff --git a/polkadot/node/gum/README.md b/polkadot/node/gum/README.md
index 739ce3066ecb33bcb4dcc4143917f02465400e85..aed576351326bc97a02f55099730c1fabb3a11b1 100644
--- a/polkadot/node/gum/README.md
+++ b/polkadot/node/gum/README.md
@@ -52,6 +52,6 @@ when providing to any of the log macros (`warn!`, `info!`, etc.).
 The crate has to be used throughout the entire codebase to work consistently, to
 disambiguate, the prefix `gum::` is used.
 
-Feature parity with `tracing::{warn!,..}` is not desired. We want consistency
+Feature Parity with `tracing::{warn!,..}` is not desired. We want consistency
 more than anything. All currently used features _are_ supported with _gum_ as
 well.
diff --git a/polkadot/node/gum/proc-macro/Cargo.toml b/polkadot/node/gum/proc-macro/Cargo.toml
index e7262008499b5666a7beeaecd635fbcfbaf918ca..1ffaf6160ba2be444ab3ac6e2094c2b690fcde12 100644
--- a/polkadot/node/gum/proc-macro/Cargo.toml
+++ b/polkadot/node/gum/proc-macro/Cargo.toml
@@ -1,6 +1,6 @@
 [package]
 name = "tracing-gum-proc-macro"
-version.workspace = true
+version = "1.0.0"
 authors.workspace = true
 edition.workspace = true
 license.workspace = true
@@ -13,7 +13,7 @@ targets = ["x86_64-unknown-linux-gnu"]
 proc-macro = true
 
 [dependencies]
-syn = { version = "2.0.15", features = ["full", "extra-traits"] }
+syn = { version = "2.0.38", features = ["full", "extra-traits"] }
 quote = "1.0.28"
 proc-macro2 = "1.0.56"
 proc-macro-crate = "1.1.3"
diff --git a/polkadot/node/jaeger/Cargo.toml b/polkadot/node/jaeger/Cargo.toml
index baee1d0be248bb848ea6029a871d054538c35bad..fcfbbaec611ef22ae593ad05bcb058a2316a0e9b 100644
--- a/polkadot/node/jaeger/Cargo.toml
+++ b/polkadot/node/jaeger/Cargo.toml
@@ -1,6 +1,6 @@
 [package]
 name = "polkadot-node-jaeger"
-version.workspace = true
+version = "1.0.0"
 authors.workspace = true
 edition.workspace = true
 license.workspace = true
@@ -14,7 +14,7 @@ polkadot-primitives = { path = "../../primitives" }
 polkadot-node-primitives = { path = "../primitives" }
 sc-network = { path = "../../../substrate/client/network" }
 sp-core = { path = "../../../substrate/primitives/core" }
-thiserror = "1.0.31"
+thiserror = "1.0.48"
 tokio = "1.24.2"
 log = "0.4.17"
 parity-scale-codec = { version = "3.6.1", default-features = false }
diff --git a/polkadot/node/malus/Cargo.toml b/polkadot/node/malus/Cargo.toml
index a0f9361f0f0af4d7e3e64956e8e6d4635e6a8570..9ce725f1682211d9b98166e50438e643c942d336 100644
--- a/polkadot/node/malus/Cargo.toml
+++ b/polkadot/node/malus/Cargo.toml
@@ -1,7 +1,7 @@
 [package]
 name = "polkadot-test-malus"
 description = "Misbehaving nodes for local testnets, system and Simnet tests."
-version.workspace = true
+version = "1.0.0"
 authors.workspace = true
 edition.workspace = true
 license.workspace = true
@@ -26,7 +26,7 @@ path = "../../src/bin/prepare-worker.rs"
 doc = false
 
 [dependencies]
-polkadot-cli = { path = "../../cli", features = [ "malus", "rococo-native", "kusama-native", "westend-native", "polkadot-native" ] }
+polkadot-cli = { path = "../../cli", features = [ "malus", "rococo-native", "westend-native" ] }
 polkadot-node-subsystem = { path = "../subsystem" }
 polkadot-node-subsystem-util = { path = "../subsystem-util" }
 polkadot-node-subsystem-types = { path = "../subsystem-types" }
@@ -40,7 +40,7 @@ assert_matches = "1.5"
 async-trait = "0.1.57"
 sp-keystore = { path = "../../../substrate/primitives/keystore" }
 sp-core = { path = "../../../substrate/primitives/core" }
-clap = { version = "4.0.9", features = ["derive"] }
+clap = { version = "4.4.6", features = ["derive"] }
 futures = "0.3.21"
 futures-timer = "3.0.2"
 gum = { package = "tracing-gum", path = "../gum" }
diff --git a/polkadot/node/malus/README.md b/polkadot/node/malus/README.md
index fb4bb0cd272fa7b89db995ebaaefa41f6a1ac37c..e0c7893a75319ed40b6bde633309f209dac91225 100644
--- a/polkadot/node/malus/README.md
+++ b/polkadot/node/malus/README.md
@@ -18,7 +18,7 @@ defined in the [(DSL[(**D**omain **S**pecific **L**anguage)]) doc](https://parit
 
 ## Usage
 
-> Assumes you already gained permissiones, ping in element @javier:matrix.parity.io to get access.
+> Assumes you already gained permissiones, ping in element `@javier:matrix.parity.io` to get access.
 > and you have cloned the [zombienet][zombienet] repo.
 
 To launch a test case in the development cluster use (e.g. for the  ./node/malus/integrationtests/0001-dispute-valid-block.toml):
@@ -48,7 +48,7 @@ This will also teardown the namespace after completion.
 ## Container Image Building Note
 
 In order to build the container image you need to have the latest changes from
-polkadot and substrate master branches.
+Polkadot and Substrate master branches.
 
 ```sh
 pwd # run this from the current dir
diff --git a/polkadot/node/malus/src/interceptor.rs b/polkadot/node/malus/src/interceptor.rs
index cbf39bccd16027e9b0dbe59745ed2dc28b283968..04ee0905deeb0758f222fce2cc6d3075b5a6000f 100644
--- a/polkadot/node/malus/src/interceptor.rs
+++ b/polkadot/node/malus/src/interceptor.rs
@@ -47,12 +47,20 @@ where
 		Some(msg)
 	}
 
-	/// Modify outgoing messages.
+	/// Specifies if we need to replace some outgoing message with another (potentially empty)
+	/// message
+	fn need_intercept_outgoing(
+		&self,
+		_msg: &<Self::Message as overseer::AssociateOutgoing>::OutgoingMessages,
+	) -> bool {
+		false
+	}
+	/// Send modified message instead of the original one
 	fn intercept_outgoing(
 		&self,
-		msg: <Self::Message as overseer::AssociateOutgoing>::OutgoingMessages,
+		_msg: &<Self::Message as overseer::AssociateOutgoing>::OutgoingMessages,
 	) -> Option<<Self::Message as overseer::AssociateOutgoing>::OutgoingMessages> {
-		Some(msg)
+		None
 	}
 }
 
@@ -66,7 +74,7 @@ pub struct InterceptedSender<Sender, Fil> {
 #[async_trait::async_trait]
 impl<OutgoingMessage, Sender, Fil> overseer::SubsystemSender<OutgoingMessage> for InterceptedSender<Sender, Fil>
 where
-	OutgoingMessage: overseer::AssociateOutgoing + Send + 'static,
+	OutgoingMessage: overseer::AssociateOutgoing + Send + 'static + TryFrom<overseer::AllMessages>,
 	Sender: overseer::SubsystemSender<OutgoingMessage>
 		+ overseer::SubsystemSender<
 				<
@@ -78,17 +86,48 @@ where
 	<
 		<Fil as MessageInterceptor<Sender>>::Message as overseer::AssociateOutgoing
 	>::OutgoingMessages:
-		From<OutgoingMessage>,
+		From<OutgoingMessage> + Send + Sync,
+	<OutgoingMessage as TryFrom<overseer::AllMessages>>::Error: std::fmt::Debug,
 {
 	async fn send_message(&mut self, msg: OutgoingMessage) {
 		let msg = <
 					<<Fil as MessageInterceptor<Sender>>::Message as overseer::AssociateOutgoing
 				>::OutgoingMessages as From<OutgoingMessage>>::from(msg);
-		if let Some(msg) = self.message_filter.intercept_outgoing(msg) {
+		if self.message_filter.need_intercept_outgoing(&msg) {
+			if let Some(msg) = self.message_filter.intercept_outgoing(&msg) {
+				self.inner.send_message(msg).await;
+			}
+		}
+		else {
 			self.inner.send_message(msg).await;
 		}
 	}
 
+	fn try_send_message(&mut self, msg: OutgoingMessage) -> Result<(), TrySendError<OutgoingMessage>> {
+		let msg = <
+				<<Fil as MessageInterceptor<Sender>>::Message as overseer::AssociateOutgoing
+			>::OutgoingMessages as From<OutgoingMessage>>::from(msg);
+		if self.message_filter.need_intercept_outgoing(&msg) {
+			if let Some(real_msg) = self.message_filter.intercept_outgoing(&msg) {
+				let orig_msg : OutgoingMessage = msg.into().try_into().expect("must be able to recover the original message");
+				self.inner.try_send_message(real_msg).map_err(|e| {
+					match e {
+						TrySendError::Full(_) => TrySendError::Full(orig_msg),
+						TrySendError::Closed(_) => TrySendError::Closed(orig_msg),
+					}
+				})
+			}
+			else {
+				// No message to send after intercepting
+				Ok(())
+			}
+		}
+		else {
+			let orig_msg : OutgoingMessage = msg.into().try_into().expect("must be able to recover the original message");
+			self.inner.try_send_message(orig_msg)
+		}
+	}
+
 	async fn send_messages<T>(&mut self, msgs: T)
 	where
 		T: IntoIterator<Item = OutgoingMessage> + Send,
@@ -101,9 +140,14 @@ where
 
 	fn send_unbounded_message(&mut self, msg: OutgoingMessage) {
 		let msg = <
-					<<Fil as MessageInterceptor<Sender>>::Message as overseer::AssociateOutgoing
-				>::OutgoingMessages as From<OutgoingMessage>>::from(msg);
-		if let Some(msg) = self.message_filter.intercept_outgoing(msg) {
+				<<Fil as MessageInterceptor<Sender>>::Message as overseer::AssociateOutgoing
+			>::OutgoingMessages as From<OutgoingMessage>>::from(msg);
+		if self.message_filter.need_intercept_outgoing(&msg) {
+			if let Some(msg) = self.message_filter.intercept_outgoing(&msg) {
+				self.inner.send_unbounded_message(msg);
+			}
+		}
+		else {
 			self.inner.send_unbounded_message(msg);
 		}
 	}
diff --git a/polkadot/node/malus/src/variants/common.rs b/polkadot/node/malus/src/variants/common.rs
index 475ca8f314520958e0677e232632abe59731fc0d..365b2f16ac21b67480b2dfc1c49b6092511c998d 100644
--- a/polkadot/node/malus/src/variants/common.rs
+++ b/polkadot/node/malus/src/variants/common.rs
@@ -278,6 +278,7 @@ where
 						validation_code,
 						candidate_receipt,
 						pov,
+						executor_params,
 						timeout,
 						sender,
 					),
@@ -292,6 +293,7 @@ where
 									validation_code,
 									candidate_receipt,
 									pov,
+									executor_params,
 									timeout,
 									sender,
 								),
@@ -329,6 +331,7 @@ where
 										validation_code,
 										candidate_receipt,
 										pov,
+										executor_params,
 										timeout,
 										sender,
 									),
@@ -368,6 +371,7 @@ where
 										validation_code,
 										candidate_receipt,
 										pov,
+										executor_params,
 										timeout,
 										sender,
 									),
@@ -382,6 +386,7 @@ where
 							validation_code,
 							candidate_receipt,
 							pov,
+							executor_params,
 							timeout,
 							sender,
 						),
@@ -394,6 +399,7 @@ where
 					CandidateValidationMessage::ValidateFromChainState(
 						candidate_receipt,
 						pov,
+						executor_params,
 						timeout,
 						response_sender,
 					),
@@ -406,6 +412,7 @@ where
 								msg: CandidateValidationMessage::ValidateFromChainState(
 									candidate_receipt,
 									pov,
+									executor_params,
 									timeout,
 									response_sender,
 								),
@@ -435,6 +442,7 @@ where
 								msg: CandidateValidationMessage::ValidateFromChainState(
 									candidate_receipt,
 									pov,
+									executor_params,
 									timeout,
 									response_sender,
 								),
@@ -468,6 +476,7 @@ where
 									msg: CandidateValidationMessage::ValidateFromChainState(
 										candidate_receipt,
 										pov,
+										executor_params,
 										timeout,
 										response_sender,
 									),
@@ -479,6 +488,7 @@ where
 						msg: CandidateValidationMessage::ValidateFromChainState(
 							candidate_receipt,
 							pov,
+							executor_params,
 							timeout,
 							response_sender,
 						),
@@ -488,11 +498,4 @@ where
 			msg => Some(msg),
 		}
 	}
-
-	fn intercept_outgoing(
-		&self,
-		msg: overseer::CandidateValidationOutgoingMessages,
-	) -> Option<overseer::CandidateValidationOutgoingMessages> {
-		Some(msg)
-	}
 }
diff --git a/polkadot/node/metrics/Cargo.toml b/polkadot/node/metrics/Cargo.toml
index c021f394780b06287c3b5d7c871eede716096cbd..e13ae63199ff0960af100a34451c14090b23e764 100644
--- a/polkadot/node/metrics/Cargo.toml
+++ b/polkadot/node/metrics/Cargo.toml
@@ -1,7 +1,7 @@
 [package]
 name = "polkadot-node-metrics"
 description = "Subsystem metric helpers"
-version.workspace = true
+version = "1.0.0"
 authors.workspace = true
 edition.workspace = true
 license.workspace = true
@@ -11,8 +11,7 @@ futures = "0.3.21"
 futures-timer = "3.0.2"
 gum = { package = "tracing-gum", path = "../gum" }
 
-metered = { package = "prioritized-metered-channel", version = "0.2.0" }
-
+metered = { package = "prioritized-metered-channel", version = "0.5.1", default-features = false, features=["futures_channel"] }
 # Both `sc-service` and `sc-cli` are required by runtime metrics `logger_hook()`.
 sc-service = { path = "../../../substrate/client/service" }
 sc-cli = { path = "../../../substrate/client/cli" }
@@ -21,7 +20,7 @@ substrate-prometheus-endpoint = { path = "../../../substrate/utils/prometheus" }
 sc-tracing = { path = "../../../substrate/client/tracing" }
 codec = { package = "parity-scale-codec", version = "3.6.1" }
 primitives = { package = "polkadot-primitives", path = "../../primitives" }
-bs58 = { version = "0.4.0", features = ["alloc"] }
+bs58 = { version = "0.5.0", features = ["alloc"] }
 log = "0.4.17"
 
 [dev-dependencies]
@@ -38,4 +37,8 @@ prometheus-parse = {version = "0.2.2"}
 [features]
 default = []
 runtime-metrics = []
-runtime-benchmarks = []
+runtime-benchmarks = [
+	"polkadot-test-service/runtime-benchmarks",
+	"primitives/runtime-benchmarks",
+	"sc-service/runtime-benchmarks",
+]
diff --git a/polkadot/node/metrics/README.md b/polkadot/node/metrics/README.md
index cc88884f21422317b4e5ecb02b9f0c8555a523f7..0cf57006f67a97f34ecf1dfdd7738ceff7e55943 100644
--- a/polkadot/node/metrics/README.md
+++ b/polkadot/node/metrics/README.md
@@ -1,4 +1,4 @@
-# polkadot-node-metrics
+# `polkadot-node-metrics`
 
 ## Testing
 
diff --git a/polkadot/node/metrics/src/tests.rs b/polkadot/node/metrics/src/tests.rs
index 68abfeebc12446e080a5b24d1460f4e54f12e044..861080228cd8dc90f9d074d54355983ab30e8e53 100644
--- a/polkadot/node/metrics/src/tests.rs
+++ b/polkadot/node/metrics/src/tests.rs
@@ -24,7 +24,7 @@ use std::collections::HashMap;
 
 const DEFAULT_PROMETHEUS_PORT: u16 = 9616;
 
-#[substrate_test_utils::test(flavor = "multi_thread")]
+#[tokio::test(flavor = "multi_thread")]
 async fn runtime_can_publish_metrics() {
 	let mut alice_config =
 		node_config(|| {}, tokio::runtime::Handle::current(), Alice, Vec::new(), true);
diff --git a/polkadot/node/network/approval-distribution/Cargo.toml b/polkadot/node/network/approval-distribution/Cargo.toml
index 9638c53d318b197438ec22aa8ef274f6343079bf..e19a1b83a62fe33b0db6989a3abadd18d768a29a 100644
--- a/polkadot/node/network/approval-distribution/Cargo.toml
+++ b/polkadot/node/network/approval-distribution/Cargo.toml
@@ -1,6 +1,6 @@
 [package]
 name = "polkadot-approval-distribution"
-version.workspace = true
+version = "1.0.0"
 authors.workspace = true
 edition.workspace = true
 license.workspace = true
diff --git a/polkadot/node/network/approval-distribution/src/lib.rs b/polkadot/node/network/approval-distribution/src/lib.rs
index ac525ea6faf3b77956c9ecd90a8b1de5466b7674..d8949b1c1123c25c00d85e2e9cf9392a6710f552 100644
--- a/polkadot/node/network/approval-distribution/src/lib.rs
+++ b/polkadot/node/network/approval-distribution/src/lib.rs
@@ -14,9 +14,12 @@
 // You should have received a copy of the GNU General Public License
 // along with Polkadot.  If not, see <http://www.gnu.org/licenses/>.
 
-//! [`ApprovalDistributionSubsystem`] implementation.
+//! [`ApprovalDistribution`] implementation.
 //!
-//! https://w3f.github.io/parachain-implementers-guide/node/approval/approval-distribution.html
+//! See the documentation on [approval distribution][approval-distribution-page] in the
+//! implementers' guide.
+//!
+//! [approval-distribution-page]: https://paritytech.github.io/polkadot-sdk/book/node/approval/approval-distribution.html
 
 #![warn(missing_docs)]
 
@@ -26,8 +29,8 @@ use polkadot_node_network_protocol::{
 	self as net_protocol,
 	grid_topology::{RandomRouting, RequiredRouting, SessionGridTopologies, SessionGridTopology},
 	peer_set::{ValidationVersion, MAX_NOTIFICATION_SIZE},
-	v1 as protocol_v1, vstaging as protocol_vstaging, PeerId, UnifiedReputationChange as Rep,
-	Versioned, VersionedValidationProtocol, View,
+	v1 as protocol_v1, v2 as protocol_v2, PeerId, UnifiedReputationChange as Rep, Versioned,
+	VersionedValidationProtocol, View,
 };
 use polkadot_node_primitives::approval::{
 	AssignmentCert, BlockApprovalMeta, IndirectAssignmentCert, IndirectSignedApprovalVote,
@@ -602,9 +605,7 @@ impl State {
 	{
 		match msg {
 			Versioned::V1(protocol_v1::ApprovalDistributionMessage::Assignments(assignments)) |
-			Versioned::VStaging(protocol_vstaging::ApprovalDistributionMessage::Assignments(
-				assignments,
-			)) => {
+			Versioned::V2(protocol_v2::ApprovalDistributionMessage::Assignments(assignments)) => {
 				gum::trace!(
 					target: LOG_TARGET,
 					peer_id = %peer_id,
@@ -644,9 +645,7 @@ impl State {
 				}
 			},
 			Versioned::V1(protocol_v1::ApprovalDistributionMessage::Approvals(approvals)) |
-			Versioned::VStaging(protocol_vstaging::ApprovalDistributionMessage::Approvals(
-				approvals,
-			)) => {
+			Versioned::V2(protocol_v2::ApprovalDistributionMessage::Approvals(approvals)) => {
 				gum::trace!(
 					target: LOG_TARGET,
 					peer_id = %peer_id,
@@ -1060,7 +1059,7 @@ impl State {
 			route_random
 		};
 
-		let (v1_peers, vstaging_peers) = {
+		let (v1_peers, v2_peers) = {
 			let peer_data = &self.peer_data;
 			let peers = entry
 				.known_by
@@ -1090,9 +1089,9 @@ impl State {
 			}
 
 			let v1_peers = filter_peers_by_version(&peers, ValidationVersion::V1);
-			let vstaging_peers = filter_peers_by_version(&peers, ValidationVersion::VStaging);
+			let v2_peers = filter_peers_by_version(&peers, ValidationVersion::V2);
 
-			(v1_peers, vstaging_peers)
+			(v1_peers, v2_peers)
 		};
 
 		if !v1_peers.is_empty() {
@@ -1103,10 +1102,10 @@ impl State {
 			.await;
 		}
 
-		if !vstaging_peers.is_empty() {
+		if !v2_peers.is_empty() {
 			ctx.send_message(NetworkBridgeTxMessage::SendValidationMessage(
-				vstaging_peers,
-				versioned_assignments_packet(ValidationVersion::VStaging, assignments.clone()),
+				v2_peers,
+				versioned_assignments_packet(ValidationVersion::V2, assignments.clone()),
 			))
 			.await;
 		}
@@ -1395,7 +1394,7 @@ impl State {
 			in_topology || knowledge.sent.contains(message_subject, MessageKind::Assignment)
 		};
 
-		let (v1_peers, vstaging_peers) = {
+		let (v1_peers, v2_peers) = {
 			let peer_data = &self.peer_data;
 			let peers = entry
 				.known_by
@@ -1425,9 +1424,9 @@ impl State {
 			}
 
 			let v1_peers = filter_peers_by_version(&peers, ValidationVersion::V1);
-			let vstaging_peers = filter_peers_by_version(&peers, ValidationVersion::VStaging);
+			let v2_peers = filter_peers_by_version(&peers, ValidationVersion::V2);
 
-			(v1_peers, vstaging_peers)
+			(v1_peers, v2_peers)
 		};
 
 		let approvals = vec![vote];
@@ -1440,10 +1439,10 @@ impl State {
 			.await;
 		}
 
-		if !vstaging_peers.is_empty() {
+		if !v2_peers.is_empty() {
 			ctx.send_message(NetworkBridgeTxMessage::SendValidationMessage(
-				vstaging_peers,
-				versioned_approvals_packet(ValidationVersion::VStaging, approvals),
+				v2_peers,
+				versioned_approvals_packet(ValidationVersion::V2, approvals),
 			))
 			.await;
 		}
@@ -2017,9 +2016,9 @@ fn versioned_approvals_packet(
 			Versioned::V1(protocol_v1::ValidationProtocol::ApprovalDistribution(
 				protocol_v1::ApprovalDistributionMessage::Approvals(approvals),
 			)),
-		ValidationVersion::VStaging =>
-			Versioned::VStaging(protocol_vstaging::ValidationProtocol::ApprovalDistribution(
-				protocol_vstaging::ApprovalDistributionMessage::Approvals(approvals),
+		ValidationVersion::V2 =>
+			Versioned::V2(protocol_v2::ValidationProtocol::ApprovalDistribution(
+				protocol_v2::ApprovalDistributionMessage::Approvals(approvals),
 			)),
 	}
 }
@@ -2033,9 +2032,9 @@ fn versioned_assignments_packet(
 			Versioned::V1(protocol_v1::ValidationProtocol::ApprovalDistribution(
 				protocol_v1::ApprovalDistributionMessage::Assignments(assignments),
 			)),
-		ValidationVersion::VStaging =>
-			Versioned::VStaging(protocol_vstaging::ValidationProtocol::ApprovalDistribution(
-				protocol_vstaging::ApprovalDistributionMessage::Assignments(assignments),
+		ValidationVersion::V2 =>
+			Versioned::V2(protocol_v2::ValidationProtocol::ApprovalDistribution(
+				protocol_v2::ApprovalDistributionMessage::Assignments(assignments),
 			)),
 	}
 }
diff --git a/polkadot/node/network/approval-distribution/src/tests.rs b/polkadot/node/network/approval-distribution/src/tests.rs
index 1e9ae7b620072939b81a13949fbc7299333210ad..29c7d8aa45daa1f88ec6737c448e9e2d8a493bb5 100644
--- a/polkadot/node/network/approval-distribution/src/tests.rs
+++ b/polkadot/node/network/approval-distribution/src/tests.rs
@@ -2388,9 +2388,9 @@ fn import_versioned_approval() {
 	let _ = test_harness(state, |mut virtual_overseer| async move {
 		let overseer = &mut virtual_overseer;
 		// All peers are aware of relay parent.
-		setup_peer_with_view(overseer, &peer_a, ValidationVersion::VStaging, view![hash]).await;
+		setup_peer_with_view(overseer, &peer_a, ValidationVersion::V2, view![hash]).await;
 		setup_peer_with_view(overseer, &peer_b, ValidationVersion::V1, view![hash]).await;
-		setup_peer_with_view(overseer, &peer_c, ValidationVersion::VStaging, view![hash]).await;
+		setup_peer_with_view(overseer, &peer_c, ValidationVersion::V2, view![hash]).await;
 
 		// new block `hash_a` with 1 candidates
 		let meta = BlockApprovalMeta {
@@ -2431,8 +2431,8 @@ fn import_versioned_approval() {
 			overseer_recv(overseer).await,
 			AllMessages::NetworkBridgeTx(NetworkBridgeTxMessage::SendValidationMessage(
 				peers,
-				Versioned::VStaging(protocol_vstaging::ValidationProtocol::ApprovalDistribution(
-					protocol_vstaging::ApprovalDistributionMessage::Assignments(assignments)
+				Versioned::V2(protocol_v2::ValidationProtocol::ApprovalDistribution(
+					protocol_v2::ApprovalDistributionMessage::Assignments(assignments)
 				))
 			)) => {
 				assert_eq!(peers.len(), 2);
@@ -2450,8 +2450,8 @@ fn import_versioned_approval() {
 			validator: validator_index,
 			signature: dummy_signature(),
 		};
-		let msg = protocol_vstaging::ApprovalDistributionMessage::Approvals(vec![approval.clone()]);
-		send_message_from_peer(overseer, &peer_a, Versioned::VStaging(msg)).await;
+		let msg = protocol_v2::ApprovalDistributionMessage::Approvals(vec![approval.clone()]);
+		send_message_from_peer(overseer, &peer_a, Versioned::V2(msg)).await;
 
 		assert_matches!(
 			overseer_recv(overseer).await,
@@ -2483,8 +2483,8 @@ fn import_versioned_approval() {
 			overseer_recv(overseer).await,
 			AllMessages::NetworkBridgeTx(NetworkBridgeTxMessage::SendValidationMessage(
 				peers,
-				Versioned::VStaging(protocol_vstaging::ValidationProtocol::ApprovalDistribution(
-					protocol_vstaging::ApprovalDistributionMessage::Approvals(approvals)
+				Versioned::V2(protocol_v2::ValidationProtocol::ApprovalDistribution(
+					protocol_v2::ApprovalDistributionMessage::Approvals(approvals)
 				))
 			)) => {
 				assert_eq!(peers, vec![peer_c]);
diff --git a/polkadot/node/network/availability-distribution/Cargo.toml b/polkadot/node/network/availability-distribution/Cargo.toml
index b81145688b69bf17b40fd5319c310ac301357f8f..c3c7aa4e0ea517b68e6e69d7aef45870d94efb90 100644
--- a/polkadot/node/network/availability-distribution/Cargo.toml
+++ b/polkadot/node/network/availability-distribution/Cargo.toml
@@ -1,6 +1,6 @@
 [package]
 name = "polkadot-availability-distribution"
-version.workspace = true
+version = "1.0.0"
 authors.workspace = true
 edition.workspace = true
 license.workspace = true
@@ -17,10 +17,10 @@ polkadot-node-subsystem-util = { path = "../../subsystem-util" }
 polkadot-node-primitives = { path = "../../primitives" }
 sp-core = { path = "../../../../substrate/primitives/core", features = ["std"] }
 sp-keystore = { path = "../../../../substrate/primitives/keystore" }
-thiserror = "1.0.31"
+thiserror = "1.0.48"
 rand = "0.8.5"
 derive_more = "0.99.17"
-lru = "0.11.0"
+schnellru = "0.2.1"
 fatality = "0.0.6"
 
 [dev-dependencies]
diff --git a/polkadot/node/network/availability-distribution/src/pov_requester/mod.rs b/polkadot/node/network/availability-distribution/src/pov_requester/mod.rs
index 8fc9fa82153e2035d8c037b8b6b86caf638bf5cc..12a97a1fb5a18330be6d94c43ef6a59b14772b40 100644
--- a/polkadot/node/network/availability-distribution/src/pov_requester/mod.rs
+++ b/polkadot/node/network/availability-distribution/src/pov_requester/mod.rs
@@ -146,7 +146,7 @@ mod tests {
 		AllMessages, AvailabilityDistributionMessage, RuntimeApiMessage, RuntimeApiRequest,
 	};
 	use polkadot_node_subsystem_test_helpers as test_helpers;
-	use polkadot_primitives::{CandidateHash, Hash, ValidatorIndex};
+	use polkadot_primitives::{CandidateHash, ExecutorParams, Hash, ValidatorIndex};
 	use test_helpers::mock::make_ferdie_keystore;
 
 	use super::*;
@@ -208,6 +208,12 @@ mod tests {
 					)) => {
 						tx.send(Ok(Some(make_session_info()))).unwrap();
 					},
+					AllMessages::RuntimeApi(RuntimeApiMessage::Request(
+						_,
+						RuntimeApiRequest::SessionExecutorParams(_, tx),
+					)) => {
+						tx.send(Ok(Some(ExecutorParams::default()))).unwrap();
+					},
 					AllMessages::NetworkBridgeTx(NetworkBridgeTxMessage::SendRequests(
 						mut reqs,
 						_,
diff --git a/polkadot/node/network/availability-distribution/src/requester/session_cache.rs b/polkadot/node/network/availability-distribution/src/requester/session_cache.rs
index e9311fb220382396762a1a801a4f26a588d85053..8a48e19c2827d13fe2d15ea4cc5ded50f058ca03 100644
--- a/polkadot/node/network/availability-distribution/src/requester/session_cache.rs
+++ b/polkadot/node/network/availability-distribution/src/requester/session_cache.rs
@@ -14,10 +14,10 @@
 // You should have received a copy of the GNU General Public License
 // along with Polkadot.  If not, see <http://www.gnu.org/licenses/>.
 
-use std::{collections::HashSet, num::NonZeroUsize};
+use std::collections::HashSet;
 
-use lru::LruCache;
 use rand::{seq::SliceRandom, thread_rng};
+use schnellru::{ByLength, LruMap};
 
 use polkadot_node_subsystem::overseer;
 use polkadot_node_subsystem_util::runtime::RuntimeInfo;
@@ -37,7 +37,7 @@ pub struct SessionCache {
 	/// Note: Performance of fetching is really secondary here, but we need to ensure we are going
 	/// to get any existing cache entry, before fetching new information, as we should not mess up
 	/// the order of validators in `SessionInfo::validator_groups`.
-	session_info_cache: LruCache<SessionIndex, SessionInfo>,
+	session_info_cache: LruMap<SessionIndex, SessionInfo>,
 }
 
 /// Localized session information, tailored for the needs of availability distribution.
@@ -83,7 +83,7 @@ impl SessionCache {
 	pub fn new() -> Self {
 		SessionCache {
 			// We need to cache the current and the last session the most:
-			session_info_cache: LruCache::new(NonZeroUsize::new(2).unwrap()),
+			session_info_cache: LruMap::new(ByLength::new(2)),
 		}
 	}
 
@@ -115,7 +115,7 @@ impl SessionCache {
 			gum::trace!(target: LOG_TARGET, session_index, "Calling `with_info`");
 			let r = with_info(&info);
 			gum::trace!(target: LOG_TARGET, session_index, "Storing session info in lru!");
-			self.session_info_cache.put(session_index, info);
+			self.session_info_cache.insert(session_index, info);
 			Ok(Some(r))
 		} else {
 			Ok(None)
@@ -142,7 +142,7 @@ impl SessionCache {
 	/// will be put at the beginning of the group.
 	pub fn report_bad(&mut self, report: BadValidators) -> Result<()> {
 		let available_sessions = self.session_info_cache.iter().map(|(k, _)| *k).collect();
-		let session = self.session_info_cache.get_mut(&report.session_index).ok_or(
+		let session = self.session_info_cache.get(&report.session_index).ok_or(
 			Error::NoSuchCachedSession {
 				available_sessions,
 				missing_session: report.session_index,
diff --git a/polkadot/node/network/availability-distribution/src/requester/tests.rs b/polkadot/node/network/availability-distribution/src/requester/tests.rs
index b74a69ea0769b2dec61c4b3ef1ddb0120ff17f5f..c4252b4e439e8a58a5ed54e2039999fb71dfde60 100644
--- a/polkadot/node/network/availability-distribution/src/requester/tests.rs
+++ b/polkadot/node/network/availability-distribution/src/requester/tests.rs
@@ -16,16 +16,17 @@
 
 use std::collections::HashMap;
 
-use std::{future::Future, sync::Arc};
+use std::future::Future;
 
 use futures::FutureExt;
 
 use polkadot_node_network_protocol::jaeger;
 use polkadot_node_primitives::{BlockData, ErasureChunk, PoV};
+use polkadot_node_subsystem_test_helpers::mock::new_leaf;
 use polkadot_node_subsystem_util::runtime::RuntimeInfo;
 use polkadot_primitives::{
-	BlockNumber, CoreState, GroupIndex, Hash, Id as ParaId, ScheduledCore, SessionIndex,
-	SessionInfo,
+	BlockNumber, CoreState, ExecutorParams, GroupIndex, Hash, Id as ParaId, ScheduledCore,
+	SessionIndex, SessionInfo,
 };
 use sp_core::traits::SpawnNamed;
 
@@ -34,7 +35,7 @@ use polkadot_node_subsystem::{
 		AllMessages, AvailabilityDistributionMessage, AvailabilityStoreMessage, ChainApiMessage,
 		NetworkBridgeTxMessage, RuntimeApiMessage, RuntimeApiRequest,
 	},
-	ActivatedLeaf, ActiveLeavesUpdate, LeafStatus, SpawnGlue,
+	ActiveLeavesUpdate, SpawnGlue,
 };
 use polkadot_node_subsystem_test_helpers::{
 	make_subsystem_context, mock::make_ferdie_keystore, TestSubsystemContext,
@@ -120,6 +121,10 @@ fn spawn_virtual_overseer(
 								tx.send(Ok(Some(test_state.session_info.clone())))
 									.expect("Receiver should be alive.");
 							},
+							RuntimeApiRequest::SessionExecutorParams(_, tx) => {
+								tx.send(Ok(Some(ExecutorParams::default())))
+									.expect("Receiver should be alive.");
+							},
 							RuntimeApiRequest::AvailabilityCores(tx) => {
 								let para_id = ParaId::from(1_u32);
 								let maybe_block_position =
@@ -201,12 +206,7 @@ fn check_ancestry_lookup_in_same_session() {
 		let spans: HashMap<Hash, jaeger::PerLeafSpan> = HashMap::new();
 		let block_number = 1;
 		let update = ActiveLeavesUpdate {
-			activated: Some(ActivatedLeaf {
-				hash: chain[block_number],
-				number: block_number as u32,
-				status: LeafStatus::Fresh,
-				span: Arc::new(jaeger::Span::Disabled),
-			}),
+			activated: Some(new_leaf(chain[block_number], block_number as u32)),
 			deactivated: Vec::new().into(),
 		};
 
@@ -221,12 +221,7 @@ fn check_ancestry_lookup_in_same_session() {
 
 		let block_number = 2;
 		let update = ActiveLeavesUpdate {
-			activated: Some(ActivatedLeaf {
-				hash: chain[block_number],
-				number: block_number as u32,
-				status: LeafStatus::Fresh,
-				span: Arc::new(jaeger::Span::Disabled),
-			}),
+			activated: Some(new_leaf(chain[block_number], block_number as u32)),
 			deactivated: Vec::new().into(),
 		};
 
@@ -248,12 +243,7 @@ fn check_ancestry_lookup_in_same_session() {
 		// part of ancestry.
 		let block_number = 2 + Requester::LEAF_ANCESTRY_LEN_WITHIN_SESSION;
 		let update = ActiveLeavesUpdate {
-			activated: Some(ActivatedLeaf {
-				hash: test_state.relay_chain[block_number],
-				number: block_number as u32,
-				status: LeafStatus::Fresh,
-				span: Arc::new(jaeger::Span::Disabled),
-			}),
+			activated: Some(new_leaf(chain[block_number], block_number as u32)),
 			deactivated: vec![chain[1], chain[2]].into(),
 		};
 		requester
@@ -288,12 +278,7 @@ fn check_ancestry_lookup_in_different_sessions() {
 		let spans: HashMap<Hash, jaeger::PerLeafSpan> = HashMap::new();
 		let block_number = 3;
 		let update = ActiveLeavesUpdate {
-			activated: Some(ActivatedLeaf {
-				hash: chain[block_number],
-				number: block_number as u32,
-				status: LeafStatus::Fresh,
-				span: Arc::new(jaeger::Span::Disabled),
-			}),
+			activated: Some(new_leaf(chain[block_number], block_number as u32)),
 			deactivated: Vec::new().into(),
 		};
 
@@ -306,12 +291,7 @@ fn check_ancestry_lookup_in_different_sessions() {
 
 		let block_number = 4;
 		let update = ActiveLeavesUpdate {
-			activated: Some(ActivatedLeaf {
-				hash: chain[block_number],
-				number: block_number as u32,
-				status: LeafStatus::Fresh,
-				span: Arc::new(jaeger::Span::Disabled),
-			}),
+			activated: Some(new_leaf(chain[block_number], block_number as u32)),
 			deactivated: vec![chain[1], chain[2], chain[3]].into(),
 		};
 
@@ -324,12 +304,7 @@ fn check_ancestry_lookup_in_different_sessions() {
 
 		let block_number = 5;
 		let update = ActiveLeavesUpdate {
-			activated: Some(ActivatedLeaf {
-				hash: chain[block_number],
-				number: block_number as u32,
-				status: LeafStatus::Fresh,
-				span: Arc::new(jaeger::Span::Disabled),
-			}),
+			activated: Some(new_leaf(chain[block_number], block_number as u32)),
 			deactivated: vec![chain[4]].into(),
 		};
 
diff --git a/polkadot/node/network/availability-distribution/src/tests/state.rs b/polkadot/node/network/availability-distribution/src/tests/state.rs
index 706ec13a3e9b3dc19dfb3208b924bd6d231414da..101d917c0db5bbd572b86647a03c4b7b2bedf969 100644
--- a/polkadot/node/network/availability-distribution/src/tests/state.rs
+++ b/polkadot/node/network/availability-distribution/src/tests/state.rs
@@ -16,7 +16,6 @@
 
 use std::{
 	collections::{HashMap, HashSet},
-	sync::Arc,
 	time::Duration,
 };
 
@@ -34,9 +33,8 @@ use sc_network::{config as netconfig, config::RequestResponseConfig, IfDisconnec
 use sp_core::{testing::TaskExecutor, traits::SpawnNamed};
 use sp_keystore::KeystorePtr;
 
-use polkadot_node_network_protocol::{
-	jaeger,
-	request_response::{v1, IncomingRequest, OutgoingRequest, Requests},
+use polkadot_node_network_protocol::request_response::{
+	v1, IncomingRequest, OutgoingRequest, Requests,
 };
 use polkadot_node_primitives::ErasureChunk;
 use polkadot_node_subsystem::{
@@ -44,14 +42,14 @@ use polkadot_node_subsystem::{
 		AllMessages, AvailabilityDistributionMessage, AvailabilityStoreMessage, ChainApiMessage,
 		NetworkBridgeTxMessage, RuntimeApiMessage, RuntimeApiRequest,
 	},
-	ActivatedLeaf, ActiveLeavesUpdate, FromOrchestra, LeafStatus, OverseerSignal,
+	ActiveLeavesUpdate, FromOrchestra, OverseerSignal,
 };
 use polkadot_node_subsystem_test_helpers as test_helpers;
 use polkadot_primitives::{
-	CandidateHash, CoreState, GroupIndex, Hash, Id as ParaId, ScheduledCore, SessionInfo,
-	ValidatorIndex,
+	CandidateHash, CoreState, ExecutorParams, GroupIndex, Hash, Id as ParaId, ScheduledCore,
+	SessionInfo, ValidatorIndex,
 };
-use test_helpers::mock::make_ferdie_keystore;
+use test_helpers::mock::{make_ferdie_keystore, new_leaf};
 
 use super::mock::{make_session_info, OccupiedCoreBuilder};
 use crate::LOG_TARGET;
@@ -175,12 +173,7 @@ impl TestState {
 				.iter()
 				.zip(advanced)
 				.map(|(old, new)| ActiveLeavesUpdate {
-					activated: Some(ActivatedLeaf {
-						hash: *new,
-						number: 1,
-						status: LeafStatus::Fresh,
-						span: Arc::new(jaeger::Span::Disabled),
-					}),
+					activated: Some(new_leaf(*new, 1)),
 					deactivated: vec![*old].into(),
 				})
 				.collect::<Vec<_>>()
@@ -267,6 +260,10 @@ impl TestState {
 							tx.send(Ok(Some(self.session_info.clone())))
 								.expect("Receiver should be alive.");
 						},
+						RuntimeApiRequest::SessionExecutorParams(_, tx) => {
+							tx.send(Ok(Some(ExecutorParams::default())))
+								.expect("Receiver should be alive.");
+						},
 						RuntimeApiRequest::AvailabilityCores(tx) => {
 							gum::trace!(target: LOG_TARGET, cores= ?self.cores[&hash], hash = ?hash, "Sending out cores for hash");
 							tx.send(Ok(self.cores[&hash].clone()))
diff --git a/polkadot/node/network/availability-recovery/Cargo.toml b/polkadot/node/network/availability-recovery/Cargo.toml
index 9dc4d05353eda05209695dc717df7dca0faeeee1..42c3abef547b93e4187ed92764a91b4415602f06 100644
--- a/polkadot/node/network/availability-recovery/Cargo.toml
+++ b/polkadot/node/network/availability-recovery/Cargo.toml
@@ -1,16 +1,17 @@
 [package]
 name = "polkadot-availability-recovery"
-version.workspace = true
+version = "1.0.0"
 authors.workspace = true
 edition.workspace = true
 license.workspace = true
 
 [dependencies]
 futures = "0.3.21"
-lru = "0.11.0"
+schnellru = "0.2.1"
 rand = "0.8.5"
 fatality = "0.0.6"
-thiserror = "1.0.31"
+thiserror = "1.0.48"
+async-trait = "0.1.73"
 gum = { package = "tracing-gum", path = "../../gum" }
 
 polkadot-erasure-coding = { path = "../../../erasure-coding" }
diff --git a/polkadot/node/network/availability-recovery/src/lib.rs b/polkadot/node/network/availability-recovery/src/lib.rs
index fb0cdb7205710623af2ad90dabd5ef4febcfb90f..e2146981da926d2c7027c902ba5be4716382f4da 100644
--- a/polkadot/node/network/availability-recovery/src/lib.rs
+++ b/polkadot/node/network/availability-recovery/src/lib.rs
@@ -23,11 +23,10 @@ use std::{
 	iter::Iterator,
 	num::NonZeroUsize,
 	pin::Pin,
-	time::Duration,
 };
 
 use futures::{
-	channel::oneshot::{self, channel},
+	channel::oneshot,
 	future::{Future, FutureExt, RemoteHandle},
 	pin_mut,
 	prelude::*,
@@ -35,80 +34,55 @@ use futures::{
 	stream::{FuturesUnordered, StreamExt},
 	task::{Context, Poll},
 };
-use lru::LruCache;
-use rand::seq::SliceRandom;
+use schnellru::{ByLength, LruMap};
+use task::{FetchChunks, FetchChunksParams, FetchFull, FetchFullParams};
 
 use fatality::Nested;
 use polkadot_erasure_coding::{
 	branch_hash, branches, obtain_chunks_v1, recovery_threshold, Error as ErasureEncodingError,
 };
-#[cfg(not(test))]
-use polkadot_node_network_protocol::request_response::CHUNK_REQUEST_TIMEOUT;
+use task::{RecoveryParams, RecoveryStrategy, RecoveryTask};
+
 use polkadot_node_network_protocol::{
-	request_response::{
-		self as req_res, outgoing::RequestError, v1 as request_v1, IncomingRequestReceiver,
-		OutgoingRequest, Recipient, Requests,
-	},
-	IfDisconnected, UnifiedReputationChange as Rep,
+	request_response::{v1 as request_v1, IncomingRequestReceiver},
+	UnifiedReputationChange as Rep,
 };
 use polkadot_node_primitives::{AvailableData, ErasureChunk};
 use polkadot_node_subsystem::{
 	errors::RecoveryError,
 	jaeger,
-	messages::{AvailabilityRecoveryMessage, AvailabilityStoreMessage, NetworkBridgeTxMessage},
-	overseer, ActiveLeavesUpdate, FromOrchestra, OverseerSignal, SpawnedSubsystem, SubsystemError,
-	SubsystemResult,
+	messages::{AvailabilityRecoveryMessage, AvailabilityStoreMessage},
+	overseer, ActiveLeavesUpdate, FromOrchestra, OverseerSignal, SpawnedSubsystem,
+	SubsystemContext, SubsystemError, SubsystemResult,
 };
 use polkadot_node_subsystem_util::request_session_info;
 use polkadot_primitives::{
-	AuthorityDiscoveryId, BlakeTwo256, BlockNumber, CandidateHash, CandidateReceipt, GroupIndex,
-	Hash, HashT, IndexedVec, SessionIndex, SessionInfo, ValidatorId, ValidatorIndex,
+	BlakeTwo256, BlockNumber, CandidateHash, CandidateReceipt, GroupIndex, Hash, HashT,
+	SessionIndex, SessionInfo, ValidatorIndex,
 };
 
 mod error;
 mod futures_undead;
 mod metrics;
+mod task;
 use metrics::Metrics;
 
-use futures_undead::FuturesUndead;
-use sc_network::{OutboundFailure, RequestFailure};
-
 #[cfg(test)]
 mod tests;
 
 const LOG_TARGET: &str = "parachain::availability-recovery";
 
-// How many parallel recovery tasks should be running at once.
-const N_PARALLEL: usize = 50;
-
 // Size of the LRU cache where we keep recovered data.
-const LRU_SIZE: NonZeroUsize = match NonZeroUsize::new(16) {
-	Some(cap) => cap,
-	None => panic!("Availability-recovery cache size must be non-zero."),
-};
+const LRU_SIZE: u32 = 16;
 
 const COST_INVALID_REQUEST: Rep = Rep::CostMajor("Peer sent unparsable request");
 
-/// Time after which we consider a request to have failed
-///
-/// and we should try more peers. Note in theory the request times out at the network level,
-/// measurements have shown, that in practice requests might actually take longer to fail in
-/// certain occasions. (The very least, authority discovery is not part of the timeout.)
-///
-/// For the time being this value is the same as the timeout on the networking layer, but as this
-/// timeout is more soft than the networking one, it might make sense to pick different values as
-/// well.
-#[cfg(not(test))]
-const TIMEOUT_START_NEW_REQUESTS: Duration = CHUNK_REQUEST_TIMEOUT;
-#[cfg(test)]
-const TIMEOUT_START_NEW_REQUESTS: Duration = Duration::from_millis(100);
-
 /// PoV size limit in bytes for which prefer fetching from backers.
 const SMALL_POV_LIMIT: usize = 128 * 1024;
 
 #[derive(Clone, PartialEq)]
 /// The strategy we use to recover the PoV.
-pub enum RecoveryStrategy {
+pub enum RecoveryStrategyKind {
 	/// We always try the backing group first, then fallback to validator chunks.
 	BackersFirstAlways,
 	/// We try the backing group first if PoV size is lower than specified, then fallback to
@@ -116,101 +90,25 @@ pub enum RecoveryStrategy {
 	BackersFirstIfSizeLower(usize),
 	/// We always recover using validator chunks.
 	ChunksAlways,
-	/// Do not request data from the availability store.
-	/// This is the useful for nodes where the
-	/// availability-store subsystem is not expected to run,
-	/// such as collators.
-	BypassAvailabilityStore,
 }
 
-impl RecoveryStrategy {
-	/// Returns true if the strategy needs backing group index.
-	pub fn needs_backing_group(&self) -> bool {
-		match self {
-			RecoveryStrategy::BackersFirstAlways | RecoveryStrategy::BackersFirstIfSizeLower(_) =>
-				true,
-			_ => false,
-		}
-	}
-
-	/// Returns the PoV size limit in bytes for `BackersFirstIfSizeLower` strategy, otherwise
-	/// `None`.
-	pub fn pov_size_limit(&self) -> Option<usize> {
-		match *self {
-			RecoveryStrategy::BackersFirstIfSizeLower(limit) => Some(limit),
-			_ => None,
-		}
-	}
-}
 /// The Availability Recovery Subsystem.
 pub struct AvailabilityRecoverySubsystem {
 	/// PoV recovery strategy to use.
-	recovery_strategy: RecoveryStrategy,
+	recovery_strategy_kind: RecoveryStrategyKind,
+	// If this is true, do not request data from the availability store.
+	/// This is the useful for nodes where the
+	/// availability-store subsystem is not expected to run,
+	/// such as collators.
+	bypass_availability_store: bool,
 	/// Receiver for available data requests.
 	req_receiver: IncomingRequestReceiver<request_v1::AvailableDataFetchingRequest>,
 	/// Metrics for this subsystem.
 	metrics: Metrics,
 }
 
-struct RequestFromBackers {
-	// a random shuffling of the validators from the backing group which indicates the order
-	// in which we connect to them and request the chunk.
-	shuffled_backers: Vec<ValidatorIndex>,
-	// channel to the erasure task handler.
-	erasure_task_tx: futures::channel::mpsc::Sender<ErasureTask>,
-}
-
-struct RequestChunksFromValidators {
-	/// How many request have been unsuccessful so far.
-	error_count: usize,
-	/// Total number of responses that have been received.
-	///
-	/// including failed ones.
-	total_received_responses: usize,
-	/// a random shuffling of the validators which indicates the order in which we connect to the
-	/// validators and request the chunk from them.
-	shuffling: VecDeque<ValidatorIndex>,
-	/// Chunks received so far.
-	received_chunks: HashMap<ValidatorIndex, ErasureChunk>,
-	/// Pending chunk requests with soft timeout.
-	requesting_chunks: FuturesUndead<Result<Option<ErasureChunk>, (ValidatorIndex, RequestError)>>,
-	// channel to the erasure task handler.
-	erasure_task_tx: futures::channel::mpsc::Sender<ErasureTask>,
-}
-
-struct RecoveryParams {
-	/// Discovery ids of `validators`.
-	validator_authority_keys: Vec<AuthorityDiscoveryId>,
-
-	/// Validators relevant to this `RecoveryTask`.
-	validators: IndexedVec<ValidatorIndex, ValidatorId>,
-
-	/// The number of pieces needed.
-	threshold: usize,
-
-	/// A hash of the relevant candidate.
-	candidate_hash: CandidateHash,
-
-	/// The root of the erasure encoding of the para block.
-	erasure_root: Hash,
-
-	/// Metrics to report
-	metrics: Metrics,
-
-	/// Do not request data from availability-store
-	bypass_availability_store: bool,
-}
-
-/// Source the availability data either by means
-/// of direct request response protocol to
-/// backers (a.k.a. fast-path), or recover from chunks.
-enum Source {
-	RequestFromBackers(RequestFromBackers),
-	RequestChunks(RequestChunksFromValidators),
-}
-
 /// Expensive erasure coding computations that we want to run on a blocking thread.
-enum ErasureTask {
+pub enum ErasureTask {
 	/// Reconstructs `AvailableData` from chunks given `n_validators`.
 	Reconstruct(
 		usize,
@@ -222,486 +120,6 @@ enum ErasureTask {
 	Reencode(usize, Hash, AvailableData, oneshot::Sender<Option<AvailableData>>),
 }
 
-/// A stateful reconstruction of availability data in reference to
-/// a candidate hash.
-struct RecoveryTask<Sender> {
-	sender: Sender,
-
-	/// The parameters of the recovery process.
-	params: RecoveryParams,
-
-	/// The source to obtain the availability data from.
-	source: Source,
-
-	// channel to the erasure task handler.
-	erasure_task_tx: futures::channel::mpsc::Sender<ErasureTask>,
-}
-
-impl RequestFromBackers {
-	fn new(
-		mut backers: Vec<ValidatorIndex>,
-		erasure_task_tx: futures::channel::mpsc::Sender<ErasureTask>,
-	) -> Self {
-		backers.shuffle(&mut rand::thread_rng());
-
-		RequestFromBackers { shuffled_backers: backers, erasure_task_tx }
-	}
-
-	// Run this phase to completion.
-	async fn run(
-		&mut self,
-		params: &RecoveryParams,
-		sender: &mut impl overseer::AvailabilityRecoverySenderTrait,
-	) -> Result<AvailableData, RecoveryError> {
-		gum::trace!(
-			target: LOG_TARGET,
-			candidate_hash = ?params.candidate_hash,
-			erasure_root = ?params.erasure_root,
-			"Requesting from backers",
-		);
-		loop {
-			// Pop the next backer, and proceed to next phase if we're out.
-			let validator_index =
-				self.shuffled_backers.pop().ok_or_else(|| RecoveryError::Unavailable)?;
-
-			// Request data.
-			let (req, response) = OutgoingRequest::new(
-				Recipient::Authority(
-					params.validator_authority_keys[validator_index.0 as usize].clone(),
-				),
-				req_res::v1::AvailableDataFetchingRequest { candidate_hash: params.candidate_hash },
-			);
-
-			sender
-				.send_message(NetworkBridgeTxMessage::SendRequests(
-					vec![Requests::AvailableDataFetchingV1(req)],
-					IfDisconnected::ImmediateError,
-				))
-				.await;
-
-			match response.await {
-				Ok(req_res::v1::AvailableDataFetchingResponse::AvailableData(data)) => {
-					let (reencode_tx, reencode_rx) = channel();
-					self.erasure_task_tx
-						.send(ErasureTask::Reencode(
-							params.validators.len(),
-							params.erasure_root,
-							data,
-							reencode_tx,
-						))
-						.await
-						.map_err(|_| RecoveryError::ChannelClosed)?;
-
-					let reencode_response =
-						reencode_rx.await.map_err(|_| RecoveryError::ChannelClosed)?;
-
-					if let Some(data) = reencode_response {
-						gum::trace!(
-							target: LOG_TARGET,
-							candidate_hash = ?params.candidate_hash,
-							"Received full data",
-						);
-
-						return Ok(data)
-					} else {
-						gum::debug!(
-							target: LOG_TARGET,
-							candidate_hash = ?params.candidate_hash,
-							?validator_index,
-							"Invalid data response",
-						);
-
-						// it doesn't help to report the peer with req/res.
-					}
-				},
-				Ok(req_res::v1::AvailableDataFetchingResponse::NoSuchData) => {},
-				Err(e) => gum::debug!(
-					target: LOG_TARGET,
-					candidate_hash = ?params.candidate_hash,
-					?validator_index,
-					err = ?e,
-					"Error fetching full available data."
-				),
-			}
-		}
-	}
-}
-
-impl RequestChunksFromValidators {
-	fn new(
-		n_validators: u32,
-		erasure_task_tx: futures::channel::mpsc::Sender<ErasureTask>,
-	) -> Self {
-		let mut shuffling: Vec<_> = (0..n_validators).map(ValidatorIndex).collect();
-		shuffling.shuffle(&mut rand::thread_rng());
-
-		RequestChunksFromValidators {
-			error_count: 0,
-			total_received_responses: 0,
-			shuffling: shuffling.into(),
-			received_chunks: HashMap::new(),
-			requesting_chunks: FuturesUndead::new(),
-			erasure_task_tx,
-		}
-	}
-
-	fn is_unavailable(&self, params: &RecoveryParams) -> bool {
-		is_unavailable(
-			self.chunk_count(),
-			self.requesting_chunks.total_len(),
-			self.shuffling.len(),
-			params.threshold,
-		)
-	}
-
-	fn chunk_count(&self) -> usize {
-		self.received_chunks.len()
-	}
-
-	fn insert_chunk(&mut self, validator_index: ValidatorIndex, chunk: ErasureChunk) {
-		self.received_chunks.insert(validator_index, chunk);
-	}
-
-	fn can_conclude(&self, params: &RecoveryParams) -> bool {
-		self.chunk_count() >= params.threshold || self.is_unavailable(params)
-	}
-
-	/// Desired number of parallel requests.
-	///
-	/// For the given threshold (total required number of chunks) get the desired number of
-	/// requests we want to have running in parallel at this time.
-	fn get_desired_request_count(&self, threshold: usize) -> usize {
-		// Upper bound for parallel requests.
-		// We want to limit this, so requests can be processed within the timeout and we limit the
-		// following feedback loop:
-		// 1. Requests fail due to timeout
-		// 2. We request more chunks to make up for it
-		// 3. Bandwidth is spread out even more, so we get even more timeouts
-		// 4. We request more chunks to make up for it ...
-		let max_requests_boundary = std::cmp::min(N_PARALLEL, threshold);
-		// How many chunks are still needed?
-		let remaining_chunks = threshold.saturating_sub(self.chunk_count());
-		// What is the current error rate, so we can make up for it?
-		let inv_error_rate =
-			self.total_received_responses.checked_div(self.error_count).unwrap_or(0);
-		// Actual number of requests we want to have in flight in parallel:
-		std::cmp::min(
-			max_requests_boundary,
-			remaining_chunks + remaining_chunks.checked_div(inv_error_rate).unwrap_or(0),
-		)
-	}
-
-	async fn launch_parallel_requests<Sender>(
-		&mut self,
-		params: &RecoveryParams,
-		sender: &mut Sender,
-	) where
-		Sender: overseer::AvailabilityRecoverySenderTrait,
-	{
-		let num_requests = self.get_desired_request_count(params.threshold);
-		let candidate_hash = &params.candidate_hash;
-		let already_requesting_count = self.requesting_chunks.len();
-
-		gum::debug!(
-			target: LOG_TARGET,
-			?candidate_hash,
-			?num_requests,
-			error_count= ?self.error_count,
-			total_received = ?self.total_received_responses,
-			threshold = ?params.threshold,
-			?already_requesting_count,
-			"Requesting availability chunks for a candidate",
-		);
-		let mut requests = Vec::with_capacity(num_requests - already_requesting_count);
-
-		while self.requesting_chunks.len() < num_requests {
-			if let Some(validator_index) = self.shuffling.pop_back() {
-				let validator = params.validator_authority_keys[validator_index.0 as usize].clone();
-				gum::trace!(
-					target: LOG_TARGET,
-					?validator,
-					?validator_index,
-					?candidate_hash,
-					"Requesting chunk",
-				);
-
-				// Request data.
-				let raw_request = req_res::v1::ChunkFetchingRequest {
-					candidate_hash: params.candidate_hash,
-					index: validator_index,
-				};
-
-				let (req, res) = OutgoingRequest::new(Recipient::Authority(validator), raw_request);
-				requests.push(Requests::ChunkFetchingV1(req));
-
-				params.metrics.on_chunk_request_issued();
-				let timer = params.metrics.time_chunk_request();
-
-				self.requesting_chunks.push(Box::pin(async move {
-					let _timer = timer;
-					match res.await {
-						Ok(req_res::v1::ChunkFetchingResponse::Chunk(chunk)) =>
-							Ok(Some(chunk.recombine_into_chunk(&raw_request))),
-						Ok(req_res::v1::ChunkFetchingResponse::NoSuchChunk) => Ok(None),
-						Err(e) => Err((validator_index, e)),
-					}
-				}));
-			} else {
-				break
-			}
-		}
-
-		sender
-			.send_message(NetworkBridgeTxMessage::SendRequests(
-				requests,
-				IfDisconnected::TryConnect,
-			))
-			.await;
-	}
-
-	/// Wait for a sufficient amount of chunks to reconstruct according to the provided `params`.
-	async fn wait_for_chunks(&mut self, params: &RecoveryParams) {
-		let metrics = &params.metrics;
-
-		// Wait for all current requests to conclude or time-out, or until we reach enough chunks.
-		// We also declare requests undead, once `TIMEOUT_START_NEW_REQUESTS` is reached and will
-		// return in that case for `launch_parallel_requests` to fill up slots again.
-		while let Some(request_result) =
-			self.requesting_chunks.next_with_timeout(TIMEOUT_START_NEW_REQUESTS).await
-		{
-			self.total_received_responses += 1;
-
-			match request_result {
-				Ok(Some(chunk)) =>
-					if is_chunk_valid(params, &chunk) {
-						metrics.on_chunk_request_succeeded();
-						gum::trace!(
-							target: LOG_TARGET,
-							candidate_hash = ?params.candidate_hash,
-							validator_index = ?chunk.index,
-							"Received valid chunk",
-						);
-						self.insert_chunk(chunk.index, chunk);
-					} else {
-						metrics.on_chunk_request_invalid();
-						self.error_count += 1;
-					},
-				Ok(None) => {
-					metrics.on_chunk_request_no_such_chunk();
-					self.error_count += 1;
-				},
-				Err((validator_index, e)) => {
-					self.error_count += 1;
-
-					gum::trace!(
-						target: LOG_TARGET,
-						candidate_hash= ?params.candidate_hash,
-						err = ?e,
-						?validator_index,
-						"Failure requesting chunk",
-					);
-
-					match e {
-						RequestError::InvalidResponse(_) => {
-							metrics.on_chunk_request_invalid();
-
-							gum::debug!(
-								target: LOG_TARGET,
-								candidate_hash = ?params.candidate_hash,
-								err = ?e,
-								?validator_index,
-								"Chunk fetching response was invalid",
-							);
-						},
-						RequestError::NetworkError(err) => {
-							// No debug logs on general network errors - that became very spammy
-							// occasionally.
-							if let RequestFailure::Network(OutboundFailure::Timeout) = err {
-								metrics.on_chunk_request_timeout();
-							} else {
-								metrics.on_chunk_request_error();
-							}
-
-							self.shuffling.push_front(validator_index);
-						},
-						RequestError::Canceled(_) => {
-							metrics.on_chunk_request_error();
-
-							self.shuffling.push_front(validator_index);
-						},
-					}
-				},
-			}
-
-			// Stop waiting for requests when we either can already recover the data
-			// or have gotten firm 'No' responses from enough validators.
-			if self.can_conclude(params) {
-				gum::debug!(
-					target: LOG_TARGET,
-					candidate_hash = ?params.candidate_hash,
-					received_chunks_count = ?self.chunk_count(),
-					requested_chunks_count = ?self.requesting_chunks.len(),
-					threshold = ?params.threshold,
-					"Can conclude availability for a candidate",
-				);
-				break
-			}
-		}
-	}
-
-	async fn run<Sender>(
-		&mut self,
-		params: &RecoveryParams,
-		sender: &mut Sender,
-	) -> Result<AvailableData, RecoveryError>
-	where
-		Sender: overseer::AvailabilityRecoverySenderTrait,
-	{
-		let metrics = &params.metrics;
-
-		// First query the store for any chunks we've got.
-		if !params.bypass_availability_store {
-			let (tx, rx) = oneshot::channel();
-			sender
-				.send_message(AvailabilityStoreMessage::QueryAllChunks(params.candidate_hash, tx))
-				.await;
-
-			match rx.await {
-				Ok(chunks) => {
-					// This should either be length 1 or 0. If we had the whole data,
-					// we wouldn't have reached this stage.
-					let chunk_indices: Vec<_> = chunks.iter().map(|c| c.index).collect();
-					self.shuffling.retain(|i| !chunk_indices.contains(i));
-
-					for chunk in chunks {
-						if is_chunk_valid(params, &chunk) {
-							gum::trace!(
-								target: LOG_TARGET,
-								candidate_hash = ?params.candidate_hash,
-								validator_index = ?chunk.index,
-								"Found valid chunk on disk"
-							);
-							self.insert_chunk(chunk.index, chunk);
-						} else {
-							gum::error!(
-								target: LOG_TARGET,
-								"Loaded invalid chunk from disk! Disk/Db corruption _very_ likely - please fix ASAP!"
-							);
-						};
-					}
-				},
-				Err(oneshot::Canceled) => {
-					gum::warn!(
-						target: LOG_TARGET,
-						candidate_hash = ?params.candidate_hash,
-						"Failed to reach the availability store"
-					);
-				},
-			}
-		}
-
-		let _recovery_timer = metrics.time_full_recovery();
-
-		loop {
-			if self.is_unavailable(&params) {
-				gum::debug!(
-					target: LOG_TARGET,
-					candidate_hash = ?params.candidate_hash,
-					erasure_root = ?params.erasure_root,
-					received = %self.chunk_count(),
-					requesting = %self.requesting_chunks.len(),
-					total_requesting = %self.requesting_chunks.total_len(),
-					n_validators = %params.validators.len(),
-					"Data recovery is not possible",
-				);
-
-				metrics.on_recovery_failed();
-
-				return Err(RecoveryError::Unavailable)
-			}
-
-			self.launch_parallel_requests(params, sender).await;
-			self.wait_for_chunks(params).await;
-
-			// If received_chunks has more than threshold entries, attempt to recover the data.
-			// If that fails, or a re-encoding of it doesn't match the expected erasure root,
-			// return Err(RecoveryError::Invalid)
-			if self.chunk_count() >= params.threshold {
-				let recovery_duration = metrics.time_erasure_recovery();
-
-				// Send request to reconstruct available data from chunks.
-				let (avilable_data_tx, available_data_rx) = channel();
-				self.erasure_task_tx
-					.send(ErasureTask::Reconstruct(
-						params.validators.len(),
-						std::mem::take(&mut self.received_chunks),
-						avilable_data_tx,
-					))
-					.await
-					.map_err(|_| RecoveryError::ChannelClosed)?;
-
-				let available_data_response =
-					available_data_rx.await.map_err(|_| RecoveryError::ChannelClosed)?;
-
-				return match available_data_response {
-					Ok(data) => {
-						// Send request to re-encode the chunks and check merkle root.
-						let (reencode_tx, reencode_rx) = channel();
-						self.erasure_task_tx
-							.send(ErasureTask::Reencode(
-								params.validators.len(),
-								params.erasure_root,
-								data,
-								reencode_tx,
-							))
-							.await
-							.map_err(|_| RecoveryError::ChannelClosed)?;
-
-						let reencode_response =
-							reencode_rx.await.map_err(|_| RecoveryError::ChannelClosed)?;
-
-						if let Some(data) = reencode_response {
-							gum::trace!(
-								target: LOG_TARGET,
-								candidate_hash = ?params.candidate_hash,
-								erasure_root = ?params.erasure_root,
-								"Data recovery complete",
-							);
-							metrics.on_recovery_succeeded();
-
-							Ok(data)
-						} else {
-							recovery_duration.map(|rd| rd.stop_and_discard());
-							gum::trace!(
-								target: LOG_TARGET,
-								candidate_hash = ?params.candidate_hash,
-								erasure_root = ?params.erasure_root,
-								"Data recovery - root mismatch",
-							);
-							metrics.on_recovery_invalid();
-
-							Err(RecoveryError::Invalid)
-						}
-					},
-					Err(err) => {
-						recovery_duration.map(|rd| rd.stop_and_discard());
-						gum::trace!(
-							target: LOG_TARGET,
-							candidate_hash = ?params.candidate_hash,
-							erasure_root = ?params.erasure_root,
-							?err,
-							"Data recovery error ",
-						);
-						metrics.on_recovery_invalid();
-
-						Err(RecoveryError::Invalid)
-					},
-				}
-			}
-		}
-	}
-}
-
 const fn is_unavailable(
 	received_chunks: usize,
 	requesting_chunks: usize,
@@ -780,60 +198,6 @@ fn reconstructed_data_matches_root(
 	branches.root() == *expected_root
 }
 
-impl<Sender> RecoveryTask<Sender>
-where
-	Sender: overseer::AvailabilityRecoverySenderTrait,
-{
-	async fn run(mut self) -> Result<AvailableData, RecoveryError> {
-		// First just see if we have the data available locally.
-		if !self.params.bypass_availability_store {
-			let (tx, rx) = oneshot::channel();
-			self.sender
-				.send_message(AvailabilityStoreMessage::QueryAvailableData(
-					self.params.candidate_hash,
-					tx,
-				))
-				.await;
-
-			match rx.await {
-				Ok(Some(data)) => return Ok(data),
-				Ok(None) => {},
-				Err(oneshot::Canceled) => {
-					gum::warn!(
-						target: LOG_TARGET,
-						candidate_hash = ?self.params.candidate_hash,
-						"Failed to reach the availability store",
-					)
-				},
-			}
-		}
-
-		self.params.metrics.on_recovery_started();
-
-		loop {
-			// These only fail if we cannot reach the underlying subsystem, which case there is
-			// nothing meaningful we can do.
-			match self.source {
-				Source::RequestFromBackers(ref mut from_backers) => {
-					match from_backers.run(&self.params, &mut self.sender).await {
-						Ok(data) => break Ok(data),
-						Err(RecoveryError::Invalid) => break Err(RecoveryError::Invalid),
-						Err(RecoveryError::ChannelClosed) =>
-							break Err(RecoveryError::ChannelClosed),
-						Err(RecoveryError::Unavailable) =>
-							self.source = Source::RequestChunks(RequestChunksFromValidators::new(
-								self.params.validators.len() as _,
-								self.erasure_task_tx.clone(),
-							)),
-					}
-				},
-				Source::RequestChunks(ref mut from_all) =>
-					break from_all.run(&self.params, &mut self.sender).await,
-			}
-		}
-	}
-}
-
 /// Accumulate all awaiting sides for some particular `AvailableData`.
 struct RecoveryHandle {
 	candidate_hash: CandidateHash,
@@ -927,7 +291,7 @@ struct State {
 	live_block: (BlockNumber, Hash),
 
 	/// An LRU cache of recently recovered data.
-	availability_lru: LruCache<CandidateHash, CachedRecovery>,
+	availability_lru: LruMap<CandidateHash, CachedRecovery>,
 }
 
 impl Default for State {
@@ -935,7 +299,7 @@ impl Default for State {
 		Self {
 			ongoing_recoveries: FuturesUnordered::new(),
 			live_block: (0, Hash::default()),
-			availability_lru: LruCache::new(LRU_SIZE),
+			availability_lru: LruMap::new(ByLength::new(LRU_SIZE)),
 		}
 	}
 }
@@ -976,65 +340,23 @@ async fn launch_recovery_task<Context>(
 	ctx: &mut Context,
 	session_info: SessionInfo,
 	receipt: CandidateReceipt,
-	mut backing_group: Option<GroupIndex>,
 	response_sender: oneshot::Sender<Result<AvailableData, RecoveryError>>,
 	metrics: &Metrics,
-	recovery_strategy: &RecoveryStrategy,
-	erasure_task_tx: futures::channel::mpsc::Sender<ErasureTask>,
+	recovery_strategies: VecDeque<Box<dyn RecoveryStrategy<<Context as SubsystemContext>::Sender>>>,
+	bypass_availability_store: bool,
 ) -> error::Result<()> {
 	let candidate_hash = receipt.hash();
 	let params = RecoveryParams {
 		validator_authority_keys: session_info.discovery_keys.clone(),
-		validators: session_info.validators.clone(),
+		n_validators: session_info.validators.len(),
 		threshold: recovery_threshold(session_info.validators.len())?,
 		candidate_hash,
 		erasure_root: receipt.descriptor.erasure_root,
 		metrics: metrics.clone(),
-		bypass_availability_store: recovery_strategy == &RecoveryStrategy::BypassAvailabilityStore,
+		bypass_availability_store,
 	};
 
-	if let Some(small_pov_limit) = recovery_strategy.pov_size_limit() {
-		// Get our own chunk size to get an estimate of the PoV size.
-		let chunk_size: Result<Option<usize>, error::Error> =
-			query_chunk_size(ctx, candidate_hash).await;
-		if let Ok(Some(chunk_size)) = chunk_size {
-			let pov_size_estimate = chunk_size.saturating_mul(session_info.validators.len()) / 3;
-			let prefer_backing_group = pov_size_estimate < small_pov_limit;
-
-			gum::trace!(
-				target: LOG_TARGET,
-				?candidate_hash,
-				pov_size_estimate,
-				small_pov_limit,
-				enabled = prefer_backing_group,
-				"Prefer fetch from backing group",
-			);
-
-			backing_group = backing_group.filter(|_| {
-				// We keep the backing group only if `1/3` of chunks sum up to less than
-				// `small_pov_limit`.
-				prefer_backing_group
-			});
-		}
-	}
-
-	let phase = backing_group
-		.and_then(|g| session_info.validator_groups.get(g))
-		.map(|group| {
-			Source::RequestFromBackers(RequestFromBackers::new(
-				group.clone(),
-				erasure_task_tx.clone(),
-			))
-		})
-		.unwrap_or_else(|| {
-			Source::RequestChunks(RequestChunksFromValidators::new(
-				params.validators.len() as _,
-				erasure_task_tx.clone(),
-			))
-		});
-
-	let recovery_task =
-		RecoveryTask { sender: ctx.sender().clone(), params, source: phase, erasure_task_tx };
+	let recovery_task = RecoveryTask::new(ctx.sender().clone(), params, recovery_strategies);
 
 	let (remote, remote_handle) = recovery_task.run().remote_handle();
 
@@ -1065,8 +387,9 @@ async fn handle_recover<Context>(
 	backing_group: Option<GroupIndex>,
 	response_sender: oneshot::Sender<Result<AvailableData, RecoveryError>>,
 	metrics: &Metrics,
-	recovery_strategy: &RecoveryStrategy,
 	erasure_task_tx: futures::channel::mpsc::Sender<ErasureTask>,
+	recovery_strategy_kind: RecoveryStrategyKind,
+	bypass_availability_store: bool,
 ) -> error::Result<()> {
 	let candidate_hash = receipt.hash();
 
@@ -1101,19 +424,71 @@ async fn handle_recover<Context>(
 
 	let _span = span.child("session-info-ctx-received");
 	match session_info {
-		Some(session_info) =>
+		Some(session_info) => {
+			let mut recovery_strategies: VecDeque<
+				Box<dyn RecoveryStrategy<<Context as SubsystemContext>::Sender>>,
+			> = VecDeque::with_capacity(2);
+
+			if let Some(backing_group) = backing_group {
+				if let Some(backing_validators) = session_info.validator_groups.get(backing_group) {
+					let mut small_pov_size = true;
+
+					if let RecoveryStrategyKind::BackersFirstIfSizeLower(small_pov_limit) =
+						recovery_strategy_kind
+					{
+						// Get our own chunk size to get an estimate of the PoV size.
+						let chunk_size: Result<Option<usize>, error::Error> =
+							query_chunk_size(ctx, candidate_hash).await;
+						if let Ok(Some(chunk_size)) = chunk_size {
+							let pov_size_estimate =
+								chunk_size.saturating_mul(session_info.validators.len()) / 3;
+							small_pov_size = pov_size_estimate < small_pov_limit;
+
+							gum::trace!(
+								target: LOG_TARGET,
+								?candidate_hash,
+								pov_size_estimate,
+								small_pov_limit,
+								enabled = small_pov_size,
+								"Prefer fetch from backing group",
+							);
+						} else {
+							// we have a POV limit but were not able to query the chunk size, so
+							// don't use the backing group.
+							small_pov_size = false;
+						}
+					};
+
+					match (&recovery_strategy_kind, small_pov_size) {
+						(RecoveryStrategyKind::BackersFirstAlways, _) |
+						(RecoveryStrategyKind::BackersFirstIfSizeLower(_), true) => recovery_strategies.push_back(
+							Box::new(FetchFull::new(FetchFullParams {
+								validators: backing_validators.to_vec(),
+								erasure_task_tx: erasure_task_tx.clone(),
+							})),
+						),
+						_ => {},
+					};
+				}
+			}
+
+			recovery_strategies.push_back(Box::new(FetchChunks::new(FetchChunksParams {
+				n_validators: session_info.validators.len(),
+				erasure_task_tx,
+			})));
+
 			launch_recovery_task(
 				state,
 				ctx,
 				session_info,
 				receipt,
-				backing_group,
 				response_sender,
 				metrics,
-				recovery_strategy,
-				erasure_task_tx,
+				recovery_strategies,
+				bypass_availability_store,
 			)
-			.await,
+			.await
+		},
 		None => {
 			gum::warn!(target: LOG_TARGET, "SessionInfo is `None` at {:?}", state.live_block);
 			response_sender
@@ -1152,13 +527,18 @@ async fn query_chunk_size<Context>(
 
 #[overseer::contextbounds(AvailabilityRecovery, prefix = self::overseer)]
 impl AvailabilityRecoverySubsystem {
-	/// Create a new instance of `AvailabilityRecoverySubsystem` which never requests the  
+	/// Create a new instance of `AvailabilityRecoverySubsystem` which never requests the
 	/// `AvailabilityStoreSubsystem` subsystem.
 	pub fn with_availability_store_skip(
 		req_receiver: IncomingRequestReceiver<request_v1::AvailableDataFetchingRequest>,
 		metrics: Metrics,
 	) -> Self {
-		Self { recovery_strategy: RecoveryStrategy::BypassAvailabilityStore, req_receiver, metrics }
+		Self {
+			recovery_strategy_kind: RecoveryStrategyKind::BackersFirstIfSizeLower(SMALL_POV_LIMIT),
+			bypass_availability_store: true,
+			req_receiver,
+			metrics,
+		}
 	}
 
 	/// Create a new instance of `AvailabilityRecoverySubsystem` which starts with a fast path to
@@ -1167,7 +547,12 @@ impl AvailabilityRecoverySubsystem {
 		req_receiver: IncomingRequestReceiver<request_v1::AvailableDataFetchingRequest>,
 		metrics: Metrics,
 	) -> Self {
-		Self { recovery_strategy: RecoveryStrategy::BackersFirstAlways, req_receiver, metrics }
+		Self {
+			recovery_strategy_kind: RecoveryStrategyKind::BackersFirstAlways,
+			bypass_availability_store: false,
+			req_receiver,
+			metrics,
+		}
 	}
 
 	/// Create a new instance of `AvailabilityRecoverySubsystem` which requests only chunks
@@ -1175,7 +560,12 @@ impl AvailabilityRecoverySubsystem {
 		req_receiver: IncomingRequestReceiver<request_v1::AvailableDataFetchingRequest>,
 		metrics: Metrics,
 	) -> Self {
-		Self { recovery_strategy: RecoveryStrategy::ChunksAlways, req_receiver, metrics }
+		Self {
+			recovery_strategy_kind: RecoveryStrategyKind::ChunksAlways,
+			bypass_availability_store: false,
+			req_receiver,
+			metrics,
+		}
 	}
 
 	/// Create a new instance of `AvailabilityRecoverySubsystem` which requests chunks if PoV is
@@ -1185,7 +575,8 @@ impl AvailabilityRecoverySubsystem {
 		metrics: Metrics,
 	) -> Self {
 		Self {
-			recovery_strategy: RecoveryStrategy::BackersFirstIfSizeLower(SMALL_POV_LIMIT),
+			recovery_strategy_kind: RecoveryStrategyKind::BackersFirstIfSizeLower(SMALL_POV_LIMIT),
+			bypass_availability_store: false,
 			req_receiver,
 			metrics,
 		}
@@ -1193,7 +584,8 @@ impl AvailabilityRecoverySubsystem {
 
 	async fn run<Context>(self, mut ctx: Context) -> SubsystemResult<()> {
 		let mut state = State::default();
-		let Self { recovery_strategy, mut req_receiver, metrics } = self;
+		let Self { mut req_receiver, metrics, recovery_strategy_kind, bypass_availability_store } =
+			self;
 
 		let (erasure_task_tx, erasure_task_rx) = futures::channel::mpsc::channel(16);
 		let mut erasure_task_rx = erasure_task_rx.fuse();
@@ -1278,11 +670,12 @@ impl AvailabilityRecoverySubsystem {
 										&mut ctx,
 										receipt,
 										session_index,
-										maybe_backing_group.filter(|_| recovery_strategy.needs_backing_group()),
+										maybe_backing_group,
 										response_sender,
 										&metrics,
-										&recovery_strategy,
 										erasure_task_tx.clone(),
+										recovery_strategy_kind.clone(),
+										bypass_availability_store
 									).await {
 										gum::warn!(
 											target: LOG_TARGET,
@@ -1298,7 +691,7 @@ impl AvailabilityRecoverySubsystem {
 				in_req = recv_req => {
 					match in_req.into_nested().map_err(|fatal| SubsystemError::with_origin("availability-recovery", fatal))? {
 						Ok(req) => {
-							if recovery_strategy == RecoveryStrategy::BypassAvailabilityStore {
+							if bypass_availability_store {
 								gum::debug!(
 									target: LOG_TARGET,
 									"Skipping request to availability-store.",
@@ -1334,7 +727,7 @@ impl AvailabilityRecoverySubsystem {
 				output = state.ongoing_recoveries.select_next_some() => {
 					if let Some((candidate_hash, result)) = output {
 						if let Ok(recovery) = CachedRecovery::try_from(result) {
-							state.availability_lru.put(candidate_hash, recovery);
+							state.availability_lru.insert(candidate_hash, recovery);
 						}
 					}
 				}
diff --git a/polkadot/node/network/availability-recovery/src/task.rs b/polkadot/node/network/availability-recovery/src/task.rs
new file mode 100644
index 0000000000000000000000000000000000000000..d5bc2da84944a3403f9d4a3bf9d5a11b0e772f40
--- /dev/null
+++ b/polkadot/node/network/availability-recovery/src/task.rs
@@ -0,0 +1,830 @@
+// 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/>.
+
+//! Recovery task and associated strategies.
+
+#![warn(missing_docs)]
+
+use crate::{
+	futures_undead::FuturesUndead, is_chunk_valid, is_unavailable, metrics::Metrics, ErasureTask,
+	LOG_TARGET,
+};
+use futures::{channel::oneshot, SinkExt};
+#[cfg(not(test))]
+use polkadot_node_network_protocol::request_response::CHUNK_REQUEST_TIMEOUT;
+use polkadot_node_network_protocol::request_response::{
+	self as req_res, outgoing::RequestError, OutgoingRequest, Recipient, Requests,
+};
+use polkadot_node_primitives::{AvailableData, ErasureChunk};
+use polkadot_node_subsystem::{
+	messages::{AvailabilityStoreMessage, NetworkBridgeTxMessage},
+	overseer, RecoveryError,
+};
+use polkadot_primitives::{AuthorityDiscoveryId, CandidateHash, Hash, ValidatorIndex};
+use rand::seq::SliceRandom;
+use sc_network::{IfDisconnected, OutboundFailure, RequestFailure};
+use std::{
+	collections::{HashMap, VecDeque},
+	time::Duration,
+};
+
+// How many parallel recovery tasks should be running at once.
+const N_PARALLEL: usize = 50;
+
+/// Time after which we consider a request to have failed
+///
+/// and we should try more peers. Note in theory the request times out at the network level,
+/// measurements have shown, that in practice requests might actually take longer to fail in
+/// certain occasions. (The very least, authority discovery is not part of the timeout.)
+///
+/// For the time being this value is the same as the timeout on the networking layer, but as this
+/// timeout is more soft than the networking one, it might make sense to pick different values as
+/// well.
+#[cfg(not(test))]
+const TIMEOUT_START_NEW_REQUESTS: Duration = CHUNK_REQUEST_TIMEOUT;
+#[cfg(test)]
+const TIMEOUT_START_NEW_REQUESTS: Duration = Duration::from_millis(100);
+
+#[async_trait::async_trait]
+/// Common trait for runnable recovery strategies.
+pub trait RecoveryStrategy<Sender: overseer::AvailabilityRecoverySenderTrait>: Send {
+	/// Main entry point of the strategy.
+	async fn run(
+		&mut self,
+		state: &mut State,
+		sender: &mut Sender,
+		common_params: &RecoveryParams,
+	) -> Result<AvailableData, RecoveryError>;
+
+	/// Return the name of the strategy for logging purposes.
+	fn display_name(&self) -> &'static str;
+}
+
+/// Recovery parameters common to all strategies in a `RecoveryTask`.
+pub struct RecoveryParams {
+	/// Discovery ids of `validators`.
+	pub validator_authority_keys: Vec<AuthorityDiscoveryId>,
+
+	/// Number of validators.
+	pub n_validators: usize,
+
+	/// The number of chunks needed.
+	pub threshold: usize,
+
+	/// A hash of the relevant candidate.
+	pub candidate_hash: CandidateHash,
+
+	/// The root of the erasure encoding of the candidate.
+	pub erasure_root: Hash,
+
+	/// Metrics to report.
+	pub metrics: Metrics,
+
+	/// Do not request data from availability-store. Useful for collators.
+	pub bypass_availability_store: bool,
+}
+
+/// Intermediate/common data that must be passed between `RecoveryStrategy`s belonging to the
+/// same `RecoveryTask`.
+pub struct State {
+	/// Chunks received so far.
+	received_chunks: HashMap<ValidatorIndex, ErasureChunk>,
+}
+
+impl State {
+	fn new() -> Self {
+		Self { received_chunks: HashMap::new() }
+	}
+
+	fn insert_chunk(&mut self, validator: ValidatorIndex, chunk: ErasureChunk) {
+		self.received_chunks.insert(validator, chunk);
+	}
+
+	fn chunk_count(&self) -> usize {
+		self.received_chunks.len()
+	}
+
+	/// Retrieve the local chunks held in the av-store (either 0 or 1).
+	async fn populate_from_av_store<Sender: overseer::AvailabilityRecoverySenderTrait>(
+		&mut self,
+		params: &RecoveryParams,
+		sender: &mut Sender,
+	) -> Vec<ValidatorIndex> {
+		let (tx, rx) = oneshot::channel();
+		sender
+			.send_message(AvailabilityStoreMessage::QueryAllChunks(params.candidate_hash, tx))
+			.await;
+
+		match rx.await {
+			Ok(chunks) => {
+				// This should either be length 1 or 0. If we had the whole data,
+				// we wouldn't have reached this stage.
+				let chunk_indices: Vec<_> = chunks.iter().map(|c| c.index).collect();
+
+				for chunk in chunks {
+					if is_chunk_valid(params, &chunk) {
+						gum::trace!(
+							target: LOG_TARGET,
+							candidate_hash = ?params.candidate_hash,
+							validator_index = ?chunk.index,
+							"Found valid chunk on disk"
+						);
+						self.insert_chunk(chunk.index, chunk);
+					} else {
+						gum::error!(
+							target: LOG_TARGET,
+							"Loaded invalid chunk from disk! Disk/Db corruption _very_ likely - please fix ASAP!"
+						);
+					};
+				}
+
+				chunk_indices
+			},
+			Err(oneshot::Canceled) => {
+				gum::warn!(
+					target: LOG_TARGET,
+					candidate_hash = ?params.candidate_hash,
+					"Failed to reach the availability store"
+				);
+
+				vec![]
+			},
+		}
+	}
+
+	/// Launch chunk requests in parallel, according to the parameters.
+	async fn launch_parallel_chunk_requests<Sender>(
+		&mut self,
+		params: &RecoveryParams,
+		sender: &mut Sender,
+		desired_requests_count: usize,
+		validators: &mut VecDeque<ValidatorIndex>,
+		requesting_chunks: &mut FuturesUndead<
+			Result<Option<ErasureChunk>, (ValidatorIndex, RequestError)>,
+		>,
+	) where
+		Sender: overseer::AvailabilityRecoverySenderTrait,
+	{
+		let candidate_hash = &params.candidate_hash;
+		let already_requesting_count = requesting_chunks.len();
+
+		let mut requests = Vec::with_capacity(desired_requests_count - already_requesting_count);
+
+		while requesting_chunks.len() < desired_requests_count {
+			if let Some(validator_index) = validators.pop_back() {
+				let validator = params.validator_authority_keys[validator_index.0 as usize].clone();
+				gum::trace!(
+					target: LOG_TARGET,
+					?validator,
+					?validator_index,
+					?candidate_hash,
+					"Requesting chunk",
+				);
+
+				// Request data.
+				let raw_request = req_res::v1::ChunkFetchingRequest {
+					candidate_hash: params.candidate_hash,
+					index: validator_index,
+				};
+
+				let (req, res) = OutgoingRequest::new(Recipient::Authority(validator), raw_request);
+				requests.push(Requests::ChunkFetchingV1(req));
+
+				params.metrics.on_chunk_request_issued();
+				let timer = params.metrics.time_chunk_request();
+
+				requesting_chunks.push(Box::pin(async move {
+					let _timer = timer;
+					match res.await {
+						Ok(req_res::v1::ChunkFetchingResponse::Chunk(chunk)) =>
+							Ok(Some(chunk.recombine_into_chunk(&raw_request))),
+						Ok(req_res::v1::ChunkFetchingResponse::NoSuchChunk) => Ok(None),
+						Err(e) => Err((validator_index, e)),
+					}
+				}));
+			} else {
+				break
+			}
+		}
+
+		sender
+			.send_message(NetworkBridgeTxMessage::SendRequests(
+				requests,
+				IfDisconnected::TryConnect,
+			))
+			.await;
+	}
+
+	/// Wait for a sufficient amount of chunks to reconstruct according to the provided `params`.
+	async fn wait_for_chunks(
+		&mut self,
+		params: &RecoveryParams,
+		validators: &mut VecDeque<ValidatorIndex>,
+		requesting_chunks: &mut FuturesUndead<
+			Result<Option<ErasureChunk>, (ValidatorIndex, RequestError)>,
+		>,
+		can_conclude: impl Fn(usize, usize, usize, &RecoveryParams, usize) -> bool,
+	) -> (usize, usize) {
+		let metrics = &params.metrics;
+
+		let mut total_received_responses = 0;
+		let mut error_count = 0;
+
+		// Wait for all current requests to conclude or time-out, or until we reach enough chunks.
+		// We also declare requests undead, once `TIMEOUT_START_NEW_REQUESTS` is reached and will
+		// return in that case for `launch_parallel_requests` to fill up slots again.
+		while let Some(request_result) =
+			requesting_chunks.next_with_timeout(TIMEOUT_START_NEW_REQUESTS).await
+		{
+			total_received_responses += 1;
+
+			match request_result {
+				Ok(Some(chunk)) =>
+					if is_chunk_valid(params, &chunk) {
+						metrics.on_chunk_request_succeeded();
+						gum::trace!(
+							target: LOG_TARGET,
+							candidate_hash = ?params.candidate_hash,
+							validator_index = ?chunk.index,
+							"Received valid chunk",
+						);
+						self.insert_chunk(chunk.index, chunk);
+					} else {
+						metrics.on_chunk_request_invalid();
+						error_count += 1;
+					},
+				Ok(None) => {
+					metrics.on_chunk_request_no_such_chunk();
+					error_count += 1;
+				},
+				Err((validator_index, e)) => {
+					error_count += 1;
+
+					gum::trace!(
+						target: LOG_TARGET,
+						candidate_hash= ?params.candidate_hash,
+						err = ?e,
+						?validator_index,
+						"Failure requesting chunk",
+					);
+
+					match e {
+						RequestError::InvalidResponse(_) => {
+							metrics.on_chunk_request_invalid();
+
+							gum::debug!(
+								target: LOG_TARGET,
+								candidate_hash = ?params.candidate_hash,
+								err = ?e,
+								?validator_index,
+								"Chunk fetching response was invalid",
+							);
+						},
+						RequestError::NetworkError(err) => {
+							// No debug logs on general network errors - that became very spammy
+							// occasionally.
+							if let RequestFailure::Network(OutboundFailure::Timeout) = err {
+								metrics.on_chunk_request_timeout();
+							} else {
+								metrics.on_chunk_request_error();
+							}
+
+							validators.push_front(validator_index);
+						},
+						RequestError::Canceled(_) => {
+							metrics.on_chunk_request_error();
+
+							validators.push_front(validator_index);
+						},
+					}
+				},
+			}
+
+			// Stop waiting for requests when we either can already recover the data
+			// or have gotten firm 'No' responses from enough validators.
+			if can_conclude(
+				validators.len(),
+				requesting_chunks.total_len(),
+				self.chunk_count(),
+				params,
+				error_count,
+			) {
+				gum::debug!(
+					target: LOG_TARGET,
+					candidate_hash = ?params.candidate_hash,
+					received_chunks_count = ?self.chunk_count(),
+					requested_chunks_count = ?requesting_chunks.len(),
+					threshold = ?params.threshold,
+					"Can conclude availability for a candidate",
+				);
+				break
+			}
+		}
+
+		(total_received_responses, error_count)
+	}
+}
+
+/// A stateful reconstruction of availability data in reference to
+/// a candidate hash.
+pub struct RecoveryTask<Sender: overseer::AvailabilityRecoverySenderTrait> {
+	sender: Sender,
+	params: RecoveryParams,
+	strategies: VecDeque<Box<dyn RecoveryStrategy<Sender>>>,
+	state: State,
+}
+
+impl<Sender> RecoveryTask<Sender>
+where
+	Sender: overseer::AvailabilityRecoverySenderTrait,
+{
+	/// Instantiate a new recovery task.
+	pub fn new(
+		sender: Sender,
+		params: RecoveryParams,
+		strategies: VecDeque<Box<dyn RecoveryStrategy<Sender>>>,
+	) -> Self {
+		Self { sender, params, strategies, state: State::new() }
+	}
+
+	async fn in_availability_store(&mut self) -> Option<AvailableData> {
+		if !self.params.bypass_availability_store {
+			let (tx, rx) = oneshot::channel();
+			self.sender
+				.send_message(AvailabilityStoreMessage::QueryAvailableData(
+					self.params.candidate_hash,
+					tx,
+				))
+				.await;
+
+			match rx.await {
+				Ok(Some(data)) => return Some(data),
+				Ok(None) => {},
+				Err(oneshot::Canceled) => {
+					gum::warn!(
+						target: LOG_TARGET,
+						candidate_hash = ?self.params.candidate_hash,
+						"Failed to reach the availability store",
+					)
+				},
+			}
+		}
+
+		None
+	}
+
+	/// Run this recovery task to completion. It will loop through the configured strategies
+	/// in-order and return whenever the first one recovers the full `AvailableData`.
+	pub async fn run(mut self) -> Result<AvailableData, RecoveryError> {
+		if let Some(data) = self.in_availability_store().await {
+			return Ok(data)
+		}
+
+		self.params.metrics.on_recovery_started();
+
+		let _timer = self.params.metrics.time_full_recovery();
+
+		while let Some(mut current_strategy) = self.strategies.pop_front() {
+			gum::debug!(
+				target: LOG_TARGET,
+				candidate_hash = ?self.params.candidate_hash,
+				"Starting `{}` strategy",
+				current_strategy.display_name(),
+			);
+
+			let res = current_strategy.run(&mut self.state, &mut self.sender, &self.params).await;
+
+			match res {
+				Err(RecoveryError::Unavailable) =>
+					if self.strategies.front().is_some() {
+						gum::debug!(
+							target: LOG_TARGET,
+							candidate_hash = ?self.params.candidate_hash,
+							"Recovery strategy `{}` did not conclude. Trying the next one.",
+							current_strategy.display_name(),
+						);
+						continue
+					},
+				Err(err) => {
+					match &err {
+						RecoveryError::Invalid => self.params.metrics.on_recovery_invalid(),
+						_ => self.params.metrics.on_recovery_failed(),
+					}
+					return Err(err)
+				},
+				Ok(data) => {
+					self.params.metrics.on_recovery_succeeded();
+					return Ok(data)
+				},
+			}
+		}
+
+		// We have no other strategies to try.
+		gum::warn!(
+			target: LOG_TARGET,
+			candidate_hash = ?self.params.candidate_hash,
+			"Recovery of available data failed.",
+		);
+		self.params.metrics.on_recovery_failed();
+
+		Err(RecoveryError::Unavailable)
+	}
+}
+
+/// `RecoveryStrategy` that sequentially tries to fetch the full `AvailableData` from
+/// already-connected validators in the configured validator set.
+pub struct FetchFull {
+	params: FetchFullParams,
+}
+
+pub struct FetchFullParams {
+	/// Validators that will be used for fetching the data.
+	pub validators: Vec<ValidatorIndex>,
+	/// Channel to the erasure task handler.
+	pub erasure_task_tx: futures::channel::mpsc::Sender<ErasureTask>,
+}
+
+impl FetchFull {
+	/// Create a new `FetchFull` recovery strategy.
+	pub fn new(mut params: FetchFullParams) -> Self {
+		params.validators.shuffle(&mut rand::thread_rng());
+		Self { params }
+	}
+}
+
+#[async_trait::async_trait]
+impl<Sender: overseer::AvailabilityRecoverySenderTrait> RecoveryStrategy<Sender> for FetchFull {
+	fn display_name(&self) -> &'static str {
+		"Full recovery from backers"
+	}
+
+	async fn run(
+		&mut self,
+		_: &mut State,
+		sender: &mut Sender,
+		common_params: &RecoveryParams,
+	) -> Result<AvailableData, RecoveryError> {
+		loop {
+			// Pop the next validator, and proceed to next fetch_chunks_task if we're out.
+			let validator_index =
+				self.params.validators.pop().ok_or_else(|| RecoveryError::Unavailable)?;
+
+			// Request data.
+			let (req, response) = OutgoingRequest::new(
+				Recipient::Authority(
+					common_params.validator_authority_keys[validator_index.0 as usize].clone(),
+				),
+				req_res::v1::AvailableDataFetchingRequest {
+					candidate_hash: common_params.candidate_hash,
+				},
+			);
+
+			sender
+				.send_message(NetworkBridgeTxMessage::SendRequests(
+					vec![Requests::AvailableDataFetchingV1(req)],
+					IfDisconnected::ImmediateError,
+				))
+				.await;
+
+			match response.await {
+				Ok(req_res::v1::AvailableDataFetchingResponse::AvailableData(data)) => {
+					let (reencode_tx, reencode_rx) = oneshot::channel();
+					self.params
+						.erasure_task_tx
+						.send(ErasureTask::Reencode(
+							common_params.n_validators,
+							common_params.erasure_root,
+							data,
+							reencode_tx,
+						))
+						.await
+						.map_err(|_| RecoveryError::ChannelClosed)?;
+
+					let reencode_response =
+						reencode_rx.await.map_err(|_| RecoveryError::ChannelClosed)?;
+
+					if let Some(data) = reencode_response {
+						gum::trace!(
+							target: LOG_TARGET,
+							candidate_hash = ?common_params.candidate_hash,
+							"Received full data",
+						);
+
+						return Ok(data)
+					} else {
+						gum::debug!(
+							target: LOG_TARGET,
+							candidate_hash = ?common_params.candidate_hash,
+							?validator_index,
+							"Invalid data response",
+						);
+
+						// it doesn't help to report the peer with req/res.
+					}
+				},
+				Ok(req_res::v1::AvailableDataFetchingResponse::NoSuchData) => {},
+				Err(e) => gum::debug!(
+					target: LOG_TARGET,
+					candidate_hash = ?common_params.candidate_hash,
+					?validator_index,
+					err = ?e,
+					"Error fetching full available data."
+				),
+			}
+		}
+	}
+}
+
+/// `RecoveryStrategy` that requests chunks from validators, in parallel.
+pub struct FetchChunks {
+	/// How many requests have been unsuccessful so far.
+	error_count: usize,
+	/// Total number of responses that have been received, including failed ones.
+	total_received_responses: usize,
+	/// Collection of in-flight requests.
+	requesting_chunks: FuturesUndead<Result<Option<ErasureChunk>, (ValidatorIndex, RequestError)>>,
+	/// A random shuffling of the validators which indicates the order in which we connect to the
+	/// validators and request the chunk from them.
+	validators: VecDeque<ValidatorIndex>,
+	/// Channel to the erasure task handler.
+	erasure_task_tx: futures::channel::mpsc::Sender<ErasureTask>,
+}
+
+/// Parameters specific to the `FetchChunks` strategy.
+pub struct FetchChunksParams {
+	/// Total number of validators.
+	pub n_validators: usize,
+	/// Channel to the erasure task handler.
+	pub erasure_task_tx: futures::channel::mpsc::Sender<ErasureTask>,
+}
+
+impl FetchChunks {
+	/// Instantiate a new strategy.
+	pub fn new(params: FetchChunksParams) -> Self {
+		let mut shuffling: Vec<_> = (0..params.n_validators)
+			.map(|i| ValidatorIndex(i.try_into().expect("number of validators must fit in a u32")))
+			.collect();
+		shuffling.shuffle(&mut rand::thread_rng());
+
+		Self {
+			error_count: 0,
+			total_received_responses: 0,
+			requesting_chunks: FuturesUndead::new(),
+			validators: shuffling.into(),
+			erasure_task_tx: params.erasure_task_tx,
+		}
+	}
+
+	fn is_unavailable(
+		unrequested_validators: usize,
+		in_flight_requests: usize,
+		chunk_count: usize,
+		threshold: usize,
+	) -> bool {
+		is_unavailable(chunk_count, in_flight_requests, unrequested_validators, threshold)
+	}
+
+	/// Desired number of parallel requests.
+	///
+	/// For the given threshold (total required number of chunks) get the desired number of
+	/// requests we want to have running in parallel at this time.
+	fn get_desired_request_count(&self, chunk_count: usize, threshold: usize) -> usize {
+		// Upper bound for parallel requests.
+		// We want to limit this, so requests can be processed within the timeout and we limit the
+		// following feedback loop:
+		// 1. Requests fail due to timeout
+		// 2. We request more chunks to make up for it
+		// 3. Bandwidth is spread out even more, so we get even more timeouts
+		// 4. We request more chunks to make up for it ...
+		let max_requests_boundary = std::cmp::min(N_PARALLEL, threshold);
+		// How many chunks are still needed?
+		let remaining_chunks = threshold.saturating_sub(chunk_count);
+		// What is the current error rate, so we can make up for it?
+		let inv_error_rate =
+			self.total_received_responses.checked_div(self.error_count).unwrap_or(0);
+		// Actual number of requests we want to have in flight in parallel:
+		std::cmp::min(
+			max_requests_boundary,
+			remaining_chunks + remaining_chunks.checked_div(inv_error_rate).unwrap_or(0),
+		)
+	}
+
+	async fn attempt_recovery(
+		&mut self,
+		state: &mut State,
+		common_params: &RecoveryParams,
+	) -> Result<AvailableData, RecoveryError> {
+		let recovery_duration = common_params.metrics.time_erasure_recovery();
+
+		// Send request to reconstruct available data from chunks.
+		let (avilable_data_tx, available_data_rx) = oneshot::channel();
+		self.erasure_task_tx
+			.send(ErasureTask::Reconstruct(
+				common_params.n_validators,
+				// Safe to leave an empty vec in place, as we're stopping the recovery process if
+				// this reconstruct fails.
+				std::mem::take(&mut state.received_chunks),
+				avilable_data_tx,
+			))
+			.await
+			.map_err(|_| RecoveryError::ChannelClosed)?;
+
+		let available_data_response =
+			available_data_rx.await.map_err(|_| RecoveryError::ChannelClosed)?;
+
+		match available_data_response {
+			Ok(data) => {
+				// Send request to re-encode the chunks and check merkle root.
+				let (reencode_tx, reencode_rx) = oneshot::channel();
+				self.erasure_task_tx
+					.send(ErasureTask::Reencode(
+						common_params.n_validators,
+						common_params.erasure_root,
+						data,
+						reencode_tx,
+					))
+					.await
+					.map_err(|_| RecoveryError::ChannelClosed)?;
+
+				let reencode_response =
+					reencode_rx.await.map_err(|_| RecoveryError::ChannelClosed)?;
+
+				if let Some(data) = reencode_response {
+					gum::trace!(
+						target: LOG_TARGET,
+						candidate_hash = ?common_params.candidate_hash,
+						erasure_root = ?common_params.erasure_root,
+						"Data recovery from chunks complete",
+					);
+
+					Ok(data)
+				} else {
+					recovery_duration.map(|rd| rd.stop_and_discard());
+					gum::trace!(
+						target: LOG_TARGET,
+						candidate_hash = ?common_params.candidate_hash,
+						erasure_root = ?common_params.erasure_root,
+						"Data recovery error - root mismatch",
+					);
+
+					Err(RecoveryError::Invalid)
+				}
+			},
+			Err(err) => {
+				recovery_duration.map(|rd| rd.stop_and_discard());
+				gum::trace!(
+					target: LOG_TARGET,
+					candidate_hash = ?common_params.candidate_hash,
+					erasure_root = ?common_params.erasure_root,
+					?err,
+					"Data recovery error ",
+				);
+
+				Err(RecoveryError::Invalid)
+			},
+		}
+	}
+}
+
+#[async_trait::async_trait]
+impl<Sender: overseer::AvailabilityRecoverySenderTrait> RecoveryStrategy<Sender> for FetchChunks {
+	fn display_name(&self) -> &'static str {
+		"Fetch chunks"
+	}
+
+	async fn run(
+		&mut self,
+		state: &mut State,
+		sender: &mut Sender,
+		common_params: &RecoveryParams,
+	) -> Result<AvailableData, RecoveryError> {
+		// First query the store for any chunks we've got.
+		if !common_params.bypass_availability_store {
+			let local_chunk_indices = state.populate_from_av_store(common_params, sender).await;
+			self.validators.retain(|i| !local_chunk_indices.contains(i));
+		}
+
+		// No need to query the validators that have the chunks we already received.
+		self.validators.retain(|i| !state.received_chunks.contains_key(i));
+
+		loop {
+			// If received_chunks has more than threshold entries, attempt to recover the data.
+			// If that fails, or a re-encoding of it doesn't match the expected erasure root,
+			// return Err(RecoveryError::Invalid).
+			// Do this before requesting any chunks because we may have enough of them coming from
+			// past RecoveryStrategies.
+			if state.chunk_count() >= common_params.threshold {
+				return self.attempt_recovery(state, common_params).await
+			}
+
+			if Self::is_unavailable(
+				self.validators.len(),
+				self.requesting_chunks.total_len(),
+				state.chunk_count(),
+				common_params.threshold,
+			) {
+				gum::debug!(
+					target: LOG_TARGET,
+					candidate_hash = ?common_params.candidate_hash,
+					erasure_root = ?common_params.erasure_root,
+					received = %state.chunk_count(),
+					requesting = %self.requesting_chunks.len(),
+					total_requesting = %self.requesting_chunks.total_len(),
+					n_validators = %common_params.n_validators,
+					"Data recovery from chunks is not possible",
+				);
+
+				return Err(RecoveryError::Unavailable)
+			}
+
+			let desired_requests_count =
+				self.get_desired_request_count(state.chunk_count(), common_params.threshold);
+			let already_requesting_count = self.requesting_chunks.len();
+			gum::debug!(
+				target: LOG_TARGET,
+				?common_params.candidate_hash,
+				?desired_requests_count,
+				error_count= ?self.error_count,
+				total_received = ?self.total_received_responses,
+				threshold = ?common_params.threshold,
+				?already_requesting_count,
+				"Requesting availability chunks for a candidate",
+			);
+			state
+				.launch_parallel_chunk_requests(
+					common_params,
+					sender,
+					desired_requests_count,
+					&mut self.validators,
+					&mut self.requesting_chunks,
+				)
+				.await;
+
+			let (total_responses, error_count) = state
+				.wait_for_chunks(
+					common_params,
+					&mut self.validators,
+					&mut self.requesting_chunks,
+					|unrequested_validators, reqs, chunk_count, params, _error_count| {
+						chunk_count >= params.threshold ||
+							Self::is_unavailable(
+								unrequested_validators,
+								reqs,
+								chunk_count,
+								params.threshold,
+							)
+					},
+				)
+				.await;
+
+			self.total_received_responses += total_responses;
+			self.error_count += error_count;
+		}
+	}
+}
+
+#[cfg(test)]
+mod tests {
+	use super::*;
+	use polkadot_erasure_coding::recovery_threshold;
+
+	#[test]
+	fn parallel_request_calculation_works_as_expected() {
+		let num_validators = 100;
+		let threshold = recovery_threshold(num_validators).unwrap();
+		let (erasure_task_tx, _erasure_task_rx) = futures::channel::mpsc::channel(16);
+
+		let mut fetch_chunks_task =
+			FetchChunks::new(FetchChunksParams { n_validators: 100, erasure_task_tx });
+		assert_eq!(fetch_chunks_task.get_desired_request_count(0, threshold), threshold);
+		fetch_chunks_task.error_count = 1;
+		fetch_chunks_task.total_received_responses = 1;
+		// We saturate at threshold (34):
+		assert_eq!(fetch_chunks_task.get_desired_request_count(0, threshold), threshold);
+
+		fetch_chunks_task.total_received_responses = 2;
+		// With given error rate - still saturating:
+		assert_eq!(fetch_chunks_task.get_desired_request_count(1, threshold), threshold);
+		fetch_chunks_task.total_received_responses += 8;
+		// error rate: 1/10
+		// remaining chunks needed: threshold (34) - 9
+		// expected: 24 * (1+ 1/10) = (next greater integer) = 27
+		assert_eq!(fetch_chunks_task.get_desired_request_count(9, threshold), 27);
+		fetch_chunks_task.error_count = 0;
+		// With error count zero - we should fetch exactly as needed:
+		assert_eq!(fetch_chunks_task.get_desired_request_count(10, threshold), threshold - 10);
+	}
+}
diff --git a/polkadot/node/network/availability-recovery/src/tests.rs b/polkadot/node/network/availability-recovery/src/tests.rs
index de923f5967e5fd919d76ede2fc38e69d25f160e7..63ccf0e94f91ebad2a8cba3158d6db24159683c0 100644
--- a/polkadot/node/network/availability-recovery/src/tests.rs
+++ b/polkadot/node/network/availability-recovery/src/tests.rs
@@ -21,20 +21,22 @@ use futures::{executor, future};
 use futures_timer::Delay;
 
 use parity_scale_codec::Encode;
-use polkadot_node_network_protocol::request_response::{IncomingRequest, ReqProtocolNames};
+use polkadot_node_network_protocol::request_response::{
+	self as req_res, IncomingRequest, Recipient, ReqProtocolNames, Requests,
+};
 
 use super::*;
 
-use sc_network::config::RequestResponseConfig;
+use sc_network::{config::RequestResponseConfig, IfDisconnected, OutboundFailure, RequestFailure};
 
 use polkadot_erasure_coding::{branches, obtain_chunks_v1 as obtain_chunks};
 use polkadot_node_primitives::{BlockData, PoV, Proof};
-use polkadot_node_subsystem::{
-	jaeger,
-	messages::{AllMessages, RuntimeApiMessage, RuntimeApiRequest},
-	ActivatedLeaf, LeafStatus,
+use polkadot_node_subsystem::messages::{
+	AllMessages, NetworkBridgeTxMessage, RuntimeApiMessage, RuntimeApiRequest,
+};
+use polkadot_node_subsystem_test_helpers::{
+	make_subsystem_context, mock::new_leaf, TestSubsystemContextHandle,
 };
-use polkadot_node_subsystem_test_helpers::{make_subsystem_context, TestSubsystemContextHandle};
 use polkadot_node_subsystem_util::TimeoutExt;
 use polkadot_primitives::{
 	AuthorityDiscoveryId, Hash, HeadData, IndexedVec, PersistedValidationData, ValidatorId,
@@ -206,7 +208,7 @@ use sp_keyring::Sr25519Keyring;
 enum Has {
 	No,
 	Yes,
-	NetworkError(sc_network::RequestFailure),
+	NetworkError(RequestFailure),
 	/// Make request not return at all, instead the sender is returned from the function.
 	///
 	/// Note, if you use `DoesNotReturn` you have to keep the returned senders alive, otherwise the
@@ -216,7 +218,7 @@ enum Has {
 
 impl Has {
 	fn timeout() -> Self {
-		Has::NetworkError(sc_network::RequestFailure::Network(sc_network::OutboundFailure::Timeout))
+		Has::NetworkError(RequestFailure::Network(OutboundFailure::Timeout))
 	}
 }
 
@@ -395,7 +397,7 @@ impl TestState {
 		candidate_hash: CandidateHash,
 		virtual_overseer: &mut VirtualOverseer,
 		who_has: impl Fn(usize) -> Has,
-	) -> Vec<oneshot::Sender<std::result::Result<Vec<u8>, sc_network::RequestFailure>>> {
+	) -> Vec<oneshot::Sender<std::result::Result<Vec<u8>, RequestFailure>>> {
 		let mut senders = Vec::new();
 		for _ in 0..self.validators.len() {
 			// Receive a request for a chunk.
@@ -561,12 +563,10 @@ fn availability_is_recovered_from_chunks_if_no_group_provided() {
 	test_harness_fast_path(|mut virtual_overseer, req_cfg| async move {
 		overseer_signal(
 			&mut virtual_overseer,
-			OverseerSignal::ActiveLeaves(ActiveLeavesUpdate::start_work(ActivatedLeaf {
-				hash: test_state.current,
-				number: 1,
-				status: LeafStatus::Fresh,
-				span: Arc::new(jaeger::Span::Disabled),
-			})),
+			OverseerSignal::ActiveLeaves(ActiveLeavesUpdate::start_work(new_leaf(
+				test_state.current,
+				1,
+			))),
 		)
 		.await;
 
@@ -647,12 +647,10 @@ fn availability_is_recovered_from_chunks_even_if_backing_group_supplied_if_chunk
 	test_harness_chunks_only(|mut virtual_overseer, req_cfg| async move {
 		overseer_signal(
 			&mut virtual_overseer,
-			OverseerSignal::ActiveLeaves(ActiveLeavesUpdate::start_work(ActivatedLeaf {
-				hash: test_state.current,
-				number: 1,
-				status: LeafStatus::Fresh,
-				span: Arc::new(jaeger::Span::Disabled),
-			})),
+			OverseerSignal::ActiveLeaves(ActiveLeavesUpdate::start_work(new_leaf(
+				test_state.current,
+				1,
+			))),
 		)
 		.await;
 
@@ -733,12 +731,10 @@ fn bad_merkle_path_leads_to_recovery_error() {
 	test_harness_fast_path(|mut virtual_overseer, req_cfg| async move {
 		overseer_signal(
 			&mut virtual_overseer,
-			OverseerSignal::ActiveLeaves(ActiveLeavesUpdate::start_work(ActivatedLeaf {
-				hash: test_state.current,
-				number: 1,
-				status: LeafStatus::Fresh,
-				span: Arc::new(jaeger::Span::Disabled),
-			})),
+			OverseerSignal::ActiveLeaves(ActiveLeavesUpdate::start_work(new_leaf(
+				test_state.current,
+				1,
+			))),
 		)
 		.await;
 
@@ -791,12 +787,10 @@ fn wrong_chunk_index_leads_to_recovery_error() {
 	test_harness_fast_path(|mut virtual_overseer, req_cfg| async move {
 		overseer_signal(
 			&mut virtual_overseer,
-			OverseerSignal::ActiveLeaves(ActiveLeavesUpdate::start_work(ActivatedLeaf {
-				hash: test_state.current,
-				number: 1,
-				status: LeafStatus::Fresh,
-				span: Arc::new(jaeger::Span::Disabled),
-			})),
+			OverseerSignal::ActiveLeaves(ActiveLeavesUpdate::start_work(new_leaf(
+				test_state.current,
+				1,
+			))),
 		)
 		.await;
 
@@ -865,12 +859,10 @@ fn invalid_erasure_coding_leads_to_invalid_error() {
 
 		overseer_signal(
 			&mut virtual_overseer,
-			OverseerSignal::ActiveLeaves(ActiveLeavesUpdate::start_work(ActivatedLeaf {
-				hash: test_state.current,
-				number: 1,
-				status: LeafStatus::Fresh,
-				span: Arc::new(jaeger::Span::Disabled),
-			})),
+			OverseerSignal::ActiveLeaves(ActiveLeavesUpdate::start_work(new_leaf(
+				test_state.current,
+				1,
+			))),
 		)
 		.await;
 
@@ -914,12 +906,10 @@ fn fast_path_backing_group_recovers() {
 	test_harness_fast_path(|mut virtual_overseer, req_cfg| async move {
 		overseer_signal(
 			&mut virtual_overseer,
-			OverseerSignal::ActiveLeaves(ActiveLeavesUpdate::start_work(ActivatedLeaf {
-				hash: test_state.current,
-				number: 1,
-				status: LeafStatus::Fresh,
-				span: Arc::new(jaeger::Span::Disabled),
-			})),
+			OverseerSignal::ActiveLeaves(ActiveLeavesUpdate::start_work(new_leaf(
+				test_state.current,
+				1,
+			))),
 		)
 		.await;
 
@@ -964,12 +954,10 @@ fn recovers_from_only_chunks_if_pov_large() {
 	test_harness_chunks_if_pov_large(|mut virtual_overseer, req_cfg| async move {
 		overseer_signal(
 			&mut virtual_overseer,
-			OverseerSignal::ActiveLeaves(ActiveLeavesUpdate::start_work(ActivatedLeaf {
-				hash: test_state.current,
-				number: 1,
-				status: LeafStatus::Fresh,
-				span: Arc::new(jaeger::Span::Disabled),
-			})),
+			OverseerSignal::ActiveLeaves(ActiveLeavesUpdate::start_work(new_leaf(
+				test_state.current,
+				1,
+			))),
 		)
 		.await;
 
@@ -1026,7 +1014,7 @@ fn recovers_from_only_chunks_if_pov_large() {
 			AvailabilityRecoveryMessage::RecoverAvailableData(
 				new_candidate.clone(),
 				test_state.session_index,
-				None,
+				Some(GroupIndex(0)),
 				tx,
 			),
 		)
@@ -1068,12 +1056,10 @@ fn fast_path_backing_group_recovers_if_pov_small() {
 	test_harness_chunks_if_pov_large(|mut virtual_overseer, req_cfg| async move {
 		overseer_signal(
 			&mut virtual_overseer,
-			OverseerSignal::ActiveLeaves(ActiveLeavesUpdate::start_work(ActivatedLeaf {
-				hash: test_state.current,
-				number: 1,
-				status: LeafStatus::Fresh,
-				span: Arc::new(jaeger::Span::Disabled),
-			})),
+			OverseerSignal::ActiveLeaves(ActiveLeavesUpdate::start_work(new_leaf(
+				test_state.current,
+				1,
+			))),
 		)
 		.await;
 
@@ -1127,12 +1113,10 @@ fn no_answers_in_fast_path_causes_chunk_requests() {
 	test_harness_fast_path(|mut virtual_overseer, req_cfg| async move {
 		overseer_signal(
 			&mut virtual_overseer,
-			OverseerSignal::ActiveLeaves(ActiveLeavesUpdate::start_work(ActivatedLeaf {
-				hash: test_state.current,
-				number: 1,
-				status: LeafStatus::Fresh,
-				span: Arc::new(jaeger::Span::Disabled),
-			})),
+			OverseerSignal::ActiveLeaves(ActiveLeavesUpdate::start_work(new_leaf(
+				test_state.current,
+				1,
+			))),
 		)
 		.await;
 
@@ -1189,12 +1173,10 @@ fn task_canceled_when_receivers_dropped() {
 	test_harness_chunks_only(|mut virtual_overseer, req_cfg| async move {
 		overseer_signal(
 			&mut virtual_overseer,
-			OverseerSignal::ActiveLeaves(ActiveLeavesUpdate::start_work(ActivatedLeaf {
-				hash: test_state.current,
-				number: 1,
-				status: LeafStatus::Fresh,
-				span: Arc::new(jaeger::Span::Disabled),
-			})),
+			OverseerSignal::ActiveLeaves(ActiveLeavesUpdate::start_work(new_leaf(
+				test_state.current,
+				1,
+			))),
 		)
 		.await;
 
@@ -1231,12 +1213,10 @@ fn chunks_retry_until_all_nodes_respond() {
 	test_harness_chunks_only(|mut virtual_overseer, req_cfg| async move {
 		overseer_signal(
 			&mut virtual_overseer,
-			OverseerSignal::ActiveLeaves(ActiveLeavesUpdate::start_work(ActivatedLeaf {
-				hash: test_state.current,
-				number: 1,
-				status: LeafStatus::Fresh,
-				span: Arc::new(jaeger::Span::Disabled),
-			})),
+			OverseerSignal::ActiveLeaves(ActiveLeavesUpdate::start_work(new_leaf(
+				test_state.current,
+				1,
+			))),
 		)
 		.await;
 
@@ -1292,12 +1272,10 @@ fn not_returning_requests_wont_stall_retrieval() {
 	test_harness_chunks_only(|mut virtual_overseer, req_cfg| async move {
 		overseer_signal(
 			&mut virtual_overseer,
-			OverseerSignal::ActiveLeaves(ActiveLeavesUpdate::start_work(ActivatedLeaf {
-				hash: test_state.current,
-				number: 1,
-				status: LeafStatus::Fresh,
-				span: Arc::new(jaeger::Span::Disabled),
-			})),
+			OverseerSignal::ActiveLeaves(ActiveLeavesUpdate::start_work(new_leaf(
+				test_state.current,
+				1,
+			))),
 		)
 		.await;
 
@@ -1364,12 +1342,10 @@ fn all_not_returning_requests_still_recovers_on_return() {
 	test_harness_chunks_only(|mut virtual_overseer, req_cfg| async move {
 		overseer_signal(
 			&mut virtual_overseer,
-			OverseerSignal::ActiveLeaves(ActiveLeavesUpdate::start_work(ActivatedLeaf {
-				hash: test_state.current,
-				number: 1,
-				status: LeafStatus::Fresh,
-				span: Arc::new(jaeger::Span::Disabled),
-			})),
+			OverseerSignal::ActiveLeaves(ActiveLeavesUpdate::start_work(new_leaf(
+				test_state.current,
+				1,
+			))),
 		)
 		.await;
 
@@ -1441,12 +1417,10 @@ fn returns_early_if_we_have_the_data() {
 	test_harness_chunks_only(|mut virtual_overseer, req_cfg| async move {
 		overseer_signal(
 			&mut virtual_overseer,
-			OverseerSignal::ActiveLeaves(ActiveLeavesUpdate::start_work(ActivatedLeaf {
-				hash: test_state.current,
-				number: 1,
-				status: LeafStatus::Fresh,
-				span: Arc::new(jaeger::Span::Disabled),
-			})),
+			OverseerSignal::ActiveLeaves(ActiveLeavesUpdate::start_work(new_leaf(
+				test_state.current,
+				1,
+			))),
 		)
 		.await;
 
@@ -1478,12 +1452,10 @@ fn does_not_query_local_validator() {
 	test_harness_chunks_only(|mut virtual_overseer, req_cfg| async move {
 		overseer_signal(
 			&mut virtual_overseer,
-			OverseerSignal::ActiveLeaves(ActiveLeavesUpdate::start_work(ActivatedLeaf {
-				hash: test_state.current,
-				number: 1,
-				status: LeafStatus::Fresh,
-				span: Arc::new(jaeger::Span::Disabled),
-			})),
+			OverseerSignal::ActiveLeaves(ActiveLeavesUpdate::start_work(new_leaf(
+				test_state.current,
+				1,
+			))),
 		)
 		.await;
 
@@ -1537,12 +1509,10 @@ fn invalid_local_chunk_is_ignored() {
 	test_harness_chunks_only(|mut virtual_overseer, req_cfg| async move {
 		overseer_signal(
 			&mut virtual_overseer,
-			OverseerSignal::ActiveLeaves(ActiveLeavesUpdate::start_work(ActivatedLeaf {
-				hash: test_state.current,
-				number: 1,
-				status: LeafStatus::Fresh,
-				span: Arc::new(jaeger::Span::Disabled),
-			})),
+			OverseerSignal::ActiveLeaves(ActiveLeavesUpdate::start_work(new_leaf(
+				test_state.current,
+				1,
+			))),
 		)
 		.await;
 
@@ -1580,36 +1550,3 @@ fn invalid_local_chunk_is_ignored() {
 		(virtual_overseer, req_cfg)
 	});
 }
-
-#[test]
-fn parallel_request_calculation_works_as_expected() {
-	let num_validators = 100;
-	let threshold = recovery_threshold(num_validators).unwrap();
-	let (erasure_task_tx, _erasure_task_rx) = futures::channel::mpsc::channel(16);
-
-	let mut phase = RequestChunksFromValidators::new(100, erasure_task_tx);
-	assert_eq!(phase.get_desired_request_count(threshold), threshold);
-	phase.error_count = 1;
-	phase.total_received_responses = 1;
-	// We saturate at threshold (34):
-	assert_eq!(phase.get_desired_request_count(threshold), threshold);
-
-	let dummy_chunk =
-		ErasureChunk { chunk: Vec::new(), index: ValidatorIndex(0), proof: Proof::dummy_proof() };
-	phase.insert_chunk(ValidatorIndex(0), dummy_chunk.clone());
-	phase.total_received_responses = 2;
-	// With given error rate - still saturating:
-	assert_eq!(phase.get_desired_request_count(threshold), threshold);
-	for i in 1..9 {
-		phase.insert_chunk(ValidatorIndex(i), dummy_chunk.clone());
-	}
-	phase.total_received_responses += 8;
-	// error rate: 1/10
-	// remaining chunks needed: threshold (34) - 9
-	// expected: 24 * (1+ 1/10) = (next greater integer) = 27
-	assert_eq!(phase.get_desired_request_count(threshold), 27);
-	phase.insert_chunk(ValidatorIndex(9), dummy_chunk.clone());
-	phase.error_count = 0;
-	// With error count zero - we should fetch exactly as needed:
-	assert_eq!(phase.get_desired_request_count(threshold), threshold - phase.chunk_count());
-}
diff --git a/polkadot/node/network/bitfield-distribution/Cargo.toml b/polkadot/node/network/bitfield-distribution/Cargo.toml
index ff5b5c267a87d8f699d728f310ff6f7a3c5ff7aa..32b0ba2545e69159c1abf6cbe336de84218ca79d 100644
--- a/polkadot/node/network/bitfield-distribution/Cargo.toml
+++ b/polkadot/node/network/bitfield-distribution/Cargo.toml
@@ -1,6 +1,6 @@
 [package]
 name = "polkadot-availability-bitfield-distribution"
-version.workspace = true
+version = "1.0.0"
 authors.workspace = true
 edition.workspace = true
 license.workspace = true
diff --git a/polkadot/node/network/bitfield-distribution/src/lib.rs b/polkadot/node/network/bitfield-distribution/src/lib.rs
index c85d874bc4db6edad95d15cdfcdd01820948b0bc..68e381ab6be51d65e4ed0a45eb971b84089cb62e 100644
--- a/polkadot/node/network/bitfield-distribution/src/lib.rs
+++ b/polkadot/node/network/bitfield-distribution/src/lib.rs
@@ -31,8 +31,8 @@ use polkadot_node_network_protocol::{
 		GridNeighbors, RandomRouting, RequiredRouting, SessionBoundGridTopologyStorage,
 	},
 	peer_set::{ProtocolVersion, ValidationVersion},
-	v1 as protocol_v1, vstaging as protocol_vstaging, OurView, PeerId,
-	UnifiedReputationChange as Rep, Versioned, View,
+	v1 as protocol_v1, v2 as protocol_v2, OurView, PeerId, UnifiedReputationChange as Rep,
+	Versioned, View,
 };
 use polkadot_node_subsystem::{
 	jaeger, messages::*, overseer, ActiveLeavesUpdate, FromOrchestra, OverseerSignal, PerLeafSpan,
@@ -96,8 +96,8 @@ impl BitfieldGossipMessage {
 					self.relay_parent,
 					self.signed_availability.into(),
 				)),
-			Some(ValidationVersion::VStaging) =>
-				Versioned::VStaging(protocol_vstaging::BitfieldDistributionMessage::Bitfield(
+			Some(ValidationVersion::V2) =>
+				Versioned::V2(protocol_v2::BitfieldDistributionMessage::Bitfield(
 					self.relay_parent,
 					self.signed_availability.into(),
 				)),
@@ -502,8 +502,7 @@ async fn relay_message<Context>(
 		};
 
 		let v1_interested_peers = filter_by_version(&interested_peers, ValidationVersion::V1);
-		let vstaging_interested_peers =
-			filter_by_version(&interested_peers, ValidationVersion::VStaging);
+		let v2_interested_peers = filter_by_version(&interested_peers, ValidationVersion::V2);
 
 		if !v1_interested_peers.is_empty() {
 			ctx.send_message(NetworkBridgeTxMessage::SendValidationMessage(
@@ -513,10 +512,10 @@ async fn relay_message<Context>(
 			.await;
 		}
 
-		if !vstaging_interested_peers.is_empty() {
+		if !v2_interested_peers.is_empty() {
 			ctx.send_message(NetworkBridgeTxMessage::SendValidationMessage(
-				vstaging_interested_peers,
-				message.into_validation_protocol(ValidationVersion::VStaging.into()),
+				v2_interested_peers,
+				message.into_validation_protocol(ValidationVersion::V2.into()),
 			))
 			.await
 		}
@@ -538,7 +537,7 @@ async fn process_incoming_peer_message<Context>(
 			relay_parent,
 			bitfield,
 		)) => (relay_parent, bitfield),
-		Versioned::VStaging(protocol_vstaging::BitfieldDistributionMessage::Bitfield(
+		Versioned::V2(protocol_v2::BitfieldDistributionMessage::Bitfield(
 			relay_parent,
 			bitfield,
 		)) => (relay_parent, bitfield),
diff --git a/polkadot/node/network/bitfield-distribution/src/tests.rs b/polkadot/node/network/bitfield-distribution/src/tests.rs
index d6795247e7866f4bb160d941161f114316c3633d..ba2434ea47d69469e812d6274b17b43c3b6b5ee3 100644
--- a/polkadot/node/network/bitfield-distribution/src/tests.rs
+++ b/polkadot/node/network/bitfield-distribution/src/tests.rs
@@ -1111,9 +1111,9 @@ fn network_protocol_versioning() {
 	let peer_c = PeerId::random();
 
 	let peers = [
-		(peer_a, ValidationVersion::VStaging),
+		(peer_a, ValidationVersion::V2),
 		(peer_b, ValidationVersion::V1),
-		(peer_c, ValidationVersion::VStaging),
+		(peer_c, ValidationVersion::V2),
 	];
 
 	// validator 0 key pair
@@ -1173,7 +1173,7 @@ fn network_protocol_versioning() {
 			&Default::default(),
 			NetworkBridgeEvent::PeerMessage(
 				peer_a,
-				msg.clone().into_network_message(ValidationVersion::VStaging.into()),
+				msg.clone().into_network_message(ValidationVersion::V2.into()),
 			),
 			&mut rng,
 		));
@@ -1201,14 +1201,14 @@ fn network_protocol_versioning() {
 			}
 		);
 
-		// vstaging gossip
+		// v2 gossip
 		assert_matches!(
 			handle.recv().await,
 			AllMessages::NetworkBridgeTx(
 				NetworkBridgeTxMessage::SendValidationMessage(peers, send_msg),
 			) => {
 				assert_eq!(peers, vec![peer_c]);
-				assert_eq!(send_msg, msg.clone().into_validation_protocol(ValidationVersion::VStaging.into()));
+				assert_eq!(send_msg, msg.clone().into_validation_protocol(ValidationVersion::V2.into()));
 			}
 		);
 
diff --git a/polkadot/node/network/bridge/Cargo.toml b/polkadot/node/network/bridge/Cargo.toml
index f4da50ffe028da5e9eb195ab343f858be31fa969..df8e881234dc56dc364478040a87363d104de4c1 100644
--- a/polkadot/node/network/bridge/Cargo.toml
+++ b/polkadot/node/network/bridge/Cargo.toml
@@ -1,6 +1,6 @@
 [package]
 name = "polkadot-network-bridge"
-version.workspace = true
+version = "1.0.0"
 authors.workspace = true
 edition.workspace = true
 license.workspace = true
diff --git a/polkadot/node/network/bridge/src/metrics.rs b/polkadot/node/network/bridge/src/metrics.rs
index bb90daad56761d24d5d68995580e893a4d773e8c..083a2a71aa0f8ad05c16822feabd0e6528f48a31 100644
--- a/polkadot/node/network/bridge/src/metrics.rs
+++ b/polkadot/node/network/bridge/src/metrics.rs
@@ -105,9 +105,27 @@ impl Metrics {
 
 	pub fn on_report_event(&self) {
 		if let Some(metrics) = self.0.as_ref() {
+			self.on_message("report_peer");
 			metrics.report_events.inc()
 		}
 	}
+
+	pub fn on_message(&self, message_type: &'static str) {
+		if let Some(metrics) = self.0.as_ref() {
+			metrics.messages_sent.with_label_values(&[message_type]).inc()
+		}
+	}
+
+	pub fn on_delayed_rx_queue(&self, queue_size: usize) {
+		if let Some(metrics) = self.0.as_ref() {
+			metrics.rx_delayed_processing.observe(queue_size as f64);
+		}
+	}
+	pub fn time_delayed_rx_events(
+		&self,
+	) -> Option<metrics::prometheus::prometheus::HistogramTimer> {
+		self.0.as_ref().map(|metrics| metrics.rx_delayed_processing_time.start_timer())
+	}
 }
 
 #[derive(Clone)]
@@ -123,6 +141,13 @@ pub(crate) struct MetricsInner {
 
 	bytes_received: prometheus::CounterVec<prometheus::U64>,
 	bytes_sent: prometheus::CounterVec<prometheus::U64>,
+
+	messages_sent: prometheus::CounterVec<prometheus::U64>,
+	// The reason why a `Histogram` is used to track a queue size is that
+	// we need not only an average size of the queue (that will be 0 normally), but
+	// we also need a dynamics for this queue size in case of messages delays.
+	rx_delayed_processing: prometheus::Histogram,
+	rx_delayed_processing_time: prometheus::Histogram,
 }
 
 impl metrics::Metrics for Metrics {
@@ -217,6 +242,34 @@ impl metrics::Metrics for Metrics {
 				)?,
 				registry,
 			)?,
+			messages_sent: prometheus::register(
+				prometheus::CounterVec::new(
+					prometheus::Opts::new(
+						"polkadot_parachain_messages_sent_total",
+						"The number of messages sent via network bridge",
+					),
+					&["type"]
+				)?,
+				registry,
+			)?,
+			rx_delayed_processing: prometheus::register(
+				prometheus::Histogram::with_opts(
+					prometheus::HistogramOpts::new(
+						"polkadot_parachain_network_bridge_rx_delayed",
+						"Number of events being delayed while broadcasting from the network bridge",
+					).buckets(vec![0.0, 1.0, 2.0, 8.0, 16.0]),
+				)?,
+				registry,
+			)?,
+			rx_delayed_processing_time: prometheus::register(
+				prometheus::Histogram::with_opts(
+					prometheus::HistogramOpts::new(
+						"polkadot_parachain_network_bridge_rx_delayed_time",
+						"Time spent for waiting of the delayed events",
+					),
+				)?,
+				registry,
+			)?,
 		};
 
 		Ok(Metrics(Some(metrics)))
diff --git a/polkadot/node/network/bridge/src/network.rs b/polkadot/node/network/bridge/src/network.rs
index 4f21212dcb64a76e25396de94b35204d53682aaa..823e1254612f8cae6980c518ffd848f0b61f2e88 100644
--- a/polkadot/node/network/bridge/src/network.rs
+++ b/polkadot/node/network/bridge/src/network.rs
@@ -61,6 +61,7 @@ pub(crate) fn send_message<M>(
 	let message = {
 		let encoded = message.encode();
 		metrics.on_notification_sent(peer_set, version, encoded.len(), peers.len());
+		metrics.on_message(std::any::type_name::<M>());
 		encoded
 	};
 
diff --git a/polkadot/node/network/bridge/src/rx/mod.rs b/polkadot/node/network/bridge/src/rx/mod.rs
index 002919c5b0e50d1ae6da8f807900b545eb0a7e0d..7e86b46a7e0397ed78e5796afd9a9979688350fa 100644
--- a/polkadot/node/network/bridge/src/rx/mod.rs
+++ b/polkadot/node/network/bridge/src/rx/mod.rs
@@ -20,7 +20,7 @@ use super::*;
 
 use always_assert::never;
 use bytes::Bytes;
-use futures::stream::BoxStream;
+use futures::stream::{BoxStream, StreamExt};
 use parity_scale_codec::{Decode, DecodeAll};
 
 use sc_network::Event as NetworkEvent;
@@ -33,7 +33,7 @@ use polkadot_node_network_protocol::{
 		CollationVersion, PeerSet, PeerSetProtocolNames, PerPeerSet, ProtocolVersion,
 		ValidationVersion,
 	},
-	v1 as protocol_v1, vstaging as protocol_vstaging, ObservedRole, OurView, PeerId,
+	v1 as protocol_v1, v2 as protocol_v2, ObservedRole, OurView, PeerId,
 	UnifiedReputationChange as Rep, View,
 };
 
@@ -92,7 +92,7 @@ impl<N, AD> NetworkBridgeRx<N, AD> {
 	/// discovery service.
 	///
 	/// This assumes that the network service has had the notifications protocol for the network
-	/// bridge already registered. See [`peers_sets_info`](peers_sets_info).
+	/// bridge already registered. See [`peer_sets_info`].
 	pub fn new(
 		network_service: N,
 		authority_discovery_service: AD,
@@ -244,6 +244,7 @@ where
 								NetworkBridgeEvent::PeerViewChange(peer, View::default()),
 							],
 							&mut sender,
+							&metrics,
 						)
 						.await;
 
@@ -261,13 +262,13 @@ where
 								),
 								&metrics,
 							),
-							ValidationVersion::VStaging => send_message(
+							ValidationVersion::V2 => send_message(
 								&mut network_service,
 								vec![peer],
 								PeerSet::Validation,
 								version,
 								&peerset_protocol_names,
-								WireMessage::<protocol_vstaging::ValidationProtocol>::ViewUpdate(
+								WireMessage::<protocol_v2::ValidationProtocol>::ViewUpdate(
 									local_view,
 								),
 								&metrics,
@@ -303,13 +304,13 @@ where
 								),
 								&metrics,
 							),
-							CollationVersion::VStaging => send_message(
+							CollationVersion::V2 => send_message(
 								&mut network_service,
 								vec![peer],
 								PeerSet::Collation,
 								version,
 								&peerset_protocol_names,
-								WireMessage::<protocol_vstaging::CollationProtocol>::ViewUpdate(
+								WireMessage::<protocol_v2::CollationProtocol>::ViewUpdate(
 									local_view,
 								),
 								&metrics,
@@ -352,6 +353,7 @@ where
 							dispatch_validation_event_to_all(
 								NetworkBridgeEvent::PeerDisconnected(peer),
 								&mut sender,
+								&metrics,
 							)
 							.await,
 						PeerSet::Collation =>
@@ -463,9 +465,9 @@ where
 							&metrics,
 						)
 					} else if expected_versions[PeerSet::Validation] ==
-						Some(ValidationVersion::VStaging.into())
+						Some(ValidationVersion::V2.into())
 					{
-						handle_peer_messages::<protocol_vstaging::ValidationProtocol, _>(
+						handle_peer_messages::<protocol_v2::ValidationProtocol, _>(
 							remote,
 							PeerSet::Validation,
 							&mut shared.0.lock().validation_peers,
@@ -490,7 +492,7 @@ where
 						network_service.report_peer(remote, report.into());
 					}
 
-					dispatch_validation_events_to_all(events, &mut sender).await;
+					dispatch_validation_events_to_all(events, &mut sender, &metrics).await;
 				}
 
 				if !c_messages.is_empty() {
@@ -505,9 +507,9 @@ where
 							&metrics,
 						)
 					} else if expected_versions[PeerSet::Collation] ==
-						Some(CollationVersion::VStaging.into())
+						Some(CollationVersion::V2.into())
 					{
-						handle_peer_messages::<protocol_vstaging::CollationProtocol, _>(
+						handle_peer_messages::<protocol_v2::CollationProtocol, _>(
 							remote,
 							PeerSet::Collation,
 							&mut shared.0.lock().collation_peers,
@@ -811,10 +813,8 @@ fn update_our_view<Net, Context>(
 	let v1_validation_peers = filter_by_version(&validation_peers, ValidationVersion::V1.into());
 	let v1_collation_peers = filter_by_version(&collation_peers, CollationVersion::V1.into());
 
-	let vstaging_validation_peers =
-		filter_by_version(&validation_peers, ValidationVersion::VStaging.into());
-	let vstaging_collation_peers =
-		filter_by_version(&collation_peers, ValidationVersion::VStaging.into());
+	let v2_validation_peers = filter_by_version(&validation_peers, ValidationVersion::V2.into());
+	let v2_collation_peers = filter_by_version(&collation_peers, ValidationVersion::V2.into());
 
 	send_validation_message_v1(
 		net,
@@ -832,17 +832,17 @@ fn update_our_view<Net, Context>(
 		metrics,
 	);
 
-	send_validation_message_vstaging(
+	send_validation_message_v2(
 		net,
-		vstaging_validation_peers,
+		v2_validation_peers,
 		peerset_protocol_names,
 		WireMessage::ViewUpdate(new_view.clone()),
 		metrics,
 	);
 
-	send_collation_message_vstaging(
+	send_collation_message_v2(
 		net,
-		vstaging_collation_peers,
+		v2_collation_peers,
 		peerset_protocol_names,
 		WireMessage::ViewUpdate(new_view),
 		metrics,
@@ -953,36 +953,36 @@ fn send_collation_message_v1(
 	);
 }
 
-fn send_validation_message_vstaging(
+fn send_validation_message_v2(
 	net: &mut impl Network,
 	peers: Vec<PeerId>,
 	protocol_names: &PeerSetProtocolNames,
-	message: WireMessage<protocol_vstaging::ValidationProtocol>,
+	message: WireMessage<protocol_v2::ValidationProtocol>,
 	metrics: &Metrics,
 ) {
 	send_message(
 		net,
 		peers,
 		PeerSet::Validation,
-		ValidationVersion::VStaging.into(),
+		ValidationVersion::V2.into(),
 		protocol_names,
 		message,
 		metrics,
 	);
 }
 
-fn send_collation_message_vstaging(
+fn send_collation_message_v2(
 	net: &mut impl Network,
 	peers: Vec<PeerId>,
 	protocol_names: &PeerSetProtocolNames,
-	message: WireMessage<protocol_vstaging::CollationProtocol>,
+	message: WireMessage<protocol_v2::CollationProtocol>,
 	metrics: &Metrics,
 ) {
 	send_message(
 		net,
 		peers,
 		PeerSet::Collation,
-		CollationVersion::VStaging.into(),
+		CollationVersion::V2.into(),
 		protocol_names,
 		message,
 		metrics,
@@ -992,8 +992,9 @@ fn send_collation_message_vstaging(
 async fn dispatch_validation_event_to_all(
 	event: NetworkBridgeEvent<net_protocol::VersionedValidationProtocol>,
 	ctx: &mut impl overseer::NetworkBridgeRxSenderTrait,
+	metrics: &Metrics,
 ) {
-	dispatch_validation_events_to_all(std::iter::once(event), ctx).await
+	dispatch_validation_events_to_all(std::iter::once(event), ctx, metrics).await
 }
 
 async fn dispatch_collation_event_to_all(
@@ -1041,6 +1042,7 @@ fn dispatch_collation_event_to_all_unbounded(
 async fn dispatch_validation_events_to_all<I>(
 	events: I,
 	sender: &mut impl overseer::NetworkBridgeRxSenderTrait,
+	_metrics: &Metrics,
 ) where
 	I: IntoIterator<Item = NetworkBridgeEvent<net_protocol::VersionedValidationProtocol>>,
 	I::IntoIter: Send,
diff --git a/polkadot/node/network/bridge/src/rx/tests.rs b/polkadot/node/network/bridge/src/rx/tests.rs
index 88a4b247fdc6f6d7d24d4facceea7a558b53c31c..7c69cce48391b65294970232b1a277d7c261ba05 100644
--- a/polkadot/node/network/bridge/src/rx/tests.rs
+++ b/polkadot/node/network/bridge/src/rx/tests.rs
@@ -16,8 +16,9 @@
 
 use super::*;
 use futures::{channel::oneshot, executor, stream::BoxStream};
+use overseer::jaeger;
 use polkadot_node_network_protocol::{self as net_protocol, OurView};
-use polkadot_node_subsystem::{messages::NetworkBridgeEvent, ActivatedLeaf};
+use polkadot_node_subsystem::messages::NetworkBridgeEvent;
 
 use assert_matches::assert_matches;
 use async_trait::async_trait;
@@ -36,15 +37,14 @@ use polkadot_node_network_protocol::{
 	view, ObservedRole, Versioned,
 };
 use polkadot_node_subsystem::{
-	jaeger,
 	messages::{
 		AllMessages, ApprovalDistributionMessage, BitfieldDistributionMessage,
 		GossipSupportMessage, StatementDistributionMessage,
 	},
-	ActiveLeavesUpdate, FromOrchestra, LeafStatus, OverseerSignal,
+	ActiveLeavesUpdate, FromOrchestra, OverseerSignal,
 };
 use polkadot_node_subsystem_test_helpers::{
-	SingleItemSink, SingleItemStream, TestSubsystemContextHandle,
+	mock::new_leaf, SingleItemSink, SingleItemStream, TestSubsystemContextHandle,
 };
 use polkadot_node_subsystem_util::metered;
 use polkadot_primitives::{AuthorityDiscoveryId, CandidateHash, Hash};
@@ -427,12 +427,7 @@ fn send_our_view_upon_connection() {
 		let head = Hash::repeat_byte(1);
 		virtual_overseer
 			.send(FromOrchestra::Signal(OverseerSignal::ActiveLeaves(
-				ActiveLeavesUpdate::start_work(ActivatedLeaf {
-					hash: head,
-					number: 1,
-					status: LeafStatus::Fresh,
-					span: Arc::new(jaeger::Span::Disabled),
-				}),
+				ActiveLeavesUpdate::start_work(new_leaf(head, 1)),
 			)))
 			.await;
 
@@ -514,12 +509,7 @@ fn sends_view_updates_to_peers() {
 
 		virtual_overseer
 			.send(FromOrchestra::Signal(OverseerSignal::ActiveLeaves(
-				ActiveLeavesUpdate::start_work(ActivatedLeaf {
-					hash: hash_a,
-					number: 1,
-					status: LeafStatus::Fresh,
-					span: Arc::new(jaeger::Span::Disabled),
-				}),
+				ActiveLeavesUpdate::start_work(new_leaf(hash_a, 1)),
 			)))
 			.await;
 
@@ -585,12 +575,7 @@ fn do_not_send_view_update_until_synced() {
 
 		virtual_overseer
 			.send(FromOrchestra::Signal(OverseerSignal::ActiveLeaves(
-				ActiveLeavesUpdate::start_work(ActivatedLeaf {
-					hash: hash_a,
-					number: 1,
-					status: LeafStatus::Fresh,
-					span: Arc::new(jaeger::Span::Disabled),
-				}),
+				ActiveLeavesUpdate::start_work(new_leaf(hash_a, 1)),
 			)))
 			.await;
 
@@ -601,12 +586,7 @@ fn do_not_send_view_update_until_synced() {
 
 		virtual_overseer
 			.send(FromOrchestra::Signal(OverseerSignal::ActiveLeaves(
-				ActiveLeavesUpdate::start_work(ActivatedLeaf {
-					hash: hash_b,
-					number: 1,
-					status: LeafStatus::Fresh,
-					span: Arc::new(jaeger::Span::Disabled),
-				}),
+				ActiveLeavesUpdate::start_work(new_leaf(hash_b, 1)),
 			)))
 			.await;
 
@@ -672,12 +652,7 @@ fn do_not_send_view_update_when_only_finalized_block_changed() {
 		// This should trigger the view update to our peers.
 		virtual_overseer
 			.send(FromOrchestra::Signal(OverseerSignal::ActiveLeaves(
-				ActiveLeavesUpdate::start_work(ActivatedLeaf {
-					hash: hash_a,
-					number: 1,
-					status: LeafStatus::Fresh,
-					span: Arc::new(jaeger::Span::Disabled),
-				}),
+				ActiveLeavesUpdate::start_work(new_leaf(hash_a, 1)),
 			)))
 			.await;
 
@@ -895,12 +870,7 @@ fn peer_disconnect_from_just_one_peerset() {
 
 		virtual_overseer
 			.send(FromOrchestra::Signal(OverseerSignal::ActiveLeaves(
-				ActiveLeavesUpdate::start_work(ActivatedLeaf {
-					hash: hash_a,
-					number: 1,
-					status: LeafStatus::Fresh,
-					span: Arc::new(jaeger::Span::Disabled),
-				}),
+				ActiveLeavesUpdate::start_work(new_leaf(hash_a, 1)),
 			)))
 			.await;
 
@@ -1132,12 +1102,7 @@ fn sent_views_include_finalized_number_update() {
 			.await;
 		virtual_overseer
 			.send(FromOrchestra::Signal(OverseerSignal::ActiveLeaves(
-				ActiveLeavesUpdate::start_work(ActivatedLeaf {
-					hash: hash_b,
-					number: 1,
-					status: LeafStatus::Fresh,
-					span: Arc::new(jaeger::Span::Disabled),
-				}),
+				ActiveLeavesUpdate::start_work(new_leaf(hash_b, 1)),
 			)))
 			.await;
 
@@ -1211,12 +1176,7 @@ fn our_view_updates_decreasing_order_and_limited_to_max() {
 			// get the correct view.
 			virtual_overseer
 				.send(FromOrchestra::Signal(OverseerSignal::ActiveLeaves(
-					ActiveLeavesUpdate::start_work(ActivatedLeaf {
-						hash,
-						number: i as _,
-						status: LeafStatus::Fresh,
-						span: Arc::new(jaeger::Span::Disabled),
-					}),
+					ActiveLeavesUpdate::start_work(new_leaf(hash, i as _)),
 				)))
 				.await;
 		}
@@ -1256,21 +1216,16 @@ fn network_protocol_versioning_view_update() {
 
 		let peer_ids: Vec<_> = (0..4).map(|_| PeerId::random()).collect();
 		let peers = [
-			(peer_ids[0], PeerSet::Validation, ValidationVersion::VStaging),
+			(peer_ids[0], PeerSet::Validation, ValidationVersion::V2),
 			(peer_ids[1], PeerSet::Collation, ValidationVersion::V1),
 			(peer_ids[2], PeerSet::Validation, ValidationVersion::V1),
-			(peer_ids[3], PeerSet::Collation, ValidationVersion::VStaging),
+			(peer_ids[3], PeerSet::Collation, ValidationVersion::V2),
 		];
 
 		let head = Hash::repeat_byte(1);
 		virtual_overseer
 			.send(FromOrchestra::Signal(OverseerSignal::ActiveLeaves(
-				ActiveLeavesUpdate::start_work(ActivatedLeaf {
-					hash: head,
-					number: 1,
-					status: LeafStatus::Fresh,
-					span: Arc::new(jaeger::Span::Disabled),
-				}),
+				ActiveLeavesUpdate::start_work(new_leaf(head, 1)),
 			)))
 			.await;
 
@@ -1290,8 +1245,8 @@ fn network_protocol_versioning_view_update() {
 				ValidationVersion::V1 =>
 					WireMessage::<protocol_v1::ValidationProtocol>::ViewUpdate(view.clone())
 						.encode(),
-				ValidationVersion::VStaging =>
-					WireMessage::<protocol_vstaging::ValidationProtocol>::ViewUpdate(view.clone())
+				ValidationVersion::V2 =>
+					WireMessage::<protocol_v2::ValidationProtocol>::ViewUpdate(view.clone())
 						.encode(),
 			};
 			assert_network_actions_contains(
@@ -1313,12 +1268,7 @@ fn network_protocol_versioning_subsystem_msg() {
 		let peer = PeerId::random();
 
 		network_handle
-			.connect_peer(
-				peer,
-				ValidationVersion::VStaging,
-				PeerSet::Validation,
-				ObservedRole::Full,
-			)
+			.connect_peer(peer, ValidationVersion::V2, PeerSet::Validation, ObservedRole::Full)
 			.await;
 
 		// bridge will inform about all connected peers.
@@ -1327,7 +1277,7 @@ fn network_protocol_versioning_subsystem_msg() {
 				NetworkBridgeEvent::PeerConnected(
 					peer,
 					ObservedRole::Full,
-					ValidationVersion::VStaging.into(),
+					ValidationVersion::V2.into(),
 					None,
 				),
 				&mut virtual_overseer,
@@ -1342,9 +1292,9 @@ fn network_protocol_versioning_subsystem_msg() {
 		}
 
 		let approval_distribution_message =
-			protocol_vstaging::ApprovalDistributionMessage::Approvals(Vec::new());
+			protocol_v2::ApprovalDistributionMessage::Approvals(Vec::new());
 
-		let msg = protocol_vstaging::ValidationProtocol::ApprovalDistribution(
+		let msg = protocol_v2::ValidationProtocol::ApprovalDistribution(
 			approval_distribution_message.clone(),
 		);
 
@@ -1360,7 +1310,7 @@ fn network_protocol_versioning_subsystem_msg() {
 			virtual_overseer.recv().await,
 			AllMessages::ApprovalDistribution(
 				ApprovalDistributionMessage::NetworkBridgeUpdate(
-					NetworkBridgeEvent::PeerMessage(p, Versioned::VStaging(m))
+					NetworkBridgeEvent::PeerMessage(p, Versioned::V2(m))
 				)
 			) => {
 				assert_eq!(p, peer);
@@ -1375,10 +1325,10 @@ fn network_protocol_versioning_subsystem_msg() {
 			signature: sp_core::crypto::UncheckedFrom::unchecked_from([1u8; 64]),
 		};
 		let statement_distribution_message =
-			protocol_vstaging::StatementDistributionMessage::V1Compatibility(
+			protocol_v2::StatementDistributionMessage::V1Compatibility(
 				protocol_v1::StatementDistributionMessage::LargeStatement(metadata),
 			);
-		let msg = protocol_vstaging::ValidationProtocol::StatementDistribution(
+		let msg = protocol_v2::ValidationProtocol::StatementDistribution(
 			statement_distribution_message.clone(),
 		);
 
@@ -1394,7 +1344,7 @@ fn network_protocol_versioning_subsystem_msg() {
 			virtual_overseer.recv().await,
 			AllMessages::StatementDistribution(
 				StatementDistributionMessage::NetworkBridgeUpdate(
-					NetworkBridgeEvent::PeerMessage(p, Versioned::VStaging(m))
+					NetworkBridgeEvent::PeerMessage(p, Versioned::V2(m))
 				)
 			) => {
 				assert_eq!(p, peer);
diff --git a/polkadot/node/network/bridge/src/tx/mod.rs b/polkadot/node/network/bridge/src/tx/mod.rs
index e0ca633547f4c0be8a7273f7688a3a5e75eafc9a..f15635f1f41c528f6b15a07870f1f348a6b777a3 100644
--- a/polkadot/node/network/bridge/src/tx/mod.rs
+++ b/polkadot/node/network/bridge/src/tx/mod.rs
@@ -20,7 +20,7 @@ use super::*;
 use polkadot_node_network_protocol::{
 	peer_set::{CollationVersion, PeerSet, PeerSetProtocolNames, ValidationVersion},
 	request_response::ReqProtocolNames,
-	v1 as protocol_v1, vstaging as protocol_vstaging, PeerId, Versioned,
+	v1 as protocol_v1, v2 as protocol_v2, PeerId, Versioned,
 };
 
 use polkadot_node_subsystem::{
@@ -33,6 +33,7 @@ use polkadot_node_subsystem::{
 ///
 /// To be passed to [`FullNetworkConfiguration::add_notification_protocol`]().
 pub use polkadot_node_network_protocol::peer_set::{peer_sets_info, IsAuthority};
+use polkadot_node_network_protocol::request_response::Requests;
 use sc_network::ReputationChange;
 
 use crate::validator_discovery;
@@ -65,7 +66,7 @@ impl<N, AD> NetworkBridgeTx<N, AD> {
 	/// discovery service.
 	///
 	/// This assumes that the network service has had the notifications protocol for the network
-	/// bridge already registered. See [`peers_sets_info`](peers_sets_info).
+	/// bridge already registered. See [`peer_sets_info`].
 	pub fn new(
 		network_service: N,
 		authority_discovery_service: AD,
@@ -197,7 +198,7 @@ where
 					WireMessage::ProtocolMessage(msg),
 					&metrics,
 				),
-				Versioned::VStaging(msg) => send_validation_message_vstaging(
+				Versioned::V2(msg) => send_validation_message_v2(
 					&mut network_service,
 					peers,
 					peerset_protocol_names,
@@ -222,7 +223,7 @@ where
 						WireMessage::ProtocolMessage(msg),
 						&metrics,
 					),
-					Versioned::VStaging(msg) => send_validation_message_vstaging(
+					Versioned::V2(msg) => send_validation_message_v2(
 						&mut network_service,
 						peers,
 						peerset_protocol_names,
@@ -247,7 +248,7 @@ where
 					WireMessage::ProtocolMessage(msg),
 					&metrics,
 				),
-				Versioned::VStaging(msg) => send_collation_message_vstaging(
+				Versioned::V2(msg) => send_collation_message_v2(
 					&mut network_service,
 					peers,
 					peerset_protocol_names,
@@ -272,7 +273,7 @@ where
 						WireMessage::ProtocolMessage(msg),
 						&metrics,
 					),
-					Versioned::VStaging(msg) => send_collation_message_vstaging(
+					Versioned::V2(msg) => send_collation_message_v2(
 						&mut network_service,
 						peers,
 						peerset_protocol_names,
@@ -290,6 +291,18 @@ where
 			);
 
 			for req in reqs {
+				match req {
+					Requests::ChunkFetchingV1(_) => metrics.on_message("chunk_fetching_v1"),
+					Requests::AvailableDataFetchingV1(_) =>
+						metrics.on_message("available_data_fetching_v1"),
+					Requests::CollationFetchingV1(_) => metrics.on_message("collation_fetching_v1"),
+					Requests::CollationFetchingV2(_) => metrics.on_message("collation_fetching_v2"),
+					Requests::PoVFetchingV1(_) => metrics.on_message("pov_fetching_v1"),
+					Requests::DisputeSendingV1(_) => metrics.on_message("dispute_sending_v1"),
+					Requests::StatementFetchingV1(_) => metrics.on_message("statement_fetching_v1"),
+					Requests::AttestedCandidateV2(_) => metrics.on_message("attested_candidate_v2"),
+				}
+
 				network_service
 					.start_request(
 						&mut authority_discovery_service,
@@ -410,36 +423,36 @@ fn send_collation_message_v1(
 	);
 }
 
-fn send_validation_message_vstaging(
+fn send_validation_message_v2(
 	net: &mut impl Network,
 	peers: Vec<PeerId>,
 	protocol_names: &PeerSetProtocolNames,
-	message: WireMessage<protocol_vstaging::ValidationProtocol>,
+	message: WireMessage<protocol_v2::ValidationProtocol>,
 	metrics: &Metrics,
 ) {
 	send_message(
 		net,
 		peers,
 		PeerSet::Validation,
-		ValidationVersion::VStaging.into(),
+		ValidationVersion::V2.into(),
 		protocol_names,
 		message,
 		metrics,
 	);
 }
 
-fn send_collation_message_vstaging(
+fn send_collation_message_v2(
 	net: &mut impl Network,
 	peers: Vec<PeerId>,
 	protocol_names: &PeerSetProtocolNames,
-	message: WireMessage<protocol_vstaging::CollationProtocol>,
+	message: WireMessage<protocol_v2::CollationProtocol>,
 	metrics: &Metrics,
 ) {
 	send_message(
 		net,
 		peers,
 		PeerSet::Collation,
-		CollationVersion::VStaging.into(),
+		CollationVersion::V2.into(),
 		protocol_names,
 		message,
 		metrics,
diff --git a/polkadot/node/network/bridge/src/tx/tests.rs b/polkadot/node/network/bridge/src/tx/tests.rs
index 21cd134c54f2141af111c5dd41ed5cf6038b58fe..48287f8b74c91a526263fed1d176f916753ce985 100644
--- a/polkadot/node/network/bridge/src/tx/tests.rs
+++ b/polkadot/node/network/bridge/src/tx/tests.rs
@@ -341,10 +341,10 @@ fn network_protocol_versioning_send() {
 
 		let peer_ids: Vec<_> = (0..4).map(|_| PeerId::random()).collect();
 		let peers = [
-			(peer_ids[0], PeerSet::Validation, ValidationVersion::VStaging),
+			(peer_ids[0], PeerSet::Validation, ValidationVersion::V2),
 			(peer_ids[1], PeerSet::Collation, ValidationVersion::V1),
 			(peer_ids[2], PeerSet::Validation, ValidationVersion::V1),
-			(peer_ids[3], PeerSet::Collation, ValidationVersion::VStaging),
+			(peer_ids[3], PeerSet::Collation, ValidationVersion::V2),
 		];
 
 		for &(peer_id, peer_set, version) in &peers {
@@ -359,9 +359,9 @@ fn network_protocol_versioning_send() {
 
 		{
 			let approval_distribution_message =
-				protocol_vstaging::ApprovalDistributionMessage::Approvals(Vec::new());
+				protocol_v2::ApprovalDistributionMessage::Approvals(Vec::new());
 
-			let msg = protocol_vstaging::ValidationProtocol::ApprovalDistribution(
+			let msg = protocol_v2::ValidationProtocol::ApprovalDistribution(
 				approval_distribution_message.clone(),
 			);
 
@@ -372,7 +372,7 @@ fn network_protocol_versioning_send() {
 				.send(FromOrchestra::Communication {
 					msg: NetworkBridgeTxMessage::SendValidationMessage(
 						receivers.clone(),
-						Versioned::VStaging(msg.clone()),
+						Versioned::V2(msg.clone()),
 					),
 				})
 				.timeout(TIMEOUT)
@@ -398,15 +398,14 @@ fn network_protocol_versioning_send() {
 		// send a collation protocol message.
 
 		{
-			let collator_protocol_message = protocol_vstaging::CollatorProtocolMessage::Declare(
+			let collator_protocol_message = protocol_v2::CollatorProtocolMessage::Declare(
 				Sr25519Keyring::Alice.public().into(),
 				0_u32.into(),
 				dummy_collator_signature(),
 			);
 
-			let msg = protocol_vstaging::CollationProtocol::CollatorProtocol(
-				collator_protocol_message.clone(),
-			);
+			let msg =
+				protocol_v2::CollationProtocol::CollatorProtocol(collator_protocol_message.clone());
 
 			let receivers = vec![peer_ids[1], peer_ids[2]];
 
@@ -414,7 +413,7 @@ fn network_protocol_versioning_send() {
 				.send(FromOrchestra::Communication {
 					msg: NetworkBridgeTxMessage::SendCollationMessages(vec![(
 						receivers.clone(),
-						Versioned::VStaging(msg.clone()),
+						Versioned::V2(msg.clone()),
 					)]),
 				})
 				.await;
diff --git a/polkadot/node/network/collator-protocol/Cargo.toml b/polkadot/node/network/collator-protocol/Cargo.toml
index d15d20fcb7cfe34be597aabb68fb48c147604c3b..e5328cf16629f4c7bdb2180e90fbe888dbfb8f42 100644
--- a/polkadot/node/network/collator-protocol/Cargo.toml
+++ b/polkadot/node/network/collator-protocol/Cargo.toml
@@ -1,6 +1,6 @@
 [package]
 name = "polkadot-collator-protocol"
-version.workspace = true
+version = "1.0.0"
 authors.workspace = true
 edition.workspace = true
 license.workspace = true
@@ -21,7 +21,7 @@ polkadot-node-primitives = { path = "../../primitives" }
 polkadot-node-subsystem-util = { path = "../../subsystem-util" }
 polkadot-node-subsystem = { path = "../../subsystem" }
 fatality = "0.0.6"
-thiserror = "1.0.31"
+thiserror = "1.0.48"
 tokio-util = "0.7.1"
 
 [dev-dependencies]
diff --git a/polkadot/node/network/collator-protocol/src/collator_side/collation.rs b/polkadot/node/network/collator-protocol/src/collator_side/collation.rs
index 28dd9e0a959e73b5ff660b169b3857ebf890a6b0..53f947142d10d615496b184b22ce7d69d815c977 100644
--- a/polkadot/node/network/collator-protocol/src/collator_side/collation.rs
+++ b/polkadot/node/network/collator-protocol/src/collator_side/collation.rs
@@ -1,4 +1,4 @@
-// Copyright 2022 Parity Technologies (UK) Ltd.
+// Copyright (C) Parity Technologies (UK) Ltd.
 // This file is part of Polkadot.
 
 // Polkadot is free software: you can redistribute it and/or modify
@@ -22,8 +22,7 @@ use futures::{future::BoxFuture, stream::FuturesUnordered};
 
 use polkadot_node_network_protocol::{
 	request_response::{
-		incoming::OutgoingResponse, v1 as protocol_v1, vstaging as protocol_vstaging,
-		IncomingRequest,
+		incoming::OutgoingResponse, v1 as protocol_v1, v2 as protocol_v2, IncomingRequest,
 	},
 	PeerId,
 };
@@ -89,7 +88,7 @@ pub struct WaitingCollationFetches {
 /// Backwards-compatible wrapper for incoming collations requests.
 pub enum VersionedCollationRequest {
 	V1(IncomingRequest<protocol_v1::CollationFetchingRequest>),
-	VStaging(IncomingRequest<protocol_vstaging::CollationFetchingRequest>),
+	V2(IncomingRequest<protocol_v2::CollationFetchingRequest>),
 }
 
 impl From<IncomingRequest<protocol_v1::CollationFetchingRequest>> for VersionedCollationRequest {
@@ -98,11 +97,9 @@ impl From<IncomingRequest<protocol_v1::CollationFetchingRequest>> for VersionedC
 	}
 }
 
-impl From<IncomingRequest<protocol_vstaging::CollationFetchingRequest>>
-	for VersionedCollationRequest
-{
-	fn from(req: IncomingRequest<protocol_vstaging::CollationFetchingRequest>) -> Self {
-		Self::VStaging(req)
+impl From<IncomingRequest<protocol_v2::CollationFetchingRequest>> for VersionedCollationRequest {
+	fn from(req: IncomingRequest<protocol_v2::CollationFetchingRequest>) -> Self {
+		Self::V2(req)
 	}
 }
 
@@ -111,7 +108,7 @@ impl VersionedCollationRequest {
 	pub fn para_id(&self) -> ParaId {
 		match self {
 			VersionedCollationRequest::V1(req) => req.payload.para_id,
-			VersionedCollationRequest::VStaging(req) => req.payload.para_id,
+			VersionedCollationRequest::V2(req) => req.payload.para_id,
 		}
 	}
 
@@ -119,7 +116,7 @@ impl VersionedCollationRequest {
 	pub fn relay_parent(&self) -> Hash {
 		match self {
 			VersionedCollationRequest::V1(req) => req.payload.relay_parent,
-			VersionedCollationRequest::VStaging(req) => req.payload.relay_parent,
+			VersionedCollationRequest::V2(req) => req.payload.relay_parent,
 		}
 	}
 
@@ -127,7 +124,7 @@ impl VersionedCollationRequest {
 	pub fn peer_id(&self) -> PeerId {
 		match self {
 			VersionedCollationRequest::V1(req) => req.peer,
-			VersionedCollationRequest::VStaging(req) => req.peer,
+			VersionedCollationRequest::V2(req) => req.peer,
 		}
 	}
 
@@ -138,7 +135,7 @@ impl VersionedCollationRequest {
 	) -> Result<(), ()> {
 		match self {
 			VersionedCollationRequest::V1(req) => req.send_outgoing_response(response),
-			VersionedCollationRequest::VStaging(req) => req.send_outgoing_response(response),
+			VersionedCollationRequest::V2(req) => req.send_outgoing_response(response),
 		}
 	}
 }
diff --git a/polkadot/node/network/collator-protocol/src/collator_side/mod.rs b/polkadot/node/network/collator-protocol/src/collator_side/mod.rs
index 96978f39a5328bc3f2c6935c1598a6f5c0ea85a0..304cabbaac80c1a540a352da9ed74faa5f4dbf32 100644
--- a/polkadot/node/network/collator-protocol/src/collator_side/mod.rs
+++ b/polkadot/node/network/collator-protocol/src/collator_side/mod.rs
@@ -31,10 +31,10 @@ use polkadot_node_network_protocol::{
 	peer_set::{CollationVersion, PeerSet},
 	request_response::{
 		incoming::{self, OutgoingResponse},
-		v1 as request_v1, vstaging as request_vstaging, IncomingRequestReceiver,
+		v1 as request_v1, v2 as request_v2, IncomingRequestReceiver,
 	},
-	v1 as protocol_v1, vstaging as protocol_vstaging, OurView, PeerId,
-	UnifiedReputationChange as Rep, Versioned, View,
+	v1 as protocol_v1, v2 as protocol_v2, OurView, PeerId, UnifiedReputationChange as Rep,
+	Versioned, View,
 };
 use polkadot_node_primitives::{CollationSecondedSignal, PoV, Statement};
 use polkadot_node_subsystem::{
@@ -577,7 +577,7 @@ async fn determine_our_validators<Context>(
 fn declare_message(
 	state: &mut State,
 	version: CollationVersion,
-) -> Option<Versioned<protocol_v1::CollationProtocol, protocol_vstaging::CollationProtocol>> {
+) -> Option<Versioned<protocol_v1::CollationProtocol, protocol_v2::CollationProtocol>> {
 	let para_id = state.collating_on?;
 	Some(match version {
 		CollationVersion::V1 => {
@@ -590,17 +590,15 @@ fn declare_message(
 			);
 			Versioned::V1(protocol_v1::CollationProtocol::CollatorProtocol(wire_message))
 		},
-		CollationVersion::VStaging => {
+		CollationVersion::V2 => {
 			let declare_signature_payload =
-				protocol_vstaging::declare_signature_payload(&state.local_peer_id);
-			let wire_message = protocol_vstaging::CollatorProtocolMessage::Declare(
+				protocol_v2::declare_signature_payload(&state.local_peer_id);
+			let wire_message = protocol_v2::CollatorProtocolMessage::Declare(
 				state.collator_pair.public(),
 				para_id,
 				state.collator_pair.sign(&declare_signature_payload),
 			);
-			Versioned::VStaging(protocol_vstaging::CollationProtocol::CollatorProtocol(
-				wire_message,
-			))
+			Versioned::V2(protocol_v2::CollationProtocol::CollatorProtocol(wire_message))
 		},
 	})
 }
@@ -706,15 +704,13 @@ async fn advertise_collation<Context>(
 		collation.status.advance_to_advertised();
 
 		let collation_message = match protocol_version {
-			CollationVersion::VStaging => {
-				let wire_message = protocol_vstaging::CollatorProtocolMessage::AdvertiseCollation {
+			CollationVersion::V2 => {
+				let wire_message = protocol_v2::CollatorProtocolMessage::AdvertiseCollation {
 					relay_parent,
 					candidate_hash: *candidate_hash,
 					parent_head_data_hash: collation.parent_head_data_hash,
 				};
-				Versioned::VStaging(protocol_vstaging::CollationProtocol::CollatorProtocol(
-					wire_message,
-				))
+				Versioned::V2(protocol_v2::CollationProtocol::CollatorProtocol(wire_message))
 			},
 			CollationVersion::V1 => {
 				let wire_message =
@@ -837,7 +833,7 @@ async fn send_collation(
 	let candidate_hash = receipt.hash();
 
 	// The response payload is the same for both versions of protocol
-	// and doesn't have vstaging alias for simplicity.
+	// and doesn't have v2 alias for simplicity.
 	let response = OutgoingResponse {
 		result: Ok(request_v1::CollationFetchingResponse::Collation(receipt, pov)),
 		reputation_changes: Vec::new(),
@@ -868,16 +864,13 @@ async fn handle_incoming_peer_message<Context>(
 	runtime: &mut RuntimeInfo,
 	state: &mut State,
 	origin: PeerId,
-	msg: Versioned<
-		protocol_v1::CollatorProtocolMessage,
-		protocol_vstaging::CollatorProtocolMessage,
-	>,
+	msg: Versioned<protocol_v1::CollatorProtocolMessage, protocol_v2::CollatorProtocolMessage>,
 ) -> Result<()> {
 	use protocol_v1::CollatorProtocolMessage as V1;
-	use protocol_vstaging::CollatorProtocolMessage as VStaging;
+	use protocol_v2::CollatorProtocolMessage as V2;
 
 	match msg {
-		Versioned::V1(V1::Declare(..)) | Versioned::VStaging(VStaging::Declare(..)) => {
+		Versioned::V1(V1::Declare(..)) | Versioned::V2(V2::Declare(..)) => {
 			gum::trace!(
 				target: LOG_TARGET,
 				?origin,
@@ -888,8 +881,7 @@ async fn handle_incoming_peer_message<Context>(
 			ctx.send_message(NetworkBridgeTxMessage::DisconnectPeer(origin, PeerSet::Collation))
 				.await;
 		},
-		Versioned::V1(V1::AdvertiseCollation(_)) |
-		Versioned::VStaging(VStaging::AdvertiseCollation { .. }) => {
+		Versioned::V1(V1::AdvertiseCollation(_)) | Versioned::V2(V2::AdvertiseCollation { .. }) => {
 			gum::trace!(
 				target: LOG_TARGET,
 				?origin,
@@ -904,7 +896,7 @@ async fn handle_incoming_peer_message<Context>(
 				.await;
 		},
 		Versioned::V1(V1::CollationSeconded(relay_parent, statement)) |
-		Versioned::VStaging(VStaging::CollationSeconded(relay_parent, statement)) => {
+		Versioned::V2(V2::CollationSeconded(relay_parent, statement)) => {
 			if !matches!(statement.unchecked_payload(), Statement::Seconded(_)) {
 				gum::warn!(
 					target: LOG_TARGET,
@@ -926,16 +918,42 @@ async fn handle_incoming_peer_message<Context>(
 						target: LOG_TARGET,
 						?statement,
 						?origin,
-						"received a valid `CollationSeconded`",
+						"received a valid `CollationSeconded`, forwarding result to collator",
 					);
 					let _ = sender.send(CollationSecondedSignal { statement, relay_parent });
 				} else {
-					gum::debug!(
-						target: LOG_TARGET,
-						candidate_hash = ?&statement.payload().candidate_hash(),
-						?origin,
-						"received an unexpected `CollationSeconded`: unknown statement",
-					);
+					// Checking whether the `CollationSeconded` statement is unexpected
+					let relay_parent = match state.per_relay_parent.get(&relay_parent) {
+						Some(per_relay_parent) => per_relay_parent,
+						None => {
+							gum::debug!(
+								target: LOG_TARGET,
+								candidate_relay_parent = %relay_parent,
+								candidate_hash = ?&statement.payload().candidate_hash(),
+								"Seconded statement relay parent is out of our view",
+							);
+							return Ok(())
+						},
+					};
+					match relay_parent.collations.get(&statement.payload().candidate_hash()) {
+						Some(_) => {
+							// We've seen this collation before, so a seconded statement is expected
+							gum::trace!(
+								target: LOG_TARGET,
+								?statement,
+								?origin,
+								"received a valid `CollationSeconded`",
+							);
+						},
+						None => {
+							gum::debug!(
+								target: LOG_TARGET,
+								candidate_hash = ?&statement.payload().candidate_hash(),
+								?origin,
+								"received an unexpected `CollationSeconded`: unknown statement",
+							);
+						},
+					}
 				}
 			}
 		},
@@ -980,7 +998,7 @@ async fn handle_incoming_request<Context>(
 			let collation = match &req {
 				VersionedCollationRequest::V1(_) if !mode.is_enabled() =>
 					per_relay_parent.collations.values_mut().next(),
-				VersionedCollationRequest::VStaging(req) =>
+				VersionedCollationRequest::V2(req) =>
 					per_relay_parent.collations.get_mut(&req.payload.candidate_hash),
 				_ => {
 					gum::warn!(
@@ -1296,7 +1314,7 @@ pub(crate) async fn run<Context>(
 	local_peer_id: PeerId,
 	collator_pair: CollatorPair,
 	req_v1_receiver: IncomingRequestReceiver<request_v1::CollationFetchingRequest>,
-	req_v2_receiver: IncomingRequestReceiver<request_vstaging::CollationFetchingRequest>,
+	req_v2_receiver: IncomingRequestReceiver<request_v2::CollationFetchingRequest>,
 	metrics: Metrics,
 ) -> std::result::Result<(), FatalError> {
 	run_inner(
@@ -1318,7 +1336,7 @@ async fn run_inner<Context>(
 	local_peer_id: PeerId,
 	collator_pair: CollatorPair,
 	mut req_v1_receiver: IncomingRequestReceiver<request_v1::CollationFetchingRequest>,
-	mut req_v2_receiver: IncomingRequestReceiver<request_vstaging::CollationFetchingRequest>,
+	mut req_v2_receiver: IncomingRequestReceiver<request_v2::CollationFetchingRequest>,
 	metrics: Metrics,
 	reputation: ReputationAggregator,
 	reputation_interval: Duration,
@@ -1399,7 +1417,7 @@ async fn run_inner<Context>(
 						(ProspectiveParachainsMode::Disabled, VersionedCollationRequest::V1(_)) => {
 							per_relay_parent.collations.values().next()
 						},
-						(ProspectiveParachainsMode::Enabled { .. }, VersionedCollationRequest::VStaging(req)) => {
+						(ProspectiveParachainsMode::Enabled { .. }, VersionedCollationRequest::V2(req)) => {
 							per_relay_parent.collations.get(&req.payload.candidate_hash)
 						},
 						_ => {
@@ -1450,7 +1468,7 @@ async fn run_inner<Context>(
 
 				log_error(
 					handle_incoming_request(&mut ctx, &mut state, request).await,
-					"Handling incoming collation fetch request VStaging"
+					"Handling incoming collation fetch request V2"
 				)?;
 			}
 		}
diff --git a/polkadot/node/network/collator-protocol/src/collator_side/tests/mod.rs b/polkadot/node/network/collator-protocol/src/collator_side/tests/mod.rs
index fae719b2b4a1faf9202a93c0c43f843783981a71..7dd2287dab684debb39f68f94098c1b225024285 100644
--- a/polkadot/node/network/collator-protocol/src/collator_side/tests/mod.rs
+++ b/polkadot/node/network/collator-protocol/src/collator_side/tests/mod.rs
@@ -40,15 +40,16 @@ use polkadot_node_subsystem::{
 	errors::RuntimeApiError,
 	jaeger,
 	messages::{AllMessages, ReportPeerMessage, RuntimeApiMessage, RuntimeApiRequest},
-	ActivatedLeaf, ActiveLeavesUpdate, LeafStatus,
+	ActiveLeavesUpdate,
 };
 use polkadot_node_subsystem_test_helpers as test_helpers;
 use polkadot_node_subsystem_util::{reputation::add_reputation, TimeoutExt};
 use polkadot_primitives::{
-	AuthorityDiscoveryId, CollatorPair, GroupIndex, GroupRotationInfo, IndexedVec, ScheduledCore,
-	SessionIndex, SessionInfo, ValidatorId, ValidatorIndex,
+	AuthorityDiscoveryId, CollatorPair, ExecutorParams, GroupIndex, GroupRotationInfo, IndexedVec,
+	ScheduledCore, SessionIndex, SessionInfo, ValidatorId, ValidatorIndex,
 };
 use polkadot_primitives_test_helpers::TestCandidateBuilder;
+use test_helpers::mock::new_leaf;
 
 mod prospective_parachains;
 
@@ -197,7 +198,7 @@ impl TestState {
 			overseer_recv(virtual_overseer).await,
 			AllMessages::RuntimeApi(RuntimeApiMessage::Request(
 				relay_parent,
-				RuntimeApiRequest::StagingAsyncBackingParams(tx)
+				RuntimeApiRequest::AsyncBackingParams(tx)
 			)) => {
 				assert_eq!(relay_parent, self.relay_parent);
 				tx.send(Err(ASYNC_BACKING_DISABLED_ERROR)).unwrap();
@@ -211,7 +212,7 @@ type VirtualOverseer = test_helpers::TestSubsystemContextHandle<CollatorProtocol
 struct TestHarness {
 	virtual_overseer: VirtualOverseer,
 	req_v1_cfg: sc_network::config::RequestResponseConfig,
-	req_vstaging_cfg: sc_network::config::RequestResponseConfig,
+	req_v2_cfg: sc_network::config::RequestResponseConfig,
 }
 
 fn test_harness<T: Future<Output = TestHarness>>(
@@ -235,7 +236,7 @@ fn test_harness<T: Future<Output = TestHarness>>(
 
 	let (collation_req_receiver, req_v1_cfg) =
 		IncomingRequest::get_config_receiver(&req_protocol_names);
-	let (collation_req_vstaging_receiver, req_vstaging_cfg) =
+	let (collation_req_v2_receiver, req_v2_cfg) =
 		IncomingRequest::get_config_receiver(&req_protocol_names);
 	let subsystem = async {
 		run_inner(
@@ -243,7 +244,7 @@ fn test_harness<T: Future<Output = TestHarness>>(
 			local_peer_id,
 			collator_pair,
 			collation_req_receiver,
-			collation_req_vstaging_receiver,
+			collation_req_v2_receiver,
 			Default::default(),
 			reputation,
 			REPUTATION_CHANGE_TEST_INTERVAL,
@@ -252,7 +253,7 @@ fn test_harness<T: Future<Output = TestHarness>>(
 		.unwrap();
 	};
 
-	let test_fut = test(TestHarness { virtual_overseer, req_v1_cfg, req_vstaging_cfg });
+	let test_fut = test(TestHarness { virtual_overseer, req_v1_cfg, req_v2_cfg });
 
 	futures::pin_mut!(test_fut);
 	futures::pin_mut!(subsystem);
@@ -310,12 +311,10 @@ async fn setup_system(virtual_overseer: &mut VirtualOverseer, test_state: &TestS
 
 	overseer_signal(
 		virtual_overseer,
-		OverseerSignal::ActiveLeaves(ActiveLeavesUpdate::start_work(ActivatedLeaf {
-			hash: test_state.relay_parent,
-			number: 1,
-			status: LeafStatus::Fresh,
-			span: Arc::new(jaeger::Span::Disabled),
-		})),
+		OverseerSignal::ActiveLeaves(ActiveLeavesUpdate::start_work(new_leaf(
+			test_state.relay_parent,
+			1,
+		))),
 	)
 	.await;
 
@@ -331,7 +330,7 @@ async fn setup_system(virtual_overseer: &mut VirtualOverseer, test_state: &TestS
 		overseer_recv(virtual_overseer).await,
 		AllMessages::RuntimeApi(RuntimeApiMessage::Request(
 			relay_parent,
-			RuntimeApiRequest::StagingAsyncBackingParams(tx)
+			RuntimeApiRequest::AsyncBackingParams(tx)
 		)) => {
 			assert_eq!(relay_parent, test_state.relay_parent);
 			tx.send(Err(ASYNC_BACKING_DISABLED_ERROR)).unwrap();
@@ -398,6 +397,16 @@ async fn distribute_collation_with_receipt(
 				tx.send(Ok(Some(test_state.session_info.clone()))).unwrap();
 			},
 
+			AllMessages::RuntimeApi(RuntimeApiMessage::Request(
+				relay_parent,
+				RuntimeApiRequest::SessionExecutorParams(session_index, tx),
+			)) => {
+				assert_eq!(relay_parent, relay_parent);
+				assert_eq!(session_index, test_state.current_session_index());
+
+				tx.send(Ok(Some(ExecutorParams::default()))).unwrap();
+			},
+
 			AllMessages::RuntimeApi(RuntimeApiMessage::Request(
 				_relay_parent,
 				RuntimeApiRequest::ValidatorGroups(tx),
@@ -536,7 +545,7 @@ async fn expect_declare_msg(
 
 /// Check that the next received message is a collation advertisement message.
 ///
-/// Expects vstaging message if `expected_candidate_hashes` is `Some`, v1 otherwise.
+/// Expects v2 message if `expected_candidate_hashes` is `Some`, v1 otherwise.
 async fn expect_advertise_collation_msg(
 	virtual_overseer: &mut VirtualOverseer,
 	peer: &PeerId,
@@ -570,13 +579,13 @@ async fn expect_advertise_collation_msg(
 					},
 					(
 						Some(candidate_hashes),
-						Versioned::VStaging(protocol_vstaging::CollationProtocol::CollatorProtocol(
+						Versioned::V2(protocol_v2::CollationProtocol::CollatorProtocol(
 							wire_message,
 						)),
 					) => {
 						assert_matches!(
 							wire_message,
-							protocol_vstaging::CollatorProtocolMessage::AdvertiseCollation {
+							protocol_v2::CollatorProtocolMessage::AdvertiseCollation {
 								relay_parent,
 								candidate_hash,
 								..
@@ -625,7 +634,7 @@ fn advertise_and_send_collation() {
 		|test_harness| async move {
 			let mut virtual_overseer = test_harness.virtual_overseer;
 			let mut req_v1_cfg = test_harness.req_v1_cfg;
-			let req_vstaging_cfg = test_harness.req_vstaging_cfg;
+			let req_v2_cfg = test_harness.req_v2_cfg;
 
 			setup_system(&mut virtual_overseer, &test_state).await;
 
@@ -780,7 +789,7 @@ fn advertise_and_send_collation() {
 				None,
 			)
 			.await;
-			TestHarness { virtual_overseer, req_v1_cfg, req_vstaging_cfg }
+			TestHarness { virtual_overseer, req_v1_cfg, req_v2_cfg }
 		},
 	);
 }
@@ -798,7 +807,7 @@ fn delay_reputation_change() {
 		|test_harness| async move {
 			let mut virtual_overseer = test_harness.virtual_overseer;
 			let mut req_v1_cfg = test_harness.req_v1_cfg;
-			let req_vstaging_cfg = test_harness.req_vstaging_cfg;
+			let req_v2_cfg = test_harness.req_v2_cfg;
 
 			setup_system(&mut virtual_overseer, &test_state).await;
 
@@ -894,15 +903,15 @@ fn delay_reputation_change() {
 				);
 			}
 
-			TestHarness { virtual_overseer, req_v1_cfg, req_vstaging_cfg }
+			TestHarness { virtual_overseer, req_v1_cfg, req_v2_cfg }
 		},
 	);
 }
 
-/// Tests that collator side works with vstaging network protocol
+/// Tests that collator side works with v2 network protocol
 /// before async backing is enabled.
 #[test]
-fn advertise_collation_vstaging_protocol() {
+fn advertise_collation_v2_protocol() {
 	let test_state = TestState::default();
 	let local_peer_id = test_state.local_peer_id;
 	let collator_pair = test_state.collator_pair.clone();
@@ -932,21 +941,16 @@ fn advertise_collation_vstaging_protocol() {
 				Some(validators[0].clone()),
 			)
 			.await;
-			// The rest with vstaging.
+			// The rest with v2.
 			for (val, peer) in validators.iter().zip(peer_ids.iter()).skip(1) {
-				connect_peer(
-					virtual_overseer,
-					*peer,
-					CollationVersion::VStaging,
-					Some(val.clone()),
-				)
-				.await;
+				connect_peer(virtual_overseer, *peer, CollationVersion::V2, Some(val.clone()))
+					.await;
 			}
 
 			// Declare messages.
 			expect_declare_msg(virtual_overseer, &test_state, &peer_ids[0]).await;
 			for peer_id in peer_ids.iter().skip(1) {
-				prospective_parachains::expect_declare_msg_vstaging(
+				prospective_parachains::expect_declare_msg_v2(
 					virtual_overseer,
 					&test_state,
 					&peer_id,
@@ -972,7 +976,7 @@ fn advertise_collation_vstaging_protocol() {
 					virtual_overseer,
 					peer_id,
 					test_state.relay_parent,
-					Some(vec![candidate.hash()]), // This is `Some`, advertisement is vstaging.
+					Some(vec![candidate.hash()]), // This is `Some`, advertisement is v2.
 				)
 				.await;
 			}
@@ -1396,7 +1400,7 @@ fn connect_to_buffered_groups() {
 		|test_harness| async move {
 			let mut virtual_overseer = test_harness.virtual_overseer;
 			let mut req_cfg = test_harness.req_v1_cfg;
-			let req_vstaging_cfg = test_harness.req_vstaging_cfg;
+			let req_v2_cfg = test_harness.req_v2_cfg;
 
 			setup_system(&mut virtual_overseer, &test_state).await;
 
@@ -1501,7 +1505,7 @@ fn connect_to_buffered_groups() {
 				}
 			);
 
-			TestHarness { virtual_overseer, req_v1_cfg: req_cfg, req_vstaging_cfg }
+			TestHarness { virtual_overseer, req_v1_cfg: req_cfg, req_v2_cfg }
 		},
 	);
 }
diff --git a/polkadot/node/network/collator-protocol/src/collator_side/tests/prospective_parachains.rs b/polkadot/node/network/collator-protocol/src/collator_side/tests/prospective_parachains.rs
index 02e8d0a7a81da8833f14f2f2464df78fc8ff559f..fd9d7a746ebe49623ff0feebd48793e8e603807b 100644
--- a/polkadot/node/network/collator-protocol/src/collator_side/tests/prospective_parachains.rs
+++ b/polkadot/node/network/collator-protocol/src/collator_side/tests/prospective_parachains.rs
@@ -1,4 +1,4 @@
-// Copyright 2022 Parity Technologies (UK) Ltd.
+// Copyright (C) Parity Technologies (UK) Ltd.
 // This file is part of Polkadot.
 
 // Polkadot is free software: you can redistribute it and/or modify
@@ -19,10 +19,10 @@
 use super::*;
 
 use polkadot_node_subsystem::messages::{ChainApiMessage, ProspectiveParachainsMessage};
-use polkadot_primitives::{vstaging as vstaging_primitives, Header, OccupiedCore};
+use polkadot_primitives::{AsyncBackingParams, Header, OccupiedCore};
 
-const ASYNC_BACKING_PARAMETERS: vstaging_primitives::AsyncBackingParams =
-	vstaging_primitives::AsyncBackingParams { max_candidate_depth: 4, allowed_ancestry_len: 3 };
+const ASYNC_BACKING_PARAMETERS: AsyncBackingParams =
+	AsyncBackingParams { max_candidate_depth: 4, allowed_ancestry_len: 3 };
 
 fn get_parent_hash(hash: Hash) -> Hash {
 	Hash::from_low_u64_be(hash.to_low_u64_be() + 1)
@@ -52,7 +52,7 @@ async fn update_view(
 			overseer_recv(virtual_overseer).await,
 			AllMessages::RuntimeApi(RuntimeApiMessage::Request(
 				parent,
-				RuntimeApiRequest::StagingAsyncBackingParams(tx),
+				RuntimeApiRequest::AsyncBackingParams(tx),
 			)) => {
 				tx.send(Ok(ASYNC_BACKING_PARAMETERS)).unwrap();
 				(parent, new_view.get(&parent).copied().expect("Unknown parent requested"))
@@ -124,7 +124,7 @@ async fn update_view(
 }
 
 /// Check that the next received message is a `Declare` message.
-pub(super) async fn expect_declare_msg_vstaging(
+pub(super) async fn expect_declare_msg_v2(
 	virtual_overseer: &mut VirtualOverseer,
 	test_state: &TestState,
 	peer: &PeerId,
@@ -133,20 +133,20 @@ pub(super) async fn expect_declare_msg_vstaging(
 		overseer_recv(virtual_overseer).await,
 		AllMessages::NetworkBridgeTx(NetworkBridgeTxMessage::SendCollationMessage(
 			to,
-			Versioned::VStaging(protocol_vstaging::CollationProtocol::CollatorProtocol(
+			Versioned::V2(protocol_v2::CollationProtocol::CollatorProtocol(
 				wire_message,
 			)),
 		)) => {
 			assert_eq!(to[0], *peer);
 			assert_matches!(
 				wire_message,
-				protocol_vstaging::CollatorProtocolMessage::Declare(
+				protocol_v2::CollatorProtocolMessage::Declare(
 					collator_id,
 					para_id,
 					signature,
 				) => {
 					assert!(signature.verify(
-						&*protocol_vstaging::declare_signature_payload(&test_state.local_peer_id),
+						&*protocol_v2::declare_signature_payload(&test_state.local_peer_id),
 						&collator_id),
 					);
 					assert_eq!(collator_id, test_state.collator_pair.public());
@@ -203,13 +203,12 @@ fn distribute_collation_from_implicit_view() {
 				.into_iter()
 				.zip(validator_peer_ids.clone())
 			{
-				connect_peer(virtual_overseer, peer, CollationVersion::VStaging, Some(val.clone()))
-					.await;
+				connect_peer(virtual_overseer, peer, CollationVersion::V2, Some(val.clone())).await;
 			}
 
 			// Collator declared itself to each peer.
 			for peer_id in &validator_peer_ids {
-				expect_declare_msg_vstaging(virtual_overseer, &test_state, peer_id).await;
+				expect_declare_msg_v2(virtual_overseer, &test_state, peer_id).await;
 			}
 
 			let pov = PoV { block_data: BlockData(vec![1, 2, 3]) };
@@ -386,7 +385,7 @@ fn advertise_and_send_collation_by_hash() {
 		|test_harness| async move {
 			let mut virtual_overseer = test_harness.virtual_overseer;
 			let req_v1_cfg = test_harness.req_v1_cfg;
-			let mut req_vstaging_cfg = test_harness.req_vstaging_cfg;
+			let mut req_v2_cfg = test_harness.req_v2_cfg;
 
 			let head_a = Hash::from_low_u64_be(128);
 			let head_a_num: u32 = 64;
@@ -435,11 +434,11 @@ fn advertise_and_send_collation_by_hash() {
 			connect_peer(
 				&mut virtual_overseer,
 				peer,
-				CollationVersion::VStaging,
+				CollationVersion::V2,
 				Some(validator_id.clone()),
 			)
 			.await;
-			expect_declare_msg_vstaging(&mut virtual_overseer, &test_state, &peer).await;
+			expect_declare_msg_v2(&mut virtual_overseer, &test_state, &peer).await;
 
 			// Head `b` is not a leaf, but both advertisements are still relevant.
 			send_peer_view_change(&mut virtual_overseer, &peer, vec![head_b]).await;
@@ -449,13 +448,13 @@ fn advertise_and_send_collation_by_hash() {
 
 			for (candidate, pov_block) in candidates {
 				let (pending_response, rx) = oneshot::channel();
-				req_vstaging_cfg
+				req_v2_cfg
 					.inbound_queue
 					.as_mut()
 					.unwrap()
 					.send(RawIncomingRequest {
 						peer,
-						payload: request_vstaging::CollationFetchingRequest {
+						payload: request_v2::CollationFetchingRequest {
 							relay_parent: head_b,
 							para_id: test_state.para_id,
 							candidate_hash: candidate.hash(),
@@ -469,7 +468,7 @@ fn advertise_and_send_collation_by_hash() {
 				assert_matches!(
 					rx.await,
 					Ok(full_response) => {
-						// Response is the same for vstaging.
+						// Response is the same for v2.
 						let request_v1::CollationFetchingResponse::Collation(receipt, pov): request_v1::CollationFetchingResponse
 							= request_v1::CollationFetchingResponse::decode(
 								&mut full_response.result
@@ -482,7 +481,7 @@ fn advertise_and_send_collation_by_hash() {
 				);
 			}
 
-			TestHarness { virtual_overseer, req_v1_cfg, req_vstaging_cfg }
+			TestHarness { virtual_overseer, req_v1_cfg, req_v2_cfg }
 		},
 	)
 }
@@ -552,11 +551,11 @@ fn advertise_core_occupied() {
 			connect_peer(
 				virtual_overseer,
 				peer_ids[0],
-				CollationVersion::VStaging,
+				CollationVersion::V2,
 				Some(validators[0].clone()),
 			)
 			.await;
-			expect_declare_msg_vstaging(virtual_overseer, &test_state, &peer_ids[0]).await;
+			expect_declare_msg_v2(virtual_overseer, &test_state, &peer_ids[0]).await;
 			// Peer is aware of the leaf.
 			send_peer_view_change(virtual_overseer, &peer_ids[0], vec![head_a]).await;
 
diff --git a/polkadot/node/network/collator-protocol/src/lib.rs b/polkadot/node/network/collator-protocol/src/lib.rs
index 62c033954f75a00fb2c1b50a3afb0b858b977c5f..1edc67664172400503158f8a451756ca3674a3d9 100644
--- a/polkadot/node/network/collator-protocol/src/lib.rs
+++ b/polkadot/node/network/collator-protocol/src/lib.rs
@@ -32,7 +32,7 @@ use polkadot_node_subsystem_util::reputation::ReputationAggregator;
 use sp_keystore::KeystorePtr;
 
 use polkadot_node_network_protocol::{
-	request_response::{v1 as request_v1, vstaging as protocol_vstaging, IncomingRequestReceiver},
+	request_response::{v1 as request_v1, v2 as protocol_v2, IncomingRequestReceiver},
 	PeerId, UnifiedReputationChange as Rep,
 };
 use polkadot_primitives::CollatorPair;
@@ -83,9 +83,8 @@ pub enum ProtocolSide {
 		collator_pair: CollatorPair,
 		/// Receiver for v1 collation fetching requests.
 		request_receiver_v1: IncomingRequestReceiver<request_v1::CollationFetchingRequest>,
-		/// Receiver for vstaging collation fetching requests.
-		request_receiver_vstaging:
-			IncomingRequestReceiver<protocol_vstaging::CollationFetchingRequest>,
+		/// Receiver for v2 collation fetching requests.
+		request_receiver_v2: IncomingRequestReceiver<protocol_v2::CollationFetchingRequest>,
 		/// Metrics.
 		metrics: collator_side::Metrics,
 	},
@@ -121,14 +120,14 @@ impl<Context> CollatorProtocolSubsystem {
 				peer_id,
 				collator_pair,
 				request_receiver_v1,
-				request_receiver_vstaging,
+				request_receiver_v2,
 				metrics,
 			} => collator_side::run(
 				ctx,
 				peer_id,
 				collator_pair,
 				request_receiver_v1,
-				request_receiver_vstaging,
+				request_receiver_v2,
 				metrics,
 			)
 			.map_err(|e| SubsystemError::with_origin("collator-protocol", e))
diff --git a/polkadot/node/network/collator-protocol/src/validator_side/collation.rs b/polkadot/node/network/collator-protocol/src/validator_side/collation.rs
index ba59cce56b60aa454b5fc00abf99d39efa0cb971..a53e0028b9e70455f3dd918bad58fc5ec472c173 100644
--- a/polkadot/node/network/collator-protocol/src/validator_side/collation.rs
+++ b/polkadot/node/network/collator-protocol/src/validator_side/collation.rs
@@ -1,4 +1,4 @@
-// Copyright 2017-2022 Parity Technologies (UK) Ltd.
+// Copyright (C) Parity Technologies (UK) Ltd.
 // This file is part of Polkadot.
 
 // Polkadot is free software: you can redistribute it and/or modify
@@ -119,7 +119,7 @@ impl PendingCollation {
 	}
 }
 
-/// vstaging advertisement that was rejected by the backing
+/// v2 advertisement that was rejected by the backing
 /// subsystem. Validator may fetch it later if its fragment
 /// membership gets recognized before relay parent goes out of view.
 #[derive(Debug, Clone)]
diff --git a/polkadot/node/network/collator-protocol/src/validator_side/metrics.rs b/polkadot/node/network/collator-protocol/src/validator_side/metrics.rs
index d898a5e7cefdfd3d7de5b0a338aca2b65f682ac3..195a135947d88b460d3699828f1fb66a3fdb731a 100644
--- a/polkadot/node/network/collator-protocol/src/validator_side/metrics.rs
+++ b/polkadot/node/network/collator-protocol/src/validator_side/metrics.rs
@@ -1,4 +1,4 @@
-// Copyright 2017-2023 Parity Technologies (UK) Ltd.
+// Copyright (C) Parity Technologies (UK) Ltd.
 // This file is part of Polkadot.
 
 // Polkadot is free software: you can redistribute it and/or modify
diff --git a/polkadot/node/network/collator-protocol/src/validator_side/mod.rs b/polkadot/node/network/collator-protocol/src/validator_side/mod.rs
index e8cf769d2e5f336f17053cc6471366ae18d694a9..fcb408d54b1b72b856b2439bd2eb1823020fb513 100644
--- a/polkadot/node/network/collator-protocol/src/validator_side/mod.rs
+++ b/polkadot/node/network/collator-protocol/src/validator_side/mod.rs
@@ -34,10 +34,10 @@ use polkadot_node_network_protocol::{
 	peer_set::{CollationVersion, PeerSet},
 	request_response::{
 		outgoing::{Recipient, RequestError},
-		v1 as request_v1, vstaging as request_vstaging, OutgoingRequest, Requests,
+		v1 as request_v1, v2 as request_v2, OutgoingRequest, Requests,
 	},
-	v1 as protocol_v1, vstaging as protocol_vstaging, OurView, PeerId,
-	UnifiedReputationChange as Rep, Versioned, View,
+	v1 as protocol_v1, v2 as protocol_v2, OurView, PeerId, UnifiedReputationChange as Rep,
+	Versioned, View,
 };
 use polkadot_node_primitives::{SignedFullStatement, Statement};
 use polkadot_node_subsystem::{
@@ -624,13 +624,9 @@ async fn notify_collation_seconded(
 		CollationVersion::V1 => Versioned::V1(protocol_v1::CollationProtocol::CollatorProtocol(
 			protocol_v1::CollatorProtocolMessage::CollationSeconded(relay_parent, statement),
 		)),
-		CollationVersion::VStaging =>
-			Versioned::VStaging(protocol_vstaging::CollationProtocol::CollatorProtocol(
-				protocol_vstaging::CollatorProtocolMessage::CollationSeconded(
-					relay_parent,
-					statement,
-				),
-			)),
+		CollationVersion::V2 => Versioned::V2(protocol_v2::CollationProtocol::CollatorProtocol(
+			protocol_v2::CollatorProtocolMessage::CollationSeconded(relay_parent, statement),
+		)),
 	};
 	sender
 		.send_message(NetworkBridgeTxMessage::SendCollationMessage(vec![peer_id], wire_message))
@@ -694,16 +690,12 @@ async fn request_collation(
 			let requests = Requests::CollationFetchingV1(req);
 			(requests, response_recv.boxed())
 		},
-		(CollationVersion::VStaging, Some(ProspectiveCandidate { candidate_hash, .. })) => {
+		(CollationVersion::V2, Some(ProspectiveCandidate { candidate_hash, .. })) => {
 			let (req, response_recv) = OutgoingRequest::new(
 				Recipient::Peer(peer_id),
-				request_vstaging::CollationFetchingRequest {
-					relay_parent,
-					para_id,
-					candidate_hash,
-				},
+				request_v2::CollationFetchingRequest { relay_parent, para_id, candidate_hash },
 			);
-			let requests = Requests::CollationFetchingVStaging(req);
+			let requests = Requests::CollationFetchingV2(req);
 			(requests, response_recv.boxed())
 		},
 		_ => return Err(FetchError::ProtocolMismatch),
@@ -758,18 +750,15 @@ async fn process_incoming_peer_message<Context>(
 	ctx: &mut Context,
 	state: &mut State,
 	origin: PeerId,
-	msg: Versioned<
-		protocol_v1::CollatorProtocolMessage,
-		protocol_vstaging::CollatorProtocolMessage,
-	>,
+	msg: Versioned<protocol_v1::CollatorProtocolMessage, protocol_v2::CollatorProtocolMessage>,
 ) {
 	use protocol_v1::CollatorProtocolMessage as V1;
-	use protocol_vstaging::CollatorProtocolMessage as VStaging;
+	use protocol_v2::CollatorProtocolMessage as V2;
 	use sp_runtime::traits::AppVerify;
 
 	match msg {
 		Versioned::V1(V1::Declare(collator_id, para_id, signature)) |
-		Versioned::VStaging(VStaging::Declare(collator_id, para_id, signature)) => {
+		Versioned::V2(V2::Declare(collator_id, para_id, signature)) => {
 			if collator_peer_id(&state.peer_data, &collator_id).is_some() {
 				modify_reputation(
 					&mut state.reputation,
@@ -881,7 +870,7 @@ async fn process_incoming_peer_message<Context>(
 					modify_reputation(&mut state.reputation, ctx.sender(), origin, rep).await;
 				}
 			},
-		Versioned::VStaging(VStaging::AdvertiseCollation {
+		Versioned::V2(V2::AdvertiseCollation {
 			relay_parent,
 			candidate_hash,
 			parent_head_data_hash,
@@ -901,15 +890,14 @@ async fn process_incoming_peer_message<Context>(
 					?relay_parent,
 					?candidate_hash,
 					error = ?err,
-					"Rejected vstaging advertisement",
+					"Rejected v2 advertisement",
 				);
 
 				if let Some(rep) = err.reputation_changes() {
 					modify_reputation(&mut state.reputation, ctx.sender(), origin, rep).await;
 				}
 			},
-		Versioned::V1(V1::CollationSeconded(..)) |
-		Versioned::VStaging(VStaging::CollationSeconded(..)) => {
+		Versioned::V1(V1::CollationSeconded(..)) | Versioned::V2(V2::CollationSeconded(..)) => {
 			gum::warn!(
 				target: LOG_TARGET,
 				peer_id = ?origin,
@@ -1074,7 +1062,7 @@ where
 	};
 
 	if relay_parent_mode.is_enabled() && prospective_candidate.is_none() {
-		// Expected vstaging advertisement.
+		// Expected v2 advertisement.
 		return Err(AdvertisementError::ProtocolMismatch)
 	}
 
diff --git a/polkadot/node/network/collator-protocol/src/validator_side/tests/mod.rs b/polkadot/node/network/collator-protocol/src/validator_side/tests/mod.rs
index 1cb656e325d325e6e824a3ea9ec5669f78d35424..9812998aab763cee54e1dac5232c1c9bddb4651b 100644
--- a/polkadot/node/network/collator-protocol/src/validator_side/tests/mod.rs
+++ b/polkadot/node/network/collator-protocol/src/validator_side/tests/mod.rs
@@ -357,7 +357,7 @@ async fn assert_fetch_collation_request(
 			),
 			Some(candidate_hash) => assert_matches!(
 				req,
-				Requests::CollationFetchingVStaging(req) => {
+				Requests::CollationFetchingV2(req) => {
 					let payload = req.payload;
 					assert_eq!(payload.relay_parent, relay_parent);
 					assert_eq!(payload.para_id, para_id);
@@ -394,12 +394,11 @@ async fn connect_and_declare_collator(
 			para_id,
 			collator.sign(&protocol_v1::declare_signature_payload(&peer)),
 		)),
-		CollationVersion::VStaging =>
-			Versioned::VStaging(protocol_vstaging::CollatorProtocolMessage::Declare(
-				collator.public(),
-				para_id,
-				collator.sign(&protocol_v1::declare_signature_payload(&peer)),
-			)),
+		CollationVersion::V2 => Versioned::V2(protocol_v2::CollatorProtocolMessage::Declare(
+			collator.public(),
+			para_id,
+			collator.sign(&protocol_v1::declare_signature_payload(&peer)),
+		)),
 	};
 
 	overseer_send(
@@ -421,7 +420,7 @@ async fn advertise_collation(
 ) {
 	let wire_message = match candidate {
 		Some((candidate_hash, parent_head_data_hash)) =>
-			Versioned::VStaging(protocol_vstaging::CollatorProtocolMessage::AdvertiseCollation {
+			Versioned::V2(protocol_v2::CollatorProtocolMessage::AdvertiseCollation {
 				relay_parent,
 				candidate_hash,
 				parent_head_data_hash,
@@ -444,7 +443,7 @@ async fn assert_async_backing_params_request(virtual_overseer: &mut VirtualOvers
 		overseer_recv(virtual_overseer).await,
 		AllMessages::RuntimeApi(RuntimeApiMessage::Request(
 			relay_parent,
-			RuntimeApiRequest::StagingAsyncBackingParams(tx)
+			RuntimeApiRequest::AsyncBackingParams(tx)
 		)) => {
 			assert_eq!(relay_parent, hash);
 			tx.send(Err(ASYNC_BACKING_DISABLED_ERROR)).unwrap();
@@ -499,10 +498,10 @@ fn act_on_advertisement() {
 	});
 }
 
-/// Tests that validator side works with vstaging network protocol
+/// Tests that validator side works with v2 network protocol
 /// before async backing is enabled.
 #[test]
-fn act_on_advertisement_vstaging() {
+fn act_on_advertisement_v2() {
 	let test_state = TestState::default();
 
 	test_harness(ReputationAggregator::new(|_| true), |test_harness| async move {
@@ -529,13 +528,13 @@ fn act_on_advertisement_vstaging() {
 			peer_b,
 			pair.clone(),
 			test_state.chain_ids[0],
-			CollationVersion::VStaging,
+			CollationVersion::V2,
 		)
 		.await;
 
 		let candidate_hash = CandidateHash::default();
 		let parent_head_data_hash = Hash::zero();
-		// vstaging advertisement.
+		// v2 advertisement.
 		advertise_collation(
 			&mut virtual_overseer,
 			peer_b,
diff --git a/polkadot/node/network/collator-protocol/src/validator_side/tests/prospective_parachains.rs b/polkadot/node/network/collator-protocol/src/validator_side/tests/prospective_parachains.rs
index a803827792d8b6ed51c17e13d5d238b6809d0097..4da0f11da39002fe035c618608e44ffca2939e94 100644
--- a/polkadot/node/network/collator-protocol/src/validator_side/tests/prospective_parachains.rs
+++ b/polkadot/node/network/collator-protocol/src/validator_side/tests/prospective_parachains.rs
@@ -1,4 +1,4 @@
-// Copyright 2022 Parity Technologies (UK) Ltd.
+// Copyright (C) Parity Technologies (UK) Ltd.
 // This file is part of Polkadot.
 
 // Polkadot is free software: you can redistribute it and/or modify
@@ -20,12 +20,12 @@ use super::*;
 
 use polkadot_node_subsystem::messages::ChainApiMessage;
 use polkadot_primitives::{
-	vstaging as vstaging_primitives, BlockNumber, CandidateCommitments, CommittedCandidateReceipt,
-	Header, SigningContext, ValidatorId,
+	AsyncBackingParams, BlockNumber, CandidateCommitments, CommittedCandidateReceipt, Header,
+	SigningContext, ValidatorId,
 };
 
-const ASYNC_BACKING_PARAMETERS: vstaging_primitives::AsyncBackingParams =
-	vstaging_primitives::AsyncBackingParams { max_candidate_depth: 4, allowed_ancestry_len: 3 };
+const ASYNC_BACKING_PARAMETERS: AsyncBackingParams =
+	AsyncBackingParams { max_candidate_depth: 4, allowed_ancestry_len: 3 };
 
 fn get_parent_hash(hash: Hash) -> Hash {
 	Hash::from_low_u64_be(hash.to_low_u64_be() + 1)
@@ -97,7 +97,7 @@ async fn update_view(
 			overseer_recv(virtual_overseer).await,
 			AllMessages::RuntimeApi(RuntimeApiMessage::Request(
 				parent,
-				RuntimeApiRequest::StagingAsyncBackingParams(tx),
+				RuntimeApiRequest::AsyncBackingParams(tx),
 			)) => {
 				tx.send(Ok(ASYNC_BACKING_PARAMETERS)).unwrap();
 				(parent, new_view.get(&parent).copied().expect("Unknown parent requested"))
@@ -226,8 +226,8 @@ async fn assert_collation_seconded(
 		overseer_recv(virtual_overseer).await,
 		AllMessages::NetworkBridgeTx(NetworkBridgeTxMessage::SendCollationMessage(
 			peers,
-			Versioned::VStaging(protocol_vstaging::CollationProtocol::CollatorProtocol(
-				protocol_vstaging::CollatorProtocolMessage::CollationSeconded(
+			Versioned::V2(protocol_v2::CollationProtocol::CollatorProtocol(
+				protocol_v2::CollatorProtocolMessage::CollationSeconded(
 					_relay_parent,
 					..,
 				),
@@ -306,7 +306,7 @@ fn accept_advertisements_from_implicit_view() {
 			peer_a,
 			pair_a.clone(),
 			test_state.chain_ids[0],
-			CollationVersion::VStaging,
+			CollationVersion::V2,
 		)
 		.await;
 		connect_and_declare_collator(
@@ -314,7 +314,7 @@ fn accept_advertisements_from_implicit_view() {
 			peer_b,
 			pair_b.clone(),
 			test_state.chain_ids[1],
-			CollationVersion::VStaging,
+			CollationVersion::V2,
 		)
 		.await;
 
@@ -406,7 +406,7 @@ fn second_multiple_candidates_per_relay_parent() {
 			peer_a,
 			pair.clone(),
 			test_state.chain_ids[0],
-			CollationVersion::VStaging,
+			CollationVersion::V2,
 		)
 		.await;
 
@@ -457,7 +457,7 @@ fn second_multiple_candidates_per_relay_parent() {
 			let pov = PoV { block_data: BlockData(vec![1]) };
 
 			response_channel
-				.send(Ok(request_vstaging::CollationFetchingResponse::Collation(
+				.send(Ok(request_v2::CollationFetchingResponse::Collation(
 					candidate.clone(),
 					pov.clone(),
 				)
@@ -514,7 +514,7 @@ fn second_multiple_candidates_per_relay_parent() {
 			peer_b,
 			pair_b.clone(),
 			test_state.chain_ids[0],
-			CollationVersion::VStaging,
+			CollationVersion::V2,
 		)
 		.await;
 
@@ -562,7 +562,7 @@ fn fetched_collation_sanity_check() {
 			peer_a,
 			pair.clone(),
 			test_state.chain_ids[0],
-			CollationVersion::VStaging,
+			CollationVersion::V2,
 		)
 		.await;
 
@@ -611,7 +611,7 @@ fn fetched_collation_sanity_check() {
 		let pov = PoV { block_data: BlockData(vec![1]) };
 
 		response_channel
-			.send(Ok(request_vstaging::CollationFetchingResponse::Collation(
+			.send(Ok(request_v2::CollationFetchingResponse::Collation(
 				candidate.clone(),
 				pov.clone(),
 			)
@@ -668,7 +668,7 @@ fn advertisement_spam_protection() {
 			peer_a,
 			pair_a.clone(),
 			test_state.chain_ids[1],
-			CollationVersion::VStaging,
+			CollationVersion::V2,
 		)
 		.await;
 
@@ -748,7 +748,7 @@ fn backed_candidate_unblocks_advertisements() {
 			peer_a,
 			pair_a.clone(),
 			test_state.chain_ids[0],
-			CollationVersion::VStaging,
+			CollationVersion::V2,
 		)
 		.await;
 		connect_and_declare_collator(
@@ -756,7 +756,7 @@ fn backed_candidate_unblocks_advertisements() {
 			peer_b,
 			pair_b.clone(),
 			test_state.chain_ids[1],
-			CollationVersion::VStaging,
+			CollationVersion::V2,
 		)
 		.await;
 
@@ -856,7 +856,7 @@ fn active_leave_unblocks_advertisements() {
 				*peer_id,
 				peer.clone(),
 				test_state.chain_ids[0],
-				CollationVersion::VStaging,
+				CollationVersion::V2,
 			)
 			.await;
 		}
diff --git a/polkadot/node/network/dispute-distribution/Cargo.toml b/polkadot/node/network/dispute-distribution/Cargo.toml
index 24f597bacadd6c73c7291762e4760640a544f944..5d8e245d289a7637f9c64c069f6038ab41946c49 100644
--- a/polkadot/node/network/dispute-distribution/Cargo.toml
+++ b/polkadot/node/network/dispute-distribution/Cargo.toml
@@ -1,6 +1,6 @@
 [package]
 name = "polkadot-dispute-distribution"
-version.workspace = true
+version = "1.0.0"
 authors.workspace = true
 edition.workspace = true
 license.workspace = true
@@ -20,9 +20,9 @@ polkadot-node-primitives = { path = "../../primitives" }
 sc-network = { path = "../../../../substrate/client/network" }
 sp-application-crypto = { path = "../../../../substrate/primitives/application-crypto" }
 sp-keystore = { path = "../../../../substrate/primitives/keystore" }
-thiserror = "1.0.31"
+thiserror = "1.0.48"
 fatality = "0.0.6"
-lru = "0.11.0"
+schnellru = "0.2.1"
 indexmap = "1.9.1"
 
 [dev-dependencies]
diff --git a/polkadot/node/network/dispute-distribution/src/lib.rs b/polkadot/node/network/dispute-distribution/src/lib.rs
index ad99bc41fa64d772b29f149e3c8de32834692395..2b4466fc2fc558ab4e29844dec0ac7adb5e8d6c0 100644
--- a/polkadot/node/network/dispute-distribution/src/lib.rs
+++ b/polkadot/node/network/dispute-distribution/src/lib.rs
@@ -21,10 +21,10 @@
 //! - a sender
 //! - and a receiver
 //!
-//! The sender is responsible for getting our vote out, see [`sender`]. The receiver handles
-//! incoming [`DisputeRequest`]s and offers spam protection, see [`receiver`].
+//! The sender is responsible for getting our vote out, see `sender`. The receiver handles
+//! incoming [`DisputeRequest`](v1::DisputeRequest)s and offers spam protection, see `receiver`.
 
-use std::{num::NonZeroUsize, time::Duration};
+use std::time::Duration;
 
 use futures::{channel::mpsc, FutureExt, StreamExt, TryFutureExt};
 
@@ -165,8 +165,7 @@ where
 	) -> Self {
 		let runtime = RuntimeInfo::new_with_config(runtime::Config {
 			keystore: Some(keystore),
-			session_cache_lru_size: NonZeroUsize::new(DISPUTE_WINDOW.get() as usize)
-				.expect("Dispute window can not be 0; qed"),
+			session_cache_lru_size: DISPUTE_WINDOW.get(),
 		});
 		let (tx, sender_rx) = NestingSender::new_root(1);
 		let disputes_sender = DisputeSender::new(tx, metrics.clone());
diff --git a/polkadot/node/network/dispute-distribution/src/receiver/mod.rs b/polkadot/node/network/dispute-distribution/src/receiver/mod.rs
index 827a77281ccb3c78b36429370df801bdfcf160e2..2b3fc45983a98f67954a16fd342d76ac8068ae07 100644
--- a/polkadot/node/network/dispute-distribution/src/receiver/mod.rs
+++ b/polkadot/node/network/dispute-distribution/src/receiver/mod.rs
@@ -15,7 +15,6 @@
 // along with Polkadot.  If not, see <http://www.gnu.org/licenses/>.
 
 use std::{
-	num::NonZeroUsize,
 	pin::Pin,
 	task::{Context, Poll},
 	time::Duration,
@@ -161,8 +160,7 @@ where
 	) -> Self {
 		let runtime = RuntimeInfo::new_with_config(runtime::Config {
 			keystore: None,
-			session_cache_lru_size: NonZeroUsize::new(DISPUTE_WINDOW.get() as usize)
-				.expect("Dispute window can not be 0; qed"),
+			session_cache_lru_size: DISPUTE_WINDOW.get(),
 		});
 		Self {
 			runtime,
diff --git a/polkadot/node/network/dispute-distribution/src/tests/mod.rs b/polkadot/node/network/dispute-distribution/src/tests/mod.rs
index bc8e8e8be16059ddd3c4a9ae1bda4b5aa449dbff..96f045cbf769219e737b4366fb0c96201c9c3b6e 100644
--- a/polkadot/node/network/dispute-distribution/src/tests/mod.rs
+++ b/polkadot/node/network/dispute-distribution/src/tests/mod.rs
@@ -19,7 +19,6 @@
 
 use std::{
 	collections::HashSet,
-	sync::Arc,
 	task::Poll,
 	time::{Duration, Instant},
 };
@@ -51,13 +50,15 @@ use polkadot_node_subsystem::{
 		AllMessages, DisputeCoordinatorMessage, DisputeDistributionMessage, ImportStatementsResult,
 		NetworkBridgeTxMessage, RuntimeApiMessage, RuntimeApiRequest,
 	},
-	ActivatedLeaf, ActiveLeavesUpdate, FromOrchestra, LeafStatus, OverseerSignal, Span,
+	ActiveLeavesUpdate, FromOrchestra, OverseerSignal,
 };
 use polkadot_node_subsystem_test_helpers::{
-	mock::make_ferdie_keystore, subsystem_test_harness, TestSubsystemContextHandle,
+	mock::{make_ferdie_keystore, new_leaf},
+	subsystem_test_harness, TestSubsystemContextHandle,
 };
 use polkadot_primitives::{
-	AuthorityDiscoveryId, CandidateHash, CandidateReceipt, Hash, SessionIndex, SessionInfo,
+	AuthorityDiscoveryId, CandidateHash, CandidateReceipt, ExecutorParams, Hash, SessionIndex,
+	SessionInfo,
 };
 
 use self::mock::{
@@ -635,6 +636,16 @@ async fn nested_network_dispute_request<'a, F, O>(
 			},
 			unexpected => panic!("Unexpected message {:?}", unexpected),
 		}
+		match handle.recv().await {
+			AllMessages::RuntimeApi(RuntimeApiMessage::Request(
+				_,
+				RuntimeApiRequest::SessionExecutorParams(_, tx),
+			)) => {
+				tx.send(Ok(Some(ExecutorParams::default())))
+					.expect("Receiver should stay alive.");
+			},
+			unexpected => panic!("Unexpected message {:?}", unexpected),
+		}
 	}
 
 	// Import should get initiated:
@@ -724,12 +735,7 @@ async fn activate_leaf(
 ) {
 	handle
 		.send(FromOrchestra::Signal(OverseerSignal::ActiveLeaves(ActiveLeavesUpdate {
-			activated: Some(ActivatedLeaf {
-				hash: activate,
-				number: 10,
-				status: LeafStatus::Fresh,
-				span: Arc::new(Span::Disabled),
-			}),
+			activated: Some(new_leaf(activate, 10)),
 			deactivated: deactivate.into_iter().collect(),
 		})))
 		.await;
@@ -746,15 +752,27 @@ async fn activate_leaf(
 
 	if let Some(session_info) = new_session {
 		assert_matches!(
-		handle.recv().await,
-		AllMessages::RuntimeApi(RuntimeApiMessage::Request(
-			h,
-			RuntimeApiRequest::SessionInfo(session_idx, tx)
-		)) => {
-			assert_eq!(h, activate);
-			assert_eq!(session_index, session_idx);
-			tx.send(Ok(Some(session_info))).expect("Receiver should stay alive.");
-		});
+			handle.recv().await,
+			AllMessages::RuntimeApi(RuntimeApiMessage::Request(
+				h,
+				RuntimeApiRequest::SessionInfo(session_idx, tx)
+			)) => {
+				assert_eq!(h, activate);
+				assert_eq!(session_index, session_idx);
+				tx.send(Ok(Some(session_info))).expect("Receiver should stay alive.");
+			}
+		);
+		assert_matches!(
+			handle.recv().await,
+			AllMessages::RuntimeApi(RuntimeApiMessage::Request(
+				h,
+				RuntimeApiRequest::SessionExecutorParams(session_idx, tx)
+			)) => {
+				assert_eq!(h, activate);
+				assert_eq!(session_index, session_idx);
+				tx.send(Ok(Some(ExecutorParams::default()))).expect("Receiver should stay alive.");
+			}
+		);
 	}
 
 	assert_matches!(
diff --git a/polkadot/node/network/gossip-support/Cargo.toml b/polkadot/node/network/gossip-support/Cargo.toml
index 5549aa1f7362afd2bc16a3e78381b5d5600478c8..a5bfda73833f32d354bd111948104d9aa73e709f 100644
--- a/polkadot/node/network/gossip-support/Cargo.toml
+++ b/polkadot/node/network/gossip-support/Cargo.toml
@@ -1,6 +1,6 @@
 [package]
 name = "polkadot-gossip-support"
-version.workspace = true
+version = "1.0.0"
 authors.workspace = true
 edition.workspace = true
 license.workspace = true
diff --git a/polkadot/node/network/gossip-support/src/lib.rs b/polkadot/node/network/gossip-support/src/lib.rs
index c5dc1ba14bd35b5127ff27c0c3d0732e0e56178c..4fa23507e86bd145782d068b0aa84d0cf2c98ba6 100644
--- a/polkadot/node/network/gossip-support/src/lib.rs
+++ b/polkadot/node/network/gossip-support/src/lib.rs
@@ -452,7 +452,7 @@ where
 				// match void -> LLVM unreachable
 				match message {
 					Versioned::V1(m) => match m {},
-					Versioned::VStaging(m) => match m {},
+					Versioned::V2(m) => match m {},
 				}
 			},
 		}
diff --git a/polkadot/node/network/gossip-support/src/tests.rs b/polkadot/node/network/gossip-support/src/tests.rs
index 20f550514157d7c542805fcc26db06b672ce8194..2e909bb0a67433e667ae87d679005091fe505810 100644
--- a/polkadot/node/network/gossip-support/src/tests.rs
+++ b/polkadot/node/network/gossip-support/src/tests.rs
@@ -16,7 +16,7 @@
 
 //! Unit tests for Gossip Support Subsystem.
 
-use std::{collections::HashSet, sync::Arc, time::Duration};
+use std::{collections::HashSet, time::Duration};
 
 use assert_matches::assert_matches;
 use async_trait::async_trait;
@@ -30,15 +30,11 @@ use sp_core::crypto::Pair as PairT;
 use sp_keyring::Sr25519Keyring;
 
 use polkadot_node_network_protocol::grid_topology::{SessionGridTopology, TopologyPeerInfo};
-use polkadot_node_subsystem::{
-	jaeger,
-	messages::{AllMessages, RuntimeApiMessage, RuntimeApiRequest},
-	ActivatedLeaf, LeafStatus,
-};
+use polkadot_node_subsystem::messages::{AllMessages, RuntimeApiMessage, RuntimeApiRequest};
 use polkadot_node_subsystem_test_helpers as test_helpers;
 use polkadot_node_subsystem_util::TimeoutExt as _;
 use polkadot_primitives::{GroupIndex, IndexedVec};
-use test_helpers::mock::make_ferdie_keystore;
+use test_helpers::mock::{make_ferdie_keystore, new_leaf};
 
 use super::*;
 
@@ -196,12 +192,7 @@ fn test_harness<T: Future<Output = VirtualOverseer>, AD: AuthorityDiscovery>(
 const TIMEOUT: Duration = Duration::from_millis(100);
 
 async fn overseer_signal_active_leaves(overseer: &mut VirtualOverseer, leaf: Hash) {
-	let leaf = ActivatedLeaf {
-		hash: leaf,
-		number: 0xdeadcafe,
-		status: LeafStatus::Fresh,
-		span: Arc::new(jaeger::Span::Disabled),
-	};
+	let leaf = new_leaf(leaf, 0xdeadcafe);
 	overseer
 		.send(FromOrchestra::Signal(OverseerSignal::ActiveLeaves(ActiveLeavesUpdate::start_work(
 			leaf,
diff --git a/polkadot/node/network/protocol/Cargo.toml b/polkadot/node/network/protocol/Cargo.toml
index 076df31be7e0515ddb924599040901dba0619ee7..379334ded24acde67100de5b61069d5cb5909ce4 100644
--- a/polkadot/node/network/protocol/Cargo.toml
+++ b/polkadot/node/network/protocol/Cargo.toml
@@ -1,6 +1,6 @@
 [package]
 name = "polkadot-node-network-protocol"
-version.workspace = true
+version = "1.0.0"
 authors.workspace = true
 edition.workspace = true
 license.workspace = true
@@ -18,7 +18,7 @@ sc-network = { path = "../../../../substrate/client/network" }
 sc-authority-discovery = { path = "../../../../substrate/client/authority-discovery" }
 strum = { version = "0.24", features = ["derive"] }
 futures = "0.3.21"
-thiserror = "1.0.31"
+thiserror = "1.0.48"
 fatality = "0.0.6"
 rand = "0.8"
 derive_more = "0.99"
@@ -27,6 +27,3 @@ bitvec = "1"
 
 [dev-dependencies]
 rand_chacha = "0.3.1"
-
-[features]
-network-protocol-staging = []
diff --git a/polkadot/node/network/protocol/src/authority_discovery.rs b/polkadot/node/network/protocol/src/authority_discovery.rs
index 0cf11b93d18439ae400f967540d4a926d3ba553d..beb5409d4ac04a58b1ba276fdfd8f7c6cae030f7 100644
--- a/polkadot/node/network/protocol/src/authority_discovery.rs
+++ b/polkadot/node/network/protocol/src/authority_discovery.rs
@@ -30,12 +30,12 @@ use sc_network::{Multiaddr, PeerId};
 /// Needed for mocking in tests mostly.
 #[async_trait]
 pub trait AuthorityDiscovery: Send + Debug + 'static {
-	/// Get the addresses for the given [`AuthorityId`] from the local address cache.
+	/// Get the addresses for the given [`AuthorityDiscoveryId`] from the local address cache.
 	async fn get_addresses_by_authority_id(
 		&mut self,
 		authority: AuthorityDiscoveryId,
 	) -> Option<HashSet<Multiaddr>>;
-	/// Get the [`AuthorityId`] for the given [`PeerId`] from the local address cache.
+	/// Get the [`AuthorityDiscoveryId`] for the given [`PeerId`] from the local address cache.
 	async fn get_authority_ids_by_peer_id(
 		&mut self,
 		peer_id: PeerId,
diff --git a/polkadot/node/network/protocol/src/lib.rs b/polkadot/node/network/protocol/src/lib.rs
index 1bed2c12fe202ce51ae07d50b0d07ca6282b669d..901ac99b66933a77b95ccb1c55fd22930fc5a34a 100644
--- a/polkadot/node/network/protocol/src/lib.rs
+++ b/polkadot/node/network/protocol/src/lib.rs
@@ -253,26 +253,25 @@ impl View {
 
 /// A protocol-versioned type.
 #[derive(Debug, Clone, PartialEq, Eq)]
-pub enum Versioned<V1, VStaging> {
+pub enum Versioned<V1, V2> {
 	/// V1 type.
 	V1(V1),
-	/// VStaging type.
-	VStaging(VStaging),
+	/// V2 type.
+	V2(V2),
 }
 
-impl<V1: Clone, VStaging: Clone> Versioned<&'_ V1, &'_ VStaging> {
+impl<V1: Clone, V2: Clone> Versioned<&'_ V1, &'_ V2> {
 	/// Convert to a fully-owned version of the message.
-	pub fn clone_inner(&self) -> Versioned<V1, VStaging> {
+	pub fn clone_inner(&self) -> Versioned<V1, V2> {
 		match *self {
 			Versioned::V1(inner) => Versioned::V1(inner.clone()),
-			Versioned::VStaging(inner) => Versioned::VStaging(inner.clone()),
+			Versioned::V2(inner) => Versioned::V2(inner.clone()),
 		}
 	}
 }
 
 /// All supported versions of the validation protocol message.
-pub type VersionedValidationProtocol =
-	Versioned<v1::ValidationProtocol, vstaging::ValidationProtocol>;
+pub type VersionedValidationProtocol = Versioned<v1::ValidationProtocol, v2::ValidationProtocol>;
 
 impl From<v1::ValidationProtocol> for VersionedValidationProtocol {
 	fn from(v1: v1::ValidationProtocol) -> Self {
@@ -280,14 +279,14 @@ impl From<v1::ValidationProtocol> for VersionedValidationProtocol {
 	}
 }
 
-impl From<vstaging::ValidationProtocol> for VersionedValidationProtocol {
-	fn from(vstaging: vstaging::ValidationProtocol) -> Self {
-		VersionedValidationProtocol::VStaging(vstaging)
+impl From<v2::ValidationProtocol> for VersionedValidationProtocol {
+	fn from(v2: v2::ValidationProtocol) -> Self {
+		VersionedValidationProtocol::V2(v2)
 	}
 }
 
 /// All supported versions of the collation protocol message.
-pub type VersionedCollationProtocol = Versioned<v1::CollationProtocol, vstaging::CollationProtocol>;
+pub type VersionedCollationProtocol = Versioned<v1::CollationProtocol, v2::CollationProtocol>;
 
 impl From<v1::CollationProtocol> for VersionedCollationProtocol {
 	fn from(v1: v1::CollationProtocol) -> Self {
@@ -295,9 +294,9 @@ impl From<v1::CollationProtocol> for VersionedCollationProtocol {
 	}
 }
 
-impl From<vstaging::CollationProtocol> for VersionedCollationProtocol {
-	fn from(vstaging: vstaging::CollationProtocol) -> Self {
-		VersionedCollationProtocol::VStaging(vstaging)
+impl From<v2::CollationProtocol> for VersionedCollationProtocol {
+	fn from(v2: v2::CollationProtocol) -> Self {
+		VersionedCollationProtocol::V2(v2)
 	}
 }
 
@@ -307,7 +306,7 @@ macro_rules! impl_versioned_full_protocol_from {
 			fn from(versioned_from: $from) -> $out {
 				match versioned_from {
 					Versioned::V1(x) => Versioned::V1(x.into()),
-					Versioned::VStaging(x) => Versioned::VStaging(x.into()),
+					Versioned::V2(x) => Versioned::V2(x.into()),
 				}
 			}
 		}
@@ -321,7 +320,7 @@ macro_rules! impl_versioned_try_from {
 		$from:ty,
 		$out:ty,
 		$v1_pat:pat => $v1_out:expr,
-		$vstaging_pat:pat => $vstaging_out:expr
+		$v2_pat:pat => $v2_out:expr
 	) => {
 		impl TryFrom<$from> for $out {
 			type Error = crate::WrongVariant;
@@ -330,7 +329,7 @@ macro_rules! impl_versioned_try_from {
 				#[allow(unreachable_patterns)] // when there is only one variant
 				match x {
 					Versioned::V1($v1_pat) => Ok(Versioned::V1($v1_out)),
-					Versioned::VStaging($vstaging_pat) => Ok(Versioned::VStaging($vstaging_out)),
+					Versioned::V2($v2_pat) => Ok(Versioned::V2($v2_out)),
 					_ => Err(crate::WrongVariant),
 				}
 			}
@@ -343,8 +342,7 @@ macro_rules! impl_versioned_try_from {
 				#[allow(unreachable_patterns)] // when there is only one variant
 				match x {
 					Versioned::V1($v1_pat) => Ok(Versioned::V1($v1_out.clone())),
-					Versioned::VStaging($vstaging_pat) =>
-						Ok(Versioned::VStaging($vstaging_out.clone())),
+					Versioned::V2($v2_pat) => Ok(Versioned::V2($v2_out.clone())),
 					_ => Err(crate::WrongVariant),
 				}
 			}
@@ -354,7 +352,7 @@ macro_rules! impl_versioned_try_from {
 
 /// Version-annotated messages used by the bitfield distribution subsystem.
 pub type BitfieldDistributionMessage =
-	Versioned<v1::BitfieldDistributionMessage, vstaging::BitfieldDistributionMessage>;
+	Versioned<v1::BitfieldDistributionMessage, v2::BitfieldDistributionMessage>;
 impl_versioned_full_protocol_from!(
 	BitfieldDistributionMessage,
 	VersionedValidationProtocol,
@@ -364,12 +362,12 @@ impl_versioned_try_from!(
 	VersionedValidationProtocol,
 	BitfieldDistributionMessage,
 	v1::ValidationProtocol::BitfieldDistribution(x) => x,
-	vstaging::ValidationProtocol::BitfieldDistribution(x) => x
+	v2::ValidationProtocol::BitfieldDistribution(x) => x
 );
 
 /// Version-annotated messages used by the statement distribution subsystem.
 pub type StatementDistributionMessage =
-	Versioned<v1::StatementDistributionMessage, vstaging::StatementDistributionMessage>;
+	Versioned<v1::StatementDistributionMessage, v2::StatementDistributionMessage>;
 impl_versioned_full_protocol_from!(
 	StatementDistributionMessage,
 	VersionedValidationProtocol,
@@ -379,12 +377,12 @@ impl_versioned_try_from!(
 	VersionedValidationProtocol,
 	StatementDistributionMessage,
 	v1::ValidationProtocol::StatementDistribution(x) => x,
-	vstaging::ValidationProtocol::StatementDistribution(x) => x
+	v2::ValidationProtocol::StatementDistribution(x) => x
 );
 
 /// Version-annotated messages used by the approval distribution subsystem.
 pub type ApprovalDistributionMessage =
-	Versioned<v1::ApprovalDistributionMessage, vstaging::ApprovalDistributionMessage>;
+	Versioned<v1::ApprovalDistributionMessage, v2::ApprovalDistributionMessage>;
 impl_versioned_full_protocol_from!(
 	ApprovalDistributionMessage,
 	VersionedValidationProtocol,
@@ -394,13 +392,13 @@ impl_versioned_try_from!(
 	VersionedValidationProtocol,
 	ApprovalDistributionMessage,
 	v1::ValidationProtocol::ApprovalDistribution(x) => x,
-	vstaging::ValidationProtocol::ApprovalDistribution(x) => x
+	v2::ValidationProtocol::ApprovalDistribution(x) => x
 
 );
 
 /// Version-annotated messages used by the gossip-support subsystem (this is void).
 pub type GossipSupportNetworkMessage =
-	Versioned<v1::GossipSupportNetworkMessage, vstaging::GossipSupportNetworkMessage>;
+	Versioned<v1::GossipSupportNetworkMessage, v2::GossipSupportNetworkMessage>;
 // This is a void enum placeholder, so never gets sent over the wire.
 impl TryFrom<VersionedValidationProtocol> for GossipSupportNetworkMessage {
 	type Error = WrongVariant;
@@ -418,7 +416,7 @@ impl<'a> TryFrom<&'a VersionedValidationProtocol> for GossipSupportNetworkMessag
 
 /// Version-annotated messages used by the bitfield distribution subsystem.
 pub type CollatorProtocolMessage =
-	Versioned<v1::CollatorProtocolMessage, vstaging::CollatorProtocolMessage>;
+	Versioned<v1::CollatorProtocolMessage, v2::CollatorProtocolMessage>;
 impl_versioned_full_protocol_from!(
 	CollatorProtocolMessage,
 	VersionedCollationProtocol,
@@ -428,7 +426,7 @@ impl_versioned_try_from!(
 	VersionedCollationProtocol,
 	CollatorProtocolMessage,
 	v1::CollationProtocol::CollatorProtocol(x) => x,
-	vstaging::CollationProtocol::CollatorProtocol(x) => x
+	v2::CollationProtocol::CollatorProtocol(x) => x
 );
 
 /// v1 notification protocol types.
@@ -589,12 +587,12 @@ pub mod v1 {
 	}
 }
 
-/// vstaging network protocol types.
-pub mod vstaging {
+/// v2 network protocol types.
+pub mod v2 {
 	use bitvec::{order::Lsb0, slice::BitSlice, vec::BitVec};
 	use parity_scale_codec::{Decode, Encode};
 
-	use polkadot_primitives::vstaging::{
+	use polkadot_primitives::{
 		CandidateHash, CandidateIndex, CollatorId, CollatorSignature, GroupIndex, Hash,
 		Id as ParaId, UncheckedSignedAvailabilityBitfield, UncheckedSignedStatement,
 	};
diff --git a/polkadot/node/network/protocol/src/peer_set.rs b/polkadot/node/network/protocol/src/peer_set.rs
index b6f8c9dec2318791d863286ea3ed72e37224cbde..8dd68b297e3000ec4fc0847b047a1323aae97353 100644
--- a/polkadot/node/network/protocol/src/peer_set.rs
+++ b/polkadot/node/network/protocol/src/peer_set.rs
@@ -118,16 +118,9 @@ impl PeerSet {
 	/// Networking layer relies on `get_main_version()` being the version
 	/// of the main protocol name reported by [`PeerSetProtocolNames::get_main_name()`].
 	pub fn get_main_version(self) -> ProtocolVersion {
-		#[cfg(not(feature = "network-protocol-staging"))]
 		match self {
-			PeerSet::Validation => ValidationVersion::V1.into(),
-			PeerSet::Collation => CollationVersion::V1.into(),
-		}
-
-		#[cfg(feature = "network-protocol-staging")]
-		match self {
-			PeerSet::Validation => ValidationVersion::VStaging.into(),
-			PeerSet::Collation => CollationVersion::VStaging.into(),
+			PeerSet::Validation => ValidationVersion::V2.into(),
+			PeerSet::Collation => CollationVersion::V2.into(),
 		}
 	}
 
@@ -152,7 +145,7 @@ impl PeerSet {
 			PeerSet::Validation =>
 				if version == ValidationVersion::V1.into() {
 					Some("validation/1")
-				} else if version == ValidationVersion::VStaging.into() {
+				} else if version == ValidationVersion::V2.into() {
 					Some("validation/2")
 				} else {
 					None
@@ -160,7 +153,7 @@ impl PeerSet {
 			PeerSet::Collation =>
 				if version == CollationVersion::V1.into() {
 					Some("collation/1")
-				} else if version == CollationVersion::VStaging.into() {
+				} else if version == CollationVersion::V2.into() {
 					Some("collation/2")
 				} else {
 					None
@@ -197,7 +190,7 @@ impl<T> IndexMut<PeerSet> for PerPeerSet<T> {
 
 /// Get `NonDefaultSetConfig`s for all available peer sets, at their default versions.
 ///
-/// Should be used during network configuration (added to [`NetworkConfiguration::extra_sets`])
+/// Should be used during network configuration (added to `NetworkConfiguration::extra_sets`)
 /// or shortly after startup to register the protocols with the network service.
 pub fn peer_sets_info(
 	is_authority: IsAuthority,
@@ -223,8 +216,8 @@ impl From<ProtocolVersion> for u32 {
 pub enum ValidationVersion {
 	/// The first version.
 	V1 = 1,
-	/// The staging version.
-	VStaging = 2,
+	/// The second version.
+	V2 = 2,
 }
 
 /// Supported collation protocol versions. Only versions defined here must be used in the codebase.
@@ -232,8 +225,8 @@ pub enum ValidationVersion {
 pub enum CollationVersion {
 	/// The first version.
 	V1 = 1,
-	/// The staging version.
-	VStaging = 2,
+	/// The second version.
+	V2 = 2,
 }
 
 /// Marker indicating the version is unknown.
@@ -288,7 +281,7 @@ pub struct PeerSetProtocolNames {
 }
 
 impl PeerSetProtocolNames {
-	/// Construct [`PeerSetProtocols`] using `genesis_hash` and `fork_id`.
+	/// Construct [`PeerSetProtocolNames`] using `genesis_hash` and `fork_id`.
 	pub fn new(genesis_hash: Hash, fork_id: Option<&str>) -> Self {
 		let mut protocols = HashMap::new();
 		let mut names = HashMap::new();
diff --git a/polkadot/node/network/protocol/src/request_response/mod.rs b/polkadot/node/network/protocol/src/request_response/mod.rs
index baed4b8463160451231d3cbfc11e32337dbd9fec..96f7adeb29ba02987857fbac1eeed7b6770d9a35 100644
--- a/polkadot/node/network/protocol/src/request_response/mod.rs
+++ b/polkadot/node/network/protocol/src/request_response/mod.rs
@@ -55,7 +55,7 @@ pub use outgoing::{OutgoingRequest, OutgoingResult, Recipient, Requests, Respons
 pub mod v1;
 
 /// Actual versioned requests and responses that are sent over the wire.
-pub mod vstaging;
+pub mod v2;
 
 /// A protocol per subsystem seems to make the most sense, this way we don't need any dispatching
 /// within protocols.
@@ -66,7 +66,7 @@ pub enum Protocol {
 	/// Protocol for fetching collations from collators.
 	CollationFetchingV1,
 	/// Protocol for fetching collations from collators when async backing is enabled.
-	CollationFetchingVStaging,
+	CollationFetchingV2,
 	/// Protocol for fetching seconded PoVs from validators of the same group.
 	PoVFetchingV1,
 	/// Protocol for fetching available data.
@@ -78,7 +78,7 @@ pub enum Protocol {
 
 	/// Protocol for requesting candidates with attestations in statement distribution
 	/// when async backing is enabled.
-	AttestedCandidateVStaging,
+	AttestedCandidateV2,
 }
 
 /// Minimum bandwidth we expect for validators - 500Mbit/s is the recommendation, so approximately
@@ -147,7 +147,7 @@ const POV_RESPONSE_SIZE: u64 = MAX_POV_SIZE as u64 + 10_000;
 /// This is `MAX_CODE_SIZE` plus some additional space for protocol overhead.
 const STATEMENT_RESPONSE_SIZE: u64 = MAX_CODE_SIZE as u64 + 10_000;
 
-/// Maximum response sizes for `AttestedCandidateVStaging`.
+/// Maximum response sizes for `AttestedCandidateV2`.
 ///
 /// This is `MAX_CODE_SIZE` plus some additional space for protocol overhead and
 /// additional backing statements.
@@ -199,7 +199,7 @@ impl Protocol {
 				request_timeout: CHUNK_REQUEST_TIMEOUT,
 				inbound_queue: tx,
 			},
-			Protocol::CollationFetchingV1 | Protocol::CollationFetchingVStaging =>
+			Protocol::CollationFetchingV1 | Protocol::CollationFetchingV2 =>
 				RequestResponseConfig {
 					name,
 					fallback_names,
@@ -254,7 +254,7 @@ impl Protocol {
 				request_timeout: DISPUTE_REQUEST_TIMEOUT,
 				inbound_queue: tx,
 			},
-			Protocol::AttestedCandidateVStaging => RequestResponseConfig {
+			Protocol::AttestedCandidateV2 => RequestResponseConfig {
 				name,
 				fallback_names,
 				max_request_size: 1_000,
@@ -275,7 +275,7 @@ impl Protocol {
 			// as well.
 			Protocol::ChunkFetchingV1 => 100,
 			// 10 seems reasonable, considering group sizes of max 10 validators.
-			Protocol::CollationFetchingV1 | Protocol::CollationFetchingVStaging => 10,
+			Protocol::CollationFetchingV1 | Protocol::CollationFetchingV2 => 10,
 			// 10 seems reasonable, considering group sizes of max 10 validators.
 			Protocol::PoVFetchingV1 => 10,
 			// Validators are constantly self-selecting to request available data which may lead
@@ -307,7 +307,7 @@ impl Protocol {
 			// failure, so having a good value here is mostly about performance tuning.
 			Protocol::DisputeSendingV1 => 100,
 
-			Protocol::AttestedCandidateVStaging => {
+			Protocol::AttestedCandidateV2 => {
 				// We assume we can utilize up to 70% of the available bandwidth for statements.
 				// This is just a guess/estimate, with the following considerations: If we are
 				// faster than that, queue size will stay low anyway, even if not - requesters will
@@ -344,8 +344,8 @@ impl Protocol {
 			Protocol::DisputeSendingV1 => Some("/polkadot/send_dispute/1"),
 
 			// Introduced after legacy names became legacy.
-			Protocol::AttestedCandidateVStaging => None,
-			Protocol::CollationFetchingVStaging => None,
+			Protocol::AttestedCandidateV2 => None,
+			Protocol::CollationFetchingV2 => None,
 		}
 	}
 }
@@ -402,8 +402,8 @@ impl ReqProtocolNames {
 			Protocol::StatementFetchingV1 => "/req_statement/1",
 			Protocol::DisputeSendingV1 => "/send_dispute/1",
 
-			Protocol::CollationFetchingVStaging => "/req_collation/2",
-			Protocol::AttestedCandidateVStaging => "/req_attested_candidate/2",
+			Protocol::CollationFetchingV2 => "/req_collation/2",
+			Protocol::AttestedCandidateV2 => "/req_attested_candidate/2",
 		};
 
 		format!("{}{}", prefix, short_name).into()
diff --git a/polkadot/node/network/protocol/src/request_response/outgoing.rs b/polkadot/node/network/protocol/src/request_response/outgoing.rs
index ddc6b85645bbb1dd457731a0b43f6628d4bf4c29..c613d5778f5eb5d21bbdaecfd8e4493ccac14117 100644
--- a/polkadot/node/network/protocol/src/request_response/outgoing.rs
+++ b/polkadot/node/network/protocol/src/request_response/outgoing.rs
@@ -23,7 +23,7 @@ use sc_network::PeerId;
 
 use polkadot_primitives::AuthorityDiscoveryId;
 
-use super::{v1, vstaging, IsRequest, Protocol};
+use super::{v1, v2, IsRequest, Protocol};
 
 /// All requests that can be sent to the network bridge via `NetworkBridgeTxMessage::SendRequest`.
 #[derive(Debug)]
@@ -42,10 +42,10 @@ pub enum Requests {
 	DisputeSendingV1(OutgoingRequest<v1::DisputeRequest>),
 
 	/// Request a candidate and attestations.
-	AttestedCandidateVStaging(OutgoingRequest<vstaging::AttestedCandidateRequest>),
+	AttestedCandidateV2(OutgoingRequest<v2::AttestedCandidateRequest>),
 	/// Fetch a collation from a collator which previously announced it.
 	/// Compared to V1 it requires specifying which candidate is requested by its hash.
-	CollationFetchingVStaging(OutgoingRequest<vstaging::CollationFetchingRequest>),
+	CollationFetchingV2(OutgoingRequest<v2::CollationFetchingRequest>),
 }
 
 impl Requests {
@@ -54,12 +54,12 @@ impl Requests {
 		match self {
 			Self::ChunkFetchingV1(_) => Protocol::ChunkFetchingV1,
 			Self::CollationFetchingV1(_) => Protocol::CollationFetchingV1,
-			Self::CollationFetchingVStaging(_) => Protocol::CollationFetchingVStaging,
+			Self::CollationFetchingV2(_) => Protocol::CollationFetchingV2,
 			Self::PoVFetchingV1(_) => Protocol::PoVFetchingV1,
 			Self::AvailableDataFetchingV1(_) => Protocol::AvailableDataFetchingV1,
 			Self::StatementFetchingV1(_) => Protocol::StatementFetchingV1,
 			Self::DisputeSendingV1(_) => Protocol::DisputeSendingV1,
-			Self::AttestedCandidateVStaging(_) => Protocol::AttestedCandidateVStaging,
+			Self::AttestedCandidateV2(_) => Protocol::AttestedCandidateV2,
 		}
 	}
 
@@ -74,12 +74,12 @@ impl Requests {
 		match self {
 			Self::ChunkFetchingV1(r) => r.encode_request(),
 			Self::CollationFetchingV1(r) => r.encode_request(),
-			Self::CollationFetchingVStaging(r) => r.encode_request(),
+			Self::CollationFetchingV2(r) => r.encode_request(),
 			Self::PoVFetchingV1(r) => r.encode_request(),
 			Self::AvailableDataFetchingV1(r) => r.encode_request(),
 			Self::StatementFetchingV1(r) => r.encode_request(),
 			Self::DisputeSendingV1(r) => r.encode_request(),
-			Self::AttestedCandidateVStaging(r) => r.encode_request(),
+			Self::AttestedCandidateV2(r) => r.encode_request(),
 		}
 	}
 }
diff --git a/polkadot/node/network/protocol/src/request_response/vstaging.rs b/polkadot/node/network/protocol/src/request_response/v2.rs
similarity index 91%
rename from polkadot/node/network/protocol/src/request_response/vstaging.rs
rename to polkadot/node/network/protocol/src/request_response/v2.rs
index f84de9505534aa35f43217ada837ce4184d51d72..6b90c579237fbff95496035f461c5cc4c5202984 100644
--- a/polkadot/node/network/protocol/src/request_response/vstaging.rs
+++ b/polkadot/node/network/protocol/src/request_response/v2.rs
@@ -1,4 +1,4 @@
-// Copyright 2022 Parity Technologies (UK) Ltd.
+// Copyright (C) Parity Technologies (UK) Ltd.
 // This file is part of Polkadot.
 
 // Polkadot is free software: you can redistribute it and/or modify
@@ -18,13 +18,13 @@
 
 use parity_scale_codec::{Decode, Encode};
 
-use polkadot_primitives::vstaging::{
+use polkadot_primitives::{
 	CandidateHash, CommittedCandidateReceipt, Hash, Id as ParaId, PersistedValidationData,
 	UncheckedSignedStatement,
 };
 
 use super::{IsRequest, Protocol};
-use crate::vstaging::StatementFilter;
+use crate::v2::StatementFilter;
 
 /// Request a candidate with statements.
 #[derive(Debug, Clone, Encode, Decode)]
@@ -56,7 +56,7 @@ pub struct AttestedCandidateResponse {
 
 impl IsRequest for AttestedCandidateRequest {
 	type Response = AttestedCandidateResponse;
-	const PROTOCOL: Protocol = Protocol::AttestedCandidateVStaging;
+	const PROTOCOL: Protocol = Protocol::AttestedCandidateV2;
 }
 
 /// Responses as sent by collators.
@@ -76,5 +76,5 @@ pub struct CollationFetchingRequest {
 impl IsRequest for CollationFetchingRequest {
 	// The response is the same as for V1.
 	type Response = CollationFetchingResponse;
-	const PROTOCOL: Protocol = Protocol::CollationFetchingVStaging;
+	const PROTOCOL: Protocol = Protocol::CollationFetchingV2;
 }
diff --git a/polkadot/node/network/statement-distribution/Cargo.toml b/polkadot/node/network/statement-distribution/Cargo.toml
index def7632e6ba2d74823596e3abb284b4c6158044f..bf516e7b7ba9b8b89dbea715bef9bf6af2ff5d36 100644
--- a/polkadot/node/network/statement-distribution/Cargo.toml
+++ b/polkadot/node/network/statement-distribution/Cargo.toml
@@ -1,7 +1,7 @@
 [package]
 name = "polkadot-statement-distribution"
 description = "Statement Distribution Subsystem"
-version.workspace = true
+version = "1.0.0"
 authors.workspace = true
 edition.workspace = true
 license.workspace = true
@@ -16,11 +16,12 @@ sp-keystore = { path = "../../../../substrate/primitives/keystore" }
 polkadot-node-subsystem = { path = "../../subsystem" }
 polkadot-node-primitives = { path = "../../primitives" }
 polkadot-node-subsystem-util = { path = "../../subsystem-util" }
+polkadot-node-subsystem-types = { path = "../../subsystem-types" }
 polkadot-node-network-protocol = { path = "../protocol" }
 arrayvec = "0.7.4"
 indexmap = "1.9.1"
 parity-scale-codec = { version = "3.6.1", default-features = false, features = ["derive"] }
-thiserror = "1.0.31"
+thiserror = "1.0.48"
 fatality = "0.0.6"
 bitvec = "1"
 
@@ -39,4 +40,3 @@ sc-network = { path = "../../../../substrate/client/network" }
 futures-timer = "3.0.2"
 polkadot-primitives-test-helpers = { path = "../../../primitives/test-helpers" }
 rand_chacha = "0.3"
-polkadot-node-subsystem-types = { path = "../../subsystem-types" }
diff --git a/polkadot/node/network/statement-distribution/src/legacy_v1/mod.rs b/polkadot/node/network/statement-distribution/src/legacy_v1/mod.rs
index b5895cb9f65ba270cc2acd09c58d4e9af1b73a99..fc2aff0da305edbb7f6f39834ffd017e2701a550 100644
--- a/polkadot/node/network/statement-distribution/src/legacy_v1/mod.rs
+++ b/polkadot/node/network/statement-distribution/src/legacy_v1/mod.rs
@@ -1,4 +1,4 @@
-// Copyright 2022 Parity Technologies (UK) Ltd.
+// Copyright (C) Parity Technologies (UK) Ltd.
 // This file is part of Polkadot.
 
 // Polkadot is free software: you can redistribute it and/or modify
@@ -21,8 +21,7 @@ use polkadot_node_network_protocol::{
 	grid_topology::{GridNeighbors, RequiredRouting, SessionBoundGridTopologyStorage},
 	peer_set::{IsAuthority, PeerSet, ValidationVersion},
 	v1::{self as protocol_v1, StatementMetadata},
-	vstaging as protocol_vstaging, IfDisconnected, PeerId, UnifiedReputationChange as Rep,
-	Versioned, View,
+	v2 as protocol_v2, IfDisconnected, PeerId, UnifiedReputationChange as Rep, Versioned, View,
 };
 use polkadot_node_primitives::{
 	SignedFullStatement, Statement, StatementWithPVD, UncheckedSignedFullStatement,
@@ -1062,7 +1061,7 @@ async fn circulate_statement<'a, Context>(
 		"We filter out duplicates above. qed.",
 	);
 
-	let (v1_peers_to_send, vstaging_peers_to_send) = peers_to_send
+	let (v1_peers_to_send, v2_peers_to_send) = peers_to_send
 		.into_iter()
 		.map(|peer_id| {
 			let peer_data =
@@ -1074,7 +1073,7 @@ async fn circulate_statement<'a, Context>(
 		})
 		.partition::<Vec<_>, _>(|(_, _, version)| match version {
 			ValidationVersion::V1 => true,
-			ValidationVersion::VStaging => false,
+			ValidationVersion::V2 => false,
 		}); // partition is handy here but not if we add more protocol versions
 
 	let payload = v1_statement_message(relay_parent, stored.statement.clone(), metrics);
@@ -1094,24 +1093,24 @@ async fn circulate_statement<'a, Context>(
 		))
 		.await;
 	}
-	if !vstaging_peers_to_send.is_empty() {
+	if !v2_peers_to_send.is_empty() {
 		gum::trace!(
 			target: LOG_TARGET,
-			?vstaging_peers_to_send,
+			?v2_peers_to_send,
 			?relay_parent,
 			statement = ?stored.statement,
-			"Sending statement to vstaging peers",
+			"Sending statement to v2 peers",
 		);
 		ctx.send_message(NetworkBridgeTxMessage::SendValidationMessage(
-			vstaging_peers_to_send.iter().map(|(p, _, _)| *p).collect(),
-			compatible_v1_message(ValidationVersion::VStaging, payload.clone()).into(),
+			v2_peers_to_send.iter().map(|(p, _, _)| *p).collect(),
+			compatible_v1_message(ValidationVersion::V2, payload.clone()).into(),
 		))
 		.await;
 	}
 
 	v1_peers_to_send
 		.into_iter()
-		.chain(vstaging_peers_to_send)
+		.chain(v2_peers_to_send)
 		.filter_map(|(peer, needs_dependent, _)| if needs_dependent { Some(peer) } else { None })
 		.collect()
 }
@@ -1443,10 +1442,8 @@ async fn handle_incoming_message<'a, Context>(
 
 	let message = match message {
 		Versioned::V1(m) => m,
-		Versioned::VStaging(protocol_vstaging::StatementDistributionMessage::V1Compatibility(
-			m,
-		)) => m,
-		Versioned::VStaging(_) => {
+		Versioned::V2(protocol_v2::StatementDistributionMessage::V1Compatibility(m)) => m,
+		Versioned::V2(_) => {
 			// The higher-level subsystem code is supposed to filter out
 			// all non v1 messages.
 			gum::debug!(
@@ -2170,8 +2167,7 @@ fn compatible_v1_message(
 ) -> net_protocol::StatementDistributionMessage {
 	match version {
 		ValidationVersion::V1 => Versioned::V1(message),
-		ValidationVersion::VStaging => Versioned::VStaging(
-			protocol_vstaging::StatementDistributionMessage::V1Compatibility(message),
-		),
+		ValidationVersion::V2 =>
+			Versioned::V2(protocol_v2::StatementDistributionMessage::V1Compatibility(message)),
 	}
 }
diff --git a/polkadot/node/network/statement-distribution/src/legacy_v1/tests.rs b/polkadot/node/network/statement-distribution/src/legacy_v1/tests.rs
index a8ce65f2986118c9b0c432ce8bb3821026019a57..ca3038f9b3f3a4250b5337e70f9e009699afbc3b 100644
--- a/polkadot/node/network/statement-distribution/src/legacy_v1/tests.rs
+++ b/polkadot/node/network/statement-distribution/src/legacy_v1/tests.rs
@@ -36,15 +36,15 @@ use polkadot_node_primitives::{
 	SignedFullStatementWithPVD, Statement, UncheckedSignedFullStatement,
 };
 use polkadot_node_subsystem::{
-	jaeger,
 	messages::{
 		network_bridge_event, AllMessages, ReportPeerMessage, RuntimeApiMessage, RuntimeApiRequest,
 	},
-	ActivatedLeaf, LeafStatus, RuntimeApiError,
+	RuntimeApiError,
 };
-use polkadot_node_subsystem_test_helpers::mock::make_ferdie_keystore;
+use polkadot_node_subsystem_test_helpers::mock::{make_ferdie_keystore, new_leaf};
 use polkadot_primitives::{
-	GroupIndex, Hash, HeadData, Id as ParaId, IndexedVec, SessionInfo, ValidationCode,
+	ExecutorParams, GroupIndex, Hash, HeadData, Id as ParaId, IndexedVec, SessionInfo,
+	ValidationCode,
 };
 use polkadot_primitives_test_helpers::{
 	dummy_committed_candidate_receipt, dummy_hash, AlwaysZeroRng,
@@ -786,19 +786,14 @@ fn receiving_from_one_sends_to_another_and_to_candidate_backing() {
 		// register our active heads.
 		handle
 			.send(FromOrchestra::Signal(OverseerSignal::ActiveLeaves(
-				ActiveLeavesUpdate::start_work(ActivatedLeaf {
-					hash: hash_a,
-					number: 1,
-					status: LeafStatus::Fresh,
-					span: Arc::new(jaeger::Span::Disabled),
-				}),
+				ActiveLeavesUpdate::start_work(new_leaf(hash_a, 1)),
 			)))
 			.await;
 
 		assert_matches!(
 			handle.recv().await,
 			AllMessages::RuntimeApi(
-				RuntimeApiMessage::Request(r, RuntimeApiRequest::StagingAsyncBackingParams(tx))
+				RuntimeApiMessage::Request(r, RuntimeApiRequest::AsyncBackingParams(tx))
 			)
 				if r == hash_a
 			=> {
@@ -828,6 +823,17 @@ fn receiving_from_one_sends_to_another_and_to_candidate_backing() {
 			}
 		);
 
+		assert_matches!(
+			handle.recv().await,
+			AllMessages::RuntimeApi(
+				RuntimeApiMessage::Request(r, RuntimeApiRequest::SessionExecutorParams(sess_index, tx))
+			)
+				if r == hash_a && sess_index == session_index
+			=> {
+				let _ = tx.send(Ok(Some(ExecutorParams::default())));
+			}
+		);
+
 		// notify of peers and view
 		handle
 			.send(FromOrchestra::Communication {
@@ -1020,19 +1026,14 @@ fn receiving_large_statement_from_one_sends_to_another_and_to_candidate_backing(
 		// register our active heads.
 		handle
 			.send(FromOrchestra::Signal(OverseerSignal::ActiveLeaves(
-				ActiveLeavesUpdate::start_work(ActivatedLeaf {
-					hash: hash_a,
-					number: 1,
-					status: LeafStatus::Fresh,
-					span: Arc::new(jaeger::Span::Disabled),
-				}),
+				ActiveLeavesUpdate::start_work(new_leaf(hash_a, 1)),
 			)))
 			.await;
 
 		assert_matches!(
 			handle.recv().await,
 			AllMessages::RuntimeApi(
-				RuntimeApiMessage::Request(r, RuntimeApiRequest::StagingAsyncBackingParams(tx))
+				RuntimeApiMessage::Request(r, RuntimeApiRequest::AsyncBackingParams(tx))
 			)
 				if r == hash_a
 			=> {
@@ -1062,6 +1063,17 @@ fn receiving_large_statement_from_one_sends_to_another_and_to_candidate_backing(
 			}
 		);
 
+		assert_matches!(
+			handle.recv().await,
+			AllMessages::RuntimeApi(
+				RuntimeApiMessage::Request(r, RuntimeApiRequest::SessionExecutorParams(sess_index, tx))
+			)
+				if r == hash_a && sess_index == session_index
+			=> {
+				let _ = tx.send(Ok(Some(ExecutorParams::default())));
+			}
+		);
+
 		// notify of peers and view
 		handle
 			.send(FromOrchestra::Communication {
@@ -1544,19 +1556,14 @@ fn delay_reputation_changes() {
 		// register our active heads.
 		handle
 			.send(FromOrchestra::Signal(OverseerSignal::ActiveLeaves(
-				ActiveLeavesUpdate::start_work(ActivatedLeaf {
-					hash: hash_a,
-					number: 1,
-					status: LeafStatus::Fresh,
-					span: Arc::new(jaeger::Span::Disabled),
-				}),
+				ActiveLeavesUpdate::start_work(new_leaf(hash_a, 1)),
 			)))
 			.await;
 
 		assert_matches!(
 			handle.recv().await,
 			AllMessages::RuntimeApi(
-				RuntimeApiMessage::Request(r, RuntimeApiRequest::StagingAsyncBackingParams(tx))
+				RuntimeApiMessage::Request(r, RuntimeApiRequest::AsyncBackingParams(tx))
 			)
 				if r == hash_a
 			=> {
@@ -1586,6 +1593,17 @@ fn delay_reputation_changes() {
 			}
 		);
 
+		assert_matches!(
+			handle.recv().await,
+			AllMessages::RuntimeApi(
+				RuntimeApiMessage::Request(r, RuntimeApiRequest::SessionExecutorParams(sess_index, tx))
+			)
+				if r == hash_a && sess_index == session_index
+			=> {
+				let _ = tx.send(Ok(Some(ExecutorParams::default())));
+			}
+		);
+
 		// notify of peers and view
 		handle
 			.send(FromOrchestra::Communication {
@@ -2018,19 +2036,14 @@ fn share_prioritizes_backing_group() {
 		// register our active heads.
 		handle
 			.send(FromOrchestra::Signal(OverseerSignal::ActiveLeaves(
-				ActiveLeavesUpdate::start_work(ActivatedLeaf {
-					hash: hash_a,
-					number: 1,
-					status: LeafStatus::Fresh,
-					span: Arc::new(jaeger::Span::Disabled),
-				}),
+				ActiveLeavesUpdate::start_work(new_leaf(hash_a, 1)),
 			)))
 			.await;
 
 		assert_matches!(
 			handle.recv().await,
 			AllMessages::RuntimeApi(
-				RuntimeApiMessage::Request(r, RuntimeApiRequest::StagingAsyncBackingParams(tx))
+				RuntimeApiMessage::Request(r, RuntimeApiRequest::AsyncBackingParams(tx))
 			)
 				if r == hash_a
 			=> {
@@ -2060,6 +2073,17 @@ fn share_prioritizes_backing_group() {
 			}
 		);
 
+		assert_matches!(
+			handle.recv().await,
+			AllMessages::RuntimeApi(
+				RuntimeApiMessage::Request(r, RuntimeApiRequest::SessionExecutorParams(sess_index, tx))
+			)
+				if r == hash_a && sess_index == session_index
+			=> {
+				let _ = tx.send(Ok(Some(ExecutorParams::default())));
+			}
+		);
+
 		// notify of dummy peers and view
 		for (peer, pair) in dummy_peers.clone().into_iter().zip(dummy_pairs) {
 			handle
@@ -2334,19 +2358,14 @@ fn peer_cant_flood_with_large_statements() {
 		// register our active heads.
 		handle
 			.send(FromOrchestra::Signal(OverseerSignal::ActiveLeaves(
-				ActiveLeavesUpdate::start_work(ActivatedLeaf {
-					hash: hash_a,
-					number: 1,
-					status: LeafStatus::Fresh,
-					span: Arc::new(jaeger::Span::Disabled),
-				}),
+				ActiveLeavesUpdate::start_work(new_leaf(hash_a, 1)),
 			)))
 			.await;
 
 		assert_matches!(
 			handle.recv().await,
 			AllMessages::RuntimeApi(
-				RuntimeApiMessage::Request(r, RuntimeApiRequest::StagingAsyncBackingParams(tx))
+				RuntimeApiMessage::Request(r, RuntimeApiRequest::AsyncBackingParams(tx))
 			)
 				if r == hash_a
 			=> {
@@ -2376,6 +2395,17 @@ fn peer_cant_flood_with_large_statements() {
 			}
 		);
 
+		assert_matches!(
+			handle.recv().await,
+			AllMessages::RuntimeApi(
+				RuntimeApiMessage::Request(r, RuntimeApiRequest::SessionExecutorParams(sess_index, tx))
+			)
+				if r == hash_a && sess_index == session_index
+			=> {
+				let _ = tx.send(Ok(Some(ExecutorParams::default())));
+			}
+		);
+
 		// notify of peers and view
 		handle
 			.send(FromOrchestra::Communication {
@@ -2553,19 +2583,14 @@ fn handle_multiple_seconded_statements() {
 		// register our active heads.
 		handle
 			.send(FromOrchestra::Signal(OverseerSignal::ActiveLeaves(
-				ActiveLeavesUpdate::start_work(ActivatedLeaf {
-					hash: relay_parent_hash,
-					number: 1,
-					status: LeafStatus::Fresh,
-					span: Arc::new(jaeger::Span::Disabled),
-				}),
+				ActiveLeavesUpdate::start_work(new_leaf(relay_parent_hash, 1)),
 			)))
 			.await;
 
 		assert_matches!(
 			handle.recv().await,
 			AllMessages::RuntimeApi(
-				RuntimeApiMessage::Request(r, RuntimeApiRequest::StagingAsyncBackingParams(tx))
+				RuntimeApiMessage::Request(r, RuntimeApiRequest::AsyncBackingParams(tx))
 			)
 				if r == relay_parent_hash
 			=> {
@@ -2595,6 +2620,17 @@ fn handle_multiple_seconded_statements() {
 			}
 		);
 
+		assert_matches!(
+			handle.recv().await,
+			AllMessages::RuntimeApi(
+				RuntimeApiMessage::Request(r, RuntimeApiRequest::SessionExecutorParams(sess_index, tx))
+			)
+				if r == relay_parent_hash && sess_index == session_index
+			=> {
+				let _ = tx.send(Ok(Some(ExecutorParams::default())));
+			}
+		);
+
 		// notify of peers and view
 		for peer in all_peers.iter() {
 			handle
diff --git a/polkadot/node/network/statement-distribution/src/lib.rs b/polkadot/node/network/statement-distribution/src/lib.rs
index b2eb9cccced4de0b607d4a4dcd9142d98c80f7ab..eead7df5224d57ddf92bc90a3ba0b18e70a72c9e 100644
--- a/polkadot/node/network/statement-distribution/src/lib.rs
+++ b/polkadot/node/network/statement-distribution/src/lib.rs
@@ -26,10 +26,8 @@ use error::{log_error, FatalResult};
 use std::time::Duration;
 
 use polkadot_node_network_protocol::{
-	request_response::{
-		v1 as request_v1, vstaging::AttestedCandidateRequest, IncomingRequestReceiver,
-	},
-	vstaging as protocol_vstaging, Versioned,
+	request_response::{v1 as request_v1, v2::AttestedCandidateRequest, IncomingRequestReceiver},
+	v2 as protocol_v2, Versioned,
 };
 use polkadot_node_primitives::StatementWithPVD;
 use polkadot_node_subsystem::{
@@ -60,7 +58,7 @@ use legacy_v1::{
 	ResponderMessage as V1ResponderMessage,
 };
 
-mod vstaging;
+mod v2;
 
 const LOG_TARGET: &str = "parachain::statement-distribution";
 
@@ -104,9 +102,9 @@ enum MuxedMessage {
 	/// Messages from spawned v1 (legacy) responder background task.
 	V1Responder(Option<V1ResponderMessage>),
 	/// Messages from candidate responder background task.
-	Responder(Option<vstaging::ResponderMessage>),
+	Responder(Option<v2::ResponderMessage>),
 	/// Messages from answered requests.
-	Response(vstaging::UnhandledResponse),
+	Response(v2::UnhandledResponse),
 	/// Message that a request is ready to be retried. This just acts as a signal that we should
 	/// dispatch all pending requests again.
 	RetryRequest(()),
@@ -116,10 +114,10 @@ enum MuxedMessage {
 impl MuxedMessage {
 	async fn receive<Context>(
 		ctx: &mut Context,
-		state: &mut vstaging::State,
+		state: &mut v2::State,
 		from_v1_requester: &mut mpsc::Receiver<V1RequesterMessage>,
 		from_v1_responder: &mut mpsc::Receiver<V1ResponderMessage>,
-		from_responder: &mut mpsc::Receiver<vstaging::ResponderMessage>,
+		from_responder: &mut mpsc::Receiver<v2::ResponderMessage>,
 	) -> MuxedMessage {
 		let (request_manager, response_manager) = state.request_and_response_managers();
 		// We are only fusing here to make `select` happy, in reality we will quit if one of those
@@ -128,8 +126,8 @@ impl MuxedMessage {
 		let from_v1_requester = from_v1_requester.next();
 		let from_v1_responder = from_v1_responder.next();
 		let from_responder = from_responder.next();
-		let receive_response = vstaging::receive_response(response_manager).fuse();
-		let retry_request = vstaging::next_retry(request_manager).fuse();
+		let receive_response = v2::receive_response(response_manager).fuse();
+		let retry_request = v2::next_retry(request_manager).fuse();
 		futures::pin_mut!(
 			from_orchestra,
 			from_v1_requester,
@@ -182,7 +180,7 @@ impl<R: rand::Rng> StatementDistributionSubsystem<R> {
 		let mut reputation_delay = new_reputation_delay();
 
 		let mut legacy_v1_state = crate::legacy_v1::State::new(self.keystore.clone());
-		let mut state = crate::vstaging::State::new(self.keystore.clone());
+		let mut state = crate::v2::State::new(self.keystore.clone());
 
 		// Sender/Receiver for getting news from our statement fetching tasks.
 		let (v1_req_sender, mut v1_req_receiver) = mpsc::channel(1);
@@ -206,7 +204,7 @@ impl<R: rand::Rng> StatementDistributionSubsystem<R> {
 
 		ctx.spawn(
 			"candidate-responder",
-			vstaging::respond_task(
+			v2::respond_task(
 				self.req_receiver.take().expect("Mandatory argument to new. qed"),
 				res_sender.clone(),
 			)
@@ -280,14 +278,13 @@ impl<R: rand::Rng> StatementDistributionSubsystem<R> {
 					)?;
 				},
 				MuxedMessage::Responder(result) => {
-					vstaging::answer_request(
+					v2::answer_request(
 						&mut state,
 						result.ok_or(FatalError::RequesterReceiverFinished)?,
 					);
 				},
 				MuxedMessage::Response(result) => {
-					vstaging::handle_response(&mut ctx, &mut state, result, &mut self.reputation)
-						.await;
+					v2::handle_response(&mut ctx, &mut state, result, &mut self.reputation).await;
 				},
 				MuxedMessage::RetryRequest(()) => {
 					// A pending request is ready to retry. This is only a signal to call
@@ -296,7 +293,7 @@ impl<R: rand::Rng> StatementDistributionSubsystem<R> {
 				},
 			};
 
-			vstaging::dispatch_requests(&mut ctx, &mut state).await;
+			v2::dispatch_requests(&mut ctx, &mut state).await;
 		}
 		Ok(())
 	}
@@ -304,7 +301,7 @@ impl<R: rand::Rng> StatementDistributionSubsystem<R> {
 	async fn handle_subsystem_message<Context>(
 		&mut self,
 		ctx: &mut Context,
-		state: &mut vstaging::State,
+		state: &mut v2::State,
 		legacy_v1_state: &mut legacy_v1::State,
 		v1_req_sender: &mpsc::Sender<V1RequesterMessage>,
 		message: FromOrchestra<StatementDistributionMessage>,
@@ -318,11 +315,11 @@ impl<R: rand::Rng> StatementDistributionSubsystem<R> {
 			})) => {
 				let _timer = metrics.time_active_leaves_update();
 
-				// vstaging should handle activated first because of implicit view.
+				// v2 should handle activated first because of implicit view.
 				if let Some(ref activated) = activated {
 					let mode = prospective_parachains_mode(ctx.sender(), activated.hash).await?;
 					if let ProspectiveParachainsMode::Enabled { .. } = mode {
-						vstaging::handle_active_leaves_update(ctx, state, activated, mode).await?;
+						v2::handle_active_leaves_update(ctx, state, activated, mode).await?;
 					} else if let ProspectiveParachainsMode::Disabled = mode {
 						for deactivated in &deactivated {
 							crate::legacy_v1::handle_deactivate_leaf(legacy_v1_state, *deactivated);
@@ -339,7 +336,7 @@ impl<R: rand::Rng> StatementDistributionSubsystem<R> {
 					for deactivated in &deactivated {
 						crate::legacy_v1::handle_deactivate_leaf(legacy_v1_state, *deactivated);
 					}
-					vstaging::handle_deactivate_leaves(state, &deactivated);
+					v2::handle_deactivate_leaves(state, &deactivated);
 				}
 			},
 			FromOrchestra::Signal(OverseerSignal::BlockFinalized(..)) => {
@@ -362,7 +359,7 @@ impl<R: rand::Rng> StatementDistributionSubsystem<R> {
 						)
 						.await?;
 					} else {
-						vstaging::share_local_statement(
+						v2::share_local_statement(
 							ctx,
 							state,
 							relay_parent,
@@ -399,11 +396,11 @@ impl<R: rand::Rng> StatementDistributionSubsystem<R> {
 
 					let target = match &event {
 						NetworkBridgeEvent::PeerMessage(_, message) => match message {
-							Versioned::VStaging(
-								protocol_vstaging::StatementDistributionMessage::V1Compatibility(_),
+							Versioned::V2(
+								protocol_v2::StatementDistributionMessage::V1Compatibility(_),
 							) => VersionTarget::Legacy,
 							Versioned::V1(_) => VersionTarget::Legacy,
-							Versioned::VStaging(_) => VersionTarget::Current,
+							Versioned::V2(_) => VersionTarget::Current,
 						},
 						_ => VersionTarget::Both,
 					};
@@ -422,14 +419,12 @@ impl<R: rand::Rng> StatementDistributionSubsystem<R> {
 					}
 
 					if target.targets_current() {
-						// pass to vstaging.
-						vstaging::handle_network_update(ctx, state, event, &mut self.reputation)
-							.await;
+						// pass to v2.
+						v2::handle_network_update(ctx, state, event, &mut self.reputation).await;
 					}
 				},
 				StatementDistributionMessage::Backed(candidate_hash) => {
-					crate::vstaging::handle_backed_candidate_message(ctx, state, candidate_hash)
-						.await;
+					crate::v2::handle_backed_candidate_message(ctx, state, candidate_hash).await;
 				},
 			},
 		}
diff --git a/polkadot/node/network/statement-distribution/src/vstaging/candidates.rs b/polkadot/node/network/statement-distribution/src/v2/candidates.rs
similarity index 99%
rename from polkadot/node/network/statement-distribution/src/vstaging/candidates.rs
rename to polkadot/node/network/statement-distribution/src/v2/candidates.rs
index 42d243614506974566bab52665dee61f9aa2add6..e660df5da173e24dce8be7afdbe3ea55c17f94c9 100644
--- a/polkadot/node/network/statement-distribution/src/vstaging/candidates.rs
+++ b/polkadot/node/network/statement-distribution/src/v2/candidates.rs
@@ -1,4 +1,4 @@
-// Copyright 2022 Parity Technologies (UK) Ltd.
+// Copyright (C) Parity Technologies (UK) Ltd.
 // This file is part of Polkadot.
 
 // Polkadot is free software: you can redistribute it and/or modify
@@ -27,7 +27,7 @@
 
 use polkadot_node_network_protocol::PeerId;
 use polkadot_node_subsystem::messages::HypotheticalCandidate;
-use polkadot_primitives::vstaging::{
+use polkadot_primitives::{
 	CandidateHash, CommittedCandidateReceipt, GroupIndex, Hash, Id as ParaId,
 	PersistedValidationData,
 };
diff --git a/polkadot/node/network/statement-distribution/src/vstaging/cluster.rs b/polkadot/node/network/statement-distribution/src/v2/cluster.rs
similarity index 99%
rename from polkadot/node/network/statement-distribution/src/vstaging/cluster.rs
rename to polkadot/node/network/statement-distribution/src/v2/cluster.rs
index 3214507407aa5bacb78f16cbc244ed59ac10241c..8adb8353ca929d75219252c2ea33e894dea41002 100644
--- a/polkadot/node/network/statement-distribution/src/vstaging/cluster.rs
+++ b/polkadot/node/network/statement-distribution/src/v2/cluster.rs
@@ -1,4 +1,4 @@
-// Copyright 2022 Parity Technologies (UK) Ltd.
+// Copyright (C) Parity Technologies (UK) Ltd.
 // This file is part of Polkadot.
 
 // Polkadot is free software: you can redistribute it and/or modify
@@ -55,7 +55,7 @@
 //! and to keep track of what we have sent to other validators in the group and what we may
 //! continue to send them.
 
-use polkadot_primitives::vstaging::{CandidateHash, CompactStatement, ValidatorIndex};
+use polkadot_primitives::{CandidateHash, CompactStatement, ValidatorIndex};
 
 use std::collections::{HashMap, HashSet};
 
@@ -459,7 +459,7 @@ pub enum RejectOutgoing {
 #[cfg(test)]
 mod tests {
 	use super::*;
-	use polkadot_primitives::vstaging::Hash;
+	use polkadot_primitives::Hash;
 
 	#[test]
 	fn rejects_incoming_outside_of_group() {
diff --git a/polkadot/node/network/statement-distribution/src/vstaging/grid.rs b/polkadot/node/network/statement-distribution/src/v2/grid.rs
similarity index 99%
rename from polkadot/node/network/statement-distribution/src/vstaging/grid.rs
rename to polkadot/node/network/statement-distribution/src/v2/grid.rs
index c6c73f8bae529cc29c1345ee88b4b7f744612f64..3d53ff6d321e2321c7b559aaaf7adc5504e18f49 100644
--- a/polkadot/node/network/statement-distribution/src/vstaging/grid.rs
+++ b/polkadot/node/network/statement-distribution/src/v2/grid.rs
@@ -1,4 +1,4 @@
-// Copyright 2022 Parity Technologies (UK) Ltd.
+// Copyright (C) Parity Technologies (UK) Ltd.
 // This file is part of Polkadot.
 
 // Polkadot is free software: you can redistribute it and/or modify
@@ -60,12 +60,8 @@
 //!         - which has sent a `BackedCandidateAcknowledgement`
 //!   - 1st-hop nodes do the same thing
 
-use polkadot_node_network_protocol::{
-	grid_topology::SessionGridTopology, vstaging::StatementFilter,
-};
-use polkadot_primitives::vstaging::{
-	CandidateHash, CompactStatement, GroupIndex, Hash, ValidatorIndex,
-};
+use polkadot_node_network_protocol::{grid_topology::SessionGridTopology, v2::StatementFilter};
+use polkadot_primitives::{CandidateHash, CompactStatement, GroupIndex, Hash, ValidatorIndex};
 
 use std::collections::{
 	hash_map::{Entry, HashMap},
@@ -1074,7 +1070,7 @@ mod tests {
 	fn dummy_groups(group_size: usize) -> Groups {
 		let groups = vec![(0..(group_size as u32)).map(ValidatorIndex).collect()].into();
 
-		Groups::new(groups)
+		Groups::new(groups, 2)
 	}
 
 	#[test]
diff --git a/polkadot/node/network/statement-distribution/src/vstaging/groups.rs b/polkadot/node/network/statement-distribution/src/v2/groups.rs
similarity index 81%
rename from polkadot/node/network/statement-distribution/src/vstaging/groups.rs
rename to polkadot/node/network/statement-distribution/src/v2/groups.rs
index 86321b30f220ebdeadab74c7c0164458bcf46e9a..d917b20905296eed7501c568d9bcd3057963f683 100644
--- a/polkadot/node/network/statement-distribution/src/vstaging/groups.rs
+++ b/polkadot/node/network/statement-distribution/src/v2/groups.rs
@@ -1,4 +1,4 @@
-// Copyright 2022 Parity Technologies (UK) Ltd.
+// Copyright (C) Parity Technologies (UK) Ltd.
 // This file is part of Polkadot.
 
 // Polkadot is free software: you can redistribute it and/or modify
@@ -16,8 +16,9 @@
 
 //! A utility for tracking groups and their members within a session.
 
-use polkadot_node_primitives::minimum_votes;
-use polkadot_primitives::vstaging::{GroupIndex, IndexedVec, ValidatorIndex};
+use polkadot_primitives::{
+	effective_minimum_backing_votes, GroupIndex, IndexedVec, ValidatorIndex,
+};
 
 use std::collections::HashMap;
 
@@ -27,12 +28,16 @@ use std::collections::HashMap;
 pub struct Groups {
 	groups: IndexedVec<GroupIndex, Vec<ValidatorIndex>>,
 	by_validator_index: HashMap<ValidatorIndex, GroupIndex>,
+	backing_threshold: u32,
 }
 
 impl Groups {
 	/// Create a new [`Groups`] tracker with the groups and discovery keys
 	/// from the session.
-	pub fn new(groups: IndexedVec<GroupIndex, Vec<ValidatorIndex>>) -> Self {
+	pub fn new(
+		groups: IndexedVec<GroupIndex, Vec<ValidatorIndex>>,
+		backing_threshold: u32,
+	) -> Self {
 		let mut by_validator_index = HashMap::new();
 
 		for (i, group) in groups.iter().enumerate() {
@@ -42,7 +47,7 @@ impl Groups {
 			}
 		}
 
-		Groups { groups, by_validator_index }
+		Groups { groups, by_validator_index, backing_threshold }
 	}
 
 	/// Access all the underlying groups.
@@ -60,7 +65,8 @@ impl Groups {
 		&self,
 		group_index: GroupIndex,
 	) -> Option<(usize, usize)> {
-		self.get(group_index).map(|g| (g.len(), minimum_votes(g.len())))
+		self.get(group_index)
+			.map(|g| (g.len(), effective_minimum_backing_votes(g.len(), self.backing_threshold)))
 	}
 
 	/// Get the group index for a validator by index.
diff --git a/polkadot/node/network/statement-distribution/src/vstaging/mod.rs b/polkadot/node/network/statement-distribution/src/v2/mod.rs
similarity index 96%
rename from polkadot/node/network/statement-distribution/src/vstaging/mod.rs
rename to polkadot/node/network/statement-distribution/src/v2/mod.rs
index 03af4ce81598eaf79ab985c7fb85cdf9232553d0..e11d66c41a04b62377008bb7c0e2b5f9f44cde5b 100644
--- a/polkadot/node/network/statement-distribution/src/vstaging/mod.rs
+++ b/polkadot/node/network/statement-distribution/src/v2/mod.rs
@@ -1,4 +1,4 @@
-// Copyright 2022 Parity Technologies (UK) Ltd.
+// Copyright (C) Parity Technologies (UK) Ltd.
 // This file is part of Polkadot.
 
 // Polkadot is free software: you can redistribute it and/or modify
@@ -23,11 +23,11 @@ use polkadot_node_network_protocol::{
 	peer_set::ValidationVersion,
 	request_response::{
 		incoming::OutgoingResponse,
-		vstaging::{AttestedCandidateRequest, AttestedCandidateResponse},
+		v2::{AttestedCandidateRequest, AttestedCandidateResponse},
 		IncomingRequest, IncomingRequestReceiver, Requests,
 		MAX_PARALLEL_ATTESTED_CANDIDATE_REQUESTS,
 	},
-	vstaging::{self as protocol_vstaging, StatementFilter},
+	v2::{self as protocol_v2, StatementFilter},
 	IfDisconnected, PeerId, UnifiedReputationChange as Rep, Versioned, View,
 };
 use polkadot_node_primitives::{
@@ -41,10 +41,11 @@ use polkadot_node_subsystem::{
 	overseer, ActivatedLeaf,
 };
 use polkadot_node_subsystem_util::{
-	backing_implicit_view::View as ImplicitView, reputation::ReputationAggregator,
-	runtime::ProspectiveParachainsMode,
+	backing_implicit_view::View as ImplicitView,
+	reputation::ReputationAggregator,
+	runtime::{request_min_backing_votes, ProspectiveParachainsMode},
 };
-use polkadot_primitives::vstaging::{
+use polkadot_primitives::{
 	AuthorityDiscoveryId, CandidateHash, CompactStatement, CoreIndex, CoreState, GroupIndex,
 	GroupRotationInfo, Hash, Id as ParaId, IndexedVec, SessionIndex, SessionInfo, SignedStatement,
 	SigningContext, UncheckedSignedStatement, ValidatorId, ValidatorIndex,
@@ -163,8 +164,8 @@ struct PerSessionState {
 }
 
 impl PerSessionState {
-	fn new(session_info: SessionInfo, keystore: &KeystorePtr) -> Self {
-		let groups = Groups::new(session_info.validator_groups.clone());
+	fn new(session_info: SessionInfo, keystore: &KeystorePtr, backing_threshold: u32) -> Self {
+		let groups = Groups::new(session_info.validator_groups.clone(), backing_threshold);
 		let mut authority_lookup = HashMap::new();
 		for (i, ad) in session_info.discovery_keys.iter().cloned().enumerate() {
 			authority_lookup.insert(ad, ValidatorIndex(i as _));
@@ -322,7 +323,7 @@ pub(crate) async fn handle_network_update<Context>(
 		NetworkBridgeEvent::PeerConnected(peer_id, role, protocol_version, mut authority_ids) => {
 			gum::trace!(target: LOG_TARGET, ?peer_id, ?role, ?protocol_version, "Peer connected");
 
-			if protocol_version != ValidationVersion::VStaging.into() {
+			if protocol_version != ValidationVersion::V2.into() {
 				return
 			}
 
@@ -380,19 +381,19 @@ pub(crate) async fn handle_network_update<Context>(
 		},
 		NetworkBridgeEvent::PeerMessage(peer_id, message) => match message {
 			net_protocol::StatementDistributionMessage::V1(_) => return,
-			net_protocol::StatementDistributionMessage::VStaging(
-				protocol_vstaging::StatementDistributionMessage::V1Compatibility(_),
+			net_protocol::StatementDistributionMessage::V2(
+				protocol_v2::StatementDistributionMessage::V1Compatibility(_),
 			) => return,
-			net_protocol::StatementDistributionMessage::VStaging(
-				protocol_vstaging::StatementDistributionMessage::Statement(relay_parent, statement),
+			net_protocol::StatementDistributionMessage::V2(
+				protocol_v2::StatementDistributionMessage::Statement(relay_parent, statement),
 			) =>
 				handle_incoming_statement(ctx, state, peer_id, relay_parent, statement, reputation)
 					.await,
-			net_protocol::StatementDistributionMessage::VStaging(
-				protocol_vstaging::StatementDistributionMessage::BackedCandidateManifest(inner),
+			net_protocol::StatementDistributionMessage::V2(
+				protocol_v2::StatementDistributionMessage::BackedCandidateManifest(inner),
 			) => handle_incoming_manifest(ctx, state, peer_id, inner, reputation).await,
-			net_protocol::StatementDistributionMessage::VStaging(
-				protocol_vstaging::StatementDistributionMessage::BackedCandidateKnown(inner),
+			net_protocol::StatementDistributionMessage::V2(
+				protocol_v2::StatementDistributionMessage::BackedCandidateKnown(inner),
 			) => handle_incoming_acknowledgement(ctx, state, peer_id, inner, reputation).await,
 		},
 		NetworkBridgeEvent::PeerViewChange(peer_id, view) =>
@@ -504,9 +505,13 @@ pub(crate) async fn handle_active_leaves_update<Context>(
 				Some(s) => s,
 			};
 
-			state
-				.per_session
-				.insert(session_index, PerSessionState::new(session_info, &state.keystore));
+			let minimum_backing_votes =
+				request_min_backing_votes(new_relay_parent, session_index, ctx.sender()).await?;
+
+			state.per_session.insert(
+				session_index,
+				PerSessionState::new(session_info, &state.keystore, minimum_backing_votes),
+			);
 		}
 
 		let per_session = state
@@ -722,10 +727,8 @@ fn pending_statement_network_message(
 	statement_store
 		.validator_statement(originator, compact)
 		.map(|s| s.as_unchecked().clone())
-		.map(|signed| {
-			protocol_vstaging::StatementDistributionMessage::Statement(relay_parent, signed)
-		})
-		.map(|msg| (vec![*peer], Versioned::VStaging(msg).into()))
+		.map(|signed| protocol_v2::StatementDistributionMessage::Statement(relay_parent, signed))
+		.map(|msg| (vec![*peer], Versioned::V2(msg).into()))
 }
 
 /// Send a peer all pending cluster statements for a relay parent.
@@ -818,7 +821,7 @@ async fn send_pending_grid_messages<Context>(
 
 		match kind {
 			grid::ManifestKind::Full => {
-				let manifest = protocol_vstaging::BackedCandidateManifest {
+				let manifest = protocol_v2::BackedCandidateManifest {
 					relay_parent,
 					candidate_hash,
 					group_index,
@@ -842,8 +845,8 @@ async fn send_pending_grid_messages<Context>(
 
 				messages.push((
 					vec![*peer_id],
-					Versioned::VStaging(
-						protocol_vstaging::StatementDistributionMessage::BackedCandidateManifest(
+					Versioned::V2(
+						protocol_v2::StatementDistributionMessage::BackedCandidateManifest(
 							manifest,
 						),
 					)
@@ -1187,7 +1190,7 @@ async fn circulate_statement<Context>(
 
 		ctx.send_message(NetworkBridgeTxMessage::SendValidationMessage(
 			statement_to,
-			Versioned::VStaging(protocol_vstaging::StatementDistributionMessage::Statement(
+			Versioned::V2(protocol_v2::StatementDistributionMessage::Statement(
 				relay_parent,
 				statement.as_unchecked().clone(),
 			))
@@ -1667,7 +1670,7 @@ async fn provide_candidate_to_grid<Context>(
 		filter.clone(),
 	);
 
-	let manifest = protocol_vstaging::BackedCandidateManifest {
+	let manifest = protocol_v2::BackedCandidateManifest {
 		relay_parent,
 		candidate_hash,
 		group_index,
@@ -1675,16 +1678,15 @@ async fn provide_candidate_to_grid<Context>(
 		parent_head_data_hash: confirmed_candidate.parent_head_data_hash(),
 		statement_knowledge: filter.clone(),
 	};
-	let acknowledgement = protocol_vstaging::BackedCandidateAcknowledgement {
+	let acknowledgement = protocol_v2::BackedCandidateAcknowledgement {
 		candidate_hash,
 		statement_knowledge: filter.clone(),
 	};
 
-	let manifest_message = Versioned::VStaging(
-		protocol_vstaging::StatementDistributionMessage::BackedCandidateManifest(manifest),
-	);
-	let ack_message = Versioned::VStaging(
-		protocol_vstaging::StatementDistributionMessage::BackedCandidateKnown(acknowledgement),
+	let manifest_message =
+		Versioned::V2(protocol_v2::StatementDistributionMessage::BackedCandidateManifest(manifest));
+	let ack_message = Versioned::V2(
+		protocol_v2::StatementDistributionMessage::BackedCandidateKnown(acknowledgement),
 	);
 
 	let mut manifest_peers = Vec::new();
@@ -2057,8 +2059,8 @@ fn post_acknowledgement_statement_messages(
 			statement.payload(),
 		);
 
-		messages.push(Versioned::VStaging(
-			protocol_vstaging::StatementDistributionMessage::Statement(
+		messages.push(Versioned::V2(
+			protocol_v2::StatementDistributionMessage::Statement(
 				relay_parent,
 				statement.as_unchecked().clone(),
 			)
@@ -2074,7 +2076,7 @@ async fn handle_incoming_manifest<Context>(
 	ctx: &mut Context,
 	state: &mut State,
 	peer: PeerId,
-	manifest: net_protocol::vstaging::BackedCandidateManifest,
+	manifest: net_protocol::v2::BackedCandidateManifest,
 	reputation: &mut ReputationAggregator,
 ) {
 	gum::debug!(
@@ -2178,14 +2180,14 @@ fn acknowledgement_and_statement_messages(
 		Some(l) => l,
 	};
 
-	let acknowledgement = protocol_vstaging::BackedCandidateAcknowledgement {
+	let acknowledgement = protocol_v2::BackedCandidateAcknowledgement {
 		candidate_hash,
 		statement_knowledge: local_knowledge.clone(),
 	};
 
-	let msg = Versioned::VStaging(
-		protocol_vstaging::StatementDistributionMessage::BackedCandidateKnown(acknowledgement),
-	);
+	let msg = Versioned::V2(protocol_v2::StatementDistributionMessage::BackedCandidateKnown(
+		acknowledgement,
+	));
 
 	let mut messages = vec![(vec![peer], msg.into())];
 
@@ -2216,7 +2218,7 @@ async fn handle_incoming_acknowledgement<Context>(
 	ctx: &mut Context,
 	state: &mut State,
 	peer: PeerId,
-	acknowledgement: net_protocol::vstaging::BackedCandidateAcknowledgement,
+	acknowledgement: net_protocol::v2::BackedCandidateAcknowledgement,
 	reputation: &mut ReputationAggregator,
 ) {
 	// The key difference between acknowledgments and full manifests is that only
@@ -2502,7 +2504,7 @@ pub(crate) async fn dispatch_requests<Context>(ctx: &mut Context, state: &mut St
 		Some(RequestProperties {
 			unwanted_mask,
 			backing_threshold: if require_backing {
-				Some(polkadot_node_primitives::minimum_votes(group.len()))
+				Some(per_session.groups.get_size_and_backing_threshold(group_index)?.1)
 			} else {
 				None
 			},
@@ -2516,7 +2518,7 @@ pub(crate) async fn dispatch_requests<Context>(ctx: &mut Context, state: &mut St
 	) {
 		// Peer is supposedly connected.
 		ctx.send_message(NetworkBridgeTxMessage::SendRequests(
-			vec![Requests::AttestedCandidateVStaging(request)],
+			vec![Requests::AttestedCandidateV2(request)],
 			IfDisconnected::ImmediateError,
 		))
 		.await;
diff --git a/polkadot/node/network/statement-distribution/src/vstaging/requests.rs b/polkadot/node/network/statement-distribution/src/v2/requests.rs
similarity index 99%
rename from polkadot/node/network/statement-distribution/src/vstaging/requests.rs
rename to polkadot/node/network/statement-distribution/src/v2/requests.rs
index 2593d81ba0b2c795f354eaa07765ad7f662cc3f9..f13496024fcfee52f48a3cdb2377c2e24eadda79 100644
--- a/polkadot/node/network/statement-distribution/src/vstaging/requests.rs
+++ b/polkadot/node/network/statement-distribution/src/v2/requests.rs
@@ -1,4 +1,4 @@
-// Copyright 2022 Parity Technologies (UK) Ltd.
+// Copyright (C) Parity Technologies (UK) Ltd.
 // This file is part of Polkadot.
 
 // Polkadot is free software: you can redistribute it and/or modify
@@ -39,14 +39,14 @@ use crate::LOG_TARGET;
 use polkadot_node_network_protocol::{
 	request_response::{
 		outgoing::{Recipient as RequestRecipient, RequestError},
-		vstaging::{AttestedCandidateRequest, AttestedCandidateResponse},
+		v2::{AttestedCandidateRequest, AttestedCandidateResponse},
 		OutgoingRequest, OutgoingResult, MAX_PARALLEL_ATTESTED_CANDIDATE_REQUESTS,
 	},
-	vstaging::StatementFilter,
+	v2::StatementFilter,
 	PeerId, UnifiedReputationChange as Rep,
 };
-use polkadot_primitives::vstaging::{
-	CandidateHash, CommittedCandidateReceipt, CompactStatement, GroupIndex, Hash, ParaId,
+use polkadot_primitives::{
+	CandidateHash, CommittedCandidateReceipt, CompactStatement, GroupIndex, Hash, Id as ParaId,
 	PersistedValidationData, SessionIndex, SignedStatement, SigningContext, ValidatorId,
 	ValidatorIndex,
 };
diff --git a/polkadot/node/network/statement-distribution/src/vstaging/statement_store.rs b/polkadot/node/network/statement-distribution/src/v2/statement_store.rs
similarity index 98%
rename from polkadot/node/network/statement-distribution/src/vstaging/statement_store.rs
rename to polkadot/node/network/statement-distribution/src/v2/statement_store.rs
index 50ac99d0a8135482d7c4d70d2c089c58a0084b83..74db431eda1d214e0031e98ab304cb0fd0fabd96 100644
--- a/polkadot/node/network/statement-distribution/src/vstaging/statement_store.rs
+++ b/polkadot/node/network/statement-distribution/src/v2/statement_store.rs
@@ -1,4 +1,4 @@
-// Copyright 2022 Parity Technologies (UK) Ltd.
+// Copyright (C) Parity Technologies (UK) Ltd.
 // This file is part of Polkadot.
 
 // Polkadot is free software: you can redistribute it and/or modify
@@ -24,8 +24,8 @@
 //! groups, and views based on the validators themselves.
 
 use bitvec::{order::Lsb0 as BitOrderLsb0, vec::BitVec};
-use polkadot_node_network_protocol::vstaging::StatementFilter;
-use polkadot_primitives::vstaging::{
+use polkadot_node_network_protocol::v2::StatementFilter;
+use polkadot_primitives::{
 	CandidateHash, CompactStatement, GroupIndex, SignedStatement, ValidatorIndex,
 };
 use std::collections::hash_map::{Entry as HEntry, HashMap};
diff --git a/polkadot/node/network/statement-distribution/src/vstaging/tests/cluster.rs b/polkadot/node/network/statement-distribution/src/v2/tests/cluster.rs
similarity index 94%
rename from polkadot/node/network/statement-distribution/src/vstaging/tests/cluster.rs
rename to polkadot/node/network/statement-distribution/src/v2/tests/cluster.rs
index 1ff53d3fd99eed1937faa4fbd8fd4e46f39d3bb4..80dec1d75ab98be43b820bf7382b4436ef87c3b2 100644
--- a/polkadot/node/network/statement-distribution/src/vstaging/tests/cluster.rs
+++ b/polkadot/node/network/statement-distribution/src/v2/tests/cluster.rs
@@ -1,4 +1,4 @@
-// Copyright 2023 Parity Technologies (UK) Ltd.
+// Copyright (C) Parity Technologies (UK) Ltd.
 // This file is part of Polkadot.
 
 // Polkadot is free software: you can redistribute it and/or modify
@@ -103,8 +103,8 @@ fn share_seconded_circulated_to_cluster() {
 			overseer.recv().await,
 			AllMessages::NetworkBridgeTx(NetworkBridgeTxMessage::SendValidationMessage(
 				peers,
-				Versioned::VStaging(protocol_vstaging::ValidationProtocol::StatementDistribution(
-					protocol_vstaging::StatementDistributionMessage::Statement(
+				Versioned::V2(protocol_v2::ValidationProtocol::StatementDistribution(
+					protocol_v2::StatementDistributionMessage::Statement(
 						r,
 						s,
 					)
@@ -173,7 +173,7 @@ fn cluster_valid_statement_before_seconded_ignored() {
 		send_peer_message(
 			&mut overseer,
 			peer_a.clone(),
-			protocol_vstaging::StatementDistributionMessage::Statement(
+			protocol_v2::StatementDistributionMessage::Statement(
 				relay_parent,
 				signed_valid.as_unchecked().clone(),
 			),
@@ -252,7 +252,7 @@ fn cluster_statement_bad_signature() {
 			send_peer_message(
 				&mut overseer,
 				peer_a.clone(),
-				protocol_vstaging::StatementDistributionMessage::Statement(
+				protocol_v2::StatementDistributionMessage::Statement(
 					relay_parent,
 					statement.clone(),
 				),
@@ -327,7 +327,7 @@ fn useful_cluster_statement_from_non_cluster_peer_rejected() {
 		send_peer_message(
 			&mut overseer,
 			peer_a.clone(),
-			protocol_vstaging::StatementDistributionMessage::Statement(relay_parent, statement),
+			protocol_v2::StatementDistributionMessage::Statement(relay_parent, statement),
 		)
 		.await;
 
@@ -388,7 +388,7 @@ fn statement_from_non_cluster_originator_unexpected() {
 		send_peer_message(
 			&mut overseer,
 			peer_a.clone(),
-			protocol_vstaging::StatementDistributionMessage::Statement(relay_parent, statement),
+			protocol_v2::StatementDistributionMessage::Statement(relay_parent, statement),
 		)
 		.await;
 
@@ -465,7 +465,7 @@ fn seconded_statement_leads_to_request() {
 		send_peer_message(
 			&mut overseer,
 			peer_a.clone(),
-			protocol_vstaging::StatementDistributionMessage::Statement(relay_parent, statement),
+			protocol_v2::StatementDistributionMessage::Statement(relay_parent, statement),
 		)
 		.await;
 
@@ -593,8 +593,8 @@ fn cluster_statements_shared_seconded_first() {
 
 				assert_matches!(
 					&messages[0].1,
-					Versioned::VStaging(protocol_vstaging::ValidationProtocol::StatementDistribution(
-						protocol_vstaging::StatementDistributionMessage::Statement(
+					Versioned::V2(protocol_v2::ValidationProtocol::StatementDistribution(
+						protocol_v2::StatementDistributionMessage::Statement(
 							r,
 							s,
 						)
@@ -604,8 +604,8 @@ fn cluster_statements_shared_seconded_first() {
 
 				assert_matches!(
 					&messages[1].1,
-					Versioned::VStaging(protocol_vstaging::ValidationProtocol::StatementDistribution(
-						protocol_vstaging::StatementDistributionMessage::Statement(
+					Versioned::V2(protocol_v2::ValidationProtocol::StatementDistribution(
+						protocol_v2::StatementDistributionMessage::Statement(
 							r,
 							s,
 						)
@@ -699,8 +699,8 @@ fn cluster_accounts_for_implicit_view() {
 			overseer.recv().await,
 			AllMessages::NetworkBridgeTx(NetworkBridgeTxMessage::SendValidationMessage(
 				peers,
-				Versioned::VStaging(protocol_vstaging::ValidationProtocol::StatementDistribution(
-					protocol_vstaging::StatementDistributionMessage::Statement(
+				Versioned::V2(protocol_v2::ValidationProtocol::StatementDistribution(
+					protocol_v2::StatementDistributionMessage::Statement(
 						r,
 						s,
 					)
@@ -749,8 +749,8 @@ fn cluster_accounts_for_implicit_view() {
 					&messages[0],
 					(
 						peers,
-						Versioned::VStaging(protocol_vstaging::ValidationProtocol::StatementDistribution(
-							protocol_vstaging::StatementDistributionMessage::Statement(
+						Versioned::V2(protocol_v2::ValidationProtocol::StatementDistribution(
+							protocol_v2::StatementDistributionMessage::Statement(
 								r,
 								s,
 							)
@@ -836,10 +836,7 @@ fn cluster_messages_imported_after_confirmed_candidate_importable_check() {
 			send_peer_message(
 				&mut overseer,
 				peer_a.clone(),
-				protocol_vstaging::StatementDistributionMessage::Statement(
-					relay_parent,
-					a_seconded,
-				),
+				protocol_v2::StatementDistributionMessage::Statement(relay_parent, a_seconded),
 			)
 			.await;
 
@@ -971,10 +968,7 @@ fn cluster_messages_imported_after_new_leaf_importable_check() {
 			send_peer_message(
 				&mut overseer,
 				peer_a.clone(),
-				protocol_vstaging::StatementDistributionMessage::Statement(
-					relay_parent,
-					a_seconded,
-				),
+				protocol_v2::StatementDistributionMessage::Statement(relay_parent, a_seconded),
 			)
 			.await;
 
@@ -1191,7 +1185,7 @@ fn ensure_seconding_limit_is_respected() {
 			send_peer_message(
 				&mut overseer,
 				peer_a.clone(),
-				protocol_vstaging::StatementDistributionMessage::Statement(relay_parent, statement),
+				protocol_v2::StatementDistributionMessage::Statement(relay_parent, statement),
 			)
 			.await;
 
@@ -1216,7 +1210,7 @@ fn ensure_seconding_limit_is_respected() {
 			send_peer_message(
 				&mut overseer,
 				peer_a.clone(),
-				protocol_vstaging::StatementDistributionMessage::Statement(relay_parent, statement),
+				protocol_v2::StatementDistributionMessage::Statement(relay_parent, statement),
 			)
 			.await;
 
@@ -1241,7 +1235,7 @@ fn ensure_seconding_limit_is_respected() {
 			send_peer_message(
 				&mut overseer,
 				peer_a.clone(),
-				protocol_vstaging::StatementDistributionMessage::Statement(relay_parent, statement),
+				protocol_v2::StatementDistributionMessage::Statement(relay_parent, statement),
 			)
 			.await;
 
diff --git a/polkadot/node/network/statement-distribution/src/vstaging/tests/grid.rs b/polkadot/node/network/statement-distribution/src/v2/tests/grid.rs
similarity index 95%
rename from polkadot/node/network/statement-distribution/src/vstaging/tests/grid.rs
rename to polkadot/node/network/statement-distribution/src/v2/tests/grid.rs
index 0c9fa60ed2e608ea86abfad3e85d59704157ca52..a0af9579823597514383f57c9cbe691a7282bb20 100644
--- a/polkadot/node/network/statement-distribution/src/vstaging/tests/grid.rs
+++ b/polkadot/node/network/statement-distribution/src/v2/tests/grid.rs
@@ -1,4 +1,4 @@
-// Copyright 2023 Parity Technologies (UK) Ltd.
+// Copyright (C) Parity Technologies (UK) Ltd.
 // This file is part of Polkadot.
 
 // Polkadot is free software: you can redistribute it and/or modify
@@ -17,9 +17,7 @@
 use super::*;
 
 use bitvec::order::Lsb0;
-use polkadot_node_network_protocol::vstaging::{
-	BackedCandidateAcknowledgement, BackedCandidateManifest,
-};
+use polkadot_node_network_protocol::v2::{BackedCandidateAcknowledgement, BackedCandidateManifest};
 use polkadot_node_subsystem::messages::CandidateBackingMessage;
 use polkadot_primitives_test_helpers::make_candidate;
 
@@ -156,7 +154,7 @@ fn backed_candidate_leads_to_advertisement() {
 			send_peer_message(
 				&mut overseer,
 				peer_a.clone(),
-				protocol_vstaging::StatementDistributionMessage::Statement(relay_parent, statement),
+				protocol_v2::StatementDistributionMessage::Statement(relay_parent, statement),
 			)
 			.await;
 
@@ -181,7 +179,7 @@ fn backed_candidate_leads_to_advertisement() {
 			send_peer_message(
 				&mut overseer,
 				peer_b.clone(),
-				protocol_vstaging::StatementDistributionMessage::Statement(relay_parent, statement),
+				protocol_v2::StatementDistributionMessage::Statement(relay_parent, statement),
 			)
 			.await;
 
@@ -210,9 +208,9 @@ fn backed_candidate_leads_to_advertisement() {
 				AllMessages:: NetworkBridgeTx(
 					NetworkBridgeTxMessage::SendValidationMessage(
 						peers,
-						Versioned::VStaging(
-							protocol_vstaging::ValidationProtocol::StatementDistribution(
-								protocol_vstaging::StatementDistributionMessage::BackedCandidateManifest(manifest),
+						Versioned::V2(
+							protocol_v2::ValidationProtocol::StatementDistribution(
+								protocol_v2::StatementDistributionMessage::BackedCandidateManifest(manifest),
 							),
 						),
 					)
@@ -349,7 +347,7 @@ fn received_advertisement_before_confirmation_leads_to_request() {
 			send_peer_message(
 				&mut overseer,
 				peer_c.clone(),
-				protocol_vstaging::StatementDistributionMessage::BackedCandidateManifest(manifest),
+				protocol_v2::StatementDistributionMessage::BackedCandidateManifest(manifest),
 			)
 			.await;
 
@@ -534,7 +532,7 @@ fn received_advertisement_after_backing_leads_to_acknowledgement() {
 			send_peer_message(
 				&mut overseer,
 				peer_c.clone(),
-				protocol_vstaging::StatementDistributionMessage::BackedCandidateManifest(
+				protocol_v2::StatementDistributionMessage::BackedCandidateManifest(
 					manifest.clone(),
 				),
 			)
@@ -603,9 +601,9 @@ fn received_advertisement_after_backing_leads_to_acknowledgement() {
 				AllMessages:: NetworkBridgeTx(
 					NetworkBridgeTxMessage::SendValidationMessage(
 						peers,
-						Versioned::VStaging(
-							protocol_vstaging::ValidationProtocol::StatementDistribution(
-								protocol_vstaging::StatementDistributionMessage::BackedCandidateKnown(ack),
+						Versioned::V2(
+							protocol_v2::ValidationProtocol::StatementDistribution(
+								protocol_v2::StatementDistributionMessage::BackedCandidateKnown(ack),
 							),
 						),
 					)
@@ -629,7 +627,7 @@ fn received_advertisement_after_backing_leads_to_acknowledgement() {
 			send_peer_message(
 				&mut overseer,
 				peer_d.clone(),
-				protocol_vstaging::StatementDistributionMessage::BackedCandidateManifest(
+				protocol_v2::StatementDistributionMessage::BackedCandidateManifest(
 					manifest.clone(),
 				),
 			)
@@ -654,8 +652,8 @@ fn received_advertisement_after_backing_leads_to_acknowledgement() {
 
 					assert_matches!(
 						&messages[0].1,
-						Versioned::VStaging(protocol_vstaging::ValidationProtocol::StatementDistribution(
-							protocol_vstaging::StatementDistributionMessage::BackedCandidateKnown(ack)
+						Versioned::V2(protocol_v2::ValidationProtocol::StatementDistribution(
+							protocol_v2::StatementDistributionMessage::BackedCandidateKnown(ack)
 						)) if *ack == expected_ack
 					);
 				}
@@ -782,7 +780,7 @@ fn received_advertisement_after_confirmation_before_backing() {
 			send_peer_message(
 				&mut overseer,
 				peer_c.clone(),
-				protocol_vstaging::StatementDistributionMessage::BackedCandidateManifest(
+				protocol_v2::StatementDistributionMessage::BackedCandidateManifest(
 					manifest.clone(),
 				),
 			)
@@ -842,7 +840,7 @@ fn received_advertisement_after_confirmation_before_backing() {
 			send_peer_message(
 				&mut overseer,
 				peer_d.clone(),
-				protocol_vstaging::StatementDistributionMessage::BackedCandidateManifest(
+				protocol_v2::StatementDistributionMessage::BackedCandidateManifest(
 					manifest.clone(),
 				),
 			)
@@ -951,7 +949,7 @@ fn additional_statements_are_shared_after_manifest_exchange() {
 			send_peer_message(
 				&mut overseer,
 				peer_c.clone(),
-				protocol_vstaging::StatementDistributionMessage::BackedCandidateManifest(
+				protocol_v2::StatementDistributionMessage::BackedCandidateManifest(
 					manifest.clone(),
 				),
 			)
@@ -1066,9 +1064,9 @@ fn additional_statements_are_shared_after_manifest_exchange() {
 				AllMessages:: NetworkBridgeTx(
 					NetworkBridgeTxMessage::SendValidationMessage(
 						peers,
-						Versioned::VStaging(
-							protocol_vstaging::ValidationProtocol::StatementDistribution(
-								protocol_vstaging::StatementDistributionMessage::BackedCandidateKnown(ack),
+						Versioned::V2(
+							protocol_v2::ValidationProtocol::StatementDistribution(
+								protocol_v2::StatementDistributionMessage::BackedCandidateKnown(ack),
 							),
 						),
 					)
@@ -1104,7 +1102,7 @@ fn additional_statements_are_shared_after_manifest_exchange() {
 			send_peer_message(
 				&mut overseer,
 				peer_d.clone(),
-				protocol_vstaging::StatementDistributionMessage::BackedCandidateManifest(
+				protocol_v2::StatementDistributionMessage::BackedCandidateManifest(
 					manifest.clone(),
 				),
 			)
@@ -1130,15 +1128,15 @@ fn additional_statements_are_shared_after_manifest_exchange() {
 
 					assert_matches!(
 						&messages[0].1,
-						Versioned::VStaging(protocol_vstaging::ValidationProtocol::StatementDistribution(
-							protocol_vstaging::StatementDistributionMessage::BackedCandidateKnown(ack)
+						Versioned::V2(protocol_v2::ValidationProtocol::StatementDistribution(
+							protocol_v2::StatementDistributionMessage::BackedCandidateKnown(ack)
 						)) if *ack == expected_ack
 					);
 
 					assert_matches!(
 						&messages[1].1,
-						Versioned::VStaging(protocol_vstaging::ValidationProtocol::StatementDistribution(
-							protocol_vstaging::StatementDistributionMessage::Statement(r, s)
+						Versioned::V2(protocol_v2::ValidationProtocol::StatementDistribution(
+							protocol_v2::StatementDistributionMessage::Statement(r, s)
 						)) if *r == relay_parent && s.unchecked_payload() == &CompactStatement::Seconded(candidate_hash) && s.unchecked_validator_index() == v_e
 					);
 				}
@@ -1281,7 +1279,7 @@ fn advertisement_sent_when_peer_enters_relay_parent_view() {
 			send_peer_message(
 				&mut overseer,
 				peer_a.clone(),
-				protocol_vstaging::StatementDistributionMessage::Statement(relay_parent, statement),
+				protocol_v2::StatementDistributionMessage::Statement(relay_parent, statement),
 			)
 			.await;
 
@@ -1306,7 +1304,7 @@ fn advertisement_sent_when_peer_enters_relay_parent_view() {
 			send_peer_message(
 				&mut overseer,
 				peer_b.clone(),
-				protocol_vstaging::StatementDistributionMessage::Statement(relay_parent, statement),
+				protocol_v2::StatementDistributionMessage::Statement(relay_parent, statement),
 			)
 			.await;
 
@@ -1357,8 +1355,8 @@ fn advertisement_sent_when_peer_enters_relay_parent_view() {
 
 					assert_matches!(
 						&messages[0].1,
-						Versioned::VStaging(protocol_vstaging::ValidationProtocol::StatementDistribution(
-							protocol_vstaging::StatementDistributionMessage::BackedCandidateManifest(manifest)
+						Versioned::V2(protocol_v2::ValidationProtocol::StatementDistribution(
+							protocol_v2::StatementDistributionMessage::BackedCandidateManifest(manifest)
 						)) => {
 							assert_eq!(*manifest, expected_manifest);
 						}
@@ -1504,7 +1502,7 @@ fn advertisement_not_re_sent_when_peer_re_enters_view() {
 			send_peer_message(
 				&mut overseer,
 				peer_a.clone(),
-				protocol_vstaging::StatementDistributionMessage::Statement(relay_parent, statement),
+				protocol_v2::StatementDistributionMessage::Statement(relay_parent, statement),
 			)
 			.await;
 
@@ -1529,7 +1527,7 @@ fn advertisement_not_re_sent_when_peer_re_enters_view() {
 			send_peer_message(
 				&mut overseer,
 				peer_b.clone(),
-				protocol_vstaging::StatementDistributionMessage::Statement(relay_parent, statement),
+				protocol_v2::StatementDistributionMessage::Statement(relay_parent, statement),
 			)
 			.await;
 
@@ -1558,9 +1556,9 @@ fn advertisement_not_re_sent_when_peer_re_enters_view() {
 				AllMessages:: NetworkBridgeTx(
 					NetworkBridgeTxMessage::SendValidationMessage(
 						peers,
-						Versioned::VStaging(
-							protocol_vstaging::ValidationProtocol::StatementDistribution(
-								protocol_vstaging::StatementDistributionMessage::BackedCandidateManifest(manifest),
+						Versioned::V2(
+							protocol_v2::ValidationProtocol::StatementDistribution(
+								protocol_v2::StatementDistributionMessage::BackedCandidateManifest(manifest),
 							),
 						),
 					)
@@ -1692,7 +1690,7 @@ fn grid_statements_imported_to_backing() {
 			send_peer_message(
 				&mut overseer,
 				peer_c.clone(),
-				protocol_vstaging::StatementDistributionMessage::BackedCandidateManifest(
+				protocol_v2::StatementDistributionMessage::BackedCandidateManifest(
 					manifest.clone(),
 				),
 			)
@@ -1907,7 +1905,7 @@ fn advertisements_rejected_from_incorrect_peers() {
 			send_peer_message(
 				&mut overseer,
 				peer_a.clone(),
-				protocol_vstaging::StatementDistributionMessage::BackedCandidateManifest(
+				protocol_v2::StatementDistributionMessage::BackedCandidateManifest(
 					manifest.clone(),
 				),
 			)
@@ -1925,7 +1923,7 @@ fn advertisements_rejected_from_incorrect_peers() {
 			send_peer_message(
 				&mut overseer,
 				peer_b.clone(),
-				protocol_vstaging::StatementDistributionMessage::BackedCandidateManifest(manifest),
+				protocol_v2::StatementDistributionMessage::BackedCandidateManifest(manifest),
 			)
 			.await;
 
@@ -2029,7 +2027,7 @@ fn manifest_rejected_with_unknown_relay_parent() {
 			send_peer_message(
 				&mut overseer,
 				peer_c.clone(),
-				protocol_vstaging::StatementDistributionMessage::BackedCandidateManifest(
+				protocol_v2::StatementDistributionMessage::BackedCandidateManifest(
 					manifest.clone(),
 				),
 			)
@@ -2131,7 +2129,7 @@ fn manifest_rejected_when_not_a_validator() {
 			send_peer_message(
 				&mut overseer,
 				peer_c.clone(),
-				protocol_vstaging::StatementDistributionMessage::BackedCandidateManifest(
+				protocol_v2::StatementDistributionMessage::BackedCandidateManifest(
 					manifest.clone(),
 				),
 			)
@@ -2238,7 +2236,7 @@ fn manifest_rejected_when_group_does_not_match_para() {
 			send_peer_message(
 				&mut overseer,
 				peer_c.clone(),
-				protocol_vstaging::StatementDistributionMessage::BackedCandidateManifest(
+				protocol_v2::StatementDistributionMessage::BackedCandidateManifest(
 					manifest.clone(),
 				),
 			)
@@ -2370,7 +2368,7 @@ fn peer_reported_for_advertisement_conflicting_with_confirmed_candidate() {
 			send_peer_message(
 				&mut overseer,
 				peer_c.clone(),
-				protocol_vstaging::StatementDistributionMessage::BackedCandidateManifest(
+				protocol_v2::StatementDistributionMessage::BackedCandidateManifest(
 					manifest.clone(),
 				),
 			)
@@ -2439,7 +2437,7 @@ fn peer_reported_for_advertisement_conflicting_with_confirmed_candidate() {
 			send_peer_message(
 				&mut overseer,
 				peer_c.clone(),
-				protocol_vstaging::StatementDistributionMessage::BackedCandidateManifest(manifest),
+				protocol_v2::StatementDistributionMessage::BackedCandidateManifest(manifest),
 			)
 			.await;
 
diff --git a/polkadot/node/network/statement-distribution/src/vstaging/tests/mod.rs b/polkadot/node/network/statement-distribution/src/v2/tests/mod.rs
similarity index 95%
rename from polkadot/node/network/statement-distribution/src/vstaging/tests/mod.rs
rename to polkadot/node/network/statement-distribution/src/v2/tests/mod.rs
index f5f4c8443257b2b5ffe8ce32af77843b7fb9349e..4150377a0c6c219832104024f6d6c046dccec709 100644
--- a/polkadot/node/network/statement-distribution/src/vstaging/tests/mod.rs
+++ b/polkadot/node/network/statement-distribution/src/v2/tests/mod.rs
@@ -1,4 +1,4 @@
-// Copyright 2023 Parity Technologies (UK) Ltd.
+// Copyright (C) Parity Technologies (UK) Ltd.
 // This file is part of Polkadot.
 
 // Polkadot is free software: you can redistribute it and/or modify
@@ -30,9 +30,8 @@ use polkadot_node_subsystem::messages::{
 	RuntimeApiMessage, RuntimeApiRequest,
 };
 use polkadot_node_subsystem_test_helpers as test_helpers;
-use polkadot_node_subsystem_types::{jaeger, ActivatedLeaf, LeafStatus};
 use polkadot_node_subsystem_util::TimeoutExt;
-use polkadot_primitives::vstaging::{
+use polkadot_primitives::{
 	AssignmentPair, AsyncBackingParams, BlockNumber, CommittedCandidateReceipt, CoreState,
 	GroupRotationInfo, HeadData, Header, IndexedVec, PersistedValidationData, ScheduledCore,
 	SessionIndex, SessionInfo, ValidatorPair,
@@ -46,6 +45,7 @@ use assert_matches::assert_matches;
 use futures::Future;
 use parity_scale_codec::Encode;
 use rand::{Rng, SeedableRng};
+use test_helpers::mock::new_leaf;
 
 use std::sync::Arc;
 
@@ -356,14 +356,9 @@ async fn activate_leaf(
 	virtual_overseer: &mut VirtualOverseer,
 	leaf: &TestLeaf,
 	test_state: &TestState,
-	expect_session_info_request: bool,
+	is_new_session: bool,
 ) {
-	let activated = ActivatedLeaf {
-		hash: leaf.hash,
-		number: leaf.number,
-		status: LeafStatus::Fresh,
-		span: Arc::new(jaeger::Span::Disabled),
-	};
+	let activated = new_leaf(leaf.hash, leaf.number);
 
 	virtual_overseer
 		.send(FromOrchestra::Signal(OverseerSignal::ActiveLeaves(ActiveLeavesUpdate::start_work(
@@ -371,21 +366,21 @@ async fn activate_leaf(
 		))))
 		.await;
 
-	handle_leaf_activation(virtual_overseer, leaf, test_state, expect_session_info_request).await;
+	handle_leaf_activation(virtual_overseer, leaf, test_state, is_new_session).await;
 }
 
 async fn handle_leaf_activation(
 	virtual_overseer: &mut VirtualOverseer,
 	leaf: &TestLeaf,
 	test_state: &TestState,
-	expect_session_info_request: bool,
+	is_new_session: bool,
 ) {
 	let TestLeaf { number, hash, parent_hash, para_data, session, availability_cores } = leaf;
 
 	assert_matches!(
 		virtual_overseer.recv().await,
 		AllMessages::RuntimeApi(
-			RuntimeApiMessage::Request(parent, RuntimeApiRequest::StagingAsyncBackingParams(tx))
+			RuntimeApiMessage::Request(parent, RuntimeApiRequest::AsyncBackingParams(tx))
 		) if parent == *hash => {
 			tx.send(Ok(test_state.config.async_backing_params.unwrap_or(DEFAULT_ASYNC_BACKING_PARAMETERS))).unwrap();
 		}
@@ -447,7 +442,7 @@ async fn handle_leaf_activation(
 		}
 	);
 
-	if expect_session_info_request {
+	if is_new_session {
 		assert_matches!(
 			virtual_overseer.recv().await,
 			AllMessages::RuntimeApi(
@@ -455,6 +450,16 @@ async fn handle_leaf_activation(
 				tx.send(Ok(Some(test_state.session_info.clone()))).unwrap();
 			}
 		);
+
+		assert_matches!(
+			virtual_overseer.recv().await,
+			AllMessages::RuntimeApi(RuntimeApiMessage::Request(
+				parent,
+				RuntimeApiRequest::MinimumBackingVotes(session_index, tx),
+			)) if parent == *hash && session_index == *session => {
+				tx.send(Ok(2)).unwrap();
+			}
+		);
 	}
 }
 
@@ -474,7 +479,7 @@ async fn handle_sent_request(
 			assert_eq!(requests.len(), 1);
 			assert_matches!(
 				requests.pop().unwrap(),
-				Requests::AttestedCandidateVStaging(outgoing) => {
+				Requests::AttestedCandidateV2(outgoing) => {
 					assert_eq!(outgoing.peer, Recipient::Peer(peer));
 					assert_eq!(outgoing.payload.candidate_hash, candidate_hash);
 					assert_eq!(outgoing.payload.mask, mask);
@@ -532,7 +537,7 @@ async fn connect_peer(
 				NetworkBridgeEvent::PeerConnected(
 					peer,
 					ObservedRole::Authority,
-					ValidationVersion::VStaging.into(),
+					ValidationVersion::V2.into(),
 					authority_ids,
 				),
 			),
@@ -565,12 +570,12 @@ async fn send_peer_view_change(virtual_overseer: &mut VirtualOverseer, peer: Pee
 async fn send_peer_message(
 	virtual_overseer: &mut VirtualOverseer,
 	peer: PeerId,
-	message: protocol_vstaging::StatementDistributionMessage,
+	message: protocol_v2::StatementDistributionMessage,
 ) {
 	virtual_overseer
 		.send(FromOrchestra::Communication {
 			msg: StatementDistributionMessage::NetworkBridgeUpdate(
-				NetworkBridgeEvent::PeerMessage(peer, Versioned::VStaging(message)),
+				NetworkBridgeEvent::PeerMessage(peer, Versioned::V2(message)),
 			),
 		})
 		.await;
diff --git a/polkadot/node/network/statement-distribution/src/vstaging/tests/requests.rs b/polkadot/node/network/statement-distribution/src/v2/tests/requests.rs
similarity index 94%
rename from polkadot/node/network/statement-distribution/src/vstaging/tests/requests.rs
rename to polkadot/node/network/statement-distribution/src/v2/tests/requests.rs
index a86ef97f780787d101789290fe931067dba4c330..0734b75c9712d50dc8be0f78bde52001ae26b8f0 100644
--- a/polkadot/node/network/statement-distribution/src/vstaging/tests/requests.rs
+++ b/polkadot/node/network/statement-distribution/src/v2/tests/requests.rs
@@ -1,4 +1,4 @@
-// Copyright 2023 Parity Technologies (UK) Ltd.
+// Copyright (C) Parity Technologies (UK) Ltd.
 // This file is part of Polkadot.
 
 // Polkadot is free software: you can redistribute it and/or modify
@@ -19,7 +19,7 @@ use super::*;
 use bitvec::order::Lsb0;
 use parity_scale_codec::{Decode, Encode};
 use polkadot_node_network_protocol::{
-	request_response::vstaging as request_vstaging, vstaging::BackedCandidateManifest,
+	request_response::v2 as request_v2, v2::BackedCandidateManifest,
 };
 use polkadot_primitives_test_helpers::make_candidate;
 use sc_network::config::{
@@ -109,10 +109,7 @@ fn cluster_peer_allowed_to_send_incomplete_statements() {
 			send_peer_message(
 				&mut overseer,
 				peer_a.clone(),
-				protocol_vstaging::StatementDistributionMessage::Statement(
-					relay_parent,
-					a_seconded,
-				),
+				protocol_v2::StatementDistributionMessage::Statement(relay_parent, a_seconded),
 			)
 			.await;
 
@@ -164,9 +161,9 @@ fn cluster_peer_allowed_to_send_incomplete_statements() {
 				AllMessages:: NetworkBridgeTx(
 					NetworkBridgeTxMessage::SendValidationMessage(
 						peers,
-						Versioned::VStaging(
-							protocol_vstaging::ValidationProtocol::StatementDistribution(
-								protocol_vstaging::StatementDistributionMessage::Statement(hash, statement),
+						Versioned::V2(
+							protocol_v2::ValidationProtocol::StatementDistribution(
+								protocol_v2::StatementDistributionMessage::Statement(hash, statement),
 							),
 						),
 					)
@@ -304,7 +301,7 @@ fn peer_reported_for_providing_statements_meant_to_be_masked_out() {
 			send_peer_message(
 				&mut overseer,
 				peer_c.clone(),
-				protocol_vstaging::StatementDistributionMessage::BackedCandidateManifest(
+				protocol_v2::StatementDistributionMessage::BackedCandidateManifest(
 					manifest.clone(),
 				),
 			)
@@ -376,7 +373,7 @@ fn peer_reported_for_providing_statements_meant_to_be_masked_out() {
 			send_peer_message(
 				&mut overseer,
 				peer_c.clone(),
-				protocol_vstaging::StatementDistributionMessage::BackedCandidateManifest(
+				protocol_v2::StatementDistributionMessage::BackedCandidateManifest(
 					manifest.clone(),
 				),
 			)
@@ -453,7 +450,7 @@ fn peer_reported_for_providing_statements_meant_to_be_masked_out() {
 			send_peer_message(
 				&mut overseer,
 				peer_c.clone(),
-				protocol_vstaging::StatementDistributionMessage::BackedCandidateManifest(
+				protocol_v2::StatementDistributionMessage::BackedCandidateManifest(
 					manifest.clone(),
 				),
 			)
@@ -568,9 +565,7 @@ fn peer_reported_for_not_enough_statements() {
 		send_peer_message(
 			&mut overseer,
 			peer_c.clone(),
-			protocol_vstaging::StatementDistributionMessage::BackedCandidateManifest(
-				manifest.clone(),
-			),
+			protocol_v2::StatementDistributionMessage::BackedCandidateManifest(manifest.clone()),
 		)
 		.await;
 
@@ -752,10 +747,7 @@ fn peer_reported_for_duplicate_statements() {
 			send_peer_message(
 				&mut overseer,
 				peer_a.clone(),
-				protocol_vstaging::StatementDistributionMessage::Statement(
-					relay_parent,
-					a_seconded,
-				),
+				protocol_v2::StatementDistributionMessage::Statement(relay_parent, a_seconded),
 			)
 			.await;
 
@@ -812,9 +804,9 @@ fn peer_reported_for_duplicate_statements() {
 				AllMessages:: NetworkBridgeTx(
 					NetworkBridgeTxMessage::SendValidationMessage(
 						peers,
-						Versioned::VStaging(
-							protocol_vstaging::ValidationProtocol::StatementDistribution(
-								protocol_vstaging::StatementDistributionMessage::Statement(hash, statement),
+						Versioned::V2(
+							protocol_v2::ValidationProtocol::StatementDistribution(
+								protocol_v2::StatementDistributionMessage::Statement(hash, statement),
 							),
 						),
 					)
@@ -916,10 +908,7 @@ fn peer_reported_for_providing_statements_with_invalid_signatures() {
 			send_peer_message(
 				&mut overseer,
 				peer_a.clone(),
-				protocol_vstaging::StatementDistributionMessage::Statement(
-					relay_parent,
-					a_seconded,
-				),
+				protocol_v2::StatementDistributionMessage::Statement(relay_parent, a_seconded),
 			)
 			.await;
 
@@ -1058,10 +1047,7 @@ fn peer_reported_for_providing_statements_with_wrong_validator_id() {
 			send_peer_message(
 				&mut overseer,
 				peer_a.clone(),
-				protocol_vstaging::StatementDistributionMessage::Statement(
-					relay_parent,
-					a_seconded,
-				),
+				protocol_v2::StatementDistributionMessage::Statement(relay_parent, a_seconded),
 			)
 			.await;
 
@@ -1191,7 +1177,7 @@ fn local_node_sanity_checks_incoming_requests() {
 				.send(RawIncomingRequest {
 					// Request from peer that received manifest.
 					peer: peer_c,
-					payload: request_vstaging::AttestedCandidateRequest {
+					payload: request_v2::AttestedCandidateRequest {
 						candidate_hash: candidate.hash(),
 						mask: mask.clone(),
 					}
@@ -1225,8 +1211,8 @@ fn local_node_sanity_checks_incoming_requests() {
 				overseer.recv().await,
 				AllMessages::NetworkBridgeTx(NetworkBridgeTxMessage::SendValidationMessage(
 					peers,
-					Versioned::VStaging(protocol_vstaging::ValidationProtocol::StatementDistribution(
-						protocol_vstaging::StatementDistributionMessage::Statement(
+					Versioned::V2(protocol_v2::ValidationProtocol::StatementDistribution(
+						protocol_v2::StatementDistributionMessage::Statement(
 							r,
 							s,
 						)
@@ -1250,7 +1236,7 @@ fn local_node_sanity_checks_incoming_requests() {
 				.send(RawIncomingRequest {
 					// Request from peer that received manifest.
 					peer: peer_d,
-					payload: request_vstaging::AttestedCandidateRequest {
+					payload: request_v2::AttestedCandidateRequest {
 						candidate_hash: candidate.hash(),
 						mask: mask.clone(),
 					}
@@ -1269,10 +1255,7 @@ fn local_node_sanity_checks_incoming_requests() {
 			let response = state
 				.send_request(
 					peer_c,
-					request_vstaging::AttestedCandidateRequest {
-						candidate_hash: candidate.hash(),
-						mask,
-					},
+					request_v2::AttestedCandidateRequest { candidate_hash: candidate.hash(), mask },
 				)
 				.await
 				.await;
@@ -1296,7 +1279,7 @@ fn local_node_sanity_checks_incoming_requests() {
 			let response = state
 				.send_request(
 					peer_c,
-					request_vstaging::AttestedCandidateRequest {
+					request_v2::AttestedCandidateRequest {
 						candidate_hash: candidate.hash(),
 						mask: mask.clone(),
 					},
@@ -1455,7 +1438,7 @@ fn local_node_respects_statement_mask() {
 			send_peer_message(
 				&mut overseer,
 				peer_a.clone(),
-				protocol_vstaging::StatementDistributionMessage::Statement(relay_parent, statement),
+				protocol_v2::StatementDistributionMessage::Statement(relay_parent, statement),
 			)
 			.await;
 
@@ -1479,7 +1462,7 @@ fn local_node_respects_statement_mask() {
 			send_peer_message(
 				&mut overseer,
 				peer_b.clone(),
-				protocol_vstaging::StatementDistributionMessage::Statement(
+				protocol_v2::StatementDistributionMessage::Statement(
 					relay_parent,
 					statement_b.clone(),
 				),
@@ -1511,9 +1494,9 @@ fn local_node_respects_statement_mask() {
 				AllMessages:: NetworkBridgeTx(
 					NetworkBridgeTxMessage::SendValidationMessage(
 						peers,
-						Versioned::VStaging(
-							protocol_vstaging::ValidationProtocol::StatementDistribution(
-								protocol_vstaging::StatementDistributionMessage::BackedCandidateManifest(manifest),
+						Versioned::V2(
+							protocol_v2::ValidationProtocol::StatementDistribution(
+								protocol_v2::StatementDistributionMessage::BackedCandidateManifest(manifest),
 							),
 						),
 					)
@@ -1547,19 +1530,16 @@ fn local_node_respects_statement_mask() {
 			let response = state
 				.send_request(
 					peer_c,
-					request_vstaging::AttestedCandidateRequest {
-						candidate_hash: candidate.hash(),
-						mask,
-					},
+					request_v2::AttestedCandidateRequest { candidate_hash: candidate.hash(), mask },
 				)
 				.await
 				.await;
 
 			let expected_statements = vec![statement_b];
 			assert_matches!(response, full_response => {
-				// Response is the same for vstaging.
-				let request_vstaging::AttestedCandidateResponse { candidate_receipt, persisted_validation_data, statements } =
-					request_vstaging::AttestedCandidateResponse::decode(
+				// Response is the same for v2.
+				let request_v2::AttestedCandidateResponse { candidate_receipt, persisted_validation_data, statements } =
+					request_v2::AttestedCandidateResponse::decode(
 						&mut full_response.result.expect("We should have a proper answer").as_ref(),
 					).expect("Decoding should work");
 				assert_eq!(candidate_receipt, candidate);
@@ -1683,7 +1663,7 @@ fn should_delay_before_retrying_dropped_requests() {
 			send_peer_message(
 				&mut overseer,
 				peer_c.clone(),
-				protocol_vstaging::StatementDistributionMessage::BackedCandidateManifest(
+				protocol_v2::StatementDistributionMessage::BackedCandidateManifest(
 					manifest.clone(),
 				),
 			)
@@ -1696,7 +1676,7 @@ fn should_delay_before_retrying_dropped_requests() {
 					assert_eq!(requests.len(), 1);
 					assert_matches!(
 						requests.pop().unwrap(),
-						Requests::AttestedCandidateVStaging(outgoing) => {
+						Requests::AttestedCandidateV2(outgoing) => {
 							assert_eq!(outgoing.peer, Recipient::Peer(peer_c));
 							assert_eq!(outgoing.payload.candidate_hash, candidate_hash_1);
 							assert_eq!(outgoing.payload.mask, mask);
@@ -1729,7 +1709,7 @@ fn should_delay_before_retrying_dropped_requests() {
 			send_peer_message(
 				&mut overseer,
 				peer_c.clone(),
-				protocol_vstaging::StatementDistributionMessage::BackedCandidateManifest(
+				protocol_v2::StatementDistributionMessage::BackedCandidateManifest(
 					manifest.clone(),
 				),
 			)
diff --git a/polkadot/node/overseer/Cargo.toml b/polkadot/node/overseer/Cargo.toml
index 577b12e2620e07caa775d98a10d8964e484c7de4..5d41407ef83a832351ff29a4026352afbb21bf5c 100644
--- a/polkadot/node/overseer/Cargo.toml
+++ b/polkadot/node/overseer/Cargo.toml
@@ -1,6 +1,6 @@
 [package]
 name = "polkadot-overseer"
-version.workspace = true
+version = "1.0.0"
 authors.workspace = true
 edition.workspace = true
 license.workspace = true
@@ -16,27 +16,28 @@ polkadot-node-primitives = { path = "../primitives" }
 polkadot-node-subsystem-types = { path = "../subsystem-types" }
 polkadot-node-metrics = { path = "../metrics" }
 polkadot-primitives = { path = "../../primitives" }
-orchestra = "0.0.5"
+orchestra = { version = "0.3.3", default-features = false, features=["futures_channel"] }
 gum = { package = "tracing-gum", path = "../gum" }
-lru = "0.11.0"
+schnellru = "0.2.1"
 sp-core = { path = "../../../substrate/primitives/core" }
 async-trait = "0.1.57"
 tikv-jemalloc-ctl = { version = "0.5.0", optional = true }
 
 [dev-dependencies]
-metered = { package = "prioritized-metered-channel", version = "0.2.0" }
-
+metered = { package = "prioritized-metered-channel", version = "0.5.1", default-features = false, features=["futures_channel"] }
 sp-core = { path = "../../../substrate/primitives/core" }
 futures = { version = "0.3.21", features = ["thread-pool"] }
 femme = "2.2.1"
 assert_matches = "1.4.0"
 test-helpers = { package = "polkadot-primitives-test-helpers", path = "../../primitives/test-helpers" }
+node-test-helpers = { package = "polkadot-node-subsystem-test-helpers", path = "../subsystem-test-helpers" }
 
 [target.'cfg(target_os = "linux")'.dependencies]
 tikv-jemalloc-ctl = "0.5.0"
 
 [features]
-default = []
-expand = [ "orchestra/expand" ]
+default = [ "futures_channel" ]
 dotgraph = [ "orchestra/dotgraph" ]
+expand = [ "orchestra/expand" ]
+futures_channel = [ "metered/futures_channel", "orchestra/futures_channel" ]
 jemalloc-allocator = [ "dep:tikv-jemalloc-ctl" ]
diff --git a/polkadot/node/overseer/examples/minimal-example.rs b/polkadot/node/overseer/examples/minimal-example.rs
index a823b1d3961ec9549cc9a01dff3814b387611321..cffdfd9f8aa14851275ef3f41a4ddcb47ccb516f 100644
--- a/polkadot/node/overseer/examples/minimal-example.rs
+++ b/polkadot/node/overseer/examples/minimal-example.rs
@@ -76,6 +76,7 @@ impl Subsystem1 {
 			let msg = CandidateValidationMessage::ValidateFromChainState(
 				candidate_receipt,
 				PoV { block_data: BlockData(Vec::new()) }.into(),
+				Default::default(),
 				PvfExecTimeoutKind::Backing,
 				tx,
 			);
@@ -162,7 +163,6 @@ fn main() {
 			.unwrap();
 
 		let overseer_fut = overseer.run().fuse();
-		let timer_stream = timer_stream;
 
 		pin_mut!(timer_stream);
 		pin_mut!(overseer_fut);
diff --git a/polkadot/node/overseer/src/dummy.rs b/polkadot/node/overseer/src/dummy.rs
index 79daba1406769f8e256b5e435daf34163d345bbf..fea96e5dbab73a05e72fa90e8d4cef1765b9921e 100644
--- a/polkadot/node/overseer/src/dummy.rs
+++ b/polkadot/node/overseer/src/dummy.rs
@@ -19,9 +19,9 @@ use crate::{
 	Overseer, OverseerMetrics, OverseerSignal, OverseerSubsystemContext, SpawnGlue,
 	KNOWN_LEAVES_CACHE_SIZE,
 };
-use lru::LruCache;
 use orchestra::{FromOrchestra, SpawnedSubsystem, Subsystem, SubsystemContext};
 use polkadot_node_subsystem_types::{errors::SubsystemError, messages::*};
+use schnellru::{ByLength, LruMap};
 // Generated dummy messages
 use crate::messages::*;
 
@@ -193,7 +193,7 @@ where
 		.activation_external_listeners(Default::default())
 		.span_per_active_leaf(Default::default())
 		.active_leaves(Default::default())
-		.known_leaves(LruCache::new(KNOWN_LEAVES_CACHE_SIZE))
+		.known_leaves(LruMap::new(ByLength::new(KNOWN_LEAVES_CACHE_SIZE)))
 		.spawner(SpawnGlue(spawner))
 		.metrics(metrics)
 		.supports_parachains(supports_parachains);
diff --git a/polkadot/node/overseer/src/lib.rs b/polkadot/node/overseer/src/lib.rs
index 5655a3ef79c17ca2183c6077daf3bff9a39e0e8f..673569ab946f0f98c06ca89523049bba5061df2b 100644
--- a/polkadot/node/overseer/src/lib.rs
+++ b/polkadot/node/overseer/src/lib.rs
@@ -17,7 +17,7 @@
 //! # Overseer
 //!
 //! `overseer` implements the Overseer architecture described in the
-//! [implementers-guide](https://w3f.github.io/parachain-implementers-guide/node/index.html).
+//! [implementers' guide][overseer-page].
 //! For the motivations behind implementing the overseer itself you should
 //! check out that guide, documentation in this crate will be mostly discussing
 //! technical stuff.
@@ -53,6 +53,8 @@
 //!             .  +--------------------+               +---------------------+  .
 //!             ..................................................................
 //! ```
+//!
+//! [overseer-page]: https://paritytech.github.io/polkadot-sdk/book/node/overseer.html
 
 // #![deny(unused_results)]
 // unused dependencies can not work for test and examples at the same time
@@ -62,14 +64,13 @@
 use std::{
 	collections::{hash_map, HashMap},
 	fmt::{self, Debug},
-	num::NonZeroUsize,
 	pin::Pin,
 	sync::Arc,
 	time::Duration,
 };
 
 use futures::{channel::oneshot, future::BoxFuture, select, Future, FutureExt, StreamExt};
-use lru::LruCache;
+use schnellru::LruMap;
 
 use client::{BlockImportNotification, BlockchainEvents, FinalityNotification};
 use polkadot_primitives::{Block, BlockNumber, Hash};
@@ -88,7 +89,7 @@ use polkadot_node_subsystem_types::messages::{
 pub use polkadot_node_subsystem_types::{
 	errors::{SubsystemError, SubsystemResult},
 	jaeger, ActivatedLeaf, ActiveLeavesUpdate, LeafStatus, OverseerSignal,
-	RuntimeApiSubsystemClient,
+	RuntimeApiSubsystemClient, UnpinHandle,
 };
 
 pub mod metrics;
@@ -108,15 +109,12 @@ pub use orchestra::{
 	contextbounds, orchestra, subsystem, FromOrchestra, MapSubsystem, MessagePacket,
 	OrchestraError as OverseerError, SignalsReceived, Spawner, Subsystem, SubsystemContext,
 	SubsystemIncomingMessages, SubsystemInstance, SubsystemMeterReadouts, SubsystemMeters,
-	SubsystemSender, TimeoutExt, ToOrchestra,
+	SubsystemSender, TimeoutExt, ToOrchestra, TrySendError,
 };
 
 /// Store 2 days worth of blocks, not accounting for forks,
 /// in the LRU cache. Assumes a 6-second block time.
-pub const KNOWN_LEAVES_CACHE_SIZE: NonZeroUsize = match NonZeroUsize::new(2 * 24 * 3600 / 6) {
-	Some(cap) => cap,
-	None => panic!("Known leaves cache size must be non-zero"),
-};
+pub const KNOWN_LEAVES_CACHE_SIZE: u32 = 2 * 24 * 3600 / 6;
 
 #[cfg(any(target_os = "linux", feature = "jemalloc-allocator"))]
 mod memory_stats;
@@ -249,23 +247,35 @@ impl Handle {
 /// `HeaderBackend::block_number_from_id()`.
 #[derive(Debug, Clone)]
 pub struct BlockInfo {
-	/// hash of the block.
+	/// Hash of the block.
 	pub hash: Hash,
-	/// hash of the parent block.
+	/// Hash of the parent block.
 	pub parent_hash: Hash,
-	/// block's number.
+	/// Block's number.
 	pub number: BlockNumber,
+	/// A handle to unpin the block on drop.
+	pub unpin_handle: UnpinHandle,
 }
 
 impl From<BlockImportNotification<Block>> for BlockInfo {
 	fn from(n: BlockImportNotification<Block>) -> Self {
-		BlockInfo { hash: n.hash, parent_hash: n.header.parent_hash, number: n.header.number }
+		let hash = n.hash;
+		let parent_hash = n.header.parent_hash;
+		let number = n.header.number;
+		let unpin_handle = n.into_unpin_handle();
+
+		BlockInfo { hash, parent_hash, number, unpin_handle }
 	}
 }
 
 impl From<FinalityNotification<Block>> for BlockInfo {
 	fn from(n: FinalityNotification<Block>) -> Self {
-		BlockInfo { hash: n.hash, parent_hash: n.header.parent_hash, number: n.header.number }
+		let hash = n.hash;
+		let parent_hash = n.header.parent_hash;
+		let number = n.header.number;
+		let unpin_handle = n.into_unpin_handle();
+
+		BlockInfo { hash, parent_hash, number, unpin_handle }
 	}
 }
 
@@ -632,7 +642,7 @@ pub struct Overseer<SupportsParachains> {
 	pub supports_parachains: SupportsParachains,
 
 	/// An LRU cache for keeping track of relay-chain heads that have already been seen.
-	pub known_leaves: LruCache<Hash, ()>,
+	pub known_leaves: LruMap<Hash, ()>,
 
 	/// Various Prometheus metrics.
 	pub metrics: OverseerMetrics,
@@ -796,6 +806,7 @@ where
 				hash: block.hash,
 				number: block.number,
 				status,
+				unpin_handle: block.unpin_handle,
 				span,
 			}),
 			None => ActiveLeavesUpdate::default(),
@@ -880,9 +891,10 @@ where
 		let span = Arc::new(span);
 		self.span_per_active_leaf.insert(*hash, span.clone());
 
-		let status = if let Some(_) = self.known_leaves.put(*hash, ()) {
+		let status = if self.known_leaves.get(hash).is_some() {
 			LeafStatus::Stale
 		} else {
+			self.known_leaves.insert(*hash, ());
 			LeafStatus::Fresh
 		};
 
diff --git a/polkadot/node/overseer/src/tests.rs b/polkadot/node/overseer/src/tests.rs
index 4ac538a7fd3a26bf1be149c11d2c53d132ec9235..c17613fb7ea5dc3d12f04a6d3a9162b7de4dbbe6 100644
--- a/polkadot/node/overseer/src/tests.rs
+++ b/polkadot/node/overseer/src/tests.rs
@@ -19,15 +19,14 @@ use futures::{executor, pending, pin_mut, poll, select, stream, FutureExt};
 use std::{collections::HashMap, sync::atomic, task::Poll};
 
 use ::test_helpers::{dummy_candidate_descriptor, dummy_candidate_receipt, dummy_hash};
+use node_test_helpers::mock::{dummy_unpin_handle, new_leaf};
 use polkadot_node_network_protocol::{PeerId, UnifiedReputationChange};
 use polkadot_node_primitives::{
 	BlockData, CollationGenerationConfig, CollationResult, DisputeMessage, InvalidDisputeVote, PoV,
 	UncheckedDisputeMessage, ValidDisputeVote,
 };
-use polkadot_node_subsystem_types::{
-	jaeger,
-	messages::{NetworkBridgeEvent, ReportPeerMessage, RuntimeApiRequest},
-	ActivatedLeaf, LeafStatus,
+use polkadot_node_subsystem_types::messages::{
+	NetworkBridgeEvent, ReportPeerMessage, RuntimeApiRequest,
 };
 use polkadot_primitives::{
 	CandidateHash, CandidateReceipt, CollatorPair, Id as ParaId, InvalidDisputeStatementKind,
@@ -99,13 +98,14 @@ where
 					if c < 10 {
 						let candidate_receipt = CandidateReceipt {
 							descriptor: dummy_candidate_descriptor(dummy_hash()),
-							commitments_hash: Hash::zero(),
+							commitments_hash: dummy_hash(),
 						};
 
 						let (tx, _) = oneshot::channel();
 						ctx.send_message(CandidateValidationMessage::ValidateFromChainState(
 							candidate_receipt,
 							PoV { block_data: BlockData(Vec::new()) }.into(),
+							Default::default(),
 							PvfExecTimeoutKind::Backing,
 							tx,
 						))
@@ -215,11 +215,20 @@ fn overseer_metrics_work() {
 	executor::block_on(async move {
 		let first_block_hash = [1; 32].into();
 		let second_block_hash = [2; 32].into();
+		let unpin_handle = dummy_unpin_handle(dummy_hash());
 
-		let first_block =
-			BlockInfo { hash: first_block_hash, parent_hash: [0; 32].into(), number: 1 };
-		let second_block =
-			BlockInfo { hash: second_block_hash, parent_hash: first_block_hash, number: 2 };
+		let first_block = BlockInfo {
+			hash: first_block_hash,
+			parent_hash: [0; 32].into(),
+			number: 1,
+			unpin_handle: unpin_handle.clone(),
+		};
+		let second_block = BlockInfo {
+			hash: second_block_hash,
+			parent_hash: first_block_hash,
+			number: 2,
+			unpin_handle: unpin_handle.clone(),
+		};
 
 		let registry = prometheus::Registry::new();
 		let (overseer, handle) =
@@ -367,11 +376,20 @@ fn overseer_start_stop_works() {
 	executor::block_on(async move {
 		let first_block_hash = [1; 32].into();
 		let second_block_hash = [2; 32].into();
+		let unpin_handle = dummy_unpin_handle(dummy_hash());
 
-		let first_block =
-			BlockInfo { hash: first_block_hash, parent_hash: [0; 32].into(), number: 1 };
-		let second_block =
-			BlockInfo { hash: second_block_hash, parent_hash: first_block_hash, number: 2 };
+		let first_block = BlockInfo {
+			hash: first_block_hash,
+			parent_hash: [0; 32].into(),
+			number: 1,
+			unpin_handle: unpin_handle.clone(),
+		};
+		let second_block = BlockInfo {
+			hash: second_block_hash,
+			parent_hash: first_block_hash,
+			number: 2,
+			unpin_handle: unpin_handle.clone(),
+		};
 
 		let (tx_5, mut rx_5) = metered::channel(64);
 		let (tx_6, mut rx_6) = metered::channel(64);
@@ -395,21 +413,11 @@ fn overseer_start_stop_works() {
 
 		let expected_heartbeats = vec![
 			OverseerSignal::ActiveLeaves(ActiveLeavesUpdate {
-				activated: Some(ActivatedLeaf {
-					hash: first_block_hash,
-					number: 1,
-					span: Arc::new(jaeger::Span::Disabled),
-					status: LeafStatus::Fresh,
-				}),
+				activated: Some(new_leaf(first_block_hash, 1)),
 				deactivated: Default::default(),
 			}),
 			OverseerSignal::ActiveLeaves(ActiveLeavesUpdate {
-				activated: Some(ActivatedLeaf {
-					hash: second_block_hash,
-					number: 2,
-					span: Arc::new(jaeger::Span::Disabled),
-					status: LeafStatus::Fresh,
-				}),
+				activated: Some(new_leaf(second_block_hash, 2)),
 				deactivated: [first_block_hash].as_ref().into(),
 			}),
 		];
@@ -455,13 +463,26 @@ fn overseer_finalize_works() {
 		let first_block_hash = [1; 32].into();
 		let second_block_hash = [2; 32].into();
 		let third_block_hash = [3; 32].into();
+		let unpin_handle = dummy_unpin_handle(dummy_hash());
 
-		let first_block =
-			BlockInfo { hash: first_block_hash, parent_hash: [0; 32].into(), number: 1 };
-		let second_block =
-			BlockInfo { hash: second_block_hash, parent_hash: [42; 32].into(), number: 2 };
-		let third_block =
-			BlockInfo { hash: third_block_hash, parent_hash: second_block_hash, number: 3 };
+		let first_block = BlockInfo {
+			hash: first_block_hash,
+			parent_hash: [0; 32].into(),
+			number: 1,
+			unpin_handle: unpin_handle.clone(),
+		};
+		let second_block = BlockInfo {
+			hash: second_block_hash,
+			parent_hash: [42; 32].into(),
+			number: 2,
+			unpin_handle: unpin_handle.clone(),
+		};
+		let third_block = BlockInfo {
+			hash: third_block_hash,
+			parent_hash: second_block_hash,
+			number: 3,
+			unpin_handle: unpin_handle.clone(),
+		};
 
 		let (tx_5, mut rx_5) = metered::channel(64);
 		let (tx_6, mut rx_6) = metered::channel(64);
@@ -491,21 +512,11 @@ fn overseer_finalize_works() {
 
 		let expected_heartbeats = vec![
 			OverseerSignal::ActiveLeaves(ActiveLeavesUpdate {
-				activated: Some(ActivatedLeaf {
-					hash: first_block_hash,
-					number: 1,
-					span: Arc::new(jaeger::Span::Disabled),
-					status: LeafStatus::Fresh,
-				}),
+				activated: Some(new_leaf(first_block_hash, 1)),
 				deactivated: Default::default(),
 			}),
 			OverseerSignal::ActiveLeaves(ActiveLeavesUpdate {
-				activated: Some(ActivatedLeaf {
-					hash: second_block_hash,
-					number: 2,
-					span: Arc::new(jaeger::Span::Disabled),
-					status: LeafStatus::Fresh,
-				}),
+				activated: Some(new_leaf(second_block_hash, 2)),
 				deactivated: Default::default(),
 			}),
 			OverseerSignal::ActiveLeaves(ActiveLeavesUpdate {
@@ -562,11 +573,20 @@ fn overseer_finalize_leaf_preserves_it() {
 	executor::block_on(async move {
 		let first_block_hash = [1; 32].into();
 		let second_block_hash = [2; 32].into();
+		let unpin_handle = dummy_unpin_handle(dummy_hash());
 
-		let first_block =
-			BlockInfo { hash: first_block_hash, parent_hash: [0; 32].into(), number: 1 };
-		let second_block =
-			BlockInfo { hash: second_block_hash, parent_hash: [42; 32].into(), number: 1 };
+		let first_block = BlockInfo {
+			hash: first_block_hash,
+			parent_hash: [0; 32].into(),
+			number: 1,
+			unpin_handle: unpin_handle.clone(),
+		};
+		let second_block = BlockInfo {
+			hash: second_block_hash,
+			parent_hash: [42; 32].into(),
+			number: 1,
+			unpin_handle: unpin_handle.clone(),
+		};
 
 		let (tx_5, mut rx_5) = metered::channel(64);
 		let (tx_6, mut rx_6) = metered::channel(64);
@@ -594,18 +614,14 @@ fn overseer_finalize_leaf_preserves_it() {
 		handle.block_finalized(first_block).await;
 
 		let expected_heartbeats = vec![
-			OverseerSignal::ActiveLeaves(ActiveLeavesUpdate::start_work(ActivatedLeaf {
-				hash: first_block_hash,
-				number: 1,
-				span: Arc::new(jaeger::Span::Disabled),
-				status: LeafStatus::Fresh,
-			})),
-			OverseerSignal::ActiveLeaves(ActiveLeavesUpdate::start_work(ActivatedLeaf {
-				hash: second_block_hash,
-				number: 1,
-				span: Arc::new(jaeger::Span::Disabled),
-				status: LeafStatus::Fresh,
-			})),
+			OverseerSignal::ActiveLeaves(ActiveLeavesUpdate::start_work(new_leaf(
+				first_block_hash,
+				1,
+			))),
+			OverseerSignal::ActiveLeaves(ActiveLeavesUpdate::start_work(new_leaf(
+				second_block_hash,
+				2,
+			))),
 			OverseerSignal::ActiveLeaves(ActiveLeavesUpdate {
 				deactivated: [second_block_hash].as_ref().into(),
 				..Default::default()
@@ -656,11 +672,21 @@ fn do_not_send_empty_leaves_update_on_block_finalization() {
 	let spawner = sp_core::testing::TaskExecutor::new();
 
 	executor::block_on(async move {
-		let imported_block =
-			BlockInfo { hash: Hash::random(), parent_hash: Hash::random(), number: 1 };
+		let unpin_handle = dummy_unpin_handle(dummy_hash());
+
+		let imported_block = BlockInfo {
+			hash: Hash::random(),
+			parent_hash: Hash::random(),
+			number: 1,
+			unpin_handle: unpin_handle.clone(),
+		};
 
-		let finalized_block =
-			BlockInfo { hash: Hash::random(), parent_hash: Hash::random(), number: 1 };
+		let finalized_block = BlockInfo {
+			hash: Hash::random(),
+			parent_hash: Hash::random(),
+			number: 1,
+			unpin_handle: unpin_handle.clone(),
+		};
 
 		let (tx_5, mut rx_5) = metered::channel(64);
 
@@ -681,12 +707,10 @@ fn do_not_send_empty_leaves_update_on_block_finalization() {
 		handle.block_imported(imported_block.clone()).await;
 
 		let expected_heartbeats = vec![
-			OverseerSignal::ActiveLeaves(ActiveLeavesUpdate::start_work(ActivatedLeaf {
-				hash: imported_block.hash,
-				number: imported_block.number,
-				span: Arc::new(jaeger::Span::Disabled),
-				status: LeafStatus::Fresh,
-			})),
+			OverseerSignal::ActiveLeaves(ActiveLeavesUpdate::start_work(new_leaf(
+				imported_block.hash,
+				imported_block.number,
+			))),
 			OverseerSignal::BlockFinalized(finalized_block.hash, 1),
 		];
 
@@ -779,6 +803,7 @@ fn test_candidate_validation_msg() -> CandidateValidationMessage {
 	CandidateValidationMessage::ValidateFromChainState(
 		candidate_receipt,
 		pov,
+		Default::default(),
 		PvfExecTimeoutKind::Backing,
 		sender,
 	)
@@ -950,11 +975,13 @@ fn overseer_all_subsystems_receive_signals_and_messages() {
 		pin_mut!(overseer_fut);
 
 		// send a signal to each subsystem
+		let unpin_handle = dummy_unpin_handle(dummy_hash());
 		handle
 			.block_imported(BlockInfo {
 				hash: Default::default(),
 				parent_hash: Default::default(),
 				number: Default::default(),
+				unpin_handle: unpin_handle.clone(),
 			})
 			.await;
 
@@ -1047,6 +1074,7 @@ fn overseer_all_subsystems_receive_signals_and_messages() {
 
 #[test]
 fn context_holds_onto_message_until_enough_signals_received() {
+	const CHANNEL_CAPACITY: usize = 64;
 	let (candidate_validation_bounded_tx, _) = metered::channel(CHANNEL_CAPACITY);
 	let (candidate_backing_bounded_tx, _) = metered::channel(CHANNEL_CAPACITY);
 	let (statement_distribution_bounded_tx, _) = metered::channel(CHANNEL_CAPACITY);
diff --git a/polkadot/node/primitives/Cargo.toml b/polkadot/node/primitives/Cargo.toml
index c7c3239855107bca5c223b844454cfd17cdff629..55dfa67387094198c2126b79b5a31abc23dc2b4e 100644
--- a/polkadot/node/primitives/Cargo.toml
+++ b/polkadot/node/primitives/Cargo.toml
@@ -1,7 +1,7 @@
 [package]
 name = "polkadot-node-primitives"
 description = "Primitives types for the Node-side"
-version.workspace = true
+version = "1.0.0"
 authors.workspace = true
 edition.workspace = true
 license.workspace = true
@@ -17,13 +17,13 @@ sp-consensus-babe = { path = "../../../substrate/primitives/consensus/babe" }
 sp-keystore = { path = "../../../substrate/primitives/keystore" }
 sp-maybe-compressed-blob = { path = "../../../substrate/primitives/maybe-compressed-blob" }
 sp-runtime = { path = "../../../substrate/primitives/runtime" }
-polkadot-parachain = { path = "../../parachain", default-features = false }
+polkadot-parachain-primitives = { path = "../../parachain", default-features = false }
 schnorrkel = "0.9.1"
-thiserror = "1.0.31"
-serde = { version = "1.0.163", features = ["derive"] }
+thiserror = "1.0.48"
+serde = { version = "1.0.188", features = ["derive"] }
 
 [target.'cfg(not(target_os = "unknown"))'.dependencies]
-zstd = { version = "0.11.2", default-features = false }
+zstd = { version = "0.12.4", default-features = false }
 
 [dev-dependencies]
 polkadot-erasure-coding = { path = "../../erasure-coding" }
diff --git a/polkadot/node/primitives/src/disputes/mod.rs b/polkadot/node/primitives/src/disputes/mod.rs
index ae8602dd5fc4d81aec63e493b2735887851224a7..500b705be9574868c4b173333b6f84dd427d470c 100644
--- a/polkadot/node/primitives/src/disputes/mod.rs
+++ b/polkadot/node/primitives/src/disputes/mod.rs
@@ -263,9 +263,9 @@ impl SignedDisputeStatement {
 		self.session_index
 	}
 
-	/// Convert a [`SignedFullStatement`] to a [`SignedDisputeStatement`]
+	/// Convert a unchecked backing statement to a [`SignedDisputeStatement`]
 	///
-	/// As [`SignedFullStatement`] contains only the validator index and
+	/// As the unchecked backing statement contains only the validator index and
 	/// not the validator public key, the public key must be passed as well,
 	/// along with the signing context.
 	///
diff --git a/polkadot/node/primitives/src/lib.rs b/polkadot/node/primitives/src/lib.rs
index 392781783319e25a095c8fc08b36d4c30cd8cacf..dab72bb2a5ed80b1842d4ca341c609109dee8c75 100644
--- a/polkadot/node/primitives/src/lib.rs
+++ b/polkadot/node/primitives/src/lib.rs
@@ -22,7 +22,7 @@
 
 #![deny(missing_docs)]
 
-use std::{num::NonZeroUsize, pin::Pin};
+use std::pin::Pin;
 
 use bounded_vec::BoundedVec;
 use futures::Future;
@@ -39,7 +39,9 @@ pub use sp_consensus_babe::{
 	AllowedSlots as BabeAllowedSlots, BabeEpochConfiguration, Epoch as BabeEpoch,
 };
 
-pub use polkadot_parachain::primitives::{BlockData, HorizontalMessages, UpwardMessages};
+pub use polkadot_parachain_primitives::primitives::{
+	BlockData, HorizontalMessages, UpwardMessages,
+};
 
 pub mod approval;
 
@@ -51,6 +53,13 @@ pub use disputes::{
 	ValidDisputeVote, ACTIVE_DURATION_SECS,
 };
 
+/// The current node version, which takes the basic SemVer form `<major>.<minor>.<patch>`.
+/// In general, minor should be bumped on every release while major or patch releases are
+/// relatively rare.
+///
+/// The associated worker binaries should use the same version as the node that spawns them.
+pub const NODE_VERSION: &'static str = "1.1.0";
+
 // For a 16-ary Merkle Prefix Trie, we can expect at most 16 32-byte hashes per node
 // plus some overhead:
 // header 1 + bitmap 2 + max partial_key 8 + children 16 * (32 + len 1) + value 32 + value len 1
@@ -143,12 +152,6 @@ impl SessionWindowSize {
 	}
 }
 
-impl From<SessionWindowSize> for NonZeroUsize {
-	fn from(value: SessionWindowSize) -> Self {
-		NonZeroUsize::new(value.get() as usize).expect("SessionWindowSize can't be 0. qed.")
-	}
-}
-
 /// The cumulative weight of a block in a fork-choice rule.
 pub type BlockWeight = u32;
 
@@ -469,8 +472,8 @@ impl CollationResult {
 /// Collation function.
 ///
 /// Will be called with the hash of the relay chain block the parachain block should be build on and
-/// the [`ValidationData`] that provides information about the state of the parachain on the relay
-/// chain.
+/// the [`PersistedValidationData`] that provides information about the state of the parachain on
+/// the relay chain.
 ///
 /// Returns an optional [`CollationResult`].
 #[cfg(not(target_os = "unknown"))]
@@ -504,7 +507,7 @@ impl std::fmt::Debug for CollationGenerationConfig {
 	}
 }
 
-/// Parameters for [`CollationGenerationMessage::SubmitCollation`].
+/// Parameters for `CollationGenerationMessage::SubmitCollation`.
 #[derive(Debug)]
 pub struct SubmitCollationParams {
 	/// The relay-parent the collation is built against.
@@ -640,7 +643,7 @@ pub struct ErasureChunk {
 }
 
 impl ErasureChunk {
-	/// Convert bounded Vec Proof to regular Vec<Vec<u8>>
+	/// Convert bounded Vec Proof to regular `Vec<Vec<u8>>`
 	pub fn proof(&self) -> &Proof {
 		&self.proof
 	}
@@ -655,10 +658,3 @@ pub fn maybe_compress_pov(pov: PoV) -> PoV {
 	let pov = PoV { block_data: BlockData(raw) };
 	pov
 }
-
-/// How many votes we need to consider a candidate backed.
-///
-/// WARNING: This has to be kept in sync with the runtime check in the inclusion module.
-pub fn minimum_votes(n_validators: usize) -> usize {
-	std::cmp::min(2, n_validators)
-}
diff --git a/polkadot/node/service/Cargo.toml b/polkadot/node/service/Cargo.toml
index f58f4abca3627063f2395356ca40e700090dbac2..ba5976fdceef89683150d68ec38e2d90ff803c6c 100644
--- a/polkadot/node/service/Cargo.toml
+++ b/polkadot/node/service/Cargo.toml
@@ -1,7 +1,7 @@
 [package]
 name = "polkadot-service"
 rust-version = "1.60"
-version.workspace = true
+version = "1.0.0"
 authors.workspace = true
 edition.workspace = true
 license.workspace = true
@@ -77,16 +77,16 @@ frame-benchmarking = { path = "../../../substrate/frame/benchmarking" }
 futures = "0.3.21"
 hex-literal = "0.4.1"
 gum = { package = "tracing-gum", path = "../gum" }
-serde = { version = "1.0.163", features = ["derive"] }
-serde_json = "1.0.96"
-thiserror = "1.0.31"
+serde = { version = "1.0.188", features = ["derive"] }
+serde_json = "1.0.107"
+thiserror = "1.0.48"
 kvdb = "0.13.0"
 kvdb-rocksdb = { version = "0.19.0", optional = true }
 parity-db = { version = "0.4.8", optional = true }
 codec = { package = "parity-scale-codec", version = "3.6.1" }
 
 async-trait = "0.1.57"
-lru = "0.11.0"
+schnellru = "0.2.1"
 log = "0.4.17"
 is_executable = "1.0.1"
 
@@ -94,7 +94,7 @@ is_executable = "1.0.1"
 polkadot-core-primitives = { path = "../../core-primitives" }
 polkadot-node-core-parachains-inherent = { path = "../core/parachains-inherent" }
 polkadot-overseer = { path = "../overseer" }
-polkadot-parachain = { path = "../../parachain" }
+polkadot-parachain-primitives = { path = "../../parachain" }
 polkadot-primitives = { path = "../../primitives" }
 polkadot-node-primitives = { path = "../primitives" }
 polkadot-rpc = { path = "../../rpc" }
@@ -103,17 +103,12 @@ polkadot-node-subsystem-util = { path = "../subsystem-util" }
 polkadot-node-subsystem-types = { path = "../subsystem-types" }
 polkadot-runtime-parachains = { path = "../../runtime/parachains" }
 polkadot-node-network-protocol = { path = "../network/protocol" }
-polkadot-runtime-common = { path = "../../runtime/common" }
 
 # Polkadot Runtime Constants
-polkadot-runtime-constants = { path = "../../runtime/polkadot/constants", optional = true }
-kusama-runtime-constants = { path = "../../runtime/kusama/constants", optional = true }
 rococo-runtime-constants = { path = "../../runtime/rococo/constants", optional = true }
 westend-runtime-constants = { path = "../../runtime/westend/constants", optional = true }
 
 # Polkadot Runtimes
-polkadot-runtime = { path = "../../runtime/polkadot", optional = true }
-kusama-runtime = { path = "../../runtime/kusama", optional = true }
 westend-runtime = { path = "../../runtime/westend", optional = true }
 rococo-runtime = { path = "../../runtime/rococo", optional = true }
 
@@ -183,43 +178,48 @@ full-node = [
 	"polkadot-statement-distribution",
 ]
 
-# Configure the native runtimes to use. Polkadot is enabled by default.
-#
-# Validators require the native runtime currently
-polkadot-native = [ "polkadot-runtime", "polkadot-runtime-constants" ]
-kusama-native = [ "kusama-runtime", "kusama-runtime-constants" ]
+# Configure the native runtimes to use.
 westend-native = [ "westend-runtime", "westend-runtime-constants" ]
 rococo-native = [ "rococo-runtime", "rococo-runtime-constants" ]
 
 runtime-benchmarks = [
-	"kusama-runtime?/runtime-benchmarks",
-	"polkadot-runtime?/runtime-benchmarks",
+	"frame-benchmarking-cli/runtime-benchmarks",
+	"frame-benchmarking/runtime-benchmarks",
+	"frame-support/runtime-benchmarks",
+	"frame-system/runtime-benchmarks",
+	"pallet-babe/runtime-benchmarks",
+	"pallet-im-online/runtime-benchmarks",
+	"pallet-staking/runtime-benchmarks",
+	"polkadot-parachain-primitives/runtime-benchmarks",
+	"polkadot-primitives/runtime-benchmarks",
+	"polkadot-runtime-parachains/runtime-benchmarks",
+	"polkadot-test-client/runtime-benchmarks",
 	"rococo-runtime?/runtime-benchmarks",
+	"sc-client-db/runtime-benchmarks",
 	"service/runtime-benchmarks",
+	"sp-runtime/runtime-benchmarks",
 	"westend-runtime?/runtime-benchmarks",
 ]
 try-runtime = [
-	"kusama-runtime?/try-runtime",
-	"polkadot-runtime?/try-runtime",
+	"frame-support/try-runtime",
+	"frame-system/try-runtime",
+	"pallet-babe/try-runtime",
+	"pallet-im-online/try-runtime",
+	"pallet-staking/try-runtime",
+	"pallet-transaction-payment/try-runtime",
+	"polkadot-runtime-parachains/try-runtime",
 	"rococo-runtime?/try-runtime",
+	"sp-runtime/try-runtime",
 	"westend-runtime?/try-runtime",
 ]
 fast-runtime = [
-	"kusama-runtime?/fast-runtime",
-	"polkadot-runtime?/fast-runtime",
 	"rococo-runtime?/fast-runtime",
 	"westend-runtime?/fast-runtime",
 ]
 
 malus = [ "full-node" ]
 runtime-metrics = [
-	"kusama-runtime?/runtime-metrics",
 	"polkadot-runtime-parachains/runtime-metrics",
-	"polkadot-runtime?/runtime-metrics",
 	"rococo-runtime?/runtime-metrics",
 	"westend-runtime?/runtime-metrics",
 ]
-
-network-protocol-staging = [
-	"polkadot-node-network-protocol/network-protocol-staging",
-]
diff --git a/polkadot/node/service/README.adoc b/polkadot/node/service/README.adoc
deleted file mode 100644
index 2196d5467806cd63751c89c6ab63674c554a5e87..0000000000000000000000000000000000000000
--- a/polkadot/node/service/README.adoc
+++ /dev/null
@@ -1,5 +0,0 @@
-
-= Polkadot Service
-
-placeholder
-//TODO Write content :) (https://github.com/paritytech/polkadot/issues/159)
diff --git a/polkadot/node/service/chain-specs/rococo.json b/polkadot/node/service/chain-specs/rococo.json
index 43dc959b57677145629019e0b57924f5a251f280..2648063641c919108e4478f53ff8bd321ff7e64e 100644
--- a/polkadot/node/service/chain-specs/rococo.json
+++ b/polkadot/node/service/chain-specs/rococo.json
@@ -3,14 +3,22 @@
   "id": "rococo_v2_2",
   "chainType": "Live",
   "bootNodes": [
-    "/dns/rococo-bootnode-0.parity-testnet.parity.io/tcp/30333/p2p/12D3KooWGikJMBmRiG5ofCqn8aijCijgfmZR5H9f53yUF3srm6Nm",
-    "/dns/rococo-bootnode-1.parity-testnet.parity.io/tcp/30333/p2p/12D3KooWLDfH9mHRCidrd5NfQjp7rRMUcJSEUwSvEKyu7xU2cG3d",
-    "/dns/rococo-bootnode-2.parity-testnet.parity.io/tcp/30333/p2p/12D3KooWSikgbrcWjVgSed7r1uXk4TeAieDnHKtrPDVZBu5XkQha",
-    "/dns/rococo-bootnode-3.parity-testnet.parity.io/tcp/30333/p2p/12D3KooWPeKuW1BBPv4pNr8xqEv7jqy7rQnS3oq9U7xTCvj9qt2k",
-    "/dns/rococo-bootnode-4.parity-testnet.parity.io/tcp/30333/p2p/12D3KooWNy7K8TNaP2Whcp3tsjBVUg2HcKMUvAArsimjvd1g31w4",
-    "/dns/rococo-bootnode-5.parity-testnet.parity.io/tcp/30333/p2p/12D3KooWAVV9DZfvJp2brvs5zcQDTBFxNmEFJKy2dsvezWL4Bmy8",
-    "/dns/rococo-bootnode-6.parity-testnet.parity.io/tcp/30333/p2p/12D3KooWM3hvXvaShyp7drQCavFHuwobkYdnCp2uHU5iRRAQwsw2",
-    "/dns/rococo-bootnode-7.parity-testnet.parity.io/tcp/30333/p2p/12D3KooWSbGtxfWCwn1tdmfZYESbmxzbTG2LKwKUrioDaZBcdMY4",
+    "/dns/rococo-bootnode-0.polkadot.io/tcp/30333/p2p/12D3KooWGikJMBmRiG5ofCqn8aijCijgfmZR5H9f53yUF3srm6Nm",
+    "/dns/rococo-bootnode-1.polkadot.io/tcp/30333/p2p/12D3KooWLDfH9mHRCidrd5NfQjp7rRMUcJSEUwSvEKyu7xU2cG3d",
+    "/dns/rococo-bootnode-2.polkadot.io/tcp/30333/p2p/12D3KooWSikgbrcWjVgSed7r1uXk4TeAieDnHKtrPDVZBu5XkQha",
+    "/dns/rococo-bootnode-3.polkadot.io/tcp/30333/p2p/12D3KooWPeKuW1BBPv4pNr8xqEv7jqy7rQnS3oq9U7xTCvj9qt2k",
+    "/dns/rococo-bootnode-4.polkadot.io/tcp/30333/p2p/12D3KooWNy7K8TNaP2Whcp3tsjBVUg2HcKMUvAArsimjvd1g31w4",
+    "/dns/rococo-bootnode-5.polkadot.io/tcp/30333/p2p/12D3KooWAVV9DZfvJp2brvs5zcQDTBFxNmEFJKy2dsvezWL4Bmy8",
+    "/dns/rococo-bootnode-6.polkadot.io/tcp/30333/p2p/12D3KooWM3hvXvaShyp7drQCavFHuwobkYdnCp2uHU5iRRAQwsw2",
+    "/dns/rococo-bootnode-7.polkadot.io/tcp/30333/p2p/12D3KooWSbGtxfWCwn1tdmfZYESbmxzbTG2LKwKUrioDaZBcdMY4",
+    "/dns/rococo-bootnode-0.polkadot.io/tcp/30334/ws/p2p/12D3KooWGikJMBmRiG5ofCqn8aijCijgfmZR5H9f53yUF3srm6Nm",
+    "/dns/rococo-bootnode-1.polkadot.io/tcp/30334/ws/p2p/12D3KooWLDfH9mHRCidrd5NfQjp7rRMUcJSEUwSvEKyu7xU2cG3d",
+    "/dns/rococo-bootnode-2.polkadot.io/tcp/30334/ws/p2p/12D3KooWSikgbrcWjVgSed7r1uXk4TeAieDnHKtrPDVZBu5XkQha",
+    "/dns/rococo-bootnode-3.polkadot.io/tcp/30334/ws/p2p/12D3KooWPeKuW1BBPv4pNr8xqEv7jqy7rQnS3oq9U7xTCvj9qt2k",
+    "/dns/rococo-bootnode-4.polkadot.io/tcp/30334/ws/p2p/12D3KooWNy7K8TNaP2Whcp3tsjBVUg2HcKMUvAArsimjvd1g31w4",
+    "/dns/rococo-bootnode-5.polkadot.io/tcp/30334/ws/p2p/12D3KooWAVV9DZfvJp2brvs5zcQDTBFxNmEFJKy2dsvezWL4Bmy8",
+    "/dns/rococo-bootnode-6.polkadot.io/tcp/30334/ws/p2p/12D3KooWM3hvXvaShyp7drQCavFHuwobkYdnCp2uHU5iRRAQwsw2",
+    "/dns/rococo-bootnode-7.polkadot.io/tcp/30334/ws/p2p/12D3KooWSbGtxfWCwn1tdmfZYESbmxzbTG2LKwKUrioDaZBcdMY4",
     "/dns/rococo-bootnode-0.polkadot.io/tcp/443/wss/p2p/12D3KooWGikJMBmRiG5ofCqn8aijCijgfmZR5H9f53yUF3srm6Nm",
     "/dns/rococo-bootnode-1.polkadot.io/tcp/443/wss/p2p/12D3KooWLDfH9mHRCidrd5NfQjp7rRMUcJSEUwSvEKyu7xU2cG3d",
     "/dns/rococo-bootnode-2.polkadot.io/tcp/443/wss/p2p/12D3KooWSikgbrcWjVgSed7r1uXk4TeAieDnHKtrPDVZBu5XkQha",
diff --git a/polkadot/node/service/chain-specs/westend.json b/polkadot/node/service/chain-specs/westend.json
index e57786f78a6419748ab85f5c0a9f02f6e9a48029..fd1f4550127fc91e743d59e4430ad313713ed445 100644
--- a/polkadot/node/service/chain-specs/westend.json
+++ b/polkadot/node/service/chain-specs/westend.json
@@ -2,16 +2,18 @@
   "name": "Westend",
   "id": "westend2",
   "bootNodes": [
-    "/dns/0.westend.paritytech.net/tcp/30333/p2p/12D3KooWKer94o1REDPtAhjtYR4SdLehnSrN8PEhBnZm5NBoCrMC",
-    "/dns/0.westend.paritytech.net/tcp/30334/ws/p2p/12D3KooWKer94o1REDPtAhjtYR4SdLehnSrN8PEhBnZm5NBoCrMC",
-    "/dns/1.westend.paritytech.net/tcp/30333/p2p/12D3KooWPVPzs42GvRBShdUMtFsk4SvnByrSdWqb6aeAAHvLMSLS",
-    "/dns/1.westend.paritytech.net/tcp/30334/ws/p2p/12D3KooWPVPzs42GvRBShdUMtFsk4SvnByrSdWqb6aeAAHvLMSLS",
-    "/dns/2.westend.paritytech.net/tcp/30333/p2p/12D3KooWByVpK92hMi9CzTjyFg9cPHDU5ariTM3EPMq9vdh5S5Po",
-    "/dns/2.westend.paritytech.net/tcp/30334/ws/p2p/12D3KooWByVpK92hMi9CzTjyFg9cPHDU5ariTM3EPMq9vdh5S5Po",
-    "/dns/3.westend.paritytech.net/tcp/30333/p2p/12D3KooWGi1tCpKXLMYED9y28QXLnwgD4neYb1Arqq4QpeV1Sv3K",
-    "/dns/3.westend.paritytech.net/tcp/30334/ws/p2p/12D3KooWGi1tCpKXLMYED9y28QXLnwgD4neYb1Arqq4QpeV1Sv3K",
-    "/dns/westend-connect-0.polkadot.io/tcp/443/wss/p2p/12D3KooWNg8iUqhux7X7voNU9Nty5pzehrFJwkQwg1CJnqN3CTzE",
-    "/dns/westend-connect-1.polkadot.io/tcp/443/wss/p2p/12D3KooWAq2A7UNFS6725XFatD5QW7iYBezTLdAUx1SmRkxN79Ne",
+    "/dns/westend-bootnode-0.polkadot.io/tcp/30333/p2p/12D3KooWKer94o1REDPtAhjtYR4SdLehnSrN8PEhBnZm5NBoCrMC",
+    "/dns/westend-bootnode-0.polkadot.io/tcp/30334/ws/p2p/12D3KooWKer94o1REDPtAhjtYR4SdLehnSrN8PEhBnZm5NBoCrMC",
+    "/dns/westend-bootnode-0.polkadot.io/tcp/443/wss/p2p/12D3KooWKer94o1REDPtAhjtYR4SdLehnSrN8PEhBnZm5NBoCrMC",
+    "/dns/westend-bootnode-1.polkadot.io/tcp/30333/p2p/12D3KooWPVPzs42GvRBShdUMtFsk4SvnByrSdWqb6aeAAHvLMSLS",
+    "/dns/westend-bootnode-1.polkadot.io/tcp/30334/ws/p2p/12D3KooWPVPzs42GvRBShdUMtFsk4SvnByrSdWqb6aeAAHvLMSLS",
+    "/dns/westend-bootnode-1.polkadot.io/tcp/443/wss/p2p/12D3KooWPVPzs42GvRBShdUMtFsk4SvnByrSdWqb6aeAAHvLMSLS",
+    "/dns/westend-bootnode-2.polkadot.io/tcp/30333/p2p/12D3KooWByVpK92hMi9CzTjyFg9cPHDU5ariTM3EPMq9vdh5S5Po",
+    "/dns/westend-bootnode-2.polkadot.io/tcp/30334/ws/p2p/12D3KooWByVpK92hMi9CzTjyFg9cPHDU5ariTM3EPMq9vdh5S5Po",
+    "/dns/westend-bootnode-2.polkadot.io/tcp/443/wss/p2p/12D3KooWByVpK92hMi9CzTjyFg9cPHDU5ariTM3EPMq9vdh5S5Po",
+    "/dns/westend-bootnode-3.polkadot.io/tcp/30333/p2p/12D3KooWGi1tCpKXLMYED9y28QXLnwgD4neYb1Arqq4QpeV1Sv3K",
+    "/dns/westend-bootnode-3.polkadot.io/tcp/30334/ws/p2p/12D3KooWGi1tCpKXLMYED9y28QXLnwgD4neYb1Arqq4QpeV1Sv3K",
+    "/dns/westend-bootnode-3.polkadot.io/tcp/443/wss/p2p/12D3KooWGi1tCpKXLMYED9y28QXLnwgD4neYb1Arqq4QpeV1Sv3K",
     "/dns/boot.stake.plus/tcp/32333/p2p/12D3KooWK8fjVoSvMq5copQYMsdYreSGPGgcMbGMgbMDPfpf3sm7",
     "/dns/boot.stake.plus/tcp/32334/wss/p2p/12D3KooWK8fjVoSvMq5copQYMsdYreSGPGgcMbGMgbMDPfpf3sm7",
     "/dns/boot-node.helikon.io/tcp/7080/p2p/12D3KooWRFDPyT8vA8mLzh6dJoyujn4QNjeqi6Ch79eSMz9beKXC",
diff --git a/polkadot/node/service/src/benchmarking.rs b/polkadot/node/service/src/benchmarking.rs
index 6955bc6d96900a7f4c38b419dbb8b7c9e4d06656..400daf1aee3448f841f9030f24b78a0029fc0830 100644
--- a/polkadot/node/service/src/benchmarking.rs
+++ b/polkadot/node/service/src/benchmarking.rs
@@ -14,7 +14,7 @@
 // You should have received a copy of the GNU General Public License
 // along with Polkadot.  If not, see <http://www.gnu.org/licenses/>.
 
-//! Code related to benchmarking a [`crate::Client`].
+//! Code related to benchmarking a node.
 
 use polkadot_primitives::AccountId;
 use sc_client_api::UsageProvider;
@@ -34,36 +34,8 @@ macro_rules! identify_chain {
 		$generic_code:expr $(,)*
 	) => {
 		match $chain {
-			Chain::Polkadot => {
-				#[cfg(feature = "polkadot-native")]
-				{
-					use polkadot_runtime as runtime;
-
-					let call = $generic_code;
-
-					Ok(polkadot_sign_call(call, $nonce, $current_block, $period, $genesis, $signer))
-				}
-
-				#[cfg(not(feature = "polkadot-native"))]
-				{
-					Err("`polkadot-native` feature not enabled")
-				}
-			},
-			Chain::Kusama => {
-				#[cfg(feature = "kusama-native")]
-				{
-					use kusama_runtime as runtime;
-
-					let call = $generic_code;
-
-					Ok(kusama_sign_call(call, $nonce, $current_block, $period, $genesis, $signer))
-				}
-
-				#[cfg(not(feature = "kusama-native"))]
-				{
-					Err("`kusama-native` feature not enabled")
-				}
-			},
+			Chain::Polkadot => Err("Polkadot runtimes are currently not supported"),
+			Chain::Kusama => Err("Kusama runtimes are currently not supported"),
 			Chain::Rococo => {
 				#[cfg(feature = "rococo-native")]
 				{
@@ -91,16 +63,18 @@ macro_rules! identify_chain {
 
 				#[cfg(not(feature = "westend-native"))]
 				{
-					let _ = $nonce;
-					let _ = $current_block;
-					let _ = $period;
-					let _ = $genesis;
-					let _ = $signer;
-
 					Err("`westend-native` feature not enabled")
 				}
 			},
-			Chain::Unknown => Err("Unknown chain"),
+			Chain::Unknown => {
+				let _ = $nonce;
+				let _ = $current_block;
+				let _ = $period;
+				let _ = $genesis;
+				let _ = $signer;
+
+				Err("Unknown chain")
+			},
 		}
 	};
 }
@@ -130,10 +104,8 @@ impl frame_benchmarking_cli::ExtrinsicBuilder for RemarkBuilder {
 	}
 
 	fn build(&self, nonce: u32) -> std::result::Result<OpaqueExtrinsic, &'static str> {
-		let period = polkadot_runtime_common::BlockHashCount::get()
-			.checked_next_power_of_two()
-			.map(|c| c / 2)
-			.unwrap_or(2) as u64;
+		// We apply the extrinsic directly, so let's take some random period.
+		let period = 128;
 		let genesis = self.client.usage_info().chain.best_hash;
 		let signer = Sr25519Keyring::Bob.pair();
 		let current_block = 0;
@@ -181,10 +153,8 @@ impl frame_benchmarking_cli::ExtrinsicBuilder for TransferKeepAliveBuilder {
 
 	fn build(&self, nonce: u32) -> std::result::Result<OpaqueExtrinsic, &'static str> {
 		let signer = Sr25519Keyring::Bob.pair();
-		let period = polkadot_runtime_common::BlockHashCount::get()
-			.checked_next_power_of_two()
-			.map(|c| c / 2)
-			.unwrap_or(2) as u64;
+		// We apply the extrinsic directly, so let's take some random period.
+		let period = 128;
 		let genesis = self.client.usage_info().chain.best_hash;
 		let current_block = 0;
 		let _dest = self.dest.clone();
@@ -206,60 +176,6 @@ impl frame_benchmarking_cli::ExtrinsicBuilder for TransferKeepAliveBuilder {
 	}
 }
 
-#[cfg(feature = "polkadot-native")]
-fn polkadot_sign_call(
-	call: polkadot_runtime::RuntimeCall,
-	nonce: u32,
-	current_block: u64,
-	period: u64,
-	genesis: sp_core::H256,
-	acc: sp_core::sr25519::Pair,
-) -> OpaqueExtrinsic {
-	use codec::Encode;
-	use polkadot_runtime as runtime;
-	use sp_core::Pair;
-
-	let extra: runtime::SignedExtra = (
-		frame_system::CheckNonZeroSender::<runtime::Runtime>::new(),
-		frame_system::CheckSpecVersion::<runtime::Runtime>::new(),
-		frame_system::CheckTxVersion::<runtime::Runtime>::new(),
-		frame_system::CheckGenesis::<runtime::Runtime>::new(),
-		frame_system::CheckMortality::<runtime::Runtime>::from(sp_runtime::generic::Era::mortal(
-			period,
-			current_block,
-		)),
-		frame_system::CheckNonce::<runtime::Runtime>::from(nonce),
-		frame_system::CheckWeight::<runtime::Runtime>::new(),
-		pallet_transaction_payment::ChargeTransactionPayment::<runtime::Runtime>::from(0),
-		polkadot_runtime_common::claims::PrevalidateAttests::<runtime::Runtime>::new(),
-	);
-
-	let payload = runtime::SignedPayload::from_raw(
-		call.clone(),
-		extra.clone(),
-		(
-			(),
-			runtime::VERSION.spec_version,
-			runtime::VERSION.transaction_version,
-			genesis,
-			genesis,
-			(),
-			(),
-			(),
-			(),
-		),
-	);
-
-	let signature = payload.using_encoded(|p| acc.sign(p));
-	runtime::UncheckedExtrinsic::new_signed(
-		call,
-		sp_runtime::AccountId32::from(acc.public()).into(),
-		polkadot_core_primitives::Signature::Sr25519(signature.clone()),
-		extra,
-	)
-	.into()
-}
-
 #[cfg(feature = "westend-native")]
 fn westend_sign_call(
 	call: westend_runtime::RuntimeCall,
@@ -312,58 +228,6 @@ fn westend_sign_call(
 	.into()
 }
 
-#[cfg(feature = "kusama-native")]
-fn kusama_sign_call(
-	call: kusama_runtime::RuntimeCall,
-	nonce: u32,
-	current_block: u64,
-	period: u64,
-	genesis: sp_core::H256,
-	acc: sp_core::sr25519::Pair,
-) -> OpaqueExtrinsic {
-	use codec::Encode;
-	use kusama_runtime as runtime;
-	use sp_core::Pair;
-
-	let extra: runtime::SignedExtra = (
-		frame_system::CheckNonZeroSender::<runtime::Runtime>::new(),
-		frame_system::CheckSpecVersion::<runtime::Runtime>::new(),
-		frame_system::CheckTxVersion::<runtime::Runtime>::new(),
-		frame_system::CheckGenesis::<runtime::Runtime>::new(),
-		frame_system::CheckMortality::<runtime::Runtime>::from(sp_runtime::generic::Era::mortal(
-			period,
-			current_block,
-		)),
-		frame_system::CheckNonce::<runtime::Runtime>::from(nonce),
-		frame_system::CheckWeight::<runtime::Runtime>::new(),
-		pallet_transaction_payment::ChargeTransactionPayment::<runtime::Runtime>::from(0),
-	);
-
-	let payload = runtime::SignedPayload::from_raw(
-		call.clone(),
-		extra.clone(),
-		(
-			(),
-			runtime::VERSION.spec_version,
-			runtime::VERSION.transaction_version,
-			genesis,
-			genesis,
-			(),
-			(),
-			(),
-		),
-	);
-
-	let signature = payload.using_encoded(|p| acc.sign(p));
-	runtime::UncheckedExtrinsic::new_signed(
-		call,
-		sp_runtime::AccountId32::from(acc.public()).into(),
-		polkadot_core_primitives::Signature::Sr25519(signature.clone()),
-		extra,
-	)
-	.into()
-}
-
 #[cfg(feature = "rococo-native")]
 fn rococo_sign_call(
 	call: rococo_runtime::RuntimeCall,
diff --git a/polkadot/node/service/src/chain_spec.rs b/polkadot/node/service/src/chain_spec.rs
index 1e5aaa807b8178989700902f0a7a80b1b1fe1d76..ce25c08b8773059497cdc9624f9fb1cd65d20031 100644
--- a/polkadot/node/service/src/chain_spec.rs
+++ b/polkadot/node/service/src/chain_spec.rs
@@ -18,22 +18,10 @@
 
 use beefy_primitives::ecdsa_crypto::AuthorityId as BeefyId;
 use grandpa::AuthorityId as GrandpaId;
-#[cfg(feature = "kusama-native")]
-use kusama_runtime as kusama;
-#[cfg(feature = "kusama-native")]
-use kusama_runtime_constants::currency::UNITS as KSM;
 use pallet_im_online::sr25519::AuthorityId as ImOnlineId;
-#[cfg(any(
-	feature = "polkadot-native",
-	feature = "kusama-native",
-	feature = "westend-native",
-))]
+#[cfg(feature = "westend-native")]
 use pallet_staking::Forcing;
 use polkadot_primitives::{AccountId, AccountPublic, AssignmentId, ValidatorId};
-#[cfg(feature = "polkadot-native")]
-use polkadot_runtime as polkadot;
-#[cfg(feature = "polkadot-native")]
-use polkadot_runtime_constants::currency::UNITS as DOT;
 use sp_authority_discovery::AuthorityId as AuthorityDiscoveryId;
 use sp_consensus_babe::AuthorityId as BabeId;
 
@@ -42,48 +30,27 @@ use rococo_runtime as rococo;
 #[cfg(feature = "rococo-native")]
 use rococo_runtime_constants::currency::UNITS as ROC;
 use sc_chain_spec::ChainSpecExtension;
-#[cfg(any(
-	feature = "polkadot-native",
-	feature = "kusama-native",
-	feature = "westend-native",
-	feature = "rococo-native"
-))]
+#[cfg(any(feature = "westend-native", feature = "rococo-native"))]
 use sc_chain_spec::ChainType;
 use serde::{Deserialize, Serialize};
 use sp_core::{sr25519, Pair, Public};
 use sp_runtime::traits::IdentifyAccount;
-#[cfg(any(
-	feature = "polkadot-native",
-	feature = "kusama-native",
-	feature = "westend-native",
-))]
+#[cfg(feature = "westend-native")]
 use sp_runtime::Perbill;
-#[cfg(any(
-	feature = "polkadot-native",
-	feature = "kusama-native",
-	feature = "westend-native",
-	feature = "rococo-native"
-))]
+#[cfg(any(feature = "westend-native", feature = "rococo-native"))]
 use telemetry::TelemetryEndpoints;
 #[cfg(feature = "westend-native")]
 use westend_runtime as westend;
 #[cfg(feature = "westend-native")]
 use westend_runtime_constants::currency::UNITS as WND;
 
-#[cfg(feature = "kusama-native")]
-const KUSAMA_STAGING_TELEMETRY_URL: &str = "wss://telemetry.polkadot.io/submit/";
 #[cfg(feature = "westend-native")]
 const WESTEND_STAGING_TELEMETRY_URL: &str = "wss://telemetry.polkadot.io/submit/";
 #[cfg(feature = "rococo-native")]
 const ROCOCO_STAGING_TELEMETRY_URL: &str = "wss://telemetry.polkadot.io/submit/";
 #[cfg(feature = "rococo-native")]
 const VERSI_STAGING_TELEMETRY_URL: &str = "wss://telemetry.polkadot.io/submit/";
-#[cfg(any(
-	feature = "polkadot-native",
-	feature = "kusama-native",
-	feature = "westend-native",
-	feature = "rococo-native"
-))]
+#[cfg(any(feature = "westend-native", feature = "rococo-native"))]
 const DEFAULT_PROTOCOL_ID: &str = "dot";
 
 /// Node `ChainSpec` extensions.
@@ -103,25 +70,8 @@ pub struct Extensions {
 	pub light_sync_state: sc_sync_state_rpc::LightSyncStateExtension,
 }
 
-/// The `ChainSpec` parameterized for the polkadot runtime.
-#[cfg(feature = "polkadot-native")]
-pub type PolkadotChainSpec = service::GenericChainSpec<polkadot::RuntimeGenesisConfig, Extensions>;
-
-// Dummy chain spec, in case when we don't have the native runtime.
-pub type DummyChainSpec = service::GenericChainSpec<(), Extensions>;
-
-// Dummy chain spec, but that is fine when we don't have the native runtime.
-#[cfg(not(feature = "polkadot-native"))]
-pub type PolkadotChainSpec = DummyChainSpec;
-
-/// The `ChainSpec` parameterized for the kusama runtime.
-#[cfg(feature = "kusama-native")]
-pub type KusamaChainSpec = service::GenericChainSpec<kusama::RuntimeGenesisConfig, Extensions>;
-
-/// The `ChainSpec` parameterized for the kusama runtime.
-// Dummy chain spec, but that is fine when we don't have the native runtime.
-#[cfg(not(feature = "kusama-native"))]
-pub type KusamaChainSpec = DummyChainSpec;
+// Generic chain spec, in case when we don't have the native runtime.
+pub type GenericChainSpec = service::GenericChainSpec<(), Extensions>;
 
 /// The `ChainSpec` parameterized for the westend runtime.
 #[cfg(feature = "westend-native")]
@@ -130,11 +80,11 @@ pub type WestendChainSpec = service::GenericChainSpec<westend::RuntimeGenesisCon
 /// The `ChainSpec` parameterized for the westend runtime.
 // Dummy chain spec, but that is fine when we don't have the native runtime.
 #[cfg(not(feature = "westend-native"))]
-pub type WestendChainSpec = DummyChainSpec;
+pub type WestendChainSpec = GenericChainSpec;
 
 /// The `ChainSpec` parameterized for the rococo runtime.
 #[cfg(feature = "rococo-native")]
-pub type RococoChainSpec = service::GenericChainSpec<RococoGenesisExt, Extensions>;
+pub type RococoChainSpec = service::GenericChainSpec<rococo::RuntimeGenesisConfig, Extensions>;
 
 /// The `ChainSpec` parameterized for the `versi` runtime.
 ///
@@ -144,38 +94,14 @@ pub type VersiChainSpec = RococoChainSpec;
 /// The `ChainSpec` parameterized for the rococo runtime.
 // Dummy chain spec, but that is fine when we don't have the native runtime.
 #[cfg(not(feature = "rococo-native"))]
-pub type RococoChainSpec = DummyChainSpec;
+pub type RococoChainSpec = GenericChainSpec;
 
-/// Extension for the Rococo genesis config to support a custom changes to the genesis state.
-#[derive(serde::Serialize, serde::Deserialize)]
-#[cfg(feature = "rococo-native")]
-pub struct RococoGenesisExt {
-	/// The runtime genesis config.
-	runtime_genesis_config: rococo::RuntimeGenesisConfig,
-	/// The session length in blocks.
-	///
-	/// If `None` is supplied, the default value is used.
-	session_length_in_blocks: Option<u32>,
+pub fn polkadot_config() -> Result<GenericChainSpec, String> {
+	GenericChainSpec::from_json_bytes(&include_bytes!("../chain-specs/polkadot.json")[..])
 }
 
-#[cfg(feature = "rococo-native")]
-impl sp_runtime::BuildStorage for RococoGenesisExt {
-	fn assimilate_storage(&self, storage: &mut sp_core::storage::Storage) -> Result<(), String> {
-		sp_state_machine::BasicExternalities::execute_with_storage(storage, || {
-			if let Some(length) = self.session_length_in_blocks.as_ref() {
-				rococo_runtime_constants::time::EpochDurationInBlocks::set(length);
-			}
-		});
-		self.runtime_genesis_config.assimilate_storage(storage)
-	}
-}
-
-pub fn polkadot_config() -> Result<PolkadotChainSpec, String> {
-	PolkadotChainSpec::from_json_bytes(&include_bytes!("../chain-specs/polkadot.json")[..])
-}
-
-pub fn kusama_config() -> Result<KusamaChainSpec, String> {
-	KusamaChainSpec::from_json_bytes(&include_bytes!("../chain-specs/kusama.json")[..])
+pub fn kusama_config() -> Result<GenericChainSpec, String> {
+	GenericChainSpec::from_json_bytes(&include_bytes!("../chain-specs/kusama.json")[..])
 }
 
 pub fn westend_config() -> Result<WestendChainSpec, String> {
@@ -192,12 +118,7 @@ pub fn wococo_config() -> Result<RococoChainSpec, String> {
 }
 
 /// The default parachains host configuration.
-#[cfg(any(
-	feature = "rococo-native",
-	feature = "kusama-native",
-	feature = "westend-native",
-	feature = "polkadot-native"
-))]
+#[cfg(any(feature = "rococo-native", feature = "westend-native",))]
 fn default_parachains_host_configuration(
 ) -> polkadot_runtime_parachains::configuration::HostConfiguration<polkadot_primitives::BlockNumber>
 {
@@ -236,57 +157,12 @@ fn default_parachains_host_configuration(
 	}
 }
 
-#[cfg(any(
-	feature = "rococo-native",
-	feature = "kusama-native",
-	feature = "westend-native",
-	feature = "polkadot-native"
-))]
+#[cfg(any(feature = "rococo-native", feature = "westend-native",))]
 #[test]
 fn default_parachains_host_configuration_is_consistent() {
 	default_parachains_host_configuration().panic_if_not_consistent();
 }
 
-#[cfg(feature = "polkadot-native")]
-fn polkadot_session_keys(
-	babe: BabeId,
-	grandpa: GrandpaId,
-	im_online: ImOnlineId,
-	para_validator: ValidatorId,
-	para_assignment: AssignmentId,
-	authority_discovery: AuthorityDiscoveryId,
-) -> polkadot::SessionKeys {
-	polkadot::SessionKeys {
-		babe,
-		grandpa,
-		im_online,
-		para_validator,
-		para_assignment,
-		authority_discovery,
-	}
-}
-
-#[cfg(feature = "kusama-native")]
-fn kusama_session_keys(
-	babe: BabeId,
-	grandpa: GrandpaId,
-	im_online: ImOnlineId,
-	para_validator: ValidatorId,
-	para_assignment: AssignmentId,
-	authority_discovery: AuthorityDiscoveryId,
-	beefy: BeefyId,
-) -> kusama::SessionKeys {
-	kusama::SessionKeys {
-		babe,
-		grandpa,
-		im_online,
-		para_validator,
-		para_assignment,
-		authority_discovery,
-		beefy,
-	}
-}
-
 #[cfg(feature = "westend-native")]
 fn westend_session_keys(
 	babe: BabeId,
@@ -525,6 +401,7 @@ fn westend_staging_testnet_config_genesis(wasm_binary: &[u8]) -> westend::Runtim
 		vesting: westend::VestingConfig { vesting: vec![] },
 		sudo: westend::SudoConfig { key: Some(endowed_accounts[0].clone()) },
 		hrmp: Default::default(),
+		treasury: Default::default(),
 		configuration: westend::ConfigurationConfig {
 			config: default_parachains_host_configuration(),
 		},
@@ -539,214 +416,6 @@ fn westend_staging_testnet_config_genesis(wasm_binary: &[u8]) -> westend::Runtim
 	}
 }
 
-#[cfg(feature = "kusama-native")]
-fn kusama_staging_testnet_config_genesis(wasm_binary: &[u8]) -> kusama::RuntimeGenesisConfig {
-	use hex_literal::hex;
-	use sp_core::crypto::UncheckedInto;
-
-	// Following keys are used in genesis config for development chains.
-	// DO NOT use them in production chains as the secret seed is public.
-	//
-	// SECRET_SEED="explain impose opinion genius bar parrot erupt panther surround best expire
-	// album" subkey inspect -n kusama "$SECRET_SEED"
-	let endowed_accounts = vec![
-		// FLN5cfhF7VCGJYefjPQJR2V6WwbfRmb9ozTwLAzBNeQQG6y
-		hex!["7a0fe424217ed176da7abf12e08198db0d0949298e1372c80a1930cb6dc21d3e"].into(),
-	];
-
-	// SECRET=$SECRET_SEED ./scripts/prepare-test-net.sh 4
-	let initial_authorities: Vec<(
-		AccountId,
-		AccountId,
-		BabeId,
-		GrandpaId,
-		ImOnlineId,
-		ValidatorId,
-		AssignmentId,
-		AuthorityDiscoveryId,
-		BeefyId,
-	)> = vec![
-		(
-			//5D5EsvSJf3KR3WHeZNG8rETdW6homig1cGHezspFt1P4o7sL
-			hex!["2ca4a9582244a3356a0d96e59d71f7e4d12aa88bca6d46f360ef11f6487cab1f"].into(),
-			//5Ev6RixvmK62UQE2PW19MPdLsYT4Nomwj85HKPdbnRECbDYh
-			hex!["7e237806f642b7f45f70ec45fbc41034516c8e5561bae2a62cd287129e1d0712"].into(),
-			//5GbjzK1uYVo6v1SaYhTeK3dbYy2GN9X4K5iwRkHEQ9eLS3We
-			hex!["c89cb7afc47ec0b5aac5824e5338a62959c92978167d3f841491836746e70b3d"]
-				.unchecked_into(),
-			//5GFz3YFW8QzEUsWhRjJzvDP7e5X5tPf5U12vUw32R8oJVgqb
-			hex!["b98b200021a608148f9817aeb553596b6968a5aa61b6d320c522f520ecc9cf9c"]
-				.unchecked_into(),
-			//5GzaFD8YsqnP5FYe5ijA9M4LQvzU9TPJmnBGdpuoqEvR1gQC
-			hex!["da0690438c0dd7a9aa26e03c9f1deaa58ba2b88d0bec0954b06478632164a401"]
-				.unchecked_into(),
-			//5CkZPtNy61PtbJpLqnjNFmbi1qukGkFdqFr5GKduSEthJ1cd
-			hex!["1e6554d35f6f17a37176c71801426204d6df400a1869114e4f00564b35d31150"]
-				.unchecked_into(),
-			//5CodnwweaYA1zB4QhdP4YVYFWnuZHY6W7zkN1NCRqJ9wZhap
-			hex!["20bddf09b1d0a2d93bafeb87fe19eb5bd59950c174f23a141a6d99736a5e700d"]
-				.unchecked_into(),
-			//5E7TSvNAP6QeJNeckdvYvADpHsx7v6aHXtGoQv5R2N1V3hEB
-			hex!["5a91b2546f1aac1c388eb0739c83e42d9972884d74360200ce32b7595bc65a04"]
-				.unchecked_into(),
-			//5GsoKeoM2HmjXPsdCua4oPu3Ms1Jgu4HbSnB81Lisa2tBFZp
-			hex!["02fd1e7e8455ab888ad054bbec7bc19409e6b1a5bb0300feefc6b58e60efae7e85"]
-				.unchecked_into(),
-		),
-		(
-			//5HMtKQuL2GQ7YvLBTh3vqFJEpkZW19sQh2X2mcUzAwBAe885
-			hex!["ea478deab0ebfbeab7342febc236a9f1af5129ca0083fa25e6b0cf6a998d8354"].into(),
-			//5EFD5pLC3w5NFEcmQ6rGw9dUZ6fTSjWJemsvJZuaj7Qmq2WT
-			hex!["607b4e88129804eca8cd6fa26cbe2dd36667130e2a061050b08d9015871f4263"].into(),
-			//5DFztsnvC9hN85j5AP116atcnzFhAxnbzPodEp1AsYq1LYXu
-			hex!["34d949c39fae5801ba328ac6d0ddc76e469b7d5a4372a4a0d94f6aad6f9c1600"]
-				.unchecked_into(),
-			//5EZJNJ4j1eEEwCWusg7nYsZxTYBwoTH2drszxRqgMBTgNxMW
-			hex!["6e47830dcfc1f2b53a1b5db3f76702fc2760c1cc119119aceb00a57ec6658465"]
-				.unchecked_into(),
-			//5Dts3SrgDQMY9XCzKeQrxYSTh5MphPek994qkDCDk5c4neeF
-			hex!["50f6ef6326cd61ac500f167493e435f1204ce1d66ad18024bc5810d09673785e"]
-				.unchecked_into(),
-			//5DMKT99825TvA8F1yCQvE1ZcKTqg8T8Ad1KEjN6EuVpz4E6w
-			hex!["38e7fb2f6a1dcec73d93b07a0dc7cff1f9a9cc32cde8eb1e6ea1782f5316b431"]
-				.unchecked_into(),
-			//5EestuSehdMsWsBZ1hXCVo5YQiYiTPJwtV281x5fjUVtaqtP
-			hex!["72889a7b6ada28c3bd05a5a7298437f01d6d3270559768d16275efaf11864c0a"]
-				.unchecked_into(),
-			//5FNd5EabUbcReXEPwY9aASJMwSqyiic9w1Qt23YxNXj3dzbi
-			hex!["925f03f6211c68377987b0f78cd02aa882ad1fa9cc00c01fe6ce68e14c23340d"]
-				.unchecked_into(),
-			//5DxhuqfovpooTn8yH7WJGFjYw3pQxSEN9y9kvYUiGguHAj9D
-			hex!["030e77039e470ccdec7fe23dbc41c66f1c187ec8345e8919d3dc1250d975c3ce82"]
-				.unchecked_into(),
-		),
-		(
-			//5DAiYTKQ5KxwLncfNoTAH58dXBk2oDcQxtAXyDwMdKGLpGeY
-			hex!["30d203d942c1d056245b51e466a50b684f172a37c1cdde678f5346a0b3dbcd52"].into(),
-			//5Dq778qqNiAsjdF4qLVdkSBR8SftJKU35nyeBnkztRgniVhV
-			hex!["4e194bbafeec45647b2679e6b615b2a879d2e74fe706921930509ab3c9dbb22d"].into(),
-			//5E6iENoE1tXJUd7PkopQ8uqejg6xhPpqAnsVjS3hAQHWK1tm
-			hex!["5a0037b6bfc5e879ba5ef480ac29c59a12873854159686899082f41950ffd472"]
-				.unchecked_into(),
-			//5F8Dtgoc5dCaLAGYtaDqQUDg91fPQUynd497Fvhor8SYMdXp
-			hex!["87638aef8ab75db093150a6677c0919292ff66fc17f9f006a71fd0618415e164"]
-				.unchecked_into(),
-			//5EKsYx6Wj1Qg7LLc12U2YRjRUFmHa4Q3rNSoGZaP1ofS54km
-			hex!["6409c85a1125fa456b9dc6e85408a6d931aa8e04f48511c87fc147d1c103e902"]
-				.unchecked_into(),
-			//5H3UQy1NhCUUq3getmSEG8R1capY7Uy8JtKJz68UABmD9UxS
-			hex!["dc3cab0f94fa974cba826984f23dd4dc77ade20f25d935af5f07b85518da8044"]
-				.unchecked_into(),
-			//5DstCjokShCt9NppNnAcjg2nS4M5PKY3etn2BoFkZzMhQJ3w
-			hex!["50379866eb62e5c8aac31133efc4a1723e964a8e30c93c3ce2e7758bd03eb776"]
-				.unchecked_into(),
-			//5E4SCbSqUWKC4NVRCkMkJEnXCaVRiNQbSHL4upRB1ffd1Mk1
-			hex!["5843c339c39d2c308bfb1841cd10beecfa157580492db05b66db8553e8d6512c"]
-				.unchecked_into(),
-			//5HNoMQ1PL3m7eBhp24FZxZUBtz4eh3AiwWq8i8jXLCRpJHsu
-			hex!["03c81d4e72cbdb96a7e6aad76830ae783b0b4650dc19703dde96866d8894dc921f"]
-				.unchecked_into(),
-		),
-		(
-			//5FNnjg8hXcPVLKASA69bPbooatacxcWNqkQAyXZfFiXi7T8r
-			hex!["927f8b12a0fa7185077353d9f6b4fe6bc6cd9682bd498642fa3801280909711a"].into(),
-			//5GipjBdL3rbex9qyxMinZpJYQbobbwk1ctbZp6B2mh3H25c6
-			hex!["ce03638cd1e8496793b0540ba23370034511ea5d08837deb17f6c4d905b8d017"].into(),
-			//5GByn4uRpwmPe4i4MA4PjTQ8HXuycdue8HMWDhZ7vbU4WR9R
-			hex!["b67d3ed42ab1fcf3fcd7dee99bd6963bc22058ee22bcfddddb776492e85bd76e"]
-				.unchecked_into(),
-			//5GnZZ1rs7RE1jwPiyw1kts4JqaxnML5SdsWMuHV9TqCcuPWj
-			hex!["d0dd492b1a33d2f06a9aa7213e1aaa41d8820a6b56e95cd2462129b446574014"]
-				.unchecked_into(),
-			//5GKEKSAa3gbitHhvu5gm4f7q942azCVGDNhrw3hnsGPEMzyg
-			hex!["bc04e9764e23330b9f4e6922aa6437f87f3dd17b8590825e824724ae89d4ac51"]
-				.unchecked_into(),
-			//5H6QLnsfU7sAQ5ZACs9bPivsn9CXrqqwxhq4KKyoquZb5mVW
-			hex!["de78b26966c08357d66f7f56e7dcac7e4beb16aa0b74939290a42b3f5949bc36"]
-				.unchecked_into(),
-			//5FUUeYiAvFfXfB5yZLNkis2ZDy9T3CBLBPC6SwXFriGEjH5f
-			hex!["96d61fe92a50a79944ea93e3afc0a95a328773878e774cf8c8fbe8eba81cd95c"]
-				.unchecked_into(),
-			//5DLkWtgJahWG99cMcQxtftW9W14oduySyQi6hdhav7w3BiKq
-			hex!["38791c68ee472b94105c66cf150387979c49175062a687d1a1509119cfdc9e0c"]
-				.unchecked_into(),
-			//5Cjm1c3Jwt5jp6AaN2XfnncgZcswAmyfJn1buHEUaPauXAKK
-			hex!["025185a88886008267d27797fc74e34241e3aa8da767fafc9dd3ae5a59546802bb"]
-				.unchecked_into(),
-		),
-	];
-
-	const ENDOWMENT: u128 = 1_000_000 * KSM;
-	const STASH: u128 = 100 * KSM;
-
-	kusama::RuntimeGenesisConfig {
-		system: kusama::SystemConfig { code: wasm_binary.to_vec(), ..Default::default() },
-		balances: kusama::BalancesConfig {
-			balances: endowed_accounts
-				.iter()
-				.map(|k: &AccountId| (k.clone(), ENDOWMENT))
-				.chain(initial_authorities.iter().map(|x| (x.0.clone(), STASH)))
-				.collect(),
-		},
-		beefy: Default::default(),
-		indices: kusama::IndicesConfig { indices: vec![] },
-		session: kusama::SessionConfig {
-			keys: initial_authorities
-				.iter()
-				.map(|x| {
-					(
-						x.0.clone(),
-						x.0.clone(),
-						kusama_session_keys(
-							x.2.clone(),
-							x.3.clone(),
-							x.4.clone(),
-							x.5.clone(),
-							x.6.clone(),
-							x.7.clone(),
-							x.8.clone(),
-						),
-					)
-				})
-				.collect::<Vec<_>>(),
-		},
-		staking: kusama::StakingConfig {
-			validator_count: 50,
-			minimum_validator_count: 4,
-			stakers: initial_authorities
-				.iter()
-				.map(|x| (x.0.clone(), x.0.clone(), STASH, kusama::StakerStatus::Validator))
-				.collect(),
-			invulnerables: initial_authorities.iter().map(|x| x.0.clone()).collect(),
-			force_era: Forcing::ForceNone,
-			slash_reward_fraction: Perbill::from_percent(10),
-			..Default::default()
-		},
-		babe: kusama::BabeConfig {
-			authorities: Default::default(),
-			epoch_config: Some(kusama::BABE_GENESIS_EPOCH_CONFIG),
-			..Default::default()
-		},
-		grandpa: Default::default(),
-		im_online: Default::default(),
-		authority_discovery: kusama::AuthorityDiscoveryConfig {
-			keys: vec![],
-			..Default::default()
-		},
-		claims: kusama::ClaimsConfig { claims: vec![], vesting: vec![] },
-		vesting: kusama::VestingConfig { vesting: vec![] },
-		treasury: Default::default(),
-		hrmp: Default::default(),
-		configuration: kusama::ConfigurationConfig {
-			config: default_parachains_host_configuration(),
-		},
-		paras: Default::default(),
-		xcm_pallet: Default::default(),
-		nomination_pools: Default::default(),
-		nis_counterpart_balances: Default::default(),
-	}
-}
-
 #[cfg(feature = "rococo-native")]
 fn rococo_staging_testnet_config_genesis(
 	wasm_binary: &[u8],
@@ -1024,7 +693,6 @@ fn rococo_staging_testnet_config_genesis(
 				})
 				.collect::<Vec<_>>(),
 		},
-		phragmen_election: Default::default(),
 		babe: rococo_runtime::BabeConfig {
 			authorities: Default::default(),
 			epoch_config: Some(rococo_runtime::BABE_GENESIS_EPOCH_CONFIG),
@@ -1032,13 +700,6 @@ fn rococo_staging_testnet_config_genesis(
 		},
 		grandpa: Default::default(),
 		im_online: Default::default(),
-		democracy: rococo_runtime::DemocracyConfig::default(),
-		council: rococo::CouncilConfig { members: vec![], phantom: Default::default() },
-		technical_committee: rococo::TechnicalCommitteeConfig {
-			members: vec![],
-			phantom: Default::default(),
-		},
-		technical_membership: Default::default(),
 		treasury: Default::default(),
 		authority_discovery: rococo_runtime::AuthorityDiscoveryConfig {
 			keys: vec![],
@@ -1062,39 +723,6 @@ fn rococo_staging_testnet_config_genesis(
 	}
 }
 
-/// Returns the properties for the [`PolkadotChainSpec`].
-pub fn polkadot_chain_spec_properties() -> serde_json::map::Map<String, serde_json::Value> {
-	serde_json::json!({
-		"tokenDecimals": 10,
-	})
-	.as_object()
-	.expect("Map given; qed")
-	.clone()
-}
-
-/// Staging testnet config.
-#[cfg(feature = "kusama-native")]
-pub fn kusama_staging_testnet_config() -> Result<KusamaChainSpec, String> {
-	let wasm_binary = kusama::WASM_BINARY.ok_or("Kusama development wasm not available")?;
-	let boot_nodes = vec![];
-
-	Ok(KusamaChainSpec::from_genesis(
-		"Kusama Staging Testnet",
-		"kusama_staging_testnet",
-		ChainType::Live,
-		move || kusama_staging_testnet_config_genesis(wasm_binary),
-		boot_nodes,
-		Some(
-			TelemetryEndpoints::new(vec![(KUSAMA_STAGING_TELEMETRY_URL.to_string(), 0)])
-				.expect("Kusama Staging telemetry url is valid; qed"),
-		),
-		Some(DEFAULT_PROTOCOL_ID),
-		None,
-		None,
-		Default::default(),
-	))
-}
-
 /// Westend staging testnet config.
 #[cfg(feature = "westend-native")]
 pub fn westend_staging_testnet_config() -> Result<WestendChainSpec, String> {
@@ -1128,10 +756,7 @@ pub fn rococo_staging_testnet_config() -> Result<RococoChainSpec, String> {
 		"Rococo Staging Testnet",
 		"rococo_staging_testnet",
 		ChainType::Live,
-		move || RococoGenesisExt {
-			runtime_genesis_config: rococo_staging_testnet_config_genesis(wasm_binary),
-			session_length_in_blocks: None,
-		},
+		move || rococo_staging_testnet_config_genesis(wasm_binary),
 		boot_nodes,
 		Some(
 			TelemetryEndpoints::new(vec![(ROCOCO_STAGING_TELEMETRY_URL.to_string(), 0)])
@@ -1165,10 +790,7 @@ pub fn versi_staging_testnet_config() -> Result<RococoChainSpec, String> {
 		"Versi Staging Testnet",
 		"versi_staging_testnet",
 		ChainType::Live,
-		move || RococoGenesisExt {
-			runtime_genesis_config: rococo_staging_testnet_config_genesis(wasm_binary),
-			session_length_in_blocks: Some(100),
-		},
+		move || rococo_staging_testnet_config_genesis(wasm_binary),
 		boot_nodes,
 		Some(
 			TelemetryEndpoints::new(vec![(VERSI_STAGING_TELEMETRY_URL.to_string(), 0)])
@@ -1239,12 +861,7 @@ pub fn get_authority_keys_from_seed_no_beefy(
 	)
 }
 
-#[cfg(any(
-	feature = "polkadot-native",
-	feature = "kusama-native",
-	feature = "westend-native",
-	feature = "rococo-native"
-))]
+#[cfg(any(feature = "westend-native", feature = "rococo-native"))]
 fn testnet_accounts() -> Vec<AccountId> {
 	vec![
 		get_account_id_from_seed::<sr25519::Public>("Alice"),
@@ -1262,176 +879,6 @@ fn testnet_accounts() -> Vec<AccountId> {
 	]
 }
 
-/// Helper function to create polkadot `RuntimeGenesisConfig` for testing
-#[cfg(feature = "polkadot-native")]
-pub fn polkadot_testnet_genesis(
-	wasm_binary: &[u8],
-	initial_authorities: Vec<(
-		AccountId,
-		AccountId,
-		BabeId,
-		GrandpaId,
-		ImOnlineId,
-		ValidatorId,
-		AssignmentId,
-		AuthorityDiscoveryId,
-	)>,
-	_root_key: AccountId,
-	endowed_accounts: Option<Vec<AccountId>>,
-) -> polkadot::RuntimeGenesisConfig {
-	let endowed_accounts: Vec<AccountId> = endowed_accounts.unwrap_or_else(testnet_accounts);
-
-	const ENDOWMENT: u128 = 1_000_000 * DOT;
-	const STASH: u128 = 100 * DOT;
-
-	polkadot::RuntimeGenesisConfig {
-		system: polkadot::SystemConfig { code: wasm_binary.to_vec(), ..Default::default() },
-		indices: polkadot::IndicesConfig { indices: vec![] },
-		balances: polkadot::BalancesConfig {
-			balances: endowed_accounts.iter().map(|k| (k.clone(), ENDOWMENT)).collect(),
-		},
-		session: polkadot::SessionConfig {
-			keys: initial_authorities
-				.iter()
-				.map(|x| {
-					(
-						x.0.clone(),
-						x.0.clone(),
-						polkadot_session_keys(
-							x.2.clone(),
-							x.3.clone(),
-							x.4.clone(),
-							x.5.clone(),
-							x.6.clone(),
-							x.7.clone(),
-						),
-					)
-				})
-				.collect::<Vec<_>>(),
-		},
-		staking: polkadot::StakingConfig {
-			minimum_validator_count: 1,
-			validator_count: initial_authorities.len() as u32,
-			stakers: initial_authorities
-				.iter()
-				.map(|x| (x.0.clone(), x.0.clone(), STASH, polkadot::StakerStatus::Validator))
-				.collect(),
-			invulnerables: initial_authorities.iter().map(|x| x.0.clone()).collect(),
-			force_era: Forcing::NotForcing,
-			slash_reward_fraction: Perbill::from_percent(10),
-			..Default::default()
-		},
-		babe: polkadot::BabeConfig {
-			authorities: Default::default(),
-			epoch_config: Some(polkadot::BABE_GENESIS_EPOCH_CONFIG),
-			..Default::default()
-		},
-		grandpa: Default::default(),
-		im_online: Default::default(),
-		authority_discovery: polkadot::AuthorityDiscoveryConfig {
-			keys: vec![],
-			..Default::default()
-		},
-		claims: polkadot::ClaimsConfig { claims: vec![], vesting: vec![] },
-		vesting: polkadot::VestingConfig { vesting: vec![] },
-		treasury: Default::default(),
-		hrmp: Default::default(),
-		configuration: polkadot::ConfigurationConfig {
-			config: default_parachains_host_configuration(),
-		},
-		paras: Default::default(),
-		xcm_pallet: Default::default(),
-		nomination_pools: Default::default(),
-	}
-}
-
-/// Helper function to create kusama `RuntimeGenesisConfig` for testing
-#[cfg(feature = "kusama-native")]
-pub fn kusama_testnet_genesis(
-	wasm_binary: &[u8],
-	initial_authorities: Vec<(
-		AccountId,
-		AccountId,
-		BabeId,
-		GrandpaId,
-		ImOnlineId,
-		ValidatorId,
-		AssignmentId,
-		AuthorityDiscoveryId,
-		BeefyId,
-	)>,
-	_root_key: AccountId,
-	endowed_accounts: Option<Vec<AccountId>>,
-) -> kusama::RuntimeGenesisConfig {
-	let endowed_accounts: Vec<AccountId> = endowed_accounts.unwrap_or_else(testnet_accounts);
-
-	const ENDOWMENT: u128 = 1_000_000 * KSM;
-	const STASH: u128 = 100 * KSM;
-
-	kusama::RuntimeGenesisConfig {
-		system: kusama::SystemConfig { code: wasm_binary.to_vec(), ..Default::default() },
-		indices: kusama::IndicesConfig { indices: vec![] },
-		balances: kusama::BalancesConfig {
-			balances: endowed_accounts.iter().map(|k| (k.clone(), ENDOWMENT)).collect(),
-		},
-		beefy: Default::default(),
-		session: kusama::SessionConfig {
-			keys: initial_authorities
-				.iter()
-				.map(|x| {
-					(
-						x.0.clone(),
-						x.0.clone(),
-						kusama_session_keys(
-							x.2.clone(),
-							x.3.clone(),
-							x.4.clone(),
-							x.5.clone(),
-							x.6.clone(),
-							x.7.clone(),
-							x.8.clone(),
-						),
-					)
-				})
-				.collect::<Vec<_>>(),
-		},
-		staking: kusama::StakingConfig {
-			minimum_validator_count: 1,
-			validator_count: initial_authorities.len() as u32,
-			stakers: initial_authorities
-				.iter()
-				.map(|x| (x.0.clone(), x.0.clone(), STASH, kusama::StakerStatus::Validator))
-				.collect(),
-			invulnerables: initial_authorities.iter().map(|x| x.0.clone()).collect(),
-			force_era: Forcing::NotForcing,
-			slash_reward_fraction: Perbill::from_percent(10),
-			..Default::default()
-		},
-		babe: kusama::BabeConfig {
-			authorities: Default::default(),
-			epoch_config: Some(kusama::BABE_GENESIS_EPOCH_CONFIG),
-			..Default::default()
-		},
-		grandpa: Default::default(),
-		im_online: Default::default(),
-		authority_discovery: kusama::AuthorityDiscoveryConfig {
-			keys: vec![],
-			..Default::default()
-		},
-		claims: kusama::ClaimsConfig { claims: vec![], vesting: vec![] },
-		vesting: kusama::VestingConfig { vesting: vec![] },
-		treasury: Default::default(),
-		hrmp: Default::default(),
-		configuration: kusama::ConfigurationConfig {
-			config: default_parachains_host_configuration(),
-		},
-		paras: Default::default(),
-		xcm_pallet: Default::default(),
-		nomination_pools: Default::default(),
-		nis_counterpart_balances: Default::default(),
-	}
-}
-
 /// Helper function to create westend `RuntimeGenesisConfig` for testing
 #[cfg(feature = "westend-native")]
 pub fn westend_testnet_genesis(
@@ -1508,6 +955,7 @@ pub fn westend_testnet_genesis(
 		vesting: westend::VestingConfig { vesting: vec![] },
 		sudo: westend::SudoConfig { key: Some(root_key) },
 		hrmp: Default::default(),
+		treasury: Default::default(),
 		configuration: westend::ConfigurationConfig {
 			config: default_parachains_host_configuration(),
 		},
@@ -1578,14 +1026,6 @@ pub fn rococo_testnet_genesis(
 		},
 		grandpa: Default::default(),
 		im_online: Default::default(),
-		phragmen_election: Default::default(),
-		democracy: rococo::DemocracyConfig::default(),
-		council: rococo::CouncilConfig { members: vec![], phantom: Default::default() },
-		technical_committee: rococo::TechnicalCommitteeConfig {
-			members: vec![],
-			phantom: Default::default(),
-		},
-		technical_membership: Default::default(),
 		treasury: Default::default(),
 		claims: rococo::ClaimsConfig { claims: vec![], vesting: vec![] },
 		vesting: rococo::VestingConfig { vesting: vec![] },
@@ -1612,26 +1052,6 @@ pub fn rococo_testnet_genesis(
 	}
 }
 
-#[cfg(feature = "polkadot-native")]
-fn polkadot_development_config_genesis(wasm_binary: &[u8]) -> polkadot::RuntimeGenesisConfig {
-	polkadot_testnet_genesis(
-		wasm_binary,
-		vec![get_authority_keys_from_seed_no_beefy("Alice")],
-		get_account_id_from_seed::<sr25519::Public>("Alice"),
-		None,
-	)
-}
-
-#[cfg(feature = "kusama-native")]
-fn kusama_development_config_genesis(wasm_binary: &[u8]) -> kusama::RuntimeGenesisConfig {
-	kusama_testnet_genesis(
-		wasm_binary,
-		vec![get_authority_keys_from_seed("Alice")],
-		get_account_id_from_seed::<sr25519::Public>("Alice"),
-		None,
-	)
-}
-
 #[cfg(feature = "westend-native")]
 fn westend_development_config_genesis(wasm_binary: &[u8]) -> westend::RuntimeGenesisConfig {
 	westend_testnet_genesis(
@@ -1652,44 +1072,6 @@ fn rococo_development_config_genesis(wasm_binary: &[u8]) -> rococo_runtime::Runt
 	)
 }
 
-/// Polkadot development config (single validator Alice)
-#[cfg(feature = "polkadot-native")]
-pub fn polkadot_development_config() -> Result<PolkadotChainSpec, String> {
-	let wasm_binary = polkadot::WASM_BINARY.ok_or("Polkadot development wasm not available")?;
-
-	Ok(PolkadotChainSpec::from_genesis(
-		"Development",
-		"polkadot_dev",
-		ChainType::Development,
-		move || polkadot_development_config_genesis(wasm_binary),
-		vec![],
-		None,
-		Some(DEFAULT_PROTOCOL_ID),
-		None,
-		Some(polkadot_chain_spec_properties()),
-		Default::default(),
-	))
-}
-
-/// Kusama development config (single validator Alice)
-#[cfg(feature = "kusama-native")]
-pub fn kusama_development_config() -> Result<KusamaChainSpec, String> {
-	let wasm_binary = kusama::WASM_BINARY.ok_or("Kusama development wasm not available")?;
-
-	Ok(KusamaChainSpec::from_genesis(
-		"Development",
-		"kusama_dev",
-		ChainType::Development,
-		move || kusama_development_config_genesis(wasm_binary),
-		vec![],
-		None,
-		Some(DEFAULT_PROTOCOL_ID),
-		None,
-		None,
-		Default::default(),
-	))
-}
-
 /// Westend development config (single validator Alice)
 #[cfg(feature = "westend-native")]
 pub fn westend_development_config() -> Result<WestendChainSpec, String> {
@@ -1718,11 +1100,7 @@ pub fn rococo_development_config() -> Result<RococoChainSpec, String> {
 		"Development",
 		"rococo_dev",
 		ChainType::Development,
-		move || RococoGenesisExt {
-			runtime_genesis_config: rococo_development_config_genesis(wasm_binary),
-			// Use 1 minute session length.
-			session_length_in_blocks: Some(10),
-		},
+		move || rococo_development_config_genesis(wasm_binary),
 		vec![],
 		None,
 		Some(DEFAULT_PROTOCOL_ID),
@@ -1741,11 +1119,7 @@ pub fn versi_development_config() -> Result<RococoChainSpec, String> {
 		"Development",
 		"versi_dev",
 		ChainType::Development,
-		move || RococoGenesisExt {
-			runtime_genesis_config: rococo_development_config_genesis(wasm_binary),
-			// Use 1 minute session length.
-			session_length_in_blocks: Some(10),
-		},
+		move || rococo_development_config_genesis(wasm_binary),
 		vec![],
 		None,
 		Some("versi"),
@@ -1765,11 +1139,7 @@ pub fn wococo_development_config() -> Result<RococoChainSpec, String> {
 		"Development",
 		"wococo_dev",
 		ChainType::Development,
-		move || RococoGenesisExt {
-			runtime_genesis_config: rococo_development_config_genesis(wasm_binary),
-			// Use 1 minute session length.
-			session_length_in_blocks: Some(10),
-		},
+		move || rococo_development_config_genesis(wasm_binary),
 		vec![],
 		None,
 		Some(WOCOCO_DEV_PROTOCOL_ID),
@@ -1779,67 +1149,6 @@ pub fn wococo_development_config() -> Result<RococoChainSpec, String> {
 	))
 }
 
-#[cfg(feature = "polkadot-native")]
-fn polkadot_local_testnet_genesis(wasm_binary: &[u8]) -> polkadot::RuntimeGenesisConfig {
-	polkadot_testnet_genesis(
-		wasm_binary,
-		vec![
-			get_authority_keys_from_seed_no_beefy("Alice"),
-			get_authority_keys_from_seed_no_beefy("Bob"),
-		],
-		get_account_id_from_seed::<sr25519::Public>("Alice"),
-		None,
-	)
-}
-
-/// Polkadot local testnet config (multivalidator Alice + Bob)
-#[cfg(feature = "polkadot-native")]
-pub fn polkadot_local_testnet_config() -> Result<PolkadotChainSpec, String> {
-	let wasm_binary = polkadot::WASM_BINARY.ok_or("Polkadot development wasm not available")?;
-
-	Ok(PolkadotChainSpec::from_genesis(
-		"Local Testnet",
-		"local_testnet",
-		ChainType::Local,
-		move || polkadot_local_testnet_genesis(wasm_binary),
-		vec![],
-		None,
-		Some(DEFAULT_PROTOCOL_ID),
-		None,
-		Some(polkadot_chain_spec_properties()),
-		Default::default(),
-	))
-}
-
-#[cfg(feature = "kusama-native")]
-fn kusama_local_testnet_genesis(wasm_binary: &[u8]) -> kusama::RuntimeGenesisConfig {
-	kusama_testnet_genesis(
-		wasm_binary,
-		vec![get_authority_keys_from_seed("Alice"), get_authority_keys_from_seed("Bob")],
-		get_account_id_from_seed::<sr25519::Public>("Alice"),
-		None,
-	)
-}
-
-/// Kusama local testnet config (multivalidator Alice + Bob)
-#[cfg(feature = "kusama-native")]
-pub fn kusama_local_testnet_config() -> Result<KusamaChainSpec, String> {
-	let wasm_binary = kusama::WASM_BINARY.ok_or("Kusama development wasm not available")?;
-
-	Ok(KusamaChainSpec::from_genesis(
-		"Kusama Local Testnet",
-		"kusama_local_testnet",
-		ChainType::Local,
-		move || kusama_local_testnet_genesis(wasm_binary),
-		vec![],
-		None,
-		Some(DEFAULT_PROTOCOL_ID),
-		None,
-		None,
-		Default::default(),
-	))
-}
-
 #[cfg(feature = "westend-native")]
 fn westend_local_testnet_genesis(wasm_binary: &[u8]) -> westend::RuntimeGenesisConfig {
 	westend_testnet_genesis(
@@ -1888,11 +1197,7 @@ pub fn rococo_local_testnet_config() -> Result<RococoChainSpec, String> {
 		"Rococo Local Testnet",
 		"rococo_local_testnet",
 		ChainType::Local,
-		move || RococoGenesisExt {
-			runtime_genesis_config: rococo_local_testnet_genesis(wasm_binary),
-			// Use 1 minute session length.
-			session_length_in_blocks: Some(10),
-		},
+		move || rococo_local_testnet_genesis(wasm_binary),
 		vec![],
 		None,
 		Some(DEFAULT_PROTOCOL_ID),
@@ -1927,11 +1232,7 @@ pub fn wococo_local_testnet_config() -> Result<RococoChainSpec, String> {
 		"Wococo Local Testnet",
 		"wococo_local_testnet",
 		ChainType::Local,
-		move || RococoGenesisExt {
-			runtime_genesis_config: wococo_local_testnet_genesis(wasm_binary),
-			// Use 1 minute session length.
-			session_length_in_blocks: Some(10),
-		},
+		move || wococo_local_testnet_genesis(wasm_binary),
 		vec![],
 		None,
 		Some(DEFAULT_PROTOCOL_ID),
@@ -1966,11 +1267,7 @@ pub fn versi_local_testnet_config() -> Result<RococoChainSpec, String> {
 		"Versi Local Testnet",
 		"versi_local_testnet",
 		ChainType::Local,
-		move || RococoGenesisExt {
-			runtime_genesis_config: versi_local_testnet_genesis(wasm_binary),
-			// Use 1 minute session length.
-			session_length_in_blocks: Some(10),
-		},
+		move || versi_local_testnet_genesis(wasm_binary),
 		vec![],
 		None,
 		Some("versi"),
diff --git a/polkadot/node/service/src/lib.rs b/polkadot/node/service/src/lib.rs
index 95c887947c98f577ecc5bf144f90ccac1af5ebbf..5991744dc3afce5cbc63af412d4c00c6417f8e93 100644
--- a/polkadot/node/service/src/lib.rs
+++ b/polkadot/node/service/src/lib.rs
@@ -84,7 +84,7 @@ use telemetry::TelemetryWorker;
 #[cfg(feature = "full-node")]
 use telemetry::{Telemetry, TelemetryWorkerHandle};
 
-pub use chain_spec::{KusamaChainSpec, PolkadotChainSpec, RococoChainSpec, WestendChainSpec};
+pub use chain_spec::{GenericChainSpec, RococoChainSpec, WestendChainSpec};
 pub use consensus_common::{Proposal, SelectChain};
 use frame_benchmarking_cli::SUBSTRATE_REFERENCE_HARDWARE;
 use mmr_gadget::MmrGadget;
@@ -104,10 +104,6 @@ pub use sp_runtime::{
 	traits::{self as runtime_traits, BlakeTwo256, Block as BlockT, Header as HeaderT, NumberFor},
 };
 
-#[cfg(feature = "kusama-native")]
-pub use {kusama_runtime, kusama_runtime_constants};
-#[cfg(feature = "polkadot-native")]
-pub use {polkadot_runtime, polkadot_runtime_constants};
 #[cfg(feature = "rococo-native")]
 pub use {rococo_runtime, rococo_runtime_constants};
 #[cfg(feature = "westend-native")]
@@ -732,7 +728,7 @@ pub fn new_full<OverseerGenerator: OverseerGen>(
 	}: NewFullParams<OverseerGenerator>,
 ) -> Result<NewFull, Error> {
 	use polkadot_node_network_protocol::request_response::IncomingRequest;
-	use sc_network_common::sync::warp::WarpSyncParams;
+	use sc_network_sync::warp::WarpSyncParams;
 
 	let is_offchain_indexing_enabled = config.offchain_worker.indexing_enabled;
 	let role = config.role.clone();
@@ -858,7 +854,7 @@ pub fn new_full<OverseerGenerator: OverseerGen>(
 	let (collation_req_v1_receiver, cfg) =
 		IncomingRequest::get_config_receiver(&req_protocol_names);
 	net_config.add_request_response_protocol(cfg);
-	let (collation_req_vstaging_receiver, cfg) =
+	let (collation_req_v2_receiver, cfg) =
 		IncomingRequest::get_config_receiver(&req_protocol_names);
 	net_config.add_request_response_protocol(cfg);
 	let (available_data_req_receiver, cfg) =
@@ -866,7 +862,7 @@ pub fn new_full<OverseerGenerator: OverseerGen>(
 	net_config.add_request_response_protocol(cfg);
 	let (statement_req_receiver, cfg) = IncomingRequest::get_config_receiver(&req_protocol_names);
 	net_config.add_request_response_protocol(cfg);
-	let (candidate_req_vstaging_receiver, cfg) =
+	let (candidate_req_v2_receiver, cfg) =
 		IncomingRequest::get_config_receiver(&req_protocol_names);
 	net_config.add_request_response_protocol(cfg);
 	let (dispute_req_receiver, cfg) = IncomingRequest::get_config_receiver(&req_protocol_names);
@@ -894,6 +890,7 @@ pub fn new_full<OverseerGenerator: OverseerGen>(
 			import_queue,
 			block_announce_validator_builder: None,
 			warp_sync_params: Some(WarpSyncParams::WithProvider(warp_sync)),
+			block_relay: None,
 		})?;
 
 	if config.offchain_worker.enabled {
@@ -1054,10 +1051,10 @@ pub fn new_full<OverseerGenerator: OverseerGen>(
 					pov_req_receiver,
 					chunk_req_receiver,
 					collation_req_v1_receiver,
-					collation_req_vstaging_receiver,
+					collation_req_v2_receiver,
 					available_data_req_receiver,
 					statement_req_receiver,
-					candidate_req_vstaging_receiver,
+					candidate_req_v2_receiver,
 					dispute_req_receiver,
 					registry: prometheus_registry.as_ref(),
 					spawner,
diff --git a/polkadot/node/service/src/overseer.rs b/polkadot/node/service/src/overseer.rs
index cb6b80eb83c8206f7eada6dbcc8d5c60457debe6..7d1add118241b123ad122b305264f95b46b8ee78 100644
--- a/polkadot/node/service/src/overseer.rs
+++ b/polkadot/node/service/src/overseer.rs
@@ -19,7 +19,6 @@ use polkadot_node_subsystem_types::DefaultSubsystemClient;
 use sc_transaction_pool_api::OffchainTransactionPoolFactory;
 use sp_core::traits::SpawnNamed;
 
-use lru::LruCache;
 use polkadot_availability_distribution::IncomingRequestReceivers;
 use polkadot_node_core_approval_voting::Config as ApprovalVotingConfig;
 use polkadot_node_core_av_store::Config as AvailabilityConfig;
@@ -29,7 +28,7 @@ use polkadot_node_core_dispute_coordinator::Config as DisputeCoordinatorConfig;
 use polkadot_node_network_protocol::{
 	peer_set::PeerSetProtocolNames,
 	request_response::{
-		v1 as request_v1, vstaging as request_vstaging, IncomingRequestReceiver, ReqProtocolNames,
+		v1 as request_v1, v2 as request_v2, IncomingRequestReceiver, ReqProtocolNames,
 	},
 };
 #[cfg(any(feature = "malus", test))]
@@ -41,6 +40,7 @@ use polkadot_overseer::{
 	metrics::Metrics as OverseerMetrics, InitializedOverseerBuilder, MetricsTrait, Overseer,
 	OverseerConnector, OverseerHandle, SpawnGlue,
 };
+use schnellru::{ByLength, LruMap};
 
 use polkadot_primitives::runtime_api::ParachainHost;
 use sc_authority_discovery::Service as AuthorityDiscoveryService;
@@ -104,17 +104,15 @@ where
 	pub chunk_req_receiver: IncomingRequestReceiver<request_v1::ChunkFetchingRequest>,
 	/// Collations request receiver for network protocol v1.
 	pub collation_req_v1_receiver: IncomingRequestReceiver<request_v1::CollationFetchingRequest>,
-	/// Collations request receiver for network protocol vstaging.
-	pub collation_req_vstaging_receiver:
-		IncomingRequestReceiver<request_vstaging::CollationFetchingRequest>,
+	/// Collations request receiver for network protocol v2.
+	pub collation_req_v2_receiver: IncomingRequestReceiver<request_v2::CollationFetchingRequest>,
 	/// Receiver for available data requests.
 	pub available_data_req_receiver:
 		IncomingRequestReceiver<request_v1::AvailableDataFetchingRequest>,
 	/// Receiver for incoming large statement requests.
 	pub statement_req_receiver: IncomingRequestReceiver<request_v1::StatementFetchingRequest>,
 	/// Receiver for incoming candidate requests.
-	pub candidate_req_vstaging_receiver:
-		IncomingRequestReceiver<request_vstaging::AttestedCandidateRequest>,
+	pub candidate_req_v2_receiver: IncomingRequestReceiver<request_v2::AttestedCandidateRequest>,
 	/// Receiver for incoming disputes.
 	pub dispute_req_receiver: IncomingRequestReceiver<request_v1::DisputeRequest>,
 	/// Prometheus registry, commonly used for production systems, less so for test.
@@ -139,7 +137,7 @@ where
 	pub overseer_message_channel_capacity_override: Option<usize>,
 	/// Request-response protocol names source.
 	pub req_protocol_names: ReqProtocolNames,
-	/// [`PeerSet`] protocol names to protocols mapping.
+	/// `PeerSet` protocol names to protocols mapping.
 	pub peerset_protocol_names: PeerSetProtocolNames,
 	/// The offchain transaction pool factory.
 	pub offchain_transaction_pool_factory: OffchainTransactionPoolFactory<Block>,
@@ -158,10 +156,10 @@ pub fn prepared_overseer_builder<Spawner, RuntimeClient>(
 		pov_req_receiver,
 		chunk_req_receiver,
 		collation_req_v1_receiver,
-		collation_req_vstaging_receiver,
+		collation_req_v2_receiver,
 		available_data_req_receiver,
 		statement_req_receiver,
-		candidate_req_vstaging_receiver,
+		candidate_req_v2_receiver,
 		dispute_req_receiver,
 		registry,
 		spawner,
@@ -288,7 +286,7 @@ where
 					peer_id: network_service.local_peer_id(),
 					collator_pair,
 					request_receiver_v1: collation_req_v1_receiver,
-					request_receiver_vstaging: collation_req_vstaging_receiver,
+					request_receiver_v2: collation_req_v2_receiver,
 					metrics: Metrics::register(registry)?,
 				},
 				IsParachainNode::FullNode => ProtocolSide::None,
@@ -309,7 +307,7 @@ where
 		.statement_distribution(StatementDistributionSubsystem::new(
 			keystore.clone(),
 			statement_req_receiver,
-			candidate_req_vstaging_receiver,
+			candidate_req_v2_receiver,
 			Metrics::register(registry)?,
 			rand::rngs::StdRng::from_entropy(),
 		))
@@ -344,7 +342,7 @@ where
 		.span_per_active_leaf(Default::default())
 		.active_leaves(Default::default())
 		.supports_parachains(runtime_api_client)
-		.known_leaves(LruCache::new(KNOWN_LEAVES_CACHE_SIZE))
+		.known_leaves(LruMap::new(ByLength::new(KNOWN_LEAVES_CACHE_SIZE)))
 		.metrics(metrics)
 		.spawner(spawner);
 
diff --git a/polkadot/node/service/src/relay_chain_selection.rs b/polkadot/node/service/src/relay_chain_selection.rs
index 189073783f0dc53eb06ceafe9015e9fd806b1f9e..5fae6a96de4ea73996042be8446220df51fc2e30 100644
--- a/polkadot/node/service/src/relay_chain_selection.rs
+++ b/polkadot/node/service/src/relay_chain_selection.rs
@@ -31,7 +31,7 @@
 //! leaf returned from the chain selection subsystem by calling into other
 //! subsystems which yield information about approvals and disputes.
 //!
-//! [chain-selection-guide]: https://w3f.github.io/parachain-implementers-guide/protocol-chain-selection.html
+//! [chain-selection-guide]: https://paritytech.github.io/polkadot-sdk/book/protocol-chain-selection.html
 
 #![cfg(feature = "full-node")]
 
diff --git a/polkadot/node/subsystem-test-helpers/Cargo.toml b/polkadot/node/subsystem-test-helpers/Cargo.toml
index e05c9194b39a794c7637caf30cdbd973823bed36..9087ca11f5d22ee5307fbc3877c88e1be5a72e27 100644
--- a/polkadot/node/subsystem-test-helpers/Cargo.toml
+++ b/polkadot/node/subsystem-test-helpers/Cargo.toml
@@ -2,7 +2,7 @@
 name = "polkadot-node-subsystem-test-helpers"
 description = "Subsystem traits and message definitions"
 publish = false
-version.workspace = true
+version = "1.0.0"
 authors.workspace = true
 edition.workspace = true
 license.workspace = true
@@ -14,11 +14,10 @@ parking_lot = "0.12.0"
 polkadot-node-subsystem = { path = "../subsystem" }
 polkadot-node-subsystem-util = { path = "../subsystem-util" }
 polkadot-primitives = { path = "../../primitives" }
+sc-client-api = { path = "../../../substrate/client/api" }
+sc-utils = { path = "../../../substrate/client/utils" }
 sp-core = { path = "../../../substrate/primitives/core" }
 sp-keystore = { path = "../../../substrate/primitives/keystore" }
 sc-keystore = { path = "../../../substrate/client/keystore" }
 sp-keyring = { path = "../../../substrate/primitives/keyring" }
 sp-application-crypto = { path = "../../../substrate/primitives/application-crypto" }
-
-[dev-dependencies]
-polkadot-overseer = { path = "../overseer" }
diff --git a/polkadot/node/subsystem-test-helpers/src/lib.rs b/polkadot/node/subsystem-test-helpers/src/lib.rs
index 339b99a4b5ac08723bbb3780744eaf256d998ae2..3f92513498c4129f418690946c2a2e2ac85605cc 100644
--- a/polkadot/node/subsystem-test-helpers/src/lib.rs
+++ b/polkadot/node/subsystem-test-helpers/src/lib.rs
@@ -20,7 +20,7 @@
 
 use polkadot_node_subsystem::{
 	messages::AllMessages, overseer, FromOrchestra, OverseerSignal, SpawnGlue, SpawnedSubsystem,
-	SubsystemError, SubsystemResult,
+	SubsystemError, SubsystemResult, TrySendError,
 };
 use polkadot_node_subsystem_util::TimeoutExt;
 
@@ -160,6 +160,14 @@ where
 		self.tx.send(msg.into()).await.expect("test overseer no longer live");
 	}
 
+	fn try_send_message(
+		&mut self,
+		msg: OutgoingMessage,
+	) -> Result<(), TrySendError<OutgoingMessage>> {
+		self.tx.unbounded_send(msg.into()).expect("test overseer no longer live");
+		Ok(())
+	}
+
 	async fn send_messages<I>(&mut self, msgs: I)
 	where
 		I: IntoIterator<Item = OutgoingMessage> + Send,
@@ -338,7 +346,7 @@ pub fn subsystem_test_harness<M, OverseerFactory, Overseer, TestFactory, Test>(
 	});
 }
 
-/// A forward subsystem that implements [`Subsystem`].
+/// A forward subsystem that implements [`Subsystem`](overseer::Subsystem).
 ///
 /// It forwards all communication from the overseer to the internal message
 /// channel.
@@ -435,42 +443,6 @@ impl Future for Yield {
 #[cfg(test)]
 mod tests {
 	use super::*;
-	use futures::executor::block_on;
-	use polkadot_node_subsystem::messages::CollatorProtocolMessage;
-	use polkadot_overseer::{dummy::dummy_overseer_builder, Handle, HeadSupportsParachains};
-	use polkadot_primitives::Hash;
-	use sp_core::traits::SpawnNamed;
-
-	struct AlwaysSupportsParachains;
-
-	#[async_trait::async_trait]
-	impl HeadSupportsParachains for AlwaysSupportsParachains {
-		async fn head_supports_parachains(&self, _head: &Hash) -> bool {
-			true
-		}
-	}
-
-	#[test]
-	fn forward_subsystem_works() {
-		let spawner = sp_core::testing::TaskExecutor::new();
-		let (tx, rx) = mpsc::channel(2);
-		let (overseer, handle) =
-			dummy_overseer_builder(spawner.clone(), AlwaysSupportsParachains, None)
-				.unwrap()
-				.replace_collator_protocol(|_| ForwardSubsystem(tx))
-				.build()
-				.unwrap();
-
-		let mut handle = Handle::new(handle);
-
-		spawner.spawn("overseer", None, overseer.run().then(|_| async { () }).boxed());
-
-		block_on(handle.send_msg_anon(CollatorProtocolMessage::CollateOn(Default::default())));
-		assert!(matches!(
-			block_on(rx.into_future()).0.unwrap(),
-			CollatorProtocolMessage::CollateOn(_)
-		));
-	}
 
 	#[test]
 	fn macro_arbitrary_order() {
diff --git a/polkadot/node/subsystem-test-helpers/src/mock.rs b/polkadot/node/subsystem-test-helpers/src/mock.rs
index 04695983d1d533a6bb57ed12dd60254e0a56d5cb..35d74e27c9c1c237e6cb71382bae9c1cd730ccd6 100644
--- a/polkadot/node/subsystem-test-helpers/src/mock.rs
+++ b/polkadot/node/subsystem-test-helpers/src/mock.rs
@@ -16,12 +16,15 @@
 
 use std::sync::Arc;
 
+use polkadot_node_subsystem::{jaeger, ActivatedLeaf, LeafStatus};
+use sc_client_api::UnpinHandle;
 use sc_keystore::LocalKeystore;
+use sc_utils::mpsc::tracing_unbounded;
 use sp_application_crypto::AppCrypto;
 use sp_keyring::Sr25519Keyring;
 use sp_keystore::{Keystore, KeystorePtr};
 
-use polkadot_primitives::{AuthorityDiscoveryId, ValidatorId};
+use polkadot_primitives::{AuthorityDiscoveryId, Block, BlockNumber, Hash, ValidatorId};
 
 /// Get mock keystore with `Ferdie` key.
 pub fn make_ferdie_keystore() -> KeystorePtr {
@@ -40,3 +43,20 @@ pub fn make_ferdie_keystore() -> KeystorePtr {
 	.expect("Insert key into keystore");
 	keystore
 }
+
+/// Create a meaningless unpin handle for a block.
+pub fn dummy_unpin_handle(block: Hash) -> UnpinHandle<Block> {
+	let (dummy_sink, _) = tracing_unbounded("Expect Chaos", 69);
+	UnpinHandle::new(block, dummy_sink)
+}
+
+/// Create a new leaf with the given hash and number.
+pub fn new_leaf(hash: Hash, number: BlockNumber) -> ActivatedLeaf {
+	ActivatedLeaf {
+		hash,
+		number,
+		status: LeafStatus::Fresh,
+		unpin_handle: dummy_unpin_handle(hash),
+		span: Arc::new(jaeger::Span::Disabled),
+	}
+}
diff --git a/polkadot/node/subsystem-types/Cargo.toml b/polkadot/node/subsystem-types/Cargo.toml
index 4f2d753b7993401bdc322b6a271a017603fe228c..a1c00cb0652e2538c590d1c3892eed8a168e1014 100644
--- a/polkadot/node/subsystem-types/Cargo.toml
+++ b/polkadot/node/subsystem-types/Cargo.toml
@@ -1,7 +1,7 @@
 [package]
 name = "polkadot-node-subsystem-types"
 description = "Subsystem traits and message definitions"
-version.workspace = true
+version = "1.0.0"
 authors.workspace = true
 edition.workspace = true
 license.workspace = true
@@ -14,13 +14,14 @@ polkadot-node-primitives = { path = "../primitives" }
 polkadot-node-network-protocol = { path = "../network/protocol" }
 polkadot-statement-table = { path = "../../statement-table" }
 polkadot-node-jaeger = { path = "../jaeger" }
-orchestra = "0.0.5"
+orchestra = { version = "0.3.3", default-features = false, features=["futures_channel"] }
 sc-network = { path = "../../../substrate/client/network" }
 sp-api = { path = "../../../substrate/primitives/api" }
 sp-consensus-babe = { path = "../../../substrate/primitives/consensus/babe" }
 sp-authority-discovery = { path = "../../../substrate/primitives/authority-discovery" }
+sc-client-api = { path = "../../../substrate/client/api" }
 sc-transaction-pool-api = { path = "../../../substrate/client/transaction-pool/api" }
 smallvec = "1.8.0"
 substrate-prometheus-endpoint = { path = "../../../substrate/utils/prometheus" }
-thiserror = "1.0.31"
+thiserror = "1.0.48"
 async-trait = "0.1.57"
diff --git a/polkadot/node/subsystem-types/src/lib.rs b/polkadot/node/subsystem-types/src/lib.rs
index f438a09592c1d22ad310c03b4b8386cb41b5a612..02651ace1e5b32829804c62cd2d192c9a0e35fd3 100644
--- a/polkadot/node/subsystem-types/src/lib.rs
+++ b/polkadot/node/subsystem-types/src/lib.rs
@@ -22,10 +22,19 @@
 
 #![warn(missing_docs)]
 
+use smallvec::SmallVec;
 use std::{fmt, sync::Arc};
 
-pub use polkadot_primitives::{BlockNumber, Hash};
-use smallvec::SmallVec;
+pub use polkadot_primitives::{Block, BlockNumber, Hash};
+
+/// Keeps the state of a specific block pinned in memory while the handle is alive.
+///
+/// The handle is reference counted and once the last is dropped, the
+/// block is unpinned.
+///
+/// This is useful for runtime API calls to blocks that are
+/// racing against finality, e.g. for slashing purposes.
+pub type UnpinHandle = sc_client_api::UnpinHandle<Block>;
 
 pub mod errors;
 pub mod messages;
@@ -80,6 +89,8 @@ pub struct ActivatedLeaf {
 	pub number: BlockNumber,
 	/// The status of the leaf.
 	pub status: LeafStatus,
+	/// A handle to unpin the block on drop.
+	pub unpin_handle: UnpinHandle,
 	/// An associated [`jaeger::Span`].
 	///
 	/// NOTE: Each span should only be kept active as long as the leaf is considered active and
diff --git a/polkadot/node/subsystem-types/src/messages.rs b/polkadot/node/subsystem-types/src/messages.rs
index 8adc39eed56db1b25880a96392dcbe97806755bb..6bc874384594e93ac7970777c16d3a6276c5938a 100644
--- a/polkadot/node/subsystem-types/src/messages.rs
+++ b/polkadot/node/subsystem-types/src/messages.rs
@@ -39,12 +39,12 @@ use polkadot_node_primitives::{
 	ValidationResult,
 };
 use polkadot_primitives::{
-	slashing, vstaging as vstaging_primitives, AuthorityDiscoveryId, BackedCandidate, BlockNumber,
-	CandidateEvent, CandidateHash, CandidateIndex, CandidateReceipt, CollatorId,
-	CommittedCandidateReceipt, CoreState, DisputeState, ExecutorParams, GroupIndex,
-	GroupRotationInfo, Hash, Header as BlockHeader, Id as ParaId, InboundDownwardMessage,
-	InboundHrmpMessage, MultiDisputeStatementSet, OccupiedCoreAssumption, PersistedValidationData,
-	PvfCheckStatement, PvfExecTimeoutKind, SessionIndex, SessionInfo, SignedAvailabilityBitfield,
+	async_backing, slashing, AuthorityDiscoveryId, BackedCandidate, BlockNumber, CandidateEvent,
+	CandidateHash, CandidateIndex, CandidateReceipt, CollatorId, CommittedCandidateReceipt,
+	CoreState, DisputeState, ExecutorParams, GroupIndex, GroupRotationInfo, Hash,
+	Header as BlockHeader, Id as ParaId, InboundDownwardMessage, InboundHrmpMessage,
+	MultiDisputeStatementSet, OccupiedCoreAssumption, PersistedValidationData, PvfCheckStatement,
+	PvfExecTimeoutKind, SessionIndex, SessionInfo, SignedAvailabilityBitfield,
 	SignedAvailabilityBitfields, ValidationCode, ValidationCodeHash, ValidatorId, ValidatorIndex,
 	ValidatorSignature,
 };
@@ -143,6 +143,7 @@ pub enum CandidateValidationMessage {
 	ValidateFromChainState(
 		CandidateReceipt,
 		Arc<PoV>,
+		ExecutorParams,
 		/// Execution timeout
 		PvfExecTimeoutKind,
 		oneshot::Sender<Result<ValidationResult, ValidationFailed>>,
@@ -161,6 +162,7 @@ pub enum CandidateValidationMessage {
 		ValidationCode,
 		CandidateReceipt,
 		Arc<PoV>,
+		ExecutorParams,
 		/// Execution timeout
 		PvfExecTimeoutKind,
 		oneshot::Sender<Result<ValidationResult, ValidationFailed>>,
@@ -691,14 +693,16 @@ pub enum RuntimeApiRequest {
 		slashing::OpaqueKeyOwnershipProof,
 		RuntimeApiSender<Option<()>>,
 	),
-
+	/// Get the minimum required backing votes.
+	MinimumBackingVotes(SessionIndex, RuntimeApiSender<u32>),
+	/// Returns all disabled validators at a given block height.
+	DisabledValidators(RuntimeApiSender<Vec<ValidatorIndex>>),
 	/// Get the backing state of the given para.
-	/// This is a staging API that will not be available on production runtimes.
-	StagingParaBackingState(ParaId, RuntimeApiSender<Option<vstaging_primitives::BackingState>>),
+	ParaBackingState(ParaId, RuntimeApiSender<Option<async_backing::BackingState>>),
 	/// Get candidate's acceptance limitations for asynchronous backing for a relay parent.
 	///
 	/// If it's not supported by the Runtime, the async backing is said to be disabled.
-	StagingAsyncBackingParams(RuntimeApiSender<vstaging_primitives::AsyncBackingParams>),
+	AsyncBackingParams(RuntimeApiSender<async_backing::AsyncBackingParams>),
 }
 
 impl RuntimeApiRequest {
@@ -719,10 +723,14 @@ impl RuntimeApiRequest {
 	/// `SubmitReportDisputeLost`
 	pub const SUBMIT_REPORT_DISPUTE_LOST_RUNTIME_REQUIREMENT: u32 = 5;
 
-	/// Minimum version for backing state, required for async backing.
-	///
-	/// 99 for now, should be adjusted to VSTAGING/actual runtime version once released.
-	pub const STAGING_BACKING_STATE: u32 = 99;
+	/// `MinimumBackingVotes`
+	pub const MINIMUM_BACKING_VOTES_RUNTIME_REQUIREMENT: u32 = 6;
+
+	/// Minimum version to enable asynchronous backing: `AsyncBackingParams` and `ParaBackingState`.
+	pub const ASYNC_BACKING_STATE_RUNTIME_REQUIREMENT: u32 = 7;
+
+	/// `DisabledValidators`
+	pub const DISABLED_VALIDATORS_RUNTIME_REQUIREMENT: u32 = 8;
 }
 
 /// A message to the Runtime API subsystem.
diff --git a/polkadot/node/subsystem-types/src/runtime_client.rs b/polkadot/node/subsystem-types/src/runtime_client.rs
index 312cc4eec6ce997ef0c5370097bf2146e4c473bc..f7adcf9862b5d09829cb1d0edbb3f068b9c55713 100644
--- a/polkadot/node/subsystem-types/src/runtime_client.rs
+++ b/polkadot/node/subsystem-types/src/runtime_client.rs
@@ -16,9 +16,9 @@
 
 use async_trait::async_trait;
 use polkadot_primitives::{
-	runtime_api::ParachainHost, vstaging, Block, BlockNumber, CandidateCommitments, CandidateEvent,
-	CandidateHash, CommittedCandidateReceipt, CoreState, DisputeState, ExecutorParams,
-	GroupRotationInfo, Hash, Id, InboundDownwardMessage, InboundHrmpMessage,
+	async_backing, runtime_api::ParachainHost, slashing, Block, BlockNumber, CandidateCommitments,
+	CandidateEvent, CandidateHash, CommittedCandidateReceipt, CoreState, DisputeState,
+	ExecutorParams, GroupRotationInfo, Hash, Id, InboundDownwardMessage, InboundHrmpMessage,
 	OccupiedCoreAssumption, PersistedValidationData, PvfCheckStatement, ScrapedOnChainVotes,
 	SessionIndex, SessionInfo, ValidationCode, ValidationCodeHash, ValidatorId, ValidatorIndex,
 	ValidatorSignature,
@@ -190,7 +190,7 @@ pub trait RuntimeApiSubsystemClient {
 	async fn unapplied_slashes(
 		&self,
 		at: Hash,
-	) -> Result<Vec<(SessionIndex, CandidateHash, vstaging::slashing::PendingSlashes)>, ApiError>;
+	) -> Result<Vec<(SessionIndex, CandidateHash, slashing::PendingSlashes)>, ApiError>;
 
 	/// Returns a merkle proof of a validator session key in a past session.
 	///
@@ -199,7 +199,7 @@ pub trait RuntimeApiSubsystemClient {
 		&self,
 		at: Hash,
 		validator_id: ValidatorId,
-	) -> Result<Option<vstaging::slashing::OpaqueKeyOwnershipProof>, ApiError>;
+	) -> Result<Option<slashing::OpaqueKeyOwnershipProof>, ApiError>;
 
 	/// Submits an unsigned extrinsic to slash validators who lost a dispute about
 	/// a candidate of a past session.
@@ -208,8 +208,8 @@ pub trait RuntimeApiSubsystemClient {
 	async fn submit_report_dispute_lost(
 		&self,
 		at: Hash,
-		dispute_proof: vstaging::slashing::DisputeProof,
-		key_ownership_proof: vstaging::slashing::OpaqueKeyOwnershipProof,
+		dispute_proof: slashing::DisputeProof,
+		key_ownership_proof: slashing::OpaqueKeyOwnershipProof,
 	) -> Result<Option<()>, ApiError>;
 
 	// === BABE API ===
@@ -232,21 +232,33 @@ pub trait RuntimeApiSubsystemClient {
 		session_index: SessionIndex,
 	) -> Result<Option<ExecutorParams>, ApiError>;
 
-	// === Asynchronous backing API ===
+	// === v6 ===
+	/// Get the minimum number of backing votes.
+	async fn minimum_backing_votes(
+		&self,
+		at: Hash,
+		session_index: SessionIndex,
+	) -> Result<u32, ApiError>;
+
+	// === v7: Asynchronous backing API ===
 
 	/// Returns candidate's acceptance limitations for asynchronous backing for a relay parent.
-	async fn staging_async_backing_params(
+	async fn async_backing_params(
 		&self,
 		at: Hash,
-	) -> Result<polkadot_primitives::vstaging::AsyncBackingParams, ApiError>;
+	) -> Result<polkadot_primitives::AsyncBackingParams, ApiError>;
 
 	/// Returns the state of parachain backing for a given para.
 	/// This is a staging method! Do not use on production runtimes!
-	async fn staging_para_backing_state(
+	async fn para_backing_state(
 		&self,
 		at: Hash,
 		para_id: Id,
-	) -> Result<Option<polkadot_primitives::vstaging::BackingState>, ApiError>;
+	) -> Result<Option<async_backing::BackingState>, ApiError>;
+
+	// === v8 ===
+	/// Gets the disabled validators at a specific block height
+	async fn disabled_validators(&self, at: Hash) -> Result<Vec<ValidatorIndex>, ApiError>;
 }
 
 /// Default implementation of [`RuntimeApiSubsystemClient`] using the client.
@@ -446,7 +458,7 @@ where
 	async fn unapplied_slashes(
 		&self,
 		at: Hash,
-	) -> Result<Vec<(SessionIndex, CandidateHash, vstaging::slashing::PendingSlashes)>, ApiError> {
+	) -> Result<Vec<(SessionIndex, CandidateHash, slashing::PendingSlashes)>, ApiError> {
 		self.client.runtime_api().unapplied_slashes(at)
 	}
 
@@ -454,15 +466,15 @@ where
 		&self,
 		at: Hash,
 		validator_id: ValidatorId,
-	) -> Result<Option<vstaging::slashing::OpaqueKeyOwnershipProof>, ApiError> {
+	) -> Result<Option<slashing::OpaqueKeyOwnershipProof>, ApiError> {
 		self.client.runtime_api().key_ownership_proof(at, validator_id)
 	}
 
 	async fn submit_report_dispute_lost(
 		&self,
 		at: Hash,
-		dispute_proof: vstaging::slashing::DisputeProof,
-		key_ownership_proof: vstaging::slashing::OpaqueKeyOwnershipProof,
+		dispute_proof: slashing::DisputeProof,
+		key_ownership_proof: slashing::OpaqueKeyOwnershipProof,
 	) -> Result<Option<()>, ApiError> {
 		let mut runtime_api = self.client.runtime_api();
 
@@ -473,19 +485,30 @@ where
 		runtime_api.submit_report_dispute_lost(at, dispute_proof, key_ownership_proof)
 	}
 
-	async fn staging_para_backing_state(
+	async fn minimum_backing_votes(
+		&self,
+		at: Hash,
+		_session_index: SessionIndex,
+	) -> Result<u32, ApiError> {
+		self.client.runtime_api().minimum_backing_votes(at)
+	}
+
+	async fn para_backing_state(
 		&self,
 		at: Hash,
 		para_id: Id,
-	) -> Result<Option<polkadot_primitives::vstaging::BackingState>, ApiError> {
-		self.client.runtime_api().staging_para_backing_state(at, para_id)
+	) -> Result<Option<async_backing::BackingState>, ApiError> {
+		self.client.runtime_api().para_backing_state(at, para_id)
 	}
 
-	/// Returns candidate's acceptance limitations for asynchronous backing for a relay parent.
-	async fn staging_async_backing_params(
+	async fn async_backing_params(
 		&self,
 		at: Hash,
-	) -> Result<polkadot_primitives::vstaging::AsyncBackingParams, ApiError> {
-		self.client.runtime_api().staging_async_backing_params(at)
+	) -> Result<async_backing::AsyncBackingParams, ApiError> {
+		self.client.runtime_api().async_backing_params(at)
+	}
+
+	async fn disabled_validators(&self, at: Hash) -> Result<Vec<ValidatorIndex>, ApiError> {
+		self.client.runtime_api().disabled_validators(at)
 	}
 }
diff --git a/polkadot/node/subsystem-util/Cargo.toml b/polkadot/node/subsystem-util/Cargo.toml
index a7c802a8ca87fb9bf0f607a96c89ad4db8eb79a5..d9364e2c2c0f15158b861ef0e8c44121a7e2d650 100644
--- a/polkadot/node/subsystem-util/Cargo.toml
+++ b/polkadot/node/subsystem-util/Cargo.toml
@@ -1,7 +1,7 @@
 [package]
 name = "polkadot-node-subsystem-util"
 description = "Subsystem traits and message definitions"
-version.workspace = true
+version = "1.0.0"
 authors.workspace = true
 edition.workspace = true
 license.workspace = true
@@ -15,24 +15,26 @@ parity-scale-codec = { version = "3.6.1", default-features = false, features = [
 parking_lot = "0.11.2"
 pin-project = "1.0.9"
 rand = "0.8.5"
-thiserror = "1.0.31"
+thiserror = "1.0.48"
 fatality = "0.0.6"
 gum = { package = "tracing-gum", path = "../gum" }
 derive_more = "0.99.17"
-lru = "0.11.0"
+schnellru = "0.2.1"
 
 polkadot-node-subsystem = { path = "../subsystem" }
+polkadot-node-subsystem-types = { path = "../subsystem-types" }
 polkadot-node-jaeger = { path = "../jaeger" }
 polkadot-node-metrics = { path = "../metrics" }
 polkadot-node-network-protocol = { path = "../network/protocol" }
 polkadot-primitives = { path = "../../primitives" }
 polkadot-node-primitives = { path = "../primitives" }
 polkadot-overseer = { path = "../overseer" }
-metered = { package = "prioritized-metered-channel", version = "0.2.0" }
+metered = { package = "prioritized-metered-channel", version = "0.5.1", default-features = false, features=["futures_channel"] }
 
 sp-core = { path = "../../../substrate/primitives/core" }
 sp-application-crypto = { path = "../../../substrate/primitives/application-crypto" }
 sp-keystore = { path = "../../../substrate/primitives/keystore" }
+sc-client-api = { path = "../../../substrate/client/api" }
 
 kvdb = "0.13.0"
 parity-db = { version = "0.4.8"}
diff --git a/polkadot/node/subsystem-util/src/backing_implicit_view.rs b/polkadot/node/subsystem-util/src/backing_implicit_view.rs
index adf7fbd54258f9b2102348174b0b1cc3cb69bdb1..a14536a17666c8e2d9183755e3579990f6185113 100644
--- a/polkadot/node/subsystem-util/src/backing_implicit_view.rs
+++ b/polkadot/node/subsystem-util/src/backing_implicit_view.rs
@@ -1,4 +1,4 @@
-// Copyright 2022 Parity Technologies (UK) Ltd.
+// Copyright (C) Parity Technologies (UK) Ltd.
 // This file is part of Polkadot.
 
 // Polkadot is free software: you can redistribute it and/or modify
@@ -20,7 +20,7 @@ use polkadot_node_subsystem::{
 	messages::{ChainApiMessage, ProspectiveParachainsMessage},
 	SubsystemSender,
 };
-use polkadot_primitives::vstaging::{BlockNumber, Hash, Id as ParaId};
+use polkadot_primitives::{BlockNumber, Hash, Id as ParaId};
 
 use std::collections::HashMap;
 
diff --git a/polkadot/node/subsystem-util/src/inclusion_emulator/mod.rs b/polkadot/node/subsystem-util/src/inclusion_emulator/mod.rs
index 6ab19fa660bd2fd05bc0cbb97745e1232b26a4e2..c7b91bffb3d705b27ee4c611985328dd1b1b7e77 100644
--- a/polkadot/node/subsystem-util/src/inclusion_emulator/mod.rs
+++ b/polkadot/node/subsystem-util/src/inclusion_emulator/mod.rs
@@ -1,4 +1,4 @@
-// Copyright 2017-2022 Parity Technologies (UK) Ltd.
+// Copyright (C) Parity Technologies (UK) Ltd.
 // This file is part of Polkadot.
 
 // Polkadot is free software: you can redistribute it and/or modify
@@ -11,4 +11,1437 @@
 // MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
 // GNU General Public License for more details.
 
-pub mod staging;
+/// # Overview
+///
+/// A set of utilities for node-side code to emulate the logic the runtime uses for checking
+/// parachain blocks in order to build prospective parachains that are produced ahead of the
+/// relay chain. These utilities allow the node-side to predict, with high accuracy, what
+/// the relay-chain will accept in the near future.
+///
+/// This module has 2 key data types: [`Constraints`] and [`Fragment`]s. [`Constraints`]
+/// exhaustively define the set of valid inputs and outputs to parachain execution. A
+/// [`Fragment`] indicates a parachain block, anchored to the relay-chain at a particular
+/// relay-chain block, known as the relay-parent.
+///
+/// ## Fragment Validity
+///
+/// Every relay-parent is implicitly associated with a unique set of [`Constraints`] that
+/// describe the properties that must be true for a block to be included in a direct child of
+/// that block, assuming there is no intermediate parachain block pending availability.
+///
+/// However, the key factor that makes asynchronously-grown prospective chains
+/// possible is the fact that the relay-chain accepts candidate blocks based on whether they
+/// are valid under the constraints of the present moment, not based on whether they were
+/// valid at the time of construction.
+///
+/// As such, [`Fragment`]s are often, but not always constructed in such a way that they are
+/// invalid at first and become valid later on, as the relay chain grows.
+///
+/// # Usage
+///
+/// It's expected that the users of this module will be building up trees of
+/// [`Fragment`]s and consistently pruning and adding to the tree.
+///
+/// ## Operating Constraints
+///
+/// The *operating constraints* of a `Fragment` are the constraints with which that fragment
+/// was intended to comply. The operating constraints are defined as the base constraints
+/// of the relay-parent of the fragment modified by the cumulative modifications of all
+/// fragments between the relay-parent and the current fragment.
+///
+/// What the operating constraints are, in practice, is a prediction about the state of the
+/// relay-chain in the future. The relay-chain is aware of some current state, and we want to
+/// make an intelligent prediction about what might be accepted in the future based on
+/// prior fragments that also exist off-chain.
+///
+/// ## Fragment Trees
+///
+/// As the relay-chain grows, some predictions come true and others come false.
+/// And new predictions get made. These three changes correspond distinctly to the
+/// 3 primary operations on fragment trees.
+///
+/// A fragment tree is a mental model for thinking about a forking series of predictions
+/// about a single parachain. There may be one or more fragment trees per parachain.
+///
+/// In expectation, most parachains will have a plausibly-unique authorship method which means
+/// that they should really be much closer to fragment-chains, maybe with an occasional fork.
+///
+/// Avoiding fragment-tree blowup is beyond the scope of this module.
+///
+/// ### Pruning Fragment Trees
+///
+/// When the relay-chain advances, we want to compare the new constraints of that relay-parent
+/// to the roots of the fragment trees we have. There are 3 cases:
+///
+/// 1. The root fragment is still valid under the new constraints. In this case, we do nothing.
+///    This is the "prediction still uncertain" case.
+///
+/// 2. The root fragment is invalid under the new constraints because it has been subsumed by
+///    the relay-chain. In this case, we can discard the root and split & re-root the fragment
+///    tree under its descendents and compare to the new constraints again. This is the
+///    "prediction came true" case.
+///
+/// 3. The root fragment is invalid under the new constraints because a competing parachain
+///    block has been included or it would never be accepted for some other reason. In this
+///    case we can discard the entire fragment tree. This is the "prediction came false" case.
+///
+/// This is all a bit of a simplification because it assumes that the relay-chain advances
+/// without forks and is finalized instantly. In practice, the set of fragment-trees needs to
+/// be observable from the perspective of a few different possible forks of the relay-chain and
+/// not pruned too eagerly.
+///
+/// Note that the fragments themselves don't need to change and the only thing we care about
+/// is whether the predictions they represent are still valid.
+///
+/// ### Extending Fragment Trees
+///
+/// As predictions fade into the past, new ones should be stacked on top.
+///
+/// Every new relay-chain block is an opportunity to make a new prediction about the future.
+/// Higher-level logic should select the leaves of the fragment-trees to build upon or whether
+/// to create a new fragment-tree.
+///
+/// ### Code Upgrades
+///
+/// Code upgrades are the main place where this emulation fails. The on-chain PVF upgrade
+/// scheduling logic is very path-dependent and intricate so we just assume that code upgrades
+/// can't be initiated and applied within a single fragment-tree. Fragment-trees aren't deep,
+/// in practice and code upgrades are fairly rare. So what's likely to happen around code
+/// upgrades is that the entire fragment-tree has to get discarded at some point.
+///
+/// That means a few blocks of execution time lost, which is not a big deal for code upgrades
+/// in practice at most once every few weeks.
+use polkadot_primitives::{
+	async_backing::Constraints as PrimitiveConstraints, BlockNumber, CandidateCommitments,
+	CollatorId, CollatorSignature, Hash, HeadData, Id as ParaId, PersistedValidationData,
+	UpgradeRestriction, ValidationCodeHash,
+};
+use std::{
+	borrow::{Borrow, Cow},
+	collections::HashMap,
+};
+
+/// Constraints on inbound HRMP channels.
+#[derive(Debug, Clone, PartialEq)]
+pub struct InboundHrmpLimitations {
+	/// An exhaustive set of all valid watermarks, sorted ascending
+	pub valid_watermarks: Vec<BlockNumber>,
+}
+
+/// Constraints on outbound HRMP channels.
+#[derive(Debug, Clone, PartialEq)]
+pub struct OutboundHrmpChannelLimitations {
+	/// The maximum bytes that can be written to the channel.
+	pub bytes_remaining: usize,
+	/// The maximum messages that can be written to the channel.
+	pub messages_remaining: usize,
+}
+
+/// Constraints on the actions that can be taken by a new parachain
+/// block. These limitations are implicitly associated with some particular
+/// parachain, which should be apparent from usage.
+#[derive(Debug, Clone, PartialEq)]
+pub struct Constraints {
+	/// The minimum relay-parent number accepted under these constraints.
+	pub min_relay_parent_number: BlockNumber,
+	/// The maximum Proof-of-Validity size allowed, in bytes.
+	pub max_pov_size: usize,
+	/// The maximum new validation code size allowed, in bytes.
+	pub max_code_size: usize,
+	/// The amount of UMP messages remaining.
+	pub ump_remaining: usize,
+	/// The amount of UMP bytes remaining.
+	pub ump_remaining_bytes: usize,
+	/// The maximum number of UMP messages allowed per candidate.
+	pub max_ump_num_per_candidate: usize,
+	/// Remaining DMP queue. Only includes sent-at block numbers.
+	pub dmp_remaining_messages: Vec<BlockNumber>,
+	/// The limitations of all registered inbound HRMP channels.
+	pub hrmp_inbound: InboundHrmpLimitations,
+	/// The limitations of all registered outbound HRMP channels.
+	pub hrmp_channels_out: HashMap<ParaId, OutboundHrmpChannelLimitations>,
+	/// The maximum number of HRMP messages allowed per candidate.
+	pub max_hrmp_num_per_candidate: usize,
+	/// The required parent head-data of the parachain.
+	pub required_parent: HeadData,
+	/// The expected validation-code-hash of this parachain.
+	pub validation_code_hash: ValidationCodeHash,
+	/// The code upgrade restriction signal as-of this parachain.
+	pub upgrade_restriction: Option<UpgradeRestriction>,
+	/// The future validation code hash, if any, and at what relay-parent
+	/// number the upgrade would be minimally applied.
+	pub future_validation_code: Option<(BlockNumber, ValidationCodeHash)>,
+}
+
+impl From<PrimitiveConstraints> for Constraints {
+	fn from(c: PrimitiveConstraints) -> Self {
+		Constraints {
+			min_relay_parent_number: c.min_relay_parent_number,
+			max_pov_size: c.max_pov_size as _,
+			max_code_size: c.max_code_size as _,
+			ump_remaining: c.ump_remaining as _,
+			ump_remaining_bytes: c.ump_remaining_bytes as _,
+			max_ump_num_per_candidate: c.max_ump_num_per_candidate as _,
+			dmp_remaining_messages: c.dmp_remaining_messages,
+			hrmp_inbound: InboundHrmpLimitations {
+				valid_watermarks: c.hrmp_inbound.valid_watermarks,
+			},
+			hrmp_channels_out: c
+				.hrmp_channels_out
+				.into_iter()
+				.map(|(para_id, limits)| {
+					(
+						para_id,
+						OutboundHrmpChannelLimitations {
+							bytes_remaining: limits.bytes_remaining as _,
+							messages_remaining: limits.messages_remaining as _,
+						},
+					)
+				})
+				.collect(),
+			max_hrmp_num_per_candidate: c.max_hrmp_num_per_candidate as _,
+			required_parent: c.required_parent,
+			validation_code_hash: c.validation_code_hash,
+			upgrade_restriction: c.upgrade_restriction,
+			future_validation_code: c.future_validation_code,
+		}
+	}
+}
+
+/// Kinds of errors that can occur when modifying constraints.
+#[derive(Debug, Clone, PartialEq)]
+pub enum ModificationError {
+	/// The HRMP watermark is not allowed.
+	DisallowedHrmpWatermark(BlockNumber),
+	/// No such HRMP outbound channel.
+	NoSuchHrmpChannel(ParaId),
+	/// Too many messages submitted to HRMP channel.
+	HrmpMessagesOverflow {
+		/// The ID of the recipient.
+		para_id: ParaId,
+		/// The amount of remaining messages in the capacity of the channel.
+		messages_remaining: usize,
+		/// The amount of messages submitted to the channel.
+		messages_submitted: usize,
+	},
+	/// Too many bytes submitted to HRMP channel.
+	HrmpBytesOverflow {
+		/// The ID of the recipient.
+		para_id: ParaId,
+		/// The amount of remaining bytes in the capacity of the channel.
+		bytes_remaining: usize,
+		/// The amount of bytes submitted to the channel.
+		bytes_submitted: usize,
+	},
+	/// Too many messages submitted to UMP.
+	UmpMessagesOverflow {
+		/// The amount of remaining messages in the capacity of UMP.
+		messages_remaining: usize,
+		/// The amount of messages submitted to UMP.
+		messages_submitted: usize,
+	},
+	/// Too many bytes submitted to UMP.
+	UmpBytesOverflow {
+		/// The amount of remaining bytes in the capacity of UMP.
+		bytes_remaining: usize,
+		/// The amount of bytes submitted to UMP.
+		bytes_submitted: usize,
+	},
+	/// Too many messages processed from DMP.
+	DmpMessagesUnderflow {
+		/// The amount of messages waiting to be processed from DMP.
+		messages_remaining: usize,
+		/// The amount of messages processed.
+		messages_processed: usize,
+	},
+	/// No validation code upgrade to apply.
+	AppliedNonexistentCodeUpgrade,
+}
+
+impl Constraints {
+	/// Check modifications against constraints.
+	pub fn check_modifications(
+		&self,
+		modifications: &ConstraintModifications,
+	) -> Result<(), ModificationError> {
+		if let Some(HrmpWatermarkUpdate::Trunk(hrmp_watermark)) = modifications.hrmp_watermark {
+			// head updates are always valid.
+			if self.hrmp_inbound.valid_watermarks.iter().all(|w| w != &hrmp_watermark) {
+				return Err(ModificationError::DisallowedHrmpWatermark(hrmp_watermark))
+			}
+		}
+
+		for (id, outbound_hrmp_mod) in &modifications.outbound_hrmp {
+			if let Some(outbound) = self.hrmp_channels_out.get(&id) {
+				outbound.bytes_remaining.checked_sub(outbound_hrmp_mod.bytes_submitted).ok_or(
+					ModificationError::HrmpBytesOverflow {
+						para_id: *id,
+						bytes_remaining: outbound.bytes_remaining,
+						bytes_submitted: outbound_hrmp_mod.bytes_submitted,
+					},
+				)?;
+
+				outbound
+					.messages_remaining
+					.checked_sub(outbound_hrmp_mod.messages_submitted)
+					.ok_or(ModificationError::HrmpMessagesOverflow {
+						para_id: *id,
+						messages_remaining: outbound.messages_remaining,
+						messages_submitted: outbound_hrmp_mod.messages_submitted,
+					})?;
+			} else {
+				return Err(ModificationError::NoSuchHrmpChannel(*id))
+			}
+		}
+
+		self.ump_remaining.checked_sub(modifications.ump_messages_sent).ok_or(
+			ModificationError::UmpMessagesOverflow {
+				messages_remaining: self.ump_remaining,
+				messages_submitted: modifications.ump_messages_sent,
+			},
+		)?;
+
+		self.ump_remaining_bytes.checked_sub(modifications.ump_bytes_sent).ok_or(
+			ModificationError::UmpBytesOverflow {
+				bytes_remaining: self.ump_remaining_bytes,
+				bytes_submitted: modifications.ump_bytes_sent,
+			},
+		)?;
+
+		self.dmp_remaining_messages
+			.len()
+			.checked_sub(modifications.dmp_messages_processed)
+			.ok_or(ModificationError::DmpMessagesUnderflow {
+				messages_remaining: self.dmp_remaining_messages.len(),
+				messages_processed: modifications.dmp_messages_processed,
+			})?;
+
+		if self.future_validation_code.is_none() && modifications.code_upgrade_applied {
+			return Err(ModificationError::AppliedNonexistentCodeUpgrade)
+		}
+
+		Ok(())
+	}
+
+	/// Apply modifications to these constraints. If this succeeds, it passes
+	/// all sanity-checks.
+	pub fn apply_modifications(
+		&self,
+		modifications: &ConstraintModifications,
+	) -> Result<Self, ModificationError> {
+		let mut new = self.clone();
+
+		if let Some(required_parent) = modifications.required_parent.as_ref() {
+			new.required_parent = required_parent.clone();
+		}
+
+		if let Some(ref hrmp_watermark) = modifications.hrmp_watermark {
+			match new.hrmp_inbound.valid_watermarks.binary_search(&hrmp_watermark.watermark()) {
+				Ok(pos) => {
+					// Exact match, so this is OK in all cases.
+					let _ = new.hrmp_inbound.valid_watermarks.drain(..pos + 1);
+				},
+				Err(pos) => match hrmp_watermark {
+					HrmpWatermarkUpdate::Head(_) => {
+						// Updates to Head are always OK.
+						let _ = new.hrmp_inbound.valid_watermarks.drain(..pos);
+					},
+					HrmpWatermarkUpdate::Trunk(n) => {
+						// Trunk update landing on disallowed watermark is not OK.
+						return Err(ModificationError::DisallowedHrmpWatermark(*n))
+					},
+				},
+			}
+		}
+
+		for (id, outbound_hrmp_mod) in &modifications.outbound_hrmp {
+			if let Some(outbound) = new.hrmp_channels_out.get_mut(&id) {
+				outbound.bytes_remaining = outbound
+					.bytes_remaining
+					.checked_sub(outbound_hrmp_mod.bytes_submitted)
+					.ok_or(ModificationError::HrmpBytesOverflow {
+						para_id: *id,
+						bytes_remaining: outbound.bytes_remaining,
+						bytes_submitted: outbound_hrmp_mod.bytes_submitted,
+					})?;
+
+				outbound.messages_remaining = outbound
+					.messages_remaining
+					.checked_sub(outbound_hrmp_mod.messages_submitted)
+					.ok_or(ModificationError::HrmpMessagesOverflow {
+						para_id: *id,
+						messages_remaining: outbound.messages_remaining,
+						messages_submitted: outbound_hrmp_mod.messages_submitted,
+					})?;
+			} else {
+				return Err(ModificationError::NoSuchHrmpChannel(*id))
+			}
+		}
+
+		new.ump_remaining = new.ump_remaining.checked_sub(modifications.ump_messages_sent).ok_or(
+			ModificationError::UmpMessagesOverflow {
+				messages_remaining: new.ump_remaining,
+				messages_submitted: modifications.ump_messages_sent,
+			},
+		)?;
+
+		new.ump_remaining_bytes = new
+			.ump_remaining_bytes
+			.checked_sub(modifications.ump_bytes_sent)
+			.ok_or(ModificationError::UmpBytesOverflow {
+				bytes_remaining: new.ump_remaining_bytes,
+				bytes_submitted: modifications.ump_bytes_sent,
+			})?;
+
+		if modifications.dmp_messages_processed > new.dmp_remaining_messages.len() {
+			return Err(ModificationError::DmpMessagesUnderflow {
+				messages_remaining: new.dmp_remaining_messages.len(),
+				messages_processed: modifications.dmp_messages_processed,
+			})
+		} else {
+			new.dmp_remaining_messages =
+				new.dmp_remaining_messages[modifications.dmp_messages_processed..].to_vec();
+		}
+
+		if modifications.code_upgrade_applied {
+			new.validation_code_hash = new
+				.future_validation_code
+				.take()
+				.ok_or(ModificationError::AppliedNonexistentCodeUpgrade)?
+				.1;
+		}
+
+		Ok(new)
+	}
+}
+
+/// Information about a relay-chain block.
+#[derive(Debug, Clone, PartialEq)]
+pub struct RelayChainBlockInfo {
+	/// The hash of the relay-chain block.
+	pub hash: Hash,
+	/// The number of the relay-chain block.
+	pub number: BlockNumber,
+	/// The storage-root of the relay-chain block.
+	pub storage_root: Hash,
+}
+
+/// An update to outbound HRMP channels.
+#[derive(Debug, Clone, PartialEq, Default)]
+pub struct OutboundHrmpChannelModification {
+	/// The number of bytes submitted to the channel.
+	pub bytes_submitted: usize,
+	/// The number of messages submitted to the channel.
+	pub messages_submitted: usize,
+}
+
+/// An update to the HRMP Watermark.
+#[derive(Debug, Clone, PartialEq)]
+pub enum HrmpWatermarkUpdate {
+	/// This is an update placing the watermark at the head of the chain,
+	/// which is always legal.
+	Head(BlockNumber),
+	/// This is an update placing the watermark behind the head of the
+	/// chain, which is only legal if it lands on a block where messages
+	/// were queued.
+	Trunk(BlockNumber),
+}
+
+impl HrmpWatermarkUpdate {
+	fn watermark(&self) -> BlockNumber {
+		match *self {
+			HrmpWatermarkUpdate::Head(n) | HrmpWatermarkUpdate::Trunk(n) => n,
+		}
+	}
+}
+
+/// Modifications to constraints as a result of prospective candidates.
+#[derive(Debug, Clone, PartialEq)]
+pub struct ConstraintModifications {
+	/// The required parent head to build upon.
+	pub required_parent: Option<HeadData>,
+	/// The new HRMP watermark
+	pub hrmp_watermark: Option<HrmpWatermarkUpdate>,
+	/// Outbound HRMP channel modifications.
+	pub outbound_hrmp: HashMap<ParaId, OutboundHrmpChannelModification>,
+	/// The amount of UMP messages sent.
+	pub ump_messages_sent: usize,
+	/// The amount of UMP bytes sent.
+	pub ump_bytes_sent: usize,
+	/// The amount of DMP messages processed.
+	pub dmp_messages_processed: usize,
+	/// Whether a pending code upgrade has been applied.
+	pub code_upgrade_applied: bool,
+}
+
+impl ConstraintModifications {
+	/// The 'identity' modifications: these can be applied to
+	/// any constraints and yield the exact same result.
+	pub fn identity() -> Self {
+		ConstraintModifications {
+			required_parent: None,
+			hrmp_watermark: None,
+			outbound_hrmp: HashMap::new(),
+			ump_messages_sent: 0,
+			ump_bytes_sent: 0,
+			dmp_messages_processed: 0,
+			code_upgrade_applied: false,
+		}
+	}
+
+	/// Stack other modifications on top of these.
+	///
+	/// This does no sanity-checking, so if `other` is garbage relative
+	/// to `self`, then the new value will be garbage as well.
+	///
+	/// This is an addition which is not commutative.
+	pub fn stack(&mut self, other: &Self) {
+		if let Some(ref new_parent) = other.required_parent {
+			self.required_parent = Some(new_parent.clone());
+		}
+		if let Some(ref new_hrmp_watermark) = other.hrmp_watermark {
+			self.hrmp_watermark = Some(new_hrmp_watermark.clone());
+		}
+
+		for (id, mods) in &other.outbound_hrmp {
+			let record = self.outbound_hrmp.entry(*id).or_default();
+			record.messages_submitted += mods.messages_submitted;
+			record.bytes_submitted += mods.bytes_submitted;
+		}
+
+		self.ump_messages_sent += other.ump_messages_sent;
+		self.ump_bytes_sent += other.ump_bytes_sent;
+		self.dmp_messages_processed += other.dmp_messages_processed;
+		self.code_upgrade_applied |= other.code_upgrade_applied;
+	}
+}
+
+/// The prospective candidate.
+///
+/// This comprises the key information that represent a candidate
+/// without pinning it to a particular session. For example, everything
+/// to do with the collator's signature and commitments are represented
+/// here. But the erasure-root is not. This means that prospective candidates
+/// are not correlated to any session in particular.
+#[derive(Debug, Clone, PartialEq)]
+pub struct ProspectiveCandidate<'a> {
+	/// The commitments to the output of the execution.
+	pub commitments: Cow<'a, CandidateCommitments>,
+	/// The collator that created the candidate.
+	pub collator: CollatorId,
+	/// The signature of the collator on the payload.
+	pub collator_signature: CollatorSignature,
+	/// The persisted validation data used to create the candidate.
+	pub persisted_validation_data: PersistedValidationData,
+	/// The hash of the PoV.
+	pub pov_hash: Hash,
+	/// The validation code hash used by the candidate.
+	pub validation_code_hash: ValidationCodeHash,
+}
+
+impl<'a> ProspectiveCandidate<'a> {
+	fn into_owned(self) -> ProspectiveCandidate<'static> {
+		ProspectiveCandidate { commitments: Cow::Owned(self.commitments.into_owned()), ..self }
+	}
+
+	/// Partially clone the prospective candidate, but borrow the
+	/// parts which are potentially heavy.
+	pub fn partial_clone(&self) -> ProspectiveCandidate {
+		ProspectiveCandidate {
+			commitments: Cow::Borrowed(self.commitments.borrow()),
+			collator: self.collator.clone(),
+			collator_signature: self.collator_signature.clone(),
+			persisted_validation_data: self.persisted_validation_data.clone(),
+			pov_hash: self.pov_hash,
+			validation_code_hash: self.validation_code_hash,
+		}
+	}
+}
+
+#[cfg(test)]
+impl ProspectiveCandidate<'static> {
+	fn commitments_mut(&mut self) -> &mut CandidateCommitments {
+		self.commitments.to_mut()
+	}
+}
+
+/// Kinds of errors with the validity of a fragment.
+#[derive(Debug, Clone, PartialEq)]
+pub enum FragmentValidityError {
+	/// The validation code of the candidate doesn't match the
+	/// operating constraints.
+	///
+	/// Expected, Got
+	ValidationCodeMismatch(ValidationCodeHash, ValidationCodeHash),
+	/// The persisted-validation-data doesn't match.
+	///
+	/// Expected, Got
+	PersistedValidationDataMismatch(PersistedValidationData, PersistedValidationData),
+	/// The outputs of the candidate are invalid under the operating
+	/// constraints.
+	OutputsInvalid(ModificationError),
+	/// New validation code size too big.
+	///
+	/// Max allowed, new.
+	CodeSizeTooLarge(usize, usize),
+	/// Relay parent too old.
+	///
+	/// Min allowed, current.
+	RelayParentTooOld(BlockNumber, BlockNumber),
+	/// Para is required to process at least one DMP message from the queue.
+	DmpAdvancementRule,
+	/// Too many messages upward messages submitted.
+	UmpMessagesPerCandidateOverflow {
+		/// The amount of messages a single candidate can submit.
+		messages_allowed: usize,
+		/// The amount of messages sent to all HRMP channels.
+		messages_submitted: usize,
+	},
+	/// Too many messages submitted to all HRMP channels.
+	HrmpMessagesPerCandidateOverflow {
+		/// The amount of messages a single candidate can submit.
+		messages_allowed: usize,
+		/// The amount of messages sent to all HRMP channels.
+		messages_submitted: usize,
+	},
+	/// Code upgrade not allowed.
+	CodeUpgradeRestricted,
+	/// HRMP messages are not ascending or are duplicate.
+	///
+	/// The `usize` is the index into the outbound HRMP messages of
+	/// the candidate.
+	HrmpMessagesDescendingOrDuplicate(usize),
+}
+
+/// A parachain fragment, representing another prospective parachain block.
+///
+/// This is a type which guarantees that the candidate is valid under the
+/// operating constraints.
+#[derive(Debug, Clone, PartialEq)]
+pub struct Fragment<'a> {
+	/// The new relay-parent.
+	relay_parent: RelayChainBlockInfo,
+	/// The constraints this fragment is operating under.
+	operating_constraints: Constraints,
+	/// The core information about the prospective candidate.
+	candidate: ProspectiveCandidate<'a>,
+	/// Modifications to the constraints based on the outputs of
+	/// the candidate.
+	modifications: ConstraintModifications,
+}
+
+impl<'a> Fragment<'a> {
+	/// Create a new fragment.
+	///
+	/// This fails if the fragment isn't in line with the operating
+	/// constraints. That is, either its inputs or its outputs fail
+	/// checks against the constraints.
+	///
+	/// This doesn't check that the collator signature is valid or
+	/// whether the PoV is small enough.
+	pub fn new(
+		relay_parent: RelayChainBlockInfo,
+		operating_constraints: Constraints,
+		candidate: ProspectiveCandidate<'a>,
+	) -> Result<Self, FragmentValidityError> {
+		let modifications = {
+			let commitments = &candidate.commitments;
+			ConstraintModifications {
+				required_parent: Some(commitments.head_data.clone()),
+				hrmp_watermark: Some({
+					if commitments.hrmp_watermark == relay_parent.number {
+						HrmpWatermarkUpdate::Head(commitments.hrmp_watermark)
+					} else {
+						HrmpWatermarkUpdate::Trunk(commitments.hrmp_watermark)
+					}
+				}),
+				outbound_hrmp: {
+					let mut outbound_hrmp = HashMap::<_, OutboundHrmpChannelModification>::new();
+
+					let mut last_recipient = None::<ParaId>;
+					for (i, message) in commitments.horizontal_messages.iter().enumerate() {
+						if let Some(last) = last_recipient {
+							if last >= message.recipient {
+								return Err(
+									FragmentValidityError::HrmpMessagesDescendingOrDuplicate(i),
+								)
+							}
+						}
+
+						last_recipient = Some(message.recipient);
+						let record = outbound_hrmp.entry(message.recipient).or_default();
+
+						record.bytes_submitted += message.data.len();
+						record.messages_submitted += 1;
+					}
+
+					outbound_hrmp
+				},
+				ump_messages_sent: commitments.upward_messages.len(),
+				ump_bytes_sent: commitments.upward_messages.iter().map(|msg| msg.len()).sum(),
+				dmp_messages_processed: commitments.processed_downward_messages as _,
+				code_upgrade_applied: operating_constraints
+					.future_validation_code
+					.map_or(false, |(at, _)| relay_parent.number >= at),
+			}
+		};
+
+		validate_against_constraints(
+			&operating_constraints,
+			&relay_parent,
+			&candidate,
+			&modifications,
+		)?;
+
+		Ok(Fragment { relay_parent, operating_constraints, candidate, modifications })
+	}
+
+	/// Access the relay parent information.
+	pub fn relay_parent(&self) -> &RelayChainBlockInfo {
+		&self.relay_parent
+	}
+
+	/// Access the operating constraints
+	pub fn operating_constraints(&self) -> &Constraints {
+		&self.operating_constraints
+	}
+
+	/// Access the underlying prospective candidate.
+	pub fn candidate(&self) -> &ProspectiveCandidate<'a> {
+		&self.candidate
+	}
+
+	/// Modifications to constraints based on the outputs of the candidate.
+	pub fn constraint_modifications(&self) -> &ConstraintModifications {
+		&self.modifications
+	}
+
+	/// Convert the fragment into an owned variant.
+	pub fn into_owned(self) -> Fragment<'static> {
+		Fragment { candidate: self.candidate.into_owned(), ..self }
+	}
+
+	/// Validate this fragment against some set of constraints
+	/// instead of the operating constraints.
+	pub fn validate_against_constraints(
+		&self,
+		constraints: &Constraints,
+	) -> Result<(), FragmentValidityError> {
+		validate_against_constraints(
+			constraints,
+			&self.relay_parent,
+			&self.candidate,
+			&self.modifications,
+		)
+	}
+}
+
+fn validate_against_constraints(
+	constraints: &Constraints,
+	relay_parent: &RelayChainBlockInfo,
+	candidate: &ProspectiveCandidate,
+	modifications: &ConstraintModifications,
+) -> Result<(), FragmentValidityError> {
+	let expected_pvd = PersistedValidationData {
+		parent_head: constraints.required_parent.clone(),
+		relay_parent_number: relay_parent.number,
+		relay_parent_storage_root: relay_parent.storage_root,
+		max_pov_size: constraints.max_pov_size as u32,
+	};
+
+	if expected_pvd != candidate.persisted_validation_data {
+		return Err(FragmentValidityError::PersistedValidationDataMismatch(
+			expected_pvd,
+			candidate.persisted_validation_data.clone(),
+		))
+	}
+
+	if constraints.validation_code_hash != candidate.validation_code_hash {
+		return Err(FragmentValidityError::ValidationCodeMismatch(
+			constraints.validation_code_hash,
+			candidate.validation_code_hash,
+		))
+	}
+
+	if relay_parent.number < constraints.min_relay_parent_number {
+		return Err(FragmentValidityError::RelayParentTooOld(
+			constraints.min_relay_parent_number,
+			relay_parent.number,
+		))
+	}
+
+	if candidate.commitments.new_validation_code.is_some() {
+		match constraints.upgrade_restriction {
+			None => {},
+			Some(UpgradeRestriction::Present) =>
+				return Err(FragmentValidityError::CodeUpgradeRestricted),
+		}
+	}
+
+	let announced_code_size = candidate
+		.commitments
+		.new_validation_code
+		.as_ref()
+		.map_or(0, |code| code.0.len());
+
+	if announced_code_size > constraints.max_code_size {
+		return Err(FragmentValidityError::CodeSizeTooLarge(
+			constraints.max_code_size,
+			announced_code_size,
+		))
+	}
+
+	if modifications.dmp_messages_processed == 0 {
+		if constraints
+			.dmp_remaining_messages
+			.get(0)
+			.map_or(false, |&msg_sent_at| msg_sent_at <= relay_parent.number)
+		{
+			return Err(FragmentValidityError::DmpAdvancementRule)
+		}
+	}
+
+	if candidate.commitments.horizontal_messages.len() > constraints.max_hrmp_num_per_candidate {
+		return Err(FragmentValidityError::HrmpMessagesPerCandidateOverflow {
+			messages_allowed: constraints.max_hrmp_num_per_candidate,
+			messages_submitted: candidate.commitments.horizontal_messages.len(),
+		})
+	}
+
+	if candidate.commitments.upward_messages.len() > constraints.max_ump_num_per_candidate {
+		return Err(FragmentValidityError::UmpMessagesPerCandidateOverflow {
+			messages_allowed: constraints.max_ump_num_per_candidate,
+			messages_submitted: candidate.commitments.upward_messages.len(),
+		})
+	}
+
+	constraints
+		.check_modifications(&modifications)
+		.map_err(FragmentValidityError::OutputsInvalid)
+}
+
+#[cfg(test)]
+mod tests {
+	use super::*;
+	use polkadot_primitives::{
+		CollatorPair, HorizontalMessages, OutboundHrmpMessage, ValidationCode,
+	};
+	use sp_application_crypto::Pair;
+
+	#[test]
+	fn stack_modifications() {
+		let para_a = ParaId::from(1u32);
+		let para_b = ParaId::from(2u32);
+		let para_c = ParaId::from(3u32);
+
+		let a = ConstraintModifications {
+			required_parent: None,
+			hrmp_watermark: None,
+			outbound_hrmp: {
+				let mut map = HashMap::new();
+				map.insert(
+					para_a,
+					OutboundHrmpChannelModification { bytes_submitted: 100, messages_submitted: 5 },
+				);
+
+				map.insert(
+					para_b,
+					OutboundHrmpChannelModification { bytes_submitted: 100, messages_submitted: 5 },
+				);
+
+				map
+			},
+			ump_messages_sent: 6,
+			ump_bytes_sent: 1000,
+			dmp_messages_processed: 5,
+			code_upgrade_applied: true,
+		};
+
+		let b = ConstraintModifications {
+			required_parent: None,
+			hrmp_watermark: None,
+			outbound_hrmp: {
+				let mut map = HashMap::new();
+				map.insert(
+					para_b,
+					OutboundHrmpChannelModification { bytes_submitted: 100, messages_submitted: 5 },
+				);
+
+				map.insert(
+					para_c,
+					OutboundHrmpChannelModification { bytes_submitted: 100, messages_submitted: 5 },
+				);
+
+				map
+			},
+			ump_messages_sent: 6,
+			ump_bytes_sent: 1000,
+			dmp_messages_processed: 5,
+			code_upgrade_applied: true,
+		};
+
+		let mut c = a.clone();
+		c.stack(&b);
+
+		assert_eq!(
+			c,
+			ConstraintModifications {
+				required_parent: None,
+				hrmp_watermark: None,
+				outbound_hrmp: {
+					let mut map = HashMap::new();
+					map.insert(
+						para_a,
+						OutboundHrmpChannelModification {
+							bytes_submitted: 100,
+							messages_submitted: 5,
+						},
+					);
+
+					map.insert(
+						para_b,
+						OutboundHrmpChannelModification {
+							bytes_submitted: 200,
+							messages_submitted: 10,
+						},
+					);
+
+					map.insert(
+						para_c,
+						OutboundHrmpChannelModification {
+							bytes_submitted: 100,
+							messages_submitted: 5,
+						},
+					);
+
+					map
+				},
+				ump_messages_sent: 12,
+				ump_bytes_sent: 2000,
+				dmp_messages_processed: 10,
+				code_upgrade_applied: true,
+			},
+		);
+
+		let mut d = ConstraintModifications::identity();
+		d.stack(&a);
+		d.stack(&b);
+
+		assert_eq!(c, d);
+	}
+
+	fn make_constraints() -> Constraints {
+		let para_a = ParaId::from(1u32);
+		let para_b = ParaId::from(2u32);
+		let para_c = ParaId::from(3u32);
+
+		Constraints {
+			min_relay_parent_number: 5,
+			max_pov_size: 1000,
+			max_code_size: 1000,
+			ump_remaining: 10,
+			ump_remaining_bytes: 1024,
+			max_ump_num_per_candidate: 5,
+			dmp_remaining_messages: Vec::new(),
+			hrmp_inbound: InboundHrmpLimitations { valid_watermarks: vec![6, 8] },
+			hrmp_channels_out: {
+				let mut map = HashMap::new();
+
+				map.insert(
+					para_a,
+					OutboundHrmpChannelLimitations { messages_remaining: 5, bytes_remaining: 512 },
+				);
+
+				map.insert(
+					para_b,
+					OutboundHrmpChannelLimitations {
+						messages_remaining: 10,
+						bytes_remaining: 1024,
+					},
+				);
+
+				map.insert(
+					para_c,
+					OutboundHrmpChannelLimitations { messages_remaining: 1, bytes_remaining: 128 },
+				);
+
+				map
+			},
+			max_hrmp_num_per_candidate: 5,
+			required_parent: HeadData::from(vec![1, 2, 3]),
+			validation_code_hash: ValidationCode(vec![4, 5, 6]).hash(),
+			upgrade_restriction: None,
+			future_validation_code: None,
+		}
+	}
+
+	#[test]
+	fn constraints_disallowed_trunk_watermark() {
+		let constraints = make_constraints();
+		let mut modifications = ConstraintModifications::identity();
+		modifications.hrmp_watermark = Some(HrmpWatermarkUpdate::Trunk(7));
+
+		assert_eq!(
+			constraints.check_modifications(&modifications),
+			Err(ModificationError::DisallowedHrmpWatermark(7)),
+		);
+
+		assert_eq!(
+			constraints.apply_modifications(&modifications),
+			Err(ModificationError::DisallowedHrmpWatermark(7)),
+		);
+	}
+
+	#[test]
+	fn constraints_always_allow_head_watermark() {
+		let constraints = make_constraints();
+		let mut modifications = ConstraintModifications::identity();
+		modifications.hrmp_watermark = Some(HrmpWatermarkUpdate::Head(7));
+
+		assert!(constraints.check_modifications(&modifications).is_ok());
+
+		let new_constraints = constraints.apply_modifications(&modifications).unwrap();
+		assert_eq!(new_constraints.hrmp_inbound.valid_watermarks, vec![8]);
+	}
+
+	#[test]
+	fn constraints_no_such_hrmp_channel() {
+		let constraints = make_constraints();
+		let mut modifications = ConstraintModifications::identity();
+		let bad_para = ParaId::from(100u32);
+		modifications.outbound_hrmp.insert(
+			bad_para,
+			OutboundHrmpChannelModification { bytes_submitted: 0, messages_submitted: 0 },
+		);
+
+		assert_eq!(
+			constraints.check_modifications(&modifications),
+			Err(ModificationError::NoSuchHrmpChannel(bad_para)),
+		);
+
+		assert_eq!(
+			constraints.apply_modifications(&modifications),
+			Err(ModificationError::NoSuchHrmpChannel(bad_para)),
+		);
+	}
+
+	#[test]
+	fn constraints_hrmp_messages_overflow() {
+		let constraints = make_constraints();
+		let mut modifications = ConstraintModifications::identity();
+		let para_a = ParaId::from(1u32);
+		modifications.outbound_hrmp.insert(
+			para_a,
+			OutboundHrmpChannelModification { bytes_submitted: 0, messages_submitted: 6 },
+		);
+
+		assert_eq!(
+			constraints.check_modifications(&modifications),
+			Err(ModificationError::HrmpMessagesOverflow {
+				para_id: para_a,
+				messages_remaining: 5,
+				messages_submitted: 6,
+			}),
+		);
+
+		assert_eq!(
+			constraints.apply_modifications(&modifications),
+			Err(ModificationError::HrmpMessagesOverflow {
+				para_id: para_a,
+				messages_remaining: 5,
+				messages_submitted: 6,
+			}),
+		);
+	}
+
+	#[test]
+	fn constraints_hrmp_bytes_overflow() {
+		let constraints = make_constraints();
+		let mut modifications = ConstraintModifications::identity();
+		let para_a = ParaId::from(1u32);
+		modifications.outbound_hrmp.insert(
+			para_a,
+			OutboundHrmpChannelModification { bytes_submitted: 513, messages_submitted: 1 },
+		);
+
+		assert_eq!(
+			constraints.check_modifications(&modifications),
+			Err(ModificationError::HrmpBytesOverflow {
+				para_id: para_a,
+				bytes_remaining: 512,
+				bytes_submitted: 513,
+			}),
+		);
+
+		assert_eq!(
+			constraints.apply_modifications(&modifications),
+			Err(ModificationError::HrmpBytesOverflow {
+				para_id: para_a,
+				bytes_remaining: 512,
+				bytes_submitted: 513,
+			}),
+		);
+	}
+
+	#[test]
+	fn constraints_ump_messages_overflow() {
+		let constraints = make_constraints();
+		let mut modifications = ConstraintModifications::identity();
+		modifications.ump_messages_sent = 11;
+
+		assert_eq!(
+			constraints.check_modifications(&modifications),
+			Err(ModificationError::UmpMessagesOverflow {
+				messages_remaining: 10,
+				messages_submitted: 11,
+			}),
+		);
+
+		assert_eq!(
+			constraints.apply_modifications(&modifications),
+			Err(ModificationError::UmpMessagesOverflow {
+				messages_remaining: 10,
+				messages_submitted: 11,
+			}),
+		);
+	}
+
+	#[test]
+	fn constraints_ump_bytes_overflow() {
+		let constraints = make_constraints();
+		let mut modifications = ConstraintModifications::identity();
+		modifications.ump_bytes_sent = 1025;
+
+		assert_eq!(
+			constraints.check_modifications(&modifications),
+			Err(ModificationError::UmpBytesOverflow {
+				bytes_remaining: 1024,
+				bytes_submitted: 1025,
+			}),
+		);
+
+		assert_eq!(
+			constraints.apply_modifications(&modifications),
+			Err(ModificationError::UmpBytesOverflow {
+				bytes_remaining: 1024,
+				bytes_submitted: 1025,
+			}),
+		);
+	}
+
+	#[test]
+	fn constraints_dmp_messages() {
+		let mut constraints = make_constraints();
+		let mut modifications = ConstraintModifications::identity();
+		assert!(constraints.check_modifications(&modifications).is_ok());
+		assert!(constraints.apply_modifications(&modifications).is_ok());
+
+		modifications.dmp_messages_processed = 6;
+
+		assert_eq!(
+			constraints.check_modifications(&modifications),
+			Err(ModificationError::DmpMessagesUnderflow {
+				messages_remaining: 0,
+				messages_processed: 6,
+			}),
+		);
+
+		assert_eq!(
+			constraints.apply_modifications(&modifications),
+			Err(ModificationError::DmpMessagesUnderflow {
+				messages_remaining: 0,
+				messages_processed: 6,
+			}),
+		);
+
+		constraints.dmp_remaining_messages = vec![1, 4, 8, 10];
+		modifications.dmp_messages_processed = 2;
+		assert!(constraints.check_modifications(&modifications).is_ok());
+		let constraints = constraints
+			.apply_modifications(&modifications)
+			.expect("modifications are valid");
+
+		assert_eq!(&constraints.dmp_remaining_messages, &[8, 10]);
+	}
+
+	#[test]
+	fn constraints_nonexistent_code_upgrade() {
+		let constraints = make_constraints();
+		let mut modifications = ConstraintModifications::identity();
+		modifications.code_upgrade_applied = true;
+
+		assert_eq!(
+			constraints.check_modifications(&modifications),
+			Err(ModificationError::AppliedNonexistentCodeUpgrade),
+		);
+
+		assert_eq!(
+			constraints.apply_modifications(&modifications),
+			Err(ModificationError::AppliedNonexistentCodeUpgrade),
+		);
+	}
+
+	fn make_candidate(
+		constraints: &Constraints,
+		relay_parent: &RelayChainBlockInfo,
+	) -> ProspectiveCandidate<'static> {
+		let collator_pair = CollatorPair::generate().0;
+		let collator = collator_pair.public();
+
+		let sig = collator_pair.sign(b"blabla".as_slice());
+
+		ProspectiveCandidate {
+			commitments: Cow::Owned(CandidateCommitments {
+				upward_messages: Default::default(),
+				horizontal_messages: Default::default(),
+				new_validation_code: None,
+				head_data: HeadData::from(vec![1, 2, 3, 4, 5]),
+				processed_downward_messages: 0,
+				hrmp_watermark: relay_parent.number,
+			}),
+			collator,
+			collator_signature: sig,
+			persisted_validation_data: PersistedValidationData {
+				parent_head: constraints.required_parent.clone(),
+				relay_parent_number: relay_parent.number,
+				relay_parent_storage_root: relay_parent.storage_root,
+				max_pov_size: constraints.max_pov_size as u32,
+			},
+			pov_hash: Hash::repeat_byte(1),
+			validation_code_hash: constraints.validation_code_hash,
+		}
+	}
+
+	#[test]
+	fn fragment_validation_code_mismatch() {
+		let relay_parent = RelayChainBlockInfo {
+			number: 6,
+			hash: Hash::repeat_byte(0x0a),
+			storage_root: Hash::repeat_byte(0xff),
+		};
+
+		let constraints = make_constraints();
+		let mut candidate = make_candidate(&constraints, &relay_parent);
+
+		let expected_code = constraints.validation_code_hash;
+		let got_code = ValidationCode(vec![9, 9, 9]).hash();
+
+		candidate.validation_code_hash = got_code;
+
+		assert_eq!(
+			Fragment::new(relay_parent, constraints, candidate),
+			Err(FragmentValidityError::ValidationCodeMismatch(expected_code, got_code,)),
+		)
+	}
+
+	#[test]
+	fn fragment_pvd_mismatch() {
+		let relay_parent = RelayChainBlockInfo {
+			number: 6,
+			hash: Hash::repeat_byte(0x0a),
+			storage_root: Hash::repeat_byte(0xff),
+		};
+
+		let relay_parent_b = RelayChainBlockInfo {
+			number: 6,
+			hash: Hash::repeat_byte(0x0b),
+			storage_root: Hash::repeat_byte(0xee),
+		};
+
+		let constraints = make_constraints();
+		let candidate = make_candidate(&constraints, &relay_parent);
+
+		let expected_pvd = PersistedValidationData {
+			parent_head: constraints.required_parent.clone(),
+			relay_parent_number: relay_parent_b.number,
+			relay_parent_storage_root: relay_parent_b.storage_root,
+			max_pov_size: constraints.max_pov_size as u32,
+		};
+
+		let got_pvd = candidate.persisted_validation_data.clone();
+
+		assert_eq!(
+			Fragment::new(relay_parent_b, constraints, candidate),
+			Err(FragmentValidityError::PersistedValidationDataMismatch(expected_pvd, got_pvd,)),
+		);
+	}
+
+	#[test]
+	fn fragment_code_size_too_large() {
+		let relay_parent = RelayChainBlockInfo {
+			number: 6,
+			hash: Hash::repeat_byte(0x0a),
+			storage_root: Hash::repeat_byte(0xff),
+		};
+
+		let constraints = make_constraints();
+		let mut candidate = make_candidate(&constraints, &relay_parent);
+
+		let max_code_size = constraints.max_code_size;
+		candidate.commitments_mut().new_validation_code = Some(vec![0; max_code_size + 1].into());
+
+		assert_eq!(
+			Fragment::new(relay_parent, constraints, candidate),
+			Err(FragmentValidityError::CodeSizeTooLarge(max_code_size, max_code_size + 1,)),
+		);
+	}
+
+	#[test]
+	fn fragment_relay_parent_too_old() {
+		let relay_parent = RelayChainBlockInfo {
+			number: 3,
+			hash: Hash::repeat_byte(0x0a),
+			storage_root: Hash::repeat_byte(0xff),
+		};
+
+		let constraints = make_constraints();
+		let candidate = make_candidate(&constraints, &relay_parent);
+
+		assert_eq!(
+			Fragment::new(relay_parent, constraints, candidate),
+			Err(FragmentValidityError::RelayParentTooOld(5, 3,)),
+		);
+	}
+
+	#[test]
+	fn fragment_hrmp_messages_overflow() {
+		let relay_parent = RelayChainBlockInfo {
+			number: 6,
+			hash: Hash::repeat_byte(0x0a),
+			storage_root: Hash::repeat_byte(0xff),
+		};
+
+		let constraints = make_constraints();
+		let mut candidate = make_candidate(&constraints, &relay_parent);
+
+		let max_hrmp = constraints.max_hrmp_num_per_candidate;
+
+		candidate
+			.commitments_mut()
+			.horizontal_messages
+			.try_extend((0..max_hrmp + 1).map(|i| OutboundHrmpMessage {
+				recipient: ParaId::from(i as u32),
+				data: vec![1, 2, 3],
+			}))
+			.unwrap();
+
+		assert_eq!(
+			Fragment::new(relay_parent, constraints, candidate),
+			Err(FragmentValidityError::HrmpMessagesPerCandidateOverflow {
+				messages_allowed: max_hrmp,
+				messages_submitted: max_hrmp + 1,
+			}),
+		);
+	}
+
+	#[test]
+	fn fragment_dmp_advancement_rule() {
+		let relay_parent = RelayChainBlockInfo {
+			number: 6,
+			hash: Hash::repeat_byte(0x0a),
+			storage_root: Hash::repeat_byte(0xff),
+		};
+
+		let mut constraints = make_constraints();
+		let mut candidate = make_candidate(&constraints, &relay_parent);
+
+		// Empty dmp queue is ok.
+		assert!(Fragment::new(relay_parent.clone(), constraints.clone(), candidate.clone()).is_ok());
+		// Unprocessed message that was sent later is ok.
+		constraints.dmp_remaining_messages = vec![relay_parent.number + 1];
+		assert!(Fragment::new(relay_parent.clone(), constraints.clone(), candidate.clone()).is_ok());
+
+		for block_number in 0..=relay_parent.number {
+			constraints.dmp_remaining_messages = vec![block_number];
+
+			assert_eq!(
+				Fragment::new(relay_parent.clone(), constraints.clone(), candidate.clone()),
+				Err(FragmentValidityError::DmpAdvancementRule),
+			);
+		}
+
+		candidate.commitments.to_mut().processed_downward_messages = 1;
+		assert!(Fragment::new(relay_parent, constraints, candidate).is_ok());
+	}
+
+	#[test]
+	fn fragment_ump_messages_overflow() {
+		let relay_parent = RelayChainBlockInfo {
+			number: 6,
+			hash: Hash::repeat_byte(0x0a),
+			storage_root: Hash::repeat_byte(0xff),
+		};
+
+		let constraints = make_constraints();
+		let mut candidate = make_candidate(&constraints, &relay_parent);
+
+		let max_ump = constraints.max_ump_num_per_candidate;
+
+		candidate
+			.commitments
+			.to_mut()
+			.upward_messages
+			.try_extend((0..max_ump + 1).map(|i| vec![i as u8]))
+			.unwrap();
+
+		assert_eq!(
+			Fragment::new(relay_parent, constraints, candidate),
+			Err(FragmentValidityError::UmpMessagesPerCandidateOverflow {
+				messages_allowed: max_ump,
+				messages_submitted: max_ump + 1,
+			}),
+		);
+	}
+
+	#[test]
+	fn fragment_code_upgrade_restricted() {
+		let relay_parent = RelayChainBlockInfo {
+			number: 6,
+			hash: Hash::repeat_byte(0x0a),
+			storage_root: Hash::repeat_byte(0xff),
+		};
+
+		let mut constraints = make_constraints();
+		let mut candidate = make_candidate(&constraints, &relay_parent);
+
+		constraints.upgrade_restriction = Some(UpgradeRestriction::Present);
+		candidate.commitments_mut().new_validation_code = Some(ValidationCode(vec![1, 2, 3]));
+
+		assert_eq!(
+			Fragment::new(relay_parent, constraints, candidate),
+			Err(FragmentValidityError::CodeUpgradeRestricted),
+		);
+	}
+
+	#[test]
+	fn fragment_hrmp_messages_descending_or_duplicate() {
+		let relay_parent = RelayChainBlockInfo {
+			number: 6,
+			hash: Hash::repeat_byte(0x0a),
+			storage_root: Hash::repeat_byte(0xff),
+		};
+
+		let constraints = make_constraints();
+		let mut candidate = make_candidate(&constraints, &relay_parent);
+
+		candidate.commitments_mut().horizontal_messages = HorizontalMessages::truncate_from(vec![
+			OutboundHrmpMessage { recipient: ParaId::from(0 as u32), data: vec![1, 2, 3] },
+			OutboundHrmpMessage { recipient: ParaId::from(0 as u32), data: vec![4, 5, 6] },
+		]);
+
+		assert_eq!(
+			Fragment::new(relay_parent.clone(), constraints.clone(), candidate.clone()),
+			Err(FragmentValidityError::HrmpMessagesDescendingOrDuplicate(1)),
+		);
+
+		candidate.commitments_mut().horizontal_messages = HorizontalMessages::truncate_from(vec![
+			OutboundHrmpMessage { recipient: ParaId::from(1 as u32), data: vec![1, 2, 3] },
+			OutboundHrmpMessage { recipient: ParaId::from(0 as u32), data: vec![4, 5, 6] },
+		]);
+
+		assert_eq!(
+			Fragment::new(relay_parent, constraints, candidate),
+			Err(FragmentValidityError::HrmpMessagesDescendingOrDuplicate(1)),
+		);
+	}
+}
diff --git a/polkadot/node/subsystem-util/src/inclusion_emulator/staging.rs b/polkadot/node/subsystem-util/src/inclusion_emulator/staging.rs
deleted file mode 100644
index a4b85775981d952dddb56fddaf0f9115771ef431..0000000000000000000000000000000000000000
--- a/polkadot/node/subsystem-util/src/inclusion_emulator/staging.rs
+++ /dev/null
@@ -1,1450 +0,0 @@
-// Copyright 2017-2022 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.
-
-//! The implementation of the inclusion emulator for the 'staging' runtime version.
-//!
-//! # Overview
-//!
-//! A set of utilities for node-side code to emulate the logic the runtime uses for checking
-//! parachain blocks in order to build prospective parachains that are produced ahead of the
-//! relay chain. These utilities allow the node-side to predict, with high accuracy, what
-//! the relay-chain will accept in the near future.
-//!
-//! This module has 2 key data types: [`Constraints`] and [`Fragment`]s. [`Constraints`]
-//! exhaustively define the set of valid inputs and outputs to parachain execution. A [`Fragment`]
-//! indicates a parachain block, anchored to the relay-chain at a particular relay-chain block,
-//! known as the relay-parent.
-//!
-//! ## Fragment Validity
-//!
-//! Every relay-parent is implicitly associated with a unique set of [`Constraints`] that describe
-//! the properties that must be true for a block to be included in a direct child of that block,
-//! assuming there is no intermediate parachain block pending availability.
-//!
-//! However, the key factor that makes asynchronously-grown prospective chains
-//! possible is the fact that the relay-chain accepts candidate blocks based on whether they
-//! are valid under the constraints of the present moment, not based on whether they were
-//! valid at the time of construction.
-//!
-//! As such, [`Fragment`]s are often, but not always constructed in such a way that they are
-//! invalid at first and become valid later on, as the relay chain grows.
-//!
-//! # Usage
-//!
-//! It's expected that the users of this module will be building up trees of
-//! [`Fragment`]s and consistently pruning and adding to the tree.
-//!
-//! ## Operating Constraints
-//!
-//! The *operating constraints* of a `Fragment` are the constraints with which that fragment
-//! was intended to comply. The operating constraints are defined as the base constraints
-//! of the relay-parent of the fragment modified by the cumulative modifications of all
-//! fragments between the relay-parent and the current fragment.
-//!
-//! What the operating constraints are, in practice, is a prediction about the state of the
-//! relay-chain in the future. The relay-chain is aware of some current state, and we want to
-//! make an intelligent prediction about what might be accepted in the future based on
-//! prior fragments that also exist off-chain.
-//!
-//! ## Fragment Trees
-//!
-//! As the relay-chain grows, some predictions come true and others come false.
-//! And new predictions get made. These three changes correspond distinctly to the
-//! 3 primary operations on fragment trees.
-//!
-//! A fragment tree is a mental model for thinking about a forking series of predictions
-//! about a single parachain. There may be one or more fragment trees per parachain.
-//!
-//! In expectation, most parachains will have a plausibly-unique authorship method which means that
-//! they should really be much closer to fragment-chains, maybe with an occasional fork.
-//!
-//! Avoiding fragment-tree blowup is beyond the scope of this module.
-//!
-//! ### Pruning Fragment Trees
-//!
-//! When the relay-chain advances, we want to compare the new constraints of that relay-parent to
-//! the roots of the fragment trees we have. There are 3 cases:
-//!
-//! 1. The root fragment is still valid under the new constraints. In this case, we do nothing. This
-//! is the "prediction still uncertain" case.
-//!
-//! 2. The root fragment is invalid under the new constraints because it has been subsumed by the
-//! relay-chain. In this case, we can discard the root and split & re-root the fragment tree under
-//! its descendents and compare to the new constraints again. This is the "prediction came true"
-//! case.
-//!
-//! 3. The root fragment is invalid under the new constraints because a competing parachain block
-//! has been included or it would never be accepted for some other reason. In this case we can
-//! discard the entire fragment tree. This is the "prediction came false" case.
-//!
-//! This is all a bit of a simplification because it assumes that the relay-chain advances without
-//! forks and is finalized instantly. In practice, the set of fragment-trees needs to be observable
-//! from the perspective of a few different possible forks of the relay-chain and not pruned
-//! too eagerly.
-//!
-//! Note that the fragments themselves don't need to change and the only thing we care about
-//! is whether the predictions they represent are still valid.
-//!
-//! ### Extending Fragment Trees
-//!
-//! As predictions fade into the past, new ones should be stacked on top.
-//!
-//! Every new relay-chain block is an opportunity to make a new prediction about the future.
-//! Higher-level logic should select the leaves of the fragment-trees to build upon or whether
-//! to create a new fragment-tree.
-//!
-//! ### Code Upgrades
-//!
-//! Code upgrades are the main place where this emulation fails. The on-chain PVF upgrade scheduling
-//! logic is very path-dependent and intricate so we just assume that code upgrades
-//! can't be initiated and applied within a single fragment-tree. Fragment-trees aren't deep,
-//! in practice and code upgrades are fairly rare. So what's likely to happen around code
-//! upgrades is that the entire fragment-tree has to get discarded at some point.
-//!
-//! That means a few blocks of execution time lost, which is not a big deal for code upgrades
-//! in practice at most once every few weeks.
-
-use polkadot_primitives::vstaging::{
-	BlockNumber, CandidateCommitments, CollatorId, CollatorSignature,
-	Constraints as PrimitiveConstraints, Hash, HeadData, Id as ParaId, PersistedValidationData,
-	UpgradeRestriction, ValidationCodeHash,
-};
-use std::{
-	borrow::{Borrow, Cow},
-	collections::HashMap,
-};
-
-/// Constraints on inbound HRMP channels.
-#[derive(Debug, Clone, PartialEq)]
-pub struct InboundHrmpLimitations {
-	/// An exhaustive set of all valid watermarks, sorted ascending
-	pub valid_watermarks: Vec<BlockNumber>,
-}
-
-/// Constraints on outbound HRMP channels.
-#[derive(Debug, Clone, PartialEq)]
-pub struct OutboundHrmpChannelLimitations {
-	/// The maximum bytes that can be written to the channel.
-	pub bytes_remaining: usize,
-	/// The maximum messages that can be written to the channel.
-	pub messages_remaining: usize,
-}
-
-/// Constraints on the actions that can be taken by a new parachain
-/// block. These limitations are implicitly associated with some particular
-/// parachain, which should be apparent from usage.
-#[derive(Debug, Clone, PartialEq)]
-pub struct Constraints {
-	/// The minimum relay-parent number accepted under these constraints.
-	pub min_relay_parent_number: BlockNumber,
-	/// The maximum Proof-of-Validity size allowed, in bytes.
-	pub max_pov_size: usize,
-	/// The maximum new validation code size allowed, in bytes.
-	pub max_code_size: usize,
-	/// The amount of UMP messages remaining.
-	pub ump_remaining: usize,
-	/// The amount of UMP bytes remaining.
-	pub ump_remaining_bytes: usize,
-	/// The maximum number of UMP messages allowed per candidate.
-	pub max_ump_num_per_candidate: usize,
-	/// Remaining DMP queue. Only includes sent-at block numbers.
-	pub dmp_remaining_messages: Vec<BlockNumber>,
-	/// The limitations of all registered inbound HRMP channels.
-	pub hrmp_inbound: InboundHrmpLimitations,
-	/// The limitations of all registered outbound HRMP channels.
-	pub hrmp_channels_out: HashMap<ParaId, OutboundHrmpChannelLimitations>,
-	/// The maximum number of HRMP messages allowed per candidate.
-	pub max_hrmp_num_per_candidate: usize,
-	/// The required parent head-data of the parachain.
-	pub required_parent: HeadData,
-	/// The expected validation-code-hash of this parachain.
-	pub validation_code_hash: ValidationCodeHash,
-	/// The code upgrade restriction signal as-of this parachain.
-	pub upgrade_restriction: Option<UpgradeRestriction>,
-	/// The future validation code hash, if any, and at what relay-parent
-	/// number the upgrade would be minimally applied.
-	pub future_validation_code: Option<(BlockNumber, ValidationCodeHash)>,
-}
-
-impl From<PrimitiveConstraints> for Constraints {
-	fn from(c: PrimitiveConstraints) -> Self {
-		Constraints {
-			min_relay_parent_number: c.min_relay_parent_number,
-			max_pov_size: c.max_pov_size as _,
-			max_code_size: c.max_code_size as _,
-			ump_remaining: c.ump_remaining as _,
-			ump_remaining_bytes: c.ump_remaining_bytes as _,
-			max_ump_num_per_candidate: c.max_ump_num_per_candidate as _,
-			dmp_remaining_messages: c.dmp_remaining_messages,
-			hrmp_inbound: InboundHrmpLimitations {
-				valid_watermarks: c.hrmp_inbound.valid_watermarks,
-			},
-			hrmp_channels_out: c
-				.hrmp_channels_out
-				.into_iter()
-				.map(|(para_id, limits)| {
-					(
-						para_id,
-						OutboundHrmpChannelLimitations {
-							bytes_remaining: limits.bytes_remaining as _,
-							messages_remaining: limits.messages_remaining as _,
-						},
-					)
-				})
-				.collect(),
-			max_hrmp_num_per_candidate: c.max_hrmp_num_per_candidate as _,
-			required_parent: c.required_parent,
-			validation_code_hash: c.validation_code_hash,
-			upgrade_restriction: c.upgrade_restriction,
-			future_validation_code: c.future_validation_code,
-		}
-	}
-}
-
-/// Kinds of errors that can occur when modifying constraints.
-#[derive(Debug, Clone, PartialEq)]
-pub enum ModificationError {
-	/// The HRMP watermark is not allowed.
-	DisallowedHrmpWatermark(BlockNumber),
-	/// No such HRMP outbound channel.
-	NoSuchHrmpChannel(ParaId),
-	/// Too many messages submitted to HRMP channel.
-	HrmpMessagesOverflow {
-		/// The ID of the recipient.
-		para_id: ParaId,
-		/// The amount of remaining messages in the capacity of the channel.
-		messages_remaining: usize,
-		/// The amount of messages submitted to the channel.
-		messages_submitted: usize,
-	},
-	/// Too many bytes submitted to HRMP channel.
-	HrmpBytesOverflow {
-		/// The ID of the recipient.
-		para_id: ParaId,
-		/// The amount of remaining bytes in the capacity of the channel.
-		bytes_remaining: usize,
-		/// The amount of bytes submitted to the channel.
-		bytes_submitted: usize,
-	},
-	/// Too many messages submitted to UMP.
-	UmpMessagesOverflow {
-		/// The amount of remaining messages in the capacity of UMP.
-		messages_remaining: usize,
-		/// The amount of messages submitted to UMP.
-		messages_submitted: usize,
-	},
-	/// Too many bytes submitted to UMP.
-	UmpBytesOverflow {
-		/// The amount of remaining bytes in the capacity of UMP.
-		bytes_remaining: usize,
-		/// The amount of bytes submitted to UMP.
-		bytes_submitted: usize,
-	},
-	/// Too many messages processed from DMP.
-	DmpMessagesUnderflow {
-		/// The amount of messages waiting to be processed from DMP.
-		messages_remaining: usize,
-		/// The amount of messages processed.
-		messages_processed: usize,
-	},
-	/// No validation code upgrade to apply.
-	AppliedNonexistentCodeUpgrade,
-}
-
-impl Constraints {
-	/// Check modifications against constraints.
-	pub fn check_modifications(
-		&self,
-		modifications: &ConstraintModifications,
-	) -> Result<(), ModificationError> {
-		if let Some(HrmpWatermarkUpdate::Trunk(hrmp_watermark)) = modifications.hrmp_watermark {
-			// head updates are always valid.
-			if self.hrmp_inbound.valid_watermarks.iter().all(|w| w != &hrmp_watermark) {
-				return Err(ModificationError::DisallowedHrmpWatermark(hrmp_watermark))
-			}
-		}
-
-		for (id, outbound_hrmp_mod) in &modifications.outbound_hrmp {
-			if let Some(outbound) = self.hrmp_channels_out.get(&id) {
-				outbound.bytes_remaining.checked_sub(outbound_hrmp_mod.bytes_submitted).ok_or(
-					ModificationError::HrmpBytesOverflow {
-						para_id: *id,
-						bytes_remaining: outbound.bytes_remaining,
-						bytes_submitted: outbound_hrmp_mod.bytes_submitted,
-					},
-				)?;
-
-				outbound
-					.messages_remaining
-					.checked_sub(outbound_hrmp_mod.messages_submitted)
-					.ok_or(ModificationError::HrmpMessagesOverflow {
-						para_id: *id,
-						messages_remaining: outbound.messages_remaining,
-						messages_submitted: outbound_hrmp_mod.messages_submitted,
-					})?;
-			} else {
-				return Err(ModificationError::NoSuchHrmpChannel(*id))
-			}
-		}
-
-		self.ump_remaining.checked_sub(modifications.ump_messages_sent).ok_or(
-			ModificationError::UmpMessagesOverflow {
-				messages_remaining: self.ump_remaining,
-				messages_submitted: modifications.ump_messages_sent,
-			},
-		)?;
-
-		self.ump_remaining_bytes.checked_sub(modifications.ump_bytes_sent).ok_or(
-			ModificationError::UmpBytesOverflow {
-				bytes_remaining: self.ump_remaining_bytes,
-				bytes_submitted: modifications.ump_bytes_sent,
-			},
-		)?;
-
-		self.dmp_remaining_messages
-			.len()
-			.checked_sub(modifications.dmp_messages_processed)
-			.ok_or(ModificationError::DmpMessagesUnderflow {
-				messages_remaining: self.dmp_remaining_messages.len(),
-				messages_processed: modifications.dmp_messages_processed,
-			})?;
-
-		if self.future_validation_code.is_none() && modifications.code_upgrade_applied {
-			return Err(ModificationError::AppliedNonexistentCodeUpgrade)
-		}
-
-		Ok(())
-	}
-
-	/// Apply modifications to these constraints. If this succeeds, it passes
-	/// all sanity-checks.
-	pub fn apply_modifications(
-		&self,
-		modifications: &ConstraintModifications,
-	) -> Result<Self, ModificationError> {
-		let mut new = self.clone();
-
-		if let Some(required_parent) = modifications.required_parent.as_ref() {
-			new.required_parent = required_parent.clone();
-		}
-
-		if let Some(ref hrmp_watermark) = modifications.hrmp_watermark {
-			match new.hrmp_inbound.valid_watermarks.binary_search(&hrmp_watermark.watermark()) {
-				Ok(pos) => {
-					// Exact match, so this is OK in all cases.
-					let _ = new.hrmp_inbound.valid_watermarks.drain(..pos + 1);
-				},
-				Err(pos) => match hrmp_watermark {
-					HrmpWatermarkUpdate::Head(_) => {
-						// Updates to Head are always OK.
-						let _ = new.hrmp_inbound.valid_watermarks.drain(..pos);
-					},
-					HrmpWatermarkUpdate::Trunk(n) => {
-						// Trunk update landing on disallowed watermark is not OK.
-						return Err(ModificationError::DisallowedHrmpWatermark(*n))
-					},
-				},
-			}
-		}
-
-		for (id, outbound_hrmp_mod) in &modifications.outbound_hrmp {
-			if let Some(outbound) = new.hrmp_channels_out.get_mut(&id) {
-				outbound.bytes_remaining = outbound
-					.bytes_remaining
-					.checked_sub(outbound_hrmp_mod.bytes_submitted)
-					.ok_or(ModificationError::HrmpBytesOverflow {
-						para_id: *id,
-						bytes_remaining: outbound.bytes_remaining,
-						bytes_submitted: outbound_hrmp_mod.bytes_submitted,
-					})?;
-
-				outbound.messages_remaining = outbound
-					.messages_remaining
-					.checked_sub(outbound_hrmp_mod.messages_submitted)
-					.ok_or(ModificationError::HrmpMessagesOverflow {
-						para_id: *id,
-						messages_remaining: outbound.messages_remaining,
-						messages_submitted: outbound_hrmp_mod.messages_submitted,
-					})?;
-			} else {
-				return Err(ModificationError::NoSuchHrmpChannel(*id))
-			}
-		}
-
-		new.ump_remaining = new.ump_remaining.checked_sub(modifications.ump_messages_sent).ok_or(
-			ModificationError::UmpMessagesOverflow {
-				messages_remaining: new.ump_remaining,
-				messages_submitted: modifications.ump_messages_sent,
-			},
-		)?;
-
-		new.ump_remaining_bytes = new
-			.ump_remaining_bytes
-			.checked_sub(modifications.ump_bytes_sent)
-			.ok_or(ModificationError::UmpBytesOverflow {
-				bytes_remaining: new.ump_remaining_bytes,
-				bytes_submitted: modifications.ump_bytes_sent,
-			})?;
-
-		if modifications.dmp_messages_processed > new.dmp_remaining_messages.len() {
-			return Err(ModificationError::DmpMessagesUnderflow {
-				messages_remaining: new.dmp_remaining_messages.len(),
-				messages_processed: modifications.dmp_messages_processed,
-			})
-		} else {
-			new.dmp_remaining_messages =
-				new.dmp_remaining_messages[modifications.dmp_messages_processed..].to_vec();
-		}
-
-		if modifications.code_upgrade_applied {
-			new.validation_code_hash = new
-				.future_validation_code
-				.take()
-				.ok_or(ModificationError::AppliedNonexistentCodeUpgrade)?
-				.1;
-		}
-
-		Ok(new)
-	}
-}
-
-/// Information about a relay-chain block.
-#[derive(Debug, Clone, PartialEq)]
-pub struct RelayChainBlockInfo {
-	/// The hash of the relay-chain block.
-	pub hash: Hash,
-	/// The number of the relay-chain block.
-	pub number: BlockNumber,
-	/// The storage-root of the relay-chain block.
-	pub storage_root: Hash,
-}
-
-/// An update to outbound HRMP channels.
-#[derive(Debug, Clone, PartialEq, Default)]
-pub struct OutboundHrmpChannelModification {
-	/// The number of bytes submitted to the channel.
-	pub bytes_submitted: usize,
-	/// The number of messages submitted to the channel.
-	pub messages_submitted: usize,
-}
-
-/// An update to the HRMP Watermark.
-#[derive(Debug, Clone, PartialEq)]
-pub enum HrmpWatermarkUpdate {
-	/// This is an update placing the watermark at the head of the chain,
-	/// which is always legal.
-	Head(BlockNumber),
-	/// This is an update placing the watermark behind the head of the
-	/// chain, which is only legal if it lands on a block where messages
-	/// were queued.
-	Trunk(BlockNumber),
-}
-
-impl HrmpWatermarkUpdate {
-	fn watermark(&self) -> BlockNumber {
-		match *self {
-			HrmpWatermarkUpdate::Head(n) | HrmpWatermarkUpdate::Trunk(n) => n,
-		}
-	}
-}
-
-/// Modifications to constraints as a result of prospective candidates.
-#[derive(Debug, Clone, PartialEq)]
-pub struct ConstraintModifications {
-	/// The required parent head to build upon.
-	pub required_parent: Option<HeadData>,
-	/// The new HRMP watermark
-	pub hrmp_watermark: Option<HrmpWatermarkUpdate>,
-	/// Outbound HRMP channel modifications.
-	pub outbound_hrmp: HashMap<ParaId, OutboundHrmpChannelModification>,
-	/// The amount of UMP messages sent.
-	pub ump_messages_sent: usize,
-	/// The amount of UMP bytes sent.
-	pub ump_bytes_sent: usize,
-	/// The amount of DMP messages processed.
-	pub dmp_messages_processed: usize,
-	/// Whether a pending code upgrade has been applied.
-	pub code_upgrade_applied: bool,
-}
-
-impl ConstraintModifications {
-	/// The 'identity' modifications: these can be applied to
-	/// any constraints and yield the exact same result.
-	pub fn identity() -> Self {
-		ConstraintModifications {
-			required_parent: None,
-			hrmp_watermark: None,
-			outbound_hrmp: HashMap::new(),
-			ump_messages_sent: 0,
-			ump_bytes_sent: 0,
-			dmp_messages_processed: 0,
-			code_upgrade_applied: false,
-		}
-	}
-
-	/// Stack other modifications on top of these.
-	///
-	/// This does no sanity-checking, so if `other` is garbage relative
-	/// to `self`, then the new value will be garbage as well.
-	///
-	/// This is an addition which is not commutative.
-	pub fn stack(&mut self, other: &Self) {
-		if let Some(ref new_parent) = other.required_parent {
-			self.required_parent = Some(new_parent.clone());
-		}
-		if let Some(ref new_hrmp_watermark) = other.hrmp_watermark {
-			self.hrmp_watermark = Some(new_hrmp_watermark.clone());
-		}
-
-		for (id, mods) in &other.outbound_hrmp {
-			let record = self.outbound_hrmp.entry(*id).or_default();
-			record.messages_submitted += mods.messages_submitted;
-			record.bytes_submitted += mods.bytes_submitted;
-		}
-
-		self.ump_messages_sent += other.ump_messages_sent;
-		self.ump_bytes_sent += other.ump_bytes_sent;
-		self.dmp_messages_processed += other.dmp_messages_processed;
-		self.code_upgrade_applied |= other.code_upgrade_applied;
-	}
-}
-
-/// The prospective candidate.
-///
-/// This comprises the key information that represent a candidate
-/// without pinning it to a particular session. For example, everything
-/// to do with the collator's signature and commitments are represented
-/// here. But the erasure-root is not. This means that prospective candidates
-/// are not correlated to any session in particular.
-#[derive(Debug, Clone, PartialEq)]
-pub struct ProspectiveCandidate<'a> {
-	/// The commitments to the output of the execution.
-	pub commitments: Cow<'a, CandidateCommitments>,
-	/// The collator that created the candidate.
-	pub collator: CollatorId,
-	/// The signature of the collator on the payload.
-	pub collator_signature: CollatorSignature,
-	/// The persisted validation data used to create the candidate.
-	pub persisted_validation_data: PersistedValidationData,
-	/// The hash of the PoV.
-	pub pov_hash: Hash,
-	/// The validation code hash used by the candidate.
-	pub validation_code_hash: ValidationCodeHash,
-}
-
-impl<'a> ProspectiveCandidate<'a> {
-	fn into_owned(self) -> ProspectiveCandidate<'static> {
-		ProspectiveCandidate { commitments: Cow::Owned(self.commitments.into_owned()), ..self }
-	}
-
-	/// Partially clone the prospective candidate, but borrow the
-	/// parts which are potentially heavy.
-	pub fn partial_clone(&self) -> ProspectiveCandidate {
-		ProspectiveCandidate {
-			commitments: Cow::Borrowed(self.commitments.borrow()),
-			collator: self.collator.clone(),
-			collator_signature: self.collator_signature.clone(),
-			persisted_validation_data: self.persisted_validation_data.clone(),
-			pov_hash: self.pov_hash,
-			validation_code_hash: self.validation_code_hash,
-		}
-	}
-}
-
-#[cfg(test)]
-impl ProspectiveCandidate<'static> {
-	fn commitments_mut(&mut self) -> &mut CandidateCommitments {
-		self.commitments.to_mut()
-	}
-}
-
-/// Kinds of errors with the validity of a fragment.
-#[derive(Debug, Clone, PartialEq)]
-pub enum FragmentValidityError {
-	/// The validation code of the candidate doesn't match the
-	/// operating constraints.
-	///
-	/// Expected, Got
-	ValidationCodeMismatch(ValidationCodeHash, ValidationCodeHash),
-	/// The persisted-validation-data doesn't match.
-	///
-	/// Expected, Got
-	PersistedValidationDataMismatch(PersistedValidationData, PersistedValidationData),
-	/// The outputs of the candidate are invalid under the operating
-	/// constraints.
-	OutputsInvalid(ModificationError),
-	/// New validation code size too big.
-	///
-	/// Max allowed, new.
-	CodeSizeTooLarge(usize, usize),
-	/// Relay parent too old.
-	///
-	/// Min allowed, current.
-	RelayParentTooOld(BlockNumber, BlockNumber),
-	/// Para is required to process at least one DMP message from the queue.
-	DmpAdvancementRule,
-	/// Too many messages upward messages submitted.
-	UmpMessagesPerCandidateOverflow {
-		/// The amount of messages a single candidate can submit.
-		messages_allowed: usize,
-		/// The amount of messages sent to all HRMP channels.
-		messages_submitted: usize,
-	},
-	/// Too many messages submitted to all HRMP channels.
-	HrmpMessagesPerCandidateOverflow {
-		/// The amount of messages a single candidate can submit.
-		messages_allowed: usize,
-		/// The amount of messages sent to all HRMP channels.
-		messages_submitted: usize,
-	},
-	/// Code upgrade not allowed.
-	CodeUpgradeRestricted,
-	/// HRMP messages are not ascending or are duplicate.
-	///
-	/// The `usize` is the index into the outbound HRMP messages of
-	/// the candidate.
-	HrmpMessagesDescendingOrDuplicate(usize),
-}
-
-/// A parachain fragment, representing another prospective parachain block.
-///
-/// This is a type which guarantees that the candidate is valid under the
-/// operating constraints.
-#[derive(Debug, Clone, PartialEq)]
-pub struct Fragment<'a> {
-	/// The new relay-parent.
-	relay_parent: RelayChainBlockInfo,
-	/// The constraints this fragment is operating under.
-	operating_constraints: Constraints,
-	/// The core information about the prospective candidate.
-	candidate: ProspectiveCandidate<'a>,
-	/// Modifications to the constraints based on the outputs of
-	/// the candidate.
-	modifications: ConstraintModifications,
-}
-
-impl<'a> Fragment<'a> {
-	/// Create a new fragment.
-	///
-	/// This fails if the fragment isn't in line with the operating
-	/// constraints. That is, either its inputs or its outputs fail
-	/// checks against the constraints.
-	///
-	/// This doesn't check that the collator signature is valid or
-	/// whether the PoV is small enough.
-	pub fn new(
-		relay_parent: RelayChainBlockInfo,
-		operating_constraints: Constraints,
-		candidate: ProspectiveCandidate<'a>,
-	) -> Result<Self, FragmentValidityError> {
-		let modifications = {
-			let commitments = &candidate.commitments;
-			ConstraintModifications {
-				required_parent: Some(commitments.head_data.clone()),
-				hrmp_watermark: Some({
-					if commitments.hrmp_watermark == relay_parent.number {
-						HrmpWatermarkUpdate::Head(commitments.hrmp_watermark)
-					} else {
-						HrmpWatermarkUpdate::Trunk(commitments.hrmp_watermark)
-					}
-				}),
-				outbound_hrmp: {
-					let mut outbound_hrmp = HashMap::<_, OutboundHrmpChannelModification>::new();
-
-					let mut last_recipient = None::<ParaId>;
-					for (i, message) in commitments.horizontal_messages.iter().enumerate() {
-						if let Some(last) = last_recipient {
-							if last >= message.recipient {
-								return Err(
-									FragmentValidityError::HrmpMessagesDescendingOrDuplicate(i),
-								)
-							}
-						}
-
-						last_recipient = Some(message.recipient);
-						let record = outbound_hrmp.entry(message.recipient).or_default();
-
-						record.bytes_submitted += message.data.len();
-						record.messages_submitted += 1;
-					}
-
-					outbound_hrmp
-				},
-				ump_messages_sent: commitments.upward_messages.len(),
-				ump_bytes_sent: commitments.upward_messages.iter().map(|msg| msg.len()).sum(),
-				dmp_messages_processed: commitments.processed_downward_messages as _,
-				code_upgrade_applied: operating_constraints
-					.future_validation_code
-					.map_or(false, |(at, _)| relay_parent.number >= at),
-			}
-		};
-
-		validate_against_constraints(
-			&operating_constraints,
-			&relay_parent,
-			&candidate,
-			&modifications,
-		)?;
-
-		Ok(Fragment { relay_parent, operating_constraints, candidate, modifications })
-	}
-
-	/// Access the relay parent information.
-	pub fn relay_parent(&self) -> &RelayChainBlockInfo {
-		&self.relay_parent
-	}
-
-	/// Access the operating constraints
-	pub fn operating_constraints(&self) -> &Constraints {
-		&self.operating_constraints
-	}
-
-	/// Access the underlying prospective candidate.
-	pub fn candidate(&self) -> &ProspectiveCandidate<'a> {
-		&self.candidate
-	}
-
-	/// Modifications to constraints based on the outputs of the candidate.
-	pub fn constraint_modifications(&self) -> &ConstraintModifications {
-		&self.modifications
-	}
-
-	/// Convert the fragment into an owned variant.
-	pub fn into_owned(self) -> Fragment<'static> {
-		Fragment { candidate: self.candidate.into_owned(), ..self }
-	}
-
-	/// Validate this fragment against some set of constraints
-	/// instead of the operating constraints.
-	pub fn validate_against_constraints(
-		&self,
-		constraints: &Constraints,
-	) -> Result<(), FragmentValidityError> {
-		validate_against_constraints(
-			constraints,
-			&self.relay_parent,
-			&self.candidate,
-			&self.modifications,
-		)
-	}
-}
-
-fn validate_against_constraints(
-	constraints: &Constraints,
-	relay_parent: &RelayChainBlockInfo,
-	candidate: &ProspectiveCandidate,
-	modifications: &ConstraintModifications,
-) -> Result<(), FragmentValidityError> {
-	let expected_pvd = PersistedValidationData {
-		parent_head: constraints.required_parent.clone(),
-		relay_parent_number: relay_parent.number,
-		relay_parent_storage_root: relay_parent.storage_root,
-		max_pov_size: constraints.max_pov_size as u32,
-	};
-
-	if expected_pvd != candidate.persisted_validation_data {
-		return Err(FragmentValidityError::PersistedValidationDataMismatch(
-			expected_pvd,
-			candidate.persisted_validation_data.clone(),
-		))
-	}
-
-	if constraints.validation_code_hash != candidate.validation_code_hash {
-		return Err(FragmentValidityError::ValidationCodeMismatch(
-			constraints.validation_code_hash,
-			candidate.validation_code_hash,
-		))
-	}
-
-	if relay_parent.number < constraints.min_relay_parent_number {
-		return Err(FragmentValidityError::RelayParentTooOld(
-			constraints.min_relay_parent_number,
-			relay_parent.number,
-		))
-	}
-
-	if candidate.commitments.new_validation_code.is_some() {
-		match constraints.upgrade_restriction {
-			None => {},
-			Some(UpgradeRestriction::Present) =>
-				return Err(FragmentValidityError::CodeUpgradeRestricted),
-		}
-	}
-
-	let announced_code_size = candidate
-		.commitments
-		.new_validation_code
-		.as_ref()
-		.map_or(0, |code| code.0.len());
-
-	if announced_code_size > constraints.max_code_size {
-		return Err(FragmentValidityError::CodeSizeTooLarge(
-			constraints.max_code_size,
-			announced_code_size,
-		))
-	}
-
-	if modifications.dmp_messages_processed == 0 {
-		if constraints
-			.dmp_remaining_messages
-			.get(0)
-			.map_or(false, |&msg_sent_at| msg_sent_at <= relay_parent.number)
-		{
-			return Err(FragmentValidityError::DmpAdvancementRule)
-		}
-	}
-
-	if candidate.commitments.horizontal_messages.len() > constraints.max_hrmp_num_per_candidate {
-		return Err(FragmentValidityError::HrmpMessagesPerCandidateOverflow {
-			messages_allowed: constraints.max_hrmp_num_per_candidate,
-			messages_submitted: candidate.commitments.horizontal_messages.len(),
-		})
-	}
-
-	if candidate.commitments.upward_messages.len() > constraints.max_ump_num_per_candidate {
-		return Err(FragmentValidityError::UmpMessagesPerCandidateOverflow {
-			messages_allowed: constraints.max_ump_num_per_candidate,
-			messages_submitted: candidate.commitments.upward_messages.len(),
-		})
-	}
-
-	constraints
-		.check_modifications(&modifications)
-		.map_err(FragmentValidityError::OutputsInvalid)
-}
-
-#[cfg(test)]
-mod tests {
-	use super::*;
-	use polkadot_primitives::vstaging::{
-		CollatorPair, HorizontalMessages, OutboundHrmpMessage, ValidationCode,
-	};
-	use sp_application_crypto::Pair;
-
-	#[test]
-	fn stack_modifications() {
-		let para_a = ParaId::from(1u32);
-		let para_b = ParaId::from(2u32);
-		let para_c = ParaId::from(3u32);
-
-		let a = ConstraintModifications {
-			required_parent: None,
-			hrmp_watermark: None,
-			outbound_hrmp: {
-				let mut map = HashMap::new();
-				map.insert(
-					para_a,
-					OutboundHrmpChannelModification { bytes_submitted: 100, messages_submitted: 5 },
-				);
-
-				map.insert(
-					para_b,
-					OutboundHrmpChannelModification { bytes_submitted: 100, messages_submitted: 5 },
-				);
-
-				map
-			},
-			ump_messages_sent: 6,
-			ump_bytes_sent: 1000,
-			dmp_messages_processed: 5,
-			code_upgrade_applied: true,
-		};
-
-		let b = ConstraintModifications {
-			required_parent: None,
-			hrmp_watermark: None,
-			outbound_hrmp: {
-				let mut map = HashMap::new();
-				map.insert(
-					para_b,
-					OutboundHrmpChannelModification { bytes_submitted: 100, messages_submitted: 5 },
-				);
-
-				map.insert(
-					para_c,
-					OutboundHrmpChannelModification { bytes_submitted: 100, messages_submitted: 5 },
-				);
-
-				map
-			},
-			ump_messages_sent: 6,
-			ump_bytes_sent: 1000,
-			dmp_messages_processed: 5,
-			code_upgrade_applied: true,
-		};
-
-		let mut c = a.clone();
-		c.stack(&b);
-
-		assert_eq!(
-			c,
-			ConstraintModifications {
-				required_parent: None,
-				hrmp_watermark: None,
-				outbound_hrmp: {
-					let mut map = HashMap::new();
-					map.insert(
-						para_a,
-						OutboundHrmpChannelModification {
-							bytes_submitted: 100,
-							messages_submitted: 5,
-						},
-					);
-
-					map.insert(
-						para_b,
-						OutboundHrmpChannelModification {
-							bytes_submitted: 200,
-							messages_submitted: 10,
-						},
-					);
-
-					map.insert(
-						para_c,
-						OutboundHrmpChannelModification {
-							bytes_submitted: 100,
-							messages_submitted: 5,
-						},
-					);
-
-					map
-				},
-				ump_messages_sent: 12,
-				ump_bytes_sent: 2000,
-				dmp_messages_processed: 10,
-				code_upgrade_applied: true,
-			},
-		);
-
-		let mut d = ConstraintModifications::identity();
-		d.stack(&a);
-		d.stack(&b);
-
-		assert_eq!(c, d);
-	}
-
-	fn make_constraints() -> Constraints {
-		let para_a = ParaId::from(1u32);
-		let para_b = ParaId::from(2u32);
-		let para_c = ParaId::from(3u32);
-
-		Constraints {
-			min_relay_parent_number: 5,
-			max_pov_size: 1000,
-			max_code_size: 1000,
-			ump_remaining: 10,
-			ump_remaining_bytes: 1024,
-			max_ump_num_per_candidate: 5,
-			dmp_remaining_messages: Vec::new(),
-			hrmp_inbound: InboundHrmpLimitations { valid_watermarks: vec![6, 8] },
-			hrmp_channels_out: {
-				let mut map = HashMap::new();
-
-				map.insert(
-					para_a,
-					OutboundHrmpChannelLimitations { messages_remaining: 5, bytes_remaining: 512 },
-				);
-
-				map.insert(
-					para_b,
-					OutboundHrmpChannelLimitations {
-						messages_remaining: 10,
-						bytes_remaining: 1024,
-					},
-				);
-
-				map.insert(
-					para_c,
-					OutboundHrmpChannelLimitations { messages_remaining: 1, bytes_remaining: 128 },
-				);
-
-				map
-			},
-			max_hrmp_num_per_candidate: 5,
-			required_parent: HeadData::from(vec![1, 2, 3]),
-			validation_code_hash: ValidationCode(vec![4, 5, 6]).hash(),
-			upgrade_restriction: None,
-			future_validation_code: None,
-		}
-	}
-
-	#[test]
-	fn constraints_disallowed_trunk_watermark() {
-		let constraints = make_constraints();
-		let mut modifications = ConstraintModifications::identity();
-		modifications.hrmp_watermark = Some(HrmpWatermarkUpdate::Trunk(7));
-
-		assert_eq!(
-			constraints.check_modifications(&modifications),
-			Err(ModificationError::DisallowedHrmpWatermark(7)),
-		);
-
-		assert_eq!(
-			constraints.apply_modifications(&modifications),
-			Err(ModificationError::DisallowedHrmpWatermark(7)),
-		);
-	}
-
-	#[test]
-	fn constraints_always_allow_head_watermark() {
-		let constraints = make_constraints();
-		let mut modifications = ConstraintModifications::identity();
-		modifications.hrmp_watermark = Some(HrmpWatermarkUpdate::Head(7));
-
-		assert!(constraints.check_modifications(&modifications).is_ok());
-
-		let new_constraints = constraints.apply_modifications(&modifications).unwrap();
-		assert_eq!(new_constraints.hrmp_inbound.valid_watermarks, vec![8]);
-	}
-
-	#[test]
-	fn constraints_no_such_hrmp_channel() {
-		let constraints = make_constraints();
-		let mut modifications = ConstraintModifications::identity();
-		let bad_para = ParaId::from(100u32);
-		modifications.outbound_hrmp.insert(
-			bad_para,
-			OutboundHrmpChannelModification { bytes_submitted: 0, messages_submitted: 0 },
-		);
-
-		assert_eq!(
-			constraints.check_modifications(&modifications),
-			Err(ModificationError::NoSuchHrmpChannel(bad_para)),
-		);
-
-		assert_eq!(
-			constraints.apply_modifications(&modifications),
-			Err(ModificationError::NoSuchHrmpChannel(bad_para)),
-		);
-	}
-
-	#[test]
-	fn constraints_hrmp_messages_overflow() {
-		let constraints = make_constraints();
-		let mut modifications = ConstraintModifications::identity();
-		let para_a = ParaId::from(1u32);
-		modifications.outbound_hrmp.insert(
-			para_a,
-			OutboundHrmpChannelModification { bytes_submitted: 0, messages_submitted: 6 },
-		);
-
-		assert_eq!(
-			constraints.check_modifications(&modifications),
-			Err(ModificationError::HrmpMessagesOverflow {
-				para_id: para_a,
-				messages_remaining: 5,
-				messages_submitted: 6,
-			}),
-		);
-
-		assert_eq!(
-			constraints.apply_modifications(&modifications),
-			Err(ModificationError::HrmpMessagesOverflow {
-				para_id: para_a,
-				messages_remaining: 5,
-				messages_submitted: 6,
-			}),
-		);
-	}
-
-	#[test]
-	fn constraints_hrmp_bytes_overflow() {
-		let constraints = make_constraints();
-		let mut modifications = ConstraintModifications::identity();
-		let para_a = ParaId::from(1u32);
-		modifications.outbound_hrmp.insert(
-			para_a,
-			OutboundHrmpChannelModification { bytes_submitted: 513, messages_submitted: 1 },
-		);
-
-		assert_eq!(
-			constraints.check_modifications(&modifications),
-			Err(ModificationError::HrmpBytesOverflow {
-				para_id: para_a,
-				bytes_remaining: 512,
-				bytes_submitted: 513,
-			}),
-		);
-
-		assert_eq!(
-			constraints.apply_modifications(&modifications),
-			Err(ModificationError::HrmpBytesOverflow {
-				para_id: para_a,
-				bytes_remaining: 512,
-				bytes_submitted: 513,
-			}),
-		);
-	}
-
-	#[test]
-	fn constraints_ump_messages_overflow() {
-		let constraints = make_constraints();
-		let mut modifications = ConstraintModifications::identity();
-		modifications.ump_messages_sent = 11;
-
-		assert_eq!(
-			constraints.check_modifications(&modifications),
-			Err(ModificationError::UmpMessagesOverflow {
-				messages_remaining: 10,
-				messages_submitted: 11,
-			}),
-		);
-
-		assert_eq!(
-			constraints.apply_modifications(&modifications),
-			Err(ModificationError::UmpMessagesOverflow {
-				messages_remaining: 10,
-				messages_submitted: 11,
-			}),
-		);
-	}
-
-	#[test]
-	fn constraints_ump_bytes_overflow() {
-		let constraints = make_constraints();
-		let mut modifications = ConstraintModifications::identity();
-		modifications.ump_bytes_sent = 1025;
-
-		assert_eq!(
-			constraints.check_modifications(&modifications),
-			Err(ModificationError::UmpBytesOverflow {
-				bytes_remaining: 1024,
-				bytes_submitted: 1025,
-			}),
-		);
-
-		assert_eq!(
-			constraints.apply_modifications(&modifications),
-			Err(ModificationError::UmpBytesOverflow {
-				bytes_remaining: 1024,
-				bytes_submitted: 1025,
-			}),
-		);
-	}
-
-	#[test]
-	fn constraints_dmp_messages() {
-		let mut constraints = make_constraints();
-		let mut modifications = ConstraintModifications::identity();
-		assert!(constraints.check_modifications(&modifications).is_ok());
-		assert!(constraints.apply_modifications(&modifications).is_ok());
-
-		modifications.dmp_messages_processed = 6;
-
-		assert_eq!(
-			constraints.check_modifications(&modifications),
-			Err(ModificationError::DmpMessagesUnderflow {
-				messages_remaining: 0,
-				messages_processed: 6,
-			}),
-		);
-
-		assert_eq!(
-			constraints.apply_modifications(&modifications),
-			Err(ModificationError::DmpMessagesUnderflow {
-				messages_remaining: 0,
-				messages_processed: 6,
-			}),
-		);
-
-		constraints.dmp_remaining_messages = vec![1, 4, 8, 10];
-		modifications.dmp_messages_processed = 2;
-		assert!(constraints.check_modifications(&modifications).is_ok());
-		let constraints = constraints
-			.apply_modifications(&modifications)
-			.expect("modifications are valid");
-
-		assert_eq!(&constraints.dmp_remaining_messages, &[8, 10]);
-	}
-
-	#[test]
-	fn constraints_nonexistent_code_upgrade() {
-		let constraints = make_constraints();
-		let mut modifications = ConstraintModifications::identity();
-		modifications.code_upgrade_applied = true;
-
-		assert_eq!(
-			constraints.check_modifications(&modifications),
-			Err(ModificationError::AppliedNonexistentCodeUpgrade),
-		);
-
-		assert_eq!(
-			constraints.apply_modifications(&modifications),
-			Err(ModificationError::AppliedNonexistentCodeUpgrade),
-		);
-	}
-
-	fn make_candidate(
-		constraints: &Constraints,
-		relay_parent: &RelayChainBlockInfo,
-	) -> ProspectiveCandidate<'static> {
-		let collator_pair = CollatorPair::generate().0;
-		let collator = collator_pair.public();
-
-		let sig = collator_pair.sign(b"blabla".as_slice());
-
-		ProspectiveCandidate {
-			commitments: Cow::Owned(CandidateCommitments {
-				upward_messages: Default::default(),
-				horizontal_messages: Default::default(),
-				new_validation_code: None,
-				head_data: HeadData::from(vec![1, 2, 3, 4, 5]),
-				processed_downward_messages: 0,
-				hrmp_watermark: relay_parent.number,
-			}),
-			collator,
-			collator_signature: sig,
-			persisted_validation_data: PersistedValidationData {
-				parent_head: constraints.required_parent.clone(),
-				relay_parent_number: relay_parent.number,
-				relay_parent_storage_root: relay_parent.storage_root,
-				max_pov_size: constraints.max_pov_size as u32,
-			},
-			pov_hash: Hash::repeat_byte(1),
-			validation_code_hash: constraints.validation_code_hash,
-		}
-	}
-
-	#[test]
-	fn fragment_validation_code_mismatch() {
-		let relay_parent = RelayChainBlockInfo {
-			number: 6,
-			hash: Hash::repeat_byte(0x0a),
-			storage_root: Hash::repeat_byte(0xff),
-		};
-
-		let constraints = make_constraints();
-		let mut candidate = make_candidate(&constraints, &relay_parent);
-
-		let expected_code = constraints.validation_code_hash;
-		let got_code = ValidationCode(vec![9, 9, 9]).hash();
-
-		candidate.validation_code_hash = got_code;
-
-		assert_eq!(
-			Fragment::new(relay_parent, constraints, candidate),
-			Err(FragmentValidityError::ValidationCodeMismatch(expected_code, got_code,)),
-		)
-	}
-
-	#[test]
-	fn fragment_pvd_mismatch() {
-		let relay_parent = RelayChainBlockInfo {
-			number: 6,
-			hash: Hash::repeat_byte(0x0a),
-			storage_root: Hash::repeat_byte(0xff),
-		};
-
-		let relay_parent_b = RelayChainBlockInfo {
-			number: 6,
-			hash: Hash::repeat_byte(0x0b),
-			storage_root: Hash::repeat_byte(0xee),
-		};
-
-		let constraints = make_constraints();
-		let candidate = make_candidate(&constraints, &relay_parent);
-
-		let expected_pvd = PersistedValidationData {
-			parent_head: constraints.required_parent.clone(),
-			relay_parent_number: relay_parent_b.number,
-			relay_parent_storage_root: relay_parent_b.storage_root,
-			max_pov_size: constraints.max_pov_size as u32,
-		};
-
-		let got_pvd = candidate.persisted_validation_data.clone();
-
-		assert_eq!(
-			Fragment::new(relay_parent_b, constraints, candidate),
-			Err(FragmentValidityError::PersistedValidationDataMismatch(expected_pvd, got_pvd,)),
-		);
-	}
-
-	#[test]
-	fn fragment_code_size_too_large() {
-		let relay_parent = RelayChainBlockInfo {
-			number: 6,
-			hash: Hash::repeat_byte(0x0a),
-			storage_root: Hash::repeat_byte(0xff),
-		};
-
-		let constraints = make_constraints();
-		let mut candidate = make_candidate(&constraints, &relay_parent);
-
-		let max_code_size = constraints.max_code_size;
-		candidate.commitments_mut().new_validation_code = Some(vec![0; max_code_size + 1].into());
-
-		assert_eq!(
-			Fragment::new(relay_parent, constraints, candidate),
-			Err(FragmentValidityError::CodeSizeTooLarge(max_code_size, max_code_size + 1,)),
-		);
-	}
-
-	#[test]
-	fn fragment_relay_parent_too_old() {
-		let relay_parent = RelayChainBlockInfo {
-			number: 3,
-			hash: Hash::repeat_byte(0x0a),
-			storage_root: Hash::repeat_byte(0xff),
-		};
-
-		let constraints = make_constraints();
-		let candidate = make_candidate(&constraints, &relay_parent);
-
-		assert_eq!(
-			Fragment::new(relay_parent, constraints, candidate),
-			Err(FragmentValidityError::RelayParentTooOld(5, 3,)),
-		);
-	}
-
-	#[test]
-	fn fragment_hrmp_messages_overflow() {
-		let relay_parent = RelayChainBlockInfo {
-			number: 6,
-			hash: Hash::repeat_byte(0x0a),
-			storage_root: Hash::repeat_byte(0xff),
-		};
-
-		let constraints = make_constraints();
-		let mut candidate = make_candidate(&constraints, &relay_parent);
-
-		let max_hrmp = constraints.max_hrmp_num_per_candidate;
-
-		candidate
-			.commitments_mut()
-			.horizontal_messages
-			.try_extend((0..max_hrmp + 1).map(|i| OutboundHrmpMessage {
-				recipient: ParaId::from(i as u32),
-				data: vec![1, 2, 3],
-			}))
-			.unwrap();
-
-		assert_eq!(
-			Fragment::new(relay_parent, constraints, candidate),
-			Err(FragmentValidityError::HrmpMessagesPerCandidateOverflow {
-				messages_allowed: max_hrmp,
-				messages_submitted: max_hrmp + 1,
-			}),
-		);
-	}
-
-	#[test]
-	fn fragment_dmp_advancement_rule() {
-		let relay_parent = RelayChainBlockInfo {
-			number: 6,
-			hash: Hash::repeat_byte(0x0a),
-			storage_root: Hash::repeat_byte(0xff),
-		};
-
-		let mut constraints = make_constraints();
-		let mut candidate = make_candidate(&constraints, &relay_parent);
-
-		// Empty dmp queue is ok.
-		assert!(Fragment::new(relay_parent.clone(), constraints.clone(), candidate.clone()).is_ok());
-		// Unprocessed message that was sent later is ok.
-		constraints.dmp_remaining_messages = vec![relay_parent.number + 1];
-		assert!(Fragment::new(relay_parent.clone(), constraints.clone(), candidate.clone()).is_ok());
-
-		for block_number in 0..=relay_parent.number {
-			constraints.dmp_remaining_messages = vec![block_number];
-
-			assert_eq!(
-				Fragment::new(relay_parent.clone(), constraints.clone(), candidate.clone()),
-				Err(FragmentValidityError::DmpAdvancementRule),
-			);
-		}
-
-		candidate.commitments.to_mut().processed_downward_messages = 1;
-		assert!(Fragment::new(relay_parent, constraints, candidate).is_ok());
-	}
-
-	#[test]
-	fn fragment_ump_messages_overflow() {
-		let relay_parent = RelayChainBlockInfo {
-			number: 6,
-			hash: Hash::repeat_byte(0x0a),
-			storage_root: Hash::repeat_byte(0xff),
-		};
-
-		let constraints = make_constraints();
-		let mut candidate = make_candidate(&constraints, &relay_parent);
-
-		let max_ump = constraints.max_ump_num_per_candidate;
-
-		candidate
-			.commitments
-			.to_mut()
-			.upward_messages
-			.try_extend((0..max_ump + 1).map(|i| vec![i as u8]))
-			.unwrap();
-
-		assert_eq!(
-			Fragment::new(relay_parent, constraints, candidate),
-			Err(FragmentValidityError::UmpMessagesPerCandidateOverflow {
-				messages_allowed: max_ump,
-				messages_submitted: max_ump + 1,
-			}),
-		);
-	}
-
-	#[test]
-	fn fragment_code_upgrade_restricted() {
-		let relay_parent = RelayChainBlockInfo {
-			number: 6,
-			hash: Hash::repeat_byte(0x0a),
-			storage_root: Hash::repeat_byte(0xff),
-		};
-
-		let mut constraints = make_constraints();
-		let mut candidate = make_candidate(&constraints, &relay_parent);
-
-		constraints.upgrade_restriction = Some(UpgradeRestriction::Present);
-		candidate.commitments_mut().new_validation_code = Some(ValidationCode(vec![1, 2, 3]));
-
-		assert_eq!(
-			Fragment::new(relay_parent, constraints, candidate),
-			Err(FragmentValidityError::CodeUpgradeRestricted),
-		);
-	}
-
-	#[test]
-	fn fragment_hrmp_messages_descending_or_duplicate() {
-		let relay_parent = RelayChainBlockInfo {
-			number: 6,
-			hash: Hash::repeat_byte(0x0a),
-			storage_root: Hash::repeat_byte(0xff),
-		};
-
-		let constraints = make_constraints();
-		let mut candidate = make_candidate(&constraints, &relay_parent);
-
-		candidate.commitments_mut().horizontal_messages = HorizontalMessages::truncate_from(vec![
-			OutboundHrmpMessage { recipient: ParaId::from(0 as u32), data: vec![1, 2, 3] },
-			OutboundHrmpMessage { recipient: ParaId::from(0 as u32), data: vec![4, 5, 6] },
-		]);
-
-		assert_eq!(
-			Fragment::new(relay_parent.clone(), constraints.clone(), candidate.clone()),
-			Err(FragmentValidityError::HrmpMessagesDescendingOrDuplicate(1)),
-		);
-
-		candidate.commitments_mut().horizontal_messages = HorizontalMessages::truncate_from(vec![
-			OutboundHrmpMessage { recipient: ParaId::from(1 as u32), data: vec![1, 2, 3] },
-			OutboundHrmpMessage { recipient: ParaId::from(0 as u32), data: vec![4, 5, 6] },
-		]);
-
-		assert_eq!(
-			Fragment::new(relay_parent, constraints, candidate),
-			Err(FragmentValidityError::HrmpMessagesDescendingOrDuplicate(1)),
-		);
-	}
-}
diff --git a/polkadot/node/subsystem-util/src/lib.rs b/polkadot/node/subsystem-util/src/lib.rs
index daee4a8350e5af321f9a040c2c943879588037bf..a5f3e9d4a0c0e08ebb3b738054ae758f1c98e822 100644
--- a/polkadot/node/subsystem-util/src/lib.rs
+++ b/polkadot/node/subsystem-util/src/lib.rs
@@ -43,7 +43,7 @@ use futures::channel::{mpsc, oneshot};
 use parity_scale_codec::Encode;
 
 use polkadot_primitives::{
-	vstaging as vstaging_primitives, AuthorityDiscoveryId, CandidateEvent, CandidateHash,
+	AsyncBackingParams, AuthorityDiscoveryId, CandidateEvent, CandidateHash,
 	CommittedCandidateReceipt, CoreState, EncodeAs, GroupIndex, GroupRotationInfo, Hash,
 	Id as ParaId, OccupiedCoreAssumption, PersistedValidationData, ScrapedOnChainVotes,
 	SessionIndex, SessionInfo, Signed, SigningContext, ValidationCode, ValidationCodeHash,
@@ -226,8 +226,8 @@ specialize_requests! {
 	fn request_unapplied_slashes() -> Vec<(SessionIndex, CandidateHash, slashing::PendingSlashes)>; UnappliedSlashes;
 	fn request_key_ownership_proof(validator_id: ValidatorId) -> Option<slashing::OpaqueKeyOwnershipProof>; KeyOwnershipProof;
 	fn request_submit_report_dispute_lost(dp: slashing::DisputeProof, okop: slashing::OpaqueKeyOwnershipProof) -> Option<()>; SubmitReportDisputeLost;
-
-	fn request_staging_async_backing_params() -> vstaging_primitives::AsyncBackingParams; StagingAsyncBackingParams;
+	fn request_disabled_validators() -> Vec<ValidatorIndex>; DisabledValidators;
+	fn request_async_backing_params() -> AsyncBackingParams; AsyncBackingParams;
 }
 
 /// Requests executor parameters from the runtime effective at given relay-parent. First obtains
diff --git a/polkadot/node/subsystem-util/src/reputation.rs b/polkadot/node/subsystem-util/src/reputation.rs
index 89e3eb64df9bd8d47a8e9aabb701c8bca504f140..349a6425433c55b919f74818e1e3aec2bfed0e7f 100644
--- a/polkadot/node/subsystem-util/src/reputation.rs
+++ b/polkadot/node/subsystem-util/src/reputation.rs
@@ -25,6 +25,7 @@ use std::{collections::HashMap, time::Duration};
 
 /// Default delay for sending reputation changes
 pub const REPUTATION_CHANGE_INTERVAL: Duration = Duration::from_secs(30);
+const LOG_TARGET: &'static str = "parachain::reputation-aggregator";
 
 type BatchReputationChange = HashMap<PeerId, i32>;
 
@@ -75,6 +76,10 @@ impl ReputationAggregator {
 		peer_id: PeerId,
 		rep: UnifiedReputationChange,
 	) {
+		if rep.cost_or_benefit() < 0 {
+			gum::debug!(target: LOG_TARGET, peer = ?peer_id, ?rep, "Reduce reputation");
+		}
+
 		if (self.send_immediately_if)(rep) {
 			self.single_send(sender, peer_id, rep).await;
 		} else {
@@ -97,12 +102,8 @@ impl ReputationAggregator {
 	}
 
 	fn add(&mut self, peer_id: PeerId, rep: UnifiedReputationChange) {
-		if self.by_peer.is_none() {
-			self.by_peer = Some(HashMap::new());
-		}
-		if let Some(ref mut by_peer) = self.by_peer {
-			add_reputation(by_peer, peer_id, rep)
-		}
+		let by_peer = self.by_peer.get_or_insert(HashMap::new());
+		add_reputation(by_peer, peer_id, rep)
 	}
 }
 
diff --git a/polkadot/node/subsystem-util/src/runtime/error.rs b/polkadot/node/subsystem-util/src/runtime/error.rs
index db3eacd68514124170bbdb972cc1e1cacbd03e00..8751693b078a6797584ed59a2ebd3c320d87cd78 100644
--- a/polkadot/node/subsystem-util/src/runtime/error.rs
+++ b/polkadot/node/subsystem-util/src/runtime/error.rs
@@ -33,17 +33,21 @@ pub enum Error {
 	/// Some request to the runtime failed.
 	/// For example if we prune a block we're requesting info about.
 	#[error("Runtime API error {0}")]
-	RuntimeRequest(RuntimeApiError),
+	RuntimeRequest(#[from] RuntimeApiError),
 
 	/// We tried fetching a session info which was not available.
 	#[error("There was no session with the given index {0}")]
 	NoSuchSession(SessionIndex),
+
+	/// We tried fetching executor params for a session which were not available.
+	#[error("There was no executor parameters for session with the given index {0}")]
+	NoExecutorParams(SessionIndex),
 }
 
 pub type Result<T> = std::result::Result<T, Error>;
 
 /// Receive a response from a runtime request and convert errors.
-pub(crate) async fn recv_runtime<V>(
+pub async fn recv_runtime<V>(
 	r: oneshot::Receiver<std::result::Result<V, RuntimeApiError>>,
 ) -> Result<V> {
 	let result = r
diff --git a/polkadot/node/subsystem-util/src/runtime/mod.rs b/polkadot/node/subsystem-util/src/runtime/mod.rs
index 1f5641e3ea956c0379c79a2c686144336ff95030..8d7cef88a70e082779cd6e0892502f27e486c7c6 100644
--- a/polkadot/node/subsystem-util/src/runtime/mod.rs
+++ b/polkadot/node/subsystem-util/src/runtime/mod.rs
@@ -16,9 +16,7 @@
 
 //! Convenient interface to runtime information.
 
-use std::num::NonZeroUsize;
-
-use lru::LruCache;
+use schnellru::{ByLength, LruMap};
 
 use parity_scale_codec::Encode;
 use sp_application_crypto::AppCrypto;
@@ -26,27 +24,31 @@ use sp_core::crypto::ByteArray;
 use sp_keystore::{Keystore, KeystorePtr};
 
 use polkadot_node_subsystem::{
-	errors::RuntimeApiError, messages::RuntimeApiMessage, overseer, SubsystemSender,
+	errors::RuntimeApiError,
+	messages::{RuntimeApiMessage, RuntimeApiRequest},
+	overseer, SubsystemSender,
 };
+use polkadot_node_subsystem_types::UnpinHandle;
 use polkadot_primitives::{
-	vstaging, CandidateEvent, CandidateHash, CoreState, EncodeAs, GroupIndex, GroupRotationInfo,
-	Hash, IndexedVec, OccupiedCore, ScrapedOnChainVotes, SessionIndex, SessionInfo, Signed,
-	SigningContext, UncheckedSigned, ValidationCode, ValidationCodeHash, ValidatorId,
-	ValidatorIndex,
+	slashing, AsyncBackingParams, CandidateEvent, CandidateHash, CoreState, EncodeAs,
+	ExecutorParams, GroupIndex, GroupRotationInfo, Hash, IndexedVec, OccupiedCore,
+	ScrapedOnChainVotes, SessionIndex, SessionInfo, Signed, SigningContext, UncheckedSigned,
+	ValidationCode, ValidationCodeHash, ValidatorId, ValidatorIndex, LEGACY_MIN_BACKING_VOTES,
 };
 
 use crate::{
-	request_availability_cores, request_candidate_events, request_key_ownership_proof,
-	request_on_chain_votes, request_session_index_for_child, request_session_info,
-	request_staging_async_backing_params, request_submit_report_dispute_lost,
-	request_unapplied_slashes, request_validation_code_by_hash, request_validator_groups,
+	request_async_backing_params, request_availability_cores, request_candidate_events,
+	request_from_runtime, request_key_ownership_proof, request_on_chain_votes,
+	request_session_executor_params, request_session_index_for_child, request_session_info,
+	request_submit_report_dispute_lost, request_unapplied_slashes, request_validation_code_by_hash,
+	request_validator_groups,
 };
 
 /// Errors that can happen on runtime fetches.
 mod error;
 
-use error::{recv_runtime, Result};
-pub use error::{Error, FatalError, JfyiError};
+use error::Result;
+pub use error::{recv_runtime, Error, FatalError, JfyiError};
 
 const LOG_TARGET: &'static str = "parachain::runtime-info";
 
@@ -58,7 +60,7 @@ pub struct Config {
 	pub keystore: Option<KeystorePtr>,
 
 	/// How many sessions should we keep in the cache?
-	pub session_cache_lru_size: NonZeroUsize,
+	pub session_cache_lru_size: u32,
 }
 
 /// Caching of session info.
@@ -69,10 +71,14 @@ pub struct RuntimeInfo {
 	///
 	/// We query this up to a 100 times per block, so caching it here without roundtrips over the
 	/// overseer seems sensible.
-	session_index_cache: LruCache<Hash, SessionIndex>,
+	session_index_cache: LruMap<Hash, SessionIndex>,
 
 	/// Look up cached sessions by `SessionIndex`.
-	session_info_cache: LruCache<SessionIndex, ExtendedSessionInfo>,
+	session_info_cache: LruMap<SessionIndex, ExtendedSessionInfo>,
+
+	/// Unpin handle of *some* block in the session.
+	/// Only blocks pinned explicitly by `pin_block` are stored here.
+	pinned_blocks: LruMap<SessionIndex, UnpinHandle>,
 
 	/// Key store for determining whether we are a validator and what `ValidatorIndex` we have.
 	keystore: Option<KeystorePtr>,
@@ -84,6 +90,8 @@ pub struct ExtendedSessionInfo {
 	pub session_info: SessionInfo,
 	/// Contains useful information about ourselves, in case this node is a validator.
 	pub validator_info: ValidatorInfo,
+	/// Session executor parameters
+	pub executor_params: ExecutorParams,
 }
 
 /// Information about ourselves, in case we are an `Authority`.
@@ -101,7 +109,7 @@ impl Default for Config {
 		Self {
 			keystore: None,
 			// Usually we need to cache the current and the last session.
-			session_cache_lru_size: NonZeroUsize::new(2).expect("2 is larger than 0; qed"),
+			session_cache_lru_size: 2,
 		}
 	}
 }
@@ -115,11 +123,9 @@ impl RuntimeInfo {
 	/// Create with more elaborate configuration options.
 	pub fn new_with_config(cfg: Config) -> Self {
 		Self {
-			session_index_cache: LruCache::new(
-				cfg.session_cache_lru_size
-					.max(NonZeroUsize::new(10).expect("10 is larger than 0; qed")),
-			),
-			session_info_cache: LruCache::new(cfg.session_cache_lru_size),
+			session_index_cache: LruMap::new(ByLength::new(cfg.session_cache_lru_size.max(10))),
+			session_info_cache: LruMap::new(ByLength::new(cfg.session_cache_lru_size)),
+			pinned_blocks: LruMap::new(ByLength::new(cfg.session_cache_lru_size)),
 			keystore: cfg.keystore,
 		}
 	}
@@ -139,12 +145,23 @@ impl RuntimeInfo {
 			None => {
 				let index =
 					recv_runtime(request_session_index_for_child(parent, sender).await).await?;
-				self.session_index_cache.put(parent, index);
+				self.session_index_cache.insert(parent, index);
 				Ok(index)
 			},
 		}
 	}
 
+	/// Pin a given block in the given session if none are pinned in that session.
+	/// Unpinning will happen automatically when LRU cache grows over the limit.
+	pub fn pin_block(&mut self, session_index: SessionIndex, unpin_handle: UnpinHandle) {
+		self.pinned_blocks.get_or_insert(session_index, || unpin_handle);
+	}
+
+	/// Get the hash of a pinned block for the given session index, if any.
+	pub fn get_block_in_session(&self, session_index: SessionIndex) -> Option<Hash> {
+		self.pinned_blocks.peek(&session_index).map(|h| h.hash())
+	}
+
 	/// Get `ExtendedSessionInfo` by relay parent hash.
 	pub async fn get_session_info<'a, Sender>(
 		&'a mut self,
@@ -172,16 +189,22 @@ impl RuntimeInfo {
 	where
 		Sender: SubsystemSender<RuntimeApiMessage>,
 	{
-		if !self.session_info_cache.contains(&session_index) {
+		if self.session_info_cache.get(&session_index).is_none() {
 			let session_info =
 				recv_runtime(request_session_info(parent, session_index, sender).await)
 					.await?
 					.ok_or(JfyiError::NoSuchSession(session_index))?;
+
+			let executor_params =
+				recv_runtime(request_session_executor_params(parent, session_index, sender).await)
+					.await?
+					.ok_or(JfyiError::NoExecutorParams(session_index))?;
+
 			let validator_info = self.get_validator_info(&session_info)?;
 
-			let full_info = ExtendedSessionInfo { session_info, validator_info };
+			let full_info = ExtendedSessionInfo { session_info, validator_info, executor_params };
 
-			self.session_info_cache.put(session_index, full_info);
+			self.session_info_cache.insert(session_index, full_info);
 		}
 		Ok(self
 			.session_info_cache
@@ -354,7 +377,7 @@ where
 pub async fn get_unapplied_slashes<Sender>(
 	sender: &mut Sender,
 	relay_parent: Hash,
-) -> Result<Vec<(SessionIndex, CandidateHash, vstaging::slashing::PendingSlashes)>>
+) -> Result<Vec<(SessionIndex, CandidateHash, slashing::PendingSlashes)>>
 where
 	Sender: SubsystemSender<RuntimeApiMessage>,
 {
@@ -369,7 +392,7 @@ pub async fn key_ownership_proof<Sender>(
 	sender: &mut Sender,
 	relay_parent: Hash,
 	validator_id: ValidatorId,
-) -> Result<Option<vstaging::slashing::OpaqueKeyOwnershipProof>>
+) -> Result<Option<slashing::OpaqueKeyOwnershipProof>>
 where
 	Sender: SubsystemSender<RuntimeApiMessage>,
 {
@@ -380,8 +403,8 @@ where
 pub async fn submit_report_dispute_lost<Sender>(
 	sender: &mut Sender,
 	relay_parent: Hash,
-	dispute_proof: vstaging::slashing::DisputeProof,
-	key_ownership_proof: vstaging::slashing::OpaqueKeyOwnershipProof,
+	dispute_proof: slashing::DisputeProof,
+	key_ownership_proof: slashing::OpaqueKeyOwnershipProof,
 ) -> Result<Option<()>>
 where
 	Sender: SubsystemSender<RuntimeApiMessage>,
@@ -406,7 +429,7 @@ where
 pub enum ProspectiveParachainsMode {
 	/// Runtime API without support of `async_backing_params`: no prospective parachains.
 	Disabled,
-	/// vstaging runtime API: prospective parachains.
+	/// v6 runtime API: prospective parachains.
 	Enabled {
 		/// The maximum number of para blocks between the para head in a relay parent
 		/// and a new candidate. Restricts nodes from building arbitrary long chains
@@ -434,8 +457,7 @@ pub async fn prospective_parachains_mode<Sender>(
 where
 	Sender: SubsystemSender<RuntimeApiMessage>,
 {
-	let result =
-		recv_runtime(request_staging_async_backing_params(relay_parent, sender).await).await;
+	let result = recv_runtime(request_async_backing_params(relay_parent, sender).await).await;
 
 	if let Err(error::Error::RuntimeRequest(RuntimeApiError::NotSupported { runtime_api_name })) =
 		&result
@@ -449,10 +471,39 @@ where
 
 		Ok(ProspectiveParachainsMode::Disabled)
 	} else {
-		let vstaging::AsyncBackingParams { max_candidate_depth, allowed_ancestry_len } = result?;
+		let AsyncBackingParams { max_candidate_depth, allowed_ancestry_len } = result?;
 		Ok(ProspectiveParachainsMode::Enabled {
 			max_candidate_depth: max_candidate_depth as _,
 			allowed_ancestry_len: allowed_ancestry_len as _,
 		})
 	}
 }
+
+/// Request the min backing votes value.
+/// Prior to runtime API version 6, just return a hardcoded constant.
+pub async fn request_min_backing_votes(
+	parent: Hash,
+	session_index: SessionIndex,
+	sender: &mut impl overseer::SubsystemSender<RuntimeApiMessage>,
+) -> Result<u32> {
+	let min_backing_votes_res = recv_runtime(
+		request_from_runtime(parent, sender, |tx| {
+			RuntimeApiRequest::MinimumBackingVotes(session_index, tx)
+		})
+		.await,
+	)
+	.await;
+
+	if let Err(Error::RuntimeRequest(RuntimeApiError::NotSupported { .. })) = min_backing_votes_res
+	{
+		gum::trace!(
+			target: LOG_TARGET,
+			?parent,
+			"Querying the backing threshold from the runtime is not supported by the current Runtime API",
+		);
+
+		Ok(LEGACY_MIN_BACKING_VOTES)
+	} else {
+		min_backing_votes_res
+	}
+}
diff --git a/polkadot/node/subsystem/Cargo.toml b/polkadot/node/subsystem/Cargo.toml
index 368a194091f53c7cfe9b9032d1d1a731348b513f..9b77359517c9926511eda509c7976386540619b8 100644
--- a/polkadot/node/subsystem/Cargo.toml
+++ b/polkadot/node/subsystem/Cargo.toml
@@ -1,7 +1,7 @@
 [package]
 name = "polkadot-node-subsystem"
 description = "Subsystem traits and message definitions and the generated overseer"
-version.workspace = true
+version = "1.0.0"
 authors.workspace = true
 edition.workspace = true
 license.workspace = true
diff --git a/polkadot/node/test/client/Cargo.toml b/polkadot/node/test/client/Cargo.toml
index f63dd1429442b31a763eaed29dc9a4b5fcbfa91e..bc4ff74be4bb89587408ee91f54cf9d00d97abe3 100644
--- a/polkadot/node/test/client/Cargo.toml
+++ b/polkadot/node/test/client/Cargo.toml
@@ -1,7 +1,7 @@
 [package]
 name = "polkadot-test-client"
 publish = false
-version.workspace = true
+version = "1.0.0"
 authors.workspace = true
 edition.workspace = true
 license.workspace = true
@@ -38,4 +38,11 @@ sp-keyring = { path = "../../../../substrate/primitives/keyring" }
 futures = "0.3.21"
 
 [features]
-runtime-benchmarks=[ "polkadot-test-runtime/runtime-benchmarks" ]
+runtime-benchmarks= [
+	"frame-benchmarking/runtime-benchmarks",
+	"polkadot-primitives/runtime-benchmarks",
+	"polkadot-test-runtime/runtime-benchmarks",
+	"polkadot-test-service/runtime-benchmarks",
+	"sc-service/runtime-benchmarks",
+	"sp-runtime/runtime-benchmarks",
+]
diff --git a/polkadot/node/test/client/src/block_builder.rs b/polkadot/node/test/client/src/block_builder.rs
index 0987cef55c1f1a2a377fdf62a947efb70eab4ef0..b4ff050ff1529f29886f281a1a0f0ebffed2a13a 100644
--- a/polkadot/node/test/client/src/block_builder.rs
+++ b/polkadot/node/test/client/src/block_builder.rs
@@ -41,7 +41,7 @@ pub trait InitPolkadotBlockBuilder {
 	/// Init a Polkadot specific block builder at a specific block that works for the test runtime.
 	///
 	/// Same as [`InitPolkadotBlockBuilder::init_polkadot_block_builder`] besides that it takes a
-	/// [`BlockId`] to say which should be the parent block of the block that is being build.
+	/// `Hash` to say which should be the parent block of the block that is being build.
 	fn init_polkadot_block_builder_at(
 		&self,
 		hash: <Block as BlockT>::Hash,
diff --git a/polkadot/node/test/performance-test/Cargo.toml b/polkadot/node/test/performance-test/Cargo.toml
deleted file mode 100644
index 0e3236795fb4c36ad7d06d219d5eed922eb5b2de..0000000000000000000000000000000000000000
--- a/polkadot/node/test/performance-test/Cargo.toml
+++ /dev/null
@@ -1,30 +0,0 @@
-[package]
-name = "polkadot-performance-test"
-publish = false
-version.workspace = true
-authors.workspace = true
-edition.workspace = true
-license.workspace = true
-
-[dependencies]
-thiserror = "1.0.31"
-quote = "1.0.28"
-env_logger = "0.9"
-log = "0.4"
-
-polkadot-node-core-pvf-prepare-worker = { path = "../../core/pvf/prepare-worker" }
-polkadot-erasure-coding = { path = "../../../erasure-coding" }
-polkadot-node-primitives = { path = "../../primitives" }
-polkadot-primitives = { path = "../../../primitives" }
-
-sc-executor-common = { path = "../../../../substrate/client/executor/common" }
-sp-maybe-compressed-blob = { path = "../../../../substrate/primitives/maybe-compressed-blob" }
-
-kusama-runtime = { path = "../../../runtime/kusama" }
-
-[[bin]]
-name = "gen-ref-constants"
-path = "src/gen_ref_constants.rs"
-
-[features]
-runtime-benchmarks = [ "kusama-runtime/runtime-benchmarks" ]
diff --git a/polkadot/node/test/performance-test/src/constants.rs b/polkadot/node/test/performance-test/src/constants.rs
deleted file mode 100644
index 158646ffc6ecf71c5ca06ab8f6e36eb3599074fb..0000000000000000000000000000000000000000
--- a/polkadot/node/test/performance-test/src/constants.rs
+++ /dev/null
@@ -1,22 +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/>.
-
-//! This file was automatically generated by `gen-ref-constants`.
-//! Do not edit manually!
-
-use std::time::Duration;
-pub const PVF_PREPARE_TIME_LIMIT: Duration = Duration::from_millis(4910u64);
-pub const ERASURE_CODING_TIME_LIMIT: Duration = Duration::from_millis(466u64);
diff --git a/polkadot/node/test/performance-test/src/gen_ref_constants.rs b/polkadot/node/test/performance-test/src/gen_ref_constants.rs
deleted file mode 100644
index ba10ed215552da7d6b2960ab9680d1d25535e778..0000000000000000000000000000000000000000
--- a/polkadot/node/test/performance-test/src/gen_ref_constants.rs
+++ /dev/null
@@ -1,99 +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/>.
-
-//! Generate reference performance check results.
-
-use polkadot_performance_test::PerfCheckError;
-
-fn main() -> Result<(), PerfCheckError> {
-	#[cfg(build_type = "release")]
-	{
-		run::run()
-	}
-	#[cfg(not(build_type = "release"))]
-	{
-		Err(PerfCheckError::WrongBuildType)
-	}
-}
-
-#[cfg(build_type = "release")]
-mod run {
-	use polkadot_node_primitives::VALIDATION_CODE_BOMB_LIMIT;
-	use polkadot_performance_test::{
-		measure_erasure_coding, measure_pvf_prepare, PerfCheckError, ERASURE_CODING_N_VALIDATORS,
-	};
-	use std::{
-		fs::OpenOptions,
-		io::{self, Write},
-		time::Duration,
-	};
-
-	const WARM_UP_RUNS: usize = 16;
-	const FILE_HEADER: &str = include_str!("../../../../file_header.txt");
-	const DOC_COMMENT: &str = "//! This file was automatically generated by `gen-ref-constants`.\n//! Do not edit manually!";
-	const FILE_PATH: &str = concat!(env!("CARGO_MANIFEST_DIR"), "/src/constants.rs");
-
-	fn save_constants(pvf_prepare: Duration, erasure_coding: Duration) -> io::Result<()> {
-		let mut output =
-			OpenOptions::new().truncate(true).create(true).write(true).open(FILE_PATH)?;
-
-		writeln!(output, "{}\n\n{}\n", FILE_HEADER, DOC_COMMENT)?;
-
-		let pvf_prepare_millis = pvf_prepare.as_millis() as u64;
-		let erasure_coding_millis = erasure_coding.as_millis() as u64;
-
-		let token_stream = quote::quote! {
-			use std::time::Duration;
-
-			pub const PVF_PREPARE_TIME_LIMIT: Duration = Duration::from_millis(#pvf_prepare_millis);
-			pub const ERASURE_CODING_TIME_LIMIT: Duration = Duration::from_millis(#erasure_coding_millis);
-		};
-
-		writeln!(output, "{}", token_stream.to_string())?;
-		Ok(())
-	}
-
-	pub fn run() -> Result<(), PerfCheckError> {
-		let _ = env_logger::builder().filter(None, log::LevelFilter::Info).try_init();
-
-		let wasm_code =
-			polkadot_performance_test::WASM_BINARY.ok_or(PerfCheckError::WasmBinaryMissing)?;
-
-		log::info!("Running the benchmark, number of iterations: {}", WARM_UP_RUNS);
-
-		let code = sp_maybe_compressed_blob::decompress(wasm_code, VALIDATION_CODE_BOMB_LIMIT)
-			.or(Err(PerfCheckError::CodeDecompressionFailed))?;
-
-		let (pvf_prepare_time, erasure_coding_time) = (1..=WARM_UP_RUNS)
-			.map(|i| {
-				if i - 1 > 0 && (i - 1) % 5 == 0 {
-					log::info!("{} iterations done", i - 1);
-				}
-				(
-					measure_pvf_prepare(code.as_ref()),
-					measure_erasure_coding(ERASURE_CODING_N_VALIDATORS, code.as_ref()),
-				)
-			})
-			.last()
-			.expect("`WARM_UP_RUNS` is greater than 1 and thus we have at least one element; qed");
-
-		save_constants(pvf_prepare_time?, erasure_coding_time?)?;
-
-		log::info!("Successfully stored new reference values at {:?}. Make sure to format the file via `cargo +nightly fmt`", FILE_PATH);
-
-		Ok(())
-	}
-}
diff --git a/polkadot/node/test/performance-test/src/lib.rs b/polkadot/node/test/performance-test/src/lib.rs
deleted file mode 100644
index 15073912654a4dd8cb24bae532ab305b5aa453e3..0000000000000000000000000000000000000000
--- a/polkadot/node/test/performance-test/src/lib.rs
+++ /dev/null
@@ -1,89 +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/>.
-
-//! A Polkadot performance tests utilities.
-
-use polkadot_erasure_coding::{obtain_chunks, reconstruct};
-use polkadot_primitives::ExecutorParams;
-use std::time::{Duration, Instant};
-
-mod constants;
-
-pub use constants::*;
-pub use polkadot_node_primitives::VALIDATION_CODE_BOMB_LIMIT;
-
-/// Value used for reference benchmark of erasure-coding.
-pub const ERASURE_CODING_N_VALIDATORS: usize = 1024;
-
-pub use kusama_runtime::WASM_BINARY;
-
-#[allow(missing_docs)]
-#[derive(thiserror::Error, Debug)]
-pub enum PerfCheckError {
-	#[error("This subcommand is only available in release mode")]
-	WrongBuildType,
-
-	#[error("No wasm code found for running the performance test")]
-	WasmBinaryMissing,
-
-	#[error("Failed to decompress wasm code")]
-	CodeDecompressionFailed,
-
-	#[error(transparent)]
-	Wasm(#[from] sc_executor_common::error::WasmError),
-
-	#[error(transparent)]
-	ErasureCoding(#[from] polkadot_erasure_coding::Error),
-
-	#[error(transparent)]
-	Io(#[from] std::io::Error),
-
-	#[error(
-		"Performance check not passed: exceeded the {limit:?} time limit, elapsed: {elapsed:?}"
-	)]
-	TimeOut { elapsed: Duration, limit: Duration },
-}
-
-/// Measures the time it takes to compile arbitrary wasm code.
-pub fn measure_pvf_prepare(wasm_code: &[u8]) -> Result<Duration, PerfCheckError> {
-	let start = Instant::now();
-
-	let code = sp_maybe_compressed_blob::decompress(wasm_code, VALIDATION_CODE_BOMB_LIMIT)
-		.or(Err(PerfCheckError::CodeDecompressionFailed))?;
-
-	// Recreate the pipeline from the pvf prepare worker.
-	let blob = polkadot_node_core_pvf_prepare_worker::prevalidate(code.as_ref())
-		.map_err(PerfCheckError::from)?;
-	polkadot_node_core_pvf_prepare_worker::prepare(blob, &ExecutorParams::default())
-		.map_err(PerfCheckError::from)?;
-
-	Ok(start.elapsed())
-}
-
-/// Measure the time it takes to break arbitrary data into chunks and reconstruct it back.
-pub fn measure_erasure_coding(
-	n_validators: usize,
-	data: &[u8],
-) -> Result<Duration, PerfCheckError> {
-	let start = Instant::now();
-
-	let chunks = obtain_chunks(n_validators, &data)?;
-	let indexed_chunks = chunks.iter().enumerate().map(|(i, chunk)| (chunk.as_slice(), i));
-
-	let _: Vec<u8> = reconstruct(n_validators, indexed_chunks)?;
-
-	Ok(start.elapsed())
-}
diff --git a/polkadot/node/test/service/Cargo.toml b/polkadot/node/test/service/Cargo.toml
index c9cb599d2fa0e83160249575b07ab51125ef11ae..1924418a48565e12fa5f1b628943f604ba9c4116 100644
--- a/polkadot/node/test/service/Cargo.toml
+++ b/polkadot/node/test/service/Cargo.toml
@@ -1,7 +1,7 @@
 [package]
 name = "polkadot-test-service"
 publish = false
-version.workspace = true
+version = "1.0.0"
 authors.workspace = true
 edition.workspace = true
 license.workspace = true
@@ -11,13 +11,14 @@ futures = "0.3.21"
 hex = "0.4.3"
 gum = { package = "tracing-gum", path = "../../gum" }
 rand = "0.8.5"
+serde_json = "1.0.106"
 tempfile = "3.2.0"
 tokio = "1.24.2"
 
 # Polkadot dependencies
 polkadot-overseer = { path = "../../overseer" }
 polkadot-primitives = { path = "../../../primitives" }
-polkadot-parachain = { path = "../../../parachain" }
+polkadot-parachain-primitives = { path = "../../../parachain" }
 polkadot-rpc = { path = "../../../rpc" }
 polkadot-runtime-common = { path = "../../../runtime/common" }
 polkadot-service = { path = "../../service" }
@@ -58,13 +59,22 @@ substrate-test-client = { path = "../../../../substrate/test-utils/client" }
 
 [dev-dependencies]
 pallet-balances = { path = "../../../../substrate/frame/balances", default-features = false }
-serde_json = "1.0.96"
+serde_json = "1.0.107"
 substrate-test-utils = { path = "../../../../substrate/test-utils" }
 tokio = { version = "1.24.2", features = ["macros"] }
 
 [features]
 runtime-metrics=[ "polkadot-test-runtime/runtime-metrics" ]
 runtime-benchmarks= [
+	"frame-system/runtime-benchmarks",
+	"pallet-balances/runtime-benchmarks",
+	"pallet-staking/runtime-benchmarks",
+	"polkadot-parachain-primitives/runtime-benchmarks",
+	"polkadot-primitives/runtime-benchmarks",
+	"polkadot-runtime-common/runtime-benchmarks",
+	"polkadot-runtime-parachains/runtime-benchmarks",
 	"polkadot-service/runtime-benchmarks",
 	"polkadot-test-runtime/runtime-benchmarks",
+	"sc-service/runtime-benchmarks",
+	"sp-runtime/runtime-benchmarks",
 ]
diff --git a/polkadot/node/test/service/README.md b/polkadot/node/test/service/README.md
index 2fdee46a7f932010eeab1c30a7766dfb4049fbc3..b0240588c44cef277067dd1513a213fc3ed02d92 100644
--- a/polkadot/node/test/service/README.md
+++ b/polkadot/node/test/service/README.md
@@ -1,4 +1,4 @@
-# polkadot-test-service
+# `polkadot-test-service`
 
 ## Testing
 
diff --git a/polkadot/node/test/service/src/chain_spec.rs b/polkadot/node/test/service/src/chain_spec.rs
index 9aadd7d203c0d6ba6197a0b7c55c20172dcd6deb..bedb1250b2a9853a7bcf96867b717cee92f272c5 100644
--- a/polkadot/node/test/service/src/chain_spec.rs
+++ b/polkadot/node/test/service/src/chain_spec.rs
@@ -20,9 +20,7 @@ use babe_primitives::AuthorityId as BabeId;
 use grandpa::AuthorityId as GrandpaId;
 use pallet_staking::Forcing;
 use polkadot_primitives::{AccountId, AssignmentId, ValidatorId, MAX_CODE_SIZE, MAX_POV_SIZE};
-use polkadot_service::chain_spec::{
-	get_account_id_from_seed, get_from_seed, polkadot_chain_spec_properties, Extensions,
-};
+use polkadot_service::chain_spec::{get_account_id_from_seed, get_from_seed, Extensions};
 use polkadot_test_runtime::BABE_GENESIS_EPOCH_CONFIG;
 use sc_chain_spec::{ChainSpec, ChainType};
 use sp_authority_discovery::AuthorityId as AuthorityDiscoveryId;
@@ -36,6 +34,16 @@ const DEFAULT_PROTOCOL_ID: &str = "dot";
 pub type PolkadotChainSpec =
 	sc_service::GenericChainSpec<polkadot_test_runtime::RuntimeGenesisConfig, Extensions>;
 
+/// Returns the properties for the [`PolkadotChainSpec`].
+pub fn polkadot_chain_spec_properties() -> serde_json::map::Map<String, serde_json::Value> {
+	serde_json::json!({
+		"tokenDecimals": 10,
+	})
+	.as_object()
+	.expect("Map given; qed")
+	.clone()
+}
+
 /// Local testnet config (multivalidator Alice + Bob)
 pub fn polkadot_local_testnet_config() -> PolkadotChainSpec {
 	PolkadotChainSpec::from_genesis(
diff --git a/polkadot/node/test/service/tests/build-blocks.rs b/polkadot/node/test/service/tests/build-blocks.rs
index b75fed60297ab902f30453ed8d8cfc5246e95a22..d5c6ab0b5ba66b7a653d7d632bbde6fd07dd0b5c 100644
--- a/polkadot/node/test/service/tests/build-blocks.rs
+++ b/polkadot/node/test/service/tests/build-blocks.rs
@@ -18,7 +18,7 @@ use futures::{future, pin_mut, select, FutureExt};
 use polkadot_test_service::*;
 use sp_keyring::Sr25519Keyring;
 
-#[substrate_test_utils::test(flavor = "multi_thread")]
+#[tokio::test(flavor = "multi_thread")]
 async fn ensure_test_service_build_blocks() {
 	let mut builder = sc_cli::LoggerBuilder::new("");
 	builder.with_colors(false);
diff --git a/polkadot/node/test/service/tests/call-function.rs b/polkadot/node/test/service/tests/call-function.rs
index c3baefdb9c91a4b338ebe266bee51028def80189..39d162eb37697b575f0195fec2b61b934920a4e9 100644
--- a/polkadot/node/test/service/tests/call-function.rs
+++ b/polkadot/node/test/service/tests/call-function.rs
@@ -17,7 +17,7 @@
 use polkadot_test_service::*;
 use sp_keyring::Sr25519Keyring::{Alice, Bob, Charlie};
 
-#[substrate_test_utils::test(flavor = "multi_thread")]
+#[tokio::test(flavor = "multi_thread")]
 async fn call_function_actually_work() {
 	let alice_config =
 		node_config(|| {}, tokio::runtime::Handle::current(), Alice, Vec::new(), true);
diff --git a/polkadot/node/zombienet-backchannel/Cargo.toml b/polkadot/node/zombienet-backchannel/Cargo.toml
index 627de13124aa2a4e1422eb3f4726b1e293db11dc..9bf56b550bbcd7803806bf37d2a40b9ac5a92e01 100644
--- a/polkadot/node/zombienet-backchannel/Cargo.toml
+++ b/polkadot/node/zombienet-backchannel/Cargo.toml
@@ -3,7 +3,7 @@ name = "zombienet-backchannel"
 description = "Zombienet backchannel to notify test runner and coordinate with malus actors."
 readme = "README.md"
 publish = false
-version.workspace = true
+version = "1.0.0"
 authors.workspace = true
 edition.workspace = true
 license.workspace = true
@@ -16,7 +16,7 @@ futures-util = "0.3.23"
 lazy_static = "1.4.0"
 parity-scale-codec = { version = "3.6.1", features = ["derive"] }
 reqwest = { version = "0.11", features = ["rustls-tls"], default-features = false }
-thiserror = "1.0.31"
+thiserror = "1.0.48"
 gum = { package = "tracing-gum", path = "../gum" }
 serde = { version = "1.0", features = ["derive"] }
 serde_json = "1"
diff --git a/polkadot/parachain/Cargo.toml b/polkadot/parachain/Cargo.toml
index 032004229f0a6b211d75167293467a955be58f44..c44ba02e3aeb0f7ada07698ab69703e9ff2ecae7 100644
--- a/polkadot/parachain/Cargo.toml
+++ b/polkadot/parachain/Cargo.toml
@@ -1,10 +1,10 @@
 [package]
-name = "polkadot-parachain"
+name = "polkadot-parachain-primitives"
 description = "Types and utilities for creating and working with parachains"
 authors.workspace = true
 edition.workspace = true
 license.workspace = true
-version.workspace = true
+version = "1.0.0"
 
 [dependencies]
 # note: special care is taken to avoid inclusion of `sp-io` externals when compiling
@@ -21,7 +21,7 @@ derive_more = "0.99.11"
 bounded-collections = { version = "0.1.8", default-features = false, features = ["serde"] }
 
 # all optional crates.
-serde = { version = "1.0.163", default-features = false, features = ["derive", "alloc"] }
+serde = { version = "1.0.188", default-features = false, features = ["derive", "alloc"] }
 
 [features]
 default = [ "std" ]
@@ -37,4 +37,7 @@ std = [
 	"sp-runtime/std",
 	"sp-std/std",
 ]
-runtime-benchmarks = []
+runtime-benchmarks = [
+	"frame-support/runtime-benchmarks",
+	"sp-runtime/runtime-benchmarks",
+]
diff --git a/polkadot/parachain/README.adoc b/polkadot/parachain/README.adoc
deleted file mode 100644
index 8650919e64ec45b9c3ceb5aee36bb3112c06a678..0000000000000000000000000000000000000000
--- a/polkadot/parachain/README.adoc
+++ /dev/null
@@ -1,5 +0,0 @@
-
-= Polkadot Parachain
-
-placeholder
-//TODO Write content :) (https://github.com/paritytech/polkadot/issues/159)
diff --git a/polkadot/parachain/src/lib.rs b/polkadot/parachain/src/lib.rs
index 7bead2314839f4974494297952293e62f6fba061..913d887e4a8a73a4a35aea9dd5b62edc579efce3 100644
--- a/polkadot/parachain/src/lib.rs
+++ b/polkadot/parachain/src/lib.rs
@@ -27,10 +27,11 @@
 //! instance and exports a function `validate_block`.
 //!
 //! `validate` accepts as input two `i32` values, representing a pointer/length pair
-//! respectively, that encodes [`ValidationParams`].
+//! respectively, that encodes [`ValidationParams`](primitives::ValidationParams).
 //!
 //! `validate` returns an `u64` which is a pointer to an `u8` array and its length.
-//! The data in the array is expected to be a SCALE encoded [`ValidationResult`].
+//! The data in the array is expected to be a SCALE encoded
+//! [`ValidationResult`](primitives::ValidationResult).
 //!
 //! ASCII-diagram demonstrating the return data format:
 //!
diff --git a/polkadot/parachain/src/primitives.rs b/polkadot/parachain/src/primitives.rs
index 5cea9d3bbf4e827a632a103132626a39c623c5c2..5f77810f5c235adffc5bde8c377b1058ef7a8644 100644
--- a/polkadot/parachain/src/primitives.rs
+++ b/polkadot/parachain/src/primitives.rs
@@ -199,13 +199,11 @@ impl From<i32> for Id {
 	}
 }
 
-const USER_INDEX_START: u32 = 1000;
+// System parachain ID is considered `< 2000`.
+const SYSTEM_INDEX_END: u32 = 1999;
 const PUBLIC_INDEX_START: u32 = 2000;
 
-/// The ID of the first user (non-system) parachain.
-pub const LOWEST_USER_ID: Id = Id(USER_INDEX_START);
-
-/// The ID of the first publicly registerable parachain.
+/// The ID of the first publicly registrable parachain.
 pub const LOWEST_PUBLIC_ID: Id = Id(PUBLIC_INDEX_START);
 
 impl Id {
@@ -223,7 +221,7 @@ pub trait IsSystem {
 
 impl IsSystem for Id {
 	fn is_system(&self) -> bool {
-		self.0 < USER_INDEX_START
+		self.0 <= SYSTEM_INDEX_END
 	}
 }
 
diff --git a/polkadot/parachain/test-parachains/Cargo.toml b/polkadot/parachain/test-parachains/Cargo.toml
index fdc3c7f29246315ed96e5dd00878993ef537f83a..a30be9c678af83871182389e2c391e041c61bdc1 100644
--- a/polkadot/parachain/test-parachains/Cargo.toml
+++ b/polkadot/parachain/test-parachains/Cargo.toml
@@ -1,7 +1,7 @@
 [package]
 name = "test-parachains"
 description = "Integration tests using the test-parachains"
-version.workspace = true
+version = "1.0.0"
 authors.workspace = true
 edition.workspace = true
 license.workspace = true
diff --git a/polkadot/parachain/test-parachains/README.md b/polkadot/parachain/test-parachains/README.md
index 2c708bd543185744506bf559baa18d83003bb7d3..e679d40591b393d7bedfdf4492a985a00da130be 100644
--- a/polkadot/parachain/test-parachains/README.md
+++ b/polkadot/parachain/test-parachains/README.md
@@ -1,3 +1,4 @@
 # Test Parachains
 
-Each parachain consists of three parts: a `#![no_std]` library with the main execution logic, a WASM crate which wraps this logic, and a collator node.
+Each parachain consists of three parts: a `#![no_std]` library with the main execution logic, a WASM crate which wraps
+this logic, and a collator node.
diff --git a/polkadot/parachain/test-parachains/adder/Cargo.toml b/polkadot/parachain/test-parachains/adder/Cargo.toml
index ca477e3b6ff1ff09ad5fe6db9f411f3f796a15bc..f22b5ccfdcc9894bd1e6cd29212648a1cdd58e16 100644
--- a/polkadot/parachain/test-parachains/adder/Cargo.toml
+++ b/polkadot/parachain/test-parachains/adder/Cargo.toml
@@ -4,12 +4,12 @@ description = "Test parachain which adds to a number as its state transition"
 build = "build.rs"
 edition.workspace = true
 license.workspace = true
-version.workspace = true
+version = "1.0.0"
 authors.workspace = true
 publish = false
 
 [dependencies]
-parachain = { package = "polkadot-parachain", path = "../..", default-features = false, features = [ "wasm-api" ] }
+parachain = { package = "polkadot-parachain-primitives", path = "../..", default-features = false, features = [ "wasm-api" ] }
 parity-scale-codec = { version = "3.6.1", default-features = false, features = ["derive"] }
 sp-std = { path = "../../../../substrate/primitives/std", default-features = false }
 tiny-keccak = { version = "2.0.2", features = ["keccak"] }
@@ -23,4 +23,4 @@ substrate-wasm-builder = { path = "../../../../substrate/utils/wasm-builder" }
 
 [features]
 default = [ "std" ]
-std = [ "parachain/std", "sp-std/std" ]
+std = [ "parachain/std", "sp-io/std", "sp-std/std" ]
diff --git a/polkadot/parachain/test-parachains/adder/collator/Cargo.toml b/polkadot/parachain/test-parachains/adder/collator/Cargo.toml
index b96d27e6ab77a1c49d5acf6d61ed9b3b104cdc30..70f2ae769a8f4cd5f59aaf2cc707053f0d3f35e2 100644
--- a/polkadot/parachain/test-parachains/adder/collator/Cargo.toml
+++ b/polkadot/parachain/test-parachains/adder/collator/Cargo.toml
@@ -2,7 +2,7 @@
 name = "test-parachain-adder-collator"
 description = "Collator for the adder test parachain"
 publish = false
-version.workspace = true
+version = "1.0.0"
 authors.workspace = true
 edition.workspace = true
 license.workspace = true
@@ -11,14 +11,9 @@ license.workspace = true
 name = "adder-collator"
 path = "src/main.rs"
 
-[[bin]]
-name = "adder_collator_puppet_worker"
-path = "bin/puppet_worker.rs"
-required-features = ["test-utils"]
-
 [dependencies]
 parity-scale-codec = { version = "3.6.1", default-features = false, features = ["derive"] }
-clap = { version = "4.0.9", features = ["derive"] }
+clap = { version = "4.4.6", features = ["derive"] }
 futures = "0.3.21"
 futures-timer = "3.0.2"
 log = "0.4.17"
@@ -33,25 +28,14 @@ polkadot-node-subsystem = { path = "../../../../node/subsystem" }
 sc-cli = { path = "../../../../../substrate/client/cli" }
 sp-core = { path = "../../../../../substrate/primitives/core" }
 sc-service = { path = "../../../../../substrate/client/service" }
-# This one is tricky. Even though it is not used directly by the collator, we still need it for the
-# `puppet_worker` binary, which is required for the integration test. However, this shouldn't be
-# a big problem since it is used transitively anyway.
-polkadot-node-core-pvf = { path = "../../../../node/core/pvf", features = ["test-utils"], optional = true }
 
 [dev-dependencies]
-polkadot-parachain = { path = "../../.." }
+polkadot-parachain-primitives = { path = "../../.." }
 polkadot-test-service = { path = "../../../../node/test/service" }
+polkadot-node-core-pvf = { path = "../../../../node/core/pvf", features = ["test-utils"] }
 
 substrate-test-utils = { path = "../../../../../substrate/test-utils" }
 sc-service = { path = "../../../../../substrate/client/service" }
 sp-keyring = { path = "../../../../../substrate/primitives/keyring" }
-# For the puppet worker, depend on ourselves with the test-utils feature.
-test-parachain-adder-collator = { path = "", features = ["test-utils"] }
 
 tokio = { version = "1.24.2", features = ["macros"] }
-
-[features]
-network-protocol-staging = [ "polkadot-cli/network-protocol-staging" ]
-# This feature is used to export test code to other crates without putting it in the production build.
-# This is also used by the `puppet_worker` binary.
-test-utils = [ "polkadot-node-core-pvf/test-utils" ]
diff --git a/polkadot/parachain/test-parachains/adder/collator/README.md b/polkadot/parachain/test-parachains/adder/collator/README.md
index a1378544c386f9fb3edb1f3be3e9675a4c61acc7..dd737627c9ad9ca443131b91707b23ad9ccb84ee 100644
--- a/polkadot/parachain/test-parachains/adder/collator/README.md
+++ b/polkadot/parachain/test-parachains/adder/collator/README.md
@@ -19,7 +19,7 @@ Next start the collator that will collate for the adder parachain:
 cargo run --release -p test-parachain-adder-collator -- --tmp --chain rococo-local --port 50553
 ```
 
-The last step is to register the parachain using polkadot-js. The parachain id is
+The last step is to register the parachain using `polkadot-js`. The parachain id is
 100. The genesis state and the validation code are printed at startup by the collator.
 
 To do this automatically, run `scripts/adder-collator.sh`.
diff --git a/polkadot/parachain/test-parachains/adder/collator/bin/puppet_worker.rs b/polkadot/parachain/test-parachains/adder/collator/bin/puppet_worker.rs
deleted file mode 100644
index 7f93519d845400684a8e3a044ea5ecac50566ac5..0000000000000000000000000000000000000000
--- a/polkadot/parachain/test-parachains/adder/collator/bin/puppet_worker.rs
+++ /dev/null
@@ -1,17 +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/>.
-
-polkadot_node_core_pvf::decl_puppet_worker_main!();
diff --git a/polkadot/parachain/test-parachains/adder/collator/src/cli.rs b/polkadot/parachain/test-parachains/adder/collator/src/cli.rs
index 9a865d75b606663b00c51054418582c0280448e7..14b259706835f3649d93af8b3b814f19755f8e62 100644
--- a/polkadot/parachain/test-parachains/adder/collator/src/cli.rs
+++ b/polkadot/parachain/test-parachains/adder/collator/src/cli.rs
@@ -80,7 +80,7 @@ impl SubstrateCli for Cli {
 	}
 
 	fn support_url() -> String {
-		"https://github.com/paritytech/polkadot/issues/new".into()
+		"https://github.com/paritytech/polkadot-sdk/issues/new".into()
 	}
 
 	fn copyright_start_year() -> i32 {
diff --git a/polkadot/parachain/test-parachains/adder/collator/src/lib.rs b/polkadot/parachain/test-parachains/adder/collator/src/lib.rs
index 1ac561dda2bad6b889976fa8ab3ce50c34d07ff4..5f62ae34caefa5db97f6481dfc21067e42666b50 100644
--- a/polkadot/parachain/test-parachains/adder/collator/src/lib.rs
+++ b/polkadot/parachain/test-parachains/adder/collator/src/lib.rs
@@ -249,7 +249,7 @@ mod tests {
 	use super::*;
 
 	use futures::executor::block_on;
-	use polkadot_parachain::primitives::{ValidationParams, ValidationResult};
+	use polkadot_parachain_primitives::primitives::{ValidationParams, ValidationResult};
 	use polkadot_primitives::PersistedValidationData;
 
 	#[test]
diff --git a/polkadot/parachain/test-parachains/adder/collator/tests/integration.rs b/polkadot/parachain/test-parachains/adder/collator/tests/integration.rs
index b891b29db59c1b82cbc658f583274557329345fd..85abf8bf36b978bb33aae5115711443da5968a79 100644
--- a/polkadot/parachain/test-parachains/adder/collator/tests/integration.rs
+++ b/polkadot/parachain/test-parachains/adder/collator/tests/integration.rs
@@ -17,12 +17,10 @@
 //! Integration test that ensures that we can build and include parachain
 //! blocks of the adder parachain.
 
-const PUPPET_EXE: &str = env!("CARGO_BIN_EXE_adder_collator_puppet_worker");
-
 // If this test is failing, make sure to run all tests with the `real-overseer` feature being
 // enabled.
 
-#[substrate_test_utils::test(flavor = "multi_thread")]
+#[tokio::test(flavor = "multi_thread")]
 async fn collating_using_adder_collator() {
 	use polkadot_primitives::Id as ParaId;
 	use sp_keyring::AccountKeyring::*;
@@ -41,8 +39,12 @@ async fn collating_using_adder_collator() {
 		true,
 	);
 
+	let mut workers_path = std::env::current_exe().unwrap();
+	workers_path.pop();
+	workers_path.pop();
+
 	// start alice
-	let alice = polkadot_test_service::run_validator_node(alice_config, Some(PUPPET_EXE.into()));
+	let alice = polkadot_test_service::run_validator_node(alice_config, Some(workers_path.clone()));
 
 	let bob_config = polkadot_test_service::node_config(
 		|| {},
@@ -53,7 +55,7 @@ async fn collating_using_adder_collator() {
 	);
 
 	// start bob
-	let bob = polkadot_test_service::run_validator_node(bob_config, Some(PUPPET_EXE.into()));
+	let bob = polkadot_test_service::run_validator_node(bob_config, Some(workers_path));
 
 	let collator = test_parachain_adder_collator::Collator::new();
 
diff --git a/polkadot/parachain/test-parachains/halt/Cargo.toml b/polkadot/parachain/test-parachains/halt/Cargo.toml
index 14af139ee78f88e899cc57ca2cea5337a3bac3b2..cb2918273eb03a8db6cb76fa72d7e6507f263ae5 100644
--- a/polkadot/parachain/test-parachains/halt/Cargo.toml
+++ b/polkadot/parachain/test-parachains/halt/Cargo.toml
@@ -3,7 +3,7 @@ name = "test-parachain-halt"
 description = "Test parachain which executes forever"
 build = "build.rs"
 publish = false
-version.workspace = true
+version = "1.0.0"
 authors.workspace = true
 edition.workspace = true
 license.workspace = true
diff --git a/polkadot/parachain/test-parachains/undying/Cargo.toml b/polkadot/parachain/test-parachains/undying/Cargo.toml
index 192e890c44d5fe2817e0e738ec1d0f14d833f709..8690da5a4bdd36ffce083032bed0200d2c9960d7 100644
--- a/polkadot/parachain/test-parachains/undying/Cargo.toml
+++ b/polkadot/parachain/test-parachains/undying/Cargo.toml
@@ -3,13 +3,13 @@ name = "test-parachain-undying"
 description = "Test parachain for zombienet integration tests"
 build = "build.rs"
 publish = false
-version.workspace = true
+version = "1.0.0"
 authors.workspace = true
 edition.workspace = true
 license.workspace = true
 
 [dependencies]
-parachain = { package = "polkadot-parachain", path = "../..", default-features = false, features = [ "wasm-api" ] }
+parachain = { package = "polkadot-parachain-primitives", path = "../..", default-features = false, features = [ "wasm-api" ] }
 parity-scale-codec = { version = "3.6.1", default-features = false, features = ["derive"] }
 sp-std = { path = "../../../../substrate/primitives/std", default-features = false }
 tiny-keccak = { version = "2.0.2", features = ["keccak"] }
@@ -24,4 +24,4 @@ substrate-wasm-builder = { path = "../../../../substrate/utils/wasm-builder" }
 
 [features]
 default = [ "std" ]
-std = [ "parachain/std", "sp-std/std" ]
+std = [ "parachain/std", "sp-io/std", "sp-std/std" ]
diff --git a/polkadot/parachain/test-parachains/undying/collator/Cargo.toml b/polkadot/parachain/test-parachains/undying/collator/Cargo.toml
index dd445910d9c604fc59b897922383a1ae608ec9c5..4569d4e153b19b6858f26acc77089d027e18be13 100644
--- a/polkadot/parachain/test-parachains/undying/collator/Cargo.toml
+++ b/polkadot/parachain/test-parachains/undying/collator/Cargo.toml
@@ -3,7 +3,7 @@ name = "test-parachain-undying-collator"
 description = "Collator for the undying test parachain"
 edition.workspace = true
 license.workspace = true
-version.workspace = true
+version = "1.0.0"
 authors.workspace = true
 publish = false
 
@@ -11,15 +11,10 @@ publish = false
 name = "undying-collator"
 path = "src/main.rs"
 
-[[bin]]
-name = "undying_collator_puppet_worker"
-path = "bin/puppet_worker.rs"
-required-features = ["test-utils"]
-
 [dependencies]
 parity-scale-codec = { version = "3.6.1", default-features = false, features = ["derive"] }
-clap = { version = "4.0.9", features = ["derive"] }
-futures = "0.3.19"
+clap = { version = "4.4.6", features = ["derive"] }
+futures = "0.3.21"
 futures-timer = "3.0.2"
 log = "0.4.17"
 
@@ -33,24 +28,14 @@ polkadot-node-subsystem = { path = "../../../../node/subsystem" }
 sc-cli = { path = "../../../../../substrate/client/cli" }
 sp-core = { path = "../../../../../substrate/primitives/core" }
 sc-service = { path = "../../../../../substrate/client/service" }
-# This one is tricky. Even though it is not used directly by the collator, we still need it for the
-# `puppet_worker` binary, which is required for the integration test. However, this shouldn't be
-# a big problem since it is used transitively anyway.
-polkadot-node-core-pvf = { path = "../../../../node/core/pvf", features = ["test-utils"], optional = true }
 
 [dev-dependencies]
-polkadot-parachain = { path = "../../.." }
+polkadot-parachain-primitives = { path = "../../.." }
 polkadot-test-service = { path = "../../../../node/test/service" }
-# For the puppet worker, depend on ourselves with the test-utils feature.
-test-parachain-undying-collator = { path = "", features = ["test-utils"] }
+polkadot-node-core-pvf = { path = "../../../../node/core/pvf", features = ["test-utils"] }
 
 substrate-test-utils = { path = "../../../../../substrate/test-utils" }
 sc-service = { path = "../../../../../substrate/client/service" }
 sp-keyring = { path = "../../../../../substrate/primitives/keyring" }
 
 tokio = { version = "1.24.2", features = ["macros"] }
-
-[features]
-# This feature is used to export test code to other crates without putting it in the production build.
-# This is also used by the `puppet_worker` binary.
-test-utils = [ "polkadot-node-core-pvf/test-utils" ]
diff --git a/polkadot/parachain/test-parachains/undying/collator/bin/puppet_worker.rs b/polkadot/parachain/test-parachains/undying/collator/bin/puppet_worker.rs
deleted file mode 100644
index 7f93519d845400684a8e3a044ea5ecac50566ac5..0000000000000000000000000000000000000000
--- a/polkadot/parachain/test-parachains/undying/collator/bin/puppet_worker.rs
+++ /dev/null
@@ -1,17 +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/>.
-
-polkadot_node_core_pvf::decl_puppet_worker_main!();
diff --git a/polkadot/parachain/test-parachains/undying/collator/src/cli.rs b/polkadot/parachain/test-parachains/undying/collator/src/cli.rs
index ab37fe20eebb466ea50b3bae9b0f82fb19814016..cd16133dbf197019bac15e0bca381759eabce5b6 100644
--- a/polkadot/parachain/test-parachains/undying/collator/src/cli.rs
+++ b/polkadot/parachain/test-parachains/undying/collator/src/cli.rs
@@ -102,7 +102,7 @@ impl SubstrateCli for Cli {
 	}
 
 	fn support_url() -> String {
-		"https://github.com/paritytech/polkadot/issues/new".into()
+		"https://github.com/paritytech/polkadot-sdk/issues/new".into()
 	}
 
 	fn copyright_start_year() -> i32 {
diff --git a/polkadot/parachain/test-parachains/undying/collator/src/lib.rs b/polkadot/parachain/test-parachains/undying/collator/src/lib.rs
index e0ecc6b0997d76c39afacc661f05c5be564137e1..3c869233182f8faf98e8855017a0e255d5b43167 100644
--- a/polkadot/parachain/test-parachains/undying/collator/src/lib.rs
+++ b/polkadot/parachain/test-parachains/undying/collator/src/lib.rs
@@ -338,7 +338,7 @@ use sp_core::traits::SpawnNamed;
 mod tests {
 	use super::*;
 	use futures::executor::block_on;
-	use polkadot_parachain::primitives::{ValidationParams, ValidationResult};
+	use polkadot_parachain_primitives::primitives::{ValidationParams, ValidationResult};
 	use polkadot_primitives::{Hash, PersistedValidationData};
 
 	#[test]
diff --git a/polkadot/parachain/test-parachains/undying/collator/tests/integration.rs b/polkadot/parachain/test-parachains/undying/collator/tests/integration.rs
index 21d174fb06c7166cf77a2d494db05c762532fb21..8be535b9bb4cc1275b59a9a3782ef352ac60d643 100644
--- a/polkadot/parachain/test-parachains/undying/collator/tests/integration.rs
+++ b/polkadot/parachain/test-parachains/undying/collator/tests/integration.rs
@@ -17,11 +17,9 @@
 //! Integration test that ensures that we can build and include parachain
 //! blocks of the `Undying` parachain.
 
-const PUPPET_EXE: &str = env!("CARGO_BIN_EXE_undying_collator_puppet_worker");
-
 // If this test is failing, make sure to run all tests with the `real-overseer` feature being
 // enabled.
-#[substrate_test_utils::test(flavor = "multi_thread")]
+#[tokio::test(flavor = "multi_thread")]
 async fn collating_using_undying_collator() {
 	use polkadot_primitives::Id as ParaId;
 	use sp_keyring::AccountKeyring::*;
@@ -40,8 +38,12 @@ async fn collating_using_undying_collator() {
 		true,
 	);
 
+	let mut workers_path = std::env::current_exe().unwrap();
+	workers_path.pop();
+	workers_path.pop();
+
 	// start alice
-	let alice = polkadot_test_service::run_validator_node(alice_config, Some(PUPPET_EXE.into()));
+	let alice = polkadot_test_service::run_validator_node(alice_config, Some(workers_path.clone()));
 
 	let bob_config = polkadot_test_service::node_config(
 		|| {},
@@ -52,7 +54,7 @@ async fn collating_using_undying_collator() {
 	);
 
 	// start bob
-	let bob = polkadot_test_service::run_validator_node(bob_config, Some(PUPPET_EXE.into()));
+	let bob = polkadot_test_service::run_validator_node(bob_config, Some(workers_path));
 
 	let collator = test_parachain_undying_collator::Collator::new(1_000, 1);
 
diff --git a/polkadot/primitives/Cargo.toml b/polkadot/primitives/Cargo.toml
index be05315a2d3f51a015d294ad13a79a288099827b..9d17b70b817432fae385d5b96a30105d87a77e68 100644
--- a/polkadot/primitives/Cargo.toml
+++ b/polkadot/primitives/Cargo.toml
@@ -1,6 +1,6 @@
 [package]
 name = "polkadot-primitives"
-version.workspace = true
+version = "1.0.0"
 authors.workspace = true
 edition.workspace = true
 license.workspace = true
@@ -10,7 +10,7 @@ bitvec = { version = "1.0.0", default-features = false, features = ["alloc"] }
 hex-literal = "0.4.1"
 parity-scale-codec = { version = "3.6.1", default-features = false, features = ["bit-vec", "derive"] }
 scale-info = { version = "2.5.0", default-features = false, features = ["bit-vec", "derive", "serde"] }
-serde = { version = "1.0.163", default-features = false, features = ["derive", "alloc"] }
+serde = { version = "1.0.188", default-features = false, features = ["derive", "alloc"] }
 
 application-crypto = { package = "sp-application-crypto", path = "../../substrate/primitives/application-crypto", default-features = false, features = ["serde"] }
 inherents = { package = "sp-inherents", path = "../../substrate/primitives/inherents", default-features = false }
@@ -26,7 +26,7 @@ sp-staking = { path = "../../substrate/primitives/staking", default-features = f
 sp-std = { package = "sp-std", path = "../../substrate/primitives/std", default-features = false }
 
 polkadot-core-primitives = { path = "../core-primitives", default-features = false }
-polkadot-parachain = { path = "../parachain", default-features = false }
+polkadot-parachain-primitives = { path = "../parachain", default-features = false }
 
 [features]
 default = [ "std" ]
@@ -36,7 +36,7 @@ std = [
 	"inherents/std",
 	"parity-scale-codec/std",
 	"polkadot-core-primitives/std",
-	"polkadot-parachain/std",
+	"polkadot-parachain-primitives/std",
 	"primitives/std",
 	"runtime_primitives/std",
 	"scale-info/std",
@@ -50,4 +50,8 @@ std = [
 	"sp-staking/std",
 	"sp-std/std",
 ]
-runtime-benchmarks = []
+runtime-benchmarks = [
+	"polkadot-parachain-primitives/runtime-benchmarks",
+	"runtime_primitives/runtime-benchmarks",
+	"sp-staking/runtime-benchmarks",
+]
diff --git a/polkadot/primitives/README.adoc b/polkadot/primitives/README.adoc
deleted file mode 100644
index 0e5c9412f002902a0a00970b08f746ffdfe5cc77..0000000000000000000000000000000000000000
--- a/polkadot/primitives/README.adoc
+++ /dev/null
@@ -1,5 +0,0 @@
-
-= Polkadot primitives
-
-placeholder
-//TODO Write content :) (https://github.com/paritytech/polkadot/issues/159)
diff --git a/polkadot/primitives/src/lib.rs b/polkadot/primitives/src/lib.rs
index 3680cb857e66e441823422e5c7cb079d8f1279bb..4ba8b8b031fcc330bb66d1ec4bd329809958db07 100644
--- a/polkadot/primitives/src/lib.rs
+++ b/polkadot/primitives/src/lib.rs
@@ -19,8 +19,8 @@
 #![warn(missing_docs)]
 #![cfg_attr(not(feature = "std"), no_std)]
 
-// `v5` is currently the latest stable version of the runtime API.
-pub mod v5;
+// `v6` is currently the latest stable version of the runtime API.
+pub mod v6;
 
 // The 'staging' version is special - it contains primitives which are
 // still in development. Once they are considered stable, they will be
@@ -33,20 +33,21 @@ pub mod runtime_api;
 
 // Current primitives not requiring versioning are exported here.
 // Primitives requiring versioning must not be exported and must be referred by an exact version.
-pub use v5::{
-	byzantine_threshold, check_candidate_backing, collator_signature_payload, metric_definitions,
-	slashing, supermajority_threshold, well_known_keys, AbridgedHostConfiguration,
-	AbridgedHrmpChannel, AccountId, AccountIndex, AccountPublic, ApprovalVote, AssignmentId,
+pub use v6::{
+	async_backing, byzantine_threshold, check_candidate_backing, collator_signature_payload,
+	effective_minimum_backing_votes, executor_params, metric_definitions, slashing,
+	supermajority_threshold, well_known_keys, AbridgedHostConfiguration, AbridgedHrmpChannel,
+	AccountId, AccountIndex, AccountPublic, ApprovalVote, AssignmentId, AsyncBackingParams,
 	AuthorityDiscoveryId, AvailabilityBitfield, BackedCandidate, Balance, BlakeTwo256, Block,
 	BlockId, BlockNumber, CandidateCommitments, CandidateDescriptor, CandidateEvent, CandidateHash,
 	CandidateIndex, CandidateReceipt, CheckedDisputeStatementSet, CheckedMultiDisputeStatementSet,
 	CollatorId, CollatorSignature, CommittedCandidateReceipt, CompactStatement, ConsensusLog,
-	CoreIndex, CoreOccupied, CoreState, DisputeState, DisputeStatement, DisputeStatementSet,
-	DownwardMessage, EncodeAs, ExecutorParam, ExecutorParams, ExecutorParamsHash,
+	CoreIndex, CoreState, DisputeState, DisputeStatement, DisputeStatementSet, DownwardMessage,
+	EncodeAs, ExecutorParam, ExecutorParamError, ExecutorParams, ExecutorParamsHash,
 	ExplicitDisputeStatement, GroupIndex, GroupRotationInfo, Hash, HashT, HeadData, Header,
-	HrmpChannelId, Id, InboundDownwardMessage, InboundHrmpMessage, IndexedVec, InherentData,
-	InvalidDisputeStatementKind, Moment, MultiDisputeStatementSet, Nonce, OccupiedCore,
-	OccupiedCoreAssumption, OutboundHrmpMessage, ParathreadClaim, ParathreadEntry,
+	HorizontalMessages, HrmpChannelId, Id, InboundDownwardMessage, InboundHrmpMessage, IndexedVec,
+	InherentData, InvalidDisputeStatementKind, Moment, MultiDisputeStatementSet, Nonce,
+	OccupiedCore, OccupiedCoreAssumption, OutboundHrmpMessage, ParathreadClaim, ParathreadEntry,
 	PersistedValidationData, PvfCheckStatement, PvfExecTimeoutKind, PvfPrepTimeoutKind,
 	RuntimeMetricLabel, RuntimeMetricLabelValue, RuntimeMetricLabelValues, RuntimeMetricLabels,
 	RuntimeMetricOp, RuntimeMetricUpdate, ScheduledCore, ScrapedOnChainVotes, SessionIndex,
@@ -55,10 +56,10 @@ pub use v5::{
 	UncheckedSignedAvailabilityBitfields, UncheckedSignedStatement, UpgradeGoAhead,
 	UpgradeRestriction, UpwardMessage, ValidDisputeStatementKind, ValidationCode,
 	ValidationCodeHash, ValidatorId, ValidatorIndex, ValidatorSignature, ValidityAttestation,
-	ValidityError, ASSIGNMENT_KEY_TYPE_ID, LOWEST_PUBLIC_ID, MAX_CODE_SIZE, MAX_HEAD_DATA_SIZE,
-	MAX_POV_SIZE, ON_DEMAND_DEFAULT_QUEUE_MAX_SIZE, PARACHAINS_INHERENT_IDENTIFIER,
-	PARACHAIN_KEY_TYPE_ID,
+	ValidityError, ASSIGNMENT_KEY_TYPE_ID, LEGACY_MIN_BACKING_VOTES, LOWEST_PUBLIC_ID,
+	MAX_CODE_SIZE, MAX_HEAD_DATA_SIZE, MAX_POV_SIZE, ON_DEMAND_DEFAULT_QUEUE_MAX_SIZE,
+	PARACHAINS_INHERENT_IDENTIFIER, PARACHAIN_KEY_TYPE_ID,
 };
 
 #[cfg(feature = "std")]
-pub use v5::{AssignmentPair, CollatorPair, ValidatorPair};
+pub use v6::{AssignmentPair, CollatorPair, ValidatorPair};
diff --git a/polkadot/primitives/src/runtime_api.rs b/polkadot/primitives/src/runtime_api.rs
index 483256fe20f3689639844fcbeade405ba21650eb..5ec897c8cbb40a7b3fe6a36ead8c72d3479b13e2 100644
--- a/polkadot/primitives/src/runtime_api.rs
+++ b/polkadot/primitives/src/runtime_api.rs
@@ -114,14 +114,15 @@
 //! separated from the stable primitives.
 
 use crate::{
-	vstaging, BlockNumber, CandidateCommitments, CandidateEvent, CandidateHash,
-	CommittedCandidateReceipt, CoreState, DisputeState, ExecutorParams, GroupRotationInfo,
-	OccupiedCoreAssumption, PersistedValidationData, PvfCheckStatement, ScrapedOnChainVotes,
-	SessionIndex, SessionInfo, ValidatorId, ValidatorIndex, ValidatorSignature,
+	async_backing, slashing, AsyncBackingParams, BlockNumber, CandidateCommitments, CandidateEvent,
+	CandidateHash, CommittedCandidateReceipt, CoreState, DisputeState, ExecutorParams,
+	GroupRotationInfo, OccupiedCoreAssumption, PersistedValidationData, PvfCheckStatement,
+	ScrapedOnChainVotes, SessionIndex, SessionInfo, ValidatorId, ValidatorIndex,
+	ValidatorSignature,
 };
 use parity_scale_codec::{Decode, Encode};
 use polkadot_core_primitives as pcp;
-use polkadot_parachain::primitives as ppp;
+use polkadot_parachain_primitives::primitives as ppp;
 use sp_std::{collections::btree_map::BTreeMap, prelude::*};
 
 sp_api::decl_runtime_apis! {
@@ -224,31 +225,44 @@ sp_api::decl_runtime_apis! {
 
 		/// Returns a list of validators that lost a past session dispute and need to be slashed.
 		/// NOTE: This function is only available since parachain host version 5.
-		fn unapplied_slashes() -> Vec<(SessionIndex, CandidateHash, vstaging::slashing::PendingSlashes)>;
+		fn unapplied_slashes() -> Vec<(SessionIndex, CandidateHash, slashing::PendingSlashes)>;
 
 		/// Returns a merkle proof of a validator session key.
 		/// NOTE: This function is only available since parachain host version 5.
 		fn key_ownership_proof(
 			validator_id: ValidatorId,
-		) -> Option<vstaging::slashing::OpaqueKeyOwnershipProof>;
+		) -> Option<slashing::OpaqueKeyOwnershipProof>;
 
 		/// Submit an unsigned extrinsic to slash validators who lost a dispute about
 		/// a candidate of a past session.
 		/// NOTE: This function is only available since parachain host version 5.
 		fn submit_report_dispute_lost(
-			dispute_proof: vstaging::slashing::DisputeProof,
-			key_ownership_proof: vstaging::slashing::OpaqueKeyOwnershipProof,
+			dispute_proof: slashing::DisputeProof,
+			key_ownership_proof: slashing::OpaqueKeyOwnershipProof,
 		) -> Option<()>;
 
-		/***** Asynchronous backing *****/
+		/***** Added in v6 *****/
 
-		/// Returns the state of parachain backing for a given para.
+		/// Get the minimum number of backing votes for a parachain candidate.
 		/// This is a staging method! Do not use on production runtimes!
-		#[api_version(99)]
-		fn staging_para_backing_state(_: ppp::Id) -> Option<vstaging::BackingState<H, N>>;
+		#[api_version(6)]
+		fn minimum_backing_votes() -> u32;
+
+
+		/***** Added in v7: Asynchronous backing *****/
+
+		/// Returns the state of parachain backing for a given para.
+		#[api_version(7)]
+		fn para_backing_state(_: ppp::Id) -> Option<async_backing::BackingState<H, N>>;
 
 		/// Returns candidate's acceptance limitations for asynchronous backing for a relay parent.
-		#[api_version(99)]
-		fn staging_async_backing_params() -> vstaging::AsyncBackingParams;
+		#[api_version(7)]
+		fn async_backing_params() -> AsyncBackingParams;
+
+		/***** Added in v8 *****/
+
+		/// Returns a list of all disabled validators at the given block.
+		#[api_version(8)]
+		fn disabled_validators() -> Vec<ValidatorIndex>;
 	}
 }
diff --git a/polkadot/primitives/src/v5/executor_params.rs b/polkadot/primitives/src/v5/executor_params.rs
deleted file mode 100644
index 6fbf3037fd6cd8c99780edda33763817dfb11941..0000000000000000000000000000000000000000
--- a/polkadot/primitives/src/v5/executor_params.rs
+++ /dev/null
@@ -1,153 +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/>.
-
-//! Abstract execution environment parameter set.
-//!
-//! Parameter set is encoded as an opaque vector which structure depends on the execution
-//! environment itself (except for environment type/version which is always represented
-//! by the first element of the vector). Decoding to a usable semantics structure is
-//! done in `polkadot-node-core-pvf`.
-
-use crate::{BlakeTwo256, HashT as _, PvfExecTimeoutKind, PvfPrepTimeoutKind};
-use parity_scale_codec::{Decode, Encode};
-use polkadot_core_primitives::Hash;
-use scale_info::TypeInfo;
-use serde::{Deserialize, Serialize};
-use sp_std::{ops::Deref, time::Duration, vec, vec::Vec};
-
-/// The different executor parameters for changing the execution environment semantics.
-#[derive(Clone, Debug, Encode, Decode, PartialEq, Eq, TypeInfo, Serialize, Deserialize)]
-pub enum ExecutorParam {
-	/// Maximum number of memory pages (64KiB bytes per page) the executor can allocate.
-	#[codec(index = 1)]
-	MaxMemoryPages(u32),
-	/// Wasm logical stack size limit (max. number of Wasm values on stack)
-	#[codec(index = 2)]
-	StackLogicalMax(u32),
-	/// Executor machine stack size limit, in bytes
-	#[codec(index = 3)]
-	StackNativeMax(u32),
-	/// Max. amount of memory the preparation worker is allowed to use during
-	/// pre-checking, in bytes
-	#[codec(index = 4)]
-	PrecheckingMaxMemory(u64),
-	/// PVF preparation timeouts, millisec
-	#[codec(index = 5)]
-	PvfPrepTimeout(PvfPrepTimeoutKind, u64),
-	/// PVF execution timeouts, millisec
-	#[codec(index = 6)]
-	PvfExecTimeout(PvfExecTimeoutKind, u64),
-	/// Enables WASM bulk memory proposal
-	#[codec(index = 7)]
-	WasmExtBulkMemory,
-}
-
-/// Unit type wrapper around [`type@Hash`] that represents an execution parameter set hash.
-///
-/// This type is produced by [`ExecutorParams::hash`].
-#[derive(Clone, Copy, Encode, Decode, Hash, Eq, PartialEq, PartialOrd, Ord, TypeInfo)]
-pub struct ExecutorParamsHash(Hash);
-
-impl ExecutorParamsHash {
-	/// Create a new executor parameter hash from `H256` hash
-	pub fn from_hash(hash: Hash) -> Self {
-		Self(hash)
-	}
-}
-
-impl sp_std::fmt::Display for ExecutorParamsHash {
-	fn fmt(&self, f: &mut sp_std::fmt::Formatter<'_>) -> sp_std::fmt::Result {
-		self.0.fmt(f)
-	}
-}
-
-impl sp_std::fmt::Debug for ExecutorParamsHash {
-	fn fmt(&self, f: &mut sp_std::fmt::Formatter<'_>) -> sp_std::fmt::Result {
-		write!(f, "{:?}", self.0)
-	}
-}
-
-impl sp_std::fmt::LowerHex for ExecutorParamsHash {
-	fn fmt(&self, f: &mut sp_std::fmt::Formatter<'_>) -> sp_std::fmt::Result {
-		sp_std::fmt::LowerHex::fmt(&self.0, f)
-	}
-}
-
-/// # Deterministically serialized execution environment semantics
-/// Represents an arbitrary semantics of an arbitrary execution environment, so should be kept as
-/// abstract as possible.
-// ADR: For mandatory entries, mandatoriness should be enforced in code rather than separating them
-// into individual fields of the structure. Thus, complex migrations shall be avoided when adding
-// new entries and removing old ones. At the moment, there's no mandatory parameters defined. If
-// they show up, they must be clearly documented as mandatory ones.
-#[derive(Clone, Debug, Encode, Decode, PartialEq, Eq, TypeInfo, Serialize, Deserialize)]
-pub struct ExecutorParams(Vec<ExecutorParam>);
-
-impl ExecutorParams {
-	/// Creates a new, empty executor parameter set
-	pub fn new() -> Self {
-		ExecutorParams(vec![])
-	}
-
-	/// Returns hash of the set of execution environment parameters
-	pub fn hash(&self) -> ExecutorParamsHash {
-		ExecutorParamsHash(BlakeTwo256::hash(&self.encode()))
-	}
-
-	/// Returns a PVF preparation timeout, if any
-	pub fn pvf_prep_timeout(&self, kind: PvfPrepTimeoutKind) -> Option<Duration> {
-		for param in &self.0 {
-			if let ExecutorParam::PvfPrepTimeout(k, timeout) = param {
-				if kind == *k {
-					return Some(Duration::from_millis(*timeout))
-				}
-			}
-		}
-		None
-	}
-
-	/// Returns a PVF execution timeout, if any
-	pub fn pvf_exec_timeout(&self, kind: PvfExecTimeoutKind) -> Option<Duration> {
-		for param in &self.0 {
-			if let ExecutorParam::PvfExecTimeout(k, timeout) = param {
-				if kind == *k {
-					return Some(Duration::from_millis(*timeout))
-				}
-			}
-		}
-		None
-	}
-}
-
-impl Deref for ExecutorParams {
-	type Target = Vec<ExecutorParam>;
-
-	fn deref(&self) -> &Self::Target {
-		&self.0
-	}
-}
-
-impl From<&[ExecutorParam]> for ExecutorParams {
-	fn from(arr: &[ExecutorParam]) -> Self {
-		ExecutorParams(arr.to_vec())
-	}
-}
-
-impl Default for ExecutorParams {
-	fn default() -> Self {
-		ExecutorParams(vec![])
-	}
-}
diff --git a/polkadot/primitives/src/v6/async_backing.rs b/polkadot/primitives/src/v6/async_backing.rs
new file mode 100644
index 0000000000000000000000000000000000000000..1abe87b6dec433122a6918f2f834a4a8e57817e8
--- /dev/null
+++ b/polkadot/primitives/src/v6/async_backing.rs
@@ -0,0 +1,132 @@
+// 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/>.
+
+//! Asynchronous backing primitives.
+
+use super::*;
+
+use parity_scale_codec::{Decode, Encode};
+use primitives::RuntimeDebug;
+use scale_info::TypeInfo;
+
+/// Candidate's acceptance limitations for asynchronous backing per relay parent.
+#[derive(
+	RuntimeDebug,
+	Copy,
+	Clone,
+	PartialEq,
+	Encode,
+	Decode,
+	TypeInfo,
+	serde::Serialize,
+	serde::Deserialize,
+)]
+
+pub struct AsyncBackingParams {
+	/// The maximum number of para blocks between the para head in a relay parent
+	/// and a new candidate. Restricts nodes from building arbitrary long chains
+	/// and spamming other validators.
+	///
+	/// When async backing is disabled, the only valid value is 0.
+	pub max_candidate_depth: u32,
+	/// How many ancestors of a relay parent are allowed to build candidates on top
+	/// of.
+	///
+	/// When async backing is disabled, the only valid value is 0.
+	pub allowed_ancestry_len: u32,
+}
+
+/// Constraints on inbound HRMP channels.
+#[derive(RuntimeDebug, Clone, PartialEq, Encode, Decode, TypeInfo)]
+pub struct InboundHrmpLimitations<N = BlockNumber> {
+	/// An exhaustive set of all valid watermarks, sorted ascending.
+	///
+	/// It's only expected to contain block numbers at which messages were
+	/// previously sent to a para, excluding most recent head.
+	pub valid_watermarks: Vec<N>,
+}
+
+/// Constraints on outbound HRMP channels.
+#[derive(RuntimeDebug, Clone, PartialEq, Encode, Decode, TypeInfo)]
+pub struct OutboundHrmpChannelLimitations {
+	/// The maximum bytes that can be written to the channel.
+	pub bytes_remaining: u32,
+	/// The maximum messages that can be written to the channel.
+	pub messages_remaining: u32,
+}
+
+/// Constraints on the actions that can be taken by a new parachain
+/// block. These limitations are implicitly associated with some particular
+/// parachain, which should be apparent from usage.
+#[derive(RuntimeDebug, Clone, PartialEq, Encode, Decode, TypeInfo)]
+pub struct Constraints<N = BlockNumber> {
+	/// The minimum relay-parent number accepted under these constraints.
+	pub min_relay_parent_number: N,
+	/// The maximum Proof-of-Validity size allowed, in bytes.
+	pub max_pov_size: u32,
+	/// The maximum new validation code size allowed, in bytes.
+	pub max_code_size: u32,
+	/// The amount of UMP messages remaining.
+	pub ump_remaining: u32,
+	/// The amount of UMP bytes remaining.
+	pub ump_remaining_bytes: u32,
+	/// The maximum number of UMP messages allowed per candidate.
+	pub max_ump_num_per_candidate: u32,
+	/// Remaining DMP queue. Only includes sent-at block numbers.
+	pub dmp_remaining_messages: Vec<N>,
+	/// The limitations of all registered inbound HRMP channels.
+	pub hrmp_inbound: InboundHrmpLimitations<N>,
+	/// The limitations of all registered outbound HRMP channels.
+	pub hrmp_channels_out: Vec<(Id, OutboundHrmpChannelLimitations)>,
+	/// The maximum number of HRMP messages allowed per candidate.
+	pub max_hrmp_num_per_candidate: u32,
+	/// The required parent head-data of the parachain.
+	pub required_parent: HeadData,
+	/// The expected validation-code-hash of this parachain.
+	pub validation_code_hash: ValidationCodeHash,
+	/// The code upgrade restriction signal as-of this parachain.
+	pub upgrade_restriction: Option<UpgradeRestriction>,
+	/// The future validation code hash, if any, and at what relay-parent
+	/// number the upgrade would be minimally applied.
+	pub future_validation_code: Option<(N, ValidationCodeHash)>,
+}
+
+/// A candidate pending availability.
+#[derive(RuntimeDebug, Clone, PartialEq, Encode, Decode, TypeInfo)]
+pub struct CandidatePendingAvailability<H = Hash, N = BlockNumber> {
+	/// The hash of the candidate.
+	pub candidate_hash: CandidateHash,
+	/// The candidate's descriptor.
+	pub descriptor: CandidateDescriptor<H>,
+	/// The commitments of the candidate.
+	pub commitments: CandidateCommitments,
+	/// The candidate's relay parent's number.
+	pub relay_parent_number: N,
+	/// The maximum Proof-of-Validity size allowed, in bytes.
+	pub max_pov_size: u32,
+}
+
+/// The per-parachain state of the backing system, including
+/// state-machine constraints and candidates pending availability.
+#[derive(RuntimeDebug, Clone, PartialEq, Encode, Decode, TypeInfo)]
+pub struct BackingState<H = Hash, N = BlockNumber> {
+	/// The state-machine constraints of the parachain.
+	pub constraints: Constraints<N>,
+	/// The candidates pending availability. These should be ordered, i.e. they should form
+	/// a sub-chain, where the first candidate builds on top of the required parent of the
+	/// constraints and each subsequent builds on top of the previous head-data.
+	pub pending_availability: Vec<CandidatePendingAvailability<H, N>>,
+}
diff --git a/polkadot/primitives/src/v6/executor_params.rs b/polkadot/primitives/src/v6/executor_params.rs
new file mode 100644
index 0000000000000000000000000000000000000000..8ea0889bd23b043f7a89e2dae756a6033243421d
--- /dev/null
+++ b/polkadot/primitives/src/v6/executor_params.rs
@@ -0,0 +1,339 @@
+// 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/>.
+
+//! Abstract execution environment parameter set.
+//!
+//! Parameter set is encoded as an opaque vector which structure depends on the execution
+//! environment itself (except for environment type/version which is always represented
+//! by the first element of the vector). Decoding to a usable semantics structure is
+//! done in `polkadot-node-core-pvf`.
+
+use crate::{BlakeTwo256, HashT as _, PvfExecTimeoutKind, PvfPrepTimeoutKind};
+use parity_scale_codec::{Decode, Encode};
+use polkadot_core_primitives::Hash;
+use scale_info::TypeInfo;
+use serde::{Deserialize, Serialize};
+use sp_std::{collections::btree_map::BTreeMap, ops::Deref, time::Duration, vec, vec::Vec};
+
+/// Default maximum number of wasm values allowed for the stack during execution of a PVF.
+pub const DEFAULT_LOGICAL_STACK_MAX: u32 = 65536;
+/// Default maximum number of bytes devoted for the stack during execution of a PVF.
+pub const DEFAULT_NATIVE_STACK_MAX: u32 = 256 * 1024 * 1024;
+
+/// The limit of [`ExecutorParam::MaxMemoryPages`].
+pub const MEMORY_PAGES_MAX: u32 = 65536;
+/// The lower bound of [`ExecutorParam::StackLogicalMax`].
+pub const LOGICAL_MAX_LO: u32 = 1024;
+/// The upper bound of [`ExecutorParam::StackLogicalMax`].
+pub const LOGICAL_MAX_HI: u32 = 2 * 65536;
+/// The lower bound of [`ExecutorParam::PrecheckingMaxMemory`].
+pub const PRECHECK_MEM_MAX_LO: u64 = 256 * 1024 * 1024;
+/// The upper bound of [`ExecutorParam::PrecheckingMaxMemory`].
+pub const PRECHECK_MEM_MAX_HI: u64 = 16 * 1024 * 1024 * 1024;
+
+// Default PVF timeouts. Must never be changed! Use executor environment parameters to adjust them.
+// See also `PvfPrepTimeoutKind` and `PvfExecTimeoutKind` docs.
+
+/// Default PVF preparation timeout for prechecking requests.
+pub const DEFAULT_PRECHECK_PREPARATION_TIMEOUT: Duration = Duration::from_secs(60);
+/// Default PVF preparation timeout for execution requests.
+pub const DEFAULT_LENIENT_PREPARATION_TIMEOUT: Duration = Duration::from_secs(360);
+/// Default PVF execution timeout for backing.
+pub const DEFAULT_BACKING_EXECUTION_TIMEOUT: Duration = Duration::from_secs(2);
+/// Default PVF execution timeout for approval or disputes.
+pub const DEFAULT_APPROVAL_EXECUTION_TIMEOUT: Duration = Duration::from_secs(12);
+
+const DEFAULT_PRECHECK_PREPARATION_TIMEOUT_MS: u64 =
+	DEFAULT_PRECHECK_PREPARATION_TIMEOUT.as_millis() as u64;
+const DEFAULT_LENIENT_PREPARATION_TIMEOUT_MS: u64 =
+	DEFAULT_LENIENT_PREPARATION_TIMEOUT.as_millis() as u64;
+const DEFAULT_BACKING_EXECUTION_TIMEOUT_MS: u64 =
+	DEFAULT_BACKING_EXECUTION_TIMEOUT.as_millis() as u64;
+const DEFAULT_APPROVAL_EXECUTION_TIMEOUT_MS: u64 =
+	DEFAULT_APPROVAL_EXECUTION_TIMEOUT.as_millis() as u64;
+
+/// The different executor parameters for changing the execution environment semantics.
+#[derive(Clone, Debug, Encode, Decode, PartialEq, Eq, TypeInfo, Serialize, Deserialize)]
+pub enum ExecutorParam {
+	/// Maximum number of memory pages (64KiB bytes per page) the executor can allocate.
+	/// A valid value lies within (0, 65536].
+	#[codec(index = 1)]
+	MaxMemoryPages(u32),
+	/// Wasm logical stack size limit (max. number of Wasm values on stack).
+	/// A valid value lies within [[`LOGICAL_MAX_LO`], [`LOGICAL_MAX_HI`]].
+	///
+	/// For WebAssembly, the stack limit is subject to implementations, meaning that it may vary on
+	/// different platforms. However, we want execution to be deterministic across machines of
+	/// different architectures, including failures like stack overflow. For deterministic
+	/// overflow, we rely on a **logical** limit, the maximum number of values allowed to be pushed
+	/// on the stack.
+	#[codec(index = 2)]
+	StackLogicalMax(u32),
+	/// Executor machine stack size limit, in bytes.
+	/// If `StackLogicalMax` is also present, a valid value should not fall below
+	/// 128 * `StackLogicalMax`.
+	///
+	/// For deterministic overflow, `StackLogicalMax` should be reached before the native stack is
+	/// exhausted.
+	#[codec(index = 3)]
+	StackNativeMax(u32),
+	/// Max. amount of memory the preparation worker is allowed to use during
+	/// pre-checking, in bytes.
+	/// Valid max. memory ranges from [`PRECHECK_MEM_MAX_LO`] to [`PRECHECK_MEM_MAX_HI`].
+	#[codec(index = 4)]
+	PrecheckingMaxMemory(u64),
+	/// PVF preparation timeouts, in millisecond.
+	/// Always ensure that `precheck_timeout` < `lenient_timeout`.
+	/// When absent, the default values will be used.
+	#[codec(index = 5)]
+	PvfPrepTimeout(PvfPrepTimeoutKind, u64),
+	/// PVF execution timeouts, in millisecond.
+	/// Always ensure that `backing_timeout` < `approval_timeout`.
+	/// When absent, the default values will be used.
+	#[codec(index = 6)]
+	PvfExecTimeout(PvfExecTimeoutKind, u64),
+	/// Enables WASM bulk memory proposal
+	#[codec(index = 7)]
+	WasmExtBulkMemory,
+}
+
+/// Possible inconsistencies of executor params.
+#[derive(Debug)]
+pub enum ExecutorParamError {
+	/// A param is duplicated.
+	DuplicatedParam(&'static str),
+	/// A param value exceeds its limitation.
+	OutsideLimit(&'static str),
+	/// Two param values are incompatible or senseless when put together.
+	IncompatibleValues(&'static str, &'static str),
+}
+
+/// Unit type wrapper around [`type@Hash`] that represents an execution parameter set hash.
+///
+/// This type is produced by [`ExecutorParams::hash`].
+#[derive(Clone, Copy, Encode, Decode, Hash, Eq, PartialEq, PartialOrd, Ord, TypeInfo)]
+pub struct ExecutorParamsHash(Hash);
+
+impl ExecutorParamsHash {
+	/// Create a new executor parameter hash from `H256` hash
+	pub fn from_hash(hash: Hash) -> Self {
+		Self(hash)
+	}
+}
+
+impl sp_std::fmt::Display for ExecutorParamsHash {
+	fn fmt(&self, f: &mut sp_std::fmt::Formatter<'_>) -> sp_std::fmt::Result {
+		self.0.fmt(f)
+	}
+}
+
+impl sp_std::fmt::Debug for ExecutorParamsHash {
+	fn fmt(&self, f: &mut sp_std::fmt::Formatter<'_>) -> sp_std::fmt::Result {
+		write!(f, "{:?}", self.0)
+	}
+}
+
+impl sp_std::fmt::LowerHex for ExecutorParamsHash {
+	fn fmt(&self, f: &mut sp_std::fmt::Formatter<'_>) -> sp_std::fmt::Result {
+		sp_std::fmt::LowerHex::fmt(&self.0, f)
+	}
+}
+
+/// # Deterministically serialized execution environment semantics
+/// Represents an arbitrary semantics of an arbitrary execution environment, so should be kept as
+/// abstract as possible.
+// ADR: For mandatory entries, mandatoriness should be enforced in code rather than separating them
+// into individual fields of the structure. Thus, complex migrations shall be avoided when adding
+// new entries and removing old ones. At the moment, there's no mandatory parameters defined. If
+// they show up, they must be clearly documented as mandatory ones.
+#[derive(Clone, Debug, Encode, Decode, PartialEq, Eq, TypeInfo, Serialize, Deserialize)]
+pub struct ExecutorParams(Vec<ExecutorParam>);
+
+impl ExecutorParams {
+	/// Creates a new, empty executor parameter set
+	pub fn new() -> Self {
+		ExecutorParams(vec![])
+	}
+
+	/// Returns hash of the set of execution environment parameters
+	pub fn hash(&self) -> ExecutorParamsHash {
+		ExecutorParamsHash(BlakeTwo256::hash(&self.encode()))
+	}
+
+	/// Returns a PVF preparation timeout, if any
+	pub fn pvf_prep_timeout(&self, kind: PvfPrepTimeoutKind) -> Option<Duration> {
+		for param in &self.0 {
+			if let ExecutorParam::PvfPrepTimeout(k, timeout) = param {
+				if kind == *k {
+					return Some(Duration::from_millis(*timeout))
+				}
+			}
+		}
+		None
+	}
+
+	/// Returns a PVF execution timeout, if any
+	pub fn pvf_exec_timeout(&self, kind: PvfExecTimeoutKind) -> Option<Duration> {
+		for param in &self.0 {
+			if let ExecutorParam::PvfExecTimeout(k, timeout) = param {
+				if kind == *k {
+					return Some(Duration::from_millis(*timeout))
+				}
+			}
+		}
+		None
+	}
+
+	/// Check params coherence.
+	pub fn check_consistency(&self) -> Result<(), ExecutorParamError> {
+		use ExecutorParam::*;
+		use ExecutorParamError::*;
+
+		let mut seen = BTreeMap::<&str, u64>::new();
+
+		macro_rules! check {
+			($param:ident, $val:expr $(,)?) => {
+				if seen.contains_key($param) {
+					return Err(DuplicatedParam($param))
+				}
+				seen.insert($param, $val as u64);
+			};
+
+			// should check existence before range
+			($param:ident, $val:expr, $out_of_limit:expr $(,)?) => {
+				if seen.contains_key($param) {
+					return Err(DuplicatedParam($param))
+				}
+				if $out_of_limit {
+					return Err(OutsideLimit($param))
+				}
+				seen.insert($param, $val as u64);
+			};
+		}
+
+		for param in &self.0 {
+			// should ensure to be unique
+			let param_ident = match *param {
+				MaxMemoryPages(_) => "MaxMemoryPages",
+				StackLogicalMax(_) => "StackLogicalMax",
+				StackNativeMax(_) => "StackNativeMax",
+				PrecheckingMaxMemory(_) => "PrecheckingMaxMemory",
+				PvfPrepTimeout(kind, _) => match kind {
+					PvfPrepTimeoutKind::Precheck => "PvfPrepTimeoutKind::Precheck",
+					PvfPrepTimeoutKind::Lenient => "PvfPrepTimeoutKind::Lenient",
+				},
+				PvfExecTimeout(kind, _) => match kind {
+					PvfExecTimeoutKind::Backing => "PvfExecTimeoutKind::Backing",
+					PvfExecTimeoutKind::Approval => "PvfExecTimeoutKind::Approval",
+				},
+				WasmExtBulkMemory => "WasmExtBulkMemory",
+			};
+
+			match *param {
+				MaxMemoryPages(val) => {
+					check!(param_ident, val, val == 0 || val > MEMORY_PAGES_MAX,);
+				},
+
+				StackLogicalMax(val) => {
+					check!(param_ident, val, val < LOGICAL_MAX_LO || val > LOGICAL_MAX_HI,);
+				},
+
+				StackNativeMax(val) => {
+					check!(param_ident, val);
+				},
+
+				PrecheckingMaxMemory(val) => {
+					check!(
+						param_ident,
+						val,
+						val < PRECHECK_MEM_MAX_LO || val > PRECHECK_MEM_MAX_HI,
+					);
+				},
+
+				PvfPrepTimeout(_, val) => {
+					check!(param_ident, val);
+				},
+
+				PvfExecTimeout(_, val) => {
+					check!(param_ident, val);
+				},
+
+				WasmExtBulkMemory => {
+					check!(param_ident, 1);
+				},
+			}
+		}
+
+		if let (Some(lm), Some(nm)) = (
+			seen.get("StackLogicalMax").or(Some(&(DEFAULT_LOGICAL_STACK_MAX as u64))),
+			seen.get("StackNativeMax").or(Some(&(DEFAULT_NATIVE_STACK_MAX as u64))),
+		) {
+			if *nm < 128 * *lm {
+				return Err(IncompatibleValues("StackLogicalMax", "StackNativeMax"))
+			}
+		}
+
+		if let (Some(precheck), Some(lenient)) = (
+			seen.get("PvfPrepTimeoutKind::Precheck")
+				.or(Some(&DEFAULT_PRECHECK_PREPARATION_TIMEOUT_MS)),
+			seen.get("PvfPrepTimeoutKind::Lenient")
+				.or(Some(&DEFAULT_LENIENT_PREPARATION_TIMEOUT_MS)),
+		) {
+			if *precheck >= *lenient {
+				return Err(IncompatibleValues(
+					"PvfPrepTimeoutKind::Precheck",
+					"PvfPrepTimeoutKind::Lenient",
+				))
+			}
+		}
+
+		if let (Some(backing), Some(approval)) = (
+			seen.get("PvfExecTimeoutKind::Backing")
+				.or(Some(&DEFAULT_BACKING_EXECUTION_TIMEOUT_MS)),
+			seen.get("PvfExecTimeoutKind::Approval")
+				.or(Some(&DEFAULT_APPROVAL_EXECUTION_TIMEOUT_MS)),
+		) {
+			if *backing >= *approval {
+				return Err(IncompatibleValues(
+					"PvfExecTimeoutKind::Backing",
+					"PvfExecTimeoutKind::Approval",
+				))
+			}
+		}
+
+		Ok(())
+	}
+}
+
+impl Deref for ExecutorParams {
+	type Target = Vec<ExecutorParam>;
+
+	fn deref(&self) -> &Self::Target {
+		&self.0
+	}
+}
+
+impl From<&[ExecutorParam]> for ExecutorParams {
+	fn from(arr: &[ExecutorParam]) -> Self {
+		ExecutorParams(arr.to_vec())
+	}
+}
+
+impl Default for ExecutorParams {
+	fn default() -> Self {
+		ExecutorParams(vec![])
+	}
+}
diff --git a/polkadot/primitives/src/v5/metrics.rs b/polkadot/primitives/src/v6/metrics.rs
similarity index 100%
rename from polkadot/primitives/src/v5/metrics.rs
rename to polkadot/primitives/src/v6/metrics.rs
diff --git a/polkadot/primitives/src/v5/mod.rs b/polkadot/primitives/src/v6/mod.rs
similarity index 97%
rename from polkadot/primitives/src/v5/mod.rs
rename to polkadot/primitives/src/v6/mod.rs
index 59fb6c927b2df588cca6e442c00b977941597d76..9371b3db406b3e6247f4ac9c12dc5ba053a77f01 100644
--- a/polkadot/primitives/src/v5/mod.rs
+++ b/polkadot/primitives/src/v6/mod.rs
@@ -14,7 +14,7 @@
 // You should have received a copy of the GNU General Public License
 // along with Polkadot.  If not, see <http://www.gnu.org/licenses/>.
 
-//! `V2` Primitives.
+//! `V6` Primitives.
 
 use bitvec::vec::BitVec;
 use parity_scale_codec::{Decode, Encode};
@@ -42,9 +42,9 @@ pub use polkadot_core_primitives::v2::{
 };
 
 // Export some polkadot-parachain primitives
-pub use polkadot_parachain::primitives::{
+pub use polkadot_parachain_primitives::primitives::{
 	HeadData, HorizontalMessages, HrmpChannelId, Id, UpwardMessage, UpwardMessages, ValidationCode,
-	ValidationCodeHash, LOWEST_PUBLIC_ID, LOWEST_USER_ID,
+	ValidationCodeHash, LOWEST_PUBLIC_ID,
 };
 
 use serde::{Deserialize, Serialize};
@@ -57,8 +57,13 @@ pub use sp_staking::SessionIndex;
 mod signed;
 pub use signed::{EncodeAs, Signed, UncheckedSigned};
 
+pub mod async_backing;
+pub mod executor_params;
 pub mod slashing;
 
+pub use async_backing::AsyncBackingParams;
+pub use executor_params::{ExecutorParam, ExecutorParamError, ExecutorParams, ExecutorParamsHash};
+
 mod metrics;
 pub use metrics::{
 	metric_definitions, RuntimeMetricLabel, RuntimeMetricLabelValue, RuntimeMetricLabelValues,
@@ -390,6 +395,10 @@ pub const MAX_POV_SIZE: u32 = 5 * 1024 * 1024;
 /// Can be adjusted in configuration.
 pub const ON_DEMAND_DEFAULT_QUEUE_MAX_SIZE: u32 = 10_000;
 
+/// Backing votes threshold used from the host prior to runtime API version 6 and from the runtime
+/// prior to v9 configuration migration.
+pub const LEGACY_MIN_BACKING_VOTES: u32 = 2;
+
 // The public key of a keypair used by a validator for determining assignments
 /// to approve included parachain candidates.
 mod assignment_app {
@@ -826,60 +835,6 @@ pub struct ParathreadEntry {
 	pub retries: u32,
 }
 
-/// An assignment for a parachain scheduled to be backed and included in a relay chain block.
-#[derive(Clone, Encode, Decode, PartialEq, TypeInfo, RuntimeDebug)]
-pub struct Assignment {
-	/// Assignment's ParaId
-	pub para_id: Id,
-}
-
-impl Assignment {
-	/// Create a new `Assignment`.
-	pub fn new(para_id: Id) -> Self {
-		Self { para_id }
-	}
-}
-
-/// An entry tracking a paras
-#[derive(Clone, Encode, Decode, TypeInfo, PartialEq, RuntimeDebug)]
-pub struct ParasEntry<N = BlockNumber> {
-	/// The `Assignment`
-	pub assignment: Assignment,
-	/// The number of times the entry has timed out in availability.
-	pub availability_timeouts: u32,
-	/// The block height where this entry becomes invalid.
-	pub ttl: N,
-}
-
-impl<N> ParasEntry<N> {
-	/// Return `Id` from the underlying `Assignment`.
-	pub fn para_id(&self) -> Id {
-		self.assignment.para_id
-	}
-
-	/// Create a new `ParasEntry`.
-	pub fn new(assignment: Assignment, now: N) -> Self {
-		ParasEntry { assignment, availability_timeouts: 0, ttl: now }
-	}
-}
-
-/// What is occupying a specific availability core.
-#[derive(Clone, Encode, Decode, TypeInfo, RuntimeDebug)]
-#[cfg_attr(feature = "std", derive(PartialEq))]
-pub enum CoreOccupied<N> {
-	/// The core is not occupied.
-	Free,
-	/// A paras.
-	Paras(ParasEntry<N>),
-}
-
-impl<N> CoreOccupied<N> {
-	/// Is core free?
-	pub fn is_free(&self) -> bool {
-		matches!(self, Self::Free)
-	}
-}
-
 /// A helper data-type for tracking validator-group rotations.
 #[derive(Clone, Encode, Decode, TypeInfo, RuntimeDebug)]
 #[cfg_attr(feature = "std", derive(PartialEq))]
@@ -1009,7 +964,7 @@ impl<H, N> OccupiedCore<H, N> {
 pub struct ScheduledCore {
 	/// The ID of a para scheduled.
 	pub para_id: Id,
-	/// DEPRECATED: see: https://github.com/paritytech/polkadot/issues/7575
+	/// DEPRECATED: see: <https://github.com/paritytech/polkadot/issues/7575>
 	///
 	/// Will be removed in a future version.
 	pub collator: Option<CollatorId>,
@@ -1166,7 +1121,7 @@ pub struct AbridgedHostConfiguration {
 	/// The delay, in blocks, before a validation upgrade is applied.
 	pub validation_upgrade_delay: BlockNumber,
 	/// Asynchronous backing parameters.
-	pub async_backing_params: super::vstaging::AsyncBackingParams,
+	pub async_backing_params: AsyncBackingParams,
 }
 
 /// Abridged version of `HrmpChannel` (from the `Hrmp` parachains host runtime module) meant to be
@@ -1695,6 +1650,14 @@ pub const fn supermajority_threshold(n: usize) -> usize {
 	n - byzantine_threshold(n)
 }
 
+/// Adjust the configured needed backing votes with the size of the backing group.
+pub fn effective_minimum_backing_votes(
+	group_len: usize,
+	configured_minimum_backing_votes: u32,
+) -> usize {
+	sp_std::cmp::min(group_len, configured_minimum_backing_votes as usize)
+}
+
 /// Information about validator sets of a session.
 ///
 /// NOTE: `SessionInfo` is frozen. Do not include new fields, consider creating a separate runtime
@@ -1735,8 +1698,8 @@ pub struct SessionInfo {
 	///
 	/// Therefore:
 	/// ```ignore
-	/// 		assignment_keys.len() == validators.len() && validators.len() <= discovery_keys.len()
-	/// 	```
+	/// 	assignment_keys.len() == validators.len() && validators.len() <= discovery_keys.len()
+	/// ```
 	pub assignment_keys: Vec<AssignmentId>,
 	/// Validators in shuffled ordering - these are the validator groups as produced
 	/// by the `Scheduler` module for the session and are typically referred to by
@@ -1845,9 +1808,6 @@ pub enum PvfExecTimeoutKind {
 	Approval,
 }
 
-pub mod executor_params;
-pub use executor_params::{ExecutorParam, ExecutorParams, ExecutorParamsHash};
-
 #[cfg(test)]
 mod tests {
 	use super::*;
diff --git a/polkadot/primitives/src/v5/signed.rs b/polkadot/primitives/src/v6/signed.rs
similarity index 100%
rename from polkadot/primitives/src/v5/signed.rs
rename to polkadot/primitives/src/v6/signed.rs
diff --git a/polkadot/primitives/src/v5/slashing.rs b/polkadot/primitives/src/v6/slashing.rs
similarity index 98%
rename from polkadot/primitives/src/v5/slashing.rs
rename to polkadot/primitives/src/v6/slashing.rs
index 34424a00d23c8b5bd965beb970b6e98cf49056ee..efffb932cdc0d997e08f9d195e2c42b857a7c8f5 100644
--- a/polkadot/primitives/src/v5/slashing.rs
+++ b/polkadot/primitives/src/v6/slashing.rs
@@ -1,4 +1,4 @@
-// Copyright 2017-2023 Parity Technologies (UK) Ltd.
+// Copyright (C) Parity Technologies (UK) Ltd.
 // This file is part of Polkadot.
 
 // Polkadot is free software: you can redistribute it and/or modify
diff --git a/polkadot/primitives/src/vstaging/mod.rs b/polkadot/primitives/src/vstaging/mod.rs
index ea341ee5b4fc973b587ecd0c23a415b5807c6350..1429b0c326aceef4b9088bd4ddef6828f8dcfbd8 100644
--- a/polkadot/primitives/src/vstaging/mod.rs
+++ b/polkadot/primitives/src/vstaging/mod.rs
@@ -17,121 +17,3 @@
 //! Staging Primitives.
 
 // Put any primitives used by staging APIs functions here
-pub use crate::v5::*;
-use sp_std::prelude::*;
-
-use parity_scale_codec::{Decode, Encode};
-use primitives::RuntimeDebug;
-use scale_info::TypeInfo;
-
-/// Useful type alias for Para IDs.
-pub type ParaId = Id;
-
-/// Candidate's acceptance limitations for asynchronous backing per relay parent.
-#[derive(
-	RuntimeDebug,
-	Copy,
-	Clone,
-	PartialEq,
-	Encode,
-	Decode,
-	TypeInfo,
-	serde::Serialize,
-	serde::Deserialize,
-)]
-
-pub struct AsyncBackingParams {
-	/// The maximum number of para blocks between the para head in a relay parent
-	/// and a new candidate. Restricts nodes from building arbitrary long chains
-	/// and spamming other validators.
-	///
-	/// When async backing is disabled, the only valid value is 0.
-	pub max_candidate_depth: u32,
-	/// How many ancestors of a relay parent are allowed to build candidates on top
-	/// of.
-	///
-	/// When async backing is disabled, the only valid value is 0.
-	pub allowed_ancestry_len: u32,
-}
-
-/// Constraints on inbound HRMP channels.
-#[derive(RuntimeDebug, Clone, PartialEq, Encode, Decode, TypeInfo)]
-pub struct InboundHrmpLimitations<N = BlockNumber> {
-	/// An exhaustive set of all valid watermarks, sorted ascending.
-	///
-	/// It's only expected to contain block numbers at which messages were
-	/// previously sent to a para, excluding most recent head.
-	pub valid_watermarks: Vec<N>,
-}
-
-/// Constraints on outbound HRMP channels.
-#[derive(RuntimeDebug, Clone, PartialEq, Encode, Decode, TypeInfo)]
-pub struct OutboundHrmpChannelLimitations {
-	/// The maximum bytes that can be written to the channel.
-	pub bytes_remaining: u32,
-	/// The maximum messages that can be written to the channel.
-	pub messages_remaining: u32,
-}
-
-/// Constraints on the actions that can be taken by a new parachain
-/// block. These limitations are implicitly associated with some particular
-/// parachain, which should be apparent from usage.
-#[derive(RuntimeDebug, Clone, PartialEq, Encode, Decode, TypeInfo)]
-pub struct Constraints<N = BlockNumber> {
-	/// The minimum relay-parent number accepted under these constraints.
-	pub min_relay_parent_number: N,
-	/// The maximum Proof-of-Validity size allowed, in bytes.
-	pub max_pov_size: u32,
-	/// The maximum new validation code size allowed, in bytes.
-	pub max_code_size: u32,
-	/// The amount of UMP messages remaining.
-	pub ump_remaining: u32,
-	/// The amount of UMP bytes remaining.
-	pub ump_remaining_bytes: u32,
-	/// The maximum number of UMP messages allowed per candidate.
-	pub max_ump_num_per_candidate: u32,
-	/// Remaining DMP queue. Only includes sent-at block numbers.
-	pub dmp_remaining_messages: Vec<N>,
-	/// The limitations of all registered inbound HRMP channels.
-	pub hrmp_inbound: InboundHrmpLimitations<N>,
-	/// The limitations of all registered outbound HRMP channels.
-	pub hrmp_channels_out: Vec<(ParaId, OutboundHrmpChannelLimitations)>,
-	/// The maximum number of HRMP messages allowed per candidate.
-	pub max_hrmp_num_per_candidate: u32,
-	/// The required parent head-data of the parachain.
-	pub required_parent: HeadData,
-	/// The expected validation-code-hash of this parachain.
-	pub validation_code_hash: ValidationCodeHash,
-	/// The code upgrade restriction signal as-of this parachain.
-	pub upgrade_restriction: Option<UpgradeRestriction>,
-	/// The future validation code hash, if any, and at what relay-parent
-	/// number the upgrade would be minimally applied.
-	pub future_validation_code: Option<(N, ValidationCodeHash)>,
-}
-
-/// A candidate pending availability.
-#[derive(RuntimeDebug, Clone, PartialEq, Encode, Decode, TypeInfo)]
-pub struct CandidatePendingAvailability<H = Hash, N = BlockNumber> {
-	/// The hash of the candidate.
-	pub candidate_hash: CandidateHash,
-	/// The candidate's descriptor.
-	pub descriptor: CandidateDescriptor<H>,
-	/// The commitments of the candidate.
-	pub commitments: CandidateCommitments,
-	/// The candidate's relay parent's number.
-	pub relay_parent_number: N,
-	/// The maximum Proof-of-Validity size allowed, in bytes.
-	pub max_pov_size: u32,
-}
-
-/// The per-parachain state of the backing system, including
-/// state-machine constraints and candidates pending availability.
-#[derive(RuntimeDebug, Clone, PartialEq, Encode, Decode, TypeInfo)]
-pub struct BackingState<H = Hash, N = BlockNumber> {
-	/// The state-machine constraints of the parachain.
-	pub constraints: Constraints<N>,
-	/// The candidates pending availability. These should be ordered, i.e. they should form
-	/// a sub-chain, where the first candidate builds on top of the required parent of the
-	/// constraints and each subsequent builds on top of the previous head-data.
-	pub pending_availability: Vec<CandidatePendingAvailability<H, N>>,
-}
diff --git a/polkadot/primitives/test-helpers/Cargo.toml b/polkadot/primitives/test-helpers/Cargo.toml
index 1f9a434e48c93cd202e9410849cb2c8fd94cea06..8215b842ba47aba53162427dd6807762cd8b2ca6 100644
--- a/polkadot/primitives/test-helpers/Cargo.toml
+++ b/polkadot/primitives/test-helpers/Cargo.toml
@@ -1,7 +1,7 @@
 [package]
 name = "polkadot-primitives-test-helpers"
 publish = false
-version.workspace = true
+version = "1.0.0"
 authors.workspace = true
 edition.workspace = true
 license.workspace = true
diff --git a/polkadot/primitives/test-helpers/src/lib.rs b/polkadot/primitives/test-helpers/src/lib.rs
index 8ee5f180d34290b8077f8b68eed73dadc81062dc..d532d6ff57f4a34c53d7099d011f1ca68bf6cf5f 100644
--- a/polkadot/primitives/test-helpers/src/lib.rs
+++ b/polkadot/primitives/test-helpers/src/lib.rs
@@ -159,6 +159,11 @@ pub fn dummy_pvd(parent_head: HeadData, relay_parent_number: u32) -> PersistedVa
 	}
 }
 
+/// Creates a meaningless signature
+pub fn dummy_signature() -> polkadot_primitives::ValidatorSignature {
+	sp_core::crypto::UncheckedFrom::unchecked_from([1u8; 64])
+}
+
 /// Create a meaningless candidate, returning its receipt and PVD.
 pub fn make_candidate(
 	relay_parent_hash: Hash,
@@ -244,6 +249,11 @@ pub fn resign_candidate_descriptor_with_collator<H: AsRef<[u8]>>(
 	descriptor.signature = signature;
 }
 
+/// Extracts validators's public keus (`ValidatorId`) from `Sr25519Keyring`
+pub fn validator_pubkeys(val_ids: &[Sr25519Keyring]) -> Vec<ValidatorId> {
+	val_ids.iter().map(|v| v.public().into()).collect()
+}
+
 /// Builder for `CandidateReceipt`.
 pub struct TestCandidateBuilder {
 	pub para_id: ParaId,
@@ -298,7 +308,3 @@ impl rand::RngCore for AlwaysZeroRng {
 		Ok(())
 	}
 }
-
-pub fn dummy_signature() -> polkadot_primitives::ValidatorSignature {
-	sp_core::crypto::UncheckedFrom::unchecked_from([1u8; 64])
-}
diff --git a/polkadot/roadmap/implementers-guide/README.md b/polkadot/roadmap/implementers-guide/README.md
index 996041f176bb2cbce5446ac2e800fe3e155fb884..e03c0c45ddba009821861cc5ba39a77c7c03dd59 100644
--- a/polkadot/roadmap/implementers-guide/README.md
+++ b/polkadot/roadmap/implementers-guide/README.md
@@ -4,7 +4,7 @@ The implementers' guide is compiled from several source files with [`mdBook`](ht
 
 ## Hosted build
 
-This is available [here](https://paritytech.github.io/polkadot/book/).
+This is available [here](https://paritytech.github.io/polkadot-sdk/book/).
 
 ## Local build
 
diff --git a/polkadot/roadmap/implementers-guide/book.toml b/polkadot/roadmap/implementers-guide/book.toml
index 0ced0e26f9a081ba034a9ed489132f3985fb240e..1e6680f6f4b7e3b356af787fe0412fbab177e902 100644
--- a/polkadot/roadmap/implementers-guide/book.toml
+++ b/polkadot/roadmap/implementers-guide/book.toml
@@ -1,5 +1,5 @@
 [book]
-authors = ["Rob Habermeier", "Peter Goodspeed-Niklaus"]
+authors = ["Parity Technologies <admin@parity.io>"]
 language = "en"
 multilingual = false
 src = "src"
diff --git a/polkadot/roadmap/implementers-guide/src/README.md b/polkadot/roadmap/implementers-guide/src/README.md
index 9b6189992773b02e97cd63f5db51843f74d799cb..6673c533ece43a8bea6e648efcf81894f4b7d6f6 100644
--- a/polkadot/roadmap/implementers-guide/src/README.md
+++ b/polkadot/roadmap/implementers-guide/src/README.md
@@ -1,5 +1,11 @@
 # Preamble
 
-This document aims to describe the purpose, functionality, and implementation of the host for Polkadot's _parachains_ functionality - that is, the software which provides security and advancement for constituent parachains. It is not for the implementer of a specific parachain but rather for the implementer of the Parachain Host. In practice, this is for the implementers of Polkadot in general.
+This document aims to describe the purpose, functionality, and implementation of the host for Polkadot's _parachains_
+functionality - that is, the software which provides security and advancement for constituent parachains. It is not for
+the implementer of a specific parachain but rather for the implementer of the Parachain Host. In practice, this is for
+the implementers of Polkadot in general.
 
-There are a number of other documents describing the research in more detail. All referenced documents will be linked here and should be read alongside this document for the best understanding of the full picture. However, this is the only document which aims to describe key aspects of Polkadot's particular instantiation of much of that research down to low-level technical details and software architecture.
+There are a number of other documents describing the research in more detail. All referenced documents will be linked
+here and should be read alongside this document for the best understanding of the full picture. However, this is the
+only document which aims to describe key aspects of Polkadot's particular instantiation of much of that research down to
+low-level technical details and software architecture.
diff --git a/polkadot/roadmap/implementers-guide/src/SUMMARY.md b/polkadot/roadmap/implementers-guide/src/SUMMARY.md
index e997d4d77ad1073f9799ada6cbdd79ffd63753c7..bb19390c7af4d422dfe62252a7153392c8ef534d 100644
--- a/polkadot/roadmap/implementers-guide/src/SUMMARY.md
+++ b/polkadot/roadmap/implementers-guide/src/SUMMARY.md
@@ -71,16 +71,16 @@
     - [Chain Selection Request](node/utility/chain-selection.md)
     - [PVF Pre-Checking](node/utility/pvf-prechecker.md)
 - [Data Structures and Types](types/README.md)
-    - [Candidate](types/candidate.md)
-    - [Backing](types/backing.md)
-    - [Availability](types/availability.md)
-    - [Overseer and Subsystem Protocol](types/overseer-protocol.md)
-    - [Runtime](types/runtime.md)
-    - [Messages](types/messages.md)
-    - [Network](types/network.md)
-    - [Approvals](types/approval.md)
-    - [Disputes](types/disputes.md)
-    - [PVF Pre-checking](types/pvf-prechecking.md)
+  - [Candidate](types/candidate.md)
+  - [Backing](types/backing.md)
+  - [Availability](types/availability.md)
+  - [Overseer and Subsystem Protocol](types/overseer-protocol.md)
+  - [Runtime](types/runtime.md)
+  - [Messages](types/messages.md)
+  - [Network](types/network.md)
+  - [Approvals](types/approval.md)
+  - [Disputes](types/disputes.md)
+  - [PVF Pre-checking](types/pvf-prechecking.md)
 
 [Glossary](glossary.md)
 [Further Reading](further-reading.md)
diff --git a/polkadot/roadmap/implementers-guide/src/architecture.md b/polkadot/roadmap/implementers-guide/src/architecture.md
index 0c192a5b980d76f82ddbb6f5c0978dd3ccb5b68b..b75270662005005f4b0a1102b4d95b3d9af2dab0 100644
--- a/polkadot/roadmap/implementers-guide/src/architecture.md
+++ b/polkadot/roadmap/implementers-guide/src/architecture.md
@@ -1,8 +1,13 @@
 # Architecture Overview
 
-This section aims to describe, at a high level, the code architecture and subsystems involved in the implementation of an individual Parachain Host. It also illuminates certain subtleties and challenges faced in the design and implementation of those subsystems.
+This section aims to describe, at a high level, the code architecture and subsystems involved in the implementation of
+an individual Parachain Host. It also illuminates certain subtleties and challenges faced in the design and
+implementation of those subsystems.
 
-To recap, Polkadot includes a blockchain known as the relay-chain. A blockchain is a Directed Acyclic Graph (DAG) of state transitions, where every block can be considered to be the head of a linked-list (known as a "chain" or "fork") with a cumulative state which is determined by applying the state transition of each block in turn. All paths through the DAG terminate at the Genesis Block. In fact, the blockchain is a tree, since each block can have only one parent.
+To recap, Polkadot includes a blockchain known as the relay-chain. A blockchain is a Directed Acyclic Graph (DAG) of
+state transitions, where every block can be considered to be the head of a linked-list (known as a "chain" or "fork")
+with a cumulative state which is determined by applying the state transition of each block in turn. All paths through
+the DAG terminate at the Genesis Block. In fact, the blockchain is a tree, since each block can have only one parent.
 
 ```dot process
 digraph {
@@ -22,16 +27,25 @@ digraph {
 }
 ```
 
-A blockchain network is comprised of nodes. These nodes each have a view of many different forks of a blockchain and must decide which forks to follow and what actions to take based on the forks of the chain that they are aware of.
+A blockchain network is comprised of nodes. These nodes each have a view of many different forks of a blockchain and
+must decide which forks to follow and what actions to take based on the forks of the chain that they are aware of.
 
-So in specifying an architecture to carry out the functionality of a Parachain Host, we have to answer two categories of questions:
+So in specifying an architecture to carry out the functionality of a Parachain Host, we have to answer two categories of
+questions:
 
-1. What is the state-transition function of the blockchain? What is necessary for a transition to be considered valid, and what information is carried within the implicit state of a block?
-1. Being aware of various forks of the blockchain as well as global private state such as a view of the current time, what behaviors should a node undertake? What information should a node extract from the state of which forks, and how should that information be used?
+1. What is the state-transition function of the blockchain? What is necessary for a transition to be considered valid,
+   and what information is carried within the implicit state of a block?
+1. Being aware of various forks of the blockchain as well as global private state such as a view of the current time,
+   what behaviors should a node undertake? What information should a node extract from the state of which forks, and how
+   should that information be used?
 
-The first category of questions will be addressed by the Runtime, which defines the state-transition logic of the chain. Runtime logic only has to focus on the perspective of one chain, as each state has only a single parent state.
+The first category of questions will be addressed by the Runtime, which defines the state-transition logic of the chain.
+Runtime logic only has to focus on the perspective of one chain, as each state has only a single parent state.
 
-The second category of questions addressed by Node-side behavior. Node-side behavior defines all activities that a node undertakes, given its view of the blockchain/block-DAG. Node-side behavior can take into account all or many of the forks of the blockchain, and only conditionally undertake certain activities based on which forks it is aware of, as well as the state of the head of those forks.
+The second category of questions addressed by Node-side behavior. Node-side behavior defines all activities that a node
+undertakes, given its view of the blockchain/block-DAG. Node-side behavior can take into account all or many of the
+forks of the blockchain, and only conditionally undertake certain activities based on which forks it is aware of, as
+well as the state of the head of those forks.
 
 ```dot process
 digraph G {
@@ -46,7 +60,13 @@ digraph G {
 
 ```
 
-It is also helpful to divide Node-side behavior into two further categories: Networking and Core. Networking behaviors relate to how information is distributed between nodes. Core behaviors relate to internal work that a specific node does. These two categories of behavior often interact, but can be heavily abstracted from each other. Core behaviors care that information is distributed and received, but not the internal details of how distribution and receipt function. Networking behaviors act on requests for distribution or fetching of information, but are not concerned with how the information is used afterwards. This allows us to create clean boundaries between Core and Networking activities, improving the modularity of the code.
+It is also helpful to divide Node-side behavior into two further categories: Networking and Core. Networking behaviors
+relate to how information is distributed between nodes. Core behaviors relate to internal work that a specific node
+does. These two categories of behavior often interact, but can be heavily abstracted from each other. Core behaviors
+care that information is distributed and received, but not the internal details of how distribution and receipt
+function. Networking behaviors act on requests for distribution or fetching of information, but are not concerned with
+how the information is used afterwards. This allows us to create clean boundaries between Core and Networking
+activities, improving the modularity of the code.
 
 ```text
           ___________________                    ____________________
@@ -65,8 +85,18 @@ It is also helpful to divide Node-side behavior into two further categories: Net
 
 ```
 
-Node-side behavior is split up into various subsystems. Subsystems are long-lived workers that perform a particular category of work. Subsystems can communicate with each other, and do so via an [Overseer](node/overseer.md) that prevents race conditions.
-
-Runtime logic is divided up into Modules and APIs. Modules encapsulate particular behavior of the system. Modules consist of storage, routines, and entry-points. Routines are invoked by entry points, by other modules, upon block initialization or closing. Routines can read and alter the storage of the module. Entry-points are the means by which new information is introduced to a module and can limit the origins (user, root, parachain) that they accept being called by. Each block in the blockchain contains a set of Extrinsics. Each extrinsic targets a a specific entry point to trigger and which data should be passed to it. Runtime APIs provide a means for Node-side behavior to extract meaningful information from the state of a single fork.
-
-These two aspects of the implementation are heavily dependent on each other. The Runtime depends on Node-side behavior to author blocks, and to include Extrinsics which trigger the correct entry points. The Node-side behavior relies on Runtime APIs to extract information necessary to determine which actions to take.
+Node-side behavior is split up into various subsystems. Subsystems are long-lived workers that perform a particular
+category of work. Subsystems can communicate with each other, and do so via an [Overseer](node/overseer.md) that
+prevents race conditions.
+
+Runtime logic is divided up into Modules and APIs. Modules encapsulate particular behavior of the system. Modules
+consist of storage, routines, and entry-points. Routines are invoked by entry points, by other modules, upon block
+initialization or closing. Routines can read and alter the storage of the module. Entry-points are the means by which
+new information is introduced to a module and can limit the origins (user, root, parachain) that they accept being
+called by. Each block in the blockchain contains a set of Extrinsics. Each extrinsic targets a a specific entry point to
+trigger and which data should be passed to it. Runtime APIs provide a means for Node-side behavior to extract meaningful
+information from the state of a single fork.
+
+These two aspects of the implementation are heavily dependent on each other. The Runtime depends on Node-side behavior
+to author blocks, and to include Extrinsics which trigger the correct entry points. The Node-side behavior relies on
+Runtime APIs to extract information necessary to determine which actions to take.
diff --git a/polkadot/roadmap/implementers-guide/src/disputes-flow.md b/polkadot/roadmap/implementers-guide/src/disputes-flow.md
index a325b2ce727276fbb8b91e0a11760365bd56cdc1..f9fd8dcce351e2b7a4461c05c35a647a69cfb4fe 100644
--- a/polkadot/roadmap/implementers-guide/src/disputes-flow.md
+++ b/polkadot/roadmap/implementers-guide/src/disputes-flow.md
@@ -70,10 +70,12 @@ stateDiagram-v2
 
 ## Conditional formulation
 
-The set of validators eligible to vote consists of
-the validators that had duty at the time of backing, plus backing votes by the backing validators.
+The set of validators eligible to vote consists of the validators that had duty at the time of backing, plus backing
+votes by the backing validators.
 
-If a validator receives an initial dispute message (a set of votes where there are at least two opposing votes contained), and the PoV or Code are hence not reconstructable from local storage, that validator must request the required data from its peers.
+If a validator receives an initial dispute message (a set of votes where there are at least two opposing votes
+contained), and the PoV or Code are hence not reconstructable from local storage, that validator must request the
+required data from its peers.
 
 The dispute availability message must contain code, persisted validation data, and the proof of validity.
 
@@ -81,9 +83,11 @@ Only peers that already voted shall be queried for the dispute availability data
 
 The peer to be queried for disputes data, must be picked at random.
 
-A validator must retain code, persisted validation data and PoV until a block, that contains the dispute resolution, is finalized - plus an additional 24 hours.
+A validator must retain code, persisted validation data and PoV until a block, that contains the dispute resolution, is
+finalized - plus an additional 24 hours.
 
-Dispute availability gossip must continue beyond the dispute resolution, until the post resolution timeout expired (equiv to the timeout until which additional late votes are accepted).
+Dispute availability gossip must continue beyond the dispute resolution, until the post resolution timeout expired
+(equiv to the timeout until which additional late votes are accepted).
 
 Remote disputes are disputes that are in relation to a chain that is not part of the local validators active heads.
 
@@ -93,32 +97,42 @@ Persisted votes stay persisted for `N` sessions, and are cleaned up on a per ses
 
 Votes must be queryable by a particular validator, identified by its signing key.
 
-Votes must be queryable by a particular validator, identified by a session index and the validator index valid in that session.
+Votes must be queryable by a particular validator, identified by a session index and the validator index valid in that
+session.
 
 If there exists a negative and a positive vote for a particular block, a dispute is detected.
 
 If a dispute is detected, all currently available votes for that block must be gossiped.
 
-If an incoming dispute vote is detected, a validator must cast their own vote. The vote is determined by validating the PoV with the Code at the time of backing the block in question.
+If an incoming dispute vote is detected, a validator must cast their own vote. The vote is determined by validating the
+PoV with the Code at the time of backing the block in question.
 
 If the validator was also a backer of the block, validation and casting an additional vote should be skipped.
 
-If the count of votes pro or cons regarding the disputed block, reaches the required ⅔ supermajority (including the backing votes), the conclusion must be recorded on chain and the voters on the loosing and no-shows being slashed appropriately.
+If the count of votes pro or cons regarding the disputed block, reaches the required ⅔ supermajority (including the
+backing votes), the conclusion must be recorded on chain and the voters on the loosing and no-shows being slashed
+appropriately.
 
-If a block is found invalid by a dispute resolution, it must be blacklisted to avoid resync or further build on that chain if other chains are available (to be detailed in the grandpa fork choice rule).
+If a block is found invalid by a dispute resolution, it must be blacklisted to avoid resync or further build on that
+chain if other chains are available (to be detailed in the grandpa fork choice rule).
 
 A dispute accepts Votes after the dispute is resolved, for 1 day.
 
-If a vote is received, after the dispute is resolved, the vote shall still be recorded in the state root, albeit yielding less reward.
+If a vote is received, after the dispute is resolved, the vote shall still be recorded in the state root, albeit
+yielding less reward.
 
 Recording in the state root might happen batched, at timeout expiry.
 
-If a new active head/chain appears, and the dispute resolution was not recorded on that chain yet, the dispute resolution or open dispute must be recorded / transplanted to that chain as well, since the disputes must be present on all chains to make sure the offender is punished.
+If a new active head/chain appears, and the dispute resolution was not recorded on that chain yet, the dispute
+resolution or open dispute must be recorded / transplanted to that chain as well, since the disputes must be present on
+all chains to make sure the offender is punished.
 
-If a validator votes in two opposing ways, this composes of a double vote like in other cases (backing, approval voting).
+If a validator votes in two opposing ways, this composes of a double vote like in other cases (backing, approval
+voting).
 
 If a dispute is not resolved within due time, all validators are to be slashed for a small amount.
 
 If a dispute is not resolved within due time, governance mode shall be entered for manual resolution.
 
-If a validator unexpectedly restarts, the dispute shall be continued with the state based on votes being cast and being present in persistent storage.
+If a validator unexpectedly restarts, the dispute shall be continued with the state based on votes being cast and being
+present in persistent storage.
diff --git a/polkadot/roadmap/implementers-guide/src/glossary.md b/polkadot/roadmap/implementers-guide/src/glossary.md
index a036ccdd668c54ff89933189238757d9b65632b1..b2365ba51c5ce80fd0d60b53c592b1037f540a52 100644
--- a/polkadot/roadmap/implementers-guide/src/glossary.md
+++ b/polkadot/roadmap/implementers-guide/src/glossary.md
@@ -2,46 +2,72 @@
 
 Here you can find definitions of a bunch of jargon, usually specific to the Polkadot project.
 
-- **Approval Checker:** A validator who randomly self-selects so to perform validity checks on a parablock which is pending approval.
-- **BABE:** (Blind Assignment for Blockchain Extension). The algorithm validators use to safely extend the Relay Chain. See [the Polkadot wiki][0] for more information.
-- **Backable Candidate:** A Parachain Candidate which is backed by a majority of validators assigned to a given parachain.
+- **Approval Checker:** A validator who randomly self-selects so to perform validity checks on a parablock which is
+  pending approval.
+- **BABE:** (Blind Assignment for Blockchain Extension). The algorithm validators use to safely extend the Relay Chain.
+  See [the Polkadot wiki][0] for more information.
+- **Backable Candidate:** A Parachain Candidate which is backed by a majority of validators assigned to a given
+  parachain.
 - **Backed Candidate:** A Backable Candidate noted in a relay-chain block
 - **Backing:** A set of statements proving that a Parachain Candidate is backable.
 - **Collator:** A node who generates Proofs-of-Validity (PoV) for blocks of a specific parachain.
-- **DMP:** (Downward Message Passing). Message passing from the relay-chain to a parachain. Also there is a runtime parachains module with the same name.
-- **DMQ:** (Downward Message Queue). A message queue for messages from the relay-chain down to a parachain. A parachain has
-exactly one downward message queue.
-- **Extrinsic:** An element of a relay-chain block which triggers a specific entry-point of a runtime module with given arguments.
-- **GRANDPA:** (Ghost-based Recursive ANcestor Deriving Prefix Agreement). The algorithm validators use to guarantee finality of the Relay Chain.
-- **HRMP:** (Horizontally Relay-routed Message Passing). A mechanism for message passing between parachains (hence horizontal) that leverages the relay-chain storage. Predates XCMP. Also there is a runtime parachains module with the same name.
-- **Inclusion Pipeline:** The set of steps taken to carry a Parachain Candidate from authoring, to backing, to availability and full inclusion in an active fork of its parachain.
+- **DMP:** (Downward Message Passing). Message passing from the relay-chain to a parachain. Also there is a runtime
+  parachains module with the same name.
+- **DMQ:** (Downward Message Queue). A message queue for messages from the relay-chain down to a parachain. A parachain
+has exactly one downward message queue.
+- **Extrinsic:** An element of a relay-chain block which triggers a specific entry-point of a runtime module with given
+  arguments.
+- **GRANDPA:** (Ghost-based Recursive ANcestor Deriving Prefix Agreement). The algorithm validators use to guarantee
+  finality of the Relay Chain.
+- **HRMP:** (Horizontally Relay-routed Message Passing). A mechanism for message passing between parachains (hence
+  horizontal) that leverages the relay-chain storage. Predates XCMP. Also there is a runtime parachains module with the
+  same name.
+- **Inclusion Pipeline:** The set of steps taken to carry a Parachain Candidate from authoring, to backing, to
+  availability and full inclusion in an active fork of its parachain.
 - **Module:** A component of the Runtime logic, encapsulating storage, routines, and entry-points.
 - **Module Entry Point:** A recipient of new information presented to the Runtime. This may trigger routines.
-- **Module Routine:** A piece of code executed within a module by block initialization, closing, or upon an entry point being triggered. This may execute computation, and read or write storage.
-- **MQC:** (Message Queue Chain). A cryptographic data structure that resembles an append-only linked list which doesn't store original values but only their hashes. The whole structure is described by a single hash, referred as a "head". When a value is appended, it's contents hashed with the previous head creating a hash that becomes a new head.
-- **Node:** A participant in the Polkadot network, who follows the protocols of communication and connection to other nodes. Nodes form a peer-to-peer network topology without a central authority.
+- **Module Routine:** A piece of code executed within a module by block initialization, closing, or upon an entry point
+  being triggered. This may execute computation, and read or write storage.
+- **MQC:** (Message Queue Chain). A cryptographic data structure that resembles an append-only linked list which doesn't
+  store original values but only their hashes. The whole structure is described by a single hash, referred as a "head".
+  When a value is appended, it's contents hashed with the previous head creating a hash that becomes a new head.
+- **Node:** A participant in the Polkadot network, who follows the protocols of communication and connection to other
+  nodes. Nodes form a peer-to-peer network topology without a central authority.
 - **Parachain Candidate, or Candidate:** A proposed block for inclusion into a parachain.
 - **Parablock:** A block in a parachain.
 - **Parachain:** A constituent chain secured by the Relay Chain's validators.
-- **Parachain Validators:** A subset of validators assigned during a period of time to back candidates for a specific parachain
+- **Parachain Validators:** A subset of validators assigned during a period of time to back candidates for a specific
+  parachain
 - **On-demand parachain:** A parachain which is scheduled on a pay-as-you-go basis.
-- **Lease holding parachain:** A parachain possessing an active slot lease. The lease holder is assigned a single availability core for the duration of the lease, granting consistent blockspace scheduling at the rate 1 parablock per relay block.
+- **Lease holding parachain:** A parachain possessing an active slot lease. The lease holder is assigned a single
+  availability core for the duration of the lease, granting consistent blockspace scheduling at the rate 1 parablock per
+  relay block.
 - **PDK (Parachain Development Kit):** A toolset that allows one to develop a parachain. Cumulus is a PDK.
-- **Preimage:** In our context, if `H(X) = Y` where `H` is a hash function and `Y` is the hash, then `X` is the hash preimage.
-- **Proof-of-Validity (PoV):** A stateless-client proof that a parachain candidate is valid, with respect to some validation function.
+- **Preimage:** In our context, if `H(X) = Y` where `H` is a hash function and `Y` is the hash, then `X` is the hash
+  preimage.
+- **Proof-of-Validity (PoV):** A stateless-client proof that a parachain candidate is valid, with respect to some
+  validation function.
 - **PVF:** Parachain Validation Function. The validation code that is run by validators on parachains.
-- **PVF Prechecking:** This is the process of initially checking the PVF when it is first added. We attempt preparation of the PVF and make sure it succeeds within a given timeout, plus some additional checks.
-- **PVF Preparation:** This is the process of preparing the WASM blob and includes both prevalidation and compilation. As there is no prevalidation right now, preparation just consists of compilation.
-- **Relay Parent:** A block in the relay chain, referred to in a context where work is being done in the context of the state at this block.
+- **PVF Prechecking:** This is the process of initially checking the PVF when it is first added. We attempt preparation
+  of the PVF and make sure it succeeds within a given timeout, plus some additional checks.
+- **PVF Preparation:** This is the process of preparing the WASM blob and includes both prevalidation and compilation.
+  As there is no prevalidation right now, preparation just consists of compilation.
+- **Relay Parent:** A block in the relay chain, referred to in a context where work is being done in the context of the
+  state at this block.
 - **Runtime:** The relay-chain state machine.
 - **Runtime Module:** See Module.
-- **Runtime API:** A means for the node-side behavior to access structured information based on the state of a fork of the blockchain.
+- **Runtime API:** A means for the node-side behavior to access structured information based on the state of a fork of
+  the blockchain.
 - **Subsystem:** A long-running task which is responsible for carrying out a particular category of work.
 - **UMP:** (Upward Message Passing) A vertical message passing mechanism from a parachain to the relay chain.
-- **Validator:** Specially-selected node in the network who is responsible for validating parachain blocks and issuing attestations about their validity.
+- **Validator:** Specially-selected node in the network who is responsible for validating parachain blocks and issuing
+  attestations about their validity.
 - **Validation Function:** A piece of Wasm code that describes the state-transition function of a parachain.
-- **VMP:** (Vertical Message Passing) A family of mechanisms that are responsible for message exchange between the relay chain and parachains.
-- **XCMP:** (Cross-Chain Message Passing) A type of horizontal message passing (i.e. between parachains) that allows secure message passing directly between parachains and has minimal resource requirements from the relay chain, thus highly scalable.
+- **VMP:** (Vertical Message Passing) A family of mechanisms that are responsible for message exchange between the relay
+  chain and parachains.
+- **XCMP:** (Cross-Chain Message Passing) A type of horizontal message passing (i.e. between parachains) that allows
+  secure message passing directly between parachains and has minimal resource requirements from the relay chain, thus
+  highly scalable.
 
 ## See Also
 
diff --git a/polkadot/roadmap/implementers-guide/src/messaging.md b/polkadot/roadmap/implementers-guide/src/messaging.md
index edc810e034154278e53e78b1e563dcbf299b1613..11cd3565e8ede8ee5e47b5b54c78cc0b627146e8 100644
--- a/polkadot/roadmap/implementers-guide/src/messaging.md
+++ b/polkadot/roadmap/implementers-guide/src/messaging.md
@@ -1,9 +1,9 @@
 # Messaging Overview
 
-The Polkadot Host has a few mechanisms that are responsible for message passing. They can be generally divided
-on two categories: Horizontal and Vertical. Horizontal Message Passing (HMP) refers to mechanisms
-that are responsible for exchanging messages between parachains. Vertical Message Passing (VMP) is
-used for communication between the relay chain and parachains.
+The Polkadot Host has a few mechanisms that are responsible for message passing. They can be generally divided on two
+categories: Horizontal and Vertical. Horizontal Message Passing (HMP) refers to mechanisms that are responsible for
+exchanging messages between parachains. Vertical Message Passing (VMP) is used for communication between the relay chain
+and parachains.
 
 ## Vertical Message Passing
 
@@ -19,35 +19,34 @@ digraph {
 
 Downward Message Passing (DMP) is a mechanism for delivering messages to parachains from the relay chain.
 
-Each parachain has its own queue that stores all pending inbound downward messages. A parachain
-doesn't have to process all messages at once, however, there are rules as to how the downward message queue
-should be processed. Currently, at least one message must be consumed per candidate if the queue is not empty.
-The downward message queue doesn't have a cap on its size and it is up to the relay-chain to put mechanisms
-that prevent spamming in place.
+Each parachain has its own queue that stores all pending inbound downward messages. A parachain doesn't have to process
+all messages at once, however, there are rules as to how the downward message queue should be processed. Currently, at
+least one message must be consumed per candidate if the queue is not empty. The downward message queue doesn't have a
+cap on its size and it is up to the relay-chain to put mechanisms that prevent spamming in place.
 
-Upward Message Passing (UMP) is a mechanism responsible for delivering messages in the opposite direction:
-from a parachain up to the relay chain. Upward messages are essentially byte blobs. However, they are interpreted
-by the relay-chain according to the XCM standard.
+Upward Message Passing (UMP) is a mechanism responsible for delivering messages in the opposite direction: from a
+parachain up to the relay chain. Upward messages are essentially byte blobs. However, they are interpreted by the
+relay-chain according to the XCM standard.
 
-The XCM standard is a common vocabulary of messages. The XCM standard doesn't require a particular interpretation of
-a message. However, the parachains host (e.g. Polkadot) guarantees certain semantics for those.
+The XCM standard is a common vocabulary of messages. The XCM standard doesn't require a particular interpretation of a
+message. However, the parachains host (e.g. Polkadot) guarantees certain semantics for those.
 
-Moreover, while most XCM messages are handled by the on-chain XCM interpreter, some of the messages are special
-cased. Specifically, those messages can be checked during the acceptance criteria and thus invalid
-messages would lead to rejecting the candidate itself.
+Moreover, while most XCM messages are handled by the on-chain XCM interpreter, some of the messages are special cased.
+Specifically, those messages can be checked during the acceptance criteria and thus invalid messages would lead to
+rejecting the candidate itself.
 
-One kind of such a message is `Xcm::Transact`. This upward message can be seen as a way for a parachain
-to execute arbitrary entrypoints on the relay-chain. `Xcm::Transact` messages resemble regular extrinsics with the exception that they
-originate from a parachain.
+One kind of such a message is `Xcm::Transact`. This upward message can be seen as a way for a parachain to execute
+arbitrary entrypoints on the relay-chain. `Xcm::Transact` messages resemble regular extrinsics with the exception that
+they originate from a parachain.
 
-The payload of `Xcm::Transact` messages is referred as to `Dispatchable`. When a candidate with such a message is enacted
-the dispatchables are put into a queue corresponding to the parachain. There can be only so many dispatchables in that queue at once.
-The weight that processing of the dispatchables can consume is limited by a preconfigured value. Therefore, it is possible
-that some dispatchables will be left for later blocks. To make the dispatching more fair, the queues are processed turn-by-turn
-in a round robin fashion.
+The payload of `Xcm::Transact` messages is referred as to `Dispatchable`. When a candidate with such a message is
+enacted the dispatchables are put into a queue corresponding to the parachain. There can be only so many dispatchables
+in that queue at once. The weight that processing of the dispatchables can consume is limited by a preconfigured value.
+Therefore, it is possible that some dispatchables will be left for later blocks. To make the dispatching more fair, the
+queues are processed turn-by-turn in a round robin fashion.
 
-The second category of special cased XCM messages are for horizontal messaging channel management,
-namely messages meant to request opening and closing HRMP channels (HRMP will be described below).
+The second category of special cased XCM messages are for horizontal messaging channel management, namely messages meant
+to request opening and closing HRMP channels (HRMP will be described below).
 
 ## Horizontal Message Passing
 
@@ -77,29 +76,28 @@ The most important member of this family is XCMP.
 
 > ℹ️ XCMP is currently under construction and details are subject for change.
 
-XCMP is a message passing mechanism between parachains that require minimal involvement of the relay chain.
-The relay chain provides means for sending parachains to authenticate messages sent to recipient parachains.
+XCMP is a message passing mechanism between parachains that require minimal involvement of the relay chain. The relay
+chain provides means for sending parachains to authenticate messages sent to recipient parachains.
 
-Semantically communication occurs through so called channels. A channel is unidirectional and it has
-two endpoints, for sender and for recipient. A channel can be opened only if the both parties agree
-and closed unilaterally.
+Semantically communication occurs through so called channels. A channel is unidirectional and it has two endpoints, for
+sender and for recipient. A channel can be opened only if the both parties agree and closed unilaterally.
 
-Only the channel metadata is stored on the relay-chain in a very compact form: all messages and their
-contents sent by the sender parachain are encoded using only one root hash. This root is referred as
-MQC head.
+Only the channel metadata is stored on the relay-chain in a very compact form: all messages and their contents sent by
+the sender parachain are encoded using only one root hash. This root is referred as MQC head.
 
-The authenticity of the messages must be proven using that root hash to the receiving party at the
-candidate authoring time. The proof stems from the relay parent storage that contains the root hash of the channel.
-Since not all messages are required to be processed by the receiver's candidate, only the processed
-messages are supplied (i.e. preimages), rest are provided as hashes.
+The authenticity of the messages must be proven using that root hash to the receiving party at the candidate authoring
+time. The proof stems from the relay parent storage that contains the root hash of the channel. Since not all messages
+are required to be processed by the receiver's candidate, only the processed messages are supplied (i.e. preimages),
+rest are provided as hashes.
 
-Further details can be found at the official repository for the
-[Cross-Consensus Message Format (XCM)](https://github.com/paritytech/xcm-format/blob/master/README.md), as well as
-at the [W3F research website](https://research.web3.foundation/en/latest/polkadot/XCMP.html) and
-[this blogpost](https://medium.com/web3foundation/polkadots-messaging-scheme-b1ec560908b7).
+Further details can be found at the official repository for the [Cross-Consensus Message Format
+(XCM)](https://github.com/paritytech/xcm-format/blob/master/README.md), as well as at the [W3F research
+website](https://research.web3.foundation/en/latest/polkadot/XCMP.html) and [this
+blogpost](https://medium.com/web3foundation/polkadots-messaging-scheme-b1ec560908b7).
 
-HRMP (Horizontally Relay-routed Message Passing) is a stop gap that predates XCMP. Semantically, it mimics XCMP's interface.
-The crucial difference from XCMP though is that all the messages are stored in the relay-chain storage. That makes
-things simple but at the same time that makes HRMP more demanding in terms of resources thus making it more expensive.
+HRMP (Horizontally Relay-routed Message Passing) is a stop gap that predates XCMP. Semantically, it mimics XCMP's
+interface. The crucial difference from XCMP though is that all the messages are stored in the relay-chain storage. That
+makes things simple but at the same time that makes HRMP more demanding in terms of resources thus making it more
+expensive.
 
 Once XCMP is available we expect to retire HRMP.
diff --git a/polkadot/roadmap/implementers-guide/src/node/README.md b/polkadot/roadmap/implementers-guide/src/node/README.md
index edd72d2335b5941971bfc8b9534a4f70b94762d8..c67f2b0b82ee565c139f7126d1243cbed1a3c51a 100644
--- a/polkadot/roadmap/implementers-guide/src/node/README.md
+++ b/polkadot/roadmap/implementers-guide/src/node/README.md
@@ -2,30 +2,49 @@
 
 ## Design Goals
 
-* Modularity: Components of the system should be as self-contained as possible. Communication boundaries between components should be well-defined and mockable. This is key to creating testable, easily reviewable code.
-* Minimizing side effects: Components of the system should aim to minimize side effects and to communicate with other components via message-passing.
-* Operational Safety: The software will be managing signing keys where conflicting messages can lead to large amounts of value to be slashed. Care should be taken to ensure that no messages are signed incorrectly or in conflict with each other.
+* Modularity: Components of the system should be as self-contained as possible. Communication boundaries between
+  components should be well-defined and mockable. This is key to creating testable, easily reviewable code.
+* Minimizing side effects: Components of the system should aim to minimize side effects and to communicate with other
+  components via message-passing.
+* Operational Safety: The software will be managing signing keys where conflicting messages can lead to large amounts of
+  value to be slashed. Care should be taken to ensure that no messages are signed incorrectly or in conflict with each
+  other.
 
-The architecture of the node-side behavior aims to embody the Rust principles of ownership and message-passing to create clean, isolatable code. Each resource should have a single owner, with minimal sharing where unavoidable.
+The architecture of the node-side behavior aims to embody the Rust principles of ownership and message-passing to create
+clean, isolatable code. Each resource should have a single owner, with minimal sharing where unavoidable.
 
-Many operations that need to be carried out involve the network, which is asynchronous. This asynchrony affects all core subsystems that rely on the network as well. The approach of hierarchical state machines is well-suited to this kind of environment.
+Many operations that need to be carried out involve the network, which is asynchronous. This asynchrony affects all core
+subsystems that rely on the network as well. The approach of hierarchical state machines is well-suited to this kind of
+environment.
 
 We introduce
 
 ## Components
 
 The node architecture consists of the following components:
-  * The Overseer (and subsystems): A hierarchy of state machines where an overseer supervises subsystems. Subsystems can contain their own internal hierarchy of jobs. This is elaborated on in the next section on Subsystems.
+  * The Overseer (and subsystems): A hierarchy of state machines where an overseer supervises subsystems. Subsystems can
+    contain their own internal hierarchy of jobs. This is elaborated on in the next section on Subsystems.
   * A block proposer: Logic triggered by the consensus algorithm of the chain when the node should author a block.
-  * A GRANDPA voting rule: A strategy for selecting chains to vote on in the GRANDPA algorithm to ensure that only valid parachain candidates appear in finalized relay-chain blocks.
+  * A GRANDPA voting rule: A strategy for selecting chains to vote on in the GRANDPA algorithm to ensure that only valid
+    parachain candidates appear in finalized relay-chain blocks.
 
 ## Assumptions
 
-The Node-side code comes with a set of assumptions that we build upon. These assumptions encompass most of the fundamental blockchain functionality.
+The Node-side code comes with a set of assumptions that we build upon. These assumptions encompass most of the
+fundamental blockchain functionality.
 
 We assume the following constraints regarding provided basic functionality:
   * The underlying **consensus** algorithm, whether it is BABE or SASSAFRAS is implemented.
-  * There is a **chain synchronization** protocol which will search for and download the longest available chains at all times.
-  * The **state** of all blocks at the head of the chain is available. There may be **state pruning** such that state of the last `k` blocks behind the last finalized block are available, as well as the state of all their descendants. This assumption implies that the state of all active leaves and their last `k` ancestors are all available. The underlying implementation is expected to support `k` of a few hundred blocks, but we reduce this to a very conservative `k=5` for our purposes.
-  * There is an underlying **networking** framework which provides **peer discovery** services which will provide us with peers and will not create "loopback" connections to our own node. The number of peers we will have is assumed to be bounded at 1000.
-  * There is a **transaction pool** and a **transaction propagation** mechanism which maintains a set of current transactions and distributes to connected peers. Current transactions are those which are not outdated relative to some "best" fork of the chain, which is part of the active heads, and have not been included in the best fork.
+  * There is a **chain synchronization** protocol which will search for and download the longest available chains at all
+    times.
+  * The **state** of all blocks at the head of the chain is available. There may be **state pruning** such that state of
+    the last `k` blocks behind the last finalized block are available, as well as the state of all their descendants.
+    This assumption implies that the state of all active leaves and their last `k` ancestors are all available. The
+    underlying implementation is expected to support `k` of a few hundred blocks, but we reduce this to a very
+    conservative `k=5` for our purposes.
+  * There is an underlying **networking** framework which provides **peer discovery** services which will provide us
+    with peers and will not create "loopback" connections to our own node. The number of peers we will have is assumed
+    to be bounded at 1000.
+  * There is a **transaction pool** and a **transaction propagation** mechanism which maintains a set of current
+    transactions and distributes to connected peers. Current transactions are those which are not outdated relative to
+    some "best" fork of the chain, which is part of the active heads, and have not been included in the best fork.
diff --git a/polkadot/roadmap/implementers-guide/src/node/approval/README.md b/polkadot/roadmap/implementers-guide/src/node/approval/README.md
index 1f65173e16bb0c3ffd47d72ccf674820dc252148..ae9f46674e54699c8fa90a5851b77b67d3bbe330 100644
--- a/polkadot/roadmap/implementers-guide/src/node/approval/README.md
+++ b/polkadot/roadmap/implementers-guide/src/node/approval/README.md
@@ -2,6 +2,9 @@
 
 The approval subsystems implement the node-side of the [Approval Protocol](../../protocol-approval.md).
 
-We make a divide between the [assignment/voting logic](approval-voting.md) and the [distribution logic](approval-distribution.md) that distributes assignment certifications and approval votes. The logic in the assignment and voting also informs the GRANDPA voting rule on how to vote.
+We make a divide between the [assignment/voting logic](approval-voting.md) and the [distribution
+logic](approval-distribution.md) that distributes assignment certifications and approval votes. The logic in the
+assignment and voting also informs the GRANDPA voting rule on how to vote.
 
-These subsystems are intended to flag issues and begin participating in live disputes. Dispute subsystems also track all observed votes (backing, approval, and dispute-specific) by all validators on all candidates.
+These subsystems are intended to flag issues and begin participating in live disputes. Dispute subsystems also track all
+observed votes (backing, approval, and dispute-specific) by all validators on all candidates.
diff --git a/polkadot/roadmap/implementers-guide/src/node/approval/approval-distribution.md b/polkadot/roadmap/implementers-guide/src/node/approval/approval-distribution.md
index 81c98afa16bf25439a59ae42ae1d3ace96a5558c..ce71de6f76b8f8550e815849ba80002f890a9b85 100644
--- a/polkadot/roadmap/implementers-guide/src/node/approval/approval-distribution.md
+++ b/polkadot/roadmap/implementers-guide/src/node/approval/approval-distribution.md
@@ -2,50 +2,73 @@
 
 A subsystem for the distribution of assignments and approvals for approval checks on candidates over the network.
 
-The [Approval Voting](approval-voting.md) subsystem is responsible for active participation in a protocol designed to select a sufficient number of validators to check each and every candidate which appears in the relay chain. Statements of participation in this checking process are divided into two kinds:
-  - **Assignments** indicate that validators have been selected to do checking
-  - **Approvals** indicate that validators have checked and found the candidate satisfactory.
-
-The [Approval Voting](approval-voting.md) subsystem handles all the issuing and tallying of this protocol, but this subsystem is responsible for the disbursal of statements among the validator-set.
-
-The inclusion pipeline of candidates concludes after availability, and only after inclusion do candidates actually get pushed into the approval checking pipeline. As such, this protocol deals with the candidates _made available by_ particular blocks, as opposed to the candidates which actually appear within those blocks, which are the candidates _backed by_ those blocks. Unless stated otherwise, whenever we reference a candidate partially by block hash, we are referring to the set of candidates _made available by_ those blocks.
-
-We implement this protocol as a gossip protocol, and like other parachain-related gossip protocols our primary concerns are about ensuring fast message propagation while maintaining an upper bound on the number of messages any given node must store at any time.
-
-Approval messages should always follow assignments, so we need to be able to discern two pieces of information based on our [View](../../types/network.md#universal-types):
+The [Approval Voting](approval-voting.md) subsystem is responsible for active participation in a protocol designed to
+select a sufficient number of validators to check each and every candidate which appears in the relay chain. Statements
+of participation in this checking process are divided into two kinds:
+  * **Assignments** indicate that validators have been selected to do checking
+  * **Approvals** indicate that validators have checked and found the candidate satisfactory.
+
+The [Approval Voting](approval-voting.md) subsystem handles all the issuing and tallying of this protocol, but this
+subsystem is responsible for the disbursal of statements among the validator-set.
+
+The inclusion pipeline of candidates concludes after availability, and only after inclusion do candidates actually get
+pushed into the approval checking pipeline. As such, this protocol deals with the candidates _made available by_
+particular blocks, as opposed to the candidates which actually appear within those blocks, which are the candidates
+_backed by_ those blocks. Unless stated otherwise, whenever we reference a candidate partially by block hash, we are
+referring to the set of candidates _made available by_ those blocks.
+
+We implement this protocol as a gossip protocol, and like other parachain-related gossip protocols our primary concerns
+are about ensuring fast message propagation while maintaining an upper bound on the number of messages any given node
+must store at any time.
+
+Approval messages should always follow assignments, so we need to be able to discern two pieces of information based on
+our [View](../../types/network.md#universal-types):
   1. Is a particular assignment relevant under a given `View`?
   2. Is a particular approval relevant to any assignment in a set?
 
-For our own local view, these two queries  must not yield false negatives. When applied to our peers' views, it is acceptable for them to yield false negatives. The reason for that is that our peers' views may be beyond ours, and we are not capable of fully evaluating them. Once we have caught up, we can check again for false negatives to continue distributing.
+For our own local view, these two queries  must not yield false negatives. When applied to our peers' views, it is
+acceptable for them to yield false negatives. The reason for that is that our peers' views may be beyond ours, and we
+are not capable of fully evaluating them. Once we have caught up, we can check again for false negatives to continue
+distributing.
 
-For assignments, what we need to be checking is whether we are aware of the (block, candidate) pair that the assignment references. For approvals, we need to be aware of an assignment by the same validator which references the candidate being approved.
+For assignments, what we need to be checking is whether we are aware of the (block, candidate) pair that the assignment
+references. For approvals, we need to be aware of an assignment by the same validator which references the candidate
+being approved.
 
-However, awareness on its own of a (block, candidate) pair would imply that even ancient candidates all the way back to the genesis are relevant. We are actually not interested in anything before finality.
+However, awareness on its own of a (block, candidate) pair would imply that even ancient candidates all the way back to
+the genesis are relevant. We are actually not interested in anything before finality.
 
-We gossip assignments along a grid topology produced by the [Gossip Support Subsystem](../utility/gossip-support.md) and also to a few random peers. The first time we accept an assignment or approval, regardless of the source, which originates from a validator peer in a shared dimension of the grid, we propagate the message to validator peers in the unshared dimension as well as a few random peers.
+We gossip assignments along a grid topology produced by the [Gossip Support Subsystem](../utility/gossip-support.md) and
+also to a few random peers. The first time we accept an assignment or approval, regardless of the source, which
+originates from a validator peer in a shared dimension of the grid, we propagate the message to validator peers in the
+unshared dimension as well as a few random peers.
 
-But, in case these mechanisms don't work on their own, we need to trade bandwidth for protocol liveness by introducing aggression.
+But, in case these mechanisms don't work on their own, we need to trade bandwidth for protocol liveness by introducing
+aggression.
 
 Aggression has 3 levels:
-    Aggression Level 0: The basic behaviors described above.
-    Aggression Level 1: The originator of a message sends to all peers. Other peers follow the rules above.
-    Aggression Level 2: All peers send all messages to all their row and column neighbors. This means that each validator will, on average, receive each message approximately 2*sqrt(n) times.
+* Aggression Level 0: The basic behaviors described above.
+* Aggression Level 1: The originator of a message sends to all peers. Other peers follow the rules above.
+* Aggression Level 2: All peers send all messages to all their row and column neighbors. This means that each validator
+    will, on average, receive each message approximately 2*sqrt(n) times.
 
-These aggression levels are chosen based on how long a block has taken to finalize: assignments and approvals related to the unfinalized block will be propagated with more aggression. In particular, it's only the earliest unfinalized blocks that aggression should be applied to, because descendants may be unfinalized only by virtue of being descendants.
+These aggression levels are chosen based on how long a block has taken to finalize: assignments and approvals related to
+the unfinalized block will be propagated with more aggression. In particular, it's only the earliest unfinalized blocks
+that aggression should be applied to, because descendants may be unfinalized only by virtue of being descendants.
 
 ## Protocol
 
 Input:
-  - `ApprovalDistributionMessage::NewBlocks`
-  - `ApprovalDistributionMessage::DistributeAssignment`
-  - `ApprovalDistributionMessage::DistributeApproval`
-  - `ApprovalDistributionMessage::NetworkBridgeUpdate`
-  - `OverseerSignal::BlockFinalized`
+  * `ApprovalDistributionMessage::NewBlocks`
+  * `ApprovalDistributionMessage::DistributeAssignment`
+  * `ApprovalDistributionMessage::DistributeApproval`
+  * `ApprovalDistributionMessage::NetworkBridgeUpdate`
+  * `OverseerSignal::BlockFinalized`
 
 Output:
-  - `ApprovalVotingMessage::CheckAndImportAssignment`
-  - `ApprovalVotingMessage::CheckAndImportApproval`
-  - `NetworkBridgeMessage::SendValidationMessage::ApprovalDistribution`
+  * `ApprovalVotingMessage::CheckAndImportAssignment`
+  * `ApprovalVotingMessage::CheckAndImportApproval`
+  * `NetworkBridgeMessage::SendValidationMessage::ApprovalDistribution`
 
 ## Functionality
 
@@ -134,28 +157,37 @@ Iterate over every `BlockEntry` and remove `PeerId` from it.
 
 #### `NetworkBridgeEvent::OurViewChange`
 
-Remove entries in `pending_known` for all hashes not present in the view.
-Ensure a vector is present in `pending_known` for each hash in the view that does not have an entry in `blocks`.
+Remove entries in `pending_known` for all hashes not present in the view. Ensure a vector is present in `pending_known`
+for each hash in the view that does not have an entry in `blocks`.
 
 #### `NetworkBridgeEvent::PeerViewChange`
 
 Invoke `unify_with_peer(peer, view)` to catch them up to messages we have.
 
-We also need to use the `view.finalized_number` to remove the `PeerId` from any blocks that it won't be wanting information about anymore. Note that we have to be on guard for peers doing crazy stuff like jumping their `finalized_number` forward 10 trillion blocks to try and get us stuck in a loop for ages.
+We also need to use the `view.finalized_number` to remove the `PeerId` from any blocks that it won't be wanting
+information about anymore. Note that we have to be on guard for peers doing crazy stuff like jumping their
+`finalized_number` forward 10 trillion blocks to try and get us stuck in a loop for ages.
 
-One of the safeguards we can implement is to reject view updates from peers where the new `finalized_number` is less than the previous.
+One of the safeguards we can implement is to reject view updates from peers where the new `finalized_number` is less
+than the previous.
 
-We augment that by defining `constrain(x)` to output the x bounded by the first and last numbers in `state.blocks_by_number`.
+We augment that by defining `constrain(x)` to output the x bounded by the first and last numbers in
+`state.blocks_by_number`.
 
-From there, we can loop backwards from `constrain(view.finalized_number)` until `constrain(last_view.finalized_number)` is reached, removing the `PeerId` from all `BlockEntry`s referenced at that height. We can break the loop early if we ever exit the bound supplied by the first block in `state.blocks_by_number`.
+From there, we can loop backwards from `constrain(view.finalized_number)` until `constrain(last_view.finalized_number)`
+is reached, removing the `PeerId` from all `BlockEntry`s referenced at that height. We can break the loop early if we
+ever exit the bound supplied by the first block in `state.blocks_by_number`.
 
 #### `NetworkBridgeEvent::PeerMessage`
 
-If the block hash referenced by the message exists in `pending_known`, add it to the vector of pending messages and return.
+If the block hash referenced by the message exists in `pending_known`, add it to the vector of pending messages and
+return.
 
-If the message is of type `ApprovalDistributionV1Message::Assignment(assignment_cert, claimed_index)`, then call `import_and_circulate_assignment(MessageSource::Peer(sender), assignment_cert, claimed_index)`
+If the message is of type `ApprovalDistributionV1Message::Assignment(assignment_cert, claimed_index)`, then call
+`import_and_circulate_assignment(MessageSource::Peer(sender), assignment_cert, claimed_index)`
 
-If the message is of type `ApprovalDistributionV1Message::Approval(approval_vote)`, then call `import_and_circulate_approval(MessageSource::Peer(sender), approval_vote)`
+If the message is of type `ApprovalDistributionV1Message::Approval(approval_vote)`, then call
+`import_and_circulate_approval(MessageSource::Peer(sender), approval_vote)`
 
 ### Subsystem Updates
 
@@ -164,7 +196,8 @@ If the message is of type `ApprovalDistributionV1Message::Approval(approval_vote
 Create `BlockEntry` and `CandidateEntries` for all blocks.
 
 For all entries in `pending_known`:
-  * If there is now an entry under `blocks` for the block hash, drain all messages and import with `import_and_circulate_assignment` and `import_and_circulate_approval`.
+  * If there is now an entry under `blocks` for the block hash, drain all messages and import with
+    `import_and_circulate_assignment` and `import_and_circulate_approval`.
 
 For all peers:
   * Compute `view_intersection` as the intersection of the peer's view blocks with the hashes of the new blocks.
@@ -180,7 +213,8 @@ Call `import_and_circulate_approval` with `MessageSource::Local`.
 
 #### `OverseerSignal::BlockFinalized`
 
-Prune all lists from `blocks_by_number` with number less than or equal to `finalized_number`. Prune all the `BlockEntry`s referenced by those lists.
+Prune all lists from `blocks_by_number` with number less than or equal to `finalized_number`. Prune all the
+`BlockEntry`s referenced by those lists.
 
 
 ### Utility
@@ -192,9 +226,14 @@ enum MessageSource {
 }
 ```
 
-#### `import_and_circulate_assignment(source: MessageSource, assignment: IndirectAssignmentCert, claimed_candidate_index: CandidateIndex)`
+#### `import_and_circulate_assignment(...)`
 
-Imports an assignment cert referenced by block hash and candidate index. As a postcondition, if the cert is valid, it will have distributed the cert to all peers who have the block in their view, with the exclusion of the peer referenced by the `MessageSource`.
+`import_and_circulate_assignment(source: MessageSource, assignment: IndirectAssignmentCert, claimed_candidate_index:
+CandidateIndex)`
+
+Imports an assignment cert referenced by block hash and candidate index. As a postcondition, if the cert is valid, it
+will have distributed the cert to all peers who have the block in their view, with the exclusion of the peer referenced
+by the `MessageSource`.
 
 We maintain a few invariants:
   * we only send an assignment to a peer after we add its fingerprint to our knowledge
@@ -202,61 +241,84 @@ We maintain a few invariants:
 
 The algorithm is the following:
 
-  * Load the `BlockEntry` using `assignment.block_hash`. If it does not exist, report the source if it is `MessageSource::Peer` and return.
+  * Load the `BlockEntry` using `assignment.block_hash`. If it does not exist, report the source if it is
+    `MessageSource::Peer` and return.
   * Compute a fingerprint for the `assignment` using `claimed_candidate_index`.
   * If the source is `MessageSource::Peer(sender)`:
-    * check if `peer` appears under `known_by` and whether the fingerprint is in the knowledge of the peer. If the peer does not know the block, report for providing data out-of-view and proceed. If the peer does know the block and the `sent` knowledge contains the fingerprint, report for providing replicate data and return, otherwise, insert into the `received` knowledge and return.
-    * If the message fingerprint appears under the `BlockEntry`'s `Knowledge`, give the peer a small positive reputation boost,
-    add the fingerprint to the peer's knowledge only if it knows about the block and return.
-    Note that we must do this after checking for out-of-view and if the peers knows about the block to avoid being spammed.
-    If we did this check earlier, a peer could provide data out-of-view repeatedly and be rewarded for it.
+    * check if `peer` appears under `known_by` and whether the fingerprint is in the knowledge of the peer. If the peer
+      does not know the block, report for providing data out-of-view and proceed. If the peer does know the block and
+      the `sent` knowledge contains the fingerprint, report for providing replicate data and return, otherwise, insert
+      into the `received` knowledge and return.
+    * If the message fingerprint appears under the `BlockEntry`'s `Knowledge`, give the peer a small positive reputation
+    boost, add the fingerprint to the peer's knowledge only if it knows about the block and return. Note that we must do
+    this after checking for out-of-view and if the peers knows about the block to avoid being spammed. If we did this
+    check earlier, a peer could provide data out-of-view repeatedly and be rewarded for it.
     * Dispatch `ApprovalVotingMessage::CheckAndImportAssignment(assignment)` and wait for the response.
     * If the result is `AssignmentCheckResult::Accepted`
       * If the vote was accepted but not duplicate, give the peer a positive reputation boost
-      * add the fingerprint to both our and the peer's knowledge in the `BlockEntry`. Note that we only doing this after making sure we have the right fingerprint.
-    * If the result is `AssignmentCheckResult::AcceptedDuplicate`, add the fingerprint to the peer's knowledge if it knows about the block and return.
+      * add the fingerprint to both our and the peer's knowledge in the `BlockEntry`. Note that we only doing this after
+        making sure we have the right fingerprint.
+    * If the result is `AssignmentCheckResult::AcceptedDuplicate`, add the fingerprint to the peer's knowledge if it
+      knows about the block and return.
     * If the result is `AssignmentCheckResult::TooFarInFuture`, mildly punish the peer and return.
     * If the result is `AssignmentCheckResult::Bad`, punish the peer and return.
   * If the source is `MessageSource::Local(CandidateIndex)`
     * check if the fingerprint appears under the `BlockEntry's` knowledge. If not, add it.
-  * Load the candidate entry for the given candidate index. It should exist unless there is a logic error in the approval voting subsystem.
-  * Set the approval state for the validator index to `ApprovalState::Assigned` unless the approval state is set already. This should not happen as long as the approval voting subsystem instructs us to ignore duplicate assignments.
-  * Dispatch a `ApprovalDistributionV1Message::Assignment(assignment, candidate_index)` to all peers in the `BlockEntry`'s `known_by` set, excluding the peer in the `source`, if `source` has kind `MessageSource::Peer`. Add the fingerprint of the assignment to the knowledge of each peer.
+  * Load the candidate entry for the given candidate index. It should exist unless there is a logic error in the
+    approval voting subsystem.
+  * Set the approval state for the validator index to `ApprovalState::Assigned` unless the approval state is set
+    already. This should not happen as long as the approval voting subsystem instructs us to ignore duplicate
+    assignments.
+  * Dispatch a `ApprovalDistributionV1Message::Assignment(assignment, candidate_index)` to all peers in the
+    `BlockEntry`'s `known_by` set, excluding the peer in the `source`, if `source` has kind `MessageSource::Peer`. Add
+    the fingerprint of the assignment to the knowledge of each peer.
 
 
 #### `import_and_circulate_approval(source: MessageSource, approval: IndirectSignedApprovalVote)`
 
 Imports an approval signature referenced by block hash and candidate index:
 
-  * Load the `BlockEntry` using `approval.block_hash` and the candidate entry using `approval.candidate_entry`. If either does not exist, report the source if it is `MessageSource::Peer` and return.
+  * Load the `BlockEntry` using `approval.block_hash` and the candidate entry using `approval.candidate_entry`. If
+    either does not exist, report the source if it is `MessageSource::Peer` and return.
   * Compute a fingerprint for the approval.
-  * Compute a fingerprint for the corresponding assignment. If the `BlockEntry`'s knowledge does not contain that fingerprint, then report the source if it is `MessageSource::Peer` and return. All references to a fingerprint after this refer to the approval's, not the assignment's.
+  * Compute a fingerprint for the corresponding assignment. If the `BlockEntry`'s knowledge does not contain that
+    fingerprint, then report the source if it is `MessageSource::Peer` and return. All references to a fingerprint after
+    this refer to the approval's, not the assignment's.
   * If the source is `MessageSource::Peer(sender)`:
-    * check if `peer` appears under `known_by` and whether the fingerprint is in the knowledge of the peer. If the peer does not know the block, report for providing data out-of-view and proceed. If the peer does know the block and the `sent` knowledge contains the fingerprint, report for providing replicate data and return, otherwise, insert into the `received` knowledge and return.
-    * If the message fingerprint appears under the `BlockEntry`'s `Knowledge`, give the peer a small positive reputation boost,
-    add the fingerprint to the peer's knowledge only if it knows about the block and return.
-    Note that we must do this after checking for out-of-view to avoid being spammed. If we did this check earlier, a peer could provide data out-of-view repeatedly and be rewarded for it.
+    * check if `peer` appears under `known_by` and whether the fingerprint is in the knowledge of the peer. If the peer
+      does not know the block, report for providing data out-of-view and proceed. If the peer does know the block and
+      the `sent` knowledge contains the fingerprint, report for providing replicate data and return, otherwise, insert
+      into the `received` knowledge and return.
+    * If the message fingerprint appears under the `BlockEntry`'s `Knowledge`, give the peer a small positive reputation
+    boost, add the fingerprint to the peer's knowledge only if it knows about the block and return. Note that we must do
+    this after checking for out-of-view to avoid being spammed. If we did this check earlier, a peer could provide data
+    out-of-view repeatedly and be rewarded for it.
     * Dispatch `ApprovalVotingMessage::CheckAndImportApproval(approval)` and wait for the response.
     * If the result is `VoteCheckResult::Accepted(())`:
       * Give the peer a positive reputation boost and add the fingerprint to both our and the peer's knowledge.
     * If the result is `VoteCheckResult::Bad`:
       * Report the peer and return.
-  * Load the candidate entry for the given candidate index. It should exist unless there is a logic error in the approval voting subsystem.
-  * Set the approval state for the validator index to `ApprovalState::Approved`. It should already be in the `Assigned` state as our `BlockEntry` knowledge contains a fingerprint for the assignment.
-  * Dispatch a `ApprovalDistributionV1Message::Approval(approval)` to all peers in the `BlockEntry`'s `known_by` set, excluding the peer in the `source`, if `source` has kind `MessageSource::Peer`. Add the fingerprint of the assignment to the knowledge of each peer. Note that this obeys the politeness conditions:
+  * Load the candidate entry for the given candidate index. It should exist unless there is a logic error in the
+    approval voting subsystem.
+  * Set the approval state for the validator index to `ApprovalState::Approved`. It should already be in the `Assigned`
+    state as our `BlockEntry` knowledge contains a fingerprint for the assignment.
+  * Dispatch a `ApprovalDistributionV1Message::Approval(approval)` to all peers in the `BlockEntry`'s `known_by` set,
+    excluding the peer in the `source`, if `source` has kind `MessageSource::Peer`. Add the fingerprint of the
+    assignment to the knowledge of each peer. Note that this obeys the politeness conditions:
     * We guarantee elsewhere that all peers within `known_by` are aware of all assignments relative to the block.
     * We've checked that this specific approval has a corresponding assignment within the `BlockEntry`.
     * Thus, all peers are aware of the assignment or have a message to them in-flight which will make them so.
 
-
-#### `unify_with_peer(peer: PeerId, view)`:
+#### `unify_with_peer(peer: PeerId, view)`
 
 1. Initialize a set `missing_knowledge = {}`
 
 For each block in the view:
-  2. Load the `BlockEntry` for the block. If the block is unknown, or the number is less than or equal to the view's finalized number go to step 6.
-  3. Inspect the `known_by` set of the `BlockEntry`. If the peer already knows all assignments/approvals, go to step 6.
-  4. Add the peer to `known_by` and add the hash and missing knowledge of the block to `missing_knowledge`.
-  5. Return to step 2 with the ancestor of the block.
-
-6. For each block in `missing_knowledge`, send all assignments and approvals for all candidates in those blocks to the peer.
+  1. Load the `BlockEntry` for the block. If the block is unknown, or the number is less than or equal to the view's
+     finalized number go to step 6.
+  1. Inspect the `known_by` set of the `BlockEntry`. If the peer already knows all assignments/approvals, go to step 6.
+  1. Add the peer to `known_by` and add the hash and missing knowledge of the block to `missing_knowledge`.
+  1. Return to step 2 with the ancestor of the block.
+
+1. For each block in `missing_knowledge`, send all assignments and approvals for all candidates in those blocks to the
+   peer.
diff --git a/polkadot/roadmap/implementers-guide/src/node/approval/approval-voting.md b/polkadot/roadmap/implementers-guide/src/node/approval/approval-voting.md
index 88744e50cf7956b6629a1f8b97895eae13287012..6da2f5d9b883a08877928bf6e7c2507ec1f38604 100644
--- a/polkadot/roadmap/implementers-guide/src/node/approval/approval-voting.md
+++ b/polkadot/roadmap/implementers-guide/src/node/approval/approval-voting.md
@@ -1,35 +1,61 @@
 # Approval Voting
 
-Reading the [section on the approval protocol](../../protocol-approval.md) will likely be necessary to understand the aims of this subsystem.
-
-Approval votes are split into two parts: Assignments and Approvals. Validators first broadcast their assignment to indicate intent to check a candidate. Upon successfully checking, they broadcast an approval vote. If a validator doesn't broadcast their approval vote shortly after issuing an assignment, this is an indication that they are being prevented from recovering or validating the block data and that more validators should self-select to check the candidate. This is known as a "no-show".
-
-The core of this subsystem is a Tick-based timer loop, where Ticks are 500ms. We also reason about time in terms of `DelayTranche`s, which measure the number of ticks elapsed since a block was produced. We track metadata for all un-finalized but included candidates. We compute our local assignments to check each candidate, as well as which `DelayTranche` those assignments may be minimally triggered at. As the same candidate may appear in more than one block, we must produce our potential assignments for each (Block, Candidate) pair. The timing loop is based on waiting for assignments to become no-shows or waiting to broadcast and begin our own assignment to check.
-
-Another main component of this subsystem is the logic for determining when a (Block, Candidate) pair has been approved and when to broadcast and trigger our own assignment. Once a (Block, Candidate) pair has been approved, we mark a corresponding bit in the `BlockEntry` that indicates the candidate has been approved under the block. When we trigger our own assignment, we broadcast it via Approval Distribution, begin fetching the data from Availability Recovery, and then pass it through to the Candidate Validation. Once these steps are successful, we issue our approval vote. If any of these steps fail, we don't issue any vote and will "no-show" from the perspective of other validators in addition a dispute is raised via the dispute-coordinator, by sending `IssueLocalStatement`.
-
-Where this all fits into Polkadot is via block finality. Our goal is to not finalize any block containing a candidate that is not approved. We provide a hook for a custom GRANDPA voting rule - GRANDPA makes requests of the form (target, minimum) consisting of a target block (i.e. longest chain) that it would like to finalize, and a minimum block which, due to the rules of GRANDPA, must be voted on. The minimum is typically the last finalized block, but may be beyond it, in the case of having a last-round-estimate beyond the last finalized. Thus, our goal is to inform GRANDPA of some block between target and minimum which we believe can be finalized safely. We do this by iterating backwards from the target to the minimum and finding the longest continuous chain from minimum where all candidates included by those blocks have been approved.
+Reading the [section on the approval protocol](../../protocol-approval.md) will likely be necessary to understand the
+aims of this subsystem.
+
+Approval votes are split into two parts: Assignments and Approvals. Validators first broadcast their assignment to
+indicate intent to check a candidate. Upon successfully checking, they broadcast an approval vote. If a validator
+doesn't broadcast their approval vote shortly after issuing an assignment, this is an indication that they are being
+prevented from recovering or validating the block data and that more validators should self-select to check the
+candidate. This is known as a "no-show".
+
+The core of this subsystem is a Tick-based timer loop, where Ticks are 500ms. We also reason about time in terms of
+`DelayTranche`s, which measure the number of ticks elapsed since a block was produced. We track metadata for all
+un-finalized but included candidates. We compute our local assignments to check each candidate, as well as which
+`DelayTranche` those assignments may be minimally triggered at. As the same candidate may appear in more than one block,
+we must produce our potential assignments for each (Block, Candidate) pair. The timing loop is based on waiting for
+assignments to become no-shows or waiting to broadcast and begin our own assignment to check.
+
+Another main component of this subsystem is the logic for determining when a (Block, Candidate) pair has been approved
+and when to broadcast and trigger our own assignment. Once a (Block, Candidate) pair has been approved, we mark a
+corresponding bit in the `BlockEntry` that indicates the candidate has been approved under the block. When we trigger
+our own assignment, we broadcast it via Approval Distribution, begin fetching the data from Availability Recovery, and
+then pass it through to the Candidate Validation. Once these steps are successful, we issue our approval vote. If any of
+these steps fail, we don't issue any vote and will "no-show" from the perspective of other validators in addition a
+dispute is raised via the dispute-coordinator, by sending `IssueLocalStatement`.
+
+Where this all fits into Polkadot is via block finality. Our goal is to not finalize any block containing a candidate
+that is not approved. We provide a hook for a custom GRANDPA voting rule - GRANDPA makes requests of the form (target,
+minimum) consisting of a target block (i.e. longest chain) that it would like to finalize, and a minimum block which,
+due to the rules of GRANDPA, must be voted on. The minimum is typically the last finalized block, but may be beyond it,
+in the case of having a last-round-estimate beyond the last finalized. Thus, our goal is to inform GRANDPA of some block
+between target and minimum which we believe can be finalized safely. We do this by iterating backwards from the target
+to the minimum and finding the longest continuous chain from minimum where all candidates included by those blocks have
+been approved.
 
 ## Protocol
 
 Input:
-  - `ApprovalVotingMessage::CheckAndImportAssignment`
-  - `ApprovalVotingMessage::CheckAndImportApproval`
-  - `ApprovalVotingMessage::ApprovedAncestor`
+  * `ApprovalVotingMessage::CheckAndImportAssignment`
+  * `ApprovalVotingMessage::CheckAndImportApproval`
+  * `ApprovalVotingMessage::ApprovedAncestor`
 
 Output:
-  - `ApprovalDistributionMessage::DistributeAssignment`
-  - `ApprovalDistributionMessage::DistributeApproval`
-  - `RuntimeApiMessage::Request`
-  - `ChainApiMessage`
-  - `AvailabilityRecoveryMessage::Recover`
-  - `CandidateExecutionMessage::ValidateFromExhaustive`
+  * `ApprovalDistributionMessage::DistributeAssignment`
+  * `ApprovalDistributionMessage::DistributeApproval`
+  * `RuntimeApiMessage::Request`
+  * `ChainApiMessage`
+  * `AvailabilityRecoveryMessage::Recover`
+  * `CandidateExecutionMessage::ValidateFromExhaustive`
 
 ## Functionality
 
-The approval voting subsystem is responsible for casting votes and determining approval of candidates and as a result, blocks.
+The approval voting subsystem is responsible for casting votes and determining approval of candidates and as a result,
+blocks.
 
-This subsystem wraps a database which is used to store metadata about unfinalized blocks and the candidates within them. Candidates may appear in multiple blocks, and assignment criteria are chosen differently based on the hash of the block they appear in.
+This subsystem wraps a database which is used to store metadata about unfinalized blocks and the candidates within them.
+Candidates may appear in multiple blocks, and assignment criteria are chosen differently based on the hash of the block
+they appear in.
 
 ## Database Schema
 
@@ -150,16 +176,22 @@ struct State {
 }
 ```
 
-This guide section makes no explicit references to writes to or reads from disk. Instead, it handles them implicitly, with the understanding that updates to block, candidate, and approval entries are persisted to disk.
+This guide section makes no explicit references to writes to or reads from disk. Instead, it handles them implicitly,
+with the understanding that updates to block, candidate, and approval entries are persisted to disk.
 
 [`SessionInfo`](../../runtime/session_info.md)
 
-On start-up, we clear everything currently stored by the database. This is done by loading the `StoredBlockRange`, iterating through each block number, iterating through each block hash, and iterating through each candidate referenced by each block. Although this is `O(o*n*p)`, we don't expect to have more than a few unfinalized blocks at any time and in extreme cases, a few thousand. The clearing operation should be relatively fast as a result.
+On start-up, we clear everything currently stored by the database. This is done by loading the `StoredBlockRange`,
+iterating through each block number, iterating through each block hash, and iterating through each candidate referenced
+by each block. Although this is `O(o*n*p)`, we don't expect to have more than a few unfinalized blocks at any time and
+in extreme cases, a few thousand. The clearing operation should be relatively fast as a result.
 
 Main loop:
   * Each iteration, select over all of
-    * The next `Tick` in `wakeups`: trigger `wakeup_process` for each `(Hash, Hash)` pair scheduled under the `Tick` and then remove all entries under the `Tick`.
-    * The next message from the overseer: handle the message as described in the [Incoming Messages section](#incoming-messages)
+    * The next `Tick` in `wakeups`: trigger `wakeup_process` for each `(Hash, Hash)` pair scheduled under the `Tick` and
+      then remove all entries under the `Tick`.
+    * The next message from the overseer: handle the message as described in the [Incoming Messages
+      section](#incoming-messages)
     * The next approval vote request from `background_rx`
       * If this is an `ApprovalVoteRequest`, [Issue an approval vote](#issue-approval-vote).
 
@@ -167,41 +199,84 @@ Main loop:
 
 #### `OverseerSignal::BlockFinalized`
 
-On receiving an `OverseerSignal::BlockFinalized(h)`, we fetch the block number `b` of that block from the `ChainApi` subsystem. We update our `StoredBlockRange` to begin at `b+1`. Additionally, we remove all block entries and candidates referenced by them up to and including `b`. Lastly, we prune out all descendants of `h` transitively: when we remove a `BlockEntry` with number `b` that is not equal to `h`, we recursively delete all the `BlockEntry`s referenced as children. We remove the `block_assignments` entry for the block hash and if `block_assignments` is now empty, remove the `CandidateEntry`. We also update each of the `BlockNumber -> Vec<Hash>` keys in the database to reflect the blocks at that height, clearing if empty.
+On receiving an `OverseerSignal::BlockFinalized(h)`, we fetch the block number `b` of that block from the `ChainApi`
+subsystem. We update our `StoredBlockRange` to begin at `b+1`. Additionally, we remove all block entries and candidates
+referenced by them up to and including `b`. Lastly, we prune out all descendants of `h` transitively: when we remove a
+`BlockEntry` with number `b` that is not equal to `h`, we recursively delete all the `BlockEntry`s referenced as
+children. We remove the `block_assignments` entry for the block hash and if `block_assignments` is now empty, remove the
+`CandidateEntry`. We also update each of the `BlockNumber -> Vec<Hash>` keys in the database to reflect the blocks at
+that height, clearing if empty.
 
 
 #### `OverseerSignal::ActiveLeavesUpdate`
 
 On receiving an `OverseerSignal::ActiveLeavesUpdate(update)`:
-  * We determine the set of new blocks that were not in our previous view. This is done by querying the ancestry of all new items in the view and contrasting against the stored `BlockNumber`s. Typically, there will be only one new block. We fetch the headers and information on these blocks from the `ChainApi` subsystem. Stale leaves in the update can be ignored.
+  * We determine the set of new blocks that were not in our previous view. This is done by querying the ancestry of all
+    new items in the view and contrasting against the stored `BlockNumber`s. Typically, there will be only one new
+    block. We fetch the headers and information on these blocks from the `ChainApi` subsystem. Stale leaves in the
+    update can be ignored.
   * We update the `StoredBlockRange` and the `BlockNumber` maps.
-  * We use the `RuntimeApiSubsystem` to determine information about these blocks. It is generally safe to assume that runtime state is available for recent, unfinalized blocks. In the case that it isn't, it means that we are catching up to the head of the chain and needn't worry about assignments to those blocks anyway, as the security assumption of the protocol tolerates nodes being temporarily offline or out-of-date.
-    * We fetch the set of candidates included by each block by dispatching a `RuntimeApiRequest::CandidateEvents` and checking the `CandidateIncluded` events.
-    * We fetch the session of the block by dispatching a `session_index_for_child` request with the parent-hash of the block.
-    * If the `session index - APPROVAL_SESSIONS > state.earliest_session`, then bump `state.earliest_sessions` to that amount and prune earlier sessions.
-    * If the session isn't in our `state.session_info`, load the session info for it and for all sessions since the earliest-session, including the earliest-session, if that is missing. And it can be, just after pruning, if we've done a big jump forward, as is the case when we've just finished chain synchronization.
+  * We use the `RuntimeApiSubsystem` to determine information about these blocks. It is generally safe to assume that
+    runtime state is available for recent, unfinalized blocks. In the case that it isn't, it means that we are catching
+    up to the head of the chain and needn't worry about assignments to those blocks anyway, as the security assumption
+    of the protocol tolerates nodes being temporarily offline or out-of-date.
+    * We fetch the set of candidates included by each block by dispatching a `RuntimeApiRequest::CandidateEvents` and
+      checking the `CandidateIncluded` events.
+    * We fetch the session of the block by dispatching a `session_index_for_child` request with the parent-hash of the
+      block.
+    * If the `session index - APPROVAL_SESSIONS > state.earliest_session`, then bump `state.earliest_sessions` to that
+      amount and prune earlier sessions.
+    * If the session isn't in our `state.session_info`, load the session info for it and for all sessions since the
+      earliest-session, including the earliest-session, if that is missing. And it can be, just after pruning, if we've
+      done a big jump forward, as is the case when we've just finished chain synchronization.
     * If any of the runtime API calls fail, we just warn and skip the block.
-  * We use the `RuntimeApiSubsystem` to determine the set of candidates included in these blocks and use BABE logic to determine the slot number and VRF of the blocks.
-  * We also note how late we appear to have received the block. We create a `BlockEntry` for each block and a `CandidateEntry` for each candidate obtained from `CandidateIncluded` events after making a `RuntimeApiRequest::CandidateEvents` request.
-  * For each candidate, if the amount of needed approvals is more than the validators remaining after the backing group of the candidate is subtracted, then the candidate is insta-approved as approval would be impossible otherwise. If all candidates in the block are insta-approved, or there are no candidates in the block, then the block is insta-approved. If the block is insta-approved, a [`ChainSelectionMessage::Approved`][CSM] should be sent for the block.
-  * Ensure that the `CandidateEntry` contains a `block_assignments` entry for the block, with the correct backing group set.
+  * We use the `RuntimeApiSubsystem` to determine the set of candidates included in these blocks and use BABE logic to
+    determine the slot number and VRF of the blocks.
+  * We also note how late we appear to have received the block. We create a `BlockEntry` for each block and a
+    `CandidateEntry` for each candidate obtained from `CandidateIncluded` events after making a
+    `RuntimeApiRequest::CandidateEvents` request.
+  * For each candidate, if the amount of needed approvals is more than the validators remaining after the backing group
+    of the candidate is subtracted, then the candidate is insta-approved as approval would be impossible otherwise. If
+    all candidates in the block are insta-approved, or there are no candidates in the block, then the block is
+    insta-approved. If the block is insta-approved, a [`ChainSelectionMessage::Approved`][CSM] should be sent for the
+    block.
+  * Ensure that the `CandidateEntry` contains a `block_assignments` entry for the block, with the correct backing group
+    set.
   * If a validator in this session, compute and assign `our_assignment` for the `block_assignments`
     * Only if not a member of the backing group.
-    * Run `RelayVRFModulo` and `RelayVRFDelay` according to the [the approvals protocol section](../../protocol-approval.md#assignment-criteria). Ensure that the assigned core derived from the output is covered by the auxiliary signature aggregated in the `VRFPRoof`.
-  * [Handle Wakeup](#handle-wakeup) for each new candidate in each new block - this will automatically broadcast a 0-tranche assignment, kick off approval work, and schedule the next delay.
+    * Run `RelayVRFModulo` and `RelayVRFDelay` according to the [the approvals protocol
+      section](../../protocol-approval.md#assignment-criteria). Ensure that the assigned core derived from the output is
+      covered by the auxiliary signature aggregated in the `VRFPRoof`.
+  * [Handle Wakeup](#handle-wakeup) for each new candidate in each new block - this will automatically broadcast a
+    0-tranche assignment, kick off approval work, and schedule the next delay.
   * Dispatch an `ApprovalDistributionMessage::NewBlocks` with the meta information filled out for each new block.
 
 #### `ApprovalVotingMessage::CheckAndImportAssignment`
 
-On receiving a `ApprovalVotingMessage::CheckAndImportAssignment` message, we check the assignment cert against the block entry. The cert itself contains information necessary to determine the candidate that is being assigned-to. In detail:
-  * Load the `BlockEntry` for the relay-parent referenced by the message. If there is none, return `AssignmentCheckResult::Bad`.
+On receiving a `ApprovalVotingMessage::CheckAndImportAssignment` message, we check the assignment cert against the block
+entry. The cert itself contains information necessary to determine the candidate that is being assigned-to. In detail:
+  * Load the `BlockEntry` for the relay-parent referenced by the message. If there is none, return
+    `AssignmentCheckResult::Bad`.
   * Fetch the `SessionInfo` for the session of the block
   * Determine the assignment key of the validator based on that.
-  * Determine the claimed core index by looking up the candidate with given index in `block_entry.candidates`. Return `AssignmentCheckResult::Bad` if missing.
+  * Determine the claimed core index by looking up the candidate with given index in `block_entry.candidates`. Return
+    `AssignmentCheckResult::Bad` if missing.
   * Check the assignment cert
-    * If the cert kind is `RelayVRFModulo`, then the certificate is valid as long as `sample < session_info.relay_vrf_samples` and the VRF is valid for the validator's key with the input `block_entry.relay_vrf_story ++ sample.encode()` as described with [the approvals protocol section](../../protocol-approval.md#assignment-criteria). We set `core_index = vrf.make_bytes().to_u32() % session_info.n_cores`. If the `BlockEntry` causes inclusion of a candidate at `core_index`, then this is a valid assignment for the candidate at `core_index` and has delay tranche 0. Otherwise, it can be ignored.
-    * If the cert kind is `RelayVRFDelay`, then we check if the VRF is valid for the validator's key with the input `block_entry.relay_vrf_story ++ cert.core_index.encode()` as described in [the approvals protocol section](../../protocol-approval.md#assignment-criteria). The cert can be ignored if the block did not cause inclusion of a candidate on that core index. Otherwise, this is a valid assignment for the included candidate. The delay tranche for the assignment is determined by reducing `(vrf.make_bytes().to_u64() % (session_info.n_delay_tranches + session_info.zeroth_delay_tranche_width)).saturating_sub(session_info.zeroth_delay_tranche_width)`.
-    * We also check that the core index derived by the output is covered by the `VRFProof` by means of an auxiliary signature.
+    * If the cert kind is `RelayVRFModulo`, then the certificate is valid as long as `sample <
+      session_info.relay_vrf_samples` and the VRF is valid for the validator's key with the input
+      `block_entry.relay_vrf_story ++ sample.encode()` as described with [the approvals protocol
+      section](../../protocol-approval.md#assignment-criteria). We set `core_index = vrf.make_bytes().to_u32() %
+      session_info.n_cores`. If the `BlockEntry` causes inclusion of a candidate at `core_index`, then this is a valid
+      assignment for the candidate at `core_index` and has delay tranche 0. Otherwise, it can be ignored.
+    * If the cert kind is `RelayVRFDelay`, then we check if the VRF is valid for the validator's key with the input
+      `block_entry.relay_vrf_story ++ cert.core_index.encode()` as described in [the approvals protocol
+      section](../../protocol-approval.md#assignment-criteria). The cert can be ignored if the block did not cause
+      inclusion of a candidate on that core index. Otherwise, this is a valid assignment for the included candidate. The
+      delay tranche for the assignment is determined by reducing `(vrf.make_bytes().to_u64() %
+      (session_info.n_delay_tranches +
+      session_info.zeroth_delay_tranche_width)).saturating_sub(session_info.zeroth_delay_tranche_width)`.
+    * We also check that the core index derived by the output is covered by the `VRFProof` by means of an auxiliary
+      signature.
     * If the delay tranche is too far in the future, return `AssignmentCheckResult::TooFarInFuture`.
   * Import the assignment.
     * Load the candidate in question and access the `approval_entry` for the block hash the cert references.
@@ -217,32 +292,41 @@ On receiving a `ApprovalVotingMessage::CheckAndImportAssignment` message, we che
 
 On receiving a `CheckAndImportApproval(indirect_approval_vote, response_channel)` message:
   * Fetch the `BlockEntry` from the indirect approval vote's `block_hash`. If none, return `ApprovalCheckResult::Bad`.
-  * Fetch the `CandidateEntry` from the indirect approval vote's `candidate_index`. If the block did not trigger inclusion of enough candidates, return `ApprovalCheckResult::Bad`.
-  * Construct a `SignedApprovalVote` using the candidate hash and check against the validator's approval key, based on the session info of the block. If invalid or no such validator, return `ApprovalCheckResult::Bad`.
+  * Fetch the `CandidateEntry` from the indirect approval vote's `candidate_index`. If the block did not trigger
+    inclusion of enough candidates, return `ApprovalCheckResult::Bad`.
+  * Construct a `SignedApprovalVote` using the candidate hash and check against the validator's approval key, based on
+    the session info of the block. If invalid or no such validator, return `ApprovalCheckResult::Bad`.
   * Send `ApprovalCheckResult::Accepted`
   * [Import the checked approval vote](#import-checked-approval)
 
 #### `ApprovalVotingMessage::ApprovedAncestor`
 
 On receiving an `ApprovedAncestor(Hash, BlockNumber, response_channel)`:
-  * Iterate over the ancestry of the hash all the way back to block number given, starting from the provided block hash. Load the `CandidateHash`es from each block entry.
+  * Iterate over the ancestry of the hash all the way back to block number given, starting from the provided block hash.
+    Load the `CandidateHash`es from each block entry.
   * Keep track of an `all_approved_max: Option<(Hash, BlockNumber, Vec<(Hash, Vec<CandidateHash>))>`.
-  * For each block hash encountered, load the `BlockEntry` associated. If any are not found, return `None` on the response channel and conclude.
-  * If the block entry's `approval_bitfield` has all bits set to 1 and `all_approved_max == None`, set `all_approved_max = Some((current_hash, current_number))`.
+  * For each block hash encountered, load the `BlockEntry` associated. If any are not found, return `None` on the
+    response channel and conclude.
+  * If the block entry's `approval_bitfield` has all bits set to 1 and `all_approved_max == None`, set `all_approved_max
+    = Some((current_hash, current_number))`.
   * If the block entry's `approval_bitfield` has any 0 bits, set `all_approved_max = None`.
-  * If `all_approved_max` is `Some`, push the current block hash and candidate hashes onto the list of blocks and candidates `all_approved_max`.
+  * If `all_approved_max` is `Some`, push the current block hash and candidate hashes onto the list of blocks and
+    candidates `all_approved_max`.
   * After iterating all ancestry, return `all_approved_max`.
 
 ### Updates and Auxiliary Logic
 
 #### Import Checked Approval
-  * Import an approval vote which we can assume to have passed signature checks and correspond to an imported assignment.
+  * Import an approval vote which we can assume to have passed signature checks and correspond to an imported
+    assignment.
   * Requires `(BlockEntry, CandidateEntry, ValidatorIndex)`
   * Set the corresponding bit of the `approvals` bitfield in the `CandidateEntry` to `1`. If already `1`, return.
-  * Checks the approval state of a candidate under a specific block, and updates the block and candidate entries accordingly.
+  * Checks the approval state of a candidate under a specific block, and updates the block and candidate entries
+    accordingly.
   * Checks the `ApprovalEntry` for the block.
     * [determine the tranches to inspect](#determine-required-tranches) of the candidate,
-    * [the candidate is approved under the block](#check-approval), set the corresponding bit in the `block_entry.approved_bitfield`.
+    * [the candidate is approved under the block](#check-approval), set the corresponding bit in the
+      `block_entry.approved_bitfield`.
     * If the block is now fully approved and was not before, send a [`ChainSelectionMessage::Approved`][CSM].
     * Otherwise, [schedule a wakeup of the candidate](#schedule-wakeup)
   * If the approval vote originates locally, set the `our_approval_sig` in the candidate entry.
@@ -250,13 +334,19 @@ On receiving an `ApprovedAncestor(Hash, BlockNumber, response_channel)`:
 #### Handling Wakeup
   * Handle a previously-scheduled wakeup of a candidate under a specific block.
   * Requires `(relay_block, candidate_hash)`
-  * Load the `BlockEntry` and `CandidateEntry` from disk. If either is not present, this may have lost a race with finality and can be ignored. Also load the `ApprovalEntry` for the block and candidate.
+  * Load the `BlockEntry` and `CandidateEntry` from disk. If either is not present, this may have lost a race with
+    finality and can be ignored. Also load the `ApprovalEntry` for the block and candidate.
   * [determine the `RequiredTranches` of the candidate](#determine-required-tranches).
   * Determine if we should trigger our assignment.
     * If we've already triggered or `OurAssignment` is `None`, we do not trigger.
-    * If we have  `RequiredTranches::All`, then we trigger if the candidate is [not approved](#check-approval). We have no next wakeup as we assume that other validators are doing the same and we will be implicitly woken up by handling new votes.
-    * If we have `RequiredTranches::Pending { considered, next_no_show, uncovered, maximum_broadcast, clock_drift }`, then we trigger if our assignment's tranche is less than or equal to `maximum_broadcast` and the current tick, with `clock_drift` applied, is at least the tick of our tranche.
-    * If we have `RequiredTranches::Exact { .. }` then we do not trigger, because this value indicates that no new assignments are needed at the moment.
+    * If we have  `RequiredTranches::All`, then we trigger if the candidate is [not approved](#check-approval). We have
+      no next wakeup as we assume that other validators are doing the same and we will be implicitly woken up by
+      handling new votes.
+    * If we have `RequiredTranches::Pending { considered, next_no_show, uncovered, maximum_broadcast, clock_drift }`,
+      then we trigger if our assignment's tranche is less than or equal to `maximum_broadcast` and the current tick,
+      with `clock_drift` applied, is at least the tick of our tranche.
+    * If we have `RequiredTranches::Exact { .. }` then we do not trigger, because this value indicates that no new
+      assignments are needed at the moment.
   * If we should trigger our assignment
     * Import the assignment to the `ApprovalEntry`
     * Broadcast on network with an `ApprovalDistributionMessage::DistributeAssignment`.
@@ -265,26 +355,39 @@ On receiving an `ApprovedAncestor(Hash, BlockNumber, response_channel)`:
 
 #### Schedule Wakeup
 
-  * Requires `(approval_entry, candidate_entry)` which effectively denotes a `(Block Hash, Candidate Hash)` pair - the candidate, along with the block it appears in.
+  * Requires `(approval_entry, candidate_entry)` which effectively denotes a `(Block Hash, Candidate Hash)` pair - the
+    candidate, along with the block it appears in.
   * Also requires `RequiredTranches`
   * If the `approval_entry` is approved, this doesn't need to be woken up again.
-  * If `RequiredTranches::All` - no wakeup. We assume other incoming votes will trigger wakeup and potentially re-schedule.
-  * If `RequiredTranches::Pending { considered, next_no_show, uncovered, maximum_broadcast, clock_drift }` - schedule at the lesser of the next no-show tick, or the tick, offset positively by `clock_drift` of the next non-empty tranche we are aware of after `considered`, including any tranche containing our own unbroadcast assignment. This can lead to no wakeup in the case that we have already broadcast our assignment and there are no pending no-shows; that is, we have approval votes for every assignment we've received that is not already a no-show. In this case, we will be re-triggered by other validators broadcasting their assignments.
-  * If `RequiredTranches::Exact { next_no_show, latest_assignment_tick, .. }` - set a wakeup for the earlier of the next no-show tick or the latest assignment tick + `APPROVAL_DELAY`.
+  * If `RequiredTranches::All` - no wakeup. We assume other incoming votes will trigger wakeup and potentially
+    re-schedule.
+  * If `RequiredTranches::Pending { considered, next_no_show, uncovered, maximum_broadcast, clock_drift }` - schedule at
+    the lesser of the next no-show tick, or the tick, offset positively by `clock_drift` of the next non-empty tranche
+    we are aware of after `considered`, including any tranche containing our own unbroadcast assignment. This can lead
+    to no wakeup in the case that we have already broadcast our assignment and there are no pending no-shows; that is,
+    we have approval votes for every assignment we've received that is not already a no-show. In this case, we will be
+    re-triggered by other validators broadcasting their assignments.
+  * If `RequiredTranches::Exact { next_no_show, latest_assignment_tick, .. }` - set a wakeup for the earlier of the next
+    no-show tick or the latest assignment tick + `APPROVAL_DELAY`.
 
 #### Launch Approval Work
 
 * Requires `(SessionIndex, SessionInfo, CandidateReceipt, ValidatorIndex, backing_group, block_hash, candidate_index)`
 * Extract the public key of the `ValidatorIndex` from the `SessionInfo` for the session.
-* Issue an `AvailabilityRecoveryMessage::RecoverAvailableData(candidate, session_index, Some(backing_group), response_sender)`
-* Load the historical validation code of the parachain by dispatching a `RuntimeApiRequest::ValidationCodeByHash(descriptor.validation_code_hash)` against the state of `block_hash`.
+* Issue an `AvailabilityRecoveryMessage::RecoverAvailableData(candidate, session_index, Some(backing_group),
+  response_sender)`
+* Load the historical validation code of the parachain by dispatching a
+  `RuntimeApiRequest::ValidationCodeByHash(descriptor.validation_code_hash)` against the state of `block_hash`.
 * Spawn a background task with a clone of `background_tx`
   * Wait for the available data
-  * Issue a `CandidateValidationMessage::ValidateFromExhaustive` message with `APPROVAL_EXECUTION_TIMEOUT` as the timeout parameter.
+  * Issue a `CandidateValidationMessage::ValidateFromExhaustive` message with `APPROVAL_EXECUTION_TIMEOUT` as the
+    timeout parameter.
   * Wait for the result of validation
   * Check that the result of validation, if valid, matches the commitments in the receipt.
   * If valid, issue a message on `background_tx` detailing the request.
-  * If any of the data, the candidate, or the commitments are invalid, issue on `background_tx` a [`DisputeCoordinatorMessage::IssueLocalStatement`](../../types/overseer-protocol.md#dispute-coordinator-message) with `valid = false` to initiate a dispute.
+  * If any of the data, the candidate, or the commitments are invalid, issue on `background_tx` a
+    [`DisputeCoordinatorMessage::IssueLocalStatement`](../../types/overseer-protocol.md#dispute-coordinator-message)
+    with `valid = false` to initiate a dispute.
 
 #### Issue Approval Vote
   * Fetch the block entry and candidate entry. Ignore if `None` - we've probably just lost a race with finality.
@@ -297,14 +400,22 @@ On receiving an `ApprovedAncestor(Hash, BlockNumber, response_channel)`:
 
 #### Determine Required Tranches
 
-This logic is for inspecting an approval entry that tracks the assignments received, along with information on which assignments have corresponding approval votes. Inspection also involves the current time and expected requirements and is used to help the higher-level code determine the following:
+This logic is for inspecting an approval entry that tracks the assignments received, along with information on which
+assignments have corresponding approval votes. Inspection also involves the current time and expected requirements and
+is used to help the higher-level code determine the following:
   * Whether to broadcast the local assignment
   * Whether to check that the candidate entry has been completely approved.
-  * If the candidate is waiting on approval, when to schedule the next wakeup of the `(candidate, block)` pair at a point where the state machine could be advanced.
+  * If the candidate is waiting on approval, when to schedule the next wakeup of the `(candidate, block)` pair at a
+    point where the state machine could be advanced.
 
-These routines are pure functions which only depend on the environmental state. The expectation is that this determination is re-run every time we attempt to update an approval entry: either when we trigger a wakeup to advance the state machine based on a no-show or our own broadcast, or when we receive further assignments or approvals from the network.
+These routines are pure functions which only depend on the environmental state. The expectation is that this
+determination is re-run every time we attempt to update an approval entry: either when we trigger a wakeup to advance
+the state machine based on a no-show or our own broadcast, or when we receive further assignments or approvals from the
+network.
 
-Thus it may be that at some point in time, we consider that tranches 0..X is required to be considered, but as we receive more information, we might require fewer tranches. Or votes that we perceived to be missing and require replacement are filled in and change our view.
+Thus it may be that at some point in time, we consider that tranches 0..X is required to be considered, but as we
+receive more information, we might require fewer tranches. Or votes that we perceived to be missing and require
+replacement are filled in and change our view.
 
 Requires `(approval_entry, approvals_received, tranche_now, block_tick, no_show_duration, needed_approvals)`
 
@@ -327,7 +438,8 @@ enum RequiredTranches {
     /// as though it is `clock_drift` ticks earlier.
     clock_drift: Tick,
   },
-  // An exact number of required tranches and a number of no-shows. This indicates that the amount of `needed_approvals` are assigned and additionally all no-shows are covered.
+  // An exact number of required tranches and a number of no-shows. This indicates that the amount of `needed_approvals`
+  // are assigned and additionally all no-shows are covered.
   Exact {
     /// The tranche to inspect up to.
     needed: DelayTranche,
@@ -345,13 +457,21 @@ enum RequiredTranches {
 
 **Clock-drift and Tranche-taking**
 
-Our vote-counting procedure depends heavily on how we interpret time based on the presence of no-shows - assignments which have no corresponding approval after some time.
+Our vote-counting procedure depends heavily on how we interpret time based on the presence of no-shows - assignments
+which have no corresponding approval after some time.
 
 We have this is because of how we handle no-shows: we keep track of the depth of no-shows we are covering.
 
-As an example: there may be initial no-shows in tranche 0. It'll take `no_show_duration` ticks before those are considered no-shows. Then, we don't want to immediately take `no_show_duration` more tranches. Instead, we want to take one tranche for each uncovered no-show. However, as we take those tranches, there may be further no-shows. Since these depth-1 no-shows should have only been triggered after the depth-0 no-shows were already known to be no-shows, we need to discount the local clock by `no_show_duration` to  see whether these should be considered no-shows or not. There may be malicious parties who broadcast their assignment earlier than they were meant to, who shouldn't be counted as instant no-shows. We continue onwards to cover all depth-1 no-shows which may lead to depth-2 no-shows and so on.
+As an example: there may be initial no-shows in tranche 0. It'll take `no_show_duration` ticks before those are
+considered no-shows. Then, we don't want to immediately take `no_show_duration` more tranches. Instead, we want to take
+one tranche for each uncovered no-show. However, as we take those tranches, there may be further no-shows. Since these
+depth-1 no-shows should have only been triggered after the depth-0 no-shows were already known to be no-shows, we need
+to discount the local clock by `no_show_duration` to  see whether these should be considered no-shows or not. There may
+be malicious parties who broadcast their assignment earlier than they were meant to, who shouldn't be counted as instant
+no-shows. We continue onwards to cover all depth-1 no-shows which may lead to depth-2 no-shows and so on.
 
-Likewise, when considering how many tranches to take, the no-show depth should be used to apply a depth-discount or clock drift to the `tranche_now`.
+Likewise, when considering how many tranches to take, the no-show depth should be used to apply a depth-discount or
+clock drift to the `tranche_now`.
 
 **Procedure**
 
@@ -360,21 +480,35 @@ Likewise, when considering how many tranches to take, the no-show depth should b
   * Take tranches up to `tranche_now - clock_drift` until all needed assignments are met.
   * Keep track of the `next_no_show` according to the clock drift, as we go.
   * Keep track of the `last_assignment_tick` as we go.
-  * If running out of tranches before then, return `Pending { considered, next_no_show, maximum_broadcast, clock_drift }`
+  * If running out of tranches before then, return `Pending { considered, next_no_show, maximum_broadcast, clock_drift
+    }`
   * If there are no no-shows, return `Exact { needed, tolerated_missing, next_no_show, last_assignment_tick }`
-  * `maximum_broadcast` is either `DelayTranche::max_value()` at tranche 0 or otherwise by the last considered tranche + the number of uncovered no-shows at this point.
-  * If there are no-shows, return to the beginning, incrementing `depth` and attempting to cover the number of no-shows. Each no-show must be covered by a non-empty tranche, which are tranches that have at least one assignment. Each non-empty tranche covers exactly one no-show.
-  * If at any point, it seems that all validators are required, do an early return with `RequiredTranches::All` which indicates that everyone should broadcast.
+  * `maximum_broadcast` is either `DelayTranche::max_value()` at tranche 0 or otherwise by the last considered tranche +
+    the number of uncovered no-shows at this point.
+  * If there are no-shows, return to the beginning, incrementing `depth` and attempting to cover the number of no-shows.
+    Each no-show must be covered by a non-empty tranche, which are tranches that have at least one assignment. Each
+    non-empty tranche covers exactly one no-show.
+  * If at any point, it seems that all validators are required, do an early return with `RequiredTranches::All` which
+    indicates that everyone should broadcast.
 
 #### Check Approval
   * Check whether a candidate is approved under a particular block.
   * Requires `(block_entry, candidate_entry, approval_entry, n_tranches)`
-  * If we have `3 * n_approvals > n_validators`, return true. This is because any set with f+1 validators must have at least one honest validator, who has approved the candidate.
+  * If we have `3 * n_approvals > n_validators`, return true. This is because any set with f+1 validators must have at
+    least one honest validator, who has approved the candidate.
   * If `n_tranches` is `RequiredTranches::Pending`, return false
   * If `n_tranches` is `RequiredTranches::All`, return false.
-  * If `n_tranches` is `RequiredTranches::Exact { tranche, tolerated_missing, latest_assignment_tick, .. }`, then we return whether all assigned validators up to `tranche` less `tolerated_missing` have approved and `latest_assignment_tick + APPROVAL_DELAY >= tick_now`.
-    * e.g. if we had 5 tranches and 1 tolerated missing, we would accept only if all but 1 of assigned validators in tranches 0..=5 have approved. In that example, we also accept all validators in tranches 0..=5 having approved, but that would indicate that the `RequiredTranches` value was incorrectly constructed, so it is not realistic. `tolerated_missing` actually represents covered no-shows. If there are more missing approvals than there are tolerated missing, that indicates that there are some assignments which are not yet no-shows, but may become no-shows, and we should wait for the validators to either approve or become no-shows.
-    * e.g. If the above passes and the `latest_assignment_tick` was 5 and the current tick was 6, then we'd return false.
+  * If `n_tranches` is `RequiredTranches::Exact { tranche, tolerated_missing, latest_assignment_tick, .. }`, then we
+    return whether all assigned validators up to `tranche` less `tolerated_missing` have approved and
+    `latest_assignment_tick + APPROVAL_DELAY >= tick_now`.
+    * e.g. if we had 5 tranches and 1 tolerated missing, we would accept only if all but 1 of assigned validators in
+      tranches 0..=5 have approved. In that example, we also accept all validators in tranches 0..=5 having approved,
+      but that would indicate that the `RequiredTranches` value was incorrectly constructed, so it is not realistic.
+      `tolerated_missing` actually represents covered no-shows. If there are more missing approvals than there are
+      tolerated missing, that indicates that there are some assignments which are not yet no-shows, but may become
+      no-shows, and we should wait for the validators to either approve or become no-shows.
+    * e.g. If the above passes and the `latest_assignment_tick` was 5 and the current tick was 6, then we'd return
+      false.
 
 ### Time
 
diff --git a/polkadot/roadmap/implementers-guide/src/node/availability/README.md b/polkadot/roadmap/implementers-guide/src/node/availability/README.md
index 76bd6467e178917b396173be1d59aca32e5b3930..2fcfd58de9e886a21eebe033cda09e22c9f26cd6 100644
--- a/polkadot/roadmap/implementers-guide/src/node/availability/README.md
+++ b/polkadot/roadmap/implementers-guide/src/node/availability/README.md
@@ -1,3 +1,7 @@
 # Availability Subsystems
 
-The availability subsystems are responsible for ensuring that Proofs of Validity of backed candidates are widely available within the validator set, without requiring every node to retain a full copy. They accomplish this by broadly distributing erasure-coded chunks of the PoV, keeping track of which validator has which chunk by means of signed bitfields. They are also responsible for reassembling a complete PoV when required, e.g. when an approval checker needs to validate a parachain block.
+The availability subsystems are responsible for ensuring that Proofs of Validity of backed candidates are widely
+available within the validator set, without requiring every node to retain a full copy. They accomplish this by broadly
+distributing erasure-coded chunks of the PoV, keeping track of which validator has which chunk by means of signed
+bitfields. They are also responsible for reassembling a complete PoV when required, e.g. when an approval checker needs
+to validate a parachain block.
diff --git a/polkadot/roadmap/implementers-guide/src/node/availability/availability-distribution.md b/polkadot/roadmap/implementers-guide/src/node/availability/availability-distribution.md
index 1760a2ee7df4ef44d33ce514f02c34a1620083f2..931d82d529b9b690c57a47acb0dc1cf01914f207 100644
--- a/polkadot/roadmap/implementers-guide/src/node/availability/availability-distribution.md
+++ b/polkadot/roadmap/implementers-guide/src/node/availability/availability-distribution.md
@@ -1,31 +1,26 @@
 # Availability Distribution
 
-This subsystem is responsible for distribution availability data to peers.
-Availability data are chunks, `PoV`s and `AvailableData` (which is `PoV` +
-`PersistedValidationData`). It does so via request response protocols.
+This subsystem is responsible for distribution availability data to peers. Availability data are chunks, `PoV`s and
+`AvailableData` (which is `PoV` + `PersistedValidationData`). It does so via request response protocols.
 
 In particular this subsystem is responsible for:
 
-- Respond to network requests requesting availability data by querying the
-  [Availability Store](../utility/availability-store.md).
-- Request chunks from backing validators to put them in the local `Availability
-  Store` whenever we find an occupied core on any fresh leaf,
-  this is to ensure availability by at least 2/3+ of all validators, this
-  happens after a candidate is backed.
-- Fetch `PoV` from validators, when requested via `FetchPoV` message from
-  backing (`pov_requester` module).
+- Respond to network requests requesting availability data by querying the [Availability
+  Store](../utility/availability-store.md).
+- Request chunks from backing validators to put them in the local `Availability Store` whenever we find an occupied core
+  on any fresh leaf, this is to ensure availability by at least 2/3+ of all validators, this happens after a candidate
+  is backed.
+- Fetch `PoV` from validators, when requested via `FetchPoV` message from backing (`pov_requester` module).
 
-The backing subsystem is responsible of making available data available in the
-local `Availability Store` upon validation. This subsystem will serve any
-network requests by querying that store.
+The backing subsystem is responsible of making available data available in the local `Availability Store` upon
+validation. This subsystem will serve any network requests by querying that store.
 
 ## Protocol
 
-This subsystem does not handle any peer set messages, but the `pov_requester`
-does connect to validators of the same backing group on the validation peer
-set, to ensure fast propagation of statements between those validators and for
-ensuring already established connections for requesting `PoV`s. Other than that
-this subsystem drives request/response protocols.
+This subsystem does not handle any peer set messages, but the `pov_requester` does connect to validators of the same
+backing group on the validation peer set, to ensure fast propagation of statements between those validators and for
+ensuring already established connections for requesting `PoV`s. Other than that this subsystem drives request/response
+protocols.
 
 Input:
 
@@ -48,51 +43,42 @@ Output:
 
 ### PoV Requester
 
-The PoV requester in the `pov_requester` module takes care of staying connected
-to validators of the current backing group of this very validator on the `Validation`
-peer set and it will handle `FetchPoV` requests by issuing network requests to
-those validators. It will check the hash of the received `PoV`, but will not do any
-further validation. That needs to be done by the original `FetchPoV` sender
-(backing subsystem).
+The PoV requester in the `pov_requester` module takes care of staying connected to validators of the current backing
+group of this very validator on the `Validation` peer set and it will handle `FetchPoV` requests by issuing network
+requests to those validators. It will check the hash of the received `PoV`, but will not do any further validation. That
+needs to be done by the original `FetchPoV` sender (backing subsystem).
 
 ### Chunk Requester
 
-After a candidate is backed, the availability of the PoV block must be confirmed
-by 2/3+ of all validators. The chunk requester is responsible of making that
-availability a reality.
+After a candidate is backed, the availability of the PoV block must be confirmed by 2/3+ of all validators. The chunk
+requester is responsible of making that availability a reality.
 
-It does that by querying checking occupied cores for all active leaves. For each
-occupied core it will spawn a task fetching the erasure chunk which has the
-`ValidatorIndex` of the node. For this an `ChunkFetchingRequest` is issued, via
-substrate's generic request/response protocol.
+It does that by querying checking occupied cores for all active leaves. For each occupied core it will spawn a task
+fetching the erasure chunk which has the `ValidatorIndex` of the node. For this an `ChunkFetchingRequest` is issued, via
+Substrate's generic request/response protocol.
 
-The spawned task will start trying to fetch the chunk from validators in
-responsible group of the occupied core, in a random order. For ensuring that we
-use already open TCP connections wherever possible, the requester maintains a
-cache and preserves that random order for the entire session.
+The spawned task will start trying to fetch the chunk from validators in responsible group of the occupied core, in a
+random order. For ensuring that we use already open TCP connections wherever possible, the requester maintains a cache
+and preserves that random order for the entire session.
 
-Note however that, because not all validators in a group have to be actual
-backers, not all of them are required to have the needed chunk. This in turn
-could lead to low throughput, as we have to wait for fetches to fail,
-before reaching a validator finally having our chunk. We do rank back validators
-not delivering our chunk, but as backers could vary from block to block on a
-perfectly legitimate basis, this is still not ideal. See issues [2509](https://github.com/paritytech/polkadot/issues/2509) and [2512](https://github.com/paritytech/polkadot/issues/2512)
-for more information.
+Note however that, because not all validators in a group have to be actual backers, not all of them are required to have
+the needed chunk. This in turn could lead to low throughput, as we have to wait for fetches to fail, before reaching a
+validator finally having our chunk. We do rank back validators not delivering our chunk, but as backers could vary from
+block to block on a perfectly legitimate basis, this is still not ideal. See issues
+[2509](https://github.com/paritytech/polkadot/issues/2509) and
+[2512](https://github.com/paritytech/polkadot/issues/2512) for more information.
 
-The current implementation also only fetches chunks for occupied cores in blocks
-in active leaves. This means though, if active leaves skips a block or we are
-particularly slow in fetching our chunk, we might not fetch our chunk if
-availability reached 2/3 fast enough (slot becomes free). This is not desirable
-as we would like as many validators as possible to have their chunk. See this
-[issue](https://github.com/paritytech/polkadot/issues/2513) for more details.
+The current implementation also only fetches chunks for occupied cores in blocks in active leaves. This means though, if
+active leaves skips a block or we are particularly slow in fetching our chunk, we might not fetch our chunk if
+availability reached 2/3 fast enough (slot becomes free). This is not desirable as we would like as many validators as
+possible to have their chunk. See this [issue](https://github.com/paritytech/polkadot/issues/2513) for more details.
 
 
 ### Serving
 
-On the other side the subsystem will listen for incoming `ChunkFetchingRequest`s
-and `PoVFetchingRequest`s from the network bridge and will respond to queries,
-by looking the requested chunks and `PoV`s up in the availability store, this
-happens in the `responder` module.
+On the other side the subsystem will listen for incoming `ChunkFetchingRequest`s and `PoVFetchingRequest`s from the
+network bridge and will respond to queries, by looking the requested chunks and `PoV`s up in the availability store,
+this happens in the `responder` module.
 
-We rely on the backing subsystem to make available data available locally in the
-`Availability Store` after it has validated it.
+We rely on the backing subsystem to make available data available locally in the `Availability Store` after it has
+validated it.
diff --git a/polkadot/roadmap/implementers-guide/src/node/availability/availability-recovery.md b/polkadot/roadmap/implementers-guide/src/node/availability/availability-recovery.md
index 48fb0fb1ca19da77a04fdec4dd8993bacceafef2..e3bb14db3a55499dfc1546494c8e83d5e6cb6ed7 100644
--- a/polkadot/roadmap/implementers-guide/src/node/availability/availability-recovery.md
+++ b/polkadot/roadmap/implementers-guide/src/node/availability/availability-recovery.md
@@ -1,8 +1,13 @@
 # Availability Recovery
 
-This subsystem is the inverse of the [Availability Distribution](availability-distribution.md) subsystem: validators will serve the availability chunks kept in the availability store to nodes who connect to them. And the subsystem will also implement the other side: the logic for nodes to connect to validators, request availability pieces, and reconstruct the `AvailableData`.
+This subsystem is the inverse of the [Availability Distribution](availability-distribution.md) subsystem: validators
+will serve the availability chunks kept in the availability store to nodes who connect to them. And the subsystem will
+also implement the other side: the logic for nodes to connect to validators, request availability pieces, and
+reconstruct the `AvailableData`.
 
-This version of the availability recovery subsystem is based off of direct connections to validators. In order to recover any given `AvailableData`, we must recover at least `f + 1` pieces from validators of the session. Thus, we will connect to and query randomly chosen validators until we have received `f + 1` pieces.
+This version of the availability recovery subsystem is based off of direct connections to validators. In order to
+recover any given `AvailableData`, we must recover at least `f + 1` pieces from validators of the session. Thus, we will
+connect to and query randomly chosen validators until we have received `f + 1` pieces.
 
 ## Protocol
 
@@ -10,18 +15,20 @@ This version of the availability recovery subsystem is based off of direct conne
 
 Input:
 
-- `NetworkBridgeUpdate(update)`
-- `AvailabilityRecoveryMessage::RecoverAvailableData(candidate, session, backing_group, response)`
+* `NetworkBridgeUpdate(update)`
+* `AvailabilityRecoveryMessage::RecoverAvailableData(candidate, session, backing_group, response)`
 
 Output:
 
-- `NetworkBridge::SendValidationMessage`
-- `NetworkBridge::ReportPeer`
-- `AvailabilityStore::QueryChunk`
+* `NetworkBridge::SendValidationMessage`
+* `NetworkBridge::ReportPeer`
+* `AvailabilityStore::QueryChunk`
 
 ## Functionality
 
-We hold a state which tracks the currently ongoing recovery tasks, as well as which request IDs correspond to which task. A recovery task is a structure encapsulating all recovery tasks with the network necessary to recover the available data in respect to one candidate.
+We hold a state which tracks the currently ongoing recovery tasks, as well as which request IDs correspond to which
+task. A recovery task is a structure encapsulating all recovery tasks with the network necessary to recover the
+available data in respect to one candidate.
 
 ```rust
 struct State {
@@ -30,7 +37,7 @@ struct State {
     /// A recent block hash for which state should be available.
     live_block_hash: Hash,
     // An LRU cache of recently recovered data.
-    availability_lru: LruCache<CandidateHash, Result<AvailableData, RecoveryError>>,
+    availability_lru: LruMap<CandidateHash, Result<AvailableData, RecoveryError>>,
 }
 
 /// This is a future, which concludes either when a response is received from the recovery tasks,
@@ -87,17 +94,22 @@ On `Conclude`, shut down the subsystem.
 
 1. Check the `availability_lru` for the candidate and return the data if so.
 1. Check if there is already an recovery handle for the request. If so, add the response handle to it.
-1. Otherwise, load the session info for the given session under the state of `live_block_hash`, and initiate a recovery task with *`launch_recovery_task`*. Add a recovery handle to the state and add the response channel to it.
+1. Otherwise, load the session info for the given session under the state of `live_block_hash`, and initiate a recovery
+   task with *`launch_recovery_task`*. Add a recovery handle to the state and add the response channel to it.
 1. If the session info is not available, return `RecoveryError::Unavailable` on the response channel.
 
 ### Recovery logic
 
 #### `launch_recovery_task(session_index, session_info, candidate_receipt, candidate_hash, Option<backing_group_index>)`
 
-1. Compute the threshold from the session info. It should be `f + 1`, where `n = 3f + k`, where `k in {1, 2, 3}`, and `n` is the number of validators.
-1. Set the various fields of `RecoveryParams` based on the validator lists in `session_info` and information about the candidate.
-1. If the `backing_group_index` is `Some`, start in the `RequestFromBackers` phase with a shuffling of the backing group validator indices and a `None` requesting value.
-1. Otherwise, start in the `RequestChunksFromValidators` source with `received_chunks`,`requesting_chunks`, and `next_shuffling` all empty.
+1. Compute the threshold from the session info. It should be `f + 1`, where `n = 3f + k`, where `k in {1, 2, 3}`, and
+   `n` is the number of validators.
+1. Set the various fields of `RecoveryParams` based on the validator lists in `session_info` and information about the
+   candidate.
+1. If the `backing_group_index` is `Some`, start in the `RequestFromBackers` phase with a shuffling of the backing group
+   validator indices and a `None` requesting value.
+1. Otherwise, start in the `RequestChunksFromValidators` source with `received_chunks`,`requesting_chunks`, and
+   `next_shuffling` all empty.
 1. Set the `to_subsystems` sender to be equal to a clone of the `SubsystemContext`'s sender.
 1. Initialize `received_chunks` to an empty set, as well as `requesting_chunks`.
 
@@ -115,19 +127,24 @@ const N_PARALLEL: usize = 50;
   * Loop:
     * If the `requesting_pov` is `Some`, poll for updates on it. If it concludes, set `requesting_pov` to `None`.
     * If the `requesting_pov` is `None`, take the next backer off the `shuffled_backers`.
-        * If the backer is `Some`, issue a `NetworkBridgeMessage::Requests` with a network request for the `AvailableData` and wait for the response.
+        * If the backer is `Some`, issue a `NetworkBridgeMessage::Requests` with a network request for the
+          `AvailableData` and wait for the response.
         * If it concludes with a `None` result, return to beginning.
         * If it concludes with available data, attempt a re-encoding.
             * If it has the correct erasure-root, break and issue a `Ok(available_data)`.
             * If it has an incorrect erasure-root, return to beginning.
         * Send the result to each member of `awaiting`.
-        * If the backer is `None`, set the source to `RequestChunksFromValidators` with a random shuffling of validators and empty `received_chunks`, and `requesting_chunks` and break the loop.
+        * If the backer is `None`, set the source to `RequestChunksFromValidators` with a random shuffling of validators
+          and empty `received_chunks`, and `requesting_chunks` and break the loop.
 
 * If the task contains `RequestChunksFromValidators`:
-  * Request `AvailabilityStoreMessage::QueryAllChunks`. For each chunk that exists, add it to `received_chunks` and remote the validator from `shuffling`.
+  * Request `AvailabilityStoreMessage::QueryAllChunks`. For each chunk that exists, add it to `received_chunks` and
+    remote the validator from `shuffling`.
   * Loop:
-    * If `received_chunks + requesting_chunks + shuffling` lengths are less than the threshold, break and return `Err(Unavailable)`.
-    * Poll for new updates from `requesting_chunks`. Check merkle proofs of any received chunks. If the request simply fails due to network issues, insert into the front of `shuffling` to be retried.
+    * If `received_chunks + requesting_chunks + shuffling` lengths are less than the threshold, break and return
+      `Err(Unavailable)`.
+    * Poll for new updates from `requesting_chunks`. Check merkle proofs of any received chunks. If the request simply
+      fails due to network issues, insert into the front of `shuffling` to be retried.
     * If `received_chunks` has more than `threshold` entries, attempt to recover the data.
       * If that fails, return `Err(RecoveryError::Invalid)`
       * If correct:
@@ -135,5 +152,6 @@ const N_PARALLEL: usize = 50;
         * break and issue `Ok(available_data)`
     * Send the result to each member of `awaiting`.
     * While there are fewer than `N_PARALLEL` entries in `requesting_chunks`,
-      * Pop the next item from `shuffling`. If it's empty and `requesting_chunks` is empty, return `Err(RecoveryError::Unavailable)`.
+      * Pop the next item from `shuffling`. If it's empty and `requesting_chunks` is empty, return
+        `Err(RecoveryError::Unavailable)`.
       * Issue a `NetworkBridgeMessage::Requests` and wait for the response in `requesting_chunks`.
diff --git a/polkadot/roadmap/implementers-guide/src/node/availability/bitfield-distribution.md b/polkadot/roadmap/implementers-guide/src/node/availability/bitfield-distribution.md
index 53bd8a1bced61f5783bfeee937786c9b4741d80e..097f2e6353843d4949c2f41088815bc4cf6e5c38 100644
--- a/polkadot/roadmap/implementers-guide/src/node/availability/bitfield-distribution.md
+++ b/polkadot/roadmap/implementers-guide/src/node/availability/bitfield-distribution.md
@@ -1,34 +1,40 @@
 # Bitfield Distribution
 
-Validators vote on the availability of a backed candidate by issuing signed bitfields, where each bit corresponds to a single candidate. These bitfields can be used to compactly determine which backed candidates are available or not based on a 2/3+ quorum.
+Validators vote on the availability of a backed candidate by issuing signed bitfields, where each bit corresponds to a
+single candidate. These bitfields can be used to compactly determine which backed candidates are available or not based
+on a 2/3+ quorum.
 
 ## Protocol
 
 `PeerSet`: `Validation`
 
-Input:
-[`BitfieldDistributionMessage`](../../types/overseer-protocol.md#bitfield-distribution-message) which are gossiped to all peers, no matter if validator or not.
+Input: [`BitfieldDistributionMessage`](../../types/overseer-protocol.md#bitfield-distribution-message) which are
+gossiped to all peers, no matter if validator or not.
 
 Output:
 
-- `NetworkBridge::SendValidationMessage([PeerId], message)` gossip a verified incoming bitfield on to interested subsystems within this validator node.
-- `NetworkBridge::ReportPeer(PeerId, cost_or_benefit)` improve or penalize the reputation of peers based on the messages that are received relative to the current view.
-- `ProvisionerMessage::ProvisionableData(ProvisionableData::Bitfield(relay_parent, SignedAvailabilityBitfield))` pass
-  on the bitfield to the other submodules via the overseer.
+- `NetworkBridge::SendValidationMessage([PeerId], message)` gossip a verified incoming bitfield on to interested
+  subsystems within this validator node.
+- `NetworkBridge::ReportPeer(PeerId, cost_or_benefit)` improve or penalize the reputation of peers based on the messages
+  that are received relative to the current view.
+- `ProvisionerMessage::ProvisionableData(ProvisionableData::Bitfield(relay_parent, SignedAvailabilityBitfield))` pass on
+  the bitfield to the other submodules via the overseer.
 
 ## Functionality
 
 This is implemented as a gossip system.
 
-It is necessary to track peer connection, view change, and disconnection events, in order to maintain an index of which peers are interested in which relay parent bitfields.
+It is necessary to track peer connection, view change, and disconnection events, in order to maintain an index of which
+peers are interested in which relay parent bitfields.
 
 
-Before gossiping incoming bitfields, they must be checked to be signed by one of the validators
-of the validator set relevant to the current relay parent.
-Only accept bitfields relevant to our current view and only distribute bitfields to other peers when relevant to their most recent view.
-Accept and distribute only one bitfield per validator.
+Before gossiping incoming bitfields, they must be checked to be signed by one of the validators of the validator set
+relevant to the current relay parent. Only accept bitfields relevant to our current view and only distribute bitfields
+to other peers when relevant to their most recent view. Accept and distribute only one bitfield per validator.
 
 
-When receiving a bitfield either from the network or from a `DistributeBitfield` message, forward it along to the block authorship (provisioning) subsystem for potential inclusion in a block.
+When receiving a bitfield either from the network or from a `DistributeBitfield` message, forward it along to the block
+authorship (provisioning) subsystem for potential inclusion in a block.
 
-Peers connecting after a set of valid bitfield gossip messages was received, those messages must be cached and sent upon connection of new peers or re-connecting peers.
+Peers connecting after a set of valid bitfield gossip messages was received, those messages must be cached and sent upon
+connection of new peers or re-connecting peers.
diff --git a/polkadot/roadmap/implementers-guide/src/node/availability/bitfield-signing.md b/polkadot/roadmap/implementers-guide/src/node/availability/bitfield-signing.md
index 08cbe528473ea4fd7099cedf15b58a6995a07226..a5875e0a8055037b0f31b32a531d418fa49cc815 100644
--- a/polkadot/roadmap/implementers-guide/src/node/availability/bitfield-signing.md
+++ b/polkadot/roadmap/implementers-guide/src/node/availability/bitfield-signing.md
@@ -1,12 +1,15 @@
 # Bitfield Signing
 
-Validators vote on the availability of a backed candidate by issuing signed bitfields, where each bit corresponds to a single candidate. These bitfields can be used to compactly determine which backed candidates are available or not based on a 2/3+ quorum.
+Validators vote on the availability of a backed candidate by issuing signed bitfields, where each bit corresponds to a
+single candidate. These bitfields can be used to compactly determine which backed candidates are available or not based
+on a 2/3+ quorum.
 
 ## Protocol
 
 Input:
 
-There is no dedicated input mechanism for bitfield signing. Instead, Bitfield Signing produces a bitfield representing the current state of availability on `StartWork`.
+There is no dedicated input mechanism for bitfield signing. Instead, Bitfield Signing produces a bitfield representing
+the current state of availability on `StartWork`.
 
 Output:
 
@@ -15,15 +18,20 @@ Output:
 
 ## Functionality
 
-Upon receipt of an `ActiveLeavesUpdate`, launch bitfield signing job for each `activated` head referring to a fresh leaf. Stop the job for each `deactivated` head.
+Upon receipt of an `ActiveLeavesUpdate`, launch bitfield signing job for each `activated` head referring to a fresh
+leaf. Stop the job for each `deactivated` head.
 
 ## Bitfield Signing Job
 
-Localized to a specific relay-parent `r`
-If not running as a validator, do nothing.
+Localized to a specific relay-parent `r` If not running as a validator, do nothing.
 
-- For each fresh leaf, begin by waiting a fixed period of time so availability distribution has the chance to make candidates available.
-- Determine our validator index `i`, the set of backed candidates pending availability in `r`, and which bit of the bitfield each corresponds to.
-- Start with an empty bitfield. For each bit in the bitfield, if there is a candidate pending availability, query the [Availability Store](../utility/availability-store.md) for whether we have the availability chunk for our validator index. The `OccupiedCore` struct contains the candidate hash so the full candidate does not need to be fetched from runtime.
+- For each fresh leaf, begin by waiting a fixed period of time so availability distribution has the chance to make
+  candidates available.
+- Determine our validator index `i`, the set of backed candidates pending availability in `r`, and which bit of the
+  bitfield each corresponds to.
+- Start with an empty bitfield. For each bit in the bitfield, if there is a candidate pending availability, query the
+  [Availability Store](../utility/availability-store.md) for whether we have the availability chunk for our validator
+  index. The `OccupiedCore` struct contains the candidate hash so the full candidate does not need to be fetched from
+  runtime.
 - For all chunks we have, set the corresponding bit in the bitfield.
 - Sign the bitfield and dispatch a `BitfieldDistribution::DistributeBitfield` message.
diff --git a/polkadot/roadmap/implementers-guide/src/node/backing/README.md b/polkadot/roadmap/implementers-guide/src/node/backing/README.md
index ac47abefb0d043e3daaf6d2c3ba9a7e19c3b9413..d2a77ded6b763326331307b4bcefb5b9aa78336e 100644
--- a/polkadot/roadmap/implementers-guide/src/node/backing/README.md
+++ b/polkadot/roadmap/implementers-guide/src/node/backing/README.md
@@ -1,10 +1,15 @@
 # Backing Subsystems
 
-The backing subsystems, when conceived as a black box, receive an arbitrary quantity of parablock candidates and associated proofs of validity from arbitrary untrusted collators. From these, they produce a bounded quantity of backable candidates which relay chain block authors may choose to include in a subsequent block.
+The backing subsystems, when conceived as a black box, receive an arbitrary quantity of parablock candidates and
+associated proofs of validity from arbitrary untrusted collators. From these, they produce a bounded quantity of
+backable candidates which relay chain block authors may choose to include in a subsequent block.
 
 In broad strokes, the flow operates like this:
 
 - **Candidate Selection** winnows the field of parablock candidates, selecting up to one of them to second.
-- **Candidate Backing** ensures that a seconding candidate is valid, then generates the appropriate `Statement`. It also keeps track of which candidates have received the backing of a quorum of other validators.
-- **Statement Distribution** is the networking component which ensures that all validators receive each others' statements.
-- **PoV Distribution** is the networking component which ensures that validators considering a candidate can get the appropriate PoV.
+- **Candidate Backing** ensures that a seconding candidate is valid, then generates the appropriate `Statement`. It also
+  keeps track of which candidates have received the backing of a quorum of other validators.
+- **Statement Distribution** is the networking component which ensures that all validators receive each others'
+  statements.
+- **PoV Distribution** is the networking component which ensures that validators considering a candidate can get the
+  appropriate PoV.
diff --git a/polkadot/roadmap/implementers-guide/src/node/backing/candidate-backing.md b/polkadot/roadmap/implementers-guide/src/node/backing/candidate-backing.md
index 0eee0cc532ef17c922e03e0b2fb299313702ffb3..31f8423fe27b275452b84bc8d2486e10b81e1908 100644
--- a/polkadot/roadmap/implementers-guide/src/node/backing/candidate-backing.md
+++ b/polkadot/roadmap/implementers-guide/src/node/backing/candidate-backing.md
@@ -1,12 +1,20 @@
 # Candidate Backing
 
-The Candidate Backing subsystem ensures every parablock considered for relay block inclusion has been seconded by at least one validator, and approved by a quorum. Parablocks for which not enough validators will assert correctness are discarded. If the block later proves invalid, the initial backers are slashable; this gives polkadot a rational threat model during subsequent stages.
+The Candidate Backing subsystem ensures every parablock considered for relay block inclusion has been seconded by at
+least one validator, and approved by a quorum. Parablocks for which not enough validators will assert correctness are
+discarded. If the block later proves invalid, the initial backers are slashable; this gives Polkadot a rational threat
+model during subsequent stages.
 
-Its role is to produce backable candidates for inclusion in new relay-chain blocks. It does so by issuing signed [`Statement`s][Statement] and tracking received statements signed by other validators. Once enough statements are received, they can be combined into backing for specific candidates.
+Its role is to produce backable candidates for inclusion in new relay-chain blocks. It does so by issuing signed
+[`Statement`s][Statement] and tracking received statements signed by other validators. Once enough statements are
+received, they can be combined into backing for specific candidates.
 
-Note that though the candidate backing subsystem attempts to produce as many backable candidates as possible, it does _not_ attempt to choose a single authoritative one. The choice of which actually gets included is ultimately up to the block author, by whatever metrics it may use; those are opaque to this subsystem.
+Note that though the candidate backing subsystem attempts to produce as many backable candidates as possible, it does
+_not_ attempt to choose a single authoritative one. The choice of which actually gets included is ultimately up to the
+block author, by whatever metrics it may use; those are opaque to this subsystem.
 
-Once a sufficient quorum has agreed that a candidate is valid, this subsystem notifies the [Provisioner][PV], which in turn engages block production mechanisms to include the parablock.
+Once a sufficient quorum has agreed that a candidate is valid, this subsystem notifies the [Provisioner][PV], which in
+turn engages block production mechanisms to include the parablock.
 
 ## Protocol
 
@@ -14,33 +22,49 @@ Input: [`CandidateBackingMessage`][CBM]
 
 Output:
 
-- [`CandidateValidationMessage`][CVM]
-- [`RuntimeApiMessage`][RAM]
-- [`CollatorProtocolMessage`][CPM]
-- [`ProvisionerMessage`][PM]
-- [`AvailabilityDistributionMessage`][ADM]
-- [`StatementDistributionMessage`][SDM]
+* [`CandidateValidationMessage`][CVM]
+* [`RuntimeApiMessage`][RAM]
+* [`CollatorProtocolMessage`][CPM]
+* [`ProvisionerMessage`][PM]
+* [`AvailabilityDistributionMessage`][ADM]
+* [`StatementDistributionMessage`][SDM]
 
 ## Functionality
 
-The [Collator Protocol][CP] subsystem is the primary source of non-overseer messages into this subsystem. That subsystem generates appropriate [`CandidateBackingMessage`s][CBM] and passes them to this subsystem.
+The [Collator Protocol][CP] subsystem is the primary source of non-overseer messages into this subsystem. That subsystem
+generates appropriate [`CandidateBackingMessage`s][CBM] and passes them to this subsystem.
 
-This subsystem requests validation from the [Candidate Validation][CV] and generates an appropriate [`Statement`][Statement]. All `Statement`s are then passed on to the [Statement Distribution][SD] subsystem to be gossiped to peers. When [Candidate Validation][CV] decides that a candidate is invalid, and it was recommended to us to second by our own [Collator Protocol][CP] subsystem, a message is sent to the [Collator Protocol][CP] subsystem with the candidate's hash so that the collator which recommended it can be penalized.
+This subsystem requests validation from the [Candidate Validation][CV] and generates an appropriate
+[`Statement`][Statement]. All `Statement`s are then passed on to the [Statement Distribution][SD] subsystem to be
+gossiped to peers. When [Candidate Validation][CV] decides that a candidate is invalid, and it was recommended to us to
+second by our own [Collator Protocol][CP] subsystem, a message is sent to the [Collator Protocol][CP] subsystem with the
+candidate's hash so that the collator which recommended it can be penalized.
 
-The subsystem should maintain a set of handles to Candidate Backing Jobs that are currently live, as well as the relay-parent to which they correspond.
+The subsystem should maintain a set of handles to Candidate Backing Jobs that are currently live, as well as the
+relay-parent to which they correspond.
 
 ### On Overseer Signal
 
 * If the signal is an [`OverseerSignal`][OverseerSignal]`::ActiveLeavesUpdate`:
-  * spawn a Candidate Backing Job for each `activated` head referring to a fresh leaf, storing a bidirectional channel with the Candidate Backing Job in the set of handles.
+  * spawn a Candidate Backing Job for each `activated` head referring to a fresh leaf, storing a bidirectional channel
+    with the Candidate Backing Job in the set of handles.
   * cease the Candidate Backing Job for each `deactivated` head, if any.
-* If the signal is an [`OverseerSignal`][OverseerSignal]`::Conclude`: Forward conclude messages to all jobs, wait a small amount of time for them to join, and then exit.
+* If the signal is an [`OverseerSignal`][OverseerSignal]`::Conclude`: Forward conclude messages to all jobs, wait a
+  small amount of time for them to join, and then exit.
 
 ### On Receiving `CandidateBackingMessage`
 
-* If the message is a [`CandidateBackingMessage`][CBM]`::GetBackedCandidates`, get all backable candidates from the statement table and send them back.
-* If the message is a [`CandidateBackingMessage`][CBM]`::Second`, sign and dispatch a `Seconded` statement only if we have not seconded any other candidate and have not signed a `Valid` statement for the requested candidate. Signing both a `Seconded` and `Valid` message is a double-voting misbehavior with a heavy penalty, and this could occur if another validator has seconded the same candidate and we've received their message before the internal seconding request.
-* If the message is a [`CandidateBackingMessage`][CBM]`::Statement`, count the statement to the quorum. If the statement in the message is `Seconded` and it contains a candidate that belongs to our assignment, request the corresponding `PoV` from the backing node via `AvailabilityDistribution` and launch validation. Issue our own `Valid` or `Invalid` statement as a result.
+* If the message is a [`CandidateBackingMessage`][CBM]`::GetBackedCandidates`, get all backable candidates from the
+  statement table and send them back.
+* If the message is a [`CandidateBackingMessage`][CBM]`::Second`, sign and dispatch a `Seconded` statement only if we
+  have not seconded any other candidate and have not signed a `Valid` statement for the requested candidate. Signing
+  both a `Seconded` and `Valid` message is a double-voting misbehavior with a heavy penalty, and this could occur if
+  another validator has seconded the same candidate and we've received their message before the internal seconding
+  request.
+* If the message is a [`CandidateBackingMessage`][CBM]`::Statement`, count the statement to the quorum. If the statement
+  in the message is `Seconded` and it contains a candidate that belongs to our assignment, request the corresponding
+  `PoV` from the backing node via `AvailabilityDistribution` and launch validation. Issue our own `Valid` or `Invalid`
+  statement as a result.
 
 If the seconding node did not provide us with the `PoV` we will retry fetching from other backing validators.
 
@@ -51,19 +75,25 @@ If the seconding node did not provide us with the `PoV` we will retry fetching f
 > * Allow inclusion of _old_ parachain candidates validated by _current_ validators.
 > * Allow inclusion of _old_ parachain candidates validated by _old_ validators.
 >
-> This will probably blur the lines between jobs, will probably require inter-job communication and a short-term memory of recently backable, but not backed candidates.
+> This will probably blur the lines between jobs, will probably require inter-job communication and a short-term memory
+> of recently backable, but not backed candidates.
 
 ## Candidate Backing Job
 
-The Candidate Backing Job represents the work a node does for backing candidates with respect to a particular relay-parent.
+The Candidate Backing Job represents the work a node does for backing candidates with respect to a particular
+relay-parent.
 
-The goal of a Candidate Backing Job is to produce as many backable candidates as possible. This is done via signed [`Statement`s][STMT] by validators. If a candidate receives a majority of supporting Statements from the Parachain Validators currently assigned, then that candidate is considered backable.
+The goal of a Candidate Backing Job is to produce as many backable candidates as possible. This is done via signed
+[`Statement`s][STMT] by validators. If a candidate receives a majority of supporting Statements from the Parachain
+Validators currently assigned, then that candidate is considered backable.
 
 ### On Startup
 
-* Fetch current validator set, validator -> parachain assignments from [`Runtime API`][RA] subsystem using [`RuntimeApiRequest::Validators`][RAM] and [`RuntimeApiRequest::ValidatorGroups`][RAM]
+* Fetch current validator set, validator -> parachain assignments from [`Runtime API`][RA] subsystem using
+  [`RuntimeApiRequest::Validators`][RAM] and [`RuntimeApiRequest::ValidatorGroups`][RAM]
 * Determine if the node controls a key in the current validator set. Call this the local key if so.
-* If the local key exists, extract the parachain head and validation function from the [`Runtime API`][RA] for the parachain the local key is assigned to by issuing a [`RuntimeApiRequest::Validators`][RAM]
+* If the local key exists, extract the parachain head and validation function from the [`Runtime API`][RA] for the
+  parachain the local key is assigned to by issuing a [`RuntimeApiRequest::Validators`][RAM]
 * Issue a [`RuntimeApiRequest::SigningContext`][RAM] message to get a context that will later be used upon signing.
 
 ### On Receiving New Candidate Backing Message
@@ -91,15 +121,17 @@ match msg {
 }
 ```
 
-Add `Seconded` statements and `Valid` statements to a quorum. If the quorum reaches a pre-defined threshold, send a [`ProvisionerMessage`][PM]`::ProvisionableData(ProvisionableData::BackedCandidate(CandidateReceipt))` message.
-`Invalid` statements that conflict with already witnessed `Seconded` and `Valid` statements for the given candidate, statements that are double-votes, self-contradictions and so on, should result in issuing a [`ProvisionerMessage`][PM]`::MisbehaviorReport` message for each newly detected case of this kind.
+Add `Seconded` statements and `Valid` statements to a quorum. If the quorum reaches a pre-defined threshold, send a
+[`ProvisionerMessage`][PM]`::ProvisionableData(ProvisionableData::BackedCandidate(CandidateReceipt))` message. `Invalid`
+statements that conflict with already witnessed `Seconded` and `Valid` statements for the given candidate, statements
+that are double-votes, self-contradictions and so on, should result in issuing a
+[`ProvisionerMessage`][PM]`::MisbehaviorReport` message for each newly detected case of this kind.
 
-Backing does not need to concern itself with providing statements to the dispute
-coordinator as the dispute coordinator scrapes them from chain. This way the
-import is batched and contains only statements that actually made it on some
+Backing does not need to concern itself with providing statements to the dispute coordinator as the dispute coordinator
+scrapes them from chain. This way the import is batched and contains only statements that actually made it on some
 chain.
 
-### Validating Candidates.
+### Validating Candidates
 
 ```rust
 fn spawn_validation_work(candidate, parachain head, validation function) {
@@ -119,14 +151,16 @@ fn spawn_validation_work(candidate, parachain head, validation function) {
 
 ### Fetch PoV Block
 
-Create a `(sender, receiver)` pair.
-Dispatch a [`AvailabilityDistributionMessage`][ADM]`::FetchPoV{ validator_index, pov_hash, candidate_hash, tx, } and listen on the passed receiver for a response. Availability distribution will send the request to the validator specified by `validator_index`, which might not be serving it for whatever reasons, therefore we need to retry with other backing validators in that case.
+Create a `(sender, receiver)` pair. Dispatch a [`AvailabilityDistributionMessage`][ADM]`::FetchPoV{ validator_index,
+pov_hash, candidate_hash, tx, }` and listen on the passed receiver for a response. Availability distribution will send
+the request to the validator specified by `validator_index`, which might not be serving it for whatever reasons,
+therefore we need to retry with other backing validators in that case.
 
 
 ### Validate PoV Block
 
-Create a `(sender, receiver)` pair.
-Dispatch a `CandidateValidationMessage::Validate(validation function, candidate, pov, BACKING_EXECUTION_TIMEOUT, sender)` and listen on the receiver for a response.
+Create a `(sender, receiver)` pair. Dispatch a `CandidateValidationMessage::Validate(validation function, candidate,
+pov, BACKING_EXECUTION_TIMEOUT, sender)` and listen on the receiver for a response.
 
 ### Distribute Signed Statement
 
diff --git a/polkadot/roadmap/implementers-guide/src/node/backing/prospective-parachains.md b/polkadot/roadmap/implementers-guide/src/node/backing/prospective-parachains.md
index a48444a46e402b6c30e2280f3923db50943ef2ce..286aeddb986d3db3c7077d8d6227ebcf979073cb 100644
--- a/polkadot/roadmap/implementers-guide/src/node/backing/prospective-parachains.md
+++ b/polkadot/roadmap/implementers-guide/src/node/backing/prospective-parachains.md
@@ -122,7 +122,7 @@ prospective validation data. This is unlikely to change.
 
 ### Outgoing
 
-- `RuntimeApiRequest::StagingParaBackingState`
+- `RuntimeApiRequest::ParaBackingState`
   - Gets the backing state of the given para (the constraints of the para and
     candidates pending availability).
 - `RuntimeApiRequest::AvailabilityCores`
diff --git a/polkadot/roadmap/implementers-guide/src/node/backing/statement-distribution-legacy.md b/polkadot/roadmap/implementers-guide/src/node/backing/statement-distribution-legacy.md
index 5cbc875d8a733ebd224056b1658570c345b9b7b7..e10a55010b91ca1dab6d3cf09aed409530c2bba5 100644
--- a/polkadot/roadmap/implementers-guide/src/node/backing/statement-distribution-legacy.md
+++ b/polkadot/roadmap/implementers-guide/src/node/backing/statement-distribution-legacy.md
@@ -1,18 +1,16 @@
 # Statement Distribution (Legacy)
 
-This describes the legacy, backwards-compatible version of the Statement
-Distribution subsystem.
+This describes the legacy, backwards-compatible version of the Statement Distribution subsystem.
 
-**Note:** All the V1 (legacy) code was extracted out to a `legacy_v1` module of
-the `statement-distribution` crate, which doesn't alter any logic. V2 (new
-protocol) peers also run `legacy_v1` and communicate with V1 peers using V1
-messages and with V2 peers using V2 messages. Once the runtime upgrade goes
-through on all networks, this `legacy_v1` code will no longer be triggered and
-will be vestigial and can be removed.
+**Note:** All the V1 (legacy) code was extracted out to a `legacy_v1` module of the `statement-distribution` crate,
+which doesn't alter any logic. V2 (new protocol) peers also run `legacy_v1` and communicate with V1 peers using V1
+messages and with V2 peers using V2 messages. Once the runtime upgrade goes through on all networks, this `legacy_v1`
+code will no longer be triggered and will be vestigial and can be removed.
 
 ## Overview
 
-The Statement Distribution Subsystem is responsible for distributing statements about seconded candidates between validators.
+The Statement Distribution Subsystem is responsible for distributing statements about seconded candidates between
+validators.
 
 ## Protocol
 
@@ -31,89 +29,133 @@ Output:
 
 ## Functionality
 
-Implemented as a gossip protocol. Handles updates to our view and peers' views. Neighbor packets are used to inform peers which chain heads we are interested in data for.
+Implemented as a gossip protocol. Handles updates to our view and peers' views. Neighbor packets are used to inform
+peers which chain heads we are interested in data for.
 
-The Statement Distribution Subsystem is responsible for distributing signed statements that we have generated and for forwarding statements generated by other validators. It also detects a variety of Validator misbehaviors for reporting to the [Provisioner Subsystem](../utility/provisioner.md). During the Backing stage of the inclusion pipeline, Statement Distribution is the main point of contact with peer nodes. On receiving a signed statement from a peer in the same backing group, assuming the peer receipt state machine is in an appropriate state, it sends the Candidate Receipt to the [Candidate Backing subsystem](candidate-backing.md) to handle the validator's statement. On receiving `StatementDistributionMessage::Share` we make sure to send messages to our backing group in addition to random other peers, to ensure a fast backing process and getting all statements quickly for distribution.
+The Statement Distribution Subsystem is responsible for distributing signed statements that we have generated and for
+forwarding statements generated by other validators. It also detects a variety of Validator misbehaviors for reporting
+to the [Provisioner Subsystem](../utility/provisioner.md). During the Backing stage of the inclusion pipeline, Statement
+Distribution is the main point of contact with peer nodes. On receiving a signed statement from a peer in the same
+backing group, assuming the peer receipt state machine is in an appropriate state, it sends the Candidate Receipt to the
+[Candidate Backing subsystem](candidate-backing.md) to handle the validator's statement. On receiving
+`StatementDistributionMessage::Share` we make sure to send messages to our backing group in addition to random other
+peers, to ensure a fast backing process and getting all statements quickly for distribution.
 
-This subsystem tracks equivocating validators and stops accepting information from them. It establishes a data-dependency order:
+This subsystem tracks equivocating validators and stops accepting information from them. It establishes a
+data-dependency order:
 
 - In order to receive a `Seconded` message we have the corresponding chain head in our view
 - In order to receive a `Valid` message we must have received the corresponding `Seconded` message.
 
-And respect this data-dependency order from our peers by respecting their views. This subsystem is responsible for checking message signatures.
+And respect this data-dependency order from our peers by respecting their views. This subsystem is responsible for
+checking message signatures.
 
 The Statement Distribution subsystem sends statements to peer nodes.
 
 ## Peer Receipt State Machine
 
-There is a very simple state machine which governs which messages we are willing to receive from peers. Not depicted in the state machine: on initial receipt of any [`SignedFullStatement`](../../types/backing.md#signed-statement-type), validate that the provided signature does in fact sign the included data. Note that each individual parablock candidate gets its own instance of this state machine; it is perfectly legal to receive a `Valid(X)` before a `Seconded(Y)`, as long as a `Seconded(X)` has been received.
+There is a very simple state machine which governs which messages we are willing to receive from peers. Not depicted in
+the state machine: on initial receipt of any [`SignedFullStatement`](../../types/backing.md#signed-statement-type),
+validate that the provided signature does in fact sign the included data. Note that each individual parablock candidate
+gets its own instance of this state machine; it is perfectly legal to receive a `Valid(X)` before a `Seconded(Y)`, as
+long as a `Seconded(X)` has been received.
 
-A: Initial State. Receive `SignedFullStatement(Statement::Second)`: extract `Statement`, forward to Candidate Backing, proceed to B. Receive any other `SignedFullStatement` variant: drop it.
+A: Initial State. Receive `SignedFullStatement(Statement::Second)`: extract `Statement`, forward to Candidate Backing,
+proceed to B. Receive any other `SignedFullStatement` variant: drop it.
 
-B: Receive any `SignedFullStatement`: check signature and determine whether the statement is new to us. if new, forward to Candidate Backing and circulate to other peers. Receive `OverseerMessage::StopWork`: proceed to C.
+B: Receive any `SignedFullStatement`: check signature and determine whether the statement is new to us. if new, forward
+to Candidate Backing and circulate to other peers. Receive `OverseerMessage::StopWork`: proceed to C.
 
 C: Receive any message for this block: drop it.
 
-For large statements (see below), we also keep track of the total received large
-statements per peer and have a hard limit on that number for flood protection.
-This is necessary as in the current code we only forward statements once we have
-all the data, therefore flood protection for large statement is a bit more
-subtle. This will become an obsolete problem once [off chain code
-upgrades](https://github.com/paritytech/polkadot/issues/2979) are implemented.
+For large statements (see below), we also keep track of the total received large statements per peer and have a hard
+limit on that number for flood protection. This is necessary as in the current code we only forward statements once we
+have all the data, therefore flood protection for large statement is a bit more subtle. This will become an obsolete
+problem once [off chain code upgrades](https://github.com/paritytech/polkadot/issues/2979) are implemented.
 
 ## Peer Knowledge Tracking
 
-The peer receipt state machine implies that for parsimony of network resources, we should model the knowledge of our peers, and help them out. For example, let's consider a case with peers A, B, and C, validators X and Y, and candidate M. A sends us a `Statement::Second(M)` signed by X. We've double-checked it, and it's valid. While we're checking it, we receive a copy of X's `Statement::Second(M)` from `B`, along with a `Statement::Valid(M)` signed by Y.
+The peer receipt state machine implies that for parsimony of network resources, we should model the knowledge of our
+peers, and help them out. For example, let's consider a case with peers A, B, and C, validators X and Y, and candidate
+M. A sends us a `Statement::Second(M)` signed by X. We've double-checked it, and it's valid. While we're checking it, we
+receive a copy of X's `Statement::Second(M)` from `B`, along with a `Statement::Valid(M)` signed by Y.
 
-Our response to A is just the `Statement::Valid(M)` signed by Y. However, we haven't heard anything about this from C. Therefore, we send it everything we have: first a copy of X's `Statement::Second`, then Y's `Statement::Valid`.
+Our response to A is just the `Statement::Valid(M)` signed by Y. However, we haven't heard anything about this from C.
+Therefore, we send it everything we have: first a copy of X's `Statement::Second`, then Y's `Statement::Valid`.
 
-This system implies a certain level of duplication of messages--we received X's `Statement::Second` from both our peers, and C may experience the same--but it minimizes the degree to which messages are simply dropped.
+This system implies a certain level of duplication of messages--we received X's `Statement::Second` from both our peers,
+and C may experience the same--but it minimizes the degree to which messages are simply dropped.
 
 And respect this data-dependency order from our peers. This subsystem is responsible for checking message signatures.
 
-No jobs. We follow view changes from the [`NetworkBridge`](../utility/network-bridge.md), which in turn is updated by the overseer.
+No jobs. We follow view changes from the [`NetworkBridge`](../utility/network-bridge.md), which in turn is updated by
+the overseer.
 
 ## Equivocations and Flood Protection
 
-An equivocation is a double-vote by a validator. The [Candidate Backing](candidate-backing.md) Subsystem is better-suited than this one to detect equivocations as it adds votes to quorum trackers.
+An equivocation is a double-vote by a validator. The [Candidate Backing](candidate-backing.md) Subsystem is
+better-suited than this one to detect equivocations as it adds votes to quorum trackers.
 
-At this level, we are primarily concerned about flood-protection, and to some extent, detecting equivocations is a part of that. In particular, we are interested in detecting equivocations of `Seconded` statements. Since every other statement is dependent on `Seconded` statements, ensuring that we only ever hold a bounded number of `Seconded` statements is sufficient for flood-protection.
+At this level, we are primarily concerned about flood-protection, and to some extent, detecting equivocations is a part
+of that. In particular, we are interested in detecting equivocations of `Seconded` statements. Since every other
+statement is dependent on `Seconded` statements, ensuring that we only ever hold a bounded number of `Seconded`
+statements is sufficient for flood-protection.
 
-The simple approach is to say that we only receive up to two `Seconded` statements per validator per chain head. However, the marginal cost of equivocation, conditional on having already equivocated, is close to 0, since a single double-vote offence is counted as all double-vote offences for a particular chain-head. Even if it were not, there is some amount of equivocations that can be done such that the marginal cost of issuing further equivocations is close to 0, as there would be an amount of equivocations necessary to be completely and totally obliterated by the slashing algorithm. We fear the validator with nothing left to lose.
+The simple approach is to say that we only receive up to two `Seconded` statements per validator per chain head.
+However, the marginal cost of equivocation, conditional on having already equivocated, is close to 0, since a single
+double-vote offence is counted as all double-vote offences for a particular chain-head. Even if it were not, there is
+some amount of equivocations that can be done such that the marginal cost of issuing further equivocations is close to
+0, as there would be an amount of equivocations necessary to be completely and totally obliterated by the slashing
+algorithm. We fear the validator with nothing left to lose.
 
 With that in mind, this simple approach has a caveat worth digging deeper into.
 
-First: We may be aware of two equivocated `Seconded` statements issued by a validator. A totally honest peer of ours can also be aware of one or two different `Seconded` statements issued by the same validator. And yet another peer may be aware of one or two _more_ `Seconded` statements. And so on. This interacts badly with pre-emptive sending logic. Upon sending a `Seconded` statement to a peer, we will want to pre-emptively follow up with all statements relative to that candidate. Waiting for acknowledgment introduces latency at every hop, so that is best avoided. What can happen is that upon receipt of the `Seconded` statement, the peer will discard it as it falls beyond the bound of 2 that it is allowed to store. It cannot store anything in memory about discarded candidates as that would introduce a DoS vector. Then, the peer would receive from us all of the statements pertaining to that candidate, which, from its perspective, would be undesired - they are data-dependent on the `Seconded` statement we sent them, but they have erased all record of that from their memory. Upon receiving a potential flood of undesired statements, this 100% honest peer may choose to disconnect from us. In this way, an adversary may be able to partition the network with careful distribution of equivocated `Seconded` statements.
-
-The fix is to track, per-peer, the hashes of up to 4 candidates per validator (per relay-parent) that the peer is aware of. It is 4 because we may send them 2 and they may send us 2 different ones. We track the data that they are aware of as the union of things we have sent them and things they have sent us. If we receive a 1st or 2nd `Seconded` statement from a peer, we note it in the peer's known candidates even if we do disregard the data locally. And then, upon receipt of any data dependent on that statement, we do not reduce that peer's standing in our eyes, as the data was not undesired.
-
-There is another caveat to the fix: we don't want to allow the peer to flood us because it has set things up in a way that it knows we will drop all of its traffic.
-We also track how many statements we have received per peer, per candidate, and per chain-head. This is any statement concerning a particular candidate: `Seconded`, `Valid`, or `Invalid`. If we ever receive a statement from a peer which would push any of these counters beyond twice the amount of validators at the chain-head, we begin to lower the peer's standing and eventually disconnect. This bound is a massive overestimate and could be reduced to twice the number of validators in the corresponding validator group. It is worth noting that the goal at the time of writing is to ensure any finite bound on the amount of stored data, as any equivocation results in a large slash.
+First: We may be aware of two equivocated `Seconded` statements issued by a validator. A totally honest peer of ours can
+also be aware of one or two different `Seconded` statements issued by the same validator. And yet another peer may be
+aware of one or two _more_ `Seconded` statements. And so on. This interacts badly with pre-emptive sending logic. Upon
+sending a `Seconded` statement to a peer, we will want to pre-emptively follow up with all statements relative to that
+candidate. Waiting for acknowledgment introduces latency at every hop, so that is best avoided. What can happen is that
+upon receipt of the `Seconded` statement, the peer will discard it as it falls beyond the bound of 2 that it is allowed
+to store. It cannot store anything in memory about discarded candidates as that would introduce a DoS vector. Then, the
+peer would receive from us all of the statements pertaining to that candidate, which, from its perspective, would be
+undesired - they are data-dependent on the `Seconded` statement we sent them, but they have erased all record of that
+from their memory. Upon receiving a potential flood of undesired statements, this 100% honest peer may choose to
+disconnect from us. In this way, an adversary may be able to partition the network with careful distribution of
+equivocated `Seconded` statements.
+
+The fix is to track, per-peer, the hashes of up to 4 candidates per validator (per relay-parent) that the peer is aware
+of. It is 4 because we may send them 2 and they may send us 2 different ones. We track the data that they are aware of
+as the union of things we have sent them and things they have sent us. If we receive a 1st or 2nd `Seconded` statement
+from a peer, we note it in the peer's known candidates even if we do disregard the data locally. And then, upon receipt
+of any data dependent on that statement, we do not reduce that peer's standing in our eyes, as the data was not
+undesired.
+
+There is another caveat to the fix: we don't want to allow the peer to flood us because it has set things up in a way
+that it knows we will drop all of its traffic. We also track how many statements we have received per peer, per
+candidate, and per chain-head. This is any statement concerning a particular candidate: `Seconded`, `Valid`, or
+`Invalid`. If we ever receive a statement from a peer which would push any of these counters beyond twice the amount of
+validators at the chain-head, we begin to lower the peer's standing and eventually disconnect. This bound is a massive
+overestimate and could be reduced to twice the number of validators in the corresponding validator group. It is worth
+noting that the goal at the time of writing is to ensure any finite bound on the amount of stored data, as any
+equivocation results in a large slash.
 
 ## Large statements
 
-Seconded statements can become quite large on parachain runtime upgrades for
-example. For this reason, there exists a `LargeStatement` constructor for the
-`StatementDistributionMessage` wire message, which only contains light metadata
-of a statement. The actual candidate data is not included. This message type is
-used whenever a message is deemed large. The receiver of such a message needs to
-request the actual payload via request/response by means of a
+Seconded statements can become quite large on parachain runtime upgrades for example. For this reason, there exists a
+`LargeStatement` constructor for the `StatementDistributionMessage` wire message, which only contains light metadata of
+a statement. The actual candidate data is not included. This message type is used whenever a message is deemed large.
+The receiver of such a message needs to request the actual payload via request/response by means of a
 `StatementFetchingV1` request.
 
-This is necessary as distribution of a large payload (mega bytes) via gossip
-would make the network collapse and timely distribution of statements would no
-longer be possible. By using request/response it is ensured that each peer only
-transferes large data once. We only take good care to detect an overloaded
-peer early and immediately move on to a different peer for fetching the data.
-This mechanism should result in a good load distribution and therefore a rather
+This is necessary as distribution of a large payload (mega bytes) via gossip would make the network collapse and timely
+distribution of statements would no longer be possible. By using request/response it is ensured that each peer only
+transferes large data once. We only take good care to detect an overloaded peer early and immediately move on to a
+different peer for fetching the data. This mechanism should result in a good load distribution and therefore a rather
 optimal distribution path.
 
-With these optimizations, distribution of payloads in the size of up to 3 to 4
-MB should work with Kusama validator specifications. For scaling up even more,
-runtime upgrades and message passing should be done off chain at some point.
+With these optimizations, distribution of payloads in the size of up to 3 to 4 MB should work with Kusama validator
+specifications. For scaling up even more, runtime upgrades and message passing should be done off chain at some point.
 
-Flood protection considerations: For making DoS attacks slightly harder on this
-subsystem, nodes will only respond to large statement requests, when they
-previously notified that peer via gossip about that statement. So, it is not
-possible to DoS nodes at scale, by requesting candidate data over and over
-again.
+Flood protection considerations: For making DoS attacks slightly harder on this subsystem, nodes will only respond to
+large statement requests, when they previously notified that peer via gossip about that statement. So, it is not
+possible to DoS nodes at scale, by requesting candidate data over and over again.
diff --git a/polkadot/roadmap/implementers-guide/src/node/backing/statement-distribution.md b/polkadot/roadmap/implementers-guide/src/node/backing/statement-distribution.md
index 2e014284821063075f08d2b624a387a9a4879a12..24f2785f8294d32ff3a890f2781d13be3a232d4e 100644
--- a/polkadot/roadmap/implementers-guide/src/node/backing/statement-distribution.md
+++ b/polkadot/roadmap/implementers-guide/src/node/backing/statement-distribution.md
@@ -1,158 +1,127 @@
 # Statement Distribution
 
-This subsystem is responsible for distributing signed statements that we have generated and forwarding statements generated by our peers. Received candidate receipts and statements are passed to the [Candidate Backing subsystem](candidate-backing.md) to handle producing local statements. On receiving `StatementDistributionMessage::Share`, this subsystem distributes the message across the network with redundency to ensure a fast backing process.
+This subsystem is responsible for distributing signed statements that we have generated and forwarding statements
+generated by our peers. Received candidate receipts and statements are passed to the [Candidate Backing
+subsystem](candidate-backing.md) to handle producing local statements. On receiving
+`StatementDistributionMessage::Share`, this subsystem distributes the message across the network with redundency to
+ensure a fast backing process.
 
 ## Overview
 
-**Goal:** every well-connected node is aware of every next potential parachain
-block.
+**Goal:** every well-connected node is aware of every next potential parachain block.
 
 Validators can either:
 
 - receive parachain block from collator, check block, and gossip statement.
-- receive statements from other validators, check the parachain block if it
-  originated within their own group, gossip forward statement if valid.
-
-Validators must have statements, candidates, and persisted validation from all
-other validators. This is because we need to store statements from validators
-who've checked the candidate on the relay chain, so we know who to hold
-accountable in case of disputes. Any validator can be selected as the next
-relay-chain block author, and this is not revealed in advance for security
-reasons. As a result, all validators must have a up to date view of all possible
-parachain candidates + backing statements that could be placed on-chain in the
-next block.
-
-[This blog post](https://polkadot.network/blog/polkadot-v1-0-sharding-and-economic-security)
-puts it another way: "Validators who aren't assigned to the parachain still
-listen for the attestations [statements] because whichever validator ends up
-being the author of the relay-chain block needs to bundle up attested parachain
-blocks for several parachains and place them into the relay-chain block."
-
-Backing-group quorum (that is, enough backing group votes) must be reached
-before the block author will consider the candidate. Therefore, validators need
-to consider _all_ seconded candidates within their own group, because that's
-what they're assigned to work on. Validators only need to consider _backable_
-candidates from other groups. This informs the design of the statement
-distribution protocol to have separate phases for in-group and out-group
-distribution, respectively called "cluster" and "grid" mode (see below).
+- receive statements from other validators, check the parachain block if it originated within their own group, gossip
+  forward statement if valid.
+
+Validators must have statements, candidates, and persisted validation from all other validators. This is because we need
+to store statements from validators who've checked the candidate on the relay chain, so we know who to hold accountable
+in case of disputes. Any validator can be selected as the next relay-chain block author, and this is not revealed in
+advance for security reasons. As a result, all validators must have a up to date view of all possible parachain
+candidates + backing statements that could be placed on-chain in the next block.
+
+[This blog post](https://polkadot.network/blog/polkadot-v1-0-sharding-and-economic-security) puts it another way:
+"Validators who aren't assigned to the parachain still listen for the attestations [statements] because whichever
+validator ends up being the author of the relay-chain block needs to bundle up attested parachain blocks for several
+parachains and place them into the relay-chain block."
+
+Backing-group quorum (that is, enough backing group votes) must be reached before the block author will consider the
+candidate. Therefore, validators need to consider _all_ seconded candidates within their own group, because that's what
+they're assigned to work on. Validators only need to consider _backable_ candidates from other groups. This informs the
+design of the statement distribution protocol to have separate phases for in-group and out-group distribution,
+respectively called "cluster" and "grid" mode (see below).
 
 ### With Async Backing
 
-Asynchronous backing changes the runtime to accept parachain candidates from a
-certain allowed range of historic relay-parents. These candidates must be backed
-by the group assigned to the parachain as-of their corresponding relay parents.
+Asynchronous backing changes the runtime to accept parachain candidates from a certain allowed range of historic
+relay-parents. These candidates must be backed by the group assigned to the parachain as-of their corresponding relay
+parents.
 
 ## Protocol
 
-To address the concern of dealing with large numbers of spam candidates or
-statements, the overall design approach is to combine a focused "clustering"
-protocol for legitimate fresh candidates with a broad-distribution "grid"
-protocol to quickly get backed candidates into the hands of many validators.
-Validators do not eagerly send each other heavy `CommittedCandidateReceipt`,
-but instead request these lazily through request/response protocols.
+To address the concern of dealing with large numbers of spam candidates or statements, the overall design approach is to
+combine a focused "clustering" protocol for legitimate fresh candidates with a broad-distribution "grid" protocol to
+quickly get backed candidates into the hands of many validators. Validators do not eagerly send each other heavy
+`CommittedCandidateReceipt`, but instead request these lazily through request/response protocols.
 
 A high-level description of the protocol follows:
 
 ### Messages
 
-Nodes can send each other a few kinds of messages: `Statement`,
-`BackedCandidateManifest`, `BackedCandidateAcknowledgement`.
+Nodes can send each other a few kinds of messages: `Statement`, `BackedCandidateManifest`,
+`BackedCandidateAcknowledgement`.
 
-- `Statement` messages contain only a signed compact statement, without full
-  candidate info.
-- `BackedCandidateManifest` messages advertise a description of a backed
-  candidate and stored statements.
-- `BackedCandidateAcknowledgement` messages acknowledge that a backed candidate
-  is fully known.
+- `Statement` messages contain only a signed compact statement, without full candidate info.
+- `BackedCandidateManifest` messages advertise a description of a backed candidate and stored statements.
+- `BackedCandidateAcknowledgement` messages acknowledge that a backed candidate is fully known.
 
 ### Request/response protocol
 
-Nodes can request the full `CommittedCandidateReceipt` and
-`PersistedValidationData`, along with statements, over a request/response
-protocol. This is the `AttestedCandidateRequest`; the response is
-`AttestedCandidateResponse`.
+Nodes can request the full `CommittedCandidateReceipt` and `PersistedValidationData`, along with statements, over a
+request/response protocol. This is the `AttestedCandidateRequest`; the response is `AttestedCandidateResponse`.
 
 ### Importability and the Hypothetical Frontier
 
-The **prospective parachains** subsystem maintains prospective "fragment trees"
-which can be used to determine whether a particular parachain candidate could
-possibly be included in the future. Candidates which either are within a
-fragment tree or _would be_ part of a fragment tree if accepted are said to be
-in the "hypothetical frontier".
+The **prospective parachains** subsystem maintains prospective "fragment trees" which can be used to determine whether a
+particular parachain candidate could possibly be included in the future. Candidates which either are within a fragment
+tree or _would be_ part of a fragment tree if accepted are said to be in the "hypothetical frontier".
 
-The **statement-distribution** subsystem keeps track of all candidates, and
-updates its knowledge of the hypothetical frontier based on events such as new
-relay parents, new confirmed candidates, and newly backed candidates.
+The **statement-distribution** subsystem keeps track of all candidates, and updates its knowledge of the hypothetical
+frontier based on events such as new relay parents, new confirmed candidates, and newly backed candidates.
 
-We only consider statements as "importable" when the corresponding candidate is
-part of the hypothetical frontier, and only send "importable" statements to the
-backing subsystem itself.
+We only consider statements as "importable" when the corresponding candidate is part of the hypothetical frontier, and
+only send "importable" statements to the backing subsystem itself.
 
 ### Cluster Mode
 
-- Validator nodes are partitioned into groups (with some exceptions), and
-  validators within a group at a relay-parent can send each other `Statement`
-  messages for any candidates within that group and based on that relay-parent.
+- Validator nodes are partitioned into groups (with some exceptions), and validators within a group at a relay-parent
+  can send each other `Statement` messages for any candidates within that group and based on that relay-parent.
 - This is referred to as the "cluster" mode.
-  - Right now these are the same as backing groups, though "cluster"
-    specifically refers to the set of nodes communicating with each other in the
-    first phase of distribution.
+  - Right now these are the same as backing groups, though "cluster" specifically refers to the set of nodes
+    communicating with each other in the first phase of distribution.
 - `Seconded` statements must be sent before `Valid` statements.
-- `Seconded` statements may only be sent to other members of the group when the
-  candidate is fully known by the local validator.
-  - "Fully known" means the validator has the full `CommittedCandidateReceipt`
-    and `PersistedValidationData`, which it receives on request from other
-    validators or from a collator.
-  - The reason for this is that sending a statement (which is always a
-    `CompactStatement` carrying nothing but a hash and signature) to the
-    cluster, is also a signal that the sending node is available to request the
-    candidate from.
-  - This makes the protocol easier to reason about, while also reducing network
-    messages about candidates that don't really exist.
-- Validators in a cluster receiving messages about unknown candidates request
-  the candidate (and statements) from other cluster members which have it.
+- `Seconded` statements may only be sent to other members of the group when the candidate is fully known by the local
+  validator.
+  - "Fully known" means the validator has the full `CommittedCandidateReceipt` and `PersistedValidationData`, which it
+    receives on request from other validators or from a collator.
+  - The reason for this is that sending a statement (which is always a `CompactStatement` carrying nothing but a hash
+    and signature) to the cluster, is also a signal that the sending node is available to request the candidate from.
+  - This makes the protocol easier to reason about, while also reducing network messages about candidates that don't
+    really exist.
+- Validators in a cluster receiving messages about unknown candidates request the candidate (and statements) from other
+  cluster members which have it.
 - Spam considerations
-  - The maximum depth of candidates allowed in asynchronous backing determines
-    the maximum amount of `Seconded` statements originating from a validator V
-    which each validator in a cluster may send to others. This bounds the number
-    of candidates.
-  - There is a small number of validators in each group, which further limits
-    the amount of candidates.
-- We accept candidates which don't fit in the fragment trees of any relay
-  parents.
-  - "Accept" means "attempt to request and store in memory until useful or
-    expired".
-  - We listen to prospective parachains subsystem to learn of new additions to
-    the fragment trees.
+  - The maximum depth of candidates allowed in asynchronous backing determines the maximum amount of `Seconded`
+    statements originating from a validator V which each validator in a cluster may send to others. This bounds the
+    number of candidates.
+  - There is a small number of validators in each group, which further limits the amount of candidates.
+- We accept candidates which don't fit in the fragment trees of any relay parents.
+  - "Accept" means "attempt to request and store in memory until useful or expired".
+  - We listen to prospective parachains subsystem to learn of new additions to the fragment trees.
   - Use this to attempt to import the candidate later.
 
 ### Grid Mode
 
-- Every consensus session provides randomness and a fixed validator set, which
-  is used to build a redundant grid topology.
-  - It's redundant in the sense that there are 2 paths from every node to every
-    other node. See "Grid Topology" section for more details.
-- This grid topology is used to create a sending path from each validator group
-  to every validator.
-- When a node observes a candidate as backed, it sends a
-  `BackedCandidateManifest` to their "receiving" nodes.
+- Every consensus session provides randomness and a fixed validator set, which is used to build a redundant grid
+  topology.
+  - It's redundant in the sense that there are 2 paths from every node to every other node. See "Grid Topology" section
+    for more details.
+- This grid topology is used to create a sending path from each validator group to every validator.
+- When a node observes a candidate as backed, it sends a `BackedCandidateManifest` to their "receiving" nodes.
 - If receiving nodes don't yet know the candidate, they request it.
-- Once they know the candidate, they respond with a
-  `BackedCandidateAcknowledgement`.
-- Once two nodes perform a manifest/acknowledgement exchange, they can send
-  `Statement` messages directly to each other for any new statements they might
-  need.
-  - This limits the amount of statements we'd have to deal with w.r.t.
-    candidates that don't really exist. See "Manifest Exchange" section.
-- There are limitations on the number of candidates that can be advertised by
-  each peer, similar to those in the cluster. Validators do not request
-  candidates which exceed these limitations.
-- Validators request candidates as soon as they are advertised, but do not
-  import the statements until the candidate is part of the hypothetical
-  frontier, and do not re-advertise or acknowledge until the candidate is
-  considered both backable and part of the hypothetical frontier.
-- Note that requesting is not an implicit acknowledgement, and an explicit
-  acknowledgement must be sent upon receipt.
+- Once they know the candidate, they respond with a `BackedCandidateAcknowledgement`.
+- Once two nodes perform a manifest/acknowledgement exchange, they can send `Statement` messages directly to each other
+  for any new statements they might need.
+  - This limits the amount of statements we'd have to deal with w.r.t. candidates that don't really exist. See "Manifest
+    Exchange" section.
+- There are limitations on the number of candidates that can be advertised by each peer, similar to those in the
+  cluster. Validators do not request candidates which exceed these limitations.
+- Validators request candidates as soon as they are advertised, but do not import the statements until the candidate is
+  part of the hypothetical frontier, and do not re-advertise or acknowledge until the candidate is considered both
+  backable and part of the hypothetical frontier.
+- Note that requesting is not an implicit acknowledgement, and an explicit acknowledgement must be sent upon receipt.
 
 ## Messages
 
@@ -161,27 +130,23 @@ backing subsystem itself.
 - `ActiveLeaves`
   - Notification of a change in the set of active leaves.
 - `StatementDistributionMessage::Share`
-  - Notification of a locally-originating statement. That is, this statement
-    comes from our node and should be distributed to other nodes.
-  - Sent by the Backing Subsystem after it successfully imports a
-    locally-originating statement.
+  - Notification of a locally-originating statement. That is, this statement comes from our node and should be
+    distributed to other nodes.
+  - Sent by the Backing Subsystem after it successfully imports a locally-originating statement.
 - `StatementDistributionMessage::Backed`
-  - Notification of a candidate being backed (received enough validity votes
-    from the backing group).
-  - Sent by the Backing Subsystem after it successfully imports a statement for
-    the first time and after sending ~Share~.
+  - Notification of a candidate being backed (received enough validity votes from the backing group).
+  - Sent by the Backing Subsystem after it successfully imports a statement for the first time and after sending
+    ~Share~.
 - `StatementDistributionMessage::NetworkBridgeUpdate`
   - See next section.
 
 #### Network bridge events
 
 - v1 compatibility
-  - Messages for the v1 protocol are routed to the legacy statement
-    distribution.
+  - Messages for the v1 protocol are routed to the legacy statement distribution.
 - `Statement`
   - Notification of a signed statement.
-  - Sent by a peer's Statement Distribution subsystem when circulating
-    statements.
+  - Sent by a peer's Statement Distribution subsystem when circulating statements.
 - `BackedCandidateManifest`
   - Notification of a backed candidate being known by the sending node.
   - For the candidate being requested by the receiving node if needed.
@@ -196,26 +161,23 @@ backing subsystem itself.
 ### Outgoing
 
 - `NetworkBridgeTxMessage::SendValidationMessages`
-  - Sends a peer all pending messages / acknowledgements / statements for a
-    relay parent, either through the cluster or the grid.
+  - Sends a peer all pending messages / acknowledgements / statements for a relay parent, either through the cluster or
+    the grid.
 - `NetworkBridgeTxMessage::SendValidationMessage`
-  - Circulates a compact statement to all peers who need it, either through the
-    cluster or the grid.
+  - Circulates a compact statement to all peers who need it, either through the cluster or the grid.
 - `NetworkBridgeTxMessage::ReportPeer`
   - Reports a peer (either good or bad).
 - `CandidateBackingMessage::Statement`
   - Note a validator's statement about a particular candidate.
 - `ProspectiveParachainsMessage::GetHypotheticalFrontier`
-  - Gets the hypothetical frontier membership of candidates under active leaves'
-    fragment trees.
+  - Gets the hypothetical frontier membership of candidates under active leaves' fragment trees.
 - `NetworkBridgeTxMessage::SendRequests`
   - Sends requests, initiating the request/response protocol.
 
 ## Request/Response
 
-We also have a request/response protocol because validators do not eagerly send
-each other heavy `CommittedCandidateReceipt`, but instead need to request these
-lazily.
+We also have a request/response protocol because validators do not eagerly send each other heavy
+`CommittedCandidateReceipt`, but instead need to request these lazily.
 
 ### Protocol
 
@@ -225,16 +187,13 @@ lazily.
      - Done as needed, when handling incoming manifests/statements.
    - `RequestManager::dispatch_requests` sends any queued-up requests.
       - Calls `RequestManager::next_request` to completion.
-        - Creates the `OutgoingRequest`, saves the receiver in
-          `RequestManager::pending_responses`.
-      - Does nothing if we have more responses pending than the limit of parallel
-        requests.
+        - Creates the `OutgoingRequest`, saves the receiver in `RequestManager::pending_responses`.
+      - Does nothing if we have more responses pending than the limit of parallel requests.
 
 2. Peer
 
    - Requests come in on a peer on the `IncomingRequestReceiver`.
-     - Runs in a background responder task which feeds requests to `answer_request`
-       through `MuxedMessage`.
+     - Runs in a background responder task which feeds requests to `answer_request` through `MuxedMessage`.
      - This responder task has a limit on the number of parallel requests.
    - `answer_request` on the peer takes the request and sends a response.
      - Does this using the response sender on the request.
@@ -243,8 +202,7 @@ lazily.
 
    - `receive_response` on the original validator yields a response.
      - Response was sent on the request's response sender.
-     - Uses `RequestManager::await_incoming` to await on pending responses in an
-       unordered fashion.
+     - Uses `RequestManager::await_incoming` to await on pending responses in an unordered fashion.
      - Runs on the `MuxedMessage` receiver.
    - `handle_response` handles the response.
 
@@ -265,25 +223,23 @@ lazily.
 
 ## Manifests
 
-A manifest is a message about a known backed candidate, along with a description
-of the statements backing it. It can be one of two kinds:
+A manifest is a message about a known backed candidate, along with a description of the statements backing it. It can be
+one of two kinds:
 
-- `Full`: Contains information about the candidate and should be sent to peers
-  who may not have the candidate yet. This is also called an `Announcement`.
-- `Acknowledgement`: Omits information implicit in the candidate, and should be
-  sent to peers which are guaranteed to have the candidate already.
+- `Full`: Contains information about the candidate and should be sent to peers who may not have the candidate yet. This
+  is also called an `Announcement`.
+- `Acknowledgement`: Omits information implicit in the candidate, and should be sent to peers which are guaranteed to
+  have the candidate already.
 
 ### Manifest Exchange
 
-Manifest exchange is when a receiving node received a `Full` manifest and
-replied with an `Acknowledgement`. It indicates that both nodes know the
-candidate as valid and backed. This allows the nodes to send `Statement`
-messages directly to each other for any new statements.
+Manifest exchange is when a receiving node received a `Full` manifest and replied with an `Acknowledgement`. It
+indicates that both nodes know the candidate as valid and backed. This allows the nodes to send `Statement` messages
+directly to each other for any new statements.
 
-Why? This limits the amount of statements we'd have to deal with w.r.t.
-candidates that don't really exist. Limiting out-of-group statement distribution
-between peers to only candidates that both peers agree are backed and exist
-ensures we only have to store statements about real candidates.
+Why? This limits the amount of statements we'd have to deal with w.r.t. candidates that don't really exist. Limiting
+out-of-group statement distribution between peers to only candidates that both peers agree are backed and exist ensures
+we only have to store statements about real candidates.
 
 In practice, manifest exchange means that one of three things have happened:
 
@@ -291,36 +247,31 @@ In practice, manifest exchange means that one of three things have happened:
 - We announced, they acknowledged.
 - We announced, they announced.
 
-Concerning the last case, note that it is possible for two nodes to have each
-other in their sending set. Consider:
+Concerning the last case, note that it is possible for two nodes to have each other in their sending set. Consider:
 
 ```
 1 2
 3 4
 ```
 
-If validators 2 and 4 are in group B, then there is a path `2->1->3` and
-`4->3->1`. Therefore, 1 and 3 might send each other manifests for the same
-candidate at the same time, without having seen the other's yet. This also
-counts as a manifest exchange, but is only allowed to occur in this way.
+If validators 2 and 4 are in group B, then there is a path `2->1->3` and `4->3->1`. Therefore, 1 and 3 might send each
+other manifests for the same candidate at the same time, without having seen the other's yet. This also counts as a
+manifest exchange, but is only allowed to occur in this way.
 
-After the exchange is complete, we update pending statements. Pending statements
-are those we know locally that the remote node does not.
+After the exchange is complete, we update pending statements. Pending statements are those we know locally that the
+remote node does not.
 
 #### Alternative Paths Through The Topology
 
-Nodes should send a `BackedCandidateAcknowledgement(CandidateHash,
-StatementFilter)` notification to any peer which has sent a manifest, and the
-candidate has been acquired by other means. This keeps alternative paths through
-the topology open, which allows nodes to receive additional statements that come
-later, but not after the candidate has been posted on-chain.
+Nodes should send a `BackedCandidateAcknowledgement(CandidateHash, StatementFilter)` notification to any peer which has
+sent a manifest, and the candidate has been acquired by other means. This keeps alternative paths through the topology
+open, which allows nodes to receive additional statements that come later, but not after the candidate has been posted
+on-chain.
 
-This is mostly about the limitation that the runtime has no way for block
-authors to post statements that come after the parablock is posted on-chain and
-ensure those validators still get rewarded. Technically, we only need enough
-statements to back the candidate and the manifest + request will provide that.
-But more statements might come shortly afterwards, and we want those to end up
-on-chain as well to ensure all validators in the group are rewarded.
+This is mostly about the limitation that the runtime has no way for block authors to post statements that come after the
+parablock is posted on-chain and ensure those validators still get rewarded. Technically, we only need enough statements
+to back the candidate and the manifest + request will provide that. But more statements might come shortly afterwards,
+and we want those to end up on-chain as well to ensure all validators in the group are rewarded.
 
 For clarity, here is the full timeline:
 
@@ -333,52 +284,42 @@ For clarity, here is the full timeline:
 
 ## Cluster Module
 
-The cluster module provides direct distribution of unbacked candidates within a
-group. By utilizing this initial phase of propagating only within
-clusters/groups, we bound the number of `Seconded` messages per validator per
-relay-parent, helping us prevent spam. Validators can try to circumvent this,
-but they would only consume a few KB of memory and it is trivially slashable on
-chain.
+The cluster module provides direct distribution of unbacked candidates within a group. By utilizing this initial phase
+of propagating only within clusters/groups, we bound the number of `Seconded` messages per validator per relay-parent,
+helping us prevent spam. Validators can try to circumvent this, but they would only consume a few KB of memory and it is
+trivially slashable on chain.
 
-The cluster module determines whether to accept/reject messages from other
-validators in the same group. It keeps track of what we have sent to other
-validators in the group, and pending statements. For the full protocol, see
-"Protocol".
+The cluster module determines whether to accept/reject messages from other validators in the same group. It keeps track
+of what we have sent to other validators in the group, and pending statements. For the full protocol, see "Protocol".
 
 ## Grid Module
 
-The grid module provides distribution of backed candidates and late statements
-outside the backing group. For the full protocol, see the "Protocol" section.
+The grid module provides distribution of backed candidates and late statements outside the backing group. For the full
+protocol, see the "Protocol" section.
 
 ### Grid Topology
 
-For distributing outside our cluster (aka backing group) we use a 2D grid 
-topology. This limits the amount of peers we send messages to, and handles 
-view updates.
+For distributing outside our cluster (aka backing group) we use a 2D grid topology. This limits the amount of peers we
+send messages to, and handles view updates.
 
 The basic operation of the grid topology is that:
 
-- A validator producing a message sends it to its row-neighbors and its
-  column-neighbors.
-- A validator receiving a message originating from one of its row-neighbors
-  sends it to its column-neighbors.
-- A validator receiving a message originating from one of its column-neighbors
-  sends it to its row-neighbors.
+- A validator producing a message sends it to its row-neighbors and its column-neighbors.
+- A validator receiving a message originating from one of its row-neighbors sends it to its column-neighbors.
+- A validator receiving a message originating from one of its column-neighbors sends it to its row-neighbors.
 
-This grid approach defines 2 unique paths for every validator to reach every
-other validator in at most 2 hops, providing redundancy.
+This grid approach defines 2 unique paths for every validator to reach every other validator in at most 2 hops,
+providing redundancy.
 
 Propagation follows these rules:
 
-- Each node has a receiving set and a sending set. These are different for each
-  group. That is, if a node receives a candidate from group A, it checks if it
-  is allowed to receive from that node for candidates from group A.
+- Each node has a receiving set and a sending set. These are different for each group. That is, if a node receives a
+  candidate from group A, it checks if it is allowed to receive from that node for candidates from group A.
 - For groups that we are in, receive from nobody and send to our X/Y peers.
 - For groups that we are not part of:
-  - We receive from any validator in the group we share a slice with and send to
-    the corresponding X/Y slice in the other dimension.
-  - For any validators we don't share a slice with, we receive from the nodes
-    which share a slice with them.
+  - We receive from any validator in the group we share a slice with and send to the corresponding X/Y slice in the
+    other dimension.
+  - For any validators we don't share a slice with, we receive from the nodes which share a slice with them.
 
 ### Example
 
@@ -391,81 +332,63 @@ For size 11, the matrix would be:
 9 10
 ```
 
-e.g. for index 10, the neighbors would be 1, 4, 7, 9 -- these are the nodes we
-could directly communicate with (e.g. either send to or receive from).
-
-Now, which of these neighbors can 10 receive from? Recall that the
-sending/receiving sets for 10 would be different for different groups. Here are
-some hypothetical scenarios:
-
-- **Scenario 1:** 9 belongs to group A but not 10. Here, 10 can directly receive
-  candidates from group A from 9. 10 would propagate them to the nodes in {1, 4,
-  7} that are not in A.
-- **Scenario 2:** 6 is in group A instead of 9, and 7 is not in group A. 10 can
-  receive group A messages from 7 or 9. 10 will try to relay these messages, but
-  7 and 9 together should have already propagated the message to all x/y 
-  peers of 10. If so, then 10 will just receive acknowledgements in reply rather 
-  than requests.
-- **Scenario 3:** 10 itself is in group A. 10 would not receive candidates from
-  this group from any other nodes through the grid. It would itself send such
-  candidates to all its neighbors that are not in A.
+e.g. for index 10, the neighbors would be 1, 4, 7, 9 -- these are the nodes we could directly communicate with (e.g.
+either send to or receive from).
+
+Now, which of these neighbors can 10 receive from? Recall that the sending/receiving sets for 10 would be different for
+different groups. Here are some hypothetical scenarios:
+
+- **Scenario 1:** 9 belongs to group A but not 10. Here, 10 can directly receive candidates from group A from 9. 10
+  would propagate them to the nodes in {1, 4, 7} that are not in A.
+- **Scenario 2:** 6 is in group A instead of 9, and 7 is not in group A. 10 can receive group A messages from 7 or 9. 10
+  will try to relay these messages, but 7 and 9 together should have already propagated the message to all x/y peers of
+  10. If so, then 10 will just receive acknowledgements in reply rather than requests.
+- **Scenario 3:** 10 itself is in group A. 10 would not receive candidates from this group from any other nodes through
+  the grid. It would itself send such candidates to all its neighbors that are not in A.
 
 ### Seconding Limit
 
-The seconding limit is a per-validator limit. Before asynchronous backing, we
-had a rule that every validator was only allowed to second one candidate per
-relay parent. With asynchronous backing, we have a 'maximum depth' which makes
-it possible to second multiple candidates per relay parent. The seconding limit
-is set to `max depth + 1` to set an upper bound on candidates entering the
-system.
+The seconding limit is a per-validator limit. Before asynchronous backing, we had a rule that every validator was only
+allowed to second one candidate per relay parent. With asynchronous backing, we have a 'maximum depth' which makes it
+possible to second multiple candidates per relay parent. The seconding limit is set to `max depth + 1` to set an upper
+bound on candidates entering the system.
 
 ## Candidates Module
 
-The candidates module provides a tracker for all known candidates in the view,
-whether they are confirmed or not, and how peers have advertised the candidates.
-What is a confirmed candidate? It is a candidate for which we have the full
-receipt and the persisted validation data. This module gets confirmed candidates
-from two sources:
+The candidates module provides a tracker for all known candidates in the view, whether they are confirmed or not, and
+how peers have advertised the candidates. What is a confirmed candidate? It is a candidate for which we have the full
+receipt and the persisted validation data. This module gets confirmed candidates from two sources:
 
-- It can be that a validator fetched a collation directly from the collator and
-  validated it.
-- The first time a validator gets an announcement for an unknown candidate, it
-  will send a request for the candidate. Upon receiving a response and
-  validating it (see `UnhandledResponse::validate_response`), it will mark the
-  candidate as confirmed.
+- It can be that a validator fetched a collation directly from the collator and validated it.
+- The first time a validator gets an announcement for an unknown candidate, it will send a request for the candidate.
+  Upon receiving a response and validating it (see `UnhandledResponse::validate_response`), it will mark the candidate
+  as confirmed.
 
 ## Requests Module
 
-The requests module provides a manager for pending requests for candidate data,
-as well as pending responses. See "Request/Response Protocol" for a high-level
-description of the flow. See module-docs for full details.
+The requests module provides a manager for pending requests for candidate data, as well as pending responses. See
+"Request/Response Protocol" for a high-level description of the flow. See module-docs for full details.
 
 ## Glossary
 
-- **Acknowledgement:** A partial manifest sent to a validator that already has the 
-  candidate to inform them that the sending node also knows the candidate. 
-  Concludes a manifest exchange.
-- **Announcement:** A full manifest indicating that a backed candidate is known by 
-  the sending node. Initiates a manifest exchange.
+- **Acknowledgement:** A partial manifest sent to a validator that already has the candidate to inform them that the
+  sending node also knows the candidate. Concludes a manifest exchange.
+- **Announcement:** A full manifest indicating that a backed candidate is known by the sending node. Initiates a
+  manifest exchange.
 - **Attestation:** See "Statement".
 - **Backable vs. Backed:**
-  - Note that we sometimes use "backed" to refer to candidates that are
-    "backable", but not yet backed on chain.
-  - **Backed** should technically mean that the parablock candidate and its
-    backing statements have been added to a relay chain block.
-  - **Backable** is when the necessary backing statements have been acquired but
-    those statements and the parablock candidate haven't been backed in a relay
-    chain block yet.
-- **Fragment tree:** A parachain fragment not referenced by the relay-chain.
-  It is a tree of prospective parachain blocks.
-- **Manifest:** A message about a known backed candidate, along with a
-  description of the statements backing it. There are two kinds of manifest, 
-  `Acknowledgement` and `Announcement`. See "Manifests" section.
+  - Note that we sometimes use "backed" to refer to candidates that are "backable", but not yet backed on chain.
+  - **Backed** should technically mean that the parablock candidate and its backing statements have been added to a
+    relay chain block.
+  - **Backable** is when the necessary backing statements have been acquired but those statements and the parablock
+    candidate haven't been backed in a relay chain block yet.
+- **Fragment tree:** A parachain fragment not referenced by the relay-chain. It is a tree of prospective parachain
+  blocks.
+- **Manifest:** A message about a known backed candidate, along with a description of the statements backing it. There
+  are two kinds of manifest, `Acknowledgement` and `Announcement`. See "Manifests" section.
 - **Peer:** Another validator that a validator is connected to.
-- **Request/response:** A protocol used to lazily request and receive heavy
-  candidate data when needed.
-- **Reputation:** Tracks reputation of peers. Applies annoyance cost and good
-  behavior benefits.
+- **Request/response:** A protocol used to lazily request and receive heavy candidate data when needed.
+- **Reputation:** Tracks reputation of peers. Applies annoyance cost and good behavior benefits.
 - **Statement:** Signed statements that can be made about parachain candidates.
   - **Seconded:** Proposal of a parachain candidate. Implicit validity vote.
   - **Valid:** States that a parachain candidate is valid.
@@ -474,6 +397,5 @@ description of the flow. See module-docs for full details.
   - **Explicit view** / **immediate view**
     - The view a peer has of the relay chain heads and highest finalized block.
   - **Implicit view**
-    - Derived from the immediate view. Composed of active leaves and minimum
-      relay-parents allowed for candidates of various parachains at those
-      leaves.
+    - Derived from the immediate view. Composed of active leaves and minimum relay-parents allowed for candidates of
+      various parachains at those leaves.
diff --git a/polkadot/roadmap/implementers-guide/src/node/collators/README.md b/polkadot/roadmap/implementers-guide/src/node/collators/README.md
index 3642e415efaba54621eccf98f781e17567f2502d..09edd0c119f36218a9aa2879175eb5cb154f3eb5 100644
--- a/polkadot/roadmap/implementers-guide/src/node/collators/README.md
+++ b/polkadot/roadmap/implementers-guide/src/node/collators/README.md
@@ -1,6 +1,8 @@
 # Collators
 
-Collators are special nodes which bridge a parachain to the relay chain. They are simultaneously full nodes of the parachain, and at least light clients of the relay chain. Their overall contribution to the system is the generation of Proofs of Validity for parachain candidates.
+Collators are special nodes which bridge a parachain to the relay chain. They are simultaneously full nodes of the
+parachain, and at least light clients of the relay chain. Their overall contribution to the system is the generation of
+Proofs of Validity for parachain candidates.
 
-The **Collation Generation** subsystem triggers collators to produce collations
-and then forwards them to **Collator Protocol** to circulate to validators.
+The **Collation Generation** subsystem triggers collators to produce collations and then forwards them to **Collator
+Protocol** to circulate to validators.
diff --git a/polkadot/roadmap/implementers-guide/src/node/collators/collation-generation.md b/polkadot/roadmap/implementers-guide/src/node/collators/collation-generation.md
index 9053ea40f89e8f2407f98d8e2a5b0826135c13f1..05148357f753d6e64f95ed30ec5af278eb7e47bd 100644
--- a/polkadot/roadmap/implementers-guide/src/node/collators/collation-generation.md
+++ b/polkadot/roadmap/implementers-guide/src/node/collators/collation-generation.md
@@ -1,17 +1,18 @@
 # Collation Generation
 
-The collation generation subsystem is executed on collator nodes and produces candidates to be distributed to validators. If configured to produce collations for a para, it produces collations and then feeds them to the [Collator Protocol][CP] subsystem, which handles the networking.
+The collation generation subsystem is executed on collator nodes and produces candidates to be distributed to
+validators. If configured to produce collations for a para, it produces collations and then feeds them to the [Collator
+Protocol][CP] subsystem, which handles the networking.
 
 ## Protocol
 
 Collation generation for Parachains currently works in the following way:
 
-1.  A new relay chain block is imported.
-2.  The collation generation subsystem checks if the core associated to
-    the parachain is free and if yes, continues.
-3.  Collation generation calls our collator callback, if present, to generate a PoV. If none exists, do nothing.
-4.  Authoring logic determines if the current node should build a PoV.
-5.  Build new PoV and give it back to collation generation.
+1. A new relay chain block is imported.
+2. The collation generation subsystem checks if the core associated to the parachain is free and if yes, continues.
+3. Collation generation calls our collator callback, if present, to generate a PoV. If none exists, do nothing.
+4. Authoring logic determines if the current node should build a PoV.
+5. Build new PoV and give it back to collation generation.
 
 ## Messages
 
@@ -22,8 +23,7 @@ Collation generation for Parachains currently works in the following way:
   - Triggers collation generation procedure outlined in "Protocol" section.
 - `CollationGenerationMessage::Initialize`
   - Initializes the subsystem. Carries a config.
-  - No more than one initialization message should ever be sent to the collation
-    generation subsystem.
+  - No more than one initialization message should ever be sent to the collation generation subsystem.
   - Sent by a collator to initialize this subsystem.
 - `CollationGenerationMessage::SubmitCollation`
   - If the subsystem isn't initialized or the relay-parent is too old to be relevant, ignore the message.
@@ -37,7 +37,9 @@ Collation generation for Parachains currently works in the following way:
 
 ## Functionality
 
-The process of generating a collation for a parachain is very parachain-specific. As such, the details of how to do so are left beyond the scope of this description. The subsystem should be implemented as an abstract wrapper, which is aware of this configuration:
+The process of generating a collation for a parachain is very parachain-specific. As such, the details of how to do so
+are left beyond the scope of this description. The subsystem should be implemented as an abstract wrapper, which is
+aware of this configuration:
 
 ```rust
 /// The output of a collator.
@@ -117,30 +119,24 @@ The configuration should be optional, to allow for the case where the node is no
 
 - **Collation (output of a collator)**
 
-  - Contains the PoV (proof to verify the state transition of the
-    parachain) and other data.
+  - Contains the PoV (proof to verify the state transition of the parachain) and other data.
 
 - **Collation result**
 
-  - Contains the collation, and an optional result sender for a
-    collation-seconded signal.
+  - Contains the collation, and an optional result sender for a collation-seconded signal.
 
 - **Collation seconded signal**
 
-  - The signal that is returned when a collation was seconded by a
-    validator.
+  - The signal that is returned when a collation was seconded by a validator.
 
 - **Collation function**
 
-  - Called with the relay chain block the parablock will be built on top
-    of.
+  - Called with the relay chain block the parablock will be built on top of.
   - Called with the validation data.
-    - Provides information about the state of the parachain on the relay
-      chain.
+    - Provides information about the state of the parachain on the relay chain.
 
 - **Collation generation config**
 
-  - Contains collator's authentication key, optional collator function, and
-    parachain ID.
+  - Contains collator's authentication key, optional collator function, and parachain ID.
 
 [CP]: collator-protocol.md
diff --git a/polkadot/roadmap/implementers-guide/src/node/collators/collator-protocol.md b/polkadot/roadmap/implementers-guide/src/node/collators/collator-protocol.md
index 09265a5348475b9f277a0ae5379ce9af3e15da55..1fed671170c7c42f6de97dead0e53200ef5d675f 100644
--- a/polkadot/roadmap/implementers-guide/src/node/collators/collator-protocol.md
+++ b/polkadot/roadmap/implementers-guide/src/node/collators/collator-protocol.md
@@ -1,16 +1,25 @@
 # Collator Protocol
 
-The Collator Protocol implements the network protocol by which collators and validators communicate. It is used by collators to distribute collations to validators and used by validators to accept collations by collators.
+The Collator Protocol implements the network protocol by which collators and validators communicate. It is used by
+collators to distribute collations to validators and used by validators to accept collations by collators.
 
-Collator-to-Validator networking is more difficult than Validator-to-Validator networking because the set of possible collators for any given para is unbounded, unlike the validator set. Validator-to-Validator networking protocols can easily be implemented as gossip because the data can be bounded, and validators can authenticate each other by their `PeerId`s for the purposes of instantiating and accepting connections.
+Collator-to-Validator networking is more difficult than Validator-to-Validator networking because the set of possible
+collators for any given para is unbounded, unlike the validator set. Validator-to-Validator networking protocols can
+easily be implemented as gossip because the data can be bounded, and validators can authenticate each other by their
+`PeerId`s for the purposes of instantiating and accepting connections.
 
-Since, at least at the level of the para abstraction, the collator-set for any given para is unbounded, validators need to make sure that they are receiving connections from capable and honest collators and that their bandwidth and time are not being wasted by attackers. Communicating across this trust-boundary is the most difficult part of this subsystem.
+Since, at least at the level of the para abstraction, the collator-set for any given para is unbounded, validators need
+to make sure that they are receiving connections from capable and honest collators and that their bandwidth and time are
+not being wasted by attackers. Communicating across this trust-boundary is the most difficult part of this subsystem.
 
-Validation of candidates is a heavy task, and furthermore, the [`PoV`][PoV] itself is a large piece of data. Empirically, `PoV`s are on the order of 10MB.
+Validation of candidates is a heavy task, and furthermore, the [`PoV`][PoV] itself is a large piece of data.
+Empirically, `PoV`s are on the order of 10MB.
 
 > TODO: note the incremental validation function Ximin proposes at https://github.com/paritytech/polkadot/issues/1348
 
-As this network protocol serves as a bridge between collators and validators, it communicates primarily with one subsystem on behalf of each. As a collator, this will receive messages from the [`CollationGeneration`][CG] subsystem. As a validator, this will communicate only with the [`CandidateBacking`][CB].
+As this network protocol serves as a bridge between collators and validators, it communicates primarily with one
+subsystem on behalf of each. As a collator, this will receive messages from the [`CollationGeneration`][CG] subsystem.
+As a validator, this will communicate only with the [`CandidateBacking`][CB].
 
 ## Protocol
 
@@ -18,9 +27,9 @@ Input: [`CollatorProtocolMessage`][CPM]
 
 Output:
 
-- [`RuntimeApiMessage`][RAM]
-- [`NetworkBridgeMessage`][NBM]
-- [`CandidateBackingMessage`][CBM]
+* [`RuntimeApiMessage`][RAM]
+* [`NetworkBridgeMessage`][NBM]
+* [`CandidateBackingMessage`][CBM]
 
 ## Functionality
 
@@ -28,7 +37,8 @@ This network protocol uses the `Collation` peer-set of the [`NetworkBridge`][NB]
 
 It uses the [`CollatorProtocolV1Message`](../../types/network.md#collator-protocol) as its `WireMessage`
 
-Since this protocol functions both for validators and collators, it is easiest to go through the protocol actions for each of them separately.
+Since this protocol functions both for validators and collators, it is easiest to go through the protocol actions for
+each of them separately.
 
 Validators and collators.
 ```dot process
@@ -47,24 +57,44 @@ digraph {
 
 ### Collators
 
-It is assumed that collators are only collating on a single parachain. Collations are generated by the [Collation Generation][CG] subsystem. We will keep up to one local collation per relay-parent, based on `DistributeCollation` messages. If the para is not scheduled on any core, at the relay-parent, or the relay-parent isn't in the active-leaves set, we ignore the message as it must be invalid in that case - although this indicates a logic error elsewhere in the node.
+It is assumed that collators are only collating on a single parachain. Collations are generated by the [Collation
+Generation][CG] subsystem. We will keep up to one local collation per relay-parent, based on `DistributeCollation`
+messages. If the para is not scheduled on any core, at the relay-parent, or the relay-parent isn't in the active-leaves
+set, we ignore the message as it must be invalid in that case - although this indicates a logic error elsewhere in the
+node.
 
-We keep track of the Para ID we are collating on as a collator. This starts as `None`, and is updated with each `CollateOn` message received. If the `ParaId` of a collation requested to be distributed does not match the one we expect, we ignore the message.
+We keep track of the Para ID we are collating on as a collator. This starts as `None`, and is updated with each
+`CollateOn` message received. If the `ParaId` of a collation requested to be distributed does not match the one we
+expect, we ignore the message.
 
 As with most other subsystems, we track the active leaves set by following `ActiveLeavesUpdate` signals.
 
-For the purposes of actually distributing a collation, we need to be connected to the validators who are interested in collations on that `ParaId` at this point in time. We assume that there is a discovery API for connecting to a set of validators.
+For the purposes of actually distributing a collation, we need to be connected to the validators who are interested in
+collations on that `ParaId` at this point in time. We assume that there is a discovery API for connecting to a set of
+validators.
 
-As seen in the [Scheduler Module][SCH] of the runtime, validator groups are fixed for an entire session and their rotations across cores are predictable. Collators will want to do these things when attempting to distribute collations at a given relay-parent:
+As seen in the [Scheduler Module][SCH] of the runtime, validator groups are fixed for an entire session and their
+rotations across cores are predictable. Collators will want to do these things when attempting to distribute collations
+at a given relay-parent:
   * Determine which core the para collated-on is assigned to.
   * Determine the group on that core.
-  * Issue a discovery request for the validators of the current group with[`NetworkBridgeMessage`][NBM]`::ConnectToValidators`.
-
-Once connected to the relevant peers for the current group assigned to the core (transitively, the para), advertise the collation to any of them which advertise the relay-parent in their view (as provided by the [Network Bridge][NB]). If any respond with a request for the full collation, provide it. However, we only send one collation at a time per relay parent, other requests need to wait. This is done to reduce the bandwidth requirements of a collator and also increases the chance to fully send the collation to at least one validator. From the point where one validator has received the collation and seconded it, it will also start to share this collation with other validators in its backing group. Upon receiving a view update from any of these peers which includes a relay-parent for which we have a collation that they will find relevant, advertise the collation to them if we haven't already.
+  * Issue a discovery request for the validators of the current group
+    with[`NetworkBridgeMessage`][NBM]`::ConnectToValidators`.
+
+Once connected to the relevant peers for the current group assigned to the core (transitively, the para), advertise the
+collation to any of them which advertise the relay-parent in their view (as provided by the [Network Bridge][NB]). If
+any respond with a request for the full collation, provide it. However, we only send one collation at a time per relay
+parent, other requests need to wait. This is done to reduce the bandwidth requirements of a collator and also increases
+the chance to fully send the collation to at least one validator. From the point where one validator has received the
+collation and seconded it, it will also start to share this collation with other validators in its backing group. Upon
+receiving a view update from any of these peers which includes a relay-parent for which we have a collation that they
+will find relevant, advertise the collation to them if we haven't already.
 
 ### Validators
 
-On the validator side of the protocol, validators need to accept incoming connections from collators. They should keep some peer slots open for accepting new speculative connections from collators and should disconnect from collators who are not relevant.
+On the validator side of the protocol, validators need to accept incoming connections from collators. They should keep
+some peer slots open for accepting new speculative connections from collators and should disconnect from collators who
+are not relevant.
 
 ```dot process
 digraph G {
@@ -98,32 +128,62 @@ digraph G {
 }
 ```
 
-When peers connect to us, they can `Declare` that they represent a collator with given public key and intend to collate on a specific para ID. Once they've declared that, and we checked their signature, they can begin to send advertisements of collations. The peers should not send us any advertisements for collations that are on a relay-parent outside of our view or for a para outside of the one they've declared.
+When peers connect to us, they can `Declare` that they represent a collator with given public key and intend to collate
+on a specific para ID. Once they've declared that, and we checked their signature, they can begin to send advertisements
+of collations. The peers should not send us any advertisements for collations that are on a relay-parent outside of our
+view or for a para outside of the one they've declared.
 
-The protocol tracks advertisements received and the source of the advertisement. The advertisement source is the `PeerId` of the peer who sent the message. We accept one advertisement per collator per source per relay-parent.
+The protocol tracks advertisements received and the source of the advertisement. The advertisement source is the
+`PeerId` of the peer who sent the message. We accept one advertisement per collator per source per relay-parent.
 
-As a validator, we will handle requests from other subsystems to fetch a collation on a specific `ParaId` and relay-parent. These requests are made with the request response protocol `CollationFetchingRequest` request. To do so, we need to first check if we have already gathered a collation on that `ParaId` and relay-parent. If not, we need to select one of the advertisements and issue a request for it. If we've already issued a request, we shouldn't issue another one until the first has returned.
+As a validator, we will handle requests from other subsystems to fetch a collation on a specific `ParaId` and
+relay-parent. These requests are made with the request response protocol `CollationFetchingRequest` request. To do so,
+we need to first check if we have already gathered a collation on that `ParaId` and relay-parent. If not, we need to
+select one of the advertisements and issue a request for it. If we've already issued a request, we shouldn't issue
+another one until the first has returned.
 
-When acting on an advertisement, we issue a `Requests::CollationFetchingV1`. However, we only request one collation at a time per relay parent. This reduces the bandwidth requirements and as we can second only one candidate per relay parent, the others are probably not required anyway. If the request times out, we need to note the collator as being unreliable and reduce its priority relative to other collators.
+When acting on an advertisement, we issue a `Requests::CollationFetchingV1`. However, we only request one collation at a
+time per relay parent. This reduces the bandwidth requirements and as we can second only one candidate per relay parent,
+the others are probably not required anyway. If the request times out, we need to note the collator as being unreliable
+and reduce its priority relative to other collators.
 
-As a validator, once the collation has been fetched some other subsystem will inspect and do deeper validation of the collation. The subsystem will report to this subsystem with a [`CollatorProtocolMessage`][CPM]`::ReportCollator`. In that case, if we are connected directly to the collator, we apply a cost to the `PeerId` associated with the collator and potentially disconnect or blacklist it. If the collation is seconded, we notify the collator and apply a benefit to the `PeerId` associated with the collator.
+As a validator, once the collation has been fetched some other subsystem will inspect and do deeper validation of the
+collation. The subsystem will report to this subsystem with a [`CollatorProtocolMessage`][CPM]`::ReportCollator`. In
+that case, if we are connected directly to the collator, we apply a cost to the `PeerId` associated with the collator
+and potentially disconnect or blacklist it. If the collation is seconded, we notify the collator and apply a benefit to
+the `PeerId` associated with the collator.
 
 ### Interaction with [Candidate Backing][CB]
 
-As collators advertise the availability, a validator will simply second the first valid parablock candidate per relay head by sending a [`CandidateBackingMessage`][CBM]`::Second`. Note that this message contains the relay parent of the advertised collation, the candidate receipt and the [PoV][PoV].
+As collators advertise the availability, a validator will simply second the first valid parablock candidate per relay
+head by sending a [`CandidateBackingMessage`][CBM]`::Second`. Note that this message contains the relay parent of the
+advertised collation, the candidate receipt and the [PoV][PoV].
 
-Subsequently, once a valid parablock candidate has been seconded, the [`CandidateBacking`][CB] subsystem will send a [`CollatorProtocolMessage`][CPM]`::Seconded`, which will trigger this subsystem to notify the collator at the `PeerId` that first advertised the parablock on the seconded relay head of their successful seconding.
+Subsequently, once a valid parablock candidate has been seconded, the [`CandidateBacking`][CB] subsystem will send a
+[`CollatorProtocolMessage`][CPM]`::Seconded`, which will trigger this subsystem to notify the collator at the `PeerId`
+that first advertised the parablock on the seconded relay head of their successful seconding.
 
 
 ## Future Work
 
 Several approaches have been discussed, but all have some issues:
 
-- The current approach is very straightforward. However, that protocol is vulnerable to a single collator which, as an attack or simply through chance, gets its block candidate to the node more often than its fair share of the time.
-- If collators produce blocks via Aura, BABE or in future Sassafras, it may be possible to choose an "Official" collator for the round, but it may be tricky to ensure that the PVF logic is enforced at collator leader election.
-- We could use relay-chain BABE randomness to generate some delay `D` on the order of 1 second, +- 1 second. The collator would then second the first valid parablock which arrives after `D`, or in case none has arrived by `2*D`, the last valid parablock which has arrived. This makes it very hard for a collator to game the system to always get its block nominated, but it reduces the maximum throughput of the system by introducing delay into an already tight schedule.
-- A variation of that scheme would be to have a fixed acceptance window `D` for parablock candidates and keep track of count `C`: the number of parablock candidates received. At the end of the period `D`, we choose a random number I in the range `[0, C)` and second the block at Index I. Its drawback is the same: it must wait the full `D` period before seconding any of its received candidates, reducing throughput.
-- In order to protect against DoS attacks, it may be prudent to run throw out collations from collators that have behaved poorly (whether recently or historically) and subsequently only verify the PoV for the most suitable of collations.
+* The current approach is very straightforward. However, that protocol is vulnerable to a single collator which, as an
+  attack or simply through chance, gets its block candidate to the node more often than its fair share of the time.
+* If collators produce blocks via Aura, BABE or in future Sassafras, it may be possible to choose an "Official" collator
+  for the round, but it may be tricky to ensure that the PVF logic is enforced at collator leader election.
+* We could use relay-chain BABE randomness to generate some delay `D` on the order of 1 second, +* 1 second. The
+  collator would then second the first valid parablock which arrives after `D`, or in case none has arrived by `2*D`,
+  the last valid parablock which has arrived. This makes it very hard for a collator to game the system to always get
+  its block nominated, but it reduces the maximum throughput of the system by introducing delay into an already tight
+  schedule.
+* A variation of that scheme would be to have a fixed acceptance window `D` for parablock candidates and keep track of
+  count `C`: the number of parablock candidates received. At the end of the period `D`, we choose a random number I in
+  the range `[0, C)` and second the block at Index I. Its drawback is the same: it must wait the full `D` period before
+  seconding any of its received candidates, reducing throughput.
+* In order to protect against DoS attacks, it may be prudent to run throw out collations from collators that have
+  behaved poorly (whether recently or historically) and subsequently only verify the PoV for the most suitable of
+  collations.
 
 [CB]: ../backing/candidate-backing.md
 [CBM]: ../../types/overseer-protocol.md#candidate-backing-mesage
diff --git a/polkadot/roadmap/implementers-guide/src/node/disputes/README.md b/polkadot/roadmap/implementers-guide/src/node/disputes/README.md
index a6e126b1534b8548f2f971dbaee095908f6db3c9..36f497114a7315572161f6d3b1caf760437cbe6a 100644
--- a/polkadot/roadmap/implementers-guide/src/node/disputes/README.md
+++ b/polkadot/roadmap/implementers-guide/src/node/disputes/README.md
@@ -4,12 +4,12 @@ If approval voting finds an invalid candidate, a dispute is raised. The disputes
 subsystems are concerned with the following:
 
 1. Disputes can be raised
-2. Disputes (votes) get propagated to all other validators
-3. Votes get recorded as necessary
-3. Nodes will participate in disputes in a sensible fashion
-4. Finality is stopped while a candidate is being disputed on chain
-5. Chains can be reverted in case a dispute concludes invalid
-6. Votes are provided to the provisioner for importing on chain, in order for
+1. Disputes (votes) get propagated to all other validators
+1. Votes get recorded as necessary
+1. Nodes will participate in disputes in a sensible fashion
+1. Finality is stopped while a candidate is being disputed on chain
+1. Chains can be reverted in case a dispute concludes invalid
+1. Votes are provided to the provisioner for importing on chain, in order for
    slashing to work.
 
 The dispute-coordinator subsystem interfaces with the provisioner and chain
diff --git a/polkadot/roadmap/implementers-guide/src/node/disputes/dispute-coordinator.md b/polkadot/roadmap/implementers-guide/src/node/disputes/dispute-coordinator.md
index 7692491fde1f7fbe47bf7ae9fa96a159d15587dd..a9cb2741b0838fb9859435d3e780f16c1025100f 100644
--- a/polkadot/roadmap/implementers-guide/src/node/disputes/dispute-coordinator.md
+++ b/polkadot/roadmap/implementers-guide/src/node/disputes/dispute-coordinator.md
@@ -1,86 +1,64 @@
 # Dispute Coordinator
 
-The coordinator is the central subsystem of the node-side components which
-participate in disputes. It wraps a database, which is used to track statements
-observed by _all_ validators over some window of sessions. Votes older than this
+The coordinator is the central subsystem of the node-side components which participate in disputes. It wraps a database,
+which is used to track statements observed by _all_ validators over some window of sessions. Votes older than this
 session window are pruned.
 
 In particular the dispute-coordinator is responsible for:
 
-- Ensuring that the node is able to raise a dispute in case an invalid candidate
-  is found during approval checking.
-- Ensuring that backing and approval votes will be recorded on chain. With these 
-  votes on chain we can be certain that appropriate targets for slashing will be
-  available for concluded disputes. Also, scraping these votes during a dispute
+- Ensuring that the node is able to raise a dispute in case an invalid candidate is found during approval checking.
+- Ensuring that backing and approval votes will be recorded on chain. With these votes on chain we can be certain that
+  appropriate targets for slashing will be available for concluded disputes. Also, scraping these votes during a dispute
   is necessary for critical spam prevention measures.
 - Ensuring backing votes will never get overridden by explicit votes.
-- Coordinating actual participation in a dispute, ensuring that the node
-  participates in any justified dispute in a way that ensures resolution of
-  disputes on the network even in the case of many disputes raised (flood/DoS
-  scenario).
-- Ensuring disputes resolve, even for candidates on abandoned forks as much as
-  reasonably possible, to rule out "free tries" and thus guarantee our gambler's
-  ruin property.
-- Providing an API for chain selection, so we can prevent finalization of any
-  chain which has included candidates for which a dispute is either ongoing or
-  concluded invalid and avoid building on chains with an included invalid
+- Coordinating actual participation in a dispute, ensuring that the node participates in any justified dispute in a way
+  that ensures resolution of disputes on the network even in the case of many disputes raised (flood/DoS scenario).
+- Ensuring disputes resolve, even for candidates on abandoned forks as much as reasonably possible, to rule out "free
+  tries" and thus guarantee our gambler's ruin property.
+- Providing an API for chain selection, so we can prevent finalization of any chain which has included candidates for
+  which a dispute is either ongoing or concluded invalid and avoid building on chains with an included invalid
   candidate.
-- Providing an API for retrieving (resolved) disputes, including all votes, both
-  implicit (approval, backing) and explicit dispute votes. So validators can get
-  rewarded/slashed accordingly.
+- Providing an API for retrieving (resolved) disputes, including all votes, both implicit (approval, backing) and
+  explicit dispute votes. So validators can get rewarded/slashed accordingly.
 
 ## Ensuring That Disputes Can Be Raised
 
-If a candidate turns out invalid in approval checking, the `approval-voting`
-subsystem will try to issue a dispute. For this, it will send a message
-`DisputeCoordinatorMessage::IssueLocalStatement` to the dispute coordinator,
-indicating to cast an explicit invalid vote. It is the responsibility of the
-dispute coordinator on reception of such a message to create and sign that
-explicit invalid vote and trigger a dispute if none for that candidate is
-already ongoing.
-
-In order to raise a dispute, a node has to be able to provide two opposing votes.
-Given that the reason of the backing phase is to have validators with skin in
-the game, the opposing valid vote will very likely be a backing vote. It could
-also be some already cast approval vote, but the significant point here is: As
-long as we have backing votes available, any node will be able to raise a
-dispute.
-
-Therefore a vital responsibility of the dispute coordinator is to make sure
-backing votes are available for all candidates that might still get disputed. To
-accomplish this task in an efficient way the dispute-coordinator relies on chain
-scraping. Whenever a candidate gets backed on chain, we record in chain storage
-the backing votes imported in that block. This way, given the chain state for a
-given relay chain block, we can retrieve via a provided runtime API the backing
-votes imported by that block. The dispute coordinator makes sure to query those
-votes for any non finalized blocks: In case of missed blocks, it will do chain
-traversal as necessary.
+If a candidate turns out invalid in approval checking, the `approval-voting` subsystem will try to issue a dispute. For
+this, it will send a message `DisputeCoordinatorMessage::IssueLocalStatement` to the dispute coordinator, indicating to
+cast an explicit invalid vote. It is the responsibility of the dispute coordinator on reception of such a message to
+create and sign that explicit invalid vote and trigger a dispute if none for that candidate is already ongoing.
+
+In order to raise a dispute, a node has to be able to provide two opposing votes. Given that the reason of the backing
+phase is to have validators with skin in the game, the opposing valid vote will very likely be a backing vote. It could
+also be some already cast approval vote, but the significant point here is: As long as we have backing votes available,
+any node will be able to raise a dispute.
+
+Therefore a vital responsibility of the dispute coordinator is to make sure backing votes are available for all
+candidates that might still get disputed. To accomplish this task in an efficient way the dispute-coordinator relies on
+chain scraping. Whenever a candidate gets backed on chain, we record in chain storage the backing votes imported in that
+block. This way, given the chain state for a given relay chain block, we can retrieve via a provided runtime API the
+backing votes imported by that block. The dispute coordinator makes sure to query those votes for any non finalized
+blocks: In case of missed blocks, it will do chain traversal as necessary.
 
 Relying on chain scraping is very efficient for two reasons:
 
-1. Votes are already batched. We import all available backing votes for a
-   candidate all at once. If instead we imported votes from candidate-backing as
-   they came along, we would import each vote individually which is
-   inefficient in the current dispute coordinator implementation (quadratic
-   complexity).
-2. We also import less votes in total, as we avoid importing statements for
-   candidates that never got successfully backed on any chain.
-
-It also is secure, because disputes are only ever raised in the approval voting
-phase. A node only starts the approval process after it has seen a candidate
-included on some chain, for that to happen it must have been backed previously.
-Therefore backing votes are available at that point in time. Signals are
-processed first, so even if a block is skipped and we only start importing
-backing votes on the including block, we will have seen the backing votes by the
-time we process messages from approval voting.
-
-In summary, for making it possible for a dispute to be raised, recording of
-backing votes from chain is sufficient and efficient. In particular there is no
-need to preemptively import approval votes, which has shown to be a very
+1. Votes are already batched. We import all available backing votes for a candidate all at once. If instead we imported
+   votes from candidate-backing as they came along, we would import each vote individually which is inefficient in the
+   current dispute coordinator implementation (quadratic complexity).
+2. We also import less votes in total, as we avoid importing statements for candidates that never got successfully
+   backed on any chain.
+
+It also is secure, because disputes are only ever raised in the approval voting phase. A node only starts the approval
+process after it has seen a candidate included on some chain, for that to happen it must have been backed previously.
+Therefore backing votes are available at that point in time. Signals are processed first, so even if a block is skipped
+and we only start importing backing votes on the including block, we will have seen the backing votes by the time we
+process messages from approval voting.
+
+In summary, for making it possible for a dispute to be raised, recording of backing votes from chain is sufficient and
+efficient. In particular there is no need to preemptively import approval votes, which has shown to be a very
 inefficient process. (Quadratic complexity adds up, with 35 votes in total per candidate)
 
-Approval votes are very relevant nonetheless as we are going to see in the next
-section.
+Approval votes are very relevant nonetheless as we are going to see in the next section.
 
 ## Ensuring approval votes will be recorded
 
@@ -88,521 +66,402 @@ section.
 
 Only votes recorded by the dispute coordinator will be considered for slashing.
 
-While there is no need to record approval votes in the dispute coordinator
-preemptively, we make some effort to have any in approval-voting received
-approval votes recorded when a dispute actually happens:
-
-This is not required for concluding the dispute, as nodes send their own vote
-anyway (either explicit valid or their existing approval-vote). What nodes can
-do though, is participating in approval-voting, casting a vote, but later when a
-dispute is raised reconsider their vote and send an explicit invalid vote. If
-they managed to only have that one recorded, then they could avoid a slash.
-
-This is not a problem for our basic security assumptions: The backers are the
-ones to be supposed to have skin in the game, so we are not too woried about
-colluding approval voters getting away slash free as the gambler's ruin property
-is maintained anyway. There is however a separate problem, from colluding
-approval-voters, that is "lazy" approval voters. If it were easy and reliable
-for approval-voters to reconsider their vote, in case of an actual dispute, then
-they don't have a direct incentive (apart from playing a part in securing the
-network) to properly run the validation function at all - they could just always
-vote "valid" totally risk free. (While they would alwasy risk a slash by voting
-invalid.)
-
-
-So we do want to fetch approval votes from approval-voting. Importing votes is
-most efficient when batched. At the same time approval voting and disputes are
-running concurrently so approval votes are expected to trickle in still, when a
+While there is no need to record approval votes in the dispute coordinator preemptively, we make some effort to have any
+in approval-voting received approval votes recorded when a dispute actually happens:
+
+This is not required for concluding the dispute, as nodes send their own vote anyway (either explicit valid or their
+existing approval-vote). What nodes can do though, is participating in approval-voting, casting a vote, but later when a
+dispute is raised reconsider their vote and send an explicit invalid vote. If they managed to only have that one
+recorded, then they could avoid a slash.
+
+This is not a problem for our basic security assumptions: The backers are the ones to be supposed to have skin in the
+game, so we are not too woried about colluding approval voters getting away slash free as the gambler's ruin property is
+maintained anyway. There is however a separate problem, from colluding approval-voters, that is "lazy" approval voters.
+If it were easy and reliable for approval-voters to reconsider their vote, in case of an actual dispute, then they don't
+have a direct incentive (apart from playing a part in securing the network) to properly run the validation function at
+all - they could just always vote "valid" totally risk free. (While they would always risk a slash by voting invalid.)
+
+
+So we do want to fetch approval votes from approval-voting. Importing votes is most efficient when batched. At the same
+time approval voting and disputes are running concurrently so approval votes are expected to trickle in still, when a
 dispute is already ongoing.
 
 Hence, we have the following requirements for importing approval votes:
 
-1. Only import them when there is a dispute, because otherwise we are
-   wasting lots of resources _always_ for the exceptional case of a dispute.
+1. Only import them when there is a dispute, because otherwise we are wasting lots of resources _always_ for the
+   exceptional case of a dispute.
 2. Import votes batched when possible, to avoid quadratic import complexity.
-3. Take into account that approval voting is still ongoing, while a dispute is
-   already running.
-
-With a design where approval voting sends votes to the dispute-coordinator by
-itself, we would need to make approval voting aware of ongoing disputes and once
-it is aware it could start sending all already existing votes batched and
-trickling in votes as they come. The problem with this is, that it adds some
-unnecessary complexity to approval-voting and also we might still import most of
-the votes unbatched one-by-one, depending on what point in time the dispute was
+3. Take into account that approval voting is still ongoing, while a dispute is already running.
+
+With a design where approval voting sends votes to the dispute-coordinator by itself, we would need to make approval
+voting aware of ongoing disputes and once it is aware it could start sending all already existing votes batched and
+trickling in votes as they come. The problem with this is, that it adds some unnecessary complexity to approval-voting
+and also we might still import most of the votes unbatched one-by-one, depending on what point in time the dispute was
 raised.
 
-Instead of the dispute coordinator informing approval-voting of an ongoing
-dispute for it to begin forwarding votes to the dispute coordinator, it makes
-more sense for the dispute-coordinator to just ask approval-voting for votes of
-candidates in dispute. This way, the dispute coordinator can also pick the best
-time for maximizing the number of votes in the batch.
-
-Now the question remains, when should the dispute coordinator ask
-approval-voting for votes?
-
-In fact for slashing it is only relevant to have them once the dispute
-concluded, so we can query approval voting the moment the dispute concludes!
-Two concerns that come to mind, are easily addressed:
-
-1. Timing: We would like to rely as little as possible on implementation details
-   of approval voting. In particular, if the dispute is ongoing for a long time,
-   do we have any guarantees that approval votes are kept around long enough by
-   approval voting? Will approval votes still be present by the time the
-   dispute concludes in all cases? The answer is nuanced, but in general we
-   cannot rely on it. The problem is first, that finalization and
-   approval-voting is an off-chain process so there is no global consensus: As
-   soon as at least f+1 honest (f=n/3, where n is the number of
-   validators/nodes) nodes have seen the dispute conclude, finalization will
-   take place and approval votes will be cleared. This would still be fine, if
-   we had some guarantees that those honest nodes will be able to include those
-   votes in a block. This guarantee does not exist unfortunately, we will
-   discuss the problem and solutions in more detail [below][#Ensuring Chain Import].
-
-   The second problem is that approval-voting will abandon votes as soon as a
-   chain can no longer be finalized (some other/better fork already has been).
-   This second problem can somehow be mitigated by also importing votes as soon
-   as a dispute is detected, but not fully resolved. It is still inherently
-   racy. The good thing is, this should be good enough: We are worried about
-   lazy approval checkers, the system does not need to be perfect. It should be
-   enough if there is some risk of getting caught.
-2. We are not worried about the dispute not concluding, as nodes will always
-   send their own vote, regardless of it being an explict or an already existing
-   approval-vote.
-
-Conclusion: As long as we make sure, if our own approval vote gets imported
-(which would prevent dispute participation) to also distribute it via
-dispute-distribution, disputes can conclude. To mitigate raciness with
-approval-voting deleting votes we will import approval votes twice during a
-dispute: Once when it is raised, to make as sure as possible to see approval
-votes also for abandoned forks and second when the dispute concludes, to
-maximize the amount of potentially malicious approval votes to be recorded. The
-raciness obviously is not fully resolved by this, but this is fine as argued
-above.
+Instead of the dispute coordinator informing approval-voting of an ongoing dispute for it to begin forwarding votes to
+the dispute coordinator, it makes more sense for the dispute-coordinator to just ask approval-voting for votes of
+candidates in dispute. This way, the dispute coordinator can also pick the best time for maximizing the number of votes
+in the batch.
+
+Now the question remains, when should the dispute coordinator ask approval-voting for votes?
+
+In fact for slashing it is only relevant to have them once the dispute concluded, so we can query approval voting the
+moment the dispute concludes! Two concerns that come to mind, are easily addressed:
+
+1. Timing: We would like to rely as little as possible on implementation details of approval voting. In particular, if
+   the dispute is ongoing for a long time, do we have any guarantees that approval votes are kept around long enough by
+   approval voting? Will approval votes still be present by the time the dispute concludes in all cases? The answer is
+   nuanced, but in general we cannot rely on it. The problem is first, that finalization and approval-voting is an
+   off-chain process so there is no global consensus: As soon as at least f+1 honest (f=n/3, where n is the number of
+   validators/nodes) nodes have seen the dispute conclude, finalization will take place and approval votes will be
+   cleared. This would still be fine, if we had some guarantees that those honest nodes will be able to include those
+   votes in a block. This guarantee does not exist unfortunately, we will discuss the problem and solutions in more
+   detail [below][#Ensuring Chain Import].
+
+   The second problem is that approval-voting will abandon votes as soon as a chain can no longer be finalized (some
+   other/better fork already has been). This second problem can somehow be mitigated by also importing votes as soon as
+   a dispute is detected, but not fully resolved. It is still inherently racy. The good thing is, this should be good
+   enough: We are worried about lazy approval checkers, the system does not need to be perfect. It should be enough if
+   there is some risk of getting caught.
+2. We are not worried about the dispute not concluding, as nodes will always send their own vote, regardless of it being
+   an explicit or an already existing approval-vote.
+
+Conclusion: As long as we make sure, if our own approval vote gets imported (which would prevent dispute participation)
+to also distribute it via dispute-distribution, disputes can conclude. To mitigate raciness with approval-voting
+deleting votes we will import approval votes twice during a dispute: Once when it is raised, to make as sure as possible
+to see approval votes also for abandoned forks and second when the dispute concludes, to maximize the amount of
+potentially malicious approval votes to be recorded. The raciness obviously is not fully resolved by this, but this is
+fine as argued above.
 
 Ensuring vote import on chain is covered in the next section.
 
-What we don't care about is that honest approval-voters will likely validate
-twice, once in approval voting and once via dispute-participation. Avoiding that
-does not really seem worthwhile though, as disputes are for one exceptional, so
-a little wasted effort won't affect everyday performance - second, even with
-eager importing of approval votes, those doubled work is still present as
-disputes and approvals are racing. Every time participation is faster than
-approval, a node would do double work.
+What we don't care about is that honest approval-voters will likely validate twice, once in approval voting and once via
+dispute-participation. Avoiding that does not really seem worthwhile though, as disputes are for one exceptional, so a
+little wasted effort won't affect everyday performance - second, even with eager importing of approval votes, those
+doubled work is still present as disputes and approvals are racing. Every time participation is faster than approval, a
+node would do double work.
 
 ### Ensuring Chain Import
 
-While in the previous section we discussed means for nodes to ensure relevant
-votes are recorded so lazy approval checkers get slashed properly, it is crucial
-to also discuss the actual chain import. Only if we guarantee that recorded votes
-will get imported on chain (on all potential chains really) we will succeed
-in executing slashes. Particularly we need to make sure backing votes end up on
-chain consistently.
-
-Dispute distribution will make sure all explicit dispute votes get distributed
-among nodes which includes current block producers (current authority set) which
-is an important property: If the dispute carries on across an era change, we
-need to ensure that the new validator set will learn about any disputes and
-their votes, so they can put that information on chain. Dispute-distribution
-luckily has this property and always sends votes to the current authority set.
-The issue is, for dispute-distribution, nodes send only their own explicit (or
-in some cases their approval vote) in addition to some opposing vote. This
-guarantees that at least some backing or approval vote will be present at the
-block producer, but we don't have a 100% guarantee to have votes for all
-backers, even less for approval checkers.
-
-Reason for backing votes: While backing votes will be present on at least some
-chain, that does not mean that any such chain is still considered for block
-production in the current set - they might only exist on an already abandoned
-fork. This means a block producer that just joined the set, might not have seen
-any of them.
-
-For approvals it is even more tricky and less necessary: Approval voting together
-with finalization is a completely off-chain process therefore those protocols
-don't care about block production at all. Approval votes only have a guarantee of
-being propagated between the nodes that are responsible for finalizing the
-concerned blocks. This implies that on an era change the current authority set,
-will not necessarily get informed about any approval votes for the previous era.
-Hence even if all validators of the previous era successfully recorded all approval
-votes in the dispute coordinator, they won't get a chance to put them on chain,
-hence they won't be considered for slashing.
-
-It is important to note, that the essential properties of the system still hold:
-Dispute-distribution will distribute at _least one_ "valid" vote to the current
-authority set, hence at least one node will get slashed in case of outcome
-"invalid". Also in reality the validator set is rarely exchanged 100%, therefore
-in practice some validators in the current authority set will overlap with the
-ones in the previous set and will be able to record votes on chain.
-
-Still, for maximum accountability we need to make sure a previous authority set
-can communicate votes to the next one, regardless of any chain: This is yet to
-be implemented see section "Resiliency" in dispute-distribution and
+While in the previous section we discussed means for nodes to ensure relevant votes are recorded so lazy approval
+checkers get slashed properly, it is crucial to also discuss the actual chain import. Only if we guarantee that recorded
+votes will get imported on chain (on all potential chains really) we will succeed in executing slashes. Particularly we
+need to make sure backing votes end up on chain consistently.
+
+Dispute distribution will make sure all explicit dispute votes get distributed among nodes which includes current block
+producers (current authority set) which is an important property: If the dispute carries on across an era change, we
+need to ensure that the new validator set will learn about any disputes and their votes, so they can put that
+information on chain. Dispute-distribution luckily has this property and always sends votes to the current authority
+set. The issue is, for dispute-distribution, nodes send only their own explicit (or in some cases their approval vote)
+in addition to some opposing vote. This guarantees that at least some backing or approval vote will be present at the
+block producer, but we don't have a 100% guarantee to have votes for all backers, even less for approval checkers.
+
+Reason for backing votes: While backing votes will be present on at least some chain, that does not mean that any such
+chain is still considered for block production in the current set - they might only exist on an already abandoned fork.
+This means a block producer that just joined the set, might not have seen any of them.
+
+For approvals it is even more tricky and less necessary: Approval voting together with finalization is a completely
+off-chain process therefore those protocols don't care about block production at all. Approval votes only have a
+guarantee of being propagated between the nodes that are responsible for finalizing the concerned blocks. This implies
+that on an era change the current authority set, will not necessarily get informed about any approval votes for the
+previous era. Hence even if all validators of the previous era successfully recorded all approval votes in the dispute
+coordinator, they won't get a chance to put them on chain, hence they won't be considered for slashing.
+
+It is important to note, that the essential properties of the system still hold: Dispute-distribution will distribute at
+_least one_ "valid" vote to the current authority set, hence at least one node will get slashed in case of outcome
+"invalid". Also in reality the validator set is rarely exchanged 100%, therefore in practice some validators in the
+current authority set will overlap with the ones in the previous set and will be able to record votes on chain.
+
+Still, for maximum accountability we need to make sure a previous authority set can communicate votes to the next one,
+regardless of any chain: This is yet to be implemented see section "Resiliency" in dispute-distribution and
 [this](https://github.com/paritytech/polkadot/issues/3398) ticket.
 
 ## Coordinating Actual Dispute Participation
 
-Once the dispute coordinator learns about a dispute, it is its responsibility to
-make sure the local node participates in that dispute.
+Once the dispute coordinator learns about a dispute, it is its responsibility to make sure the local node participates
+in that dispute.
 
-The dispute coordinator learns about a dispute by importing votes from either
-chain scraping or from dispute-distribution. If it finds opposing votes (always
-the case when coming from dispute-distribution), it records the presence of a
-dispute. Then, in case it does not find any local vote for that dispute already,
-it needs to trigger participation in the dispute (see previous section for
-considerations when the found local vote is an approval vote).
+The dispute coordinator learns about a dispute by importing votes from either chain scraping or from
+dispute-distribution. If it finds opposing votes (always the case when coming from dispute-distribution), it records the
+presence of a dispute. Then, in case it does not find any local vote for that dispute already, it needs to trigger
+participation in the dispute (see previous section for considerations when the found local vote is an approval vote).
 
-Participation means, recovering availability and re-evaluating the POV. The
-result of that validation (either valid or invalid) will be the node's vote on
-that dispute: Either explicit "invalid" or "valid". The dispute coordinator will
-inform `dispute-distribution` about our vote and `dispute-distribution` will make
-sure that our vote gets distributed to all other validators.
+Participation means, recovering availability and re-evaluating the POV. The result of that validation (either valid or
+invalid) will be the node's vote on that dispute: Either explicit "invalid" or "valid". The dispute coordinator will
+inform `dispute-distribution` about our vote and `dispute-distribution` will make sure that our vote gets distributed to
+all other validators.
 
-Nothing ever is that easy though. We can not blindly import anything that comes
-along and trigger participation no matter what.
+Nothing ever is that easy though. We can not blindly import anything that comes along and trigger participation no
+matter what.
 
 ### Spam Considerations
 
-In Polkadot's security model, it is important that attempts to attack the system
-result in a slash of the offenders. Therefore we need to make sure that this
-slash is actually happening. Attackers could try to prevent the slashing from
-taking place, by overwhelming validators with disputes in such a way that no
-single dispute ever concludes, because nodes are busy processing newly incoming
-ones. Other attacks are imaginable as well, like raising disputes for candidates
-that don't exist, just filling up everyone's disk slowly or worse making nodes
-try to participate, which will result in lots of network requests for recovering
-availability.
-
-The last point brings up a significant consideration in general: Disputes are
-about escalation: Every node will suddenly want to check, instead of only a few.
-A single message will trigger the whole network to start significant amount of
-work and will cause lots of network traffic and messages. Hence the
-dispute system is very susceptible to being a brutal amplifier for DoS attacks,
-resulting in DoS attacks to become very easy and cheap, if we are not careful.
-
-One counter measure we are taking is making raising of disputes a costly thing:
-If you raise a dispute, because you claim a candidate is invalid, although it is
-in fact valid - you will get slashed, hence you pay for consuming those
-resources. The issue is: This only works if the dispute concerns a candidate
-that actually exists!
-
-If a node raises a dispute for a candidate that never got included (became
-available) on any chain, then the dispute can never conclude, hence nobody gets
-slashed. It makes sense to point out that this is less bad than it might sound
-at first, as trying to participate in a dispute for a non existing candidate is
-"relatively" cheap. Each node will send out a few hundred tiny request messages
-for availability chunks, which all will end up in a tiny response "NoSuchChunk"
-and then no participation will actually happen as there is nothing to
-participate. Malicious nodes could provide chunks, which would make things more
-costly, but at the full expense of the attackers bandwidth - no amplification
-here. I am bringing that up for completeness only: Triggering a thousand nodes
-to send out a thousand tiny network messages by just sending out a single
-garbage message, is still a significant amplification and is nothing to ignore -
-this could absolutely be used to cause harm!
+In Polkadot's security model, it is important that attempts to attack the system result in a slash of the offenders.
+Therefore we need to make sure that this slash is actually happening. Attackers could try to prevent the slashing from
+taking place, by overwhelming validators with disputes in such a way that no single dispute ever concludes, because
+nodes are busy processing newly incoming ones. Other attacks are imaginable as well, like raising disputes for
+candidates that don't exist, just filling up everyone's disk slowly or worse making nodes try to participate, which will
+result in lots of network requests for recovering availability.
+
+The last point brings up a significant consideration in general: Disputes are about escalation: Every node will suddenly
+want to check, instead of only a few. A single message will trigger the whole network to start significant amount of
+work and will cause lots of network traffic and messages. Hence the dispute system is very susceptible to being a brutal
+amplifier for DoS attacks, resulting in DoS attacks to become very easy and cheap, if we are not careful.
+
+One counter measure we are taking is making raising of disputes a costly thing: If you raise a dispute, because you
+claim a candidate is invalid, although it is in fact valid - you will get slashed, hence you pay for consuming those
+resources. The issue is: This only works if the dispute concerns a candidate that actually exists!
+
+If a node raises a dispute for a candidate that never got included (became available) on any chain, then the dispute can
+never conclude, hence nobody gets slashed. It makes sense to point out that this is less bad than it might sound at
+first, as trying to participate in a dispute for a non existing candidate is "relatively" cheap. Each node will send out
+a few hundred tiny request messages for availability chunks, which all will end up in a tiny response "NoSuchChunk" and
+then no participation will actually happen as there is nothing to participate. Malicious nodes could provide chunks,
+which would make things more costly, but at the full expense of the attackers bandwidth - no amplification here. I am
+bringing that up for completeness only: Triggering a thousand nodes to send out a thousand tiny network messages by just
+sending out a single garbage message, is still a significant amplification and is nothing to ignore - this could
+absolutely be used to cause harm!
 
 ### Participation
 
-As explained, just blindly participating in any "dispute" that comes along is
-not a good idea. First we would like to make sure the dispute is actually
-genuine, to prevent cheap DoS attacks. Secondly, in case of genuine disputes, we
-would like to conclude one after the other, in contrast to
-processing all at the same time, slowing down progress on all of them, bringing
-individual processing to a complete halt in the worst case (nodes get overwhelmed
-at some stage in the pipeline).
-
-To ensure to only spend significant work on genuine disputes, we only trigger
-participation at all on any _vote import_ if any of the following holds true:
-
-- We saw the disputed candidate included in some not yet finalized block on at
-  least one fork of the chain.
-- We have seen the disputed candidate backed in some not yet finalized block on
-  at least one fork of the chain. This ensures the candidate is at least not
-  completely made up and there has been some effort already flown into that
-  candidate. Generally speaking a dispute shouldn't be raised for a candidate
-  which is backed but is not yet included. Disputes are raised during approval
-  checking. We participate on such disputes as a precaution - maybe we haven't
-  seen the `CandidateIncluded` event yet?
-- The dispute is already confirmed: Meaning that 1/3+1 nodes already
-  participated, as this suggests in our threat model that there was at least one
-  honest node that already voted, so the dispute must be genuine.
-
-Note: A node might be out of sync with the chain and we might only learn about a
-block, including a candidate, after we learned about the dispute. This means, we
-have to re-evaluate participation decisions on block import!
-
-With this, nodes won't waste significant resources on completely made up
-candidates. The next step is to process dispute participation in a (globally)
-ordered fashion. Meaning a majority of validators should arrive at at least
-roughly at the same ordering of participation, for disputes to get resolved one
-after another. This order is only relevant if there are lots of disputes, so we
-obviously only need to worry about order if participations start queuing up.
-
-We treat participation for candidates that we have seen included with priority
-and put them on a priority queue which sorts participation based on the block
-number of the relay parent of the candidate and for candidates with the same
-relay parent height further by the `CandidateHash`. This ordering is globally
-unique and also prioritizes older candidates.
-
-The latter property makes sense, because if an older candidate turns out invalid,
-we can roll back the full chain at once. If we resolved earlier disputes first
-and they turned out invalid as well, we might need to roll back a couple of
-times instead of just once to the oldest offender. This is obviously a good
-idea, in particular it makes it impossible for an attacker to prevent rolling
-back a very old candidate, by keeping raising disputes for newer candidates.
-
-For candidates we have not seen included, but we know are backed (thanks to
-chain scraping) or we have seen a dispute with 1/3+1 participation (confirmed
-dispute) on them - we put participation on a best-effort queue. It has got the
-same ordering as the priority one - by block heights of the relay parent, older
-blocks are with priority. There is a possibility not to be able to obtain the
-block number of the parent when we are inserting the dispute in the queue. To
-account for races, we will promote any existing participation request to the
-priority queue once we learn about an including block. NOTE: this is still work
-in progress and is tracked by [this
+As explained, just blindly participating in any "dispute" that comes along is not a good idea. First we would like to
+make sure the dispute is actually genuine, to prevent cheap DoS attacks. Secondly, in case of genuine disputes, we would
+like to conclude one after the other, in contrast to processing all at the same time, slowing down progress on all of
+them, bringing individual processing to a complete halt in the worst case (nodes get overwhelmed at some stage in the
+pipeline).
+
+To ensure to only spend significant work on genuine disputes, we only trigger participation at all on any _vote import_
+if any of the following holds true:
+
+- We saw the disputed candidate included in some not yet finalized block on at least one fork of the chain.
+- We have seen the disputed candidate backed in some not yet finalized block on at least one fork of the chain. This
+  ensures the candidate is at least not completely made up and there has been some effort already flown into that
+  candidate. Generally speaking a dispute shouldn't be raised for a candidate which is backed but is not yet included.
+  Disputes are raised during approval checking. We participate on such disputes as a precaution - maybe we haven't seen
+  the `CandidateIncluded` event yet?
+- The dispute is already confirmed: Meaning that 1/3+1 nodes already participated, as this suggests in our threat model
+  that there was at least one honest node that already voted, so the dispute must be genuine.
+
+Note: A node might be out of sync with the chain and we might only learn about a block, including a candidate, after we
+learned about the dispute. This means, we have to re-evaluate participation decisions on block import!
+
+With this, nodes won't waste significant resources on completely made up candidates. The next step is to process dispute
+participation in a (globally) ordered fashion. Meaning a majority of validators should arrive at at least roughly at the
+same ordering of participation, for disputes to get resolved one after another. This order is only relevant if there are
+lots of disputes, so we obviously only need to worry about order if participations start queuing up.
+
+We treat participation for candidates that we have seen included with priority and put them on a priority queue which
+sorts participation based on the block number of the relay parent of the candidate and for candidates with the same
+relay parent height further by the `CandidateHash`. This ordering is globally unique and also prioritizes older
+candidates.
+
+The latter property makes sense, because if an older candidate turns out invalid, we can roll back the full chain at
+once. If we resolved earlier disputes first and they turned out invalid as well, we might need to roll back a couple of
+times instead of just once to the oldest offender. This is obviously a good idea, in particular it makes it impossible
+for an attacker to prevent rolling back a very old candidate, by keeping raising disputes for newer candidates.
+
+For candidates we have not seen included, but we know are backed (thanks to chain scraping) or we have seen a dispute
+with 1/3+1 participation (confirmed dispute) on them - we put participation on a best-effort queue. It has got the same
+ordering as the priority one - by block heights of the relay parent, older blocks are with priority. There is a
+possibility not to be able to obtain the block number of the parent when we are inserting the dispute in the queue. To
+account for races, we will promote any existing participation request to the priority queue once we learn about an
+including block. NOTE: this is still work in progress and is tracked by [this
 issue](https://github.com/paritytech/polkadot/issues/5875).
 
 ### Abandoned Forks
 
-Finalization: As mentioned we care about included and backed candidates on any
-non-finalized chain, given that any disputed chain will not get finalized, we
-don't need to care about finalized blocks, but what about forks that fall behind
-the finalized chain in terms of block number? For those we would still like to
-be able to participate in any raised disputes, otherwise attackers might be able
-to avoid a slash if they manage to create a better fork after they learned about
-the approval checkers. Therefore we do care about those forks even after they
-have fallen behind the finalized chain.
-
-For simplicity we also care about the actual finalized chain (not just forks) up
-to a certain depth. We do have to limit the depth, because otherwise we open a
-DoS vector again. The depth (into the finalized chain) should be oriented on the
-approval-voting execution timeout, in particular it should be significantly
-larger. Otherwise by the time the execution is allowed to finish, we already
-dropped information about those candidates and the dispute could not conclude.
+Finalization: As mentioned we care about included and backed candidates on any non-finalized chain, given that any
+disputed chain will not get finalized, we don't need to care about finalized blocks, but what about forks that fall
+behind the finalized chain in terms of block number? For those we would still like to be able to participate in any
+raised disputes, otherwise attackers might be able to avoid a slash if they manage to create a better fork after they
+learned about the approval checkers. Therefore we do care about those forks even after they have fallen behind the
+finalized chain.
+
+For simplicity we also care about the actual finalized chain (not just forks) up to a certain depth. We do have to limit
+the depth, because otherwise we open a DoS vector again. The depth (into the finalized chain) should be oriented on the
+approval-voting execution timeout, in particular it should be significantly larger. Otherwise by the time the execution
+is allowed to finish, we already dropped information about those candidates and the dispute could not conclude.
 
 ## Import
 
 ### Spam Considerations
 
-In the last section we looked at how to treat queuing participations to
-handle heavy dispute load well. This already ensures, that honest nodes won't
-amplify cheap DoS attacks. There is one minor issue remaining: Even if we delay
-participation until we have some confirmation of the authenticity of the
-dispute, we should also not blindly import all votes arriving into the database
-as this might be used to just slowly fill up disk space, until the node is no
-longer functional. This leads to our last protection mechanism at the dispute
-coordinator level (dispute-distribution also has its own), which is spam slots.
-For each import containing an invalid vote, where we don't know whether it might
-be spam or not we increment a counter for each signing participant of explicit
-`invalid` votes.
-
-What votes do we treat as a potential spam? A vote will increase a spam slot if
-and only if all of the following conditions are satisfied:
-
-* the candidate under dispute was not seen included nor backed on any chain
-* the dispute is not confirmed
-* we haven't cast a vote for the dispute
-
-Whenever any vote on a dispute is imported these conditions are checked. If the
-dispute is found not to be potential spam, then spam slots for the disputed candidate hash are cleared. This decrements the spam count for every validator
+In the last section we looked at how to treat queuing participations to handle heavy dispute load well. This already
+ensures, that honest nodes won't amplify cheap DoS attacks. There is one minor issue remaining: Even if we delay
+participation until we have some confirmation of the authenticity of the dispute, we should also not blindly import all
+votes arriving into the database as this might be used to just slowly fill up disk space, until the node is no longer
+functional. This leads to our last protection mechanism at the dispute coordinator level (dispute-distribution also has
+its own), which is spam slots. For each import containing an invalid vote, where we don't know whether it might be spam
+or not we increment a counter for each signing participant of explicit `invalid` votes.
+
+What votes do we treat as a potential spam? A vote will increase a spam slot if and only if all of the following
+conditions are satisfied:
+
+- the candidate under dispute was not seen included nor backed on any chain
+- the dispute is not confirmed
+- we haven't cast a vote for the dispute
+
+Whenever any vote on a dispute is imported these conditions are checked. If the dispute is found not to be potential
+spam, then spam slots for the disputed candidate hash are cleared. This decrements the spam count for every validator
 which had voted invalid.
 
-To keep spam slots from filling up unnecessarily we want to clear spam slots
-whenever a candidate is seen to be backed or included. Fortunately this behavior
-is acheived by clearing slots on vote import as described above. Because on chain
-backing votes are processed when a block backing the disputed candidate is discovered, spam slots are cleared for every backed candidate. Included
-candidates have also been seen as backed on the same fork, so decrementing spam
-slots is handled in that case as well.
-
-The reason this works is because we only need to worry about actual dispute
-votes. Import of backing votes are already rate limited and concern only real
-candidates. For approval votes a similar argument holds (if they come from
-approval-voting), but we also don't import them until a dispute already
-concluded. For actual dispute votes we need two opposing votes, so there must be
-an explicit `invalid` vote in the import. Only a third of the validators can be
-malicious, so spam disk usage is limited to `2*vote_size*n/3*NUM_SPAM_SLOTS`, with
-`n` being the number of validators.
+To keep spam slots from filling up unnecessarily we want to clear spam slots whenever a candidate is seen to be backed
+or included. Fortunately this behavior is achieved by clearing slots on vote import as described above. Because on chain
+backing votes are processed when a block backing the disputed candidate is discovered, spam slots are cleared for every
+backed candidate. Included candidates have also been seen as backed on the same fork, so decrementing spam slots is
+handled in that case as well.
+
+The reason this works is because we only need to worry about actual dispute votes. Import of backing votes are already
+rate limited and concern only real candidates. For approval votes a similar argument holds (if they come from
+approval-voting), but we also don't import them until a dispute already concluded. For actual dispute votes we need two
+opposing votes, so there must be an explicit `invalid` vote in the import. Only a third of the validators can be
+malicious, so spam disk usage is limited to `2*vote_size*n/3*NUM_SPAM_SLOTS`, with `n` being the number of validators.
 
 ### Backing Votes
 
-Backing votes are in some way special. For starters they are the only valid
-votes that are guaranteed to exist for any valid dispute to be raised. Second
-they are the only votes that commit to a shorter execution timeout
-`BACKING_EXECUTION_TIMEOUT`, compared to a more lenient timeout used in approval
-voting. To account properly for execution time variance across machines,
-slashing might treat backing votes differently (more aggressively) than other
-voting `valid` votes. Hence in import we shall never override a backing vote
-with another valid vote. They can not be assumed to be interchangeable.
+Backing votes are in some way special. For starters they are the only valid votes that are guaranteed to exist for any
+valid dispute to be raised. Second they are the only votes that commit to a shorter execution timeout
+`BACKING_EXECUTION_TIMEOUT`, compared to a more lenient timeout used in approval voting. To account properly for
+execution time variance across machines, slashing might treat backing votes differently (more aggressively) than other
+voting `valid` votes. Hence in import we shall never override a backing vote with another valid vote. They can not be
+assumed to be interchangeable.
 
 ## Attacks & Considerations
 
-The following attacks on the priority queue and best-effort queues are
-considered in above design.
+The following attacks on the priority queue and best-effort queues are considered in above design.
 
 ### Priority Queue
 
-On the priority queue, we will only queue participations for candidates we have
-seen included on any chain. Any attack attempt would start with a candidate
-included on some chain, but an attacker could try to only reveal the including
-relay chain blocks to just some honest validators and stop as soon as it learns
-that some honest validator would have a relevant approval assignment.
+On the priority queue, we will only queue participations for candidates we have seen included on any chain. Any attack
+attempt would start with a candidate included on some chain, but an attacker could try to only reveal the including
+relay chain blocks to just some honest validators and stop as soon as it learns that some honest validator would have a
+relevant approval assignment.
 
-Without revealing the including block to any honest validator, we don't really
-have an attack yet. Once the block is revealed though, the above is actually
-very hard. Each honest validator will re-distribute the block it just learned
-about. This means an attacker would need to pull of a targeted DoS attack, which
-allows the validator to send its assignment, but prevents it from forwarding and
-sharing the relay chain block.
+Without revealing the including block to any honest validator, we don't really have an attack yet. Once the block is
+revealed though, the above is actually very hard. Each honest validator will re-distribute the block it just learned
+about. This means an attacker would need to pull of a targeted DoS attack, which allows the validator to send its
+assignment, but prevents it from forwarding and sharing the relay chain block.
 
-This sounds already hard enough, provided that we also start participation if
-we learned about an including block after the dispute has been raised already
-(we need to update participation queues on new leaves), but to be even safer
-we choose to have an additional best-effort queue.
+This sounds already hard enough, provided that we also start participation if we learned about an including block after
+the dispute has been raised already (we need to update participation queues on new leaves), but to be even safer we
+choose to have an additional best-effort queue.
 
 ### Best-Effort Queue
 
-While attacking the priority queue is already pretty hard, attacking the
-best-effort queue is even harder. For a candidate to be a threat, it has to be
-included on some chain. For it to be included, it has to have been backed before
-and at least n/3 honest nodes must have seen that block, so availability
-(inclusion) can be reached. Making a full third of the nodes not further
-propagate a block, while at the same time allowing them to fetch chunks, sign
-and distribute bitfields seems almost infeasible and even if accomplished, those
-nodes would be enough to confirm a dispute and we have not even touched the
-above fact that in addition, for an attack, the following including block must
-be shared with honest validators as well.
-
-It is worth mentioning that a successful attack on the priority queue as
-outlined above is already outside of our threat model, as it assumes n/3
-malicious nodes + additionally malfunctioning/DoSed nodes. Even more so for
-attacks on the best-effort queue, as our threat model only allows for n/3
-malicious _or_ malfunctioning nodes in total. It would therefore be a valid
-decision to ditch the best-effort queue, if it proves to become a burden or
-creates other issues.
-
-One issue we should not be worried about though is spam. For abusing best-effort
-for spam, the following scenario would be necessary:
-
-An attacker controls a backing group: The attacker can then have candidates
-backed and choose to not provide chunks. This should come at a cost to miss out
-on rewards for backing, so is not free. At the same time it is rate limited, as
-a backing group can only back so many candidates legitimately. (~ 1 per slot):
-
-1. They have to wait until a malicious actor becomes block producer (for causing
-  additional forks via equivocation for example).
+While attacking the priority queue is already pretty hard, attacking the best-effort queue is even harder. For a
+candidate to be a threat, it has to be included on some chain. For it to be included, it has to have been backed before
+and at least n/3 honest nodes must have seen that block, so availability (inclusion) can be reached. Making a full third
+of the nodes not further propagate a block, while at the same time allowing them to fetch chunks, sign and distribute
+bitfields seems almost infeasible and even if accomplished, those nodes would be enough to confirm a dispute and we have
+not even touched the above fact that in addition, for an attack, the following including block must be shared with
+honest validators as well.
+
+It is worth mentioning that a successful attack on the priority queue as outlined above is already outside of our threat
+model, as it assumes n/3 malicious nodes + additionally malfunctioning/DoSed nodes. Even more so for attacks on the
+best-effort queue, as our threat model only allows for n/3 malicious _or_ malfunctioning nodes in total. It would
+therefore be a valid decision to ditch the best-effort queue, if it proves to become a burden or creates other issues.
+
+One issue we should not be worried about though is spam. For abusing best-effort for spam, the following scenario would
+be necessary:
+
+An attacker controls a backing group: The attacker can then have candidates backed and choose to not provide chunks.
+This should come at a cost to miss out on rewards for backing, so is not free. At the same time it is rate limited, as a
+backing group can only back so many candidates legitimately. (~ 1 per slot):
+
+1. They have to wait until a malicious actor becomes block producer (for causing additional forks via equivocation for
+  example).
 2. Forks are possible, but if caused by equivocation also not free.
-3. For each fork the attacker has to wait until the candidate times out, for
-  backing another one.
+3. For each fork the attacker has to wait until the candidate times out, for backing another one.
 
-Assuming there can only be a handful of forks, 2) together with 3) the candidate
-timeout restriction, frequency should indeed be in the ballpark of once per
-slot. Scaling linearly in the number of controlled backing groups, so two groups
+Assuming there can only be a handful of forks, 2) together with 3) the candidate timeout restriction, frequency should
+indeed be in the ballpark of once per slot. Scaling linearly in the number of controlled backing groups, so two groups
 would mean 2 backings per slot, ...
 
-So by this reasoning an attacker could only do very limited harm and at the same
-time will have to pay some price for it (it will miss out on rewards). Overall
-the work done by the network might even be in the same ballpark as if actors
-just behaved honestly:
+So by this reasoning an attacker could only do very limited harm and at the same time will have to pay some price for it
+(it will miss out on rewards). Overall the work done by the network might even be in the same ballpark as if actors just
+behaved honestly:
 
 1. Validators would have fetched chunks
 2. Approval checkers would have done approval checks
 
-While because of the attack (backing, not providing chunks and afterwards
-disputing the candidate), the work for 1000 validators would be:
+While because of the attack (backing, not providing chunks and afterwards disputing the candidate), the work for 1000
+validators would be:
 
-All validators sending out ~ 1000 tiny requests over already established
-connections, with also tiny (byte) responses.
+All validators sending out ~ 1000 tiny requests over already established connections, with also tiny (byte) responses.
 
-This means around a million requests, while in the honest case it would be ~
-10000 (30 approval checkers x330) - where each request triggers a response in
-the range of kilobytes. Hence network load alone will likely be higher in the
-honest case than in the DoS attempt case, which would mean the DoS attempt
-actually reduces load, while also costing rewards.
+This means around a million requests, while in the honest case it would be ~ 10000 (30 approval checkers x330) - where
+each request triggers a response in the range of kilobytes. Hence network load alone will likely be higher in the honest
+case than in the DoS attempt case, which would mean the DoS attempt actually reduces load, while also costing rewards.
 
-In the worst case this can happen multiple times, as we would retry that on
-every vote import. The effect would still be in the same ballpark as honest
-behavior though and can also be mitigated by chilling repeated availability
-recovery requests for example.
+In the worst case this can happen multiple times, as we would retry that on every vote import. The effect would still be
+in the same ballpark as honest behavior though and can also be mitigated by chilling repeated availability recovery
+requests for example.
 
 ## Out of Scope
 
 ### No Disputes for Non Included Candidates
 
-We only ever care about disputes for candidates that have been included on at
-least some chain (became available). This is because the availability system was
-designed for precisely that: Only with inclusion (availability) we have
-guarantees about the candidate to actually be available. Because only then we
-have guarantees that malicious backers can be reliably checked and slashed. Also, by design non included candidates do not pose any threat to the system.
-
-One could think of an (additional) dispute system to make it possible to dispute
-any candidate that has been proposed by a validator, no matter whether it got
-successfully included or even backed. Unfortunately, it would be very brittle
-(no availability) and also spam protection would be way harder than for the
-disputes handled by the dispute-coordinator. In fact, all the spam handling
-strategies described above would simply be unavailable.
-
-It is worth thinking about who could actually raise such disputes anyway:
-Approval checkers certainly not, as they will only ever check once availability
-succeeded. The only other nodes that meaningfully could/would are honest backing
-nodes or collators. For collators spam considerations would be even worse as
-there can be an unlimited number of them and we can not charge them for spam, so
-trying to handle disputes raised by collators would be even more complex. For
-honest backers: It actually makes more sense for them to wait until availability
-is reached as well, as only then they have guarantees that other nodes will be
-able to check. If they disputed before, all nodes would need to recover the data
+We only ever care about disputes for candidates that have been included on at least some chain (became available). This
+is because the availability system was designed for precisely that: Only with inclusion (availability) we have
+guarantees about the candidate to actually be available. Because only then we have guarantees that malicious backers can
+be reliably checked and slashed. Also, by design non included candidates do not pose any threat to the system.
+
+One could think of an (additional) dispute system to make it possible to dispute any candidate that has been proposed by
+a validator, no matter whether it got successfully included or even backed. Unfortunately, it would be very brittle (no
+availability) and also spam protection would be way harder than for the disputes handled by the dispute-coordinator. In
+fact, all the spam handling strategies described above would simply be unavailable.
+
+It is worth thinking about who could actually raise such disputes anyway: Approval checkers certainly not, as they will
+only ever check once availability succeeded. The only other nodes that meaningfully could/would are honest backing nodes
+or collators. For collators spam considerations would be even worse as there can be an unlimited number of them and we
+can not charge them for spam, so trying to handle disputes raised by collators would be even more complex. For honest
+backers: It actually makes more sense for them to wait until availability is reached as well, as only then they have
+guarantees that other nodes will be able to check. If they disputed before, all nodes would need to recover the data
 from them, so they would be an easy DoS target.
 
-In summary: The availability system was designed for raising disputes in a
-meaningful and secure way after availability was reached. Trying to raise
-disputes before does not meaningfully contribute to the systems security/might
-even weaken it as attackers are warned before availability is reached, while at
-the same time adding signficant amount of complexity. We therefore punt on such
-disputes and concentrate on disputes the system was designed to handle.
+In summary: The availability system was designed for raising disputes in a meaningful and secure way after availability
+was reached. Trying to raise disputes before does not meaningfully contribute to the systems security/might even weaken
+it as attackers are warned before availability is reached, while at the same time adding significant amount of
+complexity. We therefore punt on such disputes and concentrate on disputes the system was designed to handle.
 
 ### No Disputes for Already Finalized Blocks
 
-Note that by above rules in the `Participation` section, we will not participate
-in disputes concerning a candidate in an already finalized block. This is
-because, disputing an already finalized block is simply too late and therefore
-of little value. Once finalized, bridges have already processed the block for
-example, so we have to assume the damage is already done. Governance has to step
-in and fix what can be fixed.
+Note that by above rules in the `Participation` section, we will not participate in disputes concerning a candidate in
+an already finalized block. This is because, disputing an already finalized block is simply too late and therefore of
+little value. Once finalized, bridges have already processed the block for example, so we have to assume the damage is
+already done. Governance has to step in and fix what can be fixed.
 
-Making disputes for already finalized blocks possible would only provide two
-features:
+Making disputes for already finalized blocks possible would only provide two features:
 
 1. We can at least still slash attackers.
-2. We can freeze the chain to some governance only mode, in an attempt to
-   minimize potential harm done.
+2. We can freeze the chain to some governance only mode, in an attempt to minimize potential harm done.
 
-Both seem kind of worthwhile, although as argued above, it is likely that there
-is not too much that can be done in 2 and we would likely only ending up DoSing
-the whole system without much we can do. 1 can also be achieved via governance
+Both seem kind of worthwhile, although as argued above, it is likely that there is not too much that can be done in 2
+and we would likely only ending up DoSing the whole system without much we can do. 1 can also be achieved via governance
 mechanisms.
 
-In any case, our focus should be making as sure as reasonably possible that any
-potentially invalid block does not get finalized in the first place. Not
-allowing disputing already finalized blocks actually helps a great deal with
-this goal as it massively reduces the amount of candidates that can be disputed.
-
-This makes attempts to overwhelm the system with disputes significantly harder
-and counter measures way easier. We can limit inclusion for example (as
-suggested [here](https://github.com/paritytech/polkadot/issues/5898) in case of
-high dispute load. Another measure we have at our disposal is that on finality
-lag block production will slow down, implicitly reducing the rate of new
-candidates that can be disputed. Hence, the cutting-off of the unlimited
-candidate supply of already finalized blocks, guarantees the necessary DoS
-protection and ensures we can have measures in place to keep up with processing
-of disputes.
-
-If we allowed participation for disputes for already finalized candidates, the
-above spam protection mechanisms would be insufficient/relying 100% on full and
-quick disabling of spamming validators.
+In any case, our focus should be making as sure as reasonably possible that any potentially invalid block does not get
+finalized in the first place. Not allowing disputing already finalized blocks actually helps a great deal with this goal
+as it massively reduces the amount of candidates that can be disputed.
+
+This makes attempts to overwhelm the system with disputes significantly harder and counter measures way easier. We can
+limit inclusion for example (as suggested [here](https://github.com/paritytech/polkadot/issues/5898) in case of high
+dispute load. Another measure we have at our disposal is that on finality lag block production will slow down,
+implicitly reducing the rate of new candidates that can be disputed. Hence, the cutting-off of the unlimited candidate
+supply of already finalized blocks, guarantees the necessary DoS protection and ensures we can have measures in place to
+keep up with processing of disputes.
+
+If we allowed participation for disputes for already finalized candidates, the above spam protection mechanisms would be
+insufficient/relying 100% on full and quick disabling of spamming validators.
 
 ## Database Schema
 
 We use an underlying Key-Value database where we assume we have the following operations available:
-  * `write(key, value)`
-  * `read(key) -> Option<value>`
-  * `iter_with_prefix(prefix) -> Iterator<(key, value)>` - gives all keys and values in
-    lexicographical order where the key starts with `prefix`.
+  - `write(key, value)`
+  - `read(key) -> Option<value>`
+  - `iter_with_prefix(prefix) -> Iterator<(key, value)>` - gives all keys and values in lexicographical order where the
+    key starts with `prefix`.
 
 We use this database to encode the following schema:
 
@@ -612,8 +471,8 @@ We use this database to encode the following schema:
 "earliest-session" -> Option<SessionIndex>
 ```
 
-The meta information that we track per-candidate is defined as the `CandidateVotes` struct.
-This draws on the [dispute statement types][DisputeTypes]
+The meta information that we track per-candidate is defined as the `CandidateVotes` struct. This draws on the [dispute
+statement types][DisputeTypes]
 
 ```rust
 /// Tracked votes on candidates, for the purposes of dispute resolution.
@@ -659,8 +518,7 @@ Output:
 
 ## Functionality
 
-This assumes a constant `DISPUTE_WINDOW: SessionWindowSize`. This should correspond to at least 1
-day.
+This assumes a constant `DISPUTE_WINDOW: SessionWindowSize`. This should correspond to at least 1 day.
 
 Ephemeral in-memory state:
 
@@ -678,48 +536,42 @@ struct State {
   // It can be a `Vec` if the need to track more arises.
   error: Option<SessionsUnavailable>,
   /// Latest relay blocks that have been successfully scraped.
-  last_scraped_blocks: LruCache<Hash, ()>,
+  last_scraped_blocks: LruMap<Hash, ()>,
 }
 ```
 
 ### On startup
 
-When the subsystem is initialised it waits for a new leaf (message
-`OverseerSignal::ActiveLeaves`). The leaf is used to initialise a
-`RollingSessionWindow` instance (contains leaf hash and `DISPUTE_WINDOW` which
-is a constant).
+When the subsystem is initialised it waits for a new leaf (message `OverseerSignal::ActiveLeaves`). The leaf is used to
+initialise a `RollingSessionWindow` instance (contains leaf hash and `DISPUTE_WINDOW` which is a constant).
 
-Next the active disputes are loaded from the DB and initialize spam slots
-accordingly, then for each loaded dispute, we either send a
-`DisputeDistribution::SendDispute` if there is a local vote from us available or
-if there is none and participation is in order, we push the dispute to
-participation.
+Next the active disputes are loaded from the DB and initialize spam slots accordingly, then for each loaded dispute, we
+either send a `DisputeDistribution::SendDispute` if there is a local vote from us available or if there is none and
+participation is in order, we push the dispute to participation.
 
 ### The main loop
 
-Just after the subsystem initialisation the main loop (`fn run_until_error()`) runs until
-`OverseerSignal::Conclude` signal is received. Before executing the actual main loop the leaf and
-the participations, obtained during startup are enqueued for processing. If there is capacity (the
-number of running participations is less than `MAX_PARALLEL_PARTICIPATIONS`) participation jobs are
-started (`func participate`). Finally the component waits for messages from Overseer. The behaviour
-on each message is described in the following subsections.
+Just after the subsystem initialisation the main loop (`fn run_until_error()`) runs until `OverseerSignal::Conclude`
+signal is received. Before executing the actual main loop the leaf and the participations, obtained during startup are
+enqueued for processing. If there is capacity (the number of running participations is less than
+`MAX_PARALLEL_PARTICIPATIONS`) participation jobs are started (`func participate`). Finally the component waits for
+messages from Overseer. The behaviour on each message is described in the following subsections.
 
 ### On `OverseerSignal::ActiveLeaves`
 
-Initiates processing via the `Participation` module and updates the internal state of the subsystem.
-More concretely:
+Initiates processing via the `Participation` module and updates the internal state of the subsystem. More concretely:
 
-* Passes the `ActiveLeavesUpdate` message to the ordering provider.
-* Updates the session info cache.
-* Updates `self.highest_session`.
-* Prunes old spam slots in case the session window has advanced.
-* Scrapes on chain votes.
+- Passes the `ActiveLeavesUpdate` message to the ordering provider.
+- Updates the session info cache.
+- Updates `self.highest_session`.
+- Prunes old spam slots in case the session window has advanced.
+- Scrapes on chain votes.
 
 ### On `MuxedMessage::Participation`
 
-This message is sent from `Participatuion` module and indicates a processed dispute participation.
-It's the result of the processing job initiated with `OverseerSignal::ActiveLeaves`. The subsystem
-issues a `DisputeMessage` with the result.
+This message is sent from `Participatuion` module and indicates a processed dispute participation. It's the result of
+the processing job initiated with `OverseerSignal::ActiveLeaves`. The subsystem issues a `DisputeMessage` with the
+result.
 
 ### On `OverseerSignal::Conclude`
 
@@ -731,14 +583,13 @@ Performs cleanup of the finalized candidate.
 
 ### On `DisputeCoordinatorMessage::ImportStatements`
 
-Import statements by validators are processed in `fn handle_import_statements()`. The function has
-got three main responsibilities:
-* Initiate participation in disputes and sending out of any existing own
-  approval vote in case of a raised dispute.
-* Persist all fresh votes in the database. Fresh votes in this context means votes that are not
-  already processed by the node.
-* Spam protection on all invalid (`DisputeStatement::Invalid`) votes. Please check the SpamSlots
-  section for details on how spam protection works.
+Import statements by validators are processed in `fn handle_import_statements()`. The function has got three main
+responsibilities:
+- Initiate participation in disputes and sending out of any existing own approval vote in case of a raised dispute.
+- Persist all fresh votes in the database. Fresh votes in this context means votes that are not already processed by the
+  node.
+- Spam protection on all invalid (`DisputeStatement::Invalid`) votes. Please check the SpamSlots section for details on
+  how spam protection works.
 
 ### On `DisputeCoordinatorMessage::RecentDisputes`
 
@@ -750,38 +601,35 @@ Returns all recent disputes concluded within the last `ACTIVE_DURATION_SECS` .
 
 ### On `DisputeCoordinatorMessage::QueryCandidateVotes`
 
-Loads `candidate-votes` for every `(SessionIndex, CandidateHash)` in the input query and returns
-data within each `CandidateVote`. If a particular `candidate-vote` is missing, that particular
-request is omitted from the response.
+Loads `candidate-votes` for every `(SessionIndex, CandidateHash)` in the input query and returns data within each
+`CandidateVote`. If a particular `candidate-vote` is missing, that particular request is omitted from the response.
 
 ### On `DisputeCoordinatorMessage::IssueLocalStatement`
 
 Executes `fn issue_local_statement()` which performs the following operations:
 
-* Deconstruct into parts `{ session_index, candidate_hash, candidate_receipt, is_valid }`.
-* Construct a [`DisputeStatement`][DisputeStatement] based on `Valid` or `Invalid`, depending on the
-  parameterization of this routine.
-* Sign the statement with each key in the `SessionInfo`'s list of parachain validation keys which is
-  present in the keystore, except those whose indices appear in `voted_indices`. This will typically
-  just be one key, but this does provide some future-proofing for situations where the same node may
-  run on behalf multiple validators. At the time of writing, this is not a use-case we support as
-  other subsystems do not invariably   provide this guarantee.
-* Write statement to DB.
-* Send a `DisputeDistributionMessage::SendDispute` message to get the vote distributed to other
-  validators.
+- Deconstruct into parts `{ session_index, candidate_hash, candidate_receipt, is_valid }`.
+- Construct a [`DisputeStatement`][DisputeStatement] based on `Valid` or `Invalid`, depending on the parameterization of
+  this routine.
+- Sign the statement with each key in the `SessionInfo`'s list of parachain validation keys which is present in the
+  keystore, except those whose indices appear in `voted_indices`. This will typically just be one key, but this does
+  provide some future-proofing for situations where the same node may run on behalf multiple validators. At the time of
+  writing, this is not a use-case we support as other subsystems do not invariably   provide this guarantee.
+- Write statement to DB.
+- Send a `DisputeDistributionMessage::SendDispute` message to get the vote distributed to other validators.
 
 ### On `DisputeCoordinatorMessage::DetermineUndisputedChain`
 
 Executes `fn determine_undisputed_chain()` which performs the following:
 
-* Load `"recent-disputes"`.
-* Deconstruct into parts `{ base_number, block_descriptions, rx }`
-* Starting from the beginning of `block_descriptions`:
+- Load `"recent-disputes"`.
+- Deconstruct into parts `{ base_number, block_descriptions, rx }`
+- Starting from the beginning of `block_descriptions`:
   1. Check the `RecentDisputes` for a dispute of each candidate in the block description.
   1. If there is a dispute which is active or concluded negative, exit the loop.
-* For the highest index `i` reached in the `block_descriptions`, send `(base_number + i + 1,
-  block_hash)` on the channel, unless `i` is 0, in which case `None` should be sent. The
-  `block_hash` is determined by inspecting `block_descriptions[i]`.
+- For the highest index `i` reached in the `block_descriptions`, send `(base_number + i + 1, block_hash)` on the
+  channel, unless `i` is 0, in which case `None` should be sent. The `block_hash` is determined by inspecting
+  `block_descriptions[i]`.
 
 [DisputeTypes]: ../../types/disputes.md
 [DisputeStatement]: ../../types/disputes.md#disputestatement
diff --git a/polkadot/roadmap/implementers-guide/src/node/disputes/dispute-distribution.md b/polkadot/roadmap/implementers-guide/src/node/disputes/dispute-distribution.md
index 3a45f53c45d7905a5c0b9ff3fe1a8ae299b211f9..4547e02352ec1c44eecd81c6e03d1b92bb1e26f1 100644
--- a/polkadot/roadmap/implementers-guide/src/node/disputes/dispute-distribution.md
+++ b/polkadot/roadmap/implementers-guide/src/node/disputes/dispute-distribution.md
@@ -202,8 +202,8 @@ the dispute-coordinator already knows about the dispute.
 
 Goal 3 and 4 are obviously very related and both can easily be solved via rate
 limiting as we shall see below. Rate limits should already be implemented at the
-substrate level, but [are not](https://github.com/paritytech/substrate/issues/7750)
-at the time of writing. But even if they were, the enforced substrate limits would
+Substrate level, but [are not](https://github.com/paritytech/substrate/issues/7750)
+at the time of writing. But even if they were, the enforced Substrate limits would
 likely not be configurable and thus would still be to high for our needs as we can
 rely on the following observations:
 
@@ -282,10 +282,10 @@ well, we will do the following:
    to assume this is concerning a new dispute.
 2. We open a batch and start collecting incoming messages for that candidate,
    instead of immediately forwarding.
-4. We keep collecting votes in the batch until we receive less than
+3. We keep collecting votes in the batch until we receive less than
    `MIN_KEEP_BATCH_ALIVE_VOTES` unique votes in the last `BATCH_COLLECTING_INTERVAL`. This is
    important to accommodate for goal 5 and also 3.
-5. We send the whole batch to the dispute-coordinator.
+4. We send the whole batch to the dispute-coordinator.
 
 This together with rate limiting explained above ensures we will be able to
 process valid disputes: We can limit the number of simultaneous existing batches
@@ -312,8 +312,8 @@ of attackers, each has 10 messages per second, all are needed to maintain the
 batches in memory. Therefore we have a hard cap of around 330 (number of
 malicious nodes) open batches. Each can be filled with number of malicious
 actor's votes. So 330 batches with each 330 votes: Let's assume approximately 100
-bytes per signature/vote. This results in a worst case memory usage of 330 * 330
-* 100 ~= 10 MiB.
+bytes per signature/vote. This results in a worst case memory usage of
+`330 * 330 * 100 ~= 10 MiB`.
 
 For 10_000 validators, we are already in the Gigabyte range, which means that
 with a validator set that large we might want to be more strict with the rate limit or
diff --git a/polkadot/roadmap/implementers-guide/src/node/grandpa-voting-rule.md b/polkadot/roadmap/implementers-guide/src/node/grandpa-voting-rule.md
index 5e608ccfd62e7d37a9a1c7cdc45130b5a535e9c3..6997dc99f80eb40301c090c1d2dc33782faa9a7f 100644
--- a/polkadot/roadmap/implementers-guide/src/node/grandpa-voting-rule.md
+++ b/polkadot/roadmap/implementers-guide/src/node/grandpa-voting-rule.md
@@ -1,10 +1,25 @@
 # GRANDPA Voting Rule
 
-Specifics on the motivation and types of constraints we apply to the GRANDPA voting logic as well as the definitions of **viable** and **finalizable** blocks can be found in the [Chain Selection Protocol](../protocol-chain-selection.md) section.
-The subsystem which provides us with viable leaves is the [Chain Selection Subsystem](utility/chain-selection.md). 
+Specifics on the motivation and types of constraints we apply to the GRANDPA voting logic as well as the definitions of
+**viable** and **finalizable** blocks can be found in the [Chain Selection Protocol](../protocol-chain-selection.md)
+section. The subsystem which provides us with viable leaves is the [Chain Selection
+Subsystem](utility/chain-selection.md).
 
-GRANDPA's regular voting rule is for each validator to select the longest chain they are aware of. GRANDPA proceeds in rounds, collecting information from all online validators and determines the blocks that a supermajority of validators all have in common with each other.
+GRANDPA's regular voting rule is for each validator to select the longest chain they are aware of. GRANDPA proceeds in
+rounds, collecting information from all online validators and determines the blocks that a supermajority of validators
+all have in common with each other.
 
-The low-level GRANDPA logic will provide us with a **required block**. We can find the best leaf containing that block in its chain with the [`ChainSelectionMessage::BestLeafContaining`](../types/overseer-protocol.md#chain-selection-message). If the result is `None`, then we will simply cast a vote on the required block.
+The low-level GRANDPA logic will provide us with a **required block**. We can find the best leaf containing that block
+in its chain with the
+[`ChainSelectionMessage::BestLeafContaining`](../types/overseer-protocol.md#chain-selection-message). If the result is
+`None`, then we will simply cast a vote on the required block.
 
-The **viable** leaves provided from the chain selection subsystem are not necessarily **finalizable**, so we need to perform further work to discover the finalizable ancestor of the block. The first constraint is to avoid voting on any unapproved block. The highest approved ancestor of a given block can be determined by querying the Approval Voting subsystem via the [`ApprovalVotingMessage::ApprovedAncestor`](../types/overseer-protocol.md#approval-voting) message. If the response is `Some`, we continue and apply the second constraint. The second constraint is to avoid voting on any block containing a candidate undergoing an active dispute. The list of block hashes and candidates returned from `ApprovedAncestor` should be reversed, and passed to the [`DisputeCoordinatorMessage::DetermineUndisputedChain`](../types/overseer-protocol.md#dispute-coordinator-message) to determine the **finalizable** block which will be our eventual vote.
+The **viable** leaves provided from the chain selection subsystem are not necessarily **finalizable**, so we need to
+perform further work to discover the finalizable ancestor of the block. The first constraint is to avoid voting on any
+unapproved block. The highest approved ancestor of a given block can be determined by querying the Approval Voting
+subsystem via the [`ApprovalVotingMessage::ApprovedAncestor`](../types/overseer-protocol.md#approval-voting) message. If
+the response is `Some`, we continue and apply the second constraint. The second constraint is to avoid voting on any
+block containing a candidate undergoing an active dispute. The list of block hashes and candidates returned from
+`ApprovedAncestor` should be reversed, and passed to the
+[`DisputeCoordinatorMessage::DetermineUndisputedChain`](../types/overseer-protocol.md#dispute-coordinator-message) to
+determine the **finalizable** block which will be our eventual vote.
diff --git a/polkadot/roadmap/implementers-guide/src/node/overseer.md b/polkadot/roadmap/implementers-guide/src/node/overseer.md
index 21300d9098a2949b21b5ac8f9efd54cd5dd37472..53a1153081013b684d0cab419fb3eaa0be5a15c1 100644
--- a/polkadot/roadmap/implementers-guide/src/node/overseer.md
+++ b/polkadot/roadmap/implementers-guide/src/node/overseer.md
@@ -24,27 +24,44 @@ The hierarchy of subsystems:
 
 ```
 
-The overseer determines work to do based on block import events and block finalization events. It does this by keeping track of the set of relay-parents for which work is currently being done. This is known as the "active leaves" set. It determines an initial set of active leaves on startup based on the data on-disk, and uses events about blockchain import to update the active leaves. Updates lead to [`OverseerSignal`](../types/overseer-protocol.md#overseer-signal)`::ActiveLeavesUpdate` being sent according to new relay-parents, as well as relay-parents to stop considering. Block import events inform the overseer of leaves that no longer need to be built on, now that they have children, and inform us to begin building on those children. Block finalization events inform us when we can stop focusing on blocks that appear to have been orphaned.
-
-The overseer is also responsible for tracking the freshness of active leaves. Leaves are fresh when they're encountered for the first time, and stale when they're encountered for subsequent times. This can occur after chain reversions or when the fork-choice rule abandons some chain. This distinction is used to manage **Reversion Safety**. Consensus messages are often localized to a specific relay-parent, and it is often a misbehavior to equivocate or sign two conflicting messages. When reverting the chain, we may begin work on a leaf that subsystems have already signed messages for. Subsystems which need to account for reversion safety should avoid performing work on stale leaves.
+The overseer determines work to do based on block import events and block finalization events. It does this by keeping
+track of the set of relay-parents for which work is currently being done. This is known as the "active leaves" set. It
+determines an initial set of active leaves on startup based on the data on-disk, and uses events about blockchain import
+to update the active leaves. Updates lead to
+[`OverseerSignal`](../types/overseer-protocol.md#overseer-signal)`::ActiveLeavesUpdate` being sent according to new
+relay-parents, as well as relay-parents to stop considering. Block import events inform the overseer of leaves that no
+longer need to be built on, now that they have children, and inform us to begin building on those children. Block
+finalization events inform us when we can stop focusing on blocks that appear to have been orphaned.
+
+The overseer is also responsible for tracking the freshness of active leaves. Leaves are fresh when they're encountered
+for the first time, and stale when they're encountered for subsequent times. This can occur after chain reversions or
+when the fork-choice rule abandons some chain. This distinction is used to manage **Reversion Safety**. Consensus
+messages are often localized to a specific relay-parent, and it is often a misbehavior to equivocate or sign two
+conflicting messages. When reverting the chain, we may begin work on a leaf that subsystems have already signed messages
+for. Subsystems which need to account for reversion safety should avoid performing work on stale leaves.
 
 The overseer's logic can be described with these functions:
 
 ## On Startup
 
 * Start all subsystems
-* Determine all blocks of the blockchain that should be built on. This should typically be the head of the best fork of the chain we are aware of. Sometimes add recent forks as well.
+* Determine all blocks of the blockchain that should be built on. This should typically be the head of the best fork of
+  the chain we are aware of. Sometimes add recent forks as well.
 * Send an `OverseerSignal::ActiveLeavesUpdate` to all subsystems with `activated` containing each of these blocks.
 * Begin listening for block import and finality events
 
 ## On Block Import Event
 
-* Apply the block import event to the active leaves. A new block should lead to its addition to the active leaves set and its parent being deactivated.
-* Mark any stale leaves as stale. The overseer should track all leaves it activates to determine whether leaves are fresh or stale.
-* Send an `OverseerSignal::ActiveLeavesUpdate` message to all subsystems containing all activated and deactivated leaves.
+* Apply the block import event to the active leaves. A new block should lead to its addition to the active leaves set
+  and its parent being deactivated.
+* Mark any stale leaves as stale. The overseer should track all leaves it activates to determine whether leaves are
+  fresh or stale.
+* Send an `OverseerSignal::ActiveLeavesUpdate` message to all subsystems containing all activated and deactivated
+  leaves.
 * Ensure all `ActiveLeavesUpdate` messages are flushed before resuming activity as a message router.
 
-> TODO: in the future, we may want to avoid building on too many sibling blocks at once. the notion of a "preferred head" among many competing sibling blocks would imply changes in our "active leaves" update rules here
+> TODO: in the future, we may want to avoid building on too many sibling blocks at once. the notion of a "preferred
+> head" among many competing sibling blocks would imply changes in our "active leaves" update rules here
 
 ## On Finalization Event
 
@@ -54,11 +71,16 @@ The overseer's logic can be described with these functions:
 
 ## On Subsystem Failure
 
-Subsystems are essential tasks meant to run as long as the node does. Subsystems can spawn ephemeral work in the form of jobs, but the subsystems themselves should not go down. If a subsystem goes down, it will be because of a critical error that should take the entire node down as well.
+Subsystems are essential tasks meant to run as long as the node does. Subsystems can spawn ephemeral work in the form of
+jobs, but the subsystems themselves should not go down. If a subsystem goes down, it will be because of a critical error
+that should take the entire node down as well.
 
 ## Communication Between Subsystems
 
-When a subsystem wants to communicate with another subsystem, or, more typically, a job within a subsystem wants to communicate with its counterpart under another subsystem, that communication must happen via the overseer. Consider this example where a job on subsystem A wants to send a message to its counterpart under subsystem B. This is a realistic scenario, where you can imagine that both jobs correspond to work under the same relay-parent.
+When a subsystem wants to communicate with another subsystem, or, more typically, a job within a subsystem wants to
+communicate with its counterpart under another subsystem, that communication must happen via the overseer. Consider this
+example where a job on subsystem A wants to send a message to its counterpart under subsystem B. This is a realistic
+scenario, where you can imagine that both jobs correspond to work under the same relay-parent.
 
 ```text
      +--------+                                                           +--------+
@@ -78,21 +100,48 @@ When a subsystem wants to communicate with another subsystem, or, more typically
                              +------------------------------+
 ```
 
-First, the subsystem that spawned a job is responsible for handling the first step of the communication. The overseer is not aware of the hierarchy of tasks within any given subsystem and is only responsible for subsystem-to-subsystem communication. So the sending subsystem must pass on the message via the overseer to the receiving subsystem, in such a way that the receiving subsystem can further address the communication to one of its internal tasks, if necessary.
-
-This communication prevents a certain class of race conditions. When the Overseer determines that it is time for subsystems to begin working on top of a particular relay-parent, it will dispatch a `ActiveLeavesUpdate` message to all subsystems to do so, and those messages will be handled asynchronously by those subsystems. Some subsystems will receive those messsages before others, and it is important that a message sent by subsystem A after receiving `ActiveLeavesUpdate` message will arrive at subsystem B after its `ActiveLeavesUpdate` message. If subsystem A maintained an independent channel with subsystem B to communicate, it would be possible for subsystem B to handle the side message before the `ActiveLeavesUpdate` message, but it wouldn't have any logical course of action to take with the side message - leading to it being discarded or improperly handled. Well-architectured state machines should have a single source of inputs, so that is what we do here.
-
-One exception is reasonable to make for responses to requests. A request should be made via the overseer in order to ensure that it arrives after any relevant `ActiveLeavesUpdate` message. A subsystem issuing a request as a result of a `ActiveLeavesUpdate` message can safely receive the response via a side-channel for two reasons:
-
-1. It's impossible for a request to be answered before it arrives, it is provable that any response to a request obeys the same ordering constraint.
-1. The request was sent as a result of handling a `ActiveLeavesUpdate` message. Then there is no possible future in which the `ActiveLeavesUpdate` message has not been handled upon the receipt of the response.
-
-So as a single exception to the rule that all communication must happen via the overseer we allow the receipt of responses to requests via a side-channel, which may be established for that purpose. This simplifies any cases where the outside world desires to make a request to a subsystem, as the outside world can then establish a side-channel to receive the response on.
-
-It's important to note that the overseer is not aware of the internals of subsystems, and this extends to the jobs that they spawn. The overseer isn't aware of the existence or definition of those jobs, and is only aware of the outer subsystems with which it interacts. This gives subsystem implementations leeway to define internal jobs as they see fit, and to wrap a more complex hierarchy of state machines than having a single layer of jobs for relay-parent-based work. Likewise, subsystems aren't required to spawn jobs. Certain types of subsystems, such as those for shared storage or networking resources, won't perform block-based work but would still benefit from being on the Overseer's message bus. These subsystems can just ignore the overseer's signals for block-based work.
-
-Furthermore, the protocols by which subsystems communicate with each other should be well-defined irrespective of the implementation of the subsystem. In other words, their interface should be distinct from their implementation. This will prevent subsystems from accessing aspects of each other that are beyond the scope of the communication boundary.
+First, the subsystem that spawned a job is responsible for handling the first step of the communication. The overseer is
+not aware of the hierarchy of tasks within any given subsystem and is only responsible for subsystem-to-subsystem
+communication. So the sending subsystem must pass on the message via the overseer to the receiving subsystem, in such a
+way that the receiving subsystem can further address the communication to one of its internal tasks, if necessary.
+
+This communication prevents a certain class of race conditions. When the Overseer determines that it is time for
+subsystems to begin working on top of a particular relay-parent, it will dispatch a `ActiveLeavesUpdate` message to all
+subsystems to do so, and those messages will be handled asynchronously by those subsystems. Some subsystems will receive
+those messsages before others, and it is important that a message sent by subsystem A after receiving
+`ActiveLeavesUpdate` message will arrive at subsystem B after its `ActiveLeavesUpdate` message. If subsystem A
+maintained an independent channel with subsystem B to communicate, it would be possible for subsystem B to handle the
+side message before the `ActiveLeavesUpdate` message, but it wouldn't have any logical course of action to take with the
+side message - leading to it being discarded or improperly handled. Well-architectured state machines should have a
+single source of inputs, so that is what we do here.
+
+One exception is reasonable to make for responses to requests. A request should be made via the overseer in order to
+ensure that it arrives after any relevant `ActiveLeavesUpdate` message. A subsystem issuing a request as a result of a
+`ActiveLeavesUpdate` message can safely receive the response via a side-channel for two reasons:
+
+1. It's impossible for a request to be answered before it arrives, it is provable that any response to a request obeys
+   the same ordering constraint.
+1. The request was sent as a result of handling a `ActiveLeavesUpdate` message. Then there is no possible future in
+   which the `ActiveLeavesUpdate` message has not been handled upon the receipt of the response.
+
+So as a single exception to the rule that all communication must happen via the overseer we allow the receipt of
+responses to requests via a side-channel, which may be established for that purpose. This simplifies any cases where the
+outside world desires to make a request to a subsystem, as the outside world can then establish a side-channel to
+receive the response on.
+
+It's important to note that the overseer is not aware of the internals of subsystems, and this extends to the jobs that
+they spawn. The overseer isn't aware of the existence or definition of those jobs, and is only aware of the outer
+subsystems with which it interacts. This gives subsystem implementations leeway to define internal jobs as they see fit,
+and to wrap a more complex hierarchy of state machines than having a single layer of jobs for relay-parent-based work.
+Likewise, subsystems aren't required to spawn jobs. Certain types of subsystems, such as those for shared storage or
+networking resources, won't perform block-based work but would still benefit from being on the Overseer's message bus.
+These subsystems can just ignore the overseer's signals for block-based work.
+
+Furthermore, the protocols by which subsystems communicate with each other should be well-defined irrespective of the
+implementation of the subsystem. In other words, their interface should be distinct from their implementation. This will
+prevent subsystems from accessing aspects of each other that are beyond the scope of the communication boundary.
 
 ## On shutdown
 
-Send an `OverseerSignal::Conclude` message to each subsystem and wait some time for them to conclude before hard-exiting.
+Send an `OverseerSignal::Conclude` message to each subsystem and wait some time for them to conclude before
+hard-exiting.
diff --git a/polkadot/roadmap/implementers-guide/src/node/subsystems-and-jobs.md b/polkadot/roadmap/implementers-guide/src/node/subsystems-and-jobs.md
index 6e3b4cd2d166b820a1084fe1e423886d7d6dea38..a3ca7347eb63efedb787c90a23c8e5b95138bcdb 100644
--- a/polkadot/roadmap/implementers-guide/src/node/subsystems-and-jobs.md
+++ b/polkadot/roadmap/implementers-guide/src/node/subsystems-and-jobs.md
@@ -1,25 +1,66 @@
 # Subsystems and Jobs
 
-In this section we define the notions of Subsystems and Jobs. These are guidelines for how we will employ an architecture of hierarchical state machines. We'll have a top-level state machine which oversees the next level of state machines which oversee another layer of state machines and so on. The next sections will lay out these guidelines for what we've called subsystems and jobs, since this model applies to many of the tasks that the Node-side behavior needs to encompass, but these are only guidelines and some Subsystems may have deeper hierarchies internally.
-
-Subsystems are long-lived worker tasks that are in charge of performing some particular kind of work. All subsystems can communicate with each other via a well-defined protocol. Subsystems can't generally communicate directly, but must coordinate communication through an [Overseer](overseer.md), which is responsible for relaying messages, handling subsystem failures, and dispatching work signals.
-
-Most work that happens on the Node-side is related to building on top of a specific relay-chain block, which is contextually known as the "relay parent". We call it the relay parent to explicitly denote that it is a block in the relay chain and not on a parachain. We refer to the parent because when we are in the process of building a new block, we don't know what that new block is going to be. The parent block is our only stable point of reference, even though it is usually only useful when it is not yet a parent but in fact a leaf of the block-DAG expected to soon become a parent (because validators are authoring on top of it). Furthermore, we are assuming a forkful blockchain-extension protocol, which means that there may be multiple possible children of the relay-parent. Even if the relay parent has multiple children blocks, the parent of those children is the same, and the context in which those children is authored should be the same. The parent block is the best and most stable reference to use for defining the scope of work items and messages, and is typically referred to by its cryptographic hash.
-
-Since this goal of determining when to start and conclude work relative to a specific relay-parent is common to most, if not all subsystems, it is logically the job of the Overseer to distribute those signals as opposed to each subsystem duplicating that effort, potentially being out of synchronization with each other. Subsystem A should be able to expect that subsystem B is working on the same relay-parents as it is. One of the Overseer's tasks is to provide this heartbeat, or synchronized rhythm, to the system.
-
-The work that subsystems spawn to be done on a specific relay-parent is known as a job. Subsystems should set up and tear down jobs according to the signals received from the overseer. Subsystems may share or cache state between jobs.
-
-Subsystems must be robust to spurious exits. The outputs of the set of subsystems as a whole comprises of signed messages and data committed to disk. Care must be taken to avoid issuing messages that are not substantiated. Since subsystems need to be safe under spurious exits, it is the expected behavior that an `OverseerSignal::Conclude` can just lead to breaking the loop and exiting directly as opposed to waiting for everything to shut down gracefully.
+In this section we define the notions of Subsystems and Jobs. These are
+guidelines for how we will employ an architecture of hierarchical state
+machines. We'll have a top-level state machine which oversees the next level of
+state machines which oversee another layer of state machines and so on. The next
+sections will lay out these guidelines for what we've called subsystems and
+jobs, since this model applies to many of the tasks that the Node-side behavior
+needs to encompass, but these are only guidelines and some Subsystems may have
+deeper hierarchies internally.
+
+Subsystems are long-lived worker tasks that are in charge of performing some
+particular kind of work. All subsystems can communicate with each other via a
+well-defined protocol. Subsystems can't generally communicate directly, but must
+coordinate communication through an [Overseer](overseer.md), which is
+responsible for relaying messages, handling subsystem failures, and dispatching
+work signals.
+
+Most work that happens on the Node-side is related to building on top of a
+specific relay-chain block, which is contextually known as the "relay parent".
+We call it the relay parent to explicitly denote that it is a block in the relay
+chain and not on a parachain. We refer to the parent because when we are in the
+process of building a new block, we don't know what that new block is going to
+be. The parent block is our only stable point of reference, even though it is
+usually only useful when it is not yet a parent but in fact a leaf of the
+block-DAG expected to soon become a parent (because validators are authoring on
+top of it). Furthermore, we are assuming a forkful blockchain-extension
+protocol, which means that there may be multiple possible children of the
+relay-parent. Even if the relay parent has multiple children blocks, the parent
+of those children is the same, and the context in which those children is
+authored should be the same. The parent block is the best and most stable
+reference to use for defining the scope of work items and messages, and is
+typically referred to by its cryptographic hash.
+
+Since this goal of determining when to start and conclude work relative to a
+specific relay-parent is common to most, if not all subsystems, it is logically
+the job of the Overseer to distribute those signals as opposed to each subsystem
+duplicating that effort, potentially being out of synchronization with each
+other. Subsystem A should be able to expect that subsystem B is working on the
+same relay-parents as it is. One of the Overseer's tasks is to provide this
+heartbeat, or synchronized rhythm, to the system.
+
+The work that subsystems spawn to be done on a specific relay-parent is known as
+a job. Subsystems should set up and tear down jobs according to the signals
+received from the overseer. Subsystems may share or cache state between jobs.
+
+Subsystems must be robust to spurious exits. The outputs of the set of
+subsystems as a whole comprises of signed messages and data committed to disk.
+Care must be taken to avoid issuing messages that are not substantiated. Since
+subsystems need to be safe under spurious exits, it is the expected behavior
+that an `OverseerSignal::Conclude` can just lead to breaking the loop and
+exiting directly as opposed to waiting for everything to shut down gracefully.
 
 ## Subsystem Message Traffic
 
 Which subsystems send messages to which other subsystems.
 
-**Note**: This diagram omits the overseer for simplicity. In fact, all messages are relayed via the overseer.
+**Note**: This diagram omits the overseer for simplicity. In fact, all messages
+are relayed via the overseer.
 
-**Note**: Messages with a filled diamond arrowhead ("♦") include a `oneshot::Sender` which communicates a response from the recipient.
-Messages with an open triangle arrowhead ("Δ") do not include a return sender.
+**Note**: Messages with a filled diamond arrowhead ("♦") include a
+`oneshot::Sender` which communicates a response from the recipient. Messages
+with an open triangle arrowhead ("Δ") do not include a return sender.
 
 ```dot process
 digraph {
@@ -125,14 +166,17 @@ digraph {
 
 ## The Path to Inclusion (Node Side)
 
-Let's contextualize that diagram a bit by following a parachain block from its creation through finalization.
-Parachains can use completely arbitrary processes to generate blocks. The relay chain doesn't know or care about
-the details; each parachain just needs to provide a [collator](collators/collation-generation.md).
+Let's contextualize that diagram a bit by following a parachain block from its
+creation through finalization. Parachains can use completely arbitrary processes
+to generate blocks. The relay chain doesn't know or care about the details; each
+parachain just needs to provide a [collator](collators/collation-generation.md).
 
-**Note**: Inter-subsystem communications are relayed via the overseer, but that step is omitted here for brevity.
+**Note**: Inter-subsystem communications are relayed via the overseer, but that
+step is omitted here for brevity.
 
-**Note**: Dashed lines indicate a request/response cycle, where the response is communicated asynchronously via
-a oneshot channel. Adjacent dashed lines may be processed in parallel.
+**Note**: Dashed lines indicate a request/response cycle, where the response is
+communicated asynchronously via a oneshot channel. Adjacent dashed lines may be
+processed in parallel.
 
 ```mermaid
 sequenceDiagram
@@ -156,11 +200,13 @@ sequenceDiagram
     end
 ```
 
-The `DistributeCollation` messages that `CollationGeneration` sends to the `CollatorProtocol` contains
-two items: a `CandidateReceipt` and `PoV`. The `CollatorProtocol` is then responsible for distributing
-that collation to interested validators. However, not all potential collations are of interest. The
-`CandidateSelection` subsystem is responsible for determining which collations are interesting, before
-`CollatorProtocol` actually fetches the collation.
+The `DistributeCollation` messages that `CollationGeneration` sends to the
+`CollatorProtocol` contains two items: a `CandidateReceipt` and `PoV`. The
+`CollatorProtocol` is then responsible for distributing that collation to
+interested validators. However, not all potential collations are of interest.
+The `CandidateSelection` subsystem is responsible for determining which
+collations are interesting, before `CollatorProtocol` actually fetches the
+collation.
 
 ```mermaid
 sequenceDiagram
@@ -205,10 +251,11 @@ sequenceDiagram
     end
 ```
 
-Assuming we hit the happy path, flow continues with `CandidateSelection` receiving a `(candidate_receipt, pov)` as
-the return value from its
-`FetchCollation` request. The only time `CandidateSelection` actively requests a collation is when
-it hasn't yet seconded one for some `relay_parent`, and is ready to second.
+Assuming we hit the happy path, flow continues with `CandidateSelection`
+receiving a `(candidate_receipt, pov)` as the return value from its
+`FetchCollation` request. The only time `CandidateSelection` actively requests a
+collation is when it hasn't yet seconded one for some `relay_parent`, and is
+ready to second.
 
 ```mermaid
 sequenceDiagram
@@ -243,15 +290,17 @@ sequenceDiagram
     end
 ```
 
-At this point, you'll see that control flows in two directions: to `StatementDistribution` to distribute
-the `SignedStatement`, and to `PoVDistribution` to distribute the `PoV`. However, that's largely a mirage:
-while the initial implementation distributes `PoV`s by gossip, that's inefficient, and will be replaced
-with a system which fetches `PoV`s only when actually necessary.
+At this point, you'll see that control flows in two directions: to
+`StatementDistribution` to distribute the `SignedStatement`, and to
+`PoVDistribution` to distribute the `PoV`. However, that's largely a mirage:
+while the initial implementation distributes `PoV`s by gossip, that's
+inefficient, and will be replaced with a system which fetches `PoV`s only when
+actually necessary.
 
 > TODO: figure out more precisely the current status and plans; write them up
 
-Therefore, we'll follow the `SignedStatement`. The `StatementDistribution` subsystem is largely concerned
-with implementing a gossip protocol:
+Therefore, we'll follow the `SignedStatement`. The `StatementDistribution`
+subsystem is largely concerned with implementing a gossip protocol:
 
 ```mermaid
 sequenceDiagram
@@ -278,8 +327,8 @@ sequenceDiagram
     end
 ```
 
-But who are these `Listener`s who've asked to be notified about incoming `SignedStatement`s?
-Nobody, as yet.
+But who are these `Listener`s who've asked to be notified about incoming
+`SignedStatement`s? Nobody, as yet.
 
 Let's pick back up with the PoV Distribution subsystem.
 
@@ -305,11 +354,13 @@ sequenceDiagram
     Note over PD,NB: On receipt of a network PoV, PovDistribution forwards it to each Listener.<br/>It also penalizes bad gossipers.
 ```
 
-Unlike in the case of `StatementDistribution`, there is another subsystem which in various circumstances
-already registers a listener to be notified when a new `PoV` arrives: `CandidateBacking`. Note that this
-is the second time that `CandidateBacking` has gotten involved. The first instance was from the perspective
-of the validator choosing to second a candidate via its `CandidateSelection` subsystem. This time, it's
-from the perspective of some other validator, being informed that this foreign `PoV` has been received.
+Unlike in the case of `StatementDistribution`, there is another subsystem which
+in various circumstances already registers a listener to be notified when a new
+`PoV` arrives: `CandidateBacking`. Note that this is the second time that
+`CandidateBacking` has gotten involved. The first instance was from the
+perspective of the validator choosing to second a candidate via its
+`CandidateSelection` subsystem. This time, it's from the perspective of some
+other validator, being informed that this foreign `PoV` has been received.
 
 ```mermaid
 sequenceDiagram
@@ -326,10 +377,11 @@ sequenceDiagram
     CB ->> AS: StoreAvailableData
 ```
 
-At this point, things have gone a bit nonlinear. Let's pick up the thread again with `BitfieldSigning`. As
-the `Overseer` activates each relay parent, it starts a `BitfieldSigningJob` which operates on an extremely
-simple metric: after creation, it immediately goes to sleep for 1.5 seconds. On waking, it records the state
-of the world pertaining to availability at that moment.
+At this point, things have gone a bit nonlinear. Let's pick up the thread again
+with `BitfieldSigning`. As the `Overseer` activates each relay parent, it starts
+a `BitfieldSigningJob` which operates on an extremely simple metric: after
+creation, it immediately goes to sleep for 1.5 seconds. On waking, it records
+the state of the world pertaining to availability at that moment.
 
 ```mermaid
 sequenceDiagram
@@ -350,9 +402,10 @@ sequenceDiagram
     end
 ```
 
-`BitfieldDistribution` is, like the other `*Distribution` subsystems, primarily interested in implementing
-a peer-to-peer gossip network propagating its particular messages. However, it also serves as an essential
-relay passing the message along.
+`BitfieldDistribution` is, like the other `*Distribution` subsystems, primarily
+interested in implementing a peer-to-peer gossip network propagating its
+particular messages. However, it also serves as an essential relay passing the
+message along.
 
 ```mermaid
 sequenceDiagram
@@ -366,12 +419,14 @@ sequenceDiagram
     BD ->> NB: SendValidationMessage::BitfieldDistribution::Bitfield
 ```
 
-We've now seen the message flow to the `Provisioner`: both `CandidateBacking` and `BitfieldDistribution`
-contribute provisionable data. Now, let's look at that subsystem.
+We've now seen the message flow to the `Provisioner`: both `CandidateBacking`
+and `BitfieldDistribution` contribute provisionable data. Now, let's look at
+that subsystem.
 
-Much like the `BitfieldSigning` subsystem, the `Provisioner` creates a new job for each newly-activated
-leaf, and starts a timer. Unlike `BitfieldSigning`, we won't depict that part of the process, because
-the `Provisioner` also has other things going on.
+Much like the `BitfieldSigning` subsystem, the `Provisioner` creates a new job
+for each newly-activated leaf, and starts a timer. Unlike `BitfieldSigning`, we
+won't depict that part of the process, because the `Provisioner` also has other
+things going on.
 
 ```mermaid
 sequenceDiagram
@@ -411,8 +466,9 @@ sequenceDiagram
     end
 ```
 
-In principle, any arbitrary subsystem could send a `RequestInherentData` to the `Provisioner`. In practice,
-only the `ParachainsInherentDataProvider` does so.
+In principle, any arbitrary subsystem could send a `RequestInherentData` to the
+`Provisioner`. In practice, only the `ParachainsInherentDataProvider` does so.
 
-The tuple `(SignedAvailabilityBitfields, BackedCandidates, ParentHeader)` is injected by the `ParachainsInherentDataProvider`
-into the inherent data. From that point on, control passes from the node to the runtime.
+The tuple `(SignedAvailabilityBitfields, BackedCandidates, ParentHeader)` is
+injected by the `ParachainsInherentDataProvider` into the inherent data. From
+that point on, control passes from the node to the runtime.
diff --git a/polkadot/roadmap/implementers-guide/src/node/utility/availability-store.md b/polkadot/roadmap/implementers-guide/src/node/utility/availability-store.md
index bd61455934e43080502382c54b2c3c6b5afb85ce..71d3f32452314dec6c4687a5081b27d00a77eb83 100644
--- a/polkadot/roadmap/implementers-guide/src/node/utility/availability-store.md
+++ b/polkadot/roadmap/implementers-guide/src/node/utility/availability-store.md
@@ -9,13 +9,20 @@ The two data types:
 
 For each of these data we have pruning rules that determine how long we need to keep that data available.
 
-PoV hypothetically only need to be kept around until the block where the data was made fully available is finalized. However, disputes can revert finality, so we need to be a bit more conservative and we add a delay. We should keep the PoV until a block that finalized availability of it has been finalized for 1 day + 1 hour.
+PoV hypothetically only need to be kept around until the block where the data was made fully available is finalized.
+However, disputes can revert finality, so we need to be a bit more conservative and we add a delay. We should keep the
+PoV until a block that finalized availability of it has been finalized for 1 day + 1 hour.
 
-Availability chunks need to be kept available until the dispute period for the corresponding candidate has ended. We can accomplish this by using the same criterion as the above. This gives us a pruning condition of the block finalizing availability of the chunk being final for 1 day + 1 hour.
+Availability chunks need to be kept available until the dispute period for the corresponding candidate has ended. We can
+accomplish this by using the same criterion as the above. This gives us a pruning condition of the block finalizing
+availability of the chunk being final for 1 day + 1 hour.
 
-There is also the case where a validator commits to make a PoV available, but the corresponding candidate is never backed. In this case, we keep the PoV available for 1 hour.
+There is also the case where a validator commits to make a PoV available, but the corresponding candidate is never
+backed. In this case, we keep the PoV available for 1 hour.
 
-There may be multiple competing blocks all ending the availability phase for a particular candidate. Until finality, it will be unclear which of those is actually the canonical chain, so the pruning records for PoVs and Availability chunks should keep track of all such blocks.
+There may be multiple competing blocks all ending the availability phase for a particular candidate. Until finality, it
+will be unclear which of those is actually the canonical chain, so the pruning records for PoVs and Availability chunks
+should keep track of all such blocks.
 
 ## Lifetime of the block data and chunks in storage
 
@@ -44,7 +51,8 @@ We use an underlying Key-Value database where we assume we have the following op
 
 - `write(key, value)`
 - `read(key) -> Option<value>`
-- `iter_with_prefix(prefix) -> Iterator<(key, value)>` - gives all keys and values in lexicographical order where the key starts with `prefix`.
+- `iter_with_prefix(prefix) -> Iterator<(key, value)>` - gives all keys and values in lexicographical order where the
+  key starts with `prefix`.
 
 We use this database to encode the following schema:
 
@@ -57,7 +65,8 @@ We use this database to encode the following schema:
 ("prune_by_time", Timestamp, CandidateHash) -> Option<()>
 ```
 
-Timestamps are the wall-clock seconds since Unix epoch. Timestamps and block numbers are both encoded as big-endian so lexicographic order is ascending.
+Timestamps are the wall-clock seconds since Unix epoch. Timestamps and block numbers are both encoded as big-endian so
+lexicographic order is ascending.
 
 The meta information that we track per-candidate is defined as the `CandidateMeta` struct
 
@@ -80,9 +89,12 @@ enum State {
 }
 ```
 
-We maintain the invariant that if a candidate has a meta entry, its available data exists on disk if `data_available` is true. All chunks mentioned in the meta entry are available.
+We maintain the invariant that if a candidate has a meta entry, its available data exists on disk if `data_available` is
+true. All chunks mentioned in the meta entry are available.
 
-Additionally, there is exactly one `prune_by_time` entry which holds the candidate hash unless the state is `Unfinalized`. There may be zero, one, or many "unfinalized" keys with the given candidate, and this will correspond to the `state` of the meta entry.
+Additionally, there is exactly one `prune_by_time` entry which holds the candidate hash unless the state is
+`Unfinalized`. There may be zero, one, or many "unfinalized" keys with the given candidate, and this will correspond to
+the `state` of the meta entry.
 
 ## Protocol
 
@@ -96,9 +108,15 @@ Output:
 
 For each head in the `activated` list:
 
-- Load all ancestors of the head back to the finalized block so we don't miss anything if import notifications are missed. If a `StoreChunk` message is received for a candidate which has no entry, then we will prematurely lose the data.
-- Note any new candidates backed in the head. Update the `CandidateMeta` for each. If the `CandidateMeta` does not exist, create it as `Unavailable` with the current timestamp. Register a `"prune_by_time"` entry based on the current timestamp + 1 hour.
-- Note any new candidate included in the head. Update the `CandidateMeta` for each, performing a transition from `Unavailable` to `Unfinalized` if necessary. That includes removing the `"prune_by_time"` entry. Add the head hash and number to the state, if unfinalized. Add an `"unfinalized"` entry for the block and candidate.
+- Load all ancestors of the head back to the finalized block so we don't miss anything if import notifications are
+  missed. If a `StoreChunk` message is received for a candidate which has no entry, then we will prematurely lose the
+  data.
+- Note any new candidates backed in the head. Update the `CandidateMeta` for each. If the `CandidateMeta` does not
+  exist, create it as `Unavailable` with the current timestamp. Register a `"prune_by_time"` entry based on the current
+  timestamp + 1 hour.
+- Note any new candidate included in the head. Update the `CandidateMeta` for each, performing a transition from
+  `Unavailable` to `Unfinalized` if necessary. That includes removing the `"prune_by_time"` entry. Add the head hash and
+  number to the state, if unfinalized. Add an `"unfinalized"` entry for the block and candidate.
 - The `CandidateEvent` runtime API can be used for this purpose.
 
 On `OverseerSignal::BlockFinalized(finalized)` events:
@@ -106,17 +124,22 @@ On `OverseerSignal::BlockFinalized(finalized)` events:
 - for each key in `iter_with_prefix("unfinalized")`
   - Stop if the key is beyond `("unfinalized, finalized)`
   - For each block number f that we encounter, load the finalized hash for that block.
-    - The state of each `CandidateMeta` we encounter here must be `Unfinalized`, since we loaded the candidate from an `"unfinalized"` key.
+    - The state of each `CandidateMeta` we encounter here must be `Unfinalized`, since we loaded the candidate from an
+      `"unfinalized"` key.
     - For each candidate that we encounter under `f` and the finalized block hash,
-      - Update the `CandidateMeta` to have `State::Finalized`.  Remove all `"unfinalized"` entries from the old `Unfinalized` state.
+      - Update the `CandidateMeta` to have `State::Finalized`.  Remove all `"unfinalized"` entries from the old
+        `Unfinalized` state.
       - Register a `"prune_by_time"` entry for the candidate based on the current time + 1 day + 1 hour.
     - For each candidate that we encounter under `f` which is not under the finalized block hash,
       - Remove all entries under `f` in the `Unfinalized` state.
-      - If the `CandidateMeta` has state `Unfinalized` with an empty list of blocks, downgrade to `Unavailable` and re-schedule pruning under the timestamp + 1 hour. We do not prune here as the candidate still may be included in a descendant of the finalized chain.
+      - If the `CandidateMeta` has state `Unfinalized` with an empty list of blocks, downgrade to `Unavailable` and
+        re-schedule pruning under the timestamp + 1 hour. We do not prune here as the candidate still may be included in
+        a descendant of the finalized chain.
     - Remove all `"unfinalized"` keys under `f`.
 - Update `last_finalized` = finalized.
 
-  This is roughly `O(n * m)` where n is the number of blocks finalized since the last update, and `m` is the number of parachains.
+  This is roughly `O(n * m)` where n is the number of blocks finalized since the last update, and `m` is the number of
+  parachains.
 
 On `QueryAvailableData` message:
 
@@ -139,7 +162,8 @@ On `QueryChunk` message:
 On `QueryAllChunks` message:
 
 - Query `("meta", candidate_hash)`. If `None`, send an empty response and return.
-- For all `1` bits in the `chunks_stored`, query `("chunk", candidate_hash, index)`. Ignore but warn on errors, and return a vector of all loaded chunks.
+- For all `1` bits in the `chunks_stored`, query `("chunk", candidate_hash, index)`. Ignore but warn on errors, and
+  return a vector of all loaded chunks.
 
 On `QueryChunkAvailability` message:
 
@@ -149,14 +173,17 @@ On `QueryChunkAvailability` message:
 
 On `StoreChunk` message:
 
-- If there is a `CandidateMeta` under the candidate hash, set the bit of the erasure-chunk in the `chunks_stored` bitfield to `1`. If it was not `1` already, write the chunk under `("chunk", candidate_hash, chunk_index)`.
+- If there is a `CandidateMeta` under the candidate hash, set the bit of the erasure-chunk in the `chunks_stored`
+  bitfield to `1`. If it was not `1` already, write the chunk under `("chunk", candidate_hash, chunk_index)`.
 
   This is `O(n)` in the size of the chunk.
 
 On `StoreAvailableData` message:
 
-- Compute the erasure root of the available data and compare it with `expected_erasure_root`. Return `StoreAvailableDataError::InvalidErasureRoot` on mismatch.
-- If there is no `CandidateMeta` under the candidate hash, create it with `State::Unavailable(now)`. Load the `CandidateMeta` otherwise.
+- Compute the erasure root of the available data and compare it with `expected_erasure_root`. Return
+  `StoreAvailableDataError::InvalidErasureRoot` on mismatch.
+- If there is no `CandidateMeta` under the candidate hash, create it with `State::Unavailable(now)`. Load the
+  `CandidateMeta` otherwise.
 - Store `data` under `("available", candidate_hash)` and set `data_available` to true.
 - Store each chunk under `("chunk", candidate_hash, index)` and set every bit in `chunks_stored` to `1`.
 
@@ -172,12 +199,13 @@ Every 5 minutes, run a pruning routine:
   - For each erasure chunk bit set, remove `("chunk", candidate_hash, bit_index)`.
   - If `data_available`, remove `("available", candidate_hash)`
 
-  This is O(n * m) in the amount of candidates and average size of the data stored. This is probably the most expensive operation but does not need
-  to be run very often.
+  This is O(n * m) in the amount of candidates and average size of the data stored. This is probably the most expensive
+  operation but does not need to be run very often.
 
 ## Basic scenarios to test
 
-Basically we need to test the correctness of data flow through state FSMs described earlier. These tests obviously assume that some mocking of time is happening.
+Basically we need to test the correctness of data flow through state FSMs described earlier. These tests obviously
+assume that some mocking of time is happening.
 
 - Stored data that is never included pruned in necessary timeout
   - A block (and/or a chunk) is added to the store.
diff --git a/polkadot/roadmap/implementers-guide/src/node/utility/candidate-validation.md b/polkadot/roadmap/implementers-guide/src/node/utility/candidate-validation.md
index 4a1d02be556091b2e223996493bffadb7fd43476..376fa187de1bf4b18849ba8c8b134352fbe21630 100644
--- a/polkadot/roadmap/implementers-guide/src/node/utility/candidate-validation.md
+++ b/polkadot/roadmap/implementers-guide/src/node/utility/candidate-validation.md
@@ -2,7 +2,8 @@
 
 This subsystem is responsible for handling candidate validation requests. It is a simple request/response server.
 
-A variety of subsystems want to know if a parachain block candidate is valid. None of them care about the detailed mechanics of how a candidate gets validated, just the results. This subsystem handles those details.
+A variety of subsystems want to know if a parachain block candidate is valid. None of them care about the detailed
+mechanics of how a candidate gets validated, just the results. This subsystem handles those details.
 
 ## Protocol
 
@@ -12,35 +13,53 @@ Output: Validation result via the provided response side-channel.
 
 ## Functionality
 
-This subsystem groups the requests it handles in two categories:  *candidate validation* and *PVF pre-checking*. 
+This subsystem groups the requests it handles in two categories:  *candidate validation* and *PVF pre-checking*.
 
-The first category can be further subdivided in two request types: one which draws out validation data from the state, and another which accepts all validation data exhaustively. Validation returns three possible outcomes on the response channel: the candidate is valid, the candidate is invalid, or an internal error occurred. 
+The first category can be further subdivided in two request types: one which draws out validation data from the state,
+and another which accepts all validation data exhaustively. Validation returns three possible outcomes on the response
+channel: the candidate is valid, the candidate is invalid, or an internal error occurred.
 
-Parachain candidates are validated against their validation function: A piece of Wasm code that describes the state-transition of the parachain. Validation function execution is not metered. This means that an execution which is an infinite loop or simply takes too long must be forcibly exited by some other means. For this reason, we recommend dispatching candidate validation to be done on subprocesses which can be killed if they time-out.
+Parachain candidates are validated against their validation function: A piece of Wasm code that describes the
+state-transition of the parachain. Validation function execution is not metered. This means that an execution which is
+an infinite loop or simply takes too long must be forcibly exited by some other means. For this reason, we recommend
+dispatching candidate validation to be done on subprocesses which can be killed if they time-out.
 
-Upon receiving a validation request, the first thing the candidate validation subsystem should do is make sure it has all the necessary parameters to the validation function. These are:
+Upon receiving a validation request, the first thing the candidate validation subsystem should do is make sure it has
+all the necessary parameters to the validation function. These are:
   * The Validation Function itself.
   * The [`CandidateDescriptor`](../../types/candidate.md#candidatedescriptor).
   * The [`ValidationData`](../../types/candidate.md#validationdata).
   * The [`PoV`](../../types/availability.md#proofofvalidity).
 
-The second category is for PVF pre-checking. This is primarly used by the [PVF pre-checker](pvf-prechecker.md) subsystem.
+The second category is for PVF pre-checking. This is primarly used by the [PVF pre-checker](pvf-prechecker.md)
+subsystem.
 
 ### Determining Parameters
 
 For a [`CandidateValidationMessage`][CVM]`::ValidateFromExhaustive`, these parameters are exhaustively provided.
 
-For a [`CandidateValidationMessage`][CVM]`::ValidateFromChainState`, some more work needs to be done. Due to the uncertainty of Availability Cores (implemented in the [`Scheduler`](../../runtime/scheduler.md) module of the runtime), a candidate at a particular relay-parent and for a particular para may have two different valid validation-data to be executed under depending on what is assumed to happen if the para is occupying a core at the onset of the new block. This is encoded as an `OccupiedCoreAssumption` in the runtime API.
+For a [`CandidateValidationMessage`][CVM]`::ValidateFromChainState`, some more work needs to be done. Due to the
+uncertainty of Availability Cores (implemented in the [`Scheduler`](../../runtime/scheduler.md) module of the runtime),
+a candidate at a particular relay-parent and for a particular para may have two different valid validation-data to be
+executed under depending on what is assumed to happen if the para is occupying a core at the onset of the new block.
+This is encoded as an `OccupiedCoreAssumption` in the runtime API.
 
-The way that we can determine which assumption the candidate is meant to be executed under is simply to do an exhaustive check of both possibilities based on the state of the relay-parent. First we fetch the validation data under the assumption that the block occupying becomes available. If the `validation_data_hash` of the `CandidateDescriptor` matches this validation data, we use that. Otherwise, if the `validation_data_hash` matches the validation data fetched under the `TimedOut` assumption, we use that. Otherwise, we return a `ValidationResult::Invalid` response and conclude.
+The way that we can determine which assumption the candidate is meant to be executed under is simply to do an exhaustive
+check of both possibilities based on the state of the relay-parent. First we fetch the validation data under the
+assumption that the block occupying becomes available. If the `validation_data_hash` of the `CandidateDescriptor`
+matches this validation data, we use that. Otherwise, if the `validation_data_hash` matches the validation data fetched
+under the `TimedOut` assumption, we use that. Otherwise, we return a `ValidationResult::Invalid` response and conclude.
 
-Then, we can fetch the validation code from the runtime based on which type of candidate this is. This gives us all the parameters. The descriptor and PoV come from the request itself, and the other parameters have been derived from the state.
+Then, we can fetch the validation code from the runtime based on which type of candidate this is. This gives us all the
+parameters. The descriptor and PoV come from the request itself, and the other parameters have been derived from the
+state.
 
 > TODO: This would be a great place for caching to avoid making lots of runtime requests. That would need a job, though.
 
 ### Execution of the Parachain Wasm
 
-Once we have all parameters, we can spin up a background task to perform the validation in a way that doesn't hold up the entire event loop. Before invoking the validation function itself, this should first do some basic checks:
+Once we have all parameters, we can spin up a background task to perform the validation in a way that doesn't hold up
+the entire event loop. Before invoking the validation function itself, this should first do some basic checks:
   * The collator signature is valid
   * The PoV provided matches the `pov_hash` field of the descriptor
 
@@ -48,6 +67,8 @@ For more details please see [PVF Host and Workers](pvf-host-and-workers.md).
 
 ### Checking Validation Outputs
 
-If we can assume the presence of the relay-chain state (that is, during processing [`CandidateValidationMessage`][CVM]`::ValidateFromChainState`) we can run all the checks that the relay-chain would run at the inclusion time thus confirming that the candidate will be accepted.
+If we can assume the presence of the relay-chain state (that is, during processing
+[`CandidateValidationMessage`][CVM]`::ValidateFromChainState`) we can run all the checks that the relay-chain would run
+at the inclusion time thus confirming that the candidate will be accepted.
 
 [CVM]: ../../types/overseer-protocol.md#validationrequesttype
diff --git a/polkadot/roadmap/implementers-guide/src/node/utility/chain-api.md b/polkadot/roadmap/implementers-guide/src/node/utility/chain-api.md
index e9ef9b5695bc386ca9f0bc493b151fd6f0dff892..aab4f2d5cb5625d4a5399217ca979b9d6a6670aa 100644
--- a/polkadot/roadmap/implementers-guide/src/node/utility/chain-api.md
+++ b/polkadot/roadmap/implementers-guide/src/node/utility/chain-api.md
@@ -1,6 +1,7 @@
 # Chain API
 
-The Chain API subsystem is responsible for providing a single point of access to chain state data via a set of pre-determined queries.
+The Chain API subsystem is responsible for providing a single point of access to chain state data via a set of
+pre-determined queries.
 
 ## Protocol
 
@@ -10,7 +11,8 @@ Output: None
 
 ## Functionality
 
-On receipt of `ChainApiMessage`, answer the request and provide the response to the side-channel embedded within the request.
+On receipt of `ChainApiMessage`, answer the request and provide the response to the side-channel embedded within the
+request.
 
 Currently, the following requests are supported:
 * Block hash to number
diff --git a/polkadot/roadmap/implementers-guide/src/node/utility/chain-selection.md b/polkadot/roadmap/implementers-guide/src/node/utility/chain-selection.md
index 640691e559615b3f703535aa82658a3c6c9693d9..1d1358b228b61295e7b41d4256b5fa387ebd9af2 100644
--- a/polkadot/roadmap/implementers-guide/src/node/utility/chain-selection.md
+++ b/polkadot/roadmap/implementers-guide/src/node/utility/chain-selection.md
@@ -1,8 +1,12 @@
 # Chain Selection Subsystem
 
-This subsystem implements the necessary metadata for the implementation of the [chain selection](../../protocol-chain-selection.md) portion of the protocol.
+This subsystem implements the necessary metadata for the implementation of the [chain
+selection](../../protocol-chain-selection.md) portion of the protocol.
 
-The subsystem wraps a database component which maintains a view of the unfinalized chain and records the properties of each block: whether the block is **viable**, whether it is **stagnant**, and whether it is **reverted**. It should also maintain an updated set of active leaves in accordance with this view, which should be cheap to query. Leaves are ordered descending first by weight and then by block number.
+The subsystem wraps a database component which maintains a view of the unfinalized chain and records the properties of
+each block: whether the block is **viable**, whether it is **stagnant**, and whether it is **reverted**. It should also
+maintain an updated set of active leaves in accordance with this view, which should be cheap to query. Leaves are
+ordered descending first by weight and then by block number.
 
 This subsystem needs to update its information on the unfinalized chain:
   * On every leaf-activated signal
@@ -11,32 +15,47 @@ This subsystem needs to update its information on the unfinalized chain:
   * On every `ChainSelectionMessage::RevertBlocks`
   * Periodically, to detect stagnation.
 
-Simple implementations of these updates do `O(n_unfinalized_blocks)` disk operations. If the amount of unfinalized blocks is relatively small, the updates should not take very much time. However, in cases where there are hundreds or thousands of unfinalized blocks the naive implementations of these update algorithms would have to be replaced with more sophisticated versions.
+Simple implementations of these updates do `O(n_unfinalized_blocks)` disk operations. If the amount of unfinalized
+blocks is relatively small, the updates should not take very much time. However, in cases where there are hundreds or
+thousands of unfinalized blocks the naive implementations of these update algorithms would have to be replaced with more
+sophisticated versions.
 
-### `OverseerSignal::ActiveLeavesUpdate`
+## `OverseerSignal::ActiveLeavesUpdate`
 
-Determine all new blocks implicitly referenced by any new active leaves and add them to the view. Update the set of viable leaves accordingly. The weights of imported blocks can be determined by the [`ChainApiMessage::BlockWeight`](../../types/overseer-protocol.md#chain-api-message).
+Determine all new blocks implicitly referenced by any new active leaves and add them to the view. Update the set of
+viable leaves accordingly. The weights of imported blocks can be determined by the
+[`ChainApiMessage::BlockWeight`](../../types/overseer-protocol.md#chain-api-message).
 
-### `OverseerSignal::BlockFinalized`
+## `OverseerSignal::BlockFinalized`
 
-Delete data for all orphaned chains and update all metadata descending from the new finalized block accordingly, along with the set of viable leaves. Note that finalizing a **reverted** or **stagnant** block means that the descendants of those blocks may lose that status because the definitions of those properties don't include the finalized chain. Update the set of viable leaves accordingly.
+Delete data for all orphaned chains and update all metadata descending from the new finalized block accordingly, along
+with the set of viable leaves. Note that finalizing a **reverted** or **stagnant** block means that the descendants of
+those blocks may lose that status because the definitions of those properties don't include the finalized chain. Update
+the set of viable leaves accordingly.
 
-### `ChainSelectionMessage::Approved`
+## `ChainSelectionMessage::Approved`
 
-Update the approval status of the referenced block. If the block was stagnant and thus non-viable and is now viable, then the metadata of all of its descendants needs to be updated as well, as they may no longer be stagnant either. Update the set of viable leaves accordingly.
+Update the approval status of the referenced block. If the block was stagnant and thus non-viable and is now viable,
+then the metadata of all of its descendants needs to be updated as well, as they may no longer be stagnant either.
+Update the set of viable leaves accordingly.
 
-### `ChainSelectionMessage::Leaves`
+## `ChainSelectionMessage::Leaves`
 
-Gets all leaves of the chain, i.e. block hashes that are suitable to build upon and have no suitable children. Supplies the leaves in descending order by score.
+Gets all leaves of the chain, i.e. block hashes that are suitable to build upon and have no suitable children. Supplies
+the leaves in descending order by score.
 
-### `ChainSelectionMessage::BestLeafContaining`
+## `ChainSelectionMessage::BestLeafContaining`
 
-If the required block is unknown or not viable, then return `None`. Iterate over all leaves in order of descending weight, returning the first leaf containing the required block in its chain, and `None` otherwise.
+If the required block is unknown or not viable, then return `None`. Iterate over all leaves in order of descending
+weight, returning the first leaf containing the required block in its chain, and `None` otherwise.
 
-### `ChainSelectionMessage::RevertBlocks`
-This message indicates that a dispute has concluded against a parachain block candidate. The message passes along a vector containing the block number and block hash of each block where the disputed candidate was included. The passed blocks will be marked as reverted, and their descendants will be marked as non-viable.
+## `ChainSelectionMessage::RevertBlocks`
+This message indicates that a dispute has concluded against a parachain block candidate. The message passes along a
+vector containing the block number and block hash of each block where the disputed candidate was included. The passed
+blocks will be marked as reverted, and their descendants will be marked as non-viable.
 
 
-### Periodically
+## Periodically
 
-Detect stagnant blocks and apply the stagnant definition to all descendants. Update the set of viable leaves accordingly.
+Detect stagnant blocks and apply the stagnant definition to all descendants. Update the set of viable leaves
+accordingly.
diff --git a/polkadot/roadmap/implementers-guide/src/node/utility/network-bridge.md b/polkadot/roadmap/implementers-guide/src/node/utility/network-bridge.md
index 3245772d9d8d180fef6f7e8b7374ea03c34b72c3..d2506fbe83e3ff15e786fddafa83c28bc7b63ac2 100644
--- a/polkadot/roadmap/implementers-guide/src/node/utility/network-bridge.md
+++ b/polkadot/roadmap/implementers-guide/src/node/utility/network-bridge.md
@@ -1,30 +1,43 @@
 # Network Bridge
 
-One of the main features of the overseer/subsystem duality is to avoid shared ownership of resources and to communicate via message-passing. However, implementing each networking subsystem as its own network protocol brings a fair share of challenges.
-
-The most notable challenge is coordinating and eliminating race conditions of peer connection and disconnection events. If we have many network protocols that peers are supposed to be connected on, it is difficult to enforce that a peer is indeed connected on all of them or the order in which those protocols receive notifications that peers have connected. This becomes especially difficult when attempting to share peer state across protocols. All of the Parachain-Host's gossip protocols eliminate DoS with a data-dependency on current chain heads. However, it is inefficient and confusing to implement the logic for tracking our current chain heads as well as our peers' on each of those subsystems. Having one subsystem for tracking this shared state and distributing it to the others is an improvement in architecture and efficiency.
-
-One other piece of shared state to track is peer reputation. When peers are found to have provided value or cost, we adjust their reputation accordingly.
-
-So in short, this Subsystem acts as a bridge between an actual network component and a subsystem's protocol. The implementation of the underlying network component is beyond the scope of this module. We make certain assumptions about the network component:
-  * The network allows registering of protocols and multiple versions of each protocol.
-  * The network handles version negotiation of protocols with peers and only connects the peer on the highest version of the protocol.
-  * Each protocol has its own peer-set, although there may be some overlap.
-  * The network provides peer-set management utilities for discovering the peer-IDs of validators and a means of dialing peers with given IDs.
-
-
-The network bridge makes use of the peer-set feature, but is not generic over peer-set. Instead, it exposes two peer-sets that event producers can attach to: `Validation` and `Collation`. More information can be found on the documentation of the [`NetworkBridgeMessage`][NBM].
+One of the main features of the overseer/subsystem duality is to avoid shared ownership of resources and to communicate
+via message-passing. However, implementing each networking subsystem as its own network protocol brings a fair share of
+challenges.
+
+The most notable challenge is coordinating and eliminating race conditions of peer connection and disconnection events.
+If we have many network protocols that peers are supposed to be connected on, it is difficult to enforce that a peer is
+indeed connected on all of them or the order in which those protocols receive notifications that peers have connected.
+This becomes especially difficult when attempting to share peer state across protocols. All of the Parachain-Host's
+gossip protocols eliminate DoS with a data-dependency on current chain heads. However, it is inefficient and confusing
+to implement the logic for tracking our current chain heads as well as our peers' on each of those subsystems. Having
+one subsystem for tracking this shared state and distributing it to the others is an improvement in architecture and
+efficiency.
+
+One other piece of shared state to track is peer reputation. When peers are found to have provided value or cost, we
+adjust their reputation accordingly.
+
+So in short, this Subsystem acts as a bridge between an actual network component and a subsystem's protocol. The
+implementation of the underlying network component is beyond the scope of this module. We make certain assumptions about
+the network component:
+  - The network allows registering of protocols and multiple versions of each protocol.
+  - The network handles version negotiation of protocols with peers and only connects the peer on the highest version of
+    the protocol.
+  - Each protocol has its own peer-set, although there may be some overlap.
+  - The network provides peer-set management utilities for discovering the peer-IDs of validators and a means of dialing
+    peers with given IDs.
+
+The network bridge makes use of the peer-set feature, but is not generic over peer-set. Instead, it exposes two
+peer-sets that event producers can attach to: `Validation` and `Collation`. More information can be found on the
+documentation of the [`NetworkBridgeMessage`][NBM].
 
 ## Protocol
 
 Input: [`NetworkBridgeMessage`][NBM]
 
-
-Output:
-	- [`ApprovalDistributionMessage`][AppD]`::NetworkBridgeUpdate`
-	- [`BitfieldDistributionMessage`][BitD]`::NetworkBridgeUpdate`
-	- [`CollatorProtocolMessage`][CollP]`::NetworkBridgeUpdate`
-	- [`StatementDistributionMessage`][StmtD]`::NetworkBridgeUpdate`
+Output: - [`ApprovalDistributionMessage`][AppD]`::NetworkBridgeUpdate` -
+	[`BitfieldDistributionMessage`][BitD]`::NetworkBridgeUpdate` -
+	[`CollatorProtocolMessage`][CollP]`::NetworkBridgeUpdate` -
+	[`StatementDistributionMessage`][StmtD]`::NetworkBridgeUpdate`
 
 ## Functionality
 
@@ -37,7 +50,8 @@ enum WireMessage<M> {
 }
 ```
 
-and instantiates this type twice, once using the [`ValidationProtocolV1`][VP1] message type, and once with the [`CollationProtocolV1`][CP1] message type.
+and instantiates this type twice, once using the [`ValidationProtocolV1`][VP1] message type, and once with the
+[`CollationProtocolV1`][CP1] message type.
 
 ```rust
 type ValidationV1Message = WireMessage<ValidationProtocolV1>;
@@ -46,17 +60,21 @@ type CollationV1Message = WireMessage<CollationProtocolV1>;
 
 ### Startup
 
-On startup, we register two protocols with the underlying network utility. One for validation and one for collation. We register only version 1 of each of these protocols.
+On startup, we register two protocols with the underlying network utility. One for validation and one for collation. We
+register only version 1 of each of these protocols.
 
 ### Main Loop
 
-The bulk of the work done by this subsystem is in responding to network events, signals from the overseer, and messages from other subsystems.
+The bulk of the work done by this subsystem is in responding to network events, signals from the overseer, and messages
+from other subsystems.
 
 Each network event is associated with a particular peer-set.
 
 ### Overseer Signal: `ActiveLeavesUpdate`
 
-The `activated` and `deactivated` lists determine the evolution of our local view over time. A `ProtocolMessage::ViewUpdate` is issued to each connected peer on each peer-set, and a `NetworkBridgeEvent::OurViewChange` is issued to each event handler for each protocol.
+The `activated` and `deactivated` lists determine the evolution of our local view over time. A
+`ProtocolMessage::ViewUpdate` is issued to each connected peer on each peer-set, and a
+`NetworkBridgeEvent::OurViewChange` is issued to each event handler for each protocol.
 
 We only send view updates if the node has indicated that it has finished major blockchain synchronization.
 
@@ -64,24 +82,31 @@ If we are connected to the same peer on both peer-sets, we will send the peer tw
 
 ### Overseer Signal: `BlockFinalized`
 
-We update our view's `finalized_number` to the provided one and delay `ProtocolMessage::ViewUpdate` and `NetworkBridgeEvent::OurViewChange` till the next `ActiveLeavesUpdate`.
+We update our view's `finalized_number` to the provided one and delay `ProtocolMessage::ViewUpdate` and
+`NetworkBridgeEvent::OurViewChange` till the next `ActiveLeavesUpdate`.
 
 ### Network Event: `PeerConnected`
 
-Issue a `NetworkBridgeEvent::PeerConnected` for each [Event Handler](#event-handlers) of the peer-set and negotiated protocol version of the peer. Also issue a `NetworkBridgeEvent::PeerViewChange` and send the peer our current view, but only if the node has indicated that it has finished major blockchain synchronization. Otherwise, we only send the peer an empty view.
+Issue a `NetworkBridgeEvent::PeerConnected` for each [Event Handler](#event-handlers) of the peer-set and negotiated
+protocol version of the peer. Also issue a `NetworkBridgeEvent::PeerViewChange` and send the peer our current view, but
+only if the node has indicated that it has finished major blockchain synchronization. Otherwise, we only send the peer
+an empty view.
 
 ### Network Event: `PeerDisconnected`
 
-Issue a `NetworkBridgeEvent::PeerDisconnected` for each [Event Handler](#event-handlers) of the peer-set and negotiated protocol version of the peer.
+Issue a `NetworkBridgeEvent::PeerDisconnected` for each [Event Handler](#event-handlers) of the peer-set and negotiated
+protocol version of the peer.
 
 ### Network Event: `ProtocolMessage`
 
-Map the message onto the corresponding [Event Handler](#event-handlers) based on the peer-set this message was received on and dispatch via overseer.
+Map the message onto the corresponding [Event Handler](#event-handlers) based on the peer-set this message was received
+on and dispatch via overseer.
 
 ### Network Event: `ViewUpdate`
 
 - Check that the new view is valid and note it as the most recent view update of the peer on this peer-set.
-- Map a `NetworkBridgeEvent::PeerViewChange` onto the corresponding [Event Handler](#event-handlers) based on the peer-set this message was received on and dispatch  via overseer.
+- Map a `NetworkBridgeEvent::PeerViewChange` onto the corresponding [Event Handler](#event-handlers) based on the
+  peer-set this message was received on and dispatch  via overseer.
 
 ### `ReportPeer`
 
@@ -108,22 +133,23 @@ Map the message onto the corresponding [Event Handler](#event-handlers) based on
 
 ### `NewGossipTopology`
 
-- Map all `AuthorityDiscoveryId`s to `PeerId`s and issue a corresponding `NetworkBridgeUpdate`
-  to all validation subsystems.
+- Map all `AuthorityDiscoveryId`s to `PeerId`s and issue a corresponding `NetworkBridgeUpdate` to all validation
+  subsystems.
 
 ## Event Handlers
 
-Network bridge event handlers are the intended recipients of particular network protocol messages. These are each a variant of a message to be sent via the overseer.
+Network bridge event handlers are the intended recipients of particular network protocol messages. These are each a
+variant of a message to be sent via the overseer.
 
 ### Validation V1
 
-* `ApprovalDistributionV1Message -> ApprovalDistributionMessage::NetworkBridgeUpdate`
-* `BitfieldDistributionV1Message -> BitfieldDistributionMessage::NetworkBridgeUpdate`
-* `StatementDistributionV1Message -> StatementDistributionMessage::NetworkBridgeUpdate`
+- `ApprovalDistributionV1Message -> ApprovalDistributionMessage::NetworkBridgeUpdate`
+- `BitfieldDistributionV1Message -> BitfieldDistributionMessage::NetworkBridgeUpdate`
+- `StatementDistributionV1Message -> StatementDistributionMessage::NetworkBridgeUpdate`
 
 ### Collation V1
 
-* `CollatorProtocolV1Message -> CollatorProtocolMessage::NetworkBridgeUpdate`
+- `CollatorProtocolV1Message -> CollatorProtocolMessage::NetworkBridgeUpdate`
 
 [NBM]: ../../types/overseer-protocol.md#network-bridge-message
 [AppD]: ../../types/overseer-protocol.md#approval-distribution-message
diff --git a/polkadot/roadmap/implementers-guide/src/node/utility/provisioner.md b/polkadot/roadmap/implementers-guide/src/node/utility/provisioner.md
index a3998cabba6ce67f7eb43ff12591f6213530fa2a..0b4fe6a458732de10c2dcd23466ba30f9a46924c 100644
--- a/polkadot/roadmap/implementers-guide/src/node/utility/provisioner.md
+++ b/polkadot/roadmap/implementers-guide/src/node/utility/provisioner.md
@@ -1,28 +1,43 @@
 # Provisioner
 
-Relay chain block authorship authority is governed by BABE and is beyond the scope of the Overseer and the rest of the subsystems. That said, ultimately the block author needs to select a set of backable parachain candidates and other consensus data, and assemble a block from them. This subsystem is responsible for providing the necessary data to all potential block authors. 
+Relay chain block authorship authority is governed by BABE and is beyond the scope of the Overseer and the rest of the
+subsystems. That said, ultimately the block author needs to select a set of backable parachain candidates and other
+consensus data, and assemble a block from them. This subsystem is responsible for providing the necessary data to all
+potential block authors.
 
 ## Provisionable Data
 
-There are several distinct types of provisionable data, but they share this property in common: all should eventually be included in a relay chain block.
+There are several distinct types of provisionable data, but they share this property in common: all should eventually be
+included in a relay chain block.
 
 ### Backed Candidates
 
-The block author can choose 0 or 1 backed parachain candidates per parachain; the only constraint is that each backable candidate has the appropriate relay parent. However, the choice of a backed candidate must be the block author's. The provisioner subsystem is how those block authors make this choice in practice.
+The block author can choose 0 or 1 backed parachain candidates per parachain; the only constraint is that each backable
+candidate has the appropriate relay parent. However, the choice of a backed candidate must be the block author's. The
+provisioner subsystem is how those block authors make this choice in practice.
 
 ### Signed Bitfields
 
-[Signed bitfields](../../types/availability.md#signed-availability-bitfield) are attestations from a particular validator about which candidates it believes are available. Those will only be provided on fresh leaves.
+[Signed bitfields](../../types/availability.md#signed-availability-bitfield) are attestations from a particular
+validator about which candidates it believes are available. Those will only be provided on fresh leaves.
 
 ### Misbehavior Reports
 
-Misbehavior reports are self-contained proofs of misbehavior by a validator or group of validators. For example, it is very easy to verify a double-voting misbehavior report: the report contains two votes signed by the same key, advocating different outcomes. Concretely, misbehavior reports become inherents which cause dots to be slashed.
+Misbehavior reports are self-contained proofs of misbehavior by a validator or group of validators. For example, it is
+very easy to verify a double-voting misbehavior report: the report contains two votes signed by the same key, advocating
+different outcomes. Concretely, misbehavior reports become inherents which cause dots to be slashed.
 
-Note that there is no mechanism in place which forces a block author to include a misbehavior report which it doesn't like, for example if it would be slashed by such a report. The chain's defense against this is to have a relatively long slash period, such that it's likely to encounter an honest author before the slash period expires.
+Note that there is no mechanism in place which forces a block author to include a misbehavior report which it doesn't
+like, for example if it would be slashed by such a report. The chain's defense against this is to have a relatively long
+slash period, such that it's likely to encounter an honest author before the slash period expires.
 
 ### Dispute Inherent
 
-The dispute inherent is similar to a misbehavior report in that it is an attestation of misbehavior on the part of a validator or group of validators. Unlike a misbehavior report, it is not self-contained: resolution requires coordinated action by several validators. The canonical example of a dispute inherent involves an approval checker discovering that a set of validators has improperly approved an invalid parachain block: resolving this requires the entire validator set to re-validate the block, so that the minority can be slashed.
+The dispute inherent is similar to a misbehavior report in that it is an attestation of misbehavior on the part of a
+validator or group of validators. Unlike a misbehavior report, it is not self-contained: resolution requires coordinated
+action by several validators. The canonical example of a dispute inherent involves an approval checker discovering that
+a set of validators has improperly approved an invalid parachain block: resolving this requires the entire validator set
+to re-validate the block, so that the minority can be slashed.
 
 Dispute resolution is complex and is explained in substantially more detail [here](../../runtime/disputes.md).
 
@@ -34,58 +49,85 @@ The subsystem should maintain a set of handles to Block Authorship Provisioning
 
 - `ActiveLeavesUpdate`:
   - For each `activated` head:
-    - spawn a Block Authorship Provisioning iteration with the given relay parent, storing a bidirectional channel with that iteration.
+    - spawn a Block Authorship Provisioning iteration with the given relay parent, storing a bidirectional channel with
+      that iteration.
   - For each `deactivated` head:
     - terminate the Block Authorship Provisioning iteration for the given relay parent, if any.
-- `Conclude`: Forward `Conclude` to all iterations, waiting a small amount of time for them to join, and then hard-exiting.
+- `Conclude`: Forward `Conclude` to all iterations, waiting a small amount of time for them to join, and then
+  hard-exiting.
 
 ### On `ProvisionerMessage`
 
-Forward the message to the appropriate Block Authorship Provisioning iteration, or discard if no appropriate iteration is currently active.
+Forward the message to the appropriate Block Authorship Provisioning iteration, or discard if no appropriate iteration
+is currently active.
 
 ### Per Provisioning Iteration
 
-Input: [`ProvisionerMessage`](../../types/overseer-protocol.md#provisioner-message). Backed candidates come from the [Candidate Backing subsystem](../backing/candidate-backing.md), signed bitfields come from the [Bitfield Distribution subsystem](../availability/bitfield-distribution.md), and disputes come from the [Disputes Subsystem](../disputes/dispute-coordinator.md). Misbehavior reports are currently sent from the [Candidate Backing subsystem](../backing/candidate-backing.md) and contain the following misbehaviors:
+Input: [`ProvisionerMessage`](../../types/overseer-protocol.md#provisioner-message). Backed candidates come from the
+[Candidate Backing subsystem](../backing/candidate-backing.md), signed bitfields come from the [Bitfield Distribution
+subsystem](../availability/bitfield-distribution.md), and disputes come from the [Disputes
+Subsystem](../disputes/dispute-coordinator.md). Misbehavior reports are currently sent from the [Candidate Backing
+subsystem](../backing/candidate-backing.md) and contain the following misbehaviors:
 
 1. `Misbehavior::ValidityDoubleVote`
 2. `Misbehavior::MultipleCandidates`
 3. `Misbehavior::UnauthorizedStatement`
 4. `Misbehavior::DoubleSign`
 
-But we choose not to punish these forms of misbehavior for the time being. Risks from misbehavior are sufficiently mitigated at the protocol level via reputation changes. Punitive actions here may become desirable enough to dedicate time to in the future.
+But we choose not to punish these forms of misbehavior for the time being. Risks from misbehavior are sufficiently
+mitigated at the protocol level via reputation changes. Punitive actions here may become desirable enough to dedicate
+time to in the future.
 
 At initialization, this subsystem has no outputs.
 
-Block authors request the inherent data they should use for constructing the inherent in the block which contains parachain execution information.
+Block authors request the inherent data they should use for constructing the inherent in the block which contains
+parachain execution information.
 
 ## Block Production
 
-When a validator is selected by BABE to author a block, it becomes a block producer. The provisioner is the subsystem best suited to choosing which specific backed candidates and availability bitfields should be assembled into the block. To engage this functionality, a `ProvisionerMessage::RequestInherentData` is sent; the response is a [`ParaInherentData`](../../types/runtime.md#parainherentdata). Each relay chain block backs at most one backable parachain block candidate per parachain. Additionally no further block candidate can be backed until the previous one either gets declared available or expired. If bitfields indicate that candidate A, predecessor of B, should be declared available, then B can be backed in the same relay block. Appropriate bitfields, as outlined in the section on [bitfield selection](#bitfield-selection), and any dispute statements should be attached as well.
+When a validator is selected by BABE to author a block, it becomes a block producer. The provisioner is the subsystem
+best suited to choosing which specific backed candidates and availability bitfields should be assembled into the block.
+To engage this functionality, a `ProvisionerMessage::RequestInherentData` is sent; the response is a
+[`ParaInherentData`](../../types/runtime.md#parainherentdata). Each relay chain block backs at most one backable
+parachain block candidate per parachain. Additionally no further block candidate can be backed until the previous one
+either gets declared available or expired. If bitfields indicate that candidate A, predecessor of B, should be declared
+available, then B can be backed in the same relay block. Appropriate bitfields, as outlined in the section on [bitfield
+selection](#bitfield-selection), and any dispute statements should be attached as well.
 
 ### Bitfield Selection
 
-Our goal with respect to bitfields is simple: maximize availability. However, it's not quite as simple as always including all bitfields; there are constraints which still need to be met:
+Our goal with respect to bitfields is simple: maximize availability. However, it's not quite as simple as always
+including all bitfields; there are constraints which still need to be met:
 
 - not more than one bitfield per validator
 - each 1 bit must correspond to an occupied core
 
-Beyond that, a semi-arbitrary selection policy is fine. In order to meet the goal of maximizing availability, a heuristic of picking the bitfield with the greatest number of 1 bits set in the event of conflict is useful.
+Beyond that, a semi-arbitrary selection policy is fine. In order to meet the goal of maximizing availability, a
+heuristic of picking the bitfield with the greatest number of 1 bits set in the event of conflict is useful.
 
 ### Dispute Statement Selection
 
-This is the point at which the block author provides further votes to active disputes or initiates new disputes in the runtime state.
+This is the point at which the block author provides further votes to active disputes or initiates new disputes in the
+runtime state.
 
-The block-authoring logic of the runtime has an extra step between handling the inherent-data and producing the actual inherent call, which we assume performs the work of filtering out disputes which are not relevant to the on-chain state. Backing votes are always kept in the dispute statement set. This ensures we punish the maximum number of misbehaving backers.
+The block-authoring logic of the runtime has an extra step between handling the inherent-data and producing the actual
+inherent call, which we assume performs the work of filtering out disputes which are not relevant to the on-chain state.
+Backing votes are always kept in the dispute statement set. This ensures we punish the maximum number of misbehaving
+backers.
 
 To select disputes:
 
-- Issue a `DisputeCoordinatorMessage::RecentDisputes` message and wait for the response. This is a set of all disputes in recent sessions which we are aware of.
+- Issue a `DisputeCoordinatorMessage::RecentDisputes` message and wait for the response. This is a set of all disputes
+  in recent sessions which we are aware of.
 
 ### Determining Bitfield Availability
 
-An occupied core has a `CoreAvailability` bitfield. We also have a list of `SignedAvailabilityBitfield`s. We need to determine from these whether or not a core at a particular index has become available.
+An occupied core has a `CoreAvailability` bitfield. We also have a list of `SignedAvailabilityBitfield`s. We need to
+determine from these whether or not a core at a particular index has become available.
 
-The key insight required is that `CoreAvailability` is transverse to the `SignedAvailabilityBitfield`s: if we conceptualize the list of bitfields as many rows, each bit of which is its own column, then `CoreAvailability` for a given core index is the vertical slice of bits in the set at that index.
+The key insight required is that `CoreAvailability` is transverse to the `SignedAvailabilityBitfield`s: if we
+conceptualize the list of bitfields as many rows, each bit of which is its own column, then `CoreAvailability` for a
+given core index is the vertical slice of bits in the set at that index.
 
 To compute bitfield availability, then:
 
@@ -97,16 +139,22 @@ To compute bitfield availability, then:
 
 ### Candidate Selection: Prospective Parachains Mode
 
-The state of the provisioner `PerRelayParent` tracks an important setting, `ProspectiveParachainsMode`. This setting determines which backable candidate selection method the provisioner uses.
+The state of the provisioner `PerRelayParent` tracks an important setting, `ProspectiveParachainsMode`. This setting
+determines which backable candidate selection method the provisioner uses.
 
-`ProspectiveParachainsMode::Disabled` - The provisioner uses its own internal legacy candidate selection. 
-`ProspectiveParachainsMode::Enabled` - The provisioner requests that [prospective parachains](../backing/prospective-parachains.md) provide selected candidates.
+`ProspectiveParachainsMode::Disabled` - The provisioner uses its own internal legacy candidate selection.
+`ProspectiveParachainsMode::Enabled` - The provisioner requests that [prospective
+parachains](../backing/prospective-parachains.md) provide selected candidates.
 
-Candidates selected with `ProspectiveParachainsMode::Enabled` are able to benefit from the increased block production time asynchronous backing allows. For this reason all Polkadot protocol networks will eventually use prospective parachains candidate selection. Then legacy candidate selection will be removed as obsolete.
+Candidates selected with `ProspectiveParachainsMode::Enabled` are able to benefit from the increased block production
+time asynchronous backing allows. For this reason all Polkadot protocol networks will eventually use prospective
+parachains candidate selection. Then legacy candidate selection will be removed as obsolete.
 
 ### Prospective Parachains Candidate Selection
 
-The goal of candidate selection is to determine which cores are free, and then to the degree possible, pick a candidate appropriate to each free core. In prospective parachains candidate selection the provisioner handles the former process while [prospective parachains](../backing/prospective-parachains.md) handles the latter.
+The goal of candidate selection is to determine which cores are free, and then to the degree possible, pick a candidate
+appropriate to each free core. In prospective parachains candidate selection the provisioner handles the former process
+while [prospective parachains](../backing/prospective-parachains.md) handles the latter.
 
 To select backable candidates:
 
@@ -116,32 +164,50 @@ To select backable candidates:
     - The core is unscheduled and doesn’t need to be provisioned with a candidate
   - On `CoreState::Scheduled`
     - The core is unoccupied and scheduled to accept a backed block for a particular `para_id`.
-    - The provisioner requests a backable candidate from [prospective parachains](../backing/prospective-parachains.md) with the desired relay parent, the core’s scheduled `para_id`, and an empty required path. 
+    - The provisioner requests a backable candidate from [prospective parachains](../backing/prospective-parachains.md)
+      with the desired relay parent, the core’s scheduled `para_id`, and an empty required path.
   - On `CoreState::Occupied`
-    - The availability core is occupied by a parachain block candidate pending availability. A further candidate need not be provided by the provisioner unless the core will be vacated this block. This is the case when either bitfields indicate the current core occupant has been made available or a timeout is reached.
+    - The availability core is occupied by a parachain block candidate pending availability. A further candidate need
+      not be provided by the provisioner unless the core will be vacated this block. This is the case when either
+      bitfields indicate the current core occupant has been made available or a timeout is reached.
     - If `bitfields_indicate_availability`
-      - If `Some(scheduled_core) = occupied_core.next_up_on_available`, the core will be vacated and in need of a provisioned candidate. The provisioner requests a backable candidate from [prospective parachains](../backing/prospective-parachains.md) with the core’s scheduled `para_id` and a required path with one entry. This entry corresponds to the parablock candidate previously occupying this core, which was made available and can be built upon even though it hasn’t been seen as included in a relay chain block yet. See the Required Path section below for more detail.
-      - If `occupied_core.next_up_on_available` is `None`, then the core being vacated is unscheduled and doesn’t need to be provisioned with a candidate.
+      - If `Some(scheduled_core) = occupied_core.next_up_on_available`, the core will be vacated and in need of a
+        provisioned candidate. The provisioner requests a backable candidate from [prospective
+        parachains](../backing/prospective-parachains.md) with the core’s scheduled `para_id` and a required path with
+        one entry. This entry corresponds to the parablock candidate previously occupying this core, which was made
+        available and can be built upon even though it hasn’t been seen as included in a relay chain block yet. See the
+        Required Path section below for more detail.
+      - If `occupied_core.next_up_on_available` is `None`, then the core being vacated is unscheduled and doesn’t need
+        to be provisioned with a candidate.
     - Else-if `occupied_core.time_out_at == block_number`
-      - If `Some(scheduled_core) = occupied_core.next_up_on_timeout`, the core will be vacated and in need of a provisioned candidate. A candidate is requested in exactly the same way as with `CoreState::Scheduled`.
-      - Else the core being vacated is unscheduled and doesn’t need to be provisioned with a candidate
-The end result of this process is a vector of `CandidateHash`s, sorted in order of their core index.
+      - If `Some(scheduled_core) = occupied_core.next_up_on_timeout`, the core will be vacated and in need of a
+        provisioned candidate. A candidate is requested in exactly the same way as with `CoreState::Scheduled`.
+      - Else the core being vacated is unscheduled and doesn’t need to be provisioned with a candidate The end result of
+this process is a vector of `CandidateHash`s, sorted in order of their core index.
 
 #### Required Path
 
-Required path is a parameter for `ProspectiveParachainsMessage::GetBackableCandidate`, which the provisioner sends in candidate selection. 
+Required path is a parameter for `ProspectiveParachainsMessage::GetBackableCandidate`, which the provisioner sends in
+candidate selection.
 
-An empty required path indicates that the requested candidate should be a direct child of the most recently included parablock for the given `para_id` as of the given relay parent. 
+An empty required path indicates that the requested candidate should be a direct child of the most recently included
+parablock for the given `para_id` as of the given relay parent.
 
-In contrast, a required path with one or more entries prompts [prospective parachains](../backing/prospective-parachains.md) to step forward through its fragment tree for the given `para_id` and relay parent until the desired parablock is reached. We then select a direct child of that parablock to pass to the provisioner. 
+In contrast, a required path with one or more entries prompts [prospective
+parachains](../backing/prospective-parachains.md) to step forward through its fragment tree for the given `para_id` and
+relay parent until the desired parablock is reached. We then select a direct child of that parablock to pass to the
+provisioner.
 
-The parablocks making up a required path do not need to have been previously seen as included in relay chain blocks. Thus the ability to provision backable candidates based on a required path effectively decouples backing from inclusion.
+The parablocks making up a required path do not need to have been previously seen as included in relay chain blocks.
+Thus the ability to provision backable candidates based on a required path effectively decouples backing from inclusion.
 
-### Legacy Candidate Selection 
+### Legacy Candidate Selection
 
-Legacy candidate selection takes place in the provisioner. Thus the provisioner needs to keep an up to date record of all [backed_candidates](../../types/backing.md#backed-candidate) `PerRelayParent` to pick from. 
+Legacy candidate selection takes place in the provisioner. Thus the provisioner needs to keep an up to date record of
+all [backed_candidates](../../types/backing.md#backed-candidate) `PerRelayParent` to pick from.
 
-The goal of candidate selection is to determine which cores are free, and then to the degree possible, pick a candidate appropriate to each free core.
+The goal of candidate selection is to determine which cores are free, and then to the degree possible, pick a candidate
+appropriate to each free core.
 
 To determine availability:
 
@@ -149,38 +215,54 @@ To determine availability:
 - For each core state:
   - On `CoreState::Scheduled`, then we can make an `OccupiedCoreAssumption::Free`.
   - On `CoreState::Occupied`, then we may be able to make an assumption:
-    - If the bitfields indicate availability and there is a scheduled `next_up_on_available`, then we can make an `OccupiedCoreAssumption::Included`.
-    - If the bitfields do not indicate availability, and there is a scheduled `next_up_on_time_out`, and `occupied_core.time_out_at == block_number_under_production`, then we can make an `OccupiedCoreAssumption::TimedOut`.
+    - If the bitfields indicate availability and there is a scheduled `next_up_on_available`, then we can make an
+      `OccupiedCoreAssumption::Included`.
+    - If the bitfields do not indicate availability, and there is a scheduled `next_up_on_time_out`, and
+      `occupied_core.time_out_at == block_number_under_production`, then we can make an
+      `OccupiedCoreAssumption::TimedOut`.
   - If we did not make an `OccupiedCoreAssumption`, then continue on to the next core.
-  - Now compute the core's `validation_data_hash`: get the `PersistedValidationData` from the runtime, given the known `ParaId` and `OccupiedCoreAssumption`;
+  - Now compute the core's `validation_data_hash`: get the `PersistedValidationData` from the runtime, given the known
+    `ParaId` and `OccupiedCoreAssumption`;
   - Find an appropriate candidate for the core.
-    - There are two constraints: `backed_candidate.candidate.descriptor.para_id == scheduled_core.para_id && candidate.candidate.descriptor.validation_data_hash == computed_validation_data_hash`.
-    - In the event that more than one candidate meets the constraints, selection between the candidates is arbitrary. However, not more than one candidate can be selected per core.
+    - There are two constraints: `backed_candidate.candidate.descriptor.para_id == scheduled_core.para_id &&
+      candidate.candidate.descriptor.validation_data_hash == computed_validation_data_hash`.
+    - In the event that more than one candidate meets the constraints, selection between the candidates is arbitrary.
+      However, not more than one candidate can be selected per core.
 
 The end result of this process is a vector of `CandidateHash`s, sorted in order of their core index.
 
 ### Retrieving Full `BackedCandidate`s for Selected Hashes
 
-Legacy candidate selection and prospective parachains candidate selection both leave us with a vector of `CandidateHash`s. These are passed to the backing subsystem with `CandidateBackingMessage::GetBackedCandidates`.
+Legacy candidate selection and prospective parachains candidate selection both leave us with a vector of
+`CandidateHash`s. These are passed to the backing subsystem with `CandidateBackingMessage::GetBackedCandidates`.
 
-The response is a vector of `BackedCandidate`s, sorted in order of their core index and ready to be provisioned to block authoring. The candidate selection and retrieval process should select at maximum one candidate which upgrades the runtime validation code.
+The response is a vector of `BackedCandidate`s, sorted in order of their core index and ready to be provisioned to block
+authoring. The candidate selection and retrieval process should select at maximum one candidate which upgrades the
+runtime validation code.
 
 ## Glossary
 
-- **Relay-parent:** 
-  - A particular relay-chain block which serves as an anchor and reference point for processes and data which depend on relay-chain state.
-- **Active Leaf:** 
-  - A relay chain block which is the head of an active fork of the relay chain. 
+- **Relay-parent:**
+  - A particular relay-chain block which serves as an anchor and reference point for processes and data which depend on
+    relay-chain state.
+- **Active Leaf:**
+  - A relay chain block which is the head of an active fork of the relay chain.
   - Block authorship provisioning jobs are spawned per active leaf and concluded for any leaves which become inactive.
-- **Candidate Selection:** 
+- **Candidate Selection:**
   - The process by which the provisioner selects backable parachain block candidates to pass to block authoring.
-  - Two versions, prospective parachains candidate selection and legacy candidate selection. See their respective protocol sections for details.
-- **Availability Core:** 
-  - Often referred to simply as "cores", availability cores are an abstraction used for resource management. For the provisioner, availability cores are most relevant in that core states determine which `para_id`s to provision backable candidates for.
-  - For more on availability cores see [Scheduler Module: Availability Cores](../../runtime/scheduler.md#availability-cores)
+  - Two versions, prospective parachains candidate selection and legacy candidate selection. See their respective
+    protocol sections for details.
+- **Availability Core:**
+  - Often referred to simply as "cores", availability cores are an abstraction used for resource management. For the
+    provisioner, availability cores are most relevant in that core states determine which `para_id`s to provision
+    backable candidates for.
+  - For more on availability cores see [Scheduler Module: Availability
+    Cores](../../runtime/scheduler.md#availability-cores)
 - **Availability Bitfield:**
-  - Often referred to simply as a "bitfield", an availability bitfield represents the view of parablock candidate availability from a particular validator's perspective. Each bit in the bitfield corresponds to a single [availability core](../../runtime-api/availability-cores.md).
+  - Often referred to simply as a "bitfield", an availability bitfield represents the view of parablock candidate
+    availability from a particular validator's perspective. Each bit in the bitfield corresponds to a single
+    [availability core](../../runtime-api/availability-cores.md).
   - For more on availability bitfields see [availability](../../types/availability.md)
 - **Backable vs. Backed:**
   - Note that we sometimes use "backed" to refer to candidates that are "backable", but not yet backed on chain.
-  - Backable means that a quorum of the candidate's assigned backing group have provided signed affirming statements.
\ No newline at end of file
+  - Backable means that a quorum of the candidate's assigned backing group have provided signed affirming statements.
diff --git a/polkadot/roadmap/implementers-guide/src/node/utility/pvf-host-and-workers.md b/polkadot/roadmap/implementers-guide/src/node/utility/pvf-host-and-workers.md
index bcf01b61f2173f024dc50cccacc877534f22aaf2..6a14a3a013d45f2e823be5ef8cf35617e2614dbe 100644
--- a/polkadot/roadmap/implementers-guide/src/node/utility/pvf-host-and-workers.md
+++ b/polkadot/roadmap/implementers-guide/src/node/utility/pvf-host-and-workers.md
@@ -121,10 +121,10 @@ So what are we actually worried about? Things that come to mind:
 
 ### Restricting file-system access
 
-A basic security mechanism is to make sure that any thread directly interfacing
-with untrusted code does not have access to the file-system. This provides some
-protection against attackers accessing sensitive data or modifying data on the
-host machine.
+A basic security mechanism is to make sure that any process directly interfacing
+with untrusted code does not have unnecessary access to the file-system. This
+provides some protection against attackers accessing sensitive data or modifying
+data on the host machine.
 
 ### Clearing env vars
 
diff --git a/polkadot/roadmap/implementers-guide/src/node/utility/pvf-prechecker.md b/polkadot/roadmap/implementers-guide/src/node/utility/pvf-prechecker.md
index 3cae12e65f33e7fff728124ffc1b75d1f785b7ef..b722bdc6539a6cf34c5870459180dedd590d7ec5 100644
--- a/polkadot/roadmap/implementers-guide/src/node/utility/pvf-prechecker.md
+++ b/polkadot/roadmap/implementers-guide/src/node/utility/pvf-prechecker.md
@@ -1,45 +1,70 @@
 # PVF Pre-checker
 
-The PVF pre-checker is a subsystem that is responsible for watching the relay chain for new PVFs that require pre-checking. Head over to [overview] for the PVF pre-checking process overview.
+The PVF pre-checker is a subsystem that is responsible for watching the relay chain for new PVFs that require
+pre-checking. Head over to [overview] for the PVF pre-checking process overview.
 
 ## Protocol
 
-There is no dedicated input mechanism for PVF pre-checker. Instead, PVF pre-checker looks on the `ActiveLeavesUpdate` event stream for work.
+There is no dedicated input mechanism for PVF pre-checker. Instead, PVF pre-checker looks on the `ActiveLeavesUpdate`
+event stream for work.
 
-This subsytem does not produce any output messages either. The subsystem will, however, send messages to the [Runtime API] subsystem to query for the pending PVFs and to submit votes. In addition to that, it will also communicate with [Candidate Validation] Subsystem to request PVF pre-check.
+This subsytem does not produce any output messages either. The subsystem will, however, send messages to the [Runtime
+API] subsystem to query for the pending PVFs and to submit votes. In addition to that, it will also communicate with
+[Candidate Validation] Subsystem to request PVF pre-check.
 
 ## Functionality
 
-If the node is running in a collator mode, this subsystem will be disabled. The PVF pre-checker subsystem keeps track of the PVFs that are relevant for the subsystem. 
+If the node is running in a collator mode, this subsystem will be disabled. The PVF pre-checker subsystem keeps track of
+the PVFs that are relevant for the subsystem.
 
-To be relevant for the subsystem, a PVF must be returned by the [`pvfs_require_precheck` runtime API][PVF pre-checking runtime API] in any of the active leaves. If the PVF is not present in any of the active leaves, it ceases to be relevant.
+To be relevant for the subsystem, a PVF must be returned by the [`pvfs_require_precheck` runtime API][PVF pre-checking
+runtime API] in any of the active leaves. If the PVF is not present in any of the active leaves, it ceases to be
+relevant.
 
-When a PVF just becomes relevant, the subsystem will send a message to the [Candidate Validation] subsystem asking for the pre-check.
+When a PVF just becomes relevant, the subsystem will send a message to the [Candidate Validation] subsystem asking for
+the pre-check.
 
-Upon receving a message from the candidate-validation subsystem, the pre-checker will note down that the PVF has its judgement and will also sign and submit a [`PvfCheckStatement`][PvfCheckStatement] via the [`submit_pvf_check_statement` runtime API][PVF pre-checking runtime API]. In case, a judgement was received for a PVF that is no longer in view it is ignored.
+Upon receving a message from the candidate-validation subsystem, the pre-checker will note down that the PVF has its
+judgement and will also sign and submit a [`PvfCheckStatement`][PvfCheckStatement] via the [`submit_pvf_check_statement`
+runtime API][PVF pre-checking runtime API]. In case, a judgement was received for a PVF that is no longer in view it is
+ignored.
 
-Since a vote only is valid during [one session][overview], the subsystem will have to resign and submit the statements for the new session. The new session is assumed to be started if at least one of the leaves has a greater session index that was previously observed in any of the leaves.
+Since a vote only is valid during [one session][overview], the subsystem will have to resign and submit the statements
+for the new session. The new session is assumed to be started if at least one of the leaves has a greater session index
+that was previously observed in any of the leaves.
 
-The subsystem tracks all the statements that it submitted within a session. If for some reason a PVF became irrelevant and then becomes relevant again, the subsystem will not submit a new statement for that PVF within the same session.
+The subsystem tracks all the statements that it submitted within a session. If for some reason a PVF became irrelevant
+and then becomes relevant again, the subsystem will not submit a new statement for that PVF within the same session.
 
-If the node is not in the active validator set, it will still perform all the checks. However, it will only submit the check statements when the node is in the active validator set.
+If the node is not in the active validator set, it will still perform all the checks. However, it will only submit the
+check statements when the node is in the active validator set.
 
 ### Rejecting failed PVFs
 
-It is possible that the candidate validation was not able to check the PVF, e.g. if it timed out. In that case, the PVF pre-checker will vote against it. This is considered safe, as there is no slashing for being on the wrong side of a pre-check vote.
+It is possible that the candidate validation was not able to check the PVF, e.g. if it timed out. In that case, the PVF
+pre-checker will vote against it. This is considered safe, as there is no slashing for being on the wrong side of a
+pre-check vote.
 
 Rejecting instead of abstaining is better in several ways:
 
 1. Conclusion is reached faster - we have actual votes, instead of relying on a timeout.
-1. Being strict in pre-checking makes it safer to be more lenient in preparation errors afterwards. Hence we have more leeway in avoiding raising dubious disputes, without making things less secure.
+1. Being strict in pre-checking makes it safer to be more lenient in preparation errors afterwards. Hence we have more
+   leeway in avoiding raising dubious disputes, without making things less secure.
 
-Also, if we only abstain, an attacker can specially craft a PVF wasm blob so that it will fail on e.g. 50% of the validators. In that case a supermajority will never be reached and the vote will repeat multiple times, most likely with the same result (since all votes are cleared on a session change). This is avoided by rejecting failed PVFs, and by only requiring 1/3 of validators to reject a PVF to reach a decision.
+Also, if we only abstain, an attacker can specially craft a PVF wasm blob so that it will fail on e.g. 50% of the
+validators. In that case a supermajority will never be reached and the vote will repeat multiple times, most likely with
+the same result (since all votes are cleared on a session change). This is avoided by rejecting failed PVFs, and by only
+requiring 1/3 of validators to reject a PVF to reach a decision.
 
 ### Note on Disputes
 
-Having a pre-checking phase allows us to make certain assumptions later when preparing the PVF for execution. If a runtime passed pre-checking, then we know that the runtime should be valid, and therefore any issue during preparation for execution can be assumed to be a local problem on the current node.
+Having a pre-checking phase allows us to make certain assumptions later when preparing the PVF for execution. If a
+runtime passed pre-checking, then we know that the runtime should be valid, and therefore any issue during preparation
+for execution can be assumed to be a local problem on the current node.
 
-For this reason, even deterministic preparation errors should not trigger disputes. And since we do not dispute as a result of the pre-checking phase, as stated above, it should be impossible for preparation in general to result in disputes.
+For this reason, even deterministic preparation errors should not trigger disputes. And since we do not dispute as a
+result of the pre-checking phase, as stated above, it should be impossible for preparation in general to result in
+disputes.
 
 [overview]: ../../pvf-prechecking.md
 [Runtime API]: runtime-api.md
diff --git a/polkadot/roadmap/implementers-guide/src/node/utility/runtime-api.md b/polkadot/roadmap/implementers-guide/src/node/utility/runtime-api.md
index 6271429c2666fff7c3728fb6997042ac1fd5bacb..b687bd5684c5ae8eed412f7cec25846d7b8befd4 100644
--- a/polkadot/roadmap/implementers-guide/src/node/utility/runtime-api.md
+++ b/polkadot/roadmap/implementers-guide/src/node/utility/runtime-api.md
@@ -1,6 +1,7 @@
 # Runtime API
 
-The Runtime API subsystem is responsible for providing a single point of access to runtime state data via a set of pre-determined queries. This prevents shared ownership of a blockchain client resource by providing
+The Runtime API subsystem is responsible for providing a single point of access to runtime state data via a set of
+pre-determined queries. This prevents shared ownership of a blockchain client resource by providing
 
 ## Protocol
 
@@ -10,8 +11,11 @@ Output: None
 
 ## Functionality
 
-On receipt of `RuntimeApiMessage::Request(relay_parent, request)`, answer the request using the post-state of the `relay_parent` provided and provide the response to the side-channel embedded within the request.
+On receipt of `RuntimeApiMessage::Request(relay_parent, request)`, answer the request using the post-state of the
+`relay_parent` provided and provide the response to the side-channel embedded within the request.
 
 ## Jobs
 
-> TODO Don't limit requests based on parent hash, but limit caching. No caching should be done for any requests on `relay_parent`s that are not active based on `ActiveLeavesUpdate` messages. Maybe with some leeway for things that have just been stopped.
+> TODO Don't limit requests based on parent hash, but limit caching. No caching should be done for any requests on
+> `relay_parent`s that are not active based on `ActiveLeavesUpdate` messages. Maybe with some leeway for things that
+> have just been stopped.
diff --git a/polkadot/roadmap/implementers-guide/src/protocol-approval.md b/polkadot/roadmap/implementers-guide/src/protocol-approval.md
index 693822ce07973a2016e6ac2bed61a7670e559875..9ba7f6da17340ab786df423c248905db7ca76b94 100644
--- a/polkadot/roadmap/implementers-guide/src/protocol-approval.md
+++ b/polkadot/roadmap/implementers-guide/src/protocol-approval.md
@@ -1,19 +1,39 @@
 # Approval Process
 
-The Approval Process is the mechanism by which the relay-chain ensures that only valid parablocks are finalized and that backing validators are held accountable for managing to get bad blocks included into the relay chain.
+The Approval Process is the mechanism by which the relay-chain ensures that only valid parablocks are finalized and that
+backing validators are held accountable for managing to get bad blocks included into the relay chain.
 
-Having a parachain include a bad block into a fork of the relay-chain is not catastrophic as long as the block isn't finalized by the relay-chain's finality gadget, GRANDPA. If the block isn't finalized, that means that the fork of the relay-chain can be reverted in favor of another by means of a dynamic fork-choice rule which leads honest validators to ignore any forks containing that parablock.
+Having a parachain include a bad block into a fork of the relay-chain is not catastrophic as long as the block isn't
+finalized by the relay-chain's finality gadget, GRANDPA. If the block isn't finalized, that means that the fork of the
+relay-chain can be reverted in favor of another by means of a dynamic fork-choice rule which leads honest validators to
+ignore any forks containing that parablock.
 
 Dealing with a bad parablock proceeds in these stages:
 1. Detection
 2. Escalation
 3. Consequences
 
-First, the bad block must be detected by an honest party. Second, the honest party must escalate the bad block to be checked by all validators. And last, the correct consequences of a bad block must occur. The first consequence, as mentioned above, is to revert the chain so what full nodes perceive to be best no longer contains the bad parablock. The second consequence is to slash all malicious validators. Note that, if the chain containing the bad block is reverted, that the result of the dispute needs to be transplanted or at least transplantable to all other forks of the chain so that malicious validators are slashed in all possible histories. Phrased alternatively, there needs to be no possible relay-chain in which malicious validators get away cost-free.
-
-Accepting a parablock is the end result of having passed through the detection stage without dispute, or having passed through the escalation/dispute stage with a positive outcome. For this to work, we need the detection procedure to have the properties that enough honest validators are always selected to check the parablock and that they cannot be interfered with by an adversary. This needs to be balanced with the scaling concern of parachains in general: the easiest way to get the first property is to have everyone check everything, but that is clearly too heavy. So we also have a desired constraint on the other property that we have as few validators as possible check any particular parablock. Our assignment function is the method by which we select validators to do approval checks on parablocks.
-
-It often makes more sense to think of relay-chain blocks as having been approved or not as opposed to thinking about whether parablocks have been approved. A relay-chain block containing a single bad parablock needs to be reverted, and a relay-chain block that contains only approved parablocks can be called approved, as long as its parent relay-chain block is also approved. It is important that the validity of any particular relay-chain block depend on the validity of its ancestry, so we do not finalize a block which has a bad block in its ancestry.
+First, the bad block must be detected by an honest party. Second, the honest party must escalate the bad block to be
+checked by all validators. And last, the correct consequences of a bad block must occur. The first consequence, as
+mentioned above, is to revert the chain so what full nodes perceive to be best no longer contains the bad parablock. The
+second consequence is to slash all malicious validators. Note that, if the chain containing the bad block is reverted,
+that the result of the dispute needs to be transplanted or at least transplantable to all other forks of the chain so
+that malicious validators are slashed in all possible histories. Phrased alternatively, there needs to be no possible
+relay-chain in which malicious validators get away cost-free.
+
+Accepting a parablock is the end result of having passed through the detection stage without dispute, or having passed
+through the escalation/dispute stage with a positive outcome. For this to work, we need the detection procedure to have
+the properties that enough honest validators are always selected to check the parablock and that they cannot be
+interfered with by an adversary. This needs to be balanced with the scaling concern of parachains in general: the
+easiest way to get the first property is to have everyone check everything, but that is clearly too heavy. So we also
+have a desired constraint on the other property that we have as few validators as possible check any particular
+parablock. Our assignment function is the method by which we select validators to do approval checks on parablocks.
+
+It often makes more sense to think of relay-chain blocks as having been approved or not as opposed to thinking about
+whether parablocks have been approved. A relay-chain block containing a single bad parablock needs to be reverted, and a
+relay-chain block that contains only approved parablocks can be called approved, as long as its parent relay-chain block
+is also approved. It is important that the validity of any particular relay-chain block depend on the validity of its
+ancestry, so we do not finalize a block which has a bad block in its ancestry.
 
 ```dot process Approval Process
 digraph {
@@ -24,29 +44,56 @@ digraph {
 
 Approval has roughly two parts:
 
-- **Assignments** determines which validators performs approval checks on which candidates.  It ensures that each candidate receives enough random checkers, while reducing adversaries' odds for obtaining enough checkers, and limiting adversaries' foreknowledge.  It tracks approval votes to identify when "no show" approval check takes suspiciously long, perhaps indicating the node being under attack, and assigns more checks in this case.  It tracks relay chain equivocations to determine when adversaries possibly gained foreknowledge about assignments, and adds additional checks in this case.
+- **Assignments** determines which validators performs approval checks on which candidates.  It ensures that each
+  candidate receives enough random checkers, while reducing adversaries' odds for obtaining enough checkers, and
+  limiting adversaries' foreknowledge.  It tracks approval votes to identify when "no show" approval check takes
+  suspiciously long, perhaps indicating the node being under attack, and assigns more checks in this case.  It tracks
+  relay chain equivocations to determine when adversaries possibly gained foreknowledge about assignments, and adds
+  additional checks in this case.
 
-- **Approval checks** listens to the assignments subsystem for outgoing assignment notices that we shall check specific candidates.  It then performs these checks by first invoking the reconstruction subsystem to obtain the candidate, second invoking the candidate validity utility subsystem upon the candidate, and finally sending out an approval vote, or perhaps initiating a dispute.
+- **Approval checks** listens to the assignments subsystem for outgoing assignment notices that we shall check specific
+  candidates.  It then performs these checks by first invoking the reconstruction subsystem to obtain the candidate,
+  second invoking the candidate validity utility subsystem upon the candidate, and finally sending out an approval vote,
+  or perhaps initiating a dispute.
 
-These both run first as off-chain consensus protocols using messages gossiped among all validators, and second as an on-chain record of this off-chain protocols' progress after the fact.  We need the on-chain protocol to provide rewards for the off-chain protocol.
+These both run first as off-chain consensus protocols using messages gossiped among all validators, and second as an
+on-chain record of this off-chain protocols' progress after the fact.  We need the on-chain protocol to provide rewards
+for the off-chain protocol.
 
-Approval requires two gossiped message types, assignment notices created by its assignments subsystem, and approval votes sent by our approval checks subsystem when authorized by the candidate validity utility subsystem.
+Approval requires two gossiped message types, assignment notices created by its assignments subsystem, and approval
+votes sent by our approval checks subsystem when authorized by the candidate validity utility subsystem.
 
-### Approval keys
+## Approval keys
 
 We need two separate keys for the approval subsystem:
 
-- **Approval assignment keys** are sr25519/schnorrkel keys used only for the assignment criteria VRFs.  We implicitly sign assignment notices with approval assignment keys by including their relay chain context and additional data in the VRF's extra message, but exclude these from its VRF input.
+- **Approval assignment keys** are sr25519/schnorrkel keys used only for the assignment criteria VRFs.  We implicitly
+  sign assignment notices with approval assignment keys by including their relay chain context and additional data in
+  the VRF's extra message, but exclude these from its VRF input.
 
-- **Approval vote keys** would only sign off on candidate parablock validity and has no natural key type restrictions. There's no need for this to actually embody a new session key type. We just want to make a distinction between assignments and approvals, although distant future node configurations might favor separate roles. We re-use the same keys as are used for parachain backing in practice.
+- **Approval vote keys** would only sign off on candidate parablock validity and has no natural key type restrictions.
+  There's no need for this to actually embody a new session key type. We just want to make a distinction between
+  assignments and approvals, although distant future node configurations might favor separate roles. We re-use the same
+  keys as are used for parachain backing in practice.
 
-Approval vote keys could relatively easily be handled by some hardened signer tooling, perhaps even HSMs assuming we select ed25519 for approval vote keys.  Approval assignment keys might or might not support hardened signer tooling, but doing so sounds far more complex.  In fact, assignment keys determine only VRF outputs that determine approval checker assignments, for which they can only act or not act, so they cannot equivocate, lie, etc. and represent little if any slashing risk for validator operators.
+Approval vote keys could relatively easily be handled by some hardened signer tooling, perhaps even HSMs assuming we
+select ed25519 for approval vote keys.  Approval assignment keys might or might not support hardened signer tooling, but
+doing so sounds far more complex.  In fact, assignment keys determine only VRF outputs that determine approval checker
+assignments, for which they can only act or not act, so they cannot equivocate, lie, etc. and represent little if any
+slashing risk for validator operators.
 
-In future, we shall determine which among the several hardening techniques best benefits the network as a whole.  We could provide a multi-process multi-machine architecture for validators, perhaps even reminiscent of GNUNet, or perhaps more resembling smart HSM tooling.  We might instead design a system that more resembled full systems, like like Cosmos' sentry nodes.  In either case, approval assignments might be handled by a slightly hardened machine, but not necessarily nearly as hardened as approval votes, but approval votes machines must similarly run foreign WASM code, which increases their risk, so assignments being separate sounds helpful.
+In future, we shall determine which among the several hardening techniques best benefits the network as a whole.  We
+could provide a multi-process multi-machine architecture for validators, perhaps even reminiscent of GNUNet, or perhaps
+more resembling smart HSM tooling.  We might instead design a system that more resembled full systems, like like Cosmos'
+sentry nodes.  In either case, approval assignments might be handled by a slightly hardened machine, but not necessarily
+nearly as hardened as approval votes, but approval votes machines must similarly run foreign WASM code, which increases
+their risk, so assignments being separate sounds helpful.
 
 ## Assignments
 
-Approval assignment determines on which candidate parachain blocks each validator performs approval checks.  An approval session considers only one relay chain block and assigns only those candidates that relay chain block declares available.
+Approval assignment determines on which candidate parachain blocks each validator performs approval checks.  An approval
+session considers only one relay chain block and assigns only those candidates that relay chain block declares
+available.
 
 Assignment balances several concerns:
 
@@ -54,149 +101,286 @@ Assignment balances several concerns:
 - ensures enough checkers, and
 - distributes assignments relatively equitably.
 
-Assignees determine their own assignments to check specific candidates using two or three assignment criteria.  Assignees never reveal their assignments until relevant, and gossip delays assignments sent early, which limits others' foreknowledge.  Assignees learn their assignment only with the relay chain block.
+Assignees determine their own assignments to check specific candidates using two or three assignment criteria.
+Assignees never reveal their assignments until relevant, and gossip delays assignments sent early, which limits others'
+foreknowledge.  Assignees learn their assignment only with the relay chain block.
 
-All criteria require the validator evaluate a verifiable random function (VRF) using their VRF secret key.  All criteria input specific data called "stories" about the session's relay chain block, and output candidates to check and a precedence called a `DelayTranche`.
+All criteria require the validator evaluate a verifiable random function (VRF) using their VRF secret key.  All criteria
+input specific data called "stories" about the session's relay chain block, and output candidates to check and a
+precedence called a `DelayTranche`.
 
-We liberate availability cores when their candidate becomes available of course, but one approval assignment criteria continues associating each candidate with the core number it occupied when it became available.
+We liberate availability cores when their candidate becomes available of course, but one approval assignment criteria
+continues associating each candidate with the core number it occupied when it became available.
 
-Assignment operates in loosely timed rounds determined by this `DelayTranche`s, which proceed roughly 12 times faster than six second block production assuming half second gossip times.  If a candidate `C` needs more approval checkers by the time we reach round `t` then any validators with an assignment to `C` in delay tranche `t` gossip their send assignment notice for `C`.  We continue until all candidates have enough approval checkers assigned.  We take entire tranches together if we do not yet have enough, so we expect strictly more than enough checkers.  We also take later tranches if some checkers return their approval votes too slow (see no shows below).
+Assignment operates in loosely timed rounds determined by this `DelayTranche`s, which proceed roughly 12 times faster
+than six second block production assuming half second gossip times.  If a candidate `C` needs more approval checkers by
+the time we reach round `t` then any validators with an assignment to `C` in delay tranche `t` gossip their send
+assignment notice for `C`.  We continue until all candidates have enough approval checkers assigned.  We take entire
+tranches together if we do not yet have enough, so we expect strictly more than enough checkers.  We also take later
+tranches if some checkers return their approval votes too slow (see no shows below).
 
-Assignment ensures validators check those relay chain blocks for which they have delay tranche zero aka the highest precedence, so that adversaries always face honest checkers equal to the expected number of assignments with delay tranche zero.
+Assignment ensures validators check those relay chain blocks for which they have delay tranche zero aka the highest
+precedence, so that adversaries always face honest checkers equal to the expected number of assignments with delay
+tranche zero.
 
-Among these criteria, the BABE VRF output provides the story for two, which reduces how frequently adversaries could position their own checkers.  We have one criterion whose story consists of the candidate's block hash plus external knowledge that a relay chain equivocation exists with a conflicting candidate.  It provides unforeseeable assignments when adversaries gain foreknowledge about the other two by committing an equivocation in relay chain block production.
+Among these criteria, the BABE VRF output provides the story for two, which reduces how frequently adversaries could
+position their own checkers.  We have one criterion whose story consists of the candidate's block hash plus external
+knowledge that a relay chain equivocation exists with a conflicting candidate.  It provides unforeseeable assignments
+when adversaries gain foreknowledge about the other two by committing an equivocation in relay chain block production.
 
 ## Announcements / Notices
 
-We gossip assignment notices among nodes so that all validators know which validators should check each candidate, and if any candidate requires more checkers.
+We gossip assignment notices among nodes so that all validators know which validators should check each candidate, and
+if any candidate requires more checkers.
 
-Assignment notices consist of a relay chain context given by a block hash, an assignment criteria, consisting of the criteria identifier and optionally a criteria specific field, an assignee identifier, and a VRF signature by the assignee, which itself consists of a VRF pre-output and a DLEQ proof.  Its VRF input consists of the criteria, usually including a criteria specific field, and a "story" about its relay chain context block.
+Assignment notices consist of a relay chain context given by a block hash, an assignment criteria, consisting of the
+criteria identifier and optionally a criteria specific field, an assignee identifier, and a VRF signature by the
+assignee, which itself consists of a VRF pre-output and a DLEQ proof.  Its VRF input consists of the criteria, usually
+including a criteria specific field, and a "story" about its relay chain context block.
 
-We never include stories inside the gossip messages containing assignment notices, but require each validator reconstruct them.  We never care about assignments in the disputes process, so this does not complicate remote disputes.
+We never include stories inside the gossip messages containing assignment notices, but require each validator
+reconstruct them.  We never care about assignments in the disputes process, so this does not complicate remote disputes.
 
-In a Schnorr VRF, there is an extra signed message distinct from this input, which we set to the relay chain block hash.  As a result, assignment notices are self signing and can be "politely" gossiped without additional signatures, meaning between nodes who can compute the story from the relay chain context.  In other words, if we cannot compute the story required by an assignment notice's VRF part then our self signing property fails and we cannot verify its origin.  We could fix this with either another signature layer (64 bytes) or by including the VRF input point computed from the story (32 bytes), but doing so appears unhelpful.
+In a Schnorr VRF, there is an extra signed message distinct from this input, which we set to the relay chain block hash.
+As a result, assignment notices are self signing and can be "politely" gossiped without additional signatures, meaning
+between nodes who can compute the story from the relay chain context.  In other words, if we cannot compute the story
+required by an assignment notice's VRF part then our self signing property fails and we cannot verify its origin.  We
+could fix this with either another signature layer (64 bytes) or by including the VRF input point computed from the
+story (32 bytes), but doing so appears unhelpful.
 
-Any validator could send their assignment notices and/or approval votes too early.  We gossip the approval votes early because they represent a major commitment by the validator.  We delay gossiping the assignment notices until they agree with our local clock however.  We also impose a politeness condition that the recipient knows the relay chain context used by the assignment notice.
+Any validator could send their assignment notices and/or approval votes too early.  We gossip the approval votes early
+because they represent a major commitment by the validator.  We delay gossiping the assignment notices until they agree
+with our local clock however.  We also impose a politeness condition that the recipient knows the relay chain context
+used by the assignment notice.
 
 ## Stories
 
-We based assignment criteria upon two possible "stories" about the relay chain block `R` that included the candidate aka declared the candidate available.  All stories have an output that attempts to minimize adversarial influence, which then acts as the VRF input for an assignment criteria.
+We based assignment criteria upon two possible "stories" about the relay chain block `R` that included the candidate aka
+declared the candidate available.  All stories have an output that attempts to minimize adversarial influence, which
+then acts as the VRF input for an assignment criteria.
 
-We first have a `RelayVRFStory` that outputs the randomness from another VRF output produced by the relay chain block producer when creating `R`.  Among honest nodes, only this one relay chain block producer who creates `R` knew the story in advance, and even they knew nothing two epochs previously.
+We first have a `RelayVRFStory` that outputs the randomness from another VRF output produced by the relay chain block
+producer when creating `R`.  Among honest nodes, only this one relay chain block producer who creates `R` knew the story
+in advance, and even they knew nothing two epochs previously.
 
-In BABE, we create this value calling `schnorrkel::vrf::VRFInOut::make_bytes` with a context "A&V RC-VRF", with the `VRFInOut` coming from either the VRF that authorized block production for primary blocks, or else from the secondary block VRF for the secondary block type.
+In BABE, we create this value calling `schnorrkel::vrf::VRFInOut::make_bytes` with a context "A&V RC-VRF", with the
+`VRFInOut` coming from either the VRF that authorized block production for primary blocks, or else from the secondary
+block VRF for the secondary block type.
 
-In Sassafras, we shall always use the non-anonymized recycling VRF output, never the anonymized ring VRF that authorizes block production.  We do not currently know if Sassafras shall have a separate schnorrkel key, but if it reuses its ring VRF key there is an equivalent `ring_vrf::VRFInOut::make_bytes`.
+In Sassafras, we shall always use the non-anonymized recycling VRF output, never the anonymized ring VRF that authorizes
+block production.  We do not currently know if Sassafras shall have a separate schnorrkel key, but if it reuses its ring
+VRF key there is an equivalent `ring_vrf::VRFInOut::make_bytes`.
 
-We like that `RelayVRFStory` admits relatively few choices, but an adversary who equivocates in relay chain block production could learn assignments that depend upon the `RelayVRFStory` too early because the same relay chain VRF appears in multiple blocks.
+We like that `RelayVRFStory` admits relatively few choices, but an adversary who equivocates in relay chain block
+production could learn assignments that depend upon the `RelayVRFStory` too early because the same relay chain VRF
+appears in multiple blocks.
 
-We therefore provide a secondary `RelayEquivocationStory` that outputs the candidate's block hash, but only for candidate equivocations.  We say a candidate `C` in `R` is an equivocation when there exists another relay chain block `R1` that equivocates for `R` in the sense that `R` and `R1` have the same `RelayVRFStory`, but `R` contains `C` and `R1` does not contain `C`.
+We therefore provide a secondary `RelayEquivocationStory` that outputs the candidate's block hash, but only for
+candidate equivocations.  We say a candidate `C` in `R` is an equivocation when there exists another relay chain block
+`R1` that equivocates for `R` in the sense that `R` and `R1` have the same `RelayVRFStory`, but `R` contains `C` and
+`R1` does not contain `C`.
 
-We want checkers for candidate equivocations that lie outside our preferred relay chain as well, which represents a slightly different usage for the assignments module, and might require more information in the gossip messages.
+We want checkers for candidate equivocations that lie outside our preferred relay chain as well, which represents a
+slightly different usage for the assignments module, and might require more information in the gossip messages.
 
 ## Assignment criteria
 
-Assignment criteria compute actual assignments using stories and the validators' secret approval assignment key.  Assignment criteria output a `Position` consisting of both a `ParaId` to be checked, as well as a precedence `DelayTranche` for when the assignment becomes valid.
+Assignment criteria compute actual assignments using stories and the validators' secret approval assignment key.
+Assignment criteria output a `Position` consisting of both a `ParaId` to be checked, as well as a precedence
+`DelayTranche` for when the assignment becomes valid.
 
-Assignment criteria come in three flavors, `RelayVRFModulo`, `RelayVRFDelay` and `RelayEquivocation`.  Among these, both `RelayVRFModulo` and `RelayVRFDelay` run a VRF whose input is the output of a `RelayVRFStory`, while `RelayEquivocation` runs a VRF whose input is the output of a `RelayEquivocationStory`.
+Assignment criteria come in three flavors, `RelayVRFModulo`, `RelayVRFDelay` and `RelayEquivocation`.  Among these, both
+`RelayVRFModulo` and `RelayVRFDelay` run a VRF whose input is the output of a `RelayVRFStory`, while `RelayEquivocation`
+runs a VRF whose input is the output of a `RelayEquivocationStory`.
 
 Among these, we have two distinct VRF output computations:
 
-`RelayVRFModulo` runs several distinct samples whose VRF input is the `RelayVRFStory` and the sample number.  It computes the VRF output with `schnorrkel::vrf::VRFInOut::make_bytes` using the context "A&V Core", reduces this number modulo the number of availability cores, and outputs the candidate just declared available by, and included by aka leaving, that availability core.  We drop any samples that return no candidate because no candidate was leaving the sampled availability core in this relay chain block.  We choose three samples initially, but we could make polkadot more secure and efficient by increasing this to four or five, and reducing the backing checks accordingly.  All successful `RelayVRFModulo` samples are assigned delay tranche zero.
+`RelayVRFModulo` runs several distinct samples whose VRF input is the `RelayVRFStory` and the sample number.  It
+computes the VRF output with `schnorrkel::vrf::VRFInOut::make_bytes` using the context "A&V Core", reduces this number
+modulo the number of availability cores, and outputs the candidate just declared available by, and included by aka
+leaving, that availability core.  We drop any samples that return no candidate because no candidate was leaving the
+sampled availability core in this relay chain block.  We choose three samples initially, but we could make Polkadot more
+secure and efficient by increasing this to four or five, and reducing the backing checks accordingly.  All successful
+`RelayVRFModulo` samples are assigned delay tranche zero.
 
-There is no sampling process for `RelayVRFDelay` and `RelayEquivocation`.  We instead run them on specific candidates and they compute a delay from their VRF output.  `RelayVRFDelay` runs for all candidates included under, aka declared available by, a relay chain block, and inputs the associated VRF output via `RelayVRFStory`.  `RelayEquivocation` runs only on candidate block equivocations, and inputs their block hashes via the `RelayEquivocation` story.
+There is no sampling process for `RelayVRFDelay` and `RelayEquivocation`.  We instead run them on specific candidates
+and they compute a delay from their VRF output.  `RelayVRFDelay` runs for all candidates included under, aka declared
+available by, a relay chain block, and inputs the associated VRF output via `RelayVRFStory`.  `RelayEquivocation` runs
+only on candidate block equivocations, and inputs their block hashes via the `RelayEquivocation` story.
 
-`RelayVRFDelay` and `RelayEquivocation` both compute their output with `schnorrkel::vrf::VRFInOut::make_bytes` using the context "A&V Tranche" and reduce the result modulo `num_delay_tranches + zeroth_delay_tranche_width`, and consolidate results 0 through `zeroth_delay_tranche_width` to be 0.  In this way, they ensure the zeroth delay tranche has `zeroth_delay_tranche_width+1` times as many assignments as any other tranche.
+`RelayVRFDelay` and `RelayEquivocation` both compute their output with `schnorrkel::vrf::VRFInOut::make_bytes` using the
+context "A&V Tranche" and reduce the result modulo `num_delay_tranches + zeroth_delay_tranche_width`, and consolidate
+results 0 through `zeroth_delay_tranche_width` to be 0.  In this way, they ensure the zeroth delay tranche has
+`zeroth_delay_tranche_width+1` times as many assignments as any other tranche.
 
-As future work (or TODO?), we should merge assignment notices with the same delay and story using `vrf_merge`.  We cannot merge those with the same delay and different stories because `RelayEquivocationStory`s could change but `RelayVRFStory` never changes.
+As future work (or TODO?), we should merge assignment notices with the same delay and story using `vrf_merge`.  We
+cannot merge those with the same delay and different stories because `RelayEquivocationStory`s could change but
+`RelayVRFStory` never changes.
 
 ## Announcer and Watcher/Tracker
 
-We track all validators' announced approval assignments for each candidate associated to each relay chain block, which tells us which validators were assigned to which candidates.
+We track all validators' announced approval assignments for each candidate associated to each relay chain block, which
+tells us which validators were assigned to which candidates.
 
-We permit at most one assignment per candidate per story per validator, so one validator could be assigned under both the `RelayVRFDelay` and `RelayEquivocation` criteria, but not under both `RelayVRFModulo` and `RelayVRFDelay` criteria, since those both use the same story.  We permit only one approval vote per candidate per validator, which counts for any applicable criteria.
+We permit at most one assignment per candidate per story per validator, so one validator could be assigned under both
+the `RelayVRFDelay` and `RelayEquivocation` criteria, but not under both `RelayVRFModulo` and `RelayVRFDelay` criteria,
+since those both use the same story.  We permit only one approval vote per candidate per validator, which counts for any
+applicable criteria.
 
-We announce, and start checking for, our own assignments when the delay of their tranche is reached, but only if the tracker says the assignee candidate requires more approval checkers.  We never announce an assignment we believe unnecessary because early announcements gives an adversary information.  All delay tranche zero assignments always get announced, which includes all `RelayVRFModulo` assignments.
+We announce, and start checking for, our own assignments when the delay of their tranche is reached, but only if the
+tracker says the assignee candidate requires more approval checkers.  We never announce an assignment we believe
+unnecessary because early announcements gives an adversary information.  All delay tranche zero assignments always get
+announced, which includes all `RelayVRFModulo` assignments.
 
-In other words, if some candidate `C` needs more approval checkers by the time we reach round `t` then any validators with an assignment to `C` in delay tranche `t` gossip their send assignment notice for `C`, and begin reconstruction and validation for 'C.  If however `C` reached enough assignments, then validators with later assignments skip announcing their assignments.
+In other words, if some candidate `C` needs more approval checkers by the time we reach round `t` then any validators
+with an assignment to `C` in delay tranche `t` gossip their send assignment notice for `C`, and begin reconstruction and
+validation for 'C.  If however `C` reached enough assignments, then validators with later assignments skip announcing
+their assignments.
 
-We continue until all candidates have enough approval checkers assigned.  We never prioritize assignments within tranches and count all or no assignments for a given tranche together, so we often overshoot the target number of assigned approval checkers.
+We continue until all candidates have enough approval checkers assigned.  We never prioritize assignments within
+tranches and count all or no assignments for a given tranche together, so we often overshoot the target number of
+assigned approval checkers.
 
 ### No shows
 
-We have a "no show" timeout longer than one relay chain slot, so at least 6 seconds, during which we expect approval checks should succeed in reconstructing the candidate block, in redoing its erasure coding to check the candidate receipt, and finally in rechecking the candidate block itself.
+We have a "no show" timeout longer than one relay chain slot, so at least 6 seconds, during which we expect approval
+checks should succeed in reconstructing the candidate block, in redoing its erasure coding to check the candidate
+receipt, and finally in rechecking the candidate block itself.
 
-We consider a validator a "no show" if they do not approve or dispute within this "no show" timeout from our receiving their assignment notice.  We time this from our receipt of their assignment notice instead of our imagined real time for their tranche because otherwise receiving late assignment notices creates immediate "no shows" and unnecessary work.
+We consider a validator a "no show" if they do not approve or dispute within this "no show" timeout from our receiving
+their assignment notice.  We time this from our receipt of their assignment notice instead of our imagined real time for
+their tranche because otherwise receiving late assignment notices creates immediate "no shows" and unnecessary work.
 
-We worry "no shows" represent a validator under denial of service attack, presumably to prevent it from reconstructing the candidate, but perhaps delaying it form gossiping a dispute too.  We therefore always replace "no shows" by adding one entire extra delay tranche worth of validators, so such attacks always result in additional checkers.
+We worry "no shows" represent a validator under denial of service attack, presumably to prevent it from reconstructing
+the candidate, but perhaps delaying it form gossiping a dispute too.  We therefore always replace "no shows" by adding
+one entire extra delay tranche worth of validators, so such attacks always result in additional checkers.
 
-As an example, imagine we need 20 checkers, but tranche zero produces only 14, and tranche one only 4, then we take all 5 from tranche two, and thus require 23 checkers for that candidate.  If one checker Charlie from tranche one or two does not respond within say 8 seconds, then we add all 7 checkers from tranche three.  If again one checker Cindy from tranche three does not respond within 8 seconds then we take all 3 checkers from tranche four.  We now have 33 checkers working on the candidate, so this escalated quickly.
+As an example, imagine we need 20 checkers, but tranche zero produces only 14, and tranche one only 4, then we take all
+5 from tranche two, and thus require 23 checkers for that candidate.  If one checker Charlie from tranche one or two
+does not respond within say 8 seconds, then we add all 7 checkers from tranche three.  If again one checker Cindy from
+tranche three does not respond within 8 seconds then we take all 3 checkers from tranche four.  We now have 33 checkers
+working on the candidate, so this escalated quickly.
 
-We escalated so quickly because we worried that Charlie and Cindy might be the only honest checkers assigned to that candidate.  If therefore either Charlie or Cindy finally return an approval, then we can conclude approval, and abandon the checkers from tranche four.
+We escalated so quickly because we worried that Charlie and Cindy might be the only honest checkers assigned to that
+candidate.  If therefore either Charlie or Cindy finally return an approval, then we can conclude approval, and abandon
+the checkers from tranche four.
 
-We therefore require the "no show" timeout to be longer than a relay chain slot so that we can witness "no shows" on-chain.  We discuss below how this helps reward validators who replace "no shows".
+We therefore require the "no show" timeout to be longer than a relay chain slot so that we can witness "no shows"
+on-chain.  We discuss below how this helps reward validators who replace "no shows".
 
-We avoid slashing for "no shows" by itself, although being "no show" could enter into some computation that punishes repeated poor performance, presumably replaces `ImOnline`, and we could reduce their rewards and further rewards those who filled in.
+We avoid slashing for "no shows" by itself, although being "no show" could enter into some computation that punishes
+repeated poor performance, presumably replaces `ImOnline`, and we could reduce their rewards and further rewards those
+who filled in.
 
-As future work, we foresee expanding the "no show" scheme to anonymize the additional checkers, like by using assignment noticed with a new criteria that employs a ring VRF and then all validators providing cover by requesting a couple erasure coded pieces, but such anonymity scheme sound extremely complex and lie far beyond our initial functionality.
+As future work, we foresee expanding the "no show" scheme to anonymize the additional checkers, like by using assignment
+noticed with a new criteria that employs a ring VRF and then all validators providing cover by requesting a couple
+erasure coded pieces, but such anonymity scheme sound extremely complex and lie far beyond our initial functionality.
 
 ## Assignment postponement
 
-We expect validators could occasionally overloaded when they randomly acquire too many assignments.  All these fluctuations amortize over multiple blocks fairly well, but this slows down finality.
+We expect validators could occasionally overloaded when they randomly acquire too many assignments.  All these
+fluctuations amortize over multiple blocks fairly well, but this slows down finality.
 
-We therefore permit validators to delay sending their assignment noticed intentionally.  If nobody knows about their assignment then they avoid creating "no shows" and the workload progresses normally.
+We therefore permit validators to delay sending their assignment noticed intentionally.  If nobody knows about their
+assignment then they avoid creating "no shows" and the workload progresses normally.
 
-We strongly prefer if postponements come from tranches higher aka less important than zero because tranche zero checks provide somewhat more security.
+We strongly prefer if postponements come from tranches higher aka less important than zero because tranche zero checks
+provide somewhat more security.
 
 TODO: When?  Is this optimal for the network?  etc.
 
 ## On-chain verification
 
-We should verify approval on-chain to reward approval checkers. We therefore require the "no show" timeout to be longer than a relay chain slot so that we can witness "no shows" on-chain, which helps with this goal. The major challenge with an on-chain record of the off-chain process is adversarial block producers who may either censor votes or publish votes to the chain which cause other votes to be ignored and unrewarded (reward stealing).
+We should verify approval on-chain to reward approval checkers. We therefore require the "no show" timeout to be longer
+than a relay chain slot so that we can witness "no shows" on-chain, which helps with this goal. The major challenge with
+an on-chain record of the off-chain process is adversarial block producers who may either censor votes or publish votes
+to the chain which cause other votes to be ignored and unrewarded (reward stealing).
 
-In principle, all validators have some "tranche" at which they're assigned to the parachain candidate, which ensures we reach enough validators eventually.  As noted above, we often retract "no shows" when the slow validator eventually shows up, so witnessing their initially being a "no show" helps manage rewards.
+In principle, all validators have some "tranche" at which they're assigned to the parachain candidate, which ensures we
+reach enough validators eventually.  As noted above, we often retract "no shows" when the slow validator eventually
+shows up, so witnessing their initially being a "no show" helps manage rewards.
 
-We expect on-chain verification should work in two phases:  We first record assignments notices and approval votes on-chain in relay chain block, doing the VRF or regular signature verification again in block verification, and inserting chain authenticated unsigned notes into the relay chain state that contain the checker, tranche, paraid, and relay block height for each assignment notice.  We then later have another relay chain block that runs some "approved" intrinsic, which extract all these notes from the state and feeds them into our approval code.
+We expect on-chain verification should work in two phases:  We first record assignments notices and approval votes
+on-chain in relay chain block, doing the VRF or regular signature verification again in block verification, and
+inserting chain authenticated unsigned notes into the relay chain state that contain the checker, tranche, paraid, and
+relay block height for each assignment notice.  We then later have another relay chain block that runs some "approved"
+intrinsic, which extract all these notes from the state and feeds them into our approval code.
 
-We now encounter one niche concern in the interaction between postponement and on-chain verification:  Any validator with a tranche zero (or other low) assignment could delay sending an assignment notice, like because they postponed their assigned tranche (which is allowed).  If they later send this assignment notices right around finality time, then they race with this approved. intrinsic:  If their announcement gets on-chain (also allowed), then yes it delays finality. If it does not get on-chain, then yes we've one announcement that the off-chain consensus system says is valid, but the chain ignores for being too slow.
+We now encounter one niche concern in the interaction between postponement and on-chain verification:  Any validator
+with a tranche zero (or other low) assignment could delay sending an assignment notice, like because they postponed
+their assigned tranche (which is allowed).  If they later send this assignment notices right around finality time, then
+they race with this approved. intrinsic:  If their announcement gets on-chain (also allowed), then yes it delays
+finality. If it does not get on-chain, then yes we've one announcement that the off-chain consensus system says is
+valid, but the chain ignores for being too slow.
 
-We need the chain to win in this case, but doing this requires imposing an annoyingly long overarching delay upon finality.  We might explore limits on postponement too, but this sounds much harder.
+We need the chain to win in this case, but doing this requires imposing an annoyingly long overarching delay upon
+finality.  We might explore limits on postponement too, but this sounds much harder.
 
 ## Parameters
 
-We prefer doing approval checkers assignments under `RelayVRFModulo` as opposed to `RelayVRFDelay` because `RelayVRFModulo` avoids giving individual checkers too many assignments and tranche zero assignments benefit security the most.  We suggest assigning at least 16 checkers under `RelayVRFModulo` although assignment levels have never been properly analyzed.
+We prefer doing approval checkers assignments under `RelayVRFModulo` as opposed to `RelayVRFDelay` because
+`RelayVRFModulo` avoids giving individual checkers too many assignments and tranche zero assignments benefit security
+the most.  We suggest assigning at least 16 checkers under `RelayVRFModulo` although assignment levels have never been
+properly analyzed.
 
-Our delay criteria `RelayVRFDelay` and `RelayEquivocation` both have two primary paramaters, expected checkers per tranche and the zeroth delay tranche width.
+Our delay criteria `RelayVRFDelay` and `RelayEquivocation` both have two primary paramaters, expected checkers per
+tranche and the zeroth delay tranche width.
 
-We require expected checkers per tranche to be less than three because otherwise an adversary with 1/3 stake could force all nodes into checking all blocks.  We strongly recommend expected checkers per tranche to be less than two, which helps avoid both accidental and intentional explosions.  We also suggest expected checkers per tranche be larger than one, which helps prevent adversaries from predicting than advancing one tranche adds only their own validators.
+We require expected checkers per tranche to be less than three because otherwise an adversary with 1/3 stake could force
+all nodes into checking all blocks.  We strongly recommend expected checkers per tranche to be less than two, which
+helps avoid both accidental and intentional explosions.  We also suggest expected checkers per tranche be larger than
+one, which helps prevent adversaries from predicting than advancing one tranche adds only their own validators.
 
-We improve security more with tranche zero assignments, so `RelayEquivocation` should consolidates its first several tranches into tranche zero.  We describe this as the zeroth delay tranche width, which initially we set to 12 for `RelayEquivocation` and `1` for `RelayVRFDelay`.
+We improve security more with tranche zero assignments, so `RelayEquivocation` should consolidates its first several
+tranches into tranche zero.  We describe this as the zeroth delay tranche width, which initially we set to 12 for
+`RelayEquivocation` and `1` for `RelayVRFDelay`.
 
 ## Why VRFs?
 
 We do assignments with VRFs to give "enough" checkers some meaning beyond merely "expected" checkers:
 
-We could specify a protocol that used only system randomness, which works because our strongest defense is the expected number of honest checkers who assign themselves.  In this, adversaries could trivially flood their own blocks with their own checkers, so this strong defense becomes our only defense, and delay tranches become useless, so some blocks actually have zero approval checkers and possibly only one checker overall.
+We could specify a protocol that used only system randomness, which works because our strongest defense is the expected
+number of honest checkers who assign themselves.  In this, adversaries could trivially flood their own blocks with their
+own checkers, so this strong defense becomes our only defense, and delay tranches become useless, so some blocks
+actually have zero approval checkers and possibly only one checker overall.
 
-VRFs though require adversaries wait far longer between such attacks, which also helps against adversaries with little at stake because they compromised validators.  VRFs raise user confidence that no such "drive by" attacks occurred because the delay tranche system ensure at least some minimum number of approval checkers.  In this vein, VRFs permit reducing backing checks and increasing approval checks, which makes polkadot more efficient.
+VRFs though require adversaries wait far longer between such attacks, which also helps against adversaries with little
+at stake because they compromised validators.  VRFs raise user confidence that no such "drive by" attacks occurred
+because the delay tranche system ensure at least some minimum number of approval checkers.  In this vein, VRFs permit
+reducing backing checks and increasing approval checks, which makes Polkadot more efficient.
 
 ## Gossip
 
-Any validator could send their assignment notices and/or approval votes too early.  We gossip the approval votes because they represent a major commitment by the validator.  We retain but delay gossiping the assignment notices until they agree with our local clock.
+Any validator could send their assignment notices and/or approval votes too early.  We gossip the approval votes because
+they represent a major commitment by the validator.  We retain but delay gossiping the assignment notices until they
+agree with our local clock.
 
-Assignment notices being gossiped too early might create a denial of service vector.  If so, we might exploit the relative time scheme that synchronizes our clocks, which conceivably permits just dropping excessively early assignments.
+Assignment notices being gossiped too early might create a denial of service vector.  If so, we might exploit the
+relative time scheme that synchronizes our clocks, which conceivably permits just dropping excessively early
+assignments.
 
 ## Finality GRANDPA Voting Rule
 
-The relay-chain requires validators to participate in GRANDPA. In GRANDPA, validators submit off-chain votes on what they believe to be the best block of the chain, and GRANDPA determines the common block contained by a supermajority of sub-chains. There are also additional constraints on what can be submitted based on results of previous rounds of voting.
+The relay-chain requires validators to participate in GRANDPA. In GRANDPA, validators submit off-chain votes on what
+they believe to be the best block of the chain, and GRANDPA determines the common block contained by a supermajority of
+sub-chains. There are also additional constraints on what can be submitted based on results of previous rounds of
+voting.
 
-In order to avoid finalizing anything which has not received enough approval votes or is disputed, we will pair the approval protocol with an alteration to the GRANDPA voting strategy for honest nodes which causes them to vote only on chains where every parachain candidate within has been approved.  Furthermore, the voting rule prevents voting for chains where there is any live dispute or any dispute has resolved to a candidate being invalid.
+In order to avoid finalizing anything which has not received enough approval votes or is disputed, we will pair the
+approval protocol with an alteration to the GRANDPA voting strategy for honest nodes which causes them to vote only on
+chains where every parachain candidate within has been approved.  Furthermore, the voting rule prevents voting for
+chains where there is any live dispute or any dispute has resolved to a candidate being invalid.
 
-Thus, the finalized relay-chain should contain only relay-chain blocks where a majority believe that every block within has been sufficiently approved.
+Thus, the finalized relay-chain should contain only relay-chain blocks where a majority believe that every block within
+has been sufficiently approved.
 
 ### Future work
 
-We could consider additional gossip messages with which nodes claims "slow availability" and/or "slow candidate" to fine tune the assignments "no show" system, but long enough "no show" delays suffice probably.
+We could consider additional gossip messages with which nodes claims "slow availability" and/or "slow candidate" to fine
+tune the assignments "no show" system, but long enough "no show" delays suffice probably.
 
-We shall develop more practical experience with UDP once the availability system works using direct UDP connections.  In this, we should discover if reconstruction performs adequately with a complete graphs or
-benefits from topology restrictions.  At this point, an assignment notices could implicitly request pieces from a random 1/3rd, perhaps topology restricted, which saves one gossip round.  If this preliminary fast reconstruction fails, then nodes' request alternative pieces directly.  There is an interesting design space in how this overlaps with "slow availability" claims.
+We shall develop more practical experience with UDP once the availability system works using direct UDP connections.  In
+this, we should discover if reconstruction performs adequately with a complete graphs or benefits from topology
+restrictions.  At this point, an assignment notices could implicitly request pieces from a random 1/3rd, perhaps
+topology restricted, which saves one gossip round.  If this preliminary fast reconstruction fails, then nodes' request
+alternative pieces directly.  There is an interesting design space in how this overlaps with "slow availability" claims.
diff --git a/polkadot/roadmap/implementers-guide/src/protocol-chain-selection.md b/polkadot/roadmap/implementers-guide/src/protocol-chain-selection.md
index dd066df43cdde8e0f9c0e4ecd9364e2b7fb68fbd..9f0262243bd2267e25613e0bf28b0d9dc5893253 100644
--- a/polkadot/roadmap/implementers-guide/src/protocol-chain-selection.md
+++ b/polkadot/roadmap/implementers-guide/src/protocol-chain-selection.md
@@ -1,12 +1,21 @@
 # Chain Selection
 
-Chain selection processes in blockchains are used for the purpose of selecting blocks to build on and finalize. It is important for these processes to be consistent among nodes and resilient to a maximum proportion of malicious nodes which do not obey the chain selection process.
+Chain selection processes in blockchains are used for the purpose of selecting blocks to build on and finalize. It is
+important for these processes to be consistent among nodes and resilient to a maximum proportion of malicious nodes
+which do not obey the chain selection process.
 
-The parachain host uses both a block authoring system and a finality gadget. The chain selection strategy of the parachain host involves two key components: a _leaf-selection_ rule and a set of _finality constraints_. When it's a validator's turn to author on a block, they are expected to select the best block via the leaf-selection rule to build on top of. When a validator is participating in finality, there is a minimum block which can be voted on, which is usually the finalized block. The validator should select the best chain according to the leaf-selection rule and subsequently apply the finality constraints to arrive at the actual vote cast by that validator.
+The parachain host uses both a block authoring system and a finality gadget. The chain selection strategy of the
+parachain host involves two key components: a _leaf-selection_ rule and a set of _finality constraints_. When it's a
+validator's turn to author on a block, they are expected to select the best block via the leaf-selection rule to build
+on top of. When a validator is participating in finality, there is a minimum block which can be voted on, which is
+usually the finalized block. The validator should select the best chain according to the leaf-selection rule and
+subsequently apply the finality constraints to arrive at the actual vote cast by that validator.
 
-Before diving into the particularities of the leaf-selection rule and the finality constraints, it's important to discuss the goals that these components are meant to achieve. For this it is useful to create the definitions of _viable_ and _finalizable_ blocks.
+Before diving into the particularities of the leaf-selection rule and the finality constraints, it's important to
+discuss the goals that these components are meant to achieve. For this it is useful to create the definitions of
+_viable_ and _finalizable_ blocks.
 
-### Property Definitions
+## Property Definitions
 
 A block is considered **viable** when all of the following hold:
   1. It is or descends from the finalized block
@@ -32,17 +41,27 @@ A block is considered **finalizable** when all of the following hold:
   4. It is either finalized or includes no candidates which have unresolved disputes or have lost a dispute.
 
 
-### The leaf-selection rule
+## The leaf-selection rule
 
-We assume that every block has an implicit weight or score which can be used to compare blocks. In BABE, this is determined by the number of primary slots included in the chain. In PoW, this is the chain with either the most work or GHOST weight.
+We assume that every block has an implicit weight or score which can be used to compare blocks. In BABE, this is
+determined by the number of primary slots included in the chain. In PoW, this is the chain with either the most work or
+GHOST weight.
 
-The leaf-selection rule based on our definitions above is simple: we take the maximum-scoring viable leaf we are aware of. In the case of a tie we select the one with a lower lexicographical block hash.
+The leaf-selection rule based on our definitions above is simple: we take the maximum-scoring viable leaf we are aware
+of. In the case of a tie we select the one with a lower lexicographical block hash.
 
-### The best-chain-containing rule
+## The best-chain-containing rule
 
-Finality gadgets, as mentioned above, will often impose an additional requirement to vote on a chain containing a specific block, known as the **required** block. Although this is typically the most recently finalized block, it is possible that it may be a block that is unfinalized. When receiving such a request:
+Finality gadgets, as mentioned above, will often impose an additional requirement to vote on a chain containing a
+specific block, known as the **required** block. Although this is typically the most recently finalized block, it is
+possible that it may be a block that is unfinalized. When receiving such a request:
 1. If the required block is the best finalized block, then select the best viable leaf.
-2. If the required block is unfinalized and non-viable, then select the required block and go no further. This is likely an indication that something bad will be finalized in the network, which will never happen when approvals & disputes are functioning correctly. Nevertheless we account for the case here.
-3. If the required block is unfinalized and viable, then iterate over the viable leaves in descending order by score and select the first one which contains the required block in its chain. Backwards iteration is a simple way to check this, but if unfinalized chains grow long then Merkle Mountain-Ranges will most likely be more efficient.
-
-Once selecting a leaf, the chain should be constrained to the maximum of the required block or the highest **finalizable** ancestor.
+2. If the required block is unfinalized and non-viable, then select the required block and go no further. This is likely
+   an indication that something bad will be finalized in the network, which will never happen when approvals & disputes
+   are functioning correctly. Nevertheless we account for the case here.
+3. If the required block is unfinalized and viable, then iterate over the viable leaves in descending order by score and
+   select the first one which contains the required block in its chain. Backwards iteration is a simple way to check
+   this, but if unfinalized chains grow long then Merkle Mountain-Ranges will most likely be more efficient.
+
+Once selecting a leaf, the chain should be constrained to the maximum of the required block or the highest
+**finalizable** ancestor.
diff --git a/polkadot/roadmap/implementers-guide/src/protocol-disputes.md b/polkadot/roadmap/implementers-guide/src/protocol-disputes.md
index ebbc534f199237d5fd56348b4f6b0f180d16866f..2a4082cc07f92aa99425e9e708ec2e90117c02c5 100644
--- a/polkadot/roadmap/implementers-guide/src/protocol-disputes.md
+++ b/polkadot/roadmap/implementers-guide/src/protocol-disputes.md
@@ -4,14 +4,27 @@ Fast forward to [more detailed disputes requirements](./disputes-flow.md).
 
 ## Motivation and Background
 
-All parachain blocks that end up in the finalized relay chain should be valid. This does not apply to blocks that are only backed, but not included.
+All parachain blocks that end up in the finalized relay chain should be valid. This does not apply to blocks that are
+only backed, but not included.
 
 We have two primary components for ensuring that nothing invalid ends up in the finalized relay chain:
-  * Approval Checking, as described [here](./protocol-approval.md) and implemented according to the [Approval Voting](node/approval/approval-voting.md) subsystem. This protocol can be shown to prevent invalid parachain blocks from making their way into the finalized relay chain as long as the amount of attempts are limited.
-  * Disputes, this protocol, which ensures that each attempt to include something bad is caught, and the offending validators are punished.
-Disputes differ from backing and approval process (and can not be part of those) in that a dispute is independent of a particular fork, while both backing and approval operate on particular forks. This distinction is important! Approval voting stops, if an alternative fork which might not contain the currently approved candidate gets finalized. This is totally fine from the perspective of approval voting as its sole purpose is to make sure invalid blocks won't get finalized. For disputes on the other hand we have different requirements: Even though the "danger" is past and the adversaries were not able to get their invalid block approved, we still want them to get slashed for the attempt. Otherwise they just have been able to get a free try, but this is something we need to avoid in our security model, as it is based on the assumption that the probability of getting an invalid block finalized is very low and an attacker would get bankrupt before it could have tried often enough.
-
-Every dispute stems from a disagreement among two or more validators. If a bad actor creates a bad block, but the bad actor never distributes it to honest validators, then nobody will dispute it. Of course, such a situation is not even an attack on the network, so we don't need to worry about defending against it.
+  * Approval Checking, as described [here](./protocol-approval.md) and implemented according to the [Approval
+    Voting](node/approval/approval-voting.md) subsystem. This protocol can be shown to prevent invalid parachain blocks
+    from making their way into the finalized relay chain as long as the amount of attempts are limited.
+  * Disputes, this protocol, which ensures that each attempt to include something bad is caught, and the offending
+validators are punished. Disputes differ from backing and approval process (and can not be part of those) in that a
+dispute is independent of a particular fork, while both backing and approval operate on particular forks. This
+distinction is important! Approval voting stops, if an alternative fork which might not contain the currently approved
+candidate gets finalized. This is totally fine from the perspective of approval voting as its sole purpose is to make
+sure invalid blocks won't get finalized. For disputes on the other hand we have different requirements: Even though the
+"danger" is past and the adversaries were not able to get their invalid block approved, we still want them to get
+slashed for the attempt. Otherwise they just have been able to get a free try, but this is something we need to avoid in
+our security model, as it is based on the assumption that the probability of getting an invalid block finalized is very
+low and an attacker would get bankrupt before it could have tried often enough.
+
+Every dispute stems from a disagreement among two or more validators. If a bad actor creates a bad block, but the bad
+actor never distributes it to honest validators, then nobody will dispute it. Of course, such a situation is not even an
+attack on the network, so we don't need to worry about defending against it.
 
 We are interested in identifying and deterring the following attack scenario:
   * A parablock included on a branch of the relay chain is bad
@@ -20,48 +33,101 @@ We are also interested in identifying these additional scenarios:
   * A parablock backed on a branch of the relay chain is bad
   * A parablock seconded, but not backed on any branch of the relay chain, is bad.
 
-Punishing misbehavior in the latter two scenarios doesn't effect our security guarantees and introduces substantial technical challenges as described in the `No Disputes for Non Included Candidates` section of [Dispute Coordinator](./node/disputes/dispute-coordinator.md). We therefore choose to punt on disputes in these cases, instead favoring the protocol simplicity resulting from only punishing in the first scenario.
-
-As covered in the [protocol overview](./protocol-overview.md), checking a parachain block requires 3 pieces of data: the parachain validation code, the [`AvailableData`](types/availability.md), and the [`CandidateReceipt`](types/candidate.md). The validation code is available on-chain, and published ahead of time, so that no two branches of the relay chain have diverging views of the validation code for a given parachain. Note that only for the first scenario, where the parablock has been included on a branch of the relay chain, is the data necessarily available. Thus, dispute processes should begin with an availability process to ensure availability of the `AvailableData`. This availability process will conclude quickly if the data is already available. If the data is not already available, then the initiator of the dispute must make it available.
-
-Disputes have both an on-chain and an off-chain component. Slashing and punishment is handled on-chain, so votes by validators on either side of the dispute must be placed on-chain. Furthermore, a dispute on one branch of the relay chain should be transposed to all other active branches of the relay chain. The fact that slashing occurs _in all histories_ is crucial for deterring attempts to attack the network. The attacker should not be able to escape with their funds because the network has moved on to another branch of the relay chain where no attack was attempted.
-
-In fact, this is why we introduce a distinction between _local_ and _remote_ disputes. We categorize disputes as either local or remote relative to any particular branch of the relay chain. Local disputes are about dealing with our first scenario, where a parablock has been included on the specific branch we are looking at. In these cases, the chain is corrupted all the way back to the point where the parablock was backed and must be discarded. However, as mentioned before, the dispute must propagate to all other branches of the relay chain. All other disputes are considered _remote_. For the on-chain component, when handling a dispute for a block which was not included in the current fork of the relay chain, it is impossible to discern between our attack scenarios. It is possible that the parablock was included somewhere, or backed somewhere, or wasn't backed anywhere. The on-chain component for handling these cases will be the same.
+Punishing misbehavior in the latter two scenarios doesn't effect our security guarantees and introduces substantial
+technical challenges as described in the `No Disputes for Non Included Candidates` section of [Dispute
+Coordinator](./node/disputes/dispute-coordinator.md). We therefore choose to punt on disputes in these cases, instead
+favoring the protocol simplicity resulting from only punishing in the first scenario.
+
+As covered in the [protocol overview](./protocol-overview.md), checking a parachain block requires 3 pieces of data: the
+parachain validation code, the [`AvailableData`](types/availability.md), and the
+[`CandidateReceipt`](types/candidate.md). The validation code is available on-chain, and published ahead of time, so
+that no two branches of the relay chain have diverging views of the validation code for a given parachain. Note that
+only for the first scenario, where the parablock has been included on a branch of the relay chain, is the data
+necessarily available. Thus, dispute processes should begin with an availability process to ensure availability of the
+`AvailableData`. This availability process will conclude quickly if the data is already available. If the data is not
+already available, then the initiator of the dispute must make it available.
+
+Disputes have both an on-chain and an off-chain component. Slashing and punishment is handled on-chain, so votes by
+validators on either side of the dispute must be placed on-chain. Furthermore, a dispute on one branch of the relay
+chain should be transposed to all other active branches of the relay chain. The fact that slashing occurs _in all
+histories_ is crucial for deterring attempts to attack the network. The attacker should not be able to escape with their
+funds because the network has moved on to another branch of the relay chain where no attack was attempted.
+
+In fact, this is why we introduce a distinction between _local_ and _remote_ disputes. We categorize disputes as either
+local or remote relative to any particular branch of the relay chain. Local disputes are about dealing with our first
+scenario, where a parablock has been included on the specific branch we are looking at. In these cases, the chain is
+corrupted all the way back to the point where the parablock was backed and must be discarded. However, as mentioned
+before, the dispute must propagate to all other branches of the relay chain. All other disputes are considered _remote_.
+For the on-chain component, when handling a dispute for a block which was not included in the current fork of the relay
+chain, it is impossible to discern between our attack scenarios. It is possible that the parablock was included
+somewhere, or backed somewhere, or wasn't backed anywhere. The on-chain component for handling these cases will be the
+same.
 
 ## Initiation
 
-Disputes are initiated by any validator who finds their opinion on the validity of a parablock in opposition to another issued statement. As all statements currently gathered by the relay chain imply validity, disputes will be initiated only by nodes which perceive that the parablock is bad.
-
-The initiation of a dispute begins off-chain. A validator signs a message indicating that it disputes the validity of the parablock and notifies all other validators, off-chain, of all of the statements it is aware of for the disputed parablock. These may be backing statements or approval-checking statements. It is worth noting that there is no special message type for initiating a dispute. It is the same message as is used to participate in a dispute and vote negatively. As such, there is no consensus required on who initiated a dispute, only on the fact that there is a dispute in-progress.
-
-In practice, the initiator of a dispute will be either one of the backers or one of the approval checkers for the parablock. If the result of execution is found to be invalid, the validator will initiate the dispute as described above. Furthermore, if the dispute occurs during the backing phase, the initiator must make the data available to other validators. If the dispute occurs during approval checking, the data is already available.
-
-Lastly, it is possible that for backing disputes, i.e. where the data is not already available among all validators, that an adversary may DoS the few parties who are checking the block to prevent them from distributing the data to other validators participating in the dispute process. Note that this can only occur pre-inclusion for any given parablock, so the downside of this attack is small and it is not security-critical to address these cases. However, we assume that the adversary can only prevent the validator from issuing messages for a limited amount of time. We also assume that there is a side-channel where the relay chain's governance mechanisms can trigger disputes by providing the full PoV and candidate receipt on-chain manually.
+Disputes are initiated by any validator who finds their opinion on the validity of a parablock in opposition to another
+issued statement. As all statements currently gathered by the relay chain imply validity, disputes will be initiated
+only by nodes which perceive that the parablock is bad.
+
+The initiation of a dispute begins off-chain. A validator signs a message indicating that it disputes the validity of
+the parablock and notifies all other validators, off-chain, of all of the statements it is aware of for the disputed
+parablock. These may be backing statements or approval-checking statements. It is worth noting that there is no special
+message type for initiating a dispute. It is the same message as is used to participate in a dispute and vote
+negatively. As such, there is no consensus required on who initiated a dispute, only on the fact that there is a dispute
+in-progress.
+
+In practice, the initiator of a dispute will be either one of the backers or one of the approval checkers for the
+parablock. If the result of execution is found to be invalid, the validator will initiate the dispute as described
+above. Furthermore, if the dispute occurs during the backing phase, the initiator must make the data available to other
+validators. If the dispute occurs during approval checking, the data is already available.
+
+Lastly, it is possible that for backing disputes, i.e. where the data is not already available among all validators,
+that an adversary may DoS the few parties who are checking the block to prevent them from distributing the data to other
+validators participating in the dispute process. Note that this can only occur pre-inclusion for any given parablock, so
+the downside of this attack is small and it is not security-critical to address these cases. However, we assume that the
+adversary can only prevent the validator from issuing messages for a limited amount of time. We also assume that there
+is a side-channel where the relay chain's governance mechanisms can trigger disputes by providing the full PoV and
+candidate receipt on-chain manually.
 
 ## Dispute Participation
 
-Once becoming aware of a dispute, it is the responsibility of all validators to participate in the dispute. Concretely, this means:
-  * Circulate all statements about the candidate that we are aware of - backing statements, approval checking statements, and dispute statements.
+Once becoming aware of a dispute, it is the responsibility of all validators to participate in the dispute. Concretely,
+this means:
+  * Circulate all statements about the candidate that we are aware of - backing statements, approval checking
+    statements, and dispute statements.
   * If we have already issued any type of statement about the candidate, go no further.
-  * Download the [`AvailableData`](types/availability.md). If possible, this should first be attempted from other dispute participants or backing validators, and then [(via erasure-coding)](node/availability/availability-recovery.md) from all validators.
-  * Extract the Validation Code from any recent relay chain block. Code is guaranteed to be kept available on-chain, so we don't need to download any particular fork of the chain.
-  * Execute the block under the validation code, using the `AvailableData`, and check that all outputs are correct, including the `erasure-root` of the [`CandidateReceipt`](types/candidate.md).
+  * Download the [`AvailableData`](types/availability.md). If possible, this should first be attempted from other
+    dispute participants or backing validators, and then [(via
+    erasure-coding)](node/availability/availability-recovery.md) from all validators.
+  * Extract the Validation Code from any recent relay chain block. Code is guaranteed to be kept available on-chain, so
+    we don't need to download any particular fork of the chain.
+  * Execute the block under the validation code, using the `AvailableData`, and check that all outputs are correct,
+    including the `erasure-root` of the [`CandidateReceipt`](types/candidate.md).
   * Issue a dispute participation statement to the effect of the validity of the candidate block.
 
 Disputes _conclude_ after ⅔ supermajority is reached in either direction.
 
-The on-chain component of disputes can be initiated by providing any two conflicting votes and it also waits for a ⅔ supermajority on either side. The on-chain component also tracks which parablocks have already been disputed so the same parablock may only be disputed once on any particular branch of the relay chain. Lastly, it also tracks which blocks have been included on the current branch of the relay chain. When a dispute is initiated for a para, inclusion is halted for the para until the dispute concludes.
+The on-chain component of disputes can be initiated by providing any two conflicting votes and it also waits for a ⅔
+supermajority on either side. The on-chain component also tracks which parablocks have already been disputed so the same
+parablock may only be disputed once on any particular branch of the relay chain. Lastly, it also tracks which blocks
+have been included on the current branch of the relay chain. When a dispute is initiated for a para, inclusion is halted
+for the para until the dispute concludes.
 
-The author of a relay chain block should initiate the on-chain component of disputes for all disputes which the chain is not aware of, and provide all statements to the on-chain component as well. This should all be done via _inherents_.
+The author of a relay chain block should initiate the on-chain component of disputes for all disputes which the chain is
+not aware of, and provide all statements to the on-chain component as well. This should all be done via _inherents_.
 
 Validators can learn about dispute statements in two ways:
   * Receiving them from other validators over gossip
-  * Scraping them from imported blocks of the relay chain. This is also used for validators to track other types of statements, such as backing statements.
+  * Scraping them from imported blocks of the relay chain. This is also used for validators to track other types of
+    statements, such as backing statements.
 
-Validators are rewarded for providing statements to the chain as well as for participating in the dispute, on either side. However, the losing side of the dispute is slashed.
+Validators are rewarded for providing statements to the chain as well as for participating in the dispute, on either
+side. However, the losing side of the dispute is slashed.
 
 ## Dispute Conclusion
 
-Disputes, roughly, are over when one side reaches a ⅔ supermajority. They may also never conclude without either side witnessing supermajority, which will only happen if the majority of validators are unable to vote for some reason. Furthermore, disputes on-chain will stay open for some fixed amount of time even after concluding, to accept new votes.
+Disputes, roughly, are over when one side reaches a ⅔ supermajority. They may also never conclude without either side
+witnessing supermajority, which will only happen if the majority of validators are unable to vote for some reason.
+Furthermore, disputes on-chain will stay open for some fixed amount of time even after concluding, to accept new votes.
 
 Late votes, after the dispute already reached a ⅔ supermajority, must be rewarded (albeit a smaller amount) as well.
diff --git a/polkadot/roadmap/implementers-guide/src/protocol-overview.md b/polkadot/roadmap/implementers-guide/src/protocol-overview.md
index fa5a866e6121b4e1607332f7c9bb5ffb795ed658..96827e8c06bbed580f91f1fb2adb45f9bb8e4fb1 100644
--- a/polkadot/roadmap/implementers-guide/src/protocol-overview.md
+++ b/polkadot/roadmap/implementers-guide/src/protocol-overview.md
@@ -1,28 +1,61 @@
 # Protocol Overview
 
-This section aims to describe, at a high level, the actors and protocols involved in running parachains in Polkadot. Specifically, we describe how different actors communicate with each other, what data structures they keep both individually and collectively, and the high-level purpose on why they do these things.
+This section aims to describe, at a high level, the actors and protocols involved in running parachains in Polkadot.
+Specifically, we describe how different actors communicate with each other, what data structures they keep both
+individually and collectively, and the high-level purpose on why they do these things.
 
-Our top-level goal is to carry a parachain block from authoring to secure inclusion, and define a process which can be carried out repeatedly and in parallel for many different parachains to extend them over time. Understanding of the high-level approach taken here is important to provide context for the proposed architecture further on. The key parts of Polkadot relevant to this are the main Polkadot blockchain, known as the relay-chain, and the actors which provide security and inputs to this blockchain.
+Our top-level goal is to carry a parachain block from authoring to secure inclusion, and define a process which can be
+carried out repeatedly and in parallel for many different parachains to extend them over time. Understanding of the
+high-level approach taken here is important to provide context for the proposed architecture further on. The key parts
+of Polkadot relevant to this are the main Polkadot blockchain, known as the relay-chain, and the actors which provide
+security and inputs to this blockchain.
 
 First, it's important to go over the main actors we have involved in this protocol.
 
-1. Validators. These nodes are responsible for validating proposed parachain blocks. They do so by checking a Proof-of-Validity (PoV) of the block and ensuring that the PoV remains available. They put financial capital down as "skin in the game" which can be slashed (destroyed) if they are proven to have misvalidated.
-1. Collators. These nodes are responsible for creating the Proofs-of-Validity that validators know how to check. Creating a PoV typically requires familiarity with the transaction format and block authoring rules of the parachain, as well as having access to the full state of the parachain.
-
-This implies a simple pipeline where collators send validators parachain blocks and their requisite PoV to check. Then, validators validate the block using the PoV, signing statements which describe either the positive or negative outcome, and with enough positive statements, the block can be noted on the relay-chain. Negative statements are not a veto but will lead to a dispute, with those on the wrong side being slashed. If another validator later detects that a validator or group of validators incorrectly signed a statement claiming a block was valid, then those validators will be _slashed_, with the checker receiving a bounty.
-
-However, there is a problem with this formulation. In order for another validator to check the previous group of validators' work after the fact, the PoV must remain _available_ so the other validator can fetch it in order to check the work. The PoVs are expected to be too large to include in the blockchain directly, so we require an alternate _data availability_ scheme which requires validators to prove that the inputs to their work will remain available, and so their work can be checked. Empirical tests tell us that many PoVs may be between 1 and 10MB during periods of heavy load.
-
-Here is a description of the Inclusion Pipeline: the path a parachain block (or parablock, for short) takes from creation to inclusion:
+1. Validators. These nodes are responsible for validating proposed parachain blocks. They do so by checking a
+   Proof-of-Validity (PoV) of the block and ensuring that the PoV remains available. They put financial capital down as
+   "skin in the game" which can be slashed (destroyed) if they are proven to have misvalidated.
+1. Collators. These nodes are responsible for creating the Proofs-of-Validity that validators know how to check.
+   Creating a PoV typically requires familiarity with the transaction format and block authoring rules of the parachain,
+   as well as having access to the full state of the parachain.
+
+This implies a simple pipeline where collators send validators parachain blocks and their requisite PoV to check. Then,
+validators validate the block using the PoV, signing statements which describe either the positive or negative outcome,
+and with enough positive statements, the block can be noted on the relay-chain. Negative statements are not a veto but
+will lead to a dispute, with those on the wrong side being slashed. If another validator later detects that a validator
+or group of validators incorrectly signed a statement claiming a block was valid, then those validators will be
+_slashed_, with the checker receiving a bounty.
+
+However, there is a problem with this formulation. In order for another validator to check the previous group of
+validators' work after the fact, the PoV must remain _available_ so the other validator can fetch it in order to check
+the work. The PoVs are expected to be too large to include in the blockchain directly, so we require an alternate _data
+availability_ scheme which requires validators to prove that the inputs to their work will remain available, and so
+their work can be checked. Empirical tests tell us that many PoVs may be between 1 and 10MB during periods of heavy
+load.
+
+Here is a description of the Inclusion Pipeline: the path a parachain block (or parablock, for short) takes from
+creation to inclusion:
 
 1. Validators are selected and assigned to parachains by the Validator Assignment routine.
-1. A collator produces the parachain block, which is known as a parachain candidate or candidate, along with a PoV for the candidate.
-1. The collator forwards the candidate and PoV to validators assigned to the same parachain via the [Collator Protocol](node/collators/collator-protocol.md).
-1. The validators assigned to a parachain at a given point in time participate in the [Candidate Backing subsystem](node/backing/candidate-backing.md) to validate candidates that were put forward for validation. Candidates which gather enough signed validity statements from validators are considered "backable". Their backing is the set of signed validity statements.
-1. A relay-chain block author, selected by BABE, can note up to one (1) backable candidate for each parachain to include in the relay-chain block alongside its backing. A backable candidate once included in the relay-chain is considered backed in that fork of the relay-chain.
-1. Once backed in the relay-chain, the parachain candidate is considered to be "pending availability". It is not considered to be included as part of the parachain until it is proven available.
-1. In the following relay-chain blocks, validators will participate in the [Availability Distribution subsystem](node/availability/availability-distribution.md) to ensure availability of the candidate. Information regarding the availability of the candidate will be noted in the subsequent relay-chain blocks.
-1. Once the relay-chain state machine has enough information to consider the candidate's PoV as being available, the candidate is considered to be part of the parachain and is graduated to being a full parachain block, or parablock for short.
+1. A collator produces the parachain block, which is known as a parachain candidate or candidate, along with a PoV for
+   the candidate.
+1. The collator forwards the candidate and PoV to validators assigned to the same parachain via the [Collator
+   Protocol](node/collators/collator-protocol.md).
+1. The validators assigned to a parachain at a given point in time participate in the [Candidate Backing
+   subsystem](node/backing/candidate-backing.md) to validate candidates that were put forward for validation. Candidates
+   which gather enough signed validity statements from validators are considered "backable". Their backing is the set of
+   signed validity statements.
+1. A relay-chain block author, selected by BABE, can note up to one (1) backable candidate for each parachain to include
+   in the relay-chain block alongside its backing. A backable candidate once included in the relay-chain is considered
+   backed in that fork of the relay-chain.
+1. Once backed in the relay-chain, the parachain candidate is considered to be "pending availability". It is not
+   considered to be included as part of the parachain until it is proven available.
+1. In the following relay-chain blocks, validators will participate in the [Availability Distribution
+   subsystem](node/availability/availability-distribution.md) to ensure availability of the candidate. Information
+   regarding the availability of the candidate will be noted in the subsequent relay-chain blocks.
+1. Once the relay-chain state machine has enough information to consider the candidate's PoV as being available, the
+   candidate is considered to be part of the parachain and is graduated to being a full parachain block, or parablock
+   for short.
 
 Note that the candidate can fail to be included in any of the following ways:
 
@@ -31,21 +64,47 @@ Note that the candidate can fail to be included in any of the following ways:
 - The candidate is not selected by a relay-chain block author to be included in the relay chain
 - The candidate's PoV is not considered as available within a timeout and is discarded from the relay chain.
 
-This process can be divided further down. Steps 2 & 3 relate to the work of the collator in collating and distributing the candidate to validators via the Collation Distribution Subsystem. Steps 3 & 4 relate to the work of the validators in the Candidate Backing Subsystem and the block author (itself a validator) to include the block into the relay chain. Steps 6, 7, and 8 correspond to the logic of the relay-chain state-machine (otherwise known as the Runtime) used to fully incorporate the block into the chain. Step 7 requires further work on the validators' parts to participate in the Availability Distribution Subsystem and include that information into the relay chain for step 8 to be fully realized.
-
-This brings us to the second part of the process. Once a parablock is considered available and part of the parachain, it is still "pending approval". At this stage in the pipeline, the parablock has been backed by a majority of validators in the group assigned to that parachain, and its data has been guaranteed available by the set of validators as a whole. Once it's considered available, the host will even begin to accept children of that block. At this point, we can consider the parablock as having been tentatively included in the parachain, although more confirmations are desired. However, the validators in the parachain-group (known as the "Parachain Validators" for that parachain) are sampled from a validator set which contains some proportion of byzantine, or arbitrarily malicious members. This implies that the Parachain Validators for some parachain may be majority-dishonest, which means that (secondary) approval checks must be done on the block before it can be considered approved. This is necessary only because the Parachain Validators for a given parachain are sampled from an overall validator set which is assumed to be up to <1/3 dishonest - meaning that there is a chance to randomly sample Parachain Validators for a parachain that are majority or fully dishonest and can back a candidate wrongly. The Approval Process allows us to detect such misbehavior after-the-fact without allocating more Parachain Validators and reducing the throughput of the system. A parablock's failure to pass the approval process will invalidate the block as well as all of its descendants. However, only the validators who backed the block in question will be slashed, not the validators who backed the descendants.
+This process can be divided further down. Steps 2 & 3 relate to the work of the collator in collating and distributing
+the candidate to validators via the Collation Distribution Subsystem. Steps 3 & 4 relate to the work of the validators
+in the Candidate Backing Subsystem and the block author (itself a validator) to include the block into the relay chain.
+Steps 6, 7, and 8 correspond to the logic of the relay-chain state-machine (otherwise known as the Runtime) used to
+fully incorporate the block into the chain. Step 7 requires further work on the validators' parts to participate in the
+Availability Distribution Subsystem and include that information into the relay chain for step 8 to be fully realized.
+
+This brings us to the second part of the process. Once a parablock is considered available and part of the parachain, it
+is still "pending approval". At this stage in the pipeline, the parablock has been backed by a majority of validators in
+the group assigned to that parachain, and its data has been guaranteed available by the set of validators as a whole.
+Once it's considered available, the host will even begin to accept children of that block. At this point, we can
+consider the parablock as having been tentatively included in the parachain, although more confirmations are desired.
+However, the validators in the parachain-group (known as the "Parachain Validators" for that parachain) are sampled from
+a validator set which contains some proportion of byzantine, or arbitrarily malicious members. This implies that the
+Parachain Validators for some parachain may be majority-dishonest, which means that (secondary) approval checks must be
+done on the block before it can be considered approved. This is necessary only because the Parachain Validators for a
+given parachain are sampled from an overall validator set which is assumed to be up to <1/3 dishonest - meaning that
+there is a chance to randomly sample Parachain Validators for a parachain that are majority or fully dishonest and can
+back a candidate wrongly. The Approval Process allows us to detect such misbehavior after-the-fact without allocating
+more Parachain Validators and reducing the throughput of the system. A parablock's failure to pass the approval process
+will invalidate the block as well as all of its descendants. However, only the validators who backed the block in
+question will be slashed, not the validators who backed the descendants.
 
 The Approval Process, at a glance, looks like this:
 
-1. Parablocks that have been included by the Inclusion Pipeline are pending approval for a time-window known as the secondary checking window.
+1. Parablocks that have been included by the Inclusion Pipeline are pending approval for a time-window known as the
+   secondary checking window.
 1. During the secondary-checking window, validators randomly self-select to perform secondary checks on the parablock.
-1. These validators, known in this context as secondary checkers, acquire the parablock and its PoV, and re-run the validation function.
-1. The secondary checkers gossip the result of their checks. Contradictory results lead to escalation, where all validators are required to check the block. The validators on the losing side of the dispute are slashed.
-1. At the end of the Approval Process, the parablock is either Approved or it is rejected. More on the rejection process later.
+1. These validators, known in this context as secondary checkers, acquire the parablock and its PoV, and re-run the
+   validation function.
+1. The secondary checkers gossip the result of their checks. Contradictory results lead to escalation, where all
+   validators are required to check the block. The validators on the losing side of the dispute are slashed.
+1. At the end of the Approval Process, the parablock is either Approved or it is rejected. More on the rejection process
+   later.
 
-More information on the Approval Process can be found in the dedicated section on [Approval](protocol-approval.md). More information on Disputes can be found in the dedicated section on [Disputes](protocol-disputes.md).
+More information on the Approval Process can be found in the dedicated section on [Approval](protocol-approval.md). More
+information on Disputes can be found in the dedicated section on [Disputes](protocol-disputes.md).
 
-These two pipelines sum up the sequence of events necessary to extend and acquire full security on a Parablock. Note that the Inclusion Pipeline must conclude for a specific parachain before a new block can be accepted on that parachain. After inclusion, the Approval Process kicks off, and can be running for many parachain blocks at once.
+These two pipelines sum up the sequence of events necessary to extend and acquire full security on a Parablock. Note
+that the Inclusion Pipeline must conclude for a specific parachain before a new block can be accepted on that parachain.
+After inclusion, the Approval Process kicks off, and can be running for many parachain blocks at once.
 
 Reiterating the lifecycle of a candidate:
 
@@ -129,8 +188,11 @@ digraph {
 
 The diagram above shows the happy path of a block from (1) Candidate to the (7) Approved state.
 
-It is also important to take note of the fact that the relay-chain is extended by BABE, which is a forkful algorithm. That means that different block authors can be chosen at the same time, and may not be building on the same block parent. Furthermore, the set of validators is not fixed, nor is the set of parachains. And even with the same set of validators and parachains, the validators' assignments to parachains is flexible. This means that the architecture proposed in the next chapters must deal with the variability and multiplicity of the network state.
-
+It is also important to take note of the fact that the relay-chain is extended by BABE, which is a forkful algorithm.
+That means that different block authors can be chosen at the same time, and may not be building on the same block
+parent. Furthermore, the set of validators is not fixed, nor is the set of parachains. And even with the same set of
+validators and parachains, the validators' assignments to parachains is flexible. This means that the architecture
+proposed in the next chapters must deal with the variability and multiplicity of the network state.
 
 ```dot process
 digraph {
@@ -169,7 +231,9 @@ digraph {
 }
 ```
 
-In this example, group 1 has received block C while the others have not due to network asynchrony. Now, a validator from group 2 may be able to build another block on top of B, called `C'`. Assume that afterwards, some validators become aware of both C and `C'`, while others remain only aware of one.
+In this example, group 1 has received block C while the others have not due to network asynchrony. Now, a validator from
+group 2 may be able to build another block on top of B, called `C'`. Assume that afterwards, some validators become
+aware of both C and `C'`, while others remain only aware of one.
 
 ```dot process
 digraph {
@@ -216,4 +280,7 @@ digraph {
 }
 ```
 
-Those validators that are aware of many competing heads must be aware of the work happening on each one. They may contribute to some or a full extent on both. It is possible that due to network asynchrony two forks may grow in parallel for some time, although in the absence of an adversarial network this is unlikely in the case where there are validators who are aware of both chain heads.
+Those validators that are aware of many competing heads must be aware of the work happening on each one. They may
+contribute to some or a full extent on both. It is possible that due to network asynchrony two forks may grow in
+parallel for some time, although in the absence of an adversarial network this is unlikely in the case where there are
+validators who are aware of both chain heads.
diff --git a/polkadot/roadmap/implementers-guide/src/pvf-prechecking.md b/polkadot/roadmap/implementers-guide/src/pvf-prechecking.md
index 91cc8f9b6a20d72912704fe943420037b22144cf..44ddb0abbe08bff1972c7a7433f88a330e98f103 100644
--- a/polkadot/roadmap/implementers-guide/src/pvf-prechecking.md
+++ b/polkadot/roadmap/implementers-guide/src/pvf-prechecking.md
@@ -2,20 +2,28 @@
 
 ## Motivation
 
-Parachains' validation function is described by a wasm module that we refer to as a PVF. Since a PVF is a wasm module the typical way of executing it is to compile it to machine code.
+Parachains' validation function is described by a wasm module that we refer to as a PVF. Since a PVF is a wasm module
+the typical way of executing it is to compile it to machine code.
 
-Typically an optimizing compiler consists of algorithms that are able to optimize the resulting machine code heavily. However, while those algorithms perform quite well for a typical wasm code produced by standard toolchains (e.g. rustc/LLVM), those algorithms can be abused to consume a lot of resources. Moreover, since those algorithms are rather complex there is a lot of room for a bug that can crash the compiler.
+Typically an optimizing compiler consists of algorithms that are able to optimize the resulting machine code heavily.
+However, while those algorithms perform quite well for a typical wasm code produced by standard toolchains (e.g.
+rustc/LLVM), those algorithms can be abused to consume a lot of resources. Moreover, since those algorithms are rather
+complex there is a lot of room for a bug that can crash the compiler.
 
-If compilation of a Parachain Validation Function (PVF) takes too long or uses too much memory, this can leave a node in limbo as to whether a candidate of that parachain is valid or not.
+If compilation of a Parachain Validation Function (PVF) takes too long or uses too much memory, this can leave a node in
+limbo as to whether a candidate of that parachain is valid or not.
 
-The amount of time that a PVF takes to compile is a subjective resource limit and as such PVFs may be maliciously crafted so that there is e.g. a 50/50 split of validators which can and cannot compile and execute the PVF.
+The amount of time that a PVF takes to compile is a subjective resource limit and as such PVFs may be maliciously
+crafted so that there is e.g. a 50/50 split of validators which can and cannot compile and execute the PVF.
 
 This has the following implications:
 - In backing, inclusion may be slow due to backing groups being unable to execute the block
 - In approval checking, there may be many no-shows, leading to slow finality
-- In disputes, neither side may reach supermajority. Nobody will get slashed and the chain will not be reverted or finalized.
+- In disputes, neither side may reach supermajority. Nobody will get slashed and the chain will not be reverted or
+  finalized.
 
-As a result of this issue we need a fairly hard guarantee that the PVFs of registered parachains/threads can be compiled within a reasonable amount of time.
+As a result of this issue we need a fairly hard guarantee that the PVFs of registered parachains/threads can be compiled
+within a reasonable amount of time.
 
 ## Solution
 
@@ -23,9 +31,12 @@ The problem is solved by having a pre-checking process.
 
 ### Pre-checking
 
-Pre-checking mostly consists of attempting to prepare (compile) the PVF WASM blob. We use more strict limits (e.g. timeouts) here compared to regular preparation for execution. This way errors during preparation later are likely unrelated to the PVF itself, as it already passed pre-checking. We can treat such errors as local node issues.
+Pre-checking mostly consists of attempting to prepare (compile) the PVF WASM blob. We use more strict limits (e.g.
+timeouts) here compared to regular preparation for execution. This way errors during preparation later are likely
+unrelated to the PVF itself, as it already passed pre-checking. We can treat such errors as local node issues.
 
-We also have an additional step where we attempt to instantiate the WASM runtime without running it. This is unrelated to preparation so we don't time it, but it does help us catch more issues.
+We also have an additional step where we attempt to instantiate the WASM runtime without running it. This is unrelated
+to preparation so we don't time it, but it does help us catch more issues.
 
 ### Protocol
 
@@ -34,27 +45,41 @@ Pre-checking is run when a new validation code is included in the chain. A new P
 - A new parachain is registered.
 - An existing parachain signalled an upgrade of its validation code.
 
-Before any of those operations finish, the PVF pre-checking vote is initiated. The PVF pre-checking vote is identified by the PVF code hash that is being voted on. If there is already PVF pre-checking process running, then no
-new PVF pre-checking vote will be started. Instead, the operation just subscribes to the existing vote.
+Before any of those operations finish, the PVF pre-checking vote is initiated. The PVF pre-checking vote is identified
+by the PVF code hash that is being voted on. If there is already PVF pre-checking process running, then no new PVF
+pre-checking vote will be started. Instead, the operation just subscribes to the existing vote.
 
-The pre-checking vote can be concluded either by obtaining a threshold of votes for a decision, or if it expires. The threshold to accept is a supermajority of 2/3 of validators. We reject once a supermajority is no longer possible.
+The pre-checking vote can be concluded either by obtaining a threshold of votes for a decision, or if it expires. The
+threshold to accept is a supermajority of 2/3 of validators. We reject once a supermajority is no longer possible.
 
-Each validator checks the list of PVFs available for voting. The vote is binary, i.e. accept or reject a given PVF. As soon as the threshold of votes are collected for one of the sides of the vote, the voting is concluded in that direction and the effects of the voting are enacted.
+Each validator checks the list of PVFs available for voting. The vote is binary, i.e. accept or reject a given PVF. As
+soon as the threshold of votes are collected for one of the sides of the vote, the voting is concluded in that direction
+and the effects of the voting are enacted.
 
-Only validators from the active set can participate in the vote. The set of active validators can change each session. That's why we reset the votes each session. A voting that observed a certain number of sessions will be rejected.
+Only validators from the active set can participate in the vote. The set of active validators can change each session.
+That's why we reset the votes each session. A voting that observed a certain number of sessions will be rejected.
 
 The effects of the PVF accepting depend on the operations requested it:
 
-1. All onboardings subscribed to the approved PVF pre-checking process will get scheduled and after passing 2 session boundaries they will be onboarded.
-1. All upgrades subscribed to the approved PVF pre-checking process will get scheduled very similarly to the existing process. Upgrades with pre-checking are really the same process that is just delayed by the time required for pre-checking voting. In case of instant approval the mechanism is exactly the same.
+1. All onboardings subscribed to the approved PVF pre-checking process will get scheduled and after passing 2 session
+   boundaries they will be onboarded.
+1. All upgrades subscribed to the approved PVF pre-checking process will get scheduled very similarly to the existing
+   process. Upgrades with pre-checking are really the same process that is just delayed by the time required for
+   pre-checking voting. In case of instant approval the mechanism is exactly the same.
 
-In case PVF pre-checking process was concluded with rejection, then all the operations that are subscribed to the rejected PVF pre-checking process will be processed as follows. That is, onboarding or upgrading will be cancelled.
+In case PVF pre-checking process was concluded with rejection, then all the operations that are subscribed to the
+rejected PVF pre-checking process will be processed as follows. That is, onboarding or upgrading will be cancelled.
 
 The logic described above is implemented by the [paras] module.
 
 ### Subsystem
 
-On the node-side, there is a PVF pre-checking [subsystem][pvf-prechecker-subsystem] that scans the chain for new PVFs via using [runtime APIs][pvf-runtime-api]. Upon finding a new PVF, the subsystem will initiate a PVF pre-checking request and wait for the result. Whenever the result is obtained, the subsystem will use the [runtime API][pvf-runtime-api] to submit a vote for the PVF. The vote is an unsigned transaction. The vote will be distributed via the gossip similarly to a normal transaction. Eventually a block producer will include the vote into the block where it will be handled by the [runtime][paras].
+On the node-side, there is a PVF pre-checking [subsystem][pvf-prechecker-subsystem] that scans the chain for new PVFs
+via using [runtime APIs][pvf-runtime-api]. Upon finding a new PVF, the subsystem will initiate a PVF pre-checking
+request and wait for the result. Whenever the result is obtained, the subsystem will use the [runtime
+API][pvf-runtime-api] to submit a vote for the PVF. The vote is an unsigned transaction. The vote will be distributed
+via the gossip similarly to a normal transaction. Eventually a block producer will include the vote into the block where
+it will be handled by the [runtime][paras].
 
 ## Summary
 
@@ -62,11 +87,15 @@ Parachains' validation function is described by a wasm module that we refer to a
 
 In order to make the PVF usable for candidate validation it has to be registered on-chain.
 
-As part of the registration process, it has to go through pre-checking. Pre-checking is a game of attempting preparation and additional checks, and reporting the results back on-chain.
+As part of the registration process, it has to go through pre-checking. Pre-checking is a game of attempting preparation
+and additional checks, and reporting the results back on-chain.
 
-We define preparation as a process that: validates the consistency of the wasm binary (aka prevalidation) and the compilation of the wasm module into machine code (referred to as an artifact).
+We define preparation as a process that: validates the consistency of the wasm binary (aka prevalidation) and the
+compilation of the wasm module into machine code (referred to as an artifact).
 
-Besides pre-checking, preparation can also be triggered by execution, since a compiled artifact is needed for the execution. If an artifact already exists, execution will skip preparation. If it does do preparation, execution uses a more lenient timeout than preparation, to avoid the situation where honest validators fail on valid, pre-checked PVFs.
+Besides pre-checking, preparation can also be triggered by execution, since a compiled artifact is needed for the
+execution. If an artifact already exists, execution will skip preparation. If it does do preparation, execution uses a
+more lenient timeout than preparation, to avoid the situation where honest validators fail on valid, pre-checked PVFs.
 
 [paras]: runtime/paras.md
 [pvf-runtime-api]: runtime-api/pvf-prechecking.md
diff --git a/polkadot/roadmap/implementers-guide/src/runtime-api/README.md b/polkadot/roadmap/implementers-guide/src/runtime-api/README.md
index 740ffd38ccee831a58e7fda2e7d1d64171b46856..d74100f2e262c91e27cd317de65d6408db8c20eb 100644
--- a/polkadot/roadmap/implementers-guide/src/runtime-api/README.md
+++ b/polkadot/roadmap/implementers-guide/src/runtime-api/README.md
@@ -2,9 +2,16 @@
 
 Runtime APIs are the means by which the node-side code extracts information from the state of the runtime.
 
-Every block in the relay-chain contains a *state root* which is the root hash of a state trie encapsulating all storage of runtime modules after execution of the block. This is a cryptographic commitment to a unique state. We use the terminology of accessing the *state at* a block to refer accessing the state referred to by the state root of that block.
+Every block in the relay-chain contains a *state root* which is the root hash of a state trie encapsulating all storage
+of runtime modules after execution of the block. This is a cryptographic commitment to a unique state. We use the
+terminology of accessing the *state at* a block to refer accessing the state referred to by the state root of that
+block.
 
-Although Runtime APIs are often used for simple storage access, they are actually empowered to do arbitrary computation. The implementation of the Runtime APIs lives within the Runtime as Wasm code and exposes `extern` functions that can be invoked with arguments and have a return value. Runtime APIs have access to a variety of host functions, which are contextual functions provided by the Wasm execution context, that allow it to carry out many different types of behaviors.
+Although Runtime APIs are often used for simple storage access, they are actually empowered to do arbitrary computation.
+The implementation of the Runtime APIs lives within the Runtime as Wasm code and exposes `extern` functions that can be
+invoked with arguments and have a return value. Runtime APIs have access to a variety of host functions, which are
+contextual functions provided by the Wasm execution context, that allow it to carry out many different types of
+behaviors.
 
 Abilities provided by host functions includes:
 
@@ -14,16 +21,25 @@ Abilities provided by host functions includes:
 * Optimized versions of cryptographic functions
 * More
 
-So it is clear that Runtime APIs are a versatile and powerful tool to leverage the state of the chain. In general, we will use Runtime APIs for these purposes:
+So it is clear that Runtime APIs are a versatile and powerful tool to leverage the state of the chain. In general, we
+will use Runtime APIs for these purposes:
 
 * Access of a storage item
 * Access of a bundle of related storage items
 * Deriving a value from storage based on arguments
 * Submitting misbehavior reports
 
-More broadly, we have the goal of using Runtime APIs to write Node-side code that fulfills the requirements set by the Runtime. In particular, the constraints set forth by the [Scheduler](../runtime/scheduler.md) and [Inclusion](../runtime/inclusion.md) modules. These modules are responsible for advancing paras with a two-phase protocol where validators are first chosen to validate and back a candidate and then required to ensure availability of referenced data. In the second phase, validators are meant to attest to those para-candidates that they have their availability chunk for. As the Node-side code needs to generate the inputs into these two phases, the runtime API needs to transmit information from the runtime that is aware of the Availability Cores model instantiated by the Scheduler and Inclusion modules.
+More broadly, we have the goal of using Runtime APIs to write Node-side code that fulfills the requirements set by the
+Runtime. In particular, the constraints set forth by the [Scheduler](../runtime/scheduler.md) and
+[Inclusion](../runtime/inclusion.md) modules. These modules are responsible for advancing paras with a two-phase
+protocol where validators are first chosen to validate and back a candidate and then required to ensure availability of
+referenced data. In the second phase, validators are meant to attest to those para-candidates that they have their
+availability chunk for. As the Node-side code needs to generate the inputs into these two phases, the runtime API needs
+to transmit information from the runtime that is aware of the Availability Cores model instantiated by the Scheduler and
+Inclusion modules.
 
-Node-side code is also responsible for detecting and reporting misbehavior performed by other validators, and the set of Runtime APIs needs to provide methods for observing live disputes and submitting reports as transactions.
+Node-side code is also responsible for detecting and reporting misbehavior performed by other validators, and the set of
+Runtime APIs needs to provide methods for observing live disputes and submitting reports as transactions.
 
 The next sections will contain information on specific runtime APIs. The format is this:
 
@@ -38,9 +54,16 @@ The next sections will contain information on specific runtime APIs. The format
 fn some_runtime_api(at: Block, arg1: Type1, arg2: Type2, ...) -> ReturnValue;
 ```
 
-Certain runtime APIs concerning the state of a para require the caller to provide an `OccupiedCoreAssumption`. This indicates how the result of the runtime API should be computed if there is a candidate from the para occupying an availability core in the [Inclusion Module](../runtime/inclusion.md).
+Certain runtime APIs concerning the state of a para require the caller to provide an `OccupiedCoreAssumption`. This
+indicates how the result of the runtime API should be computed if there is a candidate from the para occupying an
+availability core in the [Inclusion Module](../runtime/inclusion.md).
 
-The choices of assumption are whether the candidate occupying that core should be assumed to have been made available and included or timed out and discarded, along with a third option to assert that the core was not occupied. This choice affects everything from the parent head-data, the validation code, and the state of message-queues. Typically, users will take the assumption that either the core was free or that the occupying candidate was included, as timeouts are expected only in adversarial circumstances and even so, only in a small minority of blocks directly following validator set rotations.
+The choices of assumption are whether the candidate occupying that core should be assumed to have been made available
+and included or timed out and discarded, along with a third option to assert that the core was not occupied. This choice
+affects everything from the parent head-data, the validation code, and the state of message-queues. Typically, users
+will take the assumption that either the core was free or that the occupying candidate was included, as timeouts are
+expected only in adversarial circumstances and even so, only in a small minority of blocks directly following validator
+set rotations.
 
 ```rust
 /// An assumption being made about the state of an occupied core.
@@ -52,4 +75,4 @@ enum OccupiedCoreAssumption {
     /// The core was not occupied to begin with.
     Free,
 }
-```
\ No newline at end of file
+```
diff --git a/polkadot/roadmap/implementers-guide/src/runtime-api/availability-cores.md b/polkadot/roadmap/implementers-guide/src/runtime-api/availability-cores.md
index 9402924f0013a67e2623fdc48710f7ef60bf8b76..43288116089617fbd85da980d345df876d4c6e41 100644
--- a/polkadot/roadmap/implementers-guide/src/runtime-api/availability-cores.md
+++ b/polkadot/roadmap/implementers-guide/src/runtime-api/availability-cores.md
@@ -1,14 +1,26 @@
 # Availability Cores
 
-Yields information on all availability cores. Cores are either free or occupied. Free cores can have paras assigned to them. Occupied cores don't, but they can become available part-way through a block due to bitfields and then have something scheduled on them. To allow optimistic validation of candidates, the occupied cores are accompanied by information on what is upcoming. This information can be leveraged when validators perceive that there is a high likelihood of a core becoming available based on bitfields seen, and then optimistically validate something that would become scheduled based on that, although there is no guarantee on what the block producer will actually include in the block. 
+Yields information on all availability cores. Cores are either free or occupied. Free cores can have paras assigned to
+them. Occupied cores don't, but they can become available part-way through a block due to bitfields and then have
+something scheduled on them. To allow optimistic validation of candidates, the occupied cores are accompanied by
+information on what is upcoming. This information can be leveraged when validators perceive that there is a high
+likelihood of a core becoming available based on bitfields seen, and then optimistically validate something that would
+become scheduled based on that, although there is no guarantee on what the block producer will actually include in the
+block.
 
-See also the [Scheduler Module](../runtime/scheduler.md) for a high-level description of what an availability core is and why it exists.
+See also the [Scheduler Module](../runtime/scheduler.md) for a high-level description of what an availability core is
+and why it exists.
 
 ```rust
 fn availability_cores(at: Block) -> Vec<CoreState>;
 ```
 
-This is all the information that a validator needs about scheduling for the current block. It includes all information on [Scheduler](../runtime/scheduler.md) core-assignments and [Inclusion](../runtime/inclusion.md) state of blocks occupying availability cores. It includes data necessary to determine not only which paras are assigned now, but which cores are likely to become freed after processing bitfields, and exactly which bitfields would be necessary to make them so.  The implementation of this runtime API should invoke `Scheduler::clear` and `Scheduler::schedule(Vec::new(), current_block_number + 1)` to ensure that scheduling is accurate.
+This is all the information that a validator needs about scheduling for the current block. It includes all information
+on [Scheduler](../runtime/scheduler.md) core-assignments and [Inclusion](../runtime/inclusion.md) state of blocks
+occupying availability cores. It includes data necessary to determine not only which paras are assigned now, but which
+cores are likely to become freed after processing bitfields, and exactly which bitfields would be necessary to make them
+so.  The implementation of this runtime API should invoke `Scheduler::clear` and `Scheduler::schedule(Vec::new(),
+current_block_number + 1)` to ensure that scheduling is accurate.
 
 ```rust
 struct OccupiedCore {
diff --git a/polkadot/roadmap/implementers-guide/src/runtime-api/candidate-pending-availability.md b/polkadot/roadmap/implementers-guide/src/runtime-api/candidate-pending-availability.md
index 9c8969f6a958b2cce360ad83c1dc1e57d91e207e..e118757d83cede12468be2d8d444958ca847eadf 100644
--- a/polkadot/roadmap/implementers-guide/src/runtime-api/candidate-pending-availability.md
+++ b/polkadot/roadmap/implementers-guide/src/runtime-api/candidate-pending-availability.md
@@ -1,6 +1,7 @@
 # Candidate Pending Availability
 
-Get the receipt of a candidate pending availability. This returns `Some` for any paras assigned to occupied cores in `availability_cores` and `None` otherwise.
+Get the receipt of a candidate pending availability. This returns `Some` for any paras assigned to occupied cores in
+`availability_cores` and `None` otherwise.
 
 ```rust
 fn candidate_pending_availability(at: Block, ParaId) -> Option<CommittedCandidateReceipt>;
diff --git a/polkadot/roadmap/implementers-guide/src/runtime-api/disputes-info.md b/polkadot/roadmap/implementers-guide/src/runtime-api/disputes-info.md
index 3548d5fb5793a2e664f4ec3d681ec5e609471919..24f64a81538256c32ce3057eb4972a34af05f47c 100644
--- a/polkadot/roadmap/implementers-guide/src/runtime-api/disputes-info.md
+++ b/polkadot/roadmap/implementers-guide/src/runtime-api/disputes-info.md
@@ -1,6 +1,9 @@
 # Disputes Info
 
-Get information about all disputes known by the chain as well as information about which validators the disputes subsystem will accept disputes from. These disputes may be either live or concluded. The [`DisputeState`](../types/disputes.md#disputestate) can be used to determine whether the dispute still accepts votes, as well as which validators' votes may be included.
+Get information about all disputes known by the chain as well as information about which validators the disputes
+subsystem will accept disputes from. These disputes may be either live or concluded. The
+[`DisputeState`](../types/disputes.md#disputestate) can be used to determine whether the dispute still accepts votes, as
+well as which validators' votes may be included.
 
 ```rust
 struct Dispute {
diff --git a/polkadot/roadmap/implementers-guide/src/runtime-api/persisted-validation-data.md b/polkadot/roadmap/implementers-guide/src/runtime-api/persisted-validation-data.md
index 2fd3e55c8712c5c85193ee60b9e6c736dc0ec2b7..e741008a7370eab76ca0039b5f4b278c22bac352 100644
--- a/polkadot/roadmap/implementers-guide/src/runtime-api/persisted-validation-data.md
+++ b/polkadot/roadmap/implementers-guide/src/runtime-api/persisted-validation-data.md
@@ -1,6 +1,8 @@
 # Persisted Validation Data
 
-Yields the [`PersistedValidationData`](../types/candidate.md#persistedvalidationdata) for the given [`ParaId`](../types/candidate.md#paraid) along with an assumption that should be used if the para currently occupies a core:
+Yields the [`PersistedValidationData`](../types/candidate.md#persistedvalidationdata) for the given
+[`ParaId`](../types/candidate.md#paraid) along with an assumption that should be used if the para currently occupies a
+core:
 
 ```rust
 /// Returns the persisted validation data for the given para and occupied core assumption.
@@ -8,4 +10,4 @@ Yields the [`PersistedValidationData`](../types/candidate.md#persistedvalidation
 /// Returns `None` if either the para is not registered or the assumption is `Freed`
 /// and the para already occupies a core.
 fn persisted_validation_data(at: Block, ParaId, OccupiedCoreAssumption) -> Option<PersistedValidationData>;
-```
\ No newline at end of file
+```
diff --git a/polkadot/roadmap/implementers-guide/src/runtime-api/pvf-prechecking.md b/polkadot/roadmap/implementers-guide/src/runtime-api/pvf-prechecking.md
index c74232367bff5de1084f1fe41312c6f5767b3cfa..ef9b801a81c60889b3fd3861d2e4f974df995928 100644
--- a/polkadot/roadmap/implementers-guide/src/runtime-api/pvf-prechecking.md
+++ b/polkadot/roadmap/implementers-guide/src/runtime-api/pvf-prechecking.md
@@ -4,18 +4,18 @@
 
 There are two main runtime APIs to work with PVF pre-checking.
 
-The first runtime API is designed to fetch all PVFs that require pre-checking voting. The PVFs are
-identified by their code hashes. As soon as the PVF gains required support, the runtime API will
-not return the PVF anymore.
+The first runtime API is designed to fetch all PVFs that require pre-checking voting. The PVFs are identified by their
+code hashes. As soon as the PVF gains required support, the runtime API will not return the PVF anymore.
 
 ```rust
 fn pvfs_require_precheck() -> Vec<ValidationCodeHash>;
 ```
 
-The second runtime API is needed to submit the judgement for a PVF, whether it is approved or not.
-The voting process uses unsigned transactions. The [`PvfCheckStatement`](../types/pvf-prechecking.md) is circulated through the network via gossip similar to a normal transaction. At some point the validator
-will include the statement in the block, where it will be processed by the runtime. If that was the
-last vote before gaining the super-majority, this PVF will not be returned by `pvfs_require_precheck` anymore.
+The second runtime API is needed to submit the judgement for a PVF, whether it is approved or not. The voting process
+uses unsigned transactions. The [`PvfCheckStatement`](../types/pvf-prechecking.md) is circulated through the network via
+gossip similar to a normal transaction. At some point the validator will include the statement in the block, where it
+will be processed by the runtime. If that was the last vote before gaining the super-majority, this PVF will not be
+returned by `pvfs_require_precheck` anymore.
 
 ```rust
 fn submit_pvf_check_statement(stmt: PvfCheckStatement, signature: ValidatorSignature);
diff --git a/polkadot/roadmap/implementers-guide/src/runtime-api/session-index.md b/polkadot/roadmap/implementers-guide/src/runtime-api/session-index.md
index 1baf6a167dbb2543a1b6080dbe22dac266827fd5..d1441a3a739704f9a704f202d864fa1d38930d9b 100644
--- a/polkadot/roadmap/implementers-guide/src/runtime-api/session-index.md
+++ b/polkadot/roadmap/implementers-guide/src/runtime-api/session-index.md
@@ -2,7 +2,8 @@
 
 Get the session index that is expected at the child of a block.
 
-In the [`Initializer`](../runtime/initializer.md) module, session changes are buffered by one block. The session index of the child of any relay block is always predictable by that block's state.
+In the [`Initializer`](../runtime/initializer.md) module, session changes are buffered by one block. The session index
+of the child of any relay block is always predictable by that block's state.
 
 This session index can be used to derive a [`SigningContext`](../types/candidate.md#signing-context).
 
diff --git a/polkadot/roadmap/implementers-guide/src/runtime-api/validator-groups.md b/polkadot/roadmap/implementers-guide/src/runtime-api/validator-groups.md
index 8815a0217411773789f5d844991976ab84e70b67..e5ed7b43aa949978b88a6a2cfe678791a1e41ef4 100644
--- a/polkadot/roadmap/implementers-guide/src/runtime-api/validator-groups.md
+++ b/polkadot/roadmap/implementers-guide/src/runtime-api/validator-groups.md
@@ -1,6 +1,7 @@
 # Validator Groups
 
-Yields the validator groups used during the current session. The validators in the groups are referred to by their index into the validator-set and this is assumed to be as-of the child of the block whose state is being queried.
+Yields the validator groups used during the current session. The validators in the groups are referred to by their index
+into the validator-set and this is assumed to be as-of the child of the block whose state is being queried.
 
 ```rust
 /// A helper data-type for tracking validator-group rotations.
diff --git a/polkadot/roadmap/implementers-guide/src/runtime-api/validators.md b/polkadot/roadmap/implementers-guide/src/runtime-api/validators.md
index b7f1d964754755c2224dc89a3503835398a581a2..e9d94d736b20d269971b244e7e277cc096e671f2 100644
--- a/polkadot/roadmap/implementers-guide/src/runtime-api/validators.md
+++ b/polkadot/roadmap/implementers-guide/src/runtime-api/validators.md
@@ -1,6 +1,7 @@
 # Validators
 
-Yields the validator-set at the state of a given block. This validator set is always the one responsible for backing parachains in the child of the provided block.
+Yields the validator-set at the state of a given block. This validator set is always the one responsible for backing
+parachains in the child of the provided block.
 
 ```rust
 fn validators(at: Block) -> Vec<ValidatorId>;
diff --git a/polkadot/roadmap/implementers-guide/src/runtime/README.md b/polkadot/roadmap/implementers-guide/src/runtime/README.md
index 995b684b1f06d07bb56b4b51bad6861f0082bd68..459f0e6b69d98bddb19a9ccea85830ed8dc01150 100644
--- a/polkadot/roadmap/implementers-guide/src/runtime/README.md
+++ b/polkadot/roadmap/implementers-guide/src/runtime/README.md
@@ -1,42 +1,83 @@
 # Runtime Architecture
 
-It's clear that we want to separate different aspects of the runtime logic into different modules. Modules define their own storage, routines, and entry-points. They also define initialization and finalization logic.
+It's clear that we want to separate different aspects of the runtime logic into different modules. Modules define their
+own storage, routines, and entry-points. They also define initialization and finalization logic.
 
-Due to the (lack of) guarantees provided by a particular blockchain-runtime framework, there is no defined or dependable order in which modules' initialization or finalization logic will run. Supporting this blockchain-runtime framework is important enough to include that same uncertainty in our model of runtime modules in this guide. Furthermore, initialization logic of modules can trigger the entry-points or routines of other modules. This is one architectural pressure against dividing the runtime logic into multiple modules. However, in this case the benefits of splitting things up outweigh the costs, provided that we take certain precautions against initialization and entry-point races.
+Due to the (lack of) guarantees provided by a particular blockchain-runtime framework, there is no defined or dependable
+order in which modules' initialization or finalization logic will run. Supporting this blockchain-runtime framework is
+important enough to include that same uncertainty in our model of runtime modules in this guide. Furthermore,
+initialization logic of modules can trigger the entry-points or routines of other modules. This is one architectural
+pressure against dividing the runtime logic into multiple modules. However, in this case the benefits of splitting
+things up outweigh the costs, provided that we take certain precautions against initialization and entry-point races.
 
-We also expect, although it's beyond the scope of this guide, that these runtime modules will exist alongside various other modules. This has two facets to consider. First, even if the modules that we describe here don't invoke each others' entry points or routines during initialization, we still have to protect against those other modules doing that. Second, some of those modules are expected to provide governance capabilities for the chain. Configuration exposed by parachain-host modules is mostly for the benefit of these governance modules, to allow the operators or community of the chain to tweak parameters.
+We also expect, although it's beyond the scope of this guide, that these runtime modules will exist alongside various
+other modules. This has two facets to consider. First, even if the modules that we describe here don't invoke each
+others' entry points or routines during initialization, we still have to protect against those other modules doing that.
+Second, some of those modules are expected to provide governance capabilities for the chain. Configuration exposed by
+parachain-host modules is mostly for the benefit of these governance modules, to allow the operators or community of the
+chain to tweak parameters.
 
-The runtime's primary role is to manage scheduling and updating of parachains, as well as handling misbehavior reports and slashing. This guide doesn't focus on how parachains are registered, only that they are. Also, this runtime description assumes that validator sets are selected somehow, but doesn't assume any other details than a periodic _session change_ event. Session changes give information about the incoming validator set and the validator set of the following session.
+The runtime's primary role is to manage scheduling and updating of parachains, as well as handling misbehavior reports
+and slashing. This guide doesn't focus on how parachains are registered, only that they are. Also, this runtime
+description assumes that validator sets are selected somehow, but doesn't assume any other details than a periodic
+_session change_ event. Session changes give information about the incoming validator set and the validator set of the
+following session.
 
-The runtime also serves another role, which is to make data available to the Node-side logic via Runtime APIs. These Runtime APIs should be sufficient for the Node-side code to author blocks correctly.
+The runtime also serves another role, which is to make data available to the Node-side logic via Runtime APIs. These
+Runtime APIs should be sufficient for the Node-side code to author blocks correctly.
 
-There is some functionality of the relay chain relating to parachains that we also consider beyond the scope of this document. In particular, all modules related to how parachains are registered aren't part of this guide, although we do provide routines that should be called by the registration process.
+There is some functionality of the relay chain relating to parachains that we also consider beyond the scope of this
+document. In particular, all modules related to how parachains are registered aren't part of this guide, although we do
+provide routines that should be called by the registration process.
 
 We will split the logic of the runtime up into these modules:
 
-* Initializer: manages initialization order of the other modules.
-* Shared: manages shared storage and configurations for other modules.
-* Configuration: manages configuration and configuration updates in a non-racy manner.
-* Paras: manages chain-head and validation code for parachains.
-* Scheduler: manages parachain scheduling as well as validator assignments.
-* Inclusion: handles the inclusion and availability of scheduled parachains.
-* SessionInfo: manages various session keys of validators and other params stored per session.
-* Disputes: handles dispute resolution for included, available parablocks.
-* Slashing: handles slashing logic for concluded disputes.
-* HRMP: handles horizontal messages between paras.
-* UMP: handles upward messages from a para to the relay chain.
-* DMP: handles downward messages from the relay chain to the para.
+- Initializer: manages initialization order of the other modules.
+- Shared: manages shared storage and configurations for other modules.
+- Configuration: manages configuration and configuration updates in a non-racy manner.
+- Paras: manages chain-head and validation code for parachains.
+- Scheduler: manages parachain scheduling as well as validator assignments.
+- Inclusion: handles the inclusion and availability of scheduled parachains.
+- SessionInfo: manages various session keys of validators and other params stored per session.
+- Disputes: handles dispute resolution for included, available parablocks.
+- Slashing: handles slashing logic for concluded disputes.
+- HRMP: handles horizontal messages between paras.
+- UMP: handles upward messages from a para to the relay chain.
+- DMP: handles downward messages from the relay chain to the para.
 
-The [Initializer module](initializer.md) is special - it's responsible for handling the initialization logic of the other modules to ensure that the correct initialization order and related invariants are maintained. The other modules won't specify a on-initialize logic, but will instead expose a special semi-private routine that the initialization module will call. The other modules are relatively straightforward and perform the roles described above.
+The [Initializer module](initializer.md) is special - it's responsible for handling the initialization logic of the
+other modules to ensure that the correct initialization order and related invariants are maintained. The other modules
+won't specify a on-initialize logic, but will instead expose a special semi-private routine that the initialization
+module will call. The other modules are relatively straightforward and perform the roles described above.
 
-The Parachain Host operates under a changing set of validators. Time is split up into periodic sessions, where each session brings a potentially new set of validators. Sessions are buffered by one, meaning that the validators of the upcoming session `n+1` are determined at the end of session `n-1`, right before session `n` starts. Parachain Host runtime modules need to react to changes in the validator set, as it will affect the runtime logic for processing candidate backing, availability bitfields, and misbehavior reports. The Parachain Host modules can't determine ahead-of-time exactly when session change notifications are going to happen within the block (note: this depends on module initialization order again - better to put session before parachains modules).
+The Parachain Host operates under a changing set of validators. Time is split up into periodic sessions, where each
+session brings a potentially new set of validators. Sessions are buffered by one, meaning that the validators of the
+upcoming session `n+1` are determined at the end of session `n-1`, right before session `n` starts. Parachain Host
+runtime modules need to react to changes in the validator set, as it will affect the runtime logic for processing
+candidate backing, availability bitfields, and misbehavior reports. The Parachain Host modules can't determine
+ahead-of-time exactly when session change notifications are going to happen within the block (note: this depends on
+module initialization order again - better to put session before parachains modules).
 
-The relay chain is intended to use BABE or SASSAFRAS, which both have the property that a session changing at a block is determined not by the number of the block but instead by the time the block is authored. In some sense, sessions change in-between blocks, not at blocks. This has the side effect that the session of a child block cannot be determined solely by the parent block's identifier. Being able to unilaterally determine the validator-set at a specific block based on its parent hash would make a lot of Node-side logic much simpler.
+The relay chain is intended to use BABE or SASSAFRAS, which both have the property that a session changing at a block is
+determined not by the number of the block but instead by the time the block is authored. In some sense, sessions change
+in-between blocks, not at blocks. This has the side effect that the session of a child block cannot be determined solely
+by the parent block's identifier. Being able to unilaterally determine the validator-set at a specific block based on
+its parent hash would make a lot of Node-side logic much simpler.
 
-In order to regain the property that the validator set of a block is predictable by its parent block, we delay session changes' application to Parachains by 1 block. This means that if there is a session change at block X, that session change will be stored and applied during initialization of direct descendants of X. This principal side effect of this change is that the Parachains runtime can disagree with session or consensus modules about which session it currently is. Misbehavior reporting routines in particular will be affected by this, although not severely. The parachains runtime might believe it is the last block of the session while the system is really in the first block of the next session. In such cases, a historical validator-set membership proof will need to accompany any misbehavior report, although they typically do not need to during current-session misbehavior reports.
+In order to regain the property that the validator set of a block is predictable by its parent block, we delay session
+changes' application to Parachains by 1 block. This means that if there is a session change at block X, that session
+change will be stored and applied during initialization of direct descendants of X. This principal side effect of this
+change is that the Parachains runtime can disagree with session or consensus modules about which session it currently
+is. Misbehavior reporting routines in particular will be affected by this, although not severely. The parachains runtime
+might believe it is the last block of the session while the system is really in the first block of the next session. In
+such cases, a historical validator-set membership proof will need to accompany any misbehavior report, although they
+typically do not need to during current-session misbehavior reports.
 
-So the other role of the initializer module is to forward session change notifications to modules in the initialization order. Session change is also the point at which the [Configuration Module](configuration.md) updates the configuration. Most of the other modules will handle changes in the configuration during their session change operation, so the initializer should provide both the old and new configuration to all the other
-modules alongside the session change notification. This means that a session change notification should consist of the following data:
+So the other role of the initializer module is to forward session change notifications to modules in the initialization
+order. Session change is also the point at which the [Configuration Module](configuration.md) updates the configuration.
+Most of the other modules will handle changes in the configuration during their session change operation, so the
+initializer should provide both the old and new configuration to all the other modules alongside the session change
+notification. This means that a session change notification should consist of the following data:
 
 ```rust
 struct SessionChangeNotification {
diff --git a/polkadot/roadmap/implementers-guide/src/runtime/configuration.md b/polkadot/roadmap/implementers-guide/src/runtime/configuration.md
index be62ab2d4d5e0eda4b14358673a152328afe98b1..37885bd481598f192db6862f987a0849b80d0586 100644
--- a/polkadot/roadmap/implementers-guide/src/runtime/configuration.md
+++ b/polkadot/roadmap/implementers-guide/src/runtime/configuration.md
@@ -1,6 +1,11 @@
 # Configuration Pallet
 
-This module is responsible for managing all configuration of the parachain host in-flight. It provides a central point for configuration updates to prevent races between configuration changes and parachain-processing logic. Configuration can only change during the session change routine, and as this module handles the session change notification first it provides an invariant that the configuration does not change throughout the entire session. Both the [scheduler](scheduler.md) and [inclusion](inclusion.md) modules rely on this invariant to ensure proper behavior of the scheduler.
+This module is responsible for managing all configuration of the parachain host in-flight. It provides a central point
+for configuration updates to prevent races between configuration changes and parachain-processing logic. Configuration
+can only change during the session change routine, and as this module handles the session change notification first it
+provides an invariant that the configuration does not change throughout the entire session. Both the
+[scheduler](scheduler.md) and [inclusion](inclusion.md) modules rely on this invariant to ensure proper behavior of the
+scheduler.
 
 The configuration that we will be tracking is the [`HostConfiguration`](../types/runtime.md#host-configuration) struct.
 
@@ -23,7 +28,8 @@ The session change routine works as follows:
 
 - If there is no pending configurations, then return early.
 - Take all pending configurations that are less than or equal to the current session index.
-  - Get the pending configuration with the highest session index and apply it to the current configuration. Discard the earlier ones if any.
+  - Get the pending configuration with the highest session index and apply it to the current configuration. Discard the
+    earlier ones if any.
 
 ## Routines
 
@@ -41,17 +47,17 @@ pub fn configuration() -> HostConfiguration {
   Configuration::get()
 }
 
-/// Schedules updating the host configuration. The update is given by the `updater` closure. The 
-/// closure takes the current version of the configuration and returns the new version. 
-/// Returns an `Err` if the closure returns a broken configuration. However, there are a couple of 
-/// exceptions: 
+/// Schedules updating the host configuration. The update is given by the `updater` closure. The
+/// closure takes the current version of the configuration and returns the new version.
+/// Returns an `Err` if the closure returns a broken configuration. However, there are a couple of
+/// exceptions:
 ///
-/// - if the configuration that was passed in the closure is already broken, then it will pass the 
+/// - if the configuration that was passed in the closure is already broken, then it will pass the
 /// update: you cannot break something that is already broken.
 /// - If the `BypassConsistencyCheck` flag is set, then the checks will be skipped.
 ///
 /// The changes made by this function will always be scheduled at session X, where X is the current session index + 2.
-/// If there is already a pending update for X, then the closure will receive the already pending configuration for 
+/// If there is already a pending update for X, then the closure will receive the already pending configuration for
 /// session X.
 ///
 /// If there is already a pending update for the current session index + 1, then it won't be touched. Otherwise,
@@ -61,4 +67,6 @@ fn schedule_config_update(updater: impl FnOnce(&mut HostConfiguration<BlockNumbe
 
 ## Entry-points
 
-The Configuration module exposes an entry point for each configuration member. These entry-points accept calls only from governance origins. These entry-points will use the `update_configuration` routine to update the specific configuration field.
+The Configuration module exposes an entry point for each configuration member. These entry-points accept calls only from
+governance origins. These entry-points will use the `update_configuration` routine to update the specific configuration
+field.
diff --git a/polkadot/roadmap/implementers-guide/src/runtime/disputes.md b/polkadot/roadmap/implementers-guide/src/runtime/disputes.md
index a2558b74f56279e713ab0f40735df68527c91584..688ff7f1b330033ed46e54c069c673c9922c29cf 100644
--- a/polkadot/roadmap/implementers-guide/src/runtime/disputes.md
+++ b/polkadot/roadmap/implementers-guide/src/runtime/disputes.md
@@ -1,29 +1,47 @@
 # Disputes Pallet
 
-After a backed candidate is made available, it is included and proceeds into an acceptance period during which validators are randomly selected to do (secondary) approval checks of the parablock. Any reports disputing the validity of the candidate will cause escalation, where even more validators are requested to check the block, and so on, until either the parablock is determined to be invalid or valid. Those on the wrong side of the dispute are slashed and, if the parablock is deemed invalid, the relay chain is rolled back to a point before that block was included.
+After a backed candidate is made available, it is included and proceeds into an acceptance period during which
+validators are randomly selected to do (secondary) approval checks of the parablock. Any reports disputing the validity
+of the candidate will cause escalation, where even more validators are requested to check the block, and so on, until
+either the parablock is determined to be invalid or valid. Those on the wrong side of the dispute are slashed and, if
+the parablock is deemed invalid, the relay chain is rolled back to a point before that block was included.
 
-However, this isn't the end of the story. We are working in a forkful blockchain environment, which carries three important considerations:
+However, this isn't the end of the story. We are working in a forkful blockchain environment, which carries three
+important considerations:
 
-1. For security, validators that misbehave shouldn't only be slashed on one fork, but on all possible forks. Validators that misbehave shouldn't be able to create a new fork of the chain when caught and get away with their misbehavior.
+1. For security, validators that misbehave shouldn't only be slashed on one fork, but on all possible forks. Validators
+   that misbehave shouldn't be able to create a new fork of the chain when caught and get away with their misbehavior.
 1. It is possible (and likely) that the parablock being contested has not appeared on all forks.
-1. If a block author believes that there is a disputed parablock on a specific fork that will resolve to a reversion of the fork, that block author has more incentive to build on a different fork which does not include that parablock.
+1. If a block author believes that there is a disputed parablock on a specific fork that will resolve to a reversion of
+   the fork, that block author has more incentive to build on a different fork which does not include that parablock.
 
-This means that in all likelihood, there is the possibility of disputes that are started on one fork of the relay chain, and as soon as the dispute resolution process starts to indicate that the parablock is indeed invalid, that fork of the relay chain will be abandoned and the dispute will never be fully resolved on that chain.
+This means that in all likelihood, there is the possibility of disputes that are started on one fork of the relay chain,
+and as soon as the dispute resolution process starts to indicate that the parablock is indeed invalid, that fork of the
+relay chain will be abandoned and the dispute will never be fully resolved on that chain.
 
-Even if this doesn't happen, there is the possibility that there are two disputes underway, and one resolves leading to a reversion of the chain before the other has concluded. In this case we want to both transplant the concluded dispute onto other forks of the chain as well as the unconcluded dispute.
+Even if this doesn't happen, there is the possibility that there are two disputes underway, and one resolves leading to
+a reversion of the chain before the other has concluded. In this case we want to both transplant the concluded dispute
+onto other forks of the chain as well as the unconcluded dispute.
 
 We account for these requirements by having the disputes module handle two kinds of disputes.
 
 1. Local disputes: those contesting the validity of the current fork by disputing a parablock included within it.
-1. Remote disputes: a dispute that has partially or fully resolved on another fork which is transplanted to the local fork for completion and eventual slashing.
+1. Remote disputes: a dispute that has partially or fully resolved on another fork which is transplanted to the local
+   fork for completion and eventual slashing.
 
-When a local dispute concludes negatively, the chain needs to be abandoned and reverted back to a block where the state does not contain the bad parablock. We expect that due to the [Approval Checking Protocol](../protocol-approval.md), the current executing block should not be finalized. So we do two things when a local dispute concludes negatively:
+When a local dispute concludes negatively, the chain needs to be abandoned and reverted back to a block where the state
+does not contain the bad parablock. We expect that due to the [Approval Checking Protocol](../protocol-approval.md), the
+current executing block should not be finalized. So we do two things when a local dispute concludes negatively:
 1. Freeze the state of parachains so nothing further is backed or included.
 1. Issue a digest in the header of the block that signals to nodes that this branch of the chain is to be abandoned.
 
-If, as is expected, the chain is unfinalized, the freeze will have no effect as no honest validator will attempt to build on the frozen chain. However, if the approval checking protocol has failed and the bad parablock is finalized, the freeze serves to put the chain into a governance-only mode.
+If, as is expected, the chain is unfinalized, the freeze will have no effect as no honest validator will attempt to
+build on the frozen chain. However, if the approval checking protocol has failed and the bad parablock is finalized, the
+freeze serves to put the chain into a governance-only mode.
 
-The storage of this module is designed around tracking [`DisputeState`s](../types/disputes.md#disputestate), updating them with votes, and tracking blocks included by this branch of the relay chain. It also contains a `Frozen` parameter designed to freeze the state of all parachains.
+The storage of this module is designed around tracking [`DisputeState`s](../types/disputes.md#disputestate), updating
+them with votes, and tracking blocks included by this branch of the relay chain. It also contains a `Frozen` parameter
+designed to freeze the state of all parachains.
 
 ## Storage
 
@@ -44,15 +62,18 @@ Included: double_map (SessionIndex, CandidateHash) -> Option<BlockNumber>,
 Frozen: Option<BlockNumber>,
 ```
 
-> `byzantine_threshold` refers to the maximum number `f` of validators which may be byzantine. The total number of validators is `n = 3f + e` where `e in { 1, 2, 3 }`.
+> `byzantine_threshold` refers to the maximum number `f` of validators which may be byzantine. The total number of
+> validators is `n = 3f + e` where `e in { 1, 2, 3 }`.
 
 ## Session Change
 
 1. If the current session is not greater than `config.dispute_period + 1`, nothing to do here.
-1. Set `pruning_target = current_session - config.dispute_period - 1`. We add the extra `1` because we want to keep things for `config.dispute_period` _full_ sessions.
-   The stuff at the end of the most recent session has been around for a little over 0 sessions, not a little over 1.
+1. Set `pruning_target = current_session - config.dispute_period - 1`. We add the extra `1` because we want to keep
+   things for `config.dispute_period` _full_ sessions. The stuff at the end of the most recent session has been around
+   for a little over 0 sessions, not a little over 1.
 1. If `LastPrunedSession` is `None`, then set `LastPrunedSession` to `Some(pruning_target)` and return.
-2. Otherwise, clear out all disputes and included candidates entries in the range `last_pruned..=pruning_target` and set `LastPrunedSession` to `Some(pruning_target)`.
+1. Otherwise, clear out all disputes and included candidates entries in the range `last_pruned..=pruning_target` and set
+   `LastPrunedSession` to `Some(pruning_target)`.
 
 ## Block Initialization
 
@@ -61,11 +82,10 @@ This is currently a `no op`.
 ## Routines
 
 * `filter_multi_dispute_data(MultiDisputeStatementSet) -> MultiDisputeStatementSet`:
-  1. Takes a `MultiDisputeStatementSet` and filters it down to a `MultiDisputeStatementSet`
-    that satisfies all the criteria of `provide_multi_dispute_data`. That is, eliminating
-    ancient votes, duplicates and unconfirmed disputes.
-    This can be used by block authors to create the final submission in a block which is
-    guaranteed to pass the `provide_multi_dispute_data` checks.
+  1. Takes a `MultiDisputeStatementSet` and filters it down to a `MultiDisputeStatementSet` that satisfies all the
+    criteria of `provide_multi_dispute_data`. That is, eliminating ancient votes, duplicates and unconfirmed disputes.
+    This can be used by block authors to create the final submission in a block which is guaranteed to pass the
+    `provide_multi_dispute_data` checks.
 
 * `provide_multi_dispute_data(MultiDisputeStatementSet) -> Vec<(SessionIndex, Hash)>`:
   1. Pass on each dispute statement set to `provide_dispute_data`, propagating failure.
@@ -76,46 +96,55 @@ This is currently a `no op`.
   1. `SessionInfo` is used to check statement signatures and this function should fail if any signatures are invalid.
   1. If there is no dispute under `Disputes`, create a new `DisputeState` with blank bitfields.
   1. If `concluded_at` is `Some`, and is `concluded_at + config.post_conclusion_acceptance_period < now`, return false.
-  2. Import all statements into the dispute. This should fail if any statements are duplicate or if the corresponding bit for the corresponding validator is set in the dispute already.
-  3. If `concluded_at` is `None`, reward all statements.
-  4. If `concluded_at` is `Some`, reward all statements slightly less.
-  5. If either side now has supermajority and did not previously, slash the other side. This may be both sides, and we support this possibility in code, but note that this requires validators to participate on both sides which has negative expected value. Set `concluded_at` to `Some(now)` if it was `None`.
-  6. If just concluded against the candidate and the `Included` map contains `(session, candidate)`: invoke `revert_and_freeze` with the stored block number.
-  7. Return true if just initiated, false otherwise.
-
-* `disputes() -> Vec<(SessionIndex, CandidateHash, DisputeState)>`: Get a list of all disputes and info about dispute state.
+  1. Import all statements into the dispute. This should fail if any statements are duplicate or if the corresponding
+     bit for the corresponding validator is set in the dispute already.
+  1. If `concluded_at` is `None`, reward all statements.
+  1. If `concluded_at` is `Some`, reward all statements slightly less.
+  1. If either side now has supermajority and did not previously, slash the other side. This may be both sides, and we
+     support this possibility in code, but note that this requires validators to participate on both sides which has
+     negative expected value. Set `concluded_at` to `Some(now)` if it was `None`.
+  1. If just concluded against the candidate and the `Included` map contains `(session, candidate)`: invoke
+     `revert_and_freeze` with the stored block number.
+  1. Return true if just initiated, false otherwise.
+
+* `disputes() -> Vec<(SessionIndex, CandidateHash, DisputeState)>`: Get a list of all disputes and info about dispute
+  state.
   1. Iterate over all disputes in `Disputes` and collect into a vector.
 
 * `note_included(SessionIndex, CandidateHash, included_in: BlockNumber)`:
   1. Add `(SessionIndex, CandidateHash)` to the `Included` map with `included_in - 1` as the value.
-  1. If there is a dispute under `(SessionIndex, CandidateHash)` that has concluded against the candidate, invoke `revert_and_freeze` with the stored block number.
+  1. If there is a dispute under `(SessionIndex, CandidateHash)` that has concluded against the candidate, invoke
+     `revert_and_freeze` with the stored block number.
 
-* `concluded_invalid(SessionIndex, CandidateHash) -> bool`: Returns whether a candidate has already concluded a dispute in the negative.
+* `concluded_invalid(SessionIndex, CandidateHash) -> bool`: Returns whether a candidate has already concluded a dispute
+  in the negative.
 
 * `is_frozen()`: Load the value of `Frozen` from storage. Return true if `Some` and false if `None`.
 
-* `last_valid_block()`: Load the value of `Frozen` from storage and return. None indicates that all blocks in the chain are potentially valid.
+* `last_valid_block()`: Load the value of `Frozen` from storage and return. None indicates that all blocks in the chain
+  are potentially valid.
 
 * `revert_and_freeze(BlockNumber)`:
   1. If `is_frozen()` return.
   1. Set `Frozen` to `Some(BlockNumber)` to indicate a rollback to the block number.
-  1. Issue a `Revert(BlockNumber + 1)` log to indicate a rollback of the block's child in the header chain, which is the same as a rollback to the block number.
+  1. Issue a `Revert(BlockNumber + 1)` log to indicate a rollback of the block's child in the header chain, which is the
+     same as a rollback to the block number.
 
 # Disputes filtering
 
 All disputes delivered to the runtime by the client are filtered before the actual import. In this context actual import
 means persisted in the runtime storage. The filtering has got two purposes:
-- Limit the amount of data saved onchain.
-- Prevent persisting malicious dispute data onchain.
+* Limit the amount of data saved onchain.
+* Prevent persisting malicious dispute data onchain.
 
 *Implementation note*: Filtering is performed in function `filter_dispute_data` from `Disputes` pallet.
 
 The filtering is performed on the whole statement set which is about to be imported onchain. The following filters are
 applied:
 1. Remove ancient disputes - if a dispute is concluded before the block number indicated in `OLDEST_ACCEPTED` parameter
-   it is removed from the set. `OLDEST_ACCEPTED` is a runtime configuration option.
-   *Implementation note*: `dispute_post_conclusion_acceptance_period` from
-   `HostConfiguration` is used in the current Polkadot/Kusama implementation.
+   it is removed from the set. `OLDEST_ACCEPTED` is a runtime configuration option. *Implementation note*:
+   `dispute_post_conclusion_acceptance_period` from `HostConfiguration` is used in the current Polkadot/Kusama
+   implementation.
 2. Remove votes from unknown validators. If there is a vote from a validator which wasn't an authority in the session
    where the dispute was raised - they are removed. Please note that this step removes only single votes instead of
    removing the whole dispute.
@@ -138,4 +167,4 @@ inconclusive disputes are not slashed. Thanks to the applied filtering (describe
 confident that there are no spam disputes in the runtime. So if a validator is not voting it is due to another reason
 (e.g. being under DoS attack). There is no reason to punish such validators with a slash.
 
-*Implementation note*: Slashing is performed in `process_checked_dispute_data` from `Disputes` pallet.
\ No newline at end of file
+*Implementation note*: Slashing is performed in `process_checked_dispute_data` from `Disputes` pallet.
diff --git a/polkadot/roadmap/implementers-guide/src/runtime/dmp.md b/polkadot/roadmap/implementers-guide/src/runtime/dmp.md
index f56df31934efefd9d5025835cd103ced22913669..5aeb3bd68ef38d9a2c9565ea10e7ccd1978b6629 100644
--- a/polkadot/roadmap/implementers-guide/src/runtime/dmp.md
+++ b/polkadot/roadmap/implementers-guide/src/runtime/dmp.md
@@ -28,7 +28,8 @@ No initialization routine runs for this module.
 Candidate Acceptance Function:
 
 * `check_processed_downward_messages(P: ParaId, relay_parent_number: BlockNumber, processed_downward_messages: u32)`:
-    1. Checks that `processed_downward_messages` is at least 1 if `DownwardMessageQueues` for `P` is not empty at the given `relay_parent_number`.
+    1. Checks that `processed_downward_messages` is at least 1 if `DownwardMessageQueues` for `P` is not empty at the
+       given `relay_parent_number`.
     1. Checks that `DownwardMessageQueues` for `P` is at least `processed_downward_messages` long.
 
 Candidate Enactment:
@@ -38,11 +39,11 @@ Candidate Enactment:
 
 Utility routines.
 
-`queue_downward_message(P: ParaId, M: DownwardMessage)`:
-    1. Check if the size of `M` exceeds the `config.max_downward_message_size`. If so, return an error.
-    1. Wrap `M` into `InboundDownwardMessage` using the current block number for `sent_at`.
-    1. Obtain a new MQC link for the resulting `InboundDownwardMessage` and replace `DownwardMessageQueueHeads` for `P` with the resulting hash.
-    1. Add the resulting `InboundDownwardMessage` into `DownwardMessageQueues` for `P`.
+`queue_downward_message(P: ParaId, M: DownwardMessage)`: 1. Check if the size of `M` exceeds the
+    `config.max_downward_message_size`. If so, return an error. 1. Wrap `M` into `InboundDownwardMessage` using the
+    current block number for `sent_at`. 1. Obtain a new MQC link for the resulting `InboundDownwardMessage` and replace
+    `DownwardMessageQueueHeads` for `P` with the resulting hash. 1. Add the resulting `InboundDownwardMessage` into
+    `DownwardMessageQueues` for `P`.
 
 ## Session Change
 
diff --git a/polkadot/roadmap/implementers-guide/src/runtime/hrmp.md b/polkadot/roadmap/implementers-guide/src/runtime/hrmp.md
index 927c14cd596968bc7d2e82030140a02263093e20..aa31491d72f6c6e142059e7bcfbe881516772d25 100644
--- a/polkadot/roadmap/implementers-guide/src/runtime/hrmp.md
+++ b/polkadot/roadmap/implementers-guide/src/runtime/hrmp.md
@@ -1,6 +1,7 @@
 # HRMP Pallet
 
-A module responsible for Horizontally Relay-routed Message Passing (HRMP). See [Messaging Overview](../messaging.md) for more details.
+A module responsible for Horizontally Relay-routed Message Passing (HRMP). See [Messaging Overview](../messaging.md) for
+more details.
 
 ## Storage
 
@@ -132,7 +133,8 @@ Candidate Acceptance Function:
         1. or in `HrmpChannelDigests` for `P` an entry with the block number should exist
 * `check_outbound_hrmp(sender: ParaId, Vec<OutboundHrmpMessage>)`:
     1. Checks that there are at most `config.hrmp_max_message_num_per_candidate` messages.
-    1. Checks that horizontal messages are sorted by ascending recipient ParaId and there is no two horizontal messages have the same recipient.
+    1. Checks that horizontal messages are sorted by ascending recipient ParaId and there is no two horizontal messages
+       have the same recipient.
     1. For each horizontal message `M` with the channel `C` identified by `(sender, M.recipient)` check:
         1. exists
         1. `M`'s payload size doesn't exceed a preconfigured limit `C.max_message_size`
@@ -143,42 +145,48 @@ Candidate Enactment:
 
 * `queue_outbound_hrmp(sender: ParaId, Vec<OutboundHrmpMessage>)`:
     1. For each horizontal message `HM` with the channel `C` identified by `(sender, HM.recipient)`:
-        1. Append `HM` into `HrmpChannelContents` that corresponds to `C` with `sent_at` equals to the current block number.
-        1. Locate or create an entry in `HrmpChannelDigests` for `HM.recipient` and append `sender` into the entry's list.
+        1. Append `HM` into `HrmpChannelContents` that corresponds to `C` with `sent_at` equals to the current block
+           number.
+        1. Locate or create an entry in `HrmpChannelDigests` for `HM.recipient` and append `sender` into the entry's
+           list.
         1. Increment `C.msg_count`
         1. Increment `C.total_size` by `HM`'s payload size
-        1. Append a new link to the MQC and save the new head in `C.mqc_head`. Note that the current block number as of enactment is used for the link.
+        1. Append a new link to the MQC and save the new head in `C.mqc_head`. Note that the current block number as of
+           enactment is used for the link.
 * `prune_hrmp(recipient, new_hrmp_watermark)`:
-    1. From `HrmpChannelDigests` for `recipient` remove all entries up to an entry with block number equal to `new_hrmp_watermark`.
-    1. From the removed digests construct a set of paras that sent new messages within the interval between the old and new watermarks.
-    1. For each channel `C` identified by `(sender, recipient)` for each `sender` coming from the set, prune messages up to the `new_hrmp_watermark`.
+    1. From `HrmpChannelDigests` for `recipient` remove all entries up to an entry with block number equal to
+       `new_hrmp_watermark`.
+    1. From the removed digests construct a set of paras that sent new messages within the interval between the old and
+       new watermarks.
+    1. For each channel `C` identified by `(sender, recipient)` for each `sender` coming from the set, prune messages up
+       to the `new_hrmp_watermark`.
     1. For each pruned message `M` from channel `C`:
         1. Decrement `C.msg_count`
         1. Decrement `C.total_size` by `M`'s payload size.
     1. Set `HrmpWatermarks` for `P` to be equal to `new_hrmp_watermark`
     > NOTE: That collecting digests can be inefficient and the time it takes grows very fast. Thanks to the aggressive
-    > parameterization this shouldn't be a big of a deal.
-    > If that becomes a problem consider introducing an extra dictionary which says at what block the given sender
-    > sent a message to the recipient.
+    > parameterization this shouldn't be a big of a deal. If that becomes a problem consider introducing an extra
+    > dictionary which says at what block the given sender sent a message to the recipient.
 
 ## Entry-points
 
 The following entry-points are meant to be used for HRMP channel management.
 
-Those entry-points are meant to be called from a parachain. `origin` is defined as the `ParaId` of
-the parachain executed the message.
+Those entry-points are meant to be called from a parachain. `origin` is defined as the `ParaId` of the parachain
+executed the message.
 
 * `hrmp_init_open_channel(recipient, proposed_max_capacity, proposed_max_message_size)`:
     1. Check that the `origin` is not `recipient`.
     1. Check that `proposed_max_capacity` is less or equal to `config.hrmp_channel_max_capacity` and greater than zero.
-    1. Check that `proposed_max_message_size` is less or equal to `config.hrmp_channel_max_message_size` and greater than zero.
+    1. Check that `proposed_max_message_size` is less or equal to `config.hrmp_channel_max_message_size` and greater
+       than zero.
     1. Check that `recipient` is a valid para.
     1. Check that there is no existing channel for `(origin, recipient)` in `HrmpChannels`.
     1. Check that there is no existing open channel request (`origin`, `recipient`) in `HrmpOpenChannelRequests`.
-    1. Check that the sum of the number of already opened HRMP channels by the `origin` (the size
-    of the set found `HrmpEgressChannelsIndex` for `origin`) and the number of open requests by the
-    `origin` (the value from `HrmpOpenChannelRequestCount` for `origin`) doesn't exceed the limit of
-    channels (`config.hrmp_max_parachain_outbound_channels` or `config.hrmp_max_parathread_outbound_channels`) minus 1.
+    1. Check that the sum of the number of already opened HRMP channels by the `origin` (the size of the set found
+    `HrmpEgressChannelsIndex` for `origin`) and the number of open requests by the `origin` (the value from
+    `HrmpOpenChannelRequestCount` for `origin`) doesn't exceed the limit of channels
+    (`config.hrmp_max_parachain_outbound_channels` or `config.hrmp_max_parathread_outbound_channels`) minus 1.
     1. Check that `origin`'s balance is more or equal to `config.hrmp_sender_deposit`
     1. Reserve the deposit for the `origin` according to `config.hrmp_sender_deposit`
     1. Increase `HrmpOpenChannelRequestCount` by 1 for `origin`.
@@ -189,27 +197,26 @@ the parachain executed the message.
         1. Set `max_message_size` to `proposed_max_message_size`
         1. Set `max_total_size` to `config.hrmp_channel_max_total_size`
     1. Send a downward message to `recipient` notifying about an inbound HRMP channel request.
-        - The DM is sent using `queue_downward_message`.
-        - The DM is represented by the `HrmpNewChannelOpenRequest`  XCM message.
-            - `sender` is set to `origin`,
-            - `max_message_size` is set to `proposed_max_message_size`,
-            - `max_capacity` is set to `proposed_max_capacity`.
+        * The DM is sent using `queue_downward_message`.
+        * The DM is represented by the `HrmpNewChannelOpenRequest`  XCM message.
+            * `sender` is set to `origin`,
+            * `max_message_size` is set to `proposed_max_message_size`,
+            * `max_capacity` is set to `proposed_max_capacity`.
 * `hrmp_accept_open_channel(sender)`:
     1. Check that there is an existing request between (`sender`, `origin`) in `HrmpOpenChannelRequests`
         1. Check that it is not confirmed.
-    1. Check that the sum of the number of inbound HRMP channels opened to `origin` (the size of the set
-    found in `HrmpIngressChannelsIndex` for `origin`) and the number of accepted open requests by the `origin`
-    (the value from `HrmpAcceptedChannelRequestCount` for `origin`) doesn't exceed the limit of channels
-    (`config.hrmp_max_parachain_inbound_channels` or `config.hrmp_max_parathread_inbound_channels`)
-    minus 1.
+    1. Check that the sum of the number of inbound HRMP channels opened to `origin` (the size of the set found in
+    `HrmpIngressChannelsIndex` for `origin`) and the number of accepted open requests by the `origin` (the value from
+    `HrmpAcceptedChannelRequestCount` for `origin`) doesn't exceed the limit of channels
+    (`config.hrmp_max_parachain_inbound_channels` or `config.hrmp_max_parathread_inbound_channels`) minus 1.
     1. Check that `origin`'s balance is more or equal to `config.hrmp_recipient_deposit`.
     1. Reserve the deposit for the `origin` according to `config.hrmp_recipient_deposit`
     1. For the request in `HrmpOpenChannelRequests` identified by `(sender, P)`, set `confirmed` flag to `true`.
     1. Increase `HrmpAcceptedChannelRequestCount` by 1 for `origin`.
     1. Send a downward message to `sender` notifying that the channel request was accepted.
-        - The DM is sent using `queue_downward_message`.
-        - The DM is represented by the `HrmpChannelAccepted` XCM message.
-            - `recipient` is set to `origin`.
+        * The DM is sent using `queue_downward_message`.
+        * The DM is represented by the `HrmpChannelAccepted` XCM message.
+            * `recipient` is set to `origin`.
 * `hrmp_cancel_open_request(ch)`:
     1. Check that `origin` is either `ch.sender` or `ch.recipient`
     1. Check that the open channel request `ch` exists.
@@ -221,15 +228,15 @@ the parachain executed the message.
     1. Check that `origin` is either `ch.sender` or `ch.recipient`
     1. Check that `HrmpChannels` for `ch` exists.
     1. Check that `ch` is not in the `HrmpCloseChannelRequests` set.
-    1. If not already there, insert a new entry `Some(())` to `HrmpCloseChannelRequests` for `ch`
-    and append `ch` to `HrmpCloseChannelRequestsList`.
+    1. If not already there, insert a new entry `Some(())` to `HrmpCloseChannelRequests` for `ch` and append `ch` to
+    `HrmpCloseChannelRequestsList`.
     1. Send a downward message to the opposite party notifying about the channel closing.
-        - The DM is sent using `queue_downward_message`.
-        - The DM is represented by the `HrmpChannelClosing` XCM message with:
-            - `initator` is set to `origin`,
-            - `sender` is set to `ch.sender`,
-            - `recipient` is set to `ch.recipient`.
-        - The opposite party is `ch.sender` if `origin` is `ch.recipient` and `ch.recipient` if `origin` is `ch.sender`.
+        * The DM is sent using `queue_downward_message`.
+        * The DM is represented by the `HrmpChannelClosing` XCM message with:
+            * `initator` is set to `origin`,
+            * `sender` is set to `ch.sender`,
+            * `recipient` is set to `ch.recipient`.
+        * The opposite party is `ch.sender` if `origin` is `ch.recipient` and `ch.recipient` if `origin` is `ch.sender`.
 
 ## Session Change
 
@@ -241,13 +248,15 @@ the parachain executed the message.
     1. Remove `HrmpOpenChannelRequests` and `HrmpOpenChannelRequestsList` for `(P, _)` and `(_, P)`.
         1. For each removed channel request `C`:
             1. Unreserve the sender's deposit if the sender is not present in `outgoing_paras`
-            1. Unreserve the recipient's deposit if `C` is confirmed and the recipient is not present in `outgoing_paras`
-1. For each channel designator `D` in `HrmpOpenChannelRequestsList` we query the request `R` from `HrmpOpenChannelRequests`:
+            1. Unreserve the recipient's deposit if `C` is confirmed and the recipient is not present in
+               `outgoing_paras`
+1. For each channel designator `D` in `HrmpOpenChannelRequestsList` we query the request `R` from
+   `HrmpOpenChannelRequests`:
     1. if `R.confirmed = true`,
         1. if both `D.sender` and `D.recipient` are not offboarded.
           1. create a new channel `C` between `(D.sender, D.recipient)`.
-              1. Initialize the `C.sender_deposit` with `R.sender_deposit` and `C.recipient_deposit`
-              with the value found in the configuration `config.hrmp_recipient_deposit`.
+              1. Initialize the `C.sender_deposit` with `R.sender_deposit` and `C.recipient_deposit` with the value
+              found in the configuration `config.hrmp_recipient_deposit`.
               1. Insert `sender` into the set `HrmpIngressChannelsIndex` for the `recipient`.
               1. Insert `recipient` into the set `HrmpEgressChannelsIndex` for the `sender`.
         1. decrement `HrmpOpenChannelRequestCount` for `D.sender` by 1.
diff --git a/polkadot/roadmap/implementers-guide/src/runtime/inclusion.md b/polkadot/roadmap/implementers-guide/src/runtime/inclusion.md
index 3fe7711ae2d0ee8a1ae5dc7a0d6bb0a1cf27789d..f73df209981af32acf3e99d8023da0d9bed9115d 100644
--- a/polkadot/roadmap/implementers-guide/src/runtime/inclusion.md
+++ b/polkadot/roadmap/implementers-guide/src/runtime/inclusion.md
@@ -1,6 +1,7 @@
 # Inclusion Pallet
 
-The inclusion module is responsible for inclusion and availability of scheduled parachains. It also manages the UMP dispatch queue of each parachain.
+The inclusion module is responsible for inclusion and availability of scheduled parachains. It also manages the UMP
+dispatch queue of each parachain.
 
 ## Storage
 
@@ -37,11 +38,9 @@ PendingAvailabilityCommitments: map ParaId => CandidateCommitments;
 
 ## Config Dependencies
 
-* `MessageQueue`:
-  The message queue provides general queueing and processing functionality. Currently it
-  replaces the old `UMP` dispatch queue. Other use-cases can be implemented as well by
-  adding new variants to `AggregateMessageOrigin`. Normally it should be set to an instance
-  of the `MessageQueue` pallet.
+* `MessageQueue`: The message queue provides general queueing and processing functionality. Currently it replaces the
+  old `UMP` dispatch queue. Other use-cases can be implemented as well by adding new variants to
+  `AggregateMessageOrigin`. Normally it should be set to an instance of the `MessageQueue` pallet.
 
 ## Session Change
 
@@ -49,11 +48,13 @@ PendingAvailabilityCommitments: map ParaId => CandidateCommitments;
 1. Clear out all validator bitfields.
 
 Optional:
-1. The UMP queue of all outgoing paras can be "swept". This would prevent the dispatch queue from automatically being serviced. It is a consideration for the chain and specific behaviour is not defined.
+1. The UMP queue of all outgoing paras can be "swept". This would prevent the dispatch queue from automatically being
+   serviced. It is a consideration for the chain and specific behaviour is not defined.
 
 ## Initialization
 
-No initialization routine runs for this module. However, the initialization of the `MessageQueue` pallet will attempt to process any pending UMP messages.
+No initialization routine runs for this module. However, the initialization of the `MessageQueue` pallet will attempt to
+process any pending UMP messages.
 
 
 ## Routines
@@ -63,20 +64,19 @@ All failed checks should lead to an unrecoverable error making the block invalid
 * `process_bitfields(expected_bits, Bitfields, core_lookup: Fn(CoreIndex) -> Option<ParaId>)`:
   1. Call `sanitize_bitfields<true>` and use the sanitized `signed_bitfields` from now on.
   1. Call `sanitize_backed_candidates<true>` and use the sanitized `backed_candidates` from now on.
-  1. Apply each bit of bitfield to the corresponding pending candidate, looking up on-demand parachain cores using the `core_lookup`. Disregard bitfields that have a `1` bit for any free cores.
-  1. For each applied bit of each availability-bitfield, set the bit for the validator in the `CandidatePendingAvailability`'s `availability_votes` bitfield. Track all candidates that now have >2/3 of bits set in their `availability_votes`. These candidates are now available and can be enacted.
+  1. Apply each bit of bitfield to the corresponding pending candidate, looking up on-demand parachain cores using the
+     `core_lookup`. Disregard bitfields that have a `1` bit for any free cores.
+  1. For each applied bit of each availability-bitfield, set the bit for the validator in the
+     `CandidatePendingAvailability`'s `availability_votes` bitfield. Track all candidates that now have >2/3 of bits set
+     in their `availability_votes`. These candidates are now available and can be enacted.
   1. For all now-available candidates, invoke the `enact_candidate` routine with the candidate and relay-parent number.
-  1. Return a list of `(CoreIndex, CandidateHash)` from freed cores consisting of the cores where candidates have become available.
-* `sanitize_bitfields<T: crate::inclusion::Config>(
-    unchecked_bitfields: UncheckedSignedAvailabilityBitfields,
-    disputed_bitfield: DisputedBitfield,
-    expected_bits: usize,
-    parent_hash: T::Hash,
-    session_index: SessionIndex,
-    validators: &[ValidatorId],
-    full_check: FullCheck,
-  )`:
-  1. check that `disputed_bitfield` has the same number of bits as the `expected_bits`, iff not return early with an empty vec.
+  1. Return a list of `(CoreIndex, CandidateHash)` from freed cores consisting of the cores where candidates have become
+     available.
+* `sanitize_bitfields<T: crate::inclusion::Config>( unchecked_bitfields: UncheckedSignedAvailabilityBitfields,
+    disputed_bitfield: DisputedBitfield, expected_bits: usize, parent_hash: T::Hash, session_index: SessionIndex,
+    validators: &[ValidatorId], full_check: FullCheck, )`:
+  1. check that `disputed_bitfield` has the same number of bits as the `expected_bits`, iff not return early with an
+     empty vec.
   1. each of the below checks is for each bitfield. If a check does not pass the bitfield will be skipped.
   1. check that there are no bits set that reference a disputed candidate.
   1. check that the number of bits is equal to `expected_bits`.
@@ -84,41 +84,58 @@ All failed checks should lead to an unrecoverable error making the block invalid
   1. check that the validator bit index is not out of bounds.
   1. check the validators signature, iff `full_check=FullCheck::Yes`.
 
-* `sanitize_backed_candidates<T: crate::inclusion::Config, F: FnMut(usize, &BackedCandidate<T::Hash>) -> bool>(
-    mut backed_candidates: Vec<BackedCandidate<T::Hash>>,
-    candidate_has_concluded_invalid_dispute: F,
-    scheduled: &[CoreAssignment],
-  ) `
+* `sanitize_backed_candidates<T: crate::inclusion::Config, F: FnMut(usize, &BackedCandidate<T::Hash>) -> bool>( mut
+  backed_candidates: Vec<BackedCandidate<T::Hash>>, candidate_has_concluded_invalid_dispute: F, scheduled:
+  &[CoreAssignment], )`
   1. filter out any backed candidates that have concluded invalid.
   1. filters backed candidates whom's paraid was scheduled by means of the provided `scheduled` parameter.
   1. sorts remaining candidates with respect to the core index assigned to them.
 
-* `process_candidates(allowed_relay_parents, BackedCandidates, scheduled: Vec<CoreAssignment>, group_validators: Fn(GroupIndex) -> Option<Vec<ValidatorIndex>>)`:
+* `process_candidates(allowed_relay_parents, BackedCandidates, scheduled: Vec<CoreAssignment>, group_validators:
+  Fn(GroupIndex) -> Option<Vec<ValidatorIndex>>)`:
     > For details on `AllowedRelayParentsTracker` see documentation for [Shared](./shared.md) module.
-  1. check that each candidate corresponds to a scheduled core and that they are ordered in the same order the cores appear in assignments in `scheduled`.
+  1. check that each candidate corresponds to a scheduled core and that they are ordered in the same order the cores
+     appear in assignments in `scheduled`.
   1. check that `scheduled` is sorted ascending by `CoreIndex`, without duplicates.
   1. check that the relay-parent from each candidate receipt is one of the allowed relay-parents.
   1. check that there is no candidate pending availability for any scheduled `ParaId`.
-  1. check that each candidate's `validation_data_hash` corresponds to a `PersistedValidationData` computed from the state of the context block.
+  1. check that each candidate's `validation_data_hash` corresponds to a `PersistedValidationData` computed from the
+     state of the context block.
   1. If the core assignment includes a specific collator, ensure the backed candidate is issued by that collator.
-  1. Ensure that any code upgrade scheduled by the candidate does not happen within `config.validation_upgrade_cooldown` of `Paras::last_code_upgrade(para_id, true)`, if any, comparing against the value of `Paras::FutureCodeUpgrades` for the given para ID.
+  1. Ensure that any code upgrade scheduled by the candidate does not happen within `config.validation_upgrade_cooldown`
+     of `Paras::last_code_upgrade(para_id, true)`, if any, comparing against the value of `Paras::FutureCodeUpgrades`
+     for the given para ID.
   1. Check the collator's signature on the candidate data.
-  1. check the backing of the candidate using the signatures and the bitfields, comparing against the validators assigned to the groups, fetched with the `group_validators` lookup, while group indices are computed by `Scheduler` according to group rotation info. 
-  1. call `check_upward_messages(config, para, commitments.upward_messages)` to check that the upward messages are valid.
-  1. call `Dmp::check_processed_downward_messages(para, commitments.processed_downward_messages)` to check that the DMQ is properly drained.
-  1. call `Hrmp::check_hrmp_watermark(para, commitments.hrmp_watermark)` for each candidate to check rules of processing the HRMP watermark.
-  1. using `Hrmp::check_outbound_hrmp(sender, commitments.horizontal_messages)` ensure that the each candidate sent a valid set of horizontal messages
-  1. create an entry in the `PendingAvailability` map for each backed candidate with a blank `availability_votes` bitfield.
+  1. check the backing of the candidate using the signatures and the bitfields, comparing against the validators
+     assigned to the groups, fetched with the `group_validators` lookup, while group indices are computed by `Scheduler`
+     according to group rotation info.
+  1. call `check_upward_messages(config, para, commitments.upward_messages)` to check that the upward messages are
+     valid.
+  1. call `Dmp::check_processed_downward_messages(para, commitments.processed_downward_messages)` to check that the DMQ
+     is properly drained.
+  1. call `Hrmp::check_hrmp_watermark(para, commitments.hrmp_watermark)` for each candidate to check rules of processing
+     the HRMP watermark.
+  1. using `Hrmp::check_outbound_hrmp(sender, commitments.horizontal_messages)` ensure that the each candidate sent a
+     valid set of horizontal messages
+  1. create an entry in the `PendingAvailability` map for each backed candidate with a blank `availability_votes`
+     bitfield.
   1. create a corresponding entry in the `PendingAvailabilityCommitments` with the commitments.
-  1. Return a `Vec<CoreIndex>` of all scheduled cores of the list of passed assignments that a candidate was successfully backed for, sorted ascending by CoreIndex.
+  1. Return a `Vec<CoreIndex>` of all scheduled cores of the list of passed assignments that a candidate was
+     successfully backed for, sorted ascending by CoreIndex.
 * `enact_candidate(relay_parent_number: BlockNumber, CommittedCandidateReceipt)`:
-  1. If the receipt contains a code upgrade, Call `Paras::schedule_code_upgrade(para_id, code, relay_parent_number, config)`.
-    > TODO: Note that this is safe as long as we never enact candidates where the relay parent is across a session boundary. In that case, which we should be careful to avoid with contextual execution, the configuration might have changed and the para may de-sync from the host's understanding of it.
+  1. If the receipt contains a code upgrade, Call `Paras::schedule_code_upgrade(para_id, code, relay_parent_number,
+     config)`.
+    > TODO: Note that this is safe as long as we never enact candidates where the relay parent is across a session
+    > boundary. In that case, which we should be careful to avoid with contextual execution, the configuration might
+    > have changed and the para may de-sync from the host's understanding of it.
   1. Reward all backing validators of each candidate, contained within the `backers` field.
-  1. call `receive_upward_messages` for each backed candidate, using the [`UpwardMessage`s](../types/messages.md#upward-message) from the [`CandidateCommitments`](../types/candidate.md#candidate-commitments).
+  1. call `receive_upward_messages` for each backed candidate, using the
+     [`UpwardMessage`s](../types/messages.md#upward-message) from the
+     [`CandidateCommitments`](../types/candidate.md#candidate-commitments).
   1. call `Dmp::prune_dmq` with the para id of the candidate and the candidate's `processed_downward_messages`.
   1. call `Hrmp::prune_hrmp` with the para id of the candiate and the candidate's `hrmp_watermark`.
-  1. call `Hrmp::queue_outbound_hrmp` with the para id of the candidate and the list of horizontal messages taken from the commitment,
+  1. call `Hrmp::queue_outbound_hrmp` with the para id of the candidate and the list of horizontal messages taken from
+     the commitment,
   1. Call `Paras::note_new_head` using the `HeadData` from the receipt and `relay_parent_number`.
 
 * `collect_pending`:
@@ -130,21 +147,28 @@ All failed checks should lead to an unrecoverable error making the block invalid
       // return a vector of cleaned-up core IDs.
     }
   ```
-* `force_enact(ParaId)`: Forcibly enact the candidate with the given ID as though it had been deemed available by bitfields. Is a no-op if there is no candidate pending availability for this para-id. This should generally not be used but it is useful during execution of Runtime APIs, where the changes to the state are expected to be discarded directly after.
-* `candidate_pending_availability(ParaId) -> Option<CommittedCandidateReceipt>`: returns the `CommittedCandidateReceipt` pending availability for the para provided, if any.
-* `pending_availability(ParaId) -> Option<CandidatePendingAvailability>`: returns the metadata around the candidate pending availability for the para, if any.
-* `collect_disputed(disputed: Vec<CandidateHash>) -> Vec<CoreIndex>`: Sweeps through all paras pending availability. If the candidate hash is one of the disputed candidates, then clean up the corresponding storage for that candidate and the commitments. Return a vector of cleaned-up core IDs.
+* `force_enact(ParaId)`: Forcibly enact the candidate with the given ID as though it had been deemed available by
+  bitfields. Is a no-op if there is no candidate pending availability for this para-id. This should generally not be
+  used but it is useful during execution of Runtime APIs, where the changes to the state are expected to be discarded
+  directly after.
+* `candidate_pending_availability(ParaId) -> Option<CommittedCandidateReceipt>`: returns the `CommittedCandidateReceipt`
+  pending availability for the para provided, if any.
+* `pending_availability(ParaId) -> Option<CandidatePendingAvailability>`: returns the metadata around the candidate
+  pending availability for the para, if any.
+* `collect_disputed(disputed: Vec<CandidateHash>) -> Vec<CoreIndex>`: Sweeps through all paras pending availability. If
+  the candidate hash is one of the disputed candidates, then clean up the corresponding storage for that candidate and
+  the commitments. Return a vector of cleaned-up core IDs.
 
 These functions were formerly part of the UMP pallet:
 
 * `check_upward_messages(P: ParaId, Vec<UpwardMessage>)`:
-    1. Checks that the parachain is not currently offboarding and error otherwise. 
+    1. Checks that the parachain is not currently offboarding and error otherwise.
     1. Checks that there are at most `config.max_upward_message_num_per_candidate` messages to be enqueued.
     1. Checks that no message exceeds `config.max_upward_message_size`.
     1. Checks that the total resulting queue size would not exceed `co`.
-    1. Verify that queuing up the messages could not result in exceeding the queue's footprint
-    according to the config items `config.max_upward_queue_count` and `config.max_upward_queue_size`. The queue's current footprint is provided in `well_known_keys`
-    in order to facilitate oraclisation on to the para.
+    1. Verify that queuing up the messages could not result in exceeding the queue's footprint according to the config
+    items `config.max_upward_queue_count` and `config.max_upward_queue_size`. The queue's current footprint is provided
+    in `well_known_keys` in order to facilitate oraclisation on to the para.
 
 Candidate Enactment:
 
diff --git a/polkadot/roadmap/implementers-guide/src/runtime/initializer.md b/polkadot/roadmap/implementers-guide/src/runtime/initializer.md
index 19dfcbde50a9266305c3cb952655cb8870bfc5e2..a8522b369692de0f5a2dcec1c59b5584039b6141 100644
--- a/polkadot/roadmap/implementers-guide/src/runtime/initializer.md
+++ b/polkadot/roadmap/implementers-guide/src/runtime/initializer.md
@@ -1,6 +1,7 @@
 # Initializer Pallet
 
-This module is responsible for initializing the other modules in a deterministic order. It also has one other purpose as described in the overview of the runtime: accepting and forwarding session change notifications.
+This module is responsible for initializing the other modules in a deterministic order. It also has one other purpose as
+described in the overview of the runtime: accepting and forwarding session change notifications.
 
 ## Storage
 
@@ -15,7 +16,9 @@ BufferedSessionChanges: Vec<(BlockNumber, ValidatorSet, ValidatorSet)>;
 
 ## Initialization
 
-Before initializing modules, remove all changes from the `BufferedSessionChanges` with number less than or equal to the current block number, and apply the last one. The session change is applied to all modules in the same order as initialization.
+Before initializing modules, remove all changes from the `BufferedSessionChanges` with number less than or equal to the
+current block number, and apply the last one. The session change is applied to all modules in the same order as
+initialization.
 
 The other parachains modules are initialized in this order:
 
@@ -30,16 +33,24 @@ The other parachains modules are initialized in this order:
 1. UMP
 1. HRMP
 
-The [Configuration Module](configuration.md) is first, since all other modules need to operate under the same configuration as each other. Then the [Shared](shared.md) module is invoked, which determines the set of active validators. It would lead to inconsistency if, for example, the scheduler ran first and then the configuration was updated before the Inclusion module.
+The [Configuration Module](configuration.md) is first, since all other modules need to operate under the same
+configuration as each other. Then the [Shared](shared.md) module is invoked, which determines the set of active
+validators. It would lead to inconsistency if, for example, the scheduler ran first and then the configuration was
+updated before the Inclusion module.
 
 Set `HasInitialized` to true.
 
 ## Session Change
 
-Store the session change information in `BufferedSessionChange` along with the block number at which it was submitted, plus one. Although the expected operational parameters of the block authorship system should prevent more than one change from being buffered at any time, it may occur. Regardless, we always need to track the block number at which the session change can be applied so as to remain flexible over session change notifications being issued before or after initialization of the current block.
+Store the session change information in `BufferedSessionChange` along with the block number at which it was submitted,
+plus one. Although the expected operational parameters of the block authorship system should prevent more than one
+change from being buffered at any time, it may occur. Regardless, we always need to track the block number at which the
+session change can be applied so as to remain flexible over session change notifications being issued before or after
+initialization of the current block.
 
 ## Finalization
 
-Finalization order is less important in this case than initialization order, so we finalize the modules in the reverse order from initialization.
+Finalization order is less important in this case than initialization order, so we finalize the modules in the reverse
+order from initialization.
 
 Set `HasInitialized` to false.
diff --git a/polkadot/roadmap/implementers-guide/src/runtime/parainherent.md b/polkadot/roadmap/implementers-guide/src/runtime/parainherent.md
index 405468c609a701b1e12147ba1a22442562a0b921..4a771f1df6441696c6bff95d74bb531047e17ace 100644
--- a/polkadot/roadmap/implementers-guide/src/runtime/parainherent.md
+++ b/polkadot/roadmap/implementers-guide/src/runtime/parainherent.md
@@ -1,15 +1,27 @@
 # `ParaInherent`
 
-This module is responsible for providing all data given to the runtime by the block author to the various parachains modules. The entry-point is mandatory, in that it must be invoked exactly once within every block, and it is also "inherent", in that it is provided with no origin by the block author. The data within it carries its own authentication; i.e. the data takes the form of signed statements by validators. Invalid data will be filtered and not applied.
+This module is responsible for providing all data given to the runtime by the block author to the various parachains
+modules. The entry-point is mandatory, in that it must be invoked exactly once within every block, and it is also
+"inherent", in that it is provided with no origin by the block author. The data within it carries its own
+authentication; i.e. the data takes the form of signed statements by validators. Invalid data will be filtered and not
+applied.
 
-This module does not have the same initialization/finalization concerns as the others, as it only requires that entry points be triggered after all modules have initialized and that finalization happens after entry points are triggered. Both of these are assumptions we have already made about the runtime's order of operations, so this module doesn't need to be initialized or finalized by the `Initializer`.
+This module does not have the same initialization/finalization concerns as the others, as it only requires that entry
+points be triggered after all modules have initialized and that finalization happens after entry points are triggered.
+Both of these are assumptions we have already made about the runtime's order of operations, so this module doesn't need
+to be initialized or finalized by the `Initializer`.
 
 There are a couple of important notes to the operations in this inherent as they relate to disputes.
 
-1. We don't accept bitfields or backed candidates if in "governance-only" mode from having a local dispute conclude on this fork.
-1. When disputes are initiated, we remove the block from pending availability. This allows us to roll back chains to the block before blocks are included as opposed to backing. It's important to do this before processing bitfields.
-1. `Inclusion::collect_disputed` is kind of expensive so it's important to gate this on whether there are actually any new disputes. Which should be never.
-1. And we don't accept parablocks that have open disputes or disputes that have concluded against the candidate. It's important to import dispute statements before backing, but this is already the case as disputes are imported before processing bitfields.
+1. We don't accept bitfields or backed candidates if in "governance-only" mode from having a local dispute conclude on
+   this fork.
+1. When disputes are initiated, we remove the block from pending availability. This allows us to roll back chains to the
+   block before blocks are included as opposed to backing. It's important to do this before processing bitfields.
+1. `Inclusion::collect_disputed` is kind of expensive so it's important to gate this on whether there are actually any
+   new disputes. Which should be never.
+1. And we don't accept parablocks that have open disputes or disputes that have concluded against the candidate. It's
+   important to import dispute statements before backing, but this is already the case as disputes are imported before
+   processing bitfields.
 
 ## Storage
 
@@ -32,26 +44,19 @@ OnChainVotes: Option<ScrapedOnChainVotes>,
 * `enter`: This entry-point accepts one parameter: [`ParaInherentData`](../types/runtime.md#ParaInherentData).
 * `create_inherent`: This entry-point accepts one parameter: `InherentData`.
 
-Both entry points share mostly the same code. `create_inherent` will
-meaningfully limit inherent data to adhere to the weight limit, in addition to
-sanitizing any inputs and filtering out invalid data. Conceptually it is part of
-the block production. The `enter` call on the other hand is part of block import
-and consumes/imports the data previously produced by `create_inherent`.
-
-In practice both calls process inherent data and apply it to the state. Block
-production and block import should arrive at the same new state. Hence we re-use
-the same logic to ensure this is the case.
-
-The only real difference between the two is, that on `create_inherent` we
-actually need the processed and filtered inherent data to build the block, while
-on `enter` the processed data should for one be identical to the incoming
-inherent data (assuming honest block producers) and second it is irrelevant, as
-we are not building a block but just processing it, so the processed inherent
-data is simply dropped.
-
-This also means that the `enter` function keeps data around for no good reason.
-This seems acceptable though as the size of a block is rather limited.
-Nevertheless if we ever wanted to optimize this we can easily implement an
-inherent collector that has two implementations, where one clones and stores the
-data and the other just passes it on.
+Both entry points share mostly the same code. `create_inherent` will meaningfully limit inherent data to adhere to the
+weight limit, in addition to sanitizing any inputs and filtering out invalid data. Conceptually it is part of the block
+production. The `enter` call on the other hand is part of block import and consumes/imports the data previously produced
+by `create_inherent`.
 
+In practice both calls process inherent data and apply it to the state. Block production and block import should arrive
+at the same new state. Hence we re-use the same logic to ensure this is the case.
+
+The only real difference between the two is, that on `create_inherent` we actually need the processed and filtered
+inherent data to build the block, while on `enter` the processed data should for one be identical to the incoming
+inherent data (assuming honest block producers) and second it is irrelevant, as we are not building a block but just
+processing it, so the processed inherent data is simply dropped.
+
+This also means that the `enter` function keeps data around for no good reason. This seems acceptable though as the size
+of a block is rather limited. Nevertheless if we ever wanted to optimize this we can easily implement an inherent
+collector that has two implementations, where one clones and stores the data and the other just passes it on.
diff --git a/polkadot/roadmap/implementers-guide/src/runtime/paras.md b/polkadot/roadmap/implementers-guide/src/runtime/paras.md
index b3015bd5729052db4b99e6285465f46efc07cb03..ac9b1520c3dfb588e06142d6e40b5fe286e0b6ac 100644
--- a/polkadot/roadmap/implementers-guide/src/runtime/paras.md
+++ b/polkadot/roadmap/implementers-guide/src/runtime/paras.md
@@ -1,14 +1,12 @@
 # Paras Pallet
 
-The Paras module is responsible for storing information on parachains. Registered
-parachains cannot change except at session boundaries and after at least a full
-session has passed. This is primarily to ensure that the number and meaning of bits required for the
-availability bitfields does not change except at session boundaries.
+The Paras module is responsible for storing information on parachains. Registered parachains cannot change except at
+session boundaries and after at least a full session has passed. This is primarily to ensure that the number and meaning
+of bits required for the availability bitfields does not change except at session boundaries.
 
 It's also responsible for:
 
-- managing parachain validation code upgrades as well as maintaining availability of old parachain 
-code and its pruning.
+- managing parachain validation code upgrades as well as maintaining availability of old parachain code and its pruning.
 - vetting PVFs by means of the PVF pre-checking mechanism.
 
 ## Storage
@@ -102,8 +100,8 @@ struct PvfCheckActiveVoteState {
 
 #### Para Lifecycle
 
-Because the state changes of parachains are delayed, we track the specific state of 
-the para using the `ParaLifecycle` enum.
+Because the state changes of parachains are delayed, we track the specific state of the para using the `ParaLifecycle`
+enum.
 
 ```
 None         Parathread (on-demand parachain)    Parachain
@@ -132,8 +130,8 @@ None         Parathread (on-demand parachain)    Parachain
  +                        +                          +
 ```
 
-Note that if PVF pre-checking is enabled, onboarding of a para may potentially be delayed. This can
-happen due to PVF pre-checking voting concluding late.
+Note that if PVF pre-checking is enabled, onboarding of a para may potentially be delayed. This can happen due to PVF
+pre-checking voting concluding late.
 
 During the transition period, the para object is still considered in its existing state.
 
@@ -210,7 +208,7 @@ UpcomingUpgrades: Vec<(ParaId, BlockNumberFor<T>)>;
 ActionsQueue: map SessionIndex => Vec<ParaId>;
 /// Upcoming paras instantiation arguments.
 ///
-/// NOTE that after PVF pre-checking is enabled the para genesis arg will have it's code set 
+/// NOTE that after PVF pre-checking is enabled the para genesis arg will have it's code set
 /// to empty. Instead, the code will be saved into the storage right away via `CodeByHash`.
 UpcomingParasGenesis: map ParaId => Option<ParaGenesisArgs>;
 /// The number of references on the validation code in `CodeByHash` storage.
@@ -223,12 +221,13 @@ CodeByHash: map ValidationCodeHash => Option<ValidationCode>
 
 1. Execute all queued actions for paralifecycle changes:
   1. Clean up outgoing paras.
-     1. This means removing the entries under `Heads`, `CurrentCode`, `FutureCodeUpgrades`,
-        `FutureCode` and `MostRecentContext`. An according entry should be added to `PastCode`, `PastCodeMeta`, and `PastCodePruning` using the outgoing `ParaId` and removed `CurrentCode` value. This is because any outdated validation code must remain available on-chain for a determined amount
-        of blocks, and validation code outdated by de-registering the para is still subject to that
-        invariant.
-  1. Apply all incoming paras by initializing the `Heads` and `CurrentCode` using the genesis
-     parameters as well as `MostRecentContext` to `0`.
+    1. This means removing the entries under `Heads`, `CurrentCode`, `FutureCodeUpgrades`, `FutureCode` and
+       `MostRecentContext`. An according entry should be added to `PastCode`, `PastCodeMeta`, and `PastCodePruning`
+       using the outgoing `ParaId` and removed `CurrentCode` value. This is because any outdated validation code must
+       remain available on-chain for a determined amount of blocks, and validation code outdated by de-registering the
+       para is still subject to that invariant.
+  1. Apply all incoming paras by initializing the `Heads` and `CurrentCode` using the genesis parameters as well as
+     `MostRecentContext` to `0`.
   1. Amend the `Parachains` list and `ParaLifecycle` to reflect changes in registered parachains.
   1. Amend the `ParaLifecycle` set to reflect changes in registered on-demand parachains.
   1. Upgrade all on-demand parachains that should become lease holding parachains, updating the `Parachains` list and
@@ -239,40 +238,50 @@ CodeByHash: map ValidationCodeHash => Option<ValidationCode>
 1. Go over all active PVF pre-checking votes:
   1. Increment `age` of the vote.
   1. If `age` reached `cfg.pvf_voting_ttl`, then enact PVF rejection and remove the vote from the active list.
-  1. Otherwise, reinitialize the ballots.
-    1. Resize the `votes_accept`/`votes_reject` to have the same length as the incoming validator set.
-    1. Zero all the votes.
+  1. Otherwise, reinitialize the ballots. 1. Resize the `votes_accept`/`votes_reject` to have the same length as the
+    incoming validator set. 1. Zero all the votes.
 ## Initialization
 
-1. Do pruning based on all entries in `PastCodePruning` with `BlockNumber <= now`. Update the
-   corresponding `PastCodeMeta` and `PastCode` accordingly.
+1. Do pruning based on all entries in `PastCodePruning` with `BlockNumber <= now`. Update the corresponding
+   `PastCodeMeta` and `PastCode` accordingly.
 1. Toggle the upgrade related signals
-  1. Collect all `(para_id, expected_at)` from `UpcomingUpgrades` where `expected_at <= now` and prune them. For each para pruned set `UpgradeGoAheadSignal` to `GoAhead`. Reserve weight for the state modification to upgrade each para pruned.
-  1. Collect all `(para_id, next_possible_upgrade_at)` from `UpgradeCooldowns` where `next_possible_upgrade_at <= now`. For each para obtained this way reserve weight to remove its `UpgradeRestrictionSignal` on finalization.
+  1. Collect all `(para_id, expected_at)` from `UpcomingUpgrades` where `expected_at <= now` and prune them. For each
+     para pruned set `UpgradeGoAheadSignal` to `GoAhead`. Reserve weight for the state modification to upgrade each para
+     pruned.
+  1. Collect all `(para_id, next_possible_upgrade_at)` from `UpgradeCooldowns` where `next_possible_upgrade_at <= now`.
+     For each para obtained this way reserve weight to remove its `UpgradeRestrictionSignal` on finalization.
 
 ## Routines
 
-* `schedule_para_initialize(ParaId, ParaGenesisArgs)`: Schedule a para to be initialized at the next
-  session. Noop if para is already registered in the system with some `ParaLifecycle`.
-* `schedule_para_cleanup(ParaId)`: Schedule a para to be cleaned up after the next full session.
-* `schedule_parathread_upgrade(ParaId)`: Schedule a parathread (on-demand parachain) to be upgraded to a parachain.
-* `schedule_parachain_downgrade(ParaId)`: Schedule a parachain to be downgraded from lease holding to on-demand.
-* `schedule_code_upgrade(ParaId, new_code, relay_parent: BlockNumber, HostConfiguration)`: Schedule a future code
-  upgrade of the given parachain. In case the PVF pre-checking is disabled, or the new code is already present in the storage, the upgrade will be applied after inclusion of a block of the same parachain
-  executed in the context of a relay-chain block with number >= `relay_parent + config.validation_upgrade_delay`. If the upgrade is scheduled `UpgradeRestrictionSignal` is set and it will remain set until `relay_parent + config.validation_upgrade_cooldown`.
-In case the PVF pre-checking is enabled, or the new code is not already present in the storage, then the PVF pre-checking run will be scheduled for that validation code. If the pre-checking concludes with rejection, then the upgrade is canceled. Otherwise, after pre-checking is concluded the upgrade will be scheduled and be enacted as described above.
-* `note_new_head(ParaId, HeadData, BlockNumber)`: note that a para has progressed to a new head,
-  where the new head was executed in the context of a relay-chain block with given number, the latter value is inserted into the `MostRecentContext` mapping. This will apply pending code upgrades based on the block number provided. If an upgrade took place it will clear the `UpgradeGoAheadSignal`.
-* `lifecycle(ParaId) -> Option<ParaLifecycle>`: Return the `ParaLifecycle` of a para.
-* `is_parachain(ParaId) -> bool`: Returns true if the para ID references any live lease holding parachain,
-  including those which may be transitioning to an on-demand parachain in the future.
-* `is_parathread(ParaId) -> bool`: Returns true if the para ID references any live parathread (on-demand parachain),
+- `schedule_para_initialize(ParaId, ParaGenesisArgs)`: Schedule a para to be initialized at the next session. Noop if
+  para is already registered in the system with some `ParaLifecycle`.
+- `schedule_para_cleanup(ParaId)`: Schedule a para to be cleaned up after the next full session.
+- `schedule_parathread_upgrade(ParaId)`: Schedule a parathread (on-demand parachain) to be upgraded to a parachain.
+- `schedule_parachain_downgrade(ParaId)`: Schedule a parachain to be downgraded from lease holding to on-demand.
+- `schedule_code_upgrade(ParaId, new_code, relay_parent: BlockNumber, HostConfiguration)`: Schedule a future code
+  upgrade of the given parachain. In case the PVF pre-checking is disabled, or the new code is already present in the
+  storage, the upgrade will be applied after inclusion of a block of the same parachain executed in the context of a
+relay-chain block with number >= `relay_parent + config.validation_upgrade_delay`. If the upgrade is scheduled
+`UpgradeRestrictionSignal` is set and it will remain set until `relay_parent + config.validation_upgrade_cooldown`. In
+case the PVF pre-checking is enabled, or the new code is not already present in the storage, then the PVF pre-checking
+run will be scheduled for that validation code. If the pre-checking concludes with rejection, then the upgrade is
+canceled. Otherwise, after pre-checking is concluded the upgrade will be scheduled and be enacted as described above.
+- `note_new_head(ParaId, HeadData, BlockNumber)`: note that a para has progressed to a new head, where the new head was
+  executed in the context of a relay-chain block with given number, the latter value is inserted into the
+  `MostRecentContext` mapping. This will apply pending code upgrades based on the block number provided. If an upgrade
+  took place it will clear the `UpgradeGoAheadSignal`.
+- `lifecycle(ParaId) -> Option<ParaLifecycle>`: Return the `ParaLifecycle` of a para.
+- `is_parachain(ParaId) -> bool`: Returns true if the para ID references any live lease holding parachain, including
+  those which may be transitioning to an on-demand parachain in the future.
+- `is_parathread(ParaId) -> bool`: Returns true if the para ID references any live parathread (on-demand parachain),
   including those which may be transitioning to a lease holding parachain in the future.
-* `is_valid_para(ParaId) -> bool`: Returns true if the para ID references either a live on-demand parachain
-  or live lease holding parachain.
-* `can_upgrade_validation_code(ParaId) -> bool`: Returns true if the given para can signal code upgrade right now.
-* `pvfs_require_prechecking() -> Vec<ValidationCodeHash>`: Returns the list of PVF validation code hashes that require PVF pre-checking votes.
+- `is_valid_para(ParaId) -> bool`: Returns true if the para ID references either a live on-demand parachain or live
+  lease holding parachain.
+- `can_upgrade_validation_code(ParaId) -> bool`: Returns true if the given para can signal code upgrade right now.
+- `pvfs_require_prechecking() -> Vec<ValidationCodeHash>`: Returns the list of PVF validation code hashes that require
+  PVF pre-checking votes.
 
 ## Finalization
 
-Collect all `(para_id, next_possible_upgrade_at)` from `UpgradeCooldowns` where `next_possible_upgrade_at <= now` and prune them. For each para pruned remove its `UpgradeRestrictionSignal`.
+Collect all `(para_id, next_possible_upgrade_at)` from `UpgradeCooldowns` where `next_possible_upgrade_at <= now` and
+prune them. For each para pruned remove its `UpgradeRestrictionSignal`.
diff --git a/polkadot/roadmap/implementers-guide/src/runtime/scheduler.md b/polkadot/roadmap/implementers-guide/src/runtime/scheduler.md
index 312ecedcb50f7c0108248f4dc9803465be2a0839..2b8832946fc990e5cf2d1e38211e6bec9e78fd89 100644
--- a/polkadot/roadmap/implementers-guide/src/runtime/scheduler.md
+++ b/polkadot/roadmap/implementers-guide/src/runtime/scheduler.md
@@ -1,6 +1,7 @@
 # Scheduler Pallet
 
-> TODO: this section is still heavily under construction. key questions about availability cores and validator assignment are still open and the flow of the the section may be contradictory or inconsistent
+> TODO: this section is still heavily under construction. key questions about availability cores and validator
+> assignment are still open and the flow of the the section may be contradictory or inconsistent
 
 The Scheduler module is responsible for two main tasks:
 
@@ -9,16 +10,29 @@ The Scheduler module is responsible for two main tasks:
 
 It aims to achieve these tasks with these goals in mind:
 
-- It should be possible to know at least a block ahead-of-time, ideally more, which validators are going to be assigned to which parachains.
+- It should be possible to know at least a block ahead-of-time, ideally more, which validators are going to be assigned
+  to which parachains.
 - Parachains that have a candidate pending availability in this fork of the chain should not be assigned.
-- Validator assignments should not be gameable. Malicious cartels should not be able to manipulate the scheduler to assign themselves as desired.
+- Validator assignments should not be gameable. Malicious cartels should not be able to manipulate the scheduler to
+  assign themselves as desired.
 - High or close to optimal throughput of parachains. Work among validator groups should be balanced.
 
 ## Availability Cores
 
-The Scheduler manages resource allocation using the concept of "Availability Cores". There will be one availability core for each lease holding parachain, and a fixed number of cores used for multiplexing on-demand parachains. Validators will be partitioned into groups, with the same number of groups as availability cores. Validator groups will be assigned to different availability cores over time.
-
-An availability core can exist in either one of two states at the beginning or end of a block: free or occupied. A free availability core can have a lease holding or on-demand parachain assigned to it for the potential to have a backed candidate included. After backing, the core enters the occupied state as the backed candidate is pending availability. There is an important distinction: a core is not considered occupied until it is in charge of a block pending availability, although the implementation may treat scheduled cores the same as occupied ones for brevity. A core exits the occupied state when the candidate is no longer pending availability - either on timeout or on availability. A core starting in the occupied state can move to the free state and back to occupied all within a single block, as availability bitfields are processed before backed candidates. At the end of the block, there is a possible timeout on availability which can move the core back to the free state if occupied.
+The Scheduler manages resource allocation using the concept of "Availability Cores". There will be one availability core
+for each lease holding parachain, and a fixed number of cores used for multiplexing on-demand parachains. Validators
+will be partitioned into groups, with the same number of groups as availability cores. Validator groups will be assigned
+to different availability cores over time.
+
+An availability core can exist in either one of two states at the beginning or end of a block: free or occupied. A free
+availability core can have a lease holding or on-demand parachain assigned to it for the potential to have a backed
+candidate included. After backing, the core enters the occupied state as the backed candidate is pending availability.
+There is an important distinction: a core is not considered occupied until it is in charge of a block pending
+availability, although the implementation may treat scheduled cores the same as occupied ones for brevity. A core exits
+the occupied state when the candidate is no longer pending availability - either on timeout or on availability. A core
+starting in the occupied state can move to the free state and back to occupied all within a single block, as
+availability bitfields are processed before backed candidates. At the end of the block, there is a possible timeout on
+availability which can move the core back to the free state if occupied.
 
 Cores are treated as an ordered list and are typically referred to by their index in that list.
 
@@ -82,19 +96,47 @@ digraph {
 
 ## Validator Groups
 
-Validator group assignments do not need to change very quickly. The security benefits of fast rotation are redundant with the challenge mechanism in the [Approval process](../protocol-approval.md). Because of this, we only divide validators into groups at the beginning of the session and do not shuffle membership during the session. However, we do take steps to ensure that no particular validator group has dominance over a single lease holding parachain or on-demand parachain-multiplexer for an entire session to provide better guarantees of live-ness.
-
-Validator groups rotate across availability cores in a round-robin fashion, with rotation occurring at fixed intervals. The i'th group will be assigned to the `(i+k)%n`'th core at any point in time, where `k` is the number of rotations that have occurred in the session, and `n` is the number of cores. This makes upcoming rotations within the same session predictable.
-
-When a rotation occurs, validator groups are still responsible for distributing availability chunks for any previous cores that are still occupied and pending availability. In practice, rotation and availability-timeout frequencies should be set so this will only be the core they have just been rotated from. It is possible that a validator group is rotated onto a core which is currently occupied. In this case, the validator group will have nothing to do until the previously-assigned group finishes their availability work and frees the core or the availability process times out. Depending on if the core is for a lease holding parachain or on-demand parachain, a different timeout `t` from the [`HostConfiguration`](../types/runtime.md#host-configuration) will apply. Availability timeouts should only be triggered in the first `t-1` blocks after the beginning of a rotation.
+Validator group assignments do not need to change very quickly. The security benefits of fast rotation are redundant
+with the challenge mechanism in the [Approval process](../protocol-approval.md). Because of this, we only divide
+validators into groups at the beginning of the session and do not shuffle membership during the session. However, we do
+take steps to ensure that no particular validator group has dominance over a single lease holding parachain or on-demand
+parachain-multiplexer for an entire session to provide better guarantees of live-ness.
+
+Validator groups rotate across availability cores in a round-robin fashion, with rotation occurring at fixed intervals.
+The i'th group will be assigned to the `(i+k)%n`'th core at any point in time, where `k` is the number of rotations that
+have occurred in the session, and `n` is the number of cores. This makes upcoming rotations within the same session
+predictable.
+
+When a rotation occurs, validator groups are still responsible for distributing availability chunks for any previous
+cores that are still occupied and pending availability. In practice, rotation and availability-timeout frequencies
+should be set so this will only be the core they have just been rotated from. It is possible that a validator group is
+rotated onto a core which is currently occupied. In this case, the validator group will have nothing to do until the
+previously-assigned group finishes their availability work and frees the core or the availability process times out.
+Depending on if the core is for a lease holding parachain or on-demand parachain, a different timeout `t` from the
+[`HostConfiguration`](../types/runtime.md#host-configuration) will apply. Availability timeouts should only be triggered
+in the first `t-1` blocks after the beginning of a rotation.
 
 ## Claims
 
-On-demand parachains operate on a system of claims. Collators purchase claims on authoring the next block of an on-demand parachain, although the purchase mechanism is beyond the scope of the scheduler. The scheduler guarantees that they'll be given at least a certain number of attempts to author a candidate that is backed. Attempts that fail during the availability phase are not counted, since ensuring availability at that stage is the responsibility of the backing validators, not of the collator. When a claim is accepted, it is placed into a queue of claims, and each claim is assigned to a particular on-demand parachain-multiplexing core in advance. Given that the current assignments of validator groups to cores are known, and the upcoming assignments are predictable, it is possible for on-demand parachain collators to know who they should be talking to now and how they should begin establishing connections with as a fallback.
-
-With this information, the Node-side can be aware of which on-demand parachains have a good chance of being includable within the relay-chain block and can focus any additional resources on backing candidates from those on-demand parachains. Furthermore, Node-side code is aware of which validator group will be responsible for that thread. If the necessary conditions are reached for core reassignment, those candidates can be backed within the same block as the core being freed.
-
-On-demand claims, when scheduled onto a free core, may not result in a block pending availability. This may be due to collator error, networking timeout, or censorship by the validator group. In this case, the claims should be retried a certain number of times to give the collator a fair shot.
+On-demand parachains operate on a system of claims. Collators purchase claims on authoring the next block of an
+on-demand parachain, although the purchase mechanism is beyond the scope of the scheduler. The scheduler guarantees that
+they'll be given at least a certain number of attempts to author a candidate that is backed. Attempts that fail during
+the availability phase are not counted, since ensuring availability at that stage is the responsibility of the backing
+validators, not of the collator. When a claim is accepted, it is placed into a queue of claims, and each claim is
+assigned to a particular on-demand parachain-multiplexing core in advance. Given that the current assignments of
+validator groups to cores are known, and the upcoming assignments are predictable, it is possible for on-demand
+parachain collators to know who they should be talking to now and how they should begin establishing connections with as
+a fallback.
+
+With this information, the Node-side can be aware of which on-demand parachains have a good chance of being includable
+within the relay-chain block and can focus any additional resources on backing candidates from those on-demand
+parachains. Furthermore, Node-side code is aware of which validator group will be responsible for that thread. If the
+necessary conditions are reached for core reassignment, those candidates can be backed within the same block as the core
+being freed.
+
+On-demand claims, when scheduled onto a free core, may not result in a block pending availability. This may be due to
+collator error, networking timeout, or censorship by the validator group. In this case, the claims should be retried a
+certain number of times to give the collator a fair shot.
 
 ## Storage
 
@@ -104,7 +146,7 @@ Utility structs:
 // A claim on authoring the next block for a given parathread (on-demand parachain).
 struct ParathreadClaim(ParaId, CollatorId);
 
-// An entry tracking a parathread (on-demand parachain) claim to ensure it does not 
+// An entry tracking a parathread (on-demand parachain) claim to ensure it does not
 // pass the maximum number of retries.
 struct ParathreadEntry {
   claim: ParathreadClaim,
@@ -165,7 +207,7 @@ ParathreadClaimIndex: Vec<ParaId>;
 /// The block number where the session start occurred. Used to track how many group rotations have occurred.
 SessionStartBlock: BlockNumber;
 /// Currently scheduled cores - free but up to be occupied.
-/// The value contained here will not be valid after the end of a block. 
+/// The value contained here will not be valid after the end of a block.
 /// Runtime APIs should be used to determine scheduled cores
 /// for the upcoming block.
 Scheduled: Vec<CoreAssignment>, // sorted ascending by CoreIndex.
@@ -173,13 +215,17 @@ Scheduled: Vec<CoreAssignment>, // sorted ascending by CoreIndex.
 
 ## Session Change
 
-Session changes are the only time that configuration can change, and the [Configuration module](configuration.md)'s session-change logic is handled before this module's. We also lean on the behavior of the [Inclusion module](inclusion.md) which clears all its occupied cores on session change. Thus we don't have to worry about cores being occupied across session boundaries and it is safe to re-size the `AvailabilityCores` bitfield.
+Session changes are the only time that configuration can change, and the [Configuration module](configuration.md)'s
+session-change logic is handled before this module's. We also lean on the behavior of the [Inclusion
+module](inclusion.md) which clears all its occupied cores on session change. Thus we don't have to worry about cores
+being occupied across session boundaries and it is safe to re-size the `AvailabilityCores` bitfield.
 
 Actions:
 
 1. Set `SessionStartBlock` to current block number + 1, as session changes are applied at the end of the block.
 1. Clear all `Some` members of `AvailabilityCores`. Return all parathread claims to queue with retries un-incremented.
-1. Set `configuration = Configuration::configuration()` (see [`HostConfiguration`](../types/runtime.md#host-configuration))
+1. Set `configuration = Configuration::configuration()` (see
+   [`HostConfiguration`](../types/runtime.md#host-configuration))
 1. Fetch `Shared::ActiveValidators` as AV.
 1. Determine the number of cores & validator groups as `n_cores`. This is the maximum of
    1. `Paras::parachains().len() + configuration.parathread_cores`
@@ -187,13 +233,18 @@ Actions:
 1. Resize `AvailabilityCores` to have length `n_cores` with all `None` entries.
 1. Compute new validator groups by shuffling using a secure randomness beacon
    - Note that the total number of validators `V` in AV may not be evenly divided by `n_cores`.
-   - The groups are selected by partitioning AV.  The first `V % N` groups will have `(V / n_cores) + 1` members, while the remaining groups will have `(V / N)` members each.
-   - Instead of using the indices within AV, which point to the broader set, indices _into_ AV should be used. This implies that groups should have simply ascending validator indices.
+   - The groups are selected by partitioning AV.  The first `V % N` groups will have `(V / n_cores) + 1` members, while
+     the remaining groups will have `(V / N)` members each.
+   - Instead of using the indices within AV, which point to the broader set, indices _into_ AV should be used. This
+     implies that groups should have simply ascending validator indices.
 1. Prune the parathread (on-demand parachain) queue to remove all retries beyond `configuration.parathread_retries`.
    - Also prune all on-demand claims corresponding to de-registered parachains.
    - all pruned claims should have their entry removed from the parathread (on-demand parachain) index.
-   - assign all non-pruned claims to new cores if the number of on-demand parachain cores has changed between the `new_config` and `old_config` of the `SessionChangeNotification`.
-   - Assign claims in equal balance across all cores if rebalancing, and set the `next_core` of the `ParathreadQueue` (on-demand queue) by incrementing the relative index of the last assigned core and taking it modulo the number of on-demand cores. 
+   - assign all non-pruned claims to new cores if the number of on-demand parachain cores has changed between the
+     `new_config` and `old_config` of the `SessionChangeNotification`.
+   - Assign claims in equal balance across all cores if rebalancing, and set the `next_core` of the `ParathreadQueue`
+     (on-demand queue) by incrementing the relative index of the last assigned core and taking it modulo the number of
+     on-demand cores.
 
 ## Initialization
 
@@ -208,28 +259,52 @@ No finalization routine runs for this module.
 - `add_parathread_claim(ParathreadClaim)`: Add a parathread (on-demand parachain) claim to the queue.
   - Fails if any on-demand claim on the same parachain is currently indexed.
   - Fails if the queue length is >= `config.scheduling_lookahead * config.parathread_cores`.
-  - The core used for the on-demand claim is the `next_core` field of the `ParathreadQueue` (on-demand queue) and adding `Paras::parachains().len()` to it.
+  - The core used for the on-demand claim is the `next_core` field of the `ParathreadQueue` (on-demand queue) and adding
+    `Paras::parachains().len()` to it.
   - `next_core` is then updated by adding 1 and taking it modulo `config.parathread_cores`.
   - The claim is then added to the claim index.
-- `free_cores(Vec<(CoreIndex, FreedReason)>)`: indicate previosuly-occupied cores which are to be considered returned and why they are being returned.
+- `free_cores(Vec<(CoreIndex, FreedReason)>)`: indicate previosuly-occupied cores which are to be considered returned
+  and why they are being returned.
   - All freed lease holding parachain cores should be assigned to their respective parachain
-  - All freed on-demand parachain cores whose reason for freeing was `FreedReason::Concluded` should have the claim removed from the claim index.
-  - All freed on-demand cores whose reason for freeing was `FreedReason::TimedOut` should have the claim added to the parathread queue (on-demand queue) again without retries incremented
+  - All freed on-demand parachain cores whose reason for freeing was `FreedReason::Concluded` should have the claim
+    removed from the claim index.
+  - All freed on-demand cores whose reason for freeing was `FreedReason::TimedOut` should have the claim added to the
+    parathread queue (on-demand queue) again without retries incremented
   - All freed on-demand cores should take the next on-demand parachain entry from the queue.
-- `schedule(Vec<(CoreIndex, FreedReason)>, now: BlockNumber)`: schedule new core assignments, with a parameter indicating previously-occupied cores which are to be considered returned and why they are being returned.
+- `schedule(Vec<(CoreIndex, FreedReason)>, now: BlockNumber)`: schedule new core assignments, with a parameter
+  indicating previously-occupied cores which are to be considered returned and why they are being returned.
   - Invoke `free_cores(freed_cores)`
-  - The i'th validator group will be assigned to the `(i+k)%n`'th core at any point in time, where `k` is the number of rotations that have occurred in the session, and `n` is the total number of cores. This makes upcoming rotations within the same session predictable. Rotations are based off of `now`.
+  - The i'th validator group will be assigned to the `(i+k)%n`'th core at any point in time, where `k` is the number of
+    rotations that have occurred in the session, and `n` is the total number of cores. This makes upcoming rotations
+    within the same session predictable. Rotations are based off of `now`.
 - `scheduled() -> Vec<CoreAssignment>`: Get currently scheduled core assignments.
 - `occupied(Vec<CoreIndex>)`. Note that the given cores have become occupied.
   - Behavior undefined if any given cores were not scheduled.
   - Behavior undefined if the given cores are not sorted ascending by core index
   - This clears them from `Scheduled` and marks each corresponding `core` in the `AvailabilityCores` as occupied.
-  - Since both the availability cores and the newly-occupied cores lists are sorted ascending, this method can be implemented efficiently.
+  - Since both the availability cores and the newly-occupied cores lists are sorted ascending, this method can be
+    implemented efficiently.
 - `core_para(CoreIndex) -> ParaId`: return the currently-scheduled or occupied ParaId for the given core.
-- `group_validators(GroupIndex) -> Option<Vec<ValidatorIndex>>`: return all validators in a given group, if the group index is valid for this session.
-- `availability_timeout_predicate() -> Option<impl Fn(CoreIndex, BlockNumber) -> bool>`: returns an optional predicate that should be used for timing out occupied cores. if `None`, no timing-out should be done. The predicate accepts the index of the core, and the block number since which it has been occupied. The predicate should be implemented based on the time since the last validator group rotation, and the respective parachain timeouts, i.e. only within `max(config.chain_availability_period, config.thread_availability_period)` of the last rotation would this return `Some`.
+- `group_validators(GroupIndex) -> Option<Vec<ValidatorIndex>>`: return all validators in a given group, if the group
+  index is valid for this session.
+- `availability_timeout_predicate() -> Option<impl Fn(CoreIndex, BlockNumber) -> bool>`: returns an optional predicate
+  that should be used for timing out occupied cores. if `None`, no timing-out should be done. The predicate accepts the
+  index of the core, and the block number since which it has been occupied. The predicate should be implemented based on
+  the time since the last validator group rotation, and the respective parachain timeouts, i.e. only within
+  `max(config.chain_availability_period, config.thread_availability_period)` of the last rotation would this return
+  `Some`.
 - `group_rotation_info(now: BlockNumber) -> GroupRotationInfo`: Returns a helper for determining group rotation.
-- `next_up_on_available(CoreIndex) -> Option<ScheduledCore>`: Return the next thing that will be scheduled on this core assuming it is currently occupied and the candidate occupying it became available. Returns in `ScheduledCore` format (todo: link to Runtime APIs page; linkcheck doesn't allow this right now). For lease holding parachains, this is always the ID of the parachain and no specified collator. For on-demand parachains, this is based on the next item in the `ParathreadQueue` (on-demand queue) assigned to that core, and is `None` if there isn't one.
-- `next_up_on_time_out(CoreIndex) -> Option<ScheduledCore>`: Return the next thing that will be scheduled on this core assuming it is currently occupied and the candidate occupying it timed out. Returns in `ScheduledCore` format (todo: link to Runtime APIs page; linkcheck doesn't allow this right now). For parachains, this is always the ID of the parachain and no specified collator. For on-demand parachains, this is based on the next item in the `ParathreadQueue` (on-demand queue) assigned to that core, or if there isn't one, the claim that is currently occupying the core. Otherwise `None`.
+- `next_up_on_available(CoreIndex) -> Option<ScheduledCore>`: Return the next thing that will be scheduled on this core
+  assuming it is currently occupied and the candidate occupying it became available. Returns in `ScheduledCore` format
+  (todo: link to Runtime APIs page; linkcheck doesn't allow this right now). For lease holding parachains, this is
+  always the ID of the parachain and no specified collator. For on-demand parachains, this is based on the next item in
+  the `ParathreadQueue` (on-demand queue) assigned to that core, and is `None` if there isn't one.
+- `next_up_on_time_out(CoreIndex) -> Option<ScheduledCore>`: Return the next thing that will be scheduled on this core
+  assuming it is currently occupied and the candidate occupying it timed out. Returns in `ScheduledCore` format (todo:
+  link to Runtime APIs page; linkcheck doesn't allow this right now). For parachains, this is always the ID of the
+  parachain and no specified collator. For on-demand parachains, this is based on the next item in the `ParathreadQueue`
+  (on-demand queue) assigned to that core, or if there isn't one, the claim that is currently occupying the core.
+  Otherwise `None`.
 - `clear()`:
-  - Free all scheduled cores and return on-demand claims to queue, with retries incremented. Skip on-demand parachains which no longer exist under paras.
+  - Free all scheduled cores and return on-demand claims to queue, with retries incremented. Skip on-demand parachains
+    which no longer exist under paras.
diff --git a/polkadot/roadmap/implementers-guide/src/runtime/session_info.md b/polkadot/roadmap/implementers-guide/src/runtime/session_info.md
index 5ee63ab5a903072935b75abc909d164af5ae5d6b..0442ee57505d0823b98b54bed79596e09a16f641 100644
--- a/polkadot/roadmap/implementers-guide/src/runtime/session_info.md
+++ b/polkadot/roadmap/implementers-guide/src/runtime/session_info.md
@@ -1,6 +1,8 @@
 # Session Info
 
-For disputes and approvals, we need access to information about validator sets from prior sessions. We also often want easy access to the same information about the current session's validator set. This module aggregates and stores this information in a rolling window while providing easy APIs for access.
+For disputes and approvals, we need access to information about validator sets from prior sessions. We also often want
+easy access to the same information about the current session's validator set. This module aggregates and stores this
+information in a rolling window while providing easy APIs for access.
 
 ## Storage
 
@@ -66,10 +68,14 @@ Sessions: map SessionIndex => Option<SessionInfo>,
 
 ## Session Change
 
-1. Update `EarliestStoredSession` based on `config.dispute_period` and remove all entries from `Sessions` from the previous value up to the new value.
-1. Create a new entry in `Sessions` with information about the current session. Use `shared::ActiveValidators` to determine the indices into the broader validator sets (validation, assignment, discovery) which are actually used for parachain validation. Only these validators should appear in the `SessionInfo`.
+1. Update `EarliestStoredSession` based on `config.dispute_period` and remove all entries from `Sessions` from the
+   previous value up to the new value.
+1. Create a new entry in `Sessions` with information about the current session. Use `shared::ActiveValidators` to
+   determine the indices into the broader validator sets (validation, assignment, discovery) which are actually used for
+   parachain validation. Only these validators should appear in the `SessionInfo`.
 
 ## Routines
 
 * `earliest_stored_session() -> SessionIndex`: Yields the earliest session for which we have information stored.
-* `session_info(session: SessionIndex) -> Option<SessionInfo>`: Yields the session info for the given session, if stored.
+* `session_info(session: SessionIndex) -> Option<SessionInfo>`: Yields the session info for the given session, if
+  stored.
diff --git a/polkadot/roadmap/implementers-guide/src/runtime/shared.md b/polkadot/roadmap/implementers-guide/src/runtime/shared.md
index 0f173134e2a2c8b205f6429ff3267d3706842f6f..ebed240838ab93e2cabaa9cde01cf8828337e708 100644
--- a/polkadot/roadmap/implementers-guide/src/runtime/shared.md
+++ b/polkadot/roadmap/implementers-guide/src/runtime/shared.md
@@ -2,11 +2,11 @@
 
 This module is responsible for managing shared storage and configuration for other modules.
 
-It is important that other pallets are able to use the Shared Module, so it should not have a
-dependency on any other modules in the Parachains Runtime.
+It is important that other pallets are able to use the Shared Module, so it should not have a dependency on any other
+modules in the Parachains Runtime.
 
-For the moment, it is used exclusively to track the current session index across the Parachains
-Runtime system, and when it should be allowed to schedule future changes to Paras or Configurations.
+For the moment, it is used exclusively to track the current session index across the Parachains Runtime system, and when
+it should be allowed to schedule future changes to Paras or Configurations.
 
 ## Constants
 
@@ -57,24 +57,26 @@ AllowedRelayParents: AllowedRelayParentsTracker<T::Hash, T::BlockNumber>,
 
 The Shared Module currently has no initialization routines.
 
-The Shared Module is initialized directly after the Configuration module, but before all other
-modules. It is important to update the Shared Module before any other module since its state may be
-used within the logic of other modules, and it is important that the state is consistent across
-them.
+The Shared Module is initialized directly after the Configuration module, but before all other modules. It is important
+to update the Shared Module before any other module since its state may be used within the logic of other modules, and
+it is important that the state is consistent across them.
 
 ## Session Change
 
-During a session change, the Shared Module receives and stores the current Session Index directly from the initializer module, along with the broader validator set, and it returns the new list of validators.
+During a session change, the Shared Module receives and stores the current Session Index directly from the initializer
+module, along with the broader validator set, and it returns the new list of validators.
 
-The list of validators should be first shuffled according to the chain's random seed and then truncated. The indices of these validators should be set to `ActiveValidatorIndices` and then returned back to the initializer. `ActiveValidatorKeys` should be set accordingly.
+The list of validators should be first shuffled according to the chain's random seed and then truncated. The indices of
+these validators should be set to `ActiveValidatorIndices` and then returned back to the initializer.
+`ActiveValidatorKeys` should be set accordingly.
 
 This information is used in the:
 
-* Configuration Module: For delaying updates to configurations until at lease one full session has
-  passed.
+* Configuration Module: For delaying updates to configurations until at lease one full session has passed.
 * Paras Module: For delaying updates to paras until at least one full session has passed.
 
-Allowed relay parents buffer, which is maintained by [ParaInherent](./parainherent.md) module, is cleared on every session change.
+Allowed relay parents buffer, which is maintained by [ParaInherent](./parainherent.md) module, is cleared on every
+session change.
 
 ## Finalization
 
@@ -82,6 +84,6 @@ The Shared Module currently has no finalization routines.
 
 ## Functions
 
-* `scheduled_sessions() -> SessionIndex`: Return the next session index where updates to the
-  Parachains Runtime system would be safe to apply.
+* `scheduled_sessions() -> SessionIndex`: Return the next session index where updates to the Parachains Runtime system
+  would be safe to apply.
 * `set_session_index(SessionIndex)`: For tests. Set the current session index in the Shared Module.
diff --git a/polkadot/roadmap/implementers-guide/src/types/README.md b/polkadot/roadmap/implementers-guide/src/types/README.md
index 807130a5e66b25c441f4945fc2dfb3b63de4f354..87092bf3a005353b09d375b89f599c2918295ef5 100644
--- a/polkadot/roadmap/implementers-guide/src/types/README.md
+++ b/polkadot/roadmap/implementers-guide/src/types/README.md
@@ -31,7 +31,7 @@ digraph {
     CandidateDescriptor:collator -> CollatorId:w
     CandidateDescriptor:persisted_validation_data_hash -> PersistedValidationDataHash
 
-    Id [label="polkadot_parachain::primitives::Id"]
+    Id [label="polkadot_parachain_primitives::primitives::Id"]
     CollatorId [label="polkadot_primitives::v2::CollatorId"]
 
     PoVHash [label = "Hash", shape="doublecircle", fill="gray90"]
@@ -128,11 +128,11 @@ digraph {
         </table>
     >]
 
-    CandidateCommitments:upward_messages -> "polkadot_parachain::primitives::UpwardMessage":w
+    CandidateCommitments:upward_messages -> "polkadot_parachain_primitives::primitives::UpwardMessage":w
     CandidateCommitments:horizontal_messages -> "polkadot_core_primitives::v2::OutboundHrmpMessage":w
     CandidateCommitments:head_data -> HeadData:w
-    CandidateCommitments:horizontal_messages -> "polkadot_parachain::primitives::Id":w
-    CandidateCommitments:new_validation_code -> "polkadot_parachain::primitives::ValidationCode":w
+    CandidateCommitments:horizontal_messages -> "polkadot_parachain_primitives::primitives::Id":w
+    CandidateCommitments:new_validation_code -> "polkadot_parachain_primitives::primitives::ValidationCode":w
 
     PoV [label = <
         <table>
@@ -141,7 +141,7 @@ digraph {
         </table>
     >]
 
-    PoV:block_data -> "polkadot_parachain::primitives::BlockData":w
+    PoV:block_data -> "polkadot_parachain_primitives::primitives::BlockData":w
 
     BackedCandidate [label = <
         <table>
@@ -155,7 +155,7 @@ digraph {
     BackedCandidate:candidate -> CommittedCandidateReceipt:name
     BackedCandidate:validity_votes  -> "polkadot_primitives:v0:ValidityAttestation":w
 
-    HeadData [label = "polkadot_parachain::primitives::HeadData"]
+    HeadData [label = "polkadot_parachain_primitives::primitives::HeadData"]
 
     CoreIndex [label = <
         <table>
diff --git a/polkadot/roadmap/implementers-guide/src/types/approval.md b/polkadot/roadmap/implementers-guide/src/types/approval.md
index b58e0a8187e1d3af2eae4a7a0ec8d1ee64368b56..bc33f024426fefcf0809feeeddef2f83882c1914 100644
--- a/polkadot/roadmap/implementers-guide/src/types/approval.md
+++ b/polkadot/roadmap/implementers-guide/src/types/approval.md
@@ -6,9 +6,11 @@ The public key of a keypair used by a validator for determining assignments to a
 
 ## `AssignmentCert`
 
-An `AssignmentCert`, short for Assignment Certificate, is a piece of data provided by a validator to prove that they have been selected to perform approval checks on an included candidate.
+An `AssignmentCert`, short for Assignment Certificate, is a piece of data provided by a validator to prove that they
+have been selected to perform approval checks on an included candidate.
 
-These certificates can be checked in the context of a specific block, candidate, and validator assignment VRF key. The block state will also provide further context about the availability core states at that block.
+These certificates can be checked in the context of a specific block, candidate, and validator assignment VRF key. The
+block state will also provide further context about the availability core states at that block.
 
 ```rust
 enum AssignmentCertKind {
@@ -53,7 +55,8 @@ struct ApprovalVote(Hash);
 
 ## `SignedApprovalVote`
 
-An approval vote signed with a validator's key. This should be verifiable under the `ValidatorId` corresponding to the `ValidatorIndex` of the session, which should be implicit from context.
+An approval vote signed with a validator's key. This should be verifiable under the `ValidatorId` corresponding to the
+`ValidatorIndex` of the session, which should be implicit from context.
 
 ```rust
 struct SignedApprovalVote {
@@ -65,9 +68,11 @@ struct SignedApprovalVote {
 
 ## `IndirectSignedApprovalVote`
 
-A signed approval vote which references the candidate indirectly via the block. If there exists a look-up to the candidate hash from the block hash and candidate index, then this can be transformed into a `SignedApprovalVote`.
+A signed approval vote which references the candidate indirectly via the block. If there exists a look-up to the
+candidate hash from the block hash and candidate index, then this can be transformed into a `SignedApprovalVote`.
 
-Although this vote references the candidate by a specific block hash and candidate index, the signature is computed on the actual `SignedApprovalVote` payload.
+Although this vote references the candidate by a specific block hash and candidate index, the signature is computed on
+the actual `SignedApprovalVote` payload.
 
 ```rust
 struct IndirectSignedApprovalVote {
@@ -82,7 +87,9 @@ struct IndirectSignedApprovalVote {
 
 ## `CheckedAssignmentCert`
 
-An assignment cert which has checked both the VRF and the validity of the implied assignment according to the selection criteria rules of the protocol. This type should be declared in such a way as to be instantiatable only when the checks have actually been done. Fields should be accessible via getters, not direct struct access.
+An assignment cert which has checked both the VRF and the validity of the implied assignment according to the selection
+criteria rules of the protocol. This type should be declared in such a way as to be instantiatable only when the checks
+have actually been done. Fields should be accessible via getters, not direct struct access.
 
 ```rust
 struct CheckedAssignmentCert {
diff --git a/polkadot/roadmap/implementers-guide/src/types/availability.md b/polkadot/roadmap/implementers-guide/src/types/availability.md
index e2b90e86f43fe6ce4d8e679866d7f6e7ce002865..a04b896c12816795b27850810d536a44dc3e16eb 100644
--- a/polkadot/roadmap/implementers-guide/src/types/availability.md
+++ b/polkadot/roadmap/implementers-guide/src/types/availability.md
@@ -1,13 +1,12 @@
 # Availability
 
-One of the key roles of validators is to ensure availability of all data necessary to validate
-candidates for the duration of a challenge period. This is done via an erasure-coding of the data to keep available.
+One of the key roles of validators is to ensure availability of all data necessary to validate candidates for the
+duration of a challenge period. This is done via an erasure-coding of the data to keep available.
 
 ## Signed Availability Bitfield
 
 A bitfield [signed](backing.md#signed-wrapper) by a particular validator about the availability of pending candidates.
 
-
 ```rust
 type SignedAvailabilityBitfield = Signed<Bitvec>;
 
@@ -16,26 +15,30 @@ struct Bitfields(Vec<(SignedAvailabilityBitfield)>), // bitfields sorted by vali
 
 ### Semantics
 
-A `SignedAvailabilityBitfield` represents the view from a particular validator's perspective. Each bit in the bitfield corresponds to a single [availability core](../runtime-api/availability-cores.md). A `1` bit indicates that the validator believes the following statements to be true for a core:
+A `SignedAvailabilityBitfield` represents the view from a particular validator's perspective. Each bit in the bitfield
+corresponds to a single [availability core](../runtime-api/availability-cores.md). A `1` bit indicates that the
+validator believes the following statements to be true for a core:
 
 - the availability core is occupied
-- there exists a [`CommittedCandidateReceipt`](candidate.html#committed-candidate-receipt) corresponding to that core. In other words, that para has a block in progress.
+- there exists a [`CommittedCandidateReceipt`](candidate.html#committed-candidate-receipt) corresponding to that core.
+  In other words, that para has a block in progress.
 - the validator's [Availability Store](../node/utility/availability-store.md) contains a chunk of that parablock's PoV.
 
 In other words, it is the transpose of [`OccupiedCore::availability`](../runtime-api/availability-cores.md).
 
 ## Proof-of-Validity
 
-Often referred to as PoV, this is a type-safe wrapper around bytes (`Vec<u8>`) when referring to data that acts as a stateless-client proof of validity of a candidate, when used as input to the validation function of the para.
+Often referred to as PoV, this is a type-safe wrapper around bytes (`Vec<u8>`) when referring to data that acts as a
+stateless-client proof of validity of a candidate, when used as input to the validation function of the para.
 
 ```rust
 struct PoV(Vec<u8>);
 ```
 
-
 ## Available Data
 
-This is the data we want to keep available for each [candidate](candidate.md) included in the relay chain. This is the PoV of the block, as well as the [`PersistedValidationData`](candidate.md#persistedvalidationdata)
+This is the data we want to keep available for each [candidate](candidate.md) included in the relay chain. This is the
+PoV of the block, as well as the [`PersistedValidationData`](candidate.md#persistedvalidationdata)
 
 ```rust
 struct AvailableData {
@@ -50,7 +53,10 @@ struct AvailableData {
 
 ## Erasure Chunk
 
-The [`AvailableData`](#availabledata) is split up into an erasure-coding as part of the availability process. Each validator gets a chunk. This describes one of those chunks, along with its proof against a merkle root hash, which should be apparent from context, and is the `erasure_root` field of a [`CandidateDescriptor`](candidate.md#candidatedescriptor).
+The [`AvailableData`](#availabledata) is split up into an erasure-coding as part of the availability process. Each
+validator gets a chunk. This describes one of those chunks, along with its proof against a merkle root hash, which
+should be apparent from context, and is the `erasure_root` field of a
+[`CandidateDescriptor`](candidate.md#candidatedescriptor).
 
 
 ```rust
diff --git a/polkadot/roadmap/implementers-guide/src/types/backing.md b/polkadot/roadmap/implementers-guide/src/types/backing.md
index 5fcb3ae161b621b9fd1cc7e91bcc89561980618d..7e43325ec5cdadcbd7d233d00f9a59dd56dd22df 100644
--- a/polkadot/roadmap/implementers-guide/src/types/backing.md
+++ b/polkadot/roadmap/implementers-guide/src/types/backing.md
@@ -1,12 +1,15 @@
 # Backing Types
 
-[Candidates](candidate.md) go through many phases before being considered included in a fork of the relay chain and eventually accepted.
+[Candidates](candidate.md) go through many phases before being considered included in a fork of the relay chain and
+eventually accepted.
 
-These types describe the data used in the backing phase. Some are sent over the wire within subsystems, and some are simply included in the relay-chain block.
+These types describe the data used in the backing phase. Some are sent over the wire within subsystems, and some are
+simply included in the relay-chain block.
 
 ## Validity Attestation
 
-An attestation of validity for a candidate, used as part of a backing. Both the `Seconded` and `Valid` statements are considered attestations of validity. This structure is only useful where the candidate referenced is apparent.
+An attestation of validity for a candidate, used as part of a backing. Both the `Seconded` and `Valid` statements are
+considered attestations of validity. This structure is only useful where the candidate referenced is apparent.
 
 ```rust
 enum ValidityAttestation {
@@ -21,7 +24,8 @@ enum ValidityAttestation {
 
 ## Signed Wrapper
 
-There are a few distinct types which we desire to sign, and validate the signatures of. Instead of duplicating this work, we extract a signed wrapper.
+There are a few distinct types which we desire to sign, and validate the signatures of. Instead of duplicating this
+work, we extract a signed wrapper.
 
 ```rust,ignore
 /// A signed type which encapsulates the common desire to sign some data and validate a signature.
@@ -44,13 +48,18 @@ impl<Payload: EncodeAs<RealPayload>, RealPayload: Encode> Signed<Payload, RealPa
 }
 ```
 
-Note the presence of the [`SigningContext`](../types/candidate.md#signing-context) in the signatures of the `sign` and `validate` methods. To ensure cryptographic security, the actual signed payload is always the SCALE encoding of `(payload.into(), signing_context)`. Including the signing context prevents replay attacks.
+Note the presence of the [`SigningContext`](../types/candidate.md#signing-context) in the signatures of the `sign` and
+`validate` methods. To ensure cryptographic security, the actual signed payload is always the SCALE encoding of
+`(payload.into(), signing_context)`. Including the signing context prevents replay attacks.
 
-`EncodeAs` is a helper trait with a blanket impl which ensures that any `T` can `EncodeAs<T>`. Therefore, for the generic case where `RealPayload = Payload`, it changes nothing. However, we  `impl EncodeAs<CompactStatement> for Statement`, which helps efficiency.
+`EncodeAs` is a helper trait with a blanket impl which ensures that any `T` can `EncodeAs<T>`. Therefore, for the
+generic case where `RealPayload = Payload`, it changes nothing. However, we  `impl EncodeAs<CompactStatement> for
+Statement`, which helps efficiency.
 
 ## Statement Type
 
-The [Candidate Backing subsystem](../node/backing/candidate-backing.md) issues and signs these after candidate validation.
+The [Candidate Backing subsystem](../node/backing/candidate-backing.md) issues and signs these after candidate
+validation.
 
 ```rust
 /// A statement about the validity of a parachain candidate.
@@ -94,11 +103,13 @@ pub type SignedFullStatement = Signed<Statement, CompactStatement>;
 pub type SignedStatement = Signed<CompactStatement>;
 ```
 
-Munging the signed `Statement` into a `CompactStatement` before signing allows the candidate receipt itself to be omitted when checking a signature on a `Seconded` statement.
+Munging the signed `Statement` into a `CompactStatement` before signing allows the candidate receipt itself to be
+omitted when checking a signature on a `Seconded` statement.
 
 ## Backed Candidate
 
-An [`CommittedCandidateReceipt`](candidate.md#committed-candidate-receipt) along with all data necessary to prove its backing. This is submitted to the relay-chain to process and move along the candidate to the pending-availability stage.
+An [`CommittedCandidateReceipt`](candidate.md#committed-candidate-receipt) along with all data necessary to prove its
+backing. This is submitted to the relay-chain to process and move along the candidate to the pending-availability stage.
 
 ```rust
 struct BackedCandidate {
diff --git a/polkadot/roadmap/implementers-guide/src/types/candidate.md b/polkadot/roadmap/implementers-guide/src/types/candidate.md
index a37f98054c5e5a8430c5d2f3509b2efa3eb5988e..00176229e5a4356a9f88ae91c16eb46617b47216 100644
--- a/polkadot/roadmap/implementers-guide/src/types/candidate.md
+++ b/polkadot/roadmap/implementers-guide/src/types/candidate.md
@@ -1,15 +1,18 @@
 # Candidate Types
 
-Para candidates are some of the most common types, both within the runtime and on the Node-side.
-Candidates are the fundamental datatype for advancing parachains, encapsulating the collator's signature, the context of the parablock, the commitments to the output, and a commitment to the data which proves it valid.
+Para candidates are some of the most common types, both within the runtime and on the Node-side. Candidates are the
+fundamental datatype for advancing parachains, encapsulating the collator's signature, the context of the parablock, the
+commitments to the output, and a commitment to the data which proves it valid.
 
-In a way, this entire guide is about these candidates: how they are scheduled, constructed, backed, included, and challenged.
+In a way, this entire guide is about these candidates: how they are scheduled, constructed, backed, included, and
+challenged.
 
 This section will describe the base candidate type, its components, and variants that contain extra data.
 
 ## Para Id
 
-A unique 32-bit identifier referring to a specific para (chain or thread). The relay-chain runtime guarantees that `ParaId`s are unique for the duration of any session, but recycling and reuse over a longer period of time is permitted.
+A unique 32-bit identifier referring to a specific para (chain or thread). The relay-chain runtime guarantees that
+`ParaId`s are unique for the duration of any session, but recycling and reuse over a longer period of time is permitted.
 
 ```rust
 struct ParaId(u32);
@@ -17,9 +20,12 @@ struct ParaId(u32);
 
 ## Candidate Receipt
 
-Much info in a [`FullCandidateReceipt`](#full-candidate-receipt) is duplicated from the relay-chain state. When the corresponding relay-chain state is considered widely available, the Candidate Receipt should be favored over the `FullCandidateReceipt`.
+Much info in a [`FullCandidateReceipt`](#full-candidate-receipt) is duplicated from the relay-chain state. When the
+corresponding relay-chain state is considered widely available, the Candidate Receipt should be favored over the
+`FullCandidateReceipt`.
 
-Examples of situations where the state is readily available includes within the scope of work done by subsystems working on a given relay-parent, or within the logic of the runtime importing a backed candidate.
+Examples of situations where the state is readily available includes within the scope of work done by subsystems working
+on a given relay-parent, or within the logic of the runtime importing a backed candidate.
 
 ```rust
 /// A candidate-receipt.
@@ -33,9 +39,13 @@ struct CandidateReceipt {
 
 ## Full Candidate Receipt
 
-This is the full receipt type. The `PersistedValidationData` are technically redundant with the `inner.relay_parent`, which uniquely describes the block in the blockchain from whose state these values are derived. The [`CandidateReceipt`](#candidate-receipt) variant is often used instead for this reason.
+This is the full receipt type. The `PersistedValidationData` are technically redundant with the `inner.relay_parent`,
+which uniquely describes the block in the blockchain from whose state these values are derived. The
+[`CandidateReceipt`](#candidate-receipt) variant is often used instead for this reason.
 
-However, the Full Candidate Receipt type is useful as a means of avoiding the implicit dependency on availability of old blockchain state. In situations such as availability and approval, having the full description of the candidate within a self-contained struct is convenient.
+However, the Full Candidate Receipt type is useful as a means of avoiding the implicit dependency on availability of old
+blockchain state. In situations such as availability and approval, having the full description of the candidate within a
+self-contained struct is convenient.
 
 ```rust
 /// All data pertaining to the execution of a para candidate.
@@ -47,9 +57,13 @@ struct FullCandidateReceipt {
 
 ## Committed Candidate Receipt
 
-This is a variant of the candidate receipt which includes the commitments of the candidate receipt alongside the descriptor. This should be favored over the [`Candidate Receipt`](#candidate-receipt) in situations where the candidate is not going to be executed but the actual data committed to is important. This is often the case in the backing phase.
+This is a variant of the candidate receipt which includes the commitments of the candidate receipt alongside the
+descriptor. This should be favored over the [`Candidate Receipt`](#candidate-receipt) in situations where the candidate
+is not going to be executed but the actual data committed to is important. This is often the case in the backing phase.
 
-The hash of the committed candidate receipt will be the same as the corresponding [`Candidate Receipt`](#candidate-receipt), because it is computed by first hashing the encoding of the commitments to form a plain [`Candidate Receipt`](#candidate-receipt).
+The hash of the committed candidate receipt will be the same as the corresponding [`Candidate
+Receipt`](#candidate-receipt), because it is computed by first hashing the encoding of the commitments to form a plain
+[`Candidate Receipt`](#candidate-receipt).
 
 ```rust
 /// A candidate-receipt with commitments directly included.
@@ -110,15 +124,24 @@ pub struct ValidationParams {
 
 ## `PersistedValidationData`
 
-The validation data provides information about how to create the inputs for validation of a candidate. This information is derived from the chain state and will vary from para to para, although some of the fields may be the same for every para.
+The validation data provides information about how to create the inputs for validation of a candidate. This information
+is derived from the chain state and will vary from para to para, although some of the fields may be the same for every
+para.
 
-Since this data is used to form inputs to the validation function, it needs to be persisted by the availability system to avoid dependence on availability of the relay-chain state.
+Since this data is used to form inputs to the validation function, it needs to be persisted by the availability system
+to avoid dependence on availability of the relay-chain state.
 
-Furthermore, the validation data acts as a way to authorize the additional data the collator needs to pass to the validation function. For example, the validation function can check whether the incoming messages (e.g. downward messages) were actually sent by using the data provided in the validation data using so called MQC heads.
+Furthermore, the validation data acts as a way to authorize the additional data the collator needs to pass to the
+validation function. For example, the validation function can check whether the incoming messages (e.g. downward
+messages) were actually sent by using the data provided in the validation data using so called MQC heads.
 
-Since the commitments of the validation function are checked by the relay-chain, approval checkers can rely on the invariant that the relay-chain only includes para-blocks for which these checks have already been done. As such, there is no need for the validation data used to inform validators and collators about the checks the relay-chain will perform to be persisted by the availability system.
+Since the commitments of the validation function are checked by the relay-chain, approval checkers can rely on the
+invariant that the relay-chain only includes para-blocks for which these checks have already been done. As such, there
+is no need for the validation data used to inform validators and collators about the checks the relay-chain will perform
+to be persisted by the availability system.
 
-The `PersistedValidationData` should be relatively lightweight primarily because it is constructed during inclusion for each candidate and therefore lies on the critical path of inclusion.
+The `PersistedValidationData` should be relatively lightweight primarily because it is constructed during inclusion for
+each candidate and therefore lies on the critical path of inclusion.
 
 ```rust
 struct PersistedValidationData {
@@ -150,7 +173,8 @@ struct HeadData(Vec<u8>);
 
 ## Candidate Commitments
 
-The execution and validation of parachain candidates produces a number of values which either must be committed to blocks on the relay chain or committed to the state of the relay chain.
+The execution and validation of parachain candidates produces a number of values which either must be committed to
+blocks on the relay chain or committed to the state of the relay chain.
 
 ```rust
 /// Commitments made in a `CandidateReceipt`. Many of these are outputs of validation.
@@ -174,7 +198,9 @@ struct CandidateCommitments {
 
 ## Signing Context
 
-This struct provides context to signatures by combining with various payloads to localize the signature to a particular session index and relay-chain hash. Having these fields included in the signature makes misbehavior attribution much simpler.
+This struct provides context to signatures by combining with various payloads to localize the signature to a particular
+session index and relay-chain hash. Having these fields included in the signature makes misbehavior attribution much
+simpler.
 
 ```rust
 struct SigningContext {
diff --git a/polkadot/roadmap/implementers-guide/src/types/disputes.md b/polkadot/roadmap/implementers-guide/src/types/disputes.md
index 24f152b1308f7a1613958cb210aeeef12901fefe..c49e0fea262510ef2e1585f9aa8433dc02883b50 100644
--- a/polkadot/roadmap/implementers-guide/src/types/disputes.md
+++ b/polkadot/roadmap/implementers-guide/src/types/disputes.md
@@ -28,7 +28,8 @@ enum DisputeStatement {
 
 ## Dispute Statement Kinds
 
-Kinds of dispute statements. Each of these can be combined with a candidate hash, session index, validator public key, and validator signature to reproduce and check the original statement.
+Kinds of dispute statements. Each of these can be combined with a candidate hash, session index, validator public key,
+and validator signature to reproduce and check the original statement.
 
 ```rust
 enum ValidDisputeStatementKind {
diff --git a/polkadot/roadmap/implementers-guide/src/types/network.md b/polkadot/roadmap/implementers-guide/src/types/network.md
index b698ca2075bfe6e40a2098b2beaaa8c29dd60d27..60f5bda28fa9c40ad0e323279979a62dab74fd5e 100644
--- a/polkadot/roadmap/implementers-guide/src/types/network.md
+++ b/polkadot/roadmap/implementers-guide/src/types/network.md
@@ -139,7 +139,8 @@ enum CollationProtocolV1 {
 
 ## Network Bridge Event
 
-These updates are posted from the [Network Bridge Subsystem](../node/utility/network-bridge.md) to other subsystems based on registered listeners.
+These updates are posted from the [Network Bridge Subsystem](../node/utility/network-bridge.md) to other subsystems
+based on registered listeners.
 
 ```rust
 struct NewGossipTopology {
diff --git a/polkadot/roadmap/implementers-guide/src/types/overseer-protocol.md b/polkadot/roadmap/implementers-guide/src/types/overseer-protocol.md
index 3d9037699da6127de0af46a3e67d8b8e531f1f43..fababbff354007c5fcf8f47d6b8e52e69d0879bb 100644
--- a/polkadot/roadmap/implementers-guide/src/types/overseer-protocol.md
+++ b/polkadot/roadmap/implementers-guide/src/types/overseer-protocol.md
@@ -1,6 +1,7 @@
 # Overseer Protocol
 
-This chapter contains message types sent to and from the overseer, and the underlying subsystem message types that are transmitted using these.
+This chapter contains message types sent to and from the overseer, and the underlying subsystem message types that are
+transmitted using these.
 
 ## Overseer Signal
 
@@ -17,7 +18,8 @@ enum OverseerSignal {
 }
 ```
 
-All subsystems have their own message types; all of them need to be able to listen for overseer signals as well. There are currently two proposals for how to handle that with unified communication channels:
+All subsystems have their own message types; all of them need to be able to listen for overseer signals as well. There
+are currently two proposals for how to handle that with unified communication channels:
 
 1. Retaining the `OverseerSignal` definition above, add `enum FromOrchestra<T> {Signal(OverseerSignal), Message(T)}`.
 1. Add a generic varint to `OverseerSignal`: `Message(T)`.
@@ -26,7 +28,8 @@ Either way, there will be some top-level type encapsulating messages from the ov
 
 ## Active Leaves Update
 
-Indicates a change in active leaves. Activated leaves should have jobs, whereas deactivated leaves should lead to winding-down of work based on those leaves.
+Indicates a change in active leaves. Activated leaves should have jobs, whereas deactivated leaves should lead to
+winding-down of work based on those leaves.
 
 ```rust
 enum LeafStatus {
@@ -201,7 +204,8 @@ enum ApprovalDistributionMessage {
 
 Messages received by the availability distribution subsystem.
 
-This is a network protocol that receives messages of type [`AvailabilityDistributionV1Message`][AvailabilityDistributionV1NetworkMessage].
+This is a network protocol that receives messages of type
+[`AvailabilityDistributionV1Message`][AvailabilityDistributionV1NetworkMessage].
 
 ```rust
 enum AvailabilityDistributionMessage {
@@ -293,7 +297,7 @@ pub enum AvailabilityStoreMessage {
 		tx: oneshot::Sender<Result<(), ()>>,
 	},
 
-	/// Computes and checks the erasure root of `AvailableData` before storing all of its chunks in 
+	/// Computes and checks the erasure root of `AvailableData` before storing all of its chunks in
 	/// the AV store.
 	///
 	/// Return `Ok(())` if the store operation succeeded, `Err(StoreAvailableData)` if it failed.
@@ -319,8 +323,8 @@ pub enum StoreAvailableDataError {
 
 ## Bitfield Distribution Message
 
-Messages received by the bitfield distribution subsystem.
-This is a network protocol that receives messages of type [`BitfieldDistributionV1Message`][BitfieldDistributionV1NetworkMessage].
+Messages received by the bitfield distribution subsystem. This is a network protocol that receives messages of type
+[`BitfieldDistributionV1Message`][BitfieldDistributionV1NetworkMessage].
 
 ```rust
 enum BitfieldDistributionMessage {
@@ -354,7 +358,7 @@ enum CandidateBackingMessage {
   /// The PoV is expected to match the `pov_hash` in the descriptor.
   Second(Hash, CandidateReceipt, PoV),
   /// Note a peer validator's statement about a particular candidate. Disagreements about validity must be escalated
-  /// to a broader check by the Disputes Subsystem, though that escalation is deferred until the approval voting 
+  /// to a broader check by the Disputes Subsystem, though that escalation is deferred until the approval voting
   /// stage to guarantee availability. Agreements are simply tallied until a quorum is reached.
   Statement(Statement),
 }
@@ -420,7 +424,8 @@ enum ChainSelectionMessage {
 
 Messages received by the [Collator Protocol subsystem](../node/collators/collator-protocol.md)
 
-This is a network protocol that receives messages of type [`CollatorProtocolV1Message`][CollatorProtocolV1NetworkMessage].
+This is a network protocol that receives messages of type
+[`CollatorProtocolV1Message`][CollatorProtocolV1NetworkMessage].
 
 ```rust
 enum CollatorProtocolMessage {
@@ -452,7 +457,8 @@ enum CollatorProtocolMessage {
 
 Messages received by the [Collation Generation subsystem](../node/collators/collation-generation.md)
 
-This is the core interface by which collators built on top of a Polkadot node submit collations to validators. As such, these messages are not sent by any subsystem but are instead sent from outside of the overseer.
+This is the core interface by which collators built on top of a Polkadot node submit collations to validators. As such,
+these messages are not sent by any subsystem but are instead sent from outside of the overseer.
 
 ```rust
 /// A function provided to the subsystem which it uses to pull new collations.
@@ -503,7 +509,8 @@ enum CollationGenerationMessage {
 
 Messages received by the [Dispute Coordinator subsystem](../node/disputes/dispute-coordinator.md)
 
-This subsystem coordinates participation in disputes, tracks live disputes, and observed statements of validators from subsystems.
+This subsystem coordinates participation in disputes, tracks live disputes, and observed statements of validators from
+subsystems.
 
 ```rust
 enum DisputeCoordinatorMessage {
@@ -572,11 +579,9 @@ pub enum ImportStatementsResult {
 }
 ```
 
-
 ## Dispute Distribution Message
 
-Messages received by the [Dispute Distribution
-subsystem](../node/disputes/dispute-distribution.md). This subsystem is
+Messages received by the [Dispute Distribution subsystem](../node/disputes/dispute-distribution.md). This subsystem is
 responsible of distributing explicit dispute statements.
 
 ```rust
@@ -602,8 +607,8 @@ enum DisputeDistributionMessage {
 
 ## Network Bridge Message
 
-Messages received by the network bridge. This subsystem is invoked by others to manipulate access
-to the low-level networking code.
+Messages received by the network bridge. This subsystem is invoked by others to manipulate access to the low-level
+networking code.
 
 ```rust
 /// Peer-sets handled by the network bridge.
@@ -778,7 +783,8 @@ enum ProvisionerMessage {
 
 The Runtime API subsystem is responsible for providing an interface to the state of the chain's runtime.
 
-This is fueled by an auxiliary type encapsulating all request types defined in the [Runtime API section](../runtime-api) of the guide.
+This is fueled by an auxiliary type encapsulating all request types defined in the [Runtime API section](../runtime-api)
+of the guide.
 
 ```rust
 enum RuntimeApiRequest {
@@ -835,10 +841,12 @@ enum RuntimeApiMessage {
 
 ## Statement Distribution Message
 
-The Statement Distribution subsystem distributes signed statements and candidates from validators to other validators. It does this by distributing full statements, which embed the candidate receipt, as opposed to compact statements which don't.
-It receives updates from the network bridge and signed statements to share with other validators.
+The Statement Distribution subsystem distributes signed statements and candidates from validators to other validators.
+It does this by distributing full statements, which embed the candidate receipt, as opposed to compact statements which
+don't. It receives updates from the network bridge and signed statements to share with other validators.
 
-This is a network protocol that receives messages of type [`StatementDistributionV1Message`][StatementDistributionV1NetworkMessage].
+This is a network protocol that receives messages of type
+[`StatementDistributionV1Message`][StatementDistributionV1NetworkMessage].
 
 ```rust
 enum StatementDistributionMessage {
@@ -855,7 +863,8 @@ enum StatementDistributionMessage {
 
 ## Validation Request Type
 
-Various modules request that the [Candidate Validation subsystem](../node/utility/candidate-validation.md) validate a block with this message. It returns [`ValidationOutputs`](candidate.md#validationoutputs) for successful validation.
+Various modules request that the [Candidate Validation subsystem](../node/utility/candidate-validation.md) validate a
+block with this message. It returns [`ValidationOutputs`](candidate.md#validationoutputs) for successful validation.
 
 ```rust
 
diff --git a/polkadot/roadmap/implementers-guide/src/whence-parachains.md b/polkadot/roadmap/implementers-guide/src/whence-parachains.md
index 41842e93943b41699a6ddb06ee5589a9c1e713c5..faec46be2c6258eeb105ae5e06cbe8b30017d703 100644
--- a/polkadot/roadmap/implementers-guide/src/whence-parachains.md
+++ b/polkadot/roadmap/implementers-guide/src/whence-parachains.md
@@ -1,29 +1,50 @@
 # Whence Parachains
 
-Parachains are the solution to a problem. As with any solution, it cannot be understood without first understanding the problem. So let's start by going over the issues faced by blockchain technology that led to us beginning to explore the design space for something like parachains.
+Parachains are the solution to a problem. As with any solution, it cannot be understood without first understanding the
+problem. So let's start by going over the issues faced by blockchain technology that led to us beginning to explore the
+design space for something like parachains.
 
 ## Issue 1: Scalability
 
-It became clear a few years ago that the transaction throughput of simple Proof-of-Work (PoW) blockchains such as Bitcoin, Ethereum, and myriad others was simply too low.
+It became clear a few years ago that the transaction throughput of simple Proof-of-Work (PoW) blockchains such as
+Bitcoin, Ethereum, and myriad others was simply too low.
 
 > TODO: what if there were more blockchains, etc.
 
-Proof-of-Stake (PoS) systems can accomplish higher throughput than PoW blockchains. PoS systems are secured by bonded capital as opposed to spent effort - liquidity opportunity cost vs. burning electricity. The way they work is by selecting a set of validators with known economic identity who lock up tokens in exchange for earning the right to "validate" or participate in the consensus process. If they are found to carry out that process wrongly, they will be slashed, meaning some or all of the locked tokens will be burned. This provides a strong disincentive in the direction of misbehavior.
+Proof-of-Stake (PoS) systems can accomplish higher throughput than PoW blockchains. PoS systems are secured by bonded
+capital as opposed to spent effort - liquidity opportunity cost vs. burning electricity. The way they work is by
+selecting a set of validators with known economic identity who lock up tokens in exchange for earning the right to
+"validate" or participate in the consensus process. If they are found to carry out that process wrongly, they will be
+slashed, meaning some or all of the locked tokens will be burned. This provides a strong disincentive in the direction
+of misbehavior.
 
-Since the consensus protocol doesn't revolve around wasting effort, block times and agreement can occur much faster. Solutions to PoW challenges don't have to be found before a block can be authored, so the overhead of authoring a block is reduced to only the costs of creating and distributing the block.
+Since the consensus protocol doesn't revolve around wasting effort, block times and agreement can occur much faster.
+Solutions to PoW challenges don't have to be found before a block can be authored, so the overhead of authoring a block
+is reduced to only the costs of creating and distributing the block.
 
-However, consensus on a PoS chain requires full agreement of 2/3+ of the validator set for everything that occurs at Layer 1: all logic which is carried out as part of the blockchain's state machine. This means that everybody still needs to check everything. Furthermore, validators may have different views of the system based on the information that they receive over an asynchronous network, making agreement on the latest state more difficult.
+However, consensus on a PoS chain requires full agreement of 2/3+ of the validator set for everything that occurs at
+Layer 1: all logic which is carried out as part of the blockchain's state machine. This means that everybody still needs
+to check everything. Furthermore, validators may have different views of the system based on the information that they
+receive over an asynchronous network, making agreement on the latest state more difficult.
 
-Parachains are an example of a **sharded** protocol. Sharding is a concept borrowed from traditional database architecture. Rather than requiring every participant to check every transaction, we require each participant to check some subset of transactions, with enough redundancy baked in that byzantine (arbitrarily malicious) participants can't sneak in invalid transactions - at least not without being detected and getting slashed, with those transactions reverted.
+Parachains are an example of a **sharded** protocol. Sharding is a concept borrowed from traditional database
+architecture. Rather than requiring every participant to check every transaction, we require each participant to check
+some subset of transactions, with enough redundancy baked in that byzantine (arbitrarily malicious) participants can't
+sneak in invalid transactions - at least not without being detected and getting slashed, with those transactions
+reverted.
 
-Sharding and Proof-of-Stake in coordination with each other allow a parachain host to provide full security on many parachains, even without all participants checking all state transitions.
+Sharding and Proof-of-Stake in coordination with each other allow a parachain host to provide full security on many
+parachains, even without all participants checking all state transitions.
 
 > TODO: note about network effects & bridging
 
 ## Issue 2: Flexibility / Specialization
 
-"dumb" VMs don't give you the flexibility. Any engineer knows that being able to specialize on a problem gives them and their users more _leverage_.
+"dumb" VMs don't give you the flexibility. Any engineer knows that being able to specialize on a problem gives them and
+their users more _leverage_.
 
 > TODO: expand on leverage
 
-Having recognized these issues, we set out to find a solution to these problems, which could allow developers to create and deploy purpose-built blockchains unified under a common source of security, with the capability of message-passing between them; a _heterogeneous sharding solution_, which we have come to know as **Parachains**.
+Having recognized these issues, we set out to find a solution to these problems, which could allow developers to create
+and deploy purpose-built blockchains unified under a common source of security, with the capability of message-passing
+between them; a _heterogeneous sharding solution_, which we have come to know as **Parachains**.
diff --git a/polkadot/roadmap/parachains.md b/polkadot/roadmap/parachains.md
index 9d6c014a1c7c48e88c274998f1e7fae0aff904d3..5d6fafffd39a5f908874602a16baeea046966ef1 100644
--- a/polkadot/roadmap/parachains.md
+++ b/polkadot/roadmap/parachains.md
@@ -1,17 +1,23 @@
 # Parachains Roadmap
-This is a roadmap for the core technology underlying Parachains - what protocols, APIs, and code paths need to be in place to fully instantiate a self-sufficient and secure parachain. We don't attempt to cover anything on what APIs a parachain toolkit might expose in order to make use of parachain features - only how those features are implemented and the low-level APIs that they expose to the validation function, if any.
+
+This is a roadmap for the core technology underlying Parachains - what protocols, APIs, and code paths need to be in
+place to fully instantiate a self-sufficient and secure parachain. We don't attempt to cover anything on what APIs a
+parachain toolkit might expose in order to make use of parachain features - only how those features are implemented and
+the low-level APIs that they expose to the validation function, if any.
 
 ## Categories
 We will use these categories to delineate features:
 
-*Runtime*: Runtime code for the Relay chain specifying consensus-critical state and updates that all full nodes must maintain or perform.
+*Runtime*: Runtime code for the Relay chain specifying consensus-critical state and updates that all full nodes must
+maintain or perform.
 
 *Networking*: Protocols for nodes to speak to each other and transmit information across the network.
 
-*Node*: State or updates that must be maintained or performed by some or all nodes off-chain. Often interfaces with networking components, and references runtime state.
+*Node*: State or updates that must be maintained or performed by some or all nodes off-chain. Often interfaces with
+networking components, and references runtime state.
 
 ---
-## Sub-projects and features:
+## Sub-projects and features
 This section contains various sub-projects and the features that make them up.
 
 ### Infrastructure/API
@@ -20,7 +26,8 @@ This section contains various sub-projects and the features that make them up.
 
 Category: Networking
 
-Validators assigned to a parachain need a way to discover and connect to collators in order to get fresh parachain blocks to validate.
+Validators assigned to a parachain need a way to discover and connect to collators in order to get fresh parachain
+blocks to validate.
 
 Collators need to discover and connect to validators in order to submit parachain blocks.
 
@@ -30,7 +37,9 @@ Some connections are long-lived, some are just for a single request.
 
 #### Custom libp2p sub-protocols
 
-Polkadot parachains involve many distinct networking protocols. Ideally, we'd be able to spawn each of these as a separate futures task which communicates via channel with other protocols or node code as necessary. This requires changes in Substrate and libp2p.
+Polkadot parachains involve many distinct networking protocols. Ideally, we'd be able to spawn each of these as a
+separate futures task which communicates via channel with other protocols or node code as necessary. This requires
+changes in Substrate and libp2p.
 
 ---
 ### Assignment
@@ -39,21 +48,26 @@ Polkadot parachains involve many distinct networking protocols. Ideally, we'd be
 
 Category: Runtime
 
-Auctioning and registration of parachains. This is already implemented and follows the [Parachain Allocation — Research at W3F](https://research.web3.foundation/en/latest/polkadot/Parachain-Allocation.html) document.
+Auctioning and registration of parachains. This is already implemented and follows the [Parachain Allocation — Research
+at W3F](https://research.web3.foundation/en/latest/polkadot/Parachain-Allocation.html) document.
 
 #### *On-demand Blockspace Purchase*
 
 Category: Runtime
 
-The blockspace purchasing system for on-demand parachains consists of an on-chain mechanism for resolving block space purchases by collators and ensuring that they author a block.
+The blockspace purchasing system for on-demand parachains consists of an on-chain mechanism for resolving block space
+purchases by collators and ensuring that they author a block.
 
-The node-side portion of on-demand parachains is for collators to actually purchase blockspace and to configure the conditions in which purchases are made.
+The node-side portion of on-demand parachains is for collators to actually purchase blockspace and to configure the
+conditions in which purchases are made.
 
 #### *Validator Assignment*
 
 Category: Runtime
 
-Assignment of validators to parachains. Validators are only assigned to parachains for a short period of time. Tweakable parameters include length of time assigned to each parachain and length of time in advance that the network is aware of validators' assignments.
+Assignment of validators to parachains. Validators are only assigned to parachains for a short period of time. Tweakable
+parameters include length of time assigned to each parachain and length of time in advance that the network is aware of
+validators' assignments.
 
 ---
 ### Agreement
@@ -62,19 +76,26 @@ Assignment of validators to parachains. Validators are only assigned to parachai
 
 Category: Networking
 
-A black-box networking component for circulating attestation messages (`Candidate`, `Valid`, `Invalid`) between validators of any given parachain to create a quorum on which blocks can be included.
+A black-box networking component for circulating attestation messages (`Candidate`, `Valid`, `Invalid`) between
+validators of any given parachain to create a quorum on which blocks can be included.
 
 #### *Availability Erasure-coding*
 
 Category: Node, Networking
 
-For each potential, considered parachain block, perform an erasure-coding of the PoV and outgoing messages of the block. Call the number of validators on the relay chain for the Relay-chain block this parachain block is being considered for inclusion in `n`. Erasure-code into `n` pieces, where any `f + 1` can recover (`f` being the maximum number of tolerated faulty nodes = ~ `n / 3`). The `i'th` validator stores the `i'th` piece of the coding and provides it to any who ask.
+For each potential, considered parachain block, perform an erasure-coding of the PoV and outgoing messages of the block.
+Call the number of validators on the relay chain for the Relay-chain block this parachain block is being considered for
+inclusion in `n`. Erasure-code into `n` pieces, where any `f + 1` can recover (`f` being the maximum number of tolerated
+faulty nodes = ~ `n / 3`). The `i'th` validator stores the `i'th` piece of the coding and provides it to any who ask.
 
 #### *PoV block fetching*
 
 Category: Networking
 
-A black-box networking component for validators or fishermen on a parachain to obtain the PoV block referenced by hash in an attestation, for the purpose of validating. When fetching "current" PoV blocks (close to the head of the chain, or relating to the block currently being built), this should be fast. When fetching "old" PoV blocks, it should be possible and fall back on recovering from the availability erasure-coding.
+A black-box networking component for validators or fishermen on a parachain to obtain the PoV block referenced by hash
+in an attestation, for the purpose of validating. When fetching "current" PoV blocks (close to the head of the chain, or
+relating to the block currently being built), this should be fast. When fetching "old" PoV blocks, it should be possible
+and fall back on recovering from the availability erasure-coding.
 
 #### *On-demand Blockspace Purchase*
 
@@ -95,58 +116,80 @@ The main event loop of a collator node:
 ---
 ### Cross-chain Messaging
 
-https://hackmd.io/ILoQltEISP697oMYe4HbrA?view
-https://github.com/paritytech/polkadot/issues/597
+https://hackmd.io/ILoQltEISP697oMYe4HbrA?view https://github.com/paritytech/polkadot/issues/597
 
-The biggest sub-project of the parachains roadmap - how messages are sent between parachains. This involves the state-machine ordering of incoming messages, protocols for fetching those messages, and node logic for persisting the messages.
+The biggest sub-project of the parachains roadmap - how messages are sent between parachains. This involves the
+state-machine ordering of incoming messages, protocols for fetching those messages, and node logic for persisting the
+messages.
 
-This is designed around a concept of unidirectional _channels_ between paras, which consist of a sender and receiver. At each relay chain block, each para has an opportunity to send a message on each channel for which it controls the sending half. It will also attempt to process messages on each receiving half of the channel which it controls _in order_: messages sent at block height `b` must be processed before those sent at block height `b+1`. For messages on different channels sent at the same block height, there will be some well-defined order in which they should be processed.
+This is designed around a concept of unidirectional _channels_ between paras, which consist of a sender and receiver. At
+each relay chain block, each para has an opportunity to send a message on each channel for which it controls the sending
+half. It will also attempt to process messages on each receiving half of the channel which it controls _in order_:
+messages sent at block height `b` must be processed before those sent at block height `b+1`. For messages on different
+channels sent at the same block height, there will be some well-defined order in which they should be processed.
 
-This means that a receiving para will have a maximum height differential of `1` in terms of the most recently processed message's send-height across all of the channels it is receiving on. The minimum processed send-height of a receiving para is known as its _watermark_. All messages on all channels sending to this para before or at the watermark have been processed.
+This means that a receiving para will have a maximum height differential of `1` in terms of the most recently processed
+message's send-height across all of the channels it is receiving on. The minimum processed send-height of a receiving
+para is known as its _watermark_. All messages on all channels sending to this para before or at the watermark have been
+processed.
 
 #### *Finalize CandidateReceipt format*
 
 Category: Runtime / Node
 
-The `CandidateReceipt` is the wrapper around a parablock header which is submitted to the runtime. It contains cryptographic commitments to data which is important for validation or interpretation of the parablock, including the hash of the witness data and outgoing message data.
+The `CandidateReceipt` is the wrapper around a parablock header which is submitted to the runtime. It contains
+cryptographic commitments to data which is important for validation or interpretation of the parablock, including the
+hash of the witness data and outgoing message data.
 
-The `CandidateReceipt` format should be finalized in accordance to the XCMP writeups linked above - most importantly, to be altered to hold `bitfield` and `message_root` fields which cryptographically commit to the state of each open channel.
+The `CandidateReceipt` format should be finalized in accordance to the XCMP writeups linked above - most importantly, to
+be altered to hold `bitfield` and `message_root` fields which cryptographically commit to the state of each open
+channel.
 
 #### *Finalize PovBlock format*
 
 Category: Runtime / Node
 
-The `PovBlock` or `Proof-of-Validity` block contains all the data you need to validate a parablock. It will need to contain incoming message queues and potentially outgoing ones as well.
+The `PovBlock` or `Proof-of-Validity` block contains all the data you need to validate a parablock. It will need to
+contain incoming message queues and potentially outgoing ones as well.
 
 #### *CST Update Procedure*
 
 Category: Runtime
 
-Storage definitions and update logic of the Channel State Table (CST) based on the supplied `CandidateReceipt`s in a relay chain block.
+Storage definitions and update logic of the Channel State Table (CST) based on the supplied `CandidateReceipt`s in a
+relay chain block.
 
 #### *CST Entry Proof Generation and Checking*
 
 Category: Node
 
-Means for full nodes of the relay chain to generate proofs of items in the CST and for light clients or pruned nodes to check those proofs.
+Means for full nodes of the relay chain to generate proofs of items in the CST and for light clients or pruned nodes to
+check those proofs.
 
 #### *MQC Storage and Distribution Protocol*
 
 Category: Node
 
-Every channel's state is described by a Message Queue Chain (MQC) which is a hash-chain, where the links are defined by `(M, b, H)`: the message most recently sent, the block height at which the prior message was sent, and the hash of the prior link.
+Every channel's state is described by a Message Queue Chain (MQC) which is a hash-chain, where the links are defined by
+`(M, b, H)`: the message most recently sent, the block height at which the prior message was sent, and the hash of the
+prior link.
 
-It is the responsibility of the full nodes of the _sending_ para to maintain all links of the MQC up to and including the link where `b` is less than the watermark of the _receiving_ para.
+It is the responsibility of the full nodes of the _sending_ para to maintain all links of the MQC up to and including
+the link where `b` is less than the watermark of the _receiving_ para.
 
-Full nodes of the para will be aware of the head of all MQCs for its channels because they are produced by execution of the block. This will take collaboration with the Cumulus team (https://github.com/paritytech/cumulus) on APIs.
+Full nodes of the para will be aware of the head of all MQCs for its channels because they are produced by execution of
+the block. This will take collaboration with the Cumulus team (https://github.com/paritytech/polkadot-sdk) on APIs.
 
-We will need a network where collators of paras can discover and fetch the relevant portion of the MQC incoming from all channels.
+We will need a network where collators of paras can discover and fetch the relevant portion of the MQC incoming from all
+channels.
 
 #### *Channel Registrar and Economics*
 
 Category: Runtime
 
-Runtime logic for paras to open and close channels by putting down a deposit. The amount of channels an on-demand parachain can open will be limited. Channels that are pending close should remain open until the watermark of the recipient has reached the block height of the close request.
+Runtime logic for paras to open and close channels by putting down a deposit. The amount of channels an on-demand
+parachain can open will be limited. Channels that are pending close should remain open until the watermark of the
+recipient has reached the block height of the close request.
 
 ---
 ### Fishing/Slashing
@@ -155,17 +198,29 @@ Runtime logic for paras to open and close channels by putting down a deposit. Th
 
 Category: Runtime
 
-In Polkadot, a bad parachain group can force inclusion of an invalid or unavailable parachain block. It is the job of fishermen to detect those blocks and report them to the runtime. This item is about the report handler
+In Polkadot, a bad parachain group can force inclusion of an invalid or unavailable parachain block. It is the job of
+fishermen to detect those blocks and report them to the runtime. This item is about the report handler
 
-The W3F-research writeup on availability/validity provides a high-level view of the dispute resolution process: [Availability and Validity — Research at W3F](https://research.web3.foundation/en/latest/polkadot/Availability_and_Validity.html)
+The W3F-research writeup on availability/validity provides a high-level view of the dispute resolution process:
+[Availability and Validity — Research at
+W3F](https://research.web3.foundation/en/latest/polkadot/Availability_and_Validity.html)
 
-One of the main behaviors that is unimplemented and needs to be is the _rollback_ that occurs when the dispute resolution process concludes that an error has been made. When we mark a parachain block as having been invalid or unavailable, we need to roll back all parachains to a point from just before this state.  We would also need to roll back relay chain state, because there may have been messages from a parachain to a relay chain that now need to be rolled back. The easiest thing to do would be to side-step that by putting a delay on upwards messages, but this would impact the UX of parachain participation in slot auctions, council votes, etc. considerably. Assuming we can't side-step this, we will have to find a way to roll back selected state of the relay chain.
+One of the main behaviors that is unimplemented and needs to be is the _rollback_ that occurs when the dispute
+resolution process concludes that an error has been made. When we mark a parachain block as having been invalid or
+unavailable, we need to roll back all parachains to a point from just before this state.  We would also need to roll
+back relay chain state, because there may have been messages from a parachain to a relay chain that now need to be
+rolled back. The easiest thing to do would be to side-step that by putting a delay on upwards messages, but this would
+impact the UX of parachain participation in slot auctions, council votes, etc. considerably. Assuming we can't side-step
+this, we will have to find a way to roll back selected state of the relay chain.
 
 #### *Double-vote Slash Handler*
 
 Category: Runtime
 
-In the attestation process, validators may submit only one `Candidate` message for a given relay chain block. If issuing a `Candidate` message on a parachain block, neither a `Valid` or `Invalid` vote cannot be issued on that parachain block, as the `Candidate` message is an implicit validity vote. Otherwise, it is illegal to cast both a `Valid` and `Invalid` vote on a given parachain block.
+In the attestation process, validators may submit only one `Candidate` message for a given relay chain block. If issuing
+a `Candidate` message on a parachain block, neither a `Valid` or `Invalid` vote cannot be issued on that parachain
+block, as the `Candidate` message is an implicit validity vote. Otherwise, it is illegal to cast both a `Valid` and
+`Invalid` vote on a given parachain block.
 
 Runtime handlers that take two conflicting votes as arguments and slash the offender are needed.
 
@@ -173,9 +228,11 @@ Runtime handlers that take two conflicting votes as arguments and slash the offe
 
 Category: Node
 
-This code-path is also taken by validators who self-select based on VRF [Availability and Validity — Research at W3F](https://research.web3.foundation/en/latest/polkadot/Availability_and_Validity.html). Validators and fishermen will select parachain blocks to re-validate. In these steps:
-* Attempt to recover the PoV block, falling back on the erasure-coding. If not available, issue report.
-* Attempt to validate the PoV block. If invalid, issue report.
+This code-path is also taken by validators who self-select based on VRF [Availability and Validity — Research at
+W3F](https://research.web3.foundation/en/latest/polkadot/Availability_and_Validity.html). Validators and fishermen will
+select parachain blocks to re-validate. In these steps:
+- Attempt to recover the PoV block, falling back on the erasure-coding. If not available, issue report.
+- Attempt to validate the PoV block. If invalid, issue report.
 
 #### *Double-vote Fishing*
 
@@ -186,45 +243,50 @@ Nodes that observe a double-vote in the attestation process should submit a repo
 ---
 
 # Phases
-This roadmap is divided up into phases, where each represents another set of deliverables or iteration on a black-box component with respect to the prior phase.
+This roadmap is divided up into phases, where each represents another set of deliverables or iteration on a black-box
+component with respect to the prior phase.
 
 ## Phase 0: MVP
-The very first phase - this is parachains without slashing (full security) or cross-chain messaging. It is primarily a PoC that registration and validation are working correctly.
+The very first phase - this is parachains without slashing (full security) or cross-chain messaging. It is primarily a
+PoC that registration and validation are working correctly.
 
-### Infrastructure/API:
-  - Custom libp2p sub-protocols
-  - Peer Set Management
+### Infrastructure/API
+- Custom libp2p sub-protocols
+- Peer Set Management
 
-### Assignment:
-  - Auctions
-  - On-demand Blockspace purchase
-  - Validator Assignment
+### Assignment
+- Auctions
+- On-demand Blockspace purchase
+- Validator Assignment
 
-### Agreement:
-  - Attestation Circulation (black box: gossip)
-  - Availability Erasure-coding (black box: gossip)
-  - PoV block fetching (black box: gossip)
-  - Collation Loop
+### Agreement
+- Attestation Circulation (black box: gossip)
+- Availability Erasure-coding (black box: gossip)
+- PoV block fetching (black box: gossip)
+- Collation Loop
 
-### Cross-chain Messaging:
-  - Finalize `CandidateReceipt` format
+### Cross-chain Messaging
+- Finalize `CandidateReceipt` format
 
 ## Phase 1: Fishing and Slashing
 
-This phase marks advancement in the security of parachains. Once completed, parachains are a full-fledged cryptoeconomically secure rollup primitive. This phase also includes implementation work on XCMP, but does not enable it fully.
+This phase marks advancement in the security of parachains. Once completed, parachains are a full-fledged
+cryptoeconomically secure rollup primitive. This phase also includes implementation work on XCMP, but does not enable it
+fully.
 
 ### Agreement
-  - Availability Erasure-coding (black box: targeted distribution)
-  - PoV block fetching (black box: targeted distribution and fetching)
+- Availability Erasure-coding (black box: targeted distribution)
+- PoV block fetching (black box: targeted distribution and fetching)
 
 ### Fishing/Slashing
-  - Validity/Availability Report Handler
-  - Double-vote Slash Handler
-  - Validity/Availability Fishing
-  - Double-vote Fishing
 
-### Cross-chain Messaging:
-  - Finalize `PoVBlock` format.
+- Validity/Availability Report Handler
+- Double-vote Slash Handler
+- Validity/Availability Fishing
+- Double-vote Fishing
+
+### Cross-chain Messaging
+- Finalize `PoVBlock` format.
 
 ## Phase 2: Messaging
 
diff --git a/polkadot/rpc/Cargo.toml b/polkadot/rpc/Cargo.toml
index 4de538a8508771959d79abd50f78ef713e877023..b5f155b5a658fe25aada71fdc454966050c519f1 100644
--- a/polkadot/rpc/Cargo.toml
+++ b/polkadot/rpc/Cargo.toml
@@ -1,6 +1,6 @@
 [package]
 name = "polkadot-rpc"
-version.workspace = true
+version = "1.0.0"
 authors.workspace = true
 edition.workspace = true
 license.workspace = true
diff --git a/polkadot/runtime/common/Cargo.toml b/polkadot/runtime/common/Cargo.toml
index 72b07765e5e1084a15ca5bbddffb33bd94cf06e3..2d1aad6a575e7bda03220e433b728192e7ddeba6 100644
--- a/polkadot/runtime/common/Cargo.toml
+++ b/polkadot/runtime/common/Cargo.toml
@@ -1,6 +1,6 @@
 [package]
 name = "polkadot-runtime-common"
-version.workspace = true
+version = "1.0.0"
 authors.workspace = true
 edition.workspace = true
 license.workspace = true
@@ -12,7 +12,7 @@ parity-scale-codec = { version = "3.6.1", default-features = false, features = [
 log = { version = "0.4.17", default-features = false }
 rustc-hex = { version = "2.1.0", default-features = false }
 scale-info = { version = "2.5.0", default-features = false, features = ["derive"] }
-serde = { version = "1.0.163", default-features = false, features = ["alloc"] }
+serde = { version = "1.0.188", default-features = false, features = ["alloc"] }
 serde_derive = { version = "1.0.117" }
 static_assertions = "1.1.0"
 
@@ -38,6 +38,7 @@ pallet-timestamp = { path = "../../../substrate/frame/timestamp", default-featur
 pallet-vesting = { path = "../../../substrate/frame/vesting", default-features = false }
 pallet-transaction-payment = { path = "../../../substrate/frame/transaction-payment", default-features = false }
 pallet-treasury = { path = "../../../substrate/frame/treasury", default-features = false }
+pallet-asset-rate = { path = "../../../substrate/frame/asset-rate", default-features = false }
 pallet-election-provider-multi-phase = { path = "../../../substrate/frame/election-provider-multi-phase", default-features = false }
 frame-election-provider-support = { path = "../../../substrate/frame/election-provider-support", default-features = false }
 
@@ -49,7 +50,8 @@ libsecp256k1 = { version = "0.7.0", default-features = false }
 runtime-parachains = { package = "polkadot-runtime-parachains", path = "../parachains", default-features = false }
 
 slot-range-helper = { path = "slot_range_helper", default-features = false }
-xcm = { path = "../../xcm", default-features = false }
+xcm = { package = "staging-xcm", path = "../../xcm", default-features = false }
+xcm-builder = { package = "staging-xcm-builder", path = "../../xcm/xcm-builder", default-features = false }
 
 [dev-dependencies]
 hex-literal = "0.4.1"
@@ -58,21 +60,23 @@ pallet-babe = { path = "../../../substrate/frame/babe" }
 pallet-treasury = { path = "../../../substrate/frame/treasury" }
 sp-keystore = { path = "../../../substrate/primitives/keystore" }
 sp-keyring = { path = "../../../substrate/primitives/keyring" }
-serde_json = "1.0.96"
+serde_json = "1.0.107"
 libsecp256k1 = "0.7.0"
 test-helpers = { package = "polkadot-primitives-test-helpers", path = "../../primitives/test-helpers" }
 
 [features]
 default = [ "std" ]
-experimental = [ "frame-support/experimental" ]
 no_std = []
 std = [
 	"bitvec/std",
+	"frame-benchmarking?/std",
+	"frame-election-provider-support/std",
 	"frame-support/std",
 	"frame-system/std",
 	"inherents/std",
 	"libsecp256k1/std",
 	"log/std",
+	"pallet-asset-rate/std",
 	"pallet-authorship/std",
 	"pallet-balances/std",
 	"pallet-election-provider-multi-phase/std",
@@ -99,21 +103,41 @@ std = [
 	"sp-session/std",
 	"sp-staking/std",
 	"sp-std/std",
+	"xcm-builder/std",
 	"xcm/std",
 ]
 runtime-benchmarks = [
 	"frame-benchmarking/runtime-benchmarks",
+	"frame-election-provider-support/runtime-benchmarks",
 	"frame-support/runtime-benchmarks",
 	"frame-system/runtime-benchmarks",
 	"libsecp256k1/hmac",
 	"libsecp256k1/static-context",
+	"pallet-asset-rate/runtime-benchmarks",
 	"pallet-babe/runtime-benchmarks",
+	"pallet-balances/runtime-benchmarks",
+	"pallet-election-provider-multi-phase/runtime-benchmarks",
 	"pallet-fast-unstake/runtime-benchmarks",
+	"pallet-staking/runtime-benchmarks",
+	"pallet-timestamp/runtime-benchmarks",
+	"pallet-treasury/runtime-benchmarks",
+	"pallet-vesting/runtime-benchmarks",
+	"primitives/runtime-benchmarks",
 	"runtime-parachains/runtime-benchmarks",
+	"sp-runtime/runtime-benchmarks",
+	"sp-staking/runtime-benchmarks",
+	"xcm-builder/runtime-benchmarks",
 ]
 try-runtime = [
+	"frame-election-provider-support/try-runtime",
+	"frame-support-test/try-runtime",
+	"frame-support/try-runtime",
+	"frame-system/try-runtime",
+	"pallet-asset-rate/try-runtime",
 	"pallet-authorship/try-runtime",
+	"pallet-babe?/try-runtime",
 	"pallet-balances/try-runtime",
+	"pallet-election-provider-multi-phase/try-runtime",
 	"pallet-fast-unstake/try-runtime",
 	"pallet-session/try-runtime",
 	"pallet-staking/try-runtime",
@@ -122,4 +146,5 @@ try-runtime = [
 	"pallet-treasury/try-runtime",
 	"pallet-vesting/try-runtime",
 	"runtime-parachains/try-runtime",
+	"sp-runtime/try-runtime",
 ]
diff --git a/polkadot/runtime/common/slot_range_helper/Cargo.toml b/polkadot/runtime/common/slot_range_helper/Cargo.toml
index 4420ee488ab7d48937fe80910af97c272ee37c1d..f65717519d5e1e715f478e37381e943e20bbdca4 100644
--- a/polkadot/runtime/common/slot_range_helper/Cargo.toml
+++ b/polkadot/runtime/common/slot_range_helper/Cargo.toml
@@ -1,13 +1,13 @@
 [package]
 name = "slot-range-helper"
-version.workspace = true
+version = "1.0.0"
 authors.workspace = true
 edition.workspace = true
 license.workspace = true
 
 [dependencies]
 paste = "1.0"
-enumn = "0.1.8"
+enumn = "0.1.12"
 parity-scale-codec = { version = "3.6.1", default-features = false, features = ["derive"] }
 sp-std = { package = "sp-std", path = "../../../../substrate/primitives/std", default-features = false }
 sp-runtime = { path = "../../../../substrate/primitives/runtime", default-features = false }
diff --git a/polkadot/runtime/common/src/assigned_slots/migration.rs b/polkadot/runtime/common/src/assigned_slots/migration.rs
index 884d67222d281afb1c8c5b302dc6d466af141c8f..0e88b27a1ff8ae7bc1c7fba7fbeb4b057fdaa5fe 100644
--- a/polkadot/runtime/common/src/assigned_slots/migration.rs
+++ b/polkadot/runtime/common/src/assigned_slots/migration.rs
@@ -15,10 +15,7 @@
 // along with Polkadot.  If not, see <http://www.gnu.org/licenses/>.
 
 use super::{Config, MaxPermanentSlots, MaxTemporarySlots, Pallet, LOG_TARGET};
-use frame_support::{
-	dispatch::GetStorageVersion,
-	traits::{Get, OnRuntimeUpgrade},
-};
+use frame_support::traits::{Get, GetStorageVersion, OnRuntimeUpgrade};
 
 #[cfg(feature = "try-runtime")]
 use frame_support::ensure;
@@ -63,11 +60,10 @@ pub mod v1 {
 		}
 	}
 
-	/// [`VersionUncheckedMigrateToV1`] wrapped in a
-	/// [`frame_support::migrations::VersionedRuntimeUpgrade`], ensuring the migration is only
-	/// performed when on-chain version is 0.
-	#[cfg(feature = "experimental")]
-	pub type VersionCheckedMigrateToV1<T> = frame_support::migrations::VersionedRuntimeUpgrade<
+	/// [`MigrateToV1`] wrapped in a
+	/// [`VersionedMigration`](frame_support::migrations::VersionedMigration), ensuring the
+	/// migration is only performed when on-chain version is 0.
+	pub type VersionCheckedMigrateToV1<T> = frame_support::migrations::VersionedMigration<
 		0,
 		1,
 		MigrateToV1<T>,
diff --git a/polkadot/runtime/common/src/assigned_slots/mod.rs b/polkadot/runtime/common/src/assigned_slots/mod.rs
index 3683cfc210fa0dcfc3d7995753639879bf3386f8..cc8ec339c11847b60aaf74e909ab798a6cb45b51 100644
--- a/polkadot/runtime/common/src/assigned_slots/mod.rs
+++ b/polkadot/runtime/common/src/assigned_slots/mod.rs
@@ -739,6 +739,7 @@ mod tests {
 		type UnsignedPriority = ParasUnsignedPriority;
 		type QueueFootprinter = ();
 		type NextSessionRotation = crate::mock::TestNextSessionRotation;
+		type OnNewHead = ();
 	}
 
 	impl parachains_shared::Config for Test {}
diff --git a/polkadot/runtime/common/src/auctions.rs b/polkadot/runtime/common/src/auctions.rs
index 9c2bb04b9c8ea6f5917738583887b108e0847de5..e35303912fa1dca33d175646dfe75ace3f719d19 100644
--- a/polkadot/runtime/common/src/auctions.rs
+++ b/polkadot/runtime/common/src/auctions.rs
@@ -677,9 +677,7 @@ mod tests {
 	use crate::{auctions, mock::TestRegistrar};
 	use ::test_helpers::{dummy_hash, dummy_head_data, dummy_validation_code};
 	use frame_support::{
-		assert_noop, assert_ok, assert_storage_noop,
-		dispatch::DispatchError::BadOrigin,
-		ord_parameter_types, parameter_types,
+		assert_noop, assert_ok, assert_storage_noop, ord_parameter_types, parameter_types,
 		traits::{ConstU32, EitherOfDiverse, OnFinalize, OnInitialize},
 	};
 	use frame_system::{EnsureRoot, EnsureSignedBy};
@@ -689,6 +687,7 @@ mod tests {
 	use sp_runtime::{
 		traits::{BlakeTwo256, IdentityLookup},
 		BuildStorage,
+		DispatchError::BadOrigin,
 	};
 	use std::{cell::RefCell, collections::BTreeMap};
 
diff --git a/polkadot/runtime/common/src/claims.rs b/polkadot/runtime/common/src/claims.rs
index 9cc06b2bede29808e984230d4c2355073eacaebb..0c736a632842336e30d12381697e4d638a65d74a 100644
--- a/polkadot/runtime/common/src/claims.rs
+++ b/polkadot/runtime/common/src/claims.rs
@@ -711,7 +711,7 @@ mod tests {
 	use claims::Call as ClaimsCall;
 	use frame_support::{
 		assert_err, assert_noop, assert_ok,
-		dispatch::{DispatchError::BadOrigin, GetDispatchInfo, Pays},
+		dispatch::{GetDispatchInfo, Pays},
 		ord_parameter_types, parameter_types,
 		traits::{ConstU32, ExistenceRequirement, WithdrawReasons},
 	};
@@ -719,7 +719,9 @@ mod tests {
 	use sp_runtime::{
 		traits::{BlakeTwo256, Identity, IdentityLookup},
 		transaction_validity::TransactionLongevity,
-		BuildStorage, TokenError,
+		BuildStorage,
+		DispatchError::BadOrigin,
+		TokenError,
 	};
 
 	type Block = frame_system::mocking::MockBlock<Test>;
@@ -1470,7 +1472,7 @@ mod benchmarking {
 	use super::*;
 	use crate::claims::Call;
 	use frame_benchmarking::{account, benchmarks};
-	use frame_support::dispatch::UnfilteredDispatchable;
+	use frame_support::traits::UnfilteredDispatchable;
 	use frame_system::RawOrigin;
 	use secp_utils::*;
 	use sp_runtime::{traits::ValidateUnsigned, DispatchResult};
diff --git a/polkadot/runtime/common/src/crowdloan/migration.rs b/polkadot/runtime/common/src/crowdloan/migration.rs
index 03c4ab6c31193478b5c0cc9cb45b9f3437d8254c..5133c14ada9276a56ae91f38e8a67b4846979866 100644
--- a/polkadot/runtime/common/src/crowdloan/migration.rs
+++ b/polkadot/runtime/common/src/crowdloan/migration.rs
@@ -16,9 +16,8 @@
 
 use super::*;
 use frame_support::{
-	dispatch::GetStorageVersion,
 	storage_alias,
-	traits::{OnRuntimeUpgrade, StorageVersion},
+	traits::{GetStorageVersion, OnRuntimeUpgrade, StorageVersion},
 	Twox64Concat,
 };
 
diff --git a/polkadot/runtime/common/src/crowdloan/mod.rs b/polkadot/runtime/common/src/crowdloan/mod.rs
index 0303808e074775a5dd9309291d129d526bcb2f58..5a2939145925c453f9c86b9c6e5f7c9f71de9757 100644
--- a/polkadot/runtime/common/src/crowdloan/mod.rs
+++ b/polkadot/runtime/common/src/crowdloan/mod.rs
@@ -441,8 +441,6 @@ pub mod pallet {
 			);
 
 			NextFundIndex::<T>::put(new_fund_index);
-			// Add a lock to the para so that the configuration cannot be changed.
-			T::Registrar::apply_lock(index);
 
 			Self::deposit_event(Event::<T>::Created { para_id: index });
 			Ok(())
diff --git a/polkadot/runtime/common/src/elections.rs b/polkadot/runtime/common/src/elections.rs
index 5fd3971180f6a82c50ba2b9797a4fcf1334e2b7f..340e5c6e4acf69fa0d433d975a05c6f72117130a 100644
--- a/polkadot/runtime/common/src/elections.rs
+++ b/polkadot/runtime/common/src/elections.rs
@@ -18,7 +18,8 @@
 
 /// Implements the weight types for the elections module and a specific
 /// runtime.
-/// This macro should not be called directly; use [`impl_runtime_weights`] instead.
+/// This macro should not be called directly; use
+/// [`impl_runtime_weights`](crate::impl_runtime_weights!) instead.
 #[macro_export]
 macro_rules! impl_elections_weights {
 	($runtime:ident) => {
diff --git a/polkadot/runtime/common/src/impls.rs b/polkadot/runtime/common/src/impls.rs
index 0d0dee2e9ad9187123d3828c71c7f5d208880f7d..590593745ed040652c79e5aab86877862aeff0e4 100644
--- a/polkadot/runtime/common/src/impls.rs
+++ b/polkadot/runtime/common/src/impls.rs
@@ -18,8 +18,10 @@
 
 use crate::NegativeImbalance;
 use frame_support::traits::{Currency, Imbalance, OnUnbalanced};
+use parity_scale_codec::{Decode, Encode, MaxEncodedLen};
 use primitives::Balance;
-use sp_runtime::Perquintill;
+use sp_runtime::{traits::TryConvert, Perquintill, RuntimeDebug};
+use xcm::VersionedMultiLocation;
 
 /// Logic for the author to get a portion of fees.
 pub struct ToAuthor<R>(sp_std::marker::PhantomData<R>);
@@ -98,13 +100,104 @@ pub fn era_payout(
 	(staking_payout, rest)
 }
 
+/// Versioned locatable asset type which contains both an XCM `location` and `asset_id` to identify
+/// an asset which exists on some chain.
+#[derive(
+	Encode, Decode, Eq, PartialEq, Clone, RuntimeDebug, scale_info::TypeInfo, MaxEncodedLen,
+)]
+pub enum VersionedLocatableAsset {
+	#[codec(index = 3)]
+	V3 {
+		/// The (relative) location in which the asset ID is meaningful.
+		location: xcm::v3::MultiLocation,
+		/// The asset's ID.
+		asset_id: xcm::v3::AssetId,
+	},
+}
+
+/// Converts the [`VersionedLocatableAsset`] to the [`xcm_builder::LocatableAssetId`].
+pub struct LocatableAssetConverter;
+impl TryConvert<VersionedLocatableAsset, xcm_builder::LocatableAssetId>
+	for LocatableAssetConverter
+{
+	fn try_convert(
+		asset: VersionedLocatableAsset,
+	) -> Result<xcm_builder::LocatableAssetId, VersionedLocatableAsset> {
+		match asset {
+			VersionedLocatableAsset::V3 { location, asset_id } =>
+				Ok(xcm_builder::LocatableAssetId { asset_id, location }),
+		}
+	}
+}
+
+/// Converts the [`VersionedMultiLocation`] to the [`xcm::latest::MultiLocation`].
+pub struct VersionedMultiLocationConverter;
+impl TryConvert<&VersionedMultiLocation, xcm::latest::MultiLocation>
+	for VersionedMultiLocationConverter
+{
+	fn try_convert(
+		location: &VersionedMultiLocation,
+	) -> Result<xcm::latest::MultiLocation, &VersionedMultiLocation> {
+		let latest = match location.clone() {
+			VersionedMultiLocation::V2(l) => l.try_into().map_err(|_| location)?,
+			VersionedMultiLocation::V3(l) => l,
+		};
+		Ok(latest)
+	}
+}
+
+#[cfg(feature = "runtime-benchmarks")]
+pub mod benchmarks {
+	use super::VersionedLocatableAsset;
+	use pallet_asset_rate::AssetKindFactory;
+	use pallet_treasury::ArgumentsFactory as TreasuryArgumentsFactory;
+	use xcm::prelude::*;
+
+	/// Provides a factory method for the [`VersionedLocatableAsset`].
+	/// The location of the asset is determined as a Parachain with an ID equal to the passed seed.
+	pub struct AssetRateArguments;
+	impl AssetKindFactory<VersionedLocatableAsset> for AssetRateArguments {
+		fn create_asset_kind(seed: u32) -> VersionedLocatableAsset {
+			VersionedLocatableAsset::V3 {
+				location: xcm::v3::MultiLocation::new(0, X1(Parachain(seed))),
+				asset_id: xcm::v3::MultiLocation::new(
+					0,
+					X2(PalletInstance(seed.try_into().unwrap()), GeneralIndex(seed.into())),
+				)
+				.into(),
+			}
+		}
+	}
+
+	/// Provide factory methods for the [`VersionedLocatableAsset`] and the `Beneficiary` of the
+	/// [`VersionedMultiLocation`]. The location of the asset is determined as a Parachain with an
+	/// ID equal to the passed seed.
+	pub struct TreasuryArguments;
+	impl TreasuryArgumentsFactory<VersionedLocatableAsset, VersionedMultiLocation>
+		for TreasuryArguments
+	{
+		fn create_asset_kind(seed: u32) -> VersionedLocatableAsset {
+			AssetRateArguments::create_asset_kind(seed)
+		}
+		fn create_beneficiary(seed: [u8; 32]) -> VersionedMultiLocation {
+			VersionedMultiLocation::V3(xcm::v3::MultiLocation::new(
+				0,
+				X1(AccountId32 { network: None, id: seed }),
+			))
+		}
+	}
+}
+
 #[cfg(test)]
 mod tests {
 	use super::*;
 	use frame_support::{
 		dispatch::DispatchClass,
 		parameter_types,
-		traits::{ConstU32, FindAuthor},
+		traits::{
+			tokens::{PayFromAccount, UnityAssetBalanceConversion},
+			ConstU32, FindAuthor,
+		},
 		weights::Weight,
 		PalletId,
 	};
@@ -189,6 +282,7 @@ mod tests {
 	parameter_types! {
 		pub const TreasuryPalletId: PalletId = PalletId(*b"py/trsry");
 		pub const MaxApprovals: u32 = 100;
+		pub TreasuryAccount: AccountId = Treasury::account_id();
 	}
 
 	impl pallet_treasury::Config for Test {
@@ -208,6 +302,14 @@ mod tests {
 		type MaxApprovals = MaxApprovals;
 		type WeightInfo = ();
 		type SpendOrigin = frame_support::traits::NeverEnsureOrigin<u64>;
+		type AssetKind = ();
+		type Beneficiary = Self::AccountId;
+		type BeneficiaryLookup = IdentityLookup<Self::AccountId>;
+		type Paymaster = PayFromAccount<Balances, TreasuryAccount>;
+		type BalanceConverter = UnityAssetBalanceConversion;
+		type PayoutPeriod = ConstU64<0>;
+		#[cfg(feature = "runtime-benchmarks")]
+		type BenchmarkHelper = ();
 	}
 
 	pub struct OneAuthor;
diff --git a/polkadot/runtime/common/src/integration_tests.rs b/polkadot/runtime/common/src/integration_tests.rs
index f78347dedd8caadc209001bfa8894d8fa2f900f6..f14db68267d5b550553bd6f48819890adf011c48 100644
--- a/polkadot/runtime/common/src/integration_tests.rs
+++ b/polkadot/runtime/common/src/integration_tests.rs
@@ -204,6 +204,7 @@ impl paras::Config for Test {
 	type UnsignedPriority = ParasUnsignedPriority;
 	type QueueFootprinter = ();
 	type NextSessionRotation = crate::mock::TestNextSessionRotation;
+	type OnNewHead = ();
 }
 
 parameter_types! {
diff --git a/polkadot/runtime/common/src/lib.rs b/polkadot/runtime/common/src/lib.rs
index 61968e48832c24edde0fb96ee02fc6044400cae5..46a9f7d12cd4149839547df0f3d98d42f60af9e1 100644
--- a/polkadot/runtime/common/src/lib.rs
+++ b/polkadot/runtime/common/src/lib.rs
@@ -100,7 +100,7 @@ parameter_types! {
 }
 
 /// Parameterized slow adjusting fee updated based on
-/// https://research.web3.foundation/Polkadot/overview/token-economics#2-slow-adjusting-mechanism
+/// <https://research.web3.foundation/Polkadot/overview/token-economics#2-slow-adjusting-mechanism>
 pub type SlowAdjustingFeeUpdate<R> = TargetedFeeAdjustment<
 	R,
 	TargetBlockFullness,
diff --git a/polkadot/runtime/common/src/mock.rs b/polkadot/runtime/common/src/mock.rs
index ed25072e246e0c1acc8ae71335b7409e34e6edb3..c9e3a8c39f12d3424bd3fb47077812661b6202ba 100644
--- a/polkadot/runtime/common/src/mock.rs
+++ b/polkadot/runtime/common/src/mock.rs
@@ -17,16 +17,13 @@
 //! Mocking utilities for testing.
 
 use crate::traits::Registrar;
-use frame_support::{
-	dispatch::{DispatchError, DispatchResult},
-	weights::Weight,
-};
+use frame_support::{dispatch::DispatchResult, weights::Weight};
 use frame_system::pallet_prelude::BlockNumberFor;
 use parity_scale_codec::{Decode, Encode};
 use primitives::{HeadData, Id as ParaId, PvfCheckStatement, SessionIndex, ValidationCode};
 use runtime_parachains::paras;
 use sp_keyring::Sr25519Keyring;
-use sp_runtime::{traits::SaturatedConversion, Permill};
+use sp_runtime::{traits::SaturatedConversion, DispatchError, Permill};
 use std::{cell::RefCell, collections::HashMap};
 
 thread_local! {
diff --git a/polkadot/runtime/common/src/paras_registrar/migration.rs b/polkadot/runtime/common/src/paras_registrar/migration.rs
new file mode 100644
index 0000000000000000000000000000000000000000..b767985489d3622e6da01e689609c8913929e78a
--- /dev/null
+++ b/polkadot/runtime/common/src/paras_registrar/migration.rs
@@ -0,0 +1,70 @@
+// 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/>.
+
+use super::*;
+use frame_support::traits::{Contains, OnRuntimeUpgrade};
+
+#[derive(Encode, Decode)]
+pub struct ParaInfoV1<Account, Balance> {
+	manager: Account,
+	deposit: Balance,
+	locked: bool,
+}
+
+pub struct VersionUncheckedMigrateToV1<T, UnlockParaIds>(
+	sp_std::marker::PhantomData<(T, UnlockParaIds)>,
+);
+impl<T: Config, UnlockParaIds: Contains<ParaId>> OnRuntimeUpgrade
+	for VersionUncheckedMigrateToV1<T, UnlockParaIds>
+{
+	fn on_runtime_upgrade() -> Weight {
+		let mut count = 0u64;
+		Paras::<T>::translate::<ParaInfoV1<T::AccountId, BalanceOf<T>>, _>(|key, v1| {
+			count.saturating_inc();
+			Some(ParaInfo {
+				manager: v1.manager,
+				deposit: v1.deposit,
+				locked: if UnlockParaIds::contains(&key) { None } else { Some(v1.locked) },
+			})
+		});
+
+		log::info!(target: "runtime::registrar", "Upgraded {} storages to version 1", count);
+		T::DbWeight::get().reads_writes(count, count)
+	}
+
+	#[cfg(feature = "try-runtime")]
+	fn pre_upgrade() -> Result<Vec<u8>, sp_runtime::TryRuntimeError> {
+		Ok((Paras::<T>::iter_keys().count() as u32).encode())
+	}
+
+	#[cfg(feature = "try-runtime")]
+	fn post_upgrade(state: Vec<u8>) -> Result<(), sp_runtime::TryRuntimeError> {
+		let old_count = u32::decode(&mut &state[..]).expect("Known good");
+		let new_count = Paras::<T>::iter_values().count() as u32;
+
+		ensure!(old_count == new_count, "Paras count should not change");
+		Ok(())
+	}
+}
+
+pub type VersionCheckedMigrateToV1<T, UnlockParaIds> =
+	frame_support::migrations::VersionedMigration<
+		0,
+		1,
+		VersionUncheckedMigrateToV1<T, UnlockParaIds>,
+		super::Pallet<T>,
+		<T as frame_system::Config>::DbWeight,
+	>;
diff --git a/polkadot/runtime/common/src/paras_registrar.rs b/polkadot/runtime/common/src/paras_registrar/mod.rs
similarity index 97%
rename from polkadot/runtime/common/src/paras_registrar.rs
rename to polkadot/runtime/common/src/paras_registrar/mod.rs
index 3f5a8e1a5f93caca0fe5c243107825eeab068ca2..8b8c6d89d0185c9eb2b1f620f6809890859b37d8 100644
--- a/polkadot/runtime/common/src/paras_registrar.rs
+++ b/polkadot/runtime/common/src/paras_registrar/mod.rs
@@ -17,6 +17,8 @@
 //! Pallet to handle parachain registration and related fund management.
 //! In essence this is a simple wrapper around `paras`.
 
+pub mod migration;
+
 use frame_support::{
 	dispatch::DispatchResult,
 	ensure,
@@ -27,7 +29,7 @@ use frame_system::{self, ensure_root, ensure_signed};
 use primitives::{HeadData, Id as ParaId, ValidationCode, LOWEST_PUBLIC_ID};
 use runtime_parachains::{
 	configuration, ensure_parachain,
-	paras::{self, ParaGenesisArgs},
+	paras::{self, ParaGenesisArgs, SetGoAhead},
 	Origin, ParaLifecycle,
 };
 use sp_std::{prelude::*, result};
@@ -35,7 +37,7 @@ use sp_std::{prelude::*, result};
 use crate::traits::{OnSwap, Registrar};
 pub use pallet::*;
 use parity_scale_codec::{Decode, Encode};
-use runtime_parachains::paras::ParaKind;
+use runtime_parachains::paras::{OnNewHead, ParaKind};
 use scale_info::TypeInfo;
 use sp_runtime::{
 	traits::{CheckedSub, Saturating},
@@ -49,7 +51,15 @@ pub struct ParaInfo<Account, Balance> {
 	/// The amount reserved by the `manager` account for the registration.
 	deposit: Balance,
 	/// Whether the para registration should be locked from being controlled by the manager.
-	locked: bool,
+	/// None means the lock had not been explicitly set, and should be treated as false.
+	locked: Option<bool>,
+}
+
+impl<Account, Balance> ParaInfo<Account, Balance> {
+	/// Returns if the para is locked.
+	pub fn is_locked(&self) -> bool {
+		self.locked.unwrap_or(false)
+	}
 }
 
 type BalanceOf<T> =
@@ -96,8 +106,12 @@ pub mod pallet {
 	use frame_support::pallet_prelude::*;
 	use frame_system::pallet_prelude::*;
 
+	/// The current storage version.
+	const STORAGE_VERSION: StorageVersion = StorageVersion::new(1);
+
 	#[pallet::pallet]
 	#[pallet::without_storage_info]
+	#[pallet::storage_version(STORAGE_VERSION)]
 	pub struct Pallet<T>(_);
 
 	#[pallet::config]
@@ -398,7 +412,7 @@ pub mod pallet {
 			new_code: ValidationCode,
 		) -> DispatchResult {
 			Self::ensure_root_para_or_owner(origin, para)?;
-			runtime_parachains::schedule_code_upgrade::<T>(para, new_code)?;
+			runtime_parachains::schedule_code_upgrade::<T>(para, new_code, SetGoAhead::No)?;
 			Ok(())
 		}
 
@@ -446,12 +460,12 @@ impl<T: Config> Registrar for Pallet<T> {
 
 	// Apply a lock to the parachain.
 	fn apply_lock(id: ParaId) {
-		Paras::<T>::mutate(id, |x| x.as_mut().map(|info| info.locked = true));
+		Paras::<T>::mutate(id, |x| x.as_mut().map(|info| info.locked = Some(true)));
 	}
 
 	// Remove a lock from the parachain.
 	fn remove_lock(id: ParaId) {
-		Paras::<T>::mutate(id, |x| x.as_mut().map(|info| info.locked = false));
+		Paras::<T>::mutate(id, |x| x.as_mut().map(|info| info.locked = Some(false)));
 	}
 
 	// Register a Para ID under control of `manager`.
@@ -481,9 +495,7 @@ impl<T: Config> Registrar for Pallet<T> {
 		);
 		runtime_parachains::schedule_parathread_upgrade::<T>(id)
 			.map_err(|_| Error::<T>::CannotUpgrade)?;
-		// Once a para has upgraded to a parachain, it can no longer be managed by the owner.
-		// Intentionally, the flag stays with the para even after downgrade.
-		Self::apply_lock(id);
+
 		Ok(())
 	}
 
@@ -533,7 +545,7 @@ impl<T: Config> Pallet<T> {
 			.map_err(|e| e.into())
 			.and_then(|who| -> DispatchResult {
 				let para_info = Paras::<T>::get(id).ok_or(Error::<T>::NotRegistered)?;
-				ensure!(!para_info.locked, Error::<T>::ParaLocked);
+				ensure!(!para_info.is_locked(), Error::<T>::ParaLocked);
 				ensure!(para_info.manager == who, Error::<T>::NotOwner);
 				Ok(())
 			})
@@ -566,7 +578,7 @@ impl<T: Config> Pallet<T> {
 
 		let deposit = deposit_override.unwrap_or_else(T::ParaDeposit::get);
 		<T as Config>::Currency::reserve(&who, deposit)?;
-		let info = ParaInfo { manager: who.clone(), deposit, locked: false };
+		let info = ParaInfo { manager: who.clone(), deposit, locked: None };
 
 		Paras::<T>::insert(id, info);
 		Self::deposit_event(Event::<T>::Reserved { para_id: id, who });
@@ -585,7 +597,7 @@ impl<T: Config> Pallet<T> {
 	) -> DispatchResult {
 		let deposited = if let Some(para_data) = Paras::<T>::get(id) {
 			ensure!(para_data.manager == who, Error::<T>::NotOwner);
-			ensure!(!para_data.locked, Error::<T>::ParaLocked);
+			ensure!(!para_data.is_locked(), Error::<T>::ParaLocked);
 			para_data.deposit
 		} else {
 			ensure!(!ensure_reserved, Error::<T>::NotReserved);
@@ -601,7 +613,7 @@ impl<T: Config> Pallet<T> {
 		} else if let Some(rebate) = deposited.checked_sub(&deposit) {
 			<T as Config>::Currency::unreserve(&who, rebate);
 		};
-		let info = ParaInfo { manager: who.clone(), deposit, locked: false };
+		let info = ParaInfo { manager: who.clone(), deposit, locked: None };
 
 		Paras::<T>::insert(id, info);
 		// We check above that para has no lifecycle, so this should not fail.
@@ -665,6 +677,21 @@ impl<T: Config> Pallet<T> {
 	}
 }
 
+impl<T: Config> OnNewHead for Pallet<T> {
+	fn on_new_head(id: ParaId, _head: &HeadData) -> Weight {
+		// mark the parachain locked if the locked value is not already set
+		let mut writes = 0;
+		if let Some(mut info) = Paras::<T>::get(id) {
+			if info.locked.is_none() {
+				info.locked = Some(true);
+				Paras::<T>::insert(id, info);
+				writes += 1;
+			}
+		}
+		T::DbWeight::get().reads_writes(1, writes)
+	}
+}
+
 #[cfg(test)]
 mod tests {
 	use super::*;
@@ -784,6 +811,7 @@ mod tests {
 		type UnsignedPriority = ParasUnsignedPriority;
 		type QueueFootprinter = ();
 		type NextSessionRotation = crate::mock::TestNextSessionRotation;
+		type OnNewHead = ();
 	}
 
 	impl configuration::Config for Test {
@@ -1270,8 +1298,10 @@ mod tests {
 			));
 
 			assert_noop!(Registrar::add_lock(RuntimeOrigin::signed(2), para_id), BadOrigin);
-			// Once they begin onboarding, we lock them in.
-			assert_ok!(Registrar::add_lock(RuntimeOrigin::signed(1), para_id));
+
+			// 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),
@@ -1283,6 +1313,11 @@ mod tests {
 			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));
 		});
 	}
 
diff --git a/polkadot/runtime/common/src/purchase.rs b/polkadot/runtime/common/src/purchase.rs
index 72795a733ea9e5dc98d76baa1e2d1f69c1bf7580..58ca19d0288c4973fc3e7d7f325df31b785d5be6 100644
--- a/polkadot/runtime/common/src/purchase.rs
+++ b/polkadot/runtime/common/src/purchase.rs
@@ -132,7 +132,7 @@ pub mod pallet {
 	#[pallet::event]
 	#[pallet::generate_deposit(pub(super) fn deposit_event)]
 	pub enum Event<T: Config> {
-		/// A [new] account was created.
+		/// A new account was created.
 		AccountCreated { who: T::AccountId },
 		/// Someone's account validity was updated.
 		ValidityUpdated { who: T::AccountId, validity: AccountValidity },
@@ -484,14 +484,14 @@ mod tests {
 	// 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,
-		dispatch::DispatchError::BadOrigin,
-		ord_parameter_types, parameter_types,
+		assert_noop, assert_ok, ord_parameter_types, parameter_types,
 		traits::{Currency, WithdrawReasons},
 	};
 	use sp_runtime::{
 		traits::{BlakeTwo256, Dispatchable, IdentifyAccount, Identity, IdentityLookup, Verify},
-		ArithmeticError, BuildStorage, MultiSignature,
+		ArithmeticError, BuildStorage,
+		DispatchError::BadOrigin,
+		MultiSignature,
 	};
 
 	type Block = frame_system::mocking::MockBlock<Test>;
diff --git a/polkadot/runtime/kusama/Cargo.toml b/polkadot/runtime/kusama/Cargo.toml
deleted file mode 100644
index d04f67eda2bbbae8adcf3f2dce23372a7bc50f54..0000000000000000000000000000000000000000
--- a/polkadot/runtime/kusama/Cargo.toml
+++ /dev/null
@@ -1,335 +0,0 @@
-[package]
-name = "kusama-runtime"
-build = "build.rs"
-version.workspace = true
-authors.workspace = true
-edition.workspace = true
-license.workspace = true
-
-[dependencies]
-bitvec = { version = "1.0.0", default-features = false, features = ["alloc"] }
-parity-scale-codec = { version = "3.6.1", default-features = false, features = ["derive", "max-encoded-len"] }
-scale-info = { version = "2.5.0", default-features = false, features = ["derive"] }
-log = { version = "0.4.17", default-features = false }
-rustc-hex = { version = "2.1.0", default-features = false }
-serde = { version = "1.0.163", default-features = false }
-serde_derive = { version = "1.0.117", optional = true }
-static_assertions = "1.1.0"
-smallvec = "1.8.0"
-
-authority-discovery-primitives = { package = "sp-authority-discovery", path = "../../../substrate/primitives/authority-discovery", default-features = false }
-babe-primitives = { package = "sp-consensus-babe", path = "../../../substrate/primitives/consensus/babe", default-features = false }
-beefy-primitives = { package = "sp-consensus-beefy", path = "../../../substrate/primitives/consensus/beefy", default-features = false }
-binary-merkle-tree = { path = "../../../substrate/utils/binary-merkle-tree", default-features = false }
-kusama-runtime-constants = { package = "kusama-runtime-constants", path = "constants", default-features = false }
-sp-api = { path = "../../../substrate/primitives/api", default-features = false }
-inherents = { package = "sp-inherents", path = "../../../substrate/primitives/inherents", default-features = false }
-offchain-primitives = { package = "sp-offchain", path = "../../../substrate/primitives/offchain", default-features = false }
-sp-std = { package = "sp-std", path = "../../../substrate/primitives/std", default-features = false }
-sp-application-crypto = { path = "../../../substrate/primitives/application-crypto", default-features = false }
-sp-arithmetic = { path = "../../../substrate/primitives/arithmetic", default-features = false }
-sp-io = { path = "../../../substrate/primitives/io", default-features = false }
-sp-mmr-primitives = { path = "../../../substrate/primitives/merkle-mountain-range", default-features = false }
-sp-runtime = { path = "../../../substrate/primitives/runtime", default-features = false }
-sp-staking = { path = "../../../substrate/primitives/staking", default-features = false }
-sp-core = { path = "../../../substrate/primitives/core", default-features = false }
-sp-session = { path = "../../../substrate/primitives/session", default-features = false }
-sp-storage = { path = "../../../substrate/primitives/storage", default-features = false }
-sp-version = { path = "../../../substrate/primitives/version", default-features = false }
-tx-pool-api = { package = "sp-transaction-pool", path = "../../../substrate/primitives/transaction-pool", default-features = false }
-block-builder-api = { package = "sp-block-builder", path = "../../../substrate/primitives/block-builder", default-features = false }
-sp-npos-elections = { path = "../../../substrate/primitives/npos-elections", default-features = false }
-
-pallet-authority-discovery = { path = "../../../substrate/frame/authority-discovery", default-features = false }
-pallet-authorship = { path = "../../../substrate/frame/authorship", default-features = false }
-pallet-babe = { path = "../../../substrate/frame/babe", default-features = false }
-pallet-bags-list = { path = "../../../substrate/frame/bags-list", default-features = false }
-pallet-balances = { path = "../../../substrate/frame/balances", default-features = false }
-pallet-beefy = { path = "../../../substrate/frame/beefy", default-features = false }
-pallet-beefy-mmr = { path = "../../../substrate/frame/beefy-mmr", default-features = false }
-pallet-bounties = { path = "../../../substrate/frame/bounties", default-features = false }
-pallet-child-bounties = { path = "../../../substrate/frame/child-bounties", default-features = false }
-pallet-transaction-payment = { path = "../../../substrate/frame/transaction-payment", default-features = false }
-pallet-transaction-payment-rpc-runtime-api = { path = "../../../substrate/frame/transaction-payment/rpc/runtime-api", default-features = false }
-pallet-nomination-pools-runtime-api = { path = "../../../substrate/frame/nomination-pools/runtime-api", default-features = false }
-pallet-collective = { path = "../../../substrate/frame/collective", default-features = false }
-pallet-conviction-voting = { path = "../../../substrate/frame/conviction-voting", default-features = false }
-pallet-democracy = { path = "../../../substrate/frame/democracy", default-features = false }
-pallet-elections-phragmen = { path = "../../../substrate/frame/elections-phragmen", default-features = false }
-pallet-election-provider-multi-phase = { path = "../../../substrate/frame/election-provider-multi-phase", default-features = false }
-pallet-fast-unstake = { path = "../../../substrate/frame/fast-unstake", default-features = false }
-frame-executive = { path = "../../../substrate/frame/executive", default-features = false }
-pallet-grandpa = { path = "../../../substrate/frame/grandpa", default-features = false }
-pallet-nis = { path = "../../../substrate/frame/nis", default-features = false }
-pallet-identity = { path = "../../../substrate/frame/identity", default-features = false }
-pallet-im-online = { path = "../../../substrate/frame/im-online", default-features = false }
-pallet-indices = { path = "../../../substrate/frame/indices", default-features = false }
-pallet-membership = { path = "../../../substrate/frame/membership", default-features = false }
-pallet-message-queue = { path = "../../../substrate/frame/message-queue", default-features = false }
-pallet-mmr = { path = "../../../substrate/frame/merkle-mountain-range", default-features = false }
-pallet-multisig = { path = "../../../substrate/frame/multisig", default-features = false }
-pallet-nomination-pools = { path = "../../../substrate/frame/nomination-pools", default-features = false }
-pallet-offences = { path = "../../../substrate/frame/offences", default-features = false }
-pallet-preimage = { path = "../../../substrate/frame/preimage", default-features = false }
-pallet-proxy = { path = "../../../substrate/frame/proxy", default-features = false }
-pallet-ranked-collective = { path = "../../../substrate/frame/ranked-collective", default-features = false }
-pallet-recovery = { path = "../../../substrate/frame/recovery", default-features = false }
-pallet-referenda = { path = "../../../substrate/frame/referenda", default-features = false }
-pallet-scheduler = { path = "../../../substrate/frame/scheduler", default-features = false }
-pallet-session = { path = "../../../substrate/frame/session", default-features = false }
-pallet-society = { path = "../../../substrate/frame/society", default-features = false, features = ["experimental"] }
-frame-support = { path = "../../../substrate/frame/support", default-features = false }
-pallet-staking = { path = "../../../substrate/frame/staking", default-features = false }
-pallet-state-trie-migration = { path = "../../../substrate/frame/state-trie-migration", default-features = false }
-pallet-staking-runtime-api = { path = "../../../substrate/frame/staking/runtime-api", default-features = false }
-frame-system = { path = "../../../substrate/frame/system", default-features = false }
-frame-system-rpc-runtime-api = { path = "../../../substrate/frame/system/rpc/runtime-api", default-features = false }
-pallet-timestamp = { path = "../../../substrate/frame/timestamp", default-features = false }
-pallet-tips = { path = "../../../substrate/frame/tips", default-features = false }
-pallet-treasury = { path = "../../../substrate/frame/treasury", default-features = false }
-pallet-utility = { path = "../../../substrate/frame/utility", default-features = false }
-pallet-vesting = { path = "../../../substrate/frame/vesting", default-features = false }
-pallet-whitelist = { path = "../../../substrate/frame/whitelist", default-features = false }
-pallet-xcm = { path = "../../xcm/pallet-xcm", default-features = false }
-pallet-xcm-benchmarks = { path = "../../xcm/pallet-xcm-benchmarks", default-features = false, optional = true }
-frame-election-provider-support = { path = "../../../substrate/frame/election-provider-support", default-features = false }
-
-frame-benchmarking = { path = "../../../substrate/frame/benchmarking", default-features = false, optional = true }
-frame-try-runtime = { path = "../../../substrate/frame/try-runtime", default-features = false, optional = true }
-pallet-offences-benchmarking = { path = "../../../substrate/frame/offences/benchmarking", default-features = false, optional = true }
-pallet-session-benchmarking = { path = "../../../substrate/frame/session/benchmarking", default-features = false, optional = true }
-pallet-nomination-pools-benchmarking = { path = "../../../substrate/frame/nomination-pools/benchmarking", default-features = false, optional = true }
-frame-system-benchmarking = { path = "../../../substrate/frame/system/benchmarking", default-features = false, optional = true }
-pallet-election-provider-support-benchmarking = { path = "../../../substrate/frame/election-provider-support/benchmarking", default-features = false, optional = true }
-hex-literal = "0.4.1"
-
-runtime-common = { package = "polkadot-runtime-common", path = "../common", default-features = false }
-runtime-parachains = { package = "polkadot-runtime-parachains", path = "../parachains", default-features = false }
-primitives = { package = "polkadot-primitives", path = "../../primitives", default-features = false }
-
-xcm = { package = "xcm", path = "../../xcm", default-features = false }
-xcm-executor = { package = "xcm-executor", path = "../../xcm/xcm-executor", default-features = false }
-xcm-builder = { package = "xcm-builder", path = "../../xcm/xcm-builder", default-features = false }
-
-[dev-dependencies]
-tiny-keccak = { version = "2.0.2", features = ["keccak"] }
-keyring = { package = "sp-keyring", path = "../../../substrate/primitives/keyring" }
-sp-trie = { path = "../../../substrate/primitives/trie" }
-separator = "0.4.1"
-serde_json = "1.0.96"
-remote-externalities = { package = "frame-remote-externalities" , path = "../../../substrate/utils/frame/remote-externalities" }
-tokio = { version = "1.24.2", features = ["macros"] }
-sp-tracing = { path = "../../../substrate/primitives/tracing", default-features = false }
-
-[build-dependencies]
-substrate-wasm-builder = { path = "../../../substrate/utils/wasm-builder" }
-
-[features]
-default = [ "std" ]
-no_std = []
-only-staking = []
-std = [
-	"authority-discovery-primitives/std",
-	"babe-primitives/std",
-	"beefy-primitives/std",
-	"bitvec/std",
-	"block-builder-api/std",
-	"frame-election-provider-support/std",
-	"frame-executive/std",
-	"frame-support/std",
-	"frame-system-rpc-runtime-api/std",
-	"frame-system/std",
-	"frame-try-runtime/std",
-	"inherents/std",
-	"kusama-runtime-constants/std",
-	"log/std",
-	"offchain-primitives/std",
-	"pallet-authority-discovery/std",
-	"pallet-authorship/std",
-	"pallet-babe/std",
-	"pallet-bags-list/std",
-	"pallet-balances/std",
-	"pallet-beefy-mmr/std",
-	"pallet-beefy/std",
-	"pallet-bounties/std",
-	"pallet-child-bounties/std",
-	"pallet-collective/std",
-	"pallet-conviction-voting/std",
-	"pallet-democracy/std",
-	"pallet-election-provider-multi-phase/std",
-	"pallet-elections-phragmen/std",
-	"pallet-fast-unstake/std",
-	"pallet-grandpa/std",
-	"pallet-identity/std",
-	"pallet-im-online/std",
-	"pallet-indices/std",
-	"pallet-membership/std",
-	"pallet-message-queue/std",
-	"pallet-mmr/std",
-	"pallet-multisig/std",
-	"pallet-nis/std",
-	"pallet-nomination-pools-runtime-api/std",
-	"pallet-nomination-pools/std",
-	"pallet-offences/std",
-	"pallet-preimage/std",
-	"pallet-proxy/std",
-	"pallet-ranked-collective/std",
-	"pallet-recovery/std",
-	"pallet-referenda/std",
-	"pallet-scheduler/std",
-	"pallet-session/std",
-	"pallet-society/std",
-	"pallet-staking-runtime-api/std",
-	"pallet-staking/std",
-	"pallet-state-trie-migration/std",
-	"pallet-timestamp/std",
-	"pallet-tips/std",
-	"pallet-transaction-payment-rpc-runtime-api/std",
-	"pallet-transaction-payment/std",
-	"pallet-treasury/std",
-	"pallet-utility/std",
-	"pallet-vesting/std",
-	"pallet-whitelist/std",
-	"pallet-xcm/std",
-	"parity-scale-codec/std",
-	"primitives/std",
-	"runtime-common/std",
-	"runtime-parachains/std",
-	"rustc-hex/std",
-	"scale-info/std",
-	"serde/std",
-	"serde_derive",
-	"sp-api/std",
-	"sp-application-crypto/std",
-	"sp-arithmetic/std",
-	"sp-core/std",
-	"sp-io/std",
-	"sp-mmr-primitives/std",
-	"sp-npos-elections/std",
-	"sp-runtime/std",
-	"sp-session/std",
-	"sp-staking/std",
-	"sp-std/std",
-	"sp-version/std",
-	"tx-pool-api/std",
-	"xcm-builder/std",
-	"xcm-executor/std",
-	"xcm/std",
-]
-runtime-benchmarks = [
-	"frame-benchmarking/runtime-benchmarks",
-	"frame-election-provider-support/runtime-benchmarks",
-	"frame-support/runtime-benchmarks",
-	"frame-system-benchmarking/runtime-benchmarks",
-	"frame-system/runtime-benchmarks",
-	"pallet-babe/runtime-benchmarks",
-	"pallet-bags-list/runtime-benchmarks",
-	"pallet-balances/runtime-benchmarks",
-	"pallet-bounties/runtime-benchmarks",
-	"pallet-child-bounties/runtime-benchmarks",
-	"pallet-collective/runtime-benchmarks",
-	"pallet-conviction-voting/runtime-benchmarks",
-	"pallet-democracy/runtime-benchmarks",
-	"pallet-election-provider-multi-phase/runtime-benchmarks",
-	"pallet-election-provider-support-benchmarking/runtime-benchmarks",
-	"pallet-elections-phragmen/runtime-benchmarks",
-	"pallet-fast-unstake/runtime-benchmarks",
-	"pallet-grandpa/runtime-benchmarks",
-	"pallet-identity/runtime-benchmarks",
-	"pallet-im-online/runtime-benchmarks",
-	"pallet-indices/runtime-benchmarks",
-	"pallet-membership/runtime-benchmarks",
-	"pallet-message-queue/runtime-benchmarks",
-	"pallet-multisig/runtime-benchmarks",
-	"pallet-nis/runtime-benchmarks",
-	"pallet-nomination-pools-benchmarking/runtime-benchmarks",
-	"pallet-nomination-pools/runtime-benchmarks",
-	"pallet-offences-benchmarking/runtime-benchmarks",
-	"pallet-preimage/runtime-benchmarks",
-	"pallet-proxy/runtime-benchmarks",
-	"pallet-ranked-collective/runtime-benchmarks",
-	"pallet-recovery/runtime-benchmarks",
-	"pallet-referenda/runtime-benchmarks",
-	"pallet-scheduler/runtime-benchmarks",
-	"pallet-session-benchmarking/runtime-benchmarks",
-	"pallet-society/runtime-benchmarks",
-	"pallet-staking/runtime-benchmarks",
-	"pallet-timestamp/runtime-benchmarks",
-	"pallet-tips/runtime-benchmarks",
-	"pallet-treasury/runtime-benchmarks",
-	"pallet-utility/runtime-benchmarks",
-	"pallet-vesting/runtime-benchmarks",
-	"pallet-whitelist/runtime-benchmarks",
-	"pallet-xcm-benchmarks/runtime-benchmarks",
-	"pallet-xcm/runtime-benchmarks",
-	"runtime-common/runtime-benchmarks",
-	"runtime-parachains/runtime-benchmarks",
-	"sp-runtime/runtime-benchmarks",
-	"xcm-builder/runtime-benchmarks",
-]
-try-runtime = [
-	"frame-executive/try-runtime",
-	"frame-system/try-runtime",
-	"frame-try-runtime",
-	"pallet-authority-discovery/try-runtime",
-	"pallet-authorship/try-runtime",
-	"pallet-babe/try-runtime",
-	"pallet-bags-list/try-runtime",
-	"pallet-balances/try-runtime",
-	"pallet-beefy-mmr/try-runtime",
-	"pallet-beefy/try-runtime",
-	"pallet-bounties/try-runtime",
-	"pallet-child-bounties/try-runtime",
-	"pallet-collective/try-runtime",
-	"pallet-conviction-voting/try-runtime",
-	"pallet-democracy/try-runtime",
-	"pallet-election-provider-multi-phase/try-runtime",
-	"pallet-elections-phragmen/try-runtime",
-	"pallet-fast-unstake/try-runtime",
-	"pallet-grandpa/try-runtime",
-	"pallet-identity/try-runtime",
-	"pallet-im-online/try-runtime",
-	"pallet-indices/try-runtime",
-	"pallet-membership/try-runtime",
-	"pallet-message-queue/try-runtime",
-	"pallet-mmr/try-runtime",
-	"pallet-multisig/try-runtime",
-	"pallet-nis/try-runtime",
-	"pallet-nomination-pools/try-runtime",
-	"pallet-offences/try-runtime",
-	"pallet-preimage/try-runtime",
-	"pallet-proxy/try-runtime",
-	"pallet-ranked-collective/try-runtime",
-	"pallet-recovery/try-runtime",
-	"pallet-referenda/try-runtime",
-	"pallet-scheduler/try-runtime",
-	"pallet-session/try-runtime",
-	"pallet-society/try-runtime",
-	"pallet-staking/try-runtime",
-	"pallet-state-trie-migration/try-runtime",
-	"pallet-timestamp/try-runtime",
-	"pallet-tips/try-runtime",
-	"pallet-transaction-payment/try-runtime",
-	"pallet-treasury/try-runtime",
-	"pallet-utility/try-runtime",
-	"pallet-vesting/try-runtime",
-	"pallet-whitelist/try-runtime",
-	"pallet-xcm/try-runtime",
-	"runtime-common/try-runtime",
-]
-# When enabled, the runtime API will not be build.
-#
-# This is required by Cumulus to access certain types of the
-# runtime without clashing with the runtime API exported functions
-# in WASM.
-disable-runtime-api = []
-
-# A feature that should be enabled when the runtime should be build for on-chain
-# deployment. This will disable stuff that shouldn't be part of the on-chain wasm
-# to make it smaller like logging for example.
-on-chain-release-build = [ "sp-api/disable-logging" ]
-
-# Set timing constants (e.g. session period) to faster versions to speed up testing.
-fast-runtime = []
-
-runtime-metrics = [ "runtime-parachains/runtime-metrics", "sp-io/with-tracing" ]
diff --git a/polkadot/runtime/kusama/constants/Cargo.toml b/polkadot/runtime/kusama/constants/Cargo.toml
deleted file mode 100644
index f89fee42742b8fbacb3e9cce257caefa9a218adc..0000000000000000000000000000000000000000
--- a/polkadot/runtime/kusama/constants/Cargo.toml
+++ /dev/null
@@ -1,27 +0,0 @@
-[package]
-name = "kusama-runtime-constants"
-version.workspace = true
-authors.workspace = true
-edition.workspace = true
-license.workspace = true
-
-[dependencies]
-smallvec = "1.8.0"
-
-frame-support = { path = "../../../../substrate/frame/support", default-features = false }
-primitives = { package = "polkadot-primitives", path = "../../../primitives", default-features = false }
-runtime-common = { package = "polkadot-runtime-common", path = "../../common", default-features = false }
-sp-runtime = { path = "../../../../substrate/primitives/runtime", default-features = false }
-sp-weights = { path = "../../../../substrate/primitives/weights", default-features = false }
-sp-core = { path = "../../../../substrate/primitives/core", default-features = false }
-
-[features]
-default = [ "std" ]
-std = [
-	"frame-support/std",
-	"primitives/std",
-	"runtime-common/std",
-	"sp-core/std",
-	"sp-runtime/std",
-	"sp-weights/std",
-]
diff --git a/polkadot/runtime/kusama/constants/src/lib.rs b/polkadot/runtime/kusama/constants/src/lib.rs
deleted file mode 100644
index 78f96b35106503f8b2596e773e3af70e6ff4795e..0000000000000000000000000000000000000000
--- a/polkadot/runtime/kusama/constants/src/lib.rs
+++ /dev/null
@@ -1,128 +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/>.
-
-#![cfg_attr(not(feature = "std"), no_std)]
-
-pub mod weights;
-
-/// Money matters.
-pub mod currency {
-	use primitives::Balance;
-
-	/// The existential deposit.
-	pub const EXISTENTIAL_DEPOSIT: Balance = 1 * CENTS;
-
-	pub const UNITS: Balance = 1_000_000_000_000;
-	pub const QUID: Balance = UNITS / 30;
-	pub const CENTS: Balance = QUID / 100;
-	pub const GRAND: Balance = QUID * 1_000;
-	pub const MILLICENTS: Balance = CENTS / 1_000;
-
-	pub const fn deposit(items: u32, bytes: u32) -> Balance {
-		items as Balance * 2_000 * CENTS + (bytes as Balance) * 100 * MILLICENTS
-	}
-}
-
-/// Time and blocks.
-pub mod time {
-	use primitives::{BlockNumber, Moment};
-	use runtime_common::prod_or_fast;
-	pub const MILLISECS_PER_BLOCK: Moment = 6000;
-	pub const SLOT_DURATION: Moment = MILLISECS_PER_BLOCK;
-	pub const EPOCH_DURATION_IN_SLOTS: BlockNumber = prod_or_fast!(1 * HOURS, 1 * MINUTES);
-
-	// These time units are defined in number of blocks.
-	pub const MINUTES: BlockNumber = 60_000 / (MILLISECS_PER_BLOCK as BlockNumber);
-	pub const HOURS: BlockNumber = MINUTES * 60;
-	pub const DAYS: BlockNumber = HOURS * 24;
-	pub const WEEKS: BlockNumber = DAYS * 7;
-
-	// 1 in 4 blocks (on average, not counting collisions) will be primary babe blocks.
-	// The choice of is done in accordance to the slot duration and expected target
-	// block time, for safely resisting network delays of maximum two seconds.
-	// <https://research.web3.foundation/en/latest/polkadot/BABE/Babe/#6-practical-results>
-	pub const PRIMARY_PROBABILITY: (u64, u64) = (1, 4);
-}
-
-/// Fee-related.
-pub mod fee {
-	use crate::weights::ExtrinsicBaseWeight;
-	use frame_support::weights::{
-		WeightToFeeCoefficient, WeightToFeeCoefficients, WeightToFeePolynomial,
-	};
-	use primitives::Balance;
-	use smallvec::smallvec;
-	pub use sp_runtime::Perbill;
-
-	/// The block saturation level. Fees will be updates based on this value.
-	pub const TARGET_BLOCK_FULLNESS: Perbill = Perbill::from_percent(25);
-
-	/// Handles converting a weight scalar to a fee value, based on the scale and granularity of the
-	/// node's balance type.
-	///
-	/// This should typically create a mapping between the following ranges:
-	///   - [0, `MAXIMUM_BLOCK_WEIGHT`]
-	///   - [Balance::min, Balance::max]
-	///
-	/// Yet, it can be used for any other sort of change to weight-fee. Some examples being:
-	///   - Setting it to `0` will essentially disable the weight fee.
-	///   - Setting it to `1` will cause the literal `#[weight = x]` values to be charged.
-	pub struct WeightToFee;
-	impl WeightToFeePolynomial for WeightToFee {
-		type Balance = Balance;
-		fn polynomial() -> WeightToFeeCoefficients<Self::Balance> {
-			// in Kusama, extrinsic base weight (smallest non-zero weight) is mapped to 1/10 CENT:
-			let p = super::currency::CENTS;
-			let q = 10 * Balance::from(ExtrinsicBaseWeight::get().ref_time());
-			smallvec![WeightToFeeCoefficient {
-				degree: 1,
-				negative: false,
-				coeff_frac: Perbill::from_rational(p % q, q),
-				coeff_integer: p / q,
-			}]
-		}
-	}
-}
-
-#[cfg(test)]
-mod tests {
-	use super::{
-		currency::{CENTS, MILLICENTS},
-		fee::WeightToFee,
-	};
-	use crate::weights::ExtrinsicBaseWeight;
-	use frame_support::weights::WeightToFee as WeightToFeeT;
-	use runtime_common::MAXIMUM_BLOCK_WEIGHT;
-
-	#[test]
-	// Test that the fee for `MAXIMUM_BLOCK_WEIGHT` of weight has sane bounds.
-	fn full_block_fee_is_correct() {
-		// A full block should cost between 1,000 and 10,000 CENTS.
-		let full_block = WeightToFee::weight_to_fee(&MAXIMUM_BLOCK_WEIGHT);
-		assert!(full_block >= 1_000 * CENTS);
-		assert!(full_block <= 10_000 * CENTS);
-	}
-
-	#[test]
-	// This function tests that the fee for `ExtrinsicBaseWeight` of weight is correct
-	fn extrinsic_base_fee_is_correct() {
-		// `ExtrinsicBaseWeight` should cost 1/10 of a CENT
-		println!("Base: {}", ExtrinsicBaseWeight::get());
-		let x = WeightToFee::weight_to_fee(&ExtrinsicBaseWeight::get());
-		let y = CENTS / 10;
-		assert!(x.max(y) - x.min(y) < MILLICENTS);
-	}
-}
diff --git a/polkadot/runtime/kusama/constants/src/weights/block_weights.rs b/polkadot/runtime/kusama/constants/src/weights/block_weights.rs
deleted file mode 100644
index 8423e1f810c551166572a4d86b1c3bea3ba5af2b..0000000000000000000000000000000000000000
--- a/polkadot/runtime/kusama/constants/src/weights/block_weights.rs
+++ /dev/null
@@ -1,81 +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/>.
-
-//! THIS FILE WAS AUTO-GENERATED USING THE SUBSTRATE BENCHMARK CLI VERSION 4.0.0-dev
-//! DATE: 2023-06-19 (Y/M/D)
-//! HOSTNAME: `runner-e8ezs4ez-project-163-concurrent-0`, CPU: `Intel(R) Xeon(R) CPU @ 2.60GHz`
-//!
-//! SHORT-NAME: `block`, LONG-NAME: `BlockExecution`, RUNTIME: `Development`
-//! WARMUPS: `10`, REPEAT: `100`
-//! WEIGHT-PATH: `runtime/kusama/constants/src/weights/`
-//! WEIGHT-METRIC: `Average`, WEIGHT-MUL: `1.0`, WEIGHT-ADD: `0`
-
-// Executed Command:
-//   ./target/production/polkadot
-//   benchmark
-//   overhead
-//   --chain=kusama-dev
-//   --execution=wasm
-//   --wasm-execution=compiled
-//   --weight-path=runtime/kusama/constants/src/weights/
-//   --warmup=10
-//   --repeat=100
-//   --header=./file_header.txt
-
-use sp_core::parameter_types;
-use sp_weights::{constants::WEIGHT_REF_TIME_PER_NANOS, Weight};
-
-parameter_types! {
-	/// Time to execute an empty block.
-	/// Calculated by multiplying the *Average* with `1.0` and adding `0`.
-	///
-	/// Stats nanoseconds:
-	///   Min, Max: 14_012_555, 15_267_251
-	///   Average:  14_278_073
-	///   Median:   14_244_231
-	///   Std-Dev:  180701.37
-	///
-	/// Percentiles nanoseconds:
-	///   99th: 14_916_615
-	///   95th: 14_622_262
-	///   75th: 14_317_299
-	pub const BlockExecutionWeight: Weight =
-		Weight::from_parts(WEIGHT_REF_TIME_PER_NANOS.saturating_mul(14_278_073), 0);
-}
-
-#[cfg(test)]
-mod test_weights {
-	use sp_weights::constants;
-
-	/// Checks that the weight exists and is sane.
-	// NOTE: If this test fails but you are sure that the generated values are fine,
-	// you can delete it.
-	#[test]
-	fn sane() {
-		let w = super::BlockExecutionWeight::get();
-
-		// At least 100 µs.
-		assert!(
-			w.ref_time() >= 100u64 * constants::WEIGHT_REF_TIME_PER_MICROS,
-			"Weight should be at least 100 µs."
-		);
-		// At most 50 ms.
-		assert!(
-			w.ref_time() <= 50u64 * constants::WEIGHT_REF_TIME_PER_MILLIS,
-			"Weight should be at most 50 ms."
-		);
-	}
-}
diff --git a/polkadot/runtime/kusama/constants/src/weights/extrinsic_weights.rs b/polkadot/runtime/kusama/constants/src/weights/extrinsic_weights.rs
deleted file mode 100644
index 6a2fb7dd206e11de7c79cb7905c2e9a459cabf13..0000000000000000000000000000000000000000
--- a/polkadot/runtime/kusama/constants/src/weights/extrinsic_weights.rs
+++ /dev/null
@@ -1,81 +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/>.
-
-//! THIS FILE WAS AUTO-GENERATED USING THE SUBSTRATE BENCHMARK CLI VERSION 4.0.0-dev
-//! DATE: 2023-06-19 (Y/M/D)
-//! HOSTNAME: `runner-e8ezs4ez-project-163-concurrent-0`, CPU: `Intel(R) Xeon(R) CPU @ 2.60GHz`
-//!
-//! SHORT-NAME: `extrinsic`, LONG-NAME: `ExtrinsicBase`, RUNTIME: `Development`
-//! WARMUPS: `10`, REPEAT: `100`
-//! WEIGHT-PATH: `runtime/kusama/constants/src/weights/`
-//! WEIGHT-METRIC: `Average`, WEIGHT-MUL: `1.0`, WEIGHT-ADD: `0`
-
-// Executed Command:
-//   ./target/production/polkadot
-//   benchmark
-//   overhead
-//   --chain=kusama-dev
-//   --execution=wasm
-//   --wasm-execution=compiled
-//   --weight-path=runtime/kusama/constants/src/weights/
-//   --warmup=10
-//   --repeat=100
-//   --header=./file_header.txt
-
-use sp_core::parameter_types;
-use sp_weights::{constants::WEIGHT_REF_TIME_PER_NANOS, Weight};
-
-parameter_types! {
-	/// Time to execute a NO-OP extrinsic, for example `System::remark`.
-	/// Calculated by multiplying the *Average* with `1.0` and adding `0`.
-	///
-	/// Stats nanoseconds:
-	///   Min, Max: 123_598, 126_451
-	///   Average:  124_706
-	///   Median:   124_675
-	///   Std-Dev:  548.81
-	///
-	/// Percentiles nanoseconds:
-	///   99th: 126_070
-	///   95th: 125_605
-	///   75th: 125_041
-	pub const ExtrinsicBaseWeight: Weight =
-		Weight::from_parts(WEIGHT_REF_TIME_PER_NANOS.saturating_mul(124_706), 0);
-}
-
-#[cfg(test)]
-mod test_weights {
-	use sp_weights::constants;
-
-	/// Checks that the weight exists and is sane.
-	// NOTE: If this test fails but you are sure that the generated values are fine,
-	// you can delete it.
-	#[test]
-	fn sane() {
-		let w = super::ExtrinsicBaseWeight::get();
-
-		// At least 10 µs.
-		assert!(
-			w.ref_time() >= 10u64 * constants::WEIGHT_REF_TIME_PER_MICROS,
-			"Weight should be at least 10 µs."
-		);
-		// At most 1 ms.
-		assert!(
-			w.ref_time() <= constants::WEIGHT_REF_TIME_PER_MILLIS,
-			"Weight should be at most 1 ms."
-		);
-	}
-}
diff --git a/polkadot/runtime/kusama/constants/src/weights/paritydb_weights.rs b/polkadot/runtime/kusama/constants/src/weights/paritydb_weights.rs
deleted file mode 100644
index 25679703831a13b8d1bb7fb7dd4d92fa84b1f255..0000000000000000000000000000000000000000
--- a/polkadot/runtime/kusama/constants/src/weights/paritydb_weights.rs
+++ /dev/null
@@ -1,63 +0,0 @@
-// 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.
-
-pub mod constants {
-	use frame_support::{
-		parameter_types,
-		weights::{constants, RuntimeDbWeight},
-	};
-
-	parameter_types! {
-		/// `ParityDB` can be enabled with a feature flag, but is still experimental. These weights
-		/// are available for brave runtime engineers who may want to try this out as default.
-		pub const ParityDbWeight: RuntimeDbWeight = RuntimeDbWeight {
-			read: 8_000 * constants::WEIGHT_REF_TIME_PER_NANOS,
-			write: 50_000 * constants::WEIGHT_REF_TIME_PER_NANOS,
-		};
-	}
-
-	#[cfg(test)]
-	mod test_db_weights {
-		use super::constants::ParityDbWeight as W;
-		use frame_support::weights::constants;
-
-		/// Checks that all weights exist and have sane values.
-		// NOTE: If this test fails but you are sure that the generated values are fine,
-		// you can delete it.
-		#[test]
-		fn sane() {
-			// At least 1 µs.
-			assert!(
-				W::get().reads(1).ref_time() >= constants::WEIGHT_REF_TIME_PER_MICROS,
-				"Read weight should be at least 1 µs."
-			);
-			assert!(
-				W::get().writes(1).ref_time() >= constants::WEIGHT_REF_TIME_PER_MICROS,
-				"Write weight should be at least 1 µs."
-			);
-			// At most 1 ms.
-			assert!(
-				W::get().reads(1).ref_time() <= constants::WEIGHT_REF_TIME_PER_MILLIS,
-				"Read weight should be at most 1 ms."
-			);
-			assert!(
-				W::get().writes(1).ref_time() <= constants::WEIGHT_REF_TIME_PER_MILLIS,
-				"Write weight should be at most 1 ms."
-			);
-		}
-	}
-}
diff --git a/polkadot/runtime/kusama/constants/src/weights/rocksdb_weights.rs b/polkadot/runtime/kusama/constants/src/weights/rocksdb_weights.rs
deleted file mode 100644
index 3dd817aa6f137085b0e5fdf2b11b7f50e5c8b002..0000000000000000000000000000000000000000
--- a/polkadot/runtime/kusama/constants/src/weights/rocksdb_weights.rs
+++ /dev/null
@@ -1,63 +0,0 @@
-// 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.
-
-pub mod constants {
-	use frame_support::{
-		parameter_types,
-		weights::{constants, RuntimeDbWeight},
-	};
-
-	parameter_types! {
-		/// By default, Substrate uses `RocksDB`, so this will be the weight used throughout
-		/// the runtime.
-		pub const RocksDbWeight: RuntimeDbWeight = RuntimeDbWeight {
-			read: 25_000 * constants::WEIGHT_REF_TIME_PER_NANOS,
-			write: 100_000 * constants::WEIGHT_REF_TIME_PER_NANOS,
-		};
-	}
-
-	#[cfg(test)]
-	mod test_db_weights {
-		use super::constants::RocksDbWeight as W;
-		use frame_support::weights::constants;
-
-		/// Checks that all weights exist and have sane values.
-		// NOTE: If this test fails but you are sure that the generated values are fine,
-		// you can delete it.
-		#[test]
-		fn sane() {
-			// At least 1 µs.
-			assert!(
-				W::get().reads(1).ref_time() >= constants::WEIGHT_REF_TIME_PER_MICROS,
-				"Read weight should be at least 1 µs."
-			);
-			assert!(
-				W::get().writes(1).ref_time() >= constants::WEIGHT_REF_TIME_PER_MICROS,
-				"Write weight should be at least 1 µs."
-			);
-			// At most 1 ms.
-			assert!(
-				W::get().reads(1).ref_time() <= constants::WEIGHT_REF_TIME_PER_MILLIS,
-				"Read weight should be at most 1 ms."
-			);
-			assert!(
-				W::get().writes(1).ref_time() <= constants::WEIGHT_REF_TIME_PER_MILLIS,
-				"Write weight should be at most 1 ms."
-			);
-		}
-	}
-}
diff --git a/polkadot/runtime/kusama/src/bag_thresholds.rs b/polkadot/runtime/kusama/src/bag_thresholds.rs
deleted file mode 100644
index 82dc4c3a8119e8e38bdacd767d26f8dd5c4d0a7c..0000000000000000000000000000000000000000
--- a/polkadot/runtime/kusama/src/bag_thresholds.rs
+++ /dev/null
@@ -1,234 +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/>.
-
-//! Autogenerated voter bag thresholds.
-//!
-//! Generated on 2021-07-05T14:34:44.453491278+00:00
-//! for the kusama runtime.
-
-/// Existential weight for this runtime.
-#[cfg(any(test, feature = "std"))]
-#[allow(unused)]
-pub const EXISTENTIAL_WEIGHT: u64 = 33_333_333;
-
-/// Constant ratio between bags for this runtime.
-#[cfg(any(test, feature = "std"))]
-#[allow(unused)]
-pub const CONSTANT_RATIO: f64 = 1.1455399939091000;
-
-/// Upper thresholds delimiting the bag list.
-pub const THRESHOLDS: [u64; 200] = [
-	33_333_333,
-	38_184_666,
-	43_742_062,
-	50_108_281,
-	57_401_040,
-	65_755_187,
-	75_325_197,
-	86_288_026,
-	98_846_385,
-	113_232_487,
-	129_712_342,
-	148_590_675,
-	170_216_561,
-	194_989_878,
-	223_368_704,
-	255_877_784,
-	293_118_235,
-	335_778_661,
-	384_647_885,
-	440_629_536,
-	504_758_756,
-	578_221_342,
-	662_375_673,
-	758_777_824,
-	869_210_344,
-	995_715_212,
-	1_140_631_598,
-	1_306_639_114,
-	1_496_807_363,
-	1_714_652_697,
-	1_964_203_240,
-	2_250_073_368,
-	2_577_549_032,
-	2_952_685_502,
-	3_382_419_332,
-	3_874_696_621,
-	4_438_619_944,
-	5_084_616_664,
-	5_824_631_742,
-	6_672_348_610,
-	7_643_442_186,
-	8_755_868_715,
-	10_030_197_794,
-	11_489_992_720,
-	13_162_246_190,
-	15_077_879_420,
-	17_272_313_899,
-	19_786_126_359,
-	22_665_799_069,
-	25_964_579_327,
-	29_743_464_044,
-	34_072_327_620,
-	39_031_213_974,
-	44_711_816_618,
-	51_219_174_136,
-	58_673_612_428,
-	67_212_969_623,
-	76_995_144_813,
-	88_201_017_720,
-	101_037_793_302,
-	115_742_833_124,
-	132_588_044_352,
-	151_884_907_519,
-	173_990_236_034,
-	199_312_773_927,
-	228_320_753_830,
-	261_550_554_952,
-	299_616_621_127,
-	343_222_822_341,
-	393_175_469_814,
-	450_398_225_296,
-	515_949_180_262,
-	591_040_420_815,
-	677_060_440_060,
-	775_599_812_382,
-	888_480_604_352,
-	1_017_790_066_098,
-	1_165_919_226_119,
-	1_335_607_103_187,
-	1_529_991_352_850,
-	1_752_666_285_025,
-	2_007_749_325_472,
-	2_299_957_150_072,
-	2_634_692_899_685,
-	3_018_146_088_258,
-	3_457_407_051_560,
-	3_960_598_052_785,
-	4_537_023_469_264,
-	5_197_341_837_346,
-	5_953_762_936_697,
-	6_820_273_558_240,
-	7_812_896_130_365,
-	8_949_984_985_591,
-	10_252_565_745_880,
-	11_744_724_102_088,
-	13_454_051_176_370,
-	15_412_153_702_632,
-	17_655_238_458_639,
-	20_224_781_756_373,
-	23_168_296_370_008,
-	26_540_210_082_583,
-	30_402_872_096_348,
-	34_827_705_916_070,
-	39_896_530_022_963,
-	45_703_070_759_499,
-	52_354_695_399_464,
-	59_974_397_449_015,
-	68_703_070_888_447,
-	78_702_115_407_088,
-	90_156_420_804_069,
-	103_277_785_738_759,
-	118_308_834_046_123,
-	135_527_501_032_588,
-	155_252_172_707_386,
-	177_847_572_977_594,
-	203_731_507_665_501,
-	233_382_590_050_230,
-	267_349_090_784_630,
-	306_259_075_829_029,
-	350_832_019_859_793,
-	401_892_109_893_305,
-	460_383_485_119_292,
-	527_387_694_739_404,
-	604_143_696_619_511,
-	692_070_766_545_736,
-	792_794_741_693_469,
-	908_178_083_570_703,
-	1_040_354_316_321_961,
-	1_191_767_477_182_765,
-	1_365_217_308_553_008,
-	1_563_911_027_324_411,
-	1_791_522_628_715_580,
-	2_052_260_821_186_860,
-	2_350_946_848_602_280,
-	2_693_103_638_628_474,
-	3_085_057_925_791_037,
-	3_534_057_237_519_885,
-	4_048_403_906_342_940,
-	4_637_608_586_213_668,
-	5_312_566_111_603_995,
-	6_085_756_951_128_531,
-	6_971_477_980_728_040,
-	7_986_106_843_580_624,
-	9_148_404_784_952_770,
-	10_479_863_561_632_778,
-	12_005_102_840_561_012,
-	13_752_325_434_854_380,
-	15_753_838_794_879_048,
-	18_046_652_397_130_688,
-	20_673_162_077_088_732,
-	23_681_933_959_870_064,
-	27_128_602_484_145_260,
-	31_076_899_124_450_156,
-	35_599_830_833_736_348,
-	40_781_029_996_443_328,
-	46_716_300_853_732_512,
-	53_515_390_995_440_424,
-	61_304_020_674_959_928,
-	70_226_207_470_596_936,
-	80_446_929_278_126_800,
-	92_155_174_875_271_168,
-	105_567_438_465_310_176,
-	120_931_722_816_550_704,
-	138_532_125_018_688_464,
-	158_694_089_650_123_072,
-	181_790_426_491_212_160,
-	208_248_204_055_475_872,
-	238_556_646_405_290_848,
-	273_276_179_270_092_192,
-	313_048_792_736_563_520,
-	358_609_912_124_694_080,
-	410_801_996_551_064_960,
-	470_590_116_626_953_088,
-	539_079_799_334_522_496,
-	617_537_470_046_187_776,
-	707_413_869_675_350_912,
-	810_370_879_959_114_368,
-	928_312_252_892_475_904,
-	1_063_418_812_524_189_696,
-	1_218_188_780_021_782_528,
-	1_395_483_967_646_286_592,
-	1_598_582_695_797_773_824,
-	1_831_240_411_607_374_592,
-	2_097_759_129_958_809_600,
-	2_403_066_980_955_773_440,
-	2_752_809_334_727_236_096,
-	3_153_453_188_536_351_744,
-	3_612_406_746_388_564_480,
-	4_138_156_402_255_148_032,
-	4_740_423_659_834_265_600,
-	5_430_344_890_413_097_984,
-	6_220_677_252_688_132_096,
-	7_126_034_582_154_840_064,
-	8_163_157_611_837_691_904,
-	9_351_223_520_943_572_992,
-	10_712_200_535_224_332_288,
-	12_271_254_135_873_939_456,
-	14_057_212_388_066_050_048,
-	16_103_098_993_404_108_800,
-	18_446_744_073_709_551_615,
-];
diff --git a/polkadot/runtime/kusama/src/lib.rs b/polkadot/runtime/kusama/src/lib.rs
deleted file mode 100644
index e9e3fb2d2026f194ac00da9692ad2b6a9bece2d4..0000000000000000000000000000000000000000
--- a/polkadot/runtime/kusama/src/lib.rs
+++ /dev/null
@@ -1,2715 +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/>.
-
-//! The Kusama runtime. This can be compiled with `#[no_std]`, ready for Wasm.
-
-#![cfg_attr(not(feature = "std"), no_std)]
-// `construct_runtime!` does a lot of recursion and requires us to increase the limit.
-#![recursion_limit = "512"]
-
-use pallet_nis::WithMaximumOf;
-use parity_scale_codec::{Decode, Encode, MaxEncodedLen};
-use primitives::{
-	slashing, AccountId, AccountIndex, Balance, BlockNumber, CandidateEvent, CandidateHash,
-	CommittedCandidateReceipt, CoreState, DisputeState, ExecutorParams, GroupRotationInfo, Hash,
-	Id as ParaId, InboundDownwardMessage, InboundHrmpMessage, Moment, Nonce,
-	OccupiedCoreAssumption, PersistedValidationData, ScrapedOnChainVotes, SessionInfo, Signature,
-	ValidationCode, ValidationCodeHash, ValidatorId, ValidatorIndex, LOWEST_PUBLIC_ID,
-	PARACHAIN_KEY_TYPE_ID,
-};
-use runtime_common::{
-	auctions, claims, crowdloan, impl_runtime_weights, impls::DealWithFees, paras_registrar,
-	prod_or_fast, slots, BalanceToU256, BlockHashCount, BlockLength, CurrencyToVote,
-	SlowAdjustingFeeUpdate, U256ToBalance,
-};
-use scale_info::TypeInfo;
-use sp_std::{cmp::Ordering, collections::btree_map::BTreeMap, prelude::*};
-
-use runtime_parachains::{
-	assigner_parachains as parachains_assigner_parachains,
-	configuration as parachains_configuration, disputes as parachains_disputes,
-	disputes::slashing as parachains_slashing,
-	dmp as parachains_dmp, hrmp as parachains_hrmp, inclusion as parachains_inclusion,
-	inclusion::{AggregateMessageOrigin, UmpQueueId},
-	initializer as parachains_initializer, origin as parachains_origin, paras as parachains_paras,
-	paras_inherent as parachains_paras_inherent, reward_points as parachains_reward_points,
-	runtime_api_impl::v5 as parachains_runtime_api_impl,
-	scheduler as parachains_scheduler, session_info as parachains_session_info,
-	shared as parachains_shared,
-};
-
-use authority_discovery_primitives::AuthorityId as AuthorityDiscoveryId;
-use beefy_primitives::{
-	ecdsa_crypto::{AuthorityId as BeefyId, Signature as BeefySignature},
-	mmr::{BeefyDataProvider, MmrLeafVersion},
-};
-use frame_election_provider_support::{
-	bounds::ElectionBoundsBuilder, generate_solution_type, onchain, NposSolution,
-	SequentialPhragmen,
-};
-use frame_support::{
-	construct_runtime, parameter_types,
-	traits::{
-		ConstU32, Contains, EitherOf, EitherOfDiverse, InstanceFilter, KeyOwnerProofSystem,
-		PrivilegeCmp, ProcessMessage, ProcessMessageError, StorageMapShim, WithdrawReasons,
-	},
-	weights::{ConstantMultiplier, WeightMeter},
-	PalletId,
-};
-use frame_system::EnsureRoot;
-use pallet_grandpa::{fg_primitives, AuthorityId as GrandpaId};
-use pallet_im_online::sr25519::AuthorityId as ImOnlineId;
-use pallet_session::historical as session_historical;
-use pallet_transaction_payment::{CurrencyAdapter, FeeDetails, RuntimeDispatchInfo};
-use sp_core::{ConstU128, OpaqueMetadata, H256};
-use sp_runtime::{
-	create_runtime_str, generic, impl_opaque_keys,
-	traits::{
-		AccountIdLookup, BlakeTwo256, Block as BlockT, ConvertInto, Extrinsic as ExtrinsicT,
-		Keccak256, OpaqueKeys, SaturatedConversion, Verify,
-	},
-	transaction_validity::{TransactionPriority, TransactionSource, TransactionValidity},
-	ApplyExtrinsicResult, FixedU128, KeyTypeId, Perbill, Percent, Permill, RuntimeDebug,
-};
-use sp_staking::SessionIndex;
-#[cfg(any(feature = "std", test))]
-use sp_version::NativeVersion;
-use sp_version::RuntimeVersion;
-use xcm::latest::Junction;
-
-pub use frame_system::Call as SystemCall;
-pub use pallet_balances::Call as BalancesCall;
-pub use pallet_election_provider_multi_phase::Call as EPMCall;
-#[cfg(feature = "std")]
-pub use pallet_staking::StakerStatus;
-use pallet_staking::UseValidatorsMap;
-use sp_runtime::traits::Get;
-#[cfg(any(feature = "std", test))]
-pub use sp_runtime::BuildStorage;
-
-/// Constant values used within the runtime.
-use kusama_runtime_constants::{currency::*, fee::*, time::*};
-
-// Weights used in the runtime.
-mod weights;
-
-// Voter bag threshold definitions.
-mod bag_thresholds;
-
-// Historical information of society finances.
-mod past_payouts;
-
-// XCM configurations.
-pub mod xcm_config;
-
-// Governance configurations.
-pub mod governance;
-use governance::{
-	pallet_custom_origins, AuctionAdmin, Fellows, GeneralAdmin, LeaseAdmin, StakingAdmin,
-	Treasurer, TreasurySpender,
-};
-
-#[cfg(test)]
-mod tests;
-
-impl_runtime_weights!(kusama_runtime_constants);
-
-// Make the WASM binary available.
-#[cfg(feature = "std")]
-include!(concat!(env!("OUT_DIR"), "/wasm_binary.rs"));
-
-/// Runtime version (Kusama).
-#[sp_version::runtime_version]
-pub const VERSION: RuntimeVersion = RuntimeVersion {
-	spec_name: create_runtime_str!("kusama"),
-	impl_name: create_runtime_str!("parity-kusama"),
-	authoring_version: 2,
-	spec_version: 9430,
-	impl_version: 0,
-	#[cfg(not(feature = "disable-runtime-api"))]
-	apis: RUNTIME_API_VERSIONS,
-	#[cfg(feature = "disable-runtime-api")]
-	apis: sp_version::create_apis_vec![[]],
-	transaction_version: 23,
-	state_version: 1,
-};
-
-/// The BABE epoch configuration at genesis.
-pub const BABE_GENESIS_EPOCH_CONFIG: babe_primitives::BabeEpochConfiguration =
-	babe_primitives::BabeEpochConfiguration {
-		c: PRIMARY_PROBABILITY,
-		allowed_slots: babe_primitives::AllowedSlots::PrimaryAndSecondaryVRFSlots,
-	};
-
-/// Native version.
-#[cfg(any(feature = "std", test))]
-pub fn native_version() -> NativeVersion {
-	NativeVersion { runtime_version: VERSION, can_author_with: Default::default() }
-}
-
-/// We currently allow all calls.
-pub struct BaseFilter;
-impl Contains<RuntimeCall> for BaseFilter {
-	fn contains(_c: &RuntimeCall) -> bool {
-		true
-	}
-}
-
-parameter_types! {
-	pub const Version: RuntimeVersion = VERSION;
-	pub const SS58Prefix: u8 = 2;
-}
-
-impl frame_system::Config for Runtime {
-	type BaseCallFilter = frame_support::traits::Everything;
-	type BlockWeights = BlockWeights;
-	type BlockLength = BlockLength;
-	type RuntimeOrigin = RuntimeOrigin;
-	type RuntimeCall = RuntimeCall;
-	type Nonce = Nonce;
-	type Hash = Hash;
-	type Hashing = BlakeTwo256;
-	type AccountId = AccountId;
-	type Lookup = AccountIdLookup<AccountId, ()>;
-	type Block = Block;
-	type RuntimeEvent = RuntimeEvent;
-	type BlockHashCount = BlockHashCount;
-	type DbWeight = RocksDbWeight;
-	type Version = Version;
-	type PalletInfo = PalletInfo;
-	type AccountData = pallet_balances::AccountData<Balance>;
-	type OnNewAccount = ();
-	type OnKilledAccount = ();
-	type SystemWeightInfo = weights::frame_system::WeightInfo<Runtime>;
-	type SS58Prefix = SS58Prefix;
-	type OnSetCode = ();
-	type MaxConsumers = frame_support::traits::ConstU32<16>;
-}
-
-parameter_types! {
-	pub MaximumSchedulerWeight: Weight = Perbill::from_percent(80) * BlockWeights::get().max_block;
-	pub const MaxScheduledPerBlock: u32 = 50;
-	pub const NoPreimagePostponement: Option<u32> = Some(10);
-}
-
-/// Used the compare the privilege of an origin inside the scheduler.
-pub struct OriginPrivilegeCmp;
-
-impl PrivilegeCmp<OriginCaller> for OriginPrivilegeCmp {
-	fn cmp_privilege(left: &OriginCaller, right: &OriginCaller) -> Option<Ordering> {
-		if left == right {
-			return Some(Ordering::Equal)
-		}
-
-		match (left, right) {
-			// Root is greater than anything.
-			(OriginCaller::system(frame_system::RawOrigin::Root), _) => Some(Ordering::Greater),
-			// For every other origin we don't care, as they are not used for `ScheduleOrigin`.
-			_ => None,
-		}
-	}
-}
-
-impl pallet_scheduler::Config for Runtime {
-	type RuntimeOrigin = RuntimeOrigin;
-	type RuntimeEvent = RuntimeEvent;
-	type PalletsOrigin = OriginCaller;
-	type RuntimeCall = RuntimeCall;
-	type MaximumWeight = MaximumSchedulerWeight;
-	// The goal of having ScheduleOrigin include AuctionAdmin is to allow the auctions track of
-	// OpenGov to schedule periodic auctions.
-	type ScheduleOrigin = EitherOf<EnsureRoot<AccountId>, AuctionAdmin>;
-	type MaxScheduledPerBlock = MaxScheduledPerBlock;
-	type WeightInfo = weights::pallet_scheduler::WeightInfo<Runtime>;
-	type OriginPrivilegeCmp = OriginPrivilegeCmp;
-	type Preimages = Preimage;
-}
-
-parameter_types! {
-	pub const PreimageBaseDeposit: Balance = deposit(2, 64);
-	pub const PreimageByteDeposit: Balance = deposit(0, 1);
-}
-
-impl pallet_preimage::Config for Runtime {
-	type WeightInfo = weights::pallet_preimage::WeightInfo<Runtime>;
-	type RuntimeEvent = RuntimeEvent;
-	type Currency = Balances;
-	type ManagerOrigin = EnsureRoot<AccountId>;
-	type BaseDeposit = PreimageBaseDeposit;
-	type ByteDeposit = PreimageByteDeposit;
-}
-
-parameter_types! {
-	pub EpochDuration: u64 = prod_or_fast!(
-		EPOCH_DURATION_IN_SLOTS as u64,
-		2 * MINUTES as u64,
-		"KSM_EPOCH_DURATION"
-	);
-	pub const ExpectedBlockTime: Moment = MILLISECS_PER_BLOCK;
-	pub ReportLongevity: u64 =
-		BondingDuration::get() as u64 * SessionsPerEra::get() as u64 * EpochDuration::get();
-}
-
-impl pallet_babe::Config for Runtime {
-	type EpochDuration = EpochDuration;
-	type ExpectedBlockTime = ExpectedBlockTime;
-
-	// session module is the trigger
-	type EpochChangeTrigger = pallet_babe::ExternalTrigger;
-
-	type DisabledValidators = Session;
-
-	type KeyOwnerProof =
-		<Historical as KeyOwnerProofSystem<(KeyTypeId, pallet_babe::AuthorityId)>>::Proof;
-
-	type EquivocationReportSystem =
-		pallet_babe::EquivocationReportSystem<Self, Offences, Historical, ReportLongevity>;
-
-	type WeightInfo = ();
-
-	type MaxAuthorities = MaxAuthorities;
-	type MaxNominators = MaxNominatorRewardedPerValidator;
-}
-
-parameter_types! {
-	pub const IndexDeposit: Balance = 100 * CENTS;
-}
-
-impl pallet_indices::Config for Runtime {
-	type AccountIndex = AccountIndex;
-	type Currency = Balances;
-	type Deposit = IndexDeposit;
-	type RuntimeEvent = RuntimeEvent;
-	type WeightInfo = weights::pallet_indices::WeightInfo<Runtime>;
-}
-
-parameter_types! {
-	pub const ExistentialDeposit: Balance = EXISTENTIAL_DEPOSIT;
-	pub const MaxLocks: u32 = 50;
-	pub const MaxReserves: u32 = 50;
-}
-
-impl pallet_balances::Config for Runtime {
-	type Balance = Balance;
-	type DustRemoval = ();
-	type RuntimeEvent = RuntimeEvent;
-	type ExistentialDeposit = ExistentialDeposit;
-	type AccountStore = System;
-	type MaxLocks = MaxLocks;
-	type MaxReserves = MaxReserves;
-	type ReserveIdentifier = [u8; 8];
-	type WeightInfo = weights::pallet_balances::WeightInfo<Runtime>;
-	type FreezeIdentifier = ();
-	type MaxFreezes = ();
-	type RuntimeHoldReason = RuntimeHoldReason;
-	type MaxHolds = ConstU32<1>;
-}
-
-parameter_types! {
-	pub BeefySetIdSessionEntries: u32 = BondingDuration::get() * SessionsPerEra::get();
-}
-
-impl pallet_beefy::Config for Runtime {
-	type BeefyId = BeefyId;
-	type MaxAuthorities = MaxAuthorities;
-	type MaxNominators = MaxNominatorRewardedPerValidator;
-	type MaxSetIdSessionEntries = BeefySetIdSessionEntries;
-	type OnNewValidatorSet = BeefyMmrLeaf;
-	type WeightInfo = ();
-	type KeyOwnerProof = <Historical as KeyOwnerProofSystem<(KeyTypeId, BeefyId)>>::Proof;
-	type EquivocationReportSystem =
-		pallet_beefy::EquivocationReportSystem<Self, Offences, Historical, ReportLongevity>;
-}
-
-impl pallet_mmr::Config for Runtime {
-	const INDEXING_PREFIX: &'static [u8] = mmr::INDEXING_PREFIX;
-	type Hashing = Keccak256;
-	type OnNewRoot = pallet_beefy_mmr::DepositBeefyDigest<Runtime>;
-	type WeightInfo = ();
-	type LeafData = pallet_beefy_mmr::Pallet<Runtime>;
-}
-
-/// MMR helper types.
-mod mmr {
-	use super::Runtime;
-	pub use pallet_mmr::primitives::*;
-
-	pub type Leaf = <<Runtime as pallet_mmr::Config>::LeafData as LeafDataProvider>::LeafData;
-	pub type Hashing = <Runtime as pallet_mmr::Config>::Hashing;
-	pub type Hash = <Hashing as sp_runtime::traits::Hash>::Output;
-}
-
-parameter_types! {
-	/// Version of the produced MMR leaf.
-	///
-	/// The version consists of two parts;
-	/// - `major` (3 bits)
-	/// - `minor` (5 bits)
-	///
-	/// `major` should be updated only if decoding the previous MMR Leaf format from the payload
-	/// is not possible (i.e. backward incompatible change).
-	/// `minor` should be updated if fields are added to the previous MMR Leaf, which given SCALE
-	/// encoding does not prevent old leafs from being decoded.
-	///
-	/// Hence we expect `major` to be changed really rarely (think never).
-	/// See [`MmrLeafVersion`] type documentation for more details.
-	pub LeafVersion: MmrLeafVersion = MmrLeafVersion::new(0, 0);
-}
-
-/// A BEEFY data provider that merkelizes all the parachain heads at the current block
-/// (sorted by their parachain id).
-pub struct ParaHeadsRootProvider;
-impl BeefyDataProvider<H256> for ParaHeadsRootProvider {
-	fn extra_data() -> H256 {
-		let mut para_heads: Vec<(u32, Vec<u8>)> = Paras::parachains()
-			.into_iter()
-			.filter_map(|id| Paras::para_head(&id).map(|head| (id.into(), head.0)))
-			.collect();
-		para_heads.sort_by_key(|k| k.0);
-		binary_merkle_tree::merkle_root::<mmr::Hashing, _>(
-			para_heads.into_iter().map(|pair| pair.encode()),
-		)
-		.into()
-	}
-}
-
-impl pallet_beefy_mmr::Config for Runtime {
-	type LeafVersion = LeafVersion;
-	type BeefyAuthorityToMerkleLeaf = pallet_beefy_mmr::BeefyEcdsaToEthereum;
-	type LeafExtra = H256;
-	type BeefyDataProvider = ParaHeadsRootProvider;
-}
-
-parameter_types! {
-	pub const TransactionByteFee: Balance = 10 * MILLICENTS;
-	/// This value increases the priority of `Operational` transactions by adding
-	/// a "virtual tip" that's equal to the `OperationalFeeMultiplier * final_fee`.
-	pub const OperationalFeeMultiplier: u8 = 5;
-}
-
-impl pallet_transaction_payment::Config for Runtime {
-	type RuntimeEvent = RuntimeEvent;
-	type OnChargeTransaction = CurrencyAdapter<Balances, DealWithFees<Self>>;
-	type OperationalFeeMultiplier = OperationalFeeMultiplier;
-	type WeightToFee = WeightToFee;
-	type LengthToFee = ConstantMultiplier<Balance, TransactionByteFee>;
-	type FeeMultiplierUpdate = SlowAdjustingFeeUpdate<Self>;
-}
-
-parameter_types! {
-	pub const MinimumPeriod: u64 = SLOT_DURATION / 2;
-}
-impl pallet_timestamp::Config for Runtime {
-	type Moment = u64;
-	type OnTimestampSet = Babe;
-	type MinimumPeriod = MinimumPeriod;
-	type WeightInfo = weights::pallet_timestamp::WeightInfo<Runtime>;
-}
-
-impl pallet_authorship::Config for Runtime {
-	type FindAuthor = pallet_session::FindAccountFromAuthorIndex<Self, Babe>;
-	type EventHandler = (Staking, ImOnline);
-}
-
-impl_opaque_keys! {
-	pub struct OldSessionKeys {
-		pub grandpa: Grandpa,
-		pub babe: Babe,
-		pub im_online: ImOnline,
-		pub para_validator: Initializer,
-		pub para_assignment: ParaSessionInfo,
-		pub authority_discovery: AuthorityDiscovery,
-	}
-}
-
-impl_opaque_keys! {
-	pub struct SessionKeys {
-		pub grandpa: Grandpa,
-		pub babe: Babe,
-		pub im_online: ImOnline,
-		pub para_validator: Initializer,
-		pub para_assignment: ParaSessionInfo,
-		pub authority_discovery: AuthorityDiscovery,
-		pub beefy: Beefy,
-	}
-}
-
-// remove this when removing `OldSessionKeys`
-fn transform_session_keys(v: AccountId, old: OldSessionKeys) -> SessionKeys {
-	SessionKeys {
-		grandpa: old.grandpa,
-		babe: old.babe,
-		im_online: old.im_online,
-		para_validator: old.para_validator,
-		para_assignment: old.para_assignment,
-		authority_discovery: old.authority_discovery,
-		beefy: {
-			// From Session::upgrade_keys():
-			//
-			// Care should be taken that the raw versions of the
-			// added keys are unique for every `ValidatorId, KeyTypeId` combination.
-			// This is an invariant that the session pallet typically maintains internally.
-			//
-			// So, produce a dummy value that's unique for the `ValidatorId, KeyTypeId` combination.
-			let mut id: BeefyId = sp_application_crypto::ecdsa::Public::from_raw([0u8; 33]).into();
-			let id_raw: &mut [u8] = id.as_mut();
-			id_raw[1..33].copy_from_slice(v.as_ref());
-			id_raw[0..4].copy_from_slice(b"beef");
-			id
-		},
-	}
-}
-
-impl pallet_session::Config for Runtime {
-	type RuntimeEvent = RuntimeEvent;
-	type ValidatorId = AccountId;
-	type ValidatorIdOf = pallet_staking::StashOf<Self>;
-	type ShouldEndSession = Babe;
-	type NextSessionRotation = Babe;
-	type SessionManager = pallet_session::historical::NoteHistoricalRoot<Self, Staking>;
-	type SessionHandler = <SessionKeys as OpaqueKeys>::KeyTypeIdProviders;
-	type Keys = SessionKeys;
-	type WeightInfo = weights::pallet_session::WeightInfo<Runtime>;
-}
-
-impl pallet_session::historical::Config for Runtime {
-	type FullIdentification = pallet_staking::Exposure<AccountId, Balance>;
-	type FullIdentificationOf = pallet_staking::ExposureOf<Runtime>;
-}
-
-parameter_types! {
-	// phase durations. 1/4 of the last session for each.
-	// in testing: 1min or half of the session for each
-	pub SignedPhase: u32 = prod_or_fast!(
-		EPOCH_DURATION_IN_SLOTS / 4,
-		(1 * MINUTES).min(EpochDuration::get().saturated_into::<u32>() / 2),
-		"KSM_SIGNED_PHASE"
-	);
-	pub UnsignedPhase: u32 = prod_or_fast!(
-		EPOCH_DURATION_IN_SLOTS / 4,
-		(1 * MINUTES).min(EpochDuration::get().saturated_into::<u32>() / 2),
-		"KSM_UNSIGNED_PHASE"
-	);
-
-	// signed config
-	pub const SignedMaxSubmissions: u32 = 16;
-	pub const SignedMaxRefunds: u32 = 16 / 4;
-	pub const SignedDepositBase: Balance = deposit(2, 0);
-	pub const SignedDepositByte: Balance = deposit(0, 10) / 1024;
-	// Each good submission will get 1/10 KSM as reward
-	pub SignedRewardBase: Balance =  UNITS / 10;
-	pub BetterUnsignedThreshold: Perbill = Perbill::from_rational(5u32, 10_000);
-
-	// 1 hour session, 15 minutes unsigned phase, 8 offchain executions.
-	pub OffchainRepeat: BlockNumber = UnsignedPhase::get() / 8;
-
-	pub const MaxElectingVoters: u32 = 12_500;
-	/// We take the top 12500 nominators as electing voters and all of the validators as electable
-	/// targets. Whilst this is the case, we cannot and shall not increase the size of the
-	/// validator intentions.
-	pub ElectionBounds: frame_election_provider_support::bounds::ElectionBounds =
-		ElectionBoundsBuilder::default().voters_count(MaxElectingVoters::get().into()).build();
-	pub NposSolutionPriority: TransactionPriority =
-		Perbill::from_percent(90) * TransactionPriority::max_value();
-	/// Setup election pallet to support maximum winners upto 2000. This will mean Staking Pallet
-	/// cannot have active validators higher than this count.
-	pub const MaxActiveValidators: u32 = 2000;
-}
-
-generate_solution_type!(
-	#[compact]
-	pub struct NposCompactSolution24::<
-		VoterIndex = u32,
-		TargetIndex = u16,
-		Accuracy = sp_runtime::PerU16,
-		MaxVoters = MaxElectingVoters,
-	>(24)
-);
-
-pub struct OnChainSeqPhragmen;
-impl onchain::Config for OnChainSeqPhragmen {
-	type System = Runtime;
-	type Solver = SequentialPhragmen<AccountId, runtime_common::elections::OnChainAccuracy>;
-	type DataProvider = Staking;
-	type WeightInfo = weights::frame_election_provider_support::WeightInfo<Runtime>;
-	type MaxWinners = MaxActiveValidators;
-	type Bounds = ElectionBounds;
-}
-
-impl pallet_election_provider_multi_phase::MinerConfig for Runtime {
-	type AccountId = AccountId;
-	type MaxLength = OffchainSolutionLengthLimit;
-	type MaxWeight = OffchainSolutionWeightLimit;
-	type Solution = NposCompactSolution24;
-	type MaxVotesPerVoter = <
-		<Self as pallet_election_provider_multi_phase::Config>::DataProvider
-		as
-		frame_election_provider_support::ElectionDataProvider
-	>::MaxVotesPerVoter;
-	type MaxWinners = MaxActiveValidators;
-
-	// The unsigned submissions have to respect the weight of the submit_unsigned call, thus their
-	// weight estimate function is wired to this call's weight.
-	fn solution_weight(v: u32, t: u32, a: u32, d: u32) -> Weight {
-		<
-			<Self as pallet_election_provider_multi_phase::Config>::WeightInfo
-			as
-			pallet_election_provider_multi_phase::WeightInfo
-		>::submit_unsigned(v, t, a, d)
-	}
-}
-
-impl pallet_election_provider_multi_phase::Config for Runtime {
-	type RuntimeEvent = RuntimeEvent;
-	type Currency = Balances;
-	type EstimateCallFee = TransactionPayment;
-	type UnsignedPhase = UnsignedPhase;
-	type SignedMaxSubmissions = SignedMaxSubmissions;
-	type SignedMaxRefunds = SignedMaxRefunds;
-	type SignedRewardBase = SignedRewardBase;
-	type SignedDepositBase = SignedDepositBase;
-	type SignedDepositByte = SignedDepositByte;
-	type SignedDepositWeight = ();
-	type SignedMaxWeight =
-		<Self::MinerConfig as pallet_election_provider_multi_phase::MinerConfig>::MaxWeight;
-	type MinerConfig = Self;
-	type SlashHandler = (); // burn slashes
-	type RewardHandler = (); // nothing to do upon rewards
-	type SignedPhase = SignedPhase;
-	type BetterUnsignedThreshold = BetterUnsignedThreshold;
-	type BetterSignedThreshold = ();
-	type OffchainRepeat = OffchainRepeat;
-	type MinerTxPriority = NposSolutionPriority;
-	type DataProvider = Staking;
-	#[cfg(any(feature = "fast-runtime", feature = "runtime-benchmarks"))]
-	type Fallback = onchain::OnChainExecution<OnChainSeqPhragmen>;
-	#[cfg(not(any(feature = "fast-runtime", feature = "runtime-benchmarks")))]
-	type Fallback = frame_election_provider_support::NoElection<(
-		AccountId,
-		BlockNumber,
-		Staking,
-		MaxActiveValidators,
-	)>;
-	type GovernanceFallback = onchain::OnChainExecution<OnChainSeqPhragmen>;
-	type Solver = SequentialPhragmen<
-		AccountId,
-		pallet_election_provider_multi_phase::SolutionAccuracyOf<Self>,
-		(),
-	>;
-	type BenchmarkingConfig = runtime_common::elections::BenchmarkConfig;
-	type ForceOrigin = EitherOf<EnsureRoot<Self::AccountId>, StakingAdmin>;
-	type WeightInfo = weights::pallet_election_provider_multi_phase::WeightInfo<Self>;
-	type MaxWinners = MaxActiveValidators;
-	type ElectionBounds = ElectionBounds;
-}
-
-parameter_types! {
-	pub const BagThresholds: &'static [u64] = &bag_thresholds::THRESHOLDS;
-}
-
-type VoterBagsListInstance = pallet_bags_list::Instance1;
-impl pallet_bags_list::Config<VoterBagsListInstance> for Runtime {
-	type RuntimeEvent = RuntimeEvent;
-	type ScoreProvider = Staking;
-	type WeightInfo = weights::pallet_bags_list::WeightInfo<Runtime>;
-	type BagThresholds = BagThresholds;
-	type Score = sp_npos_elections::VoteWeight;
-}
-
-pub struct EraPayout;
-impl pallet_staking::EraPayout<Balance> for EraPayout {
-	fn era_payout(
-		total_staked: Balance,
-		_total_issuance: Balance,
-		era_duration_millis: u64,
-	) -> (Balance, Balance) {
-		// all para-ids that are currently active.
-		let auctioned_slots = Paras::parachains()
-			.into_iter()
-			// all active para-ids that do not belong to a system or common good chain is the number
-			// of parachains that we should take into account for inflation.
-			.filter(|i| *i >= LOWEST_PUBLIC_ID)
-			.count() as u64;
-
-		const MAX_ANNUAL_INFLATION: Perquintill = Perquintill::from_percent(10);
-		const MILLISECONDS_PER_YEAR: u64 = 1000 * 3600 * 24 * 36525 / 100;
-
-		runtime_common::impls::era_payout(
-			total_staked,
-			Nis::issuance().other,
-			MAX_ANNUAL_INFLATION,
-			Perquintill::from_rational(era_duration_millis, MILLISECONDS_PER_YEAR),
-			auctioned_slots,
-		)
-	}
-}
-
-parameter_types! {
-	// Six sessions in an era (6 hours).
-	pub const SessionsPerEra: SessionIndex = prod_or_fast!(6, 1);
-
-	// 28 eras for unbonding (7 days).
-	pub BondingDuration: sp_staking::EraIndex = prod_or_fast!(
-		28,
-		28,
-		"DOT_BONDING_DURATION"
-	);
-	// 27 eras in which slashes can be cancelled (slightly less than 7 days).
-	pub SlashDeferDuration: sp_staking::EraIndex = prod_or_fast!(
-		27,
-		27,
-		"DOT_SLASH_DEFER_DURATION"
-	);
-	pub const MaxNominatorRewardedPerValidator: u32 = 512;
-	pub const OffendingValidatorsThreshold: Perbill = Perbill::from_percent(17);
-	// 24
-	pub const MaxNominations: u32 = <NposCompactSolution24 as NposSolution>::LIMIT as u32;
-}
-
-impl pallet_staking::Config for Runtime {
-	type Currency = Balances;
-	type CurrencyBalance = Balance;
-	type UnixTime = Timestamp;
-	type CurrencyToVote = CurrencyToVote;
-	type ElectionProvider = ElectionProviderMultiPhase;
-	type GenesisElectionProvider = onchain::OnChainExecution<OnChainSeqPhragmen>;
-	type RewardRemainder = Treasury;
-	type RuntimeEvent = RuntimeEvent;
-	type Slash = Treasury;
-	type Reward = ();
-	type SessionsPerEra = SessionsPerEra;
-	type BondingDuration = BondingDuration;
-	type SlashDeferDuration = SlashDeferDuration;
-	type AdminOrigin = EitherOf<EnsureRoot<Self::AccountId>, StakingAdmin>;
-	type SessionInterface = Self;
-	type EraPayout = EraPayout;
-	type NextNewSession = Session;
-	type MaxNominatorRewardedPerValidator = MaxNominatorRewardedPerValidator;
-	type OffendingValidatorsThreshold = OffendingValidatorsThreshold;
-	type VoterList = VoterList;
-	type TargetList = UseValidatorsMap<Self>;
-	type NominationsQuota = pallet_staking::FixedNominationsQuota<{ MaxNominations::get() }>;
-	type MaxUnlockingChunks = frame_support::traits::ConstU32<32>;
-	type HistoryDepth = frame_support::traits::ConstU32<84>;
-	type BenchmarkingConfig = runtime_common::StakingBenchmarkingConfig;
-	type EventListeners = NominationPools;
-	type WeightInfo = weights::pallet_staking::WeightInfo<Runtime>;
-}
-
-impl pallet_fast_unstake::Config for Runtime {
-	type RuntimeEvent = RuntimeEvent;
-	type Currency = Balances;
-	type BatchSize = frame_support::traits::ConstU32<64>;
-	type Deposit = frame_support::traits::ConstU128<{ CENTS * 100 }>;
-	type ControlOrigin = EnsureRoot<AccountId>;
-	type Staking = Staking;
-	type MaxErasToCheckPerBlock = ConstU32<1>;
-	#[cfg(feature = "runtime-benchmarks")]
-	type MaxBackersPerValidator = MaxNominatorRewardedPerValidator;
-	type WeightInfo = weights::pallet_fast_unstake::WeightInfo<Runtime>;
-}
-
-parameter_types! {
-	pub const ProposalBond: Permill = Permill::from_percent(5);
-	pub const ProposalBondMinimum: Balance = 2000 * CENTS;
-	pub const ProposalBondMaximum: Balance = 1 * GRAND;
-	pub const SpendPeriod: BlockNumber = 6 * DAYS;
-	pub const Burn: Permill = Permill::from_perthousand(2);
-	pub const TreasuryPalletId: PalletId = PalletId(*b"py/trsry");
-
-	pub const TipCountdown: BlockNumber = 1 * DAYS;
-	pub const TipFindersFee: Percent = Percent::from_percent(20);
-	pub const TipReportDepositBase: Balance = 100 * CENTS;
-	pub const DataDepositPerByte: Balance = 1 * CENTS;
-	pub const MaxApprovals: u32 = 100;
-	pub const MaxAuthorities: u32 = 100_000;
-	pub const MaxKeys: u32 = 10_000;
-	pub const MaxPeerInHeartbeats: u32 = 10_000;
-}
-
-impl pallet_treasury::Config for Runtime {
-	type PalletId = TreasuryPalletId;
-	type Currency = Balances;
-	type ApproveOrigin = EitherOfDiverse<EnsureRoot<AccountId>, Treasurer>;
-	type RejectOrigin = EitherOfDiverse<EnsureRoot<AccountId>, Treasurer>;
-	type RuntimeEvent = RuntimeEvent;
-	type OnSlash = Treasury;
-	type ProposalBond = ProposalBond;
-	type ProposalBondMinimum = ProposalBondMinimum;
-	type ProposalBondMaximum = ProposalBondMaximum;
-	type SpendPeriod = SpendPeriod;
-	type Burn = Burn;
-	type BurnDestination = Society;
-	type MaxApprovals = MaxApprovals;
-	type WeightInfo = weights::pallet_treasury::WeightInfo<Runtime>;
-	type SpendFunds = Bounties;
-	type SpendOrigin = TreasurySpender;
-}
-
-parameter_types! {
-	pub const BountyDepositBase: Balance = 100 * CENTS;
-	pub const BountyDepositPayoutDelay: BlockNumber = 4 * DAYS;
-	pub const BountyUpdatePeriod: BlockNumber = 90 * DAYS;
-	pub const MaximumReasonLength: u32 = 16384;
-	pub const CuratorDepositMultiplier: Permill = Permill::from_percent(50);
-	pub const CuratorDepositMin: Balance = 10 * CENTS;
-	pub const CuratorDepositMax: Balance = 500 * CENTS;
-	pub const BountyValueMinimum: Balance = 200 * CENTS;
-}
-
-impl pallet_bounties::Config for Runtime {
-	type BountyDepositBase = BountyDepositBase;
-	type BountyDepositPayoutDelay = BountyDepositPayoutDelay;
-	type BountyUpdatePeriod = BountyUpdatePeriod;
-	type CuratorDepositMultiplier = CuratorDepositMultiplier;
-	type CuratorDepositMin = CuratorDepositMin;
-	type CuratorDepositMax = CuratorDepositMax;
-	type BountyValueMinimum = BountyValueMinimum;
-	type ChildBountyManager = ChildBounties;
-	type DataDepositPerByte = DataDepositPerByte;
-	type RuntimeEvent = RuntimeEvent;
-	type MaximumReasonLength = MaximumReasonLength;
-	type WeightInfo = weights::pallet_bounties::WeightInfo<Runtime>;
-}
-
-parameter_types! {
-	pub const MaxActiveChildBountyCount: u32 = 100;
-	pub const ChildBountyValueMinimum: Balance = BountyValueMinimum::get() / 10;
-}
-
-impl pallet_child_bounties::Config for Runtime {
-	type RuntimeEvent = RuntimeEvent;
-	type MaxActiveChildBountyCount = MaxActiveChildBountyCount;
-	type ChildBountyValueMinimum = ChildBountyValueMinimum;
-	type WeightInfo = weights::pallet_child_bounties::WeightInfo<Runtime>;
-}
-
-impl pallet_offences::Config for Runtime {
-	type RuntimeEvent = RuntimeEvent;
-	type IdentificationTuple = pallet_session::historical::IdentificationTuple<Self>;
-	type OnOffenceHandler = Staking;
-}
-
-impl pallet_authority_discovery::Config for Runtime {
-	type MaxAuthorities = MaxAuthorities;
-}
-
-parameter_types! {
-	pub const ImOnlineUnsignedPriority: TransactionPriority = TransactionPriority::max_value();
-}
-
-impl pallet_im_online::Config for Runtime {
-	type AuthorityId = ImOnlineId;
-	type RuntimeEvent = RuntimeEvent;
-	type ValidatorSet = Historical;
-	type NextSessionRotation = Babe;
-	type ReportUnresponsiveness = Offences;
-	type UnsignedPriority = ImOnlineUnsignedPriority;
-	type WeightInfo = weights::pallet_im_online::WeightInfo<Runtime>;
-	type MaxKeys = MaxKeys;
-	type MaxPeerInHeartbeats = MaxPeerInHeartbeats;
-}
-
-parameter_types! {
-	pub MaxSetIdSessionEntries: u32 = BondingDuration::get() * SessionsPerEra::get();
-}
-
-impl pallet_grandpa::Config for Runtime {
-	type RuntimeEvent = RuntimeEvent;
-
-	type WeightInfo = ();
-	type MaxAuthorities = MaxAuthorities;
-	type MaxNominators = MaxNominatorRewardedPerValidator;
-	type MaxSetIdSessionEntries = MaxSetIdSessionEntries;
-
-	type KeyOwnerProof = <Historical as KeyOwnerProofSystem<(KeyTypeId, GrandpaId)>>::Proof;
-
-	type EquivocationReportSystem =
-		pallet_grandpa::EquivocationReportSystem<Self, Offences, Historical, ReportLongevity>;
-}
-
-/// Submits transaction with the node's public and signature type. Adheres to the signed extension
-/// format of the chain.
-impl<LocalCall> frame_system::offchain::CreateSignedTransaction<LocalCall> for Runtime
-where
-	RuntimeCall: From<LocalCall>,
-{
-	fn create_transaction<C: frame_system::offchain::AppCrypto<Self::Public, Self::Signature>>(
-		call: RuntimeCall,
-		public: <Signature as Verify>::Signer,
-		account: AccountId,
-		nonce: <Runtime as frame_system::Config>::Nonce,
-	) -> Option<(RuntimeCall, <UncheckedExtrinsic as ExtrinsicT>::SignaturePayload)> {
-		use sp_runtime::traits::StaticLookup;
-		// take the biggest period possible.
-		let period =
-			BlockHashCount::get().checked_next_power_of_two().map(|c| c / 2).unwrap_or(2) as u64;
-
-		let current_block = System::block_number()
-			.saturated_into::<u64>()
-			// The `System::block_number` is initialized with `n+1`,
-			// so the actual block number is `n`.
-			.saturating_sub(1);
-		let tip = 0;
-		let extra: SignedExtra = (
-			frame_system::CheckNonZeroSender::<Runtime>::new(),
-			frame_system::CheckSpecVersion::<Runtime>::new(),
-			frame_system::CheckTxVersion::<Runtime>::new(),
-			frame_system::CheckGenesis::<Runtime>::new(),
-			frame_system::CheckMortality::<Runtime>::from(generic::Era::mortal(
-				period,
-				current_block,
-			)),
-			frame_system::CheckNonce::<Runtime>::from(nonce),
-			frame_system::CheckWeight::<Runtime>::new(),
-			pallet_transaction_payment::ChargeTransactionPayment::<Runtime>::from(tip),
-		);
-		let raw_payload = SignedPayload::new(call, extra)
-			.map_err(|e| {
-				log::warn!("Unable to create signed payload: {:?}", e);
-			})
-			.ok()?;
-		let signature = raw_payload.using_encoded(|payload| C::sign(payload, public))?;
-		let (call, extra, _) = raw_payload.deconstruct();
-		let address = <Runtime as frame_system::Config>::Lookup::unlookup(account);
-		Some((call, (address, signature, extra)))
-	}
-}
-
-impl frame_system::offchain::SigningTypes for Runtime {
-	type Public = <Signature as Verify>::Signer;
-	type Signature = Signature;
-}
-
-impl<C> frame_system::offchain::SendTransactionTypes<C> for Runtime
-where
-	RuntimeCall: From<C>,
-{
-	type Extrinsic = UncheckedExtrinsic;
-	type OverarchingCall = RuntimeCall;
-}
-
-parameter_types! {
-	pub Prefix: &'static [u8] = b"Pay KSMs to the Kusama account:";
-}
-
-impl claims::Config for Runtime {
-	type RuntimeEvent = RuntimeEvent;
-	type VestingSchedule = Vesting;
-	type Prefix = Prefix;
-	type MoveClaimOrigin = EnsureRoot<AccountId>;
-	type WeightInfo = weights::runtime_common_claims::WeightInfo<Runtime>;
-}
-
-parameter_types! {
-	// Minimum 100 bytes/KSM deposited (1 CENT/byte)
-	pub const BasicDeposit: Balance = 1000 * CENTS;       // 258 bytes on-chain
-	pub const FieldDeposit: Balance = 250 * CENTS;        // 66 bytes on-chain
-	pub const SubAccountDeposit: Balance = 200 * CENTS;   // 53 bytes on-chain
-	pub const MaxSubAccounts: u32 = 100;
-	pub const MaxAdditionalFields: u32 = 100;
-	pub const MaxRegistrars: u32 = 20;
-}
-
-impl pallet_identity::Config for Runtime {
-	type RuntimeEvent = RuntimeEvent;
-	type Currency = Balances;
-	type BasicDeposit = BasicDeposit;
-	type FieldDeposit = FieldDeposit;
-	type SubAccountDeposit = SubAccountDeposit;
-	type MaxSubAccounts = MaxSubAccounts;
-	type MaxAdditionalFields = MaxAdditionalFields;
-	type MaxRegistrars = MaxRegistrars;
-	type Slashed = Treasury;
-	type ForceOrigin = EitherOf<EnsureRoot<Self::AccountId>, GeneralAdmin>;
-	type RegistrarOrigin = EitherOf<EnsureRoot<Self::AccountId>, GeneralAdmin>;
-	type WeightInfo = weights::pallet_identity::WeightInfo<Runtime>;
-}
-
-impl pallet_utility::Config for Runtime {
-	type RuntimeEvent = RuntimeEvent;
-	type RuntimeCall = RuntimeCall;
-	type PalletsOrigin = OriginCaller;
-	type WeightInfo = weights::pallet_utility::WeightInfo<Runtime>;
-}
-
-parameter_types! {
-	// One storage item; key size is 32; value is size 4+4+16+32 bytes = 56 bytes.
-	pub const DepositBase: Balance = deposit(1, 88);
-	// Additional storage item size of 32 bytes.
-	pub const DepositFactor: Balance = deposit(0, 32);
-	pub const MaxSignatories: u32 = 100;
-}
-
-impl pallet_multisig::Config for Runtime {
-	type RuntimeEvent = RuntimeEvent;
-	type RuntimeCall = RuntimeCall;
-	type Currency = Balances;
-	type DepositBase = DepositBase;
-	type DepositFactor = DepositFactor;
-	type MaxSignatories = MaxSignatories;
-	type WeightInfo = weights::pallet_multisig::WeightInfo<Runtime>;
-}
-
-parameter_types! {
-	pub const ConfigDepositBase: Balance = 500 * CENTS;
-	pub const FriendDepositFactor: Balance = 50 * CENTS;
-	pub const MaxFriends: u16 = 9;
-	pub const RecoveryDeposit: Balance = 500 * CENTS;
-}
-
-impl pallet_recovery::Config for Runtime {
-	type RuntimeEvent = RuntimeEvent;
-	type WeightInfo = ();
-	type RuntimeCall = RuntimeCall;
-	type Currency = Balances;
-	type ConfigDepositBase = ConfigDepositBase;
-	type FriendDepositFactor = FriendDepositFactor;
-	type MaxFriends = MaxFriends;
-	type RecoveryDeposit = RecoveryDeposit;
-}
-
-parameter_types! {
-	pub const SocietyPalletId: PalletId = PalletId(*b"py/socie");
-}
-
-impl pallet_society::Config for Runtime {
-	type RuntimeEvent = RuntimeEvent;
-	type Currency = Balances;
-	type Randomness = pallet_babe::RandomnessFromOneEpochAgo<Runtime>;
-	type GraceStrikes = ConstU32<10>;
-	type PeriodSpend = ConstU128<{ 500 * QUID }>;
-	type VotingPeriod = ConstU32<{ 5 * DAYS }>;
-	type ClaimPeriod = ConstU32<{ 2 * DAYS }>;
-	type MaxLockDuration = ConstU32<{ 36 * 30 * DAYS }>;
-	type FounderSetOrigin = EnsureRoot<AccountId>;
-	type ChallengePeriod = ConstU32<{ 7 * DAYS }>;
-	type MaxPayouts = ConstU32<8>;
-	type MaxBids = ConstU32<512>;
-	type PalletId = SocietyPalletId;
-	type WeightInfo = weights::pallet_society::WeightInfo<Runtime>;
-}
-
-parameter_types! {
-	pub const MinVestedTransfer: Balance = 100 * CENTS;
-	pub UnvestedFundsAllowedWithdrawReasons: WithdrawReasons =
-		WithdrawReasons::except(WithdrawReasons::TRANSFER | WithdrawReasons::RESERVE);
-}
-
-impl pallet_vesting::Config for Runtime {
-	type RuntimeEvent = RuntimeEvent;
-	type Currency = Balances;
-	type BlockNumberToBalance = ConvertInto;
-	type MinVestedTransfer = MinVestedTransfer;
-	type WeightInfo = weights::pallet_vesting::WeightInfo<Runtime>;
-	type UnvestedFundsAllowedWithdrawReasons = UnvestedFundsAllowedWithdrawReasons;
-	const MAX_VESTING_SCHEDULES: u32 = 28;
-}
-
-parameter_types! {
-	// One storage item; key size 32, value size 8; .
-	pub const ProxyDepositBase: Balance = deposit(1, 8);
-	// Additional storage item size of 33 bytes.
-	pub const ProxyDepositFactor: Balance = deposit(0, 33);
-	pub const MaxProxies: u16 = 32;
-	pub const AnnouncementDepositBase: Balance = deposit(1, 8);
-	pub const AnnouncementDepositFactor: Balance = deposit(0, 66);
-	pub const MaxPending: u16 = 32;
-}
-
-/// The type used to represent the kinds of proxying allowed.
-#[derive(
-	Copy,
-	Clone,
-	Eq,
-	PartialEq,
-	Ord,
-	PartialOrd,
-	Encode,
-	Decode,
-	RuntimeDebug,
-	MaxEncodedLen,
-	TypeInfo,
-)]
-pub enum ProxyType {
-	Any,
-	NonTransfer,
-	Governance,
-	Staking,
-	IdentityJudgement,
-	CancelProxy,
-	Auction,
-	Society,
-	NominationPools,
-}
-
-impl Default for ProxyType {
-	fn default() -> Self {
-		Self::Any
-	}
-}
-
-impl InstanceFilter<RuntimeCall> for ProxyType {
-	fn filter(&self, c: &RuntimeCall) -> bool {
-		match self {
-			ProxyType::Any => true,
-			ProxyType::NonTransfer => matches!(
-				c,
-				RuntimeCall::System(..) |
-				RuntimeCall::Babe(..) |
-				RuntimeCall::Timestamp(..) |
-				RuntimeCall::Indices(pallet_indices::Call::claim {..}) |
-				RuntimeCall::Indices(pallet_indices::Call::free {..}) |
-				RuntimeCall::Indices(pallet_indices::Call::freeze {..}) |
-				// Specifically omitting Indices `transfer`, `force_transfer`
-				// Specifically omitting the entire Balances pallet
-				RuntimeCall::Staking(..) |
-				RuntimeCall::Session(..) |
-				RuntimeCall::Grandpa(..) |
-				RuntimeCall::ImOnline(..) |
-				RuntimeCall::Treasury(..) |
-				RuntimeCall::Bounties(..) |
-				RuntimeCall::ChildBounties(..) |
-				RuntimeCall::ConvictionVoting(..) |
-				RuntimeCall::Referenda(..) |
-				RuntimeCall::FellowshipCollective(..) |
-				RuntimeCall::FellowshipReferenda(..) |
-				RuntimeCall::Whitelist(..) |
-				RuntimeCall::Claims(..) |
-				RuntimeCall::Utility(..) |
-				RuntimeCall::Identity(..) |
-				RuntimeCall::Society(..) |
-				RuntimeCall::Recovery(pallet_recovery::Call::as_recovered {..}) |
-				RuntimeCall::Recovery(pallet_recovery::Call::vouch_recovery {..}) |
-				RuntimeCall::Recovery(pallet_recovery::Call::claim_recovery {..}) |
-				RuntimeCall::Recovery(pallet_recovery::Call::close_recovery {..}) |
-				RuntimeCall::Recovery(pallet_recovery::Call::remove_recovery {..}) |
-				RuntimeCall::Recovery(pallet_recovery::Call::cancel_recovered {..}) |
-				// Specifically omitting Recovery `create_recovery`, `initiate_recovery`
-				RuntimeCall::Vesting(pallet_vesting::Call::vest {..}) |
-				RuntimeCall::Vesting(pallet_vesting::Call::vest_other {..}) |
-				// Specifically omitting Vesting `vested_transfer`, and `force_vested_transfer`
-				RuntimeCall::Scheduler(..) |
-				RuntimeCall::Proxy(..) |
-				RuntimeCall::Multisig(..) |
-				RuntimeCall::Nis(..) |
-				RuntimeCall::Registrar(paras_registrar::Call::register {..}) |
-				RuntimeCall::Registrar(paras_registrar::Call::deregister {..}) |
-				// Specifically omitting Registrar `swap`
-				RuntimeCall::Registrar(paras_registrar::Call::reserve {..}) |
-				RuntimeCall::Crowdloan(..) |
-				RuntimeCall::Slots(..) |
-				RuntimeCall::Auctions(..) | // Specifically omitting the entire XCM Pallet
-				RuntimeCall::VoterList(..) |
-				RuntimeCall::NominationPools(..) |
-				RuntimeCall::FastUnstake(..)
-			),
-			ProxyType::Governance => matches!(
-				c,
-				RuntimeCall::Treasury(..) |
-					RuntimeCall::Bounties(..) |
-					RuntimeCall::Utility(..) |
-					RuntimeCall::ChildBounties(..) |
-					// OpenGov calls
-					RuntimeCall::ConvictionVoting(..) |
-					RuntimeCall::Referenda(..) |
-					RuntimeCall::FellowshipCollective(..) |
-					RuntimeCall::FellowshipReferenda(..) |
-					RuntimeCall::Whitelist(..)
-			),
-			ProxyType::Staking => {
-				matches!(
-					c,
-					RuntimeCall::Staking(..) |
-						RuntimeCall::Session(..) | RuntimeCall::Utility(..) |
-						RuntimeCall::FastUnstake(..) |
-						RuntimeCall::VoterList(..) |
-						RuntimeCall::NominationPools(..)
-				)
-			},
-			ProxyType::NominationPools => {
-				matches!(c, RuntimeCall::NominationPools(..) | RuntimeCall::Utility(..))
-			},
-			ProxyType::IdentityJudgement => matches!(
-				c,
-				RuntimeCall::Identity(pallet_identity::Call::provide_judgement { .. }) |
-					RuntimeCall::Utility(..)
-			),
-			ProxyType::CancelProxy => {
-				matches!(c, RuntimeCall::Proxy(pallet_proxy::Call::reject_announcement { .. }))
-			},
-			ProxyType::Auction => matches!(
-				c,
-				RuntimeCall::Auctions(..) |
-					RuntimeCall::Crowdloan(..) |
-					RuntimeCall::Registrar(..) |
-					RuntimeCall::Slots(..)
-			),
-			ProxyType::Society => matches!(c, RuntimeCall::Society(..)),
-		}
-	}
-	fn is_superset(&self, o: &Self) -> bool {
-		match (self, o) {
-			(x, y) if x == y => true,
-			(ProxyType::Any, _) => true,
-			(_, ProxyType::Any) => false,
-			(ProxyType::NonTransfer, _) => true,
-			_ => false,
-		}
-	}
-}
-
-impl pallet_proxy::Config for Runtime {
-	type RuntimeEvent = RuntimeEvent;
-	type RuntimeCall = RuntimeCall;
-	type Currency = Balances;
-	type ProxyType = ProxyType;
-	type ProxyDepositBase = ProxyDepositBase;
-	type ProxyDepositFactor = ProxyDepositFactor;
-	type MaxProxies = MaxProxies;
-	type WeightInfo = weights::pallet_proxy::WeightInfo<Runtime>;
-	type MaxPending = MaxPending;
-	type CallHasher = BlakeTwo256;
-	type AnnouncementDepositBase = AnnouncementDepositBase;
-	type AnnouncementDepositFactor = AnnouncementDepositFactor;
-}
-
-impl parachains_origin::Config for Runtime {}
-
-impl parachains_configuration::Config for Runtime {
-	type WeightInfo = weights::runtime_parachains_configuration::WeightInfo<Runtime>;
-}
-
-impl parachains_shared::Config for Runtime {}
-
-impl parachains_session_info::Config for Runtime {
-	type ValidatorSet = Historical;
-}
-
-impl parachains_inclusion::Config for Runtime {
-	type RuntimeEvent = RuntimeEvent;
-	type DisputesHandler = ParasDisputes;
-	type RewardValidators = parachains_reward_points::RewardValidatorsWithEraPoints<Runtime>;
-	type MessageQueue = MessageQueue;
-	type WeightInfo = weights::runtime_parachains_inclusion::WeightInfo<Runtime>;
-}
-
-parameter_types! {
-	pub const ParasUnsignedPriority: TransactionPriority = TransactionPriority::max_value();
-}
-
-impl parachains_paras::Config for Runtime {
-	type RuntimeEvent = RuntimeEvent;
-	type WeightInfo = weights::runtime_parachains_paras::WeightInfo<Runtime>;
-	type UnsignedPriority = ParasUnsignedPriority;
-	type QueueFootprinter = ParaInclusion;
-	type NextSessionRotation = Babe;
-}
-
-parameter_types! {
-	/// Amount of weight that can be spent per block to service messages.
-	///
-	/// # WARNING
-	///
-	/// This is not a good value for para-chains since the `Scheduler` already uses up to 80% block weight.
-	pub MessageQueueServiceWeight: Weight = Perbill::from_percent(20) * BlockWeights::get().max_block;
-	pub const MessageQueueHeapSize: u32 = 65_536;
-	pub const MessageQueueMaxStale: u32 = 16;
-}
-
-/// Message processor to handle any messages that were enqueued into the `MessageQueue` pallet.
-pub struct MessageProcessor;
-impl ProcessMessage for MessageProcessor {
-	type Origin = AggregateMessageOrigin;
-
-	fn process_message(
-		message: &[u8],
-		origin: Self::Origin,
-		meter: &mut WeightMeter,
-		id: &mut [u8; 32],
-	) -> Result<bool, ProcessMessageError> {
-		let para = match origin {
-			AggregateMessageOrigin::Ump(UmpQueueId::Para(para)) => para,
-		};
-		xcm_builder::ProcessXcmMessage::<
-			Junction,
-			xcm_executor::XcmExecutor<xcm_config::XcmConfig>,
-			RuntimeCall,
-		>::process_message(message, Junction::Parachain(para.into()), meter, id)
-	}
-}
-
-impl pallet_message_queue::Config for Runtime {
-	type RuntimeEvent = RuntimeEvent;
-	type Size = u32;
-	type HeapSize = MessageQueueHeapSize;
-	type MaxStale = MessageQueueMaxStale;
-	type ServiceWeight = MessageQueueServiceWeight;
-	#[cfg(not(feature = "runtime-benchmarks"))]
-	type MessageProcessor = MessageProcessor;
-	#[cfg(feature = "runtime-benchmarks")]
-	type MessageProcessor =
-		pallet_message_queue::mock_helpers::NoopMessageProcessor<AggregateMessageOrigin>;
-	type QueueChangeHandler = ParaInclusion;
-	type QueuePausedQuery = ();
-	type WeightInfo = weights::pallet_message_queue::WeightInfo<Runtime>;
-}
-
-impl parachains_dmp::Config for Runtime {}
-
-impl parachains_hrmp::Config for Runtime {
-	type RuntimeOrigin = RuntimeOrigin;
-	type RuntimeEvent = RuntimeEvent;
-	type ChannelManager = EitherOf<EnsureRoot<Self::AccountId>, GeneralAdmin>;
-	type Currency = Balances;
-	type WeightInfo = weights::runtime_parachains_hrmp::WeightInfo<Runtime>;
-}
-
-impl parachains_paras_inherent::Config for Runtime {
-	type WeightInfo = weights::runtime_parachains_paras_inherent::WeightInfo<Runtime>;
-}
-
-impl parachains_scheduler::Config for Runtime {
-	type AssignmentProvider = ParaAssignmentProvider;
-}
-
-impl parachains_assigner_parachains::Config for Runtime {}
-
-impl parachains_initializer::Config for Runtime {
-	type Randomness = pallet_babe::RandomnessFromOneEpochAgo<Runtime>;
-	type ForceOrigin = EnsureRoot<AccountId>;
-	type WeightInfo = weights::runtime_parachains_initializer::WeightInfo<Runtime>;
-}
-
-impl parachains_disputes::Config for Runtime {
-	type RuntimeEvent = RuntimeEvent;
-	type RewardValidators = parachains_reward_points::RewardValidatorsWithEraPoints<Runtime>;
-	type SlashingHandler = parachains_slashing::SlashValidatorsForDisputes<ParasSlashing>;
-	type WeightInfo = weights::runtime_parachains_disputes::WeightInfo<Runtime>;
-}
-
-impl parachains_slashing::Config for Runtime {
-	type KeyOwnerProofSystem = Historical;
-	type KeyOwnerProof =
-		<Self::KeyOwnerProofSystem as KeyOwnerProofSystem<(KeyTypeId, ValidatorId)>>::Proof;
-	type KeyOwnerIdentification = <Self::KeyOwnerProofSystem as KeyOwnerProofSystem<(
-		KeyTypeId,
-		ValidatorId,
-	)>>::IdentificationTuple;
-	type HandleReports = parachains_slashing::SlashingReportHandler<
-		Self::KeyOwnerIdentification,
-		Offences,
-		ReportLongevity,
-	>;
-	type WeightInfo = weights::runtime_parachains_disputes_slashing::WeightInfo<Runtime>;
-	type BenchmarkingConfig = parachains_slashing::BenchConfig<1000>;
-}
-
-parameter_types! {
-	pub const ParaDeposit: Balance = 40 * UNITS;
-}
-
-impl paras_registrar::Config for Runtime {
-	type RuntimeOrigin = RuntimeOrigin;
-	type RuntimeEvent = RuntimeEvent;
-	type Currency = Balances;
-	type OnSwap = (Crowdloan, Slots);
-	type ParaDeposit = ParaDeposit;
-	type DataDepositPerByte = DataDepositPerByte;
-	type WeightInfo = weights::runtime_common_paras_registrar::WeightInfo<Runtime>;
-}
-
-parameter_types! {
-	// 6 weeks
-	pub LeasePeriod: BlockNumber = prod_or_fast!(6 * WEEKS, 6 * WEEKS, "KSM_LEASE_PERIOD");
-}
-
-impl slots::Config for Runtime {
-	type RuntimeEvent = RuntimeEvent;
-	type Currency = Balances;
-	type Registrar = Registrar;
-	type LeasePeriod = LeasePeriod;
-	type LeaseOffset = ();
-	type ForceOrigin = EitherOf<EnsureRoot<Self::AccountId>, LeaseAdmin>;
-	type WeightInfo = weights::runtime_common_slots::WeightInfo<Runtime>;
-}
-
-parameter_types! {
-	pub const CrowdloanId: PalletId = PalletId(*b"py/cfund");
-	pub const OldSubmissionDeposit: Balance = 3 * GRAND; // ~ 10 KSM
-	pub const MinContribution: Balance = 3_000 * CENTS; // ~ .1 KSM
-	pub const RemoveKeysLimit: u32 = 1000;
-	// Allow 32 bytes for an additional memo to a crowdloan.
-	pub const MaxMemoLength: u8 = 32;
-}
-
-impl crowdloan::Config for Runtime {
-	type RuntimeEvent = RuntimeEvent;
-	type PalletId = CrowdloanId;
-	type SubmissionDeposit = OldSubmissionDeposit;
-	type MinContribution = MinContribution;
-	type RemoveKeysLimit = RemoveKeysLimit;
-	type Registrar = Registrar;
-	type Auctioneer = Auctions;
-	type MaxMemoLength = MaxMemoLength;
-	type WeightInfo = weights::runtime_common_crowdloan::WeightInfo<Runtime>;
-}
-
-parameter_types! {
-	// The average auction is 7 days long, so this will be 70% for ending period.
-	// 5 Days = 72000 Blocks @ 6 sec per block
-	pub const EndingPeriod: BlockNumber = 5 * DAYS;
-	// ~ 1000 samples per day -> ~ 20 blocks per sample -> 2 minute samples
-	pub const SampleLength: BlockNumber = 2 * MINUTES;
-}
-
-impl auctions::Config for Runtime {
-	type RuntimeEvent = RuntimeEvent;
-	type Leaser = Slots;
-	type Registrar = Registrar;
-	type EndingPeriod = EndingPeriod;
-	type SampleLength = SampleLength;
-	type Randomness = pallet_babe::RandomnessFromOneEpochAgo<Runtime>;
-	type InitiateOrigin = EitherOf<EnsureRoot<Self::AccountId>, AuctionAdmin>;
-	type WeightInfo = weights::runtime_common_auctions::WeightInfo<Runtime>;
-}
-
-type NisCounterpartInstance = pallet_balances::Instance2;
-impl pallet_balances::Config<NisCounterpartInstance> for Runtime {
-	type Balance = Balance;
-	type DustRemoval = ();
-	type RuntimeEvent = RuntimeEvent;
-	type ExistentialDeposit = ConstU128<10_000_000_000>; // One KTC cent
-	type AccountStore = StorageMapShim<
-		pallet_balances::Account<Runtime, NisCounterpartInstance>,
-		AccountId,
-		pallet_balances::AccountData<u128>,
-	>;
-	type MaxLocks = ConstU32<4>;
-	type MaxReserves = ConstU32<4>;
-	type ReserveIdentifier = [u8; 8];
-	type WeightInfo = weights::pallet_balances_nis_counterpart_balances::WeightInfo<Runtime>;
-	type RuntimeHoldReason = RuntimeHoldReason;
-	type FreezeIdentifier = ();
-	type MaxHolds = ConstU32<0>;
-	type MaxFreezes = ConstU32<0>;
-}
-
-parameter_types! {
-	pub const NisBasePeriod: BlockNumber = 7 * DAYS;
-	pub const MinBid: Balance = 100 * QUID;
-	pub MinReceipt: Perquintill = Perquintill::from_rational(1u64, 10_000_000u64);
-	pub const IntakePeriod: BlockNumber = 5 * MINUTES;
-	pub MaxIntakeWeight: Weight = MAXIMUM_BLOCK_WEIGHT / 10;
-	pub const ThawThrottle: (Perquintill, BlockNumber) = (Perquintill::from_percent(25), 5);
-	pub storage NisTarget: Perquintill = Perquintill::zero();
-	pub const NisPalletId: PalletId = PalletId(*b"py/nis  ");
-}
-
-impl pallet_nis::Config for Runtime {
-	type WeightInfo = weights::pallet_nis::WeightInfo<Runtime>;
-	type RuntimeEvent = RuntimeEvent;
-	type Currency = Balances;
-	type CurrencyBalance = Balance;
-	type FundOrigin = frame_system::EnsureSigned<AccountId>;
-	type Counterpart = NisCounterpartBalances;
-	type CounterpartAmount = WithMaximumOf<ConstU128<21_000_000_000_000_000_000u128>>;
-	type Deficit = (); // Mint
-	type IgnoredIssuance = ();
-	type Target = NisTarget;
-	type PalletId = NisPalletId;
-	type QueueCount = ConstU32<500>;
-	type MaxQueueLen = ConstU32<1000>;
-	type FifoQueueLen = ConstU32<250>;
-	type BasePeriod = NisBasePeriod;
-	type MinBid = MinBid;
-	type MinReceipt = MinReceipt;
-	type IntakePeriod = IntakePeriod;
-	type MaxIntakeWeight = MaxIntakeWeight;
-	type ThawThrottle = ThawThrottle;
-	type RuntimeHoldReason = RuntimeHoldReason;
-}
-
-parameter_types! {
-	pub const PoolsPalletId: PalletId = PalletId(*b"py/nopls");
-	pub const MaxPointsToBalance: u8 = 10;
-}
-
-impl pallet_nomination_pools::Config for Runtime {
-	type RuntimeEvent = RuntimeEvent;
-	type WeightInfo = weights::pallet_nomination_pools::WeightInfo<Self>;
-	type Currency = Balances;
-	type RewardCounter = FixedU128;
-	type BalanceToU256 = BalanceToU256;
-	type U256ToBalance = U256ToBalance;
-	type Staking = Staking;
-	type PostUnbondingPoolsWindow = ConstU32<4>;
-	type MaxMetadataLen = ConstU32<256>;
-	// we use the same number of allowed unlocking chunks as with staking.
-	type MaxUnbonding = <Self as pallet_staking::Config>::MaxUnlockingChunks;
-	type PalletId = PoolsPalletId;
-	type MaxPointsToBalance = MaxPointsToBalance;
-}
-
-parameter_types! {
-	// The deposit configuration for the singed migration. Specially if you want to allow any signed account to do the migration (see `SignedFilter`, these deposits should be high)
-	pub const MigrationSignedDepositPerItem: Balance = 1 * CENTS;
-	pub const MigrationSignedDepositBase: Balance = 20 * CENTS * 100;
-	pub const MigrationMaxKeyLen: u32 = 512;
-}
-
-impl pallet_state_trie_migration::Config for Runtime {
-	type RuntimeEvent = RuntimeEvent;
-	type Currency = Balances;
-	type SignedDepositPerItem = MigrationSignedDepositPerItem;
-	type SignedDepositBase = MigrationSignedDepositBase;
-	type ControlOrigin = EnsureRoot<AccountId>;
-	type SignedFilter = frame_support::traits::NeverEnsureOrigin<AccountId>;
-
-	// Use same weights as substrate ones.
-	type WeightInfo = pallet_state_trie_migration::weights::SubstrateWeight<Runtime>;
-	type MaxKeyLen = MigrationMaxKeyLen;
-}
-
-construct_runtime! {
-	pub enum Runtime
-	{
-		// Basic stuff; balances is uncallable initially.
-		System: frame_system::{Pallet, Call, Storage, Config<T>, Event<T>} = 0,
-
-		// Babe must be before session.
-		Babe: pallet_babe::{Pallet, Call, Storage, Config<T>, ValidateUnsigned} = 1,
-
-		Timestamp: pallet_timestamp::{Pallet, Call, Storage, Inherent} = 2,
-		Indices: pallet_indices::{Pallet, Call, Storage, Config<T>, Event<T>} = 3,
-		Balances: pallet_balances::{Pallet, Call, Storage, Config<T>, Event<T>} = 4,
-		TransactionPayment: pallet_transaction_payment::{Pallet, Storage, Event<T>} = 33,
-
-		// Consensus support.
-		// Authorship must be before session in order to note author in the correct session and era
-		// for im-online and staking.
-		Authorship: pallet_authorship::{Pallet, Storage} = 5,
-		Staking: pallet_staking::{Pallet, Call, Storage, Config<T>, Event<T>} = 6,
-		Offences: pallet_offences::{Pallet, Storage, Event} = 7,
-		Historical: session_historical::{Pallet} = 34,
-
-		// BEEFY Bridges support.
-		Beefy: pallet_beefy::{Pallet, Call, Storage, Config<T>, ValidateUnsigned} = 200,
-		// MMR leaf construction must be before session in order to have leaf contents
-		// refer to block<N-1> consistently. see substrate issue #11797 for details.
-		Mmr: pallet_mmr::{Pallet, Storage} = 201,
-		BeefyMmrLeaf: pallet_beefy_mmr::{Pallet, Storage} = 202,
-
-		Session: pallet_session::{Pallet, Call, Storage, Event, Config<T>} = 8,
-		Grandpa: pallet_grandpa::{Pallet, Call, Storage, Config<T>, Event, ValidateUnsigned} = 10,
-		ImOnline: pallet_im_online::{Pallet, Call, Storage, Event<T>, ValidateUnsigned, Config<T>} = 11,
-		AuthorityDiscovery: pallet_authority_discovery::{Pallet, Config<T>} = 12,
-
-		// Governance stuff.
-		Treasury: pallet_treasury::{Pallet, Call, Storage, Config<T>, Event<T>} = 18,
-		ConvictionVoting: pallet_conviction_voting::{Pallet, Call, Storage, Event<T>} = 20,
-		Referenda: pallet_referenda::{Pallet, Call, Storage, Event<T>} = 21,
-//		pub type FellowshipCollectiveInstance = pallet_ranked_collective::Instance1;
-		FellowshipCollective: pallet_ranked_collective::<Instance1>::{
-			Pallet, Call, Storage, Event<T>
-		} = 22,
-//		pub type FellowshipReferendaInstance = pallet_referenda::Instance2;
-		FellowshipReferenda: pallet_referenda::<Instance2>::{
-			Pallet, Call, Storage, Event<T>
-		} = 23,
-		Origins: pallet_custom_origins::{Origin} = 43,
-		Whitelist: pallet_whitelist::{Pallet, Call, Storage, Event<T>} = 44,
-
-		// Claims. Usable initially.
-		Claims: claims::{Pallet, Call, Storage, Event<T>, Config<T>, ValidateUnsigned} = 19,
-
-		// Utility module.
-		Utility: pallet_utility::{Pallet, Call, Event} = 24,
-
-		// Less simple identity module.
-		Identity: pallet_identity::{Pallet, Call, Storage, Event<T>} = 25,
-
-		// Society module.
-		Society: pallet_society::{Pallet, Call, Storage, Event<T>} = 26,
-
-		// Social recovery module.
-		Recovery: pallet_recovery::{Pallet, Call, Storage, Event<T>} = 27,
-
-		// Vesting. Usable initially, but removed once all vesting is finished.
-		Vesting: pallet_vesting::{Pallet, Call, Storage, Event<T>, Config<T>} = 28,
-
-		// System scheduler.
-		Scheduler: pallet_scheduler::{Pallet, Call, Storage, Event<T>} = 29,
-
-		// Proxy module. Late addition.
-		Proxy: pallet_proxy::{Pallet, Call, Storage, Event<T>} = 30,
-
-		// Multisig module. Late addition.
-		Multisig: pallet_multisig::{Pallet, Call, Storage, Event<T>} = 31,
-
-		// Preimage registrar.
-		Preimage: pallet_preimage::{Pallet, Call, Storage, Event<T>} = 32,
-
-		// Bounties modules.
-		Bounties: pallet_bounties::{Pallet, Call, Storage, Event<T>} = 35,
-		ChildBounties: pallet_child_bounties = 40,
-
-		// Election pallet. Only works with staking, but placed here to maintain indices.
-		ElectionProviderMultiPhase: pallet_election_provider_multi_phase::{Pallet, Call, Storage, Event<T>, ValidateUnsigned} = 37,
-
-		// NIS pallet.
-		Nis: pallet_nis::{Pallet, Call, Storage, Event<T>, HoldReason} = 38,
-//		pub type NisCounterpartInstance = pallet_balances::Instance2;
-		NisCounterpartBalances: pallet_balances::<Instance2> = 45,
-
-		// Provides a semi-sorted list of nominators for staking.
-		VoterList: pallet_bags_list::<Instance1>::{Pallet, Call, Storage, Event<T>} = 39,
-
-		// nomination pools: extension to staking.
-		NominationPools: pallet_nomination_pools::{Pallet, Call, Storage, Event<T>, Config<T>} = 41,
-
-		// Fast unstake pallet: extension to staking.
-		FastUnstake: pallet_fast_unstake = 42,
-
-		// Parachains pallets. Start indices at 50 to leave room.
-		ParachainsOrigin: parachains_origin::{Pallet, Origin} = 50,
-		Configuration: parachains_configuration::{Pallet, Call, Storage, Config<T>} = 51,
-		ParasShared: parachains_shared::{Pallet, Call, Storage} = 52,
-		ParaInclusion: parachains_inclusion::{Pallet, Call, Storage, Event<T>} = 53,
-		ParaInherent: parachains_paras_inherent::{Pallet, Call, Storage, Inherent} = 54,
-		ParaScheduler: parachains_scheduler::{Pallet, Storage} = 55,
-		Paras: parachains_paras::{Pallet, Call, Storage, Event, Config<T>, ValidateUnsigned} = 56,
-		Initializer: parachains_initializer::{Pallet, Call, Storage} = 57,
-		Dmp: parachains_dmp::{Pallet, Storage} = 58,
-		Hrmp: parachains_hrmp::{Pallet, Call, Storage, Event<T>, Config<T>} = 60,
-		ParaSessionInfo: parachains_session_info::{Pallet, Storage} = 61,
-		ParasDisputes: parachains_disputes::{Pallet, Call, Storage, Event<T>} = 62,
-		ParasSlashing: parachains_slashing::{Pallet, Call, Storage, ValidateUnsigned} = 63,
-		ParaAssignmentProvider: parachains_assigner_parachains::{Pallet, Storage} = 64,
-
-		// Parachain Onboarding Pallets. Start indices at 70 to leave room.
-		Registrar: paras_registrar::{Pallet, Call, Storage, Event<T>} = 70,
-		Slots: slots::{Pallet, Call, Storage, Event<T>} = 71,
-		Auctions: auctions::{Pallet, Call, Storage, Event<T>} = 72,
-		Crowdloan: crowdloan::{Pallet, Call, Storage, Event<T>} = 73,
-
-		// State trie migration pallet, only temporary.
-		StateTrieMigration: pallet_state_trie_migration = 98,
-
-		// Pallet for sending XCM.
-		XcmPallet: pallet_xcm::{Pallet, Call, Storage, Event<T>, Origin, Config<T>} = 99,
-
-		// Generalized message queue
-		MessageQueue: pallet_message_queue::{Pallet, Call, Storage, Event<T>} = 100,
-	}
-}
-
-/// The address format for describing accounts.
-pub type Address = sp_runtime::MultiAddress<AccountId, ()>;
-/// Block header type as expected by this runtime.
-pub type Header = generic::Header<BlockNumber, BlakeTwo256>;
-/// Block type as expected by this runtime.
-pub type Block = generic::Block<Header, UncheckedExtrinsic>;
-/// A Block signed with a Justification
-pub type SignedBlock = generic::SignedBlock<Block>;
-/// `BlockId` type as expected by this runtime.
-pub type BlockId = generic::BlockId<Block>;
-/// The `SignedExtension` to the basic transaction logic.
-pub type SignedExtra = (
-	frame_system::CheckNonZeroSender<Runtime>,
-	frame_system::CheckSpecVersion<Runtime>,
-	frame_system::CheckTxVersion<Runtime>,
-	frame_system::CheckGenesis<Runtime>,
-	frame_system::CheckMortality<Runtime>,
-	frame_system::CheckNonce<Runtime>,
-	frame_system::CheckWeight<Runtime>,
-	pallet_transaction_payment::ChargeTransactionPayment<Runtime>,
-);
-
-pub struct NominationPoolsMigrationV4OldPallet;
-impl Get<Perbill> for NominationPoolsMigrationV4OldPallet {
-	fn get() -> Perbill {
-		Perbill::from_percent(10)
-	}
-}
-
-/// All migrations that will run on the next runtime upgrade.
-///
-/// This contains the combined migrations of the last 10 releases. It allows to skip runtime
-/// upgrades in case governance decides to do so. THE ORDER IS IMPORTANT.
-pub type Migrations = migrations::Unreleased;
-
-/// The runtime migrations per release.
-#[allow(deprecated, missing_docs)]
-pub mod migrations {
-	use super::*;
-	use frame_support::traits::LockIdentifier;
-	use frame_system::pallet_prelude::BlockNumberFor;
-
-	parameter_types! {
-		pub const DemocracyPalletName: &'static str = "Democracy";
-		pub const CouncilPalletName: &'static str = "Council";
-		pub const TechnicalCommitteePalletName: &'static str = "TechnicalCommittee";
-		pub const PhragmenElectionPalletName: &'static str = "PhragmenElection";
-		pub const TechnicalMembershipPalletName: &'static str = "TechnicalMembership";
-		pub const TipsPalletName: &'static str = "Tips";
-		pub const PhragmenElectionPalletId: LockIdentifier = *b"phrelect";
-	}
-
-	// Special Config for Gov V1 pallets, allowing us to run migrations for them without
-	// implementing their configs on [`Runtime`].
-	pub struct UnlockConfig;
-	impl pallet_democracy::migrations::unlock_and_unreserve_all_funds::UnlockConfig for UnlockConfig {
-		type Currency = Balances;
-		type MaxVotes = ConstU32<100>;
-		type MaxDeposits = ConstU32<100>;
-		type AccountId = AccountId;
-		type BlockNumber = BlockNumberFor<Runtime>;
-		type DbWeight = <Runtime as frame_system::Config>::DbWeight;
-		type PalletName = DemocracyPalletName;
-	}
-	impl pallet_elections_phragmen::migrations::unlock_and_unreserve_all_funds::UnlockConfig
-		for UnlockConfig
-	{
-		type Currency = Balances;
-		type MaxVotesPerVoter = ConstU32<16>;
-		type PalletId = PhragmenElectionPalletId;
-		type AccountId = AccountId;
-		type DbWeight = <Runtime as frame_system::Config>::DbWeight;
-		type PalletName = PhragmenElectionPalletName;
-	}
-	impl pallet_tips::migrations::unreserve_deposits::UnlockConfig<()> for UnlockConfig {
-		type Currency = Balances;
-		type Hash = Hash;
-		type DataDepositPerByte = DataDepositPerByte;
-		type TipReportDepositBase = TipReportDepositBase;
-		type AccountId = AccountId;
-		type BlockNumber = BlockNumberFor<Runtime>;
-		type DbWeight = <Runtime as frame_system::Config>::DbWeight;
-		type PalletName = TipsPalletName;
-	}
-
-	/// Upgrade Session keys to include BEEFY key.
-	/// When this is removed, should also remove `OldSessionKeys`.
-	pub struct UpgradeSessionKeys;
-	impl frame_support::traits::OnRuntimeUpgrade for UpgradeSessionKeys {
-		fn on_runtime_upgrade() -> Weight {
-			Session::upgrade_keys::<OldSessionKeys, _>(transform_session_keys);
-			Perbill::from_percent(50) * BlockWeights::get().max_block
-		}
-	}
-
-	/// Unreleased migrations. Add new ones here:
-	pub type Unreleased = (
-		init_state_migration::InitMigrate,
-		pallet_society::migrations::VersionCheckedMigrateToV2<
-			Runtime,
-			(),
-			past_payouts::PastPayouts,
-		>,
-		pallet_im_online::migration::v1::Migration<Runtime>,
-		parachains_configuration::migration::v7::MigrateToV7<Runtime>,
-		parachains_scheduler::migration::v1::MigrateToV1<Runtime>,
-		parachains_configuration::migration::v8::MigrateToV8<Runtime>,
-
-		// Unlock/unreserve balances from Gov v1 pallets that hold them
-		// https://github.com/paritytech/polkadot/issues/6749
-		pallet_elections_phragmen::migrations::unlock_and_unreserve_all_funds::UnlockAndUnreserveAllFunds<UnlockConfig>,
-		pallet_democracy::migrations::unlock_and_unreserve_all_funds::UnlockAndUnreserveAllFunds<UnlockConfig>,
-		pallet_tips::migrations::unreserve_deposits::UnreserveDeposits<UnlockConfig, ()>,
-
-		// Delete storage key/values from all Gov v1 pallets
-		frame_support::migrations::RemovePallet<DemocracyPalletName, <Runtime as frame_system::Config>::DbWeight>,
-		frame_support::migrations::RemovePallet<CouncilPalletName, <Runtime as frame_system::Config>::DbWeight>,
-		frame_support::migrations::RemovePallet<TechnicalCommitteePalletName, <Runtime as frame_system::Config>::DbWeight>,
-		frame_support::migrations::RemovePallet<PhragmenElectionPalletName, <Runtime as frame_system::Config>::DbWeight>,
-		frame_support::migrations::RemovePallet<TechnicalMembershipPalletName, <Runtime as frame_system::Config>::DbWeight>,
-		frame_support::migrations::RemovePallet<TipsPalletName, <Runtime as frame_system::Config>::DbWeight>,
-
-		// Upgrade SessionKeys to include BEEFY key
-		UpgradeSessionKeys,
-	);
-}
-
-/// Unchecked extrinsic type as expected by this runtime.
-pub type UncheckedExtrinsic =
-	generic::UncheckedExtrinsic<Address, RuntimeCall, Signature, SignedExtra>;
-/// Executive: handles dispatch to the various modules.
-pub type Executive = frame_executive::Executive<
-	Runtime,
-	Block,
-	frame_system::ChainContext<Runtime>,
-	Runtime,
-	AllPalletsWithSystem,
-	Migrations,
->;
-/// The payload being signed in the transactions.
-pub type SignedPayload = generic::SignedPayload<RuntimeCall, SignedExtra>;
-
-#[cfg(feature = "runtime-benchmarks")]
-mod benches {
-	frame_benchmarking::define_benchmarks!(
-		// Polkadot
-		// NOTE: Make sure to prefix these with `runtime_common::` so
-		// that the path resolves correctly in the generated file.
-		[runtime_common::auctions, Auctions]
-		[runtime_common::crowdloan, Crowdloan]
-		[runtime_common::claims, Claims]
-		[runtime_common::slots, Slots]
-		[runtime_common::paras_registrar, Registrar]
-		[runtime_parachains::configuration, Configuration]
-		[runtime_parachains::hrmp, Hrmp]
-		[runtime_parachains::disputes, ParasDisputes]
-		[runtime_parachains::disputes::slashing, ParasSlashing]
-		[runtime_parachains::inclusion, ParaInclusion]
-		[runtime_parachains::initializer, Initializer]
-		[runtime_parachains::paras_inherent, ParaInherent]
-		[runtime_parachains::paras, Paras]
-		// Substrate
-		[pallet_balances, Balances]
-		[pallet_balances, NisCounterpartBalances]
-		[pallet_bags_list, VoterList]
-		[frame_benchmarking::baseline, Baseline::<Runtime>]
-		[pallet_bounties, Bounties]
-		[pallet_child_bounties, ChildBounties]
-		[pallet_conviction_voting, ConvictionVoting]
-		[pallet_election_provider_multi_phase, ElectionProviderMultiPhase]
-		[frame_election_provider_support, ElectionProviderBench::<Runtime>]
-		[pallet_fast_unstake, FastUnstake]
-		[pallet_nis, Nis]
-		[pallet_identity, Identity]
-		[pallet_im_online, ImOnline]
-		[pallet_indices, Indices]
-		[pallet_message_queue, MessageQueue]
-		[pallet_multisig, Multisig]
-		[pallet_nomination_pools, NominationPoolsBench::<Runtime>]
-		[pallet_offences, OffencesBench::<Runtime>]
-		[pallet_preimage, Preimage]
-		[pallet_proxy, Proxy]
-		[pallet_ranked_collective, FellowshipCollective]
-		[pallet_recovery, Recovery]
-		[pallet_referenda, Referenda]
-		[pallet_referenda, FellowshipReferenda]
-		[pallet_scheduler, Scheduler]
-		[pallet_session, SessionBench::<Runtime>]
-		[pallet_society, Society]
-		[pallet_staking, Staking]
-		[frame_system, SystemBench::<Runtime>]
-		[pallet_timestamp, Timestamp]
-		[pallet_treasury, Treasury]
-		[pallet_utility, Utility]
-		[pallet_vesting, Vesting]
-		[pallet_whitelist, Whitelist]
-		// XCM
-		[pallet_xcm, XcmPallet]
-		[pallet_xcm_benchmarks::fungible, pallet_xcm_benchmarks::fungible::Pallet::<Runtime>]
-		[pallet_xcm_benchmarks::generic, pallet_xcm_benchmarks::generic::Pallet::<Runtime>]
-	);
-}
-
-#[cfg(not(feature = "disable-runtime-api"))]
-sp_api::impl_runtime_apis! {
-	impl sp_api::Core<Block> for Runtime {
-		fn version() -> RuntimeVersion {
-			VERSION
-		}
-
-		fn execute_block(block: Block) {
-			Executive::execute_block(block);
-		}
-
-		fn initialize_block(header: &<Block as BlockT>::Header) {
-			Executive::initialize_block(header)
-		}
-	}
-
-	impl sp_api::Metadata<Block> for Runtime {
-		fn metadata() -> OpaqueMetadata {
-			OpaqueMetadata::new(Runtime::metadata().into())
-		}
-
-		fn metadata_at_version(version: u32) -> Option<OpaqueMetadata> {
-			Runtime::metadata_at_version(version)
-		}
-
-		fn metadata_versions() -> sp_std::vec::Vec<u32> {
-			Runtime::metadata_versions()
-		}
-	}
-
-	impl block_builder_api::BlockBuilder<Block> for Runtime {
-		fn apply_extrinsic(extrinsic: <Block as BlockT>::Extrinsic) -> ApplyExtrinsicResult {
-			Executive::apply_extrinsic(extrinsic)
-		}
-
-		fn finalize_block() -> <Block as BlockT>::Header {
-			Executive::finalize_block()
-		}
-
-		fn inherent_extrinsics(data: inherents::InherentData) -> Vec<<Block as BlockT>::Extrinsic> {
-			data.create_extrinsics()
-		}
-
-		fn check_inherents(
-			block: Block,
-			data: inherents::InherentData,
-		) -> inherents::CheckInherentsResult {
-			data.check_extrinsics(&block)
-		}
-	}
-
-	impl tx_pool_api::runtime_api::TaggedTransactionQueue<Block> for Runtime {
-		fn validate_transaction(
-			source: TransactionSource,
-			tx: <Block as BlockT>::Extrinsic,
-			block_hash: <Block as BlockT>::Hash,
-		) -> TransactionValidity {
-			Executive::validate_transaction(source, tx, block_hash)
-		}
-	}
-
-	impl offchain_primitives::OffchainWorkerApi<Block> for Runtime {
-		fn offchain_worker(header: &<Block as BlockT>::Header) {
-			Executive::offchain_worker(header)
-		}
-	}
-
-	impl primitives::runtime_api::ParachainHost<Block, Hash, BlockNumber> for Runtime {
-		fn validators() -> Vec<ValidatorId> {
-			parachains_runtime_api_impl::validators::<Runtime>()
-		}
-
-		fn validator_groups() -> (Vec<Vec<ValidatorIndex>>, GroupRotationInfo<BlockNumber>) {
-			parachains_runtime_api_impl::validator_groups::<Runtime>()
-		}
-
-		fn availability_cores() -> Vec<CoreState<Hash, BlockNumber>> {
-			parachains_runtime_api_impl::availability_cores::<Runtime>()
-		}
-
-		fn persisted_validation_data(para_id: ParaId, assumption: OccupiedCoreAssumption)
-			-> Option<PersistedValidationData<Hash, BlockNumber>> {
-			parachains_runtime_api_impl::persisted_validation_data::<Runtime>(para_id, assumption)
-		}
-
-		fn assumed_validation_data(
-			para_id: ParaId,
-			expected_persisted_validation_data_hash: Hash,
-		) -> Option<(PersistedValidationData<Hash, BlockNumber>, ValidationCodeHash)> {
-			parachains_runtime_api_impl::assumed_validation_data::<Runtime>(
-				para_id,
-				expected_persisted_validation_data_hash,
-			)
-		}
-
-		fn check_validation_outputs(
-			para_id: ParaId,
-			outputs: primitives::CandidateCommitments,
-		) -> bool {
-			parachains_runtime_api_impl::check_validation_outputs::<Runtime>(para_id, outputs)
-		}
-
-		fn session_index_for_child() -> SessionIndex {
-			parachains_runtime_api_impl::session_index_for_child::<Runtime>()
-		}
-
-		fn validation_code(para_id: ParaId, assumption: OccupiedCoreAssumption)
-			-> Option<ValidationCode> {
-			parachains_runtime_api_impl::validation_code::<Runtime>(para_id, assumption)
-		}
-
-		fn candidate_pending_availability(para_id: ParaId) -> Option<CommittedCandidateReceipt<Hash>> {
-			parachains_runtime_api_impl::candidate_pending_availability::<Runtime>(para_id)
-		}
-
-		fn candidate_events() -> Vec<CandidateEvent<Hash>> {
-			parachains_runtime_api_impl::candidate_events::<Runtime, _>(|ev| {
-				match ev {
-					RuntimeEvent::ParaInclusion(ev) => {
-						Some(ev)
-					}
-					_ => None,
-				}
-			})
-		}
-
-		fn session_info(index: SessionIndex) -> Option<SessionInfo> {
-			parachains_runtime_api_impl::session_info::<Runtime>(index)
-		}
-
-		fn session_executor_params(session_index: SessionIndex) -> Option<ExecutorParams> {
-			parachains_runtime_api_impl::session_executor_params::<Runtime>(session_index)
-		}
-
-		fn dmq_contents(recipient: ParaId) -> Vec<InboundDownwardMessage<BlockNumber>> {
-			parachains_runtime_api_impl::dmq_contents::<Runtime>(recipient)
-		}
-
-		fn inbound_hrmp_channels_contents(
-			recipient: ParaId
-		) -> BTreeMap<ParaId, Vec<InboundHrmpMessage<BlockNumber>>> {
-			parachains_runtime_api_impl::inbound_hrmp_channels_contents::<Runtime>(recipient)
-		}
-
-		fn validation_code_by_hash(hash: ValidationCodeHash) -> Option<ValidationCode> {
-			parachains_runtime_api_impl::validation_code_by_hash::<Runtime>(hash)
-		}
-
-		fn on_chain_votes() -> Option<ScrapedOnChainVotes<Hash>> {
-			parachains_runtime_api_impl::on_chain_votes::<Runtime>()
-		}
-
-		fn submit_pvf_check_statement(
-			stmt: primitives::PvfCheckStatement,
-			signature: primitives::ValidatorSignature,
-		) {
-			parachains_runtime_api_impl::submit_pvf_check_statement::<Runtime>(stmt, signature)
-		}
-
-		fn pvfs_require_precheck() -> Vec<ValidationCodeHash> {
-			parachains_runtime_api_impl::pvfs_require_precheck::<Runtime>()
-		}
-
-		fn validation_code_hash(para_id: ParaId, assumption: OccupiedCoreAssumption)
-			-> Option<ValidationCodeHash>
-		{
-			parachains_runtime_api_impl::validation_code_hash::<Runtime>(para_id, assumption)
-		}
-
-		fn disputes() -> Vec<(SessionIndex, CandidateHash, DisputeState<BlockNumber>)> {
-			parachains_runtime_api_impl::get_session_disputes::<Runtime>()
-		}
-
-		fn unapplied_slashes(
-		) -> Vec<(SessionIndex, CandidateHash, slashing::PendingSlashes)> {
-			parachains_runtime_api_impl::unapplied_slashes::<Runtime>()
-		}
-
-		fn key_ownership_proof(
-			validator_id: ValidatorId,
-		) -> Option<slashing::OpaqueKeyOwnershipProof> {
-			use parity_scale_codec::Encode;
-
-			Historical::prove((PARACHAIN_KEY_TYPE_ID, validator_id))
-				.map(|p| p.encode())
-				.map(slashing::OpaqueKeyOwnershipProof::new)
-		}
-
-		fn submit_report_dispute_lost(
-			dispute_proof: slashing::DisputeProof,
-			key_ownership_proof: slashing::OpaqueKeyOwnershipProof,
-		) -> Option<()> {
-			parachains_runtime_api_impl::submit_unsigned_slashing_report::<Runtime>(
-				dispute_proof,
-				key_ownership_proof,
-			)
-		}
-	}
-
-	impl beefy_primitives::BeefyApi<Block, BeefyId> for Runtime {
-		fn beefy_genesis() -> Option<BlockNumber> {
-			Beefy::genesis_block()
-		}
-
-		fn validator_set() -> Option<beefy_primitives::ValidatorSet<BeefyId>> {
-			Beefy::validator_set()
-		}
-
-		fn submit_report_equivocation_unsigned_extrinsic(
-			equivocation_proof: beefy_primitives::EquivocationProof<
-				BlockNumber,
-				BeefyId,
-				BeefySignature,
-			>,
-			key_owner_proof: beefy_primitives::OpaqueKeyOwnershipProof,
-		) -> Option<()> {
-			let key_owner_proof = key_owner_proof.decode()?;
-
-			Beefy::submit_unsigned_equivocation_report(
-				equivocation_proof,
-				key_owner_proof,
-			)
-		}
-
-		fn generate_key_ownership_proof(
-			_set_id: beefy_primitives::ValidatorSetId,
-			authority_id: BeefyId,
-		) -> Option<beefy_primitives::OpaqueKeyOwnershipProof> {
-			use parity_scale_codec::Encode;
-
-			Historical::prove((beefy_primitives::KEY_TYPE, authority_id))
-				.map(|p| p.encode())
-				.map(beefy_primitives::OpaqueKeyOwnershipProof::new)
-		}
-	}
-
-	impl mmr::MmrApi<Block, Hash, BlockNumber> for Runtime {
-		fn mmr_root() -> Result<mmr::Hash, mmr::Error> {
-			Ok(Mmr::mmr_root())
-		}
-
-		fn mmr_leaf_count() -> Result<mmr::LeafIndex, mmr::Error> {
-			Ok(Mmr::mmr_leaves())
-		}
-
-		fn generate_proof(
-			block_numbers: Vec<BlockNumber>,
-			best_known_block_number: Option<BlockNumber>,
-		) -> Result<(Vec<mmr::EncodableOpaqueLeaf>, mmr::Proof<mmr::Hash>), mmr::Error> {
-			Mmr::generate_proof(block_numbers, best_known_block_number).map(
-				|(leaves, proof)| {
-					(
-						leaves
-							.into_iter()
-							.map(|leaf| mmr::EncodableOpaqueLeaf::from_leaf(&leaf))
-							.collect(),
-						proof,
-					)
-				},
-			)
-		}
-
-		fn verify_proof(leaves: Vec<mmr::EncodableOpaqueLeaf>, proof: mmr::Proof<mmr::Hash>)
-			-> Result<(), mmr::Error>
-		{
-			let leaves = leaves.into_iter().map(|leaf|
-				leaf.into_opaque_leaf()
-				.try_decode()
-				.ok_or(mmr::Error::Verify)).collect::<Result<Vec<mmr::Leaf>, mmr::Error>>()?;
-			Mmr::verify_leaves(leaves, proof)
-		}
-
-		fn verify_proof_stateless(
-			root: mmr::Hash,
-			leaves: Vec<mmr::EncodableOpaqueLeaf>,
-			proof: mmr::Proof<mmr::Hash>
-		) -> Result<(), mmr::Error> {
-			let nodes = leaves.into_iter().map(|leaf|mmr::DataOrHash::Data(leaf.into_opaque_leaf())).collect();
-			pallet_mmr::verify_leaves_proof::<mmr::Hashing, _>(root, nodes, proof)
-		}
-	}
-
-	impl pallet_beefy_mmr::BeefyMmrApi<Block, Hash> for RuntimeApi {
-		fn authority_set_proof() -> beefy_primitives::mmr::BeefyAuthoritySet<Hash> {
-			BeefyMmrLeaf::authority_set_proof()
-		}
-
-		fn next_authority_set_proof() -> beefy_primitives::mmr::BeefyNextAuthoritySet<Hash> {
-			BeefyMmrLeaf::next_authority_set_proof()
-		}
-	}
-
-	impl fg_primitives::GrandpaApi<Block> for Runtime {
-		fn grandpa_authorities() -> Vec<(GrandpaId, u64)> {
-			Grandpa::grandpa_authorities()
-		}
-
-		fn current_set_id() -> fg_primitives::SetId {
-			Grandpa::current_set_id()
-		}
-
-		fn submit_report_equivocation_unsigned_extrinsic(
-			equivocation_proof: fg_primitives::EquivocationProof<
-				<Block as BlockT>::Hash,
-				sp_runtime::traits::NumberFor<Block>,
-			>,
-			key_owner_proof: fg_primitives::OpaqueKeyOwnershipProof,
-		) -> Option<()> {
-			let key_owner_proof = key_owner_proof.decode()?;
-
-			Grandpa::submit_unsigned_equivocation_report(
-				equivocation_proof,
-				key_owner_proof,
-			)
-		}
-
-		fn generate_key_ownership_proof(
-			_set_id: fg_primitives::SetId,
-			authority_id: fg_primitives::AuthorityId,
-		) -> Option<fg_primitives::OpaqueKeyOwnershipProof> {
-			use parity_scale_codec::Encode;
-
-			Historical::prove((fg_primitives::KEY_TYPE, authority_id))
-				.map(|p| p.encode())
-				.map(fg_primitives::OpaqueKeyOwnershipProof::new)
-		}
-	}
-
-	impl babe_primitives::BabeApi<Block> for Runtime {
-		fn configuration() -> babe_primitives::BabeConfiguration {
-			let epoch_config = Babe::epoch_config().unwrap_or(BABE_GENESIS_EPOCH_CONFIG);
-			babe_primitives::BabeConfiguration {
-				slot_duration: Babe::slot_duration(),
-				epoch_length: EpochDuration::get(),
-				c: epoch_config.c,
-				authorities: Babe::authorities().to_vec(),
-				randomness: Babe::randomness(),
-				allowed_slots: epoch_config.allowed_slots,
-			}
-		}
-
-		fn current_epoch_start() -> babe_primitives::Slot {
-			Babe::current_epoch_start()
-		}
-
-		fn current_epoch() -> babe_primitives::Epoch {
-			Babe::current_epoch()
-		}
-
-		fn next_epoch() -> babe_primitives::Epoch {
-			Babe::next_epoch()
-		}
-
-		fn generate_key_ownership_proof(
-			_slot: babe_primitives::Slot,
-			authority_id: babe_primitives::AuthorityId,
-		) -> Option<babe_primitives::OpaqueKeyOwnershipProof> {
-			use parity_scale_codec::Encode;
-
-			Historical::prove((babe_primitives::KEY_TYPE, authority_id))
-				.map(|p| p.encode())
-				.map(babe_primitives::OpaqueKeyOwnershipProof::new)
-		}
-
-		fn submit_report_equivocation_unsigned_extrinsic(
-			equivocation_proof: babe_primitives::EquivocationProof<<Block as BlockT>::Header>,
-			key_owner_proof: babe_primitives::OpaqueKeyOwnershipProof,
-		) -> Option<()> {
-			let key_owner_proof = key_owner_proof.decode()?;
-
-			Babe::submit_unsigned_equivocation_report(
-				equivocation_proof,
-				key_owner_proof,
-			)
-		}
-	}
-
-	impl authority_discovery_primitives::AuthorityDiscoveryApi<Block> for Runtime {
-		fn authorities() -> Vec<AuthorityDiscoveryId> {
-			parachains_runtime_api_impl::relevant_authority_ids::<Runtime>()
-		}
-	}
-
-	impl sp_session::SessionKeys<Block> for Runtime {
-		fn generate_session_keys(seed: Option<Vec<u8>>) -> Vec<u8> {
-			SessionKeys::generate(seed)
-		}
-
-		fn decode_session_keys(
-			encoded: Vec<u8>,
-		) -> Option<Vec<(Vec<u8>, sp_core::crypto::KeyTypeId)>> {
-			SessionKeys::decode_into_raw_public_keys(&encoded)
-		}
-	}
-
-	impl frame_system_rpc_runtime_api::AccountNonceApi<Block, AccountId, Nonce> for Runtime {
-		fn account_nonce(account: AccountId) -> Nonce {
-			System::account_nonce(account)
-		}
-	}
-
-	impl pallet_transaction_payment_rpc_runtime_api::TransactionPaymentApi<
-		Block,
-		Balance,
-	> for Runtime {
-		fn query_info(uxt: <Block as BlockT>::Extrinsic, len: u32) -> RuntimeDispatchInfo<Balance> {
-			TransactionPayment::query_info(uxt, len)
-		}
-		fn query_fee_details(uxt: <Block as BlockT>::Extrinsic, len: u32) -> FeeDetails<Balance> {
-			TransactionPayment::query_fee_details(uxt, len)
-		}
-		fn query_weight_to_fee(weight: Weight) -> Balance {
-			TransactionPayment::weight_to_fee(weight)
-		}
-		fn query_length_to_fee(length: u32) -> Balance {
-			TransactionPayment::length_to_fee(length)
-		}
-	}
-
-	impl pallet_transaction_payment_rpc_runtime_api::TransactionPaymentCallApi<Block, Balance, RuntimeCall>
-		for Runtime
-	{
-		fn query_call_info(call: RuntimeCall, len: u32) -> RuntimeDispatchInfo<Balance> {
-			TransactionPayment::query_call_info(call, len)
-		}
-		fn query_call_fee_details(call: RuntimeCall, len: u32) -> FeeDetails<Balance> {
-			TransactionPayment::query_call_fee_details(call, len)
-		}
-		fn query_weight_to_fee(weight: Weight) -> Balance {
-			TransactionPayment::weight_to_fee(weight)
-		}
-		fn query_length_to_fee(length: u32) -> Balance {
-			TransactionPayment::length_to_fee(length)
-		}
-	}
-
-	impl pallet_nomination_pools_runtime_api::NominationPoolsApi<
-		Block,
-		AccountId,
-		Balance,
-	> for Runtime {
-		fn pending_rewards(member: AccountId) -> Balance {
-			NominationPools::api_pending_rewards(member).unwrap_or_default()
-		}
-
-		fn points_to_balance(pool_id: pallet_nomination_pools::PoolId, points: Balance) -> Balance {
-			NominationPools::api_points_to_balance(pool_id, points)
-		}
-
-		fn balance_to_points(pool_id: pallet_nomination_pools::PoolId, new_funds: Balance) -> Balance {
-			NominationPools::api_balance_to_points(pool_id, new_funds)
-		}
-	}
-
-	impl pallet_staking_runtime_api::StakingApi<Block, Balance> for Runtime {
-		fn nominations_quota(balance: Balance) -> u32 {
-			Staking::api_nominations_quota(balance)
-		}
-	}
-
-	#[cfg(feature = "try-runtime")]
-	impl frame_try_runtime::TryRuntime<Block> for Runtime {
-		fn on_runtime_upgrade(checks: frame_try_runtime::UpgradeCheckSelect) -> (Weight, Weight) {
-			log::info!("try-runtime::on_runtime_upgrade kusama.");
-			let weight = Executive::try_runtime_upgrade(checks).unwrap();
-			(weight, BlockWeights::get().max_block)
-		}
-
-		fn execute_block(
-			block: Block,
-			state_root_check: bool,
-			signature_check: bool,
-			select: frame_try_runtime::TryStateSelect,
-		) -> Weight {
-			// NOTE: intentional unwrap: we don't want to propagate the error backwards, and want to
-			// have a backtrace here.
-			Executive::try_execute_block(block, state_root_check, signature_check, select).unwrap()
-		}
-	}
-
-	#[cfg(feature = "runtime-benchmarks")]
-	impl frame_benchmarking::Benchmark<Block> for Runtime {
-		fn benchmark_metadata(extra: bool) -> (
-			Vec<frame_benchmarking::BenchmarkList>,
-			Vec<frame_support::traits::StorageInfo>,
-		) {
-			use frame_benchmarking::{Benchmarking, BenchmarkList};
-			use frame_support::traits::StorageInfoTrait;
-
-			use pallet_session_benchmarking::Pallet as SessionBench;
-			use pallet_offences_benchmarking::Pallet as OffencesBench;
-			use pallet_election_provider_support_benchmarking::Pallet as ElectionProviderBench;
-			use frame_system_benchmarking::Pallet as SystemBench;
-			use pallet_nomination_pools_benchmarking::Pallet as NominationPoolsBench;
-			use frame_benchmarking::baseline::Pallet as Baseline;
-
-			let mut list = Vec::<BenchmarkList>::new();
-			list_benchmarks!(list, extra);
-
-			let storage_info = AllPalletsWithSystem::storage_info();
-			return (list, storage_info)
-		}
-
-		fn dispatch_benchmark(
-			config: frame_benchmarking::BenchmarkConfig
-		) -> Result<
-			Vec<frame_benchmarking::BenchmarkBatch>,
-			sp_runtime::RuntimeString,
-		> {
-			use frame_support::traits::WhitelistedStorageKeys;
-			use frame_benchmarking::{Benchmarking, BenchmarkBatch, BenchmarkError};
-			use sp_storage::TrackedStorageKey;
-			// Trying to add benchmarks directly to some pallets caused cyclic dependency issues.
-			// To get around that, we separated the benchmarks into its own crate.
-			use pallet_session_benchmarking::Pallet as SessionBench;
-			use pallet_offences_benchmarking::Pallet as OffencesBench;
-			use pallet_election_provider_support_benchmarking::Pallet as ElectionProviderBench;
-			use frame_system_benchmarking::Pallet as SystemBench;
-			use pallet_nomination_pools_benchmarking::Pallet as NominationPoolsBench;
-			use frame_benchmarking::baseline::Pallet as Baseline;
-			use xcm::latest::prelude::*;
-			use xcm_config::{
-				LocalCheckAccount, SovereignAccountOf, Statemine, TokenLocation, XcmConfig,
-			};
-
-			impl pallet_session_benchmarking::Config for Runtime {}
-			impl pallet_offences_benchmarking::Config for Runtime {}
-			impl pallet_election_provider_support_benchmarking::Config for Runtime {}
-			impl frame_system_benchmarking::Config for Runtime {}
-			impl frame_benchmarking::baseline::Config for Runtime {}
-			impl pallet_nomination_pools_benchmarking::Config for Runtime {}
-			impl runtime_parachains::disputes::slashing::benchmarking::Config for Runtime {}
-
-			impl pallet_xcm_benchmarks::Config for Runtime {
-				type XcmConfig = XcmConfig;
-				type AccountIdConverter = SovereignAccountOf;
-				fn valid_destination() -> Result<MultiLocation, BenchmarkError> {
-					Ok(Statemine::get())
-				}
-				fn worst_case_holding(_depositable_count: u32) -> MultiAssets {
-					// Kusama only knows about KSM.
-					vec![MultiAsset{
-						id: Concrete(TokenLocation::get()),
-						fun: Fungible(1_000_000 * UNITS),
-					}].into()
-				}
-			}
-
-			parameter_types! {
-				pub const TrustedTeleporter: Option<(MultiLocation, MultiAsset)> = Some((
-					Statemine::get(),
-					MultiAsset { fun: Fungible(1 * UNITS), id: Concrete(TokenLocation::get()) },
-				));
-				pub const TrustedReserve: Option<(MultiLocation, MultiAsset)> = None;
-			}
-
-			impl pallet_xcm_benchmarks::fungible::Config for Runtime {
-				type TransactAsset = Balances;
-
-				type CheckedAccount = LocalCheckAccount;
-				type TrustedTeleporter = TrustedTeleporter;
-				type TrustedReserve = TrustedReserve;
-
-				fn get_multi_asset() -> MultiAsset {
-					MultiAsset {
-						id: Concrete(TokenLocation::get()),
-						fun: Fungible(1 * UNITS),
-					}
-				}
-			}
-
-			impl pallet_xcm_benchmarks::generic::Config for Runtime {
-				type RuntimeCall = RuntimeCall;
-
-				fn worst_case_response() -> (u64, Response) {
-					(0u64, Response::Version(Default::default()))
-				}
-
-				fn worst_case_asset_exchange() -> Result<(MultiAssets, MultiAssets), BenchmarkError> {
-					// Kusama doesn't support asset exchanges
-					Err(BenchmarkError::Skip)
-				}
-
-				fn universal_alias() -> Result<(MultiLocation, Junction), BenchmarkError> {
-					// The XCM executor of Kusama doesn't have a configured `UniversalAliases`
-					Err(BenchmarkError::Skip)
-				}
-
-				fn transact_origin_and_runtime_call() -> Result<(MultiLocation, RuntimeCall), BenchmarkError> {
-					Ok((Statemine::get(), frame_system::Call::remark_with_event { remark: vec![] }.into()))
-				}
-
-				fn subscribe_origin() -> Result<MultiLocation, BenchmarkError> {
-					Ok(Statemine::get())
-				}
-
-				fn claimable_asset() -> Result<(MultiLocation, MultiLocation, MultiAssets), BenchmarkError> {
-					let origin = Statemine::get();
-					let assets: MultiAssets = (Concrete(TokenLocation::get()), 1_000 * UNITS).into();
-					let ticket = MultiLocation { parents: 0, interior: Here };
-					Ok((origin, ticket, assets))
-				}
-
-				fn unlockable_asset() -> Result<(MultiLocation, MultiLocation, MultiAsset), BenchmarkError> {
-					// Kusama doesn't support asset locking
-					Err(BenchmarkError::Skip)
-				}
-
-				fn export_message_origin_and_destination(
-				) -> Result<(MultiLocation, NetworkId, InteriorMultiLocation), BenchmarkError> {
-					// Kusama doesn't support exporting messages
-					Err(BenchmarkError::Skip)
-				}
-
-				fn alias_origin() -> Result<(MultiLocation, MultiLocation), BenchmarkError> {
-					// The XCM executor of Kusama doesn't have a configured `Aliasers`
-					Err(BenchmarkError::Skip)
-				}
-			}
-
-			let mut whitelist: Vec<TrackedStorageKey> = AllPalletsWithSystem::whitelisted_storage_keys();
-			let treasury_key = frame_system::Account::<Runtime>::hashed_key_for(Treasury::account_id());
-			whitelist.push(treasury_key.to_vec().into());
-
-			let mut batches = Vec::<BenchmarkBatch>::new();
-			let params = (&config, &whitelist);
-
-			add_benchmarks!(params, batches);
-
-			Ok(batches)
-		}
-	}
-}
-
-#[cfg(test)]
-mod fees_tests {
-	use super::*;
-	use sp_runtime::assert_eq_error_rate;
-
-	#[test]
-	fn signed_deposit_is_sensible() {
-		// ensure this number does not change, or that it is checked after each change.
-		// a 1 MB solution should need around 0.16 KSM deposit
-		let deposit = SignedDepositBase::get() + (SignedDepositByte::get() * 1024 * 1024);
-		assert_eq_error_rate!(deposit, UNITS * 167 / 100, UNITS / 100);
-	}
-}
-
-#[cfg(test)]
-mod multiplier_tests {
-	use super::*;
-	use frame_support::{dispatch::DispatchInfo, traits::OnFinalize};
-	use runtime_common::{MinimumMultiplier, TargetBlockFullness};
-	use separator::Separatable;
-	use sp_runtime::traits::Convert;
-
-	fn run_with_system_weight<F>(w: Weight, mut assertions: F)
-	where
-		F: FnMut() -> (),
-	{
-		let mut t: sp_io::TestExternalities = frame_system::GenesisConfig::<Runtime>::default()
-			.build_storage()
-			.unwrap()
-			.into();
-		t.execute_with(|| {
-			System::set_block_consumed_resources(w, 0);
-			assertions()
-		});
-	}
-
-	#[test]
-	fn multiplier_can_grow_from_zero() {
-		let minimum_multiplier = MinimumMultiplier::get();
-		let target = TargetBlockFullness::get() *
-			BlockWeights::get().get(DispatchClass::Normal).max_total.unwrap();
-		// if the min is too small, then this will not change, and we are doomed forever.
-		// the weight is 1/100th bigger than target.
-		run_with_system_weight(target.saturating_mul(101) / 100, || {
-			let next = SlowAdjustingFeeUpdate::<Runtime>::convert(minimum_multiplier);
-			assert!(next > minimum_multiplier, "{:?} !>= {:?}", next, minimum_multiplier);
-		})
-	}
-
-	#[test]
-	fn fast_unstake_estimate() {
-		use pallet_fast_unstake::WeightInfo;
-		let block_time = BlockWeights::get().max_block.ref_time() as f32;
-		let on_idle = weights::pallet_fast_unstake::WeightInfo::<Runtime>::on_idle_check(
-			1000,
-			<Runtime as pallet_fast_unstake::Config>::BatchSize::get(),
-		)
-		.ref_time() as f32;
-		println!("ratio of block weight for full batch fast-unstake {}", on_idle / block_time);
-		assert!(on_idle / block_time <= 0.5f32)
-	}
-
-	#[test]
-	#[ignore]
-	fn multiplier_growth_simulator() {
-		// assume the multiplier is initially set to its minimum. We update it with values twice the
-		//target (target is 25%, thus 50%) and we see at which point it reaches 1.
-		let mut multiplier = MinimumMultiplier::get();
-		let block_weight = BlockWeights::get().get(DispatchClass::Normal).max_total.unwrap();
-		let mut blocks = 0;
-		let mut fees_paid = 0;
-
-		frame_system::Pallet::<Runtime>::set_block_consumed_resources(Weight::MAX, 0);
-		let info = DispatchInfo { weight: Weight::MAX, ..Default::default() };
-
-		let mut t: sp_io::TestExternalities = frame_system::GenesisConfig::<Runtime>::default()
-			.build_storage()
-			.unwrap()
-			.into();
-		// set the minimum
-		t.execute_with(|| {
-			pallet_transaction_payment::NextFeeMultiplier::<Runtime>::set(MinimumMultiplier::get());
-		});
-
-		while multiplier <= Multiplier::from_u32(1) {
-			t.execute_with(|| {
-				// imagine this tx was called.
-				let fee = TransactionPayment::compute_fee(0, &info, 0);
-				fees_paid += fee;
-
-				// this will update the multiplier.
-				System::set_block_consumed_resources(block_weight, 0);
-				TransactionPayment::on_finalize(1);
-				let next = TransactionPayment::next_fee_multiplier();
-
-				assert!(next > multiplier, "{:?} !>= {:?}", next, multiplier);
-				multiplier = next;
-
-				println!(
-					"block = {} / multiplier {:?} / fee = {:?} / fess so far {:?}",
-					blocks,
-					multiplier,
-					fee.separated_string(),
-					fees_paid.separated_string()
-				);
-			});
-			blocks += 1;
-		}
-	}
-
-	#[test]
-	#[ignore]
-	fn multiplier_cool_down_simulator() {
-		// assume the multiplier is initially set to its minimum. We update it with values twice the
-		//target (target is 25%, thus 50%) and we see at which point it reaches 1.
-		let mut multiplier = Multiplier::from_u32(2);
-		let mut blocks = 0;
-
-		let mut t: sp_io::TestExternalities = frame_system::GenesisConfig::<Runtime>::default()
-			.build_storage()
-			.unwrap()
-			.into();
-		// set the minimum
-		t.execute_with(|| {
-			pallet_transaction_payment::NextFeeMultiplier::<Runtime>::set(multiplier);
-		});
-
-		while multiplier > Multiplier::from_u32(0) {
-			t.execute_with(|| {
-				// this will update the multiplier.
-				TransactionPayment::on_finalize(1);
-				let next = TransactionPayment::next_fee_multiplier();
-
-				assert!(next < multiplier, "{:?} !>= {:?}", next, multiplier);
-				multiplier = next;
-
-				println!("block = {} / multiplier {:?}", blocks, multiplier);
-			});
-			blocks += 1;
-		}
-	}
-}
-
-#[cfg(all(test, feature = "try-runtime"))]
-mod remote_tests {
-	use super::*;
-	use frame_try_runtime::{runtime_decl_for_try_runtime::TryRuntime, UpgradeCheckSelect};
-	use remote_externalities::{
-		Builder, Mode, OfflineConfig, OnlineConfig, SnapshotConfig, Transport,
-	};
-	use std::env::var;
-
-	#[tokio::test]
-	async fn run_migrations() {
-		if var("RUN_MIGRATION_TESTS").is_err() {
-			return
-		}
-
-		sp_tracing::try_init_simple();
-		let transport: Transport =
-			var("WS").unwrap_or("wss://kusama-rpc.polkadot.io:443".to_string()).into();
-		let maybe_state_snapshot: Option<SnapshotConfig> = var("SNAP").map(|s| s.into()).ok();
-		let mut ext = Builder::<Block>::default()
-			.mode(if let Some(state_snapshot) = maybe_state_snapshot {
-				Mode::OfflineOrElseOnline(
-					OfflineConfig { state_snapshot: state_snapshot.clone() },
-					OnlineConfig {
-						transport,
-						state_snapshot: Some(state_snapshot),
-						..Default::default()
-					},
-				)
-			} else {
-				Mode::Online(OnlineConfig { transport, ..Default::default() })
-			})
-			.build()
-			.await
-			.unwrap();
-		ext.execute_with(|| Runtime::on_runtime_upgrade(UpgradeCheckSelect::PreAndPost));
-	}
-
-	#[tokio::test]
-	#[ignore = "this test is meant to be executed manually"]
-	async fn try_fast_unstake_all() {
-		sp_tracing::try_init_simple();
-		let transport: Transport =
-			var("WS").unwrap_or("wss://kusama-rpc.polkadot.io:443".to_string()).into();
-		let maybe_state_snapshot: Option<SnapshotConfig> = var("SNAP").map(|s| s.into()).ok();
-		let mut ext = Builder::<Block>::default()
-			.mode(if let Some(state_snapshot) = maybe_state_snapshot {
-				Mode::OfflineOrElseOnline(
-					OfflineConfig { state_snapshot: state_snapshot.clone() },
-					OnlineConfig {
-						transport,
-						state_snapshot: Some(state_snapshot),
-						..Default::default()
-					},
-				)
-			} else {
-				Mode::Online(OnlineConfig { transport, ..Default::default() })
-			})
-			.build()
-			.await
-			.unwrap();
-		ext.execute_with(|| {
-			pallet_fast_unstake::ErasToCheckPerBlock::<Runtime>::put(1);
-			runtime_common::try_runtime::migrate_all_inactive_nominators::<Runtime>()
-		});
-	}
-}
-
-mod init_state_migration {
-	use super::Runtime;
-	use frame_support::traits::OnRuntimeUpgrade;
-	use pallet_state_trie_migration::{AutoLimits, MigrationLimits, MigrationProcess};
-	#[cfg(feature = "try-runtime")]
-	use sp_runtime::DispatchError;
-	#[cfg(not(feature = "std"))]
-	use sp_std::prelude::*;
-
-	/// Initialize an automatic migration process.
-	pub struct InitMigrate;
-	impl OnRuntimeUpgrade for InitMigrate {
-		#[cfg(feature = "try-runtime")]
-		fn pre_upgrade() -> Result<Vec<u8>, DispatchError> {
-			frame_support::ensure!(
-				AutoLimits::<Runtime>::get().is_none(),
-				DispatchError::Other("Automigration already started.")
-			);
-			Ok(Default::default())
-		}
-
-		fn on_runtime_upgrade() -> frame_support::weights::Weight {
-			if MigrationProcess::<Runtime>::get() == Default::default() &&
-				AutoLimits::<Runtime>::get().is_none()
-			{
-				// We use limits to target 600ko proofs per block and
-				// avg 800_000_000_000 of weight per block.
-				// See spreadsheet 4800_400 in
-				// https://raw.githubusercontent.com/cheme/substrate/try-runtime-mig/ksm.ods
-				AutoLimits::<Runtime>::put(Some(MigrationLimits { item: 4_800, size: 204800 * 2 }));
-				log::info!("Automatic trie migration started.");
-				<Runtime as frame_system::Config>::DbWeight::get().reads_writes(2, 1)
-			} else {
-				log::info!("Automatic trie migration not started.");
-				<Runtime as frame_system::Config>::DbWeight::get().reads(2)
-			}
-		}
-
-		#[cfg(feature = "try-runtime")]
-		fn post_upgrade(_state: Vec<u8>) -> Result<(), DispatchError> {
-			frame_support::ensure!(
-				AutoLimits::<Runtime>::get().is_some(),
-				DispatchError::Other("Automigration started.")
-			);
-			Ok(())
-		}
-	}
-}
diff --git a/polkadot/runtime/kusama/src/past_payouts.rs b/polkadot/runtime/kusama/src/past_payouts.rs
deleted file mode 100644
index 2d8b67902b89184867a3f35b651ca8e37425204d..0000000000000000000000000000000000000000
--- a/polkadot/runtime/kusama/src/past_payouts.rs
+++ /dev/null
@@ -1,312 +0,0 @@
-// This file is part of Polkadot.
-
-// 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.
-
-use super::*;
-use hex_literal::hex;
-use pallet_society::migrations::from_raw_past_payouts;
-
-parameter_types! {
-	pub PastPayouts: Vec<(AccountId, Balance)> = from_raw_past_payouts::<Runtime, ()>(vec![
-		(hex!["04152389a92e4356ed03ed30625afba062b9c4496116cba888e89f347834a31e"], 89000000000000u128),
-		(hex!["0483de2b96cd3756f05301eb1bca875166ae5be67a81f86a1dad152bccad6909"], 54666600000000u128),
-		(hex!["048a62b89589f7573c5f80584de850b9c8bcd4cb7a8766948d3db713d8a57204"], 83000000000000u128),
-		(hex!["060e1eacd9f4460ae43b28d39e472078784482139e483307436344019a48f26e"], 15513300000000u128),
-		(hex!["0ab0b61984dfcfe2fcb82147f0a2f00f992fa8a6b5ee81490387f8210a1ab678"], 6766666600u128),
-		(hex!["0c6e31c65ee1e82129879a145eb0c0d4de45e60c3dcab1d2219628cd70673a6b"], 69000000000000u128),
-		(hex!["10e9e630de91310a60b0bc7a4a2303a60b703afde9239750921514deb2655a0d"], 54333200000000u128),
-		(hex!["162eb21266fef25e25eb8286994264450b8c80ccf2911967cc42ee4cc55c2061"], 14223300000000u128),
-		(hex!["183f8c4d5084d96816ae7d82d44373b99bb134a16845d1589df4467671e3b56a"], 23333300000000u128),
-		(hex!["18b2624ddf0eca6c9698496801dcda614580367a4d54833fe75bbf54a9a09966"], 52999900000000u128),
-		(hex!["18b44d4c64c3aa3fb20d88b016a412d8f27000912fa7b350ed270ac8f55b3a27"], 5135000000000u128),
-		(hex!["1aa23df47ab442adc15f6c923cfd0f6c4255b2cacc19538028685e37410a691f"], 54000000000000u128),
-		(hex!["1ce0527c225ce227c1cceed0317eae0817bd600be3aa87489a704678c95a5451"], 41166600000000u128),
-		(hex!["1e20318bd5c0bc44576955b7205354b8ed9c8e4a783ba9da70d5cee0e11b4740"], 11000000000000u128),
-		(hex!["1e6fa8ff46b01fe3b8c52ea50a5ab61313ffac31393a28f621625840a6b3776d"], 11556600000000u128),
-		(hex!["20243c6b74a5f83b89ec202a337bd06ebc985fe7b1557184bfd012dc9bc97873"], 13000000000000u128),
-		(hex!["22cabf36e0954f0c013af666e27e46cb9a41f7a0db46ccec245f43b5ba438452"], 31000000000000u128),
-		(hex!["24172a563943291c97d252def71e17abf467a1626bca358728a90a82b3de3118"], 200000000000000u128),
-		(hex!["247f22a3073d04a85ab417505bb7667a5941ed74cfa596dfc7402813198a0560"], 68999000000000u128),
-		(hex!["28250c422851313e923c89cc0a41fec2af80cc124290343ae250f77ff60d767d"], 6993300000000u128),
-		(hex!["2c709012f807af8fc3f0d2abb0c51ca9a88d4ef24d1a092bf89dacf5ce63ea1d"], 333333333332u128),
-		(hex!["305b27652a4dc8038c587df4cf1d7758b413fe18a97b3a3a5c7d609f50092e11"], 39000000000000u128),
-		(hex!["3063796fb70f0bcde597bb7ed4d50f6ec7755686c894c7dbaa1ea2e33103876e"], 11650000000000u128),
-		(hex!["325c848b9000d5430844bd5486d34d844acd89e11964ed1b535bf45557e1c87f"], 10666600000000u128),
-		(hex!["3a632ab63a0ec92f1b67af756a49c8849f5722a345e54ef51cb294bef569070b"], 14993300000000u128),
-		(hex!["3c97e1879015dfb64a367e0f0eb32f16968fb6be6a48da7de7776bc8953c854d"], 18149900000000u128),
-		(hex!["3e8eb90cd422b7d72f166f135ed3db2137d0d9216e14cfdbd0ca75d2a18e2235"], 83000000000000u128),
-		(hex!["3ea89a71ac11ea023bf42d9d6215a9d8c775e626a2ee38d574b297f42c58a622"], 15056500000000u128),
-		(hex!["402d95c5f6d37ab03ecbec4628d290b2cc7571ff790ee5757b21bbcba4108924"], 12666600000000u128),
-		(hex!["40300fe00bcfb90f3ded42dc082b775dd9a8a8ea491261a262a78155a069a268"], 112000000000000u128),
-		(hex!["406855a4bb07710384d3876cf37cacbd66f2f1dab2346ebea130b00f63d0d317"], 83500000000000u128),
-		(hex!["40c6e021d4d80b9b38d850b1c5334ea88b2bcc148d07e83f5be1b45b8ceb3740"], 9893300000000u128),
-		(hex!["40f8a816b07bd23e166d2e479cfd5a3e5118f3937230ca5088eff9e33c84b552"], 12790000000000u128),
-		(hex!["422286e0da2fb826f04e46d2f6ef1319a43412261d0f8d91274a81eee21af24e"], 69000000000000u128),
-		(hex!["484a648ebe737d7dbee39d8e169d5ded94d29f70100e4d3ee87162c4a8bbdf73"], 2483300000000u128),
-		(hex!["4c4a2f66cd9f5000968f0913f01ac1181ccd2db137d6af152252ee3de689450b"], 2000000000000u128),
-		(hex!["505eb7820f60d0949697617b2f3366bd616d8c7e96724aa681e0113f6bf45c46"], 898900000000u128),
-		(hex!["569f5ab70b93bb40ecb5a8888bbbc781c785ac3709863e9866422f0fd62f2477"], 8000000000000u128),
-		(hex!["5c1be3d517926a6c194d42131d996140f3e8d7398764423cab176341b882ee7b"], 8490000000000u128),
-		(hex!["5c32313c22eebc15ecf28ebb75ed8e264d53e50429a5ce09ed3a86e72732c56d"], 5000000000000u128),
-		(hex!["5c436629095023be4d2ed2120002497bc18295fb485a11e83e529e617412626f"], 6999900000000u128),
-		(hex!["5c81f3afd924f4cdd7c151d539c7abc3cd3de33eebd59403b81b568b8efa2d3b"], 15000000000000u128),
-		(hex!["602d798e4d6f076cb28719b4bc757645ff0894a591173bd923bc8cb631fdeb0c"], 201660000000000u128),
-		(hex!["621014fccda62dbd21d32b3628691f68cecafa887a62d641ba8876e3e7e4c068"], 8000000000000u128),
-		(hex!["6613962cf897114a56ba84bbad47f52c46dc56960aae8ccfc71805cfc3fced19"], 32666600000000u128),
-		(hex!["662ef2fa0d3a90f1f9691d05daee187d35fb17482cc72b3e03922358d0bdcc6f"], 10000000000000u128),
-		(hex!["687b7e0289f5d116a2b68cf9d0496f62de37e579ea777ce39d81471c09ec142b"], 275000000000000u128),
-		(hex!["688de40f61eb6ecc19b4c3702267c0bbf052ed9ee843ff6d346d765f89ed6067"], 7000000000000u128),
-		(hex!["68fae6be10c90d572388d42129e074005005baf68d116a993073c5648ec78865"], 6356600000000u128),
-		(hex!["6a8cafed3a670189545d5b242aec4d52bb4fe90f5af2f5984d8a14eb44713a70"], 12780000000000u128),
-		(hex!["6c64f0ac3b73174aa0b0cd935b5576611e405c8485ef13a0be8bf2ea3a48da6f"], 8000000000000u128),
-		(hex!["6eb31a06ff9d943b174f683f8327e3b4847a02e197e951f01ac7759b4c102f10"], 52333300000000u128),
-		(hex!["6ed537e76f1ef68764d7544cd7a8be19cbaba2ef8af181090d281d80105fd963"], 175000000000000u128),
-		(hex!["7241b3a590243df346a79a2d0ebf79dc990f07c1c499145d0424f3769ca4c826"], 81000000000000u128),
-		(hex!["728ea7cd638962b92ec6405e7b5572b67cfbc96c7c2fc7becf4cddb22b50b02c"], 11890000000000u128),
-		(hex!["7a91a646fd4d7592aabed6ad7f3c1d9f12371f200ae3d644454c80272b8e8c14"], 44000000000000u128),
-		(hex!["7c9ae158bf660dbd429592d055efe4897fad8a07c4ed61accd1861380c5c3843"], 24666600000000u128),
-		(hex!["7cb95b196a81bb0b7952e94ff0624b9b1429e81bee0f03c8bf2f3cea5213c611"], 5805000000000u128),
-		(hex!["7ec0c61a682519e78e65026c51ceea52273870636814605a33518f02ad543317"], 6969600000000u128),
-		(hex!["802c32932fca84ba9c80d57e4b0ebccc8404ee75a346ae0b50a17666bb38c01c"], 4986600000000u128),
-		(hex!["806369b4f04792b7bd1a0d8586b7aa528591ba732362e3fb3d52d7b01e741b18"], 8660866667000u128),
-		(hex!["80a551df4b4b67586a512356fc0e513d641e39f62172d185465dfee61e67143a"], 15160000000000u128),
-		(hex!["821e24cd21f1da627bea7b7077d591b9c8a48f93dd87eb7f3f1ac4ec512f7b5f"], 7500000000000u128),
-		(hex!["84c62d27805ac9c7a62086e31dfae23703ac9dfb37fbd31bec95aa611c5d2c33"], 999666600000000u128),
-		(hex!["865facd74193d96f1b35a702efe05116e7be752d77f46c7fe4720905728ccb36"], 6993300000000u128),
-		(hex!["88077737732044369dc52dd7f7bf400cfb493a219f013fbfdd46f7cd52673d6f"], 67666600000000u128),
-		(hex!["8865278958eaaba42406d1ae16545267c944113c216fffc386edb4d6a8cffd36"], 5000000000000u128),
-		(hex!["8ad06fa44a5669702a29b394424560714a1af90ad9efb57f3864b93b1ff7961c"], 100000000000u128),
-		(hex!["8e7215d5218f170d0865fcbe16b2ceb752db7e7bfce3f3d487ecb60e776a2c36"], 39333200000000u128),
-		(hex!["8ef7167c4d50be846c6a03591e13005fa68ef858d87321bb79428b121e105a11"], 9166600000000u128),
-		(hex!["90bc6fc1133c3df447222e89b5ceaa028b69348ee381385239377b31df275248"], 15000000000000u128),
-		(hex!["90da58a51d922ae69f27d8020d52e2fc71a5e5af1b63571bae81ddb87f8ff424"], 6696900000000u128),
-		(hex!["92af8236baeef25f6e85ed30d85b758f5604c5c4c4c3637657fea1946a3da61b"], 13000000000000u128),
-		(hex!["969fe4cba88544e8d3d71f31790cc1d377cf85a89e1b3d03e7a8b932aed1d312"], 84000000000000u128),
-		(hex!["96be4635aeb775be58f3c0843bd8bc1832d257e56905525dcb3d38126d8f855e"], 12166600000000u128),
-		(hex!["9822df7da6d3c119f5118587b29eaa30aaf00839e2a03161c2df4222a0d8744e"], 8999900000000u128),
-		(hex!["9cb774a6051717a844657f0c037a93173f70afc000babd2f7f0be7d1e8475436"], 9000000000000u128),
-		(hex!["9eb27cde65b09610cbe8a3d3b82c6730f5a5dd51aeb082fdd74236c4765a040a"], 8890000000000u128),
-		(hex!["a0c6e8d74992d1ea3e43081624b2cddbd98b50d7a75998662ce6adbb2290aa64"], 175000000000000u128),
-		(hex!["a2b8bfb3c0c1f04346134e7b27cb5b63de8a7af0d57c502d09c05ba7b3dd1e28"], 9326600000000u128),
-		(hex!["a415a980463876c54b503c358613b5c02d8ac9781c13378797c54ab37fc07c05"], 8666600000000u128),
-		(hex!["a48539457aa2e54048493ccaf980be18253d8cabd6eecd295e6b62e6a357352f"], 8879900000000u128),
-		(hex!["a60b82ce304c28aad744e2a95924b3e1e560803a75e5a39fc91300556e9a9538"], 83499000000000u128),
-		(hex!["a673009c77c4734fbc09f3bf505e3414282f714e89688ca3fa9292921cb7e51d"], 93000000000000u128),
-		(hex!["a69f19b16dfdfb01b1d480c59512b0d589e600538cd9102de9619ef419211f1b"], 11993300000000u128),
-		(hex!["aa17e09d3e9685a53d52d5123cc7f4f6f9fc7f3ab34f268a6f8860de68f2b612"], 15000000000000u128),
-		(hex!["aa893ab408a0c0b8bb175ed7fa2b042e0fd30915e6ab8f66a9ac524e552d167f"], 11480000000000u128),
-		(hex!["accd5106f4794d9052617617a993556b15c6e62859282bad7edb24592d728a69"], 94999000000000u128),
-		(hex!["ae4bada5af908d3bddd0cb7e250d38da99cf9d6508a6b1118a89dc59fb372a4a"], 17000000000000u128),
-		(hex!["b2012e8078883fdd9693d75c90bb669834f7b2c302def049e6eb486e56dc7365"], 13500000000000u128),
-		(hex!["b2fa9763f56890cabe29a1ea971851a3234aecd03584c44f822e036fbd9c5156"], 8554600000000u128),
-		(hex!["b8a750597d770430e4f9771829cf964825ea6750a6229deb06dc515371c7033f"], 96600000000u128),
-		(hex!["ba8a15ff06ff808a77b93ad335884ac66e3744a5cea908f8b8a865d98a934541"], 21333300000000u128),
-		(hex!["baf98d06056833e2e887c85c938aeb1c31dff74a91d35d9863327abc8ec93f4a"], 7500000000000u128),
-		(hex!["c2487c00d0e309fdb96d1e0ed7bb2da173d777b3ae26b25c1369992add25972d"], 21000000000000u128),
-		(hex!["c2fc6a3cc910e05c508c8b252f32c6df760858d12c6a636b256135e966edcf7e"], 9715500000000u128),
-		(hex!["c443922426297f4ded0e635f0a92b8e31823b2e6893398b1e8351c34a728fe34"], 6493300000000u128),
-		(hex!["c4f4760edf86fffa05380f31bf047c72837cccfc684d9dd9b1d7fa4e3503ce51"], 14500000000000u128),
-		(hex!["c676a26c89e3be0451afa1126516b8f88b3da99511aba215ec99707ac5f08e3c"], 14833300000000u128),
-		(hex!["d25af2fedd4eb672f218932fde44f97f10c1d7788efd0079957ffad4f186ae78"], 100000000000000u128),
-		(hex!["d4610b986b4e4cb505ce0003142df98f803b7c3413acc9f7805992dc2a00483c"], 110000000000000u128),
-		(hex!["d80cb19a68fb4ae325cd0209e8563cf3d5ff0368e2ede5530940f29371a02a25"], 19000000000000u128),
-		(hex!["dc8f45881886ba4d2e2409ea49661b14a29a72e64d7a59d98465a9cee8084107"], 34666600000000u128),
-		(hex!["de3898d3824e41435b6519f2095d25af51954af6be4a946d5d2df46df3ea264f"], 110000000000000u128),
-		(hex!["e2094a5bcc479f2e6c83bfdbc88fe3658b817522ba1fb240f804b131ffa81600"], 41000000000000u128),
-		(hex!["e27bc8259449251380d0b6c848cd607b12a09b0fa8fd8875ae3f6eea70c3fd69"], 1993300000000u128),
-		(hex!["e45c09f0387a72f3a1eeb9e1a8f23feb738bc48d56d99ab88c8a910807c48a0c"], 18646600000000u128),
-		(hex!["e62321ed84ec54791122f2ec72e9e36d3cb336ed358d6848a65b8410b405650a"], 9216100000000u128),
-		(hex!["e80d8a511c20f08d8abbd69f1258fa27c28181ffa8fbee0989f706e7b6c48b21"], 9000000000000u128),
-		(hex!["ea53405eb9054ddf0b6b82de940a4646c70cb815ba4c4616394fe0488030bb32"], 72333300000000u128),
-		(hex!["eedfb6337bed7b15d7a0338820e8a4981d96fe7284e444885c7f478fe649012f"], 14566600000000u128),
-		(hex!["f20f603b0314b04a4c3b295cbfc7b53c11370cc0349ddb3cd32c91c5b416fc51"], 7493300000000u128),
-		(hex!["f4fa6e013f0a33b809b8c1dc8d73c1461407a474106f5def66c109a3d7c4f556"], 56666600000000u128),
-		(hex!["faaede0e8cfb95d55e325e29a4737decb4a20960a525384003248c5610405b7d"], 1893300000000u128),
-		(hex!["fae2f8b2e08e32c333e0332b4254119241c2f15421846b76b693eba714b3e571"], 20333300000000u128),
-		(hex!["44152e29de73d969a8d5bc6d0b3497f31ee7e7f6e01722a5a91fccadd6bcce76"], 14900000000000u128),
-		(hex!["4adb5df8ae7001c508d3e630deda167bce1760aa0e7c8544a1e3b70358ac3b45"], 15900000000000u128),
-		(hex!["f04581f47bc54daf59437fe8a8e7e76ab3f034d8b30f3629652a6a013f7e0b38"], 13986600000000u128),
-		(hex!["9c107fbcac10f60dc1910e27210283c39f8d5951816f8d7c8f5f96d0c71dbb29"], 26666666400u128),
-	].into_iter());
-}
-
-#[test]
-fn check_addresses() {
-	use sp_core::{
-		crypto::{AccountId32, Ss58Codec},
-		hexdisplay::HexDisplay,
-	};
-
-	let payouts: Vec<(&'static str, f64)> = vec![
-		("CffzJo8UPWwvwPF73VcbEv4jSG4ckvGwNePL9V52hYh743X", 89f64),
-		("CgEt8AwW9SThQXpLBAZy3MpKgNG7ZHaEDGeV5MLqHVPVoJg", 54.6666f64),
-		("CgGpRVgE8WXd2hjc3GBVxGpnG9KpjkvEGNkM6AAaCBmhQY9", 83f64),
-		("CiFzvmP1wyXB8nUHh6rA1j7tFQFBx2akg57TwdTGjRAXicm", 15.5133f64),
-		("CpLVRWcUd7PxDPSmtXwQC3628dwEYiMd3GbqZTnqvphMN3B", 0.0067666666f64),
-		("CrcpvEZP2Z82iYFUPConih1t46VFwttrX7Tv19NW6hoCzKG", 69f64),
-		("CxVmQoEyZKimVp3eMgtNHSwiFrEU3gwF1NGNPBo2gUNSr1g", 54.3332f64),
-		("D5QSdd589pFWeJm9bz1j3RTyy14ejKpnUKyEa4GBW9kYkVC", 14.2233f64),
-		("D87YYjk4agajQXHr1VyiW1qpzfm5QV4L8bk7XduhimVVS7H", 23.3333f64),
-		("D8hf8DjZ2eb8X6cyNAYx14fRa7hVUqB52ejx5YNc2ed81gC", 52.9999f64),
-		("D8iEArcApNbkH9BxEvc2AfLLWMD1sWS9F2XdRXyY9J6QDpi", 5.135f64),
-		("DBExZRq4qoK8xiZaHTR7iP9tWmQ8FL9JSQG8DLyLL8yV2J8", 54f64),
-		("DEBVjNhPic2eVBw2y42xJpTJfCSvDXXA6ibs7MzpXp2s2hj", 41.1666f64),
-		("DFpWz9jGga5ZKcRghQGchhMhSHURUcUc2TaT7dMB4pQhkeB", 11f64),
-		("DGE8ATd2NaitqX4jdvZNXFNMmY9Qui6swnfoheCiz7efWGG", 11.5566f64),
-		("DJTpC2pbDJeoJ2CTHSQBurbkbd9ZgkD2WYNDtCmJhem3swh", 13f64),
-		("DMwNfM1mwrraAoSG3LSnZcwGzuUcKipqYmRsFeCuvTvrdgL", 31f64),
-		("DPe86fQfixDTfejAiEJbRt2mvbtcGkWdGXsyCFDu37iKYVu", 200f64),
-		("DQB1TYcr7dw4UsHaNbNhM2jtyYaoQQrBoWS7jLb95D39XGb", 68.999f64),
-		("DUxSQ29BxeZWDXin4jZN7ogArgxJDohyeuKsqY83WqPhT4h", 6.9933f64),
-		("DaViizibrmJZwyUchRMRebv5YMXadS4PbYBLuZhbfMTtxPm", 0f64),
-		("Dab4bfYTZRUDMWjYAUQuFbDreQ9mt7nULWu3Dw7jodbzVe9", 0.333333333332f64),
-		("DfitqjAjNxJykJYaigWQmSRw7T847hfytxwVRuAwscdtYUh", 39f64),
-		("DfmNCWtsVSG9D8KWazZ84VdkSVgxot6989W1qL7bHEAP7SF", 11.65f64),
-		("DiMPtqB6HeYpYkjJJKNR6btJjmUNeG8yyhSg1N8UL3st5Um", 10.6666f64),
-		("Dikw9VJqJ4fJFcXuKaSqu3eSwBQM6zC8ja9rdAP3RbfeK1Y", 0f64),
-		("Dtskg3rQsxSpxxBG4pJYjTujm9fo48Q7qnEYtBfJ6UDqtSS", 14.9933f64),
-		("DwmWULE1g84ZMYyM4du8SmcQCkuz7VL7C6GmaWKoRXSG6vJ", 18.1499f64),
-		("DzLtEdo7ScPi1o3izPETynSm9kdXJF8H1Y68b3eFbsQUgm6", 83f64),
-		("DzUa9PynyTKBEJ9Yjk27o44aav9XaJG8p57YHKVNaorxbZu", 15.0565f64),
-		("E2U89NfSnVCmY3hBQHEdJ9KV6shd6B8h4EWkNLcSJCPRAk8", 12.6666f64),
-		("E2UrpeDCGs2mb9SZLzAk8E89yWaZncAvjFD5VnbYbDp44Xo", 112f64),
-		("E2maNj3d7YZZhpeUwCGGeThD7JX2zk1W8AUQ1Rqb2K9oDBR", 83.5f64),
-		("E3FfH6nbxCwQ9bg3oHAmBFpS3qEtWLbQ4QV8XUqn6qQaaab", 9.8933f64),
-		("E3WSzAdgZtu3o8NjTJdwweJjpmSGwcf42pZAFDR7CsNTrrr", 12.79f64),
-		("E52wAv1fTdLGUNR4CNSbeCmj1yNUeSFnj1CPKbRzTubt3YU", 69f64),
-		("ED74i7eA79DtKFu5WXbcLXLWT2E1XSDEdJSAEkU3ePN7LE4", 2.4833f64),
-		("EDQWMYr6a9aLjTbsMtKFAcoUsVA6qvm66RJsyJsNgbpxCFx", 0f64),
-		("EJ4FuvmVpU7Ri2GRMtQVhhfHsHzGLYngbKJzJ58RkmRrzJm", 0f64),
-		("EJMCExEPNyuq6EofbvwD2ErZKwuZCJVTFhiDcDwuW12c187", 2f64),
-		("EPhV6vifCet2sJPPCNGnUZdRhsQpfcsbxRvDkjsMPPCCvwR", 0.8989f64),
-		("EQ12pCgs4H3XHgDTc5n44xfXo6WNNkAg33b4aDFv3eUSgZd", 0f64),
-		("EXtySo37DkJUdQb5425KGzUCG8ecYL4nVkcNB5XZpDQPH73", 8f64),
-		("Ef6D2jpq92FoX8wSKihodFCg8juMjFu9CBnMwwBQDbYi4XU", 8.49f64),
-		("EfCqHrWEwRnRq2ekmTmWvKzYwKtcgD4uaJAm3T92wx3ekUx", 5f64),
-		("EfHwkqXCDup8Hi7DVWsPTDQoGiaW55HXgbQV3XzVSCEu1ii", 6.9999f64),
-		("EfcXWwDMt9UoYhj6KRfEA4NLccsZK2eQ2AFpGw4EGatNwcj", 15f64),
-		("EkRd7vCKiDZi6BM6tHKs5YAeGmE3MmQgChrrbtkRkf6SBwW", 201.66f64),
-		("EntzFKky1rX9oYWzEiv4K4D997XGtCH9BHCmairrXhrW2gb", 8f64),
-		("EtADjuauj4ETanscktz4jpejZdkCMVPnRxKos6AwgpzLdHM", 32.6666f64),
-		("EtJMBiUVsHm3bwfMhWksQ14mv1P69BHjp7ELYDWdqXynR6K", 10f64),
-		("EwKBYgaaELEEB5Vm9QAgArinAtps3dRUmb9bwBVTg5HqvxJ", 275f64),
-		("EwQeYkCGQtBHMgKvNZ7NZ9Dy9tqKJDqN3DknJm5XF8czbYB", 7f64),
-		("Ewy2kju7jdqBFbp95Nw1go31KyiMHS9rRVaevGkM62F1btd", 6.3566f64),
-		("Ez2PN6BKn31byeQTrTBqP6MAv4WF7eKF3J8UXXxaaAd1Kuv", 12.78f64),
-		("F2Sg6L8dTASXBz4rn9Rv4xsfaCKPn21pDzAX9HSAR8krMzR", 8f64),
-		("F5TzLdntQpfz5RXcqCqJM4NKrjS7jVnAcNRKhu5FpLLWm2i", 52.3333f64),
-		("F5e8A2i3XZvA5jZTYmwcUiHzVsoTAhJDgMxZEnsFe8dq2VA", 175f64),
-		("FA8VcXg8Yzg9RvVrTdhcKk5JLSH1hcwrS9fr7pjFraCRWcm", 81f64),
-		("FAXMVgYUWh6s2SFaX9h33mrjXXeq8HTcNwFHEy9D1eimrLK", 11.89f64),
-		("FM2dJMRnBkbJDbdtqhRpLfgRbwJBkiw6iKT8u6UJ7pojypt", 44f64),
-		("FPhTtxHSTKZM4fTndfgBSSXyTpdMkpEnqojAvGTS1c8hv9S", 24.6666f64),
-		("FPrWyj8aDy3dofjmXZE5mx4o6Kf82MnEGGpjVEHjH7khReo", 5.805f64),
-		("FSWpLozBJnXdVhE8t7LXYEpBybwse3S795WYFKiobhZWKVE", 6.9696f64),
-		("FUNmzDNdzWtXK51EZmwbDJXQALhcYGCQUeo8E4rtcx9QBX7", 4.9866f64),
-		("FUfBKr2pDxKrxmExGp4hjU6St4BDgffzKcyAqv6pruGnez1", 8.660866667f64),
-		("FUzksiAhxzSvvPqiYvUEwK32rFf6Fmyug9GZEdbMaoLmwh5", 15.16f64),
-		("FWvhQBV91wrvaqWiqDZfq4QPYYPFS28UV8zNgeJYyUexxXm", 7.5f64),
-		("FaQi6AhM49SdjBd7oZJftAPE6tt9mrH8AdySztpYUU1B6Vq", 999.6666f64),
-		("FcWMb9VtQutzQ5hxguyQrWKtN28zaXKuXLbL3D9oX6AJbiC", 6.9933f64),
-		("FcxNWVy5RESDsErjwyZmPCW6Z8Y3fbfLzmou34YZTrbcraL", 0f64),
-		("FegFL7hjGtjwRWvDMabMuPFGTzToioEWu4BLxjRxYPfvCpn", 67.6666f64),
-		("FfA5YrMeaPzBYB4rE4JBuauXua6BEAQoJPTd8dRCLCdRdhM", 5f64),
-		("FiL3XNxVpx5Cgnh4WPpPWms5Ed9tGqA44YEtHVDyPacHVGt", 0.1f64),
-		("Fo6D1N9EjneyZYYPGxiW1WNKsj1S9Gx1nxcrMCkKGQ1bwDM", 39.3332f64),
-		("Fomib3HNL24Cv6CbLJUf59yDF5shGFyDg8Wx7eGtmDdwrRF", 9.1666f64),
-		("Fr6PbzHWKrTvmFJmiYy7MD1iaUpTKHN91VS5iQZZgo7BWCw", 15f64),
-		("FrFGwHJKqLTyGDwqWfLgGYFDkjP12yAATQuh4oNpZMhpFzM", 6.6969f64),
-		("Ft2cSCw4V47d2S7V9nN2S6V5ByGmAnkfbkFbWUVuHVuaMvW", 0f64),
-		("FtG8FbxJXfDj6fcGp3eTL9tKJzkfqT9k8PREKXDgKmbnSDR", 0f64),
-		("FteeR6d11cvmoRUmvoBeYYHNpMd5onPnpGy5PUcR6Vo7dJX", 13f64),
-		("FypCVBt2MU61ZVL3N6mePXaUXrFX9nvGK6h5yqR89jc6JeW", 84f64),
-		("FyyDvxKBmKr81HwQWtbugiFRiu2P1JpSqBDid56AfFevuTV", 12.1666f64),
-		("G1o9z4HVf2pW7bbyKKNRP9MnmGEN4n7Ada3yJRpNzaiPoKd", 8.9999f64),
-		("G7oV7X7FzJJ2g8TetMvAaC4GvM1ZCzPCnfSk5KcnVy2PJEF", 9f64),
-		("GAQ75C8zHzVjWJLDH5PqFbLxfyck89wLJkhCzMZTXBFV5L7", 8.89f64),
-		("GD8GVB4Ai4uCSzMCiX6C4vuY4DVkBctQRT6QMqD6y5mJfr9", 175f64),
-		("GFgA4KV6Mm2TsHwEYtXfXZCf6QzebuN7c69UJGcRF2vCDTD", 9.3266f64),
-		("GHTohCLUcLyB8w4xMr4TyDkvUzDnim6fadWfJ7edPke971d", 8.6666f64),
-		("GJ2wraBjTtXH3m2TUxsVEc1bQdiuo6yiZUfczsws19uioX9", 8.8799f64),
-		("GL2tM9Q6KL6XxMEWBg5jdjLezP4EzYsh3bqR1pjTmwDY1Mf", 83.499f64),
-		("GLZdTryDdiHe3gVwFdncm2a6pKN6EiMxTGJQFHq5RxcNJZt", 93f64),
-		("GLnjFi1U2jk6hDs7HCL1Y8XHsVLPHd2UAQh3AqRgpcUAUcn", 11.9933f64),
-		("GRLkXUQUNqQMxKnNH1cM5TvWmu2H3yxGx9ohvJXSxRHUyJq", 15f64),
-		("GRvRXw8jB2H9EGojmmjM4vZCeofuu91W2Zpbtr2QC5f7iLb", 11.48f64),
-		("GUtkCnQKsVXzjqJvSZkiHtvdwZoEyukZrDE1iLTyV8F7tH6", 94.999f64),
-		("GWrL9KsayVkniG2GmkYoTRDaFHhpTTSf6fL25e623bHVkRt", 17f64),
-		("GbiPhuH4m4BCYiiLpqo2S2TyFxvgpfdSKWMdp9ZrbKdtXeM", 13.5f64),
-		("GczUwD9zRdzJnTCr9kyREURmVeYpZAg1wNWrZMjqqimHcds", 8.5546f64),
-		("GkS2m7UK6RSUkFiCHYPRtp8GCKdPtrBwP1wj7448gWoiut8", 0.0966f64),
-		("Gnh63rW5fy3FAbnZQPkajyrQXxQGkg56Waoe2Ede1RjRjrJ", 0f64),
-		("GnkMTVovNUith3JMaN5yvpuuwPzVeFbjM15wzg6LrAQSN6P", 0f64),
-		("GnuSjJqE7VWMUGYsEEqsMioXwzNXfhu7FPMvdfKCiVazJwD", 21.3333f64),
-		("GoUZE6g169BskxYVFV6prDUN4siKxa6Mr8VZD8B6TU9MEtX", 7.5f64),
-		("Gy4LfGahVbR4eM8Sj2aCC4hHFk4fbUWGZCWQV5pjSGwJRZb", 21f64),
-		("GyynnvzZzcJt24FQ6DNNg77Mgbfe8ddLdUiQG6nssoBVpmE", 9.7155f64),
-		("H1eyZGi1DKxTGdtM8UQRA1RGEe6kGhvKC4onRpy97qKqiPE", 6.4933f64),
-		("H2ZXJi5QAVB29d48oWgM1oBAmg2ngiofft4yEeyq58pViwt", 14.5f64),
-		("H4YEv9v4DzU6WJsF2pxSHGcVxZEZDS761XWYsnRKX7P3aMQ", 14.8333f64),
-		("H9eSvWe34vQDJAWckeTHWSqSChRat8bgKHG39GC1fjvEm7y", 0f64),
-		("HJHs8fpzT916HTQgdGf6s69qp5zwNmZpTTnGXmm6qNqaQyW", 0f64),
-		("HL8bEp8YicBdrUmJocCAWVLKUaR2dd1y6jnD934pbre3un1", 100f64),
-		("HNnVpuhqgXRRDL8h4H39EgvvXtVYEtFSPi1XBWHcEW4cEYc", 110f64),
-		("HTbdbMAMsFkUVeoMQ6pbH341DgQ1a4MpdCcaBu5N6uShJBq", 19f64),
-		("HZWcWK1Px51bWgu1BD5d9M6A1djczFsdRWVwhVpRrU6VUJH", 34.6666f64),
-		("Hbgxh54N33ApEZrpnYGhhvPJNYWD5LNprZodPVnSHq7QDDh", 110f64),
-		("Hgh6jDVF9SXHs5pw6TfAXMWj4qHXpU6Q4dXh7h8zpx26cdw", 41f64),
-		("HhH7NMA7FEkj327ZktSzkthknuQU591tLr1vX8zuc4E4JkB", 1.9933f64),
-		("Hjjn1CmyGWKCswCmVZJFTFMJkruTtgeycEmvR4rWJYU7izQ", 18.6466f64),
-		("HkRdC1w5XDvQQadAS2nL58mPRBCLyUCZAAiaV7DUWJgj7P8", 0f64),
-		("Hn4y5xom4rBD49e2eMTpsEbqAJgE7uSR62VGLVv78ZqCuxT", 9.2161f64),
-		("Hpaecetm5cBAJYDVqN9VeFUgVNQh3AAJAqUKAFW8PZGRst6", 9f64),
-		("HsZTGLU5foma6bWoC7BGAs51aRu9TNc2RKRQBcfaHhJES1z", 72.3333f64),
-		("HyXNSykBLZFMK8eAdys5L97ncetUhnStnLKMpuSp7kM9bCU", 14.5666f64),
-		("J3hg1qmm6VeU6WWcxGQnKaMnD8wYAxnFQwaysE7RhVXbNvs", 7.4933f64),
-		("J7XbTDFU4SRUaW6t6mYiK4tzDXtguhwa5ZK13EVCE5F2qak", 56.6666f64),
-		("J9c2fcmRhhNaJAxA8yLMkxap7PEWuYc1UaaTqxunfKscjG3", 0f64),
-		("JBfNxpntp7DaRM7pzg4XEm9TYX3gCaAVZvwgZW25ZzwXjy2", 0f64),
-		("JEzQAbxmotcDNAXFFgcDcjgEF9gbuxaxer4bhGdKEfQqyRw", 0f64),
-		("JF1SD3o1qZFdLBWmKTRHcHgBsXZRGGJhkwLeStYNoHs7ep1", 1.8933f64),
-		("JFGuwWzqiyJZ3MPM8NRy7kK75MdxwSkh7GNZcsVd6BpZq2h", 20.3333f64),
-		("D5WYdgC7f4W6jGCkQaQ3Lfe5P5F7JvfhYBAX9G6CBToMYe4", 0f64),
-		("EJgdRddcYSd6XWnwr8oZkkzxJJX8SLwig38d5yxZSRgJGQZ", 0f64),
-		("FXRK8xzufVJ45bCXuCCRr6FuS1dCfx9VjiuwqZDSqzEWgLm", 0f64),
-		("Gt8ferkwFEX9jLbxpuhLYqKdNzP9KtjZcGYVN2mMbuCwhAP", 0f64),
-		("HHCd33jjDBJJDZic7rbQZMuMaoe5ddYaRkaLf7tDURHpE56", 0f64),
-		("E7b4mfFEhpnbw7iKdhvnBw7fXoQ1QFQE4TtTRhseWMU1H2E", 14.9000f64),
-		("EGUE7VyrVLVSoaG43XVrEf3eKcgzJC8p3mFRtPUTMNLhdYs", 15.9000f64),
-		("EtommijqrHDFWFvBxP515oUbkXx9vK2qohzrmwpCXbU7Yx2", 0f64),
-		("GxzBsXcxZXXaKcLXj4CWGDdoCaXRVmcRkyiUAHFc1AfTMEV", 0f64),
-		("H1heyw8DdkexFHAJ85GhuJr5om72Kx2DdK6sHsmb2f9ebUJ", 0f64),
-		("J1Mf8RWcRWpuCRBAQVq6yRgb9exuHdKJdfV2NymtbXdkTF4", 13.9866f64),
-		("FX6PCBQr4gtejvdR5dCdstrxmS3oFrzjZHtAKXSBumEse96", 0f64),
-		("EdE26hU1nVmmVoteHWGKX8BuayykEg84iz7x3MCmzfocn2u", 0f64),
-		("DzN3bMAAKKam6DBr9co4r1TBSj5X6Looh3JvNmfegiVrUgy", 0f64),
-		("Dx2p54FSAxrqvFVN4ptvjV9LoUHkKQirM8SbLjD9PVnAonv", 0f64),
-		("G6wtWujSHgT24UxXhDHVaVbnY5fBkUJLsjykyWBvtNs2aGQ", 0.0266666664f64),
-		("DMrWWv31QiiDDESjGjyVcGhoCYMkPvrSTHHUDK5mR1riV2A", 0f64),
-		("EkahQVDKRCe97ZT9TgS1YyfTzLgPah5PHa8NsfGFLsPKpjo", 0f64),
-		("GhQ3gB8oaLZfjSd6gyeYZgymnJ2LEmvaUrSELBbva9342Y6", 0f64),
-	];
-	for (who, amount) in payouts.into_iter().filter(|&(_, amount)| amount > 0f64) {
-		println!(
-			"(hex![\"{}\"], {}u128),",
-			HexDisplay::from(AsRef::<[u8; 32]>::as_ref(&AccountId32::from_string(who).unwrap())),
-			(amount * 1_000_000_000_000f64).round() as u128,
-		)
-	}
-}
diff --git a/polkadot/runtime/kusama/src/tests.rs b/polkadot/runtime/kusama/src/tests.rs
deleted file mode 100644
index 053c3054ab463fa8c99fc4c430dc6b4bfc726efa..0000000000000000000000000000000000000000
--- a/polkadot/runtime/kusama/src/tests.rs
+++ /dev/null
@@ -1,177 +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/>.
-
-//! Tests for the Kusama Runtime Configuration
-
-use crate::*;
-use frame_support::{
-	dispatch::GetDispatchInfo, traits::WhitelistedStorageKeys, weights::WeightToFee as WeightToFeeT,
-};
-use keyring::Sr25519Keyring::Charlie;
-use pallet_transaction_payment::Multiplier;
-use parity_scale_codec::Encode;
-use runtime_common::MinimumMultiplier;
-use separator::Separatable;
-use sp_core::hexdisplay::HexDisplay;
-use sp_runtime::FixedPointNumber;
-use std::collections::HashSet;
-
-#[test]
-fn nis_hold_reason_encoding_is_correct() {
-	assert_eq!(RuntimeHoldReason::Nis(pallet_nis::HoldReason::NftReceipt).encode(), [38, 0]);
-}
-
-#[test]
-fn remove_keys_weight_is_sensible() {
-	use runtime_common::crowdloan::WeightInfo;
-	let max_weight = <Runtime as crowdloan::Config>::WeightInfo::refund(RemoveKeysLimit::get());
-	// Max remove keys limit should be no more than half the total block weight.
-	assert!((max_weight * 2).all_lt(BlockWeights::get().max_block));
-}
-
-#[test]
-fn sample_size_is_sensible() {
-	use runtime_common::auctions::WeightInfo;
-	// Need to clean up all samples at the end of an auction.
-	let samples: BlockNumber = EndingPeriod::get() / SampleLength::get();
-	let max_weight: Weight = RocksDbWeight::get().reads_writes(samples.into(), samples.into());
-	// Max sample cleanup should be no more than half the total block weight.
-	assert!((max_weight * 2).all_lt(BlockWeights::get().max_block));
-	assert!((<Runtime as auctions::Config>::WeightInfo::on_initialize() * 2)
-		.all_lt(BlockWeights::get().max_block));
-}
-
-#[test]
-fn payout_weight_portion() {
-	use pallet_staking::WeightInfo;
-	let payout_weight =
-		<Runtime as pallet_staking::Config>::WeightInfo::payout_stakers_alive_staked(
-			MaxNominatorRewardedPerValidator::get(),
-		)
-		.ref_time() as f64;
-	let block_weight = BlockWeights::get().max_block.ref_time() as f64;
-
-	println!(
-		"a full payout takes {:.2} of the block weight [{} / {}]",
-		payout_weight / block_weight,
-		payout_weight,
-		block_weight
-	);
-	assert!(payout_weight * 2f64 < block_weight);
-}
-
-#[test]
-#[ignore]
-fn block_cost() {
-	let max_block_weight = BlockWeights::get().max_block;
-	let raw_fee = WeightToFee::weight_to_fee(&max_block_weight);
-
-	println!(
-		"Full Block weight == {} // WeightToFee(full_block) == {} plank",
-		max_block_weight,
-		raw_fee.separated_string(),
-	);
-}
-
-#[test]
-#[ignore]
-fn transfer_cost_min_multiplier() {
-	let min_multiplier = MinimumMultiplier::get();
-	let call = pallet_balances::Call::<Runtime>::transfer_keep_alive {
-		dest: Charlie.to_account_id().into(),
-		value: Default::default(),
-	};
-	let info = call.get_dispatch_info();
-	// convert to outer call.
-	let call = RuntimeCall::Balances(call);
-	let len = call.using_encoded(|e| e.len()) as u32;
-
-	let mut ext = sp_io::TestExternalities::new_empty();
-	let mut test_with_multiplier = |m| {
-		ext.execute_with(|| {
-			pallet_transaction_payment::NextFeeMultiplier::<Runtime>::put(m);
-			let fee = TransactionPayment::compute_fee(len, &info, 0);
-			println!(
-				"weight = {:?} // multiplier = {:?} // full transfer fee = {:?}",
-				info.weight.ref_time().separated_string(),
-				pallet_transaction_payment::NextFeeMultiplier::<Runtime>::get(),
-				fee.separated_string(),
-			);
-		});
-	};
-
-	test_with_multiplier(min_multiplier);
-	test_with_multiplier(Multiplier::saturating_from_rational(1, 1u128));
-	test_with_multiplier(Multiplier::saturating_from_rational(1, 1_000u128));
-	test_with_multiplier(Multiplier::saturating_from_rational(1, 1_000_000u128));
-	test_with_multiplier(Multiplier::saturating_from_rational(1, 1_000_000_000u128));
-}
-
-#[test]
-fn nominator_limit() {
-	use pallet_election_provider_multi_phase::WeightInfo;
-	// starting point of the nominators.
-	let all_voters: u32 = 10_000;
-
-	// assuming we want around 5k candidates and 1k active validators.
-	let all_targets: u32 = 5_000;
-	let desired: u32 = 1_000;
-	let weight_with = |active| {
-		<Runtime as pallet_election_provider_multi_phase::Config>::WeightInfo::submit_unsigned(
-			all_voters.max(active),
-			all_targets,
-			active,
-			desired,
-		)
-	};
-
-	let mut active = 1;
-	while weight_with(active).all_lte(OffchainSolutionWeightLimit::get()) || active == all_voters {
-		active += 1;
-	}
-
-	println!("can support {} nominators to yield a weight of {}", active, weight_with(active));
-}
-
-#[test]
-fn call_size() {
-	RuntimeCall::assert_size_under(256);
-}
-
-#[test]
-fn check_whitelist() {
-	let whitelist: HashSet<String> = AllPalletsWithSystem::whitelisted_storage_keys()
-		.iter()
-		.map(|e| HexDisplay::from(&e.key).to_string())
-		.collect();
-
-	// Block number
-	assert!(whitelist.contains("26aa394eea5630e07c48ae0c9558cef702a5c1b19ab7a04f536c519aca4983ac"));
-	// Total issuance
-	assert!(whitelist.contains("c2261276cc9d1f8598ea4b6a74b15c2f57c875e4cff74148e4628f264b974c80"));
-	// Execution phase
-	assert!(whitelist.contains("26aa394eea5630e07c48ae0c9558cef7ff553b5a9862a516939d82b3d3d8661a"));
-	// Event count
-	assert!(whitelist.contains("26aa394eea5630e07c48ae0c9558cef70a98fdbe9ce6c55837576c60c7af3850"));
-	// System events
-	assert!(whitelist.contains("26aa394eea5630e07c48ae0c9558cef780d41e5e16056765bc8461851072c9d7"));
-	// Configuration ActiveConfig
-	assert!(whitelist.contains("06de3d8a54d27e44a9d5ce189618f22db4b49d95320d9021994c850f25b8e385"));
-	// XcmPallet VersionDiscoveryQueue
-	assert!(whitelist.contains("1405f2411d0af5a7ff397e7c9dc68d194a222ba0333561192e474c59ed8e30e1"));
-	// XcmPallet SafeXcmVersion
-	assert!(whitelist.contains("1405f2411d0af5a7ff397e7c9dc68d196323ae84c43568be0d1394d5d0d522c4"));
-}
diff --git a/polkadot/runtime/kusama/src/weights/frame_benchmarking_baseline.rs b/polkadot/runtime/kusama/src/weights/frame_benchmarking_baseline.rs
deleted file mode 100644
index e9f934f56564e5093d2567b535a0218b5707860e..0000000000000000000000000000000000000000
--- a/polkadot/runtime/kusama/src/weights/frame_benchmarking_baseline.rs
+++ /dev/null
@@ -1,108 +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/>.
-
-//! Autogenerated weights for `frame_benchmarking::baseline`
-//!
-//! THIS FILE WAS AUTO-GENERATED USING THE SUBSTRATE BENCHMARK CLI VERSION 4.0.0-dev
-//! DATE: 2023-06-19, STEPS: `50`, REPEAT: `20`, LOW RANGE: `[]`, HIGH RANGE: `[]`
-//! WORST CASE MAP SIZE: `1000000`
-//! HOSTNAME: `runner-e8ezs4ez-project-163-concurrent-0`, CPU: `Intel(R) Xeon(R) CPU @ 2.60GHz`
-//! EXECUTION: Some(Wasm), WASM-EXECUTION: Compiled, CHAIN: Some("kusama-dev"), DB CACHE: 1024
-
-// Executed Command:
-// ./target/production/polkadot
-// benchmark
-// pallet
-// --chain=kusama-dev
-// --steps=50
-// --repeat=20
-// --no-storage-info
-// --no-median-slopes
-// --no-min-squares
-// --pallet=frame_benchmarking::baseline
-// --extrinsic=*
-// --execution=wasm
-// --wasm-execution=compiled
-// --header=./file_header.txt
-// --output=./runtime/kusama/src/weights/frame_benchmarking_baseline.rs
-
-#![cfg_attr(rustfmt, rustfmt_skip)]
-#![allow(unused_parens)]
-#![allow(unused_imports)]
-#![allow(missing_docs)]
-
-use frame_support::{traits::Get, weights::Weight};
-use core::marker::PhantomData;
-
-/// Weight functions for `frame_benchmarking::baseline`.
-pub struct WeightInfo<T>(PhantomData<T>);
-impl<T: frame_system::Config> frame_benchmarking::baseline::WeightInfo for WeightInfo<T> {
-	/// The range of component `i` is `[0, 1000000]`.
-	fn addition(_i: u32, ) -> Weight {
-		// Proof Size summary in bytes:
-		//  Measured:  `0`
-		//  Estimated: `0`
-		// Minimum execution time: 173_000 picoseconds.
-		Weight::from_parts(235_396, 0)
-			.saturating_add(Weight::from_parts(0, 0))
-	}
-	/// The range of component `i` is `[0, 1000000]`.
-	fn subtraction(_i: u32, ) -> Weight {
-		// Proof Size summary in bytes:
-		//  Measured:  `0`
-		//  Estimated: `0`
-		// Minimum execution time: 177_000 picoseconds.
-		Weight::from_parts(228_745, 0)
-			.saturating_add(Weight::from_parts(0, 0))
-	}
-	/// The range of component `i` is `[0, 1000000]`.
-	fn multiplication(_i: u32, ) -> Weight {
-		// Proof Size summary in bytes:
-		//  Measured:  `0`
-		//  Estimated: `0`
-		// Minimum execution time: 178_000 picoseconds.
-		Weight::from_parts(233_063, 0)
-			.saturating_add(Weight::from_parts(0, 0))
-	}
-	/// The range of component `i` is `[0, 1000000]`.
-	fn division(_i: u32, ) -> Weight {
-		// Proof Size summary in bytes:
-		//  Measured:  `0`
-		//  Estimated: `0`
-		// Minimum execution time: 167_000 picoseconds.
-		Weight::from_parts(224_853, 0)
-			.saturating_add(Weight::from_parts(0, 0))
-	}
-	fn hashing() -> Weight {
-		// Proof Size summary in bytes:
-		//  Measured:  `0`
-		//  Estimated: `0`
-		// Minimum execution time: 23_298_471_000 picoseconds.
-		Weight::from_parts(23_321_832_000, 0)
-			.saturating_add(Weight::from_parts(0, 0))
-	}
-	/// The range of component `i` is `[0, 100]`.
-	fn sr25519_verification(i: u32, ) -> Weight {
-		// Proof Size summary in bytes:
-		//  Measured:  `0`
-		//  Estimated: `0`
-		// Minimum execution time: 228_000 picoseconds.
-		Weight::from_parts(8_448_493, 0)
-			.saturating_add(Weight::from_parts(0, 0))
-			// Standard Error: 18_878
-			.saturating_add(Weight::from_parts(55_611_437, 0).saturating_mul(i.into()))
-	}
-}
diff --git a/polkadot/runtime/kusama/src/weights/frame_election_provider_support.rs b/polkadot/runtime/kusama/src/weights/frame_election_provider_support.rs
deleted file mode 100644
index 9cdbd67d5e1db379958c12516e5e2f999379ef9b..0000000000000000000000000000000000000000
--- a/polkadot/runtime/kusama/src/weights/frame_election_provider_support.rs
+++ /dev/null
@@ -1,83 +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/>.
-
-//! Autogenerated weights for `frame_election_provider_support`
-//!
-//! THIS FILE WAS AUTO-GENERATED USING THE SUBSTRATE BENCHMARK CLI VERSION 4.0.0-dev
-//! DATE: 2023-06-19, STEPS: `50`, REPEAT: `20`, LOW RANGE: `[]`, HIGH RANGE: `[]`
-//! WORST CASE MAP SIZE: `1000000`
-//! HOSTNAME: `runner-e8ezs4ez-project-163-concurrent-0`, CPU: `Intel(R) Xeon(R) CPU @ 2.60GHz`
-//! EXECUTION: Some(Wasm), WASM-EXECUTION: Compiled, CHAIN: Some("kusama-dev"), DB CACHE: 1024
-
-// Executed Command:
-// ./target/production/polkadot
-// benchmark
-// pallet
-// --chain=kusama-dev
-// --steps=50
-// --repeat=20
-// --no-storage-info
-// --no-median-slopes
-// --no-min-squares
-// --pallet=frame_election_provider_support
-// --extrinsic=*
-// --execution=wasm
-// --wasm-execution=compiled
-// --header=./file_header.txt
-// --output=./runtime/kusama/src/weights/
-
-#![cfg_attr(rustfmt, rustfmt_skip)]
-#![allow(unused_parens)]
-#![allow(unused_imports)]
-#![allow(missing_docs)]
-
-use frame_support::{traits::Get, weights::Weight};
-use core::marker::PhantomData;
-
-/// Weight functions for `frame_election_provider_support`.
-pub struct WeightInfo<T>(PhantomData<T>);
-impl<T: frame_system::Config> frame_election_provider_support::WeightInfo for WeightInfo<T> {
-	/// The range of component `v` is `[1000, 2000]`.
-	/// The range of component `t` is `[500, 1000]`.
-	/// The range of component `d` is `[5, 16]`.
-	fn phragmen(v: u32, _t: u32, d: u32, ) -> Weight {
-		// Proof Size summary in bytes:
-		//  Measured:  `0`
-		//  Estimated: `0`
-		// Minimum execution time: 6_647_123_000 picoseconds.
-		Weight::from_parts(6_809_648_000, 0)
-			.saturating_add(Weight::from_parts(0, 0))
-			// Standard Error: 139_689
-			.saturating_add(Weight::from_parts(6_171_199, 0).saturating_mul(v.into()))
-			// Standard Error: 14_281_333
-			.saturating_add(Weight::from_parts(1_423_059_328, 0).saturating_mul(d.into()))
-	}
-	/// The range of component `v` is `[1000, 2000]`.
-	/// The range of component `t` is `[500, 1000]`.
-	/// The range of component `d` is `[5, 16]`.
-	fn phragmms(v: u32, _t: u32, d: u32, ) -> Weight {
-		// Proof Size summary in bytes:
-		//  Measured:  `0`
-		//  Estimated: `0`
-		// Minimum execution time: 4_616_850_000 picoseconds.
-		Weight::from_parts(4_769_028_000, 0)
-			.saturating_add(Weight::from_parts(0, 0))
-			// Standard Error: 123_691
-			.saturating_add(Weight::from_parts(4_925_892, 0).saturating_mul(v.into()))
-			// Standard Error: 12_645_798
-			.saturating_add(Weight::from_parts(1_357_902_261, 0).saturating_mul(d.into()))
-	}
-}
diff --git a/polkadot/runtime/kusama/src/weights/frame_system.rs b/polkadot/runtime/kusama/src/weights/frame_system.rs
deleted file mode 100644
index 927977e9be0119a70de110f3c566608bbbbd6845..0000000000000000000000000000000000000000
--- a/polkadot/runtime/kusama/src/weights/frame_system.rs
+++ /dev/null
@@ -1,147 +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/>.
-
-//! Autogenerated weights for `frame_system`
-//!
-//! THIS FILE WAS AUTO-GENERATED USING THE SUBSTRATE BENCHMARK CLI VERSION 4.0.0-dev
-//! DATE: 2023-06-19, STEPS: `50`, REPEAT: `20`, LOW RANGE: `[]`, HIGH RANGE: `[]`
-//! WORST CASE MAP SIZE: `1000000`
-//! HOSTNAME: `runner-e8ezs4ez-project-163-concurrent-0`, CPU: `Intel(R) Xeon(R) CPU @ 2.60GHz`
-//! EXECUTION: Some(Wasm), WASM-EXECUTION: Compiled, CHAIN: Some("kusama-dev"), DB CACHE: 1024
-
-// Executed Command:
-// ./target/production/polkadot
-// benchmark
-// pallet
-// --chain=kusama-dev
-// --steps=50
-// --repeat=20
-// --no-storage-info
-// --no-median-slopes
-// --no-min-squares
-// --pallet=frame_system
-// --extrinsic=*
-// --execution=wasm
-// --wasm-execution=compiled
-// --header=./file_header.txt
-// --output=./runtime/kusama/src/weights/
-
-#![cfg_attr(rustfmt, rustfmt_skip)]
-#![allow(unused_parens)]
-#![allow(unused_imports)]
-#![allow(missing_docs)]
-
-use frame_support::{traits::Get, weights::Weight};
-use core::marker::PhantomData;
-
-/// Weight functions for `frame_system`.
-pub struct WeightInfo<T>(PhantomData<T>);
-impl<T: frame_system::Config> frame_system::WeightInfo for WeightInfo<T> {
-	/// The range of component `b` is `[0, 3932160]`.
-	fn remark(b: u32, ) -> Weight {
-		// Proof Size summary in bytes:
-		//  Measured:  `0`
-		//  Estimated: `0`
-		// Minimum execution time: 1_951_000 picoseconds.
-		Weight::from_parts(2_015_000, 0)
-			.saturating_add(Weight::from_parts(0, 0))
-			// Standard Error: 1
-			.saturating_add(Weight::from_parts(431, 0).saturating_mul(b.into()))
-	}
-	/// The range of component `b` is `[0, 3932160]`.
-	fn remark_with_event(b: u32, ) -> Weight {
-		// Proof Size summary in bytes:
-		//  Measured:  `0`
-		//  Estimated: `0`
-		// Minimum execution time: 7_410_000 picoseconds.
-		Weight::from_parts(7_603_000, 0)
-			.saturating_add(Weight::from_parts(0, 0))
-			// Standard Error: 3
-			.saturating_add(Weight::from_parts(1_793, 0).saturating_mul(b.into()))
-	}
-	/// Storage: System Digest (r:1 w:1)
-	/// Proof Skipped: System Digest (max_values: Some(1), max_size: None, mode: Measured)
-	/// Storage: unknown `0x3a686561707061676573` (r:0 w:1)
-	/// Proof Skipped: unknown `0x3a686561707061676573` (r:0 w:1)
-	fn set_heap_pages() -> Weight {
-		// Proof Size summary in bytes:
-		//  Measured:  `0`
-		//  Estimated: `1485`
-		// Minimum execution time: 3_736_000 picoseconds.
-		Weight::from_parts(3_922_000, 0)
-			.saturating_add(Weight::from_parts(0, 1485))
-			.saturating_add(T::DbWeight::get().reads(1))
-			.saturating_add(T::DbWeight::get().writes(2))
-	}
-	/// Storage: System Digest (r:1 w:1)
-	/// Proof Skipped: System Digest (max_values: Some(1), max_size: None, mode: Measured)
-	/// Storage: unknown `0x3a636f6465` (r:0 w:1)
-	/// Proof Skipped: unknown `0x3a636f6465` (r:0 w:1)
-	fn set_code() -> Weight {
-		// Proof Size summary in bytes:
-		//  Measured:  `0`
-		//  Estimated: `1485`
-		// Minimum execution time: 93_052_017_000 picoseconds.
-		Weight::from_parts(98_271_042_000, 0)
-			.saturating_add(Weight::from_parts(0, 1485))
-			.saturating_add(T::DbWeight::get().reads(1))
-			.saturating_add(T::DbWeight::get().writes(2))
-	}
-	/// Storage: Skipped Metadata (r:0 w:0)
-	/// Proof Skipped: Skipped Metadata (max_values: None, max_size: None, mode: Measured)
-	/// The range of component `i` is `[0, 1000]`.
-	fn set_storage(i: u32, ) -> Weight {
-		// Proof Size summary in bytes:
-		//  Measured:  `0`
-		//  Estimated: `0`
-		// Minimum execution time: 2_100_000 picoseconds.
-		Weight::from_parts(2_131_000, 0)
-			.saturating_add(Weight::from_parts(0, 0))
-			// Standard Error: 1_975
-			.saturating_add(Weight::from_parts(744_852, 0).saturating_mul(i.into()))
-			.saturating_add(T::DbWeight::get().writes((1_u64).saturating_mul(i.into())))
-	}
-	/// Storage: Skipped Metadata (r:0 w:0)
-	/// Proof Skipped: Skipped Metadata (max_values: None, max_size: None, mode: Measured)
-	/// The range of component `i` is `[0, 1000]`.
-	fn kill_storage(i: u32, ) -> Weight {
-		// Proof Size summary in bytes:
-		//  Measured:  `0`
-		//  Estimated: `0`
-		// Minimum execution time: 2_089_000 picoseconds.
-		Weight::from_parts(2_129_000, 0)
-			.saturating_add(Weight::from_parts(0, 0))
-			// Standard Error: 1_093
-			.saturating_add(Weight::from_parts(568_923, 0).saturating_mul(i.into()))
-			.saturating_add(T::DbWeight::get().writes((1_u64).saturating_mul(i.into())))
-	}
-	/// Storage: Skipped Metadata (r:0 w:0)
-	/// Proof Skipped: Skipped Metadata (max_values: None, max_size: None, mode: Measured)
-	/// The range of component `p` is `[0, 1000]`.
-	fn kill_prefix(p: u32, ) -> Weight {
-		// Proof Size summary in bytes:
-		//  Measured:  `105 + p * (69 ±0)`
-		//  Estimated: `118 + p * (70 ±0)`
-		// Minimum execution time: 3_913_000 picoseconds.
-		Weight::from_parts(4_056_000, 0)
-			.saturating_add(Weight::from_parts(0, 118))
-			// Standard Error: 2_452
-			.saturating_add(Weight::from_parts(1_281_244, 0).saturating_mul(p.into()))
-			.saturating_add(T::DbWeight::get().reads((1_u64).saturating_mul(p.into())))
-			.saturating_add(T::DbWeight::get().writes((1_u64).saturating_mul(p.into())))
-			.saturating_add(Weight::from_parts(0, 70).saturating_mul(p.into()))
-	}
-}
diff --git a/polkadot/runtime/kusama/src/weights/mod.rs b/polkadot/runtime/kusama/src/weights/mod.rs
deleted file mode 100644
index b3642d49d46390d2551b5f5420ef1b5626f40678..0000000000000000000000000000000000000000
--- a/polkadot/runtime/kusama/src/weights/mod.rs
+++ /dev/null
@@ -1,69 +0,0 @@
-// 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.
-
-//! A list of the different weight modules for our runtime.
-
-pub mod frame_election_provider_support;
-pub mod frame_system;
-pub mod pallet_bags_list;
-pub mod pallet_balances;
-pub mod pallet_balances_nis_counterpart_balances;
-pub mod pallet_bounties;
-pub mod pallet_child_bounties;
-pub mod pallet_collective_council;
-pub mod pallet_collective_technical_committee;
-pub mod pallet_conviction_voting;
-pub mod pallet_democracy;
-pub mod pallet_election_provider_multi_phase;
-pub mod pallet_elections_phragmen;
-pub mod pallet_fast_unstake;
-pub mod pallet_identity;
-pub mod pallet_im_online;
-pub mod pallet_indices;
-pub mod pallet_membership;
-pub mod pallet_message_queue;
-pub mod pallet_multisig;
-pub mod pallet_nis;
-pub mod pallet_nomination_pools;
-pub mod pallet_preimage;
-pub mod pallet_proxy;
-pub mod pallet_ranked_collective;
-pub mod pallet_referenda_fellowship_referenda;
-pub mod pallet_referenda_referenda;
-pub mod pallet_scheduler;
-pub mod pallet_session;
-pub mod pallet_society;
-pub mod pallet_staking;
-pub mod pallet_timestamp;
-pub mod pallet_tips;
-pub mod pallet_treasury;
-pub mod pallet_utility;
-pub mod pallet_vesting;
-pub mod pallet_whitelist;
-pub mod pallet_xcm;
-pub mod runtime_common_auctions;
-pub mod runtime_common_claims;
-pub mod runtime_common_crowdloan;
-pub mod runtime_common_paras_registrar;
-pub mod runtime_common_slots;
-pub mod runtime_parachains_configuration;
-pub mod runtime_parachains_disputes;
-pub mod runtime_parachains_disputes_slashing;
-pub mod runtime_parachains_hrmp;
-pub mod runtime_parachains_inclusion;
-pub mod runtime_parachains_initializer;
-pub mod runtime_parachains_paras;
-pub mod runtime_parachains_paras_inherent;
-pub mod xcm;
diff --git a/polkadot/runtime/kusama/src/weights/pallet_bags_list.rs b/polkadot/runtime/kusama/src/weights/pallet_bags_list.rs
deleted file mode 100644
index b138ae3003b7e40360a6bb9b3b9ddd17957738a2..0000000000000000000000000000000000000000
--- a/polkadot/runtime/kusama/src/weights/pallet_bags_list.rs
+++ /dev/null
@@ -1,109 +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/>.
-
-//! Autogenerated weights for `pallet_bags_list`
-//!
-//! THIS FILE WAS AUTO-GENERATED USING THE SUBSTRATE BENCHMARK CLI VERSION 4.0.0-dev
-//! DATE: 2023-06-19, STEPS: `50`, REPEAT: `20`, LOW RANGE: `[]`, HIGH RANGE: `[]`
-//! WORST CASE MAP SIZE: `1000000`
-//! HOSTNAME: `runner-e8ezs4ez-project-163-concurrent-0`, CPU: `Intel(R) Xeon(R) CPU @ 2.60GHz`
-//! EXECUTION: Some(Wasm), WASM-EXECUTION: Compiled, CHAIN: Some("kusama-dev"), DB CACHE: 1024
-
-// Executed Command:
-// ./target/production/polkadot
-// benchmark
-// pallet
-// --chain=kusama-dev
-// --steps=50
-// --repeat=20
-// --no-storage-info
-// --no-median-slopes
-// --no-min-squares
-// --pallet=pallet_bags_list
-// --extrinsic=*
-// --execution=wasm
-// --wasm-execution=compiled
-// --header=./file_header.txt
-// --output=./runtime/kusama/src/weights/
-
-#![cfg_attr(rustfmt, rustfmt_skip)]
-#![allow(unused_parens)]
-#![allow(unused_imports)]
-#![allow(missing_docs)]
-
-use frame_support::{traits::Get, weights::Weight};
-use core::marker::PhantomData;
-
-/// Weight functions for `pallet_bags_list`.
-pub struct WeightInfo<T>(PhantomData<T>);
-impl<T: frame_system::Config> pallet_bags_list::WeightInfo for WeightInfo<T> {
-	/// Storage: Staking Bonded (r:1 w:0)
-	/// Proof: Staking Bonded (max_values: None, max_size: Some(72), added: 2547, mode: MaxEncodedLen)
-	/// Storage: Staking Ledger (r:1 w:0)
-	/// Proof: Staking Ledger (max_values: None, max_size: Some(1091), added: 3566, mode: MaxEncodedLen)
-	/// Storage: VoterList ListNodes (r:4 w:4)
-	/// Proof: VoterList ListNodes (max_values: None, max_size: Some(154), added: 2629, mode: MaxEncodedLen)
-	/// Storage: VoterList ListBags (r:1 w:1)
-	/// Proof: VoterList ListBags (max_values: None, max_size: Some(82), added: 2557, mode: MaxEncodedLen)
-	fn rebag_non_terminal() -> Weight {
-		// Proof Size summary in bytes:
-		//  Measured:  `1654`
-		//  Estimated: `11506`
-		// Minimum execution time: 60_661_000 picoseconds.
-		Weight::from_parts(62_784_000, 0)
-			.saturating_add(Weight::from_parts(0, 11506))
-			.saturating_add(T::DbWeight::get().reads(7))
-			.saturating_add(T::DbWeight::get().writes(5))
-	}
-	/// Storage: Staking Bonded (r:1 w:0)
-	/// Proof: Staking Bonded (max_values: None, max_size: Some(72), added: 2547, mode: MaxEncodedLen)
-	/// Storage: Staking Ledger (r:1 w:0)
-	/// Proof: Staking Ledger (max_values: None, max_size: Some(1091), added: 3566, mode: MaxEncodedLen)
-	/// Storage: VoterList ListNodes (r:3 w:3)
-	/// Proof: VoterList ListNodes (max_values: None, max_size: Some(154), added: 2629, mode: MaxEncodedLen)
-	/// Storage: VoterList ListBags (r:2 w:2)
-	/// Proof: VoterList ListBags (max_values: None, max_size: Some(82), added: 2557, mode: MaxEncodedLen)
-	fn rebag_terminal() -> Weight {
-		// Proof Size summary in bytes:
-		//  Measured:  `1548`
-		//  Estimated: `8877`
-		// Minimum execution time: 58_537_000 picoseconds.
-		Weight::from_parts(60_665_000, 0)
-			.saturating_add(Weight::from_parts(0, 8877))
-			.saturating_add(T::DbWeight::get().reads(7))
-			.saturating_add(T::DbWeight::get().writes(5))
-	}
-	/// Storage: VoterList ListNodes (r:4 w:4)
-	/// Proof: VoterList ListNodes (max_values: None, max_size: Some(154), added: 2629, mode: MaxEncodedLen)
-	/// Storage: Staking Bonded (r:2 w:0)
-	/// Proof: Staking Bonded (max_values: None, max_size: Some(72), added: 2547, mode: MaxEncodedLen)
-	/// Storage: Staking Ledger (r:2 w:0)
-	/// Proof: Staking Ledger (max_values: None, max_size: Some(1091), added: 3566, mode: MaxEncodedLen)
-	/// Storage: VoterList CounterForListNodes (r:1 w:1)
-	/// Proof: VoterList CounterForListNodes (max_values: Some(1), max_size: Some(4), added: 499, mode: MaxEncodedLen)
-	/// Storage: VoterList ListBags (r:1 w:1)
-	/// Proof: VoterList ListBags (max_values: None, max_size: Some(82), added: 2557, mode: MaxEncodedLen)
-	fn put_in_front_of() -> Weight {
-		// Proof Size summary in bytes:
-		//  Measured:  `1857`
-		//  Estimated: `11506`
-		// Minimum execution time: 66_168_000 picoseconds.
-		Weight::from_parts(67_855_000, 0)
-			.saturating_add(Weight::from_parts(0, 11506))
-			.saturating_add(T::DbWeight::get().reads(10))
-			.saturating_add(T::DbWeight::get().writes(6))
-	}
-}
diff --git a/polkadot/runtime/kusama/src/weights/pallet_balances.rs b/polkadot/runtime/kusama/src/weights/pallet_balances.rs
deleted file mode 100644
index a8498f52f8bc4ef05669a8f59de55747f7bc6f1b..0000000000000000000000000000000000000000
--- a/polkadot/runtime/kusama/src/weights/pallet_balances.rs
+++ /dev/null
@@ -1,99 +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/>.
-//! Autogenerated weights for `pallet_balances`
-//!
-//! THIS FILE WAS AUTO-GENERATED USING THE SUBSTRATE BENCHMARK CLI VERSION 4.0.0-dev
-//! DATE: 2022-11-15, STEPS: `50`, REPEAT: 20, LOW RANGE: `[]`, HIGH RANGE: `[]`
-//! HOSTNAME: `bm5`, CPU: `Intel(R) Core(TM) i7-7700K CPU @ 4.20GHz`
-//! EXECUTION: Some(Wasm), WASM-EXECUTION: Compiled, CHAIN: Some("kusama-dev"), DB CACHE: 1024
-
-// Executed Command:
-// ./target/production/polkadot
-// benchmark
-// pallet
-// --chain=kusama-dev
-// --steps=50
-// --repeat=20
-// --pallet=pallet_balances
-// --extrinsic=*
-// --execution=wasm
-// --wasm-execution=compiled
-// --header=./file_header.txt
-// --output=./runtime/kusama/src/weights/
-
-#![cfg_attr(rustfmt, rustfmt_skip)]
-#![allow(unused_parens)]
-#![allow(unused_imports)]
-
-use frame_support::{traits::Get, weights::Weight};
-use sp_std::marker::PhantomData;
-
-/// Weight functions for `pallet_balances`.
-pub struct WeightInfo<T>(PhantomData<T>);
-impl<T: frame_system::Config> pallet_balances::WeightInfo for WeightInfo<T> {
-	// Storage: System Account (r:1 w:1)
-	fn transfer_allow_death() -> Weight {
-		// Minimum execution time: 40_902 nanoseconds.
-		Weight::from_parts(41_638_000 as u64, 0)
-			.saturating_add(T::DbWeight::get().reads(1 as u64))
-			.saturating_add(T::DbWeight::get().writes(1 as u64))
-	}
-	// Storage: System Account (r:1 w:1)
-	fn transfer_keep_alive() -> Weight {
-		// Minimum execution time: 30_093 nanoseconds.
-		Weight::from_parts(30_732_000 as u64, 0)
-			.saturating_add(T::DbWeight::get().reads(1 as u64))
-			.saturating_add(T::DbWeight::get().writes(1 as u64))
-	}
-	// Storage: System Account (r:1 w:1)
-	fn force_set_balance_creating() -> Weight {
-		// Minimum execution time: 23_901 nanoseconds.
-		Weight::from_parts(24_238_000 as u64, 0)
-			.saturating_add(T::DbWeight::get().reads(1 as u64))
-			.saturating_add(T::DbWeight::get().writes(1 as u64))
-	}
-	// Storage: System Account (r:1 w:1)
-	fn force_set_balance_killing() -> Weight {
-		// Minimum execution time: 26_402 nanoseconds.
-		Weight::from_parts(27_026_000 as u64, 0)
-			.saturating_add(T::DbWeight::get().reads(1 as u64))
-			.saturating_add(T::DbWeight::get().writes(1 as u64))
-	}
-	// Storage: System Account (r:2 w:2)
-	fn force_transfer() -> Weight {
-		// Minimum execution time: 40_328 nanoseconds.
-		Weight::from_parts(41_242_000 as u64, 0)
-			.saturating_add(T::DbWeight::get().reads(2 as u64))
-			.saturating_add(T::DbWeight::get().writes(2 as u64))
-	}
-	// Storage: System Account (r:1 w:1)
-	fn transfer_all() -> Weight {
-		// Minimum execution time: 35_401 nanoseconds.
-		Weight::from_parts(36_122_000 as u64, 0)
-			.saturating_add(T::DbWeight::get().reads(1 as u64))
-			.saturating_add(T::DbWeight::get().writes(1 as u64))
-	}
-	// Storage: System Account (r:1 w:1)
-	fn force_unreserve() -> Weight {
-		// Minimum execution time: 20_178 nanoseconds.
-		Weight::from_parts(20_435_000 as u64, 0)
-			.saturating_add(T::DbWeight::get().reads(1 as u64))
-			.saturating_add(T::DbWeight::get().writes(1 as u64))
-	}
-	fn upgrade_accounts(_: u32) -> Weight {
-		Weight::from_parts(0, 0)
-	}
-}
diff --git a/polkadot/runtime/kusama/src/weights/pallet_balances_balances.rs b/polkadot/runtime/kusama/src/weights/pallet_balances_balances.rs
deleted file mode 100644
index f65c5722d8be347e086d4833e87591475a2ea385..0000000000000000000000000000000000000000
--- a/polkadot/runtime/kusama/src/weights/pallet_balances_balances.rs
+++ /dev/null
@@ -1,154 +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/>.
-
-//! Autogenerated weights for `pallet_balances`
-//!
-//! THIS FILE WAS AUTO-GENERATED USING THE SUBSTRATE BENCHMARK CLI VERSION 4.0.0-dev
-//! DATE: 2023-06-19, STEPS: `50`, REPEAT: `20`, LOW RANGE: `[]`, HIGH RANGE: `[]`
-//! WORST CASE MAP SIZE: `1000000`
-//! HOSTNAME: `runner-e8ezs4ez-project-163-concurrent-0`, CPU: `Intel(R) Xeon(R) CPU @ 2.60GHz`
-//! EXECUTION: Some(Wasm), WASM-EXECUTION: Compiled, CHAIN: Some("kusama-dev"), DB CACHE: 1024
-
-// Executed Command:
-// ./target/production/polkadot
-// benchmark
-// pallet
-// --chain=kusama-dev
-// --steps=50
-// --repeat=20
-// --no-storage-info
-// --no-median-slopes
-// --no-min-squares
-// --pallet=pallet_balances
-// --extrinsic=*
-// --execution=wasm
-// --wasm-execution=compiled
-// --header=./file_header.txt
-// --output=./runtime/kusama/src/weights/
-
-#![cfg_attr(rustfmt, rustfmt_skip)]
-#![allow(unused_parens)]
-#![allow(unused_imports)]
-#![allow(missing_docs)]
-
-use frame_support::{traits::Get, weights::Weight};
-use core::marker::PhantomData;
-
-/// Weight functions for `pallet_balances`.
-pub struct WeightInfo<T>(PhantomData<T>);
-impl<T: frame_system::Config> pallet_balances::WeightInfo for WeightInfo<T> {
-	/// Storage: System Account (r:1 w:1)
-	/// Proof: System Account (max_values: None, max_size: Some(128), added: 2603, mode: MaxEncodedLen)
-	fn transfer_allow_death() -> Weight {
-		// Proof Size summary in bytes:
-		//  Measured:  `0`
-		//  Estimated: `3593`
-		// Minimum execution time: 55_712_000 picoseconds.
-		Weight::from_parts(56_594_000, 0)
-			.saturating_add(Weight::from_parts(0, 3593))
-			.saturating_add(T::DbWeight::get().reads(1))
-			.saturating_add(T::DbWeight::get().writes(1))
-	}
-	/// Storage: System Account (r:1 w:1)
-	/// Proof: System Account (max_values: None, max_size: Some(128), added: 2603, mode: MaxEncodedLen)
-	fn transfer_keep_alive() -> Weight {
-		// Proof Size summary in bytes:
-		//  Measured:  `0`
-		//  Estimated: `3593`
-		// Minimum execution time: 42_461_000 picoseconds.
-		Weight::from_parts(43_407_000, 0)
-			.saturating_add(Weight::from_parts(0, 3593))
-			.saturating_add(T::DbWeight::get().reads(1))
-			.saturating_add(T::DbWeight::get().writes(1))
-	}
-	/// Storage: System Account (r:1 w:1)
-	/// Proof: System Account (max_values: None, max_size: Some(128), added: 2603, mode: MaxEncodedLen)
-	fn force_set_balance_creating() -> Weight {
-		// Proof Size summary in bytes:
-		//  Measured:  `174`
-		//  Estimated: `3593`
-		// Minimum execution time: 15_909_000 picoseconds.
-		Weight::from_parts(16_376_000, 0)
-			.saturating_add(Weight::from_parts(0, 3593))
-			.saturating_add(T::DbWeight::get().reads(1))
-			.saturating_add(T::DbWeight::get().writes(1))
-	}
-	/// Storage: System Account (r:1 w:1)
-	/// Proof: System Account (max_values: None, max_size: Some(128), added: 2603, mode: MaxEncodedLen)
-	fn force_set_balance_killing() -> Weight {
-		// Proof Size summary in bytes:
-		//  Measured:  `174`
-		//  Estimated: `3593`
-		// Minimum execution time: 23_026_000 picoseconds.
-		Weight::from_parts(23_599_000, 0)
-			.saturating_add(Weight::from_parts(0, 3593))
-			.saturating_add(T::DbWeight::get().reads(1))
-			.saturating_add(T::DbWeight::get().writes(1))
-	}
-	/// Storage: System Account (r:2 w:2)
-	/// Proof: System Account (max_values: None, max_size: Some(128), added: 2603, mode: MaxEncodedLen)
-	fn force_transfer() -> Weight {
-		// Proof Size summary in bytes:
-		//  Measured:  `103`
-		//  Estimated: `6196`
-		// Minimum execution time: 57_520_000 picoseconds.
-		Weight::from_parts(58_933_000, 0)
-			.saturating_add(Weight::from_parts(0, 6196))
-			.saturating_add(T::DbWeight::get().reads(2))
-			.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)
-	fn transfer_all() -> Weight {
-		// Proof Size summary in bytes:
-		//  Measured:  `0`
-		//  Estimated: `3593`
-		// Minimum execution time: 51_663_000 picoseconds.
-		Weight::from_parts(52_494_000, 0)
-			.saturating_add(Weight::from_parts(0, 3593))
-			.saturating_add(T::DbWeight::get().reads(1))
-			.saturating_add(T::DbWeight::get().writes(1))
-	}
-	/// Storage: System Account (r:1 w:1)
-	/// Proof: System Account (max_values: None, max_size: Some(128), added: 2603, mode: MaxEncodedLen)
-	fn force_unreserve() -> Weight {
-		// Proof Size summary in bytes:
-		//  Measured:  `174`
-		//  Estimated: `3593`
-		// Minimum execution time: 18_726_000 picoseconds.
-		Weight::from_parts(19_172_000, 0)
-			.saturating_add(Weight::from_parts(0, 3593))
-			.saturating_add(T::DbWeight::get().reads(1))
-			.saturating_add(T::DbWeight::get().writes(1))
-	}
-	/// Storage: System Account (r:999 w:999)
-	/// Proof: System Account (max_values: None, max_size: Some(128), added: 2603, mode: MaxEncodedLen)
-	/// The range of component `u` is `[1, 1000]`.
-	/// The range of component `u` is `[1, 1000]`.
-	fn upgrade_accounts(u: u32, ) -> Weight {
-		// Proof Size summary in bytes:
-		//  Measured:  `0 + u * (135 ±0)`
-		//  Estimated: `990 + u * (2603 ±0)`
-		// Minimum execution time: 18_041_000 picoseconds.
-		Weight::from_parts(18_377_000, 0)
-			.saturating_add(Weight::from_parts(0, 990))
-			// Standard Error: 12_295
-			.saturating_add(Weight::from_parts(16_146_961, 0).saturating_mul(u.into()))
-			.saturating_add(T::DbWeight::get().reads((1_u64).saturating_mul(u.into())))
-			.saturating_add(T::DbWeight::get().writes((1_u64).saturating_mul(u.into())))
-			.saturating_add(Weight::from_parts(0, 2603).saturating_mul(u.into()))
-	}
-}
diff --git a/polkadot/runtime/kusama/src/weights/pallet_balances_nis_counterpart_balances.rs b/polkadot/runtime/kusama/src/weights/pallet_balances_nis_counterpart_balances.rs
deleted file mode 100644
index 730d622e9abce38a90d69d3b1a1fa3baf85708b5..0000000000000000000000000000000000000000
--- a/polkadot/runtime/kusama/src/weights/pallet_balances_nis_counterpart_balances.rs
+++ /dev/null
@@ -1,178 +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/>.
-
-//! Autogenerated weights for `pallet_balances`
-//!
-//! THIS FILE WAS AUTO-GENERATED USING THE SUBSTRATE BENCHMARK CLI VERSION 4.0.0-dev
-//! DATE: 2023-06-19, STEPS: `50`, REPEAT: `20`, LOW RANGE: `[]`, HIGH RANGE: `[]`
-//! WORST CASE MAP SIZE: `1000000`
-//! HOSTNAME: `runner-e8ezs4ez-project-163-concurrent-0`, CPU: `Intel(R) Xeon(R) CPU @ 2.60GHz`
-//! EXECUTION: Some(Wasm), WASM-EXECUTION: Compiled, CHAIN: Some("kusama-dev"), DB CACHE: 1024
-
-// Executed Command:
-// ./target/production/polkadot
-// benchmark
-// pallet
-// --chain=kusama-dev
-// --steps=50
-// --repeat=20
-// --no-storage-info
-// --no-median-slopes
-// --no-min-squares
-// --pallet=pallet_balances
-// --extrinsic=*
-// --execution=wasm
-// --wasm-execution=compiled
-// --header=./file_header.txt
-// --output=./runtime/kusama/src/weights/
-
-#![cfg_attr(rustfmt, rustfmt_skip)]
-#![allow(unused_parens)]
-#![allow(unused_imports)]
-#![allow(missing_docs)]
-
-use frame_support::{traits::Get, weights::Weight};
-use core::marker::PhantomData;
-
-/// Weight functions for `pallet_balances`.
-pub struct WeightInfo<T>(PhantomData<T>);
-impl<T: frame_system::Config> pallet_balances::WeightInfo for WeightInfo<T> {
-	/// Storage: NisCounterpartBalances TotalIssuance (r:1 w:1)
-	/// Proof: NisCounterpartBalances TotalIssuance (max_values: Some(1), max_size: Some(16), added: 511, mode: MaxEncodedLen)
-	/// Storage: NisCounterpartBalances Account (r:2 w:2)
-	/// Proof: NisCounterpartBalances Account (max_values: None, max_size: Some(112), added: 2587, mode: MaxEncodedLen)
-	/// Storage: System Account (r:1 w:1)
-	/// Proof: System Account (max_values: None, max_size: Some(128), added: 2603, mode: MaxEncodedLen)
-	fn transfer_allow_death() -> Weight {
-		// Proof Size summary in bytes:
-		//  Measured:  `219`
-		//  Estimated: `6164`
-		// Minimum execution time: 56_458_000 picoseconds.
-		Weight::from_parts(57_881_000, 0)
-			.saturating_add(Weight::from_parts(0, 6164))
-			.saturating_add(T::DbWeight::get().reads(4))
-			.saturating_add(T::DbWeight::get().writes(4))
-	}
-	/// Storage: NisCounterpartBalances TotalIssuance (r:1 w:0)
-	/// Proof: NisCounterpartBalances TotalIssuance (max_values: Some(1), max_size: Some(16), added: 511, mode: MaxEncodedLen)
-	/// Storage: NisCounterpartBalances Account (r:2 w:2)
-	/// Proof: NisCounterpartBalances Account (max_values: None, max_size: Some(112), added: 2587, mode: MaxEncodedLen)
-	/// Storage: System Account (r:1 w:1)
-	/// Proof: System Account (max_values: None, max_size: Some(128), added: 2603, mode: MaxEncodedLen)
-	fn transfer_keep_alive() -> Weight {
-		// Proof Size summary in bytes:
-		//  Measured:  `219`
-		//  Estimated: `6164`
-		// Minimum execution time: 43_014_000 picoseconds.
-		Weight::from_parts(44_098_000, 0)
-			.saturating_add(Weight::from_parts(0, 6164))
-			.saturating_add(T::DbWeight::get().reads(4))
-			.saturating_add(T::DbWeight::get().writes(3))
-	}
-	/// Storage: NisCounterpartBalances Account (r:1 w:1)
-	/// Proof: NisCounterpartBalances Account (max_values: None, max_size: Some(112), added: 2587, mode: MaxEncodedLen)
-	fn force_set_balance_creating() -> Weight {
-		// Proof Size summary in bytes:
-		//  Measured:  `217`
-		//  Estimated: `3577`
-		// Minimum execution time: 14_712_000 picoseconds.
-		Weight::from_parts(15_189_000, 0)
-			.saturating_add(Weight::from_parts(0, 3577))
-			.saturating_add(T::DbWeight::get().reads(1))
-			.saturating_add(T::DbWeight::get().writes(1))
-	}
-	/// Storage: NisCounterpartBalances Account (r:1 w:1)
-	/// Proof: NisCounterpartBalances Account (max_values: None, max_size: Some(112), added: 2587, mode: MaxEncodedLen)
-	/// Storage: System Account (r:1 w:1)
-	/// Proof: System Account (max_values: None, max_size: Some(128), added: 2603, mode: MaxEncodedLen)
-	/// Storage: NisCounterpartBalances TotalIssuance (r:1 w:1)
-	/// Proof: NisCounterpartBalances TotalIssuance (max_values: Some(1), max_size: Some(16), added: 511, mode: MaxEncodedLen)
-	fn force_set_balance_killing() -> Weight {
-		// Proof Size summary in bytes:
-		//  Measured:  `393`
-		//  Estimated: `3593`
-		// Minimum execution time: 25_131_000 picoseconds.
-		Weight::from_parts(25_796_000, 0)
-			.saturating_add(Weight::from_parts(0, 3593))
-			.saturating_add(T::DbWeight::get().reads(3))
-			.saturating_add(T::DbWeight::get().writes(3))
-	}
-	/// Storage: NisCounterpartBalances TotalIssuance (r:1 w:1)
-	/// Proof: NisCounterpartBalances TotalIssuance (max_values: Some(1), max_size: Some(16), added: 511, mode: MaxEncodedLen)
-	/// Storage: NisCounterpartBalances Account (r:2 w:2)
-	/// Proof: NisCounterpartBalances Account (max_values: None, max_size: Some(112), added: 2587, mode: MaxEncodedLen)
-	/// Storage: System Account (r:2 w:2)
-	/// Proof: System Account (max_values: None, max_size: Some(128), added: 2603, mode: MaxEncodedLen)
-	fn force_transfer() -> Weight {
-		// Proof Size summary in bytes:
-		//  Measured:  `322`
-		//  Estimated: `6196`
-		// Minimum execution time: 58_350_000 picoseconds.
-		Weight::from_parts(59_738_000, 0)
-			.saturating_add(Weight::from_parts(0, 6196))
-			.saturating_add(T::DbWeight::get().reads(5))
-			.saturating_add(T::DbWeight::get().writes(5))
-	}
-	/// Storage: NisCounterpartBalances Account (r:2 w:2)
-	/// Proof: NisCounterpartBalances Account (max_values: None, max_size: Some(112), added: 2587, mode: MaxEncodedLen)
-	/// Storage: NisCounterpartBalances TotalIssuance (r:1 w:0)
-	/// Proof: NisCounterpartBalances TotalIssuance (max_values: Some(1), max_size: Some(16), added: 511, mode: MaxEncodedLen)
-	/// Storage: System Account (r:1 w:1)
-	/// Proof: System Account (max_values: None, max_size: Some(128), added: 2603, mode: MaxEncodedLen)
-	fn transfer_all() -> Weight {
-		// Proof Size summary in bytes:
-		//  Measured:  `219`
-		//  Estimated: `6164`
-		// Minimum execution time: 52_544_000 picoseconds.
-		Weight::from_parts(53_454_000, 0)
-			.saturating_add(Weight::from_parts(0, 6164))
-			.saturating_add(T::DbWeight::get().reads(4))
-			.saturating_add(T::DbWeight::get().writes(3))
-	}
-	/// Storage: NisCounterpartBalances Account (r:1 w:1)
-	/// Proof: NisCounterpartBalances Account (max_values: None, max_size: Some(112), added: 2587, mode: MaxEncodedLen)
-	/// Storage: System Account (r:1 w:1)
-	/// Proof: System Account (max_values: None, max_size: Some(128), added: 2603, mode: MaxEncodedLen)
-	fn force_unreserve() -> Weight {
-		// Proof Size summary in bytes:
-		//  Measured:  `391`
-		//  Estimated: `3593`
-		// Minimum execution time: 20_615_000 picoseconds.
-		Weight::from_parts(21_215_000, 0)
-			.saturating_add(Weight::from_parts(0, 3593))
-			.saturating_add(T::DbWeight::get().reads(2))
-			.saturating_add(T::DbWeight::get().writes(2))
-	}
-	/// Storage: NisCounterpartBalances Account (r:999 w:999)
-	/// Proof: NisCounterpartBalances Account (max_values: None, max_size: Some(112), added: 2587, mode: MaxEncodedLen)
-	/// Storage: System Account (r:999 w:999)
-	/// Proof: System Account (max_values: None, max_size: Some(128), added: 2603, mode: MaxEncodedLen)
-	/// The range of component `u` is `[1, 1000]`.
-	/// The range of component `u` is `[1, 1000]`.
-	fn upgrade_accounts(u: u32, ) -> Weight {
-		// Proof Size summary in bytes:
-		//  Measured:  `0 + u * (256 ±0)`
-		//  Estimated: `990 + u * (2603 ±0)`
-		// Minimum execution time: 20_150_000 picoseconds.
-		Weight::from_parts(20_438_000, 0)
-			.saturating_add(Weight::from_parts(0, 990))
-			// Standard Error: 26_020
-			.saturating_add(Weight::from_parts(18_369_413, 0).saturating_mul(u.into()))
-			.saturating_add(T::DbWeight::get().reads((2_u64).saturating_mul(u.into())))
-			.saturating_add(T::DbWeight::get().writes((2_u64).saturating_mul(u.into())))
-			.saturating_add(Weight::from_parts(0, 2603).saturating_mul(u.into()))
-	}
-}
diff --git a/polkadot/runtime/kusama/src/weights/pallet_bounties.rs b/polkadot/runtime/kusama/src/weights/pallet_bounties.rs
deleted file mode 100644
index 07ddb5240e6a1d43340f5b87f589d3f003600b64..0000000000000000000000000000000000000000
--- a/polkadot/runtime/kusama/src/weights/pallet_bounties.rs
+++ /dev/null
@@ -1,230 +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/>.
-
-//! Autogenerated weights for `pallet_bounties`
-//!
-//! THIS FILE WAS AUTO-GENERATED USING THE SUBSTRATE BENCHMARK CLI VERSION 4.0.0-dev
-//! DATE: 2023-06-19, STEPS: `50`, REPEAT: `20`, LOW RANGE: `[]`, HIGH RANGE: `[]`
-//! WORST CASE MAP SIZE: `1000000`
-//! HOSTNAME: `runner-e8ezs4ez-project-163-concurrent-0`, CPU: `Intel(R) Xeon(R) CPU @ 2.60GHz`
-//! EXECUTION: Some(Wasm), WASM-EXECUTION: Compiled, CHAIN: Some("kusama-dev"), DB CACHE: 1024
-
-// Executed Command:
-// ./target/production/polkadot
-// benchmark
-// pallet
-// --chain=kusama-dev
-// --steps=50
-// --repeat=20
-// --no-storage-info
-// --no-median-slopes
-// --no-min-squares
-// --pallet=pallet_bounties
-// --extrinsic=*
-// --execution=wasm
-// --wasm-execution=compiled
-// --header=./file_header.txt
-// --output=./runtime/kusama/src/weights/
-
-#![cfg_attr(rustfmt, rustfmt_skip)]
-#![allow(unused_parens)]
-#![allow(unused_imports)]
-#![allow(missing_docs)]
-
-use frame_support::{traits::Get, weights::Weight};
-use core::marker::PhantomData;
-
-/// Weight functions for `pallet_bounties`.
-pub struct WeightInfo<T>(PhantomData<T>);
-impl<T: frame_system::Config> pallet_bounties::WeightInfo for WeightInfo<T> {
-	/// Storage: Bounties BountyCount (r:1 w:1)
-	/// Proof: Bounties BountyCount (max_values: Some(1), max_size: Some(4), added: 499, mode: MaxEncodedLen)
-	/// Storage: System Account (r:1 w:1)
-	/// Proof: System Account (max_values: None, max_size: Some(128), added: 2603, mode: MaxEncodedLen)
-	/// Storage: Bounties BountyDescriptions (r:0 w:1)
-	/// Proof: Bounties BountyDescriptions (max_values: None, max_size: Some(16400), added: 18875, mode: MaxEncodedLen)
-	/// Storage: Bounties Bounties (r:0 w:1)
-	/// Proof: Bounties Bounties (max_values: None, max_size: Some(177), added: 2652, mode: MaxEncodedLen)
-	/// The range of component `d` is `[0, 16384]`.
-	fn propose_bounty(d: u32, ) -> Weight {
-		// Proof Size summary in bytes:
-		//  Measured:  `177`
-		//  Estimated: `3593`
-		// Minimum execution time: 28_620_000 picoseconds.
-		Weight::from_parts(30_319_265, 0)
-			.saturating_add(Weight::from_parts(0, 3593))
-			// Standard Error: 7
-			.saturating_add(Weight::from_parts(715, 0).saturating_mul(d.into()))
-			.saturating_add(T::DbWeight::get().reads(2))
-			.saturating_add(T::DbWeight::get().writes(4))
-	}
-	/// Storage: Bounties Bounties (r:1 w:1)
-	/// Proof: Bounties Bounties (max_values: None, max_size: Some(177), added: 2652, mode: MaxEncodedLen)
-	/// Storage: Bounties BountyApprovals (r:1 w:1)
-	/// Proof: Bounties BountyApprovals (max_values: Some(1), max_size: Some(402), added: 897, mode: MaxEncodedLen)
-	fn approve_bounty() -> Weight {
-		// Proof Size summary in bytes:
-		//  Measured:  `269`
-		//  Estimated: `3642`
-		// Minimum execution time: 10_397_000 picoseconds.
-		Weight::from_parts(10_777_000, 0)
-			.saturating_add(Weight::from_parts(0, 3642))
-			.saturating_add(T::DbWeight::get().reads(2))
-			.saturating_add(T::DbWeight::get().writes(2))
-	}
-	/// Storage: Bounties Bounties (r:1 w:1)
-	/// Proof: Bounties Bounties (max_values: None, max_size: Some(177), added: 2652, mode: MaxEncodedLen)
-	fn propose_curator() -> Weight {
-		// Proof Size summary in bytes:
-		//  Measured:  `289`
-		//  Estimated: `3642`
-		// Minimum execution time: 9_065_000 picoseconds.
-		Weight::from_parts(9_477_000, 0)
-			.saturating_add(Weight::from_parts(0, 3642))
-			.saturating_add(T::DbWeight::get().reads(1))
-			.saturating_add(T::DbWeight::get().writes(1))
-	}
-	/// Storage: Bounties Bounties (r:1 w:1)
-	/// Proof: Bounties Bounties (max_values: None, max_size: Some(177), added: 2652, mode: MaxEncodedLen)
-	/// Storage: System Account (r:1 w:1)
-	/// Proof: System Account (max_values: None, max_size: Some(128), added: 2603, mode: MaxEncodedLen)
-	fn unassign_curator() -> Weight {
-		// Proof Size summary in bytes:
-		//  Measured:  `465`
-		//  Estimated: `3642`
-		// Minimum execution time: 42_565_000 picoseconds.
-		Weight::from_parts(43_956_000, 0)
-			.saturating_add(Weight::from_parts(0, 3642))
-			.saturating_add(T::DbWeight::get().reads(2))
-			.saturating_add(T::DbWeight::get().writes(2))
-	}
-	/// Storage: Bounties Bounties (r:1 w:1)
-	/// Proof: Bounties Bounties (max_values: None, max_size: Some(177), added: 2652, mode: MaxEncodedLen)
-	/// Storage: System Account (r:1 w:1)
-	/// Proof: System Account (max_values: None, max_size: Some(128), added: 2603, mode: MaxEncodedLen)
-	fn accept_curator() -> Weight {
-		// Proof Size summary in bytes:
-		//  Measured:  `461`
-		//  Estimated: `3642`
-		// Minimum execution time: 27_461_000 picoseconds.
-		Weight::from_parts(28_307_000, 0)
-			.saturating_add(Weight::from_parts(0, 3642))
-			.saturating_add(T::DbWeight::get().reads(2))
-			.saturating_add(T::DbWeight::get().writes(2))
-	}
-	/// Storage: Bounties Bounties (r:1 w:1)
-	/// Proof: Bounties Bounties (max_values: None, max_size: Some(177), added: 2652, mode: MaxEncodedLen)
-	/// Storage: ChildBounties ParentChildBounties (r:1 w:0)
-	/// Proof: ChildBounties ParentChildBounties (max_values: None, max_size: Some(16), added: 2491, mode: MaxEncodedLen)
-	fn award_bounty() -> Weight {
-		// Proof Size summary in bytes:
-		//  Measured:  `405`
-		//  Estimated: `3642`
-		// Minimum execution time: 19_269_000 picoseconds.
-		Weight::from_parts(19_884_000, 0)
-			.saturating_add(Weight::from_parts(0, 3642))
-			.saturating_add(T::DbWeight::get().reads(2))
-			.saturating_add(T::DbWeight::get().writes(1))
-	}
-	/// Storage: Bounties Bounties (r:1 w:1)
-	/// Proof: Bounties Bounties (max_values: None, max_size: Some(177), added: 2652, mode: MaxEncodedLen)
-	/// Storage: System Account (r:3 w:3)
-	/// Proof: System Account (max_values: None, max_size: Some(128), added: 2603, mode: MaxEncodedLen)
-	/// Storage: ChildBounties ChildrenCuratorFees (r:1 w:1)
-	/// Proof: ChildBounties ChildrenCuratorFees (max_values: None, max_size: Some(28), added: 2503, mode: MaxEncodedLen)
-	/// Storage: Bounties BountyDescriptions (r:0 w:1)
-	/// Proof: Bounties BountyDescriptions (max_values: None, max_size: Some(16400), added: 18875, mode: MaxEncodedLen)
-	fn claim_bounty() -> Weight {
-		// Proof Size summary in bytes:
-		//  Measured:  `769`
-		//  Estimated: `8799`
-		// Minimum execution time: 120_844_000 picoseconds.
-		Weight::from_parts(125_606_000, 0)
-			.saturating_add(Weight::from_parts(0, 8799))
-			.saturating_add(T::DbWeight::get().reads(5))
-			.saturating_add(T::DbWeight::get().writes(6))
-	}
-	/// Storage: Bounties Bounties (r:1 w:1)
-	/// Proof: Bounties Bounties (max_values: None, max_size: Some(177), added: 2652, mode: MaxEncodedLen)
-	/// Storage: ChildBounties ParentChildBounties (r:1 w:0)
-	/// Proof: ChildBounties ParentChildBounties (max_values: None, max_size: Some(16), added: 2491, mode: MaxEncodedLen)
-	/// Storage: System Account (r:1 w:1)
-	/// Proof: System Account (max_values: None, max_size: Some(128), added: 2603, mode: MaxEncodedLen)
-	/// Storage: Bounties BountyDescriptions (r:0 w:1)
-	/// Proof: Bounties BountyDescriptions (max_values: None, max_size: Some(16400), added: 18875, mode: MaxEncodedLen)
-	fn close_bounty_proposed() -> Weight {
-		// Proof Size summary in bytes:
-		//  Measured:  `449`
-		//  Estimated: `3642`
-		// Minimum execution time: 47_439_000 picoseconds.
-		Weight::from_parts(48_838_000, 0)
-			.saturating_add(Weight::from_parts(0, 3642))
-			.saturating_add(T::DbWeight::get().reads(3))
-			.saturating_add(T::DbWeight::get().writes(3))
-	}
-	/// Storage: Bounties Bounties (r:1 w:1)
-	/// Proof: Bounties Bounties (max_values: None, max_size: Some(177), added: 2652, mode: MaxEncodedLen)
-	/// Storage: ChildBounties ParentChildBounties (r:1 w:0)
-	/// Proof: ChildBounties ParentChildBounties (max_values: None, max_size: Some(16), added: 2491, mode: MaxEncodedLen)
-	/// Storage: System Account (r:2 w:2)
-	/// Proof: System Account (max_values: None, max_size: Some(128), added: 2603, mode: MaxEncodedLen)
-	/// Storage: Bounties BountyDescriptions (r:0 w:1)
-	/// Proof: Bounties BountyDescriptions (max_values: None, max_size: Some(16400), added: 18875, mode: MaxEncodedLen)
-	fn close_bounty_active() -> Weight {
-		// Proof Size summary in bytes:
-		//  Measured:  `685`
-		//  Estimated: `6196`
-		// Minimum execution time: 81_354_000 picoseconds.
-		Weight::from_parts(83_515_000, 0)
-			.saturating_add(Weight::from_parts(0, 6196))
-			.saturating_add(T::DbWeight::get().reads(4))
-			.saturating_add(T::DbWeight::get().writes(4))
-	}
-	/// Storage: Bounties Bounties (r:1 w:1)
-	/// Proof: Bounties Bounties (max_values: None, max_size: Some(177), added: 2652, mode: MaxEncodedLen)
-	fn extend_bounty_expiry() -> Weight {
-		// Proof Size summary in bytes:
-		//  Measured:  `325`
-		//  Estimated: `3642`
-		// Minimum execution time: 14_850_000 picoseconds.
-		Weight::from_parts(15_365_000, 0)
-			.saturating_add(Weight::from_parts(0, 3642))
-			.saturating_add(T::DbWeight::get().reads(1))
-			.saturating_add(T::DbWeight::get().writes(1))
-	}
-	/// Storage: Bounties BountyApprovals (r:1 w:1)
-	/// Proof: Bounties BountyApprovals (max_values: Some(1), max_size: Some(402), added: 897, mode: MaxEncodedLen)
-	/// Storage: Bounties Bounties (r:100 w:100)
-	/// Proof: Bounties Bounties (max_values: None, max_size: Some(177), added: 2652, mode: MaxEncodedLen)
-	/// Storage: System Account (r:200 w:200)
-	/// Proof: System Account (max_values: None, max_size: Some(128), added: 2603, mode: MaxEncodedLen)
-	/// The range of component `b` is `[0, 100]`.
-	fn spend_funds(b: u32, ) -> Weight {
-		// Proof Size summary in bytes:
-		//  Measured:  `0 + b * (297 ±0)`
-		//  Estimated: `1887 + b * (5206 ±0)`
-		// Minimum execution time: 4_606_000 picoseconds.
-		Weight::from_parts(4_691_000, 0)
-			.saturating_add(Weight::from_parts(0, 1887))
-			// Standard Error: 15_735
-			.saturating_add(Weight::from_parts(44_695_416, 0).saturating_mul(b.into()))
-			.saturating_add(T::DbWeight::get().reads(1))
-			.saturating_add(T::DbWeight::get().reads((3_u64).saturating_mul(b.into())))
-			.saturating_add(T::DbWeight::get().writes(1))
-			.saturating_add(T::DbWeight::get().writes((3_u64).saturating_mul(b.into())))
-			.saturating_add(Weight::from_parts(0, 5206).saturating_mul(b.into()))
-	}
-}
diff --git a/polkadot/runtime/kusama/src/weights/pallet_child_bounties.rs b/polkadot/runtime/kusama/src/weights/pallet_child_bounties.rs
deleted file mode 100644
index 252060ba37b3b187841e080db84a4bcdd1398c76..0000000000000000000000000000000000000000
--- a/polkadot/runtime/kusama/src/weights/pallet_child_bounties.rs
+++ /dev/null
@@ -1,202 +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/>.
-
-//! Autogenerated weights for `pallet_child_bounties`
-//!
-//! THIS FILE WAS AUTO-GENERATED USING THE SUBSTRATE BENCHMARK CLI VERSION 4.0.0-dev
-//! DATE: 2023-06-19, STEPS: `50`, REPEAT: `20`, LOW RANGE: `[]`, HIGH RANGE: `[]`
-//! WORST CASE MAP SIZE: `1000000`
-//! HOSTNAME: `runner-e8ezs4ez-project-163-concurrent-0`, CPU: `Intel(R) Xeon(R) CPU @ 2.60GHz`
-//! EXECUTION: Some(Wasm), WASM-EXECUTION: Compiled, CHAIN: Some("kusama-dev"), DB CACHE: 1024
-
-// Executed Command:
-// ./target/production/polkadot
-// benchmark
-// pallet
-// --chain=kusama-dev
-// --steps=50
-// --repeat=20
-// --no-storage-info
-// --no-median-slopes
-// --no-min-squares
-// --pallet=pallet_child_bounties
-// --extrinsic=*
-// --execution=wasm
-// --wasm-execution=compiled
-// --header=./file_header.txt
-// --output=./runtime/kusama/src/weights/
-
-#![cfg_attr(rustfmt, rustfmt_skip)]
-#![allow(unused_parens)]
-#![allow(unused_imports)]
-#![allow(missing_docs)]
-
-use frame_support::{traits::Get, weights::Weight};
-use core::marker::PhantomData;
-
-/// Weight functions for `pallet_child_bounties`.
-pub struct WeightInfo<T>(PhantomData<T>);
-impl<T: frame_system::Config> pallet_child_bounties::WeightInfo for WeightInfo<T> {
-	/// Storage: ChildBounties ParentChildBounties (r:1 w:1)
-	/// Proof: ChildBounties ParentChildBounties (max_values: None, max_size: Some(16), added: 2491, mode: MaxEncodedLen)
-	/// Storage: Bounties Bounties (r:1 w:0)
-	/// Proof: Bounties Bounties (max_values: None, max_size: Some(177), added: 2652, mode: MaxEncodedLen)
-	/// Storage: System Account (r:2 w:2)
-	/// Proof: System Account (max_values: None, max_size: Some(128), added: 2603, mode: MaxEncodedLen)
-	/// Storage: ChildBounties ChildBountyCount (r:1 w:1)
-	/// Proof: ChildBounties ChildBountyCount (max_values: Some(1), max_size: Some(4), added: 499, mode: MaxEncodedLen)
-	/// Storage: ChildBounties ChildBountyDescriptions (r:0 w:1)
-	/// Proof: ChildBounties ChildBountyDescriptions (max_values: None, max_size: Some(16400), added: 18875, mode: MaxEncodedLen)
-	/// Storage: ChildBounties ChildBounties (r:0 w:1)
-	/// Proof: ChildBounties ChildBounties (max_values: None, max_size: Some(145), added: 2620, mode: MaxEncodedLen)
-	/// The range of component `d` is `[0, 16384]`.
-	fn add_child_bounty(d: u32, ) -> Weight {
-		// Proof Size summary in bytes:
-		//  Measured:  `545`
-		//  Estimated: `6196`
-		// Minimum execution time: 69_355_000 picoseconds.
-		Weight::from_parts(72_208_416, 0)
-			.saturating_add(Weight::from_parts(0, 6196))
-			// Standard Error: 10
-			.saturating_add(Weight::from_parts(705, 0).saturating_mul(d.into()))
-			.saturating_add(T::DbWeight::get().reads(5))
-			.saturating_add(T::DbWeight::get().writes(6))
-	}
-	/// Storage: Bounties Bounties (r:1 w:0)
-	/// Proof: Bounties Bounties (max_values: None, max_size: Some(177), added: 2652, mode: MaxEncodedLen)
-	/// Storage: ChildBounties ChildBounties (r:1 w:1)
-	/// Proof: ChildBounties ChildBounties (max_values: None, max_size: Some(145), added: 2620, mode: MaxEncodedLen)
-	/// Storage: ChildBounties ChildrenCuratorFees (r:1 w:1)
-	/// Proof: ChildBounties ChildrenCuratorFees (max_values: None, max_size: Some(28), added: 2503, mode: MaxEncodedLen)
-	fn propose_curator() -> Weight {
-		// Proof Size summary in bytes:
-		//  Measured:  `599`
-		//  Estimated: `3642`
-		// Minimum execution time: 17_313_000 picoseconds.
-		Weight::from_parts(18_161_000, 0)
-			.saturating_add(Weight::from_parts(0, 3642))
-			.saturating_add(T::DbWeight::get().reads(3))
-			.saturating_add(T::DbWeight::get().writes(2))
-	}
-	/// Storage: Bounties Bounties (r:1 w:0)
-	/// Proof: Bounties Bounties (max_values: None, max_size: Some(177), added: 2652, mode: MaxEncodedLen)
-	/// Storage: ChildBounties ChildBounties (r:1 w:1)
-	/// Proof: ChildBounties ChildBounties (max_values: None, max_size: Some(145), added: 2620, mode: MaxEncodedLen)
-	/// Storage: System Account (r:1 w:1)
-	/// Proof: System Account (max_values: None, max_size: Some(128), added: 2603, mode: MaxEncodedLen)
-	fn accept_curator() -> Weight {
-		// Proof Size summary in bytes:
-		//  Measured:  `745`
-		//  Estimated: `3642`
-		// Minimum execution time: 32_629_000 picoseconds.
-		Weight::from_parts(33_843_000, 0)
-			.saturating_add(Weight::from_parts(0, 3642))
-			.saturating_add(T::DbWeight::get().reads(3))
-			.saturating_add(T::DbWeight::get().writes(2))
-	}
-	/// Storage: ChildBounties ChildBounties (r:1 w:1)
-	/// Proof: ChildBounties ChildBounties (max_values: None, max_size: Some(145), added: 2620, mode: MaxEncodedLen)
-	/// Storage: Bounties Bounties (r:1 w:0)
-	/// Proof: Bounties Bounties (max_values: None, max_size: Some(177), added: 2652, mode: MaxEncodedLen)
-	/// Storage: System Account (r:1 w:1)
-	/// Proof: System Account (max_values: None, max_size: Some(128), added: 2603, mode: MaxEncodedLen)
-	fn unassign_curator() -> Weight {
-		// Proof Size summary in bytes:
-		//  Measured:  `745`
-		//  Estimated: `3642`
-		// Minimum execution time: 47_994_000 picoseconds.
-		Weight::from_parts(49_346_000, 0)
-			.saturating_add(Weight::from_parts(0, 3642))
-			.saturating_add(T::DbWeight::get().reads(3))
-			.saturating_add(T::DbWeight::get().writes(2))
-	}
-	/// Storage: Bounties Bounties (r:1 w:0)
-	/// Proof: Bounties Bounties (max_values: None, max_size: Some(177), added: 2652, mode: MaxEncodedLen)
-	/// Storage: ChildBounties ChildBounties (r:1 w:1)
-	/// Proof: ChildBounties ChildBounties (max_values: None, max_size: Some(145), added: 2620, mode: MaxEncodedLen)
-	fn award_child_bounty() -> Weight {
-		// Proof Size summary in bytes:
-		//  Measured:  `642`
-		//  Estimated: `3642`
-		// Minimum execution time: 21_866_000 picoseconds.
-		Weight::from_parts(22_532_000, 0)
-			.saturating_add(Weight::from_parts(0, 3642))
-			.saturating_add(T::DbWeight::get().reads(2))
-			.saturating_add(T::DbWeight::get().writes(1))
-	}
-	/// Storage: ChildBounties ChildBounties (r:1 w:1)
-	/// Proof: ChildBounties ChildBounties (max_values: None, max_size: Some(145), added: 2620, mode: MaxEncodedLen)
-	/// Storage: System Account (r:3 w:3)
-	/// Proof: System Account (max_values: None, max_size: Some(128), added: 2603, mode: MaxEncodedLen)
-	/// Storage: ChildBounties ParentChildBounties (r:1 w:1)
-	/// Proof: ChildBounties ParentChildBounties (max_values: None, max_size: Some(16), added: 2491, mode: MaxEncodedLen)
-	/// Storage: ChildBounties ChildBountyDescriptions (r:0 w:1)
-	/// Proof: ChildBounties ChildBountyDescriptions (max_values: None, max_size: Some(16400), added: 18875, mode: MaxEncodedLen)
-	fn claim_child_bounty() -> Weight {
-		// Proof Size summary in bytes:
-		//  Measured:  `614`
-		//  Estimated: `8799`
-		// Minimum execution time: 116_595_000 picoseconds.
-		Weight::from_parts(118_921_000, 0)
-			.saturating_add(Weight::from_parts(0, 8799))
-			.saturating_add(T::DbWeight::get().reads(5))
-			.saturating_add(T::DbWeight::get().writes(6))
-	}
-	/// Storage: Bounties Bounties (r:1 w:0)
-	/// Proof: Bounties Bounties (max_values: None, max_size: Some(177), added: 2652, mode: MaxEncodedLen)
-	/// Storage: ChildBounties ChildBounties (r:1 w:1)
-	/// Proof: ChildBounties ChildBounties (max_values: None, max_size: Some(145), added: 2620, mode: MaxEncodedLen)
-	/// Storage: ChildBounties ChildrenCuratorFees (r:1 w:1)
-	/// Proof: ChildBounties ChildrenCuratorFees (max_values: None, max_size: Some(28), added: 2503, mode: MaxEncodedLen)
-	/// Storage: ChildBounties ParentChildBounties (r:1 w:1)
-	/// Proof: ChildBounties ParentChildBounties (max_values: None, max_size: Some(16), added: 2491, mode: MaxEncodedLen)
-	/// Storage: System Account (r:2 w:2)
-	/// Proof: System Account (max_values: None, max_size: Some(128), added: 2603, mode: MaxEncodedLen)
-	/// Storage: ChildBounties ChildBountyDescriptions (r:0 w:1)
-	/// Proof: ChildBounties ChildBountyDescriptions (max_values: None, max_size: Some(16400), added: 18875, mode: MaxEncodedLen)
-	fn close_child_bounty_added() -> Weight {
-		// Proof Size summary in bytes:
-		//  Measured:  `845`
-		//  Estimated: `6196`
-		// Minimum execution time: 76_806_000 picoseconds.
-		Weight::from_parts(79_568_000, 0)
-			.saturating_add(Weight::from_parts(0, 6196))
-			.saturating_add(T::DbWeight::get().reads(6))
-			.saturating_add(T::DbWeight::get().writes(6))
-	}
-	/// Storage: Bounties Bounties (r:1 w:0)
-	/// Proof: Bounties Bounties (max_values: None, max_size: Some(177), added: 2652, mode: MaxEncodedLen)
-	/// Storage: ChildBounties ChildBounties (r:1 w:1)
-	/// Proof: ChildBounties ChildBounties (max_values: None, max_size: Some(145), added: 2620, mode: MaxEncodedLen)
-	/// Storage: System Account (r:3 w:3)
-	/// Proof: System Account (max_values: None, max_size: Some(128), added: 2603, mode: MaxEncodedLen)
-	/// Storage: ChildBounties ChildrenCuratorFees (r:1 w:1)
-	/// Proof: ChildBounties ChildrenCuratorFees (max_values: None, max_size: Some(28), added: 2503, mode: MaxEncodedLen)
-	/// Storage: ChildBounties ParentChildBounties (r:1 w:1)
-	/// Proof: ChildBounties ParentChildBounties (max_values: None, max_size: Some(16), added: 2491, mode: MaxEncodedLen)
-	/// Storage: ChildBounties ChildBountyDescriptions (r:0 w:1)
-	/// Proof: ChildBounties ChildBountyDescriptions (max_values: None, max_size: Some(16400), added: 18875, mode: MaxEncodedLen)
-	fn close_child_bounty_active() -> Weight {
-		// Proof Size summary in bytes:
-		//  Measured:  `1032`
-		//  Estimated: `8799`
-		// Minimum execution time: 93_885_000 picoseconds.
-		Weight::from_parts(96_680_000, 0)
-			.saturating_add(Weight::from_parts(0, 8799))
-			.saturating_add(T::DbWeight::get().reads(7))
-			.saturating_add(T::DbWeight::get().writes(7))
-	}
-}
diff --git a/polkadot/runtime/kusama/src/weights/pallet_collective_council.rs b/polkadot/runtime/kusama/src/weights/pallet_collective_council.rs
deleted file mode 100644
index 84157595f7cb04f636965d998493c18cb16de550..0000000000000000000000000000000000000000
--- a/polkadot/runtime/kusama/src/weights/pallet_collective_council.rs
+++ /dev/null
@@ -1,322 +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/>.
-//! Autogenerated weights for `pallet_collective`
-//!
-//! THIS FILE WAS AUTO-GENERATED USING THE SUBSTRATE BENCHMARK CLI VERSION 4.0.0-dev
-//! DATE: 2023-03-15, STEPS: `50`, REPEAT: `20`, LOW RANGE: `[]`, HIGH RANGE: `[]`
-//! WORST CASE MAP SIZE: `1000000`
-//! HOSTNAME: `bm5`, CPU: `Intel(R) Core(TM) i7-7700K CPU @ 4.20GHz`
-//! EXECUTION: Some(Wasm), WASM-EXECUTION: Compiled, CHAIN: Some("kusama-dev"), DB CACHE: 1024
-
-// Executed Command:
-// ./target/production/polkadot
-// benchmark
-// pallet
-// --chain=kusama-dev
-// --steps=50
-// --repeat=20
-// --pallet=pallet_collective
-// --extrinsic=*
-// --execution=wasm
-// --wasm-execution=compiled
-// --header=./file_header.txt
-// --output=./runtime/kusama/src/weights/
-
-#![cfg_attr(rustfmt, rustfmt_skip)]
-#![allow(unused_parens)]
-#![allow(unused_imports)]
-
-use frame_support::{traits::Get, weights::Weight};
-use sp_std::marker::PhantomData;
-
-/// Weight functions for `pallet_collective`.
-pub struct WeightInfo<T>(PhantomData<T>);
-impl<T: frame_system::Config> pallet_collective::WeightInfo for WeightInfo<T> {
-	/// Storage: Council Members (r:1 w:1)
-	/// Proof Skipped: Council Members (max_values: Some(1), max_size: None, mode: Measured)
-	/// Storage: Council Proposals (r:1 w:0)
-	/// Proof Skipped: Council Proposals (max_values: Some(1), max_size: None, mode: Measured)
-	/// Storage: Council Voting (r:100 w:100)
-	/// Proof Skipped: Council Voting (max_values: None, max_size: None, mode: Measured)
-	/// Storage: Council Prime (r:0 w:1)
-	/// Proof Skipped: Council Prime (max_values: Some(1), max_size: None, mode: Measured)
-	/// The range of component `m` is `[0, 100]`.
-	/// The range of component `n` is `[0, 100]`.
-	/// The range of component `p` is `[0, 100]`.
-	/// The range of component `m` is `[0, 100]`.
-	/// The range of component `n` is `[0, 100]`.
-	/// The range of component `p` is `[0, 100]`.
-	fn set_members(m: u32, _n: u32, p: u32, ) -> Weight {
-		// Proof Size summary in bytes:
-		//  Measured:  `0 + m * (3232 ±0) + p * (3190 ±0)`
-		//  Estimated: `19164 + m * (7799 ±17) + p * (10110 ±17)`
-		// Minimum execution time: 17_032_000 picoseconds.
-		Weight::from_parts(17_263_000, 0)
-			.saturating_add(Weight::from_parts(0, 19164))
-			// Standard Error: 51_363
-			.saturating_add(Weight::from_parts(5_779_193, 0).saturating_mul(m.into()))
-			// Standard Error: 51_363
-			.saturating_add(Weight::from_parts(8_434_866, 0).saturating_mul(p.into()))
-			.saturating_add(T::DbWeight::get().reads(2))
-			.saturating_add(T::DbWeight::get().reads((1_u64).saturating_mul(p.into())))
-			.saturating_add(T::DbWeight::get().writes(2))
-			.saturating_add(T::DbWeight::get().writes((1_u64).saturating_mul(p.into())))
-			.saturating_add(Weight::from_parts(0, 7799).saturating_mul(m.into()))
-			.saturating_add(Weight::from_parts(0, 10110).saturating_mul(p.into()))
-	}
-	/// Storage: Council Members (r:1 w:0)
-	/// Proof Skipped: Council Members (max_values: Some(1), max_size: None, mode: Measured)
-	/// The range of component `b` is `[2, 1024]`.
-	/// The range of component `m` is `[1, 100]`.
-	/// The range of component `b` is `[2, 1024]`.
-	/// The range of component `m` is `[1, 100]`.
-	fn execute(b: u32, m: u32, ) -> Weight {
-		// Proof Size summary in bytes:
-		//  Measured:  `136 + m * (32 ±0)`
-		//  Estimated: `1622 + m * (32 ±0)`
-		// Minimum execution time: 15_686_000 picoseconds.
-		Weight::from_parts(15_185_500, 0)
-			.saturating_add(Weight::from_parts(0, 1622))
-			// Standard Error: 26
-			.saturating_add(Weight::from_parts(1_363, 0).saturating_mul(b.into()))
-			// Standard Error: 277
-			.saturating_add(Weight::from_parts(15_720, 0).saturating_mul(m.into()))
-			.saturating_add(T::DbWeight::get().reads(1))
-			.saturating_add(Weight::from_parts(0, 32).saturating_mul(m.into()))
-	}
-	/// Storage: Council Members (r:1 w:0)
-	/// Proof Skipped: Council Members (max_values: Some(1), max_size: None, mode: Measured)
-	/// Storage: Council ProposalOf (r:1 w:0)
-	/// Proof Skipped: Council ProposalOf (max_values: None, max_size: None, mode: Measured)
-	/// The range of component `b` is `[2, 1024]`.
-	/// The range of component `m` is `[1, 100]`.
-	/// The range of component `b` is `[2, 1024]`.
-	/// The range of component `m` is `[1, 100]`.
-	fn propose_execute(b: u32, m: u32, ) -> Weight {
-		// Proof Size summary in bytes:
-		//  Measured:  `136 + m * (32 ±0)`
-		//  Estimated: `5224 + m * (64 ±0)`
-		// Minimum execution time: 18_314_000 picoseconds.
-		Weight::from_parts(17_659_522, 0)
-			.saturating_add(Weight::from_parts(0, 5224))
-			// Standard Error: 22
-			.saturating_add(Weight::from_parts(1_153, 0).saturating_mul(b.into()))
-			// Standard Error: 237
-			.saturating_add(Weight::from_parts(25_439, 0).saturating_mul(m.into()))
-			.saturating_add(T::DbWeight::get().reads(2))
-			.saturating_add(Weight::from_parts(0, 64).saturating_mul(m.into()))
-	}
-	/// Storage: Council Members (r:1 w:0)
-	/// Proof Skipped: Council Members (max_values: Some(1), max_size: None, mode: Measured)
-	/// Storage: Council ProposalOf (r:1 w:1)
-	/// Proof Skipped: Council ProposalOf (max_values: None, max_size: None, mode: Measured)
-	/// Storage: Council Proposals (r:1 w:1)
-	/// Proof Skipped: Council Proposals (max_values: Some(1), max_size: None, mode: Measured)
-	/// Storage: Council ProposalCount (r:1 w:1)
-	/// Proof Skipped: Council ProposalCount (max_values: Some(1), max_size: None, mode: Measured)
-	/// Storage: Council Voting (r:0 w:1)
-	/// Proof Skipped: Council Voting (max_values: None, max_size: None, mode: Measured)
-	/// The range of component `b` is `[2, 1024]`.
-	/// The range of component `m` is `[2, 100]`.
-	/// The range of component `p` is `[1, 100]`.
-	/// The range of component `b` is `[2, 1024]`.
-	/// The range of component `m` is `[2, 100]`.
-	/// The range of component `p` is `[1, 100]`.
-	fn propose_proposed(b: u32, m: u32, p: u32, ) -> Weight {
-		// Proof Size summary in bytes:
-		//  Measured:  `426 + m * (32 ±0) + p * (36 ±0)`
-		//  Estimated: `9685 + m * (165 ±0) + p * (180 ±0)`
-		// Minimum execution time: 23_916_000 picoseconds.
-		Weight::from_parts(25_192_989, 0)
-			.saturating_add(Weight::from_parts(0, 9685))
-			// Standard Error: 50
-			.saturating_add(Weight::from_parts(2_327, 0).saturating_mul(b.into()))
-			// Standard Error: 528
-			.saturating_add(Weight::from_parts(17_763, 0).saturating_mul(m.into()))
-			// Standard Error: 522
-			.saturating_add(Weight::from_parts(116_903, 0).saturating_mul(p.into()))
-			.saturating_add(T::DbWeight::get().reads(4))
-			.saturating_add(T::DbWeight::get().writes(4))
-			.saturating_add(Weight::from_parts(0, 165).saturating_mul(m.into()))
-			.saturating_add(Weight::from_parts(0, 180).saturating_mul(p.into()))
-	}
-	/// Storage: Council Members (r:1 w:0)
-	/// Proof Skipped: Council Members (max_values: Some(1), max_size: None, mode: Measured)
-	/// Storage: Council Voting (r:1 w:1)
-	/// Proof Skipped: Council Voting (max_values: None, max_size: None, mode: Measured)
-	/// The range of component `m` is `[5, 100]`.
-	/// The range of component `m` is `[5, 100]`.
-	fn vote(m: u32, ) -> Weight {
-		// Proof Size summary in bytes:
-		//  Measured:  `875 + m * (64 ±0)`
-		//  Estimated: `6698 + m * (128 ±0)`
-		// Minimum execution time: 21_641_000 picoseconds.
-		Weight::from_parts(22_373_888, 0)
-			.saturating_add(Weight::from_parts(0, 6698))
-			// Standard Error: 299
-			.saturating_add(Weight::from_parts(41_168, 0).saturating_mul(m.into()))
-			.saturating_add(T::DbWeight::get().reads(2))
-			.saturating_add(T::DbWeight::get().writes(1))
-			.saturating_add(Weight::from_parts(0, 128).saturating_mul(m.into()))
-	}
-	/// Storage: Council Voting (r:1 w:1)
-	/// Proof Skipped: Council Voting (max_values: None, max_size: None, mode: Measured)
-	/// Storage: Council Members (r:1 w:0)
-	/// Proof Skipped: Council Members (max_values: Some(1), max_size: None, mode: Measured)
-	/// Storage: Council Proposals (r:1 w:1)
-	/// Proof Skipped: Council Proposals (max_values: Some(1), max_size: None, mode: Measured)
-	/// Storage: Council ProposalOf (r:0 w:1)
-	/// Proof Skipped: Council ProposalOf (max_values: None, max_size: None, mode: Measured)
-	/// The range of component `m` is `[4, 100]`.
-	/// The range of component `p` is `[1, 100]`.
-	/// The range of component `m` is `[4, 100]`.
-	/// The range of component `p` is `[1, 100]`.
-	fn close_early_disapproved(m: u32, p: u32, ) -> Weight {
-		// Proof Size summary in bytes:
-		//  Measured:  `464 + m * (64 ±0) + p * (36 ±0)`
-		//  Estimated: `8211 + m * (260 ±0) + p * (144 ±0)`
-		// Minimum execution time: 26_158_000 picoseconds.
-		Weight::from_parts(27_675_242, 0)
-			.saturating_add(Weight::from_parts(0, 8211))
-			// Standard Error: 845
-			.saturating_add(Weight::from_parts(10_799, 0).saturating_mul(m.into()))
-			// Standard Error: 824
-			.saturating_add(Weight::from_parts(141_199, 0).saturating_mul(p.into()))
-			.saturating_add(T::DbWeight::get().reads(3))
-			.saturating_add(T::DbWeight::get().writes(3))
-			.saturating_add(Weight::from_parts(0, 260).saturating_mul(m.into()))
-			.saturating_add(Weight::from_parts(0, 144).saturating_mul(p.into()))
-	}
-	/// Storage: Council Voting (r:1 w:1)
-	/// Proof Skipped: Council Voting (max_values: None, max_size: None, mode: Measured)
-	/// Storage: Council Members (r:1 w:0)
-	/// Proof Skipped: Council Members (max_values: Some(1), max_size: None, mode: Measured)
-	/// Storage: Council ProposalOf (r:1 w:1)
-	/// Proof Skipped: Council ProposalOf (max_values: None, max_size: None, mode: Measured)
-	/// Storage: Council Proposals (r:1 w:1)
-	/// Proof Skipped: Council Proposals (max_values: Some(1), max_size: None, mode: Measured)
-	/// The range of component `b` is `[2, 1024]`.
-	/// The range of component `m` is `[4, 100]`.
-	/// The range of component `p` is `[1, 100]`.
-	/// The range of component `b` is `[2, 1024]`.
-	/// The range of component `m` is `[4, 100]`.
-	/// The range of component `p` is `[1, 100]`.
-	fn close_early_approved(b: u32, m: u32, p: u32, ) -> Weight {
-		// Proof Size summary in bytes:
-		//  Measured:  `766 + b * (1 ±0) + m * (64 ±0) + p * (40 ±0)`
-		//  Estimated: `12372 + b * (4 ±0) + m * (264 ±0) + p * (160 ±0)`
-		// Minimum execution time: 37_601_000 picoseconds.
-		Weight::from_parts(41_302_278, 0)
-			.saturating_add(Weight::from_parts(0, 12372))
-			// Standard Error: 67
-			.saturating_add(Weight::from_parts(1_608, 0).saturating_mul(b.into()))
-			// Standard Error: 716
-			.saturating_add(Weight::from_parts(14_628, 0).saturating_mul(m.into()))
-			// Standard Error: 698
-			.saturating_add(Weight::from_parts(129_997, 0).saturating_mul(p.into()))
-			.saturating_add(T::DbWeight::get().reads(4))
-			.saturating_add(T::DbWeight::get().writes(3))
-			.saturating_add(Weight::from_parts(0, 4).saturating_mul(b.into()))
-			.saturating_add(Weight::from_parts(0, 264).saturating_mul(m.into()))
-			.saturating_add(Weight::from_parts(0, 160).saturating_mul(p.into()))
-	}
-	/// Storage: Council Voting (r:1 w:1)
-	/// Proof Skipped: Council Voting (max_values: None, max_size: None, mode: Measured)
-	/// Storage: Council Members (r:1 w:0)
-	/// Proof Skipped: Council Members (max_values: Some(1), max_size: None, mode: Measured)
-	/// Storage: Council Prime (r:1 w:0)
-	/// Proof Skipped: Council Prime (max_values: Some(1), max_size: None, mode: Measured)
-	/// Storage: Council Proposals (r:1 w:1)
-	/// Proof Skipped: Council Proposals (max_values: Some(1), max_size: None, mode: Measured)
-	/// Storage: Council ProposalOf (r:0 w:1)
-	/// Proof Skipped: Council ProposalOf (max_values: None, max_size: None, mode: Measured)
-	/// The range of component `m` is `[4, 100]`.
-	/// The range of component `p` is `[1, 100]`.
-	/// The range of component `m` is `[4, 100]`.
-	/// The range of component `p` is `[1, 100]`.
-	fn close_disapproved(m: u32, p: u32, ) -> Weight {
-		// Proof Size summary in bytes:
-		//  Measured:  `484 + m * (64 ±0) + p * (36 ±0)`
-		//  Estimated: `10240 + m * (325 ±0) + p * (180 ±0)`
-		// Minimum execution time: 29_185_000 picoseconds.
-		Weight::from_parts(30_594_183, 0)
-			.saturating_add(Weight::from_parts(0, 10240))
-			// Standard Error: 865
-			.saturating_add(Weight::from_parts(30_165, 0).saturating_mul(m.into()))
-			// Standard Error: 844
-			.saturating_add(Weight::from_parts(131_623, 0).saturating_mul(p.into()))
-			.saturating_add(T::DbWeight::get().reads(4))
-			.saturating_add(T::DbWeight::get().writes(3))
-			.saturating_add(Weight::from_parts(0, 325).saturating_mul(m.into()))
-			.saturating_add(Weight::from_parts(0, 180).saturating_mul(p.into()))
-	}
-	/// Storage: Council Voting (r:1 w:1)
-	/// Proof Skipped: Council Voting (max_values: None, max_size: None, mode: Measured)
-	/// Storage: Council Members (r:1 w:0)
-	/// Proof Skipped: Council Members (max_values: Some(1), max_size: None, mode: Measured)
-	/// Storage: Council Prime (r:1 w:0)
-	/// Proof Skipped: Council Prime (max_values: Some(1), max_size: None, mode: Measured)
-	/// Storage: Council ProposalOf (r:1 w:1)
-	/// Proof Skipped: Council ProposalOf (max_values: None, max_size: None, mode: Measured)
-	/// Storage: Council Proposals (r:1 w:1)
-	/// Proof Skipped: Council Proposals (max_values: Some(1), max_size: None, mode: Measured)
-	/// The range of component `b` is `[2, 1024]`.
-	/// The range of component `m` is `[4, 100]`.
-	/// The range of component `p` is `[1, 100]`.
-	/// The range of component `b` is `[2, 1024]`.
-	/// The range of component `m` is `[4, 100]`.
-	/// The range of component `p` is `[1, 100]`.
-	fn close_approved(b: u32, m: u32, p: u32, ) -> Weight {
-		// Proof Size summary in bytes:
-		//  Measured:  `786 + b * (1 ±0) + m * (64 ±0) + p * (40 ±0)`
-		//  Estimated: `14575 + b * (5 ±0) + m * (330 ±0) + p * (200 ±0)`
-		// Minimum execution time: 43_157_000 picoseconds.
-		Weight::from_parts(43_691_874, 0)
-			.saturating_add(Weight::from_parts(0, 14575))
-			// Standard Error: 61
-			.saturating_add(Weight::from_parts(1_862, 0).saturating_mul(b.into()))
-			// Standard Error: 654
-			.saturating_add(Weight::from_parts(17_183, 0).saturating_mul(m.into()))
-			// Standard Error: 638
-			.saturating_add(Weight::from_parts(133_193, 0).saturating_mul(p.into()))
-			.saturating_add(T::DbWeight::get().reads(5))
-			.saturating_add(T::DbWeight::get().writes(3))
-			.saturating_add(Weight::from_parts(0, 5).saturating_mul(b.into()))
-			.saturating_add(Weight::from_parts(0, 330).saturating_mul(m.into()))
-			.saturating_add(Weight::from_parts(0, 200).saturating_mul(p.into()))
-	}
-	/// Storage: Council Proposals (r:1 w:1)
-	/// Proof Skipped: Council Proposals (max_values: Some(1), max_size: None, mode: Measured)
-	/// Storage: Council Voting (r:0 w:1)
-	/// Proof Skipped: Council Voting (max_values: None, max_size: None, mode: Measured)
-	/// Storage: Council ProposalOf (r:0 w:1)
-	/// Proof Skipped: Council ProposalOf (max_values: None, max_size: None, mode: Measured)
-	/// The range of component `p` is `[1, 100]`.
-	/// The range of component `p` is `[1, 100]`.
-	fn disapprove_proposal(p: u32, ) -> Weight {
-		// Proof Size summary in bytes:
-		//  Measured:  `293 + p * (32 ±0)`
-		//  Estimated: `2364 + p * (96 ±0)`
-		// Minimum execution time: 14_666_000 picoseconds.
-		Weight::from_parts(16_623_386, 0)
-			.saturating_add(Weight::from_parts(0, 2364))
-			// Standard Error: 430
-			.saturating_add(Weight::from_parts(111_461, 0).saturating_mul(p.into()))
-			.saturating_add(T::DbWeight::get().reads(1))
-			.saturating_add(T::DbWeight::get().writes(3))
-			.saturating_add(Weight::from_parts(0, 96).saturating_mul(p.into()))
-	}
-}
diff --git a/polkadot/runtime/kusama/src/weights/pallet_collective_technical_committee.rs b/polkadot/runtime/kusama/src/weights/pallet_collective_technical_committee.rs
deleted file mode 100644
index 0bf5d2839b0a2c40e9894460202419c13ca21ed8..0000000000000000000000000000000000000000
--- a/polkadot/runtime/kusama/src/weights/pallet_collective_technical_committee.rs
+++ /dev/null
@@ -1,322 +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/>.
-//! Autogenerated weights for `pallet_collective`
-//!
-//! THIS FILE WAS AUTO-GENERATED USING THE SUBSTRATE BENCHMARK CLI VERSION 4.0.0-dev
-//! DATE: 2023-03-15, STEPS: `50`, REPEAT: `20`, LOW RANGE: `[]`, HIGH RANGE: `[]`
-//! WORST CASE MAP SIZE: `1000000`
-//! HOSTNAME: `bm5`, CPU: `Intel(R) Core(TM) i7-7700K CPU @ 4.20GHz`
-//! EXECUTION: Some(Wasm), WASM-EXECUTION: Compiled, CHAIN: Some("kusama-dev"), DB CACHE: 1024
-
-// Executed Command:
-// ./target/production/polkadot
-// benchmark
-// pallet
-// --chain=kusama-dev
-// --steps=50
-// --repeat=20
-// --pallet=pallet_collective
-// --extrinsic=*
-// --execution=wasm
-// --wasm-execution=compiled
-// --header=./file_header.txt
-// --output=./runtime/kusama/src/weights/
-
-#![cfg_attr(rustfmt, rustfmt_skip)]
-#![allow(unused_parens)]
-#![allow(unused_imports)]
-
-use frame_support::{traits::Get, weights::Weight};
-use sp_std::marker::PhantomData;
-
-/// Weight functions for `pallet_collective`.
-pub struct WeightInfo<T>(PhantomData<T>);
-impl<T: frame_system::Config> pallet_collective::WeightInfo for WeightInfo<T> {
-	/// Storage: TechnicalCommittee Members (r:1 w:1)
-	/// Proof Skipped: TechnicalCommittee Members (max_values: Some(1), max_size: None, mode: Measured)
-	/// Storage: TechnicalCommittee Proposals (r:1 w:0)
-	/// Proof Skipped: TechnicalCommittee Proposals (max_values: Some(1), max_size: None, mode: Measured)
-	/// Storage: TechnicalCommittee Voting (r:100 w:100)
-	/// Proof Skipped: TechnicalCommittee Voting (max_values: None, max_size: None, mode: Measured)
-	/// Storage: TechnicalCommittee Prime (r:0 w:1)
-	/// Proof Skipped: TechnicalCommittee Prime (max_values: Some(1), max_size: None, mode: Measured)
-	/// The range of component `m` is `[0, 100]`.
-	/// The range of component `n` is `[0, 100]`.
-	/// The range of component `p` is `[0, 100]`.
-	/// The range of component `m` is `[0, 100]`.
-	/// The range of component `n` is `[0, 100]`.
-	/// The range of component `p` is `[0, 100]`.
-	fn set_members(m: u32, _n: u32, p: u32, ) -> Weight {
-		// Proof Size summary in bytes:
-		//  Measured:  `0 + m * (3232 ±0) + p * (3190 ±0)`
-		//  Estimated: `19320 + m * (7799 ±16) + p * (10110 ±16)`
-		// Minimum execution time: 17_755_000 picoseconds.
-		Weight::from_parts(18_022_000, 0)
-			.saturating_add(Weight::from_parts(0, 19320))
-			// Standard Error: 48_475
-			.saturating_add(Weight::from_parts(5_505_299, 0).saturating_mul(m.into()))
-			// Standard Error: 48_475
-			.saturating_add(Weight::from_parts(8_260_850, 0).saturating_mul(p.into()))
-			.saturating_add(T::DbWeight::get().reads(2))
-			.saturating_add(T::DbWeight::get().reads((1_u64).saturating_mul(p.into())))
-			.saturating_add(T::DbWeight::get().writes(2))
-			.saturating_add(T::DbWeight::get().writes((1_u64).saturating_mul(p.into())))
-			.saturating_add(Weight::from_parts(0, 7799).saturating_mul(m.into()))
-			.saturating_add(Weight::from_parts(0, 10110).saturating_mul(p.into()))
-	}
-	/// Storage: TechnicalCommittee Members (r:1 w:0)
-	/// Proof Skipped: TechnicalCommittee Members (max_values: Some(1), max_size: None, mode: Measured)
-	/// The range of component `b` is `[2, 1024]`.
-	/// The range of component `m` is `[1, 100]`.
-	/// The range of component `b` is `[2, 1024]`.
-	/// The range of component `m` is `[1, 100]`.
-	fn execute(b: u32, m: u32, ) -> Weight {
-		// Proof Size summary in bytes:
-		//  Measured:  `175 + m * (32 ±0)`
-		//  Estimated: `1661 + m * (32 ±0)`
-		// Minimum execution time: 16_765_000 picoseconds.
-		Weight::from_parts(15_653_912, 0)
-			.saturating_add(Weight::from_parts(0, 1661))
-			// Standard Error: 25
-			.saturating_add(Weight::from_parts(1_539, 0).saturating_mul(b.into()))
-			// Standard Error: 261
-			.saturating_add(Weight::from_parts(17_896, 0).saturating_mul(m.into()))
-			.saturating_add(T::DbWeight::get().reads(1))
-			.saturating_add(Weight::from_parts(0, 32).saturating_mul(m.into()))
-	}
-	/// Storage: TechnicalCommittee Members (r:1 w:0)
-	/// Proof Skipped: TechnicalCommittee Members (max_values: Some(1), max_size: None, mode: Measured)
-	/// Storage: TechnicalCommittee ProposalOf (r:1 w:0)
-	/// Proof Skipped: TechnicalCommittee ProposalOf (max_values: None, max_size: None, mode: Measured)
-	/// The range of component `b` is `[2, 1024]`.
-	/// The range of component `m` is `[1, 100]`.
-	/// The range of component `b` is `[2, 1024]`.
-	/// The range of component `m` is `[1, 100]`.
-	fn propose_execute(b: u32, m: u32, ) -> Weight {
-		// Proof Size summary in bytes:
-		//  Measured:  `175 + m * (32 ±0)`
-		//  Estimated: `5302 + m * (64 ±0)`
-		// Minimum execution time: 19_194_000 picoseconds.
-		Weight::from_parts(18_366_867, 0)
-			.saturating_add(Weight::from_parts(0, 5302))
-			// Standard Error: 19
-			.saturating_add(Weight::from_parts(1_342, 0).saturating_mul(b.into()))
-			// Standard Error: 200
-			.saturating_add(Weight::from_parts(22_738, 0).saturating_mul(m.into()))
-			.saturating_add(T::DbWeight::get().reads(2))
-			.saturating_add(Weight::from_parts(0, 64).saturating_mul(m.into()))
-	}
-	/// Storage: TechnicalCommittee Members (r:1 w:0)
-	/// Proof Skipped: TechnicalCommittee Members (max_values: Some(1), max_size: None, mode: Measured)
-	/// Storage: TechnicalCommittee ProposalOf (r:1 w:1)
-	/// Proof Skipped: TechnicalCommittee ProposalOf (max_values: None, max_size: None, mode: Measured)
-	/// Storage: TechnicalCommittee Proposals (r:1 w:1)
-	/// Proof Skipped: TechnicalCommittee Proposals (max_values: Some(1), max_size: None, mode: Measured)
-	/// Storage: TechnicalCommittee ProposalCount (r:1 w:1)
-	/// Proof Skipped: TechnicalCommittee ProposalCount (max_values: Some(1), max_size: None, mode: Measured)
-	/// Storage: TechnicalCommittee Voting (r:0 w:1)
-	/// Proof Skipped: TechnicalCommittee Voting (max_values: None, max_size: None, mode: Measured)
-	/// The range of component `b` is `[2, 1024]`.
-	/// The range of component `m` is `[2, 100]`.
-	/// The range of component `p` is `[1, 100]`.
-	/// The range of component `b` is `[2, 1024]`.
-	/// The range of component `m` is `[2, 100]`.
-	/// The range of component `p` is `[1, 100]`.
-	fn propose_proposed(b: u32, m: u32, p: u32, ) -> Weight {
-		// Proof Size summary in bytes:
-		//  Measured:  `465 + m * (32 ±0) + p * (36 ±0)`
-		//  Estimated: `9880 + m * (165 ±0) + p * (180 ±0)`
-		// Minimum execution time: 24_958_000 picoseconds.
-		Weight::from_parts(25_925_520, 0)
-			.saturating_add(Weight::from_parts(0, 9880))
-			// Standard Error: 54
-			.saturating_add(Weight::from_parts(2_430, 0).saturating_mul(b.into()))
-			// Standard Error: 570
-			.saturating_add(Weight::from_parts(17_303, 0).saturating_mul(m.into()))
-			// Standard Error: 563
-			.saturating_add(Weight::from_parts(119_736, 0).saturating_mul(p.into()))
-			.saturating_add(T::DbWeight::get().reads(4))
-			.saturating_add(T::DbWeight::get().writes(4))
-			.saturating_add(Weight::from_parts(0, 165).saturating_mul(m.into()))
-			.saturating_add(Weight::from_parts(0, 180).saturating_mul(p.into()))
-	}
-	/// Storage: TechnicalCommittee Members (r:1 w:0)
-	/// Proof Skipped: TechnicalCommittee Members (max_values: Some(1), max_size: None, mode: Measured)
-	/// Storage: TechnicalCommittee Voting (r:1 w:1)
-	/// Proof Skipped: TechnicalCommittee Voting (max_values: None, max_size: None, mode: Measured)
-	/// The range of component `m` is `[5, 100]`.
-	/// The range of component `m` is `[5, 100]`.
-	fn vote(m: u32, ) -> Weight {
-		// Proof Size summary in bytes:
-		//  Measured:  `914 + m * (64 ±0)`
-		//  Estimated: `6776 + m * (128 ±0)`
-		// Minimum execution time: 22_620_000 picoseconds.
-		Weight::from_parts(23_356_968, 0)
-			.saturating_add(Weight::from_parts(0, 6776))
-			// Standard Error: 273
-			.saturating_add(Weight::from_parts(40_919, 0).saturating_mul(m.into()))
-			.saturating_add(T::DbWeight::get().reads(2))
-			.saturating_add(T::DbWeight::get().writes(1))
-			.saturating_add(Weight::from_parts(0, 128).saturating_mul(m.into()))
-	}
-	/// Storage: TechnicalCommittee Voting (r:1 w:1)
-	/// Proof Skipped: TechnicalCommittee Voting (max_values: None, max_size: None, mode: Measured)
-	/// Storage: TechnicalCommittee Members (r:1 w:0)
-	/// Proof Skipped: TechnicalCommittee Members (max_values: Some(1), max_size: None, mode: Measured)
-	/// Storage: TechnicalCommittee Proposals (r:1 w:1)
-	/// Proof Skipped: TechnicalCommittee Proposals (max_values: Some(1), max_size: None, mode: Measured)
-	/// Storage: TechnicalCommittee ProposalOf (r:0 w:1)
-	/// Proof Skipped: TechnicalCommittee ProposalOf (max_values: None, max_size: None, mode: Measured)
-	/// The range of component `m` is `[4, 100]`.
-	/// The range of component `p` is `[1, 100]`.
-	/// The range of component `m` is `[4, 100]`.
-	/// The range of component `p` is `[1, 100]`.
-	fn close_early_disapproved(m: u32, p: u32, ) -> Weight {
-		// Proof Size summary in bytes:
-		//  Measured:  `503 + m * (64 ±0) + p * (36 ±0)`
-		//  Estimated: `8367 + m * (260 ±0) + p * (144 ±0)`
-		// Minimum execution time: 27_667_000 picoseconds.
-		Weight::from_parts(29_094_490, 0)
-			.saturating_add(Weight::from_parts(0, 8367))
-			// Standard Error: 842
-			.saturating_add(Weight::from_parts(25_691, 0).saturating_mul(m.into()))
-			// Standard Error: 821
-			.saturating_add(Weight::from_parts(133_244, 0).saturating_mul(p.into()))
-			.saturating_add(T::DbWeight::get().reads(3))
-			.saturating_add(T::DbWeight::get().writes(3))
-			.saturating_add(Weight::from_parts(0, 260).saturating_mul(m.into()))
-			.saturating_add(Weight::from_parts(0, 144).saturating_mul(p.into()))
-	}
-	/// Storage: TechnicalCommittee Voting (r:1 w:1)
-	/// Proof Skipped: TechnicalCommittee Voting (max_values: None, max_size: None, mode: Measured)
-	/// Storage: TechnicalCommittee Members (r:1 w:0)
-	/// Proof Skipped: TechnicalCommittee Members (max_values: Some(1), max_size: None, mode: Measured)
-	/// Storage: TechnicalCommittee ProposalOf (r:1 w:1)
-	/// Proof Skipped: TechnicalCommittee ProposalOf (max_values: None, max_size: None, mode: Measured)
-	/// Storage: TechnicalCommittee Proposals (r:1 w:1)
-	/// Proof Skipped: TechnicalCommittee Proposals (max_values: Some(1), max_size: None, mode: Measured)
-	/// The range of component `b` is `[2, 1024]`.
-	/// The range of component `m` is `[4, 100]`.
-	/// The range of component `p` is `[1, 100]`.
-	/// The range of component `b` is `[2, 1024]`.
-	/// The range of component `m` is `[4, 100]`.
-	/// The range of component `p` is `[1, 100]`.
-	fn close_early_approved(b: u32, m: u32, p: u32, ) -> Weight {
-		// Proof Size summary in bytes:
-		//  Measured:  `805 + b * (1 ±0) + m * (64 ±0) + p * (40 ±0)`
-		//  Estimated: `12528 + b * (4 ±0) + m * (264 ±0) + p * (160 ±0)`
-		// Minimum execution time: 41_678_000 picoseconds.
-		Weight::from_parts(42_218_269, 0)
-			.saturating_add(Weight::from_parts(0, 12528))
-			// Standard Error: 59
-			.saturating_add(Weight::from_parts(1_661, 0).saturating_mul(b.into()))
-			// Standard Error: 624
-			.saturating_add(Weight::from_parts(16_946, 0).saturating_mul(m.into()))
-			// Standard Error: 608
-			.saturating_add(Weight::from_parts(129_170, 0).saturating_mul(p.into()))
-			.saturating_add(T::DbWeight::get().reads(4))
-			.saturating_add(T::DbWeight::get().writes(3))
-			.saturating_add(Weight::from_parts(0, 4).saturating_mul(b.into()))
-			.saturating_add(Weight::from_parts(0, 264).saturating_mul(m.into()))
-			.saturating_add(Weight::from_parts(0, 160).saturating_mul(p.into()))
-	}
-	/// Storage: TechnicalCommittee Voting (r:1 w:1)
-	/// Proof Skipped: TechnicalCommittee Voting (max_values: None, max_size: None, mode: Measured)
-	/// Storage: TechnicalCommittee Members (r:1 w:0)
-	/// Proof Skipped: TechnicalCommittee Members (max_values: Some(1), max_size: None, mode: Measured)
-	/// Storage: TechnicalCommittee Prime (r:1 w:0)
-	/// Proof Skipped: TechnicalCommittee Prime (max_values: Some(1), max_size: None, mode: Measured)
-	/// Storage: TechnicalCommittee Proposals (r:1 w:1)
-	/// Proof Skipped: TechnicalCommittee Proposals (max_values: Some(1), max_size: None, mode: Measured)
-	/// Storage: TechnicalCommittee ProposalOf (r:0 w:1)
-	/// Proof Skipped: TechnicalCommittee ProposalOf (max_values: None, max_size: None, mode: Measured)
-	/// The range of component `m` is `[4, 100]`.
-	/// The range of component `p` is `[1, 100]`.
-	/// The range of component `m` is `[4, 100]`.
-	/// The range of component `p` is `[1, 100]`.
-	fn close_disapproved(m: u32, p: u32, ) -> Weight {
-		// Proof Size summary in bytes:
-		//  Measured:  `523 + m * (64 ±0) + p * (36 ±0)`
-		//  Estimated: `10435 + m * (325 ±0) + p * (180 ±0)`
-		// Minimum execution time: 30_447_000 picoseconds.
-		Weight::from_parts(32_661_910, 0)
-			.saturating_add(Weight::from_parts(0, 10435))
-			// Standard Error: 531
-			.saturating_add(Weight::from_parts(29_960, 0).saturating_mul(m.into()))
-			// Standard Error: 517
-			.saturating_add(Weight::from_parts(120_475, 0).saturating_mul(p.into()))
-			.saturating_add(T::DbWeight::get().reads(4))
-			.saturating_add(T::DbWeight::get().writes(3))
-			.saturating_add(Weight::from_parts(0, 325).saturating_mul(m.into()))
-			.saturating_add(Weight::from_parts(0, 180).saturating_mul(p.into()))
-	}
-	/// Storage: TechnicalCommittee Voting (r:1 w:1)
-	/// Proof Skipped: TechnicalCommittee Voting (max_values: None, max_size: None, mode: Measured)
-	/// Storage: TechnicalCommittee Members (r:1 w:0)
-	/// Proof Skipped: TechnicalCommittee Members (max_values: Some(1), max_size: None, mode: Measured)
-	/// Storage: TechnicalCommittee Prime (r:1 w:0)
-	/// Proof Skipped: TechnicalCommittee Prime (max_values: Some(1), max_size: None, mode: Measured)
-	/// Storage: TechnicalCommittee ProposalOf (r:1 w:1)
-	/// Proof Skipped: TechnicalCommittee ProposalOf (max_values: None, max_size: None, mode: Measured)
-	/// Storage: TechnicalCommittee Proposals (r:1 w:1)
-	/// Proof Skipped: TechnicalCommittee Proposals (max_values: Some(1), max_size: None, mode: Measured)
-	/// The range of component `b` is `[2, 1024]`.
-	/// The range of component `m` is `[4, 100]`.
-	/// The range of component `p` is `[1, 100]`.
-	/// The range of component `b` is `[2, 1024]`.
-	/// The range of component `m` is `[4, 100]`.
-	/// The range of component `p` is `[1, 100]`.
-	fn close_approved(b: u32, m: u32, p: u32, ) -> Weight {
-		// Proof Size summary in bytes:
-		//  Measured:  `825 + b * (1 ±0) + m * (64 ±0) + p * (40 ±0)`
-		//  Estimated: `14770 + b * (5 ±0) + m * (330 ±0) + p * (200 ±0)`
-		// Minimum execution time: 44_068_000 picoseconds.
-		Weight::from_parts(44_673_420, 0)
-			.saturating_add(Weight::from_parts(0, 14770))
-			// Standard Error: 59
-			.saturating_add(Weight::from_parts(1_779, 0).saturating_mul(b.into()))
-			// Standard Error: 625
-			.saturating_add(Weight::from_parts(17_794, 0).saturating_mul(m.into()))
-			// Standard Error: 609
-			.saturating_add(Weight::from_parts(134_062, 0).saturating_mul(p.into()))
-			.saturating_add(T::DbWeight::get().reads(5))
-			.saturating_add(T::DbWeight::get().writes(3))
-			.saturating_add(Weight::from_parts(0, 5).saturating_mul(b.into()))
-			.saturating_add(Weight::from_parts(0, 330).saturating_mul(m.into()))
-			.saturating_add(Weight::from_parts(0, 200).saturating_mul(p.into()))
-	}
-	/// Storage: TechnicalCommittee Proposals (r:1 w:1)
-	/// Proof Skipped: TechnicalCommittee Proposals (max_values: Some(1), max_size: None, mode: Measured)
-	/// Storage: TechnicalCommittee Voting (r:0 w:1)
-	/// Proof Skipped: TechnicalCommittee Voting (max_values: None, max_size: None, mode: Measured)
-	/// Storage: TechnicalCommittee ProposalOf (r:0 w:1)
-	/// Proof Skipped: TechnicalCommittee ProposalOf (max_values: None, max_size: None, mode: Measured)
-	/// The range of component `p` is `[1, 100]`.
-	/// The range of component `p` is `[1, 100]`.
-	fn disapprove_proposal(p: u32, ) -> Weight {
-		// Proof Size summary in bytes:
-		//  Measured:  `332 + p * (32 ±0)`
-		//  Estimated: `2481 + p * (96 ±0)`
-		// Minimum execution time: 15_528_000 picoseconds.
-		Weight::from_parts(17_434_864, 0)
-			.saturating_add(Weight::from_parts(0, 2481))
-			// Standard Error: 405
-			.saturating_add(Weight::from_parts(111_909, 0).saturating_mul(p.into()))
-			.saturating_add(T::DbWeight::get().reads(1))
-			.saturating_add(T::DbWeight::get().writes(3))
-			.saturating_add(Weight::from_parts(0, 96).saturating_mul(p.into()))
-	}
-}
diff --git a/polkadot/runtime/kusama/src/weights/pallet_democracy.rs b/polkadot/runtime/kusama/src/weights/pallet_democracy.rs
deleted file mode 100644
index 794c8c8159660e8fe7f1eb27f3b1b3905d5dc5df..0000000000000000000000000000000000000000
--- a/polkadot/runtime/kusama/src/weights/pallet_democracy.rs
+++ /dev/null
@@ -1,513 +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/>.
-//! Autogenerated weights for `pallet_democracy`
-//!
-//! THIS FILE WAS AUTO-GENERATED USING THE SUBSTRATE BENCHMARK CLI VERSION 4.0.0-dev
-//! DATE: 2023-03-15, STEPS: `50`, REPEAT: `20`, LOW RANGE: `[]`, HIGH RANGE: `[]`
-//! WORST CASE MAP SIZE: `1000000`
-//! HOSTNAME: `bm5`, CPU: `Intel(R) Core(TM) i7-7700K CPU @ 4.20GHz`
-//! EXECUTION: Some(Wasm), WASM-EXECUTION: Compiled, CHAIN: Some("kusama-dev"), DB CACHE: 1024
-
-// Executed Command:
-// ./target/production/polkadot
-// benchmark
-// pallet
-// --chain=kusama-dev
-// --steps=50
-// --repeat=20
-// --pallet=pallet_democracy
-// --extrinsic=*
-// --execution=wasm
-// --wasm-execution=compiled
-// --header=./file_header.txt
-// --output=./runtime/kusama/src/weights/
-
-#![cfg_attr(rustfmt, rustfmt_skip)]
-#![allow(unused_parens)]
-#![allow(unused_imports)]
-
-use frame_support::{traits::Get, weights::Weight};
-use sp_std::marker::PhantomData;
-
-/// Weight functions for `pallet_democracy`.
-pub struct WeightInfo<T>(PhantomData<T>);
-impl<T: frame_system::Config> pallet_democracy::WeightInfo for WeightInfo<T> {
-	/// Storage: Democracy PublicPropCount (r:1 w:1)
-	/// Proof: Democracy PublicPropCount (max_values: Some(1), max_size: Some(4), added: 499, mode: MaxEncodedLen)
-	/// Storage: Democracy PublicProps (r:1 w:1)
-	/// Proof: Democracy PublicProps (max_values: Some(1), max_size: Some(16702), added: 17197, mode: MaxEncodedLen)
-	/// Storage: Democracy Blacklist (r:1 w:0)
-	/// Proof: Democracy Blacklist (max_values: None, max_size: Some(3238), added: 5713, mode: MaxEncodedLen)
-	/// Storage: Democracy DepositOf (r:0 w:1)
-	/// Proof: Democracy DepositOf (max_values: None, max_size: Some(3230), added: 5705, mode: MaxEncodedLen)
-	fn propose() -> Weight {
-		// Proof Size summary in bytes:
-		//  Measured:  `4768`
-		//  Estimated: `26379`
-		// Minimum execution time: 35_098_000 picoseconds.
-		Weight::from_parts(35_696_000, 0)
-			.saturating_add(Weight::from_parts(0, 26379))
-			.saturating_add(T::DbWeight::get().reads(3))
-			.saturating_add(T::DbWeight::get().writes(3))
-	}
-	/// Storage: Democracy DepositOf (r:1 w:1)
-	/// Proof: Democracy DepositOf (max_values: None, max_size: Some(3230), added: 5705, mode: MaxEncodedLen)
-	fn second() -> Weight {
-		// Proof Size summary in bytes:
-		//  Measured:  `3523`
-		//  Estimated: `6695`
-		// Minimum execution time: 32_218_000 picoseconds.
-		Weight::from_parts(32_458_000, 0)
-			.saturating_add(Weight::from_parts(0, 6695))
-			.saturating_add(T::DbWeight::get().reads(1))
-			.saturating_add(T::DbWeight::get().writes(1))
-	}
-	/// Storage: Democracy ReferendumInfoOf (r:1 w:1)
-	/// Proof: Democracy ReferendumInfoOf (max_values: None, max_size: Some(201), added: 2676, mode: MaxEncodedLen)
-	/// Storage: Democracy VotingOf (r:1 w:1)
-	/// Proof: Democracy VotingOf (max_values: None, max_size: Some(3795), added: 6270, mode: MaxEncodedLen)
-	/// Storage: Balances Locks (r:1 w:1)
-	/// Proof: Balances Locks (max_values: None, max_size: Some(1299), added: 3774, mode: MaxEncodedLen)
-	fn vote_new() -> Weight {
-		// Proof Size summary in bytes:
-		//  Measured:  `3437`
-		//  Estimated: `15690`
-		// Minimum execution time: 46_641_000 picoseconds.
-		Weight::from_parts(47_324_000, 0)
-			.saturating_add(Weight::from_parts(0, 15690))
-			.saturating_add(T::DbWeight::get().reads(3))
-			.saturating_add(T::DbWeight::get().writes(3))
-	}
-	/// Storage: Democracy ReferendumInfoOf (r:1 w:1)
-	/// Proof: Democracy ReferendumInfoOf (max_values: None, max_size: Some(201), added: 2676, mode: MaxEncodedLen)
-	/// Storage: Democracy VotingOf (r:1 w:1)
-	/// Proof: Democracy VotingOf (max_values: None, max_size: Some(3795), added: 6270, mode: MaxEncodedLen)
-	/// Storage: Balances Locks (r:1 w:1)
-	/// Proof: Balances Locks (max_values: None, max_size: Some(1299), added: 3774, mode: MaxEncodedLen)
-	fn vote_existing() -> Weight {
-		// Proof Size summary in bytes:
-		//  Measured:  `3459`
-		//  Estimated: `15690`
-		// Minimum execution time: 47_172_000 picoseconds.
-		Weight::from_parts(47_732_000, 0)
-			.saturating_add(Weight::from_parts(0, 15690))
-			.saturating_add(T::DbWeight::get().reads(3))
-			.saturating_add(T::DbWeight::get().writes(3))
-	}
-	/// Storage: Democracy ReferendumInfoOf (r:1 w:1)
-	/// Proof: Democracy ReferendumInfoOf (max_values: None, max_size: Some(201), added: 2676, mode: MaxEncodedLen)
-	/// Storage: Democracy Cancellations (r:1 w:1)
-	/// Proof: Democracy Cancellations (max_values: None, max_size: Some(33), added: 2508, mode: MaxEncodedLen)
-	/// Storage: Democracy MetadataOf (r:1 w:1)
-	/// Proof: Democracy MetadataOf (max_values: None, max_size: Some(53), added: 2528, mode: MaxEncodedLen)
-	fn emergency_cancel() -> Weight {
-		// Proof Size summary in bytes:
-		//  Measured:  `333`
-		//  Estimated: `10682`
-		// Minimum execution time: 25_744_000 picoseconds.
-		Weight::from_parts(26_226_000, 0)
-			.saturating_add(Weight::from_parts(0, 10682))
-			.saturating_add(T::DbWeight::get().reads(3))
-			.saturating_add(T::DbWeight::get().writes(3))
-	}
-	/// Storage: Democracy PublicProps (r:1 w:1)
-	/// Proof: Democracy PublicProps (max_values: Some(1), max_size: Some(16702), added: 17197, mode: MaxEncodedLen)
-	/// Storage: Democracy DepositOf (r:1 w:1)
-	/// Proof: Democracy DepositOf (max_values: None, max_size: Some(3230), added: 5705, mode: MaxEncodedLen)
-	/// Storage: System Account (r:1 w:1)
-	/// Proof: System Account (max_values: None, max_size: Some(128), added: 2603, mode: MaxEncodedLen)
-	/// Storage: Democracy MetadataOf (r:3 w:1)
-	/// Proof: Democracy MetadataOf (max_values: None, max_size: Some(53), added: 2528, mode: MaxEncodedLen)
-	/// Storage: Democracy NextExternal (r:1 w:1)
-	/// Proof: Democracy NextExternal (max_values: Some(1), max_size: Some(132), added: 627, mode: MaxEncodedLen)
-	/// Storage: Democracy ReferendumInfoOf (r:1 w:1)
-	/// Proof: Democracy ReferendumInfoOf (max_values: None, max_size: Some(201), added: 2676, mode: MaxEncodedLen)
-	/// Storage: Democracy Blacklist (r:0 w:1)
-	/// Proof: Democracy Blacklist (max_values: None, max_size: Some(3238), added: 5713, mode: MaxEncodedLen)
-	fn blacklist() -> Weight {
-		// Proof Size summary in bytes:
-		//  Measured:  `5877`
-		//  Estimated: `42332`
-		// Minimum execution time: 88_365_000 picoseconds.
-		Weight::from_parts(90_080_000, 0)
-			.saturating_add(Weight::from_parts(0, 42332))
-			.saturating_add(T::DbWeight::get().reads(8))
-			.saturating_add(T::DbWeight::get().writes(7))
-	}
-	/// Storage: Democracy NextExternal (r:1 w:1)
-	/// Proof: Democracy NextExternal (max_values: Some(1), max_size: Some(132), added: 627, mode: MaxEncodedLen)
-	/// Storage: Democracy Blacklist (r:1 w:0)
-	/// Proof: Democracy Blacklist (max_values: None, max_size: Some(3238), added: 5713, mode: MaxEncodedLen)
-	fn external_propose() -> Weight {
-		// Proof Size summary in bytes:
-		//  Measured:  `3383`
-		//  Estimated: `8320`
-		// Minimum execution time: 12_868_000 picoseconds.
-		Weight::from_parts(13_178_000, 0)
-			.saturating_add(Weight::from_parts(0, 8320))
-			.saturating_add(T::DbWeight::get().reads(2))
-			.saturating_add(T::DbWeight::get().writes(1))
-	}
-	/// Storage: Democracy NextExternal (r:0 w:1)
-	/// Proof: Democracy NextExternal (max_values: Some(1), max_size: Some(132), added: 627, mode: MaxEncodedLen)
-	fn external_propose_majority() -> Weight {
-		// Proof Size summary in bytes:
-		//  Measured:  `0`
-		//  Estimated: `0`
-		// Minimum execution time: 3_714_000 picoseconds.
-		Weight::from_parts(3_895_000, 0)
-			.saturating_add(Weight::from_parts(0, 0))
-			.saturating_add(T::DbWeight::get().writes(1))
-	}
-	/// Storage: Democracy NextExternal (r:0 w:1)
-	/// Proof: Democracy NextExternal (max_values: Some(1), max_size: Some(132), added: 627, mode: MaxEncodedLen)
-	fn external_propose_default() -> Weight {
-		// Proof Size summary in bytes:
-		//  Measured:  `0`
-		//  Estimated: `0`
-		// Minimum execution time: 3_565_000 picoseconds.
-		Weight::from_parts(3_831_000, 0)
-			.saturating_add(Weight::from_parts(0, 0))
-			.saturating_add(T::DbWeight::get().writes(1))
-	}
-	/// Storage: Democracy NextExternal (r:1 w:1)
-	/// Proof: Democracy NextExternal (max_values: Some(1), max_size: Some(132), added: 627, mode: MaxEncodedLen)
-	/// Storage: Democracy ReferendumCount (r:1 w:1)
-	/// Proof: Democracy ReferendumCount (max_values: Some(1), max_size: Some(4), added: 499, mode: MaxEncodedLen)
-	/// Storage: Democracy MetadataOf (r:1 w:2)
-	/// Proof: Democracy MetadataOf (max_values: None, max_size: Some(53), added: 2528, mode: MaxEncodedLen)
-	/// Storage: Democracy ReferendumInfoOf (r:0 w:1)
-	/// Proof: Democracy ReferendumInfoOf (max_values: None, max_size: Some(201), added: 2676, mode: MaxEncodedLen)
-	fn fast_track() -> Weight {
-		// Proof Size summary in bytes:
-		//  Measured:  `253`
-		//  Estimated: `6624`
-		// Minimum execution time: 26_453_000 picoseconds.
-		Weight::from_parts(26_938_000, 0)
-			.saturating_add(Weight::from_parts(0, 6624))
-			.saturating_add(T::DbWeight::get().reads(3))
-			.saturating_add(T::DbWeight::get().writes(5))
-	}
-	/// Storage: Democracy NextExternal (r:1 w:1)
-	/// Proof: Democracy NextExternal (max_values: Some(1), max_size: Some(132), added: 627, mode: MaxEncodedLen)
-	/// Storage: Democracy Blacklist (r:1 w:1)
-	/// Proof: Democracy Blacklist (max_values: None, max_size: Some(3238), added: 5713, mode: MaxEncodedLen)
-	/// Storage: Democracy MetadataOf (r:1 w:1)
-	/// Proof: Democracy MetadataOf (max_values: None, max_size: Some(53), added: 2528, mode: MaxEncodedLen)
-	fn veto_external() -> Weight {
-		// Proof Size summary in bytes:
-		//  Measured:  `3486`
-		//  Estimated: `11838`
-		// Minimum execution time: 30_869_000 picoseconds.
-		Weight::from_parts(31_397_000, 0)
-			.saturating_add(Weight::from_parts(0, 11838))
-			.saturating_add(T::DbWeight::get().reads(3))
-			.saturating_add(T::DbWeight::get().writes(3))
-	}
-	/// Storage: Democracy PublicProps (r:1 w:1)
-	/// Proof: Democracy PublicProps (max_values: Some(1), max_size: Some(16702), added: 17197, mode: MaxEncodedLen)
-	/// Storage: Democracy DepositOf (r:1 w:1)
-	/// Proof: Democracy DepositOf (max_values: None, max_size: Some(3230), added: 5705, mode: MaxEncodedLen)
-	/// Storage: System Account (r:1 w:1)
-	/// Proof: System Account (max_values: None, max_size: Some(128), added: 2603, mode: MaxEncodedLen)
-	/// Storage: Democracy MetadataOf (r:1 w:1)
-	/// Proof: Democracy MetadataOf (max_values: None, max_size: Some(53), added: 2528, mode: MaxEncodedLen)
-	fn cancel_proposal() -> Weight {
-		// Proof Size summary in bytes:
-		//  Measured:  `5788`
-		//  Estimated: `31993`
-		// Minimum execution time: 72_692_000 picoseconds.
-		Weight::from_parts(73_692_000, 0)
-			.saturating_add(Weight::from_parts(0, 31993))
-			.saturating_add(T::DbWeight::get().reads(4))
-			.saturating_add(T::DbWeight::get().writes(4))
-	}
-	/// Storage: Democracy MetadataOf (r:1 w:1)
-	/// Proof: Democracy MetadataOf (max_values: None, max_size: Some(53), added: 2528, mode: MaxEncodedLen)
-	/// Storage: Democracy ReferendumInfoOf (r:0 w:1)
-	/// Proof: Democracy ReferendumInfoOf (max_values: None, max_size: Some(201), added: 2676, mode: MaxEncodedLen)
-	fn cancel_referendum() -> Weight {
-		// Proof Size summary in bytes:
-		//  Measured:  `238`
-		//  Estimated: `3518`
-		// Minimum execution time: 19_506_000 picoseconds.
-		Weight::from_parts(19_823_000, 0)
-			.saturating_add(Weight::from_parts(0, 3518))
-			.saturating_add(T::DbWeight::get().reads(1))
-			.saturating_add(T::DbWeight::get().writes(2))
-	}
-	/// Storage: Democracy LowestUnbaked (r:1 w:1)
-	/// Proof: Democracy LowestUnbaked (max_values: Some(1), max_size: Some(4), added: 499, mode: MaxEncodedLen)
-	/// Storage: Democracy ReferendumCount (r:1 w:0)
-	/// Proof: Democracy ReferendumCount (max_values: Some(1), max_size: Some(4), added: 499, mode: MaxEncodedLen)
-	/// Storage: Democracy ReferendumInfoOf (r:99 w:0)
-	/// Proof: Democracy ReferendumInfoOf (max_values: None, max_size: Some(201), added: 2676, mode: MaxEncodedLen)
-	/// The range of component `r` is `[0, 99]`.
-	fn on_initialize_base(r: u32, ) -> Weight {
-		// Proof Size summary in bytes:
-		//  Measured:  `211 + r * (86 ±0)`
-		//  Estimated: `3968 + r * (2676 ±0)`
-		// Minimum execution time: 6_019_000 picoseconds.
-		Weight::from_parts(9_632_674, 0)
-			.saturating_add(Weight::from_parts(0, 3968))
-			// Standard Error: 6_651
-			.saturating_add(Weight::from_parts(2_769_264, 0).saturating_mul(r.into()))
-			.saturating_add(T::DbWeight::get().reads(2))
-			.saturating_add(T::DbWeight::get().reads((1_u64).saturating_mul(r.into())))
-			.saturating_add(T::DbWeight::get().writes(1))
-			.saturating_add(Weight::from_parts(0, 2676).saturating_mul(r.into()))
-	}
-	/// Storage: Democracy LowestUnbaked (r:1 w:1)
-	/// Proof: Democracy LowestUnbaked (max_values: Some(1), max_size: Some(4), added: 499, mode: MaxEncodedLen)
-	/// Storage: Democracy ReferendumCount (r:1 w:0)
-	/// Proof: Democracy ReferendumCount (max_values: Some(1), max_size: Some(4), added: 499, mode: MaxEncodedLen)
-	/// Storage: Democracy LastTabledWasExternal (r:1 w:0)
-	/// Proof: Democracy LastTabledWasExternal (max_values: Some(1), max_size: Some(1), added: 496, mode: MaxEncodedLen)
-	/// Storage: Democracy NextExternal (r:1 w:0)
-	/// Proof: Democracy NextExternal (max_values: Some(1), max_size: Some(132), added: 627, mode: MaxEncodedLen)
-	/// Storage: Democracy PublicProps (r:1 w:0)
-	/// Proof: Democracy PublicProps (max_values: Some(1), max_size: Some(16702), added: 17197, mode: MaxEncodedLen)
-	/// Storage: Democracy ReferendumInfoOf (r:99 w:0)
-	/// Proof: Democracy ReferendumInfoOf (max_values: None, max_size: Some(201), added: 2676, mode: MaxEncodedLen)
-	/// The range of component `r` is `[0, 99]`.
-	fn on_initialize_base_with_launch_period(r: u32, ) -> Weight {
-		// Proof Size summary in bytes:
-		//  Measured:  `211 + r * (86 ±0)`
-		//  Estimated: `25258 + r * (2676 ±0)`
-		// Minimum execution time: 9_143_000 picoseconds.
-		Weight::from_parts(12_247_629, 0)
-			.saturating_add(Weight::from_parts(0, 25258))
-			// Standard Error: 6_077
-			.saturating_add(Weight::from_parts(2_764_547, 0).saturating_mul(r.into()))
-			.saturating_add(T::DbWeight::get().reads(5))
-			.saturating_add(T::DbWeight::get().reads((1_u64).saturating_mul(r.into())))
-			.saturating_add(T::DbWeight::get().writes(1))
-			.saturating_add(Weight::from_parts(0, 2676).saturating_mul(r.into()))
-	}
-	/// Storage: Democracy VotingOf (r:3 w:3)
-	/// Proof: Democracy VotingOf (max_values: None, max_size: Some(3795), added: 6270, mode: MaxEncodedLen)
-	/// Storage: Democracy ReferendumInfoOf (r:99 w:99)
-	/// Proof: Democracy ReferendumInfoOf (max_values: None, max_size: Some(201), added: 2676, mode: MaxEncodedLen)
-	/// Storage: Balances Locks (r:1 w:1)
-	/// Proof: Balances Locks (max_values: None, max_size: Some(1299), added: 3774, mode: MaxEncodedLen)
-	/// The range of component `r` is `[0, 99]`.
-	fn delegate(r: u32, ) -> Weight {
-		// Proof Size summary in bytes:
-		//  Measured:  `797 + r * (108 ±0)`
-		//  Estimated: `25554 + r * (2676 ±0)`
-		// Minimum execution time: 41_153_000 picoseconds.
-		Weight::from_parts(42_787_487, 0)
-			.saturating_add(Weight::from_parts(0, 25554))
-			// Standard Error: 7_883
-			.saturating_add(Weight::from_parts(3_862_521, 0).saturating_mul(r.into()))
-			.saturating_add(T::DbWeight::get().reads(4))
-			.saturating_add(T::DbWeight::get().reads((1_u64).saturating_mul(r.into())))
-			.saturating_add(T::DbWeight::get().writes(4))
-			.saturating_add(T::DbWeight::get().writes((1_u64).saturating_mul(r.into())))
-			.saturating_add(Weight::from_parts(0, 2676).saturating_mul(r.into()))
-	}
-	/// Storage: Democracy VotingOf (r:2 w:2)
-	/// Proof: Democracy VotingOf (max_values: None, max_size: Some(3795), added: 6270, mode: MaxEncodedLen)
-	/// Storage: Democracy ReferendumInfoOf (r:99 w:99)
-	/// Proof: Democracy ReferendumInfoOf (max_values: None, max_size: Some(201), added: 2676, mode: MaxEncodedLen)
-	/// The range of component `r` is `[0, 99]`.
-	fn undelegate(r: u32, ) -> Weight {
-		// Proof Size summary in bytes:
-		//  Measured:  `460 + r * (108 ±0)`
-		//  Estimated: `14520 + r * (2676 ±0)`
-		// Minimum execution time: 20_767_000 picoseconds.
-		Weight::from_parts(21_768_239, 0)
-			.saturating_add(Weight::from_parts(0, 14520))
-			// Standard Error: 9_791
-			.saturating_add(Weight::from_parts(3_862_103, 0).saturating_mul(r.into()))
-			.saturating_add(T::DbWeight::get().reads(2))
-			.saturating_add(T::DbWeight::get().reads((1_u64).saturating_mul(r.into())))
-			.saturating_add(T::DbWeight::get().writes(2))
-			.saturating_add(T::DbWeight::get().writes((1_u64).saturating_mul(r.into())))
-			.saturating_add(Weight::from_parts(0, 2676).saturating_mul(r.into()))
-	}
-	/// Storage: Democracy PublicProps (r:0 w:1)
-	/// Proof: Democracy PublicProps (max_values: Some(1), max_size: Some(16702), added: 17197, mode: MaxEncodedLen)
-	fn clear_public_proposals() -> Weight {
-		// Proof Size summary in bytes:
-		//  Measured:  `0`
-		//  Estimated: `0`
-		// Minimum execution time: 3_663_000 picoseconds.
-		Weight::from_parts(3_798_000, 0)
-			.saturating_add(Weight::from_parts(0, 0))
-			.saturating_add(T::DbWeight::get().writes(1))
-	}
-	/// Storage: Democracy VotingOf (r:1 w:1)
-	/// Proof: Democracy VotingOf (max_values: None, max_size: Some(3795), added: 6270, mode: MaxEncodedLen)
-	/// Storage: Balances Locks (r:1 w:1)
-	/// Proof: Balances Locks (max_values: None, max_size: Some(1299), added: 3774, mode: MaxEncodedLen)
-	/// Storage: System Account (r:1 w:1)
-	/// Proof: System Account (max_values: None, max_size: Some(128), added: 2603, mode: MaxEncodedLen)
-	/// The range of component `r` is `[0, 99]`.
-	fn unlock_remove(r: u32, ) -> Weight {
-		// Proof Size summary in bytes:
-		//  Measured:  `530`
-		//  Estimated: `15617`
-		// Minimum execution time: 19_923_000 picoseconds.
-		Weight::from_parts(25_945_279, 0)
-			.saturating_add(Weight::from_parts(0, 15617))
-			// Standard Error: 1_366
-			.saturating_add(Weight::from_parts(22_003, 0).saturating_mul(r.into()))
-			.saturating_add(T::DbWeight::get().reads(3))
-			.saturating_add(T::DbWeight::get().writes(3))
-	}
-	/// Storage: Democracy VotingOf (r:1 w:1)
-	/// Proof: Democracy VotingOf (max_values: None, max_size: Some(3795), added: 6270, mode: MaxEncodedLen)
-	/// Storage: Balances Locks (r:1 w:1)
-	/// Proof: Balances Locks (max_values: None, max_size: Some(1299), added: 3774, mode: MaxEncodedLen)
-	/// Storage: System Account (r:1 w:1)
-	/// Proof: System Account (max_values: None, max_size: Some(128), added: 2603, mode: MaxEncodedLen)
-	/// The range of component `r` is `[0, 99]`.
-	fn unlock_set(r: u32, ) -> Weight {
-		// Proof Size summary in bytes:
-		//  Measured:  `531 + r * (22 ±0)`
-		//  Estimated: `15617`
-		// Minimum execution time: 24_393_000 picoseconds.
-		Weight::from_parts(25_690_593, 0)
-			.saturating_add(Weight::from_parts(0, 15617))
-			// Standard Error: 553
-			.saturating_add(Weight::from_parts(59_042, 0).saturating_mul(r.into()))
-			.saturating_add(T::DbWeight::get().reads(3))
-			.saturating_add(T::DbWeight::get().writes(3))
-	}
-	/// Storage: Democracy ReferendumInfoOf (r:1 w:1)
-	/// Proof: Democracy ReferendumInfoOf (max_values: None, max_size: Some(201), added: 2676, mode: MaxEncodedLen)
-	/// Storage: Democracy VotingOf (r:1 w:1)
-	/// Proof: Democracy VotingOf (max_values: None, max_size: Some(3795), added: 6270, mode: MaxEncodedLen)
-	/// The range of component `r` is `[1, 100]`.
-	fn remove_vote(r: u32, ) -> Weight {
-		// Proof Size summary in bytes:
-		//  Measured:  `695 + r * (26 ±0)`
-		//  Estimated: `10926`
-		// Minimum execution time: 15_551_000 picoseconds.
-		Weight::from_parts(17_809_948, 0)
-			.saturating_add(Weight::from_parts(0, 10926))
-			// Standard Error: 1_907
-			.saturating_add(Weight::from_parts(86_496, 0).saturating_mul(r.into()))
-			.saturating_add(T::DbWeight::get().reads(2))
-			.saturating_add(T::DbWeight::get().writes(2))
-	}
-	/// Storage: Democracy ReferendumInfoOf (r:1 w:1)
-	/// Proof: Democracy ReferendumInfoOf (max_values: None, max_size: Some(201), added: 2676, mode: MaxEncodedLen)
-	/// Storage: Democracy VotingOf (r:1 w:1)
-	/// Proof: Democracy VotingOf (max_values: None, max_size: Some(3795), added: 6270, mode: MaxEncodedLen)
-	/// The range of component `r` is `[1, 100]`.
-	fn remove_other_vote(r: u32, ) -> Weight {
-		// Proof Size summary in bytes:
-		//  Measured:  `695 + r * (26 ±0)`
-		//  Estimated: `10926`
-		// Minimum execution time: 16_027_000 picoseconds.
-		Weight::from_parts(17_860_077, 0)
-			.saturating_add(Weight::from_parts(0, 10926))
-			// Standard Error: 1_950
-			.saturating_add(Weight::from_parts(87_722, 0).saturating_mul(r.into()))
-			.saturating_add(T::DbWeight::get().reads(2))
-			.saturating_add(T::DbWeight::get().writes(2))
-	}
-	/// Storage: Democracy NextExternal (r:1 w:0)
-	/// Proof: Democracy NextExternal (max_values: Some(1), max_size: Some(132), added: 627, mode: MaxEncodedLen)
-	/// Storage: Preimage StatusFor (r:1 w:0)
-	/// Proof: Preimage StatusFor (max_values: None, max_size: Some(91), added: 2566, mode: MaxEncodedLen)
-	/// Storage: Democracy MetadataOf (r:0 w:1)
-	/// Proof: Democracy MetadataOf (max_values: None, max_size: Some(53), added: 2528, mode: MaxEncodedLen)
-	fn set_external_metadata() -> Weight {
-		// Proof Size summary in bytes:
-		//  Measured:  `323`
-		//  Estimated: `5173`
-		// Minimum execution time: 17_551_000 picoseconds.
-		Weight::from_parts(17_776_000, 0)
-			.saturating_add(Weight::from_parts(0, 5173))
-			.saturating_add(T::DbWeight::get().reads(2))
-			.saturating_add(T::DbWeight::get().writes(1))
-	}
-	/// Storage: Democracy NextExternal (r:1 w:0)
-	/// Proof: Democracy NextExternal (max_values: Some(1), max_size: Some(132), added: 627, mode: MaxEncodedLen)
-	/// Storage: Democracy MetadataOf (r:1 w:1)
-	/// Proof: Democracy MetadataOf (max_values: None, max_size: Some(53), added: 2528, mode: MaxEncodedLen)
-	fn clear_external_metadata() -> Weight {
-		// Proof Size summary in bytes:
-		//  Measured:  `253`
-		//  Estimated: `5135`
-		// Minimum execution time: 16_020_000 picoseconds.
-		Weight::from_parts(16_477_000, 0)
-			.saturating_add(Weight::from_parts(0, 5135))
-			.saturating_add(T::DbWeight::get().reads(2))
-			.saturating_add(T::DbWeight::get().writes(1))
-	}
-	/// Storage: Democracy PublicProps (r:1 w:0)
-	/// Proof: Democracy PublicProps (max_values: Some(1), max_size: Some(16702), added: 17197, mode: MaxEncodedLen)
-	/// Storage: Preimage StatusFor (r:1 w:0)
-	/// Proof: Preimage StatusFor (max_values: None, max_size: Some(91), added: 2566, mode: MaxEncodedLen)
-	/// Storage: Democracy MetadataOf (r:0 w:1)
-	/// Proof: Democracy MetadataOf (max_values: None, max_size: Some(53), added: 2528, mode: MaxEncodedLen)
-	fn set_proposal_metadata() -> Weight {
-		// Proof Size summary in bytes:
-		//  Measured:  `4855`
-		//  Estimated: `21743`
-		// Minimum execution time: 33_144_000 picoseconds.
-		Weight::from_parts(33_457_000, 0)
-			.saturating_add(Weight::from_parts(0, 21743))
-			.saturating_add(T::DbWeight::get().reads(2))
-			.saturating_add(T::DbWeight::get().writes(1))
-	}
-	/// Storage: Democracy PublicProps (r:1 w:0)
-	/// Proof: Democracy PublicProps (max_values: Some(1), max_size: Some(16702), added: 17197, mode: MaxEncodedLen)
-	/// Storage: Democracy MetadataOf (r:1 w:1)
-	/// Proof: Democracy MetadataOf (max_values: None, max_size: Some(53), added: 2528, mode: MaxEncodedLen)
-	fn clear_proposal_metadata() -> Weight {
-		// Proof Size summary in bytes:
-		//  Measured:  `4789`
-		//  Estimated: `21705`
-		// Minimum execution time: 31_022_000 picoseconds.
-		Weight::from_parts(31_534_000, 0)
-			.saturating_add(Weight::from_parts(0, 21705))
-			.saturating_add(T::DbWeight::get().reads(2))
-			.saturating_add(T::DbWeight::get().writes(1))
-	}
-	/// Storage: Preimage StatusFor (r:1 w:0)
-	/// Proof: Preimage StatusFor (max_values: None, max_size: Some(91), added: 2566, mode: MaxEncodedLen)
-	/// Storage: Democracy MetadataOf (r:0 w:1)
-	/// Proof: Democracy MetadataOf (max_values: None, max_size: Some(53), added: 2528, mode: MaxEncodedLen)
-	fn set_referendum_metadata() -> Weight {
-		// Proof Size summary in bytes:
-		//  Measured:  `144`
-		//  Estimated: `3556`
-		// Minimum execution time: 14_512_000 picoseconds.
-		Weight::from_parts(14_769_000, 0)
-			.saturating_add(Weight::from_parts(0, 3556))
-			.saturating_add(T::DbWeight::get().reads(1))
-			.saturating_add(T::DbWeight::get().writes(1))
-	}
-	/// Storage: Democracy ReferendumInfoOf (r:1 w:0)
-	/// Proof: Democracy ReferendumInfoOf (max_values: None, max_size: Some(201), added: 2676, mode: MaxEncodedLen)
-	/// Storage: Democracy MetadataOf (r:1 w:1)
-	/// Proof: Democracy MetadataOf (max_values: None, max_size: Some(53), added: 2528, mode: MaxEncodedLen)
-	fn clear_referendum_metadata() -> Weight {
-		// Proof Size summary in bytes:
-		//  Measured:  `269`
-		//  Estimated: `7184`
-		// Minimum execution time: 17_966_000 picoseconds.
-		Weight::from_parts(18_270_000, 0)
-			.saturating_add(Weight::from_parts(0, 7184))
-			.saturating_add(T::DbWeight::get().reads(2))
-			.saturating_add(T::DbWeight::get().writes(1))
-	}
-}
diff --git a/polkadot/runtime/kusama/src/weights/pallet_election_provider_multi_phase.rs b/polkadot/runtime/kusama/src/weights/pallet_election_provider_multi_phase.rs
deleted file mode 100644
index d670d324aba04543a2fe98b654ae341f55009c38..0000000000000000000000000000000000000000
--- a/polkadot/runtime/kusama/src/weights/pallet_election_provider_multi_phase.rs
+++ /dev/null
@@ -1,272 +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/>.
-
-//! Autogenerated weights for `pallet_election_provider_multi_phase`
-//!
-//! THIS FILE WAS AUTO-GENERATED USING THE SUBSTRATE BENCHMARK CLI VERSION 4.0.0-dev
-//! DATE: 2023-06-19, STEPS: `50`, REPEAT: `20`, LOW RANGE: `[]`, HIGH RANGE: `[]`
-//! WORST CASE MAP SIZE: `1000000`
-//! HOSTNAME: `runner-e8ezs4ez-project-163-concurrent-0`, CPU: `Intel(R) Xeon(R) CPU @ 2.60GHz`
-//! EXECUTION: Some(Wasm), WASM-EXECUTION: Compiled, CHAIN: Some("kusama-dev"), DB CACHE: 1024
-
-// Executed Command:
-// ./target/production/polkadot
-// benchmark
-// pallet
-// --chain=kusama-dev
-// --steps=50
-// --repeat=20
-// --no-storage-info
-// --no-median-slopes
-// --no-min-squares
-// --pallet=pallet_election_provider_multi_phase
-// --extrinsic=*
-// --execution=wasm
-// --wasm-execution=compiled
-// --header=./file_header.txt
-// --output=./runtime/kusama/src/weights/
-
-#![cfg_attr(rustfmt, rustfmt_skip)]
-#![allow(unused_parens)]
-#![allow(unused_imports)]
-#![allow(missing_docs)]
-
-use frame_support::{traits::Get, weights::Weight};
-use core::marker::PhantomData;
-
-/// Weight functions for `pallet_election_provider_multi_phase`.
-pub struct WeightInfo<T>(PhantomData<T>);
-impl<T: frame_system::Config> pallet_election_provider_multi_phase::WeightInfo for WeightInfo<T> {
-	/// Storage: Staking CurrentEra (r:1 w:0)
-	/// Proof: Staking CurrentEra (max_values: Some(1), max_size: Some(4), added: 499, mode: MaxEncodedLen)
-	/// Storage: Staking CurrentPlannedSession (r:1 w:0)
-	/// Proof: Staking CurrentPlannedSession (max_values: Some(1), max_size: Some(4), added: 499, mode: MaxEncodedLen)
-	/// Storage: Staking ErasStartSessionIndex (r:1 w:0)
-	/// Proof: Staking ErasStartSessionIndex (max_values: None, max_size: Some(16), added: 2491, mode: MaxEncodedLen)
-	/// Storage: Babe EpochIndex (r:1 w:0)
-	/// Proof: Babe EpochIndex (max_values: Some(1), max_size: Some(8), added: 503, mode: MaxEncodedLen)
-	/// Storage: Babe GenesisSlot (r:1 w:0)
-	/// Proof: Babe GenesisSlot (max_values: Some(1), max_size: Some(8), added: 503, mode: MaxEncodedLen)
-	/// Storage: Babe CurrentSlot (r:1 w:0)
-	/// Proof: Babe CurrentSlot (max_values: Some(1), max_size: Some(8), added: 503, mode: MaxEncodedLen)
-	/// Storage: Staking ForceEra (r:1 w:0)
-	/// Proof: Staking ForceEra (max_values: Some(1), max_size: Some(1), added: 496, mode: MaxEncodedLen)
-	/// Storage: ElectionProviderMultiPhase CurrentPhase (r:1 w:0)
-	/// Proof Skipped: ElectionProviderMultiPhase CurrentPhase (max_values: Some(1), max_size: None, mode: Measured)
-	fn on_initialize_nothing() -> Weight {
-		// Proof Size summary in bytes:
-		//  Measured:  `959`
-		//  Estimated: `3481`
-		// Minimum execution time: 21_207_000 picoseconds.
-		Weight::from_parts(22_059_000, 0)
-			.saturating_add(Weight::from_parts(0, 3481))
-			.saturating_add(T::DbWeight::get().reads(8))
-	}
-	/// Storage: ElectionProviderMultiPhase Round (r:1 w:0)
-	/// Proof Skipped: ElectionProviderMultiPhase Round (max_values: Some(1), max_size: None, mode: Measured)
-	/// Storage: ElectionProviderMultiPhase CurrentPhase (r:1 w:1)
-	/// Proof Skipped: ElectionProviderMultiPhase CurrentPhase (max_values: Some(1), max_size: None, mode: Measured)
-	fn on_initialize_open_signed() -> Weight {
-		// Proof Size summary in bytes:
-		//  Measured:  `80`
-		//  Estimated: `1565`
-		// Minimum execution time: 11_472_000 picoseconds.
-		Weight::from_parts(11_772_000, 0)
-			.saturating_add(Weight::from_parts(0, 1565))
-			.saturating_add(T::DbWeight::get().reads(2))
-			.saturating_add(T::DbWeight::get().writes(1))
-	}
-	/// Storage: ElectionProviderMultiPhase Round (r:1 w:0)
-	/// Proof Skipped: ElectionProviderMultiPhase Round (max_values: Some(1), max_size: None, mode: Measured)
-	/// Storage: ElectionProviderMultiPhase CurrentPhase (r:1 w:1)
-	/// Proof Skipped: ElectionProviderMultiPhase CurrentPhase (max_values: Some(1), max_size: None, mode: Measured)
-	fn on_initialize_open_unsigned() -> Weight {
-		// Proof Size summary in bytes:
-		//  Measured:  `80`
-		//  Estimated: `1565`
-		// Minimum execution time: 12_466_000 picoseconds.
-		Weight::from_parts(12_954_000, 0)
-			.saturating_add(Weight::from_parts(0, 1565))
-			.saturating_add(T::DbWeight::get().reads(2))
-			.saturating_add(T::DbWeight::get().writes(1))
-	}
-	/// Storage: System Account (r:1 w:1)
-	/// Proof: System Account (max_values: None, max_size: Some(128), added: 2603, mode: MaxEncodedLen)
-	/// Storage: ElectionProviderMultiPhase QueuedSolution (r:0 w:1)
-	/// Proof Skipped: ElectionProviderMultiPhase QueuedSolution (max_values: Some(1), max_size: None, mode: Measured)
-	fn finalize_signed_phase_accept_solution() -> Weight {
-		// Proof Size summary in bytes:
-		//  Measured:  `174`
-		//  Estimated: `3593`
-		// Minimum execution time: 31_347_000 picoseconds.
-		Weight::from_parts(32_088_000, 0)
-			.saturating_add(Weight::from_parts(0, 3593))
-			.saturating_add(T::DbWeight::get().reads(1))
-			.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)
-	fn finalize_signed_phase_reject_solution() -> Weight {
-		// Proof Size summary in bytes:
-		//  Measured:  `174`
-		//  Estimated: `3593`
-		// Minimum execution time: 21_061_000 picoseconds.
-		Weight::from_parts(21_819_000, 0)
-			.saturating_add(Weight::from_parts(0, 3593))
-			.saturating_add(T::DbWeight::get().reads(1))
-			.saturating_add(T::DbWeight::get().writes(1))
-	}
-	/// Storage: ElectionProviderMultiPhase SnapshotMetadata (r:0 w:1)
-	/// Proof Skipped: ElectionProviderMultiPhase SnapshotMetadata (max_values: Some(1), max_size: None, mode: Measured)
-	/// Storage: ElectionProviderMultiPhase DesiredTargets (r:0 w:1)
-	/// Proof Skipped: ElectionProviderMultiPhase DesiredTargets (max_values: Some(1), max_size: None, mode: Measured)
-	/// Storage: ElectionProviderMultiPhase Snapshot (r:0 w:1)
-	/// Proof Skipped: ElectionProviderMultiPhase Snapshot (max_values: Some(1), max_size: None, mode: Measured)
-	/// The range of component `v` is `[1000, 2000]`.
-	/// The range of component `t` is `[500, 1000]`.
-	fn create_snapshot_internal(v: u32, _t: u32, ) -> Weight {
-		// Proof Size summary in bytes:
-		//  Measured:  `0`
-		//  Estimated: `0`
-		// Minimum execution time: 796_200_000 picoseconds.
-		Weight::from_parts(848_268_000, 0)
-			.saturating_add(Weight::from_parts(0, 0))
-			// Standard Error: 6_942
-			.saturating_add(Weight::from_parts(625_196, 0).saturating_mul(v.into()))
-			.saturating_add(T::DbWeight::get().writes(3))
-	}
-	/// Storage: ElectionProviderMultiPhase SignedSubmissionIndices (r:1 w:1)
-	/// Proof Skipped: ElectionProviderMultiPhase SignedSubmissionIndices (max_values: Some(1), max_size: None, mode: Measured)
-	/// Storage: ElectionProviderMultiPhase SignedSubmissionNextIndex (r:1 w:1)
-	/// Proof Skipped: ElectionProviderMultiPhase SignedSubmissionNextIndex (max_values: Some(1), max_size: None, mode: Measured)
-	/// Storage: ElectionProviderMultiPhase SnapshotMetadata (r:1 w:1)
-	/// Proof Skipped: ElectionProviderMultiPhase SnapshotMetadata (max_values: Some(1), max_size: None, mode: Measured)
-	/// Storage: ElectionProviderMultiPhase SignedSubmissionsMap (r:1 w:0)
-	/// Proof Skipped: ElectionProviderMultiPhase SignedSubmissionsMap (max_values: None, max_size: None, mode: Measured)
-	/// Storage: System BlockWeight (r:1 w:1)
-	/// Proof: System BlockWeight (max_values: Some(1), max_size: Some(48), added: 543, mode: MaxEncodedLen)
-	/// Storage: ElectionProviderMultiPhase QueuedSolution (r:1 w:1)
-	/// Proof Skipped: ElectionProviderMultiPhase QueuedSolution (max_values: Some(1), max_size: None, mode: Measured)
-	/// Storage: ElectionProviderMultiPhase Round (r:1 w:1)
-	/// Proof Skipped: ElectionProviderMultiPhase Round (max_values: Some(1), max_size: None, mode: Measured)
-	/// Storage: ElectionProviderMultiPhase CurrentPhase (r:1 w:1)
-	/// Proof Skipped: ElectionProviderMultiPhase CurrentPhase (max_values: Some(1), max_size: None, mode: Measured)
-	/// Storage: ElectionProviderMultiPhase DesiredTargets (r:0 w:1)
-	/// Proof Skipped: ElectionProviderMultiPhase DesiredTargets (max_values: Some(1), max_size: None, mode: Measured)
-	/// Storage: ElectionProviderMultiPhase Snapshot (r:0 w:1)
-	/// Proof Skipped: ElectionProviderMultiPhase Snapshot (max_values: Some(1), max_size: None, mode: Measured)
-	/// The range of component `a` is `[500, 800]`.
-	/// The range of component `d` is `[200, 400]`.
-	fn elect_queued(a: u32, d: u32, ) -> Weight {
-		// Proof Size summary in bytes:
-		//  Measured:  `832 + a * (1152 ±0) + d * (47 ±0)`
-		//  Estimated: `4282 + a * (1152 ±0) + d * (48 ±0)`
-		// Minimum execution time: 598_364_000 picoseconds.
-		Weight::from_parts(3_028_177, 0)
-			.saturating_add(Weight::from_parts(0, 4282))
-			// Standard Error: 29_462
-			.saturating_add(Weight::from_parts(1_292_240, 0).saturating_mul(a.into()))
-			// Standard Error: 44_163
-			.saturating_add(Weight::from_parts(113_479, 0).saturating_mul(d.into()))
-			.saturating_add(T::DbWeight::get().reads(8))
-			.saturating_add(T::DbWeight::get().writes(9))
-			.saturating_add(Weight::from_parts(0, 1152).saturating_mul(a.into()))
-			.saturating_add(Weight::from_parts(0, 48).saturating_mul(d.into()))
-	}
-	/// Storage: ElectionProviderMultiPhase CurrentPhase (r:1 w:0)
-	/// Proof Skipped: ElectionProviderMultiPhase CurrentPhase (max_values: Some(1), max_size: None, mode: Measured)
-	/// Storage: ElectionProviderMultiPhase SnapshotMetadata (r:1 w:0)
-	/// Proof Skipped: ElectionProviderMultiPhase SnapshotMetadata (max_values: Some(1), max_size: None, mode: Measured)
-	/// Storage: TransactionPayment NextFeeMultiplier (r:1 w:0)
-	/// Proof: TransactionPayment NextFeeMultiplier (max_values: Some(1), max_size: Some(16), added: 511, mode: MaxEncodedLen)
-	/// Storage: ElectionProviderMultiPhase SignedSubmissionIndices (r:1 w:1)
-	/// Proof Skipped: ElectionProviderMultiPhase SignedSubmissionIndices (max_values: Some(1), max_size: None, mode: Measured)
-	/// Storage: ElectionProviderMultiPhase SignedSubmissionNextIndex (r:1 w:1)
-	/// Proof Skipped: ElectionProviderMultiPhase SignedSubmissionNextIndex (max_values: Some(1), max_size: None, mode: Measured)
-	/// Storage: ElectionProviderMultiPhase SignedSubmissionsMap (r:0 w:1)
-	/// Proof Skipped: ElectionProviderMultiPhase SignedSubmissionsMap (max_values: None, max_size: None, mode: Measured)
-	fn submit() -> Weight {
-		// Proof Size summary in bytes:
-		//  Measured:  `1170`
-		//  Estimated: `2655`
-		// Minimum execution time: 50_887_000 picoseconds.
-		Weight::from_parts(53_335_000, 0)
-			.saturating_add(Weight::from_parts(0, 2655))
-			.saturating_add(T::DbWeight::get().reads(5))
-			.saturating_add(T::DbWeight::get().writes(3))
-	}
-	/// Storage: ElectionProviderMultiPhase CurrentPhase (r:1 w:0)
-	/// Proof Skipped: ElectionProviderMultiPhase CurrentPhase (max_values: Some(1), max_size: None, mode: Measured)
-	/// Storage: ElectionProviderMultiPhase Round (r:1 w:0)
-	/// Proof Skipped: ElectionProviderMultiPhase Round (max_values: Some(1), max_size: None, mode: Measured)
-	/// Storage: ElectionProviderMultiPhase DesiredTargets (r:1 w:0)
-	/// Proof Skipped: ElectionProviderMultiPhase DesiredTargets (max_values: Some(1), max_size: None, mode: Measured)
-	/// Storage: ElectionProviderMultiPhase QueuedSolution (r:1 w:1)
-	/// Proof Skipped: ElectionProviderMultiPhase QueuedSolution (max_values: Some(1), max_size: None, mode: Measured)
-	/// Storage: ElectionProviderMultiPhase SnapshotMetadata (r:1 w:0)
-	/// Proof Skipped: ElectionProviderMultiPhase SnapshotMetadata (max_values: Some(1), max_size: None, mode: Measured)
-	/// Storage: ElectionProviderMultiPhase Snapshot (r:1 w:0)
-	/// Proof Skipped: ElectionProviderMultiPhase Snapshot (max_values: Some(1), max_size: None, mode: Measured)
-	/// Storage: ElectionProviderMultiPhase MinimumUntrustedScore (r:1 w:0)
-	/// Proof Skipped: ElectionProviderMultiPhase MinimumUntrustedScore (max_values: Some(1), max_size: None, mode: Measured)
-	/// The range of component `v` is `[1000, 2000]`.
-	/// The range of component `t` is `[500, 1000]`.
-	/// The range of component `a` is `[500, 800]`.
-	/// The range of component `d` is `[200, 400]`.
-	fn submit_unsigned(v: u32, t: u32, a: u32, _d: u32, ) -> Weight {
-		// Proof Size summary in bytes:
-		//  Measured:  `185 + t * (32 ±0) + v * (809 ±0)`
-		//  Estimated: `1670 + t * (32 ±0) + v * (809 ±0)`
-		// Minimum execution time: 9_246_269_000 picoseconds.
-		Weight::from_parts(9_558_256_000, 0)
-			.saturating_add(Weight::from_parts(0, 1670))
-			// Standard Error: 40_767
-			.saturating_add(Weight::from_parts(476_361, 0).saturating_mul(v.into()))
-			// Standard Error: 120_810
-			.saturating_add(Weight::from_parts(7_762_441, 0).saturating_mul(a.into()))
-			.saturating_add(T::DbWeight::get().reads(7))
-			.saturating_add(T::DbWeight::get().writes(1))
-			.saturating_add(Weight::from_parts(0, 32).saturating_mul(t.into()))
-			.saturating_add(Weight::from_parts(0, 809).saturating_mul(v.into()))
-	}
-	/// Storage: ElectionProviderMultiPhase DesiredTargets (r:1 w:0)
-	/// Proof Skipped: ElectionProviderMultiPhase DesiredTargets (max_values: Some(1), max_size: None, mode: Measured)
-	/// Storage: ElectionProviderMultiPhase Snapshot (r:1 w:0)
-	/// Proof Skipped: ElectionProviderMultiPhase Snapshot (max_values: Some(1), max_size: None, mode: Measured)
-	/// Storage: ElectionProviderMultiPhase Round (r:1 w:0)
-	/// Proof Skipped: ElectionProviderMultiPhase Round (max_values: Some(1), max_size: None, mode: Measured)
-	/// Storage: ElectionProviderMultiPhase MinimumUntrustedScore (r:1 w:0)
-	/// Proof Skipped: ElectionProviderMultiPhase MinimumUntrustedScore (max_values: Some(1), max_size: None, mode: Measured)
-	/// The range of component `v` is `[1000, 2000]`.
-	/// The range of component `t` is `[500, 1000]`.
-	/// The range of component `a` is `[500, 800]`.
-	/// The range of component `d` is `[200, 400]`.
-	fn feasibility_check(v: u32, t: u32, a: u32, _d: u32, ) -> Weight {
-		// Proof Size summary in bytes:
-		//  Measured:  `160 + t * (32 ±0) + v * (809 ±0)`
-		//  Estimated: `1645 + t * (32 ±0) + v * (809 ±0)`
-		// Minimum execution time: 7_414_707_000 picoseconds.
-		Weight::from_parts(7_699_413_000, 0)
-			.saturating_add(Weight::from_parts(0, 1645))
-			// Standard Error: 29_542
-			.saturating_add(Weight::from_parts(312_856, 0).saturating_mul(v.into()))
-			// Standard Error: 87_545
-			.saturating_add(Weight::from_parts(5_993_730, 0).saturating_mul(a.into()))
-			.saturating_add(T::DbWeight::get().reads(4))
-			.saturating_add(Weight::from_parts(0, 32).saturating_mul(t.into()))
-			.saturating_add(Weight::from_parts(0, 809).saturating_mul(v.into()))
-	}
-}
diff --git a/polkadot/runtime/kusama/src/weights/pallet_elections_phragmen.rs b/polkadot/runtime/kusama/src/weights/pallet_elections_phragmen.rs
deleted file mode 100644
index a5c1c4dfd3d0ee5b34d98c935c6d3c10a46aa429..0000000000000000000000000000000000000000
--- a/polkadot/runtime/kusama/src/weights/pallet_elections_phragmen.rs
+++ /dev/null
@@ -1,303 +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/>.
-//! Autogenerated weights for `pallet_elections_phragmen`
-//!
-//! THIS FILE WAS AUTO-GENERATED USING THE SUBSTRATE BENCHMARK CLI VERSION 4.0.0-dev
-//! DATE: 2023-03-16, STEPS: `50`, REPEAT: `20`, LOW RANGE: `[]`, HIGH RANGE: `[]`
-//! WORST CASE MAP SIZE: `1000000`
-//! HOSTNAME: `bm5`, CPU: `Intel(R) Core(TM) i7-7700K CPU @ 4.20GHz`
-//! EXECUTION: Some(Wasm), WASM-EXECUTION: Compiled, CHAIN: Some("kusama-dev"), DB CACHE: 1024
-
-// Executed Command:
-// ./target/production/polkadot
-// benchmark
-// pallet
-// --chain=kusama-dev
-// --steps=50
-// --repeat=20
-// --pallet=pallet_elections_phragmen
-// --extrinsic=*
-// --execution=wasm
-// --wasm-execution=compiled
-// --header=./file_header.txt
-// --output=./runtime/kusama/src/weights/
-
-#![cfg_attr(rustfmt, rustfmt_skip)]
-#![allow(unused_parens)]
-#![allow(unused_imports)]
-
-use frame_support::{traits::Get, weights::Weight};
-use sp_std::marker::PhantomData;
-
-/// Weight functions for `pallet_elections_phragmen`.
-pub struct WeightInfo<T>(PhantomData<T>);
-impl<T: frame_system::Config> pallet_elections_phragmen::WeightInfo for WeightInfo<T> {
-	/// Storage: PhragmenElection Candidates (r:1 w:0)
-	/// Proof Skipped: PhragmenElection Candidates (max_values: Some(1), max_size: None, mode: Measured)
-	/// Storage: PhragmenElection Members (r:1 w:0)
-	/// Proof Skipped: PhragmenElection Members (max_values: Some(1), max_size: None, mode: Measured)
-	/// Storage: PhragmenElection RunnersUp (r:1 w:0)
-	/// Proof Skipped: PhragmenElection RunnersUp (max_values: Some(1), max_size: None, mode: Measured)
-	/// Storage: PhragmenElection Voting (r:1 w:1)
-	/// Proof Skipped: PhragmenElection Voting (max_values: None, max_size: None, mode: Measured)
-	/// Storage: Balances Locks (r:1 w:1)
-	/// Proof: Balances Locks (max_values: None, max_size: Some(1299), added: 3774, mode: MaxEncodedLen)
-	/// The range of component `v` is `[1, 16]`.
-	fn vote_equal(v: u32, ) -> Weight {
-		// Proof Size summary in bytes:
-		//  Measured:  `403 + v * (80 ±0)`
-		//  Estimated: `14292 + v * (320 ±0)`
-		// Minimum execution time: 27_353_000 picoseconds.
-		Weight::from_parts(28_103_445, 0)
-			.saturating_add(Weight::from_parts(0, 14292))
-			// Standard Error: 4_556
-			.saturating_add(Weight::from_parts(117_766, 0).saturating_mul(v.into()))
-			.saturating_add(T::DbWeight::get().reads(5))
-			.saturating_add(T::DbWeight::get().writes(2))
-			.saturating_add(Weight::from_parts(0, 320).saturating_mul(v.into()))
-	}
-	/// Storage: PhragmenElection Candidates (r:1 w:0)
-	/// Proof Skipped: PhragmenElection Candidates (max_values: Some(1), max_size: None, mode: Measured)
-	/// Storage: PhragmenElection Members (r:1 w:0)
-	/// Proof Skipped: PhragmenElection Members (max_values: Some(1), max_size: None, mode: Measured)
-	/// Storage: PhragmenElection RunnersUp (r:1 w:0)
-	/// Proof Skipped: PhragmenElection RunnersUp (max_values: Some(1), max_size: None, mode: Measured)
-	/// Storage: PhragmenElection Voting (r:1 w:1)
-	/// Proof Skipped: PhragmenElection Voting (max_values: None, max_size: None, mode: Measured)
-	/// Storage: Balances Locks (r:1 w:1)
-	/// Proof: Balances Locks (max_values: None, max_size: Some(1299), added: 3774, mode: MaxEncodedLen)
-	/// The range of component `v` is `[2, 16]`.
-	fn vote_more(v: u32, ) -> Weight {
-		// Proof Size summary in bytes:
-		//  Measured:  `371 + v * (80 ±0)`
-		//  Estimated: `14164 + v * (320 ±0)`
-		// Minimum execution time: 36_885_000 picoseconds.
-		Weight::from_parts(37_769_975, 0)
-			.saturating_add(Weight::from_parts(0, 14164))
-			// Standard Error: 6_586
-			.saturating_add(Weight::from_parts(123_567, 0).saturating_mul(v.into()))
-			.saturating_add(T::DbWeight::get().reads(5))
-			.saturating_add(T::DbWeight::get().writes(2))
-			.saturating_add(Weight::from_parts(0, 320).saturating_mul(v.into()))
-	}
-	/// Storage: PhragmenElection Candidates (r:1 w:0)
-	/// Proof Skipped: PhragmenElection Candidates (max_values: Some(1), max_size: None, mode: Measured)
-	/// Storage: PhragmenElection Members (r:1 w:0)
-	/// Proof Skipped: PhragmenElection Members (max_values: Some(1), max_size: None, mode: Measured)
-	/// Storage: PhragmenElection RunnersUp (r:1 w:0)
-	/// Proof Skipped: PhragmenElection RunnersUp (max_values: Some(1), max_size: None, mode: Measured)
-	/// Storage: PhragmenElection Voting (r:1 w:1)
-	/// Proof Skipped: PhragmenElection Voting (max_values: None, max_size: None, mode: Measured)
-	/// Storage: Balances Locks (r:1 w:1)
-	/// Proof: Balances Locks (max_values: None, max_size: Some(1299), added: 3774, mode: MaxEncodedLen)
-	/// The range of component `v` is `[2, 16]`.
-	fn vote_less(v: u32, ) -> Weight {
-		// Proof Size summary in bytes:
-		//  Measured:  `403 + v * (80 ±0)`
-		//  Estimated: `14292 + v * (320 ±0)`
-		// Minimum execution time: 36_610_000 picoseconds.
-		Weight::from_parts(37_524_808, 0)
-			.saturating_add(Weight::from_parts(0, 14292))
-			// Standard Error: 6_164
-			.saturating_add(Weight::from_parts(147_944, 0).saturating_mul(v.into()))
-			.saturating_add(T::DbWeight::get().reads(5))
-			.saturating_add(T::DbWeight::get().writes(2))
-			.saturating_add(Weight::from_parts(0, 320).saturating_mul(v.into()))
-	}
-	/// Storage: PhragmenElection Voting (r:1 w:1)
-	/// Proof Skipped: PhragmenElection Voting (max_values: None, max_size: None, mode: Measured)
-	/// Storage: Balances Locks (r:1 w:1)
-	/// Proof: Balances Locks (max_values: None, max_size: Some(1299), added: 3774, mode: MaxEncodedLen)
-	fn remove_voter() -> Weight {
-		// Proof Size summary in bytes:
-		//  Measured:  `925`
-		//  Estimated: `9154`
-		// Minimum execution time: 33_052_000 picoseconds.
-		Weight::from_parts(33_677_000, 0)
-			.saturating_add(Weight::from_parts(0, 9154))
-			.saturating_add(T::DbWeight::get().reads(2))
-			.saturating_add(T::DbWeight::get().writes(2))
-	}
-	/// Storage: PhragmenElection Candidates (r:1 w:1)
-	/// Proof Skipped: PhragmenElection Candidates (max_values: Some(1), max_size: None, mode: Measured)
-	/// Storage: PhragmenElection Members (r:1 w:0)
-	/// Proof Skipped: PhragmenElection Members (max_values: Some(1), max_size: None, mode: Measured)
-	/// Storage: PhragmenElection RunnersUp (r:1 w:0)
-	/// Proof Skipped: PhragmenElection RunnersUp (max_values: Some(1), max_size: None, mode: Measured)
-	/// The range of component `c` is `[1, 1000]`.
-	fn submit_candidacy(c: u32, ) -> Weight {
-		// Proof Size summary in bytes:
-		//  Measured:  `2712 + c * (48 ±0)`
-		//  Estimated: `12585 + c * (144 ±0)`
-		// Minimum execution time: 32_163_000 picoseconds.
-		Weight::from_parts(24_757_419, 0)
-			.saturating_add(Weight::from_parts(0, 12585))
-			// Standard Error: 902
-			.saturating_add(Weight::from_parts(79_765, 0).saturating_mul(c.into()))
-			.saturating_add(T::DbWeight::get().reads(3))
-			.saturating_add(T::DbWeight::get().writes(1))
-			.saturating_add(Weight::from_parts(0, 144).saturating_mul(c.into()))
-	}
-	/// Storage: PhragmenElection Candidates (r:1 w:1)
-	/// Proof Skipped: PhragmenElection Candidates (max_values: Some(1), max_size: None, mode: Measured)
-	/// The range of component `c` is `[1, 1000]`.
-	fn renounce_candidacy_candidate(c: u32, ) -> Weight {
-		// Proof Size summary in bytes:
-		//  Measured:  `284 + c * (48 ±0)`
-		//  Estimated: `1756 + c * (48 ±0)`
-		// Minimum execution time: 24_805_000 picoseconds.
-		Weight::from_parts(17_940_635, 0)
-			.saturating_add(Weight::from_parts(0, 1756))
-			// Standard Error: 888
-			.saturating_add(Weight::from_parts(59_369, 0).saturating_mul(c.into()))
-			.saturating_add(T::DbWeight::get().reads(1))
-			.saturating_add(T::DbWeight::get().writes(1))
-			.saturating_add(Weight::from_parts(0, 48).saturating_mul(c.into()))
-	}
-	/// Storage: PhragmenElection Members (r:1 w:1)
-	/// Proof Skipped: PhragmenElection Members (max_values: Some(1), max_size: None, mode: Measured)
-	/// Storage: PhragmenElection RunnersUp (r:1 w:1)
-	/// Proof Skipped: PhragmenElection RunnersUp (max_values: Some(1), max_size: None, mode: Measured)
-	/// Storage: Council Prime (r:1 w:1)
-	/// Proof Skipped: Council Prime (max_values: Some(1), max_size: None, mode: Measured)
-	/// Storage: Council Proposals (r:1 w:0)
-	/// Proof Skipped: Council Proposals (max_values: Some(1), max_size: None, mode: Measured)
-	/// Storage: Council Members (r:0 w:1)
-	/// Proof Skipped: Council Members (max_values: Some(1), max_size: None, mode: Measured)
-	fn renounce_candidacy_members() -> Weight {
-		// Proof Size summary in bytes:
-		//  Measured:  `2986`
-		//  Estimated: `20870`
-		// Minimum execution time: 42_908_000 picoseconds.
-		Weight::from_parts(43_409_000, 0)
-			.saturating_add(Weight::from_parts(0, 20870))
-			.saturating_add(T::DbWeight::get().reads(4))
-			.saturating_add(T::DbWeight::get().writes(4))
-	}
-	/// Storage: PhragmenElection RunnersUp (r:1 w:1)
-	/// Proof Skipped: PhragmenElection RunnersUp (max_values: Some(1), max_size: None, mode: Measured)
-	fn renounce_candidacy_runners_up() -> Weight {
-		// Proof Size summary in bytes:
-		//  Measured:  `1681`
-		//  Estimated: `3166`
-		// Minimum execution time: 27_419_000 picoseconds.
-		Weight::from_parts(27_912_000, 0)
-			.saturating_add(Weight::from_parts(0, 3166))
-			.saturating_add(T::DbWeight::get().reads(1))
-			.saturating_add(T::DbWeight::get().writes(1))
-	}
-	/// Storage: Benchmark Override (r:0 w:0)
-	/// Proof Skipped: Benchmark Override (max_values: None, max_size: None, mode: Measured)
-	fn remove_member_without_replacement() -> Weight {
-		// Proof Size summary in bytes:
-		//  Measured:  `0`
-		//  Estimated: `0`
-		// Minimum execution time: 2_000_000_000_000 picoseconds.
-		Weight::from_parts(2_000_000_000_000, 0)
-			.saturating_add(Weight::from_parts(0, 0))
-	}
-	/// Storage: PhragmenElection Members (r:1 w:1)
-	/// Proof Skipped: PhragmenElection Members (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: PhragmenElection RunnersUp (r:1 w:1)
-	/// Proof Skipped: PhragmenElection RunnersUp (max_values: Some(1), max_size: None, mode: Measured)
-	/// Storage: Council Prime (r:1 w:1)
-	/// Proof Skipped: Council Prime (max_values: Some(1), max_size: None, mode: Measured)
-	/// Storage: Council Proposals (r:1 w:0)
-	/// Proof Skipped: Council Proposals (max_values: Some(1), max_size: None, mode: Measured)
-	/// Storage: Council Members (r:0 w:1)
-	/// Proof Skipped: Council Members (max_values: Some(1), max_size: None, mode: Measured)
-	fn remove_member_with_replacement() -> Weight {
-		// Proof Size summary in bytes:
-		//  Measured:  `2986`
-		//  Estimated: `24463`
-		// Minimum execution time: 57_465_000 picoseconds.
-		Weight::from_parts(58_107_000, 0)
-			.saturating_add(Weight::from_parts(0, 24463))
-			.saturating_add(T::DbWeight::get().reads(5))
-			.saturating_add(T::DbWeight::get().writes(5))
-	}
-	/// Storage: PhragmenElection Voting (r:10001 w:10000)
-	/// Proof Skipped: PhragmenElection Voting (max_values: None, max_size: None, mode: Measured)
-	/// Storage: PhragmenElection Members (r:1 w:0)
-	/// Proof Skipped: PhragmenElection Members (max_values: Some(1), max_size: None, mode: Measured)
-	/// Storage: PhragmenElection RunnersUp (r:1 w:0)
-	/// Proof Skipped: PhragmenElection RunnersUp (max_values: Some(1), max_size: None, mode: Measured)
-	/// Storage: PhragmenElection Candidates (r:1 w:0)
-	/// Proof Skipped: PhragmenElection Candidates (max_values: Some(1), max_size: None, mode: Measured)
-	/// Storage: Balances Locks (r:10000 w:10000)
-	/// Proof: Balances Locks (max_values: None, max_size: Some(1299), added: 3774, mode: MaxEncodedLen)
-	/// Storage: System Account (r:10000 w:10000)
-	/// Proof: System Account (max_values: None, max_size: Some(128), added: 2603, mode: MaxEncodedLen)
-	/// The range of component `v` is `[5000, 10000]`.
-	/// The range of component `d` is `[0, 5000]`.
-	fn clean_defunct_voters(v: u32, _d: u32, ) -> Weight {
-		// Proof Size summary in bytes:
-		//  Measured:  `35989 + v * (808 ±0)`
-		//  Estimated: `154956 + v * (12084 ±0)`
-		// Minimum execution time: 319_677_473_000 picoseconds.
-		Weight::from_parts(320_382_361_000, 0)
-			.saturating_add(Weight::from_parts(0, 154956))
-			// Standard Error: 270_292
-			.saturating_add(Weight::from_parts(38_671_603, 0).saturating_mul(v.into()))
-			.saturating_add(T::DbWeight::get().reads(4))
-			.saturating_add(T::DbWeight::get().reads((3_u64).saturating_mul(v.into())))
-			.saturating_add(T::DbWeight::get().writes((3_u64).saturating_mul(v.into())))
-			.saturating_add(Weight::from_parts(0, 12084).saturating_mul(v.into()))
-	}
-	/// Storage: PhragmenElection Candidates (r:1 w:1)
-	/// Proof Skipped: PhragmenElection Candidates (max_values: Some(1), max_size: None, mode: Measured)
-	/// Storage: PhragmenElection Members (r:1 w:1)
-	/// Proof Skipped: PhragmenElection Members (max_values: Some(1), max_size: None, mode: Measured)
-	/// Storage: PhragmenElection RunnersUp (r:1 w:1)
-	/// Proof Skipped: PhragmenElection RunnersUp (max_values: Some(1), max_size: None, mode: Measured)
-	/// Storage: PhragmenElection Voting (r:10001 w:0)
-	/// Proof Skipped: PhragmenElection Voting (max_values: None, max_size: None, mode: Measured)
-	/// Storage: Council Proposals (r:1 w:0)
-	/// Proof Skipped: Council Proposals (max_values: Some(1), max_size: None, mode: Measured)
-	/// Storage: System Account (r:962 w:962)
-	/// Proof: System Account (max_values: None, max_size: Some(128), added: 2603, mode: MaxEncodedLen)
-	/// Storage: PhragmenElection ElectionRounds (r:1 w:1)
-	/// Proof Skipped: PhragmenElection ElectionRounds (max_values: Some(1), max_size: None, mode: Measured)
-	/// Storage: Council Members (r:0 w:1)
-	/// Proof Skipped: Council Members (max_values: Some(1), max_size: None, mode: Measured)
-	/// Storage: Council Prime (r:0 w:1)
-	/// Proof Skipped: Council Prime (max_values: Some(1), max_size: None, mode: Measured)
-	/// The range of component `c` is `[1, 1000]`.
-	/// The range of component `v` is `[1, 10000]`.
-	/// The range of component `e` is `[10000, 160000]`.
-	fn election_phragmen(c: u32, v: u32, e: u32, ) -> Weight {
-		// Proof Size summary in bytes:
-		//  Measured:  `0 + v * (607 ±0) + e * (28 ±0)`
-		//  Estimated: `4839313 + v * (5481 ±4) + e * (123 ±0) + c * (2560 ±0)`
-		// Minimum execution time: 30_795_431_000 picoseconds.
-		Weight::from_parts(30_861_700_000, 0)
-			.saturating_add(Weight::from_parts(0, 4839313))
-			// Standard Error: 482_348
-			.saturating_add(Weight::from_parts(37_626_560, 0).saturating_mul(v.into()))
-			// Standard Error: 30_954
-			.saturating_add(Weight::from_parts(2_016_889, 0).saturating_mul(e.into()))
-			.saturating_add(T::DbWeight::get().reads(265))
-			.saturating_add(T::DbWeight::get().reads((1_u64).saturating_mul(c.into())))
-			.saturating_add(T::DbWeight::get().reads((1_u64).saturating_mul(v.into())))
-			.saturating_add(T::DbWeight::get().writes(6))
-			.saturating_add(T::DbWeight::get().writes((1_u64).saturating_mul(c.into())))
-			.saturating_add(Weight::from_parts(0, 5481).saturating_mul(v.into()))
-			.saturating_add(Weight::from_parts(0, 123).saturating_mul(e.into()))
-			.saturating_add(Weight::from_parts(0, 2560).saturating_mul(c.into()))
-	}
-}
diff --git a/polkadot/runtime/kusama/src/weights/pallet_fast_unstake.rs b/polkadot/runtime/kusama/src/weights/pallet_fast_unstake.rs
deleted file mode 100644
index 34fec8e784f73538d5d9cddbc948e989c70b5455..0000000000000000000000000000000000000000
--- a/polkadot/runtime/kusama/src/weights/pallet_fast_unstake.rs
+++ /dev/null
@@ -1,203 +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/>.
-
-//! Autogenerated weights for `pallet_fast_unstake`
-//!
-//! THIS FILE WAS AUTO-GENERATED USING THE SUBSTRATE BENCHMARK CLI VERSION 4.0.0-dev
-//! DATE: 2023-06-19, STEPS: `50`, REPEAT: `20`, LOW RANGE: `[]`, HIGH RANGE: `[]`
-//! WORST CASE MAP SIZE: `1000000`
-//! HOSTNAME: `runner-e8ezs4ez-project-163-concurrent-0`, CPU: `Intel(R) Xeon(R) CPU @ 2.60GHz`
-//! EXECUTION: Some(Wasm), WASM-EXECUTION: Compiled, CHAIN: Some("kusama-dev"), DB CACHE: 1024
-
-// Executed Command:
-// ./target/production/polkadot
-// benchmark
-// pallet
-// --chain=kusama-dev
-// --steps=50
-// --repeat=20
-// --no-storage-info
-// --no-median-slopes
-// --no-min-squares
-// --pallet=pallet_fast_unstake
-// --extrinsic=*
-// --execution=wasm
-// --wasm-execution=compiled
-// --header=./file_header.txt
-// --output=./runtime/kusama/src/weights/
-
-#![cfg_attr(rustfmt, rustfmt_skip)]
-#![allow(unused_parens)]
-#![allow(unused_imports)]
-#![allow(missing_docs)]
-
-use frame_support::{traits::Get, weights::Weight};
-use core::marker::PhantomData;
-
-/// Weight functions for `pallet_fast_unstake`.
-pub struct WeightInfo<T>(PhantomData<T>);
-impl<T: frame_system::Config> pallet_fast_unstake::WeightInfo for WeightInfo<T> {
-	/// Storage: FastUnstake ErasToCheckPerBlock (r:1 w:0)
-	/// Proof: FastUnstake ErasToCheckPerBlock (max_values: Some(1), max_size: Some(4), added: 499, mode: MaxEncodedLen)
-	/// Storage: Staking ValidatorCount (r:1 w:0)
-	/// Proof: Staking ValidatorCount (max_values: Some(1), max_size: Some(4), added: 499, mode: MaxEncodedLen)
-	/// Storage: FastUnstake Head (r:1 w:1)
-	/// Proof: FastUnstake Head (max_values: Some(1), max_size: Some(3191), added: 3686, mode: MaxEncodedLen)
-	/// Storage: FastUnstake CounterForQueue (r:1 w:0)
-	/// Proof: FastUnstake CounterForQueue (max_values: Some(1), max_size: Some(4), added: 499, mode: MaxEncodedLen)
-	/// Storage: ElectionProviderMultiPhase CurrentPhase (r:1 w:0)
-	/// Proof Skipped: ElectionProviderMultiPhase CurrentPhase (max_values: Some(1), max_size: None, mode: Measured)
-	/// Storage: Staking CurrentEra (r:1 w:0)
-	/// Proof: Staking CurrentEra (max_values: Some(1), max_size: Some(4), added: 499, mode: MaxEncodedLen)
-	/// Storage: Staking SlashingSpans (r:64 w:0)
-	/// Proof Skipped: Staking SlashingSpans (max_values: None, max_size: None, mode: Measured)
-	/// Storage: Staking Bonded (r:64 w:64)
-	/// Proof: Staking Bonded (max_values: None, max_size: Some(72), added: 2547, mode: MaxEncodedLen)
-	/// Storage: Staking Validators (r:64 w:0)
-	/// Proof: Staking Validators (max_values: None, max_size: Some(45), added: 2520, mode: MaxEncodedLen)
-	/// Storage: Staking Nominators (r:64 w:0)
-	/// Proof: Staking Nominators (max_values: None, max_size: Some(814), added: 3289, mode: MaxEncodedLen)
-	/// Storage: System Account (r:64 w:64)
-	/// Proof: System Account (max_values: None, max_size: Some(128), added: 2603, mode: MaxEncodedLen)
-	/// Storage: Balances Locks (r:64 w:64)
-	/// Proof: Balances Locks (max_values: None, max_size: Some(1299), added: 3774, mode: MaxEncodedLen)
-	/// Storage: Balances Freezes (r:64 w:0)
-	/// Proof: Balances Freezes (max_values: None, max_size: Some(49), added: 2524, mode: MaxEncodedLen)
-	/// Storage: Staking Ledger (r:0 w:64)
-	/// Proof: Staking Ledger (max_values: None, max_size: Some(1091), added: 3566, mode: MaxEncodedLen)
-	/// Storage: Staking Payee (r:0 w:64)
-	/// Proof: Staking Payee (max_values: None, max_size: Some(73), added: 2548, mode: MaxEncodedLen)
-	/// The range of component `b` is `[1, 64]`.
-	fn on_idle_unstake(b: u32, ) -> Weight {
-		// Proof Size summary in bytes:
-		//  Measured:  `1176 + b * (343 ±0)`
-		//  Estimated: `4676 + b * (3774 ±0)`
-		// Minimum execution time: 90_522_000 picoseconds.
-		Weight::from_parts(30_621_885, 0)
-			.saturating_add(Weight::from_parts(0, 4676))
-			// Standard Error: 35_474
-			.saturating_add(Weight::from_parts(58_149_619, 0).saturating_mul(b.into()))
-			.saturating_add(T::DbWeight::get().reads(6))
-			.saturating_add(T::DbWeight::get().reads((7_u64).saturating_mul(b.into())))
-			.saturating_add(T::DbWeight::get().writes(1))
-			.saturating_add(T::DbWeight::get().writes((5_u64).saturating_mul(b.into())))
-			.saturating_add(Weight::from_parts(0, 3774).saturating_mul(b.into()))
-	}
-	/// Storage: FastUnstake ErasToCheckPerBlock (r:1 w:0)
-	/// Proof: FastUnstake ErasToCheckPerBlock (max_values: Some(1), max_size: Some(4), added: 499, mode: MaxEncodedLen)
-	/// Storage: Staking ValidatorCount (r:1 w:0)
-	/// Proof: Staking ValidatorCount (max_values: Some(1), max_size: Some(4), added: 499, mode: MaxEncodedLen)
-	/// Storage: FastUnstake Head (r:1 w:1)
-	/// Proof: FastUnstake Head (max_values: Some(1), max_size: Some(3191), added: 3686, mode: MaxEncodedLen)
-	/// Storage: FastUnstake CounterForQueue (r:1 w:0)
-	/// Proof: FastUnstake CounterForQueue (max_values: Some(1), max_size: Some(4), added: 499, mode: MaxEncodedLen)
-	/// Storage: ElectionProviderMultiPhase CurrentPhase (r:1 w:0)
-	/// Proof Skipped: ElectionProviderMultiPhase CurrentPhase (max_values: Some(1), max_size: None, mode: Measured)
-	/// Storage: Staking CurrentEra (r:1 w:0)
-	/// Proof: Staking CurrentEra (max_values: Some(1), max_size: Some(4), added: 499, mode: MaxEncodedLen)
-	/// Storage: Staking ErasStakers (r:257 w:0)
-	/// Proof Skipped: Staking ErasStakers (max_values: None, max_size: None, mode: Measured)
-	/// The range of component `v` is `[1, 256]`.
-	/// The range of component `b` is `[1, 64]`.
-	fn on_idle_check(v: u32, b: u32, ) -> Weight {
-		// Proof Size summary in bytes:
-		//  Measured:  `1344 + b * (48 ±0) + v * (18487 ±0)`
-		//  Estimated: `4676 + b * (49 ±0) + v * (20963 ±0)`
-		// Minimum execution time: 1_633_429_000 picoseconds.
-		Weight::from_parts(1_647_031_000, 0)
-			.saturating_add(Weight::from_parts(0, 4676))
-			// Standard Error: 14_231_088
-			.saturating_add(Weight::from_parts(454_485_752, 0).saturating_mul(v.into()))
-			// Standard Error: 56_940_204
-			.saturating_add(Weight::from_parts(1_784_096_716, 0).saturating_mul(b.into()))
-			.saturating_add(T::DbWeight::get().reads(7))
-			.saturating_add(T::DbWeight::get().reads((1_u64).saturating_mul(v.into())))
-			.saturating_add(T::DbWeight::get().writes(1))
-			.saturating_add(Weight::from_parts(0, 49).saturating_mul(b.into()))
-			.saturating_add(Weight::from_parts(0, 20963).saturating_mul(v.into()))
-	}
-	/// Storage: FastUnstake ErasToCheckPerBlock (r:1 w:0)
-	/// Proof: FastUnstake ErasToCheckPerBlock (max_values: Some(1), max_size: Some(4), added: 499, mode: MaxEncodedLen)
-	/// Storage: Staking Ledger (r:1 w:1)
-	/// Proof: Staking Ledger (max_values: None, max_size: Some(1091), added: 3566, mode: MaxEncodedLen)
-	/// Storage: FastUnstake Queue (r:1 w:1)
-	/// Proof: FastUnstake Queue (max_values: None, max_size: Some(56), added: 2531, mode: MaxEncodedLen)
-	/// Storage: FastUnstake Head (r:1 w:0)
-	/// Proof: FastUnstake Head (max_values: Some(1), max_size: Some(3191), added: 3686, mode: MaxEncodedLen)
-	/// Storage: Staking Bonded (r:1 w:0)
-	/// Proof: Staking Bonded (max_values: None, max_size: Some(72), added: 2547, mode: MaxEncodedLen)
-	/// Storage: Staking Validators (r:1 w:0)
-	/// Proof: Staking Validators (max_values: None, max_size: Some(45), added: 2520, mode: MaxEncodedLen)
-	/// Storage: Staking Nominators (r:1 w:1)
-	/// Proof: Staking Nominators (max_values: None, max_size: Some(814), added: 3289, mode: MaxEncodedLen)
-	/// Storage: Staking CounterForNominators (r:1 w:1)
-	/// Proof: Staking CounterForNominators (max_values: Some(1), max_size: Some(4), added: 499, mode: MaxEncodedLen)
-	/// Storage: VoterList ListNodes (r:1 w:1)
-	/// Proof: VoterList ListNodes (max_values: None, max_size: Some(154), added: 2629, mode: MaxEncodedLen)
-	/// Storage: VoterList ListBags (r:1 w:1)
-	/// Proof: VoterList ListBags (max_values: None, max_size: Some(82), added: 2557, mode: MaxEncodedLen)
-	/// Storage: VoterList CounterForListNodes (r:1 w:1)
-	/// Proof: VoterList CounterForListNodes (max_values: Some(1), max_size: Some(4), added: 499, mode: MaxEncodedLen)
-	/// Storage: Staking CurrentEra (r:1 w:0)
-	/// Proof: Staking CurrentEra (max_values: Some(1), max_size: Some(4), added: 499, mode: MaxEncodedLen)
-	/// Storage: Balances Locks (r:1 w:1)
-	/// Proof: Balances Locks (max_values: None, max_size: Some(1299), added: 3774, mode: MaxEncodedLen)
-	/// Storage: Balances Freezes (r:1 w:0)
-	/// Proof: Balances Freezes (max_values: None, max_size: Some(49), added: 2524, mode: MaxEncodedLen)
-	/// Storage: FastUnstake CounterForQueue (r:1 w:1)
-	/// Proof: FastUnstake CounterForQueue (max_values: Some(1), max_size: Some(4), added: 499, mode: MaxEncodedLen)
-	fn register_fast_unstake() -> Weight {
-		// Proof Size summary in bytes:
-		//  Measured:  `1826`
-		//  Estimated: `4764`
-		// Minimum execution time: 120_577_000 picoseconds.
-		Weight::from_parts(123_610_000, 0)
-			.saturating_add(Weight::from_parts(0, 4764))
-			.saturating_add(T::DbWeight::get().reads(15))
-			.saturating_add(T::DbWeight::get().writes(9))
-	}
-	/// Storage: FastUnstake ErasToCheckPerBlock (r:1 w:0)
-	/// Proof: FastUnstake ErasToCheckPerBlock (max_values: Some(1), max_size: Some(4), added: 499, mode: MaxEncodedLen)
-	/// Storage: Staking Ledger (r:1 w:0)
-	/// Proof: Staking Ledger (max_values: None, max_size: Some(1091), added: 3566, mode: MaxEncodedLen)
-	/// Storage: FastUnstake Queue (r:1 w:1)
-	/// Proof: FastUnstake Queue (max_values: None, max_size: Some(56), added: 2531, mode: MaxEncodedLen)
-	/// Storage: FastUnstake Head (r:1 w:0)
-	/// Proof: FastUnstake Head (max_values: Some(1), max_size: Some(3191), added: 3686, mode: MaxEncodedLen)
-	/// Storage: FastUnstake CounterForQueue (r:1 w:1)
-	/// Proof: FastUnstake CounterForQueue (max_values: Some(1), max_size: Some(4), added: 499, mode: MaxEncodedLen)
-	fn deregister() -> Weight {
-		// Proof Size summary in bytes:
-		//  Measured:  `1084`
-		//  Estimated: `4676`
-		// Minimum execution time: 42_258_000 picoseconds.
-		Weight::from_parts(43_647_000, 0)
-			.saturating_add(Weight::from_parts(0, 4676))
-			.saturating_add(T::DbWeight::get().reads(5))
-			.saturating_add(T::DbWeight::get().writes(2))
-	}
-	/// Storage: FastUnstake ErasToCheckPerBlock (r:0 w:1)
-	/// Proof: FastUnstake ErasToCheckPerBlock (max_values: Some(1), max_size: Some(4), added: 499, mode: MaxEncodedLen)
-	fn control() -> Weight {
-		// Proof Size summary in bytes:
-		//  Measured:  `0`
-		//  Estimated: `0`
-		// Minimum execution time: 2_524_000 picoseconds.
-		Weight::from_parts(2_654_000, 0)
-			.saturating_add(Weight::from_parts(0, 0))
-			.saturating_add(T::DbWeight::get().writes(1))
-	}
-}
diff --git a/polkadot/runtime/kusama/src/weights/pallet_identity.rs b/polkadot/runtime/kusama/src/weights/pallet_identity.rs
deleted file mode 100644
index f4952db592b421cd67fd61b802c1ddc7a431780f..0000000000000000000000000000000000000000
--- a/polkadot/runtime/kusama/src/weights/pallet_identity.rs
+++ /dev/null
@@ -1,359 +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/>.
-
-//! Autogenerated weights for `pallet_identity`
-//!
-//! THIS FILE WAS AUTO-GENERATED USING THE SUBSTRATE BENCHMARK CLI VERSION 4.0.0-dev
-//! DATE: 2023-06-19, STEPS: `50`, REPEAT: `20`, LOW RANGE: `[]`, HIGH RANGE: `[]`
-//! WORST CASE MAP SIZE: `1000000`
-//! HOSTNAME: `runner-e8ezs4ez-project-163-concurrent-0`, CPU: `Intel(R) Xeon(R) CPU @ 2.60GHz`
-//! EXECUTION: Some(Wasm), WASM-EXECUTION: Compiled, CHAIN: Some("kusama-dev"), DB CACHE: 1024
-
-// Executed Command:
-// ./target/production/polkadot
-// benchmark
-// pallet
-// --chain=kusama-dev
-// --steps=50
-// --repeat=20
-// --no-storage-info
-// --no-median-slopes
-// --no-min-squares
-// --pallet=pallet_identity
-// --extrinsic=*
-// --execution=wasm
-// --wasm-execution=compiled
-// --header=./file_header.txt
-// --output=./runtime/kusama/src/weights/
-
-#![cfg_attr(rustfmt, rustfmt_skip)]
-#![allow(unused_parens)]
-#![allow(unused_imports)]
-#![allow(missing_docs)]
-
-use frame_support::{traits::Get, weights::Weight};
-use core::marker::PhantomData;
-
-/// Weight functions for `pallet_identity`.
-pub struct WeightInfo<T>(PhantomData<T>);
-impl<T: frame_system::Config> pallet_identity::WeightInfo for WeightInfo<T> {
-	/// Storage: Identity Registrars (r:1 w:1)
-	/// Proof: Identity Registrars (max_values: Some(1), max_size: Some(1141), added: 1636, mode: MaxEncodedLen)
-	/// The range of component `r` is `[1, 19]`.
-	fn add_registrar(r: u32, ) -> Weight {
-		// Proof Size summary in bytes:
-		//  Measured:  `32 + r * (57 ±0)`
-		//  Estimated: `2626`
-		// Minimum execution time: 11_854_000 picoseconds.
-		Weight::from_parts(12_968_221, 0)
-			.saturating_add(Weight::from_parts(0, 2626))
-			// Standard Error: 5_813
-			.saturating_add(Weight::from_parts(102_873, 0).saturating_mul(r.into()))
-			.saturating_add(T::DbWeight::get().reads(1))
-			.saturating_add(T::DbWeight::get().writes(1))
-	}
-	/// Storage: Identity IdentityOf (r:1 w:1)
-	/// Proof: Identity IdentityOf (max_values: None, max_size: Some(7538), added: 10013, mode: MaxEncodedLen)
-	/// The range of component `r` is `[1, 20]`.
-	/// The range of component `x` is `[0, 100]`.
-	fn set_identity(r: u32, x: u32, ) -> Weight {
-		// Proof Size summary in bytes:
-		//  Measured:  `442 + r * (5 ±0)`
-		//  Estimated: `11003`
-		// Minimum execution time: 32_800_000 picoseconds.
-		Weight::from_parts(28_706_621, 0)
-			.saturating_add(Weight::from_parts(0, 11003))
-			// Standard Error: 12_190
-			.saturating_add(Weight::from_parts(261_969, 0).saturating_mul(r.into()))
-			// Standard Error: 2_378
-			.saturating_add(Weight::from_parts(500_617, 0).saturating_mul(x.into()))
-			.saturating_add(T::DbWeight::get().reads(1))
-			.saturating_add(T::DbWeight::get().writes(1))
-	}
-	/// Storage: Identity IdentityOf (r:1 w:0)
-	/// Proof: Identity IdentityOf (max_values: None, max_size: Some(7538), added: 10013, mode: MaxEncodedLen)
-	/// Storage: Identity SubsOf (r:1 w:1)
-	/// Proof: Identity SubsOf (max_values: None, max_size: Some(3258), added: 5733, mode: MaxEncodedLen)
-	/// Storage: Identity SuperOf (r:100 w:100)
-	/// Proof: Identity SuperOf (max_values: None, max_size: Some(114), added: 2589, mode: MaxEncodedLen)
-	/// The range of component `s` is `[0, 100]`.
-	fn set_subs_new(s: u32, ) -> Weight {
-		// Proof Size summary in bytes:
-		//  Measured:  `101`
-		//  Estimated: `11003 + s * (2589 ±0)`
-		// Minimum execution time: 8_815_000 picoseconds.
-		Weight::from_parts(21_946_444, 0)
-			.saturating_add(Weight::from_parts(0, 11003))
-			// Standard Error: 5_757
-			.saturating_add(Weight::from_parts(3_241_262, 0).saturating_mul(s.into()))
-			.saturating_add(T::DbWeight::get().reads(2))
-			.saturating_add(T::DbWeight::get().reads((1_u64).saturating_mul(s.into())))
-			.saturating_add(T::DbWeight::get().writes(1))
-			.saturating_add(T::DbWeight::get().writes((1_u64).saturating_mul(s.into())))
-			.saturating_add(Weight::from_parts(0, 2589).saturating_mul(s.into()))
-	}
-	/// Storage: Identity IdentityOf (r:1 w:0)
-	/// Proof: Identity IdentityOf (max_values: None, max_size: Some(7538), added: 10013, mode: MaxEncodedLen)
-	/// Storage: Identity SubsOf (r:1 w:1)
-	/// Proof: Identity SubsOf (max_values: None, max_size: Some(3258), added: 5733, mode: MaxEncodedLen)
-	/// Storage: Identity SuperOf (r:0 w:100)
-	/// Proof: Identity SuperOf (max_values: None, max_size: Some(114), added: 2589, mode: MaxEncodedLen)
-	/// The range of component `p` is `[0, 100]`.
-	fn set_subs_old(p: u32, ) -> Weight {
-		// Proof Size summary in bytes:
-		//  Measured:  `194 + p * (32 ±0)`
-		//  Estimated: `11003`
-		// Minimum execution time: 8_892_000 picoseconds.
-		Weight::from_parts(21_343_974, 0)
-			.saturating_add(Weight::from_parts(0, 11003))
-			// Standard Error: 5_109
-			.saturating_add(Weight::from_parts(1_410_415, 0).saturating_mul(p.into()))
-			.saturating_add(T::DbWeight::get().reads(2))
-			.saturating_add(T::DbWeight::get().writes(1))
-			.saturating_add(T::DbWeight::get().writes((1_u64).saturating_mul(p.into())))
-	}
-	/// Storage: Identity SubsOf (r:1 w:1)
-	/// Proof: Identity SubsOf (max_values: None, max_size: Some(3258), added: 5733, mode: MaxEncodedLen)
-	/// Storage: Identity IdentityOf (r:1 w:1)
-	/// Proof: Identity IdentityOf (max_values: None, max_size: Some(7538), added: 10013, mode: MaxEncodedLen)
-	/// Storage: Identity SuperOf (r:0 w:100)
-	/// Proof: Identity SuperOf (max_values: None, max_size: Some(114), added: 2589, mode: MaxEncodedLen)
-	/// The range of component `r` is `[1, 20]`.
-	/// The range of component `s` is `[0, 100]`.
-	/// The range of component `x` is `[0, 100]`.
-	fn clear_identity(r: u32, s: u32, x: u32, ) -> Weight {
-		// Proof Size summary in bytes:
-		//  Measured:  `469 + r * (5 ±0) + s * (32 ±0) + x * (66 ±0)`
-		//  Estimated: `11003`
-		// Minimum execution time: 60_331_000 picoseconds.
-		Weight::from_parts(29_115_598, 0)
-			.saturating_add(Weight::from_parts(0, 11003))
-			// Standard Error: 21_877
-			.saturating_add(Weight::from_parts(216_644, 0).saturating_mul(r.into()))
-			// Standard Error: 4_272
-			.saturating_add(Weight::from_parts(1_420_433, 0).saturating_mul(s.into()))
-			// Standard Error: 4_272
-			.saturating_add(Weight::from_parts(311_436, 0).saturating_mul(x.into()))
-			.saturating_add(T::DbWeight::get().reads(2))
-			.saturating_add(T::DbWeight::get().writes(2))
-			.saturating_add(T::DbWeight::get().writes((1_u64).saturating_mul(s.into())))
-	}
-	/// Storage: Identity Registrars (r:1 w:0)
-	/// Proof: Identity Registrars (max_values: Some(1), max_size: Some(1141), added: 1636, mode: MaxEncodedLen)
-	/// Storage: Identity IdentityOf (r:1 w:1)
-	/// Proof: Identity IdentityOf (max_values: None, max_size: Some(7538), added: 10013, mode: MaxEncodedLen)
-	/// The range of component `r` is `[1, 20]`.
-	/// The range of component `x` is `[0, 100]`.
-	fn request_judgement(r: u32, x: u32, ) -> Weight {
-		// Proof Size summary in bytes:
-		//  Measured:  `367 + r * (57 ±0) + x * (66 ±0)`
-		//  Estimated: `11003`
-		// Minimum execution time: 33_470_000 picoseconds.
-		Weight::from_parts(32_277_730, 0)
-			.saturating_add(Weight::from_parts(0, 11003))
-			// Standard Error: 4_577
-			.saturating_add(Weight::from_parts(121_062, 0).saturating_mul(r.into()))
-			// Standard Error: 893
-			.saturating_add(Weight::from_parts(496_715, 0).saturating_mul(x.into()))
-			.saturating_add(T::DbWeight::get().reads(2))
-			.saturating_add(T::DbWeight::get().writes(1))
-	}
-	/// Storage: Identity IdentityOf (r:1 w:1)
-	/// Proof: Identity IdentityOf (max_values: None, max_size: Some(7538), added: 10013, mode: MaxEncodedLen)
-	/// The range of component `r` is `[1, 20]`.
-	/// The range of component `x` is `[0, 100]`.
-	fn cancel_request(r: u32, x: u32, ) -> Weight {
-		// Proof Size summary in bytes:
-		//  Measured:  `398 + x * (66 ±0)`
-		//  Estimated: `11003`
-		// Minimum execution time: 29_626_000 picoseconds.
-		Weight::from_parts(28_419_375, 0)
-			.saturating_add(Weight::from_parts(0, 11003))
-			// Standard Error: 5_566
-			.saturating_add(Weight::from_parts(143_337, 0).saturating_mul(r.into()))
-			// Standard Error: 1_086
-			.saturating_add(Weight::from_parts(487_332, 0).saturating_mul(x.into()))
-			.saturating_add(T::DbWeight::get().reads(1))
-			.saturating_add(T::DbWeight::get().writes(1))
-	}
-	/// Storage: Identity Registrars (r:1 w:1)
-	/// Proof: Identity Registrars (max_values: Some(1), max_size: Some(1141), added: 1636, mode: MaxEncodedLen)
-	/// The range of component `r` is `[1, 19]`.
-	fn set_fee(r: u32, ) -> Weight {
-		// Proof Size summary in bytes:
-		//  Measured:  `89 + r * (57 ±0)`
-		//  Estimated: `2626`
-		// Minimum execution time: 7_221_000 picoseconds.
-		Weight::from_parts(7_708_979, 0)
-			.saturating_add(Weight::from_parts(0, 2626))
-			// Standard Error: 1_516
-			.saturating_add(Weight::from_parts(101_163, 0).saturating_mul(r.into()))
-			.saturating_add(T::DbWeight::get().reads(1))
-			.saturating_add(T::DbWeight::get().writes(1))
-	}
-	/// Storage: Identity Registrars (r:1 w:1)
-	/// Proof: Identity Registrars (max_values: Some(1), max_size: Some(1141), added: 1636, mode: MaxEncodedLen)
-	/// The range of component `r` is `[1, 19]`.
-	fn set_account_id(r: u32, ) -> Weight {
-		// Proof Size summary in bytes:
-		//  Measured:  `89 + r * (57 ±0)`
-		//  Estimated: `2626`
-		// Minimum execution time: 7_288_000 picoseconds.
-		Weight::from_parts(7_757_754, 0)
-			.saturating_add(Weight::from_parts(0, 2626))
-			// Standard Error: 1_365
-			.saturating_add(Weight::from_parts(95_345, 0).saturating_mul(r.into()))
-			.saturating_add(T::DbWeight::get().reads(1))
-			.saturating_add(T::DbWeight::get().writes(1))
-	}
-	/// Storage: Identity Registrars (r:1 w:1)
-	/// Proof: Identity Registrars (max_values: Some(1), max_size: Some(1141), added: 1636, mode: MaxEncodedLen)
-	/// The range of component `r` is `[1, 19]`.
-	fn set_fields(r: u32, ) -> Weight {
-		// Proof Size summary in bytes:
-		//  Measured:  `89 + r * (57 ±0)`
-		//  Estimated: `2626`
-		// Minimum execution time: 7_204_000 picoseconds.
-		Weight::from_parts(7_679_617, 0)
-			.saturating_add(Weight::from_parts(0, 2626))
-			// Standard Error: 1_358
-			.saturating_add(Weight::from_parts(100_186, 0).saturating_mul(r.into()))
-			.saturating_add(T::DbWeight::get().reads(1))
-			.saturating_add(T::DbWeight::get().writes(1))
-	}
-	/// Storage: Identity Registrars (r:1 w:0)
-	/// Proof: Identity Registrars (max_values: Some(1), max_size: Some(1141), added: 1636, mode: MaxEncodedLen)
-	/// Storage: Identity IdentityOf (r:1 w:1)
-	/// Proof: Identity IdentityOf (max_values: None, max_size: Some(7538), added: 10013, mode: MaxEncodedLen)
-	/// The range of component `r` is `[1, 19]`.
-	/// The range of component `x` is `[0, 100]`.
-	fn provide_judgement(r: u32, x: u32, ) -> Weight {
-		// Proof Size summary in bytes:
-		//  Measured:  `445 + r * (57 ±0) + x * (66 ±0)`
-		//  Estimated: `11003`
-		// Minimum execution time: 23_125_000 picoseconds.
-		Weight::from_parts(22_392_893, 0)
-			.saturating_add(Weight::from_parts(0, 11003))
-			// Standard Error: 5_154
-			.saturating_add(Weight::from_parts(121_813, 0).saturating_mul(r.into()))
-			// Standard Error: 953
-			.saturating_add(Weight::from_parts(806_355, 0).saturating_mul(x.into()))
-			.saturating_add(T::DbWeight::get().reads(2))
-			.saturating_add(T::DbWeight::get().writes(1))
-	}
-	/// Storage: Identity SubsOf (r:1 w:1)
-	/// Proof: Identity SubsOf (max_values: None, max_size: Some(3258), added: 5733, mode: MaxEncodedLen)
-	/// Storage: Identity IdentityOf (r:1 w:1)
-	/// Proof: Identity IdentityOf (max_values: None, max_size: Some(7538), added: 10013, mode: MaxEncodedLen)
-	/// Storage: System Account (r:1 w:1)
-	/// Proof: System Account (max_values: None, max_size: Some(128), added: 2603, mode: MaxEncodedLen)
-	/// Storage: Identity SuperOf (r:0 w:100)
-	/// Proof: Identity SuperOf (max_values: None, max_size: Some(114), added: 2589, mode: MaxEncodedLen)
-	/// The range of component `r` is `[1, 20]`.
-	/// The range of component `s` is `[0, 100]`.
-	/// The range of component `x` is `[0, 100]`.
-	fn kill_identity(r: u32, s: u32, x: u32, ) -> Weight {
-		// Proof Size summary in bytes:
-		//  Measured:  `676 + r * (5 ±0) + s * (32 ±0) + x * (66 ±0)`
-		//  Estimated: `11003`
-		// Minimum execution time: 76_226_000 picoseconds.
-		Weight::from_parts(35_456_327, 0)
-			.saturating_add(Weight::from_parts(0, 11003))
-			// Standard Error: 18_829
-			.saturating_add(Weight::from_parts(615_512, 0).saturating_mul(r.into()))
-			// Standard Error: 3_677
-			.saturating_add(Weight::from_parts(1_462_016, 0).saturating_mul(s.into()))
-			// Standard Error: 3_677
-			.saturating_add(Weight::from_parts(328_050, 0).saturating_mul(x.into()))
-			.saturating_add(T::DbWeight::get().reads(3))
-			.saturating_add(T::DbWeight::get().writes(3))
-			.saturating_add(T::DbWeight::get().writes((1_u64).saturating_mul(s.into())))
-	}
-	/// Storage: Identity IdentityOf (r:1 w:0)
-	/// Proof: Identity IdentityOf (max_values: None, max_size: Some(7538), added: 10013, mode: MaxEncodedLen)
-	/// Storage: Identity SuperOf (r:1 w:1)
-	/// Proof: Identity SuperOf (max_values: None, max_size: Some(114), added: 2589, mode: MaxEncodedLen)
-	/// Storage: Identity SubsOf (r:1 w:1)
-	/// Proof: Identity SubsOf (max_values: None, max_size: Some(3258), added: 5733, mode: MaxEncodedLen)
-	/// The range of component `s` is `[0, 99]`.
-	fn add_sub(s: u32, ) -> Weight {
-		// Proof Size summary in bytes:
-		//  Measured:  `475 + s * (36 ±0)`
-		//  Estimated: `11003`
-		// Minimum execution time: 29_381_000 picoseconds.
-		Weight::from_parts(33_288_068, 0)
-			.saturating_add(Weight::from_parts(0, 11003))
-			// Standard Error: 1_624
-			.saturating_add(Weight::from_parts(120_173, 0).saturating_mul(s.into()))
-			.saturating_add(T::DbWeight::get().reads(3))
-			.saturating_add(T::DbWeight::get().writes(2))
-	}
-	/// Storage: Identity IdentityOf (r:1 w:0)
-	/// Proof: Identity IdentityOf (max_values: None, max_size: Some(7538), added: 10013, mode: MaxEncodedLen)
-	/// Storage: Identity SuperOf (r:1 w:1)
-	/// Proof: Identity SuperOf (max_values: None, max_size: Some(114), added: 2589, mode: MaxEncodedLen)
-	/// The range of component `s` is `[1, 100]`.
-	fn rename_sub(s: u32, ) -> Weight {
-		// Proof Size summary in bytes:
-		//  Measured:  `591 + s * (3 ±0)`
-		//  Estimated: `11003`
-		// Minimum execution time: 12_418_000 picoseconds.
-		Weight::from_parts(13_798_930, 0)
-			.saturating_add(Weight::from_parts(0, 11003))
-			// Standard Error: 856
-			.saturating_add(Weight::from_parts(43_306, 0).saturating_mul(s.into()))
-			.saturating_add(T::DbWeight::get().reads(2))
-			.saturating_add(T::DbWeight::get().writes(1))
-	}
-	/// Storage: Identity IdentityOf (r:1 w:0)
-	/// Proof: Identity IdentityOf (max_values: None, max_size: Some(7538), added: 10013, mode: MaxEncodedLen)
-	/// Storage: Identity SuperOf (r:1 w:1)
-	/// Proof: Identity SuperOf (max_values: None, max_size: Some(114), added: 2589, mode: MaxEncodedLen)
-	/// Storage: Identity SubsOf (r:1 w:1)
-	/// Proof: Identity SubsOf (max_values: None, max_size: Some(3258), added: 5733, mode: MaxEncodedLen)
-	/// The range of component `s` is `[1, 100]`.
-	fn remove_sub(s: u32, ) -> Weight {
-		// Proof Size summary in bytes:
-		//  Measured:  `638 + s * (35 ±0)`
-		//  Estimated: `11003`
-		// Minimum execution time: 33_242_000 picoseconds.
-		Weight::from_parts(36_552_253, 0)
-			.saturating_add(Weight::from_parts(0, 11003))
-			// Standard Error: 2_385
-			.saturating_add(Weight::from_parts(98_359, 0).saturating_mul(s.into()))
-			.saturating_add(T::DbWeight::get().reads(3))
-			.saturating_add(T::DbWeight::get().writes(2))
-	}
-	/// Storage: Identity SuperOf (r:1 w:1)
-	/// Proof: Identity SuperOf (max_values: None, max_size: Some(114), added: 2589, mode: MaxEncodedLen)
-	/// Storage: Identity SubsOf (r:1 w:1)
-	/// Proof: Identity SubsOf (max_values: None, max_size: Some(3258), added: 5733, mode: MaxEncodedLen)
-	/// Storage: System Account (r:1 w:0)
-	/// Proof: System Account (max_values: None, max_size: Some(128), added: 2603, mode: MaxEncodedLen)
-	/// The range of component `s` is `[0, 99]`.
-	fn quit_sub(s: u32, ) -> Weight {
-		// Proof Size summary in bytes:
-		//  Measured:  `704 + s * (37 ±0)`
-		//  Estimated: `6723`
-		// Minimum execution time: 24_017_000 picoseconds.
-		Weight::from_parts(27_149_414, 0)
-			.saturating_add(Weight::from_parts(0, 6723))
-			// Standard Error: 1_769
-			.saturating_add(Weight::from_parts(79_539, 0).saturating_mul(s.into()))
-			.saturating_add(T::DbWeight::get().reads(3))
-			.saturating_add(T::DbWeight::get().writes(2))
-	}
-}
diff --git a/polkadot/runtime/kusama/src/weights/pallet_im_online.rs b/polkadot/runtime/kusama/src/weights/pallet_im_online.rs
deleted file mode 100644
index 3bb3d65c4a6b0e462aab3e179c77203a121b5a14..0000000000000000000000000000000000000000
--- a/polkadot/runtime/kusama/src/weights/pallet_im_online.rs
+++ /dev/null
@@ -1,77 +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/>.
-
-//! Autogenerated weights for `pallet_im_online`
-//!
-//! THIS FILE WAS AUTO-GENERATED USING THE SUBSTRATE BENCHMARK CLI VERSION 4.0.0-dev
-//! DATE: 2023-06-19, STEPS: `50`, REPEAT: `20`, LOW RANGE: `[]`, HIGH RANGE: `[]`
-//! WORST CASE MAP SIZE: `1000000`
-//! HOSTNAME: `runner-e8ezs4ez-project-163-concurrent-0`, CPU: `Intel(R) Xeon(R) CPU @ 2.60GHz`
-//! EXECUTION: Some(Wasm), WASM-EXECUTION: Compiled, CHAIN: Some("kusama-dev"), DB CACHE: 1024
-
-// Executed Command:
-// ./target/production/polkadot
-// benchmark
-// pallet
-// --chain=kusama-dev
-// --steps=50
-// --repeat=20
-// --no-storage-info
-// --no-median-slopes
-// --no-min-squares
-// --pallet=pallet_im_online
-// --extrinsic=*
-// --execution=wasm
-// --wasm-execution=compiled
-// --header=./file_header.txt
-// --output=./runtime/kusama/src/weights/
-
-#![cfg_attr(rustfmt, rustfmt_skip)]
-#![allow(unused_parens)]
-#![allow(unused_imports)]
-#![allow(missing_docs)]
-
-use frame_support::{traits::Get, weights::Weight};
-use core::marker::PhantomData;
-
-/// Weight functions for `pallet_im_online`.
-pub struct WeightInfo<T>(PhantomData<T>);
-impl<T: frame_system::Config> pallet_im_online::WeightInfo for WeightInfo<T> {
-	/// Storage: Session Validators (r:1 w:0)
-	/// Proof Skipped: Session Validators (max_values: Some(1), max_size: None, mode: Measured)
-	/// Storage: Session CurrentIndex (r:1 w:0)
-	/// Proof Skipped: Session CurrentIndex (max_values: Some(1), max_size: None, mode: Measured)
-	/// Storage: ImOnline Keys (r:1 w:0)
-	/// Proof: ImOnline Keys (max_values: Some(1), max_size: Some(320002), added: 320497, mode: MaxEncodedLen)
-	/// Storage: ImOnline ReceivedHeartbeats (r:1 w:1)
-	/// Proof: ImOnline ReceivedHeartbeats (max_values: None, max_size: Some(25), added: 2500, mode: MaxEncodedLen)
-	/// Storage: ImOnline AuthoredBlocks (r:1 w:0)
-	/// Proof: ImOnline AuthoredBlocks (max_values: None, max_size: Some(56), added: 2531, mode: MaxEncodedLen)
-	/// The range of component `k` is `[1, 1000]`.
-	fn validate_unsigned_and_then_heartbeat(k: u32, ) -> Weight {
-		// Proof Size summary in bytes:
-		//  Measured:  `361 + k * (32 ±0)`
-		//  Estimated: `321487 + k * (1761 ±0)`
-		// Minimum execution time: 82_038_000 picoseconds.
-		Weight::from_parts(100_726_620, 0)
-			.saturating_add(Weight::from_parts(0, 321487))
-			// Standard Error: 600
-			.saturating_add(Weight::from_parts(30_346, 0).saturating_mul(k.into()))
-			.saturating_add(T::DbWeight::get().reads(4))
-			.saturating_add(T::DbWeight::get().writes(1))
-			.saturating_add(Weight::from_parts(0, 1761).saturating_mul(k.into()))
-	}
-}
diff --git a/polkadot/runtime/kusama/src/weights/pallet_indices.rs b/polkadot/runtime/kusama/src/weights/pallet_indices.rs
deleted file mode 100644
index b26562975cf80b4bd095956ad5be0a804bceed9c..0000000000000000000000000000000000000000
--- a/polkadot/runtime/kusama/src/weights/pallet_indices.rs
+++ /dev/null
@@ -1,117 +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/>.
-
-//! Autogenerated weights for `pallet_indices`
-//!
-//! THIS FILE WAS AUTO-GENERATED USING THE SUBSTRATE BENCHMARK CLI VERSION 4.0.0-dev
-//! DATE: 2023-06-19, STEPS: `50`, REPEAT: `20`, LOW RANGE: `[]`, HIGH RANGE: `[]`
-//! WORST CASE MAP SIZE: `1000000`
-//! HOSTNAME: `runner-e8ezs4ez-project-163-concurrent-0`, CPU: `Intel(R) Xeon(R) CPU @ 2.60GHz`
-//! EXECUTION: Some(Wasm), WASM-EXECUTION: Compiled, CHAIN: Some("kusama-dev"), DB CACHE: 1024
-
-// Executed Command:
-// ./target/production/polkadot
-// benchmark
-// pallet
-// --chain=kusama-dev
-// --steps=50
-// --repeat=20
-// --no-storage-info
-// --no-median-slopes
-// --no-min-squares
-// --pallet=pallet_indices
-// --extrinsic=*
-// --execution=wasm
-// --wasm-execution=compiled
-// --header=./file_header.txt
-// --output=./runtime/kusama/src/weights/
-
-#![cfg_attr(rustfmt, rustfmt_skip)]
-#![allow(unused_parens)]
-#![allow(unused_imports)]
-#![allow(missing_docs)]
-
-use frame_support::{traits::Get, weights::Weight};
-use core::marker::PhantomData;
-
-/// Weight functions for `pallet_indices`.
-pub struct WeightInfo<T>(PhantomData<T>);
-impl<T: frame_system::Config> pallet_indices::WeightInfo for WeightInfo<T> {
-	/// Storage: Indices Accounts (r:1 w:1)
-	/// Proof: Indices Accounts (max_values: None, max_size: Some(69), added: 2544, mode: MaxEncodedLen)
-	fn claim() -> Weight {
-		// Proof Size summary in bytes:
-		//  Measured:  `142`
-		//  Estimated: `3534`
-		// Minimum execution time: 25_322_000 picoseconds.
-		Weight::from_parts(26_124_000, 0)
-			.saturating_add(Weight::from_parts(0, 3534))
-			.saturating_add(T::DbWeight::get().reads(1))
-			.saturating_add(T::DbWeight::get().writes(1))
-	}
-	/// Storage: Indices Accounts (r:1 w:1)
-	/// Proof: Indices Accounts (max_values: None, max_size: Some(69), added: 2544, mode: MaxEncodedLen)
-	/// Storage: System Account (r:1 w:1)
-	/// Proof: System Account (max_values: None, max_size: Some(128), added: 2603, mode: MaxEncodedLen)
-	fn transfer() -> Weight {
-		// Proof Size summary in bytes:
-		//  Measured:  `341`
-		//  Estimated: `3593`
-		// Minimum execution time: 36_790_000 picoseconds.
-		Weight::from_parts(37_218_000, 0)
-			.saturating_add(Weight::from_parts(0, 3593))
-			.saturating_add(T::DbWeight::get().reads(2))
-			.saturating_add(T::DbWeight::get().writes(2))
-	}
-	/// Storage: Indices Accounts (r:1 w:1)
-	/// Proof: Indices Accounts (max_values: None, max_size: Some(69), added: 2544, mode: MaxEncodedLen)
-	fn free() -> Weight {
-		// Proof Size summary in bytes:
-		//  Measured:  `238`
-		//  Estimated: `3534`
-		// Minimum execution time: 25_968_000 picoseconds.
-		Weight::from_parts(26_450_000, 0)
-			.saturating_add(Weight::from_parts(0, 3534))
-			.saturating_add(T::DbWeight::get().reads(1))
-			.saturating_add(T::DbWeight::get().writes(1))
-	}
-	/// Storage: Indices Accounts (r:1 w:1)
-	/// Proof: Indices Accounts (max_values: None, max_size: Some(69), added: 2544, mode: MaxEncodedLen)
-	/// Storage: System Account (r:1 w:1)
-	/// Proof: System Account (max_values: None, max_size: Some(128), added: 2603, mode: MaxEncodedLen)
-	fn force_transfer() -> Weight {
-		// Proof Size summary in bytes:
-		//  Measured:  `341`
-		//  Estimated: `3593`
-		// Minimum execution time: 27_734_000 picoseconds.
-		Weight::from_parts(28_523_000, 0)
-			.saturating_add(Weight::from_parts(0, 3593))
-			.saturating_add(T::DbWeight::get().reads(2))
-			.saturating_add(T::DbWeight::get().writes(2))
-	}
-	/// Storage: Indices Accounts (r:1 w:1)
-	/// Proof: Indices Accounts (max_values: None, max_size: Some(69), added: 2544, mode: MaxEncodedLen)
-	fn freeze() -> Weight {
-		// Proof Size summary in bytes:
-		//  Measured:  `238`
-		//  Estimated: `3534`
-		// Minimum execution time: 27_980_000 picoseconds.
-		Weight::from_parts(28_448_000, 0)
-			.saturating_add(Weight::from_parts(0, 3534))
-			.saturating_add(T::DbWeight::get().reads(1))
-			.saturating_add(T::DbWeight::get().writes(1))
-	}
-}
diff --git a/polkadot/runtime/kusama/src/weights/pallet_membership.rs b/polkadot/runtime/kusama/src/weights/pallet_membership.rs
deleted file mode 100644
index 6b144bc879494612c89052ed84bf5d221075aa60..0000000000000000000000000000000000000000
--- a/polkadot/runtime/kusama/src/weights/pallet_membership.rs
+++ /dev/null
@@ -1,202 +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/>.
-//! Autogenerated weights for `pallet_membership`
-//!
-//! THIS FILE WAS AUTO-GENERATED USING THE SUBSTRATE BENCHMARK CLI VERSION 4.0.0-dev
-//! DATE: 2023-03-16, STEPS: `50`, REPEAT: `20`, LOW RANGE: `[]`, HIGH RANGE: `[]`
-//! WORST CASE MAP SIZE: `1000000`
-//! HOSTNAME: `bm5`, CPU: `Intel(R) Core(TM) i7-7700K CPU @ 4.20GHz`
-//! EXECUTION: Some(Wasm), WASM-EXECUTION: Compiled, CHAIN: Some("kusama-dev"), DB CACHE: 1024
-
-// Executed Command:
-// ./target/production/polkadot
-// benchmark
-// pallet
-// --chain=kusama-dev
-// --steps=50
-// --repeat=20
-// --pallet=pallet_membership
-// --extrinsic=*
-// --execution=wasm
-// --wasm-execution=compiled
-// --header=./file_header.txt
-// --output=./runtime/kusama/src/weights/
-
-#![cfg_attr(rustfmt, rustfmt_skip)]
-#![allow(unused_parens)]
-#![allow(unused_imports)]
-
-use frame_support::{traits::Get, weights::Weight};
-use sp_std::marker::PhantomData;
-
-/// Weight functions for `pallet_membership`.
-pub struct WeightInfo<T>(PhantomData<T>);
-impl<T: frame_system::Config> pallet_membership::WeightInfo for WeightInfo<T> {
-	/// Storage: TechnicalMembership Members (r:1 w:1)
-	/// Proof: TechnicalMembership Members (max_values: Some(1), max_size: Some(3202), added: 3697, mode: MaxEncodedLen)
-	/// Storage: TechnicalCommittee Proposals (r:1 w:0)
-	/// Proof Skipped: TechnicalCommittee Proposals (max_values: Some(1), max_size: None, mode: Measured)
-	/// Storage: TechnicalCommittee Members (r:0 w:1)
-	/// Proof Skipped: TechnicalCommittee Members (max_values: Some(1), max_size: None, mode: Measured)
-	/// Storage: TechnicalCommittee Prime (r:0 w:1)
-	/// Proof Skipped: TechnicalCommittee Prime (max_values: Some(1), max_size: None, mode: Measured)
-	/// The range of component `m` is `[1, 99]`.
-	fn add_member(m: u32, ) -> Weight {
-		// Proof Size summary in bytes:
-		//  Measured:  `208 + m * (64 ±0)`
-		//  Estimated: `6793 + m * (192 ±0)`
-		// Minimum execution time: 15_847_000 picoseconds.
-		Weight::from_parts(16_597_325, 0)
-			.saturating_add(Weight::from_parts(0, 6793))
-			// Standard Error: 411
-			.saturating_add(Weight::from_parts(35_801, 0).saturating_mul(m.into()))
-			.saturating_add(T::DbWeight::get().reads(2))
-			.saturating_add(T::DbWeight::get().writes(3))
-			.saturating_add(Weight::from_parts(0, 192).saturating_mul(m.into()))
-	}
-	/// Storage: TechnicalMembership Members (r:1 w:1)
-	/// Proof: TechnicalMembership Members (max_values: Some(1), max_size: Some(3202), added: 3697, mode: MaxEncodedLen)
-	/// Storage: TechnicalCommittee Proposals (r:1 w:0)
-	/// Proof Skipped: TechnicalCommittee Proposals (max_values: Some(1), max_size: None, mode: Measured)
-	/// Storage: TechnicalMembership Prime (r:1 w:0)
-	/// Proof: TechnicalMembership Prime (max_values: Some(1), max_size: Some(32), added: 527, mode: MaxEncodedLen)
-	/// Storage: TechnicalCommittee Members (r:0 w:1)
-	/// Proof Skipped: TechnicalCommittee Members (max_values: Some(1), max_size: None, mode: Measured)
-	/// Storage: TechnicalCommittee Prime (r:0 w:1)
-	/// Proof Skipped: TechnicalCommittee Prime (max_values: Some(1), max_size: None, mode: Measured)
-	/// The range of component `m` is `[2, 100]`.
-	fn remove_member(m: u32, ) -> Weight {
-		// Proof Size summary in bytes:
-		//  Measured:  `312 + m * (64 ±0)`
-		//  Estimated: `8622 + m * (192 ±0)`
-		// Minimum execution time: 18_412_000 picoseconds.
-		Weight::from_parts(19_251_698, 0)
-			.saturating_add(Weight::from_parts(0, 8622))
-			// Standard Error: 474
-			.saturating_add(Weight::from_parts(32_206, 0).saturating_mul(m.into()))
-			.saturating_add(T::DbWeight::get().reads(3))
-			.saturating_add(T::DbWeight::get().writes(3))
-			.saturating_add(Weight::from_parts(0, 192).saturating_mul(m.into()))
-	}
-	/// Storage: TechnicalMembership Members (r:1 w:1)
-	/// Proof: TechnicalMembership Members (max_values: Some(1), max_size: Some(3202), added: 3697, mode: MaxEncodedLen)
-	/// Storage: TechnicalCommittee Proposals (r:1 w:0)
-	/// Proof Skipped: TechnicalCommittee Proposals (max_values: Some(1), max_size: None, mode: Measured)
-	/// Storage: TechnicalMembership Prime (r:1 w:0)
-	/// Proof: TechnicalMembership Prime (max_values: Some(1), max_size: Some(32), added: 527, mode: MaxEncodedLen)
-	/// Storage: TechnicalCommittee Members (r:0 w:1)
-	/// Proof Skipped: TechnicalCommittee Members (max_values: Some(1), max_size: None, mode: Measured)
-	/// Storage: TechnicalCommittee Prime (r:0 w:1)
-	/// Proof Skipped: TechnicalCommittee Prime (max_values: Some(1), max_size: None, mode: Measured)
-	/// The range of component `m` is `[2, 100]`.
-	fn swap_member(m: u32, ) -> Weight {
-		// Proof Size summary in bytes:
-		//  Measured:  `312 + m * (64 ±0)`
-		//  Estimated: `8622 + m * (192 ±0)`
-		// Minimum execution time: 18_502_000 picoseconds.
-		Weight::from_parts(19_583_888, 0)
-			.saturating_add(Weight::from_parts(0, 8622))
-			// Standard Error: 619
-			.saturating_add(Weight::from_parts(44_408, 0).saturating_mul(m.into()))
-			.saturating_add(T::DbWeight::get().reads(3))
-			.saturating_add(T::DbWeight::get().writes(3))
-			.saturating_add(Weight::from_parts(0, 192).saturating_mul(m.into()))
-	}
-	/// Storage: TechnicalMembership Members (r:1 w:1)
-	/// Proof: TechnicalMembership Members (max_values: Some(1), max_size: Some(3202), added: 3697, mode: MaxEncodedLen)
-	/// Storage: TechnicalCommittee Proposals (r:1 w:0)
-	/// Proof Skipped: TechnicalCommittee Proposals (max_values: Some(1), max_size: None, mode: Measured)
-	/// Storage: TechnicalMembership Prime (r:1 w:0)
-	/// Proof: TechnicalMembership Prime (max_values: Some(1), max_size: Some(32), added: 527, mode: MaxEncodedLen)
-	/// Storage: TechnicalCommittee Members (r:0 w:1)
-	/// Proof Skipped: TechnicalCommittee Members (max_values: Some(1), max_size: None, mode: Measured)
-	/// Storage: TechnicalCommittee Prime (r:0 w:1)
-	/// Proof Skipped: TechnicalCommittee Prime (max_values: Some(1), max_size: None, mode: Measured)
-	/// The range of component `m` is `[1, 100]`.
-	fn reset_member(m: u32, ) -> Weight {
-		// Proof Size summary in bytes:
-		//  Measured:  `312 + m * (64 ±0)`
-		//  Estimated: `8622 + m * (192 ±0)`
-		// Minimum execution time: 18_088_000 picoseconds.
-		Weight::from_parts(19_292_324, 0)
-			.saturating_add(Weight::from_parts(0, 8622))
-			// Standard Error: 759
-			.saturating_add(Weight::from_parts(162_348, 0).saturating_mul(m.into()))
-			.saturating_add(T::DbWeight::get().reads(3))
-			.saturating_add(T::DbWeight::get().writes(3))
-			.saturating_add(Weight::from_parts(0, 192).saturating_mul(m.into()))
-	}
-	/// Storage: TechnicalMembership Members (r:1 w:1)
-	/// Proof: TechnicalMembership Members (max_values: Some(1), max_size: Some(3202), added: 3697, mode: MaxEncodedLen)
-	/// Storage: TechnicalCommittee Proposals (r:1 w:0)
-	/// Proof Skipped: TechnicalCommittee Proposals (max_values: Some(1), max_size: None, mode: Measured)
-	/// Storage: TechnicalMembership Prime (r:1 w:1)
-	/// Proof: TechnicalMembership Prime (max_values: Some(1), max_size: Some(32), added: 527, mode: MaxEncodedLen)
-	/// Storage: TechnicalCommittee Members (r:0 w:1)
-	/// Proof Skipped: TechnicalCommittee Members (max_values: Some(1), max_size: None, mode: Measured)
-	/// Storage: TechnicalCommittee Prime (r:0 w:1)
-	/// Proof Skipped: TechnicalCommittee Prime (max_values: Some(1), max_size: None, mode: Measured)
-	/// The range of component `m` is `[1, 100]`.
-	fn change_key(m: u32, ) -> Weight {
-		// Proof Size summary in bytes:
-		//  Measured:  `312 + m * (64 ±0)`
-		//  Estimated: `8622 + m * (192 ±0)`
-		// Minimum execution time: 19_134_000 picoseconds.
-		Weight::from_parts(20_242_466, 0)
-			.saturating_add(Weight::from_parts(0, 8622))
-			// Standard Error: 962
-			.saturating_add(Weight::from_parts(47_779, 0).saturating_mul(m.into()))
-			.saturating_add(T::DbWeight::get().reads(3))
-			.saturating_add(T::DbWeight::get().writes(4))
-			.saturating_add(Weight::from_parts(0, 192).saturating_mul(m.into()))
-	}
-	/// Storage: TechnicalMembership Members (r:1 w:0)
-	/// Proof: TechnicalMembership Members (max_values: Some(1), max_size: Some(3202), added: 3697, mode: MaxEncodedLen)
-	/// Storage: TechnicalMembership Prime (r:0 w:1)
-	/// Proof: TechnicalMembership Prime (max_values: Some(1), max_size: Some(32), added: 527, mode: MaxEncodedLen)
-	/// Storage: TechnicalCommittee Prime (r:0 w:1)
-	/// Proof Skipped: TechnicalCommittee Prime (max_values: Some(1), max_size: None, mode: Measured)
-	/// The range of component `m` is `[1, 100]`.
-	fn set_prime(m: u32, ) -> Weight {
-		// Proof Size summary in bytes:
-		//  Measured:  `32 + m * (32 ±0)`
-		//  Estimated: `4719 + m * (32 ±0)`
-		// Minimum execution time: 6_726_000 picoseconds.
-		Weight::from_parts(6_966_055, 0)
-			.saturating_add(Weight::from_parts(0, 4719))
-			// Standard Error: 255
-			.saturating_add(Weight::from_parts(13_950, 0).saturating_mul(m.into()))
-			.saturating_add(T::DbWeight::get().reads(1))
-			.saturating_add(T::DbWeight::get().writes(2))
-			.saturating_add(Weight::from_parts(0, 32).saturating_mul(m.into()))
-	}
-	/// Storage: TechnicalMembership Prime (r:0 w:1)
-	/// Proof: TechnicalMembership Prime (max_values: Some(1), max_size: Some(32), added: 527, mode: MaxEncodedLen)
-	/// Storage: TechnicalCommittee Prime (r:0 w:1)
-	/// Proof Skipped: TechnicalCommittee Prime (max_values: Some(1), max_size: None, mode: Measured)
-	/// The range of component `m` is `[1, 100]`.
-	fn clear_prime(m: u32, ) -> Weight {
-		// Proof Size summary in bytes:
-		//  Measured:  `0`
-		//  Estimated: `0`
-		// Minimum execution time: 3_010_000 picoseconds.
-		Weight::from_parts(3_196_429, 0)
-			.saturating_add(Weight::from_parts(0, 0))
-			// Standard Error: 78
-			.saturating_add(Weight::from_parts(471, 0).saturating_mul(m.into()))
-			.saturating_add(T::DbWeight::get().writes(2))
-	}
-}
diff --git a/polkadot/runtime/kusama/src/weights/pallet_message_queue.rs b/polkadot/runtime/kusama/src/weights/pallet_message_queue.rs
deleted file mode 100644
index f149eef194fb5895665cd853cd7fa2ffd58600df..0000000000000000000000000000000000000000
--- a/polkadot/runtime/kusama/src/weights/pallet_message_queue.rs
+++ /dev/null
@@ -1,193 +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/>.
-
-//! Autogenerated weights for `pallet_message_queue`
-//!
-//! THIS FILE WAS AUTO-GENERATED USING THE SUBSTRATE BENCHMARK CLI VERSION 4.0.0-dev
-//! DATE: 2023-06-19, STEPS: `50`, REPEAT: `20`, LOW RANGE: `[]`, HIGH RANGE: `[]`
-//! WORST CASE MAP SIZE: `1000000`
-//! HOSTNAME: `runner-e8ezs4ez-project-163-concurrent-0`, CPU: `Intel(R) Xeon(R) CPU @ 2.60GHz`
-//! EXECUTION: Some(Wasm), WASM-EXECUTION: Compiled, CHAIN: Some("kusama-dev"), DB CACHE: 1024
-
-// Executed Command:
-// ./target/production/polkadot
-// benchmark
-// pallet
-// --chain=kusama-dev
-// --steps=50
-// --repeat=20
-// --no-storage-info
-// --no-median-slopes
-// --no-min-squares
-// --pallet=pallet_message_queue
-// --extrinsic=*
-// --execution=wasm
-// --wasm-execution=compiled
-// --header=./file_header.txt
-// --output=./runtime/kusama/src/weights/
-
-#![cfg_attr(rustfmt, rustfmt_skip)]
-#![allow(unused_parens)]
-#![allow(unused_imports)]
-#![allow(missing_docs)]
-
-use frame_support::{traits::Get, weights::Weight};
-use core::marker::PhantomData;
-
-/// Weight functions for `pallet_message_queue`.
-pub struct WeightInfo<T>(PhantomData<T>);
-impl<T: frame_system::Config> pallet_message_queue::WeightInfo for WeightInfo<T> {
-	/// Storage: MessageQueue ServiceHead (r:1 w:0)
-	/// Proof: MessageQueue ServiceHead (max_values: Some(1), max_size: Some(6), added: 501, mode: MaxEncodedLen)
-	/// Storage: MessageQueue BookStateFor (r:2 w:2)
-	/// Proof: MessageQueue BookStateFor (max_values: None, max_size: Some(55), added: 2530, mode: MaxEncodedLen)
-	fn ready_ring_knit() -> Weight {
-		// Proof Size summary in bytes:
-		//  Measured:  `248`
-		//  Estimated: `6050`
-		// Minimum execution time: 11_603_000 picoseconds.
-		Weight::from_parts(11_953_000, 0)
-			.saturating_add(Weight::from_parts(0, 6050))
-			.saturating_add(T::DbWeight::get().reads(3))
-			.saturating_add(T::DbWeight::get().writes(2))
-	}
-	/// Storage: MessageQueue BookStateFor (r:2 w:2)
-	/// Proof: MessageQueue BookStateFor (max_values: None, max_size: Some(55), added: 2530, mode: MaxEncodedLen)
-	/// Storage: MessageQueue ServiceHead (r:1 w:1)
-	/// Proof: MessageQueue ServiceHead (max_values: Some(1), max_size: Some(6), added: 501, mode: MaxEncodedLen)
-	fn ready_ring_unknit() -> Weight {
-		// Proof Size summary in bytes:
-		//  Measured:  `248`
-		//  Estimated: `6050`
-		// Minimum execution time: 10_668_000 picoseconds.
-		Weight::from_parts(11_105_000, 0)
-			.saturating_add(Weight::from_parts(0, 6050))
-			.saturating_add(T::DbWeight::get().reads(3))
-			.saturating_add(T::DbWeight::get().writes(3))
-	}
-	/// Storage: MessageQueue BookStateFor (r:1 w:1)
-	/// Proof: MessageQueue BookStateFor (max_values: None, max_size: Some(55), added: 2530, mode: MaxEncodedLen)
-	fn service_queue_base() -> Weight {
-		// Proof Size summary in bytes:
-		//  Measured:  `42`
-		//  Estimated: `3520`
-		// Minimum execution time: 4_158_000 picoseconds.
-		Weight::from_parts(4_379_000, 0)
-			.saturating_add(Weight::from_parts(0, 3520))
-			.saturating_add(T::DbWeight::get().reads(1))
-			.saturating_add(T::DbWeight::get().writes(1))
-	}
-	/// Storage: MessageQueue Pages (r:1 w:1)
-	/// Proof: MessageQueue Pages (max_values: None, max_size: Some(65586), added: 68061, mode: MaxEncodedLen)
-	fn service_page_base_completion() -> Weight {
-		// Proof Size summary in bytes:
-		//  Measured:  `115`
-		//  Estimated: `69051`
-		// Minimum execution time: 5_873_000 picoseconds.
-		Weight::from_parts(6_002_000, 0)
-			.saturating_add(Weight::from_parts(0, 69051))
-			.saturating_add(T::DbWeight::get().reads(1))
-			.saturating_add(T::DbWeight::get().writes(1))
-	}
-	/// Storage: MessageQueue Pages (r:1 w:1)
-	/// Proof: MessageQueue Pages (max_values: None, max_size: Some(65586), added: 68061, mode: MaxEncodedLen)
-	fn service_page_base_no_completion() -> Weight {
-		// Proof Size summary in bytes:
-		//  Measured:  `115`
-		//  Estimated: `69051`
-		// Minimum execution time: 6_110_000 picoseconds.
-		Weight::from_parts(6_385_000, 0)
-			.saturating_add(Weight::from_parts(0, 69051))
-			.saturating_add(T::DbWeight::get().reads(1))
-			.saturating_add(T::DbWeight::get().writes(1))
-	}
-	fn service_page_item() -> Weight {
-		// Proof Size summary in bytes:
-		//  Measured:  `0`
-		//  Estimated: `0`
-		// Minimum execution time: 92_242_000 picoseconds.
-		Weight::from_parts(92_796_000, 0)
-			.saturating_add(Weight::from_parts(0, 0))
-	}
-	/// Storage: MessageQueue ServiceHead (r:1 w:1)
-	/// Proof: MessageQueue ServiceHead (max_values: Some(1), max_size: Some(6), added: 501, mode: MaxEncodedLen)
-	/// Storage: MessageQueue BookStateFor (r:1 w:0)
-	/// Proof: MessageQueue BookStateFor (max_values: None, max_size: Some(55), added: 2530, mode: MaxEncodedLen)
-	fn bump_service_head() -> Weight {
-		// Proof Size summary in bytes:
-		//  Measured:  `149`
-		//  Estimated: `3520`
-		// Minimum execution time: 6_386_000 picoseconds.
-		Weight::from_parts(6_629_000, 0)
-			.saturating_add(Weight::from_parts(0, 3520))
-			.saturating_add(T::DbWeight::get().reads(2))
-			.saturating_add(T::DbWeight::get().writes(1))
-	}
-	/// Storage: MessageQueue BookStateFor (r:1 w:1)
-	/// Proof: MessageQueue BookStateFor (max_values: None, max_size: Some(55), added: 2530, mode: MaxEncodedLen)
-	/// Storage: MessageQueue Pages (r:1 w:1)
-	/// Proof: MessageQueue Pages (max_values: None, max_size: Some(65586), added: 68061, mode: MaxEncodedLen)
-	/// Storage: unknown `0x3a72656c61795f64697370617463685f71756575655f72656d61696e696e675f` (r:0 w:1)
-	/// Proof Skipped: unknown `0x3a72656c61795f64697370617463685f71756575655f72656d61696e696e675f` (r:0 w:1)
-	/// Storage: unknown `0xf5207f03cfdce586301014700e2c2593fad157e461d71fd4c1f936839a5f1f3e` (r:0 w:1)
-	/// Proof Skipped: unknown `0xf5207f03cfdce586301014700e2c2593fad157e461d71fd4c1f936839a5f1f3e` (r:0 w:1)
-	fn reap_page() -> Weight {
-		// Proof Size summary in bytes:
-		//  Measured:  `65714`
-		//  Estimated: `69051`
-		// Minimum execution time: 59_294_000 picoseconds.
-		Weight::from_parts(60_608_000, 0)
-			.saturating_add(Weight::from_parts(0, 69051))
-			.saturating_add(T::DbWeight::get().reads(2))
-			.saturating_add(T::DbWeight::get().writes(4))
-	}
-	/// Storage: MessageQueue BookStateFor (r:1 w:1)
-	/// Proof: MessageQueue BookStateFor (max_values: None, max_size: Some(55), added: 2530, mode: MaxEncodedLen)
-	/// Storage: MessageQueue Pages (r:1 w:1)
-	/// Proof: MessageQueue Pages (max_values: None, max_size: Some(65586), added: 68061, mode: MaxEncodedLen)
-	/// Storage: unknown `0x3a72656c61795f64697370617463685f71756575655f72656d61696e696e675f` (r:0 w:1)
-	/// Proof Skipped: unknown `0x3a72656c61795f64697370617463685f71756575655f72656d61696e696e675f` (r:0 w:1)
-	/// Storage: unknown `0xf5207f03cfdce586301014700e2c2593fad157e461d71fd4c1f936839a5f1f3e` (r:0 w:1)
-	/// Proof Skipped: unknown `0xf5207f03cfdce586301014700e2c2593fad157e461d71fd4c1f936839a5f1f3e` (r:0 w:1)
-	fn execute_overweight_page_removed() -> Weight {
-		// Proof Size summary in bytes:
-		//  Measured:  `65714`
-		//  Estimated: `69051`
-		// Minimum execution time: 75_134_000 picoseconds.
-		Weight::from_parts(76_729_000, 0)
-			.saturating_add(Weight::from_parts(0, 69051))
-			.saturating_add(T::DbWeight::get().reads(2))
-			.saturating_add(T::DbWeight::get().writes(4))
-	}
-	/// Storage: MessageQueue BookStateFor (r:1 w:1)
-	/// Proof: MessageQueue BookStateFor (max_values: None, max_size: Some(55), added: 2530, mode: MaxEncodedLen)
-	/// Storage: MessageQueue Pages (r:1 w:1)
-	/// Proof: MessageQueue Pages (max_values: None, max_size: Some(65586), added: 68061, mode: MaxEncodedLen)
-	/// Storage: unknown `0x3a72656c61795f64697370617463685f71756575655f72656d61696e696e675f` (r:0 w:1)
-	/// Proof Skipped: unknown `0x3a72656c61795f64697370617463685f71756575655f72656d61696e696e675f` (r:0 w:1)
-	/// Storage: unknown `0xf5207f03cfdce586301014700e2c2593fad157e461d71fd4c1f936839a5f1f3e` (r:0 w:1)
-	/// Proof Skipped: unknown `0xf5207f03cfdce586301014700e2c2593fad157e461d71fd4c1f936839a5f1f3e` (r:0 w:1)
-	fn execute_overweight_page_updated() -> Weight {
-		// Proof Size summary in bytes:
-		//  Measured:  `65714`
-		//  Estimated: `69051`
-		// Minimum execution time: 117_320_000 picoseconds.
-		Weight::from_parts(119_640_000, 0)
-			.saturating_add(Weight::from_parts(0, 69051))
-			.saturating_add(T::DbWeight::get().reads(2))
-			.saturating_add(T::DbWeight::get().writes(4))
-	}
-}
diff --git a/polkadot/runtime/kusama/src/weights/pallet_multisig.rs b/polkadot/runtime/kusama/src/weights/pallet_multisig.rs
deleted file mode 100644
index 108189c6ca1db47df39a19983dfbc79079470315..0000000000000000000000000000000000000000
--- a/polkadot/runtime/kusama/src/weights/pallet_multisig.rs
+++ /dev/null
@@ -1,165 +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/>.
-
-//! Autogenerated weights for `pallet_multisig`
-//!
-//! THIS FILE WAS AUTO-GENERATED USING THE SUBSTRATE BENCHMARK CLI VERSION 4.0.0-dev
-//! DATE: 2023-06-19, STEPS: `50`, REPEAT: `20`, LOW RANGE: `[]`, HIGH RANGE: `[]`
-//! WORST CASE MAP SIZE: `1000000`
-//! HOSTNAME: `runner-e8ezs4ez-project-163-concurrent-0`, CPU: `Intel(R) Xeon(R) CPU @ 2.60GHz`
-//! EXECUTION: Some(Wasm), WASM-EXECUTION: Compiled, CHAIN: Some("kusama-dev"), DB CACHE: 1024
-
-// Executed Command:
-// ./target/production/polkadot
-// benchmark
-// pallet
-// --chain=kusama-dev
-// --steps=50
-// --repeat=20
-// --no-storage-info
-// --no-median-slopes
-// --no-min-squares
-// --pallet=pallet_multisig
-// --extrinsic=*
-// --execution=wasm
-// --wasm-execution=compiled
-// --header=./file_header.txt
-// --output=./runtime/kusama/src/weights/
-
-#![cfg_attr(rustfmt, rustfmt_skip)]
-#![allow(unused_parens)]
-#![allow(unused_imports)]
-#![allow(missing_docs)]
-
-use frame_support::{traits::Get, weights::Weight};
-use core::marker::PhantomData;
-
-/// Weight functions for `pallet_multisig`.
-pub struct WeightInfo<T>(PhantomData<T>);
-impl<T: frame_system::Config> pallet_multisig::WeightInfo for WeightInfo<T> {
-	/// The range of component `z` is `[0, 10000]`.
-	fn as_multi_threshold_1(z: u32, ) -> Weight {
-		// Proof Size summary in bytes:
-		//  Measured:  `0`
-		//  Estimated: `0`
-		// Minimum execution time: 13_299_000 picoseconds.
-		Weight::from_parts(14_368_762, 0)
-			.saturating_add(Weight::from_parts(0, 0))
-			// Standard Error: 5
-			.saturating_add(Weight::from_parts(557, 0).saturating_mul(z.into()))
-	}
-	/// Storage: Multisig Multisigs (r:1 w:1)
-	/// Proof: Multisig Multisigs (max_values: None, max_size: Some(3346), added: 5821, mode: MaxEncodedLen)
-	/// The range of component `s` is `[2, 100]`.
-	/// The range of component `z` is `[0, 10000]`.
-	fn as_multi_create(s: u32, z: u32, ) -> Weight {
-		// Proof Size summary in bytes:
-		//  Measured:  `301 + s * (2 ±0)`
-		//  Estimated: `6811`
-		// Minimum execution time: 45_147_000 picoseconds.
-		Weight::from_parts(34_161_081, 0)
-			.saturating_add(Weight::from_parts(0, 6811))
-			// Standard Error: 1_022
-			.saturating_add(Weight::from_parts(127_000, 0).saturating_mul(s.into()))
-			// Standard Error: 10
-			.saturating_add(Weight::from_parts(1_553, 0).saturating_mul(z.into()))
-			.saturating_add(T::DbWeight::get().reads(1))
-			.saturating_add(T::DbWeight::get().writes(1))
-	}
-	/// Storage: Multisig Multisigs (r:1 w:1)
-	/// Proof: Multisig Multisigs (max_values: None, max_size: Some(3346), added: 5821, mode: MaxEncodedLen)
-	/// The range of component `s` is `[3, 100]`.
-	/// The range of component `z` is `[0, 10000]`.
-	fn as_multi_approve(s: u32, z: u32, ) -> Weight {
-		// Proof Size summary in bytes:
-		//  Measured:  `320`
-		//  Estimated: `6811`
-		// Minimum execution time: 29_650_000 picoseconds.
-		Weight::from_parts(20_868_716, 0)
-			.saturating_add(Weight::from_parts(0, 6811))
-			// Standard Error: 1_323
-			.saturating_add(Weight::from_parts(112_380, 0).saturating_mul(s.into()))
-			// Standard Error: 12
-			.saturating_add(Weight::from_parts(1_440, 0).saturating_mul(z.into()))
-			.saturating_add(T::DbWeight::get().reads(1))
-			.saturating_add(T::DbWeight::get().writes(1))
-	}
-	/// Storage: Multisig Multisigs (r:1 w:1)
-	/// Proof: Multisig Multisigs (max_values: None, max_size: Some(3346), added: 5821, mode: MaxEncodedLen)
-	/// Storage: System Account (r:1 w:1)
-	/// Proof: System Account (max_values: None, max_size: Some(128), added: 2603, mode: MaxEncodedLen)
-	/// The range of component `s` is `[2, 100]`.
-	/// The range of component `z` is `[0, 10000]`.
-	fn as_multi_complete(s: u32, z: u32, ) -> Weight {
-		// Proof Size summary in bytes:
-		//  Measured:  `426 + s * (33 ±0)`
-		//  Estimated: `6811`
-		// Minimum execution time: 50_649_000 picoseconds.
-		Weight::from_parts(34_736_758, 0)
-			.saturating_add(Weight::from_parts(0, 6811))
-			// Standard Error: 1_738
-			.saturating_add(Weight::from_parts(182_282, 0).saturating_mul(s.into()))
-			// Standard Error: 17
-			.saturating_add(Weight::from_parts(1_824, 0).saturating_mul(z.into()))
-			.saturating_add(T::DbWeight::get().reads(2))
-			.saturating_add(T::DbWeight::get().writes(2))
-	}
-	/// Storage: Multisig Multisigs (r:1 w:1)
-	/// Proof: Multisig Multisigs (max_values: None, max_size: Some(3346), added: 5821, mode: MaxEncodedLen)
-	/// The range of component `s` is `[2, 100]`.
-	fn approve_as_multi_create(s: u32, ) -> Weight {
-		// Proof Size summary in bytes:
-		//  Measured:  `301 + s * (2 ±0)`
-		//  Estimated: `6811`
-		// Minimum execution time: 32_162_000 picoseconds.
-		Weight::from_parts(33_215_652, 0)
-			.saturating_add(Weight::from_parts(0, 6811))
-			// Standard Error: 1_093
-			.saturating_add(Weight::from_parts(133_715, 0).saturating_mul(s.into()))
-			.saturating_add(T::DbWeight::get().reads(1))
-			.saturating_add(T::DbWeight::get().writes(1))
-	}
-	/// Storage: Multisig Multisigs (r:1 w:1)
-	/// Proof: Multisig Multisigs (max_values: None, max_size: Some(3346), added: 5821, mode: MaxEncodedLen)
-	/// The range of component `s` is `[2, 100]`.
-	fn approve_as_multi_approve(s: u32, ) -> Weight {
-		// Proof Size summary in bytes:
-		//  Measured:  `320`
-		//  Estimated: `6811`
-		// Minimum execution time: 18_073_000 picoseconds.
-		Weight::from_parts(19_038_713, 0)
-			.saturating_add(Weight::from_parts(0, 6811))
-			// Standard Error: 681
-			.saturating_add(Weight::from_parts(111_279, 0).saturating_mul(s.into()))
-			.saturating_add(T::DbWeight::get().reads(1))
-			.saturating_add(T::DbWeight::get().writes(1))
-	}
-	/// Storage: Multisig Multisigs (r:1 w:1)
-	/// Proof: Multisig Multisigs (max_values: None, max_size: Some(3346), added: 5821, mode: MaxEncodedLen)
-	/// The range of component `s` is `[2, 100]`.
-	fn cancel_as_multi(s: u32, ) -> Weight {
-		// Proof Size summary in bytes:
-		//  Measured:  `492 + s * (1 ±0)`
-		//  Estimated: `6811`
-		// Minimum execution time: 33_867_000 picoseconds.
-		Weight::from_parts(34_896_470, 0)
-			.saturating_add(Weight::from_parts(0, 6811))
-			// Standard Error: 1_002
-			.saturating_add(Weight::from_parts(116_935, 0).saturating_mul(s.into()))
-			.saturating_add(T::DbWeight::get().reads(1))
-			.saturating_add(T::DbWeight::get().writes(1))
-	}
-}
diff --git a/polkadot/runtime/kusama/src/weights/pallet_nis.rs b/polkadot/runtime/kusama/src/weights/pallet_nis.rs
deleted file mode 100644
index 2dc8b261eb57ac2fb6b73a34f6a11480fc66e718..0000000000000000000000000000000000000000
--- a/polkadot/runtime/kusama/src/weights/pallet_nis.rs
+++ /dev/null
@@ -1,252 +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/>.
-
-//! Autogenerated weights for `pallet_nis`
-//!
-//! THIS FILE WAS AUTO-GENERATED USING THE SUBSTRATE BENCHMARK CLI VERSION 4.0.0-dev
-//! DATE: 2023-06-19, STEPS: `50`, REPEAT: `20`, LOW RANGE: `[]`, HIGH RANGE: `[]`
-//! WORST CASE MAP SIZE: `1000000`
-//! HOSTNAME: `runner-e8ezs4ez-project-163-concurrent-0`, CPU: `Intel(R) Xeon(R) CPU @ 2.60GHz`
-//! EXECUTION: Some(Wasm), WASM-EXECUTION: Compiled, CHAIN: Some("kusama-dev"), DB CACHE: 1024
-
-// Executed Command:
-// ./target/production/polkadot
-// benchmark
-// pallet
-// --chain=kusama-dev
-// --steps=50
-// --repeat=20
-// --no-storage-info
-// --no-median-slopes
-// --no-min-squares
-// --pallet=pallet_nis
-// --extrinsic=*
-// --execution=wasm
-// --wasm-execution=compiled
-// --header=./file_header.txt
-// --output=./runtime/kusama/src/weights/
-
-#![cfg_attr(rustfmt, rustfmt_skip)]
-#![allow(unused_parens)]
-#![allow(unused_imports)]
-#![allow(missing_docs)]
-
-use frame_support::{traits::Get, weights::Weight};
-use core::marker::PhantomData;
-
-/// Weight functions for `pallet_nis`.
-pub struct WeightInfo<T>(PhantomData<T>);
-impl<T: frame_system::Config> pallet_nis::WeightInfo for WeightInfo<T> {
-	/// Storage: Nis Queues (r:1 w:1)
-	/// Proof: Nis Queues (max_values: None, max_size: Some(48022), added: 50497, mode: MaxEncodedLen)
-	/// Storage: Balances Holds (r:1 w:1)
-	/// Proof: Balances Holds (max_values: None, max_size: Some(67), added: 2542, mode: MaxEncodedLen)
-	/// Storage: Nis QueueTotals (r:1 w:1)
-	/// Proof: Nis QueueTotals (max_values: Some(1), max_size: Some(10002), added: 10497, mode: MaxEncodedLen)
-	/// The range of component `l` is `[0, 999]`.
-	fn place_bid(l: u32, ) -> Weight {
-		// Proof Size summary in bytes:
-		//  Measured:  `10210 + l * (48 ±0)`
-		//  Estimated: `51487`
-		// Minimum execution time: 49_318_000 picoseconds.
-		Weight::from_parts(47_894_330, 0)
-			.saturating_add(Weight::from_parts(0, 51487))
-			// Standard Error: 1_184
-			.saturating_add(Weight::from_parts(110_633, 0).saturating_mul(l.into()))
-			.saturating_add(T::DbWeight::get().reads(3))
-			.saturating_add(T::DbWeight::get().writes(3))
-	}
-	/// Storage: Nis Queues (r:1 w:1)
-	/// Proof: Nis Queues (max_values: None, max_size: Some(48022), added: 50497, mode: MaxEncodedLen)
-	/// Storage: Balances Holds (r:1 w:1)
-	/// Proof: Balances Holds (max_values: None, max_size: Some(67), added: 2542, mode: MaxEncodedLen)
-	/// Storage: Nis QueueTotals (r:1 w:1)
-	/// Proof: Nis QueueTotals (max_values: Some(1), max_size: Some(10002), added: 10497, mode: MaxEncodedLen)
-	fn place_bid_max() -> Weight {
-		// Proof Size summary in bytes:
-		//  Measured:  `58212`
-		//  Estimated: `51487`
-		// Minimum execution time: 162_699_000 picoseconds.
-		Weight::from_parts(171_243_000, 0)
-			.saturating_add(Weight::from_parts(0, 51487))
-			.saturating_add(T::DbWeight::get().reads(3))
-			.saturating_add(T::DbWeight::get().writes(3))
-	}
-	/// Storage: Nis Queues (r:1 w:1)
-	/// Proof: Nis Queues (max_values: None, max_size: Some(48022), added: 50497, mode: MaxEncodedLen)
-	/// Storage: Balances Holds (r:1 w:1)
-	/// Proof: Balances Holds (max_values: None, max_size: Some(67), added: 2542, mode: MaxEncodedLen)
-	/// Storage: Nis QueueTotals (r:1 w:1)
-	/// Proof: Nis QueueTotals (max_values: Some(1), max_size: Some(10002), added: 10497, mode: MaxEncodedLen)
-	/// The range of component `l` is `[1, 1000]`.
-	fn retract_bid(l: u32, ) -> Weight {
-		// Proof Size summary in bytes:
-		//  Measured:  `10210 + l * (48 ±0)`
-		//  Estimated: `51487`
-		// Minimum execution time: 51_827_000 picoseconds.
-		Weight::from_parts(44_282_033, 0)
-			.saturating_add(Weight::from_parts(0, 51487))
-			// Standard Error: 1_145
-			.saturating_add(Weight::from_parts(121_058, 0).saturating_mul(l.into()))
-			.saturating_add(T::DbWeight::get().reads(3))
-			.saturating_add(T::DbWeight::get().writes(3))
-	}
-	/// Storage: Nis Summary (r:1 w:0)
-	/// Proof: Nis Summary (max_values: Some(1), max_size: Some(40), added: 535, mode: MaxEncodedLen)
-	/// Storage: Balances InactiveIssuance (r:1 w:0)
-	/// Proof: Balances InactiveIssuance (max_values: Some(1), max_size: Some(16), added: 511, mode: MaxEncodedLen)
-	/// Storage: System Account (r:1 w:1)
-	/// Proof: System Account (max_values: None, max_size: Some(128), added: 2603, mode: MaxEncodedLen)
-	fn fund_deficit() -> Weight {
-		// Proof Size summary in bytes:
-		//  Measured:  `225`
-		//  Estimated: `3593`
-		// Minimum execution time: 39_765_000 picoseconds.
-		Weight::from_parts(40_525_000, 0)
-			.saturating_add(Weight::from_parts(0, 3593))
-			.saturating_add(T::DbWeight::get().reads(3))
-			.saturating_add(T::DbWeight::get().writes(1))
-	}
-	/// Storage: Nis Receipts (r:1 w:1)
-	/// Proof: Nis Receipts (max_values: None, max_size: Some(81), added: 2556, mode: MaxEncodedLen)
-	/// Storage: Balances Holds (r:1 w:1)
-	/// Proof: Balances Holds (max_values: None, max_size: Some(67), added: 2542, mode: MaxEncodedLen)
-	/// Storage: System Account (r:1 w:1)
-	/// Proof: System Account (max_values: None, max_size: Some(128), added: 2603, mode: MaxEncodedLen)
-	/// Storage: Nis Summary (r:1 w:1)
-	/// Proof: Nis Summary (max_values: Some(1), max_size: Some(40), added: 535, mode: MaxEncodedLen)
-	/// Storage: NisCounterpartBalances TotalIssuance (r:1 w:1)
-	/// Proof: NisCounterpartBalances TotalIssuance (max_values: Some(1), max_size: Some(16), added: 511, mode: MaxEncodedLen)
-	/// Storage: NisCounterpartBalances Account (r:1 w:1)
-	/// Proof: NisCounterpartBalances Account (max_values: None, max_size: Some(112), added: 2587, mode: MaxEncodedLen)
-	fn communify() -> Weight {
-		// Proof Size summary in bytes:
-		//  Measured:  `470`
-		//  Estimated: `3593`
-		// Minimum execution time: 75_890_000 picoseconds.
-		Weight::from_parts(77_519_000, 0)
-			.saturating_add(Weight::from_parts(0, 3593))
-			.saturating_add(T::DbWeight::get().reads(6))
-			.saturating_add(T::DbWeight::get().writes(6))
-	}
-	/// Storage: Nis Receipts (r:1 w:1)
-	/// Proof: Nis Receipts (max_values: None, max_size: Some(81), added: 2556, mode: MaxEncodedLen)
-	/// Storage: Nis Summary (r:1 w:1)
-	/// Proof: Nis Summary (max_values: Some(1), max_size: Some(40), added: 535, mode: MaxEncodedLen)
-	/// Storage: Balances InactiveIssuance (r:1 w:0)
-	/// Proof: Balances InactiveIssuance (max_values: Some(1), max_size: Some(16), added: 511, mode: MaxEncodedLen)
-	/// Storage: System Account (r:1 w:1)
-	/// Proof: System Account (max_values: None, max_size: Some(128), added: 2603, mode: MaxEncodedLen)
-	/// Storage: NisCounterpartBalances Account (r:1 w:1)
-	/// Proof: NisCounterpartBalances Account (max_values: None, max_size: Some(112), added: 2587, mode: MaxEncodedLen)
-	/// Storage: NisCounterpartBalances TotalIssuance (r:1 w:1)
-	/// Proof: NisCounterpartBalances TotalIssuance (max_values: Some(1), max_size: Some(16), added: 511, mode: MaxEncodedLen)
-	/// Storage: Balances Holds (r:1 w:1)
-	/// Proof: Balances Holds (max_values: None, max_size: Some(67), added: 2542, mode: MaxEncodedLen)
-	fn privatize() -> Weight {
-		// Proof Size summary in bytes:
-		//  Measured:  `660`
-		//  Estimated: `3593`
-		// Minimum execution time: 92_622_000 picoseconds.
-		Weight::from_parts(94_127_000, 0)
-			.saturating_add(Weight::from_parts(0, 3593))
-			.saturating_add(T::DbWeight::get().reads(7))
-			.saturating_add(T::DbWeight::get().writes(6))
-	}
-	/// Storage: Nis Receipts (r:1 w:1)
-	/// Proof: Nis Receipts (max_values: None, max_size: Some(81), added: 2556, mode: MaxEncodedLen)
-	/// Storage: Nis Summary (r:1 w:1)
-	/// Proof: Nis Summary (max_values: Some(1), max_size: Some(40), added: 535, mode: MaxEncodedLen)
-	/// Storage: Balances InactiveIssuance (r:1 w:0)
-	/// Proof: Balances InactiveIssuance (max_values: Some(1), max_size: Some(16), added: 511, mode: MaxEncodedLen)
-	/// Storage: System Account (r:1 w:0)
-	/// Proof: System Account (max_values: None, max_size: Some(128), added: 2603, mode: MaxEncodedLen)
-	/// Storage: Balances Holds (r:1 w:1)
-	/// Proof: Balances Holds (max_values: None, max_size: Some(67), added: 2542, mode: MaxEncodedLen)
-	fn thaw_private() -> Weight {
-		// Proof Size summary in bytes:
-		//  Measured:  `388`
-		//  Estimated: `3593`
-		// Minimum execution time: 49_336_000 picoseconds.
-		Weight::from_parts(50_333_000, 0)
-			.saturating_add(Weight::from_parts(0, 3593))
-			.saturating_add(T::DbWeight::get().reads(5))
-			.saturating_add(T::DbWeight::get().writes(3))
-	}
-	/// Storage: Nis Receipts (r:1 w:1)
-	/// Proof: Nis Receipts (max_values: None, max_size: Some(81), added: 2556, mode: MaxEncodedLen)
-	/// Storage: Nis Summary (r:1 w:1)
-	/// Proof: Nis Summary (max_values: Some(1), max_size: Some(40), added: 535, mode: MaxEncodedLen)
-	/// Storage: NisCounterpartBalances Account (r:1 w:1)
-	/// Proof: NisCounterpartBalances Account (max_values: None, max_size: Some(112), added: 2587, mode: MaxEncodedLen)
-	/// Storage: NisCounterpartBalances TotalIssuance (r:1 w:1)
-	/// Proof: NisCounterpartBalances TotalIssuance (max_values: Some(1), max_size: Some(16), added: 511, mode: MaxEncodedLen)
-	/// Storage: Balances InactiveIssuance (r:1 w:0)
-	/// Proof: Balances InactiveIssuance (max_values: Some(1), max_size: Some(16), added: 511, mode: MaxEncodedLen)
-	/// Storage: System Account (r:1 w:1)
-	/// Proof: System Account (max_values: None, max_size: Some(128), added: 2603, mode: MaxEncodedLen)
-	fn thaw_communal() -> Weight {
-		// Proof Size summary in bytes:
-		//  Measured:  `604`
-		//  Estimated: `3593`
-		// Minimum execution time: 98_220_000 picoseconds.
-		Weight::from_parts(100_348_000, 0)
-			.saturating_add(Weight::from_parts(0, 3593))
-			.saturating_add(T::DbWeight::get().reads(6))
-			.saturating_add(T::DbWeight::get().writes(5))
-	}
-	/// Storage: Nis Summary (r:1 w:1)
-	/// Proof: Nis Summary (max_values: Some(1), max_size: Some(40), added: 535, mode: MaxEncodedLen)
-	/// Storage: Balances InactiveIssuance (r:1 w:0)
-	/// Proof: Balances InactiveIssuance (max_values: Some(1), max_size: Some(16), added: 511, mode: MaxEncodedLen)
-	/// Storage: System Account (r:1 w:0)
-	/// Proof: System Account (max_values: None, max_size: Some(128), added: 2603, mode: MaxEncodedLen)
-	/// Storage: Nis QueueTotals (r:1 w:1)
-	/// Proof: Nis QueueTotals (max_values: Some(1), max_size: Some(10002), added: 10497, mode: MaxEncodedLen)
-	fn process_queues() -> Weight {
-		// Proof Size summary in bytes:
-		//  Measured:  `10658`
-		//  Estimated: `11487`
-		// Minimum execution time: 33_893_000 picoseconds.
-		Weight::from_parts(37_495_000, 0)
-			.saturating_add(Weight::from_parts(0, 11487))
-			.saturating_add(T::DbWeight::get().reads(4))
-			.saturating_add(T::DbWeight::get().writes(2))
-	}
-	/// Storage: Nis Queues (r:1 w:1)
-	/// Proof: Nis Queues (max_values: None, max_size: Some(48022), added: 50497, mode: MaxEncodedLen)
-	fn process_queue() -> Weight {
-		// Proof Size summary in bytes:
-		//  Measured:  `76`
-		//  Estimated: `51487`
-		// Minimum execution time: 4_173_000 picoseconds.
-		Weight::from_parts(4_322_000, 0)
-			.saturating_add(Weight::from_parts(0, 51487))
-			.saturating_add(T::DbWeight::get().reads(1))
-			.saturating_add(T::DbWeight::get().writes(1))
-	}
-	/// Storage: Nis Receipts (r:0 w:1)
-	/// Proof: Nis Receipts (max_values: None, max_size: Some(81), added: 2556, mode: MaxEncodedLen)
-	fn process_bid() -> Weight {
-		// Proof Size summary in bytes:
-		//  Measured:  `0`
-		//  Estimated: `0`
-		// Minimum execution time: 6_747_000 picoseconds.
-		Weight::from_parts(6_952_000, 0)
-			.saturating_add(Weight::from_parts(0, 0))
-			.saturating_add(T::DbWeight::get().writes(1))
-	}
-}
diff --git a/polkadot/runtime/kusama/src/weights/pallet_nomination_pools.rs b/polkadot/runtime/kusama/src/weights/pallet_nomination_pools.rs
deleted file mode 100644
index 65bb76860b3055aa5d27b3363d4629be4b9ec6e1..0000000000000000000000000000000000000000
--- a/polkadot/runtime/kusama/src/weights/pallet_nomination_pools.rs
+++ /dev/null
@@ -1,603 +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/>.
-
-//! Autogenerated weights for `pallet_nomination_pools`
-//!
-//! THIS FILE WAS AUTO-GENERATED USING THE SUBSTRATE BENCHMARK CLI VERSION 4.0.0-dev
-//! DATE: 2023-06-19, STEPS: `50`, REPEAT: `20`, LOW RANGE: `[]`, HIGH RANGE: `[]`
-//! WORST CASE MAP SIZE: `1000000`
-//! HOSTNAME: `runner-e8ezs4ez-project-163-concurrent-0`, CPU: `Intel(R) Xeon(R) CPU @ 2.60GHz`
-//! EXECUTION: Some(Wasm), WASM-EXECUTION: Compiled, CHAIN: Some("kusama-dev"), DB CACHE: 1024
-
-// Executed Command:
-// ./target/production/polkadot
-// benchmark
-// pallet
-// --chain=kusama-dev
-// --steps=50
-// --repeat=20
-// --no-storage-info
-// --no-median-slopes
-// --no-min-squares
-// --pallet=pallet_nomination_pools
-// --extrinsic=*
-// --execution=wasm
-// --wasm-execution=compiled
-// --header=./file_header.txt
-// --output=./runtime/kusama/src/weights/
-
-#![cfg_attr(rustfmt, rustfmt_skip)]
-#![allow(unused_parens)]
-#![allow(unused_imports)]
-#![allow(missing_docs)]
-
-use frame_support::{traits::Get, weights::Weight};
-use core::marker::PhantomData;
-
-/// Weight functions for `pallet_nomination_pools`.
-pub struct WeightInfo<T>(PhantomData<T>);
-impl<T: frame_system::Config> pallet_nomination_pools::WeightInfo for WeightInfo<T> {
-	/// Storage: NominationPools MinJoinBond (r:1 w:0)
-	/// Proof: NominationPools MinJoinBond (max_values: Some(1), max_size: Some(16), added: 511, mode: MaxEncodedLen)
-	/// Storage: NominationPools PoolMembers (r:1 w:1)
-	/// Proof: NominationPools PoolMembers (max_values: None, max_size: Some(717), added: 3192, mode: MaxEncodedLen)
-	/// Storage: NominationPools BondedPools (r:1 w:1)
-	/// Proof: NominationPools BondedPools (max_values: None, max_size: Some(220), added: 2695, mode: MaxEncodedLen)
-	/// Storage: Staking Bonded (r:1 w:0)
-	/// Proof: Staking Bonded (max_values: None, max_size: Some(72), added: 2547, mode: MaxEncodedLen)
-	/// Storage: Staking Ledger (r:1 w:1)
-	/// Proof: Staking Ledger (max_values: None, max_size: Some(1091), added: 3566, mode: MaxEncodedLen)
-	/// Storage: NominationPools RewardPools (r:1 w:1)
-	/// Proof: NominationPools RewardPools (max_values: None, max_size: Some(92), added: 2567, mode: MaxEncodedLen)
-	/// Storage: NominationPools GlobalMaxCommission (r:1 w:0)
-	/// Proof: NominationPools GlobalMaxCommission (max_values: Some(1), max_size: Some(4), added: 499, mode: MaxEncodedLen)
-	/// Storage: System Account (r:2 w:1)
-	/// Proof: System Account (max_values: None, max_size: Some(128), added: 2603, mode: MaxEncodedLen)
-	/// Storage: NominationPools MaxPoolMembersPerPool (r:1 w:0)
-	/// Proof: NominationPools MaxPoolMembersPerPool (max_values: Some(1), max_size: Some(4), added: 499, mode: MaxEncodedLen)
-	/// Storage: NominationPools MaxPoolMembers (r:1 w:0)
-	/// Proof: NominationPools MaxPoolMembers (max_values: Some(1), max_size: Some(4), added: 499, mode: MaxEncodedLen)
-	/// Storage: NominationPools CounterForPoolMembers (r:1 w:1)
-	/// Proof: NominationPools CounterForPoolMembers (max_values: Some(1), max_size: Some(4), added: 499, mode: MaxEncodedLen)
-	/// Storage: Balances Locks (r:1 w:1)
-	/// Proof: Balances Locks (max_values: None, max_size: Some(1299), added: 3774, mode: MaxEncodedLen)
-	/// Storage: Balances Freezes (r:1 w:0)
-	/// Proof: Balances Freezes (max_values: None, max_size: Some(49), added: 2524, mode: MaxEncodedLen)
-	/// Storage: VoterList ListNodes (r:3 w:3)
-	/// Proof: VoterList ListNodes (max_values: None, max_size: Some(154), added: 2629, mode: MaxEncodedLen)
-	/// Storage: VoterList ListBags (r:2 w:2)
-	/// Proof: VoterList ListBags (max_values: None, max_size: Some(82), added: 2557, mode: MaxEncodedLen)
-	fn join() -> Weight {
-		// Proof Size summary in bytes:
-		//  Measured:  `3229`
-		//  Estimated: `8877`
-		// Minimum execution time: 198_640_000 picoseconds.
-		Weight::from_parts(205_158_000, 0)
-			.saturating_add(Weight::from_parts(0, 8877))
-			.saturating_add(T::DbWeight::get().reads(19))
-			.saturating_add(T::DbWeight::get().writes(12))
-	}
-	/// Storage: NominationPools PoolMembers (r:1 w:1)
-	/// Proof: NominationPools PoolMembers (max_values: None, max_size: Some(717), added: 3192, mode: MaxEncodedLen)
-	/// Storage: NominationPools BondedPools (r:1 w:1)
-	/// Proof: NominationPools BondedPools (max_values: None, max_size: Some(220), added: 2695, mode: MaxEncodedLen)
-	/// Storage: NominationPools RewardPools (r:1 w:1)
-	/// Proof: NominationPools RewardPools (max_values: None, max_size: Some(92), added: 2567, mode: MaxEncodedLen)
-	/// Storage: NominationPools GlobalMaxCommission (r:1 w:0)
-	/// Proof: NominationPools GlobalMaxCommission (max_values: Some(1), max_size: Some(4), added: 499, mode: MaxEncodedLen)
-	/// Storage: System Account (r:3 w:2)
-	/// Proof: System Account (max_values: None, max_size: Some(128), added: 2603, mode: MaxEncodedLen)
-	/// Storage: Staking Bonded (r:1 w:0)
-	/// Proof: Staking Bonded (max_values: None, max_size: Some(72), added: 2547, mode: MaxEncodedLen)
-	/// Storage: Staking Ledger (r:1 w:1)
-	/// Proof: Staking Ledger (max_values: None, max_size: Some(1091), added: 3566, mode: MaxEncodedLen)
-	/// Storage: Balances Locks (r:1 w:1)
-	/// Proof: Balances Locks (max_values: None, max_size: Some(1299), added: 3774, mode: MaxEncodedLen)
-	/// Storage: Balances Freezes (r:1 w:0)
-	/// Proof: Balances Freezes (max_values: None, max_size: Some(49), added: 2524, mode: MaxEncodedLen)
-	/// Storage: VoterList ListNodes (r:3 w:3)
-	/// Proof: VoterList ListNodes (max_values: None, max_size: Some(154), added: 2629, mode: MaxEncodedLen)
-	/// Storage: VoterList ListBags (r:2 w:2)
-	/// Proof: VoterList ListBags (max_values: None, max_size: Some(82), added: 2557, mode: MaxEncodedLen)
-	fn bond_extra_transfer() -> Weight {
-		// Proof Size summary in bytes:
-		//  Measured:  `3239`
-		//  Estimated: `8877`
-		// Minimum execution time: 191_638_000 picoseconds.
-		Weight::from_parts(200_580_000, 0)
-			.saturating_add(Weight::from_parts(0, 8877))
-			.saturating_add(T::DbWeight::get().reads(16))
-			.saturating_add(T::DbWeight::get().writes(12))
-	}
-	/// Storage: NominationPools ClaimPermissions (r:1 w:0)
-	/// Proof: NominationPools ClaimPermissions (max_values: None, max_size: Some(41), added: 2516, mode: MaxEncodedLen)
-	/// Storage: NominationPools PoolMembers (r:1 w:1)
-	/// Proof: NominationPools PoolMembers (max_values: None, max_size: Some(717), added: 3192, mode: MaxEncodedLen)
-	/// Storage: NominationPools BondedPools (r:1 w:1)
-	/// Proof: NominationPools BondedPools (max_values: None, max_size: Some(220), added: 2695, mode: MaxEncodedLen)
-	/// Storage: NominationPools RewardPools (r:1 w:1)
-	/// Proof: NominationPools RewardPools (max_values: None, max_size: Some(92), added: 2567, mode: MaxEncodedLen)
-	/// Storage: NominationPools GlobalMaxCommission (r:1 w:0)
-	/// Proof: NominationPools GlobalMaxCommission (max_values: Some(1), max_size: Some(4), added: 499, mode: MaxEncodedLen)
-	/// Storage: System Account (r:3 w:3)
-	/// Proof: System Account (max_values: None, max_size: Some(128), added: 2603, mode: MaxEncodedLen)
-	/// Storage: Staking Bonded (r:1 w:0)
-	/// Proof: Staking Bonded (max_values: None, max_size: Some(72), added: 2547, mode: MaxEncodedLen)
-	/// Storage: Staking Ledger (r:1 w:1)
-	/// Proof: Staking Ledger (max_values: None, max_size: Some(1091), added: 3566, mode: MaxEncodedLen)
-	/// Storage: Balances Locks (r:1 w:1)
-	/// Proof: Balances Locks (max_values: None, max_size: Some(1299), added: 3774, mode: MaxEncodedLen)
-	/// Storage: Balances Freezes (r:1 w:0)
-	/// Proof: Balances Freezes (max_values: None, max_size: Some(49), added: 2524, mode: MaxEncodedLen)
-	/// Storage: VoterList ListNodes (r:3 w:3)
-	/// Proof: VoterList ListNodes (max_values: None, max_size: Some(154), added: 2629, mode: MaxEncodedLen)
-	/// Storage: VoterList ListBags (r:2 w:2)
-	/// Proof: VoterList ListBags (max_values: None, max_size: Some(82), added: 2557, mode: MaxEncodedLen)
-	fn bond_extra_other() -> Weight {
-		// Proof Size summary in bytes:
-		//  Measured:  `3304`
-		//  Estimated: `8877`
-		// Minimum execution time: 232_697_000 picoseconds.
-		Weight::from_parts(238_503_000, 0)
-			.saturating_add(Weight::from_parts(0, 8877))
-			.saturating_add(T::DbWeight::get().reads(17))
-			.saturating_add(T::DbWeight::get().writes(13))
-	}
-	/// Storage: NominationPools ClaimPermissions (r:1 w:0)
-	/// Proof: NominationPools ClaimPermissions (max_values: None, max_size: Some(41), added: 2516, mode: MaxEncodedLen)
-	/// Storage: NominationPools PoolMembers (r:1 w:1)
-	/// Proof: NominationPools PoolMembers (max_values: None, max_size: Some(717), added: 3192, mode: MaxEncodedLen)
-	/// Storage: NominationPools BondedPools (r:1 w:1)
-	/// Proof: NominationPools BondedPools (max_values: None, max_size: Some(220), added: 2695, mode: MaxEncodedLen)
-	/// Storage: NominationPools RewardPools (r:1 w:1)
-	/// Proof: NominationPools RewardPools (max_values: None, max_size: Some(92), added: 2567, mode: MaxEncodedLen)
-	/// Storage: NominationPools GlobalMaxCommission (r:1 w:0)
-	/// Proof: NominationPools GlobalMaxCommission (max_values: Some(1), max_size: Some(4), added: 499, mode: MaxEncodedLen)
-	/// Storage: System Account (r:1 w:1)
-	/// Proof: System Account (max_values: None, max_size: Some(128), added: 2603, mode: MaxEncodedLen)
-	fn claim_payout() -> Weight {
-		// Proof Size summary in bytes:
-		//  Measured:  `1171`
-		//  Estimated: `4182`
-		// Minimum execution time: 79_834_000 picoseconds.
-		Weight::from_parts(81_793_000, 0)
-			.saturating_add(Weight::from_parts(0, 4182))
-			.saturating_add(T::DbWeight::get().reads(6))
-			.saturating_add(T::DbWeight::get().writes(4))
-	}
-	/// Storage: NominationPools PoolMembers (r:1 w:1)
-	/// Proof: NominationPools PoolMembers (max_values: None, max_size: Some(717), added: 3192, mode: MaxEncodedLen)
-	/// Storage: NominationPools BondedPools (r:1 w:1)
-	/// Proof: NominationPools BondedPools (max_values: None, max_size: Some(220), added: 2695, mode: MaxEncodedLen)
-	/// Storage: NominationPools RewardPools (r:1 w:1)
-	/// Proof: NominationPools RewardPools (max_values: None, max_size: Some(92), added: 2567, mode: MaxEncodedLen)
-	/// Storage: Staking Bonded (r:1 w:0)
-	/// Proof: Staking Bonded (max_values: None, max_size: Some(72), added: 2547, mode: MaxEncodedLen)
-	/// Storage: Staking Ledger (r:1 w:1)
-	/// Proof: Staking Ledger (max_values: None, max_size: Some(1091), added: 3566, mode: MaxEncodedLen)
-	/// Storage: NominationPools GlobalMaxCommission (r:1 w:0)
-	/// Proof: NominationPools GlobalMaxCommission (max_values: Some(1), max_size: Some(4), added: 499, mode: MaxEncodedLen)
-	/// Storage: System Account (r:2 w:1)
-	/// Proof: System Account (max_values: None, max_size: Some(128), added: 2603, mode: MaxEncodedLen)
-	/// Storage: Staking CurrentEra (r:1 w:0)
-	/// Proof: Staking CurrentEra (max_values: Some(1), max_size: Some(4), added: 499, mode: MaxEncodedLen)
-	/// Storage: Staking Nominators (r:1 w:0)
-	/// Proof: Staking Nominators (max_values: None, max_size: Some(814), added: 3289, mode: MaxEncodedLen)
-	/// Storage: Staking MinNominatorBond (r:1 w:0)
-	/// Proof: Staking MinNominatorBond (max_values: Some(1), max_size: Some(16), added: 511, mode: MaxEncodedLen)
-	/// Storage: Balances Locks (r:1 w:1)
-	/// Proof: Balances Locks (max_values: None, max_size: Some(1299), added: 3774, mode: MaxEncodedLen)
-	/// Storage: Balances Freezes (r:1 w:0)
-	/// Proof: Balances Freezes (max_values: None, max_size: Some(49), added: 2524, mode: MaxEncodedLen)
-	/// Storage: VoterList ListNodes (r:3 w:3)
-	/// Proof: VoterList ListNodes (max_values: None, max_size: Some(154), added: 2629, mode: MaxEncodedLen)
-	/// Storage: VoterList ListBags (r:2 w:2)
-	/// Proof: VoterList ListBags (max_values: None, max_size: Some(82), added: 2557, mode: MaxEncodedLen)
-	/// Storage: NominationPools SubPoolsStorage (r:1 w:1)
-	/// Proof: NominationPools SubPoolsStorage (max_values: None, max_size: Some(1197), added: 3672, mode: MaxEncodedLen)
-	/// Storage: NominationPools CounterForSubPoolsStorage (r:1 w:1)
-	/// Proof: NominationPools CounterForSubPoolsStorage (max_values: Some(1), max_size: Some(4), added: 499, mode: MaxEncodedLen)
-	fn unbond() -> Weight {
-		// Proof Size summary in bytes:
-		//  Measured:  `3506`
-		//  Estimated: `8877`
-		// Minimum execution time: 175_155_000 picoseconds.
-		Weight::from_parts(179_781_000, 0)
-			.saturating_add(Weight::from_parts(0, 8877))
-			.saturating_add(T::DbWeight::get().reads(20))
-			.saturating_add(T::DbWeight::get().writes(13))
-	}
-	/// Storage: NominationPools BondedPools (r:1 w:0)
-	/// Proof: NominationPools BondedPools (max_values: None, max_size: Some(220), added: 2695, mode: MaxEncodedLen)
-	/// Storage: Staking Bonded (r:1 w:0)
-	/// Proof: Staking Bonded (max_values: None, max_size: Some(72), added: 2547, mode: MaxEncodedLen)
-	/// Storage: Staking Ledger (r:1 w:1)
-	/// Proof: Staking Ledger (max_values: None, max_size: Some(1091), added: 3566, mode: MaxEncodedLen)
-	/// Storage: Staking CurrentEra (r:1 w:0)
-	/// Proof: Staking CurrentEra (max_values: Some(1), max_size: Some(4), added: 499, mode: MaxEncodedLen)
-	/// Storage: Balances Locks (r:1 w:1)
-	/// Proof: Balances Locks (max_values: None, max_size: Some(1299), added: 3774, mode: MaxEncodedLen)
-	/// Storage: Balances Freezes (r:1 w:0)
-	/// Proof: Balances Freezes (max_values: None, max_size: Some(49), added: 2524, mode: MaxEncodedLen)
-	/// The range of component `s` is `[0, 100]`.
-	fn pool_withdraw_unbonded(s: u32, ) -> Weight {
-		// Proof Size summary in bytes:
-		//  Measured:  `1608`
-		//  Estimated: `4764`
-		// Minimum execution time: 63_367_000 picoseconds.
-		Weight::from_parts(65_562_125, 0)
-			.saturating_add(Weight::from_parts(0, 4764))
-			// Standard Error: 1_722
-			.saturating_add(Weight::from_parts(47_690, 0).saturating_mul(s.into()))
-			.saturating_add(T::DbWeight::get().reads(6))
-			.saturating_add(T::DbWeight::get().writes(2))
-	}
-	/// Storage: NominationPools PoolMembers (r:1 w:1)
-	/// Proof: NominationPools PoolMembers (max_values: None, max_size: Some(717), added: 3192, mode: MaxEncodedLen)
-	/// Storage: Staking CurrentEra (r:1 w:0)
-	/// Proof: Staking CurrentEra (max_values: Some(1), max_size: Some(4), added: 499, mode: MaxEncodedLen)
-	/// Storage: NominationPools BondedPools (r:1 w:1)
-	/// Proof: NominationPools BondedPools (max_values: None, max_size: Some(220), added: 2695, mode: MaxEncodedLen)
-	/// Storage: NominationPools SubPoolsStorage (r:1 w:1)
-	/// Proof: NominationPools SubPoolsStorage (max_values: None, max_size: Some(1197), added: 3672, mode: MaxEncodedLen)
-	/// Storage: Staking Bonded (r:1 w:0)
-	/// Proof: Staking Bonded (max_values: None, max_size: Some(72), added: 2547, mode: MaxEncodedLen)
-	/// Storage: Staking Ledger (r:1 w:1)
-	/// Proof: Staking Ledger (max_values: None, max_size: Some(1091), added: 3566, mode: MaxEncodedLen)
-	/// Storage: Balances Locks (r:1 w:1)
-	/// Proof: Balances Locks (max_values: None, max_size: Some(1299), added: 3774, mode: MaxEncodedLen)
-	/// Storage: Balances Freezes (r:1 w:0)
-	/// Proof: Balances Freezes (max_values: None, max_size: Some(49), added: 2524, mode: MaxEncodedLen)
-	/// Storage: System Account (r:1 w:1)
-	/// Proof: System Account (max_values: None, max_size: Some(128), added: 2603, mode: MaxEncodedLen)
-	/// Storage: NominationPools CounterForPoolMembers (r:1 w:1)
-	/// Proof: NominationPools CounterForPoolMembers (max_values: Some(1), max_size: Some(4), added: 499, mode: MaxEncodedLen)
-	/// Storage: NominationPools ClaimPermissions (r:0 w:1)
-	/// Proof: NominationPools ClaimPermissions (max_values: None, max_size: Some(41), added: 2516, mode: MaxEncodedLen)
-	/// The range of component `s` is `[0, 100]`.
-	fn withdraw_unbonded_update(s: u32, ) -> Weight {
-		// Proof Size summary in bytes:
-		//  Measured:  `2036`
-		//  Estimated: `4764`
-		// Minimum execution time: 132_738_000 picoseconds.
-		Weight::from_parts(136_968_458, 0)
-			.saturating_add(Weight::from_parts(0, 4764))
-			// Standard Error: 2_891
-			.saturating_add(Weight::from_parts(75_317, 0).saturating_mul(s.into()))
-			.saturating_add(T::DbWeight::get().reads(10))
-			.saturating_add(T::DbWeight::get().writes(8))
-	}
-	/// Storage: NominationPools PoolMembers (r:1 w:1)
-	/// Proof: NominationPools PoolMembers (max_values: None, max_size: Some(717), added: 3192, mode: MaxEncodedLen)
-	/// Storage: Staking CurrentEra (r:1 w:0)
-	/// Proof: Staking CurrentEra (max_values: Some(1), max_size: Some(4), added: 499, mode: MaxEncodedLen)
-	/// Storage: NominationPools BondedPools (r:1 w:1)
-	/// Proof: NominationPools BondedPools (max_values: None, max_size: Some(220), added: 2695, mode: MaxEncodedLen)
-	/// Storage: NominationPools SubPoolsStorage (r:1 w:1)
-	/// Proof: NominationPools SubPoolsStorage (max_values: None, max_size: Some(1197), added: 3672, mode: MaxEncodedLen)
-	/// Storage: Staking Bonded (r:1 w:1)
-	/// Proof: Staking Bonded (max_values: None, max_size: Some(72), added: 2547, mode: MaxEncodedLen)
-	/// Storage: Staking Ledger (r:1 w:1)
-	/// Proof: Staking Ledger (max_values: None, max_size: Some(1091), added: 3566, mode: MaxEncodedLen)
-	/// Storage: Staking SlashingSpans (r:1 w:0)
-	/// Proof Skipped: Staking SlashingSpans (max_values: None, max_size: None, mode: Measured)
-	/// Storage: Staking Validators (r:1 w:0)
-	/// Proof: Staking Validators (max_values: None, max_size: Some(45), added: 2520, mode: MaxEncodedLen)
-	/// Storage: Staking Nominators (r:1 w:0)
-	/// Proof: Staking Nominators (max_values: None, max_size: Some(814), added: 3289, mode: MaxEncodedLen)
-	/// Storage: System Account (r:2 w:2)
-	/// Proof: System Account (max_values: None, max_size: Some(128), added: 2603, mode: MaxEncodedLen)
-	/// Storage: Balances Locks (r:1 w:1)
-	/// Proof: Balances Locks (max_values: None, max_size: Some(1299), added: 3774, mode: MaxEncodedLen)
-	/// Storage: Balances Freezes (r:1 w:0)
-	/// Proof: Balances Freezes (max_values: None, max_size: Some(49), added: 2524, mode: MaxEncodedLen)
-	/// Storage: NominationPools CounterForPoolMembers (r:1 w:1)
-	/// Proof: NominationPools CounterForPoolMembers (max_values: Some(1), max_size: Some(4), added: 499, mode: MaxEncodedLen)
-	/// Storage: NominationPools ReversePoolIdLookup (r:1 w:1)
-	/// Proof: NominationPools ReversePoolIdLookup (max_values: None, max_size: Some(44), added: 2519, mode: MaxEncodedLen)
-	/// Storage: NominationPools CounterForReversePoolIdLookup (r:1 w:1)
-	/// Proof: NominationPools CounterForReversePoolIdLookup (max_values: Some(1), max_size: Some(4), added: 499, mode: MaxEncodedLen)
-	/// Storage: NominationPools RewardPools (r:1 w:1)
-	/// Proof: NominationPools RewardPools (max_values: None, max_size: Some(92), added: 2567, mode: MaxEncodedLen)
-	/// Storage: NominationPools CounterForRewardPools (r:1 w:1)
-	/// Proof: NominationPools CounterForRewardPools (max_values: Some(1), max_size: Some(4), added: 499, mode: MaxEncodedLen)
-	/// Storage: NominationPools CounterForSubPoolsStorage (r:1 w:1)
-	/// Proof: NominationPools CounterForSubPoolsStorage (max_values: Some(1), max_size: Some(4), added: 499, mode: MaxEncodedLen)
-	/// Storage: NominationPools Metadata (r:1 w:1)
-	/// Proof: NominationPools Metadata (max_values: None, max_size: Some(270), added: 2745, mode: MaxEncodedLen)
-	/// Storage: NominationPools CounterForBondedPools (r:1 w:1)
-	/// Proof: NominationPools CounterForBondedPools (max_values: Some(1), max_size: Some(4), added: 499, mode: MaxEncodedLen)
-	/// Storage: Staking Payee (r:0 w:1)
-	/// Proof: Staking Payee (max_values: None, max_size: Some(73), added: 2548, mode: MaxEncodedLen)
-	/// Storage: NominationPools ClaimPermissions (r:0 w:1)
-	/// Proof: NominationPools ClaimPermissions (max_values: None, max_size: Some(41), added: 2516, mode: MaxEncodedLen)
-	/// The range of component `s` is `[0, 100]`.
-	fn withdraw_unbonded_kill(s: u32, ) -> Weight {
-		// Proof Size summary in bytes:
-		//  Measured:  `2394`
-		//  Estimated: `6196`
-		// Minimum execution time: 223_915_000 picoseconds.
-		Weight::from_parts(229_729_576, 0)
-			.saturating_add(Weight::from_parts(0, 6196))
-			// Standard Error: 5_670
-			.saturating_add(Weight::from_parts(38_117, 0).saturating_mul(s.into()))
-			.saturating_add(T::DbWeight::get().reads(21))
-			.saturating_add(T::DbWeight::get().writes(18))
-	}
-	/// Storage: NominationPools LastPoolId (r:1 w:1)
-	/// Proof: NominationPools LastPoolId (max_values: Some(1), max_size: Some(4), added: 499, mode: MaxEncodedLen)
-	/// Storage: Staking MinNominatorBond (r:1 w:0)
-	/// Proof: Staking MinNominatorBond (max_values: Some(1), max_size: Some(16), added: 511, mode: MaxEncodedLen)
-	/// Storage: NominationPools MinCreateBond (r:1 w:0)
-	/// Proof: NominationPools MinCreateBond (max_values: Some(1), max_size: Some(16), added: 511, mode: MaxEncodedLen)
-	/// Storage: NominationPools MinJoinBond (r:1 w:0)
-	/// Proof: NominationPools MinJoinBond (max_values: Some(1), max_size: Some(16), added: 511, mode: MaxEncodedLen)
-	/// Storage: NominationPools MaxPools (r:1 w:0)
-	/// Proof: NominationPools MaxPools (max_values: Some(1), max_size: Some(4), added: 499, mode: MaxEncodedLen)
-	/// Storage: NominationPools CounterForBondedPools (r:1 w:1)
-	/// Proof: NominationPools CounterForBondedPools (max_values: Some(1), max_size: Some(4), added: 499, mode: MaxEncodedLen)
-	/// Storage: NominationPools PoolMembers (r:1 w:1)
-	/// Proof: NominationPools PoolMembers (max_values: None, max_size: Some(717), added: 3192, mode: MaxEncodedLen)
-	/// Storage: NominationPools MaxPoolMembersPerPool (r:1 w:0)
-	/// Proof: NominationPools MaxPoolMembersPerPool (max_values: Some(1), max_size: Some(4), added: 499, mode: MaxEncodedLen)
-	/// Storage: NominationPools MaxPoolMembers (r:1 w:0)
-	/// Proof: NominationPools MaxPoolMembers (max_values: Some(1), max_size: Some(4), added: 499, mode: MaxEncodedLen)
-	/// Storage: NominationPools CounterForPoolMembers (r:1 w:1)
-	/// Proof: NominationPools CounterForPoolMembers (max_values: Some(1), max_size: Some(4), added: 499, mode: MaxEncodedLen)
-	/// Storage: System Account (r:2 w:2)
-	/// Proof: System Account (max_values: None, max_size: Some(128), added: 2603, mode: MaxEncodedLen)
-	/// Storage: Staking Bonded (r:1 w:1)
-	/// Proof: Staking Bonded (max_values: None, max_size: Some(72), added: 2547, mode: MaxEncodedLen)
-	/// Storage: Staking Ledger (r:1 w:1)
-	/// Proof: Staking Ledger (max_values: None, max_size: Some(1091), added: 3566, mode: MaxEncodedLen)
-	/// Storage: Staking CurrentEra (r:1 w:0)
-	/// Proof: Staking CurrentEra (max_values: Some(1), max_size: Some(4), added: 499, mode: MaxEncodedLen)
-	/// Storage: Balances Locks (r:1 w:1)
-	/// Proof: Balances Locks (max_values: None, max_size: Some(1299), added: 3774, mode: MaxEncodedLen)
-	/// Storage: Balances Freezes (r:1 w:0)
-	/// Proof: Balances Freezes (max_values: None, max_size: Some(49), added: 2524, mode: MaxEncodedLen)
-	/// Storage: NominationPools RewardPools (r:1 w:1)
-	/// Proof: NominationPools RewardPools (max_values: None, max_size: Some(92), added: 2567, mode: MaxEncodedLen)
-	/// Storage: NominationPools CounterForRewardPools (r:1 w:1)
-	/// Proof: NominationPools CounterForRewardPools (max_values: Some(1), max_size: Some(4), added: 499, mode: MaxEncodedLen)
-	/// Storage: NominationPools ReversePoolIdLookup (r:1 w:1)
-	/// Proof: NominationPools ReversePoolIdLookup (max_values: None, max_size: Some(44), added: 2519, mode: MaxEncodedLen)
-	/// Storage: NominationPools CounterForReversePoolIdLookup (r:1 w:1)
-	/// Proof: NominationPools CounterForReversePoolIdLookup (max_values: Some(1), max_size: Some(4), added: 499, mode: MaxEncodedLen)
-	/// Storage: NominationPools BondedPools (r:1 w:1)
-	/// Proof: NominationPools BondedPools (max_values: None, max_size: Some(220), added: 2695, mode: MaxEncodedLen)
-	/// Storage: Staking Payee (r:0 w:1)
-	/// Proof: Staking Payee (max_values: None, max_size: Some(73), added: 2548, mode: MaxEncodedLen)
-	fn create() -> Weight {
-		// Proof Size summary in bytes:
-		//  Measured:  `1222`
-		//  Estimated: `6196`
-		// Minimum execution time: 193_054_000 picoseconds.
-		Weight::from_parts(200_888_000, 0)
-			.saturating_add(Weight::from_parts(0, 6196))
-			.saturating_add(T::DbWeight::get().reads(22))
-			.saturating_add(T::DbWeight::get().writes(15))
-	}
-	/// Storage: NominationPools BondedPools (r:1 w:0)
-	/// Proof: NominationPools BondedPools (max_values: None, max_size: Some(220), added: 2695, mode: MaxEncodedLen)
-	/// Storage: Staking Bonded (r:1 w:0)
-	/// Proof: Staking Bonded (max_values: None, max_size: Some(72), added: 2547, mode: MaxEncodedLen)
-	/// Storage: Staking Ledger (r:1 w:0)
-	/// Proof: Staking Ledger (max_values: None, max_size: Some(1091), added: 3566, mode: MaxEncodedLen)
-	/// Storage: Staking MinNominatorBond (r:1 w:0)
-	/// Proof: Staking MinNominatorBond (max_values: Some(1), max_size: Some(16), added: 511, mode: MaxEncodedLen)
-	/// Storage: Staking Nominators (r:1 w:1)
-	/// Proof: Staking Nominators (max_values: None, max_size: Some(814), added: 3289, mode: MaxEncodedLen)
-	/// Storage: Staking MaxNominatorsCount (r:1 w:0)
-	/// Proof: Staking MaxNominatorsCount (max_values: Some(1), max_size: Some(4), added: 499, mode: MaxEncodedLen)
-	/// Storage: Staking Validators (r:25 w:0)
-	/// Proof: Staking Validators (max_values: None, max_size: Some(45), added: 2520, mode: MaxEncodedLen)
-	/// Storage: Staking CurrentEra (r:1 w:0)
-	/// Proof: Staking CurrentEra (max_values: Some(1), max_size: Some(4), added: 499, mode: MaxEncodedLen)
-	/// Storage: VoterList ListNodes (r:1 w:1)
-	/// Proof: VoterList ListNodes (max_values: None, max_size: Some(154), added: 2629, mode: MaxEncodedLen)
-	/// Storage: VoterList ListBags (r:1 w:1)
-	/// Proof: VoterList ListBags (max_values: None, max_size: Some(82), added: 2557, mode: MaxEncodedLen)
-	/// Storage: VoterList CounterForListNodes (r:1 w:1)
-	/// Proof: VoterList CounterForListNodes (max_values: Some(1), max_size: Some(4), added: 499, mode: MaxEncodedLen)
-	/// Storage: Staking CounterForNominators (r:1 w:1)
-	/// Proof: Staking CounterForNominators (max_values: Some(1), max_size: Some(4), added: 499, mode: MaxEncodedLen)
-	/// The range of component `n` is `[1, 24]`.
-	fn nominate(n: u32, ) -> Weight {
-		// Proof Size summary in bytes:
-		//  Measured:  `1774`
-		//  Estimated: `4556 + n * (2520 ±0)`
-		// Minimum execution time: 67_269_000 picoseconds.
-		Weight::from_parts(68_792_502, 0)
-			.saturating_add(Weight::from_parts(0, 4556))
-			// Standard Error: 6_020
-			.saturating_add(Weight::from_parts(1_407_587, 0).saturating_mul(n.into()))
-			.saturating_add(T::DbWeight::get().reads(12))
-			.saturating_add(T::DbWeight::get().reads((1_u64).saturating_mul(n.into())))
-			.saturating_add(T::DbWeight::get().writes(5))
-			.saturating_add(Weight::from_parts(0, 2520).saturating_mul(n.into()))
-	}
-	/// Storage: NominationPools BondedPools (r:1 w:1)
-	/// Proof: NominationPools BondedPools (max_values: None, max_size: Some(220), added: 2695, mode: MaxEncodedLen)
-	/// Storage: Staking Bonded (r:1 w:0)
-	/// Proof: Staking Bonded (max_values: None, max_size: Some(72), added: 2547, mode: MaxEncodedLen)
-	/// Storage: Staking Ledger (r:1 w:0)
-	/// Proof: Staking Ledger (max_values: None, max_size: Some(1091), added: 3566, mode: MaxEncodedLen)
-	fn set_state() -> Weight {
-		// Proof Size summary in bytes:
-		//  Measured:  `1363`
-		//  Estimated: `4556`
-		// Minimum execution time: 35_349_000 picoseconds.
-		Weight::from_parts(36_869_000, 0)
-			.saturating_add(Weight::from_parts(0, 4556))
-			.saturating_add(T::DbWeight::get().reads(3))
-			.saturating_add(T::DbWeight::get().writes(1))
-	}
-	/// Storage: NominationPools BondedPools (r:1 w:0)
-	/// Proof: NominationPools BondedPools (max_values: None, max_size: Some(220), added: 2695, mode: MaxEncodedLen)
-	/// Storage: NominationPools Metadata (r:1 w:1)
-	/// Proof: NominationPools Metadata (max_values: None, max_size: Some(270), added: 2745, mode: MaxEncodedLen)
-	/// Storage: NominationPools CounterForMetadata (r:1 w:1)
-	/// Proof: NominationPools CounterForMetadata (max_values: Some(1), max_size: Some(4), added: 499, mode: MaxEncodedLen)
-	/// The range of component `n` is `[1, 256]`.
-	fn set_metadata(n: u32, ) -> Weight {
-		// Proof Size summary in bytes:
-		//  Measured:  `531`
-		//  Estimated: `3735`
-		// Minimum execution time: 13_767_000 picoseconds.
-		Weight::from_parts(14_685_113, 0)
-			.saturating_add(Weight::from_parts(0, 3735))
-			// Standard Error: 303
-			.saturating_add(Weight::from_parts(1_304, 0).saturating_mul(n.into()))
-			.saturating_add(T::DbWeight::get().reads(3))
-			.saturating_add(T::DbWeight::get().writes(2))
-	}
-	/// Storage: NominationPools MinJoinBond (r:0 w:1)
-	/// Proof: NominationPools MinJoinBond (max_values: Some(1), max_size: Some(16), added: 511, mode: MaxEncodedLen)
-	/// Storage: NominationPools MaxPoolMembers (r:0 w:1)
-	/// Proof: NominationPools MaxPoolMembers (max_values: Some(1), max_size: Some(4), added: 499, mode: MaxEncodedLen)
-	/// Storage: NominationPools MaxPoolMembersPerPool (r:0 w:1)
-	/// Proof: NominationPools MaxPoolMembersPerPool (max_values: Some(1), max_size: Some(4), added: 499, mode: MaxEncodedLen)
-	/// Storage: NominationPools MinCreateBond (r:0 w:1)
-	/// Proof: NominationPools MinCreateBond (max_values: Some(1), max_size: Some(16), added: 511, mode: MaxEncodedLen)
-	/// Storage: NominationPools GlobalMaxCommission (r:0 w:1)
-	/// Proof: NominationPools GlobalMaxCommission (max_values: Some(1), max_size: Some(4), added: 499, mode: MaxEncodedLen)
-	/// Storage: NominationPools MaxPools (r:0 w:1)
-	/// Proof: NominationPools MaxPools (max_values: Some(1), max_size: Some(4), added: 499, mode: MaxEncodedLen)
-	fn set_configs() -> Weight {
-		// Proof Size summary in bytes:
-		//  Measured:  `0`
-		//  Estimated: `0`
-		// Minimum execution time: 6_044_000 picoseconds.
-		Weight::from_parts(6_296_000, 0)
-			.saturating_add(Weight::from_parts(0, 0))
-			.saturating_add(T::DbWeight::get().writes(6))
-	}
-	/// Storage: NominationPools BondedPools (r:1 w:1)
-	/// Proof: NominationPools BondedPools (max_values: None, max_size: Some(220), added: 2695, mode: MaxEncodedLen)
-	fn update_roles() -> Weight {
-		// Proof Size summary in bytes:
-		//  Measured:  `531`
-		//  Estimated: `3685`
-		// Minimum execution time: 19_642_000 picoseconds.
-		Weight::from_parts(20_205_000, 0)
-			.saturating_add(Weight::from_parts(0, 3685))
-			.saturating_add(T::DbWeight::get().reads(1))
-			.saturating_add(T::DbWeight::get().writes(1))
-	}
-	/// Storage: NominationPools BondedPools (r:1 w:0)
-	/// Proof: NominationPools BondedPools (max_values: None, max_size: Some(220), added: 2695, mode: MaxEncodedLen)
-	/// Storage: Staking Bonded (r:1 w:0)
-	/// Proof: Staking Bonded (max_values: None, max_size: Some(72), added: 2547, mode: MaxEncodedLen)
-	/// Storage: Staking Ledger (r:1 w:0)
-	/// Proof: Staking Ledger (max_values: None, max_size: Some(1091), added: 3566, mode: MaxEncodedLen)
-	/// Storage: Staking Validators (r:1 w:0)
-	/// Proof: Staking Validators (max_values: None, max_size: Some(45), added: 2520, mode: MaxEncodedLen)
-	/// Storage: Staking Nominators (r:1 w:1)
-	/// Proof: Staking Nominators (max_values: None, max_size: Some(814), added: 3289, mode: MaxEncodedLen)
-	/// Storage: Staking CounterForNominators (r:1 w:1)
-	/// Proof: Staking CounterForNominators (max_values: Some(1), max_size: Some(4), added: 499, mode: MaxEncodedLen)
-	/// Storage: VoterList ListNodes (r:1 w:1)
-	/// Proof: VoterList ListNodes (max_values: None, max_size: Some(154), added: 2629, mode: MaxEncodedLen)
-	/// Storage: VoterList ListBags (r:1 w:1)
-	/// Proof: VoterList ListBags (max_values: None, max_size: Some(82), added: 2557, mode: MaxEncodedLen)
-	/// Storage: VoterList CounterForListNodes (r:1 w:1)
-	/// Proof: VoterList CounterForListNodes (max_values: Some(1), max_size: Some(4), added: 499, mode: MaxEncodedLen)
-	fn chill() -> Weight {
-		// Proof Size summary in bytes:
-		//  Measured:  `1937`
-		//  Estimated: `4556`
-		// Minimum execution time: 65_923_000 picoseconds.
-		Weight::from_parts(68_711_000, 0)
-			.saturating_add(Weight::from_parts(0, 4556))
-			.saturating_add(T::DbWeight::get().reads(9))
-			.saturating_add(T::DbWeight::get().writes(5))
-	}
-	/// Storage: NominationPools BondedPools (r:1 w:1)
-	/// Proof: NominationPools BondedPools (max_values: None, max_size: Some(220), added: 2695, mode: MaxEncodedLen)
-	/// Storage: NominationPools RewardPools (r:1 w:1)
-	/// Proof: NominationPools RewardPools (max_values: None, max_size: Some(92), added: 2567, mode: MaxEncodedLen)
-	/// Storage: NominationPools GlobalMaxCommission (r:1 w:0)
-	/// Proof: NominationPools GlobalMaxCommission (max_values: Some(1), max_size: Some(4), added: 499, mode: MaxEncodedLen)
-	/// Storage: System Account (r:1 w:0)
-	/// Proof: System Account (max_values: None, max_size: Some(128), added: 2603, mode: MaxEncodedLen)
-	fn set_commission() -> Weight {
-		// Proof Size summary in bytes:
-		//  Measured:  `770`
-		//  Estimated: `3685`
-		// Minimum execution time: 32_824_000 picoseconds.
-		Weight::from_parts(33_654_000, 0)
-			.saturating_add(Weight::from_parts(0, 3685))
-			.saturating_add(T::DbWeight::get().reads(4))
-			.saturating_add(T::DbWeight::get().writes(2))
-	}
-	/// Storage: NominationPools BondedPools (r:1 w:1)
-	/// Proof: NominationPools BondedPools (max_values: None, max_size: Some(220), added: 2695, mode: MaxEncodedLen)
-	fn set_commission_max() -> Weight {
-		// Proof Size summary in bytes:
-		//  Measured:  `571`
-		//  Estimated: `3685`
-		// Minimum execution time: 18_577_000 picoseconds.
-		Weight::from_parts(19_317_000, 0)
-			.saturating_add(Weight::from_parts(0, 3685))
-			.saturating_add(T::DbWeight::get().reads(1))
-			.saturating_add(T::DbWeight::get().writes(1))
-	}
-	/// Storage: NominationPools BondedPools (r:1 w:1)
-	/// Proof: NominationPools BondedPools (max_values: None, max_size: Some(220), added: 2695, mode: MaxEncodedLen)
-	fn set_commission_change_rate() -> Weight {
-		// Proof Size summary in bytes:
-		//  Measured:  `531`
-		//  Estimated: `3685`
-		// Minimum execution time: 19_228_000 picoseconds.
-		Weight::from_parts(20_070_000, 0)
-			.saturating_add(Weight::from_parts(0, 3685))
-			.saturating_add(T::DbWeight::get().reads(1))
-			.saturating_add(T::DbWeight::get().writes(1))
-	}
-	/// Storage: NominationPools PoolMembers (r:1 w:0)
-	/// Proof: NominationPools PoolMembers (max_values: None, max_size: Some(717), added: 3192, mode: MaxEncodedLen)
-	/// Storage: NominationPools ClaimPermissions (r:1 w:1)
-	/// Proof: NominationPools ClaimPermissions (max_values: None, max_size: Some(41), added: 2516, mode: MaxEncodedLen)
-	fn set_claim_permission() -> Weight {
-		// Proof Size summary in bytes:
-		//  Measured:  `542`
-		//  Estimated: `4182`
-		// Minimum execution time: 14_300_000 picoseconds.
-		Weight::from_parts(14_678_000, 0)
-			.saturating_add(Weight::from_parts(0, 4182))
-			.saturating_add(T::DbWeight::get().reads(2))
-			.saturating_add(T::DbWeight::get().writes(1))
-	}
-	/// Storage: NominationPools BondedPools (r:1 w:0)
-	/// Proof: NominationPools BondedPools (max_values: None, max_size: Some(220), added: 2695, mode: MaxEncodedLen)
-	/// Storage: NominationPools RewardPools (r:1 w:1)
-	/// Proof: NominationPools RewardPools (max_values: None, max_size: Some(92), added: 2567, mode: MaxEncodedLen)
-	/// Storage: NominationPools GlobalMaxCommission (r:1 w:0)
-	/// Proof: NominationPools GlobalMaxCommission (max_values: Some(1), max_size: Some(4), added: 499, mode: MaxEncodedLen)
-	/// Storage: System Account (r:1 w:1)
-	/// Proof: System Account (max_values: None, max_size: Some(128), added: 2603, mode: MaxEncodedLen)
-	fn claim_commission() -> Weight {
-		// Proof Size summary in bytes:
-		//  Measured:  `968`
-		//  Estimated: `3685`
-		// Minimum execution time: 65_367_000 picoseconds.
-		Weight::from_parts(67_417_000, 0)
-			.saturating_add(Weight::from_parts(0, 3685))
-			.saturating_add(T::DbWeight::get().reads(4))
-			.saturating_add(T::DbWeight::get().writes(2))
-	}
-}
diff --git a/polkadot/runtime/kusama/src/weights/pallet_offences.rs b/polkadot/runtime/kusama/src/weights/pallet_offences.rs
deleted file mode 100644
index 12a045d66761c2214abfe782a1b52efd5fa6421c..0000000000000000000000000000000000000000
--- a/polkadot/runtime/kusama/src/weights/pallet_offences.rs
+++ /dev/null
@@ -1,222 +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/>.
-
-//! Autogenerated weights for `pallet_offences`
-//!
-//! THIS FILE WAS AUTO-GENERATED USING THE SUBSTRATE BENCHMARK CLI VERSION 4.0.0-dev
-//! DATE: 2023-06-19, STEPS: `50`, REPEAT: `20`, LOW RANGE: `[]`, HIGH RANGE: `[]`
-//! WORST CASE MAP SIZE: `1000000`
-//! HOSTNAME: `runner-e8ezs4ez-project-163-concurrent-0`, CPU: `Intel(R) Xeon(R) CPU @ 2.60GHz`
-//! EXECUTION: Some(Wasm), WASM-EXECUTION: Compiled, CHAIN: Some("kusama-dev"), DB CACHE: 1024
-
-// Executed Command:
-// ./target/production/polkadot
-// benchmark
-// pallet
-// --chain=kusama-dev
-// --steps=50
-// --repeat=20
-// --no-storage-info
-// --no-median-slopes
-// --no-min-squares
-// --pallet=pallet_offences
-// --extrinsic=*
-// --execution=wasm
-// --wasm-execution=compiled
-// --header=./file_header.txt
-// --output=./runtime/kusama/src/weights/
-
-#![cfg_attr(rustfmt, rustfmt_skip)]
-#![allow(unused_parens)]
-#![allow(unused_imports)]
-#![allow(missing_docs)]
-
-use frame_support::{traits::Get, weights::Weight};
-use core::marker::PhantomData;
-
-/// Weight functions for `pallet_offences`.
-pub struct WeightInfo<T>(PhantomData<T>);
-impl<T: frame_system::Config> pallet_offences::WeightInfo for WeightInfo<T> {
-	/// Storage: Offences ConcurrentReportsIndex (r:1 w:1)
-	/// Proof Skipped: Offences ConcurrentReportsIndex (max_values: None, max_size: None, mode: Measured)
-	/// Storage: Offences Reports (r:100 w:100)
-	/// Proof Skipped: Offences Reports (max_values: None, max_size: None, mode: Measured)
-	/// Storage: Staking SlashRewardFraction (r:1 w:0)
-	/// Proof: Staking SlashRewardFraction (max_values: Some(1), max_size: Some(4), added: 499, mode: MaxEncodedLen)
-	/// Storage: Staking ActiveEra (r:1 w:0)
-	/// Proof: Staking ActiveEra (max_values: Some(1), max_size: Some(13), added: 508, mode: MaxEncodedLen)
-	/// Storage: Staking ErasStartSessionIndex (r:1 w:0)
-	/// Proof: Staking ErasStartSessionIndex (max_values: None, max_size: Some(16), added: 2491, mode: MaxEncodedLen)
-	/// Storage: Staking Invulnerables (r:1 w:0)
-	/// Proof Skipped: Staking Invulnerables (max_values: Some(1), max_size: None, mode: Measured)
-	/// Storage: Staking ValidatorSlashInEra (r:100 w:100)
-	/// Proof: Staking ValidatorSlashInEra (max_values: None, max_size: Some(72), added: 2547, mode: MaxEncodedLen)
-	/// Storage: Staking SlashingSpans (r:2500 w:2500)
-	/// Proof Skipped: Staking SlashingSpans (max_values: None, max_size: None, mode: Measured)
-	/// Storage: Staking SpanSlash (r:2500 w:2500)
-	/// Proof: Staking SpanSlash (max_values: None, max_size: Some(76), added: 2551, mode: MaxEncodedLen)
-	/// Storage: Staking Validators (r:100 w:100)
-	/// Proof: Staking Validators (max_values: None, max_size: Some(45), added: 2520, mode: MaxEncodedLen)
-	/// Storage: Staking CounterForValidators (r:1 w:1)
-	/// Proof: Staking CounterForValidators (max_values: Some(1), max_size: Some(4), added: 499, mode: MaxEncodedLen)
-	/// Storage: VoterList ListNodes (r:299 w:299)
-	/// Proof: VoterList ListNodes (max_values: None, max_size: Some(154), added: 2629, mode: MaxEncodedLen)
-	/// Storage: VoterList ListBags (r:1 w:1)
-	/// Proof: VoterList ListBags (max_values: None, max_size: Some(82), added: 2557, mode: MaxEncodedLen)
-	/// Storage: VoterList CounterForListNodes (r:1 w:1)
-	/// Proof: VoterList CounterForListNodes (max_values: Some(1), max_size: Some(4), added: 499, mode: MaxEncodedLen)
-	/// Storage: Staking Nominators (r:100 w:0)
-	/// Proof: Staking Nominators (max_values: None, max_size: Some(814), added: 3289, mode: MaxEncodedLen)
-	/// Storage: Staking OffendingValidators (r:1 w:1)
-	/// Proof Skipped: Staking OffendingValidators (max_values: Some(1), max_size: None, mode: Measured)
-	/// Storage: Session Validators (r:1 w:0)
-	/// Proof Skipped: Session Validators (max_values: Some(1), max_size: None, mode: Measured)
-	/// Storage: Staking NominatorSlashInEra (r:2400 w:2400)
-	/// Proof: Staking NominatorSlashInEra (max_values: None, max_size: Some(68), added: 2543, mode: MaxEncodedLen)
-	/// Storage: Staking UnappliedSlashes (r:1 w:1)
-	/// Proof Skipped: Staking UnappliedSlashes (max_values: None, max_size: None, mode: Measured)
-	/// The range of component `r` is `[1, 100]`.
-	/// The range of component `o` is `[2, 100]`.
-	/// The range of component `n` is `[0, 24]`.
-	fn report_offence_im_online(_r: u32, o: u32, n: u32, ) -> Weight {
-		// Proof Size summary in bytes:
-		//  Measured:  `0 + n * (2863 ±0) + o * (1226 ±0)`
-		//  Estimated: `128540 + n * (156186 ±29) + o * (38402 ±7)`
-		// Minimum execution time: 695_466_000 picoseconds.
-		Weight::from_parts(705_203_000, 0)
-			.saturating_add(Weight::from_parts(0, 128540))
-			// Standard Error: 4_753_384
-			.saturating_add(Weight::from_parts(476_947_930, 0).saturating_mul(o.into()))
-			// Standard Error: 19_364_925
-			.saturating_add(Weight::from_parts(573_438_006, 0).saturating_mul(n.into()))
-			.saturating_add(T::DbWeight::get().reads(172))
-			.saturating_add(T::DbWeight::get().reads((51_u64).saturating_mul(o.into())))
-			.saturating_add(T::DbWeight::get().reads((185_u64).saturating_mul(n.into())))
-			.saturating_add(T::DbWeight::get().writes(165))
-			.saturating_add(T::DbWeight::get().writes((50_u64).saturating_mul(o.into())))
-			.saturating_add(T::DbWeight::get().writes((185_u64).saturating_mul(n.into())))
-			.saturating_add(Weight::from_parts(0, 156186).saturating_mul(n.into()))
-			.saturating_add(Weight::from_parts(0, 38402).saturating_mul(o.into()))
-	}
-	/// Storage: Offences ConcurrentReportsIndex (r:1 w:1)
-	/// Proof Skipped: Offences ConcurrentReportsIndex (max_values: None, max_size: None, mode: Measured)
-	/// Storage: Offences Reports (r:1 w:1)
-	/// Proof Skipped: Offences Reports (max_values: None, max_size: None, mode: Measured)
-	/// Storage: Staking SlashRewardFraction (r:1 w:0)
-	/// Proof: Staking SlashRewardFraction (max_values: Some(1), max_size: Some(4), added: 499, mode: MaxEncodedLen)
-	/// Storage: Staking ActiveEra (r:1 w:0)
-	/// Proof: Staking ActiveEra (max_values: Some(1), max_size: Some(13), added: 508, mode: MaxEncodedLen)
-	/// Storage: Staking ErasStartSessionIndex (r:1 w:0)
-	/// Proof: Staking ErasStartSessionIndex (max_values: None, max_size: Some(16), added: 2491, mode: MaxEncodedLen)
-	/// Storage: Staking Invulnerables (r:1 w:0)
-	/// Proof Skipped: Staking Invulnerables (max_values: Some(1), max_size: None, mode: Measured)
-	/// Storage: Staking ValidatorSlashInEra (r:1 w:1)
-	/// Proof: Staking ValidatorSlashInEra (max_values: None, max_size: Some(72), added: 2547, mode: MaxEncodedLen)
-	/// Storage: Staking SlashingSpans (r:25 w:25)
-	/// Proof Skipped: Staking SlashingSpans (max_values: None, max_size: None, mode: Measured)
-	/// Storage: Staking SpanSlash (r:25 w:25)
-	/// Proof: Staking SpanSlash (max_values: None, max_size: Some(76), added: 2551, mode: MaxEncodedLen)
-	/// Storage: Staking Validators (r:1 w:1)
-	/// Proof: Staking Validators (max_values: None, max_size: Some(45), added: 2520, mode: MaxEncodedLen)
-	/// Storage: Staking CounterForValidators (r:1 w:1)
-	/// Proof: Staking CounterForValidators (max_values: Some(1), max_size: Some(4), added: 499, mode: MaxEncodedLen)
-	/// Storage: VoterList ListNodes (r:2 w:2)
-	/// Proof: VoterList ListNodes (max_values: None, max_size: Some(154), added: 2629, mode: MaxEncodedLen)
-	/// Storage: VoterList ListBags (r:1 w:1)
-	/// Proof: VoterList ListBags (max_values: None, max_size: Some(82), added: 2557, mode: MaxEncodedLen)
-	/// Storage: VoterList CounterForListNodes (r:1 w:1)
-	/// Proof: VoterList CounterForListNodes (max_values: Some(1), max_size: Some(4), added: 499, mode: MaxEncodedLen)
-	/// Storage: Staking Nominators (r:1 w:0)
-	/// Proof: Staking Nominators (max_values: None, max_size: Some(814), added: 3289, mode: MaxEncodedLen)
-	/// Storage: Staking OffendingValidators (r:1 w:1)
-	/// Proof Skipped: Staking OffendingValidators (max_values: Some(1), max_size: None, mode: Measured)
-	/// Storage: Session Validators (r:1 w:0)
-	/// Proof Skipped: Session Validators (max_values: Some(1), max_size: None, mode: Measured)
-	/// Storage: Staking NominatorSlashInEra (r:24 w:24)
-	/// Proof: Staking NominatorSlashInEra (max_values: None, max_size: Some(68), added: 2543, mode: MaxEncodedLen)
-	/// 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 `[0, 24]`.
-	fn report_offence_grandpa(n: u32, ) -> Weight {
-		// Proof Size summary in bytes:
-		//  Measured:  `1831 + n * (48 ±0)`
-		//  Estimated: `5686 + n * (2551 ±0)`
-		// Minimum execution time: 92_093_000 picoseconds.
-		Weight::from_parts(104_573_662, 0)
-			.saturating_add(Weight::from_parts(0, 5686))
-			// Standard Error: 22_045
-			.saturating_add(Weight::from_parts(10_859_187, 0).saturating_mul(n.into()))
-			.saturating_add(T::DbWeight::get().reads(19))
-			.saturating_add(T::DbWeight::get().reads((3_u64).saturating_mul(n.into())))
-			.saturating_add(T::DbWeight::get().writes(13))
-			.saturating_add(T::DbWeight::get().writes((3_u64).saturating_mul(n.into())))
-			.saturating_add(Weight::from_parts(0, 2551).saturating_mul(n.into()))
-	}
-	/// Storage: Offences ConcurrentReportsIndex (r:1 w:1)
-	/// Proof Skipped: Offences ConcurrentReportsIndex (max_values: None, max_size: None, mode: Measured)
-	/// Storage: Offences Reports (r:1 w:1)
-	/// Proof Skipped: Offences Reports (max_values: None, max_size: None, mode: Measured)
-	/// Storage: Staking SlashRewardFraction (r:1 w:0)
-	/// Proof: Staking SlashRewardFraction (max_values: Some(1), max_size: Some(4), added: 499, mode: MaxEncodedLen)
-	/// Storage: Staking ActiveEra (r:1 w:0)
-	/// Proof: Staking ActiveEra (max_values: Some(1), max_size: Some(13), added: 508, mode: MaxEncodedLen)
-	/// Storage: Staking ErasStartSessionIndex (r:1 w:0)
-	/// Proof: Staking ErasStartSessionIndex (max_values: None, max_size: Some(16), added: 2491, mode: MaxEncodedLen)
-	/// Storage: Staking Invulnerables (r:1 w:0)
-	/// Proof Skipped: Staking Invulnerables (max_values: Some(1), max_size: None, mode: Measured)
-	/// Storage: Staking ValidatorSlashInEra (r:1 w:1)
-	/// Proof: Staking ValidatorSlashInEra (max_values: None, max_size: Some(72), added: 2547, mode: MaxEncodedLen)
-	/// Storage: Staking SlashingSpans (r:25 w:25)
-	/// Proof Skipped: Staking SlashingSpans (max_values: None, max_size: None, mode: Measured)
-	/// Storage: Staking SpanSlash (r:25 w:25)
-	/// Proof: Staking SpanSlash (max_values: None, max_size: Some(76), added: 2551, mode: MaxEncodedLen)
-	/// Storage: Staking Validators (r:1 w:1)
-	/// Proof: Staking Validators (max_values: None, max_size: Some(45), added: 2520, mode: MaxEncodedLen)
-	/// Storage: Staking CounterForValidators (r:1 w:1)
-	/// Proof: Staking CounterForValidators (max_values: Some(1), max_size: Some(4), added: 499, mode: MaxEncodedLen)
-	/// Storage: VoterList ListNodes (r:2 w:2)
-	/// Proof: VoterList ListNodes (max_values: None, max_size: Some(154), added: 2629, mode: MaxEncodedLen)
-	/// Storage: VoterList ListBags (r:1 w:1)
-	/// Proof: VoterList ListBags (max_values: None, max_size: Some(82), added: 2557, mode: MaxEncodedLen)
-	/// Storage: VoterList CounterForListNodes (r:1 w:1)
-	/// Proof: VoterList CounterForListNodes (max_values: Some(1), max_size: Some(4), added: 499, mode: MaxEncodedLen)
-	/// Storage: Staking Nominators (r:1 w:0)
-	/// Proof: Staking Nominators (max_values: None, max_size: Some(814), added: 3289, mode: MaxEncodedLen)
-	/// Storage: Staking OffendingValidators (r:1 w:1)
-	/// Proof Skipped: Staking OffendingValidators (max_values: Some(1), max_size: None, mode: Measured)
-	/// Storage: Session Validators (r:1 w:0)
-	/// Proof Skipped: Session Validators (max_values: Some(1), max_size: None, mode: Measured)
-	/// Storage: Staking NominatorSlashInEra (r:24 w:24)
-	/// Proof: Staking NominatorSlashInEra (max_values: None, max_size: Some(68), added: 2543, mode: MaxEncodedLen)
-	/// 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 `[0, 24]`.
-	fn report_offence_babe(n: u32, ) -> Weight {
-		// Proof Size summary in bytes:
-		//  Measured:  `1831 + n * (48 ±0)`
-		//  Estimated: `5686 + n * (2551 ±0)`
-		// Minimum execution time: 92_097_000 picoseconds.
-		Weight::from_parts(104_496_920, 0)
-			.saturating_add(Weight::from_parts(0, 5686))
-			// Standard Error: 25_384
-			.saturating_add(Weight::from_parts(10_982_115, 0).saturating_mul(n.into()))
-			.saturating_add(T::DbWeight::get().reads(19))
-			.saturating_add(T::DbWeight::get().reads((3_u64).saturating_mul(n.into())))
-			.saturating_add(T::DbWeight::get().writes(13))
-			.saturating_add(T::DbWeight::get().writes((3_u64).saturating_mul(n.into())))
-			.saturating_add(Weight::from_parts(0, 2551).saturating_mul(n.into()))
-	}
-}
diff --git a/polkadot/runtime/kusama/src/weights/pallet_preimage.rs b/polkadot/runtime/kusama/src/weights/pallet_preimage.rs
deleted file mode 100644
index 8c04eb2cd4ea424cc77dcdf6e882eff987408096..0000000000000000000000000000000000000000
--- a/polkadot/runtime/kusama/src/weights/pallet_preimage.rs
+++ /dev/null
@@ -1,218 +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/>.
-
-//! Autogenerated weights for `pallet_preimage`
-//!
-//! THIS FILE WAS AUTO-GENERATED USING THE SUBSTRATE BENCHMARK CLI VERSION 4.0.0-dev
-//! DATE: 2023-06-19, STEPS: `50`, REPEAT: `20`, LOW RANGE: `[]`, HIGH RANGE: `[]`
-//! WORST CASE MAP SIZE: `1000000`
-//! HOSTNAME: `runner-e8ezs4ez-project-163-concurrent-0`, CPU: `Intel(R) Xeon(R) CPU @ 2.60GHz`
-//! EXECUTION: Some(Wasm), WASM-EXECUTION: Compiled, CHAIN: Some("kusama-dev"), DB CACHE: 1024
-
-// Executed Command:
-// ./target/production/polkadot
-// benchmark
-// pallet
-// --chain=kusama-dev
-// --steps=50
-// --repeat=20
-// --no-storage-info
-// --no-median-slopes
-// --no-min-squares
-// --pallet=pallet_preimage
-// --extrinsic=*
-// --execution=wasm
-// --wasm-execution=compiled
-// --header=./file_header.txt
-// --output=./runtime/kusama/src/weights/
-
-#![cfg_attr(rustfmt, rustfmt_skip)]
-#![allow(unused_parens)]
-#![allow(unused_imports)]
-#![allow(missing_docs)]
-
-use frame_support::{traits::Get, weights::Weight};
-use core::marker::PhantomData;
-
-/// Weight functions for `pallet_preimage`.
-pub struct WeightInfo<T>(PhantomData<T>);
-impl<T: frame_system::Config> pallet_preimage::WeightInfo for WeightInfo<T> {
-	/// Storage: Preimage StatusFor (r:1 w:1)
-	/// Proof: Preimage StatusFor (max_values: None, max_size: Some(91), added: 2566, mode: MaxEncodedLen)
-	/// Storage: Preimage PreimageFor (r:0 w:1)
-	/// Proof: Preimage PreimageFor (max_values: None, max_size: Some(4194344), added: 4196819, mode: MaxEncodedLen)
-	/// The range of component `s` is `[0, 4194304]`.
-	fn note_preimage(s: u32, ) -> Weight {
-		// Proof Size summary in bytes:
-		//  Measured:  `143`
-		//  Estimated: `3556`
-		// Minimum execution time: 29_231_000 picoseconds.
-		Weight::from_parts(29_712_000, 0)
-			.saturating_add(Weight::from_parts(0, 3556))
-			// Standard Error: 5
-			.saturating_add(Weight::from_parts(2_593, 0).saturating_mul(s.into()))
-			.saturating_add(T::DbWeight::get().reads(1))
-			.saturating_add(T::DbWeight::get().writes(2))
-	}
-	/// Storage: Preimage StatusFor (r:1 w:1)
-	/// Proof: Preimage StatusFor (max_values: None, max_size: Some(91), added: 2566, mode: MaxEncodedLen)
-	/// Storage: Preimage PreimageFor (r:0 w:1)
-	/// Proof: Preimage PreimageFor (max_values: None, max_size: Some(4194344), added: 4196819, mode: MaxEncodedLen)
-	/// The range of component `s` is `[0, 4194304]`.
-	fn note_requested_preimage(s: u32, ) -> Weight {
-		// Proof Size summary in bytes:
-		//  Measured:  `106`
-		//  Estimated: `3556`
-		// Minimum execution time: 15_753_000 picoseconds.
-		Weight::from_parts(15_927_000, 0)
-			.saturating_add(Weight::from_parts(0, 3556))
-			// Standard Error: 5
-			.saturating_add(Weight::from_parts(2_585, 0).saturating_mul(s.into()))
-			.saturating_add(T::DbWeight::get().reads(1))
-			.saturating_add(T::DbWeight::get().writes(2))
-	}
-	/// Storage: Preimage StatusFor (r:1 w:1)
-	/// Proof: Preimage StatusFor (max_values: None, max_size: Some(91), added: 2566, mode: MaxEncodedLen)
-	/// Storage: Preimage PreimageFor (r:0 w:1)
-	/// Proof: Preimage PreimageFor (max_values: None, max_size: Some(4194344), added: 4196819, mode: MaxEncodedLen)
-	/// The range of component `s` is `[0, 4194304]`.
-	fn note_no_deposit_preimage(s: u32, ) -> Weight {
-		// Proof Size summary in bytes:
-		//  Measured:  `106`
-		//  Estimated: `3556`
-		// Minimum execution time: 15_147_000 picoseconds.
-		Weight::from_parts(15_364_000, 0)
-			.saturating_add(Weight::from_parts(0, 3556))
-			// Standard Error: 4
-			.saturating_add(Weight::from_parts(2_553, 0).saturating_mul(s.into()))
-			.saturating_add(T::DbWeight::get().reads(1))
-			.saturating_add(T::DbWeight::get().writes(2))
-	}
-	/// Storage: Preimage StatusFor (r:1 w:1)
-	/// Proof: Preimage StatusFor (max_values: None, max_size: Some(91), added: 2566, mode: MaxEncodedLen)
-	/// Storage: Preimage PreimageFor (r:0 w:1)
-	/// Proof: Preimage PreimageFor (max_values: None, max_size: Some(4194344), added: 4196819, mode: MaxEncodedLen)
-	fn unnote_preimage() -> Weight {
-		// Proof Size summary in bytes:
-		//  Measured:  `289`
-		//  Estimated: `3556`
-		// Minimum execution time: 52_018_000 picoseconds.
-		Weight::from_parts(57_037_000, 0)
-			.saturating_add(Weight::from_parts(0, 3556))
-			.saturating_add(T::DbWeight::get().reads(1))
-			.saturating_add(T::DbWeight::get().writes(2))
-	}
-	/// Storage: Preimage StatusFor (r:1 w:1)
-	/// Proof: Preimage StatusFor (max_values: None, max_size: Some(91), added: 2566, mode: MaxEncodedLen)
-	/// Storage: Preimage PreimageFor (r:0 w:1)
-	/// Proof: Preimage PreimageFor (max_values: None, max_size: Some(4194344), added: 4196819, mode: MaxEncodedLen)
-	fn unnote_no_deposit_preimage() -> Weight {
-		// Proof Size summary in bytes:
-		//  Measured:  `144`
-		//  Estimated: `3556`
-		// Minimum execution time: 32_110_000 picoseconds.
-		Weight::from_parts(35_435_000, 0)
-			.saturating_add(Weight::from_parts(0, 3556))
-			.saturating_add(T::DbWeight::get().reads(1))
-			.saturating_add(T::DbWeight::get().writes(2))
-	}
-	/// Storage: Preimage StatusFor (r:1 w:1)
-	/// Proof: Preimage StatusFor (max_values: None, max_size: Some(91), added: 2566, mode: MaxEncodedLen)
-	fn request_preimage() -> Weight {
-		// Proof Size summary in bytes:
-		//  Measured:  `188`
-		//  Estimated: `3556`
-		// Minimum execution time: 28_380_000 picoseconds.
-		Weight::from_parts(31_692_000, 0)
-			.saturating_add(Weight::from_parts(0, 3556))
-			.saturating_add(T::DbWeight::get().reads(1))
-			.saturating_add(T::DbWeight::get().writes(1))
-	}
-	/// Storage: Preimage StatusFor (r:1 w:1)
-	/// Proof: Preimage StatusFor (max_values: None, max_size: Some(91), added: 2566, mode: MaxEncodedLen)
-	fn request_no_deposit_preimage() -> Weight {
-		// Proof Size summary in bytes:
-		//  Measured:  `144`
-		//  Estimated: `3556`
-		// Minimum execution time: 18_218_000 picoseconds.
-		Weight::from_parts(20_005_000, 0)
-			.saturating_add(Weight::from_parts(0, 3556))
-			.saturating_add(T::DbWeight::get().reads(1))
-			.saturating_add(T::DbWeight::get().writes(1))
-	}
-	/// Storage: Preimage StatusFor (r:1 w:1)
-	/// Proof: Preimage StatusFor (max_values: None, max_size: Some(91), added: 2566, mode: MaxEncodedLen)
-	fn request_unnoted_preimage() -> Weight {
-		// Proof Size summary in bytes:
-		//  Measured:  `42`
-		//  Estimated: `3556`
-		// Minimum execution time: 24_225_000 picoseconds.
-		Weight::from_parts(27_623_000, 0)
-			.saturating_add(Weight::from_parts(0, 3556))
-			.saturating_add(T::DbWeight::get().reads(1))
-			.saturating_add(T::DbWeight::get().writes(1))
-	}
-	/// Storage: Preimage StatusFor (r:1 w:1)
-	/// Proof: Preimage StatusFor (max_values: None, max_size: Some(91), added: 2566, mode: MaxEncodedLen)
-	fn request_requested_preimage() -> Weight {
-		// Proof Size summary in bytes:
-		//  Measured:  `106`
-		//  Estimated: `3556`
-		// Minimum execution time: 11_614_000 picoseconds.
-		Weight::from_parts(12_372_000, 0)
-			.saturating_add(Weight::from_parts(0, 3556))
-			.saturating_add(T::DbWeight::get().reads(1))
-			.saturating_add(T::DbWeight::get().writes(1))
-	}
-	/// Storage: Preimage StatusFor (r:1 w:1)
-	/// Proof: Preimage StatusFor (max_values: None, max_size: Some(91), added: 2566, mode: MaxEncodedLen)
-	/// Storage: Preimage PreimageFor (r:0 w:1)
-	/// Proof: Preimage PreimageFor (max_values: None, max_size: Some(4194344), added: 4196819, mode: MaxEncodedLen)
-	fn unrequest_preimage() -> Weight {
-		// Proof Size summary in bytes:
-		//  Measured:  `144`
-		//  Estimated: `3556`
-		// Minimum execution time: 30_214_000 picoseconds.
-		Weight::from_parts(32_682_000, 0)
-			.saturating_add(Weight::from_parts(0, 3556))
-			.saturating_add(T::DbWeight::get().reads(1))
-			.saturating_add(T::DbWeight::get().writes(2))
-	}
-	/// Storage: Preimage StatusFor (r:1 w:1)
-	/// Proof: Preimage StatusFor (max_values: None, max_size: Some(91), added: 2566, mode: MaxEncodedLen)
-	fn unrequest_unnoted_preimage() -> Weight {
-		// Proof Size summary in bytes:
-		//  Measured:  `106`
-		//  Estimated: `3556`
-		// Minimum execution time: 10_659_000 picoseconds.
-		Weight::from_parts(12_066_000, 0)
-			.saturating_add(Weight::from_parts(0, 3556))
-			.saturating_add(T::DbWeight::get().reads(1))
-			.saturating_add(T::DbWeight::get().writes(1))
-	}
-	/// Storage: Preimage StatusFor (r:1 w:1)
-	/// Proof: Preimage StatusFor (max_values: None, max_size: Some(91), added: 2566, mode: MaxEncodedLen)
-	fn unrequest_multi_referenced_preimage() -> Weight {
-		// Proof Size summary in bytes:
-		//  Measured:  `106`
-		//  Estimated: `3556`
-		// Minimum execution time: 10_770_000 picoseconds.
-		Weight::from_parts(11_745_000, 0)
-			.saturating_add(Weight::from_parts(0, 3556))
-			.saturating_add(T::DbWeight::get().reads(1))
-			.saturating_add(T::DbWeight::get().writes(1))
-	}
-}
diff --git a/polkadot/runtime/kusama/src/weights/pallet_proxy.rs b/polkadot/runtime/kusama/src/weights/pallet_proxy.rs
deleted file mode 100644
index d30547d7d01cd95a766a13ff9a26a73418b059b5..0000000000000000000000000000000000000000
--- a/polkadot/runtime/kusama/src/weights/pallet_proxy.rs
+++ /dev/null
@@ -1,224 +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/>.
-
-//! Autogenerated weights for `pallet_proxy`
-//!
-//! THIS FILE WAS AUTO-GENERATED USING THE SUBSTRATE BENCHMARK CLI VERSION 4.0.0-dev
-//! DATE: 2023-06-19, STEPS: `50`, REPEAT: `20`, LOW RANGE: `[]`, HIGH RANGE: `[]`
-//! WORST CASE MAP SIZE: `1000000`
-//! HOSTNAME: `runner-e8ezs4ez-project-163-concurrent-0`, CPU: `Intel(R) Xeon(R) CPU @ 2.60GHz`
-//! EXECUTION: Some(Wasm), WASM-EXECUTION: Compiled, CHAIN: Some("kusama-dev"), DB CACHE: 1024
-
-// Executed Command:
-// ./target/production/polkadot
-// benchmark
-// pallet
-// --chain=kusama-dev
-// --steps=50
-// --repeat=20
-// --no-storage-info
-// --no-median-slopes
-// --no-min-squares
-// --pallet=pallet_proxy
-// --extrinsic=*
-// --execution=wasm
-// --wasm-execution=compiled
-// --header=./file_header.txt
-// --output=./runtime/kusama/src/weights/
-
-#![cfg_attr(rustfmt, rustfmt_skip)]
-#![allow(unused_parens)]
-#![allow(unused_imports)]
-#![allow(missing_docs)]
-
-use frame_support::{traits::Get, weights::Weight};
-use core::marker::PhantomData;
-
-/// Weight functions for `pallet_proxy`.
-pub struct WeightInfo<T>(PhantomData<T>);
-impl<T: frame_system::Config> pallet_proxy::WeightInfo for WeightInfo<T> {
-	/// Storage: Proxy Proxies (r:1 w:0)
-	/// Proof: Proxy Proxies (max_values: None, max_size: Some(1241), added: 3716, mode: MaxEncodedLen)
-	/// The range of component `p` is `[1, 31]`.
-	fn proxy(p: u32, ) -> Weight {
-		// Proof Size summary in bytes:
-		//  Measured:  `227 + p * (37 ±0)`
-		//  Estimated: `4706`
-		// Minimum execution time: 15_098_000 picoseconds.
-		Weight::from_parts(15_489_847, 0)
-			.saturating_add(Weight::from_parts(0, 4706))
-			// Standard Error: 2_263
-			.saturating_add(Weight::from_parts(63_093, 0).saturating_mul(p.into()))
-			.saturating_add(T::DbWeight::get().reads(1))
-	}
-	/// Storage: Proxy Proxies (r:1 w:0)
-	/// Proof: Proxy Proxies (max_values: None, max_size: Some(1241), added: 3716, mode: MaxEncodedLen)
-	/// Storage: Proxy Announcements (r:1 w:1)
-	/// Proof: Proxy Announcements (max_values: None, max_size: Some(2233), added: 4708, mode: MaxEncodedLen)
-	/// Storage: System Account (r:1 w:1)
-	/// Proof: System Account (max_values: None, max_size: Some(128), added: 2603, mode: MaxEncodedLen)
-	/// The range of component `a` is `[0, 31]`.
-	/// The range of component `p` is `[1, 31]`.
-	fn proxy_announced(a: u32, p: u32, ) -> Weight {
-		// Proof Size summary in bytes:
-		//  Measured:  `554 + a * (68 ±0) + p * (37 ±0)`
-		//  Estimated: `5698`
-		// Minimum execution time: 39_651_000 picoseconds.
-		Weight::from_parts(40_543_916, 0)
-			.saturating_add(Weight::from_parts(0, 5698))
-			// Standard Error: 4_675
-			.saturating_add(Weight::from_parts(155_883, 0).saturating_mul(a.into()))
-			// Standard Error: 4_830
-			.saturating_add(Weight::from_parts(30_475, 0).saturating_mul(p.into()))
-			.saturating_add(T::DbWeight::get().reads(3))
-			.saturating_add(T::DbWeight::get().writes(2))
-	}
-	/// Storage: Proxy Announcements (r:1 w:1)
-	/// Proof: Proxy Announcements (max_values: None, max_size: Some(2233), added: 4708, mode: MaxEncodedLen)
-	/// Storage: System Account (r:1 w:1)
-	/// Proof: System Account (max_values: None, max_size: Some(128), added: 2603, mode: MaxEncodedLen)
-	/// The range of component `a` is `[0, 31]`.
-	/// The range of component `p` is `[1, 31]`.
-	fn remove_announcement(a: u32, p: u32, ) -> Weight {
-		// Proof Size summary in bytes:
-		//  Measured:  `469 + a * (68 ±0)`
-		//  Estimated: `5698`
-		// Minimum execution time: 24_096_000 picoseconds.
-		Weight::from_parts(25_043_982, 0)
-			.saturating_add(Weight::from_parts(0, 5698))
-			// Standard Error: 2_018
-			.saturating_add(Weight::from_parts(161_362, 0).saturating_mul(a.into()))
-			// Standard Error: 2_085
-			.saturating_add(Weight::from_parts(5_869, 0).saturating_mul(p.into()))
-			.saturating_add(T::DbWeight::get().reads(2))
-			.saturating_add(T::DbWeight::get().writes(2))
-	}
-	/// Storage: Proxy Announcements (r:1 w:1)
-	/// Proof: Proxy Announcements (max_values: None, max_size: Some(2233), added: 4708, mode: MaxEncodedLen)
-	/// Storage: System Account (r:1 w:1)
-	/// Proof: System Account (max_values: None, max_size: Some(128), added: 2603, mode: MaxEncodedLen)
-	/// The range of component `a` is `[0, 31]`.
-	/// The range of component `p` is `[1, 31]`.
-	fn reject_announcement(a: u32, _p: u32, ) -> Weight {
-		// Proof Size summary in bytes:
-		//  Measured:  `469 + a * (68 ±0)`
-		//  Estimated: `5698`
-		// Minimum execution time: 24_544_000 picoseconds.
-		Weight::from_parts(25_464_879, 0)
-			.saturating_add(Weight::from_parts(0, 5698))
-			// Standard Error: 1_840
-			.saturating_add(Weight::from_parts(157_224, 0).saturating_mul(a.into()))
-			.saturating_add(T::DbWeight::get().reads(2))
-			.saturating_add(T::DbWeight::get().writes(2))
-	}
-	/// Storage: Proxy Proxies (r:1 w:0)
-	/// Proof: Proxy Proxies (max_values: None, max_size: Some(1241), added: 3716, mode: MaxEncodedLen)
-	/// Storage: Proxy Announcements (r:1 w:1)
-	/// Proof: Proxy Announcements (max_values: None, max_size: Some(2233), added: 4708, mode: MaxEncodedLen)
-	/// Storage: System Account (r:1 w:1)
-	/// Proof: System Account (max_values: None, max_size: Some(128), added: 2603, mode: MaxEncodedLen)
-	/// The range of component `a` is `[0, 31]`.
-	/// The range of component `p` is `[1, 31]`.
-	fn announce(a: u32, p: u32, ) -> Weight {
-		// Proof Size summary in bytes:
-		//  Measured:  `486 + a * (68 ±0) + p * (37 ±0)`
-		//  Estimated: `5698`
-		// Minimum execution time: 33_869_000 picoseconds.
-		Weight::from_parts(36_671_590, 0)
-			.saturating_add(Weight::from_parts(0, 5698))
-			// Standard Error: 4_508
-			.saturating_add(Weight::from_parts(170_494, 0).saturating_mul(a.into()))
-			// Standard Error: 4_657
-			.saturating_add(Weight::from_parts(29_881, 0).saturating_mul(p.into()))
-			.saturating_add(T::DbWeight::get().reads(3))
-			.saturating_add(T::DbWeight::get().writes(2))
-	}
-	/// Storage: Proxy Proxies (r:1 w:1)
-	/// Proof: Proxy Proxies (max_values: None, max_size: Some(1241), added: 3716, mode: MaxEncodedLen)
-	/// The range of component `p` is `[1, 31]`.
-	fn add_proxy(p: u32, ) -> Weight {
-		// Proof Size summary in bytes:
-		//  Measured:  `227 + p * (37 ±0)`
-		//  Estimated: `4706`
-		// Minimum execution time: 25_378_000 picoseconds.
-		Weight::from_parts(26_232_312, 0)
-			.saturating_add(Weight::from_parts(0, 4706))
-			// Standard Error: 1_337
-			.saturating_add(Weight::from_parts(62_294, 0).saturating_mul(p.into()))
-			.saturating_add(T::DbWeight::get().reads(1))
-			.saturating_add(T::DbWeight::get().writes(1))
-	}
-	/// Storage: Proxy Proxies (r:1 w:1)
-	/// Proof: Proxy Proxies (max_values: None, max_size: Some(1241), added: 3716, mode: MaxEncodedLen)
-	/// The range of component `p` is `[1, 31]`.
-	fn remove_proxy(p: u32, ) -> Weight {
-		// Proof Size summary in bytes:
-		//  Measured:  `227 + p * (37 ±0)`
-		//  Estimated: `4706`
-		// Minimum execution time: 25_306_000 picoseconds.
-		Weight::from_parts(26_702_472, 0)
-			.saturating_add(Weight::from_parts(0, 4706))
-			// Standard Error: 1_760
-			.saturating_add(Weight::from_parts(52_636, 0).saturating_mul(p.into()))
-			.saturating_add(T::DbWeight::get().reads(1))
-			.saturating_add(T::DbWeight::get().writes(1))
-	}
-	/// Storage: Proxy Proxies (r:1 w:1)
-	/// Proof: Proxy Proxies (max_values: None, max_size: Some(1241), added: 3716, mode: MaxEncodedLen)
-	/// The range of component `p` is `[1, 31]`.
-	fn remove_proxies(p: u32, ) -> Weight {
-		// Proof Size summary in bytes:
-		//  Measured:  `227 + p * (37 ±0)`
-		//  Estimated: `4706`
-		// Minimum execution time: 22_177_000 picoseconds.
-		Weight::from_parts(22_859_150, 0)
-			.saturating_add(Weight::from_parts(0, 4706))
-			// Standard Error: 2_374
-			.saturating_add(Weight::from_parts(51_085, 0).saturating_mul(p.into()))
-			.saturating_add(T::DbWeight::get().reads(1))
-			.saturating_add(T::DbWeight::get().writes(1))
-	}
-	/// Storage: Proxy Proxies (r:1 w:1)
-	/// Proof: Proxy Proxies (max_values: None, max_size: Some(1241), added: 3716, mode: MaxEncodedLen)
-	/// The range of component `p` is `[1, 31]`.
-	fn create_pure(p: u32, ) -> Weight {
-		// Proof Size summary in bytes:
-		//  Measured:  `239`
-		//  Estimated: `4706`
-		// Minimum execution time: 27_010_000 picoseconds.
-		Weight::from_parts(27_910_735, 0)
-			.saturating_add(Weight::from_parts(0, 4706))
-			// Standard Error: 1_618
-			.saturating_add(Weight::from_parts(10_864, 0).saturating_mul(p.into()))
-			.saturating_add(T::DbWeight::get().reads(1))
-			.saturating_add(T::DbWeight::get().writes(1))
-	}
-	/// Storage: Proxy Proxies (r:1 w:1)
-	/// Proof: Proxy Proxies (max_values: None, max_size: Some(1241), added: 3716, mode: MaxEncodedLen)
-	/// The range of component `p` is `[0, 30]`.
-	fn kill_pure(p: u32, ) -> Weight {
-		// Proof Size summary in bytes:
-		//  Measured:  `264 + p * (37 ±0)`
-		//  Estimated: `4706`
-		// Minimum execution time: 23_039_000 picoseconds.
-		Weight::from_parts(23_903_487, 0)
-			.saturating_add(Weight::from_parts(0, 4706))
-			// Standard Error: 2_434
-			.saturating_add(Weight::from_parts(45_603, 0).saturating_mul(p.into()))
-			.saturating_add(T::DbWeight::get().reads(1))
-			.saturating_add(T::DbWeight::get().writes(1))
-	}
-}
diff --git a/polkadot/runtime/kusama/src/weights/pallet_ranked_collective.rs b/polkadot/runtime/kusama/src/weights/pallet_ranked_collective.rs
deleted file mode 100644
index 21f3f651f2e3b2baf5015f7090b09880dc13b87a..0000000000000000000000000000000000000000
--- a/polkadot/runtime/kusama/src/weights/pallet_ranked_collective.rs
+++ /dev/null
@@ -1,176 +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/>.
-
-//! Autogenerated weights for `pallet_ranked_collective`
-//!
-//! THIS FILE WAS AUTO-GENERATED USING THE SUBSTRATE BENCHMARK CLI VERSION 4.0.0-dev
-//! DATE: 2023-06-19, STEPS: `50`, REPEAT: `20`, LOW RANGE: `[]`, HIGH RANGE: `[]`
-//! WORST CASE MAP SIZE: `1000000`
-//! HOSTNAME: `runner-e8ezs4ez-project-163-concurrent-0`, CPU: `Intel(R) Xeon(R) CPU @ 2.60GHz`
-//! EXECUTION: Some(Wasm), WASM-EXECUTION: Compiled, CHAIN: Some("kusama-dev"), DB CACHE: 1024
-
-// Executed Command:
-// ./target/production/polkadot
-// benchmark
-// pallet
-// --chain=kusama-dev
-// --steps=50
-// --repeat=20
-// --no-storage-info
-// --no-median-slopes
-// --no-min-squares
-// --pallet=pallet_ranked_collective
-// --extrinsic=*
-// --execution=wasm
-// --wasm-execution=compiled
-// --header=./file_header.txt
-// --output=./runtime/kusama/src/weights/
-
-#![cfg_attr(rustfmt, rustfmt_skip)]
-#![allow(unused_parens)]
-#![allow(unused_imports)]
-#![allow(missing_docs)]
-
-use frame_support::{traits::Get, weights::Weight};
-use core::marker::PhantomData;
-
-/// Weight functions for `pallet_ranked_collective`.
-pub struct WeightInfo<T>(PhantomData<T>);
-impl<T: frame_system::Config> pallet_ranked_collective::WeightInfo for WeightInfo<T> {
-	/// Storage: FellowshipCollective Members (r:1 w:1)
-	/// Proof: FellowshipCollective Members (max_values: None, max_size: Some(42), added: 2517, mode: MaxEncodedLen)
-	/// Storage: FellowshipCollective MemberCount (r:1 w:1)
-	/// Proof: FellowshipCollective MemberCount (max_values: None, max_size: Some(14), added: 2489, mode: MaxEncodedLen)
-	/// Storage: FellowshipCollective IndexToId (r:0 w:1)
-	/// Proof: FellowshipCollective IndexToId (max_values: None, max_size: Some(54), added: 2529, mode: MaxEncodedLen)
-	/// Storage: FellowshipCollective IdToIndex (r:0 w:1)
-	/// Proof: FellowshipCollective IdToIndex (max_values: None, max_size: Some(54), added: 2529, mode: MaxEncodedLen)
-	fn add_member() -> Weight {
-		// Proof Size summary in bytes:
-		//  Measured:  `76`
-		//  Estimated: `3507`
-		// Minimum execution time: 16_103_000 picoseconds.
-		Weight::from_parts(16_743_000, 0)
-			.saturating_add(Weight::from_parts(0, 3507))
-			.saturating_add(T::DbWeight::get().reads(2))
-			.saturating_add(T::DbWeight::get().writes(4))
-	}
-	/// Storage: FellowshipCollective Members (r:1 w:1)
-	/// Proof: FellowshipCollective Members (max_values: None, max_size: Some(42), added: 2517, mode: MaxEncodedLen)
-	/// Storage: FellowshipCollective MemberCount (r:11 w:11)
-	/// Proof: FellowshipCollective MemberCount (max_values: None, max_size: Some(14), added: 2489, mode: MaxEncodedLen)
-	/// Storage: FellowshipCollective IdToIndex (r:11 w:11)
-	/// Proof: FellowshipCollective IdToIndex (max_values: None, max_size: Some(54), added: 2529, mode: MaxEncodedLen)
-	/// Storage: FellowshipCollective IndexToId (r:11 w:11)
-	/// Proof: FellowshipCollective IndexToId (max_values: None, max_size: Some(54), added: 2529, mode: MaxEncodedLen)
-	/// The range of component `r` is `[0, 10]`.
-	fn remove_member(r: u32, ) -> Weight {
-		// Proof Size summary in bytes:
-		//  Measured:  `550 + r * (281 ±0)`
-		//  Estimated: `3519 + r * (2529 ±0)`
-		// Minimum execution time: 27_225_000 picoseconds.
-		Weight::from_parts(31_460_102, 0)
-			.saturating_add(Weight::from_parts(0, 3519))
-			// Standard Error: 23_877
-			.saturating_add(Weight::from_parts(12_798_296, 0).saturating_mul(r.into()))
-			.saturating_add(T::DbWeight::get().reads(4))
-			.saturating_add(T::DbWeight::get().reads((3_u64).saturating_mul(r.into())))
-			.saturating_add(T::DbWeight::get().writes(4))
-			.saturating_add(T::DbWeight::get().writes((3_u64).saturating_mul(r.into())))
-			.saturating_add(Weight::from_parts(0, 2529).saturating_mul(r.into()))
-	}
-	/// Storage: FellowshipCollective Members (r:1 w:1)
-	/// Proof: FellowshipCollective Members (max_values: None, max_size: Some(42), added: 2517, mode: MaxEncodedLen)
-	/// Storage: FellowshipCollective MemberCount (r:1 w:1)
-	/// Proof: FellowshipCollective MemberCount (max_values: None, max_size: Some(14), added: 2489, mode: MaxEncodedLen)
-	/// Storage: FellowshipCollective IndexToId (r:0 w:1)
-	/// Proof: FellowshipCollective IndexToId (max_values: None, max_size: Some(54), added: 2529, mode: MaxEncodedLen)
-	/// Storage: FellowshipCollective IdToIndex (r:0 w:1)
-	/// Proof: FellowshipCollective IdToIndex (max_values: None, max_size: Some(54), added: 2529, mode: MaxEncodedLen)
-	/// The range of component `r` is `[0, 10]`.
-	fn promote_member(r: u32, ) -> Weight {
-		// Proof Size summary in bytes:
-		//  Measured:  `248 + r * (17 ±0)`
-		//  Estimated: `3507`
-		// Minimum execution time: 18_964_000 picoseconds.
-		Weight::from_parts(19_901_082, 0)
-			.saturating_add(Weight::from_parts(0, 3507))
-			// Standard Error: 4_560
-			.saturating_add(Weight::from_parts(326_770, 0).saturating_mul(r.into()))
-			.saturating_add(T::DbWeight::get().reads(2))
-			.saturating_add(T::DbWeight::get().writes(4))
-	}
-	/// Storage: FellowshipCollective Members (r:1 w:1)
-	/// Proof: FellowshipCollective Members (max_values: None, max_size: Some(42), added: 2517, mode: MaxEncodedLen)
-	/// Storage: FellowshipCollective MemberCount (r:1 w:1)
-	/// Proof: FellowshipCollective MemberCount (max_values: None, max_size: Some(14), added: 2489, mode: MaxEncodedLen)
-	/// Storage: FellowshipCollective IdToIndex (r:1 w:1)
-	/// Proof: FellowshipCollective IdToIndex (max_values: None, max_size: Some(54), added: 2529, mode: MaxEncodedLen)
-	/// Storage: FellowshipCollective IndexToId (r:1 w:1)
-	/// Proof: FellowshipCollective IndexToId (max_values: None, max_size: Some(54), added: 2529, mode: MaxEncodedLen)
-	/// The range of component `r` is `[0, 10]`.
-	fn demote_member(r: u32, ) -> Weight {
-		// Proof Size summary in bytes:
-		//  Measured:  `566 + r * (72 ±0)`
-		//  Estimated: `3519`
-		// Minimum execution time: 27_310_000 picoseconds.
-		Weight::from_parts(30_386_652, 0)
-			.saturating_add(Weight::from_parts(0, 3519))
-			// Standard Error: 33_721
-			.saturating_add(Weight::from_parts(667_118, 0).saturating_mul(r.into()))
-			.saturating_add(T::DbWeight::get().reads(4))
-			.saturating_add(T::DbWeight::get().writes(4))
-	}
-	/// Storage: FellowshipCollective Members (r:1 w:0)
-	/// Proof: FellowshipCollective Members (max_values: None, max_size: Some(42), added: 2517, mode: MaxEncodedLen)
-	/// Storage: FellowshipReferenda ReferendumInfoFor (r:1 w:1)
-	/// Proof: FellowshipReferenda ReferendumInfoFor (max_values: None, max_size: Some(900), added: 3375, mode: MaxEncodedLen)
-	/// Storage: FellowshipCollective Voting (r:1 w:1)
-	/// Proof: FellowshipCollective Voting (max_values: None, max_size: Some(65), added: 2540, mode: MaxEncodedLen)
-	/// Storage: Scheduler Agenda (r:2 w:2)
-	/// Proof: Scheduler Agenda (max_values: None, max_size: Some(38963), added: 41438, mode: MaxEncodedLen)
-	fn vote() -> Weight {
-		// Proof Size summary in bytes:
-		//  Measured:  `638`
-		//  Estimated: `83866`
-		// Minimum execution time: 50_373_000 picoseconds.
-		Weight::from_parts(51_359_000, 0)
-			.saturating_add(Weight::from_parts(0, 83866))
-			.saturating_add(T::DbWeight::get().reads(5))
-			.saturating_add(T::DbWeight::get().writes(4))
-	}
-	/// Storage: FellowshipReferenda ReferendumInfoFor (r:1 w:0)
-	/// Proof: FellowshipReferenda ReferendumInfoFor (max_values: None, max_size: Some(900), added: 3375, mode: MaxEncodedLen)
-	/// Storage: FellowshipCollective VotingCleanup (r:1 w:0)
-	/// Proof: FellowshipCollective VotingCleanup (max_values: None, max_size: Some(114), added: 2589, mode: MaxEncodedLen)
-	/// Storage: FellowshipCollective Voting (r:100 w:100)
-	/// Proof: FellowshipCollective Voting (max_values: None, max_size: Some(65), added: 2540, mode: MaxEncodedLen)
-	/// The range of component `n` is `[0, 100]`.
-	fn cleanup_poll(n: u32, ) -> Weight {
-		// Proof Size summary in bytes:
-		//  Measured:  `434 + n * (50 ±0)`
-		//  Estimated: `4365 + n * (2540 ±0)`
-		// Minimum execution time: 14_237_000 picoseconds.
-		Weight::from_parts(16_304_970, 0)
-			.saturating_add(Weight::from_parts(0, 4365))
-			// Standard Error: 2_460
-			.saturating_add(Weight::from_parts(1_185_342, 0).saturating_mul(n.into()))
-			.saturating_add(T::DbWeight::get().reads(2))
-			.saturating_add(T::DbWeight::get().reads((1_u64).saturating_mul(n.into())))
-			.saturating_add(T::DbWeight::get().writes((1_u64).saturating_mul(n.into())))
-			.saturating_add(Weight::from_parts(0, 2540).saturating_mul(n.into()))
-	}
-}
diff --git a/polkadot/runtime/kusama/src/weights/pallet_recovery.rs b/polkadot/runtime/kusama/src/weights/pallet_recovery.rs
deleted file mode 100644
index 6f2fdfa334f6eadb351a91174316741f79ac5c7a..0000000000000000000000000000000000000000
--- a/polkadot/runtime/kusama/src/weights/pallet_recovery.rs
+++ /dev/null
@@ -1,186 +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/>.
-
-//! Autogenerated weights for `pallet_recovery`
-//!
-//! THIS FILE WAS AUTO-GENERATED USING THE SUBSTRATE BENCHMARK CLI VERSION 4.0.0-dev
-//! DATE: 2023-06-19, STEPS: `50`, REPEAT: `20`, LOW RANGE: `[]`, HIGH RANGE: `[]`
-//! WORST CASE MAP SIZE: `1000000`
-//! HOSTNAME: `runner-e8ezs4ez-project-163-concurrent-0`, CPU: `Intel(R) Xeon(R) CPU @ 2.60GHz`
-//! EXECUTION: Some(Wasm), WASM-EXECUTION: Compiled, CHAIN: Some("kusama-dev"), DB CACHE: 1024
-
-// Executed Command:
-// ./target/production/polkadot
-// benchmark
-// pallet
-// --chain=kusama-dev
-// --steps=50
-// --repeat=20
-// --no-storage-info
-// --no-median-slopes
-// --no-min-squares
-// --pallet=pallet_recovery
-// --extrinsic=*
-// --execution=wasm
-// --wasm-execution=compiled
-// --header=./file_header.txt
-// --output=./runtime/kusama/src/weights/
-
-#![cfg_attr(rustfmt, rustfmt_skip)]
-#![allow(unused_parens)]
-#![allow(unused_imports)]
-#![allow(missing_docs)]
-
-use frame_support::{traits::Get, weights::Weight};
-use core::marker::PhantomData;
-
-/// Weight functions for `pallet_recovery`.
-pub struct WeightInfo<T>(PhantomData<T>);
-impl<T: frame_system::Config> pallet_recovery::WeightInfo for WeightInfo<T> {
-	/// Storage: Recovery Proxy (r:1 w:0)
-	/// Proof: Recovery Proxy (max_values: None, max_size: Some(80), added: 2555, mode: MaxEncodedLen)
-	fn as_recovered() -> Weight {
-		// Proof Size summary in bytes:
-		//  Measured:  `182`
-		//  Estimated: `3545`
-		// Minimum execution time: 9_088_000 picoseconds.
-		Weight::from_parts(9_345_000, 0)
-			.saturating_add(Weight::from_parts(0, 3545))
-			.saturating_add(T::DbWeight::get().reads(1))
-	}
-	/// Storage: Recovery Proxy (r:0 w:1)
-	/// Proof: Recovery Proxy (max_values: None, max_size: Some(80), added: 2555, mode: MaxEncodedLen)
-	fn set_recovered() -> Weight {
-		// Proof Size summary in bytes:
-		//  Measured:  `0`
-		//  Estimated: `0`
-		// Minimum execution time: 8_810_000 picoseconds.
-		Weight::from_parts(9_033_000, 0)
-			.saturating_add(Weight::from_parts(0, 0))
-			.saturating_add(T::DbWeight::get().writes(1))
-	}
-	/// Storage: Recovery Recoverable (r:1 w:1)
-	/// Proof: Recovery Recoverable (max_values: None, max_size: Some(351), added: 2826, mode: MaxEncodedLen)
-	/// The range of component `n` is `[1, 9]`.
-	fn create_recovery(n: u32, ) -> Weight {
-		// Proof Size summary in bytes:
-		//  Measured:  `76`
-		//  Estimated: `3816`
-		// Minimum execution time: 25_748_000 picoseconds.
-		Weight::from_parts(26_517_291, 0)
-			.saturating_add(Weight::from_parts(0, 3816))
-			// Standard Error: 4_572
-			.saturating_add(Weight::from_parts(103_064, 0).saturating_mul(n.into()))
-			.saturating_add(T::DbWeight::get().reads(1))
-			.saturating_add(T::DbWeight::get().writes(1))
-	}
-	/// Storage: Recovery Recoverable (r:1 w:0)
-	/// Proof: Recovery Recoverable (max_values: None, max_size: Some(351), added: 2826, mode: MaxEncodedLen)
-	/// Storage: Recovery ActiveRecoveries (r:1 w:1)
-	/// Proof: Recovery ActiveRecoveries (max_values: None, max_size: Some(389), added: 2864, mode: MaxEncodedLen)
-	fn initiate_recovery() -> Weight {
-		// Proof Size summary in bytes:
-		//  Measured:  `173`
-		//  Estimated: `3854`
-		// Minimum execution time: 28_593_000 picoseconds.
-		Weight::from_parts(29_386_000, 0)
-			.saturating_add(Weight::from_parts(0, 3854))
-			.saturating_add(T::DbWeight::get().reads(2))
-			.saturating_add(T::DbWeight::get().writes(1))
-	}
-	/// Storage: Recovery Recoverable (r:1 w:0)
-	/// Proof: Recovery Recoverable (max_values: None, max_size: Some(351), added: 2826, mode: MaxEncodedLen)
-	/// Storage: Recovery ActiveRecoveries (r:1 w:1)
-	/// Proof: Recovery ActiveRecoveries (max_values: None, max_size: Some(389), added: 2864, mode: MaxEncodedLen)
-	/// The range of component `n` is `[1, 9]`.
-	fn vouch_recovery(n: u32, ) -> Weight {
-		// Proof Size summary in bytes:
-		//  Measured:  `261 + n * (64 ±0)`
-		//  Estimated: `3854`
-		// Minimum execution time: 18_621_000 picoseconds.
-		Weight::from_parts(19_241_387, 0)
-			.saturating_add(Weight::from_parts(0, 3854))
-			// Standard Error: 5_538
-			.saturating_add(Weight::from_parts(263_385, 0).saturating_mul(n.into()))
-			.saturating_add(T::DbWeight::get().reads(2))
-			.saturating_add(T::DbWeight::get().writes(1))
-	}
-	/// Storage: Recovery Recoverable (r:1 w:0)
-	/// Proof: Recovery Recoverable (max_values: None, max_size: Some(351), added: 2826, mode: MaxEncodedLen)
-	/// Storage: Recovery ActiveRecoveries (r:1 w:0)
-	/// Proof: Recovery ActiveRecoveries (max_values: None, max_size: Some(389), added: 2864, mode: MaxEncodedLen)
-	/// Storage: Recovery Proxy (r:1 w:1)
-	/// Proof: Recovery Proxy (max_values: None, max_size: Some(80), added: 2555, mode: MaxEncodedLen)
-	/// The range of component `n` is `[1, 9]`.
-	fn claim_recovery(n: u32, ) -> Weight {
-		// Proof Size summary in bytes:
-		//  Measured:  `293 + n * (64 ±0)`
-		//  Estimated: `3854`
-		// Minimum execution time: 22_870_000 picoseconds.
-		Weight::from_parts(23_779_105, 0)
-			.saturating_add(Weight::from_parts(0, 3854))
-			// Standard Error: 4_668
-			.saturating_add(Weight::from_parts(149_312, 0).saturating_mul(n.into()))
-			.saturating_add(T::DbWeight::get().reads(3))
-			.saturating_add(T::DbWeight::get().writes(1))
-	}
-	/// Storage: Recovery ActiveRecoveries (r:1 w:1)
-	/// Proof: Recovery ActiveRecoveries (max_values: None, max_size: Some(389), added: 2864, mode: MaxEncodedLen)
-	/// Storage: System Account (r:1 w:1)
-	/// Proof: System Account (max_values: None, max_size: Some(128), added: 2603, mode: MaxEncodedLen)
-	/// The range of component `n` is `[1, 9]`.
-	fn close_recovery(n: u32, ) -> Weight {
-		// Proof Size summary in bytes:
-		//  Measured:  `414 + n * (32 ±0)`
-		//  Estimated: `3854`
-		// Minimum execution time: 34_111_000 picoseconds.
-		Weight::from_parts(35_420_404, 0)
-			.saturating_add(Weight::from_parts(0, 3854))
-			// Standard Error: 5_909
-			.saturating_add(Weight::from_parts(46_955, 0).saturating_mul(n.into()))
-			.saturating_add(T::DbWeight::get().reads(2))
-			.saturating_add(T::DbWeight::get().writes(2))
-	}
-	/// Storage: Recovery ActiveRecoveries (r:1 w:0)
-	/// Proof: Recovery ActiveRecoveries (max_values: None, max_size: Some(389), added: 2864, mode: MaxEncodedLen)
-	/// Storage: Recovery Recoverable (r:1 w:1)
-	/// Proof: Recovery Recoverable (max_values: None, max_size: Some(351), added: 2826, mode: MaxEncodedLen)
-	/// The range of component `n` is `[1, 9]`.
-	fn remove_recovery(n: u32, ) -> Weight {
-		// Proof Size summary in bytes:
-		//  Measured:  `170 + n * (32 ±0)`
-		//  Estimated: `3854`
-		// Minimum execution time: 30_441_000 picoseconds.
-		Weight::from_parts(31_553_945, 0)
-			.saturating_add(Weight::from_parts(0, 3854))
-			// Standard Error: 7_463
-			.saturating_add(Weight::from_parts(119_815, 0).saturating_mul(n.into()))
-			.saturating_add(T::DbWeight::get().reads(2))
-			.saturating_add(T::DbWeight::get().writes(1))
-	}
-	/// Storage: Recovery Proxy (r:1 w:1)
-	/// Proof: Recovery Proxy (max_values: None, max_size: Some(80), added: 2555, mode: MaxEncodedLen)
-	fn cancel_recovered() -> Weight {
-		// Proof Size summary in bytes:
-		//  Measured:  `182`
-		//  Estimated: `3545`
-		// Minimum execution time: 10_937_000 picoseconds.
-		Weight::from_parts(11_333_000, 0)
-			.saturating_add(Weight::from_parts(0, 3545))
-			.saturating_add(T::DbWeight::get().reads(1))
-			.saturating_add(T::DbWeight::get().writes(1))
-	}
-}
diff --git a/polkadot/runtime/kusama/src/weights/pallet_scheduler.rs b/polkadot/runtime/kusama/src/weights/pallet_scheduler.rs
deleted file mode 100644
index 3e8e8810b2e5fae3c1bae957a37d27502cf60080..0000000000000000000000000000000000000000
--- a/polkadot/runtime/kusama/src/weights/pallet_scheduler.rs
+++ /dev/null
@@ -1,207 +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/>.
-
-//! Autogenerated weights for `pallet_scheduler`
-//!
-//! THIS FILE WAS AUTO-GENERATED USING THE SUBSTRATE BENCHMARK CLI VERSION 4.0.0-dev
-//! DATE: 2023-06-19, STEPS: `50`, REPEAT: `20`, LOW RANGE: `[]`, HIGH RANGE: `[]`
-//! WORST CASE MAP SIZE: `1000000`
-//! HOSTNAME: `runner-e8ezs4ez-project-163-concurrent-0`, CPU: `Intel(R) Xeon(R) CPU @ 2.60GHz`
-//! EXECUTION: Some(Wasm), WASM-EXECUTION: Compiled, CHAIN: Some("kusama-dev"), DB CACHE: 1024
-
-// Executed Command:
-// ./target/production/polkadot
-// benchmark
-// pallet
-// --chain=kusama-dev
-// --steps=50
-// --repeat=20
-// --no-storage-info
-// --no-median-slopes
-// --no-min-squares
-// --pallet=pallet_scheduler
-// --extrinsic=*
-// --execution=wasm
-// --wasm-execution=compiled
-// --header=./file_header.txt
-// --output=./runtime/kusama/src/weights/
-
-#![cfg_attr(rustfmt, rustfmt_skip)]
-#![allow(unused_parens)]
-#![allow(unused_imports)]
-#![allow(missing_docs)]
-
-use frame_support::{traits::Get, weights::Weight};
-use core::marker::PhantomData;
-
-/// Weight functions for `pallet_scheduler`.
-pub struct WeightInfo<T>(PhantomData<T>);
-impl<T: frame_system::Config> pallet_scheduler::WeightInfo for WeightInfo<T> {
-	/// Storage: Scheduler IncompleteSince (r:1 w:1)
-	/// Proof: Scheduler IncompleteSince (max_values: Some(1), max_size: Some(4), added: 499, mode: MaxEncodedLen)
-	fn service_agendas_base() -> Weight {
-		// Proof Size summary in bytes:
-		//  Measured:  `69`
-		//  Estimated: `1489`
-		// Minimum execution time: 4_091_000 picoseconds.
-		Weight::from_parts(4_209_000, 0)
-			.saturating_add(Weight::from_parts(0, 1489))
-			.saturating_add(T::DbWeight::get().reads(1))
-			.saturating_add(T::DbWeight::get().writes(1))
-	}
-	/// Storage: Scheduler Agenda (r:1 w:1)
-	/// Proof: Scheduler Agenda (max_values: None, max_size: Some(38963), added: 41438, mode: MaxEncodedLen)
-	/// The range of component `s` is `[0, 50]`.
-	fn service_agenda_base(s: u32, ) -> Weight {
-		// Proof Size summary in bytes:
-		//  Measured:  `116 + s * (177 ±0)`
-		//  Estimated: `42428`
-		// Minimum execution time: 3_545_000 picoseconds.
-		Weight::from_parts(6_437_280, 0)
-			.saturating_add(Weight::from_parts(0, 42428))
-			// Standard Error: 1_955
-			.saturating_add(Weight::from_parts(892_412, 0).saturating_mul(s.into()))
-			.saturating_add(T::DbWeight::get().reads(1))
-			.saturating_add(T::DbWeight::get().writes(1))
-	}
-	fn service_task_base() -> Weight {
-		// Proof Size summary in bytes:
-		//  Measured:  `0`
-		//  Estimated: `0`
-		// Minimum execution time: 5_679_000 picoseconds.
-		Weight::from_parts(5_799_000, 0)
-			.saturating_add(Weight::from_parts(0, 0))
-	}
-	/// Storage: Preimage PreimageFor (r:1 w:1)
-	/// Proof: Preimage PreimageFor (max_values: None, max_size: Some(4194344), added: 4196819, mode: Measured)
-	/// Storage: Preimage StatusFor (r:1 w:1)
-	/// Proof: Preimage StatusFor (max_values: None, max_size: Some(91), added: 2566, mode: MaxEncodedLen)
-	/// The range of component `s` is `[128, 4194304]`.
-	fn service_task_fetched(s: u32, ) -> Weight {
-		// Proof Size summary in bytes:
-		//  Measured:  `179 + s * (1 ±0)`
-		//  Estimated: `3644 + s * (1 ±0)`
-		// Minimum execution time: 19_438_000 picoseconds.
-		Weight::from_parts(19_663_000, 0)
-			.saturating_add(Weight::from_parts(0, 3644))
-			// Standard Error: 3
-			.saturating_add(Weight::from_parts(1_513, 0).saturating_mul(s.into()))
-			.saturating_add(T::DbWeight::get().reads(2))
-			.saturating_add(T::DbWeight::get().writes(2))
-			.saturating_add(Weight::from_parts(0, 1).saturating_mul(s.into()))
-	}
-	/// Storage: Scheduler Lookup (r:0 w:1)
-	/// Proof: Scheduler Lookup (max_values: None, max_size: Some(48), added: 2523, mode: MaxEncodedLen)
-	fn service_task_named() -> Weight {
-		// Proof Size summary in bytes:
-		//  Measured:  `0`
-		//  Estimated: `0`
-		// Minimum execution time: 7_131_000 picoseconds.
-		Weight::from_parts(7_388_000, 0)
-			.saturating_add(Weight::from_parts(0, 0))
-			.saturating_add(T::DbWeight::get().writes(1))
-	}
-	fn service_task_periodic() -> Weight {
-		// Proof Size summary in bytes:
-		//  Measured:  `0`
-		//  Estimated: `0`
-		// Minimum execution time: 5_761_000 picoseconds.
-		Weight::from_parts(5_896_000, 0)
-			.saturating_add(Weight::from_parts(0, 0))
-	}
-	fn execute_dispatch_signed() -> Weight {
-		// Proof Size summary in bytes:
-		//  Measured:  `0`
-		//  Estimated: `0`
-		// Minimum execution time: 2_530_000 picoseconds.
-		Weight::from_parts(2_632_000, 0)
-			.saturating_add(Weight::from_parts(0, 0))
-	}
-	fn execute_dispatch_unsigned() -> Weight {
-		// Proof Size summary in bytes:
-		//  Measured:  `0`
-		//  Estimated: `0`
-		// Minimum execution time: 2_548_000 picoseconds.
-		Weight::from_parts(2_632_000, 0)
-			.saturating_add(Weight::from_parts(0, 0))
-	}
-	/// Storage: Scheduler Agenda (r:1 w:1)
-	/// Proof: Scheduler Agenda (max_values: None, max_size: Some(38963), added: 41438, mode: MaxEncodedLen)
-	/// The range of component `s` is `[0, 49]`.
-	fn schedule(s: u32, ) -> Weight {
-		// Proof Size summary in bytes:
-		//  Measured:  `116 + s * (177 ±0)`
-		//  Estimated: `42428`
-		// Minimum execution time: 12_757_000 picoseconds.
-		Weight::from_parts(15_453_687, 0)
-			.saturating_add(Weight::from_parts(0, 42428))
-			// Standard Error: 2_121
-			.saturating_add(Weight::from_parts(920_922, 0).saturating_mul(s.into()))
-			.saturating_add(T::DbWeight::get().reads(1))
-			.saturating_add(T::DbWeight::get().writes(1))
-	}
-	/// Storage: Scheduler Agenda (r:1 w:1)
-	/// Proof: Scheduler Agenda (max_values: None, max_size: Some(38963), added: 41438, mode: MaxEncodedLen)
-	/// Storage: Scheduler Lookup (r:0 w:1)
-	/// Proof: Scheduler Lookup (max_values: None, max_size: Some(48), added: 2523, mode: MaxEncodedLen)
-	/// The range of component `s` is `[1, 50]`.
-	fn cancel(s: u32, ) -> Weight {
-		// Proof Size summary in bytes:
-		//  Measured:  `116 + s * (177 ±0)`
-		//  Estimated: `42428`
-		// Minimum execution time: 17_412_000 picoseconds.
-		Weight::from_parts(16_293_532, 0)
-			.saturating_add(Weight::from_parts(0, 42428))
-			// Standard Error: 2_448
-			.saturating_add(Weight::from_parts(1_635_003, 0).saturating_mul(s.into()))
-			.saturating_add(T::DbWeight::get().reads(1))
-			.saturating_add(T::DbWeight::get().writes(2))
-	}
-	/// Storage: Scheduler Lookup (r:1 w:1)
-	/// Proof: Scheduler Lookup (max_values: None, max_size: Some(48), added: 2523, mode: MaxEncodedLen)
-	/// Storage: Scheduler Agenda (r:1 w:1)
-	/// Proof: Scheduler Agenda (max_values: None, max_size: Some(38963), added: 41438, mode: MaxEncodedLen)
-	/// The range of component `s` is `[0, 49]`.
-	fn schedule_named(s: u32, ) -> Weight {
-		// Proof Size summary in bytes:
-		//  Measured:  `293 + s * (185 ±0)`
-		//  Estimated: `42428`
-		// Minimum execution time: 16_149_000 picoseconds.
-		Weight::from_parts(19_661_866, 0)
-			.saturating_add(Weight::from_parts(0, 42428))
-			// Standard Error: 2_641
-			.saturating_add(Weight::from_parts(952_864, 0).saturating_mul(s.into()))
-			.saturating_add(T::DbWeight::get().reads(2))
-			.saturating_add(T::DbWeight::get().writes(2))
-	}
-	/// Storage: Scheduler Lookup (r:1 w:1)
-	/// Proof: Scheduler Lookup (max_values: None, max_size: Some(48), added: 2523, mode: MaxEncodedLen)
-	/// Storage: Scheduler Agenda (r:1 w:1)
-	/// Proof: Scheduler Agenda (max_values: None, max_size: Some(38963), added: 41438, mode: MaxEncodedLen)
-	/// The range of component `s` is `[1, 50]`.
-	fn cancel_named(s: u32, ) -> Weight {
-		// Proof Size summary in bytes:
-		//  Measured:  `319 + s * (185 ±0)`
-		//  Estimated: `42428`
-		// Minimum execution time: 18_858_000 picoseconds.
-		Weight::from_parts(18_380_802, 0)
-			.saturating_add(Weight::from_parts(0, 42428))
-			// Standard Error: 3_271
-			.saturating_add(Weight::from_parts(1_687_802, 0).saturating_mul(s.into()))
-			.saturating_add(T::DbWeight::get().reads(2))
-			.saturating_add(T::DbWeight::get().writes(2))
-	}
-}
diff --git a/polkadot/runtime/kusama/src/weights/pallet_session.rs b/polkadot/runtime/kusama/src/weights/pallet_session.rs
deleted file mode 100644
index 3f5469477e5816412a52de10066500df50448fbe..0000000000000000000000000000000000000000
--- a/polkadot/runtime/kusama/src/weights/pallet_session.rs
+++ /dev/null
@@ -1,85 +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/>.
-
-//! Autogenerated weights for `pallet_session`
-//!
-//! THIS FILE WAS AUTO-GENERATED USING THE SUBSTRATE BENCHMARK CLI VERSION 4.0.0-dev
-//! DATE: 2023-06-19, STEPS: `50`, REPEAT: `20`, LOW RANGE: `[]`, HIGH RANGE: `[]`
-//! WORST CASE MAP SIZE: `1000000`
-//! HOSTNAME: `runner-e8ezs4ez-project-163-concurrent-0`, CPU: `Intel(R) Xeon(R) CPU @ 2.60GHz`
-//! EXECUTION: Some(Wasm), WASM-EXECUTION: Compiled, CHAIN: Some("kusama-dev"), DB CACHE: 1024
-
-// Executed Command:
-// ./target/production/polkadot
-// benchmark
-// pallet
-// --chain=kusama-dev
-// --steps=50
-// --repeat=20
-// --no-storage-info
-// --no-median-slopes
-// --no-min-squares
-// --pallet=pallet_session
-// --extrinsic=*
-// --execution=wasm
-// --wasm-execution=compiled
-// --header=./file_header.txt
-// --output=./runtime/kusama/src/weights/
-
-#![cfg_attr(rustfmt, rustfmt_skip)]
-#![allow(unused_parens)]
-#![allow(unused_imports)]
-#![allow(missing_docs)]
-
-use frame_support::{traits::Get, weights::Weight};
-use core::marker::PhantomData;
-
-/// Weight functions for `pallet_session`.
-pub struct WeightInfo<T>(PhantomData<T>);
-impl<T: frame_system::Config> pallet_session::WeightInfo for WeightInfo<T> {
-	/// Storage: Staking Ledger (r:1 w:0)
-	/// Proof: Staking Ledger (max_values: None, max_size: Some(1091), added: 3566, mode: MaxEncodedLen)
-	/// Storage: Session NextKeys (r:1 w:1)
-	/// Proof Skipped: Session NextKeys (max_values: None, max_size: None, mode: Measured)
-	/// Storage: Session KeyOwner (r:6 w:6)
-	/// Proof Skipped: Session KeyOwner (max_values: None, max_size: None, mode: Measured)
-	fn set_keys() -> Weight {
-		// Proof Size summary in bytes:
-		//  Measured:  `2050`
-		//  Estimated: `17890`
-		// Minimum execution time: 60_102_000 picoseconds.
-		Weight::from_parts(63_699_000, 0)
-			.saturating_add(Weight::from_parts(0, 17890))
-			.saturating_add(T::DbWeight::get().reads(8))
-			.saturating_add(T::DbWeight::get().writes(7))
-	}
-	/// Storage: Staking Ledger (r:1 w:0)
-	/// Proof: Staking Ledger (max_values: None, max_size: Some(1091), added: 3566, mode: MaxEncodedLen)
-	/// Storage: Session NextKeys (r:1 w:1)
-	/// Proof Skipped: Session NextKeys (max_values: None, max_size: None, mode: Measured)
-	/// Storage: Session KeyOwner (r:0 w:6)
-	/// Proof Skipped: Session KeyOwner (max_values: None, max_size: None, mode: Measured)
-	fn purge_keys() -> Weight {
-		// Proof Size summary in bytes:
-		//  Measured:  `1914`
-		//  Estimated: `5379`
-		// Minimum execution time: 42_242_000 picoseconds.
-		Weight::from_parts(43_575_000, 0)
-			.saturating_add(Weight::from_parts(0, 5379))
-			.saturating_add(T::DbWeight::get().reads(2))
-			.saturating_add(T::DbWeight::get().writes(7))
-	}
-}
diff --git a/polkadot/runtime/kusama/src/weights/pallet_society.rs b/polkadot/runtime/kusama/src/weights/pallet_society.rs
deleted file mode 100644
index 2b564349b413cc4499f98e819ff6133e2bf39934..0000000000000000000000000000000000000000
--- a/polkadot/runtime/kusama/src/weights/pallet_society.rs
+++ /dev/null
@@ -1,437 +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/>.
-
-//! Autogenerated weights for `pallet_society`
-//!
-//! THIS FILE WAS AUTO-GENERATED USING THE SUBSTRATE BENCHMARK CLI VERSION 4.0.0-dev
-//! DATE: 2023-06-19, STEPS: `50`, REPEAT: `20`, LOW RANGE: `[]`, HIGH RANGE: `[]`
-//! WORST CASE MAP SIZE: `1000000`
-//! HOSTNAME: `runner-e8ezs4ez-project-163-concurrent-0`, CPU: `Intel(R) Xeon(R) CPU @ 2.60GHz`
-//! EXECUTION: Some(Wasm), WASM-EXECUTION: Compiled, CHAIN: Some("kusama-dev"), DB CACHE: 1024
-
-// Executed Command:
-// ./target/production/polkadot
-// benchmark
-// pallet
-// --chain=kusama-dev
-// --steps=50
-// --repeat=20
-// --no-storage-info
-// --no-median-slopes
-// --no-min-squares
-// --pallet=pallet_society
-// --extrinsic=*
-// --execution=wasm
-// --wasm-execution=compiled
-// --header=./file_header.txt
-// --output=./runtime/kusama/src/weights/
-
-#![cfg_attr(rustfmt, rustfmt_skip)]
-#![allow(unused_parens)]
-#![allow(unused_imports)]
-#![allow(missing_docs)]
-
-use frame_support::{traits::Get, weights::Weight};
-use core::marker::PhantomData;
-
-/// Weight functions for `pallet_society`.
-pub struct WeightInfo<T>(PhantomData<T>);
-impl<T: frame_system::Config> pallet_society::WeightInfo for WeightInfo<T> {
-	/// Storage: Society Bids (r:1 w:1)
-	/// Proof Skipped: Society Bids (max_values: Some(1), max_size: None, mode: Measured)
-	/// Storage: Society Candidates (r:1 w:0)
-	/// Proof Skipped: Society Candidates (max_values: None, max_size: None, mode: Measured)
-	/// Storage: Society Members (r:1 w:0)
-	/// Proof Skipped: Society Members (max_values: None, max_size: None, mode: Measured)
-	/// Storage: Society SuspendedMembers (r:1 w:0)
-	/// Proof Skipped: Society SuspendedMembers (max_values: None, max_size: None, mode: Measured)
-	/// Storage: Society Parameters (r:1 w:0)
-	/// Proof Skipped: Society Parameters (max_values: Some(1), max_size: None, mode: Measured)
-	fn bid() -> Weight {
-		// Proof Size summary in bytes:
-		//  Measured:  `416`
-		//  Estimated: `3881`
-		// Minimum execution time: 35_388_000 picoseconds.
-		Weight::from_parts(36_165_000, 0)
-			.saturating_add(Weight::from_parts(0, 3881))
-			.saturating_add(T::DbWeight::get().reads(5))
-			.saturating_add(T::DbWeight::get().writes(1))
-	}
-	/// Storage: Society Bids (r:1 w:1)
-	/// Proof Skipped: Society Bids (max_values: Some(1), max_size: None, mode: Measured)
-	fn unbid() -> Weight {
-		// Proof Size summary in bytes:
-		//  Measured:  `433`
-		//  Estimated: `1918`
-		// Minimum execution time: 28_387_000 picoseconds.
-		Weight::from_parts(29_224_000, 0)
-			.saturating_add(Weight::from_parts(0, 1918))
-			.saturating_add(T::DbWeight::get().reads(1))
-			.saturating_add(T::DbWeight::get().writes(1))
-	}
-	/// Storage: Society Bids (r:1 w:1)
-	/// Proof Skipped: Society Bids (max_values: Some(1), max_size: None, mode: Measured)
-	/// Storage: Society Candidates (r:1 w:0)
-	/// Proof Skipped: Society Candidates (max_values: None, max_size: None, mode: Measured)
-	/// Storage: Society Members (r:2 w:1)
-	/// Proof Skipped: Society Members (max_values: None, max_size: None, mode: Measured)
-	/// Storage: Society SuspendedMembers (r:1 w:0)
-	/// Proof Skipped: Society SuspendedMembers (max_values: None, max_size: None, mode: Measured)
-	fn vouch() -> Weight {
-		// Proof Size summary in bytes:
-		//  Measured:  `453`
-		//  Estimated: `6393`
-		// Minimum execution time: 25_337_000 picoseconds.
-		Weight::from_parts(26_143_000, 0)
-			.saturating_add(Weight::from_parts(0, 6393))
-			.saturating_add(T::DbWeight::get().reads(5))
-			.saturating_add(T::DbWeight::get().writes(2))
-	}
-	/// Storage: Society Bids (r:1 w:1)
-	/// Proof Skipped: Society Bids (max_values: Some(1), max_size: None, mode: Measured)
-	/// Storage: Society Members (r:1 w:1)
-	/// Proof Skipped: Society Members (max_values: None, max_size: None, mode: Measured)
-	fn unvouch() -> Weight {
-		// Proof Size summary in bytes:
-		//  Measured:  `507`
-		//  Estimated: `3972`
-		// Minimum execution time: 17_975_000 picoseconds.
-		Weight::from_parts(18_695_000, 0)
-			.saturating_add(Weight::from_parts(0, 3972))
-			.saturating_add(T::DbWeight::get().reads(2))
-			.saturating_add(T::DbWeight::get().writes(2))
-	}
-	/// Storage: Society Candidates (r:1 w:1)
-	/// Proof Skipped: Society Candidates (max_values: None, max_size: None, mode: Measured)
-	/// Storage: Society Members (r:1 w:0)
-	/// Proof Skipped: Society Members (max_values: None, max_size: None, mode: Measured)
-	/// Storage: Society Votes (r:1 w:1)
-	/// Proof Skipped: Society Votes (max_values: None, max_size: None, mode: Measured)
-	fn vote() -> Weight {
-		// Proof Size summary in bytes:
-		//  Measured:  `541`
-		//  Estimated: `4006`
-		// Minimum execution time: 23_173_000 picoseconds.
-		Weight::from_parts(23_764_000, 0)
-			.saturating_add(Weight::from_parts(0, 4006))
-			.saturating_add(T::DbWeight::get().reads(3))
-			.saturating_add(T::DbWeight::get().writes(2))
-	}
-	/// Storage: Society Defending (r:1 w:1)
-	/// Proof Skipped: Society Defending (max_values: Some(1), max_size: None, mode: Measured)
-	/// Storage: Society Members (r:1 w:0)
-	/// Proof Skipped: Society Members (max_values: None, max_size: None, mode: Measured)
-	/// Storage: Society ChallengeRoundCount (r:1 w:0)
-	/// Proof Skipped: Society ChallengeRoundCount (max_values: Some(1), max_size: None, mode: Measured)
-	/// Storage: Society DefenderVotes (r:1 w:1)
-	/// Proof Skipped: Society DefenderVotes (max_values: None, max_size: None, mode: Measured)
-	fn defender_vote() -> Weight {
-		// Proof Size summary in bytes:
-		//  Measured:  `533`
-		//  Estimated: `3998`
-		// Minimum execution time: 21_744_000 picoseconds.
-		Weight::from_parts(22_406_000, 0)
-			.saturating_add(Weight::from_parts(0, 3998))
-			.saturating_add(T::DbWeight::get().reads(4))
-			.saturating_add(T::DbWeight::get().writes(2))
-	}
-	/// Storage: Society Members (r:1 w:0)
-	/// Proof Skipped: Society Members (max_values: None, max_size: None, mode: Measured)
-	/// Storage: Society Payouts (r:1 w:1)
-	/// Proof Skipped: Society Payouts (max_values: None, 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)
-	fn payout() -> Weight {
-		// Proof Size summary in bytes:
-		//  Measured:  `622`
-		//  Estimated: `4087`
-		// Minimum execution time: 50_058_000 picoseconds.
-		Weight::from_parts(51_077_000, 0)
-			.saturating_add(Weight::from_parts(0, 4087))
-			.saturating_add(T::DbWeight::get().reads(3))
-			.saturating_add(T::DbWeight::get().writes(2))
-	}
-	/// Storage: Society Members (r:1 w:1)
-	/// Proof Skipped: Society Members (max_values: None, max_size: None, mode: Measured)
-	/// Storage: Society Payouts (r:1 w:1)
-	/// Proof Skipped: Society Payouts (max_values: None, max_size: None, mode: Measured)
-	fn waive_repay() -> Weight {
-		// Proof Size summary in bytes:
-		//  Measured:  `519`
-		//  Estimated: `3984`
-		// Minimum execution time: 21_305_000 picoseconds.
-		Weight::from_parts(22_020_000, 0)
-			.saturating_add(Weight::from_parts(0, 3984))
-			.saturating_add(T::DbWeight::get().reads(2))
-			.saturating_add(T::DbWeight::get().writes(2))
-	}
-	/// Storage: Society Head (r:1 w:1)
-	/// Proof Skipped: Society Head (max_values: Some(1), max_size: None, mode: Measured)
-	/// Storage: Society MemberCount (r:1 w:1)
-	/// Proof Skipped: Society MemberCount (max_values: Some(1), max_size: None, mode: Measured)
-	/// Storage: Society MemberByIndex (r:0 w:1)
-	/// Proof Skipped: Society MemberByIndex (max_values: None, max_size: None, mode: Measured)
-	/// Storage: Society Founder (r:0 w:1)
-	/// Proof Skipped: Society Founder (max_values: Some(1), max_size: None, mode: Measured)
-	/// Storage: Society Rules (r:0 w:1)
-	/// Proof Skipped: Society Rules (max_values: Some(1), max_size: None, mode: Measured)
-	/// Storage: Society Members (r:0 w:1)
-	/// Proof Skipped: Society Members (max_values: None, max_size: None, mode: Measured)
-	/// Storage: Society Parameters (r:0 w:1)
-	/// Proof Skipped: Society Parameters (max_values: Some(1), max_size: None, mode: Measured)
-	fn found_society() -> Weight {
-		// Proof Size summary in bytes:
-		//  Measured:  `114`
-		//  Estimated: `1599`
-		// Minimum execution time: 19_952_000 picoseconds.
-		Weight::from_parts(20_365_000, 0)
-			.saturating_add(Weight::from_parts(0, 1599))
-			.saturating_add(T::DbWeight::get().reads(2))
-			.saturating_add(T::DbWeight::get().writes(7))
-	}
-	/// Storage: Society Founder (r:1 w:1)
-	/// Proof Skipped: Society Founder (max_values: Some(1), max_size: None, mode: Measured)
-	/// Storage: Society MemberCount (r:1 w:1)
-	/// Proof Skipped: Society MemberCount (max_values: Some(1), max_size: None, mode: Measured)
-	/// Storage: Society Members (r:5 w:5)
-	/// Proof Skipped: Society Members (max_values: None, max_size: None, mode: Measured)
-	/// Storage: Society MemberByIndex (r:5 w:5)
-	/// Proof Skipped: Society MemberByIndex (max_values: None, max_size: None, mode: Measured)
-	/// Storage: Society Votes (r:4 w:4)
-	/// Proof Skipped: Society Votes (max_values: None, max_size: None, mode: Measured)
-	/// Storage: Society Candidates (r:4 w:4)
-	/// Proof Skipped: Society Candidates (max_values: None, max_size: None, mode: Measured)
-	/// Storage: Society Head (r:0 w:1)
-	/// Proof Skipped: Society Head (max_values: Some(1), max_size: None, mode: Measured)
-	/// Storage: Society Defending (r:0 w:1)
-	/// Proof Skipped: Society Defending (max_values: Some(1), max_size: None, mode: Measured)
-	/// Storage: Society ChallengeRoundCount (r:0 w:1)
-	/// Proof Skipped: Society ChallengeRoundCount (max_values: Some(1), max_size: None, mode: Measured)
-	/// Storage: Society Skeptic (r:0 w:1)
-	/// Proof Skipped: Society Skeptic (max_values: Some(1), max_size: None, mode: Measured)
-	/// Storage: Society Pot (r:0 w:1)
-	/// Proof Skipped: Society Pot (max_values: Some(1), max_size: None, mode: Measured)
-	/// Storage: Society Rules (r:0 w:1)
-	/// Proof Skipped: Society Rules (max_values: Some(1), max_size: None, mode: Measured)
-	/// Storage: Society RoundCount (r:0 w:1)
-	/// Proof Skipped: Society RoundCount (max_values: Some(1), max_size: None, mode: Measured)
-	/// Storage: Society Bids (r:0 w:1)
-	/// Proof Skipped: Society Bids (max_values: Some(1), max_size: None, mode: Measured)
-	/// Storage: Society Parameters (r:0 w:1)
-	/// Proof Skipped: Society Parameters (max_values: Some(1), max_size: None, mode: Measured)
-	/// Storage: Society NextHead (r:0 w:1)
-	/// Proof Skipped: Society NextHead (max_values: Some(1), max_size: None, mode: Measured)
-	fn dissolve() -> Weight {
-		// Proof Size summary in bytes:
-		//  Measured:  `1626`
-		//  Estimated: `14991`
-		// Minimum execution time: 64_547_000 picoseconds.
-		Weight::from_parts(66_190_000, 0)
-			.saturating_add(Weight::from_parts(0, 14991))
-			.saturating_add(T::DbWeight::get().reads(20))
-			.saturating_add(T::DbWeight::get().writes(30))
-	}
-	/// Storage: Society Founder (r:1 w:0)
-	/// Proof Skipped: Society Founder (max_values: Some(1), max_size: None, mode: Measured)
-	/// Storage: Society SuspendedMembers (r:1 w:1)
-	/// Proof Skipped: Society SuspendedMembers (max_values: None, max_size: None, mode: Measured)
-	/// Storage: Society Payouts (r:1 w:0)
-	/// Proof Skipped: Society Payouts (max_values: None, max_size: None, mode: Measured)
-	/// Storage: Society Pot (r:1 w:1)
-	/// Proof Skipped: Society Pot (max_values: Some(1), max_size: None, mode: Measured)
-	fn judge_suspended_member() -> Weight {
-		// Proof Size summary in bytes:
-		//  Measured:  `456`
-		//  Estimated: `3921`
-		// Minimum execution time: 22_276_000 picoseconds.
-		Weight::from_parts(22_817_000, 0)
-			.saturating_add(Weight::from_parts(0, 3921))
-			.saturating_add(T::DbWeight::get().reads(4))
-			.saturating_add(T::DbWeight::get().writes(2))
-	}
-	/// Storage: Society Founder (r:1 w:0)
-	/// Proof Skipped: Society Founder (max_values: Some(1), max_size: None, mode: Measured)
-	/// Storage: Society MemberCount (r:1 w:0)
-	/// Proof Skipped: Society MemberCount (max_values: Some(1), max_size: None, mode: Measured)
-	/// Storage: Society Parameters (r:0 w:1)
-	/// Proof Skipped: Society Parameters (max_values: Some(1), max_size: None, mode: Measured)
-	fn set_parameters() -> Weight {
-		// Proof Size summary in bytes:
-		//  Measured:  `359`
-		//  Estimated: `1844`
-		// Minimum execution time: 14_857_000 picoseconds.
-		Weight::from_parts(15_268_000, 0)
-			.saturating_add(Weight::from_parts(0, 1844))
-			.saturating_add(T::DbWeight::get().reads(2))
-			.saturating_add(T::DbWeight::get().writes(1))
-	}
-	/// Storage: Society Candidates (r:1 w:1)
-	/// Proof Skipped: Society Candidates (max_values: None, max_size: None, mode: Measured)
-	/// Storage: Society RoundCount (r:1 w:0)
-	/// Proof Skipped: Society RoundCount (max_values: Some(1), max_size: None, mode: Measured)
-	/// Storage: Society Skeptic (r:1 w:0)
-	/// Proof Skipped: Society Skeptic (max_values: Some(1), max_size: None, mode: Measured)
-	/// Storage: Society Votes (r:1 w:0)
-	/// Proof Skipped: Society Votes (max_values: None, max_size: None, mode: Measured)
-	/// Storage: Society Members (r:1 w:1)
-	/// Proof Skipped: Society Members (max_values: None, max_size: None, mode: Measured)
-	/// Storage: Society Parameters (r:1 w:0)
-	/// Proof Skipped: Society Parameters (max_values: Some(1), max_size: None, mode: Measured)
-	fn punish_skeptic() -> Weight {
-		// Proof Size summary in bytes:
-		//  Measured:  `608`
-		//  Estimated: `4073`
-		// Minimum execution time: 24_995_000 picoseconds.
-		Weight::from_parts(25_968_000, 0)
-			.saturating_add(Weight::from_parts(0, 4073))
-			.saturating_add(T::DbWeight::get().reads(6))
-			.saturating_add(T::DbWeight::get().writes(2))
-	}
-	/// Storage: Society Candidates (r:1 w:1)
-	/// Proof Skipped: Society Candidates (max_values: None, max_size: None, mode: Measured)
-	/// Storage: Society RoundCount (r:1 w:0)
-	/// Proof Skipped: Society RoundCount (max_values: Some(1), max_size: None, mode: Measured)
-	/// Storage: Society Parameters (r:1 w:0)
-	/// Proof Skipped: Society Parameters (max_values: Some(1), max_size: None, mode: Measured)
-	/// Storage: Society MemberCount (r:1 w:1)
-	/// Proof Skipped: Society MemberCount (max_values: Some(1), max_size: None, mode: Measured)
-	/// Storage: Society NextHead (r:1 w:1)
-	/// Proof Skipped: Society NextHead (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: Society MemberByIndex (r:0 w:1)
-	/// Proof Skipped: Society MemberByIndex (max_values: None, max_size: None, mode: Measured)
-	/// Storage: Society Members (r:0 w:1)
-	/// Proof Skipped: Society Members (max_values: None, max_size: None, mode: Measured)
-	fn claim_membership() -> Weight {
-		// Proof Size summary in bytes:
-		//  Measured:  `604`
-		//  Estimated: `4069`
-		// Minimum execution time: 41_570_000 picoseconds.
-		Weight::from_parts(42_576_000, 0)
-			.saturating_add(Weight::from_parts(0, 4069))
-			.saturating_add(T::DbWeight::get().reads(6))
-			.saturating_add(T::DbWeight::get().writes(6))
-	}
-	/// Storage: Society Founder (r:1 w:0)
-	/// Proof Skipped: Society Founder (max_values: Some(1), max_size: None, mode: Measured)
-	/// Storage: Society Candidates (r:1 w:1)
-	/// Proof Skipped: Society Candidates (max_values: None, max_size: None, mode: Measured)
-	/// Storage: Society RoundCount (r:1 w:0)
-	/// Proof Skipped: Society RoundCount (max_values: Some(1), max_size: None, mode: Measured)
-	/// Storage: Society Parameters (r:1 w:0)
-	/// Proof Skipped: Society Parameters (max_values: Some(1), max_size: None, mode: Measured)
-	/// Storage: Society MemberCount (r:1 w:1)
-	/// Proof Skipped: Society MemberCount (max_values: Some(1), max_size: None, mode: Measured)
-	/// Storage: Society NextHead (r:1 w:1)
-	/// Proof Skipped: Society NextHead (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: Society MemberByIndex (r:0 w:1)
-	/// Proof Skipped: Society MemberByIndex (max_values: None, max_size: None, mode: Measured)
-	/// Storage: Society Members (r:0 w:1)
-	/// Proof Skipped: Society Members (max_values: None, max_size: None, mode: Measured)
-	fn bestow_membership() -> Weight {
-		// Proof Size summary in bytes:
-		//  Measured:  `622`
-		//  Estimated: `4087`
-		// Minimum execution time: 43_450_000 picoseconds.
-		Weight::from_parts(44_330_000, 0)
-			.saturating_add(Weight::from_parts(0, 4087))
-			.saturating_add(T::DbWeight::get().reads(7))
-			.saturating_add(T::DbWeight::get().writes(6))
-	}
-	/// Storage: Society Founder (r:1 w:0)
-	/// Proof Skipped: Society Founder (max_values: Some(1), max_size: None, mode: Measured)
-	/// Storage: Society Candidates (r:1 w:1)
-	/// Proof Skipped: Society Candidates (max_values: None, max_size: None, mode: Measured)
-	/// Storage: Society RoundCount (r:1 w:0)
-	/// Proof Skipped: Society RoundCount (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)
-	fn kick_candidate() -> Weight {
-		// Proof Size summary in bytes:
-		//  Measured:  `748`
-		//  Estimated: `6196`
-		// Minimum execution time: 43_754_000 picoseconds.
-		Weight::from_parts(44_431_000, 0)
-			.saturating_add(Weight::from_parts(0, 6196))
-			.saturating_add(T::DbWeight::get().reads(5))
-			.saturating_add(T::DbWeight::get().writes(3))
-	}
-	/// Storage: Society Candidates (r:1 w:1)
-	/// Proof Skipped: Society Candidates (max_values: None, max_size: None, mode: Measured)
-	/// Storage: Society RoundCount (r:1 w:0)
-	/// Proof Skipped: Society RoundCount (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)
-	fn resign_candidacy() -> Weight {
-		// Proof Size summary in bytes:
-		//  Measured:  `718`
-		//  Estimated: `6196`
-		// Minimum execution time: 38_184_000 picoseconds.
-		Weight::from_parts(38_748_000, 0)
-			.saturating_add(Weight::from_parts(0, 6196))
-			.saturating_add(T::DbWeight::get().reads(4))
-			.saturating_add(T::DbWeight::get().writes(3))
-	}
-	/// Storage: Society Candidates (r:1 w:1)
-	/// Proof Skipped: Society Candidates (max_values: None, max_size: None, mode: Measured)
-	/// Storage: Society RoundCount (r:1 w:0)
-	/// Proof Skipped: Society RoundCount (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)
-	fn drop_candidate() -> Weight {
-		// Proof Size summary in bytes:
-		//  Measured:  `730`
-		//  Estimated: `6196`
-		// Minimum execution time: 38_442_000 picoseconds.
-		Weight::from_parts(39_150_000, 0)
-			.saturating_add(Weight::from_parts(0, 6196))
-			.saturating_add(T::DbWeight::get().reads(4))
-			.saturating_add(T::DbWeight::get().writes(3))
-	}
-	/// Storage: Society Candidates (r:1 w:0)
-	/// Proof Skipped: Society Candidates (max_values: None, max_size: None, mode: Measured)
-	/// Storage: Society VoteClearCursor (r:1 w:0)
-	/// Proof Skipped: Society VoteClearCursor (max_values: None, max_size: None, mode: Measured)
-	/// Storage: Society Votes (r:2 w:2)
-	/// Proof Skipped: Society Votes (max_values: None, max_size: None, mode: Measured)
-	fn cleanup_candidacy() -> Weight {
-		// Proof Size summary in bytes:
-		//  Measured:  `524`
-		//  Estimated: `6464`
-		// Minimum execution time: 17_373_000 picoseconds.
-		Weight::from_parts(18_288_000, 0)
-			.saturating_add(Weight::from_parts(0, 6464))
-			.saturating_add(T::DbWeight::get().reads(4))
-			.saturating_add(T::DbWeight::get().writes(2))
-	}
-	/// Storage: Society ChallengeRoundCount (r:1 w:0)
-	/// Proof Skipped: Society ChallengeRoundCount (max_values: Some(1), max_size: None, mode: Measured)
-	/// Storage: Society DefenderVotes (r:1 w:1)
-	/// Proof Skipped: Society DefenderVotes (max_values: None, max_size: None, mode: Measured)
-	fn cleanup_challenge() -> Weight {
-		// Proof Size summary in bytes:
-		//  Measured:  `482`
-		//  Estimated: `3947`
-		// Minimum execution time: 12_642_000 picoseconds.
-		Weight::from_parts(13_281_000, 0)
-			.saturating_add(Weight::from_parts(0, 3947))
-			.saturating_add(T::DbWeight::get().reads(2))
-			.saturating_add(T::DbWeight::get().writes(1))
-	}
-}
diff --git a/polkadot/runtime/kusama/src/weights/pallet_staking.rs b/polkadot/runtime/kusama/src/weights/pallet_staking.rs
deleted file mode 100644
index a7268a21bb99622be7c89b28e43f0c8d363b6e26..0000000000000000000000000000000000000000
--- a/polkadot/runtime/kusama/src/weights/pallet_staking.rs
+++ /dev/null
@@ -1,796 +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/>.
-
-//! Autogenerated weights for `pallet_staking`
-//!
-//! THIS FILE WAS AUTO-GENERATED USING THE SUBSTRATE BENCHMARK CLI VERSION 4.0.0-dev
-//! DATE: 2023-06-19, STEPS: `50`, REPEAT: `20`, LOW RANGE: `[]`, HIGH RANGE: `[]`
-//! WORST CASE MAP SIZE: `1000000`
-//! HOSTNAME: `runner-e8ezs4ez-project-163-concurrent-0`, CPU: `Intel(R) Xeon(R) CPU @ 2.60GHz`
-//! EXECUTION: Some(Wasm), WASM-EXECUTION: Compiled, CHAIN: Some("kusama-dev"), DB CACHE: 1024
-
-// Executed Command:
-// ./target/production/polkadot
-// benchmark
-// pallet
-// --chain=kusama-dev
-// --steps=50
-// --repeat=20
-// --no-storage-info
-// --no-median-slopes
-// --no-min-squares
-// --pallet=pallet_staking
-// --extrinsic=*
-// --execution=wasm
-// --wasm-execution=compiled
-// --header=./file_header.txt
-// --output=./runtime/kusama/src/weights/
-
-#![cfg_attr(rustfmt, rustfmt_skip)]
-#![allow(unused_parens)]
-#![allow(unused_imports)]
-#![allow(missing_docs)]
-
-use frame_support::{traits::Get, weights::Weight};
-use core::marker::PhantomData;
-
-/// Weight functions for `pallet_staking`.
-pub struct WeightInfo<T>(PhantomData<T>);
-impl<T: frame_system::Config> pallet_staking::WeightInfo for WeightInfo<T> {
-	/// Storage: Staking Bonded (r:1 w:1)
-	/// Proof: Staking Bonded (max_values: None, max_size: Some(72), added: 2547, mode: MaxEncodedLen)
-	/// Storage: Staking Ledger (r:1 w:1)
-	/// Proof: Staking Ledger (max_values: None, max_size: Some(1091), added: 3566, mode: MaxEncodedLen)
-	/// Storage: Staking CurrentEra (r:1 w:0)
-	/// Proof: Staking CurrentEra (max_values: Some(1), max_size: Some(4), added: 499, mode: MaxEncodedLen)
-	/// Storage: Balances Locks (r:1 w:1)
-	/// Proof: Balances Locks (max_values: None, max_size: Some(1299), added: 3774, mode: MaxEncodedLen)
-	/// Storage: Balances Freezes (r:1 w:0)
-	/// Proof: Balances Freezes (max_values: None, max_size: Some(49), added: 2524, mode: MaxEncodedLen)
-	/// Storage: Staking Payee (r:0 w:1)
-	/// Proof: Staking Payee (max_values: None, max_size: Some(73), added: 2548, mode: MaxEncodedLen)
-	fn bond() -> Weight {
-		// Proof Size summary in bytes:
-		//  Measured:  `980`
-		//  Estimated: `4764`
-		// Minimum execution time: 51_609_000 picoseconds.
-		Weight::from_parts(52_360_000, 0)
-			.saturating_add(Weight::from_parts(0, 4764))
-			.saturating_add(T::DbWeight::get().reads(5))
-			.saturating_add(T::DbWeight::get().writes(4))
-	}
-	/// Storage: Staking Bonded (r:1 w:0)
-	/// Proof: Staking Bonded (max_values: None, max_size: Some(72), added: 2547, mode: MaxEncodedLen)
-	/// Storage: Staking Ledger (r:1 w:1)
-	/// Proof: Staking Ledger (max_values: None, max_size: Some(1091), added: 3566, mode: MaxEncodedLen)
-	/// Storage: Balances Locks (r:1 w:1)
-	/// Proof: Balances Locks (max_values: None, max_size: Some(1299), added: 3774, mode: MaxEncodedLen)
-	/// Storage: Balances Freezes (r:1 w:0)
-	/// Proof: Balances Freezes (max_values: None, max_size: Some(49), added: 2524, mode: MaxEncodedLen)
-	/// Storage: VoterList ListNodes (r:3 w:3)
-	/// Proof: VoterList ListNodes (max_values: None, max_size: Some(154), added: 2629, mode: MaxEncodedLen)
-	/// Storage: VoterList ListBags (r:2 w:2)
-	/// Proof: VoterList ListBags (max_values: None, max_size: Some(82), added: 2557, mode: MaxEncodedLen)
-	fn bond_extra() -> Weight {
-		// Proof Size summary in bytes:
-		//  Measured:  `1955`
-		//  Estimated: `8877`
-		// Minimum execution time: 94_514_000 picoseconds.
-		Weight::from_parts(96_430_000, 0)
-			.saturating_add(Weight::from_parts(0, 8877))
-			.saturating_add(T::DbWeight::get().reads(9))
-			.saturating_add(T::DbWeight::get().writes(7))
-	}
-	/// Storage: Staking Ledger (r:1 w:1)
-	/// Proof: Staking Ledger (max_values: None, max_size: Some(1091), added: 3566, mode: MaxEncodedLen)
-	/// Storage: Staking Nominators (r:1 w:0)
-	/// Proof: Staking Nominators (max_values: None, max_size: Some(814), added: 3289, mode: MaxEncodedLen)
-	/// Storage: Staking MinNominatorBond (r:1 w:0)
-	/// Proof: Staking MinNominatorBond (max_values: Some(1), max_size: Some(16), added: 511, mode: MaxEncodedLen)
-	/// Storage: Staking CurrentEra (r:1 w:0)
-	/// Proof: Staking CurrentEra (max_values: Some(1), max_size: Some(4), added: 499, mode: MaxEncodedLen)
-	/// Storage: Balances Locks (r:1 w:1)
-	/// Proof: Balances Locks (max_values: None, max_size: Some(1299), added: 3774, mode: MaxEncodedLen)
-	/// Storage: Balances Freezes (r:1 w:0)
-	/// Proof: Balances Freezes (max_values: None, max_size: Some(49), added: 2524, mode: MaxEncodedLen)
-	/// Storage: VoterList ListNodes (r:3 w:3)
-	/// Proof: VoterList ListNodes (max_values: None, max_size: Some(154), added: 2629, mode: MaxEncodedLen)
-	/// Storage: Staking Bonded (r:1 w:0)
-	/// Proof: Staking Bonded (max_values: None, max_size: Some(72), added: 2547, mode: MaxEncodedLen)
-	/// Storage: VoterList ListBags (r:2 w:2)
-	/// Proof: VoterList ListBags (max_values: None, max_size: Some(82), added: 2557, mode: MaxEncodedLen)
-	fn unbond() -> Weight {
-		// Proof Size summary in bytes:
-		//  Measured:  `2166`
-		//  Estimated: `8877`
-		// Minimum execution time: 97_981_000 picoseconds.
-		Weight::from_parts(102_906_000, 0)
-			.saturating_add(Weight::from_parts(0, 8877))
-			.saturating_add(T::DbWeight::get().reads(12))
-			.saturating_add(T::DbWeight::get().writes(7))
-	}
-	/// Storage: Staking Ledger (r:1 w:1)
-	/// Proof: Staking Ledger (max_values: None, max_size: Some(1091), added: 3566, mode: MaxEncodedLen)
-	/// Storage: Staking CurrentEra (r:1 w:0)
-	/// Proof: Staking CurrentEra (max_values: Some(1), max_size: Some(4), added: 499, mode: MaxEncodedLen)
-	/// Storage: Balances Locks (r:1 w:1)
-	/// Proof: Balances Locks (max_values: None, max_size: Some(1299), added: 3774, mode: MaxEncodedLen)
-	/// Storage: Balances Freezes (r:1 w:0)
-	/// Proof: Balances Freezes (max_values: None, max_size: Some(49), added: 2524, mode: MaxEncodedLen)
-	/// The range of component `s` is `[0, 100]`.
-	fn withdraw_unbonded_update(s: u32, ) -> Weight {
-		// Proof Size summary in bytes:
-		//  Measured:  `944`
-		//  Estimated: `4764`
-		// Minimum execution time: 44_962_000 picoseconds.
-		Weight::from_parts(46_452_900, 0)
-			.saturating_add(Weight::from_parts(0, 4764))
-			// Standard Error: 1_541
-			.saturating_add(Weight::from_parts(40_855, 0).saturating_mul(s.into()))
-			.saturating_add(T::DbWeight::get().reads(4))
-			.saturating_add(T::DbWeight::get().writes(2))
-	}
-	/// Storage: Staking Ledger (r:1 w:1)
-	/// Proof: Staking Ledger (max_values: None, max_size: Some(1091), added: 3566, mode: MaxEncodedLen)
-	/// Storage: Staking CurrentEra (r:1 w:0)
-	/// Proof: Staking CurrentEra (max_values: Some(1), max_size: Some(4), added: 499, mode: MaxEncodedLen)
-	/// Storage: Staking Bonded (r:1 w:1)
-	/// Proof: Staking Bonded (max_values: None, max_size: Some(72), added: 2547, mode: MaxEncodedLen)
-	/// Storage: Staking SlashingSpans (r:1 w:1)
-	/// Proof Skipped: Staking SlashingSpans (max_values: None, max_size: None, mode: Measured)
-	/// Storage: Staking Validators (r:1 w:0)
-	/// Proof: Staking Validators (max_values: None, max_size: Some(45), added: 2520, mode: MaxEncodedLen)
-	/// Storage: Staking Nominators (r:1 w:1)
-	/// Proof: Staking Nominators (max_values: None, max_size: Some(814), added: 3289, mode: MaxEncodedLen)
-	/// Storage: Staking CounterForNominators (r:1 w:1)
-	/// Proof: Staking CounterForNominators (max_values: Some(1), max_size: Some(4), added: 499, mode: MaxEncodedLen)
-	/// Storage: VoterList ListNodes (r:2 w:2)
-	/// Proof: VoterList ListNodes (max_values: None, max_size: Some(154), added: 2629, mode: MaxEncodedLen)
-	/// Storage: VoterList ListBags (r:1 w:1)
-	/// Proof: VoterList ListBags (max_values: None, max_size: Some(82), added: 2557, mode: MaxEncodedLen)
-	/// Storage: VoterList CounterForListNodes (r:1 w:1)
-	/// Proof: VoterList CounterForListNodes (max_values: Some(1), max_size: Some(4), added: 499, mode: MaxEncodedLen)
-	/// Storage: Balances Locks (r:1 w:1)
-	/// Proof: Balances Locks (max_values: None, max_size: Some(1299), added: 3774, mode: MaxEncodedLen)
-	/// Storage: Balances Freezes (r:1 w:0)
-	/// Proof: Balances Freezes (max_values: None, max_size: Some(49), added: 2524, mode: MaxEncodedLen)
-	/// Storage: Staking Payee (r:0 w:1)
-	/// Proof: Staking Payee (max_values: None, max_size: Some(73), added: 2548, mode: MaxEncodedLen)
-	/// Storage: Staking SpanSlash (r:0 w:100)
-	/// Proof: Staking SpanSlash (max_values: None, max_size: Some(76), added: 2551, mode: MaxEncodedLen)
-	/// The range of component `s` is `[0, 100]`.
-	fn withdraw_unbonded_kill(s: u32, ) -> Weight {
-		// Proof Size summary in bytes:
-		//  Measured:  `2217 + s * (4 ±0)`
-		//  Estimated: `6248 + s * (4 ±0)`
-		// Minimum execution time: 94_257_000 picoseconds.
-		Weight::from_parts(102_162_641, 0)
-			.saturating_add(Weight::from_parts(0, 6248))
-			// Standard Error: 4_137
-			.saturating_add(Weight::from_parts(1_401_944, 0).saturating_mul(s.into()))
-			.saturating_add(T::DbWeight::get().reads(13))
-			.saturating_add(T::DbWeight::get().writes(11))
-			.saturating_add(T::DbWeight::get().writes((1_u64).saturating_mul(s.into())))
-			.saturating_add(Weight::from_parts(0, 4).saturating_mul(s.into()))
-	}
-	/// Storage: Staking Ledger (r:1 w:0)
-	/// Proof: Staking Ledger (max_values: None, max_size: Some(1091), added: 3566, mode: MaxEncodedLen)
-	/// Storage: Staking MinValidatorBond (r:1 w:0)
-	/// Proof: Staking MinValidatorBond (max_values: Some(1), max_size: Some(16), added: 511, mode: MaxEncodedLen)
-	/// Storage: Staking MinCommission (r:1 w:0)
-	/// Proof: Staking MinCommission (max_values: Some(1), max_size: Some(4), added: 499, mode: MaxEncodedLen)
-	/// Storage: Staking Validators (r:1 w:1)
-	/// Proof: Staking Validators (max_values: None, max_size: Some(45), added: 2520, mode: MaxEncodedLen)
-	/// Storage: Staking MaxValidatorsCount (r:1 w:0)
-	/// Proof: Staking MaxValidatorsCount (max_values: Some(1), max_size: Some(4), added: 499, mode: MaxEncodedLen)
-	/// Storage: Staking Nominators (r:1 w:0)
-	/// Proof: Staking Nominators (max_values: None, max_size: Some(814), added: 3289, mode: MaxEncodedLen)
-	/// Storage: Staking Bonded (r:1 w:0)
-	/// Proof: Staking Bonded (max_values: None, max_size: Some(72), added: 2547, mode: MaxEncodedLen)
-	/// Storage: VoterList ListNodes (r:1 w:1)
-	/// Proof: VoterList ListNodes (max_values: None, max_size: Some(154), added: 2629, mode: MaxEncodedLen)
-	/// Storage: VoterList ListBags (r:1 w:1)
-	/// Proof: VoterList ListBags (max_values: None, max_size: Some(82), added: 2557, mode: MaxEncodedLen)
-	/// Storage: VoterList CounterForListNodes (r:1 w:1)
-	/// Proof: VoterList CounterForListNodes (max_values: Some(1), max_size: Some(4), added: 499, mode: MaxEncodedLen)
-	/// Storage: Staking CounterForValidators (r:1 w:1)
-	/// Proof: Staking CounterForValidators (max_values: Some(1), max_size: Some(4), added: 499, mode: MaxEncodedLen)
-	fn validate() -> Weight {
-		// Proof Size summary in bytes:
-		//  Measured:  `1341`
-		//  Estimated: `4556`
-		// Minimum execution time: 57_139_000 picoseconds.
-		Weight::from_parts(58_021_000, 0)
-			.saturating_add(Weight::from_parts(0, 4556))
-			.saturating_add(T::DbWeight::get().reads(11))
-			.saturating_add(T::DbWeight::get().writes(5))
-	}
-	/// Storage: Staking Ledger (r:1 w:0)
-	/// Proof: Staking Ledger (max_values: None, max_size: Some(1091), added: 3566, mode: MaxEncodedLen)
-	/// Storage: Staking Nominators (r:128 w:128)
-	/// Proof: Staking Nominators (max_values: None, max_size: Some(814), added: 3289, mode: MaxEncodedLen)
-	/// The range of component `k` is `[1, 128]`.
-	fn kick(k: u32, ) -> Weight {
-		// Proof Size summary in bytes:
-		//  Measured:  `1326 + k * (823 ±0)`
-		//  Estimated: `4556 + k * (3289 ±0)`
-		// Minimum execution time: 36_112_000 picoseconds.
-		Weight::from_parts(31_474_845, 0)
-			.saturating_add(Weight::from_parts(0, 4556))
-			// Standard Error: 13_249
-			.saturating_add(Weight::from_parts(9_813_360, 0).saturating_mul(k.into()))
-			.saturating_add(T::DbWeight::get().reads(1))
-			.saturating_add(T::DbWeight::get().reads((1_u64).saturating_mul(k.into())))
-			.saturating_add(T::DbWeight::get().writes((1_u64).saturating_mul(k.into())))
-			.saturating_add(Weight::from_parts(0, 3289).saturating_mul(k.into()))
-	}
-	/// Storage: Staking Ledger (r:1 w:0)
-	/// Proof: Staking Ledger (max_values: None, max_size: Some(1091), added: 3566, mode: MaxEncodedLen)
-	/// Storage: Staking MinNominatorBond (r:1 w:0)
-	/// Proof: Staking MinNominatorBond (max_values: Some(1), max_size: Some(16), added: 511, mode: MaxEncodedLen)
-	/// Storage: Staking Nominators (r:1 w:1)
-	/// Proof: Staking Nominators (max_values: None, max_size: Some(814), added: 3289, mode: MaxEncodedLen)
-	/// Storage: Staking MaxNominatorsCount (r:1 w:0)
-	/// Proof: Staking MaxNominatorsCount (max_values: Some(1), max_size: Some(4), added: 499, mode: MaxEncodedLen)
-	/// Storage: Staking Validators (r:25 w:0)
-	/// Proof: Staking Validators (max_values: None, max_size: Some(45), added: 2520, mode: MaxEncodedLen)
-	/// Storage: Staking CurrentEra (r:1 w:0)
-	/// Proof: Staking CurrentEra (max_values: Some(1), max_size: Some(4), added: 499, mode: MaxEncodedLen)
-	/// Storage: Staking Bonded (r:1 w:0)
-	/// Proof: Staking Bonded (max_values: None, max_size: Some(72), added: 2547, mode: MaxEncodedLen)
-	/// Storage: VoterList ListNodes (r:2 w:2)
-	/// Proof: VoterList ListNodes (max_values: None, max_size: Some(154), added: 2629, mode: MaxEncodedLen)
-	/// Storage: VoterList ListBags (r:1 w:1)
-	/// Proof: VoterList ListBags (max_values: None, max_size: Some(82), added: 2557, mode: MaxEncodedLen)
-	/// Storage: VoterList CounterForListNodes (r:1 w:1)
-	/// Proof: VoterList CounterForListNodes (max_values: Some(1), max_size: Some(4), added: 499, mode: MaxEncodedLen)
-	/// Storage: Staking CounterForNominators (r:1 w:1)
-	/// Proof: Staking CounterForNominators (max_values: Some(1), max_size: Some(4), added: 499, mode: MaxEncodedLen)
-	/// The range of component `n` is `[1, 24]`.
-	fn nominate(n: u32, ) -> Weight {
-		// Proof Size summary in bytes:
-		//  Measured:  `1921 + n * (88 ±0)`
-		//  Estimated: `6248 + n * (2520 ±0)`
-		// Minimum execution time: 66_845_000 picoseconds.
-		Weight::from_parts(67_790_022, 0)
-			.saturating_add(Weight::from_parts(0, 6248))
-			// Standard Error: 18_238
-			.saturating_add(Weight::from_parts(3_739_950, 0).saturating_mul(n.into()))
-			.saturating_add(T::DbWeight::get().reads(12))
-			.saturating_add(T::DbWeight::get().reads((1_u64).saturating_mul(n.into())))
-			.saturating_add(T::DbWeight::get().writes(6))
-			.saturating_add(Weight::from_parts(0, 2520).saturating_mul(n.into()))
-	}
-	/// Storage: Staking Ledger (r:1 w:0)
-	/// Proof: Staking Ledger (max_values: None, max_size: Some(1091), added: 3566, mode: MaxEncodedLen)
-	/// Storage: Staking Validators (r:1 w:0)
-	/// Proof: Staking Validators (max_values: None, max_size: Some(45), added: 2520, mode: MaxEncodedLen)
-	/// Storage: Staking Nominators (r:1 w:1)
-	/// Proof: Staking Nominators (max_values: None, max_size: Some(814), added: 3289, mode: MaxEncodedLen)
-	/// Storage: Staking CounterForNominators (r:1 w:1)
-	/// Proof: Staking CounterForNominators (max_values: Some(1), max_size: Some(4), added: 499, mode: MaxEncodedLen)
-	/// Storage: VoterList ListNodes (r:2 w:2)
-	/// Proof: VoterList ListNodes (max_values: None, max_size: Some(154), added: 2629, mode: MaxEncodedLen)
-	/// Storage: VoterList ListBags (r:1 w:1)
-	/// Proof: VoterList ListBags (max_values: None, max_size: Some(82), added: 2557, mode: MaxEncodedLen)
-	/// Storage: VoterList CounterForListNodes (r:1 w:1)
-	/// Proof: VoterList CounterForListNodes (max_values: Some(1), max_size: Some(4), added: 499, mode: MaxEncodedLen)
-	fn chill() -> Weight {
-		// Proof Size summary in bytes:
-		//  Measured:  `1671`
-		//  Estimated: `6248`
-		// Minimum execution time: 59_727_000 picoseconds.
-		Weight::from_parts(61_591_000, 0)
-			.saturating_add(Weight::from_parts(0, 6248))
-			.saturating_add(T::DbWeight::get().reads(8))
-			.saturating_add(T::DbWeight::get().writes(6))
-	}
-	/// Storage: Staking Ledger (r:1 w:0)
-	/// Proof: Staking Ledger (max_values: None, max_size: Some(1091), added: 3566, mode: MaxEncodedLen)
-	/// Storage: Staking Payee (r:0 w:1)
-	/// Proof: Staking Payee (max_values: None, max_size: Some(73), added: 2548, mode: MaxEncodedLen)
-	fn set_payee() -> Weight {
-		// Proof Size summary in bytes:
-		//  Measured:  `735`
-		//  Estimated: `4556`
-		// Minimum execution time: 13_578_000 picoseconds.
-		Weight::from_parts(14_266_000, 0)
-			.saturating_add(Weight::from_parts(0, 4556))
-			.saturating_add(T::DbWeight::get().reads(1))
-			.saturating_add(T::DbWeight::get().writes(1))
-	}
-	/// Storage: Staking Bonded (r:1 w:1)
-	/// Proof: Staking Bonded (max_values: None, max_size: Some(72), added: 2547, mode: MaxEncodedLen)
-	/// Storage: Staking Ledger (r:2 w:2)
-	/// Proof: Staking Ledger (max_values: None, max_size: Some(1091), added: 3566, mode: MaxEncodedLen)
-	fn set_controller() -> Weight {
-		// Proof Size summary in bytes:
-		//  Measured:  `834`
-		//  Estimated: `8122`
-		// Minimum execution time: 21_128_000 picoseconds.
-		Weight::from_parts(21_739_000, 0)
-			.saturating_add(Weight::from_parts(0, 8122))
-			.saturating_add(T::DbWeight::get().reads(3))
-			.saturating_add(T::DbWeight::get().writes(3))
-	}
-	/// Storage: Staking ValidatorCount (r:0 w:1)
-	/// Proof: Staking ValidatorCount (max_values: Some(1), max_size: Some(4), added: 499, mode: MaxEncodedLen)
-	fn set_validator_count() -> Weight {
-		// Proof Size summary in bytes:
-		//  Measured:  `0`
-		//  Estimated: `0`
-		// Minimum execution time: 3_016_000 picoseconds.
-		Weight::from_parts(3_195_000, 0)
-			.saturating_add(Weight::from_parts(0, 0))
-			.saturating_add(T::DbWeight::get().writes(1))
-	}
-	/// Storage: Staking ForceEra (r:0 w:1)
-	/// Proof: Staking ForceEra (max_values: Some(1), max_size: Some(1), added: 496, mode: MaxEncodedLen)
-	fn force_no_eras() -> Weight {
-		// Proof Size summary in bytes:
-		//  Measured:  `0`
-		//  Estimated: `0`
-		// Minimum execution time: 9_431_000 picoseconds.
-		Weight::from_parts(9_624_000, 0)
-			.saturating_add(Weight::from_parts(0, 0))
-			.saturating_add(T::DbWeight::get().writes(1))
-	}
-	/// Storage: Staking ForceEra (r:0 w:1)
-	/// Proof: Staking ForceEra (max_values: Some(1), max_size: Some(1), added: 496, mode: MaxEncodedLen)
-	fn force_new_era() -> Weight {
-		// Proof Size summary in bytes:
-		//  Measured:  `0`
-		//  Estimated: `0`
-		// Minimum execution time: 9_322_000 picoseconds.
-		Weight::from_parts(9_551_000, 0)
-			.saturating_add(Weight::from_parts(0, 0))
-			.saturating_add(T::DbWeight::get().writes(1))
-	}
-	/// Storage: Staking ForceEra (r:0 w:1)
-	/// Proof: Staking ForceEra (max_values: Some(1), max_size: Some(1), added: 496, mode: MaxEncodedLen)
-	fn force_new_era_always() -> Weight {
-		// Proof Size summary in bytes:
-		//  Measured:  `0`
-		//  Estimated: `0`
-		// Minimum execution time: 9_209_000 picoseconds.
-		Weight::from_parts(9_772_000, 0)
-			.saturating_add(Weight::from_parts(0, 0))
-			.saturating_add(T::DbWeight::get().writes(1))
-	}
-	/// Storage: Staking Invulnerables (r:0 w:1)
-	/// Proof Skipped: Staking Invulnerables (max_values: Some(1), max_size: None, mode: Measured)
-	/// The range of component `v` is `[0, 1000]`.
-	fn set_invulnerables(v: u32, ) -> Weight {
-		// Proof Size summary in bytes:
-		//  Measured:  `0`
-		//  Estimated: `0`
-		// Minimum execution time: 3_228_000 picoseconds.
-		Weight::from_parts(3_437_995, 0)
-			.saturating_add(Weight::from_parts(0, 0))
-			// Standard Error: 50
-			.saturating_add(Weight::from_parts(12_179, 0).saturating_mul(v.into()))
-			.saturating_add(T::DbWeight::get().writes(1))
-	}
-	/// Storage: Staking Bonded (r:1 w:1)
-	/// Proof: Staking Bonded (max_values: None, max_size: Some(72), added: 2547, mode: MaxEncodedLen)
-	/// Storage: Staking SlashingSpans (r:1 w:1)
-	/// Proof Skipped: Staking SlashingSpans (max_values: None, max_size: None, mode: Measured)
-	/// Storage: Staking Validators (r:1 w:0)
-	/// Proof: Staking Validators (max_values: None, max_size: Some(45), added: 2520, mode: MaxEncodedLen)
-	/// Storage: Staking Nominators (r:1 w:1)
-	/// Proof: Staking Nominators (max_values: None, max_size: Some(814), added: 3289, mode: MaxEncodedLen)
-	/// Storage: Staking CounterForNominators (r:1 w:1)
-	/// Proof: Staking CounterForNominators (max_values: Some(1), max_size: Some(4), added: 499, mode: MaxEncodedLen)
-	/// Storage: VoterList ListNodes (r:2 w:2)
-	/// Proof: VoterList ListNodes (max_values: None, max_size: Some(154), added: 2629, mode: MaxEncodedLen)
-	/// Storage: VoterList ListBags (r:1 w:1)
-	/// Proof: VoterList ListBags (max_values: None, max_size: Some(82), added: 2557, mode: MaxEncodedLen)
-	/// Storage: VoterList CounterForListNodes (r:1 w:1)
-	/// Proof: VoterList CounterForListNodes (max_values: Some(1), max_size: Some(4), added: 499, mode: MaxEncodedLen)
-	/// Storage: System Account (r:1 w:1)
-	/// Proof: System Account (max_values: None, max_size: Some(128), added: 2603, mode: MaxEncodedLen)
-	/// Storage: Balances Locks (r:1 w:1)
-	/// Proof: Balances Locks (max_values: None, max_size: Some(1299), added: 3774, mode: MaxEncodedLen)
-	/// Storage: Balances Freezes (r:1 w:0)
-	/// Proof: Balances Freezes (max_values: None, max_size: Some(49), added: 2524, mode: MaxEncodedLen)
-	/// Storage: Staking Ledger (r:0 w:1)
-	/// Proof: Staking Ledger (max_values: None, max_size: Some(1091), added: 3566, mode: MaxEncodedLen)
-	/// Storage: Staking Payee (r:0 w:1)
-	/// Proof: Staking Payee (max_values: None, max_size: Some(73), added: 2548, mode: MaxEncodedLen)
-	/// Storage: Staking SpanSlash (r:0 w:100)
-	/// Proof: Staking SpanSlash (max_values: None, max_size: Some(76), added: 2551, mode: MaxEncodedLen)
-	/// The range of component `s` is `[0, 100]`.
-	fn force_unstake(s: u32, ) -> Weight {
-		// Proof Size summary in bytes:
-		//  Measured:  `1947 + s * (4 ±0)`
-		//  Estimated: `6248 + s * (4 ±0)`
-		// Minimum execution time: 86_567_000 picoseconds.
-		Weight::from_parts(93_537_408, 0)
-			.saturating_add(Weight::from_parts(0, 6248))
-			// Standard Error: 3_840
-			.saturating_add(Weight::from_parts(1_371_525, 0).saturating_mul(s.into()))
-			.saturating_add(T::DbWeight::get().reads(12))
-			.saturating_add(T::DbWeight::get().writes(12))
-			.saturating_add(T::DbWeight::get().writes((1_u64).saturating_mul(s.into())))
-			.saturating_add(Weight::from_parts(0, 4).saturating_mul(s.into()))
-	}
-	/// Storage: Staking UnappliedSlashes (r:1 w:1)
-	/// Proof Skipped: Staking UnappliedSlashes (max_values: None, max_size: None, mode: Measured)
-	/// The range of component `s` is `[1, 1000]`.
-	fn cancel_deferred_slash(s: u32, ) -> Weight {
-		// Proof Size summary in bytes:
-		//  Measured:  `66572`
-		//  Estimated: `70037`
-		// Minimum execution time: 129_433_000 picoseconds.
-		Weight::from_parts(939_746_867, 0)
-			.saturating_add(Weight::from_parts(0, 70037))
-			// Standard Error: 58_234
-			.saturating_add(Weight::from_parts(4_851_875, 0).saturating_mul(s.into()))
-			.saturating_add(T::DbWeight::get().reads(1))
-			.saturating_add(T::DbWeight::get().writes(1))
-	}
-	/// Storage: Staking CurrentEra (r:1 w:0)
-	/// Proof: Staking CurrentEra (max_values: Some(1), max_size: Some(4), added: 499, mode: MaxEncodedLen)
-	/// Storage: Staking ErasValidatorReward (r:1 w:0)
-	/// Proof: Staking ErasValidatorReward (max_values: None, max_size: Some(28), added: 2503, mode: MaxEncodedLen)
-	/// Storage: Staking Bonded (r:513 w:0)
-	/// Proof: Staking Bonded (max_values: None, max_size: Some(72), added: 2547, mode: MaxEncodedLen)
-	/// Storage: Staking Ledger (r:1 w:1)
-	/// Proof: Staking Ledger (max_values: None, max_size: Some(1091), added: 3566, mode: MaxEncodedLen)
-	/// Storage: Staking ErasStakersClipped (r:1 w:0)
-	/// Proof Skipped: Staking ErasStakersClipped (max_values: None, max_size: None, mode: Measured)
-	/// Storage: Staking ErasRewardPoints (r:1 w:0)
-	/// Proof Skipped: Staking ErasRewardPoints (max_values: None, max_size: None, mode: Measured)
-	/// Storage: Staking ErasValidatorPrefs (r:1 w:0)
-	/// Proof: Staking ErasValidatorPrefs (max_values: None, max_size: Some(57), added: 2532, mode: MaxEncodedLen)
-	/// Storage: Staking Payee (r:513 w:0)
-	/// Proof: Staking Payee (max_values: None, max_size: Some(73), added: 2548, mode: MaxEncodedLen)
-	/// Storage: System Account (r:513 w:513)
-	/// Proof: System Account (max_values: None, max_size: Some(128), added: 2603, mode: MaxEncodedLen)
-	/// The range of component `n` is `[0, 512]`.
-	fn payout_stakers_dead_controller(n: u32, ) -> Weight {
-		// Proof Size summary in bytes:
-		//  Measured:  `34175 + n * (149 ±0)`
-		//  Estimated: `32387 + n * (2603 ±1)`
-		// Minimum execution time: 121_648_000 picoseconds.
-		Weight::from_parts(145_330_037, 0)
-			.saturating_add(Weight::from_parts(0, 32387))
-			// Standard Error: 30_044
-			.saturating_add(Weight::from_parts(35_396_961, 0).saturating_mul(n.into()))
-			.saturating_add(T::DbWeight::get().reads(9))
-			.saturating_add(T::DbWeight::get().reads((3_u64).saturating_mul(n.into())))
-			.saturating_add(T::DbWeight::get().writes(2))
-			.saturating_add(T::DbWeight::get().writes((1_u64).saturating_mul(n.into())))
-			.saturating_add(Weight::from_parts(0, 2603).saturating_mul(n.into()))
-	}
-	/// Storage: Staking CurrentEra (r:1 w:0)
-	/// Proof: Staking CurrentEra (max_values: Some(1), max_size: Some(4), added: 499, mode: MaxEncodedLen)
-	/// Storage: Staking ErasValidatorReward (r:1 w:0)
-	/// Proof: Staking ErasValidatorReward (max_values: None, max_size: Some(28), added: 2503, mode: MaxEncodedLen)
-	/// Storage: Staking Bonded (r:513 w:0)
-	/// Proof: Staking Bonded (max_values: None, max_size: Some(72), added: 2547, mode: MaxEncodedLen)
-	/// Storage: Staking Ledger (r:513 w:513)
-	/// Proof: Staking Ledger (max_values: None, max_size: Some(1091), added: 3566, mode: MaxEncodedLen)
-	/// Storage: Staking ErasStakersClipped (r:1 w:0)
-	/// Proof Skipped: Staking ErasStakersClipped (max_values: None, max_size: None, mode: Measured)
-	/// Storage: Staking ErasRewardPoints (r:1 w:0)
-	/// Proof Skipped: Staking ErasRewardPoints (max_values: None, max_size: None, mode: Measured)
-	/// Storage: Staking ErasValidatorPrefs (r:1 w:0)
-	/// Proof: Staking ErasValidatorPrefs (max_values: None, max_size: Some(57), added: 2532, mode: MaxEncodedLen)
-	/// Storage: Staking Payee (r:513 w:0)
-	/// Proof: Staking Payee (max_values: None, max_size: Some(73), added: 2548, mode: MaxEncodedLen)
-	/// Storage: System Account (r:513 w:513)
-	/// Proof: System Account (max_values: None, max_size: Some(128), added: 2603, mode: MaxEncodedLen)
-	/// Storage: Balances Locks (r:513 w:513)
-	/// Proof: Balances Locks (max_values: None, max_size: Some(1299), added: 3774, mode: MaxEncodedLen)
-	/// Storage: Balances Freezes (r:513 w:0)
-	/// Proof: Balances Freezes (max_values: None, max_size: Some(49), added: 2524, mode: MaxEncodedLen)
-	/// The range of component `n` is `[0, 512]`.
-	fn payout_stakers_alive_staked(n: u32, ) -> Weight {
-		// Proof Size summary in bytes:
-		//  Measured:  `58149 + n * (385 ±0)`
-		//  Estimated: `53036 + n * (3774 ±2)`
-		// Minimum execution time: 159_726_000 picoseconds.
-		Weight::from_parts(163_012_000, 0)
-			.saturating_add(Weight::from_parts(0, 53036))
-			// Standard Error: 96_376
-			.saturating_add(Weight::from_parts(59_227_426, 0).saturating_mul(n.into()))
-			.saturating_add(T::DbWeight::get().reads(11))
-			.saturating_add(T::DbWeight::get().reads((6_u64).saturating_mul(n.into())))
-			.saturating_add(T::DbWeight::get().writes(3))
-			.saturating_add(T::DbWeight::get().writes((3_u64).saturating_mul(n.into())))
-			.saturating_add(Weight::from_parts(0, 3774).saturating_mul(n.into()))
-	}
-	/// Storage: Staking Ledger (r:1 w:1)
-	/// Proof: Staking Ledger (max_values: None, max_size: Some(1091), added: 3566, mode: MaxEncodedLen)
-	/// Storage: Balances Locks (r:1 w:1)
-	/// Proof: Balances Locks (max_values: None, max_size: Some(1299), added: 3774, mode: MaxEncodedLen)
-	/// Storage: Balances Freezes (r:1 w:0)
-	/// Proof: Balances Freezes (max_values: None, max_size: Some(49), added: 2524, mode: MaxEncodedLen)
-	/// Storage: VoterList ListNodes (r:3 w:3)
-	/// Proof: VoterList ListNodes (max_values: None, max_size: Some(154), added: 2629, mode: MaxEncodedLen)
-	/// Storage: Staking Bonded (r:1 w:0)
-	/// Proof: Staking Bonded (max_values: None, max_size: Some(72), added: 2547, mode: MaxEncodedLen)
-	/// Storage: VoterList ListBags (r:2 w:2)
-	/// Proof: VoterList ListBags (max_values: None, max_size: Some(82), added: 2557, mode: MaxEncodedLen)
-	/// The range of component `l` is `[1, 32]`.
-	fn rebond(l: u32, ) -> Weight {
-		// Proof Size summary in bytes:
-		//  Measured:  `1956 + l * (5 ±0)`
-		//  Estimated: `8877`
-		// Minimum execution time: 88_119_000 picoseconds.
-		Weight::from_parts(91_343_026, 0)
-			.saturating_add(Weight::from_parts(0, 8877))
-			// Standard Error: 5_157
-			.saturating_add(Weight::from_parts(38_885, 0).saturating_mul(l.into()))
-			.saturating_add(T::DbWeight::get().reads(9))
-			.saturating_add(T::DbWeight::get().writes(7))
-	}
-	/// Storage: Staking Bonded (r:1 w:1)
-	/// Proof: Staking Bonded (max_values: None, max_size: Some(72), added: 2547, mode: MaxEncodedLen)
-	/// Storage: Staking Ledger (r:1 w:1)
-	/// Proof: Staking Ledger (max_values: None, max_size: Some(1091), added: 3566, mode: MaxEncodedLen)
-	/// Storage: Staking SlashingSpans (r:1 w:1)
-	/// Proof Skipped: Staking SlashingSpans (max_values: None, max_size: None, mode: Measured)
-	/// Storage: Staking Validators (r:1 w:0)
-	/// Proof: Staking Validators (max_values: None, max_size: Some(45), added: 2520, mode: MaxEncodedLen)
-	/// Storage: Staking Nominators (r:1 w:1)
-	/// Proof: Staking Nominators (max_values: None, max_size: Some(814), added: 3289, mode: MaxEncodedLen)
-	/// Storage: Staking CounterForNominators (r:1 w:1)
-	/// Proof: Staking CounterForNominators (max_values: Some(1), max_size: Some(4), added: 499, mode: MaxEncodedLen)
-	/// Storage: VoterList ListNodes (r:2 w:2)
-	/// Proof: VoterList ListNodes (max_values: None, max_size: Some(154), added: 2629, mode: MaxEncodedLen)
-	/// Storage: VoterList ListBags (r:1 w:1)
-	/// Proof: VoterList ListBags (max_values: None, max_size: Some(82), added: 2557, mode: MaxEncodedLen)
-	/// Storage: VoterList CounterForListNodes (r:1 w:1)
-	/// Proof: VoterList CounterForListNodes (max_values: Some(1), max_size: Some(4), added: 499, mode: MaxEncodedLen)
-	/// Storage: Balances Locks (r:1 w:1)
-	/// Proof: Balances Locks (max_values: None, max_size: Some(1299), added: 3774, mode: MaxEncodedLen)
-	/// Storage: Balances Freezes (r:1 w:0)
-	/// Proof: Balances Freezes (max_values: None, max_size: Some(49), added: 2524, mode: MaxEncodedLen)
-	/// Storage: Staking Payee (r:0 w:1)
-	/// Proof: Staking Payee (max_values: None, max_size: Some(73), added: 2548, mode: MaxEncodedLen)
-	/// Storage: Staking SpanSlash (r:0 w:100)
-	/// Proof: Staking SpanSlash (max_values: None, max_size: Some(76), added: 2551, mode: MaxEncodedLen)
-	/// The range of component `s` is `[1, 100]`.
-	fn reap_stash(s: u32, ) -> Weight {
-		// Proof Size summary in bytes:
-		//  Measured:  `2217 + s * (4 ±0)`
-		//  Estimated: `6248 + s * (4 ±0)`
-		// Minimum execution time: 100_347_000 picoseconds.
-		Weight::from_parts(103_081_218, 0)
-			.saturating_add(Weight::from_parts(0, 6248))
-			// Standard Error: 3_957
-			.saturating_add(Weight::from_parts(1_403_417, 0).saturating_mul(s.into()))
-			.saturating_add(T::DbWeight::get().reads(12))
-			.saturating_add(T::DbWeight::get().writes(11))
-			.saturating_add(T::DbWeight::get().writes((1_u64).saturating_mul(s.into())))
-			.saturating_add(Weight::from_parts(0, 4).saturating_mul(s.into()))
-	}
-	/// Storage: VoterList CounterForListNodes (r:1 w:0)
-	/// Proof: VoterList CounterForListNodes (max_values: Some(1), max_size: Some(4), added: 499, mode: MaxEncodedLen)
-	/// Storage: VoterList ListBags (r:166 w:0)
-	/// Proof: VoterList ListBags (max_values: None, max_size: Some(82), added: 2557, mode: MaxEncodedLen)
-	/// Storage: VoterList ListNodes (r:110 w:0)
-	/// Proof: VoterList ListNodes (max_values: None, max_size: Some(154), added: 2629, mode: MaxEncodedLen)
-	/// Storage: Staking Nominators (r:110 w:0)
-	/// Proof: Staking Nominators (max_values: None, max_size: Some(814), added: 3289, mode: MaxEncodedLen)
-	/// Storage: Staking Validators (r:11 w:0)
-	/// Proof: Staking Validators (max_values: None, max_size: Some(45), added: 2520, mode: MaxEncodedLen)
-	/// Storage: Staking Bonded (r:110 w:0)
-	/// Proof: Staking Bonded (max_values: None, max_size: Some(72), added: 2547, mode: MaxEncodedLen)
-	/// Storage: Staking Ledger (r:110 w:0)
-	/// Proof: Staking Ledger (max_values: None, max_size: Some(1091), added: 3566, mode: MaxEncodedLen)
-	/// Storage: System BlockWeight (r:1 w:1)
-	/// Proof: System BlockWeight (max_values: Some(1), max_size: Some(48), added: 543, mode: MaxEncodedLen)
-	/// Storage: Staking CounterForValidators (r:1 w:0)
-	/// Proof: Staking CounterForValidators (max_values: Some(1), max_size: Some(4), added: 499, mode: MaxEncodedLen)
-	/// Storage: Staking ValidatorCount (r:1 w:0)
-	/// Proof: Staking ValidatorCount (max_values: Some(1), max_size: Some(4), added: 499, mode: MaxEncodedLen)
-	/// Storage: Staking MinimumValidatorCount (r:1 w:0)
-	/// Proof: Staking MinimumValidatorCount (max_values: Some(1), max_size: Some(4), added: 499, mode: MaxEncodedLen)
-	/// Storage: Staking CurrentEra (r:1 w:1)
-	/// Proof: Staking CurrentEra (max_values: Some(1), max_size: Some(4), added: 499, mode: MaxEncodedLen)
-	/// Storage: Staking ErasStakersClipped (r:0 w:10)
-	/// Proof Skipped: Staking ErasStakersClipped (max_values: None, max_size: None, mode: Measured)
-	/// Storage: Staking ErasValidatorPrefs (r:0 w:10)
-	/// Proof: Staking ErasValidatorPrefs (max_values: None, max_size: Some(57), added: 2532, mode: MaxEncodedLen)
-	/// Storage: Staking ErasStakers (r:0 w:10)
-	/// Proof Skipped: Staking ErasStakers (max_values: None, max_size: None, mode: Measured)
-	/// Storage: Staking ErasTotalStake (r:0 w:1)
-	/// Proof: Staking ErasTotalStake (max_values: None, max_size: Some(28), added: 2503, mode: MaxEncodedLen)
-	/// Storage: Staking ErasStartSessionIndex (r:0 w:1)
-	/// Proof: Staking ErasStartSessionIndex (max_values: None, max_size: Some(16), added: 2491, mode: MaxEncodedLen)
-	/// Storage: Staking MinimumActiveStake (r:0 w:1)
-	/// Proof: Staking MinimumActiveStake (max_values: Some(1), max_size: Some(16), added: 511, mode: MaxEncodedLen)
-	/// The range of component `v` is `[1, 10]`.
-	/// The range of component `n` is `[0, 100]`.
-	fn new_era(v: u32, n: u32, ) -> Weight {
-		// Proof Size summary in bytes:
-		//  Measured:  `0 + n * (714 ±0) + v * (3592 ±0)`
-		//  Estimated: `425452 + n * (3566 ±0) + v * (3566 ±0)`
-		// Minimum execution time: 543_737_000 picoseconds.
-		Weight::from_parts(547_799_000, 0)
-			.saturating_add(Weight::from_parts(0, 425452))
-			// Standard Error: 2_046_982
-			.saturating_add(Weight::from_parts(66_708_000, 0).saturating_mul(v.into()))
-			// Standard Error: 203_970
-			.saturating_add(Weight::from_parts(20_246_221, 0).saturating_mul(n.into()))
-			.saturating_add(T::DbWeight::get().reads(173))
-			.saturating_add(T::DbWeight::get().reads((5_u64).saturating_mul(v.into())))
-			.saturating_add(T::DbWeight::get().reads((4_u64).saturating_mul(n.into())))
-			.saturating_add(T::DbWeight::get().writes(5))
-			.saturating_add(T::DbWeight::get().writes((3_u64).saturating_mul(v.into())))
-			.saturating_add(Weight::from_parts(0, 3566).saturating_mul(n.into()))
-			.saturating_add(Weight::from_parts(0, 3566).saturating_mul(v.into()))
-	}
-	/// Storage: VoterList CounterForListNodes (r:1 w:0)
-	/// Proof: VoterList CounterForListNodes (max_values: Some(1), max_size: Some(4), added: 499, mode: MaxEncodedLen)
-	/// Storage: VoterList ListBags (r:166 w:0)
-	/// Proof: VoterList ListBags (max_values: None, max_size: Some(82), added: 2557, mode: MaxEncodedLen)
-	/// Storage: VoterList ListNodes (r:2000 w:0)
-	/// Proof: VoterList ListNodes (max_values: None, max_size: Some(154), added: 2629, mode: MaxEncodedLen)
-	/// Storage: Staking Nominators (r:2000 w:0)
-	/// Proof: Staking Nominators (max_values: None, max_size: Some(814), added: 3289, mode: MaxEncodedLen)
-	/// Storage: Staking Validators (r:1000 w:0)
-	/// Proof: Staking Validators (max_values: None, max_size: Some(45), added: 2520, mode: MaxEncodedLen)
-	/// Storage: Staking Bonded (r:2000 w:0)
-	/// Proof: Staking Bonded (max_values: None, max_size: Some(72), added: 2547, mode: MaxEncodedLen)
-	/// Storage: Staking Ledger (r:2000 w:0)
-	/// Proof: Staking Ledger (max_values: None, max_size: Some(1091), added: 3566, mode: MaxEncodedLen)
-	/// Storage: System BlockWeight (r:1 w:1)
-	/// Proof: System BlockWeight (max_values: Some(1), max_size: Some(48), added: 543, mode: MaxEncodedLen)
-	/// Storage: Staking MinimumActiveStake (r:0 w:1)
-	/// Proof: Staking MinimumActiveStake (max_values: Some(1), max_size: Some(16), added: 511, mode: MaxEncodedLen)
-	/// The range of component `v` is `[500, 1000]`.
-	/// The range of component `n` is `[500, 1000]`.
-	fn get_npos_voters(v: u32, n: u32, ) -> Weight {
-		// Proof Size summary in bytes:
-		//  Measured:  `3151 + n * (1161 ±0) + v * (389 ±0)`
-		//  Estimated: `425452 + n * (3566 ±0) + v * (3566 ±0)`
-		// Minimum execution time: 38_906_963_000 picoseconds.
-		Weight::from_parts(39_744_147_000, 0)
-			.saturating_add(Weight::from_parts(0, 425452))
-			// Standard Error: 411_378
-			.saturating_add(Weight::from_parts(3_691_522, 0).saturating_mul(v.into()))
-			// Standard Error: 411_378
-			.saturating_add(Weight::from_parts(5_732_105, 0).saturating_mul(n.into()))
-			.saturating_add(T::DbWeight::get().reads(168))
-			.saturating_add(T::DbWeight::get().reads((5_u64).saturating_mul(v.into())))
-			.saturating_add(T::DbWeight::get().reads((4_u64).saturating_mul(n.into())))
-			.saturating_add(T::DbWeight::get().writes(2))
-			.saturating_add(Weight::from_parts(0, 3566).saturating_mul(n.into()))
-			.saturating_add(Weight::from_parts(0, 3566).saturating_mul(v.into()))
-	}
-	/// Storage: Staking CounterForValidators (r:1 w:0)
-	/// Proof: Staking CounterForValidators (max_values: Some(1), max_size: Some(4), added: 499, mode: MaxEncodedLen)
-	/// Storage: Staking Validators (r:1001 w:0)
-	/// Proof: Staking Validators (max_values: None, max_size: Some(45), added: 2520, mode: MaxEncodedLen)
-	/// Storage: System BlockWeight (r:1 w:1)
-	/// Proof: System BlockWeight (max_values: Some(1), max_size: Some(48), added: 543, mode: MaxEncodedLen)
-	/// The range of component `v` is `[500, 1000]`.
-	fn get_npos_targets(v: u32, ) -> Weight {
-		// Proof Size summary in bytes:
-		//  Measured:  `917 + v * (50 ±0)`
-		//  Estimated: `3510 + v * (2520 ±0)`
-		// Minimum execution time: 2_614_613_000 picoseconds.
-		Weight::from_parts(127_976_836, 0)
-			.saturating_add(Weight::from_parts(0, 3510))
-			// Standard Error: 10_285
-			.saturating_add(Weight::from_parts(5_101_327, 0).saturating_mul(v.into()))
-			.saturating_add(T::DbWeight::get().reads(3))
-			.saturating_add(T::DbWeight::get().reads((1_u64).saturating_mul(v.into())))
-			.saturating_add(T::DbWeight::get().writes(1))
-			.saturating_add(Weight::from_parts(0, 2520).saturating_mul(v.into()))
-	}
-	/// Storage: Staking MinCommission (r:0 w:1)
-	/// Proof: Staking MinCommission (max_values: Some(1), max_size: Some(4), added: 499, mode: MaxEncodedLen)
-	/// Storage: Staking MinValidatorBond (r:0 w:1)
-	/// Proof: Staking MinValidatorBond (max_values: Some(1), max_size: Some(16), added: 511, mode: MaxEncodedLen)
-	/// Storage: Staking MaxValidatorsCount (r:0 w:1)
-	/// Proof: Staking MaxValidatorsCount (max_values: Some(1), max_size: Some(4), added: 499, mode: MaxEncodedLen)
-	/// Storage: Staking ChillThreshold (r:0 w:1)
-	/// Proof: Staking ChillThreshold (max_values: Some(1), max_size: Some(1), added: 496, mode: MaxEncodedLen)
-	/// Storage: Staking MaxNominatorsCount (r:0 w:1)
-	/// Proof: Staking MaxNominatorsCount (max_values: Some(1), max_size: Some(4), added: 499, mode: MaxEncodedLen)
-	/// Storage: Staking MinNominatorBond (r:0 w:1)
-	/// Proof: Staking MinNominatorBond (max_values: Some(1), max_size: Some(16), added: 511, mode: MaxEncodedLen)
-	fn set_staking_configs_all_set() -> Weight {
-		// Proof Size summary in bytes:
-		//  Measured:  `0`
-		//  Estimated: `0`
-		// Minimum execution time: 6_533_000 picoseconds.
-		Weight::from_parts(6_797_000, 0)
-			.saturating_add(Weight::from_parts(0, 0))
-			.saturating_add(T::DbWeight::get().writes(6))
-	}
-	/// Storage: Staking MinCommission (r:0 w:1)
-	/// Proof: Staking MinCommission (max_values: Some(1), max_size: Some(4), added: 499, mode: MaxEncodedLen)
-	/// Storage: Staking MinValidatorBond (r:0 w:1)
-	/// Proof: Staking MinValidatorBond (max_values: Some(1), max_size: Some(16), added: 511, mode: MaxEncodedLen)
-	/// Storage: Staking MaxValidatorsCount (r:0 w:1)
-	/// Proof: Staking MaxValidatorsCount (max_values: Some(1), max_size: Some(4), added: 499, mode: MaxEncodedLen)
-	/// Storage: Staking ChillThreshold (r:0 w:1)
-	/// Proof: Staking ChillThreshold (max_values: Some(1), max_size: Some(1), added: 496, mode: MaxEncodedLen)
-	/// Storage: Staking MaxNominatorsCount (r:0 w:1)
-	/// Proof: Staking MaxNominatorsCount (max_values: Some(1), max_size: Some(4), added: 499, mode: MaxEncodedLen)
-	/// Storage: Staking MinNominatorBond (r:0 w:1)
-	/// Proof: Staking MinNominatorBond (max_values: Some(1), max_size: Some(16), added: 511, mode: MaxEncodedLen)
-	fn set_staking_configs_all_remove() -> Weight {
-		// Proof Size summary in bytes:
-		//  Measured:  `0`
-		//  Estimated: `0`
-		// Minimum execution time: 6_056_000 picoseconds.
-		Weight::from_parts(6_255_000, 0)
-			.saturating_add(Weight::from_parts(0, 0))
-			.saturating_add(T::DbWeight::get().writes(6))
-	}
-	/// Storage: Staking Ledger (r:1 w:0)
-	/// Proof: Staking Ledger (max_values: None, max_size: Some(1091), added: 3566, mode: MaxEncodedLen)
-	/// Storage: Staking Nominators (r:1 w:1)
-	/// Proof: Staking Nominators (max_values: None, max_size: Some(814), added: 3289, mode: MaxEncodedLen)
-	/// Storage: Staking ChillThreshold (r:1 w:0)
-	/// Proof: Staking ChillThreshold (max_values: Some(1), max_size: Some(1), added: 496, mode: MaxEncodedLen)
-	/// Storage: Staking MaxNominatorsCount (r:1 w:0)
-	/// Proof: Staking MaxNominatorsCount (max_values: Some(1), max_size: Some(4), added: 499, mode: MaxEncodedLen)
-	/// Storage: Staking CounterForNominators (r:1 w:1)
-	/// Proof: Staking CounterForNominators (max_values: Some(1), max_size: Some(4), added: 499, mode: MaxEncodedLen)
-	/// Storage: Staking MinNominatorBond (r:1 w:0)
-	/// Proof: Staking MinNominatorBond (max_values: Some(1), max_size: Some(16), added: 511, mode: MaxEncodedLen)
-	/// Storage: Staking Validators (r:1 w:0)
-	/// Proof: Staking Validators (max_values: None, max_size: Some(45), added: 2520, mode: MaxEncodedLen)
-	/// Storage: VoterList ListNodes (r:2 w:2)
-	/// Proof: VoterList ListNodes (max_values: None, max_size: Some(154), added: 2629, mode: MaxEncodedLen)
-	/// Storage: VoterList ListBags (r:1 w:1)
-	/// Proof: VoterList ListBags (max_values: None, max_size: Some(82), added: 2557, mode: MaxEncodedLen)
-	/// Storage: VoterList CounterForListNodes (r:1 w:1)
-	/// Proof: VoterList CounterForListNodes (max_values: Some(1), max_size: Some(4), added: 499, mode: MaxEncodedLen)
-	fn chill_other() -> Weight {
-		// Proof Size summary in bytes:
-		//  Measured:  `1794`
-		//  Estimated: `6248`
-		// Minimum execution time: 71_915_000 picoseconds.
-		Weight::from_parts(73_500_000, 0)
-			.saturating_add(Weight::from_parts(0, 6248))
-			.saturating_add(T::DbWeight::get().reads(11))
-			.saturating_add(T::DbWeight::get().writes(6))
-	}
-	/// Storage: Staking MinCommission (r:1 w:0)
-	/// Proof: Staking MinCommission (max_values: Some(1), max_size: Some(4), added: 499, mode: MaxEncodedLen)
-	/// Storage: Staking Validators (r:1 w:1)
-	/// Proof: Staking Validators (max_values: None, max_size: Some(45), added: 2520, mode: MaxEncodedLen)
-	fn force_apply_min_commission() -> Weight {
-		// Proof Size summary in bytes:
-		//  Measured:  `627`
-		//  Estimated: `3510`
-		// Minimum execution time: 12_994_000 picoseconds.
-		Weight::from_parts(13_452_000, 0)
-			.saturating_add(Weight::from_parts(0, 3510))
-			.saturating_add(T::DbWeight::get().reads(2))
-			.saturating_add(T::DbWeight::get().writes(1))
-	}
-	/// Storage: Staking MinCommission (r:0 w:1)
-	/// Proof: Staking MinCommission (max_values: Some(1), max_size: Some(4), added: 499, mode: MaxEncodedLen)
-	fn set_min_commission() -> Weight {
-		// Proof Size summary in bytes:
-		//  Measured:  `0`
-		//  Estimated: `0`
-		// Minimum execution time: 3_191_000 picoseconds.
-		Weight::from_parts(3_315_000, 0)
-			.saturating_add(Weight::from_parts(0, 0))
-			.saturating_add(T::DbWeight::get().writes(1))
-	}
-}
diff --git a/polkadot/runtime/kusama/src/weights/pallet_tips.rs b/polkadot/runtime/kusama/src/weights/pallet_tips.rs
deleted file mode 100644
index 64729ed63039f53c5c3ae9a3317e4f976c29645b..0000000000000000000000000000000000000000
--- a/polkadot/runtime/kusama/src/weights/pallet_tips.rs
+++ /dev/null
@@ -1,159 +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/>.
-//! Autogenerated weights for `pallet_tips`
-//!
-//! THIS FILE WAS AUTO-GENERATED USING THE SUBSTRATE BENCHMARK CLI VERSION 4.0.0-dev
-//! DATE: 2023-03-16, STEPS: `50`, REPEAT: `20`, LOW RANGE: `[]`, HIGH RANGE: `[]`
-//! WORST CASE MAP SIZE: `1000000`
-//! HOSTNAME: `bm5`, CPU: `Intel(R) Core(TM) i7-7700K CPU @ 4.20GHz`
-//! EXECUTION: Some(Wasm), WASM-EXECUTION: Compiled, CHAIN: Some("kusama-dev"), DB CACHE: 1024
-
-// Executed Command:
-// ./target/production/polkadot
-// benchmark
-// pallet
-// --chain=kusama-dev
-// --steps=50
-// --repeat=20
-// --pallet=pallet_tips
-// --extrinsic=*
-// --execution=wasm
-// --wasm-execution=compiled
-// --header=./file_header.txt
-// --output=./runtime/kusama/src/weights/
-
-#![cfg_attr(rustfmt, rustfmt_skip)]
-#![allow(unused_parens)]
-#![allow(unused_imports)]
-
-use frame_support::{traits::Get, weights::Weight};
-use sp_std::marker::PhantomData;
-
-/// Weight functions for `pallet_tips`.
-pub struct WeightInfo<T>(PhantomData<T>);
-impl<T: frame_system::Config> pallet_tips::WeightInfo for WeightInfo<T> {
-	/// Storage: Tips Reasons (r:1 w:1)
-	/// Proof Skipped: Tips Reasons (max_values: None, max_size: None, mode: Measured)
-	/// Storage: Tips Tips (r:1 w:1)
-	/// Proof Skipped: Tips Tips (max_values: None, max_size: None, mode: Measured)
-	/// The range of component `r` is `[0, 16384]`.
-	fn report_awesome(r: u32, ) -> Weight {
-		// Proof Size summary in bytes:
-		//  Measured:  `4`
-		//  Estimated: `6938`
-		// Minimum execution time: 23_689_000 picoseconds.
-		Weight::from_parts(24_837_709, 0)
-			.saturating_add(Weight::from_parts(0, 6938))
-			// Standard Error: 6
-			.saturating_add(Weight::from_parts(1_449, 0).saturating_mul(r.into()))
-			.saturating_add(T::DbWeight::get().reads(2))
-			.saturating_add(T::DbWeight::get().writes(2))
-	}
-	/// Storage: Tips Tips (r:1 w:1)
-	/// Proof Skipped: Tips Tips (max_values: None, max_size: None, mode: Measured)
-	/// Storage: Tips Reasons (r:0 w:1)
-	/// Proof Skipped: Tips Reasons (max_values: None, max_size: None, mode: Measured)
-	fn retract_tip() -> Weight {
-		// Proof Size summary in bytes:
-		//  Measured:  `221`
-		//  Estimated: `3907`
-		// Minimum execution time: 23_163_000 picoseconds.
-		Weight::from_parts(23_386_000, 0)
-			.saturating_add(Weight::from_parts(0, 3907))
-			.saturating_add(T::DbWeight::get().reads(1))
-			.saturating_add(T::DbWeight::get().writes(2))
-	}
-	/// Storage: PhragmenElection Members (r:1 w:0)
-	/// Proof Skipped: PhragmenElection Members (max_values: Some(1), max_size: None, mode: Measured)
-	/// Storage: Tips Reasons (r:1 w:1)
-	/// Proof Skipped: Tips Reasons (max_values: None, max_size: None, mode: Measured)
-	/// Storage: Tips Tips (r:0 w:1)
-	/// Proof Skipped: Tips Tips (max_values: None, max_size: None, mode: Measured)
-	/// The range of component `r` is `[0, 16384]`.
-	/// The range of component `t` is `[1, 19]`.
-	fn tip_new(r: u32, t: u32, ) -> Weight {
-		// Proof Size summary in bytes:
-		//  Measured:  `108 + t * (64 ±0)`
-		//  Estimated: `5274 + t * (192 ±0)`
-		// Minimum execution time: 18_945_000 picoseconds.
-		Weight::from_parts(17_578_665, 0)
-			.saturating_add(Weight::from_parts(0, 5274))
-			// Standard Error: 6
-			.saturating_add(Weight::from_parts(1_320, 0).saturating_mul(r.into()))
-			// Standard Error: 5_480
-			.saturating_add(Weight::from_parts(154_765, 0).saturating_mul(t.into()))
-			.saturating_add(T::DbWeight::get().reads(2))
-			.saturating_add(T::DbWeight::get().writes(2))
-			.saturating_add(Weight::from_parts(0, 192).saturating_mul(t.into()))
-	}
-	/// Storage: PhragmenElection Members (r:1 w:0)
-	/// Proof Skipped: PhragmenElection Members (max_values: Some(1), max_size: None, mode: Measured)
-	/// Storage: Tips Tips (r:1 w:1)
-	/// Proof Skipped: Tips Tips (max_values: None, max_size: None, mode: Measured)
-	/// The range of component `t` is `[1, 19]`.
-	fn tip(t: u32, ) -> Weight {
-		// Proof Size summary in bytes:
-		//  Measured:  `329 + t * (112 ±0)`
-		//  Estimated: `5608 + t * (224 ±0)`
-		// Minimum execution time: 14_212_000 picoseconds.
-		Weight::from_parts(14_717_871, 0)
-			.saturating_add(Weight::from_parts(0, 5608))
-			// Standard Error: 1_305
-			.saturating_add(Weight::from_parts(135_786, 0).saturating_mul(t.into()))
-			.saturating_add(T::DbWeight::get().reads(2))
-			.saturating_add(T::DbWeight::get().writes(1))
-			.saturating_add(Weight::from_parts(0, 224).saturating_mul(t.into()))
-	}
-	/// Storage: Tips Tips (r:1 w:1)
-	/// Proof Skipped: Tips Tips (max_values: None, max_size: None, mode: Measured)
-	/// Storage: PhragmenElection Members (r:1 w:0)
-	/// Proof Skipped: PhragmenElection Members (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: Tips Reasons (r:0 w:1)
-	/// Proof Skipped: Tips Reasons (max_values: None, max_size: None, mode: Measured)
-	/// The range of component `t` is `[1, 19]`.
-	fn close_tip(t: u32, ) -> Weight {
-		// Proof Size summary in bytes:
-		//  Measured:  `368 + t * (112 ±0)`
-		//  Estimated: `9620 + t * (336 ±0)`
-		// Minimum execution time: 41_550_000 picoseconds.
-		Weight::from_parts(43_011_989, 0)
-			.saturating_add(Weight::from_parts(0, 9620))
-			// Standard Error: 5_482
-			.saturating_add(Weight::from_parts(120_085, 0).saturating_mul(t.into()))
-			.saturating_add(T::DbWeight::get().reads(3))
-			.saturating_add(T::DbWeight::get().writes(3))
-			.saturating_add(Weight::from_parts(0, 336).saturating_mul(t.into()))
-	}
-	/// Storage: Tips Tips (r:1 w:1)
-	/// Proof Skipped: Tips Tips (max_values: None, max_size: None, mode: Measured)
-	/// Storage: Tips Reasons (r:0 w:1)
-	/// Proof Skipped: Tips Reasons (max_values: None, max_size: None, mode: Measured)
-	/// The range of component `t` is `[1, 19]`.
-	fn slash_tip(t: u32, ) -> Weight {
-		// Proof Size summary in bytes:
-		//  Measured:  `269`
-		//  Estimated: `4003`
-		// Minimum execution time: 13_897_000 picoseconds.
-		Weight::from_parts(14_435_129, 0)
-			.saturating_add(Weight::from_parts(0, 4003))
-			// Standard Error: 1_409
-			.saturating_add(Weight::from_parts(9_959, 0).saturating_mul(t.into()))
-			.saturating_add(T::DbWeight::get().reads(1))
-			.saturating_add(T::DbWeight::get().writes(2))
-	}
-}
diff --git a/polkadot/runtime/kusama/src/weights/pallet_utility.rs b/polkadot/runtime/kusama/src/weights/pallet_utility.rs
deleted file mode 100644
index d6843617fe32d7749f89307c023212696dc55dd5..0000000000000000000000000000000000000000
--- a/polkadot/runtime/kusama/src/weights/pallet_utility.rs
+++ /dev/null
@@ -1,102 +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/>.
-
-//! Autogenerated weights for `pallet_utility`
-//!
-//! THIS FILE WAS AUTO-GENERATED USING THE SUBSTRATE BENCHMARK CLI VERSION 4.0.0-dev
-//! DATE: 2023-06-19, STEPS: `50`, REPEAT: `20`, LOW RANGE: `[]`, HIGH RANGE: `[]`
-//! WORST CASE MAP SIZE: `1000000`
-//! HOSTNAME: `runner-e8ezs4ez-project-163-concurrent-0`, CPU: `Intel(R) Xeon(R) CPU @ 2.60GHz`
-//! EXECUTION: Some(Wasm), WASM-EXECUTION: Compiled, CHAIN: Some("kusama-dev"), DB CACHE: 1024
-
-// Executed Command:
-// ./target/production/polkadot
-// benchmark
-// pallet
-// --chain=kusama-dev
-// --steps=50
-// --repeat=20
-// --no-storage-info
-// --no-median-slopes
-// --no-min-squares
-// --pallet=pallet_utility
-// --extrinsic=*
-// --execution=wasm
-// --wasm-execution=compiled
-// --header=./file_header.txt
-// --output=./runtime/kusama/src/weights/
-
-#![cfg_attr(rustfmt, rustfmt_skip)]
-#![allow(unused_parens)]
-#![allow(unused_imports)]
-#![allow(missing_docs)]
-
-use frame_support::{traits::Get, weights::Weight};
-use core::marker::PhantomData;
-
-/// Weight functions for `pallet_utility`.
-pub struct WeightInfo<T>(PhantomData<T>);
-impl<T: frame_system::Config> pallet_utility::WeightInfo for WeightInfo<T> {
-	/// The range of component `c` is `[0, 1000]`.
-	fn batch(c: u32, ) -> Weight {
-		// Proof Size summary in bytes:
-		//  Measured:  `0`
-		//  Estimated: `0`
-		// Minimum execution time: 6_750_000 picoseconds.
-		Weight::from_parts(7_924_668, 0)
-			.saturating_add(Weight::from_parts(0, 0))
-			// Standard Error: 1_937
-			.saturating_add(Weight::from_parts(5_116_413, 0).saturating_mul(c.into()))
-	}
-	fn as_derivative() -> Weight {
-		// Proof Size summary in bytes:
-		//  Measured:  `0`
-		//  Estimated: `0`
-		// Minimum execution time: 4_928_000 picoseconds.
-		Weight::from_parts(5_208_000, 0)
-			.saturating_add(Weight::from_parts(0, 0))
-	}
-	/// The range of component `c` is `[0, 1000]`.
-	fn batch_all(c: u32, ) -> Weight {
-		// Proof Size summary in bytes:
-		//  Measured:  `0`
-		//  Estimated: `0`
-		// Minimum execution time: 6_747_000 picoseconds.
-		Weight::from_parts(12_311_060, 0)
-			.saturating_add(Weight::from_parts(0, 0))
-			// Standard Error: 4_311
-			.saturating_add(Weight::from_parts(5_344_485, 0).saturating_mul(c.into()))
-	}
-	fn dispatch_as() -> Weight {
-		// Proof Size summary in bytes:
-		//  Measured:  `0`
-		//  Estimated: `0`
-		// Minimum execution time: 9_012_000 picoseconds.
-		Weight::from_parts(9_239_000, 0)
-			.saturating_add(Weight::from_parts(0, 0))
-	}
-	/// The range of component `c` is `[0, 1000]`.
-	fn force_batch(c: u32, ) -> Weight {
-		// Proof Size summary in bytes:
-		//  Measured:  `0`
-		//  Estimated: `0`
-		// Minimum execution time: 6_708_000 picoseconds.
-		Weight::from_parts(10_795_859, 0)
-			.saturating_add(Weight::from_parts(0, 0))
-			// Standard Error: 2_055
-			.saturating_add(Weight::from_parts(5_143_833, 0).saturating_mul(c.into()))
-	}
-}
diff --git a/polkadot/runtime/kusama/src/weights/pallet_vesting.rs b/polkadot/runtime/kusama/src/weights/pallet_vesting.rs
deleted file mode 100644
index b33a9174bce1163ac5a990bd0502433cbd28f0ed..0000000000000000000000000000000000000000
--- a/polkadot/runtime/kusama/src/weights/pallet_vesting.rs
+++ /dev/null
@@ -1,241 +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/>.
-
-//! Autogenerated weights for `pallet_vesting`
-//!
-//! THIS FILE WAS AUTO-GENERATED USING THE SUBSTRATE BENCHMARK CLI VERSION 4.0.0-dev
-//! DATE: 2023-06-19, STEPS: `50`, REPEAT: `20`, LOW RANGE: `[]`, HIGH RANGE: `[]`
-//! WORST CASE MAP SIZE: `1000000`
-//! HOSTNAME: `runner-e8ezs4ez-project-163-concurrent-0`, CPU: `Intel(R) Xeon(R) CPU @ 2.60GHz`
-//! EXECUTION: Some(Wasm), WASM-EXECUTION: Compiled, CHAIN: Some("kusama-dev"), DB CACHE: 1024
-
-// Executed Command:
-// ./target/production/polkadot
-// benchmark
-// pallet
-// --chain=kusama-dev
-// --steps=50
-// --repeat=20
-// --no-storage-info
-// --no-median-slopes
-// --no-min-squares
-// --pallet=pallet_vesting
-// --extrinsic=*
-// --execution=wasm
-// --wasm-execution=compiled
-// --header=./file_header.txt
-// --output=./runtime/kusama/src/weights/
-
-#![cfg_attr(rustfmt, rustfmt_skip)]
-#![allow(unused_parens)]
-#![allow(unused_imports)]
-#![allow(missing_docs)]
-
-use frame_support::{traits::Get, weights::Weight};
-use core::marker::PhantomData;
-
-/// Weight functions for `pallet_vesting`.
-pub struct WeightInfo<T>(PhantomData<T>);
-impl<T: frame_system::Config> pallet_vesting::WeightInfo for WeightInfo<T> {
-	/// Storage: Vesting Vesting (r:1 w:1)
-	/// Proof: Vesting Vesting (max_values: None, max_size: Some(1057), added: 3532, mode: MaxEncodedLen)
-	/// Storage: Balances Locks (r:1 w:1)
-	/// Proof: Balances Locks (max_values: None, max_size: Some(1299), added: 3774, mode: MaxEncodedLen)
-	/// Storage: Balances Freezes (r:1 w:0)
-	/// Proof: Balances Freezes (max_values: None, max_size: Some(49), added: 2524, mode: MaxEncodedLen)
-	/// The range of component `l` is `[0, 49]`.
-	/// The range of component `s` is `[1, 28]`.
-	fn vest_locked(l: u32, s: u32, ) -> Weight {
-		// Proof Size summary in bytes:
-		//  Measured:  `314 + l * (25 ±0) + s * (36 ±0)`
-		//  Estimated: `4764`
-		// Minimum execution time: 34_784_000 picoseconds.
-		Weight::from_parts(33_272_889, 0)
-			.saturating_add(Weight::from_parts(0, 4764))
-			// Standard Error: 1_885
-			.saturating_add(Weight::from_parts(59_791, 0).saturating_mul(l.into()))
-			// Standard Error: 3_354
-			.saturating_add(Weight::from_parts(107_412, 0).saturating_mul(s.into()))
-			.saturating_add(T::DbWeight::get().reads(3))
-			.saturating_add(T::DbWeight::get().writes(2))
-	}
-	/// Storage: Vesting Vesting (r:1 w:1)
-	/// Proof: Vesting Vesting (max_values: None, max_size: Some(1057), added: 3532, mode: MaxEncodedLen)
-	/// Storage: Balances Locks (r:1 w:1)
-	/// Proof: Balances Locks (max_values: None, max_size: Some(1299), added: 3774, mode: MaxEncodedLen)
-	/// Storage: Balances Freezes (r:1 w:0)
-	/// Proof: Balances Freezes (max_values: None, max_size: Some(49), added: 2524, mode: MaxEncodedLen)
-	/// The range of component `l` is `[0, 49]`.
-	/// The range of component `s` is `[1, 28]`.
-	fn vest_unlocked(l: u32, s: u32, ) -> Weight {
-		// Proof Size summary in bytes:
-		//  Measured:  `314 + l * (25 ±0) + s * (36 ±0)`
-		//  Estimated: `4764`
-		// Minimum execution time: 38_597_000 picoseconds.
-		Weight::from_parts(38_328_545, 0)
-			.saturating_add(Weight::from_parts(0, 4764))
-			// Standard Error: 1_835
-			.saturating_add(Weight::from_parts(30_108, 0).saturating_mul(l.into()))
-			// Standard Error: 3_265
-			.saturating_add(Weight::from_parts(67_840, 0).saturating_mul(s.into()))
-			.saturating_add(T::DbWeight::get().reads(3))
-			.saturating_add(T::DbWeight::get().writes(2))
-	}
-	/// Storage: Vesting Vesting (r:1 w:1)
-	/// Proof: Vesting Vesting (max_values: None, max_size: Some(1057), added: 3532, mode: MaxEncodedLen)
-	/// Storage: Balances Locks (r:1 w:1)
-	/// Proof: Balances Locks (max_values: None, max_size: Some(1299), added: 3774, mode: MaxEncodedLen)
-	/// Storage: Balances Freezes (r:1 w:0)
-	/// Proof: Balances Freezes (max_values: None, max_size: Some(49), added: 2524, mode: MaxEncodedLen)
-	/// Storage: System Account (r:1 w:1)
-	/// Proof: System Account (max_values: None, max_size: Some(128), added: 2603, mode: MaxEncodedLen)
-	/// The range of component `l` is `[0, 49]`.
-	/// The range of component `s` is `[1, 28]`.
-	fn vest_other_locked(l: u32, s: u32, ) -> Weight {
-		// Proof Size summary in bytes:
-		//  Measured:  `417 + l * (25 ±0) + s * (36 ±0)`
-		//  Estimated: `4764`
-		// Minimum execution time: 36_505_000 picoseconds.
-		Weight::from_parts(35_149_105, 0)
-			.saturating_add(Weight::from_parts(0, 4764))
-			// Standard Error: 1_328
-			.saturating_add(Weight::from_parts(59_063, 0).saturating_mul(l.into()))
-			// Standard Error: 2_363
-			.saturating_add(Weight::from_parts(102_227, 0).saturating_mul(s.into()))
-			.saturating_add(T::DbWeight::get().reads(4))
-			.saturating_add(T::DbWeight::get().writes(3))
-	}
-	/// Storage: Vesting Vesting (r:1 w:1)
-	/// Proof: Vesting Vesting (max_values: None, max_size: Some(1057), added: 3532, mode: MaxEncodedLen)
-	/// Storage: Balances Locks (r:1 w:1)
-	/// Proof: Balances Locks (max_values: None, max_size: Some(1299), added: 3774, mode: MaxEncodedLen)
-	/// Storage: Balances Freezes (r:1 w:0)
-	/// Proof: Balances Freezes (max_values: None, max_size: Some(49), added: 2524, mode: MaxEncodedLen)
-	/// Storage: System Account (r:1 w:1)
-	/// Proof: System Account (max_values: None, max_size: Some(128), added: 2603, mode: MaxEncodedLen)
-	/// The range of component `l` is `[0, 49]`.
-	/// The range of component `s` is `[1, 28]`.
-	fn vest_other_unlocked(l: u32, s: u32, ) -> Weight {
-		// Proof Size summary in bytes:
-		//  Measured:  `417 + l * (25 ±0) + s * (36 ±0)`
-		//  Estimated: `4764`
-		// Minimum execution time: 39_946_000 picoseconds.
-		Weight::from_parts(40_375_572, 0)
-			.saturating_add(Weight::from_parts(0, 4764))
-			// Standard Error: 1_657
-			.saturating_add(Weight::from_parts(36_203, 0).saturating_mul(l.into()))
-			// Standard Error: 2_948
-			.saturating_add(Weight::from_parts(54_092, 0).saturating_mul(s.into()))
-			.saturating_add(T::DbWeight::get().reads(4))
-			.saturating_add(T::DbWeight::get().writes(3))
-	}
-	/// Storage: Vesting Vesting (r:1 w:1)
-	/// Proof: Vesting Vesting (max_values: None, max_size: Some(1057), added: 3532, mode: MaxEncodedLen)
-	/// Storage: System Account (r:1 w:1)
-	/// Proof: System Account (max_values: None, max_size: Some(128), added: 2603, mode: MaxEncodedLen)
-	/// Storage: Balances Locks (r:1 w:1)
-	/// Proof: Balances Locks (max_values: None, max_size: Some(1299), added: 3774, mode: MaxEncodedLen)
-	/// Storage: Balances Freezes (r:1 w:0)
-	/// Proof: Balances Freezes (max_values: None, max_size: Some(49), added: 2524, mode: MaxEncodedLen)
-	/// The range of component `l` is `[0, 49]`.
-	/// The range of component `s` is `[0, 27]`.
-	fn vested_transfer(l: u32, s: u32, ) -> Weight {
-		// Proof Size summary in bytes:
-		//  Measured:  `488 + l * (25 ±0) + s * (36 ±0)`
-		//  Estimated: `4764`
-		// Minimum execution time: 73_800_000 picoseconds.
-		Weight::from_parts(76_190_149, 0)
-			.saturating_add(Weight::from_parts(0, 4764))
-			// Standard Error: 3_306
-			.saturating_add(Weight::from_parts(62_177, 0).saturating_mul(l.into()))
-			// Standard Error: 5_882
-			.saturating_add(Weight::from_parts(142_130, 0).saturating_mul(s.into()))
-			.saturating_add(T::DbWeight::get().reads(4))
-			.saturating_add(T::DbWeight::get().writes(3))
-	}
-	/// Storage: Vesting Vesting (r:1 w:1)
-	/// Proof: Vesting Vesting (max_values: None, max_size: Some(1057), added: 3532, mode: MaxEncodedLen)
-	/// Storage: System Account (r:2 w:2)
-	/// Proof: System Account (max_values: None, max_size: Some(128), added: 2603, mode: MaxEncodedLen)
-	/// Storage: Balances Locks (r:1 w:1)
-	/// Proof: Balances Locks (max_values: None, max_size: Some(1299), added: 3774, mode: MaxEncodedLen)
-	/// Storage: Balances Freezes (r:1 w:0)
-	/// Proof: Balances Freezes (max_values: None, max_size: Some(49), added: 2524, mode: MaxEncodedLen)
-	/// The range of component `l` is `[0, 49]`.
-	/// The range of component `s` is `[0, 27]`.
-	fn force_vested_transfer(l: u32, s: u32, ) -> Weight {
-		// Proof Size summary in bytes:
-		//  Measured:  `591 + l * (25 ±0) + s * (36 ±0)`
-		//  Estimated: `6196`
-		// Minimum execution time: 74_744_000 picoseconds.
-		Weight::from_parts(77_992_773, 0)
-			.saturating_add(Weight::from_parts(0, 6196))
-			// Standard Error: 3_321
-			.saturating_add(Weight::from_parts(66_392, 0).saturating_mul(l.into()))
-			// Standard Error: 5_910
-			.saturating_add(Weight::from_parts(142_911, 0).saturating_mul(s.into()))
-			.saturating_add(T::DbWeight::get().reads(5))
-			.saturating_add(T::DbWeight::get().writes(4))
-	}
-	/// Storage: Vesting Vesting (r:1 w:1)
-	/// Proof: Vesting Vesting (max_values: None, max_size: Some(1057), added: 3532, mode: MaxEncodedLen)
-	/// Storage: Balances Locks (r:1 w:1)
-	/// Proof: Balances Locks (max_values: None, max_size: Some(1299), added: 3774, mode: MaxEncodedLen)
-	/// Storage: Balances Freezes (r:1 w:0)
-	/// Proof: Balances Freezes (max_values: None, max_size: Some(49), added: 2524, mode: MaxEncodedLen)
-	/// Storage: System Account (r:1 w:1)
-	/// Proof: System Account (max_values: None, max_size: Some(128), added: 2603, mode: MaxEncodedLen)
-	/// The range of component `l` is `[0, 49]`.
-	/// The range of component `s` is `[2, 28]`.
-	fn not_unlocking_merge_schedules(l: u32, s: u32, ) -> Weight {
-		// Proof Size summary in bytes:
-		//  Measured:  `415 + l * (25 ±0) + s * (36 ±0)`
-		//  Estimated: `4764`
-		// Minimum execution time: 37_626_000 picoseconds.
-		Weight::from_parts(36_213_370, 0)
-			.saturating_add(Weight::from_parts(0, 4764))
-			// Standard Error: 2_056
-			.saturating_add(Weight::from_parts(56_586, 0).saturating_mul(l.into()))
-			// Standard Error: 3_798
-			.saturating_add(Weight::from_parts(111_413, 0).saturating_mul(s.into()))
-			.saturating_add(T::DbWeight::get().reads(4))
-			.saturating_add(T::DbWeight::get().writes(3))
-	}
-	/// Storage: Vesting Vesting (r:1 w:1)
-	/// Proof: Vesting Vesting (max_values: None, max_size: Some(1057), added: 3532, mode: MaxEncodedLen)
-	/// Storage: Balances Locks (r:1 w:1)
-	/// Proof: Balances Locks (max_values: None, max_size: Some(1299), added: 3774, mode: MaxEncodedLen)
-	/// Storage: Balances Freezes (r:1 w:0)
-	/// Proof: Balances Freezes (max_values: None, max_size: Some(49), added: 2524, mode: MaxEncodedLen)
-	/// Storage: System Account (r:1 w:1)
-	/// Proof: System Account (max_values: None, max_size: Some(128), added: 2603, mode: MaxEncodedLen)
-	/// The range of component `l` is `[0, 49]`.
-	/// The range of component `s` is `[2, 28]`.
-	fn unlocking_merge_schedules(l: u32, s: u32, ) -> Weight {
-		// Proof Size summary in bytes:
-		//  Measured:  `415 + l * (25 ±0) + s * (36 ±0)`
-		//  Estimated: `4764`
-		// Minimum execution time: 41_647_000 picoseconds.
-		Weight::from_parts(40_350_649, 0)
-			.saturating_add(Weight::from_parts(0, 4764))
-			// Standard Error: 1_906
-			.saturating_add(Weight::from_parts(59_779, 0).saturating_mul(l.into()))
-			// Standard Error: 3_521
-			.saturating_add(Weight::from_parts(111_787, 0).saturating_mul(s.into()))
-			.saturating_add(T::DbWeight::get().reads(4))
-			.saturating_add(T::DbWeight::get().writes(3))
-	}
-}
diff --git a/polkadot/runtime/kusama/src/weights/pallet_xcm.rs b/polkadot/runtime/kusama/src/weights/pallet_xcm.rs
deleted file mode 100644
index 4b1a790a57a146641fd172b71d5248de500e108a..0000000000000000000000000000000000000000
--- a/polkadot/runtime/kusama/src/weights/pallet_xcm.rs
+++ /dev/null
@@ -1,282 +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/>.
-
-//! Autogenerated weights for `pallet_xcm`
-//!
-//! THIS FILE WAS AUTO-GENERATED USING THE SUBSTRATE BENCHMARK CLI VERSION 4.0.0-dev
-//! DATE: 2023-06-19, STEPS: `50`, REPEAT: `20`, LOW RANGE: `[]`, HIGH RANGE: `[]`
-//! WORST CASE MAP SIZE: `1000000`
-//! HOSTNAME: `runner-e8ezs4ez-project-163-concurrent-0`, CPU: `Intel(R) Xeon(R) CPU @ 2.60GHz`
-//! EXECUTION: Some(Wasm), WASM-EXECUTION: Compiled, CHAIN: Some("kusama-dev"), DB CACHE: 1024
-
-// Executed Command:
-// target/production/polkadot
-// benchmark
-// pallet
-// --steps=50
-// --repeat=20
-// --no-storage-info
-// --no-median-slopes
-// --no-min-squares
-// --pallet=pallet_xcm
-// --extrinsic=*
-// --execution=wasm
-// --wasm-execution=compiled
-// --heap-pages=4096
-// --json-file=/var/lib/gitlab-runner/builds/zyw4fam_/0/parity/mirrors/polkadot/.git/.artifacts/bench.json
-// --pallet=pallet_xcm
-// --chain=kusama-dev
-// --header=./file_header.txt
-// --output=./runtime/kusama/src/weights/
-
-#![cfg_attr(rustfmt, rustfmt_skip)]
-#![allow(unused_parens)]
-#![allow(unused_imports)]
-#![allow(missing_docs)]
-
-use frame_support::{traits::Get, weights::Weight};
-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: unknown `0x3a696e747261626c6f636b5f656e74726f7079` (r:1 w:1)
-	/// Proof Skipped: unknown `0x3a696e747261626c6f636b5f656e74726f7079` (r:1 w:1)
-	/// Storage: Dmp DeliveryFeeFactor (r:1 w:0)
-	/// Proof Skipped: Dmp DeliveryFeeFactor (max_values: None, max_size: None, mode: Measured)
-	/// Storage: XcmPallet SupportedVersion (r:1 w:0)
-	/// Proof Skipped: XcmPallet SupportedVersion (max_values: None, max_size: None, mode: Measured)
-	/// Storage: Dmp DownwardMessageQueues (r:1 w:1)
-	/// Proof Skipped: Dmp DownwardMessageQueues (max_values: None, max_size: None, mode: Measured)
-	/// Storage: Dmp DownwardMessageQueueHeads (r:1 w:1)
-	/// Proof Skipped: Dmp DownwardMessageQueueHeads (max_values: None, max_size: None, mode: Measured)
-	fn send() -> Weight {
-		// Proof Size summary in bytes:
-		//  Measured:  `211`
-		//  Estimated: `3676`
-		// Minimum execution time: 36_359_000 picoseconds.
-		Weight::from_parts(37_262_000, 0)
-			.saturating_add(Weight::from_parts(0, 3676))
-			.saturating_add(T::DbWeight::get().reads(7))
-			.saturating_add(T::DbWeight::get().writes(4))
-	}
-	fn teleport_assets() -> Weight {
-		// Proof Size summary in bytes:
-		//  Measured:  `0`
-		//  Estimated: `0`
-		// Minimum execution time: 22_115_000 picoseconds.
-		Weight::from_parts(22_381_000, 0)
-			.saturating_add(Weight::from_parts(0, 0))
-	}
-	fn reserve_transfer_assets() -> Weight {
-		// Proof Size summary in bytes:
-		//  Measured:  `0`
-		//  Estimated: `0`
-		// Minimum execution time: 21_978_000 picoseconds.
-		Weight::from_parts(22_407_000, 0)
-			.saturating_add(Weight::from_parts(0, 0))
-	}
-	fn execute() -> Weight {
-		// Proof Size summary in bytes:
-		//  Measured:  `0`
-		//  Estimated: `0`
-		// Minimum execution time: 9_620_000 picoseconds.
-		Weight::from_parts(10_061_000, 0)
-			.saturating_add(Weight::from_parts(0, 0))
-	}
-	/// Storage: XcmPallet SupportedVersion (r:0 w:1)
-	/// Proof Skipped: XcmPallet SupportedVersion (max_values: None, max_size: None, mode: Measured)
-	fn force_xcm_version() -> Weight {
-		// Proof Size summary in bytes:
-		//  Measured:  `0`
-		//  Estimated: `0`
-		// Minimum execution time: 9_884_000 picoseconds.
-		Weight::from_parts(10_207_000, 0)
-			.saturating_add(Weight::from_parts(0, 0))
-			.saturating_add(T::DbWeight::get().writes(1))
-	}
-	fn force_default_xcm_version() -> Weight {
-		// Proof Size summary in bytes:
-		//  Measured:  `0`
-		//  Estimated: `0`
-		// Minimum execution time: 2_939_000 picoseconds.
-		Weight::from_parts(3_022_000, 0)
-			.saturating_add(Weight::from_parts(0, 0))
-	}
-	/// Storage: XcmPallet VersionNotifiers (r:1 w:1)
-	/// Proof Skipped: XcmPallet VersionNotifiers (max_values: None, max_size: None, mode: Measured)
-	/// Storage: XcmPallet QueryCounter (r:1 w:1)
-	/// Proof Skipped: XcmPallet QueryCounter (max_values: Some(1), max_size: None, mode: Measured)
-	/// Storage: unknown `0x3a696e747261626c6f636b5f656e74726f7079` (r:1 w:1)
-	/// Proof Skipped: unknown `0x3a696e747261626c6f636b5f656e74726f7079` (r:1 w:1)
-	/// Storage: Dmp DeliveryFeeFactor (r:1 w:0)
-	/// Proof Skipped: Dmp DeliveryFeeFactor (max_values: None, max_size: None, mode: Measured)
-	/// Storage: XcmPallet SupportedVersion (r:1 w:0)
-	/// Proof Skipped: XcmPallet SupportedVersion (max_values: None, max_size: None, mode: Measured)
-	/// Storage: Dmp DownwardMessageQueues (r:1 w:1)
-	/// Proof Skipped: Dmp DownwardMessageQueues (max_values: None, max_size: None, mode: Measured)
-	/// Storage: Dmp DownwardMessageQueueHeads (r:1 w:1)
-	/// Proof Skipped: Dmp DownwardMessageQueueHeads (max_values: None, max_size: None, mode: Measured)
-	/// Storage: XcmPallet Queries (r:0 w:1)
-	/// Proof Skipped: XcmPallet Queries (max_values: None, max_size: None, mode: Measured)
-	fn force_subscribe_version_notify() -> Weight {
-		// Proof Size summary in bytes:
-		//  Measured:  `211`
-		//  Estimated: `3676`
-		// Minimum execution time: 40_948_000 picoseconds.
-		Weight::from_parts(41_577_000, 0)
-			.saturating_add(Weight::from_parts(0, 3676))
-			.saturating_add(T::DbWeight::get().reads(9))
-			.saturating_add(T::DbWeight::get().writes(7))
-	}
-	/// Storage: XcmPallet VersionNotifiers (r:1 w:1)
-	/// Proof Skipped: XcmPallet VersionNotifiers (max_values: None, max_size: None, mode: Measured)
-	/// Storage: unknown `0x3a696e747261626c6f636b5f656e74726f7079` (r:1 w:1)
-	/// Proof Skipped: unknown `0x3a696e747261626c6f636b5f656e74726f7079` (r:1 w:1)
-	/// Storage: Dmp DeliveryFeeFactor (r:1 w:0)
-	/// Proof Skipped: Dmp DeliveryFeeFactor (max_values: None, max_size: None, mode: Measured)
-	/// Storage: XcmPallet SupportedVersion (r:1 w:0)
-	/// Proof Skipped: XcmPallet SupportedVersion (max_values: None, max_size: None, mode: Measured)
-	/// Storage: Dmp DownwardMessageQueues (r:1 w:1)
-	/// Proof Skipped: Dmp DownwardMessageQueues (max_values: None, max_size: None, mode: Measured)
-	/// Storage: Dmp DownwardMessageQueueHeads (r:1 w:1)
-	/// Proof Skipped: Dmp DownwardMessageQueueHeads (max_values: None, max_size: None, mode: Measured)
-	/// Storage: XcmPallet Queries (r:0 w:1)
-	/// Proof Skipped: XcmPallet Queries (max_values: None, max_size: None, mode: Measured)
-	fn force_unsubscribe_version_notify() -> Weight {
-		// Proof Size summary in bytes:
-		//  Measured:  `538`
-		//  Estimated: `4003`
-		// Minimum execution time: 45_857_000 picoseconds.
-		Weight::from_parts(47_289_000, 0)
-			.saturating_add(Weight::from_parts(0, 4003))
-			.saturating_add(T::DbWeight::get().reads(8))
-			.saturating_add(T::DbWeight::get().writes(6))
-	}
-	/// Storage: XcmPallet XcmExecutionSuspended (r:0 w:1)
-	/// Proof Skipped: XcmPallet XcmExecutionSuspended (max_values: Some(1), max_size: None, mode: Measured)
-	fn force_suspension() -> Weight {
-		// Proof Size summary in bytes:
-		//  Measured:  `0`
-		//  Estimated: `0`
-		// Minimum execution time: 2_837_000 picoseconds.
-		Weight::from_parts(3_065_000, 0)
-			.saturating_add(Weight::from_parts(0, 0))
-			.saturating_add(T::DbWeight::get().writes(1))
-	}
-	/// Storage: XcmPallet SupportedVersion (r:4 w:2)
-	/// Proof Skipped: XcmPallet SupportedVersion (max_values: None, max_size: None, mode: Measured)
-	fn migrate_supported_version() -> Weight {
-		// Proof Size summary in bytes:
-		//  Measured:  `229`
-		//  Estimated: `11119`
-		// Minimum execution time: 17_125_000 picoseconds.
-		Weight::from_parts(17_582_000, 0)
-			.saturating_add(Weight::from_parts(0, 11119))
-			.saturating_add(T::DbWeight::get().reads(4))
-			.saturating_add(T::DbWeight::get().writes(2))
-	}
-	/// Storage: XcmPallet VersionNotifiers (r:4 w:2)
-	/// Proof Skipped: XcmPallet VersionNotifiers (max_values: None, max_size: None, mode: Measured)
-	fn migrate_version_notifiers() -> Weight {
-		// Proof Size summary in bytes:
-		//  Measured:  `233`
-		//  Estimated: `11123`
-		// Minimum execution time: 16_834_000 picoseconds.
-		Weight::from_parts(17_412_000, 0)
-			.saturating_add(Weight::from_parts(0, 11123))
-			.saturating_add(T::DbWeight::get().reads(4))
-			.saturating_add(T::DbWeight::get().writes(2))
-	}
-	/// Storage: XcmPallet VersionNotifyTargets (r:5 w:0)
-	/// Proof Skipped: XcmPallet VersionNotifyTargets (max_values: None, max_size: None, mode: Measured)
-	fn already_notified_target() -> Weight {
-		// Proof Size summary in bytes:
-		//  Measured:  `243`
-		//  Estimated: `13608`
-		// Minimum execution time: 18_784_000 picoseconds.
-		Weight::from_parts(19_184_000, 0)
-			.saturating_add(Weight::from_parts(0, 13608))
-			.saturating_add(T::DbWeight::get().reads(5))
-	}
-	/// Storage: XcmPallet VersionNotifyTargets (r:2 w:1)
-	/// Proof Skipped: XcmPallet VersionNotifyTargets (max_values: None, max_size: None, mode: Measured)
-	/// Storage: unknown `0x3a696e747261626c6f636b5f656e74726f7079` (r:1 w:1)
-	/// Proof Skipped: unknown `0x3a696e747261626c6f636b5f656e74726f7079` (r:1 w:1)
-	/// Storage: Dmp DeliveryFeeFactor (r:1 w:0)
-	/// Proof Skipped: Dmp DeliveryFeeFactor (max_values: None, max_size: None, mode: Measured)
-	/// Storage: XcmPallet SupportedVersion (r:1 w:0)
-	/// Proof Skipped: XcmPallet SupportedVersion (max_values: None, max_size: None, mode: Measured)
-	/// Storage: Dmp DownwardMessageQueues (r:1 w:1)
-	/// Proof Skipped: Dmp DownwardMessageQueues (max_values: None, max_size: None, mode: Measured)
-	/// Storage: Dmp DownwardMessageQueueHeads (r:1 w:1)
-	/// Proof Skipped: Dmp DownwardMessageQueueHeads (max_values: None, max_size: None, mode: Measured)
-	fn notify_current_targets() -> Weight {
-		// Proof Size summary in bytes:
-		//  Measured:  `281`
-		//  Estimated: `6221`
-		// Minimum execution time: 38_232_000 picoseconds.
-		Weight::from_parts(39_125_000, 0)
-			.saturating_add(Weight::from_parts(0, 6221))
-			.saturating_add(T::DbWeight::get().reads(9))
-			.saturating_add(T::DbWeight::get().writes(5))
-	}
-	/// Storage: XcmPallet VersionNotifyTargets (r:3 w:0)
-	/// Proof Skipped: XcmPallet VersionNotifyTargets (max_values: None, max_size: None, mode: Measured)
-	fn notify_target_migration_fail() -> Weight {
-		// Proof Size summary in bytes:
-		//  Measured:  `272`
-		//  Estimated: `8687`
-		// Minimum execution time: 9_661_000 picoseconds.
-		Weight::from_parts(10_094_000, 0)
-			.saturating_add(Weight::from_parts(0, 8687))
-			.saturating_add(T::DbWeight::get().reads(3))
-	}
-	/// Storage: XcmPallet VersionNotifyTargets (r:4 w:2)
-	/// Proof Skipped: XcmPallet VersionNotifyTargets (max_values: None, max_size: None, mode: Measured)
-	fn migrate_version_notify_targets() -> Weight {
-		// Proof Size summary in bytes:
-		//  Measured:  `240`
-		//  Estimated: `11130`
-		// Minimum execution time: 17_593_000 picoseconds.
-		Weight::from_parts(18_158_000, 0)
-			.saturating_add(Weight::from_parts(0, 11130))
-			.saturating_add(T::DbWeight::get().reads(4))
-			.saturating_add(T::DbWeight::get().writes(2))
-	}
-	/// Storage: XcmPallet VersionNotifyTargets (r:4 w:2)
-	/// Proof Skipped: XcmPallet VersionNotifyTargets (max_values: None, max_size: None, mode: Measured)
-	/// Storage: unknown `0x3a696e747261626c6f636b5f656e74726f7079` (r:1 w:1)
-	/// Proof Skipped: unknown `0x3a696e747261626c6f636b5f656e74726f7079` (r:1 w:1)
-	/// Storage: Dmp DeliveryFeeFactor (r:1 w:0)
-	/// Proof Skipped: Dmp DeliveryFeeFactor (max_values: None, max_size: None, mode: Measured)
-	/// Storage: XcmPallet SupportedVersion (r:1 w:0)
-	/// Proof Skipped: XcmPallet SupportedVersion (max_values: None, max_size: None, mode: Measured)
-	/// Storage: Dmp DownwardMessageQueues (r:1 w:1)
-	/// Proof Skipped: Dmp DownwardMessageQueues (max_values: None, max_size: None, mode: Measured)
-	/// Storage: Dmp DownwardMessageQueueHeads (r:1 w:1)
-	/// Proof Skipped: Dmp DownwardMessageQueueHeads (max_values: None, max_size: None, mode: Measured)
-	fn migrate_and_notify_old_targets() -> Weight {
-		// Proof Size summary in bytes:
-		//  Measured:  `285`
-		//  Estimated: `11175`
-		// Minimum execution time: 45_525_000 picoseconds.
-		Weight::from_parts(46_583_000, 0)
-			.saturating_add(Weight::from_parts(0, 11175))
-			.saturating_add(T::DbWeight::get().reads(11))
-			.saturating_add(T::DbWeight::get().writes(6))
-	}
-}
diff --git a/polkadot/runtime/kusama/src/weights/runtime_common_auctions.rs b/polkadot/runtime/kusama/src/weights/runtime_common_auctions.rs
deleted file mode 100644
index 2370f98f07037c03634ae549b5120ba64a50c8f7..0000000000000000000000000000000000000000
--- a/polkadot/runtime/kusama/src/weights/runtime_common_auctions.rs
+++ /dev/null
@@ -1,143 +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/>.
-
-//! Autogenerated weights for `runtime_common::auctions`
-//!
-//! THIS FILE WAS AUTO-GENERATED USING THE SUBSTRATE BENCHMARK CLI VERSION 4.0.0-dev
-//! DATE: 2023-06-19, STEPS: `50`, REPEAT: `20`, LOW RANGE: `[]`, HIGH RANGE: `[]`
-//! WORST CASE MAP SIZE: `1000000`
-//! HOSTNAME: `runner-e8ezs4ez-project-163-concurrent-0`, CPU: `Intel(R) Xeon(R) CPU @ 2.60GHz`
-//! EXECUTION: Some(Wasm), WASM-EXECUTION: Compiled, CHAIN: Some("kusama-dev"), DB CACHE: 1024
-
-// Executed Command:
-// ./target/production/polkadot
-// benchmark
-// pallet
-// --chain=kusama-dev
-// --steps=50
-// --repeat=20
-// --no-storage-info
-// --no-median-slopes
-// --no-min-squares
-// --pallet=runtime_common::auctions
-// --extrinsic=*
-// --execution=wasm
-// --wasm-execution=compiled
-// --header=./file_header.txt
-// --output=./runtime/kusama/src/weights/runtime_common_auctions.rs
-
-#![cfg_attr(rustfmt, rustfmt_skip)]
-#![allow(unused_parens)]
-#![allow(unused_imports)]
-#![allow(missing_docs)]
-
-use frame_support::{traits::Get, weights::Weight};
-use core::marker::PhantomData;
-
-/// Weight functions for `runtime_common::auctions`.
-pub struct WeightInfo<T>(PhantomData<T>);
-impl<T: frame_system::Config> runtime_common::auctions::WeightInfo for WeightInfo<T> {
-	/// Storage: Auctions AuctionInfo (r:1 w:1)
-	/// Proof: Auctions AuctionInfo (max_values: Some(1), max_size: Some(8), added: 503, mode: MaxEncodedLen)
-	/// Storage: Auctions AuctionCounter (r:1 w:1)
-	/// Proof: Auctions AuctionCounter (max_values: Some(1), max_size: Some(4), added: 499, mode: MaxEncodedLen)
-	fn new_auction() -> Weight {
-		// Proof Size summary in bytes:
-		//  Measured:  `4`
-		//  Estimated: `1493`
-		// Minimum execution time: 12_713_000 picoseconds.
-		Weight::from_parts(13_211_000, 0)
-			.saturating_add(Weight::from_parts(0, 1493))
-			.saturating_add(T::DbWeight::get().reads(2))
-			.saturating_add(T::DbWeight::get().writes(2))
-	}
-	/// Storage: Paras ParaLifecycles (r:1 w:0)
-	/// Proof Skipped: Paras ParaLifecycles (max_values: None, max_size: None, mode: Measured)
-	/// Storage: Auctions AuctionCounter (r:1 w:0)
-	/// Proof: Auctions AuctionCounter (max_values: Some(1), max_size: Some(4), added: 499, mode: MaxEncodedLen)
-	/// Storage: Auctions AuctionInfo (r:1 w:0)
-	/// Proof: Auctions AuctionInfo (max_values: Some(1), max_size: Some(8), added: 503, mode: MaxEncodedLen)
-	/// Storage: Slots Leases (r:1 w:0)
-	/// Proof Skipped: Slots Leases (max_values: None, max_size: None, mode: Measured)
-	/// Storage: Auctions Winning (r:1 w:1)
-	/// Proof: Auctions Winning (max_values: None, max_size: Some(1920), added: 4395, mode: MaxEncodedLen)
-	/// Storage: Auctions ReservedAmounts (r:2 w:2)
-	/// Proof: Auctions ReservedAmounts (max_values: None, max_size: Some(60), added: 2535, mode: MaxEncodedLen)
-	/// Storage: System Account (r:1 w:1)
-	/// Proof: System Account (max_values: None, max_size: Some(128), added: 2603, mode: MaxEncodedLen)
-	fn bid() -> Weight {
-		// Proof Size summary in bytes:
-		//  Measured:  `661`
-		//  Estimated: `6060`
-		// Minimum execution time: 98_648_000 picoseconds.
-		Weight::from_parts(106_823_000, 0)
-			.saturating_add(Weight::from_parts(0, 6060))
-			.saturating_add(T::DbWeight::get().reads(8))
-			.saturating_add(T::DbWeight::get().writes(4))
-	}
-	/// Storage: Auctions AuctionInfo (r:1 w:1)
-	/// Proof: Auctions AuctionInfo (max_values: Some(1), max_size: Some(8), added: 503, mode: MaxEncodedLen)
-	/// Storage: Babe NextRandomness (r:1 w:0)
-	/// Proof: Babe NextRandomness (max_values: Some(1), max_size: Some(32), added: 527, mode: MaxEncodedLen)
-	/// Storage: Babe EpochStart (r:1 w:0)
-	/// Proof: Babe EpochStart (max_values: Some(1), max_size: Some(8), added: 503, mode: MaxEncodedLen)
-	/// Storage: Auctions AuctionCounter (r:1 w:0)
-	/// Proof: Auctions AuctionCounter (max_values: Some(1), max_size: Some(4), added: 499, mode: MaxEncodedLen)
-	/// Storage: Auctions Winning (r:3600 w:3600)
-	/// Proof: Auctions Winning (max_values: None, max_size: Some(1920), added: 4395, mode: MaxEncodedLen)
-	/// Storage: Auctions ReservedAmounts (r:37 w:36)
-	/// Proof: Auctions ReservedAmounts (max_values: None, max_size: Some(60), added: 2535, mode: MaxEncodedLen)
-	/// Storage: System Account (r:36 w:36)
-	/// Proof: System Account (max_values: None, max_size: Some(128), added: 2603, mode: MaxEncodedLen)
-	/// Storage: Slots Leases (r:7 w:7)
-	/// Proof Skipped: Slots Leases (max_values: None, max_size: None, mode: Measured)
-	/// Storage: Paras ParaLifecycles (r:1 w:1)
-	/// Proof Skipped: Paras ParaLifecycles (max_values: None, max_size: None, mode: Measured)
-	/// Storage: ParasShared CurrentSessionIndex (r:1 w:0)
-	/// Proof Skipped: ParasShared CurrentSessionIndex (max_values: Some(1), max_size: None, mode: Measured)
-	/// Storage: Paras ActionsQueue (r:1 w:1)
-	/// Proof Skipped: Paras ActionsQueue (max_values: None, max_size: None, mode: Measured)
-	/// Storage: Registrar Paras (r:1 w:1)
-	/// Proof Skipped: Registrar Paras (max_values: None, max_size: None, mode: Measured)
-	fn on_initialize() -> Weight {
-		// Proof Size summary in bytes:
-		//  Measured:  `6947699`
-		//  Estimated: `15822990`
-		// Minimum execution time: 7_936_854_000 picoseconds.
-		Weight::from_parts(8_091_086_000, 0)
-			.saturating_add(Weight::from_parts(0, 15822990))
-			.saturating_add(T::DbWeight::get().reads(3688))
-			.saturating_add(T::DbWeight::get().writes(3683))
-	}
-	/// Storage: Auctions ReservedAmounts (r:37 w:36)
-	/// Proof: Auctions ReservedAmounts (max_values: None, max_size: Some(60), added: 2535, mode: MaxEncodedLen)
-	/// Storage: System Account (r:36 w:36)
-	/// Proof: System Account (max_values: None, max_size: Some(128), added: 2603, mode: MaxEncodedLen)
-	/// Storage: Auctions Winning (r:3600 w:3600)
-	/// Proof: Auctions Winning (max_values: None, max_size: Some(1920), added: 4395, mode: MaxEncodedLen)
-	/// Storage: Auctions AuctionInfo (r:0 w:1)
-	/// Proof: Auctions AuctionInfo (max_values: Some(1), max_size: Some(8), added: 503, mode: MaxEncodedLen)
-	fn cancel_auction() -> Weight {
-		// Proof Size summary in bytes:
-		//  Measured:  `177732`
-		//  Estimated: `15822990`
-		// Minimum execution time: 6_127_393_000 picoseconds.
-		Weight::from_parts(6_302_044_000, 0)
-			.saturating_add(Weight::from_parts(0, 15822990))
-			.saturating_add(T::DbWeight::get().reads(3673))
-			.saturating_add(T::DbWeight::get().writes(3673))
-	}
-}
diff --git a/polkadot/runtime/kusama/src/weights/runtime_common_claims.rs b/polkadot/runtime/kusama/src/weights/runtime_common_claims.rs
deleted file mode 100644
index ecf29f0cdc1858fe21ed07c28cc1f81d607cf039..0000000000000000000000000000000000000000
--- a/polkadot/runtime/kusama/src/weights/runtime_common_claims.rs
+++ /dev/null
@@ -1,169 +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/>.
-
-//! Autogenerated weights for `runtime_common::claims`
-//!
-//! THIS FILE WAS AUTO-GENERATED USING THE SUBSTRATE BENCHMARK CLI VERSION 4.0.0-dev
-//! DATE: 2023-06-19, STEPS: `50`, REPEAT: `20`, LOW RANGE: `[]`, HIGH RANGE: `[]`
-//! WORST CASE MAP SIZE: `1000000`
-//! HOSTNAME: `runner-e8ezs4ez-project-163-concurrent-0`, CPU: `Intel(R) Xeon(R) CPU @ 2.60GHz`
-//! EXECUTION: Some(Wasm), WASM-EXECUTION: Compiled, CHAIN: Some("kusama-dev"), DB CACHE: 1024
-
-// Executed Command:
-// ./target/production/polkadot
-// benchmark
-// pallet
-// --chain=kusama-dev
-// --steps=50
-// --repeat=20
-// --no-storage-info
-// --no-median-slopes
-// --no-min-squares
-// --pallet=runtime_common::claims
-// --extrinsic=*
-// --execution=wasm
-// --wasm-execution=compiled
-// --header=./file_header.txt
-// --output=./runtime/kusama/src/weights/runtime_common_claims.rs
-
-#![cfg_attr(rustfmt, rustfmt_skip)]
-#![allow(unused_parens)]
-#![allow(unused_imports)]
-#![allow(missing_docs)]
-
-use frame_support::{traits::Get, weights::Weight};
-use core::marker::PhantomData;
-
-/// Weight functions for `runtime_common::claims`.
-pub struct WeightInfo<T>(PhantomData<T>);
-impl<T: frame_system::Config> runtime_common::claims::WeightInfo for WeightInfo<T> {
-	/// Storage: Claims Claims (r:1 w:1)
-	/// Proof Skipped: Claims Claims (max_values: None, max_size: None, mode: Measured)
-	/// Storage: Claims Signing (r:1 w:1)
-	/// Proof Skipped: Claims Signing (max_values: None, max_size: None, mode: Measured)
-	/// Storage: Claims Total (r:1 w:1)
-	/// Proof Skipped: Claims Total (max_values: Some(1), max_size: None, mode: Measured)
-	/// Storage: Claims Vesting (r:1 w:1)
-	/// Proof Skipped: Claims Vesting (max_values: None, max_size: None, mode: Measured)
-	/// Storage: Vesting Vesting (r:1 w:1)
-	/// Proof: Vesting Vesting (max_values: None, max_size: Some(1057), added: 3532, mode: MaxEncodedLen)
-	/// Storage: System Account (r:1 w:0)
-	/// Proof: System Account (max_values: None, max_size: Some(128), added: 2603, mode: MaxEncodedLen)
-	/// Storage: Balances Locks (r:1 w:1)
-	/// Proof: Balances Locks (max_values: None, max_size: Some(1299), added: 3774, mode: MaxEncodedLen)
-	/// Storage: Balances Freezes (r:1 w:0)
-	/// Proof: Balances Freezes (max_values: None, max_size: Some(49), added: 2524, mode: MaxEncodedLen)
-	fn claim() -> Weight {
-		// Proof Size summary in bytes:
-		//  Measured:  `620`
-		//  Estimated: `4764`
-		// Minimum execution time: 213_980_000 picoseconds.
-		Weight::from_parts(229_096_000, 0)
-			.saturating_add(Weight::from_parts(0, 4764))
-			.saturating_add(T::DbWeight::get().reads(8))
-			.saturating_add(T::DbWeight::get().writes(6))
-	}
-	/// Storage: Claims Total (r:1 w:1)
-	/// Proof Skipped: Claims Total (max_values: Some(1), max_size: None, mode: Measured)
-	/// Storage: Claims Vesting (r:0 w:1)
-	/// Proof Skipped: Claims Vesting (max_values: None, max_size: None, mode: Measured)
-	/// Storage: Claims Claims (r:0 w:1)
-	/// Proof Skipped: Claims Claims (max_values: None, max_size: None, mode: Measured)
-	/// Storage: Claims Signing (r:0 w:1)
-	/// Proof Skipped: Claims Signing (max_values: None, max_size: None, mode: Measured)
-	fn mint_claim() -> Weight {
-		// Proof Size summary in bytes:
-		//  Measured:  `216`
-		//  Estimated: `1701`
-		// Minimum execution time: 13_378_000 picoseconds.
-		Weight::from_parts(15_841_000, 0)
-			.saturating_add(Weight::from_parts(0, 1701))
-			.saturating_add(T::DbWeight::get().reads(1))
-			.saturating_add(T::DbWeight::get().writes(4))
-	}
-	/// Storage: Claims Claims (r:1 w:1)
-	/// Proof Skipped: Claims Claims (max_values: None, max_size: None, mode: Measured)
-	/// Storage: Claims Signing (r:1 w:1)
-	/// Proof Skipped: Claims Signing (max_values: None, max_size: None, mode: Measured)
-	/// Storage: Claims Total (r:1 w:1)
-	/// Proof Skipped: Claims Total (max_values: Some(1), max_size: None, mode: Measured)
-	/// Storage: Claims Vesting (r:1 w:1)
-	/// Proof Skipped: Claims Vesting (max_values: None, max_size: None, mode: Measured)
-	/// Storage: Vesting Vesting (r:1 w:1)
-	/// Proof: Vesting Vesting (max_values: None, max_size: Some(1057), added: 3532, mode: MaxEncodedLen)
-	/// Storage: System Account (r:1 w:0)
-	/// Proof: System Account (max_values: None, max_size: Some(128), added: 2603, mode: MaxEncodedLen)
-	/// Storage: Balances Locks (r:1 w:1)
-	/// Proof: Balances Locks (max_values: None, max_size: Some(1299), added: 3774, mode: MaxEncodedLen)
-	/// Storage: Balances Freezes (r:1 w:0)
-	/// Proof: Balances Freezes (max_values: None, max_size: Some(49), added: 2524, mode: MaxEncodedLen)
-	fn claim_attest() -> Weight {
-		// Proof Size summary in bytes:
-		//  Measured:  `620`
-		//  Estimated: `4764`
-		// Minimum execution time: 213_747_000 picoseconds.
-		Weight::from_parts(236_937_000, 0)
-			.saturating_add(Weight::from_parts(0, 4764))
-			.saturating_add(T::DbWeight::get().reads(8))
-			.saturating_add(T::DbWeight::get().writes(6))
-	}
-	/// Storage: Claims Preclaims (r:1 w:1)
-	/// Proof Skipped: Claims Preclaims (max_values: None, max_size: None, mode: Measured)
-	/// Storage: Claims Signing (r:1 w:1)
-	/// Proof Skipped: Claims Signing (max_values: None, max_size: None, mode: Measured)
-	/// Storage: Claims Claims (r:1 w:1)
-	/// Proof Skipped: Claims Claims (max_values: None, max_size: None, mode: Measured)
-	/// Storage: Claims Total (r:1 w:1)
-	/// Proof Skipped: Claims Total (max_values: Some(1), max_size: None, mode: Measured)
-	/// Storage: Claims Vesting (r:1 w:1)
-	/// Proof Skipped: Claims Vesting (max_values: None, max_size: None, mode: Measured)
-	/// Storage: Vesting Vesting (r:1 w:1)
-	/// Proof: Vesting Vesting (max_values: None, max_size: Some(1057), added: 3532, mode: MaxEncodedLen)
-	/// Storage: System Account (r:1 w:0)
-	/// Proof: System Account (max_values: None, max_size: Some(128), added: 2603, mode: MaxEncodedLen)
-	/// Storage: Balances Locks (r:1 w:1)
-	/// Proof: Balances Locks (max_values: None, max_size: Some(1299), added: 3774, mode: MaxEncodedLen)
-	/// Storage: Balances Freezes (r:1 w:0)
-	/// Proof: Balances Freezes (max_values: None, max_size: Some(49), added: 2524, mode: MaxEncodedLen)
-	fn attest() -> Weight {
-		// Proof Size summary in bytes:
-		//  Measured:  `694`
-		//  Estimated: `4764`
-		// Minimum execution time: 103_706_000 picoseconds.
-		Weight::from_parts(108_213_000, 0)
-			.saturating_add(Weight::from_parts(0, 4764))
-			.saturating_add(T::DbWeight::get().reads(9))
-			.saturating_add(T::DbWeight::get().writes(7))
-	}
-	/// Storage: Claims Claims (r:1 w:2)
-	/// Proof Skipped: Claims Claims (max_values: None, max_size: None, mode: Measured)
-	/// Storage: Claims Vesting (r:1 w:2)
-	/// Proof Skipped: Claims Vesting (max_values: None, max_size: None, mode: Measured)
-	/// Storage: Claims Signing (r:1 w:2)
-	/// Proof Skipped: Claims Signing (max_values: None, max_size: None, mode: Measured)
-	/// Storage: Claims Preclaims (r:1 w:1)
-	/// Proof Skipped: Claims Preclaims (max_values: None, max_size: None, mode: Measured)
-	fn move_claim() -> Weight {
-		// Proof Size summary in bytes:
-		//  Measured:  `440`
-		//  Estimated: `3905`
-		// Minimum execution time: 27_331_000 picoseconds.
-		Weight::from_parts(29_408_000, 0)
-			.saturating_add(Weight::from_parts(0, 3905))
-			.saturating_add(T::DbWeight::get().reads(4))
-			.saturating_add(T::DbWeight::get().writes(7))
-	}
-}
diff --git a/polkadot/runtime/kusama/src/weights/runtime_common_crowdloan.rs b/polkadot/runtime/kusama/src/weights/runtime_common_crowdloan.rs
deleted file mode 100644
index 1785e0e5d38ba3748068fa9c083c7c5e318fb19e..0000000000000000000000000000000000000000
--- a/polkadot/runtime/kusama/src/weights/runtime_common_crowdloan.rs
+++ /dev/null
@@ -1,225 +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/>.
-
-//! Autogenerated weights for `runtime_common::crowdloan`
-//!
-//! THIS FILE WAS AUTO-GENERATED USING THE SUBSTRATE BENCHMARK CLI VERSION 4.0.0-dev
-//! DATE: 2023-06-19, STEPS: `50`, REPEAT: `20`, LOW RANGE: `[]`, HIGH RANGE: `[]`
-//! WORST CASE MAP SIZE: `1000000`
-//! HOSTNAME: `runner-e8ezs4ez-project-163-concurrent-0`, CPU: `Intel(R) Xeon(R) CPU @ 2.60GHz`
-//! EXECUTION: Some(Wasm), WASM-EXECUTION: Compiled, CHAIN: Some("kusama-dev"), DB CACHE: 1024
-
-// Executed Command:
-// ./target/production/polkadot
-// benchmark
-// pallet
-// --chain=kusama-dev
-// --steps=50
-// --repeat=20
-// --no-storage-info
-// --no-median-slopes
-// --no-min-squares
-// --pallet=runtime_common::crowdloan
-// --extrinsic=*
-// --execution=wasm
-// --wasm-execution=compiled
-// --header=./file_header.txt
-// --output=./runtime/kusama/src/weights/runtime_common_crowdloan.rs
-
-#![cfg_attr(rustfmt, rustfmt_skip)]
-#![allow(unused_parens)]
-#![allow(unused_imports)]
-#![allow(missing_docs)]
-
-use frame_support::{traits::Get, weights::Weight};
-use core::marker::PhantomData;
-
-/// Weight functions for `runtime_common::crowdloan`.
-pub struct WeightInfo<T>(PhantomData<T>);
-impl<T: frame_system::Config> runtime_common::crowdloan::WeightInfo for WeightInfo<T> {
-	/// Storage: Crowdloan Funds (r:1 w:1)
-	/// Proof Skipped: Crowdloan Funds (max_values: None, max_size: None, mode: Measured)
-	/// Storage: Registrar Paras (r:1 w:1)
-	/// Proof Skipped: Registrar Paras (max_values: None, max_size: None, mode: Measured)
-	/// Storage: Paras ParaLifecycles (r:1 w:0)
-	/// Proof Skipped: Paras ParaLifecycles (max_values: None, max_size: None, mode: Measured)
-	/// Storage: Crowdloan NextFundIndex (r:1 w:1)
-	/// Proof Skipped: Crowdloan NextFundIndex (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)
-	fn create() -> Weight {
-		// Proof Size summary in bytes:
-		//  Measured:  `415`
-		//  Estimated: `3880`
-		// Minimum execution time: 67_350_000 picoseconds.
-		Weight::from_parts(70_662_000, 0)
-			.saturating_add(Weight::from_parts(0, 3880))
-			.saturating_add(T::DbWeight::get().reads(5))
-			.saturating_add(T::DbWeight::get().writes(4))
-	}
-	/// Storage: Crowdloan Funds (r:1 w:1)
-	/// Proof Skipped: Crowdloan Funds (max_values: None, max_size: None, mode: Measured)
-	/// Storage: Slots Leases (r:1 w:0)
-	/// Proof Skipped: Slots Leases (max_values: None, max_size: None, mode: Measured)
-	/// Storage: Auctions AuctionInfo (r:1 w:0)
-	/// Proof: Auctions AuctionInfo (max_values: Some(1), max_size: Some(8), added: 503, mode: MaxEncodedLen)
-	/// Storage: System Account (r:1 w:1)
-	/// Proof: System Account (max_values: None, max_size: Some(128), added: 2603, mode: MaxEncodedLen)
-	/// Storage: Balances InactiveIssuance (r:1 w:1)
-	/// Proof: Balances InactiveIssuance (max_values: Some(1), max_size: Some(16), added: 511, mode: MaxEncodedLen)
-	/// Storage: Crowdloan EndingsCount (r:1 w:0)
-	/// Proof Skipped: Crowdloan EndingsCount (max_values: Some(1), max_size: None, mode: Measured)
-	/// Storage: Crowdloan NewRaise (r:1 w:1)
-	/// Proof Skipped: Crowdloan NewRaise (max_values: Some(1), max_size: None, mode: Measured)
-	/// Storage: unknown `0xd861ea1ebf4800d4b89f4ff787ad79ee96d9a708c85b57da7eb8f9ddeda61291` (r:1 w:1)
-	/// Proof Skipped: unknown `0xd861ea1ebf4800d4b89f4ff787ad79ee96d9a708c85b57da7eb8f9ddeda61291` (r:1 w:1)
-	fn contribute() -> Weight {
-		// Proof Size summary in bytes:
-		//  Measured:  `463`
-		//  Estimated: `3928`
-		// Minimum execution time: 172_864_000 picoseconds.
-		Weight::from_parts(181_577_000, 0)
-			.saturating_add(Weight::from_parts(0, 3928))
-			.saturating_add(T::DbWeight::get().reads(8))
-			.saturating_add(T::DbWeight::get().writes(5))
-	}
-	/// Storage: Crowdloan Funds (r:1 w:1)
-	/// Proof Skipped: Crowdloan Funds (max_values: None, 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: Balances InactiveIssuance (r:1 w:1)
-	/// Proof: Balances InactiveIssuance (max_values: Some(1), max_size: Some(16), added: 511, mode: MaxEncodedLen)
-	/// Storage: unknown `0xc85982571aa615c788ef9b2c16f54f25773fd439e8ee1ed2aa3ae43d48e880f0` (r:1 w:1)
-	/// Proof Skipped: unknown `0xc85982571aa615c788ef9b2c16f54f25773fd439e8ee1ed2aa3ae43d48e880f0` (r:1 w:1)
-	fn withdraw() -> Weight {
-		// Proof Size summary in bytes:
-		//  Measured:  `690`
-		//  Estimated: `6196`
-		// Minimum execution time: 92_816_000 picoseconds.
-		Weight::from_parts(102_956_000, 0)
-			.saturating_add(Weight::from_parts(0, 6196))
-			.saturating_add(T::DbWeight::get().reads(5))
-			.saturating_add(T::DbWeight::get().writes(5))
-	}
-	/// Storage: Skipped Metadata (r:0 w:0)
-	/// Proof Skipped: Skipped Metadata (max_values: None, max_size: None, mode: Measured)
-	/// The range of component `k` is `[0, 1000]`.
-	fn refund(k: u32, ) -> Weight {
-		// Proof Size summary in bytes:
-		//  Measured:  `128 + k * (189 ±0)`
-		//  Estimated: `141 + k * (189 ±0)`
-		// Minimum execution time: 67_361_000 picoseconds.
-		Weight::from_parts(73_320_000, 0)
-			.saturating_add(Weight::from_parts(0, 141))
-			// Standard Error: 30_080
-			.saturating_add(Weight::from_parts(43_879_049, 0).saturating_mul(k.into()))
-			.saturating_add(T::DbWeight::get().reads(4))
-			.saturating_add(T::DbWeight::get().reads((2_u64).saturating_mul(k.into())))
-			.saturating_add(T::DbWeight::get().writes(3))
-			.saturating_add(T::DbWeight::get().writes((2_u64).saturating_mul(k.into())))
-			.saturating_add(Weight::from_parts(0, 189).saturating_mul(k.into()))
-	}
-	/// Storage: Crowdloan Funds (r:1 w:1)
-	/// Proof Skipped: Crowdloan Funds (max_values: None, 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)
-	fn dissolve() -> Weight {
-		// Proof Size summary in bytes:
-		//  Measured:  `515`
-		//  Estimated: `6196`
-		// Minimum execution time: 56_194_000 picoseconds.
-		Weight::from_parts(63_604_000, 0)
-			.saturating_add(Weight::from_parts(0, 6196))
-			.saturating_add(T::DbWeight::get().reads(3))
-			.saturating_add(T::DbWeight::get().writes(3))
-	}
-	/// Storage: Crowdloan Funds (r:1 w:1)
-	/// Proof Skipped: Crowdloan Funds (max_values: None, max_size: None, mode: Measured)
-	fn edit() -> Weight {
-		// Proof Size summary in bytes:
-		//  Measured:  `235`
-		//  Estimated: `3700`
-		// Minimum execution time: 27_093_000 picoseconds.
-		Weight::from_parts(32_181_000, 0)
-			.saturating_add(Weight::from_parts(0, 3700))
-			.saturating_add(T::DbWeight::get().reads(1))
-			.saturating_add(T::DbWeight::get().writes(1))
-	}
-	/// Storage: Crowdloan Funds (r:1 w:0)
-	/// Proof Skipped: Crowdloan Funds (max_values: None, max_size: None, mode: Measured)
-	/// Storage: unknown `0xd861ea1ebf4800d4b89f4ff787ad79ee96d9a708c85b57da7eb8f9ddeda61291` (r:1 w:1)
-	/// Proof Skipped: unknown `0xd861ea1ebf4800d4b89f4ff787ad79ee96d9a708c85b57da7eb8f9ddeda61291` (r:1 w:1)
-	fn add_memo() -> Weight {
-		// Proof Size summary in bytes:
-		//  Measured:  `412`
-		//  Estimated: `3877`
-		// Minimum execution time: 39_489_000 picoseconds.
-		Weight::from_parts(44_798_000, 0)
-			.saturating_add(Weight::from_parts(0, 3877))
-			.saturating_add(T::DbWeight::get().reads(2))
-			.saturating_add(T::DbWeight::get().writes(1))
-	}
-	/// Storage: Crowdloan Funds (r:1 w:0)
-	/// Proof Skipped: Crowdloan Funds (max_values: None, max_size: None, mode: Measured)
-	/// Storage: Crowdloan NewRaise (r:1 w:1)
-	/// Proof Skipped: Crowdloan NewRaise (max_values: Some(1), max_size: None, mode: Measured)
-	fn poke() -> Weight {
-		// Proof Size summary in bytes:
-		//  Measured:  `239`
-		//  Estimated: `3704`
-		// Minimum execution time: 26_147_000 picoseconds.
-		Weight::from_parts(30_760_000, 0)
-			.saturating_add(Weight::from_parts(0, 3704))
-			.saturating_add(T::DbWeight::get().reads(2))
-			.saturating_add(T::DbWeight::get().writes(1))
-	}
-	/// Storage: Auctions AuctionInfo (r:1 w:0)
-	/// Proof: Auctions AuctionInfo (max_values: Some(1), max_size: Some(8), added: 503, mode: MaxEncodedLen)
-	/// Storage: Crowdloan EndingsCount (r:1 w:1)
-	/// Proof Skipped: Crowdloan EndingsCount (max_values: Some(1), max_size: None, mode: Measured)
-	/// Storage: Crowdloan NewRaise (r:1 w:1)
-	/// Proof Skipped: Crowdloan NewRaise (max_values: Some(1), max_size: None, mode: Measured)
-	/// Storage: Crowdloan Funds (r:100 w:0)
-	/// Proof Skipped: Crowdloan Funds (max_values: None, max_size: None, mode: Measured)
-	/// Storage: Auctions AuctionCounter (r:1 w:0)
-	/// Proof: Auctions AuctionCounter (max_values: Some(1), max_size: Some(4), added: 499, mode: MaxEncodedLen)
-	/// Storage: Paras ParaLifecycles (r:100 w:0)
-	/// Proof Skipped: Paras ParaLifecycles (max_values: None, max_size: None, mode: Measured)
-	/// Storage: Slots Leases (r:100 w:0)
-	/// Proof Skipped: Slots Leases (max_values: None, max_size: None, mode: Measured)
-	/// Storage: Auctions Winning (r:1 w:1)
-	/// Proof: Auctions Winning (max_values: None, max_size: Some(1920), added: 4395, mode: MaxEncodedLen)
-	/// Storage: Auctions ReservedAmounts (r:100 w:100)
-	/// Proof: Auctions ReservedAmounts (max_values: None, max_size: Some(60), added: 2535, mode: MaxEncodedLen)
-	/// Storage: System Account (r:100 w:100)
-	/// Proof: System Account (max_values: None, max_size: Some(128), added: 2603, mode: MaxEncodedLen)
-	/// The range of component `n` is `[2, 100]`.
-	fn on_initialize(n: u32, ) -> Weight {
-		// Proof Size summary in bytes:
-		//  Measured:  `130 + n * (356 ±0)`
-		//  Estimated: `5385 + n * (2832 ±0)`
-		// Minimum execution time: 163_693_000 picoseconds.
-		Weight::from_parts(22_145_813, 0)
-			.saturating_add(Weight::from_parts(0, 5385))
-			// Standard Error: 47_670
-			.saturating_add(Weight::from_parts(72_049_146, 0).saturating_mul(n.into()))
-			.saturating_add(T::DbWeight::get().reads(5))
-			.saturating_add(T::DbWeight::get().reads((5_u64).saturating_mul(n.into())))
-			.saturating_add(T::DbWeight::get().writes(3))
-			.saturating_add(T::DbWeight::get().writes((2_u64).saturating_mul(n.into())))
-			.saturating_add(Weight::from_parts(0, 2832).saturating_mul(n.into()))
-	}
-}
diff --git a/polkadot/runtime/kusama/src/weights/runtime_common_paras_registrar.rs b/polkadot/runtime/kusama/src/weights/runtime_common_paras_registrar.rs
deleted file mode 100644
index 9426d667346b1b4f72e3776d3a2d766182553fab..0000000000000000000000000000000000000000
--- a/polkadot/runtime/kusama/src/weights/runtime_common_paras_registrar.rs
+++ /dev/null
@@ -1,218 +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/>.
-
-//! Autogenerated weights for `runtime_common::paras_registrar`
-//!
-//! THIS FILE WAS AUTO-GENERATED USING THE SUBSTRATE BENCHMARK CLI VERSION 4.0.0-dev
-//! DATE: 2023-06-19, STEPS: `50`, REPEAT: `20`, LOW RANGE: `[]`, HIGH RANGE: `[]`
-//! WORST CASE MAP SIZE: `1000000`
-//! HOSTNAME: `runner-e8ezs4ez-project-163-concurrent-0`, CPU: `Intel(R) Xeon(R) CPU @ 2.60GHz`
-//! EXECUTION: Some(Wasm), WASM-EXECUTION: Compiled, CHAIN: Some("kusama-dev"), DB CACHE: 1024
-
-// Executed Command:
-// ./target/production/polkadot
-// benchmark
-// pallet
-// --chain=kusama-dev
-// --steps=50
-// --repeat=20
-// --no-storage-info
-// --no-median-slopes
-// --no-min-squares
-// --pallet=runtime_common::paras_registrar
-// --extrinsic=*
-// --execution=wasm
-// --wasm-execution=compiled
-// --header=./file_header.txt
-// --output=./runtime/kusama/src/weights/runtime_common_paras_registrar.rs
-
-#![cfg_attr(rustfmt, rustfmt_skip)]
-#![allow(unused_parens)]
-#![allow(unused_imports)]
-#![allow(missing_docs)]
-
-use frame_support::{traits::Get, weights::Weight};
-use core::marker::PhantomData;
-
-/// Weight functions for `runtime_common::paras_registrar`.
-pub struct WeightInfo<T>(PhantomData<T>);
-impl<T: frame_system::Config> runtime_common::paras_registrar::WeightInfo for WeightInfo<T> {
-	/// Storage: Registrar NextFreeParaId (r:1 w:1)
-	/// Proof Skipped: Registrar NextFreeParaId (max_values: Some(1), max_size: None, mode: Measured)
-	/// Storage: Registrar Paras (r:1 w:1)
-	/// Proof Skipped: Registrar Paras (max_values: None, max_size: None, mode: Measured)
-	/// Storage: Paras ParaLifecycles (r:1 w:0)
-	/// Proof Skipped: Paras ParaLifecycles (max_values: None, max_size: None, mode: Measured)
-	fn reserve() -> Weight {
-		// Proof Size summary in bytes:
-		//  Measured:  `70`
-		//  Estimated: `3535`
-		// Minimum execution time: 30_262_000 picoseconds.
-		Weight::from_parts(30_881_000, 0)
-			.saturating_add(Weight::from_parts(0, 3535))
-			.saturating_add(T::DbWeight::get().reads(3))
-			.saturating_add(T::DbWeight::get().writes(2))
-	}
-	/// Storage: Registrar Paras (r:1 w:1)
-	/// Proof Skipped: Registrar Paras (max_values: None, max_size: None, mode: Measured)
-	/// Storage: Paras ParaLifecycles (r:1 w:1)
-	/// Proof Skipped: Paras ParaLifecycles (max_values: None, max_size: None, mode: Measured)
-	/// Storage: Paras PvfActiveVoteMap (r:1 w:1)
-	/// Proof Skipped: Paras PvfActiveVoteMap (max_values: None, max_size: None, mode: Measured)
-	/// Storage: Paras CodeByHash (r:1 w:1)
-	/// Proof Skipped: Paras CodeByHash (max_values: None, max_size: None, mode: Measured)
-	/// Storage: ParasShared ActiveValidatorKeys (r:1 w:0)
-	/// Proof Skipped: ParasShared ActiveValidatorKeys (max_values: Some(1), max_size: None, mode: Measured)
-	/// Storage: Paras PvfActiveVoteList (r:1 w:1)
-	/// Proof Skipped: Paras PvfActiveVoteList (max_values: Some(1), max_size: None, mode: Measured)
-	/// Storage: Paras CodeByHashRefs (r:1 w:1)
-	/// Proof Skipped: Paras CodeByHashRefs (max_values: None, max_size: None, mode: Measured)
-	/// Storage: Paras CurrentCodeHash (r:0 w:1)
-	/// Proof Skipped: Paras CurrentCodeHash (max_values: None, max_size: None, mode: Measured)
-	/// Storage: Paras UpcomingParasGenesis (r:0 w:1)
-	/// Proof Skipped: Paras UpcomingParasGenesis (max_values: None, max_size: None, mode: Measured)
-	fn register() -> Weight {
-		// Proof Size summary in bytes:
-		//  Measured:  `329`
-		//  Estimated: `3794`
-		// Minimum execution time: 6_443_064_000 picoseconds.
-		Weight::from_parts(7_074_736_000, 0)
-			.saturating_add(Weight::from_parts(0, 3794))
-			.saturating_add(T::DbWeight::get().reads(7))
-			.saturating_add(T::DbWeight::get().writes(8))
-	}
-	/// Storage: Registrar Paras (r:1 w:1)
-	/// Proof Skipped: Registrar Paras (max_values: None, max_size: None, mode: Measured)
-	/// Storage: Paras ParaLifecycles (r:1 w:1)
-	/// Proof Skipped: Paras ParaLifecycles (max_values: None, max_size: None, mode: Measured)
-	/// Storage: Paras PvfActiveVoteMap (r:1 w:1)
-	/// Proof Skipped: Paras PvfActiveVoteMap (max_values: None, max_size: None, mode: Measured)
-	/// Storage: Paras CodeByHash (r:1 w:1)
-	/// Proof Skipped: Paras CodeByHash (max_values: None, max_size: None, mode: Measured)
-	/// Storage: ParasShared ActiveValidatorKeys (r:1 w:0)
-	/// Proof Skipped: ParasShared ActiveValidatorKeys (max_values: Some(1), max_size: None, mode: Measured)
-	/// Storage: Paras PvfActiveVoteList (r:1 w:1)
-	/// Proof Skipped: Paras PvfActiveVoteList (max_values: Some(1), max_size: None, mode: Measured)
-	/// Storage: Paras CodeByHashRefs (r:1 w:1)
-	/// Proof Skipped: Paras CodeByHashRefs (max_values: None, max_size: None, mode: Measured)
-	/// Storage: Paras CurrentCodeHash (r:0 w:1)
-	/// Proof Skipped: Paras CurrentCodeHash (max_values: None, max_size: None, mode: Measured)
-	/// Storage: Paras UpcomingParasGenesis (r:0 w:1)
-	/// Proof Skipped: Paras UpcomingParasGenesis (max_values: None, max_size: None, mode: Measured)
-	fn force_register() -> Weight {
-		// Proof Size summary in bytes:
-		//  Measured:  `219`
-		//  Estimated: `3684`
-		// Minimum execution time: 6_298_725_000 picoseconds.
-		Weight::from_parts(7_130_498_000, 0)
-			.saturating_add(Weight::from_parts(0, 3684))
-			.saturating_add(T::DbWeight::get().reads(7))
-			.saturating_add(T::DbWeight::get().writes(8))
-	}
-	/// Storage: Registrar Paras (r:1 w:1)
-	/// Proof Skipped: Registrar Paras (max_values: None, max_size: None, mode: Measured)
-	/// Storage: Paras ParaLifecycles (r:1 w:1)
-	/// Proof Skipped: Paras ParaLifecycles (max_values: None, max_size: None, mode: Measured)
-	/// Storage: Paras FutureCodeHash (r:1 w:0)
-	/// Proof Skipped: Paras FutureCodeHash (max_values: None, max_size: None, mode: Measured)
-	/// Storage: ParasShared CurrentSessionIndex (r:1 w:0)
-	/// Proof Skipped: ParasShared CurrentSessionIndex (max_values: Some(1), max_size: None, mode: Measured)
-	/// Storage: Paras ActionsQueue (r:1 w:1)
-	/// Proof Skipped: Paras ActionsQueue (max_values: None, max_size: None, mode: Measured)
-	/// Storage: MessageQueue BookStateFor (r:1 w:0)
-	/// Proof: MessageQueue BookStateFor (max_values: None, max_size: Some(55), added: 2530, mode: MaxEncodedLen)
-	/// Storage: Registrar PendingSwap (r:0 w:1)
-	/// Proof Skipped: Registrar PendingSwap (max_values: None, max_size: None, mode: Measured)
-	fn deregister() -> Weight {
-		// Proof Size summary in bytes:
-		//  Measured:  `476`
-		//  Estimated: `3941`
-		// Minimum execution time: 60_696_000 picoseconds.
-		Weight::from_parts(65_976_000, 0)
-			.saturating_add(Weight::from_parts(0, 3941))
-			.saturating_add(T::DbWeight::get().reads(6))
-			.saturating_add(T::DbWeight::get().writes(4))
-	}
-	/// Storage: Registrar Paras (r:1 w:0)
-	/// Proof Skipped: Registrar Paras (max_values: None, max_size: None, mode: Measured)
-	/// Storage: Paras ParaLifecycles (r:2 w:2)
-	/// Proof Skipped: Paras ParaLifecycles (max_values: None, max_size: None, mode: Measured)
-	/// Storage: Registrar PendingSwap (r:1 w:1)
-	/// Proof Skipped: Registrar PendingSwap (max_values: None, max_size: None, mode: Measured)
-	/// Storage: ParasShared CurrentSessionIndex (r:1 w:0)
-	/// Proof Skipped: ParasShared CurrentSessionIndex (max_values: Some(1), max_size: None, mode: Measured)
-	/// Storage: Paras ActionsQueue (r:1 w:1)
-	/// Proof Skipped: Paras ActionsQueue (max_values: None, max_size: None, mode: Measured)
-	/// Storage: Crowdloan Funds (r:2 w:2)
-	/// Proof Skipped: Crowdloan Funds (max_values: None, max_size: None, mode: Measured)
-	/// Storage: Slots Leases (r:2 w:2)
-	/// Proof Skipped: Slots Leases (max_values: None, max_size: None, mode: Measured)
-	fn swap() -> Weight {
-		// Proof Size summary in bytes:
-		//  Measured:  `713`
-		//  Estimated: `6653`
-		// Minimum execution time: 72_165_000 picoseconds.
-		Weight::from_parts(80_369_000, 0)
-			.saturating_add(Weight::from_parts(0, 6653))
-			.saturating_add(T::DbWeight::get().reads(10))
-			.saturating_add(T::DbWeight::get().writes(8))
-	}
-	/// Storage: Paras FutureCodeHash (r:1 w:1)
-	/// Proof Skipped: Paras FutureCodeHash (max_values: None, max_size: None, mode: Measured)
-	/// Storage: Paras UpgradeRestrictionSignal (r:1 w:1)
-	/// Proof Skipped: Paras UpgradeRestrictionSignal (max_values: None, max_size: None, mode: Measured)
-	/// Storage: Paras CurrentCodeHash (r:1 w:0)
-	/// Proof Skipped: Paras CurrentCodeHash (max_values: None, max_size: None, mode: Measured)
-	/// Storage: Paras UpgradeCooldowns (r:1 w:1)
-	/// Proof Skipped: Paras UpgradeCooldowns (max_values: Some(1), max_size: None, mode: Measured)
-	/// Storage: Paras PvfActiveVoteMap (r:1 w:1)
-	/// Proof Skipped: Paras PvfActiveVoteMap (max_values: None, max_size: None, mode: Measured)
-	/// Storage: Paras CodeByHash (r:1 w:1)
-	/// Proof Skipped: Paras CodeByHash (max_values: None, max_size: None, mode: Measured)
-	/// Storage: ParasShared ActiveValidatorKeys (r:1 w:0)
-	/// Proof Skipped: ParasShared ActiveValidatorKeys (max_values: Some(1), max_size: None, mode: Measured)
-	/// Storage: Paras PvfActiveVoteList (r:1 w:1)
-	/// Proof Skipped: Paras PvfActiveVoteList (max_values: Some(1), max_size: None, mode: Measured)
-	/// Storage: Paras CodeByHashRefs (r:1 w:1)
-	/// Proof Skipped: Paras CodeByHashRefs (max_values: None, max_size: None, mode: Measured)
-	/// The range of component `b` is `[1, 3145728]`.
-	fn schedule_code_upgrade(b: u32, ) -> Weight {
-		// Proof Size summary in bytes:
-		//  Measured:  `177`
-		//  Estimated: `3642`
-		// Minimum execution time: 40_883_000 picoseconds.
-		Weight::from_parts(41_276_000, 0)
-			.saturating_add(Weight::from_parts(0, 3642))
-			// Standard Error: 5
-			.saturating_add(Weight::from_parts(2_552, 0).saturating_mul(b.into()))
-			.saturating_add(T::DbWeight::get().reads(9))
-			.saturating_add(T::DbWeight::get().writes(7))
-	}
-	/// Storage: Paras Heads (r:0 w:1)
-	/// Proof Skipped: Paras Heads (max_values: None, max_size: None, mode: Measured)
-	/// The range of component `b` is `[1, 1048576]`.
-	fn set_current_head(b: u32, ) -> Weight {
-		// Proof Size summary in bytes:
-		//  Measured:  `0`
-		//  Estimated: `0`
-		// Minimum execution time: 8_864_000 picoseconds.
-		Weight::from_parts(9_023_000, 0)
-			.saturating_add(Weight::from_parts(0, 0))
-			// Standard Error: 1
-			.saturating_add(Weight::from_parts(983, 0).saturating_mul(b.into()))
-			.saturating_add(T::DbWeight::get().writes(1))
-	}
-}
diff --git a/polkadot/runtime/kusama/src/weights/runtime_common_slots.rs b/polkadot/runtime/kusama/src/weights/runtime_common_slots.rs
deleted file mode 100644
index 8c76ff2c693ae5b78b1d05ce5070e669e07c545c..0000000000000000000000000000000000000000
--- a/polkadot/runtime/kusama/src/weights/runtime_common_slots.rs
+++ /dev/null
@@ -1,135 +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/>.
-
-//! Autogenerated weights for `runtime_common::slots`
-//!
-//! THIS FILE WAS AUTO-GENERATED USING THE SUBSTRATE BENCHMARK CLI VERSION 4.0.0-dev
-//! DATE: 2023-06-19, STEPS: `50`, REPEAT: `20`, LOW RANGE: `[]`, HIGH RANGE: `[]`
-//! WORST CASE MAP SIZE: `1000000`
-//! HOSTNAME: `runner-e8ezs4ez-project-163-concurrent-0`, CPU: `Intel(R) Xeon(R) CPU @ 2.60GHz`
-//! EXECUTION: Some(Wasm), WASM-EXECUTION: Compiled, CHAIN: Some("kusama-dev"), DB CACHE: 1024
-
-// Executed Command:
-// ./target/production/polkadot
-// benchmark
-// pallet
-// --chain=kusama-dev
-// --steps=50
-// --repeat=20
-// --no-storage-info
-// --no-median-slopes
-// --no-min-squares
-// --pallet=runtime_common::slots
-// --extrinsic=*
-// --execution=wasm
-// --wasm-execution=compiled
-// --header=./file_header.txt
-// --output=./runtime/kusama/src/weights/runtime_common_slots.rs
-
-#![cfg_attr(rustfmt, rustfmt_skip)]
-#![allow(unused_parens)]
-#![allow(unused_imports)]
-#![allow(missing_docs)]
-
-use frame_support::{traits::Get, weights::Weight};
-use core::marker::PhantomData;
-
-/// Weight functions for `runtime_common::slots`.
-pub struct WeightInfo<T>(PhantomData<T>);
-impl<T: frame_system::Config> runtime_common::slots::WeightInfo for WeightInfo<T> {
-	/// Storage: Slots Leases (r:1 w:1)
-	/// Proof Skipped: Slots Leases (max_values: None, 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)
-	fn force_lease() -> Weight {
-		// Proof Size summary in bytes:
-		//  Measured:  `220`
-		//  Estimated: `3685`
-		// Minimum execution time: 30_513_000 picoseconds.
-		Weight::from_parts(31_238_000, 0)
-			.saturating_add(Weight::from_parts(0, 3685))
-			.saturating_add(T::DbWeight::get().reads(2))
-			.saturating_add(T::DbWeight::get().writes(2))
-	}
-	/// Storage: Paras Parachains (r:1 w:0)
-	/// Proof Skipped: Paras Parachains (max_values: Some(1), max_size: None, mode: Measured)
-	/// Storage: Slots Leases (r:101 w:100)
-	/// Proof Skipped: Slots Leases (max_values: None, max_size: None, mode: Measured)
-	/// Storage: Paras ParaLifecycles (r:200 w:200)
-	/// Proof Skipped: Paras ParaLifecycles (max_values: None, max_size: None, mode: Measured)
-	/// Storage: ParasShared CurrentSessionIndex (r:1 w:0)
-	/// Proof Skipped: ParasShared CurrentSessionIndex (max_values: Some(1), max_size: None, mode: Measured)
-	/// Storage: Paras ActionsQueue (r:1 w:1)
-	/// Proof Skipped: Paras ActionsQueue (max_values: None, max_size: None, mode: Measured)
-	/// Storage: Registrar Paras (r:100 w:100)
-	/// Proof Skipped: Registrar Paras (max_values: None, max_size: None, mode: Measured)
-	/// The range of component `c` is `[0, 100]`.
-	/// The range of component `t` is `[0, 100]`.
-	fn manage_lease_period_start(c: u32, t: u32, ) -> Weight {
-		// Proof Size summary in bytes:
-		//  Measured:  `46 + c * (47 ±0) + t * (308 ±0)`
-		//  Estimated: `2823 + c * (2526 ±0) + t * (2789 ±0)`
-		// Minimum execution time: 758_558_000 picoseconds.
-		Weight::from_parts(769_052_000, 0)
-			.saturating_add(Weight::from_parts(0, 2823))
-			// Standard Error: 93_260
-			.saturating_add(Weight::from_parts(3_338_461, 0).saturating_mul(c.into()))
-			// Standard Error: 93_260
-			.saturating_add(Weight::from_parts(13_755_524, 0).saturating_mul(t.into()))
-			.saturating_add(T::DbWeight::get().reads(4))
-			.saturating_add(T::DbWeight::get().reads((1_u64).saturating_mul(c.into())))
-			.saturating_add(T::DbWeight::get().reads((3_u64).saturating_mul(t.into())))
-			.saturating_add(T::DbWeight::get().writes(1))
-			.saturating_add(T::DbWeight::get().writes((1_u64).saturating_mul(c.into())))
-			.saturating_add(T::DbWeight::get().writes((3_u64).saturating_mul(t.into())))
-			.saturating_add(Weight::from_parts(0, 2526).saturating_mul(c.into()))
-			.saturating_add(Weight::from_parts(0, 2789).saturating_mul(t.into()))
-	}
-	/// Storage: Slots Leases (r:1 w:1)
-	/// Proof Skipped: Slots Leases (max_values: None, max_size: None, mode: Measured)
-	/// Storage: System Account (r:8 w:8)
-	/// Proof: System Account (max_values: None, max_size: Some(128), added: 2603, mode: MaxEncodedLen)
-	fn clear_all_leases() -> Weight {
-		// Proof Size summary in bytes:
-		//  Measured:  `2692`
-		//  Estimated: `21814`
-		// Minimum execution time: 155_205_000 picoseconds.
-		Weight::from_parts(162_036_000, 0)
-			.saturating_add(Weight::from_parts(0, 21814))
-			.saturating_add(T::DbWeight::get().reads(9))
-			.saturating_add(T::DbWeight::get().writes(9))
-	}
-	/// Storage: Slots Leases (r:1 w:0)
-	/// Proof Skipped: Slots Leases (max_values: None, max_size: None, mode: Measured)
-	/// Storage: Paras ParaLifecycles (r:1 w:1)
-	/// Proof Skipped: Paras ParaLifecycles (max_values: None, max_size: None, mode: Measured)
-	/// Storage: ParasShared CurrentSessionIndex (r:1 w:0)
-	/// Proof Skipped: ParasShared CurrentSessionIndex (max_values: Some(1), max_size: None, mode: Measured)
-	/// Storage: Paras ActionsQueue (r:1 w:1)
-	/// Proof Skipped: Paras ActionsQueue (max_values: None, max_size: None, mode: Measured)
-	/// Storage: Registrar Paras (r:1 w:1)
-	/// Proof Skipped: Registrar Paras (max_values: None, max_size: None, mode: Measured)
-	fn trigger_onboard() -> Weight {
-		// Proof Size summary in bytes:
-		//  Measured:  `617`
-		//  Estimated: `4082`
-		// Minimum execution time: 38_799_000 picoseconds.
-		Weight::from_parts(42_044_000, 0)
-			.saturating_add(Weight::from_parts(0, 4082))
-			.saturating_add(T::DbWeight::get().reads(5))
-			.saturating_add(T::DbWeight::get().writes(3))
-	}
-}
diff --git a/polkadot/runtime/kusama/src/weights/runtime_parachains_configuration.rs b/polkadot/runtime/kusama/src/weights/runtime_parachains_configuration.rs
deleted file mode 100644
index 22609209c7333386874d23172b91e3ada94b8fab..0000000000000000000000000000000000000000
--- a/polkadot/runtime/kusama/src/weights/runtime_parachains_configuration.rs
+++ /dev/null
@@ -1,157 +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/>.
-
-//! Autogenerated weights for `runtime_parachains::configuration`
-//!
-//! THIS FILE WAS AUTO-GENERATED USING THE SUBSTRATE BENCHMARK CLI VERSION 4.0.0-dev
-//! DATE: 2023-08-11, STEPS: `50`, REPEAT: `20`, LOW RANGE: `[]`, HIGH RANGE: `[]`
-//! WORST CASE MAP SIZE: `1000000`
-//! HOSTNAME: `runner-fljshgub-project-163-concurrent-0`, CPU: `Intel(R) Xeon(R) CPU @ 2.60GHz`
-//! WASM-EXECUTION: `Compiled`, CHAIN: `Some("kusama-dev")`, DB CACHE: 1024
-
-// Executed Command:
-// target/production/polkadot
-// benchmark
-// pallet
-// --steps=50
-// --repeat=20
-// --extrinsic=*
-// --wasm-execution=compiled
-// --heap-pages=4096
-// --json-file=/builds/parity/mirrors/polkadot/.git/.artifacts/bench.json
-// --pallet=runtime_parachains::configuration
-// --chain=kusama-dev
-// --header=./file_header.txt
-// --output=./runtime/kusama/src/weights/
-
-#![cfg_attr(rustfmt, rustfmt_skip)]
-#![allow(unused_parens)]
-#![allow(unused_imports)]
-#![allow(missing_docs)]
-
-use frame_support::{traits::Get, weights::Weight};
-use core::marker::PhantomData;
-
-/// Weight functions for `runtime_parachains::configuration`.
-pub struct WeightInfo<T>(PhantomData<T>);
-impl<T: frame_system::Config> runtime_parachains::configuration::WeightInfo for WeightInfo<T> {
-	/// Storage: `Configuration::PendingConfigs` (r:1 w:1)
-	/// Proof: `Configuration::PendingConfigs` (`max_values`: Some(1), `max_size`: None, mode: `Measured`)
-	/// Storage: `Configuration::BypassConsistencyCheck` (r:1 w:0)
-	/// Proof: `Configuration::BypassConsistencyCheck` (`max_values`: Some(1), `max_size`: None, mode: `Measured`)
-	/// Storage: `ParasShared::CurrentSessionIndex` (r:1 w:0)
-	/// Proof: `ParasShared::CurrentSessionIndex` (`max_values`: Some(1), `max_size`: None, mode: `Measured`)
-	fn set_config_with_block_number() -> Weight {
-		// Proof Size summary in bytes:
-		//  Measured:  `127`
-		//  Estimated: `1612`
-		// Minimum execution time: 9_186_000 picoseconds.
-		Weight::from_parts(9_567_000, 0)
-			.saturating_add(Weight::from_parts(0, 1612))
-			.saturating_add(T::DbWeight::get().reads(3))
-			.saturating_add(T::DbWeight::get().writes(1))
-	}
-	/// Storage: `Configuration::PendingConfigs` (r:1 w:1)
-	/// Proof: `Configuration::PendingConfigs` (`max_values`: Some(1), `max_size`: None, mode: `Measured`)
-	/// Storage: `Configuration::BypassConsistencyCheck` (r:1 w:0)
-	/// Proof: `Configuration::BypassConsistencyCheck` (`max_values`: Some(1), `max_size`: None, mode: `Measured`)
-	/// Storage: `ParasShared::CurrentSessionIndex` (r:1 w:0)
-	/// Proof: `ParasShared::CurrentSessionIndex` (`max_values`: Some(1), `max_size`: None, mode: `Measured`)
-	fn set_config_with_u32() -> Weight {
-		// Proof Size summary in bytes:
-		//  Measured:  `127`
-		//  Estimated: `1612`
-		// Minimum execution time: 9_388_000 picoseconds.
-		Weight::from_parts(9_723_000, 0)
-			.saturating_add(Weight::from_parts(0, 1612))
-			.saturating_add(T::DbWeight::get().reads(3))
-			.saturating_add(T::DbWeight::get().writes(1))
-	}
-	/// Storage: `Configuration::PendingConfigs` (r:1 w:1)
-	/// Proof: `Configuration::PendingConfigs` (`max_values`: Some(1), `max_size`: None, mode: `Measured`)
-	/// Storage: `Configuration::BypassConsistencyCheck` (r:1 w:0)
-	/// Proof: `Configuration::BypassConsistencyCheck` (`max_values`: Some(1), `max_size`: None, mode: `Measured`)
-	/// Storage: `ParasShared::CurrentSessionIndex` (r:1 w:0)
-	/// Proof: `ParasShared::CurrentSessionIndex` (`max_values`: Some(1), `max_size`: None, mode: `Measured`)
-	fn set_config_with_option_u32() -> Weight {
-		// Proof Size summary in bytes:
-		//  Measured:  `127`
-		//  Estimated: `1612`
-		// Minimum execution time: 9_264_000 picoseconds.
-		Weight::from_parts(9_477_000, 0)
-			.saturating_add(Weight::from_parts(0, 1612))
-			.saturating_add(T::DbWeight::get().reads(3))
-			.saturating_add(T::DbWeight::get().writes(1))
-	}
-	/// Storage: `Benchmark::Override` (r:0 w:0)
-	/// Proof: `Benchmark::Override` (`max_values`: None, `max_size`: None, mode: `Measured`)
-	fn set_hrmp_open_request_ttl() -> Weight {
-		// Proof Size summary in bytes:
-		//  Measured:  `0`
-		//  Estimated: `0`
-		// Minimum execution time: 2_000_000_000_000 picoseconds.
-		Weight::from_parts(2_000_000_000_000, 0)
-			.saturating_add(Weight::from_parts(0, 0))
-	}
-	/// Storage: `Configuration::PendingConfigs` (r:1 w:1)
-	/// Proof: `Configuration::PendingConfigs` (`max_values`: Some(1), `max_size`: None, mode: `Measured`)
-	/// Storage: `Configuration::BypassConsistencyCheck` (r:1 w:0)
-	/// Proof: `Configuration::BypassConsistencyCheck` (`max_values`: Some(1), `max_size`: None, mode: `Measured`)
-	/// Storage: `ParasShared::CurrentSessionIndex` (r:1 w:0)
-	/// Proof: `ParasShared::CurrentSessionIndex` (`max_values`: Some(1), `max_size`: None, mode: `Measured`)
-	fn set_config_with_balance() -> Weight {
-		// Proof Size summary in bytes:
-		//  Measured:  `127`
-		//  Estimated: `1612`
-		// Minimum execution time: 9_282_000 picoseconds.
-		Weight::from_parts(9_641_000, 0)
-			.saturating_add(Weight::from_parts(0, 1612))
-			.saturating_add(T::DbWeight::get().reads(3))
-			.saturating_add(T::DbWeight::get().writes(1))
-	}
-	/// Storage: `Configuration::PendingConfigs` (r:1 w:1)
-	/// Proof: `Configuration::PendingConfigs` (`max_values`: Some(1), `max_size`: None, mode: `Measured`)
-	/// Storage: `Configuration::BypassConsistencyCheck` (r:1 w:0)
-	/// Proof: `Configuration::BypassConsistencyCheck` (`max_values`: Some(1), `max_size`: None, mode: `Measured`)
-	/// Storage: `ParasShared::CurrentSessionIndex` (r:1 w:0)
-	/// Proof: `ParasShared::CurrentSessionIndex` (`max_values`: Some(1), `max_size`: None, mode: `Measured`)
-	fn set_config_with_executor_params() -> Weight {
-		// Proof Size summary in bytes:
-		//  Measured:  `127`
-		//  Estimated: `1612`
-		// Minimum execution time: 9_937_000 picoseconds.
-		Weight::from_parts(10_445_000, 0)
-			.saturating_add(Weight::from_parts(0, 1612))
-			.saturating_add(T::DbWeight::get().reads(3))
-			.saturating_add(T::DbWeight::get().writes(1))
-	}
-	/// Storage: `Configuration::PendingConfigs` (r:1 w:1)
-	/// Proof: `Configuration::PendingConfigs` (`max_values`: Some(1), `max_size`: None, mode: `Measured`)
-	/// Storage: `Configuration::BypassConsistencyCheck` (r:1 w:0)
-	/// Proof: `Configuration::BypassConsistencyCheck` (`max_values`: Some(1), `max_size`: None, mode: `Measured`)
-	/// Storage: `ParasShared::CurrentSessionIndex` (r:1 w:0)
-	/// Proof: `ParasShared::CurrentSessionIndex` (`max_values`: Some(1), `max_size`: None, mode: `Measured`)
-	fn set_config_with_perbill() -> Weight {
-		// Proof Size summary in bytes:
-		//  Measured:  `127`
-		//  Estimated: `1612`
-		// Minimum execution time: 9_106_000 picoseconds.
-		Weight::from_parts(9_645_000, 0)
-			.saturating_add(Weight::from_parts(0, 1612))
-			.saturating_add(T::DbWeight::get().reads(3))
-			.saturating_add(T::DbWeight::get().writes(1))
-	}
-}
diff --git a/polkadot/runtime/kusama/src/weights/runtime_parachains_disputes.rs b/polkadot/runtime/kusama/src/weights/runtime_parachains_disputes.rs
deleted file mode 100644
index be78e3ac86b6ac2475df11c85d5afba9e5df396b..0000000000000000000000000000000000000000
--- a/polkadot/runtime/kusama/src/weights/runtime_parachains_disputes.rs
+++ /dev/null
@@ -1,64 +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/>.
-
-//! Autogenerated weights for `runtime_parachains::disputes`
-//!
-//! THIS FILE WAS AUTO-GENERATED USING THE SUBSTRATE BENCHMARK CLI VERSION 4.0.0-dev
-//! DATE: 2023-06-19, STEPS: `50`, REPEAT: `20`, LOW RANGE: `[]`, HIGH RANGE: `[]`
-//! WORST CASE MAP SIZE: `1000000`
-//! HOSTNAME: `runner-e8ezs4ez-project-163-concurrent-0`, CPU: `Intel(R) Xeon(R) CPU @ 2.60GHz`
-//! EXECUTION: Some(Wasm), WASM-EXECUTION: Compiled, CHAIN: Some("kusama-dev"), DB CACHE: 1024
-
-// Executed Command:
-// ./target/production/polkadot
-// benchmark
-// pallet
-// --chain=kusama-dev
-// --steps=50
-// --repeat=20
-// --no-storage-info
-// --no-median-slopes
-// --no-min-squares
-// --pallet=runtime_parachains::disputes
-// --extrinsic=*
-// --execution=wasm
-// --wasm-execution=compiled
-// --header=./file_header.txt
-// --output=./runtime/kusama/src/weights/runtime_parachains_disputes.rs
-
-#![cfg_attr(rustfmt, rustfmt_skip)]
-#![allow(unused_parens)]
-#![allow(unused_imports)]
-#![allow(missing_docs)]
-
-use frame_support::{traits::Get, weights::Weight};
-use core::marker::PhantomData;
-
-/// Weight functions for `runtime_parachains::disputes`.
-pub struct WeightInfo<T>(PhantomData<T>);
-impl<T: frame_system::Config> runtime_parachains::disputes::WeightInfo for WeightInfo<T> {
-	/// Storage: ParasDisputes Frozen (r:0 w:1)
-	/// Proof Skipped: ParasDisputes Frozen (max_values: Some(1), max_size: None, mode: Measured)
-	fn force_unfreeze() -> Weight {
-		// Proof Size summary in bytes:
-		//  Measured:  `0`
-		//  Estimated: `0`
-		// Minimum execution time: 2_684_000 picoseconds.
-		Weight::from_parts(2_943_000, 0)
-			.saturating_add(Weight::from_parts(0, 0))
-			.saturating_add(T::DbWeight::get().writes(1))
-	}
-}
diff --git a/polkadot/runtime/kusama/src/weights/runtime_parachains_disputes_slashing.rs b/polkadot/runtime/kusama/src/weights/runtime_parachains_disputes_slashing.rs
deleted file mode 100644
index bcde1ef418d8934df5855ab5331b631e040dda6a..0000000000000000000000000000000000000000
--- a/polkadot/runtime/kusama/src/weights/runtime_parachains_disputes_slashing.rs
+++ /dev/null
@@ -1,101 +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/>.
-
-//! Autogenerated weights for `runtime_parachains::disputes::slashing`
-//!
-//! THIS FILE WAS AUTO-GENERATED USING THE SUBSTRATE BENCHMARK CLI VERSION 4.0.0-dev
-//! DATE: 2023-06-19, STEPS: `50`, REPEAT: `20`, LOW RANGE: `[]`, HIGH RANGE: `[]`
-//! WORST CASE MAP SIZE: `1000000`
-//! HOSTNAME: `runner-e8ezs4ez-project-163-concurrent-0`, CPU: `Intel(R) Xeon(R) CPU @ 2.60GHz`
-//! EXECUTION: Some(Wasm), WASM-EXECUTION: Compiled, CHAIN: Some("kusama-dev"), DB CACHE: 1024
-
-// Executed Command:
-// ./target/production/polkadot
-// benchmark
-// pallet
-// --chain=kusama-dev
-// --steps=50
-// --repeat=20
-// --no-storage-info
-// --no-median-slopes
-// --no-min-squares
-// --pallet=runtime_parachains::disputes::slashing
-// --extrinsic=*
-// --execution=wasm
-// --wasm-execution=compiled
-// --header=./file_header.txt
-// --output=./runtime/kusama/src/weights/runtime_parachains_disputes_slashing.rs
-
-#![cfg_attr(rustfmt, rustfmt_skip)]
-#![allow(unused_parens)]
-#![allow(unused_imports)]
-#![allow(missing_docs)]
-
-use frame_support::{traits::Get, weights::Weight};
-use core::marker::PhantomData;
-
-/// Weight functions for `runtime_parachains::disputes::slashing`.
-pub struct WeightInfo<T>(PhantomData<T>);
-impl<T: frame_system::Config> runtime_parachains::disputes::slashing::WeightInfo for WeightInfo<T> {
-	/// Storage: Session CurrentIndex (r:1 w:0)
-	/// Proof Skipped: Session CurrentIndex (max_values: Some(1), max_size: None, mode: Measured)
-	/// Storage: Historical HistoricalSessions (r:1 w:0)
-	/// Proof: Historical HistoricalSessions (max_values: None, max_size: Some(48), added: 2523, mode: MaxEncodedLen)
-	/// Storage: ParasSlashing UnappliedSlashes (r:1 w:1)
-	/// Proof Skipped: ParasSlashing UnappliedSlashes (max_values: None, max_size: None, mode: Measured)
-	/// Storage: Offences ConcurrentReportsIndex (r:1 w:1)
-	/// Proof Skipped: Offences ConcurrentReportsIndex (max_values: None, max_size: None, mode: Measured)
-	/// Storage: Offences Reports (r:1 w:1)
-	/// Proof Skipped: Offences Reports (max_values: None, max_size: None, mode: Measured)
-	/// Storage: Staking SlashRewardFraction (r:1 w:0)
-	/// Proof: Staking SlashRewardFraction (max_values: Some(1), max_size: Some(4), added: 499, mode: MaxEncodedLen)
-	/// Storage: Staking ActiveEra (r:1 w:0)
-	/// Proof: Staking ActiveEra (max_values: Some(1), max_size: Some(13), added: 508, mode: MaxEncodedLen)
-	/// Storage: Staking ErasStartSessionIndex (r:1 w:0)
-	/// Proof: Staking ErasStartSessionIndex (max_values: None, max_size: Some(16), added: 2491, mode: MaxEncodedLen)
-	/// Storage: Staking Invulnerables (r:1 w:0)
-	/// Proof Skipped: Staking Invulnerables (max_values: Some(1), max_size: None, mode: Measured)
-	/// Storage: Staking ValidatorSlashInEra (r:1 w:1)
-	/// Proof: Staking ValidatorSlashInEra (max_values: None, max_size: Some(72), added: 2547, mode: MaxEncodedLen)
-	/// Storage: Staking SlashingSpans (r:1 w:1)
-	/// Proof Skipped: Staking SlashingSpans (max_values: None, max_size: None, mode: Measured)
-	/// Storage: Staking SpanSlash (r:1 w:1)
-	/// Proof: Staking SpanSlash (max_values: None, max_size: Some(76), added: 2551, mode: MaxEncodedLen)
-	/// Storage: Staking OffendingValidators (r:1 w:1)
-	/// Proof Skipped: Staking OffendingValidators (max_values: Some(1), max_size: None, mode: Measured)
-	/// Storage: Session Validators (r:1 w:0)
-	/// Proof Skipped: Session Validators (max_values: Some(1), max_size: None, mode: Measured)
-	/// Storage: Session DisabledValidators (r:1 w:1)
-	/// Proof Skipped: Session DisabledValidators (max_values: Some(1), max_size: None, mode: Measured)
-	/// Storage: System Digest (r:1 w:1)
-	/// Proof Skipped: System Digest (max_values: Some(1), max_size: None, mode: Measured)
-	/// 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, 1000]`.
-	fn report_dispute_lost(n: u32, ) -> Weight {
-		// Proof Size summary in bytes:
-		//  Measured:  `5325 + n * (184 ±0)`
-		//  Estimated: `8537 + n * (188 ±0)`
-		// Minimum execution time: 117_607_000 picoseconds.
-		Weight::from_parts(165_902_178, 0)
-			.saturating_add(Weight::from_parts(0, 8537))
-			// Standard Error: 3_310
-			.saturating_add(Weight::from_parts(358_233, 0).saturating_mul(n.into()))
-			.saturating_add(T::DbWeight::get().reads(17))
-			.saturating_add(T::DbWeight::get().writes(10))
-			.saturating_add(Weight::from_parts(0, 188).saturating_mul(n.into()))
-	}
-}
diff --git a/polkadot/runtime/kusama/src/weights/runtime_parachains_hrmp.rs b/polkadot/runtime/kusama/src/weights/runtime_parachains_hrmp.rs
deleted file mode 100644
index c13a8413e4102ac4fbedb64fab0c92fcb6dcf247..0000000000000000000000000000000000000000
--- a/polkadot/runtime/kusama/src/weights/runtime_parachains_hrmp.rs
+++ /dev/null
@@ -1,285 +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/>.
-
-//! Autogenerated weights for `runtime_parachains::hrmp`
-//!
-//! THIS FILE WAS AUTO-GENERATED USING THE SUBSTRATE BENCHMARK CLI VERSION 4.0.0-dev
-//! DATE: 2023-06-19, STEPS: `50`, REPEAT: `20`, LOW RANGE: `[]`, HIGH RANGE: `[]`
-//! WORST CASE MAP SIZE: `1000000`
-//! HOSTNAME: `runner-e8ezs4ez-project-163-concurrent-0`, CPU: `Intel(R) Xeon(R) CPU @ 2.60GHz`
-//! EXECUTION: Some(Wasm), WASM-EXECUTION: Compiled, CHAIN: Some("kusama-dev"), DB CACHE: 1024
-
-// Executed Command:
-// ./target/production/polkadot
-// benchmark
-// pallet
-// --chain=kusama-dev
-// --steps=50
-// --repeat=20
-// --no-storage-info
-// --no-median-slopes
-// --no-min-squares
-// --pallet=runtime_parachains::hrmp
-// --extrinsic=*
-// --execution=wasm
-// --wasm-execution=compiled
-// --header=./file_header.txt
-// --output=./runtime/kusama/src/weights/runtime_parachains_hrmp.rs
-
-#![cfg_attr(rustfmt, rustfmt_skip)]
-#![allow(unused_parens)]
-#![allow(unused_imports)]
-#![allow(missing_docs)]
-
-use frame_support::{traits::Get, weights::Weight};
-use core::marker::PhantomData;
-
-/// Weight functions for `runtime_parachains::hrmp`.
-pub struct WeightInfo<T>(PhantomData<T>);
-impl<T: frame_system::Config> runtime_parachains::hrmp::WeightInfo for WeightInfo<T> {
-	/// Storage: Paras ParaLifecycles (r:2 w:0)
-	/// Proof Skipped: Paras ParaLifecycles (max_values: None, max_size: None, mode: Measured)
-	/// Storage: Hrmp HrmpOpenChannelRequests (r:1 w:1)
-	/// Proof Skipped: Hrmp HrmpOpenChannelRequests (max_values: None, max_size: None, mode: Measured)
-	/// Storage: Hrmp HrmpChannels (r:1 w:0)
-	/// Proof Skipped: Hrmp HrmpChannels (max_values: None, max_size: None, mode: Measured)
-	/// Storage: Hrmp HrmpEgressChannelsIndex (r:1 w:0)
-	/// Proof Skipped: Hrmp HrmpEgressChannelsIndex (max_values: None, max_size: None, mode: Measured)
-	/// Storage: Hrmp HrmpOpenChannelRequestCount (r:1 w:1)
-	/// Proof Skipped: Hrmp HrmpOpenChannelRequestCount (max_values: None, max_size: None, mode: Measured)
-	/// Storage: Hrmp HrmpOpenChannelRequestsList (r:1 w:1)
-	/// Proof Skipped: Hrmp HrmpOpenChannelRequestsList (max_values: Some(1), max_size: None, mode: Measured)
-	/// Storage: Dmp DownwardMessageQueues (r:1 w:1)
-	/// Proof Skipped: Dmp DownwardMessageQueues (max_values: None, max_size: None, mode: Measured)
-	/// Storage: Dmp DownwardMessageQueueHeads (r:1 w:1)
-	/// Proof Skipped: Dmp DownwardMessageQueueHeads (max_values: None, max_size: None, mode: Measured)
-	fn hrmp_init_open_channel() -> Weight {
-		// Proof Size summary in bytes:
-		//  Measured:  `350`
-		//  Estimated: `6290`
-		// Minimum execution time: 37_901_000 picoseconds.
-		Weight::from_parts(38_728_000, 0)
-			.saturating_add(Weight::from_parts(0, 6290))
-			.saturating_add(T::DbWeight::get().reads(9))
-			.saturating_add(T::DbWeight::get().writes(5))
-	}
-	/// Storage: Hrmp HrmpOpenChannelRequests (r:1 w:1)
-	/// Proof Skipped: Hrmp HrmpOpenChannelRequests (max_values: None, max_size: None, mode: Measured)
-	/// Storage: Paras ParaLifecycles (r:1 w:0)
-	/// Proof Skipped: Paras ParaLifecycles (max_values: None, max_size: None, mode: Measured)
-	/// Storage: Hrmp HrmpIngressChannelsIndex (r:1 w:0)
-	/// Proof Skipped: Hrmp HrmpIngressChannelsIndex (max_values: None, max_size: None, mode: Measured)
-	/// Storage: Hrmp HrmpAcceptedChannelRequestCount (r:1 w:1)
-	/// Proof Skipped: Hrmp HrmpAcceptedChannelRequestCount (max_values: None, max_size: None, mode: Measured)
-	/// Storage: Dmp DownwardMessageQueues (r:1 w:1)
-	/// Proof Skipped: Dmp DownwardMessageQueues (max_values: None, max_size: None, mode: Measured)
-	/// Storage: Dmp DownwardMessageQueueHeads (r:1 w:1)
-	/// Proof Skipped: Dmp DownwardMessageQueueHeads (max_values: None, max_size: None, mode: Measured)
-	fn hrmp_accept_open_channel() -> Weight {
-		// Proof Size summary in bytes:
-		//  Measured:  `582`
-		//  Estimated: `4047`
-		// Minimum execution time: 37_634_000 picoseconds.
-		Weight::from_parts(38_332_000, 0)
-			.saturating_add(Weight::from_parts(0, 4047))
-			.saturating_add(T::DbWeight::get().reads(6))
-			.saturating_add(T::DbWeight::get().writes(4))
-	}
-	/// Storage: Hrmp HrmpChannels (r:1 w:0)
-	/// Proof Skipped: Hrmp HrmpChannels (max_values: None, max_size: None, mode: Measured)
-	/// Storage: Hrmp HrmpCloseChannelRequests (r:1 w:1)
-	/// Proof Skipped: Hrmp HrmpCloseChannelRequests (max_values: None, max_size: None, mode: Measured)
-	/// Storage: Hrmp HrmpCloseChannelRequestsList (r:1 w:1)
-	/// Proof Skipped: Hrmp HrmpCloseChannelRequestsList (max_values: Some(1), max_size: None, mode: Measured)
-	/// Storage: Dmp DownwardMessageQueues (r:1 w:1)
-	/// Proof Skipped: Dmp DownwardMessageQueues (max_values: None, max_size: None, mode: Measured)
-	/// Storage: Dmp DownwardMessageQueueHeads (r:1 w:1)
-	/// Proof Skipped: Dmp DownwardMessageQueueHeads (max_values: None, max_size: None, mode: Measured)
-	fn hrmp_close_channel() -> Weight {
-		// Proof Size summary in bytes:
-		//  Measured:  `453`
-		//  Estimated: `3918`
-		// Minimum execution time: 33_719_000 picoseconds.
-		Weight::from_parts(34_342_000, 0)
-			.saturating_add(Weight::from_parts(0, 3918))
-			.saturating_add(T::DbWeight::get().reads(5))
-			.saturating_add(T::DbWeight::get().writes(4))
-	}
-	/// Storage: Hrmp HrmpIngressChannelsIndex (r:128 w:128)
-	/// Proof Skipped: Hrmp HrmpIngressChannelsIndex (max_values: None, max_size: None, mode: Measured)
-	/// Storage: Hrmp HrmpEgressChannelsIndex (r:128 w:128)
-	/// Proof Skipped: Hrmp HrmpEgressChannelsIndex (max_values: None, max_size: None, mode: Measured)
-	/// Storage: Hrmp HrmpChannels (r:254 w:254)
-	/// Proof Skipped: Hrmp HrmpChannels (max_values: None, max_size: None, mode: Measured)
-	/// Storage: Hrmp HrmpAcceptedChannelRequestCount (r:0 w:1)
-	/// Proof Skipped: Hrmp HrmpAcceptedChannelRequestCount (max_values: None, max_size: None, mode: Measured)
-	/// Storage: Hrmp HrmpChannelContents (r:0 w:254)
-	/// Proof Skipped: Hrmp HrmpChannelContents (max_values: None, max_size: None, mode: Measured)
-	/// Storage: Hrmp HrmpOpenChannelRequestCount (r:0 w:1)
-	/// Proof Skipped: Hrmp HrmpOpenChannelRequestCount (max_values: None, max_size: None, mode: Measured)
-	/// The range of component `i` is `[0, 127]`.
-	/// The range of component `e` is `[0, 127]`.
-	fn force_clean_hrmp(i: u32, e: u32, ) -> Weight {
-		// Proof Size summary in bytes:
-		//  Measured:  `197 + e * (100 ±0) + i * (100 ±0)`
-		//  Estimated: `3659 + e * (2575 ±0) + i * (2575 ±0)`
-		// Minimum execution time: 1_267_013_000 picoseconds.
-		Weight::from_parts(1_283_708_000, 0)
-			.saturating_add(Weight::from_parts(0, 3659))
-			// Standard Error: 118_117
-			.saturating_add(Weight::from_parts(3_722_255, 0).saturating_mul(i.into()))
-			// Standard Error: 118_117
-			.saturating_add(Weight::from_parts(3_701_842, 0).saturating_mul(e.into()))
-			.saturating_add(T::DbWeight::get().reads(2))
-			.saturating_add(T::DbWeight::get().reads((2_u64).saturating_mul(i.into())))
-			.saturating_add(T::DbWeight::get().reads((2_u64).saturating_mul(e.into())))
-			.saturating_add(T::DbWeight::get().writes(4))
-			.saturating_add(T::DbWeight::get().writes((3_u64).saturating_mul(i.into())))
-			.saturating_add(T::DbWeight::get().writes((3_u64).saturating_mul(e.into())))
-			.saturating_add(Weight::from_parts(0, 2575).saturating_mul(e.into()))
-			.saturating_add(Weight::from_parts(0, 2575).saturating_mul(i.into()))
-	}
-	/// Storage: Hrmp HrmpOpenChannelRequestsList (r:1 w:1)
-	/// Proof Skipped: Hrmp HrmpOpenChannelRequestsList (max_values: Some(1), max_size: None, mode: Measured)
-	/// Storage: Hrmp HrmpOpenChannelRequests (r:128 w:128)
-	/// Proof Skipped: Hrmp HrmpOpenChannelRequests (max_values: None, max_size: None, mode: Measured)
-	/// Storage: Paras ParaLifecycles (r:256 w:0)
-	/// Proof Skipped: Paras ParaLifecycles (max_values: None, max_size: None, mode: Measured)
-	/// Storage: Hrmp HrmpIngressChannelsIndex (r:128 w:128)
-	/// Proof Skipped: Hrmp HrmpIngressChannelsIndex (max_values: None, max_size: None, mode: Measured)
-	/// Storage: Hrmp HrmpEgressChannelsIndex (r:128 w:128)
-	/// Proof Skipped: Hrmp HrmpEgressChannelsIndex (max_values: None, max_size: None, mode: Measured)
-	/// Storage: Hrmp HrmpOpenChannelRequestCount (r:128 w:128)
-	/// Proof Skipped: Hrmp HrmpOpenChannelRequestCount (max_values: None, max_size: None, mode: Measured)
-	/// Storage: Hrmp HrmpAcceptedChannelRequestCount (r:128 w:128)
-	/// Proof Skipped: Hrmp HrmpAcceptedChannelRequestCount (max_values: None, max_size: None, mode: Measured)
-	/// Storage: Hrmp HrmpChannels (r:0 w:128)
-	/// Proof Skipped: Hrmp HrmpChannels (max_values: None, max_size: None, mode: Measured)
-	/// The range of component `c` is `[0, 128]`.
-	fn force_process_hrmp_open(c: u32, ) -> Weight {
-		// Proof Size summary in bytes:
-		//  Measured:  `425 + c * (136 ±0)`
-		//  Estimated: `1880 + c * (5086 ±0)`
-		// Minimum execution time: 6_798_000 picoseconds.
-		Weight::from_parts(6_921_000, 0)
-			.saturating_add(Weight::from_parts(0, 1880))
-			// Standard Error: 12_517
-			.saturating_add(Weight::from_parts(21_683_294, 0).saturating_mul(c.into()))
-			.saturating_add(T::DbWeight::get().reads(1))
-			.saturating_add(T::DbWeight::get().reads((7_u64).saturating_mul(c.into())))
-			.saturating_add(T::DbWeight::get().writes(1))
-			.saturating_add(T::DbWeight::get().writes((6_u64).saturating_mul(c.into())))
-			.saturating_add(Weight::from_parts(0, 5086).saturating_mul(c.into()))
-	}
-	/// Storage: Hrmp HrmpCloseChannelRequestsList (r:1 w:1)
-	/// Proof Skipped: Hrmp HrmpCloseChannelRequestsList (max_values: Some(1), max_size: None, mode: Measured)
-	/// Storage: Hrmp HrmpChannels (r:128 w:128)
-	/// Proof Skipped: Hrmp HrmpChannels (max_values: None, max_size: None, mode: Measured)
-	/// Storage: Hrmp HrmpEgressChannelsIndex (r:128 w:128)
-	/// Proof Skipped: Hrmp HrmpEgressChannelsIndex (max_values: None, max_size: None, mode: Measured)
-	/// Storage: Hrmp HrmpIngressChannelsIndex (r:128 w:128)
-	/// Proof Skipped: Hrmp HrmpIngressChannelsIndex (max_values: None, max_size: None, mode: Measured)
-	/// Storage: Hrmp HrmpCloseChannelRequests (r:0 w:128)
-	/// Proof Skipped: Hrmp HrmpCloseChannelRequests (max_values: None, max_size: None, mode: Measured)
-	/// Storage: Hrmp HrmpChannelContents (r:0 w:128)
-	/// Proof Skipped: Hrmp HrmpChannelContents (max_values: None, max_size: None, mode: Measured)
-	/// The range of component `c` is `[0, 128]`.
-	fn force_process_hrmp_close(c: u32, ) -> Weight {
-		// Proof Size summary in bytes:
-		//  Measured:  `268 + c * (124 ±0)`
-		//  Estimated: `1728 + c * (2600 ±0)`
-		// Minimum execution time: 5_695_000 picoseconds.
-		Weight::from_parts(5_776_000, 0)
-			.saturating_add(Weight::from_parts(0, 1728))
-			// Standard Error: 11_189
-			.saturating_add(Weight::from_parts(13_477_149, 0).saturating_mul(c.into()))
-			.saturating_add(T::DbWeight::get().reads(1))
-			.saturating_add(T::DbWeight::get().reads((3_u64).saturating_mul(c.into())))
-			.saturating_add(T::DbWeight::get().writes(1))
-			.saturating_add(T::DbWeight::get().writes((5_u64).saturating_mul(c.into())))
-			.saturating_add(Weight::from_parts(0, 2600).saturating_mul(c.into()))
-	}
-	/// Storage: Hrmp HrmpOpenChannelRequestsList (r:1 w:1)
-	/// Proof Skipped: Hrmp HrmpOpenChannelRequestsList (max_values: Some(1), max_size: None, mode: Measured)
-	/// Storage: Hrmp HrmpOpenChannelRequests (r:1 w:1)
-	/// Proof Skipped: Hrmp HrmpOpenChannelRequests (max_values: None, max_size: None, mode: Measured)
-	/// Storage: Hrmp HrmpOpenChannelRequestCount (r:1 w:1)
-	/// Proof Skipped: Hrmp HrmpOpenChannelRequestCount (max_values: None, max_size: None, mode: Measured)
-	/// The range of component `c` is `[0, 128]`.
-	fn hrmp_cancel_open_request(c: u32, ) -> Weight {
-		// Proof Size summary in bytes:
-		//  Measured:  `959 + c * (13 ±0)`
-		//  Estimated: `4228 + c * (15 ±0)`
-		// Minimum execution time: 21_141_000 picoseconds.
-		Weight::from_parts(29_731_969, 0)
-			.saturating_add(Weight::from_parts(0, 4228))
-			// Standard Error: 3_263
-			.saturating_add(Weight::from_parts(198_283, 0).saturating_mul(c.into()))
-			.saturating_add(T::DbWeight::get().reads(3))
-			.saturating_add(T::DbWeight::get().writes(3))
-			.saturating_add(Weight::from_parts(0, 15).saturating_mul(c.into()))
-	}
-	/// Storage: Hrmp HrmpOpenChannelRequestsList (r:1 w:1)
-	/// Proof Skipped: Hrmp HrmpOpenChannelRequestsList (max_values: Some(1), max_size: None, mode: Measured)
-	/// Storage: Hrmp HrmpOpenChannelRequests (r:128 w:128)
-	/// Proof Skipped: Hrmp HrmpOpenChannelRequests (max_values: None, max_size: None, mode: Measured)
-	/// The range of component `c` is `[0, 128]`.
-	fn clean_open_channel_requests(c: u32, ) -> Weight {
-		// Proof Size summary in bytes:
-		//  Measured:  `176 + c * (63 ±0)`
-		//  Estimated: `1655 + c * (2538 ±0)`
-		// Minimum execution time: 4_573_000 picoseconds.
-		Weight::from_parts(5_593_572, 0)
-			.saturating_add(Weight::from_parts(0, 1655))
-			// Standard Error: 4_134
-			.saturating_add(Weight::from_parts(3_565_821, 0).saturating_mul(c.into()))
-			.saturating_add(T::DbWeight::get().reads(1))
-			.saturating_add(T::DbWeight::get().reads((1_u64).saturating_mul(c.into())))
-			.saturating_add(T::DbWeight::get().writes(1))
-			.saturating_add(T::DbWeight::get().writes((1_u64).saturating_mul(c.into())))
-			.saturating_add(Weight::from_parts(0, 2538).saturating_mul(c.into()))
-	}
-	/// Storage: Paras ParaLifecycles (r:2 w:0)
-	/// Proof Skipped: Paras ParaLifecycles (max_values: None, max_size: None, mode: Measured)
-	/// Storage: Hrmp HrmpOpenChannelRequests (r:1 w:1)
-	/// Proof Skipped: Hrmp HrmpOpenChannelRequests (max_values: None, max_size: None, mode: Measured)
-	/// Storage: Hrmp HrmpChannels (r:1 w:0)
-	/// Proof Skipped: Hrmp HrmpChannels (max_values: None, max_size: None, mode: Measured)
-	/// Storage: Hrmp HrmpEgressChannelsIndex (r:1 w:0)
-	/// Proof Skipped: Hrmp HrmpEgressChannelsIndex (max_values: None, max_size: None, mode: Measured)
-	/// Storage: Hrmp HrmpOpenChannelRequestCount (r:1 w:1)
-	/// Proof Skipped: Hrmp HrmpOpenChannelRequestCount (max_values: None, max_size: None, mode: Measured)
-	/// Storage: Hrmp HrmpOpenChannelRequestsList (r:1 w:1)
-	/// Proof Skipped: Hrmp HrmpOpenChannelRequestsList (max_values: Some(1), max_size: None, mode: Measured)
-	/// Storage: Dmp DownwardMessageQueues (r:2 w:2)
-	/// Proof Skipped: Dmp DownwardMessageQueues (max_values: None, max_size: None, mode: Measured)
-	/// Storage: Dmp DownwardMessageQueueHeads (r:2 w:2)
-	/// Proof Skipped: Dmp DownwardMessageQueueHeads (max_values: None, max_size: None, mode: Measured)
-	/// Storage: Hrmp HrmpIngressChannelsIndex (r:1 w:0)
-	/// Proof Skipped: Hrmp HrmpIngressChannelsIndex (max_values: None, max_size: None, mode: Measured)
-	/// Storage: Hrmp HrmpAcceptedChannelRequestCount (r:1 w:1)
-	/// Proof Skipped: Hrmp HrmpAcceptedChannelRequestCount (max_values: None, max_size: None, mode: Measured)
-	fn force_open_hrmp_channel(_c: u32, ) -> Weight {
-		// Proof Size summary in bytes:
-		//  Measured:  `350`
-		//  Estimated: `6290`
-		// Minimum execution time: 53_253_000 picoseconds.
-		Weight::from_parts(55_141_000, 0)
-			.saturating_add(Weight::from_parts(0, 6290))
-			.saturating_add(T::DbWeight::get().reads(13))
-			.saturating_add(T::DbWeight::get().writes(8))
-	}
-}
diff --git a/polkadot/runtime/kusama/src/weights/runtime_parachains_inclusion.rs b/polkadot/runtime/kusama/src/weights/runtime_parachains_inclusion.rs
deleted file mode 100644
index 9ca4b2fe2a7e7353dc09bc9b7415c57f2b7807e8..0000000000000000000000000000000000000000
--- a/polkadot/runtime/kusama/src/weights/runtime_parachains_inclusion.rs
+++ /dev/null
@@ -1,75 +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/>.
-
-//! Autogenerated weights for `runtime_parachains::inclusion`
-//!
-//! THIS FILE WAS AUTO-GENERATED USING THE SUBSTRATE BENCHMARK CLI VERSION 4.0.0-dev
-//! DATE: 2023-06-19, STEPS: `50`, REPEAT: `20`, LOW RANGE: `[]`, HIGH RANGE: `[]`
-//! WORST CASE MAP SIZE: `1000000`
-//! HOSTNAME: `runner-e8ezs4ez-project-163-concurrent-0`, CPU: `Intel(R) Xeon(R) CPU @ 2.60GHz`
-//! EXECUTION: Some(Wasm), WASM-EXECUTION: Compiled, CHAIN: Some("kusama-dev"), DB CACHE: 1024
-
-// Executed Command:
-// ./target/production/polkadot
-// benchmark
-// pallet
-// --chain=kusama-dev
-// --steps=50
-// --repeat=20
-// --no-storage-info
-// --no-median-slopes
-// --no-min-squares
-// --pallet=runtime_parachains::inclusion
-// --extrinsic=*
-// --execution=wasm
-// --wasm-execution=compiled
-// --header=./file_header.txt
-// --output=./runtime/kusama/src/weights/runtime_parachains_inclusion.rs
-
-#![cfg_attr(rustfmt, rustfmt_skip)]
-#![allow(unused_parens)]
-#![allow(unused_imports)]
-#![allow(missing_docs)]
-
-use frame_support::{traits::Get, weights::Weight};
-use core::marker::PhantomData;
-
-/// Weight functions for `runtime_parachains::inclusion`.
-pub struct WeightInfo<T>(PhantomData<T>);
-impl<T: frame_system::Config> runtime_parachains::inclusion::WeightInfo for WeightInfo<T> {
-	/// Storage: MessageQueue BookStateFor (r:1 w:1)
-	/// Proof: MessageQueue BookStateFor (max_values: None, max_size: Some(55), added: 2530, mode: MaxEncodedLen)
-	/// Storage: MessageQueue Pages (r:1 w:999)
-	/// Proof: MessageQueue Pages (max_values: None, max_size: Some(65586), added: 68061, mode: MaxEncodedLen)
-	/// Storage: unknown `0x3a72656c61795f64697370617463685f71756575655f72656d61696e696e675f` (r:0 w:1)
-	/// Proof Skipped: unknown `0x3a72656c61795f64697370617463685f71756575655f72656d61696e696e675f` (r:0 w:1)
-	/// Storage: unknown `0xf5207f03cfdce586301014700e2c2593fad157e461d71fd4c1f936839a5f1f3e` (r:0 w:1)
-	/// Proof Skipped: unknown `0xf5207f03cfdce586301014700e2c2593fad157e461d71fd4c1f936839a5f1f3e` (r:0 w:1)
-	/// The range of component `i` is `[1, 1000]`.
-	fn receive_upward_messages(i: u32, ) -> Weight {
-		// Proof Size summary in bytes:
-		//  Measured:  `65761`
-		//  Estimated: `69051`
-		// Minimum execution time: 119_471_000 picoseconds.
-		Weight::from_parts(120_105_000, 0)
-			.saturating_add(Weight::from_parts(0, 69051))
-			// Standard Error: 42_037
-			.saturating_add(Weight::from_parts(103_436_040, 0).saturating_mul(i.into()))
-			.saturating_add(T::DbWeight::get().reads(2))
-			.saturating_add(T::DbWeight::get().writes(3))
-			.saturating_add(T::DbWeight::get().writes((1_u64).saturating_mul(i.into())))
-	}
-}
diff --git a/polkadot/runtime/kusama/src/weights/runtime_parachains_initializer.rs b/polkadot/runtime/kusama/src/weights/runtime_parachains_initializer.rs
deleted file mode 100644
index 31878846d328126ac41cb71969c8d14a9108d9f4..0000000000000000000000000000000000000000
--- a/polkadot/runtime/kusama/src/weights/runtime_parachains_initializer.rs
+++ /dev/null
@@ -1,69 +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/>.
-
-//! Autogenerated weights for `runtime_parachains::initializer`
-//!
-//! THIS FILE WAS AUTO-GENERATED USING THE SUBSTRATE BENCHMARK CLI VERSION 4.0.0-dev
-//! DATE: 2023-06-19, STEPS: `50`, REPEAT: `20`, LOW RANGE: `[]`, HIGH RANGE: `[]`
-//! WORST CASE MAP SIZE: `1000000`
-//! HOSTNAME: `runner-e8ezs4ez-project-163-concurrent-0`, CPU: `Intel(R) Xeon(R) CPU @ 2.60GHz`
-//! EXECUTION: Some(Wasm), WASM-EXECUTION: Compiled, CHAIN: Some("kusama-dev"), DB CACHE: 1024
-
-// Executed Command:
-// ./target/production/polkadot
-// benchmark
-// pallet
-// --chain=kusama-dev
-// --steps=50
-// --repeat=20
-// --no-storage-info
-// --no-median-slopes
-// --no-min-squares
-// --pallet=runtime_parachains::initializer
-// --extrinsic=*
-// --execution=wasm
-// --wasm-execution=compiled
-// --header=./file_header.txt
-// --output=./runtime/kusama/src/weights/runtime_parachains_initializer.rs
-
-#![cfg_attr(rustfmt, rustfmt_skip)]
-#![allow(unused_parens)]
-#![allow(unused_imports)]
-#![allow(missing_docs)]
-
-use frame_support::{traits::Get, weights::Weight};
-use core::marker::PhantomData;
-
-/// Weight functions for `runtime_parachains::initializer`.
-pub struct WeightInfo<T>(PhantomData<T>);
-impl<T: frame_system::Config> runtime_parachains::initializer::WeightInfo for WeightInfo<T> {
-	/// Storage: System Digest (r:1 w:1)
-	/// Proof Skipped: System Digest (max_values: Some(1), max_size: None, mode: Measured)
-	/// The range of component `d` is `[0, 65536]`.
-	fn force_approve(d: u32, ) -> Weight {
-		// Proof Size summary in bytes:
-		//  Measured:  `0 + d * (11 ±0)`
-		//  Estimated: `1480 + d * (11 ±0)`
-		// Minimum execution time: 3_509_000 picoseconds.
-		Weight::from_parts(3_655_000, 0)
-			.saturating_add(Weight::from_parts(0, 1480))
-			// Standard Error: 15
-			.saturating_add(Weight::from_parts(2_861, 0).saturating_mul(d.into()))
-			.saturating_add(T::DbWeight::get().reads(1))
-			.saturating_add(T::DbWeight::get().writes(1))
-			.saturating_add(Weight::from_parts(0, 11).saturating_mul(d.into()))
-	}
-}
diff --git a/polkadot/runtime/kusama/src/weights/runtime_parachains_paras.rs b/polkadot/runtime/kusama/src/weights/runtime_parachains_paras.rs
deleted file mode 100644
index 9e66592fbdfab1520b0267f4fbbeb6bde5809d22..0000000000000000000000000000000000000000
--- a/polkadot/runtime/kusama/src/weights/runtime_parachains_paras.rs
+++ /dev/null
@@ -1,289 +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/>.
-
-//! Autogenerated weights for `runtime_parachains::paras`
-//!
-//! THIS FILE WAS AUTO-GENERATED USING THE SUBSTRATE BENCHMARK CLI VERSION 4.0.0-dev
-//! DATE: 2023-06-19, STEPS: `50`, REPEAT: `20`, LOW RANGE: `[]`, HIGH RANGE: `[]`
-//! WORST CASE MAP SIZE: `1000000`
-//! HOSTNAME: `runner-e8ezs4ez-project-163-concurrent-0`, CPU: `Intel(R) Xeon(R) CPU @ 2.60GHz`
-//! EXECUTION: Some(Wasm), WASM-EXECUTION: Compiled, CHAIN: Some("kusama-dev"), DB CACHE: 1024
-
-// Executed Command:
-// ./target/production/polkadot
-// benchmark
-// pallet
-// --chain=kusama-dev
-// --steps=50
-// --repeat=20
-// --no-storage-info
-// --no-median-slopes
-// --no-min-squares
-// --pallet=runtime_parachains::paras
-// --extrinsic=*
-// --execution=wasm
-// --wasm-execution=compiled
-// --header=./file_header.txt
-// --output=./runtime/kusama/src/weights/runtime_parachains_paras.rs
-
-#![cfg_attr(rustfmt, rustfmt_skip)]
-#![allow(unused_parens)]
-#![allow(unused_imports)]
-#![allow(missing_docs)]
-
-use frame_support::{traits::Get, weights::Weight};
-use core::marker::PhantomData;
-
-/// Weight functions for `runtime_parachains::paras`.
-pub struct WeightInfo<T>(PhantomData<T>);
-impl<T: frame_system::Config> runtime_parachains::paras::WeightInfo for WeightInfo<T> {
-	/// Storage: Paras CurrentCodeHash (r:1 w:1)
-	/// Proof Skipped: Paras CurrentCodeHash (max_values: None, max_size: None, mode: Measured)
-	/// Storage: Paras CodeByHashRefs (r:1 w:1)
-	/// Proof Skipped: Paras CodeByHashRefs (max_values: None, max_size: None, mode: Measured)
-	/// Storage: Paras PastCodeMeta (r:1 w:1)
-	/// Proof Skipped: Paras PastCodeMeta (max_values: None, max_size: None, mode: Measured)
-	/// Storage: Paras PastCodePruning (r:1 w:1)
-	/// Proof Skipped: Paras PastCodePruning (max_values: Some(1), max_size: None, mode: Measured)
-	/// Storage: Paras PastCodeHash (r:0 w:1)
-	/// Proof Skipped: Paras PastCodeHash (max_values: None, max_size: None, mode: Measured)
-	/// Storage: Paras CodeByHash (r:0 w:1)
-	/// Proof Skipped: Paras CodeByHash (max_values: None, max_size: None, mode: Measured)
-	/// The range of component `c` is `[1, 3145728]`.
-	fn force_set_current_code(c: u32, ) -> Weight {
-		// Proof Size summary in bytes:
-		//  Measured:  `8309`
-		//  Estimated: `11774`
-		// Minimum execution time: 33_015_000 picoseconds.
-		Weight::from_parts(33_678_000, 0)
-			.saturating_add(Weight::from_parts(0, 11774))
-			// Standard Error: 5
-			.saturating_add(Weight::from_parts(2_417, 0).saturating_mul(c.into()))
-			.saturating_add(T::DbWeight::get().reads(4))
-			.saturating_add(T::DbWeight::get().writes(6))
-	}
-	/// Storage: Paras Heads (r:0 w:1)
-	/// Proof Skipped: Paras Heads (max_values: None, max_size: None, mode: Measured)
-	/// The range of component `s` is `[1, 1048576]`.
-	fn force_set_current_head(s: u32, ) -> Weight {
-		// Proof Size summary in bytes:
-		//  Measured:  `0`
-		//  Estimated: `0`
-		// Minimum execution time: 8_308_000 picoseconds.
-		Weight::from_parts(8_473_000, 0)
-			.saturating_add(Weight::from_parts(0, 0))
-			// Standard Error: 1
-			.saturating_add(Weight::from_parts(992, 0).saturating_mul(s.into()))
-			.saturating_add(T::DbWeight::get().writes(1))
-	}
-	// Storage: Paras Heads (r:0 w:1)
-	fn force_set_most_recent_context() -> Weight {
-		Weight::from_parts(10_155_000, 0)
-			// Standard Error: 0
-			.saturating_add(T::DbWeight::get().writes(1 as u64))
-	}
-	/// Storage: Paras FutureCodeHash (r:1 w:1)
-	/// Proof Skipped: Paras FutureCodeHash (max_values: None, max_size: None, mode: Measured)
-	/// Storage: Paras CurrentCodeHash (r:1 w:0)
-	/// Proof Skipped: Paras CurrentCodeHash (max_values: None, max_size: None, mode: Measured)
-	/// Storage: Paras UpgradeCooldowns (r:1 w:1)
-	/// Proof Skipped: Paras UpgradeCooldowns (max_values: Some(1), max_size: None, mode: Measured)
-	/// Storage: Paras PvfActiveVoteMap (r:1 w:1)
-	/// Proof Skipped: Paras PvfActiveVoteMap (max_values: None, max_size: None, mode: Measured)
-	/// Storage: Paras CodeByHash (r:1 w:1)
-	/// Proof Skipped: Paras CodeByHash (max_values: None, max_size: None, mode: Measured)
-	/// Storage: ParasShared ActiveValidatorKeys (r:1 w:0)
-	/// Proof Skipped: ParasShared ActiveValidatorKeys (max_values: Some(1), max_size: None, mode: Measured)
-	/// Storage: Paras PvfActiveVoteList (r:1 w:1)
-	/// Proof Skipped: Paras PvfActiveVoteList (max_values: Some(1), max_size: None, mode: Measured)
-	/// Storage: Paras CodeByHashRefs (r:1 w:1)
-	/// Proof Skipped: Paras CodeByHashRefs (max_values: None, max_size: None, mode: Measured)
-	/// Storage: Paras UpgradeRestrictionSignal (r:0 w:1)
-	/// Proof Skipped: Paras UpgradeRestrictionSignal (max_values: None, max_size: None, mode: Measured)
-	/// The range of component `c` is `[1, 3145728]`.
-	fn force_schedule_code_upgrade(c: u32, ) -> Weight {
-		// Proof Size summary in bytes:
-		//  Measured:  `8428`
-		//  Estimated: `11893`
-		// Minimum execution time: 49_058_000 picoseconds.
-		Weight::from_parts(49_768_000, 0)
-			.saturating_add(Weight::from_parts(0, 11893))
-			// Standard Error: 7
-			.saturating_add(Weight::from_parts(2_541, 0).saturating_mul(c.into()))
-			.saturating_add(T::DbWeight::get().reads(8))
-			.saturating_add(T::DbWeight::get().writes(7))
-	}
-	/// Storage: Paras FutureCodeUpgrades (r:1 w:0)
-	/// Proof Skipped: Paras FutureCodeUpgrades (max_values: None, max_size: None, mode: Measured)
-	/// Storage: Paras Heads (r:0 w:1)
-	/// Proof Skipped: Paras Heads (max_values: None, max_size: None, mode: Measured)
-	/// Storage: Paras UpgradeGoAheadSignal (r:0 w:1)
-	/// Proof Skipped: Paras UpgradeGoAheadSignal (max_values: None, max_size: None, mode: Measured)
-	/// The range of component `s` is `[1, 1048576]`.
-	fn force_note_new_head(s: u32, ) -> Weight {
-		// Proof Size summary in bytes:
-		//  Measured:  `95`
-		//  Estimated: `3560`
-		// Minimum execution time: 13_559_000 picoseconds.
-		Weight::from_parts(13_774_000, 0)
-			.saturating_add(Weight::from_parts(0, 3560))
-			// Standard Error: 4
-			.saturating_add(Weight::from_parts(1_082, 0).saturating_mul(s.into()))
-			.saturating_add(T::DbWeight::get().reads(1))
-			.saturating_add(T::DbWeight::get().writes(2))
-	}
-	/// Storage: ParasShared CurrentSessionIndex (r:1 w:0)
-	/// Proof Skipped: ParasShared CurrentSessionIndex (max_values: Some(1), max_size: None, mode: Measured)
-	/// Storage: Paras ActionsQueue (r:1 w:1)
-	/// Proof Skipped: Paras ActionsQueue (max_values: None, max_size: None, mode: Measured)
-	fn force_queue_action() -> Weight {
-		// Proof Size summary in bytes:
-		//  Measured:  `4288`
-		//  Estimated: `7753`
-		// Minimum execution time: 20_213_000 picoseconds.
-		Weight::from_parts(20_576_000, 0)
-			.saturating_add(Weight::from_parts(0, 7753))
-			.saturating_add(T::DbWeight::get().reads(2))
-			.saturating_add(T::DbWeight::get().writes(1))
-	}
-	/// Storage: Paras PvfActiveVoteMap (r:1 w:1)
-	/// Proof Skipped: Paras PvfActiveVoteMap (max_values: None, max_size: None, mode: Measured)
-	/// Storage: Paras PvfActiveVoteList (r:1 w:1)
-	/// Proof Skipped: Paras PvfActiveVoteList (max_values: Some(1), max_size: None, mode: Measured)
-	/// Storage: ParasShared CurrentSessionIndex (r:1 w:0)
-	/// Proof Skipped: ParasShared CurrentSessionIndex (max_values: Some(1), max_size: None, mode: Measured)
-	/// Storage: Paras ActionsQueue (r:1 w:1)
-	/// Proof Skipped: Paras ActionsQueue (max_values: None, max_size: None, mode: Measured)
-	/// The range of component `c` is `[1, 3145728]`.
-	fn add_trusted_validation_code(c: u32, ) -> Weight {
-		// Proof Size summary in bytes:
-		//  Measured:  `659`
-		//  Estimated: `4124`
-		// Minimum execution time: 99_127_000 picoseconds.
-		Weight::from_parts(82_909_137, 0)
-			.saturating_add(Weight::from_parts(0, 4124))
-			// Standard Error: 4
-			.saturating_add(Weight::from_parts(1_848, 0).saturating_mul(c.into()))
-			.saturating_add(T::DbWeight::get().reads(4))
-			.saturating_add(T::DbWeight::get().writes(3))
-	}
-	/// Storage: Paras CodeByHashRefs (r:1 w:0)
-	/// Proof Skipped: Paras CodeByHashRefs (max_values: None, max_size: None, mode: Measured)
-	/// Storage: Paras CodeByHash (r:0 w:1)
-	/// Proof Skipped: Paras CodeByHash (max_values: None, max_size: None, mode: Measured)
-	fn poke_unused_validation_code() -> Weight {
-		// Proof Size summary in bytes:
-		//  Measured:  `28`
-		//  Estimated: `3493`
-		// Minimum execution time: 5_816_000 picoseconds.
-		Weight::from_parts(6_139_000, 0)
-			.saturating_add(Weight::from_parts(0, 3493))
-			.saturating_add(T::DbWeight::get().reads(1))
-			.saturating_add(T::DbWeight::get().writes(1))
-	}
-	/// Storage: ParasShared ActiveValidatorKeys (r:1 w:0)
-	/// Proof Skipped: ParasShared ActiveValidatorKeys (max_values: Some(1), max_size: None, mode: Measured)
-	/// Storage: ParasShared CurrentSessionIndex (r:1 w:0)
-	/// Proof Skipped: ParasShared CurrentSessionIndex (max_values: Some(1), max_size: None, mode: Measured)
-	/// Storage: Paras PvfActiveVoteMap (r:1 w:1)
-	/// Proof Skipped: Paras PvfActiveVoteMap (max_values: None, max_size: None, mode: Measured)
-	fn include_pvf_check_statement() -> Weight {
-		// Proof Size summary in bytes:
-		//  Measured:  `26682`
-		//  Estimated: `30147`
-		// Minimum execution time: 116_078_000 picoseconds.
-		Weight::from_parts(119_110_000, 0)
-			.saturating_add(Weight::from_parts(0, 30147))
-			.saturating_add(T::DbWeight::get().reads(3))
-			.saturating_add(T::DbWeight::get().writes(1))
-	}
-	/// Storage: ParasShared ActiveValidatorKeys (r:1 w:0)
-	/// Proof Skipped: ParasShared ActiveValidatorKeys (max_values: Some(1), max_size: None, mode: Measured)
-	/// Storage: ParasShared CurrentSessionIndex (r:1 w:0)
-	/// Proof Skipped: ParasShared CurrentSessionIndex (max_values: Some(1), max_size: None, mode: Measured)
-	/// Storage: Paras PvfActiveVoteMap (r:1 w:1)
-	/// Proof Skipped: Paras PvfActiveVoteMap (max_values: None, max_size: None, mode: Measured)
-	/// Storage: Paras PvfActiveVoteList (r:1 w:1)
-	/// Proof Skipped: Paras PvfActiveVoteList (max_values: Some(1), max_size: None, mode: Measured)
-	/// Storage: Paras UpcomingUpgrades (r:1 w:1)
-	/// Proof Skipped: Paras UpcomingUpgrades (max_values: Some(1), max_size: None, mode: Measured)
-	/// Storage: System Digest (r:1 w:1)
-	/// Proof Skipped: System Digest (max_values: Some(1), max_size: None, mode: Measured)
-	/// Storage: Paras FutureCodeUpgrades (r:0 w:100)
-	/// Proof Skipped: Paras FutureCodeUpgrades (max_values: None, max_size: None, mode: Measured)
-	fn include_pvf_check_statement_finalize_upgrade_accept() -> Weight {
-		// Proof Size summary in bytes:
-		//  Measured:  `27236`
-		//  Estimated: `30701`
-		// Minimum execution time: 934_879_000 picoseconds.
-		Weight::from_parts(946_892_000, 0)
-			.saturating_add(Weight::from_parts(0, 30701))
-			.saturating_add(T::DbWeight::get().reads(6))
-			.saturating_add(T::DbWeight::get().writes(104))
-	}
-	/// Storage: ParasShared ActiveValidatorKeys (r:1 w:0)
-	/// Proof Skipped: ParasShared ActiveValidatorKeys (max_values: Some(1), max_size: None, mode: Measured)
-	/// Storage: ParasShared CurrentSessionIndex (r:1 w:0)
-	/// Proof Skipped: ParasShared CurrentSessionIndex (max_values: Some(1), max_size: None, mode: Measured)
-	/// Storage: Paras PvfActiveVoteMap (r:1 w:1)
-	/// Proof Skipped: Paras PvfActiveVoteMap (max_values: None, max_size: None, mode: Measured)
-	fn include_pvf_check_statement_finalize_upgrade_reject() -> Weight {
-		// Proof Size summary in bytes:
-		//  Measured:  `27214`
-		//  Estimated: `30679`
-		// Minimum execution time: 112_297_000 picoseconds.
-		Weight::from_parts(118_546_000, 0)
-			.saturating_add(Weight::from_parts(0, 30679))
-			.saturating_add(T::DbWeight::get().reads(3))
-			.saturating_add(T::DbWeight::get().writes(1))
-	}
-	/// Storage: ParasShared ActiveValidatorKeys (r:1 w:0)
-	/// Proof Skipped: ParasShared ActiveValidatorKeys (max_values: Some(1), max_size: None, mode: Measured)
-	/// Storage: ParasShared CurrentSessionIndex (r:1 w:0)
-	/// Proof Skipped: ParasShared CurrentSessionIndex (max_values: Some(1), max_size: None, mode: Measured)
-	/// Storage: Paras PvfActiveVoteMap (r:1 w:1)
-	/// Proof Skipped: Paras PvfActiveVoteMap (max_values: None, max_size: None, mode: Measured)
-	/// Storage: Paras PvfActiveVoteList (r:1 w:1)
-	/// Proof Skipped: Paras PvfActiveVoteList (max_values: Some(1), max_size: None, mode: Measured)
-	/// Storage: Paras ActionsQueue (r:1 w:1)
-	/// Proof Skipped: Paras ActionsQueue (max_values: None, max_size: None, mode: Measured)
-	fn include_pvf_check_statement_finalize_onboarding_accept() -> Weight {
-		// Proof Size summary in bytes:
-		//  Measured:  `26704`
-		//  Estimated: `30169`
-		// Minimum execution time: 723_534_000 picoseconds.
-		Weight::from_parts(746_144_000, 0)
-			.saturating_add(Weight::from_parts(0, 30169))
-			.saturating_add(T::DbWeight::get().reads(5))
-			.saturating_add(T::DbWeight::get().writes(3))
-	}
-	/// Storage: ParasShared ActiveValidatorKeys (r:1 w:0)
-	/// Proof Skipped: ParasShared ActiveValidatorKeys (max_values: Some(1), max_size: None, mode: Measured)
-	/// Storage: ParasShared CurrentSessionIndex (r:1 w:0)
-	/// Proof Skipped: ParasShared CurrentSessionIndex (max_values: Some(1), max_size: None, mode: Measured)
-	/// Storage: Paras PvfActiveVoteMap (r:1 w:1)
-	/// Proof Skipped: Paras PvfActiveVoteMap (max_values: None, max_size: None, mode: Measured)
-	fn include_pvf_check_statement_finalize_onboarding_reject() -> Weight {
-		// Proof Size summary in bytes:
-		//  Measured:  `26682`
-		//  Estimated: `30147`
-		// Minimum execution time: 110_352_000 picoseconds.
-		Weight::from_parts(115_568_000, 0)
-			.saturating_add(Weight::from_parts(0, 30147))
-			.saturating_add(T::DbWeight::get().reads(3))
-			.saturating_add(T::DbWeight::get().writes(1))
-	}
-}
diff --git a/polkadot/runtime/kusama/src/weights/runtime_parachains_paras_inherent.rs b/polkadot/runtime/kusama/src/weights/runtime_parachains_paras_inherent.rs
deleted file mode 100644
index 9a9a3a3dffb5a1a1f364610cbb2dd8267adf8a97..0000000000000000000000000000000000000000
--- a/polkadot/runtime/kusama/src/weights/runtime_parachains_paras_inherent.rs
+++ /dev/null
@@ -1,345 +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/>.
-
-//! Autogenerated weights for `runtime_parachains::paras_inherent`
-//!
-//! THIS FILE WAS AUTO-GENERATED USING THE SUBSTRATE BENCHMARK CLI VERSION 4.0.0-dev
-//! DATE: 2023-06-28, STEPS: `50`, REPEAT: `20`, LOW RANGE: `[]`, HIGH RANGE: `[]`
-//! WORST CASE MAP SIZE: `1000000`
-//! HOSTNAME: `runner-xerhrdyb-project-163-concurrent-0`, CPU: `Intel(R) Xeon(R) CPU @ 2.60GHz`
-//! EXECUTION: Some(Wasm), WASM-EXECUTION: Compiled, CHAIN: Some("kusama-dev"), DB CACHE: 1024
-
-// Executed Command:
-// target/production/polkadot
-// benchmark
-// pallet
-// --steps=50
-// --repeat=20
-// --extrinsic=*
-// --execution=wasm
-// --wasm-execution=compiled
-// --heap-pages=4096
-// --json-file=/builds/parity/mirrors/polkadot/.git/.artifacts/bench.json
-// --pallet=runtime_parachains::paras_inherent
-// --chain=kusama-dev
-// --header=./file_header.txt
-// --output=./runtime/kusama/src/weights/
-
-#![cfg_attr(rustfmt, rustfmt_skip)]
-#![allow(unused_parens)]
-#![allow(unused_imports)]
-#![allow(missing_docs)]
-
-use frame_support::{traits::Get, weights::Weight};
-use core::marker::PhantomData;
-
-/// Weight functions for `runtime_parachains::paras_inherent`.
-pub struct WeightInfo<T>(PhantomData<T>);
-impl<T: frame_system::Config> runtime_parachains::paras_inherent::WeightInfo for WeightInfo<T> {
-	/// Storage: ParaInherent Included (r:1 w:1)
-	/// Proof Skipped: ParaInherent Included (max_values: Some(1), max_size: None, mode: Measured)
-	/// Storage: System ParentHash (r:1 w:0)
-	/// Proof: System ParentHash (max_values: Some(1), max_size: Some(32), added: 527, mode: MaxEncodedLen)
-	/// Storage: ParasShared CurrentSessionIndex (r:1 w:0)
-	/// Proof Skipped: ParasShared CurrentSessionIndex (max_values: Some(1), max_size: None, mode: Measured)
-	/// Storage: ParaScheduler AvailabilityCores (r:1 w:1)
-	/// Proof Skipped: ParaScheduler AvailabilityCores (max_values: Some(1), max_size: None, mode: Measured)
-	/// Storage: ParasShared ActiveValidatorKeys (r:1 w:0)
-	/// Proof Skipped: ParasShared ActiveValidatorKeys (max_values: Some(1), max_size: None, mode: Measured)
-	/// Storage: Babe AuthorVrfRandomness (r:1 w:0)
-	/// Proof: Babe AuthorVrfRandomness (max_values: Some(1), max_size: Some(33), added: 528, mode: MaxEncodedLen)
-	/// Storage: ParaSessionInfo Sessions (r:1 w:0)
-	/// Proof Skipped: ParaSessionInfo Sessions (max_values: None, max_size: None, mode: Measured)
-	/// Storage: ParasDisputes Disputes (r:1 w:1)
-	/// Proof Skipped: ParasDisputes Disputes (max_values: None, max_size: None, mode: Measured)
-	/// Storage: ParasDisputes BackersOnDisputes (r:1 w:1)
-	/// Proof Skipped: ParasDisputes BackersOnDisputes (max_values: None, max_size: None, mode: Measured)
-	/// Storage: ParasDisputes Included (r:1 w:1)
-	/// Proof Skipped: ParasDisputes Included (max_values: None, max_size: None, mode: Measured)
-	/// Storage: ParaSessionInfo AccountKeys (r:1 w:0)
-	/// Proof Skipped: ParaSessionInfo AccountKeys (max_values: None, max_size: None, mode: Measured)
-	/// Storage: Session Validators (r:1 w:0)
-	/// Proof Skipped: Session Validators (max_values: Some(1), max_size: None, mode: Measured)
-	/// Storage: Staking ActiveEra (r:1 w:0)
-	/// Proof: Staking ActiveEra (max_values: Some(1), max_size: Some(13), added: 508, mode: MaxEncodedLen)
-	/// Storage: Staking ErasRewardPoints (r:1 w:1)
-	/// Proof Skipped: Staking ErasRewardPoints (max_values: None, max_size: None, mode: Measured)
-	/// Storage: ParaInherent OnChainVotes (r:1 w:1)
-	/// Proof Skipped: ParaInherent OnChainVotes (max_values: Some(1), max_size: None, mode: Measured)
-	/// Storage: ParasDisputes Frozen (r:1 w:0)
-	/// Proof Skipped: ParasDisputes Frozen (max_values: Some(1), max_size: None, mode: Measured)
-	/// Storage: ParaInclusion PendingAvailability (r:2 w:1)
-	/// Proof Skipped: ParaInclusion PendingAvailability (max_values: None, max_size: None, mode: Measured)
-	/// Storage: Paras Parachains (r:1 w:0)
-	/// Proof Skipped: Paras Parachains (max_values: Some(1), max_size: None, mode: Measured)
-	/// Storage: ParaInclusion PendingAvailabilityCommitments (r:1 w:1)
-	/// Proof Skipped: ParaInclusion PendingAvailabilityCommitments (max_values: None, max_size: None, mode: Measured)
-	/// Storage: Dmp DownwardMessageQueues (r:1 w:1)
-	/// Proof Skipped: Dmp DownwardMessageQueues (max_values: None, max_size: None, mode: Measured)
-	/// Storage: Dmp DeliveryFeeFactor (r:1 w:1)
-	/// Proof Skipped: Dmp DeliveryFeeFactor (max_values: None, max_size: None, mode: Measured)
-	/// Storage: Hrmp HrmpChannelDigests (r:1 w:1)
-	/// Proof Skipped: Hrmp HrmpChannelDigests (max_values: None, max_size: None, mode: Measured)
-	/// Storage: Paras FutureCodeUpgrades (r:1 w:0)
-	/// Proof Skipped: Paras FutureCodeUpgrades (max_values: None, max_size: None, mode: Measured)
-	/// Storage: ParaScheduler SessionStartBlock (r:1 w:0)
-	/// Proof Skipped: ParaScheduler SessionStartBlock (max_values: Some(1), max_size: None, mode: Measured)
-	/// Storage: ParaScheduler ParathreadQueue (r:1 w:1)
-	/// Proof Skipped: ParaScheduler ParathreadQueue (max_values: Some(1), max_size: None, mode: Measured)
-	/// Storage: ParaScheduler Scheduled (r:1 w:1)
-	/// Proof Skipped: ParaScheduler Scheduled (max_values: Some(1), max_size: None, mode: Measured)
-	/// Storage: ParaScheduler ValidatorGroups (r:1 w:0)
-	/// Proof Skipped: ParaScheduler ValidatorGroups (max_values: Some(1), max_size: None, mode: Measured)
-	/// Storage: Hrmp HrmpWatermarks (r:0 w:1)
-	/// Proof Skipped: Hrmp HrmpWatermarks (max_values: None, max_size: None, mode: Measured)
-	/// Storage: Paras Heads (r:0 w:1)
-	/// Proof Skipped: Paras Heads (max_values: None, max_size: None, mode: Measured)
-	/// Storage: Paras UpgradeGoAheadSignal (r:0 w:1)
-	/// Proof Skipped: Paras UpgradeGoAheadSignal (max_values: None, max_size: None, mode: Measured)
-	/// The range of component `v` is `[10, 200]`.
-	fn enter_variable_disputes(v: u32, ) -> Weight {
-		// Proof Size summary in bytes:
-		//  Measured:  `50671`
-		//  Estimated: `56611 + v * (23 ±0)`
-		// Minimum execution time: 1_008_586_000 picoseconds.
-		Weight::from_parts(471_892_709, 0)
-			.saturating_add(Weight::from_parts(0, 56611))
-			// Standard Error: 15_634
-			.saturating_add(Weight::from_parts(56_433_120, 0).saturating_mul(v.into()))
-			.saturating_add(T::DbWeight::get().reads(27))
-			.saturating_add(T::DbWeight::get().writes(15))
-			.saturating_add(Weight::from_parts(0, 23).saturating_mul(v.into()))
-	}
-	/// Storage: ParaInherent Included (r:1 w:1)
-	/// Proof Skipped: ParaInherent Included (max_values: Some(1), max_size: None, mode: Measured)
-	/// Storage: System ParentHash (r:1 w:0)
-	/// Proof: System ParentHash (max_values: Some(1), max_size: Some(32), added: 527, mode: MaxEncodedLen)
-	/// Storage: ParasShared CurrentSessionIndex (r:1 w:0)
-	/// Proof Skipped: ParasShared CurrentSessionIndex (max_values: Some(1), max_size: None, mode: Measured)
-	/// Storage: ParaScheduler AvailabilityCores (r:1 w:1)
-	/// Proof Skipped: ParaScheduler AvailabilityCores (max_values: Some(1), max_size: None, mode: Measured)
-	/// Storage: ParasShared ActiveValidatorKeys (r:1 w:0)
-	/// Proof Skipped: ParasShared ActiveValidatorKeys (max_values: Some(1), max_size: None, mode: Measured)
-	/// Storage: Babe AuthorVrfRandomness (r:1 w:0)
-	/// Proof: Babe AuthorVrfRandomness (max_values: Some(1), max_size: Some(33), added: 528, mode: MaxEncodedLen)
-	/// Storage: ParaInherent OnChainVotes (r:1 w:1)
-	/// Proof Skipped: ParaInherent OnChainVotes (max_values: Some(1), max_size: None, mode: Measured)
-	/// Storage: ParasDisputes Frozen (r:1 w:0)
-	/// Proof Skipped: ParasDisputes Frozen (max_values: Some(1), max_size: None, mode: Measured)
-	/// Storage: ParaInclusion PendingAvailability (r:2 w:1)
-	/// Proof Skipped: ParaInclusion PendingAvailability (max_values: None, max_size: None, mode: Measured)
-	/// Storage: Paras Parachains (r:1 w:0)
-	/// Proof Skipped: Paras Parachains (max_values: Some(1), max_size: None, mode: Measured)
-	/// Storage: ParaInclusion PendingAvailabilityCommitments (r:1 w:1)
-	/// Proof Skipped: ParaInclusion PendingAvailabilityCommitments (max_values: None, max_size: None, mode: Measured)
-	/// Storage: ParaSessionInfo AccountKeys (r:1 w:0)
-	/// Proof Skipped: ParaSessionInfo AccountKeys (max_values: None, max_size: None, mode: Measured)
-	/// Storage: Session Validators (r:1 w:0)
-	/// Proof Skipped: Session Validators (max_values: Some(1), max_size: None, mode: Measured)
-	/// Storage: Staking ActiveEra (r:1 w:0)
-	/// Proof: Staking ActiveEra (max_values: Some(1), max_size: Some(13), added: 508, mode: MaxEncodedLen)
-	/// Storage: Staking ErasRewardPoints (r:1 w:1)
-	/// Proof Skipped: Staking ErasRewardPoints (max_values: None, max_size: None, mode: Measured)
-	/// Storage: Dmp DownwardMessageQueues (r:1 w:1)
-	/// Proof Skipped: Dmp DownwardMessageQueues (max_values: None, max_size: None, mode: Measured)
-	/// Storage: Dmp DeliveryFeeFactor (r:1 w:1)
-	/// Proof Skipped: Dmp DeliveryFeeFactor (max_values: None, max_size: None, mode: Measured)
-	/// Storage: Hrmp HrmpChannelDigests (r:1 w:1)
-	/// Proof Skipped: Hrmp HrmpChannelDigests (max_values: None, max_size: None, mode: Measured)
-	/// Storage: Paras FutureCodeUpgrades (r:1 w:0)
-	/// Proof Skipped: Paras FutureCodeUpgrades (max_values: None, max_size: None, mode: Measured)
-	/// Storage: ParasDisputes Disputes (r:1 w:0)
-	/// Proof Skipped: ParasDisputes Disputes (max_values: None, max_size: None, mode: Measured)
-	/// Storage: ParaScheduler SessionStartBlock (r:1 w:0)
-	/// Proof Skipped: ParaScheduler SessionStartBlock (max_values: Some(1), max_size: None, mode: Measured)
-	/// Storage: ParaScheduler ParathreadQueue (r:1 w:1)
-	/// Proof Skipped: ParaScheduler ParathreadQueue (max_values: Some(1), max_size: None, mode: Measured)
-	/// Storage: ParaScheduler Scheduled (r:1 w:1)
-	/// Proof Skipped: ParaScheduler Scheduled (max_values: Some(1), max_size: None, mode: Measured)
-	/// Storage: ParaScheduler ValidatorGroups (r:1 w:0)
-	/// Proof Skipped: ParaScheduler ValidatorGroups (max_values: Some(1), max_size: None, mode: Measured)
-	/// Storage: ParaInclusion AvailabilityBitfields (r:0 w:1)
-	/// Proof Skipped: ParaInclusion AvailabilityBitfields (max_values: None, max_size: None, mode: Measured)
-	/// Storage: ParasDisputes Included (r:0 w:1)
-	/// Proof Skipped: ParasDisputes Included (max_values: None, max_size: None, mode: Measured)
-	/// Storage: Hrmp HrmpWatermarks (r:0 w:1)
-	/// Proof Skipped: Hrmp HrmpWatermarks (max_values: None, max_size: None, mode: Measured)
-	/// Storage: Paras Heads (r:0 w:1)
-	/// Proof Skipped: Paras Heads (max_values: None, max_size: None, mode: Measured)
-	/// Storage: Paras UpgradeGoAheadSignal (r:0 w:1)
-	/// Proof Skipped: Paras UpgradeGoAheadSignal (max_values: None, max_size: None, mode: Measured)
-	fn enter_bitfields() -> Weight {
-		// Proof Size summary in bytes:
-		//  Measured:  `42504`
-		//  Estimated: `48444`
-		// Minimum execution time: 469_409_000 picoseconds.
-		Weight::from_parts(487_865_000, 0)
-			.saturating_add(Weight::from_parts(0, 48444))
-			.saturating_add(T::DbWeight::get().reads(25))
-			.saturating_add(T::DbWeight::get().writes(16))
-	}
-	/// Storage: ParaInherent Included (r:1 w:1)
-	/// Proof Skipped: ParaInherent Included (max_values: Some(1), max_size: None, mode: Measured)
-	/// Storage: System ParentHash (r:1 w:0)
-	/// Proof: System ParentHash (max_values: Some(1), max_size: Some(32), added: 527, mode: MaxEncodedLen)
-	/// Storage: ParasShared CurrentSessionIndex (r:1 w:0)
-	/// Proof Skipped: ParasShared CurrentSessionIndex (max_values: Some(1), max_size: None, mode: Measured)
-	/// Storage: ParaScheduler AvailabilityCores (r:1 w:1)
-	/// Proof Skipped: ParaScheduler AvailabilityCores (max_values: Some(1), max_size: None, mode: Measured)
-	/// Storage: ParasShared ActiveValidatorKeys (r:1 w:0)
-	/// Proof Skipped: ParasShared ActiveValidatorKeys (max_values: Some(1), max_size: None, mode: Measured)
-	/// Storage: Babe AuthorVrfRandomness (r:1 w:0)
-	/// Proof: Babe AuthorVrfRandomness (max_values: Some(1), max_size: Some(33), added: 528, mode: MaxEncodedLen)
-	/// Storage: ParaInherent OnChainVotes (r:1 w:1)
-	/// Proof Skipped: ParaInherent OnChainVotes (max_values: Some(1), max_size: None, mode: Measured)
-	/// Storage: ParasDisputes Frozen (r:1 w:0)
-	/// Proof Skipped: ParasDisputes Frozen (max_values: Some(1), max_size: None, mode: Measured)
-	/// Storage: ParaInclusion PendingAvailability (r:2 w:1)
-	/// Proof Skipped: ParaInclusion PendingAvailability (max_values: None, max_size: None, mode: Measured)
-	/// Storage: Paras Parachains (r:1 w:0)
-	/// Proof Skipped: Paras Parachains (max_values: Some(1), max_size: None, mode: Measured)
-	/// Storage: ParaInclusion PendingAvailabilityCommitments (r:1 w:1)
-	/// Proof Skipped: ParaInclusion PendingAvailabilityCommitments (max_values: None, max_size: None, mode: Measured)
-	/// Storage: ParaSessionInfo AccountKeys (r:1 w:0)
-	/// Proof Skipped: ParaSessionInfo AccountKeys (max_values: None, max_size: None, mode: Measured)
-	/// Storage: Session Validators (r:1 w:0)
-	/// Proof Skipped: Session Validators (max_values: Some(1), max_size: None, mode: Measured)
-	/// Storage: Staking ActiveEra (r:1 w:0)
-	/// Proof: Staking ActiveEra (max_values: Some(1), max_size: Some(13), added: 508, mode: MaxEncodedLen)
-	/// Storage: Staking ErasRewardPoints (r:1 w:1)
-	/// Proof Skipped: Staking ErasRewardPoints (max_values: None, max_size: None, mode: Measured)
-	/// Storage: Dmp DownwardMessageQueues (r:1 w:1)
-	/// Proof Skipped: Dmp DownwardMessageQueues (max_values: None, max_size: None, mode: Measured)
-	/// Storage: Dmp DeliveryFeeFactor (r:1 w:1)
-	/// Proof Skipped: Dmp DeliveryFeeFactor (max_values: None, max_size: None, mode: Measured)
-	/// Storage: Hrmp HrmpChannelDigests (r:1 w:1)
-	/// Proof Skipped: Hrmp HrmpChannelDigests (max_values: None, max_size: None, mode: Measured)
-	/// Storage: Paras FutureCodeUpgrades (r:1 w:0)
-	/// Proof Skipped: Paras FutureCodeUpgrades (max_values: None, max_size: None, mode: Measured)
-	/// Storage: ParasDisputes Disputes (r:1 w:0)
-	/// Proof Skipped: ParasDisputes Disputes (max_values: None, max_size: None, mode: Measured)
-	/// Storage: ParaScheduler SessionStartBlock (r:1 w:0)
-	/// Proof Skipped: ParaScheduler SessionStartBlock (max_values: Some(1), max_size: None, mode: Measured)
-	/// Storage: ParaScheduler ParathreadQueue (r:1 w:1)
-	/// Proof Skipped: ParaScheduler ParathreadQueue (max_values: Some(1), max_size: None, mode: Measured)
-	/// Storage: ParaScheduler Scheduled (r:1 w:1)
-	/// Proof Skipped: ParaScheduler Scheduled (max_values: Some(1), max_size: None, mode: Measured)
-	/// Storage: ParaScheduler ValidatorGroups (r:1 w:0)
-	/// Proof Skipped: ParaScheduler ValidatorGroups (max_values: Some(1), max_size: None, mode: Measured)
-	/// Storage: Paras CurrentCodeHash (r:1 w:0)
-	/// Proof Skipped: Paras CurrentCodeHash (max_values: None, max_size: None, mode: Measured)
-	/// Storage: Paras ParaLifecycles (r:1 w:0)
-	/// Proof Skipped: Paras ParaLifecycles (max_values: None, max_size: None, mode: Measured)
-	/// Storage: MessageQueue BookStateFor (r:1 w:0)
-	/// Proof: MessageQueue BookStateFor (max_values: None, max_size: Some(55), added: 2530, mode: MaxEncodedLen)
-	/// Storage: ParasDisputes Included (r:0 w:1)
-	/// Proof Skipped: ParasDisputes Included (max_values: None, max_size: None, mode: Measured)
-	/// Storage: Hrmp HrmpWatermarks (r:0 w:1)
-	/// Proof Skipped: Hrmp HrmpWatermarks (max_values: None, max_size: None, mode: Measured)
-	/// Storage: Paras Heads (r:0 w:1)
-	/// Proof Skipped: Paras Heads (max_values: None, max_size: None, mode: Measured)
-	/// Storage: Paras UpgradeGoAheadSignal (r:0 w:1)
-	/// Proof Skipped: Paras UpgradeGoAheadSignal (max_values: None, max_size: None, mode: Measured)
-	/// The range of component `v` is `[101, 200]`.
-	fn enter_backed_candidates_variable(v: u32, ) -> Weight {
-		// Proof Size summary in bytes:
-		//  Measured:  `42540`
-		//  Estimated: `48480`
-		// Minimum execution time: 6_874_816_000 picoseconds.
-		Weight::from_parts(1_229_912_739, 0)
-			.saturating_add(Weight::from_parts(0, 48480))
-			// Standard Error: 27_352
-			.saturating_add(Weight::from_parts(56_137_302, 0).saturating_mul(v.into()))
-			.saturating_add(T::DbWeight::get().reads(28))
-			.saturating_add(T::DbWeight::get().writes(15))
-	}
-	/// Storage: ParaInherent Included (r:1 w:1)
-	/// Proof Skipped: ParaInherent Included (max_values: Some(1), max_size: None, mode: Measured)
-	/// Storage: System ParentHash (r:1 w:0)
-	/// Proof: System ParentHash (max_values: Some(1), max_size: Some(32), added: 527, mode: MaxEncodedLen)
-	/// Storage: ParasShared CurrentSessionIndex (r:1 w:0)
-	/// Proof Skipped: ParasShared CurrentSessionIndex (max_values: Some(1), max_size: None, mode: Measured)
-	/// Storage: ParaScheduler AvailabilityCores (r:1 w:1)
-	/// Proof Skipped: ParaScheduler AvailabilityCores (max_values: Some(1), max_size: None, mode: Measured)
-	/// Storage: ParasShared ActiveValidatorKeys (r:1 w:0)
-	/// Proof Skipped: ParasShared ActiveValidatorKeys (max_values: Some(1), max_size: None, mode: Measured)
-	/// Storage: Babe AuthorVrfRandomness (r:1 w:0)
-	/// Proof: Babe AuthorVrfRandomness (max_values: Some(1), max_size: Some(33), added: 528, mode: MaxEncodedLen)
-	/// Storage: ParaInherent OnChainVotes (r:1 w:1)
-	/// Proof Skipped: ParaInherent OnChainVotes (max_values: Some(1), max_size: None, mode: Measured)
-	/// Storage: ParasDisputes Frozen (r:1 w:0)
-	/// Proof Skipped: ParasDisputes Frozen (max_values: Some(1), max_size: None, mode: Measured)
-	/// Storage: ParaInclusion PendingAvailability (r:2 w:1)
-	/// Proof Skipped: ParaInclusion PendingAvailability (max_values: None, max_size: None, mode: Measured)
-	/// Storage: Paras Parachains (r:1 w:0)
-	/// Proof Skipped: Paras Parachains (max_values: Some(1), max_size: None, mode: Measured)
-	/// Storage: ParaInclusion PendingAvailabilityCommitments (r:1 w:1)
-	/// Proof Skipped: ParaInclusion PendingAvailabilityCommitments (max_values: None, max_size: None, mode: Measured)
-	/// Storage: ParaSessionInfo AccountKeys (r:1 w:0)
-	/// Proof Skipped: ParaSessionInfo AccountKeys (max_values: None, max_size: None, mode: Measured)
-	/// Storage: Session Validators (r:1 w:0)
-	/// Proof Skipped: Session Validators (max_values: Some(1), max_size: None, mode: Measured)
-	/// Storage: Staking ActiveEra (r:1 w:0)
-	/// Proof: Staking ActiveEra (max_values: Some(1), max_size: Some(13), added: 508, mode: MaxEncodedLen)
-	/// Storage: Staking ErasRewardPoints (r:1 w:1)
-	/// Proof Skipped: Staking ErasRewardPoints (max_values: None, max_size: None, mode: Measured)
-	/// Storage: Dmp DownwardMessageQueues (r:1 w:1)
-	/// Proof Skipped: Dmp DownwardMessageQueues (max_values: None, max_size: None, mode: Measured)
-	/// Storage: Dmp DeliveryFeeFactor (r:1 w:1)
-	/// Proof Skipped: Dmp DeliveryFeeFactor (max_values: None, max_size: None, mode: Measured)
-	/// Storage: Hrmp HrmpChannelDigests (r:1 w:1)
-	/// Proof Skipped: Hrmp HrmpChannelDigests (max_values: None, max_size: None, mode: Measured)
-	/// Storage: Paras FutureCodeUpgrades (r:1 w:0)
-	/// Proof Skipped: Paras FutureCodeUpgrades (max_values: None, max_size: None, mode: Measured)
-	/// Storage: ParasDisputes Disputes (r:1 w:0)
-	/// Proof Skipped: ParasDisputes Disputes (max_values: None, max_size: None, mode: Measured)
-	/// Storage: ParaScheduler SessionStartBlock (r:1 w:0)
-	/// Proof Skipped: ParaScheduler SessionStartBlock (max_values: Some(1), max_size: None, mode: Measured)
-	/// Storage: ParaScheduler ParathreadQueue (r:1 w:1)
-	/// Proof Skipped: ParaScheduler ParathreadQueue (max_values: Some(1), max_size: None, mode: Measured)
-	/// Storage: ParaScheduler Scheduled (r:1 w:1)
-	/// Proof Skipped: ParaScheduler Scheduled (max_values: Some(1), max_size: None, mode: Measured)
-	/// Storage: ParaScheduler ValidatorGroups (r:1 w:0)
-	/// Proof Skipped: ParaScheduler ValidatorGroups (max_values: Some(1), max_size: None, mode: Measured)
-	/// Storage: Paras CurrentCodeHash (r:1 w:0)
-	/// Proof Skipped: Paras CurrentCodeHash (max_values: None, max_size: None, mode: Measured)
-	/// Storage: Paras FutureCodeHash (r:1 w:0)
-	/// Proof Skipped: Paras FutureCodeHash (max_values: None, max_size: None, mode: Measured)
-	/// Storage: Paras UpgradeRestrictionSignal (r:1 w:0)
-	/// Proof Skipped: Paras UpgradeRestrictionSignal (max_values: None, max_size: None, mode: Measured)
-	/// Storage: Paras ParaLifecycles (r:1 w:0)
-	/// Proof Skipped: Paras ParaLifecycles (max_values: None, max_size: None, mode: Measured)
-	/// Storage: MessageQueue BookStateFor (r:1 w:0)
-	/// Proof: MessageQueue BookStateFor (max_values: None, max_size: Some(55), added: 2530, mode: MaxEncodedLen)
-	/// Storage: ParasDisputes Included (r:0 w:1)
-	/// Proof Skipped: ParasDisputes Included (max_values: None, max_size: None, mode: Measured)
-	/// Storage: Hrmp HrmpWatermarks (r:0 w:1)
-	/// Proof Skipped: Hrmp HrmpWatermarks (max_values: None, max_size: None, mode: Measured)
-	/// Storage: Paras Heads (r:0 w:1)
-	/// Proof Skipped: Paras Heads (max_values: None, max_size: None, mode: Measured)
-	/// Storage: Paras UpgradeGoAheadSignal (r:0 w:1)
-	/// Proof Skipped: Paras UpgradeGoAheadSignal (max_values: None, max_size: None, mode: Measured)
-	fn enter_backed_candidate_code_upgrade() -> Weight {
-		// Proof Size summary in bytes:
-		//  Measured:  `42567`
-		//  Estimated: `48507`
-		// Minimum execution time: 41_075_073_000 picoseconds.
-		Weight::from_parts(43_753_587_000, 0)
-			.saturating_add(Weight::from_parts(0, 48507))
-			.saturating_add(T::DbWeight::get().reads(30))
-			.saturating_add(T::DbWeight::get().writes(15))
-	}
-}
diff --git a/polkadot/runtime/kusama/src/weights/xcm/mod.rs b/polkadot/runtime/kusama/src/weights/xcm/mod.rs
deleted file mode 100644
index 5958abe40df94109fb3c4ee09b70a47edccda9da..0000000000000000000000000000000000000000
--- a/polkadot/runtime/kusama/src/weights/xcm/mod.rs
+++ /dev/null
@@ -1,290 +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/>.
-
-mod pallet_xcm_benchmarks_fungible;
-mod pallet_xcm_benchmarks_generic;
-
-use crate::Runtime;
-use frame_support::weights::Weight;
-use sp_std::prelude::*;
-use xcm::{latest::prelude::*, DoubleEncoded};
-
-use pallet_xcm_benchmarks_fungible::WeightInfo as XcmBalancesWeight;
-use pallet_xcm_benchmarks_generic::WeightInfo as XcmGeneric;
-
-/// Types of asset supported by the Kusama runtime.
-pub enum AssetTypes {
-	/// An asset backed by `pallet-balances`.
-	Balances,
-	/// Unknown asset.
-	Unknown,
-}
-
-impl From<&MultiAsset> for AssetTypes {
-	fn from(asset: &MultiAsset) -> Self {
-		match asset {
-			MultiAsset { id: Concrete(MultiLocation { parents: 0, interior: Here }), .. } =>
-				AssetTypes::Balances,
-			_ => AssetTypes::Unknown,
-		}
-	}
-}
-
-trait WeighMultiAssets {
-	fn weigh_multi_assets(&self, balances_weight: Weight) -> Weight;
-}
-
-// Kusama only knows about one asset, the balances pallet.
-const MAX_ASSETS: u64 = 1;
-
-impl WeighMultiAssets for MultiAssetFilter {
-	fn weigh_multi_assets(&self, balances_weight: Weight) -> Weight {
-		match self {
-			Self::Definite(assets) => assets
-				.inner()
-				.into_iter()
-				.map(From::from)
-				.map(|t| match t {
-					AssetTypes::Balances => balances_weight,
-					AssetTypes::Unknown => Weight::MAX,
-				})
-				.fold(Weight::zero(), |acc, x| acc.saturating_add(x)),
-			// We don't support any NFTs on Kusama, so these two variants will always match
-			// only 1 kind of fungible asset.
-			Self::Wild(AllOf { .. } | AllOfCounted { .. }) => balances_weight,
-			Self::Wild(AllCounted(count)) =>
-				balances_weight.saturating_mul(MAX_ASSETS.min(*count as u64)),
-			Self::Wild(All) => balances_weight.saturating_mul(MAX_ASSETS),
-		}
-	}
-}
-
-impl WeighMultiAssets for MultiAssets {
-	fn weigh_multi_assets(&self, balances_weight: Weight) -> Weight {
-		self.inner()
-			.into_iter()
-			.map(|m| <AssetTypes as From<&MultiAsset>>::from(m))
-			.map(|t| match t {
-				AssetTypes::Balances => balances_weight,
-				AssetTypes::Unknown => Weight::MAX,
-			})
-			.fold(Weight::zero(), |acc, x| acc.saturating_add(x))
-	}
-}
-
-pub struct KusamaXcmWeight<RuntimeCall>(core::marker::PhantomData<RuntimeCall>);
-impl<RuntimeCall> XcmWeightInfo<RuntimeCall> for KusamaXcmWeight<RuntimeCall> {
-	fn withdraw_asset(assets: &MultiAssets) -> Weight {
-		assets.weigh_multi_assets(XcmBalancesWeight::<Runtime>::withdraw_asset())
-	}
-	fn reserve_asset_deposited(assets: &MultiAssets) -> Weight {
-		// Kusama doesn't support ReserveAssetDeposited, so this benchmark has a default weight
-		assets.weigh_multi_assets(XcmBalancesWeight::<Runtime>::reserve_asset_deposited())
-	}
-	fn receive_teleported_asset(assets: &MultiAssets) -> Weight {
-		assets.weigh_multi_assets(XcmBalancesWeight::<Runtime>::receive_teleported_asset())
-	}
-	fn query_response(
-		_query_id: &u64,
-		_response: &Response,
-		_max_weight: &Weight,
-		_querier: &Option<MultiLocation>,
-	) -> Weight {
-		XcmGeneric::<Runtime>::query_response()
-	}
-	fn transfer_asset(assets: &MultiAssets, _dest: &MultiLocation) -> Weight {
-		assets.weigh_multi_assets(XcmBalancesWeight::<Runtime>::transfer_asset())
-	}
-	fn transfer_reserve_asset(
-		assets: &MultiAssets,
-		_dest: &MultiLocation,
-		_xcm: &Xcm<()>,
-	) -> Weight {
-		assets.weigh_multi_assets(XcmBalancesWeight::<Runtime>::transfer_reserve_asset())
-	}
-	fn transact(
-		_origin_kind: &OriginKind,
-		_require_weight_at_most: &Weight,
-		_call: &DoubleEncoded<RuntimeCall>,
-	) -> Weight {
-		XcmGeneric::<Runtime>::transact()
-	}
-	fn hrmp_new_channel_open_request(
-		_sender: &u32,
-		_max_message_size: &u32,
-		_max_capacity: &u32,
-	) -> Weight {
-		// XCM Executor does not currently support HRMP channel operations
-		Weight::MAX
-	}
-	fn hrmp_channel_accepted(_recipient: &u32) -> Weight {
-		// XCM Executor does not currently support HRMP channel operations
-		Weight::MAX
-	}
-	fn hrmp_channel_closing(_initiator: &u32, _sender: &u32, _recipient: &u32) -> Weight {
-		// XCM Executor does not currently support HRMP channel operations
-		Weight::MAX
-	}
-	fn clear_origin() -> Weight {
-		XcmGeneric::<Runtime>::clear_origin()
-	}
-	fn descend_origin(_who: &InteriorMultiLocation) -> Weight {
-		XcmGeneric::<Runtime>::descend_origin()
-	}
-	fn report_error(_query_response_info: &QueryResponseInfo) -> Weight {
-		XcmGeneric::<Runtime>::report_error()
-	}
-
-	fn deposit_asset(assets: &MultiAssetFilter, _dest: &MultiLocation) -> Weight {
-		assets.weigh_multi_assets(XcmBalancesWeight::<Runtime>::deposit_asset())
-	}
-	fn deposit_reserve_asset(
-		assets: &MultiAssetFilter,
-		_dest: &MultiLocation,
-		_xcm: &Xcm<()>,
-	) -> Weight {
-		assets.weigh_multi_assets(XcmBalancesWeight::<Runtime>::deposit_reserve_asset())
-	}
-	fn exchange_asset(_give: &MultiAssetFilter, _receive: &MultiAssets, _maximal: &bool) -> Weight {
-		// Kusama does not currently support exchange asset operations
-		Weight::MAX
-	}
-	fn initiate_reserve_withdraw(
-		assets: &MultiAssetFilter,
-		_reserve: &MultiLocation,
-		_xcm: &Xcm<()>,
-	) -> Weight {
-		assets.weigh_multi_assets(XcmBalancesWeight::<Runtime>::initiate_reserve_withdraw())
-	}
-	fn initiate_teleport(
-		assets: &MultiAssetFilter,
-		_dest: &MultiLocation,
-		_xcm: &Xcm<()>,
-	) -> Weight {
-		assets.weigh_multi_assets(XcmBalancesWeight::<Runtime>::initiate_teleport())
-	}
-	fn report_holding(_response_info: &QueryResponseInfo, _assets: &MultiAssetFilter) -> Weight {
-		XcmGeneric::<Runtime>::report_holding()
-	}
-	fn buy_execution(_fees: &MultiAsset, _weight_limit: &WeightLimit) -> Weight {
-		XcmGeneric::<Runtime>::buy_execution()
-	}
-	fn refund_surplus() -> Weight {
-		XcmGeneric::<Runtime>::refund_surplus()
-	}
-	fn set_error_handler(_xcm: &Xcm<RuntimeCall>) -> Weight {
-		XcmGeneric::<Runtime>::set_error_handler()
-	}
-	fn set_appendix(_xcm: &Xcm<RuntimeCall>) -> Weight {
-		XcmGeneric::<Runtime>::set_appendix()
-	}
-	fn clear_error() -> Weight {
-		XcmGeneric::<Runtime>::clear_error()
-	}
-	fn claim_asset(_assets: &MultiAssets, _ticket: &MultiLocation) -> Weight {
-		XcmGeneric::<Runtime>::claim_asset()
-	}
-	fn trap(_code: &u64) -> Weight {
-		XcmGeneric::<Runtime>::trap()
-	}
-	fn subscribe_version(_query_id: &QueryId, _max_response_weight: &Weight) -> Weight {
-		XcmGeneric::<Runtime>::subscribe_version()
-	}
-	fn unsubscribe_version() -> Weight {
-		XcmGeneric::<Runtime>::unsubscribe_version()
-	}
-	fn burn_asset(assets: &MultiAssets) -> Weight {
-		assets.weigh_multi_assets(XcmGeneric::<Runtime>::burn_asset())
-	}
-	fn expect_asset(assets: &MultiAssets) -> Weight {
-		assets.weigh_multi_assets(XcmGeneric::<Runtime>::expect_asset())
-	}
-	fn expect_origin(_origin: &Option<MultiLocation>) -> Weight {
-		XcmGeneric::<Runtime>::expect_origin()
-	}
-	fn expect_error(_error: &Option<(u32, XcmError)>) -> Weight {
-		XcmGeneric::<Runtime>::expect_error()
-	}
-	fn expect_transact_status(_transact_status: &MaybeErrorCode) -> Weight {
-		XcmGeneric::<Runtime>::expect_transact_status()
-	}
-	fn query_pallet(_module_name: &Vec<u8>, _response_info: &QueryResponseInfo) -> Weight {
-		XcmGeneric::<Runtime>::query_pallet()
-	}
-	fn expect_pallet(
-		_index: &u32,
-		_name: &Vec<u8>,
-		_module_name: &Vec<u8>,
-		_crate_major: &u32,
-		_min_crate_minor: &u32,
-	) -> Weight {
-		XcmGeneric::<Runtime>::expect_pallet()
-	}
-	fn report_transact_status(_response_info: &QueryResponseInfo) -> Weight {
-		XcmGeneric::<Runtime>::report_transact_status()
-	}
-	fn clear_transact_status() -> Weight {
-		XcmGeneric::<Runtime>::clear_transact_status()
-	}
-	fn universal_origin(_: &Junction) -> Weight {
-		// Kusama does not currently support universal origin operations
-		Weight::MAX
-	}
-	fn export_message(_: &NetworkId, _: &Junctions, _: &Xcm<()>) -> Weight {
-		// Kusama relay should not support export message operations
-		Weight::MAX
-	}
-	fn lock_asset(_: &MultiAsset, _: &MultiLocation) -> Weight {
-		// Kusama does not currently support asset locking operations
-		Weight::MAX
-	}
-	fn unlock_asset(_: &MultiAsset, _: &MultiLocation) -> Weight {
-		// Kusama does not currently support asset locking operations
-		Weight::MAX
-	}
-	fn note_unlockable(_: &MultiAsset, _: &MultiLocation) -> Weight {
-		// Kusama does not currently support asset locking operations
-		Weight::MAX
-	}
-	fn request_unlock(_: &MultiAsset, _: &MultiLocation) -> Weight {
-		// Kusama does not currently support asset locking operations
-		Weight::MAX
-	}
-	fn set_fees_mode(_: &bool) -> Weight {
-		XcmGeneric::<Runtime>::set_fees_mode()
-	}
-	fn set_topic(_topic: &[u8; 32]) -> Weight {
-		XcmGeneric::<Runtime>::set_topic()
-	}
-	fn clear_topic() -> Weight {
-		XcmGeneric::<Runtime>::clear_topic()
-	}
-	fn alias_origin(_: &MultiLocation) -> Weight {
-		// XCM Executor does not currently support alias origin operations
-		Weight::MAX
-	}
-	fn unpaid_execution(_: &WeightLimit, _: &Option<MultiLocation>) -> Weight {
-		XcmGeneric::<Runtime>::unpaid_execution()
-	}
-}
-
-#[test]
-fn all_counted_has_a_sane_weight_upper_limit() {
-	let assets = MultiAssetFilter::Wild(AllCounted(4294967295));
-	let weight = Weight::from_parts(1000, 1000);
-
-	assert_eq!(assets.weigh_multi_assets(weight), weight * MAX_ASSETS);
-}
diff --git a/polkadot/runtime/kusama/src/weights/xcm/pallet_xcm_benchmarks_fungible.rs b/polkadot/runtime/kusama/src/weights/xcm/pallet_xcm_benchmarks_fungible.rs
deleted file mode 100644
index 07f3ccb48d9268275ef8d56d7240bddead0e9896..0000000000000000000000000000000000000000
--- a/polkadot/runtime/kusama/src/weights/xcm/pallet_xcm_benchmarks_fungible.rs
+++ /dev/null
@@ -1,179 +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/>.
-
-//! Autogenerated weights for `pallet_xcm_benchmarks::fungible`
-//!
-//! THIS FILE WAS AUTO-GENERATED USING THE SUBSTRATE BENCHMARK CLI VERSION 4.0.0-dev
-//! DATE: 2023-07-17, STEPS: `50`, REPEAT: `20`, LOW RANGE: `[]`, HIGH RANGE: `[]`
-//! WORST CASE MAP SIZE: `1000000`
-//! HOSTNAME: `runner-gghbxkbs-project-163-concurrent-0`, CPU: `Intel(R) Xeon(R) CPU @ 2.60GHz`
-//! EXECUTION: , WASM-EXECUTION: Compiled, CHAIN: Some("kusama-dev"), DB CACHE: 1024
-
-// Executed Command:
-// target/production/polkadot
-// benchmark
-// pallet
-// --steps=50
-// --repeat=20
-// --extrinsic=*
-// --wasm-execution=compiled
-// --heap-pages=4096
-// --json-file=/builds/parity/mirrors/polkadot/.git/.artifacts/bench.json
-// --pallet=pallet_xcm_benchmarks::fungible
-// --chain=kusama-dev
-// --header=./file_header.txt
-// --template=./xcm/pallet-xcm-benchmarks/template.hbs
-// --output=./runtime/kusama/src/weights/xcm/
-
-#![cfg_attr(rustfmt, rustfmt_skip)]
-#![allow(unused_parens)]
-#![allow(unused_imports)]
-#![allow(missing_docs)]
-
-use frame_support::{traits::Get, weights::Weight};
-use core::marker::PhantomData;
-
-/// Weight functions for `pallet_xcm_benchmarks::fungible`.
-pub struct WeightInfo<T>(PhantomData<T>);
-impl<T: frame_system::Config> WeightInfo<T> {
-	/// Storage: `System::Account` (r:1 w:1)
-	/// Proof: `System::Account` (`max_values`: None, `max_size`: Some(128), added: 2603, mode: `MaxEncodedLen`)
-	pub(crate) fn withdraw_asset() -> Weight {
-		// Proof Size summary in bytes:
-		//  Measured:  `101`
-		//  Estimated: `3593`
-		// Minimum execution time: 23_950_000 picoseconds.
-		Weight::from_parts(24_720_000, 3593)
-			.saturating_add(T::DbWeight::get().reads(1))
-			.saturating_add(T::DbWeight::get().writes(1))
-	}
-	/// Storage: `System::Account` (r:2 w:2)
-	/// Proof: `System::Account` (`max_values`: None, `max_size`: Some(128), added: 2603, mode: `MaxEncodedLen`)
-	pub(crate) fn transfer_asset() -> Weight {
-		// Proof Size summary in bytes:
-		//  Measured:  `101`
-		//  Estimated: `6196`
-		// Minimum execution time: 51_687_000 picoseconds.
-		Weight::from_parts(52_490_000, 6196)
-			.saturating_add(T::DbWeight::get().reads(2))
-			.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: `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: `Dmp::DownwardMessageQueueHeads` (r:1 w:1)
-	/// Proof: `Dmp::DownwardMessageQueueHeads` (`max_values`: None, `max_size`: None, mode: `Measured`)
-	pub(crate) fn transfer_reserve_asset() -> Weight {
-		// Proof Size summary in bytes:
-		//  Measured:  `177`
-		//  Estimated: `6196`
-		// Minimum execution time: 75_438_000 picoseconds.
-		Weight::from_parts(77_495_000, 6196)
-			.saturating_add(T::DbWeight::get().reads(6))
-			.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`)
-	pub(crate) fn reserve_asset_deposited() -> Weight {
-		// Proof Size summary in bytes:
-		//  Measured:  `0`
-		//  Estimated: `0`
-		// Minimum execution time: 2_000_000_000_000 picoseconds.
-		Weight::from_parts(2_000_000_000_000, 0)
-	}
-	/// 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: `Dmp::DownwardMessageQueueHeads` (r:1 w:1)
-	/// Proof: `Dmp::DownwardMessageQueueHeads` (`max_values`: None, `max_size`: None, mode: `Measured`)
-	pub(crate) fn initiate_reserve_withdraw() -> Weight {
-		// Proof Size summary in bytes:
-		//  Measured:  `76`
-		//  Estimated: `3541`
-		// Minimum execution time: 28_370_000 picoseconds.
-		Weight::from_parts(29_100_000, 3541)
-			.saturating_add(T::DbWeight::get().reads(4))
-			.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`)
-	pub(crate) fn receive_teleported_asset() -> Weight {
-		// Proof Size summary in bytes:
-		//  Measured:  `103`
-		//  Estimated: `3593`
-		// Minimum execution time: 23_041_000 picoseconds.
-		Weight::from_parts(23_433_000, 3593)
-			.saturating_add(T::DbWeight::get().reads(1))
-			.saturating_add(T::DbWeight::get().writes(1))
-	}
-	/// Storage: `System::Account` (r:1 w:1)
-	/// Proof: `System::Account` (`max_values`: None, `max_size`: Some(128), added: 2603, mode: `MaxEncodedLen`)
-	pub(crate) fn deposit_asset() -> Weight {
-		// Proof Size summary in bytes:
-		//  Measured:  `0`
-		//  Estimated: `3593`
-		// Minimum execution time: 25_386_000 picoseconds.
-		Weight::from_parts(25_904_000, 3593)
-			.saturating_add(T::DbWeight::get().reads(1))
-			.saturating_add(T::DbWeight::get().writes(1))
-	}
-	/// 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)
-	/// 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: `Dmp::DownwardMessageQueueHeads` (r:1 w:1)
-	/// Proof: `Dmp::DownwardMessageQueueHeads` (`max_values`: None, `max_size`: None, mode: `Measured`)
-	pub(crate) fn deposit_reserve_asset() -> Weight {
-		// Proof Size summary in bytes:
-		//  Measured:  `76`
-		//  Estimated: `3593`
-		// Minimum execution time: 50_645_000 picoseconds.
-		Weight::from_parts(51_719_000, 3593)
-			.saturating_add(T::DbWeight::get().reads(5))
-			.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: `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: `Dmp::DownwardMessageQueueHeads` (r:1 w:1)
-	/// Proof: `Dmp::DownwardMessageQueueHeads` (`max_values`: None, `max_size`: None, mode: `Measured`)
-	pub(crate) fn initiate_teleport() -> Weight {
-		// Proof Size summary in bytes:
-		//  Measured:  `76`
-		//  Estimated: `3593`
-		// Minimum execution time: 53_055_000 picoseconds.
-		Weight::from_parts(54_214_000, 3593)
-			.saturating_add(T::DbWeight::get().reads(5))
-			.saturating_add(T::DbWeight::get().writes(3))
-	}
-}
diff --git a/polkadot/runtime/kusama/src/weights/xcm/pallet_xcm_benchmarks_generic.rs b/polkadot/runtime/kusama/src/weights/xcm/pallet_xcm_benchmarks_generic.rs
deleted file mode 100644
index fb0ca3c19f425643f2532a0f5241688c6d84a69b..0000000000000000000000000000000000000000
--- a/polkadot/runtime/kusama/src/weights/xcm/pallet_xcm_benchmarks_generic.rs
+++ /dev/null
@@ -1,341 +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/>.
-
-//! Autogenerated weights for `pallet_xcm_benchmarks::generic`
-//!
-//! THIS FILE WAS AUTO-GENERATED USING THE SUBSTRATE BENCHMARK CLI VERSION 4.0.0-dev
-//! DATE: 2023-06-02, STEPS: `50`, REPEAT: `20`, LOW RANGE: `[]`, HIGH RANGE: `[]`
-//! WORST CASE MAP SIZE: `1000000`
-//! HOSTNAME: `bm3`, CPU: `Intel(R) Core(TM) i7-7700K CPU @ 4.20GHz`
-//! EXECUTION: Some(Wasm), WASM-EXECUTION: Compiled, CHAIN: Some("kusama-dev"), DB CACHE: 1024
-
-// Executed Command:
-// ./target/production/polkadot
-// benchmark
-// pallet
-// --steps=50
-// --repeat=20
-// --extrinsic=*
-// --execution=wasm
-// --wasm-execution=compiled
-// --heap-pages=4096
-// --json-file=/var/lib/gitlab-runner/builds/zyw4fam_/0/parity/mirrors/polkadot/.git/.artifacts/bench.json
-// --pallet=pallet_xcm_benchmarks::generic
-// --chain=kusama-dev
-// --header=./file_header.txt
-// --template=./xcm/pallet-xcm-benchmarks/template.hbs
-// --output=./runtime/kusama/src/weights/xcm/
-
-#![cfg_attr(rustfmt, rustfmt_skip)]
-#![allow(unused_parens)]
-#![allow(unused_imports)]
-#![allow(missing_docs)]
-
-use frame_support::{traits::Get, weights::Weight};
-use core::marker::PhantomData;
-
-/// Weight functions for `pallet_xcm_benchmarks::generic`.
-pub struct WeightInfo<T>(PhantomData<T>);
-impl<T: frame_system::Config> WeightInfo<T> {
-	/// Storage: unknown `0x3a696e747261626c6f636b5f656e74726f7079` (r:1 w:1)
-	/// Proof Skipped: unknown `0x3a696e747261626c6f636b5f656e74726f7079` (r:1 w:1)
-	/// Storage: Dmp DeliveryFeeFactor (r:1 w:0)
-	/// Proof Skipped: Dmp DeliveryFeeFactor (max_values: None, max_size: None, mode: Measured)
-	/// Storage: XcmPallet SupportedVersion (r:1 w:0)
-	/// Proof Skipped: XcmPallet SupportedVersion (max_values: None, max_size: None, mode: Measured)
-	/// Storage: XcmPallet VersionDiscoveryQueue (r:1 w:1)
-	/// Proof Skipped: XcmPallet VersionDiscoveryQueue (max_values: Some(1), max_size: None, mode: Measured)
-	/// Storage: XcmPallet SafeXcmVersion (r:1 w:0)
-	/// Proof Skipped: XcmPallet SafeXcmVersion (max_values: Some(1), max_size: None, mode: Measured)
-	/// Storage: Dmp DownwardMessageQueues (r:1 w:1)
-	/// Proof Skipped: Dmp DownwardMessageQueues (max_values: None, max_size: None, mode: Measured)
-	/// Storage: Dmp DownwardMessageQueueHeads (r:1 w:1)
-	/// Proof Skipped: Dmp DownwardMessageQueueHeads (max_values: None, max_size: None, mode: Measured)
-	pub(crate) fn report_holding() -> Weight {
-		// Proof Size summary in bytes:
-		//  Measured:  `211`
-		//  Estimated: `3676`
-		// Minimum execution time: 32_102_000 picoseconds.
-		Weight::from_parts(33_749_000, 3676)
-			.saturating_add(T::DbWeight::get().reads(7))
-			.saturating_add(T::DbWeight::get().writes(4))
-	}
-	pub(crate) fn buy_execution() -> Weight {
-		// Proof Size summary in bytes:
-		//  Measured:  `0`
-		//  Estimated: `0`
-		// Minimum execution time: 2_624_000 picoseconds.
-		Weight::from_parts(2_714_000, 0)
-	}
-	/// Storage: XcmPallet Queries (r:1 w:0)
-	/// Proof Skipped: XcmPallet Queries (max_values: None, max_size: None, mode: Measured)
-	pub(crate) fn query_response() -> Weight {
-		// Proof Size summary in bytes:
-		//  Measured:  `169`
-		//  Estimated: `3634`
-		// Minimum execution time: 10_599_000 picoseconds.
-		Weight::from_parts(10_882_000, 3634)
-			.saturating_add(T::DbWeight::get().reads(1))
-	}
-	pub(crate) fn transact() -> Weight {
-		// Proof Size summary in bytes:
-		//  Measured:  `0`
-		//  Estimated: `0`
-		// Minimum execution time: 11_985_000 picoseconds.
-		Weight::from_parts(12_274_000, 0)
-	}
-	pub(crate) fn refund_surplus() -> Weight {
-		// Proof Size summary in bytes:
-		//  Measured:  `0`
-		//  Estimated: `0`
-		// Minimum execution time: 2_739_000 picoseconds.
-		Weight::from_parts(2_862_000, 0)
-	}
-	pub(crate) fn set_error_handler() -> Weight {
-		// Proof Size summary in bytes:
-		//  Measured:  `0`
-		//  Estimated: `0`
-		// Minimum execution time: 2_533_000 picoseconds.
-		Weight::from_parts(2_646_000, 0)
-	}
-	pub(crate) fn set_appendix() -> Weight {
-		// Proof Size summary in bytes:
-		//  Measured:  `0`
-		//  Estimated: `0`
-		// Minimum execution time: 2_563_000 picoseconds.
-		Weight::from_parts(2_647_000, 0)
-	}
-	pub(crate) fn clear_error() -> Weight {
-		// Proof Size summary in bytes:
-		//  Measured:  `0`
-		//  Estimated: `0`
-		// Minimum execution time: 2_512_000 picoseconds.
-		Weight::from_parts(2_574_000, 0)
-	}
-	pub(crate) fn descend_origin() -> Weight {
-		// Proof Size summary in bytes:
-		//  Measured:  `0`
-		//  Estimated: `0`
-		// Minimum execution time: 3_307_000 picoseconds.
-		Weight::from_parts(3_448_000, 0)
-	}
-	pub(crate) fn clear_origin() -> Weight {
-		// Proof Size summary in bytes:
-		//  Measured:  `0`
-		//  Estimated: `0`
-		// Minimum execution time: 2_524_000 picoseconds.
-		Weight::from_parts(2_614_000, 0)
-	}
-	/// Storage: unknown `0x3a696e747261626c6f636b5f656e74726f7079` (r:1 w:1)
-	/// Proof Skipped: unknown `0x3a696e747261626c6f636b5f656e74726f7079` (r:1 w:1)
-	/// Storage: Dmp DeliveryFeeFactor (r:1 w:0)
-	/// Proof Skipped: Dmp DeliveryFeeFactor (max_values: None, max_size: None, mode: Measured)
-	/// Storage: XcmPallet SupportedVersion (r:1 w:0)
-	/// Proof Skipped: XcmPallet SupportedVersion (max_values: None, max_size: None, mode: Measured)
-	/// Storage: XcmPallet VersionDiscoveryQueue (r:1 w:1)
-	/// Proof Skipped: XcmPallet VersionDiscoveryQueue (max_values: Some(1), max_size: None, mode: Measured)
-	/// Storage: XcmPallet SafeXcmVersion (r:1 w:0)
-	/// Proof Skipped: XcmPallet SafeXcmVersion (max_values: Some(1), max_size: None, mode: Measured)
-	/// Storage: Dmp DownwardMessageQueues (r:1 w:1)
-	/// Proof Skipped: Dmp DownwardMessageQueues (max_values: None, max_size: None, mode: Measured)
-	/// Storage: Dmp DownwardMessageQueueHeads (r:1 w:1)
-	/// Proof Skipped: Dmp DownwardMessageQueueHeads (max_values: None, max_size: None, mode: Measured)
-	pub(crate) fn report_error() -> Weight {
-		// Proof Size summary in bytes:
-		//  Measured:  `211`
-		//  Estimated: `3676`
-		// Minimum execution time: 27_275_000 picoseconds.
-		Weight::from_parts(27_861_000, 3676)
-			.saturating_add(T::DbWeight::get().reads(7))
-			.saturating_add(T::DbWeight::get().writes(4))
-	}
-	/// Storage: XcmPallet AssetTraps (r:1 w:1)
-	/// Proof Skipped: XcmPallet AssetTraps (max_values: None, max_size: None, mode: Measured)
-	pub(crate) fn claim_asset() -> Weight {
-		// Proof Size summary in bytes:
-		//  Measured:  `226`
-		//  Estimated: `3691`
-		// Minimum execution time: 14_731_000 picoseconds.
-		Weight::from_parts(15_006_000, 3691)
-			.saturating_add(T::DbWeight::get().reads(1))
-			.saturating_add(T::DbWeight::get().writes(1))
-	}
-	pub(crate) fn trap() -> Weight {
-		// Proof Size summary in bytes:
-		//  Measured:  `0`
-		//  Estimated: `0`
-		// Minimum execution time: 2_446_000 picoseconds.
-		Weight::from_parts(2_581_000, 0)
-	}
-	/// Storage: XcmPallet VersionNotifyTargets (r:1 w:1)
-	/// Proof Skipped: XcmPallet VersionNotifyTargets (max_values: None, max_size: None, mode: Measured)
-	/// Storage: unknown `0x3a696e747261626c6f636b5f656e74726f7079` (r:1 w:1)
-	/// Proof Skipped: unknown `0x3a696e747261626c6f636b5f656e74726f7079` (r:1 w:1)
-	/// Storage: Dmp DeliveryFeeFactor (r:1 w:0)
-	/// Proof Skipped: Dmp DeliveryFeeFactor (max_values: None, max_size: None, mode: Measured)
-	/// Storage: XcmPallet SupportedVersion (r:1 w:0)
-	/// Proof Skipped: XcmPallet SupportedVersion (max_values: None, max_size: None, mode: Measured)
-	/// Storage: XcmPallet VersionDiscoveryQueue (r:1 w:1)
-	/// Proof Skipped: XcmPallet VersionDiscoveryQueue (max_values: Some(1), max_size: None, mode: Measured)
-	/// Storage: XcmPallet SafeXcmVersion (r:1 w:0)
-	/// Proof Skipped: XcmPallet SafeXcmVersion (max_values: Some(1), max_size: None, mode: Measured)
-	/// Storage: Dmp DownwardMessageQueues (r:1 w:1)
-	/// Proof Skipped: Dmp DownwardMessageQueues (max_values: None, max_size: None, mode: Measured)
-	/// Storage: Dmp DownwardMessageQueueHeads (r:1 w:1)
-	/// Proof Skipped: Dmp DownwardMessageQueueHeads (max_values: None, max_size: None, mode: Measured)
-	pub(crate) fn subscribe_version() -> Weight {
-		// Proof Size summary in bytes:
-		//  Measured:  `211`
-		//  Estimated: `3676`
-		// Minimum execution time: 34_319_000 picoseconds.
-		Weight::from_parts(34_708_000, 3676)
-			.saturating_add(T::DbWeight::get().reads(8))
-			.saturating_add(T::DbWeight::get().writes(5))
-	}
-	/// Storage: XcmPallet VersionNotifyTargets (r:0 w:1)
-	/// Proof Skipped: XcmPallet VersionNotifyTargets (max_values: None, max_size: None, mode: Measured)
-	pub(crate) fn unsubscribe_version() -> Weight {
-		// Proof Size summary in bytes:
-		//  Measured:  `0`
-		//  Estimated: `0`
-		// Minimum execution time: 4_974_000 picoseconds.
-		Weight::from_parts(5_155_000, 0)
-			.saturating_add(T::DbWeight::get().writes(1))
-	}
-	pub(crate) fn burn_asset() -> Weight {
-		// Proof Size summary in bytes:
-		//  Measured:  `0`
-		//  Estimated: `0`
-		// Minimum execution time: 4_059_000 picoseconds.
-		Weight::from_parts(4_125_000, 0)
-	}
-	pub(crate) fn expect_asset() -> Weight {
-		// Proof Size summary in bytes:
-		//  Measured:  `0`
-		//  Estimated: `0`
-		// Minimum execution time: 2_657_000 picoseconds.
-		Weight::from_parts(2_741_000, 0)
-	}
-	pub(crate) fn expect_origin() -> Weight {
-		// Proof Size summary in bytes:
-		//  Measured:  `0`
-		//  Estimated: `0`
-		// Minimum execution time: 2_585_000 picoseconds.
-		Weight::from_parts(2_653_000, 0)
-	}
-	pub(crate) fn expect_error() -> Weight {
-		// Proof Size summary in bytes:
-		//  Measured:  `0`
-		//  Estimated: `0`
-		// Minimum execution time: 2_552_000 picoseconds.
-		Weight::from_parts(2_632_000, 0)
-	}
-	pub(crate) fn expect_transact_status() -> Weight {
-		// Proof Size summary in bytes:
-		//  Measured:  `0`
-		//  Estimated: `0`
-		// Minimum execution time: 2_682_000 picoseconds.
-		Weight::from_parts(2_763_000, 0)
-	}
-	/// Storage: unknown `0x3a696e747261626c6f636b5f656e74726f7079` (r:1 w:1)
-	/// Proof Skipped: unknown `0x3a696e747261626c6f636b5f656e74726f7079` (r:1 w:1)
-	/// Storage: Dmp DeliveryFeeFactor (r:1 w:0)
-	/// Proof Skipped: Dmp DeliveryFeeFactor (max_values: None, max_size: None, mode: Measured)
-	/// Storage: XcmPallet SupportedVersion (r:1 w:0)
-	/// Proof Skipped: XcmPallet SupportedVersion (max_values: None, max_size: None, mode: Measured)
-	/// Storage: XcmPallet VersionDiscoveryQueue (r:1 w:1)
-	/// Proof Skipped: XcmPallet VersionDiscoveryQueue (max_values: Some(1), max_size: None, mode: Measured)
-	/// Storage: XcmPallet SafeXcmVersion (r:1 w:0)
-	/// Proof Skipped: XcmPallet SafeXcmVersion (max_values: Some(1), max_size: None, mode: Measured)
-	/// Storage: Dmp DownwardMessageQueues (r:1 w:1)
-	/// Proof Skipped: Dmp DownwardMessageQueues (max_values: None, max_size: None, mode: Measured)
-	/// Storage: Dmp DownwardMessageQueueHeads (r:1 w:1)
-	/// Proof Skipped: Dmp DownwardMessageQueueHeads (max_values: None, max_size: None, mode: Measured)
-	pub(crate) fn query_pallet() -> Weight {
-		// Proof Size summary in bytes:
-		//  Measured:  `211`
-		//  Estimated: `3676`
-		// Minimum execution time: 34_316_000 picoseconds.
-		Weight::from_parts(34_682_000, 3676)
-			.saturating_add(T::DbWeight::get().reads(7))
-			.saturating_add(T::DbWeight::get().writes(4))
-	}
-	pub(crate) fn expect_pallet() -> Weight {
-		// Proof Size summary in bytes:
-		//  Measured:  `0`
-		//  Estimated: `0`
-		// Minimum execution time: 7_938_000 picoseconds.
-		Weight::from_parts(8_071_000, 0)
-	}
-	/// Storage: unknown `0x3a696e747261626c6f636b5f656e74726f7079` (r:1 w:1)
-	/// Proof Skipped: unknown `0x3a696e747261626c6f636b5f656e74726f7079` (r:1 w:1)
-	/// Storage: Dmp DeliveryFeeFactor (r:1 w:0)
-	/// Proof Skipped: Dmp DeliveryFeeFactor (max_values: None, max_size: None, mode: Measured)
-	/// Storage: XcmPallet SupportedVersion (r:1 w:0)
-	/// Proof Skipped: XcmPallet SupportedVersion (max_values: None, max_size: None, mode: Measured)
-	/// Storage: XcmPallet VersionDiscoveryQueue (r:1 w:1)
-	/// Proof Skipped: XcmPallet VersionDiscoveryQueue (max_values: Some(1), max_size: None, mode: Measured)
-	/// Storage: XcmPallet SafeXcmVersion (r:1 w:0)
-	/// Proof Skipped: XcmPallet SafeXcmVersion (max_values: Some(1), max_size: None, mode: Measured)
-	/// Storage: Dmp DownwardMessageQueues (r:1 w:1)
-	/// Proof Skipped: Dmp DownwardMessageQueues (max_values: None, max_size: None, mode: Measured)
-	/// Storage: Dmp DownwardMessageQueueHeads (r:1 w:1)
-	/// Proof Skipped: Dmp DownwardMessageQueueHeads (max_values: None, max_size: None, mode: Measured)
-	pub(crate) fn report_transact_status() -> Weight {
-		// Proof Size summary in bytes:
-		//  Measured:  `211`
-		//  Estimated: `3676`
-		// Minimum execution time: 28_002_000 picoseconds.
-		Weight::from_parts(28_184_000, 3676)
-			.saturating_add(T::DbWeight::get().reads(7))
-			.saturating_add(T::DbWeight::get().writes(4))
-	}
-	pub(crate) fn clear_transact_status() -> Weight {
-		// Proof Size summary in bytes:
-		//  Measured:  `0`
-		//  Estimated: `0`
-		// Minimum execution time: 2_520_000 picoseconds.
-		Weight::from_parts(2_617_000, 0)
-	}
-	pub(crate) fn set_topic() -> Weight {
-		// Proof Size summary in bytes:
-		//  Measured:  `0`
-		//  Estimated: `0`
-		// Minimum execution time: 2_506_000 picoseconds.
-		Weight::from_parts(2_560_000, 0)
-	}
-	pub(crate) fn clear_topic() -> Weight {
-		// Proof Size summary in bytes:
-		//  Measured:  `0`
-		//  Estimated: `0`
-		// Minimum execution time: 2_503_000 picoseconds.
-		Weight::from_parts(2_605_000, 0)
-	}
-	pub(crate) fn set_fees_mode() -> Weight {
-		// Proof Size summary in bytes:
-		//  Measured:  `0`
-		//  Estimated: `0`
-		// Minimum execution time: 2_511_000 picoseconds.
-		Weight::from_parts(2_597_000, 0)
-	}
-	pub(crate) fn unpaid_execution() -> Weight {
-		// Proof Size summary in bytes:
-		//  Measured:  `0`
-		//  Estimated: `0`
-		// Minimum execution time: 2_617_000 picoseconds.
-		Weight::from_parts(2_715_000, 0)
-	}
-}
diff --git a/polkadot/runtime/kusama/src/xcm_config.rs b/polkadot/runtime/kusama/src/xcm_config.rs
deleted file mode 100644
index c90e6c55a94b42d9e3c1273dbfbc8a7ae105bb89..0000000000000000000000000000000000000000
--- a/polkadot/runtime/kusama/src/xcm_config.rs
+++ /dev/null
@@ -1,465 +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/>.
-
-//! XCM configurations for the Kusama runtime.
-
-use super::{
-	parachains_origin, AccountId, AllPalletsWithSystem, Balances, Dmp, Fellows, ParaId, Runtime,
-	RuntimeCall, RuntimeEvent, RuntimeOrigin, StakingAdmin, TransactionByteFee, WeightToFee,
-	XcmPallet,
-};
-use frame_support::{
-	match_types, parameter_types,
-	traits::{Contains, Everything, Nothing},
-	weights::Weight,
-};
-use frame_system::EnsureRoot;
-use kusama_runtime_constants::currency::CENTS;
-use runtime_common::{
-	crowdloan, paras_registrar,
-	xcm_sender::{ChildParachainRouter, ExponentialPrice},
-	ToAuthor,
-};
-use sp_core::ConstU32;
-use xcm::latest::prelude::*;
-use xcm_builder::{
-	AccountId32Aliases, AllowExplicitUnpaidExecutionFrom, AllowKnownQueryResponses,
-	AllowSubscriptionsFrom, AllowTopLevelPaidExecutionFrom, ChildParachainAsNative,
-	ChildParachainConvertsVia, ChildSystemParachainAsSuperuser,
-	CurrencyAdapter as XcmCurrencyAdapter, IsChildSystemParachain, IsConcrete, MintLocation,
-	OriginToPluralityVoice, SignedAccountId32AsNative, SignedToAccountId32,
-	SovereignSignedViaLocation, TakeWeightCredit, TrailingSetTopicAsId, UsingComponents,
-	WeightInfoBounds, WithComputedOrigin, WithUniqueTopic,
-};
-use xcm_executor::traits::WithOriginFilter;
-
-parameter_types! {
-	/// The location of the KSM token, from the context of this chain. Since this token is native to this
-	/// chain, we make it synonymous with it and thus it is the `Here` location, which means "equivalent to
-	/// the context".
-	pub const TokenLocation: MultiLocation = Here.into_location();
-	/// The Kusama network ID. This is named.
-	pub const ThisNetwork: NetworkId = Kusama;
-	/// Our XCM location ancestry - i.e. our location within the Consensus Universe.
-	///
-	/// Since Kusama is a top-level relay-chain with its own consensus, it's just our network ID.
-	pub UniversalLocation: InteriorMultiLocation = ThisNetwork::get().into();
-	/// The check account, which holds any native assets that have been teleported out and not back in (yet).
-	pub CheckAccount: AccountId = XcmPallet::check_account();
-	/// The check account that is allowed to mint assets locally.
-	pub LocalCheckAccount: (AccountId, MintLocation) = (CheckAccount::get(), MintLocation::Local);
-}
-
-/// The canonical means of converting a `MultiLocation` into an `AccountId`, used when we want to
-/// determine the sovereign account controlled by a location.
-pub type SovereignAccountOf = (
-	// We can convert a child parachain using the standard `AccountId` conversion.
-	ChildParachainConvertsVia<ParaId, AccountId>,
-	// We can directly alias an `AccountId32` into a local account.
-	AccountId32Aliases<ThisNetwork, AccountId>,
-);
-
-/// Our asset transactor. This is what allows us to interest with the runtime facilities from the
-/// point of view of XCM-only concepts like `MultiLocation` and `MultiAsset`.
-///
-/// Ours is only aware of the Balances pallet, which is mapped to `TokenLocation`.
-pub type LocalAssetTransactor = XcmCurrencyAdapter<
-	// Use this currency:
-	Balances,
-	// Use this currency when it is a fungible asset matching the given location or name:
-	IsConcrete<TokenLocation>,
-	// We can convert the MultiLocations with our converter above:
-	SovereignAccountOf,
-	// Our chain's account ID type (we can't get away without mentioning it explicitly):
-	AccountId,
-	// We track our teleports in/out to keep total issuance correct.
-	LocalCheckAccount,
->;
-
-/// The means that we convert the XCM message origin location into a local dispatch origin.
-type LocalOriginConverter = (
-	// A `Signed` origin of the sovereign account that the original location controls.
-	SovereignSignedViaLocation<SovereignAccountOf, RuntimeOrigin>,
-	// A child parachain, natively expressed, has the `Parachain` origin.
-	ChildParachainAsNative<parachains_origin::Origin, RuntimeOrigin>,
-	// The AccountId32 location type can be expressed natively as a `Signed` origin.
-	SignedAccountId32AsNative<ThisNetwork, RuntimeOrigin>,
-	// A system child parachain, expressed as a Superuser, converts to the `Root` origin.
-	ChildSystemParachainAsSuperuser<ParaId, RuntimeOrigin>,
-);
-
-parameter_types! {
-	/// The amount of weight an XCM operation takes. This is a safe overestimate.
-	pub const BaseXcmWeight: Weight = Weight::from_parts(1_000_000_000, 64 * 1024);
-	/// Maximum number of instructions in a single XCM fragment. A sanity check against weight
-	/// calculations getting too crazy.
-	pub const MaxInstructions: u32 = 100;
-	/// The asset ID for the asset that we use to pay for message delivery fees.
-	pub FeeAssetId: AssetId = Concrete(TokenLocation::get());
-	/// The base fee for the message delivery fees.
-	pub const BaseDeliveryFee: u128 = CENTS.saturating_mul(3);
-}
-
-/// The XCM router. When we want to send an XCM message, we use this type. It amalgamates all of our
-/// individual routers.
-pub type XcmRouter = WithUniqueTopic<(
-	// Only one router so far - use DMP to communicate with child parachains.
-	ChildParachainRouter<
-		Runtime,
-		XcmPallet,
-		ExponentialPrice<FeeAssetId, BaseDeliveryFee, TransactionByteFee, Dmp>,
-	>,
-)>;
-
-parameter_types! {
-	pub const Ksm: MultiAssetFilter = Wild(AllOf { fun: WildFungible, id: Concrete(TokenLocation::get()) });
-	pub const Statemine: MultiLocation = Parachain(1000).into_location();
-	pub const Encointer: MultiLocation = Parachain(1001).into_location();
-	pub const KsmForStatemine: (MultiAssetFilter, MultiLocation) = (Ksm::get(), Statemine::get());
-	pub const KsmForEncointer: (MultiAssetFilter, MultiLocation) = (Ksm::get(), Encointer::get());
-	pub const MaxAssetsIntoHolding: u32 = 64;
-}
-pub type TrustedTeleporters =
-	(xcm_builder::Case<KsmForStatemine>, xcm_builder::Case<KsmForEncointer>);
-
-match_types! {
-	pub type OnlyParachains: impl Contains<MultiLocation> = {
-		MultiLocation { parents: 0, interior: X1(Parachain(_)) }
-	};
-}
-
-/// The barriers one of which must be passed for an XCM message to be executed.
-pub type Barrier = TrailingSetTopicAsId<(
-	// Weight that is paid for may be consumed.
-	TakeWeightCredit,
-	// Expected responses are OK.
-	AllowKnownQueryResponses<XcmPallet>,
-	WithComputedOrigin<
-		(
-			// If the message is one that immediately attempts to pay for execution, then allow it.
-			AllowTopLevelPaidExecutionFrom<Everything>,
-			// Messages coming from system parachains need not pay for execution.
-			AllowExplicitUnpaidExecutionFrom<IsChildSystemParachain<ParaId>>,
-			// Subscriptions for version tracking are OK.
-			AllowSubscriptionsFrom<OnlyParachains>,
-		),
-		UniversalLocation,
-		ConstU32<8>,
-	>,
-)>;
-
-/// A call filter for the XCM Transact instruction. This is a temporary measure until we properly
-/// account for proof size weights.
-///
-/// Calls that are allowed through this filter must:
-/// 1. Have a fixed weight;
-/// 2. Cannot lead to another call being made;
-/// 3. Have a defined proof size weight, e.g. no unbounded vecs in call parameters.
-pub struct SafeCallFilter;
-impl Contains<RuntimeCall> for SafeCallFilter {
-	fn contains(call: &RuntimeCall) -> bool {
-		#[cfg(feature = "runtime-benchmarks")]
-		{
-			if matches!(call, RuntimeCall::System(frame_system::Call::remark_with_event { .. })) {
-				return true
-			}
-		}
-
-		match call {
-			RuntimeCall::System(
-				frame_system::Call::kill_prefix { .. } | frame_system::Call::set_heap_pages { .. },
-			) |
-			RuntimeCall::Babe(..) |
-			RuntimeCall::Timestamp(..) |
-			RuntimeCall::Indices(..) |
-			RuntimeCall::Balances(..) |
-			RuntimeCall::Crowdloan(
-				crowdloan::Call::create { .. } |
-				crowdloan::Call::contribute { .. } |
-				crowdloan::Call::withdraw { .. } |
-				crowdloan::Call::refund { .. } |
-				crowdloan::Call::dissolve { .. } |
-				crowdloan::Call::edit { .. } |
-				crowdloan::Call::poke { .. } |
-				crowdloan::Call::contribute_all { .. },
-			) |
-			RuntimeCall::Staking(
-				pallet_staking::Call::bond { .. } |
-				pallet_staking::Call::bond_extra { .. } |
-				pallet_staking::Call::unbond { .. } |
-				pallet_staking::Call::withdraw_unbonded { .. } |
-				pallet_staking::Call::validate { .. } |
-				pallet_staking::Call::nominate { .. } |
-				pallet_staking::Call::chill { .. } |
-				pallet_staking::Call::set_payee { .. } |
-				pallet_staking::Call::set_controller { .. } |
-				pallet_staking::Call::set_validator_count { .. } |
-				pallet_staking::Call::increase_validator_count { .. } |
-				pallet_staking::Call::scale_validator_count { .. } |
-				pallet_staking::Call::force_no_eras { .. } |
-				pallet_staking::Call::force_new_era { .. } |
-				pallet_staking::Call::set_invulnerables { .. } |
-				pallet_staking::Call::force_unstake { .. } |
-				pallet_staking::Call::force_new_era_always { .. } |
-				pallet_staking::Call::payout_stakers { .. } |
-				pallet_staking::Call::rebond { .. } |
-				pallet_staking::Call::reap_stash { .. } |
-				pallet_staking::Call::set_staking_configs { .. } |
-				pallet_staking::Call::chill_other { .. } |
-				pallet_staking::Call::force_apply_min_commission { .. },
-			) |
-			RuntimeCall::Session(pallet_session::Call::purge_keys { .. }) |
-			RuntimeCall::Grandpa(..) |
-			RuntimeCall::ImOnline(..) |
-			RuntimeCall::Treasury(..) |
-			RuntimeCall::ConvictionVoting(..) |
-			RuntimeCall::Referenda(
-				pallet_referenda::Call::place_decision_deposit { .. } |
-				pallet_referenda::Call::refund_decision_deposit { .. } |
-				pallet_referenda::Call::cancel { .. } |
-				pallet_referenda::Call::kill { .. } |
-				pallet_referenda::Call::nudge_referendum { .. } |
-				pallet_referenda::Call::one_fewer_deciding { .. },
-			) |
-			RuntimeCall::FellowshipCollective(..) |
-			RuntimeCall::FellowshipReferenda(
-				pallet_referenda::Call::place_decision_deposit { .. } |
-				pallet_referenda::Call::refund_decision_deposit { .. } |
-				pallet_referenda::Call::cancel { .. } |
-				pallet_referenda::Call::kill { .. } |
-				pallet_referenda::Call::nudge_referendum { .. } |
-				pallet_referenda::Call::one_fewer_deciding { .. },
-			) |
-			RuntimeCall::Claims(
-				super::claims::Call::claim { .. } |
-				super::claims::Call::mint_claim { .. } |
-				super::claims::Call::move_claim { .. },
-			) |
-			RuntimeCall::Utility(pallet_utility::Call::as_derivative { .. }) |
-			RuntimeCall::Identity(
-				pallet_identity::Call::add_registrar { .. } |
-				pallet_identity::Call::set_identity { .. } |
-				pallet_identity::Call::clear_identity { .. } |
-				pallet_identity::Call::request_judgement { .. } |
-				pallet_identity::Call::cancel_request { .. } |
-				pallet_identity::Call::set_fee { .. } |
-				pallet_identity::Call::set_account_id { .. } |
-				pallet_identity::Call::set_fields { .. } |
-				pallet_identity::Call::provide_judgement { .. } |
-				pallet_identity::Call::kill_identity { .. } |
-				pallet_identity::Call::add_sub { .. } |
-				pallet_identity::Call::rename_sub { .. } |
-				pallet_identity::Call::remove_sub { .. } |
-				pallet_identity::Call::quit_sub { .. },
-			) |
-			RuntimeCall::Society(..) |
-			RuntimeCall::Recovery(..) |
-			RuntimeCall::Vesting(..) |
-			RuntimeCall::Bounties(
-				pallet_bounties::Call::propose_bounty { .. } |
-				pallet_bounties::Call::approve_bounty { .. } |
-				pallet_bounties::Call::propose_curator { .. } |
-				pallet_bounties::Call::unassign_curator { .. } |
-				pallet_bounties::Call::accept_curator { .. } |
-				pallet_bounties::Call::award_bounty { .. } |
-				pallet_bounties::Call::claim_bounty { .. } |
-				pallet_bounties::Call::close_bounty { .. },
-			) |
-			RuntimeCall::ChildBounties(..) |
-			RuntimeCall::ElectionProviderMultiPhase(..) |
-			RuntimeCall::VoterList(..) |
-			RuntimeCall::NominationPools(
-				pallet_nomination_pools::Call::join { .. } |
-				pallet_nomination_pools::Call::bond_extra { .. } |
-				pallet_nomination_pools::Call::claim_payout { .. } |
-				pallet_nomination_pools::Call::unbond { .. } |
-				pallet_nomination_pools::Call::pool_withdraw_unbonded { .. } |
-				pallet_nomination_pools::Call::withdraw_unbonded { .. } |
-				pallet_nomination_pools::Call::create { .. } |
-				pallet_nomination_pools::Call::create_with_pool_id { .. } |
-				pallet_nomination_pools::Call::set_state { .. } |
-				pallet_nomination_pools::Call::set_configs { .. } |
-				pallet_nomination_pools::Call::update_roles { .. } |
-				pallet_nomination_pools::Call::chill { .. },
-			) |
-			RuntimeCall::Hrmp(..) |
-			RuntimeCall::Registrar(
-				paras_registrar::Call::deregister { .. } |
-				paras_registrar::Call::swap { .. } |
-				paras_registrar::Call::remove_lock { .. } |
-				paras_registrar::Call::reserve { .. } |
-				paras_registrar::Call::add_lock { .. },
-			) |
-			RuntimeCall::XcmPallet(pallet_xcm::Call::limited_reserve_transfer_assets {
-				..
-			}) |
-			RuntimeCall::Whitelist(pallet_whitelist::Call::whitelist_call { .. }) |
-			RuntimeCall::Proxy(..) => true,
-			_ => false,
-		}
-	}
-}
-
-pub struct XcmConfig;
-impl xcm_executor::Config for XcmConfig {
-	type RuntimeCall = RuntimeCall;
-	type XcmSender = XcmRouter;
-	type AssetTransactor = LocalAssetTransactor;
-	type OriginConverter = LocalOriginConverter;
-	type IsReserve = ();
-	type IsTeleporter = TrustedTeleporters;
-	type UniversalLocation = UniversalLocation;
-	type Barrier = Barrier;
-	type Weigher = WeightInfoBounds<
-		crate::weights::xcm::KusamaXcmWeight<RuntimeCall>,
-		RuntimeCall,
-		MaxInstructions,
-	>;
-	// The weight trader piggybacks on the existing transaction-fee conversion logic.
-	type Trader =
-		UsingComponents<WeightToFee, TokenLocation, AccountId, Balances, ToAuthor<Runtime>>;
-	type ResponseHandler = XcmPallet;
-	type AssetTrap = XcmPallet;
-	type AssetLocker = ();
-	type AssetExchanger = ();
-	type AssetClaims = XcmPallet;
-	type SubscriptionService = XcmPallet;
-	type PalletInstancesInfo = AllPalletsWithSystem;
-	type MaxAssetsIntoHolding = MaxAssetsIntoHolding;
-	type FeeManager = ();
-	// No bridges yet...
-	type MessageExporter = ();
-	type UniversalAliases = Nothing;
-	type CallDispatcher = WithOriginFilter<SafeCallFilter>;
-	type SafeCallFilter = SafeCallFilter;
-	type Aliasers = Nothing;
-}
-
-parameter_types! {
-	// StakingAdmin pluralistic body.
-	pub const StakingAdminBodyId: BodyId = BodyId::Defense;
-	// Fellows pluralistic body.
-	pub const FellowsBodyId: BodyId = BodyId::Technical;
-}
-
-#[cfg(feature = "runtime-benchmarks")]
-parameter_types! {
-	pub ReachableDest: Option<MultiLocation> = Some(Parachain(1000).into());
-}
-
-/// Type to convert an `Origin` type value into a `MultiLocation` value which represents an interior
-/// location of this chain.
-pub type LocalOriginToLocation = (
-	// And a usual Signed origin to be used in XCM as a corresponding AccountId32
-	SignedToAccountId32<RuntimeOrigin, AccountId, ThisNetwork>,
-);
-
-/// Type to convert the `StakingAdmin` origin to a Plurality `MultiLocation` value.
-pub type StakingAdminToPlurality =
-	OriginToPluralityVoice<RuntimeOrigin, StakingAdmin, StakingAdminBodyId>;
-
-/// Type to convert the Fellows origin to a Plurality `MultiLocation` value.
-pub type FellowsToPlurality = OriginToPluralityVoice<RuntimeOrigin, Fellows, FellowsBodyId>;
-
-/// Type to convert a pallet `Origin` type value into a `MultiLocation` value which represents an
-/// interior location of this chain for a destination chain.
-pub type LocalPalletOriginToLocation = (
-	// StakingAdmin origin to be used in XCM as a corresponding Plurality `MultiLocation` value.
-	StakingAdminToPlurality,
-	// Fellows origin to be used in XCM as a corresponding Plurality `MultiLocation` value.
-	FellowsToPlurality,
-);
-
-impl pallet_xcm::Config for Runtime {
-	type RuntimeEvent = RuntimeEvent;
-	// We only allow the root, fellows and the staking admin to send messages.
-	// This is basically safe to enable for everyone (safe the possibility of someone spamming the
-	// parachain if they're willing to pay the KSM to send from the Relay-chain), but it's useless
-	// until we bring in XCM v3 which will make `DescendOrigin` a bit more useful.
-	type SendXcmOrigin = xcm_builder::EnsureXcmOrigin<RuntimeOrigin, LocalPalletOriginToLocation>;
-	type XcmRouter = XcmRouter;
-	// Anyone can execute XCM messages locally.
-	type ExecuteXcmOrigin = xcm_builder::EnsureXcmOrigin<RuntimeOrigin, LocalOriginToLocation>;
-	type XcmExecuteFilter = Everything;
-	type XcmExecutor = xcm_executor::XcmExecutor<XcmConfig>;
-	// Anyone is able to use teleportation regardless of who they are and what they want to
-	// teleport.
-	type XcmTeleportFilter = Everything;
-	// Anyone is able to use reserve transfers regardless of who they are and what they want to
-	// transfer.
-	type XcmReserveTransferFilter = Everything;
-	type Weigher = WeightInfoBounds<
-		crate::weights::xcm::KusamaXcmWeight<RuntimeCall>,
-		RuntimeCall,
-		MaxInstructions,
-	>;
-	type UniversalLocation = UniversalLocation;
-	type RuntimeOrigin = RuntimeOrigin;
-	type RuntimeCall = RuntimeCall;
-	const VERSION_DISCOVERY_QUEUE_SIZE: u32 = 100;
-	type AdvertisedXcmVersion = pallet_xcm::CurrentXcmVersion;
-	type Currency = Balances;
-	type CurrencyMatcher = ();
-	type TrustedLockers = ();
-	type SovereignAccountOf = SovereignAccountOf;
-	type MaxLockers = ConstU32<8>;
-	type MaxRemoteLockConsumers = ConstU32<0>;
-	type RemoteLockConsumerIdentifier = ();
-	type WeightInfo = crate::weights::pallet_xcm::WeightInfo<Runtime>;
-	#[cfg(feature = "runtime-benchmarks")]
-	type ReachableDest = ReachableDest;
-	type AdminOrigin = EnsureRoot<AccountId>;
-}
-
-#[test]
-fn karura_liquid_staking_xcm_has_sane_weight_upper_limt() {
-	use frame_support::dispatch::GetDispatchInfo;
-	use parity_scale_codec::Decode;
-	use xcm::VersionedXcm;
-	use xcm_executor::traits::WeightBounds;
-
-	// should be [WithdrawAsset, BuyExecution, Transact, RefundSurplus, DepositAsset]
-	let blob = hex_literal::hex!("02140004000000000700e40b540213000000000700e40b54020006010700c817a804341801000006010b00c490bf4302140d010003ffffffff000100411f");
-	let Ok(VersionedXcm::V2(old_xcm)) = VersionedXcm::<super::RuntimeCall>::decode(&mut &blob[..])
-	else {
-		panic!("can't decode XCM blob")
-	};
-	let mut xcm: Xcm<super::RuntimeCall> =
-		old_xcm.try_into().expect("conversion from v2 to v3 failed");
-	let weight = <XcmConfig as xcm_executor::Config>::Weigher::weight(&mut xcm)
-		.expect("weighing XCM failed");
-
-	// Test that the weigher gives us a sensible weight but don't exactly hard-code it, otherwise it
-	// will be out of date after each re-run.
-	assert!(weight.all_lte(Weight::from_parts(30_313_281_000, 72_722)));
-
-	let Some(Transact { require_weight_at_most, call, .. }) =
-		xcm.inner_mut().into_iter().find(|inst| matches!(inst, Transact { .. }))
-	else {
-		panic!("no Transact instruction found")
-	};
-	// should be pallet_utility.as_derivative { index: 0, call: pallet_staking::bond_extra {
-	// max_additional: 2490000000000 } }
-	let message_call = call.take_decoded().expect("can't decode Transact call");
-	let call_weight = message_call.get_dispatch_info().weight;
-	// Ensure that the Transact instruction is giving a sensible `require_weight_at_most` value
-	assert!(
-		call_weight.all_lte(*require_weight_at_most),
-		"call weight ({:?}) was not less than or equal to require_weight_at_most ({:?})",
-		call_weight,
-		require_weight_at_most
-	);
-}
diff --git a/polkadot/runtime/metrics/Cargo.toml b/polkadot/runtime/metrics/Cargo.toml
index de3114084fdea9e5cd35db86b95e615fdecbc8b4..cfa6bf3dafb2aa02e29d3ee5865aa314d0e7436b 100644
--- a/polkadot/runtime/metrics/Cargo.toml
+++ b/polkadot/runtime/metrics/Cargo.toml
@@ -1,6 +1,6 @@
 [package]
 name = "polkadot-runtime-metrics"
-version.workspace = true
+version = "1.0.0"
 authors.workspace = true
 edition.workspace = true
 license.workspace = true
@@ -12,12 +12,13 @@ parity-scale-codec = { version = "3.6.1", default-features = false }
 primitives = { package = "polkadot-primitives", path = "../../primitives", default-features = false }
 frame-benchmarking = { path = "../../../substrate/frame/benchmarking", default-features = false, optional = true }
 
-bs58 = { version = "0.4.0", default-features = false, features = ["alloc"] }
+bs58 = { version = "0.5.0", default-features = false, features = ["alloc"] }
 
 [features]
 default = [ "std" ]
 std = [
 	"bs58/std",
+	"frame-benchmarking?/std",
 	"parity-scale-codec/std",
 	"primitives/std",
 	"sp-std/std",
diff --git a/polkadot/runtime/parachains/Cargo.toml b/polkadot/runtime/parachains/Cargo.toml
index f4f6476368bc3436679e4b145792d7cc074c55a6..9f1ec57257f821901c2febde5a02c0881aadc1be 100644
--- a/polkadot/runtime/parachains/Cargo.toml
+++ b/polkadot/runtime/parachains/Cargo.toml
@@ -1,17 +1,18 @@
 [package]
 name = "polkadot-runtime-parachains"
-version.workspace = true
+version = "1.0.0"
 authors.workspace = true
 edition.workspace = true
 license.workspace = true
 
 [dependencies]
+impl-trait-for-tuples = "0.2.2"
 bitvec = { version = "1.0.0", default-features = false, features = ["alloc"] }
 parity-scale-codec = { version = "3.6.1", default-features = false, features = ["derive", "max-encoded-len"] }
 log = { version = "0.4.17", default-features = false }
 rustc-hex = { version = "2.1.0", default-features = false }
 scale-info = { version = "2.5.0", default-features = false, features = ["derive"] }
-serde = { version = "1.0.163", default-features = false, features = ["derive", "alloc"] }
+serde = { version = "1.0.188", default-features = false, features = ["derive", "alloc"] }
 derive_more = "0.99.17"
 bitflags = "1.3.2"
 
@@ -40,15 +41,16 @@ frame-benchmarking = { path = "../../../substrate/frame/benchmarking", default-f
 frame-support = { path = "../../../substrate/frame/support", default-features = false }
 frame-system = { path = "../../../substrate/frame/system", default-features = false }
 
-xcm = { package = "xcm", path = "../../xcm", default-features = false }
-xcm-executor = { package = "xcm-executor", path = "../../xcm/xcm-executor", default-features = false }
+xcm = { package = "staging-xcm", path = "../../xcm", default-features = false }
+xcm-executor = { package = "staging-xcm-executor", path = "../../xcm/xcm-executor", default-features = false }
 primitives = { package = "polkadot-primitives", path = "../../primitives", default-features = false }
 
 rand = { version = "0.8.5", default-features = false }
 rand_chacha = { version = "0.3.1", default-features = false }
 static_assertions = { version = "1.1.0", optional = true }
-polkadot-parachain = { path = "../../parachain", default-features = false }
+polkadot-parachain-primitives = { path = "../../parachain", default-features = false }
 polkadot-runtime-metrics = { path = "../metrics", default-features = false}
+polkadot-core-primitives = { path = "../../core-primitives", default-features = false }
 
 [dev-dependencies]
 futures = "0.3.21"
@@ -60,13 +62,14 @@ test-helpers = { package = "polkadot-primitives-test-helpers", path = "../../pri
 sp-tracing = { path = "../../../substrate/primitives/tracing" }
 thousands = "0.2.0"
 assert_matches = "1"
-serde_json = "1.0.96"
+serde_json = "1.0.107"
 
 [features]
 default = [ "std" ]
 no_std = []
 std = [
 	"bitvec/std",
+	"frame-benchmarking?/std",
 	"frame-support/std",
 	"frame-system/std",
 	"inherents/std",
@@ -81,12 +84,15 @@ std = [
 	"pallet-timestamp/std",
 	"pallet-vesting/std",
 	"parity-scale-codec/std",
+	"polkadot-core-primitives/std",
+	"polkadot-parachain-primitives/std",
 	"polkadot-runtime-metrics/std",
 	"primitives/std",
 	"rustc-hex/std",
 	"scale-info/std",
 	"serde/std",
 	"sp-api/std",
+	"sp-application-crypto?/std",
 	"sp-core/std",
 	"sp-io/std",
 	"sp-keystore",
@@ -107,12 +113,18 @@ runtime-benchmarks = [
 	"pallet-staking/runtime-benchmarks",
 	"pallet-timestamp/runtime-benchmarks",
 	"pallet-vesting/runtime-benchmarks",
+	"polkadot-parachain-primitives/runtime-benchmarks",
 	"primitives/runtime-benchmarks",
 	"sp-application-crypto",
+	"sp-runtime/runtime-benchmarks",
+	"sp-staking/runtime-benchmarks",
 	"static_assertions",
+	"xcm-executor/runtime-benchmarks",
 ]
 try-runtime = [
+	"frame-support-test/try-runtime",
 	"frame-support/try-runtime",
+	"frame-system/try-runtime",
 	"pallet-authority-discovery/try-runtime",
 	"pallet-authorship/try-runtime",
 	"pallet-babe/try-runtime",
@@ -122,6 +134,7 @@ try-runtime = [
 	"pallet-staking/try-runtime",
 	"pallet-timestamp/try-runtime",
 	"pallet-vesting/try-runtime",
+	"sp-runtime/try-runtime",
 ]
 runtime-metrics = [
 	"polkadot-runtime-metrics/runtime-metrics",
diff --git a/polkadot/runtime/parachains/src/assigner.rs b/polkadot/runtime/parachains/src/assigner.rs
index 55434da11f307cd2a7af86f6d81d29460df6678f..b21e857a471379a57af4974d2280e9da69448ecd 100644
--- a/polkadot/runtime/parachains/src/assigner.rs
+++ b/polkadot/runtime/parachains/src/assigner.rs
@@ -17,11 +17,11 @@
 //! The Polkadot multiplexing assignment provider.
 //! Provides blockspace assignments for both bulk and on demand parachains.
 use frame_system::pallet_prelude::BlockNumberFor;
-use primitives::{v5::Assignment, CoreIndex, Id as ParaId};
+use primitives::{CoreIndex, Id as ParaId};
 
 use crate::{
 	configuration, paras,
-	scheduler::common::{AssignmentProvider, AssignmentProviderConfig},
+	scheduler::common::{Assignment, AssignmentProvider, AssignmentProviderConfig},
 };
 
 pub use pallet::*;
diff --git a/polkadot/runtime/parachains/src/assigner_on_demand/mod.rs b/polkadot/runtime/parachains/src/assigner_on_demand/mod.rs
index 5a60201e4fa8a4501c185324e8e72099c505bbc3..75c29bd6fbe4f79532823468a4c0a596942491a6 100644
--- a/polkadot/runtime/parachains/src/assigner_on_demand/mod.rs
+++ b/polkadot/runtime/parachains/src/assigner_on_demand/mod.rs
@@ -34,7 +34,7 @@ mod tests;
 
 use crate::{
 	configuration, paras,
-	scheduler::common::{AssignmentProvider, AssignmentProviderConfig},
+	scheduler::common::{Assignment, AssignmentProvider, AssignmentProviderConfig},
 };
 
 use frame_support::{
@@ -46,7 +46,7 @@ use frame_support::{
 	},
 };
 use frame_system::pallet_prelude::*;
-use primitives::{v5::Assignment, CoreIndex, Id as ParaId};
+use primitives::{CoreIndex, Id as ParaId};
 use sp_runtime::{
 	traits::{One, SaturatedConversion},
 	FixedPointNumber, FixedPointOperand, FixedU128, Perbill, Saturating,
@@ -263,8 +263,8 @@ pub mod pallet {
 			Pallet::<T>::do_place_order(sender, max_amount, para_id, AllowDeath)
 		}
 
-		/// Same as the [`place_order_allow_death`] call , but with a check that placing the order
-		/// will not reap the account.
+		/// Same as the [`place_order_allow_death`](Self::place_order_allow_death) call , but with a
+		/// check that placing the order will not reap the account.
 		///
 		/// Parameters:
 		/// - `origin`: The sender of the call, funds will be withdrawn from this account.
@@ -606,7 +606,6 @@ impl<T: Config> AssignmentProvider<BlockNumberFor<T>> for Pallet<T> {
 	fn get_provider_config(_core_idx: CoreIndex) -> AssignmentProviderConfig<BlockNumberFor<T>> {
 		let config = <configuration::Pallet<T>>::config();
 		AssignmentProviderConfig {
-			availability_period: config.paras_availability_period,
 			max_availability_timeouts: config.on_demand_retries,
 			ttl: config.on_demand_ttl,
 		}
diff --git a/polkadot/runtime/parachains/src/assigner_on_demand/tests.rs b/polkadot/runtime/parachains/src/assigner_on_demand/tests.rs
index 8041179cd90c51c6a1d6bb820ba0572539f1e271..d07964b691654b9de57b3f108b6439e2c720514f 100644
--- a/polkadot/runtime/parachains/src/assigner_on_demand/tests.rs
+++ b/polkadot/runtime/parachains/src/assigner_on_demand/tests.rs
@@ -24,13 +24,11 @@ use crate::{
 		System, Test,
 	},
 	paras::{ParaGenesisArgs, ParaKind},
+	scheduler::common::Assignment,
 };
 use frame_support::{assert_noop, assert_ok, error::BadOrigin};
 use pallet_balances::Error as BalancesError;
-use primitives::{
-	v5::{Assignment, ValidationCode},
-	BlockNumber, SessionIndex,
-};
+use primitives::{BlockNumber, SessionIndex, ValidationCode};
 use sp_std::collections::btree_map::BTreeMap;
 
 fn schedule_blank_para(id: ParaId, parakind: ParaKind) {
diff --git a/polkadot/runtime/parachains/src/assigner_parachains.rs b/polkadot/runtime/parachains/src/assigner_parachains.rs
index 9a6b970597d52e58d595afad642ffdde7681e857..d605d86605151071b3c5dda9c825585f723ecaf1 100644
--- a/polkadot/runtime/parachains/src/assigner_parachains.rs
+++ b/polkadot/runtime/parachains/src/assigner_parachains.rs
@@ -19,11 +19,11 @@
 
 use crate::{
 	configuration, paras,
-	scheduler::common::{AssignmentProvider, AssignmentProviderConfig},
+	scheduler::common::{Assignment, AssignmentProvider, AssignmentProviderConfig},
 };
 use frame_system::pallet_prelude::BlockNumberFor;
 pub use pallet::*;
-use primitives::{v5::Assignment, CoreIndex, Id as ParaId};
+use primitives::{CoreIndex, Id as ParaId};
 
 #[frame_support::pallet]
 pub mod pallet {
@@ -57,9 +57,7 @@ impl<T: Config> AssignmentProvider<BlockNumberFor<T>> for Pallet<T> {
 	fn push_assignment_for_core(_: CoreIndex, _: Assignment) {}
 
 	fn get_provider_config(_core_idx: CoreIndex) -> AssignmentProviderConfig<BlockNumberFor<T>> {
-		let config = <configuration::Pallet<T>>::config();
 		AssignmentProviderConfig {
-			availability_period: config.paras_availability_period,
 			// The next assignment already goes to the same [`ParaId`], no timeout tracking needed.
 			max_availability_timeouts: 0,
 			// The next assignment already goes to the same [`ParaId`], this can be any number
diff --git a/polkadot/runtime/parachains/src/builder.rs b/polkadot/runtime/parachains/src/builder.rs
index 4921af5bedda7c0354c30eeef85a153556eb7fee..dced24df0aec83d1f3aba619426f607f0dd88d1b 100644
--- a/polkadot/runtime/parachains/src/builder.rs
+++ b/polkadot/runtime/parachains/src/builder.rs
@@ -18,18 +18,20 @@ use crate::{
 	configuration, inclusion, initializer, paras,
 	paras::ParaKind,
 	paras_inherent,
-	scheduler::{self, common::AssignmentProviderConfig},
+	scheduler::{
+		self,
+		common::{Assignment, AssignmentProviderConfig},
+		CoreOccupied, ParasEntry,
+	},
 	session_info, shared,
 };
 use bitvec::{order::Lsb0 as BitOrderLsb0, vec::BitVec};
 use frame_support::pallet_prelude::*;
 use frame_system::pallet_prelude::*;
 use primitives::{
-	collator_signature_payload,
-	v5::{Assignment, ParasEntry},
-	AvailabilityBitfield, BackedCandidate, CandidateCommitments, CandidateDescriptor,
-	CandidateHash, CollatorId, CollatorSignature, CommittedCandidateReceipt, CompactStatement,
-	CoreIndex, CoreOccupied, DisputeStatement, DisputeStatementSet, GroupIndex, HeadData,
+	collator_signature_payload, AvailabilityBitfield, BackedCandidate, CandidateCommitments,
+	CandidateDescriptor, CandidateHash, CollatorId, CollatorSignature, CommittedCandidateReceipt,
+	CompactStatement, CoreIndex, DisputeStatement, DisputeStatementSet, GroupIndex, HeadData,
 	Id as ParaId, IndexedVec, InherentData as ParachainsInherentData, InvalidDisputeStatementKind,
 	PersistedValidationData, SessionIndex, SigningContext, UncheckedSigned,
 	ValidDisputeStatementKind, ValidationCode, ValidatorId, ValidatorIndex, ValidityAttestation,
diff --git a/polkadot/runtime/parachains/src/configuration.rs b/polkadot/runtime/parachains/src/configuration.rs
index accc01a2b18015856a67860fb32c299953aafd21..a65fda370488a5285e3c751a5a618a00a1c20ef1 100644
--- a/polkadot/runtime/parachains/src/configuration.rs
+++ b/polkadot/runtime/parachains/src/configuration.rs
@@ -22,10 +22,13 @@ use crate::{inclusion::MAX_UPWARD_MESSAGE_SIZE_BOUND, shared};
 use frame_support::{pallet_prelude::*, DefaultNoBound};
 use frame_system::pallet_prelude::*;
 use parity_scale_codec::{Decode, Encode};
-use polkadot_parachain::primitives::{MAX_HORIZONTAL_MESSAGE_NUM, MAX_UPWARD_MESSAGE_NUM};
+use polkadot_parachain_primitives::primitives::{
+	MAX_HORIZONTAL_MESSAGE_NUM, MAX_UPWARD_MESSAGE_NUM,
+};
 use primitives::{
-	vstaging::AsyncBackingParams, Balance, ExecutorParams, SessionIndex, MAX_CODE_SIZE,
-	MAX_HEAD_DATA_SIZE, MAX_POV_SIZE, ON_DEMAND_DEFAULT_QUEUE_MAX_SIZE,
+	AsyncBackingParams, Balance, ExecutorParamError, ExecutorParams, SessionIndex,
+	LEGACY_MIN_BACKING_VOTES, MAX_CODE_SIZE, MAX_HEAD_DATA_SIZE, MAX_POV_SIZE,
+	ON_DEMAND_DEFAULT_QUEUE_MAX_SIZE,
 };
 use sp_runtime::{traits::Zero, Perbill};
 use sp_std::prelude::*;
@@ -94,8 +97,8 @@ pub struct HostConfiguration<BlockNumber> {
 	///
 	/// If PVF pre-checking is enabled this should be greater than the maximum number of blocks
 	/// PVF pre-checking can take. Intuitively, this number should be greater than the duration
-	/// specified by [`pvf_voting_ttl`]. Unlike, [`pvf_voting_ttl`], this parameter uses blocks
-	/// as a unit.
+	/// specified by [`pvf_voting_ttl`](Self::pvf_voting_ttl). Unlike,
+	/// [`pvf_voting_ttl`](Self::pvf_voting_ttl), this parameter uses blocks as a unit.
 	#[cfg_attr(feature = "std", serde(alias = "validation_upgrade_frequency"))]
 	pub validation_upgrade_cooldown: BlockNumber,
 	/// The delay, in blocks, after which an upgrade of the validation code is applied.
@@ -113,14 +116,15 @@ pub struct HostConfiguration<BlockNumber> {
 	/// been completed.
 	///
 	/// Note, there are situations in which `expected_at` in the past. For example, if
-	/// [`paras_availability_period`] is less than the delay set by
-	/// this field or if PVF pre-check took more time than the delay. In such cases, the upgrade is
-	/// further at the earliest possible time determined by [`minimum_validation_upgrade_delay`].
+	/// [`paras_availability_period`](Self::paras_availability_period) is less than the delay set
+	/// by this field or if PVF pre-check took more time than the delay. In such cases, the upgrade
+	/// is further at the earliest possible time determined by
+	/// [`minimum_validation_upgrade_delay`](Self::minimum_validation_upgrade_delay).
 	///
 	/// The rationale for this delay has to do with relay-chain reversions. In case there is an
 	/// invalid candidate produced with the new version of the code, then the relay-chain can
-	/// revert [`validation_upgrade_delay`] many blocks back and still find the new code in the
-	/// storage by hash.
+	/// revert [`validation_upgrade_delay`](Self::validation_upgrade_delay) many blocks back and
+	/// still find the new code in the storage by hash.
 	///
 	/// [#4601]: https://github.com/paritytech/polkadot/issues/4601
 	pub validation_upgrade_delay: BlockNumber,
@@ -187,11 +191,20 @@ pub struct HostConfiguration<BlockNumber> {
 	///
 	/// Must be non-zero.
 	pub group_rotation_frequency: BlockNumber,
-	/// The availability period, in blocks. This is the amount of blocks
-	/// after inclusion that validators have to make the block available and signal its
-	/// availability to the chain.
+	/// The minimum availability period, in blocks.
 	///
-	/// Must be at least 1.
+	/// This is the minimum amount of blocks after a core became occupied that validators have time
+	/// to make the block available.
+	///
+	/// This value only has effect on group rotations. If backers backed something at the end of
+	/// their rotation, the occupied core affects the backing group that comes afterwards. We limit
+	/// the effect one backing group can have on the next to `paras_availability_period` blocks.
+	///
+	/// Within a group rotation there is no timeout as backers are only affecting themselves.
+	///
+	/// Must be at least 1. With a value of 1, the previous group will not be able to negatively
+	/// affect the following group at the expense of a tight availability timeline at group
+	/// rotation boundaries.
 	pub paras_availability_period: BlockNumber,
 	/// The amount of blocks ahead to schedule paras.
 	pub scheduling_lookahead: u32,
@@ -229,7 +242,8 @@ pub struct HostConfiguration<BlockNumber> {
 	pub pvf_voting_ttl: SessionIndex,
 	/// The lower bound number of blocks an upgrade can be scheduled.
 	///
-	/// Typically, upgrade gets scheduled [`validation_upgrade_delay`] relay-chain blocks after
+	/// Typically, upgrade gets scheduled
+	/// [`validation_upgrade_delay`](Self::validation_upgrade_delay) relay-chain blocks after
 	/// the relay-parent of the parablock that signalled the validation code upgrade. However,
 	/// in the case a pre-checking voting was concluded in a longer duration the upgrade will be
 	/// scheduled to the next block.
@@ -240,8 +254,12 @@ pub struct HostConfiguration<BlockNumber> {
 	/// To prevent that, we introduce the minimum number of blocks after which the upgrade can be
 	/// scheduled. This number is controlled by this field.
 	///
-	/// This value should be greater than [`paras_availability_period`].
+	/// This value should be greater than
+	/// [`paras_availability_period`](Self::paras_availability_period).
 	pub minimum_validation_upgrade_delay: BlockNumber,
+	/// The minimum number of valid backing statements required to consider a parachain candidate
+	/// backable.
+	pub minimum_backing_votes: u32,
 }
 
 impl<BlockNumber: Default + From<u32>> Default for HostConfiguration<BlockNumber> {
@@ -292,6 +310,7 @@ impl<BlockNumber: Default + From<u32>> Default for HostConfiguration<BlockNumber
 			on_demand_fee_variability: Perbill::from_percent(3),
 			on_demand_target_queue_utilization: Perbill::from_percent(25),
 			on_demand_ttl: 5u32.into(),
+			minimum_backing_votes: LEGACY_MIN_BACKING_VOTES,
 		}
 	}
 }
@@ -328,6 +347,10 @@ pub enum InconsistentError<BlockNumber> {
 	MaxHrmpOutboundChannelsExceeded,
 	/// Maximum number of HRMP inbound channels exceeded.
 	MaxHrmpInboundChannelsExceeded,
+	/// `minimum_backing_votes` is set to zero.
+	ZeroMinimumBackingVotes,
+	/// `executor_params` are inconsistent.
+	InconsistentExecutorParams { inner: ExecutorParamError },
 }
 
 impl<BlockNumber> HostConfiguration<BlockNumber>
@@ -408,6 +431,14 @@ where
 			return Err(MaxHrmpInboundChannelsExceeded)
 		}
 
+		if self.minimum_backing_votes.is_zero() {
+			return Err(ZeroMinimumBackingVotes)
+		}
+
+		if let Err(inner) = self.executor_params.check_consistency() {
+			return Err(InconsistentExecutorParams { inner })
+		}
+
 		Ok(())
 	}
 
@@ -474,7 +505,8 @@ pub mod pallet {
 	/// v5-v6: <https://github.com/paritytech/polkadot/pull/6271> (remove UMP dispatch queue)
 	/// v6-v7: <https://github.com/paritytech/polkadot/pull/7396>
 	/// v7-v8: <https://github.com/paritytech/polkadot/pull/6969>
-	const STORAGE_VERSION: StorageVersion = StorageVersion::new(8);
+	/// v8-v9: <https://github.com/paritytech/polkadot/pull/7577>
+	const STORAGE_VERSION: StorageVersion = StorageVersion::new(9);
 
 	#[pallet::pallet]
 	#[pallet::storage_version(STORAGE_VERSION)]
@@ -1150,6 +1182,18 @@ pub mod pallet {
 				config.on_demand_ttl = new;
 			})
 		}
+		/// Set the minimum backing votes threshold.
+		#[pallet::call_index(52)]
+		#[pallet::weight((
+			T::WeightInfo::set_config_with_u32(),
+			DispatchClass::Operational
+		))]
+		pub fn set_minimum_backing_votes(origin: OriginFor<T>, new: u32) -> DispatchResult {
+			ensure_root(origin)?;
+			Self::schedule_config_update(|config| {
+				config.minimum_backing_votes = new;
+			})
+		}
 	}
 
 	#[pallet::hooks]
diff --git a/polkadot/runtime/parachains/src/configuration/migration.rs b/polkadot/runtime/parachains/src/configuration/migration.rs
index 4499b116462b8af97c53275a4e0eea3ce0c902a6..26f8a85b496d5a76385c6c85b52f66d719d88c82 100644
--- a/polkadot/runtime/parachains/src/configuration/migration.rs
+++ b/polkadot/runtime/parachains/src/configuration/migration.rs
@@ -19,3 +19,4 @@
 pub mod v6;
 pub mod v7;
 pub mod v8;
+pub mod v9;
diff --git a/polkadot/runtime/parachains/src/configuration/migration/v6.rs b/polkadot/runtime/parachains/src/configuration/migration/v6.rs
index beed54deaffa8ea6c9331948027ecf57766ce67d..19031a90bab45c5c4cf58e50f07111db547365a6 100644
--- a/polkadot/runtime/parachains/src/configuration/migration/v6.rs
+++ b/polkadot/runtime/parachains/src/configuration/migration/v6.rs
@@ -21,7 +21,7 @@ use frame_support::pallet_prelude::*;
 use frame_system::pallet_prelude::BlockNumberFor;
 use sp_std::vec::Vec;
 
-use primitives::{vstaging::AsyncBackingParams, Balance, ExecutorParams, SessionIndex};
+use primitives::{AsyncBackingParams, Balance, ExecutorParams, SessionIndex};
 #[cfg(feature = "try-runtime")]
 use sp_std::prelude::*;
 
diff --git a/polkadot/runtime/parachains/src/configuration/migration/v7.rs b/polkadot/runtime/parachains/src/configuration/migration/v7.rs
index 11365138120782c7b5909d320f2778401f0e2916..1754b78e0a1d3bd1d764f44352601fdf187b85b5 100644
--- a/polkadot/runtime/parachains/src/configuration/migration/v7.rs
+++ b/polkadot/runtime/parachains/src/configuration/migration/v7.rs
@@ -23,7 +23,7 @@ use frame_support::{
 	weights::Weight,
 };
 use frame_system::pallet_prelude::BlockNumberFor;
-use primitives::{vstaging::AsyncBackingParams, Balance, ExecutorParams, SessionIndex};
+use primitives::{AsyncBackingParams, Balance, ExecutorParams, SessionIndex};
 use sp_std::vec::Vec;
 
 use frame_support::traits::OnRuntimeUpgrade;
diff --git a/polkadot/runtime/parachains/src/configuration/migration/v8.rs b/polkadot/runtime/parachains/src/configuration/migration/v8.rs
index 7f7cc1cdefcd974cbb6923ed1ed9de2fac56983d..d1bc9005112529d55749a82de78fe17ff28391f7 100644
--- a/polkadot/runtime/parachains/src/configuration/migration/v8.rs
+++ b/polkadot/runtime/parachains/src/configuration/migration/v8.rs
@@ -23,14 +23,113 @@ use frame_support::{
 	weights::Weight,
 };
 use frame_system::pallet_prelude::BlockNumberFor;
-use primitives::SessionIndex;
+use primitives::{
+	AsyncBackingParams, Balance, ExecutorParams, SessionIndex, ON_DEMAND_DEFAULT_QUEUE_MAX_SIZE,
+};
 use sp_runtime::Perbill;
 use sp_std::vec::Vec;
 
 use frame_support::traits::OnRuntimeUpgrade;
 
 use super::v7::V7HostConfiguration;
-type V8HostConfiguration<BlockNumber> = configuration::HostConfiguration<BlockNumber>;
+/// All configuration of the runtime with respect to paras.
+#[derive(Clone, Encode, Decode, Debug)]
+pub struct V8HostConfiguration<BlockNumber> {
+	pub max_code_size: u32,
+	pub max_head_data_size: u32,
+	pub max_upward_queue_count: u32,
+	pub max_upward_queue_size: u32,
+	pub max_upward_message_size: u32,
+	pub max_upward_message_num_per_candidate: u32,
+	pub hrmp_max_message_num_per_candidate: u32,
+	pub validation_upgrade_cooldown: BlockNumber,
+	pub validation_upgrade_delay: BlockNumber,
+	pub async_backing_params: AsyncBackingParams,
+	pub max_pov_size: u32,
+	pub max_downward_message_size: u32,
+	pub hrmp_max_parachain_outbound_channels: u32,
+	pub hrmp_sender_deposit: Balance,
+	pub hrmp_recipient_deposit: Balance,
+	pub hrmp_channel_max_capacity: u32,
+	pub hrmp_channel_max_total_size: u32,
+	pub hrmp_max_parachain_inbound_channels: u32,
+	pub hrmp_channel_max_message_size: u32,
+	pub executor_params: ExecutorParams,
+	pub code_retention_period: BlockNumber,
+	pub on_demand_cores: u32,
+	pub on_demand_retries: u32,
+	pub on_demand_queue_max_size: u32,
+	pub on_demand_target_queue_utilization: Perbill,
+	pub on_demand_fee_variability: Perbill,
+	pub on_demand_base_fee: Balance,
+	pub on_demand_ttl: BlockNumber,
+	pub group_rotation_frequency: BlockNumber,
+	pub paras_availability_period: BlockNumber,
+	pub scheduling_lookahead: u32,
+	pub max_validators_per_core: Option<u32>,
+	pub max_validators: Option<u32>,
+	pub dispute_period: SessionIndex,
+	pub dispute_post_conclusion_acceptance_period: BlockNumber,
+	pub no_show_slots: u32,
+	pub n_delay_tranches: u32,
+	pub zeroth_delay_tranche_width: u32,
+	pub needed_approvals: u32,
+	pub relay_vrf_modulo_samples: u32,
+	pub pvf_voting_ttl: SessionIndex,
+	pub minimum_validation_upgrade_delay: BlockNumber,
+}
+
+impl<BlockNumber: Default + From<u32>> Default for V8HostConfiguration<BlockNumber> {
+	fn default() -> Self {
+		Self {
+			async_backing_params: AsyncBackingParams {
+				max_candidate_depth: 0,
+				allowed_ancestry_len: 0,
+			},
+			group_rotation_frequency: 1u32.into(),
+			paras_availability_period: 1u32.into(),
+			no_show_slots: 1u32.into(),
+			validation_upgrade_cooldown: Default::default(),
+			validation_upgrade_delay: 2u32.into(),
+			code_retention_period: Default::default(),
+			max_code_size: Default::default(),
+			max_pov_size: Default::default(),
+			max_head_data_size: Default::default(),
+			on_demand_cores: Default::default(),
+			on_demand_retries: Default::default(),
+			scheduling_lookahead: 1,
+			max_validators_per_core: Default::default(),
+			max_validators: None,
+			dispute_period: 6,
+			dispute_post_conclusion_acceptance_period: 100.into(),
+			n_delay_tranches: Default::default(),
+			zeroth_delay_tranche_width: Default::default(),
+			needed_approvals: Default::default(),
+			relay_vrf_modulo_samples: Default::default(),
+			max_upward_queue_count: Default::default(),
+			max_upward_queue_size: Default::default(),
+			max_downward_message_size: Default::default(),
+			max_upward_message_size: Default::default(),
+			max_upward_message_num_per_candidate: Default::default(),
+			hrmp_sender_deposit: Default::default(),
+			hrmp_recipient_deposit: Default::default(),
+			hrmp_channel_max_capacity: Default::default(),
+			hrmp_channel_max_total_size: Default::default(),
+			hrmp_max_parachain_inbound_channels: Default::default(),
+			hrmp_channel_max_message_size: Default::default(),
+			hrmp_max_parachain_outbound_channels: Default::default(),
+			hrmp_max_message_num_per_candidate: Default::default(),
+			pvf_voting_ttl: 2u32.into(),
+			minimum_validation_upgrade_delay: 2.into(),
+			executor_params: Default::default(),
+			on_demand_queue_max_size: ON_DEMAND_DEFAULT_QUEUE_MAX_SIZE,
+			on_demand_base_fee: 10_000_000u128,
+			on_demand_fee_variability: Perbill::from_percent(3),
+			on_demand_target_queue_utilization: Perbill::from_percent(25),
+			on_demand_ttl: 5u32.into(),
+		}
+	}
+}
 
 mod v7 {
 	use super::*;
diff --git a/polkadot/runtime/parachains/src/configuration/migration/v9.rs b/polkadot/runtime/parachains/src/configuration/migration/v9.rs
new file mode 100644
index 0000000000000000000000000000000000000000..64d71e628f4ead4ee207c6f74b24dd42684e0fca
--- /dev/null
+++ b/polkadot/runtime/parachains/src/configuration/migration/v9.rs
@@ -0,0 +1,321 @@
+// 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/>.
+
+//! A module that is responsible for migration of storage.
+
+use crate::configuration::{self, Config, Pallet};
+use frame_support::{
+	pallet_prelude::*,
+	traits::{Defensive, StorageVersion},
+	weights::Weight,
+};
+use frame_system::pallet_prelude::BlockNumberFor;
+use primitives::{SessionIndex, LEGACY_MIN_BACKING_VOTES};
+use sp_runtime::Perbill;
+use sp_std::vec::Vec;
+
+use frame_support::traits::OnRuntimeUpgrade;
+
+use super::v8::V8HostConfiguration;
+type V9HostConfiguration<BlockNumber> = configuration::HostConfiguration<BlockNumber>;
+
+mod v8 {
+	use super::*;
+
+	#[frame_support::storage_alias]
+	pub(crate) type ActiveConfig<T: Config> =
+		StorageValue<Pallet<T>, V8HostConfiguration<BlockNumberFor<T>>, OptionQuery>;
+
+	#[frame_support::storage_alias]
+	pub(crate) type PendingConfigs<T: Config> = StorageValue<
+		Pallet<T>,
+		Vec<(SessionIndex, V8HostConfiguration<BlockNumberFor<T>>)>,
+		OptionQuery,
+	>;
+}
+
+mod v9 {
+	use super::*;
+
+	#[frame_support::storage_alias]
+	pub(crate) type ActiveConfig<T: Config> =
+		StorageValue<Pallet<T>, V9HostConfiguration<BlockNumberFor<T>>, OptionQuery>;
+
+	#[frame_support::storage_alias]
+	pub(crate) type PendingConfigs<T: Config> = StorageValue<
+		Pallet<T>,
+		Vec<(SessionIndex, V9HostConfiguration<BlockNumberFor<T>>)>,
+		OptionQuery,
+	>;
+}
+
+pub struct MigrateToV9<T>(sp_std::marker::PhantomData<T>);
+impl<T: Config> OnRuntimeUpgrade for MigrateToV9<T> {
+	#[cfg(feature = "try-runtime")]
+	fn pre_upgrade() -> Result<Vec<u8>, sp_runtime::TryRuntimeError> {
+		log::trace!(target: crate::configuration::LOG_TARGET, "Running pre_upgrade() for HostConfiguration MigrateToV9");
+		Ok(Vec::new())
+	}
+
+	fn on_runtime_upgrade() -> Weight {
+		log::info!(target: configuration::LOG_TARGET, "HostConfiguration MigrateToV9 started");
+		if StorageVersion::get::<Pallet<T>>() == 8 {
+			let weight_consumed = migrate_to_v9::<T>();
+
+			log::info!(target: configuration::LOG_TARGET, "HostConfiguration MigrateToV9 executed successfully");
+			StorageVersion::new(9).put::<Pallet<T>>();
+
+			weight_consumed
+		} else {
+			log::warn!(target: configuration::LOG_TARGET, "HostConfiguration MigrateToV9 should be removed.");
+			T::DbWeight::get().reads(1)
+		}
+	}
+
+	#[cfg(feature = "try-runtime")]
+	fn post_upgrade(_state: Vec<u8>) -> Result<(), sp_runtime::TryRuntimeError> {
+		log::trace!(target: crate::configuration::LOG_TARGET, "Running post_upgrade() for HostConfiguration MigrateToV9");
+		ensure!(
+			StorageVersion::get::<Pallet<T>>() >= 9,
+			"Storage version should be >= 9 after the migration"
+		);
+
+		Ok(())
+	}
+}
+
+fn migrate_to_v9<T: Config>() -> Weight {
+	// Unusual formatting is justified:
+	// - make it easier to verify that fields assign what they supposed to assign.
+	// - this code is transient and will be removed after all migrations are done.
+	// - this code is important enough to optimize for legibility sacrificing consistency.
+	#[rustfmt::skip]
+	let translate =
+		|pre: V8HostConfiguration<BlockNumberFor<T>>| ->
+		V9HostConfiguration<BlockNumberFor<T>>
+	{
+		V9HostConfiguration {
+max_code_size                            : pre.max_code_size,
+max_head_data_size                       : pre.max_head_data_size,
+max_upward_queue_count                   : pre.max_upward_queue_count,
+max_upward_queue_size                    : pre.max_upward_queue_size,
+max_upward_message_size                  : pre.max_upward_message_size,
+max_upward_message_num_per_candidate     : pre.max_upward_message_num_per_candidate,
+hrmp_max_message_num_per_candidate       : pre.hrmp_max_message_num_per_candidate,
+validation_upgrade_cooldown              : pre.validation_upgrade_cooldown,
+validation_upgrade_delay                 : pre.validation_upgrade_delay,
+max_pov_size                             : pre.max_pov_size,
+max_downward_message_size                : pre.max_downward_message_size,
+hrmp_sender_deposit                      : pre.hrmp_sender_deposit,
+hrmp_recipient_deposit                   : pre.hrmp_recipient_deposit,
+hrmp_channel_max_capacity                : pre.hrmp_channel_max_capacity,
+hrmp_channel_max_total_size              : pre.hrmp_channel_max_total_size,
+hrmp_max_parachain_inbound_channels      : pre.hrmp_max_parachain_inbound_channels,
+hrmp_max_parachain_outbound_channels     : pre.hrmp_max_parachain_outbound_channels,
+hrmp_channel_max_message_size            : pre.hrmp_channel_max_message_size,
+code_retention_period                    : pre.code_retention_period,
+on_demand_cores                          : pre.on_demand_cores,
+on_demand_retries                        : pre.on_demand_retries,
+group_rotation_frequency                 : pre.group_rotation_frequency,
+paras_availability_period                : pre.paras_availability_period,
+scheduling_lookahead                     : pre.scheduling_lookahead,
+max_validators_per_core                  : pre.max_validators_per_core,
+max_validators                           : pre.max_validators,
+dispute_period                           : pre.dispute_period,
+dispute_post_conclusion_acceptance_period: pre.dispute_post_conclusion_acceptance_period,
+no_show_slots                            : pre.no_show_slots,
+n_delay_tranches                         : pre.n_delay_tranches,
+zeroth_delay_tranche_width               : pre.zeroth_delay_tranche_width,
+needed_approvals                         : pre.needed_approvals,
+relay_vrf_modulo_samples                 : pre.relay_vrf_modulo_samples,
+pvf_voting_ttl                           : pre.pvf_voting_ttl,
+minimum_validation_upgrade_delay         : pre.minimum_validation_upgrade_delay,
+async_backing_params                     : pre.async_backing_params,
+executor_params                          : pre.executor_params,
+on_demand_queue_max_size                 : 10_000u32,
+on_demand_base_fee                       : 10_000_000u128,
+on_demand_fee_variability                : Perbill::from_percent(3),
+on_demand_target_queue_utilization       : Perbill::from_percent(25),
+on_demand_ttl                            : 5u32.into(),
+minimum_backing_votes                    : LEGACY_MIN_BACKING_VOTES
+		}
+	};
+
+	let v8 = v8::ActiveConfig::<T>::get()
+		.defensive_proof("Could not decode old config")
+		.unwrap_or_default();
+	let v9 = translate(v8);
+	v9::ActiveConfig::<T>::set(Some(v9));
+
+	// Allowed to be empty.
+	let pending_v8 = v8::PendingConfigs::<T>::get().unwrap_or_default();
+	let mut pending_v9 = Vec::new();
+
+	for (session, v8) in pending_v8.into_iter() {
+		let v9 = translate(v8);
+		pending_v9.push((session, v9));
+	}
+	v9::PendingConfigs::<T>::set(Some(pending_v9.clone()));
+
+	let num_configs = (pending_v9.len() + 1) as u64;
+	T::DbWeight::get().reads_writes(num_configs, num_configs)
+}
+
+#[cfg(test)]
+mod tests {
+	use super::*;
+	use crate::mock::{new_test_ext, Test};
+
+	#[test]
+	fn v9_deserialized_from_actual_data() {
+		// Example how to get new `raw_config`:
+		// We'll obtain the raw_config at a specified a block
+		// Steps:
+		// 1. Go to Polkadot.js -> Developer -> Chain state -> Storage: https://polkadot.js.org/apps/#/chainstate
+		// 2. Set these parameters:
+		//   2.1. selected state query: configuration; activeConfig():
+		//        PolkadotRuntimeParachainsConfigurationHostConfiguration
+		//   2.2. blockhash to query at:
+		//        0xf89d3ab5312c5f70d396dc59612f0aa65806c798346f9db4b35278baed2e0e53 (the hash of
+		//        the block)
+		//   2.3. Note the value of encoded storage key ->
+		//        0x06de3d8a54d27e44a9d5ce189618f22db4b49d95320d9021994c850f25b8e385 for the
+		// referenced        block.
+		//   2.4. You'll also need the decoded values to update the test.
+		// 3. Go to Polkadot.js -> Developer -> Chain state -> Raw storage
+		//   3.1 Enter the encoded storage key and you get the raw config.
+
+		// This exceeds the maximal line width length, but that's fine, since this is not code and
+		// doesn't need to be read and also leaving it as one line allows to easily copy it.
+		let raw_config =
+	hex_literal::hex!["
+	0000300000800000080000000000100000c8000005000000050000000200000002000000000000000000000000005000000010000400000000000000000000000000000000000000000000000000000000000000000000000800000000200000040000000000100000b004000000000000000000001027000080b2e60e80c3c901809698000000000000000000000000000500000014000000040000000100000001010000000006000000640000000200000019000000000000000300000002000000020000000500000002000000"
+	];
+
+		let v9 =
+			V9HostConfiguration::<primitives::BlockNumber>::decode(&mut &raw_config[..]).unwrap();
+
+		// We check only a sample of the values here. If we missed any fields or messed up data
+		// types that would skew all the fields coming after.
+		assert_eq!(v9.max_code_size, 3_145_728);
+		assert_eq!(v9.validation_upgrade_cooldown, 2);
+		assert_eq!(v9.max_pov_size, 5_242_880);
+		assert_eq!(v9.hrmp_channel_max_message_size, 1_048_576);
+		assert_eq!(v9.n_delay_tranches, 25);
+		assert_eq!(v9.minimum_validation_upgrade_delay, 5);
+		assert_eq!(v9.group_rotation_frequency, 20);
+		assert_eq!(v9.on_demand_cores, 0);
+		assert_eq!(v9.on_demand_base_fee, 10_000_000);
+		assert_eq!(v9.minimum_backing_votes, LEGACY_MIN_BACKING_VOTES);
+	}
+
+	#[test]
+	fn test_migrate_to_v9() {
+		// Host configuration has lots of fields. However, in this migration we only add one
+		// field. The most important part to check are a couple of the last fields. We also pick
+		// extra fields to check arbitrarily, e.g. depending on their position (i.e. the middle) and
+		// also their type.
+		//
+		// We specify only the picked fields and the rest should be provided by the `Default`
+		// implementation. That implementation is copied over between the two types and should work
+		// fine.
+		let v8 = V8HostConfiguration::<primitives::BlockNumber> {
+			needed_approvals: 69,
+			paras_availability_period: 55,
+			hrmp_recipient_deposit: 1337,
+			max_pov_size: 1111,
+			minimum_validation_upgrade_delay: 20,
+			..Default::default()
+		};
+
+		let mut pending_configs = Vec::new();
+		pending_configs.push((100, v8.clone()));
+		pending_configs.push((300, v8.clone()));
+
+		new_test_ext(Default::default()).execute_with(|| {
+			// Implant the v8 version in the state.
+			v8::ActiveConfig::<Test>::set(Some(v8));
+			v8::PendingConfigs::<Test>::set(Some(pending_configs));
+
+			migrate_to_v9::<Test>();
+
+			let v9 = v9::ActiveConfig::<Test>::get().unwrap();
+			let mut configs_to_check = v9::PendingConfigs::<Test>::get().unwrap();
+			configs_to_check.push((0, v9.clone()));
+
+			for (_, v8) in configs_to_check {
+				#[rustfmt::skip]
+				{
+					assert_eq!(v8.max_code_size                            , v9.max_code_size);
+					assert_eq!(v8.max_head_data_size                       , v9.max_head_data_size);
+					assert_eq!(v8.max_upward_queue_count                   , v9.max_upward_queue_count);
+					assert_eq!(v8.max_upward_queue_size                    , v9.max_upward_queue_size);
+					assert_eq!(v8.max_upward_message_size                  , v9.max_upward_message_size);
+					assert_eq!(v8.max_upward_message_num_per_candidate     , v9.max_upward_message_num_per_candidate);
+					assert_eq!(v8.hrmp_max_message_num_per_candidate       , v9.hrmp_max_message_num_per_candidate);
+					assert_eq!(v8.validation_upgrade_cooldown              , v9.validation_upgrade_cooldown);
+					assert_eq!(v8.validation_upgrade_delay                 , v9.validation_upgrade_delay);
+					assert_eq!(v8.max_pov_size                             , v9.max_pov_size);
+					assert_eq!(v8.max_downward_message_size                , v9.max_downward_message_size);
+					assert_eq!(v8.hrmp_max_parachain_outbound_channels     , v9.hrmp_max_parachain_outbound_channels);
+					assert_eq!(v8.hrmp_sender_deposit                      , v9.hrmp_sender_deposit);
+					assert_eq!(v8.hrmp_recipient_deposit                   , v9.hrmp_recipient_deposit);
+					assert_eq!(v8.hrmp_channel_max_capacity                , v9.hrmp_channel_max_capacity);
+					assert_eq!(v8.hrmp_channel_max_total_size              , v9.hrmp_channel_max_total_size);
+					assert_eq!(v8.hrmp_max_parachain_inbound_channels      , v9.hrmp_max_parachain_inbound_channels);
+					assert_eq!(v8.hrmp_channel_max_message_size            , v9.hrmp_channel_max_message_size);
+					assert_eq!(v8.code_retention_period                    , v9.code_retention_period);
+					assert_eq!(v8.on_demand_cores                          , v9.on_demand_cores);
+					assert_eq!(v8.on_demand_retries                        , v9.on_demand_retries);
+					assert_eq!(v8.group_rotation_frequency                 , v9.group_rotation_frequency);
+					assert_eq!(v8.paras_availability_period                , v9.paras_availability_period);
+					assert_eq!(v8.scheduling_lookahead                     , v9.scheduling_lookahead);
+					assert_eq!(v8.max_validators_per_core                  , v9.max_validators_per_core);
+					assert_eq!(v8.max_validators                           , v9.max_validators);
+					assert_eq!(v8.dispute_period                           , v9.dispute_period);
+					assert_eq!(v8.no_show_slots                            , v9.no_show_slots);
+					assert_eq!(v8.n_delay_tranches                         , v9.n_delay_tranches);
+					assert_eq!(v8.zeroth_delay_tranche_width               , v9.zeroth_delay_tranche_width);
+					assert_eq!(v8.needed_approvals                         , v9.needed_approvals);
+					assert_eq!(v8.relay_vrf_modulo_samples                 , v9.relay_vrf_modulo_samples);
+					assert_eq!(v8.pvf_voting_ttl                           , v9.pvf_voting_ttl);
+					assert_eq!(v8.minimum_validation_upgrade_delay         , v9.minimum_validation_upgrade_delay);
+					assert_eq!(v8.async_backing_params.allowed_ancestry_len, v9.async_backing_params.allowed_ancestry_len);
+					assert_eq!(v8.async_backing_params.max_candidate_depth , v9.async_backing_params.max_candidate_depth);
+					assert_eq!(v8.executor_params						   , v9.executor_params);
+				    assert_eq!(v8.minimum_backing_votes					   , v9.minimum_backing_votes);
+				}; // ; makes this a statement. `rustfmt::skip` cannot be put on an expression.
+			}
+		});
+	}
+
+	// Test that migration doesn't panic in case there're no pending configurations upgrades in
+	// pallet's storage.
+	#[test]
+	fn test_migrate_to_v9_no_pending() {
+		let v8 = V8HostConfiguration::<primitives::BlockNumber>::default();
+
+		new_test_ext(Default::default()).execute_with(|| {
+			// Implant the v8 version in the state.
+			v8::ActiveConfig::<Test>::set(Some(v8));
+			// Ensure there're no pending configs.
+			v8::PendingConfigs::<Test>::set(None);
+
+			// Shouldn't fail.
+			migrate_to_v9::<Test>();
+		});
+	}
+}
diff --git a/polkadot/runtime/parachains/src/configuration/tests.rs b/polkadot/runtime/parachains/src/configuration/tests.rs
index 43c03067a9a745e92f7f645c8d49f193fc7cfebe..ea39628c95876a92b9072bd5adc18584e48df0b5 100644
--- a/polkadot/runtime/parachains/src/configuration/tests.rs
+++ b/polkadot/runtime/parachains/src/configuration/tests.rs
@@ -317,6 +317,7 @@ fn setting_pending_config_members() {
 			on_demand_fee_variability: Perbill::from_percent(3),
 			on_demand_target_queue_utilization: Perbill::from_percent(25),
 			on_demand_ttl: 5u32,
+			minimum_backing_votes: 5,
 		};
 
 		Configuration::set_validation_upgrade_cooldown(
@@ -467,6 +468,11 @@ fn setting_pending_config_members() {
 		.unwrap();
 		Configuration::set_pvf_voting_ttl(RuntimeOrigin::root(), new_config.pvf_voting_ttl)
 			.unwrap();
+		Configuration::set_minimum_backing_votes(
+			RuntimeOrigin::root(),
+			new_config.minimum_backing_votes,
+		)
+		.unwrap();
 
 		assert_eq!(PendingConfigs::<Test>::get(), vec![(shared::SESSION_DELAY, new_config)],);
 	})
diff --git a/polkadot/runtime/parachains/src/disputes/slashing.rs b/polkadot/runtime/parachains/src/disputes/slashing.rs
index b27a7ab1ad734162e11f808825db46e59979b23b..9b2b7a48dc8b3ace0b4feea937b7efbe98e4950e 100644
--- a/polkadot/runtime/parachains/src/disputes/slashing.rs
+++ b/polkadot/runtime/parachains/src/disputes/slashing.rs
@@ -51,7 +51,7 @@ use frame_support::{
 use frame_system::pallet_prelude::BlockNumberFor;
 
 use primitives::{
-	vstaging::slashing::{DisputeProof, DisputesTimeSlot, PendingSlashes, SlashingOffenceKind},
+	slashing::{DisputeProof, DisputesTimeSlot, PendingSlashes, SlashingOffenceKind},
 	CandidateHash, SessionIndex, ValidatorId, ValidatorIndex,
 };
 use scale_info::TypeInfo;
diff --git a/polkadot/runtime/parachains/src/disputes/slashing/benchmarking.rs b/polkadot/runtime/parachains/src/disputes/slashing/benchmarking.rs
index 3ede1c908802558da7af09a7201d4e18a82f4dbc..f075ce5ca737d7597c4ed5d664050e08b9d28bf8 100644
--- a/polkadot/runtime/parachains/src/disputes/slashing/benchmarking.rs
+++ b/polkadot/runtime/parachains/src/disputes/slashing/benchmarking.rs
@@ -51,7 +51,7 @@ where
 		use rand::{RngCore, SeedableRng};
 
 		let validator = T::Lookup::lookup(who).unwrap();
-		let controller = pallet_staking::Pallet::<T>::bonded(validator).unwrap();
+		let controller = pallet_staking::Pallet::<T>::bonded(&validator).unwrap();
 
 		let keys = {
 			const SESSION_KEY_LEN: usize = 32;
diff --git a/polkadot/runtime/parachains/src/dmp.rs b/polkadot/runtime/parachains/src/dmp.rs
index 490c2fa1cd09c607022663d49f1705bb45a0d0df..bc7491a2c61a9c14804061acbca9702aebb3da29 100644
--- a/polkadot/runtime/parachains/src/dmp.rs
+++ b/polkadot/runtime/parachains/src/dmp.rs
@@ -81,9 +81,9 @@ impl From<QueueDownwardMessageError> for SendError {
 	}
 }
 
-/// An error returned by [`check_processed_downward_messages`] that indicates an acceptance check
-/// didn't pass.
-pub enum ProcessedDownwardMessagesAcceptanceErr {
+/// An error returned by [`Pallet::check_processed_downward_messages`] that indicates an acceptance
+/// check didn't pass.
+pub(crate) enum ProcessedDownwardMessagesAcceptanceErr {
 	/// If there are pending messages then `processed_downward_messages` should be at least 1,
 	AdvancementRule,
 	/// `processed_downward_messages` should not be greater than the number of pending messages.
diff --git a/polkadot/runtime/parachains/src/hrmp.rs b/polkadot/runtime/parachains/src/hrmp.rs
index a3ce6e2d8a3503d73a9a4453378ce67c24597c08..42592d9d9f1496c882e0dd2d98e53cf06fcefcc1 100644
--- a/polkadot/runtime/parachains/src/hrmp.rs
+++ b/polkadot/runtime/parachains/src/hrmp.rs
@@ -21,13 +21,16 @@ use crate::{
 use frame_support::{pallet_prelude::*, traits::ReservableCurrency, DefaultNoBound};
 use frame_system::pallet_prelude::*;
 use parity_scale_codec::{Decode, Encode};
-use polkadot_parachain::primitives::HorizontalMessages;
+use polkadot_parachain_primitives::primitives::{HorizontalMessages, IsSystem};
 use primitives::{
 	Balance, Hash, HrmpChannelId, Id as ParaId, InboundHrmpMessage, OutboundHrmpMessage,
 	SessionIndex,
 };
 use scale_info::TypeInfo;
-use sp_runtime::traits::{AccountIdConversion, BlakeTwo256, Hash as HashT, UniqueSaturatedInto};
+use sp_runtime::{
+	traits::{AccountIdConversion, BlakeTwo256, Hash as HashT, UniqueSaturatedInto, Zero},
+	ArithmeticError,
+};
 use sp_std::{
 	collections::{btree_map::BTreeMap, btree_set::BTreeSet},
 	fmt, mem,
@@ -60,6 +63,8 @@ pub trait WeightInfo {
 	fn hrmp_cancel_open_request(c: u32) -> Weight;
 	fn clean_open_channel_requests(c: u32) -> Weight;
 	fn force_open_hrmp_channel(c: u32) -> Weight;
+	fn establish_system_channel() -> Weight;
+	fn poke_channel_deposits() -> Weight;
 }
 
 /// A weight info that is only suitable for testing.
@@ -93,6 +98,12 @@ impl WeightInfo for TestWeightInfo {
 	fn force_open_hrmp_channel(_: u32) -> Weight {
 		Weight::MAX
 	}
+	fn establish_system_channel() -> Weight {
+		Weight::MAX
+	}
+	fn poke_channel_deposits() -> Weight {
+		Weight::MAX
+	}
 }
 
 /// A description of a request to open an HRMP channel.
@@ -149,17 +160,17 @@ pub struct HrmpChannel {
 	pub recipient_deposit: Balance,
 }
 
-/// An error returned by [`check_hrmp_watermark`] that indicates an acceptance criteria check
-/// didn't pass.
-pub enum HrmpWatermarkAcceptanceErr<BlockNumber> {
+/// An error returned by [`Pallet::check_hrmp_watermark`] that indicates an acceptance criteria
+/// check didn't pass.
+pub(crate) enum HrmpWatermarkAcceptanceErr<BlockNumber> {
 	AdvancementRule { new_watermark: BlockNumber, last_watermark: BlockNumber },
 	AheadRelayParent { new_watermark: BlockNumber, relay_chain_parent_number: BlockNumber },
 	LandsOnBlockWithNoMessages { new_watermark: BlockNumber },
 }
 
-/// An error returned by [`check_outbound_hrmp`] that indicates an acceptance criteria check
+/// An error returned by [`Pallet::check_outbound_hrmp`] that indicates an acceptance criteria check
 /// didn't pass.
-pub enum OutboundHrmpAcceptanceErr {
+pub(crate) enum OutboundHrmpAcceptanceErr {
 	MoreMessagesThanPermitted { sent: u32, permitted: u32 },
 	NotSorted { idx: u32 },
 	NoSuchChannel { idx: u32, channel_id: HrmpChannelId },
@@ -267,18 +278,34 @@ pub mod pallet {
 	#[pallet::generate_deposit(pub(super) fn deposit_event)]
 	pub enum Event<T: Config> {
 		/// Open HRMP channel requested.
-		/// `[sender, recipient, proposed_max_capacity, proposed_max_message_size]`
-		OpenChannelRequested(ParaId, ParaId, u32, u32),
+		OpenChannelRequested {
+			sender: ParaId,
+			recipient: ParaId,
+			proposed_max_capacity: u32,
+			proposed_max_message_size: u32,
+		},
 		/// An HRMP channel request sent by the receiver was canceled by either party.
-		/// `[by_parachain, channel_id]`
-		OpenChannelCanceled(ParaId, HrmpChannelId),
-		/// Open HRMP channel accepted. `[sender, recipient]`
-		OpenChannelAccepted(ParaId, ParaId),
-		/// HRMP channel closed. `[by_parachain, channel_id]`
-		ChannelClosed(ParaId, HrmpChannelId),
+		OpenChannelCanceled { by_parachain: ParaId, channel_id: HrmpChannelId },
+		/// Open HRMP channel accepted.
+		OpenChannelAccepted { sender: ParaId, recipient: ParaId },
+		/// HRMP channel closed.
+		ChannelClosed { by_parachain: ParaId, channel_id: HrmpChannelId },
 		/// An HRMP channel was opened via Root origin.
-		/// `[sender, recipient, proposed_max_capacity, proposed_max_message_size]`
-		HrmpChannelForceOpened(ParaId, ParaId, u32, u32),
+		HrmpChannelForceOpened {
+			sender: ParaId,
+			recipient: ParaId,
+			proposed_max_capacity: u32,
+			proposed_max_message_size: u32,
+		},
+		/// An HRMP channel was opened between two system chains.
+		HrmpSystemChannelOpened {
+			sender: ParaId,
+			recipient: ParaId,
+			proposed_max_capacity: u32,
+			proposed_max_message_size: u32,
+		},
+		/// An HRMP channel's deposits were updated.
+		OpenChannelDepositsUpdated { sender: ParaId, recipient: ParaId },
 	}
 
 	#[pallet::error]
@@ -321,6 +348,8 @@ pub mod pallet {
 		OpenHrmpChannelAlreadyConfirmed,
 		/// The provided witness data is wrong.
 		WrongWitness,
+		/// The channel between these two chains cannot be authorized.
+		ChannelCreationNotAuthorized,
 	}
 
 	/// The set of pending HRMP open channel requests.
@@ -480,12 +509,12 @@ pub mod pallet {
 				proposed_max_capacity,
 				proposed_max_message_size,
 			)?;
-			Self::deposit_event(Event::OpenChannelRequested(
-				origin,
+			Self::deposit_event(Event::OpenChannelRequested {
+				sender: origin,
 				recipient,
 				proposed_max_capacity,
 				proposed_max_message_size,
-			));
+			});
 			Ok(())
 		}
 
@@ -497,7 +526,7 @@ pub mod pallet {
 		pub fn hrmp_accept_open_channel(origin: OriginFor<T>, sender: ParaId) -> DispatchResult {
 			let origin = ensure_parachain(<T as Config>::RuntimeOrigin::from(origin))?;
 			Self::accept_open_channel(origin, sender)?;
-			Self::deposit_event(Event::OpenChannelAccepted(sender, origin));
+			Self::deposit_event(Event::OpenChannelAccepted { sender, recipient: origin });
 			Ok(())
 		}
 
@@ -513,7 +542,7 @@ pub mod pallet {
 		) -> DispatchResult {
 			let origin = ensure_parachain(<T as Config>::RuntimeOrigin::from(origin))?;
 			Self::close_channel(origin, channel_id.clone())?;
-			Self::deposit_event(Event::ChannelClosed(origin, channel_id));
+			Self::deposit_event(Event::ChannelClosed { by_parachain: origin, channel_id });
 			Ok(())
 		}
 
@@ -525,14 +554,26 @@ pub mod pallet {
 		///
 		/// Origin must be the `ChannelManager`.
 		#[pallet::call_index(3)]
-		#[pallet::weight(<T as Config>::WeightInfo::force_clean_hrmp(*_inbound, *_outbound))]
+		#[pallet::weight(<T as Config>::WeightInfo::force_clean_hrmp(*num_inbound, *num_outbound))]
 		pub fn force_clean_hrmp(
 			origin: OriginFor<T>,
 			para: ParaId,
-			_inbound: u32,
-			_outbound: u32,
+			num_inbound: u32,
+			num_outbound: u32,
 		) -> DispatchResult {
 			T::ChannelManager::ensure_origin(origin)?;
+
+			ensure!(
+				HrmpIngressChannelsIndex::<T>::decode_len(para).unwrap_or_default() <=
+					num_inbound as usize,
+				Error::<T>::WrongWitness
+			);
+			ensure!(
+				HrmpEgressChannelsIndex::<T>::decode_len(para).unwrap_or_default() <=
+					num_outbound as usize,
+				Error::<T>::WrongWitness
+			);
+
 			Self::clean_hrmp_after_outgoing(&para);
 			Ok(())
 		}
@@ -546,9 +587,16 @@ pub mod pallet {
 		///
 		/// Origin must be the `ChannelManager`.
 		#[pallet::call_index(4)]
-		#[pallet::weight(<T as Config>::WeightInfo::force_process_hrmp_open(*_channels))]
-		pub fn force_process_hrmp_open(origin: OriginFor<T>, _channels: u32) -> DispatchResult {
+		#[pallet::weight(<T as Config>::WeightInfo::force_process_hrmp_open(*channels))]
+		pub fn force_process_hrmp_open(origin: OriginFor<T>, channels: u32) -> DispatchResult {
 			T::ChannelManager::ensure_origin(origin)?;
+
+			ensure!(
+				HrmpOpenChannelRequestsList::<T>::decode_len().unwrap_or_default() as u32 <=
+					channels,
+				Error::<T>::WrongWitness
+			);
+
 			let host_config = configuration::Pallet::<T>::config();
 			Self::process_hrmp_open_channel_requests(&host_config);
 			Ok(())
@@ -563,9 +611,16 @@ pub mod pallet {
 		///
 		/// Origin must be the `ChannelManager`.
 		#[pallet::call_index(5)]
-		#[pallet::weight(<T as Config>::WeightInfo::force_process_hrmp_close(*_channels))]
-		pub fn force_process_hrmp_close(origin: OriginFor<T>, _channels: u32) -> DispatchResult {
+		#[pallet::weight(<T as Config>::WeightInfo::force_process_hrmp_close(*channels))]
+		pub fn force_process_hrmp_close(origin: OriginFor<T>, channels: u32) -> DispatchResult {
 			T::ChannelManager::ensure_origin(origin)?;
+
+			ensure!(
+				HrmpCloseChannelRequestsList::<T>::decode_len().unwrap_or_default() as u32 <=
+					channels,
+				Error::<T>::WrongWitness
+			);
+
 			Self::process_hrmp_close_channel_requests();
 			Ok(())
 		}
@@ -592,7 +647,7 @@ pub mod pallet {
 				Error::<T>::WrongWitness
 			);
 			Self::cancel_open_request(origin, channel_id.clone())?;
-			Self::deposit_event(Event::OpenChannelCanceled(origin, channel_id));
+			Self::deposit_event(Event::OpenChannelCanceled { by_parachain: origin, channel_id });
 			Ok(())
 		}
 
@@ -600,8 +655,8 @@ pub mod pallet {
 		/// the `max_capacity` and `max_message_size` are still subject to the Relay Chain's
 		/// configured limits.
 		///
-		/// Expected use is when one of the `ParaId`s involved in the channel is governed by the
-		/// Relay Chain, e.g. a system parachain.
+		/// Expected use is when one (and only one) of the `ParaId`s involved in the channel is
+		/// governed by the system, e.g. a system parachain.
 		///
 		/// Origin must be the `ChannelManager`.
 		#[pallet::call_index(7)]
@@ -628,18 +683,159 @@ pub mod pallet {
 					0
 				};
 
-			// Now we proceed with normal init/accept.
+			// Now we proceed with normal init/accept, except that we set `no_deposit` to true such
+			// that it will not require deposits from either member.
 			Self::init_open_channel(sender, recipient, max_capacity, max_message_size)?;
 			Self::accept_open_channel(recipient, sender)?;
-			Self::deposit_event(Event::HrmpChannelForceOpened(
+			Self::deposit_event(Event::HrmpChannelForceOpened {
 				sender,
 				recipient,
-				max_capacity,
-				max_message_size,
-			));
+				proposed_max_capacity: max_capacity,
+				proposed_max_message_size: max_message_size,
+			});
 
 			Ok(Some(<T as Config>::WeightInfo::force_open_hrmp_channel(cancel_request)).into())
 		}
+
+		/// Establish an HRMP channel between two system chains. If the channel does not already
+		/// exist, the transaction fees will be refunded to the caller. The system does not take
+		/// deposits for channels between system chains, and automatically sets the message number
+		/// and size limits to the maximum allowed by the network's configuration.
+		///
+		/// Arguments:
+		///
+		/// - `sender`: A system chain, `ParaId`.
+		/// - `recipient`: A system chain, `ParaId`.
+		///
+		/// Any signed origin can call this function, but _both_ inputs MUST be system chains. If
+		/// the channel does not exist yet, there is no fee.
+		#[pallet::call_index(8)]
+		#[pallet::weight(<T as Config>::WeightInfo::establish_system_channel())]
+		pub fn establish_system_channel(
+			origin: OriginFor<T>,
+			sender: ParaId,
+			recipient: ParaId,
+		) -> DispatchResultWithPostInfo {
+			let _caller = ensure_signed(origin)?;
+
+			// both chains must be system
+			ensure!(
+				sender.is_system() && recipient.is_system(),
+				Error::<T>::ChannelCreationNotAuthorized
+			);
+
+			let config = <configuration::Pallet<T>>::config();
+			let max_message_size = config.hrmp_channel_max_message_size;
+			let max_capacity = config.hrmp_channel_max_capacity;
+
+			Self::init_open_channel(sender, recipient, max_capacity, max_message_size)?;
+			Self::accept_open_channel(recipient, sender)?;
+
+			Self::deposit_event(Event::HrmpSystemChannelOpened {
+				sender,
+				recipient,
+				proposed_max_capacity: max_capacity,
+				proposed_max_message_size: max_message_size,
+			});
+
+			Ok(Pays::No.into())
+		}
+
+		/// Update the deposits held for an HRMP channel to the latest `Configuration`. Channels
+		/// with system chains do not require a deposit.
+		///
+		/// Arguments:
+		///
+		/// - `sender`: A chain, `ParaId`.
+		/// - `recipient`: A chain, `ParaId`.
+		///
+		/// Any signed origin can call this function.
+		#[pallet::call_index(9)]
+		#[pallet::weight(<T as Config>::WeightInfo::poke_channel_deposits())]
+		pub fn poke_channel_deposits(
+			origin: OriginFor<T>,
+			sender: ParaId,
+			recipient: ParaId,
+		) -> DispatchResult {
+			let _caller = ensure_signed(origin)?;
+			let channel_id = HrmpChannelId { sender, recipient };
+			let is_system = sender.is_system() || recipient.is_system();
+
+			let config = <configuration::Pallet<T>>::config();
+
+			// Channels with and amongst the system do not require a deposit.
+			let (new_sender_deposit, new_recipient_deposit) = if is_system {
+				(0, 0)
+			} else {
+				(config.hrmp_sender_deposit, config.hrmp_recipient_deposit)
+			};
+
+			let _ = HrmpChannels::<T>::mutate(&channel_id, |channel| -> DispatchResult {
+				if let Some(ref mut channel) = channel {
+					let current_sender_deposit = channel.sender_deposit;
+					let current_recipient_deposit = channel.recipient_deposit;
+
+					// nothing to update
+					if current_sender_deposit == new_sender_deposit &&
+						current_recipient_deposit == new_recipient_deposit
+					{
+						return Ok(())
+					}
+
+					// sender
+					if current_sender_deposit > new_sender_deposit {
+						// Can never underflow, but be paranoid.
+						let amount = current_sender_deposit
+							.checked_sub(new_sender_deposit)
+							.ok_or(ArithmeticError::Underflow)?;
+						T::Currency::unreserve(
+							&channel_id.sender.into_account_truncating(),
+							// The difference should always be convertable into `Balance`, but be
+							// paranoid and do nothing in case.
+							amount.try_into().unwrap_or(Zero::zero()),
+						);
+					} else if current_sender_deposit < new_sender_deposit {
+						let amount = new_sender_deposit
+							.checked_sub(current_sender_deposit)
+							.ok_or(ArithmeticError::Underflow)?;
+						T::Currency::reserve(
+							&channel_id.sender.into_account_truncating(),
+							amount.try_into().unwrap_or(Zero::zero()),
+						)?;
+					}
+
+					// recipient
+					if current_recipient_deposit > new_recipient_deposit {
+						let amount = current_recipient_deposit
+							.checked_sub(new_recipient_deposit)
+							.ok_or(ArithmeticError::Underflow)?;
+						T::Currency::unreserve(
+							&channel_id.recipient.into_account_truncating(),
+							amount.try_into().unwrap_or(Zero::zero()),
+						);
+					} else if current_recipient_deposit < new_recipient_deposit {
+						let amount = new_recipient_deposit
+							.checked_sub(current_recipient_deposit)
+							.ok_or(ArithmeticError::Underflow)?;
+						T::Currency::reserve(
+							&channel_id.recipient.into_account_truncating(),
+							amount.try_into().unwrap_or(Zero::zero()),
+						)?;
+					}
+
+					// update storage
+					channel.sender_deposit = new_sender_deposit;
+					channel.recipient_deposit = new_recipient_deposit;
+				} else {
+					return Err(Error::<T>::OpenHrmpChannelDoesntExist.into())
+				}
+				Ok(())
+			})?;
+
+			Self::deposit_event(Event::OpenChannelDepositsUpdated { sender, recipient });
+
+			Ok(())
+		}
 	}
 }
 
@@ -817,6 +1013,10 @@ impl<T: Config> Pallet<T> {
 				"can't be `None` due to the invariant that the list contains the same items as the set; qed",
 			);
 
+			let system_channel = channel_id.sender.is_system() || channel_id.recipient.is_system();
+			let sender_deposit = request.sender_deposit;
+			let recipient_deposit = if system_channel { 0 } else { config.hrmp_recipient_deposit };
+
 			if request.confirmed {
 				if <paras::Pallet<T>>::is_valid_para(channel_id.sender) &&
 					<paras::Pallet<T>>::is_valid_para(channel_id.recipient)
@@ -824,8 +1024,8 @@ impl<T: Config> Pallet<T> {
 					HrmpChannels::<T>::insert(
 						&channel_id,
 						HrmpChannel {
-							sender_deposit: request.sender_deposit,
-							recipient_deposit: config.hrmp_recipient_deposit,
+							sender_deposit,
+							recipient_deposit,
 							max_capacity: request.max_capacity,
 							max_total_size: request.max_total_size,
 							max_message_size: request.max_message_size,
@@ -1173,7 +1373,9 @@ impl<T: Config> Pallet<T> {
 	}
 
 	/// Initiate opening a channel from a parachain to a given recipient with given channel
-	/// parameters.
+	/// parameters. If neither chain is part of the system, then a deposit from the `Configuration`
+	/// will be required for `origin` (the sender) upon opening the request and the `recipient` upon
+	/// accepting it.
 	///
 	/// Basically the same as [`hrmp_init_open_channel`](Pallet::hrmp_init_open_channel) but
 	/// intended for calling directly from other pallets rather than dispatched.
@@ -1219,10 +1421,15 @@ impl<T: Config> Pallet<T> {
 			Error::<T>::OpenHrmpChannelLimitExceeded,
 		);
 
-		T::Currency::reserve(
-			&origin.into_account_truncating(),
-			config.hrmp_sender_deposit.unique_saturated_into(),
-		)?;
+		// Do not require deposits for channels with or amongst the system.
+		let is_system = origin.is_system() || recipient.is_system();
+		let deposit = if is_system { 0 } else { config.hrmp_sender_deposit };
+		if !deposit.is_zero() {
+			T::Currency::reserve(
+				&origin.into_account_truncating(),
+				deposit.unique_saturated_into(),
+			)?;
+		}
 
 		// mutating storage directly now -- shall not bail henceforth.
 
@@ -1232,7 +1439,7 @@ impl<T: Config> Pallet<T> {
 			HrmpOpenChannelRequest {
 				confirmed: false,
 				_age: 0,
-				sender_deposit: config.hrmp_sender_deposit,
+				sender_deposit: deposit,
 				max_capacity: proposed_max_capacity,
 				max_message_size: proposed_max_message_size,
 				max_total_size: config.hrmp_channel_max_total_size,
@@ -1254,7 +1461,7 @@ impl<T: Config> Pallet<T> {
 		if let Err(dmp::QueueDownwardMessageError::ExceedsMaxMessageSize) =
 			<dmp::Pallet<T>>::queue_downward_message(&config, recipient, notification_bytes)
 		{
-			// this should never happen unless the max downward message size is configured to an
+			// this should never happen unless the max downward message size is configured to a
 			// jokingly small number.
 			log::error!(
 				target: "runtime::hrmp",
@@ -1287,10 +1494,15 @@ impl<T: Config> Pallet<T> {
 			Error::<T>::AcceptHrmpChannelLimitExceeded,
 		);
 
-		T::Currency::reserve(
-			&origin.into_account_truncating(),
-			config.hrmp_recipient_deposit.unique_saturated_into(),
-		)?;
+		// Do not require deposits for channels with or amongst the system.
+		let is_system = origin.is_system() || sender.is_system();
+		let deposit = if is_system { 0 } else { config.hrmp_recipient_deposit };
+		if !deposit.is_zero() {
+			T::Currency::reserve(
+				&origin.into_account_truncating(),
+				deposit.unique_saturated_into(),
+			)?;
+		}
 
 		// persist the updated open channel request and then increment the number of accepted
 		// channels.
diff --git a/polkadot/runtime/parachains/src/hrmp/benchmarking.rs b/polkadot/runtime/parachains/src/hrmp/benchmarking.rs
index 3fe347a7bcbaf054b23afa67ecaa7bb20d9100b0..2cb49c88d437cb3e0a4c01a40d343a179316ec9d 100644
--- a/polkadot/runtime/parachains/src/hrmp/benchmarking.rs
+++ b/polkadot/runtime/parachains/src/hrmp/benchmarking.rs
@@ -14,12 +14,15 @@
 // You should have received a copy of the GNU General Public License
 // along with Polkadot.  If not, see <http://www.gnu.org/licenses/>.
 
+#![cfg(feature = "runtime-benchmarks")]
+
 use crate::{
 	configuration::Pallet as Configuration,
 	hrmp::{Pallet as Hrmp, *},
 	paras::{Pallet as Paras, ParaKind, ParachainsCache},
 	shared::Pallet as Shared,
 };
+use frame_benchmarking::{impl_benchmark_test_suite, v2::*, whitelisted_caller};
 use frame_support::{assert_ok, traits::Currency};
 
 type BalanceOf<T> =
@@ -138,10 +141,12 @@ static_assertions::const_assert!(MAX_UNIQUE_CHANNELS < PREFIX_0);
 static_assertions::const_assert!(HRMP_MAX_INBOUND_CHANNELS_BOUND < PREFIX_0);
 static_assertions::const_assert!(HRMP_MAX_OUTBOUND_CHANNELS_BOUND < PREFIX_0);
 
-frame_benchmarking::benchmarks! {
-	where_clause { where <T as frame_system::Config>::RuntimeOrigin: From<crate::Origin> }
+#[benchmarks(where <T as frame_system::Config>::RuntimeOrigin: From<crate::Origin>)]
+mod benchmarks {
+	use super::*;
 
-	hrmp_init_open_channel {
+	#[benchmark]
+	fn hrmp_init_open_channel() {
 		let sender_id: ParaId = 1u32.into();
 		let sender_origin: crate::Origin = 1u32.into();
 
@@ -149,51 +154,75 @@ frame_benchmarking::benchmarks! {
 
 		// make sure para is registered, and has enough balance.
 		let ed = T::Currency::minimum_balance();
-		let deposit: BalanceOf<T> = Configuration::<T>::config().hrmp_sender_deposit.unique_saturated_into();
+		let deposit: BalanceOf<T> =
+			Configuration::<T>::config().hrmp_sender_deposit.unique_saturated_into();
 		register_parachain_with_balance::<T>(sender_id, deposit + ed);
 		register_parachain_with_balance::<T>(recipient_id, deposit + ed);
 
 		let capacity = Configuration::<T>::config().hrmp_channel_max_capacity;
 		let message_size = Configuration::<T>::config().hrmp_channel_max_message_size;
-	}: _(sender_origin, recipient_id, capacity, message_size)
-	verify {
+
+		#[extrinsic_call]
+		_(sender_origin, recipient_id, capacity, message_size);
+
 		assert_last_event::<T>(
-			Event::<T>::OpenChannelRequested(sender_id, recipient_id, capacity, message_size).into()
+			Event::<T>::OpenChannelRequested {
+				sender: sender_id,
+				recipient: recipient_id,
+				proposed_max_capacity: capacity,
+				proposed_max_message_size: message_size,
+			}
+			.into(),
 		);
 	}
 
-	hrmp_accept_open_channel {
+	#[benchmark]
+	fn hrmp_accept_open_channel() {
 		let [(sender, _), (recipient, recipient_origin)] =
 			establish_para_connection::<T>(1, 2, ParachainSetupStep::Requested);
-	}: _(recipient_origin, sender)
-	verify {
-		assert_last_event::<T>(Event::<T>::OpenChannelAccepted(sender, recipient).into());
+
+		#[extrinsic_call]
+		_(recipient_origin, sender);
+
+		assert_last_event::<T>(Event::<T>::OpenChannelAccepted { sender, recipient }.into());
 	}
 
-	hrmp_close_channel {
+	#[benchmark]
+	fn hrmp_close_channel() {
 		let [(sender, sender_origin), (recipient, _)] =
 			establish_para_connection::<T>(1, 2, ParachainSetupStep::Established);
 		let channel_id = HrmpChannelId { sender, recipient };
-	}: _(sender_origin, channel_id.clone())
-	verify {
-		assert_last_event::<T>(Event::<T>::ChannelClosed(sender, channel_id).into());
+
+		#[extrinsic_call]
+		_(sender_origin, channel_id.clone());
+
+		assert_last_event::<T>(
+			Event::<T>::ChannelClosed { by_parachain: sender, channel_id }.into(),
+		);
 	}
 
 	// NOTE: a single parachain should have the maximum number of allowed ingress and egress
 	// channels.
-	force_clean_hrmp {
+	#[benchmark]
+	fn force_clean_hrmp(
 		// ingress channels to a single leaving parachain that need to be closed.
-		let i in 0 .. (HRMP_MAX_INBOUND_CHANNELS_BOUND - 1);
+		i: Linear<0, { HRMP_MAX_INBOUND_CHANNELS_BOUND - 1 }>,
 		// egress channels to a single leaving parachain that need to be closed.
-		let e in 0 .. (HRMP_MAX_OUTBOUND_CHANNELS_BOUND - 1);
-
+		e: Linear<0, { HRMP_MAX_OUTBOUND_CHANNELS_BOUND - 1 }>,
+	) {
 		// first, update the configs to support this many open channels...
-		assert_ok!(
-			Configuration::<T>::set_hrmp_max_parachain_outbound_channels(frame_system::RawOrigin::Root.into(), e + 1)
-		);
-		assert_ok!(
-			Configuration::<T>::set_hrmp_max_parachain_inbound_channels(frame_system::RawOrigin::Root.into(), i + 1)
-		);
+		assert_ok!(Configuration::<T>::set_hrmp_max_parachain_outbound_channels(
+			frame_system::RawOrigin::Root.into(),
+			e + 1
+		));
+		assert_ok!(Configuration::<T>::set_hrmp_max_parachain_inbound_channels(
+			frame_system::RawOrigin::Root.into(),
+			i + 1
+		));
+		assert_ok!(Configuration::<T>::set_max_downward_message_size(
+			frame_system::RawOrigin::Root.into(),
+			1024
+		));
 		// .. and enact it.
 		Configuration::<T>::initializer_on_new_session(&Shared::<T>::scheduled_session());
 
@@ -201,14 +230,17 @@ frame_benchmarking::benchmarks! {
 		let deposit: BalanceOf<T> = config.hrmp_sender_deposit.unique_saturated_into();
 
 		let para: ParaId = 1u32.into();
-		let para_origin: crate::Origin = 1u32.into();
 		register_parachain_with_balance::<T>(para, deposit);
 		T::Currency::make_free_balance_be(&para.into_account_truncating(), deposit * 256u32.into());
 
 		for ingress_para_id in 0..i {
 			// establish ingress channels to `para`.
 			let ingress_para_id = ingress_para_id + PREFIX_0;
-			let _ = establish_para_connection::<T>(ingress_para_id, para.into(), ParachainSetupStep::Established);
+			let _ = establish_para_connection::<T>(
+				ingress_para_id,
+				para.into(),
+				ParachainSetupStep::Established,
+			);
 		}
 
 		// nothing should be left unprocessed.
@@ -217,7 +249,11 @@ frame_benchmarking::benchmarks! {
 		for egress_para_id in 0..e {
 			// establish egress channels to `para`.
 			let egress_para_id = egress_para_id + PREFIX_1;
-			let _ = establish_para_connection::<T>(para.into(), egress_para_id, ParachainSetupStep::Established);
+			let _ = establish_para_connection::<T>(
+				para.into(),
+				egress_para_id,
+				ParachainSetupStep::Established,
+			);
 		}
 
 		// nothing should be left unprocessed.
@@ -225,7 +261,10 @@ frame_benchmarking::benchmarks! {
 
 		// all in all, we have created this many channels.
 		assert_eq!(HrmpChannels::<T>::iter().count() as u32, i + e);
-	}: _(frame_system::Origin::<T>::Root, para, i, e) verify {
+
+		#[extrinsic_call]
+		_(frame_system::Origin::<T>::Root, para, i, e);
+
 		// all in all, all of them must be gone by now.
 		assert_eq!(HrmpChannels::<T>::iter().count() as u32, 0);
 		// borrow this function from the tests to make sure state is clear, given that we do a lot
@@ -233,128 +272,250 @@ frame_benchmarking::benchmarks! {
 		Hrmp::<T>::assert_storage_consistency_exhaustive();
 	}
 
-	force_process_hrmp_open {
+	#[benchmark]
+	fn force_process_hrmp_open(
 		// number of channels that need to be processed. Worse case is an N-M relation: unique
 		// sender and recipients for all channels.
-		let c in 0 .. MAX_UNIQUE_CHANNELS;
-
-		for id in 0 .. c {
-			let _ = establish_para_connection::<T>(PREFIX_0 + id, PREFIX_1 + id, ParachainSetupStep::Accepted);
+		c: Linear<0, MAX_UNIQUE_CHANNELS>,
+	) {
+		for id in 0..c {
+			let _ = establish_para_connection::<T>(
+				PREFIX_0 + id,
+				PREFIX_1 + id,
+				ParachainSetupStep::Accepted,
+			);
 		}
 		assert_eq!(HrmpOpenChannelRequestsList::<T>::decode_len().unwrap_or_default() as u32, c);
-	}: _(frame_system::Origin::<T>::Root, c)
-	verify {
+
+		#[extrinsic_call]
+		_(frame_system::Origin::<T>::Root, c);
+
 		assert_eq!(HrmpOpenChannelRequestsList::<T>::decode_len().unwrap_or_default() as u32, 0);
 	}
 
-	force_process_hrmp_close {
+	#[benchmark]
+	fn force_process_hrmp_close(
 		// number of channels that need to be processed. Worse case is an N-M relation: unique
 		// sender and recipients for all channels.
-		let c in 0 .. MAX_UNIQUE_CHANNELS;
-
-		for id in 0 .. c {
-			let _ = establish_para_connection::<T>(PREFIX_0 + id, PREFIX_1 + id, ParachainSetupStep::CloseRequested);
+		c: Linear<0, MAX_UNIQUE_CHANNELS>,
+	) {
+		for id in 0..c {
+			let _ = establish_para_connection::<T>(
+				PREFIX_0 + id,
+				PREFIX_1 + id,
+				ParachainSetupStep::CloseRequested,
+			);
 		}
 
 		assert_eq!(HrmpCloseChannelRequestsList::<T>::decode_len().unwrap_or_default() as u32, c);
-	}: _(frame_system::Origin::<T>::Root, c)
-	verify {
+
+		#[extrinsic_call]
+		_(frame_system::Origin::<T>::Root, c);
+
 		assert_eq!(HrmpCloseChannelRequestsList::<T>::decode_len().unwrap_or_default() as u32, 0);
 	}
 
-	hrmp_cancel_open_request {
+	#[benchmark]
+	fn hrmp_cancel_open_request(
 		// number of items already existing in the `HrmpOpenChannelRequestsList`, other than the
 		// one that we remove.
-		let c in 0 .. MAX_UNIQUE_CHANNELS;
-
-		for id in 0 .. c {
-			let _ = establish_para_connection::<T>(PREFIX_0 + id, PREFIX_1 + id, ParachainSetupStep::Requested);
+		c: Linear<0, MAX_UNIQUE_CHANNELS>,
+	) {
+		for id in 0..c {
+			let _ = establish_para_connection::<T>(
+				PREFIX_0 + id,
+				PREFIX_1 + id,
+				ParachainSetupStep::Requested,
+			);
 		}
 
 		let [(sender, sender_origin), (recipient, _)] =
 			establish_para_connection::<T>(1, 2, ParachainSetupStep::Requested);
-		assert_eq!(HrmpOpenChannelRequestsList::<T>::decode_len().unwrap_or_default() as u32, c + 1);
+		assert_eq!(
+			HrmpOpenChannelRequestsList::<T>::decode_len().unwrap_or_default() as u32,
+			c + 1
+		);
 		let channel_id = HrmpChannelId { sender, recipient };
-	}: _(sender_origin, channel_id, c + 1)
-	verify {
+
+		#[extrinsic_call]
+		_(sender_origin, channel_id, c + 1);
+
 		assert_eq!(HrmpOpenChannelRequestsList::<T>::decode_len().unwrap_or_default() as u32, c);
 	}
 
 	// worse case will be `n` parachain channel requests, where in all of them either the sender or
 	// the recipient need to be cleaned. This enforces the deposit of at least one to be processed.
 	// No code path for triggering two deposit process exists.
-	clean_open_channel_requests {
-		let c in 0 .. MAX_UNIQUE_CHANNELS;
-
-		for id in 0 .. c {
-			let _ = establish_para_connection::<T>(PREFIX_0 + id, PREFIX_1 + id, ParachainSetupStep::Requested);
+	#[benchmark]
+	fn clean_open_channel_requests(c: Linear<0, MAX_UNIQUE_CHANNELS>) {
+		for id in 0..c {
+			let _ = establish_para_connection::<T>(
+				PREFIX_0 + id,
+				PREFIX_1 + id,
+				ParachainSetupStep::Requested,
+			);
 		}
 
 		assert_eq!(HrmpOpenChannelRequestsList::<T>::decode_len().unwrap_or_default() as u32, c);
 		let outgoing = (0..c).map(|id| (id + PREFIX_1).into()).collect::<Vec<ParaId>>();
 		let config = Configuration::<T>::config();
-	}: {
-		Hrmp::<T>::clean_open_channel_requests(&config, &outgoing);
-	} verify {
+
+		#[block]
+		{
+			Hrmp::<T>::clean_open_channel_requests(&config, &outgoing);
+		}
+
 		assert_eq!(HrmpOpenChannelRequestsList::<T>::decode_len().unwrap_or_default() as u32, 0);
 	}
 
-	force_open_hrmp_channel {
+	#[benchmark]
+	fn force_open_hrmp_channel(
+		// Weight parameter only accepts `u32`, `0` and `1` used to represent `false` and `true`,
+		// respectively.
+		c: Linear<0, 1>,
+	) {
 		let sender_id: ParaId = 1u32.into();
 		let sender_origin: crate::Origin = 1u32.into();
 		let recipient_id: ParaId = 2u32.into();
 
-		// make sure para is registered, and has enough balance.
+		// Make sure para is registered. The sender does actually need the normal deposit because it
+		// is first going the "init" route.
 		let ed = T::Currency::minimum_balance();
 		let sender_deposit: BalanceOf<T> =
 			Configuration::<T>::config().hrmp_sender_deposit.unique_saturated_into();
-		let recipient_deposit: BalanceOf<T> =
-			Configuration::<T>::config().hrmp_recipient_deposit.unique_saturated_into();
 		register_parachain_with_balance::<T>(sender_id, sender_deposit + ed);
-		register_parachain_with_balance::<T>(recipient_id, recipient_deposit + ed);
+		register_parachain_with_balance::<T>(recipient_id, Zero::zero());
 
 		let capacity = Configuration::<T>::config().hrmp_channel_max_capacity;
 		let message_size = Configuration::<T>::config().hrmp_channel_max_message_size;
 
-		// Weight parameter only accepts `u32`, `0` and `1` used to represent `false` and `true`,
-		// respectively.
-		let c = [0, 1];
 		let channel_id = HrmpChannelId { sender: sender_id, recipient: recipient_id };
-		for channels_to_close in c {
-			if channels_to_close == 1 {
-				// this will consume more weight if a channel _request_ already exists, because it
-				// will need to clear the request.
-				assert_ok!(Hrmp::<T>::hrmp_init_open_channel(
+		if c == 1 {
+			// this will consume more weight if a channel _request_ already exists, because it
+			// will need to clear the request.
+			assert_ok!(Hrmp::<T>::hrmp_init_open_channel(
+				sender_origin.clone().into(),
+				recipient_id,
+				capacity,
+				message_size
+			));
+			assert!(HrmpOpenChannelRequests::<T>::get(&channel_id).is_some());
+		} else {
+			if HrmpOpenChannelRequests::<T>::get(&channel_id).is_some() {
+				assert_ok!(Hrmp::<T>::hrmp_cancel_open_request(
 					sender_origin.clone().into(),
-					recipient_id,
-					capacity,
-					message_size
+					channel_id.clone(),
+					MAX_UNIQUE_CHANNELS,
 				));
-				assert!(HrmpOpenChannelRequests::<T>::get(&channel_id).is_some());
-			} else {
-				if HrmpOpenChannelRequests::<T>::get(&channel_id).is_some() {
-					assert_ok!(Hrmp::<T>::hrmp_cancel_open_request(
-						sender_origin.clone().into(),
-						channel_id.clone(),
-						MAX_UNIQUE_CHANNELS,
-					));
-				}
-				assert!(HrmpOpenChannelRequests::<T>::get(&channel_id).is_none());
 			}
+			assert!(HrmpOpenChannelRequests::<T>::get(&channel_id).is_none());
 		}
 
 		// but the _channel_ should not exist
 		assert!(HrmpChannels::<T>::get(&channel_id).is_none());
-	}: _(frame_system::Origin::<T>::Root, sender_id, recipient_id, capacity, message_size)
-	verify {
+
+		#[extrinsic_call]
+		_(frame_system::Origin::<T>::Root, sender_id, recipient_id, capacity, message_size);
+
 		assert_last_event::<T>(
-			Event::<T>::HrmpChannelForceOpened(sender_id, recipient_id, capacity, message_size).into()
+			Event::<T>::HrmpChannelForceOpened {
+				sender: sender_id,
+				recipient: recipient_id,
+				proposed_max_capacity: capacity,
+				proposed_max_message_size: message_size,
+			}
+			.into(),
 		);
 	}
-}
 
-frame_benchmarking::impl_benchmark_test_suite!(
-	Hrmp,
-	crate::mock::new_test_ext(crate::hrmp::tests::GenesisConfigBuilder::default().build()),
-	crate::mock::Test
-);
+	#[benchmark]
+	fn establish_system_channel() {
+		let sender_id: ParaId = 1u32.into();
+		let recipient_id: ParaId = 2u32.into();
+
+		let caller: T::AccountId = whitelisted_caller();
+		let config = Configuration::<T>::config();
+
+		// make sure para is registered, and has zero balance.
+		register_parachain_with_balance::<T>(sender_id, Zero::zero());
+		register_parachain_with_balance::<T>(recipient_id, Zero::zero());
+
+		let capacity = config.hrmp_channel_max_capacity;
+		let message_size = config.hrmp_channel_max_message_size;
+
+		#[extrinsic_call]
+		_(frame_system::RawOrigin::Signed(caller), sender_id, recipient_id);
+
+		assert_last_event::<T>(
+			Event::<T>::HrmpSystemChannelOpened {
+				sender: sender_id,
+				recipient: recipient_id,
+				proposed_max_capacity: capacity,
+				proposed_max_message_size: message_size,
+			}
+			.into(),
+		);
+	}
+
+	#[benchmark]
+	fn poke_channel_deposits() {
+		let sender_id: ParaId = 1u32.into();
+		let recipient_id: ParaId = 2u32.into();
+		let channel_id = HrmpChannelId { sender: sender_id, recipient: recipient_id };
+
+		let caller: T::AccountId = whitelisted_caller();
+		let config = Configuration::<T>::config();
+
+		// make sure para is registered, and has balance to reserve.
+		let ed = T::Currency::minimum_balance();
+		let sender_deposit: BalanceOf<T> = config.hrmp_sender_deposit.unique_saturated_into();
+		let recipient_deposit: BalanceOf<T> = config.hrmp_recipient_deposit.unique_saturated_into();
+		register_parachain_with_balance::<T>(sender_id, ed + sender_deposit);
+		register_parachain_with_balance::<T>(recipient_id, ed + recipient_deposit);
+
+		// Our normal establishment won't actually reserve deposits, so just insert them directly.
+		HrmpChannels::<T>::insert(
+			&channel_id,
+			HrmpChannel {
+				sender_deposit: config.hrmp_sender_deposit,
+				recipient_deposit: config.hrmp_recipient_deposit,
+				max_capacity: config.hrmp_channel_max_capacity,
+				max_total_size: config.hrmp_channel_max_total_size,
+				max_message_size: config.hrmp_channel_max_message_size,
+				msg_count: 0,
+				total_size: 0,
+				mqc_head: None,
+			},
+		);
+		// Actually reserve the deposits.
+		let _ = T::Currency::reserve(&sender_id.into_account_truncating(), sender_deposit);
+		let _ = T::Currency::reserve(&recipient_id.into_account_truncating(), recipient_deposit);
+
+		#[extrinsic_call]
+		_(frame_system::RawOrigin::Signed(caller), sender_id, recipient_id);
+
+		assert_last_event::<T>(
+			Event::<T>::OpenChannelDepositsUpdated { sender: sender_id, recipient: recipient_id }
+				.into(),
+		);
+		let channel = HrmpChannels::<T>::get(&channel_id).unwrap();
+		// Check that the deposit was updated in the channel state.
+		assert_eq!(channel.sender_deposit, 0);
+		assert_eq!(channel.recipient_deposit, 0);
+		// And that the funds were unreserved.
+		assert_eq!(
+			T::Currency::reserved_balance(&sender_id.into_account_truncating()),
+			0u128.unique_saturated_into()
+		);
+		assert_eq!(
+			T::Currency::reserved_balance(&recipient_id.into_account_truncating()),
+			0u128.unique_saturated_into()
+		);
+	}
+
+	impl_benchmark_test_suite!(
+		Hrmp,
+		crate::mock::new_test_ext(crate::hrmp::tests::GenesisConfigBuilder::default().build()),
+		crate::mock::Test
+	);
+}
diff --git a/polkadot/runtime/parachains/src/hrmp/tests.rs b/polkadot/runtime/parachains/src/hrmp/tests.rs
index 8cfaf48d10ef7f688ef37a4fb3a12182a7e06c13..4fc0b0b448a50658758d4f76e46c7034d2edce01 100644
--- a/polkadot/runtime/parachains/src/hrmp/tests.rs
+++ b/polkadot/runtime/parachains/src/hrmp/tests.rs
@@ -14,13 +14,17 @@
 // You should have received a copy of the GNU General Public License
 // along with Polkadot.  If not, see <http://www.gnu.org/licenses/>.
 
+// NOTE: System chains, identified by ParaId < 2000, are treated as special in HRMP channel
+// initialization. Namely, they do not require a deposit if even one ParaId is a system para. If
+// both paras are system chains, then they are also configured to the system's max configuration.
+
 use super::*;
 use crate::mock::{
 	deregister_parachain, new_test_ext, register_parachain, register_parachain_with_balance,
 	Configuration, Hrmp, MockGenesisConfig, Paras, ParasShared, RuntimeEvent as MockEvent,
 	RuntimeOrigin, System, Test,
 };
-use frame_support::assert_noop;
+use frame_support::{assert_noop, assert_ok};
 use primitives::BlockNumber;
 use std::collections::BTreeMap;
 
@@ -133,10 +137,10 @@ fn empty_state_consistent_state() {
 
 #[test]
 fn open_channel_works() {
-	let para_a = 1.into();
-	let para_a_origin: crate::Origin = 1.into();
-	let para_b = 3.into();
-	let para_b_origin: crate::Origin = 3.into();
+	let para_a = 2001.into();
+	let para_a_origin: crate::Origin = 2001.into();
+	let para_b = 2003.into();
+	let para_b_origin: crate::Origin = 2003.into();
 
 	new_test_ext(GenesisConfigBuilder::default().build()).execute_with(|| {
 		// We need both A & B to be registered and alive parachains.
@@ -147,14 +151,17 @@ fn open_channel_works() {
 		Hrmp::hrmp_init_open_channel(para_a_origin.into(), para_b, 2, 8).unwrap();
 		Hrmp::assert_storage_consistency_exhaustive();
 		assert!(System::events().iter().any(|record| record.event ==
-			MockEvent::Hrmp(Event::OpenChannelRequested(para_a, para_b, 2, 8))));
+			MockEvent::Hrmp(Event::OpenChannelRequested {
+				sender: para_a,
+				recipient: para_b,
+				proposed_max_capacity: 2,
+				proposed_max_message_size: 8
+			})));
 
 		Hrmp::hrmp_accept_open_channel(para_b_origin.into(), para_a).unwrap();
 		Hrmp::assert_storage_consistency_exhaustive();
-		assert!(System::events()
-			.iter()
-			.any(|record| record.event ==
-				MockEvent::Hrmp(Event::OpenChannelAccepted(para_a, para_b))));
+		assert!(System::events().iter().any(|record| record.event ==
+			MockEvent::Hrmp(Event::OpenChannelAccepted { sender: para_a, recipient: para_b })));
 
 		// Advance to a block 6, but without session change. That means that the channel has
 		// not been created yet.
@@ -171,18 +178,26 @@ fn open_channel_works() {
 #[test]
 fn force_open_channel_works() {
 	let para_a = 1.into();
-	let para_b = 3.into();
+	let para_b = 2003.into();
 
 	new_test_ext(GenesisConfigBuilder::default().build()).execute_with(|| {
 		// We need both A & B to be registered and live parachains.
 		register_parachain(para_a);
 		register_parachain(para_b);
 
+		let para_b_free_balance =
+			<Test as Config>::Currency::free_balance(&para_b.into_account_truncating());
+
 		run_to_block(5, Some(vec![4, 5]));
 		Hrmp::force_open_hrmp_channel(RuntimeOrigin::root(), para_a, para_b, 2, 8).unwrap();
 		Hrmp::assert_storage_consistency_exhaustive();
 		assert!(System::events().iter().any(|record| record.event ==
-			MockEvent::Hrmp(Event::HrmpChannelForceOpened(para_a, para_b, 2, 8))));
+			MockEvent::Hrmp(Event::HrmpChannelForceOpened {
+				sender: para_a,
+				recipient: para_b,
+				proposed_max_capacity: 2,
+				proposed_max_message_size: 8
+			})));
 
 		// Advance to a block 6, but without session change. That means that the channel has
 		// not been created yet.
@@ -193,14 +208,19 @@ fn force_open_channel_works() {
 		// Now let the session change happen and thus open the channel.
 		run_to_block(8, Some(vec![8]));
 		assert!(channel_exists(para_a, para_b));
+		// Because para_a is a system chain, para_b's free balance should not have changed.
+		assert_eq!(
+			<Test as Config>::Currency::free_balance(&para_b.into_account_truncating()),
+			para_b_free_balance
+		);
 	});
 }
 
 #[test]
 fn force_open_channel_works_with_existing_request() {
-	let para_a = 1.into();
-	let para_a_origin: crate::Origin = 1.into();
-	let para_b = 3.into();
+	let para_a = 2001.into();
+	let para_a_origin: crate::Origin = 2001.into();
+	let para_b = 2003.into();
 
 	new_test_ext(GenesisConfigBuilder::default().build()).execute_with(|| {
 		// We need both A & B to be registered and live parachains.
@@ -212,7 +232,12 @@ fn force_open_channel_works_with_existing_request() {
 		Hrmp::hrmp_init_open_channel(para_a_origin.into(), para_b, 2, 8).unwrap();
 		Hrmp::assert_storage_consistency_exhaustive();
 		assert!(System::events().iter().any(|record| record.event ==
-			MockEvent::Hrmp(Event::OpenChannelRequested(para_a, para_b, 2, 8))));
+			MockEvent::Hrmp(Event::OpenChannelRequested {
+				sender: para_a,
+				recipient: para_b,
+				proposed_max_capacity: 2,
+				proposed_max_message_size: 8
+			})));
 
 		run_to_block(5, Some(vec![4, 5]));
 		// the request exists, but no channel.
@@ -226,7 +251,12 @@ fn force_open_channel_works_with_existing_request() {
 		Hrmp::force_open_hrmp_channel(RuntimeOrigin::root(), para_a, para_b, 2, 8).unwrap();
 		Hrmp::assert_storage_consistency_exhaustive();
 		assert!(System::events().iter().any(|record| record.event ==
-			MockEvent::Hrmp(Event::HrmpChannelForceOpened(para_a, para_b, 2, 8))));
+			MockEvent::Hrmp(Event::HrmpChannelForceOpened {
+				sender: para_a,
+				recipient: para_b,
+				proposed_max_capacity: 2,
+				proposed_max_message_size: 8
+			})));
 
 		// Advance to a block 6, but without session change. That means that the channel has
 		// not been created yet.
@@ -240,11 +270,132 @@ fn force_open_channel_works_with_existing_request() {
 	});
 }
 
+#[test]
+fn open_system_channel_works() {
+	let para_a = 1.into();
+	let para_b = 3.into();
+
+	new_test_ext(GenesisConfigBuilder::default().build()).execute_with(|| {
+		// We need both A & B to be registered and live parachains.
+		register_parachain(para_a);
+		register_parachain(para_b);
+
+		run_to_block(5, Some(vec![4, 5]));
+		Hrmp::establish_system_channel(RuntimeOrigin::signed(1), para_a, para_b).unwrap();
+		Hrmp::assert_storage_consistency_exhaustive();
+		assert!(System::events().iter().any(|record| record.event ==
+			MockEvent::Hrmp(Event::HrmpSystemChannelOpened {
+				sender: para_a,
+				recipient: para_b,
+				proposed_max_capacity: 2,
+				proposed_max_message_size: 8
+			})));
+
+		// Advance to a block 6, but without session change. That means that the channel has
+		// not been created yet.
+		run_to_block(6, None);
+		assert!(!channel_exists(para_a, para_b));
+		Hrmp::assert_storage_consistency_exhaustive();
+
+		// Now let the session change happen and thus open the channel.
+		run_to_block(8, Some(vec![8]));
+		assert!(channel_exists(para_a, para_b));
+	});
+}
+
+#[test]
+fn open_system_channel_does_not_work_for_non_system_chains() {
+	let para_a = 2001.into();
+	let para_b = 2003.into();
+
+	new_test_ext(GenesisConfigBuilder::default().build()).execute_with(|| {
+		// We need both A & B to be registered and live parachains.
+		register_parachain(para_a);
+		register_parachain(para_b);
+
+		run_to_block(5, Some(vec![4, 5]));
+		assert_noop!(
+			Hrmp::establish_system_channel(RuntimeOrigin::signed(1), para_a, para_b),
+			Error::<Test>::ChannelCreationNotAuthorized
+		);
+		Hrmp::assert_storage_consistency_exhaustive();
+	});
+}
+
+#[test]
+fn open_system_channel_does_not_work_with_one_non_system_chain() {
+	let para_a = 1.into();
+	let para_b = 2003.into();
+
+	new_test_ext(GenesisConfigBuilder::default().build()).execute_with(|| {
+		// We need both A & B to be registered and live parachains.
+		register_parachain(para_a);
+		register_parachain(para_b);
+
+		run_to_block(5, Some(vec![4, 5]));
+		assert_noop!(
+			Hrmp::establish_system_channel(RuntimeOrigin::signed(1), para_a, para_b),
+			Error::<Test>::ChannelCreationNotAuthorized
+		);
+		Hrmp::assert_storage_consistency_exhaustive();
+	});
+}
+
+#[test]
+fn poke_deposits_works() {
+	let para_a = 1.into();
+	let para_b = 2001.into();
+
+	new_test_ext(GenesisConfigBuilder::default().build()).execute_with(|| {
+		// We need both A & B to be registered and live parachains.
+		register_parachain_with_balance(para_a, 200);
+		register_parachain_with_balance(para_b, 200);
+
+		let config = Configuration::config();
+		let channel_id = HrmpChannelId { sender: para_a, recipient: para_b };
+
+		// Our normal establishment won't actually reserve deposits, so just insert them directly.
+		HrmpChannels::<Test>::insert(
+			&channel_id,
+			HrmpChannel {
+				sender_deposit: config.hrmp_sender_deposit,
+				recipient_deposit: config.hrmp_recipient_deposit,
+				max_capacity: config.hrmp_channel_max_capacity,
+				max_total_size: config.hrmp_channel_max_total_size,
+				max_message_size: config.hrmp_channel_max_message_size,
+				msg_count: 0,
+				total_size: 0,
+				mqc_head: None,
+			},
+		);
+		// reserve funds
+		assert_ok!(<Test as Config>::Currency::reserve(
+			&para_a.into_account_truncating(),
+			config.hrmp_sender_deposit
+		));
+		assert_ok!(<Test as Config>::Currency::reserve(
+			&para_b.into_account_truncating(),
+			config.hrmp_recipient_deposit
+		));
+
+		assert_ok!(Hrmp::poke_channel_deposits(RuntimeOrigin::signed(1), para_a, para_b));
+
+		assert_eq!(
+			<Test as Config>::Currency::reserved_balance(&para_a.into_account_truncating()),
+			0
+		);
+		assert_eq!(
+			<Test as Config>::Currency::reserved_balance(&para_b.into_account_truncating()),
+			0
+		);
+	});
+}
+
 #[test]
 fn close_channel_works() {
-	let para_a = 5.into();
-	let para_b = 2.into();
-	let para_b_origin: crate::Origin = 2.into();
+	let para_a = 2005.into();
+	let para_b = 2002.into();
+	let para_b_origin: crate::Origin = 2002.into();
 
 	new_test_ext(GenesisConfigBuilder::default().build()).execute_with(|| {
 		register_parachain(para_a);
@@ -269,14 +420,17 @@ fn close_channel_works() {
 		assert!(!channel_exists(para_a, para_b));
 		Hrmp::assert_storage_consistency_exhaustive();
 		assert!(System::events().iter().any(|record| record.event ==
-			MockEvent::Hrmp(Event::ChannelClosed(para_b, channel_id.clone()))));
+			MockEvent::Hrmp(Event::ChannelClosed {
+				by_parachain: para_b,
+				channel_id: channel_id.clone()
+			})));
 	});
 }
 
 #[test]
 fn send_recv_messages() {
-	let para_a = 32.into();
-	let para_b = 64.into();
+	let para_a = 2032.into();
+	let para_b = 2064.into();
 
 	let mut genesis = GenesisConfigBuilder::default();
 	genesis.hrmp_channel_max_message_size = 20;
@@ -358,8 +512,8 @@ fn hrmp_mqc_head_fixture() {
 
 #[test]
 fn accept_incoming_request_and_offboard() {
-	let para_a = 32.into();
-	let para_b = 64.into();
+	let para_a = 2032.into();
+	let para_b = 2064.into();
 
 	new_test_ext(GenesisConfigBuilder::default().build()).execute_with(|| {
 		register_parachain(para_a);
@@ -380,9 +534,9 @@ fn accept_incoming_request_and_offboard() {
 
 #[test]
 fn check_sent_messages() {
-	let para_a = 32.into();
-	let para_b = 64.into();
-	let para_c = 97.into();
+	let para_a = 2032.into();
+	let para_b = 2064.into();
+	let para_c = 2097.into();
 
 	new_test_ext(GenesisConfigBuilder::default().build()).execute_with(|| {
 		register_parachain(para_a);
@@ -444,8 +598,8 @@ fn check_sent_messages() {
 fn verify_externally_accessible() {
 	use primitives::{well_known_keys, AbridgedHrmpChannel};
 
-	let para_a = 20.into();
-	let para_b = 21.into();
+	let para_a = 2020.into();
+	let para_b = 2021.into();
 
 	new_test_ext(GenesisConfigBuilder::default().build()).execute_with(|| {
 		// Register two parachains, wait until a session change, then initiate channel open
@@ -502,8 +656,8 @@ fn verify_externally_accessible() {
 
 #[test]
 fn charging_deposits() {
-	let para_a = 32.into();
-	let para_b = 64.into();
+	let para_a = 2032.into();
+	let para_b = 2064.into();
 
 	new_test_ext(GenesisConfigBuilder::default().build()).execute_with(|| {
 		register_parachain_with_balance(para_a, 0);
@@ -532,8 +686,8 @@ fn charging_deposits() {
 
 #[test]
 fn refund_deposit_on_normal_closure() {
-	let para_a = 32.into();
-	let para_b = 64.into();
+	let para_a = 2032.into();
+	let para_b = 2064.into();
 
 	let mut genesis = GenesisConfigBuilder::default();
 	genesis.hrmp_sender_deposit = 20;
@@ -565,8 +719,8 @@ fn refund_deposit_on_normal_closure() {
 
 #[test]
 fn refund_deposit_on_offboarding() {
-	let para_a = 32.into();
-	let para_b = 64.into();
+	let para_a = 2032.into();
+	let para_b = 2064.into();
 
 	let mut genesis = GenesisConfigBuilder::default();
 	genesis.hrmp_sender_deposit = 20;
@@ -605,8 +759,8 @@ fn refund_deposit_on_offboarding() {
 
 #[test]
 fn no_dangling_open_requests() {
-	let para_a = 32.into();
-	let para_b = 64.into();
+	let para_a = 2032.into();
+	let para_b = 2064.into();
 
 	let mut genesis = GenesisConfigBuilder::default();
 	genesis.hrmp_sender_deposit = 20;
@@ -643,8 +797,8 @@ fn no_dangling_open_requests() {
 
 #[test]
 fn cancel_pending_open_channel_request() {
-	let para_a = 32.into();
-	let para_b = 64.into();
+	let para_a = 2032.into();
+	let para_b = 2064.into();
 
 	let mut genesis = GenesisConfigBuilder::default();
 	genesis.hrmp_sender_deposit = 20;
@@ -675,8 +829,8 @@ fn cancel_pending_open_channel_request() {
 
 #[test]
 fn watermark_maxed_out_at_relay_parent() {
-	let para_a = 32.into();
-	let para_b = 64.into();
+	let para_a = 2032.into();
+	let para_b = 2064.into();
 
 	let mut genesis = GenesisConfigBuilder::default();
 	genesis.hrmp_channel_max_message_size = 20;
diff --git a/polkadot/runtime/parachains/src/inclusion/benchmarking.rs b/polkadot/runtime/parachains/src/inclusion/benchmarking.rs
index 0471c0c3b2bf8795e19ce5c522a961361f4d38b8..169e858deda8aea05751450a65065550b881142b 100644
--- a/polkadot/runtime/parachains/src/inclusion/benchmarking.rs
+++ b/polkadot/runtime/parachains/src/inclusion/benchmarking.rs
@@ -1,4 +1,4 @@
-// Copyright 2020 Parity Technologies (UK) Ltd.
+// Copyright (C) Parity Technologies (UK) Ltd.
 // This file is part of Polkadot.
 
 // Polkadot is free software: you can redistribute it and/or modify
diff --git a/polkadot/runtime/parachains/src/inclusion/mod.rs b/polkadot/runtime/parachains/src/inclusion/mod.rs
index e60aac0080cfca6d53000441958d1f15bada1265..e34286d750ac1c89d83f1c33e606e08947f6002c 100644
--- a/polkadot/runtime/parachains/src/inclusion/mod.rs
+++ b/polkadot/runtime/parachains/src/inclusion/mod.rs
@@ -21,8 +21,9 @@
 
 use crate::{
 	configuration::{self, HostConfiguration},
-	disputes, dmp, hrmp, paras,
-	scheduler::{self, common::CoreAssignment},
+	disputes, dmp, hrmp,
+	paras::{self, SetGoAhead},
+	scheduler::{self, AvailabilityTimeoutStatus},
 	shared::{self, AllowedRelayParentsTracker},
 };
 use bitvec::{order::Lsb0 as BitOrderLsb0, vec::BitVec};
@@ -36,17 +37,20 @@ use frame_system::pallet_prelude::*;
 use pallet_message_queue::OnQueueChanged;
 use parity_scale_codec::{Decode, Encode};
 use primitives::{
-	supermajority_threshold, well_known_keys, AvailabilityBitfield, BackedCandidate,
-	CandidateCommitments, CandidateDescriptor, CandidateHash, CandidateReceipt,
-	CommittedCandidateReceipt, CoreIndex, GroupIndex, Hash, HeadData, Id as ParaId,
-	SignedAvailabilityBitfields, SigningContext, UpwardMessage, ValidatorId, ValidatorIndex,
-	ValidityAttestation,
+	effective_minimum_backing_votes, supermajority_threshold, well_known_keys,
+	AvailabilityBitfield, BackedCandidate, CandidateCommitments, CandidateDescriptor,
+	CandidateHash, CandidateReceipt, CommittedCandidateReceipt, CoreIndex, GroupIndex, Hash,
+	HeadData, Id as ParaId, SignedAvailabilityBitfields, SigningContext, UpwardMessage,
+	ValidatorId, ValidatorIndex, ValidityAttestation,
 };
 use scale_info::TypeInfo;
 use sp_runtime::{traits::One, DispatchError, SaturatedConversion, Saturating};
 #[cfg(feature = "std")]
 use sp_std::fmt;
-use sp_std::{collections::btree_set::BTreeSet, prelude::*};
+use sp_std::{
+	collections::{btree_map::BTreeMap, btree_set::BTreeSet},
+	prelude::*,
+};
 
 pub use pallet::*;
 
@@ -199,17 +203,6 @@ impl<H> Default for ProcessedCandidates<H> {
 	}
 }
 
-/// Number of backing votes we need for a valid backing.
-///
-/// WARNING: This check has to be kept in sync with the node side checks.
-pub fn minimum_backing_votes(n_validators: usize) -> usize {
-	// For considerations on this value see:
-	// https://github.com/paritytech/polkadot/pull/1656#issuecomment-999734650
-	// and
-	// https://github.com/paritytech/polkadot/issues/4386
-	sp_std::cmp::min(n_validators, 2)
-}
-
 /// Reads the footprint of queues for a specific origin type.
 pub trait QueueFootprinter {
 	type Origin;
@@ -416,10 +409,10 @@ enum AcceptanceCheckErr<BlockNumber> {
 	OutboundHrmp(hrmp::OutboundHrmpAcceptanceErr),
 }
 
-/// An error returned by [`check_upward_messages`] that indicates a violation of one of acceptance
-/// criteria rules.
+/// An error returned by [`Pallet::check_upward_messages`] that indicates a violation of one of
+/// acceptance criteria rules.
 #[cfg_attr(test, derive(PartialEq))]
-pub enum UmpAcceptanceCheckErr {
+pub(crate) enum UmpAcceptanceCheckErr {
 	/// The maximal number of messages that can be submitted in one batch was exceeded.
 	MoreMessagesThanPermitted { sent: u32, permitted: u32 },
 	/// The maximal size of a single message was exceeded.
@@ -456,8 +449,9 @@ impl fmt::Debug for UmpAcceptanceCheckErr {
 				"the ump queue would have grown past the max size permitted by config ({} > {})",
 				total_size, limit,
 			),
-			UmpAcceptanceCheckErr::IsOffboarding =>
-				write!(fmt, "upward message rejected because the para is off-boarding",),
+			UmpAcceptanceCheckErr::IsOffboarding => {
+				write!(fmt, "upward message rejected because the para is off-boarding")
+			},
 		}
 	}
 }
@@ -608,7 +602,7 @@ impl<T: Config> Pallet<T> {
 	pub(crate) fn process_candidates<GV>(
 		allowed_relay_parents: &AllowedRelayParentsTracker<T::Hash, BlockNumberFor<T>>,
 		candidates: Vec<BackedCandidate<T::Hash>>,
-		scheduled: Vec<CoreAssignment<BlockNumberFor<T>>>,
+		scheduled: &BTreeMap<ParaId, CoreIndex>,
 		group_validators: GV,
 	) -> Result<ProcessedCandidates<T::Hash>, DispatchError>
 	where
@@ -622,6 +616,7 @@ impl<T: Config> Pallet<T> {
 			return Ok(ProcessedCandidates::default())
 		}
 
+		let minimum_backing_votes = configuration::Pallet::<T>::config().minimum_backing_votes;
 		let validators = shared::Pallet::<T>::active_validator_keys();
 
 		// Collect candidate receipts with backers.
@@ -630,20 +625,18 @@ impl<T: Config> Pallet<T> {
 
 		// Do all checks before writing storage.
 		let core_indices_and_backers = {
-			let mut skip = 0;
 			let mut core_indices_and_backers = Vec::with_capacity(candidates.len());
 			let mut last_core = None;
 
-			let mut check_assignment_in_order =
-				|assignment: &CoreAssignment<BlockNumberFor<T>>| -> DispatchResult {
-					ensure!(
-						last_core.map_or(true, |core| assignment.core > core),
-						Error::<T>::ScheduledOutOfOrder,
-					);
+			let mut check_assignment_in_order = |core_idx| -> DispatchResult {
+				ensure!(
+					last_core.map_or(true, |core| core_idx > core),
+					Error::<T>::ScheduledOutOfOrder,
+				);
 
-					last_core = Some(assignment.core);
-					Ok(())
-				};
+				last_core = Some(core_idx);
+				Ok(())
+			};
 
 			// We combine an outer loop over candidates with an inner loop over the scheduled,
 			// where each iteration of the outer loop picks up at the position
@@ -655,9 +648,7 @@ impl<T: Config> Pallet<T> {
 			//
 			// In the meantime, we do certain sanity checks on the candidates and on the scheduled
 			// list.
-			'next_backed_candidate: for (candidate_idx, backed_candidate) in
-				candidates.iter().enumerate()
-			{
+			for (candidate_idx, backed_candidate) in candidates.iter().enumerate() {
 				let relay_parent_hash = backed_candidate.descriptor().relay_parent;
 				let para_id = backed_candidate.descriptor().para_id;
 
@@ -691,104 +682,89 @@ impl<T: Config> Pallet<T> {
 				let para_id = backed_candidate.descriptor().para_id;
 				let mut backers = bitvec::bitvec![u8, BitOrderLsb0; 0; validators.len()];
 
-				for (i, core_assignment) in scheduled[skip..].iter().enumerate() {
-					check_assignment_in_order(core_assignment)?;
+				let core_idx = *scheduled.get(&para_id).ok_or(Error::<T>::UnscheduledCandidate)?;
+				check_assignment_in_order(core_idx)?;
+				ensure!(
+					<PendingAvailability<T>>::get(&para_id).is_none() &&
+						<PendingAvailabilityCommitments<T>>::get(&para_id).is_none(),
+					Error::<T>::CandidateScheduledBeforeParaFree,
+				);
 
-					if para_id == core_assignment.paras_entry.para_id() {
-						ensure!(
-							<PendingAvailability<T>>::get(&para_id).is_none() &&
-								<PendingAvailabilityCommitments<T>>::get(&para_id).is_none(),
-							Error::<T>::CandidateScheduledBeforeParaFree,
-						);
+				// The candidate based upon relay parent `N` should be backed by a group
+				// assigned to core at block `N + 1`. Thus, `relay_parent_number + 1`
+				// will always land in the current session.
+				let group_idx = <scheduler::Pallet<T>>::group_assigned_to_core(
+					core_idx,
+					relay_parent_number + One::one(),
+				)
+				.ok_or_else(|| {
+					log::warn!(
+						target: LOG_TARGET,
+						"Failed to compute group index for candidate {}",
+						candidate_idx
+					);
+					Error::<T>::InvalidAssignment
+				})?;
+				let group_vals =
+					group_validators(group_idx).ok_or_else(|| Error::<T>::InvalidGroupIndex)?;
+
+				// check the signatures in the backing and that it is a majority.
+				{
+					let maybe_amount_validated = primitives::check_candidate_backing(
+						&backed_candidate,
+						&signing_context,
+						group_vals.len(),
+						|intra_group_vi| {
+							group_vals
+								.get(intra_group_vi)
+								.and_then(|vi| validators.get(vi.0 as usize))
+								.map(|v| v.clone())
+						},
+					);
 
-						// account for already skipped, and then skip this one.
-						skip = i + skip + 1;
-
-						// The candidate based upon relay parent `N` should be backed by a group
-						// assigned to core at block `N + 1`. Thus, `relay_parent_number + 1`
-						// will always land in the current session.
-						let group_idx = <scheduler::Pallet<T>>::group_assigned_to_core(
-							core_assignment.core,
-							relay_parent_number + One::one(),
-						)
-						.ok_or_else(|| {
-							log::warn!(
-								target: LOG_TARGET,
-								"Failed to compute group index for candidate {}",
-								candidate_idx
-							);
-							Error::<T>::InvalidAssignment
-						})?;
-						let group_vals = group_validators(group_idx)
-							.ok_or_else(|| Error::<T>::InvalidGroupIndex)?;
-
-						// check the signatures in the backing and that it is a majority.
-						{
-							let maybe_amount_validated = primitives::check_candidate_backing(
-								&backed_candidate,
-								&signing_context,
-								group_vals.len(),
-								|intra_group_vi| {
-									group_vals
-										.get(intra_group_vi)
-										.and_then(|vi| validators.get(vi.0 as usize))
-										.map(|v| v.clone())
-								},
-							);
-
-							match maybe_amount_validated {
-								Ok(amount_validated) => ensure!(
-									amount_validated >= minimum_backing_votes(group_vals.len()),
-									Error::<T>::InsufficientBacking,
+					match maybe_amount_validated {
+						Ok(amount_validated) => ensure!(
+							amount_validated >=
+								effective_minimum_backing_votes(
+									group_vals.len(),
+									minimum_backing_votes
 								),
-								Err(()) => {
-									Err(Error::<T>::InvalidBacking)?;
-								},
-							}
-
-							let mut backer_idx_and_attestation =
-								Vec::<(ValidatorIndex, ValidityAttestation)>::with_capacity(
-									backed_candidate.validator_indices.count_ones(),
-								);
-							let candidate_receipt = backed_candidate.receipt();
-
-							for ((bit_idx, _), attestation) in backed_candidate
-								.validator_indices
-								.iter()
-								.enumerate()
-								.filter(|(_, signed)| **signed)
-								.zip(backed_candidate.validity_votes.iter().cloned())
-							{
-								let val_idx = group_vals
-									.get(bit_idx)
-									.expect("this query succeeded above; qed");
-								backer_idx_and_attestation.push((*val_idx, attestation));
-
-								backers.set(val_idx.0 as _, true);
-							}
-							candidate_receipt_with_backing_validator_indices
-								.push((candidate_receipt, backer_idx_and_attestation));
-						}
-
-						core_indices_and_backers.push((
-							(core_assignment.core, core_assignment.paras_entry.para_id()),
-							backers,
-							group_idx,
-							relay_parent_number,
-						));
-						continue 'next_backed_candidate
+							Error::<T>::InsufficientBacking,
+						),
+						Err(()) => {
+							Err(Error::<T>::InvalidBacking)?;
+						},
 					}
-				}
 
-				// end of loop reached means that the candidate didn't appear in the non-traversed
-				// section of the `scheduled` slice. either it was not scheduled or didn't appear in
-				// `candidates` in the correct order.
-				ensure!(false, Error::<T>::UnscheduledCandidate);
-			}
+					let mut backer_idx_and_attestation =
+						Vec::<(ValidatorIndex, ValidityAttestation)>::with_capacity(
+							backed_candidate.validator_indices.count_ones(),
+						);
+					let candidate_receipt = backed_candidate.receipt();
+
+					for ((bit_idx, _), attestation) in backed_candidate
+						.validator_indices
+						.iter()
+						.enumerate()
+						.filter(|(_, signed)| **signed)
+						.zip(backed_candidate.validity_votes.iter().cloned())
+					{
+						let val_idx =
+							group_vals.get(bit_idx).expect("this query succeeded above; qed");
+						backer_idx_and_attestation.push((*val_idx, attestation));
+
+						backers.set(val_idx.0 as _, true);
+					}
+					candidate_receipt_with_backing_validator_indices
+						.push((candidate_receipt, backer_idx_and_attestation));
+				}
 
-			// check remainder of scheduled cores, if any.
-			for assignment in scheduled[skip..].iter() {
-				check_assignment_in_order(assignment)?;
+				core_indices_and_backers.push((
+					(core_idx, para_id),
+					backers,
+					group_idx,
+					relay_parent_number,
+				));
 			}
 
 			core_indices_and_backers
@@ -911,6 +887,7 @@ impl<T: Config> Pallet<T> {
 				new_code,
 				now,
 				&config,
+				SetGoAhead::Yes,
 			));
 		}
 
@@ -1049,13 +1026,13 @@ impl<T: Config> Pallet<T> {
 	///
 	/// Returns a vector of cleaned-up core IDs.
 	pub(crate) fn collect_pending(
-		pred: impl Fn(CoreIndex, BlockNumberFor<T>) -> bool,
+		pred: impl Fn(BlockNumberFor<T>) -> AvailabilityTimeoutStatus<BlockNumberFor<T>>,
 	) -> Vec<CoreIndex> {
 		let mut cleaned_up_ids = Vec::new();
 		let mut cleaned_up_cores = Vec::new();
 
 		for (para_id, pending_record) in <PendingAvailability<T>>::iter() {
-			if pred(pending_record.core, pending_record.backed_in_number) {
+			if pred(pending_record.backed_in_number).timed_out {
 				cleaned_up_ids.push(para_id);
 				cleaned_up_cores.push(pending_record.core);
 			}
diff --git a/polkadot/runtime/parachains/src/inclusion/tests.rs b/polkadot/runtime/parachains/src/inclusion/tests.rs
index 7c22ac36a802fac04041fc5f97811e100dd4f81a..6bb731671f6f8afbb350dff2a2821f6ab31da5a0 100644
--- a/polkadot/runtime/parachains/src/inclusion/tests.rs
+++ b/polkadot/runtime/parachains/src/inclusion/tests.rs
@@ -26,14 +26,16 @@ use crate::{
 	paras_inherent::DisputedBitfield,
 	shared::AllowedRelayParentsTracker,
 };
-use primitives::{SignedAvailabilityBitfields, UncheckedSignedAvailabilityBitfields};
+use primitives::{
+	effective_minimum_backing_votes, SignedAvailabilityBitfields,
+	UncheckedSignedAvailabilityBitfields,
+};
 
 use assert_matches::assert_matches;
 use frame_support::assert_noop;
 use keyring::Sr25519Keyring;
 use parity_scale_codec::DecodeAll;
 use primitives::{
-	v5::{Assignment, ParasEntry},
 	BlockNumber, CandidateCommitments, CandidateDescriptor, CollatorId,
 	CompactStatement as Statement, Hash, SignedAvailabilityBitfield, SignedStatement,
 	ValidationCode, ValidatorId, ValidityAttestation, PARACHAIN_KEY_TYPE_ID,
@@ -120,11 +122,14 @@ pub(crate) fn back_candidate(
 	kind: BackingKind,
 ) -> BackedCandidate {
 	let mut validator_indices = bitvec::bitvec![u8, BitOrderLsb0; 0; group.len()];
-	let threshold = minimum_backing_votes(group.len());
+	let threshold = effective_minimum_backing_votes(
+		group.len(),
+		configuration::Pallet::<Test>::config().minimum_backing_votes,
+	);
 
 	let signing = match kind {
 		BackingKind::Unanimous => group.len(),
-		BackingKind::Threshold => threshold,
+		BackingKind::Threshold => threshold as usize,
 		BackingKind::Lacking => threshold.saturating_sub(1),
 	};
 
@@ -374,7 +379,9 @@ fn collect_pending_cleans_up_pending() {
 		(chain_b, ParaKind::Parachain),
 		(thread_a, ParaKind::Parathread),
 	];
-	new_test_ext(genesis_config(paras)).execute_with(|| {
+	let mut config = genesis_config(paras);
+	config.configuration.config.group_rotation_frequency = 3;
+	new_test_ext(config).execute_with(|| {
 		let default_candidate = TestCandidateBuilder::default().build();
 		<PendingAvailability<Test>>::insert(
 			chain_a,
@@ -402,7 +409,7 @@ fn collect_pending_cleans_up_pending() {
 				descriptor: default_candidate.descriptor,
 				availability_votes: default_availability_votes(),
 				relay_parent_number: 0,
-				backed_in_number: 0,
+				backed_in_number: 5,
 				backers: default_backing_bitfield(),
 				backing_group: GroupIndex::from(1),
 			},
@@ -416,7 +423,7 @@ fn collect_pending_cleans_up_pending() {
 		assert!(<PendingAvailabilityCommitments<Test>>::get(&chain_a).is_some());
 		assert!(<PendingAvailabilityCommitments<Test>>::get(&chain_b).is_some());
 
-		ParaInclusion::collect_pending(|core, _since| core == CoreIndex::from(0));
+		ParaInclusion::collect_pending(Scheduler::availability_timeout_predicate());
 
 		assert!(<PendingAvailability<Test>>::get(&chain_a).is_none());
 		assert!(<PendingAvailability<Test>>::get(&chain_b).is_some());
@@ -904,23 +911,12 @@ fn candidate_checks() {
 		];
 		Scheduler::set_validator_groups(validator_groups);
 
-		let entry_ttl = 10_000;
 		let thread_collator: CollatorId = Sr25519Keyring::Two.public().into();
-		let chain_a_assignment = CoreAssignment {
-			core: CoreIndex::from(0),
-			paras_entry: ParasEntry::new(Assignment::new(chain_a), entry_ttl),
-		};
+		let chain_a_assignment = (chain_a, CoreIndex::from(0));
 
-		let chain_b_assignment = CoreAssignment {
-			core: CoreIndex::from(1),
-			paras_entry: ParasEntry::new(Assignment::new(chain_b), entry_ttl),
-		};
-
-		let thread_a_assignment = CoreAssignment {
-			core: CoreIndex::from(2),
-			paras_entry: ParasEntry::new(Assignment::new(thread_a), entry_ttl),
-		};
+		let chain_b_assignment = (chain_b, CoreIndex::from(1));
 
+		let thread_a_assignment = (thread_a, CoreIndex::from(2));
 		let allowed_relay_parents = default_allowed_relay_parent_tracker();
 
 		// unscheduled candidate.
@@ -949,7 +945,7 @@ fn candidate_checks() {
 				ParaInclusion::process_candidates(
 					&allowed_relay_parents,
 					vec![backed],
-					vec![chain_b_assignment.clone()],
+					&[chain_b_assignment].into_iter().collect(),
 					&group_validators,
 				),
 				Error::<Test>::UnscheduledCandidate
@@ -1004,10 +1000,10 @@ fn candidate_checks() {
 				ParaInclusion::process_candidates(
 					&allowed_relay_parents,
 					vec![backed_b, backed_a],
-					vec![chain_a_assignment.clone(), chain_b_assignment.clone()],
+					&[chain_a_assignment, chain_b_assignment].into_iter().collect(),
 					&group_validators,
 				),
-				Error::<Test>::UnscheduledCandidate
+				Error::<Test>::ScheduledOutOfOrder
 			);
 		}
 
@@ -1037,7 +1033,7 @@ fn candidate_checks() {
 				ParaInclusion::process_candidates(
 					&allowed_relay_parents,
 					vec![backed],
-					vec![chain_a_assignment.clone()],
+					&[chain_a_assignment].into_iter().collect(),
 					&group_validators,
 				),
 				Error::<Test>::InsufficientBacking
@@ -1094,7 +1090,7 @@ fn candidate_checks() {
 				ParaInclusion::process_candidates(
 					&allowed_relay_parents,
 					vec![backed_b, backed_a],
-					vec![chain_a_assignment.clone(), chain_b_assignment.clone()],
+					&[chain_a_assignment, chain_b_assignment].into_iter().collect(),
 					&group_validators,
 				),
 				Error::<Test>::DisallowedRelayParent
@@ -1132,7 +1128,7 @@ fn candidate_checks() {
 				ParaInclusion::process_candidates(
 					&allowed_relay_parents,
 					vec![backed],
-					vec![thread_a_assignment.clone()],
+					&[thread_a_assignment].into_iter().collect(),
 					&group_validators,
 				),
 				Error::<Test>::NotCollatorSigned
@@ -1182,7 +1178,7 @@ fn candidate_checks() {
 				ParaInclusion::process_candidates(
 					&allowed_relay_parents,
 					vec![backed],
-					vec![chain_a_assignment.clone()],
+					&[chain_a_assignment].into_iter().collect(),
 					&group_validators,
 				),
 				Error::<Test>::CandidateScheduledBeforeParaFree
@@ -1222,7 +1218,7 @@ fn candidate_checks() {
 				ParaInclusion::process_candidates(
 					&allowed_relay_parents,
 					vec![backed],
-					vec![chain_a_assignment.clone()],
+					&[chain_a_assignment].into_iter().collect(),
 					&group_validators,
 				),
 				Error::<Test>::CandidateScheduledBeforeParaFree
@@ -1259,14 +1255,20 @@ fn candidate_checks() {
 				let cfg = Configuration::config();
 				let expected_at = 10 + cfg.validation_upgrade_delay;
 				assert_eq!(expected_at, 12);
-				Paras::schedule_code_upgrade(chain_a, vec![1, 2, 3, 4].into(), expected_at, &cfg);
+				Paras::schedule_code_upgrade(
+					chain_a,
+					vec![1, 2, 3, 4].into(),
+					expected_at,
+					&cfg,
+					SetGoAhead::Yes,
+				);
 			}
 
 			assert_noop!(
 				ParaInclusion::process_candidates(
 					&allowed_relay_parents,
 					vec![backed],
-					vec![chain_a_assignment.clone()],
+					&[chain_a_assignment].into_iter().collect(),
 					&group_validators,
 				),
 				Error::<Test>::PrematureCodeUpgrade
@@ -1300,7 +1302,7 @@ fn candidate_checks() {
 				ParaInclusion::process_candidates(
 					&allowed_relay_parents,
 					vec![backed],
-					vec![chain_a_assignment.clone()],
+					&[chain_a_assignment].into_iter().collect(),
 					&group_validators,
 				),
 				Err(Error::<Test>::ValidationDataHashMismatch.into()),
@@ -1335,7 +1337,7 @@ fn candidate_checks() {
 				ParaInclusion::process_candidates(
 					&allowed_relay_parents,
 					vec![backed],
-					vec![chain_a_assignment.clone()],
+					&[chain_a_assignment].into_iter().collect(),
 					&group_validators,
 				),
 				Error::<Test>::InvalidValidationCodeHash
@@ -1370,7 +1372,7 @@ fn candidate_checks() {
 				ParaInclusion::process_candidates(
 					&allowed_relay_parents,
 					vec![backed],
-					vec![chain_a_assignment.clone()],
+					&[chain_a_assignment].into_iter().collect(),
 					&group_validators,
 				),
 				Error::<Test>::ParaHeadMismatch
@@ -1440,21 +1442,9 @@ fn backing_works() {
 
 		let allowed_relay_parents = default_allowed_relay_parent_tracker();
 
-		let entry_ttl = 10_000;
-		let chain_a_assignment = CoreAssignment {
-			core: CoreIndex::from(0),
-			paras_entry: ParasEntry::new(Assignment::new(chain_a), entry_ttl),
-		};
-
-		let chain_b_assignment = CoreAssignment {
-			core: CoreIndex::from(1),
-			paras_entry: ParasEntry::new(Assignment::new(chain_b), entry_ttl),
-		};
-
-		let thread_a_assignment = CoreAssignment {
-			core: CoreIndex::from(2),
-			paras_entry: ParasEntry::new(Assignment::new(thread_a), entry_ttl),
-		};
+		let chain_a_assignment = (chain_a, CoreIndex::from(0));
+		let chain_b_assignment = (chain_b, CoreIndex::from(1));
+		let thread_a_assignment = (thread_a, CoreIndex::from(2));
 
 		let mut candidate_a = TestCandidateBuilder {
 			para_id: chain_a,
@@ -1542,11 +1532,9 @@ fn backing_works() {
 		} = ParaInclusion::process_candidates(
 			&allowed_relay_parents,
 			backed_candidates.clone(),
-			vec![
-				chain_a_assignment.clone(),
-				chain_b_assignment.clone(),
-				thread_a_assignment.clone(),
-			],
+			&[chain_a_assignment, chain_b_assignment, thread_a_assignment]
+				.into_iter()
+				.collect(),
 			&group_validators,
 		)
 		.expect("candidates scheduled, in order, and backed");
@@ -1609,7 +1597,10 @@ fn backing_works() {
 		);
 
 		let backers = {
-			let num_backers = minimum_backing_votes(group_validators(GroupIndex(0)).unwrap().len());
+			let num_backers = effective_minimum_backing_votes(
+				group_validators(GroupIndex(0)).unwrap().len(),
+				configuration::Pallet::<Test>::config().minimum_backing_votes,
+			);
 			backing_bitfield(&(0..num_backers).collect::<Vec<_>>())
 		};
 		assert_eq!(
@@ -1631,7 +1622,10 @@ fn backing_works() {
 		);
 
 		let backers = {
-			let num_backers = minimum_backing_votes(group_validators(GroupIndex(0)).unwrap().len());
+			let num_backers = effective_minimum_backing_votes(
+				group_validators(GroupIndex(0)).unwrap().len(),
+				configuration::Pallet::<Test>::config().minimum_backing_votes,
+			);
 			backing_bitfield(&(0..num_backers).map(|v| v + 2).collect::<Vec<_>>())
 		};
 		assert_eq!(
@@ -1726,12 +1720,7 @@ fn can_include_candidate_with_ok_code_upgrade() {
 		Scheduler::set_validator_groups(validator_groups);
 
 		let allowed_relay_parents = default_allowed_relay_parent_tracker();
-		let entry_ttl = 10_000;
-		let chain_a_assignment = CoreAssignment {
-			core: CoreIndex::from(0),
-			paras_entry: ParasEntry::new(Assignment::new(chain_a), entry_ttl),
-		};
-
+		let chain_a_assignment = (chain_a, CoreIndex::from(0));
 		let mut candidate_a = TestCandidateBuilder {
 			para_id: chain_a,
 			relay_parent: System::parent_hash(),
@@ -1757,7 +1746,7 @@ fn can_include_candidate_with_ok_code_upgrade() {
 			ParaInclusion::process_candidates(
 				&allowed_relay_parents,
 				vec![backed_a],
-				vec![chain_a_assignment.clone()],
+				&[chain_a_assignment].into_iter().collect(),
 				&group_validators,
 			)
 			.expect("candidates scheduled, in order, and backed");
@@ -1765,7 +1754,10 @@ fn can_include_candidate_with_ok_code_upgrade() {
 		assert_eq!(occupied_cores, vec![(CoreIndex::from(0), chain_a)]);
 
 		let backers = {
-			let num_backers = minimum_backing_votes(group_validators(GroupIndex(0)).unwrap().len());
+			let num_backers = effective_minimum_backing_votes(
+				group_validators(GroupIndex(0)).unwrap().len(),
+				configuration::Pallet::<Test>::config().minimum_backing_votes,
+			);
 			backing_bitfield(&(0..num_backers).collect::<Vec<_>>())
 		};
 		assert_eq!(
@@ -1880,28 +1872,10 @@ fn check_allowed_relay_parents() {
 			max_ancestry_len,
 		);
 
-		let chain_a_assignment = CoreAssignment {
-			core: CoreIndex::from(0),
-			paras_entry: ParasEntry {
-				assignment: Assignment { para_id: chain_a },
-				availability_timeouts: 0,
-				ttl: 5,
-			},
-		};
+		let chain_a_assignment = (chain_a, CoreIndex::from(0));
 
-		let chain_b_assignment = CoreAssignment {
-			core: CoreIndex::from(1),
-			paras_entry: ParasEntry {
-				assignment: Assignment { para_id: chain_b },
-				availability_timeouts: 0,
-				ttl: 5,
-			},
-		};
-
-		let thread_a_assignment = CoreAssignment {
-			core: CoreIndex::from(2),
-			paras_entry: ParasEntry::new(Assignment::new(thread_a), 5),
-		};
+		let chain_b_assignment = (chain_b, CoreIndex::from(1));
+		let thread_a_assignment = (thread_a, CoreIndex::from(2));
 
 		let mut candidate_a = TestCandidateBuilder {
 			para_id: chain_a,
@@ -1983,11 +1957,9 @@ fn check_allowed_relay_parents() {
 		ParaInclusion::process_candidates(
 			&allowed_relay_parents,
 			backed_candidates.clone(),
-			vec![
-				chain_a_assignment.clone(),
-				chain_b_assignment.clone(),
-				thread_a_assignment.clone(),
-			],
+			&[chain_a_assignment, chain_b_assignment, thread_a_assignment]
+				.into_iter()
+				.collect(),
 			&group_validators,
 		)
 		.expect("candidates scheduled, in order, and backed");
@@ -2197,15 +2169,7 @@ fn para_upgrade_delay_scheduled_from_inclusion() {
 
 		let allowed_relay_parents = default_allowed_relay_parent_tracker();
 
-		let chain_a_assignment = CoreAssignment {
-			core: CoreIndex::from(0),
-			paras_entry: ParasEntry {
-				assignment: Assignment { para_id: chain_a },
-				availability_timeouts: 0,
-				ttl: 5,
-			},
-		};
-
+		let chain_a_assignment = (chain_a, CoreIndex::from(0));
 		let mut candidate_a = TestCandidateBuilder {
 			para_id: chain_a,
 			relay_parent: System::parent_hash(),
@@ -2231,7 +2195,7 @@ fn para_upgrade_delay_scheduled_from_inclusion() {
 			ParaInclusion::process_candidates(
 				&allowed_relay_parents,
 				vec![backed_a],
-				vec![chain_a_assignment.clone()],
+				&[chain_a_assignment].into_iter().collect(),
 				&group_validators,
 			)
 			.expect("candidates scheduled, in order, and backed");
@@ -2277,7 +2241,7 @@ fn para_upgrade_delay_scheduled_from_inclusion() {
 		let cause = &active_vote_state.causes()[0];
 		// Upgrade block is the block of inclusion, not candidate's parent.
 		assert_matches!(cause,
-			paras::PvfCheckCause::Upgrade { id, included_at }
+			paras::PvfCheckCause::Upgrade { id, included_at, set_go_ahead: SetGoAhead::Yes }
 				if id == &chain_a && included_at == &7
 		);
 	});
diff --git a/polkadot/runtime/parachains/src/lib.rs b/polkadot/runtime/parachains/src/lib.rs
index 056eef35426098532663ee0f3e727fac3a3e5d16..e0ace86d3794a2dc4aee09ca10aa321abce1d42b 100644
--- a/polkadot/runtime/parachains/src/lib.rs
+++ b/polkadot/runtime/parachains/src/lib.rs
@@ -53,7 +53,7 @@ mod mock;
 mod ump_tests;
 
 pub use origin::{ensure_parachain, Origin};
-pub use paras::ParaLifecycle;
+pub use paras::{ParaLifecycle, SetGoAhead};
 use primitives::{HeadData, Id as ParaId, ValidationCode};
 use sp_runtime::{DispatchResult, FixedU128};
 
@@ -63,8 +63,6 @@ pub trait FeeTracker {
 }
 
 /// Schedule a para to be initialized at the start of the next session with the given genesis data.
-///
-/// See [`paras::Pallet::schedule_para_initialize`] for more details.
 pub fn schedule_para_initialize<T: paras::Config>(
 	id: ParaId,
 	genesis: paras::ParaGenesisArgs,
@@ -73,8 +71,6 @@ pub fn schedule_para_initialize<T: paras::Config>(
 }
 
 /// Schedule a para to be cleaned up at the start of the next session.
-///
-/// See [`paras::Pallet::schedule_para_cleanup`] for more details.
 pub fn schedule_para_cleanup<T: paras::Config>(id: primitives::Id) -> Result<(), ()> {
 	<paras::Pallet<T>>::schedule_para_cleanup(id).map_err(|_| ())
 }
@@ -90,18 +86,15 @@ pub fn schedule_parachain_downgrade<T: paras::Config>(id: ParaId) -> Result<(),
 }
 
 /// Schedules a validation code upgrade to a parachain with the given id.
-///
-/// This simply calls [`crate::paras::Pallet::schedule_code_upgrade_external`].
 pub fn schedule_code_upgrade<T: paras::Config>(
 	id: ParaId,
 	new_code: ValidationCode,
+	set_go_ahead: SetGoAhead,
 ) -> DispatchResult {
-	paras::Pallet::<T>::schedule_code_upgrade_external(id, new_code)
+	paras::Pallet::<T>::schedule_code_upgrade_external(id, new_code, set_go_ahead)
 }
 
 /// Sets the current parachain head with the given id.
-///
-/// This simply calls [`crate::paras::Pallet::set_current_head`].
 pub fn set_current_head<T: paras::Config>(id: ParaId, new_head: HeadData) {
 	paras::Pallet::<T>::set_current_head(id, new_head)
 }
diff --git a/polkadot/runtime/parachains/src/mock.rs b/polkadot/runtime/parachains/src/mock.rs
index f978b6c3360e49d9755267b56e34328102326caf..ded7de08e4fa95db7fd9ba7ae172514d38a86129 100644
--- a/polkadot/runtime/parachains/src/mock.rs
+++ b/polkadot/runtime/parachains/src/mock.rs
@@ -214,6 +214,7 @@ impl crate::paras::Config for Test {
 	type UnsignedPriority = ParasUnsignedPriority;
 	type QueueFootprinter = ParaInclusion;
 	type NextSessionRotation = TestNextSessionRotation;
+	type OnNewHead = ();
 }
 
 impl crate::dmp::Config for Test {}
diff --git a/polkadot/runtime/parachains/src/paras/benchmarking.rs b/polkadot/runtime/parachains/src/paras/benchmarking.rs
index 5c060547601f5869a671856b3bf3ceebf49ee812..554f0c15af24ff632e6e5ae9da34baf43aa0975e 100644
--- a/polkadot/runtime/parachains/src/paras/benchmarking.rs
+++ b/polkadot/runtime/parachains/src/paras/benchmarking.rs
@@ -124,7 +124,13 @@ benchmarks! {
 		let expired = frame_system::Pallet::<T>::block_number().saturating_sub(One::one());
 		let config = HostConfiguration::<BlockNumberFor<T>>::default();
 		generate_disordered_pruning::<T>();
-		Pallet::<T>::schedule_code_upgrade(para_id, ValidationCode(vec![0]), expired, &config);
+		Pallet::<T>::schedule_code_upgrade(
+			para_id,
+			ValidationCode(vec![0]),
+			expired,
+			&config,
+			SetGoAhead::Yes,
+		);
 	}: _(RawOrigin::Root, para_id, new_head)
 	verify {
 		assert_last_event::<T>(Event::NewHeadNoted(para_id).into());
diff --git a/polkadot/runtime/parachains/src/paras/benchmarking/pvf_check.rs b/polkadot/runtime/parachains/src/paras/benchmarking/pvf_check.rs
index ab5e13124436d076018b6e30dc2cc8a13162d5a1..05c4c9c37b4d9241a64539c13a1960f93c80d7c1 100644
--- a/polkadot/runtime/parachains/src/paras/benchmarking/pvf_check.rs
+++ b/polkadot/runtime/parachains/src/paras/benchmarking/pvf_check.rs
@@ -177,6 +177,7 @@ where
 				validation_code,
 				/* relay_parent_number */ 1u32.into(),
 				&configuration::Pallet::<T>::config(),
+				SetGoAhead::Yes,
 			);
 		} else {
 			let r = Pallet::<T>::schedule_para_initialize(
diff --git a/polkadot/runtime/parachains/src/paras/mod.rs b/polkadot/runtime/parachains/src/paras/mod.rs
index 95b89a1ca2c3a91ccde730b1254d213e6157a6b6..cd73d23bdadb398d8e852b71fce3c09f5b97d94e 100644
--- a/polkadot/runtime/parachains/src/paras/mod.rs
+++ b/polkadot/runtime/parachains/src/paras/mod.rs
@@ -386,9 +386,18 @@ pub(crate) enum PvfCheckCause<BlockNumber> {
 		///
 		/// See https://github.com/paritytech/polkadot/issues/4601 for detailed explanation.
 		included_at: BlockNumber,
+		/// Whether or not the given para should be sent the `GoAhead` signal.
+		set_go_ahead: SetGoAhead,
 	},
 }
 
+/// Should the `GoAhead` signal be set after a successful check of the new wasm binary?
+#[derive(Debug, Copy, Clone, PartialEq, TypeInfo, Decode, Encode)]
+pub enum SetGoAhead {
+	Yes,
+	No,
+}
+
 impl<BlockNumber> PvfCheckCause<BlockNumber> {
 	/// Returns the ID of the para that initiated or subscribed to the pre-checking vote.
 	fn para_id(&self) -> ParaId {
@@ -481,6 +490,22 @@ impl<BlockNumber> PvfCheckActiveVoteState<BlockNumber> {
 	}
 }
 
+/// Runtime hook for when a parachain head is updated.
+pub trait OnNewHead {
+	/// Called when a parachain head is updated.
+	/// Returns the weight consumed by this function.
+	fn on_new_head(id: ParaId, head: &HeadData) -> Weight;
+}
+
+#[impl_trait_for_tuples::impl_for_tuples(30)]
+impl OnNewHead for Tuple {
+	fn on_new_head(id: ParaId, head: &HeadData) -> Weight {
+		let mut weight: Weight = Default::default();
+		for_tuples!( #( weight.saturating_accrue(Tuple::on_new_head(id, head)); )* );
+		weight
+	}
+}
+
 pub trait WeightInfo {
 	fn force_set_current_code(c: u32) -> Weight;
 	fn force_set_current_head(s: u32) -> Weight;
@@ -575,6 +600,9 @@ pub mod pallet {
 		/// be set to the `ParaInclusion` pallet.
 		type QueueFootprinter: QueueFootprinter<Origin = UmpQueueId>;
 
+		/// Runtime hook for when a parachain head is updated.
+		type OnNewHead: OnNewHead;
+
 		/// Weight information for extrinsics in this pallet.
 		type WeightInfo: WeightInfo;
 	}
@@ -869,7 +897,13 @@ pub mod pallet {
 		) -> DispatchResult {
 			ensure_root(origin)?;
 			let config = configuration::Pallet::<T>::config();
-			Self::schedule_code_upgrade(para, new_code, relay_parent_number, &config);
+			Self::schedule_code_upgrade(
+				para,
+				new_code,
+				relay_parent_number,
+				&config,
+				SetGoAhead::No,
+			);
 			Self::deposit_event(Event::CodeUpgradeScheduled(para));
 			Ok(())
 		}
@@ -1167,6 +1201,7 @@ impl<T: Config> Pallet<T> {
 	pub(crate) fn schedule_code_upgrade_external(
 		id: ParaId,
 		new_code: ValidationCode,
+		set_go_ahead: SetGoAhead,
 	) -> DispatchResult {
 		// Check that we can schedule an upgrade at all.
 		ensure!(Self::can_upgrade_validation_code(id), Error::<T>::CannotUpgradeCode);
@@ -1174,7 +1209,7 @@ impl<T: Config> Pallet<T> {
 		let current_block = frame_system::Pallet::<T>::block_number();
 		// Schedule the upgrade with a delay just like if a parachain triggered the upgrade.
 		let upgrade_block = current_block.saturating_add(config.validation_upgrade_delay);
-		Self::schedule_code_upgrade(id, new_code, upgrade_block, &config);
+		Self::schedule_code_upgrade(id, new_code, upgrade_block, &config, set_go_ahead);
 		Self::deposit_event(Event::CodeUpgradeScheduled(id));
 		Ok(())
 	}
@@ -1515,8 +1550,15 @@ impl<T: Config> Pallet<T> {
 				PvfCheckCause::Onboarding(id) => {
 					weight += Self::proceed_with_onboarding(*id, sessions_observed);
 				},
-				PvfCheckCause::Upgrade { id, included_at } => {
-					weight += Self::proceed_with_upgrade(*id, code_hash, now, *included_at, cfg);
+				PvfCheckCause::Upgrade { id, included_at, set_go_ahead } => {
+					weight += Self::proceed_with_upgrade(
+						*id,
+						code_hash,
+						now,
+						*included_at,
+						cfg,
+						*set_go_ahead,
+					);
 				},
 			}
 		}
@@ -1549,6 +1591,7 @@ impl<T: Config> Pallet<T> {
 		now: BlockNumberFor<T>,
 		relay_parent_number: BlockNumberFor<T>,
 		cfg: &configuration::HostConfiguration<BlockNumberFor<T>>,
+		set_go_ahead: SetGoAhead,
 	) -> Weight {
 		let mut weight = Weight::zero();
 
@@ -1572,12 +1615,15 @@ impl<T: Config> Pallet<T> {
 		weight += T::DbWeight::get().reads_writes(1, 4);
 		FutureCodeUpgrades::<T>::insert(&id, expected_at);
 
-		UpcomingUpgrades::<T>::mutate(|upcoming_upgrades| {
-			let insert_idx = upcoming_upgrades
-				.binary_search_by_key(&expected_at, |&(_, b)| b)
-				.unwrap_or_else(|idx| idx);
-			upcoming_upgrades.insert(insert_idx, (id, expected_at));
-		});
+		// Only set an upcoming upgrade if `GoAhead` signal should be set for the respective para.
+		if set_go_ahead == SetGoAhead::Yes {
+			UpcomingUpgrades::<T>::mutate(|upcoming_upgrades| {
+				let insert_idx = upcoming_upgrades
+					.binary_search_by_key(&expected_at, |&(_, b)| b)
+					.unwrap_or_else(|idx| idx);
+				upcoming_upgrades.insert(insert_idx, (id, expected_at));
+			});
+		}
 
 		let expected_at = expected_at.saturated_into();
 		let log = ConsensusLog::ParaScheduleUpgradeCode(id, *code_hash, expected_at);
@@ -1816,6 +1862,7 @@ impl<T: Config> Pallet<T> {
 		new_code: ValidationCode,
 		inclusion_block_number: BlockNumberFor<T>,
 		cfg: &configuration::HostConfiguration<BlockNumberFor<T>>,
+		set_go_ahead: SetGoAhead,
 	) -> Weight {
 		let mut weight = T::DbWeight::get().reads(1);
 
@@ -1865,7 +1912,7 @@ impl<T: Config> Pallet<T> {
 		});
 
 		weight += Self::kick_off_pvf_check(
-			PvfCheckCause::Upgrade { id, included_at: inclusion_block_number },
+			PvfCheckCause::Upgrade { id, included_at: inclusion_block_number, set_go_ahead },
 			code_hash,
 			new_code,
 			cfg,
@@ -1962,10 +2009,10 @@ impl<T: Config> Pallet<T> {
 		new_head: HeadData,
 		execution_context: BlockNumberFor<T>,
 	) -> Weight {
-		Heads::<T>::insert(&id, new_head);
+		Heads::<T>::insert(&id, &new_head);
 		MostRecentContext::<T>::insert(&id, execution_context);
 
-		if let Some(expected_at) = FutureCodeUpgrades::<T>::get(&id) {
+		let weight = if let Some(expected_at) = FutureCodeUpgrades::<T>::get(&id) {
 			if expected_at <= execution_context {
 				FutureCodeUpgrades::<T>::remove(&id);
 				UpgradeGoAheadSignal::<T>::remove(&id);
@@ -2005,7 +2052,9 @@ impl<T: Config> Pallet<T> {
 			// the `Abort` signal.
 			UpgradeGoAheadSignal::<T>::remove(&id);
 			T::DbWeight::get().reads_writes(1, 2)
-		}
+		};
+
+		weight.saturating_add(T::OnNewHead::on_new_head(id, &new_head))
 	}
 
 	/// Returns the list of PVFs (aka validation code) that require casting a vote by a validator in
diff --git a/polkadot/runtime/parachains/src/paras/tests.rs b/polkadot/runtime/parachains/src/paras/tests.rs
index a024525c817a81b176d160240ec4854b67990e37..cca200c2765e361120b4c5ea8db3dfc7c82bdc13 100644
--- a/polkadot/runtime/parachains/src/paras/tests.rs
+++ b/polkadot/runtime/parachains/src/paras/tests.rs
@@ -17,11 +17,11 @@
 use super::*;
 use frame_support::{assert_err, assert_ok, assert_storage_noop};
 use keyring::Sr25519Keyring;
-use primitives::{BlockNumber, ValidatorId, PARACHAIN_KEY_TYPE_ID};
+use primitives::{BlockNumber, PARACHAIN_KEY_TYPE_ID};
 use sc_keystore::LocalKeystore;
 use sp_keystore::{Keystore, KeystorePtr};
 use std::sync::Arc;
-use test_helpers::{dummy_head_data, dummy_validation_code};
+use test_helpers::{dummy_head_data, dummy_validation_code, validator_pubkeys};
 
 use crate::{
 	configuration::HostConfiguration,
@@ -39,10 +39,6 @@ static VALIDATORS: &[Sr25519Keyring] = &[
 	Sr25519Keyring::Ferdie,
 ];
 
-fn validator_pubkeys(val_ids: &[Sr25519Keyring]) -> Vec<ValidatorId> {
-	val_ids.iter().map(|v| v.public().into()).collect()
-}
-
 fn sign_and_include_pvf_check_statement(stmt: PvfCheckStatement) {
 	let validators = &[
 		Sr25519Keyring::Alice,
@@ -440,7 +436,13 @@ fn code_upgrade_applied_after_delay() {
 			// this parablock is in the context of block 1.
 			let expected_at = 1 + validation_upgrade_delay;
 			let next_possible_upgrade_at = 1 + validation_upgrade_cooldown;
-			Paras::schedule_code_upgrade(para_id, new_code.clone(), 1, &Configuration::config());
+			Paras::schedule_code_upgrade(
+				para_id,
+				new_code.clone(),
+				1,
+				&Configuration::config(),
+				SetGoAhead::Yes,
+			);
 			// Include votes for super-majority.
 			submit_super_majority_pvf_votes(&new_code, EXPECTED_SESSION, true);
 
@@ -508,6 +510,127 @@ fn code_upgrade_applied_after_delay() {
 	});
 }
 
+#[test]
+fn code_upgrade_applied_without_setting_go_ahead_signal() {
+	let code_retention_period = 10;
+	let validation_upgrade_delay = 5;
+	let validation_upgrade_cooldown = 10;
+
+	let original_code = ValidationCode(vec![1, 2, 3]);
+	let paras = vec![(
+		0u32.into(),
+		ParaGenesisArgs {
+			para_kind: ParaKind::Parachain,
+			genesis_head: dummy_head_data(),
+			validation_code: original_code.clone(),
+		},
+	)];
+
+	let genesis_config = MockGenesisConfig {
+		paras: GenesisConfig { paras, ..Default::default() },
+		configuration: crate::configuration::GenesisConfig {
+			config: HostConfiguration {
+				code_retention_period,
+				validation_upgrade_delay,
+				validation_upgrade_cooldown,
+				..Default::default()
+			},
+		},
+		..Default::default()
+	};
+
+	new_test_ext(genesis_config).execute_with(|| {
+		check_code_is_stored(&original_code);
+
+		let para_id = ParaId::from(0);
+		let new_code = ValidationCode(vec![4, 5, 6]);
+
+		// Wait for at least one session change to set active validators.
+		const EXPECTED_SESSION: SessionIndex = 1;
+		run_to_block(2, Some(vec![1]));
+		assert_eq!(Paras::current_code(&para_id), Some(original_code.clone()));
+
+		let (expected_at, next_possible_upgrade_at) = {
+			// this parablock is in the context of block 1.
+			let expected_at = 1 + validation_upgrade_delay;
+			let next_possible_upgrade_at = 1 + validation_upgrade_cooldown;
+			// `set_go_ahead` parameter set to `false` which prevents signaling the parachain
+			// with the `GoAhead` signal.
+			Paras::schedule_code_upgrade(
+				para_id,
+				new_code.clone(),
+				1,
+				&Configuration::config(),
+				SetGoAhead::No,
+			);
+			// Include votes for super-majority.
+			submit_super_majority_pvf_votes(&new_code, EXPECTED_SESSION, true);
+
+			Paras::note_new_head(para_id, Default::default(), 1);
+
+			assert!(Paras::past_code_meta(&para_id).most_recent_change().is_none());
+			assert_eq!(FutureCodeUpgrades::<Test>::get(&para_id), Some(expected_at));
+			assert_eq!(FutureCodeHash::<Test>::get(&para_id), Some(new_code.hash()));
+			assert_eq!(UpcomingUpgrades::<Test>::get(), vec![]);
+			assert_eq!(UpgradeCooldowns::<Test>::get(), vec![(para_id, next_possible_upgrade_at)]);
+			assert_eq!(Paras::current_code(&para_id), Some(original_code.clone()));
+			check_code_is_stored(&original_code);
+			check_code_is_stored(&new_code);
+
+			(expected_at, next_possible_upgrade_at)
+		};
+
+		run_to_block(expected_at, None);
+
+		// the candidate is in the context of the parent of `expected_at`,
+		// thus does not trigger the code upgrade. However, now the `UpgradeGoAheadSignal`
+		// should not be set.
+		{
+			Paras::note_new_head(para_id, Default::default(), expected_at - 1);
+
+			assert!(Paras::past_code_meta(&para_id).most_recent_change().is_none());
+			assert_eq!(FutureCodeUpgrades::<Test>::get(&para_id), Some(expected_at));
+			assert_eq!(FutureCodeHash::<Test>::get(&para_id), Some(new_code.hash()));
+			assert!(UpgradeGoAheadSignal::<Test>::get(&para_id).is_none());
+			assert_eq!(Paras::current_code(&para_id), Some(original_code.clone()));
+			check_code_is_stored(&original_code);
+			check_code_is_stored(&new_code);
+		}
+
+		run_to_block(expected_at + 1, None);
+
+		// the candidate is in the context of `expected_at`, and triggers
+		// the upgrade.
+		{
+			Paras::note_new_head(para_id, Default::default(), expected_at);
+
+			assert_eq!(Paras::past_code_meta(&para_id).most_recent_change(), Some(expected_at));
+			assert_eq!(
+				PastCodeHash::<Test>::get(&(para_id, expected_at)),
+				Some(original_code.hash()),
+			);
+			assert!(FutureCodeUpgrades::<Test>::get(&para_id).is_none());
+			assert!(FutureCodeHash::<Test>::get(&para_id).is_none());
+			assert!(UpgradeGoAheadSignal::<Test>::get(&para_id).is_none());
+			assert_eq!(Paras::current_code(&para_id), Some(new_code.clone()));
+			assert_eq!(
+				UpgradeRestrictionSignal::<Test>::get(&para_id),
+				Some(UpgradeRestriction::Present),
+			);
+			assert_eq!(UpgradeCooldowns::<Test>::get(), vec![(para_id, next_possible_upgrade_at)]);
+			check_code_is_stored(&original_code);
+			check_code_is_stored(&new_code);
+		}
+
+		run_to_block(next_possible_upgrade_at + 1, None);
+
+		{
+			assert!(UpgradeRestrictionSignal::<Test>::get(&para_id).is_none());
+			assert!(UpgradeCooldowns::<Test>::get().is_empty());
+		}
+	});
+}
+
 #[test]
 fn code_upgrade_applied_after_delay_even_when_late() {
 	let code_retention_period = 10;
@@ -550,7 +673,13 @@ fn code_upgrade_applied_after_delay_even_when_late() {
 			// this parablock is in the context of block 1.
 			let expected_at = 1 + validation_upgrade_delay;
 			let next_possible_upgrade_at = 1 + validation_upgrade_cooldown;
-			Paras::schedule_code_upgrade(para_id, new_code.clone(), 1, &Configuration::config());
+			Paras::schedule_code_upgrade(
+				para_id,
+				new_code.clone(),
+				1,
+				&Configuration::config(),
+				SetGoAhead::Yes,
+			);
 			// Include votes for super-majority.
 			submit_super_majority_pvf_votes(&new_code, EXPECTED_SESSION, true);
 
@@ -628,7 +757,13 @@ fn submit_code_change_when_not_allowed_is_err() {
 		const EXPECTED_SESSION: SessionIndex = 1;
 		run_to_block(1, Some(vec![1]));
 
-		Paras::schedule_code_upgrade(para_id, new_code.clone(), 1, &Configuration::config());
+		Paras::schedule_code_upgrade(
+			para_id,
+			new_code.clone(),
+			1,
+			&Configuration::config(),
+			SetGoAhead::Yes,
+		);
 		// Include votes for super-majority.
 		submit_super_majority_pvf_votes(&new_code, EXPECTED_SESSION, true);
 
@@ -640,7 +775,13 @@ fn submit_code_change_when_not_allowed_is_err() {
 		// ignore it. Note that this is only true from perspective of this module.
 		run_to_block(2, None);
 		assert!(!Paras::can_upgrade_validation_code(para_id));
-		Paras::schedule_code_upgrade(para_id, newer_code.clone(), 2, &Configuration::config());
+		Paras::schedule_code_upgrade(
+			para_id,
+			newer_code.clone(),
+			2,
+			&Configuration::config(),
+			SetGoAhead::Yes,
+		);
 		assert_eq!(
 			FutureCodeUpgrades::<Test>::get(&para_id),
 			Some(1 + validation_upgrade_delay), /* did not change since the same assertion from
@@ -698,7 +839,13 @@ fn upgrade_restriction_elapsed_doesnt_mean_can_upgrade() {
 		const EXPECTED_SESSION: SessionIndex = 1;
 		run_to_block(1, Some(vec![1]));
 
-		Paras::schedule_code_upgrade(para_id, new_code.clone(), 0, &Configuration::config());
+		Paras::schedule_code_upgrade(
+			para_id,
+			new_code.clone(),
+			0,
+			&Configuration::config(),
+			SetGoAhead::Yes,
+		);
 		// Include votes for super-majority.
 		submit_super_majority_pvf_votes(&new_code, EXPECTED_SESSION, true);
 
@@ -717,7 +864,13 @@ fn upgrade_restriction_elapsed_doesnt_mean_can_upgrade() {
 		assert!(!Paras::can_upgrade_validation_code(para_id));
 
 		// And scheduling another upgrade does not do anything. `expected_at` is still the same.
-		Paras::schedule_code_upgrade(para_id, newer_code.clone(), 30, &Configuration::config());
+		Paras::schedule_code_upgrade(
+			para_id,
+			newer_code.clone(),
+			30,
+			&Configuration::config(),
+			SetGoAhead::Yes,
+		);
 		assert_eq!(FutureCodeUpgrades::<Test>::get(&para_id), Some(0 + validation_upgrade_delay));
 	});
 }
@@ -769,7 +922,13 @@ fn full_parachain_cleanup_storage() {
 		let expected_at = {
 			// this parablock is in the context of block 1.
 			let expected_at = 1 + validation_upgrade_delay;
-			Paras::schedule_code_upgrade(para_id, new_code.clone(), 1, &Configuration::config());
+			Paras::schedule_code_upgrade(
+				para_id,
+				new_code.clone(),
+				1,
+				&Configuration::config(),
+				SetGoAhead::Yes,
+			);
 			// Include votes for super-majority.
 			submit_super_majority_pvf_votes(&new_code, EXPECTED_SESSION, true);
 
@@ -864,6 +1023,7 @@ fn cannot_offboard_ongoing_pvf_check() {
 			new_code.clone(),
 			RELAY_PARENT,
 			&Configuration::config(),
+			SetGoAhead::Yes,
 		);
 		assert!(!Paras::pvfs_require_precheck().is_empty());
 
@@ -1016,7 +1176,13 @@ fn code_hash_at_returns_up_to_end_of_code_retention_period() {
 		let para_id = ParaId::from(0);
 		let old_code: ValidationCode = vec![1, 2, 3].into();
 		let new_code: ValidationCode = vec![4, 5, 6].into();
-		Paras::schedule_code_upgrade(para_id, new_code.clone(), 0, &Configuration::config());
+		Paras::schedule_code_upgrade(
+			para_id,
+			new_code.clone(),
+			0,
+			&Configuration::config(),
+			SetGoAhead::Yes,
+		);
 		// Include votes for super-majority.
 		submit_super_majority_pvf_votes(&new_code, EXPECTED_SESSION, true);
 
@@ -1124,6 +1290,7 @@ fn pvf_check_coalescing_onboarding_and_upgrade() {
 			validation_code.clone(),
 			RELAY_PARENT,
 			&Configuration::config(),
+			SetGoAhead::Yes,
 		);
 		assert!(!Paras::pvfs_require_precheck().is_empty());
 
@@ -1228,7 +1395,13 @@ fn pvf_check_upgrade_reject() {
 		// Expected current session index.
 		const EXPECTED_SESSION: SessionIndex = 1;
 
-		Paras::schedule_code_upgrade(a, new_code.clone(), RELAY_PARENT, &Configuration::config());
+		Paras::schedule_code_upgrade(
+			a,
+			new_code.clone(),
+			RELAY_PARENT,
+			&Configuration::config(),
+			SetGoAhead::Yes,
+		);
 		check_code_is_stored(&new_code);
 
 		// 1/3 of validators vote against `new_code`. PVF should not be rejected yet.
@@ -1408,7 +1581,13 @@ fn include_pvf_check_statement_refunds_weight() {
 		// Expected current session index.
 		const EXPECTED_SESSION: SessionIndex = 1;
 
-		Paras::schedule_code_upgrade(a, new_code.clone(), RELAY_PARENT, &Configuration::config());
+		Paras::schedule_code_upgrade(
+			a,
+			new_code.clone(),
+			RELAY_PARENT,
+			&Configuration::config(),
+			SetGoAhead::Yes,
+		);
 
 		let mut stmts = IntoIterator::into_iter([0, 1, 2, 3])
 			.map(|i| {
@@ -1503,7 +1682,13 @@ fn poke_unused_validation_code_doesnt_remove_code_with_users() {
 
 		// Then we add a user to the code, say by upgrading.
 		run_to_block(2, None);
-		Paras::schedule_code_upgrade(para_id, validation_code.clone(), 1, &Configuration::config());
+		Paras::schedule_code_upgrade(
+			para_id,
+			validation_code.clone(),
+			1,
+			&Configuration::config(),
+			SetGoAhead::Yes,
+		);
 		Paras::note_new_head(para_id, HeadData::default(), 1);
 
 		// Finally we poke the code, which should not remove it from the storage.
@@ -1568,7 +1753,13 @@ fn add_trusted_validation_code_insta_approval() {
 
 		// Then some parachain upgrades it's code with the relay-parent 1.
 		run_to_block(2, None);
-		Paras::schedule_code_upgrade(para_id, validation_code.clone(), 1, &Configuration::config());
+		Paras::schedule_code_upgrade(
+			para_id,
+			validation_code.clone(),
+			1,
+			&Configuration::config(),
+			SetGoAhead::Yes,
+		);
 		Paras::note_new_head(para_id, HeadData::default(), 1);
 
 		// Verify that the code upgrade has `expected_at` set to `26`.
@@ -1604,7 +1795,13 @@ fn add_trusted_validation_code_enacts_existing_pvf_vote() {
 	new_test_ext(genesis_config).execute_with(|| {
 		// First, some parachain upgrades it's code with the relay-parent 1.
 		run_to_block(2, None);
-		Paras::schedule_code_upgrade(para_id, validation_code.clone(), 1, &Configuration::config());
+		Paras::schedule_code_upgrade(
+			para_id,
+			validation_code.clone(),
+			1,
+			&Configuration::config(),
+			SetGoAhead::Yes,
+		);
 		Paras::note_new_head(para_id, HeadData::default(), 1);
 
 		// No upgrade should be scheduled at this point. PVF pre-checking vote should run for
diff --git a/polkadot/runtime/parachains/src/paras_inherent/misc.rs b/polkadot/runtime/parachains/src/paras_inherent/misc.rs
index e77b26b9e12f5fa34ab80967496f50ab07b3d6bf..dac9e6e256d0ef60c6b18b51d48f44c65e1cae8f 100644
--- a/polkadot/runtime/parachains/src/paras_inherent/misc.rs
+++ b/polkadot/runtime/parachains/src/paras_inherent/misc.rs
@@ -40,7 +40,7 @@ impl<T> IndexedRetain<T> for Vec<T> {
 }
 
 /// Helper trait until `is_sorted_by` is stabilized.
-/// TODO: https://github.com/rust-lang/rust/issues/53485
+/// TODO: <https://github.com/rust-lang/rust/issues/53485>
 pub trait IsSortedBy<T> {
 	fn is_sorted_by<F>(self, cmp: F) -> bool
 	where
diff --git a/polkadot/runtime/parachains/src/paras_inherent/mod.rs b/polkadot/runtime/parachains/src/paras_inherent/mod.rs
index 6244f44e434b03106393879b815fcbfb0a3a5e0d..8e918d35d5ff0d8af9ae77408b92fc53f9670853 100644
--- a/polkadot/runtime/parachains/src/paras_inherent/mod.rs
+++ b/polkadot/runtime/parachains/src/paras_inherent/mod.rs
@@ -29,10 +29,7 @@ use crate::{
 	initializer,
 	metrics::METRICS,
 	paras,
-	scheduler::{
-		self,
-		common::{CoreAssignment, FreedReason},
-	},
+	scheduler::{self, FreedReason},
 	shared, ParaId,
 };
 use bitvec::prelude::BitVec;
@@ -245,8 +242,8 @@ pub mod pallet {
 		T: Config,
 	{
 		// Handle timeouts for any availability core work.
-		let availability_pred = <scheduler::Pallet<T>>::availability_timeout_predicate();
-		let freed_timeout = if let Some(pred) = availability_pred {
+		let freed_timeout = if <scheduler::Pallet<T>>::availability_timeout_check_required() {
+			let pred = <scheduler::Pallet<T>>::availability_timeout_predicate();
 			<inclusion::Pallet<T>>::collect_pending(pred)
 		} else {
 			Vec::new()
@@ -320,7 +317,7 @@ impl<T: Config> Pallet<T> {
 	///
 	/// When called from `create_inherent` the `context` must be set to
 	/// `ProcessInherentDataContext::ProvideInherent` so it guarantees the invariant that inherent
-	/// is not overweight.  
+	/// is not overweight.
 	/// It is **mandatory** that calls from `enter` set `context` to
 	/// `ProcessInherentDataContext::Enter` to ensure the weight invariant is checked.
 	///
@@ -583,7 +580,10 @@ impl<T: Config> Pallet<T> {
 
 		let freed = collect_all_freed_cores::<T, _>(freed_concluded.iter().cloned());
 
-		let scheduled = <scheduler::Pallet<T>>::update_claimqueue(freed, now);
+		<scheduler::Pallet<T>>::update_claimqueue(freed, now);
+		let scheduled = <scheduler::Pallet<T>>::scheduled_paras()
+			.map(|(core_idx, para_id)| (para_id, core_idx))
+			.collect();
 
 		METRICS.on_candidates_processed_total(backed_candidates.len() as u64);
 
@@ -608,7 +608,7 @@ impl<T: Config> Pallet<T> {
 						.verify_backed_candidate(&allowed_relay_parents, candidate_idx, backed_candidate)
 						.is_err()
 			},
-			&scheduled[..],
+			&scheduled,
 		);
 
 		METRICS.on_candidates_sanitized(backed_candidates.len() as u64);
@@ -620,7 +620,7 @@ impl<T: Config> Pallet<T> {
 		} = <inclusion::Pallet<T>>::process_candidates(
 			&allowed_relay_parents,
 			backed_candidates.clone(),
-			scheduled,
+			&scheduled,
 			<scheduler::Pallet<T>>::group_validators,
 		)?;
 		// Note which of the scheduled cores were actually occupied by a backed candidate.
@@ -917,7 +917,7 @@ fn sanitize_backed_candidates<
 >(
 	mut backed_candidates: Vec<BackedCandidate<T::Hash>>,
 	mut candidate_has_concluded_invalid_dispute_or_is_invalid: F,
-	scheduled: &[CoreAssignment<BlockNumberFor<T>>],
+	scheduled: &BTreeMap<ParaId, CoreIndex>,
 ) -> Vec<BackedCandidate<T::Hash>> {
 	// Remove any candidates that were concluded invalid.
 	// This does not assume sorting.
@@ -925,11 +925,6 @@ fn sanitize_backed_candidates<
 		!candidate_has_concluded_invalid_dispute_or_is_invalid(candidate_idx, backed_candidate)
 	});
 
-	let scheduled_paras_to_core_idx = scheduled
-		.into_iter()
-		.map(|core_assignment| (core_assignment.paras_entry.para_id(), core_assignment.core))
-		.collect::<BTreeMap<ParaId, CoreIndex>>();
-
 	// Assure the backed candidate's `ParaId`'s core is free.
 	// This holds under the assumption that `Scheduler::schedule` is called _before_.
 	// We don't check the relay-parent because this is done in the closure when
@@ -938,7 +933,7 @@ fn sanitize_backed_candidates<
 	backed_candidates.retain(|backed_candidate| {
 		let desc = backed_candidate.descriptor();
 
-		scheduled_paras_to_core_idx.get(&desc.para_id).is_some()
+		scheduled.get(&desc.para_id).is_some()
 	});
 
 	// Sort the `Vec` last, once there is a guarantee that these
@@ -948,8 +943,7 @@ fn sanitize_backed_candidates<
 	// but also allows this to be done in place.
 	backed_candidates.sort_by(|x, y| {
 		// Never panics, since we filtered all panic arguments out in the previous `fn retain`.
-		scheduled_paras_to_core_idx[&x.descriptor().para_id]
-			.cmp(&scheduled_paras_to_core_idx[&y.descriptor().para_id])
+		scheduled[&x.descriptor().para_id].cmp(&scheduled[&y.descriptor().para_id])
 	});
 
 	backed_candidates
diff --git a/polkadot/runtime/parachains/src/paras_inherent/tests.rs b/polkadot/runtime/parachains/src/paras_inherent/tests.rs
index 1e5271909664d2bb98752b102cfef57532444bce..7c70fcea1943415e9882bacb75e9dfc39b23b90d 100644
--- a/polkadot/runtime/parachains/src/paras_inherent/tests.rs
+++ b/polkadot/runtime/parachains/src/paras_inherent/tests.rs
@@ -948,8 +948,11 @@ fn default_header() -> primitives::Header {
 mod sanitizers {
 	use super::*;
 
-	use crate::inclusion::tests::{
-		back_candidate, collator_sign_candidate, BackingKind, TestCandidateBuilder,
+	use crate::{
+		inclusion::tests::{
+			back_candidate, collator_sign_candidate, BackingKind, TestCandidateBuilder,
+		},
+		mock::{new_test_ext, MockGenesisConfig},
 	};
 	use bitvec::order::Lsb0;
 	use primitives::{
@@ -960,10 +963,7 @@ mod sanitizers {
 
 	use crate::mock::Test;
 	use keyring::Sr25519Keyring;
-	use primitives::{
-		v5::{Assignment, ParasEntry},
-		PARACHAIN_KEY_TYPE_ID,
-	};
+	use primitives::PARACHAIN_KEY_TYPE_ID;
 	use sc_keystore::LocalKeystore;
 	use sp_keystore::{Keystore, KeystorePtr};
 	use std::sync::Arc;
@@ -1207,131 +1207,122 @@ mod sanitizers {
 
 	#[test]
 	fn candidates() {
-		const RELAY_PARENT_NUM: u32 = 3;
-
-		let header = default_header();
-		let relay_parent = header.hash();
-		let session_index = SessionIndex::from(0_u32);
-
-		let keystore = LocalKeystore::in_memory();
-		let keystore = Arc::new(keystore) as KeystorePtr;
-		let signing_context = SigningContext { parent_hash: relay_parent, session_index };
-
-		let validators = vec![
-			keyring::Sr25519Keyring::Alice,
-			keyring::Sr25519Keyring::Bob,
-			keyring::Sr25519Keyring::Charlie,
-			keyring::Sr25519Keyring::Dave,
-		];
-		for validator in validators.iter() {
-			Keystore::sr25519_generate_new(
-				&*keystore,
-				PARACHAIN_KEY_TYPE_ID,
-				Some(&validator.to_seed()),
-			)
-			.unwrap();
-		}
-
-		let has_concluded_invalid =
-			|_idx: usize, _backed_candidate: &BackedCandidate| -> bool { false };
-
-		let entry_ttl = 10_000;
-		let scheduled = (0_usize..2)
-			.into_iter()
-			.map(|idx| {
-				let core_idx = CoreIndex::from(idx as u32);
-				let ca = CoreAssignment {
-					paras_entry: ParasEntry::new(
-						Assignment::new(ParaId::from(1_u32 + idx as u32)),
-						entry_ttl,
-					),
-					core: core_idx,
-				};
-				ca
-			})
-			.collect::<Vec<_>>();
-
-		let group_validators = |group_index: GroupIndex| {
-			match group_index {
-				group_index if group_index == GroupIndex::from(0) => Some(vec![0, 1]),
-				group_index if group_index == GroupIndex::from(1) => Some(vec![2, 3]),
-				_ => panic!("Group index out of bounds for 2 parachains and 1 parathread core"),
+		new_test_ext(MockGenesisConfig::default()).execute_with(|| {
+			const RELAY_PARENT_NUM: u32 = 3;
+
+			let header = default_header();
+			let relay_parent = header.hash();
+			let session_index = SessionIndex::from(0_u32);
+
+			let keystore = LocalKeystore::in_memory();
+			let keystore = Arc::new(keystore) as KeystorePtr;
+			let signing_context = SigningContext { parent_hash: relay_parent, session_index };
+
+			let validators = vec![
+				keyring::Sr25519Keyring::Alice,
+				keyring::Sr25519Keyring::Bob,
+				keyring::Sr25519Keyring::Charlie,
+				keyring::Sr25519Keyring::Dave,
+			];
+			for validator in validators.iter() {
+				Keystore::sr25519_generate_new(
+					&*keystore,
+					PARACHAIN_KEY_TYPE_ID,
+					Some(&validator.to_seed()),
+				)
+				.unwrap();
 			}
-			.map(|m| m.into_iter().map(ValidatorIndex).collect::<Vec<_>>())
-		};
-
-		let backed_candidates = (0_usize..2)
-			.into_iter()
-			.map(|idx0| {
-				let idx1 = idx0 + 1;
-				let mut candidate = TestCandidateBuilder {
-					para_id: ParaId::from(idx1),
-					relay_parent,
-					pov_hash: Hash::repeat_byte(idx1 as u8),
-					persisted_validation_data_hash: [42u8; 32].into(),
-					hrmp_watermark: RELAY_PARENT_NUM,
-					..Default::default()
-				}
-				.build();
-
-				collator_sign_candidate(Sr25519Keyring::One, &mut candidate);
 
-				let backed = back_candidate(
-					candidate,
-					&validators,
-					group_validators(GroupIndex::from(idx0 as u32)).unwrap().as_ref(),
-					&keystore,
-					&signing_context,
-					BackingKind::Threshold,
-				);
-				backed
-			})
-			.collect::<Vec<_>>();
-
-		// happy path
-		assert_eq!(
-			sanitize_backed_candidates::<Test, _>(
-				backed_candidates.clone(),
-				has_concluded_invalid,
-				&scheduled
-			),
-			backed_candidates
-		);
-
-		// nothing is scheduled, so no paraids match, thus all backed candidates are skipped
-		{
-			let scheduled = &Vec::new();
-			assert!(sanitize_backed_candidates::<Test, _>(
-				backed_candidates.clone(),
-				has_concluded_invalid,
-				&scheduled
-			)
-			.is_empty());
-		}
+			let has_concluded_invalid =
+				|_idx: usize, _backed_candidate: &BackedCandidate| -> bool { false };
 
-		// candidates that have concluded as invalid are filtered out
-		{
-			// mark every second one as concluded invalid
-			let set = {
-				let mut set = std::collections::HashSet::new();
-				for (idx, backed_candidate) in backed_candidates.iter().enumerate() {
-					if idx & 0x01 == 0 {
-						set.insert(backed_candidate.hash());
-					}
+			let scheduled = (0_usize..2)
+				.into_iter()
+				.map(|idx| (ParaId::from(1_u32 + idx as u32), CoreIndex::from(idx as u32)))
+				.collect::<BTreeMap<_, _>>();
+
+			let group_validators = |group_index: GroupIndex| {
+				match group_index {
+					group_index if group_index == GroupIndex::from(0) => Some(vec![0, 1]),
+					group_index if group_index == GroupIndex::from(1) => Some(vec![2, 3]),
+					_ => panic!("Group index out of bounds for 2 parachains and 1 parathread core"),
 				}
-				set
+				.map(|m| m.into_iter().map(ValidatorIndex).collect::<Vec<_>>())
 			};
-			let has_concluded_invalid =
-				|_idx: usize, candidate: &BackedCandidate| set.contains(&candidate.hash());
+
+			let backed_candidates = (0_usize..2)
+				.into_iter()
+				.map(|idx0| {
+					let idx1 = idx0 + 1;
+					let mut candidate = TestCandidateBuilder {
+						para_id: ParaId::from(idx1),
+						relay_parent,
+						pov_hash: Hash::repeat_byte(idx1 as u8),
+						persisted_validation_data_hash: [42u8; 32].into(),
+						hrmp_watermark: RELAY_PARENT_NUM,
+						..Default::default()
+					}
+					.build();
+
+					collator_sign_candidate(Sr25519Keyring::One, &mut candidate);
+
+					let backed = back_candidate(
+						candidate,
+						&validators,
+						group_validators(GroupIndex::from(idx0 as u32)).unwrap().as_ref(),
+						&keystore,
+						&signing_context,
+						BackingKind::Threshold,
+					);
+					backed
+				})
+				.collect::<Vec<_>>();
+
+			// happy path
 			assert_eq!(
 				sanitize_backed_candidates::<Test, _>(
 					backed_candidates.clone(),
 					has_concluded_invalid,
 					&scheduled
-				)
-				.len(),
-				backed_candidates.len() / 2
+				),
+				backed_candidates
 			);
-		}
+
+			// nothing is scheduled, so no paraids match, thus all backed candidates are skipped
+			{
+				let scheduled = &BTreeMap::new();
+				assert!(sanitize_backed_candidates::<Test, _>(
+					backed_candidates.clone(),
+					has_concluded_invalid,
+					&scheduled
+				)
+				.is_empty());
+			}
+
+			// candidates that have concluded as invalid are filtered out
+			{
+				// mark every second one as concluded invalid
+				let set = {
+					let mut set = std::collections::HashSet::new();
+					for (idx, backed_candidate) in backed_candidates.iter().enumerate() {
+						if idx & 0x01 == 0 {
+							set.insert(backed_candidate.hash());
+						}
+					}
+					set
+				};
+				let has_concluded_invalid =
+					|_idx: usize, candidate: &BackedCandidate| set.contains(&candidate.hash());
+				assert_eq!(
+					sanitize_backed_candidates::<Test, _>(
+						backed_candidates.clone(),
+						has_concluded_invalid,
+						&scheduled
+					)
+					.len(),
+					backed_candidates.len() / 2
+				);
+			}
+		});
 	}
 }
diff --git a/polkadot/runtime/parachains/src/runtime_api_impl/mod.rs b/polkadot/runtime/parachains/src/runtime_api_impl/mod.rs
index e066ad825a3300545a4ecf7840084ecbfc838223..ba74e488cd3b7aac66fb4e62938235b491cce839 100644
--- a/polkadot/runtime/parachains/src/runtime_api_impl/mod.rs
+++ b/polkadot/runtime/parachains/src/runtime_api_impl/mod.rs
@@ -25,5 +25,6 @@
 //! 1. Bump the version of the stable module (e.g. `v2` becomes `v3`)
 //! 2. Move methods from `vstaging` to `v3`. The new stable version should include all methods from
 //!    `vstaging` tagged with the new version number (e.g. all `v3` methods).
-pub mod v5;
+
+pub mod v7;
 pub mod vstaging;
diff --git a/polkadot/runtime/parachains/src/runtime_api_impl/v5.rs b/polkadot/runtime/parachains/src/runtime_api_impl/v7.rs
similarity index 73%
rename from polkadot/runtime/parachains/src/runtime_api_impl/v5.rs
rename to polkadot/runtime/parachains/src/runtime_api_impl/v7.rs
index cd15796897334a477ee19e33aa9cc4a92c68605e..35d92f71084fe64f1890f29d1ee840606e944beb 100644
--- a/polkadot/runtime/parachains/src/runtime_api_impl/v5.rs
+++ b/polkadot/runtime/parachains/src/runtime_api_impl/v7.rs
@@ -18,17 +18,21 @@
 //! functions.
 
 use crate::{
-	configuration, disputes, dmp, hrmp, inclusion, initializer, paras, paras_inherent, scheduler,
+	configuration, disputes, dmp, hrmp, inclusion, initializer, paras, paras_inherent,
+	scheduler::{self, CoreOccupied},
 	session_info, shared,
 };
 use frame_system::pallet_prelude::*;
 use primitives::{
+	async_backing::{
+		AsyncBackingParams, BackingState, CandidatePendingAvailability, Constraints,
+		InboundHrmpLimitations, OutboundHrmpChannelLimitations,
+	},
 	slashing, AuthorityDiscoveryId, CandidateEvent, CandidateHash, CommittedCandidateReceipt,
-	CoreIndex, CoreOccupied, CoreState, DisputeState, ExecutorParams, GroupIndex,
-	GroupRotationInfo, Hash, Id as ParaId, InboundDownwardMessage, InboundHrmpMessage,
-	OccupiedCore, OccupiedCoreAssumption, PersistedValidationData, PvfCheckStatement,
-	ScrapedOnChainVotes, SessionIndex, SessionInfo, ValidationCode, ValidationCodeHash,
-	ValidatorId, ValidatorIndex, ValidatorSignature,
+	CoreIndex, CoreState, DisputeState, ExecutorParams, GroupIndex, GroupRotationInfo, Hash,
+	Id as ParaId, InboundDownwardMessage, InboundHrmpMessage, OccupiedCore, OccupiedCoreAssumption,
+	PersistedValidationData, PvfCheckStatement, ScrapedOnChainVotes, SessionIndex, SessionInfo,
+	ValidationCode, ValidationCodeHash, ValidatorId, ValidatorIndex, ValidatorSignature,
 };
 use sp_runtime::traits::One;
 use sp_std::{collections::btree_map::BTreeMap, prelude::*};
@@ -52,29 +56,15 @@ pub fn validator_groups<T: initializer::Config>(
 /// Implementation for the `availability_cores` function of the runtime API.
 pub fn availability_cores<T: initializer::Config>() -> Vec<CoreState<T::Hash, BlockNumberFor<T>>> {
 	let cores = <scheduler::Pallet<T>>::availability_cores();
-	let config = <configuration::Pallet<T>>::config();
 	let now = <frame_system::Pallet<T>>::block_number() + One::one();
-	let rotation_info = <scheduler::Pallet<T>>::group_rotation_info(now);
 
-	let time_out_at = |backed_in_number, availability_period| {
-		let time_out_at = backed_in_number + availability_period;
-
-		let current_window = rotation_info.last_rotation_at() + availability_period;
-		let next_rotation = rotation_info.next_rotation_at();
-
-		// If we are within `period` blocks of rotation, timeouts are being checked
-		// actively. We could even time out this block.
-		if time_out_at < current_window {
-			time_out_at
-		} else if time_out_at <= next_rotation {
-			// Otherwise, it will time out at the sooner of the next rotation
-			next_rotation
-		} else {
-			// or the scheduled time-out. This is by definition within `period` blocks
-			// of `next_rotation` and is thus a valid timeout block.
-			time_out_at
-		}
-	};
+	// This explicit update is only strictly required for session boundaries:
+	//
+	// At the end of a session we clear the claim queues: Without this update call, nothing would be
+	// scheduled to the client.
+	<scheduler::Pallet<T>>::update_claimqueue(Vec::new(), now);
+
+	let time_out_for = <scheduler::Pallet<T>>::availability_timeout_predicate();
 
 	let group_responsible_for =
 		|backed_in_number, core_index| match <scheduler::Pallet<T>>::group_assigned_to_core(
@@ -93,7 +83,9 @@ pub fn availability_cores<T: initializer::Config>() -> Vec<CoreState<T::Hash, Bl
 			},
 		};
 
-	let mut core_states: Vec<_> = cores
+	let scheduled: BTreeMap<_, _> = <scheduler::Pallet<T>>::scheduled_paras().collect();
+
+	cores
 		.into_iter()
 		.enumerate()
 		.map(|(i, core)| match core {
@@ -108,7 +100,7 @@ pub fn availability_cores<T: initializer::Config>() -> Vec<CoreState<T::Hash, Bl
 						i as u32,
 					)),
 					occupied_since: backed_in_number,
-					time_out_at: time_out_at(backed_in_number, config.paras_availability_period),
+					time_out_at: time_out_for(backed_in_number).live_until,
 					next_up_on_time_out: <scheduler::Pallet<T>>::next_up_on_time_out(CoreIndex(
 						i as u32,
 					)),
@@ -121,19 +113,15 @@ pub fn availability_cores<T: initializer::Config>() -> Vec<CoreState<T::Hash, Bl
 					candidate_descriptor: pending_availability.candidate_descriptor().clone(),
 				})
 			},
-			CoreOccupied::Free => CoreState::Free,
+			CoreOccupied::Free => {
+				if let Some(para_id) = scheduled.get(&CoreIndex(i as _)).cloned() {
+					CoreState::Scheduled(primitives::ScheduledCore { para_id, collator: None })
+				} else {
+					CoreState::Free
+				}
+			},
 		})
-		.collect();
-
-	// This will overwrite only `Free` cores if the scheduler module is working as intended.
-	for scheduled in <scheduler::Pallet<T>>::scheduled_claimqueue() {
-		core_states[scheduled.core.0 as usize] = CoreState::Scheduled(primitives::ScheduledCore {
-			para_id: scheduled.paras_entry.para_id(),
-			collator: None,
-		});
-	}
-
-	core_states
+		.collect()
 }
 
 /// Returns current block number being processed and the corresponding root hash.
@@ -345,7 +333,7 @@ pub fn on_chain_votes<T: paras_inherent::Config>() -> Option<ScrapedOnChainVotes
 	<paras_inherent::Pallet<T>>::on_chain_votes()
 }
 
-/// Submits an PVF pre-checking vote. See [`paras::Pallet::submit_pvf_check_statement`].
+/// Submits an PVF pre-checking vote.
 pub fn submit_pvf_check_statement<T: paras::Config>(
 	stmt: PvfCheckStatement,
 	signature: ValidatorSignature,
@@ -353,8 +341,7 @@ pub fn submit_pvf_check_statement<T: paras::Config>(
 	<paras::Pallet<T>>::submit_pvf_check_statement(stmt, signature)
 }
 
-/// Returns the list of all PVF code hashes that require pre-checking. See
-/// [`paras::Pallet::pvfs_require_precheck`].
+/// Returns the list of all PVF code hashes that require pre-checking.
 pub fn pvfs_require_precheck<T: paras::Config>() -> Vec<ValidationCodeHash> {
 	<paras::Pallet<T>>::pvfs_require_precheck()
 }
@@ -412,3 +399,100 @@ pub fn submit_unsigned_slashing_report<T: disputes::slashing::Config>(
 		key_ownership_proof,
 	)
 }
+
+/// Return the min backing votes threshold from the configuration.
+pub fn minimum_backing_votes<T: initializer::Config>() -> u32 {
+	<configuration::Pallet<T>>::config().minimum_backing_votes
+}
+
+/// Implementation for `ParaBackingState` function from the runtime API
+pub fn backing_state<T: initializer::Config>(
+	para_id: ParaId,
+) -> Option<BackingState<T::Hash, BlockNumberFor<T>>> {
+	let config = <configuration::Pallet<T>>::config();
+	// Async backing is only expected to be enabled with a tracker capacity of 1.
+	// Subsequent configuration update gets applied on new session, which always
+	// clears the buffer.
+	//
+	// Thus, minimum relay parent is ensured to have asynchronous backing enabled.
+	let now = <frame_system::Pallet<T>>::block_number();
+	let min_relay_parent_number = <shared::Pallet<T>>::allowed_relay_parents()
+		.hypothetical_earliest_block_number(now, config.async_backing_params.allowed_ancestry_len);
+
+	let required_parent = <paras::Pallet<T>>::para_head(para_id)?;
+	let validation_code_hash = <paras::Pallet<T>>::current_code_hash(para_id)?;
+
+	let upgrade_restriction = <paras::Pallet<T>>::upgrade_restriction_signal(para_id);
+	let future_validation_code =
+		<paras::Pallet<T>>::future_code_upgrade_at(para_id).and_then(|block_num| {
+			// Only read the storage if there's a pending upgrade.
+			Some(block_num).zip(<paras::Pallet<T>>::future_code_hash(para_id))
+		});
+
+	let (ump_msg_count, ump_total_bytes) =
+		<inclusion::Pallet<T>>::relay_dispatch_queue_size(para_id);
+	let ump_remaining = config.max_upward_queue_count - ump_msg_count;
+	let ump_remaining_bytes = config.max_upward_queue_size - ump_total_bytes;
+
+	let dmp_remaining_messages = <dmp::Pallet<T>>::dmq_contents(para_id)
+		.into_iter()
+		.map(|msg| msg.sent_at)
+		.collect();
+
+	let valid_watermarks = <hrmp::Pallet<T>>::valid_watermarks(para_id);
+	let hrmp_inbound = InboundHrmpLimitations { valid_watermarks };
+	let hrmp_channels_out = <hrmp::Pallet<T>>::outbound_remaining_capacity(para_id)
+		.into_iter()
+		.map(|(para, (messages_remaining, bytes_remaining))| {
+			(para, OutboundHrmpChannelLimitations { messages_remaining, bytes_remaining })
+		})
+		.collect();
+
+	let constraints = Constraints {
+		min_relay_parent_number,
+		max_pov_size: config.max_pov_size,
+		max_code_size: config.max_code_size,
+		ump_remaining,
+		ump_remaining_bytes,
+		max_ump_num_per_candidate: config.max_upward_message_num_per_candidate,
+		dmp_remaining_messages,
+		hrmp_inbound,
+		hrmp_channels_out,
+		max_hrmp_num_per_candidate: config.hrmp_max_message_num_per_candidate,
+		required_parent,
+		validation_code_hash,
+		upgrade_restriction,
+		future_validation_code,
+	};
+
+	let pending_availability = {
+		// Note: the API deals with a `Vec` as it is future-proof for cases
+		// where there may be multiple candidates pending availability at a time.
+		// But at the moment only one candidate can be pending availability per
+		// parachain.
+		crate::inclusion::PendingAvailability::<T>::get(&para_id)
+			.and_then(|pending| {
+				let commitments =
+					crate::inclusion::PendingAvailabilityCommitments::<T>::get(&para_id);
+				commitments.map(move |c| (pending, c))
+			})
+			.map(|(pending, commitments)| {
+				CandidatePendingAvailability {
+					candidate_hash: pending.candidate_hash(),
+					descriptor: pending.candidate_descriptor().clone(),
+					commitments,
+					relay_parent_number: pending.relay_parent_number(),
+					max_pov_size: constraints.max_pov_size, // assume always same in session.
+				}
+			})
+			.into_iter()
+			.collect()
+	};
+
+	Some(BackingState { constraints, pending_availability })
+}
+
+/// Implementation for `AsyncBackingParams` function from the runtime API
+pub fn async_backing_params<T: configuration::Config>() -> AsyncBackingParams {
+	<configuration::Pallet<T>>::config().async_backing_params
+}
diff --git a/polkadot/runtime/parachains/src/runtime_api_impl/vstaging.rs b/polkadot/runtime/parachains/src/runtime_api_impl/vstaging.rs
index 5406428377d0dd0a0991f3f6edab35ada25bda13..24a076f3a44310990d61ad0076db39f4deb8f9e5 100644
--- a/polkadot/runtime/parachains/src/runtime_api_impl/vstaging.rs
+++ b/polkadot/runtime/parachains/src/runtime_api_impl/vstaging.rs
@@ -16,105 +16,29 @@
 
 //! Put implementations of functions from staging APIs here.
 
-use crate::{configuration, dmp, hrmp, inclusion, initializer, paras, shared};
-use frame_system::pallet_prelude::BlockNumberFor;
-use primitives::{
-	vstaging::{
-		AsyncBackingParams, BackingState, CandidatePendingAvailability, Constraints,
-		InboundHrmpLimitations, OutboundHrmpChannelLimitations,
-	},
-	Id as ParaId,
-};
-use sp_std::prelude::*;
-
-/// Implementation for `StagingParaBackingState` function from the runtime API
-pub fn backing_state<T: initializer::Config>(
-	para_id: ParaId,
-) -> Option<BackingState<T::Hash, BlockNumberFor<T>>> {
-	let config = <configuration::Pallet<T>>::config();
-	// Async backing is only expected to be enabled with a tracker capacity of 1.
-	// Subsequent configuration update gets applied on new session, which always
-	// clears the buffer.
-	//
-	// Thus, minimum relay parent is ensured to have asynchronous backing enabled.
-	let now = <frame_system::Pallet<T>>::block_number();
-	let min_relay_parent_number = <shared::Pallet<T>>::allowed_relay_parents()
-		.hypothetical_earliest_block_number(now, config.async_backing_params.allowed_ancestry_len);
-
-	let required_parent = <paras::Pallet<T>>::para_head(para_id)?;
-	let validation_code_hash = <paras::Pallet<T>>::current_code_hash(para_id)?;
-
-	let upgrade_restriction = <paras::Pallet<T>>::upgrade_restriction_signal(para_id);
-	let future_validation_code =
-		<paras::Pallet<T>>::future_code_upgrade_at(para_id).and_then(|block_num| {
-			// Only read the storage if there's a pending upgrade.
-			Some(block_num).zip(<paras::Pallet<T>>::future_code_hash(para_id))
-		});
-
-	let (ump_msg_count, ump_total_bytes) =
-		<inclusion::Pallet<T>>::relay_dispatch_queue_size(para_id);
-	let ump_remaining = config.max_upward_queue_count - ump_msg_count;
-	let ump_remaining_bytes = config.max_upward_queue_size - ump_total_bytes;
-
-	let dmp_remaining_messages = <dmp::Pallet<T>>::dmq_contents(para_id)
-		.into_iter()
-		.map(|msg| msg.sent_at)
-		.collect();
-
-	let valid_watermarks = <hrmp::Pallet<T>>::valid_watermarks(para_id);
-	let hrmp_inbound = InboundHrmpLimitations { valid_watermarks };
-	let hrmp_channels_out = <hrmp::Pallet<T>>::outbound_remaining_capacity(para_id)
-		.into_iter()
-		.map(|(para, (messages_remaining, bytes_remaining))| {
-			(para, OutboundHrmpChannelLimitations { messages_remaining, bytes_remaining })
-		})
-		.collect();
-
-	let constraints = Constraints {
-		min_relay_parent_number,
-		max_pov_size: config.max_pov_size,
-		max_code_size: config.max_code_size,
-		ump_remaining,
-		ump_remaining_bytes,
-		max_ump_num_per_candidate: config.max_upward_message_num_per_candidate,
-		dmp_remaining_messages,
-		hrmp_inbound,
-		hrmp_channels_out,
-		max_hrmp_num_per_candidate: config.hrmp_max_message_num_per_candidate,
-		required_parent,
-		validation_code_hash,
-		upgrade_restriction,
-		future_validation_code,
-	};
-
-	let pending_availability = {
-		// Note: the API deals with a `Vec` as it is future-proof for cases
-		// where there may be multiple candidates pending availability at a time.
-		// But at the moment only one candidate can be pending availability per
-		// parachain.
-		crate::inclusion::PendingAvailability::<T>::get(&para_id)
-			.and_then(|pending| {
-				let commitments =
-					crate::inclusion::PendingAvailabilityCommitments::<T>::get(&para_id);
-				commitments.map(move |c| (pending, c))
-			})
-			.map(|(pending, commitments)| {
-				CandidatePendingAvailability {
-					candidate_hash: pending.candidate_hash(),
-					descriptor: pending.candidate_descriptor().clone(),
-					commitments,
-					relay_parent_number: pending.relay_parent_number(),
-					max_pov_size: constraints.max_pov_size, // assume always same in session.
-				}
-			})
-			.into_iter()
-			.collect()
-	};
-
-	Some(BackingState { constraints, pending_availability })
-}
-
-/// Implementation for `StagingAsyncBackingParams` function from the runtime API
-pub fn async_backing_params<T: configuration::Config>() -> AsyncBackingParams {
-	<configuration::Pallet<T>>::config().async_backing_params
+use crate::shared;
+use primitives::ValidatorIndex;
+use sp_std::{collections::btree_map::BTreeMap, prelude::Vec};
+
+/// Implementation for `DisabledValidators`
+// CAVEAT: this should only be called on the node side
+// as it might produce incorrect results on session boundaries
+pub fn disabled_validators<T>() -> Vec<ValidatorIndex>
+where
+	T: pallet_session::Config + shared::Config,
+{
+	let shuffled_indices = <shared::Pallet<T>>::active_validator_indices();
+	// mapping from raw validator index to `ValidatorIndex`
+	// this computation is the same within a session, but should be cheap
+	let reverse_index = shuffled_indices
+		.iter()
+		.enumerate()
+		.map(|(i, v)| (v.0, ValidatorIndex(i as u32)))
+		.collect::<BTreeMap<u32, ValidatorIndex>>();
+
+	// we might have disabled validators who are not parachain validators
+	<pallet_session::Pallet<T>>::disabled_validators()
+		.iter()
+		.filter_map(|v| reverse_index.get(v).cloned())
+		.collect()
 }
diff --git a/polkadot/runtime/parachains/src/scheduler.rs b/polkadot/runtime/parachains/src/scheduler.rs
index 577bcd153b5b032fbc447de74c93c0f4f1b156d3..60b2a9254600e56b40ca2027db06a98a7711f246 100644
--- a/polkadot/runtime/parachains/src/scheduler.rs
+++ b/polkadot/runtime/parachains/src/scheduler.rs
@@ -39,11 +39,11 @@
 use crate::{configuration, initializer::SessionChangeNotification, paras};
 use frame_support::pallet_prelude::*;
 use frame_system::pallet_prelude::BlockNumberFor;
+pub use polkadot_core_primitives::v2::BlockNumber;
 use primitives::{
-	v5::ParasEntry, CoreIndex, CoreOccupied, GroupIndex, GroupRotationInfo, Id as ParaId,
-	ScheduledCore, ValidatorIndex,
+	CoreIndex, GroupIndex, GroupRotationInfo, Id as ParaId, ScheduledCore, ValidatorIndex,
 };
-use sp_runtime::traits::{One, Saturating};
+use sp_runtime::traits::One;
 use sp_std::{
 	collections::{btree_map::BTreeMap, vec_deque::VecDeque},
 	prelude::*,
@@ -51,7 +51,7 @@ use sp_std::{
 
 pub mod common;
 
-use common::{AssignmentProvider, AssignmentProviderConfig, CoreAssignment, FreedReason};
+use common::{Assignment, AssignmentProvider, AssignmentProviderConfig};
 
 pub use pallet::*;
 
@@ -101,6 +101,36 @@ pub mod pallet {
 	pub(crate) type AvailabilityCores<T: Config> =
 		StorageValue<_, Vec<CoreOccupied<BlockNumberFor<T>>>, ValueQuery>;
 
+	/// Representation of a core in `AvailabilityCores`.
+	///
+	/// This is not to be confused with `CoreState` which is an enriched variant of this and exposed
+	/// to the node side. It also provides information about scheduled/upcoming assignments for
+	/// example and is computed on the fly in the `availability_cores` runtime call.
+	#[derive(Clone, Encode, Decode, TypeInfo, RuntimeDebug)]
+	#[cfg_attr(feature = "std", derive(PartialEq))]
+	pub enum CoreOccupied<N> {
+		/// No candidate is waiting availability on this core right now (the core is not occupied).
+		Free,
+		/// A para is currently waiting for availability/inclusion on this core.
+		Paras(ParasEntry<N>),
+	}
+
+	impl<N> CoreOccupied<N> {
+		/// Is core free?
+		pub fn is_free(&self) -> bool {
+			matches!(self, Self::Free)
+		}
+	}
+
+	/// Reasons a core might be freed.
+	#[derive(Clone, Copy)]
+	pub enum FreedReason {
+		/// The core's work concluded and the parablock assigned to it is considered available.
+		Concluded,
+		/// The core's work timed out.
+		TimedOut,
+	}
+
 	/// The block number where the session start occurred. Used to track how many group rotations
 	/// have occurred.
 	///
@@ -124,6 +154,68 @@ pub mod pallet {
 		BTreeMap<CoreIndex, VecDeque<Option<ParasEntry<BlockNumberFor<T>>>>>,
 		ValueQuery,
 	>;
+
+	/// Assignments as tracked in the claim queue.
+	#[derive(Clone, Encode, Decode, TypeInfo, PartialEq, RuntimeDebug)]
+	pub struct ParasEntry<N = BlockNumber> {
+		/// The underlying `Assignment`
+		pub assignment: Assignment,
+		/// The number of times the entry has timed out in availability already.
+		pub availability_timeouts: u32,
+		/// The block height until this entry needs to be backed.
+		///
+		/// If missed the entry will be removed from the claim queue without ever having occupied
+		/// the core.
+		pub ttl: N,
+	}
+
+	impl<N> ParasEntry<N> {
+		/// Return `Id` from the underlying `Assignment`.
+		pub fn para_id(&self) -> ParaId {
+			self.assignment.para_id
+		}
+
+		/// Create a new `ParasEntry`.
+		pub fn new(assignment: Assignment, now: N) -> Self {
+			ParasEntry { assignment, availability_timeouts: 0, ttl: now }
+		}
+	}
+
+	/// How a core is mapped to a backing group and a `ParaId`
+	#[derive(Clone, Encode, Decode, PartialEq, TypeInfo)]
+	#[cfg_attr(feature = "std", derive(Debug))]
+	pub struct CoreAssignment<BlockNumber> {
+		/// The core that is assigned.
+		pub core: CoreIndex,
+		/// The para id and accompanying information needed to collate and back a parablock.
+		pub paras_entry: ParasEntry<BlockNumber>,
+	}
+
+	impl<BlockNumber> CoreAssignment<BlockNumber> {
+		/// Returns the [`ParaId`] of the assignment.
+		pub fn para_id(&self) -> ParaId {
+			self.paras_entry.para_id()
+		}
+
+		/// Returns the inner [`ParasEntry`] of the assignment.
+		pub fn to_paras_entry(self) -> ParasEntry<BlockNumber> {
+			self.paras_entry
+		}
+	}
+
+	/// Availability timeout status of a core.
+	pub(crate) struct AvailabilityTimeoutStatus<BlockNumber> {
+		/// Is the core already timed out?
+		///
+		/// If this is true the core will be freed at this block.
+		pub timed_out: bool,
+
+		/// When does this core timeout.
+		///
+		/// The block number the core times out. If `timed_out` is true, this will correspond to
+		/// now (current block number).
+		pub live_until: BlockNumber,
+	}
 }
 
 type PositionInClaimqueue = u32;
@@ -368,50 +460,47 @@ impl<T: Config> Pallet<T> {
 		Some(GroupIndex(group_idx as u32))
 	}
 
-	/// Returns an optional predicate that should be used for timing out occupied cores.
-	///
-	/// If `None`, no timing-out should be done. The predicate accepts the index of the core, and
-	/// the block number since which it has been occupied, and the respective parachain timeouts,
-	/// i.e. only within `config.paras_availability_period` of the last rotation would this return
-	/// `Some`, unless there are no rotations.
+	/// Returns a predicate that should be used for timing out occupied cores.
 	///
-	/// The timeout used to depend, but does not depend any more on group rotations. First of all
-	/// it only matters if a para got another chance (a retry). If there is a retry and it happens
-	/// still within the same group rotation a censoring backing group would need to censor again
-	/// and lose out again on backing rewards. This is bad for the censoring backing group, it does
-	/// not matter for the parachain as long as it is retried often enough (so it eventually gets a
-	/// try on another backing group) - the effect is similar to having a prolonged timeout. It
-	/// should also be noted that for both malicious and offline backing groups it is actually more
-	/// realistic that the candidate will not be backed to begin with, instead of getting backed
-	/// and then not made available.
+	/// This only ever times out cores that have been occupied across a group rotation boundary.
 	pub(crate) fn availability_timeout_predicate(
-	) -> Option<impl Fn(CoreIndex, BlockNumberFor<T>) -> bool> {
-		let now = <frame_system::Pallet<T>>::block_number();
+	) -> impl Fn(BlockNumberFor<T>) -> AvailabilityTimeoutStatus<BlockNumberFor<T>> {
 		let config = <configuration::Pallet<T>>::config();
-		let session_start = <SessionStartBlock<T>>::get();
+		let now = <frame_system::Pallet<T>>::block_number();
+		let rotation_info = Self::group_rotation_info(now);
 
-		let blocks_since_session_start = now.saturating_sub(session_start);
-		let blocks_since_last_rotation =
-			blocks_since_session_start % config.group_rotation_frequency.max(1u8.into());
+		let next_rotation = rotation_info.next_rotation_at();
 
-		if blocks_since_last_rotation >= config.paras_availability_period {
-			None
-		} else {
-			Some(|core_index: CoreIndex, pending_since| {
-				let availability_cores = AvailabilityCores::<T>::get();
-				let AssignmentProviderConfig { availability_period, .. } =
-					T::AssignmentProvider::get_provider_config(core_index);
-				let now = <frame_system::Pallet<T>>::block_number();
-				match availability_cores.get(core_index.0 as usize) {
-					None => true, // out-of-bounds, doesn't really matter what is returned.
-					Some(CoreOccupied::Free) => true, // core free, still doesn't matter.
-					Some(CoreOccupied::Paras(_)) =>
-						now.saturating_sub(pending_since) >= availability_period,
-				}
-			})
+		let times_out = Self::availability_timeout_check_required();
+
+		move |pending_since| {
+			let time_out_at = if times_out {
+				// We are at the beginning of the rotation, here availability period is relevant.
+				// Note: blocks backed in this rotation will never time out here as backed_in +
+				// config.paras_availability_period will always be > now for these blocks, as
+				// otherwise above condition would not be true.
+				pending_since + config.paras_availability_period
+			} else {
+				next_rotation + config.paras_availability_period
+			};
+
+			AvailabilityTimeoutStatus { timed_out: time_out_at <= now, live_until: time_out_at }
 		}
 	}
 
+	/// Is evaluation of `availability_timeout_predicate` necessary at the current block?
+	///
+	/// This can be used to avoid calling `availability_timeout_predicate` for each core in case
+	/// this function returns false.
+	pub(crate) fn availability_timeout_check_required() -> bool {
+		let config = <configuration::Pallet<T>>::config();
+		let now = <frame_system::Pallet<T>>::block_number() + One::one();
+		let rotation_info = Self::group_rotation_info(now);
+
+		let current_window = rotation_info.last_rotation_at() + config.paras_availability_period;
+		now < current_window
+	}
+
 	/// Returns a helper for determining group rotation.
 	pub(crate) fn group_rotation_info(
 		now: BlockNumberFor<T>,
@@ -508,7 +597,7 @@ impl<T: Config> Pallet<T> {
 	pub(crate) fn update_claimqueue(
 		just_freed_cores: impl IntoIterator<Item = (CoreIndex, FreedReason)>,
 		now: BlockNumberFor<T>,
-	) -> Vec<CoreAssignment<BlockNumberFor<T>>> {
+	) {
 		Self::move_claimqueue_forward();
 		Self::free_cores_and_fill_claimqueue(just_freed_cores, now)
 	}
@@ -534,61 +623,58 @@ impl<T: Config> Pallet<T> {
 	fn free_cores_and_fill_claimqueue(
 		just_freed_cores: impl IntoIterator<Item = (CoreIndex, FreedReason)>,
 		now: BlockNumberFor<T>,
-	) -> Vec<CoreAssignment<BlockNumberFor<T>>> {
+	) {
 		let (mut concluded_paras, mut timedout_paras) = Self::free_cores(just_freed_cores);
 
 		// This can only happen on new sessions at which we move all assignments back to the
 		// provider. Hence, there's nothing we need to do here.
 		if ValidatorGroups::<T>::get().is_empty() {
-			vec![]
-		} else {
-			let n_lookahead = Self::claimqueue_lookahead();
-			let n_session_cores = T::AssignmentProvider::session_core_count();
-			let cq = ClaimQueue::<T>::get();
-			let ttl = <configuration::Pallet<T>>::config().on_demand_ttl;
-
-			for core_idx in 0..n_session_cores {
-				let core_idx = CoreIndex::from(core_idx);
-
-				// add previously timedout paras back into the queue
-				if let Some(mut entry) = timedout_paras.remove(&core_idx) {
-					let AssignmentProviderConfig { max_availability_timeouts, .. } =
-						T::AssignmentProvider::get_provider_config(core_idx);
-					if entry.availability_timeouts < max_availability_timeouts {
-						// Increment the timeout counter.
-						entry.availability_timeouts += 1;
-						// Reset the ttl so that a timed out assignment.
-						entry.ttl = now + ttl;
-						Self::add_to_claimqueue(core_idx, entry);
-						// The claim has been added back into the claimqueue.
-						// Do not pop another assignment for the core.
-						continue
-					} else {
-						// Consider timed out assignments for on demand parachains as concluded for
-						// the assignment provider
-						let ret = concluded_paras.insert(core_idx, entry.para_id());
-						debug_assert!(ret.is_none());
-					}
+			return
+		}
+		let n_lookahead = Self::claimqueue_lookahead();
+		let n_session_cores = T::AssignmentProvider::session_core_count();
+		let cq = ClaimQueue::<T>::get();
+		let ttl = <configuration::Pallet<T>>::config().on_demand_ttl;
+
+		for core_idx in 0..n_session_cores {
+			let core_idx = CoreIndex::from(core_idx);
+
+			// add previously timedout paras back into the queue
+			if let Some(mut entry) = timedout_paras.remove(&core_idx) {
+				let AssignmentProviderConfig { max_availability_timeouts, .. } =
+					T::AssignmentProvider::get_provider_config(core_idx);
+				if entry.availability_timeouts < max_availability_timeouts {
+					// Increment the timeout counter.
+					entry.availability_timeouts += 1;
+					// Reset the ttl so that a timed out assignment.
+					entry.ttl = now + ttl;
+					Self::add_to_claimqueue(core_idx, entry);
+					// The claim has been added back into the claimqueue.
+					// Do not pop another assignment for the core.
+					continue
+				} else {
+					// Consider timed out assignments for on demand parachains as concluded for
+					// the assignment provider
+					let ret = concluded_paras.insert(core_idx, entry.para_id());
+					debug_assert!(ret.is_none());
 				}
+			}
 
-				// We  consider occupied cores to be part of the claimqueue
-				let n_lookahead_used = cq.get(&core_idx).map_or(0, |v| v.len() as u32) +
-					if Self::is_core_occupied(core_idx) { 1 } else { 0 };
-				for _ in n_lookahead_used..n_lookahead {
-					let concluded_para = concluded_paras.remove(&core_idx);
-					if let Some(assignment) =
-						T::AssignmentProvider::pop_assignment_for_core(core_idx, concluded_para)
-					{
-						Self::add_to_claimqueue(core_idx, ParasEntry::new(assignment, now + ttl));
-					}
+			// We  consider occupied cores to be part of the claimqueue
+			let n_lookahead_used = cq.get(&core_idx).map_or(0, |v| v.len() as u32) +
+				if Self::is_core_occupied(core_idx) { 1 } else { 0 };
+			for _ in n_lookahead_used..n_lookahead {
+				let concluded_para = concluded_paras.remove(&core_idx);
+				if let Some(assignment) =
+					T::AssignmentProvider::pop_assignment_for_core(core_idx, concluded_para)
+				{
+					Self::add_to_claimqueue(core_idx, ParasEntry::new(assignment, now + ttl));
 				}
 			}
-
-			debug_assert!(timedout_paras.is_empty());
-			debug_assert!(concluded_paras.is_empty());
-
-			Self::scheduled_claimqueue()
 		}
+
+		debug_assert!(timedout_paras.is_empty());
+		debug_assert!(concluded_paras.is_empty());
 	}
 
 	fn is_core_occupied(core_idx: CoreIndex) -> bool {
@@ -623,29 +709,22 @@ impl<T: Config> Pallet<T> {
 				.ok_or("remove returned None")?
 				.ok_or("Element in Claimqueue was None.")?;
 
-			// Since the core is now occupied, the next entry in the claimqueue in order to achieve
-			// 12 second block times needs to be None
-			if core_claims.front() != Some(&None) {
-				core_claims.push_front(None);
-			}
 			Ok((pos as u32, pe))
 		})
 	}
 
-	// TODO: Temporary to imitate the old schedule() call. Will be adjusted when we make the
-	// scheduler AB ready
-	pub(crate) fn scheduled_claimqueue() -> Vec<CoreAssignment<BlockNumberFor<T>>> {
+	/// Paras scheduled next in the claim queue.
+	pub(crate) fn scheduled_paras() -> impl Iterator<Item = (CoreIndex, ParaId)> {
+		Self::scheduled_entries().map(|(core_idx, e)| (core_idx, e.assignment.para_id))
+	}
+
+	/// Internal access to entries at the top of the claim queue.
+	fn scheduled_entries() -> impl Iterator<Item = (CoreIndex, ParasEntry<BlockNumberFor<T>>)> {
 		let claimqueue = ClaimQueue::<T>::get();
 
 		claimqueue
 			.into_iter()
-			.flat_map(|(core_idx, v)| {
-				v.front()
-					.cloned()
-					.flatten()
-					.map(|pe| CoreAssignment { core: core_idx, paras_entry: pe })
-			})
-			.collect()
+			.filter_map(|(core_idx, v)| v.front().cloned().flatten().map(|e| (core_idx, e)))
 	}
 
 	#[cfg(any(feature = "runtime-benchmarks", test))]
diff --git a/polkadot/runtime/parachains/src/scheduler/common.rs b/polkadot/runtime/parachains/src/scheduler/common.rs
index 0e8e8338b17b71c01e3c131e9ea5a7483f666571..316e8e3b760cc6a73c022f693e12ca537bf3443b 100644
--- a/polkadot/runtime/parachains/src/scheduler/common.rs
+++ b/polkadot/runtime/parachains/src/scheduler/common.rs
@@ -17,10 +17,7 @@
 //! Common traits and types used by the scheduler and assignment providers.
 
 use frame_support::pallet_prelude::*;
-use primitives::{
-	v5::{Assignment, ParasEntry},
-	CoreIndex, Id as ParaId,
-};
+use primitives::{CoreIndex, Id as ParaId};
 use scale_info::TypeInfo;
 use sp_std::prelude::*;
 
@@ -28,21 +25,22 @@ use sp_std::prelude::*;
 #[allow(unused)]
 use crate::configuration::HostConfiguration;
 
-/// Reasons a core might be freed
-#[derive(Clone, Copy)]
-pub enum FreedReason {
-	/// The core's work concluded and the parablock assigned to it is considered available.
-	Concluded,
-	/// The core's work timed out.
-	TimedOut,
+/// An assignment for a parachain scheduled to be backed and included in a relay chain block.
+#[derive(Clone, Encode, Decode, PartialEq, TypeInfo, RuntimeDebug)]
+pub struct Assignment {
+	/// Assignment's ParaId
+	pub para_id: ParaId,
+}
+
+impl Assignment {
+	/// Create a new `Assignment`.
+	pub fn new(para_id: ParaId) -> Self {
+		Self { para_id }
+	}
 }
 
 /// A set of variables required by the scheduler in order to operate.
 pub struct AssignmentProviderConfig<BlockNumber> {
-	/// The availability period specified by the implementation.
-	/// See [`HostConfiguration::paras_availability_period`] for more information.
-	pub availability_period: BlockNumber,
-
 	/// How many times a collation can time out on availability.
 	/// Zero timeouts still means that a collation can be provided as per the slot auction
 	/// assignment provider.
@@ -72,25 +70,3 @@ pub trait AssignmentProvider<BlockNumber> {
 	/// Returns a set of variables needed by the scheduler
 	fn get_provider_config(core_idx: CoreIndex) -> AssignmentProviderConfig<BlockNumber>;
 }
-
-/// How a core is mapped to a backing group and a `ParaId`
-#[derive(Clone, Encode, Decode, PartialEq, TypeInfo)]
-#[cfg_attr(feature = "std", derive(Debug))]
-pub struct CoreAssignment<BlockNumber> {
-	/// The core that is assigned.
-	pub core: CoreIndex,
-	/// The para id and accompanying information needed to collate and back a parablock.
-	pub paras_entry: ParasEntry<BlockNumber>,
-}
-
-impl<BlockNumber> CoreAssignment<BlockNumber> {
-	/// Returns the [`ParaId`] of the assignment.
-	pub fn para_id(&self) -> ParaId {
-		self.paras_entry.para_id()
-	}
-
-	/// Returns the inner [`ParasEntry`] of the assignment.
-	pub fn to_paras_entry(self) -> ParasEntry<BlockNumber> {
-		self.paras_entry
-	}
-}
diff --git a/polkadot/runtime/parachains/src/scheduler/migration.rs b/polkadot/runtime/parachains/src/scheduler/migration.rs
index 32ac9deaf68f24149382bb9acaadc0368687d36b..accff7016ed1e37e585b8433b5cdfd37378e4fe3 100644
--- a/polkadot/runtime/parachains/src/scheduler/migration.rs
+++ b/polkadot/runtime/parachains/src/scheduler/migration.rs
@@ -20,7 +20,6 @@ use super::*;
 use frame_support::{
 	pallet_prelude::ValueQuery, storage_alias, traits::OnRuntimeUpgrade, weights::Weight,
 };
-use primitives::vstaging::Assignment;
 
 mod v0 {
 	use super::*;
diff --git a/polkadot/runtime/parachains/src/scheduler/tests.rs b/polkadot/runtime/parachains/src/scheduler/tests.rs
index e203531ca49d2f985a32f32421db2ac49e2ac1cf..108f365d6b5c39567b57dc21243a30d0548a89bf 100644
--- a/polkadot/runtime/parachains/src/scheduler/tests.rs
+++ b/polkadot/runtime/parachains/src/scheduler/tests.rs
@@ -18,7 +18,7 @@ use super::*;
 
 use frame_support::assert_ok;
 use keyring::Sr25519Keyring;
-use primitives::{v5::Assignment, BlockNumber, SessionIndex, ValidationCode, ValidatorId};
+use primitives::{BlockNumber, SessionIndex, ValidationCode, ValidatorId};
 use sp_std::collections::{btree_map::BTreeMap, btree_set::BTreeSet};
 
 use crate::{
@@ -427,33 +427,27 @@ fn fill_claimqueue_fills() {
 
 		{
 			assert_eq!(Scheduler::claimqueue_len(), 2 * lookahead);
-			let scheduled = Scheduler::scheduled_claimqueue();
+			let scheduled: BTreeMap<_, _> = Scheduler::scheduled_entries().collect();
 
 			// Cannot assert on indices anymore as they depend on the assignment providers
 			assert!(claimqueue_contains_para_ids::<Test>(vec![chain_a, chain_b]));
 
 			assert_eq!(
-				scheduled[0],
-				CoreAssignment {
-					core: CoreIndex(0),
-					paras_entry: ParasEntry {
-						assignment: Assignment { para_id: chain_a },
-						availability_timeouts: 0,
-						ttl: 6
-					},
-				}
+				scheduled.get(&CoreIndex(0)).unwrap(),
+				&ParasEntry {
+					assignment: Assignment { para_id: chain_a },
+					availability_timeouts: 0,
+					ttl: 6
+				},
 			);
 
 			assert_eq!(
-				scheduled[1],
-				CoreAssignment {
-					core: CoreIndex(1),
-					paras_entry: ParasEntry {
-						assignment: Assignment { para_id: chain_b },
-						availability_timeouts: 0,
-						ttl: 6
-					},
-				}
+				scheduled.get(&CoreIndex(1)).unwrap(),
+				&ParasEntry {
+					assignment: Assignment { para_id: chain_b },
+					availability_timeouts: 0,
+					ttl: 6
+				},
 			);
 		}
 
@@ -481,42 +475,33 @@ fn fill_claimqueue_fills() {
 
 		{
 			assert_eq!(Scheduler::claimqueue_len(), 5);
-			let scheduled = Scheduler::scheduled_claimqueue();
+			let scheduled: BTreeMap<_, _> = Scheduler::scheduled_entries().collect();
 
 			assert_eq!(
-				scheduled[0],
-				CoreAssignment {
-					core: CoreIndex(0),
-					paras_entry: ParasEntry {
-						assignment: Assignment { para_id: chain_a },
-						availability_timeouts: 0,
-						ttl: 6
-					},
-				}
+				scheduled.get(&CoreIndex(0)).unwrap(),
+				&ParasEntry {
+					assignment: Assignment { para_id: chain_a },
+					availability_timeouts: 0,
+					ttl: 6
+				},
 			);
 			assert_eq!(
-				scheduled[1],
-				CoreAssignment {
-					core: CoreIndex(1),
-					paras_entry: ParasEntry {
-						assignment: Assignment { para_id: chain_b },
-						availability_timeouts: 0,
-						ttl: 6
-					},
-				}
+				scheduled.get(&CoreIndex(1)).unwrap(),
+				&ParasEntry {
+					assignment: Assignment { para_id: chain_b },
+					availability_timeouts: 0,
+					ttl: 6
+				},
 			);
 
 			// Was added a block later, note the TTL.
 			assert_eq!(
-				scheduled[2],
-				CoreAssignment {
-					core: CoreIndex(2),
-					paras_entry: ParasEntry {
-						assignment: Assignment { para_id: thread_a },
-						availability_timeouts: 0,
-						ttl: 7
-					},
-				}
+				scheduled.get(&CoreIndex(2)).unwrap(),
+				&ParasEntry {
+					assignment: Assignment { para_id: thread_a },
+					availability_timeouts: 0,
+					ttl: 7
+				},
 			);
 			// Sits on the same core as `thread_a`
 			assert_eq!(
@@ -528,15 +513,12 @@ fn fill_claimqueue_fills() {
 				})
 			);
 			assert_eq!(
-				scheduled[3],
-				CoreAssignment {
-					core: CoreIndex(3),
-					paras_entry: ParasEntry {
-						assignment: Assignment { para_id: thread_c },
-						availability_timeouts: 0,
-						ttl: 7
-					},
-				}
+				scheduled.get(&CoreIndex(3)).unwrap(),
+				&ParasEntry {
+					assignment: Assignment { para_id: thread_c },
+					availability_timeouts: 0,
+					ttl: 7
+				},
 			);
 		}
 	});
@@ -608,7 +590,7 @@ fn schedule_schedules_including_just_freed() {
 		let mut now = 2;
 		run_to_block(now, |_| None);
 
-		assert_eq!(Scheduler::scheduled_claimqueue().len(), 4);
+		assert_eq!(Scheduler::scheduled_paras().collect::<Vec<_>>().len(), 4);
 
 		// cores 0, 1, 2, and 3 should be occupied. mark them as such.
 		let mut occupied_map: BTreeMap<CoreIndex, ParaId> = BTreeMap::new();
@@ -630,7 +612,7 @@ fn schedule_schedules_including_just_freed() {
 			// core 4 is free
 			assert!(cores[4] == CoreOccupied::Free);
 
-			assert!(Scheduler::scheduled_claimqueue().is_empty());
+			assert!(Scheduler::scheduled_paras().collect::<Vec<_>>().is_empty());
 
 			// All core index entries in the claimqueue should have `None` in them.
 			Scheduler::claimqueue().iter().for_each(|(_core_idx, core_queue)| {
@@ -657,21 +639,18 @@ fn schedule_schedules_including_just_freed() {
 		run_to_block(now, |_| None);
 
 		{
-			let scheduled = Scheduler::scheduled_claimqueue();
+			let scheduled: BTreeMap<_, _> = Scheduler::scheduled_entries().collect();
 
 			// cores 0 and 1 are occupied by lease holding parachains. cores 2 and 3 are occupied by
 			// on-demand parachain claims. core 4 was free.
 			assert_eq!(scheduled.len(), 1);
 			assert_eq!(
-				scheduled[0],
-				CoreAssignment {
-					core: CoreIndex(4),
-					paras_entry: ParasEntry {
-						assignment: Assignment { para_id: thread_b },
-						availability_timeouts: 0,
-						ttl: 8
-					},
-				}
+				scheduled.get(&CoreIndex(4)).unwrap(),
+				&ParasEntry {
+					assignment: Assignment { para_id: thread_b },
+					availability_timeouts: 0,
+					ttl: 8
+				},
 			);
 		}
 
@@ -686,54 +665,42 @@ fn schedule_schedules_including_just_freed() {
 		Scheduler::update_claimqueue(just_updated, now);
 
 		{
-			let scheduled = Scheduler::scheduled_claimqueue();
+			let scheduled: BTreeMap<_, _> = Scheduler::scheduled_entries().collect();
 
 			// 1 thing scheduled before, + 3 cores freed.
 			assert_eq!(scheduled.len(), 4);
 			assert_eq!(
-				scheduled[0],
-				CoreAssignment {
-					core: CoreIndex(0),
-					paras_entry: ParasEntry {
-						assignment: Assignment { para_id: chain_a },
-						availability_timeouts: 0,
-						ttl: 8
-					},
-				}
+				scheduled.get(&CoreIndex(0)).unwrap(),
+				&ParasEntry {
+					assignment: Assignment { para_id: chain_a },
+					availability_timeouts: 0,
+					ttl: 8
+				},
 			);
 			assert_eq!(
-				scheduled[1],
-				CoreAssignment {
-					core: CoreIndex(2),
-					paras_entry: ParasEntry {
-						assignment: Assignment { para_id: thread_d },
-						availability_timeouts: 0,
-						ttl: 8
-					},
-				}
+				scheduled.get(&CoreIndex(2)).unwrap(),
+				&ParasEntry {
+					assignment: Assignment { para_id: thread_d },
+					availability_timeouts: 0,
+					ttl: 8
+				},
 			);
 			// Although C was descheduled, the core `4` was occupied so C goes back to the queue.
 			assert_eq!(
-				scheduled[2],
-				CoreAssignment {
-					core: CoreIndex(3),
-					paras_entry: ParasEntry {
-						assignment: Assignment { para_id: thread_c },
-						availability_timeouts: 1,
-						ttl: 8
-					},
-				}
+				scheduled.get(&CoreIndex(3)).unwrap(),
+				&ParasEntry {
+					assignment: Assignment { para_id: thread_c },
+					availability_timeouts: 1,
+					ttl: 8
+				},
 			);
 			assert_eq!(
-				scheduled[3],
-				CoreAssignment {
-					core: CoreIndex(4),
-					paras_entry: ParasEntry {
-						assignment: Assignment { para_id: thread_b },
-						availability_timeouts: 0,
-						ttl: 8
-					},
-				}
+				scheduled.get(&CoreIndex(4)).unwrap(),
+				&ParasEntry {
+					assignment: Assignment { para_id: thread_b },
+					availability_timeouts: 0,
+					ttl: 8
+				},
 			);
 
 			// The only assignment yet to be popped on to the claim queue is `thread_e`.
@@ -900,14 +867,14 @@ fn schedule_rotates_groups() {
 		run_to_block(now, |_| None);
 
 		let assert_groups_rotated = |rotations: u32, now: &BlockNumberFor<Test>| {
-			let scheduled = Scheduler::scheduled_claimqueue();
+			let scheduled: BTreeMap<_, _> = Scheduler::scheduled_paras().collect();
 			assert_eq!(scheduled.len(), 2);
 			assert_eq!(
-				Scheduler::group_assigned_to_core(scheduled[0].core, *now).unwrap(),
+				Scheduler::group_assigned_to_core(CoreIndex(0), *now).unwrap(),
 				GroupIndex((0u32 + rotations) % on_demand_cores)
 			);
 			assert_eq!(
-				Scheduler::group_assigned_to_core(scheduled[1].core, *now).unwrap(),
+				Scheduler::group_assigned_to_core(CoreIndex(1), *now).unwrap(),
 				GroupIndex((1u32 + rotations) % on_demand_cores)
 			);
 		};
@@ -999,7 +966,7 @@ fn on_demand_claims_are_pruned_after_timing_out() {
 			]
 			.into_iter()
 			.collect();
-			let core_assignments = Scheduler::update_claimqueue(just_updated, now);
+			Scheduler::update_claimqueue(just_updated, now);
 
 			// ParaId a exists in the claim queue until max_retries is reached.
 			if n < max_retries + now {
@@ -1008,13 +975,9 @@ fn on_demand_claims_are_pruned_after_timing_out() {
 				assert!(!claimqueue_contains_para_ids::<Test>(vec![thread_a]));
 			}
 
-			// Occupy the cores based on the output of update_claimqueue.
-			Scheduler::occupied(
-				core_assignments
-					.iter()
-					.map(|core_assignment| (core_assignment.core, core_assignment.para_id()))
-					.collect(),
-			);
+			let core_assignments = Scheduler::scheduled_paras().collect();
+			// Occupy the cores based on the result of update_claimqueue.
+			Scheduler::occupied(core_assignments);
 		}
 
 		// ParaId a does not exist in the claimqueue/availability_cores after
@@ -1054,7 +1017,7 @@ fn on_demand_claims_are_pruned_after_timing_out() {
 				}
 			}
 
-			let core_assignments = Scheduler::update_claimqueue(just_updated, now);
+			Scheduler::update_claimqueue(just_updated, now);
 
 			// ParaId a exists in the claim queue until groups are rotated.
 			if n < 31 {
@@ -1063,13 +1026,9 @@ fn on_demand_claims_are_pruned_after_timing_out() {
 				assert!(!claimqueue_contains_para_ids::<Test>(vec![thread_a]));
 			}
 
-			// Occupy the cores based on the output of update_claimqueue.
-			Scheduler::occupied(
-				core_assignments
-					.iter()
-					.map(|core_assignment| (core_assignment.core, core_assignment.para_id()))
-					.collect(),
-			);
+			let core_assignments = Scheduler::scheduled_paras().collect();
+			// Occupy the cores based on the result of update_claimqueue.
+			Scheduler::occupied(core_assignments);
 		}
 
 		// ParaId a does not exist in the claimqueue/availability_cores after
@@ -1124,33 +1083,25 @@ fn availability_predicate_works() {
 
 		run_to_block(1 + paras_availability_period, |_| None);
 
-		assert!(Scheduler::availability_timeout_predicate().is_none());
+		assert!(!Scheduler::availability_timeout_check_required());
 
 		run_to_block(1 + group_rotation_frequency, |_| None);
 
 		{
-			let pred = Scheduler::availability_timeout_predicate()
-				.expect("predicate exists recently after rotation");
-
 			let now = System::block_number();
-			let would_be_timed_out = now - paras_availability_period;
-			for i in 0..AvailabilityCores::<Test>::get().len() {
-				// returns true for unoccupied cores.
-				// And can time out paras at this stage.
-				assert!(pred(CoreIndex(i as u32), would_be_timed_out));
-			}
+			assert!(Scheduler::availability_timeout_check_required());
+			let pred = Scheduler::availability_timeout_predicate();
+			let last_rotation = Scheduler::group_rotation_info(now).last_rotation_at();
 
-			assert!(!pred(CoreIndex(0), now));
-			assert!(!pred(CoreIndex(1), now));
-			assert!(pred(CoreIndex(2), now));
+			let would_be_timed_out = now - paras_availability_period;
+			let should_not_be_timed_out = last_rotation;
 
-			// check the tight bound.
-			assert!(pred(CoreIndex(0), now - paras_availability_period));
-			assert!(pred(CoreIndex(1), now - paras_availability_period));
+			assert!(pred(would_be_timed_out).timed_out);
+			assert!(!pred(should_not_be_timed_out).timed_out);
+			assert!(!pred(now).timed_out);
 
 			// check the threshold is exact.
-			assert!(!pred(CoreIndex(0), now - paras_availability_period + 1));
-			assert!(!pred(CoreIndex(1), now - paras_availability_period + 1));
+			assert!(!pred(would_be_timed_out + 1).timed_out);
 		}
 
 		run_to_block(1 + group_rotation_frequency + paras_availability_period, |_| None);
diff --git a/polkadot/runtime/parachains/src/session_info.rs b/polkadot/runtime/parachains/src/session_info.rs
index 0043851be0f22ef50cabb1b5f9f9fd51e9b5e188..9e1b3d05842fd7b35f87de5c297958f5f3f36bf3 100644
--- a/polkadot/runtime/parachains/src/session_info.rs
+++ b/polkadot/runtime/parachains/src/session_info.rs
@@ -17,8 +17,9 @@
 //! The session info pallet provides information about validator sets
 //! from prior sessions needed for approvals and disputes.
 //!
-//! See <https://w3f.github.io/parachain-implementers-guide/runtime/session_info.html>.
-
+//! See the documentation on [session info][session-info-page] in the implementers' guide.
+//!
+//! [session-info-page]: https://paritytech.github.io/polkadot-sdk/book/runtime/session_info.html
 use crate::{
 	configuration, paras, scheduler, shared,
 	util::{take_active_subset, take_active_subset_and_inactive},
diff --git a/polkadot/runtime/parachains/src/shared/tests.rs b/polkadot/runtime/parachains/src/shared/tests.rs
index 91891ba8d75bb993474e06aafcc4b452a62b0fe7..ae12b4b3fc16f0d2c60c787aab8d8ce360391a8f 100644
--- a/polkadot/runtime/parachains/src/shared/tests.rs
+++ b/polkadot/runtime/parachains/src/shared/tests.rs
@@ -22,10 +22,7 @@ use crate::{
 use assert_matches::assert_matches;
 use keyring::Sr25519Keyring;
 use primitives::Hash;
-
-fn validator_pubkeys(val_ids: &[Sr25519Keyring]) -> Vec<ValidatorId> {
-	val_ids.iter().map(|v| v.public().into()).collect()
-}
+use test_helpers::validator_pubkeys;
 
 #[test]
 fn tracker_earliest_block_number() {
diff --git a/polkadot/runtime/parachains/src/ump_tests.rs b/polkadot/runtime/parachains/src/ump_tests.rs
index 22aee31043a28714051a8b76a7d077120982951f..e96b5e9689272a40d7977a43b5d3ed961a3926f1 100644
--- a/polkadot/runtime/parachains/src/ump_tests.rs
+++ b/polkadot/runtime/parachains/src/ump_tests.rs
@@ -1,4 +1,4 @@
-// Copyright 2020 Parity Technologies (UK) Ltd.
+// Copyright (C) Parity Technologies (UK) Ltd.
 // This file is part of Polkadot.
 
 // Polkadot is free software: you can redistribute it and/or modify
diff --git a/polkadot/runtime/polkadot/Cargo.toml b/polkadot/runtime/polkadot/Cargo.toml
deleted file mode 100644
index 1d2ce803910ef16f9b6f14bfdc16b09b1080a64e..0000000000000000000000000000000000000000
--- a/polkadot/runtime/polkadot/Cargo.toml
+++ /dev/null
@@ -1,306 +0,0 @@
-[package]
-name = "polkadot-runtime"
-build = "build.rs"
-version.workspace = true
-authors.workspace = true
-edition.workspace = true
-license.workspace = true
-
-[dependencies]
-bitvec = { version = "1.0.0", default-features = false, features = ["alloc"] }
-parity-scale-codec = { version = "3.6.1", default-features = false, features = ["derive", "max-encoded-len"] }
-scale-info = { version = "2.5.0", default-features = false, features = ["derive"] }
-log = { version = "0.4.17", default-features = false }
-rustc-hex = { version = "2.1.0", default-features = false }
-serde = { version = "1.0.163", default-features = false }
-serde_derive = { version = "1.0.117", optional = true }
-static_assertions = "1.1.0"
-smallvec = "1.8.0"
-
-authority-discovery-primitives = { package = "sp-authority-discovery", path = "../../../substrate/primitives/authority-discovery", default-features = false }
-babe-primitives = { package = "sp-consensus-babe", path = "../../../substrate/primitives/consensus/babe", default-features = false }
-beefy-primitives = { package = "sp-consensus-beefy", path = "../../../substrate/primitives/consensus/beefy", default-features = false }
-block-builder-api = { package = "sp-block-builder", path = "../../../substrate/primitives/block-builder", default-features = false }
-inherents = { package = "sp-inherents", path = "../../../substrate/primitives/inherents", default-features = false }
-offchain-primitives = { package = "sp-offchain", path = "../../../substrate/primitives/offchain", default-features = false }
-tx-pool-api = { package = "sp-transaction-pool", path = "../../../substrate/primitives/transaction-pool", default-features = false }
-sp-arithmetic = { path = "../../../substrate/primitives/arithmetic", default-features = false }
-sp-api = { path = "../../../substrate/primitives/api", default-features = false }
-sp-std = { path = "../../../substrate/primitives/std", default-features = false }
-sp-io = { path = "../../../substrate/primitives/io", default-features = false }
-sp-mmr-primitives = { path = "../../../substrate/primitives/merkle-mountain-range", default-features = false }
-sp-runtime = { path = "../../../substrate/primitives/runtime", default-features = false }
-sp-staking = { path = "../../../substrate/primitives/staking", default-features = false }
-sp-core = { path = "../../../substrate/primitives/core", default-features = false }
-sp-session = { path = "../../../substrate/primitives/session", default-features = false }
-sp-storage = { path = "../../../substrate/primitives/storage", default-features = false }
-sp-version = { path = "../../../substrate/primitives/version", default-features = false }
-sp-npos-elections = { path = "../../../substrate/primitives/npos-elections", default-features = false }
-
-pallet-authority-discovery = { path = "../../../substrate/frame/authority-discovery", default-features = false }
-pallet-authorship = { path = "../../../substrate/frame/authorship", default-features = false }
-pallet-babe = { path = "../../../substrate/frame/babe", default-features = false }
-pallet-bags-list = { path = "../../../substrate/frame/bags-list", default-features = false }
-pallet-balances = { path = "../../../substrate/frame/balances", default-features = false }
-pallet-bounties = { path = "../../../substrate/frame/bounties", default-features = false }
-pallet-child-bounties = { path = "../../../substrate/frame/child-bounties", default-features = false }
-pallet-transaction-payment = { path = "../../../substrate/frame/transaction-payment", default-features = false }
-pallet-transaction-payment-rpc-runtime-api = { path = "../../../substrate/frame/transaction-payment/rpc/runtime-api", default-features = false }
-pallet-collective = { path = "../../../substrate/frame/collective", default-features = false }
-pallet-conviction-voting = { path = "../../../substrate/frame/conviction-voting", default-features = false }
-pallet-democracy = { path = "../../../substrate/frame/democracy", default-features = false }
-pallet-elections-phragmen = { path = "../../../substrate/frame/elections-phragmen", default-features = false }
-pallet-election-provider-multi-phase = { path = "../../../substrate/frame/election-provider-multi-phase", default-features = false }
-pallet-fast-unstake = { path = "../../../substrate/frame/fast-unstake", default-features = false }
-frame-executive = { path = "../../../substrate/frame/executive", default-features = false }
-pallet-grandpa = { path = "../../../substrate/frame/grandpa", default-features = false }
-pallet-identity = { path = "../../../substrate/frame/identity", default-features = false }
-pallet-im-online = { path = "../../../substrate/frame/im-online", default-features = false }
-pallet-indices = { path = "../../../substrate/frame/indices", default-features = false }
-pallet-membership = { path = "../../../substrate/frame/membership", default-features = false }
-pallet-message-queue = { path = "../../../substrate/frame/message-queue", default-features = false }
-pallet-multisig = { path = "../../../substrate/frame/multisig", default-features = false }
-pallet-nomination-pools = { path = "../../../substrate/frame/nomination-pools", default-features = false }
-pallet-nomination-pools-runtime-api = { path = "../../../substrate/frame/nomination-pools/runtime-api", default-features = false }
-pallet-offences = { path = "../../../substrate/frame/offences", default-features = false }
-pallet-preimage = { path = "../../../substrate/frame/preimage", default-features = false }
-pallet-proxy = { path = "../../../substrate/frame/proxy", default-features = false }
-pallet-referenda = { path = "../../../substrate/frame/referenda", default-features = false }
-pallet-scheduler = { path = "../../../substrate/frame/scheduler", default-features = false }
-pallet-session = { path = "../../../substrate/frame/session", default-features = false }
-frame-support = { path = "../../../substrate/frame/support", default-features = false }
-pallet-staking = { path = "../../../substrate/frame/staking", default-features = false }
-pallet-staking-reward-curve = { path = "../../../substrate/frame/staking/reward-curve" }
-pallet-staking-runtime-api = { path = "../../../substrate/frame/staking/runtime-api", default-features = false }
-frame-system = { path = "../../../substrate/frame/system", default-features = false }
-frame-system-rpc-runtime-api = { path = "../../../substrate/frame/system/rpc/runtime-api", default-features = false }
-polkadot-runtime-constants = { package = "polkadot-runtime-constants", path = "constants", default-features = false }
-pallet-timestamp = { path = "../../../substrate/frame/timestamp", default-features = false }
-pallet-tips = { path = "../../../substrate/frame/tips", default-features = false }
-pallet-treasury = { path = "../../../substrate/frame/treasury", default-features = false }
-pallet-whitelist = { path = "../../../substrate/frame/whitelist", default-features = false }
-pallet-vesting = { path = "../../../substrate/frame/vesting", default-features = false }
-pallet-utility = { path = "../../../substrate/frame/utility", default-features = false }
-frame-election-provider-support = { path = "../../../substrate/frame/election-provider-support", default-features = false }
-pallet-xcm = { path = "../../xcm/pallet-xcm", default-features = false, features=["experimental"] }
-pallet-xcm-benchmarks = { path = "../../xcm/pallet-xcm-benchmarks", default-features = false, optional = true }
-
-frame-benchmarking = { path = "../../../substrate/frame/benchmarking", default-features = false, optional = true }
-frame-try-runtime = { path = "../../../substrate/frame/try-runtime", default-features = false, optional = true }
-frame-system-benchmarking = { path = "../../../substrate/frame/system/benchmarking", default-features = false, optional = true }
-pallet-election-provider-support-benchmarking = { path = "../../../substrate/frame/election-provider-support/benchmarking", default-features = false, optional = true }
-pallet-offences-benchmarking = { path = "../../../substrate/frame/offences/benchmarking", default-features = false, optional = true }
-pallet-session-benchmarking = { path = "../../../substrate/frame/session/benchmarking", default-features = false, optional = true }
-pallet-nomination-pools-benchmarking = { path = "../../../substrate/frame/nomination-pools/benchmarking", default-features = false, optional = true }
-hex-literal = { version = "0.4.1", optional = true }
-
-runtime-common = { package = "polkadot-runtime-common", path = "../common", default-features = false }
-runtime-parachains = { package = "polkadot-runtime-parachains", path = "../parachains", default-features = false }
-primitives = { package = "polkadot-primitives", path = "../../primitives", default-features = false }
-
-xcm = { package = "xcm", path = "../../xcm", default-features = false }
-xcm-executor = { package = "xcm-executor", path = "../../xcm/xcm-executor", default-features = false }
-xcm-builder = { package = "xcm-builder", path = "../../xcm/xcm-builder", default-features = false }
-
-[dev-dependencies]
-hex-literal = "0.4.1"
-tiny-keccak = { version = "2.0.2", features = ["keccak"] }
-keyring = { package = "sp-keyring", path = "../../../substrate/primitives/keyring" }
-sp-trie = { path = "../../../substrate/primitives/trie" }
-serde_json = "1.0.96"
-separator = "0.4.1"
-remote-externalities = { package = "frame-remote-externalities" , path = "../../../substrate/utils/frame/remote-externalities" }
-tokio = { version = "1.24.2", features = ["macros"] }
-sp-tracing = { path = "../../../substrate/primitives/tracing", default-features = false }
-
-[build-dependencies]
-substrate-wasm-builder = { path = "../../../substrate/utils/wasm-builder" }
-
-[features]
-default = [ "std" ]
-no_std = []
-only-staking = []
-std = [
-	"authority-discovery-primitives/std",
-	"babe-primitives/std",
-	"beefy-primitives/std",
-	"bitvec/std",
-	"block-builder-api/std",
-	"frame-election-provider-support/std",
-	"frame-executive/std",
-	"frame-support/std",
-	"frame-system-rpc-runtime-api/std",
-	"frame-system/std",
-	"frame-try-runtime/std",
-	"inherents/std",
-	"log/std",
-	"offchain-primitives/std",
-	"pallet-authority-discovery/std",
-	"pallet-authorship/std",
-	"pallet-babe/std",
-	"pallet-bags-list/std",
-	"pallet-balances/std",
-	"pallet-bounties/std",
-	"pallet-child-bounties/std",
-	"pallet-collective/std",
-	"pallet-conviction-voting/std",
-	"pallet-democracy/std",
-	"pallet-election-provider-multi-phase/std",
-	"pallet-elections-phragmen/std",
-	"pallet-fast-unstake/std",
-	"pallet-grandpa/std",
-	"pallet-identity/std",
-	"pallet-im-online/std",
-	"pallet-indices/std",
-	"pallet-membership/std",
-	"pallet-message-queue/std",
-	"pallet-multisig/std",
-	"pallet-nomination-pools-runtime-api/std",
-	"pallet-nomination-pools/std",
-	"pallet-offences/std",
-	"pallet-preimage/std",
-	"pallet-proxy/std",
-	"pallet-referenda/std",
-	"pallet-scheduler/std",
-	"pallet-session/std",
-	"pallet-staking-runtime-api/std",
-	"pallet-staking/std",
-	"pallet-timestamp/std",
-	"pallet-tips/std",
-	"pallet-transaction-payment-rpc-runtime-api/std",
-	"pallet-transaction-payment/std",
-	"pallet-treasury/std",
-	"pallet-utility/std",
-	"pallet-vesting/std",
-	"pallet-whitelist/std",
-	"pallet-xcm/std",
-	"parity-scale-codec/std",
-	"polkadot-runtime-constants/std",
-	"primitives/std",
-	"runtime-common/std",
-	"rustc-hex/std",
-	"scale-info/std",
-	"serde/std",
-	"serde_derive",
-	"sp-api/std",
-	"sp-arithmetic/std",
-	"sp-arithmetic/std",
-	"sp-core/std",
-	"sp-mmr-primitives/std",
-	"sp-npos-elections/std",
-	"sp-runtime/std",
-	"sp-session/std",
-	"sp-staking/std",
-	"sp-std/std",
-	"sp-version/std",
-	"tx-pool-api/std",
-	"xcm-builder/std",
-	"xcm-executor/std",
-	"xcm/std",
-]
-runtime-benchmarks = [
-	"frame-benchmarking/runtime-benchmarks",
-	"frame-election-provider-support/runtime-benchmarks",
-	"frame-support/runtime-benchmarks",
-	"frame-system-benchmarking/runtime-benchmarks",
-	"frame-system/runtime-benchmarks",
-	"hex-literal",
-	"pallet-babe/runtime-benchmarks",
-	"pallet-bags-list/runtime-benchmarks",
-	"pallet-balances/runtime-benchmarks",
-	"pallet-bounties/runtime-benchmarks",
-	"pallet-child-bounties/runtime-benchmarks",
-	"pallet-collective/runtime-benchmarks",
-	"pallet-conviction-voting/runtime-benchmarks",
-	"pallet-democracy/runtime-benchmarks",
-	"pallet-election-provider-multi-phase/runtime-benchmarks",
-	"pallet-election-provider-support-benchmarking/runtime-benchmarks",
-	"pallet-elections-phragmen/runtime-benchmarks",
-	"pallet-fast-unstake/runtime-benchmarks",
-	"pallet-grandpa/runtime-benchmarks",
-	"pallet-identity/runtime-benchmarks",
-	"pallet-im-online/runtime-benchmarks",
-	"pallet-indices/runtime-benchmarks",
-	"pallet-membership/runtime-benchmarks",
-	"pallet-message-queue/runtime-benchmarks",
-	"pallet-multisig/runtime-benchmarks",
-	"pallet-nomination-pools-benchmarking/runtime-benchmarks",
-	"pallet-nomination-pools/runtime-benchmarks",
-	"pallet-offences-benchmarking/runtime-benchmarks",
-	"pallet-preimage/runtime-benchmarks",
-	"pallet-proxy/runtime-benchmarks",
-	"pallet-referenda/runtime-benchmarks",
-	"pallet-scheduler/runtime-benchmarks",
-	"pallet-session-benchmarking/runtime-benchmarks",
-	"pallet-staking/runtime-benchmarks",
-	"pallet-timestamp/runtime-benchmarks",
-	"pallet-tips/runtime-benchmarks",
-	"pallet-treasury/runtime-benchmarks",
-	"pallet-utility/runtime-benchmarks",
-	"pallet-vesting/runtime-benchmarks",
-	"pallet-whitelist/runtime-benchmarks",
-	"pallet-xcm-benchmarks/runtime-benchmarks",
-	"pallet-xcm/runtime-benchmarks",
-	"runtime-common/runtime-benchmarks",
-	"runtime-parachains/runtime-benchmarks",
-	"sp-runtime/runtime-benchmarks",
-	"xcm-builder/runtime-benchmarks",
-]
-try-runtime = [
-	"frame-executive/try-runtime",
-	"frame-system/try-runtime",
-	"frame-try-runtime",
-	"pallet-authority-discovery/try-runtime",
-	"pallet-authorship/try-runtime",
-	"pallet-babe/try-runtime",
-	"pallet-bags-list/try-runtime",
-	"pallet-balances/try-runtime",
-	"pallet-bounties/try-runtime",
-	"pallet-child-bounties/try-runtime",
-	"pallet-collective/try-runtime",
-	"pallet-conviction-voting/try-runtime",
-	"pallet-democracy/try-runtime",
-	"pallet-election-provider-multi-phase/try-runtime",
-	"pallet-elections-phragmen/try-runtime",
-	"pallet-fast-unstake/try-runtime",
-	"pallet-grandpa/try-runtime",
-	"pallet-identity/try-runtime",
-	"pallet-im-online/try-runtime",
-	"pallet-indices/try-runtime",
-	"pallet-membership/try-runtime",
-	"pallet-message-queue/try-runtime",
-	"pallet-multisig/try-runtime",
-	"pallet-nomination-pools/try-runtime",
-	"pallet-offences/try-runtime",
-	"pallet-preimage/try-runtime",
-	"pallet-proxy/try-runtime",
-	"pallet-referenda/try-runtime",
-	"pallet-scheduler/try-runtime",
-	"pallet-session/try-runtime",
-	"pallet-staking/try-runtime",
-	"pallet-timestamp/try-runtime",
-	"pallet-tips/try-runtime",
-	"pallet-transaction-payment/try-runtime",
-	"pallet-treasury/try-runtime",
-	"pallet-utility/try-runtime",
-	"pallet-vesting/try-runtime",
-	"pallet-whitelist/try-runtime",
-	"pallet-xcm/try-runtime",
-	"runtime-common/try-runtime",
-]
-# When enabled, the runtime API will not be build.
-#
-# This is required by Cumulus to access certain types of the
-# runtime without clashing with the runtime API exported functions
-# in WASM.
-disable-runtime-api = []
-
-# A feature that should be enabled when the runtime should be build for on-chain
-# deployment. This will disable stuff that shouldn't be part of the on-chain wasm
-# to make it smaller like logging for example.
-on-chain-release-build = [ "sp-api/disable-logging" ]
-
-# Set timing constants (e.g. session period) to faster versions to speed up testing.
-fast-runtime = []
-
-runtime-metrics = [ "runtime-parachains/runtime-metrics", "sp-io/with-tracing" ]
diff --git a/polkadot/runtime/polkadot/README.adoc b/polkadot/runtime/polkadot/README.adoc
deleted file mode 100644
index 33373310819f975270260a27e94907dcca9498bb..0000000000000000000000000000000000000000
--- a/polkadot/runtime/polkadot/README.adoc
+++ /dev/null
@@ -1,5 +0,0 @@
-
-= Polkadot Runtime
-
-placeholder
-//TODO Write content :) (https://github.com/paritytech/polkadot/issues/159)
diff --git a/polkadot/runtime/polkadot/build.rs b/polkadot/runtime/polkadot/build.rs
deleted file mode 100644
index 428c971bc132a5c7e856e6485246c4fd2ff57822..0000000000000000000000000000000000000000
--- a/polkadot/runtime/polkadot/build.rs
+++ /dev/null
@@ -1,25 +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.
-
-// Substrate 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/>.
-
-use substrate_wasm_builder::WasmBuilder;
-
-fn main() {
-	WasmBuilder::new()
-		.with_current_project()
-		.import_memory()
-		.export_heap_base()
-		.build()
-}
diff --git a/polkadot/runtime/polkadot/constants/Cargo.toml b/polkadot/runtime/polkadot/constants/Cargo.toml
deleted file mode 100644
index 2b7f8ccacebbd064736a43c047409d85ec6490e6..0000000000000000000000000000000000000000
--- a/polkadot/runtime/polkadot/constants/Cargo.toml
+++ /dev/null
@@ -1,27 +0,0 @@
-[package]
-name = "polkadot-runtime-constants"
-version.workspace = true
-authors.workspace = true
-edition.workspace = true
-license.workspace = true
-
-[dependencies]
-smallvec = "1.8.0"
-
-frame-support = { path = "../../../../substrate/frame/support", default-features = false }
-primitives = { package = "polkadot-primitives", path = "../../../primitives", default-features = false }
-runtime-common = { package = "polkadot-runtime-common", path = "../../common", default-features = false }
-sp-runtime = { path = "../../../../substrate/primitives/runtime", default-features = false }
-sp-weights = { path = "../../../../substrate/primitives/weights", default-features = false }
-sp-core = { path = "../../../../substrate/primitives/core", default-features = false }
-
-[features]
-default = [ "std" ]
-std = [
-	"frame-support/std",
-	"primitives/std",
-	"runtime-common/std",
-	"sp-core/std",
-	"sp-runtime/std",
-	"sp-weights/std",
-]
diff --git a/polkadot/runtime/polkadot/constants/src/lib.rs b/polkadot/runtime/polkadot/constants/src/lib.rs
deleted file mode 100644
index 304d86d1dd7c572531006d76c9aab844daa19a62..0000000000000000000000000000000000000000
--- a/polkadot/runtime/polkadot/constants/src/lib.rs
+++ /dev/null
@@ -1,150 +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/>.
-
-#![cfg_attr(not(feature = "std"), no_std)]
-
-pub mod weights;
-
-pub use self::currency::DOLLARS;
-
-/// Money matters.
-pub mod currency {
-	use primitives::Balance;
-
-	/// The existential deposit.
-	pub const EXISTENTIAL_DEPOSIT: Balance = 100 * CENTS;
-
-	pub const UNITS: Balance = 10_000_000_000;
-	pub const DOLLARS: Balance = UNITS; // 10_000_000_000
-	pub const GRAND: Balance = DOLLARS * 1_000; // 10_000_000_000_000
-	pub const CENTS: Balance = DOLLARS / 100; // 100_000_000
-	pub const MILLICENTS: Balance = CENTS / 1_000; // 100_000
-
-	pub const fn deposit(items: u32, bytes: u32) -> Balance {
-		items as Balance * 20 * DOLLARS + (bytes as Balance) * 100 * MILLICENTS
-	}
-}
-
-/// Time and blocks.
-pub mod time {
-	use primitives::{BlockNumber, Moment};
-	use runtime_common::prod_or_fast;
-	pub const MILLISECS_PER_BLOCK: Moment = 6000;
-	pub const SLOT_DURATION: Moment = MILLISECS_PER_BLOCK;
-	pub const EPOCH_DURATION_IN_SLOTS: BlockNumber = prod_or_fast!(4 * HOURS, 1 * MINUTES);
-
-	// These time units are defined in number of blocks.
-	pub const MINUTES: BlockNumber = 60_000 / (MILLISECS_PER_BLOCK as BlockNumber);
-	pub const HOURS: BlockNumber = MINUTES * 60;
-	pub const DAYS: BlockNumber = HOURS * 24;
-	pub const WEEKS: BlockNumber = DAYS * 7;
-
-	// 1 in 4 blocks (on average, not counting collisions) will be primary babe blocks.
-	// The choice of is done in accordance to the slot duration and expected target
-	// block time, for safely resisting network delays of maximum two seconds.
-	// <https://research.web3.foundation/en/latest/polkadot/BABE/Babe/#6-practical-results>
-	pub const PRIMARY_PROBABILITY: (u64, u64) = (1, 4);
-}
-
-/// Fee-related.
-pub mod fee {
-	use crate::weights::ExtrinsicBaseWeight;
-	use frame_support::weights::{
-		WeightToFeeCoefficient, WeightToFeeCoefficients, WeightToFeePolynomial,
-	};
-	use primitives::Balance;
-	use smallvec::smallvec;
-	pub use sp_runtime::Perbill;
-
-	/// The block saturation level. Fees will be updates based on this value.
-	pub const TARGET_BLOCK_FULLNESS: Perbill = Perbill::from_percent(25);
-
-	/// Handles converting a weight scalar to a fee value, based on the scale and granularity of the
-	/// node's balance type.
-	///
-	/// This should typically create a mapping between the following ranges:
-	///   - [0, `MAXIMUM_BLOCK_WEIGHT`]
-	///   - [Balance::min, Balance::max]
-	///
-	/// Yet, it can be used for any other sort of change to weight-fee. Some examples being:
-	///   - Setting it to `0` will essentially disable the weight fee.
-	///   - Setting it to `1` will cause the literal `#[weight = x]` values to be charged.
-	pub struct WeightToFee;
-	impl WeightToFeePolynomial for WeightToFee {
-		type Balance = Balance;
-		fn polynomial() -> WeightToFeeCoefficients<Self::Balance> {
-			// in Polkadot, extrinsic base weight (smallest non-zero weight) is mapped to 1/10 CENT:
-			let p = super::currency::CENTS;
-			let q = 10 * Balance::from(ExtrinsicBaseWeight::get().ref_time());
-			smallvec![WeightToFeeCoefficient {
-				degree: 1,
-				negative: false,
-				coeff_frac: Perbill::from_rational(p % q, q),
-				coeff_integer: p / q,
-			}]
-		}
-	}
-}
-
-/// XCM protocol related constants.
-pub mod xcm {
-	/// Pluralistic bodies existing within the consensus.
-	pub mod body {
-		// Preallocated for the Root body.
-		#[allow(dead_code)]
-		const ROOT_INDEX: u32 = 0;
-		// The bodies corresponding to the Polkadot OpenGov Origins.
-		pub const FELLOWSHIP_ADMIN_INDEX: u32 = 1;
-	}
-}
-
-/// System Parachains.
-pub mod system_parachain {
-	/// Statemint parachain ID.
-	pub const STATEMINT_ID: u32 = 1000;
-	/// Collectives parachain ID.
-	pub const COLLECTIVES_ID: u32 = 1001;
-}
-
-#[cfg(test)]
-mod tests {
-	use super::{
-		currency::{CENTS, DOLLARS, MILLICENTS},
-		fee::WeightToFee,
-	};
-	use crate::weights::ExtrinsicBaseWeight;
-	use frame_support::weights::WeightToFee as WeightToFeeT;
-	use runtime_common::MAXIMUM_BLOCK_WEIGHT;
-
-	#[test]
-	// Test that the fee for `MAXIMUM_BLOCK_WEIGHT` of weight has sane bounds.
-	fn full_block_fee_is_correct() {
-		// A full block should cost between 10 and 100 DOLLARS.
-		let full_block = WeightToFee::weight_to_fee(&MAXIMUM_BLOCK_WEIGHT);
-		assert!(full_block >= 10 * DOLLARS);
-		assert!(full_block <= 100 * DOLLARS);
-	}
-
-	#[test]
-	// This function tests that the fee for `ExtrinsicBaseWeight` of weight is correct
-	fn extrinsic_base_fee_is_correct() {
-		// `ExtrinsicBaseWeight` should cost 1/10 of a CENT
-		println!("Base: {}", ExtrinsicBaseWeight::get());
-		let x = WeightToFee::weight_to_fee(&ExtrinsicBaseWeight::get());
-		let y = CENTS / 10;
-		assert!(x.max(y) - x.min(y) < MILLICENTS);
-	}
-}
diff --git a/polkadot/runtime/polkadot/constants/src/weights/block_weights.rs b/polkadot/runtime/polkadot/constants/src/weights/block_weights.rs
deleted file mode 100644
index 9608fd534069de346bf98e95b46e6f1c5170d025..0000000000000000000000000000000000000000
--- a/polkadot/runtime/polkadot/constants/src/weights/block_weights.rs
+++ /dev/null
@@ -1,81 +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/>.
-
-//! THIS FILE WAS AUTO-GENERATED USING THE SUBSTRATE BENCHMARK CLI VERSION 4.0.0-dev
-//! DATE: 2023-06-18 (Y/M/D)
-//! HOSTNAME: `runner-e8ezs4ez-project-163-concurrent-0`, CPU: `Intel(R) Xeon(R) CPU @ 2.60GHz`
-//!
-//! SHORT-NAME: `block`, LONG-NAME: `BlockExecution`, RUNTIME: `Development`
-//! WARMUPS: `10`, REPEAT: `100`
-//! WEIGHT-PATH: `runtime/polkadot/constants/src/weights/`
-//! WEIGHT-METRIC: `Average`, WEIGHT-MUL: `1.0`, WEIGHT-ADD: `0`
-
-// Executed Command:
-//   ./target/production/polkadot
-//   benchmark
-//   overhead
-//   --chain=polkadot-dev
-//   --execution=wasm
-//   --wasm-execution=compiled
-//   --weight-path=runtime/polkadot/constants/src/weights/
-//   --warmup=10
-//   --repeat=100
-//   --header=./file_header.txt
-
-use sp_core::parameter_types;
-use sp_weights::{constants::WEIGHT_REF_TIME_PER_NANOS, Weight};
-
-parameter_types! {
-	/// Time to execute an empty block.
-	/// Calculated by multiplying the *Average* with `1.0` and adding `0`.
-	///
-	/// Stats nanoseconds:
-	///   Min, Max: 13_546_462, 14_258_156
-	///   Average:  13_806_190
-	///   Median:   13_798_575
-	///   Std-Dev:  141568.11
-	///
-	/// Percentiles nanoseconds:
-	///   99th: 14_144_016
-	///   95th: 14_039_432
-	///   75th: 13_904_965
-	pub const BlockExecutionWeight: Weight =
-		Weight::from_parts(WEIGHT_REF_TIME_PER_NANOS.saturating_mul(13_806_190), 0);
-}
-
-#[cfg(test)]
-mod test_weights {
-	use sp_weights::constants;
-
-	/// Checks that the weight exists and is sane.
-	// NOTE: If this test fails but you are sure that the generated values are fine,
-	// you can delete it.
-	#[test]
-	fn sane() {
-		let w = super::BlockExecutionWeight::get();
-
-		// At least 100 µs.
-		assert!(
-			w.ref_time() >= 100u64 * constants::WEIGHT_REF_TIME_PER_MICROS,
-			"Weight should be at least 100 µs."
-		);
-		// At most 50 ms.
-		assert!(
-			w.ref_time() <= 50u64 * constants::WEIGHT_REF_TIME_PER_MILLIS,
-			"Weight should be at most 50 ms."
-		);
-	}
-}
diff --git a/polkadot/runtime/polkadot/constants/src/weights/extrinsic_weights.rs b/polkadot/runtime/polkadot/constants/src/weights/extrinsic_weights.rs
deleted file mode 100644
index fac87924821f5d98b9c552f016935b45617adfb8..0000000000000000000000000000000000000000
--- a/polkadot/runtime/polkadot/constants/src/weights/extrinsic_weights.rs
+++ /dev/null
@@ -1,81 +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/>.
-
-//! THIS FILE WAS AUTO-GENERATED USING THE SUBSTRATE BENCHMARK CLI VERSION 4.0.0-dev
-//! DATE: 2023-06-18 (Y/M/D)
-//! HOSTNAME: `runner-e8ezs4ez-project-163-concurrent-0`, CPU: `Intel(R) Xeon(R) CPU @ 2.60GHz`
-//!
-//! SHORT-NAME: `extrinsic`, LONG-NAME: `ExtrinsicBase`, RUNTIME: `Development`
-//! WARMUPS: `10`, REPEAT: `100`
-//! WEIGHT-PATH: `runtime/polkadot/constants/src/weights/`
-//! WEIGHT-METRIC: `Average`, WEIGHT-MUL: `1.0`, WEIGHT-ADD: `0`
-
-// Executed Command:
-//   ./target/production/polkadot
-//   benchmark
-//   overhead
-//   --chain=polkadot-dev
-//   --execution=wasm
-//   --wasm-execution=compiled
-//   --weight-path=runtime/polkadot/constants/src/weights/
-//   --warmup=10
-//   --repeat=100
-//   --header=./file_header.txt
-
-use sp_core::parameter_types;
-use sp_weights::{constants::WEIGHT_REF_TIME_PER_NANOS, Weight};
-
-parameter_types! {
-	/// Time to execute a NO-OP extrinsic, for example `System::remark`.
-	/// Calculated by multiplying the *Average* with `1.0` and adding `0`.
-	///
-	/// Stats nanoseconds:
-	///   Min, Max: 125_467, 127_402
-	///   Average:  126_045
-	///   Median:   126_039
-	///   Std-Dev:  310.96
-	///
-	/// Percentiles nanoseconds:
-	///   99th: 126_699
-	///   95th: 126_620
-	///   75th: 126_207
-	pub const ExtrinsicBaseWeight: Weight =
-		Weight::from_parts(WEIGHT_REF_TIME_PER_NANOS.saturating_mul(126_045), 0);
-}
-
-#[cfg(test)]
-mod test_weights {
-	use sp_weights::constants;
-
-	/// Checks that the weight exists and is sane.
-	// NOTE: If this test fails but you are sure that the generated values are fine,
-	// you can delete it.
-	#[test]
-	fn sane() {
-		let w = super::ExtrinsicBaseWeight::get();
-
-		// At least 10 µs.
-		assert!(
-			w.ref_time() >= 10u64 * constants::WEIGHT_REF_TIME_PER_MICROS,
-			"Weight should be at least 10 µs."
-		);
-		// At most 1 ms.
-		assert!(
-			w.ref_time() <= constants::WEIGHT_REF_TIME_PER_MILLIS,
-			"Weight should be at most 1 ms."
-		);
-	}
-}
diff --git a/polkadot/runtime/polkadot/constants/src/weights/paritydb_weights.rs b/polkadot/runtime/polkadot/constants/src/weights/paritydb_weights.rs
deleted file mode 100644
index ae7bedc394f8cd485de9ee72064f351d787450e3..0000000000000000000000000000000000000000
--- a/polkadot/runtime/polkadot/constants/src/weights/paritydb_weights.rs
+++ /dev/null
@@ -1,109 +0,0 @@
-// 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.
-
-//! THIS FILE WAS AUTO-GENERATED USING THE SUBSTRATE BENCHMARK CLI VERSION 4.0.0-dev
-//! DATE: 2022-03-30 (Y/M/D)
-//!
-//! DATABASE: `ParityDb`, RUNTIME: `Polkadot`
-//! BLOCK-NUM: `BlockId::Number(9653477)`
-//! SKIP-WRITE: `false`, SKIP-READ: `false`, WARMUPS: `1`
-//! STATE-VERSION: `V0`, STATE-CACHE-SIZE: `0`
-//! WEIGHT-PATH: `runtime/polkadot/constants/src/weights/`
-//! METRIC: `Average`, WEIGHT-MUL: `1.1`, WEIGHT-ADD: `0`
-
-// Executed Command:
-//   ./target/production/polkadot
-//   benchmark-storage
-//   --db=paritydb
-//   --state-version=0
-//   --mul=1.1
-//   --weight-path=runtime/polkadot/constants/src/weights/
-
-/// Storage DB weights for the `Polkadot` runtime and `ParityDb`.
-pub mod constants {
-	use frame_support::{
-		parameter_types,
-		weights::{constants, RuntimeDbWeight},
-	};
-
-	parameter_types! {
-		/// `ParityDB` can be enabled with a feature flag, but is still experimental. These weights
-		/// are available for brave runtime engineers who may want to try this out as default.
-		pub const ParityDbWeight: RuntimeDbWeight = RuntimeDbWeight {
-			/// Time to read one storage item.
-			/// Calculated by multiplying the *Average* of all values with `1.1` and adding `0`.
-			///
-			/// Stats [NS]:
-			///   Min, Max: 4_611, 13_478_005
-			///   Average:  10_750
-			///   Median:   10_655
-			///   Std-Dev:  12214.49
-			///
-			/// Percentiles [NS]:
-			///   99th: 14_451
-			///   95th: 12_588
-			///   75th: 11_200
-			read: 11_826 * constants::WEIGHT_REF_TIME_PER_NANOS,
-
-			/// Time to write one storage item.
-			/// Calculated by multiplying the *Average* of all values with `1.1` and adding `0`.
-			///
-			/// Stats [NS]:
-			///   Min, Max: 8_023, 47_367_740
-			///   Average:  34_592
-			///   Median:   32_703
-			///   Std-Dev:  49417.24
-			///
-			/// Percentiles [NS]:
-			///   99th: 69_379
-			///   95th: 47_168
-			///   75th: 35_252
-			write: 38_052 * constants::WEIGHT_REF_TIME_PER_NANOS,
-		};
-	}
-
-	#[cfg(test)]
-	mod test_db_weights {
-		use super::constants::ParityDbWeight as W;
-		use frame_support::weights::constants;
-
-		/// Checks that all weights exist and have sane values.
-		// NOTE: If this test fails but you are sure that the generated values are fine,
-		// you can delete it.
-		#[test]
-		fn bound() {
-			// At least 1 µs.
-			assert!(
-				W::get().reads(1).ref_time() >= constants::WEIGHT_REF_TIME_PER_MICROS,
-				"Read weight should be at least 1 µs."
-			);
-			assert!(
-				W::get().writes(1).ref_time() >= constants::WEIGHT_REF_TIME_PER_MICROS,
-				"Write weight should be at least 1 µs."
-			);
-			// At most 1 ms.
-			assert!(
-				W::get().reads(1).ref_time() <= constants::WEIGHT_REF_TIME_PER_MILLIS,
-				"Read weight should be at most 1 ms."
-			);
-			assert!(
-				W::get().writes(1).ref_time() <= constants::WEIGHT_REF_TIME_PER_MILLIS,
-				"Write weight should be at most 1 ms."
-			);
-		}
-	}
-}
diff --git a/polkadot/runtime/polkadot/constants/src/weights/rocksdb_weights.rs b/polkadot/runtime/polkadot/constants/src/weights/rocksdb_weights.rs
deleted file mode 100644
index 029f892b01dc247c7906f90441b63e6da5903297..0000000000000000000000000000000000000000
--- a/polkadot/runtime/polkadot/constants/src/weights/rocksdb_weights.rs
+++ /dev/null
@@ -1,108 +0,0 @@
-// 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.
-
-//! THIS FILE WAS AUTO-GENERATED USING THE SUBSTRATE BENCHMARK CLI VERSION 4.0.0-dev
-//! DATE: 2022-03-29 (Y/M/D)
-//!
-//! DATABASE: `RocksDb`, RUNTIME: `Polkadot`
-//! BLOCK-NUM: `BlockId::Number(9643856)`
-//! SKIP-WRITE: `false`, SKIP-READ: `false`, WARMUPS: `1`
-//! STATE-VERSION: `V0`, STATE-CACHE-SIZE: `0`
-//! WEIGHT-PATH: `runtime/polkadot/constants/src/weights/`
-//! METRIC: `Average`, WEIGHT-MUL: `1.1`, WEIGHT-ADD: `0`
-
-// Executed Command:
-//   ./target/production/polkadot
-//   benchmark-storage
-//   --state-version=0
-//   --mul=1.1
-//   --weight-path=runtime/polkadot/constants/src/weights/
-
-/// Storage DB weights for the `Polkadot` runtime and `RocksDb`.
-pub mod constants {
-	use frame_support::{
-		parameter_types,
-		weights::{constants, RuntimeDbWeight},
-	};
-
-	parameter_types! {
-		/// By default, Substrate uses `RocksDB`, so this will be the weight used throughout
-		/// the runtime.
-		pub const RocksDbWeight: RuntimeDbWeight = RuntimeDbWeight {
-			/// Time to read one storage item.
-			/// Calculated by multiplying the *Average* of all values with `1.1` and adding `0`.
-			///
-			/// Stats [NS]:
-			///   Min, Max: 5_015, 1_441_022
-			///   Average:  18_635
-			///   Median:   17_795
-			///   Std-Dev:  4829.75
-			///
-			/// Percentiles [NS]:
-			///   99th: 32_074
-			///   95th: 26_658
-			///   75th: 19_363
-			read: 20_499 * constants::WEIGHT_REF_TIME_PER_NANOS,
-
-			/// Time to write one storage item.
-			/// Calculated by multiplying the *Average* of all values with `1.1` and adding `0`.
-			///
-			/// Stats [NS]:
-			///   Min, Max: 16_368, 34_500_937
-			///   Average:  75_882
-			///   Median:   74_236
-			///   Std-Dev:  64706.41
-			///
-			/// Percentiles [NS]:
-			///   99th: 111_151
-			///   95th: 92_666
-			///   75th: 80_297
-			write: 83_471 * constants::WEIGHT_REF_TIME_PER_NANOS,
-		};
-	}
-
-	#[cfg(test)]
-	mod test_db_weights {
-		use super::constants::RocksDbWeight as W;
-		use frame_support::weights::constants;
-
-		/// Checks that all weights exist and have sane values.
-		// NOTE: If this test fails but you are sure that the generated values are fine,
-		// you can delete it.
-		#[test]
-		fn bound() {
-			// At least 1 µs.
-			assert!(
-				W::get().reads(1).ref_time() >= constants::WEIGHT_REF_TIME_PER_MICROS,
-				"Read weight should be at least 1 µs."
-			);
-			assert!(
-				W::get().writes(1).ref_time() >= constants::WEIGHT_REF_TIME_PER_MICROS,
-				"Write weight should be at least 1 µs."
-			);
-			// At most 1 ms.
-			assert!(
-				W::get().reads(1).ref_time() <= constants::WEIGHT_REF_TIME_PER_MILLIS,
-				"Read weight should be at most 1 ms."
-			);
-			assert!(
-				W::get().writes(1).ref_time() <= constants::WEIGHT_REF_TIME_PER_MILLIS,
-				"Write weight should be at most 1 ms."
-			);
-		}
-	}
-}
diff --git a/polkadot/runtime/polkadot/src/bag_thresholds.rs b/polkadot/runtime/polkadot/src/bag_thresholds.rs
deleted file mode 100644
index 56c764f7a6985424f06e9bc289126b2b68be3aa2..0000000000000000000000000000000000000000
--- a/polkadot/runtime/polkadot/src/bag_thresholds.rs
+++ /dev/null
@@ -1,234 +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/>.
-
-//! Autogenerated bag thresholds.
-//!
-//! Generated on 2021-10-14T08:36:33.156699497+00:00
-//! for the polkadot runtime.
-
-/// Existential weight for this runtime.
-#[cfg(any(test, feature = "std"))]
-#[allow(unused)]
-pub const EXISTENTIAL_WEIGHT: u64 = 10_000_000_000;
-
-/// Constant ratio between bags for this runtime.
-#[cfg(any(test, feature = "std"))]
-#[allow(unused)]
-pub const CONSTANT_RATIO: f64 = 1.1131723507077667;
-
-/// Upper thresholds delimiting the bag list.
-pub const THRESHOLDS: [u64; 200] = [
-	10_000_000_000,
-	11_131_723_507,
-	12_391_526_824,
-	13_793_905_044,
-	15_354_993_703,
-	17_092_754_435,
-	19_027_181_634,
-	21_180_532_507,
-	23_577_583_160,
-	26_245_913_670,
-	29_216_225_417,
-	32_522_694_326,
-	36_203_364_094,
-	40_300_583_912,
-	44_861_495_728,
-	49_938_576_656,
-	55_590_242_767,
-	61_881_521_217,
-	68_884_798_439,
-	76_680_653_006,
-	85_358_782_760,
-	95_019_036_859,
-	105_772_564_622,
-	117_743_094_401,
-	131_068_357_174,
-	145_901_671_259,
-	162_413_706_368,
-	180_794_447_305,
-	201_255_379_901,
-	224_031_924_337,
-	249_386_143_848,
-	277_609_759_981,
-	309_027_509_097,
-	344_000_878_735,
-	382_932_266_827,
-	426_269_611_626,
-	474_511_545_609,
-	528_213_132_664,
-	587_992_254_562,
-	654_536_720_209,
-	728_612_179_460,
-	811_070_932_564,
-	902_861_736_593,
-	1_005_040_721_687,
-	1_118_783_542_717,
-	1_245_398_906_179,
-	1_386_343_627_960,
-	1_543_239_395_225,
-	1_717_891_425_287,
-	1_912_309_236_147,
-	2_128_729_767_682,
-	2_369_643_119_512,
-	2_637_821_201_686,
-	2_936_349_627_828,
-	3_268_663_217_709,
-	3_638_585_517_729,
-	4_050_372_794_022,
-	4_508_763_004_364,
-	5_019_030_312_352,
-	5_587_045_771_074,
-	6_219_344_874_498,
-	6_923_202_753_807,
-	7_706_717_883_882,
-	8_578_905_263_043,
-	9_549_800_138_161,
-	10_630_573_468_586,
-	11_833_660_457_397,
-	13_172_903_628_838,
-	14_663_712_098_160,
-	16_323_238_866_411,
-	18_170_578_180_087,
-	20_226_985_226_447,
-	22_516_120_692_255,
-	25_064_322_999_817,
-	27_900_911_352_605,
-	31_058_523_077_268,
-	34_573_489_143_434,
-	38_486_252_181_966,
-	42_841_831_811_331,
-	47_690_342_626_046,
-	53_087_570_807_094,
-	59_095_615_988_698,
-	65_783_605_766_662,
-	73_228_491_069_308,
-	81_515_931_542_404,
-	90_741_281_135_191,
-	101_010_685_227_495,
-	112_442_301_921_293,
-	125_167_661_548_718,
-	139_333_180_038_781,
-	155_101_843_555_358,
-	172_655_083_789_626,
-	192_194_865_483_744,
-	213_946_010_204_502,
-	238_158_783_103_893,
-	265_111_772_429_462,
-	295_115_094_915_607,
-	328_513_963_936_552,
-	365_692_661_475_578,
-	407_078_959_611_349,
-	453_149_042_394_237,
-	504_432_984_742_966,
-	561_520_851_400_862,
-	625_069_486_125_324,
-	695_810_069_225_823,
-	774_556_530_406_243,
-	862_214_913_708_369,
-	959_793_802_308_039,
-	1_068_415_923_109_985,
-	1_189_331_064_661_951,
-	1_323_930_457_019_515,
-	1_473_762_779_014_021,
-	1_640_551_977_100_649,
-	1_826_217_100_807_404,
-	2_032_894_383_008_501,
-	2_262_961_819_074_188,
-	2_519_066_527_700_738,
-	2_804_155_208_229_882,
-	3_121_508_044_894_685,
-	3_474_776_448_088_622,
-	3_868_025_066_902_796,
-	4_305_778_556_320_752,
-	4_793_073_637_166_665,
-	5_335_517_047_800_242,
-	5_939_350_054_341_159,
-	6_611_520_261_667_250,
-	7_359_761_551_432_161,
-	8_192_683_066_856_378,
-	9_119_868_268_136_230,
-	10_151_985_198_186_376,
-	11_300_909_227_415_580,
-	12_579_859_689_817_292,
-	14_003_551_982_487_792,
-	15_588_366_878_604_342,
-	17_352_539_001_951_086,
-	19_316_366_631_550_092,
-	21_502_445_250_375_680,
-	23_935_927_525_325_748,
-	26_644_812_709_737_600,
-	29_660_268_798_266_784,
-	33_016_991_140_790_860,
-	36_753_601_641_491_664,
-	40_913_093_136_236_104,
-	45_543_324_061_189_736,
-	50_697_569_104_240_168,
-	56_435_132_174_936_472,
-	62_822_028_745_677_552,
-	69_931_745_415_056_768,
-	77_846_085_432_775_824,
-	86_656_109_914_600_688,
-	96_463_185_576_826_656,
-	107_380_151_045_315_664,
-	119_532_615_158_469_088,
-	133_060_402_202_199_856,
-	148_119_160_705_543_712,
-	164_882_154_307_451_552,
-	183_542_255_300_186_560,
-	204_314_163_786_713_728,
-	227_436_877_985_347_776,
-	253_176_444_104_585_088,
-	281_829_017_427_734_464,
-	313_724_269_827_691_328,
-	349_229_182_918_168_832,
-	388_752_270_484_770_624,
-	432_748_278_778_513_664,
-	481_723_418_752_617_984,
-	536_241_190_443_833_600,
-	596_928_866_512_693_376,
-	664_484_709_541_257_600,
-	739_686_006_129_409_280,
-	823_398_010_228_713_984,
-	916_583_898_614_395_264,
-	1_020_315_853_041_475_584,
-	1_135_787_396_594_579_584,
-	1_264_327_126_171_442_688,
-	1_407_413_999_103_859_968,
-	1_566_694_349_801_462_272,
-	1_744_000_832_209_069_824,
-	1_941_373_506_026_471_680,
-	2_161_083_309_305_266_176,
-	2_405_658_187_494_662_656,
-	2_677_912_179_572_818_944,
-	2_980_977_795_924_034_048,
-	3_318_342_060_496_414_208,
-	3_693_886_631_935_247_360,
-	4_111_932_465_319_354_368,
-	4_577_289_528_371_127_808,
-	5_095_312_144_166_932_480,
-	5_671_960_597_112_134_656,
-	6_313_869_711_009_142_784,
-	7_028_425_188_266_614_784,
-	7_823_848_588_596_424_704,
-	8_709_291_924_949_524_480,
-	9_694_942_965_096_232_960,
-	10_792_142_450_433_898_496,
-	12_013_514_580_722_579_456,
-	13_373_112_266_084_982_784,
-	14_886_578_817_516_689_408,
-	16_571_327_936_291_497_984,
-	18_446_744_073_709_551_615,
-];
diff --git a/polkadot/runtime/polkadot/src/lib.rs b/polkadot/runtime/polkadot/src/lib.rs
deleted file mode 100644
index c4458076cb3d9e6516d53fd61b7da08dcf9b1bcc..0000000000000000000000000000000000000000
--- a/polkadot/runtime/polkadot/src/lib.rs
+++ /dev/null
@@ -1,2586 +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/>.
-
-//! The Polkadot runtime. This can be compiled with `#[no_std]`, ready for Wasm.
-
-#![cfg_attr(not(feature = "std"), no_std)]
-// `construct_runtime!` does a lot of recursion and requires us to increase the limit to 256.
-#![recursion_limit = "512"]
-
-use pallet_transaction_payment::CurrencyAdapter;
-use runtime_common::{
-	auctions, claims, crowdloan, impl_runtime_weights, impls::DealWithFees, paras_registrar,
-	prod_or_fast, slots, BlockHashCount, BlockLength, CurrencyToVote, SlowAdjustingFeeUpdate,
-};
-
-use runtime_parachains::{
-	assigner_parachains as parachains_assigner_parachains,
-	configuration as parachains_configuration, disputes as parachains_disputes,
-	disputes::slashing as parachains_slashing,
-	dmp as parachains_dmp, hrmp as parachains_hrmp, inclusion as parachains_inclusion,
-	inclusion::{AggregateMessageOrigin, UmpQueueId},
-	initializer as parachains_initializer, origin as parachains_origin, paras as parachains_paras,
-	paras_inherent as parachains_paras_inherent, reward_points as parachains_reward_points,
-	runtime_api_impl::v5 as parachains_runtime_api_impl,
-	scheduler as parachains_scheduler, session_info as parachains_session_info,
-	shared as parachains_shared,
-};
-
-use authority_discovery_primitives::AuthorityId as AuthorityDiscoveryId;
-use beefy_primitives::ecdsa_crypto::{AuthorityId as BeefyId, Signature as BeefySignature};
-use frame_election_provider_support::{
-	bounds::ElectionBoundsBuilder, generate_solution_type, onchain, SequentialPhragmen,
-};
-use frame_support::{
-	construct_runtime, parameter_types,
-	traits::{
-		ConstU32, EitherOf, EitherOfDiverse, InstanceFilter, KeyOwnerProofSystem, PrivilegeCmp,
-		ProcessMessage, ProcessMessageError, WithdrawReasons,
-	},
-	weights::{ConstantMultiplier, WeightMeter},
-	PalletId,
-};
-use frame_system::EnsureRoot;
-use pallet_grandpa::{fg_primitives, AuthorityId as GrandpaId};
-use pallet_im_online::sr25519::AuthorityId as ImOnlineId;
-use pallet_session::historical as session_historical;
-use pallet_transaction_payment::{FeeDetails, RuntimeDispatchInfo};
-use parity_scale_codec::{Decode, Encode, MaxEncodedLen};
-use primitives::{
-	slashing, AccountId, AccountIndex, Balance, BlockNumber, CandidateEvent, CandidateHash,
-	CommittedCandidateReceipt, CoreState, DisputeState, ExecutorParams, GroupRotationInfo, Hash,
-	Id as ParaId, InboundDownwardMessage, InboundHrmpMessage, Moment, Nonce,
-	OccupiedCoreAssumption, PersistedValidationData, ScrapedOnChainVotes, SessionInfo, Signature,
-	ValidationCode, ValidationCodeHash, ValidatorId, ValidatorIndex, LOWEST_PUBLIC_ID,
-	PARACHAIN_KEY_TYPE_ID,
-};
-use sp_core::OpaqueMetadata;
-use sp_mmr_primitives as mmr;
-use sp_runtime::{
-	create_runtime_str,
-	curve::PiecewiseLinear,
-	generic, impl_opaque_keys,
-	traits::{
-		AccountIdLookup, BlakeTwo256, Block as BlockT, ConvertInto, Extrinsic as ExtrinsicT,
-		OpaqueKeys, SaturatedConversion, Verify,
-	},
-	transaction_validity::{TransactionPriority, TransactionSource, TransactionValidity},
-	ApplyExtrinsicResult, FixedU128, KeyTypeId, Perbill, Percent, Permill, RuntimeDebug,
-};
-use sp_staking::SessionIndex;
-use sp_std::{cmp::Ordering, collections::btree_map::BTreeMap, prelude::*};
-#[cfg(any(feature = "std", test))]
-use sp_version::NativeVersion;
-use sp_version::RuntimeVersion;
-use xcm::latest::Junction;
-
-pub use frame_system::Call as SystemCall;
-pub use pallet_balances::Call as BalancesCall;
-pub use pallet_election_provider_multi_phase::Call as EPMCall;
-#[cfg(feature = "std")]
-pub use pallet_staking::StakerStatus;
-use pallet_staking::UseValidatorsMap;
-pub use pallet_timestamp::Call as TimestampCall;
-use sp_runtime::traits::Get;
-#[cfg(any(feature = "std", test))]
-pub use sp_runtime::BuildStorage;
-
-/// Constant values used within the runtime.
-use polkadot_runtime_constants::{currency::*, fee::*, time::*};
-
-// Weights used in the runtime.
-mod weights;
-
-mod bag_thresholds;
-
-// Governance configurations.
-pub mod governance;
-use governance::{
-	pallet_custom_origins, AuctionAdmin, FellowshipAdmin, GeneralAdmin, LeaseAdmin, StakingAdmin,
-	Treasurer, TreasurySpender,
-};
-
-pub mod xcm_config;
-
-impl_runtime_weights!(polkadot_runtime_constants);
-
-// Make the WASM binary available.
-#[cfg(feature = "std")]
-include!(concat!(env!("OUT_DIR"), "/wasm_binary.rs"));
-
-// Polkadot version identifier;
-/// Runtime version (Polkadot).
-#[sp_version::runtime_version]
-pub const VERSION: RuntimeVersion = RuntimeVersion {
-	spec_name: create_runtime_str!("polkadot"),
-	impl_name: create_runtime_str!("parity-polkadot"),
-	authoring_version: 0,
-	spec_version: 9430,
-	impl_version: 0,
-	#[cfg(not(feature = "disable-runtime-api"))]
-	apis: RUNTIME_API_VERSIONS,
-	#[cfg(feature = "disable-runtime-api")]
-	apis: sp_version::create_apis_vec![[]],
-	transaction_version: 24,
-	state_version: 0,
-};
-
-/// The BABE epoch configuration at genesis.
-pub const BABE_GENESIS_EPOCH_CONFIG: babe_primitives::BabeEpochConfiguration =
-	babe_primitives::BabeEpochConfiguration {
-		c: PRIMARY_PROBABILITY,
-		allowed_slots: babe_primitives::AllowedSlots::PrimaryAndSecondaryVRFSlots,
-	};
-
-/// Native version.
-#[cfg(any(feature = "std", test))]
-pub fn native_version() -> NativeVersion {
-	NativeVersion { runtime_version: VERSION, can_author_with: Default::default() }
-}
-
-parameter_types! {
-	pub const Version: RuntimeVersion = VERSION;
-	pub const SS58Prefix: u8 = 0;
-}
-
-impl frame_system::Config for Runtime {
-	type BaseCallFilter = frame_support::traits::Everything;
-	type BlockWeights = BlockWeights;
-	type BlockLength = BlockLength;
-	type RuntimeOrigin = RuntimeOrigin;
-	type RuntimeCall = RuntimeCall;
-	type Nonce = Nonce;
-	type Hash = Hash;
-	type Hashing = BlakeTwo256;
-	type AccountId = AccountId;
-	type Lookup = AccountIdLookup<AccountId, ()>;
-	type Block = Block;
-	type RuntimeEvent = RuntimeEvent;
-	type BlockHashCount = BlockHashCount;
-	type DbWeight = RocksDbWeight;
-	type Version = Version;
-	type PalletInfo = PalletInfo;
-	type AccountData = pallet_balances::AccountData<Balance>;
-	type OnNewAccount = ();
-	type OnKilledAccount = ();
-	type SystemWeightInfo = weights::frame_system::WeightInfo<Runtime>;
-	type SS58Prefix = SS58Prefix;
-	type OnSetCode = ();
-	type MaxConsumers = frame_support::traits::ConstU32<16>;
-}
-
-parameter_types! {
-	pub MaximumSchedulerWeight: Weight = Perbill::from_percent(80) *
-		BlockWeights::get().max_block;
-	pub const MaxScheduledPerBlock: u32 = 50;
-	pub const NoPreimagePostponement: Option<u32> = Some(10);
-}
-
-/// Used the compare the privilege of an origin inside the scheduler.
-pub struct OriginPrivilegeCmp;
-
-impl PrivilegeCmp<OriginCaller> for OriginPrivilegeCmp {
-	fn cmp_privilege(left: &OriginCaller, right: &OriginCaller) -> Option<Ordering> {
-		if left == right {
-			return Some(Ordering::Equal)
-		}
-
-		match (left, right) {
-			// Root is greater than anything.
-			(OriginCaller::system(frame_system::RawOrigin::Root), _) => Some(Ordering::Greater),
-			// For every other origin we don't care, as they are not used for `ScheduleOrigin`.
-			_ => None,
-		}
-	}
-}
-
-impl pallet_scheduler::Config for Runtime {
-	type RuntimeOrigin = RuntimeOrigin;
-	type RuntimeEvent = RuntimeEvent;
-	type PalletsOrigin = OriginCaller;
-	type RuntimeCall = RuntimeCall;
-	type MaximumWeight = MaximumSchedulerWeight;
-	// The goal of having ScheduleOrigin include AuctionAdmin is to allow the auctions track of
-	// OpenGov to schedule periodic auctions.
-	type ScheduleOrigin = EitherOf<EnsureRoot<AccountId>, AuctionAdmin>;
-	type MaxScheduledPerBlock = MaxScheduledPerBlock;
-	type WeightInfo = weights::pallet_scheduler::WeightInfo<Runtime>;
-	type OriginPrivilegeCmp = OriginPrivilegeCmp;
-	type Preimages = Preimage;
-}
-
-parameter_types! {
-	pub const PreimageMaxSize: u32 = 4096 * 1024;
-	pub const PreimageBaseDeposit: Balance = deposit(2, 64);
-	pub const PreimageByteDeposit: Balance = deposit(0, 1);
-}
-
-impl pallet_preimage::Config for Runtime {
-	type WeightInfo = weights::pallet_preimage::WeightInfo<Runtime>;
-	type RuntimeEvent = RuntimeEvent;
-	type Currency = Balances;
-	type ManagerOrigin = EnsureRoot<AccountId>;
-	type BaseDeposit = PreimageBaseDeposit;
-	type ByteDeposit = PreimageByteDeposit;
-}
-
-parameter_types! {
-	pub EpochDuration: u64 = prod_or_fast!(
-		EPOCH_DURATION_IN_SLOTS as u64,
-		2 * MINUTES as u64,
-		"DOT_EPOCH_DURATION"
-	);
-	pub const ExpectedBlockTime: Moment = MILLISECS_PER_BLOCK;
-	pub ReportLongevity: u64 =
-		BondingDuration::get() as u64 * SessionsPerEra::get() as u64 * EpochDuration::get();
-}
-
-impl pallet_babe::Config for Runtime {
-	type EpochDuration = EpochDuration;
-	type ExpectedBlockTime = ExpectedBlockTime;
-
-	// session module is the trigger
-	type EpochChangeTrigger = pallet_babe::ExternalTrigger;
-
-	type DisabledValidators = Session;
-
-	type WeightInfo = ();
-
-	type MaxAuthorities = MaxAuthorities;
-	type MaxNominators = MaxNominatorRewardedPerValidator;
-
-	type KeyOwnerProof =
-		<Historical as KeyOwnerProofSystem<(KeyTypeId, pallet_babe::AuthorityId)>>::Proof;
-
-	type EquivocationReportSystem =
-		pallet_babe::EquivocationReportSystem<Self, Offences, Historical, ReportLongevity>;
-}
-
-parameter_types! {
-	pub const IndexDeposit: Balance = 10 * DOLLARS;
-}
-
-impl pallet_indices::Config for Runtime {
-	type AccountIndex = AccountIndex;
-	type Currency = Balances;
-	type Deposit = IndexDeposit;
-	type RuntimeEvent = RuntimeEvent;
-	type WeightInfo = weights::pallet_indices::WeightInfo<Runtime>;
-}
-
-parameter_types! {
-	pub const ExistentialDeposit: Balance = EXISTENTIAL_DEPOSIT;
-	pub const MaxLocks: u32 = 50;
-	pub const MaxReserves: u32 = 50;
-}
-
-impl pallet_balances::Config for Runtime {
-	type Balance = Balance;
-	type DustRemoval = ();
-	type RuntimeEvent = RuntimeEvent;
-	type ExistentialDeposit = ExistentialDeposit;
-	type AccountStore = System;
-	type MaxLocks = MaxLocks;
-	type MaxReserves = MaxReserves;
-	type ReserveIdentifier = [u8; 8];
-	type WeightInfo = weights::pallet_balances::WeightInfo<Runtime>;
-	type RuntimeHoldReason = RuntimeHoldReason;
-	type FreezeIdentifier = ();
-	type MaxHolds = ConstU32<0>;
-	type MaxFreezes = ConstU32<0>;
-}
-
-parameter_types! {
-	pub const TransactionByteFee: Balance = 10 * MILLICENTS;
-	/// This value increases the priority of `Operational` transactions by adding
-	/// a "virtual tip" that's equal to the `OperationalFeeMultiplier * final_fee`.
-	pub const OperationalFeeMultiplier: u8 = 5;
-}
-
-impl pallet_transaction_payment::Config for Runtime {
-	type RuntimeEvent = RuntimeEvent;
-	type OnChargeTransaction = CurrencyAdapter<Balances, DealWithFees<Runtime>>;
-	type OperationalFeeMultiplier = OperationalFeeMultiplier;
-	type WeightToFee = WeightToFee;
-	type LengthToFee = ConstantMultiplier<Balance, TransactionByteFee>;
-	type FeeMultiplierUpdate = SlowAdjustingFeeUpdate<Self>;
-}
-
-parameter_types! {
-	pub const MinimumPeriod: u64 = SLOT_DURATION / 2;
-}
-impl pallet_timestamp::Config for Runtime {
-	type Moment = u64;
-	type OnTimestampSet = Babe;
-	type MinimumPeriod = MinimumPeriod;
-	type WeightInfo = weights::pallet_timestamp::WeightInfo<Runtime>;
-}
-
-impl pallet_authorship::Config for Runtime {
-	type FindAuthor = pallet_session::FindAccountFromAuthorIndex<Self, Babe>;
-	type EventHandler = (Staking, ImOnline);
-}
-
-impl_opaque_keys! {
-	pub struct SessionKeys {
-		pub grandpa: Grandpa,
-		pub babe: Babe,
-		pub im_online: ImOnline,
-		pub para_validator: Initializer,
-		pub para_assignment: ParaSessionInfo,
-		pub authority_discovery: AuthorityDiscovery,
-	}
-}
-
-impl pallet_session::Config for Runtime {
-	type RuntimeEvent = RuntimeEvent;
-	type ValidatorId = AccountId;
-	type ValidatorIdOf = pallet_staking::StashOf<Self>;
-	type ShouldEndSession = Babe;
-	type NextSessionRotation = Babe;
-	type SessionManager = pallet_session::historical::NoteHistoricalRoot<Self, Staking>;
-	type SessionHandler = <SessionKeys as OpaqueKeys>::KeyTypeIdProviders;
-	type Keys = SessionKeys;
-	type WeightInfo = weights::pallet_session::WeightInfo<Runtime>;
-}
-
-impl pallet_session::historical::Config for Runtime {
-	type FullIdentification = pallet_staking::Exposure<AccountId, Balance>;
-	type FullIdentificationOf = pallet_staking::ExposureOf<Runtime>;
-}
-
-parameter_types! {
-	// phase durations. 1/4 of the last session for each.
-	// in testing: 1min or half of the session for each
-	pub SignedPhase: u32 = prod_or_fast!(
-		EPOCH_DURATION_IN_SLOTS / 4,
-		(1 * MINUTES).min(EpochDuration::get().saturated_into::<u32>() / 2),
-		"DOT_SIGNED_PHASE"
-	);
-	pub UnsignedPhase: u32 = prod_or_fast!(
-		EPOCH_DURATION_IN_SLOTS / 4,
-		(1 * MINUTES).min(EpochDuration::get().saturated_into::<u32>() / 2),
-		"DOT_UNSIGNED_PHASE"
-	);
-
-	// signed config
-	pub const SignedMaxSubmissions: u32 = 16;
-	pub const SignedMaxRefunds: u32 = 16 / 4;
-	// 40 DOTs fixed deposit..
-	pub const SignedDepositBase: Balance = deposit(2, 0);
-	// 0.01 DOT per KB of solution data.
-	pub const SignedDepositByte: Balance = deposit(0, 10) / 1024;
-	// Each good submission will get 1 DOT as reward
-	pub SignedRewardBase: Balance = 1 * UNITS;
-	pub BetterUnsignedThreshold: Perbill = Perbill::from_rational(5u32, 10_000);
-
-	// 4 hour session, 1 hour unsigned phase, 32 offchain executions.
-	pub OffchainRepeat: BlockNumber = UnsignedPhase::get() / 32;
-
-	pub const MaxElectingVoters: u32 = 22_500;
-	/// We take the top 22500 nominators as electing voters and all of the validators as electable
-	/// targets. Whilst this is the case, we cannot and shall not increase the size of the
-	/// validator intentions.
-	pub ElectionBounds: frame_election_provider_support::bounds::ElectionBounds =
-		ElectionBoundsBuilder::default().voters_count(MaxElectingVoters::get().into()).build();
-	/// Setup election pallet to support maximum winners upto 1200. This will mean Staking Pallet
-	/// cannot have active validators higher than this count.
-	pub const MaxActiveValidators: u32 = 1200;
-}
-
-generate_solution_type!(
-	#[compact]
-	pub struct NposCompactSolution16::<
-		VoterIndex = u32,
-		TargetIndex = u16,
-		Accuracy = sp_runtime::PerU16,
-		MaxVoters = MaxElectingVoters,
-	>(16)
-);
-
-pub struct OnChainSeqPhragmen;
-impl onchain::Config for OnChainSeqPhragmen {
-	type System = Runtime;
-	type Solver = SequentialPhragmen<AccountId, runtime_common::elections::OnChainAccuracy>;
-	type DataProvider = Staking;
-	type WeightInfo = weights::frame_election_provider_support::WeightInfo<Runtime>;
-	type MaxWinners = MaxActiveValidators;
-	type Bounds = ElectionBounds;
-}
-
-impl pallet_election_provider_multi_phase::MinerConfig for Runtime {
-	type AccountId = AccountId;
-	type MaxLength = OffchainSolutionLengthLimit;
-	type MaxWeight = OffchainSolutionWeightLimit;
-	type Solution = NposCompactSolution16;
-	type MaxVotesPerVoter = <
-		<Self as pallet_election_provider_multi_phase::Config>::DataProvider
-		as
-		frame_election_provider_support::ElectionDataProvider
-	>::MaxVotesPerVoter;
-	type MaxWinners = MaxActiveValidators;
-
-	// The unsigned submissions have to respect the weight of the submit_unsigned call, thus their
-	// weight estimate function is wired to this call's weight.
-	fn solution_weight(v: u32, t: u32, a: u32, d: u32) -> Weight {
-		<
-			<Self as pallet_election_provider_multi_phase::Config>::WeightInfo
-			as
-			pallet_election_provider_multi_phase::WeightInfo
-		>::submit_unsigned(v, t, a, d)
-	}
-}
-
-impl pallet_election_provider_multi_phase::Config for Runtime {
-	type RuntimeEvent = RuntimeEvent;
-	type Currency = Balances;
-	type EstimateCallFee = TransactionPayment;
-	type SignedPhase = SignedPhase;
-	type UnsignedPhase = UnsignedPhase;
-	type SignedMaxSubmissions = SignedMaxSubmissions;
-	type SignedMaxRefunds = SignedMaxRefunds;
-	type SignedRewardBase = SignedRewardBase;
-	type SignedDepositBase = SignedDepositBase;
-	type SignedDepositByte = SignedDepositByte;
-	type SignedDepositWeight = ();
-	type SignedMaxWeight =
-		<Self::MinerConfig as pallet_election_provider_multi_phase::MinerConfig>::MaxWeight;
-	type MinerConfig = Self;
-	type SlashHandler = (); // burn slashes
-	type RewardHandler = (); // nothing to do upon rewards
-	type BetterUnsignedThreshold = BetterUnsignedThreshold;
-	type BetterSignedThreshold = ();
-	type OffchainRepeat = OffchainRepeat;
-	type MinerTxPriority = NposSolutionPriority;
-	type DataProvider = Staking;
-	#[cfg(any(feature = "fast-runtime", feature = "runtime-benchmarks"))]
-	type Fallback = onchain::OnChainExecution<OnChainSeqPhragmen>;
-	#[cfg(not(any(feature = "fast-runtime", feature = "runtime-benchmarks")))]
-	type Fallback = frame_election_provider_support::NoElection<(
-		AccountId,
-		BlockNumber,
-		Staking,
-		MaxActiveValidators,
-	)>;
-	type GovernanceFallback = onchain::OnChainExecution<OnChainSeqPhragmen>;
-	type Solver = SequentialPhragmen<
-		AccountId,
-		pallet_election_provider_multi_phase::SolutionAccuracyOf<Self>,
-		(),
-	>;
-	type BenchmarkingConfig = runtime_common::elections::BenchmarkConfig;
-	type ForceOrigin = EitherOf<EnsureRoot<Self::AccountId>, StakingAdmin>;
-	type WeightInfo = weights::pallet_election_provider_multi_phase::WeightInfo<Self>;
-	type MaxWinners = MaxActiveValidators;
-	type ElectionBounds = ElectionBounds;
-}
-
-parameter_types! {
-	pub const BagThresholds: &'static [u64] = &bag_thresholds::THRESHOLDS;
-}
-
-type VoterBagsListInstance = pallet_bags_list::Instance1;
-impl pallet_bags_list::Config<VoterBagsListInstance> for Runtime {
-	type RuntimeEvent = RuntimeEvent;
-	type ScoreProvider = Staking;
-	type WeightInfo = weights::pallet_bags_list::WeightInfo<Runtime>;
-	type BagThresholds = BagThresholds;
-	type Score = sp_npos_elections::VoteWeight;
-}
-
-// TODO #6469: This shouldn't be static, but a lazily cached value, not built unless needed, and
-// re-built in case input parameters have changed. The `ideal_stake` should be determined by the
-// amount of parachain slots being bid on: this should be around `(75 - 25.min(slots / 4))%`.
-pallet_staking_reward_curve::build! {
-	const REWARD_CURVE: PiecewiseLinear<'static> = curve!(
-		min_inflation: 0_025_000,
-		max_inflation: 0_100_000,
-		// 3:2:1 staked : parachains : float.
-		// while there's no parachains, then this is 75% staked : 25% float.
-		ideal_stake: 0_750_000,
-		falloff: 0_050_000,
-		max_piece_count: 40,
-		test_precision: 0_005_000,
-	);
-}
-
-parameter_types! {
-	// Six sessions in an era (24 hours).
-	pub const SessionsPerEra: SessionIndex = prod_or_fast!(6, 1);
-
-	// 28 eras for unbonding (28 days).
-	pub BondingDuration: sp_staking::EraIndex = prod_or_fast!(
-		28,
-		28,
-		"DOT_BONDING_DURATION"
-	);
-	pub SlashDeferDuration: sp_staking::EraIndex = prod_or_fast!(
-		27,
-		27,
-		"DOT_SLASH_DEFER_DURATION"
-	);
-	pub const RewardCurve: &'static PiecewiseLinear<'static> = &REWARD_CURVE;
-	pub const MaxNominatorRewardedPerValidator: u32 = 512;
-	pub const OffendingValidatorsThreshold: Perbill = Perbill::from_percent(17);
-	// 16
-	pub const MaxNominations: u32 = <NposCompactSolution16 as frame_election_provider_support::NposSolution>::LIMIT as u32;
-}
-
-pub struct EraPayout;
-impl pallet_staking::EraPayout<Balance> for EraPayout {
-	fn era_payout(
-		total_staked: Balance,
-		total_issuance: Balance,
-		era_duration_millis: u64,
-	) -> (Balance, Balance) {
-		// all para-ids that are not active.
-		let auctioned_slots = Paras::parachains()
-			.into_iter()
-			// all active para-ids that do not belong to a system or common good chain is the number
-			// of parachains that we should take into account for inflation.
-			.filter(|i| *i >= LOWEST_PUBLIC_ID)
-			.count() as u64;
-
-		const MAX_ANNUAL_INFLATION: Perquintill = Perquintill::from_percent(10);
-		const MILLISECONDS_PER_YEAR: u64 = 1000 * 3600 * 24 * 36525 / 100;
-
-		runtime_common::impls::era_payout(
-			total_staked,
-			total_issuance,
-			MAX_ANNUAL_INFLATION,
-			Perquintill::from_rational(era_duration_millis, MILLISECONDS_PER_YEAR),
-			auctioned_slots,
-		)
-	}
-}
-
-impl pallet_staking::Config for Runtime {
-	type Currency = Balances;
-	type CurrencyBalance = Balance;
-	type UnixTime = Timestamp;
-	type CurrencyToVote = CurrencyToVote;
-	type RewardRemainder = Treasury;
-	type RuntimeEvent = RuntimeEvent;
-	type Slash = Treasury;
-	type Reward = ();
-	type SessionsPerEra = SessionsPerEra;
-	type BondingDuration = BondingDuration;
-	type SlashDeferDuration = SlashDeferDuration;
-	type AdminOrigin = EitherOf<EnsureRoot<Self::AccountId>, StakingAdmin>;
-	type SessionInterface = Self;
-	type EraPayout = EraPayout;
-	type MaxNominatorRewardedPerValidator = MaxNominatorRewardedPerValidator;
-	type OffendingValidatorsThreshold = OffendingValidatorsThreshold;
-	type NextNewSession = Session;
-	type ElectionProvider = ElectionProviderMultiPhase;
-	type GenesisElectionProvider = onchain::OnChainExecution<OnChainSeqPhragmen>;
-	type VoterList = VoterList;
-	type TargetList = UseValidatorsMap<Self>;
-	type NominationsQuota = pallet_staking::FixedNominationsQuota<{ MaxNominations::get() }>;
-	type MaxUnlockingChunks = frame_support::traits::ConstU32<32>;
-	type HistoryDepth = frame_support::traits::ConstU32<84>;
-	type BenchmarkingConfig = runtime_common::StakingBenchmarkingConfig;
-	type EventListeners = NominationPools;
-	type WeightInfo = weights::pallet_staking::WeightInfo<Runtime>;
-}
-
-impl pallet_fast_unstake::Config for Runtime {
-	type RuntimeEvent = RuntimeEvent;
-	type Currency = Balances;
-	type BatchSize = frame_support::traits::ConstU32<16>;
-	type Deposit = frame_support::traits::ConstU128<{ UNITS }>;
-	type ControlOrigin = EnsureRoot<AccountId>;
-	type Staking = Staking;
-	type MaxErasToCheckPerBlock = ConstU32<1>;
-	#[cfg(feature = "runtime-benchmarks")]
-	type MaxBackersPerValidator = MaxNominatorRewardedPerValidator;
-	type WeightInfo = weights::pallet_fast_unstake::WeightInfo<Runtime>;
-}
-
-parameter_types! {
-	// Minimum 4 CENTS/byte
-	pub const BasicDeposit: Balance = deposit(1, 258);
-	pub const FieldDeposit: Balance = deposit(0, 66);
-	pub const SubAccountDeposit: Balance = deposit(1, 53);
-	pub const MaxSubAccounts: u32 = 100;
-	pub const MaxAdditionalFields: u32 = 100;
-	pub const MaxRegistrars: u32 = 20;
-}
-
-impl pallet_identity::Config for Runtime {
-	type RuntimeEvent = RuntimeEvent;
-	type Currency = Balances;
-	type BasicDeposit = BasicDeposit;
-	type FieldDeposit = FieldDeposit;
-	type SubAccountDeposit = SubAccountDeposit;
-	type MaxSubAccounts = MaxSubAccounts;
-	type MaxAdditionalFields = MaxAdditionalFields;
-	type MaxRegistrars = MaxRegistrars;
-	type Slashed = Treasury;
-	type ForceOrigin = EitherOf<EnsureRoot<Self::AccountId>, GeneralAdmin>;
-	type RegistrarOrigin = EitherOf<EnsureRoot<Self::AccountId>, GeneralAdmin>;
-	type WeightInfo = weights::pallet_identity::WeightInfo<Runtime>;
-}
-
-parameter_types! {
-	pub const ProposalBond: Permill = Permill::from_percent(5);
-	pub const ProposalBondMinimum: Balance = 100 * DOLLARS;
-	pub const ProposalBondMaximum: Balance = 500 * DOLLARS;
-	pub const SpendPeriod: BlockNumber = 24 * DAYS;
-	pub const Burn: Permill = Permill::from_percent(1);
-	pub const TreasuryPalletId: PalletId = PalletId(*b"py/trsry");
-
-	pub const TipCountdown: BlockNumber = 1 * DAYS;
-	pub const TipFindersFee: Percent = Percent::from_percent(20);
-	pub const TipReportDepositBase: Balance = 1 * DOLLARS;
-	pub const DataDepositPerByte: Balance = 1 * CENTS;
-	pub const MaxApprovals: u32 = 100;
-	pub const MaxAuthorities: u32 = 100_000;
-	pub const MaxKeys: u32 = 10_000;
-	pub const MaxPeerInHeartbeats: u32 = 10_000;
-	pub const RootSpendOriginMaxAmount: Balance = Balance::MAX;
-	pub const CouncilSpendOriginMaxAmount: Balance = Balance::MAX;
-}
-
-impl pallet_treasury::Config for Runtime {
-	type PalletId = TreasuryPalletId;
-	type Currency = Balances;
-	type ApproveOrigin = EitherOfDiverse<EnsureRoot<AccountId>, Treasurer>;
-	type RejectOrigin = EitherOfDiverse<EnsureRoot<AccountId>, Treasurer>;
-	type RuntimeEvent = RuntimeEvent;
-	type OnSlash = Treasury;
-	type ProposalBond = ProposalBond;
-	type ProposalBondMinimum = ProposalBondMinimum;
-	type ProposalBondMaximum = ProposalBondMaximum;
-	type SpendPeriod = SpendPeriod;
-	type Burn = Burn;
-	type BurnDestination = ();
-	type SpendFunds = Bounties;
-	type MaxApprovals = MaxApprovals;
-	type WeightInfo = weights::pallet_treasury::WeightInfo<Runtime>;
-	type SpendOrigin = TreasurySpender;
-}
-
-parameter_types! {
-	pub const BountyDepositBase: Balance = 1 * DOLLARS;
-	pub const BountyDepositPayoutDelay: BlockNumber = 8 * DAYS;
-	pub const BountyUpdatePeriod: BlockNumber = 90 * DAYS;
-	pub const MaximumReasonLength: u32 = 16384;
-	pub const CuratorDepositMultiplier: Permill = Permill::from_percent(50);
-	pub const CuratorDepositMin: Balance = 10 * DOLLARS;
-	pub const CuratorDepositMax: Balance = 200 * DOLLARS;
-	pub const BountyValueMinimum: Balance = 10 * DOLLARS;
-}
-
-impl pallet_bounties::Config for Runtime {
-	type RuntimeEvent = RuntimeEvent;
-	type BountyDepositBase = BountyDepositBase;
-	type BountyDepositPayoutDelay = BountyDepositPayoutDelay;
-	type BountyUpdatePeriod = BountyUpdatePeriod;
-	type CuratorDepositMultiplier = CuratorDepositMultiplier;
-	type CuratorDepositMin = CuratorDepositMin;
-	type CuratorDepositMax = CuratorDepositMax;
-	type BountyValueMinimum = BountyValueMinimum;
-	type ChildBountyManager = ChildBounties;
-	type DataDepositPerByte = DataDepositPerByte;
-	type MaximumReasonLength = MaximumReasonLength;
-	type WeightInfo = weights::pallet_bounties::WeightInfo<Runtime>;
-}
-
-parameter_types! {
-	pub const MaxActiveChildBountyCount: u32 = 100;
-	pub const ChildBountyValueMinimum: Balance = BountyValueMinimum::get() / 10;
-}
-
-impl pallet_child_bounties::Config for Runtime {
-	type RuntimeEvent = RuntimeEvent;
-	type MaxActiveChildBountyCount = MaxActiveChildBountyCount;
-	type ChildBountyValueMinimum = ChildBountyValueMinimum;
-	type WeightInfo = weights::pallet_child_bounties::WeightInfo<Runtime>;
-}
-
-impl pallet_offences::Config for Runtime {
-	type RuntimeEvent = RuntimeEvent;
-	type IdentificationTuple = pallet_session::historical::IdentificationTuple<Self>;
-	type OnOffenceHandler = Staking;
-}
-
-impl pallet_authority_discovery::Config for Runtime {
-	type MaxAuthorities = MaxAuthorities;
-}
-
-parameter_types! {
-	pub NposSolutionPriority: TransactionPriority =
-		Perbill::from_percent(90) * TransactionPriority::max_value();
-	pub const ImOnlineUnsignedPriority: TransactionPriority = TransactionPriority::max_value();
-}
-
-impl pallet_im_online::Config for Runtime {
-	type AuthorityId = ImOnlineId;
-	type RuntimeEvent = RuntimeEvent;
-	type ValidatorSet = Historical;
-	type NextSessionRotation = Babe;
-	type ReportUnresponsiveness = Offences;
-	type UnsignedPriority = ImOnlineUnsignedPriority;
-	type WeightInfo = weights::pallet_im_online::WeightInfo<Runtime>;
-	type MaxKeys = MaxKeys;
-	type MaxPeerInHeartbeats = MaxPeerInHeartbeats;
-}
-
-parameter_types! {
-	pub MaxSetIdSessionEntries: u32 = BondingDuration::get() * SessionsPerEra::get();
-}
-
-impl pallet_grandpa::Config for Runtime {
-	type RuntimeEvent = RuntimeEvent;
-
-	type WeightInfo = ();
-	type MaxAuthorities = MaxAuthorities;
-	type MaxNominators = MaxNominatorRewardedPerValidator;
-	type MaxSetIdSessionEntries = MaxSetIdSessionEntries;
-
-	type KeyOwnerProof = <Historical as KeyOwnerProofSystem<(KeyTypeId, GrandpaId)>>::Proof;
-
-	type EquivocationReportSystem =
-		pallet_grandpa::EquivocationReportSystem<Self, Offences, Historical, ReportLongevity>;
-}
-
-/// Submits a transaction with the node's public and signature type. Adheres to the signed extension
-/// format of the chain.
-impl<LocalCall> frame_system::offchain::CreateSignedTransaction<LocalCall> for Runtime
-where
-	RuntimeCall: From<LocalCall>,
-{
-	fn create_transaction<C: frame_system::offchain::AppCrypto<Self::Public, Self::Signature>>(
-		call: RuntimeCall,
-		public: <Signature as Verify>::Signer,
-		account: AccountId,
-		nonce: <Runtime as frame_system::Config>::Nonce,
-	) -> Option<(RuntimeCall, <UncheckedExtrinsic as ExtrinsicT>::SignaturePayload)> {
-		use sp_runtime::traits::StaticLookup;
-		// take the biggest period possible.
-		let period =
-			BlockHashCount::get().checked_next_power_of_two().map(|c| c / 2).unwrap_or(2) as u64;
-
-		let current_block = System::block_number()
-			.saturated_into::<u64>()
-			// The `System::block_number` is initialized with `n+1`,
-			// so the actual block number is `n`.
-			.saturating_sub(1);
-		let tip = 0;
-		let extra: SignedExtra = (
-			frame_system::CheckNonZeroSender::<Runtime>::new(),
-			frame_system::CheckSpecVersion::<Runtime>::new(),
-			frame_system::CheckTxVersion::<Runtime>::new(),
-			frame_system::CheckGenesis::<Runtime>::new(),
-			frame_system::CheckMortality::<Runtime>::from(generic::Era::mortal(
-				period,
-				current_block,
-			)),
-			frame_system::CheckNonce::<Runtime>::from(nonce),
-			frame_system::CheckWeight::<Runtime>::new(),
-			pallet_transaction_payment::ChargeTransactionPayment::<Runtime>::from(tip),
-			claims::PrevalidateAttests::<Runtime>::new(),
-		);
-		let raw_payload = SignedPayload::new(call, extra)
-			.map_err(|e| {
-				log::warn!("Unable to create signed payload: {:?}", e);
-			})
-			.ok()?;
-		let signature = raw_payload.using_encoded(|payload| C::sign(payload, public))?;
-		let (call, extra, _) = raw_payload.deconstruct();
-		let address = <Runtime as frame_system::Config>::Lookup::unlookup(account);
-		Some((call, (address, signature, extra)))
-	}
-}
-
-impl frame_system::offchain::SigningTypes for Runtime {
-	type Public = <Signature as Verify>::Signer;
-	type Signature = Signature;
-}
-
-impl<C> frame_system::offchain::SendTransactionTypes<C> for Runtime
-where
-	RuntimeCall: From<C>,
-{
-	type Extrinsic = UncheckedExtrinsic;
-	type OverarchingCall = RuntimeCall;
-}
-
-parameter_types! {
-	// Deposit for a parathread (on-demand parachain)
-	pub const ParathreadDeposit: Balance = 500 * DOLLARS;
-	pub const MaxRetries: u32 = 3;
-}
-
-parameter_types! {
-	pub Prefix: &'static [u8] = b"Pay DOTs to the Polkadot account:";
-}
-
-impl claims::Config for Runtime {
-	type RuntimeEvent = RuntimeEvent;
-	type VestingSchedule = Vesting;
-	type Prefix = Prefix;
-	/// Only Root can move a claim.
-	type MoveClaimOrigin = EnsureRoot<AccountId>;
-	type WeightInfo = weights::runtime_common_claims::WeightInfo<Runtime>;
-}
-
-parameter_types! {
-	pub const MinVestedTransfer: Balance = 1 * DOLLARS;
-	pub UnvestedFundsAllowedWithdrawReasons: WithdrawReasons =
-		WithdrawReasons::except(WithdrawReasons::TRANSFER | WithdrawReasons::RESERVE);
-}
-
-impl pallet_vesting::Config for Runtime {
-	type RuntimeEvent = RuntimeEvent;
-	type Currency = Balances;
-	type BlockNumberToBalance = ConvertInto;
-	type MinVestedTransfer = MinVestedTransfer;
-	type WeightInfo = weights::pallet_vesting::WeightInfo<Runtime>;
-	type UnvestedFundsAllowedWithdrawReasons = UnvestedFundsAllowedWithdrawReasons;
-	const MAX_VESTING_SCHEDULES: u32 = 28;
-}
-
-impl pallet_utility::Config for Runtime {
-	type RuntimeEvent = RuntimeEvent;
-	type RuntimeCall = RuntimeCall;
-	type PalletsOrigin = OriginCaller;
-	type WeightInfo = weights::pallet_utility::WeightInfo<Runtime>;
-}
-
-parameter_types! {
-	// One storage item; key size is 32; value is size 4+4+16+32 bytes = 56 bytes.
-	pub const DepositBase: Balance = deposit(1, 88);
-	// Additional storage item size of 32 bytes.
-	pub const DepositFactor: Balance = deposit(0, 32);
-	pub const MaxSignatories: u32 = 100;
-}
-
-impl pallet_multisig::Config for Runtime {
-	type RuntimeEvent = RuntimeEvent;
-	type RuntimeCall = RuntimeCall;
-	type Currency = Balances;
-	type DepositBase = DepositBase;
-	type DepositFactor = DepositFactor;
-	type MaxSignatories = MaxSignatories;
-	type WeightInfo = weights::pallet_multisig::WeightInfo<Runtime>;
-}
-
-parameter_types! {
-	// One storage item; key size 32, value size 8; .
-	pub const ProxyDepositBase: Balance = deposit(1, 8);
-	// Additional storage item size of 33 bytes.
-	pub const ProxyDepositFactor: Balance = deposit(0, 33);
-	pub const MaxProxies: u16 = 32;
-	pub const AnnouncementDepositBase: Balance = deposit(1, 8);
-	pub const AnnouncementDepositFactor: Balance = deposit(0, 66);
-	pub const MaxPending: u16 = 32;
-}
-
-/// The type used to represent the kinds of proxying allowed.
-#[derive(
-	Copy,
-	Clone,
-	Eq,
-	PartialEq,
-	Ord,
-	PartialOrd,
-	Encode,
-	Decode,
-	RuntimeDebug,
-	MaxEncodedLen,
-	scale_info::TypeInfo,
-)]
-pub enum ProxyType {
-	Any = 0,
-	NonTransfer = 1,
-	Governance = 2,
-	Staking = 3,
-	// Skip 4 as it is now removed (was SudoBalances)
-	IdentityJudgement = 5,
-	CancelProxy = 6,
-	Auction = 7,
-	NominationPools = 8,
-}
-
-#[cfg(test)]
-mod proxy_type_tests {
-	use super::*;
-
-	#[derive(Copy, Clone, Eq, PartialEq, Ord, PartialOrd, Encode, Decode, RuntimeDebug)]
-	pub enum OldProxyType {
-		Any,
-		NonTransfer,
-		Governance,
-		Staking,
-		SudoBalances,
-		IdentityJudgement,
-	}
-
-	#[test]
-	fn proxy_type_decodes_correctly() {
-		for (i, j) in vec![
-			(OldProxyType::Any, ProxyType::Any),
-			(OldProxyType::NonTransfer, ProxyType::NonTransfer),
-			(OldProxyType::Governance, ProxyType::Governance),
-			(OldProxyType::Staking, ProxyType::Staking),
-			(OldProxyType::IdentityJudgement, ProxyType::IdentityJudgement),
-		]
-		.into_iter()
-		{
-			assert_eq!(i.encode(), j.encode());
-		}
-		assert!(ProxyType::decode(&mut &OldProxyType::SudoBalances.encode()[..]).is_err());
-	}
-}
-
-impl Default for ProxyType {
-	fn default() -> Self {
-		Self::Any
-	}
-}
-impl InstanceFilter<RuntimeCall> for ProxyType {
-	fn filter(&self, c: &RuntimeCall) -> bool {
-		match self {
-			ProxyType::Any => true,
-			ProxyType::NonTransfer => matches!(
-				c,
-				RuntimeCall::System(..) |
-				RuntimeCall::Scheduler(..) |
-				RuntimeCall::Babe(..) |
-				RuntimeCall::Timestamp(..) |
-				RuntimeCall::Indices(pallet_indices::Call::claim{..}) |
-				RuntimeCall::Indices(pallet_indices::Call::free{..}) |
-				RuntimeCall::Indices(pallet_indices::Call::freeze{..}) |
-				// Specifically omitting Indices `transfer`, `force_transfer`
-				// Specifically omitting the entire Balances pallet
-				RuntimeCall::Staking(..) |
-				RuntimeCall::Session(..) |
-				RuntimeCall::Grandpa(..) |
-				RuntimeCall::ImOnline(..) |
-				RuntimeCall::Treasury(..) |
-				RuntimeCall::Bounties(..) |
-				RuntimeCall::ChildBounties(..) |
-				RuntimeCall::ConvictionVoting(..) |
-				RuntimeCall::Referenda(..) |
-				RuntimeCall::Whitelist(..) |
-				RuntimeCall::Claims(..) |
-				RuntimeCall::Vesting(pallet_vesting::Call::vest{..}) |
-				RuntimeCall::Vesting(pallet_vesting::Call::vest_other{..}) |
-				// Specifically omitting Vesting `vested_transfer`, and `force_vested_transfer`
-				RuntimeCall::Utility(..) |
-				RuntimeCall::Identity(..) |
-				RuntimeCall::Proxy(..) |
-				RuntimeCall::Multisig(..) |
-				RuntimeCall::Registrar(paras_registrar::Call::register {..}) |
-				RuntimeCall::Registrar(paras_registrar::Call::deregister {..}) |
-				// Specifically omitting Registrar `swap`
-				RuntimeCall::Registrar(paras_registrar::Call::reserve {..}) |
-				RuntimeCall::Crowdloan(..) |
-				RuntimeCall::Slots(..) |
-				RuntimeCall::Auctions(..) | // Specifically omitting the entire XCM Pallet
-				RuntimeCall::VoterList(..) |
-				RuntimeCall::NominationPools(..) |
-				RuntimeCall::FastUnstake(..)
-			),
-			ProxyType::Governance => matches!(
-				c,
-				RuntimeCall::Treasury(..) |
-					RuntimeCall::Bounties(..) |
-					RuntimeCall::Utility(..) |
-					RuntimeCall::ChildBounties(..) |
-					RuntimeCall::ConvictionVoting(..) |
-					RuntimeCall::Referenda(..) |
-					RuntimeCall::Whitelist(..)
-			),
-			ProxyType::Staking => {
-				matches!(
-					c,
-					RuntimeCall::Staking(..) |
-						RuntimeCall::Session(..) | RuntimeCall::Utility(..) |
-						RuntimeCall::FastUnstake(..) |
-						RuntimeCall::VoterList(..) |
-						RuntimeCall::NominationPools(..)
-				)
-			},
-			ProxyType::NominationPools => {
-				matches!(c, RuntimeCall::NominationPools(..) | RuntimeCall::Utility(..))
-			},
-			ProxyType::IdentityJudgement => matches!(
-				c,
-				RuntimeCall::Identity(pallet_identity::Call::provide_judgement { .. }) |
-					RuntimeCall::Utility(..)
-			),
-			ProxyType::CancelProxy => {
-				matches!(c, RuntimeCall::Proxy(pallet_proxy::Call::reject_announcement { .. }))
-			},
-			ProxyType::Auction => matches!(
-				c,
-				RuntimeCall::Auctions(..) |
-					RuntimeCall::Crowdloan(..) |
-					RuntimeCall::Registrar(..) |
-					RuntimeCall::Slots(..)
-			),
-		}
-	}
-	fn is_superset(&self, o: &Self) -> bool {
-		match (self, o) {
-			(x, y) if x == y => true,
-			(ProxyType::Any, _) => true,
-			(_, ProxyType::Any) => false,
-			(ProxyType::NonTransfer, _) => true,
-			_ => false,
-		}
-	}
-}
-
-impl pallet_proxy::Config for Runtime {
-	type RuntimeEvent = RuntimeEvent;
-	type RuntimeCall = RuntimeCall;
-	type Currency = Balances;
-	type ProxyType = ProxyType;
-	type ProxyDepositBase = ProxyDepositBase;
-	type ProxyDepositFactor = ProxyDepositFactor;
-	type MaxProxies = MaxProxies;
-	type WeightInfo = weights::pallet_proxy::WeightInfo<Runtime>;
-	type MaxPending = MaxPending;
-	type CallHasher = BlakeTwo256;
-	type AnnouncementDepositBase = AnnouncementDepositBase;
-	type AnnouncementDepositFactor = AnnouncementDepositFactor;
-}
-
-impl parachains_origin::Config for Runtime {}
-
-impl parachains_configuration::Config for Runtime {
-	type WeightInfo = weights::runtime_parachains_configuration::WeightInfo<Runtime>;
-}
-
-impl parachains_shared::Config for Runtime {}
-
-impl parachains_session_info::Config for Runtime {
-	type ValidatorSet = Historical;
-}
-
-impl parachains_inclusion::Config for Runtime {
-	type RuntimeEvent = RuntimeEvent;
-	type DisputesHandler = ParasDisputes;
-	type RewardValidators = parachains_reward_points::RewardValidatorsWithEraPoints<Runtime>;
-	type MessageQueue = MessageQueue;
-	type WeightInfo = weights::runtime_parachains_inclusion::WeightInfo<Runtime>;
-}
-
-parameter_types! {
-	pub const ParasUnsignedPriority: TransactionPriority = TransactionPriority::max_value();
-}
-
-impl parachains_paras::Config for Runtime {
-	type RuntimeEvent = RuntimeEvent;
-	type WeightInfo = weights::runtime_parachains_paras::WeightInfo<Runtime>;
-	type UnsignedPriority = ParasUnsignedPriority;
-	type QueueFootprinter = ParaInclusion;
-	type NextSessionRotation = Babe;
-}
-
-parameter_types! {
-	/// Amount of weight that can be spent per block to service messages.
-	///
-	/// # WARNING
-	///
-	/// This is not a good value for para-chains since the `Scheduler` already uses up to 80% block weight.
-	pub MessageQueueServiceWeight: Weight = Perbill::from_percent(20) * BlockWeights::get().max_block;
-	pub const MessageQueueHeapSize: u32 = 65_536;
-	pub const MessageQueueMaxStale: u32 = 8;
-}
-
-/// Message processor to handle any messages that were enqueued into the `MessageQueue` pallet.
-pub struct MessageProcessor;
-impl ProcessMessage for MessageProcessor {
-	type Origin = AggregateMessageOrigin;
-
-	fn process_message(
-		message: &[u8],
-		origin: Self::Origin,
-		meter: &mut WeightMeter,
-		id: &mut [u8; 32],
-	) -> Result<bool, ProcessMessageError> {
-		let para = match origin {
-			AggregateMessageOrigin::Ump(UmpQueueId::Para(para)) => para,
-		};
-		xcm_builder::ProcessXcmMessage::<
-			Junction,
-			xcm_executor::XcmExecutor<xcm_config::XcmConfig>,
-			RuntimeCall,
-		>::process_message(message, Junction::Parachain(para.into()), meter, id)
-	}
-}
-
-impl pallet_message_queue::Config for Runtime {
-	type RuntimeEvent = RuntimeEvent;
-	type Size = u32;
-	type HeapSize = MessageQueueHeapSize;
-	type MaxStale = MessageQueueMaxStale;
-	type ServiceWeight = MessageQueueServiceWeight;
-	#[cfg(not(feature = "runtime-benchmarks"))]
-	type MessageProcessor = MessageProcessor;
-	#[cfg(feature = "runtime-benchmarks")]
-	type MessageProcessor =
-		pallet_message_queue::mock_helpers::NoopMessageProcessor<AggregateMessageOrigin>;
-	type QueueChangeHandler = ParaInclusion;
-	type QueuePausedQuery = ();
-	type WeightInfo = weights::pallet_message_queue::WeightInfo<Runtime>;
-}
-
-impl parachains_dmp::Config for Runtime {}
-
-impl parachains_hrmp::Config for Runtime {
-	type RuntimeOrigin = RuntimeOrigin;
-	type RuntimeEvent = RuntimeEvent;
-	type ChannelManager = EitherOf<EnsureRoot<Self::AccountId>, GeneralAdmin>;
-	type Currency = Balances;
-	type WeightInfo = weights::runtime_parachains_hrmp::WeightInfo<Self>;
-}
-
-impl parachains_paras_inherent::Config for Runtime {
-	type WeightInfo = weights::runtime_parachains_paras_inherent::WeightInfo<Runtime>;
-}
-
-impl parachains_scheduler::Config for Runtime {
-	type AssignmentProvider = ParaAssignmentProvider;
-}
-
-impl parachains_assigner_parachains::Config for Runtime {}
-
-impl parachains_initializer::Config for Runtime {
-	type Randomness = pallet_babe::RandomnessFromOneEpochAgo<Runtime>;
-	type ForceOrigin = EnsureRoot<AccountId>;
-	type WeightInfo = weights::runtime_parachains_initializer::WeightInfo<Runtime>;
-}
-
-impl parachains_disputes::Config for Runtime {
-	type RuntimeEvent = RuntimeEvent;
-	type RewardValidators = parachains_reward_points::RewardValidatorsWithEraPoints<Runtime>;
-	type SlashingHandler = parachains_slashing::SlashValidatorsForDisputes<ParasSlashing>;
-	type WeightInfo = weights::runtime_parachains_disputes::WeightInfo<Runtime>;
-}
-
-impl parachains_slashing::Config for Runtime {
-	type KeyOwnerProofSystem = Historical;
-	type KeyOwnerProof =
-		<Self::KeyOwnerProofSystem as KeyOwnerProofSystem<(KeyTypeId, ValidatorId)>>::Proof;
-	type KeyOwnerIdentification = <Self::KeyOwnerProofSystem as KeyOwnerProofSystem<(
-		KeyTypeId,
-		ValidatorId,
-	)>>::IdentificationTuple;
-	type HandleReports = parachains_slashing::SlashingReportHandler<
-		Self::KeyOwnerIdentification,
-		Offences,
-		ReportLongevity,
-	>;
-	type WeightInfo = weights::runtime_parachains_disputes_slashing::WeightInfo<Runtime>;
-	type BenchmarkingConfig = parachains_slashing::BenchConfig<1000>;
-}
-
-parameter_types! {
-	// Mostly arbitrary deposit price, but should provide an adequate incentive not to spam reserve
-	// `ParaId`s.
-	pub const ParaDeposit: Balance = 100 * DOLLARS;
-	pub const ParaDataByteDeposit: Balance = deposit(0, 1);
-}
-
-impl paras_registrar::Config for Runtime {
-	type RuntimeOrigin = RuntimeOrigin;
-	type RuntimeEvent = RuntimeEvent;
-	type Currency = Balances;
-	type OnSwap = (Crowdloan, Slots);
-	type ParaDeposit = ParaDeposit;
-	type DataDepositPerByte = ParaDataByteDeposit;
-	type WeightInfo = weights::runtime_common_paras_registrar::WeightInfo<Runtime>;
-}
-
-parameter_types! {
-	// 12 weeks = 3 months per lease period -> 8 lease periods ~ 2 years
-	pub LeasePeriod: BlockNumber = prod_or_fast!(12 * WEEKS, 12 * WEEKS, "DOT_LEASE_PERIOD");
-	// Polkadot Genesis was on May 26, 2020.
-	// Target Parachain Onboarding Date: Dec 15, 2021.
-	// Difference is 568 days.
-	// We want a lease period to start on the target onboarding date.
-	// 568 % (12 * 7) = 64 day offset
-	pub LeaseOffset: BlockNumber = prod_or_fast!(64 * DAYS, 0, "DOT_LEASE_OFFSET");
-}
-
-impl slots::Config for Runtime {
-	type RuntimeEvent = RuntimeEvent;
-	type Currency = Balances;
-	type Registrar = Registrar;
-	type LeasePeriod = LeasePeriod;
-	type LeaseOffset = LeaseOffset;
-	type ForceOrigin = EitherOf<EnsureRoot<Self::AccountId>, LeaseAdmin>;
-	type WeightInfo = weights::runtime_common_slots::WeightInfo<Runtime>;
-}
-
-parameter_types! {
-	pub const CrowdloanId: PalletId = PalletId(*b"py/cfund");
-	// Accounts for 10_000 contributions, each using 48 bytes (16 bytes for balance, and 32 bytes
-	// for a memo).
-	pub const SubmissionDeposit: Balance = deposit(1, 480_000);
-	// The minimum crowdloan contribution.
-	pub const MinContribution: Balance = 5 * DOLLARS;
-	pub const RemoveKeysLimit: u32 = 1000;
-	// Allow 32 bytes for an additional memo to a crowdloan.
-	pub const MaxMemoLength: u8 = 32;
-}
-
-impl crowdloan::Config for Runtime {
-	type RuntimeEvent = RuntimeEvent;
-	type PalletId = CrowdloanId;
-	type SubmissionDeposit = SubmissionDeposit;
-	type MinContribution = MinContribution;
-	type RemoveKeysLimit = RemoveKeysLimit;
-	type Registrar = Registrar;
-	type Auctioneer = Auctions;
-	type MaxMemoLength = MaxMemoLength;
-	type WeightInfo = weights::runtime_common_crowdloan::WeightInfo<Runtime>;
-}
-
-parameter_types! {
-	// The average auction is 7 days long, so this will be 70% for ending period.
-	// 5 Days = 72000 Blocks @ 6 sec per block
-	pub const EndingPeriod: BlockNumber = 5 * DAYS;
-	// ~ 1000 samples per day -> ~ 20 blocks per sample -> 2 minute samples
-	pub const SampleLength: BlockNumber = 2 * MINUTES;
-}
-
-impl auctions::Config for Runtime {
-	type RuntimeEvent = RuntimeEvent;
-	type Leaser = Slots;
-	type Registrar = Registrar;
-	type EndingPeriod = EndingPeriod;
-	type SampleLength = SampleLength;
-	type Randomness = pallet_babe::RandomnessFromOneEpochAgo<Runtime>;
-	type InitiateOrigin = EitherOf<EnsureRoot<Self::AccountId>, AuctionAdmin>;
-	type WeightInfo = weights::runtime_common_auctions::WeightInfo<Runtime>;
-}
-
-parameter_types! {
-	pub const PoolsPalletId: PalletId = PalletId(*b"py/nopls");
-	// Allow pools that got slashed up to 90% to remain operational.
-	pub const MaxPointsToBalance: u8 = 10;
-}
-
-impl pallet_nomination_pools::Config for Runtime {
-	type RuntimeEvent = RuntimeEvent;
-	type Currency = Balances;
-	type RewardCounter = FixedU128;
-	type BalanceToU256 = runtime_common::BalanceToU256;
-	type U256ToBalance = runtime_common::U256ToBalance;
-	type Staking = Staking;
-	type PostUnbondingPoolsWindow = frame_support::traits::ConstU32<4>;
-	type MaxMetadataLen = frame_support::traits::ConstU32<256>;
-	// we use the same number of allowed unlocking chunks as with staking.
-	type MaxUnbonding = <Self as pallet_staking::Config>::MaxUnlockingChunks;
-	type PalletId = PoolsPalletId;
-	type MaxPointsToBalance = MaxPointsToBalance;
-	type WeightInfo = weights::pallet_nomination_pools::WeightInfo<Self>;
-}
-
-pub struct InitiateNominationPools;
-impl frame_support::traits::OnRuntimeUpgrade for InitiateNominationPools {
-	fn on_runtime_upgrade() -> frame_support::weights::Weight {
-		// we use one as an indicator if this has already been set.
-		if pallet_nomination_pools::MaxPools::<Runtime>::get().is_none() {
-			// 5 DOT to join a pool.
-			pallet_nomination_pools::MinJoinBond::<Runtime>::put(5 * UNITS);
-			// 100 DOT to create a pool.
-			pallet_nomination_pools::MinCreateBond::<Runtime>::put(100 * UNITS);
-
-			// Initialize with limits for now.
-			pallet_nomination_pools::MaxPools::<Runtime>::put(0);
-			pallet_nomination_pools::MaxPoolMembersPerPool::<Runtime>::put(0);
-			pallet_nomination_pools::MaxPoolMembers::<Runtime>::put(0);
-
-			log::info!(target: "runtime::polkadot", "pools config initiated 🎉");
-			<Runtime as frame_system::Config>::DbWeight::get().reads_writes(1, 5)
-		} else {
-			log::info!(target: "runtime::polkadot", "pools config already initiated 😏");
-			<Runtime as frame_system::Config>::DbWeight::get().reads(1)
-		}
-	}
-}
-
-construct_runtime! {
-	pub enum Runtime
-	{
-		// Basic stuff; balances is uncallable initially.
-		System: frame_system::{Pallet, Call, Storage, Config<T>, Event<T>} = 0,
-		Scheduler: pallet_scheduler::{Pallet, Call, Storage, Event<T>} = 1,
-		Preimage: pallet_preimage::{Pallet, Call, Storage, Event<T>} = 10,
-
-		// Babe must be before session.
-		Babe: pallet_babe::{Pallet, Call, Storage, Config<T>, ValidateUnsigned} = 2,
-
-		Timestamp: pallet_timestamp::{Pallet, Call, Storage, Inherent} = 3,
-		Indices: pallet_indices::{Pallet, Call, Storage, Config<T>, Event<T>} = 4,
-		Balances: pallet_balances::{Pallet, Call, Storage, Config<T>, Event<T>} = 5,
-		TransactionPayment: pallet_transaction_payment::{Pallet, Storage, Event<T>} = 32,
-
-		// Consensus support.
-		// Authorship must be before session in order to note author in the correct session and era
-		// for im-online and staking.
-		Authorship: pallet_authorship::{Pallet, Storage} = 6,
-		Staking: pallet_staking::{Pallet, Call, Storage, Config<T>, Event<T>} = 7,
-		Offences: pallet_offences::{Pallet, Storage, Event} = 8,
-		Historical: session_historical::{Pallet} = 33,
-		Session: pallet_session::{Pallet, Call, Storage, Event, Config<T>} = 9,
-		Grandpa: pallet_grandpa::{Pallet, Call, Storage, Config<T>, Event, ValidateUnsigned} = 11,
-		ImOnline: pallet_im_online::{Pallet, Call, Storage, Event<T>, ValidateUnsigned, Config<T>} = 12,
-		AuthorityDiscovery: pallet_authority_discovery::{Pallet, Config<T>} = 13,
-
-		// OpenGov stuff.
-		Treasury: pallet_treasury::{Pallet, Call, Storage, Config<T>, Event<T>} = 19,
-		ConvictionVoting: pallet_conviction_voting::{Pallet, Call, Storage, Event<T>} = 20,
-		Referenda: pallet_referenda::{Pallet, Call, Storage, Event<T>} = 21,
-		Origins: pallet_custom_origins::{Origin} = 22,
-		Whitelist: pallet_whitelist::{Pallet, Call, Storage, Event<T>} = 23,
-
-		// Claims. Usable initially.
-		Claims: claims::{Pallet, Call, Storage, Event<T>, Config<T>, ValidateUnsigned} = 24,
-		// Vesting. Usable initially, but removed once all vesting is finished.
-		Vesting: pallet_vesting::{Pallet, Call, Storage, Event<T>, Config<T>} = 25,
-		// Cunning utilities. Usable initially.
-		Utility: pallet_utility::{Pallet, Call, Event} = 26,
-
-		// Identity. Late addition.
-		Identity: pallet_identity::{Pallet, Call, Storage, Event<T>} = 28,
-
-		// Proxy module. Late addition.
-		Proxy: pallet_proxy::{Pallet, Call, Storage, Event<T>} = 29,
-
-		// Multisig dispatch. Late addition.
-		Multisig: pallet_multisig::{Pallet, Call, Storage, Event<T>} = 30,
-
-		// Bounties modules.
-		Bounties: pallet_bounties::{Pallet, Call, Storage, Event<T>} = 34,
-		ChildBounties: pallet_child_bounties = 38,
-
-		// Election pallet. Only works with staking, but placed here to maintain indices.
-		ElectionProviderMultiPhase: pallet_election_provider_multi_phase::{Pallet, Call, Storage, Event<T>, ValidateUnsigned} = 36,
-
-		// Provides a semi-sorted list of nominators for staking.
-		VoterList: pallet_bags_list::<Instance1>::{Pallet, Call, Storage, Event<T>} = 37,
-
-		// Nomination pools: extension to staking.
-		NominationPools: pallet_nomination_pools::{Pallet, Call, Storage, Event<T>, Config<T>} = 39,
-
-		// Fast unstake pallet: extension to staking.
-		FastUnstake: pallet_fast_unstake = 40,
-
-		// Parachains pallets. Start indices at 50 to leave room.
-		ParachainsOrigin: parachains_origin::{Pallet, Origin} = 50,
-		Configuration: parachains_configuration::{Pallet, Call, Storage, Config<T>} = 51,
-		ParasShared: parachains_shared::{Pallet, Call, Storage} = 52,
-		ParaInclusion: parachains_inclusion::{Pallet, Call, Storage, Event<T>} = 53,
-		ParaInherent: parachains_paras_inherent::{Pallet, Call, Storage, Inherent} = 54,
-		ParaScheduler: parachains_scheduler::{Pallet, Storage} = 55,
-		Paras: parachains_paras::{Pallet, Call, Storage, Event, Config<T>, ValidateUnsigned} = 56,
-		Initializer: parachains_initializer::{Pallet, Call, Storage} = 57,
-		Dmp: parachains_dmp::{Pallet, Storage} = 58,
-		// Ump 59
-		Hrmp: parachains_hrmp::{Pallet, Call, Storage, Event<T>, Config<T>} = 60,
-		ParaSessionInfo: parachains_session_info::{Pallet, Storage} = 61,
-		ParasDisputes: parachains_disputes::{Pallet, Call, Storage, Event<T>} = 62,
-		ParasSlashing: parachains_slashing::{Pallet, Call, Storage, ValidateUnsigned} = 63,
-		ParaAssignmentProvider: parachains_assigner_parachains::{Pallet} = 64,
-
-		// Parachain Onboarding Pallets. Start indices at 70 to leave room.
-		Registrar: paras_registrar::{Pallet, Call, Storage, Event<T>} = 70,
-		Slots: slots::{Pallet, Call, Storage, Event<T>} = 71,
-		Auctions: auctions::{Pallet, Call, Storage, Event<T>} = 72,
-		Crowdloan: crowdloan::{Pallet, Call, Storage, Event<T>} = 73,
-
-		// Pallet for sending XCM.
-		XcmPallet: pallet_xcm::{Pallet, Call, Storage, Event<T>, Origin, Config<T>} = 99,
-
-		// Generalized message queue
-		MessageQueue: pallet_message_queue::{Pallet, Call, Storage, Event<T>} = 100,
-	}
-}
-
-/// The address format for describing accounts.
-pub type Address = sp_runtime::MultiAddress<AccountId, ()>;
-/// Block header type as expected by this runtime.
-pub type Header = generic::Header<BlockNumber, BlakeTwo256>;
-/// Block type as expected by this runtime.
-pub type Block = generic::Block<Header, UncheckedExtrinsic>;
-/// A Block signed with a Justification
-pub type SignedBlock = generic::SignedBlock<Block>;
-/// `BlockId` type as expected by this runtime.
-pub type BlockId = generic::BlockId<Block>;
-/// The `SignedExtension` to the basic transaction logic.
-pub type SignedExtra = (
-	frame_system::CheckNonZeroSender<Runtime>,
-	frame_system::CheckSpecVersion<Runtime>,
-	frame_system::CheckTxVersion<Runtime>,
-	frame_system::CheckGenesis<Runtime>,
-	frame_system::CheckMortality<Runtime>,
-	frame_system::CheckNonce<Runtime>,
-	frame_system::CheckWeight<Runtime>,
-	pallet_transaction_payment::ChargeTransactionPayment<Runtime>,
-	claims::PrevalidateAttests<Runtime>,
-);
-
-pub struct NominationPoolsMigrationV4OldPallet;
-impl Get<Perbill> for NominationPoolsMigrationV4OldPallet {
-	fn get() -> Perbill {
-		Perbill::zero()
-	}
-}
-
-/// All migrations that will run on the next runtime upgrade.
-///
-/// This contains the combined migrations of the last 10 releases. It allows to skip runtime
-/// upgrades in case governance decides to do so. THE ORDER IS IMPORTANT.
-pub type Migrations = migrations::Unreleased;
-
-/// The runtime migrations per release.
-#[allow(deprecated, missing_docs)]
-pub mod migrations {
-	use super::*;
-	use frame_support::traits::LockIdentifier;
-	use frame_system::pallet_prelude::BlockNumberFor;
-
-	parameter_types! {
-		pub const DemocracyPalletName: &'static str = "Democracy";
-		pub const CouncilPalletName: &'static str = "Council";
-		pub const TechnicalCommitteePalletName: &'static str = "TechnicalCommittee";
-		pub const PhragmenElectionPalletName: &'static str = "PhragmenElection";
-		pub const TechnicalMembershipPalletName: &'static str = "TechnicalMembership";
-		pub const TipsPalletName: &'static str = "Tips";
-		pub const PhragmenElectionPalletId: LockIdentifier = *b"phrelect";
-	}
-
-	// Special Config for Gov V1 pallets, allowing us to run migrations for them without
-	// implementing their configs on [`Runtime`].
-	pub struct UnlockConfig;
-	impl pallet_democracy::migrations::unlock_and_unreserve_all_funds::UnlockConfig for UnlockConfig {
-		type Currency = Balances;
-		type MaxVotes = ConstU32<100>;
-		type MaxDeposits = ConstU32<100>;
-		type AccountId = AccountId;
-		type BlockNumber = BlockNumberFor<Runtime>;
-		type DbWeight = <Runtime as frame_system::Config>::DbWeight;
-		type PalletName = DemocracyPalletName;
-	}
-	impl pallet_elections_phragmen::migrations::unlock_and_unreserve_all_funds::UnlockConfig
-		for UnlockConfig
-	{
-		type Currency = Balances;
-		type MaxVotesPerVoter = ConstU32<16>;
-		type PalletId = PhragmenElectionPalletId;
-		type AccountId = AccountId;
-		type DbWeight = <Runtime as frame_system::Config>::DbWeight;
-		type PalletName = PhragmenElectionPalletName;
-	}
-	impl pallet_tips::migrations::unreserve_deposits::UnlockConfig<()> for UnlockConfig {
-		type Currency = Balances;
-		type Hash = Hash;
-		type DataDepositPerByte = DataDepositPerByte;
-		type TipReportDepositBase = TipReportDepositBase;
-		type AccountId = AccountId;
-		type BlockNumber = BlockNumberFor<Runtime>;
-		type DbWeight = <Runtime as frame_system::Config>::DbWeight;
-		type PalletName = TipsPalletName;
-	}
-
-	/// Unreleased migrations. Add new ones here:
-	pub type Unreleased = (
-		pallet_im_online::migration::v1::Migration<Runtime>,
-		parachains_configuration::migration::v7::MigrateToV7<Runtime>,
-		parachains_scheduler::migration::v1::MigrateToV1<Runtime>,
-		parachains_configuration::migration::v8::MigrateToV8<Runtime>,
-
-		// Gov v1 storage migrations
-		// https://github.com/paritytech/polkadot/issues/6749
-		pallet_elections_phragmen::migrations::unlock_and_unreserve_all_funds::UnlockAndUnreserveAllFunds<UnlockConfig>,
-		pallet_democracy::migrations::unlock_and_unreserve_all_funds::UnlockAndUnreserveAllFunds<UnlockConfig>,
-		pallet_tips::migrations::unreserve_deposits::UnreserveDeposits<UnlockConfig, ()>,
-
-		// Delete all Gov v1 pallet storage key/values.
-		frame_support::migrations::RemovePallet<DemocracyPalletName, <Runtime as frame_system::Config>::DbWeight>,
-		frame_support::migrations::RemovePallet<CouncilPalletName, <Runtime as frame_system::Config>::DbWeight>,
-		frame_support::migrations::RemovePallet<TechnicalCommitteePalletName, <Runtime as frame_system::Config>::DbWeight>,
-		frame_support::migrations::RemovePallet<PhragmenElectionPalletName, <Runtime as frame_system::Config>::DbWeight>,
-		frame_support::migrations::RemovePallet<TechnicalMembershipPalletName, <Runtime as frame_system::Config>::DbWeight>,
-		frame_support::migrations::RemovePallet<TipsPalletName, <Runtime as frame_system::Config>::DbWeight>,
-	);
-}
-
-/// Unchecked extrinsic type as expected by this runtime.
-pub type UncheckedExtrinsic =
-	generic::UncheckedExtrinsic<Address, RuntimeCall, Signature, SignedExtra>;
-/// Executive: handles dispatch to the various modules.
-pub type Executive = frame_executive::Executive<
-	Runtime,
-	Block,
-	frame_system::ChainContext<Runtime>,
-	Runtime,
-	AllPalletsWithSystem,
-	Migrations,
->;
-
-/// The payload being signed in transactions.
-pub type SignedPayload = generic::SignedPayload<RuntimeCall, SignedExtra>;
-
-#[cfg(feature = "runtime-benchmarks")]
-mod benches {
-	frame_benchmarking::define_benchmarks!(
-		// Polkadot
-		// NOTE: Make sure to prefix these with `runtime_common::` so
-		// the that path resolves correctly in the generated file.
-		[runtime_common::auctions, Auctions]
-		[runtime_common::claims, Claims]
-		[runtime_common::crowdloan, Crowdloan]
-		[runtime_common::slots, Slots]
-		[runtime_common::paras_registrar, Registrar]
-		[runtime_parachains::configuration, Configuration]
-		[runtime_parachains::disputes, ParasDisputes]
-		[runtime_parachains::disputes::slashing, ParasSlashing]
-		[runtime_parachains::hrmp, Hrmp]
-		[runtime_parachains::inclusion, ParaInclusion]
-		[runtime_parachains::initializer, Initializer]
-		[runtime_parachains::paras, Paras]
-		[runtime_parachains::paras_inherent, ParaInherent]
-		// Substrate
-		[pallet_bags_list, VoterList]
-		[pallet_balances, Balances]
-		[frame_benchmarking::baseline, Baseline::<Runtime>]
-		[pallet_bounties, Bounties]
-		[pallet_child_bounties, ChildBounties]
-		[pallet_election_provider_multi_phase, ElectionProviderMultiPhase]
-		[frame_election_provider_support, ElectionProviderBench::<Runtime>]
-		[pallet_fast_unstake, FastUnstake]
-		[pallet_identity, Identity]
-		[pallet_im_online, ImOnline]
-		[pallet_indices, Indices]
-		[pallet_message_queue, MessageQueue]
-		[pallet_multisig, Multisig]
-		[pallet_nomination_pools, NominationPoolsBench::<Runtime>]
-		[pallet_offences, OffencesBench::<Runtime>]
-		[pallet_preimage, Preimage]
-		[pallet_proxy, Proxy]
-		[pallet_scheduler, Scheduler]
-		[pallet_session, SessionBench::<Runtime>]
-		[pallet_staking, Staking]
-		[frame_system, SystemBench::<Runtime>]
-		[pallet_timestamp, Timestamp]
-		[pallet_treasury, Treasury]
-		[pallet_utility, Utility]
-		[pallet_vesting, Vesting]
-		[pallet_conviction_voting, ConvictionVoting]
-		[pallet_referenda, Referenda]
-		[pallet_whitelist, Whitelist]
-		// XCM
-		[pallet_xcm, XcmPallet]
-		[pallet_xcm_benchmarks::fungible, pallet_xcm_benchmarks::fungible::Pallet::<Runtime>]
-		[pallet_xcm_benchmarks::generic, pallet_xcm_benchmarks::generic::Pallet::<Runtime>]
-	);
-}
-
-#[cfg(not(feature = "disable-runtime-api"))]
-sp_api::impl_runtime_apis! {
-	impl sp_api::Core<Block> for Runtime {
-		fn version() -> RuntimeVersion {
-			VERSION
-		}
-
-		fn execute_block(block: Block) {
-			Executive::execute_block(block);
-		}
-
-		fn initialize_block(header: &<Block as BlockT>::Header) {
-			Executive::initialize_block(header)
-		}
-	}
-
-	impl sp_api::Metadata<Block> for Runtime {
-		fn metadata() -> OpaqueMetadata {
-			OpaqueMetadata::new(Runtime::metadata().into())
-		}
-
-		fn metadata_at_version(version: u32) -> Option<OpaqueMetadata> {
-			Runtime::metadata_at_version(version)
-		}
-
-		fn metadata_versions() -> sp_std::vec::Vec<u32> {
-			Runtime::metadata_versions()
-		}
-	}
-
-	impl block_builder_api::BlockBuilder<Block> for Runtime {
-		fn apply_extrinsic(extrinsic: <Block as BlockT>::Extrinsic) -> ApplyExtrinsicResult {
-			Executive::apply_extrinsic(extrinsic)
-		}
-
-		fn finalize_block() -> <Block as BlockT>::Header {
-			Executive::finalize_block()
-		}
-
-		fn inherent_extrinsics(data: inherents::InherentData) -> Vec<<Block as BlockT>::Extrinsic> {
-			data.create_extrinsics()
-		}
-
-		fn check_inherents(
-			block: Block,
-			data: inherents::InherentData,
-		) -> inherents::CheckInherentsResult {
-			data.check_extrinsics(&block)
-		}
-	}
-
-	impl pallet_nomination_pools_runtime_api::NominationPoolsApi<
-		Block,
-		AccountId,
-		Balance,
-	> for Runtime {
-		fn pending_rewards(member: AccountId) -> Balance {
-			NominationPools::api_pending_rewards(member).unwrap_or_default()
-		}
-
-		fn points_to_balance(pool_id: pallet_nomination_pools::PoolId, points: Balance) -> Balance {
-			NominationPools::api_points_to_balance(pool_id, points)
-		}
-
-		fn balance_to_points(pool_id: pallet_nomination_pools::PoolId, new_funds: Balance) -> Balance {
-			NominationPools::api_balance_to_points(pool_id, new_funds)
-		}
-	}
-
-	impl pallet_staking_runtime_api::StakingApi<Block, Balance> for Runtime {
-		fn nominations_quota(balance: Balance) -> u32 {
-			Staking::api_nominations_quota(balance)
-		}
-	}
-
-	impl tx_pool_api::runtime_api::TaggedTransactionQueue<Block> for Runtime {
-		fn validate_transaction(
-			source: TransactionSource,
-			tx: <Block as BlockT>::Extrinsic,
-			block_hash: <Block as BlockT>::Hash,
-		) -> TransactionValidity {
-			Executive::validate_transaction(source, tx, block_hash)
-		}
-	}
-
-	impl offchain_primitives::OffchainWorkerApi<Block> for Runtime {
-		fn offchain_worker(header: &<Block as BlockT>::Header) {
-			Executive::offchain_worker(header)
-		}
-	}
-
-	impl primitives::runtime_api::ParachainHost<Block, Hash, BlockNumber> for Runtime {
-		fn validators() -> Vec<ValidatorId> {
-			parachains_runtime_api_impl::validators::<Runtime>()
-		}
-
-		fn validator_groups() -> (Vec<Vec<ValidatorIndex>>, GroupRotationInfo<BlockNumber>) {
-			parachains_runtime_api_impl::validator_groups::<Runtime>()
-		}
-
-		fn availability_cores() -> Vec<CoreState<Hash, BlockNumber>> {
-			parachains_runtime_api_impl::availability_cores::<Runtime>()
-		}
-
-		fn persisted_validation_data(para_id: ParaId, assumption: OccupiedCoreAssumption)
-			-> Option<PersistedValidationData<Hash, BlockNumber>> {
-			parachains_runtime_api_impl::persisted_validation_data::<Runtime>(para_id, assumption)
-		}
-
-		fn assumed_validation_data(
-			para_id: ParaId,
-			expected_persisted_validation_data_hash: Hash,
-		) -> Option<(PersistedValidationData<Hash, BlockNumber>, ValidationCodeHash)> {
-			parachains_runtime_api_impl::assumed_validation_data::<Runtime>(
-				para_id,
-				expected_persisted_validation_data_hash,
-			)
-		}
-
-		fn check_validation_outputs(
-			para_id: ParaId,
-			outputs: primitives::CandidateCommitments,
-		) -> bool {
-			parachains_runtime_api_impl::check_validation_outputs::<Runtime>(para_id, outputs)
-		}
-
-		fn session_index_for_child() -> SessionIndex {
-			parachains_runtime_api_impl::session_index_for_child::<Runtime>()
-		}
-
-		fn validation_code(para_id: ParaId, assumption: OccupiedCoreAssumption)
-			-> Option<ValidationCode> {
-			parachains_runtime_api_impl::validation_code::<Runtime>(para_id, assumption)
-		}
-
-		fn candidate_pending_availability(para_id: ParaId) -> Option<CommittedCandidateReceipt<Hash>> {
-			parachains_runtime_api_impl::candidate_pending_availability::<Runtime>(para_id)
-		}
-
-		fn candidate_events() -> Vec<CandidateEvent<Hash>> {
-			parachains_runtime_api_impl::candidate_events::<Runtime, _>(|ev| {
-				match ev {
-					RuntimeEvent::ParaInclusion(ev) => {
-						Some(ev)
-					}
-					_ => None,
-				}
-			})
-		}
-
-		fn session_info(index: SessionIndex) -> Option<SessionInfo> {
-			parachains_runtime_api_impl::session_info::<Runtime>(index)
-		}
-
-		fn session_executor_params(session_index: SessionIndex) -> Option<ExecutorParams> {
-			parachains_runtime_api_impl::session_executor_params::<Runtime>(session_index)
-		}
-
-		fn dmq_contents(recipient: ParaId) -> Vec<InboundDownwardMessage<BlockNumber>> {
-			parachains_runtime_api_impl::dmq_contents::<Runtime>(recipient)
-		}
-
-		fn inbound_hrmp_channels_contents(
-			recipient: ParaId
-		) -> BTreeMap<ParaId, Vec<InboundHrmpMessage<BlockNumber>>> {
-			parachains_runtime_api_impl::inbound_hrmp_channels_contents::<Runtime>(recipient)
-		}
-
-		fn validation_code_by_hash(hash: ValidationCodeHash) -> Option<ValidationCode> {
-			parachains_runtime_api_impl::validation_code_by_hash::<Runtime>(hash)
-		}
-
-		fn on_chain_votes() -> Option<ScrapedOnChainVotes<Hash>> {
-			parachains_runtime_api_impl::on_chain_votes::<Runtime>()
-		}
-
-		fn submit_pvf_check_statement(
-			stmt: primitives::PvfCheckStatement,
-			signature: primitives::ValidatorSignature,
-		) {
-			parachains_runtime_api_impl::submit_pvf_check_statement::<Runtime>(stmt, signature)
-		}
-
-		fn pvfs_require_precheck() -> Vec<ValidationCodeHash> {
-			parachains_runtime_api_impl::pvfs_require_precheck::<Runtime>()
-		}
-
-		fn validation_code_hash(para_id: ParaId, assumption: OccupiedCoreAssumption)
-			-> Option<ValidationCodeHash>
-		{
-			parachains_runtime_api_impl::validation_code_hash::<Runtime>(para_id, assumption)
-		}
-
-		fn disputes() -> Vec<(SessionIndex, CandidateHash, DisputeState<BlockNumber>)> {
-			parachains_runtime_api_impl::get_session_disputes::<Runtime>()
-		}
-
-		fn unapplied_slashes(
-		) -> Vec<(SessionIndex, CandidateHash, slashing::PendingSlashes)> {
-			parachains_runtime_api_impl::unapplied_slashes::<Runtime>()
-		}
-
-		fn key_ownership_proof(
-			validator_id: ValidatorId,
-		) -> Option<slashing::OpaqueKeyOwnershipProof> {
-			use parity_scale_codec::Encode;
-
-			Historical::prove((PARACHAIN_KEY_TYPE_ID, validator_id))
-				.map(|p| p.encode())
-				.map(slashing::OpaqueKeyOwnershipProof::new)
-		}
-
-		fn submit_report_dispute_lost(
-			dispute_proof: slashing::DisputeProof,
-			key_ownership_proof: slashing::OpaqueKeyOwnershipProof,
-		) -> Option<()> {
-			parachains_runtime_api_impl::submit_unsigned_slashing_report::<Runtime>(
-				dispute_proof,
-				key_ownership_proof,
-			)
-		}
-	}
-
-	impl beefy_primitives::BeefyApi<Block, BeefyId> for Runtime {
-		fn beefy_genesis() -> Option<BlockNumber> {
-			// dummy implementation due to lack of BEEFY pallet.
-			None
-		}
-
-		fn validator_set() -> Option<beefy_primitives::ValidatorSet<BeefyId>> {
-			// dummy implementation due to lack of BEEFY pallet.
-			None
-		}
-
-		fn submit_report_equivocation_unsigned_extrinsic(
-			_equivocation_proof: beefy_primitives::EquivocationProof<
-				BlockNumber,
-				BeefyId,
-				BeefySignature,
-			>,
-			_key_owner_proof: beefy_primitives::OpaqueKeyOwnershipProof,
-		) -> Option<()> {
-			None
-		}
-
-		fn generate_key_ownership_proof(
-			_set_id: beefy_primitives::ValidatorSetId,
-			_authority_id: BeefyId,
-		) -> Option<beefy_primitives::OpaqueKeyOwnershipProof> {
-			None
-		}
-	}
-
-	impl mmr::MmrApi<Block, Hash, BlockNumber> for Runtime {
-		fn mmr_root() -> Result<Hash, mmr::Error> {
-			Err(mmr::Error::PalletNotIncluded)
-		}
-
-		fn mmr_leaf_count() -> Result<mmr::LeafIndex, mmr::Error> {
-			Err(mmr::Error::PalletNotIncluded)
-		}
-
-		fn generate_proof(
-			_block_numbers: Vec<BlockNumber>,
-			_best_known_block_number: Option<BlockNumber>,
-		) -> Result<(Vec<mmr::EncodableOpaqueLeaf>, mmr::Proof<Hash>), mmr::Error> {
-			Err(mmr::Error::PalletNotIncluded)
-		}
-
-		fn verify_proof(_leaves: Vec<mmr::EncodableOpaqueLeaf>, _proof: mmr::Proof<Hash>)
-			-> Result<(), mmr::Error>
-		{
-			Err(mmr::Error::PalletNotIncluded)
-		}
-
-		fn verify_proof_stateless(
-			_root: Hash,
-			_leaves: Vec<mmr::EncodableOpaqueLeaf>,
-			_proof: mmr::Proof<Hash>
-		) -> Result<(), mmr::Error> {
-			Err(mmr::Error::PalletNotIncluded)
-		}
-	}
-
-	impl fg_primitives::GrandpaApi<Block> for Runtime {
-		fn grandpa_authorities() -> Vec<(GrandpaId, u64)> {
-			Grandpa::grandpa_authorities()
-		}
-
-		fn current_set_id() -> fg_primitives::SetId {
-			Grandpa::current_set_id()
-		}
-
-		fn submit_report_equivocation_unsigned_extrinsic(
-			equivocation_proof: fg_primitives::EquivocationProof<
-				<Block as BlockT>::Hash,
-				sp_runtime::traits::NumberFor<Block>,
-			>,
-			key_owner_proof: fg_primitives::OpaqueKeyOwnershipProof,
-		) -> Option<()> {
-			let key_owner_proof = key_owner_proof.decode()?;
-
-			Grandpa::submit_unsigned_equivocation_report(
-				equivocation_proof,
-				key_owner_proof,
-			)
-		}
-
-		fn generate_key_ownership_proof(
-			_set_id: fg_primitives::SetId,
-			authority_id: fg_primitives::AuthorityId,
-		) -> Option<fg_primitives::OpaqueKeyOwnershipProof> {
-			use parity_scale_codec::Encode;
-
-			Historical::prove((fg_primitives::KEY_TYPE, authority_id))
-				.map(|p| p.encode())
-				.map(fg_primitives::OpaqueKeyOwnershipProof::new)
-		}
-	}
-
-	impl babe_primitives::BabeApi<Block> for Runtime {
-		fn configuration() -> babe_primitives::BabeConfiguration {
-			let epoch_config = Babe::epoch_config().unwrap_or(BABE_GENESIS_EPOCH_CONFIG);
-			babe_primitives::BabeConfiguration {
-				slot_duration: Babe::slot_duration(),
-				epoch_length: EpochDuration::get(),
-				c: epoch_config.c,
-				authorities: Babe::authorities().to_vec(),
-				randomness: Babe::randomness(),
-				allowed_slots: epoch_config.allowed_slots,
-			}
-		}
-
-		fn current_epoch_start() -> babe_primitives::Slot {
-			Babe::current_epoch_start()
-		}
-
-		fn current_epoch() -> babe_primitives::Epoch {
-			Babe::current_epoch()
-		}
-
-		fn next_epoch() -> babe_primitives::Epoch {
-			Babe::next_epoch()
-		}
-
-		fn generate_key_ownership_proof(
-			_slot: babe_primitives::Slot,
-			authority_id: babe_primitives::AuthorityId,
-		) -> Option<babe_primitives::OpaqueKeyOwnershipProof> {
-			use parity_scale_codec::Encode;
-
-			Historical::prove((babe_primitives::KEY_TYPE, authority_id))
-				.map(|p| p.encode())
-				.map(babe_primitives::OpaqueKeyOwnershipProof::new)
-		}
-
-		fn submit_report_equivocation_unsigned_extrinsic(
-			equivocation_proof: babe_primitives::EquivocationProof<<Block as BlockT>::Header>,
-			key_owner_proof: babe_primitives::OpaqueKeyOwnershipProof,
-		) -> Option<()> {
-			let key_owner_proof = key_owner_proof.decode()?;
-
-			Babe::submit_unsigned_equivocation_report(
-				equivocation_proof,
-				key_owner_proof,
-			)
-		}
-	}
-
-	impl authority_discovery_primitives::AuthorityDiscoveryApi<Block> for Runtime {
-		fn authorities() -> Vec<AuthorityDiscoveryId> {
-			parachains_runtime_api_impl::relevant_authority_ids::<Runtime>()
-		}
-	}
-
-	impl sp_session::SessionKeys<Block> for Runtime {
-		fn generate_session_keys(seed: Option<Vec<u8>>) -> Vec<u8> {
-			SessionKeys::generate(seed)
-		}
-
-		fn decode_session_keys(
-			encoded: Vec<u8>,
-		) -> Option<Vec<(Vec<u8>, sp_core::crypto::KeyTypeId)>> {
-			SessionKeys::decode_into_raw_public_keys(&encoded)
-		}
-	}
-
-	impl frame_system_rpc_runtime_api::AccountNonceApi<Block, AccountId, Nonce> for Runtime {
-		fn account_nonce(account: AccountId) -> Nonce {
-			System::account_nonce(account)
-		}
-	}
-
-	impl pallet_transaction_payment_rpc_runtime_api::TransactionPaymentApi<
-		Block,
-		Balance,
-	> for Runtime {
-		fn query_info(uxt: <Block as BlockT>::Extrinsic, len: u32) -> RuntimeDispatchInfo<Balance> {
-			TransactionPayment::query_info(uxt, len)
-		}
-		fn query_fee_details(uxt: <Block as BlockT>::Extrinsic, len: u32) -> FeeDetails<Balance> {
-			TransactionPayment::query_fee_details(uxt, len)
-		}
-		fn query_weight_to_fee(weight: Weight) -> Balance {
-			TransactionPayment::weight_to_fee(weight)
-		}
-		fn query_length_to_fee(length: u32) -> Balance {
-			TransactionPayment::length_to_fee(length)
-		}
-	}
-
-	impl pallet_transaction_payment_rpc_runtime_api::TransactionPaymentCallApi<Block, Balance, RuntimeCall>
-		for Runtime
-	{
-		fn query_call_info(call: RuntimeCall, len: u32) -> RuntimeDispatchInfo<Balance> {
-			TransactionPayment::query_call_info(call, len)
-		}
-		fn query_call_fee_details(call: RuntimeCall, len: u32) -> FeeDetails<Balance> {
-			TransactionPayment::query_call_fee_details(call, len)
-		}
-		fn query_weight_to_fee(weight: Weight) -> Balance {
-			TransactionPayment::weight_to_fee(weight)
-		}
-		fn query_length_to_fee(length: u32) -> Balance {
-			TransactionPayment::length_to_fee(length)
-		}
-	}
-
-	#[cfg(feature = "try-runtime")]
-	impl frame_try_runtime::TryRuntime<Block> for Runtime {
-		fn on_runtime_upgrade(checks: frame_try_runtime::UpgradeCheckSelect) -> (Weight, Weight) {
-			log::info!("try-runtime::on_runtime_upgrade polkadot.");
-			let weight = Executive::try_runtime_upgrade(checks).unwrap();
-			(weight, BlockWeights::get().max_block)
-		}
-
-		fn execute_block(
-			block: Block,
-			state_root_check: bool,
-			signature_check: bool,
-			select: frame_try_runtime::TryStateSelect,
-		) -> Weight {
-			// NOTE: intentional unwrap: we don't want to propagate the error backwards, and want to
-			// have a backtrace here.
-			Executive::try_execute_block(block, state_root_check, signature_check, select).unwrap()
-		}
-	}
-
-	#[cfg(feature = "runtime-benchmarks")]
-	impl frame_benchmarking::Benchmark<Block> for Runtime {
-		fn benchmark_metadata(extra: bool) -> (
-			Vec<frame_benchmarking::BenchmarkList>,
-			Vec<frame_support::traits::StorageInfo>,
-		) {
-			use frame_benchmarking::{Benchmarking, BenchmarkList};
-			use frame_support::traits::StorageInfoTrait;
-
-			use pallet_session_benchmarking::Pallet as SessionBench;
-			use pallet_offences_benchmarking::Pallet as OffencesBench;
-			use pallet_election_provider_support_benchmarking::Pallet as ElectionProviderBench;
-			use pallet_nomination_pools_benchmarking::Pallet as NominationPoolsBench;
-			use frame_system_benchmarking::Pallet as SystemBench;
-			use frame_benchmarking::baseline::Pallet as Baseline;
-
-			let mut list = Vec::<BenchmarkList>::new();
-			list_benchmarks!(list, extra);
-
-			let storage_info = AllPalletsWithSystem::storage_info();
-			return (list, storage_info)
-		}
-
-		fn dispatch_benchmark(
-			config: frame_benchmarking::BenchmarkConfig
-		) -> Result<
-			Vec<frame_benchmarking::BenchmarkBatch>,
-			sp_runtime::RuntimeString,
-		> {
-			use frame_support::traits::WhitelistedStorageKeys;
-			use frame_benchmarking::{Benchmarking, BenchmarkBatch, BenchmarkError};
-			use sp_storage::TrackedStorageKey;
-			// Trying to add benchmarks directly to some pallets caused cyclic dependency issues.
-			// To get around that, we separated the benchmarks into its own crate.
-			use pallet_session_benchmarking::Pallet as SessionBench;
-			use pallet_offences_benchmarking::Pallet as OffencesBench;
-			use pallet_election_provider_support_benchmarking::Pallet as ElectionProviderBench;
-			use pallet_nomination_pools_benchmarking::Pallet as NominationPoolsBench;
-			use frame_system_benchmarking::Pallet as SystemBench;
-			use frame_benchmarking::baseline::Pallet as Baseline;
-			use xcm::latest::prelude::*;
-			use xcm_config::{XcmConfig, StatemintLocation, TokenLocation, LocalCheckAccount, SovereignAccountOf};
-
-			impl pallet_session_benchmarking::Config for Runtime {}
-			impl pallet_offences_benchmarking::Config for Runtime {}
-			impl pallet_election_provider_support_benchmarking::Config for Runtime {}
-			impl frame_system_benchmarking::Config for Runtime {}
-			impl frame_benchmarking::baseline::Config for Runtime {}
-			impl pallet_nomination_pools_benchmarking::Config for Runtime {}
-			impl runtime_parachains::disputes::slashing::benchmarking::Config for Runtime {}
-
-			let mut whitelist: Vec<TrackedStorageKey> = AllPalletsWithSystem::whitelisted_storage_keys();
-			let treasury_key = frame_system::Account::<Runtime>::hashed_key_for(Treasury::account_id());
-			whitelist.push(treasury_key.to_vec().into());
-
-			impl pallet_xcm_benchmarks::Config for Runtime {
-				type XcmConfig = XcmConfig;
-				type AccountIdConverter = SovereignAccountOf;
-				fn valid_destination() -> Result<MultiLocation, BenchmarkError> {
-					Ok(StatemintLocation::get())
-				}
-				fn worst_case_holding(_depositable_count: u32) -> MultiAssets {
-					// Polkadot only knows about DOT
-					vec![MultiAsset { id: Concrete(TokenLocation::get()), fun: Fungible(1_000_000 * UNITS) }].into()
-				}
-			}
-
-			parameter_types! {
-				pub const TrustedTeleporter: Option<(MultiLocation, MultiAsset)> = Some((
-					StatemintLocation::get(),
-					MultiAsset { id: Concrete(TokenLocation::get()), fun: Fungible(1 * UNITS) }
-				));
-				pub const TrustedReserve: Option<(MultiLocation, MultiAsset)> = None;
-			}
-
-			impl pallet_xcm_benchmarks::fungible::Config for Runtime {
-				type TransactAsset = Balances;
-
-				type CheckedAccount = LocalCheckAccount;
-				type TrustedTeleporter = TrustedTeleporter;
-				type TrustedReserve = TrustedReserve;
-
-				fn get_multi_asset() -> MultiAsset {
-					MultiAsset {
-						id: Concrete(TokenLocation::get()),
-						fun: Fungible(1 * UNITS)
-					}
-				}
-			}
-
-			impl pallet_xcm_benchmarks::generic::Config for Runtime {
-				type RuntimeCall = RuntimeCall;
-
-				fn worst_case_response() -> (u64, Response) {
-					(0u64, Response::Version(Default::default()))
-				}
-
-				fn worst_case_asset_exchange() -> Result<(MultiAssets, MultiAssets), BenchmarkError> {
-					// Polkadot doesn't support asset exchanges
-					Err(BenchmarkError::Skip)
-				}
-
-				fn universal_alias() -> Result<(MultiLocation, Junction), BenchmarkError> {
-					// The XCM executor of Polkadot doesn't have a configured `UniversalAliases`
-					Err(BenchmarkError::Skip)
-				}
-
-				fn transact_origin_and_runtime_call() -> Result<(MultiLocation, RuntimeCall), BenchmarkError> {
-					Ok((StatemintLocation::get(), frame_system::Call::remark_with_event { remark: vec![] }.into()))
-				}
-
-				fn subscribe_origin() -> Result<MultiLocation, BenchmarkError> {
-					Ok(StatemintLocation::get())
-				}
-
-				fn claimable_asset() -> Result<(MultiLocation, MultiLocation, MultiAssets), BenchmarkError> {
-					let origin = StatemintLocation::get();
-					let assets: MultiAssets = (Concrete(TokenLocation::get()), 1_000 * UNITS).into();
-					let ticket = MultiLocation { parents: 0, interior: Here };
-					Ok((origin, ticket, assets))
-				}
-
-				fn unlockable_asset() -> Result<(MultiLocation, MultiLocation, MultiAsset), BenchmarkError> {
-					// Polkadot doesn't support asset locking
-					Err(BenchmarkError::Skip)
-				}
-
-				fn export_message_origin_and_destination(
-				) -> Result<(MultiLocation, NetworkId, InteriorMultiLocation), BenchmarkError> {
-					// Polkadot doesn't support exporting messages
-					Err(BenchmarkError::Skip)
-				}
-
-				fn alias_origin() -> Result<(MultiLocation, MultiLocation), BenchmarkError> {
-					// The XCM executor of Polkadot doesn't have a configured `Aliasers`
-					Err(BenchmarkError::Skip)
-				}
-			}
-
-			let mut batches = Vec::<BenchmarkBatch>::new();
-			let params = (&config, &whitelist);
-
-			add_benchmarks!(params, batches);
-
-			Ok(batches)
-		}
-	}
-}
-
-#[cfg(test)]
-mod test_fees {
-	use super::*;
-	use frame_support::{dispatch::GetDispatchInfo, weights::WeightToFee as WeightToFeeT};
-	use keyring::Sr25519Keyring::{Alice, Charlie};
-	use pallet_transaction_payment::Multiplier;
-	use runtime_common::MinimumMultiplier;
-	use separator::Separatable;
-	use sp_runtime::{assert_eq_error_rate, FixedPointNumber, MultiAddress, MultiSignature};
-
-	#[test]
-	fn payout_weight_portion() {
-		use pallet_staking::WeightInfo;
-		let payout_weight =
-			<Runtime as pallet_staking::Config>::WeightInfo::payout_stakers_alive_staked(
-				MaxNominatorRewardedPerValidator::get(),
-			)
-			.ref_time() as f64;
-		let block_weight = BlockWeights::get().max_block.ref_time() as f64;
-
-		println!(
-			"a full payout takes {:.2} of the block weight [{} / {}]",
-			payout_weight / block_weight,
-			payout_weight,
-			block_weight
-		);
-		assert!(payout_weight * 2f64 < block_weight);
-	}
-
-	#[test]
-	fn block_cost() {
-		let max_block_weight = BlockWeights::get().max_block;
-		let raw_fee = WeightToFee::weight_to_fee(&max_block_weight);
-
-		let fee_with_multiplier = |m: Multiplier| {
-			println!(
-				"Full Block weight == {} // multiplier: {:?} // WeightToFee(full_block) == {} plank",
-				max_block_weight,
-				m,
-				m.saturating_mul_int(raw_fee).separated_string(),
-			);
-		};
-		fee_with_multiplier(MinimumMultiplier::get());
-		fee_with_multiplier(Multiplier::from_rational(1, 2));
-		fee_with_multiplier(Multiplier::from_u32(1));
-		fee_with_multiplier(Multiplier::from_u32(2));
-	}
-
-	#[test]
-	fn transfer_cost_min_multiplier() {
-		let min_multiplier = MinimumMultiplier::get();
-		let call = pallet_balances::Call::<Runtime>::transfer_keep_alive {
-			dest: Charlie.to_account_id().into(),
-			value: Default::default(),
-		};
-		let info = call.get_dispatch_info();
-		println!("call = {:?} / info = {:?}", call, info);
-		// convert to runtime call.
-		let call = RuntimeCall::Balances(call);
-		let extra: SignedExtra = (
-			frame_system::CheckNonZeroSender::<Runtime>::new(),
-			frame_system::CheckSpecVersion::<Runtime>::new(),
-			frame_system::CheckTxVersion::<Runtime>::new(),
-			frame_system::CheckGenesis::<Runtime>::new(),
-			frame_system::CheckMortality::<Runtime>::from(generic::Era::immortal()),
-			frame_system::CheckNonce::<Runtime>::from(1),
-			frame_system::CheckWeight::<Runtime>::new(),
-			pallet_transaction_payment::ChargeTransactionPayment::<Runtime>::from(0),
-			claims::PrevalidateAttests::<Runtime>::new(),
-		);
-		let uxt = UncheckedExtrinsic {
-			function: call,
-			signature: Some((
-				MultiAddress::Id(Alice.to_account_id()),
-				MultiSignature::Sr25519(Alice.sign(b"foo")),
-				extra,
-			)),
-		};
-		let len = uxt.encoded_size();
-
-		let mut ext = sp_io::TestExternalities::new_empty();
-		let mut test_with_multiplier = |m: Multiplier| {
-			ext.execute_with(|| {
-				pallet_transaction_payment::NextFeeMultiplier::<Runtime>::put(m);
-				let fee = TransactionPayment::query_fee_details(uxt.clone(), len as u32);
-				println!(
-					"multiplier = {:?} // fee details = {:?} // final fee = {:?}",
-					pallet_transaction_payment::NextFeeMultiplier::<Runtime>::get(),
-					fee,
-					fee.final_fee().separated_string(),
-				);
-			});
-		};
-
-		test_with_multiplier(min_multiplier);
-		test_with_multiplier(Multiplier::saturating_from_rational(1u128, 1u128));
-		test_with_multiplier(Multiplier::saturating_from_rational(1u128, 1_0u128));
-		test_with_multiplier(Multiplier::saturating_from_rational(1u128, 1_00u128));
-		test_with_multiplier(Multiplier::saturating_from_rational(1u128, 1_000u128));
-		test_with_multiplier(Multiplier::saturating_from_rational(1u128, 1_000_000u128));
-		test_with_multiplier(Multiplier::saturating_from_rational(1u128, 1_000_000_000u128));
-	}
-
-	#[test]
-	fn nominator_limit() {
-		use pallet_election_provider_multi_phase::WeightInfo;
-		// starting point of the nominators.
-		let target_voters: u32 = 50_000;
-
-		// assuming we want around 5k candidates and 1k active validators. (March 31, 2021)
-		let all_targets: u32 = 5_000;
-		let desired: u32 = 1_000;
-		let weight_with = |active| {
-			<Runtime as pallet_election_provider_multi_phase::Config>::WeightInfo::submit_unsigned(
-				active,
-				all_targets,
-				active,
-				desired,
-			)
-		};
-
-		let mut active = target_voters;
-		while weight_with(active).all_lte(OffchainSolutionWeightLimit::get()) ||
-			active == target_voters
-		{
-			active += 1;
-		}
-
-		println!("can support {} nominators to yield a weight of {}", active, weight_with(active));
-		assert!(active > target_voters, "we need to reevaluate the weight of the election system");
-	}
-
-	#[test]
-	fn signed_deposit_is_sensible() {
-		// ensure this number does not change, or that it is checked after each change.
-		// a 1 MB solution should take (40 + 10) DOTs of deposit.
-		let deposit = SignedDepositBase::get() + (SignedDepositByte::get() * 1024 * 1024);
-		assert_eq_error_rate!(deposit, 50 * DOLLARS, DOLLARS);
-	}
-}
-
-#[cfg(test)]
-mod test {
-	use std::collections::HashSet;
-
-	use super::*;
-	use frame_support::traits::WhitelistedStorageKeys;
-	use sp_core::hexdisplay::HexDisplay;
-
-	#[test]
-	fn call_size() {
-		RuntimeCall::assert_size_under(230);
-	}
-
-	#[test]
-	fn check_whitelist() {
-		let whitelist: HashSet<String> = AllPalletsWithSystem::whitelisted_storage_keys()
-			.iter()
-			.map(|e| HexDisplay::from(&e.key).to_string())
-			.collect();
-
-		// Block number
-		assert!(
-			whitelist.contains("26aa394eea5630e07c48ae0c9558cef702a5c1b19ab7a04f536c519aca4983ac")
-		);
-		// Total issuance
-		assert!(
-			whitelist.contains("c2261276cc9d1f8598ea4b6a74b15c2f57c875e4cff74148e4628f264b974c80")
-		);
-		// Execution phase
-		assert!(
-			whitelist.contains("26aa394eea5630e07c48ae0c9558cef7ff553b5a9862a516939d82b3d3d8661a")
-		);
-		// Event count
-		assert!(
-			whitelist.contains("26aa394eea5630e07c48ae0c9558cef70a98fdbe9ce6c55837576c60c7af3850")
-		);
-		// System events
-		assert!(
-			whitelist.contains("26aa394eea5630e07c48ae0c9558cef780d41e5e16056765bc8461851072c9d7")
-		);
-		// XcmPallet VersionDiscoveryQueue
-		assert!(
-			whitelist.contains("1405f2411d0af5a7ff397e7c9dc68d194a222ba0333561192e474c59ed8e30e1")
-		);
-		// XcmPallet SafeXcmVersion
-		assert!(
-			whitelist.contains("1405f2411d0af5a7ff397e7c9dc68d196323ae84c43568be0d1394d5d0d522c4")
-		);
-	}
-}
-
-#[cfg(test)]
-mod multiplier_tests {
-	use super::*;
-	use frame_support::{dispatch::DispatchInfo, traits::OnFinalize};
-	use runtime_common::{MinimumMultiplier, TargetBlockFullness};
-	use separator::Separatable;
-	use sp_runtime::traits::Convert;
-
-	fn run_with_system_weight<F>(w: Weight, mut assertions: F)
-	where
-		F: FnMut() -> (),
-	{
-		let mut t: sp_io::TestExternalities = frame_system::GenesisConfig::<Runtime>::default()
-			.build_storage()
-			.unwrap()
-			.into();
-		t.execute_with(|| {
-			System::set_block_consumed_resources(w, 0);
-			assertions()
-		});
-	}
-
-	#[test]
-	fn multiplier_can_grow_from_zero() {
-		let minimum_multiplier = MinimumMultiplier::get();
-		let target = TargetBlockFullness::get() *
-			BlockWeights::get().get(DispatchClass::Normal).max_total.unwrap();
-		// if the min is too small, then this will not change, and we are doomed forever.
-		// the weight is 1/100th bigger than target.
-		run_with_system_weight(target.saturating_mul(101) / 100, || {
-			let next = SlowAdjustingFeeUpdate::<Runtime>::convert(minimum_multiplier);
-			assert!(next > minimum_multiplier, "{:?} !>= {:?}", next, minimum_multiplier);
-		})
-	}
-
-	#[test]
-	fn fast_unstake_estimate() {
-		use pallet_fast_unstake::WeightInfo;
-		let block_time = BlockWeights::get().max_block.ref_time() as f32;
-		let on_idle = weights::pallet_fast_unstake::WeightInfo::<Runtime>::on_idle_check(
-			300,
-			<Runtime as pallet_fast_unstake::Config>::BatchSize::get(),
-		)
-		.ref_time() as f32;
-		println!("ratio of block weight for full batch fast-unstake {}", on_idle / block_time);
-		assert!(on_idle / block_time <= 0.5f32)
-	}
-
-	#[test]
-	#[ignore]
-	fn multiplier_growth_simulator() {
-		// assume the multiplier is initially set to its minimum. We update it with values twice the
-		//target (target is 25%, thus 50%) and we see at which point it reaches 1.
-		let mut multiplier = MinimumMultiplier::get();
-		let block_weight = BlockWeights::get().get(DispatchClass::Normal).max_total.unwrap();
-		let mut blocks = 0;
-		let mut fees_paid = 0;
-
-		frame_system::Pallet::<Runtime>::set_block_consumed_resources(Weight::MAX, 0);
-		let info = DispatchInfo { weight: Weight::MAX, ..Default::default() };
-
-		let mut t: sp_io::TestExternalities = frame_system::GenesisConfig::<Runtime>::default()
-			.build_storage()
-			.unwrap()
-			.into();
-		// set the minimum
-		t.execute_with(|| {
-			pallet_transaction_payment::NextFeeMultiplier::<Runtime>::set(MinimumMultiplier::get());
-		});
-
-		while multiplier <= Multiplier::from_u32(1) {
-			t.execute_with(|| {
-				// imagine this tx was called.
-				let fee = TransactionPayment::compute_fee(0, &info, 0);
-				fees_paid += fee;
-
-				// this will update the multiplier.
-				System::set_block_consumed_resources(block_weight, 0);
-				TransactionPayment::on_finalize(1);
-				let next = TransactionPayment::next_fee_multiplier();
-
-				assert!(next > multiplier, "{:?} !>= {:?}", next, multiplier);
-				multiplier = next;
-
-				println!(
-					"block = {} / multiplier {:?} / fee = {:?} / fess so far {:?}",
-					blocks,
-					multiplier,
-					fee.separated_string(),
-					fees_paid.separated_string()
-				);
-			});
-			blocks += 1;
-		}
-	}
-
-	#[test]
-	#[ignore]
-	fn multiplier_cool_down_simulator() {
-		// assume the multiplier is initially set to its minimum. We update it with values twice the
-		//target (target is 25%, thus 50%) and we see at which point it reaches 1.
-		let mut multiplier = Multiplier::from_u32(2);
-		let mut blocks = 0;
-
-		let mut t: sp_io::TestExternalities = frame_system::GenesisConfig::<Runtime>::default()
-			.build_storage()
-			.unwrap()
-			.into();
-		// set the minimum
-		t.execute_with(|| {
-			pallet_transaction_payment::NextFeeMultiplier::<Runtime>::set(multiplier);
-		});
-
-		while multiplier > Multiplier::from_u32(0) {
-			t.execute_with(|| {
-				// this will update the multiplier.
-				TransactionPayment::on_finalize(1);
-				let next = TransactionPayment::next_fee_multiplier();
-
-				assert!(next < multiplier, "{:?} !>= {:?}", next, multiplier);
-				multiplier = next;
-
-				println!("block = {} / multiplier {:?}", blocks, multiplier);
-			});
-			blocks += 1;
-		}
-	}
-}
-
-#[cfg(all(test, feature = "try-runtime"))]
-mod remote_tests {
-	use super::*;
-	use frame_try_runtime::{runtime_decl_for_try_runtime::TryRuntime, UpgradeCheckSelect};
-	use remote_externalities::{
-		Builder, Mode, OfflineConfig, OnlineConfig, SnapshotConfig, Transport,
-	};
-	use std::env::var;
-
-	#[tokio::test]
-	async fn run_migrations() {
-		if var("RUN_MIGRATION_TESTS").is_err() {
-			return
-		}
-
-		sp_tracing::try_init_simple();
-		let transport: Transport =
-			var("WS").unwrap_or("wss://rpc.polkadot.io:443".to_string()).into();
-		let maybe_state_snapshot: Option<SnapshotConfig> = var("SNAP").map(|s| s.into()).ok();
-		let mut ext = Builder::<Block>::default()
-			.mode(if let Some(state_snapshot) = maybe_state_snapshot {
-				Mode::OfflineOrElseOnline(
-					OfflineConfig { state_snapshot: state_snapshot.clone() },
-					OnlineConfig {
-						transport,
-						state_snapshot: Some(state_snapshot),
-						..Default::default()
-					},
-				)
-			} else {
-				Mode::Online(OnlineConfig { transport, ..Default::default() })
-			})
-			.build()
-			.await
-			.unwrap();
-		ext.execute_with(|| Runtime::on_runtime_upgrade(UpgradeCheckSelect::PreAndPost));
-	}
-
-	#[tokio::test]
-	#[ignore = "this test is meant to be executed manually"]
-	async fn try_fast_unstake_all() {
-		sp_tracing::try_init_simple();
-		let transport: Transport =
-			var("WS").unwrap_or("wss://rpc.polkadot.io:443".to_string()).into();
-		let maybe_state_snapshot: Option<SnapshotConfig> = var("SNAP").map(|s| s.into()).ok();
-		let mut ext = Builder::<Block>::default()
-			.mode(if let Some(state_snapshot) = maybe_state_snapshot {
-				Mode::OfflineOrElseOnline(
-					OfflineConfig { state_snapshot: state_snapshot.clone() },
-					OnlineConfig {
-						transport,
-						state_snapshot: Some(state_snapshot),
-						..Default::default()
-					},
-				)
-			} else {
-				Mode::Online(OnlineConfig { transport, ..Default::default() })
-			})
-			.build()
-			.await
-			.unwrap();
-		ext.execute_with(|| {
-			pallet_fast_unstake::ErasToCheckPerBlock::<Runtime>::put(1);
-			runtime_common::try_runtime::migrate_all_inactive_nominators::<Runtime>()
-		});
-	}
-}
diff --git a/polkadot/runtime/polkadot/src/weights/frame_benchmarking_baseline.rs b/polkadot/runtime/polkadot/src/weights/frame_benchmarking_baseline.rs
deleted file mode 100644
index bb27fdc880ca46c2f05e368a51b7da77e23b7a10..0000000000000000000000000000000000000000
--- a/polkadot/runtime/polkadot/src/weights/frame_benchmarking_baseline.rs
+++ /dev/null
@@ -1,108 +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/>.
-
-//! Autogenerated weights for `frame_benchmarking::baseline`
-//!
-//! THIS FILE WAS AUTO-GENERATED USING THE SUBSTRATE BENCHMARK CLI VERSION 4.0.0-dev
-//! DATE: 2023-06-18, STEPS: `50`, REPEAT: `20`, LOW RANGE: `[]`, HIGH RANGE: `[]`
-//! WORST CASE MAP SIZE: `1000000`
-//! HOSTNAME: `runner-e8ezs4ez-project-163-concurrent-0`, CPU: `Intel(R) Xeon(R) CPU @ 2.60GHz`
-//! EXECUTION: Some(Wasm), WASM-EXECUTION: Compiled, CHAIN: Some("polkadot-dev"), DB CACHE: 1024
-
-// Executed Command:
-// ./target/production/polkadot
-// benchmark
-// pallet
-// --chain=polkadot-dev
-// --steps=50
-// --repeat=20
-// --no-storage-info
-// --no-median-slopes
-// --no-min-squares
-// --pallet=frame_benchmarking::baseline
-// --extrinsic=*
-// --execution=wasm
-// --wasm-execution=compiled
-// --header=./file_header.txt
-// --output=./runtime/polkadot/src/weights/frame_benchmarking_baseline.rs
-
-#![cfg_attr(rustfmt, rustfmt_skip)]
-#![allow(unused_parens)]
-#![allow(unused_imports)]
-#![allow(missing_docs)]
-
-use frame_support::{traits::Get, weights::Weight};
-use core::marker::PhantomData;
-
-/// Weight functions for `frame_benchmarking::baseline`.
-pub struct WeightInfo<T>(PhantomData<T>);
-impl<T: frame_system::Config> frame_benchmarking::baseline::WeightInfo for WeightInfo<T> {
-	/// The range of component `i` is `[0, 1000000]`.
-	fn addition(_i: u32, ) -> Weight {
-		// Proof Size summary in bytes:
-		//  Measured:  `0`
-		//  Estimated: `0`
-		// Minimum execution time: 163_000 picoseconds.
-		Weight::from_parts(209_370, 0)
-			.saturating_add(Weight::from_parts(0, 0))
-	}
-	/// The range of component `i` is `[0, 1000000]`.
-	fn subtraction(_i: u32, ) -> Weight {
-		// Proof Size summary in bytes:
-		//  Measured:  `0`
-		//  Estimated: `0`
-		// Minimum execution time: 159_000 picoseconds.
-		Weight::from_parts(203_916, 0)
-			.saturating_add(Weight::from_parts(0, 0))
-	}
-	/// The range of component `i` is `[0, 1000000]`.
-	fn multiplication(_i: u32, ) -> Weight {
-		// Proof Size summary in bytes:
-		//  Measured:  `0`
-		//  Estimated: `0`
-		// Minimum execution time: 163_000 picoseconds.
-		Weight::from_parts(211_152, 0)
-			.saturating_add(Weight::from_parts(0, 0))
-	}
-	/// The range of component `i` is `[0, 1000000]`.
-	fn division(_i: u32, ) -> Weight {
-		// Proof Size summary in bytes:
-		//  Measured:  `0`
-		//  Estimated: `0`
-		// Minimum execution time: 165_000 picoseconds.
-		Weight::from_parts(205_618, 0)
-			.saturating_add(Weight::from_parts(0, 0))
-	}
-	fn hashing() -> Weight {
-		// Proof Size summary in bytes:
-		//  Measured:  `0`
-		//  Estimated: `0`
-		// Minimum execution time: 22_794_873_000 picoseconds.
-		Weight::from_parts(22_858_244_000, 0)
-			.saturating_add(Weight::from_parts(0, 0))
-	}
-	/// The range of component `i` is `[0, 100]`.
-	fn sr25519_verification(i: u32, ) -> Weight {
-		// Proof Size summary in bytes:
-		//  Measured:  `0`
-		//  Estimated: `0`
-		// Minimum execution time: 218_000 picoseconds.
-		Weight::from_parts(2_663_311, 0)
-			.saturating_add(Weight::from_parts(0, 0))
-			// Standard Error: 6_556
-			.saturating_add(Weight::from_parts(55_473_775, 0).saturating_mul(i.into()))
-	}
-}
diff --git a/polkadot/runtime/polkadot/src/weights/frame_election_provider_support.rs b/polkadot/runtime/polkadot/src/weights/frame_election_provider_support.rs
deleted file mode 100644
index 109c82884214d9a5012ad9ed05367c45f8913c79..0000000000000000000000000000000000000000
--- a/polkadot/runtime/polkadot/src/weights/frame_election_provider_support.rs
+++ /dev/null
@@ -1,83 +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/>.
-
-//! Autogenerated weights for `frame_election_provider_support`
-//!
-//! THIS FILE WAS AUTO-GENERATED USING THE SUBSTRATE BENCHMARK CLI VERSION 4.0.0-dev
-//! DATE: 2023-06-18, STEPS: `50`, REPEAT: `20`, LOW RANGE: `[]`, HIGH RANGE: `[]`
-//! WORST CASE MAP SIZE: `1000000`
-//! HOSTNAME: `runner-e8ezs4ez-project-163-concurrent-0`, CPU: `Intel(R) Xeon(R) CPU @ 2.60GHz`
-//! EXECUTION: Some(Wasm), WASM-EXECUTION: Compiled, CHAIN: Some("polkadot-dev"), DB CACHE: 1024
-
-// Executed Command:
-// ./target/production/polkadot
-// benchmark
-// pallet
-// --chain=polkadot-dev
-// --steps=50
-// --repeat=20
-// --no-storage-info
-// --no-median-slopes
-// --no-min-squares
-// --pallet=frame_election_provider_support
-// --extrinsic=*
-// --execution=wasm
-// --wasm-execution=compiled
-// --header=./file_header.txt
-// --output=./runtime/polkadot/src/weights/
-
-#![cfg_attr(rustfmt, rustfmt_skip)]
-#![allow(unused_parens)]
-#![allow(unused_imports)]
-#![allow(missing_docs)]
-
-use frame_support::{traits::Get, weights::Weight};
-use core::marker::PhantomData;
-
-/// Weight functions for `frame_election_provider_support`.
-pub struct WeightInfo<T>(PhantomData<T>);
-impl<T: frame_system::Config> frame_election_provider_support::WeightInfo for WeightInfo<T> {
-	/// The range of component `v` is `[1000, 2000]`.
-	/// The range of component `t` is `[500, 1000]`.
-	/// The range of component `d` is `[5, 16]`.
-	fn phragmen(v: u32, _t: u32, d: u32, ) -> Weight {
-		// Proof Size summary in bytes:
-		//  Measured:  `0`
-		//  Estimated: `0`
-		// Minimum execution time: 6_659_138_000 picoseconds.
-		Weight::from_parts(6_742_669_000, 0)
-			.saturating_add(Weight::from_parts(0, 0))
-			// Standard Error: 134_896
-			.saturating_add(Weight::from_parts(5_872_242, 0).saturating_mul(v.into()))
-			// Standard Error: 13_791_372
-			.saturating_add(Weight::from_parts(1_417_540_796, 0).saturating_mul(d.into()))
-	}
-	/// The range of component `v` is `[1000, 2000]`.
-	/// The range of component `t` is `[500, 1000]`.
-	/// The range of component `d` is `[5, 16]`.
-	fn phragmms(v: u32, _t: u32, d: u32, ) -> Weight {
-		// Proof Size summary in bytes:
-		//  Measured:  `0`
-		//  Estimated: `0`
-		// Minimum execution time: 4_614_958_000 picoseconds.
-		Weight::from_parts(4_655_159_000, 0)
-			.saturating_add(Weight::from_parts(0, 0))
-			// Standard Error: 121_610
-			.saturating_add(Weight::from_parts(4_875_919, 0).saturating_mul(v.into()))
-			// Standard Error: 12_432_980
-			.saturating_add(Weight::from_parts(1_332_850_451, 0).saturating_mul(d.into()))
-	}
-}
diff --git a/polkadot/runtime/polkadot/src/weights/frame_system.rs b/polkadot/runtime/polkadot/src/weights/frame_system.rs
deleted file mode 100644
index e6ece50fc8e0f1244b4286ee644ef12a9ca9ad48..0000000000000000000000000000000000000000
--- a/polkadot/runtime/polkadot/src/weights/frame_system.rs
+++ /dev/null
@@ -1,147 +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/>.
-
-//! Autogenerated weights for `frame_system`
-//!
-//! THIS FILE WAS AUTO-GENERATED USING THE SUBSTRATE BENCHMARK CLI VERSION 4.0.0-dev
-//! DATE: 2023-06-18, STEPS: `50`, REPEAT: `20`, LOW RANGE: `[]`, HIGH RANGE: `[]`
-//! WORST CASE MAP SIZE: `1000000`
-//! HOSTNAME: `runner-e8ezs4ez-project-163-concurrent-0`, CPU: `Intel(R) Xeon(R) CPU @ 2.60GHz`
-//! EXECUTION: Some(Wasm), WASM-EXECUTION: Compiled, CHAIN: Some("polkadot-dev"), DB CACHE: 1024
-
-// Executed Command:
-// ./target/production/polkadot
-// benchmark
-// pallet
-// --chain=polkadot-dev
-// --steps=50
-// --repeat=20
-// --no-storage-info
-// --no-median-slopes
-// --no-min-squares
-// --pallet=frame_system
-// --extrinsic=*
-// --execution=wasm
-// --wasm-execution=compiled
-// --header=./file_header.txt
-// --output=./runtime/polkadot/src/weights/
-
-#![cfg_attr(rustfmt, rustfmt_skip)]
-#![allow(unused_parens)]
-#![allow(unused_imports)]
-#![allow(missing_docs)]
-
-use frame_support::{traits::Get, weights::Weight};
-use core::marker::PhantomData;
-
-/// Weight functions for `frame_system`.
-pub struct WeightInfo<T>(PhantomData<T>);
-impl<T: frame_system::Config> frame_system::WeightInfo for WeightInfo<T> {
-	/// The range of component `b` is `[0, 3932160]`.
-	fn remark(b: u32, ) -> Weight {
-		// Proof Size summary in bytes:
-		//  Measured:  `0`
-		//  Estimated: `0`
-		// Minimum execution time: 1_933_000 picoseconds.
-		Weight::from_parts(2_016_000, 0)
-			.saturating_add(Weight::from_parts(0, 0))
-			// Standard Error: 1
-			.saturating_add(Weight::from_parts(469, 0).saturating_mul(b.into()))
-	}
-	/// The range of component `b` is `[0, 3932160]`.
-	fn remark_with_event(b: u32, ) -> Weight {
-		// Proof Size summary in bytes:
-		//  Measured:  `0`
-		//  Estimated: `0`
-		// Minimum execution time: 7_415_000 picoseconds.
-		Weight::from_parts(7_513_000, 0)
-			.saturating_add(Weight::from_parts(0, 0))
-			// Standard Error: 3
-			.saturating_add(Weight::from_parts(1_834, 0).saturating_mul(b.into()))
-	}
-	/// Storage: System Digest (r:1 w:1)
-	/// Proof Skipped: System Digest (max_values: Some(1), max_size: None, mode: Measured)
-	/// Storage: unknown `0x3a686561707061676573` (r:0 w:1)
-	/// Proof Skipped: unknown `0x3a686561707061676573` (r:0 w:1)
-	fn set_heap_pages() -> Weight {
-		// Proof Size summary in bytes:
-		//  Measured:  `0`
-		//  Estimated: `1485`
-		// Minimum execution time: 3_680_000 picoseconds.
-		Weight::from_parts(3_889_000, 0)
-			.saturating_add(Weight::from_parts(0, 1485))
-			.saturating_add(T::DbWeight::get().reads(1))
-			.saturating_add(T::DbWeight::get().writes(2))
-	}
-	/// Storage: System Digest (r:1 w:1)
-	/// Proof Skipped: System Digest (max_values: Some(1), max_size: None, mode: Measured)
-	/// Storage: unknown `0x3a636f6465` (r:0 w:1)
-	/// Proof Skipped: unknown `0x3a636f6465` (r:0 w:1)
-	fn set_code() -> Weight {
-		// Proof Size summary in bytes:
-		//  Measured:  `0`
-		//  Estimated: `1485`
-		// Minimum execution time: 92_505_621_000 picoseconds.
-		Weight::from_parts(96_677_957_000, 0)
-			.saturating_add(Weight::from_parts(0, 1485))
-			.saturating_add(T::DbWeight::get().reads(1))
-			.saturating_add(T::DbWeight::get().writes(2))
-	}
-	/// Storage: Skipped Metadata (r:0 w:0)
-	/// Proof Skipped: Skipped Metadata (max_values: None, max_size: None, mode: Measured)
-	/// The range of component `i` is `[0, 1000]`.
-	fn set_storage(i: u32, ) -> Weight {
-		// Proof Size summary in bytes:
-		//  Measured:  `0`
-		//  Estimated: `0`
-		// Minimum execution time: 2_080_000 picoseconds.
-		Weight::from_parts(2_160_000, 0)
-			.saturating_add(Weight::from_parts(0, 0))
-			// Standard Error: 1_639
-			.saturating_add(Weight::from_parts(731_622, 0).saturating_mul(i.into()))
-			.saturating_add(T::DbWeight::get().writes((1_u64).saturating_mul(i.into())))
-	}
-	/// Storage: Skipped Metadata (r:0 w:0)
-	/// Proof Skipped: Skipped Metadata (max_values: None, max_size: None, mode: Measured)
-	/// The range of component `i` is `[0, 1000]`.
-	fn kill_storage(i: u32, ) -> Weight {
-		// Proof Size summary in bytes:
-		//  Measured:  `0`
-		//  Estimated: `0`
-		// Minimum execution time: 2_135_000 picoseconds.
-		Weight::from_parts(2_184_000, 0)
-			.saturating_add(Weight::from_parts(0, 0))
-			// Standard Error: 976
-			.saturating_add(Weight::from_parts(554_293, 0).saturating_mul(i.into()))
-			.saturating_add(T::DbWeight::get().writes((1_u64).saturating_mul(i.into())))
-	}
-	/// Storage: Skipped Metadata (r:0 w:0)
-	/// Proof Skipped: Skipped Metadata (max_values: None, max_size: None, mode: Measured)
-	/// The range of component `p` is `[0, 1000]`.
-	fn kill_prefix(p: u32, ) -> Weight {
-		// Proof Size summary in bytes:
-		//  Measured:  `132 + p * (69 ±0)`
-		//  Estimated: `128 + p * (70 ±0)`
-		// Minimum execution time: 3_851_000 picoseconds.
-		Weight::from_parts(4_039_000, 0)
-			.saturating_add(Weight::from_parts(0, 128))
-			// Standard Error: 1_612
-			.saturating_add(Weight::from_parts(1_220_557, 0).saturating_mul(p.into()))
-			.saturating_add(T::DbWeight::get().reads((1_u64).saturating_mul(p.into())))
-			.saturating_add(T::DbWeight::get().writes((1_u64).saturating_mul(p.into())))
-			.saturating_add(Weight::from_parts(0, 70).saturating_mul(p.into()))
-	}
-}
diff --git a/polkadot/runtime/polkadot/src/weights/mod.rs b/polkadot/runtime/polkadot/src/weights/mod.rs
deleted file mode 100644
index 596b594c93707388d8c2a36bd2531a616dffd3b3..0000000000000000000000000000000000000000
--- a/polkadot/runtime/polkadot/src/weights/mod.rs
+++ /dev/null
@@ -1,64 +0,0 @@
-// 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.
-
-//! A list of the different weight modules for our runtime.
-
-pub mod frame_election_provider_support;
-pub mod frame_system;
-pub mod pallet_bags_list;
-pub mod pallet_balances;
-pub mod pallet_bounties;
-pub mod pallet_child_bounties;
-pub mod pallet_collective_council;
-pub mod pallet_collective_technical_committee;
-pub mod pallet_conviction_voting;
-pub mod pallet_democracy;
-pub mod pallet_election_provider_multi_phase;
-pub mod pallet_elections_phragmen;
-pub mod pallet_fast_unstake;
-pub mod pallet_identity;
-pub mod pallet_im_online;
-pub mod pallet_indices;
-pub mod pallet_membership;
-pub mod pallet_message_queue;
-pub mod pallet_multisig;
-pub mod pallet_nomination_pools;
-pub mod pallet_preimage;
-pub mod pallet_proxy;
-pub mod pallet_referenda;
-pub mod pallet_scheduler;
-pub mod pallet_session;
-pub mod pallet_staking;
-pub mod pallet_timestamp;
-pub mod pallet_tips;
-pub mod pallet_treasury;
-pub mod pallet_utility;
-pub mod pallet_vesting;
-pub mod pallet_whitelist;
-pub mod pallet_xcm;
-pub mod runtime_common_auctions;
-pub mod runtime_common_claims;
-pub mod runtime_common_crowdloan;
-pub mod runtime_common_paras_registrar;
-pub mod runtime_common_slots;
-pub mod runtime_parachains_configuration;
-pub mod runtime_parachains_disputes;
-pub mod runtime_parachains_disputes_slashing;
-pub mod runtime_parachains_hrmp;
-pub mod runtime_parachains_inclusion;
-pub mod runtime_parachains_initializer;
-pub mod runtime_parachains_paras;
-pub mod runtime_parachains_paras_inherent;
-pub mod xcm;
diff --git a/polkadot/runtime/polkadot/src/weights/pallet_bags_list.rs b/polkadot/runtime/polkadot/src/weights/pallet_bags_list.rs
deleted file mode 100644
index 47decc88d73e0a80db09b776fd4c0b0a8eed2a22..0000000000000000000000000000000000000000
--- a/polkadot/runtime/polkadot/src/weights/pallet_bags_list.rs
+++ /dev/null
@@ -1,109 +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/>.
-
-//! Autogenerated weights for `pallet_bags_list`
-//!
-//! THIS FILE WAS AUTO-GENERATED USING THE SUBSTRATE BENCHMARK CLI VERSION 4.0.0-dev
-//! DATE: 2023-06-18, STEPS: `50`, REPEAT: `20`, LOW RANGE: `[]`, HIGH RANGE: `[]`
-//! WORST CASE MAP SIZE: `1000000`
-//! HOSTNAME: `runner-e8ezs4ez-project-163-concurrent-0`, CPU: `Intel(R) Xeon(R) CPU @ 2.60GHz`
-//! EXECUTION: Some(Wasm), WASM-EXECUTION: Compiled, CHAIN: Some("polkadot-dev"), DB CACHE: 1024
-
-// Executed Command:
-// ./target/production/polkadot
-// benchmark
-// pallet
-// --chain=polkadot-dev
-// --steps=50
-// --repeat=20
-// --no-storage-info
-// --no-median-slopes
-// --no-min-squares
-// --pallet=pallet_bags_list
-// --extrinsic=*
-// --execution=wasm
-// --wasm-execution=compiled
-// --header=./file_header.txt
-// --output=./runtime/polkadot/src/weights/
-
-#![cfg_attr(rustfmt, rustfmt_skip)]
-#![allow(unused_parens)]
-#![allow(unused_imports)]
-#![allow(missing_docs)]
-
-use frame_support::{traits::Get, weights::Weight};
-use core::marker::PhantomData;
-
-/// Weight functions for `pallet_bags_list`.
-pub struct WeightInfo<T>(PhantomData<T>);
-impl<T: frame_system::Config> pallet_bags_list::WeightInfo for WeightInfo<T> {
-	/// Storage: Staking Bonded (r:1 w:0)
-	/// Proof: Staking Bonded (max_values: None, max_size: Some(72), added: 2547, mode: MaxEncodedLen)
-	/// Storage: Staking Ledger (r:1 w:0)
-	/// Proof: Staking Ledger (max_values: None, max_size: Some(1091), added: 3566, mode: MaxEncodedLen)
-	/// Storage: VoterList ListNodes (r:4 w:4)
-	/// Proof: VoterList ListNodes (max_values: None, max_size: Some(154), added: 2629, mode: MaxEncodedLen)
-	/// Storage: VoterList ListBags (r:1 w:1)
-	/// Proof: VoterList ListBags (max_values: None, max_size: Some(82), added: 2557, mode: MaxEncodedLen)
-	fn rebag_non_terminal() -> Weight {
-		// Proof Size summary in bytes:
-		//  Measured:  `1622`
-		//  Estimated: `11506`
-		// Minimum execution time: 61_742_000 picoseconds.
-		Weight::from_parts(63_696_000, 0)
-			.saturating_add(Weight::from_parts(0, 11506))
-			.saturating_add(T::DbWeight::get().reads(7))
-			.saturating_add(T::DbWeight::get().writes(5))
-	}
-	/// Storage: Staking Bonded (r:1 w:0)
-	/// Proof: Staking Bonded (max_values: None, max_size: Some(72), added: 2547, mode: MaxEncodedLen)
-	/// Storage: Staking Ledger (r:1 w:0)
-	/// Proof: Staking Ledger (max_values: None, max_size: Some(1091), added: 3566, mode: MaxEncodedLen)
-	/// Storage: VoterList ListNodes (r:3 w:3)
-	/// Proof: VoterList ListNodes (max_values: None, max_size: Some(154), added: 2629, mode: MaxEncodedLen)
-	/// Storage: VoterList ListBags (r:2 w:2)
-	/// Proof: VoterList ListBags (max_values: None, max_size: Some(82), added: 2557, mode: MaxEncodedLen)
-	fn rebag_terminal() -> Weight {
-		// Proof Size summary in bytes:
-		//  Measured:  `1516`
-		//  Estimated: `8877`
-		// Minimum execution time: 60_247_000 picoseconds.
-		Weight::from_parts(62_096_000, 0)
-			.saturating_add(Weight::from_parts(0, 8877))
-			.saturating_add(T::DbWeight::get().reads(7))
-			.saturating_add(T::DbWeight::get().writes(5))
-	}
-	/// Storage: VoterList ListNodes (r:4 w:4)
-	/// Proof: VoterList ListNodes (max_values: None, max_size: Some(154), added: 2629, mode: MaxEncodedLen)
-	/// Storage: Staking Bonded (r:2 w:0)
-	/// Proof: Staking Bonded (max_values: None, max_size: Some(72), added: 2547, mode: MaxEncodedLen)
-	/// Storage: Staking Ledger (r:2 w:0)
-	/// Proof: Staking Ledger (max_values: None, max_size: Some(1091), added: 3566, mode: MaxEncodedLen)
-	/// Storage: VoterList CounterForListNodes (r:1 w:1)
-	/// Proof: VoterList CounterForListNodes (max_values: Some(1), max_size: Some(4), added: 499, mode: MaxEncodedLen)
-	/// Storage: VoterList ListBags (r:1 w:1)
-	/// Proof: VoterList ListBags (max_values: None, max_size: Some(82), added: 2557, mode: MaxEncodedLen)
-	fn put_in_front_of() -> Weight {
-		// Proof Size summary in bytes:
-		//  Measured:  `1827`
-		//  Estimated: `11506`
-		// Minimum execution time: 67_049_000 picoseconds.
-		Weight::from_parts(68_704_000, 0)
-			.saturating_add(Weight::from_parts(0, 11506))
-			.saturating_add(T::DbWeight::get().reads(10))
-			.saturating_add(T::DbWeight::get().writes(6))
-	}
-}
diff --git a/polkadot/runtime/polkadot/src/weights/pallet_balances.rs b/polkadot/runtime/polkadot/src/weights/pallet_balances.rs
deleted file mode 100644
index 374718082615204d49f4e06c51a7579e64326d22..0000000000000000000000000000000000000000
--- a/polkadot/runtime/polkadot/src/weights/pallet_balances.rs
+++ /dev/null
@@ -1,153 +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/>.
-
-//! Autogenerated weights for `pallet_balances`
-//!
-//! THIS FILE WAS AUTO-GENERATED USING THE SUBSTRATE BENCHMARK CLI VERSION 4.0.0-dev
-//! DATE: 2023-06-18, STEPS: `50`, REPEAT: `20`, LOW RANGE: `[]`, HIGH RANGE: `[]`
-//! WORST CASE MAP SIZE: `1000000`
-//! HOSTNAME: `runner-e8ezs4ez-project-163-concurrent-0`, CPU: `Intel(R) Xeon(R) CPU @ 2.60GHz`
-//! EXECUTION: Some(Wasm), WASM-EXECUTION: Compiled, CHAIN: Some("polkadot-dev"), DB CACHE: 1024
-
-// Executed Command:
-// ./target/production/polkadot
-// benchmark
-// pallet
-// --chain=polkadot-dev
-// --steps=50
-// --repeat=20
-// --no-storage-info
-// --no-median-slopes
-// --no-min-squares
-// --pallet=pallet_balances
-// --extrinsic=*
-// --execution=wasm
-// --wasm-execution=compiled
-// --header=./file_header.txt
-// --output=./runtime/polkadot/src/weights/
-
-#![cfg_attr(rustfmt, rustfmt_skip)]
-#![allow(unused_parens)]
-#![allow(unused_imports)]
-#![allow(missing_docs)]
-
-use frame_support::{traits::Get, weights::Weight};
-use core::marker::PhantomData;
-
-/// Weight functions for `pallet_balances`.
-pub struct WeightInfo<T>(PhantomData<T>);
-impl<T: frame_system::Config> pallet_balances::WeightInfo for WeightInfo<T> {
-	/// Storage: System Account (r:1 w:1)
-	/// Proof: System Account (max_values: None, max_size: Some(128), added: 2603, mode: MaxEncodedLen)
-	fn transfer_allow_death() -> Weight {
-		// Proof Size summary in bytes:
-		//  Measured:  `0`
-		//  Estimated: `3593`
-		// Minimum execution time: 56_740_000 picoseconds.
-		Weight::from_parts(57_361_000, 0)
-			.saturating_add(Weight::from_parts(0, 3593))
-			.saturating_add(T::DbWeight::get().reads(1))
-			.saturating_add(T::DbWeight::get().writes(1))
-	}
-	/// Storage: System Account (r:1 w:1)
-	/// Proof: System Account (max_values: None, max_size: Some(128), added: 2603, mode: MaxEncodedLen)
-	fn transfer_keep_alive() -> Weight {
-		// Proof Size summary in bytes:
-		//  Measured:  `0`
-		//  Estimated: `3593`
-		// Minimum execution time: 42_767_000 picoseconds.
-		Weight::from_parts(43_195_000, 0)
-			.saturating_add(Weight::from_parts(0, 3593))
-			.saturating_add(T::DbWeight::get().reads(1))
-			.saturating_add(T::DbWeight::get().writes(1))
-	}
-	/// Storage: System Account (r:1 w:1)
-	/// Proof: System Account (max_values: None, max_size: Some(128), added: 2603, mode: MaxEncodedLen)
-	fn force_set_balance_creating() -> Weight {
-		// Proof Size summary in bytes:
-		//  Measured:  `174`
-		//  Estimated: `3593`
-		// Minimum execution time: 17_405_000 picoseconds.
-		Weight::from_parts(17_754_000, 0)
-			.saturating_add(Weight::from_parts(0, 3593))
-			.saturating_add(T::DbWeight::get().reads(1))
-			.saturating_add(T::DbWeight::get().writes(1))
-	}
-	/// Storage: System Account (r:1 w:1)
-	/// Proof: System Account (max_values: None, max_size: Some(128), added: 2603, mode: MaxEncodedLen)
-	fn force_set_balance_killing() -> Weight {
-		// Proof Size summary in bytes:
-		//  Measured:  `174`
-		//  Estimated: `3593`
-		// Minimum execution time: 24_580_000 picoseconds.
-		Weight::from_parts(25_063_000, 0)
-			.saturating_add(Weight::from_parts(0, 3593))
-			.saturating_add(T::DbWeight::get().reads(1))
-			.saturating_add(T::DbWeight::get().writes(1))
-	}
-	/// Storage: System Account (r:2 w:2)
-	/// Proof: System Account (max_values: None, max_size: Some(128), added: 2603, mode: MaxEncodedLen)
-	fn force_transfer() -> Weight {
-		// Proof Size summary in bytes:
-		//  Measured:  `103`
-		//  Estimated: `6196`
-		// Minimum execution time: 59_923_000 picoseconds.
-		Weight::from_parts(60_797_000, 0)
-			.saturating_add(Weight::from_parts(0, 6196))
-			.saturating_add(T::DbWeight::get().reads(2))
-			.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)
-	fn transfer_all() -> Weight {
-		// Proof Size summary in bytes:
-		//  Measured:  `0`
-		//  Estimated: `3593`
-		// Minimum execution time: 52_587_000 picoseconds.
-		Weight::from_parts(53_496_000, 0)
-			.saturating_add(Weight::from_parts(0, 3593))
-			.saturating_add(T::DbWeight::get().reads(1))
-			.saturating_add(T::DbWeight::get().writes(1))
-	}
-	/// Storage: System Account (r:1 w:1)
-	/// Proof: System Account (max_values: None, max_size: Some(128), added: 2603, mode: MaxEncodedLen)
-	fn force_unreserve() -> Weight {
-		// Proof Size summary in bytes:
-		//  Measured:  `174`
-		//  Estimated: `3593`
-		// Minimum execution time: 20_257_000 picoseconds.
-		Weight::from_parts(20_977_000, 0)
-			.saturating_add(Weight::from_parts(0, 3593))
-			.saturating_add(T::DbWeight::get().reads(1))
-			.saturating_add(T::DbWeight::get().writes(1))
-	}
-	/// Storage: System Account (r:999 w:999)
-	/// Proof: System Account (max_values: None, max_size: Some(128), added: 2603, mode: MaxEncodedLen)
-	/// The range of component `u` is `[1, 1000]`.
-	fn upgrade_accounts(u: u32, ) -> Weight {
-		// Proof Size summary in bytes:
-		//  Measured:  `0 + u * (135 ±0)`
-		//  Estimated: `990 + u * (2603 ±0)`
-		// Minimum execution time: 19_254_000 picoseconds.
-		Weight::from_parts(19_508_000, 0)
-			.saturating_add(Weight::from_parts(0, 990))
-			// Standard Error: 12_504
-			.saturating_add(Weight::from_parts(16_053_923, 0).saturating_mul(u.into()))
-			.saturating_add(T::DbWeight::get().reads((1_u64).saturating_mul(u.into())))
-			.saturating_add(T::DbWeight::get().writes((1_u64).saturating_mul(u.into())))
-			.saturating_add(Weight::from_parts(0, 2603).saturating_mul(u.into()))
-	}
-}
diff --git a/polkadot/runtime/polkadot/src/weights/pallet_bounties.rs b/polkadot/runtime/polkadot/src/weights/pallet_bounties.rs
deleted file mode 100644
index 62a417832901954a01306579dba58bd5b7019c62..0000000000000000000000000000000000000000
--- a/polkadot/runtime/polkadot/src/weights/pallet_bounties.rs
+++ /dev/null
@@ -1,230 +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/>.
-
-//! Autogenerated weights for `pallet_bounties`
-//!
-//! THIS FILE WAS AUTO-GENERATED USING THE SUBSTRATE BENCHMARK CLI VERSION 4.0.0-dev
-//! DATE: 2023-06-18, STEPS: `50`, REPEAT: `20`, LOW RANGE: `[]`, HIGH RANGE: `[]`
-//! WORST CASE MAP SIZE: `1000000`
-//! HOSTNAME: `runner-e8ezs4ez-project-163-concurrent-0`, CPU: `Intel(R) Xeon(R) CPU @ 2.60GHz`
-//! EXECUTION: Some(Wasm), WASM-EXECUTION: Compiled, CHAIN: Some("polkadot-dev"), DB CACHE: 1024
-
-// Executed Command:
-// ./target/production/polkadot
-// benchmark
-// pallet
-// --chain=polkadot-dev
-// --steps=50
-// --repeat=20
-// --no-storage-info
-// --no-median-slopes
-// --no-min-squares
-// --pallet=pallet_bounties
-// --extrinsic=*
-// --execution=wasm
-// --wasm-execution=compiled
-// --header=./file_header.txt
-// --output=./runtime/polkadot/src/weights/
-
-#![cfg_attr(rustfmt, rustfmt_skip)]
-#![allow(unused_parens)]
-#![allow(unused_imports)]
-#![allow(missing_docs)]
-
-use frame_support::{traits::Get, weights::Weight};
-use core::marker::PhantomData;
-
-/// Weight functions for `pallet_bounties`.
-pub struct WeightInfo<T>(PhantomData<T>);
-impl<T: frame_system::Config> pallet_bounties::WeightInfo for WeightInfo<T> {
-	/// Storage: Bounties BountyCount (r:1 w:1)
-	/// Proof: Bounties BountyCount (max_values: Some(1), max_size: Some(4), added: 499, mode: MaxEncodedLen)
-	/// Storage: System Account (r:1 w:1)
-	/// Proof: System Account (max_values: None, max_size: Some(128), added: 2603, mode: MaxEncodedLen)
-	/// Storage: Bounties BountyDescriptions (r:0 w:1)
-	/// Proof: Bounties BountyDescriptions (max_values: None, max_size: Some(16400), added: 18875, mode: MaxEncodedLen)
-	/// Storage: Bounties Bounties (r:0 w:1)
-	/// Proof: Bounties Bounties (max_values: None, max_size: Some(177), added: 2652, mode: MaxEncodedLen)
-	/// The range of component `d` is `[0, 16384]`.
-	fn propose_bounty(d: u32, ) -> Weight {
-		// Proof Size summary in bytes:
-		//  Measured:  `177`
-		//  Estimated: `3593`
-		// Minimum execution time: 30_000_000 picoseconds.
-		Weight::from_parts(31_021_890, 0)
-			.saturating_add(Weight::from_parts(0, 3593))
-			// Standard Error: 6
-			.saturating_add(Weight::from_parts(757, 0).saturating_mul(d.into()))
-			.saturating_add(T::DbWeight::get().reads(2))
-			.saturating_add(T::DbWeight::get().writes(4))
-	}
-	/// Storage: Bounties Bounties (r:1 w:1)
-	/// Proof: Bounties Bounties (max_values: None, max_size: Some(177), added: 2652, mode: MaxEncodedLen)
-	/// Storage: Bounties BountyApprovals (r:1 w:1)
-	/// Proof: Bounties BountyApprovals (max_values: Some(1), max_size: Some(402), added: 897, mode: MaxEncodedLen)
-	fn approve_bounty() -> Weight {
-		// Proof Size summary in bytes:
-		//  Measured:  `269`
-		//  Estimated: `3642`
-		// Minimum execution time: 11_055_000 picoseconds.
-		Weight::from_parts(11_875_000, 0)
-			.saturating_add(Weight::from_parts(0, 3642))
-			.saturating_add(T::DbWeight::get().reads(2))
-			.saturating_add(T::DbWeight::get().writes(2))
-	}
-	/// Storage: Bounties Bounties (r:1 w:1)
-	/// Proof: Bounties Bounties (max_values: None, max_size: Some(177), added: 2652, mode: MaxEncodedLen)
-	fn propose_curator() -> Weight {
-		// Proof Size summary in bytes:
-		//  Measured:  `289`
-		//  Estimated: `3642`
-		// Minimum execution time: 10_266_000 picoseconds.
-		Weight::from_parts(10_581_000, 0)
-			.saturating_add(Weight::from_parts(0, 3642))
-			.saturating_add(T::DbWeight::get().reads(1))
-			.saturating_add(T::DbWeight::get().writes(1))
-	}
-	/// Storage: Bounties Bounties (r:1 w:1)
-	/// Proof: Bounties Bounties (max_values: None, max_size: Some(177), added: 2652, mode: MaxEncodedLen)
-	/// Storage: System Account (r:1 w:1)
-	/// Proof: System Account (max_values: None, max_size: Some(128), added: 2603, mode: MaxEncodedLen)
-	fn unassign_curator() -> Weight {
-		// Proof Size summary in bytes:
-		//  Measured:  `465`
-		//  Estimated: `3642`
-		// Minimum execution time: 43_566_000 picoseconds.
-		Weight::from_parts(44_671_000, 0)
-			.saturating_add(Weight::from_parts(0, 3642))
-			.saturating_add(T::DbWeight::get().reads(2))
-			.saturating_add(T::DbWeight::get().writes(2))
-	}
-	/// Storage: Bounties Bounties (r:1 w:1)
-	/// Proof: Bounties Bounties (max_values: None, max_size: Some(177), added: 2652, mode: MaxEncodedLen)
-	/// Storage: System Account (r:1 w:1)
-	/// Proof: System Account (max_values: None, max_size: Some(128), added: 2603, mode: MaxEncodedLen)
-	fn accept_curator() -> Weight {
-		// Proof Size summary in bytes:
-		//  Measured:  `461`
-		//  Estimated: `3642`
-		// Minimum execution time: 28_400_000 picoseconds.
-		Weight::from_parts(29_259_000, 0)
-			.saturating_add(Weight::from_parts(0, 3642))
-			.saturating_add(T::DbWeight::get().reads(2))
-			.saturating_add(T::DbWeight::get().writes(2))
-	}
-	/// Storage: Bounties Bounties (r:1 w:1)
-	/// Proof: Bounties Bounties (max_values: None, max_size: Some(177), added: 2652, mode: MaxEncodedLen)
-	/// Storage: ChildBounties ParentChildBounties (r:1 w:0)
-	/// Proof: ChildBounties ParentChildBounties (max_values: None, max_size: Some(16), added: 2491, mode: MaxEncodedLen)
-	fn award_bounty() -> Weight {
-		// Proof Size summary in bytes:
-		//  Measured:  `439`
-		//  Estimated: `3642`
-		// Minimum execution time: 20_071_000 picoseconds.
-		Weight::from_parts(20_662_000, 0)
-			.saturating_add(Weight::from_parts(0, 3642))
-			.saturating_add(T::DbWeight::get().reads(2))
-			.saturating_add(T::DbWeight::get().writes(1))
-	}
-	/// Storage: Bounties Bounties (r:1 w:1)
-	/// Proof: Bounties Bounties (max_values: None, max_size: Some(177), added: 2652, mode: MaxEncodedLen)
-	/// Storage: System Account (r:3 w:3)
-	/// Proof: System Account (max_values: None, max_size: Some(128), added: 2603, mode: MaxEncodedLen)
-	/// Storage: ChildBounties ChildrenCuratorFees (r:1 w:1)
-	/// Proof: ChildBounties ChildrenCuratorFees (max_values: None, max_size: Some(28), added: 2503, mode: MaxEncodedLen)
-	/// Storage: Bounties BountyDescriptions (r:0 w:1)
-	/// Proof: Bounties BountyDescriptions (max_values: None, max_size: Some(16400), added: 18875, mode: MaxEncodedLen)
-	fn claim_bounty() -> Weight {
-		// Proof Size summary in bytes:
-		//  Measured:  `803`
-		//  Estimated: `8799`
-		// Minimum execution time: 119_806_000 picoseconds.
-		Weight::from_parts(122_217_000, 0)
-			.saturating_add(Weight::from_parts(0, 8799))
-			.saturating_add(T::DbWeight::get().reads(5))
-			.saturating_add(T::DbWeight::get().writes(6))
-	}
-	/// Storage: Bounties Bounties (r:1 w:1)
-	/// Proof: Bounties Bounties (max_values: None, max_size: Some(177), added: 2652, mode: MaxEncodedLen)
-	/// Storage: ChildBounties ParentChildBounties (r:1 w:0)
-	/// Proof: ChildBounties ParentChildBounties (max_values: None, max_size: Some(16), added: 2491, mode: MaxEncodedLen)
-	/// Storage: System Account (r:1 w:1)
-	/// Proof: System Account (max_values: None, max_size: Some(128), added: 2603, mode: MaxEncodedLen)
-	/// Storage: Bounties BountyDescriptions (r:0 w:1)
-	/// Proof: Bounties BountyDescriptions (max_values: None, max_size: Some(16400), added: 18875, mode: MaxEncodedLen)
-	fn close_bounty_proposed() -> Weight {
-		// Proof Size summary in bytes:
-		//  Measured:  `483`
-		//  Estimated: `3642`
-		// Minimum execution time: 48_528_000 picoseconds.
-		Weight::from_parts(49_592_000, 0)
-			.saturating_add(Weight::from_parts(0, 3642))
-			.saturating_add(T::DbWeight::get().reads(3))
-			.saturating_add(T::DbWeight::get().writes(3))
-	}
-	/// Storage: Bounties Bounties (r:1 w:1)
-	/// Proof: Bounties Bounties (max_values: None, max_size: Some(177), added: 2652, mode: MaxEncodedLen)
-	/// Storage: ChildBounties ParentChildBounties (r:1 w:0)
-	/// Proof: ChildBounties ParentChildBounties (max_values: None, max_size: Some(16), added: 2491, mode: MaxEncodedLen)
-	/// Storage: System Account (r:2 w:2)
-	/// Proof: System Account (max_values: None, max_size: Some(128), added: 2603, mode: MaxEncodedLen)
-	/// Storage: Bounties BountyDescriptions (r:0 w:1)
-	/// Proof: Bounties BountyDescriptions (max_values: None, max_size: Some(16400), added: 18875, mode: MaxEncodedLen)
-	fn close_bounty_active() -> Weight {
-		// Proof Size summary in bytes:
-		//  Measured:  `719`
-		//  Estimated: `6196`
-		// Minimum execution time: 79_963_000 picoseconds.
-		Weight::from_parts(81_894_000, 0)
-			.saturating_add(Weight::from_parts(0, 6196))
-			.saturating_add(T::DbWeight::get().reads(4))
-			.saturating_add(T::DbWeight::get().writes(4))
-	}
-	/// Storage: Bounties Bounties (r:1 w:1)
-	/// Proof: Bounties Bounties (max_values: None, max_size: Some(177), added: 2652, mode: MaxEncodedLen)
-	fn extend_bounty_expiry() -> Weight {
-		// Proof Size summary in bytes:
-		//  Measured:  `325`
-		//  Estimated: `3642`
-		// Minimum execution time: 15_794_000 picoseconds.
-		Weight::from_parts(16_237_000, 0)
-			.saturating_add(Weight::from_parts(0, 3642))
-			.saturating_add(T::DbWeight::get().reads(1))
-			.saturating_add(T::DbWeight::get().writes(1))
-	}
-	/// Storage: Bounties BountyApprovals (r:1 w:1)
-	/// Proof: Bounties BountyApprovals (max_values: Some(1), max_size: Some(402), added: 897, mode: MaxEncodedLen)
-	/// Storage: Bounties Bounties (r:100 w:100)
-	/// Proof: Bounties Bounties (max_values: None, max_size: Some(177), added: 2652, mode: MaxEncodedLen)
-	/// Storage: System Account (r:200 w:200)
-	/// Proof: System Account (max_values: None, max_size: Some(128), added: 2603, mode: MaxEncodedLen)
-	/// The range of component `b` is `[0, 100]`.
-	fn spend_funds(b: u32, ) -> Weight {
-		// Proof Size summary in bytes:
-		//  Measured:  `0 + b * (297 ±0)`
-		//  Estimated: `1887 + b * (5206 ±0)`
-		// Minimum execution time: 5_312_000 picoseconds.
-		Weight::from_parts(5_480_000, 0)
-			.saturating_add(Weight::from_parts(0, 1887))
-			// Standard Error: 12_652
-			.saturating_add(Weight::from_parts(45_246_882, 0).saturating_mul(b.into()))
-			.saturating_add(T::DbWeight::get().reads(1))
-			.saturating_add(T::DbWeight::get().reads((3_u64).saturating_mul(b.into())))
-			.saturating_add(T::DbWeight::get().writes(1))
-			.saturating_add(T::DbWeight::get().writes((3_u64).saturating_mul(b.into())))
-			.saturating_add(Weight::from_parts(0, 5206).saturating_mul(b.into()))
-	}
-}
diff --git a/polkadot/runtime/polkadot/src/weights/pallet_child_bounties.rs b/polkadot/runtime/polkadot/src/weights/pallet_child_bounties.rs
deleted file mode 100644
index 0e885883f093c739892944729ba8b1a1ec545ca5..0000000000000000000000000000000000000000
--- a/polkadot/runtime/polkadot/src/weights/pallet_child_bounties.rs
+++ /dev/null
@@ -1,202 +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/>.
-
-//! Autogenerated weights for `pallet_child_bounties`
-//!
-//! THIS FILE WAS AUTO-GENERATED USING THE SUBSTRATE BENCHMARK CLI VERSION 4.0.0-dev
-//! DATE: 2023-06-18, STEPS: `50`, REPEAT: `20`, LOW RANGE: `[]`, HIGH RANGE: `[]`
-//! WORST CASE MAP SIZE: `1000000`
-//! HOSTNAME: `runner-e8ezs4ez-project-163-concurrent-0`, CPU: `Intel(R) Xeon(R) CPU @ 2.60GHz`
-//! EXECUTION: Some(Wasm), WASM-EXECUTION: Compiled, CHAIN: Some("polkadot-dev"), DB CACHE: 1024
-
-// Executed Command:
-// ./target/production/polkadot
-// benchmark
-// pallet
-// --chain=polkadot-dev
-// --steps=50
-// --repeat=20
-// --no-storage-info
-// --no-median-slopes
-// --no-min-squares
-// --pallet=pallet_child_bounties
-// --extrinsic=*
-// --execution=wasm
-// --wasm-execution=compiled
-// --header=./file_header.txt
-// --output=./runtime/polkadot/src/weights/
-
-#![cfg_attr(rustfmt, rustfmt_skip)]
-#![allow(unused_parens)]
-#![allow(unused_imports)]
-#![allow(missing_docs)]
-
-use frame_support::{traits::Get, weights::Weight};
-use core::marker::PhantomData;
-
-/// Weight functions for `pallet_child_bounties`.
-pub struct WeightInfo<T>(PhantomData<T>);
-impl<T: frame_system::Config> pallet_child_bounties::WeightInfo for WeightInfo<T> {
-	/// Storage: ChildBounties ParentChildBounties (r:1 w:1)
-	/// Proof: ChildBounties ParentChildBounties (max_values: None, max_size: Some(16), added: 2491, mode: MaxEncodedLen)
-	/// Storage: Bounties Bounties (r:1 w:0)
-	/// Proof: Bounties Bounties (max_values: None, max_size: Some(177), added: 2652, mode: MaxEncodedLen)
-	/// Storage: System Account (r:2 w:2)
-	/// Proof: System Account (max_values: None, max_size: Some(128), added: 2603, mode: MaxEncodedLen)
-	/// Storage: ChildBounties ChildBountyCount (r:1 w:1)
-	/// Proof: ChildBounties ChildBountyCount (max_values: Some(1), max_size: Some(4), added: 499, mode: MaxEncodedLen)
-	/// Storage: ChildBounties ChildBountyDescriptions (r:0 w:1)
-	/// Proof: ChildBounties ChildBountyDescriptions (max_values: None, max_size: Some(16400), added: 18875, mode: MaxEncodedLen)
-	/// Storage: ChildBounties ChildBounties (r:0 w:1)
-	/// Proof: ChildBounties ChildBounties (max_values: None, max_size: Some(145), added: 2620, mode: MaxEncodedLen)
-	/// The range of component `d` is `[0, 16384]`.
-	fn add_child_bounty(d: u32, ) -> Weight {
-		// Proof Size summary in bytes:
-		//  Measured:  `579`
-		//  Estimated: `6196`
-		// Minimum execution time: 71_357_000 picoseconds.
-		Weight::from_parts(73_240_027, 0)
-			.saturating_add(Weight::from_parts(0, 6196))
-			// Standard Error: 12
-			.saturating_add(Weight::from_parts(830, 0).saturating_mul(d.into()))
-			.saturating_add(T::DbWeight::get().reads(5))
-			.saturating_add(T::DbWeight::get().writes(6))
-	}
-	/// Storage: Bounties Bounties (r:1 w:0)
-	/// Proof: Bounties Bounties (max_values: None, max_size: Some(177), added: 2652, mode: MaxEncodedLen)
-	/// Storage: ChildBounties ChildBounties (r:1 w:1)
-	/// Proof: ChildBounties ChildBounties (max_values: None, max_size: Some(145), added: 2620, mode: MaxEncodedLen)
-	/// Storage: ChildBounties ChildrenCuratorFees (r:1 w:1)
-	/// Proof: ChildBounties ChildrenCuratorFees (max_values: None, max_size: Some(28), added: 2503, mode: MaxEncodedLen)
-	fn propose_curator() -> Weight {
-		// Proof Size summary in bytes:
-		//  Measured:  `633`
-		//  Estimated: `3642`
-		// Minimum execution time: 18_405_000 picoseconds.
-		Weight::from_parts(19_111_000, 0)
-			.saturating_add(Weight::from_parts(0, 3642))
-			.saturating_add(T::DbWeight::get().reads(3))
-			.saturating_add(T::DbWeight::get().writes(2))
-	}
-	/// Storage: Bounties Bounties (r:1 w:0)
-	/// Proof: Bounties Bounties (max_values: None, max_size: Some(177), added: 2652, mode: MaxEncodedLen)
-	/// Storage: ChildBounties ChildBounties (r:1 w:1)
-	/// Proof: ChildBounties ChildBounties (max_values: None, max_size: Some(145), added: 2620, mode: MaxEncodedLen)
-	/// Storage: System Account (r:1 w:1)
-	/// Proof: System Account (max_values: None, max_size: Some(128), added: 2603, mode: MaxEncodedLen)
-	fn accept_curator() -> Weight {
-		// Proof Size summary in bytes:
-		//  Measured:  `779`
-		//  Estimated: `3642`
-		// Minimum execution time: 33_467_000 picoseconds.
-		Weight::from_parts(34_246_000, 0)
-			.saturating_add(Weight::from_parts(0, 3642))
-			.saturating_add(T::DbWeight::get().reads(3))
-			.saturating_add(T::DbWeight::get().writes(2))
-	}
-	/// Storage: ChildBounties ChildBounties (r:1 w:1)
-	/// Proof: ChildBounties ChildBounties (max_values: None, max_size: Some(145), added: 2620, mode: MaxEncodedLen)
-	/// Storage: Bounties Bounties (r:1 w:0)
-	/// Proof: Bounties Bounties (max_values: None, max_size: Some(177), added: 2652, mode: MaxEncodedLen)
-	/// Storage: System Account (r:1 w:1)
-	/// Proof: System Account (max_values: None, max_size: Some(128), added: 2603, mode: MaxEncodedLen)
-	fn unassign_curator() -> Weight {
-		// Proof Size summary in bytes:
-		//  Measured:  `779`
-		//  Estimated: `3642`
-		// Minimum execution time: 49_658_000 picoseconds.
-		Weight::from_parts(50_457_000, 0)
-			.saturating_add(Weight::from_parts(0, 3642))
-			.saturating_add(T::DbWeight::get().reads(3))
-			.saturating_add(T::DbWeight::get().writes(2))
-	}
-	/// Storage: Bounties Bounties (r:1 w:0)
-	/// Proof: Bounties Bounties (max_values: None, max_size: Some(177), added: 2652, mode: MaxEncodedLen)
-	/// Storage: ChildBounties ChildBounties (r:1 w:1)
-	/// Proof: ChildBounties ChildBounties (max_values: None, max_size: Some(145), added: 2620, mode: MaxEncodedLen)
-	fn award_child_bounty() -> Weight {
-		// Proof Size summary in bytes:
-		//  Measured:  `676`
-		//  Estimated: `3642`
-		// Minimum execution time: 22_723_000 picoseconds.
-		Weight::from_parts(23_232_000, 0)
-			.saturating_add(Weight::from_parts(0, 3642))
-			.saturating_add(T::DbWeight::get().reads(2))
-			.saturating_add(T::DbWeight::get().writes(1))
-	}
-	/// Storage: ChildBounties ChildBounties (r:1 w:1)
-	/// Proof: ChildBounties ChildBounties (max_values: None, max_size: Some(145), added: 2620, mode: MaxEncodedLen)
-	/// Storage: System Account (r:3 w:3)
-	/// Proof: System Account (max_values: None, max_size: Some(128), added: 2603, mode: MaxEncodedLen)
-	/// Storage: ChildBounties ParentChildBounties (r:1 w:1)
-	/// Proof: ChildBounties ParentChildBounties (max_values: None, max_size: Some(16), added: 2491, mode: MaxEncodedLen)
-	/// Storage: ChildBounties ChildBountyDescriptions (r:0 w:1)
-	/// Proof: ChildBounties ChildBountyDescriptions (max_values: None, max_size: Some(16400), added: 18875, mode: MaxEncodedLen)
-	fn claim_child_bounty() -> Weight {
-		// Proof Size summary in bytes:
-		//  Measured:  `648`
-		//  Estimated: `8799`
-		// Minimum execution time: 119_809_000 picoseconds.
-		Weight::from_parts(120_890_000, 0)
-			.saturating_add(Weight::from_parts(0, 8799))
-			.saturating_add(T::DbWeight::get().reads(5))
-			.saturating_add(T::DbWeight::get().writes(6))
-	}
-	/// Storage: Bounties Bounties (r:1 w:0)
-	/// Proof: Bounties Bounties (max_values: None, max_size: Some(177), added: 2652, mode: MaxEncodedLen)
-	/// Storage: ChildBounties ChildBounties (r:1 w:1)
-	/// Proof: ChildBounties ChildBounties (max_values: None, max_size: Some(145), added: 2620, mode: MaxEncodedLen)
-	/// Storage: ChildBounties ChildrenCuratorFees (r:1 w:1)
-	/// Proof: ChildBounties ChildrenCuratorFees (max_values: None, max_size: Some(28), added: 2503, mode: MaxEncodedLen)
-	/// Storage: ChildBounties ParentChildBounties (r:1 w:1)
-	/// Proof: ChildBounties ParentChildBounties (max_values: None, max_size: Some(16), added: 2491, mode: MaxEncodedLen)
-	/// Storage: System Account (r:2 w:2)
-	/// Proof: System Account (max_values: None, max_size: Some(128), added: 2603, mode: MaxEncodedLen)
-	/// Storage: ChildBounties ChildBountyDescriptions (r:0 w:1)
-	/// Proof: ChildBounties ChildBountyDescriptions (max_values: None, max_size: Some(16400), added: 18875, mode: MaxEncodedLen)
-	fn close_child_bounty_added() -> Weight {
-		// Proof Size summary in bytes:
-		//  Measured:  `879`
-		//  Estimated: `6196`
-		// Minimum execution time: 77_381_000 picoseconds.
-		Weight::from_parts(78_284_000, 0)
-			.saturating_add(Weight::from_parts(0, 6196))
-			.saturating_add(T::DbWeight::get().reads(6))
-			.saturating_add(T::DbWeight::get().writes(6))
-	}
-	/// Storage: Bounties Bounties (r:1 w:0)
-	/// Proof: Bounties Bounties (max_values: None, max_size: Some(177), added: 2652, mode: MaxEncodedLen)
-	/// Storage: ChildBounties ChildBounties (r:1 w:1)
-	/// Proof: ChildBounties ChildBounties (max_values: None, max_size: Some(145), added: 2620, mode: MaxEncodedLen)
-	/// Storage: System Account (r:3 w:3)
-	/// Proof: System Account (max_values: None, max_size: Some(128), added: 2603, mode: MaxEncodedLen)
-	/// Storage: ChildBounties ChildrenCuratorFees (r:1 w:1)
-	/// Proof: ChildBounties ChildrenCuratorFees (max_values: None, max_size: Some(28), added: 2503, mode: MaxEncodedLen)
-	/// Storage: ChildBounties ParentChildBounties (r:1 w:1)
-	/// Proof: ChildBounties ParentChildBounties (max_values: None, max_size: Some(16), added: 2491, mode: MaxEncodedLen)
-	/// Storage: ChildBounties ChildBountyDescriptions (r:0 w:1)
-	/// Proof: ChildBounties ChildBountyDescriptions (max_values: None, max_size: Some(16400), added: 18875, mode: MaxEncodedLen)
-	fn close_child_bounty_active() -> Weight {
-		// Proof Size summary in bytes:
-		//  Measured:  `1066`
-		//  Estimated: `8799`
-		// Minimum execution time: 95_032_000 picoseconds.
-		Weight::from_parts(96_932_000, 0)
-			.saturating_add(Weight::from_parts(0, 8799))
-			.saturating_add(T::DbWeight::get().reads(7))
-			.saturating_add(T::DbWeight::get().writes(7))
-	}
-}
diff --git a/polkadot/runtime/polkadot/src/weights/pallet_collective_council.rs b/polkadot/runtime/polkadot/src/weights/pallet_collective_council.rs
deleted file mode 100644
index 0d75865bf2e9e519516f473ae172598db8b4bbfe..0000000000000000000000000000000000000000
--- a/polkadot/runtime/polkadot/src/weights/pallet_collective_council.rs
+++ /dev/null
@@ -1,327 +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/>.
-
-//! Autogenerated weights for `pallet_collective`
-//!
-//! THIS FILE WAS AUTO-GENERATED USING THE SUBSTRATE BENCHMARK CLI VERSION 4.0.0-dev
-//! DATE: 2023-06-18, STEPS: `50`, REPEAT: `20`, LOW RANGE: `[]`, HIGH RANGE: `[]`
-//! WORST CASE MAP SIZE: `1000000`
-//! HOSTNAME: `runner-e8ezs4ez-project-163-concurrent-0`, CPU: `Intel(R) Xeon(R) CPU @ 2.60GHz`
-//! EXECUTION: Some(Wasm), WASM-EXECUTION: Compiled, CHAIN: Some("polkadot-dev"), DB CACHE: 1024
-
-// Executed Command:
-// ./target/production/polkadot
-// benchmark
-// pallet
-// --chain=polkadot-dev
-// --steps=50
-// --repeat=20
-// --no-storage-info
-// --no-median-slopes
-// --no-min-squares
-// --pallet=pallet_collective
-// --extrinsic=*
-// --execution=wasm
-// --wasm-execution=compiled
-// --header=./file_header.txt
-// --output=./runtime/polkadot/src/weights/
-
-#![cfg_attr(rustfmt, rustfmt_skip)]
-#![allow(unused_parens)]
-#![allow(unused_imports)]
-#![allow(missing_docs)]
-
-use frame_support::{traits::Get, weights::Weight};
-use core::marker::PhantomData;
-
-/// Weight functions for `pallet_collective`.
-pub struct WeightInfo<T>(PhantomData<T>);
-impl<T: frame_system::Config> pallet_collective::WeightInfo for WeightInfo<T> {
-	/// Storage: Council Members (r:1 w:1)
-	/// Proof Skipped: Council Members (max_values: Some(1), max_size: None, mode: Measured)
-	/// Storage: Council Proposals (r:1 w:0)
-	/// Proof Skipped: Council Proposals (max_values: Some(1), max_size: None, mode: Measured)
-	/// Storage: Council Voting (r:100 w:100)
-	/// Proof Skipped: Council Voting (max_values: None, max_size: None, mode: Measured)
-	/// Storage: Council Prime (r:0 w:1)
-	/// Proof Skipped: Council Prime (max_values: Some(1), max_size: None, mode: Measured)
-	/// The range of component `m` is `[0, 100]`.
-	/// The range of component `n` is `[0, 100]`.
-	/// The range of component `p` is `[0, 100]`.
-	/// The range of component `m` is `[0, 100]`.
-	/// The range of component `n` is `[0, 100]`.
-	/// The range of component `p` is `[0, 100]`.
-	fn set_members(m: u32, _n: u32, p: u32, ) -> Weight {
-		// Proof Size summary in bytes:
-		//  Measured:  `0 + m * (3232 ±0) + p * (3190 ±0)`
-		//  Estimated: `15762 + m * (1967 ±16) + p * (4332 ±16)`
-		// Minimum execution time: 17_563_000 picoseconds.
-		Weight::from_parts(17_790_000, 0)
-			.saturating_add(Weight::from_parts(0, 15762))
-			// Standard Error: 43_106
-			.saturating_add(Weight::from_parts(4_715_053, 0).saturating_mul(m.into()))
-			// Standard Error: 43_106
-			.saturating_add(Weight::from_parts(8_200_250, 0).saturating_mul(p.into()))
-			.saturating_add(T::DbWeight::get().reads(2))
-			.saturating_add(T::DbWeight::get().reads((1_u64).saturating_mul(p.into())))
-			.saturating_add(T::DbWeight::get().writes(2))
-			.saturating_add(T::DbWeight::get().writes((1_u64).saturating_mul(p.into())))
-			.saturating_add(Weight::from_parts(0, 1967).saturating_mul(m.into()))
-			.saturating_add(Weight::from_parts(0, 4332).saturating_mul(p.into()))
-	}
-	/// Storage: Council Members (r:1 w:0)
-	/// Proof Skipped: Council Members (max_values: Some(1), max_size: None, mode: Measured)
-	/// The range of component `b` is `[2, 1024]`.
-	/// The range of component `m` is `[1, 100]`.
-	/// The range of component `b` is `[2, 1024]`.
-	/// The range of component `m` is `[1, 100]`.
-	fn execute(b: u32, m: u32, ) -> Weight {
-		// Proof Size summary in bytes:
-		//  Measured:  `103 + m * (32 ±0)`
-		//  Estimated: `1589 + m * (32 ±0)`
-		// Minimum execution time: 16_175_000 picoseconds.
-		Weight::from_parts(15_361_457, 0)
-			.saturating_add(Weight::from_parts(0, 1589))
-			// Standard Error: 17
-			.saturating_add(Weight::from_parts(1_795, 0).saturating_mul(b.into()))
-			// Standard Error: 184
-			.saturating_add(Weight::from_parts(14_177, 0).saturating_mul(m.into()))
-			.saturating_add(T::DbWeight::get().reads(1))
-			.saturating_add(Weight::from_parts(0, 32).saturating_mul(m.into()))
-	}
-	/// Storage: Council Members (r:1 w:0)
-	/// Proof Skipped: Council Members (max_values: Some(1), max_size: None, mode: Measured)
-	/// Storage: Council ProposalOf (r:1 w:0)
-	/// Proof Skipped: Council ProposalOf (max_values: None, max_size: None, mode: Measured)
-	/// The range of component `b` is `[2, 1024]`.
-	/// The range of component `m` is `[1, 100]`.
-	/// The range of component `b` is `[2, 1024]`.
-	/// The range of component `m` is `[1, 100]`.
-	fn propose_execute(b: u32, m: u32, ) -> Weight {
-		// Proof Size summary in bytes:
-		//  Measured:  `103 + m * (32 ±0)`
-		//  Estimated: `3569 + m * (32 ±0)`
-		// Minimum execution time: 18_948_000 picoseconds.
-		Weight::from_parts(18_240_525, 0)
-			.saturating_add(Weight::from_parts(0, 3569))
-			// Standard Error: 21
-			.saturating_add(Weight::from_parts(1_603, 0).saturating_mul(b.into()))
-			// Standard Error: 224
-			.saturating_add(Weight::from_parts(22_805, 0).saturating_mul(m.into()))
-			.saturating_add(T::DbWeight::get().reads(2))
-			.saturating_add(Weight::from_parts(0, 32).saturating_mul(m.into()))
-	}
-	/// Storage: Council Members (r:1 w:0)
-	/// Proof Skipped: Council Members (max_values: Some(1), max_size: None, mode: Measured)
-	/// Storage: Council ProposalOf (r:1 w:1)
-	/// Proof Skipped: Council ProposalOf (max_values: None, max_size: None, mode: Measured)
-	/// Storage: Council Proposals (r:1 w:1)
-	/// Proof Skipped: Council Proposals (max_values: Some(1), max_size: None, mode: Measured)
-	/// Storage: Council ProposalCount (r:1 w:1)
-	/// Proof Skipped: Council ProposalCount (max_values: Some(1), max_size: None, mode: Measured)
-	/// Storage: Council Voting (r:0 w:1)
-	/// Proof Skipped: Council Voting (max_values: None, max_size: None, mode: Measured)
-	/// The range of component `b` is `[2, 1024]`.
-	/// The range of component `m` is `[2, 100]`.
-	/// The range of component `p` is `[1, 100]`.
-	/// The range of component `b` is `[2, 1024]`.
-	/// The range of component `m` is `[2, 100]`.
-	/// The range of component `p` is `[1, 100]`.
-	fn propose_proposed(b: u32, m: u32, p: u32, ) -> Weight {
-		// Proof Size summary in bytes:
-		//  Measured:  `393 + m * (32 ±0) + p * (36 ±0)`
-		//  Estimated: `3785 + m * (33 ±0) + p * (36 ±0)`
-		// Minimum execution time: 25_762_000 picoseconds.
-		Weight::from_parts(24_727_354, 0)
-			.saturating_add(Weight::from_parts(0, 3785))
-			// Standard Error: 87
-			.saturating_add(Weight::from_parts(3_653, 0).saturating_mul(b.into()))
-			// Standard Error: 908
-			.saturating_add(Weight::from_parts(28_147, 0).saturating_mul(m.into()))
-			// Standard Error: 897
-			.saturating_add(Weight::from_parts(198_752, 0).saturating_mul(p.into()))
-			.saturating_add(T::DbWeight::get().reads(4))
-			.saturating_add(T::DbWeight::get().writes(4))
-			.saturating_add(Weight::from_parts(0, 33).saturating_mul(m.into()))
-			.saturating_add(Weight::from_parts(0, 36).saturating_mul(p.into()))
-	}
-	/// Storage: Council Members (r:1 w:0)
-	/// Proof Skipped: Council Members (max_values: Some(1), max_size: None, mode: Measured)
-	/// Storage: Council Voting (r:1 w:1)
-	/// Proof Skipped: Council Voting (max_values: None, max_size: None, mode: Measured)
-	/// The range of component `m` is `[5, 100]`.
-	/// The range of component `m` is `[5, 100]`.
-	fn vote(m: u32, ) -> Weight {
-		// Proof Size summary in bytes:
-		//  Measured:  `842 + m * (64 ±0)`
-		//  Estimated: `4306 + m * (64 ±0)`
-		// Minimum execution time: 26_644_000 picoseconds.
-		Weight::from_parts(27_694_655, 0)
-			.saturating_add(Weight::from_parts(0, 4306))
-			// Standard Error: 624
-			.saturating_add(Weight::from_parts(54_184, 0).saturating_mul(m.into()))
-			.saturating_add(T::DbWeight::get().reads(2))
-			.saturating_add(T::DbWeight::get().writes(1))
-			.saturating_add(Weight::from_parts(0, 64).saturating_mul(m.into()))
-	}
-	/// Storage: Council Voting (r:1 w:1)
-	/// Proof Skipped: Council Voting (max_values: None, max_size: None, mode: Measured)
-	/// Storage: Council Members (r:1 w:0)
-	/// Proof Skipped: Council Members (max_values: Some(1), max_size: None, mode: Measured)
-	/// Storage: Council Proposals (r:1 w:1)
-	/// Proof Skipped: Council Proposals (max_values: Some(1), max_size: None, mode: Measured)
-	/// Storage: Council ProposalOf (r:0 w:1)
-	/// Proof Skipped: Council ProposalOf (max_values: None, max_size: None, mode: Measured)
-	/// The range of component `m` is `[4, 100]`.
-	/// The range of component `p` is `[1, 100]`.
-	/// The range of component `m` is `[4, 100]`.
-	/// The range of component `p` is `[1, 100]`.
-	fn close_early_disapproved(m: u32, p: u32, ) -> Weight {
-		// Proof Size summary in bytes:
-		//  Measured:  `431 + m * (64 ±0) + p * (36 ±0)`
-		//  Estimated: `3876 + m * (65 ±0) + p * (36 ±0)`
-		// Minimum execution time: 27_742_000 picoseconds.
-		Weight::from_parts(27_892_765, 0)
-			.saturating_add(Weight::from_parts(0, 3876))
-			// Standard Error: 666
-			.saturating_add(Weight::from_parts(35_102, 0).saturating_mul(m.into()))
-			// Standard Error: 649
-			.saturating_add(Weight::from_parts(190_180, 0).saturating_mul(p.into()))
-			.saturating_add(T::DbWeight::get().reads(3))
-			.saturating_add(T::DbWeight::get().writes(3))
-			.saturating_add(Weight::from_parts(0, 65).saturating_mul(m.into()))
-			.saturating_add(Weight::from_parts(0, 36).saturating_mul(p.into()))
-	}
-	/// Storage: Council Voting (r:1 w:1)
-	/// Proof Skipped: Council Voting (max_values: None, max_size: None, mode: Measured)
-	/// Storage: Council Members (r:1 w:0)
-	/// Proof Skipped: Council Members (max_values: Some(1), max_size: None, mode: Measured)
-	/// Storage: Council ProposalOf (r:1 w:1)
-	/// Proof Skipped: Council ProposalOf (max_values: None, max_size: None, mode: Measured)
-	/// Storage: Council Proposals (r:1 w:1)
-	/// Proof Skipped: Council Proposals (max_values: Some(1), max_size: None, mode: Measured)
-	/// The range of component `b` is `[2, 1024]`.
-	/// The range of component `m` is `[4, 100]`.
-	/// The range of component `p` is `[1, 100]`.
-	/// The range of component `b` is `[2, 1024]`.
-	/// The range of component `m` is `[4, 100]`.
-	/// The range of component `p` is `[1, 100]`.
-	fn close_early_approved(b: u32, m: u32, p: u32, ) -> Weight {
-		// Proof Size summary in bytes:
-		//  Measured:  `733 + b * (1 ±0) + m * (64 ±0) + p * (40 ±0)`
-		//  Estimated: `4050 + b * (1 ±0) + m * (66 ±0) + p * (40 ±0)`
-		// Minimum execution time: 39_283_000 picoseconds.
-		Weight::from_parts(40_633_810, 0)
-			.saturating_add(Weight::from_parts(0, 4050))
-			// Standard Error: 144
-			.saturating_add(Weight::from_parts(3_292, 0).saturating_mul(b.into()))
-			// Standard Error: 1_524
-			.saturating_add(Weight::from_parts(9_562, 0).saturating_mul(m.into()))
-			// Standard Error: 1_485
-			.saturating_add(Weight::from_parts(237_159, 0).saturating_mul(p.into()))
-			.saturating_add(T::DbWeight::get().reads(4))
-			.saturating_add(T::DbWeight::get().writes(3))
-			.saturating_add(Weight::from_parts(0, 1).saturating_mul(b.into()))
-			.saturating_add(Weight::from_parts(0, 66).saturating_mul(m.into()))
-			.saturating_add(Weight::from_parts(0, 40).saturating_mul(p.into()))
-	}
-	/// Storage: Council Voting (r:1 w:1)
-	/// Proof Skipped: Council Voting (max_values: None, max_size: None, mode: Measured)
-	/// Storage: Council Members (r:1 w:0)
-	/// Proof Skipped: Council Members (max_values: Some(1), max_size: None, mode: Measured)
-	/// Storage: Council Prime (r:1 w:0)
-	/// Proof Skipped: Council Prime (max_values: Some(1), max_size: None, mode: Measured)
-	/// Storage: Council Proposals (r:1 w:1)
-	/// Proof Skipped: Council Proposals (max_values: Some(1), max_size: None, mode: Measured)
-	/// Storage: Council ProposalOf (r:0 w:1)
-	/// Proof Skipped: Council ProposalOf (max_values: None, max_size: None, mode: Measured)
-	/// The range of component `m` is `[4, 100]`.
-	/// The range of component `p` is `[1, 100]`.
-	/// The range of component `m` is `[4, 100]`.
-	/// The range of component `p` is `[1, 100]`.
-	fn close_disapproved(m: u32, p: u32, ) -> Weight {
-		// Proof Size summary in bytes:
-		//  Measured:  `451 + m * (64 ±0) + p * (36 ±0)`
-		//  Estimated: `3896 + m * (65 ±0) + p * (36 ±0)`
-		// Minimum execution time: 30_417_000 picoseconds.
-		Weight::from_parts(30_840_007, 0)
-			.saturating_add(Weight::from_parts(0, 3896))
-			// Standard Error: 662
-			.saturating_add(Weight::from_parts(37_877, 0).saturating_mul(m.into()))
-			// Standard Error: 645
-			.saturating_add(Weight::from_parts(189_312, 0).saturating_mul(p.into()))
-			.saturating_add(T::DbWeight::get().reads(4))
-			.saturating_add(T::DbWeight::get().writes(3))
-			.saturating_add(Weight::from_parts(0, 65).saturating_mul(m.into()))
-			.saturating_add(Weight::from_parts(0, 36).saturating_mul(p.into()))
-	}
-	/// Storage: Council Voting (r:1 w:1)
-	/// Proof Skipped: Council Voting (max_values: None, max_size: None, mode: Measured)
-	/// Storage: Council Members (r:1 w:0)
-	/// Proof Skipped: Council Members (max_values: Some(1), max_size: None, mode: Measured)
-	/// Storage: Council Prime (r:1 w:0)
-	/// Proof Skipped: Council Prime (max_values: Some(1), max_size: None, mode: Measured)
-	/// Storage: Council ProposalOf (r:1 w:1)
-	/// Proof Skipped: Council ProposalOf (max_values: None, max_size: None, mode: Measured)
-	/// Storage: Council Proposals (r:1 w:1)
-	/// Proof Skipped: Council Proposals (max_values: Some(1), max_size: None, mode: Measured)
-	/// The range of component `b` is `[2, 1024]`.
-	/// The range of component `m` is `[4, 100]`.
-	/// The range of component `p` is `[1, 100]`.
-	/// The range of component `b` is `[2, 1024]`.
-	/// The range of component `m` is `[4, 100]`.
-	/// The range of component `p` is `[1, 100]`.
-	fn close_approved(b: u32, m: u32, p: u32, ) -> Weight {
-		// Proof Size summary in bytes:
-		//  Measured:  `753 + b * (1 ±0) + m * (64 ±0) + p * (40 ±0)`
-		//  Estimated: `4070 + b * (1 ±0) + m * (66 ±0) + p * (40 ±0)`
-		// Minimum execution time: 41_630_000 picoseconds.
-		Weight::from_parts(42_847_316, 0)
-			.saturating_add(Weight::from_parts(0, 4070))
-			// Standard Error: 134
-			.saturating_add(Weight::from_parts(3_962, 0).saturating_mul(b.into()))
-			// Standard Error: 1_423
-			.saturating_add(Weight::from_parts(22_489, 0).saturating_mul(m.into()))
-			// Standard Error: 1_387
-			.saturating_add(Weight::from_parts(244_543, 0).saturating_mul(p.into()))
-			.saturating_add(T::DbWeight::get().reads(5))
-			.saturating_add(T::DbWeight::get().writes(3))
-			.saturating_add(Weight::from_parts(0, 1).saturating_mul(b.into()))
-			.saturating_add(Weight::from_parts(0, 66).saturating_mul(m.into()))
-			.saturating_add(Weight::from_parts(0, 40).saturating_mul(p.into()))
-	}
-	/// Storage: Council Proposals (r:1 w:1)
-	/// Proof Skipped: Council Proposals (max_values: Some(1), max_size: None, mode: Measured)
-	/// Storage: Council Voting (r:0 w:1)
-	/// Proof Skipped: Council Voting (max_values: None, max_size: None, mode: Measured)
-	/// Storage: Council ProposalOf (r:0 w:1)
-	/// Proof Skipped: Council ProposalOf (max_values: None, max_size: None, mode: Measured)
-	/// The range of component `p` is `[1, 100]`.
-	/// The range of component `p` is `[1, 100]`.
-	fn disapprove_proposal(p: u32, ) -> Weight {
-		// Proof Size summary in bytes:
-		//  Measured:  `260 + p * (32 ±0)`
-		//  Estimated: `1745 + p * (32 ±0)`
-		// Minimum execution time: 15_754_000 picoseconds.
-		Weight::from_parts(17_477_133, 0)
-			.saturating_add(Weight::from_parts(0, 1745))
-			// Standard Error: 608
-			.saturating_add(Weight::from_parts(178_320, 0).saturating_mul(p.into()))
-			.saturating_add(T::DbWeight::get().reads(1))
-			.saturating_add(T::DbWeight::get().writes(3))
-			.saturating_add(Weight::from_parts(0, 32).saturating_mul(p.into()))
-	}
-}
diff --git a/polkadot/runtime/polkadot/src/weights/pallet_collective_technical_committee.rs b/polkadot/runtime/polkadot/src/weights/pallet_collective_technical_committee.rs
deleted file mode 100644
index 07fb1209b0a17b1a8990a0f71f81804d2d13314b..0000000000000000000000000000000000000000
--- a/polkadot/runtime/polkadot/src/weights/pallet_collective_technical_committee.rs
+++ /dev/null
@@ -1,327 +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/>.
-
-//! Autogenerated weights for `pallet_collective`
-//!
-//! THIS FILE WAS AUTO-GENERATED USING THE SUBSTRATE BENCHMARK CLI VERSION 4.0.0-dev
-//! DATE: 2023-06-18, STEPS: `50`, REPEAT: `20`, LOW RANGE: `[]`, HIGH RANGE: `[]`
-//! WORST CASE MAP SIZE: `1000000`
-//! HOSTNAME: `runner-e8ezs4ez-project-163-concurrent-0`, CPU: `Intel(R) Xeon(R) CPU @ 2.60GHz`
-//! EXECUTION: Some(Wasm), WASM-EXECUTION: Compiled, CHAIN: Some("polkadot-dev"), DB CACHE: 1024
-
-// Executed Command:
-// ./target/production/polkadot
-// benchmark
-// pallet
-// --chain=polkadot-dev
-// --steps=50
-// --repeat=20
-// --no-storage-info
-// --no-median-slopes
-// --no-min-squares
-// --pallet=pallet_collective
-// --extrinsic=*
-// --execution=wasm
-// --wasm-execution=compiled
-// --header=./file_header.txt
-// --output=./runtime/polkadot/src/weights/
-
-#![cfg_attr(rustfmt, rustfmt_skip)]
-#![allow(unused_parens)]
-#![allow(unused_imports)]
-#![allow(missing_docs)]
-
-use frame_support::{traits::Get, weights::Weight};
-use core::marker::PhantomData;
-
-/// Weight functions for `pallet_collective`.
-pub struct WeightInfo<T>(PhantomData<T>);
-impl<T: frame_system::Config> pallet_collective::WeightInfo for WeightInfo<T> {
-	/// Storage: TechnicalCommittee Members (r:1 w:1)
-	/// Proof Skipped: TechnicalCommittee Members (max_values: Some(1), max_size: None, mode: Measured)
-	/// Storage: TechnicalCommittee Proposals (r:1 w:0)
-	/// Proof Skipped: TechnicalCommittee Proposals (max_values: Some(1), max_size: None, mode: Measured)
-	/// Storage: TechnicalCommittee Voting (r:100 w:100)
-	/// Proof Skipped: TechnicalCommittee Voting (max_values: None, max_size: None, mode: Measured)
-	/// Storage: TechnicalCommittee Prime (r:0 w:1)
-	/// Proof Skipped: TechnicalCommittee Prime (max_values: Some(1), max_size: None, mode: Measured)
-	/// The range of component `m` is `[0, 100]`.
-	/// The range of component `n` is `[0, 100]`.
-	/// The range of component `p` is `[0, 100]`.
-	/// The range of component `m` is `[0, 100]`.
-	/// The range of component `n` is `[0, 100]`.
-	/// The range of component `p` is `[0, 100]`.
-	fn set_members(m: u32, _n: u32, p: u32, ) -> Weight {
-		// Proof Size summary in bytes:
-		//  Measured:  `0 + m * (3232 ±0) + p * (3190 ±0)`
-		//  Estimated: `15800 + m * (1967 ±16) + p * (4332 ±16)`
-		// Minimum execution time: 18_203_000 picoseconds.
-		Weight::from_parts(18_473_000, 0)
-			.saturating_add(Weight::from_parts(0, 15800))
-			// Standard Error: 43_603
-			.saturating_add(Weight::from_parts(4_734_955, 0).saturating_mul(m.into()))
-			// Standard Error: 43_603
-			.saturating_add(Weight::from_parts(8_291_611, 0).saturating_mul(p.into()))
-			.saturating_add(T::DbWeight::get().reads(2))
-			.saturating_add(T::DbWeight::get().reads((1_u64).saturating_mul(p.into())))
-			.saturating_add(T::DbWeight::get().writes(2))
-			.saturating_add(T::DbWeight::get().writes((1_u64).saturating_mul(p.into())))
-			.saturating_add(Weight::from_parts(0, 1967).saturating_mul(m.into()))
-			.saturating_add(Weight::from_parts(0, 4332).saturating_mul(p.into()))
-	}
-	/// Storage: TechnicalCommittee Members (r:1 w:0)
-	/// Proof Skipped: TechnicalCommittee Members (max_values: Some(1), max_size: None, mode: Measured)
-	/// The range of component `b` is `[2, 1024]`.
-	/// The range of component `m` is `[1, 100]`.
-	/// The range of component `b` is `[2, 1024]`.
-	/// The range of component `m` is `[1, 100]`.
-	fn execute(b: u32, m: u32, ) -> Weight {
-		// Proof Size summary in bytes:
-		//  Measured:  `141 + m * (32 ±0)`
-		//  Estimated: `1627 + m * (32 ±0)`
-		// Minimum execution time: 17_071_000 picoseconds.
-		Weight::from_parts(16_315_595, 0)
-			.saturating_add(Weight::from_parts(0, 1627))
-			// Standard Error: 14
-			.saturating_add(Weight::from_parts(1_706, 0).saturating_mul(b.into()))
-			// Standard Error: 146
-			.saturating_add(Weight::from_parts(13_626, 0).saturating_mul(m.into()))
-			.saturating_add(T::DbWeight::get().reads(1))
-			.saturating_add(Weight::from_parts(0, 32).saturating_mul(m.into()))
-	}
-	/// Storage: TechnicalCommittee Members (r:1 w:0)
-	/// Proof Skipped: TechnicalCommittee Members (max_values: Some(1), max_size: None, mode: Measured)
-	/// Storage: TechnicalCommittee ProposalOf (r:1 w:0)
-	/// Proof Skipped: TechnicalCommittee ProposalOf (max_values: None, max_size: None, mode: Measured)
-	/// The range of component `b` is `[2, 1024]`.
-	/// The range of component `m` is `[1, 100]`.
-	/// The range of component `b` is `[2, 1024]`.
-	/// The range of component `m` is `[1, 100]`.
-	fn propose_execute(b: u32, m: u32, ) -> Weight {
-		// Proof Size summary in bytes:
-		//  Measured:  `141 + m * (32 ±0)`
-		//  Estimated: `3607 + m * (32 ±0)`
-		// Minimum execution time: 19_983_000 picoseconds.
-		Weight::from_parts(18_925_239, 0)
-			.saturating_add(Weight::from_parts(0, 3607))
-			// Standard Error: 17
-			.saturating_add(Weight::from_parts(1_664, 0).saturating_mul(b.into()))
-			// Standard Error: 176
-			.saturating_add(Weight::from_parts(23_169, 0).saturating_mul(m.into()))
-			.saturating_add(T::DbWeight::get().reads(2))
-			.saturating_add(Weight::from_parts(0, 32).saturating_mul(m.into()))
-	}
-	/// Storage: TechnicalCommittee Members (r:1 w:0)
-	/// Proof Skipped: TechnicalCommittee Members (max_values: Some(1), max_size: None, mode: Measured)
-	/// Storage: TechnicalCommittee ProposalOf (r:1 w:1)
-	/// Proof Skipped: TechnicalCommittee ProposalOf (max_values: None, max_size: None, mode: Measured)
-	/// Storage: TechnicalCommittee Proposals (r:1 w:1)
-	/// Proof Skipped: TechnicalCommittee Proposals (max_values: Some(1), max_size: None, mode: Measured)
-	/// Storage: TechnicalCommittee ProposalCount (r:1 w:1)
-	/// Proof Skipped: TechnicalCommittee ProposalCount (max_values: Some(1), max_size: None, mode: Measured)
-	/// Storage: TechnicalCommittee Voting (r:0 w:1)
-	/// Proof Skipped: TechnicalCommittee Voting (max_values: None, max_size: None, mode: Measured)
-	/// The range of component `b` is `[2, 1024]`.
-	/// The range of component `m` is `[2, 100]`.
-	/// The range of component `p` is `[1, 100]`.
-	/// The range of component `b` is `[2, 1024]`.
-	/// The range of component `m` is `[2, 100]`.
-	/// The range of component `p` is `[1, 100]`.
-	fn propose_proposed(b: u32, m: u32, p: u32, ) -> Weight {
-		// Proof Size summary in bytes:
-		//  Measured:  `431 + m * (32 ±0) + p * (36 ±0)`
-		//  Estimated: `3823 + m * (33 ±0) + p * (36 ±0)`
-		// Minimum execution time: 26_490_000 picoseconds.
-		Weight::from_parts(25_739_853, 0)
-			.saturating_add(Weight::from_parts(0, 3823))
-			// Standard Error: 77
-			.saturating_add(Weight::from_parts(3_479, 0).saturating_mul(b.into()))
-			// Standard Error: 807
-			.saturating_add(Weight::from_parts(28_438, 0).saturating_mul(m.into()))
-			// Standard Error: 796
-			.saturating_add(Weight::from_parts(199_864, 0).saturating_mul(p.into()))
-			.saturating_add(T::DbWeight::get().reads(4))
-			.saturating_add(T::DbWeight::get().writes(4))
-			.saturating_add(Weight::from_parts(0, 33).saturating_mul(m.into()))
-			.saturating_add(Weight::from_parts(0, 36).saturating_mul(p.into()))
-	}
-	/// Storage: TechnicalCommittee Members (r:1 w:0)
-	/// Proof Skipped: TechnicalCommittee Members (max_values: Some(1), max_size: None, mode: Measured)
-	/// Storage: TechnicalCommittee Voting (r:1 w:1)
-	/// Proof Skipped: TechnicalCommittee Voting (max_values: None, max_size: None, mode: Measured)
-	/// The range of component `m` is `[5, 100]`.
-	/// The range of component `m` is `[5, 100]`.
-	fn vote(m: u32, ) -> Weight {
-		// Proof Size summary in bytes:
-		//  Measured:  `880 + m * (64 ±0)`
-		//  Estimated: `4344 + m * (64 ±0)`
-		// Minimum execution time: 27_693_000 picoseconds.
-		Weight::from_parts(28_461_881, 0)
-			.saturating_add(Weight::from_parts(0, 4344))
-			// Standard Error: 592
-			.saturating_add(Weight::from_parts(55_442, 0).saturating_mul(m.into()))
-			.saturating_add(T::DbWeight::get().reads(2))
-			.saturating_add(T::DbWeight::get().writes(1))
-			.saturating_add(Weight::from_parts(0, 64).saturating_mul(m.into()))
-	}
-	/// Storage: TechnicalCommittee Voting (r:1 w:1)
-	/// Proof Skipped: TechnicalCommittee Voting (max_values: None, max_size: None, mode: Measured)
-	/// Storage: TechnicalCommittee Members (r:1 w:0)
-	/// Proof Skipped: TechnicalCommittee Members (max_values: Some(1), max_size: None, mode: Measured)
-	/// Storage: TechnicalCommittee Proposals (r:1 w:1)
-	/// Proof Skipped: TechnicalCommittee Proposals (max_values: Some(1), max_size: None, mode: Measured)
-	/// Storage: TechnicalCommittee ProposalOf (r:0 w:1)
-	/// Proof Skipped: TechnicalCommittee ProposalOf (max_values: None, max_size: None, mode: Measured)
-	/// The range of component `m` is `[4, 100]`.
-	/// The range of component `p` is `[1, 100]`.
-	/// The range of component `m` is `[4, 100]`.
-	/// The range of component `p` is `[1, 100]`.
-	fn close_early_disapproved(m: u32, p: u32, ) -> Weight {
-		// Proof Size summary in bytes:
-		//  Measured:  `469 + m * (64 ±0) + p * (36 ±0)`
-		//  Estimated: `3914 + m * (65 ±0) + p * (36 ±0)`
-		// Minimum execution time: 28_958_000 picoseconds.
-		Weight::from_parts(28_772_598, 0)
-			.saturating_add(Weight::from_parts(0, 3914))
-			// Standard Error: 673
-			.saturating_add(Weight::from_parts(36_736, 0).saturating_mul(m.into()))
-			// Standard Error: 657
-			.saturating_add(Weight::from_parts(191_282, 0).saturating_mul(p.into()))
-			.saturating_add(T::DbWeight::get().reads(3))
-			.saturating_add(T::DbWeight::get().writes(3))
-			.saturating_add(Weight::from_parts(0, 65).saturating_mul(m.into()))
-			.saturating_add(Weight::from_parts(0, 36).saturating_mul(p.into()))
-	}
-	/// Storage: TechnicalCommittee Voting (r:1 w:1)
-	/// Proof Skipped: TechnicalCommittee Voting (max_values: None, max_size: None, mode: Measured)
-	/// Storage: TechnicalCommittee Members (r:1 w:0)
-	/// Proof Skipped: TechnicalCommittee Members (max_values: Some(1), max_size: None, mode: Measured)
-	/// Storage: TechnicalCommittee ProposalOf (r:1 w:1)
-	/// Proof Skipped: TechnicalCommittee ProposalOf (max_values: None, max_size: None, mode: Measured)
-	/// Storage: TechnicalCommittee Proposals (r:1 w:1)
-	/// Proof Skipped: TechnicalCommittee Proposals (max_values: Some(1), max_size: None, mode: Measured)
-	/// The range of component `b` is `[2, 1024]`.
-	/// The range of component `m` is `[4, 100]`.
-	/// The range of component `p` is `[1, 100]`.
-	/// The range of component `b` is `[2, 1024]`.
-	/// The range of component `m` is `[4, 100]`.
-	/// The range of component `p` is `[1, 100]`.
-	fn close_early_approved(b: u32, m: u32, p: u32, ) -> Weight {
-		// Proof Size summary in bytes:
-		//  Measured:  `771 + b * (1 ±0) + m * (64 ±0) + p * (40 ±0)`
-		//  Estimated: `4088 + b * (1 ±0) + m * (66 ±0) + p * (40 ±0)`
-		// Minimum execution time: 40_599_000 picoseconds.
-		Weight::from_parts(40_617_733, 0)
-			.saturating_add(Weight::from_parts(0, 4088))
-			// Standard Error: 122
-			.saturating_add(Weight::from_parts(3_479, 0).saturating_mul(b.into()))
-			// Standard Error: 1_296
-			.saturating_add(Weight::from_parts(34_407, 0).saturating_mul(m.into()))
-			// Standard Error: 1_263
-			.saturating_add(Weight::from_parts(236_766, 0).saturating_mul(p.into()))
-			.saturating_add(T::DbWeight::get().reads(4))
-			.saturating_add(T::DbWeight::get().writes(3))
-			.saturating_add(Weight::from_parts(0, 1).saturating_mul(b.into()))
-			.saturating_add(Weight::from_parts(0, 66).saturating_mul(m.into()))
-			.saturating_add(Weight::from_parts(0, 40).saturating_mul(p.into()))
-	}
-	/// Storage: TechnicalCommittee Voting (r:1 w:1)
-	/// Proof Skipped: TechnicalCommittee Voting (max_values: None, max_size: None, mode: Measured)
-	/// Storage: TechnicalCommittee Members (r:1 w:0)
-	/// Proof Skipped: TechnicalCommittee Members (max_values: Some(1), max_size: None, mode: Measured)
-	/// Storage: TechnicalCommittee Prime (r:1 w:0)
-	/// Proof Skipped: TechnicalCommittee Prime (max_values: Some(1), max_size: None, mode: Measured)
-	/// Storage: TechnicalCommittee Proposals (r:1 w:1)
-	/// Proof Skipped: TechnicalCommittee Proposals (max_values: Some(1), max_size: None, mode: Measured)
-	/// Storage: TechnicalCommittee ProposalOf (r:0 w:1)
-	/// Proof Skipped: TechnicalCommittee ProposalOf (max_values: None, max_size: None, mode: Measured)
-	/// The range of component `m` is `[4, 100]`.
-	/// The range of component `p` is `[1, 100]`.
-	/// The range of component `m` is `[4, 100]`.
-	/// The range of component `p` is `[1, 100]`.
-	fn close_disapproved(m: u32, p: u32, ) -> Weight {
-		// Proof Size summary in bytes:
-		//  Measured:  `489 + m * (64 ±0) + p * (36 ±0)`
-		//  Estimated: `3934 + m * (65 ±0) + p * (36 ±0)`
-		// Minimum execution time: 32_265_000 picoseconds.
-		Weight::from_parts(31_660_039, 0)
-			.saturating_add(Weight::from_parts(0, 3934))
-			// Standard Error: 689
-			.saturating_add(Weight::from_parts(39_118, 0).saturating_mul(m.into()))
-			// Standard Error: 672
-			.saturating_add(Weight::from_parts(192_797, 0).saturating_mul(p.into()))
-			.saturating_add(T::DbWeight::get().reads(4))
-			.saturating_add(T::DbWeight::get().writes(3))
-			.saturating_add(Weight::from_parts(0, 65).saturating_mul(m.into()))
-			.saturating_add(Weight::from_parts(0, 36).saturating_mul(p.into()))
-	}
-	/// Storage: TechnicalCommittee Voting (r:1 w:1)
-	/// Proof Skipped: TechnicalCommittee Voting (max_values: None, max_size: None, mode: Measured)
-	/// Storage: TechnicalCommittee Members (r:1 w:0)
-	/// Proof Skipped: TechnicalCommittee Members (max_values: Some(1), max_size: None, mode: Measured)
-	/// Storage: TechnicalCommittee Prime (r:1 w:0)
-	/// Proof Skipped: TechnicalCommittee Prime (max_values: Some(1), max_size: None, mode: Measured)
-	/// Storage: TechnicalCommittee ProposalOf (r:1 w:1)
-	/// Proof Skipped: TechnicalCommittee ProposalOf (max_values: None, max_size: None, mode: Measured)
-	/// Storage: TechnicalCommittee Proposals (r:1 w:1)
-	/// Proof Skipped: TechnicalCommittee Proposals (max_values: Some(1), max_size: None, mode: Measured)
-	/// The range of component `b` is `[2, 1024]`.
-	/// The range of component `m` is `[4, 100]`.
-	/// The range of component `p` is `[1, 100]`.
-	/// The range of component `b` is `[2, 1024]`.
-	/// The range of component `m` is `[4, 100]`.
-	/// The range of component `p` is `[1, 100]`.
-	fn close_approved(b: u32, m: u32, p: u32, ) -> Weight {
-		// Proof Size summary in bytes:
-		//  Measured:  `791 + b * (1 ±0) + m * (64 ±0) + p * (40 ±0)`
-		//  Estimated: `4108 + b * (1 ±0) + m * (66 ±0) + p * (40 ±0)`
-		// Minimum execution time: 42_456_000 picoseconds.
-		Weight::from_parts(43_760_828, 0)
-			.saturating_add(Weight::from_parts(0, 4108))
-			// Standard Error: 132
-			.saturating_add(Weight::from_parts(3_531, 0).saturating_mul(b.into()))
-			// Standard Error: 1_397
-			.saturating_add(Weight::from_parts(28_101, 0).saturating_mul(m.into()))
-			// Standard Error: 1_362
-			.saturating_add(Weight::from_parts(248_244, 0).saturating_mul(p.into()))
-			.saturating_add(T::DbWeight::get().reads(5))
-			.saturating_add(T::DbWeight::get().writes(3))
-			.saturating_add(Weight::from_parts(0, 1).saturating_mul(b.into()))
-			.saturating_add(Weight::from_parts(0, 66).saturating_mul(m.into()))
-			.saturating_add(Weight::from_parts(0, 40).saturating_mul(p.into()))
-	}
-	/// Storage: TechnicalCommittee Proposals (r:1 w:1)
-	/// Proof Skipped: TechnicalCommittee Proposals (max_values: Some(1), max_size: None, mode: Measured)
-	/// Storage: TechnicalCommittee Voting (r:0 w:1)
-	/// Proof Skipped: TechnicalCommittee Voting (max_values: None, max_size: None, mode: Measured)
-	/// Storage: TechnicalCommittee ProposalOf (r:0 w:1)
-	/// Proof Skipped: TechnicalCommittee ProposalOf (max_values: None, max_size: None, mode: Measured)
-	/// The range of component `p` is `[1, 100]`.
-	/// The range of component `p` is `[1, 100]`.
-	fn disapprove_proposal(p: u32, ) -> Weight {
-		// Proof Size summary in bytes:
-		//  Measured:  `298 + p * (32 ±0)`
-		//  Estimated: `1783 + p * (32 ±0)`
-		// Minimum execution time: 16_506_000 picoseconds.
-		Weight::from_parts(18_127_000, 0)
-			.saturating_add(Weight::from_parts(0, 1783))
-			// Standard Error: 616
-			.saturating_add(Weight::from_parts(175_889, 0).saturating_mul(p.into()))
-			.saturating_add(T::DbWeight::get().reads(1))
-			.saturating_add(T::DbWeight::get().writes(3))
-			.saturating_add(Weight::from_parts(0, 32).saturating_mul(p.into()))
-	}
-}
diff --git a/polkadot/runtime/polkadot/src/weights/pallet_conviction_voting.rs b/polkadot/runtime/polkadot/src/weights/pallet_conviction_voting.rs
deleted file mode 100644
index ce42464c292f742e6fcbcfb23f661961fc90fe19..0000000000000000000000000000000000000000
--- a/polkadot/runtime/polkadot/src/weights/pallet_conviction_voting.rs
+++ /dev/null
@@ -1,195 +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/>.
-
-//! Autogenerated weights for `pallet_conviction_voting`
-//!
-//! THIS FILE WAS AUTO-GENERATED USING THE SUBSTRATE BENCHMARK CLI VERSION 4.0.0-dev
-//! DATE: 2023-06-18, STEPS: `50`, REPEAT: `20`, LOW RANGE: `[]`, HIGH RANGE: `[]`
-//! WORST CASE MAP SIZE: `1000000`
-//! HOSTNAME: `runner-e8ezs4ez-project-163-concurrent-0`, CPU: `Intel(R) Xeon(R) CPU @ 2.60GHz`
-//! EXECUTION: Some(Wasm), WASM-EXECUTION: Compiled, CHAIN: Some("polkadot-dev"), DB CACHE: 1024
-
-// Executed Command:
-// ./target/production/polkadot
-// benchmark
-// pallet
-// --chain=polkadot-dev
-// --steps=50
-// --repeat=20
-// --no-storage-info
-// --no-median-slopes
-// --no-min-squares
-// --pallet=pallet_conviction_voting
-// --extrinsic=*
-// --execution=wasm
-// --wasm-execution=compiled
-// --header=./file_header.txt
-// --output=./runtime/polkadot/src/weights/
-
-#![cfg_attr(rustfmt, rustfmt_skip)]
-#![allow(unused_parens)]
-#![allow(unused_imports)]
-#![allow(missing_docs)]
-
-use frame_support::{traits::Get, weights::Weight};
-use core::marker::PhantomData;
-
-/// Weight functions for `pallet_conviction_voting`.
-pub struct WeightInfo<T>(PhantomData<T>);
-impl<T: frame_system::Config> pallet_conviction_voting::WeightInfo for WeightInfo<T> {
-	/// Storage: Referenda ReferendumInfoFor (r:1 w:1)
-	/// Proof: Referenda ReferendumInfoFor (max_values: None, max_size: Some(936), added: 3411, mode: MaxEncodedLen)
-	/// Storage: ConvictionVoting VotingFor (r:1 w:1)
-	/// Proof: ConvictionVoting VotingFor (max_values: None, max_size: Some(27241), added: 29716, mode: MaxEncodedLen)
-	/// Storage: ConvictionVoting ClassLocksFor (r:1 w:1)
-	/// Proof: ConvictionVoting ClassLocksFor (max_values: None, max_size: Some(311), added: 2786, mode: MaxEncodedLen)
-	/// Storage: Balances Locks (r:1 w:1)
-	/// Proof: Balances Locks (max_values: None, max_size: Some(1299), added: 3774, mode: MaxEncodedLen)
-	/// Storage: Balances Freezes (r:1 w:0)
-	/// Proof: Balances Freezes (max_values: None, max_size: Some(49), added: 2524, mode: MaxEncodedLen)
-	/// Storage: Scheduler Agenda (r:1 w:1)
-	/// Proof: Scheduler Agenda (max_values: None, max_size: Some(38963), added: 41438, mode: MaxEncodedLen)
-	fn vote_new() -> Weight {
-		// Proof Size summary in bytes:
-		//  Measured:  `13551`
-		//  Estimated: `42428`
-		// Minimum execution time: 154_104_000 picoseconds.
-		Weight::from_parts(162_701_000, 0)
-			.saturating_add(Weight::from_parts(0, 42428))
-			.saturating_add(T::DbWeight::get().reads(6))
-			.saturating_add(T::DbWeight::get().writes(5))
-	}
-	/// Storage: Referenda ReferendumInfoFor (r:1 w:1)
-	/// Proof: Referenda ReferendumInfoFor (max_values: None, max_size: Some(936), added: 3411, mode: MaxEncodedLen)
-	/// Storage: ConvictionVoting VotingFor (r:1 w:1)
-	/// Proof: ConvictionVoting VotingFor (max_values: None, max_size: Some(27241), added: 29716, mode: MaxEncodedLen)
-	/// Storage: ConvictionVoting ClassLocksFor (r:1 w:1)
-	/// Proof: ConvictionVoting ClassLocksFor (max_values: None, max_size: Some(311), added: 2786, mode: MaxEncodedLen)
-	/// Storage: Balances Locks (r:1 w:1)
-	/// Proof: Balances Locks (max_values: None, max_size: Some(1299), added: 3774, mode: MaxEncodedLen)
-	/// Storage: Balances Freezes (r:1 w:0)
-	/// Proof: Balances Freezes (max_values: None, max_size: Some(49), added: 2524, mode: MaxEncodedLen)
-	/// Storage: Scheduler Agenda (r:2 w:2)
-	/// Proof: Scheduler Agenda (max_values: None, max_size: Some(38963), added: 41438, mode: MaxEncodedLen)
-	fn vote_existing() -> Weight {
-		// Proof Size summary in bytes:
-		//  Measured:  `14272`
-		//  Estimated: `83866`
-		// Minimum execution time: 241_839_000 picoseconds.
-		Weight::from_parts(251_787_000, 0)
-			.saturating_add(Weight::from_parts(0, 83866))
-			.saturating_add(T::DbWeight::get().reads(7))
-			.saturating_add(T::DbWeight::get().writes(6))
-	}
-	/// Storage: ConvictionVoting VotingFor (r:1 w:1)
-	/// Proof: ConvictionVoting VotingFor (max_values: None, max_size: Some(27241), added: 29716, mode: MaxEncodedLen)
-	/// Storage: Referenda ReferendumInfoFor (r:1 w:1)
-	/// Proof: Referenda ReferendumInfoFor (max_values: None, max_size: Some(936), added: 3411, mode: MaxEncodedLen)
-	/// Storage: Scheduler Agenda (r:2 w:2)
-	/// Proof: Scheduler Agenda (max_values: None, max_size: Some(38963), added: 41438, mode: MaxEncodedLen)
-	fn remove_vote() -> Weight {
-		// Proof Size summary in bytes:
-		//  Measured:  `14024`
-		//  Estimated: `83866`
-		// Minimum execution time: 198_871_000 picoseconds.
-		Weight::from_parts(208_410_000, 0)
-			.saturating_add(Weight::from_parts(0, 83866))
-			.saturating_add(T::DbWeight::get().reads(4))
-			.saturating_add(T::DbWeight::get().writes(4))
-	}
-	/// Storage: ConvictionVoting VotingFor (r:1 w:1)
-	/// Proof: ConvictionVoting VotingFor (max_values: None, max_size: Some(27241), added: 29716, mode: MaxEncodedLen)
-	/// Storage: Referenda ReferendumInfoFor (r:1 w:0)
-	/// Proof: Referenda ReferendumInfoFor (max_values: None, max_size: Some(936), added: 3411, mode: MaxEncodedLen)
-	fn remove_other_vote() -> Weight {
-		// Proof Size summary in bytes:
-		//  Measured:  `13110`
-		//  Estimated: `30706`
-		// Minimum execution time: 86_480_000 picoseconds.
-		Weight::from_parts(90_343_000, 0)
-			.saturating_add(Weight::from_parts(0, 30706))
-			.saturating_add(T::DbWeight::get().reads(2))
-			.saturating_add(T::DbWeight::get().writes(1))
-	}
-	/// Storage: ConvictionVoting VotingFor (r:2 w:2)
-	/// Proof: ConvictionVoting VotingFor (max_values: None, max_size: Some(27241), added: 29716, mode: MaxEncodedLen)
-	/// Storage: Referenda ReferendumInfoFor (r:512 w:512)
-	/// Proof: Referenda ReferendumInfoFor (max_values: None, max_size: Some(936), added: 3411, mode: MaxEncodedLen)
-	/// Storage: Scheduler Agenda (r:2 w:2)
-	/// Proof: Scheduler Agenda (max_values: None, max_size: Some(38963), added: 41438, mode: MaxEncodedLen)
-	/// Storage: ConvictionVoting ClassLocksFor (r:1 w:1)
-	/// Proof: ConvictionVoting ClassLocksFor (max_values: None, max_size: Some(311), added: 2786, mode: MaxEncodedLen)
-	/// Storage: Balances Locks (r:1 w:1)
-	/// Proof: Balances Locks (max_values: None, max_size: Some(1299), added: 3774, mode: MaxEncodedLen)
-	/// Storage: Balances Freezes (r:1 w:0)
-	/// Proof: Balances Freezes (max_values: None, max_size: Some(49), added: 2524, mode: MaxEncodedLen)
-	/// The range of component `r` is `[0, 512]`.
-	fn delegate(r: u32, ) -> Weight {
-		// Proof Size summary in bytes:
-		//  Measured:  `29746 + r * (365 ±0)`
-		//  Estimated: `83866 + r * (3411 ±0)`
-		// Minimum execution time: 82_384_000 picoseconds.
-		Weight::from_parts(1_967_705_239, 0)
-			.saturating_add(Weight::from_parts(0, 83866))
-			// Standard Error: 169_648
-			.saturating_add(Weight::from_parts(46_550_419, 0).saturating_mul(r.into()))
-			.saturating_add(T::DbWeight::get().reads(7))
-			.saturating_add(T::DbWeight::get().reads((1_u64).saturating_mul(r.into())))
-			.saturating_add(T::DbWeight::get().writes(6))
-			.saturating_add(T::DbWeight::get().writes((1_u64).saturating_mul(r.into())))
-			.saturating_add(Weight::from_parts(0, 3411).saturating_mul(r.into()))
-	}
-	/// Storage: ConvictionVoting VotingFor (r:2 w:2)
-	/// Proof: ConvictionVoting VotingFor (max_values: None, max_size: Some(27241), added: 29716, mode: MaxEncodedLen)
-	/// Storage: Referenda ReferendumInfoFor (r:512 w:512)
-	/// Proof: Referenda ReferendumInfoFor (max_values: None, max_size: Some(936), added: 3411, mode: MaxEncodedLen)
-	/// Storage: Scheduler Agenda (r:2 w:2)
-	/// Proof: Scheduler Agenda (max_values: None, max_size: Some(38963), added: 41438, mode: MaxEncodedLen)
-	/// The range of component `r` is `[0, 512]`.
-	fn undelegate(r: u32, ) -> Weight {
-		// Proof Size summary in bytes:
-		//  Measured:  `29661 + r * (365 ±0)`
-		//  Estimated: `83866 + r * (3411 ±0)`
-		// Minimum execution time: 50_266_000 picoseconds.
-		Weight::from_parts(1_956_854_151, 0)
-			.saturating_add(Weight::from_parts(0, 83866))
-			// Standard Error: 172_335
-			.saturating_add(Weight::from_parts(46_688_704, 0).saturating_mul(r.into()))
-			.saturating_add(T::DbWeight::get().reads(4))
-			.saturating_add(T::DbWeight::get().reads((1_u64).saturating_mul(r.into())))
-			.saturating_add(T::DbWeight::get().writes(4))
-			.saturating_add(T::DbWeight::get().writes((1_u64).saturating_mul(r.into())))
-			.saturating_add(Weight::from_parts(0, 3411).saturating_mul(r.into()))
-	}
-	/// Storage: ConvictionVoting VotingFor (r:1 w:1)
-	/// Proof: ConvictionVoting VotingFor (max_values: None, max_size: Some(27241), added: 29716, mode: MaxEncodedLen)
-	/// Storage: ConvictionVoting ClassLocksFor (r:1 w:1)
-	/// Proof: ConvictionVoting ClassLocksFor (max_values: None, max_size: Some(311), added: 2786, mode: MaxEncodedLen)
-	/// Storage: Balances Locks (r:1 w:1)
-	/// Proof: Balances Locks (max_values: None, max_size: Some(1299), added: 3774, mode: MaxEncodedLen)
-	/// Storage: Balances Freezes (r:1 w:0)
-	/// Proof: Balances Freezes (max_values: None, max_size: Some(49), added: 2524, mode: MaxEncodedLen)
-	fn unlock() -> Weight {
-		// Proof Size summary in bytes:
-		//  Measured:  `12323`
-		//  Estimated: `30706`
-		// Minimum execution time: 114_930_000 picoseconds.
-		Weight::from_parts(122_209_000, 0)
-			.saturating_add(Weight::from_parts(0, 30706))
-			.saturating_add(T::DbWeight::get().reads(4))
-			.saturating_add(T::DbWeight::get().writes(3))
-	}
-}
diff --git a/polkadot/runtime/polkadot/src/weights/pallet_democracy.rs b/polkadot/runtime/polkadot/src/weights/pallet_democracy.rs
deleted file mode 100644
index 069b10a2bcc5ad1949cb26120766334e8ed4a729..0000000000000000000000000000000000000000
--- a/polkadot/runtime/polkadot/src/weights/pallet_democracy.rs
+++ /dev/null
@@ -1,528 +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/>.
-
-//! Autogenerated weights for `pallet_democracy`
-//!
-//! THIS FILE WAS AUTO-GENERATED USING THE SUBSTRATE BENCHMARK CLI VERSION 4.0.0-dev
-//! DATE: 2023-06-18, STEPS: `50`, REPEAT: `20`, LOW RANGE: `[]`, HIGH RANGE: `[]`
-//! WORST CASE MAP SIZE: `1000000`
-//! HOSTNAME: `runner-e8ezs4ez-project-163-concurrent-0`, CPU: `Intel(R) Xeon(R) CPU @ 2.60GHz`
-//! EXECUTION: Some(Wasm), WASM-EXECUTION: Compiled, CHAIN: Some("polkadot-dev"), DB CACHE: 1024
-
-// Executed Command:
-// ./target/production/polkadot
-// benchmark
-// pallet
-// --chain=polkadot-dev
-// --steps=50
-// --repeat=20
-// --no-storage-info
-// --no-median-slopes
-// --no-min-squares
-// --pallet=pallet_democracy
-// --extrinsic=*
-// --execution=wasm
-// --wasm-execution=compiled
-// --header=./file_header.txt
-// --output=./runtime/polkadot/src/weights/
-
-#![cfg_attr(rustfmt, rustfmt_skip)]
-#![allow(unused_parens)]
-#![allow(unused_imports)]
-#![allow(missing_docs)]
-
-use frame_support::{traits::Get, weights::Weight};
-use core::marker::PhantomData;
-
-/// Weight functions for `pallet_democracy`.
-pub struct WeightInfo<T>(PhantomData<T>);
-impl<T: frame_system::Config> pallet_democracy::WeightInfo for WeightInfo<T> {
-	/// Storage: Democracy PublicPropCount (r:1 w:1)
-	/// Proof: Democracy PublicPropCount (max_values: Some(1), max_size: Some(4), added: 499, mode: MaxEncodedLen)
-	/// Storage: Democracy PublicProps (r:1 w:1)
-	/// Proof: Democracy PublicProps (max_values: Some(1), max_size: Some(16702), added: 17197, mode: MaxEncodedLen)
-	/// Storage: Democracy Blacklist (r:1 w:0)
-	/// Proof: Democracy Blacklist (max_values: None, max_size: Some(3238), added: 5713, mode: MaxEncodedLen)
-	/// Storage: Democracy DepositOf (r:0 w:1)
-	/// Proof: Democracy DepositOf (max_values: None, max_size: Some(3230), added: 5705, mode: MaxEncodedLen)
-	fn propose() -> Weight {
-		// Proof Size summary in bytes:
-		//  Measured:  `4768`
-		//  Estimated: `18187`
-		// Minimum execution time: 47_165_000 picoseconds.
-		Weight::from_parts(48_488_000, 0)
-			.saturating_add(Weight::from_parts(0, 18187))
-			.saturating_add(T::DbWeight::get().reads(3))
-			.saturating_add(T::DbWeight::get().writes(3))
-	}
-	/// Storage: Democracy DepositOf (r:1 w:1)
-	/// Proof: Democracy DepositOf (max_values: None, max_size: Some(3230), added: 5705, mode: MaxEncodedLen)
-	fn second() -> Weight {
-		// Proof Size summary in bytes:
-		//  Measured:  `3523`
-		//  Estimated: `6695`
-		// Minimum execution time: 41_328_000 picoseconds.
-		Weight::from_parts(42_526_000, 0)
-			.saturating_add(Weight::from_parts(0, 6695))
-			.saturating_add(T::DbWeight::get().reads(1))
-			.saturating_add(T::DbWeight::get().writes(1))
-	}
-	/// Storage: Democracy ReferendumInfoOf (r:1 w:1)
-	/// Proof: Democracy ReferendumInfoOf (max_values: None, max_size: Some(201), added: 2676, mode: MaxEncodedLen)
-	/// Storage: Democracy VotingOf (r:1 w:1)
-	/// Proof: Democracy VotingOf (max_values: None, max_size: Some(3795), added: 6270, mode: MaxEncodedLen)
-	/// Storage: Balances Locks (r:1 w:1)
-	/// Proof: Balances Locks (max_values: None, max_size: Some(1299), added: 3774, mode: MaxEncodedLen)
-	/// Storage: Balances Freezes (r:1 w:0)
-	/// Proof: Balances Freezes (max_values: None, max_size: Some(49), added: 2524, mode: MaxEncodedLen)
-	fn vote_new() -> Weight {
-		// Proof Size summary in bytes:
-		//  Measured:  `3437`
-		//  Estimated: `7260`
-		// Minimum execution time: 57_941_000 picoseconds.
-		Weight::from_parts(59_547_000, 0)
-			.saturating_add(Weight::from_parts(0, 7260))
-			.saturating_add(T::DbWeight::get().reads(4))
-			.saturating_add(T::DbWeight::get().writes(3))
-	}
-	/// Storage: Democracy ReferendumInfoOf (r:1 w:1)
-	/// Proof: Democracy ReferendumInfoOf (max_values: None, max_size: Some(201), added: 2676, mode: MaxEncodedLen)
-	/// Storage: Democracy VotingOf (r:1 w:1)
-	/// Proof: Democracy VotingOf (max_values: None, max_size: Some(3795), added: 6270, mode: MaxEncodedLen)
-	/// Storage: Balances Locks (r:1 w:1)
-	/// Proof: Balances Locks (max_values: None, max_size: Some(1299), added: 3774, mode: MaxEncodedLen)
-	/// Storage: Balances Freezes (r:1 w:0)
-	/// Proof: Balances Freezes (max_values: None, max_size: Some(49), added: 2524, mode: MaxEncodedLen)
-	fn vote_existing() -> Weight {
-		// Proof Size summary in bytes:
-		//  Measured:  `3459`
-		//  Estimated: `7260`
-		// Minimum execution time: 63_933_000 picoseconds.
-		Weight::from_parts(65_560_000, 0)
-			.saturating_add(Weight::from_parts(0, 7260))
-			.saturating_add(T::DbWeight::get().reads(4))
-			.saturating_add(T::DbWeight::get().writes(3))
-	}
-	/// Storage: Democracy ReferendumInfoOf (r:1 w:1)
-	/// Proof: Democracy ReferendumInfoOf (max_values: None, max_size: Some(201), added: 2676, mode: MaxEncodedLen)
-	/// Storage: Democracy Cancellations (r:1 w:1)
-	/// Proof: Democracy Cancellations (max_values: None, max_size: Some(33), added: 2508, mode: MaxEncodedLen)
-	/// Storage: Democracy MetadataOf (r:1 w:1)
-	/// Proof: Democracy MetadataOf (max_values: None, max_size: Some(53), added: 2528, mode: MaxEncodedLen)
-	fn emergency_cancel() -> Weight {
-		// Proof Size summary in bytes:
-		//  Measured:  `333`
-		//  Estimated: `3666`
-		// Minimum execution time: 26_501_000 picoseconds.
-		Weight::from_parts(26_882_000, 0)
-			.saturating_add(Weight::from_parts(0, 3666))
-			.saturating_add(T::DbWeight::get().reads(3))
-			.saturating_add(T::DbWeight::get().writes(3))
-	}
-	/// Storage: Democracy PublicProps (r:1 w:1)
-	/// Proof: Democracy PublicProps (max_values: Some(1), max_size: Some(16702), added: 17197, mode: MaxEncodedLen)
-	/// Storage: Democracy DepositOf (r:1 w:1)
-	/// Proof: Democracy DepositOf (max_values: None, max_size: Some(3230), added: 5705, mode: MaxEncodedLen)
-	/// Storage: System Account (r:1 w:1)
-	/// Proof: System Account (max_values: None, max_size: Some(128), added: 2603, mode: MaxEncodedLen)
-	/// Storage: Democracy MetadataOf (r:3 w:1)
-	/// Proof: Democracy MetadataOf (max_values: None, max_size: Some(53), added: 2528, mode: MaxEncodedLen)
-	/// Storage: Democracy NextExternal (r:1 w:1)
-	/// Proof: Democracy NextExternal (max_values: Some(1), max_size: Some(132), added: 627, mode: MaxEncodedLen)
-	/// Storage: Democracy ReferendumInfoOf (r:1 w:1)
-	/// Proof: Democracy ReferendumInfoOf (max_values: None, max_size: Some(201), added: 2676, mode: MaxEncodedLen)
-	/// Storage: Democracy Blacklist (r:0 w:1)
-	/// Proof: Democracy Blacklist (max_values: None, max_size: Some(3238), added: 5713, mode: MaxEncodedLen)
-	fn blacklist() -> Weight {
-		// Proof Size summary in bytes:
-		//  Measured:  `5877`
-		//  Estimated: `18187`
-		// Minimum execution time: 111_868_000 picoseconds.
-		Weight::from_parts(116_733_000, 0)
-			.saturating_add(Weight::from_parts(0, 18187))
-			.saturating_add(T::DbWeight::get().reads(8))
-			.saturating_add(T::DbWeight::get().writes(7))
-	}
-	/// Storage: Democracy NextExternal (r:1 w:1)
-	/// Proof: Democracy NextExternal (max_values: Some(1), max_size: Some(132), added: 627, mode: MaxEncodedLen)
-	/// Storage: Democracy Blacklist (r:1 w:0)
-	/// Proof: Democracy Blacklist (max_values: None, max_size: Some(3238), added: 5713, mode: MaxEncodedLen)
-	fn external_propose() -> Weight {
-		// Proof Size summary in bytes:
-		//  Measured:  `3383`
-		//  Estimated: `6703`
-		// Minimum execution time: 13_786_000 picoseconds.
-		Weight::from_parts(14_280_000, 0)
-			.saturating_add(Weight::from_parts(0, 6703))
-			.saturating_add(T::DbWeight::get().reads(2))
-			.saturating_add(T::DbWeight::get().writes(1))
-	}
-	/// Storage: Democracy NextExternal (r:0 w:1)
-	/// Proof: Democracy NextExternal (max_values: Some(1), max_size: Some(132), added: 627, mode: MaxEncodedLen)
-	fn external_propose_majority() -> Weight {
-		// Proof Size summary in bytes:
-		//  Measured:  `0`
-		//  Estimated: `0`
-		// Minimum execution time: 3_320_000 picoseconds.
-		Weight::from_parts(3_467_000, 0)
-			.saturating_add(Weight::from_parts(0, 0))
-			.saturating_add(T::DbWeight::get().writes(1))
-	}
-	/// Storage: Democracy NextExternal (r:0 w:1)
-	/// Proof: Democracy NextExternal (max_values: Some(1), max_size: Some(132), added: 627, mode: MaxEncodedLen)
-	fn external_propose_default() -> Weight {
-		// Proof Size summary in bytes:
-		//  Measured:  `0`
-		//  Estimated: `0`
-		// Minimum execution time: 3_540_000 picoseconds.
-		Weight::from_parts(3_681_000, 0)
-			.saturating_add(Weight::from_parts(0, 0))
-			.saturating_add(T::DbWeight::get().writes(1))
-	}
-	/// Storage: Democracy NextExternal (r:1 w:1)
-	/// Proof: Democracy NextExternal (max_values: Some(1), max_size: Some(132), added: 627, mode: MaxEncodedLen)
-	/// Storage: Democracy ReferendumCount (r:1 w:1)
-	/// Proof: Democracy ReferendumCount (max_values: Some(1), max_size: Some(4), added: 499, mode: MaxEncodedLen)
-	/// Storage: Democracy MetadataOf (r:1 w:2)
-	/// Proof: Democracy MetadataOf (max_values: None, max_size: Some(53), added: 2528, mode: MaxEncodedLen)
-	/// Storage: Democracy ReferendumInfoOf (r:0 w:1)
-	/// Proof: Democracy ReferendumInfoOf (max_values: None, max_size: Some(201), added: 2676, mode: MaxEncodedLen)
-	fn fast_track() -> Weight {
-		// Proof Size summary in bytes:
-		//  Measured:  `253`
-		//  Estimated: `3518`
-		// Minimum execution time: 28_074_000 picoseconds.
-		Weight::from_parts(28_980_000, 0)
-			.saturating_add(Weight::from_parts(0, 3518))
-			.saturating_add(T::DbWeight::get().reads(3))
-			.saturating_add(T::DbWeight::get().writes(5))
-	}
-	/// Storage: Democracy NextExternal (r:1 w:1)
-	/// Proof: Democracy NextExternal (max_values: Some(1), max_size: Some(132), added: 627, mode: MaxEncodedLen)
-	/// Storage: Democracy Blacklist (r:1 w:1)
-	/// Proof: Democracy Blacklist (max_values: None, max_size: Some(3238), added: 5713, mode: MaxEncodedLen)
-	/// Storage: Democracy MetadataOf (r:1 w:1)
-	/// Proof: Democracy MetadataOf (max_values: None, max_size: Some(53), added: 2528, mode: MaxEncodedLen)
-	fn veto_external() -> Weight {
-		// Proof Size summary in bytes:
-		//  Measured:  `3486`
-		//  Estimated: `6703`
-		// Minimum execution time: 32_243_000 picoseconds.
-		Weight::from_parts(32_604_000, 0)
-			.saturating_add(Weight::from_parts(0, 6703))
-			.saturating_add(T::DbWeight::get().reads(3))
-			.saturating_add(T::DbWeight::get().writes(3))
-	}
-	/// Storage: Democracy PublicProps (r:1 w:1)
-	/// Proof: Democracy PublicProps (max_values: Some(1), max_size: Some(16702), added: 17197, mode: MaxEncodedLen)
-	/// Storage: Democracy DepositOf (r:1 w:1)
-	/// Proof: Democracy DepositOf (max_values: None, max_size: Some(3230), added: 5705, mode: MaxEncodedLen)
-	/// Storage: System Account (r:1 w:1)
-	/// Proof: System Account (max_values: None, max_size: Some(128), added: 2603, mode: MaxEncodedLen)
-	/// Storage: Democracy MetadataOf (r:1 w:1)
-	/// Proof: Democracy MetadataOf (max_values: None, max_size: Some(53), added: 2528, mode: MaxEncodedLen)
-	fn cancel_proposal() -> Weight {
-		// Proof Size summary in bytes:
-		//  Measured:  `5788`
-		//  Estimated: `18187`
-		// Minimum execution time: 93_410_000 picoseconds.
-		Weight::from_parts(95_323_000, 0)
-			.saturating_add(Weight::from_parts(0, 18187))
-			.saturating_add(T::DbWeight::get().reads(4))
-			.saturating_add(T::DbWeight::get().writes(4))
-	}
-	/// Storage: Democracy MetadataOf (r:1 w:1)
-	/// Proof: Democracy MetadataOf (max_values: None, max_size: Some(53), added: 2528, mode: MaxEncodedLen)
-	/// Storage: Democracy ReferendumInfoOf (r:0 w:1)
-	/// Proof: Democracy ReferendumInfoOf (max_values: None, max_size: Some(201), added: 2676, mode: MaxEncodedLen)
-	fn cancel_referendum() -> Weight {
-		// Proof Size summary in bytes:
-		//  Measured:  `238`
-		//  Estimated: `3518`
-		// Minimum execution time: 20_185_000 picoseconds.
-		Weight::from_parts(20_661_000, 0)
-			.saturating_add(Weight::from_parts(0, 3518))
-			.saturating_add(T::DbWeight::get().reads(1))
-			.saturating_add(T::DbWeight::get().writes(2))
-	}
-	/// Storage: Democracy LowestUnbaked (r:1 w:1)
-	/// Proof: Democracy LowestUnbaked (max_values: Some(1), max_size: Some(4), added: 499, mode: MaxEncodedLen)
-	/// Storage: Democracy ReferendumCount (r:1 w:0)
-	/// Proof: Democracy ReferendumCount (max_values: Some(1), max_size: Some(4), added: 499, mode: MaxEncodedLen)
-	/// Storage: Democracy ReferendumInfoOf (r:99 w:0)
-	/// Proof: Democracy ReferendumInfoOf (max_values: None, max_size: Some(201), added: 2676, mode: MaxEncodedLen)
-	/// The range of component `r` is `[0, 99]`.
-	fn on_initialize_base(r: u32, ) -> Weight {
-		// Proof Size summary in bytes:
-		//  Measured:  `211 + r * (86 ±0)`
-		//  Estimated: `1489 + r * (2676 ±0)`
-		// Minimum execution time: 7_484_000 picoseconds.
-		Weight::from_parts(8_532_503, 0)
-			.saturating_add(Weight::from_parts(0, 1489))
-			// Standard Error: 6_320
-			.saturating_add(Weight::from_parts(3_176_208, 0).saturating_mul(r.into()))
-			.saturating_add(T::DbWeight::get().reads(2))
-			.saturating_add(T::DbWeight::get().reads((1_u64).saturating_mul(r.into())))
-			.saturating_add(T::DbWeight::get().writes(1))
-			.saturating_add(Weight::from_parts(0, 2676).saturating_mul(r.into()))
-	}
-	/// Storage: Democracy LowestUnbaked (r:1 w:1)
-	/// Proof: Democracy LowestUnbaked (max_values: Some(1), max_size: Some(4), added: 499, mode: MaxEncodedLen)
-	/// Storage: Democracy ReferendumCount (r:1 w:0)
-	/// Proof: Democracy ReferendumCount (max_values: Some(1), max_size: Some(4), added: 499, mode: MaxEncodedLen)
-	/// Storage: Democracy LastTabledWasExternal (r:1 w:0)
-	/// Proof: Democracy LastTabledWasExternal (max_values: Some(1), max_size: Some(1), added: 496, mode: MaxEncodedLen)
-	/// Storage: Democracy NextExternal (r:1 w:0)
-	/// Proof: Democracy NextExternal (max_values: Some(1), max_size: Some(132), added: 627, mode: MaxEncodedLen)
-	/// Storage: Democracy PublicProps (r:1 w:0)
-	/// Proof: Democracy PublicProps (max_values: Some(1), max_size: Some(16702), added: 17197, mode: MaxEncodedLen)
-	/// Storage: Democracy ReferendumInfoOf (r:99 w:0)
-	/// Proof: Democracy ReferendumInfoOf (max_values: None, max_size: Some(201), added: 2676, mode: MaxEncodedLen)
-	/// The range of component `r` is `[0, 99]`.
-	fn on_initialize_base_with_launch_period(r: u32, ) -> Weight {
-		// Proof Size summary in bytes:
-		//  Measured:  `211 + r * (86 ±0)`
-		//  Estimated: `18187 + r * (2676 ±0)`
-		// Minimum execution time: 10_406_000 picoseconds.
-		Weight::from_parts(11_689_093, 0)
-			.saturating_add(Weight::from_parts(0, 18187))
-			// Standard Error: 7_450
-			.saturating_add(Weight::from_parts(3_172_162, 0).saturating_mul(r.into()))
-			.saturating_add(T::DbWeight::get().reads(5))
-			.saturating_add(T::DbWeight::get().reads((1_u64).saturating_mul(r.into())))
-			.saturating_add(T::DbWeight::get().writes(1))
-			.saturating_add(Weight::from_parts(0, 2676).saturating_mul(r.into()))
-	}
-	/// Storage: Democracy VotingOf (r:3 w:3)
-	/// Proof: Democracy VotingOf (max_values: None, max_size: Some(3795), added: 6270, mode: MaxEncodedLen)
-	/// Storage: Democracy ReferendumInfoOf (r:99 w:99)
-	/// Proof: Democracy ReferendumInfoOf (max_values: None, max_size: Some(201), added: 2676, mode: MaxEncodedLen)
-	/// Storage: Balances Locks (r:1 w:1)
-	/// Proof: Balances Locks (max_values: None, max_size: Some(1299), added: 3774, mode: MaxEncodedLen)
-	/// Storage: Balances Freezes (r:1 w:0)
-	/// Proof: Balances Freezes (max_values: None, max_size: Some(49), added: 2524, mode: MaxEncodedLen)
-	/// The range of component `r` is `[0, 99]`.
-	fn delegate(r: u32, ) -> Weight {
-		// Proof Size summary in bytes:
-		//  Measured:  `797 + r * (108 ±0)`
-		//  Estimated: `19800 + r * (2676 ±0)`
-		// Minimum execution time: 42_210_000 picoseconds.
-		Weight::from_parts(47_151_756, 0)
-			.saturating_add(Weight::from_parts(0, 19800))
-			// Standard Error: 9_095
-			.saturating_add(Weight::from_parts(4_553_285, 0).saturating_mul(r.into()))
-			.saturating_add(T::DbWeight::get().reads(5))
-			.saturating_add(T::DbWeight::get().reads((1_u64).saturating_mul(r.into())))
-			.saturating_add(T::DbWeight::get().writes(4))
-			.saturating_add(T::DbWeight::get().writes((1_u64).saturating_mul(r.into())))
-			.saturating_add(Weight::from_parts(0, 2676).saturating_mul(r.into()))
-	}
-	/// Storage: Democracy VotingOf (r:2 w:2)
-	/// Proof: Democracy VotingOf (max_values: None, max_size: Some(3795), added: 6270, mode: MaxEncodedLen)
-	/// Storage: Democracy ReferendumInfoOf (r:99 w:99)
-	/// Proof: Democracy ReferendumInfoOf (max_values: None, max_size: Some(201), added: 2676, mode: MaxEncodedLen)
-	/// The range of component `r` is `[0, 99]`.
-	fn undelegate(r: u32, ) -> Weight {
-		// Proof Size summary in bytes:
-		//  Measured:  `460 + r * (108 ±0)`
-		//  Estimated: `13530 + r * (2676 ±0)`
-		// Minimum execution time: 21_815_000 picoseconds.
-		Weight::from_parts(21_914_769, 0)
-			.saturating_add(Weight::from_parts(0, 13530))
-			// Standard Error: 7_866
-			.saturating_add(Weight::from_parts(4_497_036, 0).saturating_mul(r.into()))
-			.saturating_add(T::DbWeight::get().reads(2))
-			.saturating_add(T::DbWeight::get().reads((1_u64).saturating_mul(r.into())))
-			.saturating_add(T::DbWeight::get().writes(2))
-			.saturating_add(T::DbWeight::get().writes((1_u64).saturating_mul(r.into())))
-			.saturating_add(Weight::from_parts(0, 2676).saturating_mul(r.into()))
-	}
-	/// Storage: Democracy PublicProps (r:0 w:1)
-	/// Proof: Democracy PublicProps (max_values: Some(1), max_size: Some(16702), added: 17197, mode: MaxEncodedLen)
-	fn clear_public_proposals() -> Weight {
-		// Proof Size summary in bytes:
-		//  Measured:  `0`
-		//  Estimated: `0`
-		// Minimum execution time: 3_315_000 picoseconds.
-		Weight::from_parts(3_525_000, 0)
-			.saturating_add(Weight::from_parts(0, 0))
-			.saturating_add(T::DbWeight::get().writes(1))
-	}
-	/// Storage: Democracy VotingOf (r:1 w:1)
-	/// Proof: Democracy VotingOf (max_values: None, max_size: Some(3795), added: 6270, mode: MaxEncodedLen)
-	/// Storage: Balances Locks (r:1 w:1)
-	/// Proof: Balances Locks (max_values: None, max_size: Some(1299), added: 3774, mode: MaxEncodedLen)
-	/// Storage: Balances Freezes (r:1 w:0)
-	/// Proof: Balances Freezes (max_values: None, max_size: Some(49), added: 2524, mode: MaxEncodedLen)
-	/// Storage: System Account (r:1 w:1)
-	/// Proof: System Account (max_values: None, max_size: Some(128), added: 2603, mode: MaxEncodedLen)
-	/// The range of component `r` is `[0, 99]`.
-	fn unlock_remove(r: u32, ) -> Weight {
-		// Proof Size summary in bytes:
-		//  Measured:  `530`
-		//  Estimated: `7260`
-		// Minimum execution time: 25_326_000 picoseconds.
-		Weight::from_parts(40_406_995, 0)
-			.saturating_add(Weight::from_parts(0, 7260))
-			// Standard Error: 3_775
-			.saturating_add(Weight::from_parts(111_536, 0).saturating_mul(r.into()))
-			.saturating_add(T::DbWeight::get().reads(4))
-			.saturating_add(T::DbWeight::get().writes(3))
-	}
-	/// Storage: Democracy VotingOf (r:1 w:1)
-	/// Proof: Democracy VotingOf (max_values: None, max_size: Some(3795), added: 6270, mode: MaxEncodedLen)
-	/// Storage: Balances Locks (r:1 w:1)
-	/// Proof: Balances Locks (max_values: None, max_size: Some(1299), added: 3774, mode: MaxEncodedLen)
-	/// Storage: Balances Freezes (r:1 w:0)
-	/// Proof: Balances Freezes (max_values: None, max_size: Some(49), added: 2524, mode: MaxEncodedLen)
-	/// Storage: System Account (r:1 w:1)
-	/// Proof: System Account (max_values: None, max_size: Some(128), added: 2603, mode: MaxEncodedLen)
-	/// The range of component `r` is `[0, 99]`.
-	fn unlock_set(r: u32, ) -> Weight {
-		// Proof Size summary in bytes:
-		//  Measured:  `531 + r * (22 ±0)`
-		//  Estimated: `7260`
-		// Minimum execution time: 35_263_000 picoseconds.
-		Weight::from_parts(39_034_189, 0)
-			.saturating_add(Weight::from_parts(0, 7260))
-			// Standard Error: 2_263
-			.saturating_add(Weight::from_parts(143_605, 0).saturating_mul(r.into()))
-			.saturating_add(T::DbWeight::get().reads(4))
-			.saturating_add(T::DbWeight::get().writes(3))
-	}
-	/// Storage: Democracy ReferendumInfoOf (r:1 w:1)
-	/// Proof: Democracy ReferendumInfoOf (max_values: None, max_size: Some(201), added: 2676, mode: MaxEncodedLen)
-	/// Storage: Democracy VotingOf (r:1 w:1)
-	/// Proof: Democracy VotingOf (max_values: None, max_size: Some(3795), added: 6270, mode: MaxEncodedLen)
-	/// The range of component `r` is `[1, 100]`.
-	fn remove_vote(r: u32, ) -> Weight {
-		// Proof Size summary in bytes:
-		//  Measured:  `695 + r * (26 ±0)`
-		//  Estimated: `7260`
-		// Minimum execution time: 15_880_000 picoseconds.
-		Weight::from_parts(19_395_916, 0)
-			.saturating_add(Weight::from_parts(0, 7260))
-			// Standard Error: 1_616
-			.saturating_add(Weight::from_parts(144_889, 0).saturating_mul(r.into()))
-			.saturating_add(T::DbWeight::get().reads(2))
-			.saturating_add(T::DbWeight::get().writes(2))
-	}
-	/// Storage: Democracy ReferendumInfoOf (r:1 w:1)
-	/// Proof: Democracy ReferendumInfoOf (max_values: None, max_size: Some(201), added: 2676, mode: MaxEncodedLen)
-	/// Storage: Democracy VotingOf (r:1 w:1)
-	/// Proof: Democracy VotingOf (max_values: None, max_size: Some(3795), added: 6270, mode: MaxEncodedLen)
-	/// The range of component `r` is `[1, 100]`.
-	fn remove_other_vote(r: u32, ) -> Weight {
-		// Proof Size summary in bytes:
-		//  Measured:  `695 + r * (26 ±0)`
-		//  Estimated: `7260`
-		// Minimum execution time: 16_157_000 picoseconds.
-		Weight::from_parts(19_671_561, 0)
-			.saturating_add(Weight::from_parts(0, 7260))
-			// Standard Error: 1_803
-			.saturating_add(Weight::from_parts(143_214, 0).saturating_mul(r.into()))
-			.saturating_add(T::DbWeight::get().reads(2))
-			.saturating_add(T::DbWeight::get().writes(2))
-	}
-	/// Storage: Democracy NextExternal (r:1 w:0)
-	/// Proof: Democracy NextExternal (max_values: Some(1), max_size: Some(132), added: 627, mode: MaxEncodedLen)
-	/// Storage: Preimage StatusFor (r:1 w:0)
-	/// Proof: Preimage StatusFor (max_values: None, max_size: Some(91), added: 2566, mode: MaxEncodedLen)
-	/// Storage: Democracy MetadataOf (r:0 w:1)
-	/// Proof: Democracy MetadataOf (max_values: None, max_size: Some(53), added: 2528, mode: MaxEncodedLen)
-	fn set_external_metadata() -> Weight {
-		// Proof Size summary in bytes:
-		//  Measured:  `323`
-		//  Estimated: `3556`
-		// Minimum execution time: 18_768_000 picoseconds.
-		Weight::from_parts(19_420_000, 0)
-			.saturating_add(Weight::from_parts(0, 3556))
-			.saturating_add(T::DbWeight::get().reads(2))
-			.saturating_add(T::DbWeight::get().writes(1))
-	}
-	/// Storage: Democracy NextExternal (r:1 w:0)
-	/// Proof: Democracy NextExternal (max_values: Some(1), max_size: Some(132), added: 627, mode: MaxEncodedLen)
-	/// Storage: Democracy MetadataOf (r:1 w:1)
-	/// Proof: Democracy MetadataOf (max_values: None, max_size: Some(53), added: 2528, mode: MaxEncodedLen)
-	fn clear_external_metadata() -> Weight {
-		// Proof Size summary in bytes:
-		//  Measured:  `253`
-		//  Estimated: `3518`
-		// Minimum execution time: 17_184_000 picoseconds.
-		Weight::from_parts(17_768_000, 0)
-			.saturating_add(Weight::from_parts(0, 3518))
-			.saturating_add(T::DbWeight::get().reads(2))
-			.saturating_add(T::DbWeight::get().writes(1))
-	}
-	/// Storage: Democracy PublicProps (r:1 w:0)
-	/// Proof: Democracy PublicProps (max_values: Some(1), max_size: Some(16702), added: 17197, mode: MaxEncodedLen)
-	/// Storage: Preimage StatusFor (r:1 w:0)
-	/// Proof: Preimage StatusFor (max_values: None, max_size: Some(91), added: 2566, mode: MaxEncodedLen)
-	/// Storage: Democracy MetadataOf (r:0 w:1)
-	/// Proof: Democracy MetadataOf (max_values: None, max_size: Some(53), added: 2528, mode: MaxEncodedLen)
-	fn set_proposal_metadata() -> Weight {
-		// Proof Size summary in bytes:
-		//  Measured:  `4855`
-		//  Estimated: `18187`
-		// Minimum execution time: 40_295_000 picoseconds.
-		Weight::from_parts(41_356_000, 0)
-			.saturating_add(Weight::from_parts(0, 18187))
-			.saturating_add(T::DbWeight::get().reads(2))
-			.saturating_add(T::DbWeight::get().writes(1))
-	}
-	/// Storage: Democracy PublicProps (r:1 w:0)
-	/// Proof: Democracy PublicProps (max_values: Some(1), max_size: Some(16702), added: 17197, mode: MaxEncodedLen)
-	/// Storage: Democracy MetadataOf (r:1 w:1)
-	/// Proof: Democracy MetadataOf (max_values: None, max_size: Some(53), added: 2528, mode: MaxEncodedLen)
-	fn clear_proposal_metadata() -> Weight {
-		// Proof Size summary in bytes:
-		//  Measured:  `4789`
-		//  Estimated: `18187`
-		// Minimum execution time: 37_215_000 picoseconds.
-		Weight::from_parts(38_297_000, 0)
-			.saturating_add(Weight::from_parts(0, 18187))
-			.saturating_add(T::DbWeight::get().reads(2))
-			.saturating_add(T::DbWeight::get().writes(1))
-	}
-	/// Storage: Preimage StatusFor (r:1 w:0)
-	/// Proof: Preimage StatusFor (max_values: None, max_size: Some(91), added: 2566, mode: MaxEncodedLen)
-	/// Storage: Democracy MetadataOf (r:0 w:1)
-	/// Proof: Democracy MetadataOf (max_values: None, max_size: Some(53), added: 2528, mode: MaxEncodedLen)
-	fn set_referendum_metadata() -> Weight {
-		// Proof Size summary in bytes:
-		//  Measured:  `144`
-		//  Estimated: `3556`
-		// Minimum execution time: 14_960_000 picoseconds.
-		Weight::from_parts(15_339_000, 0)
-			.saturating_add(Weight::from_parts(0, 3556))
-			.saturating_add(T::DbWeight::get().reads(1))
-			.saturating_add(T::DbWeight::get().writes(1))
-	}
-	/// Storage: Democracy ReferendumInfoOf (r:1 w:0)
-	/// Proof: Democracy ReferendumInfoOf (max_values: None, max_size: Some(201), added: 2676, mode: MaxEncodedLen)
-	/// Storage: Democracy MetadataOf (r:1 w:1)
-	/// Proof: Democracy MetadataOf (max_values: None, max_size: Some(53), added: 2528, mode: MaxEncodedLen)
-	fn clear_referendum_metadata() -> Weight {
-		// Proof Size summary in bytes:
-		//  Measured:  `269`
-		//  Estimated: `3666`
-		// Minimum execution time: 19_182_000 picoseconds.
-		Weight::from_parts(19_788_000, 0)
-			.saturating_add(Weight::from_parts(0, 3666))
-			.saturating_add(T::DbWeight::get().reads(2))
-			.saturating_add(T::DbWeight::get().writes(1))
-	}
-}
diff --git a/polkadot/runtime/polkadot/src/weights/pallet_election_provider_multi_phase.rs b/polkadot/runtime/polkadot/src/weights/pallet_election_provider_multi_phase.rs
deleted file mode 100644
index f16da40e8eceb02293ac6d6149c6bc1bba2ecaab..0000000000000000000000000000000000000000
--- a/polkadot/runtime/polkadot/src/weights/pallet_election_provider_multi_phase.rs
+++ /dev/null
@@ -1,272 +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/>.
-
-//! Autogenerated weights for `pallet_election_provider_multi_phase`
-//!
-//! THIS FILE WAS AUTO-GENERATED USING THE SUBSTRATE BENCHMARK CLI VERSION 4.0.0-dev
-//! DATE: 2023-06-18, STEPS: `50`, REPEAT: `20`, LOW RANGE: `[]`, HIGH RANGE: `[]`
-//! WORST CASE MAP SIZE: `1000000`
-//! HOSTNAME: `runner-e8ezs4ez-project-163-concurrent-0`, CPU: `Intel(R) Xeon(R) CPU @ 2.60GHz`
-//! EXECUTION: Some(Wasm), WASM-EXECUTION: Compiled, CHAIN: Some("polkadot-dev"), DB CACHE: 1024
-
-// Executed Command:
-// ./target/production/polkadot
-// benchmark
-// pallet
-// --chain=polkadot-dev
-// --steps=50
-// --repeat=20
-// --no-storage-info
-// --no-median-slopes
-// --no-min-squares
-// --pallet=pallet_election_provider_multi_phase
-// --extrinsic=*
-// --execution=wasm
-// --wasm-execution=compiled
-// --header=./file_header.txt
-// --output=./runtime/polkadot/src/weights/
-
-#![cfg_attr(rustfmt, rustfmt_skip)]
-#![allow(unused_parens)]
-#![allow(unused_imports)]
-#![allow(missing_docs)]
-
-use frame_support::{traits::Get, weights::Weight};
-use core::marker::PhantomData;
-
-/// Weight functions for `pallet_election_provider_multi_phase`.
-pub struct WeightInfo<T>(PhantomData<T>);
-impl<T: frame_system::Config> pallet_election_provider_multi_phase::WeightInfo for WeightInfo<T> {
-	/// Storage: Staking CurrentEra (r:1 w:0)
-	/// Proof: Staking CurrentEra (max_values: Some(1), max_size: Some(4), added: 499, mode: MaxEncodedLen)
-	/// Storage: Staking CurrentPlannedSession (r:1 w:0)
-	/// Proof: Staking CurrentPlannedSession (max_values: Some(1), max_size: Some(4), added: 499, mode: MaxEncodedLen)
-	/// Storage: Staking ErasStartSessionIndex (r:1 w:0)
-	/// Proof: Staking ErasStartSessionIndex (max_values: None, max_size: Some(16), added: 2491, mode: MaxEncodedLen)
-	/// Storage: Babe EpochIndex (r:1 w:0)
-	/// Proof: Babe EpochIndex (max_values: Some(1), max_size: Some(8), added: 503, mode: MaxEncodedLen)
-	/// Storage: Babe GenesisSlot (r:1 w:0)
-	/// Proof: Babe GenesisSlot (max_values: Some(1), max_size: Some(8), added: 503, mode: MaxEncodedLen)
-	/// Storage: Babe CurrentSlot (r:1 w:0)
-	/// Proof: Babe CurrentSlot (max_values: Some(1), max_size: Some(8), added: 503, mode: MaxEncodedLen)
-	/// Storage: Staking ForceEra (r:1 w:0)
-	/// Proof: Staking ForceEra (max_values: Some(1), max_size: Some(1), added: 496, mode: MaxEncodedLen)
-	/// Storage: ElectionProviderMultiPhase CurrentPhase (r:1 w:0)
-	/// Proof Skipped: ElectionProviderMultiPhase CurrentPhase (max_values: Some(1), max_size: None, mode: Measured)
-	fn on_initialize_nothing() -> Weight {
-		// Proof Size summary in bytes:
-		//  Measured:  `993`
-		//  Estimated: `3481`
-		// Minimum execution time: 19_675_000 picoseconds.
-		Weight::from_parts(20_310_000, 0)
-			.saturating_add(Weight::from_parts(0, 3481))
-			.saturating_add(T::DbWeight::get().reads(8))
-	}
-	/// Storage: ElectionProviderMultiPhase Round (r:1 w:0)
-	/// Proof Skipped: ElectionProviderMultiPhase Round (max_values: Some(1), max_size: None, mode: Measured)
-	/// Storage: ElectionProviderMultiPhase CurrentPhase (r:1 w:1)
-	/// Proof Skipped: ElectionProviderMultiPhase CurrentPhase (max_values: Some(1), max_size: None, mode: Measured)
-	fn on_initialize_open_signed() -> Weight {
-		// Proof Size summary in bytes:
-		//  Measured:  `114`
-		//  Estimated: `1599`
-		// Minimum execution time: 12_119_000 picoseconds.
-		Weight::from_parts(12_730_000, 0)
-			.saturating_add(Weight::from_parts(0, 1599))
-			.saturating_add(T::DbWeight::get().reads(2))
-			.saturating_add(T::DbWeight::get().writes(1))
-	}
-	/// Storage: ElectionProviderMultiPhase Round (r:1 w:0)
-	/// Proof Skipped: ElectionProviderMultiPhase Round (max_values: Some(1), max_size: None, mode: Measured)
-	/// Storage: ElectionProviderMultiPhase CurrentPhase (r:1 w:1)
-	/// Proof Skipped: ElectionProviderMultiPhase CurrentPhase (max_values: Some(1), max_size: None, mode: Measured)
-	fn on_initialize_open_unsigned() -> Weight {
-		// Proof Size summary in bytes:
-		//  Measured:  `114`
-		//  Estimated: `1599`
-		// Minimum execution time: 13_456_000 picoseconds.
-		Weight::from_parts(13_787_000, 0)
-			.saturating_add(Weight::from_parts(0, 1599))
-			.saturating_add(T::DbWeight::get().reads(2))
-			.saturating_add(T::DbWeight::get().writes(1))
-	}
-	/// Storage: System Account (r:1 w:1)
-	/// Proof: System Account (max_values: None, max_size: Some(128), added: 2603, mode: MaxEncodedLen)
-	/// Storage: ElectionProviderMultiPhase QueuedSolution (r:0 w:1)
-	/// Proof Skipped: ElectionProviderMultiPhase QueuedSolution (max_values: Some(1), max_size: None, mode: Measured)
-	fn finalize_signed_phase_accept_solution() -> Weight {
-		// Proof Size summary in bytes:
-		//  Measured:  `174`
-		//  Estimated: `3593`
-		// Minimum execution time: 33_871_000 picoseconds.
-		Weight::from_parts(34_289_000, 0)
-			.saturating_add(Weight::from_parts(0, 3593))
-			.saturating_add(T::DbWeight::get().reads(1))
-			.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)
-	fn finalize_signed_phase_reject_solution() -> Weight {
-		// Proof Size summary in bytes:
-		//  Measured:  `174`
-		//  Estimated: `3593`
-		// Minimum execution time: 22_897_000 picoseconds.
-		Weight::from_parts(23_307_000, 0)
-			.saturating_add(Weight::from_parts(0, 3593))
-			.saturating_add(T::DbWeight::get().reads(1))
-			.saturating_add(T::DbWeight::get().writes(1))
-	}
-	/// Storage: ElectionProviderMultiPhase SnapshotMetadata (r:0 w:1)
-	/// Proof Skipped: ElectionProviderMultiPhase SnapshotMetadata (max_values: Some(1), max_size: None, mode: Measured)
-	/// Storage: ElectionProviderMultiPhase DesiredTargets (r:0 w:1)
-	/// Proof Skipped: ElectionProviderMultiPhase DesiredTargets (max_values: Some(1), max_size: None, mode: Measured)
-	/// Storage: ElectionProviderMultiPhase Snapshot (r:0 w:1)
-	/// Proof Skipped: ElectionProviderMultiPhase Snapshot (max_values: Some(1), max_size: None, mode: Measured)
-	/// The range of component `v` is `[1000, 2000]`.
-	/// The range of component `t` is `[500, 1000]`.
-	fn create_snapshot_internal(v: u32, _t: u32, ) -> Weight {
-		// Proof Size summary in bytes:
-		//  Measured:  `0`
-		//  Estimated: `0`
-		// Minimum execution time: 556_279_000 picoseconds.
-		Weight::from_parts(581_580_000, 0)
-			.saturating_add(Weight::from_parts(0, 0))
-			// Standard Error: 3_088
-			.saturating_add(Weight::from_parts(312_241, 0).saturating_mul(v.into()))
-			.saturating_add(T::DbWeight::get().writes(3))
-	}
-	/// Storage: ElectionProviderMultiPhase SignedSubmissionIndices (r:1 w:1)
-	/// Proof Skipped: ElectionProviderMultiPhase SignedSubmissionIndices (max_values: Some(1), max_size: None, mode: Measured)
-	/// Storage: ElectionProviderMultiPhase SignedSubmissionNextIndex (r:1 w:1)
-	/// Proof Skipped: ElectionProviderMultiPhase SignedSubmissionNextIndex (max_values: Some(1), max_size: None, mode: Measured)
-	/// Storage: ElectionProviderMultiPhase SnapshotMetadata (r:1 w:1)
-	/// Proof Skipped: ElectionProviderMultiPhase SnapshotMetadata (max_values: Some(1), max_size: None, mode: Measured)
-	/// Storage: ElectionProviderMultiPhase SignedSubmissionsMap (r:1 w:0)
-	/// Proof Skipped: ElectionProviderMultiPhase SignedSubmissionsMap (max_values: None, max_size: None, mode: Measured)
-	/// Storage: System BlockWeight (r:1 w:1)
-	/// Proof: System BlockWeight (max_values: Some(1), max_size: Some(48), added: 543, mode: MaxEncodedLen)
-	/// Storage: ElectionProviderMultiPhase QueuedSolution (r:1 w:1)
-	/// Proof Skipped: ElectionProviderMultiPhase QueuedSolution (max_values: Some(1), max_size: None, mode: Measured)
-	/// Storage: ElectionProviderMultiPhase Round (r:1 w:1)
-	/// Proof Skipped: ElectionProviderMultiPhase Round (max_values: Some(1), max_size: None, mode: Measured)
-	/// Storage: ElectionProviderMultiPhase CurrentPhase (r:1 w:1)
-	/// Proof Skipped: ElectionProviderMultiPhase CurrentPhase (max_values: Some(1), max_size: None, mode: Measured)
-	/// Storage: ElectionProviderMultiPhase DesiredTargets (r:0 w:1)
-	/// Proof Skipped: ElectionProviderMultiPhase DesiredTargets (max_values: Some(1), max_size: None, mode: Measured)
-	/// Storage: ElectionProviderMultiPhase Snapshot (r:0 w:1)
-	/// Proof Skipped: ElectionProviderMultiPhase Snapshot (max_values: Some(1), max_size: None, mode: Measured)
-	/// The range of component `a` is `[500, 800]`.
-	/// The range of component `d` is `[200, 400]`.
-	fn elect_queued(a: u32, d: u32, ) -> Weight {
-		// Proof Size summary in bytes:
-		//  Measured:  `338 + a * (768 ±0) + d * (48 ±0)`
-		//  Estimated: `3890 + a * (768 ±0) + d * (49 ±0)`
-		// Minimum execution time: 420_334_000 picoseconds.
-		Weight::from_parts(18_023_312, 0)
-			.saturating_add(Weight::from_parts(0, 3890))
-			// Standard Error: 7_565
-			.saturating_add(Weight::from_parts(659_974, 0).saturating_mul(a.into()))
-			// Standard Error: 11_339
-			.saturating_add(Weight::from_parts(287_336, 0).saturating_mul(d.into()))
-			.saturating_add(T::DbWeight::get().reads(8))
-			.saturating_add(T::DbWeight::get().writes(9))
-			.saturating_add(Weight::from_parts(0, 768).saturating_mul(a.into()))
-			.saturating_add(Weight::from_parts(0, 49).saturating_mul(d.into()))
-	}
-	/// Storage: ElectionProviderMultiPhase CurrentPhase (r:1 w:0)
-	/// Proof Skipped: ElectionProviderMultiPhase CurrentPhase (max_values: Some(1), max_size: None, mode: Measured)
-	/// Storage: ElectionProviderMultiPhase SnapshotMetadata (r:1 w:0)
-	/// Proof Skipped: ElectionProviderMultiPhase SnapshotMetadata (max_values: Some(1), max_size: None, mode: Measured)
-	/// Storage: TransactionPayment NextFeeMultiplier (r:1 w:0)
-	/// Proof: TransactionPayment NextFeeMultiplier (max_values: Some(1), max_size: Some(16), added: 511, mode: MaxEncodedLen)
-	/// Storage: ElectionProviderMultiPhase SignedSubmissionIndices (r:1 w:1)
-	/// Proof Skipped: ElectionProviderMultiPhase SignedSubmissionIndices (max_values: Some(1), max_size: None, mode: Measured)
-	/// Storage: ElectionProviderMultiPhase SignedSubmissionNextIndex (r:1 w:1)
-	/// Proof Skipped: ElectionProviderMultiPhase SignedSubmissionNextIndex (max_values: Some(1), max_size: None, mode: Measured)
-	/// Storage: ElectionProviderMultiPhase SignedSubmissionsMap (r:0 w:1)
-	/// Proof Skipped: ElectionProviderMultiPhase SignedSubmissionsMap (max_values: None, max_size: None, mode: Measured)
-	fn submit() -> Weight {
-		// Proof Size summary in bytes:
-		//  Measured:  `1204`
-		//  Estimated: `2689`
-		// Minimum execution time: 49_669_000 picoseconds.
-		Weight::from_parts(52_076_000, 0)
-			.saturating_add(Weight::from_parts(0, 2689))
-			.saturating_add(T::DbWeight::get().reads(5))
-			.saturating_add(T::DbWeight::get().writes(3))
-	}
-	/// Storage: ElectionProviderMultiPhase CurrentPhase (r:1 w:0)
-	/// Proof Skipped: ElectionProviderMultiPhase CurrentPhase (max_values: Some(1), max_size: None, mode: Measured)
-	/// Storage: ElectionProviderMultiPhase Round (r:1 w:0)
-	/// Proof Skipped: ElectionProviderMultiPhase Round (max_values: Some(1), max_size: None, mode: Measured)
-	/// Storage: ElectionProviderMultiPhase DesiredTargets (r:1 w:0)
-	/// Proof Skipped: ElectionProviderMultiPhase DesiredTargets (max_values: Some(1), max_size: None, mode: Measured)
-	/// Storage: ElectionProviderMultiPhase QueuedSolution (r:1 w:1)
-	/// Proof Skipped: ElectionProviderMultiPhase QueuedSolution (max_values: Some(1), max_size: None, mode: Measured)
-	/// Storage: ElectionProviderMultiPhase SnapshotMetadata (r:1 w:0)
-	/// Proof Skipped: ElectionProviderMultiPhase SnapshotMetadata (max_values: Some(1), max_size: None, mode: Measured)
-	/// Storage: ElectionProviderMultiPhase Snapshot (r:1 w:0)
-	/// Proof Skipped: ElectionProviderMultiPhase Snapshot (max_values: Some(1), max_size: None, mode: Measured)
-	/// Storage: ElectionProviderMultiPhase MinimumUntrustedScore (r:1 w:0)
-	/// Proof Skipped: ElectionProviderMultiPhase MinimumUntrustedScore (max_values: Some(1), max_size: None, mode: Measured)
-	/// The range of component `v` is `[1000, 2000]`.
-	/// The range of component `t` is `[500, 1000]`.
-	/// The range of component `a` is `[500, 800]`.
-	/// The range of component `d` is `[200, 400]`.
-	fn submit_unsigned(v: u32, t: u32, a: u32, _d: u32, ) -> Weight {
-		// Proof Size summary in bytes:
-		//  Measured:  `219 + t * (32 ±0) + v * (553 ±0)`
-		//  Estimated: `1704 + t * (32 ±0) + v * (553 ±0)`
-		// Minimum execution time: 5_966_688_000 picoseconds.
-		Weight::from_parts(6_129_265_000, 0)
-			.saturating_add(Weight::from_parts(0, 1704))
-			// Standard Error: 20_174
-			.saturating_add(Weight::from_parts(154_243, 0).saturating_mul(v.into()))
-			// Standard Error: 59_786
-			.saturating_add(Weight::from_parts(5_709_666, 0).saturating_mul(a.into()))
-			.saturating_add(T::DbWeight::get().reads(7))
-			.saturating_add(T::DbWeight::get().writes(1))
-			.saturating_add(Weight::from_parts(0, 32).saturating_mul(t.into()))
-			.saturating_add(Weight::from_parts(0, 553).saturating_mul(v.into()))
-	}
-	/// Storage: ElectionProviderMultiPhase DesiredTargets (r:1 w:0)
-	/// Proof Skipped: ElectionProviderMultiPhase DesiredTargets (max_values: Some(1), max_size: None, mode: Measured)
-	/// Storage: ElectionProviderMultiPhase Snapshot (r:1 w:0)
-	/// Proof Skipped: ElectionProviderMultiPhase Snapshot (max_values: Some(1), max_size: None, mode: Measured)
-	/// Storage: ElectionProviderMultiPhase Round (r:1 w:0)
-	/// Proof Skipped: ElectionProviderMultiPhase Round (max_values: Some(1), max_size: None, mode: Measured)
-	/// Storage: ElectionProviderMultiPhase MinimumUntrustedScore (r:1 w:0)
-	/// Proof Skipped: ElectionProviderMultiPhase MinimumUntrustedScore (max_values: Some(1), max_size: None, mode: Measured)
-	/// The range of component `v` is `[1000, 2000]`.
-	/// The range of component `t` is `[500, 1000]`.
-	/// The range of component `a` is `[500, 800]`.
-	/// The range of component `d` is `[200, 400]`.
-	fn feasibility_check(v: u32, t: u32, a: u32, _d: u32, ) -> Weight {
-		// Proof Size summary in bytes:
-		//  Measured:  `194 + t * (32 ±0) + v * (553 ±0)`
-		//  Estimated: `1679 + t * (32 ±0) + v * (553 ±0)`
-		// Minimum execution time: 5_058_457_000 picoseconds.
-		Weight::from_parts(5_216_393_000, 0)
-			.saturating_add(Weight::from_parts(0, 1679))
-			// Standard Error: 15_829
-			.saturating_add(Weight::from_parts(278_945, 0).saturating_mul(v.into()))
-			// Standard Error: 46_908
-			.saturating_add(Weight::from_parts(3_239_889, 0).saturating_mul(a.into()))
-			.saturating_add(T::DbWeight::get().reads(4))
-			.saturating_add(Weight::from_parts(0, 32).saturating_mul(t.into()))
-			.saturating_add(Weight::from_parts(0, 553).saturating_mul(v.into()))
-	}
-}
diff --git a/polkadot/runtime/polkadot/src/weights/pallet_elections_phragmen.rs b/polkadot/runtime/polkadot/src/weights/pallet_elections_phragmen.rs
deleted file mode 100644
index e93de0c14c1c2190bfba6cdce9b1f9680ffb5ba4..0000000000000000000000000000000000000000
--- a/polkadot/runtime/polkadot/src/weights/pallet_elections_phragmen.rs
+++ /dev/null
@@ -1,318 +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/>.
-
-//! Autogenerated weights for `pallet_elections_phragmen`
-//!
-//! THIS FILE WAS AUTO-GENERATED USING THE SUBSTRATE BENCHMARK CLI VERSION 4.0.0-dev
-//! DATE: 2023-06-18, STEPS: `50`, REPEAT: `20`, LOW RANGE: `[]`, HIGH RANGE: `[]`
-//! WORST CASE MAP SIZE: `1000000`
-//! HOSTNAME: `runner-e8ezs4ez-project-163-concurrent-0`, CPU: `Intel(R) Xeon(R) CPU @ 2.60GHz`
-//! EXECUTION: Some(Wasm), WASM-EXECUTION: Compiled, CHAIN: Some("polkadot-dev"), DB CACHE: 1024
-
-// Executed Command:
-// ./target/production/polkadot
-// benchmark
-// pallet
-// --chain=polkadot-dev
-// --steps=50
-// --repeat=20
-// --no-storage-info
-// --no-median-slopes
-// --no-min-squares
-// --pallet=pallet_elections_phragmen
-// --extrinsic=*
-// --execution=wasm
-// --wasm-execution=compiled
-// --header=./file_header.txt
-// --output=./runtime/polkadot/src/weights/
-
-#![cfg_attr(rustfmt, rustfmt_skip)]
-#![allow(unused_parens)]
-#![allow(unused_imports)]
-#![allow(missing_docs)]
-
-use frame_support::{traits::Get, weights::Weight};
-use core::marker::PhantomData;
-
-/// Weight functions for `pallet_elections_phragmen`.
-pub struct WeightInfo<T>(PhantomData<T>);
-impl<T: frame_system::Config> pallet_elections_phragmen::WeightInfo for WeightInfo<T> {
-	/// Storage: PhragmenElection Candidates (r:1 w:0)
-	/// Proof Skipped: PhragmenElection Candidates (max_values: Some(1), max_size: None, mode: Measured)
-	/// Storage: PhragmenElection Members (r:1 w:0)
-	/// Proof Skipped: PhragmenElection Members (max_values: Some(1), max_size: None, mode: Measured)
-	/// Storage: PhragmenElection RunnersUp (r:1 w:0)
-	/// Proof Skipped: PhragmenElection RunnersUp (max_values: Some(1), max_size: None, mode: Measured)
-	/// Storage: PhragmenElection Voting (r:1 w:1)
-	/// Proof Skipped: PhragmenElection Voting (max_values: None, max_size: None, mode: Measured)
-	/// Storage: Balances Locks (r:1 w:1)
-	/// Proof: Balances Locks (max_values: None, max_size: Some(1299), added: 3774, mode: MaxEncodedLen)
-	/// Storage: Balances Freezes (r:1 w:0)
-	/// Proof: Balances Freezes (max_values: None, max_size: Some(49), added: 2524, mode: MaxEncodedLen)
-	/// The range of component `v` is `[1, 16]`.
-	fn vote_equal(v: u32, ) -> Weight {
-		// Proof Size summary in bytes:
-		//  Measured:  `369 + v * (80 ±0)`
-		//  Estimated: `4764 + v * (80 ±0)`
-		// Minimum execution time: 32_711_000 picoseconds.
-		Weight::from_parts(33_843_954, 0)
-			.saturating_add(Weight::from_parts(0, 4764))
-			// Standard Error: 3_332
-			.saturating_add(Weight::from_parts(148_060, 0).saturating_mul(v.into()))
-			.saturating_add(T::DbWeight::get().reads(6))
-			.saturating_add(T::DbWeight::get().writes(2))
-			.saturating_add(Weight::from_parts(0, 80).saturating_mul(v.into()))
-	}
-	/// Storage: PhragmenElection Candidates (r:1 w:0)
-	/// Proof Skipped: PhragmenElection Candidates (max_values: Some(1), max_size: None, mode: Measured)
-	/// Storage: PhragmenElection Members (r:1 w:0)
-	/// Proof Skipped: PhragmenElection Members (max_values: Some(1), max_size: None, mode: Measured)
-	/// Storage: PhragmenElection RunnersUp (r:1 w:0)
-	/// Proof Skipped: PhragmenElection RunnersUp (max_values: Some(1), max_size: None, mode: Measured)
-	/// Storage: PhragmenElection Voting (r:1 w:1)
-	/// Proof Skipped: PhragmenElection Voting (max_values: None, max_size: None, mode: Measured)
-	/// Storage: Balances Locks (r:1 w:1)
-	/// Proof: Balances Locks (max_values: None, max_size: Some(1299), added: 3774, mode: MaxEncodedLen)
-	/// Storage: Balances Freezes (r:1 w:0)
-	/// Proof: Balances Freezes (max_values: None, max_size: Some(49), added: 2524, mode: MaxEncodedLen)
-	/// The range of component `v` is `[2, 16]`.
-	fn vote_more(v: u32, ) -> Weight {
-		// Proof Size summary in bytes:
-		//  Measured:  `337 + v * (80 ±0)`
-		//  Estimated: `4764 + v * (80 ±0)`
-		// Minimum execution time: 46_078_000 picoseconds.
-		Weight::from_parts(46_574_818, 0)
-			.saturating_add(Weight::from_parts(0, 4764))
-			// Standard Error: 3_834
-			.saturating_add(Weight::from_parts(182_895, 0).saturating_mul(v.into()))
-			.saturating_add(T::DbWeight::get().reads(6))
-			.saturating_add(T::DbWeight::get().writes(2))
-			.saturating_add(Weight::from_parts(0, 80).saturating_mul(v.into()))
-	}
-	/// Storage: PhragmenElection Candidates (r:1 w:0)
-	/// Proof Skipped: PhragmenElection Candidates (max_values: Some(1), max_size: None, mode: Measured)
-	/// Storage: PhragmenElection Members (r:1 w:0)
-	/// Proof Skipped: PhragmenElection Members (max_values: Some(1), max_size: None, mode: Measured)
-	/// Storage: PhragmenElection RunnersUp (r:1 w:0)
-	/// Proof Skipped: PhragmenElection RunnersUp (max_values: Some(1), max_size: None, mode: Measured)
-	/// Storage: PhragmenElection Voting (r:1 w:1)
-	/// Proof Skipped: PhragmenElection Voting (max_values: None, max_size: None, mode: Measured)
-	/// Storage: Balances Locks (r:1 w:1)
-	/// Proof: Balances Locks (max_values: None, max_size: Some(1299), added: 3774, mode: MaxEncodedLen)
-	/// Storage: Balances Freezes (r:1 w:0)
-	/// Proof: Balances Freezes (max_values: None, max_size: Some(49), added: 2524, mode: MaxEncodedLen)
-	/// The range of component `v` is `[2, 16]`.
-	fn vote_less(v: u32, ) -> Weight {
-		// Proof Size summary in bytes:
-		//  Measured:  `369 + v * (80 ±0)`
-		//  Estimated: `4764 + v * (80 ±0)`
-		// Minimum execution time: 45_677_000 picoseconds.
-		Weight::from_parts(46_613_391, 0)
-			.saturating_add(Weight::from_parts(0, 4764))
-			// Standard Error: 4_271
-			.saturating_add(Weight::from_parts(180_095, 0).saturating_mul(v.into()))
-			.saturating_add(T::DbWeight::get().reads(6))
-			.saturating_add(T::DbWeight::get().writes(2))
-			.saturating_add(Weight::from_parts(0, 80).saturating_mul(v.into()))
-	}
-	/// Storage: PhragmenElection Voting (r:1 w:1)
-	/// Proof Skipped: PhragmenElection Voting (max_values: None, max_size: None, mode: Measured)
-	/// Storage: Balances Locks (r:1 w:1)
-	/// Proof: Balances Locks (max_values: None, max_size: Some(1299), added: 3774, mode: MaxEncodedLen)
-	/// Storage: Balances Freezes (r:1 w:0)
-	/// Proof: Balances Freezes (max_values: None, max_size: Some(49), added: 2524, mode: MaxEncodedLen)
-	fn remove_voter() -> Weight {
-		// Proof Size summary in bytes:
-		//  Measured:  `891`
-		//  Estimated: `4764`
-		// Minimum execution time: 47_963_000 picoseconds.
-		Weight::from_parts(48_833_000, 0)
-			.saturating_add(Weight::from_parts(0, 4764))
-			.saturating_add(T::DbWeight::get().reads(3))
-			.saturating_add(T::DbWeight::get().writes(2))
-	}
-	/// Storage: PhragmenElection Candidates (r:1 w:1)
-	/// Proof Skipped: PhragmenElection Candidates (max_values: Some(1), max_size: None, mode: Measured)
-	/// Storage: PhragmenElection Members (r:1 w:0)
-	/// Proof Skipped: PhragmenElection Members (max_values: Some(1), max_size: None, mode: Measured)
-	/// Storage: PhragmenElection RunnersUp (r:1 w:0)
-	/// Proof Skipped: PhragmenElection RunnersUp (max_values: Some(1), max_size: None, mode: Measured)
-	/// The range of component `c` is `[1, 1000]`.
-	fn submit_candidacy(c: u32, ) -> Weight {
-		// Proof Size summary in bytes:
-		//  Measured:  `2358 + c * (48 ±0)`
-		//  Estimated: `3841 + c * (48 ±0)`
-		// Minimum execution time: 39_368_000 picoseconds.
-		Weight::from_parts(28_568_416, 0)
-			.saturating_add(Weight::from_parts(0, 3841))
-			// Standard Error: 1_416
-			.saturating_add(Weight::from_parts(131_107, 0).saturating_mul(c.into()))
-			.saturating_add(T::DbWeight::get().reads(3))
-			.saturating_add(T::DbWeight::get().writes(1))
-			.saturating_add(Weight::from_parts(0, 48).saturating_mul(c.into()))
-	}
-	/// Storage: PhragmenElection Candidates (r:1 w:1)
-	/// Proof Skipped: PhragmenElection Candidates (max_values: Some(1), max_size: None, mode: Measured)
-	/// The range of component `c` is `[1, 1000]`.
-	fn renounce_candidacy_candidate(c: u32, ) -> Weight {
-		// Proof Size summary in bytes:
-		//  Measured:  `250 + c * (48 ±0)`
-		//  Estimated: `1722 + c * (48 ±0)`
-		// Minimum execution time: 34_977_000 picoseconds.
-		Weight::from_parts(24_677_388, 0)
-			.saturating_add(Weight::from_parts(0, 1722))
-			// Standard Error: 1_498
-			.saturating_add(Weight::from_parts(100_855, 0).saturating_mul(c.into()))
-			.saturating_add(T::DbWeight::get().reads(1))
-			.saturating_add(T::DbWeight::get().writes(1))
-			.saturating_add(Weight::from_parts(0, 48).saturating_mul(c.into()))
-	}
-	/// Storage: PhragmenElection Members (r:1 w:1)
-	/// Proof Skipped: PhragmenElection Members (max_values: Some(1), max_size: None, mode: Measured)
-	/// Storage: PhragmenElection RunnersUp (r:1 w:1)
-	/// Proof Skipped: PhragmenElection RunnersUp (max_values: Some(1), max_size: None, mode: Measured)
-	/// Storage: Council Prime (r:1 w:1)
-	/// Proof Skipped: Council Prime (max_values: Some(1), max_size: None, mode: Measured)
-	/// Storage: Council Proposals (r:1 w:0)
-	/// Proof Skipped: Council Proposals (max_values: Some(1), max_size: None, mode: Measured)
-	/// Storage: Council Members (r:0 w:1)
-	/// Proof Skipped: Council Members (max_values: Some(1), max_size: None, mode: Measured)
-	fn renounce_candidacy_members() -> Weight {
-		// Proof Size summary in bytes:
-		//  Measured:  `2599`
-		//  Estimated: `4084`
-		// Minimum execution time: 52_891_000 picoseconds.
-		Weight::from_parts(53_852_000, 0)
-			.saturating_add(Weight::from_parts(0, 4084))
-			.saturating_add(T::DbWeight::get().reads(4))
-			.saturating_add(T::DbWeight::get().writes(4))
-	}
-	/// Storage: PhragmenElection RunnersUp (r:1 w:1)
-	/// Proof Skipped: PhragmenElection RunnersUp (max_values: Some(1), max_size: None, mode: Measured)
-	fn renounce_candidacy_runners_up() -> Weight {
-		// Proof Size summary in bytes:
-		//  Measured:  `1711`
-		//  Estimated: `3196`
-		// Minimum execution time: 36_514_000 picoseconds.
-		Weight::from_parts(37_441_000, 0)
-			.saturating_add(Weight::from_parts(0, 3196))
-			.saturating_add(T::DbWeight::get().reads(1))
-			.saturating_add(T::DbWeight::get().writes(1))
-	}
-	/// Storage: Benchmark Override (r:0 w:0)
-	/// Proof Skipped: Benchmark Override (max_values: None, max_size: None, mode: Measured)
-	fn remove_member_without_replacement() -> Weight {
-		// Proof Size summary in bytes:
-		//  Measured:  `0`
-		//  Estimated: `0`
-		// Minimum execution time: 2_000_000_000_000 picoseconds.
-		Weight::from_parts(2_000_000_000_000, 0)
-			.saturating_add(Weight::from_parts(0, 0))
-	}
-	/// Storage: PhragmenElection Members (r:1 w:1)
-	/// Proof Skipped: PhragmenElection Members (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: PhragmenElection RunnersUp (r:1 w:1)
-	/// Proof Skipped: PhragmenElection RunnersUp (max_values: Some(1), max_size: None, mode: Measured)
-	/// Storage: Council Prime (r:1 w:1)
-	/// Proof Skipped: Council Prime (max_values: Some(1), max_size: None, mode: Measured)
-	/// Storage: Council Proposals (r:1 w:0)
-	/// Proof Skipped: Council Proposals (max_values: Some(1), max_size: None, mode: Measured)
-	/// Storage: Council Members (r:0 w:1)
-	/// Proof Skipped: Council Members (max_values: Some(1), max_size: None, mode: Measured)
-	fn remove_member_with_replacement() -> Weight {
-		// Proof Size summary in bytes:
-		//  Measured:  `2599`
-		//  Estimated: `4084`
-		// Minimum execution time: 73_160_000 picoseconds.
-		Weight::from_parts(74_548_000, 0)
-			.saturating_add(Weight::from_parts(0, 4084))
-			.saturating_add(T::DbWeight::get().reads(5))
-			.saturating_add(T::DbWeight::get().writes(5))
-	}
-	/// Storage: PhragmenElection Voting (r:10001 w:10000)
-	/// Proof Skipped: PhragmenElection Voting (max_values: None, max_size: None, mode: Measured)
-	/// Storage: PhragmenElection Members (r:1 w:0)
-	/// Proof Skipped: PhragmenElection Members (max_values: Some(1), max_size: None, mode: Measured)
-	/// Storage: PhragmenElection RunnersUp (r:1 w:0)
-	/// Proof Skipped: PhragmenElection RunnersUp (max_values: Some(1), max_size: None, mode: Measured)
-	/// Storage: PhragmenElection Candidates (r:1 w:0)
-	/// Proof Skipped: PhragmenElection Candidates (max_values: Some(1), max_size: None, mode: Measured)
-	/// Storage: Balances Locks (r:10000 w:10000)
-	/// Proof: Balances Locks (max_values: None, max_size: Some(1299), added: 3774, mode: MaxEncodedLen)
-	/// Storage: Balances Freezes (r:10000 w:0)
-	/// Proof: Balances Freezes (max_values: None, max_size: Some(49), added: 2524, mode: MaxEncodedLen)
-	/// Storage: System Account (r:10000 w:10000)
-	/// Proof: System Account (max_values: None, max_size: Some(128), added: 2603, mode: MaxEncodedLen)
-	/// The range of component `v` is `[5000, 10000]`.
-	/// The range of component `d` is `[0, 5000]`.
-	fn clean_defunct_voters(v: u32, _d: u32, ) -> Weight {
-		// Proof Size summary in bytes:
-		//  Measured:  `36028 + v * (808 ±0)`
-		//  Estimated: `39768 + v * (3774 ±0)`
-		// Minimum execution time: 434_369_619_000 picoseconds.
-		Weight::from_parts(436_606_328_000, 0)
-			.saturating_add(Weight::from_parts(0, 39768))
-			// Standard Error: 365_744
-			.saturating_add(Weight::from_parts(53_633_149, 0).saturating_mul(v.into()))
-			.saturating_add(T::DbWeight::get().reads(4))
-			.saturating_add(T::DbWeight::get().reads((4_u64).saturating_mul(v.into())))
-			.saturating_add(T::DbWeight::get().writes((3_u64).saturating_mul(v.into())))
-			.saturating_add(Weight::from_parts(0, 3774).saturating_mul(v.into()))
-	}
-	/// Storage: PhragmenElection Candidates (r:1 w:1)
-	/// Proof Skipped: PhragmenElection Candidates (max_values: Some(1), max_size: None, mode: Measured)
-	/// Storage: PhragmenElection Members (r:1 w:1)
-	/// Proof Skipped: PhragmenElection Members (max_values: Some(1), max_size: None, mode: Measured)
-	/// Storage: PhragmenElection RunnersUp (r:1 w:1)
-	/// Proof Skipped: PhragmenElection RunnersUp (max_values: Some(1), max_size: None, mode: Measured)
-	/// Storage: PhragmenElection Voting (r:10001 w:0)
-	/// Proof Skipped: PhragmenElection Voting (max_values: None, max_size: None, mode: Measured)
-	/// Storage: Council Proposals (r:1 w:0)
-	/// Proof Skipped: Council Proposals (max_values: Some(1), max_size: None, mode: Measured)
-	/// Storage: System Account (r:967 w:967)
-	/// Proof: System Account (max_values: None, max_size: Some(128), added: 2603, mode: MaxEncodedLen)
-	/// Storage: PhragmenElection ElectionRounds (r:1 w:1)
-	/// Proof Skipped: PhragmenElection ElectionRounds (max_values: Some(1), max_size: None, mode: Measured)
-	/// Storage: Council Members (r:0 w:1)
-	/// Proof Skipped: Council Members (max_values: Some(1), max_size: None, mode: Measured)
-	/// Storage: Council Prime (r:0 w:1)
-	/// Proof Skipped: Council Prime (max_values: Some(1), max_size: None, mode: Measured)
-	/// The range of component `c` is `[1, 1000]`.
-	/// The range of component `v` is `[1, 10000]`.
-	/// The range of component `e` is `[10000, 160000]`.
-	fn election_phragmen(c: u32, v: u32, e: u32, ) -> Weight {
-		// Proof Size summary in bytes:
-		//  Measured:  `0 + e * (28 ±0) + v * (607 ±0)`
-		//  Estimated: `2771984 + c * (2560 ±0) + e * (16 ±0) + v * (2744 ±4)`
-		// Minimum execution time: 39_817_678_000 picoseconds.
-		Weight::from_parts(40_023_537_000, 0)
-			.saturating_add(Weight::from_parts(0, 2771984))
-			// Standard Error: 411_583
-			.saturating_add(Weight::from_parts(34_005_169, 0).saturating_mul(v.into()))
-			// Standard Error: 26_412
-			.saturating_add(Weight::from_parts(1_743_887, 0).saturating_mul(e.into()))
-			.saturating_add(T::DbWeight::get().reads(269))
-			.saturating_add(T::DbWeight::get().reads((1_u64).saturating_mul(c.into())))
-			.saturating_add(T::DbWeight::get().reads((1_u64).saturating_mul(v.into())))
-			.saturating_add(T::DbWeight::get().writes(6))
-			.saturating_add(T::DbWeight::get().writes((1_u64).saturating_mul(c.into())))
-			.saturating_add(Weight::from_parts(0, 2560).saturating_mul(c.into()))
-			.saturating_add(Weight::from_parts(0, 16).saturating_mul(e.into()))
-			.saturating_add(Weight::from_parts(0, 2744).saturating_mul(v.into()))
-	}
-}
diff --git a/polkadot/runtime/polkadot/src/weights/pallet_fast_unstake.rs b/polkadot/runtime/polkadot/src/weights/pallet_fast_unstake.rs
deleted file mode 100644
index 38771e04cb5738a51f77d9565fa5bbf3fdef7fb6..0000000000000000000000000000000000000000
--- a/polkadot/runtime/polkadot/src/weights/pallet_fast_unstake.rs
+++ /dev/null
@@ -1,203 +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/>.
-
-//! Autogenerated weights for `pallet_fast_unstake`
-//!
-//! THIS FILE WAS AUTO-GENERATED USING THE SUBSTRATE BENCHMARK CLI VERSION 4.0.0-dev
-//! DATE: 2023-06-18, STEPS: `50`, REPEAT: `20`, LOW RANGE: `[]`, HIGH RANGE: `[]`
-//! WORST CASE MAP SIZE: `1000000`
-//! HOSTNAME: `runner-e8ezs4ez-project-163-concurrent-0`, CPU: `Intel(R) Xeon(R) CPU @ 2.60GHz`
-//! EXECUTION: Some(Wasm), WASM-EXECUTION: Compiled, CHAIN: Some("polkadot-dev"), DB CACHE: 1024
-
-// Executed Command:
-// ./target/production/polkadot
-// benchmark
-// pallet
-// --chain=polkadot-dev
-// --steps=50
-// --repeat=20
-// --no-storage-info
-// --no-median-slopes
-// --no-min-squares
-// --pallet=pallet_fast_unstake
-// --extrinsic=*
-// --execution=wasm
-// --wasm-execution=compiled
-// --header=./file_header.txt
-// --output=./runtime/polkadot/src/weights/
-
-#![cfg_attr(rustfmt, rustfmt_skip)]
-#![allow(unused_parens)]
-#![allow(unused_imports)]
-#![allow(missing_docs)]
-
-use frame_support::{traits::Get, weights::Weight};
-use core::marker::PhantomData;
-
-/// Weight functions for `pallet_fast_unstake`.
-pub struct WeightInfo<T>(PhantomData<T>);
-impl<T: frame_system::Config> pallet_fast_unstake::WeightInfo for WeightInfo<T> {
-	/// Storage: FastUnstake ErasToCheckPerBlock (r:1 w:0)
-	/// Proof: FastUnstake ErasToCheckPerBlock (max_values: Some(1), max_size: Some(4), added: 499, mode: MaxEncodedLen)
-	/// Storage: Staking ValidatorCount (r:1 w:0)
-	/// Proof: Staking ValidatorCount (max_values: Some(1), max_size: Some(4), added: 499, mode: MaxEncodedLen)
-	/// Storage: FastUnstake Head (r:1 w:1)
-	/// Proof: FastUnstake Head (max_values: Some(1), max_size: Some(886), added: 1381, mode: MaxEncodedLen)
-	/// Storage: FastUnstake CounterForQueue (r:1 w:0)
-	/// Proof: FastUnstake CounterForQueue (max_values: Some(1), max_size: Some(4), added: 499, mode: MaxEncodedLen)
-	/// Storage: ElectionProviderMultiPhase CurrentPhase (r:1 w:0)
-	/// Proof Skipped: ElectionProviderMultiPhase CurrentPhase (max_values: Some(1), max_size: None, mode: Measured)
-	/// Storage: Staking CurrentEra (r:1 w:0)
-	/// Proof: Staking CurrentEra (max_values: Some(1), max_size: Some(4), added: 499, mode: MaxEncodedLen)
-	/// Storage: Staking SlashingSpans (r:16 w:0)
-	/// Proof Skipped: Staking SlashingSpans (max_values: None, max_size: None, mode: Measured)
-	/// Storage: Staking Bonded (r:16 w:16)
-	/// Proof: Staking Bonded (max_values: None, max_size: Some(72), added: 2547, mode: MaxEncodedLen)
-	/// Storage: Staking Validators (r:16 w:0)
-	/// Proof: Staking Validators (max_values: None, max_size: Some(45), added: 2520, mode: MaxEncodedLen)
-	/// Storage: Staking Nominators (r:16 w:0)
-	/// Proof: Staking Nominators (max_values: None, max_size: Some(558), added: 3033, mode: MaxEncodedLen)
-	/// Storage: System Account (r:16 w:16)
-	/// Proof: System Account (max_values: None, max_size: Some(128), added: 2603, mode: MaxEncodedLen)
-	/// Storage: Balances Locks (r:16 w:16)
-	/// Proof: Balances Locks (max_values: None, max_size: Some(1299), added: 3774, mode: MaxEncodedLen)
-	/// Storage: Balances Freezes (r:16 w:0)
-	/// Proof: Balances Freezes (max_values: None, max_size: Some(49), added: 2524, mode: MaxEncodedLen)
-	/// Storage: Staking Ledger (r:0 w:16)
-	/// Proof: Staking Ledger (max_values: None, max_size: Some(1091), added: 3566, mode: MaxEncodedLen)
-	/// Storage: Staking Payee (r:0 w:16)
-	/// Proof: Staking Payee (max_values: None, max_size: Some(73), added: 2548, mode: MaxEncodedLen)
-	/// The range of component `b` is `[1, 16]`.
-	fn on_idle_unstake(b: u32, ) -> Weight {
-		// Proof Size summary in bytes:
-		//  Measured:  `1057 + b * (359 ±0)`
-		//  Estimated: `2542 + b * (3774 ±0)`
-		// Minimum execution time: 89_149_000 picoseconds.
-		Weight::from_parts(41_025_862, 0)
-			.saturating_add(Weight::from_parts(0, 2542))
-			// Standard Error: 41_892
-			.saturating_add(Weight::from_parts(56_756_404, 0).saturating_mul(b.into()))
-			.saturating_add(T::DbWeight::get().reads(6))
-			.saturating_add(T::DbWeight::get().reads((7_u64).saturating_mul(b.into())))
-			.saturating_add(T::DbWeight::get().writes(1))
-			.saturating_add(T::DbWeight::get().writes((5_u64).saturating_mul(b.into())))
-			.saturating_add(Weight::from_parts(0, 3774).saturating_mul(b.into()))
-	}
-	/// Storage: FastUnstake ErasToCheckPerBlock (r:1 w:0)
-	/// Proof: FastUnstake ErasToCheckPerBlock (max_values: Some(1), max_size: Some(4), added: 499, mode: MaxEncodedLen)
-	/// Storage: Staking ValidatorCount (r:1 w:0)
-	/// Proof: Staking ValidatorCount (max_values: Some(1), max_size: Some(4), added: 499, mode: MaxEncodedLen)
-	/// Storage: FastUnstake Head (r:1 w:1)
-	/// Proof: FastUnstake Head (max_values: Some(1), max_size: Some(886), added: 1381, mode: MaxEncodedLen)
-	/// Storage: FastUnstake CounterForQueue (r:1 w:0)
-	/// Proof: FastUnstake CounterForQueue (max_values: Some(1), max_size: Some(4), added: 499, mode: MaxEncodedLen)
-	/// Storage: ElectionProviderMultiPhase CurrentPhase (r:1 w:0)
-	/// Proof Skipped: ElectionProviderMultiPhase CurrentPhase (max_values: Some(1), max_size: None, mode: Measured)
-	/// Storage: Staking CurrentEra (r:1 w:0)
-	/// Proof: Staking CurrentEra (max_values: Some(1), max_size: Some(4), added: 499, mode: MaxEncodedLen)
-	/// Storage: Staking ErasStakers (r:257 w:0)
-	/// Proof Skipped: Staking ErasStakers (max_values: None, max_size: None, mode: Measured)
-	/// The range of component `v` is `[1, 256]`.
-	/// The range of component `b` is `[1, 16]`.
-	fn on_idle_check(v: u32, b: u32, ) -> Weight {
-		// Proof Size summary in bytes:
-		//  Measured:  `1411 + b * (48 ±0) + v * (19511 ±0)`
-		//  Estimated: `4726 + b * (52 ±0) + v * (21987 ±0)`
-		// Minimum execution time: 645_357_000 picoseconds.
-		Weight::from_parts(650_793_000, 0)
-			.saturating_add(Weight::from_parts(0, 4726))
-			// Standard Error: 5_811_859
-			.saturating_add(Weight::from_parts(194_264_130, 0).saturating_mul(v.into()))
-			// Standard Error: 93_262_882
-			.saturating_add(Weight::from_parts(2_905_419_408, 0).saturating_mul(b.into()))
-			.saturating_add(T::DbWeight::get().reads(7))
-			.saturating_add(T::DbWeight::get().reads((1_u64).saturating_mul(v.into())))
-			.saturating_add(T::DbWeight::get().writes(1))
-			.saturating_add(Weight::from_parts(0, 52).saturating_mul(b.into()))
-			.saturating_add(Weight::from_parts(0, 21987).saturating_mul(v.into()))
-	}
-	/// Storage: FastUnstake ErasToCheckPerBlock (r:1 w:0)
-	/// Proof: FastUnstake ErasToCheckPerBlock (max_values: Some(1), max_size: Some(4), added: 499, mode: MaxEncodedLen)
-	/// Storage: Staking Ledger (r:1 w:1)
-	/// Proof: Staking Ledger (max_values: None, max_size: Some(1091), added: 3566, mode: MaxEncodedLen)
-	/// Storage: FastUnstake Queue (r:1 w:1)
-	/// Proof: FastUnstake Queue (max_values: None, max_size: Some(56), added: 2531, mode: MaxEncodedLen)
-	/// Storage: FastUnstake Head (r:1 w:0)
-	/// Proof: FastUnstake Head (max_values: Some(1), max_size: Some(886), added: 1381, mode: MaxEncodedLen)
-	/// Storage: Staking Bonded (r:1 w:0)
-	/// Proof: Staking Bonded (max_values: None, max_size: Some(72), added: 2547, mode: MaxEncodedLen)
-	/// Storage: Staking Validators (r:1 w:0)
-	/// Proof: Staking Validators (max_values: None, max_size: Some(45), added: 2520, mode: MaxEncodedLen)
-	/// Storage: Staking Nominators (r:1 w:1)
-	/// Proof: Staking Nominators (max_values: None, max_size: Some(558), added: 3033, mode: MaxEncodedLen)
-	/// Storage: Staking CounterForNominators (r:1 w:1)
-	/// Proof: Staking CounterForNominators (max_values: Some(1), max_size: Some(4), added: 499, mode: MaxEncodedLen)
-	/// Storage: VoterList ListNodes (r:2 w:2)
-	/// Proof: VoterList ListNodes (max_values: None, max_size: Some(154), added: 2629, mode: MaxEncodedLen)
-	/// Storage: VoterList ListBags (r:1 w:1)
-	/// Proof: VoterList ListBags (max_values: None, max_size: Some(82), added: 2557, mode: MaxEncodedLen)
-	/// Storage: VoterList CounterForListNodes (r:1 w:1)
-	/// Proof: VoterList CounterForListNodes (max_values: Some(1), max_size: Some(4), added: 499, mode: MaxEncodedLen)
-	/// Storage: Staking CurrentEra (r:1 w:0)
-	/// Proof: Staking CurrentEra (max_values: Some(1), max_size: Some(4), added: 499, mode: MaxEncodedLen)
-	/// Storage: Balances Locks (r:1 w:1)
-	/// Proof: Balances Locks (max_values: None, max_size: Some(1299), added: 3774, mode: MaxEncodedLen)
-	/// Storage: Balances Freezes (r:1 w:0)
-	/// Proof: Balances Freezes (max_values: None, max_size: Some(49), added: 2524, mode: MaxEncodedLen)
-	/// Storage: FastUnstake CounterForQueue (r:1 w:1)
-	/// Proof: FastUnstake CounterForQueue (max_values: Some(1), max_size: Some(4), added: 499, mode: MaxEncodedLen)
-	fn register_fast_unstake() -> Weight {
-		// Proof Size summary in bytes:
-		//  Measured:  `1919`
-		//  Estimated: `6248`
-		// Minimum execution time: 128_072_000 picoseconds.
-		Weight::from_parts(133_183_000, 0)
-			.saturating_add(Weight::from_parts(0, 6248))
-			.saturating_add(T::DbWeight::get().reads(16))
-			.saturating_add(T::DbWeight::get().writes(10))
-	}
-	/// Storage: FastUnstake ErasToCheckPerBlock (r:1 w:0)
-	/// Proof: FastUnstake ErasToCheckPerBlock (max_values: Some(1), max_size: Some(4), added: 499, mode: MaxEncodedLen)
-	/// Storage: Staking Ledger (r:1 w:0)
-	/// Proof: Staking Ledger (max_values: None, max_size: Some(1091), added: 3566, mode: MaxEncodedLen)
-	/// Storage: FastUnstake Queue (r:1 w:1)
-	/// Proof: FastUnstake Queue (max_values: None, max_size: Some(56), added: 2531, mode: MaxEncodedLen)
-	/// Storage: FastUnstake Head (r:1 w:0)
-	/// Proof: FastUnstake Head (max_values: Some(1), max_size: Some(886), added: 1381, mode: MaxEncodedLen)
-	/// Storage: FastUnstake CounterForQueue (r:1 w:1)
-	/// Proof: FastUnstake CounterForQueue (max_values: Some(1), max_size: Some(4), added: 499, mode: MaxEncodedLen)
-	fn deregister() -> Weight {
-		// Proof Size summary in bytes:
-		//  Measured:  `1118`
-		//  Estimated: `4556`
-		// Minimum execution time: 40_801_000 picoseconds.
-		Weight::from_parts(42_396_000, 0)
-			.saturating_add(Weight::from_parts(0, 4556))
-			.saturating_add(T::DbWeight::get().reads(5))
-			.saturating_add(T::DbWeight::get().writes(2))
-	}
-	/// Storage: FastUnstake ErasToCheckPerBlock (r:0 w:1)
-	/// Proof: FastUnstake ErasToCheckPerBlock (max_values: Some(1), max_size: Some(4), added: 499, mode: MaxEncodedLen)
-	fn control() -> Weight {
-		// Proof Size summary in bytes:
-		//  Measured:  `0`
-		//  Estimated: `0`
-		// Minimum execution time: 2_531_000 picoseconds.
-		Weight::from_parts(2_706_000, 0)
-			.saturating_add(Weight::from_parts(0, 0))
-			.saturating_add(T::DbWeight::get().writes(1))
-	}
-}
diff --git a/polkadot/runtime/polkadot/src/weights/pallet_identity.rs b/polkadot/runtime/polkadot/src/weights/pallet_identity.rs
deleted file mode 100644
index 8ec244ea127c10baafd7d2646b66dea919a83833..0000000000000000000000000000000000000000
--- a/polkadot/runtime/polkadot/src/weights/pallet_identity.rs
+++ /dev/null
@@ -1,359 +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/>.
-
-//! Autogenerated weights for `pallet_identity`
-//!
-//! THIS FILE WAS AUTO-GENERATED USING THE SUBSTRATE BENCHMARK CLI VERSION 4.0.0-dev
-//! DATE: 2023-06-18, STEPS: `50`, REPEAT: `20`, LOW RANGE: `[]`, HIGH RANGE: `[]`
-//! WORST CASE MAP SIZE: `1000000`
-//! HOSTNAME: `runner-e8ezs4ez-project-163-concurrent-0`, CPU: `Intel(R) Xeon(R) CPU @ 2.60GHz`
-//! EXECUTION: Some(Wasm), WASM-EXECUTION: Compiled, CHAIN: Some("polkadot-dev"), DB CACHE: 1024
-
-// Executed Command:
-// ./target/production/polkadot
-// benchmark
-// pallet
-// --chain=polkadot-dev
-// --steps=50
-// --repeat=20
-// --no-storage-info
-// --no-median-slopes
-// --no-min-squares
-// --pallet=pallet_identity
-// --extrinsic=*
-// --execution=wasm
-// --wasm-execution=compiled
-// --header=./file_header.txt
-// --output=./runtime/polkadot/src/weights/
-
-#![cfg_attr(rustfmt, rustfmt_skip)]
-#![allow(unused_parens)]
-#![allow(unused_imports)]
-#![allow(missing_docs)]
-
-use frame_support::{traits::Get, weights::Weight};
-use core::marker::PhantomData;
-
-/// Weight functions for `pallet_identity`.
-pub struct WeightInfo<T>(PhantomData<T>);
-impl<T: frame_system::Config> pallet_identity::WeightInfo for WeightInfo<T> {
-	/// Storage: Identity Registrars (r:1 w:1)
-	/// Proof: Identity Registrars (max_values: Some(1), max_size: Some(1141), added: 1636, mode: MaxEncodedLen)
-	/// The range of component `r` is `[1, 19]`.
-	fn add_registrar(r: u32, ) -> Weight {
-		// Proof Size summary in bytes:
-		//  Measured:  `32 + r * (57 ±0)`
-		//  Estimated: `2626`
-		// Minimum execution time: 12_135_000 picoseconds.
-		Weight::from_parts(12_609_967, 0)
-			.saturating_add(Weight::from_parts(0, 2626))
-			// Standard Error: 2_052
-			.saturating_add(Weight::from_parts(100_719, 0).saturating_mul(r.into()))
-			.saturating_add(T::DbWeight::get().reads(1))
-			.saturating_add(T::DbWeight::get().writes(1))
-	}
-	/// Storage: Identity IdentityOf (r:1 w:1)
-	/// Proof: Identity IdentityOf (max_values: None, max_size: Some(7538), added: 10013, mode: MaxEncodedLen)
-	/// The range of component `r` is `[1, 20]`.
-	/// The range of component `x` is `[0, 100]`.
-	fn set_identity(r: u32, x: u32, ) -> Weight {
-		// Proof Size summary in bytes:
-		//  Measured:  `442 + r * (5 ±0)`
-		//  Estimated: `11003`
-		// Minimum execution time: 32_888_000 picoseconds.
-		Weight::from_parts(30_128_985, 0)
-			.saturating_add(Weight::from_parts(0, 11003))
-			// Standard Error: 5_003
-			.saturating_add(Weight::from_parts(185_434, 0).saturating_mul(r.into()))
-			// Standard Error: 976
-			.saturating_add(Weight::from_parts(470_886, 0).saturating_mul(x.into()))
-			.saturating_add(T::DbWeight::get().reads(1))
-			.saturating_add(T::DbWeight::get().writes(1))
-	}
-	/// Storage: Identity IdentityOf (r:1 w:0)
-	/// Proof: Identity IdentityOf (max_values: None, max_size: Some(7538), added: 10013, mode: MaxEncodedLen)
-	/// Storage: Identity SubsOf (r:1 w:1)
-	/// Proof: Identity SubsOf (max_values: None, max_size: Some(3258), added: 5733, mode: MaxEncodedLen)
-	/// Storage: Identity SuperOf (r:100 w:100)
-	/// Proof: Identity SuperOf (max_values: None, max_size: Some(114), added: 2589, mode: MaxEncodedLen)
-	/// The range of component `s` is `[0, 100]`.
-	fn set_subs_new(s: u32, ) -> Weight {
-		// Proof Size summary in bytes:
-		//  Measured:  `101`
-		//  Estimated: `11003 + s * (2589 ±0)`
-		// Minimum execution time: 8_780_000 picoseconds.
-		Weight::from_parts(21_992_489, 0)
-			.saturating_add(Weight::from_parts(0, 11003))
-			// Standard Error: 3_846
-			.saturating_add(Weight::from_parts(3_111_150, 0).saturating_mul(s.into()))
-			.saturating_add(T::DbWeight::get().reads(2))
-			.saturating_add(T::DbWeight::get().reads((1_u64).saturating_mul(s.into())))
-			.saturating_add(T::DbWeight::get().writes(1))
-			.saturating_add(T::DbWeight::get().writes((1_u64).saturating_mul(s.into())))
-			.saturating_add(Weight::from_parts(0, 2589).saturating_mul(s.into()))
-	}
-	/// Storage: Identity IdentityOf (r:1 w:0)
-	/// Proof: Identity IdentityOf (max_values: None, max_size: Some(7538), added: 10013, mode: MaxEncodedLen)
-	/// Storage: Identity SubsOf (r:1 w:1)
-	/// Proof: Identity SubsOf (max_values: None, max_size: Some(3258), added: 5733, mode: MaxEncodedLen)
-	/// Storage: Identity SuperOf (r:0 w:100)
-	/// Proof: Identity SuperOf (max_values: None, max_size: Some(114), added: 2589, mode: MaxEncodedLen)
-	/// The range of component `p` is `[0, 100]`.
-	fn set_subs_old(p: u32, ) -> Weight {
-		// Proof Size summary in bytes:
-		//  Measured:  `194 + p * (32 ±0)`
-		//  Estimated: `11003`
-		// Minimum execution time: 8_828_000 picoseconds.
-		Weight::from_parts(22_708_063, 0)
-			.saturating_add(Weight::from_parts(0, 11003))
-			// Standard Error: 3_578
-			.saturating_add(Weight::from_parts(1_303_160, 0).saturating_mul(p.into()))
-			.saturating_add(T::DbWeight::get().reads(2))
-			.saturating_add(T::DbWeight::get().writes(1))
-			.saturating_add(T::DbWeight::get().writes((1_u64).saturating_mul(p.into())))
-	}
-	/// Storage: Identity SubsOf (r:1 w:1)
-	/// Proof: Identity SubsOf (max_values: None, max_size: Some(3258), added: 5733, mode: MaxEncodedLen)
-	/// Storage: Identity IdentityOf (r:1 w:1)
-	/// Proof: Identity IdentityOf (max_values: None, max_size: Some(7538), added: 10013, mode: MaxEncodedLen)
-	/// Storage: Identity SuperOf (r:0 w:100)
-	/// Proof: Identity SuperOf (max_values: None, max_size: Some(114), added: 2589, mode: MaxEncodedLen)
-	/// The range of component `r` is `[1, 20]`.
-	/// The range of component `s` is `[0, 100]`.
-	/// The range of component `x` is `[0, 100]`.
-	fn clear_identity(r: u32, s: u32, x: u32, ) -> Weight {
-		// Proof Size summary in bytes:
-		//  Measured:  `469 + r * (5 ±0) + s * (32 ±0) + x * (66 ±0)`
-		//  Estimated: `11003`
-		// Minimum execution time: 56_805_000 picoseconds.
-		Weight::from_parts(32_595_150, 0)
-			.saturating_add(Weight::from_parts(0, 11003))
-			// Standard Error: 9_806
-			.saturating_add(Weight::from_parts(148_154, 0).saturating_mul(r.into()))
-			// Standard Error: 1_915
-			.saturating_add(Weight::from_parts(1_305_241, 0).saturating_mul(s.into()))
-			// Standard Error: 1_915
-			.saturating_add(Weight::from_parts(253_271, 0).saturating_mul(x.into()))
-			.saturating_add(T::DbWeight::get().reads(2))
-			.saturating_add(T::DbWeight::get().writes(2))
-			.saturating_add(T::DbWeight::get().writes((1_u64).saturating_mul(s.into())))
-	}
-	/// Storage: Identity Registrars (r:1 w:0)
-	/// Proof: Identity Registrars (max_values: Some(1), max_size: Some(1141), added: 1636, mode: MaxEncodedLen)
-	/// Storage: Identity IdentityOf (r:1 w:1)
-	/// Proof: Identity IdentityOf (max_values: None, max_size: Some(7538), added: 10013, mode: MaxEncodedLen)
-	/// The range of component `r` is `[1, 20]`.
-	/// The range of component `x` is `[0, 100]`.
-	fn request_judgement(r: u32, x: u32, ) -> Weight {
-		// Proof Size summary in bytes:
-		//  Measured:  `367 + r * (57 ±0) + x * (66 ±0)`
-		//  Estimated: `11003`
-		// Minimum execution time: 32_747_000 picoseconds.
-		Weight::from_parts(30_894_600, 0)
-			.saturating_add(Weight::from_parts(0, 11003))
-			// Standard Error: 3_575
-			.saturating_add(Weight::from_parts(173_522, 0).saturating_mul(r.into()))
-			// Standard Error: 697
-			.saturating_add(Weight::from_parts(484_893, 0).saturating_mul(x.into()))
-			.saturating_add(T::DbWeight::get().reads(2))
-			.saturating_add(T::DbWeight::get().writes(1))
-	}
-	/// Storage: Identity IdentityOf (r:1 w:1)
-	/// Proof: Identity IdentityOf (max_values: None, max_size: Some(7538), added: 10013, mode: MaxEncodedLen)
-	/// The range of component `r` is `[1, 20]`.
-	/// The range of component `x` is `[0, 100]`.
-	fn cancel_request(r: u32, x: u32, ) -> Weight {
-		// Proof Size summary in bytes:
-		//  Measured:  `398 + x * (66 ±0)`
-		//  Estimated: `11003`
-		// Minimum execution time: 29_601_000 picoseconds.
-		Weight::from_parts(28_786_367, 0)
-			.saturating_add(Weight::from_parts(0, 11003))
-			// Standard Error: 4_460
-			.saturating_add(Weight::from_parts(120_240, 0).saturating_mul(r.into()))
-			// Standard Error: 870
-			.saturating_add(Weight::from_parts(484_414, 0).saturating_mul(x.into()))
-			.saturating_add(T::DbWeight::get().reads(1))
-			.saturating_add(T::DbWeight::get().writes(1))
-	}
-	/// Storage: Identity Registrars (r:1 w:1)
-	/// Proof: Identity Registrars (max_values: Some(1), max_size: Some(1141), added: 1636, mode: MaxEncodedLen)
-	/// The range of component `r` is `[1, 19]`.
-	fn set_fee(r: u32, ) -> Weight {
-		// Proof Size summary in bytes:
-		//  Measured:  `89 + r * (57 ±0)`
-		//  Estimated: `2626`
-		// Minimum execution time: 7_562_000 picoseconds.
-		Weight::from_parts(8_106_958, 0)
-			.saturating_add(Weight::from_parts(0, 2626))
-			// Standard Error: 1_945
-			.saturating_add(Weight::from_parts(75_862, 0).saturating_mul(r.into()))
-			.saturating_add(T::DbWeight::get().reads(1))
-			.saturating_add(T::DbWeight::get().writes(1))
-	}
-	/// Storage: Identity Registrars (r:1 w:1)
-	/// Proof: Identity Registrars (max_values: Some(1), max_size: Some(1141), added: 1636, mode: MaxEncodedLen)
-	/// The range of component `r` is `[1, 19]`.
-	fn set_account_id(r: u32, ) -> Weight {
-		// Proof Size summary in bytes:
-		//  Measured:  `89 + r * (57 ±0)`
-		//  Estimated: `2626`
-		// Minimum execution time: 7_437_000 picoseconds.
-		Weight::from_parts(7_970_108, 0)
-			.saturating_add(Weight::from_parts(0, 2626))
-			// Standard Error: 1_497
-			.saturating_add(Weight::from_parts(93_785, 0).saturating_mul(r.into()))
-			.saturating_add(T::DbWeight::get().reads(1))
-			.saturating_add(T::DbWeight::get().writes(1))
-	}
-	/// Storage: Identity Registrars (r:1 w:1)
-	/// Proof: Identity Registrars (max_values: Some(1), max_size: Some(1141), added: 1636, mode: MaxEncodedLen)
-	/// The range of component `r` is `[1, 19]`.
-	fn set_fields(r: u32, ) -> Weight {
-		// Proof Size summary in bytes:
-		//  Measured:  `89 + r * (57 ±0)`
-		//  Estimated: `2626`
-		// Minimum execution time: 7_337_000 picoseconds.
-		Weight::from_parts(7_782_268, 0)
-			.saturating_add(Weight::from_parts(0, 2626))
-			// Standard Error: 1_272
-			.saturating_add(Weight::from_parts(97_602, 0).saturating_mul(r.into()))
-			.saturating_add(T::DbWeight::get().reads(1))
-			.saturating_add(T::DbWeight::get().writes(1))
-	}
-	/// Storage: Identity Registrars (r:1 w:0)
-	/// Proof: Identity Registrars (max_values: Some(1), max_size: Some(1141), added: 1636, mode: MaxEncodedLen)
-	/// Storage: Identity IdentityOf (r:1 w:1)
-	/// Proof: Identity IdentityOf (max_values: None, max_size: Some(7538), added: 10013, mode: MaxEncodedLen)
-	/// The range of component `r` is `[1, 19]`.
-	/// The range of component `x` is `[0, 100]`.
-	fn provide_judgement(r: u32, x: u32, ) -> Weight {
-		// Proof Size summary in bytes:
-		//  Measured:  `445 + r * (57 ±0) + x * (66 ±0)`
-		//  Estimated: `11003`
-		// Minimum execution time: 22_825_000 picoseconds.
-		Weight::from_parts(21_046_708, 0)
-			.saturating_add(Weight::from_parts(0, 11003))
-			// Standard Error: 5_012
-			.saturating_add(Weight::from_parts(180_118, 0).saturating_mul(r.into()))
-			// Standard Error: 927
-			.saturating_add(Weight::from_parts(788_617, 0).saturating_mul(x.into()))
-			.saturating_add(T::DbWeight::get().reads(2))
-			.saturating_add(T::DbWeight::get().writes(1))
-	}
-	/// Storage: Identity SubsOf (r:1 w:1)
-	/// Proof: Identity SubsOf (max_values: None, max_size: Some(3258), added: 5733, mode: MaxEncodedLen)
-	/// Storage: Identity IdentityOf (r:1 w:1)
-	/// Proof: Identity IdentityOf (max_values: None, max_size: Some(7538), added: 10013, mode: MaxEncodedLen)
-	/// Storage: System Account (r:1 w:1)
-	/// Proof: System Account (max_values: None, max_size: Some(128), added: 2603, mode: MaxEncodedLen)
-	/// Storage: Identity SuperOf (r:0 w:100)
-	/// Proof: Identity SuperOf (max_values: None, max_size: Some(114), added: 2589, mode: MaxEncodedLen)
-	/// The range of component `r` is `[1, 20]`.
-	/// The range of component `s` is `[0, 100]`.
-	/// The range of component `x` is `[0, 100]`.
-	fn kill_identity(r: u32, s: u32, x: u32, ) -> Weight {
-		// Proof Size summary in bytes:
-		//  Measured:  `676 + r * (5 ±0) + s * (32 ±0) + x * (66 ±0)`
-		//  Estimated: `11003`
-		// Minimum execution time: 75_635_000 picoseconds.
-		Weight::from_parts(47_274_783, 0)
-			.saturating_add(Weight::from_parts(0, 11003))
-			// Standard Error: 11_632
-			.saturating_add(Weight::from_parts(230_554, 0).saturating_mul(r.into()))
-			// Standard Error: 2_271
-			.saturating_add(Weight::from_parts(1_333_461, 0).saturating_mul(s.into()))
-			// Standard Error: 2_271
-			.saturating_add(Weight::from_parts(276_612, 0).saturating_mul(x.into()))
-			.saturating_add(T::DbWeight::get().reads(3))
-			.saturating_add(T::DbWeight::get().writes(3))
-			.saturating_add(T::DbWeight::get().writes((1_u64).saturating_mul(s.into())))
-	}
-	/// Storage: Identity IdentityOf (r:1 w:0)
-	/// Proof: Identity IdentityOf (max_values: None, max_size: Some(7538), added: 10013, mode: MaxEncodedLen)
-	/// Storage: Identity SuperOf (r:1 w:1)
-	/// Proof: Identity SuperOf (max_values: None, max_size: Some(114), added: 2589, mode: MaxEncodedLen)
-	/// Storage: Identity SubsOf (r:1 w:1)
-	/// Proof: Identity SubsOf (max_values: None, max_size: Some(3258), added: 5733, mode: MaxEncodedLen)
-	/// The range of component `s` is `[0, 99]`.
-	fn add_sub(s: u32, ) -> Weight {
-		// Proof Size summary in bytes:
-		//  Measured:  `475 + s * (36 ±0)`
-		//  Estimated: `11003`
-		// Minimum execution time: 29_374_000 picoseconds.
-		Weight::from_parts(33_426_262, 0)
-			.saturating_add(Weight::from_parts(0, 11003))
-			// Standard Error: 1_171
-			.saturating_add(Weight::from_parts(101_531, 0).saturating_mul(s.into()))
-			.saturating_add(T::DbWeight::get().reads(3))
-			.saturating_add(T::DbWeight::get().writes(2))
-	}
-	/// Storage: Identity IdentityOf (r:1 w:0)
-	/// Proof: Identity IdentityOf (max_values: None, max_size: Some(7538), added: 10013, mode: MaxEncodedLen)
-	/// Storage: Identity SuperOf (r:1 w:1)
-	/// Proof: Identity SuperOf (max_values: None, max_size: Some(114), added: 2589, mode: MaxEncodedLen)
-	/// The range of component `s` is `[1, 100]`.
-	fn rename_sub(s: u32, ) -> Weight {
-		// Proof Size summary in bytes:
-		//  Measured:  `591 + s * (3 ±0)`
-		//  Estimated: `11003`
-		// Minimum execution time: 12_449_000 picoseconds.
-		Weight::from_parts(13_803_167, 0)
-			.saturating_add(Weight::from_parts(0, 11003))
-			// Standard Error: 492
-			.saturating_add(Weight::from_parts(39_985, 0).saturating_mul(s.into()))
-			.saturating_add(T::DbWeight::get().reads(2))
-			.saturating_add(T::DbWeight::get().writes(1))
-	}
-	/// Storage: Identity IdentityOf (r:1 w:0)
-	/// Proof: Identity IdentityOf (max_values: None, max_size: Some(7538), added: 10013, mode: MaxEncodedLen)
-	/// Storage: Identity SuperOf (r:1 w:1)
-	/// Proof: Identity SuperOf (max_values: None, max_size: Some(114), added: 2589, mode: MaxEncodedLen)
-	/// Storage: Identity SubsOf (r:1 w:1)
-	/// Proof: Identity SubsOf (max_values: None, max_size: Some(3258), added: 5733, mode: MaxEncodedLen)
-	/// The range of component `s` is `[1, 100]`.
-	fn remove_sub(s: u32, ) -> Weight {
-		// Proof Size summary in bytes:
-		//  Measured:  `638 + s * (35 ±0)`
-		//  Estimated: `11003`
-		// Minimum execution time: 32_962_000 picoseconds.
-		Weight::from_parts(35_538_881, 0)
-			.saturating_add(Weight::from_parts(0, 11003))
-			// Standard Error: 1_052
-			.saturating_add(Weight::from_parts(96_317, 0).saturating_mul(s.into()))
-			.saturating_add(T::DbWeight::get().reads(3))
-			.saturating_add(T::DbWeight::get().writes(2))
-	}
-	/// Storage: Identity SuperOf (r:1 w:1)
-	/// Proof: Identity SuperOf (max_values: None, max_size: Some(114), added: 2589, mode: MaxEncodedLen)
-	/// Storage: Identity SubsOf (r:1 w:1)
-	/// Proof: Identity SubsOf (max_values: None, max_size: Some(3258), added: 5733, mode: MaxEncodedLen)
-	/// Storage: System Account (r:1 w:0)
-	/// Proof: System Account (max_values: None, max_size: Some(128), added: 2603, mode: MaxEncodedLen)
-	/// The range of component `s` is `[0, 99]`.
-	fn quit_sub(s: u32, ) -> Weight {
-		// Proof Size summary in bytes:
-		//  Measured:  `704 + s * (37 ±0)`
-		//  Estimated: `6723`
-		// Minimum execution time: 25_233_000 picoseconds.
-		Weight::from_parts(27_271_178, 0)
-			.saturating_add(Weight::from_parts(0, 6723))
-			// Standard Error: 897
-			.saturating_add(Weight::from_parts(92_723, 0).saturating_mul(s.into()))
-			.saturating_add(T::DbWeight::get().reads(3))
-			.saturating_add(T::DbWeight::get().writes(2))
-	}
-}
diff --git a/polkadot/runtime/polkadot/src/weights/pallet_im_online.rs b/polkadot/runtime/polkadot/src/weights/pallet_im_online.rs
deleted file mode 100644
index 93264c0c6991ec04e723ae3da29eebd5130e7117..0000000000000000000000000000000000000000
--- a/polkadot/runtime/polkadot/src/weights/pallet_im_online.rs
+++ /dev/null
@@ -1,77 +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/>.
-
-//! Autogenerated weights for `pallet_im_online`
-//!
-//! THIS FILE WAS AUTO-GENERATED USING THE SUBSTRATE BENCHMARK CLI VERSION 4.0.0-dev
-//! DATE: 2023-06-18, STEPS: `50`, REPEAT: `20`, LOW RANGE: `[]`, HIGH RANGE: `[]`
-//! WORST CASE MAP SIZE: `1000000`
-//! HOSTNAME: `runner-e8ezs4ez-project-163-concurrent-0`, CPU: `Intel(R) Xeon(R) CPU @ 2.60GHz`
-//! EXECUTION: Some(Wasm), WASM-EXECUTION: Compiled, CHAIN: Some("polkadot-dev"), DB CACHE: 1024
-
-// Executed Command:
-// ./target/production/polkadot
-// benchmark
-// pallet
-// --chain=polkadot-dev
-// --steps=50
-// --repeat=20
-// --no-storage-info
-// --no-median-slopes
-// --no-min-squares
-// --pallet=pallet_im_online
-// --extrinsic=*
-// --execution=wasm
-// --wasm-execution=compiled
-// --header=./file_header.txt
-// --output=./runtime/polkadot/src/weights/
-
-#![cfg_attr(rustfmt, rustfmt_skip)]
-#![allow(unused_parens)]
-#![allow(unused_imports)]
-#![allow(missing_docs)]
-
-use frame_support::{traits::Get, weights::Weight};
-use core::marker::PhantomData;
-
-/// Weight functions for `pallet_im_online`.
-pub struct WeightInfo<T>(PhantomData<T>);
-impl<T: frame_system::Config> pallet_im_online::WeightInfo for WeightInfo<T> {
-	/// Storage: Session Validators (r:1 w:0)
-	/// Proof Skipped: Session Validators (max_values: Some(1), max_size: None, mode: Measured)
-	/// Storage: Session CurrentIndex (r:1 w:0)
-	/// Proof Skipped: Session CurrentIndex (max_values: Some(1), max_size: None, mode: Measured)
-	/// Storage: ImOnline Keys (r:1 w:0)
-	/// Proof: ImOnline Keys (max_values: Some(1), max_size: Some(320002), added: 320497, mode: MaxEncodedLen)
-	/// Storage: ImOnline ReceivedHeartbeats (r:1 w:1)
-	/// Proof: ImOnline ReceivedHeartbeats (max_values: None, max_size: Some(25), added: 2500, mode: MaxEncodedLen)
-	/// Storage: ImOnline AuthoredBlocks (r:1 w:0)
-	/// Proof: ImOnline AuthoredBlocks (max_values: None, max_size: Some(56), added: 2531, mode: MaxEncodedLen)
-	/// The range of component `k` is `[1, 1000]`.
-	fn validate_unsigned_and_then_heartbeat(k: u32, ) -> Weight {
-		// Proof Size summary in bytes:
-		//  Measured:  `361 + k * (32 ±0)`
-		//  Estimated: `321487 + k * (1761 ±0)`
-		// Minimum execution time: 83_488_000 picoseconds.
-		Weight::from_parts(99_862_268, 0)
-			.saturating_add(Weight::from_parts(0, 321487))
-			// Standard Error: 567
-			.saturating_add(Weight::from_parts(35_207, 0).saturating_mul(k.into()))
-			.saturating_add(T::DbWeight::get().reads(4))
-			.saturating_add(T::DbWeight::get().writes(1))
-			.saturating_add(Weight::from_parts(0, 1761).saturating_mul(k.into()))
-	}
-}
diff --git a/polkadot/runtime/polkadot/src/weights/pallet_indices.rs b/polkadot/runtime/polkadot/src/weights/pallet_indices.rs
deleted file mode 100644
index 94f2285efc25e0d345b823277432f4235a7668cf..0000000000000000000000000000000000000000
--- a/polkadot/runtime/polkadot/src/weights/pallet_indices.rs
+++ /dev/null
@@ -1,117 +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/>.
-
-//! Autogenerated weights for `pallet_indices`
-//!
-//! THIS FILE WAS AUTO-GENERATED USING THE SUBSTRATE BENCHMARK CLI VERSION 4.0.0-dev
-//! DATE: 2023-06-18, STEPS: `50`, REPEAT: `20`, LOW RANGE: `[]`, HIGH RANGE: `[]`
-//! WORST CASE MAP SIZE: `1000000`
-//! HOSTNAME: `runner-e8ezs4ez-project-163-concurrent-0`, CPU: `Intel(R) Xeon(R) CPU @ 2.60GHz`
-//! EXECUTION: Some(Wasm), WASM-EXECUTION: Compiled, CHAIN: Some("polkadot-dev"), DB CACHE: 1024
-
-// Executed Command:
-// ./target/production/polkadot
-// benchmark
-// pallet
-// --chain=polkadot-dev
-// --steps=50
-// --repeat=20
-// --no-storage-info
-// --no-median-slopes
-// --no-min-squares
-// --pallet=pallet_indices
-// --extrinsic=*
-// --execution=wasm
-// --wasm-execution=compiled
-// --header=./file_header.txt
-// --output=./runtime/polkadot/src/weights/
-
-#![cfg_attr(rustfmt, rustfmt_skip)]
-#![allow(unused_parens)]
-#![allow(unused_imports)]
-#![allow(missing_docs)]
-
-use frame_support::{traits::Get, weights::Weight};
-use core::marker::PhantomData;
-
-/// Weight functions for `pallet_indices`.
-pub struct WeightInfo<T>(PhantomData<T>);
-impl<T: frame_system::Config> pallet_indices::WeightInfo for WeightInfo<T> {
-	/// Storage: Indices Accounts (r:1 w:1)
-	/// Proof: Indices Accounts (max_values: None, max_size: Some(69), added: 2544, mode: MaxEncodedLen)
-	fn claim() -> Weight {
-		// Proof Size summary in bytes:
-		//  Measured:  `142`
-		//  Estimated: `3534`
-		// Minimum execution time: 24_795_000 picoseconds.
-		Weight::from_parts(25_532_000, 0)
-			.saturating_add(Weight::from_parts(0, 3534))
-			.saturating_add(T::DbWeight::get().reads(1))
-			.saturating_add(T::DbWeight::get().writes(1))
-	}
-	/// Storage: Indices Accounts (r:1 w:1)
-	/// Proof: Indices Accounts (max_values: None, max_size: Some(69), added: 2544, mode: MaxEncodedLen)
-	/// Storage: System Account (r:1 w:1)
-	/// Proof: System Account (max_values: None, max_size: Some(128), added: 2603, mode: MaxEncodedLen)
-	fn transfer() -> Weight {
-		// Proof Size summary in bytes:
-		//  Measured:  `341`
-		//  Estimated: `3593`
-		// Minimum execution time: 35_879_000 picoseconds.
-		Weight::from_parts(36_559_000, 0)
-			.saturating_add(Weight::from_parts(0, 3593))
-			.saturating_add(T::DbWeight::get().reads(2))
-			.saturating_add(T::DbWeight::get().writes(2))
-	}
-	/// Storage: Indices Accounts (r:1 w:1)
-	/// Proof: Indices Accounts (max_values: None, max_size: Some(69), added: 2544, mode: MaxEncodedLen)
-	fn free() -> Weight {
-		// Proof Size summary in bytes:
-		//  Measured:  `238`
-		//  Estimated: `3534`
-		// Minimum execution time: 25_628_000 picoseconds.
-		Weight::from_parts(26_584_000, 0)
-			.saturating_add(Weight::from_parts(0, 3534))
-			.saturating_add(T::DbWeight::get().reads(1))
-			.saturating_add(T::DbWeight::get().writes(1))
-	}
-	/// Storage: Indices Accounts (r:1 w:1)
-	/// Proof: Indices Accounts (max_values: None, max_size: Some(69), added: 2544, mode: MaxEncodedLen)
-	/// Storage: System Account (r:1 w:1)
-	/// Proof: System Account (max_values: None, max_size: Some(128), added: 2603, mode: MaxEncodedLen)
-	fn force_transfer() -> Weight {
-		// Proof Size summary in bytes:
-		//  Measured:  `341`
-		//  Estimated: `3593`
-		// Minimum execution time: 28_963_000 picoseconds.
-		Weight::from_parts(29_722_000, 0)
-			.saturating_add(Weight::from_parts(0, 3593))
-			.saturating_add(T::DbWeight::get().reads(2))
-			.saturating_add(T::DbWeight::get().writes(2))
-	}
-	/// Storage: Indices Accounts (r:1 w:1)
-	/// Proof: Indices Accounts (max_values: None, max_size: Some(69), added: 2544, mode: MaxEncodedLen)
-	fn freeze() -> Weight {
-		// Proof Size summary in bytes:
-		//  Measured:  `238`
-		//  Estimated: `3534`
-		// Minimum execution time: 27_596_000 picoseconds.
-		Weight::from_parts(28_182_000, 0)
-			.saturating_add(Weight::from_parts(0, 3534))
-			.saturating_add(T::DbWeight::get().reads(1))
-			.saturating_add(T::DbWeight::get().writes(1))
-	}
-}
diff --git a/polkadot/runtime/polkadot/src/weights/pallet_membership.rs b/polkadot/runtime/polkadot/src/weights/pallet_membership.rs
deleted file mode 100644
index a4e5ce4a7bbb8f6b05f2c3934820f1628174984b..0000000000000000000000000000000000000000
--- a/polkadot/runtime/polkadot/src/weights/pallet_membership.rs
+++ /dev/null
@@ -1,207 +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/>.
-
-//! Autogenerated weights for `pallet_membership`
-//!
-//! THIS FILE WAS AUTO-GENERATED USING THE SUBSTRATE BENCHMARK CLI VERSION 4.0.0-dev
-//! DATE: 2023-06-18, STEPS: `50`, REPEAT: `20`, LOW RANGE: `[]`, HIGH RANGE: `[]`
-//! WORST CASE MAP SIZE: `1000000`
-//! HOSTNAME: `runner-e8ezs4ez-project-163-concurrent-0`, CPU: `Intel(R) Xeon(R) CPU @ 2.60GHz`
-//! EXECUTION: Some(Wasm), WASM-EXECUTION: Compiled, CHAIN: Some("polkadot-dev"), DB CACHE: 1024
-
-// Executed Command:
-// ./target/production/polkadot
-// benchmark
-// pallet
-// --chain=polkadot-dev
-// --steps=50
-// --repeat=20
-// --no-storage-info
-// --no-median-slopes
-// --no-min-squares
-// --pallet=pallet_membership
-// --extrinsic=*
-// --execution=wasm
-// --wasm-execution=compiled
-// --header=./file_header.txt
-// --output=./runtime/polkadot/src/weights/
-
-#![cfg_attr(rustfmt, rustfmt_skip)]
-#![allow(unused_parens)]
-#![allow(unused_imports)]
-#![allow(missing_docs)]
-
-use frame_support::{traits::Get, weights::Weight};
-use core::marker::PhantomData;
-
-/// Weight functions for `pallet_membership`.
-pub struct WeightInfo<T>(PhantomData<T>);
-impl<T: frame_system::Config> pallet_membership::WeightInfo for WeightInfo<T> {
-	/// Storage: TechnicalMembership Members (r:1 w:1)
-	/// Proof: TechnicalMembership Members (max_values: Some(1), max_size: Some(3202), added: 3697, mode: MaxEncodedLen)
-	/// Storage: TechnicalCommittee Proposals (r:1 w:0)
-	/// Proof Skipped: TechnicalCommittee Proposals (max_values: Some(1), max_size: None, mode: Measured)
-	/// Storage: TechnicalCommittee Members (r:0 w:1)
-	/// Proof Skipped: TechnicalCommittee Members (max_values: Some(1), max_size: None, mode: Measured)
-	/// Storage: TechnicalCommittee Prime (r:0 w:1)
-	/// Proof Skipped: TechnicalCommittee Prime (max_values: Some(1), max_size: None, mode: Measured)
-	/// The range of component `m` is `[1, 99]`.
-	fn add_member(m: u32, ) -> Weight {
-		// Proof Size summary in bytes:
-		//  Measured:  `174 + m * (64 ±0)`
-		//  Estimated: `4687 + m * (64 ±0)`
-		// Minimum execution time: 17_443_000 picoseconds.
-		Weight::from_parts(18_272_399, 0)
-			.saturating_add(Weight::from_parts(0, 4687))
-			// Standard Error: 376
-			.saturating_add(Weight::from_parts(33_633, 0).saturating_mul(m.into()))
-			.saturating_add(T::DbWeight::get().reads(2))
-			.saturating_add(T::DbWeight::get().writes(3))
-			.saturating_add(Weight::from_parts(0, 64).saturating_mul(m.into()))
-	}
-	/// Storage: TechnicalMembership Members (r:1 w:1)
-	/// Proof: TechnicalMembership Members (max_values: Some(1), max_size: Some(3202), added: 3697, mode: MaxEncodedLen)
-	/// Storage: TechnicalCommittee Proposals (r:1 w:0)
-	/// Proof Skipped: TechnicalCommittee Proposals (max_values: Some(1), max_size: None, mode: Measured)
-	/// Storage: TechnicalMembership Prime (r:1 w:0)
-	/// Proof: TechnicalMembership Prime (max_values: Some(1), max_size: Some(32), added: 527, mode: MaxEncodedLen)
-	/// Storage: TechnicalCommittee Members (r:0 w:1)
-	/// Proof Skipped: TechnicalCommittee Members (max_values: Some(1), max_size: None, mode: Measured)
-	/// Storage: TechnicalCommittee Prime (r:0 w:1)
-	/// Proof Skipped: TechnicalCommittee Prime (max_values: Some(1), max_size: None, mode: Measured)
-	/// The range of component `m` is `[2, 100]`.
-	fn remove_member(m: u32, ) -> Weight {
-		// Proof Size summary in bytes:
-		//  Measured:  `278 + m * (64 ±0)`
-		//  Estimated: `4687 + m * (64 ±0)`
-		// Minimum execution time: 19_826_000 picoseconds.
-		Weight::from_parts(20_859_732, 0)
-			.saturating_add(Weight::from_parts(0, 4687))
-			// Standard Error: 667
-			.saturating_add(Weight::from_parts(33_155, 0).saturating_mul(m.into()))
-			.saturating_add(T::DbWeight::get().reads(3))
-			.saturating_add(T::DbWeight::get().writes(3))
-			.saturating_add(Weight::from_parts(0, 64).saturating_mul(m.into()))
-	}
-	/// Storage: TechnicalMembership Members (r:1 w:1)
-	/// Proof: TechnicalMembership Members (max_values: Some(1), max_size: Some(3202), added: 3697, mode: MaxEncodedLen)
-	/// Storage: TechnicalCommittee Proposals (r:1 w:0)
-	/// Proof Skipped: TechnicalCommittee Proposals (max_values: Some(1), max_size: None, mode: Measured)
-	/// Storage: TechnicalMembership Prime (r:1 w:0)
-	/// Proof: TechnicalMembership Prime (max_values: Some(1), max_size: Some(32), added: 527, mode: MaxEncodedLen)
-	/// Storage: TechnicalCommittee Members (r:0 w:1)
-	/// Proof Skipped: TechnicalCommittee Members (max_values: Some(1), max_size: None, mode: Measured)
-	/// Storage: TechnicalCommittee Prime (r:0 w:1)
-	/// Proof Skipped: TechnicalCommittee Prime (max_values: Some(1), max_size: None, mode: Measured)
-	/// The range of component `m` is `[2, 100]`.
-	fn swap_member(m: u32, ) -> Weight {
-		// Proof Size summary in bytes:
-		//  Measured:  `278 + m * (64 ±0)`
-		//  Estimated: `4687 + m * (64 ±0)`
-		// Minimum execution time: 20_151_000 picoseconds.
-		Weight::from_parts(20_774_114, 0)
-			.saturating_add(Weight::from_parts(0, 4687))
-			// Standard Error: 447
-			.saturating_add(Weight::from_parts(44_052, 0).saturating_mul(m.into()))
-			.saturating_add(T::DbWeight::get().reads(3))
-			.saturating_add(T::DbWeight::get().writes(3))
-			.saturating_add(Weight::from_parts(0, 64).saturating_mul(m.into()))
-	}
-	/// Storage: TechnicalMembership Members (r:1 w:1)
-	/// Proof: TechnicalMembership Members (max_values: Some(1), max_size: Some(3202), added: 3697, mode: MaxEncodedLen)
-	/// Storage: TechnicalCommittee Proposals (r:1 w:0)
-	/// Proof Skipped: TechnicalCommittee Proposals (max_values: Some(1), max_size: None, mode: Measured)
-	/// Storage: TechnicalMembership Prime (r:1 w:0)
-	/// Proof: TechnicalMembership Prime (max_values: Some(1), max_size: Some(32), added: 527, mode: MaxEncodedLen)
-	/// Storage: TechnicalCommittee Members (r:0 w:1)
-	/// Proof Skipped: TechnicalCommittee Members (max_values: Some(1), max_size: None, mode: Measured)
-	/// Storage: TechnicalCommittee Prime (r:0 w:1)
-	/// Proof Skipped: TechnicalCommittee Prime (max_values: Some(1), max_size: None, mode: Measured)
-	/// The range of component `m` is `[1, 100]`.
-	fn reset_member(m: u32, ) -> Weight {
-		// Proof Size summary in bytes:
-		//  Measured:  `278 + m * (64 ±0)`
-		//  Estimated: `4687 + m * (64 ±0)`
-		// Minimum execution time: 19_846_000 picoseconds.
-		Weight::from_parts(20_903_563, 0)
-			.saturating_add(Weight::from_parts(0, 4687))
-			// Standard Error: 865
-			.saturating_add(Weight::from_parts(149_306, 0).saturating_mul(m.into()))
-			.saturating_add(T::DbWeight::get().reads(3))
-			.saturating_add(T::DbWeight::get().writes(3))
-			.saturating_add(Weight::from_parts(0, 64).saturating_mul(m.into()))
-	}
-	/// Storage: TechnicalMembership Members (r:1 w:1)
-	/// Proof: TechnicalMembership Members (max_values: Some(1), max_size: Some(3202), added: 3697, mode: MaxEncodedLen)
-	/// Storage: TechnicalCommittee Proposals (r:1 w:0)
-	/// Proof Skipped: TechnicalCommittee Proposals (max_values: Some(1), max_size: None, mode: Measured)
-	/// Storage: TechnicalMembership Prime (r:1 w:1)
-	/// Proof: TechnicalMembership Prime (max_values: Some(1), max_size: Some(32), added: 527, mode: MaxEncodedLen)
-	/// Storage: TechnicalCommittee Members (r:0 w:1)
-	/// Proof Skipped: TechnicalCommittee Members (max_values: Some(1), max_size: None, mode: Measured)
-	/// Storage: TechnicalCommittee Prime (r:0 w:1)
-	/// Proof Skipped: TechnicalCommittee Prime (max_values: Some(1), max_size: None, mode: Measured)
-	/// The range of component `m` is `[1, 100]`.
-	fn change_key(m: u32, ) -> Weight {
-		// Proof Size summary in bytes:
-		//  Measured:  `278 + m * (64 ±0)`
-		//  Estimated: `4687 + m * (64 ±0)`
-		// Minimum execution time: 20_523_000 picoseconds.
-		Weight::from_parts(21_705_085, 0)
-			.saturating_add(Weight::from_parts(0, 4687))
-			// Standard Error: 948
-			.saturating_add(Weight::from_parts(44_568, 0).saturating_mul(m.into()))
-			.saturating_add(T::DbWeight::get().reads(3))
-			.saturating_add(T::DbWeight::get().writes(4))
-			.saturating_add(Weight::from_parts(0, 64).saturating_mul(m.into()))
-	}
-	/// Storage: TechnicalMembership Members (r:1 w:0)
-	/// Proof: TechnicalMembership Members (max_values: Some(1), max_size: Some(3202), added: 3697, mode: MaxEncodedLen)
-	/// Storage: TechnicalMembership Prime (r:0 w:1)
-	/// Proof: TechnicalMembership Prime (max_values: Some(1), max_size: Some(32), added: 527, mode: MaxEncodedLen)
-	/// Storage: TechnicalCommittee Prime (r:0 w:1)
-	/// Proof Skipped: TechnicalCommittee Prime (max_values: Some(1), max_size: None, mode: Measured)
-	/// The range of component `m` is `[1, 100]`.
-	fn set_prime(m: u32, ) -> Weight {
-		// Proof Size summary in bytes:
-		//  Measured:  `32 + m * (32 ±0)`
-		//  Estimated: `4687 + m * (32 ±0)`
-		// Minimum execution time: 8_032_000 picoseconds.
-		Weight::from_parts(8_386_682, 0)
-			.saturating_add(Weight::from_parts(0, 4687))
-			// Standard Error: 190
-			.saturating_add(Weight::from_parts(9_724, 0).saturating_mul(m.into()))
-			.saturating_add(T::DbWeight::get().reads(1))
-			.saturating_add(T::DbWeight::get().writes(2))
-			.saturating_add(Weight::from_parts(0, 32).saturating_mul(m.into()))
-	}
-	/// Storage: TechnicalMembership Prime (r:0 w:1)
-	/// Proof: TechnicalMembership Prime (max_values: Some(1), max_size: Some(32), added: 527, mode: MaxEncodedLen)
-	/// Storage: TechnicalCommittee Prime (r:0 w:1)
-	/// Proof Skipped: TechnicalCommittee Prime (max_values: Some(1), max_size: None, mode: Measured)
-	/// The range of component `m` is `[1, 100]`.
-	fn clear_prime(m: u32, ) -> Weight {
-		// Proof Size summary in bytes:
-		//  Measured:  `0`
-		//  Estimated: `0`
-		// Minimum execution time: 3_061_000 picoseconds.
-		Weight::from_parts(3_304_217, 0)
-			.saturating_add(Weight::from_parts(0, 0))
-			// Standard Error: 80
-			.saturating_add(Weight::from_parts(273, 0).saturating_mul(m.into()))
-			.saturating_add(T::DbWeight::get().writes(2))
-	}
-}
diff --git a/polkadot/runtime/polkadot/src/weights/pallet_message_queue.rs b/polkadot/runtime/polkadot/src/weights/pallet_message_queue.rs
deleted file mode 100644
index b0b9776b0114d95fc5cca0634c4ff7eaaa0ff1e6..0000000000000000000000000000000000000000
--- a/polkadot/runtime/polkadot/src/weights/pallet_message_queue.rs
+++ /dev/null
@@ -1,199 +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/>.
-
-//! Autogenerated weights for `pallet_message_queue`
-//!
-//! THIS FILE WAS AUTO-GENERATED USING THE SUBSTRATE BENCHMARK CLI VERSION 4.0.0-dev
-//! DATE: 2023-06-18, STEPS: `50`, REPEAT: `20`, LOW RANGE: `[]`, HIGH RANGE: `[]`
-//! WORST CASE MAP SIZE: `1000000`
-//! HOSTNAME: `runner-e8ezs4ez-project-163-concurrent-0`, CPU: `Intel(R) Xeon(R) CPU @ 2.60GHz`
-//! EXECUTION: Some(Wasm), WASM-EXECUTION: Compiled, CHAIN: Some("polkadot-dev"), DB CACHE: 1024
-
-// Executed Command:
-// ./target/production/polkadot
-// benchmark
-// pallet
-// --chain=polkadot-dev
-// --steps=50
-// --repeat=20
-// --no-storage-info
-// --no-median-slopes
-// --no-min-squares
-// --pallet=pallet_message_queue
-// --extrinsic=*
-// --execution=wasm
-// --wasm-execution=compiled
-// --header=./file_header.txt
-// --output=./runtime/polkadot/src/weights/
-
-#![cfg_attr(rustfmt, rustfmt_skip)]
-#![allow(unused_parens)]
-#![allow(unused_imports)]
-#![allow(missing_docs)]
-
-use frame_support::{traits::Get, weights::Weight};
-use core::marker::PhantomData;
-
-/// Weight functions for `pallet_message_queue`.
-pub struct WeightInfo<T>(PhantomData<T>);
-impl<T: frame_system::Config> pallet_message_queue::WeightInfo for WeightInfo<T> {
-	/// Storage: MessageQueue ServiceHead (r:1 w:0)
-	/// Proof: MessageQueue ServiceHead (max_values: Some(1), max_size: Some(6), added: 501, mode: MaxEncodedLen)
-	/// Storage: MessageQueue BookStateFor (r:2 w:2)
-	/// Proof: MessageQueue BookStateFor (max_values: None, max_size: Some(55), added: 2530, mode: MaxEncodedLen)
-	fn ready_ring_knit() -> Weight {
-		// Proof Size summary in bytes:
-		//  Measured:  `248`
-		//  Estimated: `6050`
-		// Minimum execution time: 12_778_000 picoseconds.
-		Weight::from_parts(13_167_000, 0)
-			.saturating_add(Weight::from_parts(0, 6050))
-			.saturating_add(T::DbWeight::get().reads(3))
-			.saturating_add(T::DbWeight::get().writes(2))
-	}
-	/// Storage: MessageQueue BookStateFor (r:2 w:2)
-	/// Proof: MessageQueue BookStateFor (max_values: None, max_size: Some(55), added: 2530, mode: MaxEncodedLen)
-	/// Storage: MessageQueue ServiceHead (r:1 w:1)
-	/// Proof: MessageQueue ServiceHead (max_values: Some(1), max_size: Some(6), added: 501, mode: MaxEncodedLen)
-	fn ready_ring_unknit() -> Weight {
-		// Proof Size summary in bytes:
-		//  Measured:  `248`
-		//  Estimated: `6050`
-		// Minimum execution time: 11_910_000 picoseconds.
-		Weight::from_parts(12_318_000, 0)
-			.saturating_add(Weight::from_parts(0, 6050))
-			.saturating_add(T::DbWeight::get().reads(3))
-			.saturating_add(T::DbWeight::get().writes(3))
-	}
-	/// Storage: MessageQueue BookStateFor (r:1 w:1)
-	/// Proof: MessageQueue BookStateFor (max_values: None, max_size: Some(55), added: 2530, mode: MaxEncodedLen)
-	fn service_queue_base() -> Weight {
-		// Proof Size summary in bytes:
-		//  Measured:  `42`
-		//  Estimated: `3520`
-		// Minimum execution time: 5_070_000 picoseconds.
-		Weight::from_parts(5_266_000, 0)
-			.saturating_add(Weight::from_parts(0, 3520))
-			.saturating_add(T::DbWeight::get().reads(1))
-			.saturating_add(T::DbWeight::get().writes(1))
-	}
-	/// Storage: MessageQueue Pages (r:1 w:1)
-	/// Proof: MessageQueue Pages (max_values: None, max_size: Some(65586), added: 68061, mode: MaxEncodedLen)
-	fn service_page_base_completion() -> Weight {
-		// Proof Size summary in bytes:
-		//  Measured:  `115`
-		//  Estimated: `69051`
-		// Minimum execution time: 6_812_000 picoseconds.
-		Weight::from_parts(7_085_000, 0)
-			.saturating_add(Weight::from_parts(0, 69051))
-			.saturating_add(T::DbWeight::get().reads(1))
-			.saturating_add(T::DbWeight::get().writes(1))
-	}
-	/// Storage: MessageQueue Pages (r:1 w:1)
-	/// Proof: MessageQueue Pages (max_values: None, max_size: Some(65586), added: 68061, mode: MaxEncodedLen)
-	fn service_page_base_no_completion() -> Weight {
-		// Proof Size summary in bytes:
-		//  Measured:  `115`
-		//  Estimated: `69051`
-		// Minimum execution time: 7_136_000 picoseconds.
-		Weight::from_parts(7_392_000, 0)
-			.saturating_add(Weight::from_parts(0, 69051))
-			.saturating_add(T::DbWeight::get().reads(1))
-			.saturating_add(T::DbWeight::get().writes(1))
-	}
-	fn service_page_item() -> Weight {
-		// Proof Size summary in bytes:
-		//  Measured:  `0`
-		//  Estimated: `0`
-		// Minimum execution time: 92_069_000 picoseconds.
-		Weight::from_parts(92_769_000, 0)
-			.saturating_add(Weight::from_parts(0, 0))
-	}
-	/// Storage: MessageQueue ServiceHead (r:1 w:1)
-	/// Proof: MessageQueue ServiceHead (max_values: Some(1), max_size: Some(6), added: 501, mode: MaxEncodedLen)
-	/// Storage: MessageQueue BookStateFor (r:1 w:0)
-	/// Proof: MessageQueue BookStateFor (max_values: None, max_size: Some(55), added: 2530, mode: MaxEncodedLen)
-	fn bump_service_head() -> Weight {
-		// Proof Size summary in bytes:
-		//  Measured:  `149`
-		//  Estimated: `3520`
-		// Minimum execution time: 7_443_000 picoseconds.
-		Weight::from_parts(7_670_000, 0)
-			.saturating_add(Weight::from_parts(0, 3520))
-			.saturating_add(T::DbWeight::get().reads(2))
-			.saturating_add(T::DbWeight::get().writes(1))
-	}
-	/// Storage: MessageQueue BookStateFor (r:1 w:1)
-	/// Proof: MessageQueue BookStateFor (max_values: None, max_size: Some(55), added: 2530, mode: MaxEncodedLen)
-	/// Storage: MessageQueue Pages (r:1 w:1)
-	/// Proof: MessageQueue Pages (max_values: None, max_size: Some(65586), added: 68061, mode: MaxEncodedLen)
-	/// Storage: Configuration ActiveConfig (r:1 w:0)
-	/// Proof Skipped: Configuration ActiveConfig (max_values: Some(1), max_size: None, mode: Measured)
-	/// Storage: unknown `0x3a72656c61795f64697370617463685f71756575655f72656d61696e696e675f` (r:0 w:1)
-	/// Proof Skipped: unknown `0x3a72656c61795f64697370617463685f71756575655f72656d61696e696e675f` (r:0 w:1)
-	/// Storage: unknown `0xf5207f03cfdce586301014700e2c2593fad157e461d71fd4c1f936839a5f1f3e` (r:0 w:1)
-	/// Proof Skipped: unknown `0xf5207f03cfdce586301014700e2c2593fad157e461d71fd4c1f936839a5f1f3e` (r:0 w:1)
-	fn reap_page() -> Weight {
-		// Proof Size summary in bytes:
-		//  Measured:  `66030`
-		//  Estimated: `69051`
-		// Minimum execution time: 67_176_000 picoseconds.
-		Weight::from_parts(68_406_000, 0)
-			.saturating_add(Weight::from_parts(0, 69051))
-			.saturating_add(T::DbWeight::get().reads(3))
-			.saturating_add(T::DbWeight::get().writes(4))
-	}
-	/// Storage: MessageQueue BookStateFor (r:1 w:1)
-	/// Proof: MessageQueue BookStateFor (max_values: None, max_size: Some(55), added: 2530, mode: MaxEncodedLen)
-	/// Storage: MessageQueue Pages (r:1 w:1)
-	/// Proof: MessageQueue Pages (max_values: None, max_size: Some(65586), added: 68061, mode: MaxEncodedLen)
-	/// Storage: Configuration ActiveConfig (r:1 w:0)
-	/// Proof Skipped: Configuration ActiveConfig (max_values: Some(1), max_size: None, mode: Measured)
-	/// Storage: unknown `0x3a72656c61795f64697370617463685f71756575655f72656d61696e696e675f` (r:0 w:1)
-	/// Proof Skipped: unknown `0x3a72656c61795f64697370617463685f71756575655f72656d61696e696e675f` (r:0 w:1)
-	/// Storage: unknown `0xf5207f03cfdce586301014700e2c2593fad157e461d71fd4c1f936839a5f1f3e` (r:0 w:1)
-	/// Proof Skipped: unknown `0xf5207f03cfdce586301014700e2c2593fad157e461d71fd4c1f936839a5f1f3e` (r:0 w:1)
-	fn execute_overweight_page_removed() -> Weight {
-		// Proof Size summary in bytes:
-		//  Measured:  `66030`
-		//  Estimated: `69051`
-		// Minimum execution time: 83_156_000 picoseconds.
-		Weight::from_parts(85_134_000, 0)
-			.saturating_add(Weight::from_parts(0, 69051))
-			.saturating_add(T::DbWeight::get().reads(3))
-			.saturating_add(T::DbWeight::get().writes(4))
-	}
-	/// Storage: MessageQueue BookStateFor (r:1 w:1)
-	/// Proof: MessageQueue BookStateFor (max_values: None, max_size: Some(55), added: 2530, mode: MaxEncodedLen)
-	/// Storage: MessageQueue Pages (r:1 w:1)
-	/// Proof: MessageQueue Pages (max_values: None, max_size: Some(65586), added: 68061, mode: MaxEncodedLen)
-	/// Storage: Configuration ActiveConfig (r:1 w:0)
-	/// Proof Skipped: Configuration ActiveConfig (max_values: Some(1), max_size: None, mode: Measured)
-	/// Storage: unknown `0x3a72656c61795f64697370617463685f71756575655f72656d61696e696e675f` (r:0 w:1)
-	/// Proof Skipped: unknown `0x3a72656c61795f64697370617463685f71756575655f72656d61696e696e675f` (r:0 w:1)
-	/// Storage: unknown `0xf5207f03cfdce586301014700e2c2593fad157e461d71fd4c1f936839a5f1f3e` (r:0 w:1)
-	/// Proof Skipped: unknown `0xf5207f03cfdce586301014700e2c2593fad157e461d71fd4c1f936839a5f1f3e` (r:0 w:1)
-	fn execute_overweight_page_updated() -> Weight {
-		// Proof Size summary in bytes:
-		//  Measured:  `66030`
-		//  Estimated: `69051`
-		// Minimum execution time: 125_205_000 picoseconds.
-		Weight::from_parts(127_325_000, 0)
-			.saturating_add(Weight::from_parts(0, 69051))
-			.saturating_add(T::DbWeight::get().reads(3))
-			.saturating_add(T::DbWeight::get().writes(4))
-	}
-}
diff --git a/polkadot/runtime/polkadot/src/weights/pallet_multisig.rs b/polkadot/runtime/polkadot/src/weights/pallet_multisig.rs
deleted file mode 100644
index 70df8a78d4f11b6605994a095daaeb842f89d304..0000000000000000000000000000000000000000
--- a/polkadot/runtime/polkadot/src/weights/pallet_multisig.rs
+++ /dev/null
@@ -1,165 +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/>.
-
-//! Autogenerated weights for `pallet_multisig`
-//!
-//! THIS FILE WAS AUTO-GENERATED USING THE SUBSTRATE BENCHMARK CLI VERSION 4.0.0-dev
-//! DATE: 2023-06-18, STEPS: `50`, REPEAT: `20`, LOW RANGE: `[]`, HIGH RANGE: `[]`
-//! WORST CASE MAP SIZE: `1000000`
-//! HOSTNAME: `runner-e8ezs4ez-project-163-concurrent-0`, CPU: `Intel(R) Xeon(R) CPU @ 2.60GHz`
-//! EXECUTION: Some(Wasm), WASM-EXECUTION: Compiled, CHAIN: Some("polkadot-dev"), DB CACHE: 1024
-
-// Executed Command:
-// ./target/production/polkadot
-// benchmark
-// pallet
-// --chain=polkadot-dev
-// --steps=50
-// --repeat=20
-// --no-storage-info
-// --no-median-slopes
-// --no-min-squares
-// --pallet=pallet_multisig
-// --extrinsic=*
-// --execution=wasm
-// --wasm-execution=compiled
-// --header=./file_header.txt
-// --output=./runtime/polkadot/src/weights/
-
-#![cfg_attr(rustfmt, rustfmt_skip)]
-#![allow(unused_parens)]
-#![allow(unused_imports)]
-#![allow(missing_docs)]
-
-use frame_support::{traits::Get, weights::Weight};
-use core::marker::PhantomData;
-
-/// Weight functions for `pallet_multisig`.
-pub struct WeightInfo<T>(PhantomData<T>);
-impl<T: frame_system::Config> pallet_multisig::WeightInfo for WeightInfo<T> {
-	/// The range of component `z` is `[0, 10000]`.
-	fn as_multi_threshold_1(z: u32, ) -> Weight {
-		// Proof Size summary in bytes:
-		//  Measured:  `0`
-		//  Estimated: `0`
-		// Minimum execution time: 13_729_000 picoseconds.
-		Weight::from_parts(14_236_505, 0)
-			.saturating_add(Weight::from_parts(0, 0))
-			// Standard Error: 3
-			.saturating_add(Weight::from_parts(610, 0).saturating_mul(z.into()))
-	}
-	/// Storage: Multisig Multisigs (r:1 w:1)
-	/// Proof: Multisig Multisigs (max_values: None, max_size: Some(3346), added: 5821, mode: MaxEncodedLen)
-	/// The range of component `s` is `[2, 100]`.
-	/// The range of component `z` is `[0, 10000]`.
-	fn as_multi_create(s: u32, z: u32, ) -> Weight {
-		// Proof Size summary in bytes:
-		//  Measured:  `267 + s * (2 ±0)`
-		//  Estimated: `6811`
-		// Minimum execution time: 45_550_000 picoseconds.
-		Weight::from_parts(34_831_496, 0)
-			.saturating_add(Weight::from_parts(0, 6811))
-			// Standard Error: 772
-			.saturating_add(Weight::from_parts(120_012, 0).saturating_mul(s.into()))
-			// Standard Error: 7
-			.saturating_add(Weight::from_parts(1_567, 0).saturating_mul(z.into()))
-			.saturating_add(T::DbWeight::get().reads(1))
-			.saturating_add(T::DbWeight::get().writes(1))
-	}
-	/// Storage: Multisig Multisigs (r:1 w:1)
-	/// Proof: Multisig Multisigs (max_values: None, max_size: Some(3346), added: 5821, mode: MaxEncodedLen)
-	/// The range of component `s` is `[3, 100]`.
-	/// The range of component `z` is `[0, 10000]`.
-	fn as_multi_approve(s: u32, z: u32, ) -> Weight {
-		// Proof Size summary in bytes:
-		//  Measured:  `286`
-		//  Estimated: `6811`
-		// Minimum execution time: 29_794_000 picoseconds.
-		Weight::from_parts(20_091_975, 0)
-			.saturating_add(Weight::from_parts(0, 6811))
-			// Standard Error: 775
-			.saturating_add(Weight::from_parts(111_349, 0).saturating_mul(s.into()))
-			// Standard Error: 7
-			.saturating_add(Weight::from_parts(1_553, 0).saturating_mul(z.into()))
-			.saturating_add(T::DbWeight::get().reads(1))
-			.saturating_add(T::DbWeight::get().writes(1))
-	}
-	/// Storage: Multisig Multisigs (r:1 w:1)
-	/// Proof: Multisig Multisigs (max_values: None, max_size: Some(3346), added: 5821, mode: MaxEncodedLen)
-	/// Storage: System Account (r:1 w:1)
-	/// Proof: System Account (max_values: None, max_size: Some(128), added: 2603, mode: MaxEncodedLen)
-	/// The range of component `s` is `[2, 100]`.
-	/// The range of component `z` is `[0, 10000]`.
-	fn as_multi_complete(s: u32, z: u32, ) -> Weight {
-		// Proof Size summary in bytes:
-		//  Measured:  `392 + s * (33 ±0)`
-		//  Estimated: `6811`
-		// Minimum execution time: 51_181_000 picoseconds.
-		Weight::from_parts(38_235_268, 0)
-			.saturating_add(Weight::from_parts(0, 6811))
-			// Standard Error: 973
-			.saturating_add(Weight::from_parts(145_449, 0).saturating_mul(s.into()))
-			// Standard Error: 9
-			.saturating_add(Weight::from_parts(1_618, 0).saturating_mul(z.into()))
-			.saturating_add(T::DbWeight::get().reads(2))
-			.saturating_add(T::DbWeight::get().writes(2))
-	}
-	/// Storage: Multisig Multisigs (r:1 w:1)
-	/// Proof: Multisig Multisigs (max_values: None, max_size: Some(3346), added: 5821, mode: MaxEncodedLen)
-	/// The range of component `s` is `[2, 100]`.
-	fn approve_as_multi_create(s: u32, ) -> Weight {
-		// Proof Size summary in bytes:
-		//  Measured:  `267 + s * (2 ±0)`
-		//  Estimated: `6811`
-		// Minimum execution time: 33_278_000 picoseconds.
-		Weight::from_parts(33_697_154, 0)
-			.saturating_add(Weight::from_parts(0, 6811))
-			// Standard Error: 863
-			.saturating_add(Weight::from_parts(122_174, 0).saturating_mul(s.into()))
-			.saturating_add(T::DbWeight::get().reads(1))
-			.saturating_add(T::DbWeight::get().writes(1))
-	}
-	/// Storage: Multisig Multisigs (r:1 w:1)
-	/// Proof: Multisig Multisigs (max_values: None, max_size: Some(3346), added: 5821, mode: MaxEncodedLen)
-	/// The range of component `s` is `[2, 100]`.
-	fn approve_as_multi_approve(s: u32, ) -> Weight {
-		// Proof Size summary in bytes:
-		//  Measured:  `286`
-		//  Estimated: `6811`
-		// Minimum execution time: 18_541_000 picoseconds.
-		Weight::from_parts(19_007_991, 0)
-			.saturating_add(Weight::from_parts(0, 6811))
-			// Standard Error: 847
-			.saturating_add(Weight::from_parts(106_382, 0).saturating_mul(s.into()))
-			.saturating_add(T::DbWeight::get().reads(1))
-			.saturating_add(T::DbWeight::get().writes(1))
-	}
-	/// Storage: Multisig Multisigs (r:1 w:1)
-	/// Proof: Multisig Multisigs (max_values: None, max_size: Some(3346), added: 5821, mode: MaxEncodedLen)
-	/// The range of component `s` is `[2, 100]`.
-	fn cancel_as_multi(s: u32, ) -> Weight {
-		// Proof Size summary in bytes:
-		//  Measured:  `458 + s * (1 ±0)`
-		//  Estimated: `6811`
-		// Minimum execution time: 34_373_000 picoseconds.
-		Weight::from_parts(35_062_021, 0)
-			.saturating_add(Weight::from_parts(0, 6811))
-			// Standard Error: 770
-			.saturating_add(Weight::from_parts(113_576, 0).saturating_mul(s.into()))
-			.saturating_add(T::DbWeight::get().reads(1))
-			.saturating_add(T::DbWeight::get().writes(1))
-	}
-}
diff --git a/polkadot/runtime/polkadot/src/weights/pallet_nomination_pools.rs b/polkadot/runtime/polkadot/src/weights/pallet_nomination_pools.rs
deleted file mode 100644
index 7273389a08055be1d61a617b9e19b1d19f34a11d..0000000000000000000000000000000000000000
--- a/polkadot/runtime/polkadot/src/weights/pallet_nomination_pools.rs
+++ /dev/null
@@ -1,601 +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/>.
-
-//! Autogenerated weights for `pallet_nomination_pools`
-//!
-//! THIS FILE WAS AUTO-GENERATED USING THE SUBSTRATE BENCHMARK CLI VERSION 4.0.0-dev
-//! DATE: 2023-06-18, STEPS: `50`, REPEAT: `20`, LOW RANGE: `[]`, HIGH RANGE: `[]`
-//! WORST CASE MAP SIZE: `1000000`
-//! HOSTNAME: `runner-e8ezs4ez-project-163-concurrent-0`, CPU: `Intel(R) Xeon(R) CPU @ 2.60GHz`
-//! EXECUTION: Some(Wasm), WASM-EXECUTION: Compiled, CHAIN: Some("polkadot-dev"), DB CACHE: 1024
-
-// Executed Command:
-// ./target/production/polkadot
-// benchmark
-// pallet
-// --chain=polkadot-dev
-// --steps=50
-// --repeat=20
-// --no-storage-info
-// --no-median-slopes
-// --no-min-squares
-// --pallet=pallet_nomination_pools
-// --extrinsic=*
-// --execution=wasm
-// --wasm-execution=compiled
-// --header=./file_header.txt
-// --output=./runtime/polkadot/src/weights/
-
-#![cfg_attr(rustfmt, rustfmt_skip)]
-#![allow(unused_parens)]
-#![allow(unused_imports)]
-#![allow(missing_docs)]
-
-use frame_support::{traits::Get, weights::Weight};
-use core::marker::PhantomData;
-
-/// Weight functions for `pallet_nomination_pools`.
-pub struct WeightInfo<T>(PhantomData<T>);
-impl<T: frame_system::Config> pallet_nomination_pools::WeightInfo for WeightInfo<T> {
-	/// Storage: NominationPools MinJoinBond (r:1 w:0)
-	/// Proof: NominationPools MinJoinBond (max_values: Some(1), max_size: Some(16), added: 511, mode: MaxEncodedLen)
-	/// Storage: NominationPools PoolMembers (r:1 w:1)
-	/// Proof: NominationPools PoolMembers (max_values: None, max_size: Some(717), added: 3192, mode: MaxEncodedLen)
-	/// Storage: NominationPools BondedPools (r:1 w:1)
-	/// Proof: NominationPools BondedPools (max_values: None, max_size: Some(220), added: 2695, mode: MaxEncodedLen)
-	/// Storage: Staking Bonded (r:1 w:0)
-	/// Proof: Staking Bonded (max_values: None, max_size: Some(72), added: 2547, mode: MaxEncodedLen)
-	/// Storage: Staking Ledger (r:1 w:1)
-	/// Proof: Staking Ledger (max_values: None, max_size: Some(1091), added: 3566, mode: MaxEncodedLen)
-	/// Storage: NominationPools RewardPools (r:1 w:1)
-	/// Proof: NominationPools RewardPools (max_values: None, max_size: Some(92), added: 2567, mode: MaxEncodedLen)
-	/// Storage: NominationPools GlobalMaxCommission (r:1 w:0)
-	/// Proof: NominationPools GlobalMaxCommission (max_values: Some(1), max_size: Some(4), added: 499, mode: MaxEncodedLen)
-	/// Storage: System Account (r:2 w:1)
-	/// Proof: System Account (max_values: None, max_size: Some(128), added: 2603, mode: MaxEncodedLen)
-	/// Storage: NominationPools MaxPoolMembersPerPool (r:1 w:0)
-	/// Proof: NominationPools MaxPoolMembersPerPool (max_values: Some(1), max_size: Some(4), added: 499, mode: MaxEncodedLen)
-	/// Storage: NominationPools MaxPoolMembers (r:1 w:0)
-	/// Proof: NominationPools MaxPoolMembers (max_values: Some(1), max_size: Some(4), added: 499, mode: MaxEncodedLen)
-	/// Storage: NominationPools CounterForPoolMembers (r:1 w:1)
-	/// Proof: NominationPools CounterForPoolMembers (max_values: Some(1), max_size: Some(4), added: 499, mode: MaxEncodedLen)
-	/// Storage: Balances Locks (r:1 w:1)
-	/// Proof: Balances Locks (max_values: None, max_size: Some(1299), added: 3774, mode: MaxEncodedLen)
-	/// Storage: Balances Freezes (r:1 w:0)
-	/// Proof: Balances Freezes (max_values: None, max_size: Some(49), added: 2524, mode: MaxEncodedLen)
-	/// Storage: VoterList ListNodes (r:3 w:3)
-	/// Proof: VoterList ListNodes (max_values: None, max_size: Some(154), added: 2629, mode: MaxEncodedLen)
-	/// Storage: VoterList ListBags (r:2 w:2)
-	/// Proof: VoterList ListBags (max_values: None, max_size: Some(82), added: 2557, mode: MaxEncodedLen)
-	fn join() -> Weight {
-		// Proof Size summary in bytes:
-		//  Measured:  `3195`
-		//  Estimated: `8877`
-		// Minimum execution time: 191_933_000 picoseconds.
-		Weight::from_parts(199_790_000, 0)
-			.saturating_add(Weight::from_parts(0, 8877))
-			.saturating_add(T::DbWeight::get().reads(19))
-			.saturating_add(T::DbWeight::get().writes(12))
-	}
-	/// Storage: NominationPools PoolMembers (r:1 w:1)
-	/// Proof: NominationPools PoolMembers (max_values: None, max_size: Some(717), added: 3192, mode: MaxEncodedLen)
-	/// Storage: NominationPools BondedPools (r:1 w:1)
-	/// Proof: NominationPools BondedPools (max_values: None, max_size: Some(220), added: 2695, mode: MaxEncodedLen)
-	/// Storage: NominationPools RewardPools (r:1 w:1)
-	/// Proof: NominationPools RewardPools (max_values: None, max_size: Some(92), added: 2567, mode: MaxEncodedLen)
-	/// Storage: NominationPools GlobalMaxCommission (r:1 w:0)
-	/// Proof: NominationPools GlobalMaxCommission (max_values: Some(1), max_size: Some(4), added: 499, mode: MaxEncodedLen)
-	/// Storage: System Account (r:3 w:2)
-	/// Proof: System Account (max_values: None, max_size: Some(128), added: 2603, mode: MaxEncodedLen)
-	/// Storage: Staking Bonded (r:1 w:0)
-	/// Proof: Staking Bonded (max_values: None, max_size: Some(72), added: 2547, mode: MaxEncodedLen)
-	/// Storage: Staking Ledger (r:1 w:1)
-	/// Proof: Staking Ledger (max_values: None, max_size: Some(1091), added: 3566, mode: MaxEncodedLen)
-	/// Storage: Balances Locks (r:1 w:1)
-	/// Proof: Balances Locks (max_values: None, max_size: Some(1299), added: 3774, mode: MaxEncodedLen)
-	/// Storage: Balances Freezes (r:1 w:0)
-	/// Proof: Balances Freezes (max_values: None, max_size: Some(49), added: 2524, mode: MaxEncodedLen)
-	/// Storage: VoterList ListNodes (r:3 w:3)
-	/// Proof: VoterList ListNodes (max_values: None, max_size: Some(154), added: 2629, mode: MaxEncodedLen)
-	/// Storage: VoterList ListBags (r:2 w:2)
-	/// Proof: VoterList ListBags (max_values: None, max_size: Some(82), added: 2557, mode: MaxEncodedLen)
-	fn bond_extra_transfer() -> Weight {
-		// Proof Size summary in bytes:
-		//  Measured:  `3205`
-		//  Estimated: `8877`
-		// Minimum execution time: 189_630_000 picoseconds.
-		Weight::from_parts(195_241_000, 0)
-			.saturating_add(Weight::from_parts(0, 8877))
-			.saturating_add(T::DbWeight::get().reads(16))
-			.saturating_add(T::DbWeight::get().writes(12))
-	}
-	/// Storage: NominationPools ClaimPermissions (r:1 w:0)
-	/// Proof: NominationPools ClaimPermissions (max_values: None, max_size: Some(41), added: 2516, mode: MaxEncodedLen)
-	/// Storage: NominationPools PoolMembers (r:1 w:1)
-	/// Proof: NominationPools PoolMembers (max_values: None, max_size: Some(717), added: 3192, mode: MaxEncodedLen)
-	/// Storage: NominationPools BondedPools (r:1 w:1)
-	/// Proof: NominationPools BondedPools (max_values: None, max_size: Some(220), added: 2695, mode: MaxEncodedLen)
-	/// Storage: NominationPools RewardPools (r:1 w:1)
-	/// Proof: NominationPools RewardPools (max_values: None, max_size: Some(92), added: 2567, mode: MaxEncodedLen)
-	/// Storage: NominationPools GlobalMaxCommission (r:1 w:0)
-	/// Proof: NominationPools GlobalMaxCommission (max_values: Some(1), max_size: Some(4), added: 499, mode: MaxEncodedLen)
-	/// Storage: System Account (r:3 w:3)
-	/// Proof: System Account (max_values: None, max_size: Some(128), added: 2603, mode: MaxEncodedLen)
-	/// Storage: Staking Bonded (r:1 w:0)
-	/// Proof: Staking Bonded (max_values: None, max_size: Some(72), added: 2547, mode: MaxEncodedLen)
-	/// Storage: Staking Ledger (r:1 w:1)
-	/// Proof: Staking Ledger (max_values: None, max_size: Some(1091), added: 3566, mode: MaxEncodedLen)
-	/// Storage: Balances Locks (r:1 w:1)
-	/// Proof: Balances Locks (max_values: None, max_size: Some(1299), added: 3774, mode: MaxEncodedLen)
-	/// Storage: Balances Freezes (r:1 w:0)
-	/// Proof: Balances Freezes (max_values: None, max_size: Some(49), added: 2524, mode: MaxEncodedLen)
-	/// Storage: VoterList ListNodes (r:2 w:2)
-	/// Proof: VoterList ListNodes (max_values: None, max_size: Some(154), added: 2629, mode: MaxEncodedLen)
-	/// Storage: VoterList ListBags (r:2 w:2)
-	/// Proof: VoterList ListBags (max_values: None, max_size: Some(82), added: 2557, mode: MaxEncodedLen)
-	fn bond_extra_other() -> Weight {
-		// Proof Size summary in bytes:
-		//  Measured:  `3152`
-		//  Estimated: `8799`
-		// Minimum execution time: 220_371_000 picoseconds.
-		Weight::from_parts(224_963_000, 0)
-			.saturating_add(Weight::from_parts(0, 8799))
-			.saturating_add(T::DbWeight::get().reads(16))
-			.saturating_add(T::DbWeight::get().writes(12))
-	}
-	/// Storage: NominationPools ClaimPermissions (r:1 w:0)
-	/// Proof: NominationPools ClaimPermissions (max_values: None, max_size: Some(41), added: 2516, mode: MaxEncodedLen)
-	/// Storage: NominationPools PoolMembers (r:1 w:1)
-	/// Proof: NominationPools PoolMembers (max_values: None, max_size: Some(717), added: 3192, mode: MaxEncodedLen)
-	/// Storage: NominationPools BondedPools (r:1 w:1)
-	/// Proof: NominationPools BondedPools (max_values: None, max_size: Some(220), added: 2695, mode: MaxEncodedLen)
-	/// Storage: NominationPools RewardPools (r:1 w:1)
-	/// Proof: NominationPools RewardPools (max_values: None, max_size: Some(92), added: 2567, mode: MaxEncodedLen)
-	/// Storage: NominationPools GlobalMaxCommission (r:1 w:0)
-	/// Proof: NominationPools GlobalMaxCommission (max_values: Some(1), max_size: Some(4), added: 499, mode: MaxEncodedLen)
-	/// Storage: System Account (r:1 w:1)
-	/// Proof: System Account (max_values: None, max_size: Some(128), added: 2603, mode: MaxEncodedLen)
-	fn claim_payout() -> Weight {
-		// Proof Size summary in bytes:
-		//  Measured:  `1137`
-		//  Estimated: `4182`
-		// Minimum execution time: 81_050_000 picoseconds.
-		Weight::from_parts(82_523_000, 0)
-			.saturating_add(Weight::from_parts(0, 4182))
-			.saturating_add(T::DbWeight::get().reads(6))
-			.saturating_add(T::DbWeight::get().writes(4))
-	}
-	/// Storage: NominationPools PoolMembers (r:1 w:1)
-	/// Proof: NominationPools PoolMembers (max_values: None, max_size: Some(717), added: 3192, mode: MaxEncodedLen)
-	/// Storage: NominationPools BondedPools (r:1 w:1)
-	/// Proof: NominationPools BondedPools (max_values: None, max_size: Some(220), added: 2695, mode: MaxEncodedLen)
-	/// Storage: NominationPools RewardPools (r:1 w:1)
-	/// Proof: NominationPools RewardPools (max_values: None, max_size: Some(92), added: 2567, mode: MaxEncodedLen)
-	/// Storage: Staking Bonded (r:1 w:0)
-	/// Proof: Staking Bonded (max_values: None, max_size: Some(72), added: 2547, mode: MaxEncodedLen)
-	/// Storage: Staking Ledger (r:1 w:1)
-	/// Proof: Staking Ledger (max_values: None, max_size: Some(1091), added: 3566, mode: MaxEncodedLen)
-	/// Storage: NominationPools GlobalMaxCommission (r:1 w:0)
-	/// Proof: NominationPools GlobalMaxCommission (max_values: Some(1), max_size: Some(4), added: 499, mode: MaxEncodedLen)
-	/// Storage: System Account (r:2 w:1)
-	/// Proof: System Account (max_values: None, max_size: Some(128), added: 2603, mode: MaxEncodedLen)
-	/// Storage: Staking CurrentEra (r:1 w:0)
-	/// Proof: Staking CurrentEra (max_values: Some(1), max_size: Some(4), added: 499, mode: MaxEncodedLen)
-	/// Storage: Staking Nominators (r:1 w:0)
-	/// Proof: Staking Nominators (max_values: None, max_size: Some(558), added: 3033, mode: MaxEncodedLen)
-	/// Storage: Staking MinNominatorBond (r:1 w:0)
-	/// Proof: Staking MinNominatorBond (max_values: Some(1), max_size: Some(16), added: 511, mode: MaxEncodedLen)
-	/// Storage: Balances Locks (r:1 w:1)
-	/// Proof: Balances Locks (max_values: None, max_size: Some(1299), added: 3774, mode: MaxEncodedLen)
-	/// Storage: Balances Freezes (r:1 w:0)
-	/// Proof: Balances Freezes (max_values: None, max_size: Some(49), added: 2524, mode: MaxEncodedLen)
-	/// Storage: VoterList ListNodes (r:3 w:3)
-	/// Proof: VoterList ListNodes (max_values: None, max_size: Some(154), added: 2629, mode: MaxEncodedLen)
-	/// Storage: VoterList ListBags (r:2 w:2)
-	/// Proof: VoterList ListBags (max_values: None, max_size: Some(82), added: 2557, mode: MaxEncodedLen)
-	/// Storage: NominationPools SubPoolsStorage (r:1 w:1)
-	/// Proof: NominationPools SubPoolsStorage (max_values: None, max_size: Some(1197), added: 3672, mode: MaxEncodedLen)
-	/// Storage: NominationPools CounterForSubPoolsStorage (r:1 w:1)
-	/// Proof: NominationPools CounterForSubPoolsStorage (max_values: Some(1), max_size: Some(4), added: 499, mode: MaxEncodedLen)
-	fn unbond() -> Weight {
-		// Proof Size summary in bytes:
-		//  Measured:  `3475`
-		//  Estimated: `8877`
-		// Minimum execution time: 174_402_000 picoseconds.
-		Weight::from_parts(180_701_000, 0)
-			.saturating_add(Weight::from_parts(0, 8877))
-			.saturating_add(T::DbWeight::get().reads(20))
-			.saturating_add(T::DbWeight::get().writes(13))
-	}
-	/// Storage: NominationPools BondedPools (r:1 w:0)
-	/// Proof: NominationPools BondedPools (max_values: None, max_size: Some(220), added: 2695, mode: MaxEncodedLen)
-	/// Storage: Staking Bonded (r:1 w:0)
-	/// Proof: Staking Bonded (max_values: None, max_size: Some(72), added: 2547, mode: MaxEncodedLen)
-	/// Storage: Staking Ledger (r:1 w:1)
-	/// Proof: Staking Ledger (max_values: None, max_size: Some(1091), added: 3566, mode: MaxEncodedLen)
-	/// Storage: Staking CurrentEra (r:1 w:0)
-	/// Proof: Staking CurrentEra (max_values: Some(1), max_size: Some(4), added: 499, mode: MaxEncodedLen)
-	/// Storage: Balances Locks (r:1 w:1)
-	/// Proof: Balances Locks (max_values: None, max_size: Some(1299), added: 3774, mode: MaxEncodedLen)
-	/// Storage: Balances Freezes (r:1 w:0)
-	/// Proof: Balances Freezes (max_values: None, max_size: Some(49), added: 2524, mode: MaxEncodedLen)
-	/// The range of component `s` is `[0, 100]`.
-	fn pool_withdraw_unbonded(s: u32, ) -> Weight {
-		// Proof Size summary in bytes:
-		//  Measured:  `1580`
-		//  Estimated: `4764`
-		// Minimum execution time: 63_246_000 picoseconds.
-		Weight::from_parts(65_760_934, 0)
-			.saturating_add(Weight::from_parts(0, 4764))
-			// Standard Error: 1_105
-			.saturating_add(Weight::from_parts(61_621, 0).saturating_mul(s.into()))
-			.saturating_add(T::DbWeight::get().reads(6))
-			.saturating_add(T::DbWeight::get().writes(2))
-	}
-	/// Storage: NominationPools PoolMembers (r:1 w:1)
-	/// Proof: NominationPools PoolMembers (max_values: None, max_size: Some(717), added: 3192, mode: MaxEncodedLen)
-	/// Storage: Staking CurrentEra (r:1 w:0)
-	/// Proof: Staking CurrentEra (max_values: Some(1), max_size: Some(4), added: 499, mode: MaxEncodedLen)
-	/// Storage: NominationPools BondedPools (r:1 w:1)
-	/// Proof: NominationPools BondedPools (max_values: None, max_size: Some(220), added: 2695, mode: MaxEncodedLen)
-	/// Storage: NominationPools SubPoolsStorage (r:1 w:1)
-	/// Proof: NominationPools SubPoolsStorage (max_values: None, max_size: Some(1197), added: 3672, mode: MaxEncodedLen)
-	/// Storage: Staking Bonded (r:1 w:0)
-	/// Proof: Staking Bonded (max_values: None, max_size: Some(72), added: 2547, mode: MaxEncodedLen)
-	/// Storage: Staking Ledger (r:1 w:1)
-	/// Proof: Staking Ledger (max_values: None, max_size: Some(1091), added: 3566, mode: MaxEncodedLen)
-	/// Storage: Balances Locks (r:1 w:1)
-	/// Proof: Balances Locks (max_values: None, max_size: Some(1299), added: 3774, mode: MaxEncodedLen)
-	/// Storage: Balances Freezes (r:1 w:0)
-	/// Proof: Balances Freezes (max_values: None, max_size: Some(49), added: 2524, mode: MaxEncodedLen)
-	/// Storage: System Account (r:1 w:1)
-	/// Proof: System Account (max_values: None, max_size: Some(128), added: 2603, mode: MaxEncodedLen)
-	/// Storage: NominationPools CounterForPoolMembers (r:1 w:1)
-	/// Proof: NominationPools CounterForPoolMembers (max_values: Some(1), max_size: Some(4), added: 499, mode: MaxEncodedLen)
-	/// Storage: NominationPools ClaimPermissions (r:0 w:1)
-	/// Proof: NominationPools ClaimPermissions (max_values: None, max_size: Some(41), added: 2516, mode: MaxEncodedLen)
-	/// The range of component `s` is `[0, 100]`.
-	fn withdraw_unbonded_update(s: u32, ) -> Weight {
-		// Proof Size summary in bytes:
-		//  Measured:  `2008`
-		//  Estimated: `4764`
-		// Minimum execution time: 133_264_000 picoseconds.
-		Weight::from_parts(137_557_538, 0)
-			.saturating_add(Weight::from_parts(0, 4764))
-			// Standard Error: 2_409
-			.saturating_add(Weight::from_parts(71_667, 0).saturating_mul(s.into()))
-			.saturating_add(T::DbWeight::get().reads(10))
-			.saturating_add(T::DbWeight::get().writes(8))
-	}
-	/// Storage: NominationPools PoolMembers (r:1 w:1)
-	/// Proof: NominationPools PoolMembers (max_values: None, max_size: Some(717), added: 3192, mode: MaxEncodedLen)
-	/// Storage: Staking CurrentEra (r:1 w:0)
-	/// Proof: Staking CurrentEra (max_values: Some(1), max_size: Some(4), added: 499, mode: MaxEncodedLen)
-	/// Storage: NominationPools BondedPools (r:1 w:1)
-	/// Proof: NominationPools BondedPools (max_values: None, max_size: Some(220), added: 2695, mode: MaxEncodedLen)
-	/// Storage: NominationPools SubPoolsStorage (r:1 w:1)
-	/// Proof: NominationPools SubPoolsStorage (max_values: None, max_size: Some(1197), added: 3672, mode: MaxEncodedLen)
-	/// Storage: Staking Bonded (r:1 w:1)
-	/// Proof: Staking Bonded (max_values: None, max_size: Some(72), added: 2547, mode: MaxEncodedLen)
-	/// Storage: Staking Ledger (r:1 w:1)
-	/// Proof: Staking Ledger (max_values: None, max_size: Some(1091), added: 3566, mode: MaxEncodedLen)
-	/// Storage: Staking SlashingSpans (r:1 w:0)
-	/// Proof Skipped: Staking SlashingSpans (max_values: None, max_size: None, mode: Measured)
-	/// Storage: Staking Validators (r:1 w:0)
-	/// Proof: Staking Validators (max_values: None, max_size: Some(45), added: 2520, mode: MaxEncodedLen)
-	/// Storage: Staking Nominators (r:1 w:0)
-	/// Proof: Staking Nominators (max_values: None, max_size: Some(558), added: 3033, mode: MaxEncodedLen)
-	/// Storage: System Account (r:2 w:2)
-	/// Proof: System Account (max_values: None, max_size: Some(128), added: 2603, mode: MaxEncodedLen)
-	/// Storage: Balances Locks (r:1 w:1)
-	/// Proof: Balances Locks (max_values: None, max_size: Some(1299), added: 3774, mode: MaxEncodedLen)
-	/// Storage: Balances Freezes (r:1 w:0)
-	/// Proof: Balances Freezes (max_values: None, max_size: Some(49), added: 2524, mode: MaxEncodedLen)
-	/// Storage: NominationPools CounterForPoolMembers (r:1 w:1)
-	/// Proof: NominationPools CounterForPoolMembers (max_values: Some(1), max_size: Some(4), added: 499, mode: MaxEncodedLen)
-	/// Storage: NominationPools ReversePoolIdLookup (r:1 w:1)
-	/// Proof: NominationPools ReversePoolIdLookup (max_values: None, max_size: Some(44), added: 2519, mode: MaxEncodedLen)
-	/// Storage: NominationPools CounterForReversePoolIdLookup (r:1 w:1)
-	/// Proof: NominationPools CounterForReversePoolIdLookup (max_values: Some(1), max_size: Some(4), added: 499, mode: MaxEncodedLen)
-	/// Storage: NominationPools RewardPools (r:1 w:1)
-	/// Proof: NominationPools RewardPools (max_values: None, max_size: Some(92), added: 2567, mode: MaxEncodedLen)
-	/// Storage: NominationPools CounterForRewardPools (r:1 w:1)
-	/// Proof: NominationPools CounterForRewardPools (max_values: Some(1), max_size: Some(4), added: 499, mode: MaxEncodedLen)
-	/// Storage: NominationPools CounterForSubPoolsStorage (r:1 w:1)
-	/// Proof: NominationPools CounterForSubPoolsStorage (max_values: Some(1), max_size: Some(4), added: 499, mode: MaxEncodedLen)
-	/// Storage: NominationPools Metadata (r:1 w:1)
-	/// Proof: NominationPools Metadata (max_values: None, max_size: Some(270), added: 2745, mode: MaxEncodedLen)
-	/// Storage: NominationPools CounterForBondedPools (r:1 w:1)
-	/// Proof: NominationPools CounterForBondedPools (max_values: Some(1), max_size: Some(4), added: 499, mode: MaxEncodedLen)
-	/// Storage: Staking Payee (r:0 w:1)
-	/// Proof: Staking Payee (max_values: None, max_size: Some(73), added: 2548, mode: MaxEncodedLen)
-	/// Storage: NominationPools ClaimPermissions (r:0 w:1)
-	/// Proof: NominationPools ClaimPermissions (max_values: None, max_size: Some(41), added: 2516, mode: MaxEncodedLen)
-	/// The range of component `s` is `[0, 100]`.
-	fn withdraw_unbonded_kill(_s: u32, ) -> Weight {
-		// Proof Size summary in bytes:
-		//  Measured:  `2364`
-		//  Estimated: `6196`
-		// Minimum execution time: 223_680_000 picoseconds.
-		Weight::from_parts(232_248_103, 0)
-			.saturating_add(Weight::from_parts(0, 6196))
-			.saturating_add(T::DbWeight::get().reads(21))
-			.saturating_add(T::DbWeight::get().writes(18))
-	}
-	/// Storage: NominationPools LastPoolId (r:1 w:1)
-	/// Proof: NominationPools LastPoolId (max_values: Some(1), max_size: Some(4), added: 499, mode: MaxEncodedLen)
-	/// Storage: Staking MinNominatorBond (r:1 w:0)
-	/// Proof: Staking MinNominatorBond (max_values: Some(1), max_size: Some(16), added: 511, mode: MaxEncodedLen)
-	/// Storage: NominationPools MinCreateBond (r:1 w:0)
-	/// Proof: NominationPools MinCreateBond (max_values: Some(1), max_size: Some(16), added: 511, mode: MaxEncodedLen)
-	/// Storage: NominationPools MinJoinBond (r:1 w:0)
-	/// Proof: NominationPools MinJoinBond (max_values: Some(1), max_size: Some(16), added: 511, mode: MaxEncodedLen)
-	/// Storage: NominationPools MaxPools (r:1 w:0)
-	/// Proof: NominationPools MaxPools (max_values: Some(1), max_size: Some(4), added: 499, mode: MaxEncodedLen)
-	/// Storage: NominationPools CounterForBondedPools (r:1 w:1)
-	/// Proof: NominationPools CounterForBondedPools (max_values: Some(1), max_size: Some(4), added: 499, mode: MaxEncodedLen)
-	/// Storage: NominationPools PoolMembers (r:1 w:1)
-	/// Proof: NominationPools PoolMembers (max_values: None, max_size: Some(717), added: 3192, mode: MaxEncodedLen)
-	/// Storage: NominationPools MaxPoolMembersPerPool (r:1 w:0)
-	/// Proof: NominationPools MaxPoolMembersPerPool (max_values: Some(1), max_size: Some(4), added: 499, mode: MaxEncodedLen)
-	/// Storage: NominationPools MaxPoolMembers (r:1 w:0)
-	/// Proof: NominationPools MaxPoolMembers (max_values: Some(1), max_size: Some(4), added: 499, mode: MaxEncodedLen)
-	/// Storage: NominationPools CounterForPoolMembers (r:1 w:1)
-	/// Proof: NominationPools CounterForPoolMembers (max_values: Some(1), max_size: Some(4), added: 499, mode: MaxEncodedLen)
-	/// Storage: System Account (r:2 w:2)
-	/// Proof: System Account (max_values: None, max_size: Some(128), added: 2603, mode: MaxEncodedLen)
-	/// Storage: Staking Bonded (r:1 w:1)
-	/// Proof: Staking Bonded (max_values: None, max_size: Some(72), added: 2547, mode: MaxEncodedLen)
-	/// Storage: Staking Ledger (r:1 w:1)
-	/// Proof: Staking Ledger (max_values: None, max_size: Some(1091), added: 3566, mode: MaxEncodedLen)
-	/// Storage: Staking CurrentEra (r:1 w:0)
-	/// Proof: Staking CurrentEra (max_values: Some(1), max_size: Some(4), added: 499, mode: MaxEncodedLen)
-	/// Storage: Balances Locks (r:1 w:1)
-	/// Proof: Balances Locks (max_values: None, max_size: Some(1299), added: 3774, mode: MaxEncodedLen)
-	/// Storage: Balances Freezes (r:1 w:0)
-	/// Proof: Balances Freezes (max_values: None, max_size: Some(49), added: 2524, mode: MaxEncodedLen)
-	/// Storage: NominationPools RewardPools (r:1 w:1)
-	/// Proof: NominationPools RewardPools (max_values: None, max_size: Some(92), added: 2567, mode: MaxEncodedLen)
-	/// Storage: NominationPools CounterForRewardPools (r:1 w:1)
-	/// Proof: NominationPools CounterForRewardPools (max_values: Some(1), max_size: Some(4), added: 499, mode: MaxEncodedLen)
-	/// Storage: NominationPools ReversePoolIdLookup (r:1 w:1)
-	/// Proof: NominationPools ReversePoolIdLookup (max_values: None, max_size: Some(44), added: 2519, mode: MaxEncodedLen)
-	/// Storage: NominationPools CounterForReversePoolIdLookup (r:1 w:1)
-	/// Proof: NominationPools CounterForReversePoolIdLookup (max_values: Some(1), max_size: Some(4), added: 499, mode: MaxEncodedLen)
-	/// Storage: NominationPools BondedPools (r:1 w:1)
-	/// Proof: NominationPools BondedPools (max_values: None, max_size: Some(220), added: 2695, mode: MaxEncodedLen)
-	/// Storage: Staking Payee (r:0 w:1)
-	/// Proof: Staking Payee (max_values: None, max_size: Some(73), added: 2548, mode: MaxEncodedLen)
-	fn create() -> Weight {
-		// Proof Size summary in bytes:
-		//  Measured:  `1188`
-		//  Estimated: `6196`
-		// Minimum execution time: 195_007_000 picoseconds.
-		Weight::from_parts(199_781_000, 0)
-			.saturating_add(Weight::from_parts(0, 6196))
-			.saturating_add(T::DbWeight::get().reads(22))
-			.saturating_add(T::DbWeight::get().writes(15))
-	}
-	/// Storage: NominationPools BondedPools (r:1 w:0)
-	/// Proof: NominationPools BondedPools (max_values: None, max_size: Some(220), added: 2695, mode: MaxEncodedLen)
-	/// Storage: Staking Bonded (r:1 w:0)
-	/// Proof: Staking Bonded (max_values: None, max_size: Some(72), added: 2547, mode: MaxEncodedLen)
-	/// Storage: Staking Ledger (r:1 w:0)
-	/// Proof: Staking Ledger (max_values: None, max_size: Some(1091), added: 3566, mode: MaxEncodedLen)
-	/// Storage: Staking MinNominatorBond (r:1 w:0)
-	/// Proof: Staking MinNominatorBond (max_values: Some(1), max_size: Some(16), added: 511, mode: MaxEncodedLen)
-	/// Storage: Staking Nominators (r:1 w:1)
-	/// Proof: Staking Nominators (max_values: None, max_size: Some(558), added: 3033, mode: MaxEncodedLen)
-	/// Storage: Staking MaxNominatorsCount (r:1 w:0)
-	/// Proof: Staking MaxNominatorsCount (max_values: Some(1), max_size: Some(4), added: 499, mode: MaxEncodedLen)
-	/// Storage: Staking Validators (r:17 w:0)
-	/// Proof: Staking Validators (max_values: None, max_size: Some(45), added: 2520, mode: MaxEncodedLen)
-	/// Storage: Staking CurrentEra (r:1 w:0)
-	/// Proof: Staking CurrentEra (max_values: Some(1), max_size: Some(4), added: 499, mode: MaxEncodedLen)
-	/// Storage: VoterList ListNodes (r:1 w:1)
-	/// Proof: VoterList ListNodes (max_values: None, max_size: Some(154), added: 2629, mode: MaxEncodedLen)
-	/// Storage: VoterList ListBags (r:1 w:1)
-	/// Proof: VoterList ListBags (max_values: None, max_size: Some(82), added: 2557, mode: MaxEncodedLen)
-	/// Storage: VoterList CounterForListNodes (r:1 w:1)
-	/// Proof: VoterList CounterForListNodes (max_values: Some(1), max_size: Some(4), added: 499, mode: MaxEncodedLen)
-	/// Storage: Staking CounterForNominators (r:1 w:1)
-	/// Proof: Staking CounterForNominators (max_values: Some(1), max_size: Some(4), added: 499, mode: MaxEncodedLen)
-	/// The range of component `n` is `[1, 16]`.
-	fn nominate(n: u32, ) -> Weight {
-		// Proof Size summary in bytes:
-		//  Measured:  `1745`
-		//  Estimated: `4556 + n * (2520 ±0)`
-		// Minimum execution time: 68_155_000 picoseconds.
-		Weight::from_parts(68_982_265, 0)
-			.saturating_add(Weight::from_parts(0, 4556))
-			// Standard Error: 9_798
-			.saturating_add(Weight::from_parts(1_483_835, 0).saturating_mul(n.into()))
-			.saturating_add(T::DbWeight::get().reads(12))
-			.saturating_add(T::DbWeight::get().reads((1_u64).saturating_mul(n.into())))
-			.saturating_add(T::DbWeight::get().writes(5))
-			.saturating_add(Weight::from_parts(0, 2520).saturating_mul(n.into()))
-	}
-	/// Storage: NominationPools BondedPools (r:1 w:1)
-	/// Proof: NominationPools BondedPools (max_values: None, max_size: Some(220), added: 2695, mode: MaxEncodedLen)
-	/// Storage: Staking Bonded (r:1 w:0)
-	/// Proof: Staking Bonded (max_values: None, max_size: Some(72), added: 2547, mode: MaxEncodedLen)
-	/// Storage: Staking Ledger (r:1 w:0)
-	/// Proof: Staking Ledger (max_values: None, max_size: Some(1091), added: 3566, mode: MaxEncodedLen)
-	fn set_state() -> Weight {
-		// Proof Size summary in bytes:
-		//  Measured:  `1333`
-		//  Estimated: `4556`
-		// Minimum execution time: 34_246_000 picoseconds.
-		Weight::from_parts(35_523_000, 0)
-			.saturating_add(Weight::from_parts(0, 4556))
-			.saturating_add(T::DbWeight::get().reads(3))
-			.saturating_add(T::DbWeight::get().writes(1))
-	}
-	/// Storage: NominationPools BondedPools (r:1 w:0)
-	/// Proof: NominationPools BondedPools (max_values: None, max_size: Some(220), added: 2695, mode: MaxEncodedLen)
-	/// Storage: NominationPools Metadata (r:1 w:1)
-	/// Proof: NominationPools Metadata (max_values: None, max_size: Some(270), added: 2745, mode: MaxEncodedLen)
-	/// Storage: NominationPools CounterForMetadata (r:1 w:1)
-	/// Proof: NominationPools CounterForMetadata (max_values: Some(1), max_size: Some(4), added: 499, mode: MaxEncodedLen)
-	/// The range of component `n` is `[1, 256]`.
-	fn set_metadata(n: u32, ) -> Weight {
-		// Proof Size summary in bytes:
-		//  Measured:  `497`
-		//  Estimated: `3735`
-		// Minimum execution time: 14_742_000 picoseconds.
-		Weight::from_parts(15_414_886, 0)
-			.saturating_add(Weight::from_parts(0, 3735))
-			// Standard Error: 140
-			.saturating_add(Weight::from_parts(1_641, 0).saturating_mul(n.into()))
-			.saturating_add(T::DbWeight::get().reads(3))
-			.saturating_add(T::DbWeight::get().writes(2))
-	}
-	/// Storage: NominationPools MinJoinBond (r:0 w:1)
-	/// Proof: NominationPools MinJoinBond (max_values: Some(1), max_size: Some(16), added: 511, mode: MaxEncodedLen)
-	/// Storage: NominationPools MaxPoolMembers (r:0 w:1)
-	/// Proof: NominationPools MaxPoolMembers (max_values: Some(1), max_size: Some(4), added: 499, mode: MaxEncodedLen)
-	/// Storage: NominationPools MaxPoolMembersPerPool (r:0 w:1)
-	/// Proof: NominationPools MaxPoolMembersPerPool (max_values: Some(1), max_size: Some(4), added: 499, mode: MaxEncodedLen)
-	/// Storage: NominationPools MinCreateBond (r:0 w:1)
-	/// Proof: NominationPools MinCreateBond (max_values: Some(1), max_size: Some(16), added: 511, mode: MaxEncodedLen)
-	/// Storage: NominationPools GlobalMaxCommission (r:0 w:1)
-	/// Proof: NominationPools GlobalMaxCommission (max_values: Some(1), max_size: Some(4), added: 499, mode: MaxEncodedLen)
-	/// Storage: NominationPools MaxPools (r:0 w:1)
-	/// Proof: NominationPools MaxPools (max_values: Some(1), max_size: Some(4), added: 499, mode: MaxEncodedLen)
-	fn set_configs() -> Weight {
-		// Proof Size summary in bytes:
-		//  Measured:  `0`
-		//  Estimated: `0`
-		// Minimum execution time: 6_186_000 picoseconds.
-		Weight::from_parts(6_325_000, 0)
-			.saturating_add(Weight::from_parts(0, 0))
-			.saturating_add(T::DbWeight::get().writes(6))
-	}
-	/// Storage: NominationPools BondedPools (r:1 w:1)
-	/// Proof: NominationPools BondedPools (max_values: None, max_size: Some(220), added: 2695, mode: MaxEncodedLen)
-	fn update_roles() -> Weight {
-		// Proof Size summary in bytes:
-		//  Measured:  `497`
-		//  Estimated: `3685`
-		// Minimum execution time: 20_194_000 picoseconds.
-		Weight::from_parts(21_006_000, 0)
-			.saturating_add(Weight::from_parts(0, 3685))
-			.saturating_add(T::DbWeight::get().reads(1))
-			.saturating_add(T::DbWeight::get().writes(1))
-	}
-	/// Storage: NominationPools BondedPools (r:1 w:0)
-	/// Proof: NominationPools BondedPools (max_values: None, max_size: Some(220), added: 2695, mode: MaxEncodedLen)
-	/// Storage: Staking Bonded (r:1 w:0)
-	/// Proof: Staking Bonded (max_values: None, max_size: Some(72), added: 2547, mode: MaxEncodedLen)
-	/// Storage: Staking Ledger (r:1 w:0)
-	/// Proof: Staking Ledger (max_values: None, max_size: Some(1091), added: 3566, mode: MaxEncodedLen)
-	/// Storage: Staking Validators (r:1 w:0)
-	/// Proof: Staking Validators (max_values: None, max_size: Some(45), added: 2520, mode: MaxEncodedLen)
-	/// Storage: Staking Nominators (r:1 w:1)
-	/// Proof: Staking Nominators (max_values: None, max_size: Some(558), added: 3033, mode: MaxEncodedLen)
-	/// Storage: Staking CounterForNominators (r:1 w:1)
-	/// Proof: Staking CounterForNominators (max_values: Some(1), max_size: Some(4), added: 499, mode: MaxEncodedLen)
-	/// Storage: VoterList ListNodes (r:1 w:1)
-	/// Proof: VoterList ListNodes (max_values: None, max_size: Some(154), added: 2629, mode: MaxEncodedLen)
-	/// Storage: VoterList ListBags (r:1 w:1)
-	/// Proof: VoterList ListBags (max_values: None, max_size: Some(82), added: 2557, mode: MaxEncodedLen)
-	/// Storage: VoterList CounterForListNodes (r:1 w:1)
-	/// Proof: VoterList CounterForListNodes (max_values: Some(1), max_size: Some(4), added: 499, mode: MaxEncodedLen)
-	fn chill() -> Weight {
-		// Proof Size summary in bytes:
-		//  Measured:  `1908`
-		//  Estimated: `4556`
-		// Minimum execution time: 66_180_000 picoseconds.
-		Weight::from_parts(68_446_000, 0)
-			.saturating_add(Weight::from_parts(0, 4556))
-			.saturating_add(T::DbWeight::get().reads(9))
-			.saturating_add(T::DbWeight::get().writes(5))
-	}
-	/// Storage: NominationPools BondedPools (r:1 w:1)
-	/// Proof: NominationPools BondedPools (max_values: None, max_size: Some(220), added: 2695, mode: MaxEncodedLen)
-	/// Storage: NominationPools RewardPools (r:1 w:1)
-	/// Proof: NominationPools RewardPools (max_values: None, max_size: Some(92), added: 2567, mode: MaxEncodedLen)
-	/// Storage: NominationPools GlobalMaxCommission (r:1 w:0)
-	/// Proof: NominationPools GlobalMaxCommission (max_values: Some(1), max_size: Some(4), added: 499, mode: MaxEncodedLen)
-	/// Storage: System Account (r:1 w:0)
-	/// Proof: System Account (max_values: None, max_size: Some(128), added: 2603, mode: MaxEncodedLen)
-	fn set_commission() -> Weight {
-		// Proof Size summary in bytes:
-		//  Measured:  `736`
-		//  Estimated: `3685`
-		// Minimum execution time: 32_843_000 picoseconds.
-		Weight::from_parts(33_862_000, 0)
-			.saturating_add(Weight::from_parts(0, 3685))
-			.saturating_add(T::DbWeight::get().reads(4))
-			.saturating_add(T::DbWeight::get().writes(2))
-	}
-	/// Storage: NominationPools BondedPools (r:1 w:1)
-	/// Proof: NominationPools BondedPools (max_values: None, max_size: Some(220), added: 2695, mode: MaxEncodedLen)
-	fn set_commission_max() -> Weight {
-		// Proof Size summary in bytes:
-		//  Measured:  `537`
-		//  Estimated: `3685`
-		// Minimum execution time: 19_565_000 picoseconds.
-		Weight::from_parts(20_103_000, 0)
-			.saturating_add(Weight::from_parts(0, 3685))
-			.saturating_add(T::DbWeight::get().reads(1))
-			.saturating_add(T::DbWeight::get().writes(1))
-	}
-	/// Storage: NominationPools BondedPools (r:1 w:1)
-	/// Proof: NominationPools BondedPools (max_values: None, max_size: Some(220), added: 2695, mode: MaxEncodedLen)
-	fn set_commission_change_rate() -> Weight {
-		// Proof Size summary in bytes:
-		//  Measured:  `497`
-		//  Estimated: `3685`
-		// Minimum execution time: 19_957_000 picoseconds.
-		Weight::from_parts(20_927_000, 0)
-			.saturating_add(Weight::from_parts(0, 3685))
-			.saturating_add(T::DbWeight::get().reads(1))
-			.saturating_add(T::DbWeight::get().writes(1))
-	}
-	/// Storage: NominationPools PoolMembers (r:1 w:0)
-	/// Proof: NominationPools PoolMembers (max_values: None, max_size: Some(717), added: 3192, mode: MaxEncodedLen)
-	/// Storage: NominationPools ClaimPermissions (r:1 w:1)
-	/// Proof: NominationPools ClaimPermissions (max_values: None, max_size: Some(41), added: 2516, mode: MaxEncodedLen)
-	fn set_claim_permission() -> Weight {
-		// Proof Size summary in bytes:
-		//  Measured:  `508`
-		//  Estimated: `4182`
-		// Minimum execution time: 15_092_000 picoseconds.
-		Weight::from_parts(15_507_000, 0)
-			.saturating_add(Weight::from_parts(0, 4182))
-			.saturating_add(T::DbWeight::get().reads(2))
-			.saturating_add(T::DbWeight::get().writes(1))
-	}
-	/// Storage: NominationPools BondedPools (r:1 w:0)
-	/// Proof: NominationPools BondedPools (max_values: None, max_size: Some(220), added: 2695, mode: MaxEncodedLen)
-	/// Storage: NominationPools RewardPools (r:1 w:1)
-	/// Proof: NominationPools RewardPools (max_values: None, max_size: Some(92), added: 2567, mode: MaxEncodedLen)
-	/// Storage: NominationPools GlobalMaxCommission (r:1 w:0)
-	/// Proof: NominationPools GlobalMaxCommission (max_values: Some(1), max_size: Some(4), added: 499, mode: MaxEncodedLen)
-	/// Storage: System Account (r:1 w:1)
-	/// Proof: System Account (max_values: None, max_size: Some(128), added: 2603, mode: MaxEncodedLen)
-	fn claim_commission() -> Weight {
-		// Proof Size summary in bytes:
-		//  Measured:  `934`
-		//  Estimated: `3685`
-		// Minimum execution time: 63_775_000 picoseconds.
-		Weight::from_parts(65_498_000, 0)
-			.saturating_add(Weight::from_parts(0, 3685))
-			.saturating_add(T::DbWeight::get().reads(4))
-			.saturating_add(T::DbWeight::get().writes(2))
-	}
-}
diff --git a/polkadot/runtime/polkadot/src/weights/pallet_offences.rs b/polkadot/runtime/polkadot/src/weights/pallet_offences.rs
deleted file mode 100644
index 1233133dfa3916465ecc2e087558745ecd13910c..0000000000000000000000000000000000000000
--- a/polkadot/runtime/polkadot/src/weights/pallet_offences.rs
+++ /dev/null
@@ -1,222 +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/>.
-
-//! Autogenerated weights for `pallet_offences`
-//!
-//! THIS FILE WAS AUTO-GENERATED USING THE SUBSTRATE BENCHMARK CLI VERSION 4.0.0-dev
-//! DATE: 2023-06-18, STEPS: `50`, REPEAT: `20`, LOW RANGE: `[]`, HIGH RANGE: `[]`
-//! WORST CASE MAP SIZE: `1000000`
-//! HOSTNAME: `runner-e8ezs4ez-project-163-concurrent-0`, CPU: `Intel(R) Xeon(R) CPU @ 2.60GHz`
-//! EXECUTION: Some(Wasm), WASM-EXECUTION: Compiled, CHAIN: Some("polkadot-dev"), DB CACHE: 1024
-
-// Executed Command:
-// ./target/production/polkadot
-// benchmark
-// pallet
-// --chain=polkadot-dev
-// --steps=50
-// --repeat=20
-// --no-storage-info
-// --no-median-slopes
-// --no-min-squares
-// --pallet=pallet_offences
-// --extrinsic=*
-// --execution=wasm
-// --wasm-execution=compiled
-// --header=./file_header.txt
-// --output=./runtime/polkadot/src/weights/
-
-#![cfg_attr(rustfmt, rustfmt_skip)]
-#![allow(unused_parens)]
-#![allow(unused_imports)]
-#![allow(missing_docs)]
-
-use frame_support::{traits::Get, weights::Weight};
-use core::marker::PhantomData;
-
-/// Weight functions for `pallet_offences`.
-pub struct WeightInfo<T>(PhantomData<T>);
-impl<T: frame_system::Config> pallet_offences::WeightInfo for WeightInfo<T> {
-	/// Storage: Offences ConcurrentReportsIndex (r:1 w:1)
-	/// Proof Skipped: Offences ConcurrentReportsIndex (max_values: None, max_size: None, mode: Measured)
-	/// Storage: Offences Reports (r:100 w:100)
-	/// Proof Skipped: Offences Reports (max_values: None, max_size: None, mode: Measured)
-	/// Storage: Staking SlashRewardFraction (r:1 w:0)
-	/// Proof: Staking SlashRewardFraction (max_values: Some(1), max_size: Some(4), added: 499, mode: MaxEncodedLen)
-	/// Storage: Staking ActiveEra (r:1 w:0)
-	/// Proof: Staking ActiveEra (max_values: Some(1), max_size: Some(13), added: 508, mode: MaxEncodedLen)
-	/// Storage: Staking ErasStartSessionIndex (r:1 w:0)
-	/// Proof: Staking ErasStartSessionIndex (max_values: None, max_size: Some(16), added: 2491, mode: MaxEncodedLen)
-	/// Storage: Staking Invulnerables (r:1 w:0)
-	/// Proof Skipped: Staking Invulnerables (max_values: Some(1), max_size: None, mode: Measured)
-	/// Storage: Staking ValidatorSlashInEra (r:100 w:100)
-	/// Proof: Staking ValidatorSlashInEra (max_values: None, max_size: Some(72), added: 2547, mode: MaxEncodedLen)
-	/// Storage: Staking SlashingSpans (r:1700 w:1700)
-	/// Proof Skipped: Staking SlashingSpans (max_values: None, max_size: None, mode: Measured)
-	/// Storage: Staking SpanSlash (r:1700 w:1700)
-	/// Proof: Staking SpanSlash (max_values: None, max_size: Some(76), added: 2551, mode: MaxEncodedLen)
-	/// Storage: Staking Validators (r:100 w:100)
-	/// Proof: Staking Validators (max_values: None, max_size: Some(45), added: 2520, mode: MaxEncodedLen)
-	/// Storage: Staking CounterForValidators (r:1 w:1)
-	/// Proof: Staking CounterForValidators (max_values: Some(1), max_size: Some(4), added: 499, mode: MaxEncodedLen)
-	/// Storage: VoterList ListNodes (r:299 w:299)
-	/// Proof: VoterList ListNodes (max_values: None, max_size: Some(154), added: 2629, mode: MaxEncodedLen)
-	/// Storage: VoterList ListBags (r:1 w:1)
-	/// Proof: VoterList ListBags (max_values: None, max_size: Some(82), added: 2557, mode: MaxEncodedLen)
-	/// Storage: VoterList CounterForListNodes (r:1 w:1)
-	/// Proof: VoterList CounterForListNodes (max_values: Some(1), max_size: Some(4), added: 499, mode: MaxEncodedLen)
-	/// Storage: Staking Nominators (r:100 w:0)
-	/// Proof: Staking Nominators (max_values: None, max_size: Some(558), added: 3033, mode: MaxEncodedLen)
-	/// Storage: Staking OffendingValidators (r:1 w:1)
-	/// Proof Skipped: Staking OffendingValidators (max_values: Some(1), max_size: None, mode: Measured)
-	/// Storage: Session Validators (r:1 w:0)
-	/// Proof Skipped: Session Validators (max_values: Some(1), max_size: None, mode: Measured)
-	/// Storage: Staking NominatorSlashInEra (r:1600 w:1600)
-	/// Proof: Staking NominatorSlashInEra (max_values: None, max_size: Some(68), added: 2543, mode: MaxEncodedLen)
-	/// Storage: Staking UnappliedSlashes (r:1 w:1)
-	/// Proof Skipped: Staking UnappliedSlashes (max_values: None, max_size: None, mode: Measured)
-	/// The range of component `r` is `[1, 100]`.
-	/// The range of component `o` is `[2, 100]`.
-	/// The range of component `n` is `[0, 16]`.
-	fn report_offence_im_online(_r: u32, o: u32, n: u32, ) -> Weight {
-		// Proof Size summary in bytes:
-		//  Measured:  `0 + n * (3454 ±0) + o * (1042 ±0)`
-		//  Estimated: `88614 + n * (157019 ±1_888) + o * (26384 ±310)`
-		// Minimum execution time: 528_759_000 picoseconds.
-		Weight::from_parts(538_714_000, 0)
-			.saturating_add(Weight::from_parts(0, 88614))
-			// Standard Error: 3_704_868
-			.saturating_add(Weight::from_parts(378_188_057, 0).saturating_mul(o.into()))
-			// Standard Error: 22_512_446
-			.saturating_add(Weight::from_parts(389_244_693, 0).saturating_mul(n.into()))
-			.saturating_add(T::DbWeight::get().reads(124))
-			.saturating_add(T::DbWeight::get().reads((37_u64).saturating_mul(o.into())))
-			.saturating_add(T::DbWeight::get().reads((187_u64).saturating_mul(n.into())))
-			.saturating_add(T::DbWeight::get().writes(117))
-			.saturating_add(T::DbWeight::get().writes((36_u64).saturating_mul(o.into())))
-			.saturating_add(T::DbWeight::get().writes((187_u64).saturating_mul(n.into())))
-			.saturating_add(Weight::from_parts(0, 157019).saturating_mul(n.into()))
-			.saturating_add(Weight::from_parts(0, 26384).saturating_mul(o.into()))
-	}
-	/// Storage: Offences ConcurrentReportsIndex (r:1 w:1)
-	/// Proof Skipped: Offences ConcurrentReportsIndex (max_values: None, max_size: None, mode: Measured)
-	/// Storage: Offences Reports (r:1 w:1)
-	/// Proof Skipped: Offences Reports (max_values: None, max_size: None, mode: Measured)
-	/// Storage: Staking SlashRewardFraction (r:1 w:0)
-	/// Proof: Staking SlashRewardFraction (max_values: Some(1), max_size: Some(4), added: 499, mode: MaxEncodedLen)
-	/// Storage: Staking ActiveEra (r:1 w:0)
-	/// Proof: Staking ActiveEra (max_values: Some(1), max_size: Some(13), added: 508, mode: MaxEncodedLen)
-	/// Storage: Staking ErasStartSessionIndex (r:1 w:0)
-	/// Proof: Staking ErasStartSessionIndex (max_values: None, max_size: Some(16), added: 2491, mode: MaxEncodedLen)
-	/// Storage: Staking Invulnerables (r:1 w:0)
-	/// Proof Skipped: Staking Invulnerables (max_values: Some(1), max_size: None, mode: Measured)
-	/// Storage: Staking ValidatorSlashInEra (r:1 w:1)
-	/// Proof: Staking ValidatorSlashInEra (max_values: None, max_size: Some(72), added: 2547, mode: MaxEncodedLen)
-	/// Storage: Staking SlashingSpans (r:17 w:17)
-	/// Proof Skipped: Staking SlashingSpans (max_values: None, max_size: None, mode: Measured)
-	/// Storage: Staking SpanSlash (r:17 w:17)
-	/// Proof: Staking SpanSlash (max_values: None, max_size: Some(76), added: 2551, mode: MaxEncodedLen)
-	/// Storage: Staking Validators (r:1 w:1)
-	/// Proof: Staking Validators (max_values: None, max_size: Some(45), added: 2520, mode: MaxEncodedLen)
-	/// Storage: Staking CounterForValidators (r:1 w:1)
-	/// Proof: Staking CounterForValidators (max_values: Some(1), max_size: Some(4), added: 499, mode: MaxEncodedLen)
-	/// Storage: VoterList ListNodes (r:2 w:2)
-	/// Proof: VoterList ListNodes (max_values: None, max_size: Some(154), added: 2629, mode: MaxEncodedLen)
-	/// Storage: VoterList ListBags (r:1 w:1)
-	/// Proof: VoterList ListBags (max_values: None, max_size: Some(82), added: 2557, mode: MaxEncodedLen)
-	/// Storage: VoterList CounterForListNodes (r:1 w:1)
-	/// Proof: VoterList CounterForListNodes (max_values: Some(1), max_size: Some(4), added: 499, mode: MaxEncodedLen)
-	/// Storage: Staking Nominators (r:1 w:0)
-	/// Proof: Staking Nominators (max_values: None, max_size: Some(558), added: 3033, mode: MaxEncodedLen)
-	/// Storage: Staking OffendingValidators (r:1 w:1)
-	/// Proof Skipped: Staking OffendingValidators (max_values: Some(1), max_size: None, mode: Measured)
-	/// Storage: Session Validators (r:1 w:0)
-	/// Proof Skipped: Session Validators (max_values: Some(1), max_size: None, mode: Measured)
-	/// Storage: Staking NominatorSlashInEra (r:16 w:16)
-	/// Proof: Staking NominatorSlashInEra (max_values: None, max_size: Some(68), added: 2543, mode: MaxEncodedLen)
-	/// 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 `[0, 16]`.
-	fn report_offence_grandpa(n: u32, ) -> Weight {
-		// Proof Size summary in bytes:
-		//  Measured:  `1709 + n * (66 ±0)`
-		//  Estimated: `5520 + n * (2551 ±0)`
-		// Minimum execution time: 92_527_000 picoseconds.
-		Weight::from_parts(104_194_764, 0)
-			.saturating_add(Weight::from_parts(0, 5520))
-			// Standard Error: 32_501
-			.saturating_add(Weight::from_parts(11_219_757, 0).saturating_mul(n.into()))
-			.saturating_add(T::DbWeight::get().reads(19))
-			.saturating_add(T::DbWeight::get().reads((3_u64).saturating_mul(n.into())))
-			.saturating_add(T::DbWeight::get().writes(13))
-			.saturating_add(T::DbWeight::get().writes((3_u64).saturating_mul(n.into())))
-			.saturating_add(Weight::from_parts(0, 2551).saturating_mul(n.into()))
-	}
-	/// Storage: Offences ConcurrentReportsIndex (r:1 w:1)
-	/// Proof Skipped: Offences ConcurrentReportsIndex (max_values: None, max_size: None, mode: Measured)
-	/// Storage: Offences Reports (r:1 w:1)
-	/// Proof Skipped: Offences Reports (max_values: None, max_size: None, mode: Measured)
-	/// Storage: Staking SlashRewardFraction (r:1 w:0)
-	/// Proof: Staking SlashRewardFraction (max_values: Some(1), max_size: Some(4), added: 499, mode: MaxEncodedLen)
-	/// Storage: Staking ActiveEra (r:1 w:0)
-	/// Proof: Staking ActiveEra (max_values: Some(1), max_size: Some(13), added: 508, mode: MaxEncodedLen)
-	/// Storage: Staking ErasStartSessionIndex (r:1 w:0)
-	/// Proof: Staking ErasStartSessionIndex (max_values: None, max_size: Some(16), added: 2491, mode: MaxEncodedLen)
-	/// Storage: Staking Invulnerables (r:1 w:0)
-	/// Proof Skipped: Staking Invulnerables (max_values: Some(1), max_size: None, mode: Measured)
-	/// Storage: Staking ValidatorSlashInEra (r:1 w:1)
-	/// Proof: Staking ValidatorSlashInEra (max_values: None, max_size: Some(72), added: 2547, mode: MaxEncodedLen)
-	/// Storage: Staking SlashingSpans (r:17 w:17)
-	/// Proof Skipped: Staking SlashingSpans (max_values: None, max_size: None, mode: Measured)
-	/// Storage: Staking SpanSlash (r:17 w:17)
-	/// Proof: Staking SpanSlash (max_values: None, max_size: Some(76), added: 2551, mode: MaxEncodedLen)
-	/// Storage: Staking Validators (r:1 w:1)
-	/// Proof: Staking Validators (max_values: None, max_size: Some(45), added: 2520, mode: MaxEncodedLen)
-	/// Storage: Staking CounterForValidators (r:1 w:1)
-	/// Proof: Staking CounterForValidators (max_values: Some(1), max_size: Some(4), added: 499, mode: MaxEncodedLen)
-	/// Storage: VoterList ListNodes (r:2 w:2)
-	/// Proof: VoterList ListNodes (max_values: None, max_size: Some(154), added: 2629, mode: MaxEncodedLen)
-	/// Storage: VoterList ListBags (r:1 w:1)
-	/// Proof: VoterList ListBags (max_values: None, max_size: Some(82), added: 2557, mode: MaxEncodedLen)
-	/// Storage: VoterList CounterForListNodes (r:1 w:1)
-	/// Proof: VoterList CounterForListNodes (max_values: Some(1), max_size: Some(4), added: 499, mode: MaxEncodedLen)
-	/// Storage: Staking Nominators (r:1 w:0)
-	/// Proof: Staking Nominators (max_values: None, max_size: Some(558), added: 3033, mode: MaxEncodedLen)
-	/// Storage: Staking OffendingValidators (r:1 w:1)
-	/// Proof Skipped: Staking OffendingValidators (max_values: Some(1), max_size: None, mode: Measured)
-	/// Storage: Session Validators (r:1 w:0)
-	/// Proof Skipped: Session Validators (max_values: Some(1), max_size: None, mode: Measured)
-	/// Storage: Staking NominatorSlashInEra (r:16 w:16)
-	/// Proof: Staking NominatorSlashInEra (max_values: None, max_size: Some(68), added: 2543, mode: MaxEncodedLen)
-	/// 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 `[0, 16]`.
-	fn report_offence_babe(n: u32, ) -> Weight {
-		// Proof Size summary in bytes:
-		//  Measured:  `1709 + n * (66 ±0)`
-		//  Estimated: `5520 + n * (2551 ±0)`
-		// Minimum execution time: 93_431_000 picoseconds.
-		Weight::from_parts(104_636_499, 0)
-			.saturating_add(Weight::from_parts(0, 5520))
-			// Standard Error: 31_475
-			.saturating_add(Weight::from_parts(11_183_248, 0).saturating_mul(n.into()))
-			.saturating_add(T::DbWeight::get().reads(19))
-			.saturating_add(T::DbWeight::get().reads((3_u64).saturating_mul(n.into())))
-			.saturating_add(T::DbWeight::get().writes(13))
-			.saturating_add(T::DbWeight::get().writes((3_u64).saturating_mul(n.into())))
-			.saturating_add(Weight::from_parts(0, 2551).saturating_mul(n.into()))
-	}
-}
diff --git a/polkadot/runtime/polkadot/src/weights/pallet_preimage.rs b/polkadot/runtime/polkadot/src/weights/pallet_preimage.rs
deleted file mode 100644
index 91605e072f0930a9fc47acd0af3856b2128459fb..0000000000000000000000000000000000000000
--- a/polkadot/runtime/polkadot/src/weights/pallet_preimage.rs
+++ /dev/null
@@ -1,218 +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/>.
-
-//! Autogenerated weights for `pallet_preimage`
-//!
-//! THIS FILE WAS AUTO-GENERATED USING THE SUBSTRATE BENCHMARK CLI VERSION 4.0.0-dev
-//! DATE: 2023-06-18, STEPS: `50`, REPEAT: `20`, LOW RANGE: `[]`, HIGH RANGE: `[]`
-//! WORST CASE MAP SIZE: `1000000`
-//! HOSTNAME: `runner-e8ezs4ez-project-163-concurrent-0`, CPU: `Intel(R) Xeon(R) CPU @ 2.60GHz`
-//! EXECUTION: Some(Wasm), WASM-EXECUTION: Compiled, CHAIN: Some("polkadot-dev"), DB CACHE: 1024
-
-// Executed Command:
-// ./target/production/polkadot
-// benchmark
-// pallet
-// --chain=polkadot-dev
-// --steps=50
-// --repeat=20
-// --no-storage-info
-// --no-median-slopes
-// --no-min-squares
-// --pallet=pallet_preimage
-// --extrinsic=*
-// --execution=wasm
-// --wasm-execution=compiled
-// --header=./file_header.txt
-// --output=./runtime/polkadot/src/weights/
-
-#![cfg_attr(rustfmt, rustfmt_skip)]
-#![allow(unused_parens)]
-#![allow(unused_imports)]
-#![allow(missing_docs)]
-
-use frame_support::{traits::Get, weights::Weight};
-use core::marker::PhantomData;
-
-/// Weight functions for `pallet_preimage`.
-pub struct WeightInfo<T>(PhantomData<T>);
-impl<T: frame_system::Config> pallet_preimage::WeightInfo for WeightInfo<T> {
-	/// Storage: Preimage StatusFor (r:1 w:1)
-	/// Proof: Preimage StatusFor (max_values: None, max_size: Some(91), added: 2566, mode: MaxEncodedLen)
-	/// Storage: Preimage PreimageFor (r:0 w:1)
-	/// Proof: Preimage PreimageFor (max_values: None, max_size: Some(4194344), added: 4196819, mode: MaxEncodedLen)
-	/// The range of component `s` is `[0, 4194304]`.
-	fn note_preimage(s: u32, ) -> Weight {
-		// Proof Size summary in bytes:
-		//  Measured:  `143`
-		//  Estimated: `3556`
-		// Minimum execution time: 31_712_000 picoseconds.
-		Weight::from_parts(32_014_000, 0)
-			.saturating_add(Weight::from_parts(0, 3556))
-			// Standard Error: 5
-			.saturating_add(Weight::from_parts(2_433, 0).saturating_mul(s.into()))
-			.saturating_add(T::DbWeight::get().reads(1))
-			.saturating_add(T::DbWeight::get().writes(2))
-	}
-	/// Storage: Preimage StatusFor (r:1 w:1)
-	/// Proof: Preimage StatusFor (max_values: None, max_size: Some(91), added: 2566, mode: MaxEncodedLen)
-	/// Storage: Preimage PreimageFor (r:0 w:1)
-	/// Proof: Preimage PreimageFor (max_values: None, max_size: Some(4194344), added: 4196819, mode: MaxEncodedLen)
-	/// The range of component `s` is `[0, 4194304]`.
-	fn note_requested_preimage(s: u32, ) -> Weight {
-		// Proof Size summary in bytes:
-		//  Measured:  `106`
-		//  Estimated: `3556`
-		// Minimum execution time: 16_935_000 picoseconds.
-		Weight::from_parts(17_306_000, 0)
-			.saturating_add(Weight::from_parts(0, 3556))
-			// Standard Error: 3
-			.saturating_add(Weight::from_parts(2_448, 0).saturating_mul(s.into()))
-			.saturating_add(T::DbWeight::get().reads(1))
-			.saturating_add(T::DbWeight::get().writes(2))
-	}
-	/// Storage: Preimage StatusFor (r:1 w:1)
-	/// Proof: Preimage StatusFor (max_values: None, max_size: Some(91), added: 2566, mode: MaxEncodedLen)
-	/// Storage: Preimage PreimageFor (r:0 w:1)
-	/// Proof: Preimage PreimageFor (max_values: None, max_size: Some(4194344), added: 4196819, mode: MaxEncodedLen)
-	/// The range of component `s` is `[0, 4194304]`.
-	fn note_no_deposit_preimage(s: u32, ) -> Weight {
-		// Proof Size summary in bytes:
-		//  Measured:  `106`
-		//  Estimated: `3556`
-		// Minimum execution time: 16_600_000 picoseconds.
-		Weight::from_parts(16_837_000, 0)
-			.saturating_add(Weight::from_parts(0, 3556))
-			// Standard Error: 3
-			.saturating_add(Weight::from_parts(2_424, 0).saturating_mul(s.into()))
-			.saturating_add(T::DbWeight::get().reads(1))
-			.saturating_add(T::DbWeight::get().writes(2))
-	}
-	/// Storage: Preimage StatusFor (r:1 w:1)
-	/// Proof: Preimage StatusFor (max_values: None, max_size: Some(91), added: 2566, mode: MaxEncodedLen)
-	/// Storage: Preimage PreimageFor (r:0 w:1)
-	/// Proof: Preimage PreimageFor (max_values: None, max_size: Some(4194344), added: 4196819, mode: MaxEncodedLen)
-	fn unnote_preimage() -> Weight {
-		// Proof Size summary in bytes:
-		//  Measured:  `289`
-		//  Estimated: `3556`
-		// Minimum execution time: 50_349_000 picoseconds.
-		Weight::from_parts(55_322_000, 0)
-			.saturating_add(Weight::from_parts(0, 3556))
-			.saturating_add(T::DbWeight::get().reads(1))
-			.saturating_add(T::DbWeight::get().writes(2))
-	}
-	/// Storage: Preimage StatusFor (r:1 w:1)
-	/// Proof: Preimage StatusFor (max_values: None, max_size: Some(91), added: 2566, mode: MaxEncodedLen)
-	/// Storage: Preimage PreimageFor (r:0 w:1)
-	/// Proof: Preimage PreimageFor (max_values: None, max_size: Some(4194344), added: 4196819, mode: MaxEncodedLen)
-	fn unnote_no_deposit_preimage() -> Weight {
-		// Proof Size summary in bytes:
-		//  Measured:  `144`
-		//  Estimated: `3556`
-		// Minimum execution time: 32_867_000 picoseconds.
-		Weight::from_parts(36_581_000, 0)
-			.saturating_add(Weight::from_parts(0, 3556))
-			.saturating_add(T::DbWeight::get().reads(1))
-			.saturating_add(T::DbWeight::get().writes(2))
-	}
-	/// Storage: Preimage StatusFor (r:1 w:1)
-	/// Proof: Preimage StatusFor (max_values: None, max_size: Some(91), added: 2566, mode: MaxEncodedLen)
-	fn request_preimage() -> Weight {
-		// Proof Size summary in bytes:
-		//  Measured:  `188`
-		//  Estimated: `3556`
-		// Minimum execution time: 27_810_000 picoseconds.
-		Weight::from_parts(30_821_000, 0)
-			.saturating_add(Weight::from_parts(0, 3556))
-			.saturating_add(T::DbWeight::get().reads(1))
-			.saturating_add(T::DbWeight::get().writes(1))
-	}
-	/// Storage: Preimage StatusFor (r:1 w:1)
-	/// Proof: Preimage StatusFor (max_values: None, max_size: Some(91), added: 2566, mode: MaxEncodedLen)
-	fn request_no_deposit_preimage() -> Weight {
-		// Proof Size summary in bytes:
-		//  Measured:  `144`
-		//  Estimated: `3556`
-		// Minimum execution time: 17_455_000 picoseconds.
-		Weight::from_parts(19_842_000, 0)
-			.saturating_add(Weight::from_parts(0, 3556))
-			.saturating_add(T::DbWeight::get().reads(1))
-			.saturating_add(T::DbWeight::get().writes(1))
-	}
-	/// Storage: Preimage StatusFor (r:1 w:1)
-	/// Proof: Preimage StatusFor (max_values: None, max_size: Some(91), added: 2566, mode: MaxEncodedLen)
-	fn request_unnoted_preimage() -> Weight {
-		// Proof Size summary in bytes:
-		//  Measured:  `42`
-		//  Estimated: `3556`
-		// Minimum execution time: 19_593_000 picoseconds.
-		Weight::from_parts(22_947_000, 0)
-			.saturating_add(Weight::from_parts(0, 3556))
-			.saturating_add(T::DbWeight::get().reads(1))
-			.saturating_add(T::DbWeight::get().writes(1))
-	}
-	/// Storage: Preimage StatusFor (r:1 w:1)
-	/// Proof: Preimage StatusFor (max_values: None, max_size: Some(91), added: 2566, mode: MaxEncodedLen)
-	fn request_requested_preimage() -> Weight {
-		// Proof Size summary in bytes:
-		//  Measured:  `106`
-		//  Estimated: `3556`
-		// Minimum execution time: 11_066_000 picoseconds.
-		Weight::from_parts(12_720_000, 0)
-			.saturating_add(Weight::from_parts(0, 3556))
-			.saturating_add(T::DbWeight::get().reads(1))
-			.saturating_add(T::DbWeight::get().writes(1))
-	}
-	/// Storage: Preimage StatusFor (r:1 w:1)
-	/// Proof: Preimage StatusFor (max_values: None, max_size: Some(91), added: 2566, mode: MaxEncodedLen)
-	/// Storage: Preimage PreimageFor (r:0 w:1)
-	/// Proof: Preimage PreimageFor (max_values: None, max_size: Some(4194344), added: 4196819, mode: MaxEncodedLen)
-	fn unrequest_preimage() -> Weight {
-		// Proof Size summary in bytes:
-		//  Measured:  `144`
-		//  Estimated: `3556`
-		// Minimum execution time: 28_739_000 picoseconds.
-		Weight::from_parts(31_484_000, 0)
-			.saturating_add(Weight::from_parts(0, 3556))
-			.saturating_add(T::DbWeight::get().reads(1))
-			.saturating_add(T::DbWeight::get().writes(2))
-	}
-	/// Storage: Preimage StatusFor (r:1 w:1)
-	/// Proof: Preimage StatusFor (max_values: None, max_size: Some(91), added: 2566, mode: MaxEncodedLen)
-	fn unrequest_unnoted_preimage() -> Weight {
-		// Proof Size summary in bytes:
-		//  Measured:  `106`
-		//  Estimated: `3556`
-		// Minimum execution time: 10_424_000 picoseconds.
-		Weight::from_parts(11_233_000, 0)
-			.saturating_add(Weight::from_parts(0, 3556))
-			.saturating_add(T::DbWeight::get().reads(1))
-			.saturating_add(T::DbWeight::get().writes(1))
-	}
-	/// Storage: Preimage StatusFor (r:1 w:1)
-	/// Proof: Preimage StatusFor (max_values: None, max_size: Some(91), added: 2566, mode: MaxEncodedLen)
-	fn unrequest_multi_referenced_preimage() -> Weight {
-		// Proof Size summary in bytes:
-		//  Measured:  `106`
-		//  Estimated: `3556`
-		// Minimum execution time: 11_087_000 picoseconds.
-		Weight::from_parts(12_055_000, 0)
-			.saturating_add(Weight::from_parts(0, 3556))
-			.saturating_add(T::DbWeight::get().reads(1))
-			.saturating_add(T::DbWeight::get().writes(1))
-	}
-}
diff --git a/polkadot/runtime/polkadot/src/weights/pallet_proxy.rs b/polkadot/runtime/polkadot/src/weights/pallet_proxy.rs
deleted file mode 100644
index 662b610f86ba845a8df8b336d5258b6cf448c403..0000000000000000000000000000000000000000
--- a/polkadot/runtime/polkadot/src/weights/pallet_proxy.rs
+++ /dev/null
@@ -1,222 +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/>.
-
-//! Autogenerated weights for `pallet_proxy`
-//!
-//! THIS FILE WAS AUTO-GENERATED USING THE SUBSTRATE BENCHMARK CLI VERSION 4.0.0-dev
-//! DATE: 2023-06-18, STEPS: `50`, REPEAT: `20`, LOW RANGE: `[]`, HIGH RANGE: `[]`
-//! WORST CASE MAP SIZE: `1000000`
-//! HOSTNAME: `runner-e8ezs4ez-project-163-concurrent-0`, CPU: `Intel(R) Xeon(R) CPU @ 2.60GHz`
-//! EXECUTION: Some(Wasm), WASM-EXECUTION: Compiled, CHAIN: Some("polkadot-dev"), DB CACHE: 1024
-
-// Executed Command:
-// ./target/production/polkadot
-// benchmark
-// pallet
-// --chain=polkadot-dev
-// --steps=50
-// --repeat=20
-// --no-storage-info
-// --no-median-slopes
-// --no-min-squares
-// --pallet=pallet_proxy
-// --extrinsic=*
-// --execution=wasm
-// --wasm-execution=compiled
-// --header=./file_header.txt
-// --output=./runtime/polkadot/src/weights/
-
-#![cfg_attr(rustfmt, rustfmt_skip)]
-#![allow(unused_parens)]
-#![allow(unused_imports)]
-#![allow(missing_docs)]
-
-use frame_support::{traits::Get, weights::Weight};
-use core::marker::PhantomData;
-
-/// Weight functions for `pallet_proxy`.
-pub struct WeightInfo<T>(PhantomData<T>);
-impl<T: frame_system::Config> pallet_proxy::WeightInfo for WeightInfo<T> {
-	/// Storage: Proxy Proxies (r:1 w:0)
-	/// Proof: Proxy Proxies (max_values: None, max_size: Some(1241), added: 3716, mode: MaxEncodedLen)
-	/// The range of component `p` is `[1, 31]`.
-	fn proxy(p: u32, ) -> Weight {
-		// Proof Size summary in bytes:
-		//  Measured:  `227 + p * (37 ±0)`
-		//  Estimated: `4706`
-		// Minimum execution time: 15_142_000 picoseconds.
-		Weight::from_parts(15_809_707, 0)
-			.saturating_add(Weight::from_parts(0, 4706))
-			// Standard Error: 889
-			.saturating_add(Weight::from_parts(29_639, 0).saturating_mul(p.into()))
-			.saturating_add(T::DbWeight::get().reads(1))
-	}
-	/// Storage: Proxy Proxies (r:1 w:0)
-	/// Proof: Proxy Proxies (max_values: None, max_size: Some(1241), added: 3716, mode: MaxEncodedLen)
-	/// Storage: Proxy Announcements (r:1 w:1)
-	/// Proof: Proxy Announcements (max_values: None, max_size: Some(2233), added: 4708, mode: MaxEncodedLen)
-	/// Storage: System Account (r:1 w:1)
-	/// Proof: System Account (max_values: None, max_size: Some(128), added: 2603, mode: MaxEncodedLen)
-	/// The range of component `a` is `[0, 31]`.
-	/// The range of component `p` is `[1, 31]`.
-	fn proxy_announced(a: u32, p: u32, ) -> Weight {
-		// Proof Size summary in bytes:
-		//  Measured:  `554 + a * (68 ±0) + p * (37 ±0)`
-		//  Estimated: `5698`
-		// Minimum execution time: 38_116_000 picoseconds.
-		Weight::from_parts(38_591_703, 0)
-			.saturating_add(Weight::from_parts(0, 5698))
-			// Standard Error: 2_336
-			.saturating_add(Weight::from_parts(169_558, 0).saturating_mul(a.into()))
-			// Standard Error: 2_414
-			.saturating_add(Weight::from_parts(25_502, 0).saturating_mul(p.into()))
-			.saturating_add(T::DbWeight::get().reads(3))
-			.saturating_add(T::DbWeight::get().writes(2))
-	}
-	/// Storage: Proxy Announcements (r:1 w:1)
-	/// Proof: Proxy Announcements (max_values: None, max_size: Some(2233), added: 4708, mode: MaxEncodedLen)
-	/// Storage: System Account (r:1 w:1)
-	/// Proof: System Account (max_values: None, max_size: Some(128), added: 2603, mode: MaxEncodedLen)
-	/// The range of component `a` is `[0, 31]`.
-	/// The range of component `p` is `[1, 31]`.
-	fn remove_announcement(a: u32, _p: u32, ) -> Weight {
-		// Proof Size summary in bytes:
-		//  Measured:  `469 + a * (68 ±0)`
-		//  Estimated: `5698`
-		// Minimum execution time: 24_792_000 picoseconds.
-		Weight::from_parts(26_160_353, 0)
-			.saturating_add(Weight::from_parts(0, 5698))
-			// Standard Error: 1_738
-			.saturating_add(Weight::from_parts(157_640, 0).saturating_mul(a.into()))
-			.saturating_add(T::DbWeight::get().reads(2))
-			.saturating_add(T::DbWeight::get().writes(2))
-	}
-	/// Storage: Proxy Announcements (r:1 w:1)
-	/// Proof: Proxy Announcements (max_values: None, max_size: Some(2233), added: 4708, mode: MaxEncodedLen)
-	/// Storage: System Account (r:1 w:1)
-	/// Proof: System Account (max_values: None, max_size: Some(128), added: 2603, mode: MaxEncodedLen)
-	/// The range of component `a` is `[0, 31]`.
-	/// The range of component `p` is `[1, 31]`.
-	fn reject_announcement(a: u32, _p: u32, ) -> Weight {
-		// Proof Size summary in bytes:
-		//  Measured:  `469 + a * (68 ±0)`
-		//  Estimated: `5698`
-		// Minimum execution time: 24_905_000 picoseconds.
-		Weight::from_parts(26_368_411, 0)
-			.saturating_add(Weight::from_parts(0, 5698))
-			// Standard Error: 1_895
-			.saturating_add(Weight::from_parts(155_491, 0).saturating_mul(a.into()))
-			.saturating_add(T::DbWeight::get().reads(2))
-			.saturating_add(T::DbWeight::get().writes(2))
-	}
-	/// Storage: Proxy Proxies (r:1 w:0)
-	/// Proof: Proxy Proxies (max_values: None, max_size: Some(1241), added: 3716, mode: MaxEncodedLen)
-	/// Storage: Proxy Announcements (r:1 w:1)
-	/// Proof: Proxy Announcements (max_values: None, max_size: Some(2233), added: 4708, mode: MaxEncodedLen)
-	/// Storage: System Account (r:1 w:1)
-	/// Proof: System Account (max_values: None, max_size: Some(128), added: 2603, mode: MaxEncodedLen)
-	/// The range of component `a` is `[0, 31]`.
-	/// The range of component `p` is `[1, 31]`.
-	fn announce(a: u32, p: u32, ) -> Weight {
-		// Proof Size summary in bytes:
-		//  Measured:  `486 + a * (68 ±0) + p * (37 ±0)`
-		//  Estimated: `5698`
-		// Minimum execution time: 34_820_000 picoseconds.
-		Weight::from_parts(35_236_824, 0)
-			.saturating_add(Weight::from_parts(0, 5698))
-			// Standard Error: 1_574
-			.saturating_add(Weight::from_parts(166_722, 0).saturating_mul(a.into()))
-			// Standard Error: 1_626
-			.saturating_add(Weight::from_parts(25_405, 0).saturating_mul(p.into()))
-			.saturating_add(T::DbWeight::get().reads(3))
-			.saturating_add(T::DbWeight::get().writes(2))
-	}
-	/// Storage: Proxy Proxies (r:1 w:1)
-	/// Proof: Proxy Proxies (max_values: None, max_size: Some(1241), added: 3716, mode: MaxEncodedLen)
-	/// The range of component `p` is `[1, 31]`.
-	fn add_proxy(p: u32, ) -> Weight {
-		// Proof Size summary in bytes:
-		//  Measured:  `227 + p * (37 ±0)`
-		//  Estimated: `4706`
-		// Minimum execution time: 25_820_000 picoseconds.
-		Weight::from_parts(27_003_669, 0)
-			.saturating_add(Weight::from_parts(0, 4706))
-			// Standard Error: 1_555
-			.saturating_add(Weight::from_parts(65_038, 0).saturating_mul(p.into()))
-			.saturating_add(T::DbWeight::get().reads(1))
-			.saturating_add(T::DbWeight::get().writes(1))
-	}
-	/// Storage: Proxy Proxies (r:1 w:1)
-	/// Proof: Proxy Proxies (max_values: None, max_size: Some(1241), added: 3716, mode: MaxEncodedLen)
-	/// The range of component `p` is `[1, 31]`.
-	fn remove_proxy(p: u32, ) -> Weight {
-		// Proof Size summary in bytes:
-		//  Measured:  `227 + p * (37 ±0)`
-		//  Estimated: `4706`
-		// Minimum execution time: 26_328_000 picoseconds.
-		Weight::from_parts(27_336_521, 0)
-			.saturating_add(Weight::from_parts(0, 4706))
-			// Standard Error: 1_703
-			.saturating_add(Weight::from_parts(57_107, 0).saturating_mul(p.into()))
-			.saturating_add(T::DbWeight::get().reads(1))
-			.saturating_add(T::DbWeight::get().writes(1))
-	}
-	/// Storage: Proxy Proxies (r:1 w:1)
-	/// Proof: Proxy Proxies (max_values: None, max_size: Some(1241), added: 3716, mode: MaxEncodedLen)
-	/// The range of component `p` is `[1, 31]`.
-	fn remove_proxies(p: u32, ) -> Weight {
-		// Proof Size summary in bytes:
-		//  Measured:  `227 + p * (37 ±0)`
-		//  Estimated: `4706`
-		// Minimum execution time: 23_016_000 picoseconds.
-		Weight::from_parts(23_867_116, 0)
-			.saturating_add(Weight::from_parts(0, 4706))
-			// Standard Error: 1_227
-			.saturating_add(Weight::from_parts(38_349, 0).saturating_mul(p.into()))
-			.saturating_add(T::DbWeight::get().reads(1))
-			.saturating_add(T::DbWeight::get().writes(1))
-	}
-	/// Storage: Proxy Proxies (r:1 w:1)
-	/// Proof: Proxy Proxies (max_values: None, max_size: Some(1241), added: 3716, mode: MaxEncodedLen)
-	/// The range of component `p` is `[1, 31]`.
-	fn create_pure(p: u32, ) -> Weight {
-		// Proof Size summary in bytes:
-		//  Measured:  `239`
-		//  Estimated: `4706`
-		// Minimum execution time: 27_525_000 picoseconds.
-		Weight::from_parts(28_670_720, 0)
-			.saturating_add(Weight::from_parts(0, 4706))
-			// Standard Error: 1_869
-			.saturating_add(Weight::from_parts(16_659, 0).saturating_mul(p.into()))
-			.saturating_add(T::DbWeight::get().reads(1))
-			.saturating_add(T::DbWeight::get().writes(1))
-	}
-	/// Storage: Proxy Proxies (r:1 w:1)
-	/// Proof: Proxy Proxies (max_values: None, max_size: Some(1241), added: 3716, mode: MaxEncodedLen)
-	/// The range of component `p` is `[0, 30]`.
-	fn kill_pure(p: u32, ) -> Weight {
-		// Proof Size summary in bytes:
-		//  Measured:  `264 + p * (37 ±0)`
-		//  Estimated: `4706`
-		// Minimum execution time: 23_877_000 picoseconds.
-		Weight::from_parts(24_530_683, 0)
-			.saturating_add(Weight::from_parts(0, 4706))
-			// Standard Error: 1_569
-			.saturating_add(Weight::from_parts(49_912, 0).saturating_mul(p.into()))
-			.saturating_add(T::DbWeight::get().reads(1))
-			.saturating_add(T::DbWeight::get().writes(1))
-	}
-}
diff --git a/polkadot/runtime/polkadot/src/weights/pallet_referenda.rs b/polkadot/runtime/polkadot/src/weights/pallet_referenda.rs
deleted file mode 100644
index 7f6fb0419c76b54ca933dea5baf457266eeaae41..0000000000000000000000000000000000000000
--- a/polkadot/runtime/polkadot/src/weights/pallet_referenda.rs
+++ /dev/null
@@ -1,523 +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/>.
-
-//! Autogenerated weights for `pallet_referenda`
-//!
-//! THIS FILE WAS AUTO-GENERATED USING THE SUBSTRATE BENCHMARK CLI VERSION 4.0.0-dev
-//! DATE: 2023-06-18, STEPS: `50`, REPEAT: `20`, LOW RANGE: `[]`, HIGH RANGE: `[]`
-//! WORST CASE MAP SIZE: `1000000`
-//! HOSTNAME: `runner-e8ezs4ez-project-163-concurrent-0`, CPU: `Intel(R) Xeon(R) CPU @ 2.60GHz`
-//! EXECUTION: Some(Wasm), WASM-EXECUTION: Compiled, CHAIN: Some("polkadot-dev"), DB CACHE: 1024
-
-// Executed Command:
-// ./target/production/polkadot
-// benchmark
-// pallet
-// --chain=polkadot-dev
-// --steps=50
-// --repeat=20
-// --no-storage-info
-// --no-median-slopes
-// --no-min-squares
-// --pallet=pallet_referenda
-// --extrinsic=*
-// --execution=wasm
-// --wasm-execution=compiled
-// --header=./file_header.txt
-// --output=./runtime/polkadot/src/weights/
-
-#![cfg_attr(rustfmt, rustfmt_skip)]
-#![allow(unused_parens)]
-#![allow(unused_imports)]
-#![allow(missing_docs)]
-
-use frame_support::{traits::Get, weights::Weight};
-use core::marker::PhantomData;
-
-/// Weight functions for `pallet_referenda`.
-pub struct WeightInfo<T>(PhantomData<T>);
-impl<T: frame_system::Config> pallet_referenda::WeightInfo for WeightInfo<T> {
-	/// Storage: Referenda ReferendumCount (r:1 w:1)
-	/// Proof: Referenda ReferendumCount (max_values: Some(1), max_size: Some(4), added: 499, mode: MaxEncodedLen)
-	/// Storage: Scheduler Agenda (r:1 w:1)
-	/// Proof: Scheduler Agenda (max_values: None, max_size: Some(38963), added: 41438, mode: MaxEncodedLen)
-	/// Storage: Referenda ReferendumInfoFor (r:0 w:1)
-	/// Proof: Referenda ReferendumInfoFor (max_values: None, max_size: Some(936), added: 3411, mode: MaxEncodedLen)
-	fn submit() -> Weight {
-		// Proof Size summary in bytes:
-		//  Measured:  `291`
-		//  Estimated: `42428`
-		// Minimum execution time: 40_432_000 picoseconds.
-		Weight::from_parts(41_423_000, 0)
-			.saturating_add(Weight::from_parts(0, 42428))
-			.saturating_add(T::DbWeight::get().reads(2))
-			.saturating_add(T::DbWeight::get().writes(3))
-	}
-	/// Storage: Referenda ReferendumInfoFor (r:1 w:1)
-	/// Proof: Referenda ReferendumInfoFor (max_values: None, max_size: Some(936), added: 3411, mode: MaxEncodedLen)
-	/// Storage: Scheduler Agenda (r:2 w:2)
-	/// Proof: Scheduler Agenda (max_values: None, max_size: Some(38963), added: 41438, mode: MaxEncodedLen)
-	fn place_decision_deposit_preparing() -> Weight {
-		// Proof Size summary in bytes:
-		//  Measured:  `544`
-		//  Estimated: `83866`
-		// Minimum execution time: 52_009_000 picoseconds.
-		Weight::from_parts(54_126_000, 0)
-			.saturating_add(Weight::from_parts(0, 83866))
-			.saturating_add(T::DbWeight::get().reads(3))
-			.saturating_add(T::DbWeight::get().writes(3))
-	}
-	/// Storage: Referenda ReferendumInfoFor (r:1 w:1)
-	/// Proof: Referenda ReferendumInfoFor (max_values: None, max_size: Some(936), added: 3411, mode: MaxEncodedLen)
-	/// Storage: Referenda DecidingCount (r:1 w:0)
-	/// Proof: Referenda DecidingCount (max_values: None, max_size: Some(14), added: 2489, mode: MaxEncodedLen)
-	/// Storage: Referenda TrackQueue (r:1 w:1)
-	/// Proof: Referenda TrackQueue (max_values: None, max_size: Some(2012), added: 4487, mode: MaxEncodedLen)
-	/// Storage: Scheduler Agenda (r:1 w:1)
-	/// Proof: Scheduler Agenda (max_values: None, max_size: Some(38963), added: 41438, mode: MaxEncodedLen)
-	fn place_decision_deposit_queued() -> Weight {
-		// Proof Size summary in bytes:
-		//  Measured:  `3331`
-		//  Estimated: `42428`
-		// Minimum execution time: 69_077_000 picoseconds.
-		Weight::from_parts(71_533_000, 0)
-			.saturating_add(Weight::from_parts(0, 42428))
-			.saturating_add(T::DbWeight::get().reads(4))
-			.saturating_add(T::DbWeight::get().writes(3))
-	}
-	/// Storage: Referenda ReferendumInfoFor (r:1 w:1)
-	/// Proof: Referenda ReferendumInfoFor (max_values: None, max_size: Some(936), added: 3411, mode: MaxEncodedLen)
-	/// Storage: Referenda DecidingCount (r:1 w:0)
-	/// Proof: Referenda DecidingCount (max_values: None, max_size: Some(14), added: 2489, mode: MaxEncodedLen)
-	/// Storage: Referenda TrackQueue (r:1 w:1)
-	/// Proof: Referenda TrackQueue (max_values: None, max_size: Some(2012), added: 4487, mode: MaxEncodedLen)
-	/// Storage: Scheduler Agenda (r:1 w:1)
-	/// Proof: Scheduler Agenda (max_values: None, max_size: Some(38963), added: 41438, mode: MaxEncodedLen)
-	fn place_decision_deposit_not_queued() -> Weight {
-		// Proof Size summary in bytes:
-		//  Measured:  `3351`
-		//  Estimated: `42428`
-		// Minimum execution time: 68_115_000 picoseconds.
-		Weight::from_parts(70_485_000, 0)
-			.saturating_add(Weight::from_parts(0, 42428))
-			.saturating_add(T::DbWeight::get().reads(4))
-			.saturating_add(T::DbWeight::get().writes(3))
-	}
-	/// Storage: Referenda ReferendumInfoFor (r:1 w:1)
-	/// Proof: Referenda ReferendumInfoFor (max_values: None, max_size: Some(936), added: 3411, mode: MaxEncodedLen)
-	/// Storage: Referenda DecidingCount (r:1 w:1)
-	/// Proof: Referenda DecidingCount (max_values: None, max_size: Some(14), added: 2489, mode: MaxEncodedLen)
-	/// Storage: Balances InactiveIssuance (r:1 w:0)
-	/// Proof: Balances InactiveIssuance (max_values: Some(1), max_size: Some(16), added: 511, mode: MaxEncodedLen)
-	/// Storage: Scheduler Agenda (r:2 w:2)
-	/// Proof: Scheduler Agenda (max_values: None, max_size: Some(38963), added: 41438, mode: MaxEncodedLen)
-	fn place_decision_deposit_passing() -> Weight {
-		// Proof Size summary in bytes:
-		//  Measured:  `544`
-		//  Estimated: `83866`
-		// Minimum execution time: 64_860_000 picoseconds.
-		Weight::from_parts(66_772_000, 0)
-			.saturating_add(Weight::from_parts(0, 83866))
-			.saturating_add(T::DbWeight::get().reads(5))
-			.saturating_add(T::DbWeight::get().writes(4))
-	}
-	/// Storage: Referenda ReferendumInfoFor (r:1 w:1)
-	/// Proof: Referenda ReferendumInfoFor (max_values: None, max_size: Some(936), added: 3411, mode: MaxEncodedLen)
-	/// Storage: Referenda DecidingCount (r:1 w:1)
-	/// Proof: Referenda DecidingCount (max_values: None, max_size: Some(14), added: 2489, mode: MaxEncodedLen)
-	/// Storage: Balances InactiveIssuance (r:1 w:0)
-	/// Proof: Balances InactiveIssuance (max_values: Some(1), max_size: Some(16), added: 511, mode: MaxEncodedLen)
-	/// Storage: Scheduler Agenda (r:2 w:2)
-	/// Proof: Scheduler Agenda (max_values: None, max_size: Some(38963), added: 41438, mode: MaxEncodedLen)
-	fn place_decision_deposit_failing() -> Weight {
-		// Proof Size summary in bytes:
-		//  Measured:  `544`
-		//  Estimated: `83866`
-		// Minimum execution time: 63_403_000 picoseconds.
-		Weight::from_parts(64_420_000, 0)
-			.saturating_add(Weight::from_parts(0, 83866))
-			.saturating_add(T::DbWeight::get().reads(5))
-			.saturating_add(T::DbWeight::get().writes(4))
-	}
-	/// Storage: Referenda ReferendumInfoFor (r:1 w:1)
-	/// Proof: Referenda ReferendumInfoFor (max_values: None, max_size: Some(936), added: 3411, mode: MaxEncodedLen)
-	fn refund_decision_deposit() -> Weight {
-		// Proof Size summary in bytes:
-		//  Measured:  `384`
-		//  Estimated: `4401`
-		// Minimum execution time: 31_560_000 picoseconds.
-		Weight::from_parts(32_111_000, 0)
-			.saturating_add(Weight::from_parts(0, 4401))
-			.saturating_add(T::DbWeight::get().reads(1))
-			.saturating_add(T::DbWeight::get().writes(1))
-	}
-	/// Storage: Referenda ReferendumInfoFor (r:1 w:1)
-	/// Proof: Referenda ReferendumInfoFor (max_values: None, max_size: Some(936), added: 3411, mode: MaxEncodedLen)
-	fn refund_submission_deposit() -> Weight {
-		// Proof Size summary in bytes:
-		//  Measured:  `374`
-		//  Estimated: `4401`
-		// Minimum execution time: 31_536_000 picoseconds.
-		Weight::from_parts(32_118_000, 0)
-			.saturating_add(Weight::from_parts(0, 4401))
-			.saturating_add(T::DbWeight::get().reads(1))
-			.saturating_add(T::DbWeight::get().writes(1))
-	}
-	/// Storage: Referenda ReferendumInfoFor (r:1 w:1)
-	/// Proof: Referenda ReferendumInfoFor (max_values: None, max_size: Some(936), added: 3411, mode: MaxEncodedLen)
-	/// Storage: Scheduler Agenda (r:2 w:2)
-	/// Proof: Scheduler Agenda (max_values: None, max_size: Some(38963), added: 41438, mode: MaxEncodedLen)
-	fn cancel() -> Weight {
-		// Proof Size summary in bytes:
-		//  Measured:  `452`
-		//  Estimated: `83866`
-		// Minimum execution time: 39_132_000 picoseconds.
-		Weight::from_parts(39_878_000, 0)
-			.saturating_add(Weight::from_parts(0, 83866))
-			.saturating_add(T::DbWeight::get().reads(3))
-			.saturating_add(T::DbWeight::get().writes(3))
-	}
-	/// Storage: Referenda ReferendumInfoFor (r:1 w:1)
-	/// Proof: Referenda ReferendumInfoFor (max_values: None, max_size: Some(936), added: 3411, mode: MaxEncodedLen)
-	/// Storage: Scheduler Agenda (r:2 w:2)
-	/// Proof: Scheduler Agenda (max_values: None, max_size: Some(38963), added: 41438, mode: MaxEncodedLen)
-	/// Storage: Referenda MetadataOf (r:1 w:0)
-	/// Proof: Referenda MetadataOf (max_values: None, max_size: Some(52), added: 2527, mode: MaxEncodedLen)
-	fn kill() -> Weight {
-		// Proof Size summary in bytes:
-		//  Measured:  `693`
-		//  Estimated: `83866`
-		// Minimum execution time: 105_261_000 picoseconds.
-		Weight::from_parts(106_923_000, 0)
-			.saturating_add(Weight::from_parts(0, 83866))
-			.saturating_add(T::DbWeight::get().reads(4))
-			.saturating_add(T::DbWeight::get().writes(3))
-	}
-	/// Storage: Referenda TrackQueue (r:1 w:0)
-	/// Proof: Referenda TrackQueue (max_values: None, max_size: Some(2012), added: 4487, mode: MaxEncodedLen)
-	/// Storage: Referenda DecidingCount (r:1 w:1)
-	/// Proof: Referenda DecidingCount (max_values: None, max_size: Some(14), added: 2489, mode: MaxEncodedLen)
-	fn one_fewer_deciding_queue_empty() -> Weight {
-		// Proof Size summary in bytes:
-		//  Measured:  `207`
-		//  Estimated: `5477`
-		// Minimum execution time: 9_171_000 picoseconds.
-		Weight::from_parts(9_585_000, 0)
-			.saturating_add(Weight::from_parts(0, 5477))
-			.saturating_add(T::DbWeight::get().reads(2))
-			.saturating_add(T::DbWeight::get().writes(1))
-	}
-	/// Storage: Referenda TrackQueue (r:1 w:1)
-	/// Proof: Referenda TrackQueue (max_values: None, max_size: Some(2012), added: 4487, mode: MaxEncodedLen)
-	/// Storage: Referenda ReferendumInfoFor (r:1 w:1)
-	/// Proof: Referenda ReferendumInfoFor (max_values: None, max_size: Some(936), added: 3411, mode: MaxEncodedLen)
-	/// Storage: Balances InactiveIssuance (r:1 w:0)
-	/// Proof: Balances InactiveIssuance (max_values: Some(1), max_size: Some(16), added: 511, mode: MaxEncodedLen)
-	/// Storage: Scheduler Agenda (r:1 w:1)
-	/// Proof: Scheduler Agenda (max_values: None, max_size: Some(38963), added: 41438, mode: MaxEncodedLen)
-	fn one_fewer_deciding_failing() -> Weight {
-		// Proof Size summary in bytes:
-		//  Measured:  `3221`
-		//  Estimated: `42428`
-		// Minimum execution time: 49_135_000 picoseconds.
-		Weight::from_parts(50_860_000, 0)
-			.saturating_add(Weight::from_parts(0, 42428))
-			.saturating_add(T::DbWeight::get().reads(4))
-			.saturating_add(T::DbWeight::get().writes(3))
-	}
-	/// Storage: Referenda TrackQueue (r:1 w:1)
-	/// Proof: Referenda TrackQueue (max_values: None, max_size: Some(2012), added: 4487, mode: MaxEncodedLen)
-	/// Storage: Referenda ReferendumInfoFor (r:1 w:1)
-	/// Proof: Referenda ReferendumInfoFor (max_values: None, max_size: Some(936), added: 3411, mode: MaxEncodedLen)
-	/// Storage: Balances InactiveIssuance (r:1 w:0)
-	/// Proof: Balances InactiveIssuance (max_values: Some(1), max_size: Some(16), added: 511, mode: MaxEncodedLen)
-	/// Storage: Scheduler Agenda (r:1 w:1)
-	/// Proof: Scheduler Agenda (max_values: None, max_size: Some(38963), added: 41438, mode: MaxEncodedLen)
-	fn one_fewer_deciding_passing() -> Weight {
-		// Proof Size summary in bytes:
-		//  Measured:  `3221`
-		//  Estimated: `42428`
-		// Minimum execution time: 53_279_000 picoseconds.
-		Weight::from_parts(54_069_000, 0)
-			.saturating_add(Weight::from_parts(0, 42428))
-			.saturating_add(T::DbWeight::get().reads(4))
-			.saturating_add(T::DbWeight::get().writes(3))
-	}
-	/// Storage: Referenda ReferendumInfoFor (r:1 w:0)
-	/// Proof: Referenda ReferendumInfoFor (max_values: None, max_size: Some(936), added: 3411, mode: MaxEncodedLen)
-	/// Storage: Referenda TrackQueue (r:1 w:1)
-	/// Proof: Referenda TrackQueue (max_values: None, max_size: Some(2012), added: 4487, mode: MaxEncodedLen)
-	fn nudge_referendum_requeued_insertion() -> Weight {
-		// Proof Size summary in bytes:
-		//  Measured:  `3044`
-		//  Estimated: `5477`
-		// Minimum execution time: 22_537_000 picoseconds.
-		Weight::from_parts(23_853_000, 0)
-			.saturating_add(Weight::from_parts(0, 5477))
-			.saturating_add(T::DbWeight::get().reads(2))
-			.saturating_add(T::DbWeight::get().writes(1))
-	}
-	/// Storage: Referenda ReferendumInfoFor (r:1 w:0)
-	/// Proof: Referenda ReferendumInfoFor (max_values: None, max_size: Some(936), added: 3411, mode: MaxEncodedLen)
-	/// Storage: Referenda TrackQueue (r:1 w:1)
-	/// Proof: Referenda TrackQueue (max_values: None, max_size: Some(2012), added: 4487, mode: MaxEncodedLen)
-	fn nudge_referendum_requeued_slide() -> Weight {
-		// Proof Size summary in bytes:
-		//  Measured:  `3044`
-		//  Estimated: `5477`
-		// Minimum execution time: 22_686_000 picoseconds.
-		Weight::from_parts(23_947_000, 0)
-			.saturating_add(Weight::from_parts(0, 5477))
-			.saturating_add(T::DbWeight::get().reads(2))
-			.saturating_add(T::DbWeight::get().writes(1))
-	}
-	/// Storage: Referenda ReferendumInfoFor (r:1 w:1)
-	/// Proof: Referenda ReferendumInfoFor (max_values: None, max_size: Some(936), added: 3411, mode: MaxEncodedLen)
-	/// Storage: Referenda DecidingCount (r:1 w:0)
-	/// Proof: Referenda DecidingCount (max_values: None, max_size: Some(14), added: 2489, mode: MaxEncodedLen)
-	/// Storage: Referenda TrackQueue (r:1 w:1)
-	/// Proof: Referenda TrackQueue (max_values: None, max_size: Some(2012), added: 4487, mode: MaxEncodedLen)
-	fn nudge_referendum_queued() -> Weight {
-		// Proof Size summary in bytes:
-		//  Measured:  `3048`
-		//  Estimated: `5477`
-		// Minimum execution time: 28_373_000 picoseconds.
-		Weight::from_parts(29_033_000, 0)
-			.saturating_add(Weight::from_parts(0, 5477))
-			.saturating_add(T::DbWeight::get().reads(3))
-			.saturating_add(T::DbWeight::get().writes(2))
-	}
-	/// Storage: Referenda ReferendumInfoFor (r:1 w:1)
-	/// Proof: Referenda ReferendumInfoFor (max_values: None, max_size: Some(936), added: 3411, mode: MaxEncodedLen)
-	/// Storage: Referenda DecidingCount (r:1 w:0)
-	/// Proof: Referenda DecidingCount (max_values: None, max_size: Some(14), added: 2489, mode: MaxEncodedLen)
-	/// Storage: Referenda TrackQueue (r:1 w:1)
-	/// Proof: Referenda TrackQueue (max_values: None, max_size: Some(2012), added: 4487, mode: MaxEncodedLen)
-	fn nudge_referendum_not_queued() -> Weight {
-		// Proof Size summary in bytes:
-		//  Measured:  `3068`
-		//  Estimated: `5477`
-		// Minimum execution time: 28_137_000 picoseconds.
-		Weight::from_parts(28_716_000, 0)
-			.saturating_add(Weight::from_parts(0, 5477))
-			.saturating_add(T::DbWeight::get().reads(3))
-			.saturating_add(T::DbWeight::get().writes(2))
-	}
-	/// Storage: Referenda ReferendumInfoFor (r:1 w:1)
-	/// Proof: Referenda ReferendumInfoFor (max_values: None, max_size: Some(936), added: 3411, mode: MaxEncodedLen)
-	/// Storage: Scheduler Agenda (r:1 w:1)
-	/// Proof: Scheduler Agenda (max_values: None, max_size: Some(38963), added: 41438, mode: MaxEncodedLen)
-	fn nudge_referendum_no_deposit() -> Weight {
-		// Proof Size summary in bytes:
-		//  Measured:  `404`
-		//  Estimated: `42428`
-		// Minimum execution time: 25_880_000 picoseconds.
-		Weight::from_parts(26_405_000, 0)
-			.saturating_add(Weight::from_parts(0, 42428))
-			.saturating_add(T::DbWeight::get().reads(2))
-			.saturating_add(T::DbWeight::get().writes(2))
-	}
-	/// Storage: Referenda ReferendumInfoFor (r:1 w:1)
-	/// Proof: Referenda ReferendumInfoFor (max_values: None, max_size: Some(936), added: 3411, mode: MaxEncodedLen)
-	/// Storage: Scheduler Agenda (r:1 w:1)
-	/// Proof: Scheduler Agenda (max_values: None, max_size: Some(38963), added: 41438, mode: MaxEncodedLen)
-	fn nudge_referendum_preparing() -> Weight {
-		// Proof Size summary in bytes:
-		//  Measured:  `452`
-		//  Estimated: `42428`
-		// Minimum execution time: 26_349_000 picoseconds.
-		Weight::from_parts(27_181_000, 0)
-			.saturating_add(Weight::from_parts(0, 42428))
-			.saturating_add(T::DbWeight::get().reads(2))
-			.saturating_add(T::DbWeight::get().writes(2))
-	}
-	/// Storage: Referenda ReferendumInfoFor (r:1 w:1)
-	/// Proof: Referenda ReferendumInfoFor (max_values: None, max_size: Some(936), added: 3411, mode: MaxEncodedLen)
-	fn nudge_referendum_timed_out() -> Weight {
-		// Proof Size summary in bytes:
-		//  Measured:  `311`
-		//  Estimated: `4401`
-		// Minimum execution time: 17_735_000 picoseconds.
-		Weight::from_parts(18_130_000, 0)
-			.saturating_add(Weight::from_parts(0, 4401))
-			.saturating_add(T::DbWeight::get().reads(1))
-			.saturating_add(T::DbWeight::get().writes(1))
-	}
-	/// Storage: Referenda ReferendumInfoFor (r:1 w:1)
-	/// Proof: Referenda ReferendumInfoFor (max_values: None, max_size: Some(936), added: 3411, mode: MaxEncodedLen)
-	/// Storage: Referenda DecidingCount (r:1 w:1)
-	/// Proof: Referenda DecidingCount (max_values: None, max_size: Some(14), added: 2489, mode: MaxEncodedLen)
-	/// Storage: Balances InactiveIssuance (r:1 w:0)
-	/// Proof: Balances InactiveIssuance (max_values: Some(1), max_size: Some(16), added: 511, mode: MaxEncodedLen)
-	/// Storage: Scheduler Agenda (r:1 w:1)
-	/// Proof: Scheduler Agenda (max_values: None, max_size: Some(38963), added: 41438, mode: MaxEncodedLen)
-	fn nudge_referendum_begin_deciding_failing() -> Weight {
-		// Proof Size summary in bytes:
-		//  Measured:  `452`
-		//  Estimated: `42428`
-		// Minimum execution time: 36_244_000 picoseconds.
-		Weight::from_parts(37_174_000, 0)
-			.saturating_add(Weight::from_parts(0, 42428))
-			.saturating_add(T::DbWeight::get().reads(4))
-			.saturating_add(T::DbWeight::get().writes(3))
-	}
-	/// Storage: Referenda ReferendumInfoFor (r:1 w:1)
-	/// Proof: Referenda ReferendumInfoFor (max_values: None, max_size: Some(936), added: 3411, mode: MaxEncodedLen)
-	/// Storage: Referenda DecidingCount (r:1 w:1)
-	/// Proof: Referenda DecidingCount (max_values: None, max_size: Some(14), added: 2489, mode: MaxEncodedLen)
-	/// Storage: Balances InactiveIssuance (r:1 w:0)
-	/// Proof: Balances InactiveIssuance (max_values: Some(1), max_size: Some(16), added: 511, mode: MaxEncodedLen)
-	/// Storage: Scheduler Agenda (r:1 w:1)
-	/// Proof: Scheduler Agenda (max_values: None, max_size: Some(38963), added: 41438, mode: MaxEncodedLen)
-	fn nudge_referendum_begin_deciding_passing() -> Weight {
-		// Proof Size summary in bytes:
-		//  Measured:  `452`
-		//  Estimated: `42428`
-		// Minimum execution time: 38_250_000 picoseconds.
-		Weight::from_parts(38_771_000, 0)
-			.saturating_add(Weight::from_parts(0, 42428))
-			.saturating_add(T::DbWeight::get().reads(4))
-			.saturating_add(T::DbWeight::get().writes(3))
-	}
-	/// Storage: Referenda ReferendumInfoFor (r:1 w:1)
-	/// Proof: Referenda ReferendumInfoFor (max_values: None, max_size: Some(936), added: 3411, mode: MaxEncodedLen)
-	/// Storage: Balances InactiveIssuance (r:1 w:0)
-	/// Proof: Balances InactiveIssuance (max_values: Some(1), max_size: Some(16), added: 511, mode: MaxEncodedLen)
-	/// Storage: Scheduler Agenda (r:1 w:1)
-	/// Proof: Scheduler Agenda (max_values: None, max_size: Some(38963), added: 41438, mode: MaxEncodedLen)
-	fn nudge_referendum_begin_confirming() -> Weight {
-		// Proof Size summary in bytes:
-		//  Measured:  `505`
-		//  Estimated: `42428`
-		// Minimum execution time: 31_177_000 picoseconds.
-		Weight::from_parts(31_886_000, 0)
-			.saturating_add(Weight::from_parts(0, 42428))
-			.saturating_add(T::DbWeight::get().reads(3))
-			.saturating_add(T::DbWeight::get().writes(2))
-	}
-	/// Storage: Referenda ReferendumInfoFor (r:1 w:1)
-	/// Proof: Referenda ReferendumInfoFor (max_values: None, max_size: Some(936), added: 3411, mode: MaxEncodedLen)
-	/// Storage: Balances InactiveIssuance (r:1 w:0)
-	/// Proof: Balances InactiveIssuance (max_values: Some(1), max_size: Some(16), added: 511, mode: MaxEncodedLen)
-	/// Storage: Scheduler Agenda (r:1 w:1)
-	/// Proof: Scheduler Agenda (max_values: None, max_size: Some(38963), added: 41438, mode: MaxEncodedLen)
-	fn nudge_referendum_end_confirming() -> Weight {
-		// Proof Size summary in bytes:
-		//  Measured:  `488`
-		//  Estimated: `42428`
-		// Minimum execution time: 31_826_000 picoseconds.
-		Weight::from_parts(32_664_000, 0)
-			.saturating_add(Weight::from_parts(0, 42428))
-			.saturating_add(T::DbWeight::get().reads(3))
-			.saturating_add(T::DbWeight::get().writes(2))
-	}
-	/// Storage: Referenda ReferendumInfoFor (r:1 w:1)
-	/// Proof: Referenda ReferendumInfoFor (max_values: None, max_size: Some(936), added: 3411, mode: MaxEncodedLen)
-	/// Storage: Balances InactiveIssuance (r:1 w:0)
-	/// Proof: Balances InactiveIssuance (max_values: Some(1), max_size: Some(16), added: 511, mode: MaxEncodedLen)
-	/// Storage: Scheduler Agenda (r:1 w:1)
-	/// Proof: Scheduler Agenda (max_values: None, max_size: Some(38963), added: 41438, mode: MaxEncodedLen)
-	fn nudge_referendum_continue_not_confirming() -> Weight {
-		// Proof Size summary in bytes:
-		//  Measured:  `505`
-		//  Estimated: `42428`
-		// Minimum execution time: 28_957_000 picoseconds.
-		Weight::from_parts(29_810_000, 0)
-			.saturating_add(Weight::from_parts(0, 42428))
-			.saturating_add(T::DbWeight::get().reads(3))
-			.saturating_add(T::DbWeight::get().writes(2))
-	}
-	/// Storage: Referenda ReferendumInfoFor (r:1 w:1)
-	/// Proof: Referenda ReferendumInfoFor (max_values: None, max_size: Some(936), added: 3411, mode: MaxEncodedLen)
-	/// Storage: Balances InactiveIssuance (r:1 w:0)
-	/// Proof: Balances InactiveIssuance (max_values: Some(1), max_size: Some(16), added: 511, mode: MaxEncodedLen)
-	/// Storage: Scheduler Agenda (r:1 w:1)
-	/// Proof: Scheduler Agenda (max_values: None, max_size: Some(38963), added: 41438, mode: MaxEncodedLen)
-	fn nudge_referendum_continue_confirming() -> Weight {
-		// Proof Size summary in bytes:
-		//  Measured:  `509`
-		//  Estimated: `42428`
-		// Minimum execution time: 28_002_000 picoseconds.
-		Weight::from_parts(28_440_000, 0)
-			.saturating_add(Weight::from_parts(0, 42428))
-			.saturating_add(T::DbWeight::get().reads(3))
-			.saturating_add(T::DbWeight::get().writes(2))
-	}
-	/// Storage: Referenda ReferendumInfoFor (r:1 w:1)
-	/// Proof: Referenda ReferendumInfoFor (max_values: None, max_size: Some(936), added: 3411, mode: MaxEncodedLen)
-	/// Storage: Balances InactiveIssuance (r:1 w:0)
-	/// Proof: Balances InactiveIssuance (max_values: Some(1), max_size: Some(16), added: 511, mode: MaxEncodedLen)
-	/// Storage: Scheduler Agenda (r:2 w:2)
-	/// Proof: Scheduler Agenda (max_values: None, max_size: Some(38963), added: 41438, mode: MaxEncodedLen)
-	/// Storage: Scheduler Lookup (r:1 w:1)
-	/// Proof: Scheduler Lookup (max_values: None, max_size: Some(48), added: 2523, mode: MaxEncodedLen)
-	fn nudge_referendum_approved() -> Weight {
-		// Proof Size summary in bytes:
-		//  Measured:  `509`
-		//  Estimated: `83866`
-		// Minimum execution time: 43_527_000 picoseconds.
-		Weight::from_parts(44_536_000, 0)
-			.saturating_add(Weight::from_parts(0, 83866))
-			.saturating_add(T::DbWeight::get().reads(5))
-			.saturating_add(T::DbWeight::get().writes(4))
-	}
-	/// Storage: Referenda ReferendumInfoFor (r:1 w:1)
-	/// Proof: Referenda ReferendumInfoFor (max_values: None, max_size: Some(936), added: 3411, mode: MaxEncodedLen)
-	/// Storage: Balances InactiveIssuance (r:1 w:0)
-	/// Proof: Balances InactiveIssuance (max_values: Some(1), max_size: Some(16), added: 511, mode: MaxEncodedLen)
-	/// Storage: Scheduler Agenda (r:1 w:1)
-	/// Proof: Scheduler Agenda (max_values: None, max_size: Some(38963), added: 41438, mode: MaxEncodedLen)
-	fn nudge_referendum_rejected() -> Weight {
-		// Proof Size summary in bytes:
-		//  Measured:  `505`
-		//  Estimated: `42428`
-		// Minimum execution time: 31_767_000 picoseconds.
-		Weight::from_parts(32_407_000, 0)
-			.saturating_add(Weight::from_parts(0, 42428))
-			.saturating_add(T::DbWeight::get().reads(3))
-			.saturating_add(T::DbWeight::get().writes(2))
-	}
-	/// Storage: Referenda ReferendumInfoFor (r:1 w:0)
-	/// Proof: Referenda ReferendumInfoFor (max_values: None, max_size: Some(936), added: 3411, mode: MaxEncodedLen)
-	/// Storage: Preimage StatusFor (r:1 w:0)
-	/// Proof: Preimage StatusFor (max_values: None, max_size: Some(91), added: 2566, mode: MaxEncodedLen)
-	/// Storage: Referenda MetadataOf (r:0 w:1)
-	/// Proof: Referenda MetadataOf (max_values: None, max_size: Some(52), added: 2527, mode: MaxEncodedLen)
-	fn set_some_metadata() -> Weight {
-		// Proof Size summary in bytes:
-		//  Measured:  `455`
-		//  Estimated: `4401`
-		// Minimum execution time: 21_013_000 picoseconds.
-		Weight::from_parts(21_503_000, 0)
-			.saturating_add(Weight::from_parts(0, 4401))
-			.saturating_add(T::DbWeight::get().reads(2))
-			.saturating_add(T::DbWeight::get().writes(1))
-	}
-	/// Storage: Referenda ReferendumInfoFor (r:1 w:0)
-	/// Proof: Referenda ReferendumInfoFor (max_values: None, max_size: Some(936), added: 3411, mode: MaxEncodedLen)
-	/// Storage: Referenda MetadataOf (r:1 w:1)
-	/// Proof: Referenda MetadataOf (max_values: None, max_size: Some(52), added: 2527, mode: MaxEncodedLen)
-	fn clear_metadata() -> Weight {
-		// Proof Size summary in bytes:
-		//  Measured:  `388`
-		//  Estimated: `4401`
-		// Minimum execution time: 18_535_000 picoseconds.
-		Weight::from_parts(19_056_000, 0)
-			.saturating_add(Weight::from_parts(0, 4401))
-			.saturating_add(T::DbWeight::get().reads(2))
-			.saturating_add(T::DbWeight::get().writes(1))
-	}
-}
diff --git a/polkadot/runtime/polkadot/src/weights/pallet_scheduler.rs b/polkadot/runtime/polkadot/src/weights/pallet_scheduler.rs
deleted file mode 100644
index 79ad62954ec66bea85994112976fa9966d991f7e..0000000000000000000000000000000000000000
--- a/polkadot/runtime/polkadot/src/weights/pallet_scheduler.rs
+++ /dev/null
@@ -1,207 +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/>.
-
-//! Autogenerated weights for `pallet_scheduler`
-//!
-//! THIS FILE WAS AUTO-GENERATED USING THE SUBSTRATE BENCHMARK CLI VERSION 4.0.0-dev
-//! DATE: 2023-06-18, STEPS: `50`, REPEAT: `20`, LOW RANGE: `[]`, HIGH RANGE: `[]`
-//! WORST CASE MAP SIZE: `1000000`
-//! HOSTNAME: `runner-e8ezs4ez-project-163-concurrent-0`, CPU: `Intel(R) Xeon(R) CPU @ 2.60GHz`
-//! EXECUTION: Some(Wasm), WASM-EXECUTION: Compiled, CHAIN: Some("polkadot-dev"), DB CACHE: 1024
-
-// Executed Command:
-// ./target/production/polkadot
-// benchmark
-// pallet
-// --chain=polkadot-dev
-// --steps=50
-// --repeat=20
-// --no-storage-info
-// --no-median-slopes
-// --no-min-squares
-// --pallet=pallet_scheduler
-// --extrinsic=*
-// --execution=wasm
-// --wasm-execution=compiled
-// --header=./file_header.txt
-// --output=./runtime/polkadot/src/weights/
-
-#![cfg_attr(rustfmt, rustfmt_skip)]
-#![allow(unused_parens)]
-#![allow(unused_imports)]
-#![allow(missing_docs)]
-
-use frame_support::{traits::Get, weights::Weight};
-use core::marker::PhantomData;
-
-/// Weight functions for `pallet_scheduler`.
-pub struct WeightInfo<T>(PhantomData<T>);
-impl<T: frame_system::Config> pallet_scheduler::WeightInfo for WeightInfo<T> {
-	/// Storage: Scheduler IncompleteSince (r:1 w:1)
-	/// Proof: Scheduler IncompleteSince (max_values: Some(1), max_size: Some(4), added: 499, mode: MaxEncodedLen)
-	fn service_agendas_base() -> Weight {
-		// Proof Size summary in bytes:
-		//  Measured:  `69`
-		//  Estimated: `1489`
-		// Minimum execution time: 5_003_000 picoseconds.
-		Weight::from_parts(5_239_000, 0)
-			.saturating_add(Weight::from_parts(0, 1489))
-			.saturating_add(T::DbWeight::get().reads(1))
-			.saturating_add(T::DbWeight::get().writes(1))
-	}
-	/// Storage: Scheduler Agenda (r:1 w:1)
-	/// Proof: Scheduler Agenda (max_values: None, max_size: Some(38963), added: 41438, mode: MaxEncodedLen)
-	/// The range of component `s` is `[0, 50]`.
-	fn service_agenda_base(s: u32, ) -> Weight {
-		// Proof Size summary in bytes:
-		//  Measured:  `116 + s * (177 ±0)`
-		//  Estimated: `42428`
-		// Minimum execution time: 4_577_000 picoseconds.
-		Weight::from_parts(7_388_958, 0)
-			.saturating_add(Weight::from_parts(0, 42428))
-			// Standard Error: 1_944
-			.saturating_add(Weight::from_parts(898_872, 0).saturating_mul(s.into()))
-			.saturating_add(T::DbWeight::get().reads(1))
-			.saturating_add(T::DbWeight::get().writes(1))
-	}
-	fn service_task_base() -> Weight {
-		// Proof Size summary in bytes:
-		//  Measured:  `0`
-		//  Estimated: `0`
-		// Minimum execution time: 5_430_000 picoseconds.
-		Weight::from_parts(5_696_000, 0)
-			.saturating_add(Weight::from_parts(0, 0))
-	}
-	/// Storage: Preimage PreimageFor (r:1 w:1)
-	/// Proof: Preimage PreimageFor (max_values: None, max_size: Some(4194344), added: 4196819, mode: Measured)
-	/// Storage: Preimage StatusFor (r:1 w:1)
-	/// Proof: Preimage StatusFor (max_values: None, max_size: Some(91), added: 2566, mode: MaxEncodedLen)
-	/// The range of component `s` is `[128, 4194304]`.
-	fn service_task_fetched(s: u32, ) -> Weight {
-		// Proof Size summary in bytes:
-		//  Measured:  `179 + s * (1 ±0)`
-		//  Estimated: `3644 + s * (1 ±0)`
-		// Minimum execution time: 20_567_000 picoseconds.
-		Weight::from_parts(20_856_000, 0)
-			.saturating_add(Weight::from_parts(0, 3644))
-			// Standard Error: 3
-			.saturating_add(Weight::from_parts(1_523, 0).saturating_mul(s.into()))
-			.saturating_add(T::DbWeight::get().reads(2))
-			.saturating_add(T::DbWeight::get().writes(2))
-			.saturating_add(Weight::from_parts(0, 1).saturating_mul(s.into()))
-	}
-	/// Storage: Scheduler Lookup (r:0 w:1)
-	/// Proof: Scheduler Lookup (max_values: None, max_size: Some(48), added: 2523, mode: MaxEncodedLen)
-	fn service_task_named() -> Weight {
-		// Proof Size summary in bytes:
-		//  Measured:  `0`
-		//  Estimated: `0`
-		// Minimum execution time: 7_013_000 picoseconds.
-		Weight::from_parts(7_231_000, 0)
-			.saturating_add(Weight::from_parts(0, 0))
-			.saturating_add(T::DbWeight::get().writes(1))
-	}
-	fn service_task_periodic() -> Weight {
-		// Proof Size summary in bytes:
-		//  Measured:  `0`
-		//  Estimated: `0`
-		// Minimum execution time: 5_486_000 picoseconds.
-		Weight::from_parts(5_656_000, 0)
-			.saturating_add(Weight::from_parts(0, 0))
-	}
-	fn execute_dispatch_signed() -> Weight {
-		// Proof Size summary in bytes:
-		//  Measured:  `0`
-		//  Estimated: `0`
-		// Minimum execution time: 2_532_000 picoseconds.
-		Weight::from_parts(2_635_000, 0)
-			.saturating_add(Weight::from_parts(0, 0))
-	}
-	fn execute_dispatch_unsigned() -> Weight {
-		// Proof Size summary in bytes:
-		//  Measured:  `0`
-		//  Estimated: `0`
-		// Minimum execution time: 2_502_000 picoseconds.
-		Weight::from_parts(2_615_000, 0)
-			.saturating_add(Weight::from_parts(0, 0))
-	}
-	/// Storage: Scheduler Agenda (r:1 w:1)
-	/// Proof: Scheduler Agenda (max_values: None, max_size: Some(38963), added: 41438, mode: MaxEncodedLen)
-	/// The range of component `s` is `[0, 49]`.
-	fn schedule(s: u32, ) -> Weight {
-		// Proof Size summary in bytes:
-		//  Measured:  `116 + s * (177 ±0)`
-		//  Estimated: `42428`
-		// Minimum execution time: 14_011_000 picoseconds.
-		Weight::from_parts(16_753_097, 0)
-			.saturating_add(Weight::from_parts(0, 42428))
-			// Standard Error: 1_751
-			.saturating_add(Weight::from_parts(908_905, 0).saturating_mul(s.into()))
-			.saturating_add(T::DbWeight::get().reads(1))
-			.saturating_add(T::DbWeight::get().writes(1))
-	}
-	/// Storage: Scheduler Agenda (r:1 w:1)
-	/// Proof: Scheduler Agenda (max_values: None, max_size: Some(38963), added: 41438, mode: MaxEncodedLen)
-	/// Storage: Scheduler Lookup (r:0 w:1)
-	/// Proof: Scheduler Lookup (max_values: None, max_size: Some(48), added: 2523, mode: MaxEncodedLen)
-	/// The range of component `s` is `[1, 50]`.
-	fn cancel(s: u32, ) -> Weight {
-		// Proof Size summary in bytes:
-		//  Measured:  `116 + s * (177 ±0)`
-		//  Estimated: `42428`
-		// Minimum execution time: 18_326_000 picoseconds.
-		Weight::from_parts(17_114_477, 0)
-			.saturating_add(Weight::from_parts(0, 42428))
-			// Standard Error: 2_468
-			.saturating_add(Weight::from_parts(1_642_647, 0).saturating_mul(s.into()))
-			.saturating_add(T::DbWeight::get().reads(1))
-			.saturating_add(T::DbWeight::get().writes(2))
-	}
-	/// Storage: Scheduler Lookup (r:1 w:1)
-	/// Proof: Scheduler Lookup (max_values: None, max_size: Some(48), added: 2523, mode: MaxEncodedLen)
-	/// Storage: Scheduler Agenda (r:1 w:1)
-	/// Proof: Scheduler Agenda (max_values: None, max_size: Some(38963), added: 41438, mode: MaxEncodedLen)
-	/// The range of component `s` is `[0, 49]`.
-	fn schedule_named(s: u32, ) -> Weight {
-		// Proof Size summary in bytes:
-		//  Measured:  `293 + s * (185 ±0)`
-		//  Estimated: `42428`
-		// Minimum execution time: 16_885_000 picoseconds.
-		Weight::from_parts(20_432_099, 0)
-			.saturating_add(Weight::from_parts(0, 42428))
-			// Standard Error: 2_865
-			.saturating_add(Weight::from_parts(954_709, 0).saturating_mul(s.into()))
-			.saturating_add(T::DbWeight::get().reads(2))
-			.saturating_add(T::DbWeight::get().writes(2))
-	}
-	/// Storage: Scheduler Lookup (r:1 w:1)
-	/// Proof: Scheduler Lookup (max_values: None, max_size: Some(48), added: 2523, mode: MaxEncodedLen)
-	/// Storage: Scheduler Agenda (r:1 w:1)
-	/// Proof: Scheduler Agenda (max_values: None, max_size: Some(38963), added: 41438, mode: MaxEncodedLen)
-	/// The range of component `s` is `[1, 50]`.
-	fn cancel_named(s: u32, ) -> Weight {
-		// Proof Size summary in bytes:
-		//  Measured:  `319 + s * (185 ±0)`
-		//  Estimated: `42428`
-		// Minimum execution time: 19_988_000 picoseconds.
-		Weight::from_parts(19_533_754, 0)
-			.saturating_add(Weight::from_parts(0, 42428))
-			// Standard Error: 3_226
-			.saturating_add(Weight::from_parts(1_671_811, 0).saturating_mul(s.into()))
-			.saturating_add(T::DbWeight::get().reads(2))
-			.saturating_add(T::DbWeight::get().writes(2))
-	}
-}
diff --git a/polkadot/runtime/polkadot/src/weights/pallet_session.rs b/polkadot/runtime/polkadot/src/weights/pallet_session.rs
deleted file mode 100644
index 53f470ef5340b10b9ef51dd3ed4696780112c86e..0000000000000000000000000000000000000000
--- a/polkadot/runtime/polkadot/src/weights/pallet_session.rs
+++ /dev/null
@@ -1,85 +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/>.
-
-//! Autogenerated weights for `pallet_session`
-//!
-//! THIS FILE WAS AUTO-GENERATED USING THE SUBSTRATE BENCHMARK CLI VERSION 4.0.0-dev
-//! DATE: 2023-06-18, STEPS: `50`, REPEAT: `20`, LOW RANGE: `[]`, HIGH RANGE: `[]`
-//! WORST CASE MAP SIZE: `1000000`
-//! HOSTNAME: `runner-e8ezs4ez-project-163-concurrent-0`, CPU: `Intel(R) Xeon(R) CPU @ 2.60GHz`
-//! EXECUTION: Some(Wasm), WASM-EXECUTION: Compiled, CHAIN: Some("polkadot-dev"), DB CACHE: 1024
-
-// Executed Command:
-// ./target/production/polkadot
-// benchmark
-// pallet
-// --chain=polkadot-dev
-// --steps=50
-// --repeat=20
-// --no-storage-info
-// --no-median-slopes
-// --no-min-squares
-// --pallet=pallet_session
-// --extrinsic=*
-// --execution=wasm
-// --wasm-execution=compiled
-// --header=./file_header.txt
-// --output=./runtime/polkadot/src/weights/
-
-#![cfg_attr(rustfmt, rustfmt_skip)]
-#![allow(unused_parens)]
-#![allow(unused_imports)]
-#![allow(missing_docs)]
-
-use frame_support::{traits::Get, weights::Weight};
-use core::marker::PhantomData;
-
-/// Weight functions for `pallet_session`.
-pub struct WeightInfo<T>(PhantomData<T>);
-impl<T: frame_system::Config> pallet_session::WeightInfo for WeightInfo<T> {
-	/// Storage: Staking Ledger (r:1 w:0)
-	/// Proof: Staking Ledger (max_values: None, max_size: Some(1091), added: 3566, mode: MaxEncodedLen)
-	/// Storage: Session NextKeys (r:1 w:1)
-	/// Proof Skipped: Session NextKeys (max_values: None, max_size: None, mode: Measured)
-	/// Storage: Session KeyOwner (r:6 w:6)
-	/// Proof Skipped: Session KeyOwner (max_values: None, max_size: None, mode: Measured)
-	fn set_keys() -> Weight {
-		// Proof Size summary in bytes:
-		//  Measured:  `1920`
-		//  Estimated: `17760`
-		// Minimum execution time: 59_408_000 picoseconds.
-		Weight::from_parts(60_600_000, 0)
-			.saturating_add(Weight::from_parts(0, 17760))
-			.saturating_add(T::DbWeight::get().reads(8))
-			.saturating_add(T::DbWeight::get().writes(7))
-	}
-	/// Storage: Staking Ledger (r:1 w:0)
-	/// Proof: Staking Ledger (max_values: None, max_size: Some(1091), added: 3566, mode: MaxEncodedLen)
-	/// Storage: Session NextKeys (r:1 w:1)
-	/// Proof Skipped: Session NextKeys (max_values: None, max_size: None, mode: Measured)
-	/// Storage: Session KeyOwner (r:0 w:6)
-	/// Proof Skipped: Session KeyOwner (max_values: None, max_size: None, mode: Measured)
-	fn purge_keys() -> Weight {
-		// Proof Size summary in bytes:
-		//  Measured:  `1784`
-		//  Estimated: `5249`
-		// Minimum execution time: 42_078_000 picoseconds.
-		Weight::from_parts(43_200_000, 0)
-			.saturating_add(Weight::from_parts(0, 5249))
-			.saturating_add(T::DbWeight::get().reads(2))
-			.saturating_add(T::DbWeight::get().writes(7))
-	}
-}
diff --git a/polkadot/runtime/polkadot/src/weights/pallet_staking.rs b/polkadot/runtime/polkadot/src/weights/pallet_staking.rs
deleted file mode 100644
index 80a60467eda137aeda6ee08460537679af4b40f9..0000000000000000000000000000000000000000
--- a/polkadot/runtime/polkadot/src/weights/pallet_staking.rs
+++ /dev/null
@@ -1,796 +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/>.
-
-//! Autogenerated weights for `pallet_staking`
-//!
-//! THIS FILE WAS AUTO-GENERATED USING THE SUBSTRATE BENCHMARK CLI VERSION 4.0.0-dev
-//! DATE: 2023-06-19, STEPS: `50`, REPEAT: `20`, LOW RANGE: `[]`, HIGH RANGE: `[]`
-//! WORST CASE MAP SIZE: `1000000`
-//! HOSTNAME: `runner-e8ezs4ez-project-163-concurrent-0`, CPU: `Intel(R) Xeon(R) CPU @ 2.60GHz`
-//! EXECUTION: Some(Wasm), WASM-EXECUTION: Compiled, CHAIN: Some("polkadot-dev"), DB CACHE: 1024
-
-// Executed Command:
-// ./target/production/polkadot
-// benchmark
-// pallet
-// --chain=polkadot-dev
-// --steps=50
-// --repeat=20
-// --no-storage-info
-// --no-median-slopes
-// --no-min-squares
-// --pallet=pallet_staking
-// --extrinsic=*
-// --execution=wasm
-// --wasm-execution=compiled
-// --header=./file_header.txt
-// --output=./runtime/polkadot/src/weights/
-
-#![cfg_attr(rustfmt, rustfmt_skip)]
-#![allow(unused_parens)]
-#![allow(unused_imports)]
-#![allow(missing_docs)]
-
-use frame_support::{traits::Get, weights::Weight};
-use core::marker::PhantomData;
-
-/// Weight functions for `pallet_staking`.
-pub struct WeightInfo<T>(PhantomData<T>);
-impl<T: frame_system::Config> pallet_staking::WeightInfo for WeightInfo<T> {
-	/// Storage: Staking Bonded (r:1 w:1)
-	/// Proof: Staking Bonded (max_values: None, max_size: Some(72), added: 2547, mode: MaxEncodedLen)
-	/// Storage: Staking Ledger (r:1 w:1)
-	/// Proof: Staking Ledger (max_values: None, max_size: Some(1091), added: 3566, mode: MaxEncodedLen)
-	/// Storage: Staking CurrentEra (r:1 w:0)
-	/// Proof: Staking CurrentEra (max_values: Some(1), max_size: Some(4), added: 499, mode: MaxEncodedLen)
-	/// Storage: Balances Locks (r:1 w:1)
-	/// Proof: Balances Locks (max_values: None, max_size: Some(1299), added: 3774, mode: MaxEncodedLen)
-	/// Storage: Balances Freezes (r:1 w:0)
-	/// Proof: Balances Freezes (max_values: None, max_size: Some(49), added: 2524, mode: MaxEncodedLen)
-	/// Storage: Staking Payee (r:0 w:1)
-	/// Proof: Staking Payee (max_values: None, max_size: Some(73), added: 2548, mode: MaxEncodedLen)
-	fn bond() -> Weight {
-		// Proof Size summary in bytes:
-		//  Measured:  `980`
-		//  Estimated: `4764`
-		// Minimum execution time: 52_344_000 picoseconds.
-		Weight::from_parts(53_469_000, 0)
-			.saturating_add(Weight::from_parts(0, 4764))
-			.saturating_add(T::DbWeight::get().reads(5))
-			.saturating_add(T::DbWeight::get().writes(4))
-	}
-	/// Storage: Staking Bonded (r:1 w:0)
-	/// Proof: Staking Bonded (max_values: None, max_size: Some(72), added: 2547, mode: MaxEncodedLen)
-	/// Storage: Staking Ledger (r:1 w:1)
-	/// Proof: Staking Ledger (max_values: None, max_size: Some(1091), added: 3566, mode: MaxEncodedLen)
-	/// Storage: Balances Locks (r:1 w:1)
-	/// Proof: Balances Locks (max_values: None, max_size: Some(1299), added: 3774, mode: MaxEncodedLen)
-	/// Storage: Balances Freezes (r:1 w:0)
-	/// Proof: Balances Freezes (max_values: None, max_size: Some(49), added: 2524, mode: MaxEncodedLen)
-	/// Storage: VoterList ListNodes (r:3 w:3)
-	/// Proof: VoterList ListNodes (max_values: None, max_size: Some(154), added: 2629, mode: MaxEncodedLen)
-	/// Storage: VoterList ListBags (r:2 w:2)
-	/// Proof: VoterList ListBags (max_values: None, max_size: Some(82), added: 2557, mode: MaxEncodedLen)
-	fn bond_extra() -> Weight {
-		// Proof Size summary in bytes:
-		//  Measured:  `1925`
-		//  Estimated: `8877`
-		// Minimum execution time: 96_497_000 picoseconds.
-		Weight::from_parts(98_479_000, 0)
-			.saturating_add(Weight::from_parts(0, 8877))
-			.saturating_add(T::DbWeight::get().reads(9))
-			.saturating_add(T::DbWeight::get().writes(7))
-	}
-	/// Storage: Staking Ledger (r:1 w:1)
-	/// Proof: Staking Ledger (max_values: None, max_size: Some(1091), added: 3566, mode: MaxEncodedLen)
-	/// Storage: Staking Nominators (r:1 w:0)
-	/// Proof: Staking Nominators (max_values: None, max_size: Some(558), added: 3033, mode: MaxEncodedLen)
-	/// Storage: Staking MinNominatorBond (r:1 w:0)
-	/// Proof: Staking MinNominatorBond (max_values: Some(1), max_size: Some(16), added: 511, mode: MaxEncodedLen)
-	/// Storage: Staking CurrentEra (r:1 w:0)
-	/// Proof: Staking CurrentEra (max_values: Some(1), max_size: Some(4), added: 499, mode: MaxEncodedLen)
-	/// Storage: Balances Locks (r:1 w:1)
-	/// Proof: Balances Locks (max_values: None, max_size: Some(1299), added: 3774, mode: MaxEncodedLen)
-	/// Storage: Balances Freezes (r:1 w:0)
-	/// Proof: Balances Freezes (max_values: None, max_size: Some(49), added: 2524, mode: MaxEncodedLen)
-	/// Storage: VoterList ListNodes (r:3 w:3)
-	/// Proof: VoterList ListNodes (max_values: None, max_size: Some(154), added: 2629, mode: MaxEncodedLen)
-	/// Storage: Staking Bonded (r:1 w:0)
-	/// Proof: Staking Bonded (max_values: None, max_size: Some(72), added: 2547, mode: MaxEncodedLen)
-	/// Storage: VoterList ListBags (r:2 w:2)
-	/// Proof: VoterList ListBags (max_values: None, max_size: Some(82), added: 2557, mode: MaxEncodedLen)
-	fn unbond() -> Weight {
-		// Proof Size summary in bytes:
-		//  Measured:  `2132`
-		//  Estimated: `8877`
-		// Minimum execution time: 98_872_000 picoseconds.
-		Weight::from_parts(101_630_000, 0)
-			.saturating_add(Weight::from_parts(0, 8877))
-			.saturating_add(T::DbWeight::get().reads(12))
-			.saturating_add(T::DbWeight::get().writes(7))
-	}
-	/// Storage: Staking Ledger (r:1 w:1)
-	/// Proof: Staking Ledger (max_values: None, max_size: Some(1091), added: 3566, mode: MaxEncodedLen)
-	/// Storage: Staking CurrentEra (r:1 w:0)
-	/// Proof: Staking CurrentEra (max_values: Some(1), max_size: Some(4), added: 499, mode: MaxEncodedLen)
-	/// Storage: Balances Locks (r:1 w:1)
-	/// Proof: Balances Locks (max_values: None, max_size: Some(1299), added: 3774, mode: MaxEncodedLen)
-	/// Storage: Balances Freezes (r:1 w:0)
-	/// Proof: Balances Freezes (max_values: None, max_size: Some(49), added: 2524, mode: MaxEncodedLen)
-	/// The range of component `s` is `[0, 100]`.
-	fn withdraw_unbonded_update(s: u32, ) -> Weight {
-		// Proof Size summary in bytes:
-		//  Measured:  `947`
-		//  Estimated: `4764`
-		// Minimum execution time: 42_427_000 picoseconds.
-		Weight::from_parts(44_370_898, 0)
-			.saturating_add(Weight::from_parts(0, 4764))
-			// Standard Error: 1_286
-			.saturating_add(Weight::from_parts(49_383, 0).saturating_mul(s.into()))
-			.saturating_add(T::DbWeight::get().reads(4))
-			.saturating_add(T::DbWeight::get().writes(2))
-	}
-	/// Storage: Staking Ledger (r:1 w:1)
-	/// Proof: Staking Ledger (max_values: None, max_size: Some(1091), added: 3566, mode: MaxEncodedLen)
-	/// Storage: Staking CurrentEra (r:1 w:0)
-	/// Proof: Staking CurrentEra (max_values: Some(1), max_size: Some(4), added: 499, mode: MaxEncodedLen)
-	/// Storage: Staking Bonded (r:1 w:1)
-	/// Proof: Staking Bonded (max_values: None, max_size: Some(72), added: 2547, mode: MaxEncodedLen)
-	/// Storage: Staking SlashingSpans (r:1 w:1)
-	/// Proof Skipped: Staking SlashingSpans (max_values: None, max_size: None, mode: Measured)
-	/// Storage: Staking Validators (r:1 w:0)
-	/// Proof: Staking Validators (max_values: None, max_size: Some(45), added: 2520, mode: MaxEncodedLen)
-	/// Storage: Staking Nominators (r:1 w:1)
-	/// Proof: Staking Nominators (max_values: None, max_size: Some(558), added: 3033, mode: MaxEncodedLen)
-	/// Storage: Staking CounterForNominators (r:1 w:1)
-	/// Proof: Staking CounterForNominators (max_values: Some(1), max_size: Some(4), added: 499, mode: MaxEncodedLen)
-	/// Storage: VoterList ListNodes (r:2 w:2)
-	/// Proof: VoterList ListNodes (max_values: None, max_size: Some(154), added: 2629, mode: MaxEncodedLen)
-	/// Storage: VoterList ListBags (r:1 w:1)
-	/// Proof: VoterList ListBags (max_values: None, max_size: Some(82), added: 2557, mode: MaxEncodedLen)
-	/// Storage: VoterList CounterForListNodes (r:1 w:1)
-	/// Proof: VoterList CounterForListNodes (max_values: Some(1), max_size: Some(4), added: 499, mode: MaxEncodedLen)
-	/// Storage: Balances Locks (r:1 w:1)
-	/// Proof: Balances Locks (max_values: None, max_size: Some(1299), added: 3774, mode: MaxEncodedLen)
-	/// Storage: Balances Freezes (r:1 w:0)
-	/// Proof: Balances Freezes (max_values: None, max_size: Some(49), added: 2524, mode: MaxEncodedLen)
-	/// Storage: Staking Payee (r:0 w:1)
-	/// Proof: Staking Payee (max_values: None, max_size: Some(73), added: 2548, mode: MaxEncodedLen)
-	/// Storage: Staking SpanSlash (r:0 w:100)
-	/// Proof: Staking SpanSlash (max_values: None, max_size: Some(76), added: 2551, mode: MaxEncodedLen)
-	/// The range of component `s` is `[0, 100]`.
-	fn withdraw_unbonded_kill(s: u32, ) -> Weight {
-		// Proof Size summary in bytes:
-		//  Measured:  `2185 + s * (4 ±0)`
-		//  Estimated: `6248 + s * (4 ±0)`
-		// Minimum execution time: 95_067_000 picoseconds.
-		Weight::from_parts(101_507_625, 0)
-			.saturating_add(Weight::from_parts(0, 6248))
-			// Standard Error: 3_419
-			.saturating_add(Weight::from_parts(1_387_390, 0).saturating_mul(s.into()))
-			.saturating_add(T::DbWeight::get().reads(13))
-			.saturating_add(T::DbWeight::get().writes(11))
-			.saturating_add(T::DbWeight::get().writes((1_u64).saturating_mul(s.into())))
-			.saturating_add(Weight::from_parts(0, 4).saturating_mul(s.into()))
-	}
-	/// Storage: Staking Ledger (r:1 w:0)
-	/// Proof: Staking Ledger (max_values: None, max_size: Some(1091), added: 3566, mode: MaxEncodedLen)
-	/// Storage: Staking MinValidatorBond (r:1 w:0)
-	/// Proof: Staking MinValidatorBond (max_values: Some(1), max_size: Some(16), added: 511, mode: MaxEncodedLen)
-	/// Storage: Staking MinCommission (r:1 w:0)
-	/// Proof: Staking MinCommission (max_values: Some(1), max_size: Some(4), added: 499, mode: MaxEncodedLen)
-	/// Storage: Staking Validators (r:1 w:1)
-	/// Proof: Staking Validators (max_values: None, max_size: Some(45), added: 2520, mode: MaxEncodedLen)
-	/// Storage: Staking MaxValidatorsCount (r:1 w:0)
-	/// Proof: Staking MaxValidatorsCount (max_values: Some(1), max_size: Some(4), added: 499, mode: MaxEncodedLen)
-	/// Storage: Staking Nominators (r:1 w:0)
-	/// Proof: Staking Nominators (max_values: None, max_size: Some(558), added: 3033, mode: MaxEncodedLen)
-	/// Storage: Staking Bonded (r:1 w:0)
-	/// Proof: Staking Bonded (max_values: None, max_size: Some(72), added: 2547, mode: MaxEncodedLen)
-	/// Storage: VoterList ListNodes (r:1 w:1)
-	/// Proof: VoterList ListNodes (max_values: None, max_size: Some(154), added: 2629, mode: MaxEncodedLen)
-	/// Storage: VoterList ListBags (r:1 w:1)
-	/// Proof: VoterList ListBags (max_values: None, max_size: Some(82), added: 2557, mode: MaxEncodedLen)
-	/// Storage: VoterList CounterForListNodes (r:1 w:1)
-	/// Proof: VoterList CounterForListNodes (max_values: Some(1), max_size: Some(4), added: 499, mode: MaxEncodedLen)
-	/// Storage: Staking CounterForValidators (r:1 w:1)
-	/// Proof: Staking CounterForValidators (max_values: Some(1), max_size: Some(4), added: 499, mode: MaxEncodedLen)
-	fn validate() -> Weight {
-		// Proof Size summary in bytes:
-		//  Measured:  `1309`
-		//  Estimated: `4556`
-		// Minimum execution time: 58_106_000 picoseconds.
-		Weight::from_parts(59_755_000, 0)
-			.saturating_add(Weight::from_parts(0, 4556))
-			.saturating_add(T::DbWeight::get().reads(11))
-			.saturating_add(T::DbWeight::get().writes(5))
-	}
-	/// Storage: Staking Ledger (r:1 w:0)
-	/// Proof: Staking Ledger (max_values: None, max_size: Some(1091), added: 3566, mode: MaxEncodedLen)
-	/// Storage: Staking Nominators (r:128 w:128)
-	/// Proof: Staking Nominators (max_values: None, max_size: Some(558), added: 3033, mode: MaxEncodedLen)
-	/// The range of component `k` is `[1, 128]`.
-	fn kick(k: u32, ) -> Weight {
-		// Proof Size summary in bytes:
-		//  Measured:  `1214 + k * (569 ±0)`
-		//  Estimated: `4556 + k * (3033 ±0)`
-		// Minimum execution time: 30_053_000 picoseconds.
-		Weight::from_parts(30_456_129, 0)
-			.saturating_add(Weight::from_parts(0, 4556))
-			// Standard Error: 8_026
-			.saturating_add(Weight::from_parts(9_197_360, 0).saturating_mul(k.into()))
-			.saturating_add(T::DbWeight::get().reads(1))
-			.saturating_add(T::DbWeight::get().reads((1_u64).saturating_mul(k.into())))
-			.saturating_add(T::DbWeight::get().writes((1_u64).saturating_mul(k.into())))
-			.saturating_add(Weight::from_parts(0, 3033).saturating_mul(k.into()))
-	}
-	/// Storage: Staking Ledger (r:1 w:0)
-	/// Proof: Staking Ledger (max_values: None, max_size: Some(1091), added: 3566, mode: MaxEncodedLen)
-	/// Storage: Staking MinNominatorBond (r:1 w:0)
-	/// Proof: Staking MinNominatorBond (max_values: Some(1), max_size: Some(16), added: 511, mode: MaxEncodedLen)
-	/// Storage: Staking Nominators (r:1 w:1)
-	/// Proof: Staking Nominators (max_values: None, max_size: Some(558), added: 3033, mode: MaxEncodedLen)
-	/// Storage: Staking MaxNominatorsCount (r:1 w:0)
-	/// Proof: Staking MaxNominatorsCount (max_values: Some(1), max_size: Some(4), added: 499, mode: MaxEncodedLen)
-	/// Storage: Staking Validators (r:17 w:0)
-	/// Proof: Staking Validators (max_values: None, max_size: Some(45), added: 2520, mode: MaxEncodedLen)
-	/// Storage: Staking CurrentEra (r:1 w:0)
-	/// Proof: Staking CurrentEra (max_values: Some(1), max_size: Some(4), added: 499, mode: MaxEncodedLen)
-	/// Storage: Staking Bonded (r:1 w:0)
-	/// Proof: Staking Bonded (max_values: None, max_size: Some(72), added: 2547, mode: MaxEncodedLen)
-	/// Storage: VoterList ListNodes (r:2 w:2)
-	/// Proof: VoterList ListNodes (max_values: None, max_size: Some(154), added: 2629, mode: MaxEncodedLen)
-	/// Storage: VoterList ListBags (r:1 w:1)
-	/// Proof: VoterList ListBags (max_values: None, max_size: Some(82), added: 2557, mode: MaxEncodedLen)
-	/// Storage: VoterList CounterForListNodes (r:1 w:1)
-	/// Proof: VoterList CounterForListNodes (max_values: Some(1), max_size: Some(4), added: 499, mode: MaxEncodedLen)
-	/// Storage: Staking CounterForNominators (r:1 w:1)
-	/// Proof: Staking CounterForNominators (max_values: Some(1), max_size: Some(4), added: 499, mode: MaxEncodedLen)
-	/// The range of component `n` is `[1, 16]`.
-	fn nominate(n: u32, ) -> Weight {
-		// Proof Size summary in bytes:
-		//  Measured:  `1805 + n * (102 ±0)`
-		//  Estimated: `6248 + n * (2520 ±0)`
-		// Minimum execution time: 68_438_000 picoseconds.
-		Weight::from_parts(65_922_031, 0)
-			.saturating_add(Weight::from_parts(0, 6248))
-			// Standard Error: 13_125
-			.saturating_add(Weight::from_parts(4_057_833, 0).saturating_mul(n.into()))
-			.saturating_add(T::DbWeight::get().reads(12))
-			.saturating_add(T::DbWeight::get().reads((1_u64).saturating_mul(n.into())))
-			.saturating_add(T::DbWeight::get().writes(6))
-			.saturating_add(Weight::from_parts(0, 2520).saturating_mul(n.into()))
-	}
-	/// Storage: Staking Ledger (r:1 w:0)
-	/// Proof: Staking Ledger (max_values: None, max_size: Some(1091), added: 3566, mode: MaxEncodedLen)
-	/// Storage: Staking Validators (r:1 w:0)
-	/// Proof: Staking Validators (max_values: None, max_size: Some(45), added: 2520, mode: MaxEncodedLen)
-	/// Storage: Staking Nominators (r:1 w:1)
-	/// Proof: Staking Nominators (max_values: None, max_size: Some(558), added: 3033, mode: MaxEncodedLen)
-	/// Storage: Staking CounterForNominators (r:1 w:1)
-	/// Proof: Staking CounterForNominators (max_values: Some(1), max_size: Some(4), added: 499, mode: MaxEncodedLen)
-	/// Storage: VoterList ListNodes (r:2 w:2)
-	/// Proof: VoterList ListNodes (max_values: None, max_size: Some(154), added: 2629, mode: MaxEncodedLen)
-	/// Storage: VoterList ListBags (r:1 w:1)
-	/// Proof: VoterList ListBags (max_values: None, max_size: Some(82), added: 2557, mode: MaxEncodedLen)
-	/// Storage: VoterList CounterForListNodes (r:1 w:1)
-	/// Proof: VoterList CounterForListNodes (max_values: Some(1), max_size: Some(4), added: 499, mode: MaxEncodedLen)
-	fn chill() -> Weight {
-		// Proof Size summary in bytes:
-		//  Measured:  `1639`
-		//  Estimated: `6248`
-		// Minimum execution time: 61_082_000 picoseconds.
-		Weight::from_parts(62_694_000, 0)
-			.saturating_add(Weight::from_parts(0, 6248))
-			.saturating_add(T::DbWeight::get().reads(8))
-			.saturating_add(T::DbWeight::get().writes(6))
-	}
-	/// Storage: Staking Ledger (r:1 w:0)
-	/// Proof: Staking Ledger (max_values: None, max_size: Some(1091), added: 3566, mode: MaxEncodedLen)
-	/// Storage: Staking Payee (r:0 w:1)
-	/// Proof: Staking Payee (max_values: None, max_size: Some(73), added: 2548, mode: MaxEncodedLen)
-	fn set_payee() -> Weight {
-		// Proof Size summary in bytes:
-		//  Measured:  `737`
-		//  Estimated: `4556`
-		// Minimum execution time: 14_638_000 picoseconds.
-		Weight::from_parts(15_251_000, 0)
-			.saturating_add(Weight::from_parts(0, 4556))
-			.saturating_add(T::DbWeight::get().reads(1))
-			.saturating_add(T::DbWeight::get().writes(1))
-	}
-	/// Storage: Staking Bonded (r:1 w:1)
-	/// Proof: Staking Bonded (max_values: None, max_size: Some(72), added: 2547, mode: MaxEncodedLen)
-	/// Storage: Staking Ledger (r:2 w:2)
-	/// Proof: Staking Ledger (max_values: None, max_size: Some(1091), added: 3566, mode: MaxEncodedLen)
-	fn set_controller() -> Weight {
-		// Proof Size summary in bytes:
-		//  Measured:  `836`
-		//  Estimated: `8122`
-		// Minimum execution time: 21_077_000 picoseconds.
-		Weight::from_parts(21_635_000, 0)
-			.saturating_add(Weight::from_parts(0, 8122))
-			.saturating_add(T::DbWeight::get().reads(3))
-			.saturating_add(T::DbWeight::get().writes(3))
-	}
-	/// Storage: Staking ValidatorCount (r:0 w:1)
-	/// Proof: Staking ValidatorCount (max_values: Some(1), max_size: Some(4), added: 499, mode: MaxEncodedLen)
-	fn set_validator_count() -> Weight {
-		// Proof Size summary in bytes:
-		//  Measured:  `0`
-		//  Estimated: `0`
-		// Minimum execution time: 3_006_000 picoseconds.
-		Weight::from_parts(3_176_000, 0)
-			.saturating_add(Weight::from_parts(0, 0))
-			.saturating_add(T::DbWeight::get().writes(1))
-	}
-	/// Storage: Staking ForceEra (r:0 w:1)
-	/// Proof: Staking ForceEra (max_values: Some(1), max_size: Some(1), added: 496, mode: MaxEncodedLen)
-	fn force_no_eras() -> Weight {
-		// Proof Size summary in bytes:
-		//  Measured:  `0`
-		//  Estimated: `0`
-		// Minimum execution time: 9_462_000 picoseconds.
-		Weight::from_parts(9_740_000, 0)
-			.saturating_add(Weight::from_parts(0, 0))
-			.saturating_add(T::DbWeight::get().writes(1))
-	}
-	/// Storage: Staking ForceEra (r:0 w:1)
-	/// Proof: Staking ForceEra (max_values: Some(1), max_size: Some(1), added: 496, mode: MaxEncodedLen)
-	fn force_new_era() -> Weight {
-		// Proof Size summary in bytes:
-		//  Measured:  `0`
-		//  Estimated: `0`
-		// Minimum execution time: 9_279_000 picoseconds.
-		Weight::from_parts(9_662_000, 0)
-			.saturating_add(Weight::from_parts(0, 0))
-			.saturating_add(T::DbWeight::get().writes(1))
-	}
-	/// Storage: Staking ForceEra (r:0 w:1)
-	/// Proof: Staking ForceEra (max_values: Some(1), max_size: Some(1), added: 496, mode: MaxEncodedLen)
-	fn force_new_era_always() -> Weight {
-		// Proof Size summary in bytes:
-		//  Measured:  `0`
-		//  Estimated: `0`
-		// Minimum execution time: 9_346_000 picoseconds.
-		Weight::from_parts(9_708_000, 0)
-			.saturating_add(Weight::from_parts(0, 0))
-			.saturating_add(T::DbWeight::get().writes(1))
-	}
-	/// Storage: Staking Invulnerables (r:0 w:1)
-	/// Proof Skipped: Staking Invulnerables (max_values: Some(1), max_size: None, mode: Measured)
-	/// The range of component `v` is `[0, 1000]`.
-	fn set_invulnerables(v: u32, ) -> Weight {
-		// Proof Size summary in bytes:
-		//  Measured:  `0`
-		//  Estimated: `0`
-		// Minimum execution time: 3_120_000 picoseconds.
-		Weight::from_parts(3_442_453, 0)
-			.saturating_add(Weight::from_parts(0, 0))
-			// Standard Error: 40
-			.saturating_add(Weight::from_parts(12_464, 0).saturating_mul(v.into()))
-			.saturating_add(T::DbWeight::get().writes(1))
-	}
-	/// Storage: Staking Bonded (r:1 w:1)
-	/// Proof: Staking Bonded (max_values: None, max_size: Some(72), added: 2547, mode: MaxEncodedLen)
-	/// Storage: Staking SlashingSpans (r:1 w:1)
-	/// Proof Skipped: Staking SlashingSpans (max_values: None, max_size: None, mode: Measured)
-	/// Storage: Staking Validators (r:1 w:0)
-	/// Proof: Staking Validators (max_values: None, max_size: Some(45), added: 2520, mode: MaxEncodedLen)
-	/// Storage: Staking Nominators (r:1 w:1)
-	/// Proof: Staking Nominators (max_values: None, max_size: Some(558), added: 3033, mode: MaxEncodedLen)
-	/// Storage: Staking CounterForNominators (r:1 w:1)
-	/// Proof: Staking CounterForNominators (max_values: Some(1), max_size: Some(4), added: 499, mode: MaxEncodedLen)
-	/// Storage: VoterList ListNodes (r:2 w:2)
-	/// Proof: VoterList ListNodes (max_values: None, max_size: Some(154), added: 2629, mode: MaxEncodedLen)
-	/// Storage: VoterList ListBags (r:1 w:1)
-	/// Proof: VoterList ListBags (max_values: None, max_size: Some(82), added: 2557, mode: MaxEncodedLen)
-	/// Storage: VoterList CounterForListNodes (r:1 w:1)
-	/// Proof: VoterList CounterForListNodes (max_values: Some(1), max_size: Some(4), added: 499, mode: MaxEncodedLen)
-	/// Storage: System Account (r:1 w:1)
-	/// Proof: System Account (max_values: None, max_size: Some(128), added: 2603, mode: MaxEncodedLen)
-	/// Storage: Balances Locks (r:1 w:1)
-	/// Proof: Balances Locks (max_values: None, max_size: Some(1299), added: 3774, mode: MaxEncodedLen)
-	/// Storage: Balances Freezes (r:1 w:0)
-	/// Proof: Balances Freezes (max_values: None, max_size: Some(49), added: 2524, mode: MaxEncodedLen)
-	/// Storage: Staking Ledger (r:0 w:1)
-	/// Proof: Staking Ledger (max_values: None, max_size: Some(1091), added: 3566, mode: MaxEncodedLen)
-	/// Storage: Staking Payee (r:0 w:1)
-	/// Proof: Staking Payee (max_values: None, max_size: Some(73), added: 2548, mode: MaxEncodedLen)
-	/// Storage: Staking SpanSlash (r:0 w:100)
-	/// Proof: Staking SpanSlash (max_values: None, max_size: Some(76), added: 2551, mode: MaxEncodedLen)
-	/// The range of component `s` is `[0, 100]`.
-	fn force_unstake(s: u32, ) -> Weight {
-		// Proof Size summary in bytes:
-		//  Measured:  `1911 + s * (4 ±0)`
-		//  Estimated: `6248 + s * (4 ±0)`
-		// Minimum execution time: 86_885_000 picoseconds.
-		Weight::from_parts(92_726_876, 0)
-			.saturating_add(Weight::from_parts(0, 6248))
-			// Standard Error: 2_614
-			.saturating_add(Weight::from_parts(1_393_582, 0).saturating_mul(s.into()))
-			.saturating_add(T::DbWeight::get().reads(12))
-			.saturating_add(T::DbWeight::get().writes(12))
-			.saturating_add(T::DbWeight::get().writes((1_u64).saturating_mul(s.into())))
-			.saturating_add(Weight::from_parts(0, 4).saturating_mul(s.into()))
-	}
-	/// Storage: Staking UnappliedSlashes (r:1 w:1)
-	/// Proof Skipped: Staking UnappliedSlashes (max_values: None, max_size: None, mode: Measured)
-	/// The range of component `s` is `[1, 1000]`.
-	fn cancel_deferred_slash(s: u32, ) -> Weight {
-		// Proof Size summary in bytes:
-		//  Measured:  `66572`
-		//  Estimated: `70037`
-		// Minimum execution time: 131_927_000 picoseconds.
-		Weight::from_parts(933_717_768, 0)
-			.saturating_add(Weight::from_parts(0, 70037))
-			// Standard Error: 57_864
-			.saturating_add(Weight::from_parts(4_834_464, 0).saturating_mul(s.into()))
-			.saturating_add(T::DbWeight::get().reads(1))
-			.saturating_add(T::DbWeight::get().writes(1))
-	}
-	/// Storage: Staking CurrentEra (r:1 w:0)
-	/// Proof: Staking CurrentEra (max_values: Some(1), max_size: Some(4), added: 499, mode: MaxEncodedLen)
-	/// Storage: Staking ErasValidatorReward (r:1 w:0)
-	/// Proof: Staking ErasValidatorReward (max_values: None, max_size: Some(28), added: 2503, mode: MaxEncodedLen)
-	/// Storage: Staking Bonded (r:513 w:0)
-	/// Proof: Staking Bonded (max_values: None, max_size: Some(72), added: 2547, mode: MaxEncodedLen)
-	/// Storage: Staking Ledger (r:1 w:1)
-	/// Proof: Staking Ledger (max_values: None, max_size: Some(1091), added: 3566, mode: MaxEncodedLen)
-	/// Storage: Staking ErasStakersClipped (r:1 w:0)
-	/// Proof Skipped: Staking ErasStakersClipped (max_values: None, max_size: None, mode: Measured)
-	/// Storage: Staking ErasRewardPoints (r:1 w:0)
-	/// Proof Skipped: Staking ErasRewardPoints (max_values: None, max_size: None, mode: Measured)
-	/// Storage: Staking ErasValidatorPrefs (r:1 w:0)
-	/// Proof: Staking ErasValidatorPrefs (max_values: None, max_size: Some(57), added: 2532, mode: MaxEncodedLen)
-	/// Storage: Staking Payee (r:513 w:0)
-	/// Proof: Staking Payee (max_values: None, max_size: Some(73), added: 2548, mode: MaxEncodedLen)
-	/// Storage: System Account (r:513 w:513)
-	/// Proof: System Account (max_values: None, max_size: Some(128), added: 2603, mode: MaxEncodedLen)
-	/// The range of component `n` is `[0, 512]`.
-	fn payout_stakers_dead_controller(n: u32, ) -> Weight {
-		// Proof Size summary in bytes:
-		//  Measured:  `34179 + n * (150 ±0)`
-		//  Estimated: `32391 + n * (2603 ±0)`
-		// Minimum execution time: 118_319_000 picoseconds.
-		Weight::from_parts(150_596_293, 0)
-			.saturating_add(Weight::from_parts(0, 32391))
-			// Standard Error: 18_978
-			.saturating_add(Weight::from_parts(34_357_240, 0).saturating_mul(n.into()))
-			.saturating_add(T::DbWeight::get().reads(9))
-			.saturating_add(T::DbWeight::get().reads((3_u64).saturating_mul(n.into())))
-			.saturating_add(T::DbWeight::get().writes(2))
-			.saturating_add(T::DbWeight::get().writes((1_u64).saturating_mul(n.into())))
-			.saturating_add(Weight::from_parts(0, 2603).saturating_mul(n.into()))
-	}
-	/// Storage: Staking CurrentEra (r:1 w:0)
-	/// Proof: Staking CurrentEra (max_values: Some(1), max_size: Some(4), added: 499, mode: MaxEncodedLen)
-	/// Storage: Staking ErasValidatorReward (r:1 w:0)
-	/// Proof: Staking ErasValidatorReward (max_values: None, max_size: Some(28), added: 2503, mode: MaxEncodedLen)
-	/// Storage: Staking Bonded (r:513 w:0)
-	/// Proof: Staking Bonded (max_values: None, max_size: Some(72), added: 2547, mode: MaxEncodedLen)
-	/// Storage: Staking Ledger (r:513 w:513)
-	/// Proof: Staking Ledger (max_values: None, max_size: Some(1091), added: 3566, mode: MaxEncodedLen)
-	/// Storage: Staking ErasStakersClipped (r:1 w:0)
-	/// Proof Skipped: Staking ErasStakersClipped (max_values: None, max_size: None, mode: Measured)
-	/// Storage: Staking ErasRewardPoints (r:1 w:0)
-	/// Proof Skipped: Staking ErasRewardPoints (max_values: None, max_size: None, mode: Measured)
-	/// Storage: Staking ErasValidatorPrefs (r:1 w:0)
-	/// Proof: Staking ErasValidatorPrefs (max_values: None, max_size: Some(57), added: 2532, mode: MaxEncodedLen)
-	/// Storage: Staking Payee (r:513 w:0)
-	/// Proof: Staking Payee (max_values: None, max_size: Some(73), added: 2548, mode: MaxEncodedLen)
-	/// Storage: System Account (r:513 w:513)
-	/// Proof: System Account (max_values: None, max_size: Some(128), added: 2603, mode: MaxEncodedLen)
-	/// Storage: Balances Locks (r:513 w:513)
-	/// Proof: Balances Locks (max_values: None, max_size: Some(1299), added: 3774, mode: MaxEncodedLen)
-	/// Storage: Balances Freezes (r:513 w:0)
-	/// Proof: Balances Freezes (max_values: None, max_size: Some(49), added: 2524, mode: MaxEncodedLen)
-	/// The range of component `n` is `[0, 512]`.
-	fn payout_stakers_alive_staked(n: u32, ) -> Weight {
-		// Proof Size summary in bytes:
-		//  Measured:  `58153 + n * (388 ±0)`
-		//  Estimated: `53040 + n * (3774 ±0)`
-		// Minimum execution time: 140_238_000 picoseconds.
-		Weight::from_parts(80_637_879, 0)
-			.saturating_add(Weight::from_parts(0, 53040))
-			// Standard Error: 53_109
-			.saturating_add(Weight::from_parts(55_488_791, 0).saturating_mul(n.into()))
-			.saturating_add(T::DbWeight::get().reads(11))
-			.saturating_add(T::DbWeight::get().reads((6_u64).saturating_mul(n.into())))
-			.saturating_add(T::DbWeight::get().writes(3))
-			.saturating_add(T::DbWeight::get().writes((3_u64).saturating_mul(n.into())))
-			.saturating_add(Weight::from_parts(0, 3774).saturating_mul(n.into()))
-	}
-	/// Storage: Staking Ledger (r:1 w:1)
-	/// Proof: Staking Ledger (max_values: None, max_size: Some(1091), added: 3566, mode: MaxEncodedLen)
-	/// Storage: Balances Locks (r:1 w:1)
-	/// Proof: Balances Locks (max_values: None, max_size: Some(1299), added: 3774, mode: MaxEncodedLen)
-	/// Storage: Balances Freezes (r:1 w:0)
-	/// Proof: Balances Freezes (max_values: None, max_size: Some(49), added: 2524, mode: MaxEncodedLen)
-	/// Storage: VoterList ListNodes (r:3 w:3)
-	/// Proof: VoterList ListNodes (max_values: None, max_size: Some(154), added: 2629, mode: MaxEncodedLen)
-	/// Storage: Staking Bonded (r:1 w:0)
-	/// Proof: Staking Bonded (max_values: None, max_size: Some(72), added: 2547, mode: MaxEncodedLen)
-	/// Storage: VoterList ListBags (r:2 w:2)
-	/// Proof: VoterList ListBags (max_values: None, max_size: Some(82), added: 2557, mode: MaxEncodedLen)
-	/// The range of component `l` is `[1, 32]`.
-	fn rebond(l: u32, ) -> Weight {
-		// Proof Size summary in bytes:
-		//  Measured:  `1926 + l * (5 ±0)`
-		//  Estimated: `8877`
-		// Minimum execution time: 89_764_000 picoseconds.
-		Weight::from_parts(92_966_007, 0)
-			.saturating_add(Weight::from_parts(0, 8877))
-			// Standard Error: 4_077
-			.saturating_add(Weight::from_parts(44_963, 0).saturating_mul(l.into()))
-			.saturating_add(T::DbWeight::get().reads(9))
-			.saturating_add(T::DbWeight::get().writes(7))
-	}
-	/// Storage: Staking Bonded (r:1 w:1)
-	/// Proof: Staking Bonded (max_values: None, max_size: Some(72), added: 2547, mode: MaxEncodedLen)
-	/// Storage: Staking Ledger (r:1 w:1)
-	/// Proof: Staking Ledger (max_values: None, max_size: Some(1091), added: 3566, mode: MaxEncodedLen)
-	/// Storage: Staking SlashingSpans (r:1 w:1)
-	/// Proof Skipped: Staking SlashingSpans (max_values: None, max_size: None, mode: Measured)
-	/// Storage: Staking Validators (r:1 w:0)
-	/// Proof: Staking Validators (max_values: None, max_size: Some(45), added: 2520, mode: MaxEncodedLen)
-	/// Storage: Staking Nominators (r:1 w:1)
-	/// Proof: Staking Nominators (max_values: None, max_size: Some(558), added: 3033, mode: MaxEncodedLen)
-	/// Storage: Staking CounterForNominators (r:1 w:1)
-	/// Proof: Staking CounterForNominators (max_values: Some(1), max_size: Some(4), added: 499, mode: MaxEncodedLen)
-	/// Storage: VoterList ListNodes (r:2 w:2)
-	/// Proof: VoterList ListNodes (max_values: None, max_size: Some(154), added: 2629, mode: MaxEncodedLen)
-	/// Storage: VoterList ListBags (r:1 w:1)
-	/// Proof: VoterList ListBags (max_values: None, max_size: Some(82), added: 2557, mode: MaxEncodedLen)
-	/// Storage: VoterList CounterForListNodes (r:1 w:1)
-	/// Proof: VoterList CounterForListNodes (max_values: Some(1), max_size: Some(4), added: 499, mode: MaxEncodedLen)
-	/// Storage: Balances Locks (r:1 w:1)
-	/// Proof: Balances Locks (max_values: None, max_size: Some(1299), added: 3774, mode: MaxEncodedLen)
-	/// Storage: Balances Freezes (r:1 w:0)
-	/// Proof: Balances Freezes (max_values: None, max_size: Some(49), added: 2524, mode: MaxEncodedLen)
-	/// Storage: Staking Payee (r:0 w:1)
-	/// Proof: Staking Payee (max_values: None, max_size: Some(73), added: 2548, mode: MaxEncodedLen)
-	/// Storage: Staking SpanSlash (r:0 w:100)
-	/// Proof: Staking SpanSlash (max_values: None, max_size: Some(76), added: 2551, mode: MaxEncodedLen)
-	/// The range of component `s` is `[1, 100]`.
-	fn reap_stash(s: u32, ) -> Weight {
-		// Proof Size summary in bytes:
-		//  Measured:  `2185 + s * (4 ±0)`
-		//  Estimated: `6248 + s * (4 ±0)`
-		// Minimum execution time: 102_828_000 picoseconds.
-		Weight::from_parts(104_295_311, 0)
-			.saturating_add(Weight::from_parts(0, 6248))
-			// Standard Error: 3_221
-			.saturating_add(Weight::from_parts(1_380_506, 0).saturating_mul(s.into()))
-			.saturating_add(T::DbWeight::get().reads(12))
-			.saturating_add(T::DbWeight::get().writes(11))
-			.saturating_add(T::DbWeight::get().writes((1_u64).saturating_mul(s.into())))
-			.saturating_add(Weight::from_parts(0, 4).saturating_mul(s.into()))
-	}
-	/// Storage: VoterList CounterForListNodes (r:1 w:0)
-	/// Proof: VoterList CounterForListNodes (max_values: Some(1), max_size: Some(4), added: 499, mode: MaxEncodedLen)
-	/// Storage: VoterList ListBags (r:178 w:0)
-	/// Proof: VoterList ListBags (max_values: None, max_size: Some(82), added: 2557, mode: MaxEncodedLen)
-	/// Storage: VoterList ListNodes (r:110 w:0)
-	/// Proof: VoterList ListNodes (max_values: None, max_size: Some(154), added: 2629, mode: MaxEncodedLen)
-	/// Storage: Staking Nominators (r:110 w:0)
-	/// Proof: Staking Nominators (max_values: None, max_size: Some(558), added: 3033, mode: MaxEncodedLen)
-	/// Storage: Staking Validators (r:11 w:0)
-	/// Proof: Staking Validators (max_values: None, max_size: Some(45), added: 2520, mode: MaxEncodedLen)
-	/// Storage: Staking Bonded (r:110 w:0)
-	/// Proof: Staking Bonded (max_values: None, max_size: Some(72), added: 2547, mode: MaxEncodedLen)
-	/// Storage: Staking Ledger (r:110 w:0)
-	/// Proof: Staking Ledger (max_values: None, max_size: Some(1091), added: 3566, mode: MaxEncodedLen)
-	/// Storage: System BlockWeight (r:1 w:1)
-	/// Proof: System BlockWeight (max_values: Some(1), max_size: Some(48), added: 543, mode: MaxEncodedLen)
-	/// Storage: Staking CounterForValidators (r:1 w:0)
-	/// Proof: Staking CounterForValidators (max_values: Some(1), max_size: Some(4), added: 499, mode: MaxEncodedLen)
-	/// Storage: Staking ValidatorCount (r:1 w:0)
-	/// Proof: Staking ValidatorCount (max_values: Some(1), max_size: Some(4), added: 499, mode: MaxEncodedLen)
-	/// Storage: Staking MinimumValidatorCount (r:1 w:0)
-	/// Proof: Staking MinimumValidatorCount (max_values: Some(1), max_size: Some(4), added: 499, mode: MaxEncodedLen)
-	/// Storage: Staking CurrentEra (r:1 w:1)
-	/// Proof: Staking CurrentEra (max_values: Some(1), max_size: Some(4), added: 499, mode: MaxEncodedLen)
-	/// Storage: Staking ErasStakersClipped (r:0 w:10)
-	/// Proof Skipped: Staking ErasStakersClipped (max_values: None, max_size: None, mode: Measured)
-	/// Storage: Staking ErasValidatorPrefs (r:0 w:10)
-	/// Proof: Staking ErasValidatorPrefs (max_values: None, max_size: Some(57), added: 2532, mode: MaxEncodedLen)
-	/// Storage: Staking ErasStakers (r:0 w:10)
-	/// Proof Skipped: Staking ErasStakers (max_values: None, max_size: None, mode: Measured)
-	/// Storage: Staking ErasTotalStake (r:0 w:1)
-	/// Proof: Staking ErasTotalStake (max_values: None, max_size: Some(28), added: 2503, mode: MaxEncodedLen)
-	/// Storage: Staking ErasStartSessionIndex (r:0 w:1)
-	/// Proof: Staking ErasStartSessionIndex (max_values: None, max_size: Some(16), added: 2491, mode: MaxEncodedLen)
-	/// Storage: Staking MinimumActiveStake (r:0 w:1)
-	/// Proof: Staking MinimumActiveStake (max_values: Some(1), max_size: Some(16), added: 511, mode: MaxEncodedLen)
-	/// The range of component `v` is `[1, 10]`.
-	/// The range of component `n` is `[0, 100]`.
-	fn new_era(v: u32, n: u32, ) -> Weight {
-		// Proof Size summary in bytes:
-		//  Measured:  `0 + n * (716 ±0) + v * (3594 ±0)`
-		//  Estimated: `456136 + n * (3566 ±3) + v * (3566 ±38)`
-		// Minimum execution time: 543_692_000 picoseconds.
-		Weight::from_parts(548_108_000, 0)
-			.saturating_add(Weight::from_parts(0, 456136))
-			// Standard Error: 2_062_056
-			.saturating_add(Weight::from_parts(64_901_773, 0).saturating_mul(v.into()))
-			// Standard Error: 205_472
-			.saturating_add(Weight::from_parts(18_855_795, 0).saturating_mul(n.into()))
-			.saturating_add(T::DbWeight::get().reads(185))
-			.saturating_add(T::DbWeight::get().reads((5_u64).saturating_mul(v.into())))
-			.saturating_add(T::DbWeight::get().reads((4_u64).saturating_mul(n.into())))
-			.saturating_add(T::DbWeight::get().writes(5))
-			.saturating_add(T::DbWeight::get().writes((3_u64).saturating_mul(v.into())))
-			.saturating_add(Weight::from_parts(0, 3566).saturating_mul(n.into()))
-			.saturating_add(Weight::from_parts(0, 3566).saturating_mul(v.into()))
-	}
-	/// Storage: VoterList CounterForListNodes (r:1 w:0)
-	/// Proof: VoterList CounterForListNodes (max_values: Some(1), max_size: Some(4), added: 499, mode: MaxEncodedLen)
-	/// Storage: VoterList ListBags (r:178 w:0)
-	/// Proof: VoterList ListBags (max_values: None, max_size: Some(82), added: 2557, mode: MaxEncodedLen)
-	/// Storage: VoterList ListNodes (r:2000 w:0)
-	/// Proof: VoterList ListNodes (max_values: None, max_size: Some(154), added: 2629, mode: MaxEncodedLen)
-	/// Storage: Staking Nominators (r:2000 w:0)
-	/// Proof: Staking Nominators (max_values: None, max_size: Some(558), added: 3033, mode: MaxEncodedLen)
-	/// Storage: Staking Validators (r:1000 w:0)
-	/// Proof: Staking Validators (max_values: None, max_size: Some(45), added: 2520, mode: MaxEncodedLen)
-	/// Storage: Staking Bonded (r:2000 w:0)
-	/// Proof: Staking Bonded (max_values: None, max_size: Some(72), added: 2547, mode: MaxEncodedLen)
-	/// Storage: Staking Ledger (r:2000 w:0)
-	/// Proof: Staking Ledger (max_values: None, max_size: Some(1091), added: 3566, mode: MaxEncodedLen)
-	/// Storage: System BlockWeight (r:1 w:1)
-	/// Proof: System BlockWeight (max_values: Some(1), max_size: Some(48), added: 543, mode: MaxEncodedLen)
-	/// Storage: Staking MinimumActiveStake (r:0 w:1)
-	/// Proof: Staking MinimumActiveStake (max_values: Some(1), max_size: Some(16), added: 511, mode: MaxEncodedLen)
-	/// The range of component `v` is `[500, 1000]`.
-	/// The range of component `n` is `[500, 1000]`.
-	fn get_npos_voters(v: u32, n: u32, ) -> Weight {
-		// Proof Size summary in bytes:
-		//  Measured:  `3117 + n * (907 ±0) + v * (391 ±0)`
-		//  Estimated: `456136 + n * (3566 ±0) + v * (3566 ±0)`
-		// Minimum execution time: 36_757_500_000 picoseconds.
-		Weight::from_parts(37_291_052_000, 0)
-			.saturating_add(Weight::from_parts(0, 456136))
-			// Standard Error: 408_866
-			.saturating_add(Weight::from_parts(5_324_689, 0).saturating_mul(v.into()))
-			// Standard Error: 408_866
-			.saturating_add(Weight::from_parts(4_075_058, 0).saturating_mul(n.into()))
-			.saturating_add(T::DbWeight::get().reads(180))
-			.saturating_add(T::DbWeight::get().reads((5_u64).saturating_mul(v.into())))
-			.saturating_add(T::DbWeight::get().reads((4_u64).saturating_mul(n.into())))
-			.saturating_add(T::DbWeight::get().writes(2))
-			.saturating_add(Weight::from_parts(0, 3566).saturating_mul(n.into()))
-			.saturating_add(Weight::from_parts(0, 3566).saturating_mul(v.into()))
-	}
-	/// Storage: Staking CounterForValidators (r:1 w:0)
-	/// Proof: Staking CounterForValidators (max_values: Some(1), max_size: Some(4), added: 499, mode: MaxEncodedLen)
-	/// Storage: Staking Validators (r:1001 w:0)
-	/// Proof: Staking Validators (max_values: None, max_size: Some(45), added: 2520, mode: MaxEncodedLen)
-	/// Storage: System BlockWeight (r:1 w:1)
-	/// Proof: System BlockWeight (max_values: Some(1), max_size: Some(48), added: 543, mode: MaxEncodedLen)
-	/// The range of component `v` is `[500, 1000]`.
-	fn get_npos_targets(v: u32, ) -> Weight {
-		// Proof Size summary in bytes:
-		//  Measured:  `917 + v * (50 ±0)`
-		//  Estimated: `3510 + v * (2520 ±0)`
-		// Minimum execution time: 2_558_883_000 picoseconds.
-		Weight::from_parts(85_901_228, 0)
-			.saturating_add(Weight::from_parts(0, 3510))
-			// Standard Error: 7_392
-			.saturating_add(Weight::from_parts(5_071_697, 0).saturating_mul(v.into()))
-			.saturating_add(T::DbWeight::get().reads(3))
-			.saturating_add(T::DbWeight::get().reads((1_u64).saturating_mul(v.into())))
-			.saturating_add(T::DbWeight::get().writes(1))
-			.saturating_add(Weight::from_parts(0, 2520).saturating_mul(v.into()))
-	}
-	/// Storage: Staking MinCommission (r:0 w:1)
-	/// Proof: Staking MinCommission (max_values: Some(1), max_size: Some(4), added: 499, mode: MaxEncodedLen)
-	/// Storage: Staking MinValidatorBond (r:0 w:1)
-	/// Proof: Staking MinValidatorBond (max_values: Some(1), max_size: Some(16), added: 511, mode: MaxEncodedLen)
-	/// Storage: Staking MaxValidatorsCount (r:0 w:1)
-	/// Proof: Staking MaxValidatorsCount (max_values: Some(1), max_size: Some(4), added: 499, mode: MaxEncodedLen)
-	/// Storage: Staking ChillThreshold (r:0 w:1)
-	/// Proof: Staking ChillThreshold (max_values: Some(1), max_size: Some(1), added: 496, mode: MaxEncodedLen)
-	/// Storage: Staking MaxNominatorsCount (r:0 w:1)
-	/// Proof: Staking MaxNominatorsCount (max_values: Some(1), max_size: Some(4), added: 499, mode: MaxEncodedLen)
-	/// Storage: Staking MinNominatorBond (r:0 w:1)
-	/// Proof: Staking MinNominatorBond (max_values: Some(1), max_size: Some(16), added: 511, mode: MaxEncodedLen)
-	fn set_staking_configs_all_set() -> Weight {
-		// Proof Size summary in bytes:
-		//  Measured:  `0`
-		//  Estimated: `0`
-		// Minimum execution time: 6_298_000 picoseconds.
-		Weight::from_parts(6_596_000, 0)
-			.saturating_add(Weight::from_parts(0, 0))
-			.saturating_add(T::DbWeight::get().writes(6))
-	}
-	/// Storage: Staking MinCommission (r:0 w:1)
-	/// Proof: Staking MinCommission (max_values: Some(1), max_size: Some(4), added: 499, mode: MaxEncodedLen)
-	/// Storage: Staking MinValidatorBond (r:0 w:1)
-	/// Proof: Staking MinValidatorBond (max_values: Some(1), max_size: Some(16), added: 511, mode: MaxEncodedLen)
-	/// Storage: Staking MaxValidatorsCount (r:0 w:1)
-	/// Proof: Staking MaxValidatorsCount (max_values: Some(1), max_size: Some(4), added: 499, mode: MaxEncodedLen)
-	/// Storage: Staking ChillThreshold (r:0 w:1)
-	/// Proof: Staking ChillThreshold (max_values: Some(1), max_size: Some(1), added: 496, mode: MaxEncodedLen)
-	/// Storage: Staking MaxNominatorsCount (r:0 w:1)
-	/// Proof: Staking MaxNominatorsCount (max_values: Some(1), max_size: Some(4), added: 499, mode: MaxEncodedLen)
-	/// Storage: Staking MinNominatorBond (r:0 w:1)
-	/// Proof: Staking MinNominatorBond (max_values: Some(1), max_size: Some(16), added: 511, mode: MaxEncodedLen)
-	fn set_staking_configs_all_remove() -> Weight {
-		// Proof Size summary in bytes:
-		//  Measured:  `0`
-		//  Estimated: `0`
-		// Minimum execution time: 5_901_000 picoseconds.
-		Weight::from_parts(6_092_000, 0)
-			.saturating_add(Weight::from_parts(0, 0))
-			.saturating_add(T::DbWeight::get().writes(6))
-	}
-	/// Storage: Staking Ledger (r:1 w:0)
-	/// Proof: Staking Ledger (max_values: None, max_size: Some(1091), added: 3566, mode: MaxEncodedLen)
-	/// Storage: Staking Nominators (r:1 w:1)
-	/// Proof: Staking Nominators (max_values: None, max_size: Some(558), added: 3033, mode: MaxEncodedLen)
-	/// Storage: Staking ChillThreshold (r:1 w:0)
-	/// Proof: Staking ChillThreshold (max_values: Some(1), max_size: Some(1), added: 496, mode: MaxEncodedLen)
-	/// Storage: Staking MaxNominatorsCount (r:1 w:0)
-	/// Proof: Staking MaxNominatorsCount (max_values: Some(1), max_size: Some(4), added: 499, mode: MaxEncodedLen)
-	/// Storage: Staking CounterForNominators (r:1 w:1)
-	/// Proof: Staking CounterForNominators (max_values: Some(1), max_size: Some(4), added: 499, mode: MaxEncodedLen)
-	/// Storage: Staking MinNominatorBond (r:1 w:0)
-	/// Proof: Staking MinNominatorBond (max_values: Some(1), max_size: Some(16), added: 511, mode: MaxEncodedLen)
-	/// Storage: Staking Validators (r:1 w:0)
-	/// Proof: Staking Validators (max_values: None, max_size: Some(45), added: 2520, mode: MaxEncodedLen)
-	/// Storage: VoterList ListNodes (r:2 w:2)
-	/// Proof: VoterList ListNodes (max_values: None, max_size: Some(154), added: 2629, mode: MaxEncodedLen)
-	/// Storage: VoterList ListBags (r:1 w:1)
-	/// Proof: VoterList ListBags (max_values: None, max_size: Some(82), added: 2557, mode: MaxEncodedLen)
-	/// Storage: VoterList CounterForListNodes (r:1 w:1)
-	/// Proof: VoterList CounterForListNodes (max_values: Some(1), max_size: Some(4), added: 499, mode: MaxEncodedLen)
-	fn chill_other() -> Weight {
-		// Proof Size summary in bytes:
-		//  Measured:  `1762`
-		//  Estimated: `6248`
-		// Minimum execution time: 72_549_000 picoseconds.
-		Weight::from_parts(74_685_000, 0)
-			.saturating_add(Weight::from_parts(0, 6248))
-			.saturating_add(T::DbWeight::get().reads(11))
-			.saturating_add(T::DbWeight::get().writes(6))
-	}
-	/// Storage: Staking MinCommission (r:1 w:0)
-	/// Proof: Staking MinCommission (max_values: Some(1), max_size: Some(4), added: 499, mode: MaxEncodedLen)
-	/// Storage: Staking Validators (r:1 w:1)
-	/// Proof: Staking Validators (max_values: None, max_size: Some(45), added: 2520, mode: MaxEncodedLen)
-	fn force_apply_min_commission() -> Weight {
-		// Proof Size summary in bytes:
-		//  Measured:  `627`
-		//  Estimated: `3510`
-		// Minimum execution time: 13_882_000 picoseconds.
-		Weight::from_parts(14_453_000, 0)
-			.saturating_add(Weight::from_parts(0, 3510))
-			.saturating_add(T::DbWeight::get().reads(2))
-			.saturating_add(T::DbWeight::get().writes(1))
-	}
-	/// Storage: Staking MinCommission (r:0 w:1)
-	/// Proof: Staking MinCommission (max_values: Some(1), max_size: Some(4), added: 499, mode: MaxEncodedLen)
-	fn set_min_commission() -> Weight {
-		// Proof Size summary in bytes:
-		//  Measured:  `0`
-		//  Estimated: `0`
-		// Minimum execution time: 2_998_000 picoseconds.
-		Weight::from_parts(3_175_000, 0)
-			.saturating_add(Weight::from_parts(0, 0))
-			.saturating_add(T::DbWeight::get().writes(1))
-	}
-}
diff --git a/polkadot/runtime/polkadot/src/weights/pallet_timestamp.rs b/polkadot/runtime/polkadot/src/weights/pallet_timestamp.rs
deleted file mode 100644
index 27d92d609fd46687d269a0cf2660120b722252b7..0000000000000000000000000000000000000000
--- a/polkadot/runtime/polkadot/src/weights/pallet_timestamp.rs
+++ /dev/null
@@ -1,75 +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/>.
-
-//! Autogenerated weights for `pallet_timestamp`
-//!
-//! THIS FILE WAS AUTO-GENERATED USING THE SUBSTRATE BENCHMARK CLI VERSION 4.0.0-dev
-//! DATE: 2023-06-19, STEPS: `50`, REPEAT: `20`, LOW RANGE: `[]`, HIGH RANGE: `[]`
-//! WORST CASE MAP SIZE: `1000000`
-//! HOSTNAME: `runner-e8ezs4ez-project-163-concurrent-0`, CPU: `Intel(R) Xeon(R) CPU @ 2.60GHz`
-//! EXECUTION: Some(Wasm), WASM-EXECUTION: Compiled, CHAIN: Some("polkadot-dev"), DB CACHE: 1024
-
-// Executed Command:
-// ./target/production/polkadot
-// benchmark
-// pallet
-// --chain=polkadot-dev
-// --steps=50
-// --repeat=20
-// --no-storage-info
-// --no-median-slopes
-// --no-min-squares
-// --pallet=pallet_timestamp
-// --extrinsic=*
-// --execution=wasm
-// --wasm-execution=compiled
-// --header=./file_header.txt
-// --output=./runtime/polkadot/src/weights/
-
-#![cfg_attr(rustfmt, rustfmt_skip)]
-#![allow(unused_parens)]
-#![allow(unused_imports)]
-#![allow(missing_docs)]
-
-use frame_support::{traits::Get, weights::Weight};
-use core::marker::PhantomData;
-
-/// Weight functions for `pallet_timestamp`.
-pub struct WeightInfo<T>(PhantomData<T>);
-impl<T: frame_system::Config> pallet_timestamp::WeightInfo for WeightInfo<T> {
-	/// Storage: Timestamp Now (r:1 w:1)
-	/// Proof: Timestamp Now (max_values: Some(1), max_size: Some(8), added: 503, mode: MaxEncodedLen)
-	/// Storage: Babe CurrentSlot (r:1 w:0)
-	/// Proof: Babe CurrentSlot (max_values: Some(1), max_size: Some(8), added: 503, mode: MaxEncodedLen)
-	fn set() -> Weight {
-		// Proof Size summary in bytes:
-		//  Measured:  `345`
-		//  Estimated: `1493`
-		// Minimum execution time: 10_314_000 picoseconds.
-		Weight::from_parts(10_644_000, 0)
-			.saturating_add(Weight::from_parts(0, 1493))
-			.saturating_add(T::DbWeight::get().reads(2))
-			.saturating_add(T::DbWeight::get().writes(1))
-	}
-	fn on_finalize() -> Weight {
-		// Proof Size summary in bytes:
-		//  Measured:  `128`
-		//  Estimated: `0`
-		// Minimum execution time: 4_852_000 picoseconds.
-		Weight::from_parts(5_026_000, 0)
-			.saturating_add(Weight::from_parts(0, 0))
-	}
-}
diff --git a/polkadot/runtime/polkadot/src/weights/pallet_tips.rs b/polkadot/runtime/polkadot/src/weights/pallet_tips.rs
deleted file mode 100644
index 62e08e017a877e7e9026590839c4e06981b20883..0000000000000000000000000000000000000000
--- a/polkadot/runtime/polkadot/src/weights/pallet_tips.rs
+++ /dev/null
@@ -1,164 +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/>.
-
-//! Autogenerated weights for `pallet_tips`
-//!
-//! THIS FILE WAS AUTO-GENERATED USING THE SUBSTRATE BENCHMARK CLI VERSION 4.0.0-dev
-//! DATE: 2023-06-19, STEPS: `50`, REPEAT: `20`, LOW RANGE: `[]`, HIGH RANGE: `[]`
-//! WORST CASE MAP SIZE: `1000000`
-//! HOSTNAME: `runner-e8ezs4ez-project-163-concurrent-0`, CPU: `Intel(R) Xeon(R) CPU @ 2.60GHz`
-//! EXECUTION: Some(Wasm), WASM-EXECUTION: Compiled, CHAIN: Some("polkadot-dev"), DB CACHE: 1024
-
-// Executed Command:
-// ./target/production/polkadot
-// benchmark
-// pallet
-// --chain=polkadot-dev
-// --steps=50
-// --repeat=20
-// --no-storage-info
-// --no-median-slopes
-// --no-min-squares
-// --pallet=pallet_tips
-// --extrinsic=*
-// --execution=wasm
-// --wasm-execution=compiled
-// --header=./file_header.txt
-// --output=./runtime/polkadot/src/weights/
-
-#![cfg_attr(rustfmt, rustfmt_skip)]
-#![allow(unused_parens)]
-#![allow(unused_imports)]
-#![allow(missing_docs)]
-
-use frame_support::{traits::Get, weights::Weight};
-use core::marker::PhantomData;
-
-/// Weight functions for `pallet_tips`.
-pub struct WeightInfo<T>(PhantomData<T>);
-impl<T: frame_system::Config> pallet_tips::WeightInfo for WeightInfo<T> {
-	/// Storage: Tips Reasons (r:1 w:1)
-	/// Proof Skipped: Tips Reasons (max_values: None, max_size: None, mode: Measured)
-	/// Storage: Tips Tips (r:1 w:1)
-	/// Proof Skipped: Tips Tips (max_values: None, max_size: None, mode: Measured)
-	/// The range of component `r` is `[0, 16384]`.
-	fn report_awesome(r: u32, ) -> Weight {
-		// Proof Size summary in bytes:
-		//  Measured:  `4`
-		//  Estimated: `3469`
-		// Minimum execution time: 28_332_000 picoseconds.
-		Weight::from_parts(29_229_064, 0)
-			.saturating_add(Weight::from_parts(0, 3469))
-			// Standard Error: 20
-			.saturating_add(Weight::from_parts(1_717, 0).saturating_mul(r.into()))
-			.saturating_add(T::DbWeight::get().reads(2))
-			.saturating_add(T::DbWeight::get().writes(2))
-	}
-	/// Storage: Tips Tips (r:1 w:1)
-	/// Proof Skipped: Tips Tips (max_values: None, max_size: None, mode: Measured)
-	/// Storage: Tips Reasons (r:0 w:1)
-	/// Proof Skipped: Tips Reasons (max_values: None, max_size: None, mode: Measured)
-	fn retract_tip() -> Weight {
-		// Proof Size summary in bytes:
-		//  Measured:  `221`
-		//  Estimated: `3686`
-		// Minimum execution time: 28_421_000 picoseconds.
-		Weight::from_parts(29_235_000, 0)
-			.saturating_add(Weight::from_parts(0, 3686))
-			.saturating_add(T::DbWeight::get().reads(1))
-			.saturating_add(T::DbWeight::get().writes(2))
-	}
-	/// Storage: PhragmenElection Members (r:1 w:0)
-	/// Proof Skipped: PhragmenElection Members (max_values: Some(1), max_size: None, mode: Measured)
-	/// Storage: Tips Reasons (r:1 w:1)
-	/// Proof Skipped: Tips Reasons (max_values: None, max_size: None, mode: Measured)
-	/// Storage: Tips Tips (r:0 w:1)
-	/// Proof Skipped: Tips Tips (max_values: None, max_size: None, mode: Measured)
-	/// The range of component `r` is `[0, 16384]`.
-	/// The range of component `t` is `[1, 13]`.
-	fn tip_new(r: u32, t: u32, ) -> Weight {
-		// Proof Size summary in bytes:
-		//  Measured:  `74 + t * (64 ±0)`
-		//  Estimated: `3539 + t * (64 ±0)`
-		// Minimum execution time: 19_215_000 picoseconds.
-		Weight::from_parts(18_521_677, 0)
-			.saturating_add(Weight::from_parts(0, 3539))
-			// Standard Error: 4
-			.saturating_add(Weight::from_parts(1_600, 0).saturating_mul(r.into()))
-			// Standard Error: 5_637
-			.saturating_add(Weight::from_parts(171_000, 0).saturating_mul(t.into()))
-			.saturating_add(T::DbWeight::get().reads(2))
-			.saturating_add(T::DbWeight::get().writes(2))
-			.saturating_add(Weight::from_parts(0, 64).saturating_mul(t.into()))
-	}
-	/// Storage: PhragmenElection Members (r:1 w:0)
-	/// Proof Skipped: PhragmenElection Members (max_values: Some(1), max_size: None, mode: Measured)
-	/// Storage: Tips Tips (r:1 w:1)
-	/// Proof Skipped: Tips Tips (max_values: None, max_size: None, mode: Measured)
-	/// The range of component `t` is `[1, 13]`.
-	fn tip(t: u32, ) -> Weight {
-		// Proof Size summary in bytes:
-		//  Measured:  `295 + t * (112 ±0)`
-		//  Estimated: `3760 + t * (112 ±0)`
-		// Minimum execution time: 15_664_000 picoseconds.
-		Weight::from_parts(16_047_212, 0)
-			.saturating_add(Weight::from_parts(0, 3760))
-			// Standard Error: 1_859
-			.saturating_add(Weight::from_parts(133_685, 0).saturating_mul(t.into()))
-			.saturating_add(T::DbWeight::get().reads(2))
-			.saturating_add(T::DbWeight::get().writes(1))
-			.saturating_add(Weight::from_parts(0, 112).saturating_mul(t.into()))
-	}
-	/// Storage: Tips Tips (r:1 w:1)
-	/// Proof Skipped: Tips Tips (max_values: None, max_size: None, mode: Measured)
-	/// Storage: PhragmenElection Members (r:1 w:0)
-	/// Proof Skipped: PhragmenElection Members (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: Tips Reasons (r:0 w:1)
-	/// Proof Skipped: Tips Reasons (max_values: None, max_size: None, mode: Measured)
-	/// The range of component `t` is `[1, 13]`.
-	fn close_tip(t: u32, ) -> Weight {
-		// Proof Size summary in bytes:
-		//  Measured:  `334 + t * (112 ±0)`
-		//  Estimated: `3790 + t * (112 ±0)`
-		// Minimum execution time: 61_465_000 picoseconds.
-		Weight::from_parts(62_876_205, 0)
-			.saturating_add(Weight::from_parts(0, 3790))
-			// Standard Error: 6_840
-			.saturating_add(Weight::from_parts(133_654, 0).saturating_mul(t.into()))
-			.saturating_add(T::DbWeight::get().reads(3))
-			.saturating_add(T::DbWeight::get().writes(3))
-			.saturating_add(Weight::from_parts(0, 112).saturating_mul(t.into()))
-	}
-	/// Storage: Tips Tips (r:1 w:1)
-	/// Proof Skipped: Tips Tips (max_values: None, max_size: None, mode: Measured)
-	/// Storage: Tips Reasons (r:0 w:1)
-	/// Proof Skipped: Tips Reasons (max_values: None, max_size: None, mode: Measured)
-	/// The range of component `t` is `[1, 13]`.
-	fn slash_tip(t: u32, ) -> Weight {
-		// Proof Size summary in bytes:
-		//  Measured:  `269`
-		//  Estimated: `3734`
-		// Minimum execution time: 14_539_000 picoseconds.
-		Weight::from_parts(15_138_065, 0)
-			.saturating_add(Weight::from_parts(0, 3734))
-			// Standard Error: 1_577
-			.saturating_add(Weight::from_parts(6_176, 0).saturating_mul(t.into()))
-			.saturating_add(T::DbWeight::get().reads(1))
-			.saturating_add(T::DbWeight::get().writes(2))
-	}
-}
diff --git a/polkadot/runtime/polkadot/src/weights/pallet_treasury.rs b/polkadot/runtime/polkadot/src/weights/pallet_treasury.rs
deleted file mode 100644
index 669bfdeb7cfd4f831d39ac11e8a90fc66d5c5d42..0000000000000000000000000000000000000000
--- a/polkadot/runtime/polkadot/src/weights/pallet_treasury.rs
+++ /dev/null
@@ -1,154 +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/>.
-
-//! Autogenerated weights for `pallet_treasury`
-//!
-//! THIS FILE WAS AUTO-GENERATED USING THE SUBSTRATE BENCHMARK CLI VERSION 4.0.0-dev
-//! DATE: 2023-06-19, STEPS: `50`, REPEAT: `20`, LOW RANGE: `[]`, HIGH RANGE: `[]`
-//! WORST CASE MAP SIZE: `1000000`
-//! HOSTNAME: `runner-e8ezs4ez-project-163-concurrent-0`, CPU: `Intel(R) Xeon(R) CPU @ 2.60GHz`
-//! EXECUTION: Some(Wasm), WASM-EXECUTION: Compiled, CHAIN: Some("polkadot-dev"), DB CACHE: 1024
-
-// Executed Command:
-// ./target/production/polkadot
-// benchmark
-// pallet
-// --chain=polkadot-dev
-// --steps=50
-// --repeat=20
-// --no-storage-info
-// --no-median-slopes
-// --no-min-squares
-// --pallet=pallet_treasury
-// --extrinsic=*
-// --execution=wasm
-// --wasm-execution=compiled
-// --header=./file_header.txt
-// --output=./runtime/polkadot/src/weights/
-
-#![cfg_attr(rustfmt, rustfmt_skip)]
-#![allow(unused_parens)]
-#![allow(unused_imports)]
-#![allow(missing_docs)]
-
-use frame_support::{traits::Get, weights::Weight};
-use core::marker::PhantomData;
-
-/// Weight functions for `pallet_treasury`.
-pub struct WeightInfo<T>(PhantomData<T>);
-impl<T: frame_system::Config> pallet_treasury::WeightInfo for WeightInfo<T> {
-	/// Storage: Treasury ProposalCount (r:1 w:1)
-	/// Proof: Treasury ProposalCount (max_values: Some(1), max_size: Some(4), added: 499, mode: MaxEncodedLen)
-	/// Storage: Treasury Approvals (r:1 w:1)
-	/// Proof: Treasury Approvals (max_values: Some(1), max_size: Some(402), added: 897, mode: MaxEncodedLen)
-	/// Storage: Treasury Proposals (r:0 w:1)
-	/// Proof: Treasury Proposals (max_values: None, max_size: Some(108), added: 2583, mode: MaxEncodedLen)
-	fn spend() -> Weight {
-		// Proof Size summary in bytes:
-		//  Measured:  `6`
-		//  Estimated: `1887`
-		// Minimum execution time: 14_843_000 picoseconds.
-		Weight::from_parts(15_346_000, 0)
-			.saturating_add(Weight::from_parts(0, 1887))
-			.saturating_add(T::DbWeight::get().reads(2))
-			.saturating_add(T::DbWeight::get().writes(3))
-	}
-	/// Storage: Treasury ProposalCount (r:1 w:1)
-	/// Proof: Treasury ProposalCount (max_values: Some(1), max_size: Some(4), added: 499, mode: MaxEncodedLen)
-	/// Storage: Treasury Proposals (r:0 w:1)
-	/// Proof: Treasury Proposals (max_values: None, max_size: Some(108), added: 2583, mode: MaxEncodedLen)
-	fn propose_spend() -> Weight {
-		// Proof Size summary in bytes:
-		//  Measured:  `107`
-		//  Estimated: `1489`
-		// Minimum execution time: 27_443_000 picoseconds.
-		Weight::from_parts(28_046_000, 0)
-			.saturating_add(Weight::from_parts(0, 1489))
-			.saturating_add(T::DbWeight::get().reads(1))
-			.saturating_add(T::DbWeight::get().writes(2))
-	}
-	/// Storage: Treasury Proposals (r:1 w:1)
-	/// Proof: Treasury Proposals (max_values: None, max_size: Some(108), added: 2583, mode: MaxEncodedLen)
-	/// Storage: System Account (r:1 w:1)
-	/// Proof: System Account (max_values: None, max_size: Some(128), added: 2603, mode: MaxEncodedLen)
-	fn reject_proposal() -> Weight {
-		// Proof Size summary in bytes:
-		//  Measured:  `265`
-		//  Estimated: `3593`
-		// Minimum execution time: 42_227_000 picoseconds.
-		Weight::from_parts(44_158_000, 0)
-			.saturating_add(Weight::from_parts(0, 3593))
-			.saturating_add(T::DbWeight::get().reads(2))
-			.saturating_add(T::DbWeight::get().writes(2))
-	}
-	/// Storage: Treasury Proposals (r:1 w:0)
-	/// Proof: Treasury Proposals (max_values: None, max_size: Some(108), added: 2583, mode: MaxEncodedLen)
-	/// Storage: Treasury Approvals (r:1 w:1)
-	/// Proof: Treasury Approvals (max_values: Some(1), max_size: Some(402), added: 897, mode: MaxEncodedLen)
-	/// The range of component `p` is `[0, 99]`.
-	fn approve_proposal(p: u32, ) -> Weight {
-		// Proof Size summary in bytes:
-		//  Measured:  `433 + p * (8 ±0)`
-		//  Estimated: `3573`
-		// Minimum execution time: 9_538_000 picoseconds.
-		Weight::from_parts(11_238_300, 0)
-			.saturating_add(Weight::from_parts(0, 3573))
-			// Standard Error: 1_300
-			.saturating_add(Weight::from_parts(72_785, 0).saturating_mul(p.into()))
-			.saturating_add(T::DbWeight::get().reads(2))
-			.saturating_add(T::DbWeight::get().writes(1))
-	}
-	/// Storage: Treasury Approvals (r:1 w:1)
-	/// Proof: Treasury Approvals (max_values: Some(1), max_size: Some(402), added: 897, mode: MaxEncodedLen)
-	fn remove_approval() -> Weight {
-		// Proof Size summary in bytes:
-		//  Measured:  `90`
-		//  Estimated: `1887`
-		// Minimum execution time: 7_582_000 picoseconds.
-		Weight::from_parts(7_778_000, 0)
-			.saturating_add(Weight::from_parts(0, 1887))
-			.saturating_add(T::DbWeight::get().reads(1))
-			.saturating_add(T::DbWeight::get().writes(1))
-	}
-	/// Storage: Treasury Deactivated (r:1 w:1)
-	/// Proof: Treasury Deactivated (max_values: Some(1), max_size: Some(16), added: 511, mode: MaxEncodedLen)
-	/// Storage: Balances InactiveIssuance (r:1 w:1)
-	/// Proof: Balances InactiveIssuance (max_values: Some(1), max_size: Some(16), added: 511, mode: MaxEncodedLen)
-	/// Storage: Treasury Approvals (r:1 w:1)
-	/// Proof: Treasury Approvals (max_values: Some(1), max_size: Some(402), added: 897, mode: MaxEncodedLen)
-	/// Storage: Treasury Proposals (r:100 w:100)
-	/// Proof: Treasury Proposals (max_values: None, max_size: Some(108), added: 2583, mode: MaxEncodedLen)
-	/// Storage: System Account (r:200 w:200)
-	/// Proof: System Account (max_values: None, max_size: Some(128), added: 2603, mode: MaxEncodedLen)
-	/// Storage: Bounties BountyApprovals (r:1 w:1)
-	/// Proof: Bounties BountyApprovals (max_values: Some(1), max_size: Some(402), added: 897, mode: MaxEncodedLen)
-	/// The range of component `p` is `[0, 100]`.
-	fn on_initialize_proposals(p: u32, ) -> Weight {
-		// Proof Size summary in bytes:
-		//  Measured:  `251 + p * (251 ±0)`
-		//  Estimated: `1887 + p * (5206 ±0)`
-		// Minimum execution time: 45_157_000 picoseconds.
-		Weight::from_parts(40_228_554, 0)
-			.saturating_add(Weight::from_parts(0, 1887))
-			// Standard Error: 17_245
-			.saturating_add(Weight::from_parts(43_213_942, 0).saturating_mul(p.into()))
-			.saturating_add(T::DbWeight::get().reads(4))
-			.saturating_add(T::DbWeight::get().reads((3_u64).saturating_mul(p.into())))
-			.saturating_add(T::DbWeight::get().writes(4))
-			.saturating_add(T::DbWeight::get().writes((3_u64).saturating_mul(p.into())))
-			.saturating_add(Weight::from_parts(0, 5206).saturating_mul(p.into()))
-	}
-}
diff --git a/polkadot/runtime/polkadot/src/weights/pallet_utility.rs b/polkadot/runtime/polkadot/src/weights/pallet_utility.rs
deleted file mode 100644
index 1315ad6f8c44787ba936d49474034889bb67d073..0000000000000000000000000000000000000000
--- a/polkadot/runtime/polkadot/src/weights/pallet_utility.rs
+++ /dev/null
@@ -1,102 +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/>.
-
-//! Autogenerated weights for `pallet_utility`
-//!
-//! THIS FILE WAS AUTO-GENERATED USING THE SUBSTRATE BENCHMARK CLI VERSION 4.0.0-dev
-//! DATE: 2023-06-19, STEPS: `50`, REPEAT: `20`, LOW RANGE: `[]`, HIGH RANGE: `[]`
-//! WORST CASE MAP SIZE: `1000000`
-//! HOSTNAME: `runner-e8ezs4ez-project-163-concurrent-0`, CPU: `Intel(R) Xeon(R) CPU @ 2.60GHz`
-//! EXECUTION: Some(Wasm), WASM-EXECUTION: Compiled, CHAIN: Some("polkadot-dev"), DB CACHE: 1024
-
-// Executed Command:
-// ./target/production/polkadot
-// benchmark
-// pallet
-// --chain=polkadot-dev
-// --steps=50
-// --repeat=20
-// --no-storage-info
-// --no-median-slopes
-// --no-min-squares
-// --pallet=pallet_utility
-// --extrinsic=*
-// --execution=wasm
-// --wasm-execution=compiled
-// --header=./file_header.txt
-// --output=./runtime/polkadot/src/weights/
-
-#![cfg_attr(rustfmt, rustfmt_skip)]
-#![allow(unused_parens)]
-#![allow(unused_imports)]
-#![allow(missing_docs)]
-
-use frame_support::{traits::Get, weights::Weight};
-use core::marker::PhantomData;
-
-/// Weight functions for `pallet_utility`.
-pub struct WeightInfo<T>(PhantomData<T>);
-impl<T: frame_system::Config> pallet_utility::WeightInfo for WeightInfo<T> {
-	/// The range of component `c` is `[0, 1000]`.
-	fn batch(c: u32, ) -> Weight {
-		// Proof Size summary in bytes:
-		//  Measured:  `0`
-		//  Estimated: `0`
-		// Minimum execution time: 6_489_000 picoseconds.
-		Weight::from_parts(13_259_019, 0)
-			.saturating_add(Weight::from_parts(0, 0))
-			// Standard Error: 2_263
-			.saturating_add(Weight::from_parts(5_239_842, 0).saturating_mul(c.into()))
-	}
-	fn as_derivative() -> Weight {
-		// Proof Size summary in bytes:
-		//  Measured:  `0`
-		//  Estimated: `0`
-		// Minimum execution time: 5_128_000 picoseconds.
-		Weight::from_parts(5_402_000, 0)
-			.saturating_add(Weight::from_parts(0, 0))
-	}
-	/// The range of component `c` is `[0, 1000]`.
-	fn batch_all(c: u32, ) -> Weight {
-		// Proof Size summary in bytes:
-		//  Measured:  `0`
-		//  Estimated: `0`
-		// Minimum execution time: 6_609_000 picoseconds.
-		Weight::from_parts(9_345_211, 0)
-			.saturating_add(Weight::from_parts(0, 0))
-			// Standard Error: 2_018
-			.saturating_add(Weight::from_parts(5_550_153, 0).saturating_mul(c.into()))
-	}
-	fn dispatch_as() -> Weight {
-		// Proof Size summary in bytes:
-		//  Measured:  `0`
-		//  Estimated: `0`
-		// Minimum execution time: 8_803_000 picoseconds.
-		Weight::from_parts(9_123_000, 0)
-			.saturating_add(Weight::from_parts(0, 0))
-	}
-	/// The range of component `c` is `[0, 1000]`.
-	fn force_batch(c: u32, ) -> Weight {
-		// Proof Size summary in bytes:
-		//  Measured:  `0`
-		//  Estimated: `0`
-		// Minimum execution time: 6_630_000 picoseconds.
-		Weight::from_parts(8_158_486, 0)
-			.saturating_add(Weight::from_parts(0, 0))
-			// Standard Error: 1_533
-			.saturating_add(Weight::from_parts(5_246_137, 0).saturating_mul(c.into()))
-	}
-}
diff --git a/polkadot/runtime/polkadot/src/weights/pallet_vesting.rs b/polkadot/runtime/polkadot/src/weights/pallet_vesting.rs
deleted file mode 100644
index 916ca4bf6b9c7cc4f90e26ea3b38a76b105d10ce..0000000000000000000000000000000000000000
--- a/polkadot/runtime/polkadot/src/weights/pallet_vesting.rs
+++ /dev/null
@@ -1,241 +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/>.
-
-//! Autogenerated weights for `pallet_vesting`
-//!
-//! THIS FILE WAS AUTO-GENERATED USING THE SUBSTRATE BENCHMARK CLI VERSION 4.0.0-dev
-//! DATE: 2023-06-19, STEPS: `50`, REPEAT: `20`, LOW RANGE: `[]`, HIGH RANGE: `[]`
-//! WORST CASE MAP SIZE: `1000000`
-//! HOSTNAME: `runner-e8ezs4ez-project-163-concurrent-0`, CPU: `Intel(R) Xeon(R) CPU @ 2.60GHz`
-//! EXECUTION: Some(Wasm), WASM-EXECUTION: Compiled, CHAIN: Some("polkadot-dev"), DB CACHE: 1024
-
-// Executed Command:
-// ./target/production/polkadot
-// benchmark
-// pallet
-// --chain=polkadot-dev
-// --steps=50
-// --repeat=20
-// --no-storage-info
-// --no-median-slopes
-// --no-min-squares
-// --pallet=pallet_vesting
-// --extrinsic=*
-// --execution=wasm
-// --wasm-execution=compiled
-// --header=./file_header.txt
-// --output=./runtime/polkadot/src/weights/
-
-#![cfg_attr(rustfmt, rustfmt_skip)]
-#![allow(unused_parens)]
-#![allow(unused_imports)]
-#![allow(missing_docs)]
-
-use frame_support::{traits::Get, weights::Weight};
-use core::marker::PhantomData;
-
-/// Weight functions for `pallet_vesting`.
-pub struct WeightInfo<T>(PhantomData<T>);
-impl<T: frame_system::Config> pallet_vesting::WeightInfo for WeightInfo<T> {
-	/// Storage: Vesting Vesting (r:1 w:1)
-	/// Proof: Vesting Vesting (max_values: None, max_size: Some(1057), added: 3532, mode: MaxEncodedLen)
-	/// Storage: Balances Locks (r:1 w:1)
-	/// Proof: Balances Locks (max_values: None, max_size: Some(1299), added: 3774, mode: MaxEncodedLen)
-	/// Storage: Balances Freezes (r:1 w:0)
-	/// Proof: Balances Freezes (max_values: None, max_size: Some(49), added: 2524, mode: MaxEncodedLen)
-	/// The range of component `l` is `[0, 49]`.
-	/// The range of component `s` is `[1, 28]`.
-	fn vest_locked(l: u32, s: u32, ) -> Weight {
-		// Proof Size summary in bytes:
-		//  Measured:  `314 + l * (25 ±0) + s * (36 ±0)`
-		//  Estimated: `4764`
-		// Minimum execution time: 34_121_000 picoseconds.
-		Weight::from_parts(33_874_584, 0)
-			.saturating_add(Weight::from_parts(0, 4764))
-			// Standard Error: 2_001
-			.saturating_add(Weight::from_parts(43_368, 0).saturating_mul(l.into()))
-			// Standard Error: 3_560
-			.saturating_add(Weight::from_parts(80_668, 0).saturating_mul(s.into()))
-			.saturating_add(T::DbWeight::get().reads(3))
-			.saturating_add(T::DbWeight::get().writes(2))
-	}
-	/// Storage: Vesting Vesting (r:1 w:1)
-	/// Proof: Vesting Vesting (max_values: None, max_size: Some(1057), added: 3532, mode: MaxEncodedLen)
-	/// Storage: Balances Locks (r:1 w:1)
-	/// Proof: Balances Locks (max_values: None, max_size: Some(1299), added: 3774, mode: MaxEncodedLen)
-	/// Storage: Balances Freezes (r:1 w:0)
-	/// Proof: Balances Freezes (max_values: None, max_size: Some(49), added: 2524, mode: MaxEncodedLen)
-	/// The range of component `l` is `[0, 49]`.
-	/// The range of component `s` is `[1, 28]`.
-	fn vest_unlocked(l: u32, s: u32, ) -> Weight {
-		// Proof Size summary in bytes:
-		//  Measured:  `314 + l * (25 ±0) + s * (36 ±0)`
-		//  Estimated: `4764`
-		// Minimum execution time: 37_615_000 picoseconds.
-		Weight::from_parts(37_040_523, 0)
-			.saturating_add(Weight::from_parts(0, 4764))
-			// Standard Error: 1_513
-			.saturating_add(Weight::from_parts(44_043, 0).saturating_mul(l.into()))
-			// Standard Error: 2_692
-			.saturating_add(Weight::from_parts(76_579, 0).saturating_mul(s.into()))
-			.saturating_add(T::DbWeight::get().reads(3))
-			.saturating_add(T::DbWeight::get().writes(2))
-	}
-	/// Storage: Vesting Vesting (r:1 w:1)
-	/// Proof: Vesting Vesting (max_values: None, max_size: Some(1057), added: 3532, mode: MaxEncodedLen)
-	/// Storage: Balances Locks (r:1 w:1)
-	/// Proof: Balances Locks (max_values: None, max_size: Some(1299), added: 3774, mode: MaxEncodedLen)
-	/// Storage: Balances Freezes (r:1 w:0)
-	/// Proof: Balances Freezes (max_values: None, max_size: Some(49), added: 2524, mode: MaxEncodedLen)
-	/// Storage: System Account (r:1 w:1)
-	/// Proof: System Account (max_values: None, max_size: Some(128), added: 2603, mode: MaxEncodedLen)
-	/// The range of component `l` is `[0, 49]`.
-	/// The range of component `s` is `[1, 28]`.
-	fn vest_other_locked(l: u32, s: u32, ) -> Weight {
-		// Proof Size summary in bytes:
-		//  Measured:  `417 + l * (25 ±0) + s * (36 ±0)`
-		//  Estimated: `4764`
-		// Minimum execution time: 36_953_000 picoseconds.
-		Weight::from_parts(35_679_094, 0)
-			.saturating_add(Weight::from_parts(0, 4764))
-			// Standard Error: 1_788
-			.saturating_add(Weight::from_parts(55_569, 0).saturating_mul(l.into()))
-			// Standard Error: 3_182
-			.saturating_add(Weight::from_parts(95_878, 0).saturating_mul(s.into()))
-			.saturating_add(T::DbWeight::get().reads(4))
-			.saturating_add(T::DbWeight::get().writes(3))
-	}
-	/// Storage: Vesting Vesting (r:1 w:1)
-	/// Proof: Vesting Vesting (max_values: None, max_size: Some(1057), added: 3532, mode: MaxEncodedLen)
-	/// Storage: Balances Locks (r:1 w:1)
-	/// Proof: Balances Locks (max_values: None, max_size: Some(1299), added: 3774, mode: MaxEncodedLen)
-	/// Storage: Balances Freezes (r:1 w:0)
-	/// Proof: Balances Freezes (max_values: None, max_size: Some(49), added: 2524, mode: MaxEncodedLen)
-	/// Storage: System Account (r:1 w:1)
-	/// Proof: System Account (max_values: None, max_size: Some(128), added: 2603, mode: MaxEncodedLen)
-	/// The range of component `l` is `[0, 49]`.
-	/// The range of component `s` is `[1, 28]`.
-	fn vest_other_unlocked(l: u32, s: u32, ) -> Weight {
-		// Proof Size summary in bytes:
-		//  Measured:  `417 + l * (25 ±0) + s * (36 ±0)`
-		//  Estimated: `4764`
-		// Minimum execution time: 39_817_000 picoseconds.
-		Weight::from_parts(40_592_159, 0)
-			.saturating_add(Weight::from_parts(0, 4764))
-			// Standard Error: 2_675
-			.saturating_add(Weight::from_parts(34_692, 0).saturating_mul(l.into()))
-			// Standard Error: 4_760
-			.saturating_add(Weight::from_parts(65_300, 0).saturating_mul(s.into()))
-			.saturating_add(T::DbWeight::get().reads(4))
-			.saturating_add(T::DbWeight::get().writes(3))
-	}
-	/// Storage: Vesting Vesting (r:1 w:1)
-	/// Proof: Vesting Vesting (max_values: None, max_size: Some(1057), added: 3532, mode: MaxEncodedLen)
-	/// Storage: System Account (r:1 w:1)
-	/// Proof: System Account (max_values: None, max_size: Some(128), added: 2603, mode: MaxEncodedLen)
-	/// Storage: Balances Locks (r:1 w:1)
-	/// Proof: Balances Locks (max_values: None, max_size: Some(1299), added: 3774, mode: MaxEncodedLen)
-	/// Storage: Balances Freezes (r:1 w:0)
-	/// Proof: Balances Freezes (max_values: None, max_size: Some(49), added: 2524, mode: MaxEncodedLen)
-	/// The range of component `l` is `[0, 49]`.
-	/// The range of component `s` is `[0, 27]`.
-	fn vested_transfer(l: u32, s: u32, ) -> Weight {
-		// Proof Size summary in bytes:
-		//  Measured:  `488 + l * (25 ±0) + s * (36 ±0)`
-		//  Estimated: `4764`
-		// Minimum execution time: 72_258_000 picoseconds.
-		Weight::from_parts(74_062_243, 0)
-			.saturating_add(Weight::from_parts(0, 4764))
-			// Standard Error: 3_135
-			.saturating_add(Weight::from_parts(50_768, 0).saturating_mul(l.into()))
-			// Standard Error: 5_578
-			.saturating_add(Weight::from_parts(83_913, 0).saturating_mul(s.into()))
-			.saturating_add(T::DbWeight::get().reads(4))
-			.saturating_add(T::DbWeight::get().writes(3))
-	}
-	/// Storage: Vesting Vesting (r:1 w:1)
-	/// Proof: Vesting Vesting (max_values: None, max_size: Some(1057), added: 3532, mode: MaxEncodedLen)
-	/// Storage: System Account (r:2 w:2)
-	/// Proof: System Account (max_values: None, max_size: Some(128), added: 2603, mode: MaxEncodedLen)
-	/// Storage: Balances Locks (r:1 w:1)
-	/// Proof: Balances Locks (max_values: None, max_size: Some(1299), added: 3774, mode: MaxEncodedLen)
-	/// Storage: Balances Freezes (r:1 w:0)
-	/// Proof: Balances Freezes (max_values: None, max_size: Some(49), added: 2524, mode: MaxEncodedLen)
-	/// The range of component `l` is `[0, 49]`.
-	/// The range of component `s` is `[0, 27]`.
-	fn force_vested_transfer(l: u32, s: u32, ) -> Weight {
-		// Proof Size summary in bytes:
-		//  Measured:  `591 + l * (25 ±0) + s * (36 ±0)`
-		//  Estimated: `6196`
-		// Minimum execution time: 75_260_000 picoseconds.
-		Weight::from_parts(75_838_762, 0)
-			.saturating_add(Weight::from_parts(0, 6196))
-			// Standard Error: 2_742
-			.saturating_add(Weight::from_parts(57_676, 0).saturating_mul(l.into()))
-			// Standard Error: 4_879
-			.saturating_add(Weight::from_parts(106_745, 0).saturating_mul(s.into()))
-			.saturating_add(T::DbWeight::get().reads(5))
-			.saturating_add(T::DbWeight::get().writes(4))
-	}
-	/// Storage: Vesting Vesting (r:1 w:1)
-	/// Proof: Vesting Vesting (max_values: None, max_size: Some(1057), added: 3532, mode: MaxEncodedLen)
-	/// Storage: Balances Locks (r:1 w:1)
-	/// Proof: Balances Locks (max_values: None, max_size: Some(1299), added: 3774, mode: MaxEncodedLen)
-	/// Storage: Balances Freezes (r:1 w:0)
-	/// Proof: Balances Freezes (max_values: None, max_size: Some(49), added: 2524, mode: MaxEncodedLen)
-	/// Storage: System Account (r:1 w:1)
-	/// Proof: System Account (max_values: None, max_size: Some(128), added: 2603, mode: MaxEncodedLen)
-	/// The range of component `l` is `[0, 49]`.
-	/// The range of component `s` is `[2, 28]`.
-	fn not_unlocking_merge_schedules(l: u32, s: u32, ) -> Weight {
-		// Proof Size summary in bytes:
-		//  Measured:  `415 + l * (25 ±0) + s * (36 ±0)`
-		//  Estimated: `4764`
-		// Minimum execution time: 37_553_000 picoseconds.
-		Weight::from_parts(36_199_505, 0)
-			.saturating_add(Weight::from_parts(0, 4764))
-			// Standard Error: 1_594
-			.saturating_add(Weight::from_parts(60_107, 0).saturating_mul(l.into()))
-			// Standard Error: 2_945
-			.saturating_add(Weight::from_parts(104_552, 0).saturating_mul(s.into()))
-			.saturating_add(T::DbWeight::get().reads(4))
-			.saturating_add(T::DbWeight::get().writes(3))
-	}
-	/// Storage: Vesting Vesting (r:1 w:1)
-	/// Proof: Vesting Vesting (max_values: None, max_size: Some(1057), added: 3532, mode: MaxEncodedLen)
-	/// Storage: Balances Locks (r:1 w:1)
-	/// Proof: Balances Locks (max_values: None, max_size: Some(1299), added: 3774, mode: MaxEncodedLen)
-	/// Storage: Balances Freezes (r:1 w:0)
-	/// Proof: Balances Freezes (max_values: None, max_size: Some(49), added: 2524, mode: MaxEncodedLen)
-	/// Storage: System Account (r:1 w:1)
-	/// Proof: System Account (max_values: None, max_size: Some(128), added: 2603, mode: MaxEncodedLen)
-	/// The range of component `l` is `[0, 49]`.
-	/// The range of component `s` is `[2, 28]`.
-	fn unlocking_merge_schedules(l: u32, s: u32, ) -> Weight {
-		// Proof Size summary in bytes:
-		//  Measured:  `415 + l * (25 ±0) + s * (36 ±0)`
-		//  Estimated: `4764`
-		// Minimum execution time: 41_939_000 picoseconds.
-		Weight::from_parts(42_113_365, 0)
-			.saturating_add(Weight::from_parts(0, 4764))
-			// Standard Error: 2_119
-			.saturating_add(Weight::from_parts(44_822, 0).saturating_mul(l.into()))
-			// Standard Error: 3_914
-			.saturating_add(Weight::from_parts(73_401, 0).saturating_mul(s.into()))
-			.saturating_add(T::DbWeight::get().reads(4))
-			.saturating_add(T::DbWeight::get().writes(3))
-	}
-}
diff --git a/polkadot/runtime/polkadot/src/weights/pallet_whitelist.rs b/polkadot/runtime/polkadot/src/weights/pallet_whitelist.rs
deleted file mode 100644
index fd3831a3ef5943288496d87b38b73bcaed2332b9..0000000000000000000000000000000000000000
--- a/polkadot/runtime/polkadot/src/weights/pallet_whitelist.rs
+++ /dev/null
@@ -1,118 +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/>.
-
-//! Autogenerated weights for `pallet_whitelist`
-//!
-//! THIS FILE WAS AUTO-GENERATED USING THE SUBSTRATE BENCHMARK CLI VERSION 4.0.0-dev
-//! DATE: 2023-06-19, STEPS: `50`, REPEAT: `20`, LOW RANGE: `[]`, HIGH RANGE: `[]`
-//! WORST CASE MAP SIZE: `1000000`
-//! HOSTNAME: `runner-e8ezs4ez-project-163-concurrent-0`, CPU: `Intel(R) Xeon(R) CPU @ 2.60GHz`
-//! EXECUTION: Some(Wasm), WASM-EXECUTION: Compiled, CHAIN: Some("polkadot-dev"), DB CACHE: 1024
-
-// Executed Command:
-// ./target/production/polkadot
-// benchmark
-// pallet
-// --chain=polkadot-dev
-// --steps=50
-// --repeat=20
-// --no-storage-info
-// --no-median-slopes
-// --no-min-squares
-// --pallet=pallet_whitelist
-// --extrinsic=*
-// --execution=wasm
-// --wasm-execution=compiled
-// --header=./file_header.txt
-// --output=./runtime/polkadot/src/weights/
-
-#![cfg_attr(rustfmt, rustfmt_skip)]
-#![allow(unused_parens)]
-#![allow(unused_imports)]
-#![allow(missing_docs)]
-
-use frame_support::{traits::Get, weights::Weight};
-use core::marker::PhantomData;
-
-/// Weight functions for `pallet_whitelist`.
-pub struct WeightInfo<T>(PhantomData<T>);
-impl<T: frame_system::Config> pallet_whitelist::WeightInfo for WeightInfo<T> {
-	/// Storage: Whitelist WhitelistedCall (r:1 w:1)
-	/// Proof: Whitelist WhitelistedCall (max_values: None, max_size: Some(40), added: 2515, mode: MaxEncodedLen)
-	/// Storage: Preimage StatusFor (r:1 w:1)
-	/// Proof: Preimage StatusFor (max_values: None, max_size: Some(91), added: 2566, mode: MaxEncodedLen)
-	fn whitelist_call() -> Weight {
-		// Proof Size summary in bytes:
-		//  Measured:  `118`
-		//  Estimated: `3556`
-		// Minimum execution time: 20_665_000 picoseconds.
-		Weight::from_parts(21_174_000, 0)
-			.saturating_add(Weight::from_parts(0, 3556))
-			.saturating_add(T::DbWeight::get().reads(2))
-			.saturating_add(T::DbWeight::get().writes(2))
-	}
-	/// Storage: Whitelist WhitelistedCall (r:1 w:1)
-	/// Proof: Whitelist WhitelistedCall (max_values: None, max_size: Some(40), added: 2515, mode: MaxEncodedLen)
-	/// Storage: Preimage StatusFor (r:1 w:1)
-	/// Proof: Preimage StatusFor (max_values: None, max_size: Some(91), added: 2566, mode: MaxEncodedLen)
-	fn remove_whitelisted_call() -> Weight {
-		// Proof Size summary in bytes:
-		//  Measured:  `247`
-		//  Estimated: `3556`
-		// Minimum execution time: 18_337_000 picoseconds.
-		Weight::from_parts(18_705_000, 0)
-			.saturating_add(Weight::from_parts(0, 3556))
-			.saturating_add(T::DbWeight::get().reads(2))
-			.saturating_add(T::DbWeight::get().writes(2))
-	}
-	/// Storage: Whitelist WhitelistedCall (r:1 w:1)
-	/// Proof: Whitelist WhitelistedCall (max_values: None, max_size: Some(40), added: 2515, mode: MaxEncodedLen)
-	/// Storage: Preimage PreimageFor (r:1 w:1)
-	/// Proof: Preimage PreimageFor (max_values: None, max_size: Some(4194344), added: 4196819, mode: Measured)
-	/// Storage: Preimage StatusFor (r:1 w:1)
-	/// Proof: Preimage StatusFor (max_values: None, max_size: Some(91), added: 2566, mode: MaxEncodedLen)
-	/// The range of component `n` is `[1, 4194294]`.
-	fn dispatch_whitelisted_call(n: u32, ) -> Weight {
-		// Proof Size summary in bytes:
-		//  Measured:  `323 + n * (1 ±0)`
-		//  Estimated: `3787 + n * (1 ±0)`
-		// Minimum execution time: 30_433_000 picoseconds.
-		Weight::from_parts(30_800_000, 0)
-			.saturating_add(Weight::from_parts(0, 3787))
-			// Standard Error: 7
-			.saturating_add(Weight::from_parts(1_558, 0).saturating_mul(n.into()))
-			.saturating_add(T::DbWeight::get().reads(3))
-			.saturating_add(T::DbWeight::get().writes(3))
-			.saturating_add(Weight::from_parts(0, 1).saturating_mul(n.into()))
-	}
-	/// Storage: Whitelist WhitelistedCall (r:1 w:1)
-	/// Proof: Whitelist WhitelistedCall (max_values: None, max_size: Some(40), added: 2515, mode: MaxEncodedLen)
-	/// Storage: Preimage StatusFor (r:1 w:1)
-	/// Proof: Preimage StatusFor (max_values: None, max_size: Some(91), added: 2566, mode: MaxEncodedLen)
-	/// The range of component `n` is `[1, 10000]`.
-	fn dispatch_whitelisted_call_with_preimage(n: u32, ) -> Weight {
-		// Proof Size summary in bytes:
-		//  Measured:  `247`
-		//  Estimated: `3556`
-		// Minimum execution time: 22_062_000 picoseconds.
-		Weight::from_parts(22_797_644, 0)
-			.saturating_add(Weight::from_parts(0, 3556))
-			// Standard Error: 3
-			.saturating_add(Weight::from_parts(1_493, 0).saturating_mul(n.into()))
-			.saturating_add(T::DbWeight::get().reads(2))
-			.saturating_add(T::DbWeight::get().writes(2))
-	}
-}
diff --git a/polkadot/runtime/polkadot/src/weights/pallet_xcm.rs b/polkadot/runtime/polkadot/src/weights/pallet_xcm.rs
deleted file mode 100644
index abbd5b1f2b9624d99a7fdaa6ad3f2cbde84355bc..0000000000000000000000000000000000000000
--- a/polkadot/runtime/polkadot/src/weights/pallet_xcm.rs
+++ /dev/null
@@ -1,284 +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/>.
-
-//! Autogenerated weights for `pallet_xcm`
-//!
-//! THIS FILE WAS AUTO-GENERATED USING THE SUBSTRATE BENCHMARK CLI VERSION 4.0.0-dev
-//! DATE: 2023-06-19, STEPS: `50`, REPEAT: `20`, LOW RANGE: `[]`, HIGH RANGE: `[]`
-//! WORST CASE MAP SIZE: `1000000`
-//! HOSTNAME: `runner-e8ezs4ez-project-163-concurrent-0`, CPU: `Intel(R) Xeon(R) CPU @ 2.60GHz`
-//! EXECUTION: Some(Wasm), WASM-EXECUTION: Compiled, CHAIN: Some("polkadot-dev"), DB CACHE: 1024
-
-// Executed Command:
-// target/production/polkadot
-// benchmark
-// pallet
-// --steps=50
-// --repeat=20
-// --no-storage-info
-// --no-median-slopes
-// --no-min-squares
-// --pallet=pallet_xcm
-// --extrinsic=*
-// --execution=wasm
-// --wasm-execution=compiled
-// --heap-pages=4096
-// --json-file=/var/lib/gitlab-runner/builds/zyw4fam_/0/parity/mirrors/polkadot/.git/.artifacts/bench.json
-// --pallet=pallet_xcm
-// --chain=polkadot-dev
-// --header=./file_header.txt
-// --output=./runtime/polkadot/src/weights/
-
-#![cfg_attr(rustfmt, rustfmt_skip)]
-#![allow(unused_parens)]
-#![allow(unused_imports)]
-#![allow(missing_docs)]
-
-use frame_support::{traits::Get, weights::Weight};
-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: Configuration ActiveConfig (r:1 w:0)
-	/// Proof Skipped: Configuration ActiveConfig (max_values: Some(1), max_size: None, mode: Measured)
-	/// Storage: Dmp DeliveryFeeFactor (r:1 w:0)
-	/// Proof Skipped: Dmp DeliveryFeeFactor (max_values: None, max_size: None, mode: Measured)
-	/// Storage: XcmPallet SupportedVersion (r:1 w:0)
-	/// Proof Skipped: XcmPallet SupportedVersion (max_values: None, max_size: None, mode: Measured)
-	/// Storage: Dmp DownwardMessageQueues (r:1 w:1)
-	/// Proof Skipped: Dmp DownwardMessageQueues (max_values: None, max_size: None, mode: Measured)
-	/// Storage: Dmp DownwardMessageQueueHeads (r:1 w:1)
-	/// Proof Skipped: Dmp DownwardMessageQueueHeads (max_values: None, max_size: None, mode: Measured)
-	fn send() -> Weight {
-		// Proof Size summary in bytes:
-		//  Measured:  `527`
-		//  Estimated: `3992`
-		// Minimum execution time: 38_390_000 picoseconds.
-		Weight::from_parts(38_885_000, 0)
-			.saturating_add(Weight::from_parts(0, 3992))
-			.saturating_add(T::DbWeight::get().reads(7))
-			.saturating_add(T::DbWeight::get().writes(3))
-	}
-	fn teleport_assets() -> Weight {
-		// Proof Size summary in bytes:
-		//  Measured:  `0`
-		//  Estimated: `0`
-		// Minimum execution time: 23_170_000 picoseconds.
-		Weight::from_parts(23_644_000, 0)
-			.saturating_add(Weight::from_parts(0, 0))
-	}
-	fn reserve_transfer_assets() -> Weight {
-		// Proof Size summary in bytes:
-		//  Measured:  `0`
-		//  Estimated: `0`
-		// Minimum execution time: 22_672_000 picoseconds.
-		Weight::from_parts(23_138_000, 0)
-			.saturating_add(Weight::from_parts(0, 0))
-	}
-	/// Storage: Benchmark Override (r:0 w:0)
-	/// Proof Skipped: Benchmark Override (max_values: None, 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))
-	}
-	/// Storage: XcmPallet SupportedVersion (r:0 w:1)
-	/// Proof Skipped: XcmPallet SupportedVersion (max_values: None, max_size: None, mode: Measured)
-	fn force_xcm_version() -> Weight {
-		// Proof Size summary in bytes:
-		//  Measured:  `0`
-		//  Estimated: `0`
-		// Minimum execution time: 9_462_000 picoseconds.
-		Weight::from_parts(9_853_000, 0)
-			.saturating_add(Weight::from_parts(0, 0))
-			.saturating_add(T::DbWeight::get().writes(1))
-	}
-	fn force_default_xcm_version() -> Weight {
-		// Proof Size summary in bytes:
-		//  Measured:  `0`
-		//  Estimated: `0`
-		// Minimum execution time: 2_769_000 picoseconds.
-		Weight::from_parts(3_001_000, 0)
-			.saturating_add(Weight::from_parts(0, 0))
-	}
-	/// Storage: XcmPallet VersionNotifiers (r:1 w:1)
-	/// Proof Skipped: XcmPallet VersionNotifiers (max_values: None, max_size: None, mode: Measured)
-	/// Storage: XcmPallet QueryCounter (r:1 w:1)
-	/// Proof Skipped: XcmPallet QueryCounter (max_values: Some(1), max_size: None, mode: Measured)
-	/// Storage: Configuration ActiveConfig (r:1 w:0)
-	/// Proof Skipped: Configuration ActiveConfig (max_values: Some(1), max_size: None, mode: Measured)
-	/// Storage: Dmp DeliveryFeeFactor (r:1 w:0)
-	/// Proof Skipped: Dmp DeliveryFeeFactor (max_values: None, max_size: None, mode: Measured)
-	/// Storage: XcmPallet SupportedVersion (r:1 w:0)
-	/// Proof Skipped: XcmPallet SupportedVersion (max_values: None, max_size: None, mode: Measured)
-	/// Storage: Dmp DownwardMessageQueues (r:1 w:1)
-	/// Proof Skipped: Dmp DownwardMessageQueues (max_values: None, max_size: None, mode: Measured)
-	/// Storage: Dmp DownwardMessageQueueHeads (r:1 w:1)
-	/// Proof Skipped: Dmp DownwardMessageQueueHeads (max_values: None, max_size: None, mode: Measured)
-	/// Storage: XcmPallet Queries (r:0 w:1)
-	/// Proof Skipped: XcmPallet Queries (max_values: None, max_size: None, mode: Measured)
-	fn force_subscribe_version_notify() -> Weight {
-		// Proof Size summary in bytes:
-		//  Measured:  `527`
-		//  Estimated: `3992`
-		// Minimum execution time: 41_707_000 picoseconds.
-		Weight::from_parts(42_742_000, 0)
-			.saturating_add(Weight::from_parts(0, 3992))
-			.saturating_add(T::DbWeight::get().reads(9))
-			.saturating_add(T::DbWeight::get().writes(6))
-	}
-	/// Storage: XcmPallet VersionNotifiers (r:1 w:1)
-	/// Proof Skipped: XcmPallet VersionNotifiers (max_values: None, max_size: None, mode: Measured)
-	/// Storage: Configuration ActiveConfig (r:1 w:0)
-	/// Proof Skipped: Configuration ActiveConfig (max_values: Some(1), max_size: None, mode: Measured)
-	/// Storage: Dmp DeliveryFeeFactor (r:1 w:0)
-	/// Proof Skipped: Dmp DeliveryFeeFactor (max_values: None, max_size: None, mode: Measured)
-	/// Storage: XcmPallet SupportedVersion (r:1 w:0)
-	/// Proof Skipped: XcmPallet SupportedVersion (max_values: None, max_size: None, mode: Measured)
-	/// Storage: Dmp DownwardMessageQueues (r:1 w:1)
-	/// Proof Skipped: Dmp DownwardMessageQueues (max_values: None, max_size: None, mode: Measured)
-	/// Storage: Dmp DownwardMessageQueueHeads (r:1 w:1)
-	/// Proof Skipped: Dmp DownwardMessageQueueHeads (max_values: None, max_size: None, mode: Measured)
-	/// Storage: XcmPallet Queries (r:0 w:1)
-	/// Proof Skipped: XcmPallet Queries (max_values: None, max_size: None, mode: Measured)
-	fn force_unsubscribe_version_notify() -> Weight {
-		// Proof Size summary in bytes:
-		//  Measured:  `799`
-		//  Estimated: `4264`
-		// Minimum execution time: 46_077_000 picoseconds.
-		Weight::from_parts(46_504_000, 0)
-			.saturating_add(Weight::from_parts(0, 4264))
-			.saturating_add(T::DbWeight::get().reads(8))
-			.saturating_add(T::DbWeight::get().writes(5))
-	}
-	/// Storage: XcmPallet XcmExecutionSuspended (r:0 w:1)
-	/// Proof Skipped: XcmPallet XcmExecutionSuspended (max_values: Some(1), max_size: None, mode: Measured)
-	fn force_suspension() -> Weight {
-		// Proof Size summary in bytes:
-		//  Measured:  `0`
-		//  Estimated: `0`
-		// Minimum execution time: 2_849_000 picoseconds.
-		Weight::from_parts(3_018_000, 0)
-			.saturating_add(Weight::from_parts(0, 0))
-			.saturating_add(T::DbWeight::get().writes(1))
-	}
-	/// Storage: XcmPallet SupportedVersion (r:4 w:2)
-	/// Proof Skipped: XcmPallet SupportedVersion (max_values: None, max_size: None, mode: Measured)
-	fn migrate_supported_version() -> Weight {
-		// Proof Size summary in bytes:
-		//  Measured:  `229`
-		//  Estimated: `11119`
-		// Minimum execution time: 17_729_000 picoseconds.
-		Weight::from_parts(18_210_000, 0)
-			.saturating_add(Weight::from_parts(0, 11119))
-			.saturating_add(T::DbWeight::get().reads(4))
-			.saturating_add(T::DbWeight::get().writes(2))
-	}
-	/// Storage: XcmPallet VersionNotifiers (r:4 w:2)
-	/// Proof Skipped: XcmPallet VersionNotifiers (max_values: None, max_size: None, mode: Measured)
-	fn migrate_version_notifiers() -> Weight {
-		// Proof Size summary in bytes:
-		//  Measured:  `233`
-		//  Estimated: `11123`
-		// Minimum execution time: 17_615_000 picoseconds.
-		Weight::from_parts(18_157_000, 0)
-			.saturating_add(Weight::from_parts(0, 11123))
-			.saturating_add(T::DbWeight::get().reads(4))
-			.saturating_add(T::DbWeight::get().writes(2))
-	}
-	/// Storage: XcmPallet VersionNotifyTargets (r:5 w:0)
-	/// Proof Skipped: XcmPallet VersionNotifyTargets (max_values: None, max_size: None, mode: Measured)
-	fn already_notified_target() -> Weight {
-		// Proof Size summary in bytes:
-		//  Measured:  `243`
-		//  Estimated: `13608`
-		// Minimum execution time: 19_112_000 picoseconds.
-		Weight::from_parts(19_512_000, 0)
-			.saturating_add(Weight::from_parts(0, 13608))
-			.saturating_add(T::DbWeight::get().reads(5))
-	}
-	/// Storage: XcmPallet VersionNotifyTargets (r:2 w:1)
-	/// Proof Skipped: XcmPallet VersionNotifyTargets (max_values: None, max_size: None, mode: Measured)
-	/// Storage: Configuration ActiveConfig (r:1 w:0)
-	/// Proof Skipped: Configuration ActiveConfig (max_values: Some(1), max_size: None, mode: Measured)
-	/// Storage: Dmp DeliveryFeeFactor (r:1 w:0)
-	/// Proof Skipped: Dmp DeliveryFeeFactor (max_values: None, max_size: None, mode: Measured)
-	/// Storage: XcmPallet SupportedVersion (r:1 w:0)
-	/// Proof Skipped: XcmPallet SupportedVersion (max_values: None, max_size: None, mode: Measured)
-	/// Storage: Dmp DownwardMessageQueues (r:1 w:1)
-	/// Proof Skipped: Dmp DownwardMessageQueues (max_values: None, max_size: None, mode: Measured)
-	/// Storage: Dmp DownwardMessageQueueHeads (r:1 w:1)
-	/// Proof Skipped: Dmp DownwardMessageQueueHeads (max_values: None, max_size: None, mode: Measured)
-	fn notify_current_targets() -> Weight {
-		// Proof Size summary in bytes:
-		//  Measured:  `597`
-		//  Estimated: `6537`
-		// Minimum execution time: 38_643_000 picoseconds.
-		Weight::from_parts(39_380_000, 0)
-			.saturating_add(Weight::from_parts(0, 6537))
-			.saturating_add(T::DbWeight::get().reads(9))
-			.saturating_add(T::DbWeight::get().writes(4))
-	}
-	/// Storage: XcmPallet VersionNotifyTargets (r:3 w:0)
-	/// Proof Skipped: XcmPallet VersionNotifyTargets (max_values: None, max_size: None, mode: Measured)
-	fn notify_target_migration_fail() -> Weight {
-		// Proof Size summary in bytes:
-		//  Measured:  `272`
-		//  Estimated: `8687`
-		// Minimum execution time: 9_326_000 picoseconds.
-		Weight::from_parts(9_772_000, 0)
-			.saturating_add(Weight::from_parts(0, 8687))
-			.saturating_add(T::DbWeight::get().reads(3))
-	}
-	/// Storage: XcmPallet VersionNotifyTargets (r:4 w:2)
-	/// Proof Skipped: XcmPallet VersionNotifyTargets (max_values: None, max_size: None, mode: Measured)
-	fn migrate_version_notify_targets() -> Weight {
-		// Proof Size summary in bytes:
-		//  Measured:  `240`
-		//  Estimated: `11130`
-		// Minimum execution time: 18_184_000 picoseconds.
-		Weight::from_parts(18_487_000, 0)
-			.saturating_add(Weight::from_parts(0, 11130))
-			.saturating_add(T::DbWeight::get().reads(4))
-			.saturating_add(T::DbWeight::get().writes(2))
-	}
-	/// Storage: XcmPallet VersionNotifyTargets (r:4 w:2)
-	/// Proof Skipped: XcmPallet VersionNotifyTargets (max_values: None, max_size: None, mode: Measured)
-	/// Storage: Configuration ActiveConfig (r:1 w:0)
-	/// Proof Skipped: Configuration ActiveConfig (max_values: Some(1), max_size: None, mode: Measured)
-	/// Storage: Dmp DeliveryFeeFactor (r:1 w:0)
-	/// Proof Skipped: Dmp DeliveryFeeFactor (max_values: None, max_size: None, mode: Measured)
-	/// Storage: XcmPallet SupportedVersion (r:1 w:0)
-	/// Proof Skipped: XcmPallet SupportedVersion (max_values: None, max_size: None, mode: Measured)
-	/// Storage: Dmp DownwardMessageQueues (r:1 w:1)
-	/// Proof Skipped: Dmp DownwardMessageQueues (max_values: None, max_size: None, mode: Measured)
-	/// Storage: Dmp DownwardMessageQueueHeads (r:1 w:1)
-	/// Proof Skipped: Dmp DownwardMessageQueueHeads (max_values: None, max_size: None, mode: Measured)
-	fn migrate_and_notify_old_targets() -> Weight {
-		// Proof Size summary in bytes:
-		//  Measured:  `601`
-		//  Estimated: `11491`
-		// Minimum execution time: 45_891_000 picoseconds.
-		Weight::from_parts(47_130_000, 0)
-			.saturating_add(Weight::from_parts(0, 11491))
-			.saturating_add(T::DbWeight::get().reads(11))
-			.saturating_add(T::DbWeight::get().writes(5))
-	}
-}
diff --git a/polkadot/runtime/polkadot/src/weights/runtime_common_auctions.rs b/polkadot/runtime/polkadot/src/weights/runtime_common_auctions.rs
deleted file mode 100644
index 8fdac1990620c754b9c0d694aa5ed32987da4d2f..0000000000000000000000000000000000000000
--- a/polkadot/runtime/polkadot/src/weights/runtime_common_auctions.rs
+++ /dev/null
@@ -1,143 +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/>.
-
-//! Autogenerated weights for `runtime_common::auctions`
-//!
-//! THIS FILE WAS AUTO-GENERATED USING THE SUBSTRATE BENCHMARK CLI VERSION 4.0.0-dev
-//! DATE: 2023-06-19, STEPS: `50`, REPEAT: `20`, LOW RANGE: `[]`, HIGH RANGE: `[]`
-//! WORST CASE MAP SIZE: `1000000`
-//! HOSTNAME: `runner-e8ezs4ez-project-163-concurrent-0`, CPU: `Intel(R) Xeon(R) CPU @ 2.60GHz`
-//! EXECUTION: Some(Wasm), WASM-EXECUTION: Compiled, CHAIN: Some("polkadot-dev"), DB CACHE: 1024
-
-// Executed Command:
-// ./target/production/polkadot
-// benchmark
-// pallet
-// --chain=polkadot-dev
-// --steps=50
-// --repeat=20
-// --no-storage-info
-// --no-median-slopes
-// --no-min-squares
-// --pallet=runtime_common::auctions
-// --extrinsic=*
-// --execution=wasm
-// --wasm-execution=compiled
-// --header=./file_header.txt
-// --output=./runtime/polkadot/src/weights/runtime_common_auctions.rs
-
-#![cfg_attr(rustfmt, rustfmt_skip)]
-#![allow(unused_parens)]
-#![allow(unused_imports)]
-#![allow(missing_docs)]
-
-use frame_support::{traits::Get, weights::Weight};
-use core::marker::PhantomData;
-
-/// Weight functions for `runtime_common::auctions`.
-pub struct WeightInfo<T>(PhantomData<T>);
-impl<T: frame_system::Config> runtime_common::auctions::WeightInfo for WeightInfo<T> {
-	/// Storage: Auctions AuctionInfo (r:1 w:1)
-	/// Proof: Auctions AuctionInfo (max_values: Some(1), max_size: Some(8), added: 503, mode: MaxEncodedLen)
-	/// Storage: Auctions AuctionCounter (r:1 w:1)
-	/// Proof: Auctions AuctionCounter (max_values: Some(1), max_size: Some(4), added: 499, mode: MaxEncodedLen)
-	fn new_auction() -> Weight {
-		// Proof Size summary in bytes:
-		//  Measured:  `4`
-		//  Estimated: `1493`
-		// Minimum execution time: 13_598_000 picoseconds.
-		Weight::from_parts(14_292_000, 0)
-			.saturating_add(Weight::from_parts(0, 1493))
-			.saturating_add(T::DbWeight::get().reads(2))
-			.saturating_add(T::DbWeight::get().writes(2))
-	}
-	/// Storage: Paras ParaLifecycles (r:1 w:0)
-	/// Proof Skipped: Paras ParaLifecycles (max_values: None, max_size: None, mode: Measured)
-	/// Storage: Auctions AuctionCounter (r:1 w:0)
-	/// Proof: Auctions AuctionCounter (max_values: Some(1), max_size: Some(4), added: 499, mode: MaxEncodedLen)
-	/// Storage: Auctions AuctionInfo (r:1 w:0)
-	/// Proof: Auctions AuctionInfo (max_values: Some(1), max_size: Some(8), added: 503, mode: MaxEncodedLen)
-	/// Storage: Slots Leases (r:1 w:0)
-	/// Proof Skipped: Slots Leases (max_values: None, max_size: None, mode: Measured)
-	/// Storage: Auctions Winning (r:1 w:1)
-	/// Proof: Auctions Winning (max_values: None, max_size: Some(1920), added: 4395, mode: MaxEncodedLen)
-	/// Storage: Auctions ReservedAmounts (r:2 w:2)
-	/// Proof: Auctions ReservedAmounts (max_values: None, max_size: Some(60), added: 2535, mode: MaxEncodedLen)
-	/// Storage: System Account (r:1 w:1)
-	/// Proof: System Account (max_values: None, max_size: Some(128), added: 2603, mode: MaxEncodedLen)
-	fn bid() -> Weight {
-		// Proof Size summary in bytes:
-		//  Measured:  `661`
-		//  Estimated: `6060`
-		// Minimum execution time: 93_532_000 picoseconds.
-		Weight::from_parts(99_534_000, 0)
-			.saturating_add(Weight::from_parts(0, 6060))
-			.saturating_add(T::DbWeight::get().reads(8))
-			.saturating_add(T::DbWeight::get().writes(4))
-	}
-	/// Storage: Auctions AuctionInfo (r:1 w:1)
-	/// Proof: Auctions AuctionInfo (max_values: Some(1), max_size: Some(8), added: 503, mode: MaxEncodedLen)
-	/// Storage: Babe NextRandomness (r:1 w:0)
-	/// Proof: Babe NextRandomness (max_values: Some(1), max_size: Some(32), added: 527, mode: MaxEncodedLen)
-	/// Storage: Babe EpochStart (r:1 w:0)
-	/// Proof: Babe EpochStart (max_values: Some(1), max_size: Some(8), added: 503, mode: MaxEncodedLen)
-	/// Storage: Auctions AuctionCounter (r:1 w:0)
-	/// Proof: Auctions AuctionCounter (max_values: Some(1), max_size: Some(4), added: 499, mode: MaxEncodedLen)
-	/// Storage: Auctions Winning (r:3600 w:3600)
-	/// Proof: Auctions Winning (max_values: None, max_size: Some(1920), added: 4395, mode: MaxEncodedLen)
-	/// Storage: Auctions ReservedAmounts (r:37 w:36)
-	/// Proof: Auctions ReservedAmounts (max_values: None, max_size: Some(60), added: 2535, mode: MaxEncodedLen)
-	/// Storage: System Account (r:36 w:36)
-	/// Proof: System Account (max_values: None, max_size: Some(128), added: 2603, mode: MaxEncodedLen)
-	/// Storage: Slots Leases (r:7 w:7)
-	/// Proof Skipped: Slots Leases (max_values: None, max_size: None, mode: Measured)
-	/// Storage: Paras ParaLifecycles (r:1 w:1)
-	/// Proof Skipped: Paras ParaLifecycles (max_values: None, max_size: None, mode: Measured)
-	/// Storage: ParasShared CurrentSessionIndex (r:1 w:0)
-	/// Proof Skipped: ParasShared CurrentSessionIndex (max_values: Some(1), max_size: None, mode: Measured)
-	/// Storage: Paras ActionsQueue (r:1 w:1)
-	/// Proof Skipped: Paras ActionsQueue (max_values: None, max_size: None, mode: Measured)
-	/// Storage: Registrar Paras (r:1 w:1)
-	/// Proof Skipped: Registrar Paras (max_values: None, max_size: None, mode: Measured)
-	fn on_initialize() -> Weight {
-		// Proof Size summary in bytes:
-		//  Measured:  `6947699`
-		//  Estimated: `15822990`
-		// Minimum execution time: 7_832_854_000 picoseconds.
-		Weight::from_parts(8_120_980_000, 0)
-			.saturating_add(Weight::from_parts(0, 15822990))
-			.saturating_add(T::DbWeight::get().reads(3688))
-			.saturating_add(T::DbWeight::get().writes(3683))
-	}
-	/// Storage: Auctions ReservedAmounts (r:37 w:36)
-	/// Proof: Auctions ReservedAmounts (max_values: None, max_size: Some(60), added: 2535, mode: MaxEncodedLen)
-	/// Storage: System Account (r:36 w:36)
-	/// Proof: System Account (max_values: None, max_size: Some(128), added: 2603, mode: MaxEncodedLen)
-	/// Storage: Auctions Winning (r:3600 w:3600)
-	/// Proof: Auctions Winning (max_values: None, max_size: Some(1920), added: 4395, mode: MaxEncodedLen)
-	/// Storage: Auctions AuctionInfo (r:0 w:1)
-	/// Proof: Auctions AuctionInfo (max_values: Some(1), max_size: Some(8), added: 503, mode: MaxEncodedLen)
-	fn cancel_auction() -> Weight {
-		// Proof Size summary in bytes:
-		//  Measured:  `177732`
-		//  Estimated: `15822990`
-		// Minimum execution time: 6_046_611_000 picoseconds.
-		Weight::from_parts(6_137_707_000, 0)
-			.saturating_add(Weight::from_parts(0, 15822990))
-			.saturating_add(T::DbWeight::get().reads(3673))
-			.saturating_add(T::DbWeight::get().writes(3673))
-	}
-}
diff --git a/polkadot/runtime/polkadot/src/weights/runtime_common_claims.rs b/polkadot/runtime/polkadot/src/weights/runtime_common_claims.rs
deleted file mode 100644
index b16ed97bc3ba5e74fc66a41cc26ae3dbfe5f65b1..0000000000000000000000000000000000000000
--- a/polkadot/runtime/polkadot/src/weights/runtime_common_claims.rs
+++ /dev/null
@@ -1,169 +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/>.
-
-//! Autogenerated weights for `runtime_common::claims`
-//!
-//! THIS FILE WAS AUTO-GENERATED USING THE SUBSTRATE BENCHMARK CLI VERSION 4.0.0-dev
-//! DATE: 2023-06-19, STEPS: `50`, REPEAT: `20`, LOW RANGE: `[]`, HIGH RANGE: `[]`
-//! WORST CASE MAP SIZE: `1000000`
-//! HOSTNAME: `runner-e8ezs4ez-project-163-concurrent-0`, CPU: `Intel(R) Xeon(R) CPU @ 2.60GHz`
-//! EXECUTION: Some(Wasm), WASM-EXECUTION: Compiled, CHAIN: Some("polkadot-dev"), DB CACHE: 1024
-
-// Executed Command:
-// ./target/production/polkadot
-// benchmark
-// pallet
-// --chain=polkadot-dev
-// --steps=50
-// --repeat=20
-// --no-storage-info
-// --no-median-slopes
-// --no-min-squares
-// --pallet=runtime_common::claims
-// --extrinsic=*
-// --execution=wasm
-// --wasm-execution=compiled
-// --header=./file_header.txt
-// --output=./runtime/polkadot/src/weights/runtime_common_claims.rs
-
-#![cfg_attr(rustfmt, rustfmt_skip)]
-#![allow(unused_parens)]
-#![allow(unused_imports)]
-#![allow(missing_docs)]
-
-use frame_support::{traits::Get, weights::Weight};
-use core::marker::PhantomData;
-
-/// Weight functions for `runtime_common::claims`.
-pub struct WeightInfo<T>(PhantomData<T>);
-impl<T: frame_system::Config> runtime_common::claims::WeightInfo for WeightInfo<T> {
-	/// Storage: Claims Claims (r:1 w:1)
-	/// Proof Skipped: Claims Claims (max_values: None, max_size: None, mode: Measured)
-	/// Storage: Claims Signing (r:1 w:1)
-	/// Proof Skipped: Claims Signing (max_values: None, max_size: None, mode: Measured)
-	/// Storage: Claims Total (r:1 w:1)
-	/// Proof Skipped: Claims Total (max_values: Some(1), max_size: None, mode: Measured)
-	/// Storage: Claims Vesting (r:1 w:1)
-	/// Proof Skipped: Claims Vesting (max_values: None, max_size: None, mode: Measured)
-	/// Storage: Vesting Vesting (r:1 w:1)
-	/// Proof: Vesting Vesting (max_values: None, max_size: Some(1057), added: 3532, mode: MaxEncodedLen)
-	/// Storage: System Account (r:1 w:0)
-	/// Proof: System Account (max_values: None, max_size: Some(128), added: 2603, mode: MaxEncodedLen)
-	/// Storage: Balances Locks (r:1 w:1)
-	/// Proof: Balances Locks (max_values: None, max_size: Some(1299), added: 3774, mode: MaxEncodedLen)
-	/// Storage: Balances Freezes (r:1 w:0)
-	/// Proof: Balances Freezes (max_values: None, max_size: Some(49), added: 2524, mode: MaxEncodedLen)
-	fn claim() -> Weight {
-		// Proof Size summary in bytes:
-		//  Measured:  `586`
-		//  Estimated: `4764`
-		// Minimum execution time: 192_126_000 picoseconds.
-		Weight::from_parts(210_300_000, 0)
-			.saturating_add(Weight::from_parts(0, 4764))
-			.saturating_add(T::DbWeight::get().reads(8))
-			.saturating_add(T::DbWeight::get().writes(6))
-	}
-	/// Storage: Claims Total (r:1 w:1)
-	/// Proof Skipped: Claims Total (max_values: Some(1), max_size: None, mode: Measured)
-	/// Storage: Claims Vesting (r:0 w:1)
-	/// Proof Skipped: Claims Vesting (max_values: None, max_size: None, mode: Measured)
-	/// Storage: Claims Claims (r:0 w:1)
-	/// Proof Skipped: Claims Claims (max_values: None, max_size: None, mode: Measured)
-	/// Storage: Claims Signing (r:0 w:1)
-	/// Proof Skipped: Claims Signing (max_values: None, max_size: None, mode: Measured)
-	fn mint_claim() -> Weight {
-		// Proof Size summary in bytes:
-		//  Measured:  `182`
-		//  Estimated: `1667`
-		// Minimum execution time: 15_323_000 picoseconds.
-		Weight::from_parts(16_648_000, 0)
-			.saturating_add(Weight::from_parts(0, 1667))
-			.saturating_add(T::DbWeight::get().reads(1))
-			.saturating_add(T::DbWeight::get().writes(4))
-	}
-	/// Storage: Claims Claims (r:1 w:1)
-	/// Proof Skipped: Claims Claims (max_values: None, max_size: None, mode: Measured)
-	/// Storage: Claims Signing (r:1 w:1)
-	/// Proof Skipped: Claims Signing (max_values: None, max_size: None, mode: Measured)
-	/// Storage: Claims Total (r:1 w:1)
-	/// Proof Skipped: Claims Total (max_values: Some(1), max_size: None, mode: Measured)
-	/// Storage: Claims Vesting (r:1 w:1)
-	/// Proof Skipped: Claims Vesting (max_values: None, max_size: None, mode: Measured)
-	/// Storage: Vesting Vesting (r:1 w:1)
-	/// Proof: Vesting Vesting (max_values: None, max_size: Some(1057), added: 3532, mode: MaxEncodedLen)
-	/// Storage: System Account (r:1 w:0)
-	/// Proof: System Account (max_values: None, max_size: Some(128), added: 2603, mode: MaxEncodedLen)
-	/// Storage: Balances Locks (r:1 w:1)
-	/// Proof: Balances Locks (max_values: None, max_size: Some(1299), added: 3774, mode: MaxEncodedLen)
-	/// Storage: Balances Freezes (r:1 w:0)
-	/// Proof: Balances Freezes (max_values: None, max_size: Some(49), added: 2524, mode: MaxEncodedLen)
-	fn claim_attest() -> Weight {
-		// Proof Size summary in bytes:
-		//  Measured:  `586`
-		//  Estimated: `4764`
-		// Minimum execution time: 198_285_000 picoseconds.
-		Weight::from_parts(211_990_000, 0)
-			.saturating_add(Weight::from_parts(0, 4764))
-			.saturating_add(T::DbWeight::get().reads(8))
-			.saturating_add(T::DbWeight::get().writes(6))
-	}
-	/// Storage: Claims Preclaims (r:1 w:1)
-	/// Proof Skipped: Claims Preclaims (max_values: None, max_size: None, mode: Measured)
-	/// Storage: Claims Signing (r:1 w:1)
-	/// Proof Skipped: Claims Signing (max_values: None, max_size: None, mode: Measured)
-	/// Storage: Claims Claims (r:1 w:1)
-	/// Proof Skipped: Claims Claims (max_values: None, max_size: None, mode: Measured)
-	/// Storage: Claims Total (r:1 w:1)
-	/// Proof Skipped: Claims Total (max_values: Some(1), max_size: None, mode: Measured)
-	/// Storage: Claims Vesting (r:1 w:1)
-	/// Proof Skipped: Claims Vesting (max_values: None, max_size: None, mode: Measured)
-	/// Storage: Vesting Vesting (r:1 w:1)
-	/// Proof: Vesting Vesting (max_values: None, max_size: Some(1057), added: 3532, mode: MaxEncodedLen)
-	/// Storage: System Account (r:1 w:0)
-	/// Proof: System Account (max_values: None, max_size: Some(128), added: 2603, mode: MaxEncodedLen)
-	/// Storage: Balances Locks (r:1 w:1)
-	/// Proof: Balances Locks (max_values: None, max_size: Some(1299), added: 3774, mode: MaxEncodedLen)
-	/// Storage: Balances Freezes (r:1 w:0)
-	/// Proof: Balances Freezes (max_values: None, max_size: Some(49), added: 2524, mode: MaxEncodedLen)
-	fn attest() -> Weight {
-		// Proof Size summary in bytes:
-		//  Measured:  `660`
-		//  Estimated: `4764`
-		// Minimum execution time: 98_860_000 picoseconds.
-		Weight::from_parts(110_990_000, 0)
-			.saturating_add(Weight::from_parts(0, 4764))
-			.saturating_add(T::DbWeight::get().reads(9))
-			.saturating_add(T::DbWeight::get().writes(7))
-	}
-	/// Storage: Claims Claims (r:1 w:2)
-	/// Proof Skipped: Claims Claims (max_values: None, max_size: None, mode: Measured)
-	/// Storage: Claims Vesting (r:1 w:2)
-	/// Proof Skipped: Claims Vesting (max_values: None, max_size: None, mode: Measured)
-	/// Storage: Claims Signing (r:1 w:2)
-	/// Proof Skipped: Claims Signing (max_values: None, max_size: None, mode: Measured)
-	/// Storage: Claims Preclaims (r:1 w:1)
-	/// Proof Skipped: Claims Preclaims (max_values: None, max_size: None, mode: Measured)
-	fn move_claim() -> Weight {
-		// Proof Size summary in bytes:
-		//  Measured:  `406`
-		//  Estimated: `3871`
-		// Minimum execution time: 27_962_000 picoseconds.
-		Weight::from_parts(30_903_000, 0)
-			.saturating_add(Weight::from_parts(0, 3871))
-			.saturating_add(T::DbWeight::get().reads(4))
-			.saturating_add(T::DbWeight::get().writes(7))
-	}
-}
diff --git a/polkadot/runtime/polkadot/src/weights/runtime_common_crowdloan.rs b/polkadot/runtime/polkadot/src/weights/runtime_common_crowdloan.rs
deleted file mode 100644
index f9b84ff2f3e241d3aced50c22c2a6580bfa9d8aa..0000000000000000000000000000000000000000
--- a/polkadot/runtime/polkadot/src/weights/runtime_common_crowdloan.rs
+++ /dev/null
@@ -1,225 +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/>.
-
-//! Autogenerated weights for `runtime_common::crowdloan`
-//!
-//! THIS FILE WAS AUTO-GENERATED USING THE SUBSTRATE BENCHMARK CLI VERSION 4.0.0-dev
-//! DATE: 2023-06-19, STEPS: `50`, REPEAT: `20`, LOW RANGE: `[]`, HIGH RANGE: `[]`
-//! WORST CASE MAP SIZE: `1000000`
-//! HOSTNAME: `runner-e8ezs4ez-project-163-concurrent-0`, CPU: `Intel(R) Xeon(R) CPU @ 2.60GHz`
-//! EXECUTION: Some(Wasm), WASM-EXECUTION: Compiled, CHAIN: Some("polkadot-dev"), DB CACHE: 1024
-
-// Executed Command:
-// ./target/production/polkadot
-// benchmark
-// pallet
-// --chain=polkadot-dev
-// --steps=50
-// --repeat=20
-// --no-storage-info
-// --no-median-slopes
-// --no-min-squares
-// --pallet=runtime_common::crowdloan
-// --extrinsic=*
-// --execution=wasm
-// --wasm-execution=compiled
-// --header=./file_header.txt
-// --output=./runtime/polkadot/src/weights/runtime_common_crowdloan.rs
-
-#![cfg_attr(rustfmt, rustfmt_skip)]
-#![allow(unused_parens)]
-#![allow(unused_imports)]
-#![allow(missing_docs)]
-
-use frame_support::{traits::Get, weights::Weight};
-use core::marker::PhantomData;
-
-/// Weight functions for `runtime_common::crowdloan`.
-pub struct WeightInfo<T>(PhantomData<T>);
-impl<T: frame_system::Config> runtime_common::crowdloan::WeightInfo for WeightInfo<T> {
-	/// Storage: Crowdloan Funds (r:1 w:1)
-	/// Proof Skipped: Crowdloan Funds (max_values: None, max_size: None, mode: Measured)
-	/// Storage: Registrar Paras (r:1 w:1)
-	/// Proof Skipped: Registrar Paras (max_values: None, max_size: None, mode: Measured)
-	/// Storage: Paras ParaLifecycles (r:1 w:0)
-	/// Proof Skipped: Paras ParaLifecycles (max_values: None, max_size: None, mode: Measured)
-	/// Storage: Crowdloan NextFundIndex (r:1 w:1)
-	/// Proof Skipped: Crowdloan NextFundIndex (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)
-	fn create() -> Weight {
-		// Proof Size summary in bytes:
-		//  Measured:  `415`
-		//  Estimated: `3880`
-		// Minimum execution time: 67_401_000 picoseconds.
-		Weight::from_parts(73_047_000, 0)
-			.saturating_add(Weight::from_parts(0, 3880))
-			.saturating_add(T::DbWeight::get().reads(5))
-			.saturating_add(T::DbWeight::get().writes(4))
-	}
-	/// Storage: Crowdloan Funds (r:1 w:1)
-	/// Proof Skipped: Crowdloan Funds (max_values: None, max_size: None, mode: Measured)
-	/// Storage: Slots Leases (r:1 w:0)
-	/// Proof Skipped: Slots Leases (max_values: None, max_size: None, mode: Measured)
-	/// Storage: Auctions AuctionInfo (r:1 w:0)
-	/// Proof: Auctions AuctionInfo (max_values: Some(1), max_size: Some(8), added: 503, mode: MaxEncodedLen)
-	/// Storage: System Account (r:1 w:1)
-	/// Proof: System Account (max_values: None, max_size: Some(128), added: 2603, mode: MaxEncodedLen)
-	/// Storage: Balances InactiveIssuance (r:1 w:1)
-	/// Proof: Balances InactiveIssuance (max_values: Some(1), max_size: Some(16), added: 511, mode: MaxEncodedLen)
-	/// Storage: Crowdloan EndingsCount (r:1 w:0)
-	/// Proof Skipped: Crowdloan EndingsCount (max_values: Some(1), max_size: None, mode: Measured)
-	/// Storage: Crowdloan NewRaise (r:1 w:1)
-	/// Proof Skipped: Crowdloan NewRaise (max_values: Some(1), max_size: None, mode: Measured)
-	/// Storage: unknown `0xd861ea1ebf4800d4b89f4ff787ad79ee96d9a708c85b57da7eb8f9ddeda61291` (r:1 w:1)
-	/// Proof Skipped: unknown `0xd861ea1ebf4800d4b89f4ff787ad79ee96d9a708c85b57da7eb8f9ddeda61291` (r:1 w:1)
-	fn contribute() -> Weight {
-		// Proof Size summary in bytes:
-		//  Measured:  `463`
-		//  Estimated: `3928`
-		// Minimum execution time: 158_577_000 picoseconds.
-		Weight::from_parts(163_468_000, 0)
-			.saturating_add(Weight::from_parts(0, 3928))
-			.saturating_add(T::DbWeight::get().reads(8))
-			.saturating_add(T::DbWeight::get().writes(5))
-	}
-	/// Storage: Crowdloan Funds (r:1 w:1)
-	/// Proof Skipped: Crowdloan Funds (max_values: None, 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: Balances InactiveIssuance (r:1 w:1)
-	/// Proof: Balances InactiveIssuance (max_values: Some(1), max_size: Some(16), added: 511, mode: MaxEncodedLen)
-	/// Storage: unknown `0xc85982571aa615c788ef9b2c16f54f25773fd439e8ee1ed2aa3ae43d48e880f0` (r:1 w:1)
-	/// Proof Skipped: unknown `0xc85982571aa615c788ef9b2c16f54f25773fd439e8ee1ed2aa3ae43d48e880f0` (r:1 w:1)
-	fn withdraw() -> Weight {
-		// Proof Size summary in bytes:
-		//  Measured:  `690`
-		//  Estimated: `6196`
-		// Minimum execution time: 86_038_000 picoseconds.
-		Weight::from_parts(93_214_000, 0)
-			.saturating_add(Weight::from_parts(0, 6196))
-			.saturating_add(T::DbWeight::get().reads(5))
-			.saturating_add(T::DbWeight::get().writes(5))
-	}
-	/// Storage: Skipped Metadata (r:0 w:0)
-	/// Proof Skipped: Skipped Metadata (max_values: None, max_size: None, mode: Measured)
-	/// The range of component `k` is `[0, 1000]`.
-	fn refund(k: u32, ) -> Weight {
-		// Proof Size summary in bytes:
-		//  Measured:  `128 + k * (189 ±0)`
-		//  Estimated: `141 + k * (189 ±0)`
-		// Minimum execution time: 63_322_000 picoseconds.
-		Weight::from_parts(65_003_000, 0)
-			.saturating_add(Weight::from_parts(0, 141))
-			// Standard Error: 27_401
-			.saturating_add(Weight::from_parts(45_003_555, 0).saturating_mul(k.into()))
-			.saturating_add(T::DbWeight::get().reads(4))
-			.saturating_add(T::DbWeight::get().reads((2_u64).saturating_mul(k.into())))
-			.saturating_add(T::DbWeight::get().writes(3))
-			.saturating_add(T::DbWeight::get().writes((2_u64).saturating_mul(k.into())))
-			.saturating_add(Weight::from_parts(0, 189).saturating_mul(k.into()))
-	}
-	/// Storage: Crowdloan Funds (r:1 w:1)
-	/// Proof Skipped: Crowdloan Funds (max_values: None, 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)
-	fn dissolve() -> Weight {
-		// Proof Size summary in bytes:
-		//  Measured:  `515`
-		//  Estimated: `6196`
-		// Minimum execution time: 49_151_000 picoseconds.
-		Weight::from_parts(55_069_000, 0)
-			.saturating_add(Weight::from_parts(0, 6196))
-			.saturating_add(T::DbWeight::get().reads(3))
-			.saturating_add(T::DbWeight::get().writes(3))
-	}
-	/// Storage: Crowdloan Funds (r:1 w:1)
-	/// Proof Skipped: Crowdloan Funds (max_values: None, max_size: None, mode: Measured)
-	fn edit() -> Weight {
-		// Proof Size summary in bytes:
-		//  Measured:  `235`
-		//  Estimated: `3700`
-		// Minimum execution time: 26_691_000 picoseconds.
-		Weight::from_parts(28_891_000, 0)
-			.saturating_add(Weight::from_parts(0, 3700))
-			.saturating_add(T::DbWeight::get().reads(1))
-			.saturating_add(T::DbWeight::get().writes(1))
-	}
-	/// Storage: Crowdloan Funds (r:1 w:0)
-	/// Proof Skipped: Crowdloan Funds (max_values: None, max_size: None, mode: Measured)
-	/// Storage: unknown `0xd861ea1ebf4800d4b89f4ff787ad79ee96d9a708c85b57da7eb8f9ddeda61291` (r:1 w:1)
-	/// Proof Skipped: unknown `0xd861ea1ebf4800d4b89f4ff787ad79ee96d9a708c85b57da7eb8f9ddeda61291` (r:1 w:1)
-	fn add_memo() -> Weight {
-		// Proof Size summary in bytes:
-		//  Measured:  `412`
-		//  Estimated: `3877`
-		// Minimum execution time: 46_088_000 picoseconds.
-		Weight::from_parts(49_781_000, 0)
-			.saturating_add(Weight::from_parts(0, 3877))
-			.saturating_add(T::DbWeight::get().reads(2))
-			.saturating_add(T::DbWeight::get().writes(1))
-	}
-	/// Storage: Crowdloan Funds (r:1 w:0)
-	/// Proof Skipped: Crowdloan Funds (max_values: None, max_size: None, mode: Measured)
-	/// Storage: Crowdloan NewRaise (r:1 w:1)
-	/// Proof Skipped: Crowdloan NewRaise (max_values: Some(1), max_size: None, mode: Measured)
-	fn poke() -> Weight {
-		// Proof Size summary in bytes:
-		//  Measured:  `239`
-		//  Estimated: `3704`
-		// Minimum execution time: 25_350_000 picoseconds.
-		Weight::from_parts(29_241_000, 0)
-			.saturating_add(Weight::from_parts(0, 3704))
-			.saturating_add(T::DbWeight::get().reads(2))
-			.saturating_add(T::DbWeight::get().writes(1))
-	}
-	/// Storage: Auctions AuctionInfo (r:1 w:0)
-	/// Proof: Auctions AuctionInfo (max_values: Some(1), max_size: Some(8), added: 503, mode: MaxEncodedLen)
-	/// Storage: Crowdloan EndingsCount (r:1 w:1)
-	/// Proof Skipped: Crowdloan EndingsCount (max_values: Some(1), max_size: None, mode: Measured)
-	/// Storage: Crowdloan NewRaise (r:1 w:1)
-	/// Proof Skipped: Crowdloan NewRaise (max_values: Some(1), max_size: None, mode: Measured)
-	/// Storage: Crowdloan Funds (r:100 w:0)
-	/// Proof Skipped: Crowdloan Funds (max_values: None, max_size: None, mode: Measured)
-	/// Storage: Auctions AuctionCounter (r:1 w:0)
-	/// Proof: Auctions AuctionCounter (max_values: Some(1), max_size: Some(4), added: 499, mode: MaxEncodedLen)
-	/// Storage: Paras ParaLifecycles (r:100 w:0)
-	/// Proof Skipped: Paras ParaLifecycles (max_values: None, max_size: None, mode: Measured)
-	/// Storage: Slots Leases (r:100 w:0)
-	/// Proof Skipped: Slots Leases (max_values: None, max_size: None, mode: Measured)
-	/// Storage: Auctions Winning (r:1 w:1)
-	/// Proof: Auctions Winning (max_values: None, max_size: Some(1920), added: 4395, mode: MaxEncodedLen)
-	/// Storage: Auctions ReservedAmounts (r:100 w:100)
-	/// Proof: Auctions ReservedAmounts (max_values: None, max_size: Some(60), added: 2535, mode: MaxEncodedLen)
-	/// Storage: System Account (r:100 w:100)
-	/// Proof: System Account (max_values: None, max_size: Some(128), added: 2603, mode: MaxEncodedLen)
-	/// The range of component `n` is `[2, 100]`.
-	fn on_initialize(n: u32, ) -> Weight {
-		// Proof Size summary in bytes:
-		//  Measured:  `130 + n * (356 ±0)`
-		//  Estimated: `5385 + n * (2832 ±0)`
-		// Minimum execution time: 154_247_000 picoseconds.
-		Weight::from_parts(18_164_126, 0)
-			.saturating_add(Weight::from_parts(0, 5385))
-			// Standard Error: 71_727
-			.saturating_add(Weight::from_parts(72_599_775, 0).saturating_mul(n.into()))
-			.saturating_add(T::DbWeight::get().reads(5))
-			.saturating_add(T::DbWeight::get().reads((5_u64).saturating_mul(n.into())))
-			.saturating_add(T::DbWeight::get().writes(3))
-			.saturating_add(T::DbWeight::get().writes((2_u64).saturating_mul(n.into())))
-			.saturating_add(Weight::from_parts(0, 2832).saturating_mul(n.into()))
-	}
-}
diff --git a/polkadot/runtime/polkadot/src/weights/runtime_common_paras_registrar.rs b/polkadot/runtime/polkadot/src/weights/runtime_common_paras_registrar.rs
deleted file mode 100644
index d176b83a648b84fc89a0e10dcc58fea1096d5cce..0000000000000000000000000000000000000000
--- a/polkadot/runtime/polkadot/src/weights/runtime_common_paras_registrar.rs
+++ /dev/null
@@ -1,224 +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/>.
-
-//! Autogenerated weights for `runtime_common::paras_registrar`
-//!
-//! THIS FILE WAS AUTO-GENERATED USING THE SUBSTRATE BENCHMARK CLI VERSION 4.0.0-dev
-//! DATE: 2023-06-19, STEPS: `50`, REPEAT: `20`, LOW RANGE: `[]`, HIGH RANGE: `[]`
-//! WORST CASE MAP SIZE: `1000000`
-//! HOSTNAME: `runner-e8ezs4ez-project-163-concurrent-0`, CPU: `Intel(R) Xeon(R) CPU @ 2.60GHz`
-//! EXECUTION: Some(Wasm), WASM-EXECUTION: Compiled, CHAIN: Some("polkadot-dev"), DB CACHE: 1024
-
-// Executed Command:
-// ./target/production/polkadot
-// benchmark
-// pallet
-// --chain=polkadot-dev
-// --steps=50
-// --repeat=20
-// --no-storage-info
-// --no-median-slopes
-// --no-min-squares
-// --pallet=runtime_common::paras_registrar
-// --extrinsic=*
-// --execution=wasm
-// --wasm-execution=compiled
-// --header=./file_header.txt
-// --output=./runtime/polkadot/src/weights/runtime_common_paras_registrar.rs
-
-#![cfg_attr(rustfmt, rustfmt_skip)]
-#![allow(unused_parens)]
-#![allow(unused_imports)]
-#![allow(missing_docs)]
-
-use frame_support::{traits::Get, weights::Weight};
-use core::marker::PhantomData;
-
-/// Weight functions for `runtime_common::paras_registrar`.
-pub struct WeightInfo<T>(PhantomData<T>);
-impl<T: frame_system::Config> runtime_common::paras_registrar::WeightInfo for WeightInfo<T> {
-	/// Storage: Registrar NextFreeParaId (r:1 w:1)
-	/// Proof Skipped: Registrar NextFreeParaId (max_values: Some(1), max_size: None, mode: Measured)
-	/// Storage: Registrar Paras (r:1 w:1)
-	/// Proof Skipped: Registrar Paras (max_values: None, max_size: None, mode: Measured)
-	/// Storage: Paras ParaLifecycles (r:1 w:0)
-	/// Proof Skipped: Paras ParaLifecycles (max_values: None, max_size: None, mode: Measured)
-	fn reserve() -> Weight {
-		// Proof Size summary in bytes:
-		//  Measured:  `70`
-		//  Estimated: `3535`
-		// Minimum execution time: 30_388_000 picoseconds.
-		Weight::from_parts(30_995_000, 0)
-			.saturating_add(Weight::from_parts(0, 3535))
-			.saturating_add(T::DbWeight::get().reads(3))
-			.saturating_add(T::DbWeight::get().writes(2))
-	}
-	/// Storage: Registrar Paras (r:1 w:1)
-	/// Proof Skipped: Registrar Paras (max_values: None, max_size: None, mode: Measured)
-	/// Storage: Paras ParaLifecycles (r:1 w:1)
-	/// Proof Skipped: Paras ParaLifecycles (max_values: None, max_size: None, mode: Measured)
-	/// Storage: Configuration ActiveConfig (r:1 w:0)
-	/// Proof Skipped: Configuration ActiveConfig (max_values: Some(1), max_size: None, mode: Measured)
-	/// Storage: Paras PvfActiveVoteMap (r:1 w:1)
-	/// Proof Skipped: Paras PvfActiveVoteMap (max_values: None, max_size: None, mode: Measured)
-	/// Storage: Paras CodeByHash (r:1 w:1)
-	/// Proof Skipped: Paras CodeByHash (max_values: None, max_size: None, mode: Measured)
-	/// Storage: ParasShared ActiveValidatorKeys (r:1 w:0)
-	/// Proof Skipped: ParasShared ActiveValidatorKeys (max_values: Some(1), max_size: None, mode: Measured)
-	/// Storage: Paras PvfActiveVoteList (r:1 w:1)
-	/// Proof Skipped: Paras PvfActiveVoteList (max_values: Some(1), max_size: None, mode: Measured)
-	/// Storage: Paras CodeByHashRefs (r:1 w:1)
-	/// Proof Skipped: Paras CodeByHashRefs (max_values: None, max_size: None, mode: Measured)
-	/// Storage: Paras CurrentCodeHash (r:0 w:1)
-	/// Proof Skipped: Paras CurrentCodeHash (max_values: None, max_size: None, mode: Measured)
-	/// Storage: Paras UpcomingParasGenesis (r:0 w:1)
-	/// Proof Skipped: Paras UpcomingParasGenesis (max_values: None, max_size: None, mode: Measured)
-	fn register() -> Weight {
-		// Proof Size summary in bytes:
-		//  Measured:  `645`
-		//  Estimated: `4110`
-		// Minimum execution time: 6_371_660_000 picoseconds.
-		Weight::from_parts(6_872_164_000, 0)
-			.saturating_add(Weight::from_parts(0, 4110))
-			.saturating_add(T::DbWeight::get().reads(8))
-			.saturating_add(T::DbWeight::get().writes(8))
-	}
-	/// Storage: Registrar Paras (r:1 w:1)
-	/// Proof Skipped: Registrar Paras (max_values: None, max_size: None, mode: Measured)
-	/// Storage: Paras ParaLifecycles (r:1 w:1)
-	/// Proof Skipped: Paras ParaLifecycles (max_values: None, max_size: None, mode: Measured)
-	/// Storage: Configuration ActiveConfig (r:1 w:0)
-	/// Proof Skipped: Configuration ActiveConfig (max_values: Some(1), max_size: None, mode: Measured)
-	/// Storage: Paras PvfActiveVoteMap (r:1 w:1)
-	/// Proof Skipped: Paras PvfActiveVoteMap (max_values: None, max_size: None, mode: Measured)
-	/// Storage: Paras CodeByHash (r:1 w:1)
-	/// Proof Skipped: Paras CodeByHash (max_values: None, max_size: None, mode: Measured)
-	/// Storage: ParasShared ActiveValidatorKeys (r:1 w:0)
-	/// Proof Skipped: ParasShared ActiveValidatorKeys (max_values: Some(1), max_size: None, mode: Measured)
-	/// Storage: Paras PvfActiveVoteList (r:1 w:1)
-	/// Proof Skipped: Paras PvfActiveVoteList (max_values: Some(1), max_size: None, mode: Measured)
-	/// Storage: Paras CodeByHashRefs (r:1 w:1)
-	/// Proof Skipped: Paras CodeByHashRefs (max_values: None, max_size: None, mode: Measured)
-	/// Storage: Paras CurrentCodeHash (r:0 w:1)
-	/// Proof Skipped: Paras CurrentCodeHash (max_values: None, max_size: None, mode: Measured)
-	/// Storage: Paras UpcomingParasGenesis (r:0 w:1)
-	/// Proof Skipped: Paras UpcomingParasGenesis (max_values: None, max_size: None, mode: Measured)
-	fn force_register() -> Weight {
-		// Proof Size summary in bytes:
-		//  Measured:  `535`
-		//  Estimated: `4000`
-		// Minimum execution time: 6_530_996_000 picoseconds.
-		Weight::from_parts(7_099_049_000, 0)
-			.saturating_add(Weight::from_parts(0, 4000))
-			.saturating_add(T::DbWeight::get().reads(8))
-			.saturating_add(T::DbWeight::get().writes(8))
-	}
-	/// Storage: Registrar Paras (r:1 w:1)
-	/// Proof Skipped: Registrar Paras (max_values: None, max_size: None, mode: Measured)
-	/// Storage: Paras ParaLifecycles (r:1 w:1)
-	/// Proof Skipped: Paras ParaLifecycles (max_values: None, max_size: None, mode: Measured)
-	/// Storage: Paras FutureCodeHash (r:1 w:0)
-	/// Proof Skipped: Paras FutureCodeHash (max_values: None, max_size: None, mode: Measured)
-	/// Storage: ParasShared CurrentSessionIndex (r:1 w:0)
-	/// Proof Skipped: ParasShared CurrentSessionIndex (max_values: Some(1), max_size: None, mode: Measured)
-	/// Storage: Paras ActionsQueue (r:1 w:1)
-	/// Proof Skipped: Paras ActionsQueue (max_values: None, max_size: None, mode: Measured)
-	/// Storage: MessageQueue BookStateFor (r:1 w:0)
-	/// Proof: MessageQueue BookStateFor (max_values: None, max_size: Some(55), added: 2530, mode: MaxEncodedLen)
-	/// Storage: Registrar PendingSwap (r:0 w:1)
-	/// Proof Skipped: Registrar PendingSwap (max_values: None, max_size: None, mode: Measured)
-	fn deregister() -> Weight {
-		// Proof Size summary in bytes:
-		//  Measured:  `476`
-		//  Estimated: `3941`
-		// Minimum execution time: 61_803_000 picoseconds.
-		Weight::from_parts(65_036_000, 0)
-			.saturating_add(Weight::from_parts(0, 3941))
-			.saturating_add(T::DbWeight::get().reads(6))
-			.saturating_add(T::DbWeight::get().writes(4))
-	}
-	/// Storage: Registrar Paras (r:1 w:0)
-	/// Proof Skipped: Registrar Paras (max_values: None, max_size: None, mode: Measured)
-	/// Storage: Paras ParaLifecycles (r:2 w:2)
-	/// Proof Skipped: Paras ParaLifecycles (max_values: None, max_size: None, mode: Measured)
-	/// Storage: Registrar PendingSwap (r:1 w:1)
-	/// Proof Skipped: Registrar PendingSwap (max_values: None, max_size: None, mode: Measured)
-	/// Storage: ParasShared CurrentSessionIndex (r:1 w:0)
-	/// Proof Skipped: ParasShared CurrentSessionIndex (max_values: Some(1), max_size: None, mode: Measured)
-	/// Storage: Paras ActionsQueue (r:1 w:1)
-	/// Proof Skipped: Paras ActionsQueue (max_values: None, max_size: None, mode: Measured)
-	/// Storage: Crowdloan Funds (r:2 w:2)
-	/// Proof Skipped: Crowdloan Funds (max_values: None, max_size: None, mode: Measured)
-	/// Storage: Slots Leases (r:2 w:2)
-	/// Proof Skipped: Slots Leases (max_values: None, max_size: None, mode: Measured)
-	fn swap() -> Weight {
-		// Proof Size summary in bytes:
-		//  Measured:  `713`
-		//  Estimated: `6653`
-		// Minimum execution time: 67_847_000 picoseconds.
-		Weight::from_parts(71_909_000, 0)
-			.saturating_add(Weight::from_parts(0, 6653))
-			.saturating_add(T::DbWeight::get().reads(10))
-			.saturating_add(T::DbWeight::get().writes(8))
-	}
-	/// Storage: Paras FutureCodeHash (r:1 w:1)
-	/// Proof Skipped: Paras FutureCodeHash (max_values: None, max_size: None, mode: Measured)
-	/// Storage: Paras UpgradeRestrictionSignal (r:1 w:1)
-	/// Proof Skipped: Paras UpgradeRestrictionSignal (max_values: None, max_size: None, mode: Measured)
-	/// Storage: Configuration ActiveConfig (r:1 w:0)
-	/// Proof Skipped: Configuration ActiveConfig (max_values: Some(1), max_size: None, mode: Measured)
-	/// Storage: Paras CurrentCodeHash (r:1 w:0)
-	/// Proof Skipped: Paras CurrentCodeHash (max_values: None, max_size: None, mode: Measured)
-	/// Storage: Paras UpgradeCooldowns (r:1 w:1)
-	/// Proof Skipped: Paras UpgradeCooldowns (max_values: Some(1), max_size: None, mode: Measured)
-	/// Storage: Paras PvfActiveVoteMap (r:1 w:1)
-	/// Proof Skipped: Paras PvfActiveVoteMap (max_values: None, max_size: None, mode: Measured)
-	/// Storage: Paras CodeByHash (r:1 w:1)
-	/// Proof Skipped: Paras CodeByHash (max_values: None, max_size: None, mode: Measured)
-	/// Storage: ParasShared ActiveValidatorKeys (r:1 w:0)
-	/// Proof Skipped: ParasShared ActiveValidatorKeys (max_values: Some(1), max_size: None, mode: Measured)
-	/// Storage: Paras PvfActiveVoteList (r:1 w:1)
-	/// Proof Skipped: Paras PvfActiveVoteList (max_values: Some(1), max_size: None, mode: Measured)
-	/// Storage: Paras CodeByHashRefs (r:1 w:1)
-	/// Proof Skipped: Paras CodeByHashRefs (max_values: None, max_size: None, mode: Measured)
-	/// The range of component `b` is `[1, 3145728]`.
-	fn schedule_code_upgrade(b: u32, ) -> Weight {
-		// Proof Size summary in bytes:
-		//  Measured:  `493`
-		//  Estimated: `3958`
-		// Minimum execution time: 44_170_000 picoseconds.
-		Weight::from_parts(44_955_000, 0)
-			.saturating_add(Weight::from_parts(0, 3958))
-			// Standard Error: 6
-			.saturating_add(Weight::from_parts(2_501, 0).saturating_mul(b.into()))
-			.saturating_add(T::DbWeight::get().reads(10))
-			.saturating_add(T::DbWeight::get().writes(7))
-	}
-	/// Storage: Paras Heads (r:0 w:1)
-	/// Proof Skipped: Paras Heads (max_values: None, max_size: None, mode: Measured)
-	/// The range of component `b` is `[1, 1048576]`.
-	fn set_current_head(b: u32, ) -> Weight {
-		// Proof Size summary in bytes:
-		//  Measured:  `0`
-		//  Estimated: `0`
-		// Minimum execution time: 8_735_000 picoseconds.
-		Weight::from_parts(8_851_000, 0)
-			.saturating_add(Weight::from_parts(0, 0))
-			// Standard Error: 1
-			.saturating_add(Weight::from_parts(1_044, 0).saturating_mul(b.into()))
-			.saturating_add(T::DbWeight::get().writes(1))
-	}
-}
diff --git a/polkadot/runtime/polkadot/src/weights/runtime_common_slots.rs b/polkadot/runtime/polkadot/src/weights/runtime_common_slots.rs
deleted file mode 100644
index 7197c8721d8e43b1579dbeeda025008551e9e540..0000000000000000000000000000000000000000
--- a/polkadot/runtime/polkadot/src/weights/runtime_common_slots.rs
+++ /dev/null
@@ -1,135 +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/>.
-
-//! Autogenerated weights for `runtime_common::slots`
-//!
-//! THIS FILE WAS AUTO-GENERATED USING THE SUBSTRATE BENCHMARK CLI VERSION 4.0.0-dev
-//! DATE: 2023-06-19, STEPS: `50`, REPEAT: `20`, LOW RANGE: `[]`, HIGH RANGE: `[]`
-//! WORST CASE MAP SIZE: `1000000`
-//! HOSTNAME: `runner-e8ezs4ez-project-163-concurrent-0`, CPU: `Intel(R) Xeon(R) CPU @ 2.60GHz`
-//! EXECUTION: Some(Wasm), WASM-EXECUTION: Compiled, CHAIN: Some("polkadot-dev"), DB CACHE: 1024
-
-// Executed Command:
-// ./target/production/polkadot
-// benchmark
-// pallet
-// --chain=polkadot-dev
-// --steps=50
-// --repeat=20
-// --no-storage-info
-// --no-median-slopes
-// --no-min-squares
-// --pallet=runtime_common::slots
-// --extrinsic=*
-// --execution=wasm
-// --wasm-execution=compiled
-// --header=./file_header.txt
-// --output=./runtime/polkadot/src/weights/runtime_common_slots.rs
-
-#![cfg_attr(rustfmt, rustfmt_skip)]
-#![allow(unused_parens)]
-#![allow(unused_imports)]
-#![allow(missing_docs)]
-
-use frame_support::{traits::Get, weights::Weight};
-use core::marker::PhantomData;
-
-/// Weight functions for `runtime_common::slots`.
-pub struct WeightInfo<T>(PhantomData<T>);
-impl<T: frame_system::Config> runtime_common::slots::WeightInfo for WeightInfo<T> {
-	/// Storage: Slots Leases (r:1 w:1)
-	/// Proof Skipped: Slots Leases (max_values: None, 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)
-	fn force_lease() -> Weight {
-		// Proof Size summary in bytes:
-		//  Measured:  `220`
-		//  Estimated: `3685`
-		// Minimum execution time: 30_634_000 picoseconds.
-		Weight::from_parts(31_305_000, 0)
-			.saturating_add(Weight::from_parts(0, 3685))
-			.saturating_add(T::DbWeight::get().reads(2))
-			.saturating_add(T::DbWeight::get().writes(2))
-	}
-	/// Storage: Paras Parachains (r:1 w:0)
-	/// Proof Skipped: Paras Parachains (max_values: Some(1), max_size: None, mode: Measured)
-	/// Storage: Slots Leases (r:101 w:100)
-	/// Proof Skipped: Slots Leases (max_values: None, max_size: None, mode: Measured)
-	/// Storage: Paras ParaLifecycles (r:200 w:200)
-	/// Proof Skipped: Paras ParaLifecycles (max_values: None, max_size: None, mode: Measured)
-	/// Storage: ParasShared CurrentSessionIndex (r:1 w:0)
-	/// Proof Skipped: ParasShared CurrentSessionIndex (max_values: Some(1), max_size: None, mode: Measured)
-	/// Storage: Paras ActionsQueue (r:1 w:1)
-	/// Proof Skipped: Paras ActionsQueue (max_values: None, max_size: None, mode: Measured)
-	/// Storage: Registrar Paras (r:100 w:100)
-	/// Proof Skipped: Registrar Paras (max_values: None, max_size: None, mode: Measured)
-	/// The range of component `c` is `[0, 100]`.
-	/// The range of component `t` is `[0, 100]`.
-	fn manage_lease_period_start(c: u32, t: u32, ) -> Weight {
-		// Proof Size summary in bytes:
-		//  Measured:  `12 + c * (47 ±0) + t * (308 ±0)`
-		//  Estimated: `2789 + c * (2526 ±0) + t * (2789 ±0)`
-		// Minimum execution time: 752_614_000 picoseconds.
-		Weight::from_parts(775_359_000, 0)
-			.saturating_add(Weight::from_parts(0, 2789))
-			// Standard Error: 95_470
-			.saturating_add(Weight::from_parts(3_269_112, 0).saturating_mul(c.into()))
-			// Standard Error: 95_470
-			.saturating_add(Weight::from_parts(13_826_144, 0).saturating_mul(t.into()))
-			.saturating_add(T::DbWeight::get().reads(4))
-			.saturating_add(T::DbWeight::get().reads((1_u64).saturating_mul(c.into())))
-			.saturating_add(T::DbWeight::get().reads((3_u64).saturating_mul(t.into())))
-			.saturating_add(T::DbWeight::get().writes(1))
-			.saturating_add(T::DbWeight::get().writes((1_u64).saturating_mul(c.into())))
-			.saturating_add(T::DbWeight::get().writes((3_u64).saturating_mul(t.into())))
-			.saturating_add(Weight::from_parts(0, 2526).saturating_mul(c.into()))
-			.saturating_add(Weight::from_parts(0, 2789).saturating_mul(t.into()))
-	}
-	/// Storage: Slots Leases (r:1 w:1)
-	/// Proof Skipped: Slots Leases (max_values: None, max_size: None, mode: Measured)
-	/// Storage: System Account (r:8 w:8)
-	/// Proof: System Account (max_values: None, max_size: Some(128), added: 2603, mode: MaxEncodedLen)
-	fn clear_all_leases() -> Weight {
-		// Proof Size summary in bytes:
-		//  Measured:  `2692`
-		//  Estimated: `21814`
-		// Minimum execution time: 155_965_000 picoseconds.
-		Weight::from_parts(162_544_000, 0)
-			.saturating_add(Weight::from_parts(0, 21814))
-			.saturating_add(T::DbWeight::get().reads(9))
-			.saturating_add(T::DbWeight::get().writes(9))
-	}
-	/// Storage: Slots Leases (r:1 w:0)
-	/// Proof Skipped: Slots Leases (max_values: None, max_size: None, mode: Measured)
-	/// Storage: Paras ParaLifecycles (r:1 w:1)
-	/// Proof Skipped: Paras ParaLifecycles (max_values: None, max_size: None, mode: Measured)
-	/// Storage: ParasShared CurrentSessionIndex (r:1 w:0)
-	/// Proof Skipped: ParasShared CurrentSessionIndex (max_values: Some(1), max_size: None, mode: Measured)
-	/// Storage: Paras ActionsQueue (r:1 w:1)
-	/// Proof Skipped: Paras ActionsQueue (max_values: None, max_size: None, mode: Measured)
-	/// Storage: Registrar Paras (r:1 w:1)
-	/// Proof Skipped: Registrar Paras (max_values: None, max_size: None, mode: Measured)
-	fn trigger_onboard() -> Weight {
-		// Proof Size summary in bytes:
-		//  Measured:  `617`
-		//  Estimated: `4082`
-		// Minimum execution time: 34_811_000 picoseconds.
-		Weight::from_parts(39_327_000, 0)
-			.saturating_add(Weight::from_parts(0, 4082))
-			.saturating_add(T::DbWeight::get().reads(5))
-			.saturating_add(T::DbWeight::get().writes(3))
-	}
-}
diff --git a/polkadot/runtime/polkadot/src/weights/runtime_parachains_configuration.rs b/polkadot/runtime/polkadot/src/weights/runtime_parachains_configuration.rs
deleted file mode 100644
index 39b0d893edbb54b20778afb3e4b6693f0855f168..0000000000000000000000000000000000000000
--- a/polkadot/runtime/polkadot/src/weights/runtime_parachains_configuration.rs
+++ /dev/null
@@ -1,157 +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/>.
-
-//! Autogenerated weights for `runtime_parachains::configuration`
-//!
-//! THIS FILE WAS AUTO-GENERATED USING THE SUBSTRATE BENCHMARK CLI VERSION 4.0.0-dev
-//! DATE: 2023-08-11, STEPS: `50`, REPEAT: `20`, LOW RANGE: `[]`, HIGH RANGE: `[]`
-//! WORST CASE MAP SIZE: `1000000`
-//! HOSTNAME: `runner-fljshgub-project-163-concurrent-0`, CPU: `Intel(R) Xeon(R) CPU @ 2.60GHz`
-//! WASM-EXECUTION: `Compiled`, CHAIN: `Some("polkadot-dev")`, DB CACHE: 1024
-
-// Executed Command:
-// target/production/polkadot
-// benchmark
-// pallet
-// --steps=50
-// --repeat=20
-// --extrinsic=*
-// --wasm-execution=compiled
-// --heap-pages=4096
-// --json-file=/builds/parity/mirrors/polkadot/.git/.artifacts/bench.json
-// --pallet=runtime_parachains::configuration
-// --chain=polkadot-dev
-// --header=./file_header.txt
-// --output=./runtime/polkadot/src/weights/
-
-#![cfg_attr(rustfmt, rustfmt_skip)]
-#![allow(unused_parens)]
-#![allow(unused_imports)]
-#![allow(missing_docs)]
-
-use frame_support::{traits::Get, weights::Weight};
-use core::marker::PhantomData;
-
-/// Weight functions for `runtime_parachains::configuration`.
-pub struct WeightInfo<T>(PhantomData<T>);
-impl<T: frame_system::Config> runtime_parachains::configuration::WeightInfo for WeightInfo<T> {
-	/// Storage: `Configuration::PendingConfigs` (r:1 w:1)
-	/// Proof: `Configuration::PendingConfigs` (`max_values`: Some(1), `max_size`: None, mode: `Measured`)
-	/// Storage: `Configuration::BypassConsistencyCheck` (r:1 w:0)
-	/// Proof: `Configuration::BypassConsistencyCheck` (`max_values`: Some(1), `max_size`: None, mode: `Measured`)
-	/// Storage: `ParasShared::CurrentSessionIndex` (r:1 w:0)
-	/// Proof: `ParasShared::CurrentSessionIndex` (`max_values`: Some(1), `max_size`: None, mode: `Measured`)
-	fn set_config_with_block_number() -> Weight {
-		// Proof Size summary in bytes:
-		//  Measured:  `127`
-		//  Estimated: `1612`
-		// Minimum execution time: 9_330_000 picoseconds.
-		Weight::from_parts(9_663_000, 0)
-			.saturating_add(Weight::from_parts(0, 1612))
-			.saturating_add(T::DbWeight::get().reads(3))
-			.saturating_add(T::DbWeight::get().writes(1))
-	}
-	/// Storage: `Configuration::PendingConfigs` (r:1 w:1)
-	/// Proof: `Configuration::PendingConfigs` (`max_values`: Some(1), `max_size`: None, mode: `Measured`)
-	/// Storage: `Configuration::BypassConsistencyCheck` (r:1 w:0)
-	/// Proof: `Configuration::BypassConsistencyCheck` (`max_values`: Some(1), `max_size`: None, mode: `Measured`)
-	/// Storage: `ParasShared::CurrentSessionIndex` (r:1 w:0)
-	/// Proof: `ParasShared::CurrentSessionIndex` (`max_values`: Some(1), `max_size`: None, mode: `Measured`)
-	fn set_config_with_u32() -> Weight {
-		// Proof Size summary in bytes:
-		//  Measured:  `127`
-		//  Estimated: `1612`
-		// Minimum execution time: 9_155_000 picoseconds.
-		Weight::from_parts(9_554_000, 0)
-			.saturating_add(Weight::from_parts(0, 1612))
-			.saturating_add(T::DbWeight::get().reads(3))
-			.saturating_add(T::DbWeight::get().writes(1))
-	}
-	/// Storage: `Configuration::PendingConfigs` (r:1 w:1)
-	/// Proof: `Configuration::PendingConfigs` (`max_values`: Some(1), `max_size`: None, mode: `Measured`)
-	/// Storage: `Configuration::BypassConsistencyCheck` (r:1 w:0)
-	/// Proof: `Configuration::BypassConsistencyCheck` (`max_values`: Some(1), `max_size`: None, mode: `Measured`)
-	/// Storage: `ParasShared::CurrentSessionIndex` (r:1 w:0)
-	/// Proof: `ParasShared::CurrentSessionIndex` (`max_values`: Some(1), `max_size`: None, mode: `Measured`)
-	fn set_config_with_option_u32() -> Weight {
-		// Proof Size summary in bytes:
-		//  Measured:  `127`
-		//  Estimated: `1612`
-		// Minimum execution time: 9_299_000 picoseconds.
-		Weight::from_parts(9_663_000, 0)
-			.saturating_add(Weight::from_parts(0, 1612))
-			.saturating_add(T::DbWeight::get().reads(3))
-			.saturating_add(T::DbWeight::get().writes(1))
-	}
-	/// Storage: `Benchmark::Override` (r:0 w:0)
-	/// Proof: `Benchmark::Override` (`max_values`: None, `max_size`: None, mode: `Measured`)
-	fn set_hrmp_open_request_ttl() -> Weight {
-		// Proof Size summary in bytes:
-		//  Measured:  `0`
-		//  Estimated: `0`
-		// Minimum execution time: 2_000_000_000_000 picoseconds.
-		Weight::from_parts(2_000_000_000_000, 0)
-			.saturating_add(Weight::from_parts(0, 0))
-	}
-	/// Storage: `Configuration::PendingConfigs` (r:1 w:1)
-	/// Proof: `Configuration::PendingConfigs` (`max_values`: Some(1), `max_size`: None, mode: `Measured`)
-	/// Storage: `Configuration::BypassConsistencyCheck` (r:1 w:0)
-	/// Proof: `Configuration::BypassConsistencyCheck` (`max_values`: Some(1), `max_size`: None, mode: `Measured`)
-	/// Storage: `ParasShared::CurrentSessionIndex` (r:1 w:0)
-	/// Proof: `ParasShared::CurrentSessionIndex` (`max_values`: Some(1), `max_size`: None, mode: `Measured`)
-	fn set_config_with_balance() -> Weight {
-		// Proof Size summary in bytes:
-		//  Measured:  `127`
-		//  Estimated: `1612`
-		// Minimum execution time: 9_130_000 picoseconds.
-		Weight::from_parts(9_554_000, 0)
-			.saturating_add(Weight::from_parts(0, 1612))
-			.saturating_add(T::DbWeight::get().reads(3))
-			.saturating_add(T::DbWeight::get().writes(1))
-	}
-	/// Storage: `Configuration::PendingConfigs` (r:1 w:1)
-	/// Proof: `Configuration::PendingConfigs` (`max_values`: Some(1), `max_size`: None, mode: `Measured`)
-	/// Storage: `Configuration::BypassConsistencyCheck` (r:1 w:0)
-	/// Proof: `Configuration::BypassConsistencyCheck` (`max_values`: Some(1), `max_size`: None, mode: `Measured`)
-	/// Storage: `ParasShared::CurrentSessionIndex` (r:1 w:0)
-	/// Proof: `ParasShared::CurrentSessionIndex` (`max_values`: Some(1), `max_size`: None, mode: `Measured`)
-	fn set_config_with_executor_params() -> Weight {
-		// Proof Size summary in bytes:
-		//  Measured:  `127`
-		//  Estimated: `1612`
-		// Minimum execution time: 10_177_000 picoseconds.
-		Weight::from_parts(10_632_000, 0)
-			.saturating_add(Weight::from_parts(0, 1612))
-			.saturating_add(T::DbWeight::get().reads(3))
-			.saturating_add(T::DbWeight::get().writes(1))
-	}
-	/// Storage: `Configuration::PendingConfigs` (r:1 w:1)
-	/// Proof: `Configuration::PendingConfigs` (`max_values`: Some(1), `max_size`: None, mode: `Measured`)
-	/// Storage: `Configuration::BypassConsistencyCheck` (r:1 w:0)
-	/// Proof: `Configuration::BypassConsistencyCheck` (`max_values`: Some(1), `max_size`: None, mode: `Measured`)
-	/// Storage: `ParasShared::CurrentSessionIndex` (r:1 w:0)
-	/// Proof: `ParasShared::CurrentSessionIndex` (`max_values`: Some(1), `max_size`: None, mode: `Measured`)
-	fn set_config_with_perbill() -> Weight {
-		// Proof Size summary in bytes:
-		//  Measured:  `127`
-		//  Estimated: `1612`
-		// Minimum execution time: 9_136_000 picoseconds.
-		Weight::from_parts(9_487_000, 0)
-			.saturating_add(Weight::from_parts(0, 1612))
-			.saturating_add(T::DbWeight::get().reads(3))
-			.saturating_add(T::DbWeight::get().writes(1))
-	}
-}
diff --git a/polkadot/runtime/polkadot/src/weights/runtime_parachains_disputes.rs b/polkadot/runtime/polkadot/src/weights/runtime_parachains_disputes.rs
deleted file mode 100644
index 2746924dc87b9fc206279903ff310e9dbbf085c1..0000000000000000000000000000000000000000
--- a/polkadot/runtime/polkadot/src/weights/runtime_parachains_disputes.rs
+++ /dev/null
@@ -1,64 +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/>.
-
-//! Autogenerated weights for `runtime_parachains::disputes`
-//!
-//! THIS FILE WAS AUTO-GENERATED USING THE SUBSTRATE BENCHMARK CLI VERSION 4.0.0-dev
-//! DATE: 2023-06-19, STEPS: `50`, REPEAT: `20`, LOW RANGE: `[]`, HIGH RANGE: `[]`
-//! WORST CASE MAP SIZE: `1000000`
-//! HOSTNAME: `runner-e8ezs4ez-project-163-concurrent-0`, CPU: `Intel(R) Xeon(R) CPU @ 2.60GHz`
-//! EXECUTION: Some(Wasm), WASM-EXECUTION: Compiled, CHAIN: Some("polkadot-dev"), DB CACHE: 1024
-
-// Executed Command:
-// ./target/production/polkadot
-// benchmark
-// pallet
-// --chain=polkadot-dev
-// --steps=50
-// --repeat=20
-// --no-storage-info
-// --no-median-slopes
-// --no-min-squares
-// --pallet=runtime_parachains::disputes
-// --extrinsic=*
-// --execution=wasm
-// --wasm-execution=compiled
-// --header=./file_header.txt
-// --output=./runtime/polkadot/src/weights/runtime_parachains_disputes.rs
-
-#![cfg_attr(rustfmt, rustfmt_skip)]
-#![allow(unused_parens)]
-#![allow(unused_imports)]
-#![allow(missing_docs)]
-
-use frame_support::{traits::Get, weights::Weight};
-use core::marker::PhantomData;
-
-/// Weight functions for `runtime_parachains::disputes`.
-pub struct WeightInfo<T>(PhantomData<T>);
-impl<T: frame_system::Config> runtime_parachains::disputes::WeightInfo for WeightInfo<T> {
-	/// Storage: ParasDisputes Frozen (r:0 w:1)
-	/// Proof Skipped: ParasDisputes Frozen (max_values: Some(1), max_size: None, mode: Measured)
-	fn force_unfreeze() -> Weight {
-		// Proof Size summary in bytes:
-		//  Measured:  `0`
-		//  Estimated: `0`
-		// Minimum execution time: 2_674_000 picoseconds.
-		Weight::from_parts(2_822_000, 0)
-			.saturating_add(Weight::from_parts(0, 0))
-			.saturating_add(T::DbWeight::get().writes(1))
-	}
-}
diff --git a/polkadot/runtime/polkadot/src/weights/runtime_parachains_disputes_slashing.rs b/polkadot/runtime/polkadot/src/weights/runtime_parachains_disputes_slashing.rs
deleted file mode 100644
index eda2f14214b11f68c8a08625a99e6a0cc562c194..0000000000000000000000000000000000000000
--- a/polkadot/runtime/polkadot/src/weights/runtime_parachains_disputes_slashing.rs
+++ /dev/null
@@ -1,101 +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/>.
-
-//! Autogenerated weights for `runtime_parachains::disputes::slashing`
-//!
-//! THIS FILE WAS AUTO-GENERATED USING THE SUBSTRATE BENCHMARK CLI VERSION 4.0.0-dev
-//! DATE: 2023-06-19, STEPS: `50`, REPEAT: `20`, LOW RANGE: `[]`, HIGH RANGE: `[]`
-//! WORST CASE MAP SIZE: `1000000`
-//! HOSTNAME: `runner-e8ezs4ez-project-163-concurrent-0`, CPU: `Intel(R) Xeon(R) CPU @ 2.60GHz`
-//! EXECUTION: Some(Wasm), WASM-EXECUTION: Compiled, CHAIN: Some("polkadot-dev"), DB CACHE: 1024
-
-// Executed Command:
-// ./target/production/polkadot
-// benchmark
-// pallet
-// --chain=polkadot-dev
-// --steps=50
-// --repeat=20
-// --no-storage-info
-// --no-median-slopes
-// --no-min-squares
-// --pallet=runtime_parachains::disputes::slashing
-// --extrinsic=*
-// --execution=wasm
-// --wasm-execution=compiled
-// --header=./file_header.txt
-// --output=./runtime/polkadot/src/weights/runtime_parachains_disputes_slashing.rs
-
-#![cfg_attr(rustfmt, rustfmt_skip)]
-#![allow(unused_parens)]
-#![allow(unused_imports)]
-#![allow(missing_docs)]
-
-use frame_support::{traits::Get, weights::Weight};
-use core::marker::PhantomData;
-
-/// Weight functions for `runtime_parachains::disputes::slashing`.
-pub struct WeightInfo<T>(PhantomData<T>);
-impl<T: frame_system::Config> runtime_parachains::disputes::slashing::WeightInfo for WeightInfo<T> {
-	/// Storage: Session CurrentIndex (r:1 w:0)
-	/// Proof Skipped: Session CurrentIndex (max_values: Some(1), max_size: None, mode: Measured)
-	/// Storage: Historical HistoricalSessions (r:1 w:0)
-	/// Proof: Historical HistoricalSessions (max_values: None, max_size: Some(48), added: 2523, mode: MaxEncodedLen)
-	/// Storage: ParasSlashing UnappliedSlashes (r:1 w:1)
-	/// Proof Skipped: ParasSlashing UnappliedSlashes (max_values: None, max_size: None, mode: Measured)
-	/// Storage: Offences ConcurrentReportsIndex (r:1 w:1)
-	/// Proof Skipped: Offences ConcurrentReportsIndex (max_values: None, max_size: None, mode: Measured)
-	/// Storage: Offences Reports (r:1 w:1)
-	/// Proof Skipped: Offences Reports (max_values: None, max_size: None, mode: Measured)
-	/// Storage: Staking SlashRewardFraction (r:1 w:0)
-	/// Proof: Staking SlashRewardFraction (max_values: Some(1), max_size: Some(4), added: 499, mode: MaxEncodedLen)
-	/// Storage: Staking ActiveEra (r:1 w:0)
-	/// Proof: Staking ActiveEra (max_values: Some(1), max_size: Some(13), added: 508, mode: MaxEncodedLen)
-	/// Storage: Staking ErasStartSessionIndex (r:1 w:0)
-	/// Proof: Staking ErasStartSessionIndex (max_values: None, max_size: Some(16), added: 2491, mode: MaxEncodedLen)
-	/// Storage: Staking Invulnerables (r:1 w:0)
-	/// Proof Skipped: Staking Invulnerables (max_values: Some(1), max_size: None, mode: Measured)
-	/// Storage: Staking ValidatorSlashInEra (r:1 w:1)
-	/// Proof: Staking ValidatorSlashInEra (max_values: None, max_size: Some(72), added: 2547, mode: MaxEncodedLen)
-	/// Storage: Staking SlashingSpans (r:1 w:1)
-	/// Proof Skipped: Staking SlashingSpans (max_values: None, max_size: None, mode: Measured)
-	/// Storage: Staking SpanSlash (r:1 w:1)
-	/// Proof: Staking SpanSlash (max_values: None, max_size: Some(76), added: 2551, mode: MaxEncodedLen)
-	/// Storage: Staking OffendingValidators (r:1 w:1)
-	/// Proof Skipped: Staking OffendingValidators (max_values: Some(1), max_size: None, mode: Measured)
-	/// Storage: Session Validators (r:1 w:0)
-	/// Proof Skipped: Session Validators (max_values: Some(1), max_size: None, mode: Measured)
-	/// Storage: Session DisabledValidators (r:1 w:1)
-	/// Proof Skipped: Session DisabledValidators (max_values: Some(1), max_size: None, mode: Measured)
-	/// Storage: System Digest (r:1 w:1)
-	/// Proof Skipped: System Digest (max_values: Some(1), max_size: None, mode: Measured)
-	/// 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, 1000]`.
-	fn report_dispute_lost(n: u32, ) -> Weight {
-		// Proof Size summary in bytes:
-		//  Measured:  `5392 + n * (185 ±0)`
-		//  Estimated: `8618 + n * (188 ±0)`
-		// Minimum execution time: 123_913_000 picoseconds.
-		Weight::from_parts(158_003_304, 0)
-			.saturating_add(Weight::from_parts(0, 8618))
-			// Standard Error: 3_048
-			.saturating_add(Weight::from_parts(361_664, 0).saturating_mul(n.into()))
-			.saturating_add(T::DbWeight::get().reads(17))
-			.saturating_add(T::DbWeight::get().writes(10))
-			.saturating_add(Weight::from_parts(0, 188).saturating_mul(n.into()))
-	}
-}
diff --git a/polkadot/runtime/polkadot/src/weights/runtime_parachains_hrmp.rs b/polkadot/runtime/polkadot/src/weights/runtime_parachains_hrmp.rs
deleted file mode 100644
index 82d8c30bacad485ba137614a3417547723f27bf3..0000000000000000000000000000000000000000
--- a/polkadot/runtime/polkadot/src/weights/runtime_parachains_hrmp.rs
+++ /dev/null
@@ -1,295 +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/>.
-
-//! Autogenerated weights for `runtime_parachains::hrmp`
-//!
-//! THIS FILE WAS AUTO-GENERATED USING THE SUBSTRATE BENCHMARK CLI VERSION 4.0.0-dev
-//! DATE: 2023-06-19, STEPS: `50`, REPEAT: `20`, LOW RANGE: `[]`, HIGH RANGE: `[]`
-//! WORST CASE MAP SIZE: `1000000`
-//! HOSTNAME: `runner-e8ezs4ez-project-163-concurrent-0`, CPU: `Intel(R) Xeon(R) CPU @ 2.60GHz`
-//! EXECUTION: Some(Wasm), WASM-EXECUTION: Compiled, CHAIN: Some("polkadot-dev"), DB CACHE: 1024
-
-// Executed Command:
-// ./target/production/polkadot
-// benchmark
-// pallet
-// --chain=polkadot-dev
-// --steps=50
-// --repeat=20
-// --no-storage-info
-// --no-median-slopes
-// --no-min-squares
-// --pallet=runtime_parachains::hrmp
-// --extrinsic=*
-// --execution=wasm
-// --wasm-execution=compiled
-// --header=./file_header.txt
-// --output=./runtime/polkadot/src/weights/runtime_parachains_hrmp.rs
-
-#![cfg_attr(rustfmt, rustfmt_skip)]
-#![allow(unused_parens)]
-#![allow(unused_imports)]
-#![allow(missing_docs)]
-
-use frame_support::{traits::Get, weights::Weight};
-use core::marker::PhantomData;
-
-/// Weight functions for `runtime_parachains::hrmp`.
-pub struct WeightInfo<T>(PhantomData<T>);
-impl<T: frame_system::Config> runtime_parachains::hrmp::WeightInfo for WeightInfo<T> {
-	/// Storage: Paras ParaLifecycles (r:2 w:0)
-	/// Proof Skipped: Paras ParaLifecycles (max_values: None, max_size: None, mode: Measured)
-	/// Storage: Configuration ActiveConfig (r:1 w:0)
-	/// Proof Skipped: Configuration ActiveConfig (max_values: Some(1), max_size: None, mode: Measured)
-	/// Storage: Hrmp HrmpOpenChannelRequests (r:1 w:1)
-	/// Proof Skipped: Hrmp HrmpOpenChannelRequests (max_values: None, max_size: None, mode: Measured)
-	/// Storage: Hrmp HrmpChannels (r:1 w:0)
-	/// Proof Skipped: Hrmp HrmpChannels (max_values: None, max_size: None, mode: Measured)
-	/// Storage: Hrmp HrmpEgressChannelsIndex (r:1 w:0)
-	/// Proof Skipped: Hrmp HrmpEgressChannelsIndex (max_values: None, max_size: None, mode: Measured)
-	/// Storage: Hrmp HrmpOpenChannelRequestCount (r:1 w:1)
-	/// Proof Skipped: Hrmp HrmpOpenChannelRequestCount (max_values: None, max_size: None, mode: Measured)
-	/// Storage: Hrmp HrmpOpenChannelRequestsList (r:1 w:1)
-	/// Proof Skipped: Hrmp HrmpOpenChannelRequestsList (max_values: Some(1), max_size: None, mode: Measured)
-	/// Storage: Dmp DownwardMessageQueues (r:1 w:1)
-	/// Proof Skipped: Dmp DownwardMessageQueues (max_values: None, max_size: None, mode: Measured)
-	/// Storage: Dmp DownwardMessageQueueHeads (r:1 w:1)
-	/// Proof Skipped: Dmp DownwardMessageQueueHeads (max_values: None, max_size: None, mode: Measured)
-	fn hrmp_init_open_channel() -> Weight {
-		// Proof Size summary in bytes:
-		//  Measured:  `666`
-		//  Estimated: `6606`
-		// Minimum execution time: 41_092_000 picoseconds.
-		Weight::from_parts(43_188_000, 0)
-			.saturating_add(Weight::from_parts(0, 6606))
-			.saturating_add(T::DbWeight::get().reads(10))
-			.saturating_add(T::DbWeight::get().writes(5))
-	}
-	/// Storage: Hrmp HrmpOpenChannelRequests (r:1 w:1)
-	/// Proof Skipped: Hrmp HrmpOpenChannelRequests (max_values: None, max_size: None, mode: Measured)
-	/// Storage: Configuration ActiveConfig (r:1 w:0)
-	/// Proof Skipped: Configuration ActiveConfig (max_values: Some(1), max_size: None, mode: Measured)
-	/// Storage: Paras ParaLifecycles (r:1 w:0)
-	/// Proof Skipped: Paras ParaLifecycles (max_values: None, max_size: None, mode: Measured)
-	/// Storage: Hrmp HrmpIngressChannelsIndex (r:1 w:0)
-	/// Proof Skipped: Hrmp HrmpIngressChannelsIndex (max_values: None, max_size: None, mode: Measured)
-	/// Storage: Hrmp HrmpAcceptedChannelRequestCount (r:1 w:1)
-	/// Proof Skipped: Hrmp HrmpAcceptedChannelRequestCount (max_values: None, max_size: None, mode: Measured)
-	/// Storage: Dmp DownwardMessageQueues (r:1 w:1)
-	/// Proof Skipped: Dmp DownwardMessageQueues (max_values: None, max_size: None, mode: Measured)
-	/// Storage: Dmp DownwardMessageQueueHeads (r:1 w:1)
-	/// Proof Skipped: Dmp DownwardMessageQueueHeads (max_values: None, max_size: None, mode: Measured)
-	fn hrmp_accept_open_channel() -> Weight {
-		// Proof Size summary in bytes:
-		//  Measured:  `898`
-		//  Estimated: `4363`
-		// Minimum execution time: 43_872_000 picoseconds.
-		Weight::from_parts(45_130_000, 0)
-			.saturating_add(Weight::from_parts(0, 4363))
-			.saturating_add(T::DbWeight::get().reads(7))
-			.saturating_add(T::DbWeight::get().writes(4))
-	}
-	/// Storage: Hrmp HrmpChannels (r:1 w:0)
-	/// Proof Skipped: Hrmp HrmpChannels (max_values: None, max_size: None, mode: Measured)
-	/// Storage: Hrmp HrmpCloseChannelRequests (r:1 w:1)
-	/// Proof Skipped: Hrmp HrmpCloseChannelRequests (max_values: None, max_size: None, mode: Measured)
-	/// Storage: Hrmp HrmpCloseChannelRequestsList (r:1 w:1)
-	/// Proof Skipped: Hrmp HrmpCloseChannelRequestsList (max_values: Some(1), max_size: None, mode: Measured)
-	/// Storage: Configuration ActiveConfig (r:1 w:0)
-	/// Proof Skipped: Configuration ActiveConfig (max_values: Some(1), max_size: None, mode: Measured)
-	/// Storage: Dmp DownwardMessageQueues (r:1 w:1)
-	/// Proof Skipped: Dmp DownwardMessageQueues (max_values: None, max_size: None, mode: Measured)
-	/// Storage: Dmp DownwardMessageQueueHeads (r:1 w:1)
-	/// Proof Skipped: Dmp DownwardMessageQueueHeads (max_values: None, max_size: None, mode: Measured)
-	fn hrmp_close_channel() -> Weight {
-		// Proof Size summary in bytes:
-		//  Measured:  `769`
-		//  Estimated: `4234`
-		// Minimum execution time: 36_749_000 picoseconds.
-		Weight::from_parts(37_721_000, 0)
-			.saturating_add(Weight::from_parts(0, 4234))
-			.saturating_add(T::DbWeight::get().reads(6))
-			.saturating_add(T::DbWeight::get().writes(4))
-	}
-	/// Storage: Hrmp HrmpIngressChannelsIndex (r:128 w:128)
-	/// Proof Skipped: Hrmp HrmpIngressChannelsIndex (max_values: None, max_size: None, mode: Measured)
-	/// Storage: Hrmp HrmpEgressChannelsIndex (r:128 w:128)
-	/// Proof Skipped: Hrmp HrmpEgressChannelsIndex (max_values: None, max_size: None, mode: Measured)
-	/// Storage: Hrmp HrmpChannels (r:254 w:254)
-	/// Proof Skipped: Hrmp HrmpChannels (max_values: None, max_size: None, mode: Measured)
-	/// Storage: Hrmp HrmpAcceptedChannelRequestCount (r:0 w:1)
-	/// Proof Skipped: Hrmp HrmpAcceptedChannelRequestCount (max_values: None, max_size: None, mode: Measured)
-	/// Storage: Hrmp HrmpChannelContents (r:0 w:254)
-	/// Proof Skipped: Hrmp HrmpChannelContents (max_values: None, max_size: None, mode: Measured)
-	/// Storage: Hrmp HrmpOpenChannelRequestCount (r:0 w:1)
-	/// Proof Skipped: Hrmp HrmpOpenChannelRequestCount (max_values: None, max_size: None, mode: Measured)
-	/// The range of component `i` is `[0, 127]`.
-	/// The range of component `e` is `[0, 127]`.
-	fn force_clean_hrmp(i: u32, e: u32, ) -> Weight {
-		// Proof Size summary in bytes:
-		//  Measured:  `197 + e * (100 ±0) + i * (100 ±0)`
-		//  Estimated: `3659 + e * (2575 ±0) + i * (2575 ±0)`
-		// Minimum execution time: 1_241_128_000 picoseconds.
-		Weight::from_parts(1_249_625_000, 0)
-			.saturating_add(Weight::from_parts(0, 3659))
-			// Standard Error: 114_117
-			.saturating_add(Weight::from_parts(3_676_253, 0).saturating_mul(i.into()))
-			// Standard Error: 114_117
-			.saturating_add(Weight::from_parts(3_657_525, 0).saturating_mul(e.into()))
-			.saturating_add(T::DbWeight::get().reads(2))
-			.saturating_add(T::DbWeight::get().reads((2_u64).saturating_mul(i.into())))
-			.saturating_add(T::DbWeight::get().reads((2_u64).saturating_mul(e.into())))
-			.saturating_add(T::DbWeight::get().writes(4))
-			.saturating_add(T::DbWeight::get().writes((3_u64).saturating_mul(i.into())))
-			.saturating_add(T::DbWeight::get().writes((3_u64).saturating_mul(e.into())))
-			.saturating_add(Weight::from_parts(0, 2575).saturating_mul(e.into()))
-			.saturating_add(Weight::from_parts(0, 2575).saturating_mul(i.into()))
-	}
-	/// Storage: Configuration ActiveConfig (r:1 w:0)
-	/// Proof Skipped: Configuration ActiveConfig (max_values: Some(1), max_size: None, mode: Measured)
-	/// Storage: Hrmp HrmpOpenChannelRequestsList (r:1 w:1)
-	/// Proof Skipped: Hrmp HrmpOpenChannelRequestsList (max_values: Some(1), max_size: None, mode: Measured)
-	/// Storage: Hrmp HrmpOpenChannelRequests (r:128 w:128)
-	/// Proof Skipped: Hrmp HrmpOpenChannelRequests (max_values: None, max_size: None, mode: Measured)
-	/// Storage: Paras ParaLifecycles (r:256 w:0)
-	/// Proof Skipped: Paras ParaLifecycles (max_values: None, max_size: None, mode: Measured)
-	/// Storage: Hrmp HrmpIngressChannelsIndex (r:128 w:128)
-	/// Proof Skipped: Hrmp HrmpIngressChannelsIndex (max_values: None, max_size: None, mode: Measured)
-	/// Storage: Hrmp HrmpEgressChannelsIndex (r:128 w:128)
-	/// Proof Skipped: Hrmp HrmpEgressChannelsIndex (max_values: None, max_size: None, mode: Measured)
-	/// Storage: Hrmp HrmpOpenChannelRequestCount (r:128 w:128)
-	/// Proof Skipped: Hrmp HrmpOpenChannelRequestCount (max_values: None, max_size: None, mode: Measured)
-	/// Storage: Hrmp HrmpAcceptedChannelRequestCount (r:128 w:128)
-	/// Proof Skipped: Hrmp HrmpAcceptedChannelRequestCount (max_values: None, max_size: None, mode: Measured)
-	/// Storage: Hrmp HrmpChannels (r:0 w:128)
-	/// Proof Skipped: Hrmp HrmpChannels (max_values: None, max_size: None, mode: Measured)
-	/// The range of component `c` is `[0, 128]`.
-	fn force_process_hrmp_open(c: u32, ) -> Weight {
-		// Proof Size summary in bytes:
-		//  Measured:  `741 + c * (136 ±0)`
-		//  Estimated: `2196 + c * (5086 ±0)`
-		// Minimum execution time: 10_559_000 picoseconds.
-		Weight::from_parts(7_421_722, 0)
-			.saturating_add(Weight::from_parts(0, 2196))
-			// Standard Error: 17_031
-			.saturating_add(Weight::from_parts(21_174_297, 0).saturating_mul(c.into()))
-			.saturating_add(T::DbWeight::get().reads(2))
-			.saturating_add(T::DbWeight::get().reads((7_u64).saturating_mul(c.into())))
-			.saturating_add(T::DbWeight::get().writes(1))
-			.saturating_add(T::DbWeight::get().writes((6_u64).saturating_mul(c.into())))
-			.saturating_add(Weight::from_parts(0, 5086).saturating_mul(c.into()))
-	}
-	/// Storage: Hrmp HrmpCloseChannelRequestsList (r:1 w:1)
-	/// Proof Skipped: Hrmp HrmpCloseChannelRequestsList (max_values: Some(1), max_size: None, mode: Measured)
-	/// Storage: Hrmp HrmpChannels (r:128 w:128)
-	/// Proof Skipped: Hrmp HrmpChannels (max_values: None, max_size: None, mode: Measured)
-	/// Storage: Hrmp HrmpEgressChannelsIndex (r:128 w:128)
-	/// Proof Skipped: Hrmp HrmpEgressChannelsIndex (max_values: None, max_size: None, mode: Measured)
-	/// Storage: Hrmp HrmpIngressChannelsIndex (r:128 w:128)
-	/// Proof Skipped: Hrmp HrmpIngressChannelsIndex (max_values: None, max_size: None, mode: Measured)
-	/// Storage: Hrmp HrmpCloseChannelRequests (r:0 w:128)
-	/// Proof Skipped: Hrmp HrmpCloseChannelRequests (max_values: None, max_size: None, mode: Measured)
-	/// Storage: Hrmp HrmpChannelContents (r:0 w:128)
-	/// Proof Skipped: Hrmp HrmpChannelContents (max_values: None, max_size: None, mode: Measured)
-	/// The range of component `c` is `[0, 128]`.
-	fn force_process_hrmp_close(c: u32, ) -> Weight {
-		// Proof Size summary in bytes:
-		//  Measured:  `268 + c * (124 ±0)`
-		//  Estimated: `1728 + c * (2600 ±0)`
-		// Minimum execution time: 6_657_000 picoseconds.
-		Weight::from_parts(2_696_128, 0)
-			.saturating_add(Weight::from_parts(0, 1728))
-			// Standard Error: 13_124
-			.saturating_add(Weight::from_parts(13_190_422, 0).saturating_mul(c.into()))
-			.saturating_add(T::DbWeight::get().reads(1))
-			.saturating_add(T::DbWeight::get().reads((3_u64).saturating_mul(c.into())))
-			.saturating_add(T::DbWeight::get().writes(1))
-			.saturating_add(T::DbWeight::get().writes((5_u64).saturating_mul(c.into())))
-			.saturating_add(Weight::from_parts(0, 2600).saturating_mul(c.into()))
-	}
-	/// Storage: Hrmp HrmpOpenChannelRequestsList (r:1 w:1)
-	/// Proof Skipped: Hrmp HrmpOpenChannelRequestsList (max_values: Some(1), max_size: None, mode: Measured)
-	/// Storage: Hrmp HrmpOpenChannelRequests (r:1 w:1)
-	/// Proof Skipped: Hrmp HrmpOpenChannelRequests (max_values: None, max_size: None, mode: Measured)
-	/// Storage: Hrmp HrmpOpenChannelRequestCount (r:1 w:1)
-	/// Proof Skipped: Hrmp HrmpOpenChannelRequestCount (max_values: None, max_size: None, mode: Measured)
-	/// The range of component `c` is `[0, 128]`.
-	fn hrmp_cancel_open_request(c: u32, ) -> Weight {
-		// Proof Size summary in bytes:
-		//  Measured:  `959 + c * (13 ±0)`
-		//  Estimated: `4228 + c * (15 ±0)`
-		// Minimum execution time: 22_102_000 picoseconds.
-		Weight::from_parts(29_549_361, 0)
-			.saturating_add(Weight::from_parts(0, 4228))
-			// Standard Error: 2_209
-			.saturating_add(Weight::from_parts(132_354, 0).saturating_mul(c.into()))
-			.saturating_add(T::DbWeight::get().reads(3))
-			.saturating_add(T::DbWeight::get().writes(3))
-			.saturating_add(Weight::from_parts(0, 15).saturating_mul(c.into()))
-	}
-	/// Storage: Hrmp HrmpOpenChannelRequestsList (r:1 w:1)
-	/// Proof Skipped: Hrmp HrmpOpenChannelRequestsList (max_values: Some(1), max_size: None, mode: Measured)
-	/// Storage: Hrmp HrmpOpenChannelRequests (r:128 w:128)
-	/// Proof Skipped: Hrmp HrmpOpenChannelRequests (max_values: None, max_size: None, mode: Measured)
-	/// The range of component `c` is `[0, 128]`.
-	fn clean_open_channel_requests(c: u32, ) -> Weight {
-		// Proof Size summary in bytes:
-		//  Measured:  `176 + c * (63 ±0)`
-		//  Estimated: `1655 + c * (2538 ±0)`
-		// Minimum execution time: 5_362_000 picoseconds.
-		Weight::from_parts(5_817_072, 0)
-			.saturating_add(Weight::from_parts(0, 1655))
-			// Standard Error: 4_287
-			.saturating_add(Weight::from_parts(3_550_045, 0).saturating_mul(c.into()))
-			.saturating_add(T::DbWeight::get().reads(1))
-			.saturating_add(T::DbWeight::get().reads((1_u64).saturating_mul(c.into())))
-			.saturating_add(T::DbWeight::get().writes(1))
-			.saturating_add(T::DbWeight::get().writes((1_u64).saturating_mul(c.into())))
-			.saturating_add(Weight::from_parts(0, 2538).saturating_mul(c.into()))
-	}
-	/// Storage: Paras ParaLifecycles (r:2 w:0)
-	/// Proof Skipped: Paras ParaLifecycles (max_values: None, max_size: None, mode: Measured)
-	/// Storage: Configuration ActiveConfig (r:1 w:0)
-	/// Proof Skipped: Configuration ActiveConfig (max_values: Some(1), max_size: None, mode: Measured)
-	/// Storage: Hrmp HrmpOpenChannelRequests (r:1 w:1)
-	/// Proof Skipped: Hrmp HrmpOpenChannelRequests (max_values: None, max_size: None, mode: Measured)
-	/// Storage: Hrmp HrmpChannels (r:1 w:0)
-	/// Proof Skipped: Hrmp HrmpChannels (max_values: None, max_size: None, mode: Measured)
-	/// Storage: Hrmp HrmpEgressChannelsIndex (r:1 w:0)
-	/// Proof Skipped: Hrmp HrmpEgressChannelsIndex (max_values: None, max_size: None, mode: Measured)
-	/// Storage: Hrmp HrmpOpenChannelRequestCount (r:1 w:1)
-	/// Proof Skipped: Hrmp HrmpOpenChannelRequestCount (max_values: None, max_size: None, mode: Measured)
-	/// Storage: Hrmp HrmpOpenChannelRequestsList (r:1 w:1)
-	/// Proof Skipped: Hrmp HrmpOpenChannelRequestsList (max_values: Some(1), max_size: None, mode: Measured)
-	/// Storage: Dmp DownwardMessageQueues (r:2 w:2)
-	/// Proof Skipped: Dmp DownwardMessageQueues (max_values: None, max_size: None, mode: Measured)
-	/// Storage: Dmp DownwardMessageQueueHeads (r:2 w:2)
-	/// Proof Skipped: Dmp DownwardMessageQueueHeads (max_values: None, max_size: None, mode: Measured)
-	/// Storage: Hrmp HrmpIngressChannelsIndex (r:1 w:0)
-	/// Proof Skipped: Hrmp HrmpIngressChannelsIndex (max_values: None, max_size: None, mode: Measured)
-	/// Storage: Hrmp HrmpAcceptedChannelRequestCount (r:1 w:1)
-	/// Proof Skipped: Hrmp HrmpAcceptedChannelRequestCount (max_values: None, max_size: None, mode: Measured)
-	fn force_open_hrmp_channel(_c: u32, ) -> Weight {
-		// Proof Size summary in bytes:
-		//  Measured:  `666`
-		//  Estimated: `6606`
-		// Minimum execution time: 56_136_000 picoseconds.
-		Weight::from_parts(57_227_000, 0)
-			.saturating_add(Weight::from_parts(0, 6606))
-			.saturating_add(T::DbWeight::get().reads(14))
-			.saturating_add(T::DbWeight::get().writes(8))
-	}
-}
diff --git a/polkadot/runtime/polkadot/src/weights/runtime_parachains_inclusion.rs b/polkadot/runtime/polkadot/src/weights/runtime_parachains_inclusion.rs
deleted file mode 100644
index c1e89a1ea9889828ae2d773f81484eb425a1e243..0000000000000000000000000000000000000000
--- a/polkadot/runtime/polkadot/src/weights/runtime_parachains_inclusion.rs
+++ /dev/null
@@ -1,77 +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/>.
-
-//! Autogenerated weights for `runtime_parachains::inclusion`
-//!
-//! THIS FILE WAS AUTO-GENERATED USING THE SUBSTRATE BENCHMARK CLI VERSION 4.0.0-dev
-//! DATE: 2023-06-19, STEPS: `50`, REPEAT: `20`, LOW RANGE: `[]`, HIGH RANGE: `[]`
-//! WORST CASE MAP SIZE: `1000000`
-//! HOSTNAME: `runner-e8ezs4ez-project-163-concurrent-0`, CPU: `Intel(R) Xeon(R) CPU @ 2.60GHz`
-//! EXECUTION: Some(Wasm), WASM-EXECUTION: Compiled, CHAIN: Some("polkadot-dev"), DB CACHE: 1024
-
-// Executed Command:
-// ./target/production/polkadot
-// benchmark
-// pallet
-// --chain=polkadot-dev
-// --steps=50
-// --repeat=20
-// --no-storage-info
-// --no-median-slopes
-// --no-min-squares
-// --pallet=runtime_parachains::inclusion
-// --extrinsic=*
-// --execution=wasm
-// --wasm-execution=compiled
-// --header=./file_header.txt
-// --output=./runtime/polkadot/src/weights/runtime_parachains_inclusion.rs
-
-#![cfg_attr(rustfmt, rustfmt_skip)]
-#![allow(unused_parens)]
-#![allow(unused_imports)]
-#![allow(missing_docs)]
-
-use frame_support::{traits::Get, weights::Weight};
-use core::marker::PhantomData;
-
-/// Weight functions for `runtime_parachains::inclusion`.
-pub struct WeightInfo<T>(PhantomData<T>);
-impl<T: frame_system::Config> runtime_parachains::inclusion::WeightInfo for WeightInfo<T> {
-	/// Storage: MessageQueue BookStateFor (r:1 w:1)
-	/// Proof: MessageQueue BookStateFor (max_values: None, max_size: Some(55), added: 2530, mode: MaxEncodedLen)
-	/// Storage: MessageQueue Pages (r:1 w:999)
-	/// Proof: MessageQueue Pages (max_values: None, max_size: Some(65586), added: 68061, mode: MaxEncodedLen)
-	/// Storage: Configuration ActiveConfig (r:1 w:0)
-	/// Proof Skipped: Configuration ActiveConfig (max_values: Some(1), max_size: None, mode: Measured)
-	/// Storage: unknown `0x3a72656c61795f64697370617463685f71756575655f72656d61696e696e675f` (r:0 w:1)
-	/// Proof Skipped: unknown `0x3a72656c61795f64697370617463685f71756575655f72656d61696e696e675f` (r:0 w:1)
-	/// Storage: unknown `0xf5207f03cfdce586301014700e2c2593fad157e461d71fd4c1f936839a5f1f3e` (r:0 w:1)
-	/// Proof Skipped: unknown `0xf5207f03cfdce586301014700e2c2593fad157e461d71fd4c1f936839a5f1f3e` (r:0 w:1)
-	/// The range of component `i` is `[1, 1000]`.
-	fn receive_upward_messages(i: u32, ) -> Weight {
-		// Proof Size summary in bytes:
-		//  Measured:  `66077`
-		//  Estimated: `69051`
-		// Minimum execution time: 124_710_000 picoseconds.
-		Weight::from_parts(126_824_000, 0)
-			.saturating_add(Weight::from_parts(0, 69051))
-			// Standard Error: 127_283
-			.saturating_add(Weight::from_parts(110_113_768, 0).saturating_mul(i.into()))
-			.saturating_add(T::DbWeight::get().reads(3))
-			.saturating_add(T::DbWeight::get().writes(3))
-			.saturating_add(T::DbWeight::get().writes((1_u64).saturating_mul(i.into())))
-	}
-}
diff --git a/polkadot/runtime/polkadot/src/weights/runtime_parachains_initializer.rs b/polkadot/runtime/polkadot/src/weights/runtime_parachains_initializer.rs
deleted file mode 100644
index 87e60aaeb24db96c1adf465524557769d60b5ebb..0000000000000000000000000000000000000000
--- a/polkadot/runtime/polkadot/src/weights/runtime_parachains_initializer.rs
+++ /dev/null
@@ -1,69 +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/>.
-
-//! Autogenerated weights for `runtime_parachains::initializer`
-//!
-//! THIS FILE WAS AUTO-GENERATED USING THE SUBSTRATE BENCHMARK CLI VERSION 4.0.0-dev
-//! DATE: 2023-06-19, STEPS: `50`, REPEAT: `20`, LOW RANGE: `[]`, HIGH RANGE: `[]`
-//! WORST CASE MAP SIZE: `1000000`
-//! HOSTNAME: `runner-e8ezs4ez-project-163-concurrent-0`, CPU: `Intel(R) Xeon(R) CPU @ 2.60GHz`
-//! EXECUTION: Some(Wasm), WASM-EXECUTION: Compiled, CHAIN: Some("polkadot-dev"), DB CACHE: 1024
-
-// Executed Command:
-// ./target/production/polkadot
-// benchmark
-// pallet
-// --chain=polkadot-dev
-// --steps=50
-// --repeat=20
-// --no-storage-info
-// --no-median-slopes
-// --no-min-squares
-// --pallet=runtime_parachains::initializer
-// --extrinsic=*
-// --execution=wasm
-// --wasm-execution=compiled
-// --header=./file_header.txt
-// --output=./runtime/polkadot/src/weights/runtime_parachains_initializer.rs
-
-#![cfg_attr(rustfmt, rustfmt_skip)]
-#![allow(unused_parens)]
-#![allow(unused_imports)]
-#![allow(missing_docs)]
-
-use frame_support::{traits::Get, weights::Weight};
-use core::marker::PhantomData;
-
-/// Weight functions for `runtime_parachains::initializer`.
-pub struct WeightInfo<T>(PhantomData<T>);
-impl<T: frame_system::Config> runtime_parachains::initializer::WeightInfo for WeightInfo<T> {
-	/// Storage: System Digest (r:1 w:1)
-	/// Proof Skipped: System Digest (max_values: Some(1), max_size: None, mode: Measured)
-	/// The range of component `d` is `[0, 65536]`.
-	fn force_approve(d: u32, ) -> Weight {
-		// Proof Size summary in bytes:
-		//  Measured:  `0 + d * (11 ±0)`
-		//  Estimated: `1480 + d * (11 ±0)`
-		// Minimum execution time: 3_619_000 picoseconds.
-		Weight::from_parts(3_743_000, 0)
-			.saturating_add(Weight::from_parts(0, 1480))
-			// Standard Error: 17
-			.saturating_add(Weight::from_parts(3_045, 0).saturating_mul(d.into()))
-			.saturating_add(T::DbWeight::get().reads(1))
-			.saturating_add(T::DbWeight::get().writes(1))
-			.saturating_add(Weight::from_parts(0, 11).saturating_mul(d.into()))
-	}
-}
diff --git a/polkadot/runtime/polkadot/src/weights/runtime_parachains_paras.rs b/polkadot/runtime/polkadot/src/weights/runtime_parachains_paras.rs
deleted file mode 100644
index 06f67211eade4180c956a7d5abc8c07b09395baf..0000000000000000000000000000000000000000
--- a/polkadot/runtime/polkadot/src/weights/runtime_parachains_paras.rs
+++ /dev/null
@@ -1,297 +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/>.
-
-//! Autogenerated weights for `runtime_parachains::paras`
-//!
-//! THIS FILE WAS AUTO-GENERATED USING THE SUBSTRATE BENCHMARK CLI VERSION 4.0.0-dev
-//! DATE: 2023-06-19, STEPS: `50`, REPEAT: `20`, LOW RANGE: `[]`, HIGH RANGE: `[]`
-//! WORST CASE MAP SIZE: `1000000`
-//! HOSTNAME: `runner-e8ezs4ez-project-163-concurrent-0`, CPU: `Intel(R) Xeon(R) CPU @ 2.60GHz`
-//! EXECUTION: Some(Wasm), WASM-EXECUTION: Compiled, CHAIN: Some("polkadot-dev"), DB CACHE: 1024
-
-// Executed Command:
-// ./target/production/polkadot
-// benchmark
-// pallet
-// --chain=polkadot-dev
-// --steps=50
-// --repeat=20
-// --no-storage-info
-// --no-median-slopes
-// --no-min-squares
-// --pallet=runtime_parachains::paras
-// --extrinsic=*
-// --execution=wasm
-// --wasm-execution=compiled
-// --header=./file_header.txt
-// --output=./runtime/polkadot/src/weights/runtime_parachains_paras.rs
-
-#![cfg_attr(rustfmt, rustfmt_skip)]
-#![allow(unused_parens)]
-#![allow(unused_imports)]
-#![allow(missing_docs)]
-
-use frame_support::{traits::Get, weights::Weight};
-use core::marker::PhantomData;
-
-/// Weight functions for `runtime_parachains::paras`.
-pub struct WeightInfo<T>(PhantomData<T>);
-impl<T: frame_system::Config> runtime_parachains::paras::WeightInfo for WeightInfo<T> {
-	/// Storage: Paras CurrentCodeHash (r:1 w:1)
-	/// Proof Skipped: Paras CurrentCodeHash (max_values: None, max_size: None, mode: Measured)
-	/// Storage: Paras CodeByHashRefs (r:1 w:1)
-	/// Proof Skipped: Paras CodeByHashRefs (max_values: None, max_size: None, mode: Measured)
-	/// Storage: Paras PastCodeMeta (r:1 w:1)
-	/// Proof Skipped: Paras PastCodeMeta (max_values: None, max_size: None, mode: Measured)
-	/// Storage: Paras PastCodePruning (r:1 w:1)
-	/// Proof Skipped: Paras PastCodePruning (max_values: Some(1), max_size: None, mode: Measured)
-	/// Storage: Paras PastCodeHash (r:0 w:1)
-	/// Proof Skipped: Paras PastCodeHash (max_values: None, max_size: None, mode: Measured)
-	/// Storage: Paras CodeByHash (r:0 w:1)
-	/// Proof Skipped: Paras CodeByHash (max_values: None, max_size: None, mode: Measured)
-	/// The range of component `c` is `[1, 3145728]`.
-	fn force_set_current_code(c: u32, ) -> Weight {
-		// Proof Size summary in bytes:
-		//  Measured:  `8309`
-		//  Estimated: `11774`
-		// Minimum execution time: 33_840_000 picoseconds.
-		Weight::from_parts(34_093_000, 0)
-			.saturating_add(Weight::from_parts(0, 11774))
-			// Standard Error: 5
-			.saturating_add(Weight::from_parts(2_436, 0).saturating_mul(c.into()))
-			.saturating_add(T::DbWeight::get().reads(4))
-			.saturating_add(T::DbWeight::get().writes(6))
-	}
-	/// Storage: Paras Heads (r:0 w:1)
-	/// Proof Skipped: Paras Heads (max_values: None, max_size: None, mode: Measured)
-	/// The range of component `s` is `[1, 1048576]`.
-	fn force_set_current_head(s: u32, ) -> Weight {
-		// Proof Size summary in bytes:
-		//  Measured:  `0`
-		//  Estimated: `0`
-		// Minimum execution time: 7_922_000 picoseconds.
-		Weight::from_parts(8_254_000, 0)
-			.saturating_add(Weight::from_parts(0, 0))
-			// Standard Error: 1
-			.saturating_add(Weight::from_parts(1_040, 0).saturating_mul(s.into()))
-			.saturating_add(T::DbWeight::get().writes(1))
-	}
-	// Storage: Paras Heads (r:0 w:1)
-	fn force_set_most_recent_context() -> Weight {
-		Weight::from_parts(10_155_000, 0)
-			// Standard Error: 0
-			.saturating_add(T::DbWeight::get().writes(1 as u64))
-	}
-	/// Storage: Configuration ActiveConfig (r:1 w:0)
-	/// Proof Skipped: Configuration ActiveConfig (max_values: Some(1), max_size: None, mode: Measured)
-	/// Storage: Paras FutureCodeHash (r:1 w:1)
-	/// Proof Skipped: Paras FutureCodeHash (max_values: None, max_size: None, mode: Measured)
-	/// Storage: Paras CurrentCodeHash (r:1 w:0)
-	/// Proof Skipped: Paras CurrentCodeHash (max_values: None, max_size: None, mode: Measured)
-	/// Storage: Paras UpgradeCooldowns (r:1 w:1)
-	/// Proof Skipped: Paras UpgradeCooldowns (max_values: Some(1), max_size: None, mode: Measured)
-	/// Storage: Paras PvfActiveVoteMap (r:1 w:1)
-	/// Proof Skipped: Paras PvfActiveVoteMap (max_values: None, max_size: None, mode: Measured)
-	/// Storage: Paras CodeByHash (r:1 w:1)
-	/// Proof Skipped: Paras CodeByHash (max_values: None, max_size: None, mode: Measured)
-	/// Storage: ParasShared ActiveValidatorKeys (r:1 w:0)
-	/// Proof Skipped: ParasShared ActiveValidatorKeys (max_values: Some(1), max_size: None, mode: Measured)
-	/// Storage: Paras PvfActiveVoteList (r:1 w:1)
-	/// Proof Skipped: Paras PvfActiveVoteList (max_values: Some(1), max_size: None, mode: Measured)
-	/// Storage: Paras CodeByHashRefs (r:1 w:1)
-	/// Proof Skipped: Paras CodeByHashRefs (max_values: None, max_size: None, mode: Measured)
-	/// Storage: Paras UpgradeRestrictionSignal (r:0 w:1)
-	/// Proof Skipped: Paras UpgradeRestrictionSignal (max_values: None, max_size: None, mode: Measured)
-	/// The range of component `c` is `[1, 3145728]`.
-	fn force_schedule_code_upgrade(c: u32, ) -> Weight {
-		// Proof Size summary in bytes:
-		//  Measured:  `8744`
-		//  Estimated: `12209`
-		// Minimum execution time: 52_554_000 picoseconds.
-		Weight::from_parts(53_345_000, 0)
-			.saturating_add(Weight::from_parts(0, 12209))
-			// Standard Error: 3
-			.saturating_add(Weight::from_parts(2_405, 0).saturating_mul(c.into()))
-			.saturating_add(T::DbWeight::get().reads(9))
-			.saturating_add(T::DbWeight::get().writes(7))
-	}
-	/// Storage: Paras FutureCodeUpgrades (r:1 w:0)
-	/// Proof Skipped: Paras FutureCodeUpgrades (max_values: None, max_size: None, mode: Measured)
-	/// Storage: Paras Heads (r:0 w:1)
-	/// Proof Skipped: Paras Heads (max_values: None, max_size: None, mode: Measured)
-	/// Storage: Paras UpgradeGoAheadSignal (r:0 w:1)
-	/// Proof Skipped: Paras UpgradeGoAheadSignal (max_values: None, max_size: None, mode: Measured)
-	/// The range of component `s` is `[1, 1048576]`.
-	fn force_note_new_head(s: u32, ) -> Weight {
-		// Proof Size summary in bytes:
-		//  Measured:  `95`
-		//  Estimated: `3560`
-		// Minimum execution time: 14_465_000 picoseconds.
-		Weight::from_parts(20_861_569, 0)
-			.saturating_add(Weight::from_parts(0, 3560))
-			// Standard Error: 1
-			.saturating_add(Weight::from_parts(1_002, 0).saturating_mul(s.into()))
-			.saturating_add(T::DbWeight::get().reads(1))
-			.saturating_add(T::DbWeight::get().writes(2))
-	}
-	/// Storage: ParasShared CurrentSessionIndex (r:1 w:0)
-	/// Proof Skipped: ParasShared CurrentSessionIndex (max_values: Some(1), max_size: None, mode: Measured)
-	/// Storage: Paras ActionsQueue (r:1 w:1)
-	/// Proof Skipped: Paras ActionsQueue (max_values: None, max_size: None, mode: Measured)
-	fn force_queue_action() -> Weight {
-		// Proof Size summary in bytes:
-		//  Measured:  `4288`
-		//  Estimated: `7753`
-		// Minimum execution time: 21_354_000 picoseconds.
-		Weight::from_parts(21_865_000, 0)
-			.saturating_add(Weight::from_parts(0, 7753))
-			.saturating_add(T::DbWeight::get().reads(2))
-			.saturating_add(T::DbWeight::get().writes(1))
-	}
-	/// Storage: Paras PvfActiveVoteMap (r:1 w:1)
-	/// Proof Skipped: Paras PvfActiveVoteMap (max_values: None, max_size: None, mode: Measured)
-	/// Storage: Paras PvfActiveVoteList (r:1 w:1)
-	/// Proof Skipped: Paras PvfActiveVoteList (max_values: Some(1), max_size: None, mode: Measured)
-	/// Storage: Configuration ActiveConfig (r:1 w:0)
-	/// Proof Skipped: Configuration ActiveConfig (max_values: Some(1), max_size: None, mode: Measured)
-	/// Storage: ParasShared CurrentSessionIndex (r:1 w:0)
-	/// Proof Skipped: ParasShared CurrentSessionIndex (max_values: Some(1), max_size: None, mode: Measured)
-	/// Storage: Paras ActionsQueue (r:1 w:1)
-	/// Proof Skipped: Paras ActionsQueue (max_values: None, max_size: None, mode: Measured)
-	/// The range of component `c` is `[1, 3145728]`.
-	fn add_trusted_validation_code(c: u32, ) -> Weight {
-		// Proof Size summary in bytes:
-		//  Measured:  `975`
-		//  Estimated: `4440`
-		// Minimum execution time: 102_448_000 picoseconds.
-		Weight::from_parts(101_036_531, 0)
-			.saturating_add(Weight::from_parts(0, 4440))
-			// Standard Error: 4
-			.saturating_add(Weight::from_parts(1_850, 0).saturating_mul(c.into()))
-			.saturating_add(T::DbWeight::get().reads(5))
-			.saturating_add(T::DbWeight::get().writes(3))
-	}
-	/// Storage: Paras CodeByHashRefs (r:1 w:0)
-	/// Proof Skipped: Paras CodeByHashRefs (max_values: None, max_size: None, mode: Measured)
-	/// Storage: Paras CodeByHash (r:0 w:1)
-	/// Proof Skipped: Paras CodeByHash (max_values: None, max_size: None, mode: Measured)
-	fn poke_unused_validation_code() -> Weight {
-		// Proof Size summary in bytes:
-		//  Measured:  `28`
-		//  Estimated: `3493`
-		// Minimum execution time: 6_803_000 picoseconds.
-		Weight::from_parts(7_013_000, 0)
-			.saturating_add(Weight::from_parts(0, 3493))
-			.saturating_add(T::DbWeight::get().reads(1))
-			.saturating_add(T::DbWeight::get().writes(1))
-	}
-	/// Storage: ParasShared ActiveValidatorKeys (r:1 w:0)
-	/// Proof Skipped: ParasShared ActiveValidatorKeys (max_values: Some(1), max_size: None, mode: Measured)
-	/// Storage: ParasShared CurrentSessionIndex (r:1 w:0)
-	/// Proof Skipped: ParasShared CurrentSessionIndex (max_values: Some(1), max_size: None, mode: Measured)
-	/// Storage: Paras PvfActiveVoteMap (r:1 w:1)
-	/// Proof Skipped: Paras PvfActiveVoteMap (max_values: None, max_size: None, mode: Measured)
-	fn include_pvf_check_statement() -> Weight {
-		// Proof Size summary in bytes:
-		//  Measured:  `26682`
-		//  Estimated: `30147`
-		// Minimum execution time: 121_645_000 picoseconds.
-		Weight::from_parts(125_576_000, 0)
-			.saturating_add(Weight::from_parts(0, 30147))
-			.saturating_add(T::DbWeight::get().reads(3))
-			.saturating_add(T::DbWeight::get().writes(1))
-	}
-	/// Storage: ParasShared ActiveValidatorKeys (r:1 w:0)
-	/// Proof Skipped: ParasShared ActiveValidatorKeys (max_values: Some(1), max_size: None, mode: Measured)
-	/// Storage: ParasShared CurrentSessionIndex (r:1 w:0)
-	/// Proof Skipped: ParasShared CurrentSessionIndex (max_values: Some(1), max_size: None, mode: Measured)
-	/// Storage: Paras PvfActiveVoteMap (r:1 w:1)
-	/// Proof Skipped: Paras PvfActiveVoteMap (max_values: None, max_size: None, mode: Measured)
-	/// Storage: Paras PvfActiveVoteList (r:1 w:1)
-	/// Proof Skipped: Paras PvfActiveVoteList (max_values: Some(1), max_size: None, mode: Measured)
-	/// Storage: Configuration ActiveConfig (r:1 w:0)
-	/// Proof Skipped: Configuration ActiveConfig (max_values: Some(1), max_size: None, mode: Measured)
-	/// Storage: Paras UpcomingUpgrades (r:1 w:1)
-	/// Proof Skipped: Paras UpcomingUpgrades (max_values: Some(1), max_size: None, mode: Measured)
-	/// Storage: System Digest (r:1 w:1)
-	/// Proof Skipped: System Digest (max_values: Some(1), max_size: None, mode: Measured)
-	/// Storage: Paras FutureCodeUpgrades (r:0 w:100)
-	/// Proof Skipped: Paras FutureCodeUpgrades (max_values: None, max_size: None, mode: Measured)
-	fn include_pvf_check_statement_finalize_upgrade_accept() -> Weight {
-		// Proof Size summary in bytes:
-		//  Measured:  `27552`
-		//  Estimated: `31017`
-		// Minimum execution time: 956_753_000 picoseconds.
-		Weight::from_parts(978_268_000, 0)
-			.saturating_add(Weight::from_parts(0, 31017))
-			.saturating_add(T::DbWeight::get().reads(7))
-			.saturating_add(T::DbWeight::get().writes(104))
-	}
-	/// Storage: ParasShared ActiveValidatorKeys (r:1 w:0)
-	/// Proof Skipped: ParasShared ActiveValidatorKeys (max_values: Some(1), max_size: None, mode: Measured)
-	/// Storage: ParasShared CurrentSessionIndex (r:1 w:0)
-	/// Proof Skipped: ParasShared CurrentSessionIndex (max_values: Some(1), max_size: None, mode: Measured)
-	/// Storage: Paras PvfActiveVoteMap (r:1 w:1)
-	/// Proof Skipped: Paras PvfActiveVoteMap (max_values: None, max_size: None, mode: Measured)
-	fn include_pvf_check_statement_finalize_upgrade_reject() -> Weight {
-		// Proof Size summary in bytes:
-		//  Measured:  `27214`
-		//  Estimated: `30679`
-		// Minimum execution time: 112_500_000 picoseconds.
-		Weight::from_parts(120_090_000, 0)
-			.saturating_add(Weight::from_parts(0, 30679))
-			.saturating_add(T::DbWeight::get().reads(3))
-			.saturating_add(T::DbWeight::get().writes(1))
-	}
-	/// Storage: ParasShared ActiveValidatorKeys (r:1 w:0)
-	/// Proof Skipped: ParasShared ActiveValidatorKeys (max_values: Some(1), max_size: None, mode: Measured)
-	/// Storage: ParasShared CurrentSessionIndex (r:1 w:0)
-	/// Proof Skipped: ParasShared CurrentSessionIndex (max_values: Some(1), max_size: None, mode: Measured)
-	/// Storage: Paras PvfActiveVoteMap (r:1 w:1)
-	/// Proof Skipped: Paras PvfActiveVoteMap (max_values: None, max_size: None, mode: Measured)
-	/// Storage: Paras PvfActiveVoteList (r:1 w:1)
-	/// Proof Skipped: Paras PvfActiveVoteList (max_values: Some(1), max_size: None, mode: Measured)
-	/// Storage: Configuration ActiveConfig (r:1 w:0)
-	/// Proof Skipped: Configuration ActiveConfig (max_values: Some(1), max_size: None, mode: Measured)
-	/// Storage: Paras ActionsQueue (r:1 w:1)
-	/// Proof Skipped: Paras ActionsQueue (max_values: None, max_size: None, mode: Measured)
-	fn include_pvf_check_statement_finalize_onboarding_accept() -> Weight {
-		// Proof Size summary in bytes:
-		//  Measured:  `27020`
-		//  Estimated: `30485`
-		// Minimum execution time: 760_189_000 picoseconds.
-		Weight::from_parts(776_400_000, 0)
-			.saturating_add(Weight::from_parts(0, 30485))
-			.saturating_add(T::DbWeight::get().reads(6))
-			.saturating_add(T::DbWeight::get().writes(3))
-	}
-	/// Storage: ParasShared ActiveValidatorKeys (r:1 w:0)
-	/// Proof Skipped: ParasShared ActiveValidatorKeys (max_values: Some(1), max_size: None, mode: Measured)
-	/// Storage: ParasShared CurrentSessionIndex (r:1 w:0)
-	/// Proof Skipped: ParasShared CurrentSessionIndex (max_values: Some(1), max_size: None, mode: Measured)
-	/// Storage: Paras PvfActiveVoteMap (r:1 w:1)
-	/// Proof Skipped: Paras PvfActiveVoteMap (max_values: None, max_size: None, mode: Measured)
-	fn include_pvf_check_statement_finalize_onboarding_reject() -> Weight {
-		// Proof Size summary in bytes:
-		//  Measured:  `26682`
-		//  Estimated: `30147`
-		// Minimum execution time: 113_010_000 picoseconds.
-		Weight::from_parts(118_335_000, 0)
-			.saturating_add(Weight::from_parts(0, 30147))
-			.saturating_add(T::DbWeight::get().reads(3))
-			.saturating_add(T::DbWeight::get().writes(1))
-	}
-}
diff --git a/polkadot/runtime/polkadot/src/weights/runtime_parachains_paras_inherent.rs b/polkadot/runtime/polkadot/src/weights/runtime_parachains_paras_inherent.rs
deleted file mode 100644
index 70eb764305e4097ca02805a74b3d78aed98c7f78..0000000000000000000000000000000000000000
--- a/polkadot/runtime/polkadot/src/weights/runtime_parachains_paras_inherent.rs
+++ /dev/null
@@ -1,353 +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/>.
-
-//! Autogenerated weights for `runtime_parachains::paras_inherent`
-//!
-//! THIS FILE WAS AUTO-GENERATED USING THE SUBSTRATE BENCHMARK CLI VERSION 4.0.0-dev
-//! DATE: 2023-06-29, STEPS: `50`, REPEAT: `20`, LOW RANGE: `[]`, HIGH RANGE: `[]`
-//! WORST CASE MAP SIZE: `1000000`
-//! HOSTNAME: `runner-xerhrdyb-project-163-concurrent-0`, CPU: `Intel(R) Xeon(R) CPU @ 2.60GHz`
-//! EXECUTION: Some(Wasm), WASM-EXECUTION: Compiled, CHAIN: Some("polkadot-dev"), DB CACHE: 1024
-
-// Executed Command:
-// target/production/polkadot
-// benchmark
-// pallet
-// --steps=50
-// --repeat=20
-// --extrinsic=*
-// --execution=wasm
-// --wasm-execution=compiled
-// --heap-pages=4096
-// --json-file=/builds/parity/mirrors/polkadot/.git/.artifacts/bench.json
-// --pallet=runtime_parachains::paras_inherent
-// --chain=polkadot-dev
-// --header=./file_header.txt
-// --output=./runtime/polkadot/src/weights/
-
-#![cfg_attr(rustfmt, rustfmt_skip)]
-#![allow(unused_parens)]
-#![allow(unused_imports)]
-#![allow(missing_docs)]
-
-use frame_support::{traits::Get, weights::Weight};
-use core::marker::PhantomData;
-
-/// Weight functions for `runtime_parachains::paras_inherent`.
-pub struct WeightInfo<T>(PhantomData<T>);
-impl<T: frame_system::Config> runtime_parachains::paras_inherent::WeightInfo for WeightInfo<T> {
-	/// Storage: ParaInherent Included (r:1 w:1)
-	/// Proof Skipped: ParaInherent Included (max_values: Some(1), max_size: None, mode: Measured)
-	/// Storage: System ParentHash (r:1 w:0)
-	/// Proof: System ParentHash (max_values: Some(1), max_size: Some(32), added: 527, mode: MaxEncodedLen)
-	/// Storage: ParasShared CurrentSessionIndex (r:1 w:0)
-	/// Proof Skipped: ParasShared CurrentSessionIndex (max_values: Some(1), max_size: None, mode: Measured)
-	/// Storage: ParaScheduler AvailabilityCores (r:1 w:1)
-	/// Proof Skipped: ParaScheduler AvailabilityCores (max_values: Some(1), max_size: None, mode: Measured)
-	/// Storage: ParasShared ActiveValidatorKeys (r:1 w:0)
-	/// Proof Skipped: ParasShared ActiveValidatorKeys (max_values: Some(1), max_size: None, mode: Measured)
-	/// Storage: Babe AuthorVrfRandomness (r:1 w:0)
-	/// Proof: Babe AuthorVrfRandomness (max_values: Some(1), max_size: Some(33), added: 528, mode: MaxEncodedLen)
-	/// Storage: Configuration ActiveConfig (r:1 w:0)
-	/// Proof Skipped: Configuration ActiveConfig (max_values: Some(1), max_size: None, mode: Measured)
-	/// Storage: ParaSessionInfo Sessions (r:1 w:0)
-	/// Proof Skipped: ParaSessionInfo Sessions (max_values: None, max_size: None, mode: Measured)
-	/// Storage: ParasDisputes Disputes (r:1 w:1)
-	/// Proof Skipped: ParasDisputes Disputes (max_values: None, max_size: None, mode: Measured)
-	/// Storage: ParasDisputes BackersOnDisputes (r:1 w:1)
-	/// Proof Skipped: ParasDisputes BackersOnDisputes (max_values: None, max_size: None, mode: Measured)
-	/// Storage: ParasDisputes Included (r:1 w:1)
-	/// Proof Skipped: ParasDisputes Included (max_values: None, max_size: None, mode: Measured)
-	/// Storage: ParaSessionInfo AccountKeys (r:1 w:0)
-	/// Proof Skipped: ParaSessionInfo AccountKeys (max_values: None, max_size: None, mode: Measured)
-	/// Storage: Session Validators (r:1 w:0)
-	/// Proof Skipped: Session Validators (max_values: Some(1), max_size: None, mode: Measured)
-	/// Storage: Staking ActiveEra (r:1 w:0)
-	/// Proof: Staking ActiveEra (max_values: Some(1), max_size: Some(13), added: 508, mode: MaxEncodedLen)
-	/// Storage: Staking ErasRewardPoints (r:1 w:1)
-	/// Proof Skipped: Staking ErasRewardPoints (max_values: None, max_size: None, mode: Measured)
-	/// Storage: ParaInherent OnChainVotes (r:1 w:1)
-	/// Proof Skipped: ParaInherent OnChainVotes (max_values: Some(1), max_size: None, mode: Measured)
-	/// Storage: ParasDisputes Frozen (r:1 w:0)
-	/// Proof Skipped: ParasDisputes Frozen (max_values: Some(1), max_size: None, mode: Measured)
-	/// Storage: ParaInclusion PendingAvailability (r:2 w:1)
-	/// Proof Skipped: ParaInclusion PendingAvailability (max_values: None, max_size: None, mode: Measured)
-	/// Storage: Paras Parachains (r:1 w:0)
-	/// Proof Skipped: Paras Parachains (max_values: Some(1), max_size: None, mode: Measured)
-	/// Storage: ParaInclusion PendingAvailabilityCommitments (r:1 w:1)
-	/// Proof Skipped: ParaInclusion PendingAvailabilityCommitments (max_values: None, max_size: None, mode: Measured)
-	/// Storage: Dmp DownwardMessageQueues (r:1 w:1)
-	/// Proof Skipped: Dmp DownwardMessageQueues (max_values: None, max_size: None, mode: Measured)
-	/// Storage: Dmp DeliveryFeeFactor (r:1 w:1)
-	/// Proof Skipped: Dmp DeliveryFeeFactor (max_values: None, max_size: None, mode: Measured)
-	/// Storage: Hrmp HrmpChannelDigests (r:1 w:1)
-	/// Proof Skipped: Hrmp HrmpChannelDigests (max_values: None, max_size: None, mode: Measured)
-	/// Storage: Paras FutureCodeUpgrades (r:1 w:0)
-	/// Proof Skipped: Paras FutureCodeUpgrades (max_values: None, max_size: None, mode: Measured)
-	/// Storage: ParaScheduler SessionStartBlock (r:1 w:0)
-	/// Proof Skipped: ParaScheduler SessionStartBlock (max_values: Some(1), max_size: None, mode: Measured)
-	/// Storage: ParaScheduler ParathreadQueue (r:1 w:1)
-	/// Proof Skipped: ParaScheduler ParathreadQueue (max_values: Some(1), max_size: None, mode: Measured)
-	/// Storage: ParaScheduler Scheduled (r:1 w:1)
-	/// Proof Skipped: ParaScheduler Scheduled (max_values: Some(1), max_size: None, mode: Measured)
-	/// Storage: ParaScheduler ValidatorGroups (r:1 w:0)
-	/// Proof Skipped: ParaScheduler ValidatorGroups (max_values: Some(1), max_size: None, mode: Measured)
-	/// Storage: Hrmp HrmpWatermarks (r:0 w:1)
-	/// Proof Skipped: Hrmp HrmpWatermarks (max_values: None, max_size: None, mode: Measured)
-	/// Storage: Paras Heads (r:0 w:1)
-	/// Proof Skipped: Paras Heads (max_values: None, max_size: None, mode: Measured)
-	/// Storage: Paras UpgradeGoAheadSignal (r:0 w:1)
-	/// Proof Skipped: Paras UpgradeGoAheadSignal (max_values: None, max_size: None, mode: Measured)
-	/// The range of component `v` is `[10, 200]`.
-	fn enter_variable_disputes(v: u32, ) -> Weight {
-		// Proof Size summary in bytes:
-		//  Measured:  `50915`
-		//  Estimated: `56855 + v * (23 ±0)`
-		// Minimum execution time: 999_704_000 picoseconds.
-		Weight::from_parts(455_751_887, 0)
-			.saturating_add(Weight::from_parts(0, 56855))
-			// Standard Error: 14_301
-			.saturating_add(Weight::from_parts(57_084_663, 0).saturating_mul(v.into()))
-			.saturating_add(T::DbWeight::get().reads(28))
-			.saturating_add(T::DbWeight::get().writes(15))
-			.saturating_add(Weight::from_parts(0, 23).saturating_mul(v.into()))
-	}
-	/// Storage: ParaInherent Included (r:1 w:1)
-	/// Proof Skipped: ParaInherent Included (max_values: Some(1), max_size: None, mode: Measured)
-	/// Storage: System ParentHash (r:1 w:0)
-	/// Proof: System ParentHash (max_values: Some(1), max_size: Some(32), added: 527, mode: MaxEncodedLen)
-	/// Storage: ParasShared CurrentSessionIndex (r:1 w:0)
-	/// Proof Skipped: ParasShared CurrentSessionIndex (max_values: Some(1), max_size: None, mode: Measured)
-	/// Storage: ParaScheduler AvailabilityCores (r:1 w:1)
-	/// Proof Skipped: ParaScheduler AvailabilityCores (max_values: Some(1), max_size: None, mode: Measured)
-	/// Storage: ParasShared ActiveValidatorKeys (r:1 w:0)
-	/// Proof Skipped: ParasShared ActiveValidatorKeys (max_values: Some(1), max_size: None, mode: Measured)
-	/// Storage: Babe AuthorVrfRandomness (r:1 w:0)
-	/// Proof: Babe AuthorVrfRandomness (max_values: Some(1), max_size: Some(33), added: 528, mode: MaxEncodedLen)
-	/// Storage: Configuration ActiveConfig (r:1 w:0)
-	/// Proof Skipped: Configuration ActiveConfig (max_values: Some(1), max_size: None, mode: Measured)
-	/// Storage: ParaInherent OnChainVotes (r:1 w:1)
-	/// Proof Skipped: ParaInherent OnChainVotes (max_values: Some(1), max_size: None, mode: Measured)
-	/// Storage: ParasDisputes Frozen (r:1 w:0)
-	/// Proof Skipped: ParasDisputes Frozen (max_values: Some(1), max_size: None, mode: Measured)
-	/// Storage: ParaInclusion PendingAvailability (r:2 w:1)
-	/// Proof Skipped: ParaInclusion PendingAvailability (max_values: None, max_size: None, mode: Measured)
-	/// Storage: Paras Parachains (r:1 w:0)
-	/// Proof Skipped: Paras Parachains (max_values: Some(1), max_size: None, mode: Measured)
-	/// Storage: ParaInclusion PendingAvailabilityCommitments (r:1 w:1)
-	/// Proof Skipped: ParaInclusion PendingAvailabilityCommitments (max_values: None, max_size: None, mode: Measured)
-	/// Storage: ParaSessionInfo AccountKeys (r:1 w:0)
-	/// Proof Skipped: ParaSessionInfo AccountKeys (max_values: None, max_size: None, mode: Measured)
-	/// Storage: Session Validators (r:1 w:0)
-	/// Proof Skipped: Session Validators (max_values: Some(1), max_size: None, mode: Measured)
-	/// Storage: Staking ActiveEra (r:1 w:0)
-	/// Proof: Staking ActiveEra (max_values: Some(1), max_size: Some(13), added: 508, mode: MaxEncodedLen)
-	/// Storage: Staking ErasRewardPoints (r:1 w:1)
-	/// Proof Skipped: Staking ErasRewardPoints (max_values: None, max_size: None, mode: Measured)
-	/// Storage: Dmp DownwardMessageQueues (r:1 w:1)
-	/// Proof Skipped: Dmp DownwardMessageQueues (max_values: None, max_size: None, mode: Measured)
-	/// Storage: Dmp DeliveryFeeFactor (r:1 w:1)
-	/// Proof Skipped: Dmp DeliveryFeeFactor (max_values: None, max_size: None, mode: Measured)
-	/// Storage: Hrmp HrmpChannelDigests (r:1 w:1)
-	/// Proof Skipped: Hrmp HrmpChannelDigests (max_values: None, max_size: None, mode: Measured)
-	/// Storage: Paras FutureCodeUpgrades (r:1 w:0)
-	/// Proof Skipped: Paras FutureCodeUpgrades (max_values: None, max_size: None, mode: Measured)
-	/// Storage: ParasDisputes Disputes (r:1 w:0)
-	/// Proof Skipped: ParasDisputes Disputes (max_values: None, max_size: None, mode: Measured)
-	/// Storage: ParaScheduler SessionStartBlock (r:1 w:0)
-	/// Proof Skipped: ParaScheduler SessionStartBlock (max_values: Some(1), max_size: None, mode: Measured)
-	/// Storage: ParaScheduler ParathreadQueue (r:1 w:1)
-	/// Proof Skipped: ParaScheduler ParathreadQueue (max_values: Some(1), max_size: None, mode: Measured)
-	/// Storage: ParaScheduler Scheduled (r:1 w:1)
-	/// Proof Skipped: ParaScheduler Scheduled (max_values: Some(1), max_size: None, mode: Measured)
-	/// Storage: ParaScheduler ValidatorGroups (r:1 w:0)
-	/// Proof Skipped: ParaScheduler ValidatorGroups (max_values: Some(1), max_size: None, mode: Measured)
-	/// Storage: ParaInclusion AvailabilityBitfields (r:0 w:1)
-	/// Proof Skipped: ParaInclusion AvailabilityBitfields (max_values: None, max_size: None, mode: Measured)
-	/// Storage: ParasDisputes Included (r:0 w:1)
-	/// Proof Skipped: ParasDisputes Included (max_values: None, max_size: None, mode: Measured)
-	/// Storage: Hrmp HrmpWatermarks (r:0 w:1)
-	/// Proof Skipped: Hrmp HrmpWatermarks (max_values: None, max_size: None, mode: Measured)
-	/// Storage: Paras Heads (r:0 w:1)
-	/// Proof Skipped: Paras Heads (max_values: None, max_size: None, mode: Measured)
-	/// Storage: Paras UpgradeGoAheadSignal (r:0 w:1)
-	/// Proof Skipped: Paras UpgradeGoAheadSignal (max_values: None, max_size: None, mode: Measured)
-	fn enter_bitfields() -> Weight {
-		// Proof Size summary in bytes:
-		//  Measured:  `42748`
-		//  Estimated: `48688`
-		// Minimum execution time: 485_153_000 picoseconds.
-		Weight::from_parts(504_774_000, 0)
-			.saturating_add(Weight::from_parts(0, 48688))
-			.saturating_add(T::DbWeight::get().reads(26))
-			.saturating_add(T::DbWeight::get().writes(16))
-	}
-	/// Storage: ParaInherent Included (r:1 w:1)
-	/// Proof Skipped: ParaInherent Included (max_values: Some(1), max_size: None, mode: Measured)
-	/// Storage: System ParentHash (r:1 w:0)
-	/// Proof: System ParentHash (max_values: Some(1), max_size: Some(32), added: 527, mode: MaxEncodedLen)
-	/// Storage: ParasShared CurrentSessionIndex (r:1 w:0)
-	/// Proof Skipped: ParasShared CurrentSessionIndex (max_values: Some(1), max_size: None, mode: Measured)
-	/// Storage: ParaScheduler AvailabilityCores (r:1 w:1)
-	/// Proof Skipped: ParaScheduler AvailabilityCores (max_values: Some(1), max_size: None, mode: Measured)
-	/// Storage: ParasShared ActiveValidatorKeys (r:1 w:0)
-	/// Proof Skipped: ParasShared ActiveValidatorKeys (max_values: Some(1), max_size: None, mode: Measured)
-	/// Storage: Babe AuthorVrfRandomness (r:1 w:0)
-	/// Proof: Babe AuthorVrfRandomness (max_values: Some(1), max_size: Some(33), added: 528, mode: MaxEncodedLen)
-	/// Storage: Configuration ActiveConfig (r:1 w:0)
-	/// Proof Skipped: Configuration ActiveConfig (max_values: Some(1), max_size: None, mode: Measured)
-	/// Storage: ParaInherent OnChainVotes (r:1 w:1)
-	/// Proof Skipped: ParaInherent OnChainVotes (max_values: Some(1), max_size: None, mode: Measured)
-	/// Storage: ParasDisputes Frozen (r:1 w:0)
-	/// Proof Skipped: ParasDisputes Frozen (max_values: Some(1), max_size: None, mode: Measured)
-	/// Storage: ParaInclusion PendingAvailability (r:2 w:1)
-	/// Proof Skipped: ParaInclusion PendingAvailability (max_values: None, max_size: None, mode: Measured)
-	/// Storage: Paras Parachains (r:1 w:0)
-	/// Proof Skipped: Paras Parachains (max_values: Some(1), max_size: None, mode: Measured)
-	/// Storage: ParaInclusion PendingAvailabilityCommitments (r:1 w:1)
-	/// Proof Skipped: ParaInclusion PendingAvailabilityCommitments (max_values: None, max_size: None, mode: Measured)
-	/// Storage: ParaSessionInfo AccountKeys (r:1 w:0)
-	/// Proof Skipped: ParaSessionInfo AccountKeys (max_values: None, max_size: None, mode: Measured)
-	/// Storage: Session Validators (r:1 w:0)
-	/// Proof Skipped: Session Validators (max_values: Some(1), max_size: None, mode: Measured)
-	/// Storage: Staking ActiveEra (r:1 w:0)
-	/// Proof: Staking ActiveEra (max_values: Some(1), max_size: Some(13), added: 508, mode: MaxEncodedLen)
-	/// Storage: Staking ErasRewardPoints (r:1 w:1)
-	/// Proof Skipped: Staking ErasRewardPoints (max_values: None, max_size: None, mode: Measured)
-	/// Storage: Dmp DownwardMessageQueues (r:1 w:1)
-	/// Proof Skipped: Dmp DownwardMessageQueues (max_values: None, max_size: None, mode: Measured)
-	/// Storage: Dmp DeliveryFeeFactor (r:1 w:1)
-	/// Proof Skipped: Dmp DeliveryFeeFactor (max_values: None, max_size: None, mode: Measured)
-	/// Storage: Hrmp HrmpChannelDigests (r:1 w:1)
-	/// Proof Skipped: Hrmp HrmpChannelDigests (max_values: None, max_size: None, mode: Measured)
-	/// Storage: Paras FutureCodeUpgrades (r:1 w:0)
-	/// Proof Skipped: Paras FutureCodeUpgrades (max_values: None, max_size: None, mode: Measured)
-	/// Storage: ParasDisputes Disputes (r:1 w:0)
-	/// Proof Skipped: ParasDisputes Disputes (max_values: None, max_size: None, mode: Measured)
-	/// Storage: ParaScheduler SessionStartBlock (r:1 w:0)
-	/// Proof Skipped: ParaScheduler SessionStartBlock (max_values: Some(1), max_size: None, mode: Measured)
-	/// Storage: ParaScheduler ParathreadQueue (r:1 w:1)
-	/// Proof Skipped: ParaScheduler ParathreadQueue (max_values: Some(1), max_size: None, mode: Measured)
-	/// Storage: ParaScheduler Scheduled (r:1 w:1)
-	/// Proof Skipped: ParaScheduler Scheduled (max_values: Some(1), max_size: None, mode: Measured)
-	/// Storage: ParaScheduler ValidatorGroups (r:1 w:0)
-	/// Proof Skipped: ParaScheduler ValidatorGroups (max_values: Some(1), max_size: None, mode: Measured)
-	/// Storage: Paras CurrentCodeHash (r:1 w:0)
-	/// Proof Skipped: Paras CurrentCodeHash (max_values: None, max_size: None, mode: Measured)
-	/// Storage: Paras ParaLifecycles (r:1 w:0)
-	/// Proof Skipped: Paras ParaLifecycles (max_values: None, max_size: None, mode: Measured)
-	/// Storage: MessageQueue BookStateFor (r:1 w:0)
-	/// Proof: MessageQueue BookStateFor (max_values: None, max_size: Some(55), added: 2530, mode: MaxEncodedLen)
-	/// Storage: ParasDisputes Included (r:0 w:1)
-	/// Proof Skipped: ParasDisputes Included (max_values: None, max_size: None, mode: Measured)
-	/// Storage: Hrmp HrmpWatermarks (r:0 w:1)
-	/// Proof Skipped: Hrmp HrmpWatermarks (max_values: None, max_size: None, mode: Measured)
-	/// Storage: Paras Heads (r:0 w:1)
-	/// Proof Skipped: Paras Heads (max_values: None, max_size: None, mode: Measured)
-	/// Storage: Paras UpgradeGoAheadSignal (r:0 w:1)
-	/// Proof Skipped: Paras UpgradeGoAheadSignal (max_values: None, max_size: None, mode: Measured)
-	/// The range of component `v` is `[101, 200]`.
-	fn enter_backed_candidates_variable(v: u32, ) -> Weight {
-		// Proof Size summary in bytes:
-		//  Measured:  `42784`
-		//  Estimated: `48724`
-		// Minimum execution time: 6_906_795_000 picoseconds.
-		Weight::from_parts(1_315_944_667, 0)
-			.saturating_add(Weight::from_parts(0, 48724))
-			// Standard Error: 31_132
-			.saturating_add(Weight::from_parts(55_792_755, 0).saturating_mul(v.into()))
-			.saturating_add(T::DbWeight::get().reads(29))
-			.saturating_add(T::DbWeight::get().writes(15))
-	}
-	/// Storage: ParaInherent Included (r:1 w:1)
-	/// Proof Skipped: ParaInherent Included (max_values: Some(1), max_size: None, mode: Measured)
-	/// Storage: System ParentHash (r:1 w:0)
-	/// Proof: System ParentHash (max_values: Some(1), max_size: Some(32), added: 527, mode: MaxEncodedLen)
-	/// Storage: ParasShared CurrentSessionIndex (r:1 w:0)
-	/// Proof Skipped: ParasShared CurrentSessionIndex (max_values: Some(1), max_size: None, mode: Measured)
-	/// Storage: ParaScheduler AvailabilityCores (r:1 w:1)
-	/// Proof Skipped: ParaScheduler AvailabilityCores (max_values: Some(1), max_size: None, mode: Measured)
-	/// Storage: ParasShared ActiveValidatorKeys (r:1 w:0)
-	/// Proof Skipped: ParasShared ActiveValidatorKeys (max_values: Some(1), max_size: None, mode: Measured)
-	/// Storage: Babe AuthorVrfRandomness (r:1 w:0)
-	/// Proof: Babe AuthorVrfRandomness (max_values: Some(1), max_size: Some(33), added: 528, mode: MaxEncodedLen)
-	/// Storage: Configuration ActiveConfig (r:1 w:0)
-	/// Proof Skipped: Configuration ActiveConfig (max_values: Some(1), max_size: None, mode: Measured)
-	/// Storage: ParaInherent OnChainVotes (r:1 w:1)
-	/// Proof Skipped: ParaInherent OnChainVotes (max_values: Some(1), max_size: None, mode: Measured)
-	/// Storage: ParasDisputes Frozen (r:1 w:0)
-	/// Proof Skipped: ParasDisputes Frozen (max_values: Some(1), max_size: None, mode: Measured)
-	/// Storage: ParaInclusion PendingAvailability (r:2 w:1)
-	/// Proof Skipped: ParaInclusion PendingAvailability (max_values: None, max_size: None, mode: Measured)
-	/// Storage: Paras Parachains (r:1 w:0)
-	/// Proof Skipped: Paras Parachains (max_values: Some(1), max_size: None, mode: Measured)
-	/// Storage: ParaInclusion PendingAvailabilityCommitments (r:1 w:1)
-	/// Proof Skipped: ParaInclusion PendingAvailabilityCommitments (max_values: None, max_size: None, mode: Measured)
-	/// Storage: ParaSessionInfo AccountKeys (r:1 w:0)
-	/// Proof Skipped: ParaSessionInfo AccountKeys (max_values: None, max_size: None, mode: Measured)
-	/// Storage: Session Validators (r:1 w:0)
-	/// Proof Skipped: Session Validators (max_values: Some(1), max_size: None, mode: Measured)
-	/// Storage: Staking ActiveEra (r:1 w:0)
-	/// Proof: Staking ActiveEra (max_values: Some(1), max_size: Some(13), added: 508, mode: MaxEncodedLen)
-	/// Storage: Staking ErasRewardPoints (r:1 w:1)
-	/// Proof Skipped: Staking ErasRewardPoints (max_values: None, max_size: None, mode: Measured)
-	/// Storage: Dmp DownwardMessageQueues (r:1 w:1)
-	/// Proof Skipped: Dmp DownwardMessageQueues (max_values: None, max_size: None, mode: Measured)
-	/// Storage: Dmp DeliveryFeeFactor (r:1 w:1)
-	/// Proof Skipped: Dmp DeliveryFeeFactor (max_values: None, max_size: None, mode: Measured)
-	/// Storage: Hrmp HrmpChannelDigests (r:1 w:1)
-	/// Proof Skipped: Hrmp HrmpChannelDigests (max_values: None, max_size: None, mode: Measured)
-	/// Storage: Paras FutureCodeUpgrades (r:1 w:0)
-	/// Proof Skipped: Paras FutureCodeUpgrades (max_values: None, max_size: None, mode: Measured)
-	/// Storage: ParasDisputes Disputes (r:1 w:0)
-	/// Proof Skipped: ParasDisputes Disputes (max_values: None, max_size: None, mode: Measured)
-	/// Storage: ParaScheduler SessionStartBlock (r:1 w:0)
-	/// Proof Skipped: ParaScheduler SessionStartBlock (max_values: Some(1), max_size: None, mode: Measured)
-	/// Storage: ParaScheduler ParathreadQueue (r:1 w:1)
-	/// Proof Skipped: ParaScheduler ParathreadQueue (max_values: Some(1), max_size: None, mode: Measured)
-	/// Storage: ParaScheduler Scheduled (r:1 w:1)
-	/// Proof Skipped: ParaScheduler Scheduled (max_values: Some(1), max_size: None, mode: Measured)
-	/// Storage: ParaScheduler ValidatorGroups (r:1 w:0)
-	/// Proof Skipped: ParaScheduler ValidatorGroups (max_values: Some(1), max_size: None, mode: Measured)
-	/// Storage: Paras CurrentCodeHash (r:1 w:0)
-	/// Proof Skipped: Paras CurrentCodeHash (max_values: None, max_size: None, mode: Measured)
-	/// Storage: Paras FutureCodeHash (r:1 w:0)
-	/// Proof Skipped: Paras FutureCodeHash (max_values: None, max_size: None, mode: Measured)
-	/// Storage: Paras UpgradeRestrictionSignal (r:1 w:0)
-	/// Proof Skipped: Paras UpgradeRestrictionSignal (max_values: None, max_size: None, mode: Measured)
-	/// Storage: Paras ParaLifecycles (r:1 w:0)
-	/// Proof Skipped: Paras ParaLifecycles (max_values: None, max_size: None, mode: Measured)
-	/// Storage: MessageQueue BookStateFor (r:1 w:0)
-	/// Proof: MessageQueue BookStateFor (max_values: None, max_size: Some(55), added: 2530, mode: MaxEncodedLen)
-	/// Storage: ParasDisputes Included (r:0 w:1)
-	/// Proof Skipped: ParasDisputes Included (max_values: None, max_size: None, mode: Measured)
-	/// Storage: Hrmp HrmpWatermarks (r:0 w:1)
-	/// Proof Skipped: Hrmp HrmpWatermarks (max_values: None, max_size: None, mode: Measured)
-	/// Storage: Paras Heads (r:0 w:1)
-	/// Proof Skipped: Paras Heads (max_values: None, max_size: None, mode: Measured)
-	/// Storage: Paras UpgradeGoAheadSignal (r:0 w:1)
-	/// Proof Skipped: Paras UpgradeGoAheadSignal (max_values: None, max_size: None, mode: Measured)
-	fn enter_backed_candidate_code_upgrade() -> Weight {
-		// Proof Size summary in bytes:
-		//  Measured:  `42811`
-		//  Estimated: `48751`
-		// Minimum execution time: 44_487_810_000 picoseconds.
-		Weight::from_parts(46_317_208_000, 0)
-			.saturating_add(Weight::from_parts(0, 48751))
-			.saturating_add(T::DbWeight::get().reads(31))
-			.saturating_add(T::DbWeight::get().writes(15))
-	}
-}
diff --git a/polkadot/runtime/polkadot/src/weights/xcm/mod.rs b/polkadot/runtime/polkadot/src/weights/xcm/mod.rs
deleted file mode 100644
index acef102b446f13835e04fd66fc64e778f4b28a52..0000000000000000000000000000000000000000
--- a/polkadot/runtime/polkadot/src/weights/xcm/mod.rs
+++ /dev/null
@@ -1,290 +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/>.
-
-mod pallet_xcm_benchmarks_fungible;
-mod pallet_xcm_benchmarks_generic;
-
-use crate::Runtime;
-use frame_support::weights::Weight;
-use sp_std::prelude::*;
-use xcm::{latest::prelude::*, DoubleEncoded};
-
-use pallet_xcm_benchmarks_fungible::WeightInfo as XcmBalancesWeight;
-use pallet_xcm_benchmarks_generic::WeightInfo as XcmGeneric;
-
-/// Types of asset supported by the Polkadot runtime.
-pub enum AssetTypes {
-	/// An asset backed by `pallet-balances`.
-	Balances,
-	/// Unknown asset.
-	Unknown,
-}
-
-impl From<&MultiAsset> for AssetTypes {
-	fn from(asset: &MultiAsset) -> Self {
-		match asset {
-			MultiAsset { id: Concrete(MultiLocation { parents: 0, interior: Here }), .. } =>
-				AssetTypes::Balances,
-			_ => AssetTypes::Unknown,
-		}
-	}
-}
-
-trait WeighMultiAssets {
-	fn weigh_multi_assets(&self, balances_weight: Weight) -> Weight;
-}
-
-// Polkadot only knows about one asset, the balances pallet.
-const MAX_ASSETS: u64 = 1;
-
-impl WeighMultiAssets for MultiAssetFilter {
-	fn weigh_multi_assets(&self, balances_weight: Weight) -> Weight {
-		match self {
-			Self::Definite(assets) => assets
-				.inner()
-				.into_iter()
-				.map(From::from)
-				.map(|t| match t {
-					AssetTypes::Balances => balances_weight,
-					AssetTypes::Unknown => Weight::MAX,
-				})
-				.fold(Weight::zero(), |acc, x| acc.saturating_add(x)),
-			// We don't support any NFTs on Polkadot, so these two variants will always match
-			// only 1 kind of fungible asset.
-			Self::Wild(AllOf { .. } | AllOfCounted { .. }) => balances_weight,
-			Self::Wild(AllCounted(count)) =>
-				balances_weight.saturating_mul(MAX_ASSETS.min(*count as u64)),
-			Self::Wild(All) => balances_weight.saturating_mul(MAX_ASSETS),
-		}
-	}
-}
-
-impl WeighMultiAssets for MultiAssets {
-	fn weigh_multi_assets(&self, balances_weight: Weight) -> Weight {
-		self.inner()
-			.into_iter()
-			.map(|m| <AssetTypes as From<&MultiAsset>>::from(m))
-			.map(|t| match t {
-				AssetTypes::Balances => balances_weight,
-				AssetTypes::Unknown => Weight::MAX,
-			})
-			.fold(Weight::zero(), |acc, x| acc.saturating_add(x))
-	}
-}
-
-pub struct PolkadotXcmWeight<RuntimeCall>(core::marker::PhantomData<RuntimeCall>);
-impl<RuntimeCall> XcmWeightInfo<RuntimeCall> for PolkadotXcmWeight<RuntimeCall> {
-	fn withdraw_asset(assets: &MultiAssets) -> Weight {
-		assets.weigh_multi_assets(XcmBalancesWeight::<Runtime>::withdraw_asset())
-	}
-	fn reserve_asset_deposited(assets: &MultiAssets) -> Weight {
-		// Polkadot doesn't support ReserveAssetDeposited, so this benchmark has a default weight
-		assets.weigh_multi_assets(XcmBalancesWeight::<Runtime>::reserve_asset_deposited())
-	}
-	fn receive_teleported_asset(assets: &MultiAssets) -> Weight {
-		assets.weigh_multi_assets(XcmBalancesWeight::<Runtime>::receive_teleported_asset())
-	}
-	fn query_response(
-		_query_id: &u64,
-		_response: &Response,
-		_max_weight: &Weight,
-		_querier: &Option<MultiLocation>,
-	) -> Weight {
-		XcmGeneric::<Runtime>::query_response()
-	}
-	fn transfer_asset(assets: &MultiAssets, _dest: &MultiLocation) -> Weight {
-		assets.weigh_multi_assets(XcmBalancesWeight::<Runtime>::transfer_asset())
-	}
-	fn transfer_reserve_asset(
-		assets: &MultiAssets,
-		_dest: &MultiLocation,
-		_xcm: &Xcm<()>,
-	) -> Weight {
-		assets.weigh_multi_assets(XcmBalancesWeight::<Runtime>::transfer_reserve_asset())
-	}
-	fn transact(
-		_origin_kind: &OriginKind,
-		_require_weight_at_most: &Weight,
-		_call: &DoubleEncoded<RuntimeCall>,
-	) -> Weight {
-		XcmGeneric::<Runtime>::transact()
-	}
-	fn hrmp_new_channel_open_request(
-		_sender: &u32,
-		_max_message_size: &u32,
-		_max_capacity: &u32,
-	) -> Weight {
-		// XCM Executor does not currently support HRMP channel operations
-		Weight::MAX
-	}
-	fn hrmp_channel_accepted(_recipient: &u32) -> Weight {
-		// XCM Executor does not currently support HRMP channel operations
-		Weight::MAX
-	}
-	fn hrmp_channel_closing(_initiator: &u32, _sender: &u32, _recipient: &u32) -> Weight {
-		// XCM Executor does not currently support HRMP channel operations
-		Weight::MAX
-	}
-	fn clear_origin() -> Weight {
-		XcmGeneric::<Runtime>::clear_origin()
-	}
-	fn descend_origin(_who: &InteriorMultiLocation) -> Weight {
-		XcmGeneric::<Runtime>::descend_origin()
-	}
-	fn report_error(_query_response_info: &QueryResponseInfo) -> Weight {
-		XcmGeneric::<Runtime>::report_error()
-	}
-
-	fn deposit_asset(assets: &MultiAssetFilter, _dest: &MultiLocation) -> Weight {
-		assets.weigh_multi_assets(XcmBalancesWeight::<Runtime>::deposit_asset())
-	}
-	fn deposit_reserve_asset(
-		assets: &MultiAssetFilter,
-		_dest: &MultiLocation,
-		_xcm: &Xcm<()>,
-	) -> Weight {
-		assets.weigh_multi_assets(XcmBalancesWeight::<Runtime>::deposit_reserve_asset())
-	}
-	fn exchange_asset(_give: &MultiAssetFilter, _receive: &MultiAssets, _maximal: &bool) -> Weight {
-		// Polkadot does not currently support exchange asset operations
-		Weight::MAX
-	}
-	fn initiate_reserve_withdraw(
-		assets: &MultiAssetFilter,
-		_reserve: &MultiLocation,
-		_xcm: &Xcm<()>,
-	) -> Weight {
-		assets.weigh_multi_assets(XcmBalancesWeight::<Runtime>::initiate_reserve_withdraw())
-	}
-	fn initiate_teleport(
-		assets: &MultiAssetFilter,
-		_dest: &MultiLocation,
-		_xcm: &Xcm<()>,
-	) -> Weight {
-		assets.weigh_multi_assets(XcmBalancesWeight::<Runtime>::initiate_teleport())
-	}
-	fn report_holding(_response_info: &QueryResponseInfo, _assets: &MultiAssetFilter) -> Weight {
-		XcmGeneric::<Runtime>::report_holding()
-	}
-	fn buy_execution(_fees: &MultiAsset, _weight_limit: &WeightLimit) -> Weight {
-		XcmGeneric::<Runtime>::buy_execution()
-	}
-	fn refund_surplus() -> Weight {
-		XcmGeneric::<Runtime>::refund_surplus()
-	}
-	fn set_error_handler(_xcm: &Xcm<RuntimeCall>) -> Weight {
-		XcmGeneric::<Runtime>::set_error_handler()
-	}
-	fn set_appendix(_xcm: &Xcm<RuntimeCall>) -> Weight {
-		XcmGeneric::<Runtime>::set_appendix()
-	}
-	fn clear_error() -> Weight {
-		XcmGeneric::<Runtime>::clear_error()
-	}
-	fn claim_asset(_assets: &MultiAssets, _ticket: &MultiLocation) -> Weight {
-		XcmGeneric::<Runtime>::claim_asset()
-	}
-	fn trap(_code: &u64) -> Weight {
-		XcmGeneric::<Runtime>::trap()
-	}
-	fn subscribe_version(_query_id: &QueryId, _max_response_weight: &Weight) -> Weight {
-		XcmGeneric::<Runtime>::subscribe_version()
-	}
-	fn unsubscribe_version() -> Weight {
-		XcmGeneric::<Runtime>::unsubscribe_version()
-	}
-	fn burn_asset(assets: &MultiAssets) -> Weight {
-		assets.weigh_multi_assets(XcmGeneric::<Runtime>::burn_asset())
-	}
-	fn expect_asset(assets: &MultiAssets) -> Weight {
-		assets.weigh_multi_assets(XcmGeneric::<Runtime>::expect_asset())
-	}
-	fn expect_origin(_origin: &Option<MultiLocation>) -> Weight {
-		XcmGeneric::<Runtime>::expect_origin()
-	}
-	fn expect_error(_error: &Option<(u32, XcmError)>) -> Weight {
-		XcmGeneric::<Runtime>::expect_error()
-	}
-	fn expect_transact_status(_transact_status: &MaybeErrorCode) -> Weight {
-		XcmGeneric::<Runtime>::expect_transact_status()
-	}
-	fn query_pallet(_module_name: &Vec<u8>, _response_info: &QueryResponseInfo) -> Weight {
-		XcmGeneric::<Runtime>::query_pallet()
-	}
-	fn expect_pallet(
-		_index: &u32,
-		_name: &Vec<u8>,
-		_module_name: &Vec<u8>,
-		_crate_major: &u32,
-		_min_crate_minor: &u32,
-	) -> Weight {
-		XcmGeneric::<Runtime>::expect_pallet()
-	}
-	fn report_transact_status(_response_info: &QueryResponseInfo) -> Weight {
-		XcmGeneric::<Runtime>::report_transact_status()
-	}
-	fn clear_transact_status() -> Weight {
-		XcmGeneric::<Runtime>::clear_transact_status()
-	}
-	fn universal_origin(_: &Junction) -> Weight {
-		// Polkadot does not currently support universal origin operations
-		Weight::MAX
-	}
-	fn export_message(_: &NetworkId, _: &Junctions, _: &Xcm<()>) -> Weight {
-		// Polkadot relay should not support export message operations
-		Weight::MAX
-	}
-	fn lock_asset(_: &MultiAsset, _: &MultiLocation) -> Weight {
-		// Polkadot does not currently support asset locking operations
-		Weight::MAX
-	}
-	fn unlock_asset(_: &MultiAsset, _: &MultiLocation) -> Weight {
-		// Polkadot does not currently support asset locking operations
-		Weight::MAX
-	}
-	fn note_unlockable(_: &MultiAsset, _: &MultiLocation) -> Weight {
-		// Polkadot does not currently support asset locking operations
-		Weight::MAX
-	}
-	fn request_unlock(_: &MultiAsset, _: &MultiLocation) -> Weight {
-		// Polkadot does not currently support asset locking operations
-		Weight::MAX
-	}
-	fn set_fees_mode(_: &bool) -> Weight {
-		XcmGeneric::<Runtime>::set_fees_mode()
-	}
-	fn set_topic(_topic: &[u8; 32]) -> Weight {
-		XcmGeneric::<Runtime>::set_topic()
-	}
-	fn clear_topic() -> Weight {
-		XcmGeneric::<Runtime>::clear_topic()
-	}
-	fn alias_origin(_: &MultiLocation) -> Weight {
-		// XCM Executor does not currently support alias origin operations
-		Weight::MAX
-	}
-	fn unpaid_execution(_: &WeightLimit, _: &Option<MultiLocation>) -> Weight {
-		XcmGeneric::<Runtime>::unpaid_execution()
-	}
-}
-
-#[test]
-fn all_counted_has_a_sane_weight_upper_limit() {
-	let assets = MultiAssetFilter::Wild(AllCounted(4294967295));
-	let weight = Weight::from_parts(1000, 1000);
-
-	assert_eq!(assets.weigh_multi_assets(weight), weight * MAX_ASSETS);
-}
diff --git a/polkadot/runtime/polkadot/src/weights/xcm/pallet_xcm_benchmarks_fungible.rs b/polkadot/runtime/polkadot/src/weights/xcm/pallet_xcm_benchmarks_fungible.rs
deleted file mode 100644
index 038e9f17361b0637755662337b2139c2e1bcc10d..0000000000000000000000000000000000000000
--- a/polkadot/runtime/polkadot/src/weights/xcm/pallet_xcm_benchmarks_fungible.rs
+++ /dev/null
@@ -1,208 +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/>.
-
-//! Autogenerated weights for `pallet_xcm_benchmarks::fungible`
-//!
-//! THIS FILE WAS AUTO-GENERATED USING THE SUBSTRATE BENCHMARK CLI VERSION 4.0.0-dev
-//! DATE: 2023-06-23, STEPS: `50`, REPEAT: `20`, LOW RANGE: `[]`, HIGH RANGE: `[]`
-//! WORST CASE MAP SIZE: `1000000`
-//! HOSTNAME: `runner-xerhrdyb-project-163-concurrent-0`, CPU: `Intel(R) Xeon(R) CPU @ 2.60GHz`
-//! EXECUTION: Some(Wasm), WASM-EXECUTION: Compiled, CHAIN: Some("polkadot-dev"), DB CACHE: 1024
-
-// Executed Command:
-// target/production/polkadot
-// benchmark
-// pallet
-// --steps=50
-// --repeat=20
-// --extrinsic=*
-// --execution=wasm
-// --wasm-execution=compiled
-// --heap-pages=4096
-// --json-file=/builds/parity/mirrors/polkadot/.git/.artifacts/bench.json
-// --pallet=pallet_xcm_benchmarks::fungible
-// --chain=polkadot-dev
-// --header=./file_header.txt
-// --template=./xcm/pallet-xcm-benchmarks/template.hbs
-// --output=./runtime/polkadot/src/weights/xcm/
-
-#![cfg_attr(rustfmt, rustfmt_skip)]
-#![allow(unused_parens)]
-#![allow(unused_imports)]
-#![allow(missing_docs)]
-
-use frame_support::{traits::Get, weights::Weight};
-use core::marker::PhantomData;
-
-/// Weight functions for `pallet_xcm_benchmarks::fungible`.
-pub struct WeightInfo<T>(PhantomData<T>);
-impl<T: frame_system::Config> WeightInfo<T> {
-	/// Storage: System Account (r:1 w:1)
-	/// Proof: System Account (max_values: None, max_size: Some(128), added: 2603, mode: MaxEncodedLen)
-	pub(crate) fn withdraw_asset() -> Weight {
-		// Proof Size summary in bytes:
-		//  Measured:  `101`
-		//  Estimated: `3593`
-		// Minimum execution time: 24_801_000 picoseconds.
-		Weight::from_parts(25_567_000, 3593)
-			.saturating_add(T::DbWeight::get().reads(1))
-			.saturating_add(T::DbWeight::get().writes(1))
-	}
-	/// Storage: System Account (r:2 w:2)
-	/// Proof: System Account (max_values: None, max_size: Some(128), added: 2603, mode: MaxEncodedLen)
-	pub(crate) fn transfer_asset() -> Weight {
-		// Proof Size summary in bytes:
-		//  Measured:  `101`
-		//  Estimated: `6196`
-		// Minimum execution time: 53_090_000 picoseconds.
-		Weight::from_parts(54_157_000, 6196)
-			.saturating_add(T::DbWeight::get().reads(2))
-			.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: Configuration ActiveConfig (r:1 w:0)
-	/// Proof Skipped: Configuration ActiveConfig (max_values: Some(1), max_size: None, mode: Measured)
-	/// Storage: Dmp DeliveryFeeFactor (r:1 w:0)
-	/// Proof Skipped: Dmp DeliveryFeeFactor (max_values: None, max_size: None, mode: Measured)
-	/// Storage: XcmPallet SupportedVersion (r:1 w:0)
-	/// Proof Skipped: XcmPallet SupportedVersion (max_values: None, max_size: None, mode: Measured)
-	/// Storage: XcmPallet VersionDiscoveryQueue (r:1 w:1)
-	/// Proof Skipped: XcmPallet VersionDiscoveryQueue (max_values: Some(1), max_size: None, mode: Measured)
-	/// Storage: XcmPallet SafeXcmVersion (r:1 w:0)
-	/// Proof Skipped: XcmPallet SafeXcmVersion (max_values: Some(1), max_size: None, mode: Measured)
-	/// Storage: Dmp DownwardMessageQueues (r:1 w:1)
-	/// Proof Skipped: Dmp DownwardMessageQueues (max_values: None, max_size: None, mode: Measured)
-	/// Storage: Dmp DownwardMessageQueueHeads (r:1 w:1)
-	/// Proof Skipped: Dmp DownwardMessageQueueHeads (max_values: None, max_size: None, mode: Measured)
-	pub(crate) fn transfer_reserve_asset() -> Weight {
-		// Proof Size summary in bytes:
-		//  Measured:  `628`
-		//  Estimated: `6196`
-		// Minimum execution time: 80_084_000 picoseconds.
-		Weight::from_parts(81_110_000, 6196)
-			.saturating_add(T::DbWeight::get().reads(9))
-			.saturating_add(T::DbWeight::get().writes(5))
-	}
-	/// Storage: Benchmark Override (r:0 w:0)
-	/// Proof Skipped: Benchmark Override (max_values: None, max_size: None, mode: Measured)
-	pub(crate) fn reserve_asset_deposited() -> Weight {
-		// Proof Size summary in bytes:
-		//  Measured:  `0`
-		//  Estimated: `0`
-		// Minimum execution time: 2_000_000_000_000 picoseconds.
-		Weight::from_parts(2_000_000_000_000, 0)
-	}
-	/// Storage: Configuration ActiveConfig (r:1 w:0)
-	/// Proof Skipped: Configuration ActiveConfig (max_values: Some(1), max_size: None, mode: Measured)
-	/// Storage: Dmp DeliveryFeeFactor (r:1 w:0)
-	/// Proof Skipped: Dmp DeliveryFeeFactor (max_values: None, max_size: None, mode: Measured)
-	/// Storage: XcmPallet SupportedVersion (r:1 w:0)
-	/// Proof Skipped: XcmPallet SupportedVersion (max_values: None, max_size: None, mode: Measured)
-	/// Storage: XcmPallet VersionDiscoveryQueue (r:1 w:1)
-	/// Proof Skipped: XcmPallet VersionDiscoveryQueue (max_values: Some(1), max_size: None, mode: Measured)
-	/// Storage: XcmPallet SafeXcmVersion (r:1 w:0)
-	/// Proof Skipped: XcmPallet SafeXcmVersion (max_values: Some(1), max_size: None, mode: Measured)
-	/// Storage: Dmp DownwardMessageQueues (r:1 w:1)
-	/// Proof Skipped: Dmp DownwardMessageQueues (max_values: None, max_size: None, mode: Measured)
-	/// Storage: Dmp DownwardMessageQueueHeads (r:1 w:1)
-	/// Proof Skipped: Dmp DownwardMessageQueueHeads (max_values: None, max_size: None, mode: Measured)
-	pub(crate) fn initiate_reserve_withdraw() -> Weight {
-		// Proof Size summary in bytes:
-		//  Measured:  `527`
-		//  Estimated: `3992`
-		// Minimum execution time: 32_535_000 picoseconds.
-		Weight::from_parts(33_276_000, 3992)
-			.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: Balances InactiveIssuance (r:1 w:1)
-	/// Proof: Balances InactiveIssuance (max_values: Some(1), max_size: Some(16), added: 511, mode: MaxEncodedLen)
-	pub(crate) fn receive_teleported_asset() -> Weight {
-		// Proof Size summary in bytes:
-		//  Measured:  `103`
-		//  Estimated: `3593`
-		// Minimum execution time: 24_283_000 picoseconds.
-		Weight::from_parts(25_042_000, 3593)
-			.saturating_add(T::DbWeight::get().reads(2))
-			.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)
-	pub(crate) fn deposit_asset() -> Weight {
-		// Proof Size summary in bytes:
-		//  Measured:  `0`
-		//  Estimated: `3593`
-		// Minimum execution time: 25_002_000 picoseconds.
-		Weight::from_parts(25_816_000, 3593)
-			.saturating_add(T::DbWeight::get().reads(1))
-			.saturating_add(T::DbWeight::get().writes(1))
-	}
-	/// Storage: System Account (r:1 w:1)
-	/// Proof: System Account (max_values: None, max_size: Some(128), added: 2603, mode: MaxEncodedLen)
-	/// Storage: Configuration ActiveConfig (r:1 w:0)
-	/// Proof Skipped: Configuration ActiveConfig (max_values: Some(1), max_size: None, mode: Measured)
-	/// Storage: Dmp DeliveryFeeFactor (r:1 w:0)
-	/// Proof Skipped: Dmp DeliveryFeeFactor (max_values: None, max_size: None, mode: Measured)
-	/// Storage: XcmPallet SupportedVersion (r:1 w:0)
-	/// Proof Skipped: XcmPallet SupportedVersion (max_values: None, max_size: None, mode: Measured)
-	/// Storage: XcmPallet VersionDiscoveryQueue (r:1 w:1)
-	/// Proof Skipped: XcmPallet VersionDiscoveryQueue (max_values: Some(1), max_size: None, mode: Measured)
-	/// Storage: XcmPallet SafeXcmVersion (r:1 w:0)
-	/// Proof Skipped: XcmPallet SafeXcmVersion (max_values: Some(1), max_size: None, mode: Measured)
-	/// Storage: Dmp DownwardMessageQueues (r:1 w:1)
-	/// Proof Skipped: Dmp DownwardMessageQueues (max_values: None, max_size: None, mode: Measured)
-	/// Storage: Dmp DownwardMessageQueueHeads (r:1 w:1)
-	/// Proof Skipped: Dmp DownwardMessageQueueHeads (max_values: None, max_size: None, mode: Measured)
-	pub(crate) fn deposit_reserve_asset() -> Weight {
-		// Proof Size summary in bytes:
-		//  Measured:  `527`
-		//  Estimated: `3992`
-		// Minimum execution time: 55_355_000 picoseconds.
-		Weight::from_parts(56_410_000, 3992)
-			.saturating_add(T::DbWeight::get().reads(8))
-			.saturating_add(T::DbWeight::get().writes(4))
-	}
-	/// Storage: System Account (r:1 w:1)
-	/// Proof: System Account (max_values: None, max_size: Some(128), added: 2603, mode: MaxEncodedLen)
-	/// Storage: Balances InactiveIssuance (r:1 w:1)
-	/// Proof: Balances InactiveIssuance (max_values: Some(1), max_size: Some(16), added: 511, mode: MaxEncodedLen)
-	/// Storage: Configuration ActiveConfig (r:1 w:0)
-	/// Proof Skipped: Configuration ActiveConfig (max_values: Some(1), max_size: None, mode: Measured)
-	/// Storage: Dmp DeliveryFeeFactor (r:1 w:0)
-	/// Proof Skipped: Dmp DeliveryFeeFactor (max_values: None, max_size: None, mode: Measured)
-	/// Storage: XcmPallet SupportedVersion (r:1 w:0)
-	/// Proof Skipped: XcmPallet SupportedVersion (max_values: None, max_size: None, mode: Measured)
-	/// Storage: XcmPallet VersionDiscoveryQueue (r:1 w:1)
-	/// Proof Skipped: XcmPallet VersionDiscoveryQueue (max_values: Some(1), max_size: None, mode: Measured)
-	/// Storage: XcmPallet SafeXcmVersion (r:1 w:0)
-	/// Proof Skipped: XcmPallet SafeXcmVersion (max_values: Some(1), max_size: None, mode: Measured)
-	/// Storage: Dmp DownwardMessageQueues (r:1 w:1)
-	/// Proof Skipped: Dmp DownwardMessageQueues (max_values: None, max_size: None, mode: Measured)
-	/// Storage: Dmp DownwardMessageQueueHeads (r:1 w:1)
-	/// Proof Skipped: Dmp DownwardMessageQueueHeads (max_values: None, max_size: None, mode: Measured)
-	pub(crate) fn initiate_teleport() -> Weight {
-		// Proof Size summary in bytes:
-		//  Measured:  `527`
-		//  Estimated: `3992`
-		// Minimum execution time: 57_258_000 picoseconds.
-		Weight::from_parts(58_205_000, 3992)
-			.saturating_add(T::DbWeight::get().reads(9))
-			.saturating_add(T::DbWeight::get().writes(5))
-	}
-}
diff --git a/polkadot/runtime/polkadot/src/weights/xcm/pallet_xcm_benchmarks_generic.rs b/polkadot/runtime/polkadot/src/weights/xcm/pallet_xcm_benchmarks_generic.rs
deleted file mode 100644
index 0b61e7cd8d1f8ad45e19fd73ddda2edb629d93c6..0000000000000000000000000000000000000000
--- a/polkadot/runtime/polkadot/src/weights/xcm/pallet_xcm_benchmarks_generic.rs
+++ /dev/null
@@ -1,327 +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/>.
-
-//! Autogenerated weights for `pallet_xcm_benchmarks::generic`
-//!
-//! THIS FILE WAS AUTO-GENERATED USING THE SUBSTRATE BENCHMARK CLI VERSION 4.0.0-dev
-//! DATE: 2023-04-14, STEPS: `50`, REPEAT: 20, LOW RANGE: `[]`, HIGH RANGE: `[]`
-//! EXECUTION: Some(Wasm), WASM-EXECUTION: Compiled, CHAIN: Some("polkadot-dev"), DB CACHE: 1024
-
-// Executed Command:
-// ./target/production/polkadot
-// benchmark
-// pallet
-// --steps=50
-// --repeat=20
-// --extrinsic=*
-// --execution=wasm
-// --wasm-execution=compiled
-// --heap-pages=4096
-// --pallet=pallet_xcm_benchmarks::generic
-// --chain=polkadot-dev
-// --header=./file_header.txt
-// --template=./xcm/pallet-xcm-benchmarks/template.hbs
-// --output=./runtime/polkadot/src/weights/xcm/
-
-#![cfg_attr(rustfmt, rustfmt_skip)]
-#![allow(unused_parens)]
-#![allow(unused_imports)]
-
-use frame_support::{traits::Get, weights::Weight};
-use sp_std::marker::PhantomData;
-
-/// Weights for `pallet_xcm_benchmarks::generic`.
-pub struct WeightInfo<T>(PhantomData<T>);
-impl<T: frame_system::Config> WeightInfo<T> {
-	// Storage: Configuration ActiveConfig (r:1 w:0)
-	// Proof Skipped: Configuration ActiveConfig (max_values: Some(1), max_size: None, mode: Measured)
-	// Storage: XcmPallet SupportedVersion (r:1 w:0)
-	// Proof Skipped: XcmPallet SupportedVersion (max_values: None, max_size: None, mode: Measured)
-	// Storage: XcmPallet VersionDiscoveryQueue (r:1 w:1)
-	// Proof Skipped: XcmPallet VersionDiscoveryQueue (max_values: Some(1), max_size: None, mode: Measured)
-	// Storage: XcmPallet SafeXcmVersion (r:1 w:0)
-	// Proof Skipped: XcmPallet SafeXcmVersion (max_values: Some(1), max_size: None, mode: Measured)
-	// Storage: Dmp DownwardMessageQueues (r:1 w:1)
-	// Proof Skipped: Dmp DownwardMessageQueues (max_values: None, max_size: None, mode: Measured)
-	// Storage: Dmp DownwardMessageQueueHeads (r:1 w:1)
-	// Proof Skipped: Dmp DownwardMessageQueueHeads (max_values: None, max_size: None, mode: Measured)
-	pub fn report_holding() -> Weight {
-		// Proof Size summary in bytes:
-		//  Measured:  `514`
-		//  Estimated: `17934`
-		// Minimum execution time: 33_813_000 picoseconds.
-		Weight::from_parts(34_357_000, 17934)
-			.saturating_add(T::DbWeight::get().reads(6))
-			.saturating_add(T::DbWeight::get().writes(3))
-	}
-	pub fn buy_execution() -> Weight {
-		// Proof Size summary in bytes:
-		//  Measured:  `0`
-		//  Estimated: `0`
-		// Minimum execution time: 3_067_000 picoseconds.
-		Weight::from_parts(3_153_000, 0)
-	}
-	// Storage: XcmPallet Queries (r:1 w:0)
-	// Proof Skipped: XcmPallet Queries (max_values: None, max_size: None, mode: Measured)
-	pub fn query_response() -> Weight {
-		// Proof Size summary in bytes:
-		//  Measured:  `169`
-		//  Estimated: `3634`
-		// Minimum execution time: 12_236_000 picoseconds.
-		Weight::from_parts(12_725_000, 3634)
-			.saturating_add(T::DbWeight::get().reads(1))
-	}
-	pub fn transact() -> Weight {
-		// Proof Size summary in bytes:
-		//  Measured:  `0`
-		//  Estimated: `0`
-		// Minimum execution time: 13_193_000 picoseconds.
-		Weight::from_parts(13_427_000, 0)
-	}
-	pub fn refund_surplus() -> Weight {
-		// Proof Size summary in bytes:
-		//  Measured:  `0`
-		//  Estimated: `0`
-		// Minimum execution time: 3_393_000 picoseconds.
-		Weight::from_parts(3_464_000, 0)
-	}
-	pub fn set_error_handler() -> Weight {
-		// Proof Size summary in bytes:
-		//  Measured:  `0`
-		//  Estimated: `0`
-		// Minimum execution time: 2_955_000 picoseconds.
-		Weight::from_parts(3_068_000, 0)
-	}
-	pub fn set_appendix() -> Weight {
-		// Proof Size summary in bytes:
-		//  Measured:  `0`
-		//  Estimated: `0`
-		// Minimum execution time: 3_004_000 picoseconds.
-		Weight::from_parts(3_107_000, 0)
-	}
-	pub fn clear_error() -> Weight {
-		// Proof Size summary in bytes:
-		//  Measured:  `0`
-		//  Estimated: `0`
-		// Minimum execution time: 2_981_000 picoseconds.
-		Weight::from_parts(3_039_000, 0)
-	}
-	pub fn descend_origin() -> Weight {
-		// Proof Size summary in bytes:
-		//  Measured:  `0`
-		//  Estimated: `0`
-		// Minimum execution time: 3_814_000 picoseconds.
-		Weight::from_parts(3_897_000, 0)
-	}
-	pub fn clear_origin() -> Weight {
-		// Proof Size summary in bytes:
-		//  Measured:  `0`
-		//  Estimated: `0`
-		// Minimum execution time: 2_921_000 picoseconds.
-		Weight::from_parts(3_010_000, 0)
-	}
-	// Storage: Configuration ActiveConfig (r:1 w:0)
-	// Proof Skipped: Configuration ActiveConfig (max_values: Some(1), max_size: None, mode: Measured)
-	// Storage: XcmPallet SupportedVersion (r:1 w:0)
-	// Proof Skipped: XcmPallet SupportedVersion (max_values: None, max_size: None, mode: Measured)
-	// Storage: XcmPallet VersionDiscoveryQueue (r:1 w:1)
-	// Proof Skipped: XcmPallet VersionDiscoveryQueue (max_values: Some(1), max_size: None, mode: Measured)
-	// Storage: XcmPallet SafeXcmVersion (r:1 w:0)
-	// Proof Skipped: XcmPallet SafeXcmVersion (max_values: Some(1), max_size: None, mode: Measured)
-	// Storage: Dmp DownwardMessageQueues (r:1 w:1)
-	// Proof Skipped: Dmp DownwardMessageQueues (max_values: None, max_size: None, mode: Measured)
-	// Storage: Dmp DownwardMessageQueueHeads (r:1 w:1)
-	// Proof Skipped: Dmp DownwardMessageQueueHeads (max_values: None, max_size: None, mode: Measured)
-	pub fn report_error() -> Weight {
-		// Proof Size summary in bytes:
-		//  Measured:  `514`
-		//  Estimated: `17934`
-		// Minimum execution time: 28_324_000 picoseconds.
-		Weight::from_parts(28_690_000, 17934)
-			.saturating_add(T::DbWeight::get().reads(6))
-			.saturating_add(T::DbWeight::get().writes(3))
-	}
-	// Storage: XcmPallet AssetTraps (r:1 w:1)
-	// Proof Skipped: XcmPallet AssetTraps (max_values: None, max_size: None, mode: Measured)
-	pub fn claim_asset() -> Weight {
-		// Proof Size summary in bytes:
-		//  Measured:  `226`
-		//  Estimated: `3691`
-		// Minimum execution time: 16_430_000 picoseconds.
-		Weight::from_parts(16_774_000, 3691)
-			.saturating_add(T::DbWeight::get().reads(1))
-			.saturating_add(T::DbWeight::get().writes(1))
-	}
-	pub fn trap() -> Weight {
-		// Proof Size summary in bytes:
-		//  Measured:  `0`
-		//  Estimated: `0`
-		// Minimum execution time: 2_916_000 picoseconds.
-		Weight::from_parts(3_035_000, 0)
-	}
-	// Storage: XcmPallet VersionNotifyTargets (r:1 w:1)
-	// Proof Skipped: XcmPallet VersionNotifyTargets (max_values: None, max_size: None, mode: Measured)
-	// Storage: Configuration ActiveConfig (r:1 w:0)
-	// Proof Skipped: Configuration ActiveConfig (max_values: Some(1), max_size: None, mode: Measured)
-	// Storage: XcmPallet SupportedVersion (r:1 w:0)
-	// Proof Skipped: XcmPallet SupportedVersion (max_values: None, max_size: None, mode: Measured)
-	// Storage: XcmPallet VersionDiscoveryQueue (r:1 w:1)
-	// Proof Skipped: XcmPallet VersionDiscoveryQueue (max_values: Some(1), max_size: None, mode: Measured)
-	// Storage: XcmPallet SafeXcmVersion (r:1 w:0)
-	// Proof Skipped: XcmPallet SafeXcmVersion (max_values: Some(1), max_size: None, mode: Measured)
-	// Storage: Dmp DownwardMessageQueues (r:1 w:1)
-	// Proof Skipped: Dmp DownwardMessageQueues (max_values: None, max_size: None, mode: Measured)
-	// Storage: Dmp DownwardMessageQueueHeads (r:1 w:1)
-	// Proof Skipped: Dmp DownwardMessageQueueHeads (max_values: None, max_size: None, mode: Measured)
-	pub fn subscribe_version() -> Weight {
-		// Proof Size summary in bytes:
-		//  Measured:  `514`
-		//  Estimated: `21913`
-		// Minimum execution time: 35_915_000 picoseconds.
-		Weight::from_parts(36_519_000, 21913)
-			.saturating_add(T::DbWeight::get().reads(7))
-			.saturating_add(T::DbWeight::get().writes(4))
-	}
-	// Storage: XcmPallet VersionNotifyTargets (r:0 w:1)
-	// Proof Skipped: XcmPallet VersionNotifyTargets (max_values: None, max_size: None, mode: Measured)
-	pub fn unsubscribe_version() -> Weight {
-		// Proof Size summary in bytes:
-		//  Measured:  `0`
-		//  Estimated: `0`
-		// Minimum execution time: 5_344_000 picoseconds.
-		Weight::from_parts(5_487_000, 0)
-			.saturating_add(T::DbWeight::get().writes(1))
-	}
-	pub fn burn_asset() -> Weight {
-		// Proof Size summary in bytes:
-		//  Measured:  `0`
-		//  Estimated: `0`
-		// Minimum execution time: 4_684_000 picoseconds.
-		Weight::from_parts(4_801_000, 0)
-	}
-	pub fn expect_asset() -> Weight {
-		// Proof Size summary in bytes:
-		//  Measured:  `0`
-		//  Estimated: `0`
-		// Minimum execution time: 3_228_000 picoseconds.
-		Weight::from_parts(3_325_000, 0)
-	}
-	pub fn expect_origin() -> Weight {
-		// Proof Size summary in bytes:
-		//  Measured:  `0`
-		//  Estimated: `0`
-		// Minimum execution time: 3_059_000 picoseconds.
-		Weight::from_parts(3_153_000, 0)
-	}
-	pub fn expect_error() -> Weight {
-		// Proof Size summary in bytes:
-		//  Measured:  `0`
-		//  Estimated: `0`
-		// Minimum execution time: 3_037_000 picoseconds.
-		Weight::from_parts(3_128_000, 0)
-	}
-	pub fn expect_transact_status() -> Weight {
-		// Proof Size summary in bytes:
-		//  Measured:  `0`
-		//  Estimated: `0`
-		// Minimum execution time: 3_287_000 picoseconds.
-		Weight::from_parts(3_360_000, 0)
-	}
-	// Storage: Configuration ActiveConfig (r:1 w:0)
-	// Proof Skipped: Configuration ActiveConfig (max_values: Some(1), max_size: None, mode: Measured)
-	// Storage: XcmPallet SupportedVersion (r:1 w:0)
-	// Proof Skipped: XcmPallet SupportedVersion (max_values: None, max_size: None, mode: Measured)
-	// Storage: XcmPallet VersionDiscoveryQueue (r:1 w:1)
-	// Proof Skipped: XcmPallet VersionDiscoveryQueue (max_values: Some(1), max_size: None, mode: Measured)
-	// Storage: XcmPallet SafeXcmVersion (r:1 w:0)
-	// Proof Skipped: XcmPallet SafeXcmVersion (max_values: Some(1), max_size: None, mode: Measured)
-	// Storage: Dmp DownwardMessageQueues (r:1 w:1)
-	// Proof Skipped: Dmp DownwardMessageQueues (max_values: None, max_size: None, mode: Measured)
-	// Storage: Dmp DownwardMessageQueueHeads (r:1 w:1)
-	// Proof Skipped: Dmp DownwardMessageQueueHeads (max_values: None, max_size: None, mode: Measured)
-	pub fn query_pallet() -> Weight {
-		// Proof Size summary in bytes:
-		//  Measured:  `514`
-		//  Estimated: `17934`
-		// Minimum execution time: 35_467_000 picoseconds.
-		Weight::from_parts(36_011_000, 17934)
-			.saturating_add(T::DbWeight::get().reads(6))
-			.saturating_add(T::DbWeight::get().writes(3))
-	}
-	pub fn expect_pallet() -> Weight {
-		// Proof Size summary in bytes:
-		//  Measured:  `0`
-		//  Estimated: `0`
-		// Minimum execution time: 8_630_000 picoseconds.
-		Weight::from_parts(8_870_000, 0)
-	}
-	// Storage: Configuration ActiveConfig (r:1 w:0)
-	// Proof Skipped: Configuration ActiveConfig (max_values: Some(1), max_size: None, mode: Measured)
-	// Storage: XcmPallet SupportedVersion (r:1 w:0)
-	// Proof Skipped: XcmPallet SupportedVersion (max_values: None, max_size: None, mode: Measured)
-	// Storage: XcmPallet VersionDiscoveryQueue (r:1 w:1)
-	// Proof Skipped: XcmPallet VersionDiscoveryQueue (max_values: Some(1), max_size: None, mode: Measured)
-	// Storage: XcmPallet SafeXcmVersion (r:1 w:0)
-	// Proof Skipped: XcmPallet SafeXcmVersion (max_values: Some(1), max_size: None, mode: Measured)
-	// Storage: Dmp DownwardMessageQueues (r:1 w:1)
-	// Proof Skipped: Dmp DownwardMessageQueues (max_values: None, max_size: None, mode: Measured)
-	// Storage: Dmp DownwardMessageQueueHeads (r:1 w:1)
-	// Proof Skipped: Dmp DownwardMessageQueueHeads (max_values: None, max_size: None, mode: Measured)
-	pub fn report_transact_status() -> Weight {
-		// Proof Size summary in bytes:
-		//  Measured:  `514`
-		//  Estimated: `17934`
-		// Minimum execution time: 28_630_000 picoseconds.
-		Weight::from_parts(29_085_000, 17934)
-			.saturating_add(T::DbWeight::get().reads(6))
-			.saturating_add(T::DbWeight::get().writes(3))
-	}
-	pub fn clear_transact_status() -> Weight {
-		// Proof Size summary in bytes:
-		//  Measured:  `0`
-		//  Estimated: `0`
-		// Minimum execution time: 2_997_000 picoseconds.
-		Weight::from_parts(3_096_000, 0)
-	}
-	pub fn set_topic() -> Weight {
-		// Proof Size summary in bytes:
-		//  Measured:  `0`
-		//  Estimated: `0`
-		// Minimum execution time: 2_984_000 picoseconds.
-		Weight::from_parts(3_059_000, 0)
-	}
-	pub fn clear_topic() -> Weight {
-		// Proof Size summary in bytes:
-		//  Measured:  `0`
-		//  Estimated: `0`
-		// Minimum execution time: 2_969_000 picoseconds.
-		Weight::from_parts(3_006_000, 0)
-	}
-	pub fn set_fees_mode() -> Weight {
-		// Proof Size summary in bytes:
-		//  Measured:  `0`
-		//  Estimated: `0`
-		// Minimum execution time: 3_045_000 picoseconds.
-		Weight::from_parts(3_087_000, 0)
-	}
-	pub fn unpaid_execution() -> Weight {
-		// Proof Size summary in bytes:
-		//  Measured:  `0`
-		//  Estimated: `0`
-		// Minimum execution time: 3_141_000 picoseconds.
-		Weight::from_parts(3_251_000, 0)
-	}
-}
diff --git a/polkadot/runtime/polkadot/src/xcm_config.rs b/polkadot/runtime/polkadot/src/xcm_config.rs
deleted file mode 100644
index 6c45f1cec402e83850d6b8d8ab3cccd31f6734f5..0000000000000000000000000000000000000000
--- a/polkadot/runtime/polkadot/src/xcm_config.rs
+++ /dev/null
@@ -1,431 +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/>.
-
-//! XCM configuration for Polkadot.
-
-use super::{
-	parachains_origin, AccountId, AllPalletsWithSystem, Balances, Dmp, FellowshipAdmin,
-	GeneralAdmin, ParaId, Runtime, RuntimeCall, RuntimeEvent, RuntimeOrigin, StakingAdmin,
-	TransactionByteFee, WeightToFee, XcmPallet,
-};
-use frame_support::{
-	match_types, parameter_types,
-	traits::{Contains, Everything, Nothing},
-	weights::Weight,
-};
-use frame_system::EnsureRoot;
-use pallet_xcm::XcmPassthrough;
-use polkadot_runtime_constants::{
-	currency::CENTS, system_parachain::*, xcm::body::FELLOWSHIP_ADMIN_INDEX,
-};
-use runtime_common::{
-	crowdloan, paras_registrar,
-	xcm_sender::{ChildParachainRouter, ExponentialPrice},
-	ToAuthor,
-};
-use sp_core::ConstU32;
-use xcm::latest::prelude::*;
-use xcm_builder::{
-	AccountId32Aliases, AllowExplicitUnpaidExecutionFrom, AllowKnownQueryResponses,
-	AllowSubscriptionsFrom, AllowTopLevelPaidExecutionFrom, ChildParachainAsNative,
-	ChildParachainConvertsVia, CurrencyAdapter as XcmCurrencyAdapter, IsConcrete, MintLocation,
-	OriginToPluralityVoice, SignedAccountId32AsNative, SignedToAccountId32,
-	SovereignSignedViaLocation, TakeWeightCredit, TrailingSetTopicAsId, UsingComponents,
-	WeightInfoBounds, WithComputedOrigin, WithUniqueTopic,
-};
-use xcm_executor::traits::WithOriginFilter;
-
-parameter_types! {
-	/// The location of the DOT token, from the context of this chain. Since this token is native to this
-	/// chain, we make it synonymous with it and thus it is the `Here` location, which means "equivalent to
-	/// the context".
-	pub const TokenLocation: MultiLocation = Here.into_location();
-	/// The Polkadot network ID. This is named.
-	pub const ThisNetwork: NetworkId = NetworkId::Polkadot;
-	/// Our location in the universe of consensus systems.
-	pub const UniversalLocation: InteriorMultiLocation = X1(GlobalConsensus(ThisNetwork::get()));
-	/// The Checking Account, which holds any native assets that have been teleported out and not back in (yet).
-	pub CheckAccount: AccountId = XcmPallet::check_account();
-	/// The Checking Account along with the indication that the local chain is able to mint tokens.
-	pub LocalCheckAccount: (AccountId, MintLocation) = (CheckAccount::get(), MintLocation::Local);
-}
-
-/// The canonical means of converting a `MultiLocation` into an `AccountId`, used when we want to
-/// determine the sovereign account controlled by a location.
-pub type SovereignAccountOf = (
-	// We can convert a child parachain using the standard `AccountId` conversion.
-	ChildParachainConvertsVia<ParaId, AccountId>,
-	// We can directly alias an `AccountId32` into a local account.
-	AccountId32Aliases<ThisNetwork, AccountId>,
-);
-
-/// Our asset transactor. This is what allows us to interact with the runtime assets from the point
-/// of view of XCM-only concepts like `MultiLocation` and `MultiAsset`.
-///
-/// Ours is only aware of the Balances pallet, which is mapped to `TokenLocation`.
-pub type LocalAssetTransactor = XcmCurrencyAdapter<
-	// Use this currency:
-	Balances,
-	// Use this currency when it is a fungible asset matching the given location or name:
-	IsConcrete<TokenLocation>,
-	// We can convert the MultiLocations with our converter above:
-	SovereignAccountOf,
-	// Our chain's account ID type (we can't get away without mentioning it explicitly):
-	AccountId,
-	// We track our teleports in/out to keep total issuance correct.
-	LocalCheckAccount,
->;
-
-/// The means that we convert an XCM origin `MultiLocation` into the runtime's `Origin` type for
-/// local dispatch. This is a conversion function from an `OriginKind` type along with the
-/// `MultiLocation` value and returns an `Origin` value or an error.
-type LocalOriginConverter = (
-	// If the origin kind is `Sovereign`, then return a `Signed` origin with the account determined
-	// by the `SovereignAccountOf` converter.
-	SovereignSignedViaLocation<SovereignAccountOf, RuntimeOrigin>,
-	// If the origin kind is `Native` and the XCM origin is a child parachain, then we can express
-	// it with the special `parachains_origin::Origin` origin variant.
-	ChildParachainAsNative<parachains_origin::Origin, RuntimeOrigin>,
-	// If the origin kind is `Native` and the XCM origin is the `AccountId32` location, then it can
-	// be expressed using the `Signed` origin variant.
-	SignedAccountId32AsNative<ThisNetwork, RuntimeOrigin>,
-	// Xcm origins can be represented natively under the Xcm pallet's Xcm origin.
-	XcmPassthrough<RuntimeOrigin>,
-);
-
-parameter_types! {
-	/// The amount of weight an XCM operation takes. This is a safe overestimate.
-	pub const BaseXcmWeight: Weight = Weight::from_parts(1_000_000_000, 1024);
-	/// Maximum number of instructions in a single XCM fragment. A sanity check against weight
-	/// calculations getting too crazy.
-	pub const MaxInstructions: u32 = 100;
-	/// The asset ID for the asset that we use to pay for message delivery fees.
-	pub FeeAssetId: AssetId = Concrete(TokenLocation::get());
-	/// The base fee for the message delivery fees.
-	pub const BaseDeliveryFee: u128 = CENTS.saturating_mul(3);
-}
-
-/// The XCM router. When we want to send an XCM message, we use this type. It amalgamates all of our
-/// individual routers.
-pub type XcmRouter = WithUniqueTopic<(
-	// Only one router so far - use DMP to communicate with child parachains.
-	ChildParachainRouter<
-		Runtime,
-		XcmPallet,
-		ExponentialPrice<FeeAssetId, BaseDeliveryFee, TransactionByteFee, Dmp>,
-	>,
-)>;
-
-parameter_types! {
-	pub const Dot: MultiAssetFilter = Wild(AllOf { fun: WildFungible, id: Concrete(TokenLocation::get()) });
-	pub const StatemintLocation: MultiLocation = Parachain(STATEMINT_ID).into_location();
-	pub const DotForStatemint: (MultiAssetFilter, MultiLocation) = (Dot::get(), StatemintLocation::get());
-	pub const CollectivesLocation: MultiLocation = Parachain(COLLECTIVES_ID).into_location();
-	pub const DotForCollectives: (MultiAssetFilter, MultiLocation) = (Dot::get(), CollectivesLocation::get());
-	pub const MaxAssetsIntoHolding: u32 = 64;
-}
-
-/// Polkadot Relay recognizes/respects the Statemint chain as a teleporter.
-pub type TrustedTeleporters =
-	(xcm_builder::Case<DotForStatemint>, xcm_builder::Case<DotForCollectives>);
-
-match_types! {
-	pub type OnlyParachains: impl Contains<MultiLocation> = {
-		MultiLocation { parents: 0, interior: X1(Parachain(_)) }
-	};
-	pub type CollectivesOrFellows: impl Contains<MultiLocation> = {
-		MultiLocation { parents: 0, interior: X1(Parachain(COLLECTIVES_ID)) } |
-		MultiLocation { parents: 0, interior: X2(Parachain(COLLECTIVES_ID), Plurality { id: BodyId::Technical, .. }) }
-	};
-}
-
-/// The barriers one of which must be passed for an XCM message to be executed.
-pub type Barrier = TrailingSetTopicAsId<(
-	// Weight that is paid for may be consumed.
-	TakeWeightCredit,
-	// Expected responses are OK.
-	AllowKnownQueryResponses<XcmPallet>,
-	WithComputedOrigin<
-		(
-			// If the message is one that immediately attemps to pay for execution, then allow it.
-			AllowTopLevelPaidExecutionFrom<Everything>,
-			// Subscriptions for version tracking are OK.
-			AllowSubscriptionsFrom<OnlyParachains>,
-			// Collectives and Fellows plurality get free execution.
-			AllowExplicitUnpaidExecutionFrom<CollectivesOrFellows>,
-		),
-		UniversalLocation,
-		ConstU32<8>,
-	>,
-)>;
-
-/// A call filter for the XCM Transact instruction. This is a temporary measure until we
-/// properly account for proof size weights.
-///
-/// Calls that are allowed through this filter must:
-/// 1. Have a fixed weight;
-/// 2. Cannot lead to another call being made;
-/// 3. Have a defined proof size weight, e.g. no unbounded vecs in call parameters.
-pub struct SafeCallFilter;
-impl Contains<RuntimeCall> for SafeCallFilter {
-	fn contains(call: &RuntimeCall) -> bool {
-		#[cfg(feature = "runtime-benchmarks")]
-		{
-			if matches!(call, RuntimeCall::System(frame_system::Call::remark_with_event { .. })) {
-				return true
-			}
-		}
-
-		match call {
-			RuntimeCall::System(
-				frame_system::Call::kill_prefix { .. } | frame_system::Call::set_heap_pages { .. },
-			) |
-			RuntimeCall::Babe(..) |
-			RuntimeCall::Timestamp(..) |
-			RuntimeCall::Indices(..) |
-			RuntimeCall::Balances(..) |
-			RuntimeCall::Crowdloan(
-				crowdloan::Call::create { .. } |
-				crowdloan::Call::contribute { .. } |
-				crowdloan::Call::withdraw { .. } |
-				crowdloan::Call::refund { .. } |
-				crowdloan::Call::dissolve { .. } |
-				crowdloan::Call::edit { .. } |
-				crowdloan::Call::poke { .. } |
-				crowdloan::Call::contribute_all { .. },
-			) |
-			RuntimeCall::Staking(
-				pallet_staking::Call::bond { .. } |
-				pallet_staking::Call::bond_extra { .. } |
-				pallet_staking::Call::unbond { .. } |
-				pallet_staking::Call::withdraw_unbonded { .. } |
-				pallet_staking::Call::validate { .. } |
-				pallet_staking::Call::nominate { .. } |
-				pallet_staking::Call::chill { .. } |
-				pallet_staking::Call::set_payee { .. } |
-				pallet_staking::Call::set_controller { .. } |
-				pallet_staking::Call::set_validator_count { .. } |
-				pallet_staking::Call::increase_validator_count { .. } |
-				pallet_staking::Call::scale_validator_count { .. } |
-				pallet_staking::Call::force_no_eras { .. } |
-				pallet_staking::Call::force_new_era { .. } |
-				pallet_staking::Call::set_invulnerables { .. } |
-				pallet_staking::Call::force_unstake { .. } |
-				pallet_staking::Call::force_new_era_always { .. } |
-				pallet_staking::Call::payout_stakers { .. } |
-				pallet_staking::Call::rebond { .. } |
-				pallet_staking::Call::reap_stash { .. } |
-				pallet_staking::Call::set_staking_configs { .. } |
-				pallet_staking::Call::chill_other { .. } |
-				pallet_staking::Call::force_apply_min_commission { .. },
-			) |
-			RuntimeCall::Session(pallet_session::Call::purge_keys { .. }) |
-			RuntimeCall::Grandpa(..) |
-			RuntimeCall::ImOnline(..) |
-			RuntimeCall::Treasury(..) |
-			RuntimeCall::ConvictionVoting(..) |
-			RuntimeCall::Referenda(
-				pallet_referenda::Call::place_decision_deposit { .. } |
-				pallet_referenda::Call::refund_decision_deposit { .. } |
-				pallet_referenda::Call::cancel { .. } |
-				pallet_referenda::Call::kill { .. } |
-				pallet_referenda::Call::nudge_referendum { .. } |
-				pallet_referenda::Call::one_fewer_deciding { .. },
-			) |
-			RuntimeCall::Claims(
-				super::claims::Call::claim { .. } |
-				super::claims::Call::mint_claim { .. } |
-				super::claims::Call::move_claim { .. },
-			) |
-			RuntimeCall::Utility(pallet_utility::Call::as_derivative { .. }) |
-			RuntimeCall::Identity(
-				pallet_identity::Call::add_registrar { .. } |
-				pallet_identity::Call::set_identity { .. } |
-				pallet_identity::Call::clear_identity { .. } |
-				pallet_identity::Call::request_judgement { .. } |
-				pallet_identity::Call::cancel_request { .. } |
-				pallet_identity::Call::set_fee { .. } |
-				pallet_identity::Call::set_account_id { .. } |
-				pallet_identity::Call::set_fields { .. } |
-				pallet_identity::Call::provide_judgement { .. } |
-				pallet_identity::Call::kill_identity { .. } |
-				pallet_identity::Call::add_sub { .. } |
-				pallet_identity::Call::rename_sub { .. } |
-				pallet_identity::Call::remove_sub { .. } |
-				pallet_identity::Call::quit_sub { .. },
-			) |
-			RuntimeCall::Vesting(..) |
-			RuntimeCall::Bounties(
-				pallet_bounties::Call::propose_bounty { .. } |
-				pallet_bounties::Call::approve_bounty { .. } |
-				pallet_bounties::Call::propose_curator { .. } |
-				pallet_bounties::Call::unassign_curator { .. } |
-				pallet_bounties::Call::accept_curator { .. } |
-				pallet_bounties::Call::award_bounty { .. } |
-				pallet_bounties::Call::claim_bounty { .. } |
-				pallet_bounties::Call::close_bounty { .. },
-			) |
-			RuntimeCall::ChildBounties(..) |
-			RuntimeCall::ElectionProviderMultiPhase(..) |
-			RuntimeCall::VoterList(..) |
-			RuntimeCall::NominationPools(
-				pallet_nomination_pools::Call::join { .. } |
-				pallet_nomination_pools::Call::bond_extra { .. } |
-				pallet_nomination_pools::Call::claim_payout { .. } |
-				pallet_nomination_pools::Call::unbond { .. } |
-				pallet_nomination_pools::Call::pool_withdraw_unbonded { .. } |
-				pallet_nomination_pools::Call::withdraw_unbonded { .. } |
-				pallet_nomination_pools::Call::create { .. } |
-				pallet_nomination_pools::Call::create_with_pool_id { .. } |
-				pallet_nomination_pools::Call::set_state { .. } |
-				pallet_nomination_pools::Call::set_configs { .. } |
-				pallet_nomination_pools::Call::update_roles { .. } |
-				pallet_nomination_pools::Call::chill { .. },
-			) |
-			RuntimeCall::Hrmp(..) |
-			RuntimeCall::Registrar(
-				paras_registrar::Call::deregister { .. } |
-				paras_registrar::Call::swap { .. } |
-				paras_registrar::Call::remove_lock { .. } |
-				paras_registrar::Call::reserve { .. } |
-				paras_registrar::Call::add_lock { .. },
-			) |
-			RuntimeCall::XcmPallet(pallet_xcm::Call::limited_reserve_transfer_assets {
-				..
-			}) |
-			RuntimeCall::Whitelist(pallet_whitelist::Call::whitelist_call { .. }) |
-			RuntimeCall::Proxy(..) => true,
-			_ => false,
-		}
-	}
-}
-
-pub struct XcmConfig;
-impl xcm_executor::Config for XcmConfig {
-	type RuntimeCall = RuntimeCall;
-	type XcmSender = XcmRouter;
-	type AssetTransactor = LocalAssetTransactor;
-	type OriginConverter = LocalOriginConverter;
-	// Polkadot Relay recognises no chains which act as reserves.
-	type IsReserve = ();
-	type IsTeleporter = TrustedTeleporters;
-	type UniversalLocation = UniversalLocation;
-	type Barrier = Barrier;
-	type Weigher = WeightInfoBounds<
-		crate::weights::xcm::PolkadotXcmWeight<RuntimeCall>,
-		RuntimeCall,
-		MaxInstructions,
-	>;
-	// The weight trader piggybacks on the existing transaction-fee conversion logic.
-	type Trader =
-		UsingComponents<WeightToFee, TokenLocation, AccountId, Balances, ToAuthor<Runtime>>;
-	type ResponseHandler = XcmPallet;
-	type AssetTrap = XcmPallet;
-	type AssetLocker = ();
-	type AssetExchanger = ();
-	type AssetClaims = XcmPallet;
-	type SubscriptionService = XcmPallet;
-	type PalletInstancesInfo = AllPalletsWithSystem;
-	type MaxAssetsIntoHolding = MaxAssetsIntoHolding;
-	type FeeManager = ();
-	// No bridges yet...
-	type MessageExporter = ();
-	type UniversalAliases = Nothing;
-	type CallDispatcher = WithOriginFilter<SafeCallFilter>;
-	type SafeCallFilter = SafeCallFilter;
-	type Aliasers = Nothing;
-}
-
-parameter_types! {
-	// `GeneralAdmin` pluralistic body.
-	pub const GeneralAdminBodyId: BodyId = BodyId::Administration;
-	// StakingAdmin pluralistic body.
-	pub const StakingAdminBodyId: BodyId = BodyId::Defense;
-	// FellowshipAdmin pluralistic body.
-	pub const FellowshipAdminBodyId: BodyId = BodyId::Index(FELLOWSHIP_ADMIN_INDEX);
-}
-
-#[cfg(feature = "runtime-benchmarks")]
-parameter_types! {
-	pub ReachableDest: Option<MultiLocation> = Some(Parachain(1000).into());
-}
-
-/// Type to convert the `GeneralAdmin` origin to a Plurality `MultiLocation` value.
-pub type GeneralAdminToPlurality =
-	OriginToPluralityVoice<RuntimeOrigin, GeneralAdmin, GeneralAdminBodyId>;
-
-/// Type to convert an `Origin` type value into a `MultiLocation` value which represents an interior
-/// location of this chain.
-pub type LocalOriginToLocation = (
-	GeneralAdminToPlurality,
-	// And a usual Signed origin to be used in XCM as a corresponding AccountId32
-	SignedToAccountId32<RuntimeOrigin, AccountId, ThisNetwork>,
-);
-
-/// Type to convert the `StakingAdmin` origin to a Plurality `MultiLocation` value.
-pub type StakingAdminToPlurality =
-	OriginToPluralityVoice<RuntimeOrigin, StakingAdmin, StakingAdminBodyId>;
-
-/// Type to convert the `FellowshipAdmin` origin to a Plurality `MultiLocation` value.
-pub type FellowshipAdminToPlurality =
-	OriginToPluralityVoice<RuntimeOrigin, FellowshipAdmin, FellowshipAdminBodyId>;
-
-/// Type to convert a pallet `Origin` type value into a `MultiLocation` value which represents an
-/// interior location of this chain for a destination chain.
-pub type LocalPalletOriginToLocation = (
-	// GeneralAdmin origin to be used in XCM as a corresponding Plurality `MultiLocation` value.
-	GeneralAdminToPlurality,
-	// StakingAdmin origin to be used in XCM as a corresponding Plurality `MultiLocation` value.
-	StakingAdminToPlurality,
-	// FellowshipAdmin origin to be used in XCM as a corresponding Plurality `MultiLocation` value.
-	FellowshipAdminToPlurality,
-);
-
-impl pallet_xcm::Config for Runtime {
-	type RuntimeEvent = RuntimeEvent;
-	// We only allow the root, the general admin, the fellowship admin and the staking admin to send
-	// messages.
-	type SendXcmOrigin = xcm_builder::EnsureXcmOrigin<RuntimeOrigin, LocalPalletOriginToLocation>;
-	type XcmRouter = XcmRouter;
-	// Anyone can execute XCM messages locally...
-	type ExecuteXcmOrigin = xcm_builder::EnsureXcmOrigin<RuntimeOrigin, LocalOriginToLocation>;
-	// ...but they must match our filter, which rejects all.
-	type XcmExecuteFilter = Nothing; // == Deny All
-	type XcmExecutor = xcm_executor::XcmExecutor<XcmConfig>;
-	type XcmTeleportFilter = Everything; // == Allow All
-	type XcmReserveTransferFilter = Everything; // == Allow All
-	type Weigher = WeightInfoBounds<
-		crate::weights::xcm::PolkadotXcmWeight<RuntimeCall>,
-		RuntimeCall,
-		MaxInstructions,
-	>;
-	type UniversalLocation = UniversalLocation;
-	type RuntimeOrigin = RuntimeOrigin;
-	type RuntimeCall = RuntimeCall;
-	const VERSION_DISCOVERY_QUEUE_SIZE: u32 = 100;
-	type AdvertisedXcmVersion = pallet_xcm::CurrentXcmVersion;
-	type Currency = Balances;
-	type CurrencyMatcher = ();
-	type TrustedLockers = ();
-	type SovereignAccountOf = SovereignAccountOf;
-	type MaxLockers = ConstU32<8>;
-	type MaxRemoteLockConsumers = ConstU32<0>;
-	type RemoteLockConsumerIdentifier = ();
-	type WeightInfo = crate::weights::pallet_xcm::WeightInfo<Runtime>;
-	#[cfg(feature = "runtime-benchmarks")]
-	type ReachableDest = ReachableDest;
-	type AdminOrigin = EnsureRoot<AccountId>;
-}
diff --git a/polkadot/runtime/rococo/Cargo.toml b/polkadot/runtime/rococo/Cargo.toml
index ebb7cd9c5ef69a6fd8ee96006ddc331f9d6cce0c..0b8a8624bb673e7242f3b78066b7fbcaecc60c93 100644
--- a/polkadot/runtime/rococo/Cargo.toml
+++ b/polkadot/runtime/rococo/Cargo.toml
@@ -1,7 +1,7 @@
 [package]
 name = "rococo-runtime"
 build = "build.rs"
-version.workspace = true
+version = "1.0.0"
 authors.workspace = true
 edition.workspace = true
 license.workspace = true
@@ -10,7 +10,7 @@ license.workspace = true
 parity-scale-codec = { version = "3.6.1", default-features = false, features = ["derive", "max-encoded-len"] }
 scale-info = { version = "2.5.0", default-features = false, features = ["derive"] }
 log = { version = "0.4.17", default-features = false }
-serde = { version = "1.0.163", default-features = false }
+serde = { version = "1.0.188", default-features = false }
 serde_derive = { version = "1.0.117", optional = true }
 static_assertions = "1.1.0"
 smallvec = "1.8.0"
@@ -21,8 +21,10 @@ beefy-primitives = { package = "sp-consensus-beefy", path = "../../../substrate/
 binary-merkle-tree = { path = "../../../substrate/utils/binary-merkle-tree", default-features = false }
 rococo-runtime-constants = { package = "rococo-runtime-constants", path = "constants", default-features = false }
 sp-api = { path = "../../../substrate/primitives/api", default-features = false }
+sp-genesis-builder = { path = "../../../substrate/primitives/genesis-builder", default-features = false }
 inherents = { package = "sp-inherents", path = "../../../substrate/primitives/inherents", default-features = false }
 offchain-primitives = { package = "sp-offchain", path = "../../../substrate/primitives/offchain", default-features = false }
+sp-arithmetic = { path = "../../../substrate/primitives/arithmetic", default-features = false }
 sp-std = { package = "sp-std", path = "../../../substrate/primitives/std", default-features = false }
 sp-io = { path = "../../../substrate/primitives/io", default-features = false }
 sp-mmr-primitives = { path = "../../../substrate/primitives/merkle-mountain-range", default-features = false }
@@ -47,8 +49,10 @@ pallet-state-trie-migration = { path = "../../../substrate/frame/state-trie-migr
 pallet-transaction-payment = { path = "../../../substrate/frame/transaction-payment", default-features = false }
 pallet-transaction-payment-rpc-runtime-api = { path = "../../../substrate/frame/transaction-payment/rpc/runtime-api", default-features = false }
 pallet-collective = { path = "../../../substrate/frame/collective", default-features = false }
+pallet-conviction-voting = { path = "../../../substrate/frame/conviction-voting", default-features = false }
 pallet-democracy = { path = "../../../substrate/frame/democracy", default-features = false }
 pallet-elections-phragmen = { path = "../../../substrate/frame/elections-phragmen", default-features = false }
+pallet-asset-rate = {  path = "../../../substrate/frame/asset-rate", default-features = false }
 frame-executive = { path = "../../../substrate/frame/executive", default-features = false }
 pallet-grandpa = { path = "../../../substrate/frame/grandpa", default-features = false }
 pallet-identity = { path = "../../../substrate/frame/identity", default-features = false }
@@ -62,12 +66,14 @@ pallet-nis = { path = "../../../substrate/frame/nis", default-features = false }
 pallet-offences = { path = "../../../substrate/frame/offences", default-features = false }
 pallet-preimage = { path = "../../../substrate/frame/preimage", default-features = false }
 pallet-proxy = { path = "../../../substrate/frame/proxy", default-features = false }
+pallet-ranked-collective = { path = "../../../substrate/frame/ranked-collective", default-features = false }
 pallet-recovery = { path = "../../../substrate/frame/recovery", default-features = false }
+pallet-referenda = { path = "../../../substrate/frame/referenda", default-features = false }
 pallet-scheduler = { path = "../../../substrate/frame/scheduler", default-features = false }
 pallet-session = { path = "../../../substrate/frame/session", default-features = false }
-pallet-society = { path = "../../../substrate/frame/society", default-features = false, features = ["experimental"] }
+pallet-society = { path = "../../../substrate/frame/society", default-features = false }
 pallet-sudo = { path = "../../../substrate/frame/sudo", default-features = false }
-frame-support = { path = "../../../substrate/frame/support", default-features = false }
+frame-support = { path = "../../../substrate/frame/support", default-features = false, features = ["tuples-96"] }
 pallet-staking = { path = "../../../substrate/frame/staking", default-features = false }
 frame-system = { path = "../../../substrate/frame/system", default-features = false }
 frame-system-rpc-runtime-api = { path = "../../../substrate/frame/system/rpc/runtime-api", default-features = false }
@@ -76,7 +82,8 @@ pallet-tips = { path = "../../../substrate/frame/tips", default-features = false
 pallet-treasury = { path = "../../../substrate/frame/treasury", default-features = false }
 pallet-utility = { path = "../../../substrate/frame/utility", default-features = false }
 pallet-vesting = { path = "../../../substrate/frame/vesting", default-features = false }
-pallet-xcm = { path = "../../xcm/pallet-xcm", default-features = false, features=["experimental"] }
+pallet-whitelist = { path = "../../../substrate/frame/whitelist", default-features = false }
+pallet-xcm = { path = "../../xcm/pallet-xcm", default-features = false }
 pallet-xcm-benchmarks = { path = "../../xcm/pallet-xcm-benchmarks", default-features = false, optional = true }
 
 frame-benchmarking = { path = "../../../substrate/frame/benchmarking", default-features = false, optional = true }
@@ -84,14 +91,14 @@ frame-try-runtime = { path = "../../../substrate/frame/try-runtime", default-fea
 frame-system-benchmarking = { path = "../../../substrate/frame/system/benchmarking", default-features = false, optional = true }
 hex-literal = { version = "0.4.1" }
 
-runtime-common = { package = "polkadot-runtime-common", path = "../common", default-features = false, features=["experimental"] }
+runtime-common = { package = "polkadot-runtime-common", path = "../common", default-features = false }
 runtime-parachains = { package = "polkadot-runtime-parachains", path = "../parachains", default-features = false }
 primitives = { package = "polkadot-primitives", path = "../../primitives", default-features = false }
-polkadot-parachain = { path = "../../parachain", default-features = false }
+polkadot-parachain-primitives = { path = "../../parachain", default-features = false }
 
-xcm = { package = "xcm", path = "../../xcm", default-features = false }
-xcm-executor = { package = "xcm-executor", path = "../../xcm/xcm-executor", default-features = false }
-xcm-builder = { package = "xcm-builder", path = "../../xcm/xcm-builder", default-features = false }
+xcm = { package = "staging-xcm", path = "../../xcm", default-features = false }
+xcm-executor = { package = "staging-xcm-executor", path = "../../xcm/xcm-executor", default-features = false }
+xcm-builder = { package = "staging-xcm-builder", path = "../../xcm/xcm-builder", default-features = false }
 
 [dev-dependencies]
 tiny-keccak = { version = "2.0.2", features = ["keccak"] }
@@ -99,12 +106,12 @@ keyring = { package = "sp-keyring", path = "../../../substrate/primitives/keyrin
 remote-externalities = { package = "frame-remote-externalities" , path = "../../../substrate/utils/frame/remote-externalities" }
 sp-trie = { path = "../../../substrate/primitives/trie" }
 separator = "0.4.1"
-serde_json = "1.0.96"
+serde_json = "1.0.107"
 sp-tracing = { path = "../../../substrate/primitives/tracing", default-features = false }
 tokio = { version = "1.24.2", features = ["macros"] }
 
 [build-dependencies]
-substrate-wasm-builder = { path = "../../../substrate/utils/wasm-builder" }
+substrate-wasm-builder = { path = "../../../substrate/utils/wasm-builder", optional = true }
 
 [features]
 default = [ "std" ]
@@ -113,15 +120,19 @@ std = [
 	"authority-discovery-primitives/std",
 	"babe-primitives/std",
 	"beefy-primitives/std",
+	"binary-merkle-tree/std",
 	"block-builder-api/std",
+	"frame-benchmarking?/std",
 	"frame-executive/std",
 	"frame-support/std",
+	"frame-system-benchmarking?/std",
 	"frame-system-rpc-runtime-api/std",
 	"frame-system/std",
 	"frame-try-runtime/std",
 	"inherents/std",
 	"log/std",
 	"offchain-primitives/std",
+	"pallet-asset-rate/std",
 	"pallet-authority-discovery/std",
 	"pallet-authorship/std",
 	"pallet-babe/std",
@@ -131,6 +142,7 @@ std = [
 	"pallet-bounties/std",
 	"pallet-child-bounties/std",
 	"pallet-collective/std",
+	"pallet-conviction-voting/std",
 	"pallet-democracy/std",
 	"pallet-elections-phragmen/std",
 	"pallet-grandpa/std",
@@ -145,7 +157,9 @@ std = [
 	"pallet-offences/std",
 	"pallet-preimage/std",
 	"pallet-proxy/std",
+	"pallet-ranked-collective/std",
 	"pallet-recovery/std",
+	"pallet-referenda/std",
 	"pallet-scheduler/std",
 	"pallet-session/std",
 	"pallet-society/std",
@@ -159,9 +173,11 @@ std = [
 	"pallet-treasury/std",
 	"pallet-utility/std",
 	"pallet-vesting/std",
+	"pallet-whitelist/std",
+	"pallet-xcm-benchmarks?/std",
 	"pallet-xcm/std",
 	"parity-scale-codec/std",
-	"polkadot-parachain/std",
+	"polkadot-parachain-primitives/std",
 	"primitives/std",
 	"rococo-runtime-constants/std",
 	"runtime-common/std",
@@ -170,14 +186,19 @@ std = [
 	"serde/std",
 	"serde_derive",
 	"sp-api/std",
+	"sp-arithmetic/std",
 	"sp-core/std",
+	"sp-genesis-builder/std",
 	"sp-io/std",
 	"sp-mmr-primitives/std",
 	"sp-runtime/std",
 	"sp-session/std",
 	"sp-staking/std",
 	"sp-std/std",
+	"sp-storage/std",
+	"sp-tracing/std",
 	"sp-version/std",
+	"substrate-wasm-builder",
 	"tx-pool-api/std",
 	"xcm-builder/std",
 	"xcm-executor/std",
@@ -188,12 +209,13 @@ runtime-benchmarks = [
 	"frame-support/runtime-benchmarks",
 	"frame-system-benchmarking/runtime-benchmarks",
 	"frame-system/runtime-benchmarks",
-	"frame-system/runtime-benchmarks",
+	"pallet-asset-rate/runtime-benchmarks",
 	"pallet-babe/runtime-benchmarks",
 	"pallet-balances/runtime-benchmarks",
 	"pallet-bounties/runtime-benchmarks",
 	"pallet-child-bounties/runtime-benchmarks",
 	"pallet-collective/runtime-benchmarks",
+	"pallet-conviction-voting/runtime-benchmarks",
 	"pallet-democracy/runtime-benchmarks",
 	"pallet-elections-phragmen/runtime-benchmarks",
 	"pallet-grandpa/runtime-benchmarks",
@@ -202,31 +224,44 @@ runtime-benchmarks = [
 	"pallet-indices/runtime-benchmarks",
 	"pallet-membership/runtime-benchmarks",
 	"pallet-message-queue/runtime-benchmarks",
+	"pallet-mmr/runtime-benchmarks",
 	"pallet-multisig/runtime-benchmarks",
 	"pallet-nis/runtime-benchmarks",
+	"pallet-offences/runtime-benchmarks",
 	"pallet-preimage/runtime-benchmarks",
 	"pallet-proxy/runtime-benchmarks",
+	"pallet-ranked-collective/runtime-benchmarks",
 	"pallet-recovery/runtime-benchmarks",
+	"pallet-referenda/runtime-benchmarks",
 	"pallet-scheduler/runtime-benchmarks",
 	"pallet-society/runtime-benchmarks",
 	"pallet-staking/runtime-benchmarks",
+	"pallet-state-trie-migration/runtime-benchmarks",
 	"pallet-sudo/runtime-benchmarks",
 	"pallet-timestamp/runtime-benchmarks",
 	"pallet-tips/runtime-benchmarks",
 	"pallet-treasury/runtime-benchmarks",
 	"pallet-utility/runtime-benchmarks",
 	"pallet-vesting/runtime-benchmarks",
+	"pallet-whitelist/runtime-benchmarks",
 	"pallet-xcm-benchmarks/runtime-benchmarks",
 	"pallet-xcm/runtime-benchmarks",
+	"polkadot-parachain-primitives/runtime-benchmarks",
+	"primitives/runtime-benchmarks",
 	"runtime-common/runtime-benchmarks",
 	"runtime-parachains/runtime-benchmarks",
 	"sp-runtime/runtime-benchmarks",
+	"sp-staking/runtime-benchmarks",
 	"xcm-builder/runtime-benchmarks",
+	"xcm-executor/runtime-benchmarks",
 ]
 try-runtime = [
 	"frame-executive/try-runtime",
+	"frame-support/try-runtime",
 	"frame-system/try-runtime",
 	"frame-try-runtime",
+	"frame-try-runtime/try-runtime",
+	"pallet-asset-rate/try-runtime",
 	"pallet-authority-discovery/try-runtime",
 	"pallet-authorship/try-runtime",
 	"pallet-babe/try-runtime",
@@ -236,6 +271,7 @@ try-runtime = [
 	"pallet-bounties/try-runtime",
 	"pallet-child-bounties/try-runtime",
 	"pallet-collective/try-runtime",
+	"pallet-conviction-voting/try-runtime",
 	"pallet-democracy/try-runtime",
 	"pallet-elections-phragmen/try-runtime",
 	"pallet-grandpa/try-runtime",
@@ -250,7 +286,9 @@ try-runtime = [
 	"pallet-offences/try-runtime",
 	"pallet-preimage/try-runtime",
 	"pallet-proxy/try-runtime",
+	"pallet-ranked-collective/try-runtime",
 	"pallet-recovery/try-runtime",
+	"pallet-referenda/try-runtime",
 	"pallet-scheduler/try-runtime",
 	"pallet-session/try-runtime",
 	"pallet-society/try-runtime",
@@ -263,18 +301,19 @@ try-runtime = [
 	"pallet-treasury/try-runtime",
 	"pallet-utility/try-runtime",
 	"pallet-vesting/try-runtime",
+	"pallet-whitelist/try-runtime",
 	"pallet-xcm/try-runtime",
 	"runtime-common/try-runtime",
 	"runtime-parachains/try-runtime",
+	"sp-runtime/try-runtime",
 ]
-# When enabled, the runtime API will not be build.
-#
-# This is required by Cumulus to access certain types of the
-# runtime without clashing with the runtime API exported functions
-# in WASM.
-disable-runtime-api = []
 
 # Set timing constants (e.g. session period) to faster versions to speed up testing.
 fast-runtime = []
 
 runtime-metrics = [ "runtime-parachains/runtime-metrics", "sp-io/with-tracing" ]
+
+# A feature that should be enabled when the runtime should be build for on-chain
+# deployment. This will disable stuff that shouldn't be part of the on-chain wasm
+# to make it smaller like logging for example.
+on-chain-release-build = [ "sp-api/disable-logging" ]
diff --git a/polkadot/runtime/rococo/README.md b/polkadot/runtime/rococo/README.md
index 0f35665ca1726104a4d95b613894f99b05d476a5..5b2c296f0ced9a053de46bac5d8207d7a1d835d8 100644
--- a/polkadot/runtime/rococo/README.md
+++ b/polkadot/runtime/rococo/README.md
@@ -2,10 +2,19 @@
 
 Rococo is a testnet runtime with no stability guarantees.
 
+## How to build `rococo` runtime
+`EpochDurationInBlocks` parameter is configurable via `ROCOCO_EPOCH_DURATION` environment variable. To build wasm
+runtime blob with customized epoch duration the following command shall be exectuted:
+```bash
+ROCOCO_EPOCH_DURATION=10 ./polkadot/scripts/build-only-wasm.sh rococo-runtime /path/to/output/directory/
+```
+
 ## How to run `rococo-local`
 
-The [Cumulus Tutorial](https://docs.substrate.io/tutorials/v3/cumulus/start-relay/) details building, starting, and testing `rococo-local` and parachains connecting to it.
+The [Cumulus Tutorial](https://docs.substrate.io/tutorials/v3/cumulus/start-relay/) details building, starting, and
+testing `rococo-local` and parachains connecting to it.
 
 ## How to register a parachain on the Rococo testnet
 
-The [parachain registration process](https://docs.substrate.io/tutorials/v3/cumulus/rococo/) on the public Rococo testnet is also outlined.
+The [parachain registration process](https://docs.substrate.io/tutorials/v3/cumulus/rococo/) on the public Rococo
+testnet is also outlined.
diff --git a/polkadot/runtime/rococo/build.rs b/polkadot/runtime/rococo/build.rs
index e7134e0ef723eae59cbd65a79ad7dda47d958b52..ed32d33105b76c45bac68360e92646019e578b2e 100644
--- a/polkadot/runtime/rococo/build.rs
+++ b/polkadot/runtime/rococo/build.rs
@@ -14,12 +14,19 @@
 // You should have received a copy of the GNU General Public License
 // along with Substrate.  If not, see <http://www.gnu.org/licenses/>.
 
-use substrate_wasm_builder::WasmBuilder;
-
+#[cfg(feature = "std")]
 fn main() {
-	WasmBuilder::new()
+	// note: needs to be synced with rococo-runtime-constants::time hard-coded string literal
+	const ROCOCO_EPOCH_DURATION_ENV: &str = "ROCOCO_EPOCH_DURATION";
+
+	substrate_wasm_builder::WasmBuilder::new()
 		.with_current_project()
 		.import_memory()
 		.export_heap_base()
-		.build()
+		.build();
+
+	println!("cargo:rerun-if-env-changed={}", ROCOCO_EPOCH_DURATION_ENV);
 }
+
+#[cfg(not(feature = "std"))]
+fn main() {}
diff --git a/polkadot/runtime/rococo/constants/Cargo.toml b/polkadot/runtime/rococo/constants/Cargo.toml
index 174e4e83a5e3e112704d56cf7d11ec6536f9cf71..b1eb3f48f65518079b8fe534ad23e8bc40e410c1 100644
--- a/polkadot/runtime/rococo/constants/Cargo.toml
+++ b/polkadot/runtime/rococo/constants/Cargo.toml
@@ -1,6 +1,6 @@
 [package]
 name = "rococo-runtime-constants"
-version.workspace = true
+version = "1.0.0"
 authors.workspace = true
 edition.workspace = true
 license.workspace = true
diff --git a/polkadot/runtime/rococo/constants/src/lib.rs b/polkadot/runtime/rococo/constants/src/lib.rs
index 214e2f3fa980e8793c2683c544cb69b2d0d8d00e..2200f7ddefe1f912f026b98f7232cf7273891d18 100644
--- a/polkadot/runtime/rococo/constants/src/lib.rs
+++ b/polkadot/runtime/rococo/constants/src/lib.rs
@@ -38,12 +38,13 @@ pub mod currency {
 /// Time and blocks.
 pub mod time {
 	use primitives::{BlockNumber, Moment};
-	use runtime_common::prod_or_fast;
 	pub const MILLISECS_PER_BLOCK: Moment = 6000;
 	pub const SLOT_DURATION: Moment = MILLISECS_PER_BLOCK;
-	pub const DEFAULT_EPOCH_DURATION: BlockNumber = prod_or_fast!(1 * HOURS, 1 * MINUTES);
+
 	frame_support::parameter_types! {
-		pub storage EpochDurationInBlocks: BlockNumber = DEFAULT_EPOCH_DURATION;
+		pub storage EpochDurationInBlocks: BlockNumber = option_env!("ROCOCO_EPOCH_DURATION")
+			.map(|s| s.parse().expect("`ROCOCO_EPOCH_DURATION` is not a valid `BlockNumber`"))
+			.unwrap_or(1 * MINUTES);
 	}
 
 	// These time units are defined in number of blocks.
diff --git a/polkadot/runtime/kusama/src/governance/fellowship.rs b/polkadot/runtime/rococo/src/governance/fellowship.rs
similarity index 90%
rename from polkadot/runtime/kusama/src/governance/fellowship.rs
rename to polkadot/runtime/rococo/src/governance/fellowship.rs
index 8837c19e0eb1461b3c287037ef69e776d46ac832..b5df6cf2df341c5563f31ea6f49f1eeae5b81fc1 100644
--- a/polkadot/runtime/kusama/src/governance/fellowship.rs
+++ b/polkadot/runtime/rococo/src/governance/fellowship.rs
@@ -14,20 +14,13 @@
 // You should have received a copy of the GNU General Public License
 // along with Polkadot. If not, see <http://www.gnu.org/licenses/>.
 
-//! Elements of governance concerning the Polkadot Fellowship. This is only a temporary arrangement
-//! since the Polkadot Fellowship belongs under the Polkadot Relay. However, that is not yet in
-//! place, so until then it will need to live here. Once it is in place and there exists a bridge
-//! between Polkadot/Kusama then this code can be removed.
+//! Elements of governance concerning the Rococo Fellowship.
 
 use frame_support::traits::{MapSuccess, TryMapSuccess};
-use sp_arithmetic::traits::CheckedSub;
-use sp_runtime::{
-	morph_types,
-	traits::{ConstU16, Replace, TypedGet},
-};
+use sp_runtime::traits::{CheckedReduceBy, ConstU16, Replace};
 
 use super::*;
-use crate::{DAYS, QUID};
+use crate::{CENTS, DAYS};
 
 parameter_types! {
 	pub const AlarmInterval: BlockNumber = 1;
@@ -46,7 +39,7 @@ impl pallet_referenda::TracksInfo<Balance, BlockNumber> for TracksInfo {
 				pallet_referenda::TrackInfo {
 					name: "candidates",
 					max_deciding: 10,
-					decision_deposit: 100 * QUID,
+					decision_deposit: 100 * 3 * CENTS,
 					prepare_period: 30 * MINUTES,
 					decision_period: 7 * DAYS,
 					confirm_period: 30 * MINUTES,
@@ -68,7 +61,7 @@ impl pallet_referenda::TracksInfo<Balance, BlockNumber> for TracksInfo {
 				pallet_referenda::TrackInfo {
 					name: "members",
 					max_deciding: 10,
-					decision_deposit: 10 * QUID,
+					decision_deposit: 10 * 3 * CENTS,
 					prepare_period: 30 * MINUTES,
 					decision_period: 7 * DAYS,
 					confirm_period: 30 * MINUTES,
@@ -90,7 +83,7 @@ impl pallet_referenda::TracksInfo<Balance, BlockNumber> for TracksInfo {
 				pallet_referenda::TrackInfo {
 					name: "proficients",
 					max_deciding: 10,
-					decision_deposit: 10 * QUID,
+					decision_deposit: 10 * 3 * CENTS,
 					prepare_period: 30 * MINUTES,
 					decision_period: 7 * DAYS,
 					confirm_period: 30 * MINUTES,
@@ -112,7 +105,7 @@ impl pallet_referenda::TracksInfo<Balance, BlockNumber> for TracksInfo {
 				pallet_referenda::TrackInfo {
 					name: "fellows",
 					max_deciding: 10,
-					decision_deposit: 10 * QUID,
+					decision_deposit: 10 * 3 * CENTS,
 					prepare_period: 30 * MINUTES,
 					decision_period: 7 * DAYS,
 					confirm_period: 30 * MINUTES,
@@ -134,7 +127,7 @@ impl pallet_referenda::TracksInfo<Balance, BlockNumber> for TracksInfo {
 				pallet_referenda::TrackInfo {
 					name: "senior fellows",
 					max_deciding: 10,
-					decision_deposit: 10 * QUID,
+					decision_deposit: 10 * 3 * CENTS,
 					prepare_period: 30 * MINUTES,
 					decision_period: 7 * DAYS,
 					confirm_period: 30 * MINUTES,
@@ -156,7 +149,7 @@ impl pallet_referenda::TracksInfo<Balance, BlockNumber> for TracksInfo {
 				pallet_referenda::TrackInfo {
 					name: "experts",
 					max_deciding: 10,
-					decision_deposit: 1 * QUID,
+					decision_deposit: 1 * 3 * CENTS,
 					prepare_period: 30 * MINUTES,
 					decision_period: 7 * DAYS,
 					confirm_period: 30 * MINUTES,
@@ -178,7 +171,7 @@ impl pallet_referenda::TracksInfo<Balance, BlockNumber> for TracksInfo {
 				pallet_referenda::TrackInfo {
 					name: "senior experts",
 					max_deciding: 10,
-					decision_deposit: 1 * QUID,
+					decision_deposit: 1 * 3 * CENTS,
 					prepare_period: 30 * MINUTES,
 					decision_period: 7 * DAYS,
 					confirm_period: 30 * MINUTES,
@@ -200,7 +193,7 @@ impl pallet_referenda::TracksInfo<Balance, BlockNumber> for TracksInfo {
 				pallet_referenda::TrackInfo {
 					name: "masters",
 					max_deciding: 10,
-					decision_deposit: 1 * QUID,
+					decision_deposit: 1 * 3 * CENTS,
 					prepare_period: 30 * MINUTES,
 					decision_period: 7 * DAYS,
 					confirm_period: 30 * MINUTES,
@@ -222,7 +215,7 @@ impl pallet_referenda::TracksInfo<Balance, BlockNumber> for TracksInfo {
 				pallet_referenda::TrackInfo {
 					name: "senior masters",
 					max_deciding: 10,
-					decision_deposit: 1 * QUID,
+					decision_deposit: 1 * 3 * CENTS,
 					prepare_period: 30 * MINUTES,
 					decision_period: 7 * DAYS,
 					confirm_period: 30 * MINUTES,
@@ -244,7 +237,7 @@ impl pallet_referenda::TracksInfo<Balance, BlockNumber> for TracksInfo {
 				pallet_referenda::TrackInfo {
 					name: "grand masters",
 					max_deciding: 10,
-					decision_deposit: 1 * QUID,
+					decision_deposit: 1 * 3 * CENTS,
 					prepare_period: 30 * MINUTES,
 					decision_period: 7 * DAYS,
 					confirm_period: 30 * MINUTES,
@@ -319,14 +312,6 @@ impl pallet_referenda::Config<FellowshipReferendaInstance> for Runtime {
 
 pub type FellowshipCollectiveInstance = pallet_ranked_collective::Instance1;
 
-morph_types! {
-	/// A `TryMorph` implementation to reduce a scalar by a particular amount, checking for
-	/// underflow.
-	pub type CheckedReduceBy<N: TypedGet>: TryMorph = |r: N::Type| -> Result<N::Type, ()> {
-		r.checked_sub(&N::get()).ok_or(())
-	} where N::Type: CheckedSub;
-}
-
 impl pallet_ranked_collective::Config<FellowshipCollectiveInstance> for Runtime {
 	type WeightInfo = weights::pallet_ranked_collective::WeightInfo<Self>;
 	type RuntimeEvent = RuntimeEvent;
diff --git a/polkadot/runtime/kusama/src/governance/mod.rs b/polkadot/runtime/rococo/src/governance/mod.rs
similarity index 96%
rename from polkadot/runtime/kusama/src/governance/mod.rs
rename to polkadot/runtime/rococo/src/governance/mod.rs
index c8a7b360ed4e9685e838864f739d32bb54938cb0..ef2adf60753d541c44eaf6073a3a012e66bf9f5c 100644
--- a/polkadot/runtime/kusama/src/governance/mod.rs
+++ b/polkadot/runtime/rococo/src/governance/mod.rs
@@ -14,7 +14,7 @@
 // You should have received a copy of the GNU General Public License
 // along with Polkadot. If not, see <http://www.gnu.org/licenses/>.
 
-//! New governance configurations for the Kusama runtime.
+//! New governance configurations for the Rococo runtime.
 
 use super::*;
 use frame_support::{
@@ -51,7 +51,7 @@ impl pallet_conviction_voting::Config for Runtime {
 
 parameter_types! {
 	pub const AlarmInterval: BlockNumber = 1;
-	pub const SubmissionDeposit: Balance = 1 * QUID;
+	pub const SubmissionDeposit: Balance = 1 * 3 * CENTS;
 	pub const UndecidingTimeout: BlockNumber = 14 * DAYS;
 }
 
diff --git a/polkadot/runtime/kusama/src/governance/origins.rs b/polkadot/runtime/rococo/src/governance/origins.rs
similarity index 97%
rename from polkadot/runtime/kusama/src/governance/origins.rs
rename to polkadot/runtime/rococo/src/governance/origins.rs
index c5cb035a526947a973eabd8b4bca32c6b280b10d..e4639f40dc432473e1222f6ab1094a31ecd26f68 100644
--- a/polkadot/runtime/kusama/src/governance/origins.rs
+++ b/polkadot/runtime/rococo/src/governance/origins.rs
@@ -20,7 +20,7 @@ pub use pallet_custom_origins::*;
 
 #[frame_support::pallet]
 pub mod pallet_custom_origins {
-	use crate::{Balance, GRAND, QUID};
+	use crate::{Balance, CENTS, GRAND};
 	use frame_support::pallet_prelude::*;
 
 	#[pallet::config]
@@ -38,7 +38,7 @@ pub mod pallet_custom_origins {
 		Treasurer,
 		/// Origin for managing the composition of the fellowship.
 		FellowshipAdmin,
-		/// Origin for managing the registrar and permissioned HRMP channel operations.
+		/// Origin for managing the registrar.
 		GeneralAdmin,
 		/// Origin for starting auctions.
 		AuctionAdmin,
@@ -169,7 +169,7 @@ pub mod pallet_custom_origins {
 
 	decl_ensure! {
 		pub type Spender: EnsureOrigin<Success = Balance> {
-			SmallTipper = 250 * QUID,
+			SmallTipper = 250 * 3 * CENTS,
 			BigTipper = 1 * GRAND,
 			SmallSpender = 10 * GRAND,
 			MediumSpender = 100 * GRAND,
diff --git a/polkadot/runtime/kusama/src/governance/tracks.rs b/polkadot/runtime/rococo/src/governance/tracks.rs
similarity index 79%
rename from polkadot/runtime/kusama/src/governance/tracks.rs
rename to polkadot/runtime/rococo/src/governance/tracks.rs
index 08a87a677c353694f68df0ff96b9e6ba111ee058..3765569f183e0414a10fe2852e528ccc9dedc3d7 100644
--- a/polkadot/runtime/kusama/src/governance/tracks.rs
+++ b/polkadot/runtime/rococo/src/governance/tracks.rs
@@ -72,10 +72,10 @@ const TRACKS_DATA: [(u16, pallet_referenda::TrackInfo<Balance, BlockNumber>); 15
 			name: "root",
 			max_deciding: 1,
 			decision_deposit: 100 * GRAND,
-			prepare_period: 2 * HOURS,
-			decision_period: 14 * DAYS,
-			confirm_period: 24 * HOURS,
-			min_enactment_period: 24 * HOURS,
+			prepare_period: 8 * MINUTES,
+			decision_period: 20 * MINUTES,
+			confirm_period: 12 * MINUTES,
+			min_enactment_period: 5 * MINUTES,
 			min_approval: APP_ROOT,
 			min_support: SUP_ROOT,
 		},
@@ -86,10 +86,10 @@ const TRACKS_DATA: [(u16, pallet_referenda::TrackInfo<Balance, BlockNumber>); 15
 			name: "whitelisted_caller",
 			max_deciding: 100,
 			decision_deposit: 10 * GRAND,
-			prepare_period: 30 * MINUTES,
-			decision_period: 14 * DAYS,
-			confirm_period: 10 * MINUTES,
-			min_enactment_period: 10 * MINUTES,
+			prepare_period: 6 * MINUTES,
+			decision_period: 20 * MINUTES,
+			confirm_period: 4 * MINUTES,
+			min_enactment_period: 3 * MINUTES,
 			min_approval: APP_WHITELISTED_CALLER,
 			min_support: SUP_WHITELISTED_CALLER,
 		},
@@ -100,10 +100,10 @@ const TRACKS_DATA: [(u16, pallet_referenda::TrackInfo<Balance, BlockNumber>); 15
 			name: "staking_admin",
 			max_deciding: 10,
 			decision_deposit: 5 * GRAND,
-			prepare_period: 2 * HOURS,
-			decision_period: 14 * DAYS,
-			confirm_period: 3 * HOURS,
-			min_enactment_period: 10 * MINUTES,
+			prepare_period: 8 * MINUTES,
+			decision_period: 20 * MINUTES,
+			confirm_period: 8 * MINUTES,
+			min_enactment_period: 3 * MINUTES,
 			min_approval: APP_STAKING_ADMIN,
 			min_support: SUP_STAKING_ADMIN,
 		},
@@ -114,10 +114,10 @@ const TRACKS_DATA: [(u16, pallet_referenda::TrackInfo<Balance, BlockNumber>); 15
 			name: "treasurer",
 			max_deciding: 10,
 			decision_deposit: 1 * GRAND,
-			prepare_period: 2 * HOURS,
-			decision_period: 14 * DAYS,
-			confirm_period: 3 * HOURS,
-			min_enactment_period: 24 * HOURS,
+			prepare_period: 8 * MINUTES,
+			decision_period: 20 * MINUTES,
+			confirm_period: 8 * MINUTES,
+			min_enactment_period: 5 * MINUTES,
 			min_approval: APP_TREASURER,
 			min_support: SUP_TREASURER,
 		},
@@ -128,10 +128,10 @@ const TRACKS_DATA: [(u16, pallet_referenda::TrackInfo<Balance, BlockNumber>); 15
 			name: "lease_admin",
 			max_deciding: 10,
 			decision_deposit: 5 * GRAND,
-			prepare_period: 2 * HOURS,
-			decision_period: 14 * DAYS,
-			confirm_period: 3 * HOURS,
-			min_enactment_period: 10 * MINUTES,
+			prepare_period: 8 * MINUTES,
+			decision_period: 20 * MINUTES,
+			confirm_period: 8 * MINUTES,
+			min_enactment_period: 3 * MINUTES,
 			min_approval: APP_LEASE_ADMIN,
 			min_support: SUP_LEASE_ADMIN,
 		},
@@ -142,10 +142,10 @@ const TRACKS_DATA: [(u16, pallet_referenda::TrackInfo<Balance, BlockNumber>); 15
 			name: "fellowship_admin",
 			max_deciding: 10,
 			decision_deposit: 5 * GRAND,
-			prepare_period: 2 * HOURS,
-			decision_period: 14 * DAYS,
-			confirm_period: 3 * HOURS,
-			min_enactment_period: 10 * MINUTES,
+			prepare_period: 8 * MINUTES,
+			decision_period: 20 * MINUTES,
+			confirm_period: 8 * MINUTES,
+			min_enactment_period: 3 * MINUTES,
 			min_approval: APP_FELLOWSHIP_ADMIN,
 			min_support: SUP_FELLOWSHIP_ADMIN,
 		},
@@ -156,10 +156,10 @@ const TRACKS_DATA: [(u16, pallet_referenda::TrackInfo<Balance, BlockNumber>); 15
 			name: "general_admin",
 			max_deciding: 10,
 			decision_deposit: 5 * GRAND,
-			prepare_period: 2 * HOURS,
-			decision_period: 14 * DAYS,
-			confirm_period: 3 * HOURS,
-			min_enactment_period: 10 * MINUTES,
+			prepare_period: 8 * MINUTES,
+			decision_period: 20 * MINUTES,
+			confirm_period: 8 * MINUTES,
+			min_enactment_period: 3 * MINUTES,
 			min_approval: APP_GENERAL_ADMIN,
 			min_support: SUP_GENERAL_ADMIN,
 		},
@@ -170,10 +170,10 @@ const TRACKS_DATA: [(u16, pallet_referenda::TrackInfo<Balance, BlockNumber>); 15
 			name: "auction_admin",
 			max_deciding: 10,
 			decision_deposit: 5 * GRAND,
-			prepare_period: 2 * HOURS,
-			decision_period: 14 * DAYS,
-			confirm_period: 3 * HOURS,
-			min_enactment_period: 10 * MINUTES,
+			prepare_period: 8 * MINUTES,
+			decision_period: 20 * MINUTES,
+			confirm_period: 8 * MINUTES,
+			min_enactment_period: 3 * MINUTES,
 			min_approval: APP_AUCTION_ADMIN,
 			min_support: SUP_AUCTION_ADMIN,
 		},
@@ -184,10 +184,10 @@ const TRACKS_DATA: [(u16, pallet_referenda::TrackInfo<Balance, BlockNumber>); 15
 			name: "referendum_canceller",
 			max_deciding: 1_000,
 			decision_deposit: 10 * GRAND,
-			prepare_period: 2 * HOURS,
-			decision_period: 7 * DAYS,
-			confirm_period: 3 * HOURS,
-			min_enactment_period: 10 * MINUTES,
+			prepare_period: 8 * MINUTES,
+			decision_period: 14 * MINUTES,
+			confirm_period: 8 * MINUTES,
+			min_enactment_period: 3 * MINUTES,
 			min_approval: APP_REFERENDUM_CANCELLER,
 			min_support: SUP_REFERENDUM_CANCELLER,
 		},
@@ -198,10 +198,10 @@ const TRACKS_DATA: [(u16, pallet_referenda::TrackInfo<Balance, BlockNumber>); 15
 			name: "referendum_killer",
 			max_deciding: 1_000,
 			decision_deposit: 50 * GRAND,
-			prepare_period: 2 * HOURS,
-			decision_period: 14 * DAYS,
-			confirm_period: 3 * HOURS,
-			min_enactment_period: 10 * MINUTES,
+			prepare_period: 8 * MINUTES,
+			decision_period: 20 * MINUTES,
+			confirm_period: 8 * MINUTES,
+			min_enactment_period: 3 * MINUTES,
 			min_approval: APP_REFERENDUM_KILLER,
 			min_support: SUP_REFERENDUM_KILLER,
 		},
@@ -211,10 +211,10 @@ const TRACKS_DATA: [(u16, pallet_referenda::TrackInfo<Balance, BlockNumber>); 15
 		pallet_referenda::TrackInfo {
 			name: "small_tipper",
 			max_deciding: 200,
-			decision_deposit: 1 * QUID,
+			decision_deposit: 1 * 3 * CENTS,
 			prepare_period: 1 * MINUTES,
-			decision_period: 7 * DAYS,
-			confirm_period: 10 * MINUTES,
+			decision_period: 14 * MINUTES,
+			confirm_period: 4 * MINUTES,
 			min_enactment_period: 1 * MINUTES,
 			min_approval: APP_SMALL_TIPPER,
 			min_support: SUP_SMALL_TIPPER,
@@ -225,11 +225,11 @@ const TRACKS_DATA: [(u16, pallet_referenda::TrackInfo<Balance, BlockNumber>); 15
 		pallet_referenda::TrackInfo {
 			name: "big_tipper",
 			max_deciding: 100,
-			decision_deposit: 10 * QUID,
-			prepare_period: 10 * MINUTES,
-			decision_period: 7 * DAYS,
-			confirm_period: 1 * HOURS,
-			min_enactment_period: 10 * MINUTES,
+			decision_deposit: 10 * 3 * CENTS,
+			prepare_period: 4 * MINUTES,
+			decision_period: 14 * MINUTES,
+			confirm_period: 12 * MINUTES,
+			min_enactment_period: 3 * MINUTES,
 			min_approval: APP_BIG_TIPPER,
 			min_support: SUP_BIG_TIPPER,
 		},
@@ -239,11 +239,11 @@ const TRACKS_DATA: [(u16, pallet_referenda::TrackInfo<Balance, BlockNumber>); 15
 		pallet_referenda::TrackInfo {
 			name: "small_spender",
 			max_deciding: 50,
-			decision_deposit: 100 * QUID,
-			prepare_period: 4 * HOURS,
-			decision_period: 14 * DAYS,
-			confirm_period: 12 * HOURS,
-			min_enactment_period: 24 * HOURS,
+			decision_deposit: 100 * 3 * CENTS,
+			prepare_period: 10 * MINUTES,
+			decision_period: 20 * MINUTES,
+			confirm_period: 10 * MINUTES,
+			min_enactment_period: 5 * MINUTES,
 			min_approval: APP_SMALL_SPENDER,
 			min_support: SUP_SMALL_SPENDER,
 		},
@@ -253,11 +253,11 @@ const TRACKS_DATA: [(u16, pallet_referenda::TrackInfo<Balance, BlockNumber>); 15
 		pallet_referenda::TrackInfo {
 			name: "medium_spender",
 			max_deciding: 50,
-			decision_deposit: 200 * QUID,
-			prepare_period: 4 * HOURS,
-			decision_period: 14 * DAYS,
-			confirm_period: 24 * HOURS,
-			min_enactment_period: 24 * HOURS,
+			decision_deposit: 200 * 3 * CENTS,
+			prepare_period: 10 * MINUTES,
+			decision_period: 20 * MINUTES,
+			confirm_period: 12 * MINUTES,
+			min_enactment_period: 5 * MINUTES,
 			min_approval: APP_MEDIUM_SPENDER,
 			min_support: SUP_MEDIUM_SPENDER,
 		},
@@ -267,11 +267,11 @@ const TRACKS_DATA: [(u16, pallet_referenda::TrackInfo<Balance, BlockNumber>); 15
 		pallet_referenda::TrackInfo {
 			name: "big_spender",
 			max_deciding: 50,
-			decision_deposit: 400 * QUID,
-			prepare_period: 4 * HOURS,
-			decision_period: 14 * DAYS,
-			confirm_period: 48 * HOURS,
-			min_enactment_period: 24 * HOURS,
+			decision_deposit: 400 * 3 * CENTS,
+			prepare_period: 10 * MINUTES,
+			decision_period: 20 * MINUTES,
+			confirm_period: 14 * MINUTES,
+			min_enactment_period: 5 * MINUTES,
 			min_approval: APP_BIG_SPENDER,
 			min_support: SUP_BIG_SPENDER,
 		},
diff --git a/polkadot/runtime/rococo/src/lib.rs b/polkadot/runtime/rococo/src/lib.rs
index 6894bd7bbf4422c2f9e3f81ad27c8f0a51f19891..3c08b9b2f94efd451e3085a951f25fabc4ec96db 100644
--- a/polkadot/runtime/rococo/src/lib.rs
+++ b/polkadot/runtime/rococo/src/lib.rs
@@ -30,7 +30,10 @@ use primitives::{
 	ValidationCode, ValidationCodeHash, ValidatorId, ValidatorIndex, PARACHAIN_KEY_TYPE_ID,
 };
 use runtime_common::{
-	assigned_slots, auctions, claims, crowdloan, impl_runtime_weights, impls::ToAuthor,
+	assigned_slots, auctions, claims, crowdloan, impl_runtime_weights,
+	impls::{
+		LocatableAssetConverter, ToAuthor, VersionedLocatableAsset, VersionedMultiLocationConverter,
+	},
 	paras_registrar, paras_sudo_wrapper, prod_or_fast, slots, BlockHashCount, BlockLength,
 	SlowAdjustingFeeUpdate,
 };
@@ -46,7 +49,9 @@ use runtime_parachains::{
 	inclusion::{AggregateMessageOrigin, UmpQueueId},
 	initializer as parachains_initializer, origin as parachains_origin, paras as parachains_paras,
 	paras_inherent as parachains_paras_inherent,
-	runtime_api_impl::v5 as parachains_runtime_api_impl,
+	runtime_api_impl::{
+		v7 as parachains_runtime_api_impl, vstaging as parachains_staging_runtime_api_impl,
+	},
 	scheduler as parachains_scheduler, session_info as parachains_session_info,
 	shared as parachains_shared,
 };
@@ -58,10 +63,13 @@ use beefy_primitives::{
 };
 
 use frame_support::{
-	construct_runtime, parameter_types,
+	construct_runtime,
+	genesis_builder_helper::{build_config, create_default_config},
+	parameter_types,
 	traits::{
-		Contains, EitherOfDiverse, InstanceFilter, KeyOwnerProofSystem, LockIdentifier,
-		PrivilegeCmp, ProcessMessage, ProcessMessageError, StorageMapShim, WithdrawReasons,
+		fungible::HoldConsideration, Contains, EitherOf, EitherOfDiverse, EverythingBut,
+		InstanceFilter, KeyOwnerProofSystem, LinearStoragePrice, PrivilegeCmp, ProcessMessage,
+		ProcessMessageError, StorageMapShim, WithdrawReasons,
 	},
 	weights::{ConstantMultiplier, WeightMeter},
 	PalletId,
@@ -76,7 +84,8 @@ use sp_runtime::{
 	create_runtime_str, generic, impl_opaque_keys,
 	traits::{
 		AccountIdLookup, BlakeTwo256, Block as BlockT, ConstU32, ConvertInto,
-		Extrinsic as ExtrinsicT, Keccak256, OpaqueKeys, SaturatedConversion, Verify,
+		Extrinsic as ExtrinsicT, IdentityLookup, Keccak256, OpaqueKeys, SaturatedConversion,
+		Verify,
 	},
 	transaction_validity::{TransactionPriority, TransactionSource, TransactionValidity},
 	ApplyExtrinsicResult, FixedU128, KeyTypeId, Perbill, Percent, Permill, RuntimeDebug,
@@ -85,8 +94,11 @@ use sp_staking::SessionIndex;
 #[cfg(any(feature = "std", test))]
 use sp_version::NativeVersion;
 use sp_version::RuntimeVersion;
-use static_assertions::const_assert;
-use xcm::latest::Junction;
+use xcm::{
+	latest::{InteriorMultiLocation, Junction, Junction::PalletInstance},
+	VersionedMultiLocation,
+};
+use xcm_builder::PayOverXcm;
 
 pub use frame_system::Call as SystemCall;
 pub use pallet_balances::Call as BalancesCall;
@@ -100,6 +112,13 @@ mod weights;
 // XCM configurations.
 pub mod xcm_config;
 
+// Governance and configurations.
+pub mod governance;
+use governance::{
+	pallet_custom_origins, AuctionAdmin, Fellows, GeneralAdmin, LeaseAdmin, Treasurer,
+	TreasurySpender,
+};
+
 mod validator_manager;
 
 impl_runtime_weights!(rococo_runtime_constants);
@@ -114,12 +133,9 @@ pub const VERSION: RuntimeVersion = RuntimeVersion {
 	spec_name: create_runtime_str!("rococo"),
 	impl_name: create_runtime_str!("parity-rococo-v2.0"),
 	authoring_version: 0,
-	spec_version: 9430,
+	spec_version: 10020,
 	impl_version: 0,
-	#[cfg(not(feature = "disable-runtime-api"))]
 	apis: RUNTIME_API_VERSIONS,
-	#[cfg(feature = "disable-runtime-api")]
-	apis: sp_version::create_apis_vec![[]],
 	transaction_version: 22,
 	state_version: 1,
 };
@@ -137,11 +153,14 @@ pub fn native_version() -> NativeVersion {
 	NativeVersion { runtime_version: VERSION, can_author_with: Default::default() }
 }
 
-/// We currently allow all calls.
-pub struct BaseFilter;
-impl Contains<RuntimeCall> for BaseFilter {
-	fn contains(_call: &RuntimeCall) -> bool {
-		true
+/// A type to identify calls to the Identity pallet. These will be filtered to prevent invocation,
+/// locking the state of the pallet and preventing further updates to identities and sub-identities.
+/// The locked state will be the genesis state of a new system chain and then removed from the Relay
+/// Chain.
+pub struct IdentityCalls;
+impl Contains<RuntimeCall> for IdentityCalls {
+	fn contains(c: &RuntimeCall) -> bool {
+		matches!(c, RuntimeCall::Identity(_))
 	}
 }
 
@@ -151,7 +170,7 @@ parameter_types! {
 }
 
 impl frame_system::Config for Runtime {
-	type BaseCallFilter = BaseFilter;
+	type BaseCallFilter = EverythingBut<IdentityCalls>;
 	type BlockWeights = BlockWeights;
 	type BlockLength = BlockLength;
 	type DbWeight = RocksDbWeight;
@@ -183,11 +202,6 @@ parameter_types! {
 	pub const NoPreimagePostponement: Option<u32> = Some(10);
 }
 
-type ScheduleOrigin = EitherOfDiverse<
-	EnsureRoot<AccountId>,
-	pallet_collective::EnsureProportionAtLeast<AccountId, CouncilCollective, 1, 2>,
->;
-
 /// Used the compare the privilege of an origin inside the scheduler.
 pub struct OriginPrivilegeCmp;
 
@@ -200,11 +214,6 @@ impl PrivilegeCmp<OriginCaller> for OriginPrivilegeCmp {
 		match (left, right) {
 			// Root is greater than anything.
 			(OriginCaller::system(frame_system::RawOrigin::Root), _) => Some(Ordering::Greater),
-			// Check which one has more yes votes.
-			(
-				OriginCaller::Council(pallet_collective::RawOrigin::Members(l_yes_votes, l_count)),
-				OriginCaller::Council(pallet_collective::RawOrigin::Members(r_yes_votes, r_count)),
-			) => Some((l_yes_votes * r_count).cmp(&(r_yes_votes * l_count))),
 			// For every other origin we don't care, as they are not used for `ScheduleOrigin`.
 			_ => None,
 		}
@@ -217,7 +226,9 @@ impl pallet_scheduler::Config for Runtime {
 	type PalletsOrigin = OriginCaller;
 	type RuntimeCall = RuntimeCall;
 	type MaximumWeight = MaximumSchedulerWeight;
-	type ScheduleOrigin = ScheduleOrigin;
+	// The goal of having ScheduleOrigin include AuctionAdmin is to allow the auctions track of
+	// OpenGov to schedule periodic auctions.
+	type ScheduleOrigin = EitherOf<EnsureRoot<AccountId>, AuctionAdmin>;
 	type MaxScheduledPerBlock = MaxScheduledPerBlock;
 	type WeightInfo = weights::pallet_scheduler::WeightInfo<Runtime>;
 	type OriginPrivilegeCmp = OriginPrivilegeCmp;
@@ -227,6 +238,7 @@ impl pallet_scheduler::Config for Runtime {
 parameter_types! {
 	pub const PreimageBaseDeposit: Balance = deposit(2, 64);
 	pub const PreimageByteDeposit: Balance = deposit(0, 1);
+	pub const PreimageHoldReason: RuntimeHoldReason = RuntimeHoldReason::Preimage(pallet_preimage::HoldReason::Preimage);
 }
 
 impl pallet_preimage::Config for Runtime {
@@ -234,8 +246,12 @@ impl pallet_preimage::Config for Runtime {
 	type RuntimeEvent = RuntimeEvent;
 	type Currency = Balances;
 	type ManagerOrigin = EnsureRoot<AccountId>;
-	type BaseDeposit = PreimageBaseDeposit;
-	type ByteDeposit = PreimageByteDeposit;
+	type Consideration = HoldConsideration<
+		AccountId,
+		Balances,
+		PreimageHoldReason,
+		LinearStoragePrice<PreimageBaseDeposit, PreimageByteDeposit, Balance>,
+	>;
 }
 
 parameter_types! {
@@ -372,171 +388,6 @@ parameter_types! {
 	pub const BondingDuration: sp_staking::EraIndex = 28;
 }
 
-parameter_types! {
-	pub LaunchPeriod: BlockNumber = prod_or_fast!(7 * DAYS, 1, "ROC_LAUNCH_PERIOD");
-	pub VotingPeriod: BlockNumber = prod_or_fast!(7 * DAYS, 1 * MINUTES, "ROC_VOTING_PERIOD");
-	pub FastTrackVotingPeriod: BlockNumber = prod_or_fast!(3 * HOURS, 1 * MINUTES, "ROC_FAST_TRACK_VOTING_PERIOD");
-	pub const MinimumDeposit: Balance = 100 * CENTS;
-	pub EnactmentPeriod: BlockNumber = prod_or_fast!(8 * DAYS, 1, "ROC_ENACTMENT_PERIOD");
-	pub CooloffPeriod: BlockNumber = prod_or_fast!(7 * DAYS, 1 * MINUTES, "ROC_COOLOFF_PERIOD");
-	pub const InstantAllowed: bool = true;
-	pub const MaxVotes: u32 = 100;
-	pub const MaxProposals: u32 = 100;
-}
-
-impl pallet_democracy::Config for Runtime {
-	type RuntimeEvent = RuntimeEvent;
-	type Currency = Balances;
-	type EnactmentPeriod = EnactmentPeriod;
-	type VoteLockingPeriod = EnactmentPeriod;
-	type LaunchPeriod = LaunchPeriod;
-	type VotingPeriod = VotingPeriod;
-	type MinimumDeposit = MinimumDeposit;
-	type SubmitOrigin = frame_system::EnsureSigned<AccountId>;
-	/// A straight majority of the council can decide what their next motion is.
-	type ExternalOrigin =
-		pallet_collective::EnsureProportionAtLeast<AccountId, CouncilCollective, 1, 2>;
-	/// A majority can have the next scheduled referendum be a straight majority-carries vote.
-	type ExternalMajorityOrigin =
-		pallet_collective::EnsureProportionAtLeast<AccountId, CouncilCollective, 1, 2>;
-	/// A unanimous council can have the next scheduled referendum be a straight default-carries
-	/// (NTB) vote.
-	type ExternalDefaultOrigin =
-		pallet_collective::EnsureProportionAtLeast<AccountId, CouncilCollective, 1, 1>;
-	/// Two thirds of the technical committee can have an `ExternalMajority/ExternalDefault` vote
-	/// be tabled immediately and with a shorter voting/enactment period.
-	type FastTrackOrigin =
-		pallet_collective::EnsureProportionAtLeast<AccountId, TechnicalCollective, 2, 3>;
-	type InstantOrigin =
-		pallet_collective::EnsureProportionAtLeast<AccountId, TechnicalCollective, 1, 1>;
-	type InstantAllowed = InstantAllowed;
-	type FastTrackVotingPeriod = FastTrackVotingPeriod;
-	// To cancel a proposal which has been passed, 2/3 of the council must agree to it.
-	type CancellationOrigin = EitherOfDiverse<
-		EnsureRoot<AccountId>,
-		pallet_collective::EnsureProportionAtLeast<AccountId, CouncilCollective, 2, 3>,
-	>;
-	type BlacklistOrigin = EnsureRoot<AccountId>;
-	// To cancel a proposal before it has been passed, the technical committee must be unanimous or
-	// Root must agree.
-	type CancelProposalOrigin = EitherOfDiverse<
-		EnsureRoot<AccountId>,
-		pallet_collective::EnsureProportionAtLeast<AccountId, TechnicalCollective, 1, 1>,
-	>;
-	// Any single technical committee member may veto a coming council proposal, however they can
-	// only do it once and it lasts only for the cooloff period.
-	type VetoOrigin = pallet_collective::EnsureMember<AccountId, TechnicalCollective>;
-	type CooloffPeriod = CooloffPeriod;
-	type Slash = Treasury;
-	type Scheduler = Scheduler;
-	type PalletsOrigin = OriginCaller;
-	type MaxVotes = MaxVotes;
-	type WeightInfo = weights::pallet_democracy::WeightInfo<Runtime>;
-	type MaxProposals = MaxProposals;
-	type Preimages = Preimage;
-	type MaxDeposits = ConstU32<100>;
-	type MaxBlacklisted = ConstU32<100>;
-}
-
-parameter_types! {
-	pub CouncilMotionDuration: BlockNumber = prod_or_fast!(3 * DAYS, 2 * MINUTES, "ROC_MOTION_DURATION");
-	pub const CouncilMaxProposals: u32 = 100;
-	pub const CouncilMaxMembers: u32 = 100;
-	pub MaxProposalWeight: Weight = Perbill::from_percent(50) * BlockWeights::get().max_block;
-}
-
-type CouncilCollective = pallet_collective::Instance1;
-impl pallet_collective::Config<CouncilCollective> for Runtime {
-	type RuntimeOrigin = RuntimeOrigin;
-	type Proposal = RuntimeCall;
-	type RuntimeEvent = RuntimeEvent;
-	type MotionDuration = CouncilMotionDuration;
-	type MaxProposals = CouncilMaxProposals;
-	type MaxMembers = CouncilMaxMembers;
-	type DefaultVote = pallet_collective::PrimeDefaultVote;
-	type SetMembersOrigin = EnsureRoot<AccountId>;
-	type WeightInfo = weights::pallet_collective_council::WeightInfo<Runtime>;
-	type MaxProposalWeight = MaxProposalWeight;
-}
-
-parameter_types! {
-	pub const CandidacyBond: Balance = 100 * CENTS;
-	// 1 storage item created, key size is 32 bytes, value size is 16+16.
-	pub const VotingBondBase: Balance = deposit(1, 64);
-	// additional data per vote is 32 bytes (account id).
-	pub const VotingBondFactor: Balance = deposit(0, 32);
-	/// Daily council elections
-	pub TermDuration: BlockNumber = prod_or_fast!(24 * HOURS, 2 * MINUTES, "ROC_TERM_DURATION");
-	pub const DesiredMembers: u32 = 19;
-	pub const DesiredRunnersUp: u32 = 19;
-	pub const MaxVoters: u32 = 10 * 1000;
-	pub const MaxVotesPerVoter: u32 = 16;
-	pub const MaxCandidates: u32 = 1000;
-	pub const PhragmenElectionPalletId: LockIdentifier = *b"phrelect";
-}
-
-// Make sure that there are no more than MaxMembers members elected via phragmen.
-const_assert!(DesiredMembers::get() <= CouncilMaxMembers::get());
-
-impl pallet_elections_phragmen::Config for Runtime {
-	type RuntimeEvent = RuntimeEvent;
-	type Currency = Balances;
-	type ChangeMembers = Council;
-	type InitializeMembers = Council;
-	type CurrencyToVote = runtime_common::CurrencyToVote;
-	type CandidacyBond = CandidacyBond;
-	type VotingBondBase = VotingBondBase;
-	type VotingBondFactor = VotingBondFactor;
-	type LoserCandidate = Treasury;
-	type KickedMember = Treasury;
-	type DesiredMembers = DesiredMembers;
-	type DesiredRunnersUp = DesiredRunnersUp;
-	type TermDuration = TermDuration;
-	type MaxVoters = MaxVoters;
-	type MaxVotesPerVoter = MaxVotesPerVoter;
-	type MaxCandidates = MaxCandidates;
-	type PalletId = PhragmenElectionPalletId;
-	type WeightInfo = weights::pallet_elections_phragmen::WeightInfo<Runtime>;
-}
-
-parameter_types! {
-	pub TechnicalMotionDuration: BlockNumber = prod_or_fast!(3 * DAYS, 2 * MINUTES, "ROC_MOTION_DURATION");
-	pub const TechnicalMaxProposals: u32 = 100;
-	pub const TechnicalMaxMembers: u32 = 100;
-}
-
-type TechnicalCollective = pallet_collective::Instance2;
-impl pallet_collective::Config<TechnicalCollective> for Runtime {
-	type RuntimeOrigin = RuntimeOrigin;
-	type Proposal = RuntimeCall;
-	type RuntimeEvent = RuntimeEvent;
-	type MotionDuration = TechnicalMotionDuration;
-	type MaxProposals = TechnicalMaxProposals;
-	type MaxMembers = TechnicalMaxMembers;
-	type DefaultVote = pallet_collective::PrimeDefaultVote;
-	type SetMembersOrigin = EnsureRoot<AccountId>;
-	type WeightInfo = weights::pallet_collective_technical_committee::WeightInfo<Runtime>;
-	type MaxProposalWeight = MaxProposalWeight;
-}
-
-type MoreThanHalfCouncil = EitherOfDiverse<
-	EnsureRoot<AccountId>,
-	pallet_collective::EnsureProportionMoreThan<AccountId, CouncilCollective, 1, 2>,
->;
-
-impl pallet_membership::Config<pallet_membership::Instance1> for Runtime {
-	type RuntimeEvent = RuntimeEvent;
-	type AddOrigin = MoreThanHalfCouncil;
-	type RemoveOrigin = MoreThanHalfCouncil;
-	type SwapOrigin = MoreThanHalfCouncil;
-	type ResetOrigin = MoreThanHalfCouncil;
-	type PrimeOrigin = MoreThanHalfCouncil;
-	type MembershipInitialized = TechnicalCommittee;
-	type MembershipChanged = TechnicalCommittee;
-	type MaxMembers = TechnicalMaxMembers;
-	type WeightInfo = weights::pallet_membership::WeightInfo<Runtime>;
-}
-
 parameter_types! {
 	pub const ProposalBond: Permill = Permill::from_percent(5);
 	pub const ProposalBondMinimum: Balance = 2000 * CENTS;
@@ -544,6 +395,10 @@ parameter_types! {
 	pub const SpendPeriod: BlockNumber = 6 * DAYS;
 	pub const Burn: Permill = Permill::from_perthousand(2);
 	pub const TreasuryPalletId: PalletId = PalletId(*b"py/trsry");
+	pub const PayoutSpendPeriod: BlockNumber = 30 * DAYS;
+	// The asset's interior location for the paying account. This is the Treasury
+	// pallet instance (which sits at index 18).
+	pub TreasuryInteriorLocation: InteriorMultiLocation = PalletInstance(18).into();
 
 	pub const TipCountdown: BlockNumber = 1 * DAYS;
 	pub const TipFindersFee: Percent = Percent::from_percent(20);
@@ -553,18 +408,14 @@ parameter_types! {
 	pub const MaxAuthorities: u32 = 100_000;
 	pub const MaxKeys: u32 = 10_000;
 	pub const MaxPeerInHeartbeats: u32 = 10_000;
+	pub const MaxBalance: Balance = Balance::max_value();
 }
 
-type ApproveOrigin = EitherOfDiverse<
-	EnsureRoot<AccountId>,
-	pallet_collective::EnsureProportionAtLeast<AccountId, CouncilCollective, 3, 5>,
->;
-
 impl pallet_treasury::Config for Runtime {
 	type PalletId = TreasuryPalletId;
 	type Currency = Balances;
-	type ApproveOrigin = ApproveOrigin;
-	type RejectOrigin = MoreThanHalfCouncil;
+	type ApproveOrigin = EitherOfDiverse<EnsureRoot<AccountId>, Treasurer>;
+	type RejectOrigin = EitherOfDiverse<EnsureRoot<AccountId>, Treasurer>;
 	type RuntimeEvent = RuntimeEvent;
 	type OnSlash = Treasury;
 	type ProposalBond = ProposalBond;
@@ -576,7 +427,24 @@ impl pallet_treasury::Config for Runtime {
 	type MaxApprovals = MaxApprovals;
 	type WeightInfo = weights::pallet_treasury::WeightInfo<Runtime>;
 	type SpendFunds = Bounties;
-	type SpendOrigin = frame_support::traits::NeverEnsureOrigin<Balance>;
+	type SpendOrigin = TreasurySpender;
+	type AssetKind = VersionedLocatableAsset;
+	type Beneficiary = VersionedMultiLocation;
+	type BeneficiaryLookup = IdentityLookup<Self::Beneficiary>;
+	type Paymaster = PayOverXcm<
+		TreasuryInteriorLocation,
+		crate::xcm_config::XcmRouter,
+		crate::XcmPallet,
+		ConstU32<{ 6 * HOURS }>,
+		Self::Beneficiary,
+		Self::AssetKind,
+		LocatableAssetConverter,
+		VersionedMultiLocationConverter,
+	>;
+	type BalanceConverter = AssetRate;
+	type PayoutPeriod = PayoutSpendPeriod;
+	#[cfg(feature = "runtime-benchmarks")]
+	type BenchmarkHelper = runtime_common::impls::benchmarks::TreasuryArguments;
 }
 
 parameter_types! {
@@ -617,17 +485,6 @@ impl pallet_child_bounties::Config for Runtime {
 	type WeightInfo = weights::pallet_child_bounties::WeightInfo<Runtime>;
 }
 
-impl pallet_tips::Config for Runtime {
-	type MaximumReasonLength = MaximumReasonLength;
-	type DataDepositPerByte = DataDepositPerByte;
-	type Tippers = PhragmenElection;
-	type TipCountdown = TipCountdown;
-	type TipFindersFee = TipFindersFee;
-	type TipReportDepositBase = TipReportDepositBase;
-	type RuntimeEvent = RuntimeEvent;
-	type WeightInfo = weights::pallet_tips::WeightInfo<Runtime>;
-}
-
 impl pallet_offences::Config for Runtime {
 	type RuntimeEvent = RuntimeEvent;
 	type IdentificationTuple = pallet_session::historical::IdentificationTuple<Self>;
@@ -738,8 +595,7 @@ impl claims::Config for Runtime {
 	type RuntimeEvent = RuntimeEvent;
 	type VestingSchedule = Vesting;
 	type Prefix = Prefix;
-	type MoveClaimOrigin =
-		pallet_collective::EnsureProportionMoreThan<AccountId, CouncilCollective, 1, 2>;
+	type MoveClaimOrigin = EnsureRoot<AccountId>;
 	type WeightInfo = weights::runtime_common_claims::WeightInfo<Runtime>;
 }
 
@@ -763,8 +619,8 @@ impl pallet_identity::Config for Runtime {
 	type MaxAdditionalFields = MaxAdditionalFields;
 	type MaxRegistrars = MaxRegistrars;
 	type Slashed = Treasury;
-	type ForceOrigin = MoreThanHalfCouncil;
-	type RegistrarOrigin = MoreThanHalfCouncil;
+	type ForceOrigin = EitherOf<EnsureRoot<Self::AccountId>, GeneralAdmin>;
+	type RegistrarOrigin = EitherOf<EnsureRoot<Self::AccountId>, GeneralAdmin>;
 	type WeightInfo = weights::pallet_identity::WeightInfo<Runtime>;
 }
 
@@ -905,15 +761,14 @@ impl InstanceFilter<RuntimeCall> for ProxyType {
 				RuntimeCall::Session(..) |
 				RuntimeCall::Grandpa(..) |
 				RuntimeCall::ImOnline(..) |
-				RuntimeCall::Democracy(..) |
-				RuntimeCall::Council(..) |
-				RuntimeCall::TechnicalCommittee(..) |
-				RuntimeCall::PhragmenElection(..) |
-				RuntimeCall::TechnicalMembership(..) |
 				RuntimeCall::Treasury(..) |
 				RuntimeCall::Bounties(..) |
 				RuntimeCall::ChildBounties(..) |
-				RuntimeCall::Tips(..) |
+				RuntimeCall::ConvictionVoting(..) |
+				RuntimeCall::Referenda(..) |
+				RuntimeCall::FellowshipCollective(..) |
+				RuntimeCall::FellowshipReferenda(..) |
+				RuntimeCall::Whitelist(..) |
 				RuntimeCall::Claims(..) |
 				RuntimeCall::Utility(..) |
 				RuntimeCall::Identity(..) |
@@ -940,17 +795,18 @@ impl InstanceFilter<RuntimeCall> for ProxyType {
 				RuntimeCall::Slots(..) |
 				RuntimeCall::Auctions(..) // Specifically omitting the entire XCM Pallet
 			),
-			ProxyType::Governance =>
-				matches!(
-					c,
-					RuntimeCall::Democracy(..) |
-						RuntimeCall::Council(..) | RuntimeCall::TechnicalCommittee(..) |
-						RuntimeCall::PhragmenElection(..) |
-						RuntimeCall::Treasury(..) |
-						RuntimeCall::Bounties(..) |
-						RuntimeCall::Tips(..) | RuntimeCall::Utility(..) |
-						RuntimeCall::ChildBounties(..)
-				),
+			ProxyType::Governance => matches!(
+				c,
+				RuntimeCall::Bounties(..) |
+					RuntimeCall::Utility(..) |
+					RuntimeCall::ChildBounties(..) |
+					// OpenGov calls
+					RuntimeCall::ConvictionVoting(..) |
+					RuntimeCall::Referenda(..) |
+					RuntimeCall::FellowshipCollective(..) |
+					RuntimeCall::FellowshipReferenda(..) |
+					RuntimeCall::Whitelist(..)
+			),
 			ProxyType::IdentityJudgement => matches!(
 				c,
 				RuntimeCall::Identity(pallet_identity::Call::provide_judgement { .. }) |
@@ -1034,6 +890,7 @@ impl parachains_paras::Config for Runtime {
 	type UnsignedPriority = ParasUnsignedPriority;
 	type QueueFootprinter = ParaInclusion;
 	type NextSessionRotation = Babe;
+	type OnNewHead = Registrar;
 }
 
 parameter_types! {
@@ -1175,7 +1032,7 @@ impl slots::Config for Runtime {
 	type Registrar = Registrar;
 	type LeasePeriod = LeasePeriod;
 	type LeaseOffset = ();
-	type ForceOrigin = MoreThanHalfCouncil;
+	type ForceOrigin = EitherOf<EnsureRoot<Self::AccountId>, LeaseAdmin>;
 	type WeightInfo = weights::runtime_common_slots::WeightInfo<Runtime>;
 }
 
@@ -1208,11 +1065,6 @@ parameter_types! {
 	pub const SampleLength: BlockNumber = 2 * MINUTES;
 }
 
-type AuctionInitiate = EitherOfDiverse<
-	EnsureRoot<AccountId>,
-	pallet_collective::EnsureProportionAtLeast<AccountId, CouncilCollective, 2, 3>,
->;
-
 impl auctions::Config for Runtime {
 	type RuntimeEvent = RuntimeEvent;
 	type Leaser = Slots;
@@ -1220,7 +1072,7 @@ impl auctions::Config for Runtime {
 	type EndingPeriod = EndingPeriod;
 	type SampleLength = SampleLength;
 	type Randomness = pallet_babe::RandomnessFromOneEpochAgo<Runtime>;
-	type InitiateOrigin = AuctionInitiate;
+	type InitiateOrigin = EitherOf<EnsureRoot<Self::AccountId>, AuctionAdmin>;
 	type WeightInfo = weights::runtime_common_auctions::WeightInfo<Runtime>;
 }
 
@@ -1382,6 +1234,18 @@ impl pallet_sudo::Config for Runtime {
 	type WeightInfo = weights::pallet_sudo::WeightInfo<Runtime>;
 }
 
+impl pallet_asset_rate::Config for Runtime {
+	type WeightInfo = weights::pallet_asset_rate::WeightInfo<Runtime>;
+	type RuntimeEvent = RuntimeEvent;
+	type CreateOrigin = EnsureRoot<AccountId>;
+	type RemoveOrigin = EnsureRoot<AccountId>;
+	type UpdateOrigin = EnsureRoot<AccountId>;
+	type Currency = Balances;
+	type AssetKind = <Runtime as pallet_treasury::Config>::AssetKind;
+	#[cfg(feature = "runtime-benchmarks")]
+	type BenchmarkHelper = runtime_common::impls::benchmarks::AssetRateArguments;
+}
+
 construct_runtime! {
 	pub enum Runtime
 	{
@@ -1416,13 +1280,19 @@ construct_runtime! {
 		AuthorityDiscovery: pallet_authority_discovery::{Pallet, Config<T>} = 12,
 
 		// Governance stuff; uncallable initially.
-		Democracy: pallet_democracy::{Pallet, Call, Storage, Config<T>, Event<T>} = 13,
-		Council: pallet_collective::<Instance1>::{Pallet, Call, Storage, Origin<T>, Event<T>, Config<T>} = 14,
-		TechnicalCommittee: pallet_collective::<Instance2>::{Pallet, Call, Storage, Origin<T>, Event<T>, Config<T>} = 15,
-		PhragmenElection: pallet_elections_phragmen::{Pallet, Call, Storage, Event<T>, Config<T>} = 16,
-		TechnicalMembership: pallet_membership::<Instance1>::{Pallet, Call, Storage, Event<T>, Config<T>} = 17,
 		Treasury: pallet_treasury::{Pallet, Call, Storage, Config<T>, Event<T>} = 18,
-
+		ConvictionVoting: pallet_conviction_voting::{Pallet, Call, Storage, Event<T>} = 20,
+		Referenda: pallet_referenda::{Pallet, Call, Storage, Event<T>} = 21,
+		//	pub type FellowshipCollectiveInstance = pallet_ranked_collective::Instance1;
+		FellowshipCollective: pallet_ranked_collective::<Instance1>::{
+			Pallet, Call, Storage, Event<T>
+		} = 22,
+		// pub type FellowshipReferendaInstance = pallet_referenda::Instance2;
+		FellowshipReferenda: pallet_referenda::<Instance2>::{
+			Pallet, Call, Storage, Event<T>
+		} = 23,
+		Origins: pallet_custom_origins::{Origin} = 43,
+		Whitelist: pallet_whitelist::{Pallet, Call, Storage, Event<T>} = 44,
 		// Claims. Usable initially.
 		Claims: claims::{Pallet, Call, Storage, Event<T>, Config<T>, ValidateUnsigned} = 19,
 
@@ -1451,15 +1321,15 @@ construct_runtime! {
 		Multisig: pallet_multisig::{Pallet, Call, Storage, Event<T>} = 31,
 
 		// Preimage registrar.
-		Preimage: pallet_preimage::{Pallet, Call, Storage, Event<T>} = 32,
+		Preimage: pallet_preimage::{Pallet, Call, Storage, Event<T>, HoldReason} = 32,
+
+		// Asset rate.
+		AssetRate: pallet_asset_rate::{Pallet, Call, Storage, Event<T>} = 39,
 
 		// Bounties modules.
 		Bounties: pallet_bounties::{Pallet, Call, Storage, Event<T>} = 35,
 		ChildBounties: pallet_child_bounties = 40,
 
-		// Tips module.
-		Tips: pallet_tips::{Pallet, Call, Storage, Event<T>} = 36,
-
 		// NIS pallet.
 		Nis: pallet_nis::{Pallet, Call, Storage, Event<T>, HoldReason} = 38,
 //		pub type NisCounterpartInstance = pallet_balances::Instance2;
@@ -1544,6 +1414,52 @@ pub type Migrations = migrations::Unreleased;
 pub mod migrations {
 	use super::*;
 
+	use frame_support::traits::LockIdentifier;
+	use frame_system::pallet_prelude::BlockNumberFor;
+
+	parameter_types! {
+		pub const DemocracyPalletName: &'static str = "Democracy";
+		pub const CouncilPalletName: &'static str = "Council";
+		pub const TechnicalCommitteePalletName: &'static str = "TechnicalCommittee";
+		pub const PhragmenElectionPalletName: &'static str = "PhragmenElection";
+		pub const TechnicalMembershipPalletName: &'static str = "TechnicalMembership";
+		pub const TipsPalletName: &'static str = "Tips";
+		pub const PhragmenElectionPalletId: LockIdentifier = *b"phrelect";
+	}
+
+	// Special Config for Gov V1 pallets, allowing us to run migrations for them without
+	// implementing their configs on [`Runtime`].
+	pub struct UnlockConfig;
+	impl pallet_democracy::migrations::unlock_and_unreserve_all_funds::UnlockConfig for UnlockConfig {
+		type Currency = Balances;
+		type MaxVotes = ConstU32<100>;
+		type MaxDeposits = ConstU32<100>;
+		type AccountId = AccountId;
+		type BlockNumber = BlockNumberFor<Runtime>;
+		type DbWeight = <Runtime as frame_system::Config>::DbWeight;
+		type PalletName = DemocracyPalletName;
+	}
+	impl pallet_elections_phragmen::migrations::unlock_and_unreserve_all_funds::UnlockConfig
+		for UnlockConfig
+	{
+		type Currency = Balances;
+		type MaxVotesPerVoter = ConstU32<16>;
+		type PalletId = PhragmenElectionPalletId;
+		type AccountId = AccountId;
+		type DbWeight = <Runtime as frame_system::Config>::DbWeight;
+		type PalletName = PhragmenElectionPalletName;
+	}
+	impl pallet_tips::migrations::unreserve_deposits::UnlockConfig<()> for UnlockConfig {
+		type Currency = Balances;
+		type Hash = Hash;
+		type DataDepositPerByte = DataDepositPerByte;
+		type TipReportDepositBase = TipReportDepositBase;
+		type AccountId = AccountId;
+		type BlockNumber = BlockNumberFor<Runtime>;
+		type DbWeight = <Runtime as frame_system::Config>::DbWeight;
+		type PalletName = TipsPalletName;
+	}
+
 	/// Unreleased migrations. Add new ones here:
 	pub type Unreleased = (
 		pallet_society::migrations::VersionCheckedMigrateToV2<Runtime, (), ()>,
@@ -1552,6 +1468,25 @@ pub mod migrations {
 		assigned_slots::migration::v1::VersionCheckedMigrateToV1<Runtime>,
 		parachains_scheduler::migration::v1::MigrateToV1<Runtime>,
 		parachains_configuration::migration::v8::MigrateToV8<Runtime>,
+		parachains_configuration::migration::v9::MigrateToV9<Runtime>,
+		paras_registrar::migration::VersionCheckedMigrateToV1<Runtime, ()>,
+		pallet_referenda::migration::v1::MigrateV0ToV1<Runtime, ()>,
+		pallet_referenda::migration::v1::MigrateV0ToV1<Runtime, pallet_referenda::Instance2>,
+
+		// Unlock & unreserve Gov1 funds
+
+		pallet_elections_phragmen::migrations::unlock_and_unreserve_all_funds::UnlockAndUnreserveAllFunds<UnlockConfig>,
+		pallet_democracy::migrations::unlock_and_unreserve_all_funds::UnlockAndUnreserveAllFunds<UnlockConfig>,
+		pallet_tips::migrations::unreserve_deposits::UnreserveDeposits<UnlockConfig, ()>,
+
+		// Delete all Gov v1 pallet storage key/values.
+
+		frame_support::migrations::RemovePallet<DemocracyPalletName, <Runtime as frame_system::Config>::DbWeight>,
+		frame_support::migrations::RemovePallet<CouncilPalletName, <Runtime as frame_system::Config>::DbWeight>,
+		frame_support::migrations::RemovePallet<TechnicalCommitteePalletName, <Runtime as frame_system::Config>::DbWeight>,
+		frame_support::migrations::RemovePallet<PhragmenElectionPalletName, <Runtime as frame_system::Config>::DbWeight>,
+		frame_support::migrations::RemovePallet<TechnicalMembershipPalletName, <Runtime as frame_system::Config>::DbWeight>,
+		frame_support::migrations::RemovePallet<TipsPalletName, <Runtime as frame_system::Config>::DbWeight>,
 	);
 }
 
@@ -1618,28 +1553,28 @@ mod benches {
 		[frame_benchmarking::baseline, Baseline::<Runtime>]
 		[pallet_bounties, Bounties]
 		[pallet_child_bounties, ChildBounties]
-		[pallet_collective, Council]
-		[pallet_collective, TechnicalCommittee]
-		[pallet_democracy, Democracy]
-		[pallet_elections_phragmen, PhragmenElection]
+		[pallet_conviction_voting, ConvictionVoting]
 		[pallet_nis, Nis]
 		[pallet_identity, Identity]
 		[pallet_im_online, ImOnline]
 		[pallet_indices, Indices]
-		[pallet_membership, TechnicalMembership]
 		[pallet_message_queue, MessageQueue]
 		[pallet_multisig, Multisig]
 		[pallet_preimage, Preimage]
 		[pallet_proxy, Proxy]
+		[pallet_ranked_collective, FellowshipCollective]
 		[pallet_recovery, Recovery]
+		[pallet_referenda, Referenda]
+		[pallet_referenda, FellowshipReferenda]
 		[pallet_scheduler, Scheduler]
 		[pallet_sudo, Sudo]
 		[frame_system, SystemBench::<Runtime>]
 		[pallet_timestamp, Timestamp]
-		[pallet_tips, Tips]
 		[pallet_treasury, Treasury]
 		[pallet_utility, Utility]
 		[pallet_vesting, Vesting]
+		[pallet_asset_rate, AssetRate]
+		[pallet_whitelist, Whitelist]
 		// XCM
 		[pallet_xcm, XcmPallet]
 		[pallet_xcm_benchmarks::fungible, pallet_xcm_benchmarks::fungible::Pallet::<Runtime>]
@@ -1647,7 +1582,6 @@ mod benches {
 	);
 }
 
-#[cfg(not(feature = "disable-runtime-api"))]
 sp_api::impl_runtime_apis! {
 	impl sp_api::Core<Block> for Runtime {
 		fn version() -> RuntimeVersion {
@@ -1714,6 +1648,7 @@ sp_api::impl_runtime_apis! {
 		}
 	}
 
+	#[api_version(8)]
 	impl primitives::runtime_api::ParachainHost<Block, Hash, BlockNumber> for Runtime {
 		fn validators() -> Vec<ValidatorId> {
 			parachains_runtime_api_impl::validators::<Runtime>()
@@ -1844,6 +1779,23 @@ sp_api::impl_runtime_apis! {
 				key_ownership_proof,
 			)
 		}
+
+		fn minimum_backing_votes() -> u32 {
+			parachains_runtime_api_impl::minimum_backing_votes::<Runtime>()
+		}
+
+		fn para_backing_state(para_id: ParaId) -> Option<primitives::async_backing::BackingState> {
+			parachains_runtime_api_impl::backing_state::<Runtime>(para_id)
+		}
+
+		fn async_backing_params() -> primitives::AsyncBackingParams {
+			parachains_runtime_api_impl::async_backing_params::<Runtime>()
+		}
+
+		fn disabled_validators() -> Vec<ValidatorIndex> {
+			parachains_staging_runtime_api_impl::disabled_validators::<Runtime>()
+		}
+
 	}
 
 	#[api_version(3)]
@@ -2120,7 +2072,7 @@ sp_api::impl_runtime_apis! {
 			use sp_storage::TrackedStorageKey;
 			use xcm::latest::prelude::*;
 			use xcm_config::{
-				LocalCheckAccount, LocationConverter, Rockmine, TokenLocation, XcmConfig,
+				LocalCheckAccount, LocationConverter, AssetHub, TokenLocation, XcmConfig,
 			};
 
 			impl frame_system_benchmarking::Config for Runtime {}
@@ -2129,7 +2081,7 @@ sp_api::impl_runtime_apis! {
 				type XcmConfig = XcmConfig;
 				type AccountIdConverter = LocationConverter;
 				fn valid_destination() -> Result<MultiLocation, BenchmarkError> {
-					Ok(Rockmine::get())
+					Ok(AssetHub::get())
 				}
 				fn worst_case_holding(_depositable_count: u32) -> MultiAssets {
 					// Rococo only knows about ROC
@@ -2142,7 +2094,7 @@ sp_api::impl_runtime_apis! {
 
 			parameter_types! {
 				pub const TrustedTeleporter: Option<(MultiLocation, MultiAsset)> = Some((
-					Rockmine::get(),
+					AssetHub::get(),
 					MultiAsset { fun: Fungible(1 * UNITS), id: Concrete(TokenLocation::get()) },
 				));
 				pub const TrustedReserve: Option<(MultiLocation, MultiAsset)> = None;
@@ -2181,15 +2133,15 @@ sp_api::impl_runtime_apis! {
 				}
 
 				fn transact_origin_and_runtime_call() -> Result<(MultiLocation, RuntimeCall), BenchmarkError> {
-					Ok((Rockmine::get(), frame_system::Call::remark_with_event { remark: vec![] }.into()))
+					Ok((AssetHub::get(), frame_system::Call::remark_with_event { remark: vec![] }.into()))
 				}
 
 				fn subscribe_origin() -> Result<MultiLocation, BenchmarkError> {
-					Ok(Rockmine::get())
+					Ok(AssetHub::get())
 				}
 
 				fn claimable_asset() -> Result<(MultiLocation, MultiLocation, MultiAssets), BenchmarkError> {
-					let origin = Rockmine::get();
+					let origin = AssetHub::get();
 					let assets: MultiAssets = (Concrete(TokenLocation::get()), 1_000 * UNITS).into();
 					let ticket = MultiLocation { parents: 0, interior: Here };
 					Ok((origin, ticket, assets))
@@ -2224,6 +2176,16 @@ sp_api::impl_runtime_apis! {
 			Ok(batches)
 		}
 	}
+
+	impl sp_genesis_builder::GenesisBuilder<Block> for Runtime {
+		fn create_default_config() -> Vec<u8> {
+			create_default_config::<RuntimeGenesisConfig>()
+		}
+
+		fn build_config(config: Vec<u8>) -> sp_genesis_builder::Result {
+			build_config::<RuntimeGenesisConfig>(config)
+		}
+	}
 }
 
 #[cfg(test)]
diff --git a/polkadot/runtime/rococo/src/weights/mod.rs b/polkadot/runtime/rococo/src/weights/mod.rs
index 21558ca3fb90548f08d90bb79fcea531165d3287..9c563a67d98b721b08cb3d84c4f5562682749b1d 100644
--- a/polkadot/runtime/rococo/src/weights/mod.rs
+++ b/polkadot/runtime/rococo/src/weights/mod.rs
@@ -16,31 +16,31 @@
 //! A list of the different weight modules for our runtime.
 
 pub mod frame_system;
+pub mod pallet_asset_rate;
 pub mod pallet_balances;
 pub mod pallet_balances_nis_counterpart_balances;
 pub mod pallet_bounties;
 pub mod pallet_child_bounties;
-pub mod pallet_collective_council;
-pub mod pallet_collective_technical_committee;
-pub mod pallet_democracy;
-pub mod pallet_elections_phragmen;
+pub mod pallet_conviction_voting;
 pub mod pallet_identity;
 pub mod pallet_im_online;
 pub mod pallet_indices;
-pub mod pallet_membership;
 pub mod pallet_message_queue;
 pub mod pallet_multisig;
 pub mod pallet_nis;
 pub mod pallet_preimage;
 pub mod pallet_proxy;
+pub mod pallet_ranked_collective;
+pub mod pallet_referenda_fellowship_referenda;
+pub mod pallet_referenda_referenda;
 pub mod pallet_scheduler;
 pub mod pallet_session;
 pub mod pallet_sudo;
 pub mod pallet_timestamp;
-pub mod pallet_tips;
 pub mod pallet_treasury;
 pub mod pallet_utility;
 pub mod pallet_vesting;
+pub mod pallet_whitelist;
 pub mod pallet_xcm;
 pub mod runtime_common_assigned_slots;
 pub mod runtime_common_auctions;
diff --git a/polkadot/runtime/rococo/src/weights/pallet_asset_rate.rs b/polkadot/runtime/rococo/src/weights/pallet_asset_rate.rs
new file mode 100644
index 0000000000000000000000000000000000000000..da2d1958cefcfeb41bcdba7ed2dd9c6b4272e873
--- /dev/null
+++ b/polkadot/runtime/rococo/src/weights/pallet_asset_rate.rs
@@ -0,0 +1,86 @@
+// 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/>.
+
+//! Autogenerated weights for `pallet_asset_rate`
+//!
+//! THIS FILE WAS AUTO-GENERATED USING THE SUBSTRATE BENCHMARK CLI VERSION 4.0.0-dev
+//! DATE: 2023-07-03, STEPS: `50`, REPEAT: `2`, LOW RANGE: `[]`, HIGH RANGE: `[]`
+//! WORST CASE MAP SIZE: `1000000`
+//! HOSTNAME: `cob`, CPU: `<UNKNOWN>`
+//! EXECUTION: None, WASM-EXECUTION: Compiled, CHAIN: Some("rococo-dev"), DB CACHE: 1024
+
+// Executed Command:
+// ./target/debug/polkadot
+// benchmark
+// pallet
+// --chain=rococo-dev
+// --steps=50
+// --repeat=2
+// --pallet=pallet_asset_rate
+// --extrinsic=*
+// --wasm-execution=compiled
+// --heap-pages=4096
+// --output=./runtime/rococo/src/weights/
+// --header=./file_header.txt
+
+#![cfg_attr(rustfmt, rustfmt_skip)]
+#![allow(unused_parens)]
+#![allow(unused_imports)]
+#![allow(missing_docs)]
+
+use frame_support::{traits::Get, weights::Weight};
+use core::marker::PhantomData;
+
+/// Weight functions for `pallet_asset_rate`.
+pub struct WeightInfo<T>(PhantomData<T>);
+impl<T: frame_system::Config> pallet_asset_rate::WeightInfo for WeightInfo<T> {
+	/// Storage: AssetRate ConversionRateToNative (r:1 w:1)
+	/// Proof: AssetRate ConversionRateToNative (max_values: None, max_size: Some(1237), added: 3712, mode: MaxEncodedLen)
+	fn create() -> Weight {
+		// Proof Size summary in bytes:
+		//  Measured:  `42`
+		//  Estimated: `4702`
+		// Minimum execution time: 143_000_000 picoseconds.
+		Weight::from_parts(155_000_000, 0)
+			.saturating_add(Weight::from_parts(0, 4702))
+			.saturating_add(T::DbWeight::get().reads(1))
+			.saturating_add(T::DbWeight::get().writes(1))
+	}
+	/// Storage: AssetRate ConversionRateToNative (r:1 w:1)
+	/// Proof: AssetRate ConversionRateToNative (max_values: None, max_size: Some(1237), added: 3712, mode: MaxEncodedLen)
+	fn update() -> Weight {
+		// Proof Size summary in bytes:
+		//  Measured:  `110`
+		//  Estimated: `4702`
+		// Minimum execution time: 156_000_000 picoseconds.
+		Weight::from_parts(172_000_000, 0)
+			.saturating_add(Weight::from_parts(0, 4702))
+			.saturating_add(T::DbWeight::get().reads(1))
+			.saturating_add(T::DbWeight::get().writes(1))
+	}
+	/// Storage: AssetRate ConversionRateToNative (r:1 w:1)
+	/// Proof: AssetRate ConversionRateToNative (max_values: None, max_size: Some(1237), added: 3712, mode: MaxEncodedLen)
+	fn remove() -> Weight {
+		// Proof Size summary in bytes:
+		//  Measured:  `110`
+		//  Estimated: `4702`
+		// Minimum execution time: 150_000_000 picoseconds.
+		Weight::from_parts(160_000_000, 0)
+			.saturating_add(Weight::from_parts(0, 4702))
+			.saturating_add(T::DbWeight::get().reads(1))
+			.saturating_add(T::DbWeight::get().writes(1))
+	}
+}
diff --git a/polkadot/runtime/rococo/src/weights/pallet_collective.rs b/polkadot/runtime/rococo/src/weights/pallet_collective.rs
deleted file mode 100644
index 9bf6671e2297112790655e99037f0ab412556ddc..0000000000000000000000000000000000000000
--- a/polkadot/runtime/rococo/src/weights/pallet_collective.rs
+++ /dev/null
@@ -1,196 +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/>.
-//! Autogenerated weights for `pallet_collective`
-//!
-//! THIS FILE WAS AUTO-GENERATED USING THE SUBSTRATE BENCHMARK CLI VERSION 4.0.0-dev
-//! DATE: 2022-09-08, STEPS: `50`, REPEAT: 20, LOW RANGE: `[]`, HIGH RANGE: `[]`
-//! HOSTNAME: `bm5`, CPU: `Intel(R) Core(TM) i7-7700K CPU @ 4.20GHz`
-//! EXECUTION: Some(Wasm), WASM-EXECUTION: Compiled, CHAIN: Some("rococo-dev"), DB CACHE: 1024
-
-// Executed Command:
-// ./target/production/polkadot
-// benchmark
-// pallet
-// --chain=rococo-dev
-// --steps=50
-// --repeat=20
-// --pallet=pallet_collective
-// --extrinsic=*
-// --execution=wasm
-// --wasm-execution=compiled
-// --header=./file_header.txt
-// --output=./runtime/rococo/src/weights/
-
-#![cfg_attr(rustfmt, rustfmt_skip)]
-#![allow(unused_parens)]
-#![allow(unused_imports)]
-
-use frame_support::{traits::Get, weights::{Weight}};
-use sp_std::marker::PhantomData;
-
-/// Weight functions for `pallet_collective`.
-pub struct WeightInfo<T>(PhantomData<T>);
-impl<T: frame_system::Config> pallet_collective::WeightInfo for WeightInfo<T> {
-	// Storage: Collective Members (r:1 w:1)
-	// Storage: Collective Proposals (r:1 w:0)
-	// Storage: Collective Voting (r:100 w:100)
-	// Storage: Collective Prime (r:0 w:1)
-	/// The range of component `m` is `[1, 100]`.
-	/// The range of component `n` is `[1, 100]`.
-	/// The range of component `p` is `[1, 100]`.
-	fn set_members(m: u32, _n: u32, p: u32, ) -> Weight {
-		Weight::from_parts(0 as u64, 0)
-			// Standard Error: 15_000
-			.saturating_add(Weight::from_parts(10_832_000 as u64, 0).saturating_mul(m as u64))
-			// Standard Error: 15_000
-			.saturating_add(Weight::from_parts(12_894_000 as u64, 0).saturating_mul(p as u64))
-			.saturating_add(T::DbWeight::get().reads(2 as u64))
-			.saturating_add(T::DbWeight::get().reads((1 as u64).saturating_mul(p as u64)))
-			.saturating_add(T::DbWeight::get().writes(2 as u64))
-			.saturating_add(T::DbWeight::get().writes((1 as u64).saturating_mul(p as u64)))
-	}
-	// Storage: Collective Members (r:1 w:0)
-	/// The range of component `b` is `[1, 1024]`.
-	/// The range of component `m` is `[1, 100]`.
-	fn execute(b: u32, m: u32, ) -> Weight {
-		Weight::from_parts(19_069_000 as u64, 0)
-			// Standard Error: 0
-			.saturating_add(Weight::from_parts(2_000 as u64, 0).saturating_mul(b as u64))
-			// Standard Error: 0
-			.saturating_add(Weight::from_parts(13_000 as u64, 0).saturating_mul(m as u64))
-			.saturating_add(T::DbWeight::get().reads(1 as u64))
-	}
-	// Storage: Collective Members (r:1 w:0)
-	// Storage: Collective ProposalOf (r:1 w:0)
-	/// The range of component `b` is `[1, 1024]`.
-	/// The range of component `m` is `[1, 100]`.
-	fn propose_execute(b: u32, m: u32, ) -> Weight {
-		Weight::from_parts(20_794_000 as u64, 0)
-			// Standard Error: 0
-			.saturating_add(Weight::from_parts(2_000 as u64, 0).saturating_mul(b as u64))
-			// Standard Error: 0
-			.saturating_add(Weight::from_parts(22_000 as u64, 0).saturating_mul(m as u64))
-			.saturating_add(T::DbWeight::get().reads(2 as u64))
-	}
-	// Storage: Collective Members (r:1 w:0)
-	// Storage: Collective ProposalOf (r:1 w:1)
-	// Storage: Collective Proposals (r:1 w:1)
-	// Storage: Collective ProposalCount (r:1 w:1)
-	// Storage: Collective Voting (r:0 w:1)
-	/// The range of component `b` is `[1, 1024]`.
-	/// The range of component `m` is `[2, 100]`.
-	/// The range of component `p` is `[1, 100]`.
-	fn propose_proposed(b: u32, m: u32, p: u32, ) -> Weight {
-		Weight::from_parts(27_870_000 as u64, 0)
-			// Standard Error: 0
-			.saturating_add(Weight::from_parts(3_000 as u64, 0).saturating_mul(b as u64))
-			// Standard Error: 1_000
-			.saturating_add(Weight::from_parts(22_000 as u64, 0).saturating_mul(m as u64))
-			// Standard Error: 1_000
-			.saturating_add(Weight::from_parts(94_000 as u64, 0).saturating_mul(p as u64))
-			.saturating_add(T::DbWeight::get().reads(4 as u64))
-			.saturating_add(T::DbWeight::get().writes(4 as u64))
-	}
-	// Storage: Collective Members (r:1 w:0)
-	// Storage: Collective Voting (r:1 w:1)
-	/// The range of component `m` is `[5, 100]`.
-	fn vote(m: u32, ) -> Weight {
-		Weight::from_parts(27_249_000 as u64, 0)
-			// Standard Error: 0
-			.saturating_add(Weight::from_parts(35_000 as u64, 0).saturating_mul(m as u64))
-			.saturating_add(T::DbWeight::get().reads(2 as u64))
-			.saturating_add(T::DbWeight::get().writes(1 as u64))
-	}
-	// Storage: Collective Voting (r:1 w:1)
-	// Storage: Collective Members (r:1 w:0)
-	// Storage: Collective Proposals (r:1 w:1)
-	// Storage: Collective ProposalOf (r:0 w:1)
-	/// The range of component `m` is `[4, 100]`.
-	/// The range of component `p` is `[1, 100]`.
-	fn close_early_disapproved(m: u32, p: u32, ) -> Weight {
-		Weight::from_parts(30_754_000 as u64, 0)
-			// Standard Error: 0
-			.saturating_add(Weight::from_parts(28_000 as u64, 0).saturating_mul(m as u64))
-			// Standard Error: 0
-			.saturating_add(Weight::from_parts(81_000 as u64, 0).saturating_mul(p as u64))
-			.saturating_add(T::DbWeight::get().reads(3 as u64))
-			.saturating_add(T::DbWeight::get().writes(3 as u64))
-	}
-	// Storage: Collective Voting (r:1 w:1)
-	// Storage: Collective Members (r:1 w:0)
-	// Storage: Collective ProposalOf (r:1 w:1)
-	// Storage: Collective Proposals (r:1 w:1)
-	/// The range of component `b` is `[1, 1024]`.
-	/// The range of component `m` is `[4, 100]`.
-	/// The range of component `p` is `[1, 100]`.
-	fn close_early_approved(b: u32, m: u32, p: u32, ) -> Weight {
-		Weight::from_parts(39_508_000 as u64, 0)
-			// Standard Error: 0
-			.saturating_add(Weight::from_parts(1_000 as u64, 0).saturating_mul(b as u64))
-			// Standard Error: 0
-			.saturating_add(Weight::from_parts(29_000 as u64, 0).saturating_mul(m as u64))
-			// Standard Error: 0
-			.saturating_add(Weight::from_parts(90_000 as u64, 0).saturating_mul(p as u64))
-			.saturating_add(T::DbWeight::get().reads(4 as u64))
-			.saturating_add(T::DbWeight::get().writes(3 as u64))
-	}
-	// Storage: Collective Voting (r:1 w:1)
-	// Storage: Collective Members (r:1 w:0)
-	// Storage: Collective Prime (r:1 w:0)
-	// Storage: Collective Proposals (r:1 w:1)
-	// Storage: Collective ProposalOf (r:0 w:1)
-	/// The range of component `m` is `[4, 100]`.
-	/// The range of component `p` is `[1, 100]`.
-	fn close_disapproved(m: u32, p: u32, ) -> Weight {
-		Weight::from_parts(32_769_000 as u64, 0)
-			// Standard Error: 0
-			.saturating_add(Weight::from_parts(31_000 as u64, 0).saturating_mul(m as u64))
-			// Standard Error: 0
-			.saturating_add(Weight::from_parts(83_000 as u64, 0).saturating_mul(p as u64))
-			.saturating_add(T::DbWeight::get().reads(4 as u64))
-			.saturating_add(T::DbWeight::get().writes(3 as u64))
-	}
-	// Storage: Collective Voting (r:1 w:1)
-	// Storage: Collective Members (r:1 w:0)
-	// Storage: Collective Prime (r:1 w:0)
-	// Storage: Collective ProposalOf (r:1 w:1)
-	// Storage: Collective Proposals (r:1 w:1)
-	/// The range of component `b` is `[1, 1024]`.
-	/// The range of component `m` is `[4, 100]`.
-	/// The range of component `p` is `[1, 100]`.
-	fn close_approved(b: u32, m: u32, p: u32, ) -> Weight {
-		Weight::from_parts(41_704_000 as u64, 0)
-			// Standard Error: 0
-			.saturating_add(Weight::from_parts(1_000 as u64, 0).saturating_mul(b as u64))
-			// Standard Error: 0
-			.saturating_add(Weight::from_parts(28_000 as u64, 0).saturating_mul(m as u64))
-			// Standard Error: 0
-			.saturating_add(Weight::from_parts(92_000 as u64, 0).saturating_mul(p as u64))
-			.saturating_add(T::DbWeight::get().reads(5 as u64))
-			.saturating_add(T::DbWeight::get().writes(3 as u64))
-	}
-	// Storage: Collective Proposals (r:1 w:1)
-	// Storage: Collective Voting (r:0 w:1)
-	// Storage: Collective ProposalOf (r:0 w:1)
-	/// The range of component `p` is `[1, 100]`.
-	fn disapprove_proposal(p: u32, ) -> Weight {
-		Weight::from_parts(22_720_000 as u64, 0)
-			// Standard Error: 2_000
-			.saturating_add(Weight::from_parts(74_000 as u64, 0).saturating_mul(p as u64))
-			.saturating_add(T::DbWeight::get().reads(1 as u64))
-			.saturating_add(T::DbWeight::get().writes(3 as u64))
-	}
-}
diff --git a/polkadot/runtime/rococo/src/weights/pallet_collective_council.rs b/polkadot/runtime/rococo/src/weights/pallet_collective_council.rs
deleted file mode 100644
index 835bdef7e67387d97edd1e7004a4a5d454711960..0000000000000000000000000000000000000000
--- a/polkadot/runtime/rococo/src/weights/pallet_collective_council.rs
+++ /dev/null
@@ -1,322 +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/>.
-
-//! Autogenerated weights for `pallet_collective`
-//!
-//! THIS FILE WAS AUTO-GENERATED USING THE SUBSTRATE BENCHMARK CLI VERSION 4.0.0-dev
-//! DATE: 2023-05-26, STEPS: `50`, REPEAT: `20`, LOW RANGE: `[]`, HIGH RANGE: `[]`
-//! WORST CASE MAP SIZE: `1000000`
-//! HOSTNAME: `bm5`, CPU: `Intel(R) Core(TM) i7-7700K CPU @ 4.20GHz`
-//! EXECUTION: Some(Wasm), WASM-EXECUTION: Compiled, CHAIN: Some("rococo-dev"), DB CACHE: 1024
-
-// Executed Command:
-// ./target/production/polkadot
-// benchmark
-// pallet
-// --chain=rococo-dev
-// --steps=50
-// --repeat=20
-// --pallet=pallet_collective
-// --extrinsic=*
-// --execution=wasm
-// --wasm-execution=compiled
-// --header=./file_header.txt
-// --output=./runtime/rococo/src/weights/
-
-#![cfg_attr(rustfmt, rustfmt_skip)]
-#![allow(unused_parens)]
-#![allow(unused_imports)]
-#![allow(missing_docs)]
-
-use frame_support::{traits::Get, weights::Weight};
-use core::marker::PhantomData;
-
-/// Weight functions for `pallet_collective`.
-pub struct WeightInfo<T>(PhantomData<T>);
-impl<T: frame_system::Config> pallet_collective::WeightInfo for WeightInfo<T> {
-	/// Storage: Council Members (r:1 w:1)
-	/// Proof Skipped: Council Members (max_values: Some(1), max_size: None, mode: Measured)
-	/// Storage: Council Proposals (r:1 w:0)
-	/// Proof Skipped: Council Proposals (max_values: Some(1), max_size: None, mode: Measured)
-	/// Storage: Council Voting (r:100 w:100)
-	/// Proof Skipped: Council Voting (max_values: None, max_size: None, mode: Measured)
-	/// Storage: Council Prime (r:0 w:1)
-	/// Proof Skipped: Council Prime (max_values: Some(1), max_size: None, mode: Measured)
-	/// The range of component `m` is `[0, 100]`.
-	/// The range of component `n` is `[0, 100]`.
-	/// The range of component `p` is `[0, 100]`.
-	/// The range of component `m` is `[0, 100]`.
-	/// The range of component `n` is `[0, 100]`.
-	/// The range of component `p` is `[0, 100]`.
-	fn set_members(m: u32, _n: u32, p: u32, ) -> Weight {
-		// Proof Size summary in bytes:
-		//  Measured:  `0 + m * (3232 ±0) + p * (3190 ±0)`
-		//  Estimated: `15795 + m * (1967 ±16) + p * (4332 ±16)`
-		// Minimum execution time: 17_182_000 picoseconds.
-		Weight::from_parts(17_462_000, 0)
-			.saturating_add(Weight::from_parts(0, 15795))
-			// Standard Error: 42_032
-			.saturating_add(Weight::from_parts(4_868_618, 0).saturating_mul(m.into()))
-			// Standard Error: 42_032
-			.saturating_add(Weight::from_parts(7_289_594, 0).saturating_mul(p.into()))
-			.saturating_add(T::DbWeight::get().reads(2))
-			.saturating_add(T::DbWeight::get().reads((1_u64).saturating_mul(p.into())))
-			.saturating_add(T::DbWeight::get().writes(2))
-			.saturating_add(T::DbWeight::get().writes((1_u64).saturating_mul(p.into())))
-			.saturating_add(Weight::from_parts(0, 1967).saturating_mul(m.into()))
-			.saturating_add(Weight::from_parts(0, 4332).saturating_mul(p.into()))
-	}
-	/// Storage: Council Members (r:1 w:0)
-	/// Proof Skipped: Council Members (max_values: Some(1), max_size: None, mode: Measured)
-	/// The range of component `b` is `[2, 1024]`.
-	/// The range of component `m` is `[1, 100]`.
-	/// The range of component `b` is `[2, 1024]`.
-	/// The range of component `m` is `[1, 100]`.
-	fn execute(b: u32, m: u32, ) -> Weight {
-		// Proof Size summary in bytes:
-		//  Measured:  `136 + m * (32 ±0)`
-		//  Estimated: `1622 + m * (32 ±0)`
-		// Minimum execution time: 16_507_000 picoseconds.
-		Weight::from_parts(16_066_632, 0)
-			.saturating_add(Weight::from_parts(0, 1622))
-			// Standard Error: 21
-			.saturating_add(Weight::from_parts(982, 0).saturating_mul(b.into()))
-			// Standard Error: 220
-			.saturating_add(Weight::from_parts(14_026, 0).saturating_mul(m.into()))
-			.saturating_add(T::DbWeight::get().reads(1))
-			.saturating_add(Weight::from_parts(0, 32).saturating_mul(m.into()))
-	}
-	/// Storage: Council Members (r:1 w:0)
-	/// Proof Skipped: Council Members (max_values: Some(1), max_size: None, mode: Measured)
-	/// Storage: Council ProposalOf (r:1 w:0)
-	/// Proof Skipped: Council ProposalOf (max_values: None, max_size: None, mode: Measured)
-	/// The range of component `b` is `[2, 1024]`.
-	/// The range of component `m` is `[1, 100]`.
-	/// The range of component `b` is `[2, 1024]`.
-	/// The range of component `m` is `[1, 100]`.
-	fn propose_execute(b: u32, m: u32, ) -> Weight {
-		// Proof Size summary in bytes:
-		//  Measured:  `136 + m * (32 ±0)`
-		//  Estimated: `3602 + m * (32 ±0)`
-		// Minimum execution time: 18_990_000 picoseconds.
-		Weight::from_parts(18_411_713, 0)
-			.saturating_add(Weight::from_parts(0, 3602))
-			// Standard Error: 15
-			.saturating_add(Weight::from_parts(1_166, 0).saturating_mul(b.into()))
-			// Standard Error: 164
-			.saturating_add(Weight::from_parts(23_067, 0).saturating_mul(m.into()))
-			.saturating_add(T::DbWeight::get().reads(2))
-			.saturating_add(Weight::from_parts(0, 32).saturating_mul(m.into()))
-	}
-	/// Storage: Council Members (r:1 w:0)
-	/// Proof Skipped: Council Members (max_values: Some(1), max_size: None, mode: Measured)
-	/// Storage: Council ProposalOf (r:1 w:1)
-	/// Proof Skipped: Council ProposalOf (max_values: None, max_size: None, mode: Measured)
-	/// Storage: Council Proposals (r:1 w:1)
-	/// Proof Skipped: Council Proposals (max_values: Some(1), max_size: None, mode: Measured)
-	/// Storage: Council ProposalCount (r:1 w:1)
-	/// Proof Skipped: Council ProposalCount (max_values: Some(1), max_size: None, mode: Measured)
-	/// Storage: Council Voting (r:0 w:1)
-	/// Proof Skipped: Council Voting (max_values: None, max_size: None, mode: Measured)
-	/// The range of component `b` is `[2, 1024]`.
-	/// The range of component `m` is `[2, 100]`.
-	/// The range of component `p` is `[1, 100]`.
-	/// The range of component `b` is `[2, 1024]`.
-	/// The range of component `m` is `[2, 100]`.
-	/// The range of component `p` is `[1, 100]`.
-	fn propose_proposed(b: u32, m: u32, p: u32, ) -> Weight {
-		// Proof Size summary in bytes:
-		//  Measured:  `426 + m * (32 ±0) + p * (36 ±0)`
-		//  Estimated: `3818 + m * (33 ±0) + p * (36 ±0)`
-		// Minimum execution time: 25_500_000 picoseconds.
-		Weight::from_parts(26_304_307, 0)
-			.saturating_add(Weight::from_parts(0, 3818))
-			// Standard Error: 49
-			.saturating_add(Weight::from_parts(2_243, 0).saturating_mul(b.into()))
-			// Standard Error: 515
-			.saturating_add(Weight::from_parts(18_905, 0).saturating_mul(m.into()))
-			// Standard Error: 508
-			.saturating_add(Weight::from_parts(120_761, 0).saturating_mul(p.into()))
-			.saturating_add(T::DbWeight::get().reads(4))
-			.saturating_add(T::DbWeight::get().writes(4))
-			.saturating_add(Weight::from_parts(0, 33).saturating_mul(m.into()))
-			.saturating_add(Weight::from_parts(0, 36).saturating_mul(p.into()))
-	}
-	/// Storage: Council Members (r:1 w:0)
-	/// Proof Skipped: Council Members (max_values: Some(1), max_size: None, mode: Measured)
-	/// Storage: Council Voting (r:1 w:1)
-	/// Proof Skipped: Council Voting (max_values: None, max_size: None, mode: Measured)
-	/// The range of component `m` is `[5, 100]`.
-	/// The range of component `m` is `[5, 100]`.
-	fn vote(m: u32, ) -> Weight {
-		// Proof Size summary in bytes:
-		//  Measured:  `875 + m * (64 ±0)`
-		//  Estimated: `4339 + m * (64 ±0)`
-		// Minimum execution time: 22_166_000 picoseconds.
-		Weight::from_parts(22_901_859, 0)
-			.saturating_add(Weight::from_parts(0, 4339))
-			// Standard Error: 238
-			.saturating_add(Weight::from_parts(40_475, 0).saturating_mul(m.into()))
-			.saturating_add(T::DbWeight::get().reads(2))
-			.saturating_add(T::DbWeight::get().writes(1))
-			.saturating_add(Weight::from_parts(0, 64).saturating_mul(m.into()))
-	}
-	/// Storage: Council Voting (r:1 w:1)
-	/// Proof Skipped: Council Voting (max_values: None, max_size: None, mode: Measured)
-	/// Storage: Council Members (r:1 w:0)
-	/// Proof Skipped: Council Members (max_values: Some(1), max_size: None, mode: Measured)
-	/// Storage: Council Proposals (r:1 w:1)
-	/// Proof Skipped: Council Proposals (max_values: Some(1), max_size: None, mode: Measured)
-	/// Storage: Council ProposalOf (r:0 w:1)
-	/// Proof Skipped: Council ProposalOf (max_values: None, max_size: None, mode: Measured)
-	/// The range of component `m` is `[4, 100]`.
-	/// The range of component `p` is `[1, 100]`.
-	/// The range of component `m` is `[4, 100]`.
-	/// The range of component `p` is `[1, 100]`.
-	fn close_early_disapproved(m: u32, p: u32, ) -> Weight {
-		// Proof Size summary in bytes:
-		//  Measured:  `464 + m * (64 ±0) + p * (36 ±0)`
-		//  Estimated: `3909 + m * (65 ±0) + p * (36 ±0)`
-		// Minimum execution time: 27_064_000 picoseconds.
-		Weight::from_parts(27_961_599, 0)
-			.saturating_add(Weight::from_parts(0, 3909))
-			// Standard Error: 401
-			.saturating_add(Weight::from_parts(22_196, 0).saturating_mul(m.into()))
-			// Standard Error: 391
-			.saturating_add(Weight::from_parts(115_698, 0).saturating_mul(p.into()))
-			.saturating_add(T::DbWeight::get().reads(3))
-			.saturating_add(T::DbWeight::get().writes(3))
-			.saturating_add(Weight::from_parts(0, 65).saturating_mul(m.into()))
-			.saturating_add(Weight::from_parts(0, 36).saturating_mul(p.into()))
-	}
-	/// Storage: Council Voting (r:1 w:1)
-	/// Proof Skipped: Council Voting (max_values: None, max_size: None, mode: Measured)
-	/// Storage: Council Members (r:1 w:0)
-	/// Proof Skipped: Council Members (max_values: Some(1), max_size: None, mode: Measured)
-	/// Storage: Council ProposalOf (r:1 w:1)
-	/// Proof Skipped: Council ProposalOf (max_values: None, max_size: None, mode: Measured)
-	/// Storage: Council Proposals (r:1 w:1)
-	/// Proof Skipped: Council Proposals (max_values: Some(1), max_size: None, mode: Measured)
-	/// The range of component `b` is `[2, 1024]`.
-	/// The range of component `m` is `[4, 100]`.
-	/// The range of component `p` is `[1, 100]`.
-	/// The range of component `b` is `[2, 1024]`.
-	/// The range of component `m` is `[4, 100]`.
-	/// The range of component `p` is `[1, 100]`.
-	fn close_early_approved(b: u32, m: u32, p: u32, ) -> Weight {
-		// Proof Size summary in bytes:
-		//  Measured:  `766 + b * (1 ±0) + m * (64 ±0) + p * (40 ±0)`
-		//  Estimated: `4083 + b * (1 ±0) + m * (66 ±0) + p * (40 ±0)`
-		// Minimum execution time: 38_302_000 picoseconds.
-		Weight::from_parts(40_639_640, 0)
-			.saturating_add(Weight::from_parts(0, 4083))
-			// Standard Error: 123
-			.saturating_add(Weight::from_parts(1_914, 0).saturating_mul(b.into()))
-			// Standard Error: 1_272
-			.saturating_add(Weight::from_parts(150_067, 0).saturating_mul(p.into()))
-			.saturating_add(T::DbWeight::get().reads(4))
-			.saturating_add(T::DbWeight::get().writes(3))
-			.saturating_add(Weight::from_parts(0, 1).saturating_mul(b.into()))
-			.saturating_add(Weight::from_parts(0, 66).saturating_mul(m.into()))
-			.saturating_add(Weight::from_parts(0, 40).saturating_mul(p.into()))
-	}
-	/// Storage: Council Voting (r:1 w:1)
-	/// Proof Skipped: Council Voting (max_values: None, max_size: None, mode: Measured)
-	/// Storage: Council Members (r:1 w:0)
-	/// Proof Skipped: Council Members (max_values: Some(1), max_size: None, mode: Measured)
-	/// Storage: Council Prime (r:1 w:0)
-	/// Proof Skipped: Council Prime (max_values: Some(1), max_size: None, mode: Measured)
-	/// Storage: Council Proposals (r:1 w:1)
-	/// Proof Skipped: Council Proposals (max_values: Some(1), max_size: None, mode: Measured)
-	/// Storage: Council ProposalOf (r:0 w:1)
-	/// Proof Skipped: Council ProposalOf (max_values: None, max_size: None, mode: Measured)
-	/// The range of component `m` is `[4, 100]`.
-	/// The range of component `p` is `[1, 100]`.
-	/// The range of component `m` is `[4, 100]`.
-	/// The range of component `p` is `[1, 100]`.
-	fn close_disapproved(m: u32, p: u32, ) -> Weight {
-		// Proof Size summary in bytes:
-		//  Measured:  `484 + m * (64 ±0) + p * (36 ±0)`
-		//  Estimated: `3929 + m * (65 ±0) + p * (36 ±0)`
-		// Minimum execution time: 30_017_000 picoseconds.
-		Weight::from_parts(30_565_580, 0)
-			.saturating_add(Weight::from_parts(0, 3929))
-			// Standard Error: 378
-			.saturating_add(Weight::from_parts(24_396, 0).saturating_mul(m.into()))
-			// Standard Error: 369
-			.saturating_add(Weight::from_parts(114_807, 0).saturating_mul(p.into()))
-			.saturating_add(T::DbWeight::get().reads(4))
-			.saturating_add(T::DbWeight::get().writes(3))
-			.saturating_add(Weight::from_parts(0, 65).saturating_mul(m.into()))
-			.saturating_add(Weight::from_parts(0, 36).saturating_mul(p.into()))
-	}
-	/// Storage: Council Voting (r:1 w:1)
-	/// Proof Skipped: Council Voting (max_values: None, max_size: None, mode: Measured)
-	/// Storage: Council Members (r:1 w:0)
-	/// Proof Skipped: Council Members (max_values: Some(1), max_size: None, mode: Measured)
-	/// Storage: Council Prime (r:1 w:0)
-	/// Proof Skipped: Council Prime (max_values: Some(1), max_size: None, mode: Measured)
-	/// Storage: Council ProposalOf (r:1 w:1)
-	/// Proof Skipped: Council ProposalOf (max_values: None, max_size: None, mode: Measured)
-	/// Storage: Council Proposals (r:1 w:1)
-	/// Proof Skipped: Council Proposals (max_values: Some(1), max_size: None, mode: Measured)
-	/// The range of component `b` is `[2, 1024]`.
-	/// The range of component `m` is `[4, 100]`.
-	/// The range of component `p` is `[1, 100]`.
-	/// The range of component `b` is `[2, 1024]`.
-	/// The range of component `m` is `[4, 100]`.
-	/// The range of component `p` is `[1, 100]`.
-	fn close_approved(b: u32, m: u32, p: u32, ) -> Weight {
-		// Proof Size summary in bytes:
-		//  Measured:  `786 + b * (1 ±0) + m * (64 ±0) + p * (40 ±0)`
-		//  Estimated: `4103 + b * (1 ±0) + m * (66 ±0) + p * (40 ±0)`
-		// Minimum execution time: 40_911_000 picoseconds.
-		Weight::from_parts(42_312_485, 0)
-			.saturating_add(Weight::from_parts(0, 4103))
-			// Standard Error: 83
-			.saturating_add(Weight::from_parts(2_208, 0).saturating_mul(b.into()))
-			// Standard Error: 879
-			.saturating_add(Weight::from_parts(20_173, 0).saturating_mul(m.into()))
-			// Standard Error: 857
-			.saturating_add(Weight::from_parts(146_302, 0).saturating_mul(p.into()))
-			.saturating_add(T::DbWeight::get().reads(5))
-			.saturating_add(T::DbWeight::get().writes(3))
-			.saturating_add(Weight::from_parts(0, 1).saturating_mul(b.into()))
-			.saturating_add(Weight::from_parts(0, 66).saturating_mul(m.into()))
-			.saturating_add(Weight::from_parts(0, 40).saturating_mul(p.into()))
-	}
-	/// Storage: Council Proposals (r:1 w:1)
-	/// Proof Skipped: Council Proposals (max_values: Some(1), max_size: None, mode: Measured)
-	/// Storage: Council Voting (r:0 w:1)
-	/// Proof Skipped: Council Voting (max_values: None, max_size: None, mode: Measured)
-	/// Storage: Council ProposalOf (r:0 w:1)
-	/// Proof Skipped: Council ProposalOf (max_values: None, max_size: None, mode: Measured)
-	/// The range of component `p` is `[1, 100]`.
-	/// The range of component `p` is `[1, 100]`.
-	fn disapprove_proposal(p: u32, ) -> Weight {
-		// Proof Size summary in bytes:
-		//  Measured:  `293 + p * (32 ±0)`
-		//  Estimated: `1778 + p * (32 ±0)`
-		// Minimum execution time: 15_465_000 picoseconds.
-		Weight::from_parts(17_387_663, 0)
-			.saturating_add(Weight::from_parts(0, 1778))
-			// Standard Error: 450
-			.saturating_add(Weight::from_parts(110_406, 0).saturating_mul(p.into()))
-			.saturating_add(T::DbWeight::get().reads(1))
-			.saturating_add(T::DbWeight::get().writes(3))
-			.saturating_add(Weight::from_parts(0, 32).saturating_mul(p.into()))
-	}
-}
diff --git a/polkadot/runtime/rococo/src/weights/pallet_collective_technical_committee.rs b/polkadot/runtime/rococo/src/weights/pallet_collective_technical_committee.rs
deleted file mode 100644
index 6d66dc871cd54edcd9c846fc0a3e059d1f8a42ce..0000000000000000000000000000000000000000
--- a/polkadot/runtime/rococo/src/weights/pallet_collective_technical_committee.rs
+++ /dev/null
@@ -1,324 +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/>.
-
-//! Autogenerated weights for `pallet_collective`
-//!
-//! THIS FILE WAS AUTO-GENERATED USING THE SUBSTRATE BENCHMARK CLI VERSION 4.0.0-dev
-//! DATE: 2023-05-26, STEPS: `50`, REPEAT: `20`, LOW RANGE: `[]`, HIGH RANGE: `[]`
-//! WORST CASE MAP SIZE: `1000000`
-//! HOSTNAME: `bm5`, CPU: `Intel(R) Core(TM) i7-7700K CPU @ 4.20GHz`
-//! EXECUTION: Some(Wasm), WASM-EXECUTION: Compiled, CHAIN: Some("rococo-dev"), DB CACHE: 1024
-
-// Executed Command:
-// ./target/production/polkadot
-// benchmark
-// pallet
-// --chain=rococo-dev
-// --steps=50
-// --repeat=20
-// --pallet=pallet_collective
-// --extrinsic=*
-// --execution=wasm
-// --wasm-execution=compiled
-// --header=./file_header.txt
-// --output=./runtime/rococo/src/weights/
-
-#![cfg_attr(rustfmt, rustfmt_skip)]
-#![allow(unused_parens)]
-#![allow(unused_imports)]
-#![allow(missing_docs)]
-
-use frame_support::{traits::Get, weights::Weight};
-use core::marker::PhantomData;
-
-/// Weight functions for `pallet_collective`.
-pub struct WeightInfo<T>(PhantomData<T>);
-impl<T: frame_system::Config> pallet_collective::WeightInfo for WeightInfo<T> {
-	/// Storage: TechnicalCommittee Members (r:1 w:1)
-	/// Proof Skipped: TechnicalCommittee Members (max_values: Some(1), max_size: None, mode: Measured)
-	/// Storage: TechnicalCommittee Proposals (r:1 w:0)
-	/// Proof Skipped: TechnicalCommittee Proposals (max_values: Some(1), max_size: None, mode: Measured)
-	/// Storage: TechnicalCommittee Voting (r:100 w:100)
-	/// Proof Skipped: TechnicalCommittee Voting (max_values: None, max_size: None, mode: Measured)
-	/// Storage: TechnicalCommittee Prime (r:0 w:1)
-	/// Proof Skipped: TechnicalCommittee Prime (max_values: Some(1), max_size: None, mode: Measured)
-	/// The range of component `m` is `[0, 100]`.
-	/// The range of component `n` is `[0, 100]`.
-	/// The range of component `p` is `[0, 100]`.
-	/// The range of component `m` is `[0, 100]`.
-	/// The range of component `n` is `[0, 100]`.
-	/// The range of component `p` is `[0, 100]`.
-	fn set_members(m: u32, _n: u32, p: u32, ) -> Weight {
-		// Proof Size summary in bytes:
-		//  Measured:  `0 + m * (3232 ±0) + p * (3190 ±0)`
-		//  Estimated: `15766 + m * (1967 ±16) + p * (4332 ±16)`
-		// Minimum execution time: 17_826_000 picoseconds.
-		Weight::from_parts(18_046_000, 0)
-			.saturating_add(Weight::from_parts(0, 15766))
-			// Standard Error: 42_164
-			.saturating_add(Weight::from_parts(4_858_188, 0).saturating_mul(m.into()))
-			// Standard Error: 42_164
-			.saturating_add(Weight::from_parts(7_379_354, 0).saturating_mul(p.into()))
-			.saturating_add(T::DbWeight::get().reads(2))
-			.saturating_add(T::DbWeight::get().reads((1_u64).saturating_mul(p.into())))
-			.saturating_add(T::DbWeight::get().writes(2))
-			.saturating_add(T::DbWeight::get().writes((1_u64).saturating_mul(p.into())))
-			.saturating_add(Weight::from_parts(0, 1967).saturating_mul(m.into()))
-			.saturating_add(Weight::from_parts(0, 4332).saturating_mul(p.into()))
-	}
-	/// Storage: TechnicalCommittee Members (r:1 w:0)
-	/// Proof Skipped: TechnicalCommittee Members (max_values: Some(1), max_size: None, mode: Measured)
-	/// The range of component `b` is `[2, 1024]`.
-	/// The range of component `m` is `[1, 100]`.
-	/// The range of component `b` is `[2, 1024]`.
-	/// The range of component `m` is `[1, 100]`.
-	fn execute(b: u32, m: u32, ) -> Weight {
-		// Proof Size summary in bytes:
-		//  Measured:  `107 + m * (32 ±0)`
-		//  Estimated: `1593 + m * (32 ±0)`
-		// Minimum execution time: 16_992_000 picoseconds.
-		Weight::from_parts(16_555_669, 0)
-			.saturating_add(Weight::from_parts(0, 1593))
-			// Standard Error: 18
-			.saturating_add(Weight::from_parts(976, 0).saturating_mul(b.into()))
-			// Standard Error: 189
-			.saturating_add(Weight::from_parts(12_101, 0).saturating_mul(m.into()))
-			.saturating_add(T::DbWeight::get().reads(1))
-			.saturating_add(Weight::from_parts(0, 32).saturating_mul(m.into()))
-	}
-	/// Storage: TechnicalCommittee Members (r:1 w:0)
-	/// Proof Skipped: TechnicalCommittee Members (max_values: Some(1), max_size: None, mode: Measured)
-	/// Storage: TechnicalCommittee ProposalOf (r:1 w:0)
-	/// Proof Skipped: TechnicalCommittee ProposalOf (max_values: None, max_size: None, mode: Measured)
-	/// The range of component `b` is `[2, 1024]`.
-	/// The range of component `m` is `[1, 100]`.
-	/// The range of component `b` is `[2, 1024]`.
-	/// The range of component `m` is `[1, 100]`.
-	fn propose_execute(b: u32, m: u32, ) -> Weight {
-		// Proof Size summary in bytes:
-		//  Measured:  `107 + m * (32 ±0)`
-		//  Estimated: `3573 + m * (32 ±0)`
-		// Minimum execution time: 19_900_000 picoseconds.
-		Weight::from_parts(19_068_072, 0)
-			.saturating_add(Weight::from_parts(0, 3573))
-			// Standard Error: 12
-			.saturating_add(Weight::from_parts(1_161, 0).saturating_mul(b.into()))
-			// Standard Error: 129
-			.saturating_add(Weight::from_parts(22_376, 0).saturating_mul(m.into()))
-			.saturating_add(T::DbWeight::get().reads(2))
-			.saturating_add(Weight::from_parts(0, 32).saturating_mul(m.into()))
-	}
-	/// Storage: TechnicalCommittee Members (r:1 w:0)
-	/// Proof Skipped: TechnicalCommittee Members (max_values: Some(1), max_size: None, mode: Measured)
-	/// Storage: TechnicalCommittee ProposalOf (r:1 w:1)
-	/// Proof Skipped: TechnicalCommittee ProposalOf (max_values: None, max_size: None, mode: Measured)
-	/// Storage: TechnicalCommittee Proposals (r:1 w:1)
-	/// Proof Skipped: TechnicalCommittee Proposals (max_values: Some(1), max_size: None, mode: Measured)
-	/// Storage: TechnicalCommittee ProposalCount (r:1 w:1)
-	/// Proof Skipped: TechnicalCommittee ProposalCount (max_values: Some(1), max_size: None, mode: Measured)
-	/// Storage: TechnicalCommittee Voting (r:0 w:1)
-	/// Proof Skipped: TechnicalCommittee Voting (max_values: None, max_size: None, mode: Measured)
-	/// The range of component `b` is `[2, 1024]`.
-	/// The range of component `m` is `[2, 100]`.
-	/// The range of component `p` is `[1, 100]`.
-	/// The range of component `b` is `[2, 1024]`.
-	/// The range of component `m` is `[2, 100]`.
-	/// The range of component `p` is `[1, 100]`.
-	fn propose_proposed(b: u32, m: u32, p: u32, ) -> Weight {
-		// Proof Size summary in bytes:
-		//  Measured:  `397 + m * (32 ±0) + p * (36 ±0)`
-		//  Estimated: `3789 + m * (33 ±0) + p * (36 ±0)`
-		// Minimum execution time: 26_264_000 picoseconds.
-		Weight::from_parts(27_099_606, 0)
-			.saturating_add(Weight::from_parts(0, 3789))
-			// Standard Error: 50
-			.saturating_add(Weight::from_parts(2_278, 0).saturating_mul(b.into()))
-			// Standard Error: 525
-			.saturating_add(Weight::from_parts(19_424, 0).saturating_mul(m.into()))
-			// Standard Error: 519
-			.saturating_add(Weight::from_parts(120_852, 0).saturating_mul(p.into()))
-			.saturating_add(T::DbWeight::get().reads(4))
-			.saturating_add(T::DbWeight::get().writes(4))
-			.saturating_add(Weight::from_parts(0, 33).saturating_mul(m.into()))
-			.saturating_add(Weight::from_parts(0, 36).saturating_mul(p.into()))
-	}
-	/// Storage: TechnicalCommittee Members (r:1 w:0)
-	/// Proof Skipped: TechnicalCommittee Members (max_values: Some(1), max_size: None, mode: Measured)
-	/// Storage: TechnicalCommittee Voting (r:1 w:1)
-	/// Proof Skipped: TechnicalCommittee Voting (max_values: None, max_size: None, mode: Measured)
-	/// The range of component `m` is `[5, 100]`.
-	/// The range of component `m` is `[5, 100]`.
-	fn vote(m: u32, ) -> Weight {
-		// Proof Size summary in bytes:
-		//  Measured:  `846 + m * (64 ±0)`
-		//  Estimated: `4310 + m * (64 ±0)`
-		// Minimum execution time: 22_954_000 picoseconds.
-		Weight::from_parts(23_675_214, 0)
-			.saturating_add(Weight::from_parts(0, 4310))
-			// Standard Error: 256
-			.saturating_add(Weight::from_parts(40_562, 0).saturating_mul(m.into()))
-			.saturating_add(T::DbWeight::get().reads(2))
-			.saturating_add(T::DbWeight::get().writes(1))
-			.saturating_add(Weight::from_parts(0, 64).saturating_mul(m.into()))
-	}
-	/// Storage: TechnicalCommittee Voting (r:1 w:1)
-	/// Proof Skipped: TechnicalCommittee Voting (max_values: None, max_size: None, mode: Measured)
-	/// Storage: TechnicalCommittee Members (r:1 w:0)
-	/// Proof Skipped: TechnicalCommittee Members (max_values: Some(1), max_size: None, mode: Measured)
-	/// Storage: TechnicalCommittee Proposals (r:1 w:1)
-	/// Proof Skipped: TechnicalCommittee Proposals (max_values: Some(1), max_size: None, mode: Measured)
-	/// Storage: TechnicalCommittee ProposalOf (r:0 w:1)
-	/// Proof Skipped: TechnicalCommittee ProposalOf (max_values: None, max_size: None, mode: Measured)
-	/// The range of component `m` is `[4, 100]`.
-	/// The range of component `p` is `[1, 100]`.
-	/// The range of component `m` is `[4, 100]`.
-	/// The range of component `p` is `[1, 100]`.
-	fn close_early_disapproved(m: u32, p: u32, ) -> Weight {
-		// Proof Size summary in bytes:
-		//  Measured:  `435 + m * (64 ±0) + p * (36 ±0)`
-		//  Estimated: `3880 + m * (65 ±0) + p * (36 ±0)`
-		// Minimum execution time: 27_797_000 picoseconds.
-		Weight::from_parts(28_934_600, 0)
-			.saturating_add(Weight::from_parts(0, 3880))
-			// Standard Error: 374
-			.saturating_add(Weight::from_parts(20_716, 0).saturating_mul(m.into()))
-			// Standard Error: 364
-			.saturating_add(Weight::from_parts(115_491, 0).saturating_mul(p.into()))
-			.saturating_add(T::DbWeight::get().reads(3))
-			.saturating_add(T::DbWeight::get().writes(3))
-			.saturating_add(Weight::from_parts(0, 65).saturating_mul(m.into()))
-			.saturating_add(Weight::from_parts(0, 36).saturating_mul(p.into()))
-	}
-	/// Storage: TechnicalCommittee Voting (r:1 w:1)
-	/// Proof Skipped: TechnicalCommittee Voting (max_values: None, max_size: None, mode: Measured)
-	/// Storage: TechnicalCommittee Members (r:1 w:0)
-	/// Proof Skipped: TechnicalCommittee Members (max_values: Some(1), max_size: None, mode: Measured)
-	/// Storage: TechnicalCommittee ProposalOf (r:1 w:1)
-	/// Proof Skipped: TechnicalCommittee ProposalOf (max_values: None, max_size: None, mode: Measured)
-	/// Storage: TechnicalCommittee Proposals (r:1 w:1)
-	/// Proof Skipped: TechnicalCommittee Proposals (max_values: Some(1), max_size: None, mode: Measured)
-	/// The range of component `b` is `[2, 1024]`.
-	/// The range of component `m` is `[4, 100]`.
-	/// The range of component `p` is `[1, 100]`.
-	/// The range of component `b` is `[2, 1024]`.
-	/// The range of component `m` is `[4, 100]`.
-	/// The range of component `p` is `[1, 100]`.
-	fn close_early_approved(b: u32, m: u32, p: u32, ) -> Weight {
-		// Proof Size summary in bytes:
-		//  Measured:  `737 + b * (1 ±0) + m * (64 ±0) + p * (40 ±0)`
-		//  Estimated: `4054 + b * (1 ±0) + m * (66 ±0) + p * (40 ±0)`
-		// Minimum execution time: 39_160_000 picoseconds.
-		Weight::from_parts(40_470_419, 0)
-			.saturating_add(Weight::from_parts(0, 4054))
-			// Standard Error: 82
-			.saturating_add(Weight::from_parts(2_146, 0).saturating_mul(b.into()))
-			// Standard Error: 869
-			.saturating_add(Weight::from_parts(21_442, 0).saturating_mul(m.into()))
-			// Standard Error: 847
-			.saturating_add(Weight::from_parts(144_479, 0).saturating_mul(p.into()))
-			.saturating_add(T::DbWeight::get().reads(4))
-			.saturating_add(T::DbWeight::get().writes(3))
-			.saturating_add(Weight::from_parts(0, 1).saturating_mul(b.into()))
-			.saturating_add(Weight::from_parts(0, 66).saturating_mul(m.into()))
-			.saturating_add(Weight::from_parts(0, 40).saturating_mul(p.into()))
-	}
-	/// Storage: TechnicalCommittee Voting (r:1 w:1)
-	/// Proof Skipped: TechnicalCommittee Voting (max_values: None, max_size: None, mode: Measured)
-	/// Storage: TechnicalCommittee Members (r:1 w:0)
-	/// Proof Skipped: TechnicalCommittee Members (max_values: Some(1), max_size: None, mode: Measured)
-	/// Storage: TechnicalCommittee Prime (r:1 w:0)
-	/// Proof Skipped: TechnicalCommittee Prime (max_values: Some(1), max_size: None, mode: Measured)
-	/// Storage: TechnicalCommittee Proposals (r:1 w:1)
-	/// Proof Skipped: TechnicalCommittee Proposals (max_values: Some(1), max_size: None, mode: Measured)
-	/// Storage: TechnicalCommittee ProposalOf (r:0 w:1)
-	/// Proof Skipped: TechnicalCommittee ProposalOf (max_values: None, max_size: None, mode: Measured)
-	/// The range of component `m` is `[4, 100]`.
-	/// The range of component `p` is `[1, 100]`.
-	/// The range of component `m` is `[4, 100]`.
-	/// The range of component `p` is `[1, 100]`.
-	fn close_disapproved(m: u32, p: u32, ) -> Weight {
-		// Proof Size summary in bytes:
-		//  Measured:  `455 + m * (64 ±0) + p * (36 ±0)`
-		//  Estimated: `3900 + m * (65 ±0) + p * (36 ±0)`
-		// Minimum execution time: 30_953_000 picoseconds.
-		Weight::from_parts(31_427_489, 0)
-			.saturating_add(Weight::from_parts(0, 3900))
-			// Standard Error: 397
-			.saturating_add(Weight::from_parts(24_280, 0).saturating_mul(m.into()))
-			// Standard Error: 387
-			.saturating_add(Weight::from_parts(116_864, 0).saturating_mul(p.into()))
-			.saturating_add(T::DbWeight::get().reads(4))
-			.saturating_add(T::DbWeight::get().writes(3))
-			.saturating_add(Weight::from_parts(0, 65).saturating_mul(m.into()))
-			.saturating_add(Weight::from_parts(0, 36).saturating_mul(p.into()))
-	}
-	/// Storage: TechnicalCommittee Voting (r:1 w:1)
-	/// Proof Skipped: TechnicalCommittee Voting (max_values: None, max_size: None, mode: Measured)
-	/// Storage: TechnicalCommittee Members (r:1 w:0)
-	/// Proof Skipped: TechnicalCommittee Members (max_values: Some(1), max_size: None, mode: Measured)
-	/// Storage: TechnicalCommittee Prime (r:1 w:0)
-	/// Proof Skipped: TechnicalCommittee Prime (max_values: Some(1), max_size: None, mode: Measured)
-	/// Storage: TechnicalCommittee ProposalOf (r:1 w:1)
-	/// Proof Skipped: TechnicalCommittee ProposalOf (max_values: None, max_size: None, mode: Measured)
-	/// Storage: TechnicalCommittee Proposals (r:1 w:1)
-	/// Proof Skipped: TechnicalCommittee Proposals (max_values: Some(1), max_size: None, mode: Measured)
-	/// The range of component `b` is `[2, 1024]`.
-	/// The range of component `m` is `[4, 100]`.
-	/// The range of component `p` is `[1, 100]`.
-	/// The range of component `b` is `[2, 1024]`.
-	/// The range of component `m` is `[4, 100]`.
-	/// The range of component `p` is `[1, 100]`.
-	fn close_approved(b: u32, m: u32, p: u32, ) -> Weight {
-		// Proof Size summary in bytes:
-		//  Measured:  `757 + b * (1 ±0) + m * (64 ±0) + p * (40 ±0)`
-		//  Estimated: `4074 + b * (1 ±0) + m * (66 ±0) + p * (40 ±0)`
-		// Minimum execution time: 41_468_000 picoseconds.
-		Weight::from_parts(43_538_242, 0)
-			.saturating_add(Weight::from_parts(0, 4074))
-			// Standard Error: 80
-			.saturating_add(Weight::from_parts(1_994, 0).saturating_mul(b.into()))
-			// Standard Error: 853
-			.saturating_add(Weight::from_parts(19_637, 0).saturating_mul(m.into()))
-			// Standard Error: 831
-			.saturating_add(Weight::from_parts(144_674, 0).saturating_mul(p.into()))
-			.saturating_add(T::DbWeight::get().reads(5))
-			.saturating_add(T::DbWeight::get().writes(3))
-			.saturating_add(Weight::from_parts(0, 1).saturating_mul(b.into()))
-			.saturating_add(Weight::from_parts(0, 66).saturating_mul(m.into()))
-			.saturating_add(Weight::from_parts(0, 40).saturating_mul(p.into()))
-	}
-	/// Storage: TechnicalCommittee Proposals (r:1 w:1)
-	/// Proof Skipped: TechnicalCommittee Proposals (max_values: Some(1), max_size: None, mode: Measured)
-	/// Storage: TechnicalCommittee Voting (r:0 w:1)
-	/// Proof Skipped: TechnicalCommittee Voting (max_values: None, max_size: None, mode: Measured)
-	/// Storage: TechnicalCommittee ProposalOf (r:0 w:1)
-	/// Proof Skipped: TechnicalCommittee ProposalOf (max_values: None, max_size: None, mode: Measured)
-	/// The range of component `p` is `[1, 100]`.
-	/// The range of component `p` is `[1, 100]`.
-	fn disapprove_proposal(p: u32, ) -> Weight {
-		// Proof Size summary in bytes:
-		//  Measured:  `264 + p * (32 ±0)`
-		//  Estimated: `1749 + p * (32 ±0)`
-		// Minimum execution time: 15_998_000 picoseconds.
-		Weight::from_parts(17_837_641, 0)
-			.saturating_add(Weight::from_parts(0, 1749))
-			// Standard Error: 422
-			.saturating_add(Weight::from_parts(111_526, 0).saturating_mul(p.into()))
-			.saturating_add(T::DbWeight::get().reads(1))
-			.saturating_add(T::DbWeight::get().writes(3))
-			.saturating_add(Weight::from_parts(0, 32).saturating_mul(p.into()))
-	}
-}
diff --git a/polkadot/runtime/kusama/src/weights/pallet_conviction_voting.rs b/polkadot/runtime/rococo/src/weights/pallet_conviction_voting.rs
similarity index 100%
rename from polkadot/runtime/kusama/src/weights/pallet_conviction_voting.rs
rename to polkadot/runtime/rococo/src/weights/pallet_conviction_voting.rs
diff --git a/polkadot/runtime/rococo/src/weights/pallet_democracy.rs b/polkadot/runtime/rococo/src/weights/pallet_democracy.rs
deleted file mode 100644
index 00629a5c1103cba6813566097b9590104e712347..0000000000000000000000000000000000000000
--- a/polkadot/runtime/rococo/src/weights/pallet_democracy.rs
+++ /dev/null
@@ -1,525 +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/>.
-
-//! Autogenerated weights for `pallet_democracy`
-//!
-//! THIS FILE WAS AUTO-GENERATED USING THE SUBSTRATE BENCHMARK CLI VERSION 4.0.0-dev
-//! DATE: 2023-05-26, STEPS: `50`, REPEAT: `20`, LOW RANGE: `[]`, HIGH RANGE: `[]`
-//! WORST CASE MAP SIZE: `1000000`
-//! HOSTNAME: `bm5`, CPU: `Intel(R) Core(TM) i7-7700K CPU @ 4.20GHz`
-//! EXECUTION: Some(Wasm), WASM-EXECUTION: Compiled, CHAIN: Some("rococo-dev"), DB CACHE: 1024
-
-// Executed Command:
-// ./target/production/polkadot
-// benchmark
-// pallet
-// --chain=rococo-dev
-// --steps=50
-// --repeat=20
-// --pallet=pallet_democracy
-// --extrinsic=*
-// --execution=wasm
-// --wasm-execution=compiled
-// --header=./file_header.txt
-// --output=./runtime/rococo/src/weights/
-
-#![cfg_attr(rustfmt, rustfmt_skip)]
-#![allow(unused_parens)]
-#![allow(unused_imports)]
-#![allow(missing_docs)]
-
-use frame_support::{traits::Get, weights::Weight};
-use core::marker::PhantomData;
-
-/// Weight functions for `pallet_democracy`.
-pub struct WeightInfo<T>(PhantomData<T>);
-impl<T: frame_system::Config> pallet_democracy::WeightInfo for WeightInfo<T> {
-	/// Storage: Democracy PublicPropCount (r:1 w:1)
-	/// Proof: Democracy PublicPropCount (max_values: Some(1), max_size: Some(4), added: 499, mode: MaxEncodedLen)
-	/// Storage: Democracy PublicProps (r:1 w:1)
-	/// Proof: Democracy PublicProps (max_values: Some(1), max_size: Some(16702), added: 17197, mode: MaxEncodedLen)
-	/// Storage: Democracy Blacklist (r:1 w:0)
-	/// Proof: Democracy Blacklist (max_values: None, max_size: Some(3238), added: 5713, mode: MaxEncodedLen)
-	/// Storage: Democracy DepositOf (r:0 w:1)
-	/// Proof: Democracy DepositOf (max_values: None, max_size: Some(3230), added: 5705, mode: MaxEncodedLen)
-	fn propose() -> Weight {
-		// Proof Size summary in bytes:
-		//  Measured:  `4734`
-		//  Estimated: `18187`
-		// Minimum execution time: 39_492_000 picoseconds.
-		Weight::from_parts(39_853_000, 0)
-			.saturating_add(Weight::from_parts(0, 18187))
-			.saturating_add(T::DbWeight::get().reads(3))
-			.saturating_add(T::DbWeight::get().writes(3))
-	}
-	/// Storage: Democracy DepositOf (r:1 w:1)
-	/// Proof: Democracy DepositOf (max_values: None, max_size: Some(3230), added: 5705, mode: MaxEncodedLen)
-	fn second() -> Weight {
-		// Proof Size summary in bytes:
-		//  Measured:  `3489`
-		//  Estimated: `6695`
-		// Minimum execution time: 36_683_000 picoseconds.
-		Weight::from_parts(37_121_000, 0)
-			.saturating_add(Weight::from_parts(0, 6695))
-			.saturating_add(T::DbWeight::get().reads(1))
-			.saturating_add(T::DbWeight::get().writes(1))
-	}
-	/// Storage: Democracy ReferendumInfoOf (r:1 w:1)
-	/// Proof: Democracy ReferendumInfoOf (max_values: None, max_size: Some(201), added: 2676, mode: MaxEncodedLen)
-	/// Storage: Democracy VotingOf (r:1 w:1)
-	/// Proof: Democracy VotingOf (max_values: None, max_size: Some(3795), added: 6270, mode: MaxEncodedLen)
-	/// Storage: Balances Locks (r:1 w:1)
-	/// Proof: Balances Locks (max_values: None, max_size: Some(1299), added: 3774, mode: MaxEncodedLen)
-	/// Storage: Balances Freezes (r:1 w:0)
-	/// Proof: Balances Freezes (max_values: None, max_size: Some(65), added: 2540, mode: MaxEncodedLen)
-	fn vote_new() -> Weight {
-		// Proof Size summary in bytes:
-		//  Measured:  `3365`
-		//  Estimated: `7260`
-		// Minimum execution time: 48_191_000 picoseconds.
-		Weight::from_parts(48_936_000, 0)
-			.saturating_add(Weight::from_parts(0, 7260))
-			.saturating_add(T::DbWeight::get().reads(4))
-			.saturating_add(T::DbWeight::get().writes(3))
-	}
-	/// Storage: Democracy ReferendumInfoOf (r:1 w:1)
-	/// Proof: Democracy ReferendumInfoOf (max_values: None, max_size: Some(201), added: 2676, mode: MaxEncodedLen)
-	/// Storage: Democracy VotingOf (r:1 w:1)
-	/// Proof: Democracy VotingOf (max_values: None, max_size: Some(3795), added: 6270, mode: MaxEncodedLen)
-	/// Storage: Balances Locks (r:1 w:1)
-	/// Proof: Balances Locks (max_values: None, max_size: Some(1299), added: 3774, mode: MaxEncodedLen)
-	/// Storage: Balances Freezes (r:1 w:0)
-	/// Proof: Balances Freezes (max_values: None, max_size: Some(65), added: 2540, mode: MaxEncodedLen)
-	fn vote_existing() -> Weight {
-		// Proof Size summary in bytes:
-		//  Measured:  `3387`
-		//  Estimated: `7260`
-		// Minimum execution time: 52_175_000 picoseconds.
-		Weight::from_parts(53_011_000, 0)
-			.saturating_add(Weight::from_parts(0, 7260))
-			.saturating_add(T::DbWeight::get().reads(4))
-			.saturating_add(T::DbWeight::get().writes(3))
-	}
-	/// Storage: Democracy ReferendumInfoOf (r:1 w:1)
-	/// Proof: Democracy ReferendumInfoOf (max_values: None, max_size: Some(201), added: 2676, mode: MaxEncodedLen)
-	/// Storage: Democracy Cancellations (r:1 w:1)
-	/// Proof: Democracy Cancellations (max_values: None, max_size: Some(33), added: 2508, mode: MaxEncodedLen)
-	/// Storage: Democracy MetadataOf (r:1 w:1)
-	/// Proof: Democracy MetadataOf (max_values: None, max_size: Some(53), added: 2528, mode: MaxEncodedLen)
-	fn emergency_cancel() -> Weight {
-		// Proof Size summary in bytes:
-		//  Measured:  `299`
-		//  Estimated: `3666`
-		// Minimum execution time: 26_255_000 picoseconds.
-		Weight::from_parts(26_768_000, 0)
-			.saturating_add(Weight::from_parts(0, 3666))
-			.saturating_add(T::DbWeight::get().reads(3))
-			.saturating_add(T::DbWeight::get().writes(3))
-	}
-	/// Storage: Democracy PublicProps (r:1 w:1)
-	/// Proof: Democracy PublicProps (max_values: Some(1), max_size: Some(16702), added: 17197, mode: MaxEncodedLen)
-	/// Storage: Democracy DepositOf (r:1 w:1)
-	/// Proof: Democracy DepositOf (max_values: None, max_size: Some(3230), added: 5705, mode: MaxEncodedLen)
-	/// Storage: System Account (r:1 w:1)
-	/// Proof: System Account (max_values: None, max_size: Some(128), added: 2603, mode: MaxEncodedLen)
-	/// Storage: Democracy MetadataOf (r:3 w:1)
-	/// Proof: Democracy MetadataOf (max_values: None, max_size: Some(53), added: 2528, mode: MaxEncodedLen)
-	/// Storage: Democracy NextExternal (r:1 w:1)
-	/// Proof: Democracy NextExternal (max_values: Some(1), max_size: Some(132), added: 627, mode: MaxEncodedLen)
-	/// Storage: Democracy ReferendumInfoOf (r:1 w:1)
-	/// Proof: Democracy ReferendumInfoOf (max_values: None, max_size: Some(201), added: 2676, mode: MaxEncodedLen)
-	/// Storage: Democracy Blacklist (r:0 w:1)
-	/// Proof: Democracy Blacklist (max_values: None, max_size: Some(3238), added: 5713, mode: MaxEncodedLen)
-	fn blacklist() -> Weight {
-		// Proof Size summary in bytes:
-		//  Measured:  `5843`
-		//  Estimated: `18187`
-		// Minimum execution time: 96_376_000 picoseconds.
-		Weight::from_parts(97_222_000, 0)
-			.saturating_add(Weight::from_parts(0, 18187))
-			.saturating_add(T::DbWeight::get().reads(8))
-			.saturating_add(T::DbWeight::get().writes(7))
-	}
-	/// Storage: Democracy NextExternal (r:1 w:1)
-	/// Proof: Democracy NextExternal (max_values: Some(1), max_size: Some(132), added: 627, mode: MaxEncodedLen)
-	/// Storage: Democracy Blacklist (r:1 w:0)
-	/// Proof: Democracy Blacklist (max_values: None, max_size: Some(3238), added: 5713, mode: MaxEncodedLen)
-	fn external_propose() -> Weight {
-		// Proof Size summary in bytes:
-		//  Measured:  `3349`
-		//  Estimated: `6703`
-		// Minimum execution time: 13_815_000 picoseconds.
-		Weight::from_parts(14_071_000, 0)
-			.saturating_add(Weight::from_parts(0, 6703))
-			.saturating_add(T::DbWeight::get().reads(2))
-			.saturating_add(T::DbWeight::get().writes(1))
-	}
-	/// Storage: Democracy NextExternal (r:0 w:1)
-	/// Proof: Democracy NextExternal (max_values: Some(1), max_size: Some(132), added: 627, mode: MaxEncodedLen)
-	fn external_propose_majority() -> Weight {
-		// Proof Size summary in bytes:
-		//  Measured:  `0`
-		//  Estimated: `0`
-		// Minimum execution time: 3_456_000 picoseconds.
-		Weight::from_parts(3_716_000, 0)
-			.saturating_add(Weight::from_parts(0, 0))
-			.saturating_add(T::DbWeight::get().writes(1))
-	}
-	/// Storage: Democracy NextExternal (r:0 w:1)
-	/// Proof: Democracy NextExternal (max_values: Some(1), max_size: Some(132), added: 627, mode: MaxEncodedLen)
-	fn external_propose_default() -> Weight {
-		// Proof Size summary in bytes:
-		//  Measured:  `0`
-		//  Estimated: `0`
-		// Minimum execution time: 3_610_000 picoseconds.
-		Weight::from_parts(3_768_000, 0)
-			.saturating_add(Weight::from_parts(0, 0))
-			.saturating_add(T::DbWeight::get().writes(1))
-	}
-	/// Storage: Democracy NextExternal (r:1 w:1)
-	/// Proof: Democracy NextExternal (max_values: Some(1), max_size: Some(132), added: 627, mode: MaxEncodedLen)
-	/// Storage: Democracy ReferendumCount (r:1 w:1)
-	/// Proof: Democracy ReferendumCount (max_values: Some(1), max_size: Some(4), added: 499, mode: MaxEncodedLen)
-	/// Storage: Democracy MetadataOf (r:1 w:2)
-	/// Proof: Democracy MetadataOf (max_values: None, max_size: Some(53), added: 2528, mode: MaxEncodedLen)
-	/// Storage: Democracy ReferendumInfoOf (r:0 w:1)
-	/// Proof: Democracy ReferendumInfoOf (max_values: None, max_size: Some(201), added: 2676, mode: MaxEncodedLen)
-	fn fast_track() -> Weight {
-		// Proof Size summary in bytes:
-		//  Measured:  `219`
-		//  Estimated: `3518`
-		// Minimum execution time: 27_514_000 picoseconds.
-		Weight::from_parts(27_905_000, 0)
-			.saturating_add(Weight::from_parts(0, 3518))
-			.saturating_add(T::DbWeight::get().reads(3))
-			.saturating_add(T::DbWeight::get().writes(5))
-	}
-	/// Storage: Democracy NextExternal (r:1 w:1)
-	/// Proof: Democracy NextExternal (max_values: Some(1), max_size: Some(132), added: 627, mode: MaxEncodedLen)
-	/// Storage: Democracy Blacklist (r:1 w:1)
-	/// Proof: Democracy Blacklist (max_values: None, max_size: Some(3238), added: 5713, mode: MaxEncodedLen)
-	/// Storage: Democracy MetadataOf (r:1 w:1)
-	/// Proof: Democracy MetadataOf (max_values: None, max_size: Some(53), added: 2528, mode: MaxEncodedLen)
-	fn veto_external() -> Weight {
-		// Proof Size summary in bytes:
-		//  Measured:  `3452`
-		//  Estimated: `6703`
-		// Minimum execution time: 31_250_000 picoseconds.
-		Weight::from_parts(31_604_000, 0)
-			.saturating_add(Weight::from_parts(0, 6703))
-			.saturating_add(T::DbWeight::get().reads(3))
-			.saturating_add(T::DbWeight::get().writes(3))
-	}
-	/// Storage: Democracy PublicProps (r:1 w:1)
-	/// Proof: Democracy PublicProps (max_values: Some(1), max_size: Some(16702), added: 17197, mode: MaxEncodedLen)
-	/// Storage: Democracy DepositOf (r:1 w:1)
-	/// Proof: Democracy DepositOf (max_values: None, max_size: Some(3230), added: 5705, mode: MaxEncodedLen)
-	/// Storage: System Account (r:1 w:1)
-	/// Proof: System Account (max_values: None, max_size: Some(128), added: 2603, mode: MaxEncodedLen)
-	/// Storage: Democracy MetadataOf (r:1 w:1)
-	/// Proof: Democracy MetadataOf (max_values: None, max_size: Some(53), added: 2528, mode: MaxEncodedLen)
-	fn cancel_proposal() -> Weight {
-		// Proof Size summary in bytes:
-		//  Measured:  `5754`
-		//  Estimated: `18187`
-		// Minimum execution time: 79_757_000 picoseconds.
-		Weight::from_parts(83_603_000, 0)
-			.saturating_add(Weight::from_parts(0, 18187))
-			.saturating_add(T::DbWeight::get().reads(4))
-			.saturating_add(T::DbWeight::get().writes(4))
-	}
-	/// Storage: Democracy MetadataOf (r:1 w:1)
-	/// Proof: Democracy MetadataOf (max_values: None, max_size: Some(53), added: 2528, mode: MaxEncodedLen)
-	/// Storage: Democracy ReferendumInfoOf (r:0 w:1)
-	/// Proof: Democracy ReferendumInfoOf (max_values: None, max_size: Some(201), added: 2676, mode: MaxEncodedLen)
-	fn cancel_referendum() -> Weight {
-		// Proof Size summary in bytes:
-		//  Measured:  `204`
-		//  Estimated: `3518`
-		// Minimum execution time: 20_034_000 picoseconds.
-		Weight::from_parts(20_674_000, 0)
-			.saturating_add(Weight::from_parts(0, 3518))
-			.saturating_add(T::DbWeight::get().reads(1))
-			.saturating_add(T::DbWeight::get().writes(2))
-	}
-	/// Storage: Democracy LowestUnbaked (r:1 w:1)
-	/// Proof: Democracy LowestUnbaked (max_values: Some(1), max_size: Some(4), added: 499, mode: MaxEncodedLen)
-	/// Storage: Democracy ReferendumCount (r:1 w:0)
-	/// Proof: Democracy ReferendumCount (max_values: Some(1), max_size: Some(4), added: 499, mode: MaxEncodedLen)
-	/// Storage: Democracy ReferendumInfoOf (r:99 w:0)
-	/// Proof: Democracy ReferendumInfoOf (max_values: None, max_size: Some(201), added: 2676, mode: MaxEncodedLen)
-	/// The range of component `r` is `[0, 99]`.
-	fn on_initialize_base(r: u32, ) -> Weight {
-		// Proof Size summary in bytes:
-		//  Measured:  `177 + r * (86 ±0)`
-		//  Estimated: `1489 + r * (2676 ±0)`
-		// Minimum execution time: 7_053_000 picoseconds.
-		Weight::from_parts(10_157_848, 0)
-			.saturating_add(Weight::from_parts(0, 1489))
-			// Standard Error: 5_462
-			.saturating_add(Weight::from_parts(2_710_889, 0).saturating_mul(r.into()))
-			.saturating_add(T::DbWeight::get().reads(2))
-			.saturating_add(T::DbWeight::get().reads((1_u64).saturating_mul(r.into())))
-			.saturating_add(T::DbWeight::get().writes(1))
-			.saturating_add(Weight::from_parts(0, 2676).saturating_mul(r.into()))
-	}
-	/// Storage: Democracy LowestUnbaked (r:1 w:1)
-	/// Proof: Democracy LowestUnbaked (max_values: Some(1), max_size: Some(4), added: 499, mode: MaxEncodedLen)
-	/// Storage: Democracy ReferendumCount (r:1 w:0)
-	/// Proof: Democracy ReferendumCount (max_values: Some(1), max_size: Some(4), added: 499, mode: MaxEncodedLen)
-	/// Storage: Democracy LastTabledWasExternal (r:1 w:0)
-	/// Proof: Democracy LastTabledWasExternal (max_values: Some(1), max_size: Some(1), added: 496, mode: MaxEncodedLen)
-	/// Storage: Democracy NextExternal (r:1 w:0)
-	/// Proof: Democracy NextExternal (max_values: Some(1), max_size: Some(132), added: 627, mode: MaxEncodedLen)
-	/// Storage: Democracy PublicProps (r:1 w:0)
-	/// Proof: Democracy PublicProps (max_values: Some(1), max_size: Some(16702), added: 17197, mode: MaxEncodedLen)
-	/// Storage: Democracy ReferendumInfoOf (r:99 w:0)
-	/// Proof: Democracy ReferendumInfoOf (max_values: None, max_size: Some(201), added: 2676, mode: MaxEncodedLen)
-	/// The range of component `r` is `[0, 99]`.
-	fn on_initialize_base_with_launch_period(r: u32, ) -> Weight {
-		// Proof Size summary in bytes:
-		//  Measured:  `177 + r * (86 ±0)`
-		//  Estimated: `18187 + r * (2676 ±0)`
-		// Minimum execution time: 9_585_000 picoseconds.
-		Weight::from_parts(13_021_372, 0)
-			.saturating_add(Weight::from_parts(0, 18187))
-			// Standard Error: 6_031
-			.saturating_add(Weight::from_parts(2_707_449, 0).saturating_mul(r.into()))
-			.saturating_add(T::DbWeight::get().reads(5))
-			.saturating_add(T::DbWeight::get().reads((1_u64).saturating_mul(r.into())))
-			.saturating_add(T::DbWeight::get().writes(1))
-			.saturating_add(Weight::from_parts(0, 2676).saturating_mul(r.into()))
-	}
-	/// Storage: Democracy VotingOf (r:3 w:3)
-	/// Proof: Democracy VotingOf (max_values: None, max_size: Some(3795), added: 6270, mode: MaxEncodedLen)
-	/// Storage: Democracy ReferendumInfoOf (r:99 w:99)
-	/// Proof: Democracy ReferendumInfoOf (max_values: None, max_size: Some(201), added: 2676, mode: MaxEncodedLen)
-	/// Storage: Balances Locks (r:1 w:1)
-	/// Proof: Balances Locks (max_values: None, max_size: Some(1299), added: 3774, mode: MaxEncodedLen)
-	/// Storage: Balances Freezes (r:1 w:0)
-	/// Proof: Balances Freezes (max_values: None, max_size: Some(65), added: 2540, mode: MaxEncodedLen)
-	/// The range of component `r` is `[0, 99]`.
-	fn delegate(r: u32, ) -> Weight {
-		// Proof Size summary in bytes:
-		//  Measured:  `729 + r * (108 ±0)`
-		//  Estimated: `19800 + r * (2676 ±0)`
-		// Minimum execution time: 41_109_000 picoseconds.
-		Weight::from_parts(46_477_334, 0)
-			.saturating_add(Weight::from_parts(0, 19800))
-			// Standard Error: 9_372
-			.saturating_add(Weight::from_parts(3_815_232, 0).saturating_mul(r.into()))
-			.saturating_add(T::DbWeight::get().reads(5))
-			.saturating_add(T::DbWeight::get().reads((1_u64).saturating_mul(r.into())))
-			.saturating_add(T::DbWeight::get().writes(4))
-			.saturating_add(T::DbWeight::get().writes((1_u64).saturating_mul(r.into())))
-			.saturating_add(Weight::from_parts(0, 2676).saturating_mul(r.into()))
-	}
-	/// Storage: Democracy VotingOf (r:2 w:2)
-	/// Proof: Democracy VotingOf (max_values: None, max_size: Some(3795), added: 6270, mode: MaxEncodedLen)
-	/// Storage: Democracy ReferendumInfoOf (r:99 w:99)
-	/// Proof: Democracy ReferendumInfoOf (max_values: None, max_size: Some(201), added: 2676, mode: MaxEncodedLen)
-	/// The range of component `r` is `[0, 99]`.
-	fn undelegate(r: u32, ) -> Weight {
-		// Proof Size summary in bytes:
-		//  Measured:  `426 + r * (108 ±0)`
-		//  Estimated: `13530 + r * (2676 ±0)`
-		// Minimum execution time: 21_283_000 picoseconds.
-		Weight::from_parts(23_372_139, 0)
-			.saturating_add(Weight::from_parts(0, 13530))
-			// Standard Error: 6_191
-			.saturating_add(Weight::from_parts(3_768_585, 0).saturating_mul(r.into()))
-			.saturating_add(T::DbWeight::get().reads(2))
-			.saturating_add(T::DbWeight::get().reads((1_u64).saturating_mul(r.into())))
-			.saturating_add(T::DbWeight::get().writes(2))
-			.saturating_add(T::DbWeight::get().writes((1_u64).saturating_mul(r.into())))
-			.saturating_add(Weight::from_parts(0, 2676).saturating_mul(r.into()))
-	}
-	/// Storage: Democracy PublicProps (r:0 w:1)
-	/// Proof: Democracy PublicProps (max_values: Some(1), max_size: Some(16702), added: 17197, mode: MaxEncodedLen)
-	fn clear_public_proposals() -> Weight {
-		// Proof Size summary in bytes:
-		//  Measured:  `0`
-		//  Estimated: `0`
-		// Minimum execution time: 3_510_000 picoseconds.
-		Weight::from_parts(3_642_000, 0)
-			.saturating_add(Weight::from_parts(0, 0))
-			.saturating_add(T::DbWeight::get().writes(1))
-	}
-	/// Storage: Democracy VotingOf (r:1 w:1)
-	/// Proof: Democracy VotingOf (max_values: None, max_size: Some(3795), added: 6270, mode: MaxEncodedLen)
-	/// Storage: Balances Locks (r:1 w:1)
-	/// Proof: Balances Locks (max_values: None, max_size: Some(1299), added: 3774, mode: MaxEncodedLen)
-	/// Storage: Balances Freezes (r:1 w:0)
-	/// Proof: Balances Freezes (max_values: None, max_size: Some(65), added: 2540, mode: MaxEncodedLen)
-	/// Storage: System Account (r:1 w:1)
-	/// Proof: System Account (max_values: None, max_size: Some(128), added: 2603, mode: MaxEncodedLen)
-	/// The range of component `r` is `[0, 99]`.
-	fn unlock_remove(r: u32, ) -> Weight {
-		// Proof Size summary in bytes:
-		//  Measured:  `458`
-		//  Estimated: `7260`
-		// Minimum execution time: 23_647_000 picoseconds.
-		Weight::from_parts(36_627_552, 0)
-			.saturating_add(Weight::from_parts(0, 7260))
-			// Standard Error: 2_937
-			.saturating_add(Weight::from_parts(34_132, 0).saturating_mul(r.into()))
-			.saturating_add(T::DbWeight::get().reads(4))
-			.saturating_add(T::DbWeight::get().writes(3))
-	}
-	/// Storage: Democracy VotingOf (r:1 w:1)
-	/// Proof: Democracy VotingOf (max_values: None, max_size: Some(3795), added: 6270, mode: MaxEncodedLen)
-	/// Storage: Balances Locks (r:1 w:1)
-	/// Proof: Balances Locks (max_values: None, max_size: Some(1299), added: 3774, mode: MaxEncodedLen)
-	/// Storage: Balances Freezes (r:1 w:0)
-	/// Proof: Balances Freezes (max_values: None, max_size: Some(65), added: 2540, mode: MaxEncodedLen)
-	/// Storage: System Account (r:1 w:1)
-	/// Proof: System Account (max_values: None, max_size: Some(128), added: 2603, mode: MaxEncodedLen)
-	/// The range of component `r` is `[0, 99]`.
-	fn unlock_set(r: u32, ) -> Weight {
-		// Proof Size summary in bytes:
-		//  Measured:  `459 + r * (22 ±0)`
-		//  Estimated: `7260`
-		// Minimum execution time: 33_932_000 picoseconds.
-		Weight::from_parts(35_331_660, 0)
-			.saturating_add(Weight::from_parts(0, 7260))
-			// Standard Error: 615
-			.saturating_add(Weight::from_parts(60_730, 0).saturating_mul(r.into()))
-			.saturating_add(T::DbWeight::get().reads(4))
-			.saturating_add(T::DbWeight::get().writes(3))
-	}
-	/// Storage: Democracy ReferendumInfoOf (r:1 w:1)
-	/// Proof: Democracy ReferendumInfoOf (max_values: None, max_size: Some(201), added: 2676, mode: MaxEncodedLen)
-	/// Storage: Democracy VotingOf (r:1 w:1)
-	/// Proof: Democracy VotingOf (max_values: None, max_size: Some(3795), added: 6270, mode: MaxEncodedLen)
-	/// The range of component `r` is `[1, 100]`.
-	fn remove_vote(r: u32, ) -> Weight {
-		// Proof Size summary in bytes:
-		//  Measured:  `661 + r * (26 ±0)`
-		//  Estimated: `7260`
-		// Minimum execution time: 16_605_000 picoseconds.
-		Weight::from_parts(19_057_092, 0)
-			.saturating_add(Weight::from_parts(0, 7260))
-			// Standard Error: 873
-			.saturating_add(Weight::from_parts(68_964, 0).saturating_mul(r.into()))
-			.saturating_add(T::DbWeight::get().reads(2))
-			.saturating_add(T::DbWeight::get().writes(2))
-	}
-	/// Storage: Democracy ReferendumInfoOf (r:1 w:1)
-	/// Proof: Democracy ReferendumInfoOf (max_values: None, max_size: Some(201), added: 2676, mode: MaxEncodedLen)
-	/// Storage: Democracy VotingOf (r:1 w:1)
-	/// Proof: Democracy VotingOf (max_values: None, max_size: Some(3795), added: 6270, mode: MaxEncodedLen)
-	/// The range of component `r` is `[1, 100]`.
-	fn remove_other_vote(r: u32, ) -> Weight {
-		// Proof Size summary in bytes:
-		//  Measured:  `661 + r * (26 ±0)`
-		//  Estimated: `7260`
-		// Minimum execution time: 16_801_000 picoseconds.
-		Weight::from_parts(19_166_788, 0)
-			.saturating_add(Weight::from_parts(0, 7260))
-			// Standard Error: 1_008
-			.saturating_add(Weight::from_parts(69_851, 0).saturating_mul(r.into()))
-			.saturating_add(T::DbWeight::get().reads(2))
-			.saturating_add(T::DbWeight::get().writes(2))
-	}
-	/// Storage: Democracy NextExternal (r:1 w:0)
-	/// Proof: Democracy NextExternal (max_values: Some(1), max_size: Some(132), added: 627, mode: MaxEncodedLen)
-	/// Storage: Preimage StatusFor (r:1 w:0)
-	/// Proof: Preimage StatusFor (max_values: None, max_size: Some(91), added: 2566, mode: MaxEncodedLen)
-	/// Storage: Democracy MetadataOf (r:0 w:1)
-	/// Proof: Democracy MetadataOf (max_values: None, max_size: Some(53), added: 2528, mode: MaxEncodedLen)
-	fn set_external_metadata() -> Weight {
-		// Proof Size summary in bytes:
-		//  Measured:  `361`
-		//  Estimated: `3556`
-		// Minimum execution time: 19_207_000 picoseconds.
-		Weight::from_parts(19_693_000, 0)
-			.saturating_add(Weight::from_parts(0, 3556))
-			.saturating_add(T::DbWeight::get().reads(2))
-			.saturating_add(T::DbWeight::get().writes(1))
-	}
-	/// Storage: Democracy NextExternal (r:1 w:0)
-	/// Proof: Democracy NextExternal (max_values: Some(1), max_size: Some(132), added: 627, mode: MaxEncodedLen)
-	/// Storage: Democracy MetadataOf (r:1 w:1)
-	/// Proof: Democracy MetadataOf (max_values: None, max_size: Some(53), added: 2528, mode: MaxEncodedLen)
-	fn clear_external_metadata() -> Weight {
-		// Proof Size summary in bytes:
-		//  Measured:  `219`
-		//  Estimated: `3518`
-		// Minimum execution time: 17_333_000 picoseconds.
-		Weight::from_parts(17_555_000, 0)
-			.saturating_add(Weight::from_parts(0, 3518))
-			.saturating_add(T::DbWeight::get().reads(2))
-			.saturating_add(T::DbWeight::get().writes(1))
-	}
-	/// Storage: Democracy PublicProps (r:1 w:0)
-	/// Proof: Democracy PublicProps (max_values: Some(1), max_size: Some(16702), added: 17197, mode: MaxEncodedLen)
-	/// Storage: Preimage StatusFor (r:1 w:0)
-	/// Proof: Preimage StatusFor (max_values: None, max_size: Some(91), added: 2566, mode: MaxEncodedLen)
-	/// Storage: Democracy MetadataOf (r:0 w:1)
-	/// Proof: Democracy MetadataOf (max_values: None, max_size: Some(53), added: 2528, mode: MaxEncodedLen)
-	fn set_proposal_metadata() -> Weight {
-		// Proof Size summary in bytes:
-		//  Measured:  `4893`
-		//  Estimated: `18187`
-		// Minimum execution time: 33_859_000 picoseconds.
-		Weight::from_parts(34_538_000, 0)
-			.saturating_add(Weight::from_parts(0, 18187))
-			.saturating_add(T::DbWeight::get().reads(2))
-			.saturating_add(T::DbWeight::get().writes(1))
-	}
-	/// Storage: Democracy PublicProps (r:1 w:0)
-	/// Proof: Democracy PublicProps (max_values: Some(1), max_size: Some(16702), added: 17197, mode: MaxEncodedLen)
-	/// Storage: Democracy MetadataOf (r:1 w:1)
-	/// Proof: Democracy MetadataOf (max_values: None, max_size: Some(53), added: 2528, mode: MaxEncodedLen)
-	fn clear_proposal_metadata() -> Weight {
-		// Proof Size summary in bytes:
-		//  Measured:  `4755`
-		//  Estimated: `18187`
-		// Minimum execution time: 31_155_000 picoseconds.
-		Weight::from_parts(31_520_000, 0)
-			.saturating_add(Weight::from_parts(0, 18187))
-			.saturating_add(T::DbWeight::get().reads(2))
-			.saturating_add(T::DbWeight::get().writes(1))
-	}
-	/// Storage: Preimage StatusFor (r:1 w:0)
-	/// Proof: Preimage StatusFor (max_values: None, max_size: Some(91), added: 2566, mode: MaxEncodedLen)
-	/// Storage: Democracy MetadataOf (r:0 w:1)
-	/// Proof: Democracy MetadataOf (max_values: None, max_size: Some(53), added: 2528, mode: MaxEncodedLen)
-	fn set_referendum_metadata() -> Weight {
-		// Proof Size summary in bytes:
-		//  Measured:  `216`
-		//  Estimated: `3556`
-		// Minimum execution time: 15_924_000 picoseconds.
-		Weight::from_parts(16_151_000, 0)
-			.saturating_add(Weight::from_parts(0, 3556))
-			.saturating_add(T::DbWeight::get().reads(1))
-			.saturating_add(T::DbWeight::get().writes(1))
-	}
-	/// Storage: Democracy ReferendumInfoOf (r:1 w:0)
-	/// Proof: Democracy ReferendumInfoOf (max_values: None, max_size: Some(201), added: 2676, mode: MaxEncodedLen)
-	/// Storage: Democracy MetadataOf (r:1 w:1)
-	/// Proof: Democracy MetadataOf (max_values: None, max_size: Some(53), added: 2528, mode: MaxEncodedLen)
-	fn clear_referendum_metadata() -> Weight {
-		// Proof Size summary in bytes:
-		//  Measured:  `235`
-		//  Estimated: `3666`
-		// Minimum execution time: 18_983_000 picoseconds.
-		Weight::from_parts(19_280_000, 0)
-			.saturating_add(Weight::from_parts(0, 3666))
-			.saturating_add(T::DbWeight::get().reads(2))
-			.saturating_add(T::DbWeight::get().writes(1))
-	}
-}
diff --git a/polkadot/runtime/rococo/src/weights/pallet_elections_phragmen.rs b/polkadot/runtime/rococo/src/weights/pallet_elections_phragmen.rs
deleted file mode 100644
index fe6aca5ab881d457ac8c40c8191f655a43261bb2..0000000000000000000000000000000000000000
--- a/polkadot/runtime/rococo/src/weights/pallet_elections_phragmen.rs
+++ /dev/null
@@ -1,315 +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/>.
-
-//! Autogenerated weights for `pallet_elections_phragmen`
-//!
-//! THIS FILE WAS AUTO-GENERATED USING THE SUBSTRATE BENCHMARK CLI VERSION 4.0.0-dev
-//! DATE: 2023-05-26, STEPS: `50`, REPEAT: `20`, LOW RANGE: `[]`, HIGH RANGE: `[]`
-//! WORST CASE MAP SIZE: `1000000`
-//! HOSTNAME: `bm5`, CPU: `Intel(R) Core(TM) i7-7700K CPU @ 4.20GHz`
-//! EXECUTION: Some(Wasm), WASM-EXECUTION: Compiled, CHAIN: Some("rococo-dev"), DB CACHE: 1024
-
-// Executed Command:
-// ./target/production/polkadot
-// benchmark
-// pallet
-// --chain=rococo-dev
-// --steps=50
-// --repeat=20
-// --pallet=pallet_elections_phragmen
-// --extrinsic=*
-// --execution=wasm
-// --wasm-execution=compiled
-// --header=./file_header.txt
-// --output=./runtime/rococo/src/weights/
-
-#![cfg_attr(rustfmt, rustfmt_skip)]
-#![allow(unused_parens)]
-#![allow(unused_imports)]
-#![allow(missing_docs)]
-
-use frame_support::{traits::Get, weights::Weight};
-use core::marker::PhantomData;
-
-/// Weight functions for `pallet_elections_phragmen`.
-pub struct WeightInfo<T>(PhantomData<T>);
-impl<T: frame_system::Config> pallet_elections_phragmen::WeightInfo for WeightInfo<T> {
-	/// Storage: PhragmenElection Candidates (r:1 w:0)
-	/// Proof Skipped: PhragmenElection Candidates (max_values: Some(1), max_size: None, mode: Measured)
-	/// Storage: PhragmenElection Members (r:1 w:0)
-	/// Proof Skipped: PhragmenElection Members (max_values: Some(1), max_size: None, mode: Measured)
-	/// Storage: PhragmenElection RunnersUp (r:1 w:0)
-	/// Proof Skipped: PhragmenElection RunnersUp (max_values: Some(1), max_size: None, mode: Measured)
-	/// Storage: PhragmenElection Voting (r:1 w:1)
-	/// Proof Skipped: PhragmenElection Voting (max_values: None, max_size: None, mode: Measured)
-	/// Storage: Balances Locks (r:1 w:1)
-	/// Proof: Balances Locks (max_values: None, max_size: Some(1299), added: 3774, mode: MaxEncodedLen)
-	/// Storage: Balances Freezes (r:1 w:0)
-	/// Proof: Balances Freezes (max_values: None, max_size: Some(65), added: 2540, mode: MaxEncodedLen)
-	/// The range of component `v` is `[1, 16]`.
-	fn vote_equal(v: u32, ) -> Weight {
-		// Proof Size summary in bytes:
-		//  Measured:  `331 + v * (80 ±0)`
-		//  Estimated: `4764 + v * (80 ±0)`
-		// Minimum execution time: 30_910_000 picoseconds.
-		Weight::from_parts(31_851_802, 0)
-			.saturating_add(Weight::from_parts(0, 4764))
-			// Standard Error: 4_099
-			.saturating_add(Weight::from_parts(137_675, 0).saturating_mul(v.into()))
-			.saturating_add(T::DbWeight::get().reads(6))
-			.saturating_add(T::DbWeight::get().writes(2))
-			.saturating_add(Weight::from_parts(0, 80).saturating_mul(v.into()))
-	}
-	/// Storage: PhragmenElection Candidates (r:1 w:0)
-	/// Proof Skipped: PhragmenElection Candidates (max_values: Some(1), max_size: None, mode: Measured)
-	/// Storage: PhragmenElection Members (r:1 w:0)
-	/// Proof Skipped: PhragmenElection Members (max_values: Some(1), max_size: None, mode: Measured)
-	/// Storage: PhragmenElection RunnersUp (r:1 w:0)
-	/// Proof Skipped: PhragmenElection RunnersUp (max_values: Some(1), max_size: None, mode: Measured)
-	/// Storage: PhragmenElection Voting (r:1 w:1)
-	/// Proof Skipped: PhragmenElection Voting (max_values: None, max_size: None, mode: Measured)
-	/// Storage: Balances Locks (r:1 w:1)
-	/// Proof: Balances Locks (max_values: None, max_size: Some(1299), added: 3774, mode: MaxEncodedLen)
-	/// Storage: Balances Freezes (r:1 w:0)
-	/// Proof: Balances Freezes (max_values: None, max_size: Some(65), added: 2540, mode: MaxEncodedLen)
-	/// The range of component `v` is `[2, 16]`.
-	fn vote_more(v: u32, ) -> Weight {
-		// Proof Size summary in bytes:
-		//  Measured:  `299 + v * (80 ±0)`
-		//  Estimated: `4764 + v * (80 ±0)`
-		// Minimum execution time: 42_670_000 picoseconds.
-		Weight::from_parts(43_351_345, 0)
-			.saturating_add(Weight::from_parts(0, 4764))
-			// Standard Error: 2_986
-			.saturating_add(Weight::from_parts(142_231, 0).saturating_mul(v.into()))
-			.saturating_add(T::DbWeight::get().reads(6))
-			.saturating_add(T::DbWeight::get().writes(2))
-			.saturating_add(Weight::from_parts(0, 80).saturating_mul(v.into()))
-	}
-	/// Storage: PhragmenElection Candidates (r:1 w:0)
-	/// Proof Skipped: PhragmenElection Candidates (max_values: Some(1), max_size: None, mode: Measured)
-	/// Storage: PhragmenElection Members (r:1 w:0)
-	/// Proof Skipped: PhragmenElection Members (max_values: Some(1), max_size: None, mode: Measured)
-	/// Storage: PhragmenElection RunnersUp (r:1 w:0)
-	/// Proof Skipped: PhragmenElection RunnersUp (max_values: Some(1), max_size: None, mode: Measured)
-	/// Storage: PhragmenElection Voting (r:1 w:1)
-	/// Proof Skipped: PhragmenElection Voting (max_values: None, max_size: None, mode: Measured)
-	/// Storage: Balances Locks (r:1 w:1)
-	/// Proof: Balances Locks (max_values: None, max_size: Some(1299), added: 3774, mode: MaxEncodedLen)
-	/// Storage: Balances Freezes (r:1 w:0)
-	/// Proof: Balances Freezes (max_values: None, max_size: Some(65), added: 2540, mode: MaxEncodedLen)
-	/// The range of component `v` is `[2, 16]`.
-	fn vote_less(v: u32, ) -> Weight {
-		// Proof Size summary in bytes:
-		//  Measured:  `331 + v * (80 ±0)`
-		//  Estimated: `4764 + v * (80 ±0)`
-		// Minimum execution time: 42_782_000 picoseconds.
-		Weight::from_parts(43_611_866, 0)
-			.saturating_add(Weight::from_parts(0, 4764))
-			// Standard Error: 2_968
-			.saturating_add(Weight::from_parts(125_939, 0).saturating_mul(v.into()))
-			.saturating_add(T::DbWeight::get().reads(6))
-			.saturating_add(T::DbWeight::get().writes(2))
-			.saturating_add(Weight::from_parts(0, 80).saturating_mul(v.into()))
-	}
-	/// Storage: PhragmenElection Voting (r:1 w:1)
-	/// Proof Skipped: PhragmenElection Voting (max_values: None, max_size: None, mode: Measured)
-	/// Storage: Balances Locks (r:1 w:1)
-	/// Proof: Balances Locks (max_values: None, max_size: Some(1299), added: 3774, mode: MaxEncodedLen)
-	/// Storage: Balances Freezes (r:1 w:0)
-	/// Proof: Balances Freezes (max_values: None, max_size: Some(65), added: 2540, mode: MaxEncodedLen)
-	fn remove_voter() -> Weight {
-		// Proof Size summary in bytes:
-		//  Measured:  `853`
-		//  Estimated: `4764`
-		// Minimum execution time: 44_301_000 picoseconds.
-		Weight::from_parts(44_843_000, 0)
-			.saturating_add(Weight::from_parts(0, 4764))
-			.saturating_add(T::DbWeight::get().reads(3))
-			.saturating_add(T::DbWeight::get().writes(2))
-	}
-	/// Storage: PhragmenElection Candidates (r:1 w:1)
-	/// Proof Skipped: PhragmenElection Candidates (max_values: Some(1), max_size: None, mode: Measured)
-	/// Storage: PhragmenElection Members (r:1 w:0)
-	/// Proof Skipped: PhragmenElection Members (max_values: Some(1), max_size: None, mode: Measured)
-	/// Storage: PhragmenElection RunnersUp (r:1 w:0)
-	/// Proof Skipped: PhragmenElection RunnersUp (max_values: Some(1), max_size: None, mode: Measured)
-	/// The range of component `c` is `[1, 1000]`.
-	fn submit_candidacy(c: u32, ) -> Weight {
-		// Proof Size summary in bytes:
-		//  Measured:  `2678 + c * (48 ±0)`
-		//  Estimated: `4161 + c * (48 ±0)`
-		// Minimum execution time: 33_576_000 picoseconds.
-		Weight::from_parts(26_859_487, 0)
-			.saturating_add(Weight::from_parts(0, 4161))
-			// Standard Error: 854
-			.saturating_add(Weight::from_parts(81_887, 0).saturating_mul(c.into()))
-			.saturating_add(T::DbWeight::get().reads(3))
-			.saturating_add(T::DbWeight::get().writes(1))
-			.saturating_add(Weight::from_parts(0, 48).saturating_mul(c.into()))
-	}
-	/// Storage: PhragmenElection Candidates (r:1 w:1)
-	/// Proof Skipped: PhragmenElection Candidates (max_values: Some(1), max_size: None, mode: Measured)
-	/// The range of component `c` is `[1, 1000]`.
-	fn renounce_candidacy_candidate(c: u32, ) -> Weight {
-		// Proof Size summary in bytes:
-		//  Measured:  `250 + c * (48 ±0)`
-		//  Estimated: `1722 + c * (48 ±0)`
-		// Minimum execution time: 29_671_000 picoseconds.
-		Weight::from_parts(22_509_800, 0)
-			.saturating_add(Weight::from_parts(0, 1722))
-			// Standard Error: 908
-			.saturating_add(Weight::from_parts(58_320, 0).saturating_mul(c.into()))
-			.saturating_add(T::DbWeight::get().reads(1))
-			.saturating_add(T::DbWeight::get().writes(1))
-			.saturating_add(Weight::from_parts(0, 48).saturating_mul(c.into()))
-	}
-	/// Storage: PhragmenElection Members (r:1 w:1)
-	/// Proof Skipped: PhragmenElection Members (max_values: Some(1), max_size: None, mode: Measured)
-	/// Storage: PhragmenElection RunnersUp (r:1 w:1)
-	/// Proof Skipped: PhragmenElection RunnersUp (max_values: Some(1), max_size: None, mode: Measured)
-	/// Storage: Council Prime (r:1 w:1)
-	/// Proof Skipped: Council Prime (max_values: Some(1), max_size: None, mode: Measured)
-	/// Storage: Council Proposals (r:1 w:0)
-	/// Proof Skipped: Council Proposals (max_values: Some(1), max_size: None, mode: Measured)
-	/// Storage: Council Members (r:0 w:1)
-	/// Proof Skipped: Council Members (max_values: Some(1), max_size: None, mode: Measured)
-	fn renounce_candidacy_members() -> Weight {
-		// Proof Size summary in bytes:
-		//  Measured:  `2952`
-		//  Estimated: `4437`
-		// Minimum execution time: 45_934_000 picoseconds.
-		Weight::from_parts(46_279_000, 0)
-			.saturating_add(Weight::from_parts(0, 4437))
-			.saturating_add(T::DbWeight::get().reads(4))
-			.saturating_add(T::DbWeight::get().writes(4))
-	}
-	/// Storage: PhragmenElection RunnersUp (r:1 w:1)
-	/// Proof Skipped: PhragmenElection RunnersUp (max_values: Some(1), max_size: None, mode: Measured)
-	fn renounce_candidacy_runners_up() -> Weight {
-		// Proof Size summary in bytes:
-		//  Measured:  `1647`
-		//  Estimated: `3132`
-		// Minimum execution time: 30_291_000 picoseconds.
-		Weight::from_parts(30_611_000, 0)
-			.saturating_add(Weight::from_parts(0, 3132))
-			.saturating_add(T::DbWeight::get().reads(1))
-			.saturating_add(T::DbWeight::get().writes(1))
-	}
-	/// Storage: Benchmark Override (r:0 w:0)
-	/// Proof Skipped: Benchmark Override (max_values: None, max_size: None, mode: Measured)
-	fn remove_member_without_replacement() -> Weight {
-		// Proof Size summary in bytes:
-		//  Measured:  `0`
-		//  Estimated: `0`
-		// Minimum execution time: 2_000_000_000_000 picoseconds.
-		Weight::from_parts(2_000_000_000_000, 0)
-			.saturating_add(Weight::from_parts(0, 0))
-	}
-	/// Storage: PhragmenElection Members (r:1 w:1)
-	/// Proof Skipped: PhragmenElection Members (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: PhragmenElection RunnersUp (r:1 w:1)
-	/// Proof Skipped: PhragmenElection RunnersUp (max_values: Some(1), max_size: None, mode: Measured)
-	/// Storage: Council Prime (r:1 w:1)
-	/// Proof Skipped: Council Prime (max_values: Some(1), max_size: None, mode: Measured)
-	/// Storage: Council Proposals (r:1 w:0)
-	/// Proof Skipped: Council Proposals (max_values: Some(1), max_size: None, mode: Measured)
-	/// Storage: Council Members (r:0 w:1)
-	/// Proof Skipped: Council Members (max_values: Some(1), max_size: None, mode: Measured)
-	fn remove_member_with_replacement() -> Weight {
-		// Proof Size summary in bytes:
-		//  Measured:  `2952`
-		//  Estimated: `4437`
-		// Minimum execution time: 63_178_000 picoseconds.
-		Weight::from_parts(63_850_000, 0)
-			.saturating_add(Weight::from_parts(0, 4437))
-			.saturating_add(T::DbWeight::get().reads(5))
-			.saturating_add(T::DbWeight::get().writes(5))
-	}
-	/// Storage: PhragmenElection Voting (r:10001 w:10000)
-	/// Proof Skipped: PhragmenElection Voting (max_values: None, max_size: None, mode: Measured)
-	/// Storage: PhragmenElection Members (r:1 w:0)
-	/// Proof Skipped: PhragmenElection Members (max_values: Some(1), max_size: None, mode: Measured)
-	/// Storage: PhragmenElection RunnersUp (r:1 w:0)
-	/// Proof Skipped: PhragmenElection RunnersUp (max_values: Some(1), max_size: None, mode: Measured)
-	/// Storage: PhragmenElection Candidates (r:1 w:0)
-	/// Proof Skipped: PhragmenElection Candidates (max_values: Some(1), max_size: None, mode: Measured)
-	/// Storage: Balances Locks (r:10000 w:10000)
-	/// Proof: Balances Locks (max_values: None, max_size: Some(1299), added: 3774, mode: MaxEncodedLen)
-	/// Storage: Balances Freezes (r:10000 w:0)
-	/// Proof: Balances Freezes (max_values: None, max_size: Some(65), added: 2540, mode: MaxEncodedLen)
-	/// Storage: System Account (r:10000 w:10000)
-	/// Proof: System Account (max_values: None, max_size: Some(128), added: 2603, mode: MaxEncodedLen)
-	/// The range of component `v` is `[5000, 10000]`.
-	/// The range of component `d` is `[0, 5000]`.
-	fn clean_defunct_voters(v: u32, _d: u32, ) -> Weight {
-		// Proof Size summary in bytes:
-		//  Measured:  `35961 + v * (808 ±0)`
-		//  Estimated: `39702 + v * (3774 ±0)`
-		// Minimum execution time: 379_638_846_000 picoseconds.
-		Weight::from_parts(380_443_068_000, 0)
-			.saturating_add(Weight::from_parts(0, 39702))
-			// Standard Error: 318_371
-			.saturating_add(Weight::from_parts(46_236_987, 0).saturating_mul(v.into()))
-			.saturating_add(T::DbWeight::get().reads(4))
-			.saturating_add(T::DbWeight::get().reads((4_u64).saturating_mul(v.into())))
-			.saturating_add(T::DbWeight::get().writes((3_u64).saturating_mul(v.into())))
-			.saturating_add(Weight::from_parts(0, 3774).saturating_mul(v.into()))
-	}
-	/// Storage: PhragmenElection Candidates (r:1 w:1)
-	/// Proof Skipped: PhragmenElection Candidates (max_values: Some(1), max_size: None, mode: Measured)
-	/// Storage: PhragmenElection Members (r:1 w:1)
-	/// Proof Skipped: PhragmenElection Members (max_values: Some(1), max_size: None, mode: Measured)
-	/// Storage: PhragmenElection RunnersUp (r:1 w:1)
-	/// Proof Skipped: PhragmenElection RunnersUp (max_values: Some(1), max_size: None, mode: Measured)
-	/// Storage: PhragmenElection Voting (r:10001 w:0)
-	/// Proof Skipped: PhragmenElection Voting (max_values: None, max_size: None, mode: Measured)
-	/// Storage: Council Proposals (r:1 w:0)
-	/// Proof Skipped: Council Proposals (max_values: Some(1), max_size: None, mode: Measured)
-	/// Storage: System Account (r:962 w:962)
-	/// Proof: System Account (max_values: None, max_size: Some(128), added: 2603, mode: MaxEncodedLen)
-	/// Storage: PhragmenElection ElectionRounds (r:1 w:1)
-	/// Proof Skipped: PhragmenElection ElectionRounds (max_values: Some(1), max_size: None, mode: Measured)
-	/// Storage: Council Members (r:0 w:1)
-	/// Proof Skipped: Council Members (max_values: Some(1), max_size: None, mode: Measured)
-	/// Storage: Council Prime (r:0 w:1)
-	/// Proof Skipped: Council Prime (max_values: Some(1), max_size: None, mode: Measured)
-	/// The range of component `c` is `[1, 1000]`.
-	/// The range of component `v` is `[1, 10000]`.
-	/// The range of component `e` is `[10000, 160000]`.
-	fn election_phragmen(c: u32, v: u32, e: u32, ) -> Weight {
-		// Proof Size summary in bytes:
-		//  Measured:  `0 + e * (28 ±0) + v * (607 ±0)`
-		//  Estimated: `2771509 + c * (2560 ±0) + e * (16 ±0) + v * (2744 ±4)`
-		// Minimum execution time: 35_941_980_000 picoseconds.
-		Weight::from_parts(36_032_688_000, 0)
-			.saturating_add(Weight::from_parts(0, 2771509))
-			// Standard Error: 554_972
-			.saturating_add(Weight::from_parts(43_733_923, 0).saturating_mul(v.into()))
-			// Standard Error: 35_614
-			.saturating_add(Weight::from_parts(2_430_249, 0).saturating_mul(e.into()))
-			.saturating_add(T::DbWeight::get().reads(265))
-			.saturating_add(T::DbWeight::get().reads((1_u64).saturating_mul(c.into())))
-			.saturating_add(T::DbWeight::get().reads((1_u64).saturating_mul(v.into())))
-			.saturating_add(T::DbWeight::get().writes(6))
-			.saturating_add(T::DbWeight::get().writes((1_u64).saturating_mul(c.into())))
-			.saturating_add(Weight::from_parts(0, 2560).saturating_mul(c.into()))
-			.saturating_add(Weight::from_parts(0, 16).saturating_mul(e.into()))
-			.saturating_add(Weight::from_parts(0, 2744).saturating_mul(v.into()))
-	}
-}
diff --git a/polkadot/runtime/rococo/src/weights/pallet_membership.rs b/polkadot/runtime/rococo/src/weights/pallet_membership.rs
deleted file mode 100644
index 4486c7a270c47e790f51f76148b7592a15ff0fbc..0000000000000000000000000000000000000000
--- a/polkadot/runtime/rococo/src/weights/pallet_membership.rs
+++ /dev/null
@@ -1,204 +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/>.
-
-//! Autogenerated weights for `pallet_membership`
-//!
-//! THIS FILE WAS AUTO-GENERATED USING THE SUBSTRATE BENCHMARK CLI VERSION 4.0.0-dev
-//! DATE: 2023-05-26, STEPS: `50`, REPEAT: `20`, LOW RANGE: `[]`, HIGH RANGE: `[]`
-//! WORST CASE MAP SIZE: `1000000`
-//! HOSTNAME: `bm5`, CPU: `Intel(R) Core(TM) i7-7700K CPU @ 4.20GHz`
-//! EXECUTION: Some(Wasm), WASM-EXECUTION: Compiled, CHAIN: Some("rococo-dev"), DB CACHE: 1024
-
-// Executed Command:
-// ./target/production/polkadot
-// benchmark
-// pallet
-// --chain=rococo-dev
-// --steps=50
-// --repeat=20
-// --pallet=pallet_membership
-// --extrinsic=*
-// --execution=wasm
-// --wasm-execution=compiled
-// --header=./file_header.txt
-// --output=./runtime/rococo/src/weights/
-
-#![cfg_attr(rustfmt, rustfmt_skip)]
-#![allow(unused_parens)]
-#![allow(unused_imports)]
-#![allow(missing_docs)]
-
-use frame_support::{traits::Get, weights::Weight};
-use core::marker::PhantomData;
-
-/// Weight functions for `pallet_membership`.
-pub struct WeightInfo<T>(PhantomData<T>);
-impl<T: frame_system::Config> pallet_membership::WeightInfo for WeightInfo<T> {
-	/// Storage: TechnicalMembership Members (r:1 w:1)
-	/// Proof: TechnicalMembership Members (max_values: Some(1), max_size: Some(3202), added: 3697, mode: MaxEncodedLen)
-	/// Storage: TechnicalCommittee Proposals (r:1 w:0)
-	/// Proof Skipped: TechnicalCommittee Proposals (max_values: Some(1), max_size: None, mode: Measured)
-	/// Storage: TechnicalCommittee Members (r:0 w:1)
-	/// Proof Skipped: TechnicalCommittee Members (max_values: Some(1), max_size: None, mode: Measured)
-	/// Storage: TechnicalCommittee Prime (r:0 w:1)
-	/// Proof Skipped: TechnicalCommittee Prime (max_values: Some(1), max_size: None, mode: Measured)
-	/// The range of component `m` is `[1, 99]`.
-	fn add_member(m: u32, ) -> Weight {
-		// Proof Size summary in bytes:
-		//  Measured:  `140 + m * (64 ±0)`
-		//  Estimated: `4687 + m * (64 ±0)`
-		// Minimum execution time: 17_084_000 picoseconds.
-		Weight::from_parts(17_897_754, 0)
-			.saturating_add(Weight::from_parts(0, 4687))
-			// Standard Error: 295
-			.saturating_add(Weight::from_parts(30_882, 0).saturating_mul(m.into()))
-			.saturating_add(T::DbWeight::get().reads(2))
-			.saturating_add(T::DbWeight::get().writes(3))
-			.saturating_add(Weight::from_parts(0, 64).saturating_mul(m.into()))
-	}
-	/// Storage: TechnicalMembership Members (r:1 w:1)
-	/// Proof: TechnicalMembership Members (max_values: Some(1), max_size: Some(3202), added: 3697, mode: MaxEncodedLen)
-	/// Storage: TechnicalCommittee Proposals (r:1 w:0)
-	/// Proof Skipped: TechnicalCommittee Proposals (max_values: Some(1), max_size: None, mode: Measured)
-	/// Storage: TechnicalMembership Prime (r:1 w:0)
-	/// Proof: TechnicalMembership Prime (max_values: Some(1), max_size: Some(32), added: 527, mode: MaxEncodedLen)
-	/// Storage: TechnicalCommittee Members (r:0 w:1)
-	/// Proof Skipped: TechnicalCommittee Members (max_values: Some(1), max_size: None, mode: Measured)
-	/// Storage: TechnicalCommittee Prime (r:0 w:1)
-	/// Proof Skipped: TechnicalCommittee Prime (max_values: Some(1), max_size: None, mode: Measured)
-	/// The range of component `m` is `[2, 100]`.
-	fn remove_member(m: u32, ) -> Weight {
-		// Proof Size summary in bytes:
-		//  Measured:  `244 + m * (64 ±0)`
-		//  Estimated: `4687 + m * (64 ±0)`
-		// Minimum execution time: 19_550_000 picoseconds.
-		Weight::from_parts(20_467_978, 0)
-			.saturating_add(Weight::from_parts(0, 4687))
-			// Standard Error: 330
-			.saturating_add(Weight::from_parts(31_881, 0).saturating_mul(m.into()))
-			.saturating_add(T::DbWeight::get().reads(3))
-			.saturating_add(T::DbWeight::get().writes(3))
-			.saturating_add(Weight::from_parts(0, 64).saturating_mul(m.into()))
-	}
-	/// Storage: TechnicalMembership Members (r:1 w:1)
-	/// Proof: TechnicalMembership Members (max_values: Some(1), max_size: Some(3202), added: 3697, mode: MaxEncodedLen)
-	/// Storage: TechnicalCommittee Proposals (r:1 w:0)
-	/// Proof Skipped: TechnicalCommittee Proposals (max_values: Some(1), max_size: None, mode: Measured)
-	/// Storage: TechnicalMembership Prime (r:1 w:0)
-	/// Proof: TechnicalMembership Prime (max_values: Some(1), max_size: Some(32), added: 527, mode: MaxEncodedLen)
-	/// Storage: TechnicalCommittee Members (r:0 w:1)
-	/// Proof Skipped: TechnicalCommittee Members (max_values: Some(1), max_size: None, mode: Measured)
-	/// Storage: TechnicalCommittee Prime (r:0 w:1)
-	/// Proof Skipped: TechnicalCommittee Prime (max_values: Some(1), max_size: None, mode: Measured)
-	/// The range of component `m` is `[2, 100]`.
-	fn swap_member(m: u32, ) -> Weight {
-		// Proof Size summary in bytes:
-		//  Measured:  `244 + m * (64 ±0)`
-		//  Estimated: `4687 + m * (64 ±0)`
-		// Minimum execution time: 19_994_000 picoseconds.
-		Weight::from_parts(20_663_824, 0)
-			.saturating_add(Weight::from_parts(0, 4687))
-			// Standard Error: 337
-			.saturating_add(Weight::from_parts(44_806, 0).saturating_mul(m.into()))
-			.saturating_add(T::DbWeight::get().reads(3))
-			.saturating_add(T::DbWeight::get().writes(3))
-			.saturating_add(Weight::from_parts(0, 64).saturating_mul(m.into()))
-	}
-	/// Storage: TechnicalMembership Members (r:1 w:1)
-	/// Proof: TechnicalMembership Members (max_values: Some(1), max_size: Some(3202), added: 3697, mode: MaxEncodedLen)
-	/// Storage: TechnicalCommittee Proposals (r:1 w:0)
-	/// Proof Skipped: TechnicalCommittee Proposals (max_values: Some(1), max_size: None, mode: Measured)
-	/// Storage: TechnicalMembership Prime (r:1 w:0)
-	/// Proof: TechnicalMembership Prime (max_values: Some(1), max_size: Some(32), added: 527, mode: MaxEncodedLen)
-	/// Storage: TechnicalCommittee Members (r:0 w:1)
-	/// Proof Skipped: TechnicalCommittee Members (max_values: Some(1), max_size: None, mode: Measured)
-	/// Storage: TechnicalCommittee Prime (r:0 w:1)
-	/// Proof Skipped: TechnicalCommittee Prime (max_values: Some(1), max_size: None, mode: Measured)
-	/// The range of component `m` is `[1, 100]`.
-	fn reset_member(m: u32, ) -> Weight {
-		// Proof Size summary in bytes:
-		//  Measured:  `244 + m * (64 ±0)`
-		//  Estimated: `4687 + m * (64 ±0)`
-		// Minimum execution time: 18_978_000 picoseconds.
-		Weight::from_parts(21_273_577, 0)
-			.saturating_add(Weight::from_parts(0, 4687))
-			// Standard Error: 2_765
-			.saturating_add(Weight::from_parts(152_082, 0).saturating_mul(m.into()))
-			.saturating_add(T::DbWeight::get().reads(3))
-			.saturating_add(T::DbWeight::get().writes(3))
-			.saturating_add(Weight::from_parts(0, 64).saturating_mul(m.into()))
-	}
-	/// Storage: TechnicalMembership Members (r:1 w:1)
-	/// Proof: TechnicalMembership Members (max_values: Some(1), max_size: Some(3202), added: 3697, mode: MaxEncodedLen)
-	/// Storage: TechnicalCommittee Proposals (r:1 w:0)
-	/// Proof Skipped: TechnicalCommittee Proposals (max_values: Some(1), max_size: None, mode: Measured)
-	/// Storage: TechnicalMembership Prime (r:1 w:1)
-	/// Proof: TechnicalMembership Prime (max_values: Some(1), max_size: Some(32), added: 527, mode: MaxEncodedLen)
-	/// Storage: TechnicalCommittee Members (r:0 w:1)
-	/// Proof Skipped: TechnicalCommittee Members (max_values: Some(1), max_size: None, mode: Measured)
-	/// Storage: TechnicalCommittee Prime (r:0 w:1)
-	/// Proof Skipped: TechnicalCommittee Prime (max_values: Some(1), max_size: None, mode: Measured)
-	/// The range of component `m` is `[1, 100]`.
-	fn change_key(m: u32, ) -> Weight {
-		// Proof Size summary in bytes:
-		//  Measured:  `244 + m * (64 ±0)`
-		//  Estimated: `4687 + m * (64 ±0)`
-		// Minimum execution time: 20_005_000 picoseconds.
-		Weight::from_parts(21_280_089, 0)
-			.saturating_add(Weight::from_parts(0, 4687))
-			// Standard Error: 672
-			.saturating_add(Weight::from_parts(41_961, 0).saturating_mul(m.into()))
-			.saturating_add(T::DbWeight::get().reads(3))
-			.saturating_add(T::DbWeight::get().writes(4))
-			.saturating_add(Weight::from_parts(0, 64).saturating_mul(m.into()))
-	}
-	/// Storage: TechnicalMembership Members (r:1 w:0)
-	/// Proof: TechnicalMembership Members (max_values: Some(1), max_size: Some(3202), added: 3697, mode: MaxEncodedLen)
-	/// Storage: TechnicalMembership Prime (r:0 w:1)
-	/// Proof: TechnicalMembership Prime (max_values: Some(1), max_size: Some(32), added: 527, mode: MaxEncodedLen)
-	/// Storage: TechnicalCommittee Prime (r:0 w:1)
-	/// Proof Skipped: TechnicalCommittee Prime (max_values: Some(1), max_size: None, mode: Measured)
-	/// The range of component `m` is `[1, 100]`.
-	fn set_prime(m: u32, ) -> Weight {
-		// Proof Size summary in bytes:
-		//  Measured:  `32 + m * (32 ±0)`
-		//  Estimated: `4687 + m * (32 ±0)`
-		// Minimum execution time: 8_168_000 picoseconds.
-		Weight::from_parts(8_579_141, 0)
-			.saturating_add(Weight::from_parts(0, 4687))
-			// Standard Error: 215
-			.saturating_add(Weight::from_parts(9_557, 0).saturating_mul(m.into()))
-			.saturating_add(T::DbWeight::get().reads(1))
-			.saturating_add(T::DbWeight::get().writes(2))
-			.saturating_add(Weight::from_parts(0, 32).saturating_mul(m.into()))
-	}
-	/// Storage: TechnicalMembership Prime (r:0 w:1)
-	/// Proof: TechnicalMembership Prime (max_values: Some(1), max_size: Some(32), added: 527, mode: MaxEncodedLen)
-	/// Storage: TechnicalCommittee Prime (r:0 w:1)
-	/// Proof Skipped: TechnicalCommittee Prime (max_values: Some(1), max_size: None, mode: Measured)
-	/// The range of component `m` is `[1, 100]`.
-	fn clear_prime(m: u32, ) -> Weight {
-		// Proof Size summary in bytes:
-		//  Measured:  `0`
-		//  Estimated: `0`
-		// Minimum execution time: 3_344_000 picoseconds.
-		Weight::from_parts(3_551_700, 0)
-			.saturating_add(Weight::from_parts(0, 0))
-			// Standard Error: 86
-			.saturating_add(Weight::from_parts(832, 0).saturating_mul(m.into()))
-			.saturating_add(T::DbWeight::get().writes(2))
-	}
-}
diff --git a/polkadot/runtime/rococo/src/weights/pallet_preimage.rs b/polkadot/runtime/rococo/src/weights/pallet_preimage.rs
index b067e6a6d91e31e745f78c36eb96e6aced428452..e051ebd5bbab84cf98d34853666926a0f281e5c1 100644
--- a/polkadot/runtime/rococo/src/weights/pallet_preimage.rs
+++ b/polkadot/runtime/rococo/src/weights/pallet_preimage.rs
@@ -47,6 +47,21 @@ use core::marker::PhantomData;
 /// Weight functions for `pallet_preimage`.
 pub struct WeightInfo<T>(PhantomData<T>);
 impl<T: frame_system::Config> pallet_preimage::WeightInfo for WeightInfo<T> {
+	fn ensure_updated(n: u32, ) -> Weight {
+		// Proof Size summary in bytes:
+		//  Measured:  `193 + n * (91 ±0)`
+		//  Estimated: `3593 + n * (2566 ±0)`
+		// Minimum execution time: 2_000_000 picoseconds.
+		Weight::from_parts(2_000_000, 3593)
+			// Standard Error: 13_720
+			.saturating_add(Weight::from_parts(17_309_199, 0).saturating_mul(n.into()))
+			.saturating_add(T::DbWeight::get().reads(1_u64))
+			.saturating_add(T::DbWeight::get().reads((1_u64).saturating_mul(n.into())))
+			.saturating_add(T::DbWeight::get().writes(1_u64))
+			.saturating_add(T::DbWeight::get().writes((2_u64).saturating_mul(n.into())))
+			.saturating_add(Weight::from_parts(0, 2566).saturating_mul(n.into()))
+	}
+
 	/// Storage: Preimage StatusFor (r:1 w:1)
 	/// Proof: Preimage StatusFor (max_values: None, max_size: Some(91), added: 2566, mode: MaxEncodedLen)
 	/// Storage: Preimage PreimageFor (r:0 w:1)
diff --git a/polkadot/runtime/rococo/src/weights/pallet_ranked_collective.rs b/polkadot/runtime/rococo/src/weights/pallet_ranked_collective.rs
new file mode 100644
index 0000000000000000000000000000000000000000..8a556c3a248ef46fdb2b5b5449c4b0c75972a9fd
--- /dev/null
+++ b/polkadot/runtime/rococo/src/weights/pallet_ranked_collective.rs
@@ -0,0 +1,175 @@
+// 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/>.
+
+//! Autogenerated weights for `pallet_ranked_collective`
+//!
+//! THIS FILE WAS AUTO-GENERATED USING THE SUBSTRATE BENCHMARK CLI VERSION 4.0.0-dev
+//! DATE: 2023-07-11, STEPS: `50`, REPEAT: `20`, LOW RANGE: `[]`, HIGH RANGE: `[]`
+//! WORST CASE MAP SIZE: `1000000`
+//! HOSTNAME: `runner-xerhrdyb-project-163-concurrent-0`, CPU: `Intel(R) Xeon(R) CPU @ 2.60GHz`
+//! EXECUTION: `Some(Wasm)`, WASM-EXECUTION: `Compiled`, CHAIN: `Some("rococo-dev")`, DB CACHE: 1024
+
+// Executed Command:
+// target/production/polkadot
+// benchmark
+// pallet
+// --steps=50
+// --repeat=20
+// --extrinsic=*
+// --execution=wasm
+// --wasm-execution=compiled
+// --heap-pages=4096
+// --json-file=/builds/parity/mirrors/polkadot/.git/.artifacts/bench.json
+// --pallet=pallet_ranked_collective
+// --chain=rococo-dev
+// --header=./file_header.txt
+// --output=./runtime/rococo/src/weights/
+
+#![cfg_attr(rustfmt, rustfmt_skip)]
+#![allow(unused_parens)]
+#![allow(unused_imports)]
+#![allow(missing_docs)]
+
+use frame_support::{traits::Get, weights::Weight};
+use core::marker::PhantomData;
+
+/// Weight functions for `pallet_ranked_collective`.
+pub struct WeightInfo<T>(PhantomData<T>);
+impl<T: frame_system::Config> pallet_ranked_collective::WeightInfo for WeightInfo<T> {
+	/// Storage: `FellowshipCollective::Members` (r:1 w:1)
+	/// Proof: `FellowshipCollective::Members` (`max_values`: None, `max_size`: Some(42), added: 2517, mode: `MaxEncodedLen`)
+	/// Storage: `FellowshipCollective::MemberCount` (r:1 w:1)
+	/// Proof: `FellowshipCollective::MemberCount` (`max_values`: None, `max_size`: Some(14), added: 2489, mode: `MaxEncodedLen`)
+	/// Storage: `FellowshipCollective::IndexToId` (r:0 w:1)
+	/// Proof: `FellowshipCollective::IndexToId` (`max_values`: None, `max_size`: Some(54), added: 2529, mode: `MaxEncodedLen`)
+	/// Storage: `FellowshipCollective::IdToIndex` (r:0 w:1)
+	/// Proof: `FellowshipCollective::IdToIndex` (`max_values`: None, `max_size`: Some(54), added: 2529, mode: `MaxEncodedLen`)
+	fn add_member() -> Weight {
+		// Proof Size summary in bytes:
+		//  Measured:  `42`
+		//  Estimated: `3507`
+		// Minimum execution time: 17_632_000 picoseconds.
+		Weight::from_parts(18_252_000, 0)
+			.saturating_add(Weight::from_parts(0, 3507))
+			.saturating_add(T::DbWeight::get().reads(2))
+			.saturating_add(T::DbWeight::get().writes(4))
+	}
+	/// Storage: `FellowshipCollective::Members` (r:1 w:1)
+	/// Proof: `FellowshipCollective::Members` (`max_values`: None, `max_size`: Some(42), added: 2517, mode: `MaxEncodedLen`)
+	/// Storage: `FellowshipCollective::MemberCount` (r:11 w:11)
+	/// Proof: `FellowshipCollective::MemberCount` (`max_values`: None, `max_size`: Some(14), added: 2489, mode: `MaxEncodedLen`)
+	/// Storage: `FellowshipCollective::IdToIndex` (r:11 w:11)
+	/// Proof: `FellowshipCollective::IdToIndex` (`max_values`: None, `max_size`: Some(54), added: 2529, mode: `MaxEncodedLen`)
+	/// Storage: `FellowshipCollective::IndexToId` (r:11 w:11)
+	/// Proof: `FellowshipCollective::IndexToId` (`max_values`: None, `max_size`: Some(54), added: 2529, mode: `MaxEncodedLen`)
+	/// The range of component `r` is `[0, 10]`.
+	fn remove_member(r: u32, ) -> Weight {
+		// Proof Size summary in bytes:
+		//  Measured:  `517 + r * (281 ±0)`
+		//  Estimated: `3519 + r * (2529 ±0)`
+		// Minimum execution time: 27_960_000 picoseconds.
+		Weight::from_parts(30_632_408, 0)
+			.saturating_add(Weight::from_parts(0, 3519))
+			// Standard Error: 22_806
+			.saturating_add(Weight::from_parts(13_000_901, 0).saturating_mul(r.into()))
+			.saturating_add(T::DbWeight::get().reads(4))
+			.saturating_add(T::DbWeight::get().reads((3_u64).saturating_mul(r.into())))
+			.saturating_add(T::DbWeight::get().writes(4))
+			.saturating_add(T::DbWeight::get().writes((3_u64).saturating_mul(r.into())))
+			.saturating_add(Weight::from_parts(0, 2529).saturating_mul(r.into()))
+	}
+	/// Storage: `FellowshipCollective::Members` (r:1 w:1)
+	/// Proof: `FellowshipCollective::Members` (`max_values`: None, `max_size`: Some(42), added: 2517, mode: `MaxEncodedLen`)
+	/// Storage: `FellowshipCollective::MemberCount` (r:1 w:1)
+	/// Proof: `FellowshipCollective::MemberCount` (`max_values`: None, `max_size`: Some(14), added: 2489, mode: `MaxEncodedLen`)
+	/// Storage: `FellowshipCollective::IndexToId` (r:0 w:1)
+	/// Proof: `FellowshipCollective::IndexToId` (`max_values`: None, `max_size`: Some(54), added: 2529, mode: `MaxEncodedLen`)
+	/// Storage: `FellowshipCollective::IdToIndex` (r:0 w:1)
+	/// Proof: `FellowshipCollective::IdToIndex` (`max_values`: None, `max_size`: Some(54), added: 2529, mode: `MaxEncodedLen`)
+	/// The range of component `r` is `[0, 10]`.
+	fn promote_member(r: u32, ) -> Weight {
+		// Proof Size summary in bytes:
+		//  Measured:  `214 + r * (17 ±0)`
+		//  Estimated: `3507`
+		// Minimum execution time: 19_900_000 picoseconds.
+		Weight::from_parts(20_908_316, 0)
+			.saturating_add(Weight::from_parts(0, 3507))
+			// Standard Error: 4_878
+			.saturating_add(Weight::from_parts(330_385, 0).saturating_mul(r.into()))
+			.saturating_add(T::DbWeight::get().reads(2))
+			.saturating_add(T::DbWeight::get().writes(4))
+	}
+	/// Storage: `FellowshipCollective::Members` (r:1 w:1)
+	/// Proof: `FellowshipCollective::Members` (`max_values`: None, `max_size`: Some(42), added: 2517, mode: `MaxEncodedLen`)
+	/// Storage: `FellowshipCollective::MemberCount` (r:1 w:1)
+	/// Proof: `FellowshipCollective::MemberCount` (`max_values`: None, `max_size`: Some(14), added: 2489, mode: `MaxEncodedLen`)
+	/// Storage: `FellowshipCollective::IdToIndex` (r:1 w:1)
+	/// Proof: `FellowshipCollective::IdToIndex` (`max_values`: None, `max_size`: Some(54), added: 2529, mode: `MaxEncodedLen`)
+	/// Storage: `FellowshipCollective::IndexToId` (r:1 w:1)
+	/// Proof: `FellowshipCollective::IndexToId` (`max_values`: None, `max_size`: Some(54), added: 2529, mode: `MaxEncodedLen`)
+	/// The range of component `r` is `[0, 10]`.
+	fn demote_member(r: u32, ) -> Weight {
+		// Proof Size summary in bytes:
+		//  Measured:  `532 + r * (72 ±0)`
+		//  Estimated: `3519`
+		// Minimum execution time: 27_697_000 picoseconds.
+		Weight::from_parts(30_341_815, 0)
+			.saturating_add(Weight::from_parts(0, 3519))
+			// Standard Error: 17_010
+			.saturating_add(Weight::from_parts(642_213, 0).saturating_mul(r.into()))
+			.saturating_add(T::DbWeight::get().reads(4))
+			.saturating_add(T::DbWeight::get().writes(4))
+	}
+	/// Storage: `FellowshipCollective::Members` (r:1 w:0)
+	/// Proof: `FellowshipCollective::Members` (`max_values`: None, `max_size`: Some(42), added: 2517, mode: `MaxEncodedLen`)
+	/// Storage: `FellowshipReferenda::ReferendumInfoFor` (r:1 w:1)
+	/// Proof: `FellowshipReferenda::ReferendumInfoFor` (`max_values`: None, `max_size`: Some(900), added: 3375, mode: `MaxEncodedLen`)
+	/// Storage: `FellowshipCollective::Voting` (r:1 w:1)
+	/// Proof: `FellowshipCollective::Voting` (`max_values`: None, `max_size`: Some(65), added: 2540, mode: `MaxEncodedLen`)
+	/// Storage: `Scheduler::Agenda` (r:2 w:2)
+	/// Proof: `Scheduler::Agenda` (`max_values`: None, `max_size`: Some(38963), added: 41438, mode: `MaxEncodedLen`)
+	fn vote() -> Weight {
+		// Proof Size summary in bytes:
+		//  Measured:  `638`
+		//  Estimated: `83866`
+		// Minimum execution time: 48_275_000 picoseconds.
+		Weight::from_parts(49_326_000, 0)
+			.saturating_add(Weight::from_parts(0, 83866))
+			.saturating_add(T::DbWeight::get().reads(5))
+			.saturating_add(T::DbWeight::get().writes(4))
+	}
+	/// Storage: `FellowshipReferenda::ReferendumInfoFor` (r:1 w:0)
+	/// Proof: `FellowshipReferenda::ReferendumInfoFor` (`max_values`: None, `max_size`: Some(900), added: 3375, mode: `MaxEncodedLen`)
+	/// Storage: `FellowshipCollective::VotingCleanup` (r:1 w:0)
+	/// Proof: `FellowshipCollective::VotingCleanup` (`max_values`: None, `max_size`: Some(114), added: 2589, mode: `MaxEncodedLen`)
+	/// Storage: `FellowshipCollective::Voting` (r:100 w:100)
+	/// Proof: `FellowshipCollective::Voting` (`max_values`: None, `max_size`: Some(65), added: 2540, mode: `MaxEncodedLen`)
+	/// The range of component `n` is `[0, 100]`.
+	fn cleanup_poll(n: u32, ) -> Weight {
+		// Proof Size summary in bytes:
+		//  Measured:  `434 + n * (50 ±0)`
+		//  Estimated: `4365 + n * (2540 ±0)`
+		// Minimum execution time: 15_506_000 picoseconds.
+		Weight::from_parts(17_634_029, 0)
+			.saturating_add(Weight::from_parts(0, 4365))
+			// Standard Error: 2_117
+			.saturating_add(Weight::from_parts(1_126_879, 0).saturating_mul(n.into()))
+			.saturating_add(T::DbWeight::get().reads(2))
+			.saturating_add(T::DbWeight::get().reads((1_u64).saturating_mul(n.into())))
+			.saturating_add(T::DbWeight::get().writes((1_u64).saturating_mul(n.into())))
+			.saturating_add(Weight::from_parts(0, 2540).saturating_mul(n.into()))
+	}
+}
diff --git a/polkadot/runtime/rococo/src/weights/pallet_referenda_fellowship_referenda.rs b/polkadot/runtime/rococo/src/weights/pallet_referenda_fellowship_referenda.rs
new file mode 100644
index 0000000000000000000000000000000000000000..96f172230e13f5aed92b47338b2387f4db79fa27
--- /dev/null
+++ b/polkadot/runtime/rococo/src/weights/pallet_referenda_fellowship_referenda.rs
@@ -0,0 +1,524 @@
+// 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/>.
+
+//! Autogenerated weights for `pallet_referenda`
+//!
+//! THIS FILE WAS AUTO-GENERATED USING THE SUBSTRATE BENCHMARK CLI VERSION 4.0.0-dev
+//! DATE: 2023-07-11, STEPS: `50`, REPEAT: `20`, LOW RANGE: `[]`, HIGH RANGE: `[]`
+//! WORST CASE MAP SIZE: `1000000`
+//! HOSTNAME: `runner-xerhrdyb-project-163-concurrent-0`, CPU: `Intel(R) Xeon(R) CPU @ 2.60GHz`
+//! EXECUTION: `Some(Wasm)`, WASM-EXECUTION: `Compiled`, CHAIN: `Some("rococo-dev")`, DB CACHE: 1024
+
+// Executed Command:
+// target/production/polkadot
+// benchmark
+// pallet
+// --steps=50
+// --repeat=20
+// --extrinsic=*
+// --execution=wasm
+// --wasm-execution=compiled
+// --heap-pages=4096
+// --json-file=/builds/parity/mirrors/polkadot/.git/.artifacts/bench.json
+// --pallet=pallet_referenda
+// --chain=rococo-dev
+// --header=./file_header.txt
+// --output=./runtime/rococo/src/weights/
+
+#![cfg_attr(rustfmt, rustfmt_skip)]
+#![allow(unused_parens)]
+#![allow(unused_imports)]
+#![allow(missing_docs)]
+
+use frame_support::{traits::Get, weights::Weight};
+use core::marker::PhantomData;
+
+/// Weight functions for `pallet_referenda`.
+pub struct WeightInfo<T>(PhantomData<T>);
+impl<T: frame_system::Config> pallet_referenda::WeightInfo for WeightInfo<T> {
+	/// Storage: `FellowshipCollective::Members` (r:1 w:0)
+	/// Proof: `FellowshipCollective::Members` (`max_values`: None, `max_size`: Some(42), added: 2517, mode: `MaxEncodedLen`)
+	/// Storage: `FellowshipReferenda::ReferendumCount` (r:1 w:1)
+	/// Proof: `FellowshipReferenda::ReferendumCount` (`max_values`: Some(1), `max_size`: Some(4), added: 499, mode: `MaxEncodedLen`)
+	/// Storage: `Scheduler::Agenda` (r:1 w:1)
+	/// Proof: `Scheduler::Agenda` (`max_values`: None, `max_size`: Some(38963), added: 41438, mode: `MaxEncodedLen`)
+	/// Storage: `FellowshipReferenda::ReferendumInfoFor` (r:0 w:1)
+	/// Proof: `FellowshipReferenda::ReferendumInfoFor` (`max_values`: None, `max_size`: Some(900), added: 3375, mode: `MaxEncodedLen`)
+	fn submit() -> Weight {
+		// Proof Size summary in bytes:
+		//  Measured:  `327`
+		//  Estimated: `42428`
+		// Minimum execution time: 29_909_000 picoseconds.
+		Weight::from_parts(30_645_000, 0)
+			.saturating_add(Weight::from_parts(0, 42428))
+			.saturating_add(T::DbWeight::get().reads(3))
+			.saturating_add(T::DbWeight::get().writes(3))
+	}
+	/// Storage: `FellowshipReferenda::ReferendumInfoFor` (r:1 w:1)
+	/// Proof: `FellowshipReferenda::ReferendumInfoFor` (`max_values`: None, `max_size`: Some(900), added: 3375, mode: `MaxEncodedLen`)
+	/// Storage: `Scheduler::Agenda` (r:2 w:2)
+	/// Proof: `Scheduler::Agenda` (`max_values`: None, `max_size`: Some(38963), added: 41438, mode: `MaxEncodedLen`)
+	fn place_decision_deposit_preparing() -> Weight {
+		// Proof Size summary in bytes:
+		//  Measured:  `438`
+		//  Estimated: `83866`
+		// Minimum execution time: 54_405_000 picoseconds.
+		Weight::from_parts(55_583_000, 0)
+			.saturating_add(Weight::from_parts(0, 83866))
+			.saturating_add(T::DbWeight::get().reads(3))
+			.saturating_add(T::DbWeight::get().writes(3))
+	}
+	/// Storage: `FellowshipReferenda::ReferendumInfoFor` (r:1 w:1)
+	/// Proof: `FellowshipReferenda::ReferendumInfoFor` (`max_values`: None, `max_size`: Some(900), added: 3375, mode: `MaxEncodedLen`)
+	/// Storage: `FellowshipReferenda::DecidingCount` (r:1 w:0)
+	/// Proof: `FellowshipReferenda::DecidingCount` (`max_values`: None, `max_size`: Some(14), added: 2489, mode: `MaxEncodedLen`)
+	/// Storage: `FellowshipReferenda::TrackQueue` (r:1 w:1)
+	/// Proof: `FellowshipReferenda::TrackQueue` (`max_values`: None, `max_size`: Some(812), added: 3287, mode: `MaxEncodedLen`)
+	/// Storage: `Scheduler::Agenda` (r:1 w:1)
+	/// Proof: `Scheduler::Agenda` (`max_values`: None, `max_size`: Some(38963), added: 41438, mode: `MaxEncodedLen`)
+	fn place_decision_deposit_queued() -> Weight {
+		// Proof Size summary in bytes:
+		//  Measured:  `2076`
+		//  Estimated: `42428`
+		// Minimum execution time: 110_477_000 picoseconds.
+		Weight::from_parts(119_187_000, 0)
+			.saturating_add(Weight::from_parts(0, 42428))
+			.saturating_add(T::DbWeight::get().reads(4))
+			.saturating_add(T::DbWeight::get().writes(3))
+	}
+	/// Storage: `FellowshipReferenda::ReferendumInfoFor` (r:1 w:1)
+	/// Proof: `FellowshipReferenda::ReferendumInfoFor` (`max_values`: None, `max_size`: Some(900), added: 3375, mode: `MaxEncodedLen`)
+	/// Storage: `FellowshipReferenda::DecidingCount` (r:1 w:0)
+	/// Proof: `FellowshipReferenda::DecidingCount` (`max_values`: None, `max_size`: Some(14), added: 2489, mode: `MaxEncodedLen`)
+	/// Storage: `FellowshipReferenda::TrackQueue` (r:1 w:1)
+	/// Proof: `FellowshipReferenda::TrackQueue` (`max_values`: None, `max_size`: Some(812), added: 3287, mode: `MaxEncodedLen`)
+	/// Storage: `Scheduler::Agenda` (r:1 w:1)
+	/// Proof: `Scheduler::Agenda` (`max_values`: None, `max_size`: Some(38963), added: 41438, mode: `MaxEncodedLen`)
+	fn place_decision_deposit_not_queued() -> Weight {
+		// Proof Size summary in bytes:
+		//  Measured:  `2117`
+		//  Estimated: `42428`
+		// Minimum execution time: 111_467_000 picoseconds.
+		Weight::from_parts(117_758_000, 0)
+			.saturating_add(Weight::from_parts(0, 42428))
+			.saturating_add(T::DbWeight::get().reads(4))
+			.saturating_add(T::DbWeight::get().writes(3))
+	}
+	/// Storage: `FellowshipReferenda::ReferendumInfoFor` (r:1 w:1)
+	/// Proof: `FellowshipReferenda::ReferendumInfoFor` (`max_values`: None, `max_size`: Some(900), added: 3375, mode: `MaxEncodedLen`)
+	/// Storage: `FellowshipReferenda::DecidingCount` (r:1 w:1)
+	/// Proof: `FellowshipReferenda::DecidingCount` (`max_values`: None, `max_size`: Some(14), added: 2489, mode: `MaxEncodedLen`)
+	/// Storage: `FellowshipCollective::MemberCount` (r:1 w:0)
+	/// Proof: `FellowshipCollective::MemberCount` (`max_values`: None, `max_size`: Some(14), added: 2489, mode: `MaxEncodedLen`)
+	/// Storage: `Scheduler::Agenda` (r:2 w:2)
+	/// Proof: `Scheduler::Agenda` (`max_values`: None, `max_size`: Some(38963), added: 41438, mode: `MaxEncodedLen`)
+	fn place_decision_deposit_passing() -> Weight {
+		// Proof Size summary in bytes:
+		//  Measured:  `774`
+		//  Estimated: `83866`
+		// Minimum execution time: 191_135_000 picoseconds.
+		Weight::from_parts(210_535_000, 0)
+			.saturating_add(Weight::from_parts(0, 83866))
+			.saturating_add(T::DbWeight::get().reads(5))
+			.saturating_add(T::DbWeight::get().writes(4))
+	}
+	/// Storage: `FellowshipReferenda::ReferendumInfoFor` (r:1 w:1)
+	/// Proof: `FellowshipReferenda::ReferendumInfoFor` (`max_values`: None, `max_size`: Some(900), added: 3375, mode: `MaxEncodedLen`)
+	/// Storage: `FellowshipReferenda::DecidingCount` (r:1 w:1)
+	/// Proof: `FellowshipReferenda::DecidingCount` (`max_values`: None, `max_size`: Some(14), added: 2489, mode: `MaxEncodedLen`)
+	/// Storage: `FellowshipCollective::MemberCount` (r:1 w:0)
+	/// Proof: `FellowshipCollective::MemberCount` (`max_values`: None, `max_size`: Some(14), added: 2489, mode: `MaxEncodedLen`)
+	/// Storage: `Scheduler::Agenda` (r:2 w:2)
+	/// Proof: `Scheduler::Agenda` (`max_values`: None, `max_size`: Some(38963), added: 41438, mode: `MaxEncodedLen`)
+	fn place_decision_deposit_failing() -> Weight {
+		// Proof Size summary in bytes:
+		//  Measured:  `639`
+		//  Estimated: `83866`
+		// Minimum execution time: 67_168_000 picoseconds.
+		Weight::from_parts(68_895_000, 0)
+			.saturating_add(Weight::from_parts(0, 83866))
+			.saturating_add(T::DbWeight::get().reads(5))
+			.saturating_add(T::DbWeight::get().writes(4))
+	}
+	/// Storage: `FellowshipReferenda::ReferendumInfoFor` (r:1 w:1)
+	/// Proof: `FellowshipReferenda::ReferendumInfoFor` (`max_values`: None, `max_size`: Some(900), added: 3375, mode: `MaxEncodedLen`)
+	fn refund_decision_deposit() -> Weight {
+		// Proof Size summary in bytes:
+		//  Measured:  `351`
+		//  Estimated: `4365`
+		// Minimum execution time: 31_298_000 picoseconds.
+		Weight::from_parts(32_570_000, 0)
+			.saturating_add(Weight::from_parts(0, 4365))
+			.saturating_add(T::DbWeight::get().reads(1))
+			.saturating_add(T::DbWeight::get().writes(1))
+	}
+	/// Storage: `FellowshipReferenda::ReferendumInfoFor` (r:1 w:1)
+	/// Proof: `FellowshipReferenda::ReferendumInfoFor` (`max_values`: None, `max_size`: Some(900), added: 3375, mode: `MaxEncodedLen`)
+	fn refund_submission_deposit() -> Weight {
+		// Proof Size summary in bytes:
+		//  Measured:  `201`
+		//  Estimated: `4365`
+		// Minimum execution time: 15_674_000 picoseconds.
+		Weight::from_parts(16_190_000, 0)
+			.saturating_add(Weight::from_parts(0, 4365))
+			.saturating_add(T::DbWeight::get().reads(1))
+			.saturating_add(T::DbWeight::get().writes(1))
+	}
+	/// Storage: `FellowshipReferenda::ReferendumInfoFor` (r:1 w:1)
+	/// Proof: `FellowshipReferenda::ReferendumInfoFor` (`max_values`: None, `max_size`: Some(900), added: 3375, mode: `MaxEncodedLen`)
+	/// Storage: `Scheduler::Agenda` (r:2 w:2)
+	/// Proof: `Scheduler::Agenda` (`max_values`: None, `max_size`: Some(38963), added: 41438, mode: `MaxEncodedLen`)
+	fn cancel() -> Weight {
+		// Proof Size summary in bytes:
+		//  Measured:  `383`
+		//  Estimated: `83866`
+		// Minimum execution time: 38_927_000 picoseconds.
+		Weight::from_parts(40_545_000, 0)
+			.saturating_add(Weight::from_parts(0, 83866))
+			.saturating_add(T::DbWeight::get().reads(3))
+			.saturating_add(T::DbWeight::get().writes(3))
+	}
+	/// Storage: `FellowshipReferenda::ReferendumInfoFor` (r:1 w:1)
+	/// Proof: `FellowshipReferenda::ReferendumInfoFor` (`max_values`: None, `max_size`: Some(900), added: 3375, mode: `MaxEncodedLen`)
+	/// Storage: `Scheduler::Agenda` (r:2 w:2)
+	/// Proof: `Scheduler::Agenda` (`max_values`: None, `max_size`: Some(38963), added: 41438, mode: `MaxEncodedLen`)
+	/// Storage: `FellowshipReferenda::MetadataOf` (r:1 w:0)
+	/// Proof: `FellowshipReferenda::MetadataOf` (`max_values`: None, `max_size`: Some(52), added: 2527, mode: `MaxEncodedLen`)
+	fn kill() -> Weight {
+		// Proof Size summary in bytes:
+		//  Measured:  `484`
+		//  Estimated: `83866`
+		// Minimum execution time: 80_209_000 picoseconds.
+		Weight::from_parts(82_084_000, 0)
+			.saturating_add(Weight::from_parts(0, 83866))
+			.saturating_add(T::DbWeight::get().reads(4))
+			.saturating_add(T::DbWeight::get().writes(3))
+	}
+	/// Storage: `FellowshipReferenda::TrackQueue` (r:1 w:0)
+	/// Proof: `FellowshipReferenda::TrackQueue` (`max_values`: None, `max_size`: Some(812), added: 3287, mode: `MaxEncodedLen`)
+	/// Storage: `FellowshipReferenda::DecidingCount` (r:1 w:1)
+	/// Proof: `FellowshipReferenda::DecidingCount` (`max_values`: None, `max_size`: Some(14), added: 2489, mode: `MaxEncodedLen`)
+	fn one_fewer_deciding_queue_empty() -> Weight {
+		// Proof Size summary in bytes:
+		//  Measured:  `174`
+		//  Estimated: `4277`
+		// Minimum execution time: 9_520_000 picoseconds.
+		Weight::from_parts(10_088_000, 0)
+			.saturating_add(Weight::from_parts(0, 4277))
+			.saturating_add(T::DbWeight::get().reads(2))
+			.saturating_add(T::DbWeight::get().writes(1))
+	}
+	/// Storage: `FellowshipReferenda::TrackQueue` (r:1 w:1)
+	/// Proof: `FellowshipReferenda::TrackQueue` (`max_values`: None, `max_size`: Some(812), added: 3287, mode: `MaxEncodedLen`)
+	/// Storage: `FellowshipReferenda::ReferendumInfoFor` (r:1 w:1)
+	/// Proof: `FellowshipReferenda::ReferendumInfoFor` (`max_values`: None, `max_size`: Some(900), added: 3375, mode: `MaxEncodedLen`)
+	/// Storage: `FellowshipCollective::MemberCount` (r:1 w:0)
+	/// Proof: `FellowshipCollective::MemberCount` (`max_values`: None, `max_size`: Some(14), added: 2489, mode: `MaxEncodedLen`)
+	/// Storage: `Scheduler::Agenda` (r:1 w:1)
+	/// Proof: `Scheduler::Agenda` (`max_values`: None, `max_size`: Some(38963), added: 41438, mode: `MaxEncodedLen`)
+	fn one_fewer_deciding_failing() -> Weight {
+		// Proof Size summary in bytes:
+		//  Measured:  `2376`
+		//  Estimated: `42428`
+		// Minimum execution time: 93_893_000 picoseconds.
+		Weight::from_parts(101_065_000, 0)
+			.saturating_add(Weight::from_parts(0, 42428))
+			.saturating_add(T::DbWeight::get().reads(4))
+			.saturating_add(T::DbWeight::get().writes(3))
+	}
+	/// Storage: `FellowshipReferenda::TrackQueue` (r:1 w:1)
+	/// Proof: `FellowshipReferenda::TrackQueue` (`max_values`: None, `max_size`: Some(812), added: 3287, mode: `MaxEncodedLen`)
+	/// Storage: `FellowshipReferenda::ReferendumInfoFor` (r:1 w:1)
+	/// Proof: `FellowshipReferenda::ReferendumInfoFor` (`max_values`: None, `max_size`: Some(900), added: 3375, mode: `MaxEncodedLen`)
+	/// Storage: `FellowshipCollective::MemberCount` (r:1 w:0)
+	/// Proof: `FellowshipCollective::MemberCount` (`max_values`: None, `max_size`: Some(14), added: 2489, mode: `MaxEncodedLen`)
+	/// Storage: `Scheduler::Agenda` (r:1 w:1)
+	/// Proof: `Scheduler::Agenda` (`max_values`: None, `max_size`: Some(38963), added: 41438, mode: `MaxEncodedLen`)
+	fn one_fewer_deciding_passing() -> Weight {
+		// Proof Size summary in bytes:
+		//  Measured:  `2362`
+		//  Estimated: `42428`
+		// Minimum execution time: 98_811_000 picoseconds.
+		Weight::from_parts(103_590_000, 0)
+			.saturating_add(Weight::from_parts(0, 42428))
+			.saturating_add(T::DbWeight::get().reads(4))
+			.saturating_add(T::DbWeight::get().writes(3))
+	}
+	/// Storage: `FellowshipReferenda::ReferendumInfoFor` (r:1 w:0)
+	/// Proof: `FellowshipReferenda::ReferendumInfoFor` (`max_values`: None, `max_size`: Some(900), added: 3375, mode: `MaxEncodedLen`)
+	/// Storage: `FellowshipReferenda::TrackQueue` (r:1 w:1)
+	/// Proof: `FellowshipReferenda::TrackQueue` (`max_values`: None, `max_size`: Some(812), added: 3287, mode: `MaxEncodedLen`)
+	fn nudge_referendum_requeued_insertion() -> Weight {
+		// Proof Size summary in bytes:
+		//  Measured:  `1841`
+		//  Estimated: `4365`
+		// Minimum execution time: 43_230_000 picoseconds.
+		Weight::from_parts(46_120_000, 0)
+			.saturating_add(Weight::from_parts(0, 4365))
+			.saturating_add(T::DbWeight::get().reads(2))
+			.saturating_add(T::DbWeight::get().writes(1))
+	}
+	/// Storage: `FellowshipReferenda::ReferendumInfoFor` (r:1 w:0)
+	/// Proof: `FellowshipReferenda::ReferendumInfoFor` (`max_values`: None, `max_size`: Some(900), added: 3375, mode: `MaxEncodedLen`)
+	/// Storage: `FellowshipReferenda::TrackQueue` (r:1 w:1)
+	/// Proof: `FellowshipReferenda::TrackQueue` (`max_values`: None, `max_size`: Some(812), added: 3287, mode: `MaxEncodedLen`)
+	fn nudge_referendum_requeued_slide() -> Weight {
+		// Proof Size summary in bytes:
+		//  Measured:  `1808`
+		//  Estimated: `4365`
+		// Minimum execution time: 43_092_000 picoseconds.
+		Weight::from_parts(46_018_000, 0)
+			.saturating_add(Weight::from_parts(0, 4365))
+			.saturating_add(T::DbWeight::get().reads(2))
+			.saturating_add(T::DbWeight::get().writes(1))
+	}
+	/// Storage: `FellowshipReferenda::ReferendumInfoFor` (r:1 w:1)
+	/// Proof: `FellowshipReferenda::ReferendumInfoFor` (`max_values`: None, `max_size`: Some(900), added: 3375, mode: `MaxEncodedLen`)
+	/// Storage: `FellowshipReferenda::DecidingCount` (r:1 w:0)
+	/// Proof: `FellowshipReferenda::DecidingCount` (`max_values`: None, `max_size`: Some(14), added: 2489, mode: `MaxEncodedLen`)
+	/// Storage: `FellowshipReferenda::TrackQueue` (r:1 w:1)
+	/// Proof: `FellowshipReferenda::TrackQueue` (`max_values`: None, `max_size`: Some(812), added: 3287, mode: `MaxEncodedLen`)
+	fn nudge_referendum_queued() -> Weight {
+		// Proof Size summary in bytes:
+		//  Measured:  `1824`
+		//  Estimated: `4365`
+		// Minimum execution time: 49_697_000 picoseconds.
+		Weight::from_parts(53_795_000, 0)
+			.saturating_add(Weight::from_parts(0, 4365))
+			.saturating_add(T::DbWeight::get().reads(3))
+			.saturating_add(T::DbWeight::get().writes(2))
+	}
+	/// Storage: `FellowshipReferenda::ReferendumInfoFor` (r:1 w:1)
+	/// Proof: `FellowshipReferenda::ReferendumInfoFor` (`max_values`: None, `max_size`: Some(900), added: 3375, mode: `MaxEncodedLen`)
+	/// Storage: `FellowshipReferenda::DecidingCount` (r:1 w:0)
+	/// Proof: `FellowshipReferenda::DecidingCount` (`max_values`: None, `max_size`: Some(14), added: 2489, mode: `MaxEncodedLen`)
+	/// Storage: `FellowshipReferenda::TrackQueue` (r:1 w:1)
+	/// Proof: `FellowshipReferenda::TrackQueue` (`max_values`: None, `max_size`: Some(812), added: 3287, mode: `MaxEncodedLen`)
+	fn nudge_referendum_not_queued() -> Weight {
+		// Proof Size summary in bytes:
+		//  Measured:  `1865`
+		//  Estimated: `4365`
+		// Minimum execution time: 50_417_000 picoseconds.
+		Weight::from_parts(53_214_000, 0)
+			.saturating_add(Weight::from_parts(0, 4365))
+			.saturating_add(T::DbWeight::get().reads(3))
+			.saturating_add(T::DbWeight::get().writes(2))
+	}
+	/// Storage: `FellowshipReferenda::ReferendumInfoFor` (r:1 w:1)
+	/// Proof: `FellowshipReferenda::ReferendumInfoFor` (`max_values`: None, `max_size`: Some(900), added: 3375, mode: `MaxEncodedLen`)
+	/// Storage: `Scheduler::Agenda` (r:1 w:1)
+	/// Proof: `Scheduler::Agenda` (`max_values`: None, `max_size`: Some(38963), added: 41438, mode: `MaxEncodedLen`)
+	fn nudge_referendum_no_deposit() -> Weight {
+		// Proof Size summary in bytes:
+		//  Measured:  `335`
+		//  Estimated: `42428`
+		// Minimum execution time: 25_688_000 picoseconds.
+		Weight::from_parts(26_575_000, 0)
+			.saturating_add(Weight::from_parts(0, 42428))
+			.saturating_add(T::DbWeight::get().reads(2))
+			.saturating_add(T::DbWeight::get().writes(2))
+	}
+	/// Storage: `FellowshipReferenda::ReferendumInfoFor` (r:1 w:1)
+	/// Proof: `FellowshipReferenda::ReferendumInfoFor` (`max_values`: None, `max_size`: Some(900), added: 3375, mode: `MaxEncodedLen`)
+	/// Storage: `Scheduler::Agenda` (r:1 w:1)
+	/// Proof: `Scheduler::Agenda` (`max_values`: None, `max_size`: Some(38963), added: 41438, mode: `MaxEncodedLen`)
+	fn nudge_referendum_preparing() -> Weight {
+		// Proof Size summary in bytes:
+		//  Measured:  `383`
+		//  Estimated: `42428`
+		// Minimum execution time: 26_230_000 picoseconds.
+		Weight::from_parts(27_235_000, 0)
+			.saturating_add(Weight::from_parts(0, 42428))
+			.saturating_add(T::DbWeight::get().reads(2))
+			.saturating_add(T::DbWeight::get().writes(2))
+	}
+	/// Storage: `FellowshipReferenda::ReferendumInfoFor` (r:1 w:1)
+	/// Proof: `FellowshipReferenda::ReferendumInfoFor` (`max_values`: None, `max_size`: Some(900), added: 3375, mode: `MaxEncodedLen`)
+	fn nudge_referendum_timed_out() -> Weight {
+		// Proof Size summary in bytes:
+		//  Measured:  `242`
+		//  Estimated: `4365`
+		// Minimum execution time: 17_585_000 picoseconds.
+		Weight::from_parts(18_225_000, 0)
+			.saturating_add(Weight::from_parts(0, 4365))
+			.saturating_add(T::DbWeight::get().reads(1))
+			.saturating_add(T::DbWeight::get().writes(1))
+	}
+	/// Storage: `FellowshipReferenda::ReferendumInfoFor` (r:1 w:1)
+	/// Proof: `FellowshipReferenda::ReferendumInfoFor` (`max_values`: None, `max_size`: Some(900), added: 3375, mode: `MaxEncodedLen`)
+	/// Storage: `FellowshipReferenda::DecidingCount` (r:1 w:1)
+	/// Proof: `FellowshipReferenda::DecidingCount` (`max_values`: None, `max_size`: Some(14), added: 2489, mode: `MaxEncodedLen`)
+	/// Storage: `FellowshipCollective::MemberCount` (r:1 w:0)
+	/// Proof: `FellowshipCollective::MemberCount` (`max_values`: None, `max_size`: Some(14), added: 2489, mode: `MaxEncodedLen`)
+	/// Storage: `Scheduler::Agenda` (r:1 w:1)
+	/// Proof: `Scheduler::Agenda` (`max_values`: None, `max_size`: Some(38963), added: 41438, mode: `MaxEncodedLen`)
+	fn nudge_referendum_begin_deciding_failing() -> Weight {
+		// Proof Size summary in bytes:
+		//  Measured:  `584`
+		//  Estimated: `42428`
+		// Minimum execution time: 38_243_000 picoseconds.
+		Weight::from_parts(39_959_000, 0)
+			.saturating_add(Weight::from_parts(0, 42428))
+			.saturating_add(T::DbWeight::get().reads(4))
+			.saturating_add(T::DbWeight::get().writes(3))
+	}
+	/// Storage: `FellowshipReferenda::ReferendumInfoFor` (r:1 w:1)
+	/// Proof: `FellowshipReferenda::ReferendumInfoFor` (`max_values`: None, `max_size`: Some(900), added: 3375, mode: `MaxEncodedLen`)
+	/// Storage: `FellowshipReferenda::DecidingCount` (r:1 w:1)
+	/// Proof: `FellowshipReferenda::DecidingCount` (`max_values`: None, `max_size`: Some(14), added: 2489, mode: `MaxEncodedLen`)
+	/// Storage: `FellowshipCollective::MemberCount` (r:1 w:0)
+	/// Proof: `FellowshipCollective::MemberCount` (`max_values`: None, `max_size`: Some(14), added: 2489, mode: `MaxEncodedLen`)
+	/// Storage: `Scheduler::Agenda` (r:1 w:1)
+	/// Proof: `Scheduler::Agenda` (`max_values`: None, `max_size`: Some(38963), added: 41438, mode: `MaxEncodedLen`)
+	fn nudge_referendum_begin_deciding_passing() -> Weight {
+		// Proof Size summary in bytes:
+		//  Measured:  `719`
+		//  Estimated: `42428`
+		// Minimum execution time: 88_424_000 picoseconds.
+		Weight::from_parts(92_969_000, 0)
+			.saturating_add(Weight::from_parts(0, 42428))
+			.saturating_add(T::DbWeight::get().reads(4))
+			.saturating_add(T::DbWeight::get().writes(3))
+	}
+	/// Storage: `FellowshipReferenda::ReferendumInfoFor` (r:1 w:1)
+	/// Proof: `FellowshipReferenda::ReferendumInfoFor` (`max_values`: None, `max_size`: Some(900), added: 3375, mode: `MaxEncodedLen`)
+	/// Storage: `FellowshipCollective::MemberCount` (r:1 w:0)
+	/// Proof: `FellowshipCollective::MemberCount` (`max_values`: None, `max_size`: Some(14), added: 2489, mode: `MaxEncodedLen`)
+	/// Storage: `Scheduler::Agenda` (r:1 w:1)
+	/// Proof: `Scheduler::Agenda` (`max_values`: None, `max_size`: Some(38963), added: 41438, mode: `MaxEncodedLen`)
+	fn nudge_referendum_begin_confirming() -> Weight {
+		// Proof Size summary in bytes:
+		//  Measured:  `770`
+		//  Estimated: `42428`
+		// Minimum execution time: 138_207_000 picoseconds.
+		Weight::from_parts(151_726_000, 0)
+			.saturating_add(Weight::from_parts(0, 42428))
+			.saturating_add(T::DbWeight::get().reads(3))
+			.saturating_add(T::DbWeight::get().writes(2))
+	}
+	/// Storage: `FellowshipReferenda::ReferendumInfoFor` (r:1 w:1)
+	/// Proof: `FellowshipReferenda::ReferendumInfoFor` (`max_values`: None, `max_size`: Some(900), added: 3375, mode: `MaxEncodedLen`)
+	/// Storage: `FellowshipCollective::MemberCount` (r:1 w:0)
+	/// Proof: `FellowshipCollective::MemberCount` (`max_values`: None, `max_size`: Some(14), added: 2489, mode: `MaxEncodedLen`)
+	/// Storage: `Scheduler::Agenda` (r:1 w:1)
+	/// Proof: `Scheduler::Agenda` (`max_values`: None, `max_size`: Some(38963), added: 41438, mode: `MaxEncodedLen`)
+	fn nudge_referendum_end_confirming() -> Weight {
+		// Proof Size summary in bytes:
+		//  Measured:  `755`
+		//  Estimated: `42428`
+		// Minimum execution time: 131_001_000 picoseconds.
+		Weight::from_parts(148_651_000, 0)
+			.saturating_add(Weight::from_parts(0, 42428))
+			.saturating_add(T::DbWeight::get().reads(3))
+			.saturating_add(T::DbWeight::get().writes(2))
+	}
+	/// Storage: `FellowshipReferenda::ReferendumInfoFor` (r:1 w:1)
+	/// Proof: `FellowshipReferenda::ReferendumInfoFor` (`max_values`: None, `max_size`: Some(900), added: 3375, mode: `MaxEncodedLen`)
+	/// Storage: `FellowshipCollective::MemberCount` (r:1 w:0)
+	/// Proof: `FellowshipCollective::MemberCount` (`max_values`: None, `max_size`: Some(14), added: 2489, mode: `MaxEncodedLen`)
+	/// Storage: `Scheduler::Agenda` (r:1 w:1)
+	/// Proof: `Scheduler::Agenda` (`max_values`: None, `max_size`: Some(38963), added: 41438, mode: `MaxEncodedLen`)
+	fn nudge_referendum_continue_not_confirming() -> Weight {
+		// Proof Size summary in bytes:
+		//  Measured:  `770`
+		//  Estimated: `42428`
+		// Minimum execution time: 109_612_000 picoseconds.
+		Weight::from_parts(143_626_000, 0)
+			.saturating_add(Weight::from_parts(0, 42428))
+			.saturating_add(T::DbWeight::get().reads(3))
+			.saturating_add(T::DbWeight::get().writes(2))
+	}
+	/// Storage: `FellowshipReferenda::ReferendumInfoFor` (r:1 w:1)
+	/// Proof: `FellowshipReferenda::ReferendumInfoFor` (`max_values`: None, `max_size`: Some(900), added: 3375, mode: `MaxEncodedLen`)
+	/// Storage: `FellowshipCollective::MemberCount` (r:1 w:0)
+	/// Proof: `FellowshipCollective::MemberCount` (`max_values`: None, `max_size`: Some(14), added: 2489, mode: `MaxEncodedLen`)
+	/// Storage: `Scheduler::Agenda` (r:1 w:1)
+	/// Proof: `Scheduler::Agenda` (`max_values`: None, `max_size`: Some(38963), added: 41438, mode: `MaxEncodedLen`)
+	fn nudge_referendum_continue_confirming() -> Weight {
+		// Proof Size summary in bytes:
+		//  Measured:  `776`
+		//  Estimated: `42428`
+		// Minimum execution time: 71_754_000 picoseconds.
+		Weight::from_parts(77_329_000, 0)
+			.saturating_add(Weight::from_parts(0, 42428))
+			.saturating_add(T::DbWeight::get().reads(3))
+			.saturating_add(T::DbWeight::get().writes(2))
+	}
+	/// Storage: `FellowshipReferenda::ReferendumInfoFor` (r:1 w:1)
+	/// Proof: `FellowshipReferenda::ReferendumInfoFor` (`max_values`: None, `max_size`: Some(900), added: 3375, mode: `MaxEncodedLen`)
+	/// Storage: `FellowshipCollective::MemberCount` (r:1 w:0)
+	/// Proof: `FellowshipCollective::MemberCount` (`max_values`: None, `max_size`: Some(14), added: 2489, mode: `MaxEncodedLen`)
+	/// Storage: `Scheduler::Agenda` (r:2 w:2)
+	/// Proof: `Scheduler::Agenda` (`max_values`: None, `max_size`: Some(38963), added: 41438, mode: `MaxEncodedLen`)
+	/// Storage: `Scheduler::Lookup` (r:1 w:1)
+	/// Proof: `Scheduler::Lookup` (`max_values`: None, `max_size`: Some(48), added: 2523, mode: `MaxEncodedLen`)
+	fn nudge_referendum_approved() -> Weight {
+		// Proof Size summary in bytes:
+		//  Measured:  `776`
+		//  Estimated: `83866`
+		// Minimum execution time: 153_244_000 picoseconds.
+		Weight::from_parts(169_961_000, 0)
+			.saturating_add(Weight::from_parts(0, 83866))
+			.saturating_add(T::DbWeight::get().reads(5))
+			.saturating_add(T::DbWeight::get().writes(4))
+	}
+	/// Storage: `FellowshipReferenda::ReferendumInfoFor` (r:1 w:1)
+	/// Proof: `FellowshipReferenda::ReferendumInfoFor` (`max_values`: None, `max_size`: Some(900), added: 3375, mode: `MaxEncodedLen`)
+	/// Storage: `FellowshipCollective::MemberCount` (r:1 w:0)
+	/// Proof: `FellowshipCollective::MemberCount` (`max_values`: None, `max_size`: Some(14), added: 2489, mode: `MaxEncodedLen`)
+	/// Storage: `Scheduler::Agenda` (r:1 w:1)
+	/// Proof: `Scheduler::Agenda` (`max_values`: None, `max_size`: Some(38963), added: 41438, mode: `MaxEncodedLen`)
+	fn nudge_referendum_rejected() -> Weight {
+		// Proof Size summary in bytes:
+		//  Measured:  `772`
+		//  Estimated: `42428`
+		// Minimum execution time: 137_997_000 picoseconds.
+		Weight::from_parts(157_862_000, 0)
+			.saturating_add(Weight::from_parts(0, 42428))
+			.saturating_add(T::DbWeight::get().reads(3))
+			.saturating_add(T::DbWeight::get().writes(2))
+	}
+	/// Storage: `FellowshipReferenda::ReferendumInfoFor` (r:1 w:0)
+	/// Proof: `FellowshipReferenda::ReferendumInfoFor` (`max_values`: None, `max_size`: Some(900), added: 3375, mode: `MaxEncodedLen`)
+	/// Storage: `Preimage::StatusFor` (r:1 w:0)
+	/// Proof: `Preimage::StatusFor` (`max_values`: None, `max_size`: Some(91), added: 2566, mode: `MaxEncodedLen`)
+	/// Storage: `FellowshipReferenda::MetadataOf` (r:0 w:1)
+	/// Proof: `FellowshipReferenda::MetadataOf` (`max_values`: None, `max_size`: Some(52), added: 2527, mode: `MaxEncodedLen`)
+	fn set_some_metadata() -> Weight {
+		// Proof Size summary in bytes:
+		//  Measured:  `458`
+		//  Estimated: `4365`
+		// Minimum execution time: 21_794_000 picoseconds.
+		Weight::from_parts(22_341_000, 0)
+			.saturating_add(Weight::from_parts(0, 4365))
+			.saturating_add(T::DbWeight::get().reads(2))
+			.saturating_add(T::DbWeight::get().writes(1))
+	}
+	/// Storage: `FellowshipReferenda::ReferendumInfoFor` (r:1 w:0)
+	/// Proof: `FellowshipReferenda::ReferendumInfoFor` (`max_values`: None, `max_size`: Some(900), added: 3375, mode: `MaxEncodedLen`)
+	/// Storage: `FellowshipReferenda::MetadataOf` (r:1 w:1)
+	/// Proof: `FellowshipReferenda::MetadataOf` (`max_values`: None, `max_size`: Some(52), added: 2527, mode: `MaxEncodedLen`)
+	fn clear_metadata() -> Weight {
+		// Proof Size summary in bytes:
+		//  Measured:  `319`
+		//  Estimated: `4365`
+		// Minimum execution time: 18_458_000 picoseconds.
+		Weight::from_parts(19_097_000, 0)
+			.saturating_add(Weight::from_parts(0, 4365))
+			.saturating_add(T::DbWeight::get().reads(2))
+			.saturating_add(T::DbWeight::get().writes(1))
+	}
+}
diff --git a/polkadot/runtime/rococo/src/weights/pallet_referenda_referenda.rs b/polkadot/runtime/rococo/src/weights/pallet_referenda_referenda.rs
new file mode 100644
index 0000000000000000000000000000000000000000..b7cc5df28b91cc2cc36cade14784b41d7d34ff71
--- /dev/null
+++ b/polkadot/runtime/rococo/src/weights/pallet_referenda_referenda.rs
@@ -0,0 +1,522 @@
+// 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/>.
+
+//! Autogenerated weights for `pallet_referenda`
+//!
+//! THIS FILE WAS AUTO-GENERATED USING THE SUBSTRATE BENCHMARK CLI VERSION 4.0.0-dev
+//! DATE: 2023-07-11, STEPS: `50`, REPEAT: `20`, LOW RANGE: `[]`, HIGH RANGE: `[]`
+//! WORST CASE MAP SIZE: `1000000`
+//! HOSTNAME: `runner-xerhrdyb-project-163-concurrent-0`, CPU: `Intel(R) Xeon(R) CPU @ 2.60GHz`
+//! EXECUTION: `Some(Wasm)`, WASM-EXECUTION: `Compiled`, CHAIN: `Some("rococo-dev")`, DB CACHE: 1024
+
+// Executed Command:
+// target/production/polkadot
+// benchmark
+// pallet
+// --steps=50
+// --repeat=20
+// --extrinsic=*
+// --execution=wasm
+// --wasm-execution=compiled
+// --heap-pages=4096
+// --json-file=/builds/parity/mirrors/polkadot/.git/.artifacts/bench.json
+// --pallet=pallet_referenda
+// --chain=rococo-dev
+// --header=./file_header.txt
+// --output=./runtime/rococo/src/weights/
+
+#![cfg_attr(rustfmt, rustfmt_skip)]
+#![allow(unused_parens)]
+#![allow(unused_imports)]
+#![allow(missing_docs)]
+
+use frame_support::{traits::Get, weights::Weight};
+use core::marker::PhantomData;
+
+/// Weight functions for `pallet_referenda`.
+pub struct WeightInfo<T>(PhantomData<T>);
+impl<T: frame_system::Config> pallet_referenda::WeightInfo for WeightInfo<T> {
+	/// Storage: `Referenda::ReferendumCount` (r:1 w:1)
+	/// Proof: `Referenda::ReferendumCount` (`max_values`: Some(1), `max_size`: Some(4), added: 499, mode: `MaxEncodedLen`)
+	/// Storage: `Scheduler::Agenda` (r:1 w:1)
+	/// Proof: `Scheduler::Agenda` (`max_values`: None, `max_size`: Some(38963), added: 41438, mode: `MaxEncodedLen`)
+	/// Storage: `Referenda::ReferendumInfoFor` (r:0 w:1)
+	/// Proof: `Referenda::ReferendumInfoFor` (`max_values`: None, `max_size`: Some(936), added: 3411, mode: `MaxEncodedLen`)
+	fn submit() -> Weight {
+		// Proof Size summary in bytes:
+		//  Measured:  `324`
+		//  Estimated: `42428`
+		// Minimum execution time: 39_852_000 picoseconds.
+		Weight::from_parts(41_610_000, 0)
+			.saturating_add(Weight::from_parts(0, 42428))
+			.saturating_add(T::DbWeight::get().reads(2))
+			.saturating_add(T::DbWeight::get().writes(3))
+	}
+	/// Storage: `Referenda::ReferendumInfoFor` (r:1 w:1)
+	/// Proof: `Referenda::ReferendumInfoFor` (`max_values`: None, `max_size`: Some(936), added: 3411, mode: `MaxEncodedLen`)
+	/// Storage: `Scheduler::Agenda` (r:2 w:2)
+	/// Proof: `Scheduler::Agenda` (`max_values`: None, `max_size`: Some(38963), added: 41438, mode: `MaxEncodedLen`)
+	fn place_decision_deposit_preparing() -> Weight {
+		// Proof Size summary in bytes:
+		//  Measured:  `577`
+		//  Estimated: `83866`
+		// Minimum execution time: 52_588_000 picoseconds.
+		Weight::from_parts(54_154_000, 0)
+			.saturating_add(Weight::from_parts(0, 83866))
+			.saturating_add(T::DbWeight::get().reads(3))
+			.saturating_add(T::DbWeight::get().writes(3))
+	}
+	/// Storage: `Referenda::ReferendumInfoFor` (r:1 w:1)
+	/// Proof: `Referenda::ReferendumInfoFor` (`max_values`: None, `max_size`: Some(936), added: 3411, mode: `MaxEncodedLen`)
+	/// Storage: `Referenda::DecidingCount` (r:1 w:0)
+	/// Proof: `Referenda::DecidingCount` (`max_values`: None, `max_size`: Some(14), added: 2489, mode: `MaxEncodedLen`)
+	/// Storage: `Referenda::TrackQueue` (r:1 w:1)
+	/// Proof: `Referenda::TrackQueue` (`max_values`: None, `max_size`: Some(2012), added: 4487, mode: `MaxEncodedLen`)
+	/// Storage: `Scheduler::Agenda` (r:1 w:1)
+	/// Proof: `Scheduler::Agenda` (`max_values`: None, `max_size`: Some(38963), added: 41438, mode: `MaxEncodedLen`)
+	fn place_decision_deposit_queued() -> Weight {
+		// Proof Size summary in bytes:
+		//  Measured:  `3334`
+		//  Estimated: `42428`
+		// Minimum execution time: 70_483_000 picoseconds.
+		Weight::from_parts(72_731_000, 0)
+			.saturating_add(Weight::from_parts(0, 42428))
+			.saturating_add(T::DbWeight::get().reads(4))
+			.saturating_add(T::DbWeight::get().writes(3))
+	}
+	/// Storage: `Referenda::ReferendumInfoFor` (r:1 w:1)
+	/// Proof: `Referenda::ReferendumInfoFor` (`max_values`: None, `max_size`: Some(936), added: 3411, mode: `MaxEncodedLen`)
+	/// Storage: `Referenda::DecidingCount` (r:1 w:0)
+	/// Proof: `Referenda::DecidingCount` (`max_values`: None, `max_size`: Some(14), added: 2489, mode: `MaxEncodedLen`)
+	/// Storage: `Referenda::TrackQueue` (r:1 w:1)
+	/// Proof: `Referenda::TrackQueue` (`max_values`: None, `max_size`: Some(2012), added: 4487, mode: `MaxEncodedLen`)
+	/// Storage: `Scheduler::Agenda` (r:1 w:1)
+	/// Proof: `Scheduler::Agenda` (`max_values`: None, `max_size`: Some(38963), added: 41438, mode: `MaxEncodedLen`)
+	fn place_decision_deposit_not_queued() -> Weight {
+		// Proof Size summary in bytes:
+		//  Measured:  `3354`
+		//  Estimated: `42428`
+		// Minimum execution time: 68_099_000 picoseconds.
+		Weight::from_parts(71_560_000, 0)
+			.saturating_add(Weight::from_parts(0, 42428))
+			.saturating_add(T::DbWeight::get().reads(4))
+			.saturating_add(T::DbWeight::get().writes(3))
+	}
+	/// Storage: `Referenda::ReferendumInfoFor` (r:1 w:1)
+	/// Proof: `Referenda::ReferendumInfoFor` (`max_values`: None, `max_size`: Some(936), added: 3411, mode: `MaxEncodedLen`)
+	/// Storage: `Referenda::DecidingCount` (r:1 w:1)
+	/// Proof: `Referenda::DecidingCount` (`max_values`: None, `max_size`: Some(14), added: 2489, mode: `MaxEncodedLen`)
+	/// Storage: `Balances::InactiveIssuance` (r:1 w:0)
+	/// Proof: `Balances::InactiveIssuance` (`max_values`: Some(1), `max_size`: Some(16), added: 511, mode: `MaxEncodedLen`)
+	/// Storage: `Scheduler::Agenda` (r:2 w:2)
+	/// Proof: `Scheduler::Agenda` (`max_values`: None, `max_size`: Some(38963), added: 41438, mode: `MaxEncodedLen`)
+	fn place_decision_deposit_passing() -> Weight {
+		// Proof Size summary in bytes:
+		//  Measured:  `577`
+		//  Estimated: `83866`
+		// Minimum execution time: 64_357_000 picoseconds.
+		Weight::from_parts(66_081_000, 0)
+			.saturating_add(Weight::from_parts(0, 83866))
+			.saturating_add(T::DbWeight::get().reads(5))
+			.saturating_add(T::DbWeight::get().writes(4))
+	}
+	/// Storage: `Referenda::ReferendumInfoFor` (r:1 w:1)
+	/// Proof: `Referenda::ReferendumInfoFor` (`max_values`: None, `max_size`: Some(936), added: 3411, mode: `MaxEncodedLen`)
+	/// Storage: `Referenda::DecidingCount` (r:1 w:1)
+	/// Proof: `Referenda::DecidingCount` (`max_values`: None, `max_size`: Some(14), added: 2489, mode: `MaxEncodedLen`)
+	/// Storage: `Balances::InactiveIssuance` (r:1 w:0)
+	/// Proof: `Balances::InactiveIssuance` (`max_values`: Some(1), `max_size`: Some(16), added: 511, mode: `MaxEncodedLen`)
+	/// Storage: `Scheduler::Agenda` (r:2 w:2)
+	/// Proof: `Scheduler::Agenda` (`max_values`: None, `max_size`: Some(38963), added: 41438, mode: `MaxEncodedLen`)
+	fn place_decision_deposit_failing() -> Weight {
+		// Proof Size summary in bytes:
+		//  Measured:  `577`
+		//  Estimated: `83866`
+		// Minimum execution time: 62_709_000 picoseconds.
+		Weight::from_parts(64_534_000, 0)
+			.saturating_add(Weight::from_parts(0, 83866))
+			.saturating_add(T::DbWeight::get().reads(5))
+			.saturating_add(T::DbWeight::get().writes(4))
+	}
+	/// Storage: `Referenda::ReferendumInfoFor` (r:1 w:1)
+	/// Proof: `Referenda::ReferendumInfoFor` (`max_values`: None, `max_size`: Some(936), added: 3411, mode: `MaxEncodedLen`)
+	fn refund_decision_deposit() -> Weight {
+		// Proof Size summary in bytes:
+		//  Measured:  `417`
+		//  Estimated: `4401`
+		// Minimum execution time: 31_296_000 picoseconds.
+		Weight::from_parts(32_221_000, 0)
+			.saturating_add(Weight::from_parts(0, 4401))
+			.saturating_add(T::DbWeight::get().reads(1))
+			.saturating_add(T::DbWeight::get().writes(1))
+	}
+	/// Storage: `Referenda::ReferendumInfoFor` (r:1 w:1)
+	/// Proof: `Referenda::ReferendumInfoFor` (`max_values`: None, `max_size`: Some(936), added: 3411, mode: `MaxEncodedLen`)
+	fn refund_submission_deposit() -> Weight {
+		// Proof Size summary in bytes:
+		//  Measured:  `407`
+		//  Estimated: `4401`
+		// Minimum execution time: 31_209_000 picoseconds.
+		Weight::from_parts(32_168_000, 0)
+			.saturating_add(Weight::from_parts(0, 4401))
+			.saturating_add(T::DbWeight::get().reads(1))
+			.saturating_add(T::DbWeight::get().writes(1))
+	}
+	/// Storage: `Referenda::ReferendumInfoFor` (r:1 w:1)
+	/// Proof: `Referenda::ReferendumInfoFor` (`max_values`: None, `max_size`: Some(936), added: 3411, mode: `MaxEncodedLen`)
+	/// Storage: `Scheduler::Agenda` (r:2 w:2)
+	/// Proof: `Scheduler::Agenda` (`max_values`: None, `max_size`: Some(38963), added: 41438, mode: `MaxEncodedLen`)
+	fn cancel() -> Weight {
+		// Proof Size summary in bytes:
+		//  Measured:  `485`
+		//  Estimated: `83866`
+		// Minimum execution time: 38_887_000 picoseconds.
+		Weight::from_parts(40_193_000, 0)
+			.saturating_add(Weight::from_parts(0, 83866))
+			.saturating_add(T::DbWeight::get().reads(3))
+			.saturating_add(T::DbWeight::get().writes(3))
+	}
+	/// Storage: `Referenda::ReferendumInfoFor` (r:1 w:1)
+	/// Proof: `Referenda::ReferendumInfoFor` (`max_values`: None, `max_size`: Some(936), added: 3411, mode: `MaxEncodedLen`)
+	/// Storage: `Scheduler::Agenda` (r:2 w:2)
+	/// Proof: `Scheduler::Agenda` (`max_values`: None, `max_size`: Some(38963), added: 41438, mode: `MaxEncodedLen`)
+	/// Storage: `Referenda::MetadataOf` (r:1 w:0)
+	/// Proof: `Referenda::MetadataOf` (`max_values`: None, `max_size`: Some(52), added: 2527, mode: `MaxEncodedLen`)
+	fn kill() -> Weight {
+		// Proof Size summary in bytes:
+		//  Measured:  `726`
+		//  Estimated: `83866`
+		// Minimum execution time: 106_054_000 picoseconds.
+		Weight::from_parts(108_318_000, 0)
+			.saturating_add(Weight::from_parts(0, 83866))
+			.saturating_add(T::DbWeight::get().reads(4))
+			.saturating_add(T::DbWeight::get().writes(3))
+	}
+	/// Storage: `Referenda::TrackQueue` (r:1 w:0)
+	/// Proof: `Referenda::TrackQueue` (`max_values`: None, `max_size`: Some(2012), added: 4487, mode: `MaxEncodedLen`)
+	/// Storage: `Referenda::DecidingCount` (r:1 w:1)
+	/// Proof: `Referenda::DecidingCount` (`max_values`: None, `max_size`: Some(14), added: 2489, mode: `MaxEncodedLen`)
+	fn one_fewer_deciding_queue_empty() -> Weight {
+		// Proof Size summary in bytes:
+		//  Measured:  `240`
+		//  Estimated: `5477`
+		// Minimum execution time: 9_263_000 picoseconds.
+		Weight::from_parts(9_763_000, 0)
+			.saturating_add(Weight::from_parts(0, 5477))
+			.saturating_add(T::DbWeight::get().reads(2))
+			.saturating_add(T::DbWeight::get().writes(1))
+	}
+	/// Storage: `Referenda::TrackQueue` (r:1 w:1)
+	/// Proof: `Referenda::TrackQueue` (`max_values`: None, `max_size`: Some(2012), added: 4487, mode: `MaxEncodedLen`)
+	/// Storage: `Referenda::ReferendumInfoFor` (r:1 w:1)
+	/// Proof: `Referenda::ReferendumInfoFor` (`max_values`: None, `max_size`: Some(936), added: 3411, mode: `MaxEncodedLen`)
+	/// Storage: `Balances::InactiveIssuance` (r:1 w:0)
+	/// Proof: `Balances::InactiveIssuance` (`max_values`: Some(1), `max_size`: Some(16), added: 511, mode: `MaxEncodedLen`)
+	/// Storage: `Scheduler::Agenda` (r:1 w:1)
+	/// Proof: `Scheduler::Agenda` (`max_values`: None, `max_size`: Some(38963), added: 41438, mode: `MaxEncodedLen`)
+	fn one_fewer_deciding_failing() -> Weight {
+		// Proof Size summary in bytes:
+		//  Measured:  `3254`
+		//  Estimated: `42428`
+		// Minimum execution time: 50_080_000 picoseconds.
+		Weight::from_parts(51_858_000, 0)
+			.saturating_add(Weight::from_parts(0, 42428))
+			.saturating_add(T::DbWeight::get().reads(4))
+			.saturating_add(T::DbWeight::get().writes(3))
+	}
+	/// Storage: `Referenda::TrackQueue` (r:1 w:1)
+	/// Proof: `Referenda::TrackQueue` (`max_values`: None, `max_size`: Some(2012), added: 4487, mode: `MaxEncodedLen`)
+	/// Storage: `Referenda::ReferendumInfoFor` (r:1 w:1)
+	/// Proof: `Referenda::ReferendumInfoFor` (`max_values`: None, `max_size`: Some(936), added: 3411, mode: `MaxEncodedLen`)
+	/// Storage: `Balances::InactiveIssuance` (r:1 w:0)
+	/// Proof: `Balances::InactiveIssuance` (`max_values`: Some(1), `max_size`: Some(16), added: 511, mode: `MaxEncodedLen`)
+	/// Storage: `Scheduler::Agenda` (r:1 w:1)
+	/// Proof: `Scheduler::Agenda` (`max_values`: None, `max_size`: Some(38963), added: 41438, mode: `MaxEncodedLen`)
+	fn one_fewer_deciding_passing() -> Weight {
+		// Proof Size summary in bytes:
+		//  Measured:  `3254`
+		//  Estimated: `42428`
+		// Minimum execution time: 53_889_000 picoseconds.
+		Weight::from_parts(55_959_000, 0)
+			.saturating_add(Weight::from_parts(0, 42428))
+			.saturating_add(T::DbWeight::get().reads(4))
+			.saturating_add(T::DbWeight::get().writes(3))
+	}
+	/// Storage: `Referenda::ReferendumInfoFor` (r:1 w:0)
+	/// Proof: `Referenda::ReferendumInfoFor` (`max_values`: None, `max_size`: Some(936), added: 3411, mode: `MaxEncodedLen`)
+	/// Storage: `Referenda::TrackQueue` (r:1 w:1)
+	/// Proof: `Referenda::TrackQueue` (`max_values`: None, `max_size`: Some(2012), added: 4487, mode: `MaxEncodedLen`)
+	fn nudge_referendum_requeued_insertion() -> Weight {
+		// Proof Size summary in bytes:
+		//  Measured:  `3077`
+		//  Estimated: `5477`
+		// Minimum execution time: 23_266_000 picoseconds.
+		Weight::from_parts(24_624_000, 0)
+			.saturating_add(Weight::from_parts(0, 5477))
+			.saturating_add(T::DbWeight::get().reads(2))
+			.saturating_add(T::DbWeight::get().writes(1))
+	}
+	/// Storage: `Referenda::ReferendumInfoFor` (r:1 w:0)
+	/// Proof: `Referenda::ReferendumInfoFor` (`max_values`: None, `max_size`: Some(936), added: 3411, mode: `MaxEncodedLen`)
+	/// Storage: `Referenda::TrackQueue` (r:1 w:1)
+	/// Proof: `Referenda::TrackQueue` (`max_values`: None, `max_size`: Some(2012), added: 4487, mode: `MaxEncodedLen`)
+	fn nudge_referendum_requeued_slide() -> Weight {
+		// Proof Size summary in bytes:
+		//  Measured:  `3077`
+		//  Estimated: `5477`
+		// Minimum execution time: 22_846_000 picoseconds.
+		Weight::from_parts(24_793_000, 0)
+			.saturating_add(Weight::from_parts(0, 5477))
+			.saturating_add(T::DbWeight::get().reads(2))
+			.saturating_add(T::DbWeight::get().writes(1))
+	}
+	/// Storage: `Referenda::ReferendumInfoFor` (r:1 w:1)
+	/// Proof: `Referenda::ReferendumInfoFor` (`max_values`: None, `max_size`: Some(936), added: 3411, mode: `MaxEncodedLen`)
+	/// Storage: `Referenda::DecidingCount` (r:1 w:0)
+	/// Proof: `Referenda::DecidingCount` (`max_values`: None, `max_size`: Some(14), added: 2489, mode: `MaxEncodedLen`)
+	/// Storage: `Referenda::TrackQueue` (r:1 w:1)
+	/// Proof: `Referenda::TrackQueue` (`max_values`: None, `max_size`: Some(2012), added: 4487, mode: `MaxEncodedLen`)
+	fn nudge_referendum_queued() -> Weight {
+		// Proof Size summary in bytes:
+		//  Measured:  `3081`
+		//  Estimated: `5477`
+		// Minimum execution time: 28_284_000 picoseconds.
+		Weight::from_parts(29_940_000, 0)
+			.saturating_add(Weight::from_parts(0, 5477))
+			.saturating_add(T::DbWeight::get().reads(3))
+			.saturating_add(T::DbWeight::get().writes(2))
+	}
+	/// Storage: `Referenda::ReferendumInfoFor` (r:1 w:1)
+	/// Proof: `Referenda::ReferendumInfoFor` (`max_values`: None, `max_size`: Some(936), added: 3411, mode: `MaxEncodedLen`)
+	/// Storage: `Referenda::DecidingCount` (r:1 w:0)
+	/// Proof: `Referenda::DecidingCount` (`max_values`: None, `max_size`: Some(14), added: 2489, mode: `MaxEncodedLen`)
+	/// Storage: `Referenda::TrackQueue` (r:1 w:1)
+	/// Proof: `Referenda::TrackQueue` (`max_values`: None, `max_size`: Some(2012), added: 4487, mode: `MaxEncodedLen`)
+	fn nudge_referendum_not_queued() -> Weight {
+		// Proof Size summary in bytes:
+		//  Measured:  `3101`
+		//  Estimated: `5477`
+		// Minimum execution time: 28_133_000 picoseconds.
+		Weight::from_parts(29_638_000, 0)
+			.saturating_add(Weight::from_parts(0, 5477))
+			.saturating_add(T::DbWeight::get().reads(3))
+			.saturating_add(T::DbWeight::get().writes(2))
+	}
+	/// Storage: `Referenda::ReferendumInfoFor` (r:1 w:1)
+	/// Proof: `Referenda::ReferendumInfoFor` (`max_values`: None, `max_size`: Some(936), added: 3411, mode: `MaxEncodedLen`)
+	/// Storage: `Scheduler::Agenda` (r:1 w:1)
+	/// Proof: `Scheduler::Agenda` (`max_values`: None, `max_size`: Some(38963), added: 41438, mode: `MaxEncodedLen`)
+	fn nudge_referendum_no_deposit() -> Weight {
+		// Proof Size summary in bytes:
+		//  Measured:  `437`
+		//  Estimated: `42428`
+		// Minimum execution time: 25_710_000 picoseconds.
+		Weight::from_parts(26_500_000, 0)
+			.saturating_add(Weight::from_parts(0, 42428))
+			.saturating_add(T::DbWeight::get().reads(2))
+			.saturating_add(T::DbWeight::get().writes(2))
+	}
+	/// Storage: `Referenda::ReferendumInfoFor` (r:1 w:1)
+	/// Proof: `Referenda::ReferendumInfoFor` (`max_values`: None, `max_size`: Some(936), added: 3411, mode: `MaxEncodedLen`)
+	/// Storage: `Scheduler::Agenda` (r:1 w:1)
+	/// Proof: `Scheduler::Agenda` (`max_values`: None, `max_size`: Some(38963), added: 41438, mode: `MaxEncodedLen`)
+	fn nudge_referendum_preparing() -> Weight {
+		// Proof Size summary in bytes:
+		//  Measured:  `485`
+		//  Estimated: `42428`
+		// Minimum execution time: 25_935_000 picoseconds.
+		Weight::from_parts(26_803_000, 0)
+			.saturating_add(Weight::from_parts(0, 42428))
+			.saturating_add(T::DbWeight::get().reads(2))
+			.saturating_add(T::DbWeight::get().writes(2))
+	}
+	/// Storage: `Referenda::ReferendumInfoFor` (r:1 w:1)
+	/// Proof: `Referenda::ReferendumInfoFor` (`max_values`: None, `max_size`: Some(936), added: 3411, mode: `MaxEncodedLen`)
+	fn nudge_referendum_timed_out() -> Weight {
+		// Proof Size summary in bytes:
+		//  Measured:  `344`
+		//  Estimated: `4401`
+		// Minimum execution time: 17_390_000 picoseconds.
+		Weight::from_parts(18_042_000, 0)
+			.saturating_add(Weight::from_parts(0, 4401))
+			.saturating_add(T::DbWeight::get().reads(1))
+			.saturating_add(T::DbWeight::get().writes(1))
+	}
+	/// Storage: `Referenda::ReferendumInfoFor` (r:1 w:1)
+	/// Proof: `Referenda::ReferendumInfoFor` (`max_values`: None, `max_size`: Some(936), added: 3411, mode: `MaxEncodedLen`)
+	/// Storage: `Referenda::DecidingCount` (r:1 w:1)
+	/// Proof: `Referenda::DecidingCount` (`max_values`: None, `max_size`: Some(14), added: 2489, mode: `MaxEncodedLen`)
+	/// Storage: `Balances::InactiveIssuance` (r:1 w:0)
+	/// Proof: `Balances::InactiveIssuance` (`max_values`: Some(1), `max_size`: Some(16), added: 511, mode: `MaxEncodedLen`)
+	/// Storage: `Scheduler::Agenda` (r:1 w:1)
+	/// Proof: `Scheduler::Agenda` (`max_values`: None, `max_size`: Some(38963), added: 41438, mode: `MaxEncodedLen`)
+	fn nudge_referendum_begin_deciding_failing() -> Weight {
+		// Proof Size summary in bytes:
+		//  Measured:  `485`
+		//  Estimated: `42428`
+		// Minimum execution time: 35_141_000 picoseconds.
+		Weight::from_parts(36_318_000, 0)
+			.saturating_add(Weight::from_parts(0, 42428))
+			.saturating_add(T::DbWeight::get().reads(4))
+			.saturating_add(T::DbWeight::get().writes(3))
+	}
+	/// Storage: `Referenda::ReferendumInfoFor` (r:1 w:1)
+	/// Proof: `Referenda::ReferendumInfoFor` (`max_values`: None, `max_size`: Some(936), added: 3411, mode: `MaxEncodedLen`)
+	/// Storage: `Referenda::DecidingCount` (r:1 w:1)
+	/// Proof: `Referenda::DecidingCount` (`max_values`: None, `max_size`: Some(14), added: 2489, mode: `MaxEncodedLen`)
+	/// Storage: `Balances::InactiveIssuance` (r:1 w:0)
+	/// Proof: `Balances::InactiveIssuance` (`max_values`: Some(1), `max_size`: Some(16), added: 511, mode: `MaxEncodedLen`)
+	/// Storage: `Scheduler::Agenda` (r:1 w:1)
+	/// Proof: `Scheduler::Agenda` (`max_values`: None, `max_size`: Some(38963), added: 41438, mode: `MaxEncodedLen`)
+	fn nudge_referendum_begin_deciding_passing() -> Weight {
+		// Proof Size summary in bytes:
+		//  Measured:  `485`
+		//  Estimated: `42428`
+		// Minimum execution time: 37_815_000 picoseconds.
+		Weight::from_parts(39_243_000, 0)
+			.saturating_add(Weight::from_parts(0, 42428))
+			.saturating_add(T::DbWeight::get().reads(4))
+			.saturating_add(T::DbWeight::get().writes(3))
+	}
+	/// Storage: `Referenda::ReferendumInfoFor` (r:1 w:1)
+	/// Proof: `Referenda::ReferendumInfoFor` (`max_values`: None, `max_size`: Some(936), added: 3411, mode: `MaxEncodedLen`)
+	/// Storage: `Balances::InactiveIssuance` (r:1 w:0)
+	/// Proof: `Balances::InactiveIssuance` (`max_values`: Some(1), `max_size`: Some(16), added: 511, mode: `MaxEncodedLen`)
+	/// Storage: `Scheduler::Agenda` (r:1 w:1)
+	/// Proof: `Scheduler::Agenda` (`max_values`: None, `max_size`: Some(38963), added: 41438, mode: `MaxEncodedLen`)
+	fn nudge_referendum_begin_confirming() -> Weight {
+		// Proof Size summary in bytes:
+		//  Measured:  `538`
+		//  Estimated: `42428`
+		// Minimum execution time: 30_779_000 picoseconds.
+		Weight::from_parts(31_845_000, 0)
+			.saturating_add(Weight::from_parts(0, 42428))
+			.saturating_add(T::DbWeight::get().reads(3))
+			.saturating_add(T::DbWeight::get().writes(2))
+	}
+	/// Storage: `Referenda::ReferendumInfoFor` (r:1 w:1)
+	/// Proof: `Referenda::ReferendumInfoFor` (`max_values`: None, `max_size`: Some(936), added: 3411, mode: `MaxEncodedLen`)
+	/// Storage: `Balances::InactiveIssuance` (r:1 w:0)
+	/// Proof: `Balances::InactiveIssuance` (`max_values`: Some(1), `max_size`: Some(16), added: 511, mode: `MaxEncodedLen`)
+	/// Storage: `Scheduler::Agenda` (r:1 w:1)
+	/// Proof: `Scheduler::Agenda` (`max_values`: None, `max_size`: Some(38963), added: 41438, mode: `MaxEncodedLen`)
+	fn nudge_referendum_end_confirming() -> Weight {
+		// Proof Size summary in bytes:
+		//  Measured:  `521`
+		//  Estimated: `42428`
+		// Minimum execution time: 31_908_000 picoseconds.
+		Weight::from_parts(33_253_000, 0)
+			.saturating_add(Weight::from_parts(0, 42428))
+			.saturating_add(T::DbWeight::get().reads(3))
+			.saturating_add(T::DbWeight::get().writes(2))
+	}
+	/// Storage: `Referenda::ReferendumInfoFor` (r:1 w:1)
+	/// Proof: `Referenda::ReferendumInfoFor` (`max_values`: None, `max_size`: Some(936), added: 3411, mode: `MaxEncodedLen`)
+	/// Storage: `Balances::InactiveIssuance` (r:1 w:0)
+	/// Proof: `Balances::InactiveIssuance` (`max_values`: Some(1), `max_size`: Some(16), added: 511, mode: `MaxEncodedLen`)
+	/// Storage: `Scheduler::Agenda` (r:1 w:1)
+	/// Proof: `Scheduler::Agenda` (`max_values`: None, `max_size`: Some(38963), added: 41438, mode: `MaxEncodedLen`)
+	fn nudge_referendum_continue_not_confirming() -> Weight {
+		// Proof Size summary in bytes:
+		//  Measured:  `538`
+		//  Estimated: `42428`
+		// Minimum execution time: 28_951_000 picoseconds.
+		Weight::from_parts(30_004_000, 0)
+			.saturating_add(Weight::from_parts(0, 42428))
+			.saturating_add(T::DbWeight::get().reads(3))
+			.saturating_add(T::DbWeight::get().writes(2))
+	}
+	/// Storage: `Referenda::ReferendumInfoFor` (r:1 w:1)
+	/// Proof: `Referenda::ReferendumInfoFor` (`max_values`: None, `max_size`: Some(936), added: 3411, mode: `MaxEncodedLen`)
+	/// Storage: `Balances::InactiveIssuance` (r:1 w:0)
+	/// Proof: `Balances::InactiveIssuance` (`max_values`: Some(1), `max_size`: Some(16), added: 511, mode: `MaxEncodedLen`)
+	/// Storage: `Scheduler::Agenda` (r:1 w:1)
+	/// Proof: `Scheduler::Agenda` (`max_values`: None, `max_size`: Some(38963), added: 41438, mode: `MaxEncodedLen`)
+	fn nudge_referendum_continue_confirming() -> Weight {
+		// Proof Size summary in bytes:
+		//  Measured:  `542`
+		//  Estimated: `42428`
+		// Minimum execution time: 27_750_000 picoseconds.
+		Weight::from_parts(28_588_000, 0)
+			.saturating_add(Weight::from_parts(0, 42428))
+			.saturating_add(T::DbWeight::get().reads(3))
+			.saturating_add(T::DbWeight::get().writes(2))
+	}
+	/// Storage: `Referenda::ReferendumInfoFor` (r:1 w:1)
+	/// Proof: `Referenda::ReferendumInfoFor` (`max_values`: None, `max_size`: Some(936), added: 3411, mode: `MaxEncodedLen`)
+	/// Storage: `Balances::InactiveIssuance` (r:1 w:0)
+	/// Proof: `Balances::InactiveIssuance` (`max_values`: Some(1), `max_size`: Some(16), added: 511, mode: `MaxEncodedLen`)
+	/// Storage: `Scheduler::Agenda` (r:2 w:2)
+	/// Proof: `Scheduler::Agenda` (`max_values`: None, `max_size`: Some(38963), added: 41438, mode: `MaxEncodedLen`)
+	/// Storage: `Scheduler::Lookup` (r:1 w:1)
+	/// Proof: `Scheduler::Lookup` (`max_values`: None, `max_size`: Some(48), added: 2523, mode: `MaxEncodedLen`)
+	fn nudge_referendum_approved() -> Weight {
+		// Proof Size summary in bytes:
+		//  Measured:  `542`
+		//  Estimated: `83866`
+		// Minimum execution time: 43_950_000 picoseconds.
+		Weight::from_parts(46_164_000, 0)
+			.saturating_add(Weight::from_parts(0, 83866))
+			.saturating_add(T::DbWeight::get().reads(5))
+			.saturating_add(T::DbWeight::get().writes(4))
+	}
+	/// Storage: `Referenda::ReferendumInfoFor` (r:1 w:1)
+	/// Proof: `Referenda::ReferendumInfoFor` (`max_values`: None, `max_size`: Some(936), added: 3411, mode: `MaxEncodedLen`)
+	/// Storage: `Balances::InactiveIssuance` (r:1 w:0)
+	/// Proof: `Balances::InactiveIssuance` (`max_values`: Some(1), `max_size`: Some(16), added: 511, mode: `MaxEncodedLen`)
+	/// Storage: `Scheduler::Agenda` (r:1 w:1)
+	/// Proof: `Scheduler::Agenda` (`max_values`: None, `max_size`: Some(38963), added: 41438, mode: `MaxEncodedLen`)
+	fn nudge_referendum_rejected() -> Weight {
+		// Proof Size summary in bytes:
+		//  Measured:  `538`
+		//  Estimated: `42428`
+		// Minimum execution time: 31_050_000 picoseconds.
+		Weight::from_parts(32_169_000, 0)
+			.saturating_add(Weight::from_parts(0, 42428))
+			.saturating_add(T::DbWeight::get().reads(3))
+			.saturating_add(T::DbWeight::get().writes(2))
+	}
+	/// Storage: `Referenda::ReferendumInfoFor` (r:1 w:0)
+	/// Proof: `Referenda::ReferendumInfoFor` (`max_values`: None, `max_size`: Some(936), added: 3411, mode: `MaxEncodedLen`)
+	/// Storage: `Preimage::StatusFor` (r:1 w:0)
+	/// Proof: `Preimage::StatusFor` (`max_values`: None, `max_size`: Some(91), added: 2566, mode: `MaxEncodedLen`)
+	/// Storage: `Referenda::MetadataOf` (r:0 w:1)
+	/// Proof: `Referenda::MetadataOf` (`max_values`: None, `max_size`: Some(52), added: 2527, mode: `MaxEncodedLen`)
+	fn set_some_metadata() -> Weight {
+		// Proof Size summary in bytes:
+		//  Measured:  `560`
+		//  Estimated: `4401`
+		// Minimum execution time: 21_193_000 picoseconds.
+		Weight::from_parts(22_116_000, 0)
+			.saturating_add(Weight::from_parts(0, 4401))
+			.saturating_add(T::DbWeight::get().reads(2))
+			.saturating_add(T::DbWeight::get().writes(1))
+	}
+	/// Storage: `Referenda::ReferendumInfoFor` (r:1 w:0)
+	/// Proof: `Referenda::ReferendumInfoFor` (`max_values`: None, `max_size`: Some(936), added: 3411, mode: `MaxEncodedLen`)
+	/// Storage: `Referenda::MetadataOf` (r:1 w:1)
+	/// Proof: `Referenda::MetadataOf` (`max_values`: None, `max_size`: Some(52), added: 2527, mode: `MaxEncodedLen`)
+	fn clear_metadata() -> Weight {
+		// Proof Size summary in bytes:
+		//  Measured:  `421`
+		//  Estimated: `4401`
+		// Minimum execution time: 18_065_000 picoseconds.
+		Weight::from_parts(18_781_000, 0)
+			.saturating_add(Weight::from_parts(0, 4401))
+			.saturating_add(T::DbWeight::get().reads(2))
+			.saturating_add(T::DbWeight::get().writes(1))
+	}
+}
diff --git a/polkadot/runtime/rococo/src/weights/pallet_tips.rs b/polkadot/runtime/rococo/src/weights/pallet_tips.rs
deleted file mode 100644
index c4710afd78e2bf2fa6b0501140845681295eee0b..0000000000000000000000000000000000000000
--- a/polkadot/runtime/rococo/src/weights/pallet_tips.rs
+++ /dev/null
@@ -1,161 +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/>.
-
-//! Autogenerated weights for `pallet_tips`
-//!
-//! THIS FILE WAS AUTO-GENERATED USING THE SUBSTRATE BENCHMARK CLI VERSION 4.0.0-dev
-//! DATE: 2023-05-26, STEPS: `50`, REPEAT: `20`, LOW RANGE: `[]`, HIGH RANGE: `[]`
-//! WORST CASE MAP SIZE: `1000000`
-//! HOSTNAME: `bm5`, CPU: `Intel(R) Core(TM) i7-7700K CPU @ 4.20GHz`
-//! EXECUTION: Some(Wasm), WASM-EXECUTION: Compiled, CHAIN: Some("rococo-dev"), DB CACHE: 1024
-
-// Executed Command:
-// ./target/production/polkadot
-// benchmark
-// pallet
-// --chain=rococo-dev
-// --steps=50
-// --repeat=20
-// --pallet=pallet_tips
-// --extrinsic=*
-// --execution=wasm
-// --wasm-execution=compiled
-// --header=./file_header.txt
-// --output=./runtime/rococo/src/weights/
-
-#![cfg_attr(rustfmt, rustfmt_skip)]
-#![allow(unused_parens)]
-#![allow(unused_imports)]
-#![allow(missing_docs)]
-
-use frame_support::{traits::Get, weights::Weight};
-use core::marker::PhantomData;
-
-/// Weight functions for `pallet_tips`.
-pub struct WeightInfo<T>(PhantomData<T>);
-impl<T: frame_system::Config> pallet_tips::WeightInfo for WeightInfo<T> {
-	/// Storage: Tips Reasons (r:1 w:1)
-	/// Proof Skipped: Tips Reasons (max_values: None, max_size: None, mode: Measured)
-	/// Storage: Tips Tips (r:1 w:1)
-	/// Proof Skipped: Tips Tips (max_values: None, max_size: None, mode: Measured)
-	/// The range of component `r` is `[0, 16384]`.
-	fn report_awesome(r: u32, ) -> Weight {
-		// Proof Size summary in bytes:
-		//  Measured:  `4`
-		//  Estimated: `3469`
-		// Minimum execution time: 27_741_000 picoseconds.
-		Weight::from_parts(28_495_173, 0)
-			.saturating_add(Weight::from_parts(0, 3469))
-			// Standard Error: 4
-			.saturating_add(Weight::from_parts(1_433, 0).saturating_mul(r.into()))
-			.saturating_add(T::DbWeight::get().reads(2))
-			.saturating_add(T::DbWeight::get().writes(2))
-	}
-	/// Storage: Tips Tips (r:1 w:1)
-	/// Proof Skipped: Tips Tips (max_values: None, max_size: None, mode: Measured)
-	/// Storage: Tips Reasons (r:0 w:1)
-	/// Proof Skipped: Tips Reasons (max_values: None, max_size: None, mode: Measured)
-	fn retract_tip() -> Weight {
-		// Proof Size summary in bytes:
-		//  Measured:  `221`
-		//  Estimated: `3686`
-		// Minimum execution time: 27_275_000 picoseconds.
-		Weight::from_parts(27_649_000, 0)
-			.saturating_add(Weight::from_parts(0, 3686))
-			.saturating_add(T::DbWeight::get().reads(1))
-			.saturating_add(T::DbWeight::get().writes(2))
-	}
-	/// Storage: PhragmenElection Members (r:1 w:0)
-	/// Proof Skipped: PhragmenElection Members (max_values: Some(1), max_size: None, mode: Measured)
-	/// Storage: Tips Reasons (r:1 w:1)
-	/// Proof Skipped: Tips Reasons (max_values: None, max_size: None, mode: Measured)
-	/// Storage: Tips Tips (r:0 w:1)
-	/// Proof Skipped: Tips Tips (max_values: None, max_size: None, mode: Measured)
-	/// The range of component `r` is `[0, 16384]`.
-	/// The range of component `t` is `[1, 19]`.
-	fn tip_new(r: u32, t: u32, ) -> Weight {
-		// Proof Size summary in bytes:
-		//  Measured:  `74 + t * (64 ±0)`
-		//  Estimated: `3539 + t * (64 ±0)`
-		// Minimum execution time: 19_809_000 picoseconds.
-		Weight::from_parts(18_182_607, 0)
-			.saturating_add(Weight::from_parts(0, 3539))
-			// Standard Error: 5
-			.saturating_add(Weight::from_parts(1_303, 0).saturating_mul(r.into()))
-			// Standard Error: 5_156
-			.saturating_add(Weight::from_parts(151_789, 0).saturating_mul(t.into()))
-			.saturating_add(T::DbWeight::get().reads(2))
-			.saturating_add(T::DbWeight::get().writes(2))
-			.saturating_add(Weight::from_parts(0, 64).saturating_mul(t.into()))
-	}
-	/// Storage: PhragmenElection Members (r:1 w:0)
-	/// Proof Skipped: PhragmenElection Members (max_values: Some(1), max_size: None, mode: Measured)
-	/// Storage: Tips Tips (r:1 w:1)
-	/// Proof Skipped: Tips Tips (max_values: None, max_size: None, mode: Measured)
-	/// The range of component `t` is `[1, 19]`.
-	fn tip(t: u32, ) -> Weight {
-		// Proof Size summary in bytes:
-		//  Measured:  `295 + t * (112 ±0)`
-		//  Estimated: `3760 + t * (112 ±0)`
-		// Minimum execution time: 15_528_000 picoseconds.
-		Weight::from_parts(15_717_755, 0)
-			.saturating_add(Weight::from_parts(0, 3760))
-			// Standard Error: 6_569
-			.saturating_add(Weight::from_parts(146_426, 0).saturating_mul(t.into()))
-			.saturating_add(T::DbWeight::get().reads(2))
-			.saturating_add(T::DbWeight::get().writes(1))
-			.saturating_add(Weight::from_parts(0, 112).saturating_mul(t.into()))
-	}
-	/// Storage: Tips Tips (r:1 w:1)
-	/// Proof Skipped: Tips Tips (max_values: None, max_size: None, mode: Measured)
-	/// Storage: PhragmenElection Members (r:1 w:0)
-	/// Proof Skipped: PhragmenElection Members (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: Tips Reasons (r:0 w:1)
-	/// Proof Skipped: Tips Reasons (max_values: None, max_size: None, mode: Measured)
-	/// The range of component `t` is `[1, 19]`.
-	fn close_tip(t: u32, ) -> Weight {
-		// Proof Size summary in bytes:
-		//  Measured:  `334 + t * (112 ±0)`
-		//  Estimated: `3790 + t * (112 ±0)`
-		// Minimum execution time: 58_304_000 picoseconds.
-		Weight::from_parts(60_138_785, 0)
-			.saturating_add(Weight::from_parts(0, 3790))
-			// Standard Error: 7_636
-			.saturating_add(Weight::from_parts(86_665, 0).saturating_mul(t.into()))
-			.saturating_add(T::DbWeight::get().reads(3))
-			.saturating_add(T::DbWeight::get().writes(3))
-			.saturating_add(Weight::from_parts(0, 112).saturating_mul(t.into()))
-	}
-	/// Storage: Tips Tips (r:1 w:1)
-	/// Proof Skipped: Tips Tips (max_values: None, max_size: None, mode: Measured)
-	/// Storage: Tips Reasons (r:0 w:1)
-	/// Proof Skipped: Tips Reasons (max_values: None, max_size: None, mode: Measured)
-	/// The range of component `t` is `[1, 19]`.
-	fn slash_tip(t: u32, ) -> Weight {
-		// Proof Size summary in bytes:
-		//  Measured:  `269`
-		//  Estimated: `3734`
-		// Minimum execution time: 15_097_000 picoseconds.
-		Weight::from_parts(15_497_872, 0)
-			.saturating_add(Weight::from_parts(0, 3734))
-			// Standard Error: 785
-			.saturating_add(Weight::from_parts(18_377, 0).saturating_mul(t.into()))
-			.saturating_add(T::DbWeight::get().reads(1))
-			.saturating_add(T::DbWeight::get().writes(2))
-	}
-}
diff --git a/polkadot/runtime/rococo/src/weights/pallet_treasury.rs b/polkadot/runtime/rococo/src/weights/pallet_treasury.rs
index 041d976d82570d711b409fdb4253b56eb45dc15b..144e9d5b872382b7381e2d77c6fb08a8fbece4fa 100644
--- a/polkadot/runtime/rococo/src/weights/pallet_treasury.rs
+++ b/polkadot/runtime/rococo/src/weights/pallet_treasury.rs
@@ -17,24 +17,24 @@
 //! Autogenerated weights for `pallet_treasury`
 //!
 //! THIS FILE WAS AUTO-GENERATED USING THE SUBSTRATE BENCHMARK CLI VERSION 4.0.0-dev
-//! DATE: 2023-05-26, STEPS: `50`, REPEAT: `20`, LOW RANGE: `[]`, HIGH RANGE: `[]`
+//! DATE: 2023-07-07, STEPS: `50`, REPEAT: `2`, LOW RANGE: `[]`, HIGH RANGE: `[]`
 //! WORST CASE MAP SIZE: `1000000`
-//! HOSTNAME: `bm5`, CPU: `Intel(R) Core(TM) i7-7700K CPU @ 4.20GHz`
-//! EXECUTION: Some(Wasm), WASM-EXECUTION: Compiled, CHAIN: Some("rococo-dev"), DB CACHE: 1024
+//! HOSTNAME: `cob`, CPU: `<UNKNOWN>`
+//! EXECUTION: None, WASM-EXECUTION: Compiled, CHAIN: Some("rococo-dev"), DB CACHE: 1024
 
 // Executed Command:
-// ./target/production/polkadot
+// ./target/debug/polkadot
 // benchmark
 // pallet
 // --chain=rococo-dev
 // --steps=50
-// --repeat=20
+// --repeat=2
 // --pallet=pallet_treasury
 // --extrinsic=*
-// --execution=wasm
 // --wasm-execution=compiled
-// --header=./file_header.txt
+// --heap-pages=4096
 // --output=./runtime/rococo/src/weights/
+// --header=./file_header.txt
 
 #![cfg_attr(rustfmt, rustfmt_skip)]
 #![allow(unused_parens)]
@@ -47,13 +47,21 @@ use core::marker::PhantomData;
 /// Weight functions for `pallet_treasury`.
 pub struct WeightInfo<T>(PhantomData<T>);
 impl<T: frame_system::Config> pallet_treasury::WeightInfo for WeightInfo<T> {
-	fn spend() -> Weight {
+	/// Storage: Treasury ProposalCount (r:1 w:1)
+	/// Proof: Treasury ProposalCount (max_values: Some(1), max_size: Some(4), added: 499, mode: MaxEncodedLen)
+	/// Storage: Treasury Approvals (r:1 w:1)
+	/// Proof: Treasury Approvals (max_values: Some(1), max_size: Some(402), added: 897, mode: MaxEncodedLen)
+	/// Storage: Treasury Proposals (r:0 w:1)
+	/// Proof: Treasury Proposals (max_values: None, max_size: Some(108), added: 2583, mode: MaxEncodedLen)
+	fn spend_local() -> Weight {
 		// Proof Size summary in bytes:
-		//  Measured:  `0`
-		//  Estimated: `0`
-		// Minimum execution time: 204_000 picoseconds.
-		Weight::from_parts(233_000, 0)
-			.saturating_add(Weight::from_parts(0, 0))
+		//  Measured:  `42`
+		//  Estimated: `1887`
+		// Minimum execution time: 177_000_000 picoseconds.
+		Weight::from_parts(191_000_000, 0)
+			.saturating_add(Weight::from_parts(0, 1887))
+			.saturating_add(T::DbWeight::get().reads(2))
+			.saturating_add(T::DbWeight::get().writes(3))
 	}
 	/// Storage: Treasury ProposalCount (r:1 w:1)
 	/// Proof: Treasury ProposalCount (max_values: Some(1), max_size: Some(4), added: 499, mode: MaxEncodedLen)
@@ -61,10 +69,10 @@ impl<T: frame_system::Config> pallet_treasury::WeightInfo for WeightInfo<T> {
 	/// Proof: Treasury Proposals (max_values: None, max_size: Some(108), added: 2583, mode: MaxEncodedLen)
 	fn propose_spend() -> Weight {
 		// Proof Size summary in bytes:
-		//  Measured:  `107`
+		//  Measured:  `143`
 		//  Estimated: `1489`
-		// Minimum execution time: 27_592_000 picoseconds.
-		Weight::from_parts(27_960_000, 0)
+		// Minimum execution time: 354_000_000 picoseconds.
+		Weight::from_parts(376_000_000, 0)
 			.saturating_add(Weight::from_parts(0, 1489))
 			.saturating_add(T::DbWeight::get().reads(1))
 			.saturating_add(T::DbWeight::get().writes(2))
@@ -75,10 +83,10 @@ impl<T: frame_system::Config> pallet_treasury::WeightInfo for WeightInfo<T> {
 	/// Proof: System Account (max_values: None, max_size: Some(128), added: 2603, mode: MaxEncodedLen)
 	fn reject_proposal() -> Weight {
 		// Proof Size summary in bytes:
-		//  Measured:  `265`
+		//  Measured:  `301`
 		//  Estimated: `3593`
-		// Minimum execution time: 40_336_000 picoseconds.
-		Weight::from_parts(41_085_000, 0)
+		// Minimum execution time: 547_000_000 picoseconds.
+		Weight::from_parts(550_000_000, 0)
 			.saturating_add(Weight::from_parts(0, 3593))
 			.saturating_add(T::DbWeight::get().reads(2))
 			.saturating_add(T::DbWeight::get().writes(2))
@@ -90,13 +98,13 @@ impl<T: frame_system::Config> pallet_treasury::WeightInfo for WeightInfo<T> {
 	/// The range of component `p` is `[0, 99]`.
 	fn approve_proposal(p: u32, ) -> Weight {
 		// Proof Size summary in bytes:
-		//  Measured:  `433 + p * (8 ±0)`
+		//  Measured:  `470 + p * (8 ±0)`
 		//  Estimated: `3573`
-		// Minimum execution time: 9_938_000 picoseconds.
-		Weight::from_parts(12_061_206, 0)
+		// Minimum execution time: 104_000_000 picoseconds.
+		Weight::from_parts(121_184_402, 0)
 			.saturating_add(Weight::from_parts(0, 3573))
-			// Standard Error: 801
-			.saturating_add(Weight::from_parts(26_602, 0).saturating_mul(p.into()))
+			// Standard Error: 42_854
+			.saturating_add(Weight::from_parts(153_112, 0).saturating_mul(p.into()))
 			.saturating_add(T::DbWeight::get().reads(2))
 			.saturating_add(T::DbWeight::get().writes(1))
 	}
@@ -104,10 +112,10 @@ impl<T: frame_system::Config> pallet_treasury::WeightInfo for WeightInfo<T> {
 	/// Proof: Treasury Approvals (max_values: Some(1), max_size: Some(402), added: 897, mode: MaxEncodedLen)
 	fn remove_approval() -> Weight {
 		// Proof Size summary in bytes:
-		//  Measured:  `90`
+		//  Measured:  `127`
 		//  Estimated: `1887`
-		// Minimum execution time: 7_421_000 picoseconds.
-		Weight::from_parts(7_620_000, 0)
+		// Minimum execution time: 80_000_000 picoseconds.
+		Weight::from_parts(82_000_000, 0)
 			.saturating_add(Weight::from_parts(0, 1887))
 			.saturating_add(T::DbWeight::get().reads(1))
 			.saturating_add(T::DbWeight::get().writes(1))
@@ -118,26 +126,98 @@ impl<T: frame_system::Config> pallet_treasury::WeightInfo for WeightInfo<T> {
 	/// Proof: Balances InactiveIssuance (max_values: Some(1), max_size: Some(16), added: 511, mode: MaxEncodedLen)
 	/// Storage: Treasury Approvals (r:1 w:1)
 	/// Proof: Treasury Approvals (max_values: Some(1), max_size: Some(402), added: 897, mode: MaxEncodedLen)
-	/// Storage: Treasury Proposals (r:100 w:100)
+	/// Storage: Treasury Proposals (r:99 w:99)
 	/// Proof: Treasury Proposals (max_values: None, max_size: Some(108), added: 2583, mode: MaxEncodedLen)
-	/// Storage: System Account (r:201 w:201)
+	/// Storage: System Account (r:199 w:199)
 	/// Proof: System Account (max_values: None, max_size: Some(128), added: 2603, mode: MaxEncodedLen)
 	/// Storage: Bounties BountyApprovals (r:1 w:1)
 	/// Proof: Bounties BountyApprovals (max_values: Some(1), max_size: Some(402), added: 897, mode: MaxEncodedLen)
-	/// The range of component `p` is `[0, 100]`.
+	/// The range of component `p` is `[0, 99]`.
 	fn on_initialize_proposals(p: u32, ) -> Weight {
 		// Proof Size summary in bytes:
-		//  Measured:  `296 + p * (251 ±0)`
+		//  Measured:  `331 + p * (251 ±0)`
 		//  Estimated: `3593 + p * (5206 ±0)`
-		// Minimum execution time: 62_706_000 picoseconds.
-		Weight::from_parts(61_351_470, 0)
+		// Minimum execution time: 887_000_000 picoseconds.
+		Weight::from_parts(828_616_021, 0)
 			.saturating_add(Weight::from_parts(0, 3593))
-			// Standard Error: 32_787
-			.saturating_add(Weight::from_parts(37_873_920, 0).saturating_mul(p.into()))
+			// Standard Error: 695_351
+			.saturating_add(Weight::from_parts(566_114_524, 0).saturating_mul(p.into()))
 			.saturating_add(T::DbWeight::get().reads(5))
 			.saturating_add(T::DbWeight::get().reads((3_u64).saturating_mul(p.into())))
 			.saturating_add(T::DbWeight::get().writes(5))
 			.saturating_add(T::DbWeight::get().writes((3_u64).saturating_mul(p.into())))
 			.saturating_add(Weight::from_parts(0, 5206).saturating_mul(p.into()))
 	}
+	/// Storage: AssetRate ConversionRateToNative (r:1 w:0)
+	/// Proof: AssetRate ConversionRateToNative (max_values: None, max_size: Some(1237), added: 3712, mode: MaxEncodedLen)
+	/// Storage: Treasury SpendCount (r:1 w:1)
+	/// Proof: Treasury SpendCount (max_values: Some(1), max_size: Some(4), added: 499, mode: MaxEncodedLen)
+	/// Storage: Treasury Spends (r:0 w:1)
+	/// Proof: Treasury Spends (max_values: None, max_size: Some(1848), added: 4323, mode: MaxEncodedLen)
+	fn spend() -> Weight {
+		// Proof Size summary in bytes:
+		//  Measured:  `114`
+		//  Estimated: `4702`
+		// Minimum execution time: 208_000_000 picoseconds.
+		Weight::from_parts(222_000_000, 0)
+			.saturating_add(Weight::from_parts(0, 4702))
+			.saturating_add(T::DbWeight::get().reads(2))
+			.saturating_add(T::DbWeight::get().writes(2))
+	}
+	/// Storage: Treasury Spends (r:1 w:1)
+	/// Proof: Treasury Spends (max_values: None, max_size: Some(1848), added: 4323, mode: MaxEncodedLen)
+	/// Storage: XcmPallet QueryCounter (r:1 w:1)
+	/// Proof Skipped: XcmPallet QueryCounter (max_values: Some(1), max_size: None, mode: Measured)
+	/// Storage: Configuration ActiveConfig (r:1 w:0)
+	/// Proof Skipped: Configuration ActiveConfig (max_values: Some(1), max_size: None, mode: Measured)
+	/// Storage: Dmp DeliveryFeeFactor (r:1 w:0)
+	/// Proof Skipped: Dmp DeliveryFeeFactor (max_values: None, max_size: None, mode: Measured)
+	/// Storage: XcmPallet SupportedVersion (r:1 w:0)
+	/// Proof Skipped: XcmPallet SupportedVersion (max_values: None, max_size: None, mode: Measured)
+	/// Storage: XcmPallet VersionDiscoveryQueue (r:1 w:1)
+	/// Proof Skipped: XcmPallet VersionDiscoveryQueue (max_values: Some(1), max_size: None, mode: Measured)
+	/// Storage: XcmPallet SafeXcmVersion (r:1 w:0)
+	/// Proof Skipped: XcmPallet SafeXcmVersion (max_values: Some(1), max_size: None, mode: Measured)
+	/// Storage: Dmp DownwardMessageQueues (r:1 w:1)
+	/// Proof Skipped: Dmp DownwardMessageQueues (max_values: None, max_size: None, mode: Measured)
+	/// Storage: Dmp DownwardMessageQueueHeads (r:1 w:1)
+	/// Proof Skipped: Dmp DownwardMessageQueueHeads (max_values: None, max_size: None, mode: Measured)
+	/// Storage: XcmPallet Queries (r:0 w:1)
+	/// Proof Skipped: XcmPallet Queries (max_values: None, max_size: None, mode: Measured)
+	fn payout() -> Weight {
+		// Proof Size summary in bytes:
+		//  Measured:  `737`
+		//  Estimated: `5313`
+		// Minimum execution time: 551_000_000 picoseconds.
+		Weight::from_parts(569_000_000, 0)
+			.saturating_add(Weight::from_parts(0, 5313))
+			.saturating_add(T::DbWeight::get().reads(9))
+			.saturating_add(T::DbWeight::get().writes(6))
+	}
+	/// Storage: Treasury Spends (r:1 w:1)
+	/// Proof: Treasury Spends (max_values: None, max_size: Some(1848), added: 4323, mode: MaxEncodedLen)
+	/// Storage: XcmPallet Queries (r:1 w:1)
+	/// Proof Skipped: XcmPallet Queries (max_values: None, max_size: None, mode: Measured)
+	fn check_status() -> Weight {
+		// Proof Size summary in bytes:
+		//  Measured:  `442`
+		//  Estimated: `5313`
+		// Minimum execution time: 245_000_000 picoseconds.
+		Weight::from_parts(281_000_000, 0)
+			.saturating_add(Weight::from_parts(0, 5313))
+			.saturating_add(T::DbWeight::get().reads(2))
+			.saturating_add(T::DbWeight::get().writes(2))
+	}
+	/// Storage: Treasury Spends (r:1 w:1)
+	/// Proof: Treasury Spends (max_values: None, max_size: Some(1848), added: 4323, mode: MaxEncodedLen)
+	fn void_spend() -> Weight {
+		// Proof Size summary in bytes:
+		//  Measured:  `172`
+		//  Estimated: `5313`
+		// Minimum execution time: 147_000_000 picoseconds.
+		Weight::from_parts(160_000_000, 0)
+			.saturating_add(Weight::from_parts(0, 5313))
+			.saturating_add(T::DbWeight::get().reads(1))
+			.saturating_add(T::DbWeight::get().writes(1))
+	}
 }
diff --git a/polkadot/runtime/kusama/src/weights/pallet_whitelist.rs b/polkadot/runtime/rococo/src/weights/pallet_whitelist.rs
similarity index 50%
rename from polkadot/runtime/kusama/src/weights/pallet_whitelist.rs
rename to polkadot/runtime/rococo/src/weights/pallet_whitelist.rs
index fe2d317651a028294d4d70d94b97896d1bcb5edb..7c307deec4c6f8480019b5559117cfc47ee84b40 100644
--- a/polkadot/runtime/kusama/src/weights/pallet_whitelist.rs
+++ b/polkadot/runtime/rococo/src/weights/pallet_whitelist.rs
@@ -17,27 +17,25 @@
 //! Autogenerated weights for `pallet_whitelist`
 //!
 //! THIS FILE WAS AUTO-GENERATED USING THE SUBSTRATE BENCHMARK CLI VERSION 4.0.0-dev
-//! DATE: 2023-06-19, STEPS: `50`, REPEAT: `20`, LOW RANGE: `[]`, HIGH RANGE: `[]`
+//! DATE: 2023-08-25, STEPS: `50`, REPEAT: `20`, LOW RANGE: `[]`, HIGH RANGE: `[]`
 //! WORST CASE MAP SIZE: `1000000`
-//! HOSTNAME: `runner-e8ezs4ez-project-163-concurrent-0`, CPU: `Intel(R) Xeon(R) CPU @ 2.60GHz`
-//! EXECUTION: Some(Wasm), WASM-EXECUTION: Compiled, CHAIN: Some("kusama-dev"), DB CACHE: 1024
+//! HOSTNAME: `runner-aahe6cbd-project-163-concurrent-0`, 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
-// --chain=kusama-dev
 // --steps=50
 // --repeat=20
-// --no-storage-info
-// --no-median-slopes
-// --no-min-squares
-// --pallet=pallet_whitelist
 // --extrinsic=*
-// --execution=wasm
 // --wasm-execution=compiled
+// --heap-pages=4096
+// --json-file=/builds/parity/mirrors/polkadot/.git/.artifacts/bench.json
+// --pallet=pallet_whitelist
+// --chain=rococo-dev
 // --header=./file_header.txt
-// --output=./runtime/kusama/src/weights/
+// --output=./runtime/rococo/src/weights/
 
 #![cfg_attr(rustfmt, rustfmt_skip)]
 #![allow(unused_parens)]
@@ -50,68 +48,68 @@ use core::marker::PhantomData;
 /// Weight functions for `pallet_whitelist`.
 pub struct WeightInfo<T>(PhantomData<T>);
 impl<T: frame_system::Config> pallet_whitelist::WeightInfo for WeightInfo<T> {
-	/// Storage: Whitelist WhitelistedCall (r:1 w:1)
-	/// Proof: Whitelist WhitelistedCall (max_values: None, max_size: Some(40), added: 2515, mode: MaxEncodedLen)
-	/// Storage: Preimage StatusFor (r:1 w:1)
-	/// Proof: Preimage StatusFor (max_values: None, max_size: Some(91), added: 2566, mode: MaxEncodedLen)
+	/// Storage: `Whitelist::WhitelistedCall` (r:1 w:1)
+	/// Proof: `Whitelist::WhitelistedCall` (`max_values`: None, `max_size`: Some(40), added: 2515, mode: `MaxEncodedLen`)
+	/// Storage: `Preimage::StatusFor` (r:1 w:1)
+	/// Proof: `Preimage::StatusFor` (`max_values`: None, `max_size`: Some(91), added: 2566, mode: `MaxEncodedLen`)
 	fn whitelist_call() -> Weight {
 		// Proof Size summary in bytes:
-		//  Measured:  `118`
+		//  Measured:  `223`
 		//  Estimated: `3556`
-		// Minimum execution time: 19_893_000 picoseconds.
-		Weight::from_parts(20_176_000, 0)
+		// Minimum execution time: 20_035_000 picoseconds.
+		Weight::from_parts(20_452_000, 0)
 			.saturating_add(Weight::from_parts(0, 3556))
 			.saturating_add(T::DbWeight::get().reads(2))
 			.saturating_add(T::DbWeight::get().writes(2))
 	}
-	/// Storage: Whitelist WhitelistedCall (r:1 w:1)
-	/// Proof: Whitelist WhitelistedCall (max_values: None, max_size: Some(40), added: 2515, mode: MaxEncodedLen)
-	/// Storage: Preimage StatusFor (r:1 w:1)
-	/// Proof: Preimage StatusFor (max_values: None, max_size: Some(91), added: 2566, mode: MaxEncodedLen)
+	/// Storage: `Whitelist::WhitelistedCall` (r:1 w:1)
+	/// Proof: `Whitelist::WhitelistedCall` (`max_values`: None, `max_size`: Some(40), added: 2515, mode: `MaxEncodedLen`)
+	/// Storage: `Preimage::StatusFor` (r:1 w:1)
+	/// Proof: `Preimage::StatusFor` (`max_values`: None, `max_size`: Some(91), added: 2566, mode: `MaxEncodedLen`)
 	fn remove_whitelisted_call() -> Weight {
 		// Proof Size summary in bytes:
-		//  Measured:  `247`
+		//  Measured:  `352`
 		//  Estimated: `3556`
-		// Minimum execution time: 17_393_000 picoseconds.
-		Weight::from_parts(18_076_000, 0)
+		// Minimum execution time: 20_247_000 picoseconds.
+		Weight::from_parts(20_808_000, 0)
 			.saturating_add(Weight::from_parts(0, 3556))
 			.saturating_add(T::DbWeight::get().reads(2))
 			.saturating_add(T::DbWeight::get().writes(2))
 	}
-	/// Storage: Whitelist WhitelistedCall (r:1 w:1)
-	/// Proof: Whitelist WhitelistedCall (max_values: None, max_size: Some(40), added: 2515, mode: MaxEncodedLen)
-	/// Storage: Preimage PreimageFor (r:1 w:1)
-	/// Proof: Preimage PreimageFor (max_values: None, max_size: Some(4194344), added: 4196819, mode: Measured)
-	/// Storage: Preimage StatusFor (r:1 w:1)
-	/// Proof: Preimage StatusFor (max_values: None, max_size: Some(91), added: 2566, mode: MaxEncodedLen)
+	/// Storage: `Whitelist::WhitelistedCall` (r:1 w:1)
+	/// Proof: `Whitelist::WhitelistedCall` (`max_values`: None, `max_size`: Some(40), added: 2515, mode: `MaxEncodedLen`)
+	/// Storage: `Preimage::PreimageFor` (r:1 w:1)
+	/// Proof: `Preimage::PreimageFor` (`max_values`: None, `max_size`: Some(4194344), added: 4196819, mode: `Measured`)
+	/// Storage: `Preimage::StatusFor` (r:1 w:1)
+	/// Proof: `Preimage::StatusFor` (`max_values`: None, `max_size`: Some(91), added: 2566, mode: `MaxEncodedLen`)
 	/// The range of component `n` is `[1, 4194294]`.
 	fn dispatch_whitelisted_call(n: u32, ) -> Weight {
 		// Proof Size summary in bytes:
-		//  Measured:  `323 + n * (1 ±0)`
-		//  Estimated: `3787 + n * (1 ±0)`
-		// Minimum execution time: 29_485_000 picoseconds.
-		Weight::from_parts(29_730_000, 0)
-			.saturating_add(Weight::from_parts(0, 3787))
-			// Standard Error: 8
-			.saturating_add(Weight::from_parts(1_530, 0).saturating_mul(n.into()))
+		//  Measured:  `428 + n * (1 ±0)`
+		//  Estimated: `3892 + n * (1 ±0)`
+		// Minimum execution time: 32_633_000 picoseconds.
+		Weight::from_parts(32_855_000, 0)
+			.saturating_add(Weight::from_parts(0, 3892))
+			// Standard Error: 1
+			.saturating_add(Weight::from_parts(1_223, 0).saturating_mul(n.into()))
 			.saturating_add(T::DbWeight::get().reads(3))
 			.saturating_add(T::DbWeight::get().writes(3))
 			.saturating_add(Weight::from_parts(0, 1).saturating_mul(n.into()))
 	}
-	/// Storage: Whitelist WhitelistedCall (r:1 w:1)
-	/// Proof: Whitelist WhitelistedCall (max_values: None, max_size: Some(40), added: 2515, mode: MaxEncodedLen)
-	/// Storage: Preimage StatusFor (r:1 w:1)
-	/// Proof: Preimage StatusFor (max_values: None, max_size: Some(91), added: 2566, mode: MaxEncodedLen)
+	/// Storage: `Whitelist::WhitelistedCall` (r:1 w:1)
+	/// Proof: `Whitelist::WhitelistedCall` (`max_values`: None, `max_size`: Some(40), added: 2515, mode: `MaxEncodedLen`)
+	/// Storage: `Preimage::StatusFor` (r:1 w:1)
+	/// Proof: `Preimage::StatusFor` (`max_values`: None, `max_size`: Some(91), added: 2566, mode: `MaxEncodedLen`)
 	/// The range of component `n` is `[1, 10000]`.
 	fn dispatch_whitelisted_call_with_preimage(n: u32, ) -> Weight {
 		// Proof Size summary in bytes:
-		//  Measured:  `247`
+		//  Measured:  `352`
 		//  Estimated: `3556`
-		// Minimum execution time: 21_190_000 picoseconds.
-		Weight::from_parts(21_802_426, 0)
+		// Minimum execution time: 23_833_000 picoseconds.
+		Weight::from_parts(24_698_994, 0)
 			.saturating_add(Weight::from_parts(0, 3556))
-			// Standard Error: 2
-			.saturating_add(Weight::from_parts(1_465, 0).saturating_mul(n.into()))
+			// Standard Error: 4
+			.saturating_add(Weight::from_parts(1_454, 0).saturating_mul(n.into()))
 			.saturating_add(T::DbWeight::get().reads(2))
 			.saturating_add(T::DbWeight::get().writes(2))
 	}
diff --git a/polkadot/runtime/rococo/src/weights/runtime_parachains_hrmp.rs b/polkadot/runtime/rococo/src/weights/runtime_parachains_hrmp.rs
index 9f1cf65efa649972f111be4029b00ca40c7554da..417820e6627f6e39c4107df722f4b83f9cca6a4b 100644
--- a/polkadot/runtime/rococo/src/weights/runtime_parachains_hrmp.rs
+++ b/polkadot/runtime/rococo/src/weights/runtime_parachains_hrmp.rs
@@ -289,4 +289,46 @@ impl<T: frame_system::Config> runtime_parachains::hrmp::WeightInfo for WeightInf
 			.saturating_add(T::DbWeight::get().reads(14))
 			.saturating_add(T::DbWeight::get().writes(8))
 	}
+	/// Storage: `Paras::ParaLifecycles` (r:1 w:0)
+	/// Proof: `Paras::ParaLifecycles` (`max_values`: None, `max_size`: None, mode: `Measured`)
+	/// Storage: `Hrmp::HrmpOpenChannelRequests` (r:1 w:1)
+	/// Proof: `Hrmp::HrmpOpenChannelRequests` (`max_values`: None, `max_size`: None, mode: `Measured`)
+	/// Storage: `Hrmp::HrmpChannels` (r:1 w:0)
+	/// Proof: `Hrmp::HrmpChannels` (`max_values`: None, `max_size`: None, mode: `Measured`)
+	/// Storage: `Hrmp::HrmpEgressChannelsIndex` (r:1 w:0)
+	/// Proof: `Hrmp::HrmpEgressChannelsIndex` (`max_values`: None, `max_size`: None, mode: `Measured`)
+	/// Storage: `Hrmp::HrmpOpenChannelRequestCount` (r:1 w:1)
+	/// Proof: `Hrmp::HrmpOpenChannelRequestCount` (`max_values`: None, `max_size`: None, mode: `Measured`)
+	/// Storage: `Hrmp::HrmpOpenChannelRequestsList` (r:1 w:1)
+	/// Proof: `Hrmp::HrmpOpenChannelRequestsList` (`max_values`: Some(1), `max_size`: None, mode: `Measured`)
+	/// Storage: `Dmp::DownwardMessageQueues` (r:2 w:2)
+	/// Proof: `Dmp::DownwardMessageQueues` (`max_values`: None, `max_size`: None, mode: `Measured`)
+	/// Storage: `Dmp::DownwardMessageQueueHeads` (r:2 w:2)
+	/// Proof: `Dmp::DownwardMessageQueueHeads` (`max_values`: None, `max_size`: None, mode: `Measured`)
+	/// Storage: `Hrmp::HrmpIngressChannelsIndex` (r:1 w:0)
+	/// Proof: `Hrmp::HrmpIngressChannelsIndex` (`max_values`: None, `max_size`: None, mode: `Measured`)
+	/// Storage: `Hrmp::HrmpAcceptedChannelRequestCount` (r:1 w:1)
+	/// Proof: `Hrmp::HrmpAcceptedChannelRequestCount` (`max_values`: None, `max_size`: None, mode: `Measured`)
+	fn establish_system_channel() -> Weight {
+		// Proof Size summary in bytes:
+		//  Measured:  `417`
+		//  Estimated: `6357`
+		// Minimum execution time: 629_674_000 picoseconds.
+		Weight::from_parts(640_174_000, 0)
+			.saturating_add(Weight::from_parts(0, 6357))
+			.saturating_add(T::DbWeight::get().reads(12))
+			.saturating_add(T::DbWeight::get().writes(8))
+	}
+	/// Storage: `Hrmp::HrmpChannels` (r:1 w:1)
+	/// Proof: `Hrmp::HrmpChannels` (`max_values`: None, `max_size`: None, mode: `Measured`)
+	fn poke_channel_deposits() -> Weight {
+		// Proof Size summary in bytes:
+		//  Measured:  `263`
+		//  Estimated: `3728`
+		// Minimum execution time: 173_371_000 picoseconds.
+		Weight::from_parts(175_860_000, 0)
+			.saturating_add(Weight::from_parts(0, 3728))
+			.saturating_add(T::DbWeight::get().reads(1))
+			.saturating_add(T::DbWeight::get().writes(1))
+	}
 }
diff --git a/polkadot/runtime/rococo/src/weights/xcm/mod.rs b/polkadot/runtime/rococo/src/weights/xcm/mod.rs
index 1d613717dc52798ece0ac9c484b8f91b66f53803..cc485dfbaf7e4e29fe7fdd50960490bc9c05665c 100644
--- a/polkadot/runtime/rococo/src/weights/xcm/mod.rs
+++ b/polkadot/runtime/rococo/src/weights/xcm/mod.rs
@@ -91,7 +91,6 @@ impl<RuntimeCall> XcmWeightInfo<RuntimeCall> for RococoXcmWeight<RuntimeCall> {
 		assets.weigh_multi_assets(XcmBalancesWeight::<Runtime>::withdraw_asset())
 	}
 	fn reserve_asset_deposited(assets: &MultiAssets) -> Weight {
-		// Rococo doesn't support ReserveAssetDeposited, so this benchmark has a default weight
 		assets.weigh_multi_assets(XcmBalancesWeight::<Runtime>::reserve_asset_deposited())
 	}
 	fn receive_teleported_asset(assets: &MultiAssets) -> Weight {
diff --git a/polkadot/runtime/rococo/src/weights/xcm/pallet_xcm_benchmarks_fungible.rs b/polkadot/runtime/rococo/src/weights/xcm/pallet_xcm_benchmarks_fungible.rs
index 59c49e4f8c821beb00a9493ad7b07928cfe6daf9..60c40429b1ac323e69bca1345c41c3c04c221f79 100644
--- a/polkadot/runtime/rococo/src/weights/xcm/pallet_xcm_benchmarks_fungible.rs
+++ b/polkadot/runtime/rococo/src/weights/xcm/pallet_xcm_benchmarks_fungible.rs
@@ -17,10 +17,10 @@
 //! Autogenerated weights for `pallet_xcm_benchmarks::fungible`
 //!
 //! THIS FILE WAS AUTO-GENERATED USING THE SUBSTRATE BENCHMARK CLI VERSION 4.0.0-dev
-//! DATE: 2023-07-17, STEPS: `50`, REPEAT: `20`, LOW RANGE: `[]`, HIGH RANGE: `[]`
+//! DATE: 2023-09-28, STEPS: `50`, REPEAT: `20`, LOW RANGE: `[]`, HIGH RANGE: `[]`
 //! WORST CASE MAP SIZE: `1000000`
-//! HOSTNAME: `runner-gghbxkbs-project-163-concurrent-0`, CPU: `Intel(R) Xeon(R) CPU @ 2.60GHz`
-//! EXECUTION: , WASM-EXECUTION: Compiled, CHAIN: Some("rococo-dev"), DB CACHE: 1024
+//! HOSTNAME: `runner-nbnwcyh-project-674-concurrent-0`, CPU: `Intel(R) Xeon(R) CPU @ 2.60GHz`
+//! WASM-EXECUTION: Compiled, CHAIN: Some("rococo-dev"), DB CACHE: 1024
 
 // Executed Command:
 // target/production/polkadot
@@ -31,12 +31,12 @@
 // --extrinsic=*
 // --wasm-execution=compiled
 // --heap-pages=4096
-// --json-file=/builds/parity/mirrors/polkadot/.git/.artifacts/bench.json
+// --json-file=/builds/parity/mirrors/polkadot-sdk/.git/.artifacts/bench.json
 // --pallet=pallet_xcm_benchmarks::fungible
 // --chain=rococo-dev
-// --header=./file_header.txt
-// --template=./xcm/pallet-xcm-benchmarks/template.hbs
-// --output=./runtime/rococo/src/weights/xcm/
+// --header=./polkadot/file_header.txt
+// --template=./polkadot/xcm/pallet-xcm-benchmarks/template.hbs
+// --output=./polkadot/runtime/rococo/src/weights/xcm/
 
 #![cfg_attr(rustfmt, rustfmt_skip)]
 #![allow(unused_parens)]
@@ -55,8 +55,8 @@ impl<T: frame_system::Config> WeightInfo<T> {
 		// Proof Size summary in bytes:
 		//  Measured:  `101`
 		//  Estimated: `3593`
-		// Minimum execution time: 24_892_000 picoseconds.
-		Weight::from_parts(25_219_000, 3593)
+		// Minimum execution time: 23_189_000 picoseconds.
+		Weight::from_parts(23_896_000, 3593)
 			.saturating_add(T::DbWeight::get().reads(1))
 			.saturating_add(T::DbWeight::get().writes(1))
 	}
@@ -66,8 +66,8 @@ impl<T: frame_system::Config> WeightInfo<T> {
 		// Proof Size summary in bytes:
 		//  Measured:  `101`
 		//  Estimated: `6196`
-		// Minimum execution time: 52_112_000 picoseconds.
-		Weight::from_parts(53_104_000, 6196)
+		// Minimum execution time: 50_299_000 picoseconds.
+		Weight::from_parts(50_962_000, 6196)
 			.saturating_add(T::DbWeight::get().reads(2))
 			.saturating_add(T::DbWeight::get().writes(2))
 	}
@@ -83,10 +83,10 @@ impl<T: frame_system::Config> WeightInfo<T> {
 	/// Proof: `Dmp::DownwardMessageQueueHeads` (`max_values`: None, `max_size`: None, mode: `Measured`)
 	pub(crate) fn transfer_reserve_asset() -> Weight {
 		// Proof Size summary in bytes:
-		//  Measured:  `210`
+		//  Measured:  `243`
 		//  Estimated: `6196`
-		// Minimum execution time: 76_459_000 picoseconds.
-		Weight::from_parts(79_152_000, 6196)
+		// Minimum execution time: 71_748_000 picoseconds.
+		Weight::from_parts(74_072_000, 6196)
 			.saturating_add(T::DbWeight::get().reads(6))
 			.saturating_add(T::DbWeight::get().writes(4))
 	}
@@ -96,8 +96,8 @@ impl<T: frame_system::Config> WeightInfo<T> {
 		// Proof Size summary in bytes:
 		//  Measured:  `0`
 		//  Estimated: `0`
-		// Minimum execution time: 2_000_000_000_000 picoseconds.
-		Weight::from_parts(2_000_000_000_000, 0)
+		// Minimum execution time: 18_446_744_073_709_551_000 picoseconds.
+		Weight::from_parts(18_446_744_073_709_551_000, 0)
 	}
 	/// Storage: `Dmp::DeliveryFeeFactor` (r:1 w:0)
 	/// Proof: `Dmp::DeliveryFeeFactor` (`max_values`: None, `max_size`: None, mode: `Measured`)
@@ -109,10 +109,10 @@ impl<T: frame_system::Config> WeightInfo<T> {
 	/// Proof: `Dmp::DownwardMessageQueueHeads` (`max_values`: None, `max_size`: None, mode: `Measured`)
 	pub(crate) fn initiate_reserve_withdraw() -> Weight {
 		// Proof Size summary in bytes:
-		//  Measured:  `109`
-		//  Estimated: `3574`
-		// Minimum execution time: 29_734_000 picoseconds.
-		Weight::from_parts(30_651_000, 3574)
+		//  Measured:  `142`
+		//  Estimated: `3607`
+		// Minimum execution time: 27_806_000 picoseconds.
+		Weight::from_parts(28_594_000, 3607)
 			.saturating_add(T::DbWeight::get().reads(4))
 			.saturating_add(T::DbWeight::get().writes(2))
 	}
@@ -122,8 +122,8 @@ impl<T: frame_system::Config> WeightInfo<T> {
 		// Proof Size summary in bytes:
 		//  Measured:  `103`
 		//  Estimated: `3593`
-		// Minimum execution time: 23_028_000 picoseconds.
-		Weight::from_parts(23_687_000, 3593)
+		// Minimum execution time: 21_199_000 picoseconds.
+		Weight::from_parts(21_857_000, 3593)
 			.saturating_add(T::DbWeight::get().reads(1))
 			.saturating_add(T::DbWeight::get().writes(1))
 	}
@@ -133,8 +133,8 @@ impl<T: frame_system::Config> WeightInfo<T> {
 		// Proof Size summary in bytes:
 		//  Measured:  `0`
 		//  Estimated: `3593`
-		// Minimum execution time: 26_399_000 picoseconds.
-		Weight::from_parts(27_262_000, 3593)
+		// Minimum execution time: 23_578_000 picoseconds.
+		Weight::from_parts(24_060_000, 3593)
 			.saturating_add(T::DbWeight::get().reads(1))
 			.saturating_add(T::DbWeight::get().writes(1))
 	}
@@ -150,10 +150,10 @@ impl<T: frame_system::Config> WeightInfo<T> {
 	/// Proof: `Dmp::DownwardMessageQueueHeads` (`max_values`: None, `max_size`: None, mode: `Measured`)
 	pub(crate) fn deposit_reserve_asset() -> Weight {
 		// Proof Size summary in bytes:
-		//  Measured:  `109`
-		//  Estimated: `3593`
-		// Minimum execution time: 52_015_000 picoseconds.
-		Weight::from_parts(53_498_000, 3593)
+		//  Measured:  `142`
+		//  Estimated: `3607`
+		// Minimum execution time: 48_522_000 picoseconds.
+		Weight::from_parts(49_640_000, 3607)
 			.saturating_add(T::DbWeight::get().reads(5))
 			.saturating_add(T::DbWeight::get().writes(3))
 	}
@@ -169,10 +169,10 @@ impl<T: frame_system::Config> WeightInfo<T> {
 	/// Proof: `Dmp::DownwardMessageQueueHeads` (`max_values`: None, `max_size`: None, mode: `Measured`)
 	pub(crate) fn initiate_teleport() -> Weight {
 		// Proof Size summary in bytes:
-		//  Measured:  `109`
-		//  Estimated: `3593`
-		// Minimum execution time: 53_833_000 picoseconds.
-		Weight::from_parts(55_688_000, 3593)
+		//  Measured:  `142`
+		//  Estimated: `3607`
+		// Minimum execution time: 50_429_000 picoseconds.
+		Weight::from_parts(51_295_000, 3607)
 			.saturating_add(T::DbWeight::get().reads(5))
 			.saturating_add(T::DbWeight::get().writes(3))
 	}
diff --git a/polkadot/runtime/rococo/src/xcm_config.rs b/polkadot/runtime/rococo/src/xcm_config.rs
index 356cffaa0ba2b6582582c1bdc2e48f5dbe6bb951..b84d2335a6990e7c4e92093c5cff68e4f1c266b3 100644
--- a/polkadot/runtime/rococo/src/xcm_config.rs
+++ b/polkadot/runtime/rococo/src/xcm_config.rs
@@ -17,18 +17,20 @@
 //! XCM configuration for Rococo.
 
 use super::{
-	parachains_origin, AccountId, AllPalletsWithSystem, Balances, Dmp, ParaId, Runtime,
+	parachains_origin, AccountId, AllPalletsWithSystem, Balances, Dmp, Fellows, ParaId, Runtime,
 	RuntimeCall, RuntimeEvent, RuntimeOrigin, TransactionByteFee, WeightToFee, XcmPallet,
 };
+
+use crate::governance::StakingAdmin;
+
 use frame_support::{
 	match_types, parameter_types,
-	traits::{Contains, Everything, Nothing},
+	traits::{Everything, Nothing},
 	weights::Weight,
 };
 use frame_system::EnsureRoot;
 use rococo_runtime_constants::currency::CENTS;
 use runtime_common::{
-	crowdloan, paras_registrar,
 	xcm_sender::{ChildParachainRouter, ExponentialPrice},
 	ToAuthor,
 };
@@ -37,13 +39,13 @@ use xcm::latest::prelude::*;
 use xcm_builder::{
 	AccountId32Aliases, AllowExplicitUnpaidExecutionFrom, AllowKnownQueryResponses,
 	AllowSubscriptionsFrom, AllowTopLevelPaidExecutionFrom, ChildParachainAsNative,
-	ChildParachainConvertsVia, ChildSystemParachainAsSuperuser,
-	CurrencyAdapter as XcmCurrencyAdapter, FixedWeightBounds, IsChildSystemParachain, IsConcrete,
-	MintLocation, SignedAccountId32AsNative, SignedToAccountId32, SovereignSignedViaLocation,
-	TakeWeightCredit, TrailingSetTopicAsId, UsingComponents, WeightInfoBounds, WithComputedOrigin,
-	WithUniqueTopic,
+	ChildParachainConvertsVia, CurrencyAdapter as XcmCurrencyAdapter, DescribeBodyTerminal,
+	DescribeFamily, FixedWeightBounds, HashedDescription, IsChildSystemParachain, IsConcrete,
+	MintLocation, OriginToPluralityVoice, SignedAccountId32AsNative, SignedToAccountId32,
+	SovereignSignedViaLocation, TakeWeightCredit, TrailingSetTopicAsId, UsingComponents,
+	WeightInfoBounds, WithComputedOrigin, WithUniqueTopic,
 };
-use xcm_executor::{traits::WithOriginFilter, XcmExecutor};
+use xcm_executor::XcmExecutor;
 
 parameter_types! {
 	pub const TokenLocation: MultiLocation = Here.into_location();
@@ -53,8 +55,14 @@ parameter_types! {
 	pub LocalCheckAccount: (AccountId, MintLocation) = (CheckAccount::get(), MintLocation::Local);
 }
 
-pub type LocationConverter =
-	(ChildParachainConvertsVia<ParaId, AccountId>, AccountId32Aliases<ThisNetwork, AccountId>);
+pub type LocationConverter = (
+	// We can convert a child parachain using the standard `AccountId` conversion.
+	ChildParachainConvertsVia<ParaId, AccountId>,
+	// We can directly alias an `AccountId32` into a local account.
+	AccountId32Aliases<ThisNetwork, AccountId>,
+	// Allow governance body to be used as a sovereign account.
+	HashedDescription<AccountId, DescribeFamily<DescribeBodyTerminal>>,
+);
 
 /// Our asset transactor. This is what allows us to interest with the runtime facilities from the
 /// point of view of XCM-only concepts like `MultiLocation` and `MultiAsset`.
@@ -81,8 +89,6 @@ type LocalOriginConverter = (
 	ChildParachainAsNative<parachains_origin::Origin, RuntimeOrigin>,
 	// The AccountId32 location type can be expressed natively as a `Signed` origin.
 	SignedAccountId32AsNative<ThisNetwork, RuntimeOrigin>,
-	// A system child parachain, expressed as a Superuser, converts to the `Root` origin.
-	ChildSystemParachainAsSuperuser<ParaId, RuntimeOrigin>,
 );
 
 parameter_types! {
@@ -107,7 +113,7 @@ pub type XcmRouter = WithUniqueTopic<(
 
 parameter_types! {
 	pub const Roc: MultiAssetFilter = Wild(AllOf { fun: WildFungible, id: Concrete(TokenLocation::get()) });
-	pub const Rockmine: MultiLocation = Parachain(1000).into_location();
+	pub const AssetHub: MultiLocation = Parachain(1000).into_location();
 	pub const Contracts: MultiLocation = Parachain(1002).into_location();
 	pub const Encointer: MultiLocation = Parachain(1003).into_location();
 	pub const Tick: MultiLocation = Parachain(100).into_location();
@@ -116,7 +122,7 @@ parameter_types! {
 	pub const RocForTick: (MultiAssetFilter, MultiLocation) = (Roc::get(), Tick::get());
 	pub const RocForTrick: (MultiAssetFilter, MultiLocation) = (Roc::get(), Trick::get());
 	pub const RocForTrack: (MultiAssetFilter, MultiLocation) = (Roc::get(), Track::get());
-	pub const RocForRockmine: (MultiAssetFilter, MultiLocation) = (Roc::get(), Rockmine::get());
+	pub const RocForAssetHub: (MultiAssetFilter, MultiLocation) = (Roc::get(), AssetHub::get());
 	pub const RocForContracts: (MultiAssetFilter, MultiLocation) = (Roc::get(), Contracts::get());
 	pub const RocForEncointer: (MultiAssetFilter, MultiLocation) = (Roc::get(), Encointer::get());
 	pub const MaxInstructions: u32 = 100;
@@ -126,7 +132,7 @@ pub type TrustedTeleporters = (
 	xcm_builder::Case<RocForTick>,
 	xcm_builder::Case<RocForTrick>,
 	xcm_builder::Case<RocForTrack>,
-	xcm_builder::Case<RocForRockmine>,
+	xcm_builder::Case<RocForAssetHub>,
 	xcm_builder::Case<RocForContracts>,
 	xcm_builder::Case<RocForEncointer>,
 );
@@ -157,138 +163,6 @@ pub type Barrier = TrailingSetTopicAsId<(
 	>,
 )>;
 
-/// A call filter for the XCM Transact instruction. This is a temporary measure until we
-/// properly account for proof size weights.
-///
-/// Calls that are allowed through this filter must:
-/// 1. Have a fixed weight;
-/// 2. Cannot lead to another call being made;
-/// 3. Have a defined proof size weight, e.g. no unbounded vecs in call parameters.
-pub struct SafeCallFilter;
-impl Contains<RuntimeCall> for SafeCallFilter {
-	fn contains(call: &RuntimeCall) -> bool {
-		#[cfg(feature = "runtime-benchmarks")]
-		{
-			if matches!(call, RuntimeCall::System(frame_system::Call::remark_with_event { .. })) {
-				return true
-			}
-		}
-
-		match call {
-			RuntimeCall::System(
-				frame_system::Call::kill_prefix { .. } | frame_system::Call::set_heap_pages { .. },
-			) |
-			RuntimeCall::Babe(..) |
-			RuntimeCall::Timestamp(..) |
-			RuntimeCall::Indices(..) |
-			RuntimeCall::Balances(..) |
-			RuntimeCall::Crowdloan(
-				crowdloan::Call::create { .. } |
-				crowdloan::Call::contribute { .. } |
-				crowdloan::Call::withdraw { .. } |
-				crowdloan::Call::refund { .. } |
-				crowdloan::Call::dissolve { .. } |
-				crowdloan::Call::edit { .. } |
-				crowdloan::Call::poke { .. } |
-				crowdloan::Call::contribute_all { .. },
-			) |
-			RuntimeCall::Session(pallet_session::Call::purge_keys { .. }) |
-			RuntimeCall::Grandpa(..) |
-			RuntimeCall::ImOnline(..) |
-			RuntimeCall::Democracy(
-				pallet_democracy::Call::second { .. } |
-				pallet_democracy::Call::vote { .. } |
-				pallet_democracy::Call::emergency_cancel { .. } |
-				pallet_democracy::Call::fast_track { .. } |
-				pallet_democracy::Call::veto_external { .. } |
-				pallet_democracy::Call::cancel_referendum { .. } |
-				pallet_democracy::Call::delegate { .. } |
-				pallet_democracy::Call::undelegate { .. } |
-				pallet_democracy::Call::clear_public_proposals { .. } |
-				pallet_democracy::Call::unlock { .. } |
-				pallet_democracy::Call::remove_vote { .. } |
-				pallet_democracy::Call::remove_other_vote { .. } |
-				pallet_democracy::Call::blacklist { .. } |
-				pallet_democracy::Call::cancel_proposal { .. },
-			) |
-			RuntimeCall::Council(
-				pallet_collective::Call::vote { .. } |
-				pallet_collective::Call::disapprove_proposal { .. } |
-				pallet_collective::Call::close { .. },
-			) |
-			RuntimeCall::TechnicalCommittee(
-				pallet_collective::Call::vote { .. } |
-				pallet_collective::Call::disapprove_proposal { .. } |
-				pallet_collective::Call::close { .. },
-			) |
-			RuntimeCall::PhragmenElection(
-				pallet_elections_phragmen::Call::remove_voter { .. } |
-				pallet_elections_phragmen::Call::submit_candidacy { .. } |
-				pallet_elections_phragmen::Call::renounce_candidacy { .. } |
-				pallet_elections_phragmen::Call::remove_member { .. } |
-				pallet_elections_phragmen::Call::clean_defunct_voters { .. },
-			) |
-			RuntimeCall::TechnicalMembership(
-				pallet_membership::Call::add_member { .. } |
-				pallet_membership::Call::remove_member { .. } |
-				pallet_membership::Call::swap_member { .. } |
-				pallet_membership::Call::change_key { .. } |
-				pallet_membership::Call::set_prime { .. } |
-				pallet_membership::Call::clear_prime { .. },
-			) |
-			RuntimeCall::Treasury(..) |
-			RuntimeCall::Claims(
-				super::claims::Call::claim { .. } |
-				super::claims::Call::mint_claim { .. } |
-				super::claims::Call::move_claim { .. },
-			) |
-			RuntimeCall::Utility(pallet_utility::Call::as_derivative { .. }) |
-			RuntimeCall::Identity(
-				pallet_identity::Call::add_registrar { .. } |
-				pallet_identity::Call::set_identity { .. } |
-				pallet_identity::Call::clear_identity { .. } |
-				pallet_identity::Call::request_judgement { .. } |
-				pallet_identity::Call::cancel_request { .. } |
-				pallet_identity::Call::set_fee { .. } |
-				pallet_identity::Call::set_account_id { .. } |
-				pallet_identity::Call::set_fields { .. } |
-				pallet_identity::Call::provide_judgement { .. } |
-				pallet_identity::Call::kill_identity { .. } |
-				pallet_identity::Call::add_sub { .. } |
-				pallet_identity::Call::rename_sub { .. } |
-				pallet_identity::Call::remove_sub { .. } |
-				pallet_identity::Call::quit_sub { .. },
-			) |
-			RuntimeCall::Society(..) |
-			RuntimeCall::Recovery(..) |
-			RuntimeCall::Vesting(..) |
-			RuntimeCall::Bounties(
-				pallet_bounties::Call::propose_bounty { .. } |
-				pallet_bounties::Call::approve_bounty { .. } |
-				pallet_bounties::Call::propose_curator { .. } |
-				pallet_bounties::Call::unassign_curator { .. } |
-				pallet_bounties::Call::accept_curator { .. } |
-				pallet_bounties::Call::award_bounty { .. } |
-				pallet_bounties::Call::claim_bounty { .. } |
-				pallet_bounties::Call::close_bounty { .. },
-			) |
-			RuntimeCall::ChildBounties(..) |
-			RuntimeCall::Hrmp(..) |
-			RuntimeCall::Registrar(
-				paras_registrar::Call::deregister { .. } |
-				paras_registrar::Call::swap { .. } |
-				paras_registrar::Call::remove_lock { .. } |
-				paras_registrar::Call::reserve { .. } |
-				paras_registrar::Call::add_lock { .. },
-			) |
-			RuntimeCall::XcmPallet(pallet_xcm::Call::limited_reserve_transfer_assets {
-				..
-			}) => true,
-			_ => false,
-		}
-	}
-}
-
 pub struct XcmConfig;
 impl xcm_executor::Config for XcmConfig {
 	type RuntimeCall = RuntimeCall;
@@ -317,11 +191,19 @@ impl xcm_executor::Config for XcmConfig {
 	type FeeManager = ();
 	type MessageExporter = ();
 	type UniversalAliases = Nothing;
-	type CallDispatcher = WithOriginFilter<SafeCallFilter>;
-	type SafeCallFilter = SafeCallFilter;
+	type CallDispatcher = RuntimeCall;
+	type SafeCallFilter = Everything;
 	type Aliasers = Nothing;
 }
 
+parameter_types! {
+	pub const CollectiveBodyId: BodyId = BodyId::Unit;
+	// StakingAdmin pluralistic body.
+	pub const StakingAdminBodyId: BodyId = BodyId::Defense;
+	// Fellows pluralistic body.
+	pub const FellowsBodyId: BodyId = BodyId::Technical;
+}
+
 #[cfg(feature = "runtime-benchmarks")]
 parameter_types! {
 	pub ReachableDest: Option<MultiLocation> = Some(Parachain(1000).into());
@@ -330,12 +212,33 @@ parameter_types! {
 /// Type to convert an `Origin` type value into a `MultiLocation` value which represents an interior
 /// location of this chain.
 pub type LocalOriginToLocation = (
-	// A usual Signed origin to be used in XCM as a corresponding AccountId32
+	// And a usual Signed origin to be used in XCM as a corresponding AccountId32
 	SignedToAccountId32<RuntimeOrigin, AccountId, ThisNetwork>,
 );
+
+/// Type to convert the `StakingAdmin` origin to a Plurality `MultiLocation` value.
+pub type StakingAdminToPlurality =
+	OriginToPluralityVoice<RuntimeOrigin, StakingAdmin, StakingAdminBodyId>;
+
+/// Type to convert the Fellows origin to a Plurality `MultiLocation` value.
+pub type FellowsToPlurality = OriginToPluralityVoice<RuntimeOrigin, Fellows, FellowsBodyId>;
+
+/// Type to convert a pallet `Origin` type value into a `MultiLocation` value which represents an
+/// interior location of this chain for a destination chain.
+pub type LocalPalletOriginToLocation = (
+	// StakingAdmin origin to be used in XCM as a corresponding Plurality `MultiLocation` value.
+	StakingAdminToPlurality,
+	// Fellows origin to be used in XCM as a corresponding Plurality `MultiLocation` value.
+	FellowsToPlurality,
+);
+
 impl pallet_xcm::Config for Runtime {
 	type RuntimeEvent = RuntimeEvent;
-	type SendXcmOrigin = xcm_builder::EnsureXcmOrigin<RuntimeOrigin, LocalOriginToLocation>;
+	// We only allow the root, fellows and the staking admin to send messages.
+	// This is basically safe to enable for everyone (safe the possibility of someone spamming the
+	// parachain if they're willing to pay the KSM to send from the Relay-chain), but it's useless
+	// until we bring in XCM v3 which will make `DescendOrigin` a bit more useful.
+	type SendXcmOrigin = xcm_builder::EnsureXcmOrigin<RuntimeOrigin, LocalPalletOriginToLocation>;
 	type XcmRouter = XcmRouter;
 	// Anyone can execute XCM messages locally.
 	type ExecuteXcmOrigin = xcm_builder::EnsureXcmOrigin<RuntimeOrigin, LocalOriginToLocation>;
diff --git a/polkadot/runtime/test-runtime/Cargo.toml b/polkadot/runtime/test-runtime/Cargo.toml
index e5d04a0dff386ff52287c7f707b1d96dad598457..2e9c773a3f8cf17da29e6e52ea1efb15da147d85 100644
--- a/polkadot/runtime/test-runtime/Cargo.toml
+++ b/polkadot/runtime/test-runtime/Cargo.toml
@@ -2,7 +2,7 @@
 name = "polkadot-test-runtime"
 build = "build.rs"
 publish = false
-version.workspace = true
+version = "1.0.0"
 authors.workspace = true
 edition.workspace = true
 license.workspace = true
@@ -13,7 +13,7 @@ parity-scale-codec = { version = "3.6.1", default-features = false, features = [
 log = { version = "0.4.17", default-features = false }
 rustc-hex = { version = "2.1.0", default-features = false }
 scale-info = { version = "2.5.0", default-features = false, features = ["derive"] }
-serde = { version = "1.0.163", default-features = false }
+serde = { version = "1.0.188", default-features = false }
 serde_derive = { version = "1.0.117", optional = true }
 smallvec = "1.8.0"
 
@@ -28,6 +28,7 @@ sp-io = { path = "../../../substrate/primitives/io", default-features = false }
 sp-runtime = { path = "../../../substrate/primitives/runtime", default-features = false }
 sp-staking = { path = "../../../substrate/primitives/staking", default-features = false }
 sp-core = { path = "../../../substrate/primitives/core", default-features = false }
+sp-genesis-builder = { path = "../../../substrate/primitives/genesis-builder", default-features = false }
 sp-mmr-primitives = { path = "../../../substrate/primitives/merkle-mountain-range", default-features = false }
 sp-session = { path = "../../../substrate/primitives/session", default-features = false }
 sp-version = { path = "../../../substrate/primitives/version", default-features = false }
@@ -59,18 +60,18 @@ pallet-vesting = { path = "../../../substrate/frame/vesting", default-features =
 runtime-common = { package = "polkadot-runtime-common", path = "../common", default-features = false }
 primitives = { package = "polkadot-primitives", path = "../../primitives", default-features = false }
 pallet-xcm = { path = "../../xcm/pallet-xcm", default-features = false }
-polkadot-parachain = { path = "../../parachain", default-features = false }
+polkadot-parachain-primitives = { path = "../../parachain", default-features = false }
 polkadot-runtime-parachains = { path = "../parachains", default-features = false }
-xcm-builder = { path = "../../xcm/xcm-builder", default-features = false }
-xcm-executor = { path = "../../xcm/xcm-executor", default-features = false }
-xcm = { path = "../../xcm", default-features = false }
+xcm-builder = { package = "staging-xcm-builder", path = "../../xcm/xcm-builder", default-features = false }
+xcm-executor = { package = "staging-xcm-executor", path = "../../xcm/xcm-executor", default-features = false }
+xcm = { package = "staging-xcm", path = "../../xcm", default-features = false }
 
 [dev-dependencies]
 hex-literal = "0.4.1"
 tiny-keccak = { version = "2.0.2", features = ["keccak"] }
 keyring = { package = "sp-keyring", path = "../../../substrate/primitives/keyring" }
 sp-trie = { path = "../../../substrate/primitives/trie" }
-serde_json = "1.0.96"
+serde_json = "1.0.107"
 
 [build-dependencies]
 substrate-wasm-builder = { path = "../../../substrate/utils/wasm-builder" }
@@ -114,7 +115,8 @@ std = [
 	"pallet-vesting/std",
 	"pallet-xcm/std",
 	"parity-scale-codec/std",
-	"polkadot-parachain/std",
+	"polkadot-parachain-primitives/std",
+	"polkadot-runtime-parachains/std",
 	"primitives/std",
 	"runtime-common/std",
 	"rustc-hex/std",
@@ -123,7 +125,9 @@ std = [
 	"serde_derive",
 	"sp-api/std",
 	"sp-core/std",
+	"sp-genesis-builder/std",
 	"sp-io/std",
+	"sp-mmr-primitives/std",
 	"sp-runtime/std",
 	"sp-session/std",
 	"sp-staking/std",
@@ -137,6 +141,25 @@ std = [
 ]
 
 runtime-benchmarks = [
+	"frame-election-provider-support/runtime-benchmarks",
+	"frame-support/runtime-benchmarks",
+	"frame-system/runtime-benchmarks",
+	"pallet-babe/runtime-benchmarks",
+	"pallet-balances/runtime-benchmarks",
+	"pallet-grandpa/runtime-benchmarks",
+	"pallet-indices/runtime-benchmarks",
+	"pallet-offences/runtime-benchmarks",
+	"pallet-staking/runtime-benchmarks",
+	"pallet-sudo/runtime-benchmarks",
+	"pallet-timestamp/runtime-benchmarks",
+	"pallet-vesting/runtime-benchmarks",
 	"pallet-xcm/runtime-benchmarks",
+	"polkadot-parachain-primitives/runtime-benchmarks",
+	"polkadot-runtime-parachains/runtime-benchmarks",
+	"primitives/runtime-benchmarks",
+	"runtime-common/runtime-benchmarks",
+	"sp-runtime/runtime-benchmarks",
+	"sp-staking/runtime-benchmarks",
 	"xcm-builder/runtime-benchmarks",
+	"xcm-executor/runtime-benchmarks",
 ]
diff --git a/polkadot/runtime/test-runtime/constants/Cargo.toml b/polkadot/runtime/test-runtime/constants/Cargo.toml
index 30b2a09a94934fe1ad3b0da3497c01b77481e673..d83e92a6ce8863cc529262b3e9c0edb666e2f618 100644
--- a/polkadot/runtime/test-runtime/constants/Cargo.toml
+++ b/polkadot/runtime/test-runtime/constants/Cargo.toml
@@ -1,7 +1,7 @@
 [package]
 name = "test-runtime-constants"
 publish = false
-version.workspace = true
+version = "1.0.0"
 authors.workspace = true
 edition.workspace = true
 license.workspace = true
diff --git a/polkadot/runtime/test-runtime/src/lib.rs b/polkadot/runtime/test-runtime/src/lib.rs
index b2397299430de240ddc43b0812f69ecabcdf19aa..99fd2198400bf821f406345ac5daabe13d4b009a 100644
--- a/polkadot/runtime/test-runtime/src/lib.rs
+++ b/polkadot/runtime/test-runtime/src/lib.rs
@@ -30,7 +30,7 @@ use polkadot_runtime_parachains::{
 	disputes::slashing as parachains_slashing, dmp as parachains_dmp, hrmp as parachains_hrmp,
 	inclusion as parachains_inclusion, initializer as parachains_initializer,
 	origin as parachains_origin, paras as parachains_paras,
-	paras_inherent as parachains_paras_inherent, runtime_api_impl::v5 as runtime_impl,
+	paras_inherent as parachains_paras_inherent, runtime_api_impl::v7 as runtime_impl,
 	scheduler as parachains_scheduler, session_info as parachains_session_info,
 	shared as parachains_shared,
 };
@@ -42,7 +42,9 @@ use frame_election_provider_support::{
 	onchain, SequentialPhragmen,
 };
 use frame_support::{
-	construct_runtime, parameter_types,
+	construct_runtime,
+	genesis_builder_helper::{build_config, create_default_config},
+	parameter_types,
 	traits::{Everything, KeyOwnerProofSystem, WithdrawReasons},
 };
 use pallet_grandpa::{fg_primitives, AuthorityId as GrandpaId};
@@ -540,6 +542,7 @@ impl parachains_paras::Config for Runtime {
 	type UnsignedPriority = ParasUnsignedPriority;
 	type QueueFootprinter = ParaInclusion;
 	type NextSessionRotation = Babe;
+	type OnNewHead = ();
 }
 
 impl parachains_dmp::Config for Runtime {}
@@ -1136,4 +1139,14 @@ sp_api::impl_runtime_apis! {
 			Timestamp::now()
 		}
 	}
+
+	impl sp_genesis_builder::GenesisBuilder<Block> for Runtime {
+		fn create_default_config() -> Vec<u8> {
+			create_default_config::<RuntimeGenesisConfig>()
+		}
+
+		fn build_config(config: Vec<u8>) -> sp_genesis_builder::Result {
+			build_config::<RuntimeGenesisConfig>(config)
+		}
+	}
 }
diff --git a/polkadot/runtime/westend/Cargo.toml b/polkadot/runtime/westend/Cargo.toml
index 40664e33a3ad2cde8d6b9b6db9d62539e08e0264..58a6cc21eecdb4da8a3c3b28b75aadd8dac51de0 100644
--- a/polkadot/runtime/westend/Cargo.toml
+++ b/polkadot/runtime/westend/Cargo.toml
@@ -1,7 +1,7 @@
 [package]
 name = "westend-runtime"
 build = "build.rs"
-version.workspace = true
+version = "1.0.0"
 authors.workspace = true
 edition.workspace = true
 license.workspace = true
@@ -12,7 +12,7 @@ parity-scale-codec = { version = "3.6.1", default-features = false, features = [
 scale-info = { version = "2.5.0", default-features = false, features = ["derive"] }
 log = { version = "0.4.17", default-features = false }
 rustc-hex = { version = "2.1.0", default-features = false }
-serde = { version = "1.0.163", default-features = false }
+serde = { version = "1.0.188", default-features = false }
 serde_derive = { version = "1.0.117", optional = true }
 smallvec = "1.8.0"
 
@@ -24,7 +24,9 @@ inherents = { package = "sp-inherents", path = "../../../substrate/primitives/in
 offchain-primitives = { package = "sp-offchain", path = "../../../substrate/primitives/offchain", default-features = false }
 sp-api = { path = "../../../substrate/primitives/api", default-features = false }
 sp-application-crypto = { path = "../../../substrate/primitives/application-crypto", default-features = false }
+sp-arithmetic = { path = "../../../substrate/primitives/arithmetic", default-features = false }
 sp-std = { package = "sp-std", path = "../../../substrate/primitives/std", default-features = false }
+sp-genesis-builder = { path = "../../../substrate/primitives/genesis-builder", default-features = false }
 sp-io = { path = "../../../substrate/primitives/io", default-features = false }
 sp-mmr-primitives = { path = "../../../substrate/primitives/merkle-mountain-range", default-features = false }
 sp-runtime = { path = "../../../substrate/primitives/runtime", default-features = false }
@@ -39,10 +41,11 @@ sp-npos-elections = { path = "../../../substrate/primitives/npos-elections", def
 
 frame-election-provider-support = { path = "../../../substrate/frame/election-provider-support", default-features = false }
 frame-executive = { path = "../../../substrate/frame/executive", default-features = false }
-frame-support = { path = "../../../substrate/frame/support", default-features = false }
+frame-support = { path = "../../../substrate/frame/support", default-features = false, features = ["tuples-96"] }
 frame-system = { path = "../../../substrate/frame/system", default-features = false }
 frame-system-rpc-runtime-api = { path = "../../../substrate/frame/system/rpc/runtime-api", default-features = false }
 westend-runtime-constants = { package = "westend-runtime-constants", path = "constants", default-features = false }
+pallet-asset-rate = {  path = "../../../substrate/frame/asset-rate", default-features = false }
 pallet-authority-discovery = { path = "../../../substrate/frame/authority-discovery", default-features = false }
 pallet-authorship = { path = "../../../substrate/frame/authorship", default-features = false }
 pallet-babe = { path = "../../../substrate/frame/babe", default-features = false }
@@ -64,10 +67,12 @@ pallet-message-queue = { path = "../../../substrate/frame/message-queue", defaul
 pallet-mmr = { path = "../../../substrate/frame/merkle-mountain-range", default-features = false }
 pallet-multisig = { path = "../../../substrate/frame/multisig", default-features = false }
 pallet-nomination-pools = { path = "../../../substrate/frame/nomination-pools", default-features = false }
+pallet-conviction-voting = { path = "../../../substrate/frame/conviction-voting", default-features = false }
 pallet-offences = { path = "../../../substrate/frame/offences", default-features = false }
 pallet-preimage = { path = "../../../substrate/frame/preimage", default-features = false }
 pallet-proxy = { path = "../../../substrate/frame/proxy", default-features = false }
 pallet-recovery = { path = "../../../substrate/frame/recovery", default-features = false }
+pallet-referenda = { path = "../../../substrate/frame/referenda", default-features = false }
 pallet-scheduler = { path = "../../../substrate/frame/scheduler", default-features = false }
 pallet-session = { path = "../../../substrate/frame/session", default-features = false }
 pallet-society = { path = "../../../substrate/frame/society", default-features = false }
@@ -83,7 +88,8 @@ pallet-nomination-pools-runtime-api = { path = "../../../substrate/frame/nominat
 pallet-treasury = { path = "../../../substrate/frame/treasury", default-features = false }
 pallet-utility = { path = "../../../substrate/frame/utility", default-features = false }
 pallet-vesting = { path = "../../../substrate/frame/vesting", default-features = false }
-pallet-xcm = { path = "../../xcm/pallet-xcm", default-features = false, features=["experimental"] }
+pallet-whitelist = { path = "../../../substrate/frame/whitelist", default-features = false }
+pallet-xcm = { path = "../../xcm/pallet-xcm", default-features = false }
 pallet-xcm-benchmarks = { path = "../../xcm/pallet-xcm-benchmarks", default-features = false, optional = true }
 
 frame-benchmarking = { path = "../../../substrate/frame/benchmarking", default-features = false, optional = true }
@@ -95,20 +101,20 @@ pallet-offences-benchmarking = { path = "../../../substrate/frame/offences/bench
 pallet-session-benchmarking = { path = "../../../substrate/frame/session/benchmarking", default-features = false, optional = true }
 hex-literal = { version = "0.4.1", optional = true }
 
-runtime-common = { package = "polkadot-runtime-common", path = "../common", default-features = false, features=["experimental"] }
+runtime-common = { package = "polkadot-runtime-common", path = "../common", default-features = false }
 primitives = { package = "polkadot-primitives", path = "../../primitives", default-features = false }
-polkadot-parachain = { path = "../../parachain", default-features = false }
+polkadot-parachain-primitives = { path = "../../parachain", default-features = false }
 runtime-parachains = { package = "polkadot-runtime-parachains", path = "../parachains", default-features = false }
 
-xcm = { package = "xcm", path = "../../xcm", default-features = false }
-xcm-executor = { package = "xcm-executor", path = "../../xcm/xcm-executor", default-features = false }
-xcm-builder = { package = "xcm-builder", path = "../../xcm/xcm-builder", default-features = false }
+xcm = { package = "staging-xcm", path = "../../xcm", default-features = false }
+xcm-executor = { package = "staging-xcm-executor", path = "../../xcm/xcm-executor", default-features = false }
+xcm-builder = { package = "staging-xcm-builder", path = "../../xcm/xcm-builder", default-features = false }
 
 [dev-dependencies]
 hex-literal = "0.4.1"
 tiny-keccak = { version = "2.0.2", features = ["keccak"] }
 keyring = { package = "sp-keyring", path = "../../../substrate/primitives/keyring" }
-serde_json = "1.0.96"
+serde_json = "1.0.107"
 remote-externalities = { package = "frame-remote-externalities" , path = "../../../substrate/utils/frame/remote-externalities" }
 tokio = { version = "1.24.2", features = ["macros"] }
 sp-tracing = { path = "../../../substrate/primitives/tracing", default-features = false }
@@ -124,17 +130,21 @@ std = [
 	"authority-discovery-primitives/std",
 	"babe-primitives/std",
 	"beefy-primitives/std",
+	"binary-merkle-tree/std",
 	"bitvec/std",
 	"block-builder-api/std",
+	"frame-benchmarking?/std",
 	"frame-election-provider-support/std",
 	"frame-executive/std",
 	"frame-support/std",
+	"frame-system-benchmarking?/std",
 	"frame-system-rpc-runtime-api/std",
 	"frame-system/std",
 	"frame-try-runtime/std",
 	"inherents/std",
 	"log/std",
 	"offchain-primitives/std",
+	"pallet-asset-rate/std",
 	"pallet-authority-discovery/std",
 	"pallet-authorship/std",
 	"pallet-babe/std",
@@ -143,8 +153,10 @@ std = [
 	"pallet-beefy-mmr/std",
 	"pallet-beefy/std",
 	"pallet-collective/std",
+	"pallet-conviction-voting/std",
 	"pallet-democracy/std",
 	"pallet-election-provider-multi-phase/std",
+	"pallet-election-provider-support-benchmarking?/std",
 	"pallet-elections-phragmen/std",
 	"pallet-fast-unstake/std",
 	"pallet-grandpa/std",
@@ -155,13 +167,17 @@ std = [
 	"pallet-message-queue/std",
 	"pallet-mmr/std",
 	"pallet-multisig/std",
+	"pallet-nomination-pools-benchmarking?/std",
 	"pallet-nomination-pools-runtime-api/std",
 	"pallet-nomination-pools/std",
+	"pallet-offences-benchmarking?/std",
 	"pallet-offences/std",
 	"pallet-preimage/std",
 	"pallet-proxy/std",
 	"pallet-recovery/std",
+	"pallet-referenda/std",
 	"pallet-scheduler/std",
+	"pallet-session-benchmarking?/std",
 	"pallet-session/std",
 	"pallet-society/std",
 	"pallet-staking-runtime-api/std",
@@ -174,9 +190,11 @@ std = [
 	"pallet-treasury/std",
 	"pallet-utility/std",
 	"pallet-vesting/std",
+	"pallet-whitelist/std",
+	"pallet-xcm-benchmarks?/std",
 	"pallet-xcm/std",
 	"parity-scale-codec/std",
-	"polkadot-parachain/std",
+	"polkadot-parachain-primitives/std",
 	"primitives/std",
 	"runtime-common/std",
 	"runtime-parachains/std",
@@ -186,7 +204,9 @@ std = [
 	"serde_derive",
 	"sp-api/std",
 	"sp-application-crypto/std",
+	"sp-arithmetic/std",
 	"sp-core/std",
+	"sp-genesis-builder/std",
 	"sp-io/std",
 	"sp-mmr-primitives/std",
 	"sp-npos-elections/std",
@@ -194,6 +214,8 @@ std = [
 	"sp-session/std",
 	"sp-staking/std",
 	"sp-std/std",
+	"sp-storage/std",
+	"sp-tracing/std",
 	"sp-version/std",
 	"tx-pool-api/std",
 	"westend-runtime-constants/std",
@@ -208,10 +230,12 @@ runtime-benchmarks = [
 	"frame-system-benchmarking/runtime-benchmarks",
 	"frame-system/runtime-benchmarks",
 	"hex-literal",
+	"pallet-asset-rate/runtime-benchmarks",
 	"pallet-babe/runtime-benchmarks",
 	"pallet-bags-list/runtime-benchmarks",
 	"pallet-balances/runtime-benchmarks",
 	"pallet-collective/runtime-benchmarks",
+	"pallet-conviction-voting/runtime-benchmarks",
 	"pallet-democracy/runtime-benchmarks",
 	"pallet-election-provider-multi-phase/runtime-benchmarks",
 	"pallet-election-provider-support-benchmarking/runtime-benchmarks",
@@ -223,32 +247,46 @@ runtime-benchmarks = [
 	"pallet-indices/runtime-benchmarks",
 	"pallet-membership/runtime-benchmarks",
 	"pallet-message-queue/runtime-benchmarks",
+	"pallet-mmr/runtime-benchmarks",
 	"pallet-multisig/runtime-benchmarks",
 	"pallet-nomination-pools-benchmarking/runtime-benchmarks",
+	"pallet-nomination-pools/runtime-benchmarks",
 	"pallet-offences-benchmarking/runtime-benchmarks",
+	"pallet-offences/runtime-benchmarks",
 	"pallet-preimage/runtime-benchmarks",
 	"pallet-proxy/runtime-benchmarks",
 	"pallet-recovery/runtime-benchmarks",
+	"pallet-referenda/runtime-benchmarks",
 	"pallet-scheduler/runtime-benchmarks",
 	"pallet-session-benchmarking/runtime-benchmarks",
 	"pallet-society/runtime-benchmarks",
 	"pallet-staking/runtime-benchmarks",
+	"pallet-state-trie-migration/runtime-benchmarks",
 	"pallet-sudo/runtime-benchmarks",
 	"pallet-timestamp/runtime-benchmarks",
 	"pallet-treasury/runtime-benchmarks",
 	"pallet-utility/runtime-benchmarks",
 	"pallet-vesting/runtime-benchmarks",
+	"pallet-whitelist/runtime-benchmarks",
 	"pallet-xcm-benchmarks/runtime-benchmarks",
 	"pallet-xcm/runtime-benchmarks",
+	"polkadot-parachain-primitives/runtime-benchmarks",
+	"primitives/runtime-benchmarks",
 	"runtime-common/runtime-benchmarks",
 	"runtime-parachains/runtime-benchmarks",
 	"sp-runtime/runtime-benchmarks",
+	"sp-staking/runtime-benchmarks",
 	"xcm-builder/runtime-benchmarks",
+	"xcm-executor/runtime-benchmarks",
 ]
 try-runtime = [
+	"frame-election-provider-support/try-runtime",
 	"frame-executive/try-runtime",
+	"frame-support/try-runtime",
 	"frame-system/try-runtime",
 	"frame-try-runtime",
+	"frame-try-runtime/try-runtime",
+	"pallet-asset-rate/try-runtime",
 	"pallet-authority-discovery/try-runtime",
 	"pallet-authorship/try-runtime",
 	"pallet-babe/try-runtime",
@@ -257,6 +295,7 @@ try-runtime = [
 	"pallet-beefy-mmr/try-runtime",
 	"pallet-beefy/try-runtime",
 	"pallet-collective/try-runtime",
+	"pallet-conviction-voting/try-runtime",
 	"pallet-democracy/try-runtime",
 	"pallet-election-provider-multi-phase/try-runtime",
 	"pallet-elections-phragmen/try-runtime",
@@ -274,6 +313,7 @@ try-runtime = [
 	"pallet-preimage/try-runtime",
 	"pallet-proxy/try-runtime",
 	"pallet-recovery/try-runtime",
+	"pallet-referenda/try-runtime",
 	"pallet-scheduler/try-runtime",
 	"pallet-session/try-runtime",
 	"pallet-society/try-runtime",
@@ -285,17 +325,19 @@ try-runtime = [
 	"pallet-treasury/try-runtime",
 	"pallet-utility/try-runtime",
 	"pallet-vesting/try-runtime",
+	"pallet-whitelist/try-runtime",
 	"pallet-xcm/try-runtime",
 	"runtime-common/try-runtime",
+	"runtime-parachains/try-runtime",
+	"sp-runtime/try-runtime",
 ]
-# When enabled, the runtime API will not be build.
-#
-# This is required by Cumulus to access certain types of the
-# runtime without clashing with the runtime API exported functions
-# in WASM.
-disable-runtime-api = []
 
 # Set timing constants (e.g. session period) to faster versions to speed up testing.
 fast-runtime = []
 
 runtime-metrics = [ "runtime-parachains/runtime-metrics", "sp-io/with-tracing" ]
+
+# A feature that should be enabled when the runtime should be build for on-chain
+# deployment. This will disable stuff that shouldn't be part of the on-chain wasm
+# to make it smaller like logging for example.
+on-chain-release-build = [ "sp-api/disable-logging" ]
diff --git a/polkadot/runtime/westend/constants/Cargo.toml b/polkadot/runtime/westend/constants/Cargo.toml
index e792a56a5461490f94e717d8a5f149c29061cf81..779b2cb3110a5f776a0f1cd81b342eca1a14121f 100644
--- a/polkadot/runtime/westend/constants/Cargo.toml
+++ b/polkadot/runtime/westend/constants/Cargo.toml
@@ -1,6 +1,6 @@
 [package]
 name = "westend-runtime-constants"
-version.workspace = true
+version = "1.0.0"
 authors.workspace = true
 edition.workspace = true
 license.workspace = true
diff --git a/polkadot/runtime/westend/constants/src/lib.rs b/polkadot/runtime/westend/constants/src/lib.rs
index f9830dab3325b62b2a9003498911e79e7778e0d3..0dd64d092c34512dc963499ab418201d253fa167 100644
--- a/polkadot/runtime/westend/constants/src/lib.rs
+++ b/polkadot/runtime/westend/constants/src/lib.rs
@@ -96,6 +96,26 @@ pub mod fee {
 	}
 }
 
+/// XCM protocol related constants.
+pub mod xcm {
+	/// Pluralistic bodies existing within the consensus.
+	pub mod body {
+		// Preallocated for the Root body.
+		#[allow(dead_code)]
+		const ROOT_INDEX: u32 = 0;
+		// The bodies corresponding to the Polkadot OpenGov Origins.
+		pub const FELLOWSHIP_ADMIN_INDEX: u32 = 1;
+	}
+}
+
+/// System Parachains.
+pub mod system_parachain {
+	/// Statemint parachain ID.
+	pub const ASSET_HUB_ID: u32 = 1000;
+	/// Collectives parachain ID.
+	pub const COLLECTIVES_ID: u32 = 1001;
+}
+
 #[cfg(test)]
 mod tests {
 	use super::{
diff --git a/polkadot/runtime/polkadot/src/governance/mod.rs b/polkadot/runtime/westend/src/governance/mod.rs
similarity index 89%
rename from polkadot/runtime/polkadot/src/governance/mod.rs
rename to polkadot/runtime/westend/src/governance/mod.rs
index 79c904622dddea96112c29f4e58bdf92f53de3b8..d027f788d71f6bf255b71157bfe21ba1fdc16f5a 100644
--- a/polkadot/runtime/polkadot/src/governance/mod.rs
+++ b/polkadot/runtime/westend/src/governance/mod.rs
@@ -14,10 +14,10 @@
 // You should have received a copy of the GNU General Public License
 // along with Polkadot. If not, see <http://www.gnu.org/licenses/>.
 
-//! New governance configurations for the Polkadot runtime.
+//! New governance configurations for the Kusama runtime.
 
 use super::*;
-use crate::xcm_config::CollectivesLocation;
+use crate::xcm_config::Collectives;
 use frame_support::{parameter_types, traits::EitherOf};
 use frame_system::EnsureRootWithSuccess;
 use pallet_xcm::{EnsureXcm, IsVoiceOfBody};
@@ -32,7 +32,7 @@ mod tracks;
 pub use tracks::TracksInfo;
 
 parameter_types! {
-	pub const VoteLockingPeriod: BlockNumber = prod_or_fast!(28 * DAYS, 1);
+	pub const VoteLockingPeriod: BlockNumber = 7 * DAYS;
 }
 
 impl pallet_conviction_voting::Config for Runtime {
@@ -48,7 +48,7 @@ impl pallet_conviction_voting::Config for Runtime {
 
 parameter_types! {
 	pub const AlarmInterval: BlockNumber = 1;
-	pub const SubmissionDeposit: Balance = 1 * DOLLARS;
+	pub const SubmissionDeposit: Balance = 1 * 3 * CENTS;
 	pub const UndecidingTimeout: BlockNumber = 14 * DAYS;
 }
 
@@ -70,14 +70,14 @@ impl pallet_whitelist::Config for Runtime {
 	type RuntimeEvent = RuntimeEvent;
 	type WhitelistOrigin = EitherOfDiverse<
 		EnsureRoot<Self::AccountId>,
-		EnsureXcm<IsVoiceOfBody<CollectivesLocation, FellowsBodyId>>,
+		EnsureXcm<IsVoiceOfBody<Collectives, FellowsBodyId>>,
 	>;
 	type DispatchWhitelistedOrigin = EitherOf<EnsureRoot<Self::AccountId>, WhitelistedCaller>;
 	type Preimages = Preimage;
 }
 
 impl pallet_referenda::Config for Runtime {
-	type WeightInfo = weights::pallet_referenda::WeightInfo<Self>;
+	type WeightInfo = weights::pallet_referenda_referenda::WeightInfo<Self>;
 	type RuntimeCall = RuntimeCall;
 	type RuntimeEvent = RuntimeEvent;
 	type Scheduler = Scheduler;
diff --git a/polkadot/runtime/polkadot/src/governance/origins.rs b/polkadot/runtime/westend/src/governance/origins.rs
similarity index 63%
rename from polkadot/runtime/polkadot/src/governance/origins.rs
rename to polkadot/runtime/westend/src/governance/origins.rs
index 551e05e556db414731efe5a003709509544cb63a..e4639f40dc432473e1222f6ab1094a31ecd26f68 100644
--- a/polkadot/runtime/polkadot/src/governance/origins.rs
+++ b/polkadot/runtime/westend/src/governance/origins.rs
@@ -20,7 +20,7 @@ pub use pallet_custom_origins::*;
 
 #[frame_support::pallet]
 pub mod pallet_custom_origins {
-	use crate::{Balance, DOLLARS, GRAND};
+	use crate::{Balance, CENTS, GRAND};
 	use frame_support::pallet_prelude::*;
 
 	#[pallet::config]
@@ -32,14 +32,13 @@ pub mod pallet_custom_origins {
 	#[derive(PartialEq, Eq, Clone, MaxEncodedLen, Encode, Decode, TypeInfo, RuntimeDebug)]
 	#[pallet::origin]
 	pub enum Origin {
-		/// Origin able to cancel slashes and manage minimum commission.
+		/// Origin for cancelling slashes.
 		StakingAdmin,
-		/// Origin for spending up to $10,000,000 DOT from the treasury as well as generally
-		/// administering it.
+		/// Origin for spending (any amount of) funds.
 		Treasurer,
 		/// Origin for managing the composition of the fellowship.
 		FellowshipAdmin,
-		/// Origin for managing the registrar and permissioned HRMP channel operations.
+		/// Origin for managing the registrar.
 		GeneralAdmin,
 		/// Origin for starting auctions.
 		AuctionAdmin,
@@ -49,18 +48,44 @@ pub mod pallet_custom_origins {
 		ReferendumCanceller,
 		/// Origin able to kill referenda.
 		ReferendumKiller,
-		/// Origin able to spend around $250 from the treasury at once.
+		/// Origin able to spend up to 1 KSM from the treasury at once.
 		SmallTipper,
-		/// Origin able to spend around $1,000 from the treasury at once.
+		/// Origin able to spend up to 5 KSM from the treasury at once.
 		BigTipper,
-		/// Origin able to spend around $10,000 from the treasury at once.
+		/// Origin able to spend up to 50 KSM from the treasury at once.
 		SmallSpender,
-		/// Origin able to spend around $100,000 from the treasury at once.
+		/// Origin able to spend up to 500 KSM from the treasury at once.
 		MediumSpender,
-		/// Origin able to spend up to $1,000,000 DOT from the treasury at once.
+		/// Origin able to spend up to 5,000 KSM from the treasury at once.
 		BigSpender,
 		/// Origin able to dispatch a whitelisted call.
 		WhitelistedCaller,
+		/// Origin commanded by any members of the Polkadot Fellowship (no Dan grade needed).
+		FellowshipInitiates,
+		/// Origin commanded by Polkadot Fellows (3rd Dan fellows or greater).
+		Fellows,
+		/// Origin commanded by Polkadot Experts (5th Dan fellows or greater).
+		FellowshipExperts,
+		/// Origin commanded by Polkadot Masters (7th Dan fellows of greater).
+		FellowshipMasters,
+		/// Origin commanded by rank 1 of the Polkadot Fellowship and with a success of 1.
+		Fellowship1Dan,
+		/// Origin commanded by rank 2 of the Polkadot Fellowship and with a success of 2.
+		Fellowship2Dan,
+		/// Origin commanded by rank 3 of the Polkadot Fellowship and with a success of 3.
+		Fellowship3Dan,
+		/// Origin commanded by rank 4 of the Polkadot Fellowship and with a success of 4.
+		Fellowship4Dan,
+		/// Origin commanded by rank 5 of the Polkadot Fellowship and with a success of 5.
+		Fellowship5Dan,
+		/// Origin commanded by rank 6 of the Polkadot Fellowship and with a success of 6.
+		Fellowship6Dan,
+		/// Origin commanded by rank 7 of the Polkadot Fellowship and with a success of 7.
+		Fellowship7Dan,
+		/// Origin commanded by rank 8 of the Polkadot Fellowship and with a success of 8.
+		Fellowship8Dan,
+		/// Origin commanded by rank 9 of the Polkadot Fellowship and with a success of 9.
+		Fellowship9Dan,
 	}
 
 	macro_rules! decl_unit_ensures {
@@ -103,6 +128,10 @@ pub mod pallet_custom_origins {
 		ReferendumCanceller,
 		ReferendumKiller,
 		WhitelistedCaller,
+		FellowshipInitiates: u16 = 0,
+		Fellows: u16 = 3,
+		FellowshipExperts: u16 = 5,
+		FellowshipMasters: u16 = 7,
 	);
 
 	macro_rules! decl_ensure {
@@ -140,7 +169,7 @@ pub mod pallet_custom_origins {
 
 	decl_ensure! {
 		pub type Spender: EnsureOrigin<Success = Balance> {
-			SmallTipper = 250 * DOLLARS,
+			SmallTipper = 250 * 3 * CENTS,
 			BigTipper = 1 * GRAND,
 			SmallSpender = 10 * GRAND,
 			MediumSpender = 100 * GRAND,
@@ -148,4 +177,18 @@ pub mod pallet_custom_origins {
 			Treasurer = 10_000 * GRAND,
 		}
 	}
+
+	decl_ensure! {
+		pub type EnsureFellowship: EnsureOrigin<Success = u16> {
+			Fellowship1Dan = 1,
+			Fellowship2Dan = 2,
+			Fellowship3Dan = 3,
+			Fellowship4Dan = 4,
+			Fellowship5Dan = 5,
+			Fellowship6Dan = 6,
+			Fellowship7Dan = 7,
+			Fellowship8Dan = 8,
+			Fellowship9Dan = 9,
+		}
+	}
 }
diff --git a/polkadot/runtime/polkadot/src/governance/tracks.rs b/polkadot/runtime/westend/src/governance/tracks.rs
similarity index 79%
rename from polkadot/runtime/polkadot/src/governance/tracks.rs
rename to polkadot/runtime/westend/src/governance/tracks.rs
index 2b6d470e516e64cd31b791c724670f5bbf8c556c..3765569f183e0414a10fe2852e528ccc9dedc3d7 100644
--- a/polkadot/runtime/polkadot/src/governance/tracks.rs
+++ b/polkadot/runtime/westend/src/governance/tracks.rs
@@ -72,10 +72,10 @@ const TRACKS_DATA: [(u16, pallet_referenda::TrackInfo<Balance, BlockNumber>); 15
 			name: "root",
 			max_deciding: 1,
 			decision_deposit: 100 * GRAND,
-			prepare_period: 2 * HOURS,
-			decision_period: 28 * DAYS,
-			confirm_period: 24 * HOURS,
-			min_enactment_period: 24 * HOURS,
+			prepare_period: 8 * MINUTES,
+			decision_period: 20 * MINUTES,
+			confirm_period: 12 * MINUTES,
+			min_enactment_period: 5 * MINUTES,
 			min_approval: APP_ROOT,
 			min_support: SUP_ROOT,
 		},
@@ -86,10 +86,10 @@ const TRACKS_DATA: [(u16, pallet_referenda::TrackInfo<Balance, BlockNumber>); 15
 			name: "whitelisted_caller",
 			max_deciding: 100,
 			decision_deposit: 10 * GRAND,
-			prepare_period: 30 * MINUTES,
-			decision_period: 28 * DAYS,
-			confirm_period: 10 * MINUTES,
-			min_enactment_period: 10 * MINUTES,
+			prepare_period: 6 * MINUTES,
+			decision_period: 20 * MINUTES,
+			confirm_period: 4 * MINUTES,
+			min_enactment_period: 3 * MINUTES,
 			min_approval: APP_WHITELISTED_CALLER,
 			min_support: SUP_WHITELISTED_CALLER,
 		},
@@ -100,10 +100,10 @@ const TRACKS_DATA: [(u16, pallet_referenda::TrackInfo<Balance, BlockNumber>); 15
 			name: "staking_admin",
 			max_deciding: 10,
 			decision_deposit: 5 * GRAND,
-			prepare_period: 2 * HOURS,
-			decision_period: 28 * DAYS,
-			confirm_period: 3 * HOURS,
-			min_enactment_period: 10 * MINUTES,
+			prepare_period: 8 * MINUTES,
+			decision_period: 20 * MINUTES,
+			confirm_period: 8 * MINUTES,
+			min_enactment_period: 3 * MINUTES,
 			min_approval: APP_STAKING_ADMIN,
 			min_support: SUP_STAKING_ADMIN,
 		},
@@ -114,10 +114,10 @@ const TRACKS_DATA: [(u16, pallet_referenda::TrackInfo<Balance, BlockNumber>); 15
 			name: "treasurer",
 			max_deciding: 10,
 			decision_deposit: 1 * GRAND,
-			prepare_period: 2 * HOURS,
-			decision_period: 28 * DAYS,
-			confirm_period: 3 * HOURS,
-			min_enactment_period: 24 * HOURS,
+			prepare_period: 8 * MINUTES,
+			decision_period: 20 * MINUTES,
+			confirm_period: 8 * MINUTES,
+			min_enactment_period: 5 * MINUTES,
 			min_approval: APP_TREASURER,
 			min_support: SUP_TREASURER,
 		},
@@ -128,10 +128,10 @@ const TRACKS_DATA: [(u16, pallet_referenda::TrackInfo<Balance, BlockNumber>); 15
 			name: "lease_admin",
 			max_deciding: 10,
 			decision_deposit: 5 * GRAND,
-			prepare_period: 2 * HOURS,
-			decision_period: 28 * DAYS,
-			confirm_period: 3 * HOURS,
-			min_enactment_period: 10 * MINUTES,
+			prepare_period: 8 * MINUTES,
+			decision_period: 20 * MINUTES,
+			confirm_period: 8 * MINUTES,
+			min_enactment_period: 3 * MINUTES,
 			min_approval: APP_LEASE_ADMIN,
 			min_support: SUP_LEASE_ADMIN,
 		},
@@ -142,10 +142,10 @@ const TRACKS_DATA: [(u16, pallet_referenda::TrackInfo<Balance, BlockNumber>); 15
 			name: "fellowship_admin",
 			max_deciding: 10,
 			decision_deposit: 5 * GRAND,
-			prepare_period: 2 * HOURS,
-			decision_period: 28 * DAYS,
-			confirm_period: 3 * HOURS,
-			min_enactment_period: 10 * MINUTES,
+			prepare_period: 8 * MINUTES,
+			decision_period: 20 * MINUTES,
+			confirm_period: 8 * MINUTES,
+			min_enactment_period: 3 * MINUTES,
 			min_approval: APP_FELLOWSHIP_ADMIN,
 			min_support: SUP_FELLOWSHIP_ADMIN,
 		},
@@ -156,10 +156,10 @@ const TRACKS_DATA: [(u16, pallet_referenda::TrackInfo<Balance, BlockNumber>); 15
 			name: "general_admin",
 			max_deciding: 10,
 			decision_deposit: 5 * GRAND,
-			prepare_period: 2 * HOURS,
-			decision_period: 28 * DAYS,
-			confirm_period: 3 * HOURS,
-			min_enactment_period: 10 * MINUTES,
+			prepare_period: 8 * MINUTES,
+			decision_period: 20 * MINUTES,
+			confirm_period: 8 * MINUTES,
+			min_enactment_period: 3 * MINUTES,
 			min_approval: APP_GENERAL_ADMIN,
 			min_support: SUP_GENERAL_ADMIN,
 		},
@@ -170,10 +170,10 @@ const TRACKS_DATA: [(u16, pallet_referenda::TrackInfo<Balance, BlockNumber>); 15
 			name: "auction_admin",
 			max_deciding: 10,
 			decision_deposit: 5 * GRAND,
-			prepare_period: 2 * HOURS,
-			decision_period: 28 * DAYS,
-			confirm_period: 3 * HOURS,
-			min_enactment_period: 10 * MINUTES,
+			prepare_period: 8 * MINUTES,
+			decision_period: 20 * MINUTES,
+			confirm_period: 8 * MINUTES,
+			min_enactment_period: 3 * MINUTES,
 			min_approval: APP_AUCTION_ADMIN,
 			min_support: SUP_AUCTION_ADMIN,
 		},
@@ -184,10 +184,10 @@ const TRACKS_DATA: [(u16, pallet_referenda::TrackInfo<Balance, BlockNumber>); 15
 			name: "referendum_canceller",
 			max_deciding: 1_000,
 			decision_deposit: 10 * GRAND,
-			prepare_period: 2 * HOURS,
-			decision_period: 7 * DAYS,
-			confirm_period: 3 * HOURS,
-			min_enactment_period: 10 * MINUTES,
+			prepare_period: 8 * MINUTES,
+			decision_period: 14 * MINUTES,
+			confirm_period: 8 * MINUTES,
+			min_enactment_period: 3 * MINUTES,
 			min_approval: APP_REFERENDUM_CANCELLER,
 			min_support: SUP_REFERENDUM_CANCELLER,
 		},
@@ -198,10 +198,10 @@ const TRACKS_DATA: [(u16, pallet_referenda::TrackInfo<Balance, BlockNumber>); 15
 			name: "referendum_killer",
 			max_deciding: 1_000,
 			decision_deposit: 50 * GRAND,
-			prepare_period: 2 * HOURS,
-			decision_period: 28 * DAYS,
-			confirm_period: 3 * HOURS,
-			min_enactment_period: 10 * MINUTES,
+			prepare_period: 8 * MINUTES,
+			decision_period: 20 * MINUTES,
+			confirm_period: 8 * MINUTES,
+			min_enactment_period: 3 * MINUTES,
 			min_approval: APP_REFERENDUM_KILLER,
 			min_support: SUP_REFERENDUM_KILLER,
 		},
@@ -211,10 +211,10 @@ const TRACKS_DATA: [(u16, pallet_referenda::TrackInfo<Balance, BlockNumber>); 15
 		pallet_referenda::TrackInfo {
 			name: "small_tipper",
 			max_deciding: 200,
-			decision_deposit: 1 * DOLLARS,
+			decision_deposit: 1 * 3 * CENTS,
 			prepare_period: 1 * MINUTES,
-			decision_period: 7 * DAYS,
-			confirm_period: 10 * MINUTES,
+			decision_period: 14 * MINUTES,
+			confirm_period: 4 * MINUTES,
 			min_enactment_period: 1 * MINUTES,
 			min_approval: APP_SMALL_TIPPER,
 			min_support: SUP_SMALL_TIPPER,
@@ -225,11 +225,11 @@ const TRACKS_DATA: [(u16, pallet_referenda::TrackInfo<Balance, BlockNumber>); 15
 		pallet_referenda::TrackInfo {
 			name: "big_tipper",
 			max_deciding: 100,
-			decision_deposit: 10 * DOLLARS,
-			prepare_period: 10 * MINUTES,
-			decision_period: 7 * DAYS,
-			confirm_period: 1 * HOURS,
-			min_enactment_period: 10 * MINUTES,
+			decision_deposit: 10 * 3 * CENTS,
+			prepare_period: 4 * MINUTES,
+			decision_period: 14 * MINUTES,
+			confirm_period: 12 * MINUTES,
+			min_enactment_period: 3 * MINUTES,
 			min_approval: APP_BIG_TIPPER,
 			min_support: SUP_BIG_TIPPER,
 		},
@@ -239,11 +239,11 @@ const TRACKS_DATA: [(u16, pallet_referenda::TrackInfo<Balance, BlockNumber>); 15
 		pallet_referenda::TrackInfo {
 			name: "small_spender",
 			max_deciding: 50,
-			decision_deposit: 100 * DOLLARS,
-			prepare_period: 4 * HOURS,
-			decision_period: 28 * DAYS,
-			confirm_period: 12 * HOURS,
-			min_enactment_period: 24 * HOURS,
+			decision_deposit: 100 * 3 * CENTS,
+			prepare_period: 10 * MINUTES,
+			decision_period: 20 * MINUTES,
+			confirm_period: 10 * MINUTES,
+			min_enactment_period: 5 * MINUTES,
 			min_approval: APP_SMALL_SPENDER,
 			min_support: SUP_SMALL_SPENDER,
 		},
@@ -253,11 +253,11 @@ const TRACKS_DATA: [(u16, pallet_referenda::TrackInfo<Balance, BlockNumber>); 15
 		pallet_referenda::TrackInfo {
 			name: "medium_spender",
 			max_deciding: 50,
-			decision_deposit: 200 * DOLLARS,
-			prepare_period: 4 * HOURS,
-			decision_period: 28 * DAYS,
-			confirm_period: 24 * HOURS,
-			min_enactment_period: 24 * HOURS,
+			decision_deposit: 200 * 3 * CENTS,
+			prepare_period: 10 * MINUTES,
+			decision_period: 20 * MINUTES,
+			confirm_period: 12 * MINUTES,
+			min_enactment_period: 5 * MINUTES,
 			min_approval: APP_MEDIUM_SPENDER,
 			min_support: SUP_MEDIUM_SPENDER,
 		},
@@ -267,11 +267,11 @@ const TRACKS_DATA: [(u16, pallet_referenda::TrackInfo<Balance, BlockNumber>); 15
 		pallet_referenda::TrackInfo {
 			name: "big_spender",
 			max_deciding: 50,
-			decision_deposit: 400 * DOLLARS,
-			prepare_period: 4 * HOURS,
-			decision_period: 28 * DAYS,
-			confirm_period: 48 * HOURS,
-			min_enactment_period: 24 * HOURS,
+			decision_deposit: 400 * 3 * CENTS,
+			prepare_period: 10 * MINUTES,
+			decision_period: 20 * MINUTES,
+			confirm_period: 14 * MINUTES,
+			min_enactment_period: 5 * MINUTES,
 			min_approval: APP_BIG_SPENDER,
 			min_support: SUP_BIG_SPENDER,
 		},
@@ -310,6 +310,7 @@ impl pallet_referenda::TracksInfo<Balance, BlockNumber> for TracksInfo {
 				origins::Origin::SmallSpender => Ok(32),
 				origins::Origin::MediumSpender => Ok(33),
 				origins::Origin::BigSpender => Ok(34),
+				_ => Err(()),
 			}
 		} else {
 			Err(())
diff --git a/polkadot/runtime/westend/src/lib.rs b/polkadot/runtime/westend/src/lib.rs
index 9ae30c376010ed2af96b58eae556fc5ac3d3c7a5..0e93b3449fec5b8ba20128b37460faa71abb78c0 100644
--- a/polkadot/runtime/westend/src/lib.rs
+++ b/polkadot/runtime/westend/src/lib.rs
@@ -17,7 +17,7 @@
 //! The Westend runtime. This can be compiled with `#[no_std]`, ready for Wasm.
 
 #![cfg_attr(not(feature = "std"), no_std)]
-// `construct_runtime!` does a lot of recursion and requires us to increase the limit to 512.
+// `construct_runtime!` does a lot of recursion and requires us to increase the limit.
 #![recursion_limit = "512"]
 
 use authority_discovery_primitives::AuthorityId as AuthorityDiscoveryId;
@@ -27,10 +27,13 @@ use beefy_primitives::{
 };
 use frame_election_provider_support::{bounds::ElectionBoundsBuilder, onchain, SequentialPhragmen};
 use frame_support::{
-	construct_runtime, parameter_types,
+	construct_runtime,
+	genesis_builder_helper::{build_config, create_default_config},
+	parameter_types,
 	traits::{
-		ConstU32, InstanceFilter, KeyOwnerProofSystem, ProcessMessage, ProcessMessageError,
-		WithdrawReasons,
+		fungible::HoldConsideration, ConstU32, Contains, EitherOf, EitherOfDiverse, EverythingBut,
+		InstanceFilter, KeyOwnerProofSystem, LinearStoragePrice, ProcessMessage,
+		ProcessMessageError, WithdrawReasons,
 	},
 	weights::{ConstantMultiplier, WeightMeter},
 	PalletId,
@@ -50,9 +53,14 @@ use primitives::{
 	ValidatorSignature, PARACHAIN_KEY_TYPE_ID,
 };
 use runtime_common::{
-	assigned_slots, auctions, crowdloan, elections::OnChainAccuracy, impl_runtime_weights,
-	impls::ToAuthor, paras_registrar, paras_sudo_wrapper, prod_or_fast, slots, BalanceToU256,
-	BlockHashCount, BlockLength, CurrencyToVote, SlowAdjustingFeeUpdate, U256ToBalance,
+	assigned_slots, auctions, crowdloan,
+	elections::OnChainAccuracy,
+	impl_runtime_weights,
+	impls::{
+		LocatableAssetConverter, ToAuthor, VersionedLocatableAsset, VersionedMultiLocationConverter,
+	},
+	paras_registrar, paras_sudo_wrapper, prod_or_fast, slots, BalanceToU256, BlockHashCount,
+	BlockLength, CurrencyToVote, SlowAdjustingFeeUpdate, U256ToBalance,
 };
 use runtime_parachains::{
 	assigner_parachains as parachains_assigner_parachains,
@@ -62,7 +70,9 @@ use runtime_parachains::{
 	inclusion::{AggregateMessageOrigin, UmpQueueId},
 	initializer as parachains_initializer, origin as parachains_origin, paras as parachains_paras,
 	paras_inherent as parachains_paras_inherent, reward_points as parachains_reward_points,
-	runtime_api_impl::v5 as parachains_runtime_api_impl,
+	runtime_api_impl::{
+		v7 as parachains_runtime_api_impl, vstaging as parachains_staging_runtime_api_impl,
+	},
 	scheduler as parachains_scheduler, session_info as parachains_session_info,
 	shared as parachains_shared,
 };
@@ -74,21 +84,25 @@ use sp_runtime::{
 	generic, impl_opaque_keys,
 	traits::{
 		AccountIdLookup, BlakeTwo256, Block as BlockT, ConvertInto, Extrinsic as ExtrinsicT,
-		Keccak256, OpaqueKeys, SaturatedConversion, Verify,
+		IdentityLookup, Keccak256, OpaqueKeys, SaturatedConversion, Verify,
 	},
 	transaction_validity::{TransactionPriority, TransactionSource, TransactionValidity},
-	ApplyExtrinsicResult, FixedU128, KeyTypeId, Perbill,
+	ApplyExtrinsicResult, FixedU128, KeyTypeId, Perbill, Percent, Permill,
 };
 use sp_staking::SessionIndex;
 use sp_std::{collections::btree_map::BTreeMap, prelude::*};
 #[cfg(any(feature = "std", test))]
 use sp_version::NativeVersion;
 use sp_version::RuntimeVersion;
-use xcm::latest::Junction;
+use xcm::{
+	latest::{InteriorMultiLocation, Junction, Junction::PalletInstance},
+	VersionedMultiLocation,
+};
+use xcm_builder::PayOverXcm;
 
 pub use frame_system::Call as SystemCall;
 pub use pallet_balances::Call as BalancesCall;
-pub use pallet_election_provider_multi_phase::Call as EPMCall;
+pub use pallet_election_provider_multi_phase::{Call as EPMCall, GeometricDepositBase};
 #[cfg(feature = "std")]
 pub use pallet_staking::StakerStatus;
 use pallet_staking::UseValidatorsMap;
@@ -104,6 +118,13 @@ mod bag_thresholds;
 mod weights;
 pub mod xcm_config;
 
+// Governance and configurations.
+pub mod governance;
+use governance::{
+	pallet_custom_origins, AuctionAdmin, FellowshipAdmin, GeneralAdmin, LeaseAdmin, StakingAdmin,
+	Treasurer, TreasurySpender,
+};
+
 #[cfg(test)]
 mod tests;
 
@@ -119,12 +140,9 @@ pub const VERSION: RuntimeVersion = RuntimeVersion {
 	spec_name: create_runtime_str!("westend"),
 	impl_name: create_runtime_str!("parity-westend"),
 	authoring_version: 2,
-	spec_version: 9430,
+	spec_version: 10020,
 	impl_version: 0,
-	#[cfg(not(feature = "disable-runtime-api"))]
 	apis: RUNTIME_API_VERSIONS,
-	#[cfg(feature = "disable-runtime-api")]
-	apis: sp_version::create_apis_vec![[]],
 	transaction_version: 22,
 	state_version: 1,
 };
@@ -142,13 +160,24 @@ pub fn native_version() -> NativeVersion {
 	NativeVersion { runtime_version: VERSION, can_author_with: Default::default() }
 }
 
+/// A type to identify calls to the Identity pallet. These will be filtered to prevent invocation,
+/// locking the state of the pallet and preventing further updates to identities and sub-identities.
+/// The locked state will be the genesis state of a new system chain and then removed from the Relay
+/// Chain.
+pub struct IdentityCalls;
+impl Contains<RuntimeCall> for IdentityCalls {
+	fn contains(c: &RuntimeCall) -> bool {
+		matches!(c, RuntimeCall::Identity(_))
+	}
+}
+
 parameter_types! {
 	pub const Version: RuntimeVersion = VERSION;
 	pub const SS58Prefix: u8 = 42;
 }
 
 impl frame_system::Config for Runtime {
-	type BaseCallFilter = frame_support::traits::Everything;
+	type BaseCallFilter = EverythingBut<IdentityCalls>;
 	type BlockWeights = BlockWeights;
 	type BlockLength = BlockLength;
 	type RuntimeOrigin = RuntimeOrigin;
@@ -186,7 +215,9 @@ impl pallet_scheduler::Config for Runtime {
 	type PalletsOrigin = OriginCaller;
 	type RuntimeCall = RuntimeCall;
 	type MaximumWeight = MaximumSchedulerWeight;
-	type ScheduleOrigin = EnsureRoot<AccountId>;
+	// The goal of having ScheduleOrigin include AuctionAdmin is to allow the auctions track of
+	// OpenGov to schedule periodic auctions.
+	type ScheduleOrigin = EitherOf<EnsureRoot<AccountId>, AuctionAdmin>;
 	type MaxScheduledPerBlock = MaxScheduledPerBlock;
 	type WeightInfo = weights::pallet_scheduler::WeightInfo<Runtime>;
 	type OriginPrivilegeCmp = frame_support::traits::EqualPrivilegeOnly;
@@ -194,9 +225,9 @@ impl pallet_scheduler::Config for Runtime {
 }
 
 parameter_types! {
-	pub const PreimageMaxSize: u32 = 4096 * 1024;
 	pub const PreimageBaseDeposit: Balance = deposit(2, 64);
 	pub const PreimageByteDeposit: Balance = deposit(0, 1);
+	pub const PreimageHoldReason: RuntimeHoldReason = RuntimeHoldReason::Preimage(pallet_preimage::HoldReason::Preimage);
 }
 
 impl pallet_preimage::Config for Runtime {
@@ -204,8 +235,12 @@ impl pallet_preimage::Config for Runtime {
 	type RuntimeEvent = RuntimeEvent;
 	type Currency = Balances;
 	type ManagerOrigin = EnsureRoot<AccountId>;
-	type BaseDeposit = PreimageBaseDeposit;
-	type ByteDeposit = PreimageByteDeposit;
+	type Consideration = HoldConsideration<
+		AccountId,
+		Balances,
+		PreimageHoldReason,
+		LinearStoragePrice<PreimageBaseDeposit, PreimageByteDeposit, Balance>,
+	>;
 }
 
 parameter_types! {
@@ -268,9 +303,9 @@ impl pallet_balances::Config for Runtime {
 	type ReserveIdentifier = [u8; 8];
 	type WeightInfo = weights::pallet_balances::WeightInfo<Runtime>;
 	type RuntimeHoldReason = RuntimeHoldReason;
-	type FreezeIdentifier = ();
-	type MaxHolds = ConstU32<0>;
-	type MaxFreezes = ConstU32<0>;
+	type FreezeIdentifier = RuntimeFreezeReason;
+	type MaxFreezes = ConstU32<1>;
+	type MaxHolds = ConstU32<1>;
 }
 
 parameter_types! {
@@ -478,7 +513,8 @@ parameter_types! {
 	// signed config
 	pub const SignedMaxSubmissions: u32 = 128;
 	pub const SignedMaxRefunds: u32 = 128 / 4;
-	pub const SignedDepositBase: Balance = deposit(2, 0);
+	pub const SignedFixedDeposit: Balance = deposit(2, 0);
+	pub const SignedDepositIncreaseFactor: Percent = Percent::from_percent(10);
 	pub const SignedDepositByte: Balance = deposit(0, 10) / 1024;
 	// Each good submission will get 1 WND as reward
 	pub SignedRewardBase: Balance = 1 * UNITS;
@@ -550,7 +586,8 @@ impl pallet_election_provider_multi_phase::Config for Runtime {
 	type SignedMaxSubmissions = SignedMaxSubmissions;
 	type SignedMaxRefunds = SignedMaxRefunds;
 	type SignedRewardBase = SignedRewardBase;
-	type SignedDepositBase = SignedDepositBase;
+	type SignedDepositBase =
+		GeometricDepositBase<Balance, SignedFixedDeposit, SignedDepositIncreaseFactor>;
 	type SignedDepositByte = SignedDepositByte;
 	type SignedDepositWeight = ();
 	type SignedMaxWeight =
@@ -666,7 +703,62 @@ impl pallet_fast_unstake::Config for Runtime {
 }
 
 parameter_types! {
+	pub const ProposalBond: Permill = Permill::from_percent(5);
+	pub const ProposalBondMinimum: Balance = 2000 * CENTS;
+	pub const ProposalBondMaximum: Balance = 1 * GRAND;
+	pub const SpendPeriod: BlockNumber = 6 * DAYS;
+	pub const Burn: Permill = Permill::from_perthousand(2);
+	pub const TreasuryPalletId: PalletId = PalletId(*b"py/trsry");
+	pub const PayoutSpendPeriod: BlockNumber = 30 * DAYS;
+	// The asset's interior location for the paying account. This is the Treasury
+	// pallet instance (which sits at index 37).
+	pub TreasuryInteriorLocation: InteriorMultiLocation = PalletInstance(37).into();
+
+	pub const TipCountdown: BlockNumber = 1 * DAYS;
+	pub const TipFindersFee: Percent = Percent::from_percent(20);
+	pub const TipReportDepositBase: Balance = 100 * CENTS;
+	pub const DataDepositPerByte: Balance = 1 * CENTS;
+	pub const MaxApprovals: u32 = 100;
 	pub const MaxAuthorities: u32 = 100_000;
+	pub const MaxKeys: u32 = 10_000;
+	pub const MaxPeerInHeartbeats: u32 = 10_000;
+	pub const MaxBalance: Balance = Balance::max_value();
+}
+
+impl pallet_treasury::Config for Runtime {
+	type PalletId = TreasuryPalletId;
+	type Currency = Balances;
+	type ApproveOrigin = EitherOfDiverse<EnsureRoot<AccountId>, Treasurer>;
+	type RejectOrigin = EitherOfDiverse<EnsureRoot<AccountId>, Treasurer>;
+	type RuntimeEvent = RuntimeEvent;
+	type OnSlash = Treasury;
+	type ProposalBond = ProposalBond;
+	type ProposalBondMinimum = ProposalBondMinimum;
+	type ProposalBondMaximum = ProposalBondMaximum;
+	type SpendPeriod = SpendPeriod;
+	type Burn = Burn;
+	type BurnDestination = ();
+	type MaxApprovals = MaxApprovals;
+	type WeightInfo = weights::pallet_treasury::WeightInfo<Runtime>;
+	type SpendFunds = ();
+	type SpendOrigin = TreasurySpender;
+	type AssetKind = VersionedLocatableAsset;
+	type Beneficiary = VersionedMultiLocation;
+	type BeneficiaryLookup = IdentityLookup<Self::Beneficiary>;
+	type Paymaster = PayOverXcm<
+		TreasuryInteriorLocation,
+		crate::xcm_config::XcmRouter,
+		crate::XcmPallet,
+		ConstU32<{ 6 * HOURS }>,
+		Self::Beneficiary,
+		Self::AssetKind,
+		LocatableAssetConverter,
+		VersionedMultiLocationConverter,
+	>;
+	type BalanceConverter = AssetRate;
+	type PayoutPeriod = PayoutSpendPeriod;
+	#[cfg(feature = "runtime-benchmarks")]
+	type BenchmarkHelper = runtime_common::impls::benchmarks::TreasuryArguments;
 }
 
 impl pallet_offences::Config for Runtime {
@@ -682,8 +774,6 @@ impl pallet_authority_discovery::Config for Runtime {
 parameter_types! {
 	pub const NposSolutionPriority: TransactionPriority = TransactionPriority::max_value() / 2;
 	pub const ImOnlineUnsignedPriority: TransactionPriority = TransactionPriority::max_value();
-	pub const MaxKeys: u32 = 10_000;
-	pub const MaxPeerInHeartbeats: u32 = 10_000;
 }
 
 impl pallet_im_online::Config for Runtime {
@@ -797,8 +887,8 @@ impl pallet_identity::Config for Runtime {
 	type MaxSubAccounts = MaxSubAccounts;
 	type MaxAdditionalFields = MaxAdditionalFields;
 	type MaxRegistrars = MaxRegistrars;
-	type RegistrarOrigin = frame_system::EnsureRoot<AccountId>;
-	type ForceOrigin = frame_system::EnsureRoot<AccountId>;
+	type ForceOrigin = EitherOf<EnsureRoot<Self::AccountId>, GeneralAdmin>;
+	type RegistrarOrigin = EitherOf<EnsureRoot<Self::AccountId>, GeneralAdmin>;
 	type WeightInfo = weights::pallet_identity::WeightInfo<Runtime>;
 }
 
@@ -895,6 +985,7 @@ parameter_types! {
 pub enum ProxyType {
 	Any,
 	NonTransfer,
+	Governance,
 	Staking,
 	SudoBalances,
 	IdentityJudgement,
@@ -927,6 +1018,9 @@ impl InstanceFilter<RuntimeCall> for ProxyType {
 				RuntimeCall::ImOnline(..) |
 				RuntimeCall::Utility(..) |
 				RuntimeCall::Identity(..) |
+				RuntimeCall::ConvictionVoting(..) |
+				RuntimeCall::Referenda(..) |
+				RuntimeCall::Whitelist(..) |
 				RuntimeCall::Recovery(pallet_recovery::Call::as_recovered{..}) |
 				RuntimeCall::Recovery(pallet_recovery::Call::vouch_recovery{..}) |
 				RuntimeCall::Recovery(pallet_recovery::Call::claim_recovery{..}) |
@@ -972,6 +1066,13 @@ impl InstanceFilter<RuntimeCall> for ProxyType {
 				RuntimeCall::Utility(..) => true,
 				_ => false,
 			},
+			ProxyType::Governance => matches!(
+				c,
+				// OpenGov calls
+				RuntimeCall::ConvictionVoting(..) |
+					RuntimeCall::Referenda(..) |
+					RuntimeCall::Whitelist(..)
+			),
 			ProxyType::IdentityJudgement => matches!(
 				c,
 				RuntimeCall::Identity(pallet_identity::Call::provide_judgement { .. }) |
@@ -1045,6 +1146,7 @@ impl parachains_paras::Config for Runtime {
 	type UnsignedPriority = ParasUnsignedPriority;
 	type QueueFootprinter = ParaInclusion;
 	type NextSessionRotation = Babe;
+	type OnNewHead = ();
 }
 
 parameter_types! {
@@ -1166,7 +1268,7 @@ impl parachains_slashing::Config for Runtime {
 
 parameter_types! {
 	pub const ParaDeposit: Balance = 2000 * CENTS;
-	pub const DataDepositPerByte: Balance = deposit(0, 1);
+	pub const RegistrarDataDepositPerByte: Balance = deposit(0, 1);
 }
 
 impl paras_registrar::Config for Runtime {
@@ -1175,7 +1277,7 @@ impl paras_registrar::Config for Runtime {
 	type Currency = Balances;
 	type OnSwap = (Crowdloan, Slots);
 	type ParaDeposit = ParaDeposit;
-	type DataDepositPerByte = DataDepositPerByte;
+	type DataDepositPerByte = RegistrarDataDepositPerByte;
 	type WeightInfo = weights::runtime_common_paras_registrar::WeightInfo<Runtime>;
 }
 
@@ -1189,7 +1291,7 @@ impl slots::Config for Runtime {
 	type Registrar = Registrar;
 	type LeasePeriod = LeasePeriod;
 	type LeaseOffset = ();
-	type ForceOrigin = EnsureRoot<AccountId>;
+	type ForceOrigin = EitherOf<EnsureRoot<Self::AccountId>, LeaseAdmin>;
 	type WeightInfo = weights::runtime_common_slots::WeightInfo<Runtime>;
 }
 
@@ -1229,7 +1331,7 @@ impl auctions::Config for Runtime {
 	type EndingPeriod = EndingPeriod;
 	type SampleLength = SampleLength;
 	type Randomness = pallet_babe::RandomnessFromOneEpochAgo<Runtime>;
-	type InitiateOrigin = EnsureRoot<AccountId>;
+	type InitiateOrigin = EitherOf<EnsureRoot<Self::AccountId>, AuctionAdmin>;
 	type WeightInfo = weights::runtime_common_auctions::WeightInfo<Runtime>;
 }
 
@@ -1242,6 +1344,7 @@ impl pallet_nomination_pools::Config for Runtime {
 	type RuntimeEvent = RuntimeEvent;
 	type WeightInfo = weights::pallet_nomination_pools::WeightInfo<Self>;
 	type Currency = Balances;
+	type RuntimeFreezeReason = RuntimeFreezeReason;
 	type RewardCounter = FixedU128;
 	type BalanceToU256 = BalanceToU256;
 	type U256ToBalance = U256ToBalance;
@@ -1261,6 +1364,18 @@ parameter_types! {
 	pub const MigrationMaxKeyLen: u32 = 512;
 }
 
+impl pallet_asset_rate::Config for Runtime {
+	type WeightInfo = weights::pallet_asset_rate::WeightInfo<Runtime>;
+	type RuntimeEvent = RuntimeEvent;
+	type CreateOrigin = EnsureRoot<AccountId>;
+	type RemoveOrigin = EnsureRoot<AccountId>;
+	type UpdateOrigin = EnsureRoot<AccountId>;
+	type Currency = Balances;
+	type AssetKind = <Runtime as pallet_treasury::Config>::AssetKind;
+	#[cfg(feature = "runtime-benchmarks")]
+	type BenchmarkHelper = runtime_common::impls::benchmarks::AssetRateArguments;
+}
+
 construct_runtime! {
 	pub enum Runtime
 	{
@@ -1311,7 +1426,7 @@ construct_runtime! {
 		Scheduler: pallet_scheduler::{Pallet, Call, Storage, Event<T>} = 20,
 
 		// Preimage registrar.
-		Preimage: pallet_preimage::{Pallet, Call, Storage, Event<T>} = 28,
+		Preimage: pallet_preimage::{Pallet, Call, Storage, Event<T>, HoldReason} = 28,
 
 		// Sudo.
 		Sudo: pallet_sudo::{Pallet, Call, Storage, Event<T>, Config<T>} = 21,
@@ -1329,11 +1444,20 @@ construct_runtime! {
 		VoterList: pallet_bags_list::<Instance1>::{Pallet, Call, Storage, Event<T>} = 25,
 
 		// Nomination pools for staking.
-		NominationPools: pallet_nomination_pools::{Pallet, Call, Storage, Event<T>, Config<T>} = 29,
+		NominationPools: pallet_nomination_pools::{Pallet, Call, Storage, Event<T>, Config<T>, FreezeReason} = 29,
 
 		// Fast unstake pallet: extension to staking.
 		FastUnstake: pallet_fast_unstake = 30,
 
+		// OpenGov
+		ConvictionVoting: pallet_conviction_voting::{Pallet, Call, Storage, Event<T>} = 31,
+		Referenda: pallet_referenda::{Pallet, Call, Storage, Event<T>} = 32,
+		Origins: pallet_custom_origins::{Origin} = 35,
+		Whitelist: pallet_whitelist::{Pallet, Call, Storage, Event<T>} = 36,
+
+		// Treasury
+		Treasury: pallet_treasury::{Pallet, Call, Storage, Config<T>, Event<T>} = 37,
+
 		// Parachains pallets. Start indices at 40 to leave room.
 		ParachainsOrigin: parachains_origin::{Pallet, Origin} = 41,
 		Configuration: parachains_configuration::{Pallet, Call, Storage, Config<T>} = 42,
@@ -1364,6 +1488,9 @@ construct_runtime! {
 
 		// Generalized message queue
 		MessageQueue: pallet_message_queue::{Pallet, Call, Storage, Event<T>} = 100,
+
+		// Asset rate.
+		AssetRate: pallet_asset_rate::{Pallet, Call, Storage, Event<T>} = 101,
 	}
 }
 
@@ -1425,6 +1552,11 @@ pub mod migrations {
 		parachains_scheduler::migration::v1::MigrateToV1<Runtime>,
 		parachains_configuration::migration::v8::MigrateToV8<Runtime>,
 		UpgradeSessionKeys,
+		parachains_configuration::migration::v9::MigrateToV9<Runtime>,
+		paras_registrar::migration::VersionCheckedMigrateToV1<Runtime, ()>,
+		pallet_nomination_pools::migration::versioned_migrations::V5toV6<Runtime>,
+		pallet_referenda::migration::v1::MigrateV0ToV1<Runtime, ()>,
+		pallet_nomination_pools::migration::versioned_migrations::V6ToV7<Runtime>,
 	);
 }
 
@@ -1465,6 +1597,7 @@ mod benches {
 		// Substrate
 		[pallet_bags_list, VoterList]
 		[pallet_balances, Balances]
+		[pallet_conviction_voting, ConvictionVoting]
 		[pallet_election_provider_multi_phase, ElectionProviderMultiPhase]
 		[frame_election_provider_support, ElectionProviderBench::<Runtime>]
 		[pallet_fast_unstake, FastUnstake]
@@ -1478,14 +1611,18 @@ mod benches {
 		[pallet_preimage, Preimage]
 		[pallet_proxy, Proxy]
 		[pallet_recovery, Recovery]
+		[pallet_referenda, Referenda]
 		[pallet_scheduler, Scheduler]
 		[pallet_session, SessionBench::<Runtime>]
 		[pallet_staking, Staking]
 		[pallet_sudo, Sudo]
 		[frame_system, SystemBench::<Runtime>]
 		[pallet_timestamp, Timestamp]
+		[pallet_treasury, Treasury]
 		[pallet_utility, Utility]
 		[pallet_vesting, Vesting]
+		[pallet_whitelist, Whitelist]
+		[pallet_asset_rate, AssetRate]
 		// XCM
 		[pallet_xcm, XcmPallet]
 		// NOTE: Make sure you point to the individual modules below.
@@ -1494,7 +1631,6 @@ mod benches {
 	);
 }
 
-#[cfg(not(feature = "disable-runtime-api"))]
 sp_api::impl_runtime_apis! {
 	impl sp_api::Core<Block> for Runtime {
 		fn version() -> RuntimeVersion {
@@ -1561,6 +1697,7 @@ sp_api::impl_runtime_apis! {
 		}
 	}
 
+	#[api_version(8)]
 	impl primitives::runtime_api::ParachainHost<Block, Hash, BlockNumber> for Runtime {
 		fn validators() -> Vec<ValidatorId> {
 			parachains_runtime_api_impl::validators::<Runtime>()
@@ -1691,6 +1828,22 @@ sp_api::impl_runtime_apis! {
 				key_ownership_proof,
 			)
 		}
+
+		fn minimum_backing_votes() -> u32 {
+			parachains_runtime_api_impl::minimum_backing_votes::<Runtime>()
+		}
+
+		fn para_backing_state(para_id: ParaId) -> Option<primitives::async_backing::BackingState> {
+			parachains_runtime_api_impl::backing_state::<Runtime>(para_id)
+		}
+
+		fn async_backing_params() -> primitives::AsyncBackingParams {
+			parachains_runtime_api_impl::async_backing_params::<Runtime>()
+		}
+
+		fn disabled_validators() -> Vec<ValidatorIndex> {
+			parachains_staging_runtime_api_impl::disabled_validators::<Runtime>()
+		}
 	}
 
 	impl beefy_primitives::BeefyApi<Block, BeefyId> for Runtime {
@@ -2027,13 +2180,13 @@ sp_api::impl_runtime_apis! {
 				AssetId::*, Fungibility::*, InteriorMultiLocation, Junction, Junctions::*,
 				MultiAsset, MultiAssets, MultiLocation, NetworkId, Response,
 			};
-			use xcm_config::{Westmint, TokenLocation};
+			use xcm_config::{AssetHub, TokenLocation};
 
 			impl pallet_xcm_benchmarks::Config for Runtime {
 				type XcmConfig = xcm_config::XcmConfig;
 				type AccountIdConverter = xcm_config::LocationConverter;
 				fn valid_destination() -> Result<MultiLocation, BenchmarkError> {
-					Ok(Westmint::get())
+					Ok(AssetHub::get())
 				}
 				fn worst_case_holding(_depositable_count: u32) -> MultiAssets {
 					// Westend only knows about WND.
@@ -2046,7 +2199,7 @@ sp_api::impl_runtime_apis! {
 
 			parameter_types! {
 				pub const TrustedTeleporter: Option<(MultiLocation, MultiAsset)> = Some((
-					Westmint::get(),
+					AssetHub::get(),
 					MultiAsset { fun: Fungible(1 * UNITS), id: Concrete(TokenLocation::get()) },
 				));
 				pub const TrustedReserve: Option<(MultiLocation, MultiAsset)> = None;
@@ -2085,15 +2238,15 @@ sp_api::impl_runtime_apis! {
 				}
 
 				fn transact_origin_and_runtime_call() -> Result<(MultiLocation, RuntimeCall), BenchmarkError> {
-					Ok((Westmint::get(), frame_system::Call::remark_with_event { remark: vec![] }.into()))
+					Ok((AssetHub::get(), frame_system::Call::remark_with_event { remark: vec![] }.into()))
 				}
 
 				fn subscribe_origin() -> Result<MultiLocation, BenchmarkError> {
-					Ok(Westmint::get())
+					Ok(AssetHub::get())
 				}
 
 				fn claimable_asset() -> Result<(MultiLocation, MultiLocation, MultiAssets), BenchmarkError> {
-					let origin = Westmint::get();
+					let origin = AssetHub::get();
 					let assets: MultiAssets = (Concrete(TokenLocation::get()), 1_000 * UNITS).into();
 					let ticket = MultiLocation { parents: 0, interior: Here };
 					Ok((origin, ticket, assets))
@@ -2129,6 +2282,16 @@ sp_api::impl_runtime_apis! {
 			Ok(batches)
 		}
 	}
+
+	impl sp_genesis_builder::GenesisBuilder<Block> for Runtime {
+		fn create_default_config() -> Vec<u8> {
+			create_default_config::<RuntimeGenesisConfig>()
+		}
+
+		fn build_config(config: Vec<u8>) -> sp_genesis_builder::Result {
+			build_config::<RuntimeGenesisConfig>(config)
+		}
+	}
 }
 
 #[cfg(all(test, feature = "try-runtime"))]
diff --git a/polkadot/runtime/westend/src/weights/mod.rs b/polkadot/runtime/westend/src/weights/mod.rs
index 531de5527de52deb2d3979658f6a28f5b5194787..9ae6798d70b6e234c7ffbbfd99f2f97c56fb30a4 100644
--- a/polkadot/runtime/westend/src/weights/mod.rs
+++ b/polkadot/runtime/westend/src/weights/mod.rs
@@ -17,8 +17,10 @@
 
 pub mod frame_election_provider_support;
 pub mod frame_system;
+pub mod pallet_asset_rate;
 pub mod pallet_bags_list;
 pub mod pallet_balances;
+pub mod pallet_conviction_voting;
 pub mod pallet_election_provider_multi_phase;
 pub mod pallet_fast_unstake;
 pub mod pallet_identity;
@@ -29,13 +31,17 @@ pub mod pallet_multisig;
 pub mod pallet_nomination_pools;
 pub mod pallet_preimage;
 pub mod pallet_proxy;
+pub mod pallet_referenda_fellowship_referenda;
+pub mod pallet_referenda_referenda;
 pub mod pallet_scheduler;
 pub mod pallet_session;
 pub mod pallet_staking;
 pub mod pallet_sudo;
 pub mod pallet_timestamp;
+pub mod pallet_treasury;
 pub mod pallet_utility;
 pub mod pallet_vesting;
+pub mod pallet_whitelist;
 pub mod pallet_xcm;
 pub mod runtime_common_assigned_slots;
 pub mod runtime_common_auctions;
diff --git a/polkadot/runtime/westend/src/weights/pallet_asset_rate.rs b/polkadot/runtime/westend/src/weights/pallet_asset_rate.rs
new file mode 100644
index 0000000000000000000000000000000000000000..810dd01a170263a257629aad42dc166b9bd75f41
--- /dev/null
+++ b/polkadot/runtime/westend/src/weights/pallet_asset_rate.rs
@@ -0,0 +1,86 @@
+// 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/>.
+
+//! Autogenerated weights for `pallet_asset_rate`
+//!
+//! THIS FILE WAS AUTO-GENERATED USING THE SUBSTRATE BENCHMARK CLI VERSION 4.0.0-dev
+//! DATE: 2023-07-04, STEPS: `50`, REPEAT: `2`, LOW RANGE: `[]`, HIGH RANGE: `[]`
+//! WORST CASE MAP SIZE: `1000000`
+//! HOSTNAME: `cob`, CPU: `<UNKNOWN>`
+//! EXECUTION: None, WASM-EXECUTION: Compiled, CHAIN: Some("polkadot-dev"), DB CACHE: 1024
+
+// Executed Command:
+// ./target/debug/polkadot
+// benchmark
+// pallet
+// --chain=polkadot-dev
+// --steps=50
+// --repeat=2
+// --pallet=pallet_asset_rate
+// --extrinsic=*
+// --wasm-execution=compiled
+// --heap-pages=4096
+// --output=./runtime/polkadot/src/weights/
+// --header=./file_header.txt
+
+#![cfg_attr(rustfmt, rustfmt_skip)]
+#![allow(unused_parens)]
+#![allow(unused_imports)]
+#![allow(missing_docs)]
+
+use frame_support::{traits::Get, weights::Weight};
+use core::marker::PhantomData;
+
+/// Weight functions for `pallet_asset_rate`.
+pub struct WeightInfo<T>(PhantomData<T>);
+impl<T: frame_system::Config> pallet_asset_rate::WeightInfo for WeightInfo<T> {
+	/// Storage: AssetRate ConversionRateToNative (r:1 w:1)
+	/// Proof: AssetRate ConversionRateToNative (max_values: None, max_size: Some(1237), added: 3712, mode: MaxEncodedLen)
+	fn create() -> Weight {
+		// Proof Size summary in bytes:
+		//  Measured:  `42`
+		//  Estimated: `4702`
+		// Minimum execution time: 67_000_000 picoseconds.
+		Weight::from_parts(69_000_000, 0)
+			.saturating_add(Weight::from_parts(0, 4702))
+			.saturating_add(T::DbWeight::get().reads(1))
+			.saturating_add(T::DbWeight::get().writes(1))
+	}
+	/// Storage: AssetRate ConversionRateToNative (r:1 w:1)
+	/// Proof: AssetRate ConversionRateToNative (max_values: None, max_size: Some(1237), added: 3712, mode: MaxEncodedLen)
+	fn update() -> Weight {
+		// Proof Size summary in bytes:
+		//  Measured:  `110`
+		//  Estimated: `4702`
+		// Minimum execution time: 69_000_000 picoseconds.
+		Weight::from_parts(71_000_000, 0)
+			.saturating_add(Weight::from_parts(0, 4702))
+			.saturating_add(T::DbWeight::get().reads(1))
+			.saturating_add(T::DbWeight::get().writes(1))
+	}
+	/// Storage: AssetRate ConversionRateToNative (r:1 w:1)
+	/// Proof: AssetRate ConversionRateToNative (max_values: None, max_size: Some(1237), added: 3712, mode: MaxEncodedLen)
+	fn remove() -> Weight {
+		// Proof Size summary in bytes:
+		//  Measured:  `110`
+		//  Estimated: `4702`
+		// Minimum execution time: 70_000_000 picoseconds.
+		Weight::from_parts(90_000_000, 0)
+			.saturating_add(Weight::from_parts(0, 4702))
+			.saturating_add(T::DbWeight::get().reads(1))
+			.saturating_add(T::DbWeight::get().writes(1))
+	}
+}
diff --git a/polkadot/runtime/westend/src/weights/pallet_conviction_voting.rs b/polkadot/runtime/westend/src/weights/pallet_conviction_voting.rs
new file mode 100644
index 0000000000000000000000000000000000000000..8965a7392ed2859b245ff96a80e13dd5eea66403
--- /dev/null
+++ b/polkadot/runtime/westend/src/weights/pallet_conviction_voting.rs
@@ -0,0 +1,194 @@
+// 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/>.
+
+//! Autogenerated weights for `pallet_conviction_voting`
+//!
+//! THIS FILE WAS AUTO-GENERATED USING THE SUBSTRATE BENCHMARK CLI VERSION 4.0.0-dev
+//! DATE: 2023-07-10, STEPS: `50`, REPEAT: `20`, LOW RANGE: `[]`, HIGH RANGE: `[]`
+//! WORST CASE MAP SIZE: `1000000`
+//! HOSTNAME: `runner-xerhrdyb-project-163-concurrent-0`, CPU: `Intel(R) Xeon(R) CPU @ 2.60GHz`
+//! EXECUTION: `Some(Wasm)`, WASM-EXECUTION: `Compiled`, CHAIN: `Some("westend-dev")`, DB CACHE: 1024
+
+// Executed Command:
+// target/production/polkadot
+// benchmark
+// pallet
+// --steps=50
+// --repeat=20
+// --extrinsic=*
+// --execution=wasm
+// --wasm-execution=compiled
+// --heap-pages=4096
+// --json-file=/builds/parity/mirrors/polkadot/.git/.artifacts/bench.json
+// --pallet=pallet_conviction_voting
+// --chain=westend-dev
+// --header=./file_header.txt
+// --output=./runtime/westend/src/weights/
+
+#![cfg_attr(rustfmt, rustfmt_skip)]
+#![allow(unused_parens)]
+#![allow(unused_imports)]
+#![allow(missing_docs)]
+
+use frame_support::{traits::Get, weights::Weight};
+use core::marker::PhantomData;
+
+/// Weight functions for `pallet_conviction_voting`.
+pub struct WeightInfo<T>(PhantomData<T>);
+impl<T: frame_system::Config> pallet_conviction_voting::WeightInfo for WeightInfo<T> {
+	/// Storage: `Referenda::ReferendumInfoFor` (r:1 w:1)
+	/// Proof: `Referenda::ReferendumInfoFor` (`max_values`: None, `max_size`: Some(936), added: 3411, mode: `MaxEncodedLen`)
+	/// Storage: `ConvictionVoting::VotingFor` (r:1 w:1)
+	/// Proof: `ConvictionVoting::VotingFor` (`max_values`: None, `max_size`: Some(27241), added: 29716, mode: `MaxEncodedLen`)
+	/// Storage: `ConvictionVoting::ClassLocksFor` (r:1 w:1)
+	/// Proof: `ConvictionVoting::ClassLocksFor` (`max_values`: None, `max_size`: Some(311), added: 2786, mode: `MaxEncodedLen`)
+	/// Storage: `Balances::Locks` (r:1 w:1)
+	/// Proof: `Balances::Locks` (`max_values`: None, `max_size`: Some(1299), added: 3774, mode: `MaxEncodedLen`)
+	/// Storage: `Balances::Freezes` (r:1 w:0)
+	/// Proof: `Balances::Freezes` (`max_values`: None, `max_size`: Some(49), added: 2524, mode: `MaxEncodedLen`)
+	/// Storage: `Scheduler::Agenda` (r:1 w:1)
+	/// Proof: `Scheduler::Agenda` (`max_values`: None, `max_size`: Some(38963), added: 41438, mode: `MaxEncodedLen`)
+	fn vote_new() -> Weight {
+		// Proof Size summary in bytes:
+		//  Measured:  `13445`
+		//  Estimated: `42428`
+		// Minimum execution time: 152_223_000 picoseconds.
+		Weight::from_parts(162_148_000, 0)
+			.saturating_add(Weight::from_parts(0, 42428))
+			.saturating_add(T::DbWeight::get().reads(6))
+			.saturating_add(T::DbWeight::get().writes(5))
+	}
+	/// Storage: `Referenda::ReferendumInfoFor` (r:1 w:1)
+	/// Proof: `Referenda::ReferendumInfoFor` (`max_values`: None, `max_size`: Some(936), added: 3411, mode: `MaxEncodedLen`)
+	/// Storage: `ConvictionVoting::VotingFor` (r:1 w:1)
+	/// Proof: `ConvictionVoting::VotingFor` (`max_values`: None, `max_size`: Some(27241), added: 29716, mode: `MaxEncodedLen`)
+	/// Storage: `ConvictionVoting::ClassLocksFor` (r:1 w:1)
+	/// Proof: `ConvictionVoting::ClassLocksFor` (`max_values`: None, `max_size`: Some(311), added: 2786, mode: `MaxEncodedLen`)
+	/// Storage: `Balances::Locks` (r:1 w:1)
+	/// Proof: `Balances::Locks` (`max_values`: None, `max_size`: Some(1299), added: 3774, mode: `MaxEncodedLen`)
+	/// Storage: `Balances::Freezes` (r:1 w:0)
+	/// Proof: `Balances::Freezes` (`max_values`: None, `max_size`: Some(49), added: 2524, mode: `MaxEncodedLen`)
+	/// Storage: `Scheduler::Agenda` (r:2 w:2)
+	/// Proof: `Scheduler::Agenda` (`max_values`: None, `max_size`: Some(38963), added: 41438, mode: `MaxEncodedLen`)
+	fn vote_existing() -> Weight {
+		// Proof Size summary in bytes:
+		//  Measured:  `14166`
+		//  Estimated: `83866`
+		// Minimum execution time: 220_361_000 picoseconds.
+		Weight::from_parts(236_478_000, 0)
+			.saturating_add(Weight::from_parts(0, 83866))
+			.saturating_add(T::DbWeight::get().reads(7))
+			.saturating_add(T::DbWeight::get().writes(6))
+	}
+	/// Storage: `ConvictionVoting::VotingFor` (r:1 w:1)
+	/// Proof: `ConvictionVoting::VotingFor` (`max_values`: None, `max_size`: Some(27241), added: 29716, mode: `MaxEncodedLen`)
+	/// Storage: `Referenda::ReferendumInfoFor` (r:1 w:1)
+	/// Proof: `Referenda::ReferendumInfoFor` (`max_values`: None, `max_size`: Some(936), added: 3411, mode: `MaxEncodedLen`)
+	/// Storage: `Scheduler::Agenda` (r:2 w:2)
+	/// Proof: `Scheduler::Agenda` (`max_values`: None, `max_size`: Some(38963), added: 41438, mode: `MaxEncodedLen`)
+	fn remove_vote() -> Weight {
+		// Proof Size summary in bytes:
+		//  Measured:  `13918`
+		//  Estimated: `83866`
+		// Minimum execution time: 198_787_000 picoseconds.
+		Weight::from_parts(204_983_000, 0)
+			.saturating_add(Weight::from_parts(0, 83866))
+			.saturating_add(T::DbWeight::get().reads(4))
+			.saturating_add(T::DbWeight::get().writes(4))
+	}
+	/// Storage: `ConvictionVoting::VotingFor` (r:1 w:1)
+	/// Proof: `ConvictionVoting::VotingFor` (`max_values`: None, `max_size`: Some(27241), added: 29716, mode: `MaxEncodedLen`)
+	/// Storage: `Referenda::ReferendumInfoFor` (r:1 w:0)
+	/// Proof: `Referenda::ReferendumInfoFor` (`max_values`: None, `max_size`: Some(936), added: 3411, mode: `MaxEncodedLen`)
+	fn remove_other_vote() -> Weight {
+		// Proof Size summary in bytes:
+		//  Measured:  `13004`
+		//  Estimated: `30706`
+		// Minimum execution time: 88_469_000 picoseconds.
+		Weight::from_parts(95_942_000, 0)
+			.saturating_add(Weight::from_parts(0, 30706))
+			.saturating_add(T::DbWeight::get().reads(2))
+			.saturating_add(T::DbWeight::get().writes(1))
+	}
+	/// Storage: `ConvictionVoting::VotingFor` (r:2 w:2)
+	/// Proof: `ConvictionVoting::VotingFor` (`max_values`: None, `max_size`: Some(27241), added: 29716, mode: `MaxEncodedLen`)
+	/// Storage: `Referenda::ReferendumInfoFor` (r:512 w:512)
+	/// Proof: `Referenda::ReferendumInfoFor` (`max_values`: None, `max_size`: Some(936), added: 3411, mode: `MaxEncodedLen`)
+	/// Storage: `Scheduler::Agenda` (r:2 w:2)
+	/// Proof: `Scheduler::Agenda` (`max_values`: None, `max_size`: Some(38963), added: 41438, mode: `MaxEncodedLen`)
+	/// Storage: `ConvictionVoting::ClassLocksFor` (r:1 w:1)
+	/// Proof: `ConvictionVoting::ClassLocksFor` (`max_values`: None, `max_size`: Some(311), added: 2786, mode: `MaxEncodedLen`)
+	/// Storage: `Balances::Locks` (r:1 w:1)
+	/// Proof: `Balances::Locks` (`max_values`: None, `max_size`: Some(1299), added: 3774, mode: `MaxEncodedLen`)
+	/// Storage: `Balances::Freezes` (r:1 w:0)
+	/// Proof: `Balances::Freezes` (`max_values`: None, `max_size`: Some(49), added: 2524, mode: `MaxEncodedLen`)
+	/// The range of component `r` is `[0, 512]`.
+	fn delegate(r: u32, ) -> Weight {
+		// Proof Size summary in bytes:
+		//  Measured:  `29640 + r * (365 ±0)`
+		//  Estimated: `83866 + r * (3411 ±0)`
+		// Minimum execution time: 79_951_000 picoseconds.
+		Weight::from_parts(1_844_983_097, 0)
+			.saturating_add(Weight::from_parts(0, 83866))
+			// Standard Error: 160_158
+			.saturating_add(Weight::from_parts(43_973_863, 0).saturating_mul(r.into()))
+			.saturating_add(T::DbWeight::get().reads(7))
+			.saturating_add(T::DbWeight::get().reads((1_u64).saturating_mul(r.into())))
+			.saturating_add(T::DbWeight::get().writes(6))
+			.saturating_add(T::DbWeight::get().writes((1_u64).saturating_mul(r.into())))
+			.saturating_add(Weight::from_parts(0, 3411).saturating_mul(r.into()))
+	}
+	/// Storage: `ConvictionVoting::VotingFor` (r:2 w:2)
+	/// Proof: `ConvictionVoting::VotingFor` (`max_values`: None, `max_size`: Some(27241), added: 29716, mode: `MaxEncodedLen`)
+	/// Storage: `Referenda::ReferendumInfoFor` (r:512 w:512)
+	/// Proof: `Referenda::ReferendumInfoFor` (`max_values`: None, `max_size`: Some(936), added: 3411, mode: `MaxEncodedLen`)
+	/// Storage: `Scheduler::Agenda` (r:2 w:2)
+	/// Proof: `Scheduler::Agenda` (`max_values`: None, `max_size`: Some(38963), added: 41438, mode: `MaxEncodedLen`)
+	/// The range of component `r` is `[0, 512]`.
+	fn undelegate(r: u32, ) -> Weight {
+		// Proof Size summary in bytes:
+		//  Measured:  `29555 + r * (365 ±0)`
+		//  Estimated: `83866 + r * (3411 ±0)`
+		// Minimum execution time: 47_976_000 picoseconds.
+		Weight::from_parts(1_877_857_335, 0)
+			.saturating_add(Weight::from_parts(0, 83866))
+			// Standard Error: 168_477
+			.saturating_add(Weight::from_parts(43_303_902, 0).saturating_mul(r.into()))
+			.saturating_add(T::DbWeight::get().reads(4))
+			.saturating_add(T::DbWeight::get().reads((1_u64).saturating_mul(r.into())))
+			.saturating_add(T::DbWeight::get().writes(4))
+			.saturating_add(T::DbWeight::get().writes((1_u64).saturating_mul(r.into())))
+			.saturating_add(Weight::from_parts(0, 3411).saturating_mul(r.into()))
+	}
+	/// Storage: `ConvictionVoting::VotingFor` (r:1 w:1)
+	/// Proof: `ConvictionVoting::VotingFor` (`max_values`: None, `max_size`: Some(27241), added: 29716, mode: `MaxEncodedLen`)
+	/// Storage: `ConvictionVoting::ClassLocksFor` (r:1 w:1)
+	/// Proof: `ConvictionVoting::ClassLocksFor` (`max_values`: None, `max_size`: Some(311), added: 2786, mode: `MaxEncodedLen`)
+	/// Storage: `Balances::Locks` (r:1 w:1)
+	/// Proof: `Balances::Locks` (`max_values`: None, `max_size`: Some(1299), added: 3774, mode: `MaxEncodedLen`)
+	/// Storage: `Balances::Freezes` (r:1 w:0)
+	/// Proof: `Balances::Freezes` (`max_values`: None, `max_size`: Some(49), added: 2524, mode: `MaxEncodedLen`)
+	fn unlock() -> Weight {
+		// Proof Size summary in bytes:
+		//  Measured:  `12218`
+		//  Estimated: `30706`
+		// Minimum execution time: 102_868_000 picoseconds.
+		Weight::from_parts(110_438_000, 0)
+			.saturating_add(Weight::from_parts(0, 30706))
+			.saturating_add(T::DbWeight::get().reads(4))
+			.saturating_add(T::DbWeight::get().writes(3))
+	}
+}
diff --git a/polkadot/runtime/westend/src/weights/pallet_nomination_pools.rs b/polkadot/runtime/westend/src/weights/pallet_nomination_pools.rs
index 9d43eb2498927cac586eb56c4247d262adee27b0..49bc687a3e4fa2afba34567769bb3b68c2d55d89 100644
--- a/polkadot/runtime/westend/src/weights/pallet_nomination_pools.rs
+++ b/polkadot/runtime/westend/src/weights/pallet_nomination_pools.rs
@@ -17,27 +17,25 @@
 //! Autogenerated weights for `pallet_nomination_pools`
 //!
 //! THIS FILE WAS AUTO-GENERATED USING THE SUBSTRATE BENCHMARK CLI VERSION 4.0.0-dev
-//! DATE: 2023-06-14, STEPS: `50`, REPEAT: `20`, LOW RANGE: `[]`, HIGH RANGE: `[]`
+//! DATE: 2023-09-22, STEPS: `50`, REPEAT: `20`, LOW RANGE: `[]`, HIGH RANGE: `[]`
 //! WORST CASE MAP SIZE: `1000000`
-//! HOSTNAME: `runner--ss9ysm1-project-163-concurrent-0`, CPU: `Intel(R) Xeon(R) CPU @ 2.60GHz`
-//! EXECUTION: Some(Wasm), WASM-EXECUTION: Compiled, CHAIN: Some("westend-dev"), DB CACHE: 1024
+//! HOSTNAME: `runner-nbnwcyh-project-674-concurrent-0`, CPU: `Intel(R) Xeon(R) CPU @ 2.60GHz`
+//! WASM-EXECUTION: `Compiled`, CHAIN: `Some("westend-dev")`, DB CACHE: 1024
 
 // Executed Command:
-// ./target/production/polkadot
+// target/production/polkadot
 // benchmark
 // pallet
-// --chain=westend-dev
 // --steps=50
 // --repeat=20
-// --no-storage-info
-// --no-median-slopes
-// --no-min-squares
-// --pallet=pallet_nomination_pools
 // --extrinsic=*
-// --execution=wasm
 // --wasm-execution=compiled
-// --header=./file_header.txt
-// --output=./runtime/westend/src/weights/
+// --heap-pages=4096
+// --json-file=/builds/parity/mirrors/polkadot-sdk/.git/.artifacts/bench.json
+// --pallet=pallet_nomination_pools
+// --chain=westend-dev
+// --header=./polkadot/file_header.txt
+// --output=./polkadot/runtime/westend/src/weights/
 
 #![cfg_attr(rustfmt, rustfmt_skip)]
 #![allow(unused_parens)]
@@ -50,552 +48,574 @@ use core::marker::PhantomData;
 /// Weight functions for `pallet_nomination_pools`.
 pub struct WeightInfo<T>(PhantomData<T>);
 impl<T: frame_system::Config> pallet_nomination_pools::WeightInfo for WeightInfo<T> {
-	/// Storage: NominationPools MinJoinBond (r:1 w:0)
-	/// Proof: NominationPools MinJoinBond (max_values: Some(1), max_size: Some(16), added: 511, mode: MaxEncodedLen)
-	/// Storage: NominationPools PoolMembers (r:1 w:1)
-	/// Proof: NominationPools PoolMembers (max_values: None, max_size: Some(717), added: 3192, mode: MaxEncodedLen)
-	/// Storage: NominationPools BondedPools (r:1 w:1)
-	/// Proof: NominationPools BondedPools (max_values: None, max_size: Some(220), added: 2695, mode: MaxEncodedLen)
-	/// Storage: Staking Bonded (r:1 w:0)
-	/// Proof: Staking Bonded (max_values: None, max_size: Some(72), added: 2547, mode: MaxEncodedLen)
-	/// Storage: Staking Ledger (r:1 w:1)
-	/// Proof: Staking Ledger (max_values: None, max_size: Some(1091), added: 3566, mode: MaxEncodedLen)
-	/// Storage: NominationPools RewardPools (r:1 w:1)
-	/// Proof: NominationPools RewardPools (max_values: None, max_size: Some(92), added: 2567, mode: MaxEncodedLen)
-	/// Storage: NominationPools GlobalMaxCommission (r:1 w:0)
-	/// Proof: NominationPools GlobalMaxCommission (max_values: Some(1), max_size: Some(4), added: 499, mode: MaxEncodedLen)
-	/// Storage: System Account (r:2 w:1)
-	/// Proof: System Account (max_values: None, max_size: Some(128), added: 2603, mode: MaxEncodedLen)
-	/// Storage: NominationPools MaxPoolMembersPerPool (r:1 w:0)
-	/// Proof: NominationPools MaxPoolMembersPerPool (max_values: Some(1), max_size: Some(4), added: 499, mode: MaxEncodedLen)
-	/// Storage: NominationPools MaxPoolMembers (r:1 w:0)
-	/// Proof: NominationPools MaxPoolMembers (max_values: Some(1), max_size: Some(4), added: 499, mode: MaxEncodedLen)
-	/// Storage: NominationPools CounterForPoolMembers (r:1 w:1)
-	/// Proof: NominationPools CounterForPoolMembers (max_values: Some(1), max_size: Some(4), added: 499, mode: MaxEncodedLen)
-	/// Storage: Balances Locks (r:1 w:1)
-	/// Proof: Balances Locks (max_values: None, max_size: Some(1299), added: 3774, mode: MaxEncodedLen)
-	/// Storage: Balances Freezes (r:1 w:0)
-	/// Proof: Balances Freezes (max_values: None, max_size: Some(49), added: 2524, mode: MaxEncodedLen)
-	/// Storage: VoterList ListNodes (r:3 w:3)
-	/// Proof: VoterList ListNodes (max_values: None, max_size: Some(154), added: 2629, mode: MaxEncodedLen)
-	/// Storage: VoterList ListBags (r:2 w:2)
-	/// Proof: VoterList ListBags (max_values: None, max_size: Some(82), added: 2557, mode: MaxEncodedLen)
+	/// Storage: `NominationPools::MinJoinBond` (r:1 w:0)
+	/// Proof: `NominationPools::MinJoinBond` (`max_values`: Some(1), `max_size`: Some(16), added: 511, mode: `MaxEncodedLen`)
+	/// Storage: `NominationPools::PoolMembers` (r:1 w:1)
+	/// Proof: `NominationPools::PoolMembers` (`max_values`: None, `max_size`: Some(717), added: 3192, mode: `MaxEncodedLen`)
+	/// Storage: `NominationPools::BondedPools` (r:1 w:1)
+	/// Proof: `NominationPools::BondedPools` (`max_values`: None, `max_size`: Some(220), added: 2695, mode: `MaxEncodedLen`)
+	/// Storage: `Staking::Bonded` (r:1 w:0)
+	/// Proof: `Staking::Bonded` (`max_values`: None, `max_size`: Some(72), added: 2547, mode: `MaxEncodedLen`)
+	/// Storage: `Staking::Ledger` (r:1 w:1)
+	/// Proof: `Staking::Ledger` (`max_values`: None, `max_size`: Some(1091), added: 3566, mode: `MaxEncodedLen`)
+	/// Storage: `NominationPools::RewardPools` (r:1 w:1)
+	/// Proof: `NominationPools::RewardPools` (`max_values`: None, `max_size`: Some(92), added: 2567, mode: `MaxEncodedLen`)
+	/// Storage: `NominationPools::GlobalMaxCommission` (r:1 w:0)
+	/// Proof: `NominationPools::GlobalMaxCommission` (`max_values`: Some(1), `max_size`: Some(4), added: 499, mode: `MaxEncodedLen`)
+	/// Storage: `System::Account` (r:2 w:1)
+	/// Proof: `System::Account` (`max_values`: None, `max_size`: Some(128), added: 2603, mode: `MaxEncodedLen`)
+	/// Storage: `NominationPools::MaxPoolMembersPerPool` (r:1 w:0)
+	/// Proof: `NominationPools::MaxPoolMembersPerPool` (`max_values`: Some(1), `max_size`: Some(4), added: 499, mode: `MaxEncodedLen`)
+	/// Storage: `NominationPools::MaxPoolMembers` (r:1 w:0)
+	/// Proof: `NominationPools::MaxPoolMembers` (`max_values`: Some(1), `max_size`: Some(4), added: 499, mode: `MaxEncodedLen`)
+	/// Storage: `NominationPools::CounterForPoolMembers` (r:1 w:1)
+	/// Proof: `NominationPools::CounterForPoolMembers` (`max_values`: Some(1), `max_size`: Some(4), added: 499, mode: `MaxEncodedLen`)
+	/// Storage: `Balances::Locks` (r:1 w:1)
+	/// Proof: `Balances::Locks` (`max_values`: None, `max_size`: Some(1299), added: 3774, mode: `MaxEncodedLen`)
+	/// Storage: `Balances::Freezes` (r:1 w:0)
+	/// Proof: `Balances::Freezes` (`max_values`: None, `max_size`: Some(67), added: 2542, mode: `MaxEncodedLen`)
+	/// Storage: `VoterList::ListNodes` (r:3 w:3)
+	/// Proof: `VoterList::ListNodes` (`max_values`: None, `max_size`: Some(154), added: 2629, mode: `MaxEncodedLen`)
+	/// Storage: `VoterList::ListBags` (r:2 w:2)
+	/// Proof: `VoterList::ListBags` (`max_values`: None, `max_size`: Some(82), added: 2557, mode: `MaxEncodedLen`)
 	fn join() -> Weight {
 		// Proof Size summary in bytes:
-		//  Measured:  `3281`
+		//  Measured:  `3318`
 		//  Estimated: `8877`
-		// Minimum execution time: 196_298_000 picoseconds.
-		Weight::from_parts(202_857_000, 0)
+		// Minimum execution time: 187_795_000 picoseconds.
+		Weight::from_parts(193_857_000, 0)
 			.saturating_add(Weight::from_parts(0, 8877))
 			.saturating_add(T::DbWeight::get().reads(19))
 			.saturating_add(T::DbWeight::get().writes(12))
 	}
-	/// Storage: NominationPools PoolMembers (r:1 w:1)
-	/// Proof: NominationPools PoolMembers (max_values: None, max_size: Some(717), added: 3192, mode: MaxEncodedLen)
-	/// Storage: NominationPools BondedPools (r:1 w:1)
-	/// Proof: NominationPools BondedPools (max_values: None, max_size: Some(220), added: 2695, mode: MaxEncodedLen)
-	/// Storage: NominationPools RewardPools (r:1 w:1)
-	/// Proof: NominationPools RewardPools (max_values: None, max_size: Some(92), added: 2567, mode: MaxEncodedLen)
-	/// Storage: NominationPools GlobalMaxCommission (r:1 w:0)
-	/// Proof: NominationPools GlobalMaxCommission (max_values: Some(1), max_size: Some(4), added: 499, mode: MaxEncodedLen)
-	/// Storage: System Account (r:3 w:2)
-	/// Proof: System Account (max_values: None, max_size: Some(128), added: 2603, mode: MaxEncodedLen)
-	/// Storage: Staking Bonded (r:1 w:0)
-	/// Proof: Staking Bonded (max_values: None, max_size: Some(72), added: 2547, mode: MaxEncodedLen)
-	/// Storage: Staking Ledger (r:1 w:1)
-	/// Proof: Staking Ledger (max_values: None, max_size: Some(1091), added: 3566, mode: MaxEncodedLen)
-	/// Storage: Balances Locks (r:1 w:1)
-	/// Proof: Balances Locks (max_values: None, max_size: Some(1299), added: 3774, mode: MaxEncodedLen)
-	/// Storage: Balances Freezes (r:1 w:0)
-	/// Proof: Balances Freezes (max_values: None, max_size: Some(49), added: 2524, mode: MaxEncodedLen)
-	/// Storage: VoterList ListNodes (r:3 w:3)
-	/// Proof: VoterList ListNodes (max_values: None, max_size: Some(154), added: 2629, mode: MaxEncodedLen)
-	/// Storage: VoterList ListBags (r:2 w:2)
-	/// Proof: VoterList ListBags (max_values: None, max_size: Some(82), added: 2557, mode: MaxEncodedLen)
+	/// Storage: `NominationPools::PoolMembers` (r:1 w:1)
+	/// Proof: `NominationPools::PoolMembers` (`max_values`: None, `max_size`: Some(717), added: 3192, mode: `MaxEncodedLen`)
+	/// Storage: `NominationPools::BondedPools` (r:1 w:1)
+	/// Proof: `NominationPools::BondedPools` (`max_values`: None, `max_size`: Some(220), added: 2695, mode: `MaxEncodedLen`)
+	/// Storage: `NominationPools::RewardPools` (r:1 w:1)
+	/// Proof: `NominationPools::RewardPools` (`max_values`: None, `max_size`: Some(92), added: 2567, mode: `MaxEncodedLen`)
+	/// Storage: `NominationPools::GlobalMaxCommission` (r:1 w:0)
+	/// Proof: `NominationPools::GlobalMaxCommission` (`max_values`: Some(1), `max_size`: Some(4), added: 499, mode: `MaxEncodedLen`)
+	/// Storage: `System::Account` (r:3 w:2)
+	/// Proof: `System::Account` (`max_values`: None, `max_size`: Some(128), added: 2603, mode: `MaxEncodedLen`)
+	/// Storage: `Staking::Bonded` (r:1 w:0)
+	/// Proof: `Staking::Bonded` (`max_values`: None, `max_size`: Some(72), added: 2547, mode: `MaxEncodedLen`)
+	/// Storage: `Staking::Ledger` (r:1 w:1)
+	/// Proof: `Staking::Ledger` (`max_values`: None, `max_size`: Some(1091), added: 3566, mode: `MaxEncodedLen`)
+	/// Storage: `Balances::Locks` (r:1 w:1)
+	/// Proof: `Balances::Locks` (`max_values`: None, `max_size`: Some(1299), added: 3774, mode: `MaxEncodedLen`)
+	/// Storage: `Balances::Freezes` (r:1 w:0)
+	/// Proof: `Balances::Freezes` (`max_values`: None, `max_size`: Some(67), added: 2542, mode: `MaxEncodedLen`)
+	/// Storage: `VoterList::ListNodes` (r:3 w:3)
+	/// Proof: `VoterList::ListNodes` (`max_values`: None, `max_size`: Some(154), added: 2629, mode: `MaxEncodedLen`)
+	/// Storage: `VoterList::ListBags` (r:2 w:2)
+	/// Proof: `VoterList::ListBags` (`max_values`: None, `max_size`: Some(82), added: 2557, mode: `MaxEncodedLen`)
 	fn bond_extra_transfer() -> Weight {
 		// Proof Size summary in bytes:
-		//  Measured:  `3291`
+		//  Measured:  `3328`
 		//  Estimated: `8877`
-		// Minimum execution time: 191_639_000 picoseconds.
-		Weight::from_parts(197_000_000, 0)
+		// Minimum execution time: 186_245_000 picoseconds.
+		Weight::from_parts(190_916_000, 0)
 			.saturating_add(Weight::from_parts(0, 8877))
 			.saturating_add(T::DbWeight::get().reads(16))
 			.saturating_add(T::DbWeight::get().writes(12))
 	}
-	/// Storage: NominationPools ClaimPermissions (r:1 w:0)
-	/// Proof: NominationPools ClaimPermissions (max_values: None, max_size: Some(41), added: 2516, mode: MaxEncodedLen)
-	/// Storage: NominationPools PoolMembers (r:1 w:1)
-	/// Proof: NominationPools PoolMembers (max_values: None, max_size: Some(717), added: 3192, mode: MaxEncodedLen)
-	/// Storage: NominationPools BondedPools (r:1 w:1)
-	/// Proof: NominationPools BondedPools (max_values: None, max_size: Some(220), added: 2695, mode: MaxEncodedLen)
-	/// Storage: NominationPools RewardPools (r:1 w:1)
-	/// Proof: NominationPools RewardPools (max_values: None, max_size: Some(92), added: 2567, mode: MaxEncodedLen)
-	/// Storage: NominationPools GlobalMaxCommission (r:1 w:0)
-	/// Proof: NominationPools GlobalMaxCommission (max_values: Some(1), max_size: Some(4), added: 499, mode: MaxEncodedLen)
-	/// Storage: System Account (r:3 w:3)
-	/// Proof: System Account (max_values: None, max_size: Some(128), added: 2603, mode: MaxEncodedLen)
-	/// Storage: Staking Bonded (r:1 w:0)
-	/// Proof: Staking Bonded (max_values: None, max_size: Some(72), added: 2547, mode: MaxEncodedLen)
-	/// Storage: Staking Ledger (r:1 w:1)
-	/// Proof: Staking Ledger (max_values: None, max_size: Some(1091), added: 3566, mode: MaxEncodedLen)
-	/// Storage: Balances Locks (r:1 w:1)
-	/// Proof: Balances Locks (max_values: None, max_size: Some(1299), added: 3774, mode: MaxEncodedLen)
-	/// Storage: Balances Freezes (r:1 w:0)
-	/// Proof: Balances Freezes (max_values: None, max_size: Some(49), added: 2524, mode: MaxEncodedLen)
-	/// Storage: VoterList ListNodes (r:2 w:2)
-	/// Proof: VoterList ListNodes (max_values: None, max_size: Some(154), added: 2629, mode: MaxEncodedLen)
-	/// Storage: VoterList ListBags (r:2 w:2)
-	/// Proof: VoterList ListBags (max_values: None, max_size: Some(82), added: 2557, mode: MaxEncodedLen)
+	/// Storage: `NominationPools::ClaimPermissions` (r:1 w:0)
+	/// Proof: `NominationPools::ClaimPermissions` (`max_values`: None, `max_size`: Some(41), added: 2516, mode: `MaxEncodedLen`)
+	/// Storage: `NominationPools::PoolMembers` (r:1 w:1)
+	/// Proof: `NominationPools::PoolMembers` (`max_values`: None, `max_size`: Some(717), added: 3192, mode: `MaxEncodedLen`)
+	/// Storage: `NominationPools::BondedPools` (r:1 w:1)
+	/// Proof: `NominationPools::BondedPools` (`max_values`: None, `max_size`: Some(220), added: 2695, mode: `MaxEncodedLen`)
+	/// Storage: `NominationPools::RewardPools` (r:1 w:1)
+	/// Proof: `NominationPools::RewardPools` (`max_values`: None, `max_size`: Some(92), added: 2567, mode: `MaxEncodedLen`)
+	/// Storage: `NominationPools::GlobalMaxCommission` (r:1 w:0)
+	/// Proof: `NominationPools::GlobalMaxCommission` (`max_values`: Some(1), `max_size`: Some(4), added: 499, mode: `MaxEncodedLen`)
+	/// Storage: `System::Account` (r:3 w:3)
+	/// Proof: `System::Account` (`max_values`: None, `max_size`: Some(128), added: 2603, mode: `MaxEncodedLen`)
+	/// Storage: `Staking::Bonded` (r:1 w:0)
+	/// Proof: `Staking::Bonded` (`max_values`: None, `max_size`: Some(72), added: 2547, mode: `MaxEncodedLen`)
+	/// Storage: `Staking::Ledger` (r:1 w:1)
+	/// Proof: `Staking::Ledger` (`max_values`: None, `max_size`: Some(1091), added: 3566, mode: `MaxEncodedLen`)
+	/// Storage: `Balances::Locks` (r:1 w:1)
+	/// Proof: `Balances::Locks` (`max_values`: None, `max_size`: Some(1299), added: 3774, mode: `MaxEncodedLen`)
+	/// Storage: `Balances::Freezes` (r:1 w:0)
+	/// Proof: `Balances::Freezes` (`max_values`: None, `max_size`: Some(67), added: 2542, mode: `MaxEncodedLen`)
+	/// Storage: `VoterList::ListNodes` (r:2 w:2)
+	/// Proof: `VoterList::ListNodes` (`max_values`: None, `max_size`: Some(154), added: 2629, mode: `MaxEncodedLen`)
+	/// Storage: `VoterList::ListBags` (r:2 w:2)
+	/// Proof: `VoterList::ListBags` (`max_values`: None, `max_size`: Some(82), added: 2557, mode: `MaxEncodedLen`)
 	fn bond_extra_other() -> Weight {
 		// Proof Size summary in bytes:
-		//  Measured:  `3186`
+		//  Measured:  `3274`
 		//  Estimated: `8799`
-		// Minimum execution time: 224_836_000 picoseconds.
-		Weight::from_parts(230_990_000, 0)
+		// Minimum execution time: 217_918_000 picoseconds.
+		Weight::from_parts(224_772_000, 0)
 			.saturating_add(Weight::from_parts(0, 8799))
 			.saturating_add(T::DbWeight::get().reads(16))
 			.saturating_add(T::DbWeight::get().writes(12))
 	}
-	/// Storage: NominationPools ClaimPermissions (r:1 w:0)
-	/// Proof: NominationPools ClaimPermissions (max_values: None, max_size: Some(41), added: 2516, mode: MaxEncodedLen)
-	/// Storage: NominationPools PoolMembers (r:1 w:1)
-	/// Proof: NominationPools PoolMembers (max_values: None, max_size: Some(717), added: 3192, mode: MaxEncodedLen)
-	/// Storage: NominationPools BondedPools (r:1 w:1)
-	/// Proof: NominationPools BondedPools (max_values: None, max_size: Some(220), added: 2695, mode: MaxEncodedLen)
-	/// Storage: NominationPools RewardPools (r:1 w:1)
-	/// Proof: NominationPools RewardPools (max_values: None, max_size: Some(92), added: 2567, mode: MaxEncodedLen)
-	/// Storage: NominationPools GlobalMaxCommission (r:1 w:0)
-	/// Proof: NominationPools GlobalMaxCommission (max_values: Some(1), max_size: Some(4), added: 499, mode: MaxEncodedLen)
-	/// Storage: System Account (r:1 w:1)
-	/// Proof: System Account (max_values: None, max_size: Some(128), added: 2603, mode: MaxEncodedLen)
+	/// Storage: `NominationPools::ClaimPermissions` (r:1 w:0)
+	/// Proof: `NominationPools::ClaimPermissions` (`max_values`: None, `max_size`: Some(41), added: 2516, mode: `MaxEncodedLen`)
+	/// Storage: `NominationPools::PoolMembers` (r:1 w:1)
+	/// Proof: `NominationPools::PoolMembers` (`max_values`: None, `max_size`: Some(717), added: 3192, mode: `MaxEncodedLen`)
+	/// Storage: `NominationPools::BondedPools` (r:1 w:1)
+	/// Proof: `NominationPools::BondedPools` (`max_values`: None, `max_size`: Some(220), added: 2695, mode: `MaxEncodedLen`)
+	/// Storage: `NominationPools::RewardPools` (r:1 w:1)
+	/// Proof: `NominationPools::RewardPools` (`max_values`: None, `max_size`: Some(92), added: 2567, mode: `MaxEncodedLen`)
+	/// Storage: `NominationPools::GlobalMaxCommission` (r:1 w:0)
+	/// Proof: `NominationPools::GlobalMaxCommission` (`max_values`: Some(1), `max_size`: Some(4), added: 499, mode: `MaxEncodedLen`)
+	/// Storage: `System::Account` (r:1 w:1)
+	/// Proof: `System::Account` (`max_values`: None, `max_size`: Some(128), added: 2603, mode: `MaxEncodedLen`)
 	fn claim_payout() -> Weight {
 		// Proof Size summary in bytes:
 		//  Measured:  `1137`
 		//  Estimated: `4182`
-		// Minimum execution time: 79_609_000 picoseconds.
-		Weight::from_parts(81_434_000, 0)
+		// Minimum execution time: 76_958_000 picoseconds.
+		Weight::from_parts(78_278_000, 0)
 			.saturating_add(Weight::from_parts(0, 4182))
 			.saturating_add(T::DbWeight::get().reads(6))
 			.saturating_add(T::DbWeight::get().writes(4))
 	}
-	/// Storage: NominationPools PoolMembers (r:1 w:1)
-	/// Proof: NominationPools PoolMembers (max_values: None, max_size: Some(717), added: 3192, mode: MaxEncodedLen)
-	/// Storage: NominationPools BondedPools (r:1 w:1)
-	/// Proof: NominationPools BondedPools (max_values: None, max_size: Some(220), added: 2695, mode: MaxEncodedLen)
-	/// Storage: NominationPools RewardPools (r:1 w:1)
-	/// Proof: NominationPools RewardPools (max_values: None, max_size: Some(92), added: 2567, mode: MaxEncodedLen)
-	/// Storage: Staking Bonded (r:1 w:0)
-	/// Proof: Staking Bonded (max_values: None, max_size: Some(72), added: 2547, mode: MaxEncodedLen)
-	/// Storage: Staking Ledger (r:1 w:1)
-	/// Proof: Staking Ledger (max_values: None, max_size: Some(1091), added: 3566, mode: MaxEncodedLen)
-	/// Storage: NominationPools GlobalMaxCommission (r:1 w:0)
-	/// Proof: NominationPools GlobalMaxCommission (max_values: Some(1), max_size: Some(4), added: 499, mode: MaxEncodedLen)
-	/// Storage: System Account (r:2 w:1)
-	/// Proof: System Account (max_values: None, max_size: Some(128), added: 2603, mode: MaxEncodedLen)
-	/// Storage: Staking CurrentEra (r:1 w:0)
-	/// Proof: Staking CurrentEra (max_values: Some(1), max_size: Some(4), added: 499, mode: MaxEncodedLen)
-	/// Storage: Staking Nominators (r:1 w:0)
-	/// Proof: Staking Nominators (max_values: None, max_size: Some(558), added: 3033, mode: MaxEncodedLen)
-	/// Storage: Staking MinNominatorBond (r:1 w:0)
-	/// Proof: Staking MinNominatorBond (max_values: Some(1), max_size: Some(16), added: 511, mode: MaxEncodedLen)
-	/// Storage: Balances Locks (r:1 w:1)
-	/// Proof: Balances Locks (max_values: None, max_size: Some(1299), added: 3774, mode: MaxEncodedLen)
-	/// Storage: Balances Freezes (r:1 w:0)
-	/// Proof: Balances Freezes (max_values: None, max_size: Some(49), added: 2524, mode: MaxEncodedLen)
-	/// Storage: VoterList ListNodes (r:3 w:3)
-	/// Proof: VoterList ListNodes (max_values: None, max_size: Some(154), added: 2629, mode: MaxEncodedLen)
-	/// Storage: VoterList ListBags (r:2 w:2)
-	/// Proof: VoterList ListBags (max_values: None, max_size: Some(82), added: 2557, mode: MaxEncodedLen)
-	/// Storage: NominationPools SubPoolsStorage (r:1 w:1)
-	/// Proof: NominationPools SubPoolsStorage (max_values: None, max_size: Some(261), added: 2736, mode: MaxEncodedLen)
-	/// Storage: NominationPools CounterForSubPoolsStorage (r:1 w:1)
-	/// Proof: NominationPools CounterForSubPoolsStorage (max_values: Some(1), max_size: Some(4), added: 499, mode: MaxEncodedLen)
+	/// Storage: `NominationPools::PoolMembers` (r:1 w:1)
+	/// Proof: `NominationPools::PoolMembers` (`max_values`: None, `max_size`: Some(717), added: 3192, mode: `MaxEncodedLen`)
+	/// Storage: `NominationPools::BondedPools` (r:1 w:1)
+	/// Proof: `NominationPools::BondedPools` (`max_values`: None, `max_size`: Some(220), added: 2695, mode: `MaxEncodedLen`)
+	/// Storage: `NominationPools::RewardPools` (r:1 w:1)
+	/// Proof: `NominationPools::RewardPools` (`max_values`: None, `max_size`: Some(92), added: 2567, mode: `MaxEncodedLen`)
+	/// Storage: `Staking::Bonded` (r:1 w:0)
+	/// Proof: `Staking::Bonded` (`max_values`: None, `max_size`: Some(72), added: 2547, mode: `MaxEncodedLen`)
+	/// Storage: `Staking::Ledger` (r:1 w:1)
+	/// Proof: `Staking::Ledger` (`max_values`: None, `max_size`: Some(1091), added: 3566, mode: `MaxEncodedLen`)
+	/// Storage: `NominationPools::GlobalMaxCommission` (r:1 w:0)
+	/// Proof: `NominationPools::GlobalMaxCommission` (`max_values`: Some(1), `max_size`: Some(4), added: 499, mode: `MaxEncodedLen`)
+	/// Storage: `System::Account` (r:2 w:1)
+	/// Proof: `System::Account` (`max_values`: None, `max_size`: Some(128), added: 2603, mode: `MaxEncodedLen`)
+	/// Storage: `Staking::CurrentEra` (r:1 w:0)
+	/// Proof: `Staking::CurrentEra` (`max_values`: Some(1), `max_size`: Some(4), added: 499, mode: `MaxEncodedLen`)
+	/// Storage: `Staking::Nominators` (r:1 w:0)
+	/// Proof: `Staking::Nominators` (`max_values`: None, `max_size`: Some(558), added: 3033, mode: `MaxEncodedLen`)
+	/// Storage: `Staking::MinNominatorBond` (r:1 w:0)
+	/// Proof: `Staking::MinNominatorBond` (`max_values`: Some(1), `max_size`: Some(16), added: 511, mode: `MaxEncodedLen`)
+	/// Storage: `Balances::Locks` (r:1 w:1)
+	/// Proof: `Balances::Locks` (`max_values`: None, `max_size`: Some(1299), added: 3774, mode: `MaxEncodedLen`)
+	/// Storage: `Balances::Freezes` (r:1 w:0)
+	/// Proof: `Balances::Freezes` (`max_values`: None, `max_size`: Some(67), added: 2542, mode: `MaxEncodedLen`)
+	/// Storage: `VoterList::ListNodes` (r:3 w:3)
+	/// Proof: `VoterList::ListNodes` (`max_values`: None, `max_size`: Some(154), added: 2629, mode: `MaxEncodedLen`)
+	/// Storage: `VoterList::ListBags` (r:2 w:2)
+	/// Proof: `VoterList::ListBags` (`max_values`: None, `max_size`: Some(82), added: 2557, mode: `MaxEncodedLen`)
+	/// Storage: `NominationPools::SubPoolsStorage` (r:1 w:1)
+	/// Proof: `NominationPools::SubPoolsStorage` (`max_values`: None, `max_size`: Some(261), added: 2736, mode: `MaxEncodedLen`)
+	/// Storage: `NominationPools::CounterForSubPoolsStorage` (r:1 w:1)
+	/// Proof: `NominationPools::CounterForSubPoolsStorage` (`max_values`: Some(1), `max_size`: Some(4), added: 499, mode: `MaxEncodedLen`)
 	fn unbond() -> Weight {
 		// Proof Size summary in bytes:
-		//  Measured:  `3560`
+		//  Measured:  `3597`
 		//  Estimated: `8877`
-		// Minimum execution time: 175_473_000 picoseconds.
-		Weight::from_parts(179_976_000, 0)
+		// Minimum execution time: 170_992_000 picoseconds.
+		Weight::from_parts(179_987_000, 0)
 			.saturating_add(Weight::from_parts(0, 8877))
 			.saturating_add(T::DbWeight::get().reads(20))
 			.saturating_add(T::DbWeight::get().writes(13))
 	}
-	/// Storage: NominationPools BondedPools (r:1 w:0)
-	/// Proof: NominationPools BondedPools (max_values: None, max_size: Some(220), added: 2695, mode: MaxEncodedLen)
-	/// Storage: Staking Bonded (r:1 w:0)
-	/// Proof: Staking Bonded (max_values: None, max_size: Some(72), added: 2547, mode: MaxEncodedLen)
-	/// Storage: Staking Ledger (r:1 w:1)
-	/// Proof: Staking Ledger (max_values: None, max_size: Some(1091), added: 3566, mode: MaxEncodedLen)
-	/// Storage: Staking CurrentEra (r:1 w:0)
-	/// Proof: Staking CurrentEra (max_values: Some(1), max_size: Some(4), added: 499, mode: MaxEncodedLen)
-	/// Storage: Balances Locks (r:1 w:1)
-	/// Proof: Balances Locks (max_values: None, max_size: Some(1299), added: 3774, mode: MaxEncodedLen)
-	/// Storage: Balances Freezes (r:1 w:0)
-	/// Proof: Balances Freezes (max_values: None, max_size: Some(49), added: 2524, mode: MaxEncodedLen)
+	/// Storage: `NominationPools::BondedPools` (r:1 w:0)
+	/// Proof: `NominationPools::BondedPools` (`max_values`: None, `max_size`: Some(220), added: 2695, mode: `MaxEncodedLen`)
+	/// Storage: `Staking::Bonded` (r:1 w:0)
+	/// Proof: `Staking::Bonded` (`max_values`: None, `max_size`: Some(72), added: 2547, mode: `MaxEncodedLen`)
+	/// Storage: `Staking::Ledger` (r:1 w:1)
+	/// Proof: `Staking::Ledger` (`max_values`: None, `max_size`: Some(1091), added: 3566, mode: `MaxEncodedLen`)
+	/// Storage: `Staking::CurrentEra` (r:1 w:0)
+	/// Proof: `Staking::CurrentEra` (`max_values`: Some(1), `max_size`: Some(4), added: 499, mode: `MaxEncodedLen`)
+	/// Storage: `Balances::Locks` (r:1 w:1)
+	/// Proof: `Balances::Locks` (`max_values`: None, `max_size`: Some(1299), added: 3774, mode: `MaxEncodedLen`)
+	/// Storage: `Balances::Freezes` (r:1 w:0)
+	/// Proof: `Balances::Freezes` (`max_values`: None, `max_size`: Some(67), added: 2542, mode: `MaxEncodedLen`)
 	/// The range of component `s` is `[0, 100]`.
 	fn pool_withdraw_unbonded(s: u32, ) -> Weight {
 		// Proof Size summary in bytes:
-		//  Measured:  `1614`
+		//  Measured:  `1670`
 		//  Estimated: `4764`
-		// Minimum execution time: 63_011_000 picoseconds.
-		Weight::from_parts(65_966_680, 0)
+		// Minimum execution time: 60_740_000 picoseconds.
+		Weight::from_parts(64_502_831, 0)
 			.saturating_add(Weight::from_parts(0, 4764))
-			// Standard Error: 2_422
-			.saturating_add(Weight::from_parts(58_078, 0).saturating_mul(s.into()))
+			// Standard Error: 2_724
+			.saturating_add(Weight::from_parts(37_725, 0).saturating_mul(s.into()))
 			.saturating_add(T::DbWeight::get().reads(6))
 			.saturating_add(T::DbWeight::get().writes(2))
 	}
-	/// Storage: NominationPools PoolMembers (r:1 w:1)
-	/// Proof: NominationPools PoolMembers (max_values: None, max_size: Some(717), added: 3192, mode: MaxEncodedLen)
-	/// Storage: Staking CurrentEra (r:1 w:0)
-	/// Proof: Staking CurrentEra (max_values: Some(1), max_size: Some(4), added: 499, mode: MaxEncodedLen)
-	/// Storage: NominationPools BondedPools (r:1 w:1)
-	/// Proof: NominationPools BondedPools (max_values: None, max_size: Some(220), added: 2695, mode: MaxEncodedLen)
-	/// Storage: NominationPools SubPoolsStorage (r:1 w:1)
-	/// Proof: NominationPools SubPoolsStorage (max_values: None, max_size: Some(261), added: 2736, mode: MaxEncodedLen)
-	/// Storage: Staking Bonded (r:1 w:0)
-	/// Proof: Staking Bonded (max_values: None, max_size: Some(72), added: 2547, mode: MaxEncodedLen)
-	/// Storage: Staking Ledger (r:1 w:1)
-	/// Proof: Staking Ledger (max_values: None, max_size: Some(1091), added: 3566, mode: MaxEncodedLen)
-	/// Storage: Balances Locks (r:1 w:1)
-	/// Proof: Balances Locks (max_values: None, max_size: Some(1299), added: 3774, mode: MaxEncodedLen)
-	/// Storage: Balances Freezes (r:1 w:0)
-	/// Proof: Balances Freezes (max_values: None, max_size: Some(49), added: 2524, mode: MaxEncodedLen)
-	/// Storage: System Account (r:1 w:1)
-	/// Proof: System Account (max_values: None, max_size: Some(128), added: 2603, mode: MaxEncodedLen)
-	/// Storage: NominationPools CounterForPoolMembers (r:1 w:1)
-	/// Proof: NominationPools CounterForPoolMembers (max_values: Some(1), max_size: Some(4), added: 499, mode: MaxEncodedLen)
-	/// Storage: NominationPools ClaimPermissions (r:0 w:1)
-	/// Proof: NominationPools ClaimPermissions (max_values: None, max_size: Some(41), added: 2516, mode: MaxEncodedLen)
+	/// Storage: `NominationPools::PoolMembers` (r:1 w:1)
+	/// Proof: `NominationPools::PoolMembers` (`max_values`: None, `max_size`: Some(717), added: 3192, mode: `MaxEncodedLen`)
+	/// Storage: `Staking::CurrentEra` (r:1 w:0)
+	/// Proof: `Staking::CurrentEra` (`max_values`: Some(1), `max_size`: Some(4), added: 499, mode: `MaxEncodedLen`)
+	/// Storage: `NominationPools::BondedPools` (r:1 w:1)
+	/// Proof: `NominationPools::BondedPools` (`max_values`: None, `max_size`: Some(220), added: 2695, mode: `MaxEncodedLen`)
+	/// Storage: `NominationPools::SubPoolsStorage` (r:1 w:1)
+	/// Proof: `NominationPools::SubPoolsStorage` (`max_values`: None, `max_size`: Some(261), added: 2736, mode: `MaxEncodedLen`)
+	/// Storage: `Staking::Bonded` (r:1 w:0)
+	/// Proof: `Staking::Bonded` (`max_values`: None, `max_size`: Some(72), added: 2547, mode: `MaxEncodedLen`)
+	/// Storage: `Staking::Ledger` (r:1 w:1)
+	/// Proof: `Staking::Ledger` (`max_values`: None, `max_size`: Some(1091), added: 3566, mode: `MaxEncodedLen`)
+	/// Storage: `Balances::Locks` (r:1 w:1)
+	/// Proof: `Balances::Locks` (`max_values`: None, `max_size`: Some(1299), added: 3774, mode: `MaxEncodedLen`)
+	/// Storage: `Balances::Freezes` (r:1 w:0)
+	/// Proof: `Balances::Freezes` (`max_values`: None, `max_size`: Some(67), added: 2542, mode: `MaxEncodedLen`)
+	/// Storage: `System::Account` (r:1 w:1)
+	/// Proof: `System::Account` (`max_values`: None, `max_size`: Some(128), added: 2603, mode: `MaxEncodedLen`)
+	/// Storage: `NominationPools::CounterForPoolMembers` (r:1 w:1)
+	/// Proof: `NominationPools::CounterForPoolMembers` (`max_values`: Some(1), `max_size`: Some(4), added: 499, mode: `MaxEncodedLen`)
+	/// Storage: `NominationPools::ClaimPermissions` (r:0 w:1)
+	/// Proof: `NominationPools::ClaimPermissions` (`max_values`: None, `max_size`: Some(41), added: 2516, mode: `MaxEncodedLen`)
 	/// The range of component `s` is `[0, 100]`.
 	fn withdraw_unbonded_update(s: u32, ) -> Weight {
 		// Proof Size summary in bytes:
-		//  Measured:  `2042`
+		//  Measured:  `2098`
 		//  Estimated: `4764`
-		// Minimum execution time: 134_765_000 picoseconds.
-		Weight::from_parts(140_539_571, 0)
+		// Minimum execution time: 127_322_000 picoseconds.
+		Weight::from_parts(132_064_603, 0)
 			.saturating_add(Weight::from_parts(0, 4764))
-			// Standard Error: 4_169
-			.saturating_add(Weight::from_parts(61_448, 0).saturating_mul(s.into()))
+			// Standard Error: 3_424
+			.saturating_add(Weight::from_parts(64_590, 0).saturating_mul(s.into()))
 			.saturating_add(T::DbWeight::get().reads(10))
 			.saturating_add(T::DbWeight::get().writes(8))
 	}
-	/// Storage: NominationPools PoolMembers (r:1 w:1)
-	/// Proof: NominationPools PoolMembers (max_values: None, max_size: Some(717), added: 3192, mode: MaxEncodedLen)
-	/// Storage: Staking CurrentEra (r:1 w:0)
-	/// Proof: Staking CurrentEra (max_values: Some(1), max_size: Some(4), added: 499, mode: MaxEncodedLen)
-	/// Storage: NominationPools BondedPools (r:1 w:1)
-	/// Proof: NominationPools BondedPools (max_values: None, max_size: Some(220), added: 2695, mode: MaxEncodedLen)
-	/// Storage: NominationPools SubPoolsStorage (r:1 w:1)
-	/// Proof: NominationPools SubPoolsStorage (max_values: None, max_size: Some(261), added: 2736, mode: MaxEncodedLen)
-	/// Storage: Staking Bonded (r:1 w:1)
-	/// Proof: Staking Bonded (max_values: None, max_size: Some(72), added: 2547, mode: MaxEncodedLen)
-	/// Storage: Staking Ledger (r:1 w:1)
-	/// Proof: Staking Ledger (max_values: None, max_size: Some(1091), added: 3566, mode: MaxEncodedLen)
-	/// Storage: Staking SlashingSpans (r:1 w:0)
-	/// Proof Skipped: Staking SlashingSpans (max_values: None, max_size: None, mode: Measured)
-	/// Storage: Staking Validators (r:1 w:0)
-	/// Proof: Staking Validators (max_values: None, max_size: Some(45), added: 2520, mode: MaxEncodedLen)
-	/// Storage: Staking Nominators (r:1 w:0)
-	/// Proof: Staking Nominators (max_values: None, max_size: Some(558), added: 3033, mode: MaxEncodedLen)
-	/// Storage: System Account (r:2 w:2)
-	/// Proof: System Account (max_values: None, max_size: Some(128), added: 2603, mode: MaxEncodedLen)
-	/// Storage: Balances Locks (r:1 w:1)
-	/// Proof: Balances Locks (max_values: None, max_size: Some(1299), added: 3774, mode: MaxEncodedLen)
-	/// Storage: Balances Freezes (r:1 w:0)
-	/// Proof: Balances Freezes (max_values: None, max_size: Some(49), added: 2524, mode: MaxEncodedLen)
-	/// Storage: NominationPools CounterForPoolMembers (r:1 w:1)
-	/// Proof: NominationPools CounterForPoolMembers (max_values: Some(1), max_size: Some(4), added: 499, mode: MaxEncodedLen)
-	/// Storage: NominationPools ReversePoolIdLookup (r:1 w:1)
-	/// Proof: NominationPools ReversePoolIdLookup (max_values: None, max_size: Some(44), added: 2519, mode: MaxEncodedLen)
-	/// Storage: NominationPools CounterForReversePoolIdLookup (r:1 w:1)
-	/// Proof: NominationPools CounterForReversePoolIdLookup (max_values: Some(1), max_size: Some(4), added: 499, mode: MaxEncodedLen)
-	/// Storage: NominationPools RewardPools (r:1 w:1)
-	/// Proof: NominationPools RewardPools (max_values: None, max_size: Some(92), added: 2567, mode: MaxEncodedLen)
-	/// Storage: NominationPools CounterForRewardPools (r:1 w:1)
-	/// Proof: NominationPools CounterForRewardPools (max_values: Some(1), max_size: Some(4), added: 499, mode: MaxEncodedLen)
-	/// Storage: NominationPools CounterForSubPoolsStorage (r:1 w:1)
-	/// Proof: NominationPools CounterForSubPoolsStorage (max_values: Some(1), max_size: Some(4), added: 499, mode: MaxEncodedLen)
-	/// Storage: NominationPools Metadata (r:1 w:1)
-	/// Proof: NominationPools Metadata (max_values: None, max_size: Some(270), added: 2745, mode: MaxEncodedLen)
-	/// Storage: NominationPools CounterForBondedPools (r:1 w:1)
-	/// Proof: NominationPools CounterForBondedPools (max_values: Some(1), max_size: Some(4), added: 499, mode: MaxEncodedLen)
-	/// Storage: Staking Payee (r:0 w:1)
-	/// Proof: Staking Payee (max_values: None, max_size: Some(73), added: 2548, mode: MaxEncodedLen)
-	/// Storage: NominationPools ClaimPermissions (r:0 w:1)
-	/// Proof: NominationPools ClaimPermissions (max_values: None, max_size: Some(41), added: 2516, mode: MaxEncodedLen)
+	/// Storage: `NominationPools::PoolMembers` (r:1 w:1)
+	/// Proof: `NominationPools::PoolMembers` (`max_values`: None, `max_size`: Some(717), added: 3192, mode: `MaxEncodedLen`)
+	/// Storage: `Staking::CurrentEra` (r:1 w:0)
+	/// Proof: `Staking::CurrentEra` (`max_values`: Some(1), `max_size`: Some(4), added: 499, mode: `MaxEncodedLen`)
+	/// Storage: `NominationPools::BondedPools` (r:1 w:1)
+	/// Proof: `NominationPools::BondedPools` (`max_values`: None, `max_size`: Some(220), added: 2695, mode: `MaxEncodedLen`)
+	/// Storage: `NominationPools::SubPoolsStorage` (r:1 w:1)
+	/// Proof: `NominationPools::SubPoolsStorage` (`max_values`: None, `max_size`: Some(261), added: 2736, mode: `MaxEncodedLen`)
+	/// Storage: `Staking::Bonded` (r:1 w:1)
+	/// Proof: `Staking::Bonded` (`max_values`: None, `max_size`: Some(72), added: 2547, mode: `MaxEncodedLen`)
+	/// Storage: `Staking::Ledger` (r:1 w:1)
+	/// Proof: `Staking::Ledger` (`max_values`: None, `max_size`: Some(1091), added: 3566, mode: `MaxEncodedLen`)
+	/// Storage: `Staking::SlashingSpans` (r:1 w:0)
+	/// Proof: `Staking::SlashingSpans` (`max_values`: None, `max_size`: None, mode: `Measured`)
+	/// Storage: `Staking::Validators` (r:1 w:0)
+	/// Proof: `Staking::Validators` (`max_values`: None, `max_size`: Some(45), added: 2520, mode: `MaxEncodedLen`)
+	/// Storage: `Staking::Nominators` (r:1 w:0)
+	/// Proof: `Staking::Nominators` (`max_values`: None, `max_size`: Some(558), added: 3033, mode: `MaxEncodedLen`)
+	/// Storage: `System::Account` (r:2 w:2)
+	/// Proof: `System::Account` (`max_values`: None, `max_size`: Some(128), added: 2603, mode: `MaxEncodedLen`)
+	/// Storage: `Balances::Locks` (r:2 w:1)
+	/// Proof: `Balances::Locks` (`max_values`: None, `max_size`: Some(1299), added: 3774, mode: `MaxEncodedLen`)
+	/// Storage: `Balances::Freezes` (r:2 w:1)
+	/// Proof: `Balances::Freezes` (`max_values`: None, `max_size`: Some(67), added: 2542, mode: `MaxEncodedLen`)
+	/// Storage: `NominationPools::CounterForPoolMembers` (r:1 w:1)
+	/// Proof: `NominationPools::CounterForPoolMembers` (`max_values`: Some(1), `max_size`: Some(4), added: 499, mode: `MaxEncodedLen`)
+	/// Storage: `NominationPools::ReversePoolIdLookup` (r:1 w:1)
+	/// Proof: `NominationPools::ReversePoolIdLookup` (`max_values`: None, `max_size`: Some(44), added: 2519, mode: `MaxEncodedLen`)
+	/// Storage: `NominationPools::CounterForReversePoolIdLookup` (r:1 w:1)
+	/// Proof: `NominationPools::CounterForReversePoolIdLookup` (`max_values`: Some(1), `max_size`: Some(4), added: 499, mode: `MaxEncodedLen`)
+	/// Storage: `NominationPools::RewardPools` (r:1 w:1)
+	/// Proof: `NominationPools::RewardPools` (`max_values`: None, `max_size`: Some(92), added: 2567, mode: `MaxEncodedLen`)
+	/// Storage: `NominationPools::CounterForRewardPools` (r:1 w:1)
+	/// Proof: `NominationPools::CounterForRewardPools` (`max_values`: Some(1), `max_size`: Some(4), added: 499, mode: `MaxEncodedLen`)
+	/// Storage: `NominationPools::CounterForSubPoolsStorage` (r:1 w:1)
+	/// Proof: `NominationPools::CounterForSubPoolsStorage` (`max_values`: Some(1), `max_size`: Some(4), added: 499, mode: `MaxEncodedLen`)
+	/// Storage: `NominationPools::Metadata` (r:1 w:1)
+	/// Proof: `NominationPools::Metadata` (`max_values`: None, `max_size`: Some(270), added: 2745, mode: `MaxEncodedLen`)
+	/// Storage: `NominationPools::CounterForBondedPools` (r:1 w:1)
+	/// Proof: `NominationPools::CounterForBondedPools` (`max_values`: Some(1), `max_size`: Some(4), added: 499, mode: `MaxEncodedLen`)
+	/// Storage: `Staking::Payee` (r:0 w:1)
+	/// Proof: `Staking::Payee` (`max_values`: None, `max_size`: Some(73), added: 2548, mode: `MaxEncodedLen`)
+	/// Storage: `NominationPools::ClaimPermissions` (r:0 w:1)
+	/// Proof: `NominationPools::ClaimPermissions` (`max_values`: None, `max_size`: Some(41), added: 2516, mode: `MaxEncodedLen`)
 	/// The range of component `s` is `[0, 100]`.
-	fn withdraw_unbonded_kill(_s: u32, ) -> Weight {
+	fn withdraw_unbonded_kill(s: u32, ) -> Weight {
 		// Proof Size summary in bytes:
-		//  Measured:  `2398`
-		//  Estimated: `6196`
-		// Minimum execution time: 226_632_000 picoseconds.
-		Weight::from_parts(234_263_474, 0)
-			.saturating_add(Weight::from_parts(0, 6196))
-			.saturating_add(T::DbWeight::get().reads(21))
-			.saturating_add(T::DbWeight::get().writes(18))
+		//  Measured:  `2454`
+		//  Estimated: `8538`
+		// Minimum execution time: 236_510_000 picoseconds.
+		Weight::from_parts(243_943_334, 0)
+			.saturating_add(Weight::from_parts(0, 8538))
+			// Standard Error: 4_864
+			.saturating_add(Weight::from_parts(14_974, 0).saturating_mul(s.into()))
+			.saturating_add(T::DbWeight::get().reads(23))
+			.saturating_add(T::DbWeight::get().writes(19))
 	}
-	/// Storage: NominationPools LastPoolId (r:1 w:1)
-	/// Proof: NominationPools LastPoolId (max_values: Some(1), max_size: Some(4), added: 499, mode: MaxEncodedLen)
-	/// Storage: Staking MinNominatorBond (r:1 w:0)
-	/// Proof: Staking MinNominatorBond (max_values: Some(1), max_size: Some(16), added: 511, mode: MaxEncodedLen)
-	/// Storage: NominationPools MinCreateBond (r:1 w:0)
-	/// Proof: NominationPools MinCreateBond (max_values: Some(1), max_size: Some(16), added: 511, mode: MaxEncodedLen)
-	/// Storage: NominationPools MinJoinBond (r:1 w:0)
-	/// Proof: NominationPools MinJoinBond (max_values: Some(1), max_size: Some(16), added: 511, mode: MaxEncodedLen)
-	/// Storage: NominationPools MaxPools (r:1 w:0)
-	/// Proof: NominationPools MaxPools (max_values: Some(1), max_size: Some(4), added: 499, mode: MaxEncodedLen)
-	/// Storage: NominationPools CounterForBondedPools (r:1 w:1)
-	/// Proof: NominationPools CounterForBondedPools (max_values: Some(1), max_size: Some(4), added: 499, mode: MaxEncodedLen)
-	/// Storage: NominationPools PoolMembers (r:1 w:1)
-	/// Proof: NominationPools PoolMembers (max_values: None, max_size: Some(717), added: 3192, mode: MaxEncodedLen)
-	/// Storage: NominationPools MaxPoolMembersPerPool (r:1 w:0)
-	/// Proof: NominationPools MaxPoolMembersPerPool (max_values: Some(1), max_size: Some(4), added: 499, mode: MaxEncodedLen)
-	/// Storage: NominationPools MaxPoolMembers (r:1 w:0)
-	/// Proof: NominationPools MaxPoolMembers (max_values: Some(1), max_size: Some(4), added: 499, mode: MaxEncodedLen)
-	/// Storage: NominationPools CounterForPoolMembers (r:1 w:1)
-	/// Proof: NominationPools CounterForPoolMembers (max_values: Some(1), max_size: Some(4), added: 499, mode: MaxEncodedLen)
-	/// Storage: System Account (r:2 w:2)
-	/// Proof: System Account (max_values: None, max_size: Some(128), added: 2603, mode: MaxEncodedLen)
-	/// Storage: Staking Bonded (r:1 w:1)
-	/// Proof: Staking Bonded (max_values: None, max_size: Some(72), added: 2547, mode: MaxEncodedLen)
-	/// Storage: Staking Ledger (r:1 w:1)
-	/// Proof: Staking Ledger (max_values: None, max_size: Some(1091), added: 3566, mode: MaxEncodedLen)
-	/// Storage: Staking CurrentEra (r:1 w:0)
-	/// Proof: Staking CurrentEra (max_values: Some(1), max_size: Some(4), added: 499, mode: MaxEncodedLen)
-	/// Storage: Balances Locks (r:1 w:1)
-	/// Proof: Balances Locks (max_values: None, max_size: Some(1299), added: 3774, mode: MaxEncodedLen)
-	/// Storage: Balances Freezes (r:1 w:0)
-	/// Proof: Balances Freezes (max_values: None, max_size: Some(49), added: 2524, mode: MaxEncodedLen)
-	/// Storage: NominationPools RewardPools (r:1 w:1)
-	/// Proof: NominationPools RewardPools (max_values: None, max_size: Some(92), added: 2567, mode: MaxEncodedLen)
-	/// Storage: NominationPools CounterForRewardPools (r:1 w:1)
-	/// Proof: NominationPools CounterForRewardPools (max_values: Some(1), max_size: Some(4), added: 499, mode: MaxEncodedLen)
-	/// Storage: NominationPools ReversePoolIdLookup (r:1 w:1)
-	/// Proof: NominationPools ReversePoolIdLookup (max_values: None, max_size: Some(44), added: 2519, mode: MaxEncodedLen)
-	/// Storage: NominationPools CounterForReversePoolIdLookup (r:1 w:1)
-	/// Proof: NominationPools CounterForReversePoolIdLookup (max_values: Some(1), max_size: Some(4), added: 499, mode: MaxEncodedLen)
-	/// Storage: NominationPools BondedPools (r:1 w:1)
-	/// Proof: NominationPools BondedPools (max_values: None, max_size: Some(220), added: 2695, mode: MaxEncodedLen)
-	/// Storage: Staking Payee (r:0 w:1)
-	/// Proof: Staking Payee (max_values: None, max_size: Some(73), added: 2548, mode: MaxEncodedLen)
+	/// Storage: `NominationPools::LastPoolId` (r:1 w:1)
+	/// Proof: `NominationPools::LastPoolId` (`max_values`: Some(1), `max_size`: Some(4), added: 499, mode: `MaxEncodedLen`)
+	/// Storage: `Staking::MinNominatorBond` (r:1 w:0)
+	/// Proof: `Staking::MinNominatorBond` (`max_values`: Some(1), `max_size`: Some(16), added: 511, mode: `MaxEncodedLen`)
+	/// Storage: `NominationPools::MinCreateBond` (r:1 w:0)
+	/// Proof: `NominationPools::MinCreateBond` (`max_values`: Some(1), `max_size`: Some(16), added: 511, mode: `MaxEncodedLen`)
+	/// Storage: `NominationPools::MinJoinBond` (r:1 w:0)
+	/// Proof: `NominationPools::MinJoinBond` (`max_values`: Some(1), `max_size`: Some(16), added: 511, mode: `MaxEncodedLen`)
+	/// Storage: `NominationPools::MaxPools` (r:1 w:0)
+	/// Proof: `NominationPools::MaxPools` (`max_values`: Some(1), `max_size`: Some(4), added: 499, mode: `MaxEncodedLen`)
+	/// Storage: `NominationPools::CounterForBondedPools` (r:1 w:1)
+	/// Proof: `NominationPools::CounterForBondedPools` (`max_values`: Some(1), `max_size`: Some(4), added: 499, mode: `MaxEncodedLen`)
+	/// Storage: `NominationPools::PoolMembers` (r:1 w:1)
+	/// Proof: `NominationPools::PoolMembers` (`max_values`: None, `max_size`: Some(717), added: 3192, mode: `MaxEncodedLen`)
+	/// Storage: `NominationPools::MaxPoolMembersPerPool` (r:1 w:0)
+	/// Proof: `NominationPools::MaxPoolMembersPerPool` (`max_values`: Some(1), `max_size`: Some(4), added: 499, mode: `MaxEncodedLen`)
+	/// Storage: `NominationPools::MaxPoolMembers` (r:1 w:0)
+	/// Proof: `NominationPools::MaxPoolMembers` (`max_values`: Some(1), `max_size`: Some(4), added: 499, mode: `MaxEncodedLen`)
+	/// Storage: `NominationPools::CounterForPoolMembers` (r:1 w:1)
+	/// Proof: `NominationPools::CounterForPoolMembers` (`max_values`: Some(1), `max_size`: Some(4), added: 499, mode: `MaxEncodedLen`)
+	/// Storage: `System::Account` (r:2 w:2)
+	/// Proof: `System::Account` (`max_values`: None, `max_size`: Some(128), added: 2603, mode: `MaxEncodedLen`)
+	/// Storage: `Staking::Bonded` (r:1 w:1)
+	/// Proof: `Staking::Bonded` (`max_values`: None, `max_size`: Some(72), added: 2547, mode: `MaxEncodedLen`)
+	/// Storage: `Staking::Ledger` (r:1 w:1)
+	/// Proof: `Staking::Ledger` (`max_values`: None, `max_size`: Some(1091), added: 3566, mode: `MaxEncodedLen`)
+	/// Storage: `Staking::CurrentEra` (r:1 w:0)
+	/// Proof: `Staking::CurrentEra` (`max_values`: Some(1), `max_size`: Some(4), added: 499, mode: `MaxEncodedLen`)
+	/// Storage: `Balances::Locks` (r:2 w:1)
+	/// Proof: `Balances::Locks` (`max_values`: None, `max_size`: Some(1299), added: 3774, mode: `MaxEncodedLen`)
+	/// Storage: `Balances::Freezes` (r:2 w:1)
+	/// Proof: `Balances::Freezes` (`max_values`: None, `max_size`: Some(67), added: 2542, mode: `MaxEncodedLen`)
+	/// Storage: `NominationPools::RewardPools` (r:1 w:1)
+	/// Proof: `NominationPools::RewardPools` (`max_values`: None, `max_size`: Some(92), added: 2567, mode: `MaxEncodedLen`)
+	/// Storage: `NominationPools::CounterForRewardPools` (r:1 w:1)
+	/// Proof: `NominationPools::CounterForRewardPools` (`max_values`: Some(1), `max_size`: Some(4), added: 499, mode: `MaxEncodedLen`)
+	/// Storage: `NominationPools::ReversePoolIdLookup` (r:1 w:1)
+	/// Proof: `NominationPools::ReversePoolIdLookup` (`max_values`: None, `max_size`: Some(44), added: 2519, mode: `MaxEncodedLen`)
+	/// Storage: `NominationPools::CounterForReversePoolIdLookup` (r:1 w:1)
+	/// Proof: `NominationPools::CounterForReversePoolIdLookup` (`max_values`: Some(1), `max_size`: Some(4), added: 499, mode: `MaxEncodedLen`)
+	/// Storage: `NominationPools::BondedPools` (r:1 w:1)
+	/// Proof: `NominationPools::BondedPools` (`max_values`: None, `max_size`: Some(220), added: 2695, mode: `MaxEncodedLen`)
+	/// Storage: `Staking::Payee` (r:0 w:1)
+	/// Proof: `Staking::Payee` (`max_values`: None, `max_size`: Some(73), added: 2548, mode: `MaxEncodedLen`)
 	fn create() -> Weight {
 		// Proof Size summary in bytes:
 		//  Measured:  `1222`
-		//  Estimated: `6196`
-		// Minimum execution time: 197_132_000 picoseconds.
-		Weight::from_parts(202_099_000, 0)
-			.saturating_add(Weight::from_parts(0, 6196))
-			.saturating_add(T::DbWeight::get().reads(22))
-			.saturating_add(T::DbWeight::get().writes(15))
+		//  Estimated: `8538`
+		// Minimum execution time: 197_883_000 picoseconds.
+		Weight::from_parts(201_750_000, 0)
+			.saturating_add(Weight::from_parts(0, 8538))
+			.saturating_add(T::DbWeight::get().reads(24))
+			.saturating_add(T::DbWeight::get().writes(16))
 	}
-	/// Storage: NominationPools BondedPools (r:1 w:0)
-	/// Proof: NominationPools BondedPools (max_values: None, max_size: Some(220), added: 2695, mode: MaxEncodedLen)
-	/// Storage: Staking Bonded (r:1 w:0)
-	/// Proof: Staking Bonded (max_values: None, max_size: Some(72), added: 2547, mode: MaxEncodedLen)
-	/// Storage: Staking Ledger (r:1 w:0)
-	/// Proof: Staking Ledger (max_values: None, max_size: Some(1091), added: 3566, mode: MaxEncodedLen)
-	/// Storage: Staking MinNominatorBond (r:1 w:0)
-	/// Proof: Staking MinNominatorBond (max_values: Some(1), max_size: Some(16), added: 511, mode: MaxEncodedLen)
-	/// Storage: Staking Nominators (r:1 w:1)
-	/// Proof: Staking Nominators (max_values: None, max_size: Some(558), added: 3033, mode: MaxEncodedLen)
-	/// Storage: Staking MaxNominatorsCount (r:1 w:0)
-	/// Proof: Staking MaxNominatorsCount (max_values: Some(1), max_size: Some(4), added: 499, mode: MaxEncodedLen)
-	/// Storage: Staking Validators (r:17 w:0)
-	/// Proof: Staking Validators (max_values: None, max_size: Some(45), added: 2520, mode: MaxEncodedLen)
-	/// Storage: Staking CurrentEra (r:1 w:0)
-	/// Proof: Staking CurrentEra (max_values: Some(1), max_size: Some(4), added: 499, mode: MaxEncodedLen)
-	/// Storage: VoterList ListNodes (r:1 w:1)
-	/// Proof: VoterList ListNodes (max_values: None, max_size: Some(154), added: 2629, mode: MaxEncodedLen)
-	/// Storage: VoterList ListBags (r:1 w:1)
-	/// Proof: VoterList ListBags (max_values: None, max_size: Some(82), added: 2557, mode: MaxEncodedLen)
-	/// Storage: VoterList CounterForListNodes (r:1 w:1)
-	/// Proof: VoterList CounterForListNodes (max_values: Some(1), max_size: Some(4), added: 499, mode: MaxEncodedLen)
-	/// Storage: Staking CounterForNominators (r:1 w:1)
-	/// Proof: Staking CounterForNominators (max_values: Some(1), max_size: Some(4), added: 499, mode: MaxEncodedLen)
+	/// Storage: `NominationPools::BondedPools` (r:1 w:0)
+	/// Proof: `NominationPools::BondedPools` (`max_values`: None, `max_size`: Some(220), added: 2695, mode: `MaxEncodedLen`)
+	/// Storage: `Staking::Bonded` (r:1 w:0)
+	/// Proof: `Staking::Bonded` (`max_values`: None, `max_size`: Some(72), added: 2547, mode: `MaxEncodedLen`)
+	/// Storage: `Staking::Ledger` (r:1 w:0)
+	/// Proof: `Staking::Ledger` (`max_values`: None, `max_size`: Some(1091), added: 3566, mode: `MaxEncodedLen`)
+	/// Storage: `Staking::MinNominatorBond` (r:1 w:0)
+	/// Proof: `Staking::MinNominatorBond` (`max_values`: Some(1), `max_size`: Some(16), added: 511, mode: `MaxEncodedLen`)
+	/// Storage: `Staking::Nominators` (r:1 w:1)
+	/// Proof: `Staking::Nominators` (`max_values`: None, `max_size`: Some(558), added: 3033, mode: `MaxEncodedLen`)
+	/// Storage: `Staking::MaxNominatorsCount` (r:1 w:0)
+	/// Proof: `Staking::MaxNominatorsCount` (`max_values`: Some(1), `max_size`: Some(4), added: 499, mode: `MaxEncodedLen`)
+	/// Storage: `Staking::Validators` (r:17 w:0)
+	/// Proof: `Staking::Validators` (`max_values`: None, `max_size`: Some(45), added: 2520, mode: `MaxEncodedLen`)
+	/// Storage: `Staking::CurrentEra` (r:1 w:0)
+	/// Proof: `Staking::CurrentEra` (`max_values`: Some(1), `max_size`: Some(4), added: 499, mode: `MaxEncodedLen`)
+	/// Storage: `VoterList::ListNodes` (r:1 w:1)
+	/// Proof: `VoterList::ListNodes` (`max_values`: None, `max_size`: Some(154), added: 2629, mode: `MaxEncodedLen`)
+	/// Storage: `VoterList::ListBags` (r:1 w:1)
+	/// Proof: `VoterList::ListBags` (`max_values`: None, `max_size`: Some(82), added: 2557, mode: `MaxEncodedLen`)
+	/// Storage: `VoterList::CounterForListNodes` (r:1 w:1)
+	/// Proof: `VoterList::CounterForListNodes` (`max_values`: Some(1), `max_size`: Some(4), added: 499, mode: `MaxEncodedLen`)
+	/// Storage: `Staking::CounterForNominators` (r:1 w:1)
+	/// Proof: `Staking::CounterForNominators` (`max_values`: Some(1), `max_size`: Some(4), added: 499, mode: `MaxEncodedLen`)
 	/// The range of component `n` is `[1, 16]`.
 	fn nominate(n: u32, ) -> Weight {
 		// Proof Size summary in bytes:
 		//  Measured:  `1779`
 		//  Estimated: `4556 + n * (2520 ±0)`
-		// Minimum execution time: 68_142_000 picoseconds.
-		Weight::from_parts(68_977_842, 0)
+		// Minimum execution time: 65_505_000 picoseconds.
+		Weight::from_parts(67_148_657, 0)
 			.saturating_add(Weight::from_parts(0, 4556))
-			// Standard Error: 10_560
-			.saturating_add(Weight::from_parts(1_606_142, 0).saturating_mul(n.into()))
+			// Standard Error: 9_115
+			.saturating_add(Weight::from_parts(1_421_198, 0).saturating_mul(n.into()))
 			.saturating_add(T::DbWeight::get().reads(12))
 			.saturating_add(T::DbWeight::get().reads((1_u64).saturating_mul(n.into())))
 			.saturating_add(T::DbWeight::get().writes(5))
 			.saturating_add(Weight::from_parts(0, 2520).saturating_mul(n.into()))
 	}
-	/// Storage: NominationPools BondedPools (r:1 w:1)
-	/// Proof: NominationPools BondedPools (max_values: None, max_size: Some(220), added: 2695, mode: MaxEncodedLen)
-	/// Storage: Staking Bonded (r:1 w:0)
-	/// Proof: Staking Bonded (max_values: None, max_size: Some(72), added: 2547, mode: MaxEncodedLen)
-	/// Storage: Staking Ledger (r:1 w:0)
-	/// Proof: Staking Ledger (max_values: None, max_size: Some(1091), added: 3566, mode: MaxEncodedLen)
+	/// Storage: `NominationPools::BondedPools` (r:1 w:1)
+	/// Proof: `NominationPools::BondedPools` (`max_values`: None, `max_size`: Some(220), added: 2695, mode: `MaxEncodedLen`)
+	/// Storage: `Staking::Bonded` (r:1 w:0)
+	/// Proof: `Staking::Bonded` (`max_values`: None, `max_size`: Some(72), added: 2547, mode: `MaxEncodedLen`)
+	/// Storage: `Staking::Ledger` (r:1 w:0)
+	/// Proof: `Staking::Ledger` (`max_values`: None, `max_size`: Some(1091), added: 3566, mode: `MaxEncodedLen`)
 	fn set_state() -> Weight {
 		// Proof Size summary in bytes:
 		//  Measured:  `1367`
 		//  Estimated: `4556`
-		// Minimum execution time: 36_343_000 picoseconds.
-		Weight::from_parts(37_669_000, 0)
+		// Minimum execution time: 34_157_000 picoseconds.
+		Weight::from_parts(35_557_000, 0)
 			.saturating_add(Weight::from_parts(0, 4556))
 			.saturating_add(T::DbWeight::get().reads(3))
 			.saturating_add(T::DbWeight::get().writes(1))
 	}
-	/// Storage: NominationPools BondedPools (r:1 w:0)
-	/// Proof: NominationPools BondedPools (max_values: None, max_size: Some(220), added: 2695, mode: MaxEncodedLen)
-	/// Storage: NominationPools Metadata (r:1 w:1)
-	/// Proof: NominationPools Metadata (max_values: None, max_size: Some(270), added: 2745, mode: MaxEncodedLen)
-	/// Storage: NominationPools CounterForMetadata (r:1 w:1)
-	/// Proof: NominationPools CounterForMetadata (max_values: Some(1), max_size: Some(4), added: 499, mode: MaxEncodedLen)
+	/// Storage: `NominationPools::BondedPools` (r:1 w:0)
+	/// Proof: `NominationPools::BondedPools` (`max_values`: None, `max_size`: Some(220), added: 2695, mode: `MaxEncodedLen`)
+	/// Storage: `NominationPools::Metadata` (r:1 w:1)
+	/// Proof: `NominationPools::Metadata` (`max_values`: None, `max_size`: Some(270), added: 2745, mode: `MaxEncodedLen`)
+	/// Storage: `NominationPools::CounterForMetadata` (r:1 w:1)
+	/// Proof: `NominationPools::CounterForMetadata` (`max_values`: Some(1), `max_size`: Some(4), added: 499, mode: `MaxEncodedLen`)
 	/// The range of component `n` is `[1, 256]`.
 	fn set_metadata(n: u32, ) -> Weight {
 		// Proof Size summary in bytes:
 		//  Measured:  `497`
 		//  Estimated: `3735`
-		// Minimum execution time: 14_157_000 picoseconds.
-		Weight::from_parts(15_201_514, 0)
+		// Minimum execution time: 13_806_000 picoseconds.
+		Weight::from_parts(14_540_018, 0)
 			.saturating_add(Weight::from_parts(0, 3735))
-			// Standard Error: 194
-			.saturating_add(Weight::from_parts(718, 0).saturating_mul(n.into()))
+			// Standard Error: 123
+			.saturating_add(Weight::from_parts(644, 0).saturating_mul(n.into()))
 			.saturating_add(T::DbWeight::get().reads(3))
 			.saturating_add(T::DbWeight::get().writes(2))
 	}
-	/// Storage: NominationPools MinJoinBond (r:0 w:1)
-	/// Proof: NominationPools MinJoinBond (max_values: Some(1), max_size: Some(16), added: 511, mode: MaxEncodedLen)
-	/// Storage: NominationPools MaxPoolMembers (r:0 w:1)
-	/// Proof: NominationPools MaxPoolMembers (max_values: Some(1), max_size: Some(4), added: 499, mode: MaxEncodedLen)
-	/// Storage: NominationPools MaxPoolMembersPerPool (r:0 w:1)
-	/// Proof: NominationPools MaxPoolMembersPerPool (max_values: Some(1), max_size: Some(4), added: 499, mode: MaxEncodedLen)
-	/// Storage: NominationPools MinCreateBond (r:0 w:1)
-	/// Proof: NominationPools MinCreateBond (max_values: Some(1), max_size: Some(16), added: 511, mode: MaxEncodedLen)
-	/// Storage: NominationPools GlobalMaxCommission (r:0 w:1)
-	/// Proof: NominationPools GlobalMaxCommission (max_values: Some(1), max_size: Some(4), added: 499, mode: MaxEncodedLen)
-	/// Storage: NominationPools MaxPools (r:0 w:1)
-	/// Proof: NominationPools MaxPools (max_values: Some(1), max_size: Some(4), added: 499, mode: MaxEncodedLen)
+	/// Storage: `NominationPools::MinJoinBond` (r:0 w:1)
+	/// Proof: `NominationPools::MinJoinBond` (`max_values`: Some(1), `max_size`: Some(16), added: 511, mode: `MaxEncodedLen`)
+	/// Storage: `NominationPools::MaxPoolMembers` (r:0 w:1)
+	/// Proof: `NominationPools::MaxPoolMembers` (`max_values`: Some(1), `max_size`: Some(4), added: 499, mode: `MaxEncodedLen`)
+	/// Storage: `NominationPools::MaxPoolMembersPerPool` (r:0 w:1)
+	/// Proof: `NominationPools::MaxPoolMembersPerPool` (`max_values`: Some(1), `max_size`: Some(4), added: 499, mode: `MaxEncodedLen`)
+	/// Storage: `NominationPools::MinCreateBond` (r:0 w:1)
+	/// Proof: `NominationPools::MinCreateBond` (`max_values`: Some(1), `max_size`: Some(16), added: 511, mode: `MaxEncodedLen`)
+	/// Storage: `NominationPools::GlobalMaxCommission` (r:0 w:1)
+	/// Proof: `NominationPools::GlobalMaxCommission` (`max_values`: Some(1), `max_size`: Some(4), added: 499, mode: `MaxEncodedLen`)
+	/// Storage: `NominationPools::MaxPools` (r:0 w:1)
+	/// Proof: `NominationPools::MaxPools` (`max_values`: Some(1), `max_size`: Some(4), added: 499, mode: `MaxEncodedLen`)
 	fn set_configs() -> Weight {
 		// Proof Size summary in bytes:
 		//  Measured:  `0`
 		//  Estimated: `0`
-		// Minimum execution time: 6_082_000 picoseconds.
-		Weight::from_parts(6_275_000, 0)
+		// Minimum execution time: 5_870_000 picoseconds.
+		Weight::from_parts(6_253_000, 0)
 			.saturating_add(Weight::from_parts(0, 0))
 			.saturating_add(T::DbWeight::get().writes(6))
 	}
-	/// Storage: NominationPools BondedPools (r:1 w:1)
-	/// Proof: NominationPools BondedPools (max_values: None, max_size: Some(220), added: 2695, mode: MaxEncodedLen)
+	/// Storage: `NominationPools::BondedPools` (r:1 w:1)
+	/// Proof: `NominationPools::BondedPools` (`max_values`: None, `max_size`: Some(220), added: 2695, mode: `MaxEncodedLen`)
 	fn update_roles() -> Weight {
 		// Proof Size summary in bytes:
 		//  Measured:  `497`
 		//  Estimated: `3685`
-		// Minimum execution time: 19_952_000 picoseconds.
-		Weight::from_parts(20_880_000, 0)
+		// Minimum execution time: 18_290_000 picoseconds.
+		Weight::from_parts(18_961_000, 0)
 			.saturating_add(Weight::from_parts(0, 3685))
 			.saturating_add(T::DbWeight::get().reads(1))
 			.saturating_add(T::DbWeight::get().writes(1))
 	}
-	/// Storage: NominationPools BondedPools (r:1 w:0)
-	/// Proof: NominationPools BondedPools (max_values: None, max_size: Some(220), added: 2695, mode: MaxEncodedLen)
-	/// Storage: Staking Bonded (r:1 w:0)
-	/// Proof: Staking Bonded (max_values: None, max_size: Some(72), added: 2547, mode: MaxEncodedLen)
-	/// Storage: Staking Ledger (r:1 w:0)
-	/// Proof: Staking Ledger (max_values: None, max_size: Some(1091), added: 3566, mode: MaxEncodedLen)
-	/// Storage: Staking Validators (r:1 w:0)
-	/// Proof: Staking Validators (max_values: None, max_size: Some(45), added: 2520, mode: MaxEncodedLen)
-	/// Storage: Staking Nominators (r:1 w:1)
-	/// Proof: Staking Nominators (max_values: None, max_size: Some(558), added: 3033, mode: MaxEncodedLen)
-	/// Storage: Staking CounterForNominators (r:1 w:1)
-	/// Proof: Staking CounterForNominators (max_values: Some(1), max_size: Some(4), added: 499, mode: MaxEncodedLen)
-	/// Storage: VoterList ListNodes (r:1 w:1)
-	/// Proof: VoterList ListNodes (max_values: None, max_size: Some(154), added: 2629, mode: MaxEncodedLen)
-	/// Storage: VoterList ListBags (r:1 w:1)
-	/// Proof: VoterList ListBags (max_values: None, max_size: Some(82), added: 2557, mode: MaxEncodedLen)
-	/// Storage: VoterList CounterForListNodes (r:1 w:1)
-	/// Proof: VoterList CounterForListNodes (max_values: Some(1), max_size: Some(4), added: 499, mode: MaxEncodedLen)
+	/// Storage: `NominationPools::BondedPools` (r:1 w:0)
+	/// Proof: `NominationPools::BondedPools` (`max_values`: None, `max_size`: Some(220), added: 2695, mode: `MaxEncodedLen`)
+	/// Storage: `Staking::Bonded` (r:1 w:0)
+	/// Proof: `Staking::Bonded` (`max_values`: None, `max_size`: Some(72), added: 2547, mode: `MaxEncodedLen`)
+	/// Storage: `Staking::Ledger` (r:1 w:0)
+	/// Proof: `Staking::Ledger` (`max_values`: None, `max_size`: Some(1091), added: 3566, mode: `MaxEncodedLen`)
+	/// Storage: `Staking::Validators` (r:1 w:0)
+	/// Proof: `Staking::Validators` (`max_values`: None, `max_size`: Some(45), added: 2520, mode: `MaxEncodedLen`)
+	/// Storage: `Staking::Nominators` (r:1 w:1)
+	/// Proof: `Staking::Nominators` (`max_values`: None, `max_size`: Some(558), added: 3033, mode: `MaxEncodedLen`)
+	/// Storage: `Staking::CounterForNominators` (r:1 w:1)
+	/// Proof: `Staking::CounterForNominators` (`max_values`: Some(1), `max_size`: Some(4), added: 499, mode: `MaxEncodedLen`)
+	/// Storage: `VoterList::ListNodes` (r:1 w:1)
+	/// Proof: `VoterList::ListNodes` (`max_values`: None, `max_size`: Some(154), added: 2629, mode: `MaxEncodedLen`)
+	/// Storage: `VoterList::ListBags` (r:1 w:1)
+	/// Proof: `VoterList::ListBags` (`max_values`: None, `max_size`: Some(82), added: 2557, mode: `MaxEncodedLen`)
+	/// Storage: `VoterList::CounterForListNodes` (r:1 w:1)
+	/// Proof: `VoterList::CounterForListNodes` (`max_values`: Some(1), `max_size`: Some(4), added: 499, mode: `MaxEncodedLen`)
 	fn chill() -> Weight {
 		// Proof Size summary in bytes:
 		//  Measured:  `1942`
 		//  Estimated: `4556`
-		// Minimum execution time: 66_233_000 picoseconds.
-		Weight::from_parts(68_181_000, 0)
+		// Minimum execution time: 63_708_000 picoseconds.
+		Weight::from_parts(65_570_000, 0)
 			.saturating_add(Weight::from_parts(0, 4556))
 			.saturating_add(T::DbWeight::get().reads(9))
 			.saturating_add(T::DbWeight::get().writes(5))
 	}
-	/// Storage: NominationPools BondedPools (r:1 w:1)
-	/// Proof: NominationPools BondedPools (max_values: None, max_size: Some(220), added: 2695, mode: MaxEncodedLen)
-	/// Storage: NominationPools RewardPools (r:1 w:1)
-	/// Proof: NominationPools RewardPools (max_values: None, max_size: Some(92), added: 2567, mode: MaxEncodedLen)
-	/// Storage: NominationPools GlobalMaxCommission (r:1 w:0)
-	/// Proof: NominationPools GlobalMaxCommission (max_values: Some(1), max_size: Some(4), added: 499, mode: MaxEncodedLen)
-	/// Storage: System Account (r:1 w:0)
-	/// Proof: System Account (max_values: None, max_size: Some(128), added: 2603, mode: MaxEncodedLen)
+	/// Storage: `NominationPools::BondedPools` (r:1 w:1)
+	/// Proof: `NominationPools::BondedPools` (`max_values`: None, `max_size`: Some(220), added: 2695, mode: `MaxEncodedLen`)
+	/// Storage: `NominationPools::RewardPools` (r:1 w:1)
+	/// Proof: `NominationPools::RewardPools` (`max_values`: None, `max_size`: Some(92), added: 2567, mode: `MaxEncodedLen`)
+	/// Storage: `NominationPools::GlobalMaxCommission` (r:1 w:0)
+	/// Proof: `NominationPools::GlobalMaxCommission` (`max_values`: Some(1), `max_size`: Some(4), added: 499, mode: `MaxEncodedLen`)
+	/// Storage: `System::Account` (r:1 w:0)
+	/// Proof: `System::Account` (`max_values`: None, `max_size`: Some(128), added: 2603, mode: `MaxEncodedLen`)
 	fn set_commission() -> Weight {
 		// Proof Size summary in bytes:
 		//  Measured:  `736`
 		//  Estimated: `3685`
-		// Minimum execution time: 33_533_000 picoseconds.
-		Weight::from_parts(34_915_000, 0)
+		// Minimum execution time: 34_291_000 picoseconds.
+		Weight::from_parts(34_767_000, 0)
 			.saturating_add(Weight::from_parts(0, 3685))
 			.saturating_add(T::DbWeight::get().reads(4))
 			.saturating_add(T::DbWeight::get().writes(2))
 	}
-	/// Storage: NominationPools BondedPools (r:1 w:1)
-	/// Proof: NominationPools BondedPools (max_values: None, max_size: Some(220), added: 2695, mode: MaxEncodedLen)
+	/// Storage: `NominationPools::BondedPools` (r:1 w:1)
+	/// Proof: `NominationPools::BondedPools` (`max_values`: None, `max_size`: Some(220), added: 2695, mode: `MaxEncodedLen`)
+	/// Storage: `NominationPools::GlobalMaxCommission` (r:1 w:0)
+	/// Proof: `NominationPools::GlobalMaxCommission` (`max_values`: Some(1), `max_size`: Some(4), added: 499, mode: `MaxEncodedLen`)
 	fn set_commission_max() -> Weight {
 		// Proof Size summary in bytes:
 		//  Measured:  `537`
 		//  Estimated: `3685`
-		// Minimum execution time: 18_920_000 picoseconds.
-		Weight::from_parts(19_410_000, 0)
+		// Minimum execution time: 18_406_000 picoseconds.
+		Weight::from_parts(18_999_000, 0)
 			.saturating_add(Weight::from_parts(0, 3685))
-			.saturating_add(T::DbWeight::get().reads(1))
+			.saturating_add(T::DbWeight::get().reads(2))
 			.saturating_add(T::DbWeight::get().writes(1))
 	}
-	/// Storage: NominationPools BondedPools (r:1 w:1)
-	/// Proof: NominationPools BondedPools (max_values: None, max_size: Some(220), added: 2695, mode: MaxEncodedLen)
+	/// Storage: `NominationPools::BondedPools` (r:1 w:1)
+	/// Proof: `NominationPools::BondedPools` (`max_values`: None, `max_size`: Some(220), added: 2695, mode: `MaxEncodedLen`)
 	fn set_commission_change_rate() -> Weight {
 		// Proof Size summary in bytes:
 		//  Measured:  `497`
 		//  Estimated: `3685`
-		// Minimum execution time: 19_388_000 picoseconds.
-		Weight::from_parts(20_346_000, 0)
+		// Minimum execution time: 18_440_000 picoseconds.
+		Weight::from_parts(19_230_000, 0)
 			.saturating_add(Weight::from_parts(0, 3685))
 			.saturating_add(T::DbWeight::get().reads(1))
 			.saturating_add(T::DbWeight::get().writes(1))
 	}
-	/// Storage: NominationPools PoolMembers (r:1 w:0)
-	/// Proof: NominationPools PoolMembers (max_values: None, max_size: Some(717), added: 3192, mode: MaxEncodedLen)
-	/// Storage: NominationPools ClaimPermissions (r:1 w:1)
-	/// Proof: NominationPools ClaimPermissions (max_values: None, max_size: Some(41), added: 2516, mode: MaxEncodedLen)
+	/// Storage: `NominationPools::PoolMembers` (r:1 w:0)
+	/// Proof: `NominationPools::PoolMembers` (`max_values`: None, `max_size`: Some(717), added: 3192, mode: `MaxEncodedLen`)
+	/// Storage: `NominationPools::ClaimPermissions` (r:1 w:1)
+	/// Proof: `NominationPools::ClaimPermissions` (`max_values`: None, `max_size`: Some(41), added: 2516, mode: `MaxEncodedLen`)
 	fn set_claim_permission() -> Weight {
 		// Proof Size summary in bytes:
 		//  Measured:  `508`
 		//  Estimated: `4182`
-		// Minimum execution time: 14_137_000 picoseconds.
-		Weight::from_parts(14_846_000, 0)
+		// Minimum execution time: 14_310_000 picoseconds.
+		Weight::from_parts(14_681_000, 0)
 			.saturating_add(Weight::from_parts(0, 4182))
 			.saturating_add(T::DbWeight::get().reads(2))
 			.saturating_add(T::DbWeight::get().writes(1))
 	}
-	/// Storage: NominationPools BondedPools (r:1 w:0)
-	/// Proof: NominationPools BondedPools (max_values: None, max_size: Some(220), added: 2695, mode: MaxEncodedLen)
-	/// Storage: NominationPools RewardPools (r:1 w:1)
-	/// Proof: NominationPools RewardPools (max_values: None, max_size: Some(92), added: 2567, mode: MaxEncodedLen)
-	/// Storage: NominationPools GlobalMaxCommission (r:1 w:0)
-	/// Proof: NominationPools GlobalMaxCommission (max_values: Some(1), max_size: Some(4), added: 499, mode: MaxEncodedLen)
-	/// Storage: System Account (r:1 w:1)
-	/// Proof: System Account (max_values: None, max_size: Some(128), added: 2603, mode: MaxEncodedLen)
+	/// Storage: `NominationPools::BondedPools` (r:1 w:0)
+	/// Proof: `NominationPools::BondedPools` (`max_values`: None, `max_size`: Some(220), added: 2695, mode: `MaxEncodedLen`)
+	/// Storage: `NominationPools::RewardPools` (r:1 w:1)
+	/// Proof: `NominationPools::RewardPools` (`max_values`: None, `max_size`: Some(92), added: 2567, mode: `MaxEncodedLen`)
+	/// Storage: `NominationPools::GlobalMaxCommission` (r:1 w:0)
+	/// Proof: `NominationPools::GlobalMaxCommission` (`max_values`: Some(1), `max_size`: Some(4), added: 499, mode: `MaxEncodedLen`)
+	/// Storage: `System::Account` (r:1 w:1)
+	/// Proof: `System::Account` (`max_values`: None, `max_size`: Some(128), added: 2603, mode: `MaxEncodedLen`)
 	fn claim_commission() -> Weight {
 		// Proof Size summary in bytes:
 		//  Measured:  `934`
 		//  Estimated: `3685`
-		// Minimum execution time: 66_667_000 picoseconds.
-		Weight::from_parts(68_573_000, 0)
+		// Minimum execution time: 64_526_000 picoseconds.
+		Weight::from_parts(66_800_000, 0)
 			.saturating_add(Weight::from_parts(0, 3685))
 			.saturating_add(T::DbWeight::get().reads(4))
 			.saturating_add(T::DbWeight::get().writes(2))
 	}
+	/// Storage: `NominationPools::BondedPools` (r:1 w:0)
+	/// Proof: `NominationPools::BondedPools` (`max_values`: None, `max_size`: Some(220), added: 2695, mode: `MaxEncodedLen`)
+	/// Storage: `Balances::Freezes` (r:1 w:1)
+	/// Proof: `Balances::Freezes` (`max_values`: None, `max_size`: Some(67), added: 2542, mode: `MaxEncodedLen`)
+	/// Storage: `System::Account` (r:1 w:1)
+	/// Proof: `System::Account` (`max_values`: None, `max_size`: Some(128), added: 2603, mode: `MaxEncodedLen`)
+	/// Storage: `Balances::Locks` (r:1 w:0)
+	/// Proof: `Balances::Locks` (`max_values`: None, `max_size`: Some(1299), added: 3774, mode: `MaxEncodedLen`)
+	fn adjust_pool_deposit() -> Weight {
+		// Proof Size summary in bytes:
+		//  Measured:  `866`
+		//  Estimated: `4764`
+		// Minimum execution time: 73_472_000 picoseconds.
+		Weight::from_parts(74_698_000, 0)
+			.saturating_add(Weight::from_parts(0, 4764))
+			.saturating_add(T::DbWeight::get().reads(4))
+			.saturating_add(T::DbWeight::get().writes(2))
+	}
 }
diff --git a/polkadot/runtime/westend/src/weights/pallet_preimage.rs b/polkadot/runtime/westend/src/weights/pallet_preimage.rs
index 39d3626b189f6e9078556cb68d59de9a3aa2d99d..0c4677a7d969423bb5bccbb938f6b8fd2c9ac402 100644
--- a/polkadot/runtime/westend/src/weights/pallet_preimage.rs
+++ b/polkadot/runtime/westend/src/weights/pallet_preimage.rs
@@ -50,6 +50,21 @@ use core::marker::PhantomData;
 /// Weight functions for `pallet_preimage`.
 pub struct WeightInfo<T>(PhantomData<T>);
 impl<T: frame_system::Config> pallet_preimage::WeightInfo for WeightInfo<T> {
+	fn ensure_updated(n: u32, ) -> Weight {
+		// Proof Size summary in bytes:
+		//  Measured:  `193 + n * (91 ±0)`
+		//  Estimated: `3593 + n * (2566 ±0)`
+		// Minimum execution time: 2_000_000 picoseconds.
+		Weight::from_parts(2_000_000, 3593)
+			// Standard Error: 13_720
+			.saturating_add(Weight::from_parts(17_309_199, 0).saturating_mul(n.into()))
+			.saturating_add(T::DbWeight::get().reads(1_u64))
+			.saturating_add(T::DbWeight::get().reads((1_u64).saturating_mul(n.into())))
+			.saturating_add(T::DbWeight::get().writes(1_u64))
+			.saturating_add(T::DbWeight::get().writes((2_u64).saturating_mul(n.into())))
+			.saturating_add(Weight::from_parts(0, 2566).saturating_mul(n.into()))
+	}
+
 	/// Storage: Preimage StatusFor (r:1 w:1)
 	/// Proof: Preimage StatusFor (max_values: None, max_size: Some(91), added: 2566, mode: MaxEncodedLen)
 	/// Storage: Preimage PreimageFor (r:0 w:1)
diff --git a/polkadot/runtime/kusama/src/weights/pallet_referenda_fellowship_referenda.rs b/polkadot/runtime/westend/src/weights/pallet_referenda_fellowship_referenda.rs
similarity index 100%
rename from polkadot/runtime/kusama/src/weights/pallet_referenda_fellowship_referenda.rs
rename to polkadot/runtime/westend/src/weights/pallet_referenda_fellowship_referenda.rs
diff --git a/polkadot/runtime/kusama/src/weights/pallet_referenda_referenda.rs b/polkadot/runtime/westend/src/weights/pallet_referenda_referenda.rs
similarity index 100%
rename from polkadot/runtime/kusama/src/weights/pallet_referenda_referenda.rs
rename to polkadot/runtime/westend/src/weights/pallet_referenda_referenda.rs
diff --git a/polkadot/runtime/kusama/src/weights/pallet_treasury.rs b/polkadot/runtime/westend/src/weights/pallet_treasury.rs
similarity index 51%
rename from polkadot/runtime/kusama/src/weights/pallet_treasury.rs
rename to polkadot/runtime/westend/src/weights/pallet_treasury.rs
index fe2e4f9cee8f8edd52ddb76f30410edabb8c1bf4..144e9d5b872382b7381e2d77c6fb08a8fbece4fa 100644
--- a/polkadot/runtime/kusama/src/weights/pallet_treasury.rs
+++ b/polkadot/runtime/westend/src/weights/pallet_treasury.rs
@@ -17,27 +17,24 @@
 //! Autogenerated weights for `pallet_treasury`
 //!
 //! THIS FILE WAS AUTO-GENERATED USING THE SUBSTRATE BENCHMARK CLI VERSION 4.0.0-dev
-//! DATE: 2023-06-19, STEPS: `50`, REPEAT: `20`, LOW RANGE: `[]`, HIGH RANGE: `[]`
+//! DATE: 2023-07-07, STEPS: `50`, REPEAT: `2`, LOW RANGE: `[]`, HIGH RANGE: `[]`
 //! WORST CASE MAP SIZE: `1000000`
-//! HOSTNAME: `runner-e8ezs4ez-project-163-concurrent-0`, CPU: `Intel(R) Xeon(R) CPU @ 2.60GHz`
-//! EXECUTION: Some(Wasm), WASM-EXECUTION: Compiled, CHAIN: Some("kusama-dev"), DB CACHE: 1024
+//! HOSTNAME: `cob`, CPU: `<UNKNOWN>`
+//! EXECUTION: None, WASM-EXECUTION: Compiled, CHAIN: Some("rococo-dev"), DB CACHE: 1024
 
 // Executed Command:
-// ./target/production/polkadot
+// ./target/debug/polkadot
 // benchmark
 // pallet
-// --chain=kusama-dev
+// --chain=rococo-dev
 // --steps=50
-// --repeat=20
-// --no-storage-info
-// --no-median-slopes
-// --no-min-squares
+// --repeat=2
 // --pallet=pallet_treasury
 // --extrinsic=*
-// --execution=wasm
 // --wasm-execution=compiled
+// --heap-pages=4096
+// --output=./runtime/rococo/src/weights/
 // --header=./file_header.txt
-// --output=./runtime/kusama/src/weights/
 
 #![cfg_attr(rustfmt, rustfmt_skip)]
 #![allow(unused_parens)]
@@ -56,12 +53,12 @@ impl<T: frame_system::Config> pallet_treasury::WeightInfo for WeightInfo<T> {
 	/// Proof: Treasury Approvals (max_values: Some(1), max_size: Some(402), added: 897, mode: MaxEncodedLen)
 	/// Storage: Treasury Proposals (r:0 w:1)
 	/// Proof: Treasury Proposals (max_values: None, max_size: Some(108), added: 2583, mode: MaxEncodedLen)
-	fn spend() -> Weight {
+	fn spend_local() -> Weight {
 		// Proof Size summary in bytes:
-		//  Measured:  `6`
+		//  Measured:  `42`
 		//  Estimated: `1887`
-		// Minimum execution time: 14_076_000 picoseconds.
-		Weight::from_parts(14_546_000, 0)
+		// Minimum execution time: 177_000_000 picoseconds.
+		Weight::from_parts(191_000_000, 0)
 			.saturating_add(Weight::from_parts(0, 1887))
 			.saturating_add(T::DbWeight::get().reads(2))
 			.saturating_add(T::DbWeight::get().writes(3))
@@ -72,10 +69,10 @@ impl<T: frame_system::Config> pallet_treasury::WeightInfo for WeightInfo<T> {
 	/// Proof: Treasury Proposals (max_values: None, max_size: Some(108), added: 2583, mode: MaxEncodedLen)
 	fn propose_spend() -> Weight {
 		// Proof Size summary in bytes:
-		//  Measured:  `107`
+		//  Measured:  `143`
 		//  Estimated: `1489`
-		// Minimum execution time: 27_324_000 picoseconds.
-		Weight::from_parts(27_723_000, 0)
+		// Minimum execution time: 354_000_000 picoseconds.
+		Weight::from_parts(376_000_000, 0)
 			.saturating_add(Weight::from_parts(0, 1489))
 			.saturating_add(T::DbWeight::get().reads(1))
 			.saturating_add(T::DbWeight::get().writes(2))
@@ -86,10 +83,10 @@ impl<T: frame_system::Config> pallet_treasury::WeightInfo for WeightInfo<T> {
 	/// Proof: System Account (max_values: None, max_size: Some(128), added: 2603, mode: MaxEncodedLen)
 	fn reject_proposal() -> Weight {
 		// Proof Size summary in bytes:
-		//  Measured:  `265`
+		//  Measured:  `301`
 		//  Estimated: `3593`
-		// Minimum execution time: 41_722_000 picoseconds.
-		Weight::from_parts(42_638_000, 0)
+		// Minimum execution time: 547_000_000 picoseconds.
+		Weight::from_parts(550_000_000, 0)
 			.saturating_add(Weight::from_parts(0, 3593))
 			.saturating_add(T::DbWeight::get().reads(2))
 			.saturating_add(T::DbWeight::get().writes(2))
@@ -101,13 +98,13 @@ impl<T: frame_system::Config> pallet_treasury::WeightInfo for WeightInfo<T> {
 	/// The range of component `p` is `[0, 99]`.
 	fn approve_proposal(p: u32, ) -> Weight {
 		// Proof Size summary in bytes:
-		//  Measured:  `433 + p * (8 ±0)`
+		//  Measured:  `470 + p * (8 ±0)`
 		//  Estimated: `3573`
-		// Minimum execution time: 8_332_000 picoseconds.
-		Weight::from_parts(10_971_007, 0)
+		// Minimum execution time: 104_000_000 picoseconds.
+		Weight::from_parts(121_184_402, 0)
 			.saturating_add(Weight::from_parts(0, 3573))
-			// Standard Error: 1_480
-			.saturating_add(Weight::from_parts(78_440, 0).saturating_mul(p.into()))
+			// Standard Error: 42_854
+			.saturating_add(Weight::from_parts(153_112, 0).saturating_mul(p.into()))
 			.saturating_add(T::DbWeight::get().reads(2))
 			.saturating_add(T::DbWeight::get().writes(1))
 	}
@@ -115,10 +112,10 @@ impl<T: frame_system::Config> pallet_treasury::WeightInfo for WeightInfo<T> {
 	/// Proof: Treasury Approvals (max_values: Some(1), max_size: Some(402), added: 897, mode: MaxEncodedLen)
 	fn remove_approval() -> Weight {
 		// Proof Size summary in bytes:
-		//  Measured:  `90`
+		//  Measured:  `127`
 		//  Estimated: `1887`
-		// Minimum execution time: 6_465_000 picoseconds.
-		Weight::from_parts(6_632_000, 0)
+		// Minimum execution time: 80_000_000 picoseconds.
+		Weight::from_parts(82_000_000, 0)
 			.saturating_add(Weight::from_parts(0, 1887))
 			.saturating_add(T::DbWeight::get().reads(1))
 			.saturating_add(T::DbWeight::get().writes(1))
@@ -129,26 +126,98 @@ impl<T: frame_system::Config> pallet_treasury::WeightInfo for WeightInfo<T> {
 	/// Proof: Balances InactiveIssuance (max_values: Some(1), max_size: Some(16), added: 511, mode: MaxEncodedLen)
 	/// Storage: Treasury Approvals (r:1 w:1)
 	/// Proof: Treasury Approvals (max_values: Some(1), max_size: Some(402), added: 897, mode: MaxEncodedLen)
-	/// Storage: Treasury Proposals (r:100 w:100)
+	/// Storage: Treasury Proposals (r:99 w:99)
 	/// Proof: Treasury Proposals (max_values: None, max_size: Some(108), added: 2583, mode: MaxEncodedLen)
-	/// Storage: System Account (r:201 w:201)
+	/// Storage: System Account (r:199 w:199)
 	/// Proof: System Account (max_values: None, max_size: Some(128), added: 2603, mode: MaxEncodedLen)
 	/// Storage: Bounties BountyApprovals (r:1 w:1)
 	/// Proof: Bounties BountyApprovals (max_values: Some(1), max_size: Some(402), added: 897, mode: MaxEncodedLen)
-	/// The range of component `p` is `[0, 100]`.
+	/// The range of component `p` is `[0, 99]`.
 	fn on_initialize_proposals(p: u32, ) -> Weight {
 		// Proof Size summary in bytes:
-		//  Measured:  `264 + p * (251 ±0)`
+		//  Measured:  `331 + p * (251 ±0)`
 		//  Estimated: `3593 + p * (5206 ±0)`
-		// Minimum execution time: 67_339_000 picoseconds.
-		Weight::from_parts(61_523_213, 0)
+		// Minimum execution time: 887_000_000 picoseconds.
+		Weight::from_parts(828_616_021, 0)
 			.saturating_add(Weight::from_parts(0, 3593))
-			// Standard Error: 28_817
-			.saturating_add(Weight::from_parts(44_009_562, 0).saturating_mul(p.into()))
+			// Standard Error: 695_351
+			.saturating_add(Weight::from_parts(566_114_524, 0).saturating_mul(p.into()))
 			.saturating_add(T::DbWeight::get().reads(5))
 			.saturating_add(T::DbWeight::get().reads((3_u64).saturating_mul(p.into())))
 			.saturating_add(T::DbWeight::get().writes(5))
 			.saturating_add(T::DbWeight::get().writes((3_u64).saturating_mul(p.into())))
 			.saturating_add(Weight::from_parts(0, 5206).saturating_mul(p.into()))
 	}
+	/// Storage: AssetRate ConversionRateToNative (r:1 w:0)
+	/// Proof: AssetRate ConversionRateToNative (max_values: None, max_size: Some(1237), added: 3712, mode: MaxEncodedLen)
+	/// Storage: Treasury SpendCount (r:1 w:1)
+	/// Proof: Treasury SpendCount (max_values: Some(1), max_size: Some(4), added: 499, mode: MaxEncodedLen)
+	/// Storage: Treasury Spends (r:0 w:1)
+	/// Proof: Treasury Spends (max_values: None, max_size: Some(1848), added: 4323, mode: MaxEncodedLen)
+	fn spend() -> Weight {
+		// Proof Size summary in bytes:
+		//  Measured:  `114`
+		//  Estimated: `4702`
+		// Minimum execution time: 208_000_000 picoseconds.
+		Weight::from_parts(222_000_000, 0)
+			.saturating_add(Weight::from_parts(0, 4702))
+			.saturating_add(T::DbWeight::get().reads(2))
+			.saturating_add(T::DbWeight::get().writes(2))
+	}
+	/// Storage: Treasury Spends (r:1 w:1)
+	/// Proof: Treasury Spends (max_values: None, max_size: Some(1848), added: 4323, mode: MaxEncodedLen)
+	/// Storage: XcmPallet QueryCounter (r:1 w:1)
+	/// Proof Skipped: XcmPallet QueryCounter (max_values: Some(1), max_size: None, mode: Measured)
+	/// Storage: Configuration ActiveConfig (r:1 w:0)
+	/// Proof Skipped: Configuration ActiveConfig (max_values: Some(1), max_size: None, mode: Measured)
+	/// Storage: Dmp DeliveryFeeFactor (r:1 w:0)
+	/// Proof Skipped: Dmp DeliveryFeeFactor (max_values: None, max_size: None, mode: Measured)
+	/// Storage: XcmPallet SupportedVersion (r:1 w:0)
+	/// Proof Skipped: XcmPallet SupportedVersion (max_values: None, max_size: None, mode: Measured)
+	/// Storage: XcmPallet VersionDiscoveryQueue (r:1 w:1)
+	/// Proof Skipped: XcmPallet VersionDiscoveryQueue (max_values: Some(1), max_size: None, mode: Measured)
+	/// Storage: XcmPallet SafeXcmVersion (r:1 w:0)
+	/// Proof Skipped: XcmPallet SafeXcmVersion (max_values: Some(1), max_size: None, mode: Measured)
+	/// Storage: Dmp DownwardMessageQueues (r:1 w:1)
+	/// Proof Skipped: Dmp DownwardMessageQueues (max_values: None, max_size: None, mode: Measured)
+	/// Storage: Dmp DownwardMessageQueueHeads (r:1 w:1)
+	/// Proof Skipped: Dmp DownwardMessageQueueHeads (max_values: None, max_size: None, mode: Measured)
+	/// Storage: XcmPallet Queries (r:0 w:1)
+	/// Proof Skipped: XcmPallet Queries (max_values: None, max_size: None, mode: Measured)
+	fn payout() -> Weight {
+		// Proof Size summary in bytes:
+		//  Measured:  `737`
+		//  Estimated: `5313`
+		// Minimum execution time: 551_000_000 picoseconds.
+		Weight::from_parts(569_000_000, 0)
+			.saturating_add(Weight::from_parts(0, 5313))
+			.saturating_add(T::DbWeight::get().reads(9))
+			.saturating_add(T::DbWeight::get().writes(6))
+	}
+	/// Storage: Treasury Spends (r:1 w:1)
+	/// Proof: Treasury Spends (max_values: None, max_size: Some(1848), added: 4323, mode: MaxEncodedLen)
+	/// Storage: XcmPallet Queries (r:1 w:1)
+	/// Proof Skipped: XcmPallet Queries (max_values: None, max_size: None, mode: Measured)
+	fn check_status() -> Weight {
+		// Proof Size summary in bytes:
+		//  Measured:  `442`
+		//  Estimated: `5313`
+		// Minimum execution time: 245_000_000 picoseconds.
+		Weight::from_parts(281_000_000, 0)
+			.saturating_add(Weight::from_parts(0, 5313))
+			.saturating_add(T::DbWeight::get().reads(2))
+			.saturating_add(T::DbWeight::get().writes(2))
+	}
+	/// Storage: Treasury Spends (r:1 w:1)
+	/// Proof: Treasury Spends (max_values: None, max_size: Some(1848), added: 4323, mode: MaxEncodedLen)
+	fn void_spend() -> Weight {
+		// Proof Size summary in bytes:
+		//  Measured:  `172`
+		//  Estimated: `5313`
+		// Minimum execution time: 147_000_000 picoseconds.
+		Weight::from_parts(160_000_000, 0)
+			.saturating_add(Weight::from_parts(0, 5313))
+			.saturating_add(T::DbWeight::get().reads(1))
+			.saturating_add(T::DbWeight::get().writes(1))
+	}
 }
diff --git a/polkadot/runtime/westend/src/weights/pallet_whitelist.rs b/polkadot/runtime/westend/src/weights/pallet_whitelist.rs
new file mode 100644
index 0000000000000000000000000000000000000000..6177ac799e6a41b47f0216bf145e1009acf39679
--- /dev/null
+++ b/polkadot/runtime/westend/src/weights/pallet_whitelist.rs
@@ -0,0 +1,116 @@
+// 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/>.
+
+//! Autogenerated weights for `pallet_whitelist`
+//!
+//! THIS FILE WAS AUTO-GENERATED USING THE SUBSTRATE BENCHMARK CLI VERSION 4.0.0-dev
+//! DATE: 2023-07-12, STEPS: `50`, REPEAT: `20`, LOW RANGE: `[]`, HIGH RANGE: `[]`
+//! WORST CASE MAP SIZE: `1000000`
+//! HOSTNAME: `runner-o7yfgx5n-project-163-concurrent-0`, CPU: `Intel(R) Xeon(R) CPU @ 2.60GHz`
+//! EXECUTION: ``, WASM-EXECUTION: `Compiled`, CHAIN: `Some("westend-dev")`, DB CACHE: 1024
+
+// Executed Command:
+// target/production/polkadot
+// benchmark
+// pallet
+// --steps=50
+// --repeat=20
+// --extrinsic=*
+// --wasm-execution=compiled
+// --heap-pages=4096
+// --json-file=/builds/parity/mirrors/polkadot/.git/.artifacts/bench.json
+// --pallet=pallet_whitelist
+// --chain=westend-dev
+// --header=./file_header.txt
+// --output=./runtime/westend/src/weights/
+
+#![cfg_attr(rustfmt, rustfmt_skip)]
+#![allow(unused_parens)]
+#![allow(unused_imports)]
+#![allow(missing_docs)]
+
+use frame_support::{traits::Get, weights::Weight};
+use core::marker::PhantomData;
+
+/// Weight functions for `pallet_whitelist`.
+pub struct WeightInfo<T>(PhantomData<T>);
+impl<T: frame_system::Config> pallet_whitelist::WeightInfo for WeightInfo<T> {
+	/// Storage: `Whitelist::WhitelistedCall` (r:1 w:1)
+	/// Proof: `Whitelist::WhitelistedCall` (`max_values`: None, `max_size`: Some(40), added: 2515, mode: `MaxEncodedLen`)
+	/// Storage: `Preimage::StatusFor` (r:1 w:1)
+	/// Proof: `Preimage::StatusFor` (`max_values`: None, `max_size`: Some(91), added: 2566, mode: `MaxEncodedLen`)
+	fn whitelist_call() -> Weight {
+		// Proof Size summary in bytes:
+		//  Measured:  `122`
+		//  Estimated: `3556`
+		// Minimum execution time: 21_188_000 picoseconds.
+		Weight::from_parts(21_804_000, 0)
+			.saturating_add(Weight::from_parts(0, 3556))
+			.saturating_add(T::DbWeight::get().reads(2))
+			.saturating_add(T::DbWeight::get().writes(2))
+	}
+	/// Storage: `Whitelist::WhitelistedCall` (r:1 w:1)
+	/// Proof: `Whitelist::WhitelistedCall` (`max_values`: None, `max_size`: Some(40), added: 2515, mode: `MaxEncodedLen`)
+	/// Storage: `Preimage::StatusFor` (r:1 w:1)
+	/// Proof: `Preimage::StatusFor` (`max_values`: None, `max_size`: Some(91), added: 2566, mode: `MaxEncodedLen`)
+	fn remove_whitelisted_call() -> Weight {
+		// Proof Size summary in bytes:
+		//  Measured:  `251`
+		//  Estimated: `3556`
+		// Minimum execution time: 17_655_000 picoseconds.
+		Weight::from_parts(19_443_000, 0)
+			.saturating_add(Weight::from_parts(0, 3556))
+			.saturating_add(T::DbWeight::get().reads(2))
+			.saturating_add(T::DbWeight::get().writes(2))
+	}
+	/// Storage: `Whitelist::WhitelistedCall` (r:1 w:1)
+	/// Proof: `Whitelist::WhitelistedCall` (`max_values`: None, `max_size`: Some(40), added: 2515, mode: `MaxEncodedLen`)
+	/// Storage: `Preimage::PreimageFor` (r:1 w:1)
+	/// Proof: `Preimage::PreimageFor` (`max_values`: None, `max_size`: Some(4194344), added: 4196819, mode: `Measured`)
+	/// Storage: `Preimage::StatusFor` (r:1 w:1)
+	/// Proof: `Preimage::StatusFor` (`max_values`: None, `max_size`: Some(91), added: 2566, mode: `MaxEncodedLen`)
+	/// The range of component `n` is `[1, 4194294]`.
+	fn dispatch_whitelisted_call(n: u32, ) -> Weight {
+		// Proof Size summary in bytes:
+		//  Measured:  `327 + n * (1 ±0)`
+		//  Estimated: `3791 + n * (1 ±0)`
+		// Minimum execution time: 30_540_000 picoseconds.
+		Weight::from_parts(30_886_000, 0)
+			.saturating_add(Weight::from_parts(0, 3791))
+			// Standard Error: 9
+			.saturating_add(Weight::from_parts(1_779, 0).saturating_mul(n.into()))
+			.saturating_add(T::DbWeight::get().reads(3))
+			.saturating_add(T::DbWeight::get().writes(3))
+			.saturating_add(Weight::from_parts(0, 1).saturating_mul(n.into()))
+	}
+	/// Storage: `Whitelist::WhitelistedCall` (r:1 w:1)
+	/// Proof: `Whitelist::WhitelistedCall` (`max_values`: None, `max_size`: Some(40), added: 2515, mode: `MaxEncodedLen`)
+	/// Storage: `Preimage::StatusFor` (r:1 w:1)
+	/// Proof: `Preimage::StatusFor` (`max_values`: None, `max_size`: Some(91), added: 2566, mode: `MaxEncodedLen`)
+	/// The range of component `n` is `[1, 10000]`.
+	fn dispatch_whitelisted_call_with_preimage(n: u32, ) -> Weight {
+		// Proof Size summary in bytes:
+		//  Measured:  `251`
+		//  Estimated: `3556`
+		// Minimum execution time: 21_082_000 picoseconds.
+		Weight::from_parts(21_922_294, 0)
+			.saturating_add(Weight::from_parts(0, 3556))
+			// Standard Error: 4
+			.saturating_add(Weight::from_parts(1_412, 0).saturating_mul(n.into()))
+			.saturating_add(T::DbWeight::get().reads(2))
+			.saturating_add(T::DbWeight::get().writes(2))
+	}
+}
diff --git a/polkadot/runtime/westend/src/weights/runtime_parachains_hrmp.rs b/polkadot/runtime/westend/src/weights/runtime_parachains_hrmp.rs
index e6ff97fa08784d5f9fc75d9274295c2ee666843a..9beb15303d871cd4ae0b6b0ce3148291d745395b 100644
--- a/polkadot/runtime/westend/src/weights/runtime_parachains_hrmp.rs
+++ b/polkadot/runtime/westend/src/weights/runtime_parachains_hrmp.rs
@@ -282,4 +282,46 @@ impl<T: frame_system::Config> runtime_parachains::hrmp::WeightInfo for WeightInf
 			.saturating_add(T::DbWeight::get().reads(13))
 			.saturating_add(T::DbWeight::get().writes(8))
 	}
+	/// Storage: `Paras::ParaLifecycles` (r:1 w:0)
+	/// Proof: `Paras::ParaLifecycles` (`max_values`: None, `max_size`: None, mode: `Measured`)
+	/// Storage: `Hrmp::HrmpOpenChannelRequests` (r:1 w:1)
+	/// Proof: `Hrmp::HrmpOpenChannelRequests` (`max_values`: None, `max_size`: None, mode: `Measured`)
+	/// Storage: `Hrmp::HrmpChannels` (r:1 w:0)
+	/// Proof: `Hrmp::HrmpChannels` (`max_values`: None, `max_size`: None, mode: `Measured`)
+	/// Storage: `Hrmp::HrmpEgressChannelsIndex` (r:1 w:0)
+	/// Proof: `Hrmp::HrmpEgressChannelsIndex` (`max_values`: None, `max_size`: None, mode: `Measured`)
+	/// Storage: `Hrmp::HrmpOpenChannelRequestCount` (r:1 w:1)
+	/// Proof: `Hrmp::HrmpOpenChannelRequestCount` (`max_values`: None, `max_size`: None, mode: `Measured`)
+	/// Storage: `Hrmp::HrmpOpenChannelRequestsList` (r:1 w:1)
+	/// Proof: `Hrmp::HrmpOpenChannelRequestsList` (`max_values`: Some(1), `max_size`: None, mode: `Measured`)
+	/// Storage: `Dmp::DownwardMessageQueues` (r:2 w:2)
+	/// Proof: `Dmp::DownwardMessageQueues` (`max_values`: None, `max_size`: None, mode: `Measured`)
+	/// Storage: `Dmp::DownwardMessageQueueHeads` (r:2 w:2)
+	/// Proof: `Dmp::DownwardMessageQueueHeads` (`max_values`: None, `max_size`: None, mode: `Measured`)
+	/// Storage: `Hrmp::HrmpIngressChannelsIndex` (r:1 w:0)
+	/// Proof: `Hrmp::HrmpIngressChannelsIndex` (`max_values`: None, `max_size`: None, mode: `Measured`)
+	/// Storage: `Hrmp::HrmpAcceptedChannelRequestCount` (r:1 w:1)
+	/// Proof: `Hrmp::HrmpAcceptedChannelRequestCount` (`max_values`: None, `max_size`: None, mode: `Measured`)
+	fn establish_system_channel() -> Weight {
+		// Proof Size summary in bytes:
+		//  Measured:  `417`
+		//  Estimated: `6357`
+		// Minimum execution time: 629_674_000 picoseconds.
+		Weight::from_parts(640_174_000, 0)
+			.saturating_add(Weight::from_parts(0, 6357))
+			.saturating_add(T::DbWeight::get().reads(12))
+			.saturating_add(T::DbWeight::get().writes(8))
+	}
+	/// Storage: `Hrmp::HrmpChannels` (r:1 w:1)
+	/// Proof: `Hrmp::HrmpChannels` (`max_values`: None, `max_size`: None, mode: `Measured`)
+	fn poke_channel_deposits() -> Weight {
+		// Proof Size summary in bytes:
+		//  Measured:  `263`
+		//  Estimated: `3728`
+		// Minimum execution time: 173_371_000 picoseconds.
+		Weight::from_parts(175_860_000, 0)
+			.saturating_add(Weight::from_parts(0, 3728))
+			.saturating_add(T::DbWeight::get().reads(1))
+			.saturating_add(T::DbWeight::get().writes(1))
+	}
 }
diff --git a/polkadot/runtime/westend/src/weights/xcm/mod.rs b/polkadot/runtime/westend/src/weights/xcm/mod.rs
index c6fa6bb93eb6ab69b256597bbedd59210bfcbf67..d5b3d8257ba54cd665933d10a5518d73382327e1 100644
--- a/polkadot/runtime/westend/src/weights/xcm/mod.rs
+++ b/polkadot/runtime/westend/src/weights/xcm/mod.rs
@@ -94,7 +94,6 @@ impl<RuntimeCall> XcmWeightInfo<RuntimeCall> for WestendXcmWeight<RuntimeCall> {
 		assets.weigh_multi_assets(XcmBalancesWeight::<Runtime>::withdraw_asset())
 	}
 	fn reserve_asset_deposited(assets: &MultiAssets) -> Weight {
-		// Westend doesn't support ReserveAssetDeposited, so this benchmark has a default weight
 		assets.weigh_multi_assets(XcmBalancesWeight::<Runtime>::reserve_asset_deposited())
 	}
 	fn receive_teleported_asset(assets: &MultiAssets) -> Weight {
diff --git a/polkadot/runtime/westend/src/weights/xcm/pallet_xcm_benchmarks_fungible.rs b/polkadot/runtime/westend/src/weights/xcm/pallet_xcm_benchmarks_fungible.rs
index b92749bfa15b314573052ed4472bc664cd39e3ae..87e63fbe31070be2a45dc3f9c2b8ba36eaac83bb 100644
--- a/polkadot/runtime/westend/src/weights/xcm/pallet_xcm_benchmarks_fungible.rs
+++ b/polkadot/runtime/westend/src/weights/xcm/pallet_xcm_benchmarks_fungible.rs
@@ -17,10 +17,10 @@
 //! Autogenerated weights for `pallet_xcm_benchmarks::fungible`
 //!
 //! THIS FILE WAS AUTO-GENERATED USING THE SUBSTRATE BENCHMARK CLI VERSION 4.0.0-dev
-//! DATE: 2023-07-17, STEPS: `50`, REPEAT: `20`, LOW RANGE: `[]`, HIGH RANGE: `[]`
+//! DATE: 2023-09-28, STEPS: `50`, REPEAT: `20`, LOW RANGE: `[]`, HIGH RANGE: `[]`
 //! WORST CASE MAP SIZE: `1000000`
-//! HOSTNAME: `runner-gghbxkbs-project-163-concurrent-0`, CPU: `Intel(R) Xeon(R) CPU @ 2.60GHz`
-//! EXECUTION: , WASM-EXECUTION: Compiled, CHAIN: Some("westend-dev"), DB CACHE: 1024
+//! HOSTNAME: `runner-nbnwcyh-project-674-concurrent-0`, CPU: `Intel(R) Xeon(R) CPU @ 2.60GHz`
+//! WASM-EXECUTION: Compiled, CHAIN: Some("westend-dev"), DB CACHE: 1024
 
 // Executed Command:
 // target/production/polkadot
@@ -31,12 +31,12 @@
 // --extrinsic=*
 // --wasm-execution=compiled
 // --heap-pages=4096
-// --json-file=/builds/parity/mirrors/polkadot/.git/.artifacts/bench.json
+// --json-file=/builds/parity/mirrors/polkadot-sdk/.git/.artifacts/bench.json
 // --pallet=pallet_xcm_benchmarks::fungible
 // --chain=westend-dev
-// --header=./file_header.txt
-// --template=./xcm/pallet-xcm-benchmarks/template.hbs
-// --output=./runtime/westend/src/weights/xcm/
+// --header=./polkadot/file_header.txt
+// --template=./polkadot/xcm/pallet-xcm-benchmarks/template.hbs
+// --output=./polkadot/runtime/westend/src/weights/xcm/
 
 #![cfg_attr(rustfmt, rustfmt_skip)]
 #![allow(unused_parens)]
@@ -55,8 +55,8 @@ impl<T: frame_system::Config> WeightInfo<T> {
 		// Proof Size summary in bytes:
 		//  Measured:  `101`
 		//  Estimated: `3593`
-		// Minimum execution time: 24_887_000 picoseconds.
-		Weight::from_parts(25_361_000, 3593)
+		// Minimum execution time: 24_642_000 picoseconds.
+		Weight::from_parts(24_973_000, 3593)
 			.saturating_add(T::DbWeight::get().reads(1))
 			.saturating_add(T::DbWeight::get().writes(1))
 	}
@@ -66,8 +66,8 @@ impl<T: frame_system::Config> WeightInfo<T> {
 		// Proof Size summary in bytes:
 		//  Measured:  `101`
 		//  Estimated: `6196`
-		// Minimum execution time: 52_408_000 picoseconds.
-		Weight::from_parts(53_387_000, 6196)
+		// Minimum execution time: 50_882_000 picoseconds.
+		Weight::from_parts(51_516_000, 6196)
 			.saturating_add(T::DbWeight::get().reads(2))
 			.saturating_add(T::DbWeight::get().writes(2))
 	}
@@ -83,10 +83,10 @@ impl<T: frame_system::Config> WeightInfo<T> {
 	/// Proof: `Dmp::DownwardMessageQueueHeads` (`max_values`: None, `max_size`: None, mode: `Measured`)
 	pub(crate) fn transfer_reserve_asset() -> Weight {
 		// Proof Size summary in bytes:
-		//  Measured:  `177`
+		//  Measured:  `210`
 		//  Estimated: `6196`
-		// Minimum execution time: 74_753_000 picoseconds.
-		Weight::from_parts(76_838_000, 6196)
+		// Minimum execution time: 73_923_000 picoseconds.
+		Weight::from_parts(75_454_000, 6196)
 			.saturating_add(T::DbWeight::get().reads(6))
 			.saturating_add(T::DbWeight::get().writes(4))
 	}
@@ -96,8 +96,8 @@ impl<T: frame_system::Config> WeightInfo<T> {
 		// Proof Size summary in bytes:
 		//  Measured:  `0`
 		//  Estimated: `0`
-		// Minimum execution time: 2_000_000_000_000 picoseconds.
-		Weight::from_parts(2_000_000_000_000, 0)
+		// Minimum execution time: 18_446_744_073_709_551_000 picoseconds.
+		Weight::from_parts(18_446_744_073_709_551_000, 0)
 	}
 	/// Storage: `Dmp::DeliveryFeeFactor` (r:1 w:0)
 	/// Proof: `Dmp::DeliveryFeeFactor` (`max_values`: None, `max_size`: None, mode: `Measured`)
@@ -109,10 +109,10 @@ impl<T: frame_system::Config> WeightInfo<T> {
 	/// Proof: `Dmp::DownwardMessageQueueHeads` (`max_values`: None, `max_size`: None, mode: `Measured`)
 	pub(crate) fn initiate_reserve_withdraw() -> Weight {
 		// Proof Size summary in bytes:
-		//  Measured:  `76`
-		//  Estimated: `3541`
-		// Minimum execution time: 29_272_000 picoseconds.
-		Weight::from_parts(30_061_000, 3541)
+		//  Measured:  `109`
+		//  Estimated: `3574`
+		// Minimum execution time: 29_035_000 picoseconds.
+		Weight::from_parts(30_086_000, 3574)
 			.saturating_add(T::DbWeight::get().reads(4))
 			.saturating_add(T::DbWeight::get().writes(2))
 	}
@@ -122,8 +122,8 @@ impl<T: frame_system::Config> WeightInfo<T> {
 		// Proof Size summary in bytes:
 		//  Measured:  `103`
 		//  Estimated: `3593`
-		// Minimum execution time: 23_112_000 picoseconds.
-		Weight::from_parts(23_705_000, 3593)
+		// Minimum execution time: 22_094_000 picoseconds.
+		Weight::from_parts(22_560_000, 3593)
 			.saturating_add(T::DbWeight::get().reads(1))
 			.saturating_add(T::DbWeight::get().writes(1))
 	}
@@ -133,8 +133,8 @@ impl<T: frame_system::Config> WeightInfo<T> {
 		// Proof Size summary in bytes:
 		//  Measured:  `0`
 		//  Estimated: `3593`
-		// Minimum execution time: 26_077_000 picoseconds.
-		Weight::from_parts(26_486_000, 3593)
+		// Minimum execution time: 24_771_000 picoseconds.
+		Weight::from_parts(25_280_000, 3593)
 			.saturating_add(T::DbWeight::get().reads(1))
 			.saturating_add(T::DbWeight::get().writes(1))
 	}
@@ -150,10 +150,10 @@ impl<T: frame_system::Config> WeightInfo<T> {
 	/// Proof: `Dmp::DownwardMessageQueueHeads` (`max_values`: None, `max_size`: None, mode: `Measured`)
 	pub(crate) fn deposit_reserve_asset() -> Weight {
 		// Proof Size summary in bytes:
-		//  Measured:  `76`
+		//  Measured:  `109`
 		//  Estimated: `3593`
-		// Minimum execution time: 51_022_000 picoseconds.
-		Weight::from_parts(52_498_000, 3593)
+		// Minimum execution time: 49_777_000 picoseconds.
+		Weight::from_parts(50_833_000, 3593)
 			.saturating_add(T::DbWeight::get().reads(5))
 			.saturating_add(T::DbWeight::get().writes(3))
 	}
@@ -169,10 +169,10 @@ impl<T: frame_system::Config> WeightInfo<T> {
 	/// Proof: `Dmp::DownwardMessageQueueHeads` (`max_values`: None, `max_size`: None, mode: `Measured`)
 	pub(crate) fn initiate_teleport() -> Weight {
 		// Proof Size summary in bytes:
-		//  Measured:  `76`
+		//  Measured:  `109`
 		//  Estimated: `3593`
-		// Minimum execution time: 53_062_000 picoseconds.
-		Weight::from_parts(54_300_000, 3593)
+		// Minimum execution time: 51_425_000 picoseconds.
+		Weight::from_parts(52_213_000, 3593)
 			.saturating_add(T::DbWeight::get().reads(5))
 			.saturating_add(T::DbWeight::get().writes(3))
 	}
diff --git a/polkadot/runtime/westend/src/xcm_config.rs b/polkadot/runtime/westend/src/xcm_config.rs
index a83c38c9f66f655055c39ec12ceca5d890aa5b0f..66a2e2230ccd6652c3b9f5e8d54d8ca0dae7d122 100644
--- a/polkadot/runtime/westend/src/xcm_config.rs
+++ b/polkadot/runtime/westend/src/xcm_config.rs
@@ -17,36 +17,40 @@
 //! XCM configurations for Westend.
 
 use super::{
-	parachains_origin, weights, AccountId, AllPalletsWithSystem, Balances, Dmp, ParaId, Runtime,
-	RuntimeCall, RuntimeEvent, RuntimeOrigin, TransactionByteFee, WeightToFee, XcmPallet,
+	parachains_origin, AccountId, AllPalletsWithSystem, Balances, Dmp, FellowshipAdmin,
+	GeneralAdmin, ParaId, Runtime, RuntimeCall, RuntimeEvent, RuntimeOrigin, StakingAdmin,
+	TransactionByteFee, WeightToFee, XcmPallet,
 };
+
 use frame_support::{
-	parameter_types,
-	traits::{Contains, Everything, Nothing},
+	match_types, parameter_types,
+	traits::{Everything, Nothing},
 };
 use frame_system::EnsureRoot;
+use pallet_xcm::XcmPassthrough;
 use runtime_common::{
-	crowdloan, paras_registrar,
 	xcm_sender::{ChildParachainRouter, ExponentialPrice},
 	ToAuthor,
 };
 use sp_core::ConstU32;
-use westend_runtime_constants::currency::CENTS;
+use westend_runtime_constants::{
+	currency::CENTS, system_parachain::*, xcm::body::FELLOWSHIP_ADMIN_INDEX,
+};
 use xcm::latest::prelude::*;
 use xcm_builder::{
 	AccountId32Aliases, AllowExplicitUnpaidExecutionFrom, AllowKnownQueryResponses,
 	AllowSubscriptionsFrom, AllowTopLevelPaidExecutionFrom, ChildParachainAsNative,
-	ChildParachainConvertsVia, ChildSystemParachainAsSuperuser,
-	CurrencyAdapter as XcmCurrencyAdapter, IsChildSystemParachain, IsConcrete, MintLocation,
+	ChildParachainConvertsVia, CurrencyAdapter as XcmCurrencyAdapter, DescribeBodyTerminal,
+	DescribeFamily, HashedDescription, IsConcrete, MintLocation, OriginToPluralityVoice,
 	SignedAccountId32AsNative, SignedToAccountId32, SovereignSignedViaLocation, TakeWeightCredit,
 	TrailingSetTopicAsId, UsingComponents, WeightInfoBounds, WithComputedOrigin, WithUniqueTopic,
 };
-use xcm_executor::{traits::WithOriginFilter, XcmExecutor};
+use xcm_executor::XcmExecutor;
 
 parameter_types! {
 	pub const TokenLocation: MultiLocation = Here.into_location();
 	pub const ThisNetwork: NetworkId = Westend;
-	pub UniversalLocation: InteriorMultiLocation = ThisNetwork::get().into();
+	pub const UniversalLocation: InteriorMultiLocation = X1(GlobalConsensus(ThisNetwork::get()));
 	pub CheckAccount: AccountId = XcmPallet::check_account();
 	pub LocalCheckAccount: (AccountId, MintLocation) = (CheckAccount::get(), MintLocation::Local);
 	/// The asset ID for the asset that we use to pay for message delivery fees.
@@ -55,8 +59,14 @@ parameter_types! {
 	pub const BaseDeliveryFee: u128 = CENTS.saturating_mul(3);
 }
 
-pub type LocationConverter =
-	(ChildParachainConvertsVia<ParaId, AccountId>, AccountId32Aliases<ThisNetwork, AccountId>);
+pub type LocationConverter = (
+	// We can convert a child parachain using the standard `AccountId` conversion.
+	ChildParachainConvertsVia<ParaId, AccountId>,
+	// We can directly alias an `AccountId32` into a local account.
+	AccountId32Aliases<ThisNetwork, AccountId>,
+	// Allow governance body to be used as a sovereign account.
+	HashedDescription<AccountId, DescribeFamily<DescribeBodyTerminal>>,
+);
 
 pub type LocalAssetTransactor = XcmCurrencyAdapter<
 	// Use this currency:
@@ -72,10 +82,17 @@ pub type LocalAssetTransactor = XcmCurrencyAdapter<
 >;
 
 type LocalOriginConverter = (
+	// If the origin kind is `Sovereign`, then return a `Signed` origin with the account determined
+	// by the `LocationConverter` converter.
 	SovereignSignedViaLocation<LocationConverter, RuntimeOrigin>,
+	// If the origin kind is `Native` and the XCM origin is a child parachain, then we can express
+	// it with the special `parachains_origin::Origin` origin variant.
 	ChildParachainAsNative<parachains_origin::Origin, RuntimeOrigin>,
+	// If the origin kind is `Native` and the XCM origin is the `AccountId32` location, then it can
+	// be expressed using the `Signed` origin variant.
 	SignedAccountId32AsNative<ThisNetwork, RuntimeOrigin>,
-	ChildSystemParachainAsSuperuser<ParaId, RuntimeOrigin>,
+	// Xcm origins can be represented natively under the Xcm pallet's Xcm origin.
+	XcmPassthrough<RuntimeOrigin>,
 );
 
 /// The XCM router. When we want to send an XCM message, we use this type. It amalgamates all of our
@@ -90,22 +107,27 @@ pub type XcmRouter = WithUniqueTopic<(
 )>;
 
 parameter_types! {
-	pub const Westmint: MultiLocation = Parachain(1000).into_location();
-	pub const Collectives: MultiLocation = Parachain(1001).into_location();
 	pub const Wnd: MultiAssetFilter = Wild(AllOf { fun: WildFungible, id: Concrete(TokenLocation::get()) });
-	pub const WndForWestmint: (MultiAssetFilter, MultiLocation) = (Wnd::get(), Westmint::get());
+	pub const AssetHub: MultiLocation = Parachain(ASSET_HUB_ID).into_location();
+	pub const WndForAssetHub: (MultiAssetFilter, MultiLocation) = (Wnd::get(), AssetHub::get());
+	pub const Collectives: MultiLocation = Parachain(COLLECTIVES_ID).into_location();
 	pub const WndForCollectives: (MultiAssetFilter, MultiLocation) = (Wnd::get(), Collectives::get());
 	pub const MaxInstructions: u32 = 100;
 	pub const MaxAssetsIntoHolding: u32 = 64;
 }
 
-#[cfg(feature = "runtime-benchmarks")]
-parameter_types! {
-	pub ReachableDest: Option<MultiLocation> = Some(Parachain(1000).into());
-}
-
 pub type TrustedTeleporters =
-	(xcm_builder::Case<WndForWestmint>, xcm_builder::Case<WndForCollectives>);
+	(xcm_builder::Case<WndForAssetHub>, xcm_builder::Case<WndForCollectives>);
+
+match_types! {
+	pub type OnlyParachains: impl Contains<MultiLocation> = {
+		MultiLocation { parents: 0, interior: X1(Parachain(_)) }
+	};
+	pub type CollectivesOrFellows: impl Contains<MultiLocation> = {
+		MultiLocation { parents: 0, interior: X1(Parachain(COLLECTIVES_ID)) } |
+		MultiLocation { parents: 0, interior: X2(Parachain(COLLECTIVES_ID), Plurality { id: BodyId::Technical, .. }) }
+	};
+}
 
 /// The barriers one of which must be passed for an XCM message to be executed.
 pub type Barrier = TrailingSetTopicAsId<(
@@ -117,130 +139,16 @@ pub type Barrier = TrailingSetTopicAsId<(
 		(
 			// If the message is one that immediately attemps to pay for execution, then allow it.
 			AllowTopLevelPaidExecutionFrom<Everything>,
-			// Messages coming from system parachains need not pay for execution.
-			AllowExplicitUnpaidExecutionFrom<IsChildSystemParachain<ParaId>>,
 			// Subscriptions for version tracking are OK.
-			AllowSubscriptionsFrom<Everything>,
+			AllowSubscriptionsFrom<OnlyParachains>,
+			// Collectives and Fellows plurality get free execution.
+			AllowExplicitUnpaidExecutionFrom<CollectivesOrFellows>,
 		),
 		UniversalLocation,
 		ConstU32<8>,
 	>,
 )>;
 
-/// A call filter for the XCM Transact instruction. This is a temporary measure until we
-/// properly account for proof size weights.
-///
-/// Calls that are allowed through this filter must:
-/// 1. Have a fixed weight;
-/// 2. Cannot lead to another call being made;
-/// 3. Have a defined proof size weight, e.g. no unbounded vecs in call parameters.
-pub struct SafeCallFilter;
-impl Contains<RuntimeCall> for SafeCallFilter {
-	fn contains(call: &RuntimeCall) -> bool {
-		#[cfg(feature = "runtime-benchmarks")]
-		{
-			if matches!(call, RuntimeCall::System(frame_system::Call::remark_with_event { .. })) {
-				return true
-			}
-		}
-
-		match call {
-			RuntimeCall::System(
-				frame_system::Call::kill_prefix { .. } | frame_system::Call::set_heap_pages { .. },
-			) |
-			RuntimeCall::Babe(..) |
-			RuntimeCall::Timestamp(..) |
-			RuntimeCall::Indices(..) |
-			RuntimeCall::Balances(..) |
-			RuntimeCall::Crowdloan(
-				crowdloan::Call::create { .. } |
-				crowdloan::Call::contribute { .. } |
-				crowdloan::Call::withdraw { .. } |
-				crowdloan::Call::refund { .. } |
-				crowdloan::Call::dissolve { .. } |
-				crowdloan::Call::edit { .. } |
-				crowdloan::Call::poke { .. } |
-				crowdloan::Call::contribute_all { .. },
-			) |
-			RuntimeCall::Staking(
-				pallet_staking::Call::bond { .. } |
-				pallet_staking::Call::bond_extra { .. } |
-				pallet_staking::Call::unbond { .. } |
-				pallet_staking::Call::withdraw_unbonded { .. } |
-				pallet_staking::Call::validate { .. } |
-				pallet_staking::Call::nominate { .. } |
-				pallet_staking::Call::chill { .. } |
-				pallet_staking::Call::set_payee { .. } |
-				pallet_staking::Call::set_controller { .. } |
-				pallet_staking::Call::set_validator_count { .. } |
-				pallet_staking::Call::increase_validator_count { .. } |
-				pallet_staking::Call::scale_validator_count { .. } |
-				pallet_staking::Call::force_no_eras { .. } |
-				pallet_staking::Call::force_new_era { .. } |
-				pallet_staking::Call::set_invulnerables { .. } |
-				pallet_staking::Call::force_unstake { .. } |
-				pallet_staking::Call::force_new_era_always { .. } |
-				pallet_staking::Call::payout_stakers { .. } |
-				pallet_staking::Call::rebond { .. } |
-				pallet_staking::Call::reap_stash { .. } |
-				pallet_staking::Call::set_staking_configs { .. } |
-				pallet_staking::Call::chill_other { .. } |
-				pallet_staking::Call::force_apply_min_commission { .. },
-			) |
-			RuntimeCall::Session(pallet_session::Call::purge_keys { .. }) |
-			RuntimeCall::Grandpa(..) |
-			RuntimeCall::ImOnline(..) |
-			RuntimeCall::Utility(pallet_utility::Call::as_derivative { .. }) |
-			RuntimeCall::Identity(
-				pallet_identity::Call::add_registrar { .. } |
-				pallet_identity::Call::set_identity { .. } |
-				pallet_identity::Call::clear_identity { .. } |
-				pallet_identity::Call::request_judgement { .. } |
-				pallet_identity::Call::cancel_request { .. } |
-				pallet_identity::Call::set_fee { .. } |
-				pallet_identity::Call::set_account_id { .. } |
-				pallet_identity::Call::set_fields { .. } |
-				pallet_identity::Call::provide_judgement { .. } |
-				pallet_identity::Call::kill_identity { .. } |
-				pallet_identity::Call::add_sub { .. } |
-				pallet_identity::Call::rename_sub { .. } |
-				pallet_identity::Call::remove_sub { .. } |
-				pallet_identity::Call::quit_sub { .. },
-			) |
-			RuntimeCall::Recovery(..) |
-			RuntimeCall::Vesting(..) |
-			RuntimeCall::ElectionProviderMultiPhase(..) |
-			RuntimeCall::VoterList(..) |
-			RuntimeCall::NominationPools(
-				pallet_nomination_pools::Call::join { .. } |
-				pallet_nomination_pools::Call::bond_extra { .. } |
-				pallet_nomination_pools::Call::claim_payout { .. } |
-				pallet_nomination_pools::Call::unbond { .. } |
-				pallet_nomination_pools::Call::pool_withdraw_unbonded { .. } |
-				pallet_nomination_pools::Call::withdraw_unbonded { .. } |
-				pallet_nomination_pools::Call::create { .. } |
-				pallet_nomination_pools::Call::create_with_pool_id { .. } |
-				pallet_nomination_pools::Call::set_state { .. } |
-				pallet_nomination_pools::Call::set_configs { .. } |
-				pallet_nomination_pools::Call::update_roles { .. } |
-				pallet_nomination_pools::Call::chill { .. },
-			) |
-			RuntimeCall::Hrmp(..) |
-			RuntimeCall::Registrar(
-				paras_registrar::Call::deregister { .. } |
-				paras_registrar::Call::swap { .. } |
-				paras_registrar::Call::remove_lock { .. } |
-				paras_registrar::Call::reserve { .. } |
-				paras_registrar::Call::add_lock { .. },
-			) |
-			RuntimeCall::XcmPallet(pallet_xcm::Call::limited_reserve_transfer_assets {
-				..
-			}) => true,
-			_ => false,
-		}
-	}
-}
-
 pub struct XcmConfig;
 impl xcm_executor::Config for XcmConfig {
 	type RuntimeCall = RuntimeCall;
@@ -251,8 +159,11 @@ impl xcm_executor::Config for XcmConfig {
 	type IsTeleporter = TrustedTeleporters;
 	type UniversalLocation = UniversalLocation;
 	type Barrier = Barrier;
-	type Weigher =
-		WeightInfoBounds<weights::xcm::WestendXcmWeight<RuntimeCall>, RuntimeCall, MaxInstructions>;
+	type Weigher = WeightInfoBounds<
+		crate::weights::xcm::WestendXcmWeight<RuntimeCall>,
+		RuntimeCall,
+		MaxInstructions,
+	>;
 	type Trader =
 		UsingComponents<WeightToFee, TokenLocation, AccountId, Balances, ToAuthor<Runtime>>;
 	type ResponseHandler = XcmPallet;
@@ -266,21 +177,59 @@ impl xcm_executor::Config for XcmConfig {
 	type FeeManager = ();
 	type MessageExporter = ();
 	type UniversalAliases = Nothing;
-	type CallDispatcher = WithOriginFilter<SafeCallFilter>;
-	type SafeCallFilter = SafeCallFilter;
+	type CallDispatcher = RuntimeCall;
+	type SafeCallFilter = Everything;
 	type Aliasers = Nothing;
 }
 
+parameter_types! {
+	// `GeneralAdmin` pluralistic body.
+	pub const GeneralAdminBodyId: BodyId = BodyId::Administration;
+	// StakingAdmin pluralistic body.
+	pub const StakingAdminBodyId: BodyId = BodyId::Defense;
+	// FellowshipAdmin pluralistic body.
+	pub const FellowshipAdminBodyId: BodyId = BodyId::Index(FELLOWSHIP_ADMIN_INDEX);
+}
+
+#[cfg(feature = "runtime-benchmarks")]
+parameter_types! {
+	pub ReachableDest: Option<MultiLocation> = Some(Parachain(1000).into());
+}
+
+/// Type to convert the `GeneralAdmin` origin to a Plurality `MultiLocation` value.
+pub type GeneralAdminToPlurality =
+	OriginToPluralityVoice<RuntimeOrigin, GeneralAdmin, GeneralAdminBodyId>;
+
 /// Type to convert an `Origin` type value into a `MultiLocation` value which represents an interior
 /// location of this chain.
 pub type LocalOriginToLocation = (
+	GeneralAdminToPlurality,
 	// And a usual Signed origin to be used in XCM as a corresponding AccountId32
 	SignedToAccountId32<RuntimeOrigin, AccountId, ThisNetwork>,
 );
 
+/// Type to convert the `StakingAdmin` origin to a Plurality `MultiLocation` value.
+pub type StakingAdminToPlurality =
+	OriginToPluralityVoice<RuntimeOrigin, StakingAdmin, StakingAdminBodyId>;
+
+/// Type to convert the `FellowshipAdmin` origin to a Plurality `MultiLocation` value.
+pub type FellowshipAdminToPlurality =
+	OriginToPluralityVoice<RuntimeOrigin, FellowshipAdmin, FellowshipAdminBodyId>;
+
+/// Type to convert a pallet `Origin` type value into a `MultiLocation` value which represents an
+/// interior location of this chain for a destination chain.
+pub type LocalPalletOriginToLocation = (
+	// GeneralAdmin origin to be used in XCM as a corresponding Plurality `MultiLocation` value.
+	GeneralAdminToPlurality,
+	// StakingAdmin origin to be used in XCM as a corresponding Plurality `MultiLocation` value.
+	StakingAdminToPlurality,
+	// FellowshipAdmin origin to be used in XCM as a corresponding Plurality `MultiLocation` value.
+	FellowshipAdminToPlurality,
+);
+
 impl pallet_xcm::Config for Runtime {
 	type RuntimeEvent = RuntimeEvent;
-	type SendXcmOrigin = xcm_builder::EnsureXcmOrigin<RuntimeOrigin, LocalOriginToLocation>;
+	type SendXcmOrigin = xcm_builder::EnsureXcmOrigin<RuntimeOrigin, LocalPalletOriginToLocation>;
 	type XcmRouter = XcmRouter;
 	// Anyone can execute XCM messages locally...
 	type ExecuteXcmOrigin = xcm_builder::EnsureXcmOrigin<RuntimeOrigin, LocalOriginToLocation>;
@@ -289,8 +238,11 @@ impl pallet_xcm::Config for Runtime {
 	type XcmExecutor = XcmExecutor<XcmConfig>;
 	type XcmTeleportFilter = Everything;
 	type XcmReserveTransferFilter = Everything;
-	type Weigher =
-		WeightInfoBounds<weights::xcm::WestendXcmWeight<RuntimeCall>, RuntimeCall, MaxInstructions>;
+	type Weigher = WeightInfoBounds<
+		crate::weights::xcm::WestendXcmWeight<RuntimeCall>,
+		RuntimeCall,
+		MaxInstructions,
+	>;
 	type UniversalLocation = UniversalLocation;
 	type RuntimeOrigin = RuntimeOrigin;
 	type RuntimeCall = RuntimeCall;
diff --git a/polkadot/rustfmt.toml b/polkadot/rustfmt.toml
deleted file mode 100644
index e2c4a037f37fe229bd237cf50c4bb218814b890f..0000000000000000000000000000000000000000
--- a/polkadot/rustfmt.toml
+++ /dev/null
@@ -1,28 +0,0 @@
-# Basic
-edition = "2021"
-hard_tabs = true
-max_width = 100
-use_small_heuristics = "Max"
-
-# Imports
-imports_granularity = "Crate"
-reorder_imports = true
-
-# Consistency
-newline_style = "Unix"
-
-# Format comments
-comment_width = 100
-wrap_comments = true
-
-# Misc
-chain_width = 80
-spaces_around_ranges = false
-binop_separator = "Back"
-reorder_impl_items = false
-match_arm_leading_pipes = "Preserve"
-match_arm_blocks = false
-match_block_trailing_comma = true
-trailing_comma = "Vertical"
-trailing_semicolon = false
-use_field_init_shorthand = true
diff --git a/polkadot/scripts/build-demos.sh b/polkadot/scripts/build-demos.sh
deleted file mode 100755
index 285da143c17d8ec4c0f4147dea62dc34843050bf..0000000000000000000000000000000000000000
--- a/polkadot/scripts/build-demos.sh
+++ /dev/null
@@ -1,28 +0,0 @@
-#!/usr/bin/env bash
-
-# This script assumes that all pre-requisites are installed.
-
-set -e
-
-PROJECT_ROOT=`git rev-parse --show-toplevel`
-source `dirname "$0"`/common.sh
-
-export CARGO_INCREMENTAL=0
-
-# Save current directory.
-pushd .
-
-cd $ROOT
-
-for DEMO in "${DEMOS[@]}"
-do
-  echo "*** Building wasm binaries in $DEMO"
-  cd "$PROJECT_ROOT/$DEMO"
-
-  ./build.sh
-
-  cd - >> /dev/null
-done
-
-# Restore initial directory.
-popd
diff --git a/polkadot/scripts/ci/changelog/.gitignore b/polkadot/scripts/ci/changelog/.gitignore
deleted file mode 100644
index 4fbcc523b04cf0aba6c866a38250a83c16deb8d8..0000000000000000000000000000000000000000
--- a/polkadot/scripts/ci/changelog/.gitignore
+++ /dev/null
@@ -1,4 +0,0 @@
-changelog.md
-*.json
-release*.md
-.env
diff --git a/polkadot/scripts/ci/changelog/Gemfile b/polkadot/scripts/ci/changelog/Gemfile
deleted file mode 100644
index 46b058e3c5004c85f4ef79b867d2a6638a7e8cd4..0000000000000000000000000000000000000000
--- a/polkadot/scripts/ci/changelog/Gemfile
+++ /dev/null
@@ -1,23 +0,0 @@
-# frozen_string_literal: true
-
-source 'https://rubygems.org'
-
-git_source(:github) { |repo_name| "https://github.com/#{repo_name}" }
-
-gem 'octokit', '~> 4'
-
-gem 'git_diff_parser', '~> 3'
-
-gem 'toml', '~> 0.3.0'
-
-gem 'rake', group: :dev
-
-gem 'optparse', '~> 0.1.1'
-
-gem 'logger', '~> 1.4'
-
-gem 'changelogerator', '0.10.1'
-
-gem 'test-unit', group: :dev
-
-gem 'rubocop', group: :dev, require: false
diff --git a/polkadot/scripts/ci/changelog/Gemfile.lock b/polkadot/scripts/ci/changelog/Gemfile.lock
deleted file mode 100644
index 422aa3a8844bbc48f4f23ce2f96e5dce609a626e..0000000000000000000000000000000000000000
--- a/polkadot/scripts/ci/changelog/Gemfile.lock
+++ /dev/null
@@ -1,84 +0,0 @@
-GEM
-  remote: https://rubygems.org/
-  specs:
-    addressable (2.8.0)
-      public_suffix (>= 2.0.2, < 5.0)
-    ast (2.4.2)
-    changelogerator (0.10.1)
-      git_diff_parser (~> 3)
-      octokit (~> 4)
-    faraday (1.8.0)
-      faraday-em_http (~> 1.0)
-      faraday-em_synchrony (~> 1.0)
-      faraday-excon (~> 1.1)
-      faraday-httpclient (~> 1.0.1)
-      faraday-net_http (~> 1.0)
-      faraday-net_http_persistent (~> 1.1)
-      faraday-patron (~> 1.0)
-      faraday-rack (~> 1.0)
-      multipart-post (>= 1.2, < 3)
-      ruby2_keywords (>= 0.0.4)
-    faraday-em_http (1.0.0)
-    faraday-em_synchrony (1.0.0)
-    faraday-excon (1.1.0)
-    faraday-httpclient (1.0.1)
-    faraday-net_http (1.0.1)
-    faraday-net_http_persistent (1.2.0)
-    faraday-patron (1.0.0)
-    faraday-rack (1.0.0)
-    git_diff_parser (3.2.0)
-    logger (1.4.4)
-    multipart-post (2.1.1)
-    octokit (4.21.0)
-      faraday (>= 0.9)
-      sawyer (~> 0.8.0, >= 0.5.3)
-    optparse (0.1.1)
-    parallel (1.21.0)
-    parser (3.0.2.0)
-      ast (~> 2.4.1)
-    parslet (2.0.0)
-    power_assert (2.0.1)
-    public_suffix (4.0.6)
-    rainbow (3.0.0)
-    rake (13.0.6)
-    regexp_parser (2.1.1)
-    rexml (3.2.5)
-    rubocop (1.23.0)
-      parallel (~> 1.10)
-      parser (>= 3.0.0.0)
-      rainbow (>= 2.2.2, < 4.0)
-      regexp_parser (>= 1.8, < 3.0)
-      rexml
-      rubocop-ast (>= 1.12.0, < 2.0)
-      ruby-progressbar (~> 1.7)
-      unicode-display_width (>= 1.4.0, < 3.0)
-    rubocop-ast (1.13.0)
-      parser (>= 3.0.1.1)
-    ruby-progressbar (1.11.0)
-    ruby2_keywords (0.0.5)
-    sawyer (0.8.2)
-      addressable (>= 2.3.5)
-      faraday (> 0.8, < 2.0)
-    test-unit (3.5.1)
-      power_assert
-    toml (0.3.0)
-      parslet (>= 1.8.0, < 3.0.0)
-    unicode-display_width (2.1.0)
-
-PLATFORMS
-  x86_64-darwin-20
-  x86_64-darwin-22
-
-DEPENDENCIES
-  changelogerator (= 0.10.1)
-  git_diff_parser (~> 3)
-  logger (~> 1.4)
-  octokit (~> 4)
-  optparse (~> 0.1.1)
-  rake
-  rubocop
-  test-unit
-  toml (~> 0.3.0)
-
-BUNDLED WITH
-   2.4.6
diff --git a/polkadot/scripts/ci/changelog/README.md b/polkadot/scripts/ci/changelog/README.md
deleted file mode 100644
index ab3c1fd214ee72529c663220c847476c8b8e3a82..0000000000000000000000000000000000000000
--- a/polkadot/scripts/ci/changelog/README.md
+++ /dev/null
@@ -1,80 +0,0 @@
-# Changelog
-
-Currently, the changelog is built locally. It will be moved to CI once labels stabilize.
-
-For now, a bit of preparation is required before you can run the script:
-- fetch the srtool digests
-- store them under the `digests` folder as `<chain>-srtool-digest.json`
-- ensure the `.env` file is up to date with correct information. See below for an example
-
-The content of the release notes is generated from the template files under the `scripts/ci/changelog/templates` folder. For readability and maintenance, the template is split into several small snippets.
-
-Run:
-```
-./bin/changelog <ref_until> [<ref_since>]
-```
-
-For instance:
-```
-./bin/changelog v0.9.18
-```
-
-A file called `release-notes.md` will be generated and can be used for the release.
-
-## ENV
-
-You may use the following ENV for testing:
-
-```
-RUSTC_STABLE="rustc 1.56.1 (59eed8a2a 2021-11-01)"
-RUSTC_NIGHTLY="rustc 1.57.0-nightly (51e514c0f 2021-09-12)"
-PRE_RELEASE=true
-HIDE_SRTOOL_SHELL=true
-DEBUG=1
-NO_CACHE=1
-```
-## Considered labels
-
-The following list will likely evolve over time and it will be hard to keep it in sync.
-In any case, if you want to find all the labels that are used, search for `meta` in the templates.
-Currently, the considered labels are:
-
-- Priority: C<N> labels
-- Audit: D<N> labels
-- E4 => new host function
-- E2 => database migration
-- B0 => silent, not showing up
-- B1 => noteworthy
-- T0 => node
-- T1 => runtime
-
-Note that labels with the same letter are mutually exclusive.
-A PR should not have both `B0` and `B5`, or both `C1` and `C9`. In case of conflicts, the template will
-decide which label will be considered.
-
-## Dev and debuggin
-
-### Hot Reload
-
-The following command allows **Hot Reload**:
-```
-fswatch templates -e ".*\.md$" | xargs -n1 -I{} ./bin/changelog v0.9.18
-```
-### Caching
-
-By default, if the changelog data from Github is already present, the calls to the Github API will be skipped
-and the local version of the data will be used. This is much faster.
-If you know that some labels have changed in Github, you will want to refresh the data.
-You can then either delete manually the `<chain>.json` file or `export NO_CACHE=1` to force refreshing the data.
-
-## Full PR list
-
-At times, it may be useful to get a raw full PR list.
-In order to produce this list, you first need to fetch the the latest `context.json` from the `release-notes-context` artifacts you can find [here](https://github.com/paritytech/polkadot/actions/workflows/release-30_publish-draft-release.yml). You may store this `context.json` under `scripts/ci/changelog`.
-
-Using the `full_pr_list.md.tera` template, you can generate the `raw` list of changes:
-
-```
-cd scripts/ci/changelog
-tera --env --env-key env  --template templates/full_pr_list.md.tera context.json
-```
diff --git a/polkadot/scripts/ci/changelog/bin/changelog b/polkadot/scripts/ci/changelog/bin/changelog
deleted file mode 100755
index e642a44890433f01314490253b508a5d8641488a..0000000000000000000000000000000000000000
--- a/polkadot/scripts/ci/changelog/bin/changelog
+++ /dev/null
@@ -1,105 +0,0 @@
-#!/usr/bin/env ruby
-
-# frozen_string_literal: true
-
-# call for instance as:
-# ./bin/changelog <to> [<from>] [<output_file>]
-# for instance, for the release notes of v1.2.3:
-# ./bin/changelog v1.2.3
-# or
-# ./bin/changelog v1.2.3 v1.2.2
-#
-# You may set the ENV NO_CACHE to force fetching from Github
-# You should also ensure you set the ENV: GITHUB_TOKEN
-
-require_relative '../lib/changelog'
-require 'logger'
-
-logger = Logger.new($stdout)
-logger.level = Logger::DEBUG
-logger.debug('Starting')
-
-changelogerator_version = `changelogerator --version`
-logger.debug(changelogerator_version)
-
-owner = 'paritytech'
-repo = 'polkadot'
-
-gh_polkadot = SubRef.new(format('%<owner>s/%<repo>s', { owner: owner, repo: repo }))
-last_release_ref = gh_polkadot.get_last_ref()
-
-polkadot_ref2 = ARGV[0] || 'HEAD'
-polkadot_ref1 = ARGV[1] || last_release_ref
-
-output = ARGV[2] || 'release-notes.md'
-
-ENV['REF1'] = polkadot_ref1
-ENV['REF2'] = polkadot_ref2
-
-substrate_ref1 = gh_polkadot.get_dependency_reference(polkadot_ref1, 'sp-io')
-substrate_ref2 = gh_polkadot.get_dependency_reference(polkadot_ref2, 'sp-io')
-
-logger.debug("Polkadot from:   #{polkadot_ref1}")
-logger.debug("Polkadot to:     #{polkadot_ref2}")
-
-logger.debug("Substrate from:  #{substrate_ref1}")
-logger.debug("Substrate to:    #{substrate_ref2}")
-
-substrate_data = 'substrate.json'
-polkadot_data = 'polkadot.json'
-
-logger.debug("Using SUBSTRATE: #{substrate_data}")
-logger.debug("Using POLKADOT:  #{polkadot_data}")
-
-logger.warn('NO_CACHE set') if ENV['NO_CACHE']
-
-if ENV['NO_CACHE'] || !File.file?(polkadot_data)
-  logger.debug(format('Fetching data for Polkadot into %s', polkadot_data))
-  cmd = format('changelogerator %<owner>s/%<repo>s -f %<from>s -t %<to>s > %<output>s',
-               { owner: owner, repo: 'polkadot', from: polkadot_ref1, to: polkadot_ref2, output: polkadot_data })
-  system(cmd)
-else
-  logger.debug("Re-using:#{polkadot_data}")
-end
-
-if ENV['NO_CACHE'] || !File.file?(substrate_data)
-  logger.debug(format('Fetching data for Substrate into %s', substrate_data))
-  cmd = format('changelogerator %<owner>s/%<repo>s -f %<from>s -t %<to>s > %<output>s',
-               { owner: owner, repo: 'substrate', from: substrate_ref1, to: substrate_ref2, output: substrate_data })
-  system(cmd)
-else
-  logger.debug("Re-using:#{substrate_data}")
-end
-
-KUSAMA_DIGEST = ENV['KUSAMA_DIGEST'] || 'digests/kusama_srtool_output.json'
-WESTEND_DIGEST = ENV['WESTEND_DIGEST'] || 'digests/westend_srtool_output.json'
-ROCOCO_DIGEST = ENV['ROCOCO_DIGEST'] || 'digests/rococo_srtool_output.json'
-POLKADOT_DIGEST = ENV['POLKADOT_DIGEST'] || 'digests/polkadot_srtool_output.json'
-
-# Here we compose all the pieces together into one
-# single big json file.
-cmd = format('jq \
-    --slurpfile substrate %s \
-    --slurpfile polkadot %s \
-    --slurpfile srtool_kusama %s \
-    --slurpfile srtool_westend %s \
-    --slurpfile srtool_rococo %s \
-    --slurpfile srtool_polkadot %s \
-    -n \'{
-            substrate: $substrate[0],
-            polkadot: $polkadot[0],
-        srtool: [
-        { name: "kusama", data: $srtool_kusama[0] },
-        { name: "westend", data: $srtool_westend[0] },
-        { name: "rococo", data: $srtool_rococo[0] },
-        { name: "polkadot", data: $srtool_polkadot[0] }
-    ] }\' > context.json', substrate_data, polkadot_data,
-             KUSAMA_DIGEST,
-             WESTEND_DIGEST,
-             ROCOCO_DIGEST,
-             POLKADOT_DIGEST)
-system(cmd)
-
-cmd = format('tera --env --env-key env --include-path templates \
-        --template templates/template.md.tera context.json > %s', output)
-system(cmd)
diff --git a/polkadot/scripts/ci/changelog/digests/.gitignore b/polkadot/scripts/ci/changelog/digests/.gitignore
deleted file mode 100644
index a6c57f5fb2ffba0a6af4278619c2983394d237cc..0000000000000000000000000000000000000000
--- a/polkadot/scripts/ci/changelog/digests/.gitignore
+++ /dev/null
@@ -1 +0,0 @@
-*.json
diff --git a/polkadot/scripts/ci/changelog/digests/.gitkeep b/polkadot/scripts/ci/changelog/digests/.gitkeep
deleted file mode 100644
index e69de29bb2d1d6434b8b29ae775ad8c2e48c5391..0000000000000000000000000000000000000000
diff --git a/polkadot/scripts/ci/changelog/lib/changelog.rb b/polkadot/scripts/ci/changelog/lib/changelog.rb
deleted file mode 100644
index e98baf82f01f8ecbc5b3e2424387576b1afc4ae7..0000000000000000000000000000000000000000
--- a/polkadot/scripts/ci/changelog/lib/changelog.rb
+++ /dev/null
@@ -1,38 +0,0 @@
-# frozen_string_literal: true
-
-# A Class to find Substrate references
-class SubRef
-  require 'octokit'
-  require 'toml'
-
-  attr_reader :client, :repository
-
-  def initialize(github_repo)
-    @client = Octokit::Client.new(
-      access_token: ENV['GITHUB_TOKEN']
-    )
-    @repository = @client.repository(github_repo)
-  end
-
-  # This function checks the Cargo.lock of a given
-  # Rust project, for a given package, and fetches
-  # the dependency git ref.
-  def get_dependency_reference(ref, package)
-    cargo = TOML::Parser.new(
-      Base64.decode64(
-        @client.contents(
-          @repository.full_name,
-          path: 'Cargo.lock',
-          query: { ref: ref.to_s }
-        ).content
-      )
-    ).parsed
-    cargo['package'].find { |p| p['name'] == package }['source'].split('#').last
-  end
-
-  # Get the git ref of the last release for the repo.
-  # repo is given in the form paritytech/polkadot
-  def get_last_ref()
-    'refs/tags/' + @client.latest_release(@repository.full_name).tag_name
-  end
-end
diff --git a/polkadot/scripts/ci/changelog/templates/_free_notes.md.tera b/polkadot/scripts/ci/changelog/templates/_free_notes.md.tera
deleted file mode 100644
index c4a841a992515a0016f8aec99cc0038e7428cafb..0000000000000000000000000000000000000000
--- a/polkadot/scripts/ci/changelog/templates/_free_notes.md.tera
+++ /dev/null
@@ -1,10 +0,0 @@
-
-{# This file uses the Markdown format with additional templating such as this comment. -#}
-{# Such a comment will not show up in the rendered release notes. -#}
-{# The content of this file (if any) will be inserted at the top of the release notes -#}
-{# and generated for each new release candidate. -#}
-{# Ensure you leave an empty line at both top and bottom of this file. -#}
-
-<!-- Such a comment will be rendered but remain invisible in the rendered markdown -->
-<!-- Edit below this line -->
-<!-- Edit above this line -->
diff --git a/polkadot/scripts/ci/changelog/templates/change.md.tera b/polkadot/scripts/ci/changelog/templates/change.md.tera
deleted file mode 100644
index cfde3be6e85f1f400d3894063d1ffaf9c7870e6c..0000000000000000000000000000000000000000
--- a/polkadot/scripts/ci/changelog/templates/change.md.tera
+++ /dev/null
@@ -1,43 +0,0 @@
-{# This macro shows ONE change #}
-{%- macro change(c, cml="[C]", dot="[P]", sub="[S]") -%}
-
-{%- if c.meta.C and c.meta.C.agg.max >= 7 -%}
-{%- set prio = " ‼️ HIGH" -%}
-{%- elif c.meta.C and c.meta.C.agg.max >= 3 -%}
-{%- set prio = " ❗️ Medium" -%}
-{%- elif c.meta.C and c.meta.C.agg.max < 3 -%}
-{%- set prio = " Low" -%}
-{%- else -%}
-{%- set prio = "" -%}
-{%- endif -%}
-
-{%- set audit = "" -%}
-
-{%- if c.meta.D and c.meta.D.D1 -%}
-{%- set audit = "✅ audited " -%}
-{%- elif c.meta.D and c.meta.D.D2 -%}
-{%- set audit = "✅ trivial " -%}
-{%- elif c.meta.D and c.meta.D.D3 -%}
-{%- set audit = "✅ trivial " -%}
-{%- elif c.meta.D and c.meta.D.D5 -%}
-{%- set audit = "⏳ pending non-critical audit " -%}
-{%- else -%}
-{%- set audit = "" -%}
-{%- endif -%}
-
-{%- if c.html_url is containing("polkadot") -%}
-{%- set repo = dot -%}
-{%- elif c.html_url is containing("substrate") -%}
-{%- set repo = sub -%}
-{%- else -%}
-{%- set repo = "   " -%}
-{%- endif -%}
-
-{%- if c.meta.T and c.meta.T.T6 -%}
-{%- set xcm = " [✉️ XCM]" -%}
-{%- else -%}
-{%- set xcm = "" -%}
-{%- endif -%}
-
-{{- repo }} {{ audit }}[`#{{c.number}}`]({{c.html_url}}) {{- prio }} - {{ c.title | capitalize | truncate(length=120, end="…") }}{{xcm }}
-{%- endmacro change -%}
diff --git a/polkadot/scripts/ci/changelog/templates/changes.md.tera b/polkadot/scripts/ci/changelog/templates/changes.md.tera
deleted file mode 100644
index f598b2fe83f78bf22b97d832afb61e44c11eba53..0000000000000000000000000000000000000000
--- a/polkadot/scripts/ci/changelog/templates/changes.md.tera
+++ /dev/null
@@ -1,15 +0,0 @@
-{# This include generates the section showing the changes #}
-## Changes
-
-### Legend
-
-- {{ DOT }} Polkadot
-- {{ SUB }} Substrate
-
-{% include "changes_client.md.tera" %}
-
-{% include "changes_runtime.md.tera" %}
-
-{% include "changes_api.md.tera" %}
-
-{% include "changes_misc.md.tera" %}
diff --git a/polkadot/scripts/ci/changelog/templates/changes_api.md.tera b/polkadot/scripts/ci/changelog/templates/changes_api.md.tera
deleted file mode 100644
index 29e08b8cd38254cc975d34ef449ab8f8e0a8d42b..0000000000000000000000000000000000000000
--- a/polkadot/scripts/ci/changelog/templates/changes_api.md.tera
+++ /dev/null
@@ -1,17 +0,0 @@
-{% import "change.md.tera" as m_c -%}
-### API
-
-{#- The changes are sorted by merge date #}
-{%- for pr in changes | sort(attribute="merged_at") %}
-
-{%- if pr.meta.B %}
-    {%- if pr.meta.B.B0 %}
-    {#- We skip silent ones -#}
-    {%- else -%}
-
-        {%- if pr.meta.T and pr.meta.T.T2 and not pr.title is containing("ompanion") %}
-- {{ m_c::change(c=pr) }}
-        {%- endif -%}
-    {% endif -%}
-    {% endif -%}
-{% endfor %}
diff --git a/polkadot/scripts/ci/changelog/templates/changes_client.md.tera b/polkadot/scripts/ci/changelog/templates/changes_client.md.tera
deleted file mode 100644
index 6d31961c3650193137cea14e975febad07199510..0000000000000000000000000000000000000000
--- a/polkadot/scripts/ci/changelog/templates/changes_client.md.tera
+++ /dev/null
@@ -1,17 +0,0 @@
-{% import "change.md.tera" as m_c -%}
-### Client
-
-{#- The changes are sorted by merge date #}
-{%- for pr in changes | sort(attribute="merged_at") %}
-
-{%- if pr.meta.B %}
-    {%- if pr.meta.B.B0 %}
-    {#- We skip silent ones -#}
-    {%- else -%}
-
-        {%- if pr.meta.T and pr.meta.T.T0 and not pr.title is containing("ompanion") %}
-- {{ m_c::change(c=pr) }}
-        {%- endif -%}
-    {% endif -%}
-    {% endif -%}
-{% endfor %}
diff --git a/polkadot/scripts/ci/changelog/templates/changes_misc.md.tera b/polkadot/scripts/ci/changelog/templates/changes_misc.md.tera
deleted file mode 100644
index 725b03081eb36d34dc0435deb2c4f3d1ef0f8da9..0000000000000000000000000000000000000000
--- a/polkadot/scripts/ci/changelog/templates/changes_misc.md.tera
+++ /dev/null
@@ -1,42 +0,0 @@
-{%- import "change.md.tera" as m_c -%}
-
-{%- set_global misc_count = 0 -%}
-{#- First pass to count #}
-{%- for pr in changes -%}
-    {%- if pr.meta.B %}
-        {%- if pr.meta.B.B0 -%}
-        {#- We skip silent ones -#}
-        {%- else -%}
-            {%- if pr.meta.T and pr.meta.T.agg.max > 2   %}
-{%- set_global misc_count = misc_count + 1 -%}
-            {%- endif -%}
-        {% endif -%}
-    {% endif -%}
-{% endfor -%}
-
-<!-- Found {{ misc_count }} misc PRs -->
-{%- if misc_count > 0 %}
-### Misc
-
-{% if misc_count > 10 %}
-There are other misc. changes. You can expand the list below to view them all.
-<details><summary>Other misc. changes</summary>
-{% endif -%}
-
-{#- The changes are sorted by merge date #}
-{%- for pr in changes | sort(attribute="merged_at") %}
-    {%- if pr.meta.B and not pr.title is containing("ompanion") %}
-        {%- if pr.meta.B.B0 %}
-        {#- We skip silent ones -#}
-        {%- else -%}
-            {%- if pr.meta.T and pr.meta.T.agg.max > 2 %}
-- {{ m_c::change(c=pr) }}
-            {%- endif -%}
-        {% endif -%}
-    {% endif -%}
-{% endfor %}
-
-{% if misc_count > 10 %}
-</details>
-{% endif -%}
-{% endif -%}
diff --git a/polkadot/scripts/ci/changelog/templates/changes_runtime.md.tera b/polkadot/scripts/ci/changelog/templates/changes_runtime.md.tera
deleted file mode 100644
index bd126c0628c4089ddc8eee8cde345b4234c2ef0d..0000000000000000000000000000000000000000
--- a/polkadot/scripts/ci/changelog/templates/changes_runtime.md.tera
+++ /dev/null
@@ -1,19 +0,0 @@
-{%- import "change.md.tera" as m_c -%}
-
-### Runtime
-
-{#- The changes are sorted by merge date -#}
-{% for pr in changes | sort(attribute="merged_at") -%}
-
-{%- if pr.meta.B -%}
-{%- if pr.meta.B.B0 -%}
-{#- We skip silent ones -#}
-{%- else -%}
-
-{%- if pr.meta.T and pr.meta.T.T1 and not pr.title is containing("ompanion") %}
-- {{ m_c::change(c=pr) }}
-{%- endif -%}
-{%- endif -%}
-
-{%- endif -%}
-{%- endfor %}
diff --git a/polkadot/scripts/ci/changelog/templates/compiler.md.tera b/polkadot/scripts/ci/changelog/templates/compiler.md.tera
deleted file mode 100644
index 6fa1baa6506197768fb1ac82b1961daa8ac5f9fa..0000000000000000000000000000000000000000
--- a/polkadot/scripts/ci/changelog/templates/compiler.md.tera
+++ /dev/null
@@ -1,7 +0,0 @@
-## Rust compiler versions
-
-This release was built and tested against the following versions of `rustc`.
-Other versions may work.
-
-- Rust Stable: `{{ env.RUSTC_STABLE }}`
-- Rust Nightly: `{{ env.RUSTC_NIGHTLY }}`
diff --git a/polkadot/scripts/ci/changelog/templates/debug.md.tera b/polkadot/scripts/ci/changelog/templates/debug.md.tera
deleted file mode 100644
index 8c829b09ffe2b1d7ba91d6e6ba43f80701efe558..0000000000000000000000000000000000000000
--- a/polkadot/scripts/ci/changelog/templates/debug.md.tera
+++ /dev/null
@@ -1,8 +0,0 @@
-{%- set to_ignore = changes | filter(attribute="meta.B.B0") %}
-
-<!--
-changes:
- - total: {{ changes | length }}
- - silent: {{ to_ignore | length }}
- - remaining: {{ changes | length - to_ignore | length }}
--->
diff --git a/polkadot/scripts/ci/changelog/templates/docker_image.md.tera b/polkadot/scripts/ci/changelog/templates/docker_image.md.tera
deleted file mode 100644
index 4a3793a86ad2450fd16096b08ba39097cd5dfb63..0000000000000000000000000000000000000000
--- a/polkadot/scripts/ci/changelog/templates/docker_image.md.tera
+++ /dev/null
@@ -1,11 +0,0 @@
-
-## Docker image
-
-The docker image for this release can be found at [Docker hub](https://hub.docker.com/r/parity/polkadot/tags?page=1&ordering=last_updated)
-(It will be available a few minutes after the release has been published).
-
-You may pull it using:
-
-```
-docker pull parity/polkadot:latest
-```
diff --git a/polkadot/scripts/ci/changelog/templates/full_pr_list.md.tera b/polkadot/scripts/ci/changelog/templates/full_pr_list.md.tera
deleted file mode 100644
index 1cdab310652fc9bd42ce08d51c94ce7286c3b2f8..0000000000000000000000000000000000000000
--- a/polkadot/scripts/ci/changelog/templates/full_pr_list.md.tera
+++ /dev/null
@@ -1,16 +0,0 @@
-{# This is a helper template to get the FULL PR list #}
-{# It is not used in the release notes #}
-
-# PR list
-
-## substrate
-
-{%- for change in  substrate.changes %}
- - [S] [`{{ change.number }}`]({{ change.html_url }}) - {{ change.title }}
-{%- endfor %}
-
-## polkadot
-
-{%- for change in  polkadot.changes %}
- - [P] [`{{ change.number }}`]({{ change.html_url }}) - {{ change.title }}
-{%- endfor %}
diff --git a/polkadot/scripts/ci/changelog/templates/global_priority.md.tera b/polkadot/scripts/ci/changelog/templates/global_priority.md.tera
deleted file mode 100644
index fe3d634f19dd1393e32ee8ad9f97f3f5419d688a..0000000000000000000000000000000000000000
--- a/polkadot/scripts/ci/changelog/templates/global_priority.md.tera
+++ /dev/null
@@ -1,22 +0,0 @@
-{% import "high_priority.md.tera" as m_p -%}
-## Upgrade Priority
-
-{%- set polkadot_prio = 0 -%}
-{%- set substrate_prio = 0 -%}
-
-{# We fetch the various priorities #}
-{%- if polkadot.meta.C -%}
-    {%- set polkadot_prio = polkadot.meta.C.max -%}
-{%- endif -%}
-{%- if substrate.meta.C -%}
-    {%- set substrate_prio = substrate.meta.C.max -%}
-{%- endif -%}
-
-{# We compute the global priority #}
-{%- set global_prio = polkadot_prio -%}
-{%- if substrate_prio > global_prio -%}
-    {%- set global_prio = substrate_prio -%}
-{%- endif -%}
-
-{#- We show the result #}
-{{ m_p::high_priority(p=global_prio, changes=changes) }}
diff --git a/polkadot/scripts/ci/changelog/templates/high_priority.md.tera b/polkadot/scripts/ci/changelog/templates/high_priority.md.tera
deleted file mode 100644
index 39938da44d172e4755cf9dde57ec2cfdf8ebc618..0000000000000000000000000000000000000000
--- a/polkadot/scripts/ci/changelog/templates/high_priority.md.tera
+++ /dev/null
@@ -1,38 +0,0 @@
-{%- import "change.md.tera" as m_c -%}
-
-{# This macro convert a priority level into readable output #}
-{%- macro high_priority(p, changes) -%}
-
-{%- if p >= 7 -%}
-    {%- set prio = "‼️ HIGH" -%}
-    {%- set text = "This is a **high priority** release and you must upgrade as as soon as possible." -%}
-{%- elif p >= 3 -%}
-    {%- set prio = "❗️ Medium" -%}
-    {%- set text = "This is a medium priority release and you should upgrade in a timely manner." -%}
-{%- else -%}
-    {%- set prio = "Low" -%}
-    {%- set text = "This is a low priority release and you may upgrade at your convenience." -%}
-{%- endif %}
-
-<!-- detected max prio is: {{p}} -->
-
-{%- if prio %}
-{{prio}}: {{text}}
-
-{% if p >= 3 %}
-The changes motivating this priority level are:
-{% for pr in changes | sort(attribute="merged_at") -%}
-    {%- if pr.meta.C -%}
-        {%- if pr.meta.C.agg.max >= p %}
-- {{ m_c::change(c=pr) }}
-{%- if pr.meta.T and pr.meta.T.T1 %} (RUNTIME)
-{% endif %}
-        {%- endif -%}
-    {%- endif -%}
-{%- endfor -%}
-{%- else -%}
-<!-- No relevant Priority label as been detected for p={{ p }} -->
-{%- endif -%}
-{%- endif -%}
-
-{%- endmacro priority -%}
diff --git a/polkadot/scripts/ci/changelog/templates/host_functions-list.md.tera b/polkadot/scripts/ci/changelog/templates/host_functions-list.md.tera
deleted file mode 100644
index 954d41e40d3b6f962432495aecd0917dcffc8ad3..0000000000000000000000000000000000000000
--- a/polkadot/scripts/ci/changelog/templates/host_functions-list.md.tera
+++ /dev/null
@@ -1,12 +0,0 @@
-{%- import "change.md.tera" as m_c -%}
-
-{% for pr in changes | sort(attribute="merged_at") -%}
-
-{%- if pr.meta.B and pr.meta.B.B0 -%}
-{#- We skip silent ones -#}
-{%- else -%}
-    {%- if pr.meta.E and pr.meta.E.E3 -%}
-- {{ m_c::change(c=pr) }}
-    {% endif -%}
-{% endif -%}
-{%- endfor -%}
diff --git a/polkadot/scripts/ci/changelog/templates/host_functions.md.tera b/polkadot/scripts/ci/changelog/templates/host_functions.md.tera
deleted file mode 100644
index e38bc5d71828d066e1f4b2efd96f588cf46606bf..0000000000000000000000000000000000000000
--- a/polkadot/scripts/ci/changelog/templates/host_functions.md.tera
+++ /dev/null
@@ -1,44 +0,0 @@
-{%- import "change.md.tera" as m_c -%}
-
-{%- set_global host_fn_count = 0 -%}
-{%- set_global upgrade_first = 0 -%}
-
-{% for pr in changes | sort(attribute="merged_at") -%}
-
-{%- if pr.meta.B and pr.meta.B.B0 -%}
-{#- We skip silent ones -#}
-{%- else -%}
-    {%- if pr.meta.E and pr.meta.E.E3 -%}
-        {%- set_global host_fn_count = host_fn_count + 1 -%}
-            - {{ m_c::change(c=pr) }}
-    {% endif -%}
-    {%- if pr.meta.E and pr.meta.E.E4 -%}
-        {%- set_global upgrade_first = upgrade_first + 1 -%}
-            - {{ m_c::change(c=pr) }}
-    {% endif -%}
-{% endif -%}
-{%- endfor -%}
-
-<!-- {{ upgrade_first }} changes require node upgrade -->
-
-{%- if upgrade_first != 0 %}
-## Node upgrade required
-⚠️ There is a runtime change that will require nodes to be upgraded BEFORE the runtime upgrade.
-
-⚠️ It is critical that you update your client before the chain switches to the new runtime.
-{%- endif %}
-
-<!-- {{ host_fn_count }} host functions were detected -->
-
-## Host functions
-
-{% if host_fn_count == 0 %}
-ℹ️ This release does not contain any change related to host functions.
-{% elif host_fn_count == 1 -%}
-{# ---- #}
-ℹ️ The runtimes in this release contain one change related to **host function**s:
-{% include "host_functions-list.md.tera" -%}
-{%- else -%}
-ℹ️ The runtimes in this release contain {{ host_fn_count }} changes related to **host function**s:
-{% include "host_functions-list.md.tera" -%}
-{%- endif %}
diff --git a/polkadot/scripts/ci/changelog/templates/migrations-db.md.tera b/polkadot/scripts/ci/changelog/templates/migrations-db.md.tera
deleted file mode 100644
index 130a61a12cb2a2fb35bec99fd395609612a10b3e..0000000000000000000000000000000000000000
--- a/polkadot/scripts/ci/changelog/templates/migrations-db.md.tera
+++ /dev/null
@@ -1,30 +0,0 @@
-{% import "change.md.tera" as m_c %}
-{%- set_global db_migration_count = 0 -%}
-{%- for pr in changes -%}
-    {%- if pr.meta.B and pr.meta.B.B0 %}
-        {#- We skip silent ones -#}
-    {%- elif pr.meta.E and pr.meta.E.E1 -%}
-        {%- set_global db_migration_count = db_migration_count + 1 -%}
-    {%- endif -%}
-{%- endfor %}
-
-## Database Migrations
-
-Database migrations are operations upgrading the database to the latest stand.
-Some migrations may break compatibility, making a backup of your database is highly recommended.
-
-{% if db_migration_count == 0 -%}
-ℹ️ There is no database migration in this release.
-{%- elif db_migration_count == 1 -%}
-⚠️ There is one database migration in this release:
-{%- else -%}
-⚠️ There are {{ db_migration_count }} database migrations in this release:
-{%- endif %}
-{% for pr in changes | sort(attribute="merged_at") -%}
-
-{%- if pr.meta.B and pr.meta.B.B0 %}
-{#- We skip silent ones -#}
-{%- elif pr.meta.E and pr.meta.E.E1 -%}
-- {{ m_c::change(c=pr) }}
-{% endif -%}
-{% endfor -%}
diff --git a/polkadot/scripts/ci/changelog/templates/migrations-runtime.md.tera b/polkadot/scripts/ci/changelog/templates/migrations-runtime.md.tera
deleted file mode 100644
index 25517a142eb390e9aab19f34a2b3781ed994056c..0000000000000000000000000000000000000000
--- a/polkadot/scripts/ci/changelog/templates/migrations-runtime.md.tera
+++ /dev/null
@@ -1,29 +0,0 @@
-{%- import "change.md.tera" as m_c %}
-{%- set_global runtime_migration_count = 0 -%}
-{%- for pr in changes -%}
-    {%- if pr.meta.B and pr.meta.B.B0 %}
-        {#- We skip silent ones -#}
-    {%- elif pr.meta.E and pr.meta.E.E0 -%}
-        {%- set_global runtime_migration_count = runtime_migration_count + 1 -%}
-    {%- endif -%}
-{%- endfor %}
-
-## Runtime Migrations
-
-Runtime migrations are operations running once during a runtime upgrade.
-
-{% if runtime_migration_count == 0 -%}
-ℹ️ There is no runtime migration in this release.
-{%- elif runtime_migration_count == 1 -%}
-⚠️ There is one runtime migration in this release:
-{%- else -%}
-⚠️ There are {{ runtime_migration_count }} runtime migrations in this release:
-{%- endif %}
-{% for pr in changes | sort(attribute="merged_at") -%}
-
-{%- if pr.meta.B and pr.meta.B.B0 %}
-{#- We skip silent ones -#}
-{%- elif pr.meta.E and pr.meta.E.E0 -%}
-- {{ m_c::change(c=pr) }}
-{% endif -%}
-{% endfor -%}
diff --git a/polkadot/scripts/ci/changelog/templates/pre_release.md.tera b/polkadot/scripts/ci/changelog/templates/pre_release.md.tera
deleted file mode 100644
index 7d4ad42dd8fe9ba42f9d5d1f98ec80d70445b28b..0000000000000000000000000000000000000000
--- a/polkadot/scripts/ci/changelog/templates/pre_release.md.tera
+++ /dev/null
@@ -1,11 +0,0 @@
-{%- if env.PRE_RELEASE == "true" -%}
-<details><summary>⚠️ This is a pre-release</summary>
-
-**Release candidates** are **pre-releases** and may not be final.
-Although they are reasonably tested, there may be additional changes or issues
-before an official release is tagged. Use at your own discretion, and consider
-only using final releases on critical production infrastructure.
-</details>
-{% else -%}
-<!-- NOT a pre-release-->
-{%- endif %}
diff --git a/polkadot/scripts/ci/changelog/templates/runtime.md.tera b/polkadot/scripts/ci/changelog/templates/runtime.md.tera
deleted file mode 100644
index cd7edf28f7a3eabb0767ae54087fb29fa2bc406e..0000000000000000000000000000000000000000
--- a/polkadot/scripts/ci/changelog/templates/runtime.md.tera
+++ /dev/null
@@ -1,28 +0,0 @@
-{# This macro shows one runtime #}
-{%- macro runtime(runtime) -%}
-
-### {{ runtime.name | capitalize }}
-
-{%- if runtime.data.runtimes.compressed.subwasm.compression.compressed %}
-{%- set compressed = "Yes" %}
-{%- else %}
-{%- set compressed = "No" %}
-{%- endif %}
-
-{%- set comp_ratio = 100 - (runtime.data.runtimes.compressed.subwasm.compression.size_compressed / runtime.data.runtimes.compressed.subwasm.compression.size_decompressed *100) %}
-<!-- commit : {{ runtime.data.commit }} -->
-<!-- tag    : {{ runtime.data.tag }} -->
-<!-- branch : {{ runtime.data.branch }} -->
-<!-- pkg    : {{ runtime.data.pkg }} -->
-
-```
-🏋️ Runtime Size:           {{ runtime.data.runtimes.compressed.subwasm.size | filesizeformat }} ({{ runtime.data.runtimes.compressed.subwasm.size }} bytes)
-🔥 Core Version:           {{ runtime.data.runtimes.compressed.subwasm.core_version.specName }}-{{ runtime.data.runtimes.compressed.subwasm.core_version.specVersion }} ({{ runtime.data.runtimes.compressed.subwasm.core_version.implName }}-{{ runtime.data.runtimes.compressed.subwasm.core_version.implVersion }}.tx{{ runtime.data.runtimes.compressed.subwasm.core_version.transactionVersion }}.au{{ runtime.data.runtimes.compressed.subwasm.core_version.authoringVersion }})
-🗜 Compressed:             {{ compressed }}: {{ comp_ratio | round(method="ceil", precision=2) }}%
-🎁 Metadata version:       V{{ runtime.data.runtimes.compressed.subwasm.metadata_version }}
-🗳️ system.setCode hash:    {{ runtime.data.runtimes.compressed.subwasm.proposal_hash }}
-🗳️ authorizeUpgrade hash:  {{ runtime.data.runtimes.compressed.subwasm.parachain_authorize_upgrade_hash }}
-🗳️ Blake2-256 hash:        {{ runtime.data.runtimes.compressed.subwasm.blake2_256 }}
-📦 IPFS:                   {{ runtime.data.runtimes.compressed.subwasm.ipfs_hash }}
-```
-{%- endmacro runtime %}
diff --git a/polkadot/scripts/ci/changelog/templates/runtimes.md.tera b/polkadot/scripts/ci/changelog/templates/runtimes.md.tera
deleted file mode 100644
index 0847382689fb5336eeedeb1fbb712d317797efcb..0000000000000000000000000000000000000000
--- a/polkadot/scripts/ci/changelog/templates/runtimes.md.tera
+++ /dev/null
@@ -1,19 +0,0 @@
-{# This include shows the list and details of the runtimes #}
-{%- import "runtime.md.tera" as m_r -%}
-
-{# ---  #}
-
-## Runtimes
-
-{% set rtm = srtool[0] -%}
-
-The information about the runtimes included in this release can be found below.
-The runtimes have been built using [{{ rtm.data.gen }}](https://github.com/paritytech/srtool) and `{{ rtm.data.rustc }}`.
-
-{%- for runtime in srtool | sort(attribute="name") %}
-{%- set HIDE_VAR = "HIDE_SRTOOL_" ~ runtime.name | upper %}
-{%- if not env is containing(HIDE_VAR) %}
-
-{{ m_r::runtime(runtime=runtime) }}
-{%- endif %}
-{%- endfor %}
diff --git a/polkadot/scripts/ci/changelog/templates/template.md.tera b/polkadot/scripts/ci/changelog/templates/template.md.tera
deleted file mode 100644
index e04636b4b2277418790376535e39b189c12ce496..0000000000000000000000000000000000000000
--- a/polkadot/scripts/ci/changelog/templates/template.md.tera
+++ /dev/null
@@ -1,37 +0,0 @@
-{# This is the entry point of the template -#}
-<!-- repository: {{ polkadot.repository.name }} -->
-{% include "pre_release.md.tera" -%}
-
-{% if env.PRE_RELEASE == "true" -%}
-This pre-release contains the changes from `{{ env.REF1 | replace(from="refs/tags/", to="") }}` to `{{ env.REF2 | replace(from="refs/tags/", to="") }}`.
-{%- else -%}
-This release contains the changes from `{{ env.REF1 | replace(from="refs/tags/", to="") }}` to `{{ env.REF2 | replace(from="refs/tags/", to="") }}`.
-{% endif -%}
-
-{%- set changes = polkadot.changes | concat(with=substrate.changes) -%}
-{%- include "debug.md.tera" -%}
-
-{%- set CML = "[C]" -%}
-{%- set DOT = "[P]" -%}
-{%- set SUB = "[S]" -%}
-
-{# -- Manual free notes section -- #}
-{% include "_free_notes.md.tera" -%}
-
-{# -- Important automatic section -- #}
-{% include "global_priority.md.tera" -%}
-
-{% include "host_functions.md.tera" -%}
-
-{% include "migrations-db.md.tera" -%}
-
-{% include "migrations-runtime.md.tera" -%}
-{# --------------------------------- #}
-
-{% include "compiler.md.tera" -%}
-
-{% include "runtimes.md.tera" -%}
-
-{% include "changes.md.tera" -%}
-
-{% include "docker_image.md.tera" -%}
diff --git a/polkadot/scripts/ci/changelog/test/test_basic.rb b/polkadot/scripts/ci/changelog/test/test_basic.rb
deleted file mode 100644
index d099fadca43328d034cf753046274414b141888b..0000000000000000000000000000000000000000
--- a/polkadot/scripts/ci/changelog/test/test_basic.rb
+++ /dev/null
@@ -1,23 +0,0 @@
-# frozen_string_literal: true
-
-require_relative '../lib/changelog'
-require 'test/unit'
-
-class TestChangelog < Test::Unit::TestCase
-  def test_get_dep_ref_polkadot
-    c = SubRef.new('paritytech/polkadot')
-    ref = '13c2695'
-    package = 'sc-cli'
-    result = c.get_dependency_reference(ref, package)
-    assert_equal('7db0768a85dc36a3f2a44d042b32f3715c00a90d', result)
-  end
-
-  def test_get_dep_ref_invalid_ref
-    c = SubRef.new('paritytech/polkadot')
-    ref = '9999999'
-    package = 'sc-cli'
-    assert_raise do
-      c.get_dependency_reference(ref, package)
-    end
-  end
-end
diff --git a/polkadot/scripts/ci/dockerfiles/staking-miner/README.md b/polkadot/scripts/ci/dockerfiles/staking-miner/README.md
deleted file mode 100644
index 3610e11303167b1b3b8deb4ef2a9c37a60c77a1f..0000000000000000000000000000000000000000
--- a/polkadot/scripts/ci/dockerfiles/staking-miner/README.md
+++ /dev/null
@@ -1,37 +0,0 @@
-# staking-miner container image
-
-## Build using the Builder
-
-```
-./build.sh
-```
-
-## Build the injected Image
-
-You first need a valid Linux binary to inject. Let's assume this binary is located in `BIN_FOLDER`.
-
-```
-./build-injected.sh "$BIN_FOLDER"
-```
-
-## Test
-
-Here is how to test the image. We can generate a valid seed but the staking-miner will quickly notice that our
-account is not funded and "does not exist".
-
-You may pass any ENV supported by the binary and must provide at least a few such as `SEED` and `URI`:
-```
-ENV SEED=""
-ENV URI="wss://rpc.polkadot.io:443"
-ENV RUST_LOG="info"
-```
-
-```
-export SEED=$(subkey generate -n polkadot --output-type json  | jq -r .secretSeed)
-podman run --rm -it \
-    -e URI="wss://rpc.polkadot.io:443" \
-    -e RUST_LOG="info" \
-    -e SEED \
-    localhost/parity/staking-miner \
-        dry-run seq-phragmen
-```
diff --git a/polkadot/scripts/ci/dockerfiles/staking-miner/build-injected.sh b/polkadot/scripts/ci/dockerfiles/staking-miner/build-injected.sh
deleted file mode 100755
index 536636df6a918d252af9db49bed0fed8b493d473..0000000000000000000000000000000000000000
--- a/polkadot/scripts/ci/dockerfiles/staking-miner/build-injected.sh
+++ /dev/null
@@ -1,13 +0,0 @@
-#!/usr/bin/env bash
-
-# Sample call:
-# $0 /path/to/folder_with_staking-miner_binary
-# This script replace the former dedicated staking-miner "injected" Dockerfile
-# and shows how to use the generic binary_injected.dockerfile
-
-PROJECT_ROOT=`git rev-parse --show-toplevel`
-
-export BINARY=staking-miner
-export BIN_FOLDER=$1
-
-$PROJECT_ROOT/scripts/ci/dockerfiles/build-injected.sh
diff --git a/polkadot/scripts/ci/dockerfiles/staking-miner/build.sh b/polkadot/scripts/ci/dockerfiles/staking-miner/build.sh
deleted file mode 100755
index 67c82afcd2ce52ea002ef4df8761e471f5d9d10b..0000000000000000000000000000000000000000
--- a/polkadot/scripts/ci/dockerfiles/staking-miner/build.sh
+++ /dev/null
@@ -1,13 +0,0 @@
-#!/usr/bin/env bash
-
-# Sample call:
-# $0 /path/to/folder_with_staking-miner_binary
-# This script replace the former dedicated staking-miner "injected" Dockerfile
-# and shows how to use the generic binary_injected.dockerfile
-
-PROJECT_ROOT=`git rev-parse --show-toplevel`
-ENGINE=podman
-
-echo "Building the staking-miner using the Builder image"
-echo "PROJECT_ROOT=$PROJECT_ROOT"
-$ENGINE build -t staking-miner -f staking-miner_builder.Dockerfile "$PROJECT_ROOT"
diff --git a/polkadot/scripts/ci/dockerfiles/staking-miner/staking-miner_Dockerfile.README.md b/polkadot/scripts/ci/dockerfiles/staking-miner/staking-miner_Dockerfile.README.md
deleted file mode 100644
index ce424c42f479a657191fb412a476fa04e1430b03..0000000000000000000000000000000000000000
--- a/polkadot/scripts/ci/dockerfiles/staking-miner/staking-miner_Dockerfile.README.md
+++ /dev/null
@@ -1,3 +0,0 @@
-# Staking-miner Docker image
-
-## [GitHub](https://github.com/paritytech/polkadot/tree/master/utils/staking-miner)
diff --git a/polkadot/scripts/ci/dockerfiles/staking-miner/staking-miner_builder.Dockerfile b/polkadot/scripts/ci/dockerfiles/staking-miner/staking-miner_builder.Dockerfile
deleted file mode 100644
index 0ae77f36c79d0888c29c2f8211b21fc120db6037..0000000000000000000000000000000000000000
--- a/polkadot/scripts/ci/dockerfiles/staking-miner/staking-miner_builder.Dockerfile
+++ /dev/null
@@ -1,43 +0,0 @@
-FROM paritytech/ci-linux:production as builder
-
-# metadata
-ARG VCS_REF
-ARG BUILD_DATE
-ARG IMAGE_NAME="staking-miner"
-ARG PROFILE=production
-
-LABEL description="This is the build stage. Here we create the binary."
-
-WORKDIR /app
-COPY . /app
-RUN cargo build --locked --profile $PROFILE --package staking-miner
-
-# ===== SECOND STAGE ======
-
-FROM docker.io/parity/base-bin:latest
-LABEL description="This is the 2nd stage: a very small image where we copy the binary."
-LABEL io.parity.image.authors="devops-team@parity.io" \
-	io.parity.image.vendor="Parity Technologies" \
-	io.parity.image.title="${IMAGE_NAME}" \
-	io.parity.image.description="${IMAGE_NAME} for substrate based chains" \
-	io.parity.image.source="https://github.com/paritytech/polkadot/blob/${VCS_REF}/scripts/ci/dockerfiles/${IMAGE_NAME}/${IMAGE_NAME}_builder.Dockerfile" \
-	io.parity.image.revision="${VCS_REF}" \
-	io.parity.image.created="${BUILD_DATE}" \
-	io.parity.image.documentation="https://github.com/paritytech/polkadot/"
-
-ARG PROFILE=release
-COPY --from=builder /app/target/$PROFILE/staking-miner /usr/local/bin
-
-# show backtraces
-ENV RUST_BACKTRACE 1
-
-USER parity
-
-ENV SEED=""
-ENV URI="wss://rpc.polkadot.io"
-ENV RUST_LOG="info"
-
-# check if the binary works in this container
-RUN /usr/local/bin/staking-miner --version
-
-ENTRYPOINT [ "/usr/local/bin/staking-miner" ]
diff --git a/polkadot/scripts/ci/github/check-rel-br b/polkadot/scripts/ci/github/check-rel-br
deleted file mode 100755
index 1b49ae621722a42d9adbb7f018ff66ee0e935762..0000000000000000000000000000000000000000
--- a/polkadot/scripts/ci/github/check-rel-br
+++ /dev/null
@@ -1,127 +0,0 @@
-#!/usr/bin/env bash
-
-# This script helps running sanity checks on a release branch
-# It is intended to be ran from the repo and from the release branch
-
-# NOTE: The diener runs do take time and are not really required because
-# if we missed the diener runs, the Cargo.lock that we check won't pass
-# the tests. See https://github.com/bkchr/diener/issues/17
-
-grv=$(git remote --verbose | grep push)
-export RUST_LOG=none
-REPO=$(echo "$grv" | cut -d ' ' -f1 | cut -d$'\t' -f2 | sed 's/.*github.com\/\(.*\)/\1/g' | cut -d '/' -f2 | cut -d '.' -f1 | sort | uniq)
-echo "[+] Detected repo: $REPO"
-
-BRANCH=$(git branch --show-current)
-if ! [[ "$BRANCH" =~ ^release.*$ || "$BRANCH" =~ ^polkadot.*$ ]]; then
-    echo "This script is meant to run only on a RELEASE branch."
-    echo "Try one of the following branch:"
-    git branch -r --format "%(refname:short)" --sort=-committerdate | grep -Ei '/?release' | head
-    exit 1
-fi
-echo "[+] Working on $BRANCH"
-
-# Tried to get the version of the release from the branch
-# input: release-foo-v0.9.22 or release-bar-v9220 or release-foo-v0.9.220
-# output: 0.9.22
-get_version() {
-    branch=$1
-    [[ $branch =~ -v(.*) ]]
-    version=${BASH_REMATCH[1]}
-    if [[ $version =~ \. ]]; then
-        MAJOR=$(($(echo $version | cut -d '.' -f1)))
-        MINOR=$(($(echo $version | cut -d '.' -f2)))
-        PATCH=$(($(echo $version | cut -d '.' -f3)))
-        echo $MAJOR.$MINOR.${PATCH:0:2}
-    else
-        MAJOR=$(echo $(($version / 100000)))
-        remainer=$(($version - $MAJOR * 100000))
-        MINOR=$(echo $(($remainer / 1000)))
-        remainer=$(($remainer - $MINOR * 1000))
-        PATCH=$(echo $(($remainer / 10)))
-        echo $MAJOR.$MINOR.$PATCH
-    fi
-}
-
-# return the name of the release branch for a given repo and version
-get_release_branch() {
-    repo=$1
-    version=$2
-    case $repo in
-        polkadot)
-            echo "release-v$version"
-            ;;
-
-        substrate)
-            echo "polkadot-v$version"
-            ;;
-
-        *)
-            echo "Repo $repo is not supported, exiting"
-            exit 1
-            ;;
-    esac
-}
-
-# repo = substrate / polkadot
-check_release_branch_repo() {
-    repo=$1
-    branch=$2
-
-    echo "[+] Checking deps for $repo=$branch"
-
-    POSTIVE=$(cat Cargo.lock | grep "$repo?branch=$branch" | sort | uniq | wc -l)
-    NEGATIVE=$(cat Cargo.lock | grep "$repo?branch=" | grep -v $branch | sort | uniq | wc -l)
-
-    if [[ $POSTIVE -eq 1 && $NEGATIVE -eq 0 ]]; then
-        echo -e "[+] ✅ Looking good"
-        cat Cargo.lock | grep "$repo?branch=" | sort | uniq | sed 's/^/\t - /'
-        return 0
-    else
-        echo -e "[+] ❌ Something seems to be wrong, we want 1 unique match and 0 non match (1, 0) and we got ($(($POSTIVE)), $(($NEGATIVE)))"
-        cat Cargo.lock | grep "$repo?branch=" | sort | uniq | sed 's/^/\t - /'
-        return 1
-    fi
-}
-
-# Check a release branch
-check_release_branches() {
-    SUBSTRATE_BRANCH=$1
-    POLKADOT_BRANCH=$2
-
-    check_release_branch_repo substrate $SUBSTRATE_BRANCH
-    ret_a1=$?
-
-    ret_b1=0
-    if [ $POLKADOT_BRANCH ]; then
-        check_release_branch_repo polkadot $POLKADOT_BRANCH
-        ret_b1=$?
-    fi
-
-    STATUS=$(($ret_a1 + $ret_b1))
-
-    return $STATUS
-}
-
-VERSION=$(get_version $BRANCH)
-echo "[+] Target version: v$VERSION"
-
-case $REPO in
-    polkadot)
-        substrate=$(get_release_branch substrate $VERSION)
-
-        check_release_branches $substrate
-        ;;
-
-    cumulus)
-        polkadot=$(get_release_branch polkadot $VERSION)
-        substrate=$(get_release_branch substrate $VERSION)
-
-        check_release_branches $substrate $polkadot
-        ;;
-
-    *)
-        echo "REPO $REPO is not supported, exiting"
-        exit 1
-        ;;
-esac
diff --git a/polkadot/scripts/ci/github/check_bootnodes.sh b/polkadot/scripts/ci/github/check_bootnodes.sh
deleted file mode 100755
index f98a58cda2c846e0538d54c03c8bee998fba1261..0000000000000000000000000000000000000000
--- a/polkadot/scripts/ci/github/check_bootnodes.sh
+++ /dev/null
@@ -1,71 +0,0 @@
-#!/usr/bin/env bash
-
-# In this script, we check each bootnode for a given chainspec file and ensure they are contactable.
-# We do this by removing every bootnode from the chainspec with the exception of the one
-# we want to check. Then we spin up a node using this new chainspec, wait a little while
-# and then check our local node's RPC endpoint for the number of peers. If the node hasn't
-# been able to contact any other nodes, we can reason that the bootnode we used is not well-connected
-# or is otherwise uncontactable.
-
-# shellcheck source=scripts/ci/common/lib.sh
-source "$(dirname "${0}")/../common/lib.sh"
-CHAINSPEC_FILE="$1"
-RUNTIME=$(basename "$CHAINSPEC_FILE" | cut -d '.' -f 1)
-
-trap cleanup EXIT INT TERM
-
-cleanup(){
-    echo "[+] Script interrupted or ended. Cleaning up..."
-    # Kill all the polkadot processes
-    killall polkadot > /dev/null 2>&1
-    exit $1
-}
-
-# count the number of bootnodes
-BOOTNODES=$( jq -r '.bootNodes | length' "$CHAINSPEC_FILE" )
-# Make a temporary dir for chainspec files
-# Store an array of the bad bootnodes
-BAD_BOOTNODES=()
-GOOD_BOOTNODES=()
-PIDS=()
-
-echo "[+] Checking $BOOTNODES bootnodes for $RUNTIME"
-for i in $(seq 0 $((BOOTNODES-1))); do
-    BOOTNODE=$( jq -r .bootNodes["$i"] < "$CHAINSPEC_FILE" )
-    # Check each bootnode in parallel
-    check_bootnode "$BOOTNODE" "$CHAINSPEC_FILE" &
-    PIDS+=($!)
-    # Hold off 5 seconds between attempting to spawn nodes to stop the machine from getting overloaded
-    sleep 5
-done
-RESPS=()
-# Wait for all the nodes to finish
-for pid in "${PIDS[@]}"; do
-    wait "$pid"
-    RESPS+=($?)
-done
-echo
-# For any bootnodes that failed, add them to the bad bootnodes array
-for i in "${!RESPS[@]}"; do
-    if [ "${RESPS[$i]}" -ne 0 ]; then
-        BAD_BOOTNODES+=("$( jq -r .bootNodes["$i"] < "$CHAINSPEC_FILE" )")
-    fi
-done
-# For any bootnodes that succeeded, add them to the good bootnodes array
-for i in "${!RESPS[@]}"; do
-    if [ "${RESPS[$i]}" -eq 0 ]; then
-        GOOD_BOOTNODES+=("$( jq -r .bootNodes["$i"] < "$CHAINSPEC_FILE" )")
-    fi
-done
-
-# If we've got any uncontactable bootnodes for this runtime, print them
-if [ ${#BAD_BOOTNODES[@]} -gt 0 ]; then
-    echo "[!] Bad bootnodes found for $RUNTIME:"
-    for i in "${BAD_BOOTNODES[@]}"; do
-        echo "    $i"
-    done
-    cleanup 1
-else
-    echo "[+] All bootnodes for $RUNTIME are contactable"
-    cleanup 0
-fi
diff --git a/polkadot/scripts/ci/github/check_labels.sh b/polkadot/scripts/ci/github/check_labels.sh
deleted file mode 100755
index 12f07b3495e3bb59fda9142aaa1af6ce38925114..0000000000000000000000000000000000000000
--- a/polkadot/scripts/ci/github/check_labels.sh
+++ /dev/null
@@ -1,75 +0,0 @@
-#!/usr/bin/env bash
-
-#shellcheck source=../common/lib.sh
-source "$( cd "$( dirname "${BASH_SOURCE[0]}" )" >/dev/null 2>&1 && pwd )/../common/lib.sh"
-
-repo="$GITHUB_REPOSITORY"
-pr="$GITHUB_PR"
-
-ensure_labels() {
-  for label in "$@"; do
-    if has_label "$repo" "$pr" "$label"; then
-      return 0
-    fi
-  done
-  return 1
-}
-
-# Must have one of the following labels
-releasenotes_labels=(
-  'B0-silent'
-  'B1-releasenotes'
-  'B7-runtimenoteworthy'
-)
-
-# Must be an ordered list of priorities, lowest first
-priority_labels=(
-  'C1-low 📌'
-  'C3-medium 📣'
-  'C7-high ❗️'
-  'C9-critical ‼️'
-)
-
-audit_labels=(
-  'D1-audited 👍'
-  'D2-notlive 💤'
-  'D3-trivial 🧸'
-  'D5-nicetohaveaudit ⚠️'
-  'D9-needsaudit 👮'
-)
-
-echo "[+] Checking release notes (B) labels for $CI_COMMIT_BRANCH"
-if ensure_labels "${releasenotes_labels[@]}";  then
-  echo "[+] Release notes label detected. All is well."
-else
-  echo "[!] Release notes label not detected. Please add one of: ${releasenotes_labels[*]}"
-  exit 1
-fi
-
-echo "[+] Checking release priority (C) labels for $CI_COMMIT_BRANCH"
-if ensure_labels "${priority_labels[@]}";  then
-  echo "[+] Release priority label detected. All is well."
-else
-  echo "[!] Release priority label not detected. Please add one of: ${priority_labels[*]}"
-  exit 1
-fi
-
-if has_runtime_changes "${BASE_SHA}" "${HEAD_SHA}"; then
-  echo "[+] Runtime changes detected. Checking audit (D) labels"
-  if ensure_labels "${audit_labels[@]}";  then
-    echo "[+] Release audit label detected. All is well."
-  else
-    echo "[!] Release audit label not detected. Please add one of: ${audit_labels[*]}"
-    exit 1
-  fi
-fi
-
-# If the priority is anything other than the lowest, we *must not* have a B0-silent
-# label
-if has_label "$repo" "$GITHUB_PR" 'B0-silent' &&
-  ! has_label "$repo" "$GITHUB_PR" "${priority_labels[0]}"; then
-  echo "[!] Changes with a priority higher than C1-low *MUST* have a B- label that is not B0-Silent"
-  exit 1
-fi
-
-exit 0
diff --git a/polkadot/scripts/ci/github/check_new_bootnodes.sh b/polkadot/scripts/ci/github/check_new_bootnodes.sh
deleted file mode 100755
index 604db6a4e367b6377bf802070c442c38208266af..0000000000000000000000000000000000000000
--- a/polkadot/scripts/ci/github/check_new_bootnodes.sh
+++ /dev/null
@@ -1,42 +0,0 @@
-#!/bin/bash
-set -e
-# shellcheck source=scripts/ci/common/lib.sh
-source "$(dirname "${0}")/../common/lib.sh"
-
-# This script checks any new bootnodes added since the last git commit
-
-RUNTIMES=( kusama westend polkadot )
-
-WAS_ERROR=0
-
-for RUNTIME in "${RUNTIMES[@]}"; do
-    CHAINSPEC_FILE="node/service/chain-specs/$RUNTIME.json"
-    # Get the bootnodes from master's chainspec
-    git show origin/master:"$CHAINSPEC_FILE" | jq '{"oldNodes": .bootNodes}' > "$RUNTIME-old-bootnodes.json"
-    # Get the bootnodes from the current branch's chainspec
-    git show HEAD:"$CHAINSPEC_FILE" | jq '{"newNodes": .bootNodes}' > "$RUNTIME-new-bootnodes.json"
-    # Make a chainspec containing only the new bootnodes
-    jq ".bootNodes = $(jq -rs '.[0] * .[1] | .newNodes-.oldNodes' \
-        "$RUNTIME-new-bootnodes.json" "$RUNTIME-old-bootnodes.json")" \
-        < "node/service/chain-specs/$RUNTIME.json" \
-        > "$RUNTIME-new-chainspec.json"
-    # exit early if the new chainspec has no bootnodes
-    if [ "$(jq -r '.bootNodes | length' "$RUNTIME-new-chainspec.json")" -eq 0 ]; then
-        echo "[+] No new bootnodes for $RUNTIME"
-        # Clean up the temporary files
-        rm "$RUNTIME-new-chainspec.json" "$RUNTIME-old-bootnodes.json" "$RUNTIME-new-bootnodes.json"
-        continue
-    fi
-    # Check the new bootnodes
-    if ! "scripts/ci/github/check_bootnodes.sh" "$RUNTIME-new-chainspec.json"; then
-        WAS_ERROR=1
-    fi
-    # Clean up the temporary files
-    rm "$RUNTIME-new-chainspec.json" "$RUNTIME-old-bootnodes.json" "$RUNTIME-new-bootnodes.json"
-done
-
-
-if [ $WAS_ERROR -eq 1 ]; then
-    echo "[!] One of the new bootnodes failed to connect. Please check logs above."
-    exit 1
-fi
diff --git a/polkadot/scripts/ci/github/check_weights_swc.sh b/polkadot/scripts/ci/github/check_weights_swc.sh
deleted file mode 100755
index 35652f4fde83690e78f4d1d4e47f4e333b3fc2fe..0000000000000000000000000000000000000000
--- a/polkadot/scripts/ci/github/check_weights_swc.sh
+++ /dev/null
@@ -1,20 +0,0 @@
-#!/usr/bin/env bash
-# Need to set globstar for ** magic
-shopt -s globstar
-
-RUNTIME=$1
-VERSION=$2
-echo "<details>"
-echo "<summary>Weight changes for $RUNTIME</summary>"
-echo
-swc compare commits \
-    --method asymptotic \
-    --offline \
-    --path-pattern "./runtime/$RUNTIME/src/weights/**/*.rs" \
-    --no-color \
-    --format markdown \
-    --strip-path-prefix "runtime/$RUNTIME/src/weights/" \
-    "$VERSION"
-    #--ignore-errors
-echo
-echo "</details>"
diff --git a/polkadot/scripts/ci/github/extrinsic-ordering-filter.sh b/polkadot/scripts/ci/github/extrinsic-ordering-filter.sh
deleted file mode 100755
index 4fd3337f64a6e9ea93848685cdf2fbac8b0340e7..0000000000000000000000000000000000000000
--- a/polkadot/scripts/ci/github/extrinsic-ordering-filter.sh
+++ /dev/null
@@ -1,55 +0,0 @@
-#!/usr/bin/env bash
-# This script is used in a Github Workflow. It helps filtering out what is interesting
-# when comparing metadata and spot what would require a tx version bump.
-
-# shellcheck disable=SC2002,SC2086
-
-FILE=$1
-
-# Higlight indexes that were deleted
-function find_deletions() {
-    echo "\n## Deletions\n"
-    RES=$(cat "$FILE" | grep -n '\[\-\]' | tr -s " ")
-    if [ "$RES" ]; then
-        echo "$RES" | awk '{ printf "%s\\n", $0 }'
-    else
-        echo "n/a"
-    fi
-}
-
-# Highlight indexes that have been deleted
-function find_index_changes() {
-    echo "\n## Index changes\n"
-    RES=$(cat "$FILE" | grep -E -n -i 'idx:\s*([0-9]+)\s*(->)\s*([0-9]+)' | tr -s " ")
-    if [ "$RES" ]; then
-        echo "$RES" | awk '{ printf "%s\\n", $0 }'
-    else
-        echo "n/a"
-    fi
-}
-
-# Highlight values that decreased
-function find_decreases() {
-    echo "\n## Decreases\n"
-    OUT=$(cat "$FILE" | grep -E -i -o '([0-9]+)\s*(->)\s*([0-9]+)' | awk '$1 > $3 { printf "%s;", $0 }')
-    IFS=$';' LIST=("$OUT")
-    unset RES
-    for line in "${LIST[@]}"; do
-        RES="$RES\n$(cat "$FILE" | grep -E -i -n \"$line\" | tr -s " ")"
-    done
-
-    if [ "$RES" ]; then
-        echo "$RES" | awk '{ printf "%s\\n", $0 }' | sort -u -g | uniq
-    else
-        echo "n/a"
-    fi
-}
-
-echo "\n------------------------------ SUMMARY -------------------------------"
-echo "\n⚠️ This filter is here to help spotting changes that should be reviewed carefully."
-echo "\n⚠️ It catches only index changes, deletions and value decreases".
-
-find_deletions "$FILE"
-find_index_changes "$FILE"
-find_decreases "$FILE"
-echo "\n----------------------------------------------------------------------\n"
diff --git a/polkadot/scripts/ci/github/generate_release_text.rb b/polkadot/scripts/ci/github/generate_release_text.rb
deleted file mode 100644
index 83b3853a342d1e7a2570276a3b2eb526a79090a5..0000000000000000000000000000000000000000
--- a/polkadot/scripts/ci/github/generate_release_text.rb
+++ /dev/null
@@ -1,148 +0,0 @@
-# frozen_string_literal: true
-
-require 'base64'
-require 'changelogerator'
-require 'erb'
-require 'git'
-require 'json'
-require 'octokit'
-require 'toml'
-require_relative './lib.rb'
-
-# A logger only active when NOT running in CI
-def logger(s)
-  puts "▶ DEBUG: %s" % [s] if ENV['CI'] != 'true'
-end
-
-# Check if all the required ENV are set
-# This is especially convenient when testing locally
-def check_env()
-  if ENV['CI'] != 'true' then
-    logger("Running locally")
-    vars = ['GITHUB_REF', 'GITHUB_TOKEN', 'GITHUB_WORKSPACE', 'GITHUB_REPOSITORY', 'RUSTC_STABLE', 'RUSTC_NIGHTLY']
-    vars.each { |x|
-      env = (ENV[x] || "")
-      if env.length > 0 then
-        logger("- %s:\tset: %s, len: %d" % [x, env.length > 0 || false, env.length])
-      else
-        logger("- %s:\tset: %s, len: %d" % [x, env.length > 0 || false, env.length])
-      end
-    }
-  end
-end
-
-check_env()
-
-current_ref = ENV['GITHUB_REF']
-token = ENV['GITHUB_TOKEN']
-
-logger("Connecting to Github")
-github_client = Octokit::Client.new(
-  access_token: token
-)
-
-polkadot_path = ENV['GITHUB_WORKSPACE'] + '/polkadot/'
-
-# Generate an ERB renderer based on the template .erb file
-renderer = ERB.new(
-  File.read(File.join(polkadot_path, 'scripts/ci/github/polkadot_release.erb')),
-  trim_mode: '<>'
-)
-
-# get ref of last polkadot release
-last_ref = 'refs/tags/' + github_client.latest_release(ENV['GITHUB_REPOSITORY']).tag_name
-logger("Last ref: " + last_ref)
-
-logger("Generate changelog for Polkadot")
-polkadot_cl = Changelog.new(
-  'paritytech/polkadot', last_ref, current_ref, token: token
-)
-
-# Gets the substrate commit hash used for a given polkadot ref
-def get_substrate_commit(client, ref)
-  cargo = TOML::Parser.new(
-    Base64.decode64(
-      client.contents(
-        ENV['GITHUB_REPOSITORY'],
-        path: 'Cargo.lock',
-        query: { ref: ref.to_s }
-      ).content
-    )
-  ).parsed
-  cargo['package'].find { |p| p['name'] == 'sc-cli' }['source'].split('#').last
-end
-
-substrate_prev_sha = get_substrate_commit(github_client, last_ref)
-substrate_cur_sha = get_substrate_commit(github_client, current_ref)
-
-logger("Generate changelog for Substrate")
-substrate_cl = Changelog.new(
-  'paritytech/substrate', substrate_prev_sha, substrate_cur_sha,
-  token: token,
-  prefix: true
-)
-
-# Combine all changes into a single array and filter out companions
-all_changes = (polkadot_cl.changes + substrate_cl.changes).reject do |c|
-  c[:title] =~ /[Cc]ompanion/
-end
-
-# Set all the variables needed for a release
-
-misc_changes = Changelog.changes_with_label(all_changes, 'B1-releasenotes')
-client_changes = Changelog.changes_with_label(all_changes, 'B5-clientnoteworthy')
-runtime_changes = Changelog.changes_with_label(all_changes, 'B7-runtimenoteworthy')
-
-# Add the audit status for runtime changes
-runtime_changes.each do |c|
-  if c[:labels].any? { |l| l[:name] == 'D1-audited 👍' }
-    c[:pretty_title] = "✅ `audited` #{c[:pretty_title]}"
-    next
-  end
-  if c[:labels].any? { |l| l[:name] == 'D2-notlive 💤' }
-    c[:pretty_title] = "✅ `not live` #{c[:pretty_title]}"
-    next
-  end
-  if c[:labels].any? { |l| l[:name] == 'D3-trivial 🧸' }
-    c[:pretty_title] = "✅ `trivial` #{c[:pretty_title]}"
-    next
-  end
-  if c[:labels].any? { |l| l[:name] == 'D5-nicetohaveaudit ⚠️' }
-    c[:pretty_title] = "⏳ `pending non-critical audit` #{c[:pretty_title]}"
-    next
-  end
-  if c[:labels].any? { |l| l[:name] == 'D9-needsaudit 👮' }
-    c[:pretty_title] = "❌ `AWAITING AUDIT` #{c[:pretty_title]}"
-    next
-  end
-  c[:pretty_title] = "⭕️ `unknown audit requirements` #{c[:pretty_title]}"
-end
-
-# The priority of users upgraded is determined by the highest-priority
-# *Client* change
-release_priority = Changelog.highest_priority_for_changes(client_changes)
-
-# Pulled from the previous Github step
-rustc_stable = ENV['RUSTC_STABLE']
-rustc_nightly = ENV['RUSTC_NIGHTLY']
-polkadot_runtime = get_runtime('polkadot', polkadot_path)
-kusama_runtime = get_runtime('kusama', polkadot_path)
-westend_runtime = get_runtime('westend', polkadot_path)
-rococo_runtime = get_runtime('rococo', polkadot_path)
-
-# These json files should have been downloaded as part of the build-runtimes
-# github action
-
-polkadot_json = JSON.parse(
-  File.read(
-    "#{ENV['GITHUB_WORKSPACE']}/polkadot-srtool-json/polkadot_srtool_output.json"
-  )
-)
-
-kusama_json = JSON.parse(
-  File.read(
-    "#{ENV['GITHUB_WORKSPACE']}/kusama-srtool-json/kusama_srtool_output.json"
-  )
-)
-
-puts renderer.result
diff --git a/polkadot/scripts/ci/github/lib.rb b/polkadot/scripts/ci/github/lib.rb
deleted file mode 100644
index 14663acaf31a32c739243c445d41a7f3d3774074..0000000000000000000000000000000000000000
--- a/polkadot/scripts/ci/github/lib.rb
+++ /dev/null
@@ -1,10 +0,0 @@
-# frozen_string_literal: true
-
-# Gets the runtime version for a given runtime from the filesystem.
-# Optionally accepts a path that is the root of the project which defaults to
-# the current working directory
-def get_runtime(runtime: nil, path: '.', runtime_dir: 'runtime')
-  File.open(path + "/#{runtime_dir}/#{runtime}/src/lib.rs") do |f|
-    f.find { |l| l =~ /spec_version/ }.match(/[0-9]+/)[0]
-  end
-end
diff --git a/polkadot/scripts/ci/github/polkadot_release.erb b/polkadot/scripts/ci/github/polkadot_release.erb
deleted file mode 100644
index 3fcf07dddc5c61dccf22eab54ba4efe9246a4cae..0000000000000000000000000000000000000000
--- a/polkadot/scripts/ci/github/polkadot_release.erb
+++ /dev/null
@@ -1,42 +0,0 @@
-<%= print release_priority[:text] %> <%= puts " due to changes: *#{Changelog.changes_with_label(all_changes, release_priority[:label]).map(&:pretty_title).join(", ")}*" if release_priority[:priority] > 1 %>
-
-Native runtimes:
-
-- Polkadot: **<%= polkadot_runtime %>**
-- Kusama: **<%= kusama_runtime %>**
-- Westend: **<%= westend_runtime %>**
-
-This release was tested against the following versions of `rustc`. Other versions may work.
-
-- <%= rustc_stable %>
-- <%= rustc_nightly %>
-
-WASM runtimes built with [<%= polkadot_json['info']['generator']['name'] %> v<%= polkadot_json['info']['generator']['version'] %>](https://github.com/paritytech/srtool) using `<%= polkadot_json['rustc'] %>`.
-
-Proposal hashes:
-* `polkadot_runtime-v<%= polkadot_runtime %>.compact.compressed.wasm`: `<%= polkadot_json['runtimes']['compressed']['prop'] %>`
-* `kusama_runtime-v<%= kusama_runtime %>.compact.compressed.wasm`: `<%= kusama_json['runtimes']['compressed']['prop'] %>`
-
-<% unless misc_changes.empty? %>
-## Changes
-
-<% misc_changes.each do |c| %>
-* <%= c[:pretty_title] %>
-<% end %>
-<% end %>
-
-<% unless client_changes.empty? %>
-## Client
-
-<% client_changes.each do |c| %>
-* <%= c[:pretty_title] %>
-<% end %>
-<% end %>
-
-<% unless runtime_changes.empty? %>
-## Runtime
-
-<% runtime_changes.each do |c| %>
-* <%= c[:pretty_title] %>
-<% end %>
-<% end %>
diff --git a/polkadot/scripts/ci/github/run_fuzzer.sh b/polkadot/scripts/ci/github/run_fuzzer.sh
deleted file mode 100755
index b73a83beab91ff1219c1b82e9aeb7f9b40ebcb2c..0000000000000000000000000000000000000000
--- a/polkadot/scripts/ci/github/run_fuzzer.sh
+++ /dev/null
@@ -1,13 +0,0 @@
-#!/usr/bin/env bash
-
-timeout --signal INT 5h cargo hfuzz run $1
-status=$?
-
-if [ $status -ne 124 ]; then
-  echo "Found a panic!"
-  # TODO: provide Minimal Reproducible Input
-  # TODO: message on Matrix
-  exit 1
-else
-  echo "Didn't find any problem in 5 hours of fuzzing"
-fi
diff --git a/polkadot/scripts/ci/github/verify_updated_weights.sh b/polkadot/scripts/ci/github/verify_updated_weights.sh
deleted file mode 100755
index 54db1de21ca00af1bff26b9fdb22932578e3f511..0000000000000000000000000000000000000000
--- a/polkadot/scripts/ci/github/verify_updated_weights.sh
+++ /dev/null
@@ -1,56 +0,0 @@
-#!/bin/bash
-
-ROOT="$(dirname "$0")/../../.."
-RUNTIME="$1"
-
-# If we're on a mac, use gdate for date command (requires coreutils installed via brew)
-if [[ "$OSTYPE" == "darwin"* ]]; then
-  DATE="gdate"
-else
-  DATE="date"
-fi
-
-function check_date() {
-  # Get the dates as input arguments
-  LAST_RUN="$1"
-  TODAY="$($DATE +%Y-%m-%d)"
-  # Calculate the date two days before today
-  CUTOFF=$($DATE -d "$TODAY - 2 days" +%Y-%m-%d)
-
-  if [[ "$LAST_RUN" > "$CUTOFF" ]]; then
-    return 0
-  else
-    return 1
-  fi
-}
-
-check_weights(){
-    FILE=$1
-    CUR_DATE=$2
-    DATE_REGEX='[0-9]{4}-[0-9]{2}-[0-9]{2}'
-    LAST_UPDATE="$(grep -E "//! DATE: $DATE_REGEX" "$FILE" | sed -r "s/.*DATE: ($DATE_REGEX).*/\1/")"
-    # If the file does not contain a date, flag it as an error.
-    if [ -z "$LAST_UPDATE" ]; then
-        echo "Skipping $FILE, no date found."
-        return 0
-    fi
-    if ! check_date "$LAST_UPDATE" ; then
-        echo "ERROR: $FILE was not updated for the current date. Last update: $LAST_UPDATE"
-        return 1
-    fi
-    # echo "OK: $FILE"
-}
-
-echo "Checking weights for $RUNTIME"
-CUR_DATE="$(date +%Y-%m-%d)"
-HAS_ERROR=0
-for FILE in "$ROOT"/runtime/"$RUNTIME"/src/weights/*.rs; do
-    if ! check_weights "$FILE" "$CUR_DATE"; then
-        HAS_ERROR=1
-    fi
-done
-
-if [ $HAS_ERROR -eq 1 ]; then
-    echo "ERROR: One or more weights files were not updated during the last benchmark run. Check the logs above."
-    exit 1
-fi
\ No newline at end of file
diff --git a/polkadot/scripts/ci/gitlab/check_extrinsics_ordering.sh b/polkadot/scripts/ci/gitlab/check_extrinsics_ordering.sh
deleted file mode 100755
index 8a7385f03f9f2347e4c66f2f12d7803cde0ff184..0000000000000000000000000000000000000000
--- a/polkadot/scripts/ci/gitlab/check_extrinsics_ordering.sh
+++ /dev/null
@@ -1,82 +0,0 @@
-#!/usr/bin/env bash
-set -e
-
-# Include the common functions library
-#shellcheck source=../common/lib.sh
-. "$(dirname "${0}")/../common/lib.sh"
-
-HEAD_BIN=./artifacts/polkadot
-HEAD_WS=ws://localhost:9944
-RELEASE_WS=ws://localhost:9945
-
-runtimes=(
-  "westend"
-  "kusama"
-  "polkadot"
-)
-
-# First we fetch the latest released binary
-latest_release=$(latest_release 'paritytech/polkadot')
-RELEASE_BIN="./polkadot-$latest_release"
-echo "[+] Fetching binary for Polkadot version $latest_release"
-curl -L "https://github.com/paritytech/polkadot/releases/download/$latest_release/polkadot" > "$RELEASE_BIN" || exit 1
-chmod +x "$RELEASE_BIN"
-
-
-for RUNTIME in "${runtimes[@]}"; do
-  echo "[+] Checking runtime: ${RUNTIME}"
-
-  release_transaction_version=$(
-    git show "origin/release:runtime/${RUNTIME}/src/lib.rs" | \
-      grep 'transaction_version'
-  )
-
-  current_transaction_version=$(
-    grep 'transaction_version' "./runtime/${RUNTIME}/src/lib.rs"
-  )
-
-  echo "[+] Release: ${release_transaction_version}"
-  echo "[+] Ours: ${current_transaction_version}"
-
-  if [ ! "$release_transaction_version" = "$current_transaction_version" ]; then
-    echo "[+] Transaction version for ${RUNTIME} has been bumped since last release."
-    exit 0
-  fi
-
-  # Start running the nodes in the background
-  $HEAD_BIN --chain="$RUNTIME-local" --tmp &
-  $RELEASE_BIN --chain="$RUNTIME-local" --ws-port 9945 --tmp &
-  jobs
-
-  # Sleep a little to allow the nodes to spin up and start listening
-  TIMEOUT=5
-  for i in $(seq $TIMEOUT); do
-    sleep 1
-      if [ "$(lsof -nP -iTCP -sTCP:LISTEN | grep -c '994[45]')" == 2 ]; then
-        echo "[+] Both nodes listening"
-        break
-      fi
-      if [ "$i" == $TIMEOUT ]; then
-        echo "[!] Both nodes not listening after $i seconds. Exiting"
-        exit 1
-      fi
-  done
-  sleep 5
-
-  changed_extrinsics=$(
-    polkadot-js-metadata-cmp "$RELEASE_WS" "$HEAD_WS" \
-      | sed 's/^ \+//g' | grep -e 'idx: [0-9]\+ -> [0-9]\+' || true
-  )
-
-  if [ -n "$changed_extrinsics" ]; then
-    echo "[!] Extrinsics indexing/ordering has changed in the ${RUNTIME} runtime! If this change is intentional, please bump transaction_version in lib.rs. Changed extrinsics:"
-    echo "$changed_extrinsics"
-    exit 1
-  fi
-
-  echo "[+] No change in extrinsics ordering for the ${RUNTIME} runtime"
-  jobs -p | xargs kill; sleep 5
-done
-
-# Sleep a little to let the jobs die properly
-sleep 5
diff --git a/polkadot/scripts/ci/gitlab/check_runtime.sh b/polkadot/scripts/ci/gitlab/check_runtime.sh
deleted file mode 100755
index 9618bbfa1c769a8e56e4bbef50b52f9f917e49a2..0000000000000000000000000000000000000000
--- a/polkadot/scripts/ci/gitlab/check_runtime.sh
+++ /dev/null
@@ -1,204 +0,0 @@
-#!/usr/bin/env bash
-
-# Check for any changes in any runtime directories (e.g., ^runtime/polkadot) as
-# well as directories common to all runtimes (e.g., ^runtime/common). If there
-# are no changes, check if the Substrate git SHA in Cargo.lock has been
-# changed. If so, pull the repo and verify if {spec,impl}_versions have been
-# altered since the previous Substrate version used.
-#
-# If there were changes to any runtimes or common dirs, we iterate over each
-# runtime (defined in the $runtimes() array), and check if {spec,impl}_version
-# have been changed since the last release.
-
-set -e # fail on any error
-
-#Include the common functions library
-#shellcheck source=../common/lib.sh
-. "$(dirname "${0}")/../common/lib.sh"
-
-SUBSTRATE_REPO="https://github.com/paritytech/substrate"
-SUBSTRATE_REPO_CARGO="git\+${SUBSTRATE_REPO}"
-SUBSTRATE_VERSIONS_FILE="bin/node/runtime/src/lib.rs"
-
-# figure out the latest release tag
-boldprint "make sure we have all tags (including those from the release branch)"
-git fetch --depth="${GIT_DEPTH:-100}" origin release
-git fetch --depth="${GIT_DEPTH:-100}" origin 'refs/tags/*:refs/tags/*'
-LATEST_TAG="$(git tag -l | grep -E '^v[0-9]+\.[0-9]+\.[0-9]+-?[0-9]*$' | sort -V | tail -n 1)"
-boldprint "latest release tag ${LATEST_TAG}"
-
-boldprint "latest 10 commits of ${CI_COMMIT_REF_NAME}"
-git --no-pager log --graph --oneline --decorate=short -n 10
-
-boldprint "make sure the master branch is available in shallow clones"
-git fetch --depth="${GIT_DEPTH:-100}" origin master
-
-
-runtimes=(
-  "kusama"
-  "polkadot"
-  "westend"
-  "rococo"
-)
-
-common_dirs=(
-  "common"
-)
-
-# Helper function to join elements in an array with a multi-char delimiter
-# https://stackoverflow.com/questions/1527049/how-can-i-join-elements-of-an-array-in-bash
-function join_by { local d=$1; shift; echo -n "$1"; shift; printf "%s" "${@/#/$d}"; }
-
-boldprint "check if the wasm sources changed since ${LATEST_TAG}"
-if ! has_runtime_changes "${LATEST_TAG}" "${CI_COMMIT_SHA}"; then
-  boldprint "no changes to any runtime source code detected"
-  # continue checking if Cargo.lock was updated with a new substrate reference
-  # and if that change includes a {spec|impl}_version update.
-
-  SUBSTRATE_REFS_CHANGED="$(
-    git diff "refs/tags/${LATEST_TAG}...${CI_COMMIT_SHA}" Cargo.lock \
-    | sed -n -r "s~^[\+\-]source = \"${SUBSTRATE_REPO_CARGO}#([a-f0-9]+)\".*$~\1~p" | sort -u | wc -l
-  )"
-
-  # check Cargo.lock for substrate ref change
-  case "${SUBSTRATE_REFS_CHANGED}" in
-    (0)
-      boldprint "substrate refs not changed in Cargo.lock"
-      exit 0
-      ;;
-    (2)
-      boldprint "substrate refs updated since ${LATEST_TAG}"
-      ;;
-    (*)
-      boldprint "check unsupported: more than one commit targeted in repo ${SUBSTRATE_REPO_CARGO}"
-      exit 1
-  esac
-
-
-  SUBSTRATE_PREV_REF="$(
-    git diff "refs/tags/${LATEST_TAG}...${CI_COMMIT_SHA}" Cargo.lock \
-    | sed -n -r "s~^\-source = \"${SUBSTRATE_REPO_CARGO}#([a-f0-9]+)\".*$~\1~p" | sort -u | head -n 1
-  )"
-
-  SUBSTRATE_NEW_REF="$(
-    git diff "refs/tags/${LATEST_TAG}...${CI_COMMIT_SHA}" Cargo.lock \
-    | sed -n -r "s~^\+source = \"${SUBSTRATE_REPO_CARGO}#([a-f0-9]+)\".*$~\1~p" | sort -u | head -n 1
-  )"
-
-
-  boldcat <<EOT
-previous substrate commit id ${SUBSTRATE_PREV_REF}
-new substrate commit id      ${SUBSTRATE_NEW_REF}
-EOT
-
-  # okay so now need to fetch the substrate repository and check whether spec_version or impl_version has changed there
-  SUBSTRATE_CLONE_DIR="$(mktemp -t -d substrate-XXXXXX)"
-  trap 'rm -rf "${SUBSTRATE_CLONE_DIR}"' INT QUIT TERM ABRT EXIT
-
-  git clone --depth="${GIT_DEPTH:-100}" --no-tags \
-    "${SUBSTRATE_REPO}" "${SUBSTRATE_CLONE_DIR}"
-
-  # check if there are changes to the spec|impl versions
-  git -C "${SUBSTRATE_CLONE_DIR}" diff \
-    "${SUBSTRATE_PREV_REF}..${SUBSTRATE_NEW_REF}" "${SUBSTRATE_VERSIONS_FILE}" \
-    | grep -E '^[\+\-][[:space:]]+(spec|impl)_version: +([0-9]+),$' || exit 0
-
-  boldcat <<EOT
-spec_version or or impl_version have changed in substrate after updating Cargo.lock
-please make sure versions are bumped in polkadot accordingly
-EOT
-
-fi
-
-failed_runtime_checks=()
-
-# Iterate over each runtime defined at the start of the script
-for RUNTIME in "${runtimes[@]}"
-do
-
-  # Check if there were changes to this specific runtime or common directories.
-  # If not, we can skip to the next runtime
-  regex="^runtime/$(join_by '|^runtime/' "$RUNTIME" "${common_dirs[@]}")"
-  if ! git diff --name-only "refs/tags/${LATEST_TAG}...${CI_COMMIT_SHA}" \
-    | grep -E -q -e "$regex"; then
-    continue
-  fi
-
-  # check for spec_version updates: if the spec versions changed, then there is
-  # consensus-critical logic that has changed. the runtime wasm blobs must be
-  # rebuilt.
-
-  add_spec_version="$(
-    git diff "refs/tags/${LATEST_TAG}...${CI_COMMIT_SHA}" "runtime/${RUNTIME}/src/lib.rs" \
-    | sed -n -r "s/^\+[[:space:]]+spec_version: +([0-9]+),$/\1/p"
-  )"
-  sub_spec_version="$(
-    git diff "refs/tags/${LATEST_TAG}...${CI_COMMIT_SHA}" "runtime/${RUNTIME}/src/lib.rs" \
-    | sed -n -r "s/^\-[[:space:]]+spec_version: +([0-9]+),$/\1/p"
-  )"
-
-
-  # see if the version and the binary blob changed
-  if [ "${add_spec_version}" != "${sub_spec_version}" ]
-  then
-
-    boldcat <<EOT
-## RUNTIME: ${RUNTIME} ##
-
-changes to the ${RUNTIME} runtime sources and changes in the spec version.
-
-spec_version: ${sub_spec_version} -> ${add_spec_version}
-
-EOT
-    continue
-
-  else
-    # check for impl_version updates: if only the impl versions changed, we assume
-    # there is no consensus-critical logic that has changed.
-
-    add_impl_version="$(
-      git diff refs/tags/"${LATEST_TAG}...${CI_COMMIT_SHA}" "runtime/${RUNTIME}/src/lib.rs" \
-      | sed -n -r 's/^\+[[:space:]]+impl_version: +([0-9]+),$/\1/p'
-    )"
-    sub_impl_version="$(
-      git diff refs/tags/"${LATEST_TAG}...${CI_COMMIT_SHA}" "runtime/${RUNTIME}/src/lib.rs" \
-      | sed -n -r 's/^\-[[:space:]]+impl_version: +([0-9]+),$/\1/p'
-    )"
-
-
-    # see if the impl version changed
-    if [ "${add_impl_version}" != "${sub_impl_version}" ]
-    then
-      boldcat <<EOT
-
-## RUNTIME: ${RUNTIME} ##
-
-changes to the ${RUNTIME} runtime sources and changes in the impl version.
-
-impl_version: ${sub_impl_version} -> ${add_impl_version}
-
-EOT
-      continue
-    fi
-
-    failed_runtime_checks+=("$RUNTIME")
-  fi
-done
-
-if [ ${#failed_runtime_checks} -gt 0 ]; then
-  boldcat <<EOT
-wasm source files changed or the spec version in the substrate reference in
-the Cargo.lock but not the spec/impl version. If changes made do not alter
-logic, just bump 'impl_version'. If they do change logic, bump
-'spec_version'.
-
-source file directories:
-- runtime
-
-version files: ${failed_runtime_checks[@]}
-EOT
-
-  exit 1
-fi
-
-exit 0
diff --git a/polkadot/scripts/ci/gitlab/lingua.dic b/polkadot/scripts/ci/gitlab/lingua.dic
deleted file mode 100644
index 5bf272231fabe56f47d2f1574f72b2c56ca1bfd1..0000000000000000000000000000000000000000
--- a/polkadot/scripts/ci/gitlab/lingua.dic
+++ /dev/null
@@ -1,344 +0,0 @@
-150
-2D
-A&V
-accessor/MS
-AccountId
-activations
-acyclic
-adversary/SM
-allocator/SM
-annualised
-anonymize/D
-Apache-2.0/M
-API
-APIs
-arg/MS
-assignee/SM
-async
-asynchrony
-autogenerated
-backable
-backend/MS
-benchmark/DSMG
-BFT/M
-bitfield/MS
-bitwise
-blake2/MS
-blockchain/MS
-borked
-broadcast/UDSMG
-BTC/S
-canonicalization
-canonicalize/D
-CentOS
-CLI/MS
-codebase/SM
-codec/SM
-commit/D
-comparator
-computable
-conclude/UD
-config/MS
-could've
-crowdfund
-crowdloan/MSG
-crypto/MS
-CSM
-Cucumber/MS
-customizable/B
-DDoS
-Debian/M
-decodable/MS
-decrement
-deduplicated
-deduplication
-deinitializing
-dequeue/SD
-dequeuing
-deregister
-deserialize/G
-DHT
-disincentivize/D
-dispatchable/SM
-DLEQ
-DM
-DMP/SM
-DMQ
-DoS
-DOT
-DOTs
-ECDSA
-ed25519
-encodable
-enqueue/D
-enqueue/DMSG
-entrypoint/MS
-enum
-ERC-20
-ETH/S
-ethereum/MS
-externality/MS
-extrinsic
-extrinsics
-fedora/M
-finalize/B
-FRAME/MS
-FSMs
-functor
-fungibility
-gameable
-getter/MS
-GiB/S
-GKE
-GNUNet
-GPL/M
-GPLv3/M
-Grafana/MS
-Gurke/MS
-gurke/MS
-Handler/MS
-HMP/SM
-HRMP
-HSM
-https
-iff
-implementer/MS
-includable
-include/BG
-increment/DSMG
-inherent
-inherents
-initialize/CRG
-initializer
-instantiate/B
-instantiation/SM
-intrinsic
-intrinsics
-invariant/MS
-invariants
-inverter/MS
-invertible
-io
-IP/S
-isn
-isolatable
-isolate/BG
-iterable
-jaeger/MS
-js
-judgement/S
-keccak256/M
-keypair/MS
-keystore/MS
-Kovan
-KSM/S
-Kubernetes/MS
-kusama/S
-KYC/M
-lib
-libp2p
-lifecycle/MS
-liveness
-lookahead/MS
-lookup/MS
-LRU
-mainnet/MS
-malus/MS
-MB/M
-Mbit
-merkle/MS
-Merklized
-metadata/M
-middleware/MS
-Millau
-misbehavior/SM
-misbehaviors
-misvalidate/D
-MIT/M
-MMR
-modularity
-mpsc
-MPSC
-MQC/SM
-msg
-multisig/S
-multivalidator/SM
-mutators
-mutex
-natively
-NFA
-NFT/SM
-no_std
-nonces
-NPoS
-NTB
-offboard/DMSG
-onboard/DMSG
-oneshot/MS
-onwards
-OOM/S
-OPENISH
-others'
-ourself
-overseer/MS
-ownerless
-p2p
-parablock/MS
-parachain/MS
-ParaId
-parameterization
-parameterize/D
-parathread/MS
-participations
-passthrough
-PDK
-peerset/MS
-permission/D
-pessimization
-phragmen
-picosecond/SM
-PoA/MS
-polkadot/MS
-Polkadot/MS
-PoS/MS
-PoV/MS
-PoW/MS
-PR
-precheck
-prechecking
-preconfigured
-preimage/MS
-preopen
-prepend/G
-prevalidating
-prevalidation
-preverify/G
-programmatically
-prometheus/MS
-provisioner/MS
-proxy/DMSG
-proxy/G
-proxying
-PRs
-PVF/S
-querier
-README/MS
-redhat/M
-register/CD
-relayer
-repo/MS
-requesters
-reservable
-responder/SM
-retriability
-reverify
-ROC
-roundtrip/MS
-routable
-rpc
-RPC/MS
-runtime/MS
-rustc/MS
-SAFT
-scalability
-scalable
-Schnorr
-schnorrkel
-SDF
-sending/S
-sharding
-shareable
-Simnet/MS
-spawn/SR
-spawner
-sr25519
-SS58
-SSL
-startup/MS
-stateful
-Statemine
-str
-struct/MS
-subcommand/SM
-substream
-subsystem/MS
-subsystems'
-supermajority
-SURI
-sybil
-systemwide
-taskmanager/MS
-TCP
-teleport/D
-teleport/RG
-teleportation/SM
-teleporter/SM
-teleporters
-template/GSM
-testnet/MS
-tera/M
-teleports
-timeframe
-timestamp/MS
-topologies
-tradeoff
-transitionary
-trie/MS
-trustless/Y
-TTL
-tuple/SM
-typesystem
-ubuntu/M
-UDP
-UI
-unapplied
-unassign
-unconcluded
-unexpectable
-unfinalize/B
-unfinalized
-union/MSG
-unordered
-unreceived
-unreserve
-unreserving
-unroutable
-unservable/B
-unshare/D
-untrusted
-untyped
-unvested
-URI
-utilize
-v0
-v1
-v2
-validator/SM
-ve
-vec
-verifier
-verify/R
-versa
-Versi
-version/DMSG
-VMP/SM
-VPS
-VRF/SM
-vstaging
-VStaging
-w3f/MS
-wakeup
-wakeups
-warming/S
-wasm/M
-wasmtime
-Westend/M
-wildcard/MS
-WND/S
-Wococo
-WS
-XCM/S
-XCMP/M
-yeet
-yml
-zsh
diff --git a/polkadot/scripts/ci/gitlab/pipeline/build.yml b/polkadot/scripts/ci/gitlab/pipeline/build.yml
deleted file mode 100644
index 845ac797010822167a78ebdb1fde3476b11e9d06..0000000000000000000000000000000000000000
--- a/polkadot/scripts/ci/gitlab/pipeline/build.yml
+++ /dev/null
@@ -1,174 +0,0 @@
-# This file is part of .gitlab-ci.yml
-# Here are all jobs that are executed during "build" stage
-
-build-linux-stable:
-  stage: build
-  # this is an artificial job dependency, for pipeline optimization using GitLab's DAGs
-  # the job can be found in check.yml
-  needs:
-    - job: job-starter
-      artifacts: false
-  extends:
-    - .docker-env
-    - .common-refs
-    - .compiler-info
-    - .collect-artifacts
-  variables:
-    RUST_TOOLCHAIN: stable
-    # Enable debug assertions since we are running optimized builds for testing
-    # but still want to have debug assertions.
-    RUSTFLAGS: "-Cdebug-assertions=y -Dwarnings"
-    # Ensure we run the UI tests.
-    RUN_UI_TESTS: 1
-  script:
-    - time cargo build --locked --profile testnet --features pyroscope,fast-runtime --verbose --bins
-    # pack artifacts
-    - mkdir -p ./artifacts
-    - VERSION="${CI_COMMIT_REF_NAME}" # will be tag or branch name
-    - mv ./target/testnet/polkadot ./artifacts/.
-    - mv ./target/testnet/polkadot-prepare-worker ./artifacts/.
-    - mv ./target/testnet/polkadot-execute-worker ./artifacts/.
-    - pushd artifacts
-    - sha256sum polkadot | tee polkadot.sha256
-    - shasum -c polkadot.sha256
-    - popd
-    - EXTRATAG="${CI_COMMIT_REF_NAME}-${CI_COMMIT_SHORT_SHA}"
-    - echo "Polkadot version = ${VERSION} (EXTRATAG = ${EXTRATAG})"
-    - echo -n ${VERSION} > ./artifacts/VERSION
-    - echo -n ${EXTRATAG} > ./artifacts/EXTRATAG
-    - echo -n ${CI_JOB_ID} > ./artifacts/BUILD_LINUX_JOB_ID
-    - RELEASE_VERSION=$(./artifacts/polkadot -V | awk '{print $2}'| awk -F "-" '{print $1}')
-    - echo -n "v${RELEASE_VERSION}" > ./artifacts/BUILD_RELEASE_VERSION
-
-build-test-collators:
-  stage: build
-  # this is an artificial job dependency, for pipeline optimization using GitLab's DAGs
-  # the job can be found in check.yml
-  needs:
-    - job: job-starter
-      artifacts: false
-  extends:
-    - .docker-env
-    - .common-refs
-    - .compiler-info
-    - .collect-artifacts
-  script:
-    - time cargo build --locked --profile testnet --verbose -p test-parachain-adder-collator
-    - time cargo build --locked --profile testnet --verbose -p test-parachain-undying-collator
-    # pack artifacts
-    - mkdir -p ./artifacts
-    - mv ./target/testnet/adder-collator ./artifacts/.
-    - mv ./target/testnet/undying-collator ./artifacts/.
-    - echo -n "${CI_COMMIT_REF_NAME}" > ./artifacts/VERSION
-    - echo -n "${CI_COMMIT_REF_NAME}-${CI_COMMIT_SHORT_SHA}" > ./artifacts/EXTRATAG
-    - echo "adder-collator version = $(cat ./artifacts/VERSION) (EXTRATAG = $(cat ./artifacts/EXTRATAG))"
-    - echo "undying-collator version = $(cat ./artifacts/VERSION) (EXTRATAG = $(cat ./artifacts/EXTRATAG))"
-
-build-malus:
-  stage: build
-  # this is an artificial job dependency, for pipeline optimization using GitLab's DAGs
-  # the job can be found in check.yml
-  needs:
-    - job: job-starter
-      artifacts: false
-  extends:
-    - .docker-env
-    - .common-refs
-    - .compiler-info
-    - .collect-artifacts
-  script:
-    - time cargo build --locked --profile testnet --verbose -p polkadot-test-malus
-    # pack artifacts
-    - mkdir -p ./artifacts
-    - mv ./target/testnet/malus ./artifacts/.
-    - mv ./target/testnet/polkadot-execute-worker ./artifacts/.
-    - mv ./target/testnet/polkadot-prepare-worker ./artifacts/.
-    - echo -n "${CI_COMMIT_REF_NAME}" > ./artifacts/VERSION
-    - echo -n "${CI_COMMIT_REF_NAME}-${CI_COMMIT_SHORT_SHA}" > ./artifacts/EXTRATAG
-    - echo "polkadot-test-malus = $(cat ./artifacts/VERSION) (EXTRATAG = $(cat ./artifacts/EXTRATAG))"
-
-build-staking-miner:
-  stage: build
-  # this is an artificial job dependency, for pipeline optimization using GitLab's DAGs
-  # the job can be found in check.yml
-  needs:
-    - job: job-starter
-      artifacts: false
-  extends:
-    - .docker-env
-    - .common-refs
-    - .compiler-info
-    - .collect-artifacts
-  script:
-    - time cargo build --locked --release --package staking-miner
-    # pack artifacts
-    - mkdir -p ./artifacts
-    - mv ./target/release/staking-miner ./artifacts/.
-    - echo -n "${CI_COMMIT_REF_NAME}" > ./artifacts/VERSION
-    - echo -n "${CI_COMMIT_REF_NAME}-${CI_COMMIT_SHORT_SHA}" > ./artifacts/EXTRATAG
-    - echo "staking-miner = $(cat ./artifacts/VERSION) (EXTRATAG = $(cat ./artifacts/EXTRATAG))"
-
-build-rustdoc:
-  stage: build
-  # this is an artificial job dependency, for pipeline optimization using GitLab's DAGs
-  # the job can be found in test.yml
-  needs:
-    - job: test-deterministic-wasm
-      artifacts: false
-  extends:
-    - .docker-env
-    - .test-refs
-  variables:
-    SKIP_WASM_BUILD: 1
-  artifacts:
-    name: "${CI_JOB_NAME}_${CI_COMMIT_REF_NAME}-doc"
-    when: on_success
-    expire_in: 1 days
-    paths:
-      - ./crate-docs/
-  script:
-    # FIXME: it fails with `RUSTDOCFLAGS="-Dwarnings"` and `--all-features`
-    # FIXME: return to stable when https://github.com/rust-lang/rust/issues/96937 gets into stable
-    - time cargo doc --workspace --verbose --no-deps
-    - rm -f ./target/doc/.lock
-    - mv ./target/doc ./crate-docs
-    # FIXME: remove me after CI image gets nonroot
-    - chown -R nonroot:nonroot ./crate-docs
-    - echo "<meta http-equiv=refresh content=0;url=polkadot_service/index.html>" > ./crate-docs/index.html
-
-build-implementers-guide:
-  stage: build
-  # this is an artificial job dependency, for pipeline optimization using GitLab's DAGs
-  # the job can be found in test.yml
-  needs:
-    - job: test-deterministic-wasm
-      artifacts: false
-  extends:
-    - .kubernetes-env
-    - .test-refs
-    - .collect-artifacts-short
-  # git depth is set on purpose: https://github.com/paritytech/polkadot/issues/6284
-  variables:
-    GIT_STRATEGY: clone
-    GIT_DEPTH: 0
-    CI_IMAGE: paritytech/mdbook-utils:e14aae4a-20221123
-  script:
-    - mdbook build ./roadmap/implementers-guide
-    - mkdir -p artifacts
-    - mv roadmap/implementers-guide/book artifacts/
-
-build-short-benchmark:
-  stage: build
-  # this is an artificial job dependency, for pipeline optimization using GitLab's DAGs
-  # the job can be found in check.yml
-  needs:
-    - job: job-starter
-      artifacts: false
-  extends:
-    - .docker-env
-    - .test-refs
-    - .collect-artifacts
-  script:
-    - cargo build --profile release --locked --features=runtime-benchmarks
-    - mkdir artifacts
-    - cp ./target/release/polkadot ./artifacts/
diff --git a/polkadot/scripts/ci/gitlab/pipeline/check.yml b/polkadot/scripts/ci/gitlab/pipeline/check.yml
deleted file mode 100644
index 9b2ad5e738332aba11b27b825439fccd9db82bc3..0000000000000000000000000000000000000000
--- a/polkadot/scripts/ci/gitlab/pipeline/check.yml
+++ /dev/null
@@ -1,136 +0,0 @@
-# This file is part of .gitlab-ci.yml
-# Here are all jobs that are executed during "check" stage
-
-check-runtime:
-  stage: check
-  image: paritytech/tools:latest
-  extends:
-    - .kubernetes-env
-  rules:
-    - if: $CI_COMMIT_REF_NAME =~ /^release-v[0-9]+\.[0-9]+.*$/ # i.e. release-v0.9.27
-  variables:
-    GITLAB_API: "https://gitlab.parity.io/api/v4"
-    GITHUB_API_PROJECT: "parity%2Finfrastructure%2Fgithub-api"
-  script:
-    - ./scripts/ci/gitlab/check_runtime.sh
-  allow_failure: true
-
-cargo-fmt:
-  stage: check
-  extends:
-    - .docker-env
-    - .test-refs
-  script:
-    - cargo +nightly --version
-    - cargo +nightly fmt --all -- --check
-  allow_failure: true
-
-# Disabled in https://github.com/paritytech/polkadot/pull/7512
-.spellcheck_disabled:
-  stage: check
-  extends:
-    - .docker-env
-    - .test-refs
-  script:
-    - cargo spellcheck --version
-    # compare with the commit parent to the PR, given it's from a default branch
-    - git fetch origin +${CI_DEFAULT_BRANCH}:${CI_DEFAULT_BRANCH}
-    - echo "___Spellcheck is going to check your diff___"
-    - cargo spellcheck list-files -vvv $(git diff --diff-filter=AM --name-only $(git merge-base ${CI_COMMIT_SHA} ${CI_DEFAULT_BRANCH} -- :^bridges))
-    - time cargo spellcheck check -vvv --cfg=scripts/ci/gitlab/spellcheck.toml --checkers hunspell --code 1
-      $(git diff --diff-filter=AM --name-only $(git merge-base ${CI_COMMIT_SHA} ${CI_DEFAULT_BRANCH} -- :^bridges))
-  allow_failure: true
-
-check-try-runtime:
-  stage: check
-  extends:
-    - .docker-env
-    - .test-refs
-    - .compiler-info
-  script:
-    # Check that everything compiles with `try-runtime` feature flag.
-    - cargo check --locked --features try-runtime --all
-
-# More info can be found here: https://github.com/paritytech/polkadot/pull/5865
-.check-runtime-migration:
-  stage: check
-  extends:
-    - .docker-env
-    - .test-pr-refs
-    - .compiler-info
-  script:
-    - |
-      export RUST_LOG=remote-ext=debug,runtime=debug
-      echo "---------- Running try-runtime for ${NETWORK} ----------"
-      time cargo install --locked --git https://github.com/paritytech/try-runtime-cli --rev a93c9b5abe5d31a4cf1936204f7e5c489184b521
-      time cargo build --release --locked -p "$NETWORK"-runtime --features try-runtime
-      time try-runtime \
-          --runtime ./target/release/wbuild/"$NETWORK"-runtime/target/wasm32-unknown-unknown/release/"$NETWORK"_runtime.wasm \
-          on-runtime-upgrade --checks=pre-and-post live --uri wss://${NETWORK}-try-runtime-node.parity-chains.parity.io:443
-
-check-runtime-migration-polkadot:
-  stage: check
-  extends:
-    - .docker-env
-    - .test-pr-refs
-    - .compiler-info
-    - .check-runtime-migration
-  variables:
-    NETWORK: "polkadot"
-  allow_failure: true # FIXME https://github.com/paritytech/substrate/issues/13107
-
-check-runtime-migration-kusama:
-  stage: check
-  extends:
-    - .docker-env
-    - .test-pr-refs
-    - .compiler-info
-    - .check-runtime-migration
-  variables:
-    NETWORK: "kusama"
-  allow_failure: true # FIXME https://github.com/paritytech/substrate/issues/13107
-
-check-runtime-migration-westend:
-  stage: check
-  extends:
-    - .docker-env
-    - .test-pr-refs
-    - .compiler-info
-    - .check-runtime-migration
-  variables:
-    NETWORK: "westend"
-  allow_failure: true # FIXME https://github.com/paritytech/substrate/issues/13107
-
-check-runtime-migration-rococo:
-  stage: check
-  extends:
-    - .docker-env
-    - .test-pr-refs
-    - .compiler-info
-    - .check-runtime-migration
-  variables:
-    NETWORK: "rococo"
-  allow_failure: true # FIXME https://github.com/paritytech/substrate/issues/13107
-
-# is broken, need to fix
-check-no-default-features:
-  stage: check
-  extends:
-    - .docker-env
-    - .test-refs
-    - .compiler-info
-  script:
-    # Check that polkadot-cli will compile no default features.
-    - pushd ./node/service && cargo check --locked --no-default-features && popd
-    - pushd ./cli && cargo check --locked --no-default-features --features "service" && popd
-    - exit 0
-
-# this is artificial job to run some build and tests using DAG
-job-starter:
-  stage: check
-  image: paritytech/tools:latest
-  extends:
-    - .kubernetes-env
-    - .common-refs
-  script:
-    - echo ok
diff --git a/polkadot/scripts/ci/gitlab/pipeline/publish.yml b/polkadot/scripts/ci/gitlab/pipeline/publish.yml
deleted file mode 100644
index c224094125e375e527b11557b4e584a75c2ea44d..0000000000000000000000000000000000000000
--- a/polkadot/scripts/ci/gitlab/pipeline/publish.yml
+++ /dev/null
@@ -1,276 +0,0 @@
-# This file is part of .gitlab-ci.yml
-# Here are all jobs that are executed during "publish" stage
-
-# This image is used in testnets
-# Release image is handled by the Github Action here:
-# .github/workflows/publish-docker-release.yml
-publish-polkadot-debug-image:
-  stage: publish
-  extends:
-    - .kubernetes-env
-    - .build-push-image
-  rules:
-    # Don't run when triggered from another pipeline
-    - if: $CI_PIPELINE_SOURCE == "pipeline"
-      when: never
-    - if: $CI_PIPELINE_SOURCE == "web"
-    - if: $CI_PIPELINE_SOURCE == "schedule"
-    - if: $CI_COMMIT_REF_NAME == "master"
-    - if: $CI_COMMIT_REF_NAME =~ /^[0-9]+$/ # PRs
-    - if: $CI_COMMIT_REF_NAME =~ /^v[0-9]+\.[0-9]+.*$/ # i.e. v1.0, v2.1rc1
-  variables:
-    IMAGE_NAME: "polkadot-debug"
-    BINARY: "polkadot,polkadot-execute-worker,polkadot-prepare-worker"
-  needs:
-    - job: build-linux-stable
-      artifacts: true
-  after_script:
-    - !reference [.build-push-image, after_script]
-    # pass artifacts to the zombienet-tests job
-    # https://docs.gitlab.com/ee/ci/multi_project_pipelines.html#with-variable-inheritance
-    - echo "PARACHAINS_IMAGE_NAME=${IMAGE}" > ./artifacts/parachains.env
-    - echo "PARACHAINS_IMAGE_TAG=$(cat ./artifacts/EXTRATAG)" >> ./artifacts/parachains.env
-  artifacts:
-    reports:
-      # this artifact is used in zombienet-tests job
-      dotenv: ./artifacts/parachains.env
-    expire_in: 1 days
-
-publish-test-collators-image:
-  # service image for Simnet
-  stage: publish
-  extends:
-    - .kubernetes-env
-    - .build-push-image
-    - .zombienet-refs
-  variables:
-    IMAGE_NAME: "colander"
-    BINARY: "adder-collator,undying-collator"
-  needs:
-    - job: build-test-collators
-      artifacts: true
-  after_script:
-    - !reference [.build-push-image, after_script]
-    # pass artifacts to the zombienet-tests job
-    - echo "COLLATOR_IMAGE_NAME=${IMAGE}" > ./artifacts/collator.env
-    - echo "COLLATOR_IMAGE_TAG=$(cat ./artifacts/EXTRATAG)" >> ./artifacts/collator.env
-  artifacts:
-    reports:
-      # this artifact is used in zombienet-tests job
-      dotenv: ./artifacts/collator.env
-
-publish-malus-image:
-  # service image for Simnet
-  stage: publish
-  extends:
-    - .kubernetes-env
-    - .build-push-image
-    - .zombienet-refs
-  variables:
-    IMAGE_NAME: "malus"
-    BINARY: "malus,polkadot-execute-worker,polkadot-prepare-worker"
-  needs:
-    - job: build-malus
-      artifacts: true
-  after_script:
-    - !reference [.build-push-image, after_script]
-    # pass artifacts to the zombienet-tests job
-    - echo "MALUS_IMAGE_NAME=${IMAGE}" > ./artifacts/malus.env
-    - echo "MALUS_IMAGE_TAG=$(cat ./artifacts/EXTRATAG)" >> ./artifacts/malus.env
-  artifacts:
-    reports:
-      # this artifact is used in zombienet-tests job
-      dotenv: ./artifacts/malus.env
-
-publish-staking-miner-image:
-  stage: publish
-  extends:
-    - .kubernetes-env
-    - .build-push-image
-    - .publish-refs
-  variables:
-    IMAGE_NAME: "staking-miner"
-    BINARY: "staking-miner"
-    DOCKER_OWNER: "paritytech"
-    DOCKER_USER: "${Docker_Hub_User_Parity}"
-    DOCKER_PASS: "${Docker_Hub_Pass_Parity}"
-  needs:
-    - job: build-staking-miner
-      artifacts: true
-
-publish-polkadot-image-description:
-  stage: publish
-  image: paritytech/dockerhub-description
-  variables:
-    DOCKER_USERNAME: ${Docker_Hub_User_Parity}
-    DOCKER_PASSWORD: ${Docker_Hub_Pass_Parity}
-    DOCKERHUB_REPOSITORY: parity/polkadot
-    SHORT_DESCRIPTION: "Polkadot Official Docker Image"
-    README_FILEPATH: $CI_PROJECT_DIR/scripts/ci/dockerfiles/polkadot/polkadot_Dockerfile.README.md
-  rules:
-    - if: $CI_COMMIT_REF_NAME == "master"
-      changes:
-        - scripts/ci/dockerfiles/polkadot/polkadot_Dockerfile.README.md
-    - if: $CI_PIPELINE_SOURCE == "schedule"
-      when: never
-  script:
-    - cd / && sh entrypoint.sh
-  tags:
-    - kubernetes-parity-build
-
-publish-staking-miner-image-description:
-  stage: publish
-  image: paritytech/dockerhub-description
-  variables:
-    DOCKER_USERNAME: ${Docker_Hub_User_Parity}
-    DOCKER_PASSWORD: ${Docker_Hub_Pass_Parity}
-    DOCKERHUB_REPOSITORY: paritytech/staking-miner
-    SHORT_DESCRIPTION: "Staking-miner Docker Image"
-    README_FILEPATH: $CI_PROJECT_DIR/scripts/ci/dockerfiles/staking-miner/staking-miner_Dockerfile.README.md
-  rules:
-    - if: $CI_COMMIT_REF_NAME == "master"
-      changes:
-        - scripts/ci/dockerfiles/staking-miner/staking-miner_Dockerfile.README.md
-    - if: $CI_PIPELINE_SOURCE == "schedule"
-      when: never
-  script:
-    - cd / && sh entrypoint.sh
-  tags:
-    - kubernetes-parity-build
-
-publish-s3-release:
-  stage: publish
-  extends:
-    - .kubernetes-env
-  needs:
-    - job: build-linux-stable
-      artifacts: true
-  variables:
-    CI_IMAGE: paritytech/awscli:latest
-    GIT_STRATEGY: none
-    PREFIX: "builds/polkadot/${ARCH}-${DOCKER_OS}"
-  rules:
-    - if: $CI_PIPELINE_SOURCE == "pipeline"
-      when: never
-    # publishing binaries nightly
-    - if: $CI_PIPELINE_SOURCE == "schedule"
-  before_script:
-    - !reference [.build-push-image, before_script]
-  script:
-    - echo "uploading objects to https://releases.parity.io/${PREFIX}/${VERSION}"
-    - aws s3 sync --acl public-read ./artifacts/ s3://${AWS_BUCKET}/${PREFIX}/${VERSION}/
-    - echo "update objects at https://releases.parity.io/${PREFIX}/${EXTRATAG}"
-    - find ./artifacts -type f | while read file; do
-      name="${file#./artifacts/}";
-      aws s3api copy-object
-      --copy-source ${AWS_BUCKET}/${PREFIX}/${VERSION}/${name}
-      --bucket ${AWS_BUCKET} --key ${PREFIX}/${EXTRATAG}/${name};
-      done
-    - |
-      cat <<-EOM
-      |
-      |  polkadot binary paths:
-      |
-      |  - https://releases.parity.io/${PREFIX}/${EXTRATAG}/polkadot
-      |  - https://releases.parity.io/${PREFIX}/${VERSION}/polkadot
-      |
-      EOM
-  after_script:
-    - aws s3 ls s3://${AWS_BUCKET}/${PREFIX}/${EXTRATAG}/
-      --recursive --human-readable --summarize
-
-publish-rustdoc:
-  stage: publish
-  extends:
-    - .kubernetes-env
-  variables:
-    CI_IMAGE: paritytech/tools:latest
-  rules:
-    - if: $CI_PIPELINE_SOURCE == "pipeline"
-      when: never
-    - if: $CI_PIPELINE_SOURCE == "web" && $CI_COMMIT_REF_NAME == "master"
-    - if: $CI_COMMIT_REF_NAME == "master"
-  # `needs:` can be removed after CI image gets nonroot. In this case `needs:` stops other
-  # artifacts from being dowloaded by this job.
-  needs:
-    - job: build-rustdoc
-      artifacts: true
-    - job: build-implementers-guide
-      artifacts: true
-  script:
-    # Save README and docs
-    - cp -r ./crate-docs/ /tmp/doc/
-    - cp -r ./artifacts/book/ /tmp/
-    # setup ssh
-    - eval $(ssh-agent)
-    - ssh-add - <<< ${GITHUB_SSH_PRIV_KEY}
-    - mkdir ~/.ssh && touch ~/.ssh/known_hosts
-    - ssh-keyscan -t rsa github.com >> ~/.ssh/known_hosts
-    # Set git config
-    - git config user.email "devops-team@parity.io"
-    - git config user.name "${GITHUB_USER}"
-    - git config remote.origin.url "git@github.com:/paritytech/${CI_PROJECT_NAME}.git"
-    - git config remote.origin.fetch "+refs/heads/*:refs/remotes/origin/*"
-    - git fetch origin gh-pages
-    - git checkout gh-pages
-    # Remove everything and restore generated docs and README
-    - cp index.html /tmp
-    - cp README.md /tmp
-    - rm -rf ./*
-    # dir for rustdoc
-    - mkdir -p doc
-    # dir for implementors guide
-    - mkdir -p book
-    - mv /tmp/doc/* doc/
-    - mv /tmp/book/html/* book/
-    - mv /tmp/index.html .
-    - mv /tmp/README.md .
-    # Upload files
-    - git add --all --force
-    # `git commit` has an exit code of > 0 if there is nothing to commit.
-    # This causes GitLab to exit immediately and marks this job failed.
-    # We don't want to mark the entire job failed if there's nothing to
-    # publish though, hence the `|| true`.
-    - git commit -m "Updated docs for ${CI_COMMIT_REF_NAME}" ||
-      echo "___Nothing to commit___"
-    - git push origin gh-pages --force
-    - echo "___Rustdoc was successfully published to https://paritytech.github.io/polkadot/___"
-  after_script:
-    - rm -rf .git/ ./*
-
-.update-substrate-template-repository:
-  stage: publish
-  extends: .kubernetes-env
-  variables:
-    GIT_STRATEGY: none
-  rules:
-    # The template is only updated for FINAL releases
-    # i.e. the rule should not cover RC or patch releases
-    - if: $CI_COMMIT_TAG =~ /^v[0-9]+\.[0-9]+$/ # e.g. v1.0
-    - if: $CI_COMMIT_TAG =~ /^v[0-9]+\.[0-9]+\.[0-9]+$/ # e.g. v1.0.0
-  script:
-    - git clone --depth=1 --branch="$PIPELINE_SCRIPTS_TAG" https://github.com/paritytech/pipeline-scripts
-    - export POLKADOT_BRANCH="polkadot-$CI_COMMIT_TAG"
-    - git clone --depth=1 --branch="$POLKADOT_BRANCH" https://github.com/paritytech/"$TEMPLATE_SOURCE"
-    - cd "$TEMPLATE_SOURCE"
-    - ../pipeline-scripts/update_substrate_template.sh
-      --repo-name "$TARGET_REPOSITORY"
-      --template-path "$TEMPLATE_PATH"
-      --github-api-token "$GITHUB_TOKEN"
-      --polkadot-branch "$POLKADOT_BRANCH"
-
-# Ref: https://github.com/paritytech/opstooling/issues/111
-update-node-template:
-  extends: .update-substrate-template-repository
-  variables:
-    TARGET_REPOSITORY: substrate-node-template
-    TEMPLATE_SOURCE: substrate
-    TEMPLATE_PATH: bin/node-template
-
-# Ref: https://github.com/paritytech/opstooling/issues/111
-update-parachain-template:
-  extends: .update-substrate-template-repository
-  variables:
-    TARGET_REPOSITORY: substrate-parachain-template
-    TEMPLATE_SOURCE: cumulus
-    TEMPLATE_PATH: parachain-template
diff --git a/polkadot/scripts/ci/gitlab/pipeline/short-benchmarks.yml b/polkadot/scripts/ci/gitlab/pipeline/short-benchmarks.yml
deleted file mode 100644
index dd150e5916e263c74e1d6bf98872142705800982..0000000000000000000000000000000000000000
--- a/polkadot/scripts/ci/gitlab/pipeline/short-benchmarks.yml
+++ /dev/null
@@ -1,27 +0,0 @@
-# This file is part of .gitlab-ci.yml
-# Here are all jobs that are executed during "short-benchmarks" stage
-
-# Run all pallet benchmarks only once to check if there are any errors
-short-benchmark-polkadot: &short-bench
-  stage: short-benchmarks
-  extends:
-    - .test-pr-refs
-    - .docker-env
-  # this is an artificial job dependency, for pipeline optimization using GitLab's DAGs
-  needs:
-    - job: build-short-benchmark
-      artifacts: true
-  variables:
-    RUNTIME: polkadot
-  script:
-    - ./artifacts/polkadot benchmark pallet --wasm-execution compiled --chain $RUNTIME-dev --pallet "*" --extrinsic "*" --steps 2 --repeat 1
-
-short-benchmark-kusama:
-  <<: *short-bench
-  variables:
-    RUNTIME: kusama
-
-short-benchmark-westend:
-  <<: *short-bench
-  variables:
-    RUNTIME: westend
diff --git a/polkadot/scripts/ci/gitlab/pipeline/test.yml b/polkadot/scripts/ci/gitlab/pipeline/test.yml
deleted file mode 100644
index 963df0aa03031daef11fce665694cd5866d05c86..0000000000000000000000000000000000000000
--- a/polkadot/scripts/ci/gitlab/pipeline/test.yml
+++ /dev/null
@@ -1,119 +0,0 @@
-# This file is part of .gitlab-ci.yml
-# Here are all jobs that are executed during "test" stage
-
-# It's more like a check and it belongs to the previous stage, but we want to run this job with real tests in parallel
-find-fail-ci-phrase:
-  stage: test
-  variables:
-    CI_IMAGE: "paritytech/tools:latest"
-    ASSERT_REGEX: "FAIL-CI"
-    GIT_DEPTH: 1
-  extends:
-    - .kubernetes-env
-  script:
-    - set +e
-    - rg --line-number --hidden --type rust --glob '!{.git,target}' "$ASSERT_REGEX" .; exit_status=$?
-    - if [ $exit_status -eq 0 ]; then
-      echo "$ASSERT_REGEX was found, exiting with 1";
-      exit 1;
-      else
-      echo "No $ASSERT_REGEX was found, exiting with 0";
-      exit 0;
-      fi
-
-test-linux-stable:
-  stage: test
-  # this is an artificial job dependency, for pipeline optimization using GitLab's DAGs
-  # the job can be found in check.yml
-  needs:
-    - job: job-starter
-      artifacts: false
-  extends:
-    - .docker-env
-    - .common-refs
-    - .pipeline-stopper-artifacts
-  before_script:
-    - !reference [.compiler-info, before_script]
-    - !reference [.pipeline-stopper-vars, before_script]
-  variables:
-    RUST_TOOLCHAIN: stable
-    # Enable debug assertions since we are running optimized builds for testing
-    # but still want to have debug assertions.
-    RUSTFLAGS: "-Cdebug-assertions=y -Dwarnings"
-  script:
-    - time cargo test --workspace --profile testnet --verbose --locked --features=runtime-benchmarks,runtime-metrics,try-runtime,ci-only-tests
-    # Run `polkadot-runtime-parachains` tests a second time because `paras_inherent::enter` tests are gated by not having
-    # the `runtime-benchmarks` feature enabled.
-    - time cargo test --profile testnet --verbose --locked --features=runtime-metrics,try-runtime -p polkadot-runtime-parachains
-
-test-linux-oldkernel-stable:
-  extends: test-linux-stable
-  tags:
-    - oldkernel-vm
-
-.check-dependent-project: &check-dependent-project
-  stage: test
-  extends:
-    - .docker-env
-    - .test-pr-refs
-  script:
-    - git clone
-      --depth=1
-      "--branch=$PIPELINE_SCRIPTS_TAG"
-      https://github.com/paritytech/pipeline-scripts
-    - ./pipeline-scripts/check_dependent_project.sh
-      --org paritytech
-      --dependent-repo "$DEPENDENT_REPO"
-      --github-api-token "$GITHUB_PR_TOKEN"
-      --extra-dependencies "$EXTRA_DEPENDENCIES"
-      --companion-overrides "$COMPANION_OVERRIDES"
-
-check-dependent-cumulus:
-  <<: *check-dependent-project
-  variables:
-    DEPENDENT_REPO: cumulus
-    EXTRA_DEPENDENCIES: substrate
-    COMPANION_OVERRIDES: |
-      polkadot: release-v*
-      cumulus: polkadot-v*
-
-test-node-metrics:
-  stage: test
-  extends:
-    - .docker-env
-    - .test-refs
-    - .compiler-info
-  variables:
-    RUST_TOOLCHAIN: stable
-    # Enable debug assertions since we are running optimized builds for testing
-    # but still want to have debug assertions.
-    RUSTFLAGS: "-Cdebug-assertions=y -Dwarnings"
-  script:
-    # Build the required workers.
-    - cargo build --bin polkadot-execute-worker --bin polkadot-prepare-worker --profile testnet --verbose --locked
-    # Run tests.
-    - time cargo test  --profile testnet --verbose --locked --features=runtime-metrics -p polkadot-node-metrics
-
-test-deterministic-wasm:
-  stage: test
-  extends:
-    - .docker-env
-    - .test-refs
-    - .compiler-info
-  script:
-    - ./scripts/ci/gitlab/test_deterministic_wasm.sh
-
-cargo-clippy:
-  stage: test
-  # this is an artificial job dependency, for pipeline optimization using GitLab's DAGs
-  # the job can be found in check.yml
-  needs:
-    - job: job-starter
-      artifacts: false
-  extends:
-    - .docker-env
-    - .test-refs
-  script:
-    - echo $RUSTFLAGS
-    - cargo version && cargo clippy --version
-    - SKIP_WASM_BUILD=1 env -u RUSTFLAGS cargo clippy -q --locked --all-targets --workspace
diff --git a/polkadot/scripts/ci/gitlab/pipeline/weights.yml b/polkadot/scripts/ci/gitlab/pipeline/weights.yml
deleted file mode 100644
index edca9e769b4338a20d7099f8bc4a9bb839883286..0000000000000000000000000000000000000000
--- a/polkadot/scripts/ci/gitlab/pipeline/weights.yml
+++ /dev/null
@@ -1,39 +0,0 @@
-# This file is part of .gitlab-ci.yml
-# Here are all jobs that are executed during "weights" stage
-
-update_polkadot_weights: &update-weights
-  # The update-weights pipeline defaults to `interruptible: false` so that we'll be able to
-  # reach and run the benchmarking jobs despite the "Auto-cancel redundant pipelines" CI setting.
-  # The setting is relevant because future pipelines (e.g. created for new commits or other schedules)
-  # might otherwise cancel the benchmark jobs early.
-  interruptible: false
-  stage: weights
-  timeout: 1d
-  when: manual
-  image: $CI_IMAGE
-  variables:
-    RUNTIME: polkadot
-  artifacts:
-    paths:
-      - ${RUNTIME}_weights_${CI_COMMIT_SHORT_SHA}.patch
-  script:
-    - ./scripts/ci/run_benches_for_runtime.sh $RUNTIME
-    - git diff -P > ${RUNTIME}_weights_${CI_COMMIT_SHORT_SHA}.patch
-  # uses the "shell" executors
-  tags:
-    - weights
-
-update_kusama_weights:
-  <<: *update-weights
-  variables:
-    RUNTIME: kusama
-
-update_westend_weights:
-  <<: *update-weights
-  variables:
-    RUNTIME: westend
-
-update_rococo_weights:
-  <<: *update-weights
-  variables:
-    RUNTIME: rococo
diff --git a/polkadot/scripts/ci/gitlab/pipeline/zombienet.yml b/polkadot/scripts/ci/gitlab/pipeline/zombienet.yml
deleted file mode 100644
index 62e081d1de0e5f4b61f2c1dc34a2ab53a73f3fe7..0000000000000000000000000000000000000000
--- a/polkadot/scripts/ci/gitlab/pipeline/zombienet.yml
+++ /dev/null
@@ -1,444 +0,0 @@
-# This file is part of .gitlab-ci.yml
-# Here are all jobs that are executed during "zombienet" stage
-
-zombienet-tests-parachains-smoke-test:
-  stage: zombienet
-  image: "${ZOMBIENET_IMAGE}"
-  extends:
-    - .kubernetes-env
-    - .zombienet-refs
-  needs:
-    - job: publish-polkadot-debug-image
-    - job: publish-malus-image
-    - job: publish-test-collators-image
-  variables:
-    RUN_IN_CONTAINER: "1"
-    GH_DIR: "https://github.com/paritytech/polkadot/tree/${CI_COMMIT_SHORT_SHA}/zombienet_tests/smoke"
-  before_script:
-    - echo "Zombie-net Tests Config"
-    - echo "${ZOMBIENET_IMAGE}"
-    - echo "${PARACHAINS_IMAGE_NAME} ${PARACHAINS_IMAGE_TAG}"
-    - echo "${MALUS_IMAGE_NAME} ${MALUS_IMAGE_TAG}"
-    - echo "${GH_DIR}"
-    - export DEBUG=zombie,zombie::network-node
-    - export ZOMBIENET_INTEGRATION_TEST_IMAGE=${PARACHAINS_IMAGE_NAME}:${PARACHAINS_IMAGE_TAG}
-    - export MALUS_IMAGE=${MALUS_IMAGE_NAME}:${MALUS_IMAGE_TAG}
-    - export COL_IMAGE="docker.io/paritypr/colander:7292" # The collator image is fixed
-  script:
-    - /home/nonroot/zombie-net/scripts/ci/run-test-env-manager.sh
-      --github-remote-dir="${GH_DIR}"
-      --test="0001-parachains-smoke-test.zndsl"
-  allow_failure: false
-  retry: 2
-  tags:
-    - zombienet-polkadot-integration-test
-
-zombienet-tests-parachains-pvf:
-  stage: zombienet
-  image: "${ZOMBIENET_IMAGE}"
-  extends:
-    - .kubernetes-env
-    - .zombienet-refs
-  needs:
-    - job: publish-polkadot-debug-image
-    - job: publish-test-collators-image
-  variables:
-    RUN_IN_CONTAINER: "1"
-    GH_DIR: "https://github.com/paritytech/polkadot/tree/${CI_COMMIT_SHORT_SHA}/zombienet_tests/functional"
-  before_script:
-    - echo "Zombie-net Tests Config"
-    - echo "${ZOMBIENET_IMAGE}"
-    - echo "${PARACHAINS_IMAGE_NAME} ${PARACHAINS_IMAGE_TAG}"
-    - echo "COL_IMAGE=${COLLATOR_IMAGE_NAME}:${COLLATOR_IMAGE_TAG}"
-    - echo "${GH_DIR}"
-    - export DEBUG=zombie,zombie::network-node
-    - export ZOMBIENET_INTEGRATION_TEST_IMAGE=${PARACHAINS_IMAGE_NAME}:${PARACHAINS_IMAGE_TAG}
-    - export MALUS_IMAGE=${MALUS_IMAGE_NAME}:${MALUS_IMAGE_TAG}
-    - export COL_IMAGE=${COLLATOR_IMAGE_NAME}:${COLLATOR_IMAGE_TAG}
-  script:
-    - /home/nonroot/zombie-net/scripts/ci/run-test-env-manager.sh
-      --github-remote-dir="${GH_DIR}"
-      --test="0001-parachains-pvf.zndsl"
-  allow_failure: false
-  retry: 2
-  tags:
-    - zombienet-polkadot-integration-test
-
-zombienet-tests-parachains-disputes:
-  stage: zombienet
-  image: "${ZOMBIENET_IMAGE}"
-  extends:
-    - .kubernetes-env
-    - .zombienet-refs
-  needs:
-    - job: publish-polkadot-debug-image
-    - job: publish-test-collators-image
-    - job: publish-malus-image
-  variables:
-    RUN_IN_CONTAINER: "1"
-    GH_DIR: "https://github.com/paritytech/polkadot/tree/${CI_COMMIT_SHORT_SHA}/zombienet_tests/functional"
-  before_script:
-    - echo "Zombie-net Tests Config"
-    - echo "${ZOMBIENET_IMAGE_NAME}"
-    - echo "${PARACHAINS_IMAGE_NAME} ${PARACHAINS_IMAGE_TAG}"
-    - echo "${MALUS_IMAGE_NAME} ${MALUS_IMAGE_TAG}"
-    - echo "${GH_DIR}"
-    - export DEBUG=zombie,zombie::network-node
-    - export ZOMBIENET_INTEGRATION_TEST_IMAGE=${PARACHAINS_IMAGE_NAME}:${PARACHAINS_IMAGE_TAG}
-    - export MALUS_IMAGE=${MALUS_IMAGE_NAME}:${MALUS_IMAGE_TAG}
-    - export COL_IMAGE=${COLLATOR_IMAGE_NAME}:${COLLATOR_IMAGE_TAG}
-  script:
-    - /home/nonroot/zombie-net/scripts/ci/run-test-env-manager.sh
-      --github-remote-dir="${GH_DIR}"
-      --test="0002-parachains-disputes.zndsl"
-  allow_failure: false
-  retry: 2
-  tags:
-    - zombienet-polkadot-integration-test
-
-zombienet-tests-parachains-disputes-garbage-candidate:
-  stage: zombienet
-  image: "${ZOMBIENET_IMAGE}"
-  extends:
-    - .kubernetes-env
-    - .zombienet-refs
-  needs:
-    - job: publish-polkadot-debug-image
-    - job: publish-test-collators-image
-    - job: publish-malus-image
-  variables:
-    RUN_IN_CONTAINER: "1"
-    GH_DIR: "https://github.com/paritytech/polkadot/tree/${CI_COMMIT_SHORT_SHA}/zombienet_tests/functional"
-  before_script:
-    - echo "Zombie-net Tests Config"
-    - echo "${ZOMBIENET_IMAGE_NAME}"
-    - echo "${PARACHAINS_IMAGE_NAME} ${PARACHAINS_IMAGE_TAG}"
-    - echo "${MALUS_IMAGE_NAME} ${MALUS_IMAGE_TAG}"
-    - echo "${GH_DIR}"
-    - export DEBUG=zombie,zombie::network-node
-    - export ZOMBIENET_INTEGRATION_TEST_IMAGE=${PARACHAINS_IMAGE_NAME}:${PARACHAINS_IMAGE_TAG}
-    - export MALUS_IMAGE=${MALUS_IMAGE_NAME}:${MALUS_IMAGE_TAG}
-    - export COL_IMAGE=${COLLATOR_IMAGE_NAME}:${COLLATOR_IMAGE_TAG}
-  script:
-    - /home/nonroot/zombie-net/scripts/ci/run-test-env-manager.sh
-      --github-remote-dir="${GH_DIR}"
-      --test="0003-parachains-garbage-candidate.zndsl"
-  allow_failure: false
-  retry: 2
-  tags:
-    - zombienet-polkadot-integration-test
-
-zombienet-tests-parachains-disputes-past-session:
-  stage: zombienet
-  image: "${ZOMBIENET_IMAGE}"
-  extends:
-    - .kubernetes-env
-    - .zombienet-refs
-  needs:
-    - job: publish-polkadot-debug-image
-    - job: publish-test-collators-image
-    - job: publish-malus-image
-  variables:
-    RUN_IN_CONTAINER: "1"
-    GH_DIR: "https://github.com/paritytech/polkadot/tree/${CI_COMMIT_SHORT_SHA}/zombienet_tests/functional"
-  before_script:
-    - echo "Zombie-net Tests Config"
-    - echo "${ZOMBIENET_IMAGE_NAME}"
-    - echo "${PARACHAINS_IMAGE_NAME} ${PARACHAINS_IMAGE_TAG}"
-    - echo "${MALUS_IMAGE_NAME} ${MALUS_IMAGE_TAG}"
-    - echo "${GH_DIR}"
-    - export DEBUG=zombie,zombie::network-node
-    - export ZOMBIENET_INTEGRATION_TEST_IMAGE=${PARACHAINS_IMAGE_NAME}:${PARACHAINS_IMAGE_TAG}
-    - export MALUS_IMAGE=${MALUS_IMAGE_NAME}:${MALUS_IMAGE_TAG}
-    - export COL_IMAGE=${COLLATOR_IMAGE_NAME}:${COLLATOR_IMAGE_TAG}
-  script:
-    - /home/nonroot/zombie-net/scripts/ci/run-test-env-manager.sh
-      --github-remote-dir="${GH_DIR}"
-      --test="0004-parachains-disputes-past-session.zndsl"
-  allow_failure: true
-  retry: 2
-  tags:
-    - zombienet-polkadot-integration-test
-
-
-zombienet-test-parachains-upgrade-smoke-test:
-  stage: zombienet
-  image: "${ZOMBIENET_IMAGE}"
-  extends:
-    - .kubernetes-env
-    - .zombienet-refs
-  needs:
-    - job: publish-polkadot-debug-image
-    - job: publish-malus-image
-    - job: publish-test-collators-image
-  variables:
-    RUN_IN_CONTAINER: "1"
-    GH_DIR: "https://github.com/paritytech/polkadot/tree/${CI_COMMIT_SHORT_SHA}/zombienet_tests/smoke"
-  before_script:
-    - echo "ZombieNet Tests Config"
-    - echo "${PARACHAINS_IMAGE_NAME}:${PARACHAINS_IMAGE_TAG}"
-    - echo "docker.io/parity/polkadot-collator:latest"
-    - echo "${ZOMBIENET_IMAGE}"
-    - echo "${GH_DIR}"
-    - export DEBUG=zombie,zombie::network-node
-    - export ZOMBIENET_INTEGRATION_TEST_IMAGE=${PARACHAINS_IMAGE_NAME}:${PARACHAINS_IMAGE_TAG}
-    - export COL_IMAGE="docker.io/parity/polkadot-collator:latest" # Use cumulus lastest image
-  script:
-    - /home/nonroot/zombie-net/scripts/ci/run-test-env-manager.sh
-      --github-remote-dir="${GH_DIR}"
-      --test="0002-parachains-upgrade-smoke-test.zndsl"
-  allow_failure: false
-  retry: 2
-  tags:
-    - zombienet-polkadot-integration-test
-
-zombienet-tests-misc-paritydb:
-  stage: zombienet
-  image: "${ZOMBIENET_IMAGE}"
-  extends:
-    - .kubernetes-env
-    - .zombienet-refs
-  needs:
-    - job: publish-polkadot-debug-image
-    - job: publish-test-collators-image
-      artifacts: true
-  variables:
-    RUN_IN_CONTAINER: "1"
-    GH_DIR: "https://github.com/paritytech/polkadot/tree/${CI_COMMIT_SHORT_SHA}/zombienet_tests/misc"
-  before_script:
-    - echo "Zombie-net Tests Config"
-    - echo "${ZOMBIENET_IMAGE_NAME}"
-    - echo "${PARACHAINS_IMAGE_NAME} ${PARACHAINS_IMAGE_TAG}"
-    - echo "${GH_DIR}"
-    - export DEBUG=zombie,zombie::network-node
-    - export ZOMBIENET_INTEGRATION_TEST_IMAGE=${PARACHAINS_IMAGE_NAME}:${PARACHAINS_IMAGE_TAG}
-    - export COL_IMAGE=${COLLATOR_IMAGE_NAME}:${COLLATOR_IMAGE_TAG}
-  script:
-    - /home/nonroot/zombie-net/scripts/ci/run-test-env-manager.sh
-      --github-remote-dir="${GH_DIR}"
-      --test="0001-paritydb.zndsl"
-  allow_failure: false
-  retry: 2
-  tags:
-    - zombienet-polkadot-integration-test
-
-zombienet-tests-misc-upgrade-node:
-   stage: zombienet
-   image: "${ZOMBIENET_IMAGE}"
-   extends:
-     - .kubernetes-env
-     - .zombienet-refs
-   needs:
-     - job: publish-polkadot-debug-image
-     - job: publish-test-collators-image
-     - job: build-linux-stable
-       artifacts: true
-   variables:
-    RUN_IN_CONTAINER: "1"
-    GH_DIR: "https://github.com/paritytech/polkadot/tree/${CI_COMMIT_SHORT_SHA}/zombienet_tests/misc"
-   before_script:
-     - echo "Zombie-net Tests Config"
-     - echo "${ZOMBIENET_IMAGE_NAME}"
-     - echo "${PARACHAINS_IMAGE_NAME} ${PARACHAINS_IMAGE_TAG}"
-     - echo "${GH_DIR}"
-     - export DEBUG=zombie,zombie::network-node
-     - export ZOMBIENET_INTEGRATION_TEST_IMAGE="docker.io/parity/polkadot:latest"
-     - export COL_IMAGE=${COLLATOR_IMAGE_NAME}:${COLLATOR_IMAGE_TAG}
-     - BUILD_LINUX_JOB_ID="$(cat ./artifacts/BUILD_LINUX_JOB_ID)"
-     - export POLKADOT_PR_ARTIFACTS_URL="https://gitlab.parity.io/parity/mirrors/polkadot/-/jobs/${BUILD_LINUX_JOB_ID}/artifacts/raw/artifacts"
-   script:
-     - /home/nonroot/zombie-net/scripts/ci/run-test-env-manager.sh
-       --github-remote-dir="${GH_DIR}"
-       --test="0002-upgrade-node.zndsl"
-   allow_failure: false
-   retry: 2
-   tags:
-     - zombienet-polkadot-integration-test
-
-zombienet-tests-malus-dispute-valid:
-  stage: zombienet
-  image: "${ZOMBIENET_IMAGE}"
-  extends:
-    - .kubernetes-env
-    - .zombienet-refs
-  needs:
-    - job: publish-polkadot-debug-image
-    - job: publish-malus-image
-    - job: publish-test-collators-image
-  variables:
-    RUN_IN_CONTAINER: "1"
-    GH_DIR: "https://github.com/paritytech/polkadot/tree/${CI_COMMIT_SHORT_SHA}/node/malus/integrationtests"
-  before_script:
-    - echo "Zombie-net Tests Config"
-    - echo "${ZOMBIENET_IMAGE_NAME}"
-    - echo "${PARACHAINS_IMAGE_NAME} ${PARACHAINS_IMAGE_TAG}"
-    - echo "${MALUS_IMAGE_NAME} ${MALUS_IMAGE_TAG}"
-    - echo "${GH_DIR}"
-    - export DEBUG=zombie*
-    - export ZOMBIENET_INTEGRATION_TEST_IMAGE=${PARACHAINS_IMAGE_NAME}:${PARACHAINS_IMAGE_TAG}
-    - export MALUS_IMAGE=${MALUS_IMAGE_NAME}:${MALUS_IMAGE_TAG}
-    - export COL_IMAGE=${COLLATOR_IMAGE_NAME}:${COLLATOR_IMAGE_TAG}
-  script:
-    - /home/nonroot/zombie-net/scripts/ci/run-test-env-manager.sh
-      --github-remote-dir="${GH_DIR}"
-      --test="0001-dispute-valid-block.zndsl"
-  allow_failure: false
-  retry: 2
-  tags:
-    - zombienet-polkadot-integration-test
-
-zombienet-tests-deregister-register-validator:
-  stage: zombienet
-  image: "${ZOMBIENET_IMAGE}"
-  extends:
-    - .kubernetes-env
-    - .zombienet-refs
-  needs:
-    - job: publish-polkadot-debug-image
-      artifacts: true
-  variables:
-    RUN_IN_CONTAINER: "1"
-    GH_DIR: "https://github.com/paritytech/polkadot/tree/${CI_COMMIT_SHORT_SHA}/zombienet_tests/smoke"
-  before_script:
-    - echo "Zombie-net Tests Config"
-    - echo "${ZOMBIENET_IMAGE_NAME}"
-    - echo "${PARACHAINS_IMAGE_NAME} ${PARACHAINS_IMAGE_TAG}"
-    - echo "${GH_DIR}"
-    - export DEBUG=zombie*
-    - export ZOMBIENET_INTEGRATION_TEST_IMAGE=${PARACHAINS_IMAGE_NAME}:${PARACHAINS_IMAGE_TAG}
-    - export MALUS_IMAGE=${MALUS_IMAGE_NAME}:${MALUS_IMAGE_TAG}
-  script:
-    - /home/nonroot/zombie-net/scripts/ci/run-test-env-manager.sh
-      --github-remote-dir="${GH_DIR}"
-      --test="0003-deregister-register-validator-smoke.zndsl"
-  allow_failure: false
-  retry: 2
-  tags:
-    - zombienet-polkadot-integration-test
-
-zombienet-tests-beefy-and-mmr:
-  stage: zombienet
-  image: "${ZOMBIENET_IMAGE}"
-  extends:
-    - .kubernetes-env
-    - .zombienet-refs
-  needs:
-    - job: publish-polkadot-debug-image
-  variables:
-    RUN_IN_CONTAINER: "1"
-    GH_DIR: "https://github.com/paritytech/polkadot/tree/${CI_COMMIT_SHORT_SHA}/zombienet_tests/functional"
-  before_script:
-    - echo "Zombie-net Tests Config"
-    - echo "${ZOMBIENET_IMAGE_NAME}"
-    - echo "${PARACHAINS_IMAGE_NAME} ${PARACHAINS_IMAGE_TAG}"
-    - echo "${GH_DIR}"
-    - export DEBUG=zombie*
-    - export ZOMBIENET_INTEGRATION_TEST_IMAGE=${PARACHAINS_IMAGE_NAME}:${PARACHAINS_IMAGE_TAG}
-  script:
-    - /home/nonroot/zombie-net/scripts/ci/run-test-env-manager.sh
-      --github-remote-dir="${GH_DIR}"
-      --test="0003-beefy-and-mmr.zndsl"
-  allow_failure: true
-  retry: 2
-  tags:
-    - zombienet-polkadot-integration-test
-
-zombienet-tests-async-backing-compatibility:
-  stage:                           zombienet
-  extends:
-    - .kubernetes-env
-    - .zombienet-refs
-  image:                           "${ZOMBIENET_IMAGE}"
-  needs:
-    - job:                         publish-polkadot-debug-image
-    - job:                         publish-test-collators-image
-    - job:                         build-linux-stable
-      artifacts:                   true
-  variables:
-    RUN_IN_CONTAINER: "1"
-    GH_DIR:                        "https://github.com/paritytech/polkadot/tree/${CI_COMMIT_SHORT_SHA}/zombienet_tests/async_backing"
-  before_script:
-    - echo "Zombie-net Tests Config"
-    - echo "${ZOMBIENET_IMAGE_NAME}"
-    - echo "${PARACHAINS_IMAGE_NAME} ${PARACHAINS_IMAGE_TAG}"
-    - echo "${GH_DIR}"
-    - export DEBUG=zombie,zombie::network-node
-    - BUILD_RELEASE_VERSION="$(cat ./artifacts/BUILD_RELEASE_VERSION)"
-    - export ZOMBIENET_INTEGRATION_TEST_IMAGE=${PARACHAINS_IMAGE_NAME}:${PARACHAINS_IMAGE_TAG}
-    - export ZOMBIENET_INTEGRATION_TEST_SECONDARY_IMAGE="docker.io/parity/polkadot:${BUILD_RELEASE_VERSION}"
-    - export COL_IMAGE=${COLLATOR_IMAGE_NAME}:${COLLATOR_IMAGE_TAG}
-  script:
-    - /home/nonroot/zombie-net/scripts/ci/run-test-env-manager.sh
-        --github-remote-dir="${GH_DIR}"
-        --test="001-async-backing-compatibility.zndsl"
-  allow_failure:                   false
-  retry: 2
-  tags:
-    - zombienet-polkadot-integration-test
-
-zombienet-tests-async-backing-runtime-upgrade:
-  stage:                             zombienet
-  extends:
-    - .kubernetes-env
-    - .zombienet-refs
-  image:                           "${ZOMBIENET_IMAGE}"
-  needs:
-    - job:                         publish-polkadot-debug-image
-    - job:                         publish-test-collators-image
-    - job:                         build-linux-stable
-      artifacts:                   true
-  variables:
-    RUN_IN_CONTAINER: "1"
-    GH_DIR:                        "https://github.com/paritytech/polkadot/tree/${CI_COMMIT_SHORT_SHA}/zombienet_tests/async_backing"
-  before_script:
-    - echo "Zombie-net Tests Config"
-    - echo "${ZOMBIENET_IMAGE_NAME}"
-    - echo "${PARACHAINS_IMAGE_NAME} ${PARACHAINS_IMAGE_TAG}"
-    - echo "${GH_DIR}"
-    - export DEBUG=zombie,zombie::network-node
-    - BUILD_RELEASE_VERSION="$(cat ./artifacts/BUILD_RELEASE_VERSION)"
-    - export ZOMBIENET_INTEGRATION_TEST_IMAGE=${PARACHAINS_IMAGE_NAME}:${PARACHAINS_IMAGE_TAG}
-    - export ZOMBIENET_INTEGRATION_TEST_SECONDARY_IMAGE="docker.io/parity/polkadot:${BUILD_RELEASE_VERSION}"
-    - export COL_IMAGE=${COLLATOR_IMAGE_NAME}:${COLLATOR_IMAGE_TAG}
-    - export POLKADOT_PR_BIN_URL="https://gitlab.parity.io/parity/mirrors/polkadot/-/jobs/${BUILD_LINUX_JOB_ID}/artifacts/raw/artifacts/polkadot"
-  script:
-    - /home/nonroot/zombie-net/scripts/ci/run-test-env-manager.sh
-        --github-remote-dir="${GH_DIR}"
-        --test="002-async-backing-runtime-upgrade.zndsl"
-  allow_failure:                   false
-  retry: 2
-  tags:
-    - zombienet-polkadot-integration-test
-
-zombienet-tests-async-backing-collator-mix:
-  stage:                             zombienet
-  extends:
-    - .kubernetes-env
-    - .zombienet-refs
-  image:                           "${ZOMBIENET_IMAGE}"
-  needs:
-    - job:                         publish-polkadot-debug-image
-    - job:                         publish-test-collators-image
-    - job:                         build-linux-stable
-      artifacts:                   true
-  variables:
-    RUN_IN_CONTAINER: "1"
-    GH_DIR:                        "https://github.com/paritytech/polkadot/tree/${CI_COMMIT_SHORT_SHA}/zombienet_tests/async_backing"
-  before_script:
-    - echo "Zombie-net Tests Config"
-    - echo "${ZOMBIENET_IMAGE_NAME}"
-    - echo "${PARACHAINS_IMAGE_NAME} ${PARACHAINS_IMAGE_TAG}"
-    - echo "${GH_DIR}"
-    - export DEBUG=zombie,zombie::network-node
-    - BUILD_RELEASE_VERSION="$(cat ./artifacts/BUILD_RELEASE_VERSION)"
-    - export ZOMBIENET_INTEGRATION_TEST_IMAGE=${PARACHAINS_IMAGE_NAME}:${PARACHAINS_IMAGE_TAG}
-    - export ZOMBIENET_INTEGRATION_TEST_SECONDARY_IMAGE="docker.io/parity/polkadot:${BUILD_RELEASE_VERSION}"
-    - export COL_IMAGE=${COLLATOR_IMAGE_NAME}:${COLLATOR_IMAGE_TAG}
-  script:
-    - /home/nonroot/zombie-net/scripts/ci/run-test-env-manager.sh
-        --github-remote-dir="${GH_DIR}"
-        --test="003-async-backing-collator-mix.zndsl"
-  allow_failure:                   false
-  retry: 2
-  tags:
-    - zombienet-polkadot-integration-test
diff --git a/polkadot/scripts/ci/gitlab/prettier.sh b/polkadot/scripts/ci/gitlab/prettier.sh
deleted file mode 100755
index 299bbee179dcaeff3fbadffd89fb4548ac878555..0000000000000000000000000000000000000000
--- a/polkadot/scripts/ci/gitlab/prettier.sh
+++ /dev/null
@@ -1,6 +0,0 @@
-#!/bin/sh
-
-# meant to be installed via
-#   git config filter.ci-prettier.clean "scripts/ci/gitlab/prettier.sh"
-
-prettier --parser yaml
diff --git a/polkadot/scripts/ci/gitlab/spellcheck.toml b/polkadot/scripts/ci/gitlab/spellcheck.toml
deleted file mode 100644
index 636cafa2cc4e93484215284c897ded7b507cec54..0000000000000000000000000000000000000000
--- a/polkadot/scripts/ci/gitlab/spellcheck.toml
+++ /dev/null
@@ -1,34 +0,0 @@
-[hunspell]
-lang = "en_US"
-search_dirs = ["."]
-extra_dictionaries = ["lingua.dic"]
-skip_os_lookups = true
-use_builtin = true
-
-[hunspell.quirks]
-# He tagged it as 'TheGreatestOfAllTimes'
-transform_regex = [
-# `Type`'s
-	"^'([^\\s])'$",
-# 5x
-# 10.7%
-	"^[0-9_]+(?:\\.[0-9]*)?(x|%)$",
-# Transforms'
-	"^(.*)'$",
-# backslashes
-	"^\\+$",
-	"^[0-9]*+k|MB|Mb|ms|Mbit|nd|th|rd$",
-# single char `=` `>` `%` ..
-	"^=|>|<|%$",
-# 22_100
-	"^(?:[0-9]+_)+[0-9]+$",
-# V5, v5, P1.2, etc
-	"[A-Za-z][0-9]",
-# ~50
-	"~[0-9]+",
-	"ABI",
-	"bool",
-	"sigil",
-]
-allow_concatenation = true
-allow_dashes = true
diff --git a/polkadot/scripts/ci/gitlab/test_deterministic_wasm.sh b/polkadot/scripts/ci/gitlab/test_deterministic_wasm.sh
deleted file mode 100755
index b4292376942156e326517d3b3df3c99424270e6b..0000000000000000000000000000000000000000
--- a/polkadot/scripts/ci/gitlab/test_deterministic_wasm.sh
+++ /dev/null
@@ -1,15 +0,0 @@
-#!/usr/bin/env bash
-
-#shellcheck source=../common/lib.sh
-source "$( cd "$( dirname "${BASH_SOURCE[0]}" )" >/dev/null 2>&1 && pwd )/../common/lib.sh"
-
-# build runtime
-WASM_BUILD_NO_COLOR=1 cargo build --verbose --release -p kusama-runtime -p polkadot-runtime -p westend-runtime
-# make checksum
-sha256sum target/release/wbuild/*-runtime/target/wasm32-unknown-unknown/release/*.wasm > checksum.sha256
-# clean up - FIXME: can we reuse some of the artifacts?
-cargo clean
-# build again
-WASM_BUILD_NO_COLOR=1 cargo build --verbose --release -p kusama-runtime -p polkadot-runtime -p westend-runtime
-# confirm checksum
-sha256sum -c checksum.sha256
diff --git a/polkadot/scripts/ci/run_benches_for_runtime.sh b/polkadot/scripts/ci/run_benches_for_runtime.sh
deleted file mode 100755
index 296985a42764767c9a6c98b1c51d8a8939e7210d..0000000000000000000000000000000000000000
--- a/polkadot/scripts/ci/run_benches_for_runtime.sh
+++ /dev/null
@@ -1,76 +0,0 @@
-#!/bin/bash
-
-# Runs all benchmarks for all pallets, for a given runtime, provided by $1
-# Should be run on a reference machine to gain accurate benchmarks
-# current reference machine: https://github.com/paritytech/substrate/pull/5848
-
-runtime="$1"
-
-echo "[+] Compiling benchmarks..."
-cargo build --profile production --locked --features=runtime-benchmarks
-
-# Load all pallet names in an array.
-PALLETS=($(
-  ./target/production/polkadot benchmark pallet --list --chain="${runtime}-dev" |\
-    tail -n+2 |\
-    cut -d',' -f1 |\
-    sort |\
-    uniq
-))
-
-echo "[+] Benchmarking ${#PALLETS[@]} pallets for runtime $runtime"
-
-# Define the error file.
-ERR_FILE="benchmarking_errors.txt"
-# Delete the error file before each run.
-rm -f $ERR_FILE
-
-# Benchmark each pallet.
-for PALLET in "${PALLETS[@]}"; do
-  echo "[+] Benchmarking $PALLET for $runtime";
-
-  output_file=""
-  if [[ $PALLET == *"::"* ]]; then
-    # translates e.g. "pallet_foo::bar" to "pallet_foo_bar"
-    output_file="${PALLET//::/_}.rs"
-  fi
-
-  OUTPUT=$(
-    ./target/production/polkadot benchmark pallet \
-    --chain="${runtime}-dev" \
-    --steps=50 \
-    --repeat=20 \
-    --pallet="$PALLET" \
-    --extrinsic="*" \
-    --wasm-execution=compiled \
-    --header=./file_header.txt \
-    --output="./runtime/${runtime}/src/weights/${output_file}" 2>&1
-  )
-  if [ $? -ne 0 ]; then
-    echo "$OUTPUT" >> "$ERR_FILE"
-    echo "[-] Failed to benchmark $PALLET. Error written to $ERR_FILE; continuing..."
-  fi
-done
-
-# Update the block and extrinsic overhead weights.
-echo "[+] Benchmarking block and extrinsic overheads..."
-OUTPUT=$(
-  ./target/production/polkadot benchmark overhead \
-  --chain="${runtime}-dev" \
-  --wasm-execution=compiled \
-  --weight-path="runtime/${runtime}/constants/src/weights/" \
-  --warmup=10 \
-  --repeat=100 \
-  --header=./file_header.txt
-)
-if [ $? -ne 0 ]; then
-  echo "$OUTPUT" >> "$ERR_FILE"
-  echo "[-] Failed to benchmark the block and extrinsic overheads. Error written to $ERR_FILE; continuing..."
-fi
-
-# Check if the error file exists.
-if [ -f "$ERR_FILE" ]; then
-  echo "[-] Some benchmarks failed. See: $ERR_FILE"
-else
-  echo "[+] All benchmarks passed."
-fi
diff --git a/polkadot/scripts/init.sh b/polkadot/scripts/init.sh
deleted file mode 100755
index cf5ecf97926fea7a5e8fd2a91df96853f90e8ee7..0000000000000000000000000000000000000000
--- a/polkadot/scripts/init.sh
+++ /dev/null
@@ -1,16 +0,0 @@
-#!/usr/bin/env bash
-
-set -e
-
-echo "*** Initializing WASM build environment"
-
-if [ -z $CI_PROJECT_NAME ] ; then
-   rustup update nightly
-   rustup update stable
-fi
-
-rustup target add wasm32-unknown-unknown --toolchain nightly
-
-# Install wasm-gc. It's useful for stripping slimming down wasm binaries.
-command -v wasm-gc || \
-	cargo +nightly install --git https://github.com/alexcrichton/wasm-gc --force
diff --git a/polkadot/scripts/run_all_benches.sh b/polkadot/scripts/run_all_benches.sh
deleted file mode 100755
index 923013f351555c348cdd5c169f8d7382ac5f0a5b..0000000000000000000000000000000000000000
--- a/polkadot/scripts/run_all_benches.sh
+++ /dev/null
@@ -1,15 +0,0 @@
-#!/bin/bash
-
-# Runs all benchmarks for all pallets, for each of the runtimes specified below
-# Should be run on a reference machine to gain accurate benchmarks
-# current reference machine: https://github.com/paritytech/substrate/pull/5848
-
-runtimes=(
-  polkadot
-  kusama
-  westend
-)
-
-for runtime in "${runtimes[@]}"; do
-  "$(dirname "$0")/run_benches_for_runtime.sh" "$runtime"
-done
diff --git a/polkadot/scripts/update-rust-stable.sh b/polkadot/scripts/update-rust-stable.sh
deleted file mode 100755
index 6aae75d8cb2daa2dee5a332d19c31cd8f4fe818f..0000000000000000000000000000000000000000
--- a/polkadot/scripts/update-rust-stable.sh
+++ /dev/null
@@ -1,39 +0,0 @@
-#!/usr/bin/env bash
-#
-# Script for updating the UI tests for a new rust stable version.
-#
-# It needs to be called like this:
-#
-# update-rust-stable.sh 1.61
-#
-# This will run all UI tests with the rust stable 1.61. The script
-# requires that rustup is installed.
-set -e
-
-if [ "$#" -ne 1 ]; then
-	echo "Please specify the rust version to use. E.g. update-rust-stable.sh 1.61"
-	exit
-fi
-
-RUST_VERSION=$1
-
-if ! command -v rustup &> /dev/null
-then
-	echo "rustup needs to be installed"
-	exit
-fi
-
-rustup install $RUST_VERSION
-rustup component add rust-src --toolchain $RUST_VERSION
-
-# Ensure we run the ui tests
-export RUN_UI_TESTS=1
-# We don't need any wasm files for ui tests
-export SKIP_WASM_BUILD=1
-# Let trybuild overwrite the .stderr files
-export TRYBUILD=overwrite
-
-# Run all the relevant UI tests
-#
-# Any new UI tests in different crates need to be added here as well.
-rustup run $RUST_VERSION cargo test -p orchestra ui
diff --git a/polkadot/src/README.adoc b/polkadot/src/README.adoc
deleted file mode 100644
index 4ec8e18d8afe90105104bf0d5434f8f7fc8c94ff..0000000000000000000000000000000000000000
--- a/polkadot/src/README.adoc
+++ /dev/null
@@ -1,5 +0,0 @@
-
-= Polkadot Src
-
-placeholder
-//TODO Write content :) (https://github.com/paritytech/polkadot/issues/159)
diff --git a/polkadot/src/bin/execute-worker.rs b/polkadot/src/bin/execute-worker.rs
index 72cab799d753e814beae0a337e30b7c21269f08d..1deb365809860502e8e298802814a185479c09c6 100644
--- a/polkadot/src/bin/execute-worker.rs
+++ b/polkadot/src/bin/execute-worker.rs
@@ -19,5 +19,5 @@
 polkadot_node_core_pvf_common::decl_worker_main!(
 	"execute-worker",
 	polkadot_node_core_pvf_execute_worker::worker_entrypoint,
-	env!("SUBSTRATE_CLI_IMPL_VERSION")
+	polkadot_cli::NODE_VERSION,
 );
diff --git a/polkadot/src/bin/prepare-worker.rs b/polkadot/src/bin/prepare-worker.rs
index 695f66cc7b7d3cae5c35a36af9570ce3911ed432..d731f8a30d065f0c9abdcc438df411be7d16417e 100644
--- a/polkadot/src/bin/prepare-worker.rs
+++ b/polkadot/src/bin/prepare-worker.rs
@@ -19,5 +19,5 @@
 polkadot_node_core_pvf_common::decl_worker_main!(
 	"prepare-worker",
 	polkadot_node_core_pvf_prepare_worker::worker_entrypoint,
-	env!("SUBSTRATE_CLI_IMPL_VERSION")
+	polkadot_cli::NODE_VERSION,
 );
diff --git a/polkadot/statement-table/Cargo.toml b/polkadot/statement-table/Cargo.toml
index 65fb21708c23ca0b16926d2fbbb07ee027740f47..91ca2015af3a1d766f37cf7e0ae33eb282640a53 100644
--- a/polkadot/statement-table/Cargo.toml
+++ b/polkadot/statement-table/Cargo.toml
@@ -1,6 +1,6 @@
 [package]
 name = "polkadot-statement-table"
-version.workspace = true
+version = "1.0.0"
 authors.workspace = true
 edition.workspace = true
 license.workspace = true
diff --git a/polkadot/statement-table/README.adoc b/polkadot/statement-table/README.adoc
deleted file mode 100644
index a4da4dee80ff5fc9917d93fa705e66220fb34696..0000000000000000000000000000000000000000
--- a/polkadot/statement-table/README.adoc
+++ /dev/null
@@ -1,5 +0,0 @@
-
-= Polkadot Statement table
-
-placeholder
-//TODO Write content :) (https://github.com/paritytech/polkadot/issues/159)
diff --git a/polkadot/statement-table/src/generic.rs b/polkadot/statement-table/src/generic.rs
index a427aae42fb9523a21a416a106b61f56e8be46c2..22bffde5acc11b8fdbea565d054949caf40d788f 100644
--- a/polkadot/statement-table/src/generic.rs
+++ b/polkadot/statement-table/src/generic.rs
@@ -30,7 +30,10 @@ use std::{
 	hash::Hash,
 };
 
-use primitives::{ValidatorSignature, ValidityAttestation as PrimitiveValidityAttestation};
+use primitives::{
+	effective_minimum_backing_votes, ValidatorSignature,
+	ValidityAttestation as PrimitiveValidityAttestation,
+};
 
 use parity_scale_codec::{Decode, Encode};
 
@@ -57,8 +60,8 @@ pub trait Context {
 	/// Members are meant to submit candidates and vote on validity.
 	fn is_member_of(&self, authority: &Self::AuthorityId, group: &Self::GroupId) -> bool;
 
-	/// requisite number of votes for validity from a group.
-	fn requisite_votes(&self, group: &Self::GroupId) -> usize;
+	/// Get a validator group size.
+	fn get_group_size(&self, group: &Self::GroupId) -> Option<usize>;
 }
 
 /// Table configuration.
@@ -319,9 +322,12 @@ impl<Ctx: Context> Table<Ctx> {
 		&self,
 		digest: &Ctx::Digest,
 		context: &Ctx,
+		minimum_backing_votes: u32,
 	) -> Option<AttestedCandidate<Ctx::GroupId, Ctx::Candidate, Ctx::AuthorityId, Ctx::Signature>> {
 		self.candidate_votes.get(digest).and_then(|data| {
-			let v_threshold = context.requisite_votes(&data.group_id);
+			let v_threshold = context.get_group_size(&data.group_id).map_or(usize::MAX, |len| {
+				effective_minimum_backing_votes(len, minimum_backing_votes)
+			});
 			data.attested(v_threshold)
 		})
 	}
@@ -636,16 +642,13 @@ mod tests {
 			self.authorities.get(authority).map(|v| v == group).unwrap_or(false)
 		}
 
-		fn requisite_votes(&self, id: &GroupId) -> usize {
-			let mut total_validity = 0;
-
-			for validity in self.authorities.values() {
-				if validity == id {
-					total_validity += 1
-				}
+		fn get_group_size(&self, group: &Self::GroupId) -> Option<usize> {
+			let count = self.authorities.values().filter(|g| *g == group).count();
+			if count == 0 {
+				None
+			} else {
+				Some(count)
 			}
-
-			total_validity / 2 + 1
 		}
 	}
 
@@ -910,7 +913,7 @@ mod tests {
 		table.import_statement(&context, statement);
 
 		assert!(!table.detected_misbehavior.contains_key(&AuthorityId(1)));
-		assert!(table.attested_candidate(&candidate_digest, &context).is_none());
+		assert!(table.attested_candidate(&candidate_digest, &context, 2).is_none());
 
 		let vote = SignedStatement {
 			statement: Statement::Valid(candidate_digest),
@@ -920,7 +923,7 @@ mod tests {
 
 		table.import_statement(&context, vote);
 		assert!(!table.detected_misbehavior.contains_key(&AuthorityId(2)));
-		assert!(table.attested_candidate(&candidate_digest, &context).is_some());
+		assert!(table.attested_candidate(&candidate_digest, &context, 2).is_some());
 	}
 
 	#[test]
diff --git a/polkadot/tests/benchmark_block.rs b/polkadot/tests/benchmark_block.rs
index bc91b31bc7b64430b757b9f87f39a0eb34b7238f..99f95ef611a48266105ba6b413641867fab21101 100644
--- a/polkadot/tests/benchmark_block.rs
+++ b/polkadot/tests/benchmark_block.rs
@@ -18,6 +18,7 @@
 #![cfg(unix)]
 
 use assert_cmd::cargo::cargo_bin;
+use common::run_with_timeout;
 use nix::{
 	sys::signal::{kill, Signal::SIGINT},
 	unistd::Pid,
@@ -32,25 +33,28 @@ use tempfile::tempdir;
 
 pub mod common;
 
-static RUNTIMES: [&str; 4] = ["polkadot", "kusama", "westend", "rococo"];
+static RUNTIMES: &[&str] = &["westend", "rococo"];
 
 /// `benchmark block` works for all dev runtimes using the wasm executor.
 #[tokio::test]
 async fn benchmark_block_works() {
 	for runtime in RUNTIMES {
-		let tmp_dir = tempdir().expect("could not create a temp dir");
-		let base_path = tmp_dir.path();
-		let runtime = format!("{}-dev", runtime);
-
-		// Build a chain with a single block.
-		build_chain(&runtime, base_path).await.unwrap();
-		// Benchmark the one block.
-		benchmark_block(&runtime, base_path, 1).unwrap();
+		run_with_timeout(Duration::from_secs(10 * 60), async move {
+			let tmp_dir = tempdir().expect("could not create a temp dir");
+			let base_path = tmp_dir.path();
+			let runtime = format!("{}-dev", runtime);
+
+			// Build a chain with a single block.
+			build_chain(&runtime, base_path).await;
+			// Benchmark the one block.
+			benchmark_block(&runtime, base_path, 1).unwrap();
+		})
+		.await
 	}
 }
 
 /// Builds a chain with one block for the given runtime and base path.
-async fn build_chain(runtime: &str, base_path: &Path) -> Result<(), String> {
+async fn build_chain(runtime: &str, base_path: &Path) {
 	let mut cmd = Command::new(cargo_bin("polkadot"))
 		.stdout(process::Stdio::piped())
 		.stderr(process::Stdio::piped())
@@ -64,13 +68,10 @@ async fn build_chain(runtime: &str, base_path: &Path) -> Result<(), String> {
 	let (ws_url, _) = common::find_ws_url_from_output(cmd.stderr.take().unwrap());
 
 	// Wait for the chain to produce one block.
-	let ok = common::wait_n_finalized_blocks(1, Duration::from_secs(60), &ws_url).await;
+	common::wait_n_finalized_blocks(1, &ws_url).await;
 	// Send SIGINT to node.
 	kill(Pid::from_raw(cmd.id().try_into().unwrap()), SIGINT).unwrap();
-	// Wait for the node to handle it and exit.
-	assert!(common::wait_for(&mut cmd, 30).map(|x| x.success()).unwrap_or_default());
-
-	ok.map_err(|e| format!("Node did not build the chain: {:?}", e))
+	assert!(cmd.wait().unwrap().success());
 }
 
 /// Benchmarks the given block with the wasm executor.
diff --git a/polkadot/tests/benchmark_extrinsic.rs b/polkadot/tests/benchmark_extrinsic.rs
index e701fd9c923c2eb736ed34493a865afcca6d6145..529eb29362d4dda4fba34592ce5ff9066ca61796 100644
--- a/polkadot/tests/benchmark_extrinsic.rs
+++ b/polkadot/tests/benchmark_extrinsic.rs
@@ -17,7 +17,7 @@
 use assert_cmd::cargo::cargo_bin;
 use std::{process::Command, result::Result};
 
-static RUNTIMES: [&str; 4] = ["polkadot", "kusama", "westend", "rococo"];
+static RUNTIMES: &[&str] = &["westend", "rococo"];
 
 static EXTRINSICS: [(&str, &str); 2] = [("system", "remark"), ("balances", "transfer_keep_alive")];
 
diff --git a/polkadot/tests/benchmark_overhead.rs b/polkadot/tests/benchmark_overhead.rs
index 295479594eb9ba56a5d64e2df34a014bdd8ecd9f..b0912225347df5f4dd563f7dd0ff8075e76923c9 100644
--- a/polkadot/tests/benchmark_overhead.rs
+++ b/polkadot/tests/benchmark_overhead.rs
@@ -18,26 +18,26 @@ use assert_cmd::cargo::cargo_bin;
 use std::{process::Command, result::Result};
 use tempfile::tempdir;
 
-static RUNTIMES: [&str; 4] = ["polkadot", "kusama", "westend", "rococo"];
+static RUNTIMES: &[&str] = &["westend", "rococo"];
 
 /// `benchmark overhead` works for all dev runtimes.
 #[test]
 fn benchmark_overhead_works() {
 	for runtime in RUNTIMES {
 		let runtime = format!("{}-dev", runtime);
-		assert!(benchmark_overhead(runtime).is_ok());
+		assert!(benchmark_overhead(&runtime).is_ok());
 	}
 }
 
 /// `benchmark overhead` rejects all non-dev runtimes.
 #[test]
 fn benchmark_overhead_rejects_non_dev_runtimes() {
-	for runtime in RUNTIMES {
-		assert!(benchmark_overhead(runtime.into()).is_err());
+	for runtime in RUNTIMES.into_iter() {
+		assert!(benchmark_overhead(runtime).is_err());
 	}
 }
 
-fn benchmark_overhead(runtime: String) -> Result<(), String> {
+fn benchmark_overhead(runtime: &str) -> Result<(), String> {
 	let tmp_dir = tempdir().expect("could not create a temp dir");
 	let base_path = tmp_dir.path();
 
diff --git a/polkadot/tests/common.rs b/polkadot/tests/common.rs
index 940a0c6f18d0fe47575df6177fcc4f84fa7f3071..15721c990e01b30b97db32151b0899c1e5a3888b 100644
--- a/polkadot/tests/common.rs
+++ b/polkadot/tests/common.rs
@@ -16,50 +16,24 @@
 
 use polkadot_core_primitives::{Block, Hash, Header};
 use std::{
+	future::Future,
 	io::{BufRead, BufReader, Read},
-	process::{Child, ExitStatus},
-	thread,
 	time::Duration,
 };
 use substrate_rpc_client::{ws_client, ChainApi};
-use tokio::time::timeout;
 
-/// Wait for the given `child` the given amount of `secs`.
-///
-/// Returns the `Some(exit status)` or `None` if the process did not finish in the given time.
-pub fn wait_for(child: &mut Child, secs: usize) -> Option<ExitStatus> {
-	for _ in 0..secs {
-		match child.try_wait().unwrap() {
-			Some(status) => return Some(status),
-			None => thread::sleep(Duration::from_secs(1)),
-		}
-	}
-	eprintln!("Took to long to exit. Killing...");
-	let _ = child.kill();
-	child.wait().unwrap();
-
-	None
-}
-
-/// Wait for at least `n` blocks to be finalized within the specified time.
-pub async fn wait_n_finalized_blocks(
-	n: usize,
-	timeout_duration: Duration,
-	url: &str,
-) -> Result<(), tokio::time::error::Elapsed> {
-	timeout(timeout_duration, wait_n_finalized_blocks_from(n, url)).await
+/// Run the given `future` and panic if the `timeout` is hit.
+pub async fn run_with_timeout(timeout: Duration, future: impl Future<Output = ()>) {
+	tokio::time::timeout(timeout, future).await.expect("Hit timeout");
 }
 
 /// Wait for at least `n` blocks to be finalized from a specified node.
-async fn wait_n_finalized_blocks_from(n: usize, url: &str) {
+pub async fn wait_n_finalized_blocks(n: usize, url: &str) {
 	let mut built_blocks = std::collections::HashSet::new();
 	let mut interval = tokio::time::interval(Duration::from_secs(6));
 
 	loop {
-		let rpc = match ws_client(url).await {
-			Ok(rpc_service) => rpc_service,
-			Err(_) => continue,
-		};
+		let Ok(rpc) = ws_client(url).await else { continue };
 
 		if let Ok(block) = ChainApi::<(), Hash, Header, Block>::finalized_head(&rpc).await {
 			built_blocks.insert(block);
@@ -67,6 +41,7 @@ async fn wait_n_finalized_blocks_from(n: usize, url: &str) {
 				break
 			}
 		};
+
 		interval.tick().await;
 	}
 }
diff --git a/polkadot/tests/purge_chain_works.rs b/polkadot/tests/purge_chain_works.rs
index 3e9a378147810e5d2edf377fa7c5ed93ecf16952..f5a73e232e0cb22ee18c7a6100e21f44d208d78f 100644
--- a/polkadot/tests/purge_chain_works.rs
+++ b/polkadot/tests/purge_chain_works.rs
@@ -14,7 +14,14 @@
 // You should have received a copy of the GNU General Public License
 // along with Substrate.  If not, see <http://www.gnu.org/licenses/>.
 
+#![cfg(unix)]
+
 use assert_cmd::cargo::cargo_bin;
+use common::run_with_timeout;
+use nix::{
+	sys::signal::{kill, Signal::SIGINT},
+	unistd::Pid,
+};
 use std::{
 	process::{self, Command},
 	time::Duration,
@@ -24,105 +31,91 @@ use tempfile::tempdir;
 pub mod common;
 
 #[tokio::test]
-#[cfg(unix)]
 async fn purge_chain_rocksdb_works() {
-	use nix::{
-		sys::signal::{kill, Signal::SIGINT},
-		unistd::Pid,
-	};
-
-	let tmpdir = tempdir().expect("could not create temp dir");
-
-	let mut cmd = Command::new(cargo_bin("polkadot"))
-		.stdout(process::Stdio::piped())
-		.stderr(process::Stdio::piped())
-		.args(["--dev", "-d"])
-		.arg(tmpdir.path())
-		.arg("--port")
-		.arg("33034")
-		.arg("--no-hardware-benchmarks")
-		.spawn()
-		.unwrap();
-
-	let (ws_url, _) = common::find_ws_url_from_output(cmd.stderr.take().unwrap());
-
-	// Let it produce 1 block.
-	common::wait_n_finalized_blocks(1, Duration::from_secs(60), &ws_url)
-		.await
-		.unwrap();
-
-	// Send SIGINT to node.
-	kill(Pid::from_raw(cmd.id().try_into().unwrap()), SIGINT).unwrap();
-	// Wait for the node to handle it and exit.
-	assert!(common::wait_for(&mut cmd, 30).map(|x| x.success()).unwrap_or_default());
-	assert!(tmpdir.path().join("chains/polkadot_dev").exists());
-	assert!(tmpdir.path().join("chains/polkadot_dev/db/full").exists());
-	assert!(tmpdir.path().join("chains/polkadot_dev/db/full/parachains").exists());
-
-	// Purge chain
-	let status = Command::new(cargo_bin("polkadot"))
-		.args(["purge-chain", "--dev", "-d"])
-		.arg(tmpdir.path())
-		.arg("-y")
-		.status()
-		.unwrap();
-	assert!(status.success());
-
-	// Make sure that the chain folder exists, but `db/full` is deleted.
-	assert!(tmpdir.path().join("chains/polkadot_dev").exists());
-	assert!(!tmpdir.path().join("chains/polkadot_dev/db/full").exists());
+	run_with_timeout(Duration::from_secs(10 * 60), async move {
+		let tmpdir = tempdir().expect("could not create temp dir");
+
+		let mut cmd = Command::new(cargo_bin("polkadot"))
+			.stdout(process::Stdio::piped())
+			.stderr(process::Stdio::piped())
+			.args(["--dev", "-d"])
+			.arg(tmpdir.path())
+			.arg("--port")
+			.arg("33034")
+			.arg("--no-hardware-benchmarks")
+			.spawn()
+			.unwrap();
+
+		let (ws_url, _) = common::find_ws_url_from_output(cmd.stderr.take().unwrap());
+
+		// Let it produce 1 block.
+		common::wait_n_finalized_blocks(1, &ws_url).await;
+
+		// Send SIGINT to node.
+		kill(Pid::from_raw(cmd.id().try_into().unwrap()), SIGINT).unwrap();
+		// Wait for the node to handle it and exit.
+		assert!(cmd.wait().unwrap().success());
+		assert!(tmpdir.path().join("chains/rococo_dev").exists());
+		assert!(tmpdir.path().join("chains/rococo_dev/db/full").exists());
+
+		// Purge chain
+		let status = Command::new(cargo_bin("polkadot"))
+			.args(["purge-chain", "--dev", "-d"])
+			.arg(tmpdir.path())
+			.arg("-y")
+			.status()
+			.unwrap();
+		assert!(status.success());
+
+		// Make sure that the chain folder exists, but `db/full` is deleted.
+		assert!(tmpdir.path().join("chains/rococo_dev").exists());
+		assert!(!tmpdir.path().join("chains/rococo_dev/db/full").exists());
+	})
+	.await;
 }
 
 #[tokio::test]
-#[cfg(unix)]
 async fn purge_chain_paritydb_works() {
-	use nix::{
-		sys::signal::{kill, Signal::SIGINT},
-		unistd::Pid,
-	};
-
-	let tmpdir = tempdir().expect("could not create temp dir");
-
-	let mut cmd = Command::new(cargo_bin("polkadot"))
-		.stdout(process::Stdio::piped())
-		.stderr(process::Stdio::piped())
-		.args(["--dev", "-d"])
-		.arg(tmpdir.path())
-		.arg("--database")
-		.arg("paritydb-experimental")
-		.arg("--no-hardware-benchmarks")
-		.spawn()
-		.unwrap();
-
-	let (ws_url, _) = common::find_ws_url_from_output(cmd.stderr.take().unwrap());
-
-	// Let it produce 1 block.
-	common::wait_n_finalized_blocks(1, Duration::from_secs(60), &ws_url)
-		.await
-		.unwrap();
-
-	// Send SIGINT to node.
-	kill(Pid::from_raw(cmd.id().try_into().unwrap()), SIGINT).unwrap();
-	// Wait for the node to handle it and exit.
-	assert!(common::wait_for(&mut cmd, 30).map(|x| x.success()).unwrap_or_default());
-	assert!(tmpdir.path().join("chains/polkadot_dev").exists());
-	assert!(tmpdir.path().join("chains/polkadot_dev/paritydb/full").exists());
-	assert!(tmpdir.path().join("chains/polkadot_dev/paritydb/parachains").exists());
-
-	// Purge chain
-	let status = Command::new(cargo_bin("polkadot"))
-		.args(["purge-chain", "--dev", "-d"])
-		.arg(tmpdir.path())
-		.arg("--database")
-		.arg("paritydb-experimental")
-		.arg("-y")
-		.status()
-		.unwrap();
-	assert!(status.success());
-
-	// Make sure that the chain folder exists, but `db/full` is deleted.
-	assert!(tmpdir.path().join("chains/polkadot_dev").exists());
-	assert!(!tmpdir.path().join("chains/polkadot_dev/paritydb/full").exists());
-	// Parachains removal requires calling "purge-chain --parachains".
-	assert!(tmpdir.path().join("chains/polkadot_dev/paritydb/parachains").exists());
+	run_with_timeout(Duration::from_secs(10 * 60), async move {
+		let tmpdir = tempdir().expect("could not create temp dir");
+
+		let mut cmd = Command::new(cargo_bin("polkadot"))
+			.stdout(process::Stdio::piped())
+			.stderr(process::Stdio::piped())
+			.args(["--dev", "-d"])
+			.arg(tmpdir.path())
+			.arg("--database")
+			.arg("paritydb-experimental")
+			.arg("--no-hardware-benchmarks")
+			.spawn()
+			.unwrap();
+
+		let (ws_url, _) = common::find_ws_url_from_output(cmd.stderr.take().unwrap());
+
+		// Let it produce 1 block.
+		common::wait_n_finalized_blocks(1, &ws_url).await;
+
+		// Send SIGINT to node.
+		kill(Pid::from_raw(cmd.id().try_into().unwrap()), SIGINT).unwrap();
+		// Wait for the node to handle it and exit.
+		assert!(cmd.wait().unwrap().success());
+		assert!(tmpdir.path().join("chains/rococo_dev").exists());
+		assert!(tmpdir.path().join("chains/rococo_dev/paritydb/full").exists());
+
+		// Purge chain
+		let status = Command::new(cargo_bin("polkadot"))
+			.args(["purge-chain", "--dev", "-d"])
+			.arg(tmpdir.path())
+			.arg("--database")
+			.arg("paritydb-experimental")
+			.arg("-y")
+			.status()
+			.unwrap();
+		assert!(status.success());
+
+		// Make sure that the chain folder exists, but `db/full` is deleted.
+		assert!(tmpdir.path().join("chains/rococo_dev").exists());
+		assert!(!tmpdir.path().join("chains/rococo_dev/paritydb/full").exists());
+	})
+	.await;
 }
diff --git a/polkadot/tests/running_the_node_and_interrupt.rs b/polkadot/tests/running_the_node_and_interrupt.rs
index d3935cbb02ad176e56e1a248b9410f71b714ec95..079c34e0421e8a1936359b03bc46f3fea87f4b8b 100644
--- a/polkadot/tests/running_the_node_and_interrupt.rs
+++ b/polkadot/tests/running_the_node_and_interrupt.rs
@@ -15,10 +15,7 @@
 // along with Substrate.  If not, see <http://www.gnu.org/licenses/>.
 
 use assert_cmd::cargo::cargo_bin;
-use std::{
-	process::{self, Command},
-	time::Duration,
-};
+use std::process::{self, Command};
 use tempfile::tempdir;
 
 pub mod common;
@@ -49,17 +46,13 @@ async fn running_the_node_works_and_can_be_interrupted() {
 		let (ws_url, _) = common::find_ws_url_from_output(cmd.stderr.take().unwrap());
 
 		// Let it produce three blocks.
-		common::wait_n_finalized_blocks(3, Duration::from_secs(60), &ws_url)
-			.await
-			.unwrap();
+		common::wait_n_finalized_blocks(3, &ws_url).await;
 
 		assert!(cmd.try_wait().unwrap().is_none(), "the process should still be running");
 		kill(Pid::from_raw(cmd.id().try_into().unwrap()), signal).unwrap();
-		assert_eq!(
-			common::wait_for(&mut cmd, 30).map(|x| x.success()),
-			Some(true),
-			"the process must exit gracefully after signal {}",
-			signal,
+		assert!(
+			cmd.wait().unwrap().success(),
+			"the process must exit gracefully after signal {signal}",
 		);
 	}
 
diff --git a/polkadot/utils/generate-bags/Cargo.toml b/polkadot/utils/generate-bags/Cargo.toml
index 819a16d5c3594e0cad3fbfac845fbb0a04c270ec..95ca57ea728e16837843207e04d97f6b472979be 100644
--- a/polkadot/utils/generate-bags/Cargo.toml
+++ b/polkadot/utils/generate-bags/Cargo.toml
@@ -1,16 +1,14 @@
 [package]
 name = "polkadot-voter-bags"
-version.workspace = true
+version = "1.0.0"
 authors.workspace = true
 edition.workspace = true
 license.workspace = true
 
 [dependencies]
-clap = { version = "4.0.9", features = ["derive"] }
+clap = { version = "4.4.6", features = ["derive"] }
 
 generate-bags = { path = "../../../substrate/utils/frame/generate-bags" }
 sp-io = { path = "../../../substrate/primitives/io" }
 
 westend-runtime = { path = "../../runtime/westend" }
-kusama-runtime = { path = "../../runtime/kusama" }
-polkadot-runtime = { path = "../../runtime/polkadot" }
diff --git a/polkadot/utils/generate-bags/src/main.rs b/polkadot/utils/generate-bags/src/main.rs
index 6d0b0e19e899691f8ea0d6d41fbcba59303631a5..511980518c05807ba904cae053a0c24d5de41eff 100644
--- a/polkadot/utils/generate-bags/src/main.rs
+++ b/polkadot/utils/generate-bags/src/main.rs
@@ -22,8 +22,6 @@
 
 use clap::{Parser, ValueEnum};
 use generate_bags::generate_thresholds;
-use kusama_runtime::Runtime as KusamaRuntime;
-use polkadot_runtime::Runtime as PolkadotRuntime;
 use std::path::{Path, PathBuf};
 use westend_runtime::Runtime as WestendRuntime;
 
@@ -31,8 +29,6 @@ use westend_runtime::Runtime as WestendRuntime;
 #[value(rename_all = "PascalCase")]
 enum Runtime {
 	Westend,
-	Kusama,
-	Polkadot,
 }
 
 impl Runtime {
@@ -41,8 +37,6 @@ impl Runtime {
 	) -> Box<dyn FnOnce(usize, &Path, u128, u128) -> Result<(), std::io::Error>> {
 		match self {
 			Runtime::Westend => Box::new(generate_thresholds::<WestendRuntime>),
-			Runtime::Kusama => Box::new(generate_thresholds::<KusamaRuntime>),
-			Runtime::Polkadot => Box::new(generate_thresholds::<PolkadotRuntime>),
 		}
 	}
 }
@@ -54,7 +48,7 @@ struct Opt {
 	n_bags: usize,
 
 	/// Which runtime to generate.
-	#[arg(long, ignore_case = true, value_enum, default_value_t = Runtime::Polkadot)]
+	#[arg(long, ignore_case = true, value_enum, default_value_t = Runtime::Westend)]
 	runtime: Runtime,
 
 	/// Where to write the output.
diff --git a/polkadot/utils/remote-ext-tests/bags-list/Cargo.toml b/polkadot/utils/remote-ext-tests/bags-list/Cargo.toml
index bb48c82f0b73a1ed6b5689c3d85da79f75bd4839..e305edc039b5ab68c91bf587f322678c91e02cc1 100644
--- a/polkadot/utils/remote-ext-tests/bags-list/Cargo.toml
+++ b/polkadot/utils/remote-ext-tests/bags-list/Cargo.toml
@@ -1,17 +1,13 @@
 [package]
 name = "remote-ext-tests-bags-list"
 publish = false
-version.workspace = true
+version = "1.0.0"
 authors.workspace = true
 edition.workspace = true
 license.workspace = true
 
 [dependencies]
-polkadot-runtime = { path = "../../../runtime/polkadot" }
-kusama-runtime = { path = "../../../runtime/kusama" }
 westend-runtime = { path = "../../../runtime/westend" }
-polkadot-runtime-constants = { path = "../../../runtime/polkadot/constants" }
-kusama-runtime-constants = { path = "../../../runtime/kusama/constants" }
 westend-runtime-constants = { path = "../../../runtime/westend/constants" }
 
 pallet-bags-list-remote-tests = { path = "../../../../substrate/frame/bags-list/remote-tests" }
@@ -19,6 +15,6 @@ sp-tracing = { path = "../../../../substrate/primitives/tracing" }
 frame-system = { path = "../../../../substrate/frame/system" }
 sp-core = { path = "../../../../substrate/primitives/core" }
 
-clap = { version = "4.0.9", features = ["derive"] }
+clap = { version = "4.4.6", features = ["derive"] }
 log = "0.4.17"
 tokio = { version = "1.24.2", features = ["macros"] }
diff --git a/polkadot/utils/remote-ext-tests/bags-list/src/main.rs b/polkadot/utils/remote-ext-tests/bags-list/src/main.rs
index 6fb66ab2160147e8373ef1d115bda10f0249cfa6..1b7b6c5b694eeb109c18027c555dfa448eacb7bc 100644
--- a/polkadot/utils/remote-ext-tests/bags-list/src/main.rs
+++ b/polkadot/utils/remote-ext-tests/bags-list/src/main.rs
@@ -29,16 +29,14 @@ enum Command {
 #[derive(Clone, Debug, ValueEnum)]
 #[value(rename_all = "PascalCase")]
 enum Runtime {
-	Polkadot,
-	Kusama,
 	Westend,
 }
 
 #[derive(Parser)]
 struct Cli {
-	#[arg(long, short, default_value = "wss://kusama-rpc.polkadot.io:443")]
+	#[arg(long, short, default_value = "wss://westend-rpc.polkadot.io:443")]
 	uri: String,
-	#[arg(long, short, ignore_case = true, value_enum, default_value_t = Runtime::Kusama)]
+	#[arg(long, short, ignore_case = true, value_enum, default_value_t = Runtime::Westend)]
 	runtime: Runtime,
 	#[arg(long, short, ignore_case = true, value_enum, default_value_t = Command::SanityCheck)]
 	command: Command,
@@ -60,16 +58,6 @@ async fn main() {
 
 	use pallet_bags_list_remote_tests::*;
 	match options.runtime {
-		Runtime::Polkadot => sp_core::crypto::set_default_ss58_version(
-			<polkadot_runtime::Runtime as frame_system::Config>::SS58Prefix::get()
-				.try_into()
-				.unwrap(),
-		),
-		Runtime::Kusama => sp_core::crypto::set_default_ss58_version(
-			<kusama_runtime::Runtime as frame_system::Config>::SS58Prefix::get()
-				.try_into()
-				.unwrap(),
-		),
 		Runtime::Westend => sp_core::crypto::set_default_ss58_version(
 			<westend_runtime::Runtime as frame_system::Config>::SS58Prefix::get()
 				.try_into()
@@ -78,27 +66,6 @@ async fn main() {
 	};
 
 	match (options.runtime, options.command) {
-		(Runtime::Kusama, Command::CheckMigration) => {
-			use kusama_runtime::{Block, Runtime};
-			use kusama_runtime_constants::currency::UNITS;
-			migration::execute::<Runtime, Block>(UNITS as u64, "KSM", options.uri.clone()).await;
-		},
-		(Runtime::Kusama, Command::SanityCheck) => {
-			use kusama_runtime::{Block, Runtime};
-			use kusama_runtime_constants::currency::UNITS;
-			try_state::execute::<Runtime, Block>(UNITS as u64, "KSM", options.uri.clone()).await;
-		},
-		(Runtime::Kusama, Command::Snapshot) => {
-			use kusama_runtime::{Block, Runtime};
-			use kusama_runtime_constants::currency::UNITS;
-			snapshot::execute::<Runtime, Block>(
-				options.snapshot_limit,
-				UNITS.try_into().unwrap(),
-				options.uri.clone(),
-			)
-			.await;
-		},
-
 		(Runtime::Westend, Command::CheckMigration) => {
 			use westend_runtime::{Block, Runtime};
 			use westend_runtime_constants::currency::UNITS;
@@ -119,26 +86,5 @@ async fn main() {
 			)
 			.await;
 		},
-
-		(Runtime::Polkadot, Command::CheckMigration) => {
-			use polkadot_runtime::{Block, Runtime};
-			use polkadot_runtime_constants::currency::UNITS;
-			migration::execute::<Runtime, Block>(UNITS as u64, "DOT", options.uri.clone()).await;
-		},
-		(Runtime::Polkadot, Command::SanityCheck) => {
-			use polkadot_runtime::{Block, Runtime};
-			use polkadot_runtime_constants::currency::UNITS;
-			try_state::execute::<Runtime, Block>(UNITS as u64, "DOT", options.uri.clone()).await;
-		},
-		(Runtime::Polkadot, Command::Snapshot) => {
-			use polkadot_runtime::{Block, Runtime};
-			use polkadot_runtime_constants::currency::UNITS;
-			snapshot::execute::<Runtime, Block>(
-				options.snapshot_limit,
-				UNITS.try_into().unwrap(),
-				options.uri.clone(),
-			)
-			.await;
-		},
 	}
 }
diff --git a/polkadot/utils/staking-miner/.gitignore b/polkadot/utils/staking-miner/.gitignore
deleted file mode 100644
index db7cff848330b52bc5135e811ba222a2fc303a0b..0000000000000000000000000000000000000000
--- a/polkadot/utils/staking-miner/.gitignore
+++ /dev/null
@@ -1,2 +0,0 @@
-*.key
-*.bin
diff --git a/polkadot/utils/staking-miner/Cargo.toml b/polkadot/utils/staking-miner/Cargo.toml
deleted file mode 100644
index f3d4a693e11f3be2becceb69e94db83badfba82b..0000000000000000000000000000000000000000
--- a/polkadot/utils/staking-miner/Cargo.toml
+++ /dev/null
@@ -1,54 +0,0 @@
-[[bin]]
-name = "staking-miner"
-path = "src/main.rs"
-
-[package]
-name = "staking-miner"
-version.workspace = true
-authors.workspace = true
-edition.workspace = true
-license.workspace = true
-publish = false
-
-[dependencies]
-codec = { package = "parity-scale-codec", version = "3.6.1" }
-clap = { version = "4.0.9", features = ["derive", "env"] }
-tracing-subscriber = { version = "0.3.11", features = ["env-filter"] }
-jsonrpsee = { version = "0.16.2", features = ["ws-client", "macros"] }
-log = "0.4.17"
-paste = "1.0.7"
-serde = "1.0.163"
-serde_json = "1.0"
-thiserror = "1.0.31"
-tokio = { version = "1.24.2", features = ["macros", "rt-multi-thread", "sync"] }
-remote-externalities = { package = "frame-remote-externalities" , path = "../../../substrate/utils/frame/remote-externalities" }
-signal-hook-tokio = { version = "0.3", features = ["futures-v0_3"] }
-sp-core = { path = "../../../substrate/primitives/core" }
-sp-version = { path = "../../../substrate/primitives/version" }
-sp-state-machine = { path = "../../../substrate/primitives/state-machine" }
-sp-runtime = { path = "../../../substrate/primitives/runtime" }
-sp-npos-elections = { path = "../../../substrate/primitives/npos-elections" }
-sc-transaction-pool-api = { path = "../../../substrate/client/transaction-pool/api" }
-
-frame-system = { path = "../../../substrate/frame/system" }
-frame-support = { path = "../../../substrate/frame/support" }
-frame-election-provider-support = { path = "../../../substrate/frame/election-provider-support" }
-pallet-election-provider-multi-phase = { path = "../../../substrate/frame/election-provider-multi-phase" }
-pallet-staking = { path = "../../../substrate/frame/staking" }
-pallet-balances = { path = "../../../substrate/frame/balances" }
-pallet-transaction-payment = { path = "../../../substrate/frame/transaction-payment" }
-
-core-primitives = { package = "polkadot-core-primitives", path = "../../core-primitives" }
-
-runtime-common = { package = "polkadot-runtime-common", path = "../../runtime/common" }
-polkadot-runtime = { path = "../../runtime/polkadot" }
-kusama-runtime = { path = "../../runtime/kusama" }
-westend-runtime = { path = "../../runtime/westend" }
-exitcode = "1.1"
-
-sub-tokens = { git = "https://github.com/paritytech/substrate-debug-kit", branch = "master" }
-signal-hook = "0.3"
-futures-util = "0.3"
-
-[dev-dependencies]
-assert_cmd = "2.0.4"
diff --git a/polkadot/utils/staking-miner/README.md b/polkadot/utils/staking-miner/README.md
deleted file mode 100644
index 7e7254dc7759f3cf811922eb670a4ff9aa542cff..0000000000000000000000000000000000000000
--- a/polkadot/utils/staking-miner/README.md
+++ /dev/null
@@ -1,70 +0,0 @@
-# Staking Miner
-
-Substrate chains validators compute a basic solution for the NPoS election. The optimization of the solution is computing-intensive and can be delegated to the `staking-miner`. The `staking-miner` does not act as validator and focuses solely on the optimization of the solution.
-
-The staking miner connects to a specified chain and keeps listening to new Signed phase of the [pallet-election-provider-multi-phase](https://crates.parity.io/pallet_election_provider_multi_phase/index.html) in order to submit solutions to the NPoS election. When the correct time comes, it computes its solution and submit it to the chain.
-The default miner algorithm is [sequential-phragmen](https://crates.parity.io/sp_npos_elections/phragmen/fn.seq_phragmen_core.html)] with a configurable number of balancing iterations that improve the score.
-
-Running the staking-miner requires passing the seed of a funded account in order to pay the fees for the transactions that will be sent. The same account's balance is used to reserve deposits as well. The best solution in each round is rewarded. All correct solutions will get their bond back. Any invalid solution will lose their bond.
-
-You can check the help with:
-```
-staking-miner --help
-```
-
-## Building
-
-You can build from the root of the Polkadot repository using:
-```
-cargo build --profile production --locked --package staking-miner --bin staking-miner
-```
-
-## Docker
-
-There are 2 options to build a staking-miner Docker image:
-- injected binary: the binary is first built on a Linux host and then injected into a Docker base image. This method only works if you have a Linux host or access to a pre-built binary from a Linux host.
-- multi-stage: the binary is entirely built within the multi-stage Docker image. There is no requirement on the host in terms of OS and the host does not even need to have any Rust toolchain installed.
-
-### Building the injected image
-
-First build the binary as documented [above](#building).
-You may then inject the binary into a Docker base image: `parity/base-bin` (running the command from the root of the Polkadot repository):
-```
-TODO: UPDATE THAT
-docker build -t staking-miner -f scripts/ci/dockerfiles/staking-miner/staking-miner_injected.Dockerfile target/release
-```
-
-### Building the multi-stage image
-
-Unlike the injected image that requires a Linux pre-built binary, this option does not requires a Linux host, nor Rust to be installed.
-The trade-off however is that it takes a little longer to build and this option is less ideal for CI tasks.
-You may build the multi-stage image the root of the Polkadot repository with:
-```
-TODO: UPDATE THAT
-docker build -t staking-miner -f scripts/ci/dockerfiles/staking-miner/staking-miner_builder.Dockerfile .
-```
-
-### Running
-
-A Docker container, especially one holding one of your `SEED` should be kept as secure as possible.
-While it won't prevent a malicious actor to read your `SEED` if they gain access to your container, it is nonetheless recommended running this container in `read-only` mode:
-
-```
-# The following line starts with an extra space on purpose:
- SEED=0x1234...
-
-docker run --rm -i \
-    --name staking-miner \
-    --read-only \
-    -e RUST_LOG=info \
-    -e SEED=$SEED \
-    -e URI=wss://your-node:9944 \
-    staking-miner dry-run
-```
-
-### Test locally
-
-Make sure you've built Polkadot, then:
-
-1. `cargo run -p polkadot --features fast-runtime -- --chain polkadot-dev --tmp --alice -lruntime=debug`
-2. `cargo run -p staking-miner -- --uri ws://localhost:9944 monitor --seed-or-path //Alice phrag-mms`
diff --git a/polkadot/utils/staking-miner/src/dry_run.rs b/polkadot/utils/staking-miner/src/dry_run.rs
deleted file mode 100644
index 7e46f630a1f5e581143a1c91c87823d23b934bd0..0000000000000000000000000000000000000000
--- a/polkadot/utils/staking-miner/src/dry_run.rs
+++ /dev/null
@@ -1,166 +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/>.
-
-//! The dry-run command.
-
-use crate::{opts::DryRunConfig, prelude::*, rpc::*, signer::Signer, Error, SharedRpcClient};
-use codec::Encode;
-use frame_support::traits::Currency;
-use sp_core::Bytes;
-use sp_npos_elections::ElectionScore;
-
-/// Forcefully create the snapshot. This can be used to compute the election at anytime.
-fn force_create_snapshot<T: EPM::Config>(ext: &mut Ext) -> Result<(), Error<T>> {
-	ext.execute_with(|| {
-		if <EPM::Snapshot<T>>::exists() {
-			log::info!(target: LOG_TARGET, "snapshot already exists.");
-			Ok(())
-		} else {
-			log::info!(target: LOG_TARGET, "creating a fake snapshot now.");
-			<EPM::Pallet<T>>::create_snapshot().map(|_| ()).map_err(Into::into)
-		}
-	})
-}
-
-/// Helper method to print the encoded size of the snapshot.
-async fn print_info<T: EPM::Config>(
-	rpc: &SharedRpcClient,
-	ext: &mut Ext,
-	raw_solution: &EPM::RawSolution<EPM::SolutionOf<T::MinerConfig>>,
-	extrinsic: &Bytes,
-) where
-	<T as EPM::Config>::Currency: Currency<T::AccountId, Balance = Balance>,
-{
-	ext.execute_with(|| {
-		log::info!(
-			target: LOG_TARGET,
-			"Snapshot Metadata: {:?}",
-			<EPM::Pallet<T>>::snapshot_metadata()
-		);
-		log::info!(
-			target: LOG_TARGET,
-			"Snapshot Encoded Length: {:?}",
-			<EPM::Pallet<T>>::snapshot()
-				.expect("snapshot must exist before calling `measure_snapshot_size`")
-				.encode()
-				.len()
-		);
-
-		let snapshot_size =
-			<EPM::Pallet<T>>::snapshot_metadata().expect("snapshot must exist by now; qed.");
-		let deposit = EPM::Pallet::<T>::deposit_for(raw_solution, snapshot_size);
-
-		let score = {
-			let ElectionScore { minimal_stake, sum_stake, sum_stake_squared } = raw_solution.score;
-			[Token::from(minimal_stake), Token::from(sum_stake), Token::from(sum_stake_squared)]
-		};
-
-		log::info!(
-			target: LOG_TARGET,
-			"solution score {:?} / deposit {:?} / length {:?}",
-			score,
-			Token::from(deposit),
-			raw_solution.encode().len(),
-		);
-	});
-
-	let info = rpc.payment_query_info(&extrinsic, None).await;
-
-	log::info!(
-		target: LOG_TARGET,
-		"payment_queryInfo: (fee = {}) {:?}",
-		info.as_ref()
-			.map(|d| Token::from(d.partial_fee))
-			.unwrap_or_else(|_| Token::from(0)),
-		info,
-	);
-}
-
-/// Find the stake threshold in order to have at most `count` voters.
-#[allow(unused)]
-fn find_threshold<T: EPM::Config>(ext: &mut Ext, count: usize) {
-	ext.execute_with(|| {
-		let mut voters = <EPM::Pallet<T>>::snapshot()
-			.expect("snapshot must exist before calling `measure_snapshot_size`")
-			.voters;
-		voters.sort_by_key(|(_voter, weight, _targets)| std::cmp::Reverse(*weight));
-		match voters.get(count) {
-			Some(threshold_voter) => println!("smallest allowed voter is {:?}", threshold_voter),
-			None => {
-				println!("requested truncation to {} voters but had only {}", count, voters.len());
-				println!("smallest current voter: {:?}", voters.last());
-			},
-		}
-	})
-}
-
-macro_rules! dry_run_cmd_for { ($runtime:ident) => { paste::paste! {
-	/// Execute the dry-run command.
-	pub(crate) async fn [<dry_run_cmd_ $runtime>](
-		rpc: SharedRpcClient,
-		config: DryRunConfig,
-		signer: Signer,
-	) -> Result<(), Error<$crate::[<$runtime _runtime_exports>]::Runtime>> {
-		use $crate::[<$runtime _runtime_exports>]::*;
-		let pallets = if config.force_snapshot {
-			vec!["Staking".to_string(), "BagsList".to_string()]
-		} else {
-			Default::default()
-		};
-		let mut ext = crate::create_election_ext::<Runtime>(rpc.clone(), config.at, pallets).await?;
-		if config.force_snapshot {
-			force_create_snapshot::<Runtime>(&mut ext)?;
-		};
-
-		log::debug!(target: LOG_TARGET, "solving with {:?}", config.solver);
-		let raw_solution = crate::mine_with::<Runtime>(&config.solver, &mut ext, false)?;
-
-		let nonce = crate::get_account_info::<Runtime>(&rpc, &signer.account, config.at)
-			.await?
-			.map(|i| i.nonce)
-			.expect("signer account is checked to exist upon startup; it can only die if it \
-			transfers funds out of it, or get slashed. If it does not exist at this point, \
-			it is likely due to a bug, or the signer got slashed. Terminating."
-		);
-		let tip = 0 as Balance;
-		let era = sp_runtime::generic::Era::Immortal;
-		let extrinsic = ext.execute_with(|| create_uxt(raw_solution.clone(), signer.clone(), nonce, tip, era));
-
-		let bytes = sp_core::Bytes(extrinsic.encode().to_vec());
-		print_info::<Runtime>(&rpc, &mut ext, &raw_solution, &bytes).await;
-
-		let feasibility_result = ext.execute_with(|| {
-			EPM::Pallet::<Runtime>::feasibility_check(raw_solution.clone(), EPM::ElectionCompute::Signed)
-		});
-		log::info!(target: LOG_TARGET, "feasibility result is {:?}", feasibility_result.map(|_| ()));
-
-		let dispatch_result = ext.execute_with(|| {
-			// manually tweak the phase.
-			EPM::CurrentPhase::<Runtime>::put(EPM::Phase::Signed);
-			EPM::Pallet::<Runtime>::submit(frame_system::RawOrigin::Signed(signer.account).into(), Box::new(raw_solution))
-		});
-		log::info!(target: LOG_TARGET, "dispatch result is {:?}", dispatch_result);
-
-		let dry_run_fut = rpc.dry_run(&bytes, None);
-		let outcome: sp_runtime::ApplyExtrinsicResult = await_request_and_decode(dry_run_fut).await.map_err::<Error<Runtime>, _>(Into::into)?;
-		log::info!(target: LOG_TARGET, "dry-run outcome is {:?}", outcome);
-		Ok(())
-	}
-}}}
-
-dry_run_cmd_for!(polkadot);
-dry_run_cmd_for!(kusama);
-dry_run_cmd_for!(westend);
diff --git a/polkadot/utils/staking-miner/src/emergency_solution.rs b/polkadot/utils/staking-miner/src/emergency_solution.rs
deleted file mode 100644
index 9ea9f90756e22f458fc1c4e6872d77b7a246282b..0000000000000000000000000000000000000000
--- a/polkadot/utils/staking-miner/src/emergency_solution.rs
+++ /dev/null
@@ -1,65 +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/>.
-
-//! The emergency-solution command.
-
-use crate::{prelude::*, EmergencySolutionConfig, Error, SharedRpcClient};
-use codec::Encode;
-use std::io::Write;
-
-macro_rules! emergency_solution_cmd_for { ($runtime:ident) => { paste::paste! {
-	/// Execute the emergency-solution command.
-	pub(crate) async fn [<emergency_solution_cmd_ $runtime>](
-		client: SharedRpcClient,
-		config: EmergencySolutionConfig,
-	) -> Result<(), Error<$crate::[<$runtime _runtime_exports>]::Runtime>> {
-		use $crate::[<$runtime _runtime_exports>]::*;
-
-		let mut ext = crate::create_election_ext::<Runtime>(client, config.at, vec![]).await?;
-		let raw_solution = crate::mine_with::<Runtime>(&config.solver, &mut ext, false)?;
-
-		ext.execute_with(|| {
-			assert!(EPM::Pallet::<Runtime>::current_phase().is_emergency());
-
-			log::info!(target: LOG_TARGET, "mined solution with {:?}", &raw_solution.score);
-
-			let ready_solution = EPM::Pallet::<Runtime>::feasibility_check(raw_solution, EPM::ElectionCompute::Signed)?;
-			let encoded_size = ready_solution.encoded_size();
-			let score = ready_solution.score;
-			let mut supports = ready_solution.supports.into_inner();
-			// maybe truncate.
-			if let Some(take) = config.take {
-				log::info!(target: LOG_TARGET, "truncating {} winners to {}", supports.len(), take);
-				supports.sort_unstable_by_key(|(_, s)| s.total);
-				supports.truncate(take);
-			}
-
-			// write to file and stdout.
-			let encoded_support = supports.encode();
-			let mut supports_file = std::fs::File::create("solution.supports.bin")?;
-			supports_file.write_all(&encoded_support)?;
-
-			log::info!(target: LOG_TARGET, "ReadySolution: size {:?} / score = {:?}", encoded_size, score);
-			log::trace!(target: LOG_TARGET, "Supports: {}", sp_core::hexdisplay::HexDisplay::from(&encoded_support));
-
-			Ok(())
-		})
-	}
-}}}
-
-emergency_solution_cmd_for!(polkadot);
-emergency_solution_cmd_for!(kusama);
-emergency_solution_cmd_for!(westend);
diff --git a/polkadot/utils/staking-miner/src/main.rs b/polkadot/utils/staking-miner/src/main.rs
deleted file mode 100644
index 90b2c7366a1bab6b1a742d0274f872341e3c3a9a..0000000000000000000000000000000000000000
--- a/polkadot/utils/staking-miner/src/main.rs
+++ /dev/null
@@ -1,665 +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/>.
-
-//! # Polkadot Staking Miner.
-//!
-//! Simple bot capable of monitoring a polkadot (and cousins) chain and submitting solutions to the
-//! `pallet-election-provider-multi-phase`. See `--help` for more details.
-//!
-//! # Implementation Notes:
-//!
-//! - First draft: Be aware that this is the first draft and there might be bugs, or undefined
-//!   behaviors. Don't attach this bot to an account with lots of funds.
-//! - Quick to crash: The bot is written so that it only continues to work if everything goes well.
-//!   In case of any failure (RPC, logic, IO), it will crash. This was a decision to simplify the
-//!   development. It is intended to run this bot with a `restart = true` way, so that it reports it
-//!   crash, but resumes work thereafter.
-
-// Silence erroneous warning about unsafe not being required whereas it is
-// see https://github.com/rust-lang/rust/issues/49112
-#![allow(unused_unsafe)]
-
-mod dry_run;
-mod emergency_solution;
-mod monitor;
-mod opts;
-mod prelude;
-mod rpc;
-mod runtime_versions;
-mod signer;
-
-pub(crate) use prelude::*;
-pub(crate) use signer::get_account_info;
-
-use crate::opts::*;
-use clap::Parser;
-use frame_election_provider_support::NposSolver;
-use frame_support::traits::Get;
-use futures_util::StreamExt;
-use jsonrpsee::ws_client::{WsClient, WsClientBuilder};
-use remote_externalities::{Builder, Mode, OnlineConfig, Transport};
-use rpc::{RpcApiClient, SharedRpcClient};
-use runtime_versions::RuntimeVersions;
-use signal_hook::consts::signal::*;
-use signal_hook_tokio::Signals;
-use sp_npos_elections::BalancingConfig;
-use std::{ops::Deref, sync::Arc, time::Duration};
-use tracing_subscriber::{fmt, EnvFilter};
-
-pub(crate) enum AnyRuntime {
-	Polkadot,
-	Kusama,
-	Westend,
-}
-
-pub(crate) static mut RUNTIME: AnyRuntime = AnyRuntime::Polkadot;
-
-macro_rules! construct_runtime_prelude {
-	($runtime:ident) => { paste::paste! {
-		pub(crate) mod [<$runtime _runtime_exports>] {
-			pub(crate) use crate::prelude::EPM;
-			pub(crate) use [<$runtime _runtime>]::*;
-			pub(crate) use crate::monitor::[<monitor_cmd_ $runtime>] as monitor_cmd;
-			pub(crate) use crate::dry_run::[<dry_run_cmd_ $runtime>] as dry_run_cmd;
-			pub(crate) use crate::emergency_solution::[<emergency_solution_cmd_ $runtime>] as emergency_solution_cmd;
-			pub(crate) use private::{[<create_uxt_ $runtime>] as create_uxt};
-
-			mod private {
-				use super::*;
-				pub(crate) fn [<create_uxt_ $runtime>](
-					raw_solution: EPM::RawSolution<EPM::SolutionOf<Runtime>>,
-					signer: crate::signer::Signer,
-					nonce: crate::prelude::Nonce,
-					tip: crate::prelude::Balance,
-					era: sp_runtime::generic::Era,
-				) -> UncheckedExtrinsic {
-					use codec::Encode as _;
-					use sp_core::Pair as _;
-					use sp_runtime::traits::StaticLookup as _;
-
-					let crate::signer::Signer { account, pair, .. } = signer;
-
-					let local_call = EPMCall::<Runtime>::submit { raw_solution: Box::new(raw_solution) };
-					let call: RuntimeCall = <EPMCall<Runtime> as std::convert::TryInto<RuntimeCall>>::try_into(local_call)
-						.expect("election provider pallet must exist in the runtime, thus \
-							inner call can be converted, qed."
-						);
-
-					let extra: SignedExtra = crate::[<signed_ext_builder_ $runtime>](nonce, tip, era);
-					let raw_payload = SignedPayload::new(call, extra).expect("creating signed payload infallible; qed.");
-					let signature = raw_payload.using_encoded(|payload| {
-						pair.sign(payload)
-					});
-					let (call, extra, _) = raw_payload.deconstruct();
-					let address = <Runtime as frame_system::Config>::Lookup::unlookup(account);
-					let extrinsic = UncheckedExtrinsic::new_signed(call, address, signature.into(), extra);
-					log::debug!(
-						target: crate::LOG_TARGET, "constructed extrinsic {} with length {}",
-						sp_core::hexdisplay::HexDisplay::from(&extrinsic.encode()),
-						extrinsic.encode().len(),
-					);
-					extrinsic
-				}
-			}
-		}}
-	};
-}
-
-// NOTE: we might be able to use some code from the bridges repo here.
-fn signed_ext_builder_polkadot(
-	nonce: Nonce,
-	tip: Balance,
-	era: sp_runtime::generic::Era,
-) -> polkadot_runtime_exports::SignedExtra {
-	use polkadot_runtime_exports::Runtime;
-	(
-		frame_system::CheckNonZeroSender::<Runtime>::new(),
-		frame_system::CheckSpecVersion::<Runtime>::new(),
-		frame_system::CheckTxVersion::<Runtime>::new(),
-		frame_system::CheckGenesis::<Runtime>::new(),
-		frame_system::CheckMortality::<Runtime>::from(era),
-		frame_system::CheckNonce::<Runtime>::from(nonce),
-		frame_system::CheckWeight::<Runtime>::new(),
-		pallet_transaction_payment::ChargeTransactionPayment::<Runtime>::from(tip),
-		runtime_common::claims::PrevalidateAttests::<Runtime>::new(),
-	)
-}
-
-fn signed_ext_builder_kusama(
-	nonce: Nonce,
-	tip: Balance,
-	era: sp_runtime::generic::Era,
-) -> kusama_runtime_exports::SignedExtra {
-	use kusama_runtime_exports::Runtime;
-	(
-		frame_system::CheckNonZeroSender::<Runtime>::new(),
-		frame_system::CheckSpecVersion::<Runtime>::new(),
-		frame_system::CheckTxVersion::<Runtime>::new(),
-		frame_system::CheckGenesis::<Runtime>::new(),
-		frame_system::CheckMortality::<Runtime>::from(era),
-		frame_system::CheckNonce::<Runtime>::from(nonce),
-		frame_system::CheckWeight::<Runtime>::new(),
-		pallet_transaction_payment::ChargeTransactionPayment::<Runtime>::from(tip),
-	)
-}
-
-fn signed_ext_builder_westend(
-	nonce: Nonce,
-	tip: Balance,
-	era: sp_runtime::generic::Era,
-) -> westend_runtime_exports::SignedExtra {
-	use westend_runtime_exports::Runtime;
-	(
-		frame_system::CheckNonZeroSender::<Runtime>::new(),
-		frame_system::CheckSpecVersion::<Runtime>::new(),
-		frame_system::CheckTxVersion::<Runtime>::new(),
-		frame_system::CheckGenesis::<Runtime>::new(),
-		frame_system::CheckMortality::<Runtime>::from(era),
-		frame_system::CheckNonce::<Runtime>::from(nonce),
-		frame_system::CheckWeight::<Runtime>::new(),
-		pallet_transaction_payment::ChargeTransactionPayment::<Runtime>::from(tip),
-	)
-}
-
-construct_runtime_prelude!(polkadot);
-construct_runtime_prelude!(kusama);
-construct_runtime_prelude!(westend);
-
-// NOTE: this is no longer used extensively, most of the per-runtime stuff us delegated to
-// `construct_runtime_prelude` and macro's the import directly from it. A part of the code is also
-// still generic over `T`. My hope is to still make everything generic over a `Runtime`, but sadly
-// that is not currently possible as each runtime has its unique `Call`, and all Calls are not
-// sharing any generic trait. In other words, to create the `UncheckedExtrinsic` of each chain, you
-// need the concrete `Call` of that chain as well.
-#[macro_export]
-macro_rules! any_runtime {
-	($($code:tt)*) => {
-		unsafe {
-			match $crate::RUNTIME {
-				$crate::AnyRuntime::Polkadot => {
-					#[allow(unused)]
-					use $crate::polkadot_runtime_exports::*;
-					$($code)*
-				},
-				$crate::AnyRuntime::Kusama => {
-					#[allow(unused)]
-					use $crate::kusama_runtime_exports::*;
-					$($code)*
-				},
-				$crate::AnyRuntime::Westend => {
-					#[allow(unused)]
-					use $crate::westend_runtime_exports::*;
-					$($code)*
-				}
-			}
-		}
-	}
-}
-
-/// Same as [`any_runtime`], but instead of returning a `Result`, this simply returns `()`. Useful
-/// for situations where the result is not useful and un-ergonomic to handle.
-#[macro_export]
-macro_rules! any_runtime_unit {
-	($($code:tt)*) => {
-		unsafe {
-			match $crate::RUNTIME {
-				$crate::AnyRuntime::Polkadot => {
-					#[allow(unused)]
-					use $crate::polkadot_runtime_exports::*;
-					let _ = $($code)*;
-				},
-				$crate::AnyRuntime::Kusama => {
-					#[allow(unused)]
-					use $crate::kusama_runtime_exports::*;
-					let _ = $($code)*;
-				},
-				$crate::AnyRuntime::Westend => {
-					#[allow(unused)]
-					use $crate::westend_runtime_exports::*;
-					let _ = $($code)*;
-				}
-			}
-		}
-	}
-}
-
-#[derive(frame_support::DebugNoBound, thiserror::Error)]
-enum Error<T: EPM::Config> {
-	Io(#[from] std::io::Error),
-	JsonRpsee(#[from] jsonrpsee::core::Error),
-	RpcHelperError(#[from] rpc::RpcHelperError),
-	Codec(#[from] codec::Error),
-	Crypto(sp_core::crypto::SecretStringError),
-	RemoteExternalities(&'static str),
-	PalletMiner(EPM::unsigned::MinerError),
-	PalletElection(EPM::ElectionError<T>),
-	PalletFeasibility(EPM::FeasibilityError),
-	AccountDoesNotExists,
-	IncorrectPhase,
-	AlreadySubmitted,
-	VersionMismatch,
-	StrategyNotSatisfied,
-	Other(String),
-}
-
-impl<T: EPM::Config> From<sp_core::crypto::SecretStringError> for Error<T> {
-	fn from(e: sp_core::crypto::SecretStringError) -> Error<T> {
-		Error::Crypto(e)
-	}
-}
-
-impl<T: EPM::Config> From<EPM::unsigned::MinerError> for Error<T> {
-	fn from(e: EPM::unsigned::MinerError) -> Error<T> {
-		Error::PalletMiner(e)
-	}
-}
-
-impl<T: EPM::Config> From<EPM::ElectionError<T>> for Error<T> {
-	fn from(e: EPM::ElectionError<T>) -> Error<T> {
-		Error::PalletElection(e)
-	}
-}
-
-impl<T: EPM::Config> From<EPM::FeasibilityError> for Error<T> {
-	fn from(e: EPM::FeasibilityError) -> Error<T> {
-		Error::PalletFeasibility(e)
-	}
-}
-
-impl<T: EPM::Config> std::fmt::Display for Error<T> {
-	fn fmt(&self, f: &mut std::fmt::Formatter<'_>) -> std::fmt::Result {
-		<Error<T> as std::fmt::Debug>::fmt(self, f)
-	}
-}
-
-frame_support::parameter_types! {
-	/// Number of balancing iterations for a solution algorithm. Set based on the [`Solvers`] CLI
-	/// config.
-	pub static BalanceIterations: usize = 10;
-	pub static Balancing: Option<BalancingConfig> = Some( BalancingConfig { iterations: BalanceIterations::get(), tolerance: 0 } );
-}
-
-/// Build the Ext at hash with all the data of `ElectionProviderMultiPhase` and any additional
-/// pallets.
-async fn create_election_ext<T>(
-	client: SharedRpcClient,
-	at: Option<Hash>,
-	additional: Vec<String>,
-) -> Result<Ext, Error<T>>
-where
-	T: EPM::Config,
-{
-	use frame_support::{storage::generator::StorageMap, traits::PalletInfo};
-	use sp_core::hashing::twox_128;
-
-	let mut pallets = vec![<T as frame_system::Config>::PalletInfo::name::<EPM::Pallet<T>>()
-		.expect("Pallet always has name; qed.")
-		.to_string()];
-	pallets.extend(additional);
-	Builder::<Block>::new()
-		.mode(Mode::Online(OnlineConfig {
-			transport: Transport::Uri(client.uri().to_owned()),
-			at,
-			pallets,
-			hashed_prefixes: vec![<frame_system::BlockHash<T>>::prefix_hash()],
-			hashed_keys: vec![[twox_128(b"System"), twox_128(b"Number")].concat()],
-			..Default::default()
-		}))
-		.build()
-		.await
-		.map_err(|why| Error::<T>::RemoteExternalities(why))
-		.map(|rx| rx.inner_ext)
-}
-
-/// Compute the election. It expects to NOT be `Phase::Off`. In other words, the snapshot must
-/// exists on the given externalities.
-fn mine_solution<T, S>(
-	ext: &mut Ext,
-	do_feasibility: bool,
-) -> Result<EPM::RawSolution<EPM::SolutionOf<T::MinerConfig>>, Error<T>>
-where
-	T: EPM::Config,
-	S: NposSolver<
-		Error = <<T as EPM::Config>::Solver as NposSolver>::Error,
-		AccountId = <<T as EPM::Config>::Solver as NposSolver>::AccountId,
-	>,
-{
-	ext.execute_with(|| {
-		let (solution, _) = <EPM::Pallet<T>>::mine_solution().map_err::<Error<T>, _>(Into::into)?;
-		if do_feasibility {
-			let _ = <EPM::Pallet<T>>::feasibility_check(
-				solution.clone(),
-				EPM::ElectionCompute::Signed,
-			)?;
-		}
-		Ok(solution)
-	})
-}
-
-/// Mine a solution with the given `solver`.
-fn mine_with<T>(
-	solver: &Solver,
-	ext: &mut Ext,
-	do_feasibility: bool,
-) -> Result<EPM::RawSolution<EPM::SolutionOf<T::MinerConfig>>, Error<T>>
-where
-	T: EPM::Config,
-	T::Solver: NposSolver<Error = sp_npos_elections::Error>,
-{
-	use frame_election_provider_support::{PhragMMS, SequentialPhragmen};
-
-	match solver {
-		Solver::SeqPhragmen { iterations } => {
-			BalanceIterations::set(*iterations);
-			mine_solution::<
-				T,
-				SequentialPhragmen<
-					<T as frame_system::Config>::AccountId,
-					sp_runtime::Perbill,
-					Balancing,
-				>,
-			>(ext, do_feasibility)
-		},
-		Solver::PhragMMS { iterations } => {
-			BalanceIterations::set(*iterations);
-			mine_solution::<
-				T,
-				PhragMMS<<T as frame_system::Config>::AccountId, sp_runtime::Perbill, Balancing>,
-			>(ext, do_feasibility)
-		},
-	}
-}
-
-#[allow(unused)]
-fn mine_dpos<T: EPM::Config>(ext: &mut Ext) -> Result<(), Error<T>> {
-	ext.execute_with(|| {
-		use std::collections::BTreeMap;
-		use EPM::RoundSnapshot;
-		let RoundSnapshot { voters, .. } = EPM::Snapshot::<T>::get().unwrap();
-		let desired_targets = EPM::DesiredTargets::<T>::get().unwrap();
-		let mut candidates_and_backing = BTreeMap::<T::AccountId, u128>::new();
-		voters.into_iter().for_each(|(who, stake, targets)| {
-			if targets.is_empty() {
-				println!("target = {:?}", (who, stake, targets));
-				return
-			}
-			let share: u128 = (stake as u128) / (targets.len() as u128);
-			for target in targets {
-				*candidates_and_backing.entry(target.clone()).or_default() += share
-			}
-		});
-
-		let mut candidates_and_backing =
-			candidates_and_backing.into_iter().collect::<Vec<(_, _)>>();
-		candidates_and_backing.sort_by_key(|(_, total_stake)| *total_stake);
-		let winners = candidates_and_backing
-			.into_iter()
-			.rev()
-			.take(desired_targets as usize)
-			.collect::<Vec<_>>();
-		let score = {
-			let min_staker = *winners.last().map(|(_, stake)| stake).unwrap();
-			let sum_stake = winners.iter().fold(0u128, |acc, (_, stake)| acc + stake);
-			let sum_squared = winners.iter().fold(0u128, |acc, (_, stake)| acc + stake);
-			[min_staker, sum_stake, sum_squared]
-		};
-		println!("mined a dpos-like solution with score = {:?}", score);
-		Ok(())
-	})
-}
-
-pub(crate) async fn check_versions<T: frame_system::Config + EPM::Config>(
-	rpc: &SharedRpcClient,
-	print: bool,
-) -> Result<(), Error<T>> {
-	let linked_version = T::Version::get();
-	let on_chain_version = rpc
-		.runtime_version(None)
-		.await
-		.expect("runtime version RPC should always work; qed");
-
-	let do_print = || {
-		log::info!(
-			target: LOG_TARGET,
-			"linked version {:?}",
-			(&linked_version.spec_name, &linked_version.spec_version)
-		);
-		log::info!(
-			target: LOG_TARGET,
-			"on-chain version {:?}",
-			(&on_chain_version.spec_name, &on_chain_version.spec_version)
-		);
-	};
-
-	if print {
-		do_print();
-	}
-
-	// we relax the checking here a bit, which should not cause any issues in production (a chain
-	// that messes up its spec name is highly unlikely), but it allows us to do easier testing.
-	if linked_version.spec_name != on_chain_version.spec_name ||
-		linked_version.spec_version != on_chain_version.spec_version
-	{
-		if !print {
-			do_print();
-		}
-		log::error!(
-			target: LOG_TARGET,
-			"VERSION MISMATCH: any transaction will fail with bad-proof"
-		);
-		Err(Error::VersionMismatch)
-	} else {
-		Ok(())
-	}
-}
-
-/// Control how we exit the application
-fn controlled_exit(code: i32) {
-	log::info!(target: LOG_TARGET, "Exiting application");
-	std::process::exit(code);
-}
-
-/// Handles the various signal and exit the application
-/// when appropriate.
-async fn handle_signals(mut signals: Signals) {
-	let mut keyboard_sig_count: u8 = 0;
-	while let Some(signal) = signals.next().await {
-		match signal {
-			// Interrupts come from the keyboard
-			SIGQUIT | SIGINT => {
-				if keyboard_sig_count >= 1 {
-					log::info!(
-						target: LOG_TARGET,
-						"Received keyboard termination signal #{}/{}, quitting...",
-						keyboard_sig_count + 1,
-						2
-					);
-					controlled_exit(exitcode::OK);
-				}
-				keyboard_sig_count += 1;
-				log::warn!(
-					target: LOG_TARGET,
-					"Received keyboard termination signal #{}, if you keep doing that I will really quit",
-					keyboard_sig_count
-				);
-			},
-
-			SIGKILL | SIGTERM => {
-				log::info!(target: LOG_TARGET, "Received SIGKILL | SIGTERM, quitting...");
-				controlled_exit(exitcode::OK);
-			},
-			_ => unreachable!(),
-		}
-	}
-}
-
-#[tokio::main]
-async fn main() {
-	fmt().with_env_filter(EnvFilter::from_default_env()).init();
-
-	let Opt { uri, command, connection_timeout, request_timeout } = Opt::parse();
-	log::debug!(target: LOG_TARGET, "attempting to connect to {:?}", uri);
-
-	let signals = Signals::new(&[SIGTERM, SIGINT, SIGQUIT]).expect("Failed initializing Signals");
-	let handle = signals.handle();
-	let signals_task = tokio::spawn(handle_signals(signals));
-
-	let rpc = loop {
-		match SharedRpcClient::new(
-			&uri,
-			Duration::from_secs(connection_timeout as u64),
-			Duration::from_secs(request_timeout as u64),
-		)
-		.await
-		{
-			Ok(client) => break client,
-			Err(why) => {
-				log::warn!(
-					target: LOG_TARGET,
-					"failed to connect to client due to {:?}, retrying soon..",
-					why
-				);
-				tokio::time::sleep(std::time::Duration::from_millis(2500)).await;
-			},
-		}
-	};
-
-	let chain: String = rpc.system_chain().await.expect("system_chain infallible; qed.");
-	match chain.to_lowercase().as_str() {
-		"polkadot" | "development" => {
-			sp_core::crypto::set_default_ss58_version(
-				sp_core::crypto::Ss58AddressFormatRegistry::PolkadotAccount.into(),
-			);
-			sub_tokens::dynamic::set_name("DOT");
-			sub_tokens::dynamic::set_decimal_points(10_000_000_000);
-			// safety: this program will always be single threaded, thus accessing global static is
-			// safe.
-			unsafe {
-				RUNTIME = AnyRuntime::Polkadot;
-			}
-		},
-		"kusama" | "kusama-dev" => {
-			sp_core::crypto::set_default_ss58_version(
-				sp_core::crypto::Ss58AddressFormatRegistry::KusamaAccount.into(),
-			);
-			sub_tokens::dynamic::set_name("KSM");
-			sub_tokens::dynamic::set_decimal_points(1_000_000_000_000);
-			// safety: this program will always be single threaded, thus accessing global static is
-			// safe.
-			unsafe {
-				RUNTIME = AnyRuntime::Kusama;
-			}
-		},
-		"westend" => {
-			sp_core::crypto::set_default_ss58_version(
-				sp_core::crypto::Ss58AddressFormatRegistry::PolkadotAccount.into(),
-			);
-			sub_tokens::dynamic::set_name("WND");
-			sub_tokens::dynamic::set_decimal_points(1_000_000_000_000);
-			// safety: this program will always be single threaded, thus accessing global static is
-			// safe.
-			unsafe {
-				RUNTIME = AnyRuntime::Westend;
-			}
-		},
-		_ => {
-			eprintln!("unexpected chain: {:?}", chain);
-			return
-		},
-	}
-	log::info!(target: LOG_TARGET, "connected to chain {:?}", chain);
-
-	any_runtime_unit! {
-		check_versions::<Runtime>(&rpc, true).await
-	};
-
-	let outcome = any_runtime! {
-		match command {
-			Command::Monitor(monitor_config) =>
-			{
-				let signer_account = any_runtime! {
-					signer::signer_uri_from_string::<Runtime>(&monitor_config.seed_or_path , &rpc)
-						.await
-						.expect("Provided account is invalid, terminating.")
-				};
-				monitor_cmd(rpc, monitor_config, signer_account).await
-				.map_err(|e| {
-					log::error!(target: LOG_TARGET, "Monitor error: {:?}", e);
-				})},
-			Command::DryRun(dryrun_config) => {
-				let signer_account = any_runtime! {
-					signer::signer_uri_from_string::<Runtime>(&dryrun_config.seed_or_path , &rpc)
-						.await
-						.expect("Provided account is invalid, terminating.")
-				};
-				dry_run_cmd(rpc, dryrun_config, signer_account).await
-				.map_err(|e| {
-					log::error!(target: LOG_TARGET, "DryRun error: {:?}", e);
-				})},
-			Command::EmergencySolution(emergency_solution_config) =>
-				emergency_solution_cmd(rpc, emergency_solution_config).await
-				.map_err(|e| {
-					log::error!(target: LOG_TARGET, "EmergencySolution error: {:?}", e);
-				}),
-			Command::Info(info_opts) => {
-				let remote_runtime_version = rpc.runtime_version(None).await.expect("runtime_version infallible; qed.");
-
-				let builtin_version = any_runtime! {
-					Version::get()
-				};
-
-				let versions = RuntimeVersions::new(&remote_runtime_version, &builtin_version);
-
-				if !info_opts.json {
-					println!("{}", versions);
-				} else {
-					let versions = serde_json::to_string_pretty(&versions).expect("Failed serializing version info");
-					println!("{}", versions);
-				}
-				Ok(())
-			}
-		}
-	};
-	log::info!(target: LOG_TARGET, "round of execution finished. outcome = {:?}", outcome);
-
-	handle.close();
-	let _ = signals_task.await;
-}
-
-#[cfg(test)]
-mod tests {
-	use super::*;
-
-	fn get_version<T: frame_system::Config>() -> sp_version::RuntimeVersion {
-		T::Version::get()
-	}
-
-	#[test]
-	fn any_runtime_works() {
-		unsafe {
-			RUNTIME = AnyRuntime::Polkadot;
-		}
-		let polkadot_version = any_runtime! { get_version::<Runtime>() };
-
-		unsafe {
-			RUNTIME = AnyRuntime::Kusama;
-		}
-		let kusama_version = any_runtime! { get_version::<Runtime>() };
-
-		assert_eq!(polkadot_version.spec_name, "polkadot".into());
-		assert_eq!(kusama_version.spec_name, "kusama".into());
-	}
-}
diff --git a/polkadot/utils/staking-miner/src/monitor.rs b/polkadot/utils/staking-miner/src/monitor.rs
deleted file mode 100644
index 607ecb6baa42c9b24a2453044271a6446b16d285..0000000000000000000000000000000000000000
--- a/polkadot/utils/staking-miner/src/monitor.rs
+++ /dev/null
@@ -1,478 +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/>.
-
-//! The monitor command.
-
-use crate::{
-	prelude::*, rpc::*, signer::Signer, Error, MonitorConfig, SharedRpcClient, SubmissionStrategy,
-};
-use codec::Encode;
-use jsonrpsee::core::Error as RpcError;
-use sc_transaction_pool_api::TransactionStatus;
-use sp_core::storage::StorageKey;
-use sp_runtime::Perbill;
-use std::sync::Arc;
-use tokio::sync::{mpsc, Mutex};
-use EPM::{signed::SubmissionIndicesOf, SignedSubmissionOf};
-
-/// Ensure that now is the signed phase.
-async fn ensure_signed_phase<T: EPM::Config, B: BlockT<Hash = Hash>>(
-	rpc: &SharedRpcClient,
-	at: B::Hash,
-) -> Result<(), Error<T>> {
-	let key = StorageKey(EPM::CurrentPhase::<T>::hashed_key().to_vec());
-	let phase = rpc
-		.get_storage_and_decode::<EPM::Phase<BlockNumber>>(&key, Some(at))
-		.await
-		.map_err::<Error<T>, _>(Into::into)?
-		.unwrap_or_default();
-
-	if phase.is_signed() {
-		Ok(())
-	} else {
-		Err(Error::IncorrectPhase)
-	}
-}
-
-/// Ensure that our current `us` have not submitted anything previously.
-async fn ensure_no_previous_solution<T, B>(
-	rpc: &SharedRpcClient,
-	at: Hash,
-	us: &AccountId,
-) -> Result<(), Error<T>>
-where
-	T: EPM::Config + frame_system::Config<AccountId = AccountId, Hash = Hash>,
-	B: BlockT,
-{
-	let indices_key = StorageKey(EPM::SignedSubmissionIndices::<T>::hashed_key().to_vec());
-
-	let indices: SubmissionIndicesOf<T> = rpc
-		.get_storage_and_decode(&indices_key, Some(at))
-		.await
-		.map_err::<Error<T>, _>(Into::into)?
-		.unwrap_or_default();
-
-	for (_score, _bn, idx) in indices {
-		let key = StorageKey(EPM::SignedSubmissionsMap::<T>::hashed_key_for(idx));
-
-		if let Some(submission) = rpc
-			.get_storage_and_decode::<SignedSubmissionOf<T>>(&key, Some(at))
-			.await
-			.map_err::<Error<T>, _>(Into::into)?
-		{
-			if &submission.who == us {
-				return Err(Error::AlreadySubmitted)
-			}
-		}
-	}
-
-	Ok(())
-}
-
-/// `true` if `our_score` should pass the onchain `best_score` with the given strategy.
-pub(crate) fn score_passes_strategy(
-	our_score: sp_npos_elections::ElectionScore,
-	best_score: sp_npos_elections::ElectionScore,
-	strategy: SubmissionStrategy,
-) -> bool {
-	match strategy {
-		SubmissionStrategy::Always => true,
-		SubmissionStrategy::IfLeading =>
-			our_score == best_score ||
-				our_score.strict_threshold_better(best_score, Perbill::zero()),
-		SubmissionStrategy::ClaimBetterThan(epsilon) =>
-			our_score.strict_threshold_better(best_score, epsilon),
-		SubmissionStrategy::ClaimNoWorseThan(epsilon) =>
-			!best_score.strict_threshold_better(our_score, epsilon),
-	}
-}
-
-/// Reads all current solutions and checks the scores according to the `SubmissionStrategy`.
-async fn ensure_strategy_met<T: EPM::Config, B: BlockT>(
-	rpc: &SharedRpcClient,
-	at: Hash,
-	score: sp_npos_elections::ElectionScore,
-	strategy: SubmissionStrategy,
-	max_submissions: u32,
-) -> Result<(), Error<T>> {
-	// don't care about current scores.
-	if matches!(strategy, SubmissionStrategy::Always) {
-		return Ok(())
-	}
-
-	let indices_key = StorageKey(EPM::SignedSubmissionIndices::<T>::hashed_key().to_vec());
-
-	let indices: SubmissionIndicesOf<T> = rpc
-		.get_storage_and_decode(&indices_key, Some(at))
-		.await
-		.map_err::<Error<T>, _>(Into::into)?
-		.unwrap_or_default();
-
-	if indices.len() >= max_submissions as usize {
-		log::debug!(target: LOG_TARGET, "The submissions queue is full");
-	}
-
-	// default score is all zeros, any score is better than it.
-	let best_score = indices.last().map(|(score, _, _)| *score).unwrap_or_default();
-	log::debug!(target: LOG_TARGET, "best onchain score is {:?}", best_score);
-
-	if score_passes_strategy(score, best_score, strategy) {
-		Ok(())
-	} else {
-		Err(Error::StrategyNotSatisfied)
-	}
-}
-
-async fn get_latest_head<T: EPM::Config>(
-	rpc: &SharedRpcClient,
-	mode: &str,
-) -> Result<Hash, Error<T>> {
-	if mode == "head" {
-		match rpc.block_hash(None).await {
-			Ok(Some(hash)) => Ok(hash),
-			Ok(None) => Err(Error::Other("Best head not found".into())),
-			Err(e) => Err(e.into()),
-		}
-	} else {
-		rpc.finalized_head().await.map_err(Into::into)
-	}
-}
-
-macro_rules! monitor_cmd_for { ($runtime:tt) => { paste::paste! {
-
-	/// The monitor command.
-	pub(crate) async fn [<monitor_cmd_ $runtime>](
-		rpc: SharedRpcClient,
-		config: MonitorConfig,
-		signer: Signer,
-	) -> Result<(), Error<$crate::[<$runtime _runtime_exports>]::Runtime>> {
-		use $crate::[<$runtime _runtime_exports>]::*;
-		type StakingMinerError = Error<$crate::[<$runtime _runtime_exports>]::Runtime>;
-
-		let heads_subscription = ||
-			if config.listen == "head" {
-				rpc.subscribe_new_heads()
-			} else {
-				rpc.subscribe_finalized_heads()
-			};
-
-		let mut subscription = heads_subscription().await?;
-		let (tx, mut rx) = mpsc::unbounded_channel::<StakingMinerError>();
-		let submit_lock = Arc::new(Mutex::new(()));
-
-		loop {
-			let at = tokio::select! {
-				maybe_rp = subscription.next() => {
-					match maybe_rp {
-						Some(Ok(r)) => r,
-						Some(Err(e)) => {
-							log::error!(target: LOG_TARGET, "subscription failed to decode Header {:?}, this is bug please file an issue", e);
-							return Err(e.into());
-						}
-						// The subscription was dropped, should only happen if:
-						//	- the connection was closed.
-						//	- the subscription could not keep up with the server.
-						None => {
-							log::warn!(target: LOG_TARGET, "subscription to `subscribeNewHeads/subscribeFinalizedHeads` terminated. Retrying..");
-							subscription = heads_subscription().await?;
-							continue
-						}
-					}
-				},
-				maybe_err = rx.recv() => {
-					match maybe_err {
-						Some(err) => return Err(err),
-						None => unreachable!("at least one sender kept in the main loop should always return Some; qed"),
-					}
-				}
-			};
-
-			// Spawn task and non-recoverable errors are sent back to the main task
-			// such as if the connection has been closed.
-			tokio::spawn(
-				send_and_watch_extrinsic(rpc.clone(), tx.clone(), at, signer.clone(), config.clone(), submit_lock.clone())
-			);
-		}
-
-		/// Construct extrinsic at given block and watch it.
-		async fn send_and_watch_extrinsic(
-			rpc: SharedRpcClient,
-			tx: mpsc::UnboundedSender<StakingMinerError>,
-			at: Header,
-			signer: Signer,
-			config: MonitorConfig,
-			submit_lock: Arc<Mutex<()>>,
-		) {
-
-			async fn flatten<T>(
-				handle: tokio::task::JoinHandle<Result<T, StakingMinerError>>
-			) -> Result<T, StakingMinerError> {
-				match handle.await {
-					Ok(Ok(result)) => Ok(result),
-					Ok(Err(err)) => Err(err),
-					Err(err) => panic!("tokio spawn task failed; kill task: {:?}", err),
-				}
-			}
-
-			let hash = at.hash();
-			log::trace!(target: LOG_TARGET, "new event at #{:?} ({:?})", at.number, hash);
-
-			// block on this because if this fails there is no way to recover from
-			// that error i.e, upgrade/downgrade required.
-			if let Err(err) = crate::check_versions::<Runtime>(&rpc, false).await {
-				let _ = tx.send(err.into());
-				return;
-			}
-
-			let rpc1 = rpc.clone();
-			let rpc2 = rpc.clone();
-			let account = signer.account.clone();
-
-			let signed_phase_fut = tokio::spawn(async move {
-				ensure_signed_phase::<Runtime, Block>(&rpc1, hash).await
-			});
-
-			tokio::time::sleep(std::time::Duration::from_secs(config.delay as u64)).await;
-
-			let no_prev_sol_fut = tokio::spawn(async move {
-				ensure_no_previous_solution::<Runtime, Block>(&rpc2, hash, &account).await
-			});
-
-			// Run the calls in parallel and return once all has completed or any failed.
-			if let Err(err) = tokio::try_join!(flatten(signed_phase_fut), flatten(no_prev_sol_fut)) {
-				log::debug!(target: LOG_TARGET, "Skipping block {}; {}", at.number, err);
-				return;
-			}
-
-			let _lock = submit_lock.lock().await;
-
-			let mut ext = match crate::create_election_ext::<Runtime>(rpc.clone(), Some(hash), vec![]).await {
-				Ok(ext) => ext,
-				Err(err) => {
-					log::debug!(target: LOG_TARGET, "Skipping block {}; {}", at.number, err);
-					return;
-				}
-			};
-
-			// mine a solution, and run feasibility check on it as well.
-			let raw_solution = match crate::mine_with::<Runtime>(&config.solver, &mut ext, true) {
-				Ok(r) => r,
-				Err(err) => {
-					let _ = tx.send(err.into());
-					return;
-				}
-			};
-
-			let score = raw_solution.score;
-			log::info!(target: LOG_TARGET, "mined solution with {:?}", score);
-
-			let nonce = match crate::get_account_info::<Runtime>(&rpc, &signer.account, Some(hash)).await {
-				Ok(maybe_account) => {
-					let acc = maybe_account.expect(crate::signer::SIGNER_ACCOUNT_WILL_EXIST);
-					acc.nonce
-				}
-				Err(err) => {
-					let _ = tx.send(err);
-					return;
-				}
-			};
-
-			let tip = 0 as Balance;
-			let period = <Runtime as frame_system::Config>::BlockHashCount::get() / 2;
-			let current_block = at.number.saturating_sub(1);
-			let era = sp_runtime::generic::Era::mortal(period.into(), current_block.into());
-
-			log::trace!(
-				target: LOG_TARGET, "transaction mortality: {:?} -> {:?}",
-				era.birth(current_block.into()),
-				era.death(current_block.into()),
-			);
-
-			let extrinsic = ext.execute_with(|| create_uxt(raw_solution, signer.clone(), nonce, tip, era));
-			let bytes = sp_core::Bytes(extrinsic.encode());
-
-			let rpc1 = rpc.clone();
-			let rpc2 = rpc.clone();
-			let rpc3 = rpc.clone();
-
-			let latest_head = match get_latest_head::<Runtime>(&rpc, &config.listen).await {
-				Ok(hash) => hash,
-				Err(e) => {
-					log::debug!(target: LOG_TARGET, "Skipping to submit at block {}; {}", at.number, e);
-					return;
-				}
-			};
-
-			let ensure_strategy_met_fut = tokio::spawn(async move {
-				ensure_strategy_met::<Runtime, Block>(
-					&rpc1,
-					latest_head,
-					score,
-					config.submission_strategy,
-					SignedMaxSubmissions::get()
-				).await
-			});
-
-			let ensure_signed_phase_fut = tokio::spawn(async move {
-				ensure_signed_phase::<Runtime, Block>(&rpc2, latest_head).await
-			});
-
-			let account = signer.account.clone();
-			let no_prev_sol_fut = tokio::spawn(async move {
-				ensure_no_previous_solution::<Runtime, Block>(&rpc3, latest_head, &account).await
-			});
-
-			// Run the calls in parallel and return once all has completed or any failed.
-			if let Err(err) = tokio::try_join!(
-				flatten(ensure_strategy_met_fut),
-				flatten(ensure_signed_phase_fut),
-				flatten(no_prev_sol_fut),
-			) {
-				log::debug!(target: LOG_TARGET, "Skipping to submit at block {}; {}", at.number, err);
-				return;
-			}
-
-			let mut tx_subscription = match rpc.watch_extrinsic(&bytes).await {
-				Ok(sub) => sub,
-				Err(RpcError::RestartNeeded(e)) => {
-					let _ = tx.send(RpcError::RestartNeeded(e).into());
-					return
-				},
-				Err(why) => {
-					// This usually happens when we've been busy with mining for a few blocks, and
-					// now we're receiving the subscriptions of blocks in which we were busy. In
-					// these blocks, we still don't have a solution, so we re-compute a new solution
-					// and submit it with an outdated `Nonce`, which yields most often `Stale`
-					// error. NOTE: to improve this overall, and to be able to introduce an array of
-					// other fancy features, we should make this multi-threaded and do the
-					// computation outside of this callback.
-					log::warn!(
-						target: LOG_TARGET,
-						"failing to submit a transaction {:?}. ignore block: {}",
-						why, at.number
-					);
-					return;
-				},
-			};
-
-			while let Some(rp) = tx_subscription.next().await {
-				let status_update = match rp {
-					Ok(r) => r,
-					Err(e) => {
-						log::error!(target: LOG_TARGET, "subscription failed to decode TransactionStatus {:?}, this is a bug please file an issue", e);
-						let _ = tx.send(e.into());
-						return;
-					},
-				};
-
-				log::trace!(target: LOG_TARGET, "status update {:?}", status_update);
-				match status_update {
-					TransactionStatus::Ready |
-					TransactionStatus::Broadcast(_) |
-					TransactionStatus::Future => continue,
-					TransactionStatus::InBlock((hash, _)) => {
-						log::info!(target: LOG_TARGET, "included at {:?}", hash);
-						let key = StorageKey(
-							frame_support::storage::storage_prefix(b"System", b"Events").to_vec(),
-						);
-
-						let events = match rpc.get_storage_and_decode::<
-							Vec<frame_system::EventRecord<RuntimeEvent, <Block as BlockT>::Hash>>,
-						>(&key, Some(hash))
-						.await {
-							Ok(rp) => rp.unwrap_or_default(),
-							Err(RpcHelperError::JsonRpsee(RpcError::RestartNeeded(e))) => {
-								let _ = tx.send(RpcError::RestartNeeded(e).into());
-								return;
-							}
-							// Decoding or other RPC error => just terminate the task.
-							Err(e) => {
-								log::warn!(target: LOG_TARGET, "get_storage [key: {:?}, hash: {:?}] failed: {:?}; skip block: {}",
-									key, hash, e, at.number
-								);
-								return;
-							}
-						};
-
-						log::info!(target: LOG_TARGET, "events at inclusion {:?}", events);
-					},
-					TransactionStatus::Retracted(hash) => {
-						log::info!(target: LOG_TARGET, "Retracted at {:?}", hash);
-					},
-					TransactionStatus::Finalized((hash, _)) => {
-						log::info!(target: LOG_TARGET, "Finalized at {:?}", hash);
-						break
-					},
-					_ => {
-						log::warn!(
-							target: LOG_TARGET,
-							"Stopping listen due to other status {:?}",
-							status_update
-						);
-						break
-					},
-				};
-			}
-		}
-	}
-}}}
-
-monitor_cmd_for!(polkadot);
-monitor_cmd_for!(kusama);
-monitor_cmd_for!(westend);
-
-#[cfg(test)]
-pub mod tests {
-	use super::*;
-
-	#[test]
-	fn score_passes_strategy_works() {
-		let s = |x| sp_npos_elections::ElectionScore { minimal_stake: x, ..Default::default() };
-		let two = Perbill::from_percent(2);
-
-		// anything passes Always
-		assert!(score_passes_strategy(s(0), s(0), SubmissionStrategy::Always));
-		assert!(score_passes_strategy(s(5), s(0), SubmissionStrategy::Always));
-		assert!(score_passes_strategy(s(5), s(10), SubmissionStrategy::Always));
-
-		// if leading
-		assert!(score_passes_strategy(s(0), s(0), SubmissionStrategy::IfLeading));
-		assert!(score_passes_strategy(s(1), s(0), SubmissionStrategy::IfLeading));
-		assert!(score_passes_strategy(s(2), s(0), SubmissionStrategy::IfLeading));
-		assert!(!score_passes_strategy(s(5), s(10), SubmissionStrategy::IfLeading));
-		assert!(!score_passes_strategy(s(9), s(10), SubmissionStrategy::IfLeading));
-		assert!(score_passes_strategy(s(10), s(10), SubmissionStrategy::IfLeading));
-
-		// if better by 2%
-		assert!(!score_passes_strategy(s(50), s(100), SubmissionStrategy::ClaimBetterThan(two)));
-		assert!(!score_passes_strategy(s(100), s(100), SubmissionStrategy::ClaimBetterThan(two)));
-		assert!(!score_passes_strategy(s(101), s(100), SubmissionStrategy::ClaimBetterThan(two)));
-		assert!(!score_passes_strategy(s(102), s(100), SubmissionStrategy::ClaimBetterThan(two)));
-		assert!(score_passes_strategy(s(103), s(100), SubmissionStrategy::ClaimBetterThan(two)));
-		assert!(score_passes_strategy(s(150), s(100), SubmissionStrategy::ClaimBetterThan(two)));
-
-		// if no less than 2% worse
-		assert!(!score_passes_strategy(s(50), s(100), SubmissionStrategy::ClaimNoWorseThan(two)));
-		assert!(!score_passes_strategy(s(97), s(100), SubmissionStrategy::ClaimNoWorseThan(two)));
-		assert!(score_passes_strategy(s(98), s(100), SubmissionStrategy::ClaimNoWorseThan(two)));
-		assert!(score_passes_strategy(s(99), s(100), SubmissionStrategy::ClaimNoWorseThan(two)));
-		assert!(score_passes_strategy(s(100), s(100), SubmissionStrategy::ClaimNoWorseThan(two)));
-		assert!(score_passes_strategy(s(101), s(100), SubmissionStrategy::ClaimNoWorseThan(two)));
-		assert!(score_passes_strategy(s(102), s(100), SubmissionStrategy::ClaimNoWorseThan(two)));
-		assert!(score_passes_strategy(s(103), s(100), SubmissionStrategy::ClaimNoWorseThan(two)));
-		assert!(score_passes_strategy(s(150), s(100), SubmissionStrategy::ClaimNoWorseThan(two)));
-	}
-}
diff --git a/polkadot/utils/staking-miner/src/opts.rs b/polkadot/utils/staking-miner/src/opts.rs
deleted file mode 100644
index ecffe45310144caf5a8e73868f132bb8379e0b79..0000000000000000000000000000000000000000
--- a/polkadot/utils/staking-miner/src/opts.rs
+++ /dev/null
@@ -1,366 +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/>.
-
-use crate::prelude::*;
-use clap::Parser;
-use sp_runtime::Perbill;
-use std::str::FromStr;
-
-#[derive(Debug, Clone, Parser)]
-#[cfg_attr(test, derive(PartialEq))]
-#[command(author, version, about)]
-pub(crate) struct Opt {
-	/// The `ws` node to connect to.
-	#[arg(long, short, default_value = DEFAULT_URI, env = "URI", global = true)]
-	pub uri: String,
-
-	/// WS connection timeout in number of seconds.
-	#[arg(long, default_value_t = 60)]
-	pub connection_timeout: usize,
-
-	/// WS request timeout in number of seconds.
-	#[arg(long, default_value_t = 60 * 10)]
-	pub request_timeout: usize,
-
-	#[command(subcommand)]
-	pub command: Command,
-}
-
-#[derive(Debug, Clone, Parser)]
-#[cfg_attr(test, derive(PartialEq))]
-pub(crate) enum Command {
-	/// Monitor for the phase being signed, then compute.
-	Monitor(MonitorConfig),
-
-	/// Just compute a solution now, and don't submit it.
-	DryRun(DryRunConfig),
-
-	/// Provide a solution that can be submitted to the chain as an emergency response.
-	EmergencySolution(EmergencySolutionConfig),
-
-	/// Return information about the current version
-	Info(InfoOpts),
-}
-
-#[derive(Debug, Clone, Parser)]
-#[cfg_attr(test, derive(PartialEq))]
-pub(crate) struct MonitorConfig {
-	/// The path to a file containing the seed of the account. If the file is not found, the seed
-	/// is used as-is.
-	///
-	/// Can also be provided via the `SEED` environment variable.
-	///
-	/// WARNING: Don't use an account with a large stash for this. Based on how the bot is
-	/// configured, it might re-try and lose funds through transaction fees/deposits.
-	#[arg(long, short, env = "SEED")]
-	pub seed_or_path: String,
-
-	/// They type of event to listen to.
-	///
-	/// Typically, finalized is safer and there is no chance of anything going wrong, but it can be
-	/// slower. It is recommended to use finalized, if the duration of the signed phase is longer
-	/// than the the finality delay.
-	#[arg(long, default_value = "head", value_parser = ["head", "finalized"])]
-	pub listen: String,
-
-	/// The solver algorithm to use.
-	#[command(subcommand)]
-	pub solver: Solver,
-
-	/// Submission strategy to use.
-	///
-	/// Possible options:
-	///
-	/// `--submission-strategy if-leading`: only submit if leading.
-	///
-	/// `--submission-strategy always`: always submit.
-	///
-	/// `--submission-strategy "percent-better <percent>"`: submit if the submission is `n` percent
-	/// better.
-	///
-	/// `--submission-strategy "no-worse-than  <percent>"`: submit if submission is no more than
-	/// `n` percent worse.
-	#[clap(long, default_value = "if-leading")]
-	pub submission_strategy: SubmissionStrategy,
-
-	/// Delay in number seconds to wait until starting mining a solution.
-	///
-	/// At every block when a solution is attempted
-	/// a delay can be enforced to avoid submitting at
-	/// "same time" and risk potential races with other miners.
-	///
-	/// When this is enabled and there are competing solutions, your solution might not be
-	/// submitted if the scores are equal.
-	#[arg(long, default_value_t = 0)]
-	pub delay: usize,
-}
-
-#[derive(Debug, Clone, Parser)]
-#[cfg_attr(test, derive(PartialEq))]
-pub(crate) struct DryRunConfig {
-	/// The path to a file containing the seed of the account. If the file is not found, the seed
-	/// is used as-is.
-	///
-	/// Can also be provided via the `SEED` environment variable.
-	///
-	/// WARNING: Don't use an account with a large stash for this. Based on how the bot is
-	/// configured, it might re-try and lose funds through transaction fees/deposits.
-	#[arg(long, short, env = "SEED")]
-	pub seed_or_path: String,
-
-	/// The block hash at which scraping happens. If none is provided, the latest head is used.
-	#[arg(long)]
-	pub at: Option<Hash>,
-
-	/// The solver algorithm to use.
-	#[command(subcommand)]
-	pub solver: Solver,
-
-	/// Force create a new snapshot, else expect one to exist onchain.
-	#[arg(long)]
-	pub force_snapshot: bool,
-}
-
-#[derive(Debug, Clone, Parser)]
-#[cfg_attr(test, derive(PartialEq))]
-pub(crate) struct EmergencySolutionConfig {
-	/// The block hash at which scraping happens. If none is provided, the latest head is used.
-	#[arg(long)]
-	pub at: Option<Hash>,
-
-	/// The solver algorithm to use.
-	#[command(subcommand)]
-	pub solver: Solver,
-
-	/// The number of top backed winners to take. All are taken, if not provided.
-	pub take: Option<usize>,
-}
-
-#[derive(Debug, Clone, Parser)]
-#[cfg_attr(test, derive(PartialEq))]
-pub(crate) struct InfoOpts {
-	/// Serialize the output as json
-	#[arg(long, short)]
-	pub json: bool,
-}
-
-/// Submission strategy to use.
-#[derive(Debug, Copy, Clone)]
-#[cfg_attr(test, derive(PartialEq))]
-pub enum SubmissionStrategy {
-	/// Always submit.
-	Always,
-	/// Only submit if at the time, we are the best (or equal to it).
-	IfLeading,
-	/// Submit if we are no worse than `Perbill` worse than the best.
-	ClaimNoWorseThan(Perbill),
-	/// Submit if we are leading, or if the solution that's leading is more that the given
-	/// `Perbill` better than us. This helps detect obviously fake solutions and still combat them.
-	ClaimBetterThan(Perbill),
-}
-
-#[derive(Debug, Clone, Parser)]
-#[cfg_attr(test, derive(PartialEq))]
-pub(crate) enum Solver {
-	SeqPhragmen {
-		#[arg(long, default_value_t = 10)]
-		iterations: usize,
-	},
-	PhragMMS {
-		#[arg(long, default_value_t = 10)]
-		iterations: usize,
-	},
-}
-
-/// Custom `impl` to parse `SubmissionStrategy` from CLI.
-///
-/// Possible options:
-/// * --submission-strategy if-leading: only submit if leading
-/// * --submission-strategy always: always submit
-/// * --submission-strategy "percent-better <percent>": submit if submission is `n` percent better.
-/// * --submission-strategy "no-worse-than<percent>": submit if submission is no more than `n`
-///   percent worse.
-impl FromStr for SubmissionStrategy {
-	type Err = String;
-
-	fn from_str(s: &str) -> Result<Self, Self::Err> {
-		let s = s.trim();
-
-		let res = if s == "if-leading" {
-			Self::IfLeading
-		} else if s == "always" {
-			Self::Always
-		} else if let Some(percent) = s.strip_prefix("no-worse-than ") {
-			let percent: u32 = percent.parse().map_err(|e| format!("{:?}", e))?;
-			Self::ClaimNoWorseThan(Perbill::from_percent(percent))
-		} else if let Some(percent) = s.strip_prefix("percent-better ") {
-			let percent: u32 = percent.parse().map_err(|e| format!("{:?}", e))?;
-			Self::ClaimBetterThan(Perbill::from_percent(percent))
-		} else {
-			return Err(s.into())
-		};
-		Ok(res)
-	}
-}
-
-#[cfg(test)]
-mod test_super {
-	use super::*;
-
-	#[test]
-	fn cli_monitor_works() {
-		let opt = Opt::try_parse_from([
-			env!("CARGO_PKG_NAME"),
-			"--uri",
-			"hi",
-			"monitor",
-			"--seed-or-path",
-			"//Alice",
-			"--listen",
-			"head",
-			"--delay",
-			"12",
-			"seq-phragmen",
-		])
-		.unwrap();
-
-		assert_eq!(
-			opt,
-			Opt {
-				uri: "hi".to_string(),
-				connection_timeout: 60,
-				request_timeout: 10 * 60,
-				command: Command::Monitor(MonitorConfig {
-					seed_or_path: "//Alice".to_string(),
-					listen: "head".to_string(),
-					solver: Solver::SeqPhragmen { iterations: 10 },
-					submission_strategy: SubmissionStrategy::IfLeading,
-					delay: 12,
-				}),
-			}
-		);
-	}
-
-	#[test]
-	fn cli_dry_run_works() {
-		let opt = Opt::try_parse_from([
-			env!("CARGO_PKG_NAME"),
-			"--uri",
-			"hi",
-			"dry-run",
-			"--seed-or-path",
-			"//Alice",
-			"phrag-mms",
-		])
-		.unwrap();
-
-		assert_eq!(
-			opt,
-			Opt {
-				uri: "hi".to_string(),
-				connection_timeout: 60,
-				request_timeout: 10 * 60,
-				command: Command::DryRun(DryRunConfig {
-					seed_or_path: "//Alice".to_string(),
-					at: None,
-					solver: Solver::PhragMMS { iterations: 10 },
-					force_snapshot: false,
-				}),
-			}
-		);
-	}
-
-	#[test]
-	fn cli_emergency_works() {
-		let opt = Opt::try_parse_from([
-			env!("CARGO_PKG_NAME"),
-			"--uri",
-			"hi",
-			"emergency-solution",
-			"99",
-			"phrag-mms",
-			"--iterations",
-			"1337",
-		])
-		.unwrap();
-
-		assert_eq!(
-			opt,
-			Opt {
-				uri: "hi".to_string(),
-				connection_timeout: 60,
-				request_timeout: 10 * 60,
-				command: Command::EmergencySolution(EmergencySolutionConfig {
-					take: Some(99),
-					at: None,
-					solver: Solver::PhragMMS { iterations: 1337 }
-				}),
-			}
-		);
-	}
-
-	#[test]
-	fn cli_info_works() {
-		let opt = Opt::try_parse_from([env!("CARGO_PKG_NAME"), "--uri", "hi", "info"]).unwrap();
-
-		assert_eq!(
-			opt,
-			Opt {
-				uri: "hi".to_string(),
-				connection_timeout: 60,
-				request_timeout: 10 * 60,
-				command: Command::Info(InfoOpts { json: false })
-			}
-		);
-	}
-
-	#[test]
-	fn cli_request_conn_timeout_works() {
-		let opt = Opt::try_parse_from([
-			env!("CARGO_PKG_NAME"),
-			"--uri",
-			"hi",
-			"--request-timeout",
-			"10",
-			"--connection-timeout",
-			"9",
-			"info",
-		])
-		.unwrap();
-
-		assert_eq!(
-			opt,
-			Opt {
-				uri: "hi".to_string(),
-				connection_timeout: 9,
-				request_timeout: 10,
-				command: Command::Info(InfoOpts { json: false })
-			}
-		);
-	}
-
-	#[test]
-	fn submission_strategy_from_str_works() {
-		use std::str::FromStr;
-
-		assert_eq!(SubmissionStrategy::from_str("if-leading"), Ok(SubmissionStrategy::IfLeading));
-		assert_eq!(SubmissionStrategy::from_str("always"), Ok(SubmissionStrategy::Always));
-		assert_eq!(
-			SubmissionStrategy::from_str("  percent-better 99   "),
-			Ok(SubmissionStrategy::ClaimBetterThan(Perbill::from_percent(99)))
-		);
-	}
-}
diff --git a/polkadot/utils/staking-miner/src/prelude.rs b/polkadot/utils/staking-miner/src/prelude.rs
deleted file mode 100644
index fb701ece2384d8f1286e4573ebad0c00724dbb42..0000000000000000000000000000000000000000
--- a/polkadot/utils/staking-miner/src/prelude.rs
+++ /dev/null
@@ -1,55 +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/>.
-
-//! Types that we don't fetch from a particular runtime and just assume that they are constant all
-//! of the place.
-//!
-//! It is actually easy to convert the rest as well, but it'll be a lot of noise in our codebase,
-//! needing to sprinkle `any_runtime` in a few extra places.
-
-/// The account id type.
-pub type AccountId = core_primitives::AccountId;
-/// The block number type.
-pub type BlockNumber = core_primitives::BlockNumber;
-/// The balance type.
-pub type Balance = core_primitives::Balance;
-/// Index of a transaction in the chain.
-pub type Nonce = core_primitives::Nonce;
-/// The hash type. We re-export it here, but we can easily get it from block as well.
-pub type Hash = core_primitives::Hash;
-/// The header type. We re-export it here, but we can easily get it from block as well.
-pub type Header = core_primitives::Header;
-/// The block type.
-pub type Block = core_primitives::Block;
-
-pub use sp_runtime::traits::{Block as BlockT, Header as HeaderT};
-
-/// Default URI to connect to.
-pub const DEFAULT_URI: &str = "wss://rpc.polkadot.io:443";
-/// The logging target.
-pub const LOG_TARGET: &str = "staking-miner";
-
-/// The election provider pallet.
-pub use pallet_election_provider_multi_phase as EPM;
-
-/// The externalities type.
-pub type Ext = sp_state_machine::TestExternalities<sp_runtime::traits::HashingFor<Block>>;
-
-/// The key pair type being used. We "strongly" assume sr25519 for simplicity.
-pub type Pair = sp_core::sr25519::Pair;
-
-/// A dynamic token type used to represent account balances.
-pub type Token = sub_tokens::dynamic::DynamicToken;
diff --git a/polkadot/utils/staking-miner/src/rpc.rs b/polkadot/utils/staking-miner/src/rpc.rs
deleted file mode 100644
index 2d25616e2a179e7eb993e2423dfe7496b022baca..0000000000000000000000000000000000000000
--- a/polkadot/utils/staking-miner/src/rpc.rs
+++ /dev/null
@@ -1,182 +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/>.
-
-//! JSON-RPC related types and helpers.
-
-use super::*;
-use jsonrpsee::{
-	core::{Error as RpcError, RpcResult},
-	proc_macros::rpc,
-};
-use pallet_transaction_payment::RuntimeDispatchInfo;
-use sc_transaction_pool_api::TransactionStatus;
-use sp_core::{storage::StorageKey, Bytes};
-use sp_version::RuntimeVersion;
-use std::{future::Future, time::Duration};
-
-#[derive(frame_support::DebugNoBound, thiserror::Error)]
-pub(crate) enum RpcHelperError {
-	JsonRpsee(#[from] jsonrpsee::core::Error),
-	Codec(#[from] codec::Error),
-}
-
-impl std::fmt::Display for RpcHelperError {
-	fn fmt(&self, f: &mut std::fmt::Formatter<'_>) -> std::fmt::Result {
-		<RpcHelperError as std::fmt::Debug>::fmt(self, f)
-	}
-}
-
-#[rpc(client)]
-pub trait RpcApi {
-	/// Fetch system name.
-	#[method(name = "system_chain")]
-	async fn system_chain(&self) -> RpcResult<String>;
-
-	/// Fetch a storage key.
-	#[method(name = "state_getStorage")]
-	async fn storage(&self, key: &StorageKey, hash: Option<Hash>) -> RpcResult<Option<Bytes>>;
-
-	/// Fetch the runtime version.
-	#[method(name = "state_getRuntimeVersion")]
-	async fn runtime_version(&self, at: Option<Hash>) -> RpcResult<RuntimeVersion>;
-
-	/// Fetch the payment query info.
-	#[method(name = "payment_queryInfo")]
-	async fn payment_query_info(
-		&self,
-		encoded_xt: &Bytes,
-		at: Option<&Hash>,
-	) -> RpcResult<RuntimeDispatchInfo<Balance>>;
-
-	/// Dry run an extrinsic at a given block. Return SCALE encoded
-	/// [`sp_runtime::ApplyExtrinsicResult`].
-	#[method(name = "system_dryRun")]
-	async fn dry_run(&self, extrinsic: &Bytes, at: Option<Hash>) -> RpcResult<Bytes>;
-
-	/// Get hash of the n-th block in the canon chain.
-	///
-	/// By default returns latest block hash.
-	#[method(name = "chain_getBlockHash", aliases = ["chain_getHead"], blocking)]
-	fn block_hash(&self, hash: Option<Hash>) -> RpcResult<Option<Hash>>;
-
-	/// Get hash of the last finalized block in the canon chain.
-	#[method(name = "chain_getFinalizedHead", aliases = ["chain_getFinalisedHead"], blocking)]
-	fn finalized_head(&self) -> RpcResult<Hash>;
-
-	/// Submit an extrinsic to watch.
-	///
-	/// See [`TransactionStatus`](sc_transaction_pool_api::TransactionStatus) for details on
-	/// transaction life cycle.
-	#[subscription(
-		name = "author_submitAndWatchExtrinsic" => "author_extrinsicUpdate",
-		unsubscribe = "author_unwatchExtrinsic",
-		item = TransactionStatus<Hash, Hash>
-	)]
-	fn watch_extrinsic(&self, bytes: &Bytes);
-
-	/// New head subscription.
-	#[subscription(
-		name = "chain_subscribeNewHeads" => "newHead",
-		unsubscribe = "chain_unsubscribeNewHeads",
-		item = Header
-	)]
-	fn subscribe_new_heads(&self);
-
-	/// Finalized head subscription.
-	#[subscription(
-		name = "chain_subscribeFinalizedHeads" => "chain_finalizedHead",
-		unsubscribe = "chain_unsubscribeFinalizedHeads",
-		item = Header
-	)]
-	fn subscribe_finalized_heads(&self);
-}
-
-type Uri = String;
-
-/// Wraps a shared web-socket JSON-RPC client that can be cloned.
-#[derive(Clone, Debug)]
-pub(crate) struct SharedRpcClient(Arc<WsClient>, Uri);
-
-impl Deref for SharedRpcClient {
-	type Target = WsClient;
-
-	fn deref(&self) -> &Self::Target {
-		&self.0
-	}
-}
-
-impl SharedRpcClient {
-	/// Get the URI of the client.
-	pub fn uri(&self) -> &str {
-		&self.1
-	}
-
-	/// Create a new shared JSON-RPC web-socket client.
-	pub(crate) async fn new(
-		uri: &str,
-		connection_timeout: Duration,
-		request_timeout: Duration,
-	) -> Result<Self, RpcError> {
-		let client = WsClientBuilder::default()
-			.connection_timeout(connection_timeout)
-			.max_request_body_size(u32::MAX)
-			.request_timeout(request_timeout)
-			.max_concurrent_requests(u32::MAX as usize)
-			.build(uri)
-			.await?;
-		Ok(Self(Arc::new(client), uri.to_owned()))
-	}
-
-	/// Get a storage item and decode it as `T`.
-	///
-	/// # Return value:
-	///
-	/// The function returns:
-	///
-	/// * `Ok(Some(val))` if successful.
-	/// * `Ok(None)` if the storage item was not found.
-	/// * `Err(e)` if the JSON-RPC call failed.
-	pub(crate) async fn get_storage_and_decode<'a, T: codec::Decode>(
-		&self,
-		key: &StorageKey,
-		hash: Option<Hash>,
-	) -> Result<Option<T>, RpcHelperError> {
-		if let Some(bytes) = self.storage(key, hash).await? {
-			let decoded = <T as codec::Decode>::decode(&mut &*bytes.0)
-				.map_err::<RpcHelperError, _>(Into::into)?;
-			Ok(Some(decoded))
-		} else {
-			Ok(None)
-		}
-	}
-}
-
-/// Takes a future that returns `Bytes` and tries to decode those bytes into the type `Dec`.
-/// Warning: don't use for storage, it will fail for non-existent storage items.
-///
-/// # Return value:
-///
-/// The function returns:
-///
-/// * `Ok(val)` if successful.
-/// * `Err(RpcHelperError::JsonRpsee)` if the JSON-RPC call failed.
-/// * `Err(RpcHelperError::Codec)` if `Bytes` could not be decoded.
-pub(crate) async fn await_request_and_decode<'a, Dec: codec::Decode>(
-	req: impl Future<Output = Result<Bytes, RpcError>>,
-) -> Result<Dec, RpcHelperError> {
-	let bytes = req.await?;
-	Dec::decode(&mut &*bytes.0).map_err::<RpcHelperError, _>(Into::into)
-}
diff --git a/polkadot/utils/staking-miner/src/runtime_versions.rs b/polkadot/utils/staking-miner/src/runtime_versions.rs
deleted file mode 100644
index 38af05ead24143ae122e4e0ac2732c0de8f6c145..0000000000000000000000000000000000000000
--- a/polkadot/utils/staking-miner/src/runtime_versions.rs
+++ /dev/null
@@ -1,90 +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/>.
-
-use sp_version::RuntimeVersion;
-use std::fmt;
-
-#[derive(Debug, serde::Serialize)]
-pub(crate) struct RuntimeWrapper<'a>(pub &'a RuntimeVersion);
-
-impl<'a> fmt::Display for RuntimeWrapper<'a> {
-	fn fmt(&self, f: &mut fmt::Formatter) -> fmt::Result {
-		let width = 16;
-
-		writeln!(
-			f,
-			r#"   impl_name           : {impl_name:>width$}
-   spec_name           : {spec_name:>width$}
-   spec_version        : {spec_version:>width$}
-   transaction_version : {transaction_version:>width$}
-   impl_version        : {impl_version:>width$}
-   authoringVersion    : {authoring_version:>width$}
-   state_version       : {state_version:>width$}"#,
-			spec_name = self.0.spec_name.to_string(),
-			impl_name = self.0.impl_name.to_string(),
-			spec_version = self.0.spec_version,
-			impl_version = self.0.impl_version,
-			authoring_version = self.0.authoring_version,
-			transaction_version = self.0.transaction_version,
-			state_version = self.0.state_version,
-		)
-	}
-}
-
-impl<'a> From<&'a RuntimeVersion> for RuntimeWrapper<'a> {
-	fn from(r: &'a RuntimeVersion) -> Self {
-		RuntimeWrapper(r)
-	}
-}
-
-#[derive(Debug, serde::Serialize)]
-pub(crate) struct RuntimeVersions<'a> {
-	/// The `RuntimeVersion` linked in the staking-miner
-	pub linked: RuntimeWrapper<'a>,
-
-	/// The `RuntimeVersion` reported by the node we connect to via RPC
-	pub remote: RuntimeWrapper<'a>,
-
-	/// This `bool` reports whether both remote and linked `RuntimeVersion` are compatible
-	/// and if the staking-miner is expected to work properly against the remote runtime
-	compatible: bool,
-}
-
-impl<'a> RuntimeVersions<'a> {
-	pub fn new(
-		remote_runtime_version: &'a RuntimeVersion,
-		linked_runtime_version: &'a RuntimeVersion,
-	) -> Self {
-		Self {
-			remote: remote_runtime_version.into(),
-			linked: linked_runtime_version.into(),
-			compatible: are_runtimes_compatible(remote_runtime_version, linked_runtime_version),
-		}
-	}
-}
-
-/// Check whether runtimes are compatible. Currently we only support equality.
-fn are_runtimes_compatible(r1: &RuntimeVersion, r2: &RuntimeVersion) -> bool {
-	r1 == r2
-}
-
-impl<'a> fmt::Display for RuntimeVersions<'a> {
-	fn fmt(&self, f: &mut fmt::Formatter) -> fmt::Result {
-		let _ = write!(f, "- linked:\n{}", self.linked);
-		let _ = write!(f, "- remote :\n{}", self.remote);
-		write!(f, "Compatible: {}", if self.compatible { "YES" } else { "NO" })
-	}
-}
diff --git a/polkadot/utils/staking-miner/src/signer.rs b/polkadot/utils/staking-miner/src/signer.rs
deleted file mode 100644
index e6677ccd3a66149e25affb5286140a5b44a6a3e4..0000000000000000000000000000000000000000
--- a/polkadot/utils/staking-miner/src/signer.rs
+++ /dev/null
@@ -1,84 +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/>.
-
-//! Wrappers around creating a signer account.
-
-use crate::{prelude::*, rpc::SharedRpcClient, AccountId, Error, Nonce, Pair, LOG_TARGET};
-use frame_system::AccountInfo;
-use sp_core::{crypto::Pair as _, storage::StorageKey};
-
-pub(crate) const SIGNER_ACCOUNT_WILL_EXIST: &str =
-	"signer account is checked to exist upon startup; it can only die if it transfers funds out \
-	 of it, or get slashed. If it does not exist at this point, it is likely due to a bug, or the \
-	 signer got slashed. Terminating.";
-
-/// Some information about the signer. Redundant at this point, but makes life easier.
-#[derive(Clone)]
-pub(crate) struct Signer {
-	/// The account id.
-	pub(crate) account: AccountId,
-
-	/// The full crypto key-pair.
-	pub(crate) pair: Pair,
-}
-
-pub(crate) async fn get_account_info<T: frame_system::Config<Hash = Hash> + EPM::Config>(
-	rpc: &SharedRpcClient,
-	who: &T::AccountId,
-	maybe_at: Option<T::Hash>,
-) -> Result<Option<AccountInfo<Nonce, T::AccountData>>, Error<T>> {
-	rpc.get_storage_and_decode::<AccountInfo<Nonce, T::AccountData>>(
-		&StorageKey(<frame_system::Account<T>>::hashed_key_for(&who)),
-		maybe_at,
-	)
-	.await
-	.map_err(Into::into)
-}
-
-/// Read the signer account's URI
-pub(crate) async fn signer_uri_from_string<
-	T: frame_system::Config<
-			AccountId = AccountId,
-			Nonce = Nonce,
-			AccountData = pallet_balances::AccountData<Balance>,
-			Hash = Hash,
-		> + EPM::Config,
->(
-	mut seed_or_path: &str,
-	client: &SharedRpcClient,
-) -> Result<Signer, Error<T>> {
-	seed_or_path = seed_or_path.trim();
-
-	let seed = match std::fs::read(seed_or_path) {
-		Ok(s) => String::from_utf8(s).map_err(|_| Error::<T>::AccountDoesNotExists)?,
-		Err(_) => seed_or_path.to_string(),
-	};
-	let seed = seed.trim();
-
-	let pair = Pair::from_string(seed, None)?;
-	let account = T::AccountId::from(pair.public());
-	let _info = get_account_info::<T>(client, &account, None)
-		.await?
-		.ok_or(Error::<T>::AccountDoesNotExists)?;
-	log::info!(
-		target: LOG_TARGET,
-		"loaded account {:?}, free: {:?}, info: {:?}",
-		&account,
-		Token::from(_info.data.free),
-		_info
-	);
-	Ok(Signer { account, pair })
-}
diff --git a/polkadot/utils/staking-miner/tests/cli.rs b/polkadot/utils/staking-miner/tests/cli.rs
deleted file mode 100644
index 1ced1239e5530c0b1a656ef3197fdaf9a4334dd1..0000000000000000000000000000000000000000
--- a/polkadot/utils/staking-miner/tests/cli.rs
+++ /dev/null
@@ -1,49 +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/>.
-
-use assert_cmd::{cargo::cargo_bin, Command};
-use serde_json::{Result, Value};
-
-#[test]
-fn cli_version_works() {
-	let crate_name = env!("CARGO_PKG_NAME");
-	let output = Command::new(cargo_bin(crate_name)).arg("--version").output().unwrap();
-
-	assert!(output.status.success(), "command returned with non-success exit code");
-	let version = String::from_utf8_lossy(&output.stdout).trim().to_owned();
-
-	assert_eq!(version, format!("{} {}", crate_name, env!("CARGO_PKG_VERSION")));
-}
-
-#[test]
-fn cli_info_works() {
-	let crate_name = env!("CARGO_PKG_NAME");
-	let output = Command::new(cargo_bin(crate_name))
-		.arg("info")
-		.arg("--json")
-		.env("RUST_LOG", "none")
-		.output()
-		.unwrap();
-
-	assert!(output.status.success(), "command returned with non-success exit code");
-	let info = String::from_utf8_lossy(&output.stdout).trim().to_owned();
-	let v: Result<Value> = serde_json::from_str(&info);
-	let v = v.unwrap();
-	assert!(!v["builtin"].to_string().is_empty());
-	assert!(!v["builtin"]["spec_name"].to_string().is_empty());
-	assert!(!v["builtin"]["spec_version"].to_string().is_empty());
-	assert!(!v["remote"].to_string().is_empty());
-}
diff --git a/polkadot/xcm/Cargo.toml b/polkadot/xcm/Cargo.toml
index d33b1bf5de12f0f94fcf32973dd4887f0af33f25..f04f31c3ec103da9d08dd9c84cc3668eb46afb70 100644
--- a/polkadot/xcm/Cargo.toml
+++ b/polkadot/xcm/Cargo.toml
@@ -1,7 +1,7 @@
 [package]
-name = "xcm"
+name = "staging-xcm"
 description = "The basic XCM datastructures."
-version.workspace = true
+version = "1.0.0"
 authors.workspace = true
 edition.workspace = true
 license.workspace = true
@@ -14,8 +14,9 @@ log = { version = "0.4.17", default-features = false }
 parity-scale-codec = { version = "3.6.1", default-features = false, features = [ "derive", "max-encoded-len" ] }
 scale-info = { version = "2.5.0", default-features = false, features = ["derive", "serde"] }
 sp-weights = { path = "../../substrate/primitives/weights", default-features = false, features = ["serde"] }
-serde = { version = "1.0.163", default-features = false, features = ["alloc", "derive"] }
+serde = { version = "1.0.188", default-features = false, features = ["alloc", "derive"] }
 xcm-procedural = { path = "procedural" }
+environmental = { version = "1.1.4", default-features = false }
 
 [dev-dependencies]
 sp-io = { path = "../../substrate/primitives/io" }
@@ -27,6 +28,7 @@ default = [ "std" ]
 wasm-api = []
 std = [
 	"bounded-collections/std",
+	"environmental/std",
 	"parity-scale-codec/std",
 	"scale-info/std",
 	"serde/std",
diff --git a/polkadot/xcm/pallet-xcm-benchmarks/Cargo.toml b/polkadot/xcm/pallet-xcm-benchmarks/Cargo.toml
index f6f993b7d916302282478999e38d7b06b0097fe6..35b0b7dc553e5fa58e9457ab89bf9416d418bfe8 100644
--- a/polkadot/xcm/pallet-xcm-benchmarks/Cargo.toml
+++ b/polkadot/xcm/pallet-xcm-benchmarks/Cargo.toml
@@ -3,7 +3,7 @@ name = "pallet-xcm-benchmarks"
 authors.workspace = true
 edition.workspace = true
 license.workspace = true
-version.workspace = true
+version = "1.0.0"
 
 [package.metadata.docs.rs]
 targets = ["x86_64-unknown-linux-gnu"]
@@ -16,10 +16,10 @@ frame-system = { path = "../../../substrate/frame/system", default-features = fa
 sp-runtime = { path = "../../../substrate/primitives/runtime", default-features = false}
 sp-std = { path = "../../../substrate/primitives/std", default-features = false}
 sp-io = { path = "../../../substrate/primitives/io", default-features = false}
-xcm-executor = { path = "../xcm-executor", default-features = false }
+xcm-executor = { package = "staging-xcm-executor", path = "../xcm-executor", default-features = false }
 frame-benchmarking = { path = "../../../substrate/frame/benchmarking", default-features = false}
-xcm = { path = "..", default-features = false }
-xcm-builder = { path = "../xcm-builder", default-features = false }
+xcm = { package = "staging-xcm", path = "..", default-features = false }
+xcm-builder = { package = "staging-xcm-builder", path = "../xcm-builder", default-features = false }
 log = "0.4.17"
 
 [dev-dependencies]
@@ -27,7 +27,7 @@ pallet-balances = { path = "../../../substrate/frame/balances" }
 pallet-assets = { path = "../../../substrate/frame/assets" }
 sp-core = { path = "../../../substrate/primitives/core" }
 sp-tracing = { path = "../../../substrate/primitives/tracing" }
-xcm = { path = ".." }
+xcm = { package = "staging-xcm", path = ".." }
 # temp
 pallet-xcm = { path = "../pallet-xcm" }
 polkadot-runtime-common = { path = "../../runtime/common" }
@@ -51,7 +51,12 @@ runtime-benchmarks = [
 	"frame-benchmarking/runtime-benchmarks",
 	"frame-support/runtime-benchmarks",
 	"frame-system/runtime-benchmarks",
+	"pallet-assets/runtime-benchmarks",
+	"pallet-balances/runtime-benchmarks",
 	"pallet-xcm/runtime-benchmarks",
+	"polkadot-primitives/runtime-benchmarks",
+	"polkadot-runtime-common/runtime-benchmarks",
+	"sp-runtime/runtime-benchmarks",
 	"xcm-builder/runtime-benchmarks",
 	"xcm-executor/runtime-benchmarks",
 ]
diff --git a/polkadot/xcm/pallet-xcm-benchmarks/src/fungible/benchmarking.rs b/polkadot/xcm/pallet-xcm-benchmarks/src/fungible/benchmarking.rs
index 504b795403991dc3229f005027baa8fc97790617..760fa33b693e50d565445853a07cd0a317ac6487 100644
--- a/polkadot/xcm/pallet-xcm-benchmarks/src/fungible/benchmarking.rs
+++ b/polkadot/xcm/pallet-xcm-benchmarks/src/fungible/benchmarking.rs
@@ -20,6 +20,7 @@ use frame_benchmarking::{benchmarks_instance_pallet, BenchmarkError, BenchmarkRe
 use frame_support::{
 	pallet_prelude::Get,
 	traits::fungible::{Inspect, Mutate},
+	weights::Weight,
 };
 use sp_runtime::traits::{Bounded, Zero};
 use sp_std::{prelude::*, vec};
@@ -134,7 +135,7 @@ benchmarks_instance_pallet! {
 	reserve_asset_deposited {
 		let (trusted_reserve, transferable_reserve_asset) = T::TrustedReserve::get()
 			.ok_or(BenchmarkError::Override(
-				BenchmarkResult::from_weight(T::BlockWeights::get().max_block)
+				BenchmarkResult::from_weight(Weight::MAX)
 			))?;
 
 		let assets: MultiAssets = vec![ transferable_reserve_asset ].into();
@@ -187,7 +188,7 @@ benchmarks_instance_pallet! {
 	}: {
 		executor.bench_process(xcm).map_err(|_| {
 			BenchmarkError::Override(
-				BenchmarkResult::from_weight(T::BlockWeights::get().max_block)
+				BenchmarkResult::from_weight(Weight::MAX)
 			)
 		})?;
 	} verify {
diff --git a/polkadot/xcm/pallet-xcm-benchmarks/src/generic/mod.rs b/polkadot/xcm/pallet-xcm-benchmarks/src/generic/mod.rs
index 195066ee5b48441ea915872fa1ce1163d00772ac..f207c238a39f14e5d1b6606b1d91dda12b096237 100644
--- a/polkadot/xcm/pallet-xcm-benchmarks/src/generic/mod.rs
+++ b/polkadot/xcm/pallet-xcm-benchmarks/src/generic/mod.rs
@@ -24,10 +24,8 @@ mod mock;
 #[frame_support::pallet]
 pub mod pallet {
 	use frame_benchmarking::BenchmarkError;
-	use frame_support::{
-		dispatch::{Dispatchable, GetDispatchInfo},
-		pallet_prelude::Encode,
-	};
+	use frame_support::{dispatch::GetDispatchInfo, pallet_prelude::Encode};
+	use sp_runtime::traits::Dispatchable;
 	use xcm::latest::{
 		InteriorMultiLocation, Junction, MultiAsset, MultiAssets, MultiLocation, NetworkId,
 		Response,
diff --git a/polkadot/xcm/pallet-xcm/Cargo.toml b/polkadot/xcm/pallet-xcm/Cargo.toml
index eefc3c2f549115cce4ee91df3ba6c5c673392547..4946a8d11ce96aed88e5864a57e79875d62555f0 100644
--- a/polkadot/xcm/pallet-xcm/Cargo.toml
+++ b/polkadot/xcm/pallet-xcm/Cargo.toml
@@ -3,14 +3,14 @@ name = "pallet-xcm"
 authors.workspace = true
 edition.workspace = true
 license.workspace = true
-version.workspace = true
+version = "1.0.0"
 
 
 [dependencies]
 bounded-collections = { version = "0.1.8", default-features = false }
 codec = { package = "parity-scale-codec", version = "3.6.1", default-features = false, features = ["derive"] }
 scale-info = { version = "2.5.0", default-features = false, features = ["derive"] }
-serde = { version = "1.0.163", optional = true, features = ["derive"] }
+serde = { version = "1.0.188", optional = true, features = ["derive"] }
 log = { version = "0.4.17", default-features = false }
 
 frame-benchmarking = { path = "../../../substrate/frame/benchmarking", default-features = false, optional = true }
@@ -21,19 +21,17 @@ sp-io = { path = "../../../substrate/primitives/io", default-features = false}
 sp-runtime = { path = "../../../substrate/primitives/runtime", default-features = false}
 sp-std = { path = "../../../substrate/primitives/std", default-features = false}
 
-xcm = { path = "..", default-features = false }
-xcm-executor = { path = "../xcm-executor", default-features = false }
+xcm = { package = "staging-xcm", path = "..", default-features = false }
+xcm-executor = { package = "staging-xcm-executor", path = "../xcm-executor", default-features = false }
 
 [dev-dependencies]
 pallet-balances = { path = "../../../substrate/frame/balances" }
 polkadot-runtime-parachains = { path = "../../runtime/parachains" }
-polkadot-parachain = { path = "../../parachain" }
-xcm-builder = { path = "../xcm-builder" }
+polkadot-parachain-primitives = { path = "../../parachain" }
+xcm-builder = { package = "staging-xcm-builder", path = "../xcm-builder" }
 
 [features]
 default = [ "std" ]
-# Enable `VersionedRuntimeUpgrade` for the migrations that is currently still experimental.
-experimental = [ "frame-support/experimental" ]
 std = [
 	"bounded-collections/std",
 	"codec/std",
@@ -53,6 +51,17 @@ runtime-benchmarks = [
 	"frame-benchmarking/runtime-benchmarks",
 	"frame-support/runtime-benchmarks",
 	"frame-system/runtime-benchmarks",
+	"pallet-balances/runtime-benchmarks",
+	"polkadot-parachain-primitives/runtime-benchmarks",
+	"polkadot-runtime-parachains/runtime-benchmarks",
+	"sp-runtime/runtime-benchmarks",
 	"xcm-builder/runtime-benchmarks",
+	"xcm-executor/runtime-benchmarks",
+]
+try-runtime = [
+	"frame-support/try-runtime",
+	"frame-system/try-runtime",
+	"pallet-balances/try-runtime",
+	"polkadot-runtime-parachains/try-runtime",
+	"sp-runtime/try-runtime",
 ]
-try-runtime = [ "frame-support/try-runtime" ]
diff --git a/polkadot/xcm/pallet-xcm/src/lib.rs b/polkadot/xcm/pallet-xcm/src/lib.rs
index aefcf30910ed90a6f989e8db56cfa7f8ef558ef1..321bb294b88d89187924a88a98302c33dd860fb9 100644
--- a/polkadot/xcm/pallet-xcm/src/lib.rs
+++ b/polkadot/xcm/pallet-xcm/src/lib.rs
@@ -34,7 +34,8 @@ use frame_support::traits::{
 use scale_info::TypeInfo;
 use sp_runtime::{
 	traits::{
-		AccountIdConversion, BadOrigin, BlakeTwo256, BlockNumberProvider, Hash, Saturating, Zero,
+		AccountIdConversion, BadOrigin, BlakeTwo256, BlockNumberProvider, Dispatchable, Hash,
+		Saturating, Zero,
 	},
 	RuntimeDebug,
 };
@@ -43,10 +44,7 @@ use xcm::{latest::QueryResponseInfo, prelude::*};
 use xcm_executor::traits::{ConvertOrigin, Properties};
 
 use frame_support::{
-	dispatch::{Dispatchable, GetDispatchInfo},
-	pallet_prelude::*,
-	traits::WithdrawReasons,
-	PalletId,
+	dispatch::GetDispatchInfo, pallet_prelude::*, traits::WithdrawReasons, PalletId,
 };
 use frame_system::pallet_prelude::*;
 pub use pallet::*;
@@ -149,11 +147,12 @@ impl WeightInfo for TestWeightInfo {
 pub mod pallet {
 	use super::*;
 	use frame_support::{
-		dispatch::{Dispatchable, GetDispatchInfo, PostDispatchInfo},
+		dispatch::{GetDispatchInfo, PostDispatchInfo},
 		parameter_types,
 	};
 	use frame_system::Config as SysConfig;
 	use sp_core::H256;
+	use sp_runtime::traits::Dispatchable;
 	use xcm_executor::traits::{MatchesFungible, WeightBounds};
 
 	parameter_types! {
@@ -204,10 +203,10 @@ pub mod pallet {
 		>;
 
 		/// Our XCM filter which messages to be executed using `XcmExecutor` must pass.
-		type XcmExecuteFilter: Contains<(MultiLocation, Xcm<<Self as SysConfig>::RuntimeCall>)>;
+		type XcmExecuteFilter: Contains<(MultiLocation, Xcm<<Self as Config>::RuntimeCall>)>;
 
 		/// Something to execute an XCM message.
-		type XcmExecutor: ExecuteXcm<<Self as SysConfig>::RuntimeCall>;
+		type XcmExecutor: ExecuteXcm<<Self as Config>::RuntimeCall>;
 
 		/// Our XCM filter which messages to be teleported using the dedicated extrinsic must pass.
 		type XcmTeleportFilter: Contains<(MultiLocation, Vec<MultiAsset>)>;
@@ -217,7 +216,7 @@ pub mod pallet {
 		type XcmReserveTransferFilter: Contains<(MultiLocation, Vec<MultiAsset>)>;
 
 		/// Means of measuring the weight consumed by an XCM message locally.
-		type Weigher: WeightBounds<<Self as SysConfig>::RuntimeCall>;
+		type Weigher: WeightBounds<<Self as Config>::RuntimeCall>;
 
 		/// This chain's Universal Location.
 		type UniversalLocation: Get<InteriorMultiLocation>;
@@ -228,7 +227,6 @@ pub mod pallet {
 		/// The runtime `Call` type.
 		type RuntimeCall: Parameter
 			+ GetDispatchInfo
-			+ IsType<<Self as frame_system::Config>::RuntimeCall>
 			+ Dispatchable<
 				RuntimeOrigin = <Self as Config>::RuntimeOrigin,
 				PostInfo = PostDispatchInfo,
@@ -788,6 +786,8 @@ pub mod pallet {
 
 		/// Teleport some assets from the local chain to some destination chain.
 		///
+		/// **This function is deprecated: Use `limited_teleport_assets` instead.**
+		///
 		/// Fee payment on the destination side is made from the asset in the `assets` vector of
 		/// index `fee_asset_item`. The weight limit for fees is not provided and thus is unlimited,
 		/// with all fees taken as needed from the asset.
@@ -831,12 +831,14 @@ pub mod pallet {
 			assets: Box<VersionedMultiAssets>,
 			fee_asset_item: u32,
 		) -> DispatchResult {
-			Self::do_teleport_assets(origin, dest, beneficiary, assets, fee_asset_item, None)
+			Self::do_teleport_assets(origin, dest, beneficiary, assets, fee_asset_item, Unlimited)
 		}
 
 		/// Transfer some assets from the local chain to the sovereign account of a destination
 		/// chain and forward a notification XCM.
 		///
+		/// **This function is deprecated: Use `limited_reserve_transfer_assets` instead.**
+		///
 		/// Fee payment on the destination side is made from the asset in the `assets` vector of
 		/// index `fee_asset_item`. The weight limit for fees is not provided and thus is unlimited,
 		/// with all fees taken as needed from the asset.
@@ -880,7 +882,7 @@ pub mod pallet {
 				beneficiary,
 				assets,
 				fee_asset_item,
-				None,
+				Unlimited,
 			)
 		}
 
@@ -899,7 +901,7 @@ pub mod pallet {
 		#[pallet::weight(max_weight.saturating_add(T::WeightInfo::execute()))]
 		pub fn execute(
 			origin: OriginFor<T>,
-			message: Box<VersionedXcm<<T as SysConfig>::RuntimeCall>>,
+			message: Box<VersionedXcm<<T as Config>::RuntimeCall>>,
 			max_weight: Weight,
 		) -> DispatchResultWithPostInfo {
 			let origin_location = T::ExecuteXcmOrigin::ensure_origin(origin)?;
@@ -1056,7 +1058,7 @@ pub mod pallet {
 				beneficiary,
 				assets,
 				fee_asset_item,
-				Some(weight_limit),
+				weight_limit,
 			)
 		}
 
@@ -1110,7 +1112,7 @@ pub mod pallet {
 				beneficiary,
 				assets,
 				fee_asset_item,
-				Some(weight_limit),
+				weight_limit,
 			)
 		}
 
@@ -1198,7 +1200,7 @@ impl<T: Config> Pallet<T> {
 		beneficiary: Box<VersionedMultiLocation>,
 		assets: Box<VersionedMultiAssets>,
 		fee_asset_item: u32,
-		maybe_weight_limit: Option<WeightLimit>,
+		weight_limit: WeightLimit,
 	) -> DispatchResult {
 		let origin_location = T::ExecuteXcmOrigin::ensure_origin(origin)?;
 		let dest = (*dest).try_into().map_err(|()| Error::<T>::BadVersion)?;
@@ -1219,22 +1221,6 @@ impl<T: Config> Pallet<T> {
 			.map_err(|_| Error::<T>::CannotReanchor)?;
 		let max_assets = assets.len() as u32;
 		let assets: MultiAssets = assets.into();
-		let weight_limit = match maybe_weight_limit {
-			Some(weight_limit) => weight_limit,
-			None => {
-				let fees = fees.clone();
-				let mut remote_message = Xcm(vec![
-					ReserveAssetDeposited(assets.clone()),
-					ClearOrigin,
-					BuyExecution { fees, weight_limit: Limited(Weight::zero()) },
-					DepositAsset { assets: Wild(AllCounted(max_assets)), beneficiary },
-				]);
-				// use local weight for remote message and hope for the best.
-				let remote_weight = T::Weigher::weight(&mut remote_message)
-					.map_err(|()| Error::<T>::UnweighableMessage)?;
-				Limited(remote_weight)
-			},
-		};
 		let xcm = Xcm(vec![
 			BuyExecution { fees, weight_limit },
 			DepositAsset { assets: Wild(AllCounted(max_assets)), beneficiary },
@@ -1258,7 +1244,7 @@ impl<T: Config> Pallet<T> {
 		beneficiary: Box<VersionedMultiLocation>,
 		assets: Box<VersionedMultiAssets>,
 		fee_asset_item: u32,
-		maybe_weight_limit: Option<WeightLimit>,
+		weight_limit: WeightLimit,
 	) -> DispatchResult {
 		let origin_location = T::ExecuteXcmOrigin::ensure_origin(origin)?;
 		let dest = (*dest).try_into().map_err(|()| Error::<T>::BadVersion)?;
@@ -1279,22 +1265,6 @@ impl<T: Config> Pallet<T> {
 			.map_err(|_| Error::<T>::CannotReanchor)?;
 		let max_assets = assets.len() as u32;
 		let assets: MultiAssets = assets.into();
-		let weight_limit = match maybe_weight_limit {
-			Some(weight_limit) => weight_limit,
-			None => {
-				let fees = fees.clone();
-				let mut remote_message = Xcm(vec![
-					ReceiveTeleportedAsset(assets.clone()),
-					ClearOrigin,
-					BuyExecution { fees, weight_limit: Limited(Weight::zero()) },
-					DepositAsset { assets: Wild(AllCounted(max_assets)), beneficiary },
-				]);
-				// use local weight for remote message and hope for the best.
-				let remote_weight = T::Weigher::weight(&mut remote_message)
-					.map_err(|()| Error::<T>::UnweighableMessage)?;
-				Limited(remote_weight)
-			},
-		};
 		let xcm = Xcm(vec![
 			BuyExecution { fees, weight_limit },
 			DepositAsset { assets: Wild(AllCounted(max_assets)), beneficiary },
diff --git a/polkadot/xcm/pallet-xcm/src/migration.rs b/polkadot/xcm/pallet-xcm/src/migration.rs
index 08809f0d2f2e674e35321910d713eed8362b66b7..ba3cdb5c51edc82712b3bf00feedc8b670365547 100644
--- a/polkadot/xcm/pallet-xcm/src/migration.rs
+++ b/polkadot/xcm/pallet-xcm/src/migration.rs
@@ -63,10 +63,9 @@ pub mod v1 {
 
 	/// Version checked migration to v1.
 	///
-	/// Wrapped in VersionedRuntimeUpgrade so the pre/post checks don't begin failing after the
-	/// upgrade is enacted on-chain.
-	#[cfg(feature = "experimental")]
-	pub type VersionCheckedMigrateToV1<T> = frame_support::migrations::VersionedRuntimeUpgrade<
+	/// Wrapped in [`frame_support::migrations::VersionedMigration`] so the pre/post checks don't
+	/// begin failing after the upgrade is enacted on-chain.
+	pub type VersionCheckedMigrateToV1<T> = frame_support::migrations::VersionedMigration<
 		0,
 		1,
 		VersionUncheckedMigrateToV1<T>,
diff --git a/polkadot/xcm/pallet-xcm/src/mock.rs b/polkadot/xcm/pallet-xcm/src/mock.rs
index b56b1af82defd2d21a1deb378508df817483f959..b09bcb80ed671de34eaea0a512b90be7e2b92534 100644
--- a/polkadot/xcm/pallet-xcm/src/mock.rs
+++ b/polkadot/xcm/pallet-xcm/src/mock.rs
@@ -21,7 +21,7 @@ use frame_support::{
 	weights::Weight,
 };
 use frame_system::EnsureRoot;
-use polkadot_parachain::primitives::Id as ParaId;
+use polkadot_parachain_primitives::primitives::Id as ParaId;
 use polkadot_runtime_parachains::origin;
 use sp_core::H256;
 use sp_runtime::{traits::IdentityLookup, AccountId32, BuildStorage};
diff --git a/polkadot/xcm/pallet-xcm/src/tests.rs b/polkadot/xcm/pallet-xcm/src/tests.rs
index 6ff9f1d893c890bed05ee6e84489126a90c07c8b..5d8aee8d665f4d2a98af0aeef3622219d3a87634 100644
--- a/polkadot/xcm/pallet-xcm/src/tests.rs
+++ b/polkadot/xcm/pallet-xcm/src/tests.rs
@@ -24,7 +24,7 @@ use frame_support::{
 	traits::{Currency, Hooks},
 	weights::Weight,
 };
-use polkadot_parachain::primitives::Id as ParaId;
+use polkadot_parachain_primitives::primitives::Id as ParaId;
 use sp_runtime::traits::{AccountIdConversion, BlakeTwo256, Hash};
 use xcm::{latest::QueryResponseInfo, prelude::*};
 use xcm_builder::AllowKnownQueryResponses;
@@ -375,7 +375,7 @@ fn teleport_assets_works() {
 				Xcm(vec![
 					ReceiveTeleportedAsset((Here, SEND_AMOUNT).into()),
 					ClearOrigin,
-					buy_limited_execution((Here, SEND_AMOUNT), Weight::from_parts(4000, 4000)),
+					buy_execution((Here, SEND_AMOUNT)),
 					DepositAsset { assets: AllCounted(1).into(), beneficiary: dest },
 				]),
 			)]
@@ -508,7 +508,7 @@ fn reserve_transfer_assets_works() {
 				Xcm(vec![
 					ReserveAssetDeposited((Parent, SEND_AMOUNT).into()),
 					ClearOrigin,
-					buy_limited_execution((Parent, SEND_AMOUNT), Weight::from_parts(4000, 4000)),
+					buy_execution((Parent, SEND_AMOUNT)),
 					DepositAsset { assets: AllCounted(1).into(), beneficiary: dest },
 				]),
 			)]
diff --git a/polkadot/xcm/procedural/Cargo.toml b/polkadot/xcm/procedural/Cargo.toml
index a821a73669e01ac5e7d37451537ebd8bb9cb9920..56df0d94f586002cdc0e5aee58a5a9dfc7470599 100644
--- a/polkadot/xcm/procedural/Cargo.toml
+++ b/polkadot/xcm/procedural/Cargo.toml
@@ -3,7 +3,7 @@ name = "xcm-procedural"
 authors.workspace = true
 edition.workspace = true
 license.workspace = true
-version.workspace = true
+version = "1.0.0"
 
 [lib]
 proc-macro = true
@@ -11,5 +11,5 @@ proc-macro = true
 [dependencies]
 proc-macro2 = "1.0.56"
 quote = "1.0.28"
-syn = "2.0.15"
+syn = "2.0.38"
 Inflector = "0.11.4"
diff --git a/polkadot/xcm/src/lib.rs b/polkadot/xcm/src/lib.rs
index a012c5f53fbf24cc4ec2c9e202573e3228d13f6d..d3e2baf4f8aa570ffb3722870b3328f1f15c1c03 100644
--- a/polkadot/xcm/src/lib.rs
+++ b/polkadot/xcm/src/lib.rs
@@ -20,7 +20,8 @@
 // necessarily related to FRAME or even Substrate.
 //
 // Hence, `no_std` rather than sp-runtime.
-#![no_std]
+#![cfg_attr(not(feature = "std"), no_std)]
+
 extern crate alloc;
 
 use derivative::Derivative;
@@ -447,11 +448,6 @@ pub mod opaque {
 	pub type VersionedXcm = super::VersionedXcm<()>;
 }
 
-// A simple trait to get the weight of some object.
-pub trait GetWeight<W> {
-	fn weight(&self) -> latest::Weight;
-}
-
 #[test]
 fn conversion_works() {
 	use latest::prelude::*;
diff --git a/polkadot/xcm/src/v2/mod.rs b/polkadot/xcm/src/v2/mod.rs
index 8a67b771c9e97844406ff0415967bde7ff3a7ce1..a81468cd4812d9a08baefad6bee85130d172788d 100644
--- a/polkadot/xcm/src/v2/mod.rs
+++ b/polkadot/xcm/src/v2/mod.rs
@@ -55,7 +55,7 @@ use super::{
 		NetworkId as NewNetworkId, Response as NewResponse, WeightLimit as NewWeightLimit,
 		Xcm as NewXcm,
 	},
-	DoubleEncoded, GetWeight,
+	DoubleEncoded,
 };
 use alloc::{vec, vec::Vec};
 use bounded_collections::{ConstU32, WeakBoundedVec};
@@ -77,7 +77,7 @@ pub use multiasset::{
 pub use multilocation::{
 	Ancestor, AncestorThen, InteriorMultiLocation, Junctions, MultiLocation, Parent, ParentThen,
 };
-pub use traits::{Error, ExecuteXcm, Outcome, Result, SendError, SendResult, SendXcm};
+pub use traits::{Error, ExecuteXcm, GetWeight, Outcome, Result, SendError, SendResult, SendXcm};
 
 /// Basically just the XCM (more general) version of `ParachainDispatchOrigin`.
 #[derive(Copy, Clone, Eq, PartialEq, Encode, Decode, Debug, TypeInfo)]
diff --git a/polkadot/xcm/src/v2/multilocation.rs b/polkadot/xcm/src/v2/multilocation.rs
index 9fb74e8afb35b59ad6231e7d7c8b86b19a537f45..7d6bdece335f5659c9c7afa81dae2373da01c8c5 100644
--- a/polkadot/xcm/src/v2/multilocation.rs
+++ b/polkadot/xcm/src/v2/multilocation.rs
@@ -238,15 +238,13 @@ impl MultiLocation {
 	///
 	/// # Example
 	/// ```rust
-	/// # use xcm::v2::{Junctions::*, Junction::*, MultiLocation};
-	/// # fn main() {
+	/// # use staging_xcm::v2::{Junctions::*, Junction::*, MultiLocation};
 	/// let mut m = MultiLocation::new(1, X2(PalletInstance(3), OnlyChild));
 	/// assert_eq!(
 	///     m.match_and_split(&MultiLocation::new(1, X1(PalletInstance(3)))),
 	///     Some(&OnlyChild),
 	/// );
 	/// assert_eq!(m.match_and_split(&MultiLocation::new(1, Here)), None);
-	/// # }
 	/// ```
 	pub fn match_and_split(&self, prefix: &MultiLocation) -> Option<&Junction> {
 		if self.parents != prefix.parents {
@@ -260,7 +258,7 @@ impl MultiLocation {
 	///
 	/// # Example
 	/// ```rust
-	/// # use xcm::v2::{Junctions::*, Junction::*, MultiLocation};
+	/// # use staging_xcm::v2::{Junctions::*, Junction::*, MultiLocation};
 	/// let m = MultiLocation::new(1, X3(PalletInstance(3), OnlyChild, OnlyChild));
 	/// assert!(m.starts_with(&MultiLocation::new(1, X1(PalletInstance(3)))));
 	/// assert!(!m.starts_with(&MultiLocation::new(1, X1(GeneralIndex(99)))));
@@ -279,12 +277,10 @@ impl MultiLocation {
 	///
 	/// # Example
 	/// ```rust
-	/// # use xcm::v2::{Junctions::*, Junction::*, MultiLocation};
-	/// # fn main() {
+	/// # use staging_xcm::v2::{Junctions::*, Junction::*, MultiLocation};
 	/// let mut m = MultiLocation::new(1, X1(Parachain(21)));
 	/// assert_eq!(m.append_with(X1(PalletInstance(3))), Ok(()));
 	/// assert_eq!(m, MultiLocation::new(1, X2(Parachain(21), PalletInstance(3))));
-	/// # }
 	/// ```
 	pub fn append_with(&mut self, suffix: Junctions) -> Result<(), Junctions> {
 		if self.interior.len().saturating_add(suffix.len()) > MAX_JUNCTIONS {
@@ -302,12 +298,10 @@ impl MultiLocation {
 	///
 	/// # Example
 	/// ```rust
-	/// # use xcm::v2::{Junctions::*, Junction::*, MultiLocation};
-	/// # fn main() {
+	/// # use staging_xcm::v2::{Junctions::*, Junction::*, MultiLocation};
 	/// let mut m = MultiLocation::new(2, X1(PalletInstance(3)));
 	/// assert_eq!(m.prepend_with(MultiLocation::new(1, X2(Parachain(21), OnlyChild))), Ok(()));
 	/// assert_eq!(m, MultiLocation::new(1, X1(PalletInstance(3))));
-	/// # }
 	/// ```
 	pub fn prepend_with(&mut self, mut prefix: MultiLocation) -> Result<(), MultiLocation> {
 		//     prefix     self (suffix)
@@ -839,12 +833,10 @@ impl Junctions {
 	///
 	/// # Example
 	/// ```rust
-	/// # use xcm::v2::{Junctions::*, Junction::*};
-	/// # fn main() {
+	/// # use staging_xcm::v2::{Junctions::*, Junction::*};
 	/// let mut m = X3(Parachain(2), PalletInstance(3), OnlyChild);
 	/// assert_eq!(m.match_and_split(&X2(Parachain(2), PalletInstance(3))), Some(&OnlyChild));
 	/// assert_eq!(m.match_and_split(&X1(Parachain(2))), None);
-	/// # }
 	/// ```
 	pub fn match_and_split(&self, prefix: &Junctions) -> Option<&Junction> {
 		if prefix.len() + 1 != self.len() || !self.starts_with(prefix) {
@@ -857,7 +849,7 @@ impl Junctions {
 	///
 	/// # Example
 	/// ```rust
-	/// # use xcm::v2::{Junctions::*, Junction::*};
+	/// # use staging_xcm::v2::{Junctions::*, Junction::*};
 	/// let mut j = X3(Parachain(2), PalletInstance(3), OnlyChild);
 	/// assert!(j.starts_with(&X2(Parachain(2), PalletInstance(3))));
 	/// assert!(j.starts_with(&j));
diff --git a/polkadot/xcm/src/v2/traits.rs b/polkadot/xcm/src/v2/traits.rs
index ae03cf5547bad2223d430325b98b469eda8274a8..8173beb19d87c8150f5118082b9cf193482b5e4f 100644
--- a/polkadot/xcm/src/v2/traits.rs
+++ b/polkadot/xcm/src/v2/traits.rs
@@ -23,6 +23,11 @@ use scale_info::TypeInfo;
 
 use super::*;
 
+// A simple trait to get the weight of some object.
+pub trait GetWeight<W> {
+	fn weight(&self) -> sp_weights::Weight;
+}
+
 #[derive(Copy, Clone, Encode, Decode, Eq, PartialEq, Debug, TypeInfo)]
 pub enum Error {
 	// Errors that happen due to instructions being executed. These alone are defined in the
@@ -273,7 +278,7 @@ pub type SendResult = result::Result<(), SendError>;
 ///
 /// # Example
 /// ```rust
-/// # use xcm::v2::prelude::*;
+/// # use staging_xcm::v2::prelude::*;
 /// # use parity_scale_codec::Encode;
 ///
 /// /// A sender that only passes the message through and does nothing.
diff --git a/polkadot/xcm/src/v3/junctions.rs b/polkadot/xcm/src/v3/junctions.rs
index 201a80fb7658c6f1c919b9c16951d949dad4ca00..f7624c91c861259fa6f747e0d8e811a68ac56310 100644
--- a/polkadot/xcm/src/v3/junctions.rs
+++ b/polkadot/xcm/src/v3/junctions.rs
@@ -437,12 +437,10 @@ impl Junctions {
 	///
 	/// # Example
 	/// ```rust
-	/// # use xcm::v3::{Junctions::*, Junction::*, MultiLocation};
-	/// # fn main() {
+	/// # use staging_xcm::v3::{Junctions::*, Junction::*, MultiLocation};
 	/// let mut m = X1(Parachain(21));
 	/// assert_eq!(m.append_with(X1(PalletInstance(3))), Ok(()));
 	/// assert_eq!(m, X2(Parachain(21), PalletInstance(3)));
-	/// # }
 	/// ```
 	pub fn append_with(&mut self, suffix: impl Into<Junctions>) -> Result<(), Junctions> {
 		let suffix = suffix.into();
@@ -568,12 +566,10 @@ impl Junctions {
 	///
 	/// # Example
 	/// ```rust
-	/// # use xcm::v3::{Junctions::*, Junction::*};
-	/// # fn main() {
+	/// # use staging_xcm::v3::{Junctions::*, Junction::*};
 	/// let mut m = X3(Parachain(2), PalletInstance(3), OnlyChild);
 	/// assert_eq!(m.match_and_split(&X2(Parachain(2), PalletInstance(3))), Some(&OnlyChild));
 	/// assert_eq!(m.match_and_split(&X1(Parachain(2))), None);
-	/// # }
 	/// ```
 	pub fn match_and_split(&self, prefix: &Junctions) -> Option<&Junction> {
 		if prefix.len() + 1 != self.len() {
diff --git a/polkadot/xcm/src/v3/mod.rs b/polkadot/xcm/src/v3/mod.rs
index 36086795786270d75a0a2c2a987f66688233e8cd..a428f1277a5fe479422b3dd7bf80d741b267dd20 100644
--- a/polkadot/xcm/src/v3/mod.rs
+++ b/polkadot/xcm/src/v3/mod.rs
@@ -20,7 +20,7 @@ use super::v2::{
 	Instruction as OldInstruction, Response as OldResponse, WeightLimit as OldWeightLimit,
 	Xcm as OldXcm,
 };
-use crate::{DoubleEncoded, GetWeight};
+use crate::DoubleEncoded;
 use alloc::{vec, vec::Vec};
 use bounded_collections::{parameter_types, BoundedVec};
 use core::{
@@ -29,7 +29,10 @@ use core::{
 	result,
 };
 use derivative::Derivative;
-use parity_scale_codec::{self, Decode, Encode, MaxEncodedLen};
+use parity_scale_codec::{
+	self, decode_vec_with_len, Compact, Decode, Encode, Error as CodecError, Input as CodecInput,
+	MaxEncodedLen,
+};
 use scale_info::TypeInfo;
 
 mod junction;
@@ -52,7 +55,7 @@ pub use traits::{
 	SendResult, SendXcm, Weight, XcmHash,
 };
 // These parts of XCM v2 are unchanged in XCM v3, and are re-imported here.
-pub use super::v2::OriginKind;
+pub use super::v2::{GetWeight, OriginKind};
 
 /// This module's XCM version.
 pub const VERSION: super::Version = 3;
@@ -60,13 +63,35 @@ pub const VERSION: super::Version = 3;
 /// An identifier for a query.
 pub type QueryId = u64;
 
-#[derive(Derivative, Default, Encode, Decode, TypeInfo)]
+// TODO (v4): Use `BoundedVec` instead of `Vec`
+#[derive(Derivative, Default, Encode, TypeInfo)]
 #[derivative(Clone(bound = ""), Eq(bound = ""), PartialEq(bound = ""), Debug(bound = ""))]
 #[codec(encode_bound())]
-#[codec(decode_bound())]
 #[scale_info(bounds(), skip_type_params(Call))]
 pub struct Xcm<Call>(pub Vec<Instruction<Call>>);
 
+const MAX_INSTRUCTIONS_TO_DECODE: u8 = 100;
+
+environmental::environmental!(instructions_count: u8);
+
+impl<Call> Decode for Xcm<Call> {
+	fn decode<I: CodecInput>(input: &mut I) -> core::result::Result<Self, CodecError> {
+		instructions_count::using_once(&mut 0, || {
+			let number_of_instructions: u32 = <Compact<u32>>::decode(input)?.into();
+			instructions_count::with(|count| {
+				*count = count.saturating_add(number_of_instructions as u8);
+				if *count > MAX_INSTRUCTIONS_TO_DECODE {
+					return Err(CodecError::from("Max instructions exceeded"))
+				}
+				Ok(())
+			})
+			.unwrap_or(Ok(()))?;
+			let decoded_instructions = decode_vec_with_len(input, number_of_instructions as usize)?;
+			Ok(Self(decoded_instructions))
+		})
+	}
+}
+
 impl<Call> Xcm<Call> {
 	/// Create an empty instance.
 	pub fn new() -> Self {
@@ -174,6 +199,7 @@ pub mod prelude {
 			AssetInstance::{self, *},
 			BodyId, BodyPart, Error as XcmError, ExecuteXcm,
 			Fungibility::{self, *},
+			GetWeight,
 			Instruction::*,
 			InteriorMultiLocation,
 			Junction::{self, *},
@@ -1426,4 +1452,33 @@ mod tests {
 		let new_xcm: Xcm<()> = old_xcm.try_into().unwrap();
 		assert_eq!(new_xcm, xcm);
 	}
+
+	#[test]
+	fn decoding_respects_limit() {
+		let max_xcm = Xcm::<()>(vec![ClearOrigin; MAX_INSTRUCTIONS_TO_DECODE as usize]);
+		let encoded = max_xcm.encode();
+		assert!(Xcm::<()>::decode(&mut &encoded[..]).is_ok());
+
+		let big_xcm = Xcm::<()>(vec![ClearOrigin; MAX_INSTRUCTIONS_TO_DECODE as usize + 1]);
+		let encoded = big_xcm.encode();
+		assert!(Xcm::<()>::decode(&mut &encoded[..]).is_err());
+
+		let nested_xcm = Xcm::<()>(vec![
+			DepositReserveAsset {
+				assets: All.into(),
+				dest: Here.into(),
+				xcm: max_xcm,
+			};
+			(MAX_INSTRUCTIONS_TO_DECODE / 2) as usize
+		]);
+		let encoded = nested_xcm.encode();
+		assert!(Xcm::<()>::decode(&mut &encoded[..]).is_err());
+
+		let even_more_nested_xcm = Xcm::<()>(vec![SetAppendix(nested_xcm); 64]);
+		let encoded = even_more_nested_xcm.encode();
+		assert_eq!(encoded.len(), 342530);
+		// This should not decode since the limit is 100
+		assert_eq!(MAX_INSTRUCTIONS_TO_DECODE, 100, "precondition");
+		assert!(Xcm::<()>::decode(&mut &encoded[..]).is_err());
+	}
 }
diff --git a/polkadot/xcm/src/v3/multiasset.rs b/polkadot/xcm/src/v3/multiasset.rs
index 1668d1b870dcf12bb76ced97cd25aa3dfb929d83..188555318c8c0ba16e129407845ffdb3b056e81d 100644
--- a/polkadot/xcm/src/v3/multiasset.rs
+++ b/polkadot/xcm/src/v3/multiasset.rs
@@ -34,6 +34,7 @@ use crate::v2::{
 	WildMultiAsset as OldWildMultiAsset,
 };
 use alloc::{vec, vec::Vec};
+use bounded_collections::{BoundedVec, ConstU32};
 use core::{
 	cmp::Ordering,
 	convert::{TryFrom, TryInto},
@@ -506,9 +507,8 @@ impl TryFrom<OldMultiAsset> for MultiAsset {
 #[cfg_attr(feature = "std", derive(serde::Serialize, serde::Deserialize))]
 pub struct MultiAssets(Vec<MultiAsset>);
 
-/// Maximum number of items we expect in a single `MultiAssets` value. Note this is not (yet)
-/// enforced, and just serves to provide a sensible `max_encoded_len` for `MultiAssets`.
-const MAX_ITEMS_IN_MULTIASSETS: usize = 20;
+/// Maximum number of items in a single `MultiAssets` value that can be decoded.
+pub const MAX_ITEMS_IN_MULTIASSETS: usize = 20;
 
 impl MaxEncodedLen for MultiAssets {
 	fn max_encoded_len() -> usize {
@@ -517,8 +517,10 @@ impl MaxEncodedLen for MultiAssets {
 }
 
 impl Decode for MultiAssets {
-	fn decode<I: codec::Input>(input: &mut I) -> Result<Self, parity_scale_codec::Error> {
-		Self::from_sorted_and_deduplicated(Vec::<MultiAsset>::decode(input)?)
+	fn decode<I: codec::Input>(input: &mut I) -> Result<Self, codec::Error> {
+		let bounded_instructions =
+			BoundedVec::<MultiAsset, ConstU32<{ MAX_ITEMS_IN_MULTIASSETS as u32 }>>::decode(input)?;
+		Self::from_sorted_and_deduplicated(bounded_instructions.into_inner())
 			.map_err(|()| "Out of order".into())
 	}
 }
@@ -974,4 +976,31 @@ mod tests {
 		let r = MultiAssets::from_sorted_and_deduplicated(mixed_bad);
 		assert!(r.is_err());
 	}
+
+	#[test]
+	fn decoding_respects_limit() {
+		use super::*;
+
+		// Having lots of one asset will work since they are deduplicated
+		let lots_of_one_asset: MultiAssets =
+			vec![(GeneralIndex(1), 1u128).into(); MAX_ITEMS_IN_MULTIASSETS + 1].into();
+		let encoded = lots_of_one_asset.encode();
+		assert!(MultiAssets::decode(&mut &encoded[..]).is_ok());
+
+		// Fewer assets than the limit works
+		let mut few_assets: MultiAssets = Vec::new().into();
+		for i in 0..MAX_ITEMS_IN_MULTIASSETS {
+			few_assets.push((GeneralIndex(i as u128), 1u128).into());
+		}
+		let encoded = few_assets.encode();
+		assert!(MultiAssets::decode(&mut &encoded[..]).is_ok());
+
+		// Having lots of different assets will not work
+		let mut too_many_different_assets: MultiAssets = Vec::new().into();
+		for i in 0..MAX_ITEMS_IN_MULTIASSETS + 1 {
+			too_many_different_assets.push((GeneralIndex(i as u128), 1u128).into());
+		}
+		let encoded = too_many_different_assets.encode();
+		assert!(MultiAssets::decode(&mut &encoded[..]).is_err());
+	}
 }
diff --git a/polkadot/xcm/src/v3/multilocation.rs b/polkadot/xcm/src/v3/multilocation.rs
index 07f829d014c0bfdcb8a640ae334df6cb4428e5d7..8a1575d9bc950620e3f411349cdca6ef9db5deef 100644
--- a/polkadot/xcm/src/v3/multilocation.rs
+++ b/polkadot/xcm/src/v3/multilocation.rs
@@ -265,15 +265,13 @@ impl MultiLocation {
 	///
 	/// # Example
 	/// ```rust
-	/// # use xcm::v3::{Junctions::*, Junction::*, MultiLocation};
-	/// # fn main() {
+	/// # use staging_xcm::v3::{Junctions::*, Junction::*, MultiLocation};
 	/// let mut m = MultiLocation::new(1, X2(PalletInstance(3), OnlyChild));
 	/// assert_eq!(
 	///     m.match_and_split(&MultiLocation::new(1, X1(PalletInstance(3)))),
 	///     Some(&OnlyChild),
 	/// );
 	/// assert_eq!(m.match_and_split(&MultiLocation::new(1, Here)), None);
-	/// # }
 	/// ```
 	pub fn match_and_split(&self, prefix: &MultiLocation) -> Option<&Junction> {
 		if self.parents != prefix.parents {
@@ -292,12 +290,10 @@ impl MultiLocation {
 	///
 	/// # Example
 	/// ```rust
-	/// # use xcm::v3::{Junctions::*, Junction::*, MultiLocation, Parent};
-	/// # fn main() {
+	/// # use staging_xcm::v3::{Junctions::*, Junction::*, MultiLocation, Parent};
 	/// let mut m: MultiLocation = (Parent, Parachain(21), 69u64).into();
 	/// assert_eq!(m.append_with((Parent, PalletInstance(3))), Ok(()));
 	/// assert_eq!(m, MultiLocation::new(1, X2(Parachain(21), PalletInstance(3))));
-	/// # }
 	/// ```
 	pub fn append_with(&mut self, suffix: impl Into<Self>) -> Result<(), Self> {
 		let prefix = core::mem::replace(self, suffix.into());
@@ -313,12 +309,10 @@ impl MultiLocation {
 	///
 	/// # Example
 	/// ```rust
-	/// # use xcm::v3::{Junctions::*, Junction::*, MultiLocation, Parent};
-	/// # fn main() {
+	/// # use staging_xcm::v3::{Junctions::*, Junction::*, MultiLocation, Parent};
 	/// let mut m: MultiLocation = (Parent, Parachain(21), 69u64).into();
 	/// let r = m.appended_with((Parent, PalletInstance(3))).unwrap();
 	/// assert_eq!(r, MultiLocation::new(1, X2(Parachain(21), PalletInstance(3))));
-	/// # }
 	/// ```
 	pub fn appended_with(mut self, suffix: impl Into<Self>) -> Result<Self, (Self, Self)> {
 		match self.append_with(suffix) {
@@ -333,12 +327,10 @@ impl MultiLocation {
 	///
 	/// # Example
 	/// ```rust
-	/// # use xcm::v3::{Junctions::*, Junction::*, MultiLocation, Parent};
-	/// # fn main() {
+	/// # use staging_xcm::v3::{Junctions::*, Junction::*, MultiLocation, Parent};
 	/// let mut m: MultiLocation = (Parent, Parent, PalletInstance(3)).into();
 	/// assert_eq!(m.prepend_with((Parent, Parachain(21), OnlyChild)), Ok(()));
 	/// assert_eq!(m, MultiLocation::new(1, X1(PalletInstance(3))));
-	/// # }
 	/// ```
 	pub fn prepend_with(&mut self, prefix: impl Into<Self>) -> Result<(), Self> {
 		//     prefix     self (suffix)
@@ -382,12 +374,10 @@ impl MultiLocation {
 	///
 	/// # Example
 	/// ```rust
-	/// # use xcm::v3::{Junctions::*, Junction::*, MultiLocation, Parent};
-	/// # fn main() {
+	/// # use staging_xcm::v3::{Junctions::*, Junction::*, MultiLocation, Parent};
 	/// let m: MultiLocation = (Parent, Parent, PalletInstance(3)).into();
 	/// let r = m.prepended_with((Parent, Parachain(21), OnlyChild)).unwrap();
 	/// assert_eq!(r, MultiLocation::new(1, X1(PalletInstance(3))));
-	/// # }
 	/// ```
 	pub fn prepended_with(mut self, prefix: impl Into<Self>) -> Result<Self, (Self, Self)> {
 		match self.prepend_with(prefix) {
diff --git a/polkadot/xcm/src/v3/traits.rs b/polkadot/xcm/src/v3/traits.rs
index 128be42c2a2b335adcf5414a0228e6001aeaa2e5..a3cbeada91bd258545664b72b79d88ff7ca09f4c 100644
--- a/polkadot/xcm/src/v3/traits.rs
+++ b/polkadot/xcm/src/v3/traits.rs
@@ -449,8 +449,8 @@ pub type SendResult<T> = result::Result<(T, MultiAssets), SendError>;
 /// # Example
 /// ```rust
 /// # use parity_scale_codec::Encode;
-/// # use xcm::v3::{prelude::*, Weight};
-/// # use xcm::VersionedXcm;
+/// # use staging_xcm::v3::{prelude::*, Weight};
+/// # use staging_xcm::VersionedXcm;
 /// # use std::convert::Infallible;
 ///
 /// /// A sender that only passes the message through and does nothing.
diff --git a/polkadot/xcm/xcm-builder/Cargo.toml b/polkadot/xcm/xcm-builder/Cargo.toml
index 336162dce567c495d1599be5aa195be4c04ff9a3..1f0e1cf347758b01f7a06c65f75d6caf7944aa51 100644
--- a/polkadot/xcm/xcm-builder/Cargo.toml
+++ b/polkadot/xcm/xcm-builder/Cargo.toml
@@ -1,17 +1,17 @@
 [package]
-name = "xcm-builder"
+name = "staging-xcm-builder"
 description = "Tools & types for building with XCM and its executor."
 authors.workspace = true
 edition.workspace = true
 license.workspace = true
-version.workspace = true
+version = "1.0.0"
 
 [dependencies]
 impl-trait-for-tuples = "0.2.1"
 parity-scale-codec = { version = "3.6.1", default-features = false, features = ["derive"] }
 scale-info = { version = "2.5.0", default-features = false, features = ["derive"] }
-xcm = { path = "..", default-features = false }
-xcm-executor = { path = "../xcm-executor", default-features = false }
+xcm = { package = "staging-xcm", path = "..", default-features = false }
+xcm-executor = { package = "staging-xcm-executor", path = "../xcm-executor", default-features = false }
 sp-std = { path = "../../../substrate/primitives/std", default-features = false }
 sp-arithmetic = { path = "../../../substrate/primitives/arithmetic", default-features = false }
 sp-io = { path = "../../../substrate/primitives/io", default-features = false }
@@ -23,7 +23,7 @@ pallet-transaction-payment = { path = "../../../substrate/frame/transaction-paym
 log = { version = "0.4.17", default-features = false }
 
 # Polkadot dependencies
-polkadot-parachain = { path = "../../parachain", default-features = false }
+polkadot-parachain-primitives = { path = "../../parachain", default-features = false }
 
 [dev-dependencies]
 primitive-types = "0.12.1"
@@ -42,6 +42,14 @@ runtime-benchmarks = [
 	"frame-support/runtime-benchmarks",
 	"frame-system/runtime-benchmarks",
 	"pallet-assets/runtime-benchmarks",
+	"pallet-balances/runtime-benchmarks",
+	"pallet-salary/runtime-benchmarks",
+	"pallet-xcm/runtime-benchmarks",
+	"polkadot-parachain-primitives/runtime-benchmarks",
+	"polkadot-runtime-parachains/runtime-benchmarks",
+	"polkadot-test-runtime/runtime-benchmarks",
+	"primitives/runtime-benchmarks",
+	"sp-runtime/runtime-benchmarks",
 	"xcm-executor/runtime-benchmarks",
 ]
 std = [
@@ -50,7 +58,7 @@ std = [
 	"log/std",
 	"pallet-transaction-payment/std",
 	"parity-scale-codec/std",
-	"polkadot-parachain/std",
+	"polkadot-parachain-primitives/std",
 	"scale-info/std",
 	"sp-arithmetic/std",
 	"sp-io/std",
diff --git a/polkadot/xcm/xcm-builder/src/barriers.rs b/polkadot/xcm/xcm-builder/src/barriers.rs
index 353e111b813b66e95fd7a0e7876ca9658afe0c94..0d04e0971bf7bbd4be0f32b088d5a518f4d58030 100644
--- a/polkadot/xcm/xcm-builder/src/barriers.rs
+++ b/polkadot/xcm/xcm-builder/src/barriers.rs
@@ -21,7 +21,7 @@ use frame_support::{
 	ensure,
 	traits::{Contains, Get, ProcessMessageError},
 };
-use polkadot_parachain::primitives::IsSystem;
+use polkadot_parachain_primitives::primitives::IsSystem;
 use sp_std::{cell::Cell, marker::PhantomData, ops::ControlFlow, result::Result};
 use xcm::prelude::*;
 use xcm_executor::traits::{CheckSuspension, OnResponse, Properties, ShouldExecute};
diff --git a/polkadot/xcm/xcm-builder/src/currency_adapter.rs b/polkadot/xcm/xcm-builder/src/currency_adapter.rs
index 4dbd4fe8bcd0342d2bfe3722c2900f01f613bcf6..23dc7958fe15426dbec058cdcd01dc1f9b34a126 100644
--- a/polkadot/xcm/xcm-builder/src/currency_adapter.rs
+++ b/polkadot/xcm/xcm-builder/src/currency_adapter.rs
@@ -53,7 +53,7 @@ impl From<Error> for XcmError {
 /// use frame_support::{parameter_types, PalletId};
 /// use sp_runtime::traits::{AccountIdConversion, TrailingZeroInput};
 /// use xcm::latest::prelude::*;
-/// use xcm_builder::{ParentIsPreset, CurrencyAdapter, IsConcrete};
+/// use staging_xcm_builder::{ParentIsPreset, CurrencyAdapter, IsConcrete};
 ///
 /// /// Our chain's account id.
 /// type AccountId = sp_runtime::AccountId32;
diff --git a/polkadot/xcm/xcm-builder/src/lib.rs b/polkadot/xcm/xcm-builder/src/lib.rs
index e3f91040963840d2b29ceaa30fc1a8e373de4817..9fdd55d9f927483127fbca38f1f08f24066d9b35 100644
--- a/polkadot/xcm/xcm-builder/src/lib.rs
+++ b/polkadot/xcm/xcm-builder/src/lib.rs
@@ -32,10 +32,10 @@ pub use location_conversion::ForeignChainAliasAccount;
 pub use location_conversion::{
 	Account32Hash, AccountId32Aliases, AccountKey20Aliases, AliasesIntoAccountId32,
 	ChildParachainConvertsVia, DescribeAccountId32Terminal, DescribeAccountIdTerminal,
-	DescribeAccountKey20Terminal, DescribeAllTerminal, DescribeFamily, DescribeLocation,
-	DescribePalletTerminal, DescribeTerminus, GlobalConsensusConvertsFor,
-	GlobalConsensusParachainConvertsFor, HashedDescription, ParentIsPreset,
-	SiblingParachainConvertsVia,
+	DescribeAccountKey20Terminal, DescribeAllTerminal, DescribeBodyTerminal, DescribeFamily,
+	DescribeLocation, DescribePalletTerminal, DescribeTerminus, DescribeTreasuryVoiceTerminal,
+	GlobalConsensusConvertsFor, GlobalConsensusParachainConvertsFor, HashedDescription,
+	LocalTreasuryVoiceConvertsVia, ParentIsPreset, SiblingParachainConvertsVia,
 };
 
 mod origin_conversion;
diff --git a/polkadot/xcm/xcm-builder/src/location_conversion.rs b/polkadot/xcm/xcm-builder/src/location_conversion.rs
index 26b48fc88adcea2ca7cdb9d64402b6844a88942e..25d16f7eb8ccc7c6bc40e4454e77be012de172b4 100644
--- a/polkadot/xcm/xcm-builder/src/location_conversion.rs
+++ b/polkadot/xcm/xcm-builder/src/location_conversion.rs
@@ -18,7 +18,7 @@ use crate::universal_exports::ensure_is_remote;
 use frame_support::traits::Get;
 use parity_scale_codec::{Compact, Decode, Encode};
 use sp_io::hashing::blake2_256;
-use sp_runtime::traits::{AccountIdConversion, Convert, TrailingZeroInput};
+use sp_runtime::traits::{AccountIdConversion, TrailingZeroInput, TryConvert};
 use sp_std::{marker::PhantomData, prelude::*};
 use xcm::latest::prelude::*;
 use xcm_executor::traits::ConvertLocation;
@@ -84,13 +84,39 @@ impl DescribeLocation for DescribeAccountKey20Terminal {
 	}
 }
 
+/// Create a description of the remote treasury `location` if possible. No two locations should have
+/// the same descriptor.
+pub struct DescribeTreasuryVoiceTerminal;
+
+impl DescribeLocation for DescribeTreasuryVoiceTerminal {
+	fn describe_location(l: &MultiLocation) -> Option<Vec<u8>> {
+		match (l.parents, &l.interior) {
+			(0, X1(Plurality { id: BodyId::Treasury, part: BodyPart::Voice })) =>
+				Some((b"Treasury", b"Voice").encode()),
+			_ => None,
+		}
+	}
+}
+
 pub type DescribeAccountIdTerminal = (DescribeAccountId32Terminal, DescribeAccountKey20Terminal);
 
+pub struct DescribeBodyTerminal;
+impl DescribeLocation for DescribeBodyTerminal {
+	fn describe_location(l: &MultiLocation) -> Option<Vec<u8>> {
+		match (l.parents, &l.interior) {
+			(0, X1(Plurality { id, part })) => Some((b"Body", id, part).encode()),
+			_ => return None,
+		}
+	}
+}
+
 pub type DescribeAllTerminal = (
 	DescribeTerminus,
 	DescribePalletTerminal,
 	DescribeAccountId32Terminal,
 	DescribeAccountKey20Terminal,
+	DescribeTreasuryVoiceTerminal,
+	DescribeBodyTerminal,
 );
 
 pub struct DescribeFamily<DescribeInterior>(PhantomData<DescribeInterior>);
@@ -317,15 +343,34 @@ impl<Network: Get<Option<NetworkId>>, AccountId: From<[u8; 32]> + Into<[u8; 32]>
 	}
 }
 
+/// Returns specified `TreasuryAccount` as `AccountId32` if passed `location` matches Treasury
+/// plurality.
+pub struct LocalTreasuryVoiceConvertsVia<TreasuryAccount, AccountId>(
+	PhantomData<(TreasuryAccount, AccountId)>,
+);
+impl<TreasuryAccount: Get<AccountId>, AccountId: From<[u8; 32]> + Into<[u8; 32]> + Clone>
+	ConvertLocation<AccountId> for LocalTreasuryVoiceConvertsVia<TreasuryAccount, AccountId>
+{
+	fn convert_location(location: &MultiLocation) -> Option<AccountId> {
+		match *location {
+			MultiLocation {
+				parents: 0,
+				interior: X1(Plurality { id: BodyId::Treasury, part: BodyPart::Voice }),
+			} => Some((TreasuryAccount::get().into() as [u8; 32]).into()),
+			_ => None,
+		}
+	}
+}
+
 /// Conversion implementation which converts from a `[u8; 32]`-based `AccountId` into a
 /// `MultiLocation` consisting solely of a `AccountId32` junction with a fixed value for its
 /// network (provided by `Network`) and the `AccountId`'s `[u8; 32]` datum for the `id`.
 pub struct AliasesIntoAccountId32<Network, AccountId>(PhantomData<(Network, AccountId)>);
 impl<'a, Network: Get<Option<NetworkId>>, AccountId: Clone + Into<[u8; 32]> + Clone>
-	Convert<&'a AccountId, MultiLocation> for AliasesIntoAccountId32<Network, AccountId>
+	TryConvert<&'a AccountId, MultiLocation> for AliasesIntoAccountId32<Network, AccountId>
 {
-	fn convert(who: &AccountId) -> MultiLocation {
-		AccountId32 { network: Network::get(), id: who.clone().into() }.into()
+	fn try_convert(who: &AccountId) -> Result<MultiLocation, &AccountId> {
+		Ok(AccountId32 { network: Network::get(), id: who.clone().into() }.into())
 	}
 }
 
@@ -431,10 +476,13 @@ impl<UniversalLocation, AccountId>
 #[cfg(test)]
 mod tests {
 	use super::*;
-
+	use primitives::AccountId;
 	pub type ForeignChainAliasAccount<AccountId> =
 		HashedDescription<AccountId, LegacyDescribeForeignChainAccount>;
 
+	pub type ForeignChainAliasTreasuryAccount<AccountId> =
+		HashedDescription<AccountId, DescribeFamily<DescribeTreasuryVoiceTerminal>>;
+
 	use frame_support::parameter_types;
 	use xcm::latest::Junction;
 
@@ -925,4 +973,70 @@ mod tests {
 		};
 		assert!(ForeignChainAliasAccount::<[u8; 32]>::convert_location(&mul).is_none());
 	}
+
+	#[test]
+	fn remote_account_convert_on_para_sending_from_remote_para_treasury() {
+		let relay_treasury_to_para_location = MultiLocation {
+			parents: 1,
+			interior: X1(Plurality { id: BodyId::Treasury, part: BodyPart::Voice }),
+		};
+		let actual_description = ForeignChainAliasTreasuryAccount::<[u8; 32]>::convert_location(
+			&relay_treasury_to_para_location,
+		)
+		.unwrap();
+
+		assert_eq!(
+			[
+				18, 84, 93, 74, 187, 212, 254, 71, 192, 127, 112, 51, 3, 42, 54, 24, 220, 185, 161,
+				67, 205, 154, 108, 116, 108, 166, 226, 211, 29, 11, 244, 115
+			],
+			actual_description
+		);
+
+		let para_to_para_treasury_location = MultiLocation {
+			parents: 1,
+			interior: X2(
+				Parachain(1001),
+				Plurality { id: BodyId::Treasury, part: BodyPart::Voice },
+			),
+		};
+		let actual_description = ForeignChainAliasTreasuryAccount::<[u8; 32]>::convert_location(
+			&para_to_para_treasury_location,
+		)
+		.unwrap();
+
+		assert_eq!(
+			[
+				202, 52, 249, 30, 7, 99, 135, 128, 153, 139, 176, 141, 138, 234, 163, 150, 7, 36,
+				204, 92, 220, 137, 87, 57, 73, 91, 243, 189, 245, 200, 217, 204
+			],
+			actual_description
+		);
+	}
+
+	#[test]
+	fn local_account_convert_on_para_from_relay_treasury() {
+		let location = MultiLocation {
+			parents: 0,
+			interior: X1(Plurality { id: BodyId::Treasury, part: BodyPart::Voice }),
+		};
+
+		parameter_types! {
+			pub TreasuryAccountId: AccountId = AccountId::new([42u8; 32]);
+		}
+
+		let actual_description =
+			LocalTreasuryVoiceConvertsVia::<TreasuryAccountId, [u8; 32]>::convert_location(
+				&location,
+			)
+			.unwrap();
+
+		assert_eq!(
+			[
+				42, 42, 42, 42, 42, 42, 42, 42, 42, 42, 42, 42, 42, 42, 42, 42, 42, 42, 42, 42, 42,
+				42, 42, 42, 42, 42, 42, 42, 42, 42, 42, 42
+			],
+			actual_description
+		);
+	}
 }
diff --git a/polkadot/xcm/xcm-builder/src/matcher.rs b/polkadot/xcm/xcm-builder/src/matcher.rs
index 4a3c896a159ff81601dcbd9fa07e04975aaffb64..9da135dae31ea3360b67b54558b82a93427d9cc5 100644
--- a/polkadot/xcm/xcm-builder/src/matcher.rs
+++ b/polkadot/xcm/xcm-builder/src/matcher.rs
@@ -50,7 +50,7 @@ impl<'a, Call> CreateMatcher for &'a mut [Instruction<Call>] {
 /// ```rust
 /// use frame_support::traits::ProcessMessageError;
 /// use xcm::latest::Instruction;
-/// use xcm_builder::{CreateMatcher, MatchXcm};
+/// use staging_xcm_builder::{CreateMatcher, MatchXcm};
 ///
 /// let mut msg = [Instruction::<()>::ClearOrigin];
 /// let res = msg
diff --git a/polkadot/xcm/xcm-builder/src/matches_token.rs b/polkadot/xcm/xcm-builder/src/matches_token.rs
index ddb25799be62dc3ddf6e3f0850bdbe18b29a2165..b6a320d89316a50ec2c9554c1e71f2ace1412792 100644
--- a/polkadot/xcm/xcm-builder/src/matches_token.rs
+++ b/polkadot/xcm/xcm-builder/src/matches_token.rs
@@ -33,7 +33,7 @@ use xcm_executor::traits::{MatchesFungible, MatchesNonFungible};
 ///
 /// ```
 /// use xcm::latest::{MultiLocation, Parent};
-/// use xcm_builder::IsConcrete;
+/// use staging_xcm_builder::IsConcrete;
 /// use xcm_executor::traits::MatchesFungible;
 ///
 /// frame_support::parameter_types! {
@@ -71,7 +71,7 @@ impl<T: Get<MultiLocation>, I: TryFrom<AssetInstance>> MatchesNonFungible<I> for
 ///
 /// ```
 /// use xcm::latest::prelude::*;
-/// use xcm_builder::IsAbstract;
+/// use staging_xcm_builder::IsAbstract;
 /// use xcm_executor::traits::{MatchesFungible, MatchesNonFungible};
 ///
 /// frame_support::parameter_types! {
diff --git a/polkadot/xcm/xcm-builder/src/origin_conversion.rs b/polkadot/xcm/xcm-builder/src/origin_conversion.rs
index 112b26869a998f54f91bf67ab4d4f7b673d92d4d..cced7dedf62d234e9bec51f57292a77a6e365351 100644
--- a/polkadot/xcm/xcm-builder/src/origin_conversion.rs
+++ b/polkadot/xcm/xcm-builder/src/origin_conversion.rs
@@ -18,7 +18,7 @@
 
 use frame_support::traits::{EnsureOrigin, Get, GetBacking, OriginTrait};
 use frame_system::RawOrigin as SystemRawOrigin;
-use polkadot_parachain::primitives::IsSystem;
+use polkadot_parachain_primitives::primitives::IsSystem;
 use sp_runtime::traits::TryConvert;
 use sp_std::marker::PhantomData;
 use xcm::latest::{BodyId, BodyPart, Junction, Junctions::*, MultiLocation, NetworkId, OriginKind};
diff --git a/polkadot/xcm/xcm-builder/src/pay.rs b/polkadot/xcm/xcm-builder/src/pay.rs
index e36d26e425be3d0981e80ff93127e07a9c522805..0f3a622f4ece1769a4314b507bcc4fd917b911f7 100644
--- a/polkadot/xcm/xcm-builder/src/pay.rs
+++ b/polkadot/xcm/xcm-builder/src/pay.rs
@@ -1,4 +1,4 @@
-// Copyright Parity Technologies (UK) Ltd.
+// Copyright (C) Parity Technologies (UK) Ltd.
 // This file is part of Polkadot.
 
 // Polkadot is free software: you can redistribute it and/or modify
@@ -20,7 +20,7 @@ use frame_support::traits::{
 	tokens::{Pay, PaymentStatus},
 	Get,
 };
-use sp_runtime::traits::Convert;
+use sp_runtime::traits::TryConvert;
 use sp_std::{marker::PhantomData, vec};
 use xcm::{opaque::lts::Weight, prelude::*};
 use xcm_executor::traits::{QueryHandler, QueryResponseStatus};
@@ -71,8 +71,8 @@ impl<
 		Timeout: Get<Querier::BlockNumber>,
 		Beneficiary: Clone,
 		AssetKind,
-		AssetKindToLocatableAsset: Convert<AssetKind, LocatableAssetId>,
-		BeneficiaryRefToLocation: for<'a> Convert<&'a Beneficiary, MultiLocation>,
+		AssetKindToLocatableAsset: TryConvert<AssetKind, LocatableAssetId>,
+		BeneficiaryRefToLocation: for<'a> TryConvert<&'a Beneficiary, MultiLocation>,
 	> Pay
 	for PayOverXcm<
 		Interior,
@@ -96,12 +96,14 @@ impl<
 		asset_kind: Self::AssetKind,
 		amount: Self::Balance,
 	) -> Result<Self::Id, Self::Error> {
-		let locatable = AssetKindToLocatableAsset::convert(asset_kind);
+		let locatable = AssetKindToLocatableAsset::try_convert(asset_kind)
+			.map_err(|_| xcm::latest::Error::InvalidLocation)?;
 		let LocatableAssetId { asset_id, location: asset_location } = locatable;
 		let destination = Querier::UniversalLocation::get()
 			.invert_target(&asset_location)
 			.map_err(|()| Self::Error::LocationNotInvertible)?;
-		let beneficiary = BeneficiaryRefToLocation::convert(&who);
+		let beneficiary = BeneficiaryRefToLocation::try_convert(&who)
+			.map_err(|_| xcm::latest::Error::InvalidLocation)?;
 
 		let query_id = Querier::new_query(asset_location, Timeout::get(), Interior::get());
 
@@ -193,13 +195,13 @@ pub struct LocatableAssetId {
 	pub location: MultiLocation,
 }
 
-/// Adapter `struct` which implements a conversion from any `AssetKind` into a [`LocatableAsset`]
+/// Adapter `struct` which implements a conversion from any `AssetKind` into a [`LocatableAssetId`]
 /// value using a fixed `Location` for the `location` field.
 pub struct FixedLocation<Location>(sp_std::marker::PhantomData<Location>);
-impl<Location: Get<MultiLocation>, AssetKind: Into<AssetId>> Convert<AssetKind, LocatableAssetId>
+impl<Location: Get<MultiLocation>, AssetKind: Into<AssetId>> TryConvert<AssetKind, LocatableAssetId>
 	for FixedLocation<Location>
 {
-	fn convert(value: AssetKind) -> LocatableAssetId {
-		LocatableAssetId { asset_id: value.into(), location: Location::get() }
+	fn try_convert(value: AssetKind) -> Result<LocatableAssetId, AssetKind> {
+		Ok(LocatableAssetId { asset_id: value.into(), location: Location::get() })
 	}
 }
diff --git a/polkadot/xcm/xcm-builder/src/process_xcm_message.rs b/polkadot/xcm/xcm-builder/src/process_xcm_message.rs
index 8130d1732935da4629b71d2421c00bdb9d5e5b9c..dba45a8310aca1cedac249a01eb0ded7435be98a 100644
--- a/polkadot/xcm/xcm-builder/src/process_xcm_message.rs
+++ b/polkadot/xcm/xcm-builder/src/process_xcm_message.rs
@@ -1,4 +1,4 @@
-// Copyright 2020 Parity Technologies (UK) Ltd.
+// Copyright (C) Parity Technologies (UK) Ltd.
 // This file is part of Polkadot.
 
 // Polkadot is free software: you can redistribute it and/or modify
@@ -26,7 +26,7 @@ use sp_std::{fmt::Debug, marker::PhantomData};
 use sp_weights::{Weight, WeightMeter};
 use xcm::prelude::*;
 
-/// A message processor that delegates execution to an [`XcmExecutor`].
+/// A message processor that delegates execution to an `XcmExecutor`.
 pub struct ProcessXcmMessage<MessageOrigin, XcmExecutor, Call>(
 	PhantomData<(MessageOrigin, XcmExecutor, Call)>,
 );
@@ -110,7 +110,7 @@ mod tests {
 
 			// Errors if we stay below a weight limit of 1000.
 			for i in 0..10 {
-				let meter = &mut WeightMeter::from_limit((i * 10).into());
+				let meter = &mut WeightMeter::with_limit((i * 10).into());
 				let mut id = [0; 32];
 				assert_err!(
 					Processor::process_message(msg, ORIGIN, meter, &mut id),
@@ -120,7 +120,7 @@ mod tests {
 			}
 
 			// Works with a limit of 1000.
-			let meter = &mut WeightMeter::from_limit(1000.into());
+			let meter = &mut WeightMeter::with_limit(1000.into());
 			let mut id = [0; 32];
 			assert_ok!(Processor::process_message(msg, ORIGIN, meter, &mut id));
 			assert_eq!(meter.consumed(), 1000.into());
@@ -150,6 +150,6 @@ mod tests {
 	}
 
 	fn process_raw(raw: &[u8]) -> Result<bool, ProcessMessageError> {
-		Processor::process_message(raw, ORIGIN, &mut WeightMeter::max_limit(), &mut [0; 32])
+		Processor::process_message(raw, ORIGIN, &mut WeightMeter::new(), &mut [0; 32])
 	}
 }
diff --git a/polkadot/xcm/xcm-builder/src/tests/mock.rs b/polkadot/xcm/xcm-builder/src/tests/mock.rs
index 0e7b748106efefaf87af4e7b5772ffa7ddfc3f1d..e73b62f007314ae06034f35030e4474cc290183d 100644
--- a/polkadot/xcm/xcm-builder/src/tests/mock.rs
+++ b/polkadot/xcm/xcm-builder/src/tests/mock.rs
@@ -28,11 +28,10 @@ pub use crate::{
 use frame_support::traits::{ContainsPair, Everything};
 pub use frame_support::{
 	dispatch::{
-		DispatchError, DispatchInfo, DispatchResultWithPostInfo, Dispatchable, GetDispatchInfo,
-		Parameter, PostDispatchInfo,
+		DispatchInfo, DispatchResultWithPostInfo, GetDispatchInfo, Parameter, PostDispatchInfo,
 	},
 	ensure, match_types, parameter_types,
-	sp_runtime::DispatchErrorWithPostInfo,
+	sp_runtime::{traits::Dispatchable, DispatchError, DispatchErrorWithPostInfo},
 	traits::{ConstU32, Contains, Get, IsInVec},
 };
 pub use parity_scale_codec::{Decode, Encode};
diff --git a/polkadot/xcm/xcm-builder/src/tests/pay/mock.rs b/polkadot/xcm/xcm-builder/src/tests/pay/mock.rs
index c663b0a4d76f41b7e9a184f63202ace61376089a..5b6fa3ee5a0b05fbfb868f813b673e749dfaaf18 100644
--- a/polkadot/xcm/xcm-builder/src/tests/pay/mock.rs
+++ b/polkadot/xcm/xcm-builder/src/tests/pay/mock.rs
@@ -49,22 +49,12 @@ construct_runtime!(
 	}
 );
 
-parameter_types! {
-	pub const BlockHashCount: BlockNumber = 250;
-}
-
 #[derive_impl(frame_system::config_preludes::TestDefaultConfig as frame_system::DefaultConfig)]
 impl frame_system::Config for Test {
 	type Block = Block;
-	type BlockHashCount = BlockHashCount;
-	type BaseCallFilter = frame_support::traits::Everything;
-	type RuntimeOrigin = RuntimeOrigin;
-	type RuntimeCall = RuntimeCall;
-	type RuntimeEvent = RuntimeEvent;
-	type PalletInfo = PalletInfo;
-	type OnSetCode = ();
 	type AccountData = pallet_balances::AccountData<Balance>;
 	type AccountId = AccountId;
+	type BlockHashCount = ConstU32<256>;
 	type Lookup = sp_runtime::traits::IdentityLookup<AccountId>;
 }
 
diff --git a/polkadot/xcm/xcm-builder/src/tests/pay/pay.rs b/polkadot/xcm/xcm-builder/src/tests/pay/pay.rs
index 28b2feec0c231438c94d8e890a41e855498f6ded..491a2bcef7a0c8a3d026e13cf48f226161c0b9cf 100644
--- a/polkadot/xcm/xcm-builder/src/tests/pay/pay.rs
+++ b/polkadot/xcm/xcm-builder/src/tests/pay/pay.rs
@@ -29,9 +29,9 @@ pub struct AssetKind {
 }
 
 pub struct LocatableAssetKindConverter;
-impl sp_runtime::traits::Convert<AssetKind, LocatableAssetId> for LocatableAssetKindConverter {
-	fn convert(value: AssetKind) -> LocatableAssetId {
-		LocatableAssetId { asset_id: value.asset_id, location: value.destination }
+impl sp_runtime::traits::TryConvert<AssetKind, LocatableAssetId> for LocatableAssetKindConverter {
+	fn try_convert(value: AssetKind) -> Result<LocatableAssetId, AssetKind> {
+		Ok(LocatableAssetId { asset_id: value.asset_id, location: value.destination })
 	}
 }
 
diff --git a/polkadot/xcm/xcm-builder/src/universal_exports.rs b/polkadot/xcm/xcm-builder/src/universal_exports.rs
index 0ee627e0ee903d56b81a1b1f22ce80dd2b3a0fdc..a24631ffa9423c31c78b6f2860ab3df48e502725 100644
--- a/polkadot/xcm/xcm-builder/src/universal_exports.rs
+++ b/polkadot/xcm/xcm-builder/src/universal_exports.rs
@@ -163,15 +163,21 @@ impl<Bridges: ExporterFor, Router: SendXcm, UniversalLocation: Get<InteriorMulti
 
 	fn validate(
 		dest: &mut Option<MultiLocation>,
-		xcm: &mut Option<Xcm<()>>,
+		msg: &mut Option<Xcm<()>>,
 	) -> SendResult<Router::Ticket> {
 		let d = dest.ok_or(MissingArgument)?;
 		let devolved = ensure_is_remote(UniversalLocation::get(), d).map_err(|_| NotApplicable)?;
 		let (remote_network, remote_location) = devolved;
-		let xcm = xcm.take().ok_or(MissingArgument)?;
-
-		let (bridge, maybe_payment) =
-			Bridges::exporter_for(&remote_network, &remote_location, &xcm).ok_or(NotApplicable)?;
+		let xcm = msg.take().ok_or(MissingArgument)?;
+
+		// find exporter
+		let Some((bridge, maybe_payment)) =
+			Bridges::exporter_for(&remote_network, &remote_location, &xcm)
+		else {
+			// We need to make sure that msg is not consumed in case of `NotApplicable`.
+			*msg = Some(xcm);
+			return Err(SendError::NotApplicable)
+		};
 		ensure!(maybe_payment.is_none(), Unroutable);
 
 		// `xcm` should already end with `SetTopic` - if it does, then extract and derive into
@@ -224,13 +230,21 @@ impl<Bridges: ExporterFor, Router: SendXcm, UniversalLocation: Get<InteriorMulti
 
 	fn validate(
 		dest: &mut Option<MultiLocation>,
-		xcm: &mut Option<Xcm<()>>,
+		msg: &mut Option<Xcm<()>>,
 	) -> SendResult<Router::Ticket> {
 		let d = *dest.as_ref().ok_or(MissingArgument)?;
 		let devolved = ensure_is_remote(UniversalLocation::get(), d).map_err(|_| NotApplicable)?;
 		let (remote_network, remote_location) = devolved;
-
-		let xcm = xcm.take().ok_or(MissingArgument)?;
+		let xcm = msg.take().ok_or(MissingArgument)?;
+
+		// find exporter
+		let Some((bridge, maybe_payment)) =
+			Bridges::exporter_for(&remote_network, &remote_location, &xcm)
+		else {
+			// We need to make sure that msg is not consumed in case of `NotApplicable`.
+			*msg = Some(xcm);
+			return Err(SendError::NotApplicable)
+		};
 
 		// `xcm` should already end with `SetTopic` - if it does, then extract and derive into
 		// an onward topic ID.
@@ -239,9 +253,6 @@ impl<Bridges: ExporterFor, Router: SendXcm, UniversalLocation: Get<InteriorMulti
 			_ => None,
 		};
 
-		let (bridge, maybe_payment) =
-			Bridges::exporter_for(&remote_network, &remote_location, &xcm).ok_or(NotApplicable)?;
-
 		let local_from_bridge =
 			UniversalLocation::get().invert_target(&bridge).map_err(|_| Unroutable)?;
 		let export_instruction =
@@ -452,4 +463,80 @@ mod tests {
 		let x = ensure_is_remote((), (Parent, Polkadot, Parachain(1000)));
 		assert_eq!(x, Err((Parent, Polkadot, Parachain(1000)).into()));
 	}
+
+	pub struct OkSender;
+	impl SendXcm for OkSender {
+		type Ticket = ();
+
+		fn validate(
+			_destination: &mut Option<MultiLocation>,
+			_message: &mut Option<Xcm<()>>,
+		) -> SendResult<Self::Ticket> {
+			Ok(((), MultiAssets::new()))
+		}
+
+		fn deliver(_ticket: Self::Ticket) -> Result<XcmHash, SendError> {
+			Ok([0; 32])
+		}
+	}
+
+	/// Generic test case asserting that dest and msg is not consumed by `validate` implementation
+	/// of `SendXcm` in case of expected result.
+	fn ensure_validate_does_not_consume_dest_or_msg<S: SendXcm>(
+		dest: MultiLocation,
+		assert_result: impl Fn(SendResult<S::Ticket>),
+	) {
+		let mut dest_wrapper = Some(dest);
+		let msg = Xcm::<()>::new();
+		let mut msg_wrapper = Some(msg.clone());
+
+		assert_result(S::validate(&mut dest_wrapper, &mut msg_wrapper));
+
+		// ensure dest and msg are untouched
+		assert_eq!(Some(dest), dest_wrapper);
+		assert_eq!(Some(msg), msg_wrapper);
+	}
+
+	#[test]
+	fn remote_exporters_does_not_consume_dest_or_msg_on_not_applicable() {
+		frame_support::parameter_types! {
+			pub Local: NetworkId = ByGenesis([0; 32]);
+			pub UniversalLocation: InteriorMultiLocation = X2(GlobalConsensus(Local::get()), Parachain(1234));
+			pub DifferentRemote: NetworkId = ByGenesis([22; 32]);
+			// no routers
+			pub BridgeTable: Vec<(NetworkId, MultiLocation, Option<MultiAsset>)> = vec![];
+		}
+
+		// check with local destination (should be remote)
+		let local_dest = (Parent, Parachain(5678)).into();
+		assert!(ensure_is_remote(UniversalLocation::get(), local_dest).is_err());
+
+		ensure_validate_does_not_consume_dest_or_msg::<
+			UnpaidRemoteExporter<NetworkExportTable<BridgeTable>, OkSender, UniversalLocation>,
+		>(local_dest, |result| assert_eq!(Err(NotApplicable), result));
+
+		ensure_validate_does_not_consume_dest_or_msg::<
+			SovereignPaidRemoteExporter<
+				NetworkExportTable<BridgeTable>,
+				OkSender,
+				UniversalLocation,
+			>,
+		>(local_dest, |result| assert_eq!(Err(NotApplicable), result));
+
+		// check with not applicable destination
+		let remote_dest = (Parent, Parent, DifferentRemote::get()).into();
+		assert!(ensure_is_remote(UniversalLocation::get(), remote_dest).is_ok());
+
+		ensure_validate_does_not_consume_dest_or_msg::<
+			UnpaidRemoteExporter<NetworkExportTable<BridgeTable>, OkSender, UniversalLocation>,
+		>(remote_dest, |result| assert_eq!(Err(NotApplicable), result));
+
+		ensure_validate_does_not_consume_dest_or_msg::<
+			SovereignPaidRemoteExporter<
+				NetworkExportTable<BridgeTable>,
+				OkSender,
+				UniversalLocation,
+			>,
+		>(remote_dest, |result| assert_eq!(Err(NotApplicable), result));
+	}
 }
diff --git a/polkadot/xcm/xcm-builder/src/weight.rs b/polkadot/xcm/xcm-builder/src/weight.rs
index f1c14a4c65176b6e427e6fdfdd47e8775707c04a..c16c52939a38bfb62434e7d7c9a994ac54f35dd9 100644
--- a/polkadot/xcm/xcm-builder/src/weight.rs
+++ b/polkadot/xcm/xcm-builder/src/weight.rs
@@ -73,7 +73,7 @@ where
 	W: XcmWeightInfo<C>,
 	C: Decode + GetDispatchInfo,
 	M: Get<u32>,
-	Instruction<C>: xcm::GetWeight<W>,
+	Instruction<C>: xcm::latest::GetWeight<W>,
 {
 	fn weight(message: &mut Xcm<C>) -> Result<Weight, ()> {
 		log::trace!(target: "xcm::weight", "WeightInfoBounds message: {:?}", message);
@@ -90,7 +90,7 @@ where
 	W: XcmWeightInfo<C>,
 	C: Decode + GetDispatchInfo,
 	M: Get<u32>,
-	Instruction<C>: xcm::GetWeight<W>,
+	Instruction<C>: xcm::latest::GetWeight<W>,
 {
 	fn weight_with_limit(message: &Xcm<C>, instrs_limit: &mut u32) -> Result<Weight, ()> {
 		let mut r: Weight = Weight::zero();
@@ -104,7 +104,6 @@ where
 		instruction: &Instruction<C>,
 		instrs_limit: &mut u32,
 	) -> Result<Weight, ()> {
-		use xcm::GetWeight;
 		let instr_weight = match instruction {
 			Transact { require_weight_at_most, .. } => *require_weight_at_most,
 			SetErrorHandler(xcm) | SetAppendix(xcm) => Self::weight_with_limit(xcm, instrs_limit)?,
diff --git a/polkadot/xcm/xcm-builder/tests/mock/mod.rs b/polkadot/xcm/xcm-builder/tests/mock/mod.rs
index f799be7e401309dd5c12db2f64a1c6cf808411ef..363748940ca624e12212733a897db3a1d840c531 100644
--- a/polkadot/xcm/xcm-builder/tests/mock/mod.rs
+++ b/polkadot/xcm/xcm-builder/tests/mock/mod.rs
@@ -25,11 +25,13 @@ use primitive_types::H256;
 use sp_runtime::{traits::IdentityLookup, AccountId32, BuildStorage};
 use sp_std::cell::RefCell;
 
-use polkadot_parachain::primitives::Id as ParaId;
+use polkadot_parachain_primitives::primitives::Id as ParaId;
 use polkadot_runtime_parachains::{configuration, origin, shared};
 use xcm::latest::{opaque, prelude::*};
 use xcm_executor::XcmExecutor;
 
+use staging_xcm_builder as xcm_builder;
+
 use xcm_builder::{
 	AccountId32Aliases, AllowTopLevelPaidExecutionFrom, AllowUnpaidExecutionFrom,
 	ChildParachainAsNative, ChildParachainConvertsVia, ChildSystemParachainAsSuperuser,
diff --git a/polkadot/xcm/xcm-builder/tests/scenarios.rs b/polkadot/xcm/xcm-builder/tests/scenarios.rs
index 3e735720aa7620ce4d18450e55eff90f83101db3..426efcaccdbaf7f2dec0894e8b615bd0e199c188 100644
--- a/polkadot/xcm/xcm-builder/tests/scenarios.rs
+++ b/polkadot/xcm/xcm-builder/tests/scenarios.rs
@@ -20,7 +20,7 @@ use mock::{
 	fake_message_hash, kusama_like_with_balances, AccountId, Balance, Balances, BaseXcmWeight,
 	System, XcmConfig, CENTS,
 };
-use polkadot_parachain::primitives::Id as ParaId;
+use polkadot_parachain_primitives::primitives::Id as ParaId;
 use sp_runtime::traits::AccountIdConversion;
 use xcm::latest::prelude::*;
 use xcm_executor::XcmExecutor;
diff --git a/polkadot/xcm/xcm-executor/Cargo.toml b/polkadot/xcm/xcm-executor/Cargo.toml
index de0ca1e4689e0c6c5be36e7a95ec00ce6563e2a5..902f55901d6c8195ac6af2a44ddb68a9ab177768 100644
--- a/polkadot/xcm/xcm-executor/Cargo.toml
+++ b/polkadot/xcm/xcm-executor/Cargo.toml
@@ -1,16 +1,16 @@
 [package]
-name = "xcm-executor"
+name = "staging-xcm-executor"
 description = "An abstract and configurable XCM message executor."
 authors.workspace = true
 edition.workspace = true
 license.workspace = true
-version.workspace = true
+version = "1.0.0"
 
 [dependencies]
 impl-trait-for-tuples = "0.2.2"
 environmental = { version = "1.1.4", default-features = false }
 parity-scale-codec = { version = "3.6.1", default-features = false, features = ["derive"] }
-xcm = { path = "..", default-features = false }
+xcm = { package = "staging-xcm", path = "..", default-features = false }
 sp-std = { path = "../../../substrate/primitives/std", default-features = false }
 sp-io = { path = "../../../substrate/primitives/io", default-features = false }
 sp-arithmetic = { path = "../../../substrate/primitives/arithmetic", default-features = false }
@@ -23,7 +23,11 @@ frame-benchmarking = { path = "../../../substrate/frame/benchmarking", default-f
 
 [features]
 default = [ "std" ]
-runtime-benchmarks = [ "frame-benchmarking/runtime-benchmarks" ]
+runtime-benchmarks = [
+	"frame-benchmarking/runtime-benchmarks",
+	"frame-support/runtime-benchmarks",
+	"sp-runtime/runtime-benchmarks",
+]
 std = [
 	"frame-benchmarking/std",
 	"frame-support/std",
diff --git a/polkadot/xcm/xcm-executor/integration-tests/Cargo.toml b/polkadot/xcm/xcm-executor/integration-tests/Cargo.toml
index ecd7096c58debe73c409447e26620f802fb2971e..d869fc6f2dcd2a72d0e20d80a890ebf89a9114cf 100644
--- a/polkadot/xcm/xcm-executor/integration-tests/Cargo.toml
+++ b/polkadot/xcm/xcm-executor/integration-tests/Cargo.toml
@@ -4,7 +4,7 @@ description = "Integration tests for the XCM Executor"
 authors.workspace = true
 edition.workspace = true
 license.workspace = true
-version.workspace = true
+version = "1.0.0"
 publish = false
 
 [dependencies]
@@ -20,8 +20,8 @@ sp-consensus = { path = "../../../../substrate/primitives/consensus/common" }
 sp-keyring = { path = "../../../../substrate/primitives/keyring" }
 sp-runtime = { path = "../../../../substrate/primitives/runtime", default-features = false }
 sp-state-machine = { path = "../../../../substrate/primitives/state-machine" }
-xcm = { path = "../..", default-features = false }
-xcm-executor = { path = ".." }
+xcm = { package = "staging-xcm", path = "../..", default-features = false }
+xcm-executor = { package = "staging-xcm-executor", path = ".." }
 sp-tracing = { path = "../../../../substrate/primitives/tracing" }
 
 [features]
diff --git a/polkadot/xcm/xcm-executor/src/assets.rs b/polkadot/xcm/xcm-executor/src/assets.rs
index d8d8936df33187388522a705df08847a73f63245..33f2ff218c732ccc04c2950f1798a1ec65a89330 100644
--- a/polkadot/xcm/xcm-executor/src/assets.rs
+++ b/polkadot/xcm/xcm-executor/src/assets.rs
@@ -446,7 +446,7 @@ impl Assets {
 	/// Example:
 	///
 	/// ```
-	/// use xcm_executor::Assets;
+	/// use staging_xcm_executor::Assets;
 	/// use xcm::latest::prelude::*;
 	/// let assets_i_have: Assets = vec![ (Here, 100).into(), ([0; 32], 100).into() ].into();
 	/// let assets_they_want: MultiAssetFilter = vec![ (Here, 200).into(), ([0; 32], 50).into() ].into();
diff --git a/polkadot/xcm/xcm-executor/src/config.rs b/polkadot/xcm/xcm-executor/src/config.rs
index 1fc5cef39215380e2015c8d9d5dd273f3e15a87a..2ff12cd7a5399f442fc1882e534e914703a91df6 100644
--- a/polkadot/xcm/xcm-executor/src/config.rs
+++ b/polkadot/xcm/xcm-executor/src/config.rs
@@ -20,9 +20,10 @@ use crate::traits::{
 	WeightTrader,
 };
 use frame_support::{
-	dispatch::{Dispatchable, GetDispatchInfo, Parameter, PostDispatchInfo},
+	dispatch::{GetDispatchInfo, Parameter, PostDispatchInfo},
 	traits::{Contains, ContainsPair, Get, PalletsInfoAccess},
 };
+use sp_runtime::traits::Dispatchable;
 use xcm::prelude::*;
 
 /// The trait to parameterize the `XcmExecutor`.
diff --git a/polkadot/xcm/xcm-executor/src/traits/conversion.rs b/polkadot/xcm/xcm-executor/src/traits/conversion.rs
index dac099ffaf8e400a7d75cbd9009482ab375ea5db..1fcdf21405784860f39a51f2e7b1a7b1e0baa459 100644
--- a/polkadot/xcm/xcm-executor/src/traits/conversion.rs
+++ b/polkadot/xcm/xcm-executor/src/traits/conversion.rs
@@ -46,7 +46,7 @@ impl<AccountId> ConvertLocation<AccountId> for Tuple {
 ///
 /// ```rust
 /// # use xcm::latest::{MultiLocation, Junctions, Junction, OriginKind};
-/// # use xcm_executor::traits::ConvertOrigin;
+/// # use staging_xcm_executor::traits::ConvertOrigin;
 /// // A convertor that will bump the para id and pass it to the next one.
 /// struct BumpParaId;
 /// impl ConvertOrigin<u32> for BumpParaId {
diff --git a/polkadot/xcm/xcm-executor/src/traits/on_response.rs b/polkadot/xcm/xcm-executor/src/traits/on_response.rs
index b0f8b35bb98f430c8c89d54c8be05f92ab2b9559..3558160dc87d37acc03833518875d980a458f4e2 100644
--- a/polkadot/xcm/xcm-executor/src/traits/on_response.rs
+++ b/polkadot/xcm/xcm-executor/src/traits/on_response.rs
@@ -16,12 +16,10 @@
 
 use crate::Xcm;
 use core::result;
-use frame_support::{
-	dispatch::fmt::Debug,
-	pallet_prelude::{Get, TypeInfo},
-};
+use frame_support::pallet_prelude::{Get, TypeInfo};
 use parity_scale_codec::{FullCodec, MaxEncodedLen};
 use sp_arithmetic::traits::Zero;
+use sp_std::fmt::Debug;
 use xcm::latest::{
 	Error as XcmError, InteriorMultiLocation, MultiLocation, QueryId, Response,
 	Result as XcmResult, Weight, XcmContext,
diff --git a/polkadot/xcm/xcm-simulator/Cargo.toml b/polkadot/xcm/xcm-simulator/Cargo.toml
index 901ca49d0f71aa427da0bfc1298f71c8890d6177..eedcfa0032af41d2cb69844c54048d8abb5137c9 100644
--- a/polkadot/xcm/xcm-simulator/Cargo.toml
+++ b/polkadot/xcm/xcm-simulator/Cargo.toml
@@ -1,7 +1,7 @@
 [package]
 name = "xcm-simulator"
 description = "Test kit to simulate cross-chain message passing and XCM execution"
-version.workspace = true
+version = "1.0.0"
 authors.workspace = true
 edition.workspace = true
 license.workspace = true
@@ -14,9 +14,9 @@ frame-support = { path = "../../../substrate/frame/support" }
 sp-io = { path = "../../../substrate/primitives/io" }
 sp-std = { path = "../../../substrate/primitives/std" }
 
-xcm = { path = ".." }
-xcm-executor = { path = "../xcm-executor" }
-xcm-builder = { path = "../xcm-builder" }
+xcm = { package = "staging-xcm", path = ".." }
+xcm-executor = { package = "staging-xcm-executor", path = "../xcm-executor" }
+xcm-builder = { package = "staging-xcm-builder", path = "../xcm-builder" }
 polkadot-core-primitives = { path = "../../core-primitives" }
-polkadot-parachain = { path = "../../parachain" }
+polkadot-parachain-primitives = { path = "../../parachain" }
 polkadot-runtime-parachains = { path = "../../runtime/parachains" }
diff --git a/polkadot/xcm/xcm-simulator/example/Cargo.toml b/polkadot/xcm/xcm-simulator/example/Cargo.toml
index 33a5164ee821b9c0d86f926541623e58a39c05c1..9c48b11f6226fd4a1af2a241cee91f37c010d1a1 100644
--- a/polkadot/xcm/xcm-simulator/example/Cargo.toml
+++ b/polkadot/xcm/xcm-simulator/example/Cargo.toml
@@ -4,7 +4,7 @@ description = "Examples of xcm-simulator usage."
 authors.workspace = true
 edition.workspace = true
 license.workspace = true
-version.workspace = true
+version = "1.0.0"
 
 [dependencies]
 codec = { package = "parity-scale-codec", version = "3.6.1" }
@@ -22,14 +22,14 @@ sp-runtime = { path = "../../../../substrate/primitives/runtime" }
 sp-io = { path = "../../../../substrate/primitives/io" }
 sp-tracing = { path = "../../../../substrate/primitives/tracing" }
 
-xcm = { path = "../.." }
+xcm = { package = "staging-xcm", path = "../.." }
 xcm-simulator = { path = ".." }
-xcm-executor = { path = "../../xcm-executor" }
-xcm-builder = { path = "../../xcm-builder" }
+xcm-executor = { package = "staging-xcm-executor", path = "../../xcm-executor" }
+xcm-builder = { package = "staging-xcm-builder", path = "../../xcm-builder" }
 pallet-xcm = { path = "../../pallet-xcm" }
 polkadot-core-primitives = { path = "../../../core-primitives" }
 polkadot-runtime-parachains = { path = "../../../runtime/parachains" }
-polkadot-parachain = { path = "../../../parachain" }
+polkadot-parachain-primitives = { path = "../../../parachain" }
 
 [features]
 default = []
@@ -40,8 +40,9 @@ runtime-benchmarks = [
 	"pallet-message-queue/runtime-benchmarks",
 	"pallet-uniques/runtime-benchmarks",
 	"pallet-xcm/runtime-benchmarks",
-	"polkadot-parachain/runtime-benchmarks",
+	"polkadot-parachain-primitives/runtime-benchmarks",
 	"polkadot-runtime-parachains/runtime-benchmarks",
+	"sp-runtime/runtime-benchmarks",
 	"xcm-builder/runtime-benchmarks",
 	"xcm-executor/runtime-benchmarks",
 ]
diff --git a/polkadot/xcm/xcm-simulator/example/src/parachain.rs b/polkadot/xcm/xcm-simulator/example/src/parachain.rs
index 9c4cbe8fcb2d8d501797cca6e6e29b77ea350cda..bc7cba313828b76e6079dcaa9d7ba7f9342a046f 100644
--- a/polkadot/xcm/xcm-simulator/example/src/parachain.rs
+++ b/polkadot/xcm/xcm-simulator/example/src/parachain.rs
@@ -34,7 +34,7 @@ use sp_std::prelude::*;
 
 use pallet_xcm::XcmPassthrough;
 use polkadot_core_primitives::BlockNumber as RelayBlockNumber;
-use polkadot_parachain::primitives::{
+use polkadot_parachain_primitives::primitives::{
 	DmpMessageHandler, Id as ParaId, Sibling, XcmpMessageFormat, XcmpMessageHandler,
 };
 use xcm::{latest::prelude::*, VersionedXcm};
diff --git a/polkadot/xcm/xcm-simulator/example/src/relay_chain.rs b/polkadot/xcm/xcm-simulator/example/src/relay_chain.rs
index 6f0e92dc91b9a1c359bb48df9ba18625d867ace7..4e9195a8454f5091dde7bcbf2c841eaaeb148285 100644
--- a/polkadot/xcm/xcm-simulator/example/src/relay_chain.rs
+++ b/polkadot/xcm/xcm-simulator/example/src/relay_chain.rs
@@ -26,7 +26,7 @@ use frame_system::EnsureRoot;
 use sp_core::{ConstU32, H256};
 use sp_runtime::{traits::IdentityLookup, AccountId32};
 
-use polkadot_parachain::primitives::Id as ParaId;
+use polkadot_parachain_primitives::primitives::Id as ParaId;
 use polkadot_runtime_parachains::{
 	configuration,
 	inclusion::{AggregateMessageOrigin, UmpQueueId},
diff --git a/polkadot/xcm/xcm-simulator/fuzzer/Cargo.toml b/polkadot/xcm/xcm-simulator/fuzzer/Cargo.toml
index a8e43d00e98bcb160382ceb8f4201542558ebbd9..0ca57e680d1ddff4ec784f49614d7747ea9cfb74 100644
--- a/polkadot/xcm/xcm-simulator/fuzzer/Cargo.toml
+++ b/polkadot/xcm/xcm-simulator/fuzzer/Cargo.toml
@@ -1,10 +1,11 @@
 [package]
 name = "xcm-simulator-fuzzer"
 description = "Examples of xcm-simulator usage."
-version.workspace = true
+version = "1.0.0"
 authors.workspace = true
 edition.workspace = true
 license.workspace = true
+publish = false
 
 [dependencies]
 codec = { package = "parity-scale-codec", version = "3.6.1" }
@@ -21,21 +22,27 @@ sp-core = { path = "../../../../substrate/primitives/core" }
 sp-runtime = { path = "../../../../substrate/primitives/runtime" }
 sp-io = { path = "../../../../substrate/primitives/io" }
 
-xcm = { path = "../.." }
+xcm = { package = "staging-xcm", path = "../.." }
 xcm-simulator = { path = ".." }
-xcm-executor = { path = "../../xcm-executor" }
-xcm-builder = { path = "../../xcm-builder" }
+xcm-executor = { package = "staging-xcm-executor", path = "../../xcm-executor" }
+xcm-builder = { package = "staging-xcm-builder", path = "../../xcm-builder" }
 pallet-xcm = { path = "../../pallet-xcm" }
 polkadot-core-primitives = { path = "../../../core-primitives" }
 polkadot-runtime-parachains = { path = "../../../runtime/parachains" }
-polkadot-parachain = { path = "../../../parachain" }
+polkadot-parachain-primitives = { path = "../../../parachain" }
 
 [features]
 runtime-benchmarks = [
 	"frame-support/runtime-benchmarks",
+	"frame-system/runtime-benchmarks",
+	"pallet-balances/runtime-benchmarks",
 	"pallet-message-queue/runtime-benchmarks",
 	"pallet-xcm/runtime-benchmarks",
+	"polkadot-parachain-primitives/runtime-benchmarks",
+	"polkadot-runtime-parachains/runtime-benchmarks",
+	"sp-runtime/runtime-benchmarks",
 	"xcm-builder/runtime-benchmarks",
+	"xcm-executor/runtime-benchmarks",
 ]
 
 [[bin]]
diff --git a/polkadot/xcm/xcm-simulator/fuzzer/README.md b/polkadot/xcm/xcm-simulator/fuzzer/README.md
index 69e8cd377b97739d0ad723fe380e668a979dcc82..0b3fdd8ec776d5e78d37aa5b57e6c0762af21320 100644
--- a/polkadot/xcm/xcm-simulator/fuzzer/README.md
+++ b/polkadot/xcm/xcm-simulator/fuzzer/README.md
@@ -1,6 +1,7 @@
 # XCM Simulator Fuzzer
 
-This project will fuzz-test the XCM simulator. It can catch reachable panics, timeouts as well as integer overflows and underflows.
+This project will fuzz-test the XCM simulator. It can catch reachable panics, timeouts as well as integer overflows and
+underflows.
 
 ## Install dependencies
 
@@ -29,7 +30,8 @@ cargo hfuzz run-debug xcm-fuzzer hfuzz_workspace/xcm-fuzzer/fuzzer_input_file
 In this directory, run these four commands:
 
 ```
-RUSTFLAGS="-Zprofile -Ccodegen-units=1 -Copt-level=0 -Clink-dead-code -Coverflow-checks=off -Zpanic_abort_tests -Cpanic=abort" CARGO_INCREMENTAL=0 SKIP_WASM_BUILD=1 CARGO_HOME=./cargo cargo build
+RUSTFLAGS="-Zprofile -Ccodegen-units=1 -Copt-level=0 -Clink-dead-code -Coverflow-checks=off -Zpanic_abort_tests -Cpanic=abort" \
+CARGO_INCREMENTAL=0 SKIP_WASM_BUILD=1 CARGO_HOME=./cargo cargo build
 ../../../target/debug/xcm-fuzzer hfuzz_workspace/xcm-fuzzer/input/
 zip -0 ccov.zip `find ../../../target/ \( -name "*.gc*" -o -name "test-*.gc*" \) -print`
 grcov ccov.zip -s ../../../ -t html --llvm --branch --ignore-not-existing -o ./coverage
diff --git a/polkadot/xcm/xcm-simulator/fuzzer/src/fuzz.rs b/polkadot/xcm/xcm-simulator/fuzzer/src/fuzz.rs
index 441b9f4d28616fe973192ad4e2a426da14511cf7..0893c7c086f8bc0d7e57647eadcdf87e9c732da0 100644
--- a/polkadot/xcm/xcm-simulator/fuzzer/src/fuzz.rs
+++ b/polkadot/xcm/xcm-simulator/fuzzer/src/fuzz.rs
@@ -19,7 +19,7 @@ mod relay_chain;
 
 use codec::DecodeLimit;
 use polkadot_core_primitives::AccountId;
-use polkadot_parachain::primitives::Id as ParaId;
+use polkadot_parachain_primitives::primitives::Id as ParaId;
 use sp_runtime::{traits::AccountIdConversion, BuildStorage};
 use xcm_simulator::{decl_test_network, decl_test_parachain, decl_test_relay_chain, TestExt};
 
diff --git a/polkadot/xcm/xcm-simulator/fuzzer/src/parachain.rs b/polkadot/xcm/xcm-simulator/fuzzer/src/parachain.rs
index 3d0b1c82f6911bf6a6650ae1fc98ef74bef22c88..95f875eca06e5c6fcb7d0d5610e1719a5f1b15b5 100644
--- a/polkadot/xcm/xcm-simulator/fuzzer/src/parachain.rs
+++ b/polkadot/xcm/xcm-simulator/fuzzer/src/parachain.rs
@@ -33,7 +33,7 @@ use sp_std::prelude::*;
 
 use pallet_xcm::XcmPassthrough;
 use polkadot_core_primitives::BlockNumber as RelayBlockNumber;
-use polkadot_parachain::primitives::{
+use polkadot_parachain_primitives::primitives::{
 	DmpMessageHandler, Id as ParaId, Sibling, XcmpMessageFormat, XcmpMessageHandler,
 };
 use xcm::{latest::prelude::*, VersionedXcm};
diff --git a/polkadot/xcm/xcm-simulator/fuzzer/src/relay_chain.rs b/polkadot/xcm/xcm-simulator/fuzzer/src/relay_chain.rs
index 32f3b8aa83fba13d7b3778b3603cb2b41d5d45e5..a29ead9e6c3beaed1ef5e625012e3866ef5808f1 100644
--- a/polkadot/xcm/xcm-simulator/fuzzer/src/relay_chain.rs
+++ b/polkadot/xcm/xcm-simulator/fuzzer/src/relay_chain.rs
@@ -26,7 +26,7 @@ use frame_system::EnsureRoot;
 use sp_core::{ConstU32, H256};
 use sp_runtime::{traits::IdentityLookup, AccountId32};
 
-use polkadot_parachain::primitives::Id as ParaId;
+use polkadot_parachain_primitives::primitives::Id as ParaId;
 use polkadot_runtime_parachains::{
 	configuration,
 	inclusion::{AggregateMessageOrigin, UmpQueueId},
diff --git a/polkadot/xcm/xcm-simulator/src/lib.rs b/polkadot/xcm/xcm-simulator/src/lib.rs
index cf56784f7d4e228f00a2ef08d07b2f8395670a5e..b38465b3d4a2cb9d2a83b35b2f9f0c2fc484c4a4 100644
--- a/polkadot/xcm/xcm-simulator/src/lib.rs
+++ b/polkadot/xcm/xcm-simulator/src/lib.rs
@@ -27,7 +27,7 @@ pub use sp_io::{hashing::blake2_256, TestExternalities};
 pub use sp_std::{cell::RefCell, collections::vec_deque::VecDeque, marker::PhantomData};
 
 pub use polkadot_core_primitives::BlockNumber as RelayBlockNumber;
-pub use polkadot_parachain::primitives::{
+pub use polkadot_parachain_primitives::primitives::{
 	DmpMessageHandler as DmpMessageHandlerT, Id as ParaId, XcmpMessageFormat,
 	XcmpMessageHandler as XcmpMessageHandlerT,
 };
@@ -324,7 +324,7 @@ macro_rules! decl_test_network {
 						let mut _id = [0; 32];
 						let r = <$relay_chain>::process_message(
 							encoded.as_slice(), para_id,
-							&mut $crate::WeightMeter::max_limit(),
+							&mut $crate::WeightMeter::new(),
 							&mut _id,
 						);
 						match r {
diff --git a/polkadot/zombienet_tests/README.md b/polkadot/zombienet_tests/README.md
index 84334c3e1cfefadc053165c4646d384840268dc4..516ff880b2eb84ed7bc3ed7684b2f81def683e9b 100644
--- a/polkadot/zombienet_tests/README.md
+++ b/polkadot/zombienet_tests/README.md
@@ -1,34 +1,38 @@
 # Zombienet tests
 
-_The content of this directory is meant to be used by Parity's private CI/CD infrastructure with private tools. At the moment those tools are still early stage of development and we don't know if / when they will available for public use._
+_The content of this directory is meant to be used by Parity's private CI/CD infrastructure with private tools. At the
+moment those tools are still early stage of development and we don't know if / when they will available for public use._
 
 ## Contents of this directory
 
-`parachains`
-    At the moment this directory only have one test related to parachains: `/parachains-smoke-test`, that check the parachain registration and the block height.
+`parachains` At the moment this directory only have one test related to parachains: `/parachains-smoke-test`, that check
+    the parachain registration and the block height.
 
 ## Resources
 
-* [zombienet repo](https://github.com/paritytech/zombienet)
-* [zombienet book](https://paritytech.github.io/zombienet/)
+- [zombienet repo](https://github.com/paritytech/zombienet)
+- [zombienet book](https://paritytech.github.io/zombienet/)
 
 ## Running tests locally
 
-To run any test locally use the native provider (`zombienet test -p native ...`) you need first build the binaries. They are:
+To run any test locally use the native provider (`zombienet test -p native ...`) you need first build the binaries. They
+are:
 
-* adder-collator -> polkadot/target/testnet/adder-collator
-* malus -> polkadot/target/testnet/malus
-* polkadot -> polkadot/target/testnet/polkadot, polkadot/target/testnet/polkadot-prepare-worker, polkadot/target/testnet/polkadot-execute-worker
-* polkadot-collator -> cumulus/target/release/polkadot-parachain
-* undying-collator -> polkadot/target/testnet/undying-collator
+- `adder-collator` -> `polkadot/target/testnet/adder-collator`
+- `malus` -> `polkadot/target/testnet/malus`
+- `polkadot` -> `polkadot/target/testnet/polkadot`, `polkadot/target/testnet/polkadot-prepare-worker`,
+  `polkadot/target/testnet/polkadot-execute-worker`
+- `polkadot-collator` -> `cumulus/target/release/polkadot-parachain`
+- `undying-collator` -> `polkadot/target/testnet/undying-collator`
 
 To build them use:
-* adder-collator -> `cargo build --profile testnet -p test-parachain-adder-collator`
-* undying-collator -> `cargo build --profile testnet -p test-parachain-undying-collator`
-* malus -> `cargo build --profile testnet -p polkadot-test-malus`
-* polkadot (in polkadot repo) and polkadot-collator (in cumulus repo) -> `cargo build --profile testnet`
+- `adder-collator` -> `cargo build --profile testnet -p test-parachain-adder-collator`
+- `undying-collator` -> `cargo build --profile testnet -p test-parachain-undying-collator`
+- `malus` -> `cargo build --profile testnet -p polkadot-test-malus`
+- `polkadot` (in the Polkadot repo) and `polkadot-collator` (in Cumulus repo) -> `cargo build --profile testnet`
 
-One solution is to use the `.set_env` file (from this directory) and fill the `CUSTOM_PATHS` before *source* it to patch the PATH of your system to find the binaries you just built.
+One solution is to use the `.set_env` file (from this directory) and fill the `CUSTOM_PATHS` before _source_ it to patch
+the PATH of your system to find the binaries you just built.
 
 E.g.:
 ```
@@ -45,8 +49,9 @@ CUSTOM_PATHS=(
 source .set_env
 ```
 
-Then you have your `PATH` customized and ready to run `zombienet`.
- **NOTE**: You should need to do this ones per terminal session, since we are patching the `PATH` and re-exporting. **Or** you can also `source` this file in your `.bashrc` file to get executed automatically in each new session.
+Then you have your `PATH` customized and ready to run `zombienet`. **NOTE**: You should need to do this ones per
+ terminal session, since we are patching the `PATH` and re-exporting. **Or** you can also `source` this file in your
+ `.bashrc` file to get executed automatically in each new session.
 
 Example:
 
@@ -57,4 +62,5 @@ zombienet test -p native 0001-parachains-pvf.zndsl
 
 ## Questions / permissions
 
-Ping in element Javier (@javier:matrix.parity.io) to ask questions or grant permission to run the test from your local setup.
+Ping in element Javier (`@javier:matrix.parity.io`) to ask questions or grant permission to run the test from your local
+setup.
diff --git a/polkadot/zombienet_tests/async_backing/001-async-backing-compatibility.toml b/polkadot/zombienet_tests/async_backing/001-async-backing-compatibility.toml
deleted file mode 100644
index 918fb5bf4f62c6be92009a62143fb5972d8c2292..0000000000000000000000000000000000000000
--- a/polkadot/zombienet_tests/async_backing/001-async-backing-compatibility.toml
+++ /dev/null
@@ -1,34 +0,0 @@
-[settings]
-timeout = 1000
-
-[relaychain]
-default_image = "{{ZOMBIENET_INTEGRATION_TEST_IMAGE}}"
-chain = "rococo-local"
-default_command = "polkadot"
-
-  [relaychain.default_resources]
-  limits = { memory = "4G", cpu = "2" }
-  requests = { memory = "2G", cpu = "1" }
-
-  [[relaychain.nodes]]
-  name = "alice"
-  args = [ "-lparachain=debug,runtime=debug"]
-
-  [[relaychain.nodes]]
-  name = "bob"
-  image = "{{ZOMBIENET_INTEGRATION_TEST_SECONDARY_IMAGE}}"
-  args = [ "-lparachain=debug,runtime=debug"]
-
-[[parachains]]
-id = 100
-
-  [parachains.collator]
-  name = "collator01"
-  image = "{{COL_IMAGE}}"
-  command = "undying-collator"
-  args = ["-lparachain=debug"]
-
-[types.Header]
-number = "u64"
-parent_hash = "Hash"
-post_state = "Hash"
diff --git a/polkadot/zombienet_tests/async_backing/001-async-backing-compatibility.zndsl b/polkadot/zombienet_tests/async_backing/001-async-backing-compatibility.zndsl
deleted file mode 100644
index 46c1d77acf46cec2a0925ed80bc93487e7c12452..0000000000000000000000000000000000000000
--- a/polkadot/zombienet_tests/async_backing/001-async-backing-compatibility.zndsl
+++ /dev/null
@@ -1,23 +0,0 @@
-Description: Async Backing Compatibility Test
-Network: ./001-async-backing-compatibility.toml
-Creds: config
-
-# General
-alice: is up
-bob: is up
-
-# Check authority status 
-alice: reports node_roles is 4
-bob: reports node_roles is 4
-
-# Check peers
-alice: reports peers count is at least 2 within 20 seconds
-bob: reports peers count is at least 2 within 20 seconds
-
-# Parachain registration
-alice: parachain 100 is registered within 225 seconds
-bob: parachain 100 is registered within 225 seconds
-
-# Ensure parachain progress
-alice: parachain 100 block height is at least 10 within 250 seconds
-bob: parachain 100 block height is at least 10 within 250 seconds
diff --git a/polkadot/zombienet_tests/async_backing/002-async-backing-runtime-upgrade.toml b/polkadot/zombienet_tests/async_backing/002-async-backing-runtime-upgrade.toml
deleted file mode 100644
index e61f7dd47ef6e09ed82173b21e58cd4445a8da28..0000000000000000000000000000000000000000
--- a/polkadot/zombienet_tests/async_backing/002-async-backing-runtime-upgrade.toml
+++ /dev/null
@@ -1,54 +0,0 @@
-[settings]
-timeout = 1000
-
-[relaychain]
-default_image = "{{ZOMBIENET_INTEGRATION_TEST_IMAGE}}"
-chain = "rococo-local"
-default_command = "polkadot"
-
-  [relaychain.default_resources]
-  limits = { memory = "4G", cpu = "2" }
-  requests = { memory = "2G", cpu = "1" }
-
-  [[relaychain.nodes]]
-  name = "alice"
-  args = [ "-lparachain=debug,runtime=debug"]
-
-  [[relaychain.nodes]]
-  name = "bob"
-  args = [ "-lparachain=debug,runtime=debug"]
-
-  [[relaychain.nodes]]
-  name = "charlie"
-  image = "{{ZOMBIENET_INTEGRATION_TEST_SECONDARY_IMAGE}}"
-  args = [ "-lparachain=debug,runtime=debug"]
-
-  [[relaychain.nodes]]
-  name = "dave"
-  image = "{{ZOMBIENET_INTEGRATION_TEST_SECONDARY_IMAGE}}"
-  args = [ "-lparachain=debug,runtime=debug"]
-
-[[parachains]]
-id = 100
-addToGenesis = true
-
-  [parachains.collator]
-  name = "collator02"
-  image = "{{COL_IMAGE}}"
-  command = "undying-collator"
-  args = ["-lparachain=debug"]
-
-[[parachains]]
-id = 101
-addToGenesis = true
-
-  [parachains.collator]
-  name = "collator02"
-  image = "{{COL_IMAGE}}"
-  command = "undying-collator"
-  args = ["-lparachain=debug"]
-
-[types.Header]
-number = "u64"
-parent_hash = "Hash"
-post_state = "Hash"
diff --git a/polkadot/zombienet_tests/async_backing/002-async-backing-runtime-upgrade.zndsl b/polkadot/zombienet_tests/async_backing/002-async-backing-runtime-upgrade.zndsl
deleted file mode 100644
index 6213d1afb81e23ecd441cc566551461b0a802033..0000000000000000000000000000000000000000
--- a/polkadot/zombienet_tests/async_backing/002-async-backing-runtime-upgrade.zndsl
+++ /dev/null
@@ -1,34 +0,0 @@
-Description: Async Backing Runtime Upgrade Test
-Network: ./002-async-backing-runtime-upgrade.toml
-Creds: config
-
-# General
-alice: is up
-bob: is up
-charlie: is up
-dave: is up
-
-# Check peers
-alice: reports peers count is at least 3 within 20 seconds
-bob: reports peers count is at least 3 within 20 seconds
-
-# Parachain registration
-alice: parachain 100 is registered within 225 seconds
-bob: parachain 100 is registered within 225 seconds
-charlie: parachain 100 is registered within 225 seconds
-dave: parachain 100 is registered within 225 seconds
-alice: parachain 101 is registered within 225 seconds
-bob: parachain 101 is registered within 225 seconds
-charlie: parachain 101 is registered within 225 seconds
-dave: parachain 101 is registered within 225 seconds
-
-# Ensure parachain progress
-alice: parachain 100 block height is at least 10 within 250 seconds
-bob: parachain 100 block height is at least 10 within 250 seconds
-
-# Runtime upgrade (according to previous runtime tests, avg. is 30s)
-alice: run ../misc/0002-download-polkadot-from-pr.sh with "{{POLKADOT_PR_BIN_URL}}" within 40 seconds
-bob: run ../misc/0002-download-polkadot-from-pr.sh with "{{POLKADOT_PR_BIN_URL}}" within 40 seconds
-
-# Bootstrap the runtime upgrade
-sleep 30 seconds
diff --git a/polkadot/zombienet_tests/async_backing/003-async-backing-collator-mix.toml b/polkadot/zombienet_tests/async_backing/003-async-backing-collator-mix.toml
deleted file mode 100644
index 4dca4d3d531268c45026a7da938b186334aee5de..0000000000000000000000000000000000000000
--- a/polkadot/zombienet_tests/async_backing/003-async-backing-collator-mix.toml
+++ /dev/null
@@ -1,40 +0,0 @@
-[settings]
-timeout = 1000
-
-[relaychain]
-default_image = "{{ZOMBIENET_INTEGRATION_TEST_IMAGE}}"
-chain = "rococo-local"
-default_command = "polkadot"
-
-  [relaychain.default_resources]
-  limits = { memory = "4G", cpu = "2" }
-  requests = { memory = "2G", cpu = "1" }
-
-  [[relaychain.nodes]]
-  name = "alice"
-  args = [ "-lparachain=debug"]
-
-  [[relaychain.nodes]]
-  name = "bob"
-  image = "{{ZOMBIENET_INTEGRATION_TEST_SECONDARY_IMAGE}}"
-  args = [ "-lparachain=debug"]
-
-[[parachains]]
-id = 100
-
-  [[parachains.collators]]
-  name = "collator01"
-  image = "docker.io/paritypr/colander:master"
-  command = "undying-collator"
-  args = ["-lparachain=debug"]
-
-  [[parachains.collators]]
-  name = "collator02"
-  image = "{{COL_IMAGE}}"
-  command = "undying-collator"
-  args = ["-lparachain=debug"]
-
-[types.Header]
-number = "u64"
-parent_hash = "Hash"
-post_state = "Hash"
diff --git a/polkadot/zombienet_tests/async_backing/003-async-backing-collator-mix.zndsl b/polkadot/zombienet_tests/async_backing/003-async-backing-collator-mix.zndsl
deleted file mode 100644
index 98436b0459cf80a4f7f494d7af9a6684da73cdf9..0000000000000000000000000000000000000000
--- a/polkadot/zombienet_tests/async_backing/003-async-backing-collator-mix.zndsl
+++ /dev/null
@@ -1,19 +0,0 @@
-Description: Async Backing Collator Mix Test
-Network: ./003-async-backing-collator-mix.toml
-Creds: config
-
-# General
-alice: is up
-bob: is up
-
-# Check peers
-alice: reports peers count is at least 3 within 20 seconds
-bob: reports peers count is at least 3 within 20 seconds
-
-# Parachain registration
-alice: parachain 100 is registered within 225 seconds
-bob: parachain 100 is registered within 225 seconds
-
-# Ensure parachain progress
-alice: parachain 100 block height is at least 10 within 250 seconds
-bob: parachain 100 block height is at least 10 within 250 seconds
diff --git a/polkadot/zombienet_tests/async_backing/README.md b/polkadot/zombienet_tests/async_backing/README.md
deleted file mode 100644
index 9774ea3c25c96d434643d1e565a3e933fbc2412c..0000000000000000000000000000000000000000
--- a/polkadot/zombienet_tests/async_backing/README.md
+++ /dev/null
@@ -1,9 +0,0 @@
-# async-backing zombienet tests
-
-This directory contains zombienet tests made explicitly for the async-backing feature branch.
-
-## coverage
-
-- Network protocol upgrade deploying both master and async branch (compatibility).
-- Runtime ugprade while running both master and async backing branch nodes.
-- Async backing test with a mix of collators collating via async backing and sync backing.
diff --git a/polkadot/zombienet_tests/functional/0002-parachains-disputes.toml b/polkadot/zombienet_tests/functional/0002-parachains-disputes.toml
index a0a87d60d4e3ec381686a8dd02dbb605209dd2af..e6aeb8e245c2bab3e53628498aeb2c7caa626e0f 100644
--- a/polkadot/zombienet_tests/functional/0002-parachains-disputes.toml
+++ b/polkadot/zombienet_tests/functional/0002-parachains-disputes.toml
@@ -1,7 +1,7 @@
 [settings]
 timeout = 1000
 
-[relaychain.genesis.runtime.runtime_genesis_config.configuration.config]
+[relaychain.genesis.runtime.configuration.config]
   max_validators_per_core = 5
   needed_approvals = 8
 
diff --git a/polkadot/zombienet_tests/functional/0004-parachains-disputes-past-session.zndsl b/polkadot/zombienet_tests/functional/0004-parachains-disputes-past-session.zndsl
deleted file mode 100644
index 8e792f974fe383aa1e34481e6ba4e8d90ca9ecb6..0000000000000000000000000000000000000000
--- a/polkadot/zombienet_tests/functional/0004-parachains-disputes-past-session.zndsl
+++ /dev/null
@@ -1,37 +0,0 @@
-Description: Past-session dispute slashing
-Network: ./0004-parachains-disputes-past-session.toml
-Creds: config
-
-alice: reports node_roles is 4
-
-# pause alice so that disputes don't conclude
-alice: pause
-
-# Ensure parachain is registered.
-honest-validator-0: parachain 1000 is registered within 100 seconds
-
-# Ensure parachain made progress.
-honest-validator-0: parachain 1000 block height is at least 1 within 300 seconds
-
-# There should be disputes initiated
-honest-validator-0: reports polkadot_parachain_candidate_disputes_total is at least 2 within 200 seconds
-
-# Stop issuing disputes
-malus-validator-0: pause
-
-# wait for the next session
-sleep 120 seconds
-
-# But should not resolve
-honest-validator-0: reports block height minus finalised block is at least 10 within 100 seconds
-
-# Now resume alice
-alice: resume
-
-# Disputes should start concluding now
-honest-validator-0: reports polkadot_parachain_candidate_dispute_concluded{validity="invalid"} is at least 1 within 200 seconds
-# Disputes should always end as "invalid"
-honest-validator-0: reports polkadot_parachain_candidate_dispute_concluded{validity="valid"} is 0
-
-# Check an unsigned extrinsic is submitted
-honest-validator: log line contains "Successfully reported pending slash" within 180 seconds
diff --git a/polkadot/zombienet_tests/functional/0003-parachains-garbage-candidate.toml b/polkadot/zombienet_tests/functional/0004-parachains-garbage-candidate.toml
similarity index 94%
rename from polkadot/zombienet_tests/functional/0003-parachains-garbage-candidate.toml
rename to polkadot/zombienet_tests/functional/0004-parachains-garbage-candidate.toml
index 7c4f5a9f1bcab8550755bfefadd1a1c425b4ac06..ef27d7b92f029d7978c9b7ab1a175c882fbb1d70 100644
--- a/polkadot/zombienet_tests/functional/0003-parachains-garbage-candidate.toml
+++ b/polkadot/zombienet_tests/functional/0004-parachains-garbage-candidate.toml
@@ -2,7 +2,7 @@
 timeout = 1000
 bootnode = true
 
-[relaychain.genesis.runtime.runtime_genesis_config.configuration.config]
+[relaychain.genesis.runtime.configuration.config]
   max_validators_per_core = 1
   needed_approvals = 2
 
diff --git a/polkadot/zombienet_tests/functional/0003-parachains-garbage-candidate.zndsl b/polkadot/zombienet_tests/functional/0004-parachains-garbage-candidate.zndsl
similarity index 98%
rename from polkadot/zombienet_tests/functional/0003-parachains-garbage-candidate.zndsl
rename to polkadot/zombienet_tests/functional/0004-parachains-garbage-candidate.zndsl
index c4fd3ee7c55a851770af9650f1148a27b2bee6d4..be2ae9504b89bc1728c12e7521b11526e9793363 100644
--- a/polkadot/zombienet_tests/functional/0003-parachains-garbage-candidate.zndsl
+++ b/polkadot/zombienet_tests/functional/0004-parachains-garbage-candidate.zndsl
@@ -1,5 +1,5 @@
 Description: Test dispute finality lag when 1/3 of parachain validators always attempt to include an invalid block
-Network: ./0003-parachains-garbage-candidate.toml
+Network: ./0004-parachains-garbage-candidate.toml
 Creds: config
 
 # Check authority status.
diff --git a/polkadot/zombienet_tests/functional/0004-parachains-disputes-past-session.toml b/polkadot/zombienet_tests/functional/0005-parachains-disputes-past-session.toml
similarity index 76%
rename from polkadot/zombienet_tests/functional/0004-parachains-disputes-past-session.toml
rename to polkadot/zombienet_tests/functional/0005-parachains-disputes-past-session.toml
index 3b05c91e134333a50cd1773e7924ac2442ae332c..25d922bb6827cbf8e129a07f64b537391bc72d7a 100644
--- a/polkadot/zombienet_tests/functional/0004-parachains-disputes-past-session.toml
+++ b/polkadot/zombienet_tests/functional/0005-parachains-disputes-past-session.toml
@@ -4,8 +4,8 @@ bootnode = true
 
 [relaychain.genesis.runtime.configuration.config]
   max_validators_per_core = 1
-  needed_approvals = 3
-  group_rotation_frequency = 4
+  needed_approvals = 2
+  group_rotation_frequency = 2
 
 [relaychain]
 default_image = "{{ZOMBIENET_INTEGRATION_TEST_IMAGE}}"
@@ -16,15 +16,16 @@ default_command = "polkadot"
 limits = { memory = "4G", cpu = "2" }
 requests = { memory = "2G", cpu = "1" }
 
-  [[relaychain.nodes]]
-  name = "alice"
+  [[relaychain.node_groups]]
+  name = "honest-flaky-validator"
   invulnerable = true # it will go offline, we don't want to disable it
-  args = ["-lparachain=debug,runtime=debug"]
+  count = 2
+  args = ["-lparachain=debug"]
 
   [[relaychain.node_groups]]
   name = "honest-validator"
-  count = 2
-  args = ["-lruntime=debug,sync=trace"]
+  count = 1
+  args = ["-lparachain=debug"]
 
   [[relaychain.node_groups]]
   image = "{{MALUS_IMAGE}}"
@@ -38,8 +39,7 @@ id = 1000
 cumulus_based = true
 
   [parachains.collator]
-  name = "collator"
+  name = "alice"
   command = "polkadot-parachain"
-  image = "docker.io/parity/polkadot-parachain:latest"
-  # image = "{{COL_IMAGE}}"
+  image = "{{CUMULUS_IMAGE}}"
   args = ["-lparachain=debug"]
diff --git a/polkadot/zombienet_tests/functional/0005-parachains-disputes-past-session.zndsl b/polkadot/zombienet_tests/functional/0005-parachains-disputes-past-session.zndsl
new file mode 100644
index 0000000000000000000000000000000000000000..a3f1f0669ac9e85cea978ac2b62991cb3a092297
--- /dev/null
+++ b/polkadot/zombienet_tests/functional/0005-parachains-disputes-past-session.zndsl
@@ -0,0 +1,53 @@
+Description: Past-session dispute slashing
+Network: ./0005-parachains-disputes-past-session.toml
+Creds: config
+
+# Ensure nodes are up and running
+honest-flaky-validator: reports node_roles is 4
+
+# Stop issuing disputes for now
+malus-validator: pause
+
+# Ensure parachain is registered
+honest-validator: parachain 1000 is registered within 100 seconds
+
+# Ensure parachain made progress
+honest-validator: parachain 1000 block height is at least 1 within 300 seconds
+
+# Start issuing disputes
+malus-validator: resume
+
+# Wait for malus to back garbage candidate
+malus-validator: log line matches "Suggesting malicious candidate" within 200 seconds
+
+# Pause first flaky node
+# Availability will continue with 3/4 nodes online (incl. malus)
+honest-flaky-validator-0: pause
+
+# Wait for the dispute
+honest-flaky-validator-1: reports parachain_candidate_disputes_total is at least 1 within 60 seconds
+
+# Pause second flaky node so that we do not revert blocks due to f+1 invalid votes
+# Availability and finality will stop
+honest-flaky-validator-1: pause
+
+# Wait for 1 full session to pass after the last unconcluded dispute.
+sleep 110 seconds
+
+# Now resume flaky validators
+honest-flaky-validator: resume
+
+# Stop issuing disputes
+malus-validator: pause
+
+# Disputes should start concluding now
+honest-validator: reports polkadot_parachain_candidate_dispute_concluded{validity="invalid"} is at least 1 within 200 seconds
+
+# Disputes should always end as "invalid"
+honest-validator: reports polkadot_parachain_candidate_dispute_concluded{validity="valid"} is 0
+
+# Check an unsigned extrinsic is submitted
+honest-validator: log line contains "Successfully reported pending slash" within 180 seconds
+
+# Finality should not lag after dispute resolution
+honest-validator: reports block height minus finalised block is lower than 8 within 100 seconds
diff --git a/polkadot/zombienet_tests/misc/0001-paritydb.toml b/polkadot/zombienet_tests/misc/0001-paritydb.toml
index 38fa56898196ae21934e786a26cb6265ed915282..99dc9c66e26ee6b04bfea1951d7818e23be70118 100644
--- a/polkadot/zombienet_tests/misc/0001-paritydb.toml
+++ b/polkadot/zombienet_tests/misc/0001-paritydb.toml
@@ -2,7 +2,7 @@
 timeout = 1000
 bootnode = true
 
-[relaychain.genesis.runtime.runtime_genesis_config.configuration.config]
+[relaychain.genesis.runtime.configuration.config]
   max_validators_per_core = 1
   needed_approvals = 3
 
diff --git a/polkadot/zombienet_tests/misc/0002-download-polkadot-from-pr.sh b/polkadot/zombienet_tests/misc/0002-download-polkadot-from-pr.sh
index 0d4b2807579564f0fcbad3e43f400f8a68f082fc..b55534559278df65cab369ea02d924abdc5746ad 100644
--- a/polkadot/zombienet_tests/misc/0002-download-polkadot-from-pr.sh
+++ b/polkadot/zombienet_tests/misc/0002-download-polkadot-from-pr.sh
@@ -12,8 +12,10 @@ export PATH=$CFG_DIR:$PATH
 
 cd $CFG_DIR
 # see 0002-upgrade-node.zndsl to view the args.
-curl -L -O $1/polkadot
-curl -L -O $1/polkadot-prepare-worker
-curl -L -O $1/polkadot-execute-worker
+curl -L -O $1/polkadot &
+curl -L -O $1/polkadot-prepare-worker &
+curl -L -O $1/polkadot-execute-worker &
+wait
+
 chmod +x $CFG_DIR/polkadot $CFG_DIR/polkadot-prepare-worker $CFG_DIR/polkadot-execute-worker
 echo $(polkadot --version)
diff --git a/polkadot/zombienet_tests/misc/0002-upgrade-node.zndsl b/polkadot/zombienet_tests/misc/0002-upgrade-node.zndsl
index fdf16b7286c910bef0d2052a8a1f6c5c595352d7..9191fb027de0d0240805d6cb65e68adfc4f15942 100644
--- a/polkadot/zombienet_tests/misc/0002-upgrade-node.zndsl
+++ b/polkadot/zombienet_tests/misc/0002-upgrade-node.zndsl
@@ -11,8 +11,8 @@ dave: parachain 2001 block height is at least 10 within 200 seconds
 # with the version of polkadot you want to download.
 
 # avg 30s in our infra
-alice: run ./0002-download-polkadot-from-pr.sh with "{{POLKADOT_PR_ARTIFACTS_URL}}" within 40 seconds
-bob: run ./0002-download-polkadot-from-pr.sh with "{{POLKADOT_PR_ARTIFACTS_URL}}" within 40 seconds
+alice: run ./0002-download-polkadot-from-pr.sh with "{{POLKADOT_PR_ARTIFACTS_URL}}" within 60 seconds
+bob: run ./0002-download-polkadot-from-pr.sh with "{{POLKADOT_PR_ARTIFACTS_URL}}" within 60 seconds
 alice: restart after 5 seconds
 bob: restart after 5 seconds
 
diff --git a/polkadot/zombienet_tests/smoke/0002-parachains-upgrade-smoke-test.toml b/polkadot/zombienet_tests/smoke/0002-parachains-upgrade-smoke-test.toml
index 0becb408550a61e4a05af7ca80b4df79acedee00..d72e3ebdb3354dedc5c90e50dd697d1883365d0f 100644
--- a/polkadot/zombienet_tests/smoke/0002-parachains-upgrade-smoke-test.toml
+++ b/polkadot/zombienet_tests/smoke/0002-parachains-upgrade-smoke-test.toml
@@ -30,8 +30,8 @@ cumulus_based = true
 
   [parachains.collator]
   name = "collator01"
-  image = "{{COL_IMAGE}}"
-  command = "polkadot-collator"
+  image = "{{CUMULUS_IMAGE}}"
+  command = "polkadot-parachain"
 
   [[parachains.collator.env]]
   name = "RUST_LOG"
diff --git a/cumulus/scripts/ci/changelog/digests/.gitkeep b/prdoc/.gitkeep
similarity index 100%
rename from cumulus/scripts/ci/changelog/digests/.gitkeep
rename to prdoc/.gitkeep
diff --git a/prdoc/pr_1226.prdoc b/prdoc/pr_1226.prdoc
new file mode 100644
index 0000000000000000000000000000000000000000..df7a425b538496d22040f2b5d9151623ea534585
--- /dev/null
+++ b/prdoc/pr_1226.prdoc
@@ -0,0 +1,17 @@
+title: Removed deprecated `Balances::transfer` and `Balances::set_balance_deprecated` functions.
+
+doc:
+  - audience: Builder
+    description: The Balances pallet's dispatchables `set_balance_deprecated` and `transfer` were deprecated in [paritytech/substrate#12951](https://github.com/paritytech/substrate/pull/12951) and have now been removed.
+    notes: 
+      - Use `set_balance_deprecated` instead `force_set_balance` and `transfer_allow_death` instead of `transfer`.
+
+migrations:
+  db: []
+
+  runtime: []
+
+crates:
+  - name: pallet-balances
+
+host_functions: []
diff --git a/prdoc/pr_1255.prdoc b/prdoc/pr_1255.prdoc
new file mode 100644
index 0000000000000000000000000000000000000000..793b5c3c8597a785276637a796eb83be5738f42a
--- /dev/null
+++ b/prdoc/pr_1255.prdoc
@@ -0,0 +1,22 @@
+# Schema: Parity PR Documentation Schema (prdoc)
+# See doc at https://github.com/paritytech/prdoc
+
+title: Fix for Reward Deficit in the pool
+
+doc:
+  - audience: Core Dev
+    description: Instead of fragile calculation of current balance by looking at free balance - ED, Nomination Pool now freezes ED in the pool reward account to restrict an account from going below minimum balance. This also has a nice side effect that if ED changes, we know how much is the imbalance in ED frozen in the pool and the current required ED. A pool operator can diligently top up the pool with the deficit in ED or vice versa, withdraw the excess they transferred to the pool.
+    notes:
+      - Introduces new call `adjust_pool_deposit` that allows to top up the deficit or withdraw the excess deposit for the pool.
+      - Switch to using Fungible trait from Currency trait.
+
+migrations:
+  db: []
+
+  runtime:
+    - { pallet: "pallet-nomination-pools", description: "One time migration of freezing ED from each of the existing pools."}
+
+crates:
+  - name: pallet-nomination-pools
+
+host_functions: []
\ No newline at end of file
diff --git a/prdoc/pr_1408_prodc-introduction.prdoc b/prdoc/pr_1408_prodc-introduction.prdoc
new file mode 100644
index 0000000000000000000000000000000000000000..4b10e0fe2e8139e973ab31cabc7fb181c75f4fba
--- /dev/null
+++ b/prdoc/pr_1408_prodc-introduction.prdoc
@@ -0,0 +1,19 @@
+# This PR does not need a prdoc but it is provided in order to test
+title: PRdoc check
+
+doc:
+  - audience: Core Dev
+    description: |
+      This PRdoc is an **example**.
+
+      This PR brings support and automated checks for documentation in the form of a
+      [`prdoc`](https://github.com/paritytech/prdoc/) file.
+
+migrations:
+  db: []
+
+  runtime: []
+
+crates: []
+
+host_functions: []
diff --git a/prdoc/pr_1818.prdoc b/prdoc/pr_1818.prdoc
new file mode 100644
index 0000000000000000000000000000000000000000..cbafa02f9af563e88f38a4fb4f74e4ae7c13fc1a
--- /dev/null
+++ b/prdoc/pr_1818.prdoc
@@ -0,0 +1,16 @@
+title: FRAME pallets warning for unchecked weight witness
+
+doc:
+  - audience: Core Dev
+    description: |
+      FRAME pallets now emit a warning when a call uses a function argument that starts with an underscore in its weight declaration.
+
+migrations:
+  db: [ ]
+  runtime: [ ]
+
+host_functions: []
+
+crates:
+- name: "frame-support-procedural"
+  semver: minor
diff --git a/rustfmt.toml b/rustfmt.toml
deleted file mode 100644
index 10568e496801e075a399aa59d0db8003a6a16f85..0000000000000000000000000000000000000000
--- a/rustfmt.toml
+++ /dev/null
@@ -1,27 +0,0 @@
-# Basic
-hard_tabs = true
-max_width = 100
-use_small_heuristics = "Max"
-# Imports
-imports_granularity = "Crate"
-reorder_imports = true
-# Consistency
-newline_style = "Unix"
-# Misc
-chain_width = 80
-spaces_around_ranges = false
-binop_separator = "Back"
-reorder_impl_items = false
-match_arm_leading_pipes = "Preserve"
-match_arm_blocks = false
-match_block_trailing_comma = true
-trailing_comma = "Vertical"
-trailing_semicolon = false
-use_field_init_shorthand = true
-ignore = [
-    "bridges",
-]
-edition = "2021"
-# Format comments
-comment_width = 100
-wrap_comments = true
\ No newline at end of file
diff --git a/cumulus/scripts/bridges_update_subtree.sh b/scripts/bridges_update_subtree.sh
similarity index 100%
rename from cumulus/scripts/bridges_update_subtree.sh
rename to scripts/bridges_update_subtree.sh
diff --git a/scripts/update-ui-tests.sh b/scripts/update-ui-tests.sh
new file mode 100755
index 0000000000000000000000000000000000000000..785cc7bd3291ccdaff1d80558e9f3d52418068c3
--- /dev/null
+++ b/scripts/update-ui-tests.sh
@@ -0,0 +1,40 @@
+#!/usr/bin/env bash
+# Script for updating the UI tests for a new rust stable version.
+# Exit on error
+set -e
+
+# by default current rust stable will be used
+RUSTUP_RUN=""
+# check if we have a parameter
+# ./scripts/update-ui-tests.sh 1.70
+if [ ! -z "$1" ]; then
+ echo "RUST_VERSION: $1"
+  # This will run all UI tests with the rust stable 1.70.
+  # The script requires that rustup is installed.
+  RUST_VERSION=$1
+  RUSTUP_RUN="rustup run $RUST_VERSION"
+
+
+  echo "installing rustup $RUST_VERSION"
+  if ! command -v rustup &> /dev/null
+  then
+    echo "rustup needs to be installed"
+    exit
+  fi
+  
+  rustup install $RUST_VERSION
+  rustup component add rust-src --toolchain $RUST_VERSION
+fi
+
+# Ensure we run the ui tests
+export RUN_UI_TESTS=1
+# We don't need any wasm files for ui tests
+export SKIP_WASM_BUILD=1
+# Let trybuild overwrite the .stderr files
+export TRYBUILD=overwrite
+
+# ./substrate
+$RUSTUP_RUN cargo test -p sp-runtime-interface ui
+$RUSTUP_RUN cargo test -p sp-api-test ui
+$RUSTUP_RUN cargo test -p frame-election-provider-solution-type ui
+$RUSTUP_RUN cargo test -p frame-support-test ui
diff --git a/substrate/.cargo/config.toml b/substrate/.cargo/config.toml
deleted file mode 100644
index 4796a2c26965c1021d14c6acc854bca1aea76941..0000000000000000000000000000000000000000
--- a/substrate/.cargo/config.toml
+++ /dev/null
@@ -1,33 +0,0 @@
-#
-# An auto defined `clippy` feature was introduced,
-# but it was found to clash with user defined features,
-# so was renamed to `cargo-clippy`.
-#
-# If you want standard clippy run:
-# RUSTFLAGS= cargo clippy
-[target.'cfg(feature = "cargo-clippy")']
-rustflags = [
-  "-Aclippy::all",
-  "-Dclippy::correctness",
-  "-Aclippy::if-same-then-else",
-  "-Aclippy::clone-double-ref",
-  "-Dclippy::complexity",
-  "-Aclippy::zero-prefixed-literal",     # 00_1000_000
-  "-Aclippy::type_complexity",           # raison d'etre
-  "-Aclippy::nonminimal-bool",           # maybe
-  "-Aclippy::borrowed-box",              # Reasonable to fix this one
-  "-Aclippy::too-many-arguments",        # (Turning this on would lead to)
-  "-Aclippy::unnecessary_cast",          # Types may change
-  "-Aclippy::identity-op",               # One case where we do 0 +
-  "-Aclippy::useless_conversion",        # Types may change
-  "-Aclippy::unit_arg",                  # styalistic.
-  "-Aclippy::option-map-unit-fn",        # styalistic
-  "-Aclippy::bind_instead_of_map",       # styalistic
-  "-Aclippy::erasing_op",                # E.g. 0 * DOLLARS
-  "-Aclippy::eq_op",                     # In tests we test equality.
-  "-Aclippy::while_immutable_condition", # false positives
-  "-Aclippy::needless_option_as_deref",  # false positives
-  "-Aclippy::derivable_impls",           # false positives
-  "-Aclippy::stable_sort_primitive",     # prefer stable sort
-  "-Aclippy::extra-unused-type-parameters", # stylistic
-]
diff --git a/substrate/.git-blame-ignore-revs b/substrate/.git-blame-ignore-revs
index c99a3070231d8e3ec6ed1365fdd1221c162779b8..aae391d6d83514422243e532895dcba8ea9398ac 100644
--- a/substrate/.git-blame-ignore-revs
+++ b/substrate/.git-blame-ignore-revs
@@ -10,6 +10,6 @@
 #
 # You should add new commit hashes to this file when you create or find such big
 # automated refactorings while reading code history. If you only know the short hash,
-# use `git rev-parse 1d5abf01` to expand it to the full SHA1 hash needed in this file.
+# use `git rev-parse 7b56ab15b4` to expand it to the full SHA1 hash needed in this file.
 
-1d5abf01abafdb6c15bcd0172f5de09fd87c5fbf # Run cargo fmt on the whole code base (#9394)
+7b56ab15b4a8e06df5eefc17e600e3c1419aede5 # Run cargo fmt on the whole code base (#9394)
diff --git a/substrate/.gitattributes b/substrate/.gitattributes
index a77c52fccdb778ebfd76020760d45bcb4da922ab..4cb3ef4972feb1eba84cf44d7d5f88a19f1ba0a2 100644
--- a/substrate/.gitattributes
+++ b/substrate/.gitattributes
@@ -1,4 +1,2 @@
 Cargo.lock linguist-generated=true
-/.gitlab-ci.yml filter=ci-prettier
-/scripts/ci/gitlab/pipeline/*.yml filter=ci-prettier
 frame/**/src/weights.rs linguist-generated=true
diff --git a/substrate/.github/dependabot.yml b/substrate/.github/dependabot.yml
deleted file mode 100644
index 04cf0d1e1a5a4fa5bcdfeaa3e3ec378b0cc20de4..0000000000000000000000000000000000000000
--- a/substrate/.github/dependabot.yml
+++ /dev/null
@@ -1,12 +0,0 @@
-version: 2
-updates:
-  - package-ecosystem: "cargo"
-    directory: "/"
-    labels: ["A2-insubstantial", "B0-silent", "C1-low", "E2-dependencies"]
-    schedule:
-      interval: "daily"
-  - package-ecosystem: github-actions
-    directory: '/'
-    labels: ["A2-insubstantial", "B0-silent", "C1-low", "E2-dependencies"]
-    schedule:
-      interval: daily
diff --git a/substrate/.github/pr-custom-review.yml b/substrate/.github/pr-custom-review.yml
deleted file mode 100644
index 059f4a283af075c2e23c6d65be8803a6b8898ec9..0000000000000000000000000000000000000000
--- a/substrate/.github/pr-custom-review.yml
+++ /dev/null
@@ -1,39 +0,0 @@
-# 🔒 PROTECTED: Changes to locks-review-team should be approved by the current locks-review-team
-locks-review-team: locks-review
-team-leads-team: polkadot-review
-action-review-team: ci
-
-rules:
-  - name: Core developers
-    check_type: changed_files
-    condition:
-      include: .*
-      # excluding files from 'CI team' and 'FRAME coders' rules
-      exclude: ^\.gitlab-ci\.yml|^scripts/ci/.*|^\.github/.*|^\.config/nextest.toml|^frame/(?!.*(nfts/.*|uniques/.*|babe/.*|grandpa/.*|beefy|merkle-mountain-range/.*|contracts/.*|election|nomination-pools/.*|staking/.*|aura/.*))
-    min_approvals: 2
-    teams:
-      - core-devs
-
-  - name: FRAME coders
-    check_type: changed_files
-    condition:
-      include: ^frame/(?!.*(nfts/.*|uniques/.*|babe/.*|grandpa/.*|beefy|merkle-mountain-range/.*|contracts/.*|election|nomination-pools/.*|staking/.*|aura/.*))
-    all:
-      - min_approvals: 2
-        teams:
-          - core-devs
-      - min_approvals: 1
-        teams:
-          - frame-coders
-
-  - name: CI team
-    check_type: changed_files
-    condition:
-      include: ^\.gitlab-ci\.yml|^scripts/ci/.*|^\.github/.*|^\.config/nextest.toml
-    min_approvals: 2
-    teams:
-      - ci
-
-prevent-review-request:
-  teams:
-    - core-devs
diff --git a/substrate/.github/stale.yml b/substrate/.github/stale.yml
deleted file mode 100644
index 61d0fd0228d97afaee6e9a9d30d0440d7fb1f670..0000000000000000000000000000000000000000
--- a/substrate/.github/stale.yml
+++ /dev/null
@@ -1,18 +0,0 @@
-# Number of days of inactivity before an issue becomes stale
-daysUntilStale: 30
-# Number of days of inactivity before a stale issue is closed
-daysUntilClose: 14
-# Issues with these labels will never be considered stale
-exemptLabels:
-  - "D9-needsaudit 👮"
-# Label to use when marking an issue as stale
-staleLabel: "A3-stale"
-# we only bother with pull requests
-only: pulls
-# Comment to post when marking an issue as stale. Set to `false` to disable
-markComment: >
-  Hey, is anyone still working on this? Due to the inactivity this issue has
-  been automatically marked as stale. It will be closed if no further activity
-  occurs. Thank you for your contributions.
-# Comment to post when closing a stale issue. Set to `false` to disable
-closeComment: false
diff --git a/substrate/.github/workflows/auto-label-issues.yml b/substrate/.github/workflows/auto-label-issues.yml
deleted file mode 100644
index 12ffce702cdcca9e3ed65dfceb1d35e8c078bdac..0000000000000000000000000000000000000000
--- a/substrate/.github/workflows/auto-label-issues.yml
+++ /dev/null
@@ -1,17 +0,0 @@
-# If the author of the issues is not a contributor to the project, label
-# the issue with 'Z0-unconfirmed'
-
-name: Label New Issues
-on:
-  issues:
-    types: [opened]
-
-jobs:
-  label-new-issues:
-    runs-on: ubuntu-latest
-    steps:
-      - name: Label drafts
-        uses: andymckay/labeler@e6c4322d0397f3240f0e7e30a33b5c5df2d39e90 # 1.0.4
-        if: github.event.issue.author_association == 'NONE'
-        with:
-          add-labels: "I10-unconfirmed"
diff --git a/substrate/.github/workflows/burnin-label-notification.yml b/substrate/.github/workflows/burnin-label-notification.yml
deleted file mode 100644
index f45455d31db1e2dcd9ed34708630304312a3168a..0000000000000000000000000000000000000000
--- a/substrate/.github/workflows/burnin-label-notification.yml
+++ /dev/null
@@ -1,24 +0,0 @@
-name: Notify devops when burn-in label applied
-on:
-  pull_request:
-    types: [labeled]
-
-jobs:
-  notify-devops:
-    runs-on: ubuntu-latest
-    strategy:
-      matrix:
-        channel:
-          - name: 'Team: DevOps'
-            room: '!lUslSijLMgNcEKcAiE:parity.io'
-
-    steps:
-      - name: Notify devops
-        if: startsWith(github.event.label.name, 'A1-')
-        uses: s3krit/matrix-message-action@70ad3fb812ee0e45ff8999d6af11cafad11a6ecf # v0.0.3
-        with:
-          room_id: ${{ matrix.channel.room }}
-          access_token: ${{ secrets.RELEASENOTES_MATRIX_V2_ACCESS_TOKEN }}
-          server: "m.parity.io"
-          message: |
-            @room Burn-in request received for [${{ github.event.pull_request.title }}](${{ github.event.pull_request.html_url }})
diff --git a/substrate/.github/workflows/check-D-labels.yml b/substrate/.github/workflows/check-D-labels.yml
deleted file mode 100644
index 7bb358ce1182e4b4bae1dc94bd986567cee1b599..0000000000000000000000000000000000000000
--- a/substrate/.github/workflows/check-D-labels.yml
+++ /dev/null
@@ -1,48 +0,0 @@
-name: Check D labels
-
-on:
-  pull_request:
-    types: [labeled, opened, synchronize, unlabeled]
-    paths:
-      - frame/**
-      - primitives/**
-
-env:
-  IMAGE: paritytech/ruled_labels:0.4.0
-
-jobs:
-  check-labels:
-    runs-on: ubuntu-latest
-    steps:
-      - name: Pull image
-        run: docker pull $IMAGE
-
-      - name: Check labels
-        env:
-          MOUNT: /work
-          GITHUB_PR: ${{ github.event.pull_request.number }}
-          GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
-          API_BASE: https://api.github.com/repos
-          REPO: ${{ github.repository }}
-          RULES_PATH: labels/ruled_labels
-          CHECK_SPECS: specs_substrate.yaml
-        run: |
-          echo "REPO: ${REPO}"
-          echo "GITHUB_PR: ${GITHUB_PR}"
-          # Clone repo with labels specs
-          git clone https://github.com/paritytech/labels
-          # Fetch the labels for the PR under test
-          labels=$( curl -H "Authorization: token ${GITHUB_TOKEN}" -s "$API_BASE/${REPO}/pulls/${GITHUB_PR}" | jq '.labels | .[] | .name' | tr "\n" ",")
-
-          if [ -z "${labels}" ]; then
-            docker run --rm -i -v $PWD/${RULES_PATH}/:$MOUNT $IMAGE check $MOUNT/$CHECK_SPECS --tags audit --no-label
-          fi
-
-          labels_args=${labels: :-1}
-          printf "Checking labels: %s\n" "${labels_args}"
-
-          # Prevent the shell from splitting labels with spaces
-          IFS=","
-
-          # --dev is more useful to debug mode to debug
-          docker run --rm -i -v $PWD/${RULES_PATH}/:$MOUNT $IMAGE check $MOUNT/$CHECK_SPECS --labels ${labels_args} --dev --tags audit
diff --git a/substrate/.github/workflows/check-labels.yml b/substrate/.github/workflows/check-labels.yml
deleted file mode 100644
index 55b8f7389fa7f128b7134549b8517c9677bd9562..0000000000000000000000000000000000000000
--- a/substrate/.github/workflows/check-labels.yml
+++ /dev/null
@@ -1,45 +0,0 @@
-name: Check labels
-
-on:
-  pull_request:
-    types: [labeled, opened, synchronize, unlabeled]
-
-env:
-  IMAGE: paritytech/ruled_labels:0.4.0
-
-jobs:
-  check-labels:
-    runs-on: ubuntu-latest
-    steps:
-      - name: Pull image
-        run: docker pull $IMAGE
-
-      - name: Check labels
-        env:
-          MOUNT: /work
-          GITHUB_PR: ${{ github.event.pull_request.number }}
-          GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
-          API_BASE: https://api.github.com/repos
-          REPO: ${{ github.repository }}
-          RULES_PATH: labels/ruled_labels
-          CHECK_SPECS: specs_substrate.yaml
-        run: |
-          echo "REPO: ${REPO}"
-          echo "GITHUB_PR: ${GITHUB_PR}"
-          # Clone repo with labels specs
-          git clone https://github.com/paritytech/labels
-          # Fetch the labels for the PR under test
-          labels=$( curl -H "Authorization: token ${GITHUB_TOKEN}" -s "$API_BASE/${REPO}/pulls/${GITHUB_PR}" | jq '.labels | .[] | .name' | tr "\n" ",")
-
-          if [ -z "${labels}" ]; then
-            docker run --rm -i -v $PWD/${RULES_PATH}/:$MOUNT $IMAGE check $MOUNT/$CHECK_SPECS --tags PR --no-label
-          fi
-
-          labels_args=${labels: :-1}
-          printf "Checking labels: %s\n" "${labels_args}"
-
-          # Prevent the shell from splitting labels with spaces
-          IFS=","
-
-          # --dev is more useful to debug mode to debug
-          docker run --rm -i -v $PWD/${RULES_PATH}/:$MOUNT $IMAGE check $MOUNT/$CHECK_SPECS --labels ${labels_args} --dev --tags PR
diff --git a/substrate/.github/workflows/md-link-check.yml b/substrate/.github/workflows/md-link-check.yml
deleted file mode 100644
index e1387f6da13f71396cdd761f0967a2c35c7169eb..0000000000000000000000000000000000000000
--- a/substrate/.github/workflows/md-link-check.yml
+++ /dev/null
@@ -1,19 +0,0 @@
-name: Check Links
-
-on:
-  pull_request:
-    branches:
-    - master
-  push:
-    branches:
-    - master
-
-jobs:
-  markdown-link-check:
-    runs-on: ubuntu-latest
-    steps:
-    - uses: actions/checkout@v3
-    - uses: gaurav-nelson/github-action-markdown-link-check@0a51127e9955b855a9bbfa1ff5577f1d1338c9a5 # 1.0.14
-      with:
-        use-quiet-mode: 'yes'
-        config-file: '.github/workflows/mlc_config.json'
diff --git a/substrate/.github/workflows/mlc_config.json b/substrate/.github/workflows/mlc_config.json
deleted file mode 100644
index e7e620b39e0a9b2dd60eb57498ba99c1b6635443..0000000000000000000000000000000000000000
--- a/substrate/.github/workflows/mlc_config.json
+++ /dev/null
@@ -1,7 +0,0 @@
-{
-    "ignorePatterns": [
-        {
-            "pattern": "^https://crates.io",
-        }
-    ]
-}
diff --git a/substrate/.github/workflows/monthly-tag.yml b/substrate/.github/workflows/monthly-tag.yml
deleted file mode 100644
index 055207d85a4dd22b65097a0c3b41f1896c358954..0000000000000000000000000000000000000000
--- a/substrate/.github/workflows/monthly-tag.yml
+++ /dev/null
@@ -1,43 +0,0 @@
-name: Monthly Snapshot Tag
-
-on:
-  schedule:
-    - cron: "0 1 1 * *"
-  workflow_dispatch:
-
-jobs:
-  build:
-    name: Take Snapshot
-    runs-on: ubuntu-latest
-    steps:
-      - name: Get the tags by date
-        id: tags
-        run: |
-          echo "new=$(date +'monthly-%Y-%m')" >> $GITHUB_OUTPUT
-          echo "old=$(date -d'1 month ago' +'monthly-%Y-%m')" >> $GITHUB_OUTPUT
-      - name: Checkout branch "master"
-        uses: actions/checkout@v3
-        with:
-          ref: 'master'
-          fetch-depth: 0
-      - name: Generate changelog
-        id: changelog
-        env:
-          GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
-        run: |
-          echo "# Automatic snapshot pre-release ${{ steps.tags.outputs.new }}" > Changelog.md
-          echo "" >> Changelog.md
-          echo "## Changes since last snapshot (${{ steps.tags.outputs.old }})" >> Changelog.md
-          echo "" >> Changelog.md
-          ./scripts/ci/github/generate_changelog.sh ${{ steps.tags.outputs.old }} >>  Changelog.md
-      - name: Release snapshot
-        id: release-snapshot
-        uses: actions/create-release@0cb9c9b65d5d1901c1f53e5e66eaf4afd303e70e # v1.1.4 latest version, repo archived
-        env:
-          GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
-        with:
-          tag_name: ${{ steps.tags.outputs.new }}
-          release_name: ${{ steps.tags.outputs.new }}
-          draft: false
-          prerelease: true
-          body_path: Changelog.md
diff --git a/substrate/.github/workflows/pr-custom-review.yml b/substrate/.github/workflows/pr-custom-review.yml
deleted file mode 100644
index 8e40c9ee72989d9ef244247456aa578d3836f8c6..0000000000000000000000000000000000000000
--- a/substrate/.github/workflows/pr-custom-review.yml
+++ /dev/null
@@ -1,42 +0,0 @@
-name: Assign reviewers
-
-on:
-  pull_request:
-    branches:
-      - master
-      - main
-    types:
-      - opened
-      - reopened
-      - synchronize
-      - review_requested
-      - review_request_removed
-      - ready_for_review
-      - converted_to_draft
-  pull_request_review:
-
-jobs:
-  pr-custom-review:
-    runs-on: ubuntu-latest
-    steps:
-      - name: Skip if pull request is in Draft
-        # `if: github.event.pull_request.draft == true` should be kept here, at
-        # the step level, rather than at the job level. The latter is not
-        # recommended because when the PR is moved from "Draft" to "Ready to
-        # review" the workflow will immediately be passing (since it was skipped),
-        # even though it hasn't actually ran, since it takes a few seconds for
-        # the workflow to start. This is also disclosed in:
-        # https://github.community/t/dont-run-actions-on-draft-pull-requests/16817/17
-        # That scenario would open an opportunity for the check to be bypassed:
-        # 1. Get your PR approved
-        # 2. Move it to Draft
-        # 3. Push whatever commits you want
-        # 4. Move it to "Ready for review"; now the workflow is passing (it was
-        #    skipped) and "Check reviews" is also passing (it won't be updated
-        #    until the workflow is finished)
-        if: github.event.pull_request.draft == true
-        run: exit 1
-      - name: pr-custom-review
-        uses: paritytech/pr-custom-review@action-v3
-        with:
-          checks-reviews-api: http://pcr.parity-prod.parity.io/api/v1/check_reviews
diff --git a/substrate/.github/workflows/release-bot.yml b/substrate/.github/workflows/release-bot.yml
deleted file mode 100644
index 05bea32abc697e4f0aa5ce42f30f7cc475cfa63a..0000000000000000000000000000000000000000
--- a/substrate/.github/workflows/release-bot.yml
+++ /dev/null
@@ -1,31 +0,0 @@
-name: Pushes release updates to a pre-defined Matrix room
-on:
-  release:
-    types:
-      - edited
-      - prereleased
-      - published
-jobs:
-  ping_matrix:
-    runs-on: ubuntu-latest
-    strategy:
-      matrix:
-        channel:
-          - name: 'General: Rust, Polkadot, Substrate'
-            room: '!aJymqQYtCjjqImFLSb:parity.io'
-            pre-release: false
-
-    steps:
-      - name: send message
-        uses: s3krit/matrix-message-action@70ad3fb812ee0e45ff8999d6af11cafad11a6ecf # v0.0.3
-        with:
-          room_id: ${{ matrix.channel.room }}
-          access_token: ${{ secrets.RELEASENOTES_MATRIX_V2_ACCESS_TOKEN }}
-          server: "m.parity.io"
-          message: |
-            ***${{github.event.repository.full_name}}:*** A release has been ${{github.event.action}}<br/>
-            Release version [${{github.event.release.tag_name}}](${{github.event.release.html_url}})
-
-            -----
-
-            ${{github.event.release.body}}<br/>
diff --git a/substrate/.github/workflows/release-tagging.yml b/substrate/.github/workflows/release-tagging.yml
deleted file mode 100644
index 1862582f40eba2f33a5d94fd356870d4f4c49cce..0000000000000000000000000000000000000000
--- a/substrate/.github/workflows/release-tagging.yml
+++ /dev/null
@@ -1,20 +0,0 @@
-# Github action to ensure the `release` tag always tracks latest release
-
-name: Retag release
-
-on:
-  release:
-    types: [ published ]
-
-jobs:
-  build:
-    runs-on: ubuntu-latest
-
-    steps:
-      - name: Set Git tag
-        uses: s3krit/walking-tag-action@d04f7a53b72ceda4e20283736ce3627011275178 # latest version from master
-        with:
-          tag-name: release
-          tag-message: Latest release
-        env:
-          GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
diff --git a/substrate/.gitignore b/substrate/.gitignore
deleted file mode 100644
index 65059279f3a551802b43962c88b1f0b6e8c2a142..0000000000000000000000000000000000000000
--- a/substrate/.gitignore
+++ /dev/null
@@ -1,30 +0,0 @@
-**/target/
-**/*.rs.bk
-*.swp
-.wasm-binaries
-pwasm-alloc/target/
-pwasm-libc/target/
-pwasm-alloc/Cargo.lock
-pwasm-libc/Cargo.lock
-bin/node/runtime/wasm/target/
-**/._*
-**/.criterion/
-.vscode
-polkadot.*
-.DS_Store
-.idea/
-nohup.out
-rls*.log
-*.orig
-*.rej
-**/wip/*.stderr
-.local
-**/hfuzz_target/
-**/hfuzz_workspace/
-.cargo-remote.toml
-*.bin
-*.iml
-bin/node-template/Cargo.lock
-substrate.code-workspace
-.direnv/
-/.envrc
diff --git a/substrate/.gitlab-ci.yml b/substrate/.gitlab-ci.yml
deleted file mode 100644
index f00836528973ecb068f8075d647d94236e293904..0000000000000000000000000000000000000000
--- a/substrate/.gitlab-ci.yml
+++ /dev/null
@@ -1,412 +0,0 @@
-# .gitlab-ci.yml
-#
-# substrate
-#
-# pipelines can be triggered manually in the web
-#
-# Currently the file is divided into subfiles. Each stage has a different file which
-# can be found here: scripts/ci/gitlab/pipeline/<stage_name>.yml
-#
-# Instead of YAML anchors "extends" is used.
-# Useful links:
-#    https://docs.gitlab.com/ee/ci/yaml/index.html#extends
-#    https://docs.gitlab.com/ee/ci/yaml/yaml_optimization.html#reference-tags
-#
-# SAMPLE JOB TEMPLATE - This is not a complete example but is enough to build a
-# simple CI job. For full documentation, visit https://docs.gitlab.com/ee/ci/yaml/
-#
-# my-example-job:
-#   stage:                           test # One of the stages listed below this job (required)
-#   image:                           paritytech/tools:latest # Any docker image (required)
-#   allow_failure:                   true # Allow the pipeline to continue if this job fails (default: false)
-#   needs:
-#     - job:                         test-linux # Any jobs that are required to run before this job (optional)
-#   variables:
-#     MY_ENVIRONMENT_VARIABLE:       "some useful value" # Environment variables passed to the job (optional)
-#   script:
-#     - echo "List of shell commands to run in your job"
-#     - echo "You can also just specify a script here, like so:"
-#     - ./scripts/ci/gitlab/my_amazing_script.sh
-
-stages:
-  - check
-  - test
-  - build
-  - publish
-  - notify
-  - zombienet
-  - deploy
-
-workflow:
-  rules:
-    - if: $CI_COMMIT_TAG
-    - if: $CI_COMMIT_BRANCH
-
-variables:
-  GIT_STRATEGY: fetch
-  GIT_DEPTH: 100
-  CARGO_INCREMENTAL: 0
-  DOCKER_OS: "debian:bullseye"
-  ARCH: "x86_64"
-  CI_IMAGE: !reference [.ci-unified, variables, CI_IMAGE]
-  BUILDAH_IMAGE: "quay.io/buildah/stable:v1.29"
-  BUILDAH_COMMAND: "buildah --storage-driver overlay2"
-  RELENG_SCRIPTS_BRANCH: "master"
-
-  RUSTY_CACHIER_SINGLE_BRANCH: master
-  RUSTY_CACHIER_DONT_OPERATE_ON_MAIN_BRANCH: "true"
-  RUSTY_CACHIER_MINIO_ALIAS: rustycachier_gcs
-  RUSTY_CACHIER_MINIO_BUCKET: parity-build-rusty-cachier
-  RUSTY_CACHIER_COMPRESSION_METHOD: zstd
-
-  NEXTEST_FAILURE_OUTPUT: immediate-final
-  NEXTEST_SUCCESS_OUTPUT: final
-  ZOMBIENET_IMAGE: "docker.io/paritytech/zombienet:v1.3.55"
-
-default:
-  retry:
-    max: 2
-    when:
-      - runner_system_failure
-      - unknown_failure
-      - api_failure
-  cache: {}
-  interruptible: true
-
-.collect-artifacts:
-  artifacts:
-    name: "${CI_JOB_NAME}_${CI_COMMIT_REF_NAME}"
-    when: on_success
-    expire_in: 7 days
-    paths:
-      - artifacts/
-
-.collect-artifacts-short:
-  artifacts:
-    name: "${CI_JOB_NAME}_${CI_COMMIT_REF_NAME}"
-    when: on_success
-    expire_in: 3 hours
-    paths:
-      - artifacts/
-
-.prepare-env:
-  before_script:
-    # TODO: remove unset invocation when we'll be free from 'ENV RUSTC_WRAPPER=sccache' & sccache
-    # itself in all images
-    - unset RUSTC_WRAPPER
-    # $WASM_BUILD_WORKSPACE_HINT enables wasm-builder to find the Cargo.lock from within generated
-    # packages
-    - export WASM_BUILD_WORKSPACE_HINT="$PWD"
-    # ensure that RUSTFLAGS are set correctly
-    - echo $RUSTFLAGS
-
-.job-switcher:
-  before_script:
-    - if echo "$CI_DISABLED_JOBS" | grep -xF "$CI_JOB_NAME"; then echo "The job has been cancelled in CI settings"; exit 0; fi
-
-.kubernetes-env:
-  image: "${CI_IMAGE}"
-  before_script:
-    - !reference [.timestamp, before_script]
-    - !reference [.job-switcher, before_script]
-    - !reference [.prepare-env, before_script]
-  tags:
-    - kubernetes-parity-build
-
-.rust-info-script:
-  script:
-    - rustup show
-    - cargo --version
-    - rustup +nightly show
-    - cargo +nightly --version
-
-.pipeline-stopper-vars:
-  script:
-    - !reference [.job-switcher, before_script]
-    - echo "Collecting env variables for the cancel-pipeline job"
-    - echo "FAILED_JOB_URL=${CI_JOB_URL}" > pipeline-stopper.env
-    - echo "FAILED_JOB_NAME=${CI_JOB_NAME}" >> pipeline-stopper.env
-    - echo "PR_NUM=${CI_COMMIT_REF_NAME}" >> pipeline-stopper.env
-
-.pipeline-stopper-artifacts:
-  artifacts:
-    reports:
-      dotenv: pipeline-stopper.env
-
-.docker-env:
-  image: "${CI_IMAGE}"
-  before_script:
-    - !reference [.timestamp, before_script]
-    - !reference [.job-switcher, before_script]
-    - !reference [.prepare-env, before_script]
-    - !reference [.rust-info-script, script]
-    - !reference [.rusty-cachier, before_script]
-    - !reference [.pipeline-stopper-vars, script]
-  after_script:
-    - !reference [.rusty-cachier, after_script]
-  tags:
-    - linux-docker-vm-c2
-
-# rusty-cachier's hidden job. Parts of this job are used to instrument the pipeline's other real jobs with rusty-cachier
-# Description of the commands is available here - https://gitlab.parity.io/parity/infrastructure/ci_cd/rusty-cachier/client#description
-.rusty-cachier:
-  before_script:
-    - curl -s https://gitlab-ci-token:${CI_JOB_TOKEN}@gitlab.parity.io/parity/infrastructure/ci_cd/rusty-cachier/client/-/raw/release/util/install.sh | bash
-    - rusty-cachier environment check --gracefully
-    - $(rusty-cachier environment inject)
-    - rusty-cachier project mtime
-  after_script:
-    - env RUSTY_CACHIER_SUPRESS_OUTPUT=true rusty-cachier snapshot destroy
-
-.test-refs:
-  rules:
-    - if: $CI_PIPELINE_SOURCE == "web"
-    - if: $CI_PIPELINE_SOURCE == "schedule"
-    - if: $CI_COMMIT_REF_NAME == "master"
-    - if: $CI_COMMIT_REF_NAME =~ /^[0-9]+$/ # PRs
-    - if: $CI_COMMIT_REF_NAME =~ /^v[0-9]+\.[0-9]+.*$/ # i.e. v1.0, v2.1rc1
-
-# handle the specific case where benches could store incorrect bench data because of the downstream staging runs
-# exclude cargo-check-benches from such runs
-.test-refs-check-benches:
-  rules:
-    - if: $CI_COMMIT_REF_NAME == "master" && $CI_PIPELINE_SOURCE == "pipeline"  && $CI_IMAGE =~ /staging$/
-      when: never
-    - if: $CI_PIPELINE_SOURCE == "web"
-    - if: $CI_PIPELINE_SOURCE == "schedule"
-    - if: $CI_COMMIT_REF_NAME == "master"
-    - if: $CI_COMMIT_REF_NAME =~ /^[0-9]+$/ # PRs
-    - if: $CI_COMMIT_REF_NAME =~ /^v[0-9]+\.[0-9]+.*$/ # i.e. v1.0, v2.1rc1
-
-.test-refs-no-trigger:
-  rules:
-    - if: $CI_PIPELINE_SOURCE == "pipeline"
-      when: never
-    - if: $CI_PIPELINE_SOURCE == "web"
-    - if: $CI_PIPELINE_SOURCE == "schedule"
-    - if: $CI_COMMIT_REF_NAME == "master"
-    - if: $CI_COMMIT_REF_NAME =~ /^[0-9]+$/ # PRs
-    - if: $CI_COMMIT_REF_NAME =~ /^v[0-9]+\.[0-9]+.*$/ # i.e. v1.0, v2.1rc1
-    - if: $CI_COMMIT_REF_NAME =~ /^ci-release-.*$/
-
-.test-refs-no-trigger-prs-only:
-  rules:
-    - if: $CI_PIPELINE_SOURCE == "pipeline"
-      when: never
-    - if: $CI_PIPELINE_SOURCE == "web"
-    - if: $CI_PIPELINE_SOURCE == "schedule"
-    - if: $CI_COMMIT_REF_NAME =~ /^[0-9]+$/ # PRs
-
-.publish-refs:
-  rules:
-    - if: $CI_PIPELINE_SOURCE == "pipeline"
-      when: never
-    - if: $CI_PIPELINE_SOURCE == "web"
-    - if: $CI_PIPELINE_SOURCE == "schedule"
-    - if: $CI_COMMIT_REF_NAME == "master"
-    - if: $CI_COMMIT_REF_NAME =~ /^v[0-9]+\.[0-9]+.*$/ # i.e. v1.0, v2.1rc1
-
-.build-refs:
-  # publish-refs + PRs
-  rules:
-    - if: $CI_PIPELINE_SOURCE == "pipeline"
-      when: never
-    - if: $CI_PIPELINE_SOURCE == "web"
-    - if: $CI_PIPELINE_SOURCE == "schedule"
-    - if: $CI_COMMIT_REF_NAME == "master"
-    - if: $CI_COMMIT_REF_NAME =~ /^v[0-9]+\.[0-9]+.*$/ # i.e. v1.0, v2.1rc1
-    - if: $CI_COMMIT_REF_NAME =~ /^[0-9]+$/ # PRs
-
-.zombienet-refs:
-  extends: .build-refs
-
-.crates-publishing-variables:
-  variables:
-    CRATESIO_CRATES_OWNER: parity-crate-owner
-    REPO: substrate
-    REPO_OWNER: paritytech
-
-.crates-publishing-pipeline:
-  extends: .crates-publishing-variables
-  rules:
-    - if: $CI_PIPELINE_SOURCE == "schedule" && $CI_COMMIT_REF_NAME == "master" && $PIPELINE == "automatic-crate-publishing"
-
-.crates-publishing-template:
-  extends:
-    - .docker-env
-    - .crates-publishing-variables
-  # collect artifacts even on failure so that we know how the crates were generated (they'll be
-  # generated to the artifacts folder according to SPUB_TMP further down)
-  artifacts:
-    name: "${CI_JOB_NAME}_${CI_COMMIT_REF_NAME}"
-    when: always
-    expire_in: 7 days
-    paths:
-      - artifacts/
-  variables:
-    SPUB_TMP: artifacts
-    # disable timestamping for the crate publishing jobs, they leave stray child processes behind
-    # which don't interact well with the timestamping script
-    CI_DISABLE_TIMESTAMP: 1
-
-#### stage:                       .pre
-
-check-crates-publishing-pipeline:
-  stage: .pre
-  extends:
-    - .kubernetes-env
-    - .crates-publishing-pipeline
-  script:
-    - git clone
-      --depth 1
-      --branch "$RELENG_SCRIPTS_BRANCH"
-      https://github.com/paritytech/releng-scripts.git
-    - ONLY_CHECK_PIPELINE=true ./releng-scripts/publish-crates
-
-# By default our pipelines are interruptible, but some special pipelines shouldn't be interrupted:
-# * multi-project pipelines such as the ones triggered by the scripts repo
-# * the scheduled automatic-crate-publishing pipeline
-#
-# In those cases, we add an uninterruptible .pre job; once that one has started,
-# the entire pipeline becomes uninterruptible
-uninterruptible-pipeline:
-  extends: .kubernetes-env
-  variables:
-    CI_IMAGE: "paritytech/tools:latest"
-  stage: .pre
-  interruptible: false
-  rules:
-    - if: $CI_PIPELINE_SOURCE == "pipeline"
-    - if: $CI_PIPELINE_SOURCE == "schedule" && $PIPELINE == "automatic-crate-publishing"
-  script: "true"
-
-include:
-  # check jobs
-  - scripts/ci/gitlab/pipeline/check.yml
-  # tests jobs
-  - scripts/ci/gitlab/pipeline/test.yml
-  # build jobs
-  - scripts/ci/gitlab/pipeline/build.yml
-  # publish jobs
-  - scripts/ci/gitlab/pipeline/publish.yml
-  # zombienet jobs
-  - scripts/ci/gitlab/pipeline/zombienet.yml
-  # The crate-publishing pipeline requires a customized `interruptible` configuration. Unfortunately
-  # `interruptible` can't currently be dynamically set based on variables as per:
-  # - https://gitlab.com/gitlab-org/gitlab/-/issues/38349
-  # - https://gitlab.com/gitlab-org/gitlab/-/issues/194023
-  # Thus we work around that limitation by using conditional includes.
-  # For crate-publishing pipelines: run it with defaults + `interruptible: false`. The WHOLE
-  # pipeline is made uninterruptible to ensure that test jobs also get a chance to run to
-  # completion, because the publishing jobs depends on them AS INTENDED: crates should not be
-  # published before their source code is checked.
-  - project: parity/infrastructure/ci_cd/shared
-    ref: main
-    file: /common/timestamp.yml
-  - project: parity/infrastructure/ci_cd/shared
-    ref: main
-    file: /common/ci-unified.yml
-
-
-#### stage:                        notify
-
-# This job notifies rusty-cachier about the latest commit with the cache.
-# This info is later used for the cache distribution and an overlay creation.
-# Note that we don't use any .rusty-cachier references as we assume that a pipeline has reached this stage with working rusty-cachier.
-rusty-cachier-notify:
-  stage: notify
-  extends: .kubernetes-env
-  variables:
-    CI_IMAGE: paritytech/rusty-cachier-env:latest
-    GIT_STRATEGY: none
-  dependencies: []
-  script:
-    - curl -s https://gitlab-ci-token:${CI_JOB_TOKEN}@gitlab.parity.io/parity/infrastructure/ci_cd/rusty-cachier/client/-/raw/release/util/install.sh | bash
-    - rusty-cachier cache notify
-
-#### stage:                        .post
-
-# This job cancels the whole pipeline if any of provided jobs fail.
-# In a DAG, every jobs chain is executed independently of others. The `fail_fast` principle suggests
-# to fail the pipeline as soon as possible to shorten the feedback loop.
-.cancel-pipeline-template:
-  stage: .post
-  rules:
-    - if: $CI_COMMIT_REF_NAME =~ /^[0-9]+$/ # PRs
-      when: on_failure
-  variables:
-    PROJECT_ID: "${CI_PROJECT_ID}"
-    PROJECT_NAME: "${CI_PROJECT_NAME}"
-    PIPELINE_ID: "${CI_PIPELINE_ID}"
-    FAILED_JOB_URL: "${FAILED_JOB_URL}"
-    FAILED_JOB_NAME: "${FAILED_JOB_NAME}"
-    PR_NUM: "${PR_NUM}"
-  trigger:
-    project: "parity/infrastructure/ci_cd/pipeline-stopper"
-
-remove-cancel-pipeline-message:
-  stage: .post
-  rules:
-    - if: $CI_COMMIT_REF_NAME =~ /^[0-9]+$/ # PRs
-  variables:
-    PROJECT_ID: "${CI_PROJECT_ID}"
-    PROJECT_NAME: "${CI_PROJECT_NAME}"
-    PIPELINE_ID: "${CI_PIPELINE_ID}"
-    FAILED_JOB_URL: "https://gitlab.com"
-    FAILED_JOB_NAME: "nope"
-    PR_NUM: "${CI_COMMIT_REF_NAME}"
-  trigger:
-    project: "parity/infrastructure/ci_cd/pipeline-stopper"
-    branch: "as-improve"
-
-# need to copy jobs this way because otherwise gitlab will wait
-# for all 3 jobs to finish instead of cancelling if one fails
-cancel-pipeline-test-linux-stable1:
-  extends: .cancel-pipeline-template
-  needs:
-    - job: "test-linux-stable 1/3"
-
-cancel-pipeline-test-linux-stable2:
-  extends: .cancel-pipeline-template
-  needs:
-    - job: "test-linux-stable 2/3"
-
-cancel-pipeline-test-linux-stable3:
-  extends: .cancel-pipeline-template
-  needs:
-    - job: "test-linux-stable 3/3"
-
-cancel-pipeline-cargo-check-benches1:
-  extends: .cancel-pipeline-template
-  needs:
-    - job: "cargo-check-benches 1/2"
-
-cancel-pipeline-cargo-check-benches2:
-  extends: .cancel-pipeline-template
-  needs:
-    - job: "cargo-check-benches 2/2"
-
-cancel-pipeline-test-linux-stable-int:
-  extends: .cancel-pipeline-template
-  needs:
-    - job: test-linux-stable-int
-
-cancel-pipeline-cargo-check-each-crate-1:
-  extends: .cancel-pipeline-template
-  needs:
-    - job: "cargo-check-each-crate 1/2"
-
-cancel-pipeline-cargo-check-each-crate-2:
-  extends: .cancel-pipeline-template
-  needs:
-    - job: "cargo-check-each-crate 2/2"
-
-cancel-pipeline-cargo-check-each-crate-macos:
-  extends: .cancel-pipeline-template
-  needs:
-    - job: cargo-check-each-crate-macos
-
-cancel-pipeline-check-tracing:
-  extends: .cancel-pipeline-template
-  needs:
-    - job: check-tracing
diff --git a/substrate/.maintain/getgoing.sh b/substrate/.maintain/getgoing.sh
deleted file mode 100644
index 98f360837d04aca82569eeb04dc2147803b69641..0000000000000000000000000000000000000000
--- a/substrate/.maintain/getgoing.sh
+++ /dev/null
@@ -1,6 +0,0 @@
-/usr/bin/ruby -e "$(curl -fsSL https://raw.githubusercontent.com/Homebrew/install/master/install)"
-brew install openssl cmake
-curl https://sh.rustup.rs -sSf | sh
-source ~/.cargo/env
-cargo install --git https://github.com/paritytech/substrate subkey
-cargo install --git https://github.com/paritytech/substrate substrate
diff --git a/substrate/.maintain/init.sh b/substrate/.maintain/init.sh
deleted file mode 100755
index 1405a41ef333e6af863080d83f854d3edb5fb4fa..0000000000000000000000000000000000000000
--- a/substrate/.maintain/init.sh
+++ /dev/null
@@ -1,12 +0,0 @@
-#!/usr/bin/env bash
-
-set -e
-
-echo "*** Initializing WASM build environment"
-
-if [ -z $CI_PROJECT_NAME ] ; then
-   rustup update nightly
-   rustup update stable
-fi
-
-rustup target add wasm32-unknown-unknown --toolchain nightly
diff --git a/substrate/.maintain/runtime-dep.py b/substrate/.maintain/runtime-dep.py
deleted file mode 100755
index 3198bb3e2669e9bcc41e0c26e534028747d377e9..0000000000000000000000000000000000000000
--- a/substrate/.maintain/runtime-dep.py
+++ /dev/null
@@ -1,34 +0,0 @@
-#!/usr/bin/env python3
-
-# To run this script, you need to install the 'toml' python package and install the 'graphviz' package:
-# pip install toml
-# sudo apt-get install graphviz
-# the first parameter is the runtime folder
-# python ./.maintain/runtime-dep.py ./substrate/runtime | dot -Tpng -o output.png
-import sys
-import os
-import toml
-
-if len(sys.argv) != 2:
-    print("needs the runtime folder.")
-    sys.exit(-1)
-
-runtime_dir = sys.argv[1]
-
-files = [os.path.join(runtime_dir, f, 'Cargo.toml') for f in os.listdir(runtime_dir) if os.path.isfile(os.path.join(runtime_dir, f, 'Cargo.toml')) and f != 'example']
-
-print("digraph G {")
-
-
-PREFIX = "substrate-runtime-"
-
-for f in files:
-    manifest = toml.load(f)
-
-    package_name = manifest['package']['name']
-    deps = [d for d in manifest['dependencies'].keys() if d.startswith(PREFIX)]
-
-    for d in deps:
-        print("    \"{}\" -> \"{}\";".format(package_name, d))
-
-print("}")
diff --git a/substrate/.maintain/rustdocs-release.sh b/substrate/.maintain/rustdocs-release.sh
index 2a1e141e63ad21c35e4b904764f64141ce838da1..091f9289e4e3438dda6976d5893a2ae85fe8f02f 100755
--- a/substrate/.maintain/rustdocs-release.sh
+++ b/substrate/.maintain/rustdocs-release.sh
@@ -1,7 +1,8 @@
 #!/usr/bin/env bash
 # set -x
 
-# This script manages the deployment of Substrate rustdocs to https://paritytech.github.io/substrate/.
+# This script used to manage the deployment of Substrate rustdocs to https://paritytech.github.io/substrate/.
+# It is no longer used anywhere, and only here for historical/demonstration purposes.
 # - With `deploy` sub-command, it will checkout the passed-in branch/tag ref, build the rustdocs
 #   locally (this takes some time), update the `index.html` index page, and push it to remote
 #   `gh-pages` branch. So users running this command need to have write access to the remote
diff --git a/substrate/.maintain/update-deps.sh b/substrate/.maintain/update-deps.sh
deleted file mode 100755
index cd6b7c853825ed42a0b55d32018b81207a3d1642..0000000000000000000000000000000000000000
--- a/substrate/.maintain/update-deps.sh
+++ /dev/null
@@ -1,9 +0,0 @@
-#!/bin/sh --
-set -eu
-case $0 in
-   (/*) dir=${0%/*}/;;
-   (*/*) dir=./${0%/*};;
-   (*) dir=.;;
-esac
-
-find "$dir/.." -name Cargo.lock -execdir cargo update \;
diff --git a/substrate/.maintain/update-rust-stable.sh b/substrate/.maintain/update-rust-stable.sh
deleted file mode 100755
index b253bb4105313c6663948e55ee826dff3059d22d..0000000000000000000000000000000000000000
--- a/substrate/.maintain/update-rust-stable.sh
+++ /dev/null
@@ -1,42 +0,0 @@
-#!/usr/bin/env bash
-#
-# Script for updating the UI tests for a new rust stable version.
-#
-# It needs to be called like this:
-#
-# update-rust-stable.sh 1.61
-#
-# This will run all UI tests with the rust stable 1.61. The script
-# requires that rustup is installed.
-set -e
-
-if [ "$#" -ne 1 ]; then
-	echo "Please specify the rust version to use. E.g. update-rust-stable.sh 1.61"
-	exit
-fi
-
-RUST_VERSION=$1
-
-if ! command -v rustup &> /dev/null
-then
-	echo "rustup needs to be installed"
-	exit
-fi
-
-rustup install $RUST_VERSION
-rustup component add rust-src --toolchain $RUST_VERSION
-
-# Ensure we run the ui tests
-export RUN_UI_TESTS=1
-# We don't need any wasm files for ui tests
-export SKIP_WASM_BUILD=1
-# Let trybuild overwrite the .stderr files
-export TRYBUILD=overwrite
-
-# Run all the relevant UI tests
-#
-# Any new UI tests in different crates need to be added here as well.
-rustup run $RUST_VERSION cargo test -p sp-runtime-interface ui
-rustup run $RUST_VERSION cargo test -p sp-api-test ui
-rustup run $RUST_VERSION cargo test -p frame-election-provider-solution-type ui
-rustup run $RUST_VERSION cargo test -p frame-support-test ui
diff --git a/substrate/Cargo.toml b/substrate/Cargo.toml
new file mode 100644
index 0000000000000000000000000000000000000000..d77f02c60603150ce2627ae5594d1fc96d1bfac8
--- /dev/null
+++ b/substrate/Cargo.toml
@@ -0,0 +1,28 @@
+[package]
+name = "substrate"
+description = "Next-generation framework for blockchain innovation"
+license = "GPL-3.0-or-later WITH Classpath-exception-2.0"
+homepage = "https://substrate.io"
+repository.workspace = true
+authors.workspace = true
+edition.workspace = true
+version = "1.0.0"
+
+# The dependencies are only needed for docs.
+[dependencies]
+aquamarine = "0.3.2"
+
+subkey = { path = "bin/utils/subkey" }
+chain-spec-builder = { path = "bin/utils/chain-spec-builder" }
+
+sc-service = { path = "client/service" }
+sc-cli = { path = "client/cli" }
+sc-consensus-aura = { path = "client/consensus/aura" }
+sc-consensus-babe = { path = "client/consensus/babe" }
+sc-consensus-grandpa = { path = "client/consensus/grandpa" }
+sc-consensus-beefy = { path = "client/consensus/beefy" }
+sc-consensus-manual-seal = { path = "client/consensus/manual-seal" }
+sc-consensus-pow = { path = "client/consensus/pow" }
+
+sp-runtime = { path = "primitives/runtime" }
+frame-support = { path = "frame/support" }
diff --git a/substrate/README.md b/substrate/README.md
index 59e0cff015d39c5d3bdbdb83668b81ab019a4112..f7afa7a894d88f7bf57c8c7f6fb870a3e60c1b73 100644
--- a/substrate/README.md
+++ b/substrate/README.md
@@ -1,13 +1,50 @@
-Dear contributors and users,
+# Substrate
 
-We would like to inform you that we have recently made significant changes to our repository structure. In order to streamline our development process and foster better contributions, we have merged three separate repositories Cumulus, Substrate and Polkadot into a single new repository: [the Polkadot SDK](https://github.com/paritytech/polkadot-sdk). Go ahead and make sure to support us by giving a star ⭐️ to the new repo.
+[![GitHub license](https://img.shields.io/badge/license-GPL3%2FApache2-blue)](#LICENSE)
+[![GitLab
+Status](https://gitlab.parity.io/parity/mirrors/polkadot-sdk/badges/master/pipeline.svg)](https://gitlab.parity.io/parity/mirrors/polkadot-sdk/-/pipelines)
+[![PRs Welcome](https://img.shields.io/badge/PRs-welcome-brightgreen.svg)](docs/CONTRIBUTING.md)
+[![Stack
+Exchange](https://img.shields.io/badge/Substrate-Community%20&%20Support-24CC85?logo=stackexchange)](https://substrate.stackexchange.com/)
+<p align="center">
+  <img src="../substrate/docs/media/sub.gif">
+</p>
 
-By consolidating our codebase, we aim to enhance collaboration and provide a more efficient platform for future development.
+Substrate is a next-generation framework for blockchain innovation 🚀.
 
-If you currently have an open pull request in any of the merged repositories, we kindly request that you resubmit your PR in the new repository. This will ensure that your contributions are considered within the updated context and enable us to review and merge them more effectively.
+## Getting Started
 
-We appreciate your understanding and ongoing support throughout this transition. Should you have any questions or require further assistance, please don't hesitate to [reach out to us](https://forum.polkadot.network/t/psa-parity-is-currently-working-on-merging-the-polkadot-stack-repositories-into-one-single-repository/2883).
+Head to [`docs.substrate.io`](https://docs.substrate.io) and follow the [installation](https://docs.substrate.io/install/)
+instructions.  Then try out one of the [tutorials](https://docs.substrate.io/tutorials/).  Refer to the [Docker
+instructions](./docker/README.md) to quickly run Substrate, Substrate Node Template, Subkey, or to build a chain spec.
 
-Best Regards,
+## Community & Support
 
-Parity Technologies
\ No newline at end of file
+Join the highly active and supportive community on the [Substrate Stack Exchange](https://substrate.stackexchange.com/)
+to ask questions about use and problems you run into using this software. Please do report bugs and [issues
+here](https://github.com/paritytech/polkadot-sdk/issues) for anything you suspect requires action in the source.
+
+## Contributions & Code of Conduct
+
+Please follow the contributions guidelines as outlined in
+[`docs/CONTRIBUTING.md`](https://github.com/paritytech/polkadot-sdk/blob/master/docs/CONTRIBUTING.md). In all
+communications and contributions, this project follows the [Contributor Covenant Code of
+Conduct](https://github.com/paritytech/polkadot-sdk/blob/master/docs/CODE_OF_CONDUCT.md).
+
+## Security
+
+The security policy and procedures can be found in
+[`docs/SECURITY.md`](https://github.com/paritytech/polkadot-sdk/blob/master/docs/SECURITY.md).
+
+## License
+
+- Substrate Primitives (`sp-*`), Frame (`frame-*`) and the pallets (`pallets-*`), binaries (`/bin`) and all other
+utilities are licensed under [Apache 2.0](LICENSE-APACHE2).  - Substrate Client (`/client/*` / `sc-*`) is licensed under
+[GPL v3.0 with a classpath linking exception](LICENSE-GPL3).
+
+The reason for the split-licensing is to ensure that for the vast majority of teams using Substrate to create
+feature-chains, then all changes can be made entirely in Apache2-licensed code, allowing teams full freedom over what
+and how they release and giving licensing clarity to commercial teams.
+
+In the interests of the community, we require any deeper improvements made to Substrate's core logic (e.g. Substrate's
+internal consensus, crypto or database code) to be contributed back so everyone can benefit.
diff --git a/substrate/bin/node-template/README.md b/substrate/bin/node-template/README.md
index 337facaaf089864b1eec753be19836ed97224540..6390c9524ce185f7cda7679b874f532694d34a0b 100644
--- a/substrate/bin/node-template/README.md
+++ b/substrate/bin/node-template/README.md
@@ -2,17 +2,26 @@
 
 A fresh [Substrate](https://substrate.io/) node, ready for hacking :rocket:
 
-A standalone version of this template is available for each release of Polkadot in the [Substrate Developer Hub Parachain Template](https://github.com/substrate-developer-hub/substrate-parachain-template/) repository.
-The parachain template is generated directly at each Polkadot release branch from the [Node Template in Substrate](https://github.com/paritytech/substrate/tree/master/bin/node-template) upstream
-
-It is usually best to use the stand-alone version to start a new project.
-All bugs, suggestions, and feature requests should be made upstream in the [Substrate](https://github.com/paritytech/substrate/tree/master/bin/node-template) repository.
+A standalone version of this template is available for each release of Polkadot
+in the [Substrate Developer Hub Parachain
+Template](https://github.com/substrate-developer-hub/substrate-parachain-template/)
+repository. The parachain template is generated directly at each Polkadot
+release branch from the [Node Template in
+Substrate](https://github.com/paritytech/polkadot-sdk/tree/master/substrate/bin/node-template)
+upstream
+
+It is usually best to use the stand-alone version to start a new project. All
+bugs, suggestions, and feature requests should be made upstream in the
+[Substrate](https://github.com/paritytech/polkadot-sdk/tree/master/substrate)
+repository.
 
 ## Getting Started
 
-Depending on your operating system and Rust version, there might be additional packages required to compile this template.
-Check the [Install](https://docs.substrate.io/install/) instructions for your platform for the most common dependencies.
-Alternatively, you can use one of the [alternative installation](#alternatives-installations) options.
+Depending on your operating system and Rust version, there might be additional
+packages required to compile this template. Check the
+[Install](https://docs.substrate.io/install/) instructions for your platform for
+the most common dependencies. Alternatively, you can use one of the [alternative
+installation](#alternatives-installations) options.
 
 ### Build
 
@@ -24,13 +33,16 @@ cargo build --release
 
 ### Embedded Docs
 
-After you build the project, you can use the following command to explore its parameters and subcommands:
+After you build the project, you can use the following command to explore its
+parameters and subcommands:
 
 ```sh
 ./target/release/node-template -h
 ```
 
-You can generate and view the [Rust Docs](https://doc.rust-lang.org/cargo/commands/cargo-doc.html) for this template with this command:
+You can generate and view the [Rust
+Docs](https://doc.rust-lang.org/cargo/commands/cargo-doc.html) for this template
+with this command:
 
 ```sh
 cargo +nightly doc --open
@@ -38,7 +50,8 @@ cargo +nightly doc --open
 
 ### Single-Node Development Chain
 
-The following command starts a single-node development chain that doesn't persist state:
+The following command starts a single-node development chain that doesn't
+persist state:
 
 ```sh
 ./target/release/node-template --dev
@@ -61,10 +74,12 @@ Development chains:
 - Maintain state in a `tmp` folder while the node is running.
 - Use the **Alice** and **Bob** accounts as default validator authorities.
 - Use the **Alice** account as the default `sudo` account.
-- Are preconfigured with a genesis state (`/node/src/chain_spec.rs`) that includes several prefunded development accounts.
+- Are preconfigured with a genesis state (`/node/src/chain_spec.rs`) that
+  includes several prefunded development accounts.
 
 
-To persist chain state between runs, specify a base path by running a command similar to the following:
+To persist chain state between runs, specify a base path by running a command
+similar to the following:
 
 ```sh
 // Create a folder to use as the db base path
@@ -84,81 +99,127 @@ db keystore network
 
 ### Connect with Polkadot-JS Apps Front-End
 
-After you start the node template locally, you can interact with it using the hosted version of the [Polkadot/Substrate Portal](https://polkadot.js.org/apps/#/explorer?rpc=ws://localhost:9944) front-end by connecting to the local node endpoint.
-A hosted version is also available on [IPFS (redirect) here](https://dotapps.io/) or [IPNS (direct) here](ipns://dotapps.io/?rpc=ws%3A%2F%2F127.0.0.1%3A9944#/explorer).
-You can also find the source code and instructions for hosting your own instance on the [polkadot-js/apps](https://github.com/polkadot-js/apps) repository.
+After you start the node template locally, you can interact with it using the
+hosted version of the [Polkadot/Substrate
+Portal](https://polkadot.js.org/apps/#/explorer?rpc=ws://localhost:9944)
+front-end by connecting to the local node endpoint. A hosted version is also
+available on [IPFS (redirect) here](https://dotapps.io/) or [IPNS (direct)
+here](ipns://dotapps.io/?rpc=ws%3A%2F%2F127.0.0.1%3A9944#/explorer). You can
+also find the source code and instructions for hosting your own instance on the
+[`polkadot-js/apps`](https://github.com/polkadot-js/apps) repository.
 
 ### Multi-Node Local Testnet
 
-If you want to see the multi-node consensus algorithm in action, see [Simulate a network](https://docs.substrate.io/tutorials/build-a-blockchain/simulate-network/).
+If you want to see the multi-node consensus algorithm in action, see [Simulate a
+network](https://docs.substrate.io/tutorials/build-a-blockchain/simulate-network/).
 
 ## Template Structure
 
-A Substrate project such as this consists of a number of components that are spread across a few directories.
+A Substrate project such as this consists of a number of components that are
+spread across a few directories.
 
 ### Node
 
-A blockchain node is an application that allows users to participate in a blockchain network.
-Substrate-based blockchain nodes expose a number of capabilities:
-
-- Networking: Substrate nodes use the [`libp2p`](https://libp2p.io/) networking stack to allow the
-  nodes in the network to communicate with one another.
-- Consensus: Blockchains must have a way to come to [consensus](https://docs.substrate.io/fundamentals/consensus/) on the state of the network.
-  Substrate makes it possible to supply custom consensus engines and also ships with several consensus mechanisms that have been built on top of [Web3 Foundation research](https://research.web3.foundation/en/latest/polkadot/NPoS/index.html).
-- RPC Server: A remote procedure call (RPC) server is used to interact with Substrate nodes.
-
-There are several files in the `node` directory.
-Take special note of the following:
-
-- [`chain_spec.rs`](./node/src/chain_spec.rs): A [chain specification](https://docs.substrate.io/build/chain-spec/) is a source code file that defines a Substrate chain's initial (genesis) state.
-  Chain specifications are useful for development and testing, and critical when architecting the launch of a production chain.
-  Take note of the `development_config` and `testnet_genesis` functions,.
-  These functions are used to define the genesis state for the local development chain configuration.
-  These functions identify some [well-known accounts](https://docs.substrate.io/reference/command-line-tools/subkey/) and use them to configure the blockchain's initial state.
-- [`service.rs`](./node/src/service.rs): This file defines the node implementation.
-  Take note of the libraries that this file imports and the names of the functions it invokes.
-  In particular, there are references to consensus-related topics, such as the [block finalization and forks](https://docs.substrate.io/fundamentals/consensus/#finalization-and-forks) and other [consensus mechanisms](https://docs.substrate.io/fundamentals/consensus/#default-consensus-models) such as Aura for block authoring and GRANDPA for finality.
-
+A blockchain node is an application that allows users to participate in a
+blockchain network. Substrate-based blockchain nodes expose a number of
+capabilities:
+
+- Networking: Substrate nodes use the [`libp2p`](https://libp2p.io/) networking
+  stack to allow the nodes in the network to communicate with one another.
+- Consensus: Blockchains must have a way to come to
+  [consensus](https://docs.substrate.io/fundamentals/consensus/) on the state of
+  the network. Substrate makes it possible to supply custom consensus engines
+  and also ships with several consensus mechanisms that have been built on top
+  of [Web3 Foundation
+  research](https://research.web3.foundation/en/latest/polkadot/NPoS/index.html).
+- RPC Server: A remote procedure call (RPC) server is used to interact with
+  Substrate nodes.
+
+There are several files in the `node` directory. Take special note of the
+following:
+
+- [`chain_spec.rs`](./node/src/chain_spec.rs): A [chain
+  specification](https://docs.substrate.io/build/chain-spec/) is a source code
+  file that defines a Substrate chain's initial (genesis) state. Chain
+  specifications are useful for development and testing, and critical when
+  architecting the launch of a production chain. Take note of the
+  `development_config` and `testnet_genesis` functions,. These functions are
+  used to define the genesis state for the local development chain
+  configuration. These functions identify some [well-known
+  accounts](https://docs.substrate.io/reference/command-line-tools/subkey/) and
+  use them to configure the blockchain's initial state.
+- [`service.rs`](./node/src/service.rs): This file defines the node
+  implementation. Take note of the libraries that this file imports and the
+  names of the functions it invokes. In particular, there are references to
+  consensus-related topics, such as the [block finalization and
+  forks](https://docs.substrate.io/fundamentals/consensus/#finalization-and-forks)
+  and other [consensus
+  mechanisms](https://docs.substrate.io/fundamentals/consensus/#default-consensus-models)
+  such as Aura for block authoring and GRANDPA for finality.
 
 
 ### Runtime
 
 In Substrate, the terms "runtime" and "state transition function" are analogous.
-Both terms refer to the core logic of the blockchain that is responsible for validating blocks and executing the state changes they define.
-The Substrate project in this repository uses [FRAME](https://docs.substrate.io/learn/runtime-development/#frame) to construct a blockchain runtime.
-FRAME allows runtime developers to declare domain-specific logic in modules called "pallets".
-At the heart of FRAME is a helpful [macro language](https://docs.substrate.io/reference/frame-macros/) that makes it easy to create pallets and flexibly compose them to create blockchains that can address [a variety of needs](https://substrate.io/ecosystem/projects/).
-
-Review the [FRAME runtime implementation](./runtime/src/lib.rs) included in this template and note the following:
-
-- This file configures several pallets to include in the runtime.
-  Each pallet configuration is defined by a code block that begins with `impl $PALLET_NAME::Config for Runtime`.
-- The pallets are composed into a single runtime by way of the [`construct_runtime!`](https://paritytech.github.io/substrate/master/frame_support/macro.construct_runtime.html) macro, which is part of the [core FRAME pallet library](https://docs.substrate.io/reference/frame-pallets/#system-pallets).
+Both terms refer to the core logic of the blockchain that is responsible for
+validating blocks and executing the state changes they define. The Substrate
+project in this repository uses
+[FRAME](https://docs.substrate.io/learn/runtime-development/#frame) to construct
+a blockchain runtime. FRAME allows runtime developers to declare domain-specific
+logic in modules called "pallets". At the heart of FRAME is a helpful [macro
+language](https://docs.substrate.io/reference/frame-macros/) that makes it easy
+to create pallets and flexibly compose them to create blockchains that can
+address [a variety of needs](https://substrate.io/ecosystem/projects/).
+
+Review the [FRAME runtime implementation](./runtime/src/lib.rs) included in this
+template and note the following:
+
+- This file configures several pallets to include in the runtime. Each pallet
+  configuration is defined by a code block that begins with `impl
+  $PALLET_NAME::Config for Runtime`.
+- The pallets are composed into a single runtime by way of the
+  [`construct_runtime!`](https://paritytech.github.io/substrate/master/frame_support/macro.construct_runtime.html)
+  macro, which is part of the [core FRAME pallet
+  library](https://docs.substrate.io/reference/frame-pallets/#system-pallets).
 
 ### Pallets
 
-The runtime in this project is constructed using many FRAME pallets that ship with [the Substrate repository](https://github.com/paritytech/substrate/tree/master/frame) and a template pallet that is [defined in the `pallets`](./pallets/template/src/lib.rs) directory.
+The runtime in this project is constructed using many FRAME pallets that ship
+with [the Substrate
+repository](https://github.com/paritytech/polkadot-sdk/tree/master/substrate/frame) and a
+template pallet that is [defined in the
+`pallets`](./pallets/template/src/lib.rs) directory.
 
 A FRAME pallet is comprised of a number of blockchain primitives, including:
 
-- Storage: FRAME defines a rich set of powerful [storage abstractions](https://docs.substrate.io/build/runtime-storage/) that makes it easy to use Substrate's efficient key-value database to manage the evolving state of a blockchain.
-- Dispatchables: FRAME pallets define special types of functions that can be invoked (dispatched) from outside of the runtime in order to update its state.
-- Events: Substrate uses [events](https://docs.substrate.io/build/events-and-errors/) to notify users of significant state changes.
+- Storage: FRAME defines a rich set of powerful [storage
+  abstractions](https://docs.substrate.io/build/runtime-storage/) that makes it
+  easy to use Substrate's efficient key-value database to manage the evolving
+  state of a blockchain.
+- Dispatchables: FRAME pallets define special types of functions that can be
+  invoked (dispatched) from outside of the runtime in order to update its state.
+- Events: Substrate uses
+  [events](https://docs.substrate.io/build/events-and-errors/) to notify users
+  of significant state changes.
 - Errors: When a dispatchable fails, it returns an error.
 
-Each pallet has its own `Config` trait which serves as a configuration interface to generically define the types and parameters it depends on.
+Each pallet has its own `Config` trait which serves as a configuration interface
+to generically define the types and parameters it depends on.
 
 ## Alternatives Installations
 
-Instead of installing dependencies and building this source directly, consider the following alternatives.
+Instead of installing dependencies and building this source directly, consider
+the following alternatives.
 
 ### Nix
 
 Install [nix](https://nixos.org/) and
-[nix-direnv](https://github.com/nix-community/nix-direnv) for a fully plug-and-play
-experience for setting up the development environment.
-To get all the correct dependencies, activate direnv `direnv allow`.
+[nix-direnv](https://github.com/nix-community/nix-direnv) for a fully
+plug-and-play experience for setting up the development environment. To get all
+the correct dependencies, activate direnv `direnv allow`.
 
 ### Docker
 
-Please follow the [Substrate Docker instructions here](https://github.com/paritytech/substrate/blob/master/docker/README.md) to build the Docker container with the Substrate Node Template binary.
+Please follow the [Substrate Docker instructions
+here](https://github.com/paritytech/polkadot-sdk/blob/master/substrate/docker/README.md) to
+build the Docker container with the Substrate Node Template binary.
diff --git a/substrate/bin/node-template/docs/rust-setup.md b/substrate/bin/node-template/docs/rust-setup.md
index 2755966e3ae0f8b6099314efc0da9ec03ae08508..00089ab6a061360b0d35d31e42fb7ec0e7ae4abd 100644
--- a/substrate/bin/node-template/docs/rust-setup.md
+++ b/substrate/bin/node-template/docs/rust-setup.md
@@ -1,22 +1,18 @@
----
-title: Installation
----
+# Installation
 
-This guide is for reference only, please check the latest information on getting starting with Substrate 
-[here](https://docs.substrate.io/main-docs/install/).
+This guide is for reference only, please check the latest information on getting started with Substrate [here](https://docs.substrate.io/main-docs/install/).
 
-This page will guide you through the **2 steps** needed to prepare a computer for **Substrate** development.
-Since Substrate is built with [the Rust programming language](https://www.rust-lang.org/), the first
-thing you will need to do is prepare the computer for Rust development - these steps will vary based
-on the computer's operating system. Once Rust is configured, you will use its toolchains to interact
-with Rust projects; the commands for Rust's toolchains will be the same for all supported,
-Unix-based operating systems.
+This page will guide you through the **2 steps** needed to prepare a computer for **Substrate** development. Since
+Substrate is built with [the Rust programming language](https://www.rust-lang.org/), the first thing you will need to do
+is prepare the computer for Rust development - these steps will vary based on the computer's operating system. Once Rust
+is configured, you will use its toolchains to interact with Rust projects; the commands for Rust's toolchains will be
+the same for all supported, Unix-based operating systems.
 
 ## Build dependencies
 
-Substrate development is easiest on Unix-based operating systems like macOS or Linux. The examples
-in the [Substrate Docs](https://docs.substrate.io) use Unix-style terminals to demonstrate how to
-interact with Substrate from the command line.
+Substrate development is easiest on Unix-based operating systems like macOS or Linux. The examples in the [Substrate
+Docs](https://docs.substrate.io) use Unix-style terminals to demonstrate how to interact with Substrate from the command
+line.
 
 ### Ubuntu/Debian
 
@@ -55,10 +51,9 @@ sudo zypper install clang curl git openssl-devel llvm-devel libudev-devel
 
 ### macOS
 
-> **Apple M1 ARM**
-> If you have an Apple M1 ARM system on a chip, make sure that you have Apple Rosetta 2
-> installed through `softwareupdate --install-rosetta`. This is only needed to run the
-> `protoc` tool during the build. The build itself and the target binaries would remain native.
+> **Apple M1 ARM** If you have an Apple M1 ARM system on a chip, make sure that you have Apple Rosetta 2 installed
+> through `softwareupdate --install-rosetta`. This is only needed to run the `protoc` tool during the build. The build
+> itself and the target binaries would remain native.
 
 Open the Terminal application and execute the following commands:
 
@@ -74,15 +69,15 @@ brew install openssl
 ### Windows
 
 **_PLEASE NOTE:_** Native Windows development of Substrate is _not_ very well supported! It is _highly_
-recommend to use [Windows Subsystem Linux](https://docs.microsoft.com/en-us/windows/wsl/install-win10)
+recommended to use [Windows Subsystem Linux](https://docs.microsoft.com/en-us/windows/wsl/install-win10)
 (WSL) and follow the instructions for [Ubuntu/Debian](#ubuntudebian).
 Please refer to the separate
 [guide for native Windows development](https://docs.substrate.io/main-docs/install/windows/).
 
 ## Rust developer environment
 
-This guide uses <https://rustup.rs> installer and the `rustup` tool to manage the Rust toolchain.
-First install and configure `rustup`:
+This guide uses <https://rustup.rs> installer and the `rustup` tool to manage the Rust toolchain. First install and
+configure `rustup`:
 
 ```bash
 # Install
@@ -102,13 +97,13 @@ rustup target add wasm32-unknown-unknown --toolchain nightly
 
 ## Test your set-up
 
-Now the best way to ensure that you have successfully prepared a computer for Substrate
-development is to follow the steps in [our first Substrate tutorial](https://docs.substrate.io/tutorials/v3/create-your-first-substrate-chain/).
+Now the best way to ensure that you have successfully prepared a computer for Substrate development is to follow the
+steps in [our first Substrate tutorial](https://docs.substrate.io/tutorials/v3/create-your-first-substrate-chain/).
 
 ## Troubleshooting Substrate builds
 
-Sometimes you can't get the Substrate node template
-to compile out of the box. Here are some tips to help you work through that.
+Sometimes you can't get the Substrate node template to compile out of the box. Here are some tips to help you work
+through that.
 
 ### Rust configuration check
 
@@ -144,27 +139,27 @@ stable-x86_64-unknown-linux-gnu (default)
 rustc 1.50.0 (cb75ad5db 2021-02-10)
 ```
 
-As you can see above, the default toolchain is stable, and the
-`nightly-x86_64-unknown-linux-gnu` toolchain as well as its `wasm32-unknown-unknown` target is installed.
-You also see that `nightly-2020-10-06-x86_64-unknown-linux-gnu` is installed, but is not used unless explicitly defined as illustrated in the [specify your nightly version](#specifying-nightly-version)
-section.
+As you can see above, the default toolchain is stable, and the `nightly-x86_64-unknown-linux-gnu` toolchain as well as
+its `wasm32-unknown-unknown` target is installed. You also see that `nightly-2020-10-06-x86_64-unknown-linux-gnu` is
+installed, but is not used unless explicitly defined as illustrated in the [specify your nightly
+version](#specifying-nightly-version) section.
 
 ### WebAssembly compilation
 
-Substrate uses [WebAssembly](https://webassembly.org) (Wasm) to produce portable blockchain
-runtimes. You will need to configure your Rust compiler to use
-[`nightly` builds](https://doc.rust-lang.org/book/appendix-07-nightly-rust.html) to allow you to
-compile Substrate runtime code to the Wasm target.
+Substrate uses [WebAssembly](https://webassembly.org) (Wasm) to produce portable blockchain runtimes. You will need to
+configure your Rust compiler to use [`nightly` builds](https://doc.rust-lang.org/book/appendix-07-nightly-rust.html) to
+allow you to compile Substrate runtime code to the Wasm target.
 
 > There are upstream issues in Rust that need to be resolved before all of Substrate can use the stable Rust toolchain.
-> [This is our tracking issue](https://github.com/paritytech/substrate/issues/1252) if you're curious as to why and how this will be resolved.
+> [This is our tracking issue](https://github.com/paritytech/substrate/issues/1252) if you're curious as to why and how
+> this will be resolved.
 
 #### Latest nightly for Substrate `master`
 
-Developers who are building Substrate _itself_ should always use the latest bug-free versions of
-Rust stable and nightly. This is because the Substrate codebase follows the tip of Rust nightly,
-which means that changes in Substrate often depend on upstream changes in the Rust nightly compiler.
-To ensure your Rust compiler is always up to date, you should run:
+Developers who are building Substrate _itself_ should always use the latest bug-free versions of Rust stable and
+nightly. This is because the Substrate codebase follows the tip of Rust nightly, which means that changes in Substrate
+often depend on upstream changes in the Rust nightly compiler. To ensure your Rust compiler is always up to date, you
+should run:
 
 ```bash
 rustup update
@@ -172,21 +167,19 @@ rustup update nightly
 rustup target add wasm32-unknown-unknown --toolchain nightly
 ```
 
-> NOTE: It may be necessary to occasionally rerun `rustup update` if a change in the upstream Substrate
-> codebase depends on a new feature of the Rust compiler. When you do this, both your nightly
-> and stable toolchains will be pulled to the most recent release, and for nightly, it is
-> generally _not_ expected to compile WASM without error (although it very often does).
-> Be sure to [specify your nightly version](#specifying-nightly-version) if you get WASM build errors
-> from `rustup` and [downgrade nightly as needed](#downgrading-rust-nightly).
+> NOTE: It may be necessary to occasionally rerun `rustup update` if a change in the upstream Substrate codebase depends
+> on a new feature of the Rust compiler. When you do this, both your nightly and stable toolchains will be pulled to the
+> most recent release, and for nightly, it is generally _not_ expected to compile WASM without error (although it very
+> often does). Be sure to [specify your nightly version](#specifying-nightly-version) if you get WASM build errors from
+> `rustup` and [downgrade nightly as needed](#downgrading-rust-nightly).
 
 #### Rust nightly toolchain
 
-If you want to guarantee that your build works on your computer as you update Rust and other
-dependencies, you should use a specific Rust nightly version that is known to be
-compatible with the version of Substrate they are using; this version will vary from project to
-project and different projects may use different mechanisms to communicate this version to
-developers. For instance, the Polkadot client specifies this information in its
-[release notes](https://github.com/paritytech/polkadot/releases).
+If you want to guarantee that your build works on your computer as you update Rust and other dependencies, you should
+use a specific Rust nightly version that is known to be compatible with the version of Substrate they are using; this
+version will vary from project to project and different projects may use different mechanisms to communicate this
+version to developers. For instance, the Polkadot client specifies this information in its [release
+notes](https://github.com/paritytech/polkadot-sdk/releases).
 
 ```bash
 # Specify the specific nightly toolchain in the date below:
@@ -203,20 +196,20 @@ rustup target add wasm32-unknown-unknown --toolchain nightly-<yyyy-MM-dd>
 
 ### Specifying nightly version
 
-Use the `WASM_BUILD_TOOLCHAIN` environment variable to specify the Rust nightly version a Substrate
-project should use for Wasm compilation:
+Use the `WASM_BUILD_TOOLCHAIN` environment variable to specify the Rust nightly version a Substrate project should use
+for Wasm compilation:
 
 ```bash
 WASM_BUILD_TOOLCHAIN=nightly-<yyyy-MM-dd> cargo build --release
 ```
 
-> Note that this only builds _the runtime_ with the specified nightly. The rest of project will be
-> compiled with **your default toolchain**, i.e. the latest installed stable toolchain.
+> Note that this only builds _the runtime_ with the specified nightly. The rest of project will be compiled with **your
+> default toolchain**, i.e. the latest installed stable toolchain.
 
 ### Downgrading Rust nightly
 
-If your computer is configured to use the latest Rust nightly and you would like to downgrade to a
-specific nightly version, follow these steps:
+If your computer is configured to use the latest Rust nightly and you would like to downgrade to a specific nightly
+version, follow these steps:
 
 ```bash
 rustup uninstall nightly
diff --git a/substrate/bin/node-template/node/Cargo.toml b/substrate/bin/node-template/node/Cargo.toml
index fc3fa64da993320a60e1c7523d72556e1b793d6f..23840cce2229ba0b83057584fa6657f8424f5c8a 100644
--- a/substrate/bin/node-template/node/Cargo.toml
+++ b/substrate/bin/node-template/node/Cargo.toml
@@ -4,7 +4,7 @@ version = "4.0.0-dev"
 description = "A fresh FRAME-based Substrate node, ready for hacking."
 authors = ["Substrate DevHub <https://github.com/substrate-developer-hub>"]
 homepage = "https://substrate.io/"
-edition = "2021"
+edition.workspace = true
 license = "MIT-0"
 publish = false
 repository = "https://github.com/substrate-developer-hub/substrate-node-template/"
@@ -17,7 +17,7 @@ targets = ["x86_64-unknown-linux-gnu"]
 name = "node-template"
 
 [dependencies]
-clap = { version = "4.2.5", features = ["derive"] }
+clap = { version = "4.4.6", features = ["derive"] }
 futures = { version = "0.3.21", features = ["thread-pool"]}
 
 sc-cli = { path = "../../../client/cli" }
diff --git a/substrate/bin/node-template/node/src/service.rs b/substrate/bin/node-template/node/src/service.rs
index 7303f5cd6dd6d2eb23131fb102ef11ae955f4806..403202829241ee682a688a435ccdc687ffa3af62 100644
--- a/substrate/bin/node-template/node/src/service.rs
+++ b/substrate/bin/node-template/node/src/service.rs
@@ -183,6 +183,7 @@ pub fn new_full(config: Configuration) -> Result<TaskManager, ServiceError> {
 			import_queue,
 			block_announce_validator_builder: None,
 			warp_sync_params: Some(WarpSyncParams::WithProvider(warp_sync)),
+			block_relay: None,
 		})?;
 
 	if config.offchain_worker.enabled {
diff --git a/substrate/bin/node-template/pallets/template/Cargo.toml b/substrate/bin/node-template/pallets/template/Cargo.toml
index 5c5482c8f78e8374c1fed25299070025f59981a3..3e6acc5ceabffb2faeb16f26e98bf79432e723c2 100644
--- a/substrate/bin/node-template/pallets/template/Cargo.toml
+++ b/substrate/bin/node-template/pallets/template/Cargo.toml
@@ -4,7 +4,7 @@ version = "4.0.0-dev"
 description = "FRAME pallet template for defining custom runtime logic."
 authors = ["Substrate DevHub <https://github.com/substrate-developer-hub>"]
 homepage = "https://substrate.io"
-edition = "2021"
+edition.workspace = true
 license = "MIT-0"
 publish = false
 repository = "https://github.com/substrate-developer-hub/substrate-node-template/"
diff --git a/substrate/bin/node-template/pallets/template/README.md b/substrate/bin/node-template/pallets/template/README.md
index d0d59537c12d7ef6490562eb4560d67506082a41..9e4dc55267d69c47fff971cb0427bcb2e0ff871c 100644
--- a/substrate/bin/node-template/pallets/template/README.md
+++ b/substrate/bin/node-template/pallets/template/README.md
@@ -1 +1 @@
-License: MIT-0
\ No newline at end of file
+License: MIT-0
diff --git a/substrate/bin/node-template/pallets/template/src/lib.rs b/substrate/bin/node-template/pallets/template/src/lib.rs
index edf7769bab7d3e852256b2d338c565b28117a600..4a2e53baa774ee5ca333602024d458aa078f9c10 100644
--- a/substrate/bin/node-template/pallets/template/src/lib.rs
+++ b/substrate/bin/node-template/pallets/template/src/lib.rs
@@ -1,105 +1,201 @@
+//! # Template Pallet
+//!
+//! A pallet with minimal functionality to help developers understand the essential components of
+//! writing a FRAME pallet. It is typically used in beginner tutorials or in Substrate template
+//! nodes as a starting point for creating a new pallet and **not meant to be used in production**.
+//!
+//! ## Overview
+//!
+//! This template pallet contains basic examples of:
+//! - declaring a storage item that stores a single `u32` value
+//! - declaring and using events
+//! - declaring and using errors
+//! - a dispatchable function that allows a user to set a new value to storage and emits an event
+//!   upon success
+//! - another dispatchable function that causes a custom error to be thrown
+//!
+//! Each pallet section is annotated with an attribute using the `#[pallet::...]` procedural macro.
+//! This macro generates the necessary code for a pallet to be aggregated into a FRAME runtime.
+//!
+//! Learn more about FRAME macros [here](https://docs.substrate.io/reference/frame-macros/).
+//!
+//! ### Pallet Sections
+//!
+//! The pallet sections in this template are:
+//!
+//! - A **configuration trait** that defines the types and parameters which the pallet depends on
+//!   (denoted by the `#[pallet::config]` attribute). See: [`Config`].
+//! - A **means to store pallet-specific data** (denoted by the `#[pallet::storage]` attribute).
+//!   See: [`storage_types`].
+//! - A **declaration of the events** this pallet emits (denoted by the `#[pallet::event]`
+//!   attribute). See: [`Event`].
+//! - A **declaration of the errors** that this pallet can throw (denoted by the `#[pallet::error]`
+//!   attribute). See: [`Error`].
+//! - A **set of dispatchable functions** that define the pallet's functionality (denoted by the
+//!   `#[pallet::call]` attribute). See: [`dispatchables`].
+//!
+//! Run `cargo doc --package pallet-template --open` to view this pallet's documentation.
+
+// We make sure this pallet uses `no_std` for compiling to Wasm.
 #![cfg_attr(not(feature = "std"), no_std)]
 
-/// Edit this file to define custom logic or remove it if it is not needed.
-/// Learn more about FRAME and the core library of Substrate FRAME pallets:
-/// <https://docs.substrate.io/reference/frame-pallets/>
+// Re-export pallet items so that they can be accessed from the crate namespace.
 pub use pallet::*;
 
+// FRAME pallets require their own "mock runtimes" to be able to run unit tests. This module
+// contains a mock runtime specific for testing this pallet's functionality.
 #[cfg(test)]
 mod mock;
 
+// This module contains the unit tests for this pallet.
+// Learn about pallet unit testing here: https://docs.substrate.io/test/unit-testing/
 #[cfg(test)]
 mod tests;
 
+// Every callable function or "dispatchable" a pallet exposes must have weight values that correctly
+// estimate a dispatchable's execution time. The benchmarking module is used to calculate weights
+// for each dispatchable and generates this pallet's weight.rs file. Learn more about benchmarking here: https://docs.substrate.io/test/benchmark/
 #[cfg(feature = "runtime-benchmarks")]
 mod benchmarking;
 pub mod weights;
 pub use weights::*;
 
+// All pallet logic is defined in its own module and must be annotated by the `pallet` attribute.
 #[frame_support::pallet]
 pub mod pallet {
+	// Import various useful types required by all FRAME pallets.
 	use super::*;
 	use frame_support::pallet_prelude::*;
 	use frame_system::pallet_prelude::*;
 
+	// The `Pallet` struct serves as a placeholder to implement traits, methods and dispatchables
+	// (`Call`s) in this pallet.
 	#[pallet::pallet]
 	pub struct Pallet<T>(_);
 
-	/// Configure the pallet by specifying the parameters and types on which it depends.
+	/// The pallet's configuration trait.
+	///
+	/// All our types and constants a pallet depends on must be declared here.
+	/// These types are defined generically and made concrete when the pallet is declared in the
+	/// `runtime/src/lib.rs` file of your chain.
 	#[pallet::config]
 	pub trait Config: frame_system::Config {
-		/// Because this pallet emits events, it depends on the runtime's definition of an event.
+		/// The overarching runtime event type.
 		type RuntimeEvent: From<Event<Self>> + IsType<<Self as frame_system::Config>::RuntimeEvent>;
-		/// Type representing the weight of this pallet
+		/// A type representing the weights required by the dispatchables of this pallet.
 		type WeightInfo: WeightInfo;
 	}
 
-	// The pallet's runtime storage items.
-	// https://docs.substrate.io/main-docs/build/runtime-storage/
+	/// A storage item for this pallet.
+	///
+	/// In this template, we are declaring a storage item called `Something` that stores a single
+	/// `u32` value. Learn more about runtime storage here: <https://docs.substrate.io/build/runtime-storage/>
+	/// The [`getter`] macro generates a function to conveniently retrieve the value from storage.
 	#[pallet::storage]
 	#[pallet::getter(fn something)]
-	// Learn more about declaring storage items:
-	// https://docs.substrate.io/main-docs/build/runtime-storage/#declaring-storage-items
 	pub type Something<T> = StorageValue<_, u32>;
 
-	// Pallets use events to inform users when important changes are made.
-	// https://docs.substrate.io/main-docs/build/events-errors/
+	/// Events that functions in this pallet can emit.
+	///
+	/// Events are a simple means of indicating to the outside world (such as dApps, chain explorers
+	/// or other users) that some notable update in the runtime has occurred. In a FRAME pallet, the
+	/// documentation for each event field and its parameters is added to a node's metadata so it
+	/// can be used by external interfaces or tools.
+	///
+	///	The `generate_deposit` macro generates a function on `Pallet` called `deposit_event` which
+	/// will convert the event type of your pallet into `RuntimeEvent` (declared in the pallet's
+	/// [`Config`] trait) and deposit it using [`frame_system::Pallet::deposit_event`].
 	#[pallet::event]
 	#[pallet::generate_deposit(pub(super) fn deposit_event)]
 	pub enum Event<T: Config> {
-		/// Event documentation should end with an array that provides descriptive names for event
-		/// parameters. [something, who]
-		SomethingStored { something: u32, who: T::AccountId },
+		/// A user has successfully set a new value.
+		SomethingStored {
+			/// The new value set.
+			something: u32,
+			/// The account who set the new value.
+			who: T::AccountId,
+		},
 	}
 
-	// Errors inform users that something went wrong.
+	/// Errors that can be returned by this pallet.
+	///
+	/// Errors tell users that something went wrong so it's important that their naming is
+	/// informative. Similar to events, error documentation is added to a node's metadata so it's
+	/// equally important that they have helpful documentation associated with them.
+	///
+	/// This type of runtime error can be up to 4 bytes in size should you want to return additional
+	/// information.
 	#[pallet::error]
 	pub enum Error<T> {
-		/// Error names should be descriptive.
+		/// The value retrieved was `None` as no value was previously set.
 		NoneValue,
-		/// Errors should have helpful documentation associated with them.
+		/// There was an attempt to increment the value in storage over `u32::MAX`.
 		StorageOverflow,
 	}
 
-	// Dispatchable functions allows users to interact with the pallet and invoke state changes.
-	// These functions materialize as "extrinsics", which are often compared to transactions.
-	// Dispatchable functions must be annotated with a weight and must return a DispatchResult.
+	/// The pallet's dispatchable functions ([`Call`]s).
+	///
+	/// Dispatchable functions allows users to interact with the pallet and invoke state changes.
+	/// These functions materialize as "extrinsics", which are often compared to transactions.
+	/// They must always return a `DispatchResult` and be annotated with a weight and call index.
+	///
+	/// The [`call_index`] macro is used to explicitly
+	/// define an index for calls in the [`Call`] enum. This is useful for pallets that may
+	/// introduce new dispatchables over time. If the order of a dispatchable changes, its index
+	/// will also change which will break backwards compatibility.
+	///
+	/// The [`weight`] macro is used to assign a weight to each call.
 	#[pallet::call]
 	impl<T: Config> Pallet<T> {
-		/// An example dispatchable that takes a singles value as a parameter, writes the value to
-		/// storage and emits an event. This function must be dispatched by a signed extrinsic.
+		/// An example dispatchable that takes a single u32 value as a parameter, writes the value
+		/// to storage and emits an event.
+		///
+		/// It checks that the _origin_ for this call is _Signed_ and returns a dispatch
+		/// error if it isn't. Learn more about origins here: <https://docs.substrate.io/build/origins/>
 		#[pallet::call_index(0)]
 		#[pallet::weight(T::WeightInfo::do_something())]
 		pub fn do_something(origin: OriginFor<T>, something: u32) -> DispatchResult {
 			// Check that the extrinsic was signed and get the signer.
-			// This function will return an error if the extrinsic is not signed.
-			// https://docs.substrate.io/main-docs/build/origins/
 			let who = ensure_signed(origin)?;
 
 			// Update storage.
-			<Something<T>>::put(something);
+			Something::<T>::put(something);
 
 			// Emit an event.
 			Self::deposit_event(Event::SomethingStored { something, who });
-			// Return a successful DispatchResultWithPostInfo
+
+			// Return a successful `DispatchResult`
 			Ok(())
 		}
 
 		/// An example dispatchable that may throw a custom error.
+		///
+		/// It checks that the caller is a signed origin and reads the current value from the
+		/// `Something` storage item. If a current value exists, it is incremented by 1 and then
+		/// written back to storage.
+		///
+		/// ## Errors
+		///
+		/// The function will return an error under the following conditions:
+		///
+		/// - If no value has been set ([`Error::NoneValue`])
+		/// - If incrementing the value in storage causes an arithmetic overflow
+		///   ([`Error::StorageOverflow`])
 		#[pallet::call_index(1)]
 		#[pallet::weight(T::WeightInfo::cause_error())]
 		pub fn cause_error(origin: OriginFor<T>) -> DispatchResult {
 			let _who = ensure_signed(origin)?;
 
 			// Read a value from storage.
-			match <Something<T>>::get() {
+			match Pallet::<T>::something() {
 				// Return an error if the value has not been set.
 				None => Err(Error::<T>::NoneValue.into()),
 				Some(old) => {
-					// Increment the value read from storage; will error in the event of overflow.
+					// Increment the value read from storage. This will cause an error in the event
+					// of overflow.
 					let new = old.checked_add(1).ok_or(Error::<T>::StorageOverflow)?;
 					// Update the value in storage with the incremented result.
-					<Something<T>>::put(new);
+					Something::<T>::put(new);
 					Ok(())
 				},
 			}
diff --git a/substrate/bin/node-template/runtime/Cargo.toml b/substrate/bin/node-template/runtime/Cargo.toml
index c816013c8255eddb40f7caf1a0c224b92a34ee1a..eb3ff37b425fb491aa4ea5ccd3e705dbc332ae16 100644
--- a/substrate/bin/node-template/runtime/Cargo.toml
+++ b/substrate/bin/node-template/runtime/Cargo.toml
@@ -4,7 +4,7 @@ version = "4.0.0-dev"
 description = "A fresh FRAME-based Substrate node, ready for hacking."
 authors = ["Substrate DevHub <https://github.com/substrate-developer-hub>"]
 homepage = "https://substrate.io/"
-edition = "2021"
+edition.workspace = true
 license = "MIT-0"
 publish = false
 repository = "https://github.com/substrate-developer-hub/substrate-node-template/"
@@ -39,6 +39,7 @@ sp-std = { path = "../../../primitives/std", default-features = false}
 sp-storage = { path = "../../../primitives/storage", default-features = false}
 sp-transaction-pool = { path = "../../../primitives/transaction-pool", default-features = false}
 sp-version = { path = "../../../primitives/version", default-features = false}
+sp-genesis-builder = { default-features = false, path = "../../../primitives/genesis-builder" }
 
 # Used for the node template's RPCs
 frame-system-rpc-runtime-api = { path = "../../../frame/system/rpc/runtime-api", default-features = false}
@@ -64,7 +65,6 @@ std = [
 	"frame-system-benchmarking?/std",
 	"frame-system-rpc-runtime-api/std",
 	"frame-system/std",
-	"frame-try-runtime/std",
 	"frame-try-runtime?/std",
 	"pallet-aura/std",
 	"pallet-balances/std",
@@ -80,6 +80,7 @@ std = [
 	"sp-consensus-aura/std",
 	"sp-consensus-grandpa/std",
 	"sp-core/std",
+	"sp-genesis-builder/std",
 	"sp-inherents/std",
 	"sp-offchain/std",
 	"sp-runtime/std",
diff --git a/substrate/bin/node-template/runtime/src/lib.rs b/substrate/bin/node-template/runtime/src/lib.rs
index 216be9588bca1ad936a4a5941a24c100b79e22e6..4653b49bf2c344c6cd433a5881565488a0d50fa9 100644
--- a/substrate/bin/node-template/runtime/src/lib.rs
+++ b/substrate/bin/node-template/runtime/src/lib.rs
@@ -23,6 +23,7 @@ use sp_std::prelude::*;
 use sp_version::NativeVersion;
 use sp_version::RuntimeVersion;
 
+use frame_support::genesis_builder_helper::{build_config, create_default_config};
 // A few exports that help ease life for downstream crates.
 pub use frame_support::{
 	construct_runtime, parameter_types,
@@ -571,4 +572,14 @@ impl_runtime_apis! {
 			Executive::try_execute_block(block, state_root_check, signature_check, select).expect("execute-block failed")
 		}
 	}
+
+	impl sp_genesis_builder::GenesisBuilder<Block> for Runtime {
+		fn create_default_config() -> Vec<u8> {
+			create_default_config::<RuntimeGenesisConfig>()
+		}
+
+		fn build_config(config: Vec<u8>) -> sp_genesis_builder::Result {
+			build_config::<RuntimeGenesisConfig>(config)
+		}
+	}
 }
diff --git a/substrate/bin/node-template/scripts/init.sh b/substrate/bin/node-template/scripts/init.sh
deleted file mode 100755
index f976f7235d700c8f2e5064bd638ff9fb4d7ff48b..0000000000000000000000000000000000000000
--- a/substrate/bin/node-template/scripts/init.sh
+++ /dev/null
@@ -1,12 +0,0 @@
-#!/usr/bin/env bash
-# This script is meant to be run on Unix/Linux based systems
-set -e
-
-echo "*** Initializing WASM build environment"
-
-if [ -z $CI_PROJECT_NAME ] ; then
-   rustup update nightly
-   rustup update stable
-fi
-
-rustup target add wasm32-unknown-unknown --toolchain nightly
diff --git a/substrate/bin/node/bench/Cargo.toml b/substrate/bin/node/bench/Cargo.toml
index bef67b995be349a904c1d24f66151f38a1fcef7b..c111d345623d584c2748d7659bc034e1a66e6087 100644
--- a/substrate/bin/node/bench/Cargo.toml
+++ b/substrate/bin/node/bench/Cargo.toml
@@ -1,19 +1,19 @@
 [package]
 name = "node-bench"
 version = "0.9.0-dev"
-authors = ["Parity Technologies <admin@parity.io>"]
+authors.workspace = true
 description = "Substrate node integration benchmarks."
-edition = "2021"
+edition.workspace = true
 license = "GPL-3.0-or-later WITH Classpath-exception-2.0"
 homepage = "https://substrate.io"
-repository = "https://github.com/paritytech/substrate/"
+repository.workspace = true
 publish = false
 
 # See more keys and their definitions at https://doc.rust-lang.org/cargo/reference/manifest.html
 
 [dependencies]
 array-bytes = "6.1"
-clap = { version = "4.2.5", features = ["derive"] }
+clap = { version = "4.4.6", features = ["derive"] }
 log = "0.4.17"
 node-primitives = { path = "../primitives" }
 node-testing = { path = "../testing" }
@@ -21,8 +21,8 @@ kitchensink-runtime = { path = "../runtime" }
 sc-client-api = { path = "../../../client/api" }
 sp-runtime = { path = "../../../primitives/runtime" }
 sp-state-machine = { path = "../../../primitives/state-machine" }
-serde = "1.0.163"
-serde_json = "1.0.85"
+serde = "1.0.188"
+serde_json = "1.0.107"
 derive_more = { version = "0.99.17", default-features = false, features = ["display"] }
 kvdb = "0.13.0"
 kvdb-rocksdb = "0.19.0"
diff --git a/substrate/bin/node/bench/src/construct.rs b/substrate/bin/node/bench/src/construct.rs
index 4f3ca07f86b9d2c8e50d170ae92dfa9738ca2c85..23d0a0cc1ee5e1974e7394e841837e074ae04fc4 100644
--- a/substrate/bin/node/bench/src/construct.rs
+++ b/substrate/bin/node/bench/src/construct.rs
@@ -35,7 +35,7 @@ use sc_transaction_pool_api::{
 };
 use sp_consensus::{Environment, Proposer};
 use sp_inherents::InherentDataProvider;
-use sp_runtime::{generic::BlockId, traits::NumberFor, OpaqueExtrinsic};
+use sp_runtime::{traits::NumberFor, OpaqueExtrinsic};
 
 use crate::{
 	common::SizeType,
@@ -233,7 +233,7 @@ impl sc_transaction_pool_api::TransactionPool for Transactions {
 	/// Returns a future that imports a bunch of unverified transactions to the pool.
 	fn submit_at(
 		&self,
-		_at: &BlockId<Self::Block>,
+		_at: Self::Hash,
 		_source: TransactionSource,
 		_xts: Vec<TransactionFor<Self>>,
 	) -> PoolFuture<Vec<Result<node_primitives::Hash, Self::Error>>, Self::Error> {
@@ -243,7 +243,7 @@ impl sc_transaction_pool_api::TransactionPool for Transactions {
 	/// Returns a future that imports one unverified transaction to the pool.
 	fn submit_one(
 		&self,
-		_at: &BlockId<Self::Block>,
+		_at: Self::Hash,
 		_source: TransactionSource,
 		_xt: TransactionFor<Self>,
 	) -> PoolFuture<TxHash<Self>, Self::Error> {
@@ -252,7 +252,7 @@ impl sc_transaction_pool_api::TransactionPool for Transactions {
 
 	fn submit_and_watch(
 		&self,
-		_at: &BlockId<Self::Block>,
+		_at: Self::Hash,
 		_source: TransactionSource,
 		_xt: TransactionFor<Self>,
 	) -> PoolFuture<Pin<Box<TransactionStatusStreamFor<Self>>>, Self::Error> {
@@ -282,6 +282,10 @@ impl sc_transaction_pool_api::TransactionPool for Transactions {
 		Default::default()
 	}
 
+	fn futures(&self) -> Vec<Self::InPoolTransaction> {
+		unimplemented!()
+	}
+
 	fn status(&self) -> PoolStatus {
 		unimplemented!()
 	}
diff --git a/substrate/bin/node/bench/src/txpool.rs b/substrate/bin/node/bench/src/txpool.rs
index a3524ac5bc8901be636e23c2cc666feb7cfb460d..e56bb559a7b555f192f552e750d20f2313a2a0a9 100644
--- a/substrate/bin/node/bench/src/txpool.rs
+++ b/substrate/bin/node/bench/src/txpool.rs
@@ -27,7 +27,6 @@ use node_testing::bench::{BenchDb, BlockType, DatabaseType, KeyTypes};
 
 use sc_transaction_pool::BasicPool;
 use sc_transaction_pool_api::{TransactionPool, TransactionSource};
-use sp_runtime::generic::BlockId;
 
 use crate::core::{self, Mode, Path};
 
@@ -58,10 +57,11 @@ impl core::BenchmarkDescription for PoolBenchmarkDescription {
 impl core::Benchmark for PoolBenchmark {
 	fn run(&mut self, mode: Mode) -> std::time::Duration {
 		let context = self.database.create_context();
+		let genesis_hash = context.client.chain_info().genesis_hash;
 
 		let _ = context
 			.client
-			.runtime_version_at(context.client.chain_info().genesis_hash)
+			.runtime_version_at(genesis_hash)
 			.expect("Failed to get runtime version")
 			.spec_version;
 
@@ -90,7 +90,7 @@ impl core::Benchmark for PoolBenchmark {
 		let start = std::time::Instant::now();
 		let submissions = generated_transactions
 			.into_iter()
-			.map(|tx| txpool.submit_one(&BlockId::Number(0), TransactionSource::External, tx));
+			.map(|tx| txpool.submit_one(genesis_hash, TransactionSource::External, tx));
 		futures::executor::block_on(futures::future::join_all(submissions));
 		let elapsed = start.elapsed();
 
diff --git a/substrate/bin/node/cli/Cargo.toml b/substrate/bin/node/cli/Cargo.toml
index 41e2399f89e2ee008ce88e9dfbdb3621ede7ff9c..49dc39099be03b9470d712245c8d3642c3d8aaaa 100644
--- a/substrate/bin/node/cli/Cargo.toml
+++ b/substrate/bin/node/cli/Cargo.toml
@@ -1,14 +1,14 @@
 [package]
 name = "node-cli"
 version = "3.0.0-dev"
-authors = ["Parity Technologies <admin@parity.io>"]
+authors.workspace = true
 description = "Generic Substrate node implementation in Rust."
 build = "build.rs"
-edition = "2021"
+edition.workspace = true
 license = "GPL-3.0-or-later WITH Classpath-exception-2.0"
 default-run = "substrate-node"
 homepage = "https://substrate.io"
-repository = "https://github.com/paritytech/substrate/"
+repository.workspace = true
 publish = false
 
 [package.metadata.wasm-pack.profile.release]
@@ -38,9 +38,9 @@ crate-type = ["cdylib", "rlib"]
 [dependencies]
 # third-party dependencies
 array-bytes = "6.1"
-clap = { version = "4.2.5", features = ["derive"], optional = true }
+clap = { version = "4.4.6", features = ["derive"], optional = true }
 codec = { package = "parity-scale-codec", version = "3.6.1" }
-serde = { version = "1.0.163", features = ["derive"] }
+serde = { version = "1.0.188", features = ["derive"] }
 jsonrpsee = { version = "0.16.2", features = ["server"] }
 futures = "0.3.21"
 log = "0.4.17"
@@ -60,6 +60,7 @@ sp-keystore = { path = "../../../primitives/keystore" }
 sp-consensus = { path = "../../../primitives/consensus/common" }
 sp-transaction-storage-proof = { path = "../../../primitives/transaction-storage-proof" }
 sp-io = { path = "../../../primitives/io" }
+sp-mixnet = { path = "../../../primitives/mixnet" }
 sp-statement-store = { path = "../../../primitives/statement-store" }
 
 # client dependencies
@@ -82,6 +83,7 @@ sc-service = { path = "../../../client/service", default-features = false}
 sc-telemetry = { path = "../../../client/telemetry" }
 sc-executor = { path = "../../../client/executor" }
 sc-authority-discovery = { path = "../../../client/authority-discovery" }
+sc-mixnet = { path = "../../../client/mixnet" }
 sc-sync-state-rpc = { path = "../../../client/sync-state-rpc" }
 sc-sysinfo = { path = "../../../client/sysinfo" }
 sc-storage-monitor = { path = "../../../client/storage-monitor" }
@@ -106,7 +108,7 @@ sc-cli = { path = "../../../client/cli", optional = true}
 frame-benchmarking-cli = { path = "../../../utils/frame/benchmarking-cli", optional = true}
 node-inspect = { path = "../inspect", optional = true}
 try-runtime-cli = { path = "../../../utils/frame/try-runtime/cli", optional = true}
-serde_json = "1.0.85"
+serde_json = "1.0.107"
 
 [dev-dependencies]
 sc-keystore = { path = "../../../client/keystore" }
@@ -135,7 +137,7 @@ pallet-timestamp = { path = "../../../frame/timestamp" }
 substrate-cli-test-utils = { path = "../../../test-utils/cli" }
 
 [build-dependencies]
-clap = { version = "4.2.5", optional = true }
+clap = { version = "4.4.6", optional = true }
 clap_complete = { version = "4.0.2", optional = true }
 node-inspect = { path = "../inspect", optional = true}
 frame-benchmarking-cli = { path = "../../../utils/frame/benchmarking-cli", optional = true}
diff --git a/substrate/bin/node/cli/benches/block_production.rs b/substrate/bin/node/cli/benches/block_production.rs
index b877aa7350228ca7b0d2a766ba9aba0e8b96b71c..246de8f3e925df6e3d91994af1467975a1669f4c 100644
--- a/substrate/bin/node/cli/benches/block_production.rs
+++ b/substrate/bin/node/cli/benches/block_production.rs
@@ -100,7 +100,7 @@ fn new_node(tokio_handle: Handle) -> node_cli::service::NewFullBase {
 		wasm_runtime_overrides: None,
 	};
 
-	node_cli::service::new_full_base(config, false, |_, _| ())
+	node_cli::service::new_full_base(config, None, false, |_, _| ())
 		.expect("creating a full node doesn't fail")
 }
 
diff --git a/substrate/bin/node/cli/benches/transaction_pool.rs b/substrate/bin/node/cli/benches/transaction_pool.rs
index d3e8c02a958f7e3379c199c64653d53fe3230429..47f890574151d8f8023f901cacd6832d0dea69e5 100644
--- a/substrate/bin/node/cli/benches/transaction_pool.rs
+++ b/substrate/bin/node/cli/benches/transaction_pool.rs
@@ -34,7 +34,7 @@ use sc_transaction_pool::PoolLimit;
 use sc_transaction_pool_api::{TransactionPool as _, TransactionSource, TransactionStatus};
 use sp_core::{crypto::Pair, sr25519};
 use sp_keyring::Sr25519Keyring;
-use sp_runtime::{generic::BlockId, OpaqueExtrinsic};
+use sp_runtime::OpaqueExtrinsic;
 use tokio::runtime::Handle;
 
 fn new_node(tokio_handle: Handle) -> node_cli::service::NewFullBase {
@@ -96,7 +96,7 @@ fn new_node(tokio_handle: Handle) -> node_cli::service::NewFullBase {
 		wasm_runtime_overrides: None,
 	};
 
-	node_cli::service::new_full_base(config, false, |_, _| ()).expect("Creates node")
+	node_cli::service::new_full_base(config, None, false, |_, _| ()).expect("Creates node")
 }
 
 fn create_accounts(num: usize) -> Vec<sr25519::Pair> {
@@ -191,7 +191,7 @@ async fn submit_tx_and_wait_for_inclusion(
 	let best_hash = client.chain_info().best_hash;
 
 	let mut watch = tx_pool
-		.submit_and_watch(&BlockId::Hash(best_hash), TransactionSource::External, tx.clone())
+		.submit_and_watch(best_hash, TransactionSource::External, tx.clone())
 		.await
 		.expect("Submits tx to pool")
 		.fuse();
diff --git a/substrate/bin/node/cli/doc/shell-completion.adoc b/substrate/bin/node/cli/doc/shell-completion.md
similarity index 75%
rename from substrate/bin/node/cli/doc/shell-completion.adoc
rename to substrate/bin/node/cli/doc/shell-completion.md
index 168f00994fb2de175266447965576c6de6876591..3f009a04373d9decc3be3b3e12c204d7d18c33c0 100644
--- a/substrate/bin/node/cli/doc/shell-completion.adoc
+++ b/substrate/bin/node/cli/doc/shell-completion.md
@@ -1,12 +1,11 @@
+# Shell completion
 
-== Shell completion
-
-The Substrate cli command supports shell auto-completion. For this to work, you will need to run the completion script matching your build and system.
+The Substrate cli command supports shell auto-completion. For this to work, you will need to run the
+completion script matching your build and system.
 
 Assuming you built a release version using `cargo build --release` and use `bash` run the following:
 
-[source, shell]
-source target/release/completion-scripts/substrate.bash
+`source target/release/completion-scripts/substrate.bash`
 
 You can find completion scripts for:
 - bash
@@ -17,25 +16,19 @@ You can find completion scripts for:
 
 To make this change persistent, you can proceed as follows:
 
-.First install
-
-[source, shell]
-----
+```shell
 COMPL_DIR=$HOME/.completion
 mkdir -p $COMPL_DIR
 cp -f target/release/completion-scripts/substrate.bash $COMPL_DIR/
 echo "source $COMPL_DIR/substrate.bash" >> $HOME/.bash_profile
 source $HOME/.bash_profile
-----
-
-.Update
+```
 
 When you build a new version of Substrate, the following will ensure your auto-completion script matches the current binary:
 
-[source, shell]
-----
+```shell
 COMPL_DIR=$HOME/.completion
 mkdir -p $COMPL_DIR
 cp -f target/release/completion-scripts/substrate.bash $COMPL_DIR/
 source $HOME/.bash_profile
-----
+```
diff --git a/substrate/bin/node/cli/src/chain_spec.rs b/substrate/bin/node/cli/src/chain_spec.rs
index 3a13c4e29f1c3324d83f7c83eb580c8282b4ad35..68de3312898375a9b703906f898a40971f50ad6a 100644
--- a/substrate/bin/node/cli/src/chain_spec.rs
+++ b/substrate/bin/node/cli/src/chain_spec.rs
@@ -33,6 +33,7 @@ use serde::{Deserialize, Serialize};
 use sp_authority_discovery::AuthorityId as AuthorityDiscoveryId;
 use sp_consensus_babe::AuthorityId as BabeId;
 use sp_core::{crypto::UncheckedInto, sr25519, Pair, Public};
+use sp_mixnet::types::AuthorityId as MixnetId;
 use sp_runtime::{
 	traits::{IdentifyAccount, Verify},
 	Perbill,
@@ -72,8 +73,9 @@ fn session_keys(
 	babe: BabeId,
 	im_online: ImOnlineId,
 	authority_discovery: AuthorityDiscoveryId,
+	mixnet: MixnetId,
 ) -> SessionKeys {
-	SessionKeys { grandpa, babe, im_online, authority_discovery }
+	SessionKeys { grandpa, babe, im_online, authority_discovery, mixnet }
 }
 
 fn staging_testnet_config_genesis() -> RuntimeGenesisConfig {
@@ -93,6 +95,7 @@ fn staging_testnet_config_genesis() -> RuntimeGenesisConfig {
 		BabeId,
 		ImOnlineId,
 		AuthorityDiscoveryId,
+		MixnetId,
 	)> = vec![
 		(
 			// 5Fbsd6WXDGiLTxunqeK5BATNiocfCqu9bS1yArVjCgeBLkVy
@@ -111,6 +114,9 @@ fn staging_testnet_config_genesis() -> RuntimeGenesisConfig {
 			// 5EZaeQ8djPcq9pheJUhgerXQZt9YaHnMJpiHMRhwQeinqUW8
 			array_bytes::hex2array_unchecked("6e7e4eb42cbd2e0ab4cae8708ce5509580b8c04d11f6758dbf686d50fe9f9106")
 				.unchecked_into(),
+			// 5EZaeQ8djPcq9pheJUhgerXQZt9YaHnMJpiHMRhwQeinqUW8
+			array_bytes::hex2array_unchecked("6e7e4eb42cbd2e0ab4cae8708ce5509580b8c04d11f6758dbf686d50fe9f9106")
+				.unchecked_into(),
 		),
 		(
 			// 5ERawXCzCWkjVq3xz1W5KGNtVx2VdefvZ62Bw1FEuZW4Vny2
@@ -129,6 +135,9 @@ fn staging_testnet_config_genesis() -> RuntimeGenesisConfig {
 			// 5DhLtiaQd1L1LU9jaNeeu9HJkP6eyg3BwXA7iNMzKm7qqruQ
 			array_bytes::hex2array_unchecked("482dbd7297a39fa145c570552249c2ca9dd47e281f0c500c971b59c9dcdcd82e")
 				.unchecked_into(),
+			// 5DhLtiaQd1L1LU9jaNeeu9HJkP6eyg3BwXA7iNMzKm7qqruQ
+			array_bytes::hex2array_unchecked("482dbd7297a39fa145c570552249c2ca9dd47e281f0c500c971b59c9dcdcd82e")
+				.unchecked_into(),
 		),
 		(
 			// 5DyVtKWPidondEu8iHZgi6Ffv9yrJJ1NDNLom3X9cTDi98qp
@@ -147,6 +156,9 @@ fn staging_testnet_config_genesis() -> RuntimeGenesisConfig {
 			// 5DhKqkHRkndJu8vq7pi2Q5S3DfftWJHGxbEUNH43b46qNspH
 			array_bytes::hex2array_unchecked("482a3389a6cf42d8ed83888cfd920fec738ea30f97e44699ada7323f08c3380a")
 				.unchecked_into(),
+			// 5DhKqkHRkndJu8vq7pi2Q5S3DfftWJHGxbEUNH43b46qNspH
+			array_bytes::hex2array_unchecked("482a3389a6cf42d8ed83888cfd920fec738ea30f97e44699ada7323f08c3380a")
+				.unchecked_into(),
 		),
 		(
 			// 5HYZnKWe5FVZQ33ZRJK1rG3WaLMztxWrrNDb1JRwaHHVWyP9
@@ -165,6 +177,9 @@ fn staging_testnet_config_genesis() -> RuntimeGenesisConfig {
 			// 5C4vDQxA8LTck2xJEy4Yg1hM9qjDt4LvTQaMo4Y8ne43aU6x
 			array_bytes::hex2array_unchecked("00299981a2b92f878baaf5dbeba5c18d4e70f2a1fcd9c61b32ea18daf38f4378")
 				.unchecked_into(),
+			// 5C4vDQxA8LTck2xJEy4Yg1hM9qjDt4LvTQaMo4Y8ne43aU6x
+			array_bytes::hex2array_unchecked("00299981a2b92f878baaf5dbeba5c18d4e70f2a1fcd9c61b32ea18daf38f4378")
+				.unchecked_into(),
 		),
 	];
 
@@ -217,7 +232,7 @@ where
 /// Helper function to generate stash, controller and session key from seed.
 pub fn authority_keys_from_seed(
 	seed: &str,
-) -> (AccountId, AccountId, GrandpaId, BabeId, ImOnlineId, AuthorityDiscoveryId) {
+) -> (AccountId, AccountId, GrandpaId, BabeId, ImOnlineId, AuthorityDiscoveryId, MixnetId) {
 	(
 		get_account_id_from_seed::<sr25519::Public>(&format!("{}//stash", seed)),
 		get_account_id_from_seed::<sr25519::Public>(seed),
@@ -225,6 +240,7 @@ pub fn authority_keys_from_seed(
 		get_from_seed::<BabeId>(seed),
 		get_from_seed::<ImOnlineId>(seed),
 		get_from_seed::<AuthorityDiscoveryId>(seed),
+		get_from_seed::<MixnetId>(seed),
 	)
 }
 
@@ -237,6 +253,7 @@ pub fn testnet_genesis(
 		BabeId,
 		ImOnlineId,
 		AuthorityDiscoveryId,
+		MixnetId,
 	)>,
 	initial_nominators: Vec<AccountId>,
 	root_key: AccountId,
@@ -307,7 +324,13 @@ pub fn testnet_genesis(
 					(
 						x.0.clone(),
 						x.0.clone(),
-						session_keys(x.2.clone(), x.3.clone(), x.4.clone(), x.5.clone()),
+						session_keys(
+							x.2.clone(),
+							x.3.clone(),
+							x.4.clone(),
+							x.5.clone(),
+							x.6.clone(),
+						),
 					)
 				})
 				.collect::<Vec<_>>(),
@@ -368,6 +391,7 @@ pub fn testnet_genesis(
 			..Default::default()
 		},
 		glutton: Default::default(),
+		mixnet: Default::default(),
 	}
 }
 
@@ -476,7 +500,7 @@ pub(crate) mod tests {
 
 		sc_service_test::connectivity(integration_test_config_with_two_authorities(), |config| {
 			let NewFullBase { task_manager, client, network, sync, transaction_pool, .. } =
-				new_full_base(config, false, |_, _| ())?;
+				new_full_base(config, None, false, |_, _| ())?;
 			Ok(sc_service_test::TestNetComponents::new(
 				task_manager,
 				client,
diff --git a/substrate/bin/node/cli/src/cli.rs b/substrate/bin/node/cli/src/cli.rs
index 4e0d6303870cba960ee42f77ed105c1021cbb380..f3c0435fd32dcaa71f9f94b78dcae01ff07c8b81 100644
--- a/substrate/bin/node/cli/src/cli.rs
+++ b/substrate/bin/node/cli/src/cli.rs
@@ -27,6 +27,10 @@ pub struct Cli {
 	#[clap(flatten)]
 	pub run: sc_cli::RunCmd,
 
+	#[allow(missing_docs)]
+	#[clap(flatten)]
+	pub mixnet_params: sc_cli::MixnetParams,
+
 	/// Disable automatic hardware benchmarks.
 	///
 	/// By default these benchmarks are automatically ran at startup and measure
diff --git a/substrate/bin/node/cli/src/command.rs b/substrate/bin/node/cli/src/command.rs
index 8fb413dba17780fd17a07bc47bc722ab833d98c2..16d0415ff2637fe4f613cb302bec81a7966224e8 100644
--- a/substrate/bin/node/cli/src/command.rs
+++ b/substrate/bin/node/cli/src/command.rs
@@ -50,7 +50,7 @@ impl SubstrateCli for Cli {
 	}
 
 	fn support_url() -> String {
-		"https://github.com/paritytech/substrate/issues/new".into()
+		"https://github.com/paritytech/polkadot-sdk/issues/new".into()
 	}
 
 	fn copyright_start_year() -> i32 {
@@ -111,7 +111,7 @@ pub fn run() -> Result<()> {
 					},
 					BenchmarkCmd::Block(cmd) => {
 						// ensure that we keep the task manager alive
-						let partial = new_partial(&config)?;
+						let partial = new_partial(&config, None)?;
 						cmd.run(partial.client)
 					},
 					#[cfg(not(feature = "runtime-benchmarks"))]
@@ -122,7 +122,7 @@ pub fn run() -> Result<()> {
 					#[cfg(feature = "runtime-benchmarks")]
 					BenchmarkCmd::Storage(cmd) => {
 						// ensure that we keep the task manager alive
-						let partial = new_partial(&config)?;
+						let partial = new_partial(&config, None)?;
 						let db = partial.backend.expose_db();
 						let storage = partial.backend.expose_storage();
 
@@ -130,7 +130,7 @@ pub fn run() -> Result<()> {
 					},
 					BenchmarkCmd::Overhead(cmd) => {
 						// ensure that we keep the task manager alive
-						let partial = new_partial(&config)?;
+						let partial = new_partial(&config, None)?;
 						let ext_builder = RemarkBuilder::new(partial.client.clone());
 
 						cmd.run(
@@ -143,7 +143,7 @@ pub fn run() -> Result<()> {
 					},
 					BenchmarkCmd::Extrinsic(cmd) => {
 						// ensure that we keep the task manager alive
-						let partial = service::new_partial(&config)?;
+						let partial = service::new_partial(&config, None)?;
 						// Register the *Remark* and *TKA* builders.
 						let ext_factory = ExtrinsicFactory(vec![
 							Box::new(RemarkBuilder::new(partial.client.clone())),
@@ -178,21 +178,21 @@ pub fn run() -> Result<()> {
 			let runner = cli.create_runner(cmd)?;
 			runner.async_run(|config| {
 				let PartialComponents { client, task_manager, import_queue, .. } =
-					new_partial(&config)?;
+					new_partial(&config, None)?;
 				Ok((cmd.run(client, import_queue), task_manager))
 			})
 		},
 		Some(Subcommand::ExportBlocks(cmd)) => {
 			let runner = cli.create_runner(cmd)?;
 			runner.async_run(|config| {
-				let PartialComponents { client, task_manager, .. } = new_partial(&config)?;
+				let PartialComponents { client, task_manager, .. } = new_partial(&config, None)?;
 				Ok((cmd.run(client, config.database), task_manager))
 			})
 		},
 		Some(Subcommand::ExportState(cmd)) => {
 			let runner = cli.create_runner(cmd)?;
 			runner.async_run(|config| {
-				let PartialComponents { client, task_manager, .. } = new_partial(&config)?;
+				let PartialComponents { client, task_manager, .. } = new_partial(&config, None)?;
 				Ok((cmd.run(client, config.chain_spec), task_manager))
 			})
 		},
@@ -200,7 +200,7 @@ pub fn run() -> Result<()> {
 			let runner = cli.create_runner(cmd)?;
 			runner.async_run(|config| {
 				let PartialComponents { client, task_manager, import_queue, .. } =
-					new_partial(&config)?;
+					new_partial(&config, None)?;
 				Ok((cmd.run(client, import_queue), task_manager))
 			})
 		},
@@ -211,7 +211,8 @@ pub fn run() -> Result<()> {
 		Some(Subcommand::Revert(cmd)) => {
 			let runner = cli.create_runner(cmd)?;
 			runner.async_run(|config| {
-				let PartialComponents { client, task_manager, backend, .. } = new_partial(&config)?;
+				let PartialComponents { client, task_manager, backend, .. } =
+					new_partial(&config, None)?;
 				let aux_revert = Box::new(|client: Arc<FullClient>, backend, blocks| {
 					sc_consensus_babe::revert(client.clone(), backend, blocks)?;
 					grandpa::revert(client, blocks)?;
diff --git a/substrate/bin/node/cli/src/service.rs b/substrate/bin/node/cli/src/service.rs
index ecca5c60db5156bbda32e012ed607db74e2d9fec..5a85f4cde0ae0ac22c4edecec32691d9b781e877 100644
--- a/substrate/bin/node/cli/src/service.rs
+++ b/substrate/bin/node/cli/src/service.rs
@@ -32,8 +32,7 @@ use sc_client_api::{Backend, BlockBackend};
 use sc_consensus_babe::{self, SlotProportion};
 use sc_executor::NativeElseWasmExecutor;
 use sc_network::{event::Event, NetworkEventStream, NetworkService};
-use sc_network_common::sync::warp::WarpSyncParams;
-use sc_network_sync::SyncingService;
+use sc_network_sync::{warp::WarpSyncParams, SyncingService};
 use sc_service::{config::Configuration, error::Error as ServiceError, RpcHandlers, TaskManager};
 use sc_statement_store::Store as StatementStore;
 use sc_telemetry::{Telemetry, TelemetryWorker};
@@ -135,6 +134,7 @@ pub fn create_extrinsic(
 /// Creates a new partial node.
 pub fn new_partial(
 	config: &Configuration,
+	mixnet_config: Option<&sc_mixnet::Config>,
 ) -> Result<
 	sc_service::PartialComponents<
 		FullClient,
@@ -155,6 +155,7 @@ pub fn new_partial(
 			grandpa::SharedVoterState,
 			Option<Telemetry>,
 			Arc<StatementStore>,
+			Option<sc_mixnet::ApiBackend>,
 		),
 	>,
 	ServiceError,
@@ -247,6 +248,8 @@ pub fn new_partial(
 	)
 	.map_err(|e| ServiceError::Other(format!("Statement store error: {:?}", e)))?;
 
+	let (mixnet_api, mixnet_api_backend) = mixnet_config.map(sc_mixnet::Api::new).unzip();
+
 	let (rpc_extensions_builder, rpc_setup) = {
 		let (_, grandpa_link, _) = &import_setup;
 
@@ -288,6 +291,7 @@ pub fn new_partial(
 				},
 				statement_store: rpc_statement_store.clone(),
 				backend: rpc_backend.clone(),
+				mixnet_api: mixnet_api.as_ref().cloned(),
 			};
 
 			node_rpc::create_full(deps).map_err(Into::into)
@@ -304,7 +308,14 @@ pub fn new_partial(
 		select_chain,
 		import_queue,
 		transaction_pool,
-		other: (rpc_extensions_builder, import_setup, rpc_setup, telemetry, statement_store),
+		other: (
+			rpc_extensions_builder,
+			import_setup,
+			rpc_setup,
+			telemetry,
+			statement_store,
+			mixnet_api_backend,
+		),
 	})
 }
 
@@ -327,6 +338,7 @@ pub struct NewFullBase {
 /// Creates a full service from the configuration.
 pub fn new_full_base(
 	config: Configuration,
+	mixnet_config: Option<sc_mixnet::Config>,
 	disable_hardware_benchmarks: bool,
 	with_startup_data: impl FnOnce(
 		&sc_consensus_babe::BabeBlockImport<Block, FullClient, FullGrandpaBlockImport>,
@@ -348,31 +360,36 @@ pub fn new_full_base(
 		keystore_container,
 		select_chain,
 		transaction_pool,
-		other: (rpc_builder, import_setup, rpc_setup, mut telemetry, statement_store),
-	} = new_partial(&config)?;
+		other:
+			(rpc_builder, import_setup, rpc_setup, mut telemetry, statement_store, mixnet_api_backend),
+	} = new_partial(&config, mixnet_config.as_ref())?;
 
 	let shared_voter_state = rpc_setup;
 	let auth_disc_publish_non_global_ips = config.network.allow_non_globals_in_dht;
 	let mut net_config = sc_network::config::FullNetworkConfiguration::new(&config.network);
 
-	let grandpa_protocol_name = grandpa::protocol_standard_name(
-		&client.block_hash(0).ok().flatten().expect("Genesis block exists; qed"),
-		&config.chain_spec,
-	);
+	let genesis_hash = client.block_hash(0).ok().flatten().expect("Genesis block exists; qed");
+
+	let grandpa_protocol_name = grandpa::protocol_standard_name(&genesis_hash, &config.chain_spec);
 	net_config.add_notification_protocol(grandpa::grandpa_peers_set_config(
 		grandpa_protocol_name.clone(),
 	));
 
 	let statement_handler_proto = sc_network_statement::StatementHandlerPrototype::new(
-		client
-			.block_hash(0u32.into())
-			.ok()
-			.flatten()
-			.expect("Genesis block exists; qed"),
+		genesis_hash,
 		config.chain_spec.fork_id(),
 	);
 	net_config.add_notification_protocol(statement_handler_proto.set_config());
 
+	let mixnet_protocol_name =
+		sc_mixnet::protocol_name(genesis_hash.as_ref(), config.chain_spec.fork_id());
+	if let Some(mixnet_config) = &mixnet_config {
+		net_config.add_notification_protocol(sc_mixnet::peers_set_config(
+			mixnet_protocol_name.clone(),
+			mixnet_config,
+		));
+	}
+
 	let warp_sync = Arc::new(grandpa::warp_proof::NetworkProvider::new(
 		backend.clone(),
 		import_setup.1.shared_authority_set().clone(),
@@ -389,8 +406,23 @@ pub fn new_full_base(
 			import_queue,
 			block_announce_validator_builder: None,
 			warp_sync_params: Some(WarpSyncParams::WithProvider(warp_sync)),
+			block_relay: None,
 		})?;
 
+	if let Some(mixnet_config) = mixnet_config {
+		let mixnet = sc_mixnet::run(
+			mixnet_config,
+			mixnet_api_backend.expect("Mixnet API backend created if mixnet enabled"),
+			client.clone(),
+			sync_service.clone(),
+			network.clone(),
+			mixnet_protocol_name,
+			transaction_pool.clone(),
+			Some(keystore_container.keystore()),
+		);
+		task_manager.spawn_handle().spawn("mixnet", None, mixnet);
+	}
+
 	let role = config.role.clone();
 	let force_authoring = config.force_authoring;
 	let backoff_authoring_blocks =
@@ -546,7 +578,7 @@ pub fn new_full_base(
 		// and vote data availability than the observer. The observer has not
 		// been tested extensively yet and having most nodes in a network run it
 		// could lead to finality stalls.
-		let grandpa_config = grandpa::GrandpaParams {
+		let grandpa_params = grandpa::GrandpaParams {
 			config: grandpa_config,
 			link: grandpa_link,
 			network: network.clone(),
@@ -563,7 +595,7 @@ pub fn new_full_base(
 		task_manager.spawn_essential_handle().spawn_blocking(
 			"grandpa-voter",
 			None,
-			grandpa::run_grandpa_voter(grandpa_config)?,
+			grandpa::run_grandpa_voter(grandpa_params)?,
 		);
 	}
 
@@ -623,8 +655,9 @@ pub fn new_full_base(
 
 /// Builds a new service for a full client.
 pub fn new_full(config: Configuration, cli: Cli) -> Result<TaskManager, ServiceError> {
+	let mixnet_config = cli.mixnet_params.config(config.role.is_authority());
 	let database_source = config.database.clone();
-	let task_manager = new_full_base(config, cli.no_hardware_benchmarks, |_, _| ())
+	let task_manager = new_full_base(config, mixnet_config, cli.no_hardware_benchmarks, |_, _| ())
 		.map(|NewFullBase { task_manager, .. }| task_manager)?;
 
 	sc_storage_monitor::StorageMonitorService::try_spawn(
@@ -702,6 +735,7 @@ mod tests {
 				let NewFullBase { task_manager, client, network, sync, transaction_pool, .. } =
 					new_full_base(
 						config,
+						None,
 						false,
 						|block_import: &sc_consensus_babe::BabeBlockImport<Block, _, _>,
 						 babe_link: &sc_consensus_babe::BabeLink<Block>| {
@@ -876,7 +910,7 @@ mod tests {
 			crate::chain_spec::tests::integration_test_config_with_two_authorities(),
 			|config| {
 				let NewFullBase { task_manager, client, network, sync, transaction_pool, .. } =
-					new_full_base(config, false, |_, _| ())?;
+					new_full_base(config, None, false, |_, _| ())?;
 				Ok(sc_service_test::TestNetComponents::new(
 					task_manager,
 					client,
diff --git a/substrate/bin/node/executor/Cargo.toml b/substrate/bin/node/executor/Cargo.toml
index e98d6fa36c15f8e0cab8f9bbecd3c408cc33e222..bed63697b56ef49c5b9b0d4a4889a63b4ec219ba 100644
--- a/substrate/bin/node/executor/Cargo.toml
+++ b/substrate/bin/node/executor/Cargo.toml
@@ -1,12 +1,12 @@
 [package]
 name = "node-executor"
 version = "3.0.0-dev"
-authors = ["Parity Technologies <admin@parity.io>"]
+authors.workspace = true
 description = "Substrate node implementation in Rust."
-edition = "2021"
+edition.workspace = true
 license = "Apache-2.0"
 homepage = "https://substrate.io"
-repository = "https://github.com/paritytech/substrate/"
+repository.workspace = true
 publish = false
 
 [package.metadata.docs.rs]
diff --git a/substrate/bin/node/executor/tests/submit_transaction.rs b/substrate/bin/node/executor/tests/submit_transaction.rs
index 7678a3c6e5a9fc9e7d0060bd57a5de0239fc3129..5cbb0103d471b96902bb341bcd796e6cf09eac76 100644
--- a/substrate/bin/node/executor/tests/submit_transaction.rs
+++ b/substrate/bin/node/executor/tests/submit_transaction.rs
@@ -239,7 +239,7 @@ fn submitted_transaction_should_be_valid() {
 		let author = extrinsic.signature.clone().unwrap().0;
 		let address = Indices::lookup(author).unwrap();
 		let data = pallet_balances::AccountData { free: 5_000_000_000_000, ..Default::default() };
-		let account = frame_system::AccountInfo { data, ..Default::default() };
+		let account = frame_system::AccountInfo { providers: 1, data, ..Default::default() };
 		<frame_system::Account<Runtime>>::insert(&address, account);
 
 		// check validity
diff --git a/substrate/bin/node/inspect/Cargo.toml b/substrate/bin/node/inspect/Cargo.toml
index b14dc1c719e9223d395fe1630409eb320eaed9d3..4a92db2918589da64edbeef74ca1f04bb620a354 100644
--- a/substrate/bin/node/inspect/Cargo.toml
+++ b/substrate/bin/node/inspect/Cargo.toml
@@ -1,19 +1,19 @@
 [package]
 name = "node-inspect"
 version = "0.9.0-dev"
-authors = ["Parity Technologies <admin@parity.io>"]
+authors.workspace = true
 description = "Substrate node block inspection tool."
-edition = "2021"
+edition.workspace = true
 license = "GPL-3.0-or-later WITH Classpath-exception-2.0"
 homepage = "https://substrate.io"
-repository = "https://github.com/paritytech/substrate/"
+repository.workspace = true
 publish = false
 
 [package.metadata.docs.rs]
 targets = ["x86_64-unknown-linux-gnu"]
 
 [dependencies]
-clap = { version = "4.2.5", features = ["derive"] }
+clap = { version = "4.4.6", features = ["derive"] }
 codec = { package = "parity-scale-codec", version = "3.6.1" }
 thiserror = "1.0"
 sc-cli = { path = "../../../client/cli" }
diff --git a/substrate/bin/node/primitives/Cargo.toml b/substrate/bin/node/primitives/Cargo.toml
index c8b058c4a15d9709b20de6a9be35e9a3675185eb..77bf7ad467614e7df0fdd68a601a2d614fa9bc0e 100644
--- a/substrate/bin/node/primitives/Cargo.toml
+++ b/substrate/bin/node/primitives/Cargo.toml
@@ -1,12 +1,12 @@
 [package]
 name = "node-primitives"
 version = "2.0.0"
-authors = ["Parity Technologies <admin@parity.io>"]
+authors.workspace = true
 description = "Substrate node low-level primitives."
-edition = "2021"
+edition.workspace = true
 license = "Apache-2.0"
 homepage = "https://substrate.io"
-repository = "https://github.com/paritytech/substrate/"
+repository.workspace = true
 publish = false
 
 [package.metadata.docs.rs]
diff --git a/substrate/bin/node/rpc/Cargo.toml b/substrate/bin/node/rpc/Cargo.toml
index d2daa115764479e578f5429fe48a3ec175aaed35..43db4ab9d34f709c43809e5bf909b979eebba6c5 100644
--- a/substrate/bin/node/rpc/Cargo.toml
+++ b/substrate/bin/node/rpc/Cargo.toml
@@ -1,12 +1,12 @@
 [package]
 name = "node-rpc"
 version = "3.0.0-dev"
-authors = ["Parity Technologies <admin@parity.io>"]
+authors.workspace = true
 description = "Substrate node rpc methods."
-edition = "2021"
+edition.workspace = true
 license = "Apache-2.0"
 homepage = "https://substrate.io"
-repository = "https://github.com/paritytech/substrate/"
+repository.workspace = true
 publish = false
 
 [package.metadata.docs.rs]
@@ -23,6 +23,7 @@ sc-consensus-babe = { path = "../../../client/consensus/babe" }
 sc-consensus-babe-rpc = { path = "../../../client/consensus/babe/rpc" }
 sc-consensus-grandpa = { path = "../../../client/consensus/grandpa" }
 sc-consensus-grandpa-rpc = { path = "../../../client/consensus/grandpa/rpc" }
+sc-mixnet = { path = "../../../client/mixnet" }
 sc-rpc = { path = "../../../client/rpc" }
 sc-rpc-api = { path = "../../../client/rpc-api" }
 sc-rpc-spec-v2 = { path = "../../../client/rpc-spec-v2" }
diff --git a/substrate/bin/node/rpc/src/lib.rs b/substrate/bin/node/rpc/src/lib.rs
index 6d8aa5ff0a9da9f33c2ac3123d108ccffe98571b..acc58777e912d546b337dc4ca8a664095a8c33a7 100644
--- a/substrate/bin/node/rpc/src/lib.rs
+++ b/substrate/bin/node/rpc/src/lib.rs
@@ -92,6 +92,8 @@ pub struct FullDeps<C, P, SC, B> {
 	pub statement_store: Arc<dyn sp_statement_store::StatementStore>,
 	/// The backend used by the node.
 	pub backend: Arc<B>,
+	/// Mixnet API.
+	pub mixnet_api: Option<sc_mixnet::Api>,
 }
 
 /// Instantiate all Full RPC extensions.
@@ -106,6 +108,7 @@ pub fn create_full<C, P, SC, B>(
 		grandpa,
 		statement_store,
 		backend,
+		mixnet_api,
 	}: FullDeps<C, P, SC, B>,
 ) -> Result<RpcModule<()>, Box<dyn std::error::Error + Send + Sync>>
 where
@@ -133,6 +136,7 @@ where
 	use sc_consensus_grandpa_rpc::{Grandpa, GrandpaApiServer};
 	use sc_rpc::{
 		dev::{Dev, DevApiServer},
+		mixnet::MixnetApiServer,
 		statement::StatementApiServer,
 	};
 	use sc_rpc_spec_v2::chain_spec::{ChainSpec, ChainSpecApiServer};
@@ -196,5 +200,10 @@ where
 		sc_rpc::statement::StatementStore::new(statement_store, deny_unsafe).into_rpc();
 	io.merge(statement_store)?;
 
+	if let Some(mixnet_api) = mixnet_api {
+		let mixnet = sc_rpc::mixnet::Mixnet::new(mixnet_api).into_rpc();
+		io.merge(mixnet)?;
+	}
+
 	Ok(io)
 }
diff --git a/substrate/bin/node/runtime/Cargo.toml b/substrate/bin/node/runtime/Cargo.toml
index f4a6f6b9c46f55b3079f34001390b2b6d47b8407..e356a7b6024df346e283d70bdde696b09d89211e 100644
--- a/substrate/bin/node/runtime/Cargo.toml
+++ b/substrate/bin/node/runtime/Cargo.toml
@@ -1,13 +1,13 @@
 [package]
 name = "kitchensink-runtime"
 version = "3.0.0-dev"
-authors = ["Parity Technologies <admin@parity.io>"]
+authors.workspace = true
 description = "Substrate node kitchensink runtime."
-edition = "2021"
+edition.workspace = true
 build = "build.rs"
 license = "Apache-2.0"
 homepage = "https://substrate.io"
-repository = "https://github.com/paritytech/substrate/"
+repository.workspace = true
 publish = false
 
 [package.metadata.docs.rs]
@@ -32,8 +32,10 @@ sp-authority-discovery = { path = "../../../primitives/authority-discovery", def
 sp-consensus-babe = { path = "../../../primitives/consensus/babe", default-features = false}
 sp-consensus-grandpa = { path = "../../../primitives/consensus/grandpa", default-features = false}
 sp-block-builder = { path = "../../../primitives/block-builder", default-features = false}
+sp-genesis-builder = { default-features = false, path = "../../../primitives/genesis-builder" }
 sp-inherents = { path = "../../../primitives/inherents", default-features = false}
 node-primitives = { path = "../primitives", default-features = false}
+sp-mixnet = { path = "../../../primitives/mixnet", default-features = false }
 sp-offchain = { path = "../../../primitives/offchain", default-features = false}
 sp-core = { path = "../../../primitives/core", default-features = false}
 sp-std = { path = "../../../primitives/std", default-features = false}
@@ -87,6 +89,7 @@ pallet-identity = { path = "../../../frame/identity", default-features = false}
 pallet-lottery = { path = "../../../frame/lottery", default-features = false}
 pallet-membership = { path = "../../../frame/membership", default-features = false}
 pallet-message-queue = { path = "../../../frame/message-queue", default-features = false}
+pallet-mixnet = { path = "../../../frame/mixnet", default-features = false }
 pallet-mmr = { path = "../../../frame/merkle-mountain-range", default-features = false}
 pallet-multisig = { path = "../../../frame/multisig", default-features = false}
 pallet-nfts = { path = "../../../frame/nfts", default-features = false}
@@ -184,6 +187,7 @@ std = [
 	"pallet-lottery/std",
 	"pallet-membership/std",
 	"pallet-message-queue/std",
+	"pallet-mixnet/std",
 	"pallet-mmr/std",
 	"pallet-multisig/std",
 	"pallet-nft-fractionalization/std",
@@ -231,8 +235,10 @@ std = [
 	"sp-consensus-babe/std",
 	"sp-consensus-grandpa/std",
 	"sp-core/std",
+	"sp-genesis-builder/std",
 	"sp-inherents/std",
 	"sp-io/std",
+	"sp-mixnet/std",
 	"sp-offchain/std",
 	"sp-runtime/std",
 	"sp-session/std",
@@ -279,6 +285,7 @@ runtime-benchmarks = [
 	"pallet-lottery/runtime-benchmarks",
 	"pallet-membership/runtime-benchmarks",
 	"pallet-message-queue/runtime-benchmarks",
+	"pallet-mixnet/runtime-benchmarks",
 	"pallet-mmr/runtime-benchmarks",
 	"pallet-multisig/runtime-benchmarks",
 	"pallet-nft-fractionalization/runtime-benchmarks",
@@ -352,6 +359,7 @@ try-runtime = [
 	"pallet-lottery/try-runtime",
 	"pallet-membership/try-runtime",
 	"pallet-message-queue/try-runtime",
+	"pallet-mixnet/try-runtime",
 	"pallet-mmr/try-runtime",
 	"pallet-multisig/try-runtime",
 	"pallet-nft-fractionalization/try-runtime",
diff --git a/substrate/bin/node/runtime/src/assets_api.rs b/substrate/bin/node/runtime/src/assets_api.rs
index cf1a663d70300aa6a4427d3998112c84056e68d2..792ed7c6576bd85485eae9abe84ea17d5749cd13 100644
--- a/substrate/bin/node/runtime/src/assets_api.rs
+++ b/substrate/bin/node/runtime/src/assets_api.rs
@@ -1,6 +1,6 @@
 // This file is part of Substrate.
 
-// Copyright (C) 2018-2022 Parity Technologies (UK) Ltd.
+// Copyright (C) Parity Technologies (UK) Ltd.
 // SPDX-License-Identifier: GPL-3.0-or-later WITH Classpath-exception-2.0
 
 // This program is free software: you can redistribute it and/or modify
diff --git a/substrate/bin/node/runtime/src/lib.rs b/substrate/bin/node/runtime/src/lib.rs
index 4f34e4ecd812221102c01e839df96472f5b8de99..2070e3f12d04fd49419f5da032b125f28b6ff4a4 100644
--- a/substrate/bin/node/runtime/src/lib.rs
+++ b/substrate/bin/node/runtime/src/lib.rs
@@ -30,16 +30,18 @@ use frame_election_provider_support::{
 use frame_support::{
 	construct_runtime,
 	dispatch::DispatchClass,
+	genesis_builder_helper::{build_config, create_default_config},
 	instances::{Instance1, Instance2},
 	ord_parameter_types,
 	pallet_prelude::Get,
 	parameter_types,
 	traits::{
-		fungible::{Balanced, Credit, ItemOf},
-		tokens::{nonfungibles_v2::Inspect, GetSalary, PayFromAccount},
+		fungible::{Balanced, Credit, HoldConsideration, ItemOf},
+		tokens::{nonfungibles_v2::Inspect, pay::PayAssetFromAccount, GetSalary, PayFromAccount},
 		AsEnsureOriginWithArg, ConstBool, ConstU128, ConstU16, ConstU32, Contains, Currency,
 		EitherOfDiverse, EqualPrivilegeOnly, Imbalance, InsideBoth, InstanceFilter,
-		KeyOwnerProofSystem, LockIdentifier, Nothing, OnUnbalanced, WithdrawReasons,
+		KeyOwnerProofSystem, LinearStoragePrice, LockIdentifier, Nothing, OnUnbalanced,
+		WithdrawReasons,
 	},
 	weights::{
 		constants::{
@@ -57,7 +59,7 @@ pub use node_primitives::{AccountId, Signature};
 use node_primitives::{AccountIndex, Balance, BlockNumber, Hash, Moment, Nonce};
 use pallet_asset_conversion::{NativeOrAssetId, NativeOrAssetIdConverter};
 use pallet_broker::{CoreAssignment, CoreIndex, CoretimeInterface, PartsOf57600};
-use pallet_election_provider_multi_phase::SolutionAccuracyOf;
+use pallet_election_provider_multi_phase::{GeometricDepositBase, SolutionAccuracyOf};
 use pallet_im_online::sr25519::AuthorityId as ImOnlineId;
 use pallet_nfts::PalletFeatures;
 use pallet_nis::WithMaximumOf;
@@ -447,10 +449,10 @@ impl pallet_glutton::Config for Runtime {
 }
 
 parameter_types! {
-	pub const PreimageMaxSize: u32 = 4096 * 1024;
 	pub const PreimageBaseDeposit: Balance = 1 * DOLLARS;
 	// One cent: $10,000 / MB
 	pub const PreimageByteDeposit: Balance = 1 * CENTS;
+	pub const PreimageHoldReason: RuntimeHoldReason = RuntimeHoldReason::Preimage(pallet_preimage::HoldReason::Preimage);
 }
 
 impl pallet_preimage::Config for Runtime {
@@ -458,8 +460,12 @@ impl pallet_preimage::Config for Runtime {
 	type RuntimeEvent = RuntimeEvent;
 	type Currency = Balances;
 	type ManagerOrigin = EnsureRoot<AccountId>;
-	type BaseDeposit = PreimageBaseDeposit;
-	type ByteDeposit = PreimageByteDeposit;
+	type Consideration = HoldConsideration<
+		AccountId,
+		Balances,
+		PreimageHoldReason,
+		LinearStoragePrice<PreimageBaseDeposit, PreimageByteDeposit, Balance>,
+	>;
 }
 
 parameter_types! {
@@ -515,8 +521,8 @@ impl pallet_balances::Config for Runtime {
 	type ExistentialDeposit = ExistentialDeposit;
 	type AccountStore = frame_system::Pallet<Runtime>;
 	type WeightInfo = pallet_balances::weights::SubstrateWeight<Runtime>;
-	type FreezeIdentifier = ();
-	type MaxFreezes = ();
+	type FreezeIdentifier = RuntimeFreezeReason;
+	type MaxFreezes = ConstU32<1>;
 	type RuntimeHoldReason = RuntimeHoldReason;
 	type MaxHolds = ConstU32<2>;
 }
@@ -583,6 +589,7 @@ impl_opaque_keys! {
 		pub babe: Babe,
 		pub im_online: ImOnline,
 		pub authority_discovery: AuthorityDiscovery,
+		pub mixnet: Mixnet,
 	}
 }
 
@@ -689,7 +696,8 @@ parameter_types! {
 
 	// signed config
 	pub const SignedRewardBase: Balance = 1 * DOLLARS;
-	pub const SignedDepositBase: Balance = 1 * DOLLARS;
+	pub const SignedFixedDeposit: Balance = 1 * DOLLARS;
+	pub const SignedDepositIncreaseFactor: Percent = Percent::from_percent(10);
 	pub const SignedDepositByte: Balance = 1 * CENTS;
 
 	pub BetterUnsignedThreshold: Perbill = Perbill::from_rational(1u32, 10_000);
@@ -817,7 +825,8 @@ impl pallet_election_provider_multi_phase::Config for Runtime {
 	type MinerConfig = Self;
 	type SignedMaxSubmissions = ConstU32<10>;
 	type SignedRewardBase = SignedRewardBase;
-	type SignedDepositBase = SignedDepositBase;
+	type SignedDepositBase =
+		GeometricDepositBase<Balance, SignedFixedDeposit, SignedDepositIncreaseFactor>;
 	type SignedDepositByte = SignedDepositByte;
 	type SignedMaxRefunds = ConstU32<3>;
 	type SignedDepositWeight = ();
@@ -874,6 +883,7 @@ impl pallet_nomination_pools::Config for Runtime {
 	type WeightInfo = ();
 	type RuntimeEvent = RuntimeEvent;
 	type Currency = Balances;
+	type RuntimeFreezeReason = RuntimeFreezeReason;
 	type RewardCounter = FixedU128;
 	type BalanceToU256 = BalanceToU256;
 	type U256ToBalance = U256ToBalance;
@@ -1039,7 +1049,7 @@ impl pallet_democracy::Config for Runtime {
 		pallet_collective::EnsureProportionAtLeast<AccountId, TechnicalCollective, 2, 3>;
 	type InstantOrigin =
 		pallet_collective::EnsureProportionAtLeast<AccountId, TechnicalCollective, 1, 1>;
-	type InstantAllowed = frame_support::traits::ConstBool<true>;
+	type InstantAllowed = ConstBool<true>;
 	type FastTrackVotingPeriod = FastTrackVotingPeriod;
 	// To cancel a proposal which has been passed, 2/3 of the council must agree to it.
 	type CancellationOrigin =
@@ -1177,6 +1187,7 @@ parameter_types! {
 	pub const MaximumReasonLength: u32 = 300;
 	pub const MaxApprovals: u32 = 100;
 	pub const MaxBalance: Balance = Balance::max_value();
+	pub const SpendPayoutPeriod: BlockNumber = 30 * DAYS;
 }
 
 impl pallet_treasury::Config for Runtime {
@@ -1202,6 +1213,14 @@ impl pallet_treasury::Config for Runtime {
 	type WeightInfo = pallet_treasury::weights::SubstrateWeight<Runtime>;
 	type MaxApprovals = MaxApprovals;
 	type SpendOrigin = EnsureWithSuccess<EnsureRoot<AccountId>, AccountId, MaxBalance>;
+	type AssetKind = u32;
+	type Beneficiary = AccountId;
+	type BeneficiaryLookup = Indices;
+	type Paymaster = PayAssetFromAccount<Assets, TreasuryAccount>;
+	type BalanceConverter = AssetRate;
+	type PayoutPeriod = SpendPayoutPeriod;
+	#[cfg(feature = "runtime-benchmarks")]
+	type BenchmarkHelper = ();
 }
 
 impl pallet_asset_rate::Config for Runtime {
@@ -1281,6 +1300,7 @@ impl pallet_tips::Config for Runtime {
 	type TipCountdown = TipCountdown;
 	type TipFindersFee = TipFindersFee;
 	type TipReportDepositBase = TipReportDepositBase;
+	type MaxTipAmount = ConstU128<{ 500 * DOLLARS }>;
 	type WeightInfo = pallet_tips::weights::SubstrateWeight<Runtime>;
 }
 
@@ -2009,6 +2029,29 @@ impl pallet_broker::Config for Runtime {
 	type PriceAdapter = pallet_broker::Linear;
 }
 
+parameter_types! {
+	pub const MixnetNumCoverToCurrentBlocks: BlockNumber = 3;
+	pub const MixnetNumRequestsToCurrentBlocks: BlockNumber = 3;
+	pub const MixnetNumCoverToPrevBlocks: BlockNumber = 3;
+	pub const MixnetNumRegisterStartSlackBlocks: BlockNumber = 3;
+	pub const MixnetNumRegisterEndSlackBlocks: BlockNumber = 3;
+	pub const MixnetRegistrationPriority: TransactionPriority = ImOnlineUnsignedPriority::get() - 1;
+}
+
+impl pallet_mixnet::Config for Runtime {
+	type MaxAuthorities = MaxAuthorities;
+	type MaxExternalAddressSize = ConstU32<128>;
+	type MaxExternalAddressesPerMixnode = ConstU32<16>;
+	type NextSessionRotation = Babe;
+	type NumCoverToCurrentBlocks = MixnetNumCoverToCurrentBlocks;
+	type NumRequestsToCurrentBlocks = MixnetNumRequestsToCurrentBlocks;
+	type NumCoverToPrevBlocks = MixnetNumCoverToPrevBlocks;
+	type NumRegisterStartSlackBlocks = MixnetNumRegisterStartSlackBlocks;
+	type NumRegisterEndSlackBlocks = MixnetNumRegisterEndSlackBlocks;
+	type RegistrationPriority = MixnetRegistrationPriority;
+	type MinMixnodes = ConstU32<7>; // Low to allow small testing networks
+}
+
 construct_runtime!(
 	pub struct Runtime
 	{
@@ -2085,6 +2128,7 @@ construct_runtime!(
 		SafeMode: pallet_safe_mode,
 		Statement: pallet_statement,
 		Broker: pallet_broker,
+		Mixnet: pallet_mixnet,
 	}
 );
 
@@ -2644,6 +2688,24 @@ impl_runtime_apis! {
 		}
 	}
 
+	impl sp_mixnet::runtime_api::MixnetApi<Block> for Runtime {
+		fn session_status() -> sp_mixnet::types::SessionStatus {
+			Mixnet::session_status()
+		}
+
+		fn prev_mixnodes() -> Result<Vec<sp_mixnet::types::Mixnode>, sp_mixnet::types::MixnodesErr> {
+			Mixnet::prev_mixnodes()
+		}
+
+		fn current_mixnodes() -> Result<Vec<sp_mixnet::types::Mixnode>, sp_mixnet::types::MixnodesErr> {
+			Mixnet::current_mixnodes()
+		}
+
+		fn maybe_register(session_index: sp_mixnet::types::SessionIndex, mixnode: sp_mixnet::types::Mixnode) -> bool {
+			Mixnet::maybe_register(session_index, mixnode)
+		}
+	}
+
 	impl sp_session::SessionKeys<Block> for Runtime {
 		fn generate_session_keys(seed: Option<Vec<u8>>) -> Vec<u8> {
 			SessionKeys::generate(seed)
@@ -2743,6 +2805,16 @@ impl_runtime_apis! {
 			Ok(batches)
 		}
 	}
+
+	impl sp_genesis_builder::GenesisBuilder<Block> for Runtime {
+		fn create_default_config() -> Vec<u8> {
+			create_default_config::<RuntimeGenesisConfig>()
+		}
+
+		fn build_config(config: Vec<u8>) -> sp_genesis_builder::Result {
+			build_config::<RuntimeGenesisConfig>(config)
+		}
+	}
 }
 
 #[cfg(test)]
diff --git a/substrate/bin/node/testing/Cargo.toml b/substrate/bin/node/testing/Cargo.toml
index 89af222df593c801a875d89f9e5d509de2619713..f5a39693301ce6443e9bef6ba20edf5183357b6c 100644
--- a/substrate/bin/node/testing/Cargo.toml
+++ b/substrate/bin/node/testing/Cargo.toml
@@ -1,12 +1,12 @@
 [package]
 name = "node-testing"
 version = "3.0.0-dev"
-authors = ["Parity Technologies <admin@parity.io>"]
+authors.workspace = true
 description = "Test utilities for Substrate node."
-edition = "2021"
+edition.workspace = true
 license = "GPL-3.0-or-later WITH Classpath-exception-2.0"
 homepage = "https://substrate.io"
-repository = "https://github.com/paritytech/substrate/"
+repository.workspace = true
 publish = false
 
 [package.metadata.docs.rs]
diff --git a/substrate/bin/node/testing/src/genesis.rs b/substrate/bin/node/testing/src/genesis.rs
index e8413ad79e2f5db4b465611c6ed17a589ed660ef..93b5e6bc49a8b87b7b99b9af9e8aabaa699580a6 100644
--- a/substrate/bin/node/testing/src/genesis.rs
+++ b/substrate/bin/node/testing/src/genesis.rs
@@ -110,5 +110,6 @@ pub fn config_endowed(code: Option<&[u8]>, extra_endowed: Vec<AccountId>) -> Run
 			trash_data_count: Default::default(),
 			..Default::default()
 		},
+		mixnet: Default::default(),
 	}
 }
diff --git a/substrate/bin/node/testing/src/keyring.rs b/substrate/bin/node/testing/src/keyring.rs
index b4b714d9083d60ef5c13688f2c00179216f5a33d..22a8f5deb19f737537227ae21b4c0c20770f7759 100644
--- a/substrate/bin/node/testing/src/keyring.rs
+++ b/substrate/bin/node/testing/src/keyring.rs
@@ -64,6 +64,7 @@ pub fn to_session_keys(
 		babe: sr25519_keyring.to_owned().public().into(),
 		im_online: sr25519_keyring.to_owned().public().into(),
 		authority_discovery: sr25519_keyring.to_owned().public().into(),
+		mixnet: sr25519_keyring.to_owned().public().into(),
 	}
 }
 
diff --git a/substrate/bin/utils/chain-spec-builder/Cargo.toml b/substrate/bin/utils/chain-spec-builder/Cargo.toml
index 4baa403e1b2e0f699393955607c46ecb13230f1c..c7690faf7d065dd941f71aaf7f74d0166f8ee7ce 100644
--- a/substrate/bin/utils/chain-spec-builder/Cargo.toml
+++ b/substrate/bin/utils/chain-spec-builder/Cargo.toml
@@ -1,12 +1,12 @@
 [package]
 name = "chain-spec-builder"
 version = "2.0.0"
-authors = ["Parity Technologies <admin@parity.io>"]
-edition = "2021"
+authors.workspace = true
+edition.workspace = true
 build = "build.rs"
 license = "GPL-3.0-or-later WITH Classpath-exception-2.0"
 homepage = "https://substrate.io"
-repository = "https://github.com/paritytech/substrate/"
+repository.workspace = true
 readme = "README.md"
 publish = false
 
@@ -22,7 +22,7 @@ crate-type = ["rlib"]
 
 [dependencies]
 ansi_term = "0.12.1"
-clap = { version = "4.2.5", features = ["derive"] }
+clap = { version = "4.4.6", features = ["derive"] }
 rand = "0.8"
 node-cli = { path = "../../node/cli" }
 sc-chain-spec = { path = "../../../client/chain-spec" }
diff --git a/substrate/bin/utils/chain-spec-builder/src/lib.rs b/substrate/bin/utils/chain-spec-builder/src/lib.rs
index 528b6b70115a07c3225d52c0bf30a727bf1eebd7..2b88e40ef74fd804a086f83b2903572aef373904 100644
--- a/substrate/bin/utils/chain-spec-builder/src/lib.rs
+++ b/substrate/bin/utils/chain-spec-builder/src/lib.rs
@@ -179,7 +179,7 @@ pub fn generate_authority_keys_and_store(
 				.map_err(|err| err.to_string())?
 				.into();
 
-		let (_, _, grandpa, babe, im_online, authority_discovery) =
+		let (_, _, grandpa, babe, im_online, authority_discovery, mixnet) =
 			chain_spec::authority_keys_from_seed(seed);
 
 		let insert_key = |key_type, public| {
@@ -198,6 +198,8 @@ pub fn generate_authority_keys_and_store(
 			sp_core::crypto::key_types::AUTHORITY_DISCOVERY,
 			authority_discovery.as_slice(),
 		)?;
+
+		insert_key(sp_core::crypto::key_types::MIXNET, mixnet.as_slice())?;
 	}
 
 	Ok(())
diff --git a/substrate/bin/utils/subkey/Cargo.toml b/substrate/bin/utils/subkey/Cargo.toml
index b9cc4d3c264c0a4fad8f296fe19f09ed92d1c14e..6606d8ac365f9f9e68805808ef6db62662fbeac5 100644
--- a/substrate/bin/utils/subkey/Cargo.toml
+++ b/substrate/bin/utils/subkey/Cargo.toml
@@ -1,12 +1,12 @@
 [package]
 name = "subkey"
 version = "3.0.0"
-authors = ["Parity Technologies <admin@parity.io>"]
+authors.workspace = true
 description = "Generate and restore keys for Substrate based chains such as Polkadot, Kusama and a growing number of parachains and Substrate based projects."
-edition = "2021"
+edition.workspace = true
 license = "GPL-3.0-or-later WITH Classpath-exception-2.0"
 homepage = "https://substrate.io"
-repository = "https://github.com/paritytech/substrate/"
+repository.workspace = true
 readme = "README.md"
 
 [package.metadata.docs.rs]
@@ -17,5 +17,5 @@ path = "src/main.rs"
 name = "subkey"
 
 [dependencies]
-clap = { version = "4.2.5", features = ["derive"] }
+clap = { version = "4.4.6", features = ["derive"] }
 sc-cli = { path = "../../../client/cli" }
diff --git a/substrate/bin/utils/subkey/README.md b/substrate/bin/utils/subkey/README.md
index d19ccefb59aae8efc581d848ce466bce23bf1825..60e5a9ca935008e81518263b2802b3eb1e90d636 100644
--- a/substrate/bin/utils/subkey/README.md
+++ b/substrate/bin/utils/subkey/README.md
@@ -1,26 +1,33 @@
 # Subkey
 
-Subkey is a commandline utility included with Substrate. It allows generating and restoring keys for Substrate based chains such as Polkadot, Kusama and a growing number of parachains and Substrate based projects.
+Subkey is a commandline utility included with Substrate. It allows generating and restoring keys for Substrate based
+chains such as Polkadot, Kusama and a growing number of parachains and Substrate based projects.
 
 `subkey` provides a few sub-commands to generate keys, check keys, sign messages, verify messages, etc...
 
-You can see the full list of commands with `subkey --help`. Most commands have additional help available with for instance `subkey generate --help` for the `generate` command.
+You can see the full list of commands with `subkey --help`. Most commands have additional help available with for
+instance `subkey generate --help` for the `generate` command.
 
 ## Safety first
 
-`subkey` does not need an internet connection to work. Indeed, for the best security, you should be using `subkey` on a machine that is **not connected** to the internet.
+`subkey` does not need an internet connection to work. Indeed, for the best security, you should be using `subkey` on a
+machine that is **not connected** to the internet.
 
-`subkey` deals with **seeds** and **private keys**. Make sure to use `subkey` in a safe environment (ie. no one looking over your shoulder) and on a safe computer (ie. no one able to check your command history).
+`subkey` deals with **seeds** and **private keys**. Make sure to use `subkey` in a safe environment (ie. no one looking
+over your shoulder) and on a safe computer (ie. no one able to check your command history).
 
-If you save any output of `subkey` into a file, make sure to apply proper permissions and/or delete the file as soon as possible.
+If you save any output of `subkey` into a file, make sure to apply proper permissions and/or delete the file as soon as
+possible.
 
 ## Usage
 
-The following guide explains *some* of the `subkey` commands. For the full list and the most up to date documentation, make sure to check the integrated help with `subkey --help`.
+The following guide explains *some* of the `subkey` commands. For the full list and the most up to date documentation,
+make sure to check the integrated help with `subkey --help`.
 
 ### Install with Cargo
 
-You will need to have the Substrate build dependencies to install Subkey. Use the following two commands to install the dependencies and Subkey, respectively:
+You will need to have the Substrate build dependencies to install Subkey. Use the following two commands to install the
+dependencies and Subkey, respectively:
 
 Command:
 
@@ -58,19 +65,26 @@ Secret phrase `hotel forest jar hover kite book view eight stuff angle legend de
 ---
 ☠️ DO NT RE-USE ANY OF THE SEEDS AND SECRETS FROM THIS PAGE ☠️.
 
-You can read more about security and risks in [SECURITY.md](./SECURITY.md) and in the [Polkadot Wiki](https://wiki.polkadot.network/docs/learn-account-generation).
+You can read more about security and risks in [SECURITY.md](./SECURITY.md) and in the [Polkadot
+Wiki](https://wiki.polkadot.network/docs/learn-account-generation).
 
 ---
 
-The output above shows a **secret phrase** (also called **mnemonic phrase**) and the **secret seed** (also called **Private Key**). Those 2 secrets are the pieces of information you MUST keep safe and secret. All the other information below can be derived from those secrets.
+The output above shows a **secret phrase** (also called **mnemonic phrase**) and the **secret seed** (also called
+**Private Key**). Those 2 secrets are the pieces of information you MUST keep safe and secret. All the other information
+below can be derived from those secrets.
 
-The output above also show the **public key** and the **Account ID**. Those are the independant from the network where you will use the key.
+The output above also show the **public key** and the **Account ID**. Those are the independant from the network where
+you will use the key.
 
-The **SS58 address** (or **Public Address**) of a new account is a reprensentation of the public keys of an account for a given network (for instance Kusama or Polkadot).
+The **SS58 address** (or **Public Address**) of a new account is a reprensentation of the public keys of an account for
+a given network (for instance Kusama or Polkadot).
 
-You can read more about the [SS58 format in the Substrate Docs](https://docs.substrate.io/reference/address-formats/) and see the list of reserved prefixes in the [SS58 Registry](https://github.com/paritytech/ss58-registry).
+You can read more about the [SS58 format in the Substrate Docs](https://docs.substrate.io/reference/address-formats/)
+and see the list of reserved prefixes in the [SS58 Registry](https://github.com/paritytech/ss58-registry).
 
-For instance, considering the previous seed `0xa05c75731970cc7868a2fb7cb577353cd5b31f62dccced92c441acd8fee0c92d` the SS58 addresses are:
+For instance, considering the previous seed `0xa05c75731970cc7868a2fb7cb577353cd5b31f62dccced92c441acd8fee0c92d` the
+SS58 addresses are:
 
 - Polkadot: `16m4J167Mptt8UXL8aGSAi7U2FnPpPxZHPrCgMG9KJzVoFqM`
 - Kusama: `JLNozAv8QeLSbLFwe2UvWeKKE4yvmDbfGxTuiYkF2BUMx4M`
@@ -129,13 +143,17 @@ Secret phrase `soup lyrics media market way crouch elevator put moon useful ques
   SS58 Address:     5He5pZpc7AJ8evPuab37vJF6KkFDqq9uDq2WXh877Qw6iaVC
 ```
 
-Using the `inspect` command (see more details below), we see that knowning only the **secret seed** is no longer sufficient to recover the account:
+Using the `inspect` command (see more details below), we see that knowning only the **secret seed** is no longer
+sufficient to recover the account:
 
 ```bash
 subkey inspect "soup lyrics media market way crouch elevator put moon useful question wide"
 ```
 
-which recovers the account `5Fe4sqj2K4fRuzEGvToi4KATqZfiDU7TqynjXG6PZE2dxwyh` and not `5He5pZpc7AJ8evPuab37vJF6KkFDqq9uDq2WXh877Qw6iaVC` as we expected. The additional user-defined **password** (`extra_secret` in our example) is now required to fully recover the account. Let's inspect the the previous mnemonic, this time passing also the required `password` as shown below:
+which recovers the account `5Fe4sqj2K4fRuzEGvToi4KATqZfiDU7TqynjXG6PZE2dxwyh` and not
+`5He5pZpc7AJ8evPuab37vJF6KkFDqq9uDq2WXh877Qw6iaVC` as we expected. The additional user-defined **password**
+(`extra_secret` in our example) is now required to fully recover the account. Let's inspect the the previous mnemonic,
+this time passing also the required `password` as shown below:
 
 ```bash
 subkey inspect --password extra_secret "soup lyrics media market way crouch elevator put moon useful question wide"
@@ -161,7 +179,8 @@ subkey inspect --public < pubkey | address >
 
 **NOTE**: While you will be able to recover the secret seed from the mnemonic, the opposite is not possible.
 
-**NOTE**: For obvious reasons, the **secrets** cannot be recovered from passing **public data** such as `pubkey` or `address` as input.
+**NOTE**: For obvious reasons, the **secrets** cannot be recovered from passing **public data** such as `pubkey` or
+`address` as input.
 
 command:
 
@@ -181,7 +200,8 @@ Secret Key URI `0xa05c75731970cc7868a2fb7cb577353cd5b31f62dccced92c441acd8fee0c9
 
 ### Signing
 
-`subkey` allows using a **secret key** to sign a random message. The signature can then be verified by anyone using your **public key**:
+`subkey` allows using a **secret key** to sign a random message. The signature can then be verified by anyone using your
+**public key**:
 
 ```bash
 echo -n <msg> | subkey sign --suri <seed|mnemonic>
@@ -201,11 +221,13 @@ output:
 9201af3788ad4f986b800853c79da47155f2e08fde2070d866be4c27ab060466fea0623dc2b51f4392f4c61f25381a62848dd66c5d8217fae3858e469ebd668c
 ```
 
-**NOTE**: Each run of the `sign` command will yield a different output. While each signature is different, they are all valid.
+**NOTE**: Each run of the `sign` command will yield a different output. While each signature is different, they are all
+valid.
 
 ### Verifying a signature
 
-Given a message, a signature and an address, `subkey` can verify whether the **message** has been digitally signed by the holder (or one of the holders) of the **private key** for the given **address**:
+Given a message, a signature and an address, `subkey` can verify whether the **message** has been digitally signed by
+the holder (or one of the holders) of the **private key** for the given **address**:
 
 ```bash
 echo -n <msg> | subkey verify <sig> <address>
@@ -234,7 +256,8 @@ Error: SignatureInvalid
 
 ### Using the vanity generator
 
-You can use the included vanity generator to find a seed that provides an address which includes the desired pattern. Be warned, depending on your hardware this may take a while.
+You can use the included vanity generator to find a seed that provides an address which includes the desired pattern. Be
+warned, depending on your hardware this may take a while.
 
 command:
 
@@ -256,7 +279,9 @@ Secret Key URI `0x8c9a73097f235b84021a446bc2826a00c690ea0be3e0d81a84931cb4146d66
 
 `Bob` now got a nice address starting with their name: 1**bob**YxBPjZWRPbVo35aSwci1u5Zmq8P6J2jpa4kkudBZMqE.
 
-**Note**: While `Bob`, having a short name (3 chars), got a result rather quickly, it will take much longer for `Alice` who has a much longer name, thus the chances to generate a random address that contains the chain `alice` will be much smaller.
+**Note**: While `Bob`, having a short name (3 chars), got a result rather quickly, it will take much longer for `Alice`
+who has a much longer name, thus the chances to generate a random address that contains the chain `alice` will be much
+smaller.
 
 ## License
 
diff --git a/substrate/bin/utils/subkey/SECURITY.md b/substrate/bin/utils/subkey/SECURITY.md
index 672d2965c7eae62b56a1ab6def39aea63bce4c00..698f119c29202120241b164abf06895b6c8ca5fb 100644
--- a/substrate/bin/utils/subkey/SECURITY.md
+++ b/substrate/bin/utils/subkey/SECURITY.md
@@ -1,8 +1,9 @@
 # Keys and Security
 
-The following information is not exhaustive but meant to prevent the most common mistakes.
-You can read more about security and risks in the [Polkadot Wiki](https://wiki.polkadot.network/docs/learn-account-generation).
-The Polkadot network has a few **test networks**, e.g. **Westend**. Test networks are a great way to experiment and learn safely as you can lose tokens on those networks without any financial consequences.
+The following information is not exhaustive but meant to prevent the most common mistakes. You can read more about
+security and risks in the [Polkadot Wiki](https://wiki.polkadot.network/docs/learn-account-generation). The Polkadot
+network has a few **test networks**, e.g. **Westend**. Test networks are a great way to experiment and learn safely as
+you can lose tokens on those networks without any financial consequences.
 
 `subkey` generates and provides 2 pieces of **secret** information:
 - **secret phrase**: a bunch of words, exactly 12 by default (can be 12, 15, 18, 21 or 24)
@@ -10,16 +11,22 @@ The Polkadot network has a few **test networks**, e.g. **Westend**. Test network
 
 There are 2 risks related to private keys:
 - loss of keys: this can happen if you don't have a proper backup
-- leak of the keys: this can unfortunately happen in many ways, including malware, phishing, key logger, backups on system that are online and not properly secured
+- leak of the keys: this can unfortunately happen in many ways, including malware, phishing, key logger, backups on
+  system that are online and not properly secured
 
 You want to ensure that:
 - you **do not lose** those secrets
 - **no one but you can access** those secrets
 
-☠️ **DO NOT SHARE** your mnemonic phrase or secret seed with ANYONE under **ANY** circumstances. Doing so would give them access to your funds and to send transactions on your behalf.
+☠️ **DO NOT SHARE** your mnemonic phrase or secret seed with ANYONE under **ANY** circumstances. Doing so would give
+them access to your funds and to send transactions on your behalf.
 
-☠️ If someone is asking for your **secret** phrase or **secret** seed, you can be **SURE** they are attempting to steal your funds.
+☠️ If someone is asking for your **secret** phrase or **secret** seed, you can be **SURE** they are attempting to steal
+your funds.
 
-✅ It is however fine to share your **SS58 Address** as this is meant to be public information and is needed by anyone you want to be able to make transfer to or otherwise interact with your account. They will only ever need your **Public Address**.
+✅ It is however fine to share your **SS58 Address** as this is meant to be public information and is needed by anyone
+you want to be able to make transfer to or otherwise interact with your account. They will only ever need your **Public
+Address**.
 
-⚠️ While using the same key on multiple networks is possible, it is usually **not** recommended unless you have good motivations for doing so and understand the associated risks and drawbacks.
+⚠️ While using the same key on multiple networks is possible, it is usually **not** recommended unless you have good
+motivations for doing so and understand the associated risks and drawbacks.
diff --git a/substrate/client/allocator/Cargo.toml b/substrate/client/allocator/Cargo.toml
index 4d529fd93b405cd42d16cf4a8c4571c4513a6596..31c714180ce57b0684ebfb7a8e27f7d2b42857ea 100644
--- a/substrate/client/allocator/Cargo.toml
+++ b/substrate/client/allocator/Cargo.toml
@@ -1,11 +1,11 @@
 [package]
 name = "sc-allocator"
 version = "4.1.0-dev"
-authors = ["Parity Technologies <admin@parity.io>"]
-edition = "2021"
+authors.workspace = true
+edition.workspace = true
 license = "Apache-2.0"
 homepage = "https://substrate.io"
-repository = "https://github.com/paritytech/substrate/"
+repository.workspace = true
 description = "Collection of allocator implementations."
 documentation = "https://docs.rs/sc-allocator"
 readme = "README.md"
@@ -15,6 +15,6 @@ targets = ["x86_64-unknown-linux-gnu"]
 
 [dependencies]
 log = "0.4.17"
-thiserror = "1.0.30"
+thiserror = "1.0.48"
 sp-core = { path = "../../primitives/core" }
 sp-wasm-interface = { path = "../../primitives/wasm-interface" }
diff --git a/substrate/client/allocator/README.md b/substrate/client/allocator/README.md
index b89348b4c6950b4375c15f53ab4eef2031171150..e5a94e50f36d54e6a6c6671205e6f669da9826e7 100644
--- a/substrate/client/allocator/README.md
+++ b/substrate/client/allocator/README.md
@@ -3,4 +3,4 @@ Collection of allocator implementations.
 This crate provides the following allocator implementations:
 - A freeing-bump allocator: [`FreeingBumpHeapAllocator`](https://docs.rs/sc-allocator/latest/sc_allocator/struct.FreeingBumpHeapAllocator.html)
 
-License: Apache-2.0
\ No newline at end of file
+License: Apache-2.0
diff --git a/substrate/client/api/Cargo.toml b/substrate/client/api/Cargo.toml
index b4ce9ee2970975a62bd9efcad61c004ec751bae4..2b64c86038dda3ad5a37962c6dfc4a3230f7a4b2 100644
--- a/substrate/client/api/Cargo.toml
+++ b/substrate/client/api/Cargo.toml
@@ -1,11 +1,11 @@
 [package]
 name = "sc-client-api"
 version = "4.0.0-dev"
-authors = ["Parity Technologies <admin@parity.io>"]
-edition = "2021"
+authors.workspace = true
+edition.workspace = true
 license = "GPL-3.0-or-later WITH Classpath-exception-2.0"
 homepage = "https://substrate.io"
-repository = "https://github.com/paritytech/substrate/"
+repository.workspace = true
 description = "Substrate client interfaces."
 documentation = "https://docs.rs/sc-client-api"
 readme = "README.md"
@@ -35,8 +35,9 @@ sp-runtime = { path = "../../primitives/runtime", default-features = false}
 sp-state-machine = { path = "../../primitives/state-machine" }
 sp-statement-store = { path = "../../primitives/statement-store" }
 sp-storage = { path = "../../primitives/storage" }
+sp-trie = { path = "../../primitives/trie" }
 
 [dev-dependencies]
-thiserror = "1.0.30"
+thiserror = "1.0.48"
 sp-test-primitives = { path = "../../primitives/test-primitives" }
 substrate-test-runtime = { path = "../../test-utils/runtime" }
diff --git a/substrate/client/api/README.md b/substrate/client/api/README.md
index 142f5b32dd9a8de7c083aac5260ac6677042c3ad..7f94b1ca5e6912f7c14022f14d7ad6d65b4f6eca 100644
--- a/substrate/client/api/README.md
+++ b/substrate/client/api/README.md
@@ -1,3 +1,3 @@
 Substrate client interfaces.
 
-License: GPL-3.0-or-later WITH Classpath-exception-2.0
\ No newline at end of file
+License: GPL-3.0-or-later WITH Classpath-exception-2.0
diff --git a/substrate/client/api/src/backend.rs b/substrate/client/api/src/backend.rs
index 2d8fdef77cdb9064076c3d38188d72bccedfdf9e..31b100433c7086719737275bfaa6b3931bffc88a 100644
--- a/substrate/client/api/src/backend.rs
+++ b/substrate/client/api/src/backend.rs
@@ -33,6 +33,7 @@ use sp_state_machine::{
 	OffchainChangesCollection, StorageCollection, StorageIterator,
 };
 use sp_storage::{ChildInfo, StorageData, StorageKey};
+pub use sp_trie::MerkleValue;
 
 use crate::{blockchain::Backend as BlockchainBackend, UsageInfo};
 
@@ -470,6 +471,21 @@ pub trait StorageProvider<Block: BlockT, B: Backend<Block>> {
 		child_info: &ChildInfo,
 		key: &StorageKey,
 	) -> sp_blockchain::Result<Option<Block::Hash>>;
+
+	/// Given a block's `Hash` and a key, return the closest merkle value.
+	fn closest_merkle_value(
+		&self,
+		hash: Block::Hash,
+		key: &StorageKey,
+	) -> sp_blockchain::Result<Option<MerkleValue<Block::Hash>>>;
+
+	/// Given a block's `Hash`, a key and a child storage key, return the closest merkle value.
+	fn child_closest_merkle_value(
+		&self,
+		hash: Block::Hash,
+		child_info: &ChildInfo,
+		key: &StorageKey,
+	) -> sp_blockchain::Result<Option<MerkleValue<Block::Hash>>>;
 }
 
 /// Client backend.
diff --git a/substrate/client/api/src/lib.rs b/substrate/client/api/src/lib.rs
index faadf3663a59d88871eb371c472826ddbec6f12f..f614a1e30b48e9c1daccb670a8f873f44b93372c 100644
--- a/substrate/client/api/src/lib.rs
+++ b/substrate/client/api/src/lib.rs
@@ -49,7 +49,6 @@ pub trait UsageProvider<Block: sp_runtime::traits::Block> {
 pub mod utils {
 	use sp_blockchain::{Error, HeaderBackend, HeaderMetadata};
 	use sp_runtime::traits::Block as BlockT;
-	use std::borrow::Borrow;
 
 	/// Returns a function for checking block ancestry, the returned function will
 	/// return `true` if the given hash (second parameter) is a descendent of the
@@ -69,10 +68,8 @@ pub mod utils {
 				return Ok(false)
 			}
 
-			let current = current.as_ref().map(|(c, p)| (c.borrow(), p.borrow()));
-
 			let mut hash = hash;
-			if let Some((current_hash, current_parent_hash)) = current {
+			if let Some((current_hash, current_parent_hash)) = &current {
 				if base == current_hash {
 					return Ok(false)
 				}
diff --git a/substrate/client/authority-discovery/Cargo.toml b/substrate/client/authority-discovery/Cargo.toml
index 2a28f9836d69ddd4680a63ea02aa8624bb1790e4..ef2fdcfd485f1b08539e83c9deb82ba82232d58c 100644
--- a/substrate/client/authority-discovery/Cargo.toml
+++ b/substrate/client/authority-discovery/Cargo.toml
@@ -1,12 +1,12 @@
 [package]
 name = "sc-authority-discovery"
 version = "0.10.0-dev"
-authors = ["Parity Technologies <admin@parity.io>"]
-edition = "2021"
+authors.workspace = true
+edition.workspace = true
 build = "build.rs"
 license = "GPL-3.0-or-later WITH Classpath-exception-2.0"
 homepage = "https://substrate.io"
-repository = "https://github.com/paritytech/substrate/"
+repository.workspace = true
 description = "Substrate authority discovery."
 readme = "README.md"
 
diff --git a/substrate/client/authority-discovery/build.rs b/substrate/client/authority-discovery/build.rs
index 00d45f07ae159c3f15d6ea822d02f6dcd75ef2e0..83076ac8c893736cf9c2e0852d515339f8bde7a5 100644
--- a/substrate/client/authority-discovery/build.rs
+++ b/substrate/client/authority-discovery/build.rs
@@ -1,3 +1,21 @@
+// This file is part of Substrate.
+
+// Copyright (C) Parity Technologies (UK) Ltd.
+// SPDX-License-Identifier: GPL-3.0-or-later WITH Classpath-exception-2.0
+
+// This program 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.
+
+// This program 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 this program. If not, see <https://www.gnu.org/licenses/>.
+
 fn main() {
 	prost_build::compile_protos(
 		&["src/worker/schema/dht-v1.proto", "src/worker/schema/dht-v2.proto"],
diff --git a/substrate/client/basic-authorship/Cargo.toml b/substrate/client/basic-authorship/Cargo.toml
index d8c6cd0f3140083597557e7f84dca65507ff1a7d..b65a591795549115f7f22e4fa9cf409fcf3ecfbd 100644
--- a/substrate/client/basic-authorship/Cargo.toml
+++ b/substrate/client/basic-authorship/Cargo.toml
@@ -1,11 +1,11 @@
 [package]
 name = "sc-basic-authorship"
 version = "0.10.0-dev"
-authors = ["Parity Technologies <admin@parity.io>"]
-edition = "2021"
+authors.workspace = true
+edition.workspace = true
 license = "GPL-3.0-or-later WITH Classpath-exception-2.0"
 homepage = "https://substrate.io"
-repository = "https://github.com/paritytech/substrate/"
+repository.workspace = true
 description = "Basic implementation of block-authoring logic."
 readme = "README.md"
 
diff --git a/substrate/client/basic-authorship/src/basic_authorship.rs b/substrate/client/basic-authorship/src/basic_authorship.rs
index b3a8f0d8970b6148a68abe9abbfa98080a84e4d3..57c2996ab4063143694f3c2b44af93aae74bf775 100644
--- a/substrate/client/basic-authorship/src/basic_authorship.rs
+++ b/substrate/client/basic-authorship/src/basic_authorship.rs
@@ -79,7 +79,7 @@ pub struct ProposerFactory<A, B, C, PR> {
 	/// The soft deadline indicates where we should stop attempting to add transactions
 	/// to the block, which exhaust resources. After soft deadline is reached,
 	/// we switch to a fixed-amount mode, in which after we see `MAX_SKIPPED_TRANSACTIONS`
-	/// transactions which exhaust resrouces, we will conclude that the block is full.
+	/// transactions which exhaust resources, we will conclude that the block is full.
 	soft_deadline_percent: Percent,
 	telemetry: Option<TelemetryHandle>,
 	/// When estimating the block size, should the proof be included?
@@ -642,8 +642,8 @@ mod tests {
 			client.clone(),
 		);
 
-		block_on(txpool.submit_at(&BlockId::number(0), SOURCE, vec![extrinsic(0), extrinsic(1)]))
-			.unwrap();
+		let hashof0 = client.info().genesis_hash;
+		block_on(txpool.submit_at(hashof0, SOURCE, vec![extrinsic(0), extrinsic(1)])).unwrap();
 
 		block_on(
 			txpool.maintain(chain_event(
@@ -658,7 +658,7 @@ mod tests {
 
 		let cell = Mutex::new((false, time::Instant::now()));
 		let proposer = proposer_factory.init_with_now(
-			&client.expect_header(client.info().genesis_hash).unwrap(),
+			&client.expect_header(hashof0).unwrap(),
 			Box::new(move || {
 				let mut value = cell.lock();
 				if !value.0 {
@@ -736,7 +736,7 @@ mod tests {
 
 		let genesis_hash = client.info().best_hash;
 
-		block_on(txpool.submit_at(&BlockId::number(0), SOURCE, vec![extrinsic(0)])).unwrap();
+		block_on(txpool.submit_at(genesis_hash, SOURCE, vec![extrinsic(0)])).unwrap();
 
 		block_on(
 			txpool.maintain(chain_event(
@@ -800,7 +800,7 @@ mod tests {
 		};
 
 		block_on(txpool.submit_at(
-			&BlockId::number(0),
+			client.info().genesis_hash,
 			SOURCE,
 			vec![medium(0), medium(1), huge(2), medium(3), huge(4), medium(5), medium(6)],
 		))
@@ -897,9 +897,8 @@ mod tests {
 			spawner.clone(),
 			client.clone(),
 		);
-		let genesis_header = client
-			.expect_header(client.info().genesis_hash)
-			.expect("there should be header");
+		let genesis_hash = client.info().genesis_hash;
+		let genesis_header = client.expect_header(genesis_hash).expect("there should be header");
 
 		let extrinsics_num = 5;
 		let extrinsics = std::iter::once(
@@ -922,7 +921,7 @@ mod tests {
 				.sum::<usize>() +
 			Vec::<Extrinsic>::new().encoded_size();
 
-		block_on(txpool.submit_at(&BlockId::number(0), SOURCE, extrinsics.clone())).unwrap();
+		block_on(txpool.submit_at(genesis_hash, SOURCE, extrinsics.clone())).unwrap();
 
 		block_on(txpool.maintain(chain_event(genesis_header.clone())));
 
@@ -999,6 +998,7 @@ mod tests {
 			spawner.clone(),
 			client.clone(),
 		);
+		let genesis_hash = client.info().genesis_hash;
 
 		let tiny = |nonce| {
 			ExtrinsicBuilder::new_fill_block(Perbill::from_parts(TINY)).nonce(nonce).build()
@@ -1011,7 +1011,7 @@ mod tests {
 
 		block_on(
 			txpool.submit_at(
-				&BlockId::number(0),
+				genesis_hash,
 				SOURCE,
 				// add 2 * MAX_SKIPPED_TRANSACTIONS that exhaust resources
 				(0..MAX_SKIPPED_TRANSACTIONS * 2)
@@ -1024,13 +1024,9 @@ mod tests {
 		)
 		.unwrap();
 
-		block_on(
-			txpool.maintain(chain_event(
-				client
-					.expect_header(client.info().genesis_hash)
-					.expect("there should be header"),
-			)),
-		);
+		block_on(txpool.maintain(chain_event(
+			client.expect_header(genesis_hash).expect("there should be header"),
+		)));
 		assert_eq!(txpool.ready().count(), MAX_SKIPPED_TRANSACTIONS * 3);
 
 		let mut proposer_factory =
@@ -1038,7 +1034,7 @@ mod tests {
 
 		let cell = Mutex::new(time::Instant::now());
 		let proposer = proposer_factory.init_with_now(
-			&client.expect_header(client.info().genesis_hash).unwrap(),
+			&client.expect_header(genesis_hash).unwrap(),
 			Box::new(move || {
 				let mut value = cell.lock();
 				let old = *value;
@@ -1071,6 +1067,7 @@ mod tests {
 			spawner.clone(),
 			client.clone(),
 		);
+		let genesis_hash = client.info().genesis_hash;
 
 		let tiny = |who| {
 			ExtrinsicBuilder::new_fill_block(Perbill::from_parts(TINY))
@@ -1086,7 +1083,7 @@ mod tests {
 
 		block_on(
 			txpool.submit_at(
-				&BlockId::number(0),
+				genesis_hash,
 				SOURCE,
 				(0..MAX_SKIPPED_TRANSACTIONS + 2)
 					.into_iter()
@@ -1098,13 +1095,9 @@ mod tests {
 		)
 		.unwrap();
 
-		block_on(
-			txpool.maintain(chain_event(
-				client
-					.expect_header(client.info().genesis_hash)
-					.expect("there should be header"),
-			)),
-		);
+		block_on(txpool.maintain(chain_event(
+			client.expect_header(genesis_hash).expect("there should be header"),
+		)));
 		assert_eq!(txpool.ready().count(), MAX_SKIPPED_TRANSACTIONS * 2 + 4);
 
 		let mut proposer_factory =
@@ -1114,7 +1107,7 @@ mod tests {
 		let cell = Arc::new(Mutex::new((0, time::Instant::now())));
 		let cell2 = cell.clone();
 		let proposer = proposer_factory.init_with_now(
-			&client.expect_header(client.info().genesis_hash).unwrap(),
+			&client.expect_header(genesis_hash).unwrap(),
 			Box::new(move || {
 				let mut value = cell.lock();
 				let (called, old) = *value;
diff --git a/substrate/client/block-builder/Cargo.toml b/substrate/client/block-builder/Cargo.toml
index 3a6a0ea184d245c9903763b635e9295fe251bbfe..ff2f9635b7a2fae718d7a47deaa5e6e280ec2091 100644
--- a/substrate/client/block-builder/Cargo.toml
+++ b/substrate/client/block-builder/Cargo.toml
@@ -1,11 +1,11 @@
 [package]
 name = "sc-block-builder"
 version = "0.10.0-dev"
-authors = ["Parity Technologies <admin@parity.io>"]
-edition = "2021"
+authors.workspace = true
+edition.workspace = true
 license = "GPL-3.0-or-later WITH Classpath-exception-2.0"
 homepage = "https://substrate.io"
-repository = "https://github.com/paritytech/substrate/"
+repository.workspace = true
 description = "Substrate block builder"
 readme = "README.md"
 
diff --git a/substrate/client/block-builder/README.md b/substrate/client/block-builder/README.md
index b105d4203362f2bf373a665f083d2169a2cb9801..f255b9a5480b14c5cceaa29e25c7cdb1e58308a9 100644
--- a/substrate/client/block-builder/README.md
+++ b/substrate/client/block-builder/README.md
@@ -6,4 +6,4 @@ This crate provides the [`BlockBuilder`] utility and the corresponding runtime a
 The block builder utility is used in the node as an abstraction over the runtime api to
 initialize a block, to push extrinsics and to finalize a block.
 
-License: GPL-3.0-or-later WITH Classpath-exception-2.0
\ No newline at end of file
+License: GPL-3.0-or-later WITH Classpath-exception-2.0
diff --git a/substrate/client/chain-spec/Cargo.toml b/substrate/client/chain-spec/Cargo.toml
index 32f74f13ab50a5cfc7716ea06c634ab6ce5ff2ee..e326d84ae50c6c6172965160a8ecd203319f3c0a 100644
--- a/substrate/client/chain-spec/Cargo.toml
+++ b/substrate/client/chain-spec/Cargo.toml
@@ -1,11 +1,11 @@
 [package]
 name = "sc-chain-spec"
 version = "4.0.0-dev"
-authors = ["Parity Technologies <admin@parity.io>"]
-edition = "2021"
+authors.workspace = true
+edition.workspace = true
 license = "GPL-3.0-or-later WITH Classpath-exception-2.0"
 homepage = "https://substrate.io"
-repository = "https://github.com/paritytech/substrate/"
+repository.workspace = true
 description = "Substrate chain configurations."
 readme = "README.md"
 
@@ -14,8 +14,8 @@ targets = ["x86_64-unknown-linux-gnu"]
 
 [dependencies]
 memmap2 = "0.5.0"
-serde = { version = "1.0.163", features = ["derive"] }
-serde_json = "1.0.85"
+serde = { version = "1.0.188", features = ["derive"] }
+serde_json = "1.0.107"
 sc-client-api = { path = "../api" }
 sc-chain-spec-derive = { path = "derive" }
 sc-executor = { path = "../executor" }
diff --git a/substrate/client/chain-spec/README.md b/substrate/client/chain-spec/README.md
index 5525affbed81ccf343af1496ac3e384b110a32c1..dad1662d3230ec11b1bafa39fd78bf7d64d1ac5f 100644
--- a/substrate/client/chain-spec/README.md
+++ b/substrate/client/chain-spec/README.md
@@ -89,4 +89,4 @@ pub struct Extension {
 pub type MyChainSpec<G> = GenericChainSpec<G, Extension>;
 ```
 
-License: GPL-3.0-or-later WITH Classpath-exception-2.0
\ No newline at end of file
+License: GPL-3.0-or-later WITH Classpath-exception-2.0
diff --git a/substrate/client/chain-spec/derive/Cargo.toml b/substrate/client/chain-spec/derive/Cargo.toml
index 537f8aee6ab600154557000ce4c857baf63fe76c..74b8b656a4042bdd348cf2997fa3b9ae686fe2cd 100644
--- a/substrate/client/chain-spec/derive/Cargo.toml
+++ b/substrate/client/chain-spec/derive/Cargo.toml
@@ -1,11 +1,11 @@
 [package]
 name = "sc-chain-spec-derive"
 version = "4.0.0-dev"
-authors = ["Parity Technologies <admin@parity.io>"]
-edition = "2021"
+authors.workspace = true
+edition.workspace = true
 license = "GPL-3.0-or-later WITH Classpath-exception-2.0"
 homepage = "https://substrate.io"
-repository = "https://github.com/paritytech/substrate/"
+repository.workspace = true
 description = "Macros to derive chain spec extension traits implementation."
 
 [package.metadata.docs.rs]
@@ -18,4 +18,4 @@ proc-macro = true
 proc-macro-crate = "1.1.3"
 proc-macro2 = "1.0.56"
 quote = "1.0.28"
-syn = "2.0.16"
+syn = "2.0.38"
diff --git a/substrate/client/cli/Cargo.toml b/substrate/client/cli/Cargo.toml
index 00ee962347bc18239edd767af6a4e996f9767011..98928700328fc9837fb6beed721faee473b3f1ba 100644
--- a/substrate/client/cli/Cargo.toml
+++ b/substrate/client/cli/Cargo.toml
@@ -1,12 +1,12 @@
 [package]
 name = "sc-cli"
 version = "0.10.0-dev"
-authors = ["Parity Technologies <admin@parity.io>"]
+authors.workspace = true
 description = "Substrate CLI interface."
-edition = "2021"
+edition.workspace = true
 license = "GPL-3.0-or-later WITH Classpath-exception-2.0"
 homepage = "https://substrate.io"
-repository = "https://github.com/paritytech/substrate/"
+repository.workspace = true
 readme = "README.md"
 
 [package.metadata.docs.rs]
@@ -14,25 +14,26 @@ targets = ["x86_64-unknown-linux-gnu"]
 
 [dependencies]
 array-bytes = "6.1"
-chrono = "0.4.10"
-clap = { version = "4.2.5", features = ["derive", "string"] }
+chrono = "0.4.27"
+clap = { version = "4.4.6", features = ["derive", "string"] }
 fdlimit = "0.2.1"
 futures = "0.3.21"
-libp2p-identity = { version = "0.1.2", features = ["peerid", "ed25519"]}
+libp2p-identity = { version = "0.1.3", features = ["peerid", "ed25519"]}
 log = "0.4.17"
 names = { version = "0.13.0", default-features = false }
 parity-scale-codec = "3.6.1"
 rand = "0.8.5"
 regex = "1.6.0"
 rpassword = "7.0.0"
-serde = "1.0.163"
-serde_json = "1.0.85"
-thiserror = "1.0.30"
+serde = "1.0.188"
+serde_json = "1.0.107"
+thiserror = "1.0.48"
 tiny-bip39 = "1.0.0"
 tokio = { version = "1.22.0", features = ["signal", "rt-multi-thread", "parking_lot"] }
 sc-client-api = { path = "../api" }
 sc-client-db = { path = "../db", default-features = false}
 sc-keystore = { path = "../keystore" }
+sc-mixnet = { path = "../mixnet" }
 sc-network = { path = "../network" }
 sc-service = { path = "../service", default-features = false}
 sc-telemetry = { path = "../telemetry" }
diff --git a/substrate/client/cli/README.adoc b/substrate/client/cli/README.adoc
deleted file mode 100644
index fc58908fdf23d750409fc5ac8ce20fc40b3800e8..0000000000000000000000000000000000000000
--- a/substrate/client/cli/README.adoc
+++ /dev/null
@@ -1,6 +0,0 @@
-
-= Substrate CLI
-
-Substrate CLI library
-
-include::doc/shell-completion.adoc[]
diff --git a/substrate/client/cli/README.md b/substrate/client/cli/README.md
index 2504dbb0c03b5f9525c580622445ac431fe61d6f..aeaee1e12194345b04b61b17b465d47198089b80 100644
--- a/substrate/client/cli/README.md
+++ b/substrate/client/cli/README.md
@@ -1,3 +1,3 @@
 Substrate CLI library.
 
-License: GPL-3.0-or-later WITH Classpath-exception-2.0
\ No newline at end of file
+License: GPL-3.0-or-later WITH Classpath-exception-2.0
diff --git a/substrate/client/cli/src/arg_enums.rs b/substrate/client/cli/src/arg_enums.rs
index 40d86fd97988d23eaa209f6d067422af5ad89850..c55b97675da25d871736d517081280508ce5ed1e 100644
--- a/substrate/client/cli/src/arg_enums.rs
+++ b/substrate/client/cli/src/arg_enums.rs
@@ -38,12 +38,6 @@ pub enum WasmtimeInstantiationStrategy {
 
 	/// Recreate the instance from scratch on every instantiation. Very slow.
 	RecreateInstance,
-
-	/// Legacy instance reuse mechanism. DEPRECATED. Will be removed in the future.
-	///
-	/// Should only be used in case of encountering any issues with the new default
-	/// instantiation strategy.
-	LegacyInstanceReuse,
 }
 
 /// The default [`WasmtimeInstantiationStrategy`].
@@ -92,8 +86,6 @@ pub fn execution_method_from_cli(
 				sc_service::config::WasmtimeInstantiationStrategy::Pooling,
 			WasmtimeInstantiationStrategy::RecreateInstance =>
 				sc_service::config::WasmtimeInstantiationStrategy::RecreateInstance,
-			WasmtimeInstantiationStrategy::LegacyInstanceReuse =>
-				sc_service::config::WasmtimeInstantiationStrategy::LegacyInstanceReuse,
 		},
 	}
 }
@@ -133,7 +125,7 @@ pub enum CryptoScheme {
 	Ed25519,
 	/// Use sr25519.
 	Sr25519,
-	/// Use
+	/// Use ecdsa.
 	Ecdsa,
 }
 
diff --git a/substrate/client/cli/src/commands/inspect_node_key.rs b/substrate/client/cli/src/commands/inspect_node_key.rs
index 19b5a31ca12c046ae112e91d1669f796c29909f5..6cf025a2d115066ed18277e4036a028965e3c32f 100644
--- a/substrate/client/cli/src/commands/inspect_node_key.rs
+++ b/substrate/client/cli/src/commands/inspect_node_key.rs
@@ -85,7 +85,7 @@ mod tests {
 	fn inspect_node_key() {
 		let path = tempfile::tempdir().unwrap().into_path().join("node-id").into_os_string();
 		let path = path.to_str().unwrap();
-		let cmd = GenerateNodeKeyCmd::parse_from(&["generate-node-key", "--file", path.clone()]);
+		let cmd = GenerateNodeKeyCmd::parse_from(&["generate-node-key", "--file", path]);
 
 		assert!(cmd.run().is_ok());
 
diff --git a/substrate/client/cli/src/commands/purge_chain_cmd.rs b/substrate/client/cli/src/commands/purge_chain_cmd.rs
index 2ff3d4b9a04c017095180625a1b3c299ab4bd8b8..6e7b8143a5bb7f2a3e4c12dfc032d617a98cadec 100644
--- a/substrate/client/cli/src/commands/purge_chain_cmd.rs
+++ b/substrate/client/cli/src/commands/purge_chain_cmd.rs
@@ -48,7 +48,7 @@ pub struct PurgeChainCmd {
 impl PurgeChainCmd {
 	/// Run the purge command
 	pub fn run(&self, database_config: DatabaseSource) -> error::Result<()> {
-		let db_path = database_config.path().ok_or_else(|| {
+		let db_path = database_config.path().and_then(|p| p.parent()).ok_or_else(|| {
 			error::Error::Input("Cannot purge custom database implementation".into())
 		})?;
 
diff --git a/substrate/client/cli/src/commands/utils.rs b/substrate/client/cli/src/commands/utils.rs
index ff159909b879c18f6f081021c4e97ed4e8417fdb..fc725f570e5ec2c3011012145bce1d390fa636a9 100644
--- a/substrate/client/cli/src/commands/utils.rs
+++ b/substrate/client/cli/src/commands/utils.rs
@@ -136,7 +136,7 @@ pub fn print_from_uri<Pair>(
 			OutputType::Text => {
 				println!(
 					"Secret Key URI `{}` is account:\n  \
-					Network ID:        {} \n \
+					Network ID:        {}\n  \
 					Secret seed:       {}\n  \
 					Public key (hex):  {}\n  \
 					Account ID:        {}\n  \
diff --git a/substrate/client/cli/src/params/keystore_params.rs b/substrate/client/cli/src/params/keystore_params.rs
index a2fdd6b2218c4b2dcadb03a6ca179d00a59868e2..87210c3390cae3ee3860398ce74f041465f76caf 100644
--- a/substrate/client/cli/src/params/keystore_params.rs
+++ b/substrate/client/cli/src/params/keystore_params.rs
@@ -31,10 +31,6 @@ const DEFAULT_KEYSTORE_CONFIG_PATH: &str = "keystore";
 /// Parameters of the keystore
 #[derive(Debug, Clone, Args)]
 pub struct KeystoreParams {
-	/// Specify custom URIs to connect to for keystore-services
-	#[arg(long)]
-	pub keystore_uri: Option<String>,
-
 	/// Specify custom keystore path.
 	#[arg(long, value_name = "PATH")]
 	pub keystore_path: Option<PathBuf>,
diff --git a/substrate/client/cli/src/params/mixnet_params.rs b/substrate/client/cli/src/params/mixnet_params.rs
new file mode 100644
index 0000000000000000000000000000000000000000..4758a84ec458d6c508d2fe01cec119c6eddcf189
--- /dev/null
+++ b/substrate/client/cli/src/params/mixnet_params.rs
@@ -0,0 +1,67 @@
+// This file is part of Substrate.
+
+// Copyright (C) Parity Technologies (UK) Ltd.
+// SPDX-License-Identifier: GPL-3.0-or-later WITH Classpath-exception-2.0
+
+// This program 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.
+
+// This program 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 this program. If not, see <https://www.gnu.org/licenses/>.
+
+use clap::Args;
+use sp_core::H256;
+use std::str::FromStr;
+
+fn parse_kx_secret(s: &str) -> Result<sc_mixnet::KxSecret, String> {
+	H256::from_str(s).map(H256::to_fixed_bytes).map_err(|err| err.to_string())
+}
+
+/// Parameters used to create the mixnet configuration.
+#[derive(Debug, Clone, Args)]
+pub struct MixnetParams {
+	/// Enable the mixnet service.
+	///
+	/// This will make the mixnet RPC methods available. If the node is running as a validator, it
+	/// will also attempt to register and operate as a mixnode.
+	#[arg(long)]
+	pub mixnet: bool,
+
+	/// The mixnet key-exchange secret to use in session 0.
+	///
+	/// Should be 64 hex characters, giving a 32-byte secret.
+	///
+	/// WARNING: Secrets provided as command-line arguments are easily exposed. Use of this option
+	/// should be limited to development and testing.
+	#[arg(long, value_name = "SECRET", value_parser = parse_kx_secret)]
+	pub mixnet_session_0_kx_secret: Option<sc_mixnet::KxSecret>,
+}
+
+impl MixnetParams {
+	/// Returns the mixnet configuration, or `None` if the mixnet is disabled.
+	pub fn config(&self, is_authority: bool) -> Option<sc_mixnet::Config> {
+		self.mixnet.then(|| {
+			let mut config = sc_mixnet::Config {
+				core: sc_mixnet::CoreConfig {
+					session_0_kx_secret: self.mixnet_session_0_kx_secret,
+					..Default::default()
+				},
+				..Default::default()
+			};
+			if !is_authority {
+				// Only authorities can be mixnodes; don't attempt to register
+				config.substrate.register = false;
+				// Only mixnodes need to allow connections from non-mixnodes
+				config.substrate.num_gateway_slots = 0;
+			}
+			config
+		})
+	}
+}
diff --git a/substrate/client/cli/src/params/mod.rs b/substrate/client/cli/src/params/mod.rs
index a73bd8844fec4200e44fb8fb3cd42bf3d9f5eabf..f07223ec6a73ea93b2b1ae6b76238ed9a45aab50 100644
--- a/substrate/client/cli/src/params/mod.rs
+++ b/substrate/client/cli/src/params/mod.rs
@@ -19,6 +19,7 @@ mod database_params;
 mod import_params;
 mod keystore_params;
 mod message_params;
+mod mixnet_params;
 mod network_params;
 mod node_key_params;
 mod offchain_worker_params;
@@ -39,9 +40,10 @@ use sp_runtime::{
 use std::{fmt::Debug, str::FromStr};
 
 pub use crate::params::{
-	database_params::*, import_params::*, keystore_params::*, message_params::*, network_params::*,
-	node_key_params::*, offchain_worker_params::*, prometheus_params::*, pruning_params::*,
-	runtime_params::*, shared_params::*, telemetry_params::*, transaction_pool_params::*,
+	database_params::*, import_params::*, keystore_params::*, message_params::*, mixnet_params::*,
+	network_params::*, node_key_params::*, offchain_worker_params::*, prometheus_params::*,
+	pruning_params::*, runtime_params::*, shared_params::*, telemetry_params::*,
+	transaction_pool_params::*,
 };
 
 /// Parse Ss58AddressFormat
diff --git a/substrate/client/consensus/aura/Cargo.toml b/substrate/client/consensus/aura/Cargo.toml
index 49fd61c2d15681f989f7aa85c4801a789feeecb7..bc9648f683a880afe7eded0a079efdbcafcd5cc3 100644
--- a/substrate/client/consensus/aura/Cargo.toml
+++ b/substrate/client/consensus/aura/Cargo.toml
@@ -1,12 +1,12 @@
 [package]
 name = "sc-consensus-aura"
 version = "0.10.0-dev"
-authors = ["Parity Technologies <admin@parity.io>"]
+authors.workspace = true
 description = "Aura consensus algorithm for substrate"
-edition = "2021"
+edition.workspace = true
 license = "GPL-3.0-or-later WITH Classpath-exception-2.0"
 homepage = "https://substrate.io"
-repository = "https://github.com/paritytech/substrate/"
+repository.workspace = true
 readme = "README.md"
 
 [package.metadata.docs.rs]
diff --git a/substrate/client/consensus/aura/README.md b/substrate/client/consensus/aura/README.md
index 85d82cd7dfd3b4e392c8210c40a32a6e57508413..cefa5f6c7d9d95e29cd3e62a7952dfda088d536f 100644
--- a/substrate/client/consensus/aura/README.md
+++ b/substrate/client/consensus/aura/README.md
@@ -1,4 +1,4 @@
-Aura (Authority-round) consensus in substrate.
+Aura (Authority-round) consensus in Substrate.
 
 Aura works by having a list of authorities A who are expected to roughly
 agree on the current time. Time is divided up into discrete slots of t
@@ -12,4 +12,4 @@ far in the future they are.
 
 NOTE: Aura itself is designed to be generic over the crypto used.
 
-License: GPL-3.0-or-later WITH Classpath-exception-2.0
\ No newline at end of file
+License: GPL-3.0-or-later WITH Classpath-exception-2.0
diff --git a/substrate/client/consensus/aura/src/lib.rs b/substrate/client/consensus/aura/src/lib.rs
index a77f00d08d3e0ae663d7ab3dbdf61f821209f751..2ed451ef663ed87b6c61efbd6e1714118e0235ac 100644
--- a/substrate/client/consensus/aura/src/lib.rs
+++ b/substrate/client/consensus/aura/src/lib.rs
@@ -371,7 +371,7 @@ where
 	}
 
 	async fn claim_slot(
-		&self,
+		&mut self,
 		_header: &B::Header,
 		slot: Slot,
 		authorities: &Self::AuxData,
@@ -790,7 +790,7 @@ mod tests {
 		let client = peer.client().as_client();
 		let environ = DummyFactory(client.clone());
 
-		let worker = AuraWorker {
+		let mut worker = AuraWorker {
 			client: client.clone(),
 			block_import: client,
 			env: environ,
diff --git a/substrate/client/consensus/babe/Cargo.toml b/substrate/client/consensus/babe/Cargo.toml
index 81477cfc99afd600c250a5ac748fce1859a6b16f..c8cff0981b36f89e0b6f9120f4c6378f7c6793e7 100644
--- a/substrate/client/consensus/babe/Cargo.toml
+++ b/substrate/client/consensus/babe/Cargo.toml
@@ -1,12 +1,12 @@
 [package]
 name = "sc-consensus-babe"
 version = "0.10.0-dev"
-authors = ["Parity Technologies <admin@parity.io>"]
+authors.workspace = true
 description = "BABE consensus algorithm for substrate"
-edition = "2021"
+edition.workspace = true
 license = "GPL-3.0-or-later WITH Classpath-exception-2.0"
 homepage = "https://substrate.io"
-repository = "https://github.com/paritytech/substrate/"
+repository.workspace = true
 documentation = "https://docs.rs/sc-consensus-babe"
 readme = "README.md"
 
@@ -15,7 +15,6 @@ targets = ["x86_64-unknown-linux-gnu"]
 
 [dependencies]
 async-trait = "0.1.57"
-scale-info = { version = "2.5.0", features = ["derive"] }
 codec = { package = "parity-scale-codec", version = "3.6.1", features = ["derive"] }
 futures = "0.3.21"
 log = "0.4.17"
@@ -45,10 +44,8 @@ sp-keystore = { path = "../../../primitives/keystore" }
 sp-runtime = { path = "../../../primitives/runtime" }
 
 [dev-dependencies]
-rand_chacha = "0.2.2"
 sc-block-builder = { path = "../../block-builder" }
 sp-keyring = { path = "../../../primitives/keyring" }
-sc-network = { path = "../../network" }
 sc-network-test = { path = "../../network/test" }
 sp-timestamp = { path = "../../../primitives/timestamp" }
 sp-tracing = { path = "../../../primitives/tracing" }
diff --git a/substrate/client/consensus/babe/README.md b/substrate/client/consensus/babe/README.md
index a404d2ea447064e083d05aac59752a8c41d97096..a3cf944b513b80eb96493342b821147bfc905592 100644
--- a/substrate/client/consensus/babe/README.md
+++ b/substrate/client/consensus/babe/README.md
@@ -45,4 +45,4 @@ blocks) and will go with the longest one in case of a tie.
 An in-depth description and analysis of the protocol can be found here:
 <https://research.web3.foundation/en/latest/polkadot/block-production/Babe.html>
 
-License: GPL-3.0-or-later WITH Classpath-exception-2.0
\ No newline at end of file
+License: GPL-3.0-or-later WITH Classpath-exception-2.0
diff --git a/substrate/client/consensus/babe/rpc/Cargo.toml b/substrate/client/consensus/babe/rpc/Cargo.toml
index a16ec11e0b8c92abccfc4bc8200f246d2e25d83b..f54edb296842ddf9b9f4390aa8e307c0bef69398 100644
--- a/substrate/client/consensus/babe/rpc/Cargo.toml
+++ b/substrate/client/consensus/babe/rpc/Cargo.toml
@@ -1,12 +1,12 @@
 [package]
 name = "sc-consensus-babe-rpc"
 version = "0.10.0-dev"
-authors = ["Parity Technologies <admin@parity.io>"]
+authors.workspace = true
 description = "RPC extensions for the BABE consensus algorithm"
-edition = "2021"
+edition.workspace = true
 license = "GPL-3.0-or-later WITH Classpath-exception-2.0"
 homepage = "https://substrate.io"
-repository = "https://github.com/paritytech/substrate/"
+repository.workspace = true
 readme = "README.md"
 
 [package.metadata.docs.rs]
@@ -15,7 +15,7 @@ targets = ["x86_64-unknown-linux-gnu"]
 [dependencies]
 jsonrpsee = { version = "0.16.2", features = ["client-core", "server", "macros"] }
 futures = "0.3.21"
-serde = { version = "1.0.163", features = ["derive"] }
+serde = { version = "1.0.188", features = ["derive"] }
 thiserror = "1.0"
 sc-consensus-babe = { path = ".." }
 sc-consensus-epochs = { path = "../../epochs" }
@@ -30,7 +30,7 @@ sp-keystore = { path = "../../../../primitives/keystore" }
 sp-runtime = { path = "../../../../primitives/runtime" }
 
 [dev-dependencies]
-serde_json = "1.0.85"
+serde_json = "1.0.107"
 tokio = "1.22.0"
 sc-consensus = { path = "../../common" }
 sc-keystore = { path = "../../../keystore" }
diff --git a/substrate/client/consensus/babe/rpc/README.md b/substrate/client/consensus/babe/rpc/README.md
index e76dd3dc67f81d3b789e718acbb8cb8b0e755cec..e1a366204cd0112d33a7b69a0fed4b81af9b7b57 100644
--- a/substrate/client/consensus/babe/rpc/README.md
+++ b/substrate/client/consensus/babe/rpc/README.md
@@ -1,3 +1,3 @@
 RPC api for babe.
 
-License: GPL-3.0-or-later WITH Classpath-exception-2.0
\ No newline at end of file
+License: GPL-3.0-or-later WITH Classpath-exception-2.0
diff --git a/substrate/client/consensus/babe/src/authorship.rs b/substrate/client/consensus/babe/src/authorship.rs
index 758d5321a94c5b1c4cdaca6855a5739370ec012d..3580caba746141a8a9faf9e73216cb8903667acf 100644
--- a/substrate/client/consensus/babe/src/authorship.rs
+++ b/substrate/client/consensus/babe/src/authorship.rs
@@ -132,23 +132,22 @@ fn claim_secondary_slot(
 	keystore: &KeystorePtr,
 	author_secondary_vrf: bool,
 ) -> Option<(PreDigest, AuthorityId)> {
-	let Epoch { authorities, randomness, mut epoch_index, .. } = epoch;
-
-	if authorities.is_empty() {
+	if epoch.authorities.is_empty() {
 		return None
 	}
 
+	let mut epoch_index = epoch.epoch_index;
 	if epoch.end_slot() <= slot {
 		// Slot doesn't strictly belong to the epoch, create a clone with fixed values.
 		epoch_index = epoch.clone_for_slot(slot).epoch_index;
 	}
 
-	let expected_author = secondary_slot_author(slot, authorities, *randomness)?;
+	let expected_author = secondary_slot_author(slot, &epoch.authorities, epoch.randomness)?;
 
 	for (authority_id, authority_index) in keys {
 		if authority_id == expected_author {
 			let pre_digest = if author_secondary_vrf {
-				let data = make_vrf_sign_data(randomness, slot, epoch_index);
+				let data = make_vrf_sign_data(&epoch.randomness, slot, epoch_index);
 				let result =
 					keystore.sr25519_vrf_sign(AuthorityId::ID, authority_id.as_ref(), &data);
 				if let Ok(Some(vrf_signature)) = result {
@@ -232,19 +231,18 @@ fn claim_primary_slot(
 	keystore: &KeystorePtr,
 	keys: &[(AuthorityId, usize)],
 ) -> Option<(PreDigest, AuthorityId)> {
-	let Epoch { authorities, randomness, mut epoch_index, .. } = epoch;
-
+	let mut epoch_index = epoch.epoch_index;
 	if epoch.end_slot() <= slot {
 		// Slot doesn't strictly belong to the epoch, create a clone with fixed values.
 		epoch_index = epoch.clone_for_slot(slot).epoch_index;
 	}
 
-	let data = make_vrf_sign_data(randomness, slot, epoch_index);
+	let data = make_vrf_sign_data(&epoch.randomness, slot, epoch_index);
 
 	for (authority_id, authority_index) in keys {
 		let result = keystore.sr25519_vrf_sign(AuthorityId::ID, authority_id.as_ref(), &data);
 		if let Ok(Some(vrf_signature)) = result {
-			let threshold = calculate_primary_threshold(c, authorities, *authority_index);
+			let threshold = calculate_primary_threshold(c, &epoch.authorities, *authority_index);
 
 			let can_claim = authority_id
 				.as_inner_ref()
@@ -274,7 +272,7 @@ fn claim_primary_slot(
 #[cfg(test)]
 mod tests {
 	use super::*;
-	use sp_consensus_babe::{AllowedSlots, AuthorityId, BabeEpochConfiguration};
+	use sp_consensus_babe::{AllowedSlots, AuthorityId, BabeEpochConfiguration, Epoch};
 	use sp_core::{crypto::Pair as _, sr25519::Pair};
 	use sp_keystore::testing::MemoryKeystore;
 
@@ -300,7 +298,8 @@ mod tests {
 				c: (3, 10),
 				allowed_slots: AllowedSlots::PrimaryAndSecondaryPlainSlots,
 			},
-		};
+		}
+		.into();
 
 		assert!(claim_slot(10.into(), &epoch, &keystore).is_none());
 
diff --git a/substrate/client/consensus/babe/src/lib.rs b/substrate/client/consensus/babe/src/lib.rs
index b89fa8f5df65e02807c59fde7a5e899ba97f44f8..ccf72939631accae68c9e473cf30461c2fca65dc 100644
--- a/substrate/client/consensus/babe/src/lib.rs
+++ b/substrate/client/consensus/babe/src/lib.rs
@@ -69,6 +69,7 @@
 use std::{
 	collections::HashSet,
 	future::Future,
+	ops::{Deref, DerefMut},
 	pin::Pin,
 	sync::Arc,
 	task::{Context, Poll},
@@ -156,20 +157,27 @@ const AUTHORING_SCORE_VRF_CONTEXT: &[u8] = b"substrate-babe-vrf";
 const AUTHORING_SCORE_LENGTH: usize = 16;
 
 /// BABE epoch information
-#[derive(Decode, Encode, PartialEq, Eq, Clone, Debug, scale_info::TypeInfo)]
-pub struct Epoch {
-	/// The epoch index.
-	pub epoch_index: u64,
-	/// The starting slot of the epoch.
-	pub start_slot: Slot,
-	/// The duration of this epoch.
-	pub duration: u64,
-	/// The authorities and their weights.
-	pub authorities: Vec<(AuthorityId, BabeAuthorityWeight)>,
-	/// Randomness for this epoch.
-	pub randomness: Randomness,
-	/// Configuration of the epoch.
-	pub config: BabeEpochConfiguration,
+#[derive(Clone, Debug, PartialEq, Eq, Encode, Decode)]
+pub struct Epoch(sp_consensus_babe::Epoch);
+
+impl Deref for Epoch {
+	type Target = sp_consensus_babe::Epoch;
+
+	fn deref(&self) -> &Self::Target {
+		&self.0
+	}
+}
+
+impl DerefMut for Epoch {
+	fn deref_mut(&mut self) -> &mut Self::Target {
+		&mut self.0
+	}
+}
+
+impl From<sp_consensus_babe::Epoch> for Epoch {
+	fn from(epoch: sp_consensus_babe::Epoch) -> Self {
+		Epoch(epoch)
+	}
 }
 
 impl EpochT for Epoch {
@@ -180,7 +188,7 @@ impl EpochT for Epoch {
 		&self,
 		(descriptor, config): (NextEpochDescriptor, BabeEpochConfiguration),
 	) -> Epoch {
-		Epoch {
+		sp_consensus_babe::Epoch {
 			epoch_index: self.epoch_index + 1,
 			start_slot: self.start_slot + self.duration,
 			duration: self.duration,
@@ -188,6 +196,7 @@ impl EpochT for Epoch {
 			randomness: descriptor.randomness,
 			config,
 		}
+		.into()
 	}
 
 	fn start_slot(&self) -> Slot {
@@ -199,25 +208,12 @@ impl EpochT for Epoch {
 	}
 }
 
-impl From<sp_consensus_babe::Epoch> for Epoch {
-	fn from(epoch: sp_consensus_babe::Epoch) -> Self {
-		Epoch {
-			epoch_index: epoch.epoch_index,
-			start_slot: epoch.start_slot,
-			duration: epoch.duration,
-			authorities: epoch.authorities,
-			randomness: epoch.randomness,
-			config: epoch.config,
-		}
-	}
-}
-
 impl Epoch {
 	/// Create the genesis epoch (epoch #0).
 	///
 	/// This is defined to start at the slot of the first block, so that has to be provided.
 	pub fn genesis(genesis_config: &BabeConfiguration, slot: Slot) -> Epoch {
-		Epoch {
+		sp_consensus_babe::Epoch {
 			epoch_index: 0,
 			start_slot: slot,
 			duration: genesis_config.epoch_length,
@@ -228,6 +224,7 @@ impl Epoch {
 				allowed_slots: genesis_config.allowed_slots,
 			},
 		}
+		.into()
 	}
 
 	/// Clone and tweak epoch information to refer to the specified slot.
@@ -723,12 +720,12 @@ where
 	B: BlockT,
 	C: ProvideRuntimeApi<B> + HeaderBackend<B> + HeaderMetadata<B, Error = ClientError>,
 	C::Api: BabeApi<B>,
-	E: Environment<B, Error = Error> + Sync,
+	E: Environment<B, Error = Error> + Send + Sync,
 	E::Proposer: Proposer<B, Error = Error>,
 	I: BlockImport<B> + Send + Sync + 'static,
 	SO: SyncOracle + Send + Clone + Sync,
 	L: sc_consensus::JustificationSyncLink<B>,
-	BS: BackoffAuthoringBlocksStrategy<NumberFor<B>> + Sync,
+	BS: BackoffAuthoringBlocksStrategy<NumberFor<B>> + Send + Sync,
 	Error: std::error::Error + Send + From<ConsensusError> + From<I::Error> + 'static,
 {
 	type Claim = (PreDigest, AuthorityId);
@@ -769,7 +766,7 @@ where
 	}
 
 	async fn claim_slot(
-		&self,
+		&mut self,
 		_parent_header: &B::Header,
 		slot: Slot,
 		epoch_descriptor: &ViableEpochDescriptor<B::Hash, NumberFor<B>, Epoch>,
diff --git a/substrate/client/consensus/babe/src/migration.rs b/substrate/client/consensus/babe/src/migration.rs
index 2b1396c41c268476c2dadc69c8051a04112b5d16..bec2d0a61f4b6d4f55236f69042bd764629b5f92 100644
--- a/substrate/client/consensus/babe/src/migration.rs
+++ b/substrate/client/consensus/babe/src/migration.rs
@@ -62,10 +62,11 @@ impl EpochT for EpochV0 {
 	}
 }
 
+// Implement From<EpochV0> for Epoch
 impl EpochV0 {
 	/// Migrate the sturct to current epoch version.
 	pub fn migrate(self, config: &BabeConfiguration) -> Epoch {
-		Epoch {
+		sp_consensus_babe::Epoch {
 			epoch_index: self.epoch_index,
 			start_slot: self.start_slot,
 			duration: self.duration,
@@ -73,5 +74,6 @@ impl EpochV0 {
 			randomness: self.randomness,
 			config: BabeEpochConfiguration { c: config.c, allowed_slots: config.allowed_slots },
 		}
+		.into()
 	}
 }
diff --git a/substrate/client/consensus/babe/src/tests.rs b/substrate/client/consensus/babe/src/tests.rs
index b3843f8acfa0a481ed456f13bdce5a7fb54173b4..02882d8baaeda2d8cf8ed2fdf2682c31989d1ab3 100644
--- a/substrate/client/consensus/babe/src/tests.rs
+++ b/substrate/client/consensus/babe/src/tests.rs
@@ -501,7 +501,7 @@ fn claim_epoch_slots() {
 	let authority = Sr25519Keyring::Alice;
 	let keystore = create_keystore(authority);
 
-	let mut epoch = Epoch {
+	let mut epoch: Epoch = sp_consensus_babe::Epoch {
 		start_slot: 0.into(),
 		authorities: vec![(authority.public().into(), 1)],
 		randomness: [0; 32],
@@ -511,7 +511,8 @@ fn claim_epoch_slots() {
 			c: (3, 10),
 			allowed_slots: AllowedSlots::PrimaryAndSecondaryPlainSlots,
 		},
-	};
+	}
+	.into();
 
 	let claim_slot_wrap = |s, e| match claim_slot(Slot::from(s as u64), &e, &keystore) {
 		None => 0,
@@ -551,7 +552,7 @@ fn claim_vrf_check() {
 
 	let public = authority.public();
 
-	let epoch = Epoch {
+	let epoch: Epoch = sp_consensus_babe::Epoch {
 		start_slot: 0.into(),
 		authorities: vec![(public.into(), 1)],
 		randomness: [0; 32],
@@ -561,7 +562,8 @@ fn claim_vrf_check() {
 			c: (3, 10),
 			allowed_slots: AllowedSlots::PrimaryAndSecondaryVRFSlots,
 		},
-	};
+	}
+	.into();
 
 	// We leverage the predictability of claim types given a constant randomness.
 
diff --git a/substrate/client/consensus/beefy/Cargo.toml b/substrate/client/consensus/beefy/Cargo.toml
index d76abc61f6d0f85d02cce17915857d7b1b770158..aae5a44d7fa26da98d90b02d1dcb9dbd22faae06 100644
--- a/substrate/client/consensus/beefy/Cargo.toml
+++ b/substrate/client/consensus/beefy/Cargo.toml
@@ -1,10 +1,10 @@
 [package]
 name = "sc-consensus-beefy"
 version = "4.0.0-dev"
-authors = ["Parity Technologies <admin@parity.io>"]
-edition = "2021"
+authors.workspace = true
+edition.workspace = true
 license = "GPL-3.0-or-later WITH Classpath-exception-2.0"
-repository = "https://github.com/paritytech/substrate"
+repository.workspace = true
 description = "BEEFY Client gadget for substrate"
 homepage = "https://substrate.io"
 
@@ -38,7 +38,7 @@ sp-mmr-primitives = { path = "../../../primitives/merkle-mountain-range" }
 sp-runtime = { path = "../../../primitives/runtime" }
 
 [dev-dependencies]
-serde = "1.0.163"
+serde = "1.0.188"
 tempfile = "3.1.0"
 tokio = "1.22.0"
 sc-block-builder = { path = "../../block-builder" }
diff --git a/substrate/client/consensus/beefy/README.md b/substrate/client/consensus/beefy/README.md
index d9099dc7c661df409b0240356273bed5f30879ea..1a5a9667fdbb74d9dbd872629b19974ed6b08497 100644
--- a/substrate/client/consensus/beefy/README.md
+++ b/substrate/client/consensus/beefy/README.md
@@ -159,7 +159,7 @@ ambiguity despite using block number instead of a hash. A collection of **votes*
 a Commitment and a collection of signatures is going to be called **Signed Commitment**. A valid
 (see later for the rules) Signed Commitment is also called a **BEEFY Justification** or
 **BEEFY Finality Proof**. For more details on the actual data structures please see
-[BEEFY primitives definitions](https://github.com/paritytech/substrate/tree/master/primitives/beefy/src).
+[BEEFY primitives definitions](https://github.com/paritytech/polkadot-sdk/tree/master/substrate/primitives/beefy/src).
 
 A **round** is an attempt by BEEFY validators to produce a BEEFY Justification. **Round number**
 is simply defined as a block number the validators are voting for, or to be more precise, the
diff --git a/substrate/client/consensus/beefy/rpc/Cargo.toml b/substrate/client/consensus/beefy/rpc/Cargo.toml
index e814f3487b409d8c8290e52e0b2e5aba42543c1b..74733ea9edd9d274a9578248f607b68fe1aacee4 100644
--- a/substrate/client/consensus/beefy/rpc/Cargo.toml
+++ b/substrate/client/consensus/beefy/rpc/Cargo.toml
@@ -1,10 +1,10 @@
 [package]
 name = "sc-consensus-beefy-rpc"
 version = "4.0.0-dev"
-authors = ["Parity Technologies <admin@parity.io>"]
-edition = "2021"
+authors.workspace = true
+edition.workspace = true
 license = "GPL-3.0-or-later WITH Classpath-exception-2.0"
-repository = "https://github.com/paritytech/substrate"
+repository.workspace = true
 description = "RPC for the BEEFY Client gadget for substrate"
 homepage = "https://substrate.io"
 
@@ -14,7 +14,7 @@ futures = "0.3.21"
 jsonrpsee = { version = "0.16.2", features = ["client-core", "server", "macros"] }
 log = "0.4"
 parking_lot = "0.12.1"
-serde = { version = "1.0.163", features = ["derive"] }
+serde = { version = "1.0.188", features = ["derive"] }
 thiserror = "1.0"
 sc-consensus-beefy = { path = ".." }
 sp-consensus-beefy = { path = "../../../../primitives/consensus/beefy" }
@@ -23,7 +23,7 @@ sp-core = { path = "../../../../primitives/core" }
 sp-runtime = { path = "../../../../primitives/runtime" }
 
 [dev-dependencies]
-serde_json = "1.0.85"
+serde_json = "1.0.107"
 sc-rpc = { path = "../../../rpc", features = ["test-helpers"]}
 substrate-test-runtime-client = { path = "../../../../test-utils/runtime/client" }
 tokio = { version = "1.22.0", features = ["macros"] }
diff --git a/substrate/client/consensus/beefy/src/communication/gossip.rs b/substrate/client/consensus/beefy/src/communication/gossip.rs
index 8c025ca0676197203035d652646a727e89354085..342cd0511a511bc0fc520c438fc23abbbd3a9897 100644
--- a/substrate/client/consensus/beefy/src/communication/gossip.rs
+++ b/substrate/client/consensus/beefy/src/communication/gossip.rs
@@ -16,11 +16,10 @@
 // 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 std::{collections::BTreeMap, sync::Arc, time::Duration};
+use std::{collections::BTreeSet, sync::Arc, time::Duration};
 
 use sc_network::{PeerId, ReputationChange};
 use sc_network_gossip::{MessageIntent, ValidationResult, Validator, ValidatorContext};
-use sp_core::hashing::twox_64;
 use sp_runtime::traits::{Block, Hash, Header, NumberFor};
 
 use codec::{Decode, DecodeAll, Encode};
@@ -115,9 +114,6 @@ where
 	<<B::Header as Header>::Hashing as Hash>::hash(b"beefy-justifications")
 }
 
-/// A type that represents hash of the message.
-pub type MessageHash = [u8; 8];
-
 #[derive(Clone, Debug)]
 pub(crate) struct GossipFilterCfg<'a, B: Block> {
 	pub start: NumberFor<B>,
@@ -133,18 +129,21 @@ struct FilterInner<B: Block> {
 }
 
 struct Filter<B: Block> {
+	// specifies live rounds
 	inner: Option<FilterInner<B>>,
-	live_votes: BTreeMap<NumberFor<B>, fnv::FnvHashSet<MessageHash>>,
+	// cache of seen valid justifications in active rounds
+	rounds_with_valid_proofs: BTreeSet<NumberFor<B>>,
 }
 
 impl<B: Block> Filter<B> {
 	pub fn new() -> Self {
-		Self { inner: None, live_votes: BTreeMap::new() }
+		Self { inner: None, rounds_with_valid_proofs: BTreeSet::new() }
 	}
 
 	/// Update filter to new `start` and `set_id`.
 	fn update(&mut self, cfg: GossipFilterCfg<B>) {
-		self.live_votes.retain(|&round, _| round >= cfg.start && round <= cfg.end);
+		self.rounds_with_valid_proofs
+			.retain(|&round| round >= cfg.start && round <= cfg.end);
 		// only clone+overwrite big validator_set if set_id changed
 		match self.inner.as_mut() {
 			Some(f) if f.validator_set.id() == cfg.validator_set.id() => {
@@ -203,14 +202,14 @@ impl<B: Block> Filter<B> {
 			.unwrap_or(Consider::RejectOutOfScope)
 	}
 
-	/// Add new _known_ `hash` to the round's known votes.
-	fn add_known_vote(&mut self, round: NumberFor<B>, hash: MessageHash) {
-		self.live_votes.entry(round).or_default().insert(hash);
+	/// Add new _known_ `round` to the set of seen valid justifications.
+	fn mark_round_as_proven(&mut self, round: NumberFor<B>) {
+		self.rounds_with_valid_proofs.insert(round);
 	}
 
-	/// Check if `hash` is already part of round's known votes.
-	fn is_known_vote(&self, round: NumberFor<B>, hash: &MessageHash) -> bool {
-		self.live_votes.get(&round).map(|known| known.contains(hash)).unwrap_or(false)
+	/// Check if `round` is already part of seen valid justifications.
+	fn is_already_proven(&self, round: NumberFor<B>) -> bool {
+		self.rounds_with_valid_proofs.contains(&round)
 	}
 
 	fn validator_set(&self) -> Option<&ValidatorSet<AuthorityId>> {
@@ -273,16 +272,13 @@ where
 		&self,
 		vote: VoteMessage<NumberFor<B>, AuthorityId, Signature>,
 		sender: &PeerId,
-		data: &[u8],
 	) -> Action<B::Hash> {
-		let msg_hash = twox_64(data);
 		let round = vote.commitment.block_number;
 		let set_id = vote.commitment.validator_set_id;
 		self.known_peers.lock().note_vote_for(*sender, round);
 
 		// Verify general usefulness of the message.
-		// We are going to discard old votes right away (without verification)
-		// Also we keep track of already received votes to avoid verifying duplicates.
+		// We are going to discard old votes right away (without verification).
 		{
 			let filter = self.gossip_filter.read();
 
@@ -293,10 +289,6 @@ where
 				Consider::Accept => {},
 			}
 
-			if filter.is_known_vote(round, &msg_hash) {
-				return Action::Keep(self.votes_topic, benefit::KNOWN_VOTE_MESSAGE)
-			}
-
 			// ensure authority is part of the set.
 			if !filter
 				.validator_set()
@@ -309,7 +301,6 @@ where
 		}
 
 		if BeefyKeystore::verify(&vote.id, &vote.signature, &vote.commitment.encode()) {
-			self.gossip_filter.write().add_known_vote(round, msg_hash);
 			Action::Keep(self.votes_topic, benefit::VOTE_MESSAGE)
 		} else {
 			debug!(
@@ -328,34 +319,46 @@ where
 		let (round, set_id) = proof_block_num_and_set_id::<B>(&proof);
 		self.known_peers.lock().note_vote_for(*sender, round);
 
-		let guard = self.gossip_filter.read();
-		// Verify general usefulness of the justification.
-		match guard.consider_finality_proof(round, set_id) {
-			Consider::RejectPast => return Action::Discard(cost::OUTDATED_MESSAGE),
-			Consider::RejectFuture => return Action::Discard(cost::FUTURE_MESSAGE),
-			Consider::RejectOutOfScope => return Action::Discard(cost::OUT_OF_SCOPE_MESSAGE),
-			Consider::Accept => {},
+		let action = {
+			let guard = self.gossip_filter.read();
+
+			// Verify general usefulness of the justification.
+			match guard.consider_finality_proof(round, set_id) {
+				Consider::RejectPast => return Action::Discard(cost::OUTDATED_MESSAGE),
+				Consider::RejectFuture => return Action::Discard(cost::FUTURE_MESSAGE),
+				Consider::RejectOutOfScope => return Action::Discard(cost::OUT_OF_SCOPE_MESSAGE),
+				Consider::Accept => {},
+			}
+
+			if guard.is_already_proven(round) {
+				return Action::Discard(benefit::NOT_INTERESTED)
+			}
+
+			// Verify justification signatures.
+			guard
+				.validator_set()
+				.map(|validator_set| {
+					if let Err((_, signatures_checked)) =
+						verify_with_validator_set::<B>(round, validator_set, &proof)
+					{
+						debug!(
+							target: LOG_TARGET,
+							"🥩 Bad signatures on message: {:?}, from: {:?}", proof, sender
+						);
+						let mut cost = cost::INVALID_PROOF;
+						cost.value +=
+							cost::PER_SIGNATURE_CHECKED.saturating_mul(signatures_checked as i32);
+						Action::Discard(cost)
+					} else {
+						Action::Keep(self.justifs_topic, benefit::VALIDATED_PROOF)
+					}
+				})
+				.unwrap_or(Action::Discard(cost::OUT_OF_SCOPE_MESSAGE))
+		};
+		if matches!(action, Action::Keep(_, _)) {
+			self.gossip_filter.write().mark_round_as_proven(round);
 		}
-		// Verify justification signatures.
-		guard
-			.validator_set()
-			.map(|validator_set| {
-				if let Err((_, signatures_checked)) =
-					verify_with_validator_set::<B>(round, validator_set, &proof)
-				{
-					debug!(
-						target: LOG_TARGET,
-						"🥩 Bad signatures on message: {:?}, from: {:?}", proof, sender
-					);
-					let mut cost = cost::INVALID_PROOF;
-					cost.value +=
-						cost::PER_SIGNATURE_CHECKED.saturating_mul(signatures_checked as i32);
-					Action::Discard(cost)
-				} else {
-					Action::Keep(self.justifs_topic, benefit::VALIDATED_PROOF)
-				}
-			})
-			.unwrap_or(Action::Discard(cost::OUT_OF_SCOPE_MESSAGE))
+		action
 	}
 }
 
@@ -375,7 +378,7 @@ where
 	) -> ValidationResult<B::Hash> {
 		let raw = data;
 		let action = match GossipMessage::<B>::decode_all(&mut data) {
-			Ok(GossipMessage::Vote(msg)) => self.validate_vote(msg, sender, raw),
+			Ok(GossipMessage::Vote(msg)) => self.validate_vote(msg, sender),
 			Ok(GossipMessage::FinalityProof(proof)) => self.validate_finality_proof(proof, sender),
 			Err(e) => {
 				debug!(target: LOG_TARGET, "Error decoding message: {}", e);
@@ -483,41 +486,6 @@ pub(crate) mod tests {
 	};
 	use sp_keystore::{testing::MemoryKeystore, Keystore};
 
-	#[test]
-	fn known_votes_insert_remove() {
-		let mut filter = Filter::<Block>::new();
-		let msg_hash = twox_64(b"data");
-		let keys = vec![Keyring::Alice.public()];
-		let validator_set = ValidatorSet::<AuthorityId>::new(keys.clone(), 1).unwrap();
-
-		filter.add_known_vote(1, msg_hash);
-		filter.add_known_vote(1, msg_hash);
-		filter.add_known_vote(2, msg_hash);
-		assert_eq!(filter.live_votes.len(), 2);
-
-		filter.add_known_vote(3, msg_hash);
-		assert!(filter.is_known_vote(3, &msg_hash));
-		assert!(!filter.is_known_vote(3, &twox_64(b"other")));
-		assert!(!filter.is_known_vote(4, &msg_hash));
-		assert_eq!(filter.live_votes.len(), 3);
-
-		assert!(filter.inner.is_none());
-		assert_eq!(filter.consider_vote(1, 1), Consider::RejectOutOfScope);
-
-		filter.update(GossipFilterCfg { start: 3, end: 10, validator_set: &validator_set });
-		assert_eq!(filter.live_votes.len(), 1);
-		assert!(filter.live_votes.contains_key(&3));
-		assert_eq!(filter.consider_vote(2, 1), Consider::RejectPast);
-		assert_eq!(filter.consider_vote(3, 1), Consider::Accept);
-		assert_eq!(filter.consider_vote(4, 1), Consider::Accept);
-		assert_eq!(filter.consider_vote(20, 1), Consider::RejectFuture);
-		assert_eq!(filter.consider_vote(4, 2), Consider::RejectFuture);
-
-		let validator_set = ValidatorSet::<AuthorityId>::new(keys, 2).unwrap();
-		filter.update(GossipFilterCfg { start: 5, end: 10, validator_set: &validator_set });
-		assert!(filter.live_votes.is_empty());
-	}
-
 	struct TestContext;
 	impl<B: sp_runtime::traits::Block> ValidatorContext<B> for TestContext {
 		fn broadcast_topic(&mut self, _topic: B::Hash, _force: bool) {
@@ -610,20 +578,6 @@ pub(crate) mod tests {
 		assert!(matches!(res, ValidationResult::ProcessAndKeep(_)));
 		expected_report.cost_benefit = benefit::VOTE_MESSAGE;
 		assert_eq!(report_stream.try_recv().unwrap(), expected_report);
-		assert_eq!(
-			gv.gossip_filter
-				.read()
-				.live_votes
-				.get(&vote.commitment.block_number)
-				.map(|x| x.len()),
-			Some(1)
-		);
-
-		// second time we should hit the cache
-		let res = gv.validate(&mut context, &sender, &encoded);
-		assert!(matches!(res, ValidationResult::ProcessAndKeep(_)));
-		expected_report.cost_benefit = benefit::KNOWN_VOTE_MESSAGE;
-		assert_eq!(report_stream.try_recv().unwrap(), expected_report);
 
 		// reject vote, voter not in validator set
 		let mut bad_vote = vote.clone();
@@ -692,7 +646,7 @@ pub(crate) mod tests {
 		// reject proof, bad signatures (Bob instead of Alice)
 		let bad_validator_set =
 			ValidatorSet::<AuthorityId>::new(vec![Keyring::Bob.public()], 0).unwrap();
-		let proof = dummy_proof(20, &bad_validator_set);
+		let proof = dummy_proof(21, &bad_validator_set);
 		let encoded_proof = GossipMessage::<Block>::FinalityProof(proof).encode();
 		let res = gv.validate(&mut context, &sender, &encoded_proof);
 		assert!(matches!(res, ValidationResult::Discard));
diff --git a/substrate/client/consensus/beefy/src/communication/mod.rs b/substrate/client/consensus/beefy/src/communication/mod.rs
index 7f9535bfc23f1322fbe4995f596e83360c85fc68..10a6071aae658d2988874092dcaade873870ca37 100644
--- a/substrate/client/consensus/beefy/src/communication/mod.rs
+++ b/substrate/client/consensus/beefy/src/communication/mod.rs
@@ -102,7 +102,7 @@ mod cost {
 mod benefit {
 	use sc_network::ReputationChange as Rep;
 	pub(super) const VOTE_MESSAGE: Rep = Rep::new(100, "BEEFY: Round vote message");
-	pub(super) const KNOWN_VOTE_MESSAGE: Rep = Rep::new(50, "BEEFY: Known vote");
+	pub(super) const NOT_INTERESTED: Rep = Rep::new(10, "BEEFY: Not interested in round");
 	pub(super) const VALIDATED_PROOF: Rep = Rep::new(100, "BEEFY: Justification");
 }
 
diff --git a/substrate/client/consensus/beefy/src/communication/request_response/incoming_requests_handler.rs b/substrate/client/consensus/beefy/src/communication/request_response/incoming_requests_handler.rs
index b8d8cd35434c97ac91a54c6fa73e57e6348f5ddd..71c5c49b3690ccfbd3cb06242d6733528a880964 100644
--- a/substrate/client/consensus/beefy/src/communication/request_response/incoming_requests_handler.rs
+++ b/substrate/client/consensus/beefy/src/communication/request_response/incoming_requests_handler.rs
@@ -1,4 +1,4 @@
-// Copyright Parity Technologies (UK) Ltd.
+// Copyright (C) Parity Technologies (UK) Ltd.
 // This file is part of Substrate.
 
 // Substrate is free software: you can redistribute it and/or modify
diff --git a/substrate/client/consensus/beefy/src/lib.rs b/substrate/client/consensus/beefy/src/lib.rs
index 0b3baa007c1ce83c56c3d0b1cd02cc08e5db1b9b..89a5d51c88702df76f7e3f0e7bb4f65076531066 100644
--- a/substrate/client/consensus/beefy/src/lib.rs
+++ b/substrate/client/consensus/beefy/src/lib.rs
@@ -33,7 +33,7 @@ use crate::{
 	worker::PersistedState,
 };
 use futures::{stream::Fuse, StreamExt};
-use log::{error, info};
+use log::{debug, error, info};
 use parking_lot::Mutex;
 use prometheus::Registry;
 use sc_client_api::{Backend, BlockBackend, BlockchainEvents, FinalityNotifications, Finalizer};
@@ -255,36 +255,42 @@ pub async fn start_beefy_gadget<B, BE, C, N, P, R, S>(
 	let mut finality_notifications = client.finality_notification_stream().fuse();
 	let mut block_import_justif = links.from_block_import_justif_stream.subscribe(100_000).fuse();
 
+	let known_peers = Arc::new(Mutex::new(KnownPeers::new()));
+	// Default votes filter is to discard everything.
+	// Validator is updated later with correct starting round and set id.
+	let (gossip_validator, gossip_report_stream) =
+		communication::gossip::GossipValidator::new(known_peers.clone());
+	let gossip_validator = Arc::new(gossip_validator);
+	let gossip_engine = GossipEngine::new(
+		network.clone(),
+		sync.clone(),
+		gossip_protocol_name.clone(),
+		gossip_validator.clone(),
+		None,
+	);
+
+	// The `GossipValidator` adds and removes known peers based on valid votes and network
+	// events.
+	let on_demand_justifications = OnDemandJustificationsEngine::new(
+		network.clone(),
+		justifications_protocol_name.clone(),
+		known_peers,
+		prometheus_registry.clone(),
+	);
+	let mut beefy_comms = worker::BeefyComms {
+		gossip_engine,
+		gossip_validator,
+		gossip_report_stream,
+		on_demand_justifications,
+	};
+
 	// We re-create and re-run the worker in this loop in order to quickly reinit and resume after
 	// select recoverable errors.
 	loop {
-		let known_peers = Arc::new(Mutex::new(KnownPeers::new()));
-		// Default votes filter is to discard everything.
-		// Validator is updated later with correct starting round and set id.
-		let (gossip_validator, gossip_report_stream) =
-			communication::gossip::GossipValidator::new(known_peers.clone());
-		let gossip_validator = Arc::new(gossip_validator);
-		let mut gossip_engine = GossipEngine::new(
-			network.clone(),
-			sync.clone(),
-			gossip_protocol_name.clone(),
-			gossip_validator.clone(),
-			None,
-		);
-
-		// The `GossipValidator` adds and removes known peers based on valid votes and network
-		// events.
-		let on_demand_justifications = OnDemandJustificationsEngine::new(
-			network.clone(),
-			justifications_protocol_name.clone(),
-			known_peers,
-			prometheus_registry.clone(),
-		);
-
 		// Wait for BEEFY pallet to be active before starting voter.
 		let persisted_state = match wait_for_runtime_pallet(
 			&*runtime,
-			&mut gossip_engine,
+			&mut beefy_comms.gossip_engine,
 			&mut finality_notifications,
 		)
 		.await
@@ -306,7 +312,7 @@ pub async fn start_beefy_gadget<B, BE, C, N, P, R, S>(
 		// Update the gossip validator with the right starting round and set id.
 		if let Err(e) = persisted_state
 			.gossip_filter_config()
-			.map(|f| gossip_validator.update_filter(f))
+			.map(|f| beefy_comms.gossip_validator.update_filter(f))
 		{
 			error!(target: LOG_TARGET, "Error: {:?}. Terminating.", e);
 			return
@@ -318,10 +324,7 @@ pub async fn start_beefy_gadget<B, BE, C, N, P, R, S>(
 			runtime: runtime.clone(),
 			sync: sync.clone(),
 			key_store: key_store.clone().into(),
-			gossip_engine,
-			gossip_validator,
-			gossip_report_stream,
-			on_demand_justifications,
+			comms: beefy_comms,
 			links: links.clone(),
 			metrics: metrics.clone(),
 			pending_justifications: BTreeMap::new(),
@@ -335,12 +338,13 @@ pub async fn start_beefy_gadget<B, BE, C, N, P, R, S>(
 		.await
 		{
 			// On `ConsensusReset` error, just reinit and restart voter.
-			futures::future::Either::Left((error::Error::ConsensusReset, _)) => {
+			futures::future::Either::Left(((error::Error::ConsensusReset, reuse_comms), _)) => {
 				error!(target: LOG_TARGET, "🥩 Error: {:?}. Restarting voter.", error::Error::ConsensusReset);
+				beefy_comms = reuse_comms;
 				continue
 			},
 			// On other errors, bring down / finish the task.
-			futures::future::Either::Left((worker_err, _)) =>
+			futures::future::Either::Left(((worker_err, _), _)) =>
 				error!(target: LOG_TARGET, "🥩 Error: {:?}. Terminating.", worker_err),
 			futures::future::Either::Right((odj_handler_err, _)) =>
 				error!(target: LOG_TARGET, "🥩 Error: {:?}. Terminating.", odj_handler_err),
@@ -424,7 +428,7 @@ where
 			let best_beefy = *header.number();
 			// If no session boundaries detected so far, just initialize new rounds here.
 			if sessions.is_empty() {
-				let active_set = expect_validator_set(runtime, backend, &header, beefy_genesis)?;
+				let active_set = expect_validator_set(runtime, backend, &header)?;
 				let mut rounds = Rounds::new(best_beefy, active_set);
 				// Mark the round as already finalized.
 				rounds.conclude(best_beefy);
@@ -443,7 +447,7 @@ where
 
 		if *header.number() == beefy_genesis {
 			// We've reached BEEFY genesis, initialize voter here.
-			let genesis_set = expect_validator_set(runtime, backend, &header, beefy_genesis)?;
+			let genesis_set = expect_validator_set(runtime, backend, &header)?;
 			info!(
 				target: LOG_TARGET,
 				"🥩 Loading BEEFY voter state from genesis on what appears to be first startup. \
@@ -528,7 +532,6 @@ fn expect_validator_set<B, BE, R>(
 	runtime: &R,
 	backend: &BE,
 	at_header: &B::Header,
-	beefy_genesis: NumberFor<B>,
 ) -> ClientResult<ValidatorSet<AuthorityId>>
 where
 	B: Block,
@@ -536,6 +539,7 @@ where
 	R: ProvideRuntimeApi<B>,
 	R::Api: BeefyApi<B, AuthorityId>,
 {
+	debug!(target: LOG_TARGET, "🥩 Try to find validator set active at header: {:?}", at_header);
 	runtime
 		.runtime_api()
 		.validator_set(at_header.hash())
@@ -546,14 +550,14 @@ where
 			// Digest emitted when validator set active 'at_header' was enacted.
 			let blockchain = backend.blockchain();
 			let mut header = at_header.clone();
-			while *header.number() >= beefy_genesis {
+			loop {
+				debug!(target: LOG_TARGET, "🥩 look for auth set change digest in header number: {:?}", *header.number());
 				match worker::find_authorities_change::<B>(&header) {
 					Some(active) => return Some(active),
 					// Move up the chain.
 					None => header = blockchain.expect_header(*header.parent_hash()).ok()?,
 				}
 			}
-			None
 		})
 		.ok_or_else(|| ClientError::Backend("Could not find initial validator set".into()))
 }
diff --git a/substrate/client/consensus/beefy/src/tests.rs b/substrate/client/consensus/beefy/src/tests.rs
index 3bb65e9d57f435b78b9faccffb687bc4ab64757d..902feca163983c594baa54f01688ad183c171a03 100644
--- a/substrate/client/consensus/beefy/src/tests.rs
+++ b/substrate/client/consensus/beefy/src/tests.rs
@@ -247,7 +247,7 @@ impl TestNetFactory for BeefyTestNet {
 #[derive(Clone)]
 pub(crate) struct TestApi {
 	pub beefy_genesis: u64,
-	pub validator_set: BeefyValidatorSet,
+	pub validator_set: Option<BeefyValidatorSet>,
 	pub mmr_root_hash: MmrRootHash,
 	pub reported_equivocations:
 		Option<Arc<Mutex<Vec<EquivocationProof<NumberFor<Block>, AuthorityId, Signature>>>>>,
@@ -261,7 +261,7 @@ impl TestApi {
 	) -> Self {
 		TestApi {
 			beefy_genesis,
-			validator_set: validator_set.clone(),
+			validator_set: Some(validator_set.clone()),
 			mmr_root_hash,
 			reported_equivocations: None,
 		}
@@ -270,7 +270,7 @@ impl TestApi {
 	pub fn with_validator_set(validator_set: &BeefyValidatorSet) -> Self {
 		TestApi {
 			beefy_genesis: 1,
-			validator_set: validator_set.clone(),
+			validator_set: Some(validator_set.clone()),
 			mmr_root_hash: GOOD_MMR_ROOT,
 			reported_equivocations: None,
 		}
@@ -300,7 +300,7 @@ sp_api::mock_impl_runtime_apis! {
 		}
 
 		fn validator_set() -> Option<BeefyValidatorSet> {
-			Some(self.inner.validator_set.clone())
+			self.inner.validator_set.clone()
 		}
 
 		fn submit_report_equivocation_unsigned_extrinsic(
@@ -1188,6 +1188,54 @@ async fn should_initialize_voter_at_latest_finalized() {
 	assert_eq!(state, persisted_state);
 }
 
+#[tokio::test]
+async fn should_initialize_voter_at_custom_genesis_when_state_unavailable() {
+	let keys = &[BeefyKeyring::Alice];
+	let validator_set = ValidatorSet::new(make_beefy_ids(keys), 0).unwrap();
+	let mut net = BeefyTestNet::new(1);
+	let backend = net.peer(0).client().as_backend();
+	// custom pallet genesis is block number 7
+	let custom_pallet_genesis = 7;
+	let mut api = TestApi::new(custom_pallet_genesis, &validator_set, GOOD_MMR_ROOT);
+	// remove validator set from `TestApi`, practically simulating unavailable/pruned runtime state
+	api.validator_set = None;
+
+	// push 30 blocks with `AuthorityChange` digests every 5 blocks
+	let hashes = net.generate_blocks_and_sync(30, 5, &validator_set, false).await;
+	let mut finality = net.peer(0).client().as_client().finality_notification_stream().fuse();
+	// finalize 30 without justifications
+	net.peer(0).client().as_client().finalize_block(hashes[30], None).unwrap();
+
+	// load persistent state - nothing in DB, should init at genesis
+	let persisted_state = voter_init_setup(&mut net, &mut finality, &api).await.unwrap();
+
+	// Test initialization at session boundary.
+	// verify voter initialized with all sessions pending, first one starting at block 5 (start of
+	// session containing `custom_pallet_genesis`).
+	let sessions = persisted_state.voting_oracle().sessions();
+	// should have enqueued 6 sessions (every 5 blocks from 5 to 30)
+	assert_eq!(sessions.len(), 6);
+	assert_eq!(sessions[0].session_start(), 7);
+	assert_eq!(sessions[1].session_start(), 10);
+	assert_eq!(sessions[2].session_start(), 15);
+	assert_eq!(sessions[3].session_start(), 20);
+	assert_eq!(sessions[4].session_start(), 25);
+	assert_eq!(sessions[5].session_start(), 30);
+	let rounds = persisted_state.active_round().unwrap();
+	assert_eq!(rounds.session_start(), custom_pallet_genesis);
+	assert_eq!(rounds.validator_set_id(), validator_set.id());
+
+	// verify next vote target is mandatory block 7 (genesis)
+	assert_eq!(persisted_state.best_beefy_block(), 0);
+	assert_eq!(persisted_state.best_grandpa_number(), 30);
+	assert_eq!(persisted_state.voting_oracle().voting_target(), Some(custom_pallet_genesis));
+
+	// verify state also saved to db
+	assert!(verify_persisted_version(&*backend));
+	let state = load_persistent(&*backend).unwrap().unwrap();
+	assert_eq!(state, persisted_state);
+}
+
 #[tokio::test]
 async fn beefy_finalizing_after_pallet_genesis() {
 	sp_tracing::try_init_simple();
@@ -1302,7 +1350,7 @@ async fn gossipped_finality_proofs() {
 	// Only Alice and Bob are running the voter -> finality threshold not reached
 	let peers = [BeefyKeyring::Alice, BeefyKeyring::Bob];
 	let validator_set = ValidatorSet::new(make_beefy_ids(&validators), 0).unwrap();
-	let session_len = 30;
+	let session_len = 10;
 	let min_block_delta = 1;
 
 	let mut net = BeefyTestNet::new(3);
@@ -1332,14 +1380,8 @@ async fn gossipped_finality_proofs() {
 
 	let net = Arc::new(Mutex::new(net));
 
-	// Pump net + Charlie gossip to see peers.
-	let timeout = Box::pin(tokio::time::sleep(Duration::from_millis(200)));
-	let gossip_engine_pump = &mut charlie_gossip_engine;
-	let pump_with_timeout = future::select(gossip_engine_pump, timeout);
-	run_until(pump_with_timeout, &net).await;
-
-	// push 10 blocks
-	let hashes = net.lock().generate_blocks_and_sync(10, session_len, &validator_set, true).await;
+	// push 42 blocks
+	let hashes = net.lock().generate_blocks_and_sync(42, session_len, &validator_set, true).await;
 
 	let peers = peers.into_iter().enumerate();
 
diff --git a/substrate/client/consensus/beefy/src/worker.rs b/substrate/client/consensus/beefy/src/worker.rs
index 0d3845a270368f89ca73f16f333e54acd95a99d4..309d8c5135bef96447bc87b1485775fb96f6b255 100644
--- a/substrate/client/consensus/beefy/src/worker.rs
+++ b/substrate/client/consensus/beefy/src/worker.rs
@@ -313,6 +313,16 @@ impl<B: Block> PersistedState<B> {
 	}
 }
 
+/// Helper object holding BEEFY worker communication/gossip components.
+///
+/// These are created once, but will be reused if worker is restarted/reinitialized.
+pub(crate) struct BeefyComms<B: Block> {
+	pub gossip_engine: GossipEngine<B>,
+	pub gossip_validator: Arc<GossipValidator<B>>,
+	pub gossip_report_stream: TracingUnboundedReceiver<PeerReport>,
+	pub on_demand_justifications: OnDemandJustificationsEngine<B>,
+}
+
 /// A BEEFY worker plays the BEEFY protocol
 pub(crate) struct BeefyWorker<B: Block, BE, P, RuntimeApi, S> {
 	// utilities
@@ -322,11 +332,8 @@ pub(crate) struct BeefyWorker<B: Block, BE, P, RuntimeApi, S> {
 	pub sync: Arc<S>,
 	pub key_store: BeefyKeystore,
 
-	// communication
-	pub gossip_engine: GossipEngine<B>,
-	pub gossip_validator: Arc<GossipValidator<B>>,
-	pub gossip_report_stream: TracingUnboundedReceiver<PeerReport>,
-	pub on_demand_justifications: OnDemandJustificationsEngine<B>,
+	// communication (created once, but returned and reused if worker is restarted/reinitialized)
+	pub comms: BeefyComms<B>,
 
 	// channels
 	/// Links between the block importer, the background voter and the RPC layer.
@@ -475,7 +482,7 @@ where
 			if let Err(e) = self
 				.persisted_state
 				.gossip_filter_config()
-				.map(|filter| self.gossip_validator.update_filter(filter))
+				.map(|filter| self.comms.gossip_validator.update_filter(filter))
 			{
 				error!(target: LOG_TARGET, "🥩 Voter error: {:?}", e);
 			}
@@ -495,7 +502,11 @@ where
 				if let Some(finality_proof) = self.handle_vote(vote)? {
 					let gossip_proof = GossipMessage::<B>::FinalityProof(finality_proof);
 					let encoded_proof = gossip_proof.encode();
-					self.gossip_engine.gossip_message(proofs_topic::<B>(), encoded_proof, true);
+					self.comms.gossip_engine.gossip_message(
+						proofs_topic::<B>(),
+						encoded_proof,
+						true,
+					);
 				},
 			RoundAction::Drop => metric_inc!(self, beefy_stale_votes),
 			RoundAction::Enqueue => error!(target: LOG_TARGET, "🥩 unexpected vote: {:?}.", vote),
@@ -593,6 +604,11 @@ where
 			VersionedFinalityProof::V1(ref sc) => sc.commitment.block_number,
 		};
 
+		if block_num <= self.persisted_state.voting_oracle.best_beefy_block {
+			// we've already finalized this round before, short-circuit.
+			return Ok(())
+		}
+
 		// Finalize inner round and update voting_oracle state.
 		self.persisted_state.voting_oracle.finalize(block_num)?;
 
@@ -603,7 +619,7 @@ where
 
 		metric_set!(self, beefy_best_block, block_num);
 
-		self.on_demand_justifications.cancel_requests_older_than(block_num);
+		self.comms.on_demand_justifications.cancel_requests_older_than(block_num);
 
 		if let Err(e) = self
 			.backend
@@ -618,7 +634,7 @@ where
 				self.backend
 					.append_justification(hash, (BEEFY_ENGINE_ID, finality_proof.encode()))
 			}) {
-			error!(
+			debug!(
 				target: LOG_TARGET,
 				"🥩 Error {:?} on appending justification: {:?}", e, finality_proof
 			);
@@ -632,12 +648,12 @@ where
 		// Update gossip validator votes filter.
 		self.persisted_state
 			.gossip_filter_config()
-			.map(|filter| self.gossip_validator.update_filter(filter))?;
+			.map(|filter| self.comms.gossip_validator.update_filter(filter))?;
 		Ok(())
 	}
 
 	/// Handle previously buffered justifications, that now land in the voting interval.
-	fn try_pending_justififactions(&mut self) -> Result<(), Error> {
+	fn try_pending_justifications(&mut self) -> Result<(), Error> {
 		// Interval of blocks for which we can process justifications and votes right now.
 		let (start, end) = self.voting_oracle().accepted_interval()?;
 		// Process pending justifications.
@@ -752,12 +768,14 @@ where
 			err
 		})? {
 			let encoded_proof = GossipMessage::<B>::FinalityProof(finality_proof).encode();
-			self.gossip_engine.gossip_message(proofs_topic::<B>(), encoded_proof, true);
+			self.comms
+				.gossip_engine
+				.gossip_message(proofs_topic::<B>(), encoded_proof, true);
 		} else {
 			metric_inc!(self, beefy_votes_sent);
 			debug!(target: LOG_TARGET, "🥩 Sent vote message: {:?}", vote);
 			let encoded_vote = GossipMessage::<B>::Vote(vote).encode();
-			self.gossip_engine.gossip_message(votes_topic::<B>(), encoded_vote, false);
+			self.comms.gossip_engine.gossip_message(votes_topic::<B>(), encoded_vote, false);
 		}
 
 		// Persist state after vote to avoid double voting in case of voter restarts.
@@ -769,7 +787,7 @@ where
 
 	fn process_new_state(&mut self) {
 		// Handle pending justifications and/or votes for now GRANDPA finalized blocks.
-		if let Err(err) = self.try_pending_justififactions() {
+		if let Err(err) = self.try_pending_justifications() {
 			debug!(target: LOG_TARGET, "🥩 {}", err);
 		}
 
@@ -783,7 +801,7 @@ where
 			// make sure there's also an on-demand justification request out for it.
 			if let Some((block, active)) = self.voting_oracle().mandatory_pending() {
 				// This only starts new request if there isn't already an active one.
-				self.on_demand_justifications.request(block, active);
+				self.comms.on_demand_justifications.request(block, active);
 			}
 		}
 	}
@@ -796,7 +814,7 @@ where
 		mut self,
 		block_import_justif: &mut Fuse<NotificationReceiver<BeefyVersionedFinalityProof<B>>>,
 		finality_notifications: &mut Fuse<FinalityNotifications<B>>,
-	) -> Error {
+	) -> (Error, BeefyComms<B>) {
 		info!(
 			target: LOG_TARGET,
 			"🥩 run BEEFY worker, best grandpa: #{:?}.",
@@ -804,7 +822,8 @@ where
 		);
 
 		let mut votes = Box::pin(
-			self.gossip_engine
+			self.comms
+				.gossip_engine
 				.messages_for(votes_topic::<B>())
 				.filter_map(|notification| async move {
 					let vote = GossipMessage::<B>::decode_all(&mut &notification.message[..])
@@ -816,7 +835,8 @@ where
 				.fuse(),
 		);
 		let mut gossip_proofs = Box::pin(
-			self.gossip_engine
+			self.comms
+				.gossip_engine
 				.messages_for(proofs_topic::<B>())
 				.filter_map(|notification| async move {
 					let proof = GossipMessage::<B>::decode_all(&mut &notification.message[..])
@@ -828,12 +848,12 @@ where
 				.fuse(),
 		);
 
-		loop {
+		let error = loop {
 			// Act on changed 'state'.
 			self.process_new_state();
 
 			// Mutable reference used to drive the gossip engine.
-			let mut gossip_engine = &mut self.gossip_engine;
+			let mut gossip_engine = &mut self.comms.gossip_engine;
 			// Use temp val and report after async section,
 			// to avoid having to Mutex-wrap `gossip_engine`.
 			let mut gossip_report: Option<PeerReport> = None;
@@ -847,18 +867,18 @@ where
 				notification = finality_notifications.next() => {
 					if let Some(notif) = notification {
 						if let Err(err) = self.handle_finality_notification(&notif) {
-							return err;
+							break err;
 						}
 					} else {
-						return Error::FinalityStreamTerminated;
+						break Error::FinalityStreamTerminated;
 					}
 				},
 				// Make sure to pump gossip engine.
 				_ = gossip_engine => {
-					return Error::GossipEngineTerminated;
+					break Error::GossipEngineTerminated;
 				},
 				// Process incoming justifications as these can make some in-flight votes obsolete.
-				response_info = self.on_demand_justifications.next().fuse() => {
+				response_info = self.comms.on_demand_justifications.next().fuse() => {
 					match response_info {
 						ResponseInfo::ValidProof(justif, peer_report) => {
 							if let Err(err) = self.triage_incoming_justif(justif) {
@@ -878,7 +898,7 @@ where
 							debug!(target: LOG_TARGET, "🥩 {}", err);
 						}
 					} else {
-						return Error::BlockImportStreamTerminated;
+						break Error::BlockImportStreamTerminated;
 					}
 				},
 				justif = gossip_proofs.next() => {
@@ -888,7 +908,7 @@ where
 							debug!(target: LOG_TARGET, "🥩 {}", err);
 						}
 					} else {
-						return Error::FinalityProofGossipStreamTerminated;
+						break Error::FinalityProofGossipStreamTerminated;
 					}
 				},
 				// Finally process incoming votes.
@@ -899,18 +919,21 @@ where
 							debug!(target: LOG_TARGET, "🥩 {}", err);
 						}
 					} else {
-						return Error::VotesGossipStreamTerminated;
+						break Error::VotesGossipStreamTerminated;
 					}
 				},
 				// Process peer reports.
-				report = self.gossip_report_stream.next() => {
+				report = self.comms.gossip_report_stream.next() => {
 					gossip_report = report;
 				},
 			}
 			if let Some(PeerReport { who, cost_benefit }) = gossip_report {
-				self.gossip_engine.report(who, cost_benefit);
+				self.comms.gossip_engine.report(who, cost_benefit);
 			}
-		}
+		};
+
+		// return error _and_ `comms` that can be reused
+		(error, self.comms)
 	}
 
 	/// Report the given equivocation to the BEEFY runtime module. This method
@@ -1146,18 +1169,21 @@ pub(crate) mod tests {
 		)
 		.unwrap();
 		let payload_provider = MmrRootProvider::new(api.clone());
+		let comms = BeefyComms {
+			gossip_engine,
+			gossip_validator,
+			gossip_report_stream,
+			on_demand_justifications,
+		};
 		BeefyWorker {
 			backend,
 			payload_provider,
 			runtime: api,
 			key_store: Some(keystore).into(),
 			links,
-			gossip_engine,
-			gossip_validator,
-			gossip_report_stream,
+			comms,
 			metrics,
 			sync: Arc::new(sync),
-			on_demand_justifications,
 			pending_justifications: BTreeMap::new(),
 			persisted_state,
 		}
diff --git a/substrate/client/consensus/common/Cargo.toml b/substrate/client/consensus/common/Cargo.toml
index d9310081d43c32cb766e9909b345835742409aef..f269e3752d435488e9c843260454adbccd325b7b 100644
--- a/substrate/client/consensus/common/Cargo.toml
+++ b/substrate/client/consensus/common/Cargo.toml
@@ -1,11 +1,11 @@
 [package]
 name = "sc-consensus"
 version = "0.10.0-dev"
-authors = ["Parity Technologies <admin@parity.io>"]
-edition = "2021"
+authors.workspace = true
+edition.workspace = true
 license = "GPL-3.0-or-later WITH Classpath-exception-2.0"
 homepage = "https://substrate.io"
-repository = "https://github.com/paritytech/substrate/"
+repository.workspace = true
 description = "Collection of common consensus specific imlementations for Substrate (client)"
 readme = "README.md"
 
@@ -16,12 +16,12 @@ targets = ["x86_64-unknown-linux-gnu"]
 async-trait = "0.1.57"
 futures = { version = "0.3.21", features = ["thread-pool"] }
 futures-timer = "3.0.1"
-libp2p-identity = { version = "0.1.2", features = ["peerid", "ed25519"] }
+libp2p-identity = { version = "0.1.3", features = ["peerid", "ed25519"] }
 log = "0.4.17"
 mockall = "0.11.3"
 parking_lot = "0.12.1"
 serde = { version = "1.0", features = ["derive"] }
-thiserror = "1.0.30"
+thiserror = "1.0.48"
 prometheus-endpoint = { package = "substrate-prometheus-endpoint", path = "../../../utils/prometheus" }
 sc-client-api = { path = "../../api" }
 sc-utils = { path = "../../utils" }
diff --git a/substrate/client/consensus/common/README.md b/substrate/client/consensus/common/README.md
index a6717a1d7a6df682607e9ddf3c45d7bbf6115dfc..9b953fbf32740e62205f405f2e7a98552da71bcd 100644
--- a/substrate/client/consensus/common/README.md
+++ b/substrate/client/consensus/common/README.md
@@ -1,3 +1,3 @@
 Collection of common consensus specific implementations
 
-License: GPL-3.0-or-later WITH Classpath-exception-2.0
\ No newline at end of file
+License: GPL-3.0-or-later WITH Classpath-exception-2.0
diff --git a/substrate/client/consensus/epochs/Cargo.toml b/substrate/client/consensus/epochs/Cargo.toml
index 8d94bf988c542f7226f3eb4580210d00d530f9c7..07de83980bcf766b55b97a9c8826b26c0978e839 100644
--- a/substrate/client/consensus/epochs/Cargo.toml
+++ b/substrate/client/consensus/epochs/Cargo.toml
@@ -1,12 +1,12 @@
 [package]
 name = "sc-consensus-epochs"
 version = "0.10.0-dev"
-authors = ["Parity Technologies <admin@parity.io>"]
+authors.workspace = true
 description = "Generic epochs-based utilities for consensus"
-edition = "2021"
+edition.workspace = true
 license = "GPL-3.0-or-later WITH Classpath-exception-2.0"
 homepage = "https://substrate.io"
-repository = "https://github.com/paritytech/substrate/"
+repository.workspace = true
 readme = "README.md"
 
 [package.metadata.docs.rs]
diff --git a/substrate/client/consensus/epochs/README.md b/substrate/client/consensus/epochs/README.md
index 1e74e04172c2400f41d9d3c18037132412feb299..e4abc58c6c0d2dd7fa720ec835dc17d204aa0b30 100644
--- a/substrate/client/consensus/epochs/README.md
+++ b/substrate/client/consensus/epochs/README.md
@@ -1,3 +1,3 @@
 Generic utilities for epoch-based consensus engines.
 
-License: GPL-3.0-or-later WITH Classpath-exception-2.0
\ No newline at end of file
+License: GPL-3.0-or-later WITH Classpath-exception-2.0
diff --git a/substrate/client/consensus/grandpa/Cargo.toml b/substrate/client/consensus/grandpa/Cargo.toml
index 8ef1ee928d0f6b193faba569be3f7c9b6182dd1c..472bdd1c5b820e5590d6d38c1e15add9c94e6fd6 100644
--- a/substrate/client/consensus/grandpa/Cargo.toml
+++ b/substrate/client/consensus/grandpa/Cargo.toml
@@ -1,11 +1,11 @@
 [package]
 name = "sc-consensus-grandpa"
 version = "0.10.0-dev"
-authors = ["Parity Technologies <admin@parity.io>"]
-edition = "2021"
+authors.workspace = true
+edition.workspace = true
 license = "GPL-3.0-or-later WITH Classpath-exception-2.0"
 homepage = "https://substrate.io"
-repository = "https://github.com/paritytech/substrate/"
+repository.workspace = true
 description = "Integration of the GRANDPA finality gadget into substrate."
 documentation = "https://docs.rs/sc-consensus-grandpa"
 readme = "README.md"
@@ -25,7 +25,7 @@ log = "0.4.17"
 parity-scale-codec = { version = "3.6.1", features = ["derive"] }
 parking_lot = "0.12.1"
 rand = "0.8.5"
-serde_json = "1.0.85"
+serde_json = "1.0.107"
 thiserror = "1.0"
 fork-tree = { path = "../../../utils/fork-tree" }
 prometheus-endpoint = { package = "substrate-prometheus-endpoint", path = "../../../utils/prometheus" }
@@ -52,7 +52,7 @@ sp-runtime = { path = "../../../primitives/runtime" }
 [dev-dependencies]
 assert_matches = "1.3.0"
 finality-grandpa = { version = "0.16.2", features = ["derive-codec", "test-helpers"] }
-serde = "1.0.163"
+serde = "1.0.188"
 tokio = "1.22.0"
 sc-network = { path = "../../network" }
 sc-network-test = { path = "../../network/test" }
diff --git a/substrate/client/consensus/grandpa/README.md b/substrate/client/consensus/grandpa/README.md
index 64a7e70bc6a52631016bba71343b38d3e0f9f005..f4045896599085d7436f1684f4612844c12184e9 100644
--- a/substrate/client/consensus/grandpa/README.md
+++ b/substrate/client/consensus/grandpa/README.md
@@ -1,4 +1,4 @@
-Integration of the GRANDPA finality gadget into substrate.
+Integration of the GRANDPA finality gadget into Substrate.
 
 This crate is unstable and the API and usage may change.
 
@@ -36,4 +36,4 @@ number (this is num(signal) + N). When finalizing a block, we either apply
 or prune any signaled changes based on whether the signaling block is
 included in the newly-finalized chain.
 
-License: GPL-3.0-or-later WITH Classpath-exception-2.0
\ No newline at end of file
+License: GPL-3.0-or-later WITH Classpath-exception-2.0
diff --git a/substrate/client/consensus/grandpa/rpc/Cargo.toml b/substrate/client/consensus/grandpa/rpc/Cargo.toml
index 50ea8aa21a3a54a629663f271f6d805454e0932a..e2f9e40afb2da661cd5003b4755d7ee425b5ee1a 100644
--- a/substrate/client/consensus/grandpa/rpc/Cargo.toml
+++ b/substrate/client/consensus/grandpa/rpc/Cargo.toml
@@ -1,10 +1,10 @@
 [package]
 name = "sc-consensus-grandpa-rpc"
 version = "0.10.0-dev"
-authors = ["Parity Technologies <admin@parity.io>"]
+authors.workspace = true
 description = "RPC extensions for the GRANDPA finality gadget"
-repository = "https://github.com/paritytech/substrate/"
-edition = "2021"
+repository.workspace = true
+edition.workspace = true
 license = "GPL-3.0-or-later WITH Classpath-exception-2.0"
 readme = "README.md"
 homepage = "https://substrate.io"
@@ -15,7 +15,7 @@ futures = "0.3.16"
 jsonrpsee = { version = "0.16.2", features = ["client-core", "server", "macros"] }
 log = "0.4.8"
 parity-scale-codec = { version = "3.6.1", features = ["derive"] }
-serde = { version = "1.0.163", features = ["derive"] }
+serde = { version = "1.0.188", features = ["derive"] }
 thiserror = "1.0"
 sc-client-api = { path = "../../../api" }
 sc-consensus-grandpa = { path = ".." }
diff --git a/substrate/client/consensus/grandpa/rpc/README.md b/substrate/client/consensus/grandpa/rpc/README.md
index 0007f55dbd4dbfa5fe0b10b0cb9e0714def30b1a..ad73878a61bdde1b3fe0e059960b54051eefa7f2 100644
--- a/substrate/client/consensus/grandpa/rpc/README.md
+++ b/substrate/client/consensus/grandpa/rpc/README.md
@@ -1,3 +1,3 @@
 RPC API for GRANDPA.
 
-License: GPL-3.0-or-later WITH Classpath-exception-2.0
\ No newline at end of file
+License: GPL-3.0-or-later WITH Classpath-exception-2.0
diff --git a/substrate/client/consensus/grandpa/src/import.rs b/substrate/client/consensus/grandpa/src/import.rs
index 8481b395847292173b4fa89206d9610d5aa767e0..ca5b7c400bfb2f83be8c1b22459ee0730072ada0 100644
--- a/substrate/client/consensus/grandpa/src/import.rs
+++ b/substrate/client/consensus/grandpa/src/import.rs
@@ -552,7 +552,6 @@ where
 							.into(),
 					))
 				}
-				assert!(block.justifications.is_some());
 				let mut authority_set = self.authority_set.inner_locked();
 				authority_set.authority_set_changes.insert(number);
 				crate::aux_schema::update_authority_set::<Block, _, _>(
diff --git a/substrate/client/consensus/grandpa/src/warp_proof.rs b/substrate/client/consensus/grandpa/src/warp_proof.rs
index 9acf1f2187793c0ad5a722c0481f7cde2b22d77d..ea8114eafd789ec00a909b5535f0659ceea1fbfe 100644
--- a/substrate/client/consensus/grandpa/src/warp_proof.rs
+++ b/substrate/client/consensus/grandpa/src/warp_proof.rs
@@ -1,4 +1,4 @@
-// Copyright Parity Technologies (UK) Ltd.
+// Copyright (C) Parity Technologies (UK) Ltd.
 // This file is part of Substrate.
 
 // Substrate is free software: you can redistribute it and/or modify
diff --git a/substrate/client/consensus/manual-seal/Cargo.toml b/substrate/client/consensus/manual-seal/Cargo.toml
index bd3a030757ace61334062ceddd74e346c9e29343..a6430fdf1deece639a443e78ee8c08d627f8e6c3 100644
--- a/substrate/client/consensus/manual-seal/Cargo.toml
+++ b/substrate/client/consensus/manual-seal/Cargo.toml
@@ -1,12 +1,12 @@
 [package]
 name = "sc-consensus-manual-seal"
 version = "0.10.0-dev"
-authors = ["Parity Technologies <admin@parity.io>"]
+authors.workspace = true
 description = "Manual sealing engine for Substrate"
-edition = "2021"
+edition.workspace = true
 license = "GPL-3.0-or-later WITH Classpath-exception-2.0"
 homepage = "https://substrate.io"
-repository = "https://github.com/paritytech/substrate/"
+repository.workspace = true
 readme = "README.md"
 
 [package.metadata.docs.rs]
diff --git a/substrate/client/consensus/manual-seal/README.md b/substrate/client/consensus/manual-seal/README.md
index b355f8b73183cc9661b4c65d76a060d9f6cc8918..131b620cb2feab527818d6faafa175868938d045 100644
--- a/substrate/client/consensus/manual-seal/README.md
+++ b/substrate/client/consensus/manual-seal/README.md
@@ -1,4 +1,4 @@
 A manual sealing engine: the engine listens for rpc calls to seal blocks and create forks.
 This is suitable for a testing environment.
 
-License: GPL-3.0-or-later WITH Classpath-exception-2.0
\ No newline at end of file
+License: GPL-3.0-or-later WITH Classpath-exception-2.0
diff --git a/substrate/client/consensus/manual-seal/src/lib.rs b/substrate/client/consensus/manual-seal/src/lib.rs
index 1e5db966e66dbdbc453f9cdc04ff80d2f15ad9b2..41cd5f3127e8ead7508bb2a7c375aab9bc355892 100644
--- a/substrate/client/consensus/manual-seal/src/lib.rs
+++ b/substrate/client/consensus/manual-seal/src/lib.rs
@@ -351,7 +351,7 @@ mod tests {
 	use sc_transaction_pool::{BasicPool, FullChainApi, Options, RevalidationType};
 	use sc_transaction_pool_api::{MaintainedTransactionPool, TransactionPool, TransactionSource};
 	use sp_inherents::InherentData;
-	use sp_runtime::generic::{BlockId, Digest, DigestItem};
+	use sp_runtime::generic::{Digest, DigestItem};
 	use substrate_test_runtime_client::{
 		AccountKeyring::*, DefaultTestClientBuilderExt, TestClientBuilder, TestClientBuilderExt,
 	};
@@ -400,10 +400,11 @@ mod tests {
 		let client = Arc::new(client);
 		let spawner = sp_core::testing::TaskExecutor::new();
 		let genesis_hash = client.info().genesis_hash;
+		let pool_api = Arc::new(FullChainApi::new(client.clone(), None, &spawner.clone()));
 		let pool = Arc::new(BasicPool::with_revalidation_type(
 			Options::default(),
 			true.into(),
-			api(),
+			pool_api,
 			None,
 			RevalidationType::Full,
 			spawner.clone(),
@@ -444,7 +445,7 @@ mod tests {
 			rt.block_on(future);
 		});
 		// submit a transaction to pool.
-		let result = pool.submit_one(&BlockId::Number(0), SOURCE, uxt(Alice, 0)).await;
+		let result = pool.submit_one(genesis_hash, SOURCE, uxt(Alice, 0)).await;
 		// assert that it was successfully imported
 		assert!(result.is_ok());
 		// assert that the background task returns ok
@@ -475,10 +476,11 @@ mod tests {
 		let client = Arc::new(client);
 		let spawner = sp_core::testing::TaskExecutor::new();
 		let genesis_hash = client.info().genesis_hash;
+		let pool_api = Arc::new(FullChainApi::new(client.clone(), None, &spawner.clone()));
 		let pool = Arc::new(BasicPool::with_revalidation_type(
 			Options::default(),
 			true.into(),
-			api(),
+			pool_api,
 			None,
 			RevalidationType::Full,
 			spawner.clone(),
@@ -535,7 +537,7 @@ mod tests {
 
 		let mut finality_stream = client.finality_notification_stream();
 		// submit a transaction to pool.
-		let result = pool.submit_one(&BlockId::Number(0), SOURCE, uxt(Alice, 0)).await;
+		let result = pool.submit_one(genesis_hash, SOURCE, uxt(Alice, 0)).await;
 		// assert that it was successfully imported
 		assert!(result.is_ok());
 		// assert that the background task returns ok
@@ -571,10 +573,11 @@ mod tests {
 		let client = Arc::new(client);
 		let spawner = sp_core::testing::TaskExecutor::new();
 		let genesis_hash = client.info().genesis_hash;
+		let pool_api = Arc::new(FullChainApi::new(client.clone(), None, &spawner.clone()));
 		let pool = Arc::new(BasicPool::with_revalidation_type(
 			Options::default(),
 			true.into(),
-			api(),
+			pool_api,
 			None,
 			RevalidationType::Full,
 			spawner.clone(),
@@ -602,7 +605,7 @@ mod tests {
 			rt.block_on(future);
 		});
 		// submit a transaction to pool.
-		let result = pool.submit_one(&BlockId::Number(0), SOURCE, uxt(Alice, 0)).await;
+		let result = pool.submit_one(genesis_hash, SOURCE, uxt(Alice, 0)).await;
 		// assert that it was successfully imported
 		assert!(result.is_ok());
 		let (tx, rx) = futures::channel::oneshot::channel();
@@ -688,7 +691,7 @@ mod tests {
 			rt.block_on(future);
 		});
 		// submit a transaction to pool.
-		let result = pool.submit_one(&BlockId::Number(0), SOURCE, uxt(Alice, 0)).await;
+		let result = pool.submit_one(genesis_hash, SOURCE, uxt(Alice, 0)).await;
 		// assert that it was successfully imported
 		assert!(result.is_ok());
 
@@ -719,7 +722,7 @@ mod tests {
 			}
 		);
 
-		assert!(pool.submit_one(&BlockId::Number(1), SOURCE, uxt(Alice, 1)).await.is_ok());
+		assert!(pool.submit_one(created_block.hash, SOURCE, uxt(Alice, 1)).await.is_ok());
 
 		let header = client.header(created_block.hash).expect("db error").expect("imported above");
 		assert_eq!(header.number, 1);
@@ -741,7 +744,7 @@ mod tests {
 			.is_ok());
 		assert_matches::assert_matches!(rx1.await.expect("should be no error receiving"), Ok(_));
 
-		assert!(pool.submit_one(&BlockId::Number(1), SOURCE, uxt(Bob, 0)).await.is_ok());
+		assert!(pool.submit_one(created_block.hash, SOURCE, uxt(Bob, 0)).await.is_ok());
 		let (tx2, rx2) = futures::channel::oneshot::channel();
 		assert!(sink
 			.send(EngineCommand::SealNewBlock {
diff --git a/substrate/client/consensus/pow/Cargo.toml b/substrate/client/consensus/pow/Cargo.toml
index 23e4cecb626f35dda8b70793a854737fcbee36d8..ef32425685b6f127fc67d01ec0acfc5598501897 100644
--- a/substrate/client/consensus/pow/Cargo.toml
+++ b/substrate/client/consensus/pow/Cargo.toml
@@ -1,12 +1,12 @@
 [package]
 name = "sc-consensus-pow"
 version = "0.10.0-dev"
-authors = ["Parity Technologies <admin@parity.io>"]
+authors.workspace = true
 description = "PoW consensus algorithm for substrate"
-edition = "2021"
+edition.workspace = true
 license = "GPL-3.0-or-later WITH Classpath-exception-2.0"
 homepage = "https://substrate.io"
-repository = "https://github.com/paritytech/substrate/"
+repository.workspace = true
 readme = "README.md"
 
 [package.metadata.docs.rs]
diff --git a/substrate/client/consensus/slots/Cargo.toml b/substrate/client/consensus/slots/Cargo.toml
index a29979541e35fbf00d84478df6436c5580aeb997..52c528c3028a80edbba90e13a48d22a24fd45d38 100644
--- a/substrate/client/consensus/slots/Cargo.toml
+++ b/substrate/client/consensus/slots/Cargo.toml
@@ -1,13 +1,13 @@
 [package]
 name = "sc-consensus-slots"
 version = "0.10.0-dev"
-authors = ["Parity Technologies <admin@parity.io>"]
+authors.workspace = true
 description = "Generic slots-based utilities for consensus"
-edition = "2021"
+edition.workspace = true
 build = "build.rs"
 license = "GPL-3.0-or-later WITH Classpath-exception-2.0"
 homepage = "https://substrate.io"
-repository = "https://github.com/paritytech/substrate/"
+repository.workspace = true
 readme = "README.md"
 
 [package.metadata.docs.rs]
diff --git a/substrate/client/consensus/slots/README.md b/substrate/client/consensus/slots/README.md
index 9ab3c3742f33076b46be61efbf3c3e5fd824b50c..aa896430f7dc2a56ce1b41a43de634e9e34f039e 100644
--- a/substrate/client/consensus/slots/README.md
+++ b/substrate/client/consensus/slots/README.md
@@ -4,4 +4,4 @@ Some consensus algorithms have a concept of *slots*, which are intervals in
 time during which certain events can and/or must occur.  This crate
 provides generic functionality for slots.
 
-License: GPL-3.0-or-later WITH Classpath-exception-2.0
\ No newline at end of file
+License: GPL-3.0-or-later WITH Classpath-exception-2.0
diff --git a/substrate/client/consensus/slots/src/lib.rs b/substrate/client/consensus/slots/src/lib.rs
index 5ee93d168643702387d0ee1529b8875d66b1a860..12636aae7a4412228ab1da5755c9f82669c469e5 100644
--- a/substrate/client/consensus/slots/src/lib.rs
+++ b/substrate/client/consensus/slots/src/lib.rs
@@ -126,7 +126,7 @@ pub trait SimpleSlotWorker<B: BlockT> {
 
 	/// Tries to claim the given slot, returning an object with claim data if successful.
 	async fn claim_slot(
-		&self,
+		&mut self,
 		header: &B::Header,
 		slot: Slot,
 		aux_data: &Self::AuxData,
diff --git a/substrate/client/db/Cargo.toml b/substrate/client/db/Cargo.toml
index 025d0cac212c1faa39a6a1cdba9bfad03f81e78a..cb9560b6cb62fbd9cab7d335eee1a0a352d69ef2 100644
--- a/substrate/client/db/Cargo.toml
+++ b/substrate/client/db/Cargo.toml
@@ -1,11 +1,11 @@
 [package]
 name = "sc-client-db"
 version = "0.10.0-dev"
-authors = ["Parity Technologies <admin@parity.io>"]
-edition = "2021"
+authors.workspace = true
+edition.workspace = true
 license = "GPL-3.0-or-later WITH Classpath-exception-2.0"
 homepage = "https://substrate.io"
-repository = "https://github.com/paritytech/substrate/"
+repository.workspace = true
 description = "Client backend that uses RocksDB database as storage."
 readme = "README.md"
 
diff --git a/substrate/client/db/README.md b/substrate/client/db/README.md
index e5fb3fce1d9763d92554b3d0c6262e4e3cfccd66..a11ae0d6f57effd7f7766dbc6f37fc42e60c8f6d 100644
--- a/substrate/client/db/README.md
+++ b/substrate/client/db/README.md
@@ -8,4 +8,4 @@ having discarded heavy state that will allow a chain reorganization.
 
 Finality implies canonicality but not vice-versa.
 
-License: GPL-3.0-or-later WITH Classpath-exception-2.0
\ No newline at end of file
+License: GPL-3.0-or-later WITH Classpath-exception-2.0
diff --git a/substrate/client/db/src/bench.rs b/substrate/client/db/src/bench.rs
index 38c37a42ede79659639268eb34e10316c8cbed15..03ad4817b53bcea2cb349d4d05c190bb239530fa 100644
--- a/substrate/client/db/src/bench.rs
+++ b/substrate/client/db/src/bench.rs
@@ -37,7 +37,7 @@ use sp_state_machine::{
 };
 use sp_trie::{
 	cache::{CacheSize, SharedTrieCache},
-	prefixed_key, MemoryDB,
+	prefixed_key, MemoryDB, MerkleValue,
 };
 use std::{
 	cell::{Cell, RefCell},
@@ -382,6 +382,27 @@ impl<B: BlockT> StateBackend<HashingFor<B>> for BenchmarkingState<B> {
 			.child_storage_hash(child_info, key)
 	}
 
+	fn closest_merkle_value(
+		&self,
+		key: &[u8],
+	) -> Result<Option<MerkleValue<B::Hash>>, Self::Error> {
+		self.add_read_key(None, key);
+		self.state.borrow().as_ref().ok_or_else(state_err)?.closest_merkle_value(key)
+	}
+
+	fn child_closest_merkle_value(
+		&self,
+		child_info: &ChildInfo,
+		key: &[u8],
+	) -> Result<Option<MerkleValue<B::Hash>>, Self::Error> {
+		self.add_read_key(None, key);
+		self.state
+			.borrow()
+			.as_ref()
+			.ok_or_else(state_err)?
+			.child_closest_merkle_value(child_info, key)
+	}
+
 	fn exists_storage(&self, key: &[u8]) -> Result<bool, Self::Error> {
 		self.add_read_key(None, key);
 		self.state.borrow().as_ref().ok_or_else(state_err)?.exists_storage(key)
diff --git a/substrate/client/db/src/lib.rs b/substrate/client/db/src/lib.rs
index 73fb4f8ce6db37f0857813d5b64821e77413b34b..194bec8a88eb46fd90537bf61a65c12dc02982c8 100644
--- a/substrate/client/db/src/lib.rs
+++ b/substrate/client/db/src/lib.rs
@@ -90,7 +90,7 @@ use sp_state_machine::{
 	OffchainChangesCollection, StateMachineStats, StorageCollection, StorageIterator, StorageKey,
 	StorageValue, UsageInfo as StateUsageInfo,
 };
-use sp_trie::{cache::SharedTrieCache, prefixed_key, MemoryDB, PrefixedMemoryDB};
+use sp_trie::{cache::SharedTrieCache, prefixed_key, MemoryDB, MerkleValue, PrefixedMemoryDB};
 
 // Re-export the Database trait so that one can pass an implementation of it.
 pub use sc_state_db::PruningMode;
@@ -214,6 +214,21 @@ impl<B: BlockT> StateBackend<HashingFor<B>> for RefTrackingState<B> {
 		self.state.child_storage_hash(child_info, key)
 	}
 
+	fn closest_merkle_value(
+		&self,
+		key: &[u8],
+	) -> Result<Option<MerkleValue<B::Hash>>, Self::Error> {
+		self.state.closest_merkle_value(key)
+	}
+
+	fn child_closest_merkle_value(
+		&self,
+		child_info: &ChildInfo,
+		key: &[u8],
+	) -> Result<Option<MerkleValue<B::Hash>>, Self::Error> {
+		self.state.child_closest_merkle_value(child_info, key)
+	}
+
 	fn exists_storage(&self, key: &[u8]) -> Result<bool, Self::Error> {
 		self.state.exists_storage(key)
 	}
diff --git a/substrate/client/db/src/record_stats_state.rs b/substrate/client/db/src/record_stats_state.rs
index 29ece84f97e5744c7fb0902d5f5fc98ba0eb7ced..d9a35c075d79486683a632fabb7707891fa1ad8a 100644
--- a/substrate/client/db/src/record_stats_state.rs
+++ b/substrate/client/db/src/record_stats_state.rs
@@ -28,6 +28,7 @@ use sp_state_machine::{
 	backend::{AsTrieBackend, Backend as StateBackend},
 	BackendTransaction, IterArgs, StorageIterator, StorageKey, StorageValue, TrieBackend,
 };
+use sp_trie::MerkleValue;
 use std::sync::Arc;
 
 /// State abstraction for recording stats about state access.
@@ -144,6 +145,21 @@ impl<S: StateBackend<HashingFor<B>>, B: BlockT> StateBackend<HashingFor<B>>
 		self.state.child_storage_hash(child_info, key)
 	}
 
+	fn closest_merkle_value(
+		&self,
+		key: &[u8],
+	) -> Result<Option<MerkleValue<B::Hash>>, Self::Error> {
+		self.state.closest_merkle_value(key)
+	}
+
+	fn child_closest_merkle_value(
+		&self,
+		child_info: &ChildInfo,
+		key: &[u8],
+	) -> Result<Option<MerkleValue<B::Hash>>, Self::Error> {
+		self.state.child_closest_merkle_value(child_info, key)
+	}
+
 	fn exists_storage(&self, key: &[u8]) -> Result<bool, Self::Error> {
 		self.state.exists_storage(key)
 	}
diff --git a/substrate/client/executor/Cargo.toml b/substrate/client/executor/Cargo.toml
index 877e91c2021029b7fa2171a9b2f0272a3b2f9ffd..9f41b74237374334e079970f25e3e14526636c35 100644
--- a/substrate/client/executor/Cargo.toml
+++ b/substrate/client/executor/Cargo.toml
@@ -1,11 +1,11 @@
 [package]
 name = "sc-executor"
 version = "0.10.0-dev"
-authors = ["Parity Technologies <admin@parity.io>"]
-edition = "2021"
+authors.workspace = true
+edition.workspace = true
 license = "GPL-3.0-or-later WITH Classpath-exception-2.0"
 homepage = "https://substrate.io"
-repository = "https://github.com/paritytech/substrate/"
+repository.workspace = true
 description = "A crate that provides means of executing/dispatching calls into the runtime."
 documentation = "https://docs.rs/sc-executor"
 readme = "README.md"
diff --git a/substrate/client/executor/README.md b/substrate/client/executor/README.md
index ab7b3d45206f9fc4ca4e0323dcc5b27bbf943226..6a35697962fa3a5dffb14abacd5e50341ff28dad 100644
--- a/substrate/client/executor/README.md
+++ b/substrate/client/executor/README.md
@@ -10,4 +10,4 @@ provided into the wasm runtime module.
 by the current value of `:code` in the provided externalities), i.e. interfacing with
 wasm engine used, instance cache.
 
-License: GPL-3.0-or-later WITH Classpath-exception-2.0
\ No newline at end of file
+License: GPL-3.0-or-later WITH Classpath-exception-2.0
diff --git a/substrate/client/executor/benches/bench.rs b/substrate/client/executor/benches/bench.rs
index 66a82a175221d6a9aa229c5a593f3531f80f656f..86c769f88811b9d004e373ac22a166ae84416df2 100644
--- a/substrate/client/executor/benches/bench.rs
+++ b/substrate/client/executor/benches/bench.rs
@@ -150,13 +150,6 @@ fn bench_call_instance(c: &mut Criterion) {
 	let _ = env_logger::try_init();
 
 	let strategies = [
-		(
-			"legacy_instance_reuse",
-			Method::Compiled {
-				instantiation_strategy: InstantiationStrategy::LegacyInstanceReuse,
-				precompile: false,
-			},
-		),
 		(
 			"recreate_instance_vanilla",
 			Method::Compiled {
diff --git a/substrate/client/executor/common/Cargo.toml b/substrate/client/executor/common/Cargo.toml
index 3dda7363b74ce702674acae6245e1f437f588034..5118279b43b44ad75df3b8882592640c5ec9bd11 100644
--- a/substrate/client/executor/common/Cargo.toml
+++ b/substrate/client/executor/common/Cargo.toml
@@ -1,11 +1,11 @@
 [package]
 name = "sc-executor-common"
 version = "0.10.0-dev"
-authors = ["Parity Technologies <admin@parity.io>"]
-edition = "2021"
+authors.workspace = true
+edition.workspace = true
 license = "GPL-3.0-or-later WITH Classpath-exception-2.0"
 homepage = "https://substrate.io"
-repository = "https://github.com/paritytech/substrate/"
+repository.workspace = true
 description = "A set of common definitions that are needed for defining execution engines."
 documentation = "https://docs.rs/sc-executor-common/"
 readme = "README.md"
@@ -14,7 +14,7 @@ readme = "README.md"
 targets = ["x86_64-unknown-linux-gnu"]
 
 [dependencies]
-thiserror = "1.0.30"
+thiserror = "1.0.48"
 wasm-instrument = "0.3"
 sc-allocator = { path = "../../allocator" }
 sp-maybe-compressed-blob = { path = "../../../primitives/maybe-compressed-blob" }
diff --git a/substrate/client/executor/common/README.md b/substrate/client/executor/common/README.md
index 0c0d3bf08bcb20519013a428ee4daf9ce6c1a622..253d7340313765b1913798029a47807480004433 100644
--- a/substrate/client/executor/common/README.md
+++ b/substrate/client/executor/common/README.md
@@ -1,3 +1,3 @@
 A set of common definitions that are needed for defining execution engines.
 
-License: GPL-3.0-or-later WITH Classpath-exception-2.0
\ No newline at end of file
+License: GPL-3.0-or-later WITH Classpath-exception-2.0
diff --git a/substrate/client/executor/common/src/runtime_blob/data_segments_snapshot.rs b/substrate/client/executor/common/src/runtime_blob/data_segments_snapshot.rs
deleted file mode 100644
index 3fd546ce4457b225819aed8ff785a43c81e93d4d..0000000000000000000000000000000000000000
--- a/substrate/client/executor/common/src/runtime_blob/data_segments_snapshot.rs
+++ /dev/null
@@ -1,87 +0,0 @@
-// This file is part of Substrate.
-
-// Copyright (C) Parity Technologies (UK) Ltd.
-// SPDX-License-Identifier: GPL-3.0-or-later WITH Classpath-exception-2.0
-
-// This program 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.
-
-// This program 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 this program. If not, see <https://www.gnu.org/licenses/>.
-
-use super::RuntimeBlob;
-use crate::error::{self, Error};
-use std::mem;
-use wasm_instrument::parity_wasm::elements::Instruction;
-
-/// This is a snapshot of data segments specialzied for a particular instantiation.
-///
-/// Note that this assumes that no mutable globals are used.
-#[derive(Clone)]
-pub struct DataSegmentsSnapshot {
-	/// The list of data segments represented by (offset, contents).
-	data_segments: Vec<(u32, Vec<u8>)>,
-}
-
-impl DataSegmentsSnapshot {
-	/// Create a snapshot from the data segments from the module.
-	pub fn take(module: &RuntimeBlob) -> error::Result<Self> {
-		let data_segments = module
-			.data_segments()
-			.into_iter()
-			.map(|mut segment| {
-				// Just replace contents of the segment since the segments will be discarded later
-				// anyway.
-				let contents = mem::take(segment.value_mut());
-
-				let init_expr = match segment.offset() {
-					Some(offset) => offset.code(),
-					// Return if the segment is passive
-					None => return Err(Error::SharedMemUnsupported),
-				};
-
-				// [op, End]
-				if init_expr.len() != 2 {
-					return Err(Error::InitializerHasTooManyExpressions)
-				}
-				let offset = match &init_expr[0] {
-					Instruction::I32Const(v) => *v as u32,
-					Instruction::GetGlobal(_) => {
-						// In a valid wasm file, initializer expressions can only refer imported
-						// globals.
-						//
-						// At the moment of writing the Substrate Runtime Interface does not provide
-						// any globals. There is nothing that prevents us from supporting this
-						// if/when we gain those.
-						return Err(Error::ImportedGlobalsUnsupported)
-					},
-					insn => return Err(Error::InvalidInitializerExpression(format!("{:?}", insn))),
-				};
-
-				Ok((offset, contents))
-			})
-			.collect::<error::Result<Vec<_>>>()?;
-
-		Ok(Self { data_segments })
-	}
-
-	/// Apply the given snapshot to a linear memory.
-	///
-	/// Linear memory interface is represented by a closure `memory_set`.
-	pub fn apply<E>(
-		&self,
-		mut memory_set: impl FnMut(u32, &[u8]) -> Result<(), E>,
-	) -> Result<(), E> {
-		for (offset, contents) in &self.data_segments {
-			memory_set(*offset, contents)?;
-		}
-		Ok(())
-	}
-}
diff --git a/substrate/client/executor/common/src/runtime_blob/globals_snapshot.rs b/substrate/client/executor/common/src/runtime_blob/globals_snapshot.rs
deleted file mode 100644
index 9ba6fc55e49c2a002d6e574a56e6b6865292e969..0000000000000000000000000000000000000000
--- a/substrate/client/executor/common/src/runtime_blob/globals_snapshot.rs
+++ /dev/null
@@ -1,112 +0,0 @@
-// This file is part of Substrate.
-
-// Copyright (C) Parity Technologies (UK) Ltd.
-// SPDX-License-Identifier: GPL-3.0-or-later WITH Classpath-exception-2.0
-
-// This program 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.
-
-// This program 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 this program. If not, see <https://www.gnu.org/licenses/>.
-
-use super::RuntimeBlob;
-
-/// Saved value of particular exported global.
-struct SavedValue<Global> {
-	/// The handle of this global which can be used to refer to this global.
-	handle: Global,
-	/// The global value that was observed during the snapshot creation.
-	value: sp_wasm_interface::Value,
-}
-
-/// An adapter for a wasm module instance that is focused on getting and setting globals.
-pub trait InstanceGlobals {
-	/// A handle to a global which can be used to get or set a global variable. This is supposed to
-	/// be a lightweight handle, like an index or an Rc-like smart-pointer, which is cheap to clone.
-	type Global: Clone;
-	/// Get a handle to a global by it's export name.
-	///
-	/// The requested export is must exist in the exported list, and it should be a mutable global.
-	fn get_global(&mut self, export_name: &str) -> Self::Global;
-	/// Get the current value of the global.
-	fn get_global_value(&mut self, global: &Self::Global) -> sp_wasm_interface::Value;
-	/// Update the current value of the global.
-	///
-	/// The global behind the handle is guaranteed to be mutable and the value to be the same type
-	/// as the global.
-	fn set_global_value(&mut self, global: &Self::Global, value: sp_wasm_interface::Value);
-}
-
-/// A set of exposed mutable globals.
-///
-/// This is set of globals required to create a [`GlobalsSnapshot`] and that are collected from
-/// a runtime blob that was instrumented by
-/// [`RuntimeBlob::expose_mutable_globals`](super::RuntimeBlob::expose_mutable_globals`).
-
-/// If the code wasn't instrumented then it would be empty and snapshot would do nothing.
-pub struct ExposedMutableGlobalsSet(Vec<String>);
-
-impl ExposedMutableGlobalsSet {
-	/// Collect the set from the given runtime blob. See the struct documentation for details.
-	pub fn collect(runtime_blob: &RuntimeBlob) -> Self {
-		let global_names =
-			runtime_blob.exported_internal_global_names().map(ToOwned::to_owned).collect();
-		Self(global_names)
-	}
-}
-
-/// A snapshot of a global variables values. This snapshot can be later used for restoring the
-/// values to the preserved state.
-///
-/// Technically, a snapshot stores only values of mutable global variables. This is because
-/// immutable global variables always have the same values.
-///
-/// We take it from an instance rather from a module because the start function could potentially
-/// change any of the mutable global values.
-pub struct GlobalsSnapshot<Global>(Vec<SavedValue<Global>>);
-
-impl<Global> GlobalsSnapshot<Global> {
-	/// Take a snapshot of global variables for a given instance.
-	///
-	/// # Panics
-	///
-	/// This function panics if the instance doesn't correspond to the module from which the
-	/// [`ExposedMutableGlobalsSet`] was collected.
-	pub fn take<Instance>(
-		mutable_globals: &ExposedMutableGlobalsSet,
-		instance: &mut Instance,
-	) -> Self
-	where
-		Instance: InstanceGlobals<Global = Global>,
-	{
-		let global_names = &mutable_globals.0;
-		let mut saved_values = Vec::with_capacity(global_names.len());
-
-		for global_name in global_names {
-			let handle = instance.get_global(global_name);
-			let value = instance.get_global_value(&handle);
-			saved_values.push(SavedValue { handle, value });
-		}
-
-		Self(saved_values)
-	}
-
-	/// Apply the snapshot to the given instance.
-	///
-	/// This instance must be the same that was used for creation of this snapshot.
-	pub fn apply<Instance>(&self, instance: &mut Instance)
-	where
-		Instance: InstanceGlobals<Global = Global>,
-	{
-		for saved_value in &self.0 {
-			instance.set_global_value(&saved_value.handle, saved_value.value);
-		}
-	}
-}
diff --git a/substrate/client/executor/common/src/runtime_blob/mod.rs b/substrate/client/executor/common/src/runtime_blob/mod.rs
index 07a0945cc2b668b1c9737b171bd3dc4707903d11..8261d07eda5efce09a0b73ebd33b8ec9720c5d5d 100644
--- a/substrate/client/executor/common/src/runtime_blob/mod.rs
+++ b/substrate/client/executor/common/src/runtime_blob/mod.rs
@@ -46,10 +46,6 @@
 //! is free of any floating point operations, which is a useful step towards making instances
 //! produced from such a module deterministic.
 
-mod data_segments_snapshot;
-mod globals_snapshot;
 mod runtime_blob;
 
-pub use data_segments_snapshot::DataSegmentsSnapshot;
-pub use globals_snapshot::{ExposedMutableGlobalsSet, GlobalsSnapshot, InstanceGlobals};
 pub use runtime_blob::RuntimeBlob;
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 24dc7e393a4bccd1806f4ce5b6dccacaeeac8302..becf9e219b0b7a60f97bb08b4044897b143bd006 100644
--- a/substrate/client/executor/common/src/runtime_blob/runtime_blob.rs
+++ b/substrate/client/executor/common/src/runtime_blob/runtime_blob.rs
@@ -20,8 +20,8 @@ use crate::{error::WasmError, wasm_runtime::HeapAllocStrategy};
 use wasm_instrument::{
 	export_mutable_globals,
 	parity_wasm::elements::{
-		deserialize_buffer, serialize, DataSegment, ExportEntry, External, Internal, MemorySection,
-		MemoryType, Module, Section,
+		deserialize_buffer, serialize, ExportEntry, External, Internal, MemorySection, MemoryType,
+		Module, Section,
 	},
 };
 
@@ -52,11 +52,6 @@ impl RuntimeBlob {
 		Ok(Self { raw_module })
 	}
 
-	/// Extract the data segments from the given wasm code.
-	pub(super) fn data_segments(&self) -> Vec<DataSegment> {
-		self.raw_module.data_section().map(|ds| ds.entries()).unwrap_or(&[]).to_vec()
-	}
-
 	/// The number of globals defined in locally in this module.
 	pub fn declared_globals_count(&self) -> u32 {
 		self.raw_module
@@ -190,16 +185,6 @@ impl RuntimeBlob {
 		Ok(())
 	}
 
-	/// Returns an iterator of all globals which were exported by [`expose_mutable_globals`].
-	pub(super) fn exported_internal_global_names(&self) -> impl Iterator<Item = &str> {
-		let exports = self.raw_module.export_section().map(|es| es.entries()).unwrap_or(&[]);
-		exports.iter().filter_map(|export| match export.internal() {
-			Internal::Global(_) if export.field().starts_with("exported_internal_global") =>
-				Some(export.field()),
-			_ => None,
-		})
-	}
-
 	/// Scans the wasm blob for the first section with the name that matches the given. Returns the
 	/// contents of the custom section if found or `None` otherwise.
 	pub fn custom_section_contents(&self, section_name: &str) -> Option<&[u8]> {
diff --git a/substrate/client/executor/common/src/wasm_runtime.rs b/substrate/client/executor/common/src/wasm_runtime.rs
index 5dac77e59fa7488e14fe35059f465ffce9b6407e..d8e142b9d55905e3e31d2247f5a48e8e2b0f987a 100644
--- a/substrate/client/executor/common/src/wasm_runtime.rs
+++ b/substrate/client/executor/common/src/wasm_runtime.rs
@@ -115,16 +115,6 @@ pub trait WasmInstance: Send {
 	///
 	/// This method is only suitable for getting immutable globals.
 	fn get_global_const(&mut self, name: &str) -> Result<Option<Value>, Error>;
-
-	/// **Testing Only**. This function returns the base address of the linear memory.
-	///
-	/// This is meant to be the starting address of the memory mapped area for the linear memory.
-	///
-	/// This function is intended only for a specific test that measures physical memory
-	/// consumption.
-	fn linear_memory_base_ptr(&self) -> Option<*const u8> {
-		None
-	}
 }
 
 /// Defines the heap pages allocation strategy the wasm runtime should use.
diff --git a/substrate/client/executor/runtime-test/Cargo.toml b/substrate/client/executor/runtime-test/Cargo.toml
index 2b397b61689d01aa339d28b7165a56722f8965d9..046e59c08e0251890e83ea818e90c28e652e8f70 100644
--- a/substrate/client/executor/runtime-test/Cargo.toml
+++ b/substrate/client/executor/runtime-test/Cargo.toml
@@ -1,13 +1,13 @@
 [package]
 name = "sc-runtime-test"
 version = "2.0.0"
-authors = ["Parity Technologies <admin@parity.io>"]
-edition = "2021"
+authors.workspace = true
+edition.workspace = true
 build = "build.rs"
 license = "GPL-3.0-or-later WITH Classpath-exception-2.0"
 publish = false
 homepage = "https://substrate.io"
-repository = "https://github.com/paritytech/substrate/"
+repository.workspace = true
 
 [package.metadata.docs.rs]
 targets = ["x86_64-unknown-linux-gnu"]
diff --git a/substrate/client/executor/runtime-test/src/lib.rs b/substrate/client/executor/runtime-test/src/lib.rs
index 2bd2aeeb606ebed10a50743d13cccb6aa08abe39..ec9b2378d4d463b36fdd7370e013ab4de6849226 100644
--- a/substrate/client/executor/runtime-test/src/lib.rs
+++ b/substrate/client/executor/runtime-test/src/lib.rs
@@ -1,3 +1,21 @@
+// This file is part of Substrate.
+
+// Copyright (C) Parity Technologies (UK) Ltd.
+// SPDX-License-Identifier: GPL-3.0-or-later WITH Classpath-exception-2.0
+
+// This program 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.
+
+// This program 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 this program. If not, see <https://www.gnu.org/licenses/>.
+
 #![cfg_attr(not(feature = "std"), no_std)]
 
 // Make the WASM binary available.
diff --git a/substrate/client/executor/src/integration_tests/linux.rs b/substrate/client/executor/src/integration_tests/linux.rs
deleted file mode 100644
index 68ac37e9011a18a811ad8acba7026ac974a2c888..0000000000000000000000000000000000000000
--- a/substrate/client/executor/src/integration_tests/linux.rs
+++ /dev/null
@@ -1,84 +0,0 @@
-// This file is part of Substrate.
-
-// Copyright (C) Parity Technologies (UK) Ltd.
-// SPDX-License-Identifier: GPL-3.0-or-later WITH Classpath-exception-2.0
-
-// This program 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.
-
-// This program 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 this program. If not, see <https://www.gnu.org/licenses/>.
-
-//! Tests that are only relevant for Linux.
-
-mod smaps;
-
-use super::mk_test_runtime;
-use crate::WasmExecutionMethod;
-use codec::Encode as _;
-use sc_executor_common::wasm_runtime::DEFAULT_HEAP_ALLOC_STRATEGY;
-
-use self::smaps::Smaps;
-
-#[test]
-fn memory_consumption_compiled() {
-	let _ = sp_tracing::try_init_simple();
-
-	if std::env::var("RUN_TEST").is_ok() {
-		memory_consumption(WasmExecutionMethod::Compiled {
-			instantiation_strategy:
-				sc_executor_wasmtime::InstantiationStrategy::LegacyInstanceReuse,
-		});
-	} else {
-		// We need to run the test in isolation, to not getting interfered by the other tests.
-		let executable = std::env::current_exe().unwrap();
-		let status = std::process::Command::new(executable)
-			.env("RUN_TEST", "1")
-			.args(&["--nocapture", "memory_consumption_compiled"])
-			.status()
-			.unwrap();
-
-		assert!(status.success());
-	}
-}
-
-fn memory_consumption(wasm_method: WasmExecutionMethod) {
-	// This aims to see if linear memory stays backed by the physical memory after a runtime call.
-	//
-	// For that we make a series of runtime calls, probing the RSS for the VMA matching the linear
-	// memory. After the call we expect RSS to be equal to 0.
-
-	let runtime = mk_test_runtime(wasm_method, DEFAULT_HEAP_ALLOC_STRATEGY);
-
-	let mut instance = runtime.new_instance().unwrap();
-	let heap_base = instance
-		.get_global_const("__heap_base")
-		.expect("`__heap_base` is valid")
-		.expect("`__heap_base` exists")
-		.as_i32()
-		.expect("`__heap_base` is an `i32`");
-
-	fn probe_rss(instance: &dyn sc_executor_common::wasm_runtime::WasmInstance) -> usize {
-		let base_addr = instance.linear_memory_base_ptr().unwrap() as usize;
-		Smaps::new().get_rss(base_addr).expect("failed to get rss")
-	}
-
-	instance
-		.call_export("test_dirty_plenty_memory", &(heap_base as u32, 1u32).encode())
-		.unwrap();
-	let probe_1 = probe_rss(&*instance);
-	instance
-		.call_export("test_dirty_plenty_memory", &(heap_base as u32, 1024u32).encode())
-		.unwrap();
-	let probe_2 = probe_rss(&*instance);
-
-	assert_eq!(probe_1, 0);
-	assert_eq!(probe_2, 0);
-}
diff --git a/substrate/client/executor/src/integration_tests/linux/smaps.rs b/substrate/client/executor/src/integration_tests/linux/smaps.rs
deleted file mode 100644
index 1ac570dd8d5f237b61eb4006e39c8b25bb211a90..0000000000000000000000000000000000000000
--- a/substrate/client/executor/src/integration_tests/linux/smaps.rs
+++ /dev/null
@@ -1,82 +0,0 @@
-// This file is part of Substrate.
-
-// Copyright (C) Parity Technologies (UK) Ltd.
-// SPDX-License-Identifier: GPL-3.0-or-later WITH Classpath-exception-2.0
-
-// This program 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.
-
-// This program 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 this program. If not, see <https://www.gnu.org/licenses/>.
-
-//! A tool for extracting information about the memory consumption of the current process from
-//! the procfs.
-
-use std::{collections::BTreeMap, ops::Range};
-
-/// An interface to the /proc/self/smaps
-///
-/// See docs about [procfs on kernel.org][procfs]
-///
-/// [procfs]: https://www.kernel.org/doc/html/latest/filesystems/proc.html
-pub struct Smaps(Vec<(Range<usize>, BTreeMap<String, usize>)>);
-
-impl Smaps {
-	pub fn new() -> Self {
-		let regex_start = regex::RegexBuilder::new("^([0-9a-f]+)-([0-9a-f]+)")
-			.multi_line(true)
-			.build()
-			.unwrap();
-		let regex_kv = regex::RegexBuilder::new(r#"^([^:]+):\s*(\d+) kB"#)
-			.multi_line(true)
-			.build()
-			.unwrap();
-		let smaps = std::fs::read_to_string("/proc/self/smaps").unwrap();
-		let boundaries: Vec<_> = regex_start
-			.find_iter(&smaps)
-			.map(|matched| matched.start())
-			.chain(std::iter::once(smaps.len()))
-			.collect();
-
-		let mut output = Vec::new();
-		for window in boundaries.windows(2) {
-			let chunk = &smaps[window[0]..window[1]];
-			let caps = regex_start.captures(chunk).unwrap();
-			let start = usize::from_str_radix(caps.get(1).unwrap().as_str(), 16).unwrap();
-			let end = usize::from_str_radix(caps.get(2).unwrap().as_str(), 16).unwrap();
-
-			let values = regex_kv
-				.captures_iter(chunk)
-				.map(|cap| {
-					let key = cap.get(1).unwrap().as_str().to_owned();
-					let value = cap.get(2).unwrap().as_str().parse().unwrap();
-					(key, value)
-				})
-				.collect();
-
-			output.push((start..end, values));
-		}
-
-		Self(output)
-	}
-
-	fn get_map(&self, addr: usize) -> &BTreeMap<String, usize> {
-		&self
-			.0
-			.iter()
-			.find(|(range, _)| addr >= range.start && addr < range.end)
-			.unwrap()
-			.1
-	}
-
-	pub fn get_rss(&self, addr: usize) -> Option<usize> {
-		self.get_map(addr).get("Rss").cloned()
-	}
-}
diff --git a/substrate/client/executor/src/integration_tests/mod.rs b/substrate/client/executor/src/integration_tests/mod.rs
index 37aed8eef96a1b81e703a26b9cd95e6a19c346a1..0bd080c243574c8af93e8f2bd66190bef35ebe24 100644
--- a/substrate/client/executor/src/integration_tests/mod.rs
+++ b/substrate/client/executor/src/integration_tests/mod.rs
@@ -16,9 +16,6 @@
 // You should have received a copy of the GNU General Public License
 // along with this program. If not, see <https://www.gnu.org/licenses/>.
 
-#[cfg(target_os = "linux")]
-mod linux;
-
 use assert_matches::assert_matches;
 use codec::{Decode, Encode};
 use sc_executor_common::{
@@ -81,14 +78,6 @@ macro_rules! test_wasm_execution {
 					instantiation_strategy: sc_executor_wasmtime::InstantiationStrategy::Pooling
 				});
 			}
-
-			#[test]
-			fn [<$method_name _compiled_legacy_instance_reuse>]() {
-				let _ = sp_tracing::try_init_simple();
-				$method_name(WasmExecutionMethod::Compiled {
-					instantiation_strategy: sc_executor_wasmtime::InstantiationStrategy::LegacyInstanceReuse
-				});
-			}
 		}
 	};
 }
diff --git a/substrate/client/executor/wasmtime/Cargo.toml b/substrate/client/executor/wasmtime/Cargo.toml
index 36c2940eb3acc54a8a58ede1775b1315db18a856..fee1afc96666bc55b11351bc200ca213ded7f346 100644
--- a/substrate/client/executor/wasmtime/Cargo.toml
+++ b/substrate/client/executor/wasmtime/Cargo.toml
@@ -1,11 +1,11 @@
 [package]
 name = "sc-executor-wasmtime"
 version = "0.10.0-dev"
-authors = ["Parity Technologies <admin@parity.io>"]
-edition = "2021"
+authors.workspace = true
+edition.workspace = true
 license = "GPL-3.0-or-later WITH Classpath-exception-2.0"
 homepage = "https://substrate.io"
-repository = "https://github.com/paritytech/substrate/"
+repository.workspace = true
 description = "Defines a `WasmRuntime` that uses the Wasmtime JIT to execute."
 readme = "README.md"
 
diff --git a/substrate/client/executor/wasmtime/README.md b/substrate/client/executor/wasmtime/README.md
index 3e9ac0bddbdc17539d12893553789983e38ab05f..64fc2fa0c28485566fc60329ad8cfc0057112bc7 100644
--- a/substrate/client/executor/wasmtime/README.md
+++ b/substrate/client/executor/wasmtime/README.md
@@ -1 +1 @@
-License: GPL-3.0-or-later WITH Classpath-exception-2.0
\ No newline at end of file
+License: GPL-3.0-or-later WITH Classpath-exception-2.0
diff --git a/substrate/client/executor/wasmtime/src/host.rs b/substrate/client/executor/wasmtime/src/host.rs
index 9bd3ca3dade5eaefc4f9457bd43663b0effaf03d..f8c78cbb660eefbe1a25a77a3a5301d99c9f3b9b 100644
--- a/substrate/client/executor/wasmtime/src/host.rs
+++ b/substrate/client/executor/wasmtime/src/host.rs
@@ -32,7 +32,7 @@ use crate::{instance_wrapper::MemoryWrapper, runtime::StoreData, util};
 pub struct HostState {
 	/// The allocator instance to keep track of allocated memory.
 	///
-	/// This is stored as an `Option` as we need to temporarly set this to `None` when we are
+	/// This is stored as an `Option` as we need to temporarily set this to `None` when we are
 	/// allocating/deallocating memory. The problem being that we can only mutable access `caller`
 	/// once.
 	allocator: Option<FreeingBumpHeapAllocator>,
diff --git a/substrate/client/executor/wasmtime/src/instance_wrapper.rs b/substrate/client/executor/wasmtime/src/instance_wrapper.rs
index 6d319cce509e54c6c52c2f55359e6c4bedd64bae..acc799061c27ca9ab7b96bde403f7e092d127bd6 100644
--- a/substrate/client/executor/wasmtime/src/instance_wrapper.rs
+++ b/substrate/client/executor/wasmtime/src/instance_wrapper.rs
@@ -116,14 +116,14 @@ impl EntryPoint {
 pub(crate) struct MemoryWrapper<'a, C>(pub &'a wasmtime::Memory, pub &'a mut C);
 
 impl<C: AsContextMut> sc_allocator::Memory for MemoryWrapper<'_, C> {
-	fn with_access<R>(&self, run: impl FnOnce(&[u8]) -> R) -> R {
-		run(self.0.data(&self.1))
-	}
-
 	fn with_access_mut<R>(&mut self, run: impl FnOnce(&mut [u8]) -> R) -> R {
 		run(self.0.data_mut(&mut self.1))
 	}
 
+	fn with_access<R>(&self, run: impl FnOnce(&[u8]) -> R) -> R {
+		run(self.0.data(&self.1))
+	}
+
 	fn grow(&mut self, additional: u32) -> std::result::Result<(), ()> {
 		self.0
 			.grow(&mut self.1, additional as u64)
@@ -153,11 +153,6 @@ impl<C: AsContextMut> sc_allocator::Memory for MemoryWrapper<'_, C> {
 /// routines.
 pub struct InstanceWrapper {
 	instance: Instance,
-	/// The memory instance of the `instance`.
-	///
-	/// It is important to make sure that we don't make any copies of this to make it easier to
-	/// proof
-	memory: Memory,
 	store: Store,
 }
 
@@ -177,7 +172,7 @@ impl InstanceWrapper {
 		store.data_mut().memory = Some(memory);
 		store.data_mut().table = table;
 
-		Ok(InstanceWrapper { instance, memory, store })
+		Ok(InstanceWrapper { instance, store })
 	}
 
 	/// Resolves a substrate entrypoint by the given name.
@@ -280,11 +275,6 @@ impl InstanceWrapper {
 			_ => Err("Unknown value type".into()),
 		}
 	}
-
-	/// Get a global with the given `name`.
-	pub fn get_global(&mut self, name: &str) -> Option<wasmtime::Global> {
-		self.instance.get_global(&mut self.store, name)
-	}
 }
 
 /// Extract linear memory instance from the given instance.
@@ -311,76 +301,6 @@ fn get_table(instance: &Instance, ctx: &mut Store) -> Option<Table> {
 
 /// Functions related to memory.
 impl InstanceWrapper {
-	/// Returns the pointer to the first byte of the linear memory for this instance.
-	pub fn base_ptr(&self) -> *const u8 {
-		self.memory.data_ptr(&self.store)
-	}
-
-	/// If possible removes physical backing from the allocated linear memory which
-	/// leads to returning the memory back to the system; this also zeroes the memory
-	/// as a side-effect.
-	pub fn decommit(&mut self) {
-		if self.memory.data_size(&self.store) == 0 {
-			return
-		}
-
-		cfg_if::cfg_if! {
-			if #[cfg(target_os = "linux")] {
-				use std::sync::Once;
-
-				unsafe {
-					let ptr = self.memory.data_ptr(&self.store);
-					let len = self.memory.data_size(&self.store);
-
-					// Linux handles MADV_DONTNEED reliably. The result is that the given area
-					// is unmapped and will be zeroed on the next pagefault.
-					if libc::madvise(ptr as _, len, libc::MADV_DONTNEED) != 0 {
-						static LOGGED: Once = Once::new();
-						LOGGED.call_once(|| {
-							log::warn!(
-								"madvise(MADV_DONTNEED) failed: {}",
-								std::io::Error::last_os_error(),
-							);
-						});
-					} else {
-						return;
-					}
-				}
-			} else if #[cfg(target_os = "macos")] {
-				use std::sync::Once;
-
-				unsafe {
-					let ptr = self.memory.data_ptr(&self.store);
-					let len = self.memory.data_size(&self.store);
-
-					// On MacOS we can simply overwrite memory mapping.
-					if libc::mmap(
-						ptr as _,
-						len,
-						libc::PROT_READ | libc::PROT_WRITE,
-						libc::MAP_FIXED | libc::MAP_PRIVATE | libc::MAP_ANONYMOUS,
-						-1,
-						0,
-					) == libc::MAP_FAILED {
-						static LOGGED: Once = Once::new();
-						LOGGED.call_once(|| {
-							log::warn!(
-								"Failed to decommit WASM instance memory through mmap: {}",
-								std::io::Error::last_os_error(),
-							);
-						});
-					} else {
-						return;
-					}
-				}
-			}
-		}
-
-		// If we're on an unsupported OS or the memory couldn't have been
-		// decommited for some reason then just manually zero it out.
-		self.memory.data_mut(self.store.as_context_mut()).fill(0);
-	}
-
 	pub(crate) fn store(&self) -> &Store {
 		&self.store
 	}
@@ -389,17 +309,3 @@ impl InstanceWrapper {
 		&mut self.store
 	}
 }
-
-#[test]
-fn decommit_works() {
-	let engine = wasmtime::Engine::default();
-	let code = wat::parse_str("(module (memory (export \"memory\") 1 4))").unwrap();
-	let module = wasmtime::Module::new(&engine, code).unwrap();
-	let linker = wasmtime::Linker::new(&engine);
-	let instance_pre = linker.instantiate_pre(&module).unwrap();
-	let mut wrapper = InstanceWrapper::new(&engine, &instance_pre).unwrap();
-	unsafe { *wrapper.memory.data_ptr(&wrapper.store) = 42 };
-	assert_eq!(unsafe { *wrapper.memory.data_ptr(&wrapper.store) }, 42);
-	wrapper.decommit();
-	assert_eq!(unsafe { *wrapper.memory.data_ptr(&wrapper.store) }, 0);
-}
diff --git a/substrate/client/executor/wasmtime/src/runtime.rs b/substrate/client/executor/wasmtime/src/runtime.rs
index 23b069870aa36f8c7e2b2e0fa45f9126c86c24de..ae78137959be1a4799bce16d23d2654931be4c47 100644
--- a/substrate/client/executor/wasmtime/src/runtime.rs
+++ b/substrate/client/executor/wasmtime/src/runtime.rs
@@ -27,9 +27,7 @@ use crate::{
 use sc_allocator::{AllocationStats, FreeingBumpHeapAllocator};
 use sc_executor_common::{
 	error::{Error, Result, WasmError},
-	runtime_blob::{
-		self, DataSegmentsSnapshot, ExposedMutableGlobalsSet, GlobalsSnapshot, RuntimeBlob,
-	},
+	runtime_blob::RuntimeBlob,
 	util::checked_range,
 	wasm_runtime::{HeapAllocStrategy, InvokeMethod, WasmInstance, WasmModule},
 };
@@ -69,17 +67,11 @@ impl StoreData {
 pub(crate) type Store = wasmtime::Store<StoreData>;
 
 enum Strategy {
-	LegacyInstanceReuse {
-		instance_wrapper: InstanceWrapper,
-		globals_snapshot: GlobalsSnapshot<wasmtime::Global>,
-		data_segments_snapshot: Arc<DataSegmentsSnapshot>,
-		heap_base: u32,
-	},
 	RecreateInstance(InstanceCreator),
 }
 
 struct InstanceCreator {
-	engine: wasmtime::Engine,
+	engine: Engine,
 	instance_pre: Arc<wasmtime::InstancePre<StoreData>>,
 }
 
@@ -89,40 +81,10 @@ impl InstanceCreator {
 	}
 }
 
-struct InstanceGlobals<'a> {
-	instance: &'a mut InstanceWrapper,
-}
-
-impl<'a> runtime_blob::InstanceGlobals for InstanceGlobals<'a> {
-	type Global = wasmtime::Global;
-
-	fn get_global(&mut self, export_name: &str) -> Self::Global {
-		self.instance
-			.get_global(export_name)
-			.expect("get_global is guaranteed to be called with an export name of a global; qed")
-	}
-
-	fn get_global_value(&mut self, global: &Self::Global) -> Value {
-		util::from_wasmtime_val(global.get(&mut self.instance.store_mut()))
-	}
-
-	fn set_global_value(&mut self, global: &Self::Global, value: Value) {
-		global.set(&mut self.instance.store_mut(), util::into_wasmtime_val(value)).expect(
-			"the value is guaranteed to be of the same value; the global is guaranteed to be mutable; qed",
-		);
-	}
-}
-
-/// Data required for creating instances with the fast instance reuse strategy.
-struct InstanceSnapshotData {
-	mutable_globals: ExposedMutableGlobalsSet,
-	data_segments_snapshot: Arc<DataSegmentsSnapshot>,
-}
-
 /// A `WasmModule` implementation using wasmtime to compile the runtime module to machine code
 /// and execute the compiled code.
 pub struct WasmtimeRuntime {
-	engine: wasmtime::Engine,
+	engine: Engine,
 	instance_pre: Arc<wasmtime::InstancePre<StoreData>>,
 	instantiation_strategy: InternalInstantiationStrategy,
 }
@@ -130,26 +92,6 @@ pub struct WasmtimeRuntime {
 impl WasmModule for WasmtimeRuntime {
 	fn new_instance(&self) -> Result<Box<dyn WasmInstance>> {
 		let strategy = match self.instantiation_strategy {
-			InternalInstantiationStrategy::LegacyInstanceReuse(ref snapshot_data) => {
-				let mut instance_wrapper = InstanceWrapper::new(&self.engine, &self.instance_pre)?;
-				let heap_base = instance_wrapper.extract_heap_base()?;
-
-				// This function panics if the instance was created from a runtime blob different
-				// from which the mutable globals were collected. Here, it is easy to see that there
-				// is only a single runtime blob and thus it's the same that was used for both
-				// creating the instance and collecting the mutable globals.
-				let globals_snapshot = GlobalsSnapshot::take(
-					&snapshot_data.mutable_globals,
-					&mut InstanceGlobals { instance: &mut instance_wrapper },
-				);
-
-				Strategy::LegacyInstanceReuse {
-					instance_wrapper,
-					globals_snapshot,
-					data_segments_snapshot: snapshot_data.data_segments_snapshot.clone(),
-					heap_base,
-				}
-			},
 			InternalInstantiationStrategy::Builtin => Strategy::RecreateInstance(InstanceCreator {
 				engine: self.engine.clone(),
 				instance_pre: self.instance_pre.clone(),
@@ -174,39 +116,12 @@ impl WasmtimeInstance {
 		allocation_stats: &mut Option<AllocationStats>,
 	) -> Result<Vec<u8>> {
 		match &mut self.strategy {
-			Strategy::LegacyInstanceReuse {
-				ref mut instance_wrapper,
-				globals_snapshot,
-				data_segments_snapshot,
-				heap_base,
-			} => {
-				let entrypoint = instance_wrapper.resolve_entrypoint(method)?;
-
-				data_segments_snapshot.apply(|offset, contents| {
-					util::write_memory_from(
-						instance_wrapper.store_mut(),
-						Pointer::new(offset),
-						contents,
-					)
-				})?;
-				globals_snapshot.apply(&mut InstanceGlobals { instance: instance_wrapper });
-				let allocator = FreeingBumpHeapAllocator::new(*heap_base);
-
-				let result =
-					perform_call(data, instance_wrapper, entrypoint, allocator, allocation_stats);
-
-				// Signal to the OS that we are done with the linear memory and that it can be
-				// reclaimed.
-				instance_wrapper.decommit();
-
-				result
-			},
 			Strategy::RecreateInstance(ref mut instance_creator) => {
 				let mut instance_wrapper = instance_creator.instantiate()?;
 				let heap_base = instance_wrapper.extract_heap_base()?;
 				let entrypoint = instance_wrapper.resolve_entrypoint(method)?;
-
 				let allocator = FreeingBumpHeapAllocator::new(heap_base);
+
 				perform_call(data, &mut instance_wrapper, entrypoint, allocator, allocation_stats)
 			},
 		}
@@ -226,24 +141,10 @@ impl WasmInstance for WasmtimeInstance {
 
 	fn get_global_const(&mut self, name: &str) -> Result<Option<Value>> {
 		match &mut self.strategy {
-			Strategy::LegacyInstanceReuse { instance_wrapper, .. } =>
-				instance_wrapper.get_global_val(name),
 			Strategy::RecreateInstance(ref mut instance_creator) =>
 				instance_creator.instantiate()?.get_global_val(name),
 		}
 	}
-
-	fn linear_memory_base_ptr(&self) -> Option<*const u8> {
-		match &self.strategy {
-			Strategy::RecreateInstance(_) => {
-				// We do not keep the wasm instance around, therefore there is no linear memory
-				// associated with it.
-				None
-			},
-			Strategy::LegacyInstanceReuse { instance_wrapper, .. } =>
-				Some(instance_wrapper.base_ptr()),
-		}
-	}
 }
 
 /// Prepare a directory structure and a config file to enable wasmtime caching.
@@ -338,7 +239,6 @@ fn common_config(semantics: &Semantics) -> std::result::Result<wasmtime::Config,
 		InstantiationStrategy::Pooling => (true, false),
 		InstantiationStrategy::RecreateInstanceCopyOnWrite => (false, true),
 		InstantiationStrategy::RecreateInstance => (false, false),
-		InstantiationStrategy::LegacyInstanceReuse => (false, false),
 	};
 
 	const WASM_PAGE_SIZE: u64 = 65536;
@@ -409,7 +309,7 @@ fn common_config(semantics: &Semantics) -> std::result::Result<wasmtime::Config,
 ///
 /// See [here][stack_height] for more details of the instrumentation
 ///
-/// [stack_height]: https://github.com/paritytech/wasm-utils/blob/d9432baf/src/stack_height/mod.rs#L1-L50
+/// [stack_height]: https://github.com/paritytech/wasm-instrument/blob/master/src/stack_limiter/mod.rs
 #[derive(Clone)]
 pub struct DeterministicStackLimit {
 	/// A number of logical "values" that can be pushed on the wasm stack. A trap will be triggered
@@ -458,13 +358,9 @@ pub enum InstantiationStrategy {
 
 	/// Recreate the instance from scratch on every instantiation. Very slow.
 	RecreateInstance,
-
-	/// Legacy instance reuse mechanism. DEPRECATED. Will be removed. Do not use.
-	LegacyInstanceReuse,
 }
 
 enum InternalInstantiationStrategy {
-	LegacyInstanceReuse(InstanceSnapshotData),
 	Builtin,
 }
 
@@ -655,22 +551,6 @@ where
 				.map_err(|e| WasmError::Other(format!("cannot create module: {:#}", e)))?;
 
 			match config.semantics.instantiation_strategy {
-				InstantiationStrategy::LegacyInstanceReuse => {
-					let data_segments_snapshot =
-						DataSegmentsSnapshot::take(&blob).map_err(|e| {
-							WasmError::Other(format!("cannot take data segments snapshot: {}", e))
-						})?;
-					let data_segments_snapshot = Arc::new(data_segments_snapshot);
-					let mutable_globals = ExposedMutableGlobalsSet::collect(&blob);
-
-					(
-						module,
-						InternalInstantiationStrategy::LegacyInstanceReuse(InstanceSnapshotData {
-							data_segments_snapshot,
-							mutable_globals,
-						}),
-					)
-				},
 				InstantiationStrategy::Pooling |
 				InstantiationStrategy::PoolingCopyOnWrite |
 				InstantiationStrategy::RecreateInstance |
@@ -679,12 +559,6 @@ where
 			}
 		},
 		CodeSupplyMode::Precompiled(compiled_artifact_path) => {
-			if let InstantiationStrategy::LegacyInstanceReuse =
-				config.semantics.instantiation_strategy
-			{
-				return Err(WasmError::Other("the legacy instance reuse instantiation strategy is incompatible with precompiled modules".into()));
-			}
-
 			// SAFETY: The unsafety of `deserialize_file` is covered by this function. The
 			//         responsibilities to maintain the invariants are passed to the caller.
 			//
@@ -695,12 +569,6 @@ where
 			(module, InternalInstantiationStrategy::Builtin)
 		},
 		CodeSupplyMode::PrecompiledBytes(compiled_artifact_bytes) => {
-			if let InstantiationStrategy::LegacyInstanceReuse =
-				config.semantics.instantiation_strategy
-			{
-				return Err(WasmError::Other("the legacy instance reuse instantiation strategy is incompatible with precompiled modules".into()));
-			}
-
 			// SAFETY: The unsafety of `deserialize` is covered by this function. The
 			//         responsibilities to maintain the invariants are passed to the caller.
 			//
@@ -730,13 +598,6 @@ fn prepare_blob_for_compilation(
 		blob = blob.inject_stack_depth_metering(logical_max)?;
 	}
 
-	if let InstantiationStrategy::LegacyInstanceReuse = semantics.instantiation_strategy {
-		// When this strategy is used this must be called after all other passes which may introduce
-		// new global variables, otherwise they will not be reset when we call into the runtime
-		// again.
-		blob.expose_mutable_globals();
-	}
-
 	// We don't actually need the memory to be imported so we can just convert any memory
 	// import into an export with impunity. This simplifies our code since `wasmtime` will
 	// now automatically take care of creating the memory for us, and it is also necessary
diff --git a/substrate/client/executor/wasmtime/src/tests.rs b/substrate/client/executor/wasmtime/src/tests.rs
index 65093687822d49b650c7a2a639b8a9ac864a202a..e185754b07696fde80f61787c659c869ff112842 100644
--- a/substrate/client/executor/wasmtime/src/tests.rs
+++ b/substrate/client/executor/wasmtime/src/tests.rs
@@ -30,7 +30,7 @@ type HostFunctions = sp_io::SubstrateHostFunctions;
 
 #[macro_export]
 macro_rules! test_wasm_execution {
-	(@no_legacy_instance_reuse $method_name:ident) => {
+	($method_name:ident) => {
 		paste::item! {
 			#[test]
 			fn [<$method_name _recreate_instance_cow>]() {
@@ -61,19 +61,6 @@ macro_rules! test_wasm_execution {
 			}
 		}
 	};
-
-	($method_name:ident) => {
-		test_wasm_execution!(@no_legacy_instance_reuse $method_name);
-
-		paste::item! {
-			#[test]
-			fn [<$method_name _legacy_instance_reuse>]() {
-				$method_name(
-					InstantiationStrategy::LegacyInstanceReuse
-				);
-			}
-		}
-	};
 }
 
 struct RuntimeBuilder {
@@ -330,14 +317,14 @@ fn test_max_memory_pages_exported_memory_without_precompilation(
 	test_max_memory_pages(instantiation_strategy, false, false);
 }
 
-test_wasm_execution!(@no_legacy_instance_reuse test_max_memory_pages_imported_memory_with_precompilation);
+test_wasm_execution!(test_max_memory_pages_imported_memory_with_precompilation);
 fn test_max_memory_pages_imported_memory_with_precompilation(
 	instantiation_strategy: InstantiationStrategy,
 ) {
 	test_max_memory_pages(instantiation_strategy, true, true);
 }
 
-test_wasm_execution!(@no_legacy_instance_reuse test_max_memory_pages_exported_memory_with_precompilation);
+test_wasm_execution!(test_max_memory_pages_exported_memory_with_precompilation);
 fn test_max_memory_pages_exported_memory_with_precompilation(
 	instantiation_strategy: InstantiationStrategy,
 ) {
diff --git a/substrate/client/executor/wasmtime/src/util.rs b/substrate/client/executor/wasmtime/src/util.rs
index c38d969ce9dcdc67575a6259265e10f8e9b0ed91..7af554c35e1b37274ff35a797b558a75f9032de4 100644
--- a/substrate/client/executor/wasmtime/src/util.rs
+++ b/substrate/client/executor/wasmtime/src/util.rs
@@ -21,33 +21,9 @@ use sc_executor_common::{
 	error::{Error, Result},
 	util::checked_range,
 };
-use sp_wasm_interface::{Pointer, Value};
+use sp_wasm_interface::Pointer;
 use wasmtime::{AsContext, AsContextMut};
 
-/// Converts a [`wasmtime::Val`] into a substrate runtime interface [`Value`].
-///
-/// Panics if the given value doesn't have a corresponding variant in `Value`.
-pub fn from_wasmtime_val(val: wasmtime::Val) -> Value {
-	match val {
-		wasmtime::Val::I32(v) => Value::I32(v),
-		wasmtime::Val::I64(v) => Value::I64(v),
-		wasmtime::Val::F32(f_bits) => Value::F32(f_bits),
-		wasmtime::Val::F64(f_bits) => Value::F64(f_bits),
-		v => panic!("Given value type is unsupported by Substrate: {:?}", v),
-	}
-}
-
-/// Converts a sp_wasm_interface's [`Value`] into the corresponding variant in wasmtime's
-/// [`wasmtime::Val`].
-pub fn into_wasmtime_val(value: Value) -> wasmtime::Val {
-	match value {
-		Value::I32(v) => wasmtime::Val::I32(v),
-		Value::I64(v) => wasmtime::Val::I64(v),
-		Value::F32(f_bits) => wasmtime::Val::F32(f_bits),
-		Value::F64(f_bits) => wasmtime::Val::F64(f_bits),
-	}
-}
-
 /// Read data from the instance memory into a slice.
 ///
 /// Returns an error if the read would go out of the memory bounds.
@@ -140,8 +116,8 @@ pub(crate) fn replace_strategy_if_broken(strategy: &mut InstantiationStrategy) {
 
 		// These strategies require a working `madvise` to be sound.
 		InstantiationStrategy::PoolingCopyOnWrite => InstantiationStrategy::Pooling,
-		InstantiationStrategy::RecreateInstanceCopyOnWrite |
-		InstantiationStrategy::LegacyInstanceReuse => InstantiationStrategy::RecreateInstance,
+		InstantiationStrategy::RecreateInstanceCopyOnWrite =>
+			InstantiationStrategy::RecreateInstance,
 	};
 
 	use std::sync::OnceLock;
diff --git a/substrate/client/informant/Cargo.toml b/substrate/client/informant/Cargo.toml
index 33f991d4c67f668ffc88b8679146fbd58e404c57..e077f4e11a59f532861e7d8b72c5eda31c1ef970 100644
--- a/substrate/client/informant/Cargo.toml
+++ b/substrate/client/informant/Cargo.toml
@@ -1,12 +1,12 @@
 [package]
 name = "sc-informant"
 version = "0.10.0-dev"
-authors = ["Parity Technologies <admin@parity.io>"]
+authors.workspace = true
 description = "Substrate informant."
-edition = "2021"
+edition.workspace = true
 license = "GPL-3.0-or-later WITH Classpath-exception-2.0"
 homepage = "https://substrate.io"
-repository = "https://github.com/paritytech/substrate/"
+repository.workspace = true
 readme = "README.md"
 
 [package.metadata.docs.rs]
diff --git a/substrate/client/informant/README.md b/substrate/client/informant/README.md
index b494042590a4218aaa9c63d5e4b3c8a09a804b5b..a5ad89a932d36e0dd0b7209676c98a8078d16723 100644
--- a/substrate/client/informant/README.md
+++ b/substrate/client/informant/README.md
@@ -1,3 +1,3 @@
 Console informant. Prints sync progress and block events. Runs on the calling thread.
 
-License: GPL-3.0-or-later WITH Classpath-exception-2.0
\ No newline at end of file
+License: GPL-3.0-or-later WITH Classpath-exception-2.0
diff --git a/substrate/client/keystore/Cargo.toml b/substrate/client/keystore/Cargo.toml
index cc5a16dd11102e8017aeea99afca530aad13db57..6303ff5c27e1d943a3dd1b3ff86a4d7dad962e9a 100644
--- a/substrate/client/keystore/Cargo.toml
+++ b/substrate/client/keystore/Cargo.toml
@@ -1,11 +1,11 @@
 [package]
 name = "sc-keystore"
 version = "4.0.0-dev"
-authors = ["Parity Technologies <admin@parity.io>"]
-edition = "2021"
+authors.workspace = true
+edition.workspace = true
 license = "GPL-3.0-or-later WITH Classpath-exception-2.0"
 homepage = "https://substrate.io"
-repository = "https://github.com/paritytech/substrate/"
+repository.workspace = true
 description = "Keystore (and session key management) for ed25519 based chains like Polkadot."
 documentation = "https://docs.rs/sc-keystore"
 readme = "README.md"
@@ -16,7 +16,7 @@ targets = ["x86_64-unknown-linux-gnu"]
 [dependencies]
 array-bytes = "6.1"
 parking_lot = "0.12.1"
-serde_json = "1.0.85"
+serde_json = "1.0.107"
 thiserror = "1.0"
 sp-application-crypto = { path = "../../primitives/application-crypto" }
 sp-core = { path = "../../primitives/core" }
diff --git a/substrate/client/keystore/README.md b/substrate/client/keystore/README.md
index 9946a61d6fde65e8c0988d03c6d3e34b9d3d7bfb..5d50f7ad2cfa06f932131f5c8c53d41e91bdaf53 100644
--- a/substrate/client/keystore/README.md
+++ b/substrate/client/keystore/README.md
@@ -1,3 +1,3 @@
 Keystore (and session key management) for ed25519 based chains like Polkadot.
 
-License: GPL-3.0-or-later WITH Classpath-exception-2.0
\ No newline at end of file
+License: GPL-3.0-or-later WITH Classpath-exception-2.0
diff --git a/substrate/client/keystore/src/local.rs b/substrate/client/keystore/src/local.rs
index 97bc7c71a4a58a9ee317f075e79a5df740ec6093..c77f023e0f0afe0f8e9f0869599720ae22010698 100644
--- a/substrate/client/keystore/src/local.rs
+++ b/substrate/client/keystore/src/local.rs
@@ -19,10 +19,6 @@
 
 use parking_lot::RwLock;
 use sp_application_crypto::{AppCrypto, AppPair, IsWrappedBy};
-#[cfg(feature = "bandersnatch-experimental")]
-use sp_core::bandersnatch;
-#[cfg(feature = "bls-experimental")]
-use sp_core::{bls377, bls381};
 use sp_core::{
 	crypto::{ByteArray, ExposeSecret, KeyTypeId, Pair as CorePair, SecretString, VrfSecret},
 	ecdsa, ed25519, sr25519,
@@ -36,6 +32,14 @@ use std::{
 	sync::Arc,
 };
 
+sp_keystore::bandersnatch_experimental_enabled! {
+use sp_core::bandersnatch;
+}
+
+sp_keystore::bls_experimental_enabled! {
+use sp_core::{bls377, bls381};
+}
+
 use crate::{Error, Result};
 
 /// A local based keystore that is either memory-based or filesystem-based.
@@ -132,6 +136,25 @@ impl LocalKeystore {
 }
 
 impl Keystore for LocalKeystore {
+	fn insert(
+		&self,
+		key_type: KeyTypeId,
+		suri: &str,
+		public: &[u8],
+	) -> std::result::Result<(), ()> {
+		self.0.write().insert(key_type, suri, public).map_err(|_| ())
+	}
+
+	fn keys(&self, key_type: KeyTypeId) -> std::result::Result<Vec<Vec<u8>>, TraitError> {
+		self.0.read().raw_public_keys(key_type).map_err(|e| e.into())
+	}
+
+	fn has_keys(&self, public_keys: &[(Vec<u8>, KeyTypeId)]) -> bool {
+		public_keys
+			.iter()
+			.all(|(p, t)| self.0.read().key_phrase_by_type(p, *t).ok().flatten().is_some())
+	}
+
 	fn sr25519_public_keys(&self, key_type: KeyTypeId) -> Vec<sr25519::Public> {
 		self.public_keys::<sr25519::Pair>(key_type)
 	}
@@ -236,140 +259,113 @@ impl Keystore for LocalKeystore {
 		Ok(sig)
 	}
 
-	#[cfg(feature = "bandersnatch-experimental")]
-	fn bandersnatch_public_keys(&self, key_type: KeyTypeId) -> Vec<bandersnatch::Public> {
-		self.public_keys::<bandersnatch::Pair>(key_type)
-	}
-
-	/// Generate a new pair compatible with the 'bandersnatch' signature scheme.
-	///
-	/// If `[seed]` is `Some` then the key will be ephemeral and stored in memory.
-	#[cfg(feature = "bandersnatch-experimental")]
-	fn bandersnatch_generate_new(
-		&self,
-		key_type: KeyTypeId,
-		seed: Option<&str>,
-	) -> std::result::Result<bandersnatch::Public, TraitError> {
-		self.generate_new::<bandersnatch::Pair>(key_type, seed)
-	}
-
-	#[cfg(feature = "bandersnatch-experimental")]
-	fn bandersnatch_sign(
-		&self,
-		key_type: KeyTypeId,
-		public: &bandersnatch::Public,
-		msg: &[u8],
-	) -> std::result::Result<Option<bandersnatch::Signature>, TraitError> {
-		self.sign::<bandersnatch::Pair>(key_type, public, msg)
-	}
-
-	#[cfg(feature = "bandersnatch-experimental")]
-	fn bandersnatch_vrf_sign(
-		&self,
-		key_type: KeyTypeId,
-		public: &bandersnatch::Public,
-		data: &bandersnatch::vrf::VrfSignData,
-	) -> std::result::Result<Option<bandersnatch::vrf::VrfSignature>, TraitError> {
-		self.vrf_sign::<bandersnatch::Pair>(key_type, public, data)
-	}
+	sp_keystore::bandersnatch_experimental_enabled! {
+		fn bandersnatch_public_keys(&self, key_type: KeyTypeId) -> Vec<bandersnatch::Public> {
+			self.public_keys::<bandersnatch::Pair>(key_type)
+		}
 
-	#[cfg(feature = "bandersnatch-experimental")]
-	fn bandersnatch_vrf_output(
-		&self,
-		key_type: KeyTypeId,
-		public: &bandersnatch::Public,
-		input: &bandersnatch::vrf::VrfInput,
-	) -> std::result::Result<Option<bandersnatch::vrf::VrfOutput>, TraitError> {
-		self.vrf_output::<bandersnatch::Pair>(key_type, public, input)
-	}
+		/// Generate a new pair compatible with the 'bandersnatch' signature scheme.
+		///
+		/// If `[seed]` is `Some` then the key will be ephemeral and stored in memory.
+		fn bandersnatch_generate_new(
+			&self,
+			key_type: KeyTypeId,
+			seed: Option<&str>,
+		) -> std::result::Result<bandersnatch::Public, TraitError> {
+			self.generate_new::<bandersnatch::Pair>(key_type, seed)
+		}
 
-	#[cfg(feature = "bandersnatch-experimental")]
-	fn bandersnatch_ring_vrf_sign(
-		&self,
-		key_type: KeyTypeId,
-		public: &bandersnatch::Public,
-		data: &bandersnatch::vrf::VrfSignData,
-		prover: &bandersnatch::ring_vrf::RingProver,
-	) -> std::result::Result<Option<bandersnatch::ring_vrf::RingVrfSignature>, TraitError> {
-		let sig = self
-			.0
-			.read()
-			.key_pair_by_type::<bandersnatch::Pair>(public, key_type)?
-			.map(|pair| pair.ring_vrf_sign(data, prover));
-		Ok(sig)
-	}
+		fn bandersnatch_sign(
+			&self,
+			key_type: KeyTypeId,
+			public: &bandersnatch::Public,
+			msg: &[u8],
+		) -> std::result::Result<Option<bandersnatch::Signature>, TraitError> {
+			self.sign::<bandersnatch::Pair>(key_type, public, msg)
+		}
 
-	#[cfg(feature = "bls-experimental")]
-	fn bls381_public_keys(&self, key_type: KeyTypeId) -> Vec<bls381::Public> {
-		self.public_keys::<bls381::Pair>(key_type)
-	}
+		fn bandersnatch_vrf_sign(
+			&self,
+			key_type: KeyTypeId,
+			public: &bandersnatch::Public,
+			data: &bandersnatch::vrf::VrfSignData,
+		) -> std::result::Result<Option<bandersnatch::vrf::VrfSignature>, TraitError> {
+			self.vrf_sign::<bandersnatch::Pair>(key_type, public, data)
+		}
 
-	#[cfg(feature = "bls-experimental")]
-	/// Generate a new pair compatible with the 'bls381' signature scheme.
-	///
-	/// If `[seed]` is `Some` then the key will be ephemeral and stored in memory.
-	fn bls381_generate_new(
-		&self,
-		key_type: KeyTypeId,
-		seed: Option<&str>,
-	) -> std::result::Result<bls381::Public, TraitError> {
-		self.generate_new::<bls381::Pair>(key_type, seed)
-	}
+		fn bandersnatch_vrf_output(
+			&self,
+			key_type: KeyTypeId,
+			public: &bandersnatch::Public,
+			input: &bandersnatch::vrf::VrfInput,
+		) -> std::result::Result<Option<bandersnatch::vrf::VrfOutput>, TraitError> {
+			self.vrf_output::<bandersnatch::Pair>(key_type, public, input)
+		}
 
-	#[cfg(feature = "bls-experimental")]
-	fn bls381_sign(
-		&self,
-		key_type: KeyTypeId,
-		public: &bls381::Public,
-		msg: &[u8],
-	) -> std::result::Result<Option<bls381::Signature>, TraitError> {
-		self.sign::<bls381::Pair>(key_type, public, msg)
+		fn bandersnatch_ring_vrf_sign(
+			&self,
+			key_type: KeyTypeId,
+			public: &bandersnatch::Public,
+			data: &bandersnatch::vrf::VrfSignData,
+			prover: &bandersnatch::ring_vrf::RingProver,
+		) -> std::result::Result<Option<bandersnatch::ring_vrf::RingVrfSignature>, TraitError> {
+			let sig = self
+				.0
+				.read()
+				.key_pair_by_type::<bandersnatch::Pair>(public, key_type)?
+				.map(|pair| pair.ring_vrf_sign(data, prover));
+			Ok(sig)
+		}
 	}
 
-	#[cfg(feature = "bls-experimental")]
-	fn bls377_public_keys(&self, key_type: KeyTypeId) -> Vec<bls377::Public> {
-		self.public_keys::<bls377::Pair>(key_type)
-	}
+	sp_keystore::bls_experimental_enabled! {
+		fn bls381_public_keys(&self, key_type: KeyTypeId) -> Vec<bls381::Public> {
+			self.public_keys::<bls381::Pair>(key_type)
+		}
 
-	#[cfg(feature = "bls-experimental")]
-	/// Generate a new pair compatible with the 'bls377' signature scheme.
-	///
-	/// If `[seed]` is `Some` then the key will be ephemeral and stored in memory.
-	fn bls377_generate_new(
-		&self,
-		key_type: KeyTypeId,
-		seed: Option<&str>,
-	) -> std::result::Result<bls377::Public, TraitError> {
-		self.generate_new::<bls377::Pair>(key_type, seed)
-	}
+		/// Generate a new pair compatible with the 'bls381' signature scheme.
+		///
+		/// If `[seed]` is `Some` then the key will be ephemeral and stored in memory.
+		fn bls381_generate_new(
+			&self,
+			key_type: KeyTypeId,
+			seed: Option<&str>,
+		) -> std::result::Result<bls381::Public, TraitError> {
+			self.generate_new::<bls381::Pair>(key_type, seed)
+		}
 
-	#[cfg(feature = "bls-experimental")]
-	fn bls377_sign(
-		&self,
-		key_type: KeyTypeId,
-		public: &bls377::Public,
-		msg: &[u8],
-	) -> std::result::Result<Option<bls377::Signature>, TraitError> {
-		self.sign::<bls377::Pair>(key_type, public, msg)
-	}
+		fn bls381_sign(
+			&self,
+			key_type: KeyTypeId,
+			public: &bls381::Public,
+			msg: &[u8],
+		) -> std::result::Result<Option<bls381::Signature>, TraitError> {
+			self.sign::<bls381::Pair>(key_type, public, msg)
+		}
 
-	fn insert(
-		&self,
-		key_type: KeyTypeId,
-		suri: &str,
-		public: &[u8],
-	) -> std::result::Result<(), ()> {
-		self.0.write().insert(key_type, suri, public).map_err(|_| ())
-	}
+		fn bls377_public_keys(&self, key_type: KeyTypeId) -> Vec<bls377::Public> {
+			self.public_keys::<bls377::Pair>(key_type)
+		}
 
-	fn keys(&self, key_type: KeyTypeId) -> std::result::Result<Vec<Vec<u8>>, TraitError> {
-		self.0.read().raw_public_keys(key_type).map_err(|e| e.into())
-	}
+		/// Generate a new pair compatible with the 'bls377' signature scheme.
+		///
+		/// If `[seed]` is `Some` then the key will be ephemeral and stored in memory.
+		fn bls377_generate_new(
+			&self,
+			key_type: KeyTypeId,
+			seed: Option<&str>,
+		) -> std::result::Result<bls377::Public, TraitError> {
+			self.generate_new::<bls377::Pair>(key_type, seed)
+		}
 
-	fn has_keys(&self, public_keys: &[(Vec<u8>, KeyTypeId)]) -> bool {
-		public_keys
-			.iter()
-			.all(|(p, t)| self.0.read().key_phrase_by_type(p, *t).ok().flatten().is_some())
+		fn bls377_sign(
+			&self,
+			key_type: KeyTypeId,
+			public: &bls377::Public,
+			msg: &[u8],
+		) -> std::result::Result<Option<bls377::Signature>, TraitError> {
+			self.sign::<bls377::Pair>(key_type, public, msg)
+		}
 	}
 }
 
diff --git a/substrate/client/merkle-mountain-range/Cargo.toml b/substrate/client/merkle-mountain-range/Cargo.toml
index 092bf1701d4ed519dffa831200400fac16b4ecbb..ae60fd1ce8968befae4105206e65875cb173660f 100644
--- a/substrate/client/merkle-mountain-range/Cargo.toml
+++ b/substrate/client/merkle-mountain-range/Cargo.toml
@@ -1,10 +1,10 @@
 [package]
 name = "mmr-gadget"
 version = "4.0.0-dev"
-authors = ["Parity Technologies <admin@parity.io>"]
-edition = "2021"
+authors.workspace = true
+edition.workspace = true
 license = "GPL-3.0-or-later WITH Classpath-exception-2.0"
-repository = "https://github.com/paritytech/substrate"
+repository.workspace = true
 description = "MMR Client gadget for substrate"
 homepage = "https://substrate.io"
 
diff --git a/substrate/client/merkle-mountain-range/rpc/Cargo.toml b/substrate/client/merkle-mountain-range/rpc/Cargo.toml
index c00aeb91edad65a7a3ee93a50b236e5756b2d5ac..05d8547d243ffa35f74783accddb7a0deac8e5db 100644
--- a/substrate/client/merkle-mountain-range/rpc/Cargo.toml
+++ b/substrate/client/merkle-mountain-range/rpc/Cargo.toml
@@ -1,11 +1,11 @@
 [package]
 name = "mmr-rpc"
 version = "4.0.0-dev"
-authors = ["Parity Technologies <admin@parity.io>"]
-edition = "2021"
+authors.workspace = true
+edition.workspace = true
 license = "Apache-2.0"
 homepage = "https://substrate.io"
-repository = "https://github.com/paritytech/substrate/"
+repository.workspace = true
 description = "Node-specific RPC methods for interaction with Merkle Mountain Range pallet."
 
 [package.metadata.docs.rs]
@@ -14,7 +14,7 @@ targets = ["x86_64-unknown-linux-gnu"]
 [dependencies]
 codec = { package = "parity-scale-codec", version = "3.6.1" }
 jsonrpsee = { version = "0.16.2", features = ["client-core", "server", "macros"] }
-serde = { version = "1.0.163", features = ["derive"] }
+serde = { version = "1.0.188", features = ["derive"] }
 sp-api = { path = "../../../primitives/api" }
 sp-blockchain = { path = "../../../primitives/blockchain" }
 sp-core = { path = "../../../primitives/core" }
@@ -23,4 +23,4 @@ sp-runtime = { path = "../../../primitives/runtime" }
 anyhow = "1"
 
 [dev-dependencies]
-serde_json = "1.0.85"
+serde_json = "1.0.107"
diff --git a/substrate/client/mixnet/Cargo.toml b/substrate/client/mixnet/Cargo.toml
new file mode 100644
index 0000000000000000000000000000000000000000..86c5a37754afb8c7de3e2cae539e51d47ee57282
--- /dev/null
+++ b/substrate/client/mixnet/Cargo.toml
@@ -0,0 +1,36 @@
+[package]
+description = "Substrate mixnet service"
+name = "sc-mixnet"
+version = "0.1.0-dev"
+license = "GPL-3.0-or-later WITH Classpath-exception-2.0"
+authors = ["Parity Technologies <admin@parity.io>"]
+edition = "2021"
+homepage = "https://substrate.io"
+repository = "https://github.com/paritytech/substrate/"
+readme = "README.md"
+
+[package.metadata.docs.rs]
+targets = ["x86_64-unknown-linux-gnu"]
+
+[dependencies]
+array-bytes = "4.1"
+arrayvec = "0.7.2"
+blake2 = "0.10.4"
+codec = { package = "parity-scale-codec", version = "3.6.1", default-features = false, features = ["derive"] }
+futures = "0.3.25"
+futures-timer = "3.0.2"
+libp2p-identity = { version = "0.1.3", features = ["peerid"] }
+log = "0.4.17"
+mixnet = "0.7.0"
+multiaddr = "0.17.1"
+parking_lot = "0.12.1"
+sc-client-api = { path = "../api" }
+sc-network = { path = "../network" }
+sc-transaction-pool-api = { path = "../transaction-pool/api" }
+sp-api = { path = "../../primitives/api" }
+sp-consensus = { path = "../../primitives/consensus/common" }
+sp-core = { path = "../../primitives/core" }
+sp-keystore = { path = "../../primitives/keystore" }
+sp-mixnet = { path = "../../primitives/mixnet" }
+sp-runtime = { path = "../../primitives/runtime" }
+thiserror = "1.0"
diff --git a/substrate/client/mixnet/README.md b/substrate/client/mixnet/README.md
new file mode 100644
index 0000000000000000000000000000000000000000..cd8d14740838715c16529000da688ca3ef0aabd4
--- /dev/null
+++ b/substrate/client/mixnet/README.md
@@ -0,0 +1,3 @@
+Substrate mixnet service.
+
+License: GPL-3.0-or-later WITH Classpath-exception-2.0
diff --git a/substrate/client/mixnet/src/api.rs b/substrate/client/mixnet/src/api.rs
new file mode 100644
index 0000000000000000000000000000000000000000..42a2e395345dc321d88cda1a3edcfbc545b0a0d2
--- /dev/null
+++ b/substrate/client/mixnet/src/api.rs
@@ -0,0 +1,69 @@
+// This file is part of Substrate.
+
+// Copyright (C) Parity Technologies (UK) Ltd.
+// SPDX-License-Identifier: GPL-3.0-or-later WITH Classpath-exception-2.0
+
+// This program 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.
+
+// This program 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 this program. If not, see <https://www.gnu.org/licenses/>.
+
+use super::{config::Config, error::Error, request::Request};
+use futures::{
+	channel::{mpsc, oneshot},
+	SinkExt,
+};
+use sp_core::Bytes;
+use std::future::Future;
+
+/// The other end of an [`Api`]. This should be passed to [`run`](super::run::run).
+pub struct ApiBackend {
+	pub(super) request_receiver: mpsc::Receiver<Request>,
+}
+
+/// Interface to the mixnet service.
+#[derive(Clone)]
+pub struct Api {
+	request_sender: mpsc::Sender<Request>,
+}
+
+impl Api {
+	/// Create a new `Api`. The [`ApiBackend`] should be passed to [`run`](super::run::run).
+	pub fn new(config: &Config) -> (Self, ApiBackend) {
+		let (request_sender, request_receiver) = mpsc::channel(config.substrate.request_buffer);
+		(Self { request_sender }, ApiBackend { request_receiver })
+	}
+
+	/// Submit an extrinsic via the mixnet.
+	///
+	/// Returns a [`Future`] which returns another `Future`.
+	///
+	/// The first `Future` resolves as soon as there is space in the mixnet service queue. The
+	/// second `Future` resolves once a reply is received over the mixnet (or sooner if there is an
+	/// error).
+	///
+	/// The first `Future` references `self`, but the second does not. This makes it possible to
+	/// submit concurrent mixnet requests using a single `Api` instance.
+	pub async fn submit_extrinsic(
+		&mut self,
+		extrinsic: Bytes,
+	) -> impl Future<Output = Result<(), Error>> {
+		let (reply_sender, reply_receiver) = oneshot::channel();
+		let res = self
+			.request_sender
+			.feed(Request::SubmitExtrinsic { extrinsic, reply_sender })
+			.await;
+		async move {
+			res.map_err(|_| Error::ServiceUnavailable)?;
+			reply_receiver.await.map_err(|_| Error::ServiceUnavailable)?
+		}
+	}
+}
diff --git a/substrate/client/mixnet/src/config.rs b/substrate/client/mixnet/src/config.rs
new file mode 100644
index 0000000000000000000000000000000000000000..b716237ab7b534fb6a1922c2fda61637578328a1
--- /dev/null
+++ b/substrate/client/mixnet/src/config.rs
@@ -0,0 +1,88 @@
+// This file is part of Substrate.
+
+// Copyright (C) Parity Technologies (UK) Ltd.
+// SPDX-License-Identifier: GPL-3.0-or-later WITH Classpath-exception-2.0
+
+// This program 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.
+
+// This program 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 this program. If not, see <https://www.gnu.org/licenses/>.
+
+pub use mixnet::core::Config as CoreConfig;
+use std::time::Duration;
+
+/// Substrate-specific mixnet configuration.
+#[derive(Clone, Debug)]
+pub struct SubstrateConfig {
+	/// Attempt to register the local node as a mixnode?
+	pub register: bool,
+	/// Maximum number of incoming mixnet connections to accept from non-mixnodes. If the local
+	/// node will never be a mixnode, this can be set to 0.
+	pub num_gateway_slots: u32,
+
+	/// Number of requests to the mixnet service that can be buffered, in addition to the one per
+	/// [`Api`](super::api::Api) instance. Note that this does not include requests that are being
+	/// actively handled.
+	pub request_buffer: usize,
+	/// Used to determine the number of SURBs to include in request messages: the maximum number of
+	/// SURBs needed for a single reply is multiplied by this. This should not be set to 0.
+	pub surb_factor: usize,
+
+	/// Maximum number of submit extrinsic requests waiting for their delay to elapse. When at the
+	/// limit, any submit extrinsic requests that arrive will simply be dropped.
+	pub extrinsic_queue_capacity: usize,
+	/// Mean delay between receiving a submit extrinsic request and actually submitting the
+	/// extrinsic. This should really be the same for all nodes!
+	pub mean_extrinsic_delay: Duration,
+	/// Maximum number of extrinsics being actively submitted. If a submit extrinsic request's
+	/// delay elapses and we are already at this limit, the request will simply be dropped.
+	pub max_pending_extrinsics: usize,
+}
+
+impl Default for SubstrateConfig {
+	fn default() -> Self {
+		Self {
+			register: true,
+			num_gateway_slots: 150,
+
+			request_buffer: 4,
+			surb_factor: 2,
+
+			extrinsic_queue_capacity: 50,
+			mean_extrinsic_delay: Duration::from_secs(1),
+			max_pending_extrinsics: 20,
+		}
+	}
+}
+
+/// Mixnet configuration.
+#[derive(Clone, Debug)]
+pub struct Config {
+	/// Core configuration.
+	pub core: CoreConfig,
+	/// Request manager configuration.
+	pub request_manager: mixnet::request_manager::Config,
+	/// Reply manager configuration.
+	pub reply_manager: mixnet::reply_manager::Config,
+	/// Substrate-specific configuration.
+	pub substrate: SubstrateConfig,
+}
+
+impl Default for Config {
+	fn default() -> Self {
+		Self {
+			core: Default::default(),
+			request_manager: Default::default(),
+			reply_manager: Default::default(),
+			substrate: Default::default(),
+		}
+	}
+}
diff --git a/substrate/client/mixnet/src/error.rs b/substrate/client/mixnet/src/error.rs
new file mode 100644
index 0000000000000000000000000000000000000000..88942dbe3b36fa6afbe12f6f971c2c73898b8a96
--- /dev/null
+++ b/substrate/client/mixnet/src/error.rs
@@ -0,0 +1,56 @@
+// This file is part of Substrate.
+
+// Copyright (C) Parity Technologies (UK) Ltd.
+// SPDX-License-Identifier: GPL-3.0-or-later WITH Classpath-exception-2.0
+
+// This program 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.
+
+// This program 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 this program. If not, see <https://www.gnu.org/licenses/>.
+
+use codec::{Decode, Encode};
+use mixnet::core::PostErr;
+
+/// Error handling a request. Sent in replies over the mixnet.
+#[derive(Debug, thiserror::Error, Decode, Encode)]
+pub enum RemoteErr {
+	/// An error that doesn't map to any of the other variants.
+	#[error("{0}")]
+	Other(String),
+	/// Failed to decode the request.
+	#[error("Failed to decode the request: {0}")]
+	Decode(String),
+}
+
+/// Mixnet error.
+#[derive(Debug, thiserror::Error)]
+pub enum Error {
+	/// Failed to communicate with the mixnet service. Possibly it panicked. The node probably
+	/// needs to be restarted.
+	#[error(
+		"Failed to communicate with the mixnet service; the node probably needs to be restarted"
+	)]
+	ServiceUnavailable,
+	/// Did not receive a reply after the configured number of attempts.
+	#[error("Did not receive a reply from the mixnet after the configured number of attempts")]
+	NoReply,
+	/// Received a malformed reply.
+	#[error("Received a malformed reply from the mixnet")]
+	BadReply,
+	/// Failed to post the request to the mixnet. Note that some [`PostErr`] variants, eg
+	/// [`PostErr::NotEnoughSpaceInQueue`], are handled internally and will never be returned from
+	/// the top-level API.
+	#[error("Failed to post the request to the mixnet: {0}")]
+	Post(#[from] PostErr),
+	/// Error reported by destination mixnode.
+	#[error("Error reported by the destination mixnode: {0}")]
+	Remote(#[from] RemoteErr),
+}
diff --git a/substrate/client/mixnet/src/extrinsic_queue.rs b/substrate/client/mixnet/src/extrinsic_queue.rs
new file mode 100644
index 0000000000000000000000000000000000000000..b6f6f9ebae99843efbcb561effcfb9983e71b30c
--- /dev/null
+++ b/substrate/client/mixnet/src/extrinsic_queue.rs
@@ -0,0 +1,94 @@
+// This file is part of Substrate.
+
+// Copyright (C) Parity Technologies (UK) Ltd.
+// SPDX-License-Identifier: GPL-3.0-or-later WITH Classpath-exception-2.0
+
+// This program 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.
+
+// This program 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 this program. If not, see <https://www.gnu.org/licenses/>.
+
+//! [`ExtrinsicQueue`] is a queue for extrinsics received from the mixnet. These extrinsics are
+//! explicitly delayed by a random amount, to decorrelate the times at which they are received from
+//! the times at which they are broadcast to peers.
+
+use mixnet::reply_manager::ReplyContext;
+use std::{cmp::Ordering, collections::BinaryHeap, time::Instant};
+
+/// An extrinsic that should be submitted to the transaction pool after `deadline`. `Eq` and `Ord`
+/// are implemented for this to support use in `BinaryHeap`s. Only `deadline` is compared.
+struct DelayedExtrinsic<E> {
+	/// When the extrinsic should actually be submitted to the pool.
+	deadline: Instant,
+	extrinsic: E,
+	reply_context: ReplyContext,
+}
+
+impl<E> PartialEq for DelayedExtrinsic<E> {
+	fn eq(&self, other: &Self) -> bool {
+		self.deadline == other.deadline
+	}
+}
+
+impl<E> Eq for DelayedExtrinsic<E> {}
+
+impl<E> PartialOrd for DelayedExtrinsic<E> {
+	fn partial_cmp(&self, other: &Self) -> Option<Ordering> {
+		Some(self.cmp(other))
+	}
+}
+
+impl<E> Ord for DelayedExtrinsic<E> {
+	fn cmp(&self, other: &Self) -> Ordering {
+		// Extrinsics with the earliest deadline considered greatest
+		self.deadline.cmp(&other.deadline).reverse()
+	}
+}
+
+pub struct ExtrinsicQueue<E> {
+	capacity: usize,
+	queue: BinaryHeap<DelayedExtrinsic<E>>,
+	next_deadline_changed: bool,
+}
+
+impl<E> ExtrinsicQueue<E> {
+	pub fn new(capacity: usize) -> Self {
+		Self { capacity, queue: BinaryHeap::with_capacity(capacity), next_deadline_changed: false }
+	}
+
+	pub fn next_deadline(&self) -> Option<Instant> {
+		self.queue.peek().map(|extrinsic| extrinsic.deadline)
+	}
+
+	pub fn next_deadline_changed(&mut self) -> bool {
+		let changed = self.next_deadline_changed;
+		self.next_deadline_changed = false;
+		changed
+	}
+
+	pub fn has_space(&self) -> bool {
+		self.queue.len() < self.capacity
+	}
+
+	pub fn insert(&mut self, deadline: Instant, extrinsic: E, reply_context: ReplyContext) {
+		debug_assert!(self.has_space());
+		let prev_deadline = self.next_deadline();
+		self.queue.push(DelayedExtrinsic { deadline, extrinsic, reply_context });
+		if self.next_deadline() != prev_deadline {
+			self.next_deadline_changed = true;
+		}
+	}
+
+	pub fn pop(&mut self) -> Option<(E, ReplyContext)> {
+		self.next_deadline_changed = true;
+		self.queue.pop().map(|extrinsic| (extrinsic.extrinsic, extrinsic.reply_context))
+	}
+}
diff --git a/substrate/test-utils/tests/ui.rs b/substrate/client/mixnet/src/lib.rs
similarity index 57%
rename from substrate/test-utils/tests/ui.rs
rename to substrate/client/mixnet/src/lib.rs
index baf822bb87a49c8e43278c2686afc2811aee6c09..dfbb50dad6b4927a3e1c0d64de4ec78a35b4d555 100644
--- a/substrate/test-utils/tests/ui.rs
+++ b/substrate/client/mixnet/src/lib.rs
@@ -16,8 +16,29 @@
 // You should have received a copy of the GNU General Public License
 // along with this program. If not, see <https://www.gnu.org/licenses/>.
 
-#[test]
-fn substrate_test_utils_derive_trybuild() {
-	let t = trybuild::TestCases::new();
-	t.compile_fail("tests/ui/too-many-func-parameters.rs");
-}
+//! Substrate mixnet service. This implements the [Substrate Mix Network
+//! Specification](https://paritytech.github.io/mixnet-spec/).
+
+#![warn(missing_docs)]
+#![forbid(unsafe_code)]
+
+mod api;
+mod config;
+mod error;
+mod extrinsic_queue;
+mod maybe_inf_delay;
+mod packet_dispatcher;
+mod peer_id;
+mod protocol;
+mod request;
+mod run;
+mod sync_with_runtime;
+
+pub use self::{
+	api::{Api, ApiBackend},
+	config::{Config, CoreConfig, SubstrateConfig},
+	error::{Error, RemoteErr},
+	protocol::{peers_set_config, protocol_name},
+	run::run,
+};
+pub use mixnet::core::{KxSecret, PostErr, TopologyErr};
diff --git a/substrate/client/mixnet/src/maybe_inf_delay.rs b/substrate/client/mixnet/src/maybe_inf_delay.rs
new file mode 100644
index 0000000000000000000000000000000000000000..feb0d038560a38e751c339df416140a0bbd5ff9a
--- /dev/null
+++ b/substrate/client/mixnet/src/maybe_inf_delay.rs
@@ -0,0 +1,111 @@
+// This file is part of Substrate.
+
+// Copyright (C) Parity Technologies (UK) Ltd.
+// SPDX-License-Identifier: GPL-3.0-or-later WITH Classpath-exception-2.0
+
+// This program 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.
+
+// This program 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 this program. If not, see <https://www.gnu.org/licenses/>.
+
+use futures::{future::FusedFuture, FutureExt};
+use futures_timer::Delay;
+use std::{
+	future::Future,
+	pin::Pin,
+	task::{Context, Poll, Waker},
+	time::Duration,
+};
+
+enum Inner {
+	Infinite {
+		/// Waker from the most recent `poll` call. If `None`, either `poll` has not been called
+		/// yet, we returned `Poll::Ready` from the last call, or the waker is attached to `delay`.
+		waker: Option<Waker>,
+		delay: Option<Delay>,
+	},
+	Finite(Delay),
+}
+
+/// Like [`Delay`] but the duration can be infinite (in which case the future will never fire).
+/// Unlike [`Delay`], implements [`FusedFuture`], with [`is_terminated`](Self::is_terminated)
+/// returning `true` when the delay is infinite. As with [`Delay`], once [`poll`](Self::poll)
+/// returns [`Poll::Ready`], it will continue to do so until [`reset`](Self::reset) is called.
+pub struct MaybeInfDelay(Inner);
+
+impl MaybeInfDelay {
+	/// Create a new `MaybeInfDelay` future. If `duration` is [`Some`], the future will fire after
+	/// the given duration has elapsed. If `duration` is [`None`], the future will "never" fire
+	/// (although see [`reset`](Self::reset)).
+	pub fn new(duration: Option<Duration>) -> Self {
+		match duration {
+			Some(duration) => Self(Inner::Finite(Delay::new(duration))),
+			None => Self(Inner::Infinite { waker: None, delay: None }),
+		}
+	}
+
+	/// Reset the timer. `duration` is handled just like in [`new`](Self::new). Note that while
+	/// this is similar to `std::mem::replace(&mut self, MaybeInfDelay::new(duration))`, with
+	/// `replace` you would have to manually ensure [`poll`](Self::poll) was called again; with
+	/// `reset` this is not necessary.
+	pub fn reset(&mut self, duration: Option<Duration>) {
+		match duration {
+			Some(duration) => match &mut self.0 {
+				Inner::Infinite { waker, delay } => {
+					let mut delay = match delay.take() {
+						Some(mut delay) => {
+							delay.reset(duration);
+							delay
+						},
+						None => Delay::new(duration),
+					};
+					if let Some(waker) = waker.take() {
+						let mut cx = Context::from_waker(&waker);
+						match delay.poll_unpin(&mut cx) {
+							Poll::Pending => (), // Waker attached to delay
+							Poll::Ready(_) => waker.wake(),
+						}
+					}
+					self.0 = Inner::Finite(delay);
+				},
+				Inner::Finite(delay) => delay.reset(duration),
+			},
+			None =>
+				self.0 = match std::mem::replace(
+					&mut self.0,
+					Inner::Infinite { waker: None, delay: None },
+				) {
+					Inner::Finite(delay) => Inner::Infinite { waker: None, delay: Some(delay) },
+					infinite => infinite,
+				},
+		}
+	}
+}
+
+impl Future for MaybeInfDelay {
+	type Output = ();
+
+	fn poll(mut self: Pin<&mut Self>, cx: &mut Context<'_>) -> Poll<Self::Output> {
+		match &mut self.0 {
+			Inner::Infinite { waker, .. } => {
+				*waker = Some(cx.waker().clone());
+				Poll::Pending
+			},
+			Inner::Finite(delay) => delay.poll_unpin(cx),
+		}
+	}
+}
+
+impl FusedFuture for MaybeInfDelay {
+	fn is_terminated(&self) -> bool {
+		matches!(self.0, Inner::Infinite { .. })
+	}
+}
diff --git a/substrate/client/mixnet/src/packet_dispatcher.rs b/substrate/client/mixnet/src/packet_dispatcher.rs
new file mode 100644
index 0000000000000000000000000000000000000000..856208ecb34260f5cf03c183cf68683dec6710d0
--- /dev/null
+++ b/substrate/client/mixnet/src/packet_dispatcher.rs
@@ -0,0 +1,198 @@
+// This file is part of Substrate.
+
+// Copyright (C) Parity Technologies (UK) Ltd.
+// SPDX-License-Identifier: GPL-3.0-or-later WITH Classpath-exception-2.0
+
+// This program 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.
+
+// This program 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 this program. If not, see <https://www.gnu.org/licenses/>.
+
+//! [`AddressedPacket`] dispatching.
+
+use super::peer_id::{from_core_peer_id, to_core_peer_id};
+use arrayvec::ArrayVec;
+use libp2p_identity::PeerId;
+use log::{debug, warn};
+use mixnet::core::{AddressedPacket, NetworkStatus, Packet, PeerId as CorePeerId};
+use parking_lot::Mutex;
+use sc_network::{NetworkNotification, ProtocolName};
+use std::{collections::HashMap, future::Future, sync::Arc};
+
+const LOG_TARGET: &str = "mixnet";
+
+/// Packet queue for a peer.
+///
+/// Ideally we would use `Rc<RefCell<_>>`, but that would prevent the top-level future from being
+/// automatically marked `Send`. I believe it would be safe to manually mark it `Send`, but using
+/// `Arc<Mutex<_>>` here is not really a big deal.
+struct PeerQueue(Mutex<ArrayVec<Box<Packet>, 2>>);
+
+impl PeerQueue {
+	fn new() -> Self {
+		Self(Mutex::new(ArrayVec::new()))
+	}
+
+	/// Push `packet` onto the queue. Returns `true` if the queue was previously empty. Fails if
+	/// the queue is full.
+	fn push(&self, packet: Box<Packet>) -> Result<bool, ()> {
+		let mut queue = self.0.lock();
+		if queue.is_full() {
+			Err(())
+		} else {
+			let was_empty = queue.is_empty();
+			queue.push(packet);
+			Ok(was_empty)
+		}
+	}
+
+	/// Drop all packets from the queue.
+	fn clear(&self) {
+		let mut queue = self.0.lock();
+		queue.clear();
+	}
+
+	/// Pop the packet at the head of the queue and return it, or, if the queue is empty, return
+	/// `None`. Also returns `true` if there are more packets in the queue.
+	fn pop(&self) -> (Option<Box<Packet>>, bool) {
+		let mut queue = self.0.lock();
+		let packet = queue.pop();
+		(packet, !queue.is_empty())
+	}
+}
+
+/// A peer which has packets ready to send but is not currently being serviced.
+pub struct ReadyPeer {
+	id: PeerId,
+	/// The peer's packet queue. Not empty.
+	queue: Arc<PeerQueue>,
+}
+
+impl ReadyPeer {
+	/// If a future is returned, and if that future returns `Some`, this function should be called
+	/// again to send the next packet queued for the peer; `self` is placed in the `Some` to make
+	/// this straightforward. Otherwise, we have either sent or dropped all packets queued for the
+	/// peer, and it can be forgotten about for the time being.
+	pub fn send_packet(
+		self,
+		network: &impl NetworkNotification,
+		protocol_name: ProtocolName,
+	) -> Option<impl Future<Output = Option<Self>>> {
+		match network.notification_sender(self.id, protocol_name) {
+			Err(err) => {
+				debug!(
+					target: LOG_TARGET,
+					"Failed to get notification sender for peer ID {}: {err}", self.id
+				);
+				self.queue.clear();
+				None
+			},
+			Ok(sender) => Some(async move {
+				match sender.ready().await.and_then(|mut ready| {
+					let (packet, more_packets) = self.queue.pop();
+					let packet =
+						packet.expect("Should only be called if there is a packet to send");
+					ready.send((packet as Box<[_]>).into())?;
+					Ok(more_packets)
+				}) {
+					Err(err) => {
+						debug!(
+							target: LOG_TARGET,
+							"Notification sender for peer ID {} failed: {err}", self.id
+						);
+						self.queue.clear();
+						None
+					},
+					Ok(more_packets) => more_packets.then(|| self),
+				}
+			}),
+		}
+	}
+}
+
+pub struct PacketDispatcher {
+	/// Peer ID of the local node. Only used to implement [`NetworkStatus`].
+	local_peer_id: CorePeerId,
+	/// Packet queue for each connected peer. These queues are very short and only exist to give
+	/// packets somewhere to sit while waiting for notification senders to be ready.
+	peer_queues: HashMap<CorePeerId, Arc<PeerQueue>>,
+}
+
+impl PacketDispatcher {
+	pub fn new(local_peer_id: &CorePeerId) -> Self {
+		Self { local_peer_id: *local_peer_id, peer_queues: HashMap::new() }
+	}
+
+	pub fn add_peer(&mut self, id: &PeerId) {
+		let Some(core_id) = to_core_peer_id(id) else {
+			debug!(target: LOG_TARGET,
+				"Cannot add peer; failed to convert libp2p peer ID {id} to mixnet peer ID");
+			return
+		};
+		if self.peer_queues.insert(core_id, Arc::new(PeerQueue::new())).is_some() {
+			warn!(target: LOG_TARGET, "Two stream opened notifications for peer ID {id}");
+		}
+	}
+
+	pub fn remove_peer(&mut self, id: &PeerId) {
+		let Some(core_id) = to_core_peer_id(id) else {
+			debug!(target: LOG_TARGET,
+				"Cannot remove peer; failed to convert libp2p peer ID {id} to mixnet peer ID");
+			return
+		};
+		if self.peer_queues.remove(&core_id).is_none() {
+			warn!(target: LOG_TARGET, "Stream closed notification for unknown peer ID {id}");
+		}
+	}
+
+	/// If the peer is not connected or the peer's packet queue is full, the packet is dropped.
+	/// Otherwise the packet is pushed onto the peer's queue, and if the queue was previously empty
+	/// a [`ReadyPeer`] is returned.
+	pub fn dispatch(&mut self, packet: AddressedPacket) -> Option<ReadyPeer> {
+		let Some(queue) = self.peer_queues.get_mut(&packet.peer_id) else {
+			debug!(target: LOG_TARGET, "Dropped packet to mixnet peer ID {:x?}; not connected",
+				packet.peer_id);
+			return None
+		};
+
+		match queue.push(packet.packet) {
+			Err(_) => {
+				debug!(
+					target: LOG_TARGET,
+					"Dropped packet to mixnet peer ID {:x?}; peer queue full", packet.peer_id
+				);
+				None
+			},
+			Ok(true) => {
+				// Queue was empty. Construct and return a ReadyPeer.
+				let Some(id) = from_core_peer_id(&packet.peer_id) else {
+					debug!(target: LOG_TARGET, "Cannot send packet; \
+						failed to convert mixnet peer ID {:x?} to libp2p peer ID",
+						packet.peer_id);
+					queue.clear();
+					return None
+				};
+				Some(ReadyPeer { id, queue: queue.clone() })
+			},
+			Ok(false) => None, // Queue was not empty
+		}
+	}
+}
+
+impl NetworkStatus for PacketDispatcher {
+	fn local_peer_id(&self) -> CorePeerId {
+		self.local_peer_id
+	}
+
+	fn is_connected(&self, peer_id: &CorePeerId) -> bool {
+		self.peer_queues.contains_key(peer_id)
+	}
+}
diff --git a/substrate/client/mixnet/src/peer_id.rs b/substrate/client/mixnet/src/peer_id.rs
new file mode 100644
index 0000000000000000000000000000000000000000..7984da8c75be77e245cd88b06451d38f443f904d
--- /dev/null
+++ b/substrate/client/mixnet/src/peer_id.rs
@@ -0,0 +1,44 @@
+// This file is part of Substrate.
+
+// Copyright (C) Parity Technologies (UK) Ltd.
+// SPDX-License-Identifier: GPL-3.0-or-later WITH Classpath-exception-2.0
+
+// This program 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.
+
+// This program 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 this program. If not, see <https://www.gnu.org/licenses/>.
+
+use libp2p_identity::PeerId;
+use mixnet::core::PeerId as CorePeerId;
+
+/// Convert a libp2p [`PeerId`] into a mixnet core [`PeerId`](CorePeerId).
+///
+/// This will succeed only if `peer_id` is an Ed25519 public key ("hashed" using the identity
+/// hasher). Returns `None` on failure.
+pub fn to_core_peer_id(peer_id: &PeerId) -> Option<CorePeerId> {
+	let hash = peer_id.as_ref();
+	if hash.code() != 0 {
+		// Hash is not identity
+		return None
+	}
+	let public = libp2p_identity::PublicKey::try_decode_protobuf(hash.digest()).ok()?;
+	public.try_into_ed25519().ok().map(|public| public.to_bytes())
+}
+
+/// Convert a mixnet core [`PeerId`](CorePeerId) into a libp2p [`PeerId`].
+///
+/// This will succeed only if `peer_id` represents a point on the Ed25519 curve. Returns `None` on
+/// failure.
+pub fn from_core_peer_id(core_peer_id: &CorePeerId) -> Option<PeerId> {
+	let public = libp2p_identity::ed25519::PublicKey::try_from_bytes(core_peer_id).ok()?;
+	let public: libp2p_identity::PublicKey = public.into();
+	Some(public.into())
+}
diff --git a/substrate/client/mixnet/src/protocol.rs b/substrate/client/mixnet/src/protocol.rs
new file mode 100644
index 0000000000000000000000000000000000000000..555c267b86e0c5b95d52df355c552448e9c19ce4
--- /dev/null
+++ b/substrate/client/mixnet/src/protocol.rs
@@ -0,0 +1,42 @@
+// This file is part of Substrate.
+
+// Copyright (C) Parity Technologies (UK) Ltd.
+// SPDX-License-Identifier: GPL-3.0-or-later WITH Classpath-exception-2.0
+
+// This program 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.
+
+// This program 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 this program. If not, see <https://www.gnu.org/licenses/>.
+
+use super::config::Config;
+use mixnet::core::PACKET_SIZE;
+use sc_network::{config::NonDefaultSetConfig, ProtocolName};
+
+/// Returns the protocol name to use for the mixnet controlled by the given chain.
+pub fn protocol_name(genesis_hash: &[u8], fork_id: Option<&str>) -> ProtocolName {
+	let name = if let Some(fork_id) = fork_id {
+		format!("/{}/{}/mixnet/1", array_bytes::bytes2hex("", genesis_hash), fork_id)
+	} else {
+		format!("/{}/mixnet/1", array_bytes::bytes2hex("", genesis_hash))
+	};
+	name.into()
+}
+
+/// Returns the peers set configuration for the mixnet protocol.
+pub fn peers_set_config(name: ProtocolName, config: &Config) -> NonDefaultSetConfig {
+	let mut set_config = NonDefaultSetConfig::new(name, PACKET_SIZE as u64);
+	if config.substrate.num_gateway_slots != 0 {
+		// out_peers is always 0; we are only interested in connecting to mixnodes, which we do by
+		// setting them as reserved nodes
+		set_config.allow_non_reserved(config.substrate.num_gateway_slots, 0);
+	}
+	set_config
+}
diff --git a/substrate/client/mixnet/src/request.rs b/substrate/client/mixnet/src/request.rs
new file mode 100644
index 0000000000000000000000000000000000000000..18a74c7ea5cf1aa7d9ae2a9f1805a0dbc32ebbf5
--- /dev/null
+++ b/substrate/client/mixnet/src/request.rs
@@ -0,0 +1,119 @@
+// This file is part of Substrate.
+
+// Copyright (C) Parity Technologies (UK) Ltd.
+// SPDX-License-Identifier: GPL-3.0-or-later WITH Classpath-exception-2.0
+
+// This program 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.
+
+// This program 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 this program. If not, see <https://www.gnu.org/licenses/>.
+
+//! Sender-side request logic. Some things from this module are also used on the receiver side, eg
+//! [`extrinsic_delay`], but most of the receiver-side request logic lives elsewhere.
+
+use super::{config::SubstrateConfig, error::Error};
+use blake2::{
+	digest::{consts::U16, Mac},
+	Blake2bMac,
+};
+use codec::{Decode, DecodeAll};
+use futures::channel::oneshot;
+use log::debug;
+use mixnet::core::{Delay, MessageId, PostErr, Scattered};
+use sp_core::Bytes;
+use std::time::Duration;
+
+const LOG_TARGET: &str = "mixnet";
+
+fn send_err<T>(reply_sender: oneshot::Sender<Result<T, Error>>, err: Error) {
+	if let Err(Err(err)) = reply_sender.send(Err(err)) {
+		debug!(target: LOG_TARGET, "Failed to inform requester of error: {err}");
+	}
+}
+
+fn send_reply<T: Decode>(reply_sender: oneshot::Sender<Result<T, Error>>, mut data: &[u8]) {
+	let res = match Result::decode_all(&mut data) {
+		Ok(res) => res.map_err(Error::Remote),
+		Err(_) => Err(Error::BadReply),
+	};
+	match reply_sender.send(res) {
+		Ok(_) => (),
+		Err(Ok(_)) => debug!(target: LOG_TARGET, "Failed to send reply to requester"),
+		Err(Err(err)) => debug!(target: LOG_TARGET, "Failed to inform requester of error: {err}"),
+	}
+}
+
+/// First byte of a submit extrinsic request, identifying it as such.
+pub const SUBMIT_EXTRINSIC: u8 = 1;
+
+const EXTRINSIC_DELAY_PERSONA: &[u8; 16] = b"submit-extrn-dly";
+
+/// Returns the artificial delay that should be inserted between receipt of a submit extrinsic
+/// request with the given message ID and import of the extrinsic into the local transaction pool.
+pub fn extrinsic_delay(message_id: &MessageId, config: &SubstrateConfig) -> Duration {
+	let h = Blake2bMac::<U16>::new_with_salt_and_personal(message_id, b"", EXTRINSIC_DELAY_PERSONA)
+		.expect("Key, salt, and persona sizes are fixed and small enough");
+	let delay = Delay::exp(h.finalize().into_bytes().as_ref());
+	delay.to_duration(config.mean_extrinsic_delay)
+}
+
+/// Request parameters and local reply channel. Stored by the
+/// [`RequestManager`](mixnet::request_manager::RequestManager).
+pub enum Request {
+	SubmitExtrinsic { extrinsic: Bytes, reply_sender: oneshot::Sender<Result<(), Error>> },
+}
+
+impl Request {
+	/// Forward an error to the user of the mixnet service.
+	fn send_err(self, err: Error) {
+		match self {
+			Request::SubmitExtrinsic { reply_sender, .. } => send_err(reply_sender, err),
+		}
+	}
+
+	/// Forward a reply to the user of the mixnet service.
+	pub fn send_reply(self, data: &[u8]) {
+		match self {
+			Request::SubmitExtrinsic { reply_sender, .. } => send_reply(reply_sender, data),
+		}
+	}
+}
+
+impl mixnet::request_manager::Request for Request {
+	type Context = SubstrateConfig;
+
+	fn with_data<T>(&self, f: impl FnOnce(Scattered<u8>) -> T, _context: &Self::Context) -> T {
+		match self {
+			Request::SubmitExtrinsic { extrinsic, .. } =>
+				f([&[SUBMIT_EXTRINSIC], extrinsic.as_ref()].as_slice().into()),
+		}
+	}
+
+	fn num_surbs(&self, context: &Self::Context) -> usize {
+		match self {
+			Request::SubmitExtrinsic { .. } => context.surb_factor,
+		}
+	}
+
+	fn handling_delay(&self, message_id: &MessageId, context: &Self::Context) -> Duration {
+		match self {
+			Request::SubmitExtrinsic { .. } => extrinsic_delay(message_id, context),
+		}
+	}
+
+	fn handle_post_err(self, err: PostErr, _context: &Self::Context) {
+		self.send_err(err.into());
+	}
+
+	fn handle_retry_limit_reached(self, _context: &Self::Context) {
+		self.send_err(Error::NoReply);
+	}
+}
diff --git a/substrate/client/mixnet/src/run.rs b/substrate/client/mixnet/src/run.rs
new file mode 100644
index 0000000000000000000000000000000000000000..09020469d5eee42782b1f3178f3402f83d5edbce
--- /dev/null
+++ b/substrate/client/mixnet/src/run.rs
@@ -0,0 +1,388 @@
+// This file is part of Substrate.
+
+// Copyright (C) Parity Technologies (UK) Ltd.
+// SPDX-License-Identifier: GPL-3.0-or-later WITH Classpath-exception-2.0
+
+// This program 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.
+
+// This program 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 this program. If not, see <https://www.gnu.org/licenses/>.
+
+//! Top-level mixnet service function.
+
+use super::{
+	api::ApiBackend,
+	config::{Config, SubstrateConfig},
+	error::RemoteErr,
+	extrinsic_queue::ExtrinsicQueue,
+	maybe_inf_delay::MaybeInfDelay,
+	packet_dispatcher::PacketDispatcher,
+	peer_id::to_core_peer_id,
+	request::{extrinsic_delay, Request, SUBMIT_EXTRINSIC},
+	sync_with_runtime::sync_with_runtime,
+};
+use codec::{Decode, DecodeAll, Encode};
+use futures::{
+	future::{pending, Either},
+	stream::FuturesUnordered,
+	StreamExt,
+};
+use log::{debug, error, trace, warn};
+use mixnet::{
+	core::{Events, Message, Mixnet, Packet},
+	reply_manager::{ReplyContext, ReplyManager},
+	request_manager::RequestManager,
+};
+use sc_client_api::{BlockchainEvents, HeaderBackend};
+use sc_network::{
+	Event::{NotificationStreamClosed, NotificationStreamOpened, NotificationsReceived},
+	NetworkEventStream, NetworkNotification, NetworkPeers, NetworkStateInfo, ProtocolName,
+};
+use sc_transaction_pool_api::{
+	LocalTransactionPool, OffchainTransactionPoolFactory, TransactionPool,
+};
+use sp_api::{ApiExt, ProvideRuntimeApi};
+use sp_consensus::SyncOracle;
+use sp_keystore::{KeystoreExt, KeystorePtr};
+use sp_mixnet::{runtime_api::MixnetApi, types::Mixnode};
+use sp_runtime::{
+	traits::{Block, Header},
+	transaction_validity::TransactionSource,
+	Saturating,
+};
+use std::{
+	sync::Arc,
+	time::{Duration, Instant},
+};
+
+const LOG_TARGET: &str = "mixnet";
+
+const MIN_BLOCKS_BETWEEN_REGISTRATION_ATTEMPTS: u32 = 3;
+
+fn complete_submit_extrinsic<X>(
+	reply_manager: &mut ReplyManager,
+	reply_context: ReplyContext,
+	data: Result<(), RemoteErr>,
+	mixnet: &mut Mixnet<X>,
+) {
+	reply_manager.complete(reply_context, data.encode(), mixnet);
+}
+
+fn handle_packet<X, E: Decode>(
+	packet: &Packet,
+	mixnet: &mut Mixnet<X>,
+	request_manager: &mut RequestManager<Request>,
+	reply_manager: &mut ReplyManager,
+	extrinsic_queue: &mut ExtrinsicQueue<E>,
+	config: &SubstrateConfig,
+) {
+	match mixnet.handle_packet(packet) {
+		Some(Message::Request(message)) => {
+			let Some((reply_context, data)) = reply_manager.insert(message, mixnet) else { return };
+
+			match data.as_slice() {
+				[SUBMIT_EXTRINSIC, encoded_extrinsic @ ..] => {
+					if !extrinsic_queue.has_space() {
+						debug!(target: LOG_TARGET, "No space in extrinsic queue; dropping request");
+						// We don't send a reply in this case; we want the requester to retry
+						reply_manager.abandon(reply_context);
+						return
+					}
+
+					// Decode the extrinsic
+					let mut encoded_extrinsic = encoded_extrinsic;
+					let extrinsic = match E::decode_all(&mut encoded_extrinsic) {
+						Ok(extrinsic) => extrinsic,
+						Err(err) => {
+							complete_submit_extrinsic(
+								reply_manager,
+								reply_context,
+								Err(RemoteErr::Decode(format!("Bad extrinsic: {}", err))),
+								mixnet,
+							);
+							return
+						},
+					};
+
+					let deadline =
+						Instant::now() + extrinsic_delay(reply_context.message_id(), config);
+					extrinsic_queue.insert(deadline, extrinsic, reply_context);
+				},
+				_ => {
+					debug!(target: LOG_TARGET, "Unrecognised request; discarding");
+					// To keep things simple we don't bother sending a reply in this case. The
+					// requester will give up and try another mixnode eventually.
+					reply_manager.abandon(reply_context);
+				},
+			}
+		},
+		Some(Message::Reply(message)) => {
+			let Some(request) = request_manager.remove(&message.request_id) else {
+				trace!(
+					target: LOG_TARGET,
+					"Received reply to already-completed request with message ID {:x?}",
+					message.request_id
+				);
+				return
+			};
+			request.send_reply(&message.data);
+		},
+		None => (),
+	}
+}
+
+fn time_until(instant: Instant) -> Duration {
+	instant.saturating_duration_since(Instant::now())
+}
+
+/// Run the mixnet service. If `keystore` is `None`, the service will not attempt to register the
+/// local node as a mixnode, even if `config.register` is `true`.
+pub async fn run<B, C, S, N, P>(
+	config: Config,
+	mut api_backend: ApiBackend,
+	client: Arc<C>,
+	sync: Arc<S>,
+	network: Arc<N>,
+	protocol_name: ProtocolName,
+	transaction_pool: Arc<P>,
+	keystore: Option<KeystorePtr>,
+) where
+	B: Block,
+	C: BlockchainEvents<B> + ProvideRuntimeApi<B> + HeaderBackend<B>,
+	C::Api: MixnetApi<B>,
+	S: SyncOracle,
+	N: NetworkStateInfo + NetworkEventStream + NetworkNotification + NetworkPeers,
+	P: TransactionPool<Block = B> + LocalTransactionPool<Block = B> + 'static,
+{
+	let local_peer_id = network.local_peer_id();
+	let Some(local_peer_id) = to_core_peer_id(&local_peer_id) else {
+		error!(target: LOG_TARGET,
+			"Failed to convert libp2p local peer ID {local_peer_id} to mixnet peer ID; \
+			mixnet not running");
+		return
+	};
+
+	let offchain_transaction_pool_factory =
+		OffchainTransactionPoolFactory::new(transaction_pool.clone());
+
+	let mut mixnet = Mixnet::new(config.core);
+	// It would make sense to reset this to 0 when the session changes, but registrations aren't
+	// allowed at the start of a session anyway, so it doesn't really matter
+	let mut min_register_block = 0u32.into();
+	let mut packet_dispatcher = PacketDispatcher::new(&local_peer_id);
+	let mut request_manager = RequestManager::new(config.request_manager);
+	let mut reply_manager = ReplyManager::new(config.reply_manager);
+	let mut extrinsic_queue = ExtrinsicQueue::new(config.substrate.extrinsic_queue_capacity);
+
+	let mut finality_notifications = client.finality_notification_stream();
+	// Import notifications only used for triggering registration attempts
+	let mut import_notifications = if config.substrate.register && keystore.is_some() {
+		Some(client.import_notification_stream())
+	} else {
+		None
+	};
+	let mut network_events = network.event_stream("mixnet").fuse();
+	let mut next_forward_packet_delay = MaybeInfDelay::new(None);
+	let mut next_authored_packet_delay = MaybeInfDelay::new(None);
+	let mut ready_peers = FuturesUnordered::new();
+	let mut next_retry_delay = MaybeInfDelay::new(None);
+	let mut next_extrinsic_delay = MaybeInfDelay::new(None);
+	let mut submit_extrinsic_results = FuturesUnordered::new();
+
+	loop {
+		let mut next_request = if request_manager.has_space() {
+			Either::Left(api_backend.request_receiver.select_next_some())
+		} else {
+			Either::Right(pending())
+		};
+
+		let mut next_import_notification = import_notifications.as_mut().map_or_else(
+			|| Either::Right(pending()),
+			|notifications| Either::Left(notifications.select_next_some()),
+		);
+
+		futures::select! {
+			request = next_request =>
+				request_manager.insert(request, &mut mixnet, &packet_dispatcher, &config.substrate),
+
+			notification = finality_notifications.select_next_some() => {
+				// To avoid trying to connect to old mixnodes, ignore finality notifications while
+				// offline or major syncing. This is a bit racy but should be good enough.
+				if !sync.is_offline() && !sync.is_major_syncing() {
+					let api = client.runtime_api();
+					sync_with_runtime(&mut mixnet, api, notification.hash);
+					request_manager.update_session_status(
+						&mut mixnet, &packet_dispatcher, &config.substrate);
+				}
+			}
+
+			notification = next_import_notification => {
+				if notification.is_new_best && (*notification.header.number() >= min_register_block) {
+					let mut api = client.runtime_api();
+					api.register_extension(KeystoreExt(keystore.clone().expect(
+						"Import notification stream only setup if we have a keystore")));
+					api.register_extension(offchain_transaction_pool_factory
+						.offchain_transaction_pool(notification.hash));
+					let session_index = mixnet.session_status().current_index;
+					let mixnode = Mixnode {
+						kx_public: *mixnet.next_kx_public(),
+						peer_id: local_peer_id,
+						external_addresses: network.external_addresses().into_iter()
+							.map(|addr| addr.to_string().into_bytes()).collect(),
+					};
+					match api.maybe_register(notification.hash, session_index, mixnode) {
+						Ok(true) => min_register_block = notification.header.number().saturating_add(
+							MIN_BLOCKS_BETWEEN_REGISTRATION_ATTEMPTS.into()),
+						Ok(false) => (),
+						Err(err) => debug!(target: LOG_TARGET,
+							"Error trying to register for the next session: {err}"),
+					}
+				}
+			}
+
+			event = network_events.select_next_some() => match event {
+				NotificationStreamOpened { remote, protocol, .. }
+					if protocol == protocol_name => packet_dispatcher.add_peer(&remote),
+				NotificationStreamClosed { remote, protocol }
+					if protocol == protocol_name => packet_dispatcher.remove_peer(&remote),
+				NotificationsReceived { remote, messages } => {
+					for message in messages {
+						if message.0 == protocol_name {
+							match message.1.as_ref().try_into() {
+								Ok(packet) => handle_packet(packet,
+									&mut mixnet, &mut request_manager, &mut reply_manager,
+									&mut extrinsic_queue, &config.substrate),
+								Err(_) => debug!(target: LOG_TARGET,
+									"Dropped incorrectly sized packet ({} bytes) from {remote}",
+									message.1.len(),
+								),
+							}
+						}
+					}
+				}
+				_ => ()
+			},
+
+			_ = next_forward_packet_delay => {
+				if let Some(packet) = mixnet.pop_next_forward_packet() {
+					if let Some(ready_peer) = packet_dispatcher.dispatch(packet) {
+						if let Some(fut) = ready_peer.send_packet(&*network, protocol_name.clone()) {
+							ready_peers.push(fut);
+						}
+					}
+				} else {
+					warn!(target: LOG_TARGET,
+						"Next forward packet deadline reached, but no packet in queue; \
+						this is a bug");
+				}
+			}
+
+			_ = next_authored_packet_delay => {
+				if let Some(packet) = mixnet.pop_next_authored_packet(&packet_dispatcher) {
+					if let Some(ready_peer) = packet_dispatcher.dispatch(packet) {
+						if let Some(fut) = ready_peer.send_packet(&*network, protocol_name.clone()) {
+							ready_peers.push(fut);
+						}
+					}
+				}
+			}
+
+			ready_peer = ready_peers.select_next_some() => {
+				if let Some(ready_peer) = ready_peer {
+					if let Some(fut) = ready_peer.send_packet(&*network, protocol_name.clone()) {
+						ready_peers.push(fut);
+					}
+				}
+			}
+
+			_ = next_retry_delay => {
+				if !request_manager.pop_next_retry(&mut mixnet, &packet_dispatcher, &config.substrate) {
+					warn!(target: LOG_TARGET,
+						"Next retry deadline reached, but no request in retry queue; \
+						this is a bug");
+				}
+			}
+
+			_ = next_extrinsic_delay => {
+				if let Some((extrinsic, reply_context)) = extrinsic_queue.pop() {
+					if submit_extrinsic_results.len() < config.substrate.max_pending_extrinsics {
+						let fut = transaction_pool.submit_one(
+							client.info().best_hash,
+							TransactionSource::External,
+							extrinsic);
+						submit_extrinsic_results.push(async move {
+							(fut.await, reply_context)
+						});
+					} else {
+						// There are already too many pending extrinsics, just drop this one. We
+						// don't send a reply; we want the requester to retry.
+						debug!(target: LOG_TARGET,
+							"Too many pending extrinsics; dropped submit extrinsic request");
+						reply_manager.abandon(reply_context);
+					}
+				} else {
+					warn!(target: LOG_TARGET,
+						"Next extrinsic deadline reached, but no extrinsic in queue; \
+						this is a bug");
+				}
+			}
+
+			res_reply_context = submit_extrinsic_results.select_next_some() => {
+				let (res, reply_context) = res_reply_context;
+				let res = match res {
+					Ok(_) => Ok(()),
+					Err(err) => Err(RemoteErr::Other(err.to_string())),
+				};
+				complete_submit_extrinsic(&mut reply_manager, reply_context, res, &mut mixnet);
+			}
+		}
+
+		let events = mixnet.take_events();
+		if !events.is_empty() {
+			if events.contains(Events::RESERVED_PEERS_CHANGED) {
+				let reserved_peer_addrs = mixnet
+					.reserved_peers()
+					.flat_map(|mixnode| mixnode.extra.iter()) // External addresses
+					.cloned()
+					.collect();
+				if let Err(err) =
+					network.set_reserved_peers(protocol_name.clone(), reserved_peer_addrs)
+				{
+					debug!(target: LOG_TARGET, "Setting reserved peers failed: {err}");
+				}
+			}
+			if events.contains(Events::NEXT_FORWARD_PACKET_DEADLINE_CHANGED) {
+				next_forward_packet_delay
+					.reset(mixnet.next_forward_packet_deadline().map(time_until));
+			}
+			if events.contains(Events::NEXT_AUTHORED_PACKET_DEADLINE_CHANGED) {
+				next_authored_packet_delay.reset(mixnet.next_authored_packet_delay());
+			}
+			if events.contains(Events::SPACE_IN_AUTHORED_PACKET_QUEUE) {
+				// Note this may cause the next retry deadline to change, but should not trigger
+				// any mixnet events
+				request_manager.process_post_queues(
+					&mut mixnet,
+					&packet_dispatcher,
+					&config.substrate,
+				);
+			}
+		}
+
+		if request_manager.next_retry_deadline_changed() {
+			next_retry_delay.reset(request_manager.next_retry_deadline().map(time_until));
+		}
+
+		if extrinsic_queue.next_deadline_changed() {
+			next_extrinsic_delay.reset(extrinsic_queue.next_deadline().map(time_until));
+		}
+	}
+}
diff --git a/substrate/client/mixnet/src/sync_with_runtime.rs b/substrate/client/mixnet/src/sync_with_runtime.rs
new file mode 100644
index 0000000000000000000000000000000000000000..4a80b3c75f43d88ac5fd714e55fd8e7cb4c26d1c
--- /dev/null
+++ b/substrate/client/mixnet/src/sync_with_runtime.rs
@@ -0,0 +1,228 @@
+// This file is part of Substrate.
+
+// Copyright (C) Parity Technologies (UK) Ltd.
+// SPDX-License-Identifier: GPL-3.0-or-later WITH Classpath-exception-2.0
+
+// This program 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.
+
+// This program 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 this program. If not, see <https://www.gnu.org/licenses/>.
+
+//! [`sync_with_runtime`] synchronises the session status and mixnode sets from the blockchain
+//! runtime to the core mixnet state. It is called every time a block is finalised.
+
+use super::peer_id::from_core_peer_id;
+use libp2p_identity::PeerId;
+use log::{debug, info};
+use mixnet::core::{
+	Mixnet, Mixnode as CoreMixnode, MixnodesErr as CoreMixnodesErr, RelSessionIndex,
+	SessionPhase as CoreSessionPhase, SessionStatus as CoreSessionStatus,
+};
+use multiaddr::{multiaddr, Multiaddr, Protocol};
+use sp_api::{ApiError, ApiRef};
+use sp_mixnet::{
+	runtime_api::MixnetApi,
+	types::{
+		Mixnode as RuntimeMixnode, MixnodesErr as RuntimeMixnodesErr,
+		SessionPhase as RuntimeSessionPhase, SessionStatus as RuntimeSessionStatus,
+	},
+};
+use sp_runtime::traits::Block;
+
+const LOG_TARGET: &str = "mixnet";
+
+/// Convert a [`RuntimeSessionStatus`] to a [`CoreSessionStatus`].
+///
+/// The [`RuntimeSessionStatus`] and [`CoreSessionStatus`] types are effectively the same.
+/// [`RuntimeSessionStatus`] is used in the runtime to avoid depending on the [`mixnet`] crate
+/// there.
+fn to_core_session_status(status: RuntimeSessionStatus) -> CoreSessionStatus {
+	CoreSessionStatus {
+		current_index: status.current_index,
+		phase: match status.phase {
+			RuntimeSessionPhase::CoverToCurrent => CoreSessionPhase::CoverToCurrent,
+			RuntimeSessionPhase::RequestsToCurrent => CoreSessionPhase::RequestsToCurrent,
+			RuntimeSessionPhase::CoverToPrev => CoreSessionPhase::CoverToPrev,
+			RuntimeSessionPhase::DisconnectFromPrev => CoreSessionPhase::DisconnectFromPrev,
+		},
+	}
+}
+
+fn parse_external_addresses(external_addresses: Vec<Vec<u8>>) -> Vec<Multiaddr> {
+	external_addresses
+		.into_iter()
+		.flat_map(|addr| {
+			let addr = match String::from_utf8(addr) {
+				Ok(addr) => addr,
+				Err(addr) => {
+					debug!(
+						target: LOG_TARGET,
+						"Mixnode external address {:x?} is not valid UTF-8",
+						addr.into_bytes(),
+					);
+					return None
+				},
+			};
+			match addr.parse() {
+				Ok(addr) => Some(addr),
+				Err(err) => {
+					debug!(
+						target: LOG_TARGET,
+						"Could not parse mixnode address {addr}: {err}",
+					);
+					None
+				},
+			}
+		})
+		.collect()
+}
+
+/// Modify `external_addresses` such that there is at least one address and the final component of
+/// each address matches `peer_id`.
+fn fixup_external_addresses(external_addresses: &mut Vec<Multiaddr>, peer_id: &PeerId) {
+	// Ensure the final component of each address matches peer_id
+	external_addresses.retain_mut(|addr| match PeerId::try_from_multiaddr(addr) {
+		Some(addr_peer_id) if addr_peer_id == *peer_id => true,
+		Some(_) => {
+			debug!(
+				target: LOG_TARGET,
+				"Mixnode address {} does not match mixnode peer ID {}, ignoring",
+				addr,
+				peer_id
+			);
+			false
+		},
+		None if matches!(addr.iter().last(), Some(Protocol::P2p(_))) => {
+			debug!(
+				target: LOG_TARGET,
+				"Mixnode address {} has unrecognised P2P protocol, ignoring",
+				addr
+			);
+			false
+		},
+		None => {
+			addr.push(Protocol::P2p(*peer_id.as_ref()));
+			true
+		},
+	});
+
+	// If there are no addresses, insert one consisting of just the peer ID
+	if external_addresses.is_empty() {
+		external_addresses.push(multiaddr!(P2p(*peer_id.as_ref())));
+	}
+}
+
+/// Convert a [`RuntimeMixnode`] to a [`CoreMixnode`]. If the conversion fails, an error message is
+/// logged, but a [`CoreMixnode`] is still returned.
+///
+/// It would be possible to handle conversion failure in a better way, but this would complicate
+/// things for what should be a rare case. Note that even if the conversion here succeeds, there is
+/// no guarantee that we will be able to connect to the mixnode or send packets to it. The most
+/// common failure case is expected to be that a mixnode is simply unreachable over the network.
+fn into_core_mixnode(mixnode: RuntimeMixnode) -> CoreMixnode<Vec<Multiaddr>> {
+	let external_addresses = if let Some(peer_id) = from_core_peer_id(&mixnode.peer_id) {
+		let mut external_addresses = parse_external_addresses(mixnode.external_addresses);
+		fixup_external_addresses(&mut external_addresses, &peer_id);
+		external_addresses
+	} else {
+		debug!(
+			target: LOG_TARGET,
+			"Failed to convert mixnet peer ID {:x?} to libp2p peer ID",
+			mixnode.peer_id,
+		);
+		Vec::new()
+	};
+
+	CoreMixnode {
+		kx_public: mixnode.kx_public,
+		peer_id: mixnode.peer_id,
+		extra: external_addresses,
+	}
+}
+
+fn maybe_set_mixnodes(
+	mixnet: &mut Mixnet<Vec<Multiaddr>>,
+	rel_session_index: RelSessionIndex,
+	mixnodes: &dyn Fn() -> Result<Result<Vec<RuntimeMixnode>, RuntimeMixnodesErr>, ApiError>,
+) {
+	let current_session_index = mixnet.session_status().current_index;
+	mixnet.maybe_set_mixnodes(rel_session_index, &mut || {
+		// Note that RelSessionIndex::Prev + 0 would panic, but this closure will not get called in
+		// that case so we are fine. Do not move this out of the closure!
+		let session_index = rel_session_index + current_session_index;
+		match mixnodes() {
+			Ok(Ok(mixnodes)) => Ok(mixnodes.into_iter().map(into_core_mixnode).collect()),
+			Ok(Err(err)) => {
+				info!(target: LOG_TARGET, "Session {session_index}: Mixnet disabled: {err}");
+				Err(CoreMixnodesErr::Permanent) // Disable the session slot
+			},
+			Err(err) => {
+				debug!(
+					target: LOG_TARGET,
+					"Session {session_index}: Error getting mixnodes from runtime: {err}"
+				);
+				Err(CoreMixnodesErr::Transient) // Just leave the session slot empty; try again next block
+			},
+		}
+	});
+}
+
+pub fn sync_with_runtime<B, A>(mixnet: &mut Mixnet<Vec<Multiaddr>>, api: ApiRef<A>, hash: B::Hash)
+where
+	B: Block,
+	A: MixnetApi<B>,
+{
+	let session_status = match api.session_status(hash) {
+		Ok(session_status) => session_status,
+		Err(err) => {
+			debug!(target: LOG_TARGET, "Error getting session status from runtime: {err}");
+			return
+		},
+	};
+	mixnet.set_session_status(to_core_session_status(session_status));
+
+	maybe_set_mixnodes(mixnet, RelSessionIndex::Prev, &|| api.prev_mixnodes(hash));
+	maybe_set_mixnodes(mixnet, RelSessionIndex::Current, &|| api.current_mixnodes(hash));
+}
+
+#[cfg(test)]
+mod tests {
+	use super::*;
+
+	#[test]
+	fn fixup_empty_external_addresses() {
+		let peer_id = PeerId::random();
+		let mut external_addresses = Vec::new();
+		fixup_external_addresses(&mut external_addresses, &peer_id);
+		assert_eq!(external_addresses, vec![multiaddr!(P2p(peer_id))]);
+	}
+
+	#[test]
+	fn fixup_misc_external_addresses() {
+		let peer_id = PeerId::random();
+		let other_peer_id = PeerId::random();
+		let mut external_addresses = vec![
+			multiaddr!(Tcp(0u16), P2p(peer_id)),
+			multiaddr!(Tcp(1u16), P2p(other_peer_id)),
+			multiaddr!(Tcp(2u16)),
+			Multiaddr::empty(),
+		];
+		fixup_external_addresses(&mut external_addresses, &peer_id);
+		assert_eq!(
+			external_addresses,
+			vec![
+				multiaddr!(Tcp(0u16), P2p(peer_id)),
+				multiaddr!(Tcp(2u16), P2p(peer_id)),
+				multiaddr!(P2p(peer_id)),
+			]
+		);
+	}
+}
diff --git a/substrate/client/network-gossip/Cargo.toml b/substrate/client/network-gossip/Cargo.toml
index 8680a60d015b634ad1a4f792de19de2d699b22c7..73d2d3fa051e72725688b69469f431cfa9b90776 100644
--- a/substrate/client/network-gossip/Cargo.toml
+++ b/substrate/client/network-gossip/Cargo.toml
@@ -3,10 +3,10 @@ description = "Gossiping for the Substrate network protocol"
 name = "sc-network-gossip"
 version = "0.10.0-dev"
 license = "GPL-3.0-or-later WITH Classpath-exception-2.0"
-authors = ["Parity Technologies <admin@parity.io>"]
-edition = "2021"
+authors.workspace = true
+edition.workspace = true
 homepage = "https://substrate.io"
-repository = "https://github.com/paritytech/substrate/"
+repository.workspace = true
 documentation = "https://docs.rs/sc-network-gossip"
 readme = "README.md"
 
diff --git a/substrate/client/network-gossip/README.md b/substrate/client/network-gossip/README.md
index 9030fac056407aada04522af786058f8f75d8718..900f223251d7b7ea33e24b5df834b52f7503c1bd 100644
--- a/substrate/client/network-gossip/README.md
+++ b/substrate/client/network-gossip/README.md
@@ -38,4 +38,4 @@ opens the door for neighbor status packets to be baked into the gossip protocol.
 These status packets will typically contain light pieces of information
 used to inform peers of a current view of protocol state.
 
-License: GPL-3.0-or-later WITH Classpath-exception-2.0
\ No newline at end of file
+License: GPL-3.0-or-later WITH Classpath-exception-2.0
diff --git a/substrate/client/network/Cargo.toml b/substrate/client/network/Cargo.toml
index 620d74dc0f5020aed7a992e25e77f0ba18a2dd1d..8b188176fc5e57f487ac74aaa7f9b3c179183846 100644
--- a/substrate/client/network/Cargo.toml
+++ b/substrate/client/network/Cargo.toml
@@ -3,10 +3,10 @@ description = "Substrate network protocol"
 name = "sc-network"
 version = "0.10.0-dev"
 license = "GPL-3.0-or-later WITH Classpath-exception-2.0"
-authors = ["Parity Technologies <admin@parity.io>"]
-edition = "2021"
+authors.workspace = true
+edition.workspace = true
 homepage = "https://substrate.io"
-repository = "https://github.com/paritytech/substrate/"
+repository.workspace = true
 documentation = "https://docs.rs/sc-network"
 readme = "README.md"
 
@@ -33,8 +33,8 @@ parking_lot = "0.12.1"
 partial_sort = "0.2.0"
 pin-project = "1.0.12"
 rand = "0.8.5"
-serde = { version = "1.0.163", features = ["derive"] }
-serde_json = "1.0.85"
+serde = { version = "1.0.188", features = ["derive"] }
+serde_json = "1.0.107"
 smallvec = "1.11.0"
 thiserror = "1.0"
 unsigned-varint = { version = "0.7.1", features = ["futures", "asynchronous_codec"] }
diff --git a/substrate/client/network/README.md b/substrate/client/network/README.md
index cad46d059092c366754df98181e978651b8e3fa6..f4031fbd308539c6235f3bc2697dfa13136f039d 100644
--- a/substrate/client/network/README.md
+++ b/substrate/client/network/README.md
@@ -80,8 +80,8 @@ is "dot". In the protocol names below, `<protocol-id>` must be replaced with the
 protocol ID.
 
 > **Note**: It is possible for the same connection to be used for multiple chains. For example,
->           one can use both the `/dot/sync/2` and `/sub/sync/2` protocols on the same
->           connection, provided that the remote supports them.
+> one can use both the `/dot/sync/2` and `/sub/sync/2` protocols on the same
+> connection, provided that the remote supports them.
 
 Substrate uses the following standard libp2p protocols:
 
@@ -138,7 +138,7 @@ substream is closed, the entire connection is closed as well. This is a bug that
 resolved by deprecating the protocol entirely.
 
 Within the unique Substrate substream, messages encoded using
-[*parity-scale-codec*](https://github.com/paritytech/parity-scale-codec) are exchanged.
+[`parity-scale-codec``](https://github.com/paritytech/parity-scale-codec) are exchanged.
 The detail of theses messages is not totally in place, but they can be found in the
 `message.rs` file.
 
@@ -240,7 +240,7 @@ The state is then imported into the database and the keep-up sync starts in norm
 This is similar to fast sync, but instead of downloading and verifying full header chain, the algorithm
 only downloads finalized authority set changes.
 
-### GRANDPA warp sync.
+### GRANDPA warp sync
 
 GRANDPA keeps justifications for each finalized authority set change. Each change is signed by the
 authorities from the previous set. By downloading and verifying these signed hand-offs starting from genesis,
@@ -254,7 +254,7 @@ the fast sync. The state is verified to match the header storage root. After the
 database it is queried for the information that allows GRANDPA and BABE to continue operating from that state.
 This includes BABE epoch information and GRANDPA authority set id.
 
-### Background block download.
+### Background block download
 
 After the latest state has been imported the node is fully operational, but is still missing historic block
 data. I.e. it is unable to serve bock bodies and headers other than the most recent one. To make sure all
diff --git a/substrate/client/network/bitswap/Cargo.toml b/substrate/client/network/bitswap/Cargo.toml
index 3efcfe23456d021b0a008a69ef119f6f4f2bfd67..412d603163d8c4ce340adaf2fee2059920142313 100644
--- a/substrate/client/network/bitswap/Cargo.toml
+++ b/substrate/client/network/bitswap/Cargo.toml
@@ -3,10 +3,10 @@ description = "Substrate bitswap protocol"
 name = "sc-network-bitswap"
 version = "0.10.0-dev"
 license = "GPL-3.0-or-later WITH Classpath-exception-2.0"
-authors = ["Parity Technologies <admin@parity.io>"]
-edition = "2021"
+authors.workspace = true
+edition.workspace = true
 homepage = "https://substrate.io"
-repository = "https://github.com/paritytech/substrate/"
+repository.workspace = true
 documentation = "https://docs.rs/sc-network-bitswap"
 
 [package.metadata.docs.rs]
@@ -19,7 +19,7 @@ prost-build = "0.11"
 async-channel = "1.8.0"
 cid = "0.9.0"
 futures = "0.3.21"
-libp2p-identity = { version = "0.1.2", features = ["peerid"] }
+libp2p-identity = { version = "0.1.3", features = ["peerid"] }
 log = "0.4.17"
 prost = "0.11"
 thiserror = "1.0"
diff --git a/substrate/client/network/bitswap/build.rs b/substrate/client/network/bitswap/build.rs
index 671277230a7746b4da5e4e1d9d6b68f5ccf10b3e..2495a9c25653bde1dd9a3d49bc3391c1d1053f20 100644
--- a/substrate/client/network/bitswap/build.rs
+++ b/substrate/client/network/bitswap/build.rs
@@ -1,3 +1,21 @@
+// This file is part of Substrate.
+
+// Copyright (C) Parity Technologies (UK) Ltd.
+// SPDX-License-Identifier: GPL-3.0-or-later WITH Classpath-exception-2.0
+
+// This program 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.
+
+// This program 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 this program. If not, see <https://www.gnu.org/licenses/>.
+
 const PROTOS: &[&str] = &["src/schema/bitswap.v1.2.0.proto"];
 
 fn main() {
diff --git a/substrate/client/network/bitswap/src/lib.rs b/substrate/client/network/bitswap/src/lib.rs
index beaaa8fd0fdec2d5d526ccc4447871cb832b4225..7bb8b00306534c991a5e7fb317d9255952f24bc6 100644
--- a/substrate/client/network/bitswap/src/lib.rs
+++ b/substrate/client/network/bitswap/src/lib.rs
@@ -1,4 +1,4 @@
-// Copyright Parity Technologies (UK) Ltd.
+// Copyright (C) Parity Technologies (UK) Ltd.
 // This file is part of Substrate.
 
 // Substrate is free software: you can redistribute it and/or modify
diff --git a/substrate/client/network/common/Cargo.toml b/substrate/client/network/common/Cargo.toml
index 7b44487b0e198538d927aa9536cbb5cfcaef97b6..65c8e1d71c721b99447e8292d036a3312f9cfc1a 100644
--- a/substrate/client/network/common/Cargo.toml
+++ b/substrate/client/network/common/Cargo.toml
@@ -3,10 +3,10 @@ description = "Substrate network common"
 name = "sc-network-common"
 version = "0.10.0-dev"
 license = "GPL-3.0-or-later WITH Classpath-exception-2.0"
-authors = ["Parity Technologies <admin@parity.io>"]
-edition = "2021"
+authors.workspace = true
+edition.workspace = true
 homepage = "https://substrate.io"
-repository = "https://github.com/paritytech/substrate/"
+repository.workspace = true
 documentation = "https://docs.rs/sc-network-sync"
 
 [package.metadata.docs.rs]
@@ -22,7 +22,7 @@ codec = { package = "parity-scale-codec", version = "3.6.1", features = [
 	"derive",
 ] }
 futures = "0.3.21"
-libp2p-identity = { version = "0.1.2", features = ["peerid"] }
+libp2p-identity = { version = "0.1.3", features = ["peerid"] }
 sc-consensus = { path = "../../consensus/common" }
 sp-consensus = { path = "../../../primitives/consensus/common" }
 sp-consensus-grandpa = { path = "../../../primitives/consensus/grandpa" }
diff --git a/substrate/client/network/common/src/role.rs b/substrate/client/network/common/src/role.rs
index cd43f6655b72cc2d5f1b35c0187ebcfb7a2a9b8c..fd02c00e2324afb59e10c441b5018ea292149fad 100644
--- a/substrate/client/network/common/src/role.rs
+++ b/substrate/client/network/common/src/role.rs
@@ -16,6 +16,10 @@
 // You should have received a copy of the GNU General Public License
 // along with this program. If not, see <https://www.gnu.org/licenses/>.
 
+// file-level lint whitelist to avoid problem with bitflags macro below
+// TODO: can be dropped after an update to bitflags 2.4
+#![allow(clippy::bad_bit_mask)]
+
 use codec::{self, Encode, EncodeLike, Input, Output};
 
 /// Role that the peer sent to us during the handshake, with the addition of what our local node
diff --git a/substrate/client/network/common/src/sync.rs b/substrate/client/network/common/src/sync.rs
index b142925aeb10c90971bdadff33b6bc10ccde471e..4ca21221f87febc84231b34af73433a0e29d33c5 100644
--- a/substrate/client/network/common/src/sync.rs
+++ b/substrate/client/network/common/src/sync.rs
@@ -27,7 +27,7 @@ use futures::Stream;
 
 use libp2p_identity::PeerId;
 
-use message::{BlockAnnounce, BlockData, BlockRequest, BlockResponse};
+use message::{BlockAnnounce, BlockRequest, BlockResponse};
 use sc_consensus::{import_queue::RuntimeOrigin, IncomingBlock};
 use sp_consensus::BlockOrigin;
 use sp_runtime::{
@@ -36,7 +36,7 @@ use sp_runtime::{
 };
 use warp::WarpSyncProgress;
 
-use std::{any::Any, fmt, fmt::Formatter, pin::Pin, sync::Arc, task::Poll};
+use std::{any::Any, fmt, fmt::Formatter, pin::Pin, sync::Arc};
 
 /// The sync status of a peer we are trying to sync with
 #[derive(Debug)]
@@ -116,11 +116,18 @@ impl fmt::Display for BadPeer {
 
 impl std::error::Error for BadPeer {}
 
+/// Action that the parent of [`ChainSync`] should perform if we want to import blocks.
+#[derive(Debug, Clone, PartialEq, Eq)]
+pub struct ImportBlocksAction<B: BlockT> {
+	pub origin: BlockOrigin,
+	pub blocks: Vec<IncomingBlock<B>>,
+}
+
 /// Result of [`ChainSync::on_block_data`].
 #[derive(Debug, Clone, PartialEq, Eq)]
 pub enum OnBlockData<Block: BlockT> {
 	/// The block should be imported.
-	Import(BlockOrigin, Vec<IncomingBlock<Block>>),
+	Import(ImportBlocksAction<Block>),
 	/// A new block request needs to be made to the given peer.
 	Request(PeerId, BlockRequest<Block>),
 	/// Continue processing events.
@@ -134,7 +141,7 @@ pub enum OnBlockJustification<Block: BlockT> {
 	Nothing,
 	/// The justification should be imported.
 	Import {
-		peer: PeerId,
+		peer_id: PeerId,
 		hash: Block::Hash,
 		number: NumberFor<Block>,
 		justifications: Justifications,
@@ -157,38 +164,6 @@ pub enum ImportResult<B: BlockT> {
 	JustificationImport(RuntimeOrigin, B::Hash, NumberFor<B>, Justifications),
 }
 
-/// Value polled from `ChainSync`
-#[derive(Debug)]
-pub enum PollResult<B: BlockT> {
-	Import(ImportResult<B>),
-	Announce(PollBlockAnnounceValidation<B::Header>),
-}
-
-/// Result of [`ChainSync::poll_block_announce_validation`].
-#[derive(Debug, Clone, PartialEq, Eq)]
-pub enum PollBlockAnnounceValidation<H> {
-	/// The announcement failed at validation.
-	///
-	/// The peer reputation should be decreased.
-	Failure {
-		/// Who sent the processed block announcement?
-		who: PeerId,
-		/// Should the peer be disconnected?
-		disconnect: bool,
-	},
-	/// The announcement does not require further handling.
-	Nothing {
-		/// Who sent the processed block announcement?
-		who: PeerId,
-		/// Was this their new best block?
-		is_best: bool,
-		/// The announcement.
-		announce: BlockAnnounce<H>,
-	},
-	/// The block announcement should be skipped.
-	Skip,
-}
-
 /// Sync operation mode.
 #[derive(Copy, Clone, Debug, Eq, PartialEq)]
 pub enum SyncMode {
@@ -236,6 +211,23 @@ pub enum PeerRequest<B: BlockT> {
 	WarpProof,
 }
 
+#[derive(Debug)]
+pub enum PeerRequestType {
+	Block,
+	State,
+	WarpProof,
+}
+
+impl<B: BlockT> PeerRequest<B> {
+	pub fn get_type(&self) -> PeerRequestType {
+		match self {
+			PeerRequest::Block(_) => PeerRequestType::Block,
+			PeerRequest::State => PeerRequestType::State,
+			PeerRequest::WarpProof => PeerRequestType::WarpProof,
+		}
+	}
+}
+
 /// Wrapper for implementation-specific state request.
 ///
 /// NOTE: Implementation must be able to encode and decode it for network purposes.
@@ -258,28 +250,6 @@ impl fmt::Debug for OpaqueStateResponse {
 	}
 }
 
-/// Wrapper for implementation-specific block request.
-///
-/// NOTE: Implementation must be able to encode and decode it for network purposes.
-pub struct OpaqueBlockRequest(pub Box<dyn Any + Send>);
-
-impl fmt::Debug for OpaqueBlockRequest {
-	fn fmt(&self, f: &mut Formatter<'_>) -> fmt::Result {
-		f.debug_struct("OpaqueBlockRequest").finish()
-	}
-}
-
-/// Wrapper for implementation-specific block response.
-///
-/// NOTE: Implementation must be able to encode and decode it for network purposes.
-pub struct OpaqueBlockResponse(pub Box<dyn Any + Send>);
-
-impl fmt::Debug for OpaqueBlockResponse {
-	fn fmt(&self, f: &mut Formatter<'_>) -> fmt::Result {
-		f.debug_struct("OpaqueBlockResponse").finish()
-	}
-}
-
 /// Provides high-level status of syncing.
 #[async_trait::async_trait]
 pub trait SyncStatusProvider<Block: BlockT>: Send + Sync {
@@ -343,12 +313,10 @@ pub trait ChainSync<Block: BlockT>: Send {
 	/// Returns the current number of peers stored within this state machine.
 	fn num_peers(&self) -> usize;
 
-	/// Returns the number of peers we're connected to and that are being queried.
-	fn num_active_peers(&self) -> usize;
-
 	/// Handle a new connected peer.
 	///
 	/// Call this method whenever we connect to a new peer.
+	#[must_use]
 	fn new_peer(
 		&mut self,
 		who: PeerId,
@@ -380,6 +348,7 @@ pub trait ChainSync<Block: BlockT>: Send {
 	///
 	/// If this corresponds to a valid block, this outputs the block that
 	/// must be imported in the import queue.
+	#[must_use]
 	fn on_block_data(
 		&mut self,
 		who: &PeerId,
@@ -390,6 +359,7 @@ pub trait ChainSync<Block: BlockT>: Send {
 	/// Handle a response from the remote to a justification request that we made.
 	///
 	/// `request` must be the original request that triggered `response`.
+	#[must_use]
 	fn on_block_justification(
 		&mut self,
 		who: PeerId,
@@ -408,54 +378,20 @@ pub trait ChainSync<Block: BlockT>: Send {
 	/// Notify about finalization of the given block.
 	fn on_block_finalized(&mut self, hash: &Block::Hash, number: NumberFor<Block>);
 
-	/// Push a block announce validation.
-	///
-	/// It is required that [`ChainSync::poll_block_announce_validation`] is called
-	/// to check for finished block announce validations.
-	fn push_block_announce_validation(
+	/// Notify about pre-validated block announcement.
+	fn on_validated_block_announce(
 		&mut self,
-		who: PeerId,
-		hash: Block::Hash,
-		announce: BlockAnnounce<Block::Header>,
 		is_best: bool,
+		who: PeerId,
+		announce: &BlockAnnounce<Block::Header>,
 	);
 
-	/// Poll block announce validation.
-	///
-	/// Block announce validations can be pushed by using
-	/// [`ChainSync::push_block_announce_validation`].
-	///
-	/// This should be polled until it returns [`Poll::Pending`].
-	fn poll_block_announce_validation(
-		&mut self,
-		cx: &mut std::task::Context<'_>,
-	) -> Poll<PollBlockAnnounceValidation<Block::Header>>;
-
 	/// Call when a peer has disconnected.
 	/// Canceled obsolete block request may result in some blocks being ready for
 	/// import, so this functions checks for such blocks and returns them.
-	fn peer_disconnected(&mut self, who: &PeerId);
+	#[must_use]
+	fn peer_disconnected(&mut self, who: &PeerId) -> Option<ImportBlocksAction<Block>>;
 
 	/// Return some key metrics.
 	fn metrics(&self) -> Metrics;
-
-	/// Access blocks from implementation-specific block response.
-	fn block_response_into_blocks(
-		&self,
-		request: &BlockRequest<Block>,
-		response: OpaqueBlockResponse,
-	) -> Result<Vec<BlockData<Block>>, String>;
-
-	/// Advance the state of `ChainSync`
-	///
-	/// Internally calls [`ChainSync::poll_block_announce_validation()`] and
-	/// this function should be polled until it returns [`Poll::Pending`] to
-	/// consume all pending events.
-	fn poll(
-		&mut self,
-		cx: &mut std::task::Context,
-	) -> Poll<PollBlockAnnounceValidation<Block::Header>>;
-
-	/// Send block request to peer
-	fn send_block_request(&mut self, who: PeerId, request: BlockRequest<Block>);
 }
diff --git a/substrate/client/network/common/src/sync/warp.rs b/substrate/client/network/common/src/sync/warp.rs
index 37a6e62c53b4e834914df12b6a39b1881f312c14..f4e39f438512889742c13f3081fe66554f2688ae 100644
--- a/substrate/client/network/common/src/sync/warp.rs
+++ b/substrate/client/network/common/src/sync/warp.rs
@@ -1,4 +1,4 @@
-// Copyright Parity Technologies (UK) Ltd.
+// Copyright (C) Parity Technologies (UK) Ltd.
 // This file is part of Substrate.
 
 // Substrate is free software: you can redistribute it and/or modify
@@ -15,10 +15,9 @@
 // along with Substrate.  If not, see <http://www.gnu.org/licenses/>.
 
 use codec::{Decode, Encode};
-use futures::channel::oneshot;
 pub use sp_consensus_grandpa::{AuthorityList, SetId};
 use sp_runtime::traits::{Block as BlockT, NumberFor};
-use std::{fmt, sync::Arc};
+use std::fmt;
 
 /// Scale-encoded warp sync proof response.
 pub struct EncodedProof(pub Vec<u8>);
@@ -30,16 +29,6 @@ pub struct WarpProofRequest<B: BlockT> {
 	pub begin: B::Hash,
 }
 
-/// The different types of warp syncing.
-pub enum WarpSyncParams<Block: BlockT> {
-	/// Standard warp sync for the chain.
-	WithProvider(Arc<dyn WarpSyncProvider<Block>>),
-	/// Skip downloading proofs and wait for a header of the state that should be downloaded.
-	///
-	/// It is expected that the header provider ensures that the header is trusted.
-	WaitForTarget(oneshot::Receiver<<Block as BlockT>::Header>),
-}
-
 /// Proof verification result.
 pub enum VerificationResult<Block: BlockT> {
 	/// Proof is valid, but the target was not reached.
diff --git a/substrate/client/network/light/Cargo.toml b/substrate/client/network/light/Cargo.toml
index 84c01e6c913fbe323fa5d8f8cb618157a92b65cf..f426cda7fc860a22fba6000935afb234d738f767 100644
--- a/substrate/client/network/light/Cargo.toml
+++ b/substrate/client/network/light/Cargo.toml
@@ -3,10 +3,10 @@ description = "Substrate light network protocol"
 name = "sc-network-light"
 version = "0.10.0-dev"
 license = "GPL-3.0-or-later WITH Classpath-exception-2.0"
-authors = ["Parity Technologies <admin@parity.io>"]
-edition = "2021"
+authors.workspace = true
+edition.workspace = true
 homepage = "https://substrate.io"
-repository = "https://github.com/paritytech/substrate/"
+repository.workspace = true
 documentation = "https://docs.rs/sc-network-light"
 
 [package.metadata.docs.rs]
@@ -22,7 +22,7 @@ codec = { package = "parity-scale-codec", version = "3.6.1", features = [
     "derive",
 ] }
 futures = "0.3.21"
-libp2p-identity = { version = "0.1.2", features = ["peerid"] }
+libp2p-identity = { version = "0.1.3", features = ["peerid"] }
 log = "0.4.16"
 prost = "0.11"
 sp-blockchain = { path = "../../../primitives/blockchain" }
diff --git a/substrate/client/network/light/build.rs b/substrate/client/network/light/build.rs
index 9c44bcd29318168397802bb7de04088c55309cc7..199738abc91b3186de33050bcbc964fee97e11ef 100644
--- a/substrate/client/network/light/build.rs
+++ b/substrate/client/network/light/build.rs
@@ -1,3 +1,21 @@
+// This file is part of Substrate.
+
+// Copyright (C) Parity Technologies (UK) Ltd.
+// SPDX-License-Identifier: GPL-3.0-or-later WITH Classpath-exception-2.0
+
+// This program 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.
+
+// This program 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 this program. If not, see <https://www.gnu.org/licenses/>.
+
 const PROTOS: &[&str] = &["src/schema/light.v1.proto"];
 
 fn main() {
diff --git a/substrate/client/network/src/peer_store.rs b/substrate/client/network/src/peer_store.rs
index 2f3d4a1fd1a0b00ed8bbb17c90a997d956b8bca6..35d17e588cb962099b4656481276457c5f8e56f2 100644
--- a/substrate/client/network/src/peer_store.rs
+++ b/substrate/client/network/src/peer_store.rs
@@ -222,7 +222,7 @@ impl PeerStoreInner {
 		if peer_info.reputation < BANNED_THRESHOLD {
 			self.protocols.iter().for_each(|handle| handle.disconnect_peer(peer_id));
 
-			log::trace!(
+			log::warn!(
 				target: LOG_TARGET,
 				"Report {}: {:+} to {}. Reason: {}. Banned, disconnecting.",
 				peer_id,
diff --git a/substrate/client/network/src/protocol/notifications/behaviour.rs b/substrate/client/network/src/protocol/notifications/behaviour.rs
index 89513e004c6df701d6bfc93f023282629abac782..b78f15f8529c6e1ef7bb338a2d41811c47be8700 100644
--- a/substrate/client/network/src/protocol/notifications/behaviour.rs
+++ b/substrate/client/network/src/protocol/notifications/behaviour.rs
@@ -1423,7 +1423,6 @@ impl NetworkBehaviour for Notifications {
 									let delay_id = self.next_delay_id;
 									self.next_delay_id.0 += 1;
 									let delay = futures_timer::Delay::new(ban_duration);
-									let peer_id = peer_id;
 									self.delays.push(
 										async move {
 											delay.await;
diff --git a/substrate/client/network/src/protocol_controller.rs b/substrate/client/network/src/protocol_controller.rs
index c9baa0a77d4ba401da0ea3cc565134c034724102..3a305011ded0296c7f56711182b2ec520febe94a 100644
--- a/substrate/client/network/src/protocol_controller.rs
+++ b/substrate/client/network/src/protocol_controller.rs
@@ -493,8 +493,8 @@ impl ProtocolController {
 		}
 	}
 
-	/// Remove the peer from the set of reserved peers. The peer is moved to the set of regular
-	/// nodes.
+	/// Remove the peer from the set of reserved peers. The peer is either moved to the set of
+	/// regular nodes or disconnected.
 	fn on_remove_reserved_peer(&mut self, peer_id: PeerId) {
 		let state = match self.reserved_nodes.remove(&peer_id) {
 			Some(state) => state,
@@ -508,7 +508,14 @@ impl ProtocolController {
 		};
 
 		if let PeerState::Connected(direction) = state {
-			if self.reserved_only {
+			// Disconnect if we're at (or over) the regular node limit
+			let disconnect = self.reserved_only ||
+				match direction {
+					Direction::Inbound => self.num_in >= self.max_in,
+					Direction::Outbound => self.num_out >= self.max_out,
+				};
+
+			if disconnect {
 				// Disconnect the node.
 				trace!(
 					target: LOG_TARGET,
diff --git a/substrate/client/network/src/service.rs b/substrate/client/network/src/service.rs
index aca0072a31de6425d0658e6d540c2500407814e4..c1df48ad7858d512eef38df27c1bab4066cf7c2d 100644
--- a/substrate/client/network/src/service.rs
+++ b/substrate/client/network/src/service.rs
@@ -943,9 +943,10 @@ where
 		peers: HashSet<Multiaddr>,
 	) -> Result<(), String> {
 		let Some(set_id) = self.notification_protocol_ids.get(&protocol) else {
-			return Err(
-				format!("Cannot add peers to reserved set of unknown protocol: {}", protocol)
-			)
+			return Err(format!(
+				"Cannot add peers to reserved set of unknown protocol: {}",
+				protocol
+			))
 		};
 
 		let peers = self.split_multiaddr_and_peer_id(peers)?;
@@ -974,9 +975,10 @@ where
 		peers: Vec<PeerId>,
 	) -> Result<(), String> {
 		let Some(set_id) = self.notification_protocol_ids.get(&protocol) else {
-			return Err(
-				format!("Cannot remove peers from reserved set of unknown protocol: {}", protocol)
-			)
+			return Err(format!(
+				"Cannot remove peers from reserved set of unknown protocol: {}",
+				protocol
+			))
 		};
 
 		for peer_id in peers.into_iter() {
diff --git a/substrate/client/network/statement/Cargo.toml b/substrate/client/network/statement/Cargo.toml
index ed9cc76d9005c87b54e6389783d0a081160f61c7..adfb2d6a05fb97c87b7bf1ff653b641ee1acc52c 100644
--- a/substrate/client/network/statement/Cargo.toml
+++ b/substrate/client/network/statement/Cargo.toml
@@ -3,10 +3,10 @@ description = "Substrate statement protocol"
 name = "sc-network-statement"
 version = "0.10.0-dev"
 license = "GPL-3.0-or-later WITH Classpath-exception-2.0"
-authors = ["Parity Technologies <admin@parity.io>"]
-edition = "2021"
+authors.workspace = true
+edition.workspace = true
 homepage = "https://substrate.io"
-repository = "https://github.com/paritytech/substrate/"
+repository.workspace = true
 documentation = "https://docs.rs/sc-network-statement"
 
 [package.metadata.docs.rs]
diff --git a/substrate/client/network/sync/Cargo.toml b/substrate/client/network/sync/Cargo.toml
index 0bbc1350518813c22bcc72f8250f2b27da9e0d94..39312cc4b327dbc024a8cc3d3a9b934ae6bee315 100644
--- a/substrate/client/network/sync/Cargo.toml
+++ b/substrate/client/network/sync/Cargo.toml
@@ -3,10 +3,10 @@ description = "Substrate sync network protocol"
 name = "sc-network-sync"
 version = "0.10.0-dev"
 license = "GPL-3.0-or-later WITH Classpath-exception-2.0"
-authors = ["Parity Technologies <admin@parity.io>"]
-edition = "2021"
+authors.workspace = true
+edition.workspace = true
 homepage = "https://substrate.io"
-repository = "https://github.com/paritytech/substrate/"
+repository.workspace = true
 documentation = "https://docs.rs/sc-network-sync"
 
 [package.metadata.docs.rs]
@@ -29,6 +29,7 @@ prost = "0.11"
 schnellru = "0.2.1"
 smallvec = "1.11.0"
 thiserror = "1.0"
+tokio-stream = "0.1.14"
 fork-tree = { path = "../../../utils/fork-tree" }
 prometheus-endpoint = { package = "substrate-prometheus-endpoint", path = "../../../utils/prometheus" }
 sc-client-api = { path = "../../api" }
diff --git a/substrate/client/network/sync/build.rs b/substrate/client/network/sync/build.rs
index 55794919cdb42881975eb3d3911e8f7cfe9074a6..b780136737e72561a05717a8f89db827d4e9940d 100644
--- a/substrate/client/network/sync/build.rs
+++ b/substrate/client/network/sync/build.rs
@@ -1,3 +1,21 @@
+// This file is part of Substrate.
+
+// Copyright (C) Parity Technologies (UK) Ltd.
+// SPDX-License-Identifier: GPL-3.0-or-later WITH Classpath-exception-2.0
+
+// This program 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.
+
+// This program 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 this program. If not, see <https://www.gnu.org/licenses/>.
+
 const PROTOS: &[&str] = &["src/schema/api.v1.proto"];
 
 fn main() {
diff --git a/substrate/client/network/sync/src/block_announce_validator.rs b/substrate/client/network/sync/src/block_announce_validator.rs
new file mode 100644
index 0000000000000000000000000000000000000000..f083f9e29e44f46c038efd849c292aff9ad720c7
--- /dev/null
+++ b/substrate/client/network/sync/src/block_announce_validator.rs
@@ -0,0 +1,405 @@
+// This file is part of Substrate.
+
+// Copyright (C) Parity Technologies (UK) Ltd.
+// SPDX-License-Identifier: GPL-3.0-or-later WITH Classpath-exception-2.0
+
+// This program 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.
+
+// This program 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 this program. If not, see <https://www.gnu.org/licenses/>.
+
+//! `BlockAnnounceValidator` is responsible for async validation of block announcements.
+
+use crate::futures_stream::FuturesStream;
+use futures::{Future, FutureExt, Stream, StreamExt};
+use libp2p::PeerId;
+use log::{debug, error, trace, warn};
+use sc_network_common::sync::message::BlockAnnounce;
+use sp_consensus::block_validation::Validation;
+use sp_runtime::traits::{Block as BlockT, Header, Zero};
+use std::{
+	collections::{hash_map::Entry, HashMap},
+	default::Default,
+	pin::Pin,
+	task::{Context, Poll},
+};
+
+/// Log target for this file.
+const LOG_TARGET: &str = "sync";
+
+/// Maximum number of concurrent block announce validations.
+///
+/// If the queue reaches the maximum, we drop any new block
+/// announcements.
+const MAX_CONCURRENT_BLOCK_ANNOUNCE_VALIDATIONS: usize = 256;
+
+/// Maximum number of concurrent block announce validations per peer.
+///
+/// See [`MAX_CONCURRENT_BLOCK_ANNOUNCE_VALIDATIONS`] for more information.
+const MAX_CONCURRENT_BLOCK_ANNOUNCE_VALIDATIONS_PER_PEER: usize = 4;
+
+/// Item that yields [`Stream`] implementation of [`BlockAnnounceValidator`].
+#[derive(Debug, Clone, PartialEq, Eq)]
+pub(crate) enum BlockAnnounceValidationResult<H> {
+	/// The announcement failed at validation.
+	///
+	/// The peer reputation should be decreased.
+	Failure {
+		/// The id of the peer that send us the announcement.
+		peer_id: PeerId,
+		/// Should the peer be disconnected?
+		disconnect: bool,
+	},
+	/// The announcement was validated successfully and should be passed to [`crate::ChainSync`].
+	Process {
+		/// The id of the peer that send us the announcement.
+		peer_id: PeerId,
+		/// Was this their new best block?
+		is_new_best: bool,
+		/// The announcement.
+		announce: BlockAnnounce<H>,
+	},
+	/// The block announcement should be skipped.
+	Skip {
+		/// The id of the peer that send us the announcement.
+		peer_id: PeerId,
+	},
+}
+
+impl<H> BlockAnnounceValidationResult<H> {
+	fn peer_id(&self) -> &PeerId {
+		match self {
+			BlockAnnounceValidationResult::Failure { peer_id, .. } |
+			BlockAnnounceValidationResult::Process { peer_id, .. } |
+			BlockAnnounceValidationResult::Skip { peer_id } => peer_id,
+		}
+	}
+}
+
+/// Result of [`BlockAnnounceValidator::allocate_slot_for_block_announce_validation`].
+enum AllocateSlotForBlockAnnounceValidation {
+	/// Success, there is a slot for the block announce validation.
+	Allocated,
+	/// We reached the total maximum number of validation slots.
+	TotalMaximumSlotsReached,
+	/// We reached the maximum number of validation slots for the given peer.
+	MaximumPeerSlotsReached,
+}
+
+pub(crate) struct BlockAnnounceValidator<B: BlockT> {
+	/// A type to check incoming block announcements.
+	validator: Box<dyn sp_consensus::block_validation::BlockAnnounceValidator<B> + Send>,
+	/// All block announcements that are currently being validated.
+	validations: FuturesStream<
+		Pin<Box<dyn Future<Output = BlockAnnounceValidationResult<B::Header>> + Send>>,
+	>,
+	/// Number of concurrent block announce validations per peer.
+	validations_per_peer: HashMap<PeerId, usize>,
+}
+
+impl<B: BlockT> BlockAnnounceValidator<B> {
+	pub(crate) fn new(
+		validator: Box<dyn sp_consensus::block_validation::BlockAnnounceValidator<B> + Send>,
+	) -> Self {
+		Self {
+			validator,
+			validations: Default::default(),
+			validations_per_peer: Default::default(),
+		}
+	}
+
+	/// Push a block announce validation.
+	pub(crate) fn push_block_announce_validation(
+		&mut self,
+		peer_id: PeerId,
+		hash: B::Hash,
+		announce: BlockAnnounce<B::Header>,
+		is_best: bool,
+	) {
+		let header = &announce.header;
+		let number = *header.number();
+		debug!(
+			target: LOG_TARGET,
+			"Pre-validating received block announcement {:?} with number {:?} from {}",
+			hash,
+			number,
+			peer_id,
+		);
+
+		if number.is_zero() {
+			warn!(
+				target: LOG_TARGET,
+				"💔 Ignored genesis block (#0) announcement from {}: {}",
+				peer_id,
+				hash,
+			);
+			return
+		}
+
+		// Try to allocate a slot for this block announce validation.
+		match self.allocate_slot_for_block_announce_validation(&peer_id) {
+			AllocateSlotForBlockAnnounceValidation::Allocated => {},
+			AllocateSlotForBlockAnnounceValidation::TotalMaximumSlotsReached => {
+				warn!(
+					target: LOG_TARGET,
+					"💔 Ignored block (#{} -- {}) announcement from {} because all validation slots are occupied.",
+					number,
+					hash,
+					peer_id,
+				);
+				return
+			},
+			AllocateSlotForBlockAnnounceValidation::MaximumPeerSlotsReached => {
+				warn!(
+					target: LOG_TARGET,
+					"💔 Ignored block (#{} -- {}) announcement from {} because all validation slots for this peer are occupied.",
+					number,
+					hash,
+					peer_id,
+				);
+				return
+			},
+		}
+
+		// Let external validator check the block announcement.
+		let assoc_data = announce.data.as_ref().map_or(&[][..], |v| v.as_slice());
+		let future = self.validator.validate(header, assoc_data);
+
+		self.validations.push(
+			async move {
+				match future.await {
+					Ok(Validation::Success { is_new_best }) => {
+						let is_new_best = is_new_best || is_best;
+
+						trace!(
+							target: LOG_TARGET,
+							"Block announcement validated successfully: from {}: {:?}. Local best: {}.",
+							peer_id,
+							announce.summary(),
+							is_new_best,
+						);
+
+						BlockAnnounceValidationResult::Process { is_new_best, announce, peer_id }
+					},
+					Ok(Validation::Failure { disconnect }) => {
+						debug!(
+							target: LOG_TARGET,
+							"Block announcement validation failed: from {}, block {:?}. Disconnect: {}.",
+							peer_id,
+							hash,
+							disconnect,
+						);
+
+						BlockAnnounceValidationResult::Failure { peer_id, disconnect }
+					},
+					Err(e) => {
+						debug!(
+							target: LOG_TARGET,
+							"💔 Ignoring block announcement validation from {} of block {:?} due to internal error: {}.",
+							peer_id,
+							hash,
+							e,
+						);
+
+						BlockAnnounceValidationResult::Skip { peer_id }
+					},
+				}
+			}
+			.boxed(),
+		);
+	}
+
+	/// Checks if there is a slot for a block announce validation.
+	///
+	/// The total number and the number per peer of concurrent block announce validations
+	/// is capped.
+	///
+	/// Returns [`AllocateSlotForBlockAnnounceValidation`] to inform about the result.
+	///
+	/// # Note
+	///
+	/// It is *required* to call [`Self::deallocate_slot_for_block_announce_validation`] when the
+	/// validation is finished to clear the slot.
+	fn allocate_slot_for_block_announce_validation(
+		&mut self,
+		peer_id: &PeerId,
+	) -> AllocateSlotForBlockAnnounceValidation {
+		if self.validations.len() >= MAX_CONCURRENT_BLOCK_ANNOUNCE_VALIDATIONS {
+			return AllocateSlotForBlockAnnounceValidation::TotalMaximumSlotsReached
+		}
+
+		match self.validations_per_peer.entry(*peer_id) {
+			Entry::Vacant(entry) => {
+				entry.insert(1);
+				AllocateSlotForBlockAnnounceValidation::Allocated
+			},
+			Entry::Occupied(mut entry) => {
+				if *entry.get() < MAX_CONCURRENT_BLOCK_ANNOUNCE_VALIDATIONS_PER_PEER {
+					*entry.get_mut() += 1;
+					AllocateSlotForBlockAnnounceValidation::Allocated
+				} else {
+					AllocateSlotForBlockAnnounceValidation::MaximumPeerSlotsReached
+				}
+			},
+		}
+	}
+
+	/// Should be called when a block announce validation is finished, to update the slots
+	/// of the peer that send the block announce.
+	fn deallocate_slot_for_block_announce_validation(&mut self, peer_id: &PeerId) {
+		match self.validations_per_peer.entry(*peer_id) {
+			Entry::Vacant(_) => {
+				error!(
+					target: LOG_TARGET,
+					"💔 Block announcement validation from peer {} finished for a slot that was not allocated!",
+					peer_id,
+				);
+			},
+			Entry::Occupied(mut entry) => match entry.get().checked_sub(1) {
+				Some(value) =>
+					if value == 0 {
+						entry.remove();
+					} else {
+						*entry.get_mut() = value;
+					},
+				None => {
+					entry.remove();
+
+					error!(
+						target: LOG_TARGET,
+						"Invalid (zero) block announce validation slot counter for peer {peer_id}.",
+					);
+					debug_assert!(
+						false,
+						"Invalid (zero) block announce validation slot counter for peer {peer_id}.",
+					);
+				},
+			},
+		}
+	}
+}
+
+impl<B: BlockT> Stream for BlockAnnounceValidator<B> {
+	type Item = BlockAnnounceValidationResult<B::Header>;
+
+	/// Poll for finished block announce validations. The stream never terminates.
+	fn poll_next(mut self: Pin<&mut Self>, cx: &mut Context<'_>) -> Poll<Option<Self::Item>> {
+		let validation = futures::ready!(self.validations.poll_next_unpin(cx))
+			.expect("`FuturesStream` never terminates; qed");
+		self.deallocate_slot_for_block_announce_validation(validation.peer_id());
+
+		Poll::Ready(Some(validation))
+	}
+}
+
+#[cfg(test)]
+mod tests {
+	use super::*;
+	use crate::block_announce_validator::AllocateSlotForBlockAnnounceValidation;
+	use libp2p::PeerId;
+	use sp_consensus::block_validation::DefaultBlockAnnounceValidator;
+	use substrate_test_runtime_client::runtime::Block;
+
+	#[test]
+	fn allocate_one_validation_slot() {
+		let mut validator =
+			BlockAnnounceValidator::<Block>::new(Box::new(DefaultBlockAnnounceValidator {}));
+		let peer_id = PeerId::random();
+
+		assert!(matches!(
+			validator.allocate_slot_for_block_announce_validation(&peer_id),
+			AllocateSlotForBlockAnnounceValidation::Allocated,
+		));
+	}
+
+	#[test]
+	fn allocate_validation_slots_for_two_peers() {
+		let mut validator =
+			BlockAnnounceValidator::<Block>::new(Box::new(DefaultBlockAnnounceValidator {}));
+		let peer_id_1 = PeerId::random();
+		let peer_id_2 = PeerId::random();
+
+		assert!(matches!(
+			validator.allocate_slot_for_block_announce_validation(&peer_id_1),
+			AllocateSlotForBlockAnnounceValidation::Allocated,
+		));
+		assert!(matches!(
+			validator.allocate_slot_for_block_announce_validation(&peer_id_2),
+			AllocateSlotForBlockAnnounceValidation::Allocated,
+		));
+	}
+
+	#[test]
+	fn maximum_validation_slots_per_peer() {
+		let mut validator =
+			BlockAnnounceValidator::<Block>::new(Box::new(DefaultBlockAnnounceValidator {}));
+		let peer_id = PeerId::random();
+
+		for _ in 0..MAX_CONCURRENT_BLOCK_ANNOUNCE_VALIDATIONS_PER_PEER {
+			assert!(matches!(
+				validator.allocate_slot_for_block_announce_validation(&peer_id),
+				AllocateSlotForBlockAnnounceValidation::Allocated,
+			));
+		}
+
+		assert!(matches!(
+			validator.allocate_slot_for_block_announce_validation(&peer_id),
+			AllocateSlotForBlockAnnounceValidation::MaximumPeerSlotsReached,
+		));
+	}
+
+	#[test]
+	fn validation_slots_per_peer_deallocated() {
+		let mut validator =
+			BlockAnnounceValidator::<Block>::new(Box::new(DefaultBlockAnnounceValidator {}));
+		let peer_id = PeerId::random();
+
+		for _ in 0..MAX_CONCURRENT_BLOCK_ANNOUNCE_VALIDATIONS_PER_PEER {
+			assert!(matches!(
+				validator.allocate_slot_for_block_announce_validation(&peer_id),
+				AllocateSlotForBlockAnnounceValidation::Allocated,
+			));
+		}
+
+		assert!(matches!(
+			validator.allocate_slot_for_block_announce_validation(&peer_id),
+			AllocateSlotForBlockAnnounceValidation::MaximumPeerSlotsReached,
+		));
+
+		validator.deallocate_slot_for_block_announce_validation(&peer_id);
+
+		assert!(matches!(
+			validator.allocate_slot_for_block_announce_validation(&peer_id),
+			AllocateSlotForBlockAnnounceValidation::Allocated,
+		));
+	}
+
+	#[test]
+	fn maximum_validation_slots_for_all_peers() {
+		let mut validator =
+			BlockAnnounceValidator::<Block>::new(Box::new(DefaultBlockAnnounceValidator {}));
+
+		for _ in 0..MAX_CONCURRENT_BLOCK_ANNOUNCE_VALIDATIONS {
+			validator.validations.push(
+				futures::future::ready(BlockAnnounceValidationResult::Skip {
+					peer_id: PeerId::random(),
+				})
+				.boxed(),
+			);
+		}
+
+		let peer_id = PeerId::random();
+		assert!(matches!(
+			validator.allocate_slot_for_block_announce_validation(&peer_id),
+			AllocateSlotForBlockAnnounceValidation::TotalMaximumSlotsReached,
+		));
+	}
+}
diff --git a/substrate/client/network/sync/src/block_relay_protocol.rs b/substrate/client/network/sync/src/block_relay_protocol.rs
new file mode 100644
index 0000000000000000000000000000000000000000..7a313458bf0344772c54dec6a5c5328b324e6383
--- /dev/null
+++ b/substrate/client/network/sync/src/block_relay_protocol.rs
@@ -0,0 +1,72 @@
+// Copyright Parity Technologies (UK) Ltd.
+// This file is part of Substrate.
+
+// Substrate 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.
+
+// Substrate 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 Substrate.  If not, see <http://www.gnu.org/licenses/>.
+
+//! Block relay protocol related definitions.
+
+use futures::channel::oneshot;
+use libp2p::PeerId;
+use sc_network::request_responses::{ProtocolConfig, RequestFailure};
+use sc_network_common::sync::message::{BlockData, BlockRequest};
+use sp_runtime::traits::Block as BlockT;
+use std::sync::Arc;
+
+/// The serving side of the block relay protocol. It runs a single instance
+/// of the server task that processes the incoming protocol messages.
+#[async_trait::async_trait]
+pub trait BlockServer<Block: BlockT>: Send {
+	/// Starts the protocol processing.
+	async fn run(&mut self);
+}
+
+/// The client side stub to download blocks from peers. This is a handle
+/// that can be used to initiate concurrent downloads.
+#[async_trait::async_trait]
+pub trait BlockDownloader<Block: BlockT>: Send + Sync {
+	/// Performs the protocol specific sequence to fetch the blocks from the peer.
+	/// Output: if the download succeeds, the response is a `Vec<u8>` which is
+	/// in a format specific to the protocol implementation. The block data
+	/// can be extracted from this response using [`BlockDownloader::block_response_into_blocks`].
+	async fn download_blocks(
+		&self,
+		who: PeerId,
+		request: BlockRequest<Block>,
+	) -> Result<Result<Vec<u8>, RequestFailure>, oneshot::Canceled>;
+
+	/// Parses the protocol specific response to retrieve the block data.
+	fn block_response_into_blocks(
+		&self,
+		request: &BlockRequest<Block>,
+		response: Vec<u8>,
+	) -> Result<Vec<BlockData<Block>>, BlockResponseError>;
+}
+
+/// Errors returned by [`BlockDownloader::block_response_into_blocks`].
+#[derive(Debug)]
+pub enum BlockResponseError {
+	/// Failed to decode the response bytes.
+	DecodeFailed(String),
+
+	/// Failed to extract the blocks from the decoded bytes.
+	ExtractionFailed(String),
+}
+
+/// Block relay specific params for network creation, specified in
+/// ['sc_service::BuildNetworkParams'].
+pub struct BlockRelayParams<Block: BlockT> {
+	pub server: Box<dyn BlockServer<Block>>,
+	pub downloader: Arc<dyn BlockDownloader<Block>>,
+	pub request_response_config: ProtocolConfig,
+}
diff --git a/substrate/client/network/sync/src/block_request_handler.rs b/substrate/client/network/sync/src/block_request_handler.rs
index 291157eae4b07699572b2a66136f90dd4b33e1a8..c24083f6328783ef51f81a6806eca91772992820 100644
--- a/substrate/client/network/sync/src/block_request_handler.rs
+++ b/substrate/client/network/sync/src/block_request_handler.rs
@@ -1,4 +1,4 @@
-// Copyright Parity Technologies (UK) Ltd.
+// Copyright (C) Parity Technologies (UK) Ltd.
 // This file is part of Substrate.
 
 // Substrate is free software: you can redistribute it and/or modify
@@ -18,29 +18,35 @@
 //! `crate::request_responses::RequestResponsesBehaviour`.
 
 use crate::{
-	schema::v1::{block_request::FromBlock, BlockResponse, Direction},
+	block_relay_protocol::{BlockDownloader, BlockRelayParams, BlockResponseError, BlockServer},
+	schema::v1::{
+		block_request::FromBlock as FromBlockSchema, BlockRequest as BlockRequestSchema,
+		BlockResponse as BlockResponseSchema, BlockResponse, Direction,
+	},
+	service::network::NetworkServiceHandle,
 	MAX_BLOCKS_IN_RESPONSE,
 };
 
-use codec::{Decode, Encode};
+use codec::{Decode, DecodeAll, Encode};
 use futures::{channel::oneshot, stream::StreamExt};
 use libp2p::PeerId;
 use log::debug;
 use prost::Message;
-use schnellru::{ByLength, LruMap};
-
 use sc_client_api::BlockBackend;
 use sc_network::{
 	config::ProtocolId,
-	request_responses::{IncomingRequest, OutgoingResponse, ProtocolConfig},
+	request_responses::{
+		IfDisconnected, IncomingRequest, OutgoingResponse, ProtocolConfig, RequestFailure,
+	},
+	types::ProtocolName,
 };
-use sc_network_common::sync::message::BlockAttributes;
+use sc_network_common::sync::message::{BlockAttributes, BlockData, BlockRequest, FromBlock};
+use schnellru::{ByLength, LruMap};
 use sp_blockchain::HeaderBackend;
 use sp_runtime::{
 	generic::BlockId,
 	traits::{Block as BlockT, Header, One, Zero},
 };
-
 use std::{
 	cmp::min,
 	hash::{Hash, Hasher},
@@ -129,7 +135,8 @@ enum SeenRequestsValue {
 	Fulfilled(usize),
 }
 
-/// Handler for incoming block requests from a remote peer.
+/// The full block server implementation of [`BlockServer`]. It handles
+/// the incoming block requests from a remote peer.
 pub struct BlockRequestHandler<B: BlockT, Client> {
 	client: Arc<Client>,
 	request_receiver: async_channel::Receiver<IncomingRequest>,
@@ -146,11 +153,12 @@ where
 {
 	/// Create a new [`BlockRequestHandler`].
 	pub fn new(
+		network: NetworkServiceHandle,
 		protocol_id: &ProtocolId,
 		fork_id: Option<&str>,
 		client: Arc<Client>,
 		num_peer_hint: usize,
-	) -> (Self, ProtocolConfig) {
+	) -> BlockRelayParams<B> {
 		// Reserve enough request slots for one request per peer when we are at the maximum
 		// number of peers.
 		let capacity = std::cmp::max(num_peer_hint, 1);
@@ -170,11 +178,15 @@ where
 		let capacity = ByLength::new(num_peer_hint.max(1) as u32 * 2);
 		let seen_requests = LruMap::new(capacity);
 
-		(Self { client, request_receiver, seen_requests }, protocol_config)
+		BlockRelayParams {
+			server: Box::new(Self { client, request_receiver, seen_requests }),
+			downloader: Arc::new(FullBlockDownloader::new(protocol_config.name.clone(), network)),
+			request_response_config: protocol_config,
+		}
 	}
 
 	/// Run [`BlockRequestHandler`].
-	pub async fn run(mut self) {
+	async fn process_requests(&mut self) {
 		while let Some(request) = self.request_receiver.next().await {
 			let IncomingRequest { peer, payload, pending_response } = request;
 
@@ -197,11 +209,11 @@ where
 		let request = crate::schema::v1::BlockRequest::decode(&payload[..])?;
 
 		let from_block_id = match request.from_block.ok_or(HandleRequestError::MissingFromField)? {
-			FromBlock::Hash(ref h) => {
+			FromBlockSchema::Hash(ref h) => {
 				let h = Decode::decode(&mut h.as_ref())?;
 				BlockId::<B>::Hash(h)
 			},
-			FromBlock::Number(ref n) => {
+			FromBlockSchema::Number(ref n) => {
 				let n = Decode::decode(&mut n.as_ref())?;
 				BlockId::<B>::Number(n)
 			},
@@ -448,6 +460,17 @@ where
 	}
 }
 
+#[async_trait::async_trait]
+impl<B, Client> BlockServer<B> for BlockRequestHandler<B, Client>
+where
+	B: BlockT,
+	Client: HeaderBackend<B> + BlockBackend<B> + Send + Sync + 'static,
+{
+	async fn run(&mut self) {
+		self.process_requests().await;
+	}
+}
+
 #[derive(Debug, thiserror::Error)]
 enum HandleRequestError {
 	#[error("Failed to decode request: {0}.")]
@@ -465,3 +488,122 @@ enum HandleRequestError {
 	#[error("Failed to send response.")]
 	SendResponse,
 }
+
+/// The full block downloader implementation of [`BlockDownloader].
+pub struct FullBlockDownloader {
+	protocol_name: ProtocolName,
+	network: NetworkServiceHandle,
+}
+
+impl FullBlockDownloader {
+	fn new(protocol_name: ProtocolName, network: NetworkServiceHandle) -> Self {
+		Self { protocol_name, network }
+	}
+
+	/// Extracts the blocks from the response schema.
+	fn blocks_from_schema<B: BlockT>(
+		&self,
+		request: &BlockRequest<B>,
+		response: BlockResponseSchema,
+	) -> Result<Vec<BlockData<B>>, String> {
+		response
+			.blocks
+			.into_iter()
+			.map(|block_data| {
+				Ok(BlockData::<B> {
+					hash: Decode::decode(&mut block_data.hash.as_ref())?,
+					header: if !block_data.header.is_empty() {
+						Some(Decode::decode(&mut block_data.header.as_ref())?)
+					} else {
+						None
+					},
+					body: if request.fields.contains(BlockAttributes::BODY) {
+						Some(
+							block_data
+								.body
+								.iter()
+								.map(|body| Decode::decode(&mut body.as_ref()))
+								.collect::<Result<Vec<_>, _>>()?,
+						)
+					} else {
+						None
+					},
+					indexed_body: if request.fields.contains(BlockAttributes::INDEXED_BODY) {
+						Some(block_data.indexed_body)
+					} else {
+						None
+					},
+					receipt: if !block_data.receipt.is_empty() {
+						Some(block_data.receipt)
+					} else {
+						None
+					},
+					message_queue: if !block_data.message_queue.is_empty() {
+						Some(block_data.message_queue)
+					} else {
+						None
+					},
+					justification: if !block_data.justification.is_empty() {
+						Some(block_data.justification)
+					} else if block_data.is_empty_justification {
+						Some(Vec::new())
+					} else {
+						None
+					},
+					justifications: if !block_data.justifications.is_empty() {
+						Some(DecodeAll::decode_all(&mut block_data.justifications.as_ref())?)
+					} else {
+						None
+					},
+				})
+			})
+			.collect::<Result<_, _>>()
+			.map_err(|error: codec::Error| error.to_string())
+	}
+}
+
+#[async_trait::async_trait]
+impl<B: BlockT> BlockDownloader<B> for FullBlockDownloader {
+	async fn download_blocks(
+		&self,
+		who: PeerId,
+		request: BlockRequest<B>,
+	) -> Result<Result<Vec<u8>, RequestFailure>, oneshot::Canceled> {
+		// Build the request protobuf.
+		let bytes = BlockRequestSchema {
+			fields: request.fields.to_be_u32(),
+			from_block: match request.from {
+				FromBlock::Hash(h) => Some(FromBlockSchema::Hash(h.encode())),
+				FromBlock::Number(n) => Some(FromBlockSchema::Number(n.encode())),
+			},
+			direction: request.direction as i32,
+			max_blocks: request.max.unwrap_or(0),
+			support_multiple_justifications: true,
+		}
+		.encode_to_vec();
+
+		let (tx, rx) = oneshot::channel();
+		self.network.start_request(
+			who,
+			self.protocol_name.clone(),
+			bytes,
+			tx,
+			IfDisconnected::ImmediateError,
+		);
+		rx.await
+	}
+
+	fn block_response_into_blocks(
+		&self,
+		request: &BlockRequest<B>,
+		response: Vec<u8>,
+	) -> Result<Vec<BlockData<B>>, BlockResponseError> {
+		// Decode the response protobuf
+		let response_schema = BlockResponseSchema::decode(response.as_slice())
+			.map_err(|error| BlockResponseError::DecodeFailed(error.to_string()))?;
+
+		// Extract the block data from the protobuf
+		self.blocks_from_schema::<B>(request, response_schema)
+			.map_err(|error| BlockResponseError::ExtractionFailed(error.to_string()))
+	}
+}
diff --git a/substrate/client/network/sync/src/blocks.rs b/substrate/client/network/sync/src/blocks.rs
index 240c1ca1f8b26aba92f2d8db53be9684d69fee5d..cad50fef3e3211970a417643742a02f8221b4935 100644
--- a/substrate/client/network/sync/src/blocks.rs
+++ b/substrate/client/network/sync/src/blocks.rs
@@ -212,6 +212,31 @@ impl<B: BlockT> BlockCollection<B> {
 		ready
 	}
 
+	/// Returns the block header of the first block that is ready for importing.
+	/// `from` is the maximum block number for the start of the range that we are interested in.
+	/// The function will return None if the first block ready is higher than `from`.
+	/// The logic is structured to be consistent with ready_blocks().
+	pub fn first_ready_block_header(&self, from: NumberFor<B>) -> Option<B::Header> {
+		let mut prev = from;
+		for (&start, range_data) in &self.blocks {
+			if start > prev {
+				break
+			}
+
+			match range_data {
+				BlockRangeState::Complete(blocks) => {
+					let len = (blocks.len() as u32).into();
+					prev = start + len;
+					if let Some(BlockData { block, .. }) = blocks.first() {
+						return block.header.clone()
+					}
+				},
+				_ => continue,
+			}
+		}
+		None
+	}
+
 	pub fn clear_queued(&mut self, hash: &B::Hash) {
 		if let Some((from, to)) = self.queued_blocks.remove(hash) {
 			let mut block_num = from;
diff --git a/substrate/client/network/sync/src/engine.rs b/substrate/client/network/sync/src/engine.rs
index d5c4957ab3d706db81c9f24f415e622cc117656e..1a383cdde4794231e13126c69d125005340b78ce 100644
--- a/substrate/client/network/sync/src/engine.rs
+++ b/substrate/client/network/sync/src/engine.rs
@@ -1,6 +1,6 @@
 // This file is part of Substrate.
 
-// Copyright (C) 2017-2023 Parity Technologies (UK) Ltd.
+// Copyright (C) Parity Technologies (UK) Ltd.
 // SPDX-License-Identifier: GPL-3.0-or-later WITH Classpath-exception-2.0
 
 // This program is free software: you can redistribute it and/or modify
@@ -20,32 +20,52 @@
 //! to tip and keep the blockchain up to date with network updates.
 
 use crate::{
+	block_announce_validator::{
+		BlockAnnounceValidationResult, BlockAnnounceValidator as BlockAnnounceValidatorStream,
+	},
+	block_relay_protocol::{BlockDownloader, BlockResponseError},
+	pending_responses::{PendingResponses, ResponseEvent},
+	schema::v1::{StateRequest, StateResponse},
 	service::{self, chain_sync::ToServiceCommand},
-	ChainSync, ClientError, SyncingService,
+	warp::WarpSyncParams,
+	BlockRequestAction, ChainSync, ClientError, ImportBlocksAction, ImportJustificationsAction,
+	OnBlockResponse, SyncingService,
 };
 
 use codec::{Decode, Encode};
-use futures::{FutureExt, StreamExt};
+use futures::{
+	channel::oneshot,
+	future::{BoxFuture, Fuse},
+	FutureExt, StreamExt,
+};
 use futures_timer::Delay;
-use libp2p::PeerId;
+use libp2p::{request_response::OutboundFailure, PeerId};
+use log::{debug, trace};
 use prometheus_endpoint::{
-	register, Gauge, GaugeVec, MetricSource, Opts, PrometheusError, Registry, SourcedGauge, U64,
+	register, Counter, Gauge, GaugeVec, MetricSource, Opts, PrometheusError, Registry,
+	SourcedGauge, U64,
 };
+use prost::Message;
 use schnellru::{ByLength, LruMap};
 
 use sc_client_api::{BlockBackend, HeaderBackend, ProofProvider};
 use sc_consensus::import_queue::ImportQueueService;
 use sc_network::{
-	config::{FullNetworkConfiguration, NonDefaultSetConfig, ProtocolId},
+	config::{
+		FullNetworkConfiguration, NonDefaultSetConfig, NonReservedPeerMode, NotificationHandshake,
+		ProtocolId, SetConfig,
+	},
+	request_responses::{IfDisconnected, RequestFailure},
 	utils::LruHashSet,
 	NotificationsSink, ProtocolName, ReputationChange,
 };
 use sc_network_common::{
 	role::Roles,
 	sync::{
-		message::{BlockAnnounce, BlockAnnouncesHandshake, BlockState},
-		warp::WarpSyncParams,
-		BadPeer, ChainSync as ChainSyncT, ExtendedPeerInfo, PollBlockAnnounceValidation, SyncEvent,
+		message::{BlockAnnounce, BlockAnnouncesHandshake, BlockRequest, BlockState},
+		warp::{EncodedProof, WarpProofRequest},
+		BadPeer, ChainSync as ChainSyncT, ExtendedPeerInfo, OpaqueStateRequest,
+		OpaqueStateResponse, PeerRequest, SyncEvent,
 	},
 };
 use sc_utils::mpsc::{tracing_unbounded, TracingUnboundedReceiver, TracingUnboundedSender};
@@ -55,6 +75,7 @@ use sp_runtime::traits::{Block as BlockT, Header, NumberFor, Zero};
 
 use std::{
 	collections::{HashMap, HashSet},
+	iter,
 	num::NonZeroUsize,
 	sync::{
 		atomic::{AtomicBool, AtomicUsize, Ordering},
@@ -64,6 +85,9 @@ use std::{
 	time::{Duration, Instant},
 };
 
+/// Log target for this file.
+const LOG_TARGET: &'static str = "sync";
+
 /// Interval at which we perform time based maintenance
 const TICK_TIMEOUT: std::time::Duration = std::time::Duration::from_millis(1100);
 
@@ -87,6 +111,9 @@ const INACTIVITY_EVICT_THRESHOLD: Duration = Duration::from_secs(30);
 /// before it starts evicting peers.
 const INITIAL_EVICTION_WAIT_PERIOD: Duration = Duration::from_secs(2 * 60);
 
+/// Maximum allowed size for a block announce.
+const MAX_BLOCK_ANNOUNCE_SIZE: u64 = 1024 * 1024;
+
 mod rep {
 	use sc_network::ReputationChange as Rep;
 	/// Peer has different genesis.
@@ -95,6 +122,14 @@ mod rep {
 	pub const BAD_BLOCK_ANNOUNCEMENT: Rep = Rep::new(-(1 << 12), "Bad block announcement");
 	/// Block announce substream with the peer has been inactive too long
 	pub const INACTIVE_SUBSTREAM: Rep = Rep::new(-(1 << 10), "Inactive block announce substream");
+	/// We received a message that failed to decode.
+	pub const BAD_MESSAGE: Rep = Rep::new(-(1 << 12), "Bad message");
+	/// Peer is on unsupported protocol version.
+	pub const BAD_PROTOCOL: Rep = Rep::new_fatal("Unsupported protocol");
+	/// Reputation change when a peer refuses a request.
+	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");
 }
 
 struct Metrics {
@@ -102,6 +137,8 @@ struct Metrics {
 	queued_blocks: Gauge<U64>,
 	fork_targets: Gauge<U64>,
 	justifications: GaugeVec<U64>,
+	import_queue_blocks_submitted: Counter<U64>,
+	import_queue_justifications_submitted: Counter<U64>,
 }
 
 impl Metrics {
@@ -131,6 +168,20 @@ impl Metrics {
 				)?;
 				register(g, r)?
 			},
+			import_queue_blocks_submitted: {
+				let c = Counter::new(
+					"substrate_sync_import_queue_blocks_submitted",
+					"Number of blocks submitted to the import queue.",
+				)?;
+				register(c, r)?
+			},
+			import_queue_justifications_submitted: {
+				let c = Counter::new(
+					"substrate_sync_import_queue_justifications_submitted",
+					"Number of justifications submitted to the import queue.",
+				)?;
+				register(c, r)?
+			},
 		})
 	}
 }
@@ -239,12 +290,19 @@ pub struct SyncingEngine<B: BlockT, Client> {
 	/// Number of inbound peers accepted so far.
 	num_in_peers: usize,
 
+	/// Async processor of block announce validations.
+	block_announce_validator: BlockAnnounceValidatorStream<B>,
+
 	/// A cache for the data that was associated to a block announcement.
 	block_announce_data_cache: LruMap<B::Hash, Vec<u8>>,
 
 	/// The `PeerId`'s of all boot nodes.
 	boot_node_ids: HashSet<PeerId>,
 
+	/// A channel to get target block header if we skip over proofs downloading during warp sync.
+	warp_sync_target_block_header_rx:
+		Fuse<BoxFuture<'static, Result<B::Header, oneshot::Canceled>>>,
+
 	/// Protocol name used for block announcements
 	block_announce_protocol_name: ProtocolName,
 
@@ -259,6 +317,21 @@ pub struct SyncingEngine<B: BlockT, Client> {
 
 	/// Instant when the last notification was sent or received.
 	last_notification_io: Instant,
+
+	/// Pending responses
+	pending_responses: PendingResponses<B>,
+
+	/// Block downloader
+	block_downloader: Arc<dyn BlockDownloader<B>>,
+
+	/// Protocol name used to send out state requests
+	state_request_protocol_name: ProtocolName,
+
+	/// Protocol name used to send out warp sync requests
+	warp_sync_protocol_name: Option<ProtocolName>,
+
+	/// Handle to import queue.
+	import_queue: Box<dyn ImportQueueService<B>>,
 }
 
 impl<B: BlockT, Client> SyncingEngine<B, Client>
@@ -283,7 +356,7 @@ where
 		warp_sync_params: Option<WarpSyncParams<B>>,
 		network_service: service::network::NetworkServiceHandle,
 		import_queue: Box<dyn ImportQueueService<B>>,
-		block_request_protocol_name: ProtocolName,
+		block_downloader: Arc<dyn BlockDownloader<B>>,
 		state_request_protocol_name: ProtocolName,
 		warp_sync_protocol_name: Option<ProtocolName>,
 		rx: sc_utils::mpsc::TracingUnboundedReceiver<sc_network::SyncEvent<B>>,
@@ -293,7 +366,11 @@ where
 		let max_blocks_per_request = if net_config.network_config.max_blocks_per_request >
 			crate::MAX_BLOCKS_IN_RESPONSE as u32
 		{
-			log::info!(target: "sync", "clamping maximum blocks per request to {}", crate::MAX_BLOCKS_IN_RESPONSE);
+			log::info!(
+				target: LOG_TARGET,
+				"clamping maximum blocks per request to {}",
+				crate::MAX_BLOCKS_IN_RESPONSE,
+			);
 			crate::MAX_BLOCKS_IN_RESPONSE as u32
 		} else {
 			net_config.network_config.max_blocks_per_request
@@ -346,25 +423,43 @@ where
 			total.saturating_sub(net_config.network_config.default_peers_set_num_full) as usize
 		};
 
-		let (chain_sync, block_announce_config) = ChainSync::new(
-			mode,
-			client.clone(),
+		// Split warp sync params into warp sync config and a channel to retreive target block
+		// header.
+		let (warp_sync_config, warp_sync_target_block_header_rx) =
+			warp_sync_params.map_or((None, None), |params| {
+				let (config, target_block_rx) = params.split();
+				(Some(config), target_block_rx)
+			});
+
+		// Make sure polling of the target block channel is a no-op if there is no block to
+		// retrieve.
+		let warp_sync_target_block_header_rx = warp_sync_target_block_header_rx
+			.map_or(futures::future::pending().boxed().fuse(), |rx| rx.boxed().fuse());
+
+		let block_announce_config = Self::get_block_announce_proto_config(
 			protocol_id,
 			fork_id,
 			roles,
-			block_announce_validator,
+			client.info().best_number,
+			client.info().best_hash,
+			client
+				.block_hash(Zero::zero())
+				.ok()
+				.flatten()
+				.expect("Genesis block exists; qed"),
+		);
+		let block_announce_protocol_name = block_announce_config.notifications_protocol.clone();
+
+		let chain_sync = ChainSync::new(
+			mode,
+			client.clone(),
+			block_announce_protocol_name.clone(),
 			max_parallel_downloads,
 			max_blocks_per_request,
-			warp_sync_params,
-			metrics_registry,
+			warp_sync_config,
 			network_service.clone(),
-			import_queue,
-			block_request_protocol_name,
-			state_request_protocol_name,
-			warp_sync_protocol_name,
 		)?;
 
-		let block_announce_protocol_name = block_announce_config.notifications_protocol.clone();
 		let (tx, service_rx) = tracing_unbounded("mpsc_chain_sync", 100_000);
 		let num_connected = Arc::new(AtomicUsize::new(0));
 		let is_major_syncing = Arc::new(AtomicBool::new(false));
@@ -389,6 +484,9 @@ where
 				peers: HashMap::new(),
 				block_announce_data_cache: LruMap::new(ByLength::new(cache_capacity)),
 				block_announce_protocol_name,
+				block_announce_validator: BlockAnnounceValidatorStream::new(
+					block_announce_validator,
+				),
 				num_connected: num_connected.clone(),
 				is_major_syncing: is_major_syncing.clone(),
 				service_rx,
@@ -396,6 +494,7 @@ where
 				genesis_hash,
 				important_peers,
 				default_peers_set_no_slot_connected_peers: HashSet::new(),
+				warp_sync_target_block_header_rx,
 				boot_node_ids,
 				default_peers_set_no_slot_peers,
 				default_peers_set_num_full,
@@ -410,13 +509,18 @@ where
 					match Metrics::register(r, is_major_syncing.clone()) {
 						Ok(metrics) => Some(metrics),
 						Err(err) => {
-							log::error!(target: "sync", "Failed to register metrics {err:?}");
+							log::error!(target: LOG_TARGET, "Failed to register metrics {err:?}");
 							None
 						},
 					}
 				} else {
 					None
 				},
+				pending_responses: PendingResponses::new(),
+				block_downloader,
+				state_request_protocol_name,
+				warp_sync_protocol_name,
+				import_queue,
 			},
 			SyncingService::new(tx, num_connected, is_major_syncing),
 			block_announce_config,
@@ -453,9 +557,9 @@ where
 		}
 	}
 
-	fn update_peer_info(&mut self, who: &PeerId) {
-		if let Some(info) = self.chain_sync.peer_info(who) {
-			if let Some(ref mut peer) = self.peers.get_mut(who) {
+	fn update_peer_info(&mut self, peer_id: &PeerId) {
+		if let Some(info) = self.chain_sync.peer_info(peer_id) {
+			if let Some(ref mut peer) = self.peers.get_mut(peer_id) {
 				peer.info.best_hash = info.best_hash;
 				peer.info.best_number = info.best_number;
 			}
@@ -463,14 +567,16 @@ where
 	}
 
 	/// Process the result of the block announce validation.
-	pub fn process_block_announce_validation_result(
+	fn process_block_announce_validation_result(
 		&mut self,
-		validation_result: PollBlockAnnounceValidation<B::Header>,
+		validation_result: BlockAnnounceValidationResult<B::Header>,
 	) {
 		match validation_result {
-			PollBlockAnnounceValidation::Skip => {},
-			PollBlockAnnounceValidation::Nothing { is_best: _, who, announce } => {
-				self.update_peer_info(&who);
+			BlockAnnounceValidationResult::Skip { peer_id: _ } => {},
+			BlockAnnounceValidationResult::Process { is_new_best, peer_id, announce } => {
+				self.chain_sync.on_validated_block_announce(is_new_best, peer_id, &announce);
+
+				self.update_peer_info(&peer_id);
 
 				if let Some(data) = announce.data {
 					if !data.is_empty() {
@@ -478,41 +584,32 @@ where
 					}
 				}
 			},
-			PollBlockAnnounceValidation::Failure { who, disconnect } => {
+			BlockAnnounceValidationResult::Failure { peer_id, disconnect } => {
 				if disconnect {
 					self.network_service
-						.disconnect_peer(who, self.block_announce_protocol_name.clone());
+						.disconnect_peer(peer_id, self.block_announce_protocol_name.clone());
 				}
 
-				self.network_service.report_peer(who, rep::BAD_BLOCK_ANNOUNCEMENT);
+				self.network_service.report_peer(peer_id, rep::BAD_BLOCK_ANNOUNCEMENT);
 			},
 		}
 	}
 
 	/// Push a block announce validation.
-	///
-	/// It is required that [`ChainSync::poll_block_announce_validation`] is
-	/// called later to check for finished validations. The result of the validation
-	/// needs to be passed to [`SyncingEngine::process_block_announce_validation_result`]
-	/// to finish the processing.
-	///
-	/// # Note
-	///
-	/// This will internally create a future, but this future will not be registered
-	/// in the task before being polled once. So, it is required to call
-	/// [`ChainSync::poll_block_announce_validation`] to ensure that the future is
-	/// registered properly and will wake up the task when being ready.
 	pub fn push_block_announce_validation(
 		&mut self,
-		who: PeerId,
+		peer_id: PeerId,
 		announce: BlockAnnounce<B::Header>,
 	) {
 		let hash = announce.header.hash();
 
-		let peer = match self.peers.get_mut(&who) {
+		let peer = match self.peers.get_mut(&peer_id) {
 			Some(p) => p,
 			None => {
-				log::error!(target: "sync", "Received block announce from disconnected peer {}", who);
+				log::error!(
+					target: LOG_TARGET,
+					"Received block announce from disconnected peer {peer_id}",
+				);
 				debug_assert!(false);
 				return
 			},
@@ -525,7 +622,8 @@ where
 				BlockState::Normal => false,
 			};
 
-			self.chain_sync.push_block_announce_validation(who, hash, announce, is_best);
+			self.block_announce_validator
+				.push_block_announce_validation(peer_id, hash, announce, is_best);
 		}
 	}
 
@@ -537,11 +635,11 @@ where
 		let header = match self.client.header(hash) {
 			Ok(Some(header)) => header,
 			Ok(None) => {
-				log::warn!(target: "sync", "Trying to announce unknown block: {}", hash);
+				log::warn!(target: LOG_TARGET, "Trying to announce unknown block: {hash}");
 				return
 			},
 			Err(e) => {
-				log::warn!(target: "sync", "Error reading block header {}: {}", hash, e);
+				log::warn!(target: LOG_TARGET, "Error reading block header {hash}: {e}");
 				return
 			},
 		};
@@ -552,16 +650,16 @@ where
 		}
 
 		let is_best = self.client.info().best_hash == hash;
-		log::debug!(target: "sync", "Reannouncing block {:?} is_best: {}", hash, is_best);
+		log::debug!(target: LOG_TARGET, "Reannouncing block {hash:?} is_best: {is_best}");
 
 		let data = data
 			.or_else(|| self.block_announce_data_cache.get(&hash).cloned())
 			.unwrap_or_default();
 
-		for (who, ref mut peer) in self.peers.iter_mut() {
+		for (peer_id, ref mut peer) in self.peers.iter_mut() {
 			let inserted = peer.known_blocks.insert(hash);
 			if inserted {
-				log::trace!(target: "sync", "Announcing block {:?} to {}", hash, who);
+				log::trace!(target: LOG_TARGET, "Announcing block {hash:?} to {peer_id}");
 				let message = BlockAnnounce {
 					header: header.clone(),
 					state: if is_best { Some(BlockState::Best) } else { Some(BlockState::Normal) },
@@ -576,7 +674,7 @@ where
 
 	/// Inform sync about new best imported block.
 	pub fn new_best_block_imported(&mut self, hash: B::Hash, number: NumberFor<B>) {
-		log::debug!(target: "sync", "New best block imported {:?}/#{}", hash, number);
+		log::debug!(target: LOG_TARGET, "New best block imported {hash:?}/#{number}");
 
 		self.chain_sync.update_chain_info(&hash, number);
 		self.network_service.set_notification_handshake(
@@ -620,7 +718,10 @@ where
 			// consider it connected or are also all stalled. In order to unstall the node,
 			// disconnect all peers and allow `ProtocolController` to establish new connections.
 			if self.last_notification_io.elapsed() > INACTIVITY_EVICT_THRESHOLD {
-				log::debug!(target: "sync", "syncing has halted due to inactivity, evicting all peers");
+				log::debug!(
+					target: LOG_TARGET,
+					"syncing has halted due to inactivity, evicting all peers",
+				);
 
 				for peer in self.peers.keys() {
 					self.network_service.report_peer(*peer, rep::INACTIVE_SUBSTREAM);
@@ -647,23 +748,38 @@ where
 				ToServiceCommand::BlocksProcessed(imported, count, results) => {
 					for result in self.chain_sync.on_blocks_processed(imported, count, results) {
 						match result {
-							Ok((id, req)) => self.chain_sync.send_block_request(id, req),
-							Err(BadPeer(id, repu)) => {
-								self.network_service
-									.disconnect_peer(id, self.block_announce_protocol_name.clone());
-								self.network_service.report_peer(id, repu)
+							Ok(action) => match action {
+								BlockRequestAction::SendRequest { peer_id, request } => {
+									// drop obsolete pending response first
+									self.pending_responses.remove(&peer_id);
+									self.send_block_request(peer_id, request);
+								},
+								BlockRequestAction::RemoveStale { peer_id } => {
+									self.pending_responses.remove(&peer_id);
+								},
+							},
+							Err(BadPeer(peer_id, repu)) => {
+								self.pending_responses.remove(&peer_id);
+								self.network_service.disconnect_peer(
+									peer_id,
+									self.block_announce_protocol_name.clone(),
+								);
+								self.network_service.report_peer(peer_id, repu)
 							},
 						}
 					}
 				},
-				ToServiceCommand::JustificationImported(peer, hash, number, success) => {
+				ToServiceCommand::JustificationImported(peer_id, hash, number, success) => {
 					self.chain_sync.on_justification_import(hash, number, success);
 					if !success {
-						log::info!(target: "sync", "💔 Invalid justification provided by {} for #{}", peer, hash);
+						log::info!(
+							target: LOG_TARGET,
+							"💔 Invalid justification provided by {peer_id} for #{hash}",
+						);
 						self.network_service
-							.disconnect_peer(peer, self.block_announce_protocol_name.clone());
+							.disconnect_peer(peer_id, self.block_announce_protocol_name.clone());
 						self.network_service.report_peer(
-							peer,
+							peer_id,
 							ReputationChange::new_fatal("Invalid justification"),
 						);
 					}
@@ -677,7 +793,7 @@ where
 					let _ = tx.send(status);
 				},
 				ToServiceCommand::NumActivePeers(tx) => {
-					let _ = tx.send(self.chain_sync.num_active_peers());
+					let _ = tx.send(self.num_active_peers());
 				},
 				ToServiceCommand::SyncState(tx) => {
 					let _ = tx.send(self.chain_sync.status());
@@ -698,8 +814,11 @@ where
 					let _ = tx.send(self.chain_sync.num_sync_requests());
 				},
 				ToServiceCommand::PeersInfo(tx) => {
-					let peers_info =
-						self.peers.iter().map(|(id, peer)| (*id, peer.info.clone())).collect();
+					let peers_info = self
+						.peers
+						.iter()
+						.map(|(peer_id, peer)| (*peer_id, peer.info.clone()))
+						.collect();
 					let _ = tx.send(peers_info);
 				},
 				ToServiceCommand::OnBlockFinalized(hash, header) =>
@@ -721,7 +840,7 @@ where
 					},
 					Err(()) => {
 						log::debug!(
-							target: "sync",
+							target: LOG_TARGET,
 							"Failed to register peer {remote:?}: {received_handshake:?}",
 						);
 						let _ = tx.send(false);
@@ -730,7 +849,7 @@ where
 				sc_network::SyncEvent::NotificationStreamClosed { remote } => {
 					if self.on_sync_peer_disconnected(remote).is_err() {
 						log::trace!(
-							target: "sync",
+							target: LOG_TARGET,
 							"Disconnected peer which had earlier been refused by on_sync_peer_connected {}",
 							remote
 						);
@@ -742,22 +861,13 @@ where
 							if let Ok(announce) = BlockAnnounce::decode(&mut message.as_ref()) {
 								self.last_notification_io = Instant::now();
 								self.push_block_announce_validation(remote, announce);
-
-								// Make sure that the newly added block announce validation future
-								// was polled once to be registered in the task.
-								if let Poll::Ready(res) =
-									self.chain_sync.poll_block_announce_validation(cx)
-								{
-									self.process_block_announce_validation_result(res)
-								}
 							} else {
 								log::warn!(target: "sub-libp2p", "Failed to decode block announce");
 							}
 						} else {
 							log::trace!(
-								target: "sync",
-								"Received sync for peer earlier refused by sync layer: {}",
-								remote
+								target: LOG_TARGET,
+								"Received sync for peer earlier refused by sync layer: {remote}",
 							);
 						}
 					}
@@ -770,10 +880,34 @@ where
 			}
 		}
 
-		// poll `ChainSync` last because of a block announcement was received through the
-		// event stream between `SyncingEngine` and `Protocol` and the validation finished
-		// right after it as queued, the resulting block request (if any) can be sent right away.
-		while let Poll::Ready(result) = self.chain_sync.poll(cx) {
+		// Retreive warp sync target block header just before polling `ChainSync`
+		// to make progress as soon as we receive it.
+		match self.warp_sync_target_block_header_rx.poll_unpin(cx) {
+			Poll::Ready(Ok(target)) => {
+				self.chain_sync.set_warp_sync_target_block(target);
+			},
+			Poll::Ready(Err(err)) => {
+				log::error!(
+					target: LOG_TARGET,
+					"Failed to get target block for warp sync. Error: {err:?}",
+				);
+			},
+			Poll::Pending => {},
+		}
+
+		// Send outbound requests on `ChanSync`'s behalf.
+		self.send_chain_sync_requests();
+
+		// Poll & process pending responses.
+		while let Poll::Ready(Some(event)) = self.pending_responses.poll_next_unpin(cx) {
+			self.process_response_event(event);
+		}
+
+		// Poll block announce validations last, because if a block announcement was received
+		// through the event stream between `SyncingEngine` and `Protocol` and the validation
+		// finished right after it is queued, the resulting block request (if any) can be sent
+		// right away.
+		while let Poll::Ready(Some(result)) = self.block_announce_validator.poll_next_unpin(cx) {
 			self.process_block_announce_validation_result(result);
 		}
 
@@ -783,15 +917,15 @@ where
 	/// Called by peer when it is disconnecting.
 	///
 	/// Returns a result if the handshake of this peer was indeed accepted.
-	pub fn on_sync_peer_disconnected(&mut self, peer: PeerId) -> Result<(), ()> {
-		if let Some(info) = self.peers.remove(&peer) {
-			if self.important_peers.contains(&peer) {
-				log::warn!(target: "sync", "Reserved peer {} disconnected", peer);
+	pub fn on_sync_peer_disconnected(&mut self, peer_id: PeerId) -> Result<(), ()> {
+		if let Some(info) = self.peers.remove(&peer_id) {
+			if self.important_peers.contains(&peer_id) {
+				log::warn!(target: LOG_TARGET, "Reserved peer {peer_id} disconnected");
 			} else {
-				log::debug!(target: "sync", "{} disconnected", peer);
+				log::debug!(target: LOG_TARGET, "{peer_id} disconnected");
 			}
 
-			if !self.default_peers_set_no_slot_connected_peers.remove(&peer) &&
+			if !self.default_peers_set_no_slot_connected_peers.remove(&peer_id) &&
 				info.inbound && info.info.roles.is_full()
 			{
 				match self.num_in_peers.checked_sub(1) {
@@ -800,7 +934,7 @@ where
 					},
 					None => {
 						log::error!(
-							target: "sync",
+							target: LOG_TARGET,
 							"trying to disconnect an inbound node which is not counted as inbound"
 						);
 						debug_assert!(false);
@@ -808,9 +942,14 @@ where
 				}
 			}
 
-			self.chain_sync.peer_disconnected(&peer);
-			self.event_streams
-				.retain(|stream| stream.unbounded_send(SyncEvent::PeerDisconnected(peer)).is_ok());
+			if let Some(import_blocks_action) = self.chain_sync.peer_disconnected(&peer_id) {
+				self.import_blocks(import_blocks_action)
+			}
+
+			self.pending_responses.remove(&peer_id);
+			self.event_streams.retain(|stream| {
+				stream.unbounded_send(SyncEvent::PeerDisconnected(peer_id)).is_ok()
+			});
 			Ok(())
 		} else {
 			Err(())
@@ -824,41 +963,44 @@ where
 	/// from.
 	pub fn on_sync_peer_connected(
 		&mut self,
-		who: PeerId,
+		peer_id: PeerId,
 		status: &BlockAnnouncesHandshake<B>,
 		sink: NotificationsSink,
 		inbound: bool,
 	) -> Result<(), ()> {
-		log::trace!(target: "sync", "New peer {} {:?}", who, status);
+		log::trace!(target: LOG_TARGET, "New peer {peer_id} {status:?}");
 
-		if self.peers.contains_key(&who) {
-			log::error!(target: "sync", "Called on_sync_peer_connected with already connected peer {}", who);
+		if self.peers.contains_key(&peer_id) {
+			log::error!(
+				target: LOG_TARGET,
+				"Called on_sync_peer_connected with already connected peer {peer_id}",
+			);
 			debug_assert!(false);
 			return Err(())
 		}
 
 		if status.genesis_hash != self.genesis_hash {
-			self.network_service.report_peer(who, rep::GENESIS_MISMATCH);
+			self.network_service.report_peer(peer_id, rep::GENESIS_MISMATCH);
 
-			if self.important_peers.contains(&who) {
+			if self.important_peers.contains(&peer_id) {
 				log::error!(
-					target: "sync",
+					target: LOG_TARGET,
 					"Reserved peer id `{}` is on a different chain (our genesis: {} theirs: {})",
-					who,
+					peer_id,
 					self.genesis_hash,
 					status.genesis_hash,
 				);
-			} else if self.boot_node_ids.contains(&who) {
+			} else if self.boot_node_ids.contains(&peer_id) {
 				log::error!(
-					target: "sync",
+					target: LOG_TARGET,
 					"Bootnode with peer id `{}` is on a different chain (our genesis: {} theirs: {})",
-					who,
+					peer_id,
 					self.genesis_hash,
 					status.genesis_hash,
 				);
 			} else {
 				log::debug!(
-					target: "sync",
+					target: LOG_TARGET,
 					"Peer is on different chain (our genesis: {} theirs: {})",
 					self.genesis_hash, status.genesis_hash
 				);
@@ -867,7 +1009,7 @@ where
 			return Err(())
 		}
 
-		let no_slot_peer = self.default_peers_set_no_slot_peers.contains(&who);
+		let no_slot_peer = self.default_peers_set_no_slot_peers.contains(&peer_id);
 		let this_peer_reserved_slot: usize = if no_slot_peer { 1 } else { 0 };
 
 		// make sure to accept no more than `--in-peers` many full nodes
@@ -875,7 +1017,10 @@ where
 			status.roles.is_full() &&
 			inbound && self.num_in_peers == self.max_in_peers
 		{
-			log::debug!(target: "sync", "All inbound slots have been consumed, rejecting {who}");
+			log::debug!(
+				target: LOG_TARGET,
+				"All inbound slots have been consumed, rejecting {peer_id}",
+			);
 			return Err(())
 		}
 
@@ -885,7 +1030,7 @@ where
 					self.default_peers_set_no_slot_connected_peers.len() +
 					this_peer_reserved_slot
 		{
-			log::debug!(target: "sync", "Too many full nodes, rejecting {}", who);
+			log::debug!(target: LOG_TARGET, "Too many full nodes, rejecting {peer_id}");
 			return Err(())
 		}
 
@@ -893,7 +1038,7 @@ where
 			(self.peers.len() - self.chain_sync.num_peers()) >= self.default_peers_set_num_light
 		{
 			// Make sure that not all slots are occupied by light clients.
-			log::debug!(target: "sync", "Too many light nodes, rejecting {}", who);
+			log::debug!(target: LOG_TARGET, "Too many light nodes, rejecting {peer_id}");
 			return Err(())
 		}
 
@@ -911,7 +1056,7 @@ where
 		};
 
 		let req = if peer.info.roles.is_full() {
-			match self.chain_sync.new_peer(who, peer.info.best_hash, peer.info.best_number) {
+			match self.chain_sync.new_peer(peer_id, peer.info.best_hash, peer.info.best_number) {
 				Ok(req) => req,
 				Err(BadPeer(id, repu)) => {
 					self.network_service.report_peer(id, repu);
@@ -922,23 +1067,325 @@ where
 			None
 		};
 
-		log::debug!(target: "sync", "Connected {}", who);
+		log::debug!(target: LOG_TARGET, "Connected {peer_id}");
 
-		self.peers.insert(who, peer);
+		self.peers.insert(peer_id, peer);
 
 		if no_slot_peer {
-			self.default_peers_set_no_slot_connected_peers.insert(who);
+			self.default_peers_set_no_slot_connected_peers.insert(peer_id);
 		} else if inbound && status.roles.is_full() {
 			self.num_in_peers += 1;
 		}
 
 		if let Some(req) = req {
-			self.chain_sync.send_block_request(who, req);
+			self.send_block_request(peer_id, req);
 		}
 
 		self.event_streams
-			.retain(|stream| stream.unbounded_send(SyncEvent::PeerConnected(who)).is_ok());
+			.retain(|stream| stream.unbounded_send(SyncEvent::PeerConnected(peer_id)).is_ok());
 
 		Ok(())
 	}
+
+	fn send_chain_sync_requests(&mut self) {
+		for (peer_id, request) in self.chain_sync.block_requests() {
+			self.send_block_request(peer_id, request);
+		}
+
+		if let Some((peer_id, request)) = self.chain_sync.state_request() {
+			self.send_state_request(peer_id, request);
+		}
+
+		for (peer_id, request) in self.chain_sync.justification_requests() {
+			self.send_block_request(peer_id, request);
+		}
+
+		if let Some((peer_id, request)) = self.chain_sync.warp_sync_request() {
+			self.send_warp_sync_request(peer_id, request);
+		}
+	}
+
+	fn send_block_request(&mut self, peer_id: PeerId, request: BlockRequest<B>) {
+		if !self.chain_sync.is_peer_known(&peer_id) {
+			trace!(target: LOG_TARGET, "Cannot send block request to unknown peer {peer_id}");
+			debug_assert!(false);
+			return
+		}
+
+		let downloader = self.block_downloader.clone();
+
+		self.pending_responses.insert(
+			peer_id,
+			PeerRequest::Block(request.clone()),
+			async move { downloader.download_blocks(peer_id, request).await }.boxed(),
+		);
+	}
+
+	fn send_state_request(&mut self, peer_id: PeerId, request: OpaqueStateRequest) {
+		if !self.chain_sync.is_peer_known(&peer_id) {
+			trace!(target: LOG_TARGET, "Cannot send state request to unknown peer {peer_id}");
+			debug_assert!(false);
+			return
+		}
+
+		let (tx, rx) = oneshot::channel();
+
+		self.pending_responses.insert(peer_id, PeerRequest::State, rx.boxed());
+
+		match Self::encode_state_request(&request) {
+			Ok(data) => {
+				self.network_service.start_request(
+					peer_id,
+					self.state_request_protocol_name.clone(),
+					data,
+					tx,
+					IfDisconnected::ImmediateError,
+				);
+			},
+			Err(err) => {
+				log::warn!(
+					target: LOG_TARGET,
+					"Failed to encode state request {request:?}: {err:?}",
+				);
+			},
+		}
+	}
+
+	fn send_warp_sync_request(&mut self, peer_id: PeerId, request: WarpProofRequest<B>) {
+		if !self.chain_sync.is_peer_known(&peer_id) {
+			trace!(target: LOG_TARGET, "Cannot send warp proof request to unknown peer {peer_id}");
+			debug_assert!(false);
+			return
+		}
+
+		let (tx, rx) = oneshot::channel();
+
+		self.pending_responses.insert(peer_id, PeerRequest::WarpProof, rx.boxed());
+
+		match &self.warp_sync_protocol_name {
+			Some(name) => self.network_service.start_request(
+				peer_id,
+				name.clone(),
+				request.encode(),
+				tx,
+				IfDisconnected::ImmediateError,
+			),
+			None => {
+				log::warn!(
+					target: LOG_TARGET,
+					"Trying to send warp sync request when no protocol is configured {request:?}",
+				);
+			},
+		}
+	}
+
+	fn encode_state_request(request: &OpaqueStateRequest) -> Result<Vec<u8>, String> {
+		let request: &StateRequest = request.0.downcast_ref().ok_or_else(|| {
+			"Failed to downcast opaque state response during encoding, this is an \
+				implementation bug."
+				.to_string()
+		})?;
+
+		Ok(request.encode_to_vec())
+	}
+
+	fn decode_state_response(response: &[u8]) -> Result<OpaqueStateResponse, String> {
+		let response = StateResponse::decode(response)
+			.map_err(|error| format!("Failed to decode state response: {error}"))?;
+
+		Ok(OpaqueStateResponse(Box::new(response)))
+	}
+
+	fn process_response_event(&mut self, response_event: ResponseEvent<B>) {
+		let ResponseEvent { peer_id, request, response } = response_event;
+
+		match response {
+			Ok(Ok(resp)) => match request {
+				PeerRequest::Block(req) => {
+					match self.block_downloader.block_response_into_blocks(&req, resp) {
+						Ok(blocks) => {
+							match self.chain_sync.on_block_response(peer_id, req, blocks) {
+								OnBlockResponse::SendBlockRequest { peer_id, request } =>
+									self.send_block_request(peer_id, request),
+								OnBlockResponse::ImportBlocks(import_blocks_action) =>
+									self.import_blocks(import_blocks_action),
+								OnBlockResponse::ImportJustifications(action) =>
+									self.import_justifications(action),
+								OnBlockResponse::Nothing => {},
+							}
+						},
+						Err(BlockResponseError::DecodeFailed(e)) => {
+							debug!(
+								target: LOG_TARGET,
+								"Failed to decode block response from peer {:?}: {:?}.",
+								peer_id,
+								e
+							);
+							self.network_service.report_peer(peer_id, rep::BAD_MESSAGE);
+							self.network_service.disconnect_peer(
+								peer_id,
+								self.block_announce_protocol_name.clone(),
+							);
+							return
+						},
+						Err(BlockResponseError::ExtractionFailed(e)) => {
+							debug!(
+								target: LOG_TARGET,
+								"Failed to extract blocks from peer response {:?}: {:?}.",
+								peer_id,
+								e
+							);
+							self.network_service.report_peer(peer_id, rep::BAD_MESSAGE);
+							return
+						},
+					}
+				},
+				PeerRequest::State => {
+					let response = match Self::decode_state_response(&resp[..]) {
+						Ok(proto) => proto,
+						Err(e) => {
+							debug!(
+								target: LOG_TARGET,
+								"Failed to decode state response from peer {peer_id:?}: {e:?}.",
+							);
+							self.network_service.report_peer(peer_id, rep::BAD_MESSAGE);
+							self.network_service.disconnect_peer(
+								peer_id,
+								self.block_announce_protocol_name.clone(),
+							);
+							return
+						},
+					};
+
+					if let Some(import_blocks_action) =
+						self.chain_sync.on_state_response(peer_id, response)
+					{
+						self.import_blocks(import_blocks_action);
+					}
+				},
+				PeerRequest::WarpProof => {
+					self.chain_sync.on_warp_sync_response(peer_id, EncodedProof(resp));
+				},
+			},
+			Ok(Err(e)) => {
+				debug!(target: LOG_TARGET, "Request to peer {peer_id:?} failed: {e:?}.");
+
+				match e {
+					RequestFailure::Network(OutboundFailure::Timeout) => {
+						self.network_service.report_peer(peer_id, rep::TIMEOUT);
+						self.network_service
+							.disconnect_peer(peer_id, self.block_announce_protocol_name.clone());
+					},
+					RequestFailure::Network(OutboundFailure::UnsupportedProtocols) => {
+						self.network_service.report_peer(peer_id, rep::BAD_PROTOCOL);
+						self.network_service
+							.disconnect_peer(peer_id, self.block_announce_protocol_name.clone());
+					},
+					RequestFailure::Network(OutboundFailure::DialFailure) => {
+						self.network_service
+							.disconnect_peer(peer_id, self.block_announce_protocol_name.clone());
+					},
+					RequestFailure::Refused => {
+						self.network_service.report_peer(peer_id, rep::REFUSED);
+						self.network_service
+							.disconnect_peer(peer_id, self.block_announce_protocol_name.clone());
+					},
+					RequestFailure::Network(OutboundFailure::ConnectionClosed) |
+					RequestFailure::NotConnected => {
+						self.network_service
+							.disconnect_peer(peer_id, self.block_announce_protocol_name.clone());
+					},
+					RequestFailure::UnknownProtocol => {
+						debug_assert!(false, "Block request protocol should always be known.");
+					},
+					RequestFailure::Obsolete => {
+						debug_assert!(
+							false,
+							"Can not receive `RequestFailure::Obsolete` after dropping the \
+								response receiver.",
+						);
+					},
+				}
+			},
+			Err(oneshot::Canceled) => {
+				trace!(
+					target: LOG_TARGET,
+					"Request to peer {peer_id:?} failed due to oneshot being canceled.",
+				);
+				self.network_service
+					.disconnect_peer(peer_id, self.block_announce_protocol_name.clone());
+			},
+		}
+	}
+
+	/// Returns the number of peers we're connected to and that are being queried.
+	fn num_active_peers(&self) -> usize {
+		self.pending_responses.len()
+	}
+
+	/// Get config for the block announcement protocol
+	fn get_block_announce_proto_config(
+		protocol_id: ProtocolId,
+		fork_id: &Option<String>,
+		roles: Roles,
+		best_number: NumberFor<B>,
+		best_hash: B::Hash,
+		genesis_hash: B::Hash,
+	) -> NonDefaultSetConfig {
+		let block_announces_protocol = {
+			let genesis_hash = genesis_hash.as_ref();
+			if let Some(ref fork_id) = fork_id {
+				format!(
+					"/{}/{}/block-announces/1",
+					array_bytes::bytes2hex("", genesis_hash),
+					fork_id
+				)
+			} else {
+				format!("/{}/block-announces/1", array_bytes::bytes2hex("", genesis_hash))
+			}
+		};
+
+		NonDefaultSetConfig {
+			notifications_protocol: block_announces_protocol.into(),
+			fallback_names: iter::once(
+				format!("/{}/block-announces/1", protocol_id.as_ref()).into(),
+			)
+			.collect(),
+			max_notification_size: MAX_BLOCK_ANNOUNCE_SIZE,
+			handshake: Some(NotificationHandshake::new(BlockAnnouncesHandshake::<B>::build(
+				roles,
+				best_number,
+				best_hash,
+				genesis_hash,
+			))),
+			// NOTE: `set_config` will be ignored by `protocol.rs` as the block announcement
+			// protocol is still hardcoded into the peerset.
+			set_config: SetConfig {
+				in_peers: 0,
+				out_peers: 0,
+				reserved_nodes: Vec::new(),
+				non_reserved_mode: NonReservedPeerMode::Deny,
+			},
+		}
+	}
+
+	/// Import blocks.
+	fn import_blocks(&mut self, ImportBlocksAction { origin, blocks }: ImportBlocksAction<B>) {
+		if let Some(metrics) = &self.metrics {
+			metrics.import_queue_blocks_submitted.inc();
+		}
+
+		self.import_queue.import_blocks(origin, blocks);
+	}
+
+	/// Import justifications.
+	fn import_justifications(&mut self, action: ImportJustificationsAction<B>) {
+		if let Some(metrics) = &self.metrics {
+			metrics.import_queue_justifications_submitted.inc();
+		}
+
+		let ImportJustificationsAction { peer_id, hash, number, justifications } = action;
+
+		self.import_queue.import_justifications(peer_id, hash, number, justifications);
+	}
 }
diff --git a/substrate/client/network/sync/src/futures_stream.rs b/substrate/client/network/sync/src/futures_stream.rs
new file mode 100644
index 0000000000000000000000000000000000000000..c33d582345b64ee077b4d1fed9b5c0e36103ed5d
--- /dev/null
+++ b/substrate/client/network/sync/src/futures_stream.rs
@@ -0,0 +1,134 @@
+// This file is part of Substrate.
+
+// Copyright (C) Parity Technologies (UK) Ltd.
+// SPDX-License-Identifier: GPL-3.0-or-later WITH Classpath-exception-2.0
+
+// This program 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.
+
+// This program 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 this program. If not, see <https://www.gnu.org/licenses/>.
+
+//! A wrapper for [`FuturesUnordered`] that wakes the task up once a new future is pushed
+//! for it to be polled automatically. It's [`Stream`] never terminates.
+
+use futures::{stream::FuturesUnordered, Future, Stream, StreamExt};
+use std::{
+	pin::Pin,
+	task::{Context, Poll, Waker},
+};
+
+/// Wrapper around [`FuturesUnordered`] that wakes a task up automatically.
+pub struct FuturesStream<F> {
+	futures: FuturesUnordered<F>,
+	waker: Option<Waker>,
+}
+
+/// Surprizingly, `#[derive(Default)]` doesn't work on [`FuturesStream`].
+impl<F> Default for FuturesStream<F> {
+	fn default() -> FuturesStream<F> {
+		FuturesStream { futures: Default::default(), waker: None }
+	}
+}
+
+impl<F> FuturesStream<F> {
+	/// Push a future for processing.
+	pub fn push(&mut self, future: F) {
+		self.futures.push(future);
+
+		if let Some(waker) = self.waker.take() {
+			waker.wake();
+		}
+	}
+
+	/// The number of futures in the stream.
+	pub fn len(&self) -> usize {
+		self.futures.len()
+	}
+}
+
+impl<F: Future> Stream for FuturesStream<F> {
+	type Item = <F as Future>::Output;
+
+	fn poll_next(mut self: Pin<&mut Self>, cx: &mut Context<'_>) -> Poll<Option<Self::Item>> {
+		let Poll::Ready(Some(result)) = self.futures.poll_next_unpin(cx) else {
+			self.waker = Some(cx.waker().clone());
+
+			return Poll::Pending
+		};
+
+		Poll::Ready(Some(result))
+	}
+}
+
+#[cfg(test)]
+mod tests {
+	use super::*;
+	use futures::future::{BoxFuture, FutureExt};
+
+	/// [`Stream`] implementation for [`FuturesStream`] relies on the undocumented
+	/// feature that [`FuturesUnordered`] can be polled and repeatedly yield
+	/// `Poll::Ready(None)` before any futures are added into it.
+	#[tokio::test]
+	async fn empty_futures_unordered_can_be_polled() {
+		let mut unordered = FuturesUnordered::<BoxFuture<()>>::default();
+
+		futures::future::poll_fn(|cx| {
+			assert_eq!(unordered.poll_next_unpin(cx), Poll::Ready(None));
+			assert_eq!(unordered.poll_next_unpin(cx), Poll::Ready(None));
+
+			Poll::Ready(())
+		})
+		.await;
+	}
+
+	/// [`Stream`] implementation for [`FuturesStream`] relies on the undocumented
+	/// feature that [`FuturesUnordered`] can be polled and repeatedly yield
+	/// `Poll::Ready(None)` after all the futures in it have resolved.
+	#[tokio::test]
+	async fn deplenished_futures_unordered_can_be_polled() {
+		let mut unordered = FuturesUnordered::<BoxFuture<()>>::default();
+
+		unordered.push(futures::future::ready(()).boxed());
+		assert_eq!(unordered.next().await, Some(()));
+
+		futures::future::poll_fn(|cx| {
+			assert_eq!(unordered.poll_next_unpin(cx), Poll::Ready(None));
+			assert_eq!(unordered.poll_next_unpin(cx), Poll::Ready(None));
+
+			Poll::Ready(())
+		})
+		.await;
+	}
+
+	#[tokio::test]
+	async fn empty_futures_stream_yields_pending() {
+		let mut stream = FuturesStream::<BoxFuture<()>>::default();
+
+		futures::future::poll_fn(|cx| {
+			assert_eq!(stream.poll_next_unpin(cx), Poll::Pending);
+			Poll::Ready(())
+		})
+		.await;
+	}
+
+	#[tokio::test]
+	async fn futures_stream_resolves_futures_and_yields_pending() {
+		let mut stream = FuturesStream::default();
+		stream.push(futures::future::ready(17));
+
+		futures::future::poll_fn(|cx| {
+			assert_eq!(stream.poll_next_unpin(cx), Poll::Ready(Some(17)));
+			assert_eq!(stream.poll_next_unpin(cx), Poll::Pending);
+			Poll::Ready(())
+		})
+		.await;
+	}
+}
diff --git a/substrate/client/network/sync/src/lib.rs b/substrate/client/network/sync/src/lib.rs
index 175c1c43f46f703d09404a79a1234eecf6149e30..a291da4a90d58e66c8b904a3f53f171491a926ba 100644
--- a/substrate/client/network/sync/src/lib.rs
+++ b/substrate/client/network/sync/src/lib.rs
@@ -30,52 +30,32 @@
 
 use crate::{
 	blocks::BlockCollection,
-	schema::v1::{StateRequest, StateResponse},
+	schema::v1::StateResponse,
 	state::StateSync,
-	warp::{WarpProofImportResult, WarpSync},
+	warp::{WarpProofImportResult, WarpSync, WarpSyncConfig},
 };
 
-use codec::{Decode, DecodeAll, Encode};
+use codec::Encode;
 use extra_requests::ExtraRequests;
-use futures::{
-	channel::oneshot, stream::FuturesUnordered, task::Poll, Future, FutureExt, StreamExt,
-};
-use libp2p::{request_response::OutboundFailure, PeerId};
+use libp2p::PeerId;
 use log::{debug, error, info, trace, warn};
-use prost::Message;
 
-use prometheus_endpoint::{register, Counter, PrometheusError, Registry, U64};
 use sc_client_api::{BlockBackend, ProofProvider};
-use sc_consensus::{
-	import_queue::ImportQueueService, BlockImportError, BlockImportStatus, IncomingBlock,
-};
-use sc_network::{
-	config::{
-		NonDefaultSetConfig, NonReservedPeerMode, NotificationHandshake, ProtocolId, SetConfig,
-	},
-	request_responses::{IfDisconnected, RequestFailure},
-	types::ProtocolName,
-};
-use sc_network_common::{
-	role::Roles,
-	sync::{
-		message::{
-			BlockAnnounce, BlockAnnouncesHandshake, BlockAttributes, BlockData, BlockRequest,
-			BlockResponse, Direction, FromBlock,
-		},
-		warp::{EncodedProof, WarpProofRequest, WarpSyncParams, WarpSyncPhase, WarpSyncProgress},
-		BadPeer, ChainSync as ChainSyncT, ImportResult, Metrics, OnBlockData, OnBlockJustification,
-		OnStateData, OpaqueBlockRequest, OpaqueBlockResponse, OpaqueStateRequest,
-		OpaqueStateResponse, PeerInfo, PeerRequest, PollBlockAnnounceValidation, SyncMode,
-		SyncState, SyncStatus,
+use sc_consensus::{BlockImportError, BlockImportStatus, IncomingBlock};
+use sc_network::types::ProtocolName;
+use sc_network_common::sync::{
+	message::{
+		BlockAnnounce, BlockAttributes, BlockData, BlockRequest, BlockResponse, Direction,
+		FromBlock,
 	},
+	warp::{EncodedProof, WarpProofRequest, WarpSyncPhase, WarpSyncProgress},
+	BadPeer, ChainSync as ChainSyncT, ImportBlocksAction, Metrics, OnBlockData,
+	OnBlockJustification, OnStateData, OpaqueStateRequest, OpaqueStateResponse, PeerInfo, SyncMode,
+	SyncState, SyncStatus,
 };
 use sp_arithmetic::traits::Saturating;
 use sp_blockchain::{Error as ClientError, HeaderBackend, HeaderMetadata};
-use sp_consensus::{
-	block_validation::{BlockAnnounceValidator, Validation},
-	BlockOrigin, BlockStatus,
-};
+use sp_consensus::{BlockOrigin, BlockStatus};
 use sp_runtime::{
 	traits::{
 		Block as BlockT, CheckedSub, Hash, HashingFor, Header as HeaderT, NumberFor, One,
@@ -85,18 +65,20 @@ use sp_runtime::{
 };
 
 use std::{
-	collections::{hash_map::Entry, HashMap, HashSet},
-	iter,
+	collections::{HashMap, HashSet},
 	ops::Range,
-	pin::Pin,
 	sync::Arc,
 };
 
 pub use service::chain_sync::SyncingService;
 
+mod block_announce_validator;
 mod extra_requests;
+mod futures_stream;
+mod pending_responses;
 mod schema;
 
+pub mod block_relay_protocol;
 pub mod block_request_handler;
 pub mod blocks;
 pub mod engine;
@@ -107,6 +89,9 @@ pub mod state_request_handler;
 pub mod warp;
 pub mod warp_request_handler;
 
+/// Log target for this file.
+const LOG_TARGET: &'static str = "sync";
+
 /// Maximum blocks to store in the import queue.
 const MAX_IMPORTING_BLOCKS: usize = 2048;
 
@@ -117,17 +102,6 @@ const MAX_DOWNLOAD_AHEAD: u32 = 2048;
 /// common block of a node.
 const MAX_BLOCKS_TO_LOOK_BACKWARDS: u32 = MAX_DOWNLOAD_AHEAD / 2;
 
-/// Maximum number of concurrent block announce validations.
-///
-/// If the queue reaches the maximum, we drop any new block
-/// announcements.
-const MAX_CONCURRENT_BLOCK_ANNOUNCE_VALIDATIONS: usize = 256;
-
-/// Maximum number of concurrent block announce validations per peer.
-///
-/// See [`MAX_CONCURRENT_BLOCK_ANNOUNCE_VALIDATIONS`] for more information.
-const MAX_CONCURRENT_BLOCK_ANNOUNCE_VALIDATIONS_PER_PEER: usize = 4;
-
 /// Pick the state to sync as the latest finalized number minus this.
 const STATE_SYNC_FINALITY_THRESHOLD: u32 = 8;
 
@@ -141,9 +115,6 @@ const MAJOR_SYNC_BLOCKS: u8 = 5;
 /// Number of peers that need to be connected before warp sync is started.
 const MIN_PEERS_TO_START_WARP_SYNC: usize = 3;
 
-/// Maximum allowed size for a block announce.
-const MAX_BLOCK_ANNOUNCE_SIZE: u64 = 1024 * 1024;
-
 /// Maximum blocks per response.
 pub(crate) const MAX_BLOCKS_IN_RESPONSE: usize = 128;
 
@@ -180,18 +151,6 @@ mod rep {
 
 	/// Peer response data does not have requested bits.
 	pub const BAD_RESPONSE: Rep = Rep::new(-(1 << 12), "Incomplete response");
-
-	/// Reputation change when a peer doesn't respond in time to our messages.
-	pub const TIMEOUT: Rep = Rep::new(-(1 << 10), "Request timeout");
-
-	/// Peer is on unsupported protocol version.
-	pub const BAD_PROTOCOL: Rep = Rep::new_fatal("Unsupported protocol");
-
-	/// Reputation change when a peer refuses a request.
-	pub const REFUSED: Rep = Rep::new(-(1 << 10), "Request refused");
-
-	/// We received a message that failed to decode.
-	pub const BAD_MESSAGE: Rep = Rep::new(-(1 << 12), "Bad message");
 }
 
 enum AllowedRequests {
@@ -239,49 +198,41 @@ impl Default for AllowedRequests {
 	}
 }
 
-struct SyncingMetrics {
-	pub import_queue_blocks_submitted: Counter<U64>,
-	pub import_queue_justifications_submitted: Counter<U64>,
-}
-
-impl SyncingMetrics {
-	fn register(registry: &Registry) -> Result<Self, PrometheusError> {
-		Ok(Self {
-			import_queue_blocks_submitted: register(
-				Counter::new(
-					"substrate_sync_import_queue_blocks_submitted",
-					"Number of blocks submitted to the import queue.",
-				)?,
-				registry,
-			)?,
-			import_queue_justifications_submitted: register(
-				Counter::new(
-					"substrate_sync_import_queue_justifications_submitted",
-					"Number of justifications submitted to the import queue.",
-				)?,
-				registry,
-			)?,
-		})
-	}
-}
-
 struct GapSync<B: BlockT> {
 	blocks: BlockCollection<B>,
 	best_queued_number: NumberFor<B>,
 	target: NumberFor<B>,
 }
 
-type PendingResponse<B> = Pin<
-	Box<
-		dyn Future<
-				Output = (
-					PeerId,
-					PeerRequest<B>,
-					Result<Result<Vec<u8>, RequestFailure>, oneshot::Canceled>,
-				),
-			> + Send,
-	>,
->;
+/// Action that [`engine::SyncingEngine`] should perform after reporting imported blocks with
+/// [`ChainSync::on_blocks_processed`].
+enum BlockRequestAction<B: BlockT> {
+	/// Send block request to peer. Always implies dropping a stale block request to the same peer.
+	SendRequest { peer_id: PeerId, request: BlockRequest<B> },
+	/// Drop stale block request.
+	RemoveStale { peer_id: PeerId },
+}
+
+/// Action that [`engine::SyncingEngine`] should perform if we want to import justifications.
+struct ImportJustificationsAction<B: BlockT> {
+	peer_id: PeerId,
+	hash: B::Hash,
+	number: NumberFor<B>,
+	justifications: Justifications,
+}
+
+/// Action that [`engine::SyncingEngine`] should perform on behalf of [`ChainSync`]
+/// after reporting block response with [`ChainSync::on_block_response`].
+enum OnBlockResponse<B: BlockT> {
+	/// Nothing to do
+	Nothing,
+	/// Perform block request.
+	SendBlockRequest { peer_id: PeerId, request: BlockRequest<B> },
+	/// Import blocks.
+	ImportBlocks(ImportBlocksAction<B>),
+	/// Import justifications.
+	ImportJustifications(ImportJustificationsAction<B>),
+}
 
 /// The main data structure which contains all the state for a chains
 /// active syncing strategy.
@@ -307,27 +258,22 @@ pub struct ChainSync<B: BlockT, Client> {
 	fork_targets: HashMap<B::Hash, ForkTarget<B>>,
 	/// A set of peers for which there might be potential block requests
 	allowed_requests: AllowedRequests,
-	/// A type to check incoming block announcements.
-	block_announce_validator: Box<dyn BlockAnnounceValidator<B> + Send>,
 	/// Maximum number of peers to ask the same blocks in parallel.
 	max_parallel_downloads: u32,
 	/// Maximum blocks per request.
 	max_blocks_per_request: u32,
 	/// Total number of downloaded blocks.
 	downloaded_blocks: usize,
-	/// All block announcement that are currently being validated.
-	block_announce_validation:
-		FuturesUnordered<Pin<Box<dyn Future<Output = PreValidateBlockAnnounce<B::Header>> + Send>>>,
-	/// Stats per peer about the number of concurrent block announce validations.
-	block_announce_validation_per_peer_stats: HashMap<PeerId, usize>,
 	/// State sync in progress, if any.
 	state_sync: Option<StateSync<B, Client>>,
 	/// Warp sync in progress, if any.
 	warp_sync: Option<WarpSync<B, Client>>,
-	/// Warp sync params.
+	/// Warp sync configuration.
 	///
 	/// Will be `None` after `self.warp_sync` is `Some(_)`.
-	warp_sync_params: Option<WarpSyncParams<B>>,
+	warp_sync_config: Option<WarpSyncConfig<B>>,
+	/// A temporary storage for warp sync target block until warp sync is initialized.
+	warp_sync_target_block_header: Option<B::Header>,
 	/// Enable importing existing blocks. This is used used after the state download to
 	/// catch up to the latest state while re-importing blocks.
 	import_existing: bool,
@@ -337,18 +283,6 @@ pub struct ChainSync<B: BlockT, Client> {
 	network_service: service::network::NetworkServiceHandle,
 	/// Protocol name used for block announcements
 	block_announce_protocol_name: ProtocolName,
-	/// Protocol name used to send out block requests
-	block_request_protocol_name: ProtocolName,
-	/// Protocol name used to send out state requests
-	state_request_protocol_name: ProtocolName,
-	/// Protocol name used to send out warp sync requests
-	warp_sync_protocol_name: Option<ProtocolName>,
-	/// Pending responses
-	pending_responses: HashMap<PeerId, PendingResponse<B>>,
-	/// Handle to import queue.
-	import_queue: Box<dyn ImportQueueService<B>>,
-	/// Metrics.
-	metrics: Option<SyncingMetrics>,
 }
 
 /// All the data we have about a Peer that we are trying to sync with
@@ -373,7 +307,7 @@ impl<B: BlockT> PeerSync<B> {
 	fn update_common_number(&mut self, new_common: NumberFor<B>) {
 		if self.common_number < new_common {
 			trace!(
-				target: "sync",
+				target: LOG_TARGET,
 				"Updating peer {} common number from={} => to={}.",
 				self.peer_id,
 				self.common_number,
@@ -424,51 +358,6 @@ impl<B: BlockT> PeerSyncState<B> {
 	}
 }
 
-/// Result of [`ChainSync::block_announce_validation`].
-#[derive(Debug, Clone, PartialEq, Eq)]
-enum PreValidateBlockAnnounce<H> {
-	/// The announcement failed at validation.
-	///
-	/// The peer reputation should be decreased.
-	Failure {
-		/// Who sent the processed block announcement?
-		who: PeerId,
-		/// Should the peer be disconnected?
-		disconnect: bool,
-	},
-	/// The pre-validation was sucessful and the announcement should be
-	/// further processed.
-	Process {
-		/// Is this the new best block of the peer?
-		is_new_best: bool,
-		/// The id of the peer that send us the announcement.
-		who: PeerId,
-		/// The announcement.
-		announce: BlockAnnounce<H>,
-	},
-	/// The announcement validation returned an error.
-	///
-	/// An error means that *this* node failed to validate it because some internal error happened.
-	/// If the block announcement was invalid, [`Self::Failure`] is the correct variant to express
-	/// this.
-	Error { who: PeerId },
-	/// The block announcement should be skipped.
-	///
-	/// This should *only* be returned when there wasn't a slot registered
-	/// for this block announcement validation.
-	Skip,
-}
-
-/// Result of [`ChainSync::has_slot_for_block_announce_validation`].
-enum HasSlotForBlockAnnounceValidation {
-	/// Yes, there is a slot for the block announce validation.
-	Yes,
-	/// We reached the total maximum number of validation slots.
-	TotalMaximumSlotsReached,
-	/// We reached the maximum number of validation slots for the given peer.
-	MaximumPeerSlotsReached,
-}
-
 impl<B, Client> ChainSyncT<B> for ChainSync<B, Client>
 where
 	B: BlockT,
@@ -551,10 +440,7 @@ where
 		self.peers.len()
 	}
 
-	fn num_active_peers(&self) -> usize {
-		self.pending_responses.len()
-	}
-
+	#[must_use]
 	fn new_peer(
 		&mut self,
 		who: PeerId,
@@ -564,7 +450,7 @@ where
 		// There is nothing sync can get from the node that has no blockchain data.
 		match self.block_status(&best_hash) {
 			Err(e) => {
-				debug!(target:"sync", "Error reading blockchain: {}", e);
+				debug!(target:LOG_TARGET, "Error reading blockchain: {e}");
 				Err(BadPeer(who, rep::BLOCKCHAIN_READ_ERROR))
 			},
 			Ok(BlockStatus::KnownBad) => {
@@ -582,7 +468,7 @@ where
 				// an ancestor search, which is what we do in the next match case below.
 				if self.queue_blocks.len() > MAJOR_SYNC_BLOCKS.into() {
 					debug!(
-						target:"sync",
+						target:LOG_TARGET,
 						"New peer with unknown best hash {} ({}), assuming common block.",
 						self.best_queued_hash,
 						self.best_queued_number
@@ -603,10 +489,8 @@ where
 				// If we are at genesis, just start downloading.
 				let (state, req) = if self.best_queued_number.is_zero() {
 					debug!(
-						target:"sync",
-						"New peer with best hash {} ({}).",
-						best_hash,
-						best_number,
+						target:LOG_TARGET,
+						"New peer with best hash {best_hash} ({best_number}).",
 					);
 
 					(PeerSyncState::Available, None)
@@ -614,7 +498,7 @@ where
 					let common_best = std::cmp::min(self.best_queued_number, best_number);
 
 					debug!(
-						target:"sync",
+						target:LOG_TARGET,
 						"New peer with unknown best hash {} ({}), searching for common ancestor.",
 						best_hash,
 						best_number
@@ -645,9 +529,14 @@ where
 				if let SyncMode::Warp = self.mode {
 					if self.peers.len() >= MIN_PEERS_TO_START_WARP_SYNC && self.warp_sync.is_none()
 					{
-						log::debug!(target: "sync", "Starting warp state sync.");
-						if let Some(params) = self.warp_sync_params.take() {
-							self.warp_sync = Some(WarpSync::new(self.client.clone(), params));
+						log::debug!(target: LOG_TARGET, "Starting warp state sync.");
+
+						if let Some(config) = self.warp_sync_config.take() {
+							let mut warp_sync = WarpSync::new(self.client.clone(), config);
+							if let Some(header) = self.warp_sync_target_block_header.take() {
+								warp_sync.set_target_block(header);
+							}
+							self.warp_sync = Some(warp_sync);
 						}
 					}
 				}
@@ -657,10 +546,8 @@ where
 			Ok(BlockStatus::InChainWithState) |
 			Ok(BlockStatus::InChainPruned) => {
 				debug!(
-					target: "sync",
-					"New peer with known best hash {} ({}).",
-					best_hash,
-					best_number,
+					target: LOG_TARGET,
+					"New peer with known best hash {best_hash} ({best_number}).",
 				);
 				self.peers.insert(
 					who,
@@ -692,7 +579,7 @@ where
 		self.extra_justifications.reset();
 	}
 
-	// The implementation is similar to on_block_announce with unknown parent hash.
+	// The implementation is similar to `on_validated_block_announce` with unknown parent hash.
 	fn set_sync_fork_request(
 		&mut self,
 		mut peers: Vec<PeerId>,
@@ -709,21 +596,23 @@ where
 				.collect();
 
 			debug!(
-				target: "sync",
-				"Explicit sync request for block {:?} with no peers specified. \
-				Syncing from these peers {:?} instead.",
-				hash, peers,
+				target: LOG_TARGET,
+				"Explicit sync request for block {hash:?} with no peers specified. \
+				Syncing from these peers {peers:?} instead.",
 			);
 		} else {
-			debug!(target: "sync", "Explicit sync request for block {:?} with {:?}", hash, peers);
+			debug!(
+				target: LOG_TARGET,
+				"Explicit sync request for block {hash:?} with {peers:?}",
+			);
 		}
 
 		if self.is_known(hash) {
-			debug!(target: "sync", "Refusing to sync known hash {:?}", hash);
+			debug!(target: LOG_TARGET, "Refusing to sync known hash {hash:?}");
 			return
 		}
 
-		trace!(target: "sync", "Downloading requested old fork {:?}", hash);
+		trace!(target: LOG_TARGET, "Downloading requested old fork {hash:?}");
 		for peer_id in &peers {
 			if let Some(peer) = self.peers.get_mut(peer_id) {
 				if let PeerSyncState::AncestorSearch { .. } = peer.state {
@@ -745,6 +634,7 @@ where
 			.extend(peers);
 	}
 
+	#[must_use]
 	fn on_block_data(
 		&mut self,
 		who: &PeerId,
@@ -756,7 +646,7 @@ where
 		let new_blocks: Vec<IncomingBlock<B>> = if let Some(peer) = self.peers.get_mut(who) {
 			let mut blocks = response.blocks;
 			if request.as_ref().map_or(false, |r| r.direction == Direction::Descending) {
-				trace!(target: "sync", "Reversing incoming block list");
+				trace!(target: LOG_TARGET, "Reversing incoming block list");
 				blocks.reverse()
 			}
 			self.allowed_requests.add(who);
@@ -807,17 +697,22 @@ where
 									}
 								})
 								.collect();
-							debug!(target: "sync", "Drained {} gap blocks from {}", blocks.len(), gap_sync.best_queued_number);
+							debug!(
+								target: LOG_TARGET,
+								"Drained {} gap blocks from {}",
+								blocks.len(),
+								gap_sync.best_queued_number,
+							);
 							blocks
 						} else {
-							debug!(target: "sync", "Unexpected gap block response from {}", who);
+							debug!(target: LOG_TARGET, "Unexpected gap block response from {who}");
 							return Err(BadPeer(*who, rep::NO_BLOCK))
 						}
 					},
 					PeerSyncState::DownloadingStale(_) => {
 						peer.state = PeerSyncState::Available;
 						if blocks.is_empty() {
-							debug!(target: "sync", "Empty block response from {}", who);
+							debug!(target: LOG_TARGET, "Empty block response from {who}");
 							return Err(BadPeer(*who, rep::NO_BLOCK))
 						}
 						validate_blocks::<B>(&blocks, who, Some(request))?;
@@ -846,7 +741,7 @@ where
 						let matching_hash = match (blocks.get(0), self.client.hash(*current)) {
 							(Some(block), Ok(maybe_our_block_hash)) => {
 								trace!(
-									target: "sync",
+									target: LOG_TARGET,
 									"Got ancestry block #{} ({}) from peer {}",
 									current,
 									block.hash,
@@ -856,17 +751,15 @@ where
 							},
 							(None, _) => {
 								debug!(
-									target: "sync",
-									"Invalid response when searching for ancestor from {}",
-									who,
+									target: LOG_TARGET,
+									"Invalid response when searching for ancestor from {who}",
 								);
 								return Err(BadPeer(*who, rep::UNKNOWN_ANCESTOR))
 							},
 							(_, Err(e)) => {
 								info!(
-									target: "sync",
-									"❌ Error answering legitimate blockchain query: {}",
-									e,
+									target: LOG_TARGET,
+									"❌ Error answering legitimate blockchain query: {e}",
 								);
 								return Err(BadPeer(*who, rep::BLOCKCHAIN_READ_ERROR))
 							},
@@ -884,7 +777,10 @@ where
 							}
 						}
 						if matching_hash.is_none() && current.is_zero() {
-							trace!(target:"sync", "Ancestry search: genesis mismatch for peer {}", who);
+							trace!(
+								target:LOG_TARGET,
+								"Ancestry search: genesis mismatch for peer {who}",
+							);
 							return Err(BadPeer(*who, rep::GENESIS_MISMATCH))
 						}
 						if let Some((next_state, next_num)) =
@@ -900,7 +796,7 @@ where
 							// Ancestry search is complete. Check if peer is on a stale fork unknown
 							// to us and add it to sync targets if necessary.
 							trace!(
-								target: "sync",
+								target: LOG_TARGET,
 								"Ancestry search complete. Ours={} ({}), Theirs={} ({}), Common={:?} ({})",
 								self.best_queued_hash,
 								self.best_queued_number,
@@ -913,7 +809,7 @@ where
 								peer.best_number < self.best_queued_number
 							{
 								trace!(
-									target: "sync",
+									target: LOG_TARGET,
 									"Added fork target {} for {}",
 									peer.best_hash,
 									who,
@@ -946,11 +842,11 @@ where
 										return Err(BadPeer(*who, rep::VERIFICATION_FAIL)),
 								}
 							} else if blocks.is_empty() {
-								debug!(target: "sync", "Empty block response from {}", who);
+								debug!(target: LOG_TARGET, "Empty block response from {who}");
 								return Err(BadPeer(*who, rep::NO_BLOCK))
 							} else {
 								debug!(
-									target: "sync",
+									target: LOG_TARGET,
 									"Too many blocks ({}) in warp target block response from {}",
 									blocks.len(),
 									who,
@@ -959,7 +855,7 @@ where
 							}
 						} else {
 							debug!(
-								target: "sync",
+								target: LOG_TARGET,
 								"Logic error: we think we are downloading warp target block from {}, but no warp sync is happening.",
 								who,
 							);
@@ -1000,9 +896,10 @@ where
 			return Err(BadPeer(*who, rep::NOT_REQUESTED))
 		};
 
-		Ok(self.validate_and_queue_blocks(new_blocks, gap))
+		Ok(OnBlockData::Import(self.validate_and_queue_blocks(new_blocks, gap)))
 	}
 
+	#[must_use]
 	fn on_block_justification(
 		&mut self,
 		who: PeerId,
@@ -1011,7 +908,10 @@ where
 		let peer = if let Some(peer) = self.peers.get_mut(&who) {
 			peer
 		} else {
-			error!(target: "sync", "💔 Called on_block_justification with a peer ID of an unknown peer");
+			error!(
+				target: LOG_TARGET,
+				"💔 Called on_block_justification with a peer ID of an unknown peer",
+			);
 			return Ok(OnBlockJustification::Nothing)
 		};
 
@@ -1023,7 +923,7 @@ where
 			let justification = if let Some(block) = response.blocks.into_iter().next() {
 				if hash != block.hash {
 					warn!(
-						target: "sync",
+						target: LOG_TARGET,
 						"💔 Invalid block justification provided by {}: requested: {:?} got: {:?}",
 						who,
 						hash,
@@ -1039,19 +939,17 @@ where
 				// we might have asked the peer for a justification on a block that we assumed it
 				// had but didn't (regardless of whether it had a justification for it or not).
 				trace!(
-					target: "sync",
-					"Peer {:?} provided empty response for justification request {:?}",
-					who,
-					hash,
+					target: LOG_TARGET,
+					"Peer {who:?} provided empty response for justification request {hash:?}",
 				);
 
 				None
 			};
 
-			if let Some((peer, hash, number, j)) =
+			if let Some((peer_id, hash, number, justifications)) =
 				self.extra_justifications.on_response(who, justification)
 			{
-				return Ok(OnBlockJustification::Import { peer, hash, number, justifications: j })
+				return Ok(OnBlockJustification::Import { peer_id, hash, number, justifications })
 			}
 		}
 
@@ -1080,10 +978,8 @@ where
 				if number + STATE_SYNC_FINALITY_THRESHOLD.saturated_into() >= median {
 					if let Ok(Some(header)) = self.client.header(*hash) {
 						log::debug!(
-							target: "sync",
-							"Starting state sync for #{} ({})",
-							number,
-							hash,
+							target: LOG_TARGET,
+							"Starting state sync for #{number} ({hash})",
 						);
 						self.state_sync = Some(StateSync::new(
 							self.client.clone(),
@@ -1100,136 +996,104 @@ where
 
 		if let Err(err) = r {
 			warn!(
-				target: "sync",
-				"💔 Error cleaning up pending extra justification data requests: {}",
-				err,
+				target: LOG_TARGET,
+				"💔 Error cleaning up pending extra justification data requests: {err}",
 			);
 		}
 	}
 
-	fn push_block_announce_validation(
+	fn on_validated_block_announce(
 		&mut self,
-		who: PeerId,
-		hash: B::Hash,
-		announce: BlockAnnounce<B::Header>,
 		is_best: bool,
+		who: PeerId,
+		announce: &BlockAnnounce<B::Header>,
 	) {
-		let header = &announce.header;
-		let number = *header.number();
-		debug!(
-			target: "sync",
-			"Pre-validating received block announcement {:?} with number {:?} from {}",
-			hash,
-			number,
-			who,
-		);
+		let number = *announce.header.number();
+		let hash = announce.header.hash();
+		let parent_status =
+			self.block_status(announce.header.parent_hash()).unwrap_or(BlockStatus::Unknown);
+		let known_parent = parent_status != BlockStatus::Unknown;
+		let ancient_parent = parent_status == BlockStatus::InChainPruned;
 
-		if number.is_zero() {
-			self.block_announce_validation.push(
-				async move {
-					warn!(
-						target: "sync",
-						"💔 Ignored genesis block (#0) announcement from {}: {}",
-						who,
-						hash,
-					);
-					PreValidateBlockAnnounce::Skip
-				}
-				.boxed(),
-			);
+		let known = self.is_known(&hash);
+		let peer = if let Some(peer) = self.peers.get_mut(&who) {
+			peer
+		} else {
+			error!(target: LOG_TARGET, "💔 Called `on_validated_block_announce` with a bad peer ID");
+			return
+		};
+
+		if let PeerSyncState::AncestorSearch { .. } = peer.state {
+			trace!(target: LOG_TARGET, "Peer {} is in the ancestor search state.", who);
 			return
 		}
 
-		// Check if there is a slot for this block announce validation.
-		match self.has_slot_for_block_announce_validation(&who) {
-			HasSlotForBlockAnnounceValidation::Yes => {},
-			HasSlotForBlockAnnounceValidation::TotalMaximumSlotsReached => {
-				self.block_announce_validation.push(
-					async move {
-						warn!(
-							target: "sync",
-							"💔 Ignored block (#{} -- {}) announcement from {} because all validation slots are occupied.",
-							number,
-							hash,
-							who,
-						);
-						PreValidateBlockAnnounce::Skip
-					}
-					.boxed(),
-				);
-				return
-			},
-			HasSlotForBlockAnnounceValidation::MaximumPeerSlotsReached => {
-				self.block_announce_validation.push(async move {
-					warn!(
-						target: "sync",
-						"💔 Ignored block (#{} -- {}) announcement from {} because all validation slots for this peer are occupied.",
-						number,
-						hash,
-						who,
-					);
-					PreValidateBlockAnnounce::Skip
-				}.boxed());
-				return
-			},
+		if is_best {
+			// update their best block
+			peer.best_number = number;
+			peer.best_hash = hash;
 		}
 
-		// Let external validator check the block announcement.
-		let assoc_data = announce.data.as_ref().map_or(&[][..], |v| v.as_slice());
-		let future = self.block_announce_validator.validate(header, assoc_data);
+		// If the announced block is the best they have and is not ahead of us, our common number
+		// is either one further ahead or it's the one they just announced, if we know about it.
+		if is_best {
+			if known && self.best_queued_number >= number {
+				self.update_peer_common_number(&who, number);
+			} else if announce.header.parent_hash() == &self.best_queued_hash ||
+				known_parent && self.best_queued_number >= number
+			{
+				self.update_peer_common_number(&who, number.saturating_sub(One::one()));
+			}
+		}
+		self.allowed_requests.add(&who);
 
-		self.block_announce_validation.push(
-			async move {
-				match future.await {
-					Ok(Validation::Success { is_new_best }) => PreValidateBlockAnnounce::Process {
-						is_new_best: is_new_best || is_best,
-						announce,
-						who,
-					},
-					Ok(Validation::Failure { disconnect }) => {
-						debug!(
-							target: "sync",
-							"Block announcement validation of block {:?} from {} failed",
-							hash,
-							who,
-						);
-						PreValidateBlockAnnounce::Failure { who, disconnect }
-					},
-					Err(e) => {
-						debug!(
-							target: "sync",
-							"💔 Block announcement validation of block {:?} errored: {}",
-							hash,
-							e,
-						);
-						PreValidateBlockAnnounce::Error { who }
-					},
-				}
+		// known block case
+		if known || self.is_already_downloading(&hash) {
+			trace!(target: "sync", "Known block announce from {}: {}", who, hash);
+			if let Some(target) = self.fork_targets.get_mut(&hash) {
+				target.peers.insert(who);
 			}
-			.boxed(),
-		);
-	}
+			return
+		}
 
-	fn poll_block_announce_validation(
-		&mut self,
-		cx: &mut std::task::Context,
-	) -> Poll<PollBlockAnnounceValidation<B::Header>> {
-		match self.block_announce_validation.poll_next_unpin(cx) {
-			Poll::Ready(Some(res)) => {
-				self.peer_block_announce_validation_finished(&res);
-				Poll::Ready(self.finish_block_announce_validation(res))
-			},
-			_ => Poll::Pending,
+		if ancient_parent {
+			trace!(
+				target: "sync",
+				"Ignored ancient block announced from {}: {} {:?}",
+				who,
+				hash,
+				announce.header,
+			);
+			return
+		}
+
+		if self.status().state == SyncState::Idle {
+			trace!(
+				target: "sync",
+				"Added sync target for block announced from {}: {} {:?}",
+				who,
+				hash,
+				announce.summary(),
+			);
+			self.fork_targets
+				.entry(hash)
+				.or_insert_with(|| ForkTarget {
+					number,
+					parent_hash: Some(*announce.header.parent_hash()),
+					peers: Default::default(),
+				})
+				.peers
+				.insert(who);
 		}
 	}
 
-	fn peer_disconnected(&mut self, who: &PeerId) {
+	#[must_use]
+	fn peer_disconnected(&mut self, who: &PeerId) -> Option<ImportBlocksAction<B>> {
 		self.blocks.clear_peer_download(who);
 		if let Some(gap_sync) = &mut self.gap_sync {
 			gap_sync.blocks.clear_peer_download(who)
 		}
 		self.peers.remove(who);
-		self.pending_responses.remove(who);
 		self.extra_justifications.peer_disconnected(who);
 		self.allowed_requests.set_all();
 		self.fork_targets.retain(|_, target| {
@@ -1238,11 +1102,8 @@ where
 		});
 
 		let blocks = self.ready_blocks();
-		if let Some(OnBlockData::Import(origin, blocks)) =
-			(!blocks.is_empty()).then(|| self.validate_and_queue_blocks(blocks, false))
-		{
-			self.import_blocks(origin, blocks);
-		}
+
+		(!blocks.is_empty()).then(|| self.validate_and_queue_blocks(blocks, false))
 	}
 
 	fn metrics(&self) -> Metrics {
@@ -1252,128 +1113,6 @@ where
 			justifications: self.extra_justifications.metrics(),
 		}
 	}
-
-	fn block_response_into_blocks(
-		&self,
-		request: &BlockRequest<B>,
-		response: OpaqueBlockResponse,
-	) -> Result<Vec<BlockData<B>>, String> {
-		let response: Box<schema::v1::BlockResponse> = response.0.downcast().map_err(|_error| {
-			"Failed to downcast opaque block response during encoding, this is an \
-				implementation bug."
-				.to_string()
-		})?;
-
-		response
-			.blocks
-			.into_iter()
-			.map(|block_data| {
-				Ok(BlockData::<B> {
-					hash: Decode::decode(&mut block_data.hash.as_ref())?,
-					header: if !block_data.header.is_empty() {
-						Some(Decode::decode(&mut block_data.header.as_ref())?)
-					} else {
-						None
-					},
-					body: if request.fields.contains(BlockAttributes::BODY) {
-						Some(
-							block_data
-								.body
-								.iter()
-								.map(|body| Decode::decode(&mut body.as_ref()))
-								.collect::<Result<Vec<_>, _>>()?,
-						)
-					} else {
-						None
-					},
-					indexed_body: if request.fields.contains(BlockAttributes::INDEXED_BODY) {
-						Some(block_data.indexed_body)
-					} else {
-						None
-					},
-					receipt: if !block_data.receipt.is_empty() {
-						Some(block_data.receipt)
-					} else {
-						None
-					},
-					message_queue: if !block_data.message_queue.is_empty() {
-						Some(block_data.message_queue)
-					} else {
-						None
-					},
-					justification: if !block_data.justification.is_empty() {
-						Some(block_data.justification)
-					} else if block_data.is_empty_justification {
-						Some(Vec::new())
-					} else {
-						None
-					},
-					justifications: if !block_data.justifications.is_empty() {
-						Some(DecodeAll::decode_all(&mut block_data.justifications.as_ref())?)
-					} else {
-						None
-					},
-				})
-			})
-			.collect::<Result<_, _>>()
-			.map_err(|error: codec::Error| error.to_string())
-	}
-
-	fn poll(
-		&mut self,
-		cx: &mut std::task::Context,
-	) -> Poll<PollBlockAnnounceValidation<B::Header>> {
-		// Should be called before `process_outbound_requests` to ensure
-		// that a potential target block is directly leading to requests.
-		if let Some(warp_sync) = &mut self.warp_sync {
-			let _ = warp_sync.poll(cx);
-		}
-
-		self.process_outbound_requests();
-
-		while let Poll::Ready(result) = self.poll_pending_responses(cx) {
-			match result {
-				ImportResult::BlockImport(origin, blocks) => self.import_blocks(origin, blocks),
-				ImportResult::JustificationImport(who, hash, number, justifications) =>
-					self.import_justifications(who, hash, number, justifications),
-			}
-		}
-
-		if let Poll::Ready(announce) = self.poll_block_announce_validation(cx) {
-			return Poll::Ready(announce)
-		}
-
-		Poll::Pending
-	}
-
-	fn send_block_request(&mut self, who: PeerId, request: BlockRequest<B>) {
-		let (tx, rx) = oneshot::channel();
-		let opaque_req = self.create_opaque_block_request(&request);
-
-		if self.peers.contains_key(&who) {
-			self.pending_responses
-				.insert(who, Box::pin(async move { (who, PeerRequest::Block(request), rx.await) }));
-		}
-
-		match self.encode_block_request(&opaque_req) {
-			Ok(data) => {
-				self.network_service.start_request(
-					who,
-					self.block_request_protocol_name.clone(),
-					data,
-					tx,
-					IfDisconnected::ImmediateError,
-				);
-			},
-			Err(err) => {
-				log::warn!(
-					target: "sync",
-					"Failed to encode block request {:?}: {:?}",
-					opaque_req, err
-				);
-			},
-		}
-	}
 }
 
 impl<B, Client> ChainSync<B, Client>
@@ -1392,33 +1131,12 @@ where
 	pub fn new(
 		mode: SyncMode,
 		client: Arc<Client>,
-		protocol_id: ProtocolId,
-		fork_id: &Option<String>,
-		roles: Roles,
-		block_announce_validator: Box<dyn BlockAnnounceValidator<B> + Send>,
+		block_announce_protocol_name: ProtocolName,
 		max_parallel_downloads: u32,
 		max_blocks_per_request: u32,
-		warp_sync_params: Option<WarpSyncParams<B>>,
-		metrics_registry: Option<&Registry>,
+		warp_sync_config: Option<WarpSyncConfig<B>>,
 		network_service: service::network::NetworkServiceHandle,
-		import_queue: Box<dyn ImportQueueService<B>>,
-		block_request_protocol_name: ProtocolName,
-		state_request_protocol_name: ProtocolName,
-		warp_sync_protocol_name: Option<ProtocolName>,
-	) -> Result<(Self, NonDefaultSetConfig), ClientError> {
-		let block_announce_config = Self::get_block_announce_proto_config(
-			protocol_id,
-			fork_id,
-			roles,
-			client.info().best_number,
-			client.info().best_hash,
-			client
-				.block_hash(Zero::zero())
-				.ok()
-				.flatten()
-				.expect("Genesis block exists; qed"),
-		);
-
+	) -> Result<Self, ClientError> {
 		let mut sync = Self {
 			client,
 			peers: HashMap::new(),
@@ -1430,42 +1148,21 @@ where
 			queue_blocks: Default::default(),
 			fork_targets: Default::default(),
 			allowed_requests: Default::default(),
-			block_announce_validator,
 			max_parallel_downloads,
 			max_blocks_per_request,
 			downloaded_blocks: 0,
-			block_announce_validation: Default::default(),
-			block_announce_validation_per_peer_stats: Default::default(),
 			state_sync: None,
 			warp_sync: None,
 			import_existing: false,
 			gap_sync: None,
 			network_service,
-			block_request_protocol_name,
-			state_request_protocol_name,
-			warp_sync_params,
-			warp_sync_protocol_name,
-			block_announce_protocol_name: block_announce_config
-				.notifications_protocol
-				.clone()
-				.into(),
-			pending_responses: HashMap::new(),
-			import_queue,
-			metrics: if let Some(r) = &metrics_registry {
-				match SyncingMetrics::register(r) {
-					Ok(metrics) => Some(metrics),
-					Err(err) => {
-						error!(target: "sync", "Failed to register metrics for ChainSync: {err:?}");
-						None
-					},
-				}
-			} else {
-				None
-			},
+			warp_sync_config,
+			warp_sync_target_block_header: None,
+			block_announce_protocol_name,
 		};
 
 		sync.reset_sync_start_point()?;
-		Ok((sync, block_announce_config))
+		Ok(sync)
 	}
 
 	/// Returns the median seen block number.
@@ -1507,12 +1204,12 @@ where
 		&mut self,
 		mut new_blocks: Vec<IncomingBlock<B>>,
 		gap: bool,
-	) -> OnBlockData<B> {
+	) -> ImportBlocksAction<B> {
 		let orig_len = new_blocks.len();
 		new_blocks.retain(|b| !self.queue_blocks.contains(&b.hash));
 		if new_blocks.len() != orig_len {
 			debug!(
-				target: "sync",
+				target: LOG_TARGET,
 				"Ignoring {} blocks that are already queued",
 				orig_len - new_blocks.len(),
 			);
@@ -1529,7 +1226,7 @@ where
 			.and_then(|b| b.header.as_ref().map(|h| (&b.hash, *h.number())))
 		{
 			trace!(
-				target:"sync",
+				target:LOG_TARGET,
 				"Accepted {} blocks ({:?}) with origin {:?}",
 				new_blocks.len(),
 				h,
@@ -1538,7 +1235,8 @@ where
 			self.on_block_queued(h, n)
 		}
 		self.queue_blocks.extend(new_blocks.iter().map(|b| b.hash));
-		OnBlockData::Import(origin, new_blocks)
+
+		ImportBlocksAction { origin, blocks: new_blocks }
 	}
 
 	fn update_peer_common_number(&mut self, peer_id: &PeerId, new_common: NumberFor<B>) {
@@ -1553,7 +1251,7 @@ where
 	/// through all peers to update our view of their state as well.
 	fn on_block_queued(&mut self, hash: &B::Hash, number: NumberFor<B>) {
 		if self.fork_targets.remove(hash).is_some() {
-			trace!(target: "sync", "Completed fork sync {:?}", hash);
+			trace!(target: LOG_TARGET, "Completed fork sync {hash:?}");
 		}
 		if let Some(gap_sync) = &mut self.gap_sync {
 			if number > gap_sync.best_queued_number && number <= gap_sync.target {
@@ -1572,7 +1270,7 @@ where
 				let new_common_number =
 					if peer.best_number >= number { number } else { peer.best_number };
 				trace!(
-					target: "sync",
+					target: LOG_TARGET,
 					"Updating peer {} info, ours={}, common={}->{}, their best={}",
 					n,
 					number,
@@ -1586,215 +1284,40 @@ where
 		self.allowed_requests.set_all();
 	}
 
-	/// Checks if there is a slot for a block announce validation.
-	///
-	/// The total number and the number per peer of concurrent block announce validations
-	/// is capped.
-	///
-	/// Returns [`HasSlotForBlockAnnounceValidation`] to inform about the result.
-	///
-	/// # Note
-	///
-	/// It is *required* to call [`Self::peer_block_announce_validation_finished`] when the
-	/// validation is finished to clear the slot.
-	fn has_slot_for_block_announce_validation(
-		&mut self,
-		peer: &PeerId,
-	) -> HasSlotForBlockAnnounceValidation {
-		if self.block_announce_validation.len() >= MAX_CONCURRENT_BLOCK_ANNOUNCE_VALIDATIONS {
-			return HasSlotForBlockAnnounceValidation::TotalMaximumSlotsReached
-		}
-
-		match self.block_announce_validation_per_peer_stats.entry(*peer) {
-			Entry::Vacant(entry) => {
-				entry.insert(1);
-				HasSlotForBlockAnnounceValidation::Yes
-			},
-			Entry::Occupied(mut entry) => {
-				if *entry.get() < MAX_CONCURRENT_BLOCK_ANNOUNCE_VALIDATIONS_PER_PEER {
-					*entry.get_mut() += 1;
-					HasSlotForBlockAnnounceValidation::Yes
-				} else {
-					HasSlotForBlockAnnounceValidation::MaximumPeerSlotsReached
-				}
-			},
-		}
-	}
-
-	/// Should be called when a block announce validation is finished, to update the slots
-	/// of the peer that send the block announce.
-	fn peer_block_announce_validation_finished(
-		&mut self,
-		res: &PreValidateBlockAnnounce<B::Header>,
-	) {
-		let peer = match res {
-			PreValidateBlockAnnounce::Failure { who, .. } |
-			PreValidateBlockAnnounce::Process { who, .. } |
-			PreValidateBlockAnnounce::Error { who } => who,
-			PreValidateBlockAnnounce::Skip => return,
-		};
-
-		match self.block_announce_validation_per_peer_stats.entry(*peer) {
-			Entry::Vacant(_) => {
-				error!(
-					target: "sync",
-					"💔 Block announcement validation from peer {} finished for that no slot was allocated!",
-					peer,
-				);
-			},
-			Entry::Occupied(mut entry) => {
-				*entry.get_mut() = entry.get().saturating_sub(1);
-				if *entry.get() == 0 {
-					entry.remove();
-				}
-			},
-		}
-	}
-
-	/// This will finish processing of the block announcement.
-	fn finish_block_announce_validation(
-		&mut self,
-		pre_validation_result: PreValidateBlockAnnounce<B::Header>,
-	) -> PollBlockAnnounceValidation<B::Header> {
-		let (announce, is_best, who) = match pre_validation_result {
-			PreValidateBlockAnnounce::Failure { who, disconnect } => {
-				debug!(
-					target: "sync",
-					"Failed announce validation: {:?}, disconnect: {}",
-					who,
-					disconnect,
-				);
-				return PollBlockAnnounceValidation::Failure { who, disconnect }
-			},
-			PreValidateBlockAnnounce::Process { announce, is_new_best, who } =>
-				(announce, is_new_best, who),
-			PreValidateBlockAnnounce::Error { .. } | PreValidateBlockAnnounce::Skip => {
-				debug!(
-					target: "sync",
-					"Ignored announce validation",
-				);
-				return PollBlockAnnounceValidation::Skip
-			},
-		};
-
-		trace!(
-			target: "sync",
-			"Finished block announce validation: from {:?}: {:?}. local_best={}",
-			who,
-			announce.summary(),
-			is_best,
-		);
-
-		let number = *announce.header.number();
-		let hash = announce.header.hash();
-		let parent_status =
-			self.block_status(announce.header.parent_hash()).unwrap_or(BlockStatus::Unknown);
-		let known_parent = parent_status != BlockStatus::Unknown;
-		let ancient_parent = parent_status == BlockStatus::InChainPruned;
-
-		let known = self.is_known(&hash);
-		let peer = if let Some(peer) = self.peers.get_mut(&who) {
-			peer
-		} else {
-			error!(target: "sync", "💔 Called on_block_announce with a bad peer ID");
-			return PollBlockAnnounceValidation::Nothing { is_best, who, announce }
-		};
-
-		if let PeerSyncState::AncestorSearch { .. } = peer.state {
-			trace!(target: "sync", "Peer state is ancestor search.");
-			return PollBlockAnnounceValidation::Nothing { is_best, who, announce }
-		}
-
-		if is_best {
-			// update their best block
-			peer.best_number = number;
-			peer.best_hash = hash;
-		}
-
-		// If the announced block is the best they have and is not ahead of us, our common number
-		// is either one further ahead or it's the one they just announced, if we know about it.
-		if is_best {
-			if known && self.best_queued_number >= number {
-				self.update_peer_common_number(&who, number);
-			} else if announce.header.parent_hash() == &self.best_queued_hash ||
-				known_parent && self.best_queued_number >= number
-			{
-				self.update_peer_common_number(&who, number - One::one());
-			}
-		}
-		self.allowed_requests.add(&who);
-
-		// known block case
-		if known || self.is_already_downloading(&hash) {
-			trace!(target: "sync", "Known block announce from {}: {}", who, hash);
-			if let Some(target) = self.fork_targets.get_mut(&hash) {
-				target.peers.insert(who);
-			}
-			return PollBlockAnnounceValidation::Nothing { is_best, who, announce }
-		}
-
-		if ancient_parent {
-			trace!(
-				target: "sync",
-				"Ignored ancient block announced from {}: {} {:?}",
-				who,
-				hash,
-				announce.header,
-			);
-			return PollBlockAnnounceValidation::Nothing { is_best, who, announce }
-		}
-
-		if self.status().state == SyncState::Idle {
-			trace!(
-				target: "sync",
-				"Added sync target for block announced from {}: {} {:?}",
-				who,
-				hash,
-				announce.summary(),
-			);
-			self.fork_targets
-				.entry(hash)
-				.or_insert_with(|| ForkTarget {
-					number,
-					parent_hash: Some(*announce.header.parent_hash()),
-					peers: Default::default(),
-				})
-				.peers
-				.insert(who);
-		}
-
-		PollBlockAnnounceValidation::Nothing { is_best, who, announce }
-	}
-
 	/// Restart the sync process. This will reset all pending block requests and return an iterator
 	/// of new block requests to make to peers. Peers that were downloading finality data (i.e.
 	/// their state was `DownloadingJustification`) are unaffected and will stay in the same state.
-	fn restart(&mut self) -> impl Iterator<Item = Result<(PeerId, BlockRequest<B>), BadPeer>> + '_ {
+	fn restart(&mut self) -> impl Iterator<Item = Result<BlockRequestAction<B>, BadPeer>> + '_ {
 		self.blocks.clear();
 		if let Err(e) = self.reset_sync_start_point() {
-			warn!(target: "sync", "💔  Unable to restart sync: {}", e);
+			warn!(target: LOG_TARGET, "💔  Unable to restart sync: {e}");
 		}
 		self.allowed_requests.set_all();
-		debug!(target:"sync", "Restarted with {} ({})", self.best_queued_number, self.best_queued_hash);
+		debug!(
+			target: LOG_TARGET,
+			"Restarted with {} ({})",
+			self.best_queued_number,
+			self.best_queued_hash,
+		);
 		let old_peers = std::mem::take(&mut self.peers);
 
-		old_peers.into_iter().filter_map(move |(id, mut p)| {
+		old_peers.into_iter().filter_map(move |(peer_id, mut p)| {
 			// peers that were downloading justifications
 			// should be kept in that state.
 			if let PeerSyncState::DownloadingJustification(_) = p.state {
 				// We make sure our commmon number is at least something we have.
 				p.common_number = self.best_queued_number;
-				self.peers.insert(id, p);
+				self.peers.insert(peer_id, p);
 				return None
 			}
 
-			// since the request is not a justification, remove it from pending responses
-			self.pending_responses.remove(&id);
-
 			// handle peers that were in other states.
-			match self.new_peer(id, p.best_hash, p.best_number) {
-				Ok(None) => None,
-				Ok(Some(x)) => Some(Ok((id, x))),
+			match self.new_peer(peer_id, p.best_hash, p.best_number) {
+				// since the request is not a justification, remove it from pending responses
+				Ok(None) => Some(Ok(BlockRequestAction::RemoveStale { peer_id })),
+				// update the request if the new one is available
+				Ok(Some(request)) => Some(Ok(BlockRequestAction::SendRequest { peer_id, request })),
+				// this implies that we need to drop pending response from the peer
 				Err(e) => Some(Err(e)),
 			}
 		})
@@ -1806,14 +1329,14 @@ where
 		let info = self.client.info();
 		if matches!(self.mode, SyncMode::LightState { .. }) && info.finalized_state.is_some() {
 			warn!(
-				target: "sync",
+				target: LOG_TARGET,
 				"Can't use fast sync mode with a partially synced database. Reverting to full sync mode."
 			);
 			self.mode = SyncMode::Full;
 		}
 		if matches!(self.mode, SyncMode::Warp) && info.finalized_state.is_some() {
 			warn!(
-				target: "sync",
+				target: LOG_TARGET,
 				"Can't use warp sync mode with a partially synced database. Reverting to full sync mode."
 			);
 			self.mode = SyncMode::Full;
@@ -1828,25 +1351,30 @@ where
 			self.import_existing = true;
 			// Latest state is missing, start with the last finalized state or genesis instead.
 			if let Some((hash, number)) = info.finalized_state {
-				debug!(target: "sync", "Starting from finalized state #{}", number);
+				debug!(target: LOG_TARGET, "Starting from finalized state #{number}");
 				self.best_queued_hash = hash;
 				self.best_queued_number = number;
 			} else {
-				debug!(target: "sync", "Restarting from genesis");
+				debug!(target: LOG_TARGET, "Restarting from genesis");
 				self.best_queued_hash = Default::default();
 				self.best_queued_number = Zero::zero();
 			}
 		}
 
 		if let Some((start, end)) = info.block_gap {
-			debug!(target: "sync", "Starting gap sync #{} - #{}", start, end);
+			debug!(target: LOG_TARGET, "Starting gap sync #{start} - #{end}");
 			self.gap_sync = Some(GapSync {
 				best_queued_number: start - One::one(),
 				target: end,
 				blocks: BlockCollection::new(),
 			});
 		}
-		trace!(target: "sync", "Restarted sync at #{} ({:?})", self.best_queued_number, self.best_queued_hash);
+		trace!(
+			target: LOG_TARGET,
+			"Restarted sync at #{} ({:?})",
+			self.best_queued_number,
+			self.best_queued_hash,
+		);
 		Ok(())
 	}
 
@@ -1870,10 +1398,34 @@ where
 			.any(|(_, p)| p.state == PeerSyncState::DownloadingStale(*hash))
 	}
 
+	/// Is the peer know to the sync state machine?
+	pub fn is_peer_known(&self, peer_id: &PeerId) -> bool {
+		self.peers.contains_key(peer_id)
+	}
+
 	/// Get the set of downloaded blocks that are ready to be queued for import.
 	fn ready_blocks(&mut self) -> Vec<IncomingBlock<B>> {
+		let start_block = self.best_queued_number + One::one();
+
+		// Verify that the parent of the first available block is in the chain.
+		// If not, we are downloading from a fork. In this case, wait until
+		// the start block has a parent on chain.
+		let parent_on_chain =
+			self.blocks.first_ready_block_header(start_block).map_or(false, |hdr| {
+				std::matches!(
+					self.block_status(hdr.parent_hash()).unwrap_or(BlockStatus::Unknown),
+					BlockStatus::InChainWithState |
+						BlockStatus::InChainPruned |
+						BlockStatus::Queued
+				)
+			});
+
+		if !parent_on_chain {
+			return vec![]
+		}
+
 		self.blocks
-			.ready_blocks(self.best_queued_number + One::one())
+			.ready_blocks(start_block)
 			.into_iter()
 			.map(|block_data| {
 				let justifications = block_data
@@ -1896,6 +1448,15 @@ where
 			.collect()
 	}
 
+	/// Set warp sync target block externally in case we skip warp proof downloading.
+	pub fn set_warp_sync_target_block(&mut self, header: B::Header) {
+		if let Some(ref mut warp_sync) = self.warp_sync {
+			warp_sync.set_target_block(header);
+		} else {
+			self.warp_sync_target_block_header = Some(header);
+		}
+	}
+
 	/// Generate block request for downloading of the target block body during warp sync.
 	fn warp_target_block_request(&mut self) -> Option<(PeerId, BlockRequest<B>)> {
 		let sync = &self.warp_sync.as_ref()?;
@@ -1914,7 +1475,7 @@ where
 			// Find a random peer that has a block with the target number.
 			for (id, peer) in self.peers.iter_mut() {
 				if peer.state.is_available() && peer.best_number >= target_number {
-					trace!(target: "sync", "New warp target block request for {}", id);
+					trace!(target: LOG_TARGET, "New warp target block request for {id}");
 					peer.state = PeerSyncState::DownloadingWarpTargetBlock;
 					self.allowed_requests.clear();
 					return Some((*id, request))
@@ -1925,135 +1486,14 @@ where
 		None
 	}
 
-	/// Get config for the block announcement protocol
-	pub fn get_block_announce_proto_config(
-		protocol_id: ProtocolId,
-		fork_id: &Option<String>,
-		roles: Roles,
-		best_number: NumberFor<B>,
-		best_hash: B::Hash,
-		genesis_hash: B::Hash,
-	) -> NonDefaultSetConfig {
-		let block_announces_protocol = {
-			let genesis_hash = genesis_hash.as_ref();
-			if let Some(ref fork_id) = fork_id {
-				format!(
-					"/{}/{}/block-announces/1",
-					array_bytes::bytes2hex("", genesis_hash),
-					fork_id
-				)
-			} else {
-				format!("/{}/block-announces/1", array_bytes::bytes2hex("", genesis_hash))
-			}
-		};
-
-		NonDefaultSetConfig {
-			notifications_protocol: block_announces_protocol.into(),
-			fallback_names: iter::once(
-				format!("/{}/block-announces/1", protocol_id.as_ref()).into(),
-			)
-			.collect(),
-			max_notification_size: MAX_BLOCK_ANNOUNCE_SIZE,
-			handshake: Some(NotificationHandshake::new(BlockAnnouncesHandshake::<B>::build(
-				roles,
-				best_number,
-				best_hash,
-				genesis_hash,
-			))),
-			// NOTE: `set_config` will be ignored by `protocol.rs` as the block announcement
-			// protocol is still hardcoded into the peerset.
-			set_config: SetConfig {
-				in_peers: 0,
-				out_peers: 0,
-				reserved_nodes: Vec::new(),
-				non_reserved_mode: NonReservedPeerMode::Deny,
-			},
-		}
-	}
-
-	fn decode_block_response(response: &[u8]) -> Result<OpaqueBlockResponse, String> {
-		let response = schema::v1::BlockResponse::decode(response)
-			.map_err(|error| format!("Failed to decode block response: {error}"))?;
-
-		Ok(OpaqueBlockResponse(Box::new(response)))
-	}
-
-	fn decode_state_response(response: &[u8]) -> Result<OpaqueStateResponse, String> {
-		let response = StateResponse::decode(response)
-			.map_err(|error| format!("Failed to decode state response: {error}"))?;
-
-		Ok(OpaqueStateResponse(Box::new(response)))
-	}
-
-	fn send_state_request(&mut self, who: PeerId, request: OpaqueStateRequest) {
-		let (tx, rx) = oneshot::channel();
-
-		if self.peers.contains_key(&who) {
-			self.pending_responses
-				.insert(who, Box::pin(async move { (who, PeerRequest::State, rx.await) }));
-		}
-
-		match self.encode_state_request(&request) {
-			Ok(data) => {
-				self.network_service.start_request(
-					who,
-					self.state_request_protocol_name.clone(),
-					data,
-					tx,
-					IfDisconnected::ImmediateError,
-				);
-			},
-			Err(err) => {
-				log::warn!(
-					target: "sync",
-					"Failed to encode state request {:?}: {:?}",
-					request, err
-				);
-			},
-		}
-	}
-
-	fn send_warp_sync_request(&mut self, who: PeerId, request: WarpProofRequest<B>) {
-		let (tx, rx) = oneshot::channel();
-
-		if self.peers.contains_key(&who) {
-			self.pending_responses
-				.insert(who, Box::pin(async move { (who, PeerRequest::WarpProof, rx.await) }));
-		}
-
-		match &self.warp_sync_protocol_name {
-			Some(name) => self.network_service.start_request(
-				who,
-				name.clone(),
-				request.encode(),
-				tx,
-				IfDisconnected::ImmediateError,
-			),
-			None => {
-				log::warn!(
-					target: "sync",
-					"Trying to send warp sync request when no protocol is configured {:?}",
-					request,
-				);
-			},
-		}
-	}
-
-	fn on_block_response(
+	/// Process blocks received in a response.
+	#[must_use]
+	pub(crate) fn on_block_response(
 		&mut self,
 		peer_id: PeerId,
 		request: BlockRequest<B>,
-		response: OpaqueBlockResponse,
-	) -> Option<ImportResult<B>> {
-		let blocks = match self.block_response_into_blocks(&request, response) {
-			Ok(blocks) => blocks,
-			Err(err) => {
-				debug!(target: "sync", "Failed to decode block response from {}: {}", peer_id, err);
-				self.network_service.report_peer(peer_id, rep::BAD_MESSAGE);
-				return None
-			},
-		};
-
+		blocks: Vec<BlockData<B>>,
+	) -> OnBlockResponse<B> {
 		let block_response = BlockResponse::<B> { id: request.id, blocks };
 
 		let blocks_range = || match (
@@ -2068,7 +1508,7 @@ where
 			_ => Default::default(),
 		};
 		trace!(
-			target: "sync",
+			target: LOG_TARGET,
 			"BlockResponse {} from {} with {} blocks {}",
 			block_response.id,
 			peer_id,
@@ -2078,47 +1518,47 @@ where
 
 		if request.fields == BlockAttributes::JUSTIFICATION {
 			match self.on_block_justification(peer_id, block_response) {
-				Ok(OnBlockJustification::Nothing) => None,
-				Ok(OnBlockJustification::Import { peer, hash, number, justifications }) => {
-					self.import_justifications(peer, hash, number, justifications);
-					None
-				},
+				Ok(OnBlockJustification::Nothing) => OnBlockResponse::Nothing,
+				Ok(OnBlockJustification::Import { peer_id, hash, number, justifications }) =>
+					OnBlockResponse::ImportJustifications(ImportJustificationsAction {
+						peer_id,
+						hash,
+						number,
+						justifications,
+					}),
 				Err(BadPeer(id, repu)) => {
 					self.network_service
 						.disconnect_peer(id, self.block_announce_protocol_name.clone());
 					self.network_service.report_peer(id, repu);
-					None
+					OnBlockResponse::Nothing
 				},
 			}
 		} else {
 			match self.on_block_data(&peer_id, Some(request), block_response) {
-				Ok(OnBlockData::Import(origin, blocks)) => {
-					self.import_blocks(origin, blocks);
-					None
-				},
-				Ok(OnBlockData::Request(peer, req)) => {
-					self.send_block_request(peer, req);
-					None
-				},
-				Ok(OnBlockData::Continue) => None,
+				Ok(OnBlockData::Import(action)) => OnBlockResponse::ImportBlocks(action),
+				Ok(OnBlockData::Request(peer_id, request)) =>
+					OnBlockResponse::SendBlockRequest { peer_id, request },
+				Ok(OnBlockData::Continue) => OnBlockResponse::Nothing,
 				Err(BadPeer(id, repu)) => {
 					self.network_service
 						.disconnect_peer(id, self.block_announce_protocol_name.clone());
 					self.network_service.report_peer(id, repu);
-					None
+					OnBlockResponse::Nothing
 				},
 			}
 		}
 	}
 
+	/// Process state received in a response.
+	#[must_use]
 	pub fn on_state_response(
 		&mut self,
 		peer_id: PeerId,
 		response: OpaqueStateResponse,
-	) -> Option<ImportResult<B>> {
+	) -> Option<ImportBlocksAction<B>> {
 		match self.on_state_data(&peer_id, response) {
 			Ok(OnStateData::Import(origin, block)) =>
-				Some(ImportResult::BlockImport(origin, vec![block])),
+				Some(ImportBlocksAction { origin, blocks: vec![block] }),
 			Ok(OnStateData::Continue) => None,
 			Err(BadPeer(id, repu)) => {
 				self.network_service
@@ -2137,183 +1577,10 @@ where
 		}
 	}
 
-	fn process_outbound_requests(&mut self) {
-		for (id, request) in self.block_requests() {
-			self.send_block_request(id, request);
-		}
-
-		if let Some((id, request)) = self.state_request() {
-			self.send_state_request(id, request);
-		}
-
-		for (id, request) in self.justification_requests().collect::<Vec<_>>() {
-			self.send_block_request(id, request);
-		}
-
-		if let Some((id, request)) = self.warp_sync_request() {
-			self.send_warp_sync_request(id, request);
-		}
-	}
-
-	fn poll_pending_responses(&mut self, cx: &mut std::task::Context) -> Poll<ImportResult<B>> {
-		let ready_responses = self
-			.pending_responses
-			.values_mut()
-			.filter_map(|future| match future.poll_unpin(cx) {
-				Poll::Pending => None,
-				Poll::Ready(result) => Some(result),
-			})
-			.collect::<Vec<_>>();
-
-		for (id, request, response) in ready_responses {
-			self.pending_responses
-				.remove(&id)
-				.expect("Logic error: peer id from pending response is missing in the map.");
-
-			match response {
-				Ok(Ok(resp)) => match request {
-					PeerRequest::Block(req) => {
-						let response = match Self::decode_block_response(&resp[..]) {
-							Ok(proto) => proto,
-							Err(e) => {
-								debug!(
-									target: "sync",
-									"Failed to decode block response from peer {:?}: {:?}.",
-									id,
-									e
-								);
-								self.network_service.report_peer(id, rep::BAD_MESSAGE);
-								self.network_service
-									.disconnect_peer(id, self.block_announce_protocol_name.clone());
-								continue
-							},
-						};
-
-						if let Some(import) = self.on_block_response(id, req, response) {
-							return Poll::Ready(import)
-						}
-					},
-					PeerRequest::State => {
-						let response = match Self::decode_state_response(&resp[..]) {
-							Ok(proto) => proto,
-							Err(e) => {
-								debug!(
-									target: "sync",
-									"Failed to decode state response from peer {:?}: {:?}.",
-									id,
-									e
-								);
-								self.network_service.report_peer(id, rep::BAD_MESSAGE);
-								self.network_service
-									.disconnect_peer(id, self.block_announce_protocol_name.clone());
-								continue
-							},
-						};
-
-						if let Some(import) = self.on_state_response(id, response) {
-							return Poll::Ready(import)
-						}
-					},
-					PeerRequest::WarpProof => {
-						self.on_warp_sync_response(id, EncodedProof(resp));
-					},
-				},
-				Ok(Err(e)) => {
-					debug!(target: "sync", "Request to peer {:?} failed: {:?}.", id, e);
-
-					match e {
-						RequestFailure::Network(OutboundFailure::Timeout) => {
-							self.network_service.report_peer(id, rep::TIMEOUT);
-							self.network_service
-								.disconnect_peer(id, self.block_announce_protocol_name.clone());
-						},
-						RequestFailure::Network(OutboundFailure::UnsupportedProtocols) => {
-							self.network_service.report_peer(id, rep::BAD_PROTOCOL);
-							self.network_service
-								.disconnect_peer(id, self.block_announce_protocol_name.clone());
-						},
-						RequestFailure::Network(OutboundFailure::DialFailure) => {
-							self.network_service
-								.disconnect_peer(id, self.block_announce_protocol_name.clone());
-						},
-						RequestFailure::Refused => {
-							self.network_service.report_peer(id, rep::REFUSED);
-							self.network_service
-								.disconnect_peer(id, self.block_announce_protocol_name.clone());
-						},
-						RequestFailure::Network(OutboundFailure::ConnectionClosed) |
-						RequestFailure::NotConnected => {
-							self.network_service
-								.disconnect_peer(id, self.block_announce_protocol_name.clone());
-						},
-						RequestFailure::UnknownProtocol => {
-							debug_assert!(false, "Block request protocol should always be known.");
-						},
-						RequestFailure::Obsolete => {
-							debug_assert!(
-								false,
-								"Can not receive `RequestFailure::Obsolete` after dropping the \
-								 response receiver.",
-							);
-						},
-					}
-				},
-				Err(oneshot::Canceled) => {
-					trace!(
-						target: "sync",
-						"Request to peer {:?} failed due to oneshot being canceled.",
-						id,
-					);
-					self.network_service
-						.disconnect_peer(id, self.block_announce_protocol_name.clone());
-				},
-			}
-		}
-
-		Poll::Pending
-	}
-
-	/// Create implementation-specific block request.
-	fn create_opaque_block_request(&self, request: &BlockRequest<B>) -> OpaqueBlockRequest {
-		OpaqueBlockRequest(Box::new(schema::v1::BlockRequest {
-			fields: request.fields.to_be_u32(),
-			from_block: match request.from {
-				FromBlock::Hash(h) => Some(schema::v1::block_request::FromBlock::Hash(h.encode())),
-				FromBlock::Number(n) =>
-					Some(schema::v1::block_request::FromBlock::Number(n.encode())),
-			},
-			direction: request.direction as i32,
-			max_blocks: request.max.unwrap_or(0),
-			support_multiple_justifications: true,
-		}))
-	}
-
-	fn encode_block_request(&self, request: &OpaqueBlockRequest) -> Result<Vec<u8>, String> {
-		let request: &schema::v1::BlockRequest = request.0.downcast_ref().ok_or_else(|| {
-			"Failed to downcast opaque block response during encoding, this is an \
-				implementation bug."
-				.to_string()
-		})?;
-
-		Ok(request.encode_to_vec())
-	}
-
-	fn encode_state_request(&self, request: &OpaqueStateRequest) -> Result<Vec<u8>, String> {
-		let request: &StateRequest = request.0.downcast_ref().ok_or_else(|| {
-			"Failed to downcast opaque state response during encoding, this is an \
-				implementation bug."
-				.to_string()
-		})?;
-
-		Ok(request.encode_to_vec())
-	}
-
-	fn justification_requests<'a>(
-		&'a mut self,
-	) -> Box<dyn Iterator<Item = (PeerId, BlockRequest<B>)> + 'a> {
+	fn justification_requests(&mut self) -> Vec<(PeerId, BlockRequest<B>)> {
 		let peers = &mut self.peers;
 		let mut matcher = self.extra_justifications.matcher();
-		Box::new(std::iter::from_fn(move || {
+		std::iter::from_fn(move || {
 			if let Some((peer, request)) = matcher.next(peers) {
 				peers
 					.get_mut(&peer)
@@ -2332,7 +1599,8 @@ where
 			} else {
 				None
 			}
-		}))
+		})
+		.collect()
 	}
 
 	fn block_requests(&mut self) -> Vec<(PeerId, BlockRequest<B>)> {
@@ -2347,7 +1615,7 @@ where
 		}
 
 		if self.queue_blocks.len() > MAX_IMPORTING_BLOCKS {
-			trace!(target: "sync", "Too many blocks in the queue.");
+			trace!(target: LOG_TARGET, "Too many blocks in the queue.");
 			return Vec::new()
 		}
 		let is_major_syncing = self.status().state.is_major_syncing();
@@ -2382,7 +1650,7 @@ where
 					queue.len() <= MAJOR_SYNC_BLOCKS.into()
 				{
 					trace!(
-						target: "sync",
+						target: LOG_TARGET,
 						"Peer {:?} common block {} too far behind of our best {}. Starting ancestry search.",
 						id,
 						peer.common_number,
@@ -2407,7 +1675,7 @@ where
 				) {
 					peer.state = PeerSyncState::DownloadingNew(range.start);
 					trace!(
-						target: "sync",
+						target: LOG_TARGET,
 						"New block request for {}, (best:{}, common:{}) {:?}",
 						id,
 						peer.best_number,
@@ -2430,7 +1698,7 @@ where
 					},
 					max_blocks_per_request,
 				) {
-					trace!(target: "sync", "Downloading fork {:?} from {}", hash, id);
+					trace!(target: LOG_TARGET, "Downloading fork {hash:?} from {id}");
 					peer.state = PeerSyncState::DownloadingStale(hash);
 					Some((id, req))
 				} else if let Some((range, req)) = gap_sync.as_mut().and_then(|sync| {
@@ -2446,7 +1714,7 @@ where
 				}) {
 					peer.state = PeerSyncState::DownloadingGap(range.start);
 					trace!(
-						target: "sync",
+						target: LOG_TARGET,
 						"New gap block request for {}, (best:{}, common:{}) {:?}",
 						id,
 						peer.best_number,
@@ -2459,7 +1727,6 @@ where
 				}
 			})
 			.collect()
-		// Box::new(iter)
 	}
 
 	fn state_request(&mut self) -> Option<(PeerId, OpaqueStateRequest)> {
@@ -2481,7 +1748,7 @@ where
 				if peer.state.is_available() && peer.common_number >= sync.target_block_num() {
 					peer.state = PeerSyncState::DownloadingState;
 					let request = sync.next_request();
-					trace!(target: "sync", "New StateRequest for {}: {:?}", id, request);
+					trace!(target: LOG_TARGET, "New StateRequest for {}: {:?}", id, request);
 					self.allowed_requests.clear();
 					return Some((*id, OpaqueStateRequest(Box::new(request))))
 				}
@@ -2496,7 +1763,7 @@ where
 			{
 				for (id, peer) in self.peers.iter_mut() {
 					if peer.state.is_available() && peer.best_number >= target {
-						trace!(target: "sync", "New StateRequest for {}: {:?}", id, request);
+						trace!(target: LOG_TARGET, "New StateRequest for {id}: {request:?}");
 						peer.state = PeerSyncState::DownloadingState;
 						self.allowed_requests.clear();
 						return Some((*id, OpaqueStateRequest(Box::new(request))))
@@ -2526,7 +1793,7 @@ where
 					// Find a random peer that is synced as much as peer majority.
 					for (id, peer) in self.peers.iter_mut() {
 						if peer.state.is_available() && peer.best_number >= median {
-							trace!(target: "sync", "New WarpProofRequest for {}", id);
+							trace!(target: LOG_TARGET, "New WarpProofRequest for {id}");
 							peer.state = PeerSyncState::DownloadingWarpProof;
 							self.allowed_requests.clear();
 							return Some((*id, request))
@@ -2545,7 +1812,7 @@ where
 	) -> Result<OnStateData<B>, BadPeer> {
 		let response: Box<StateResponse> = response.0.downcast().map_err(|_error| {
 			error!(
-				target: "sync",
+				target: LOG_TARGET,
 				"Failed to downcast opaque state response, this is an implementation bug."
 			);
 
@@ -2560,7 +1827,7 @@ where
 		}
 		let import_result = if let Some(sync) = &mut self.state_sync {
 			debug!(
-				target: "sync",
+				target: LOG_TARGET,
 				"Importing state data from {} with {} keys, {} proof nodes.",
 				who,
 				response.entries.len(),
@@ -2569,7 +1836,7 @@ where
 			sync.import(*response)
 		} else if let Some(sync) = &mut self.warp_sync {
 			debug!(
-				target: "sync",
+				target: LOG_TARGET,
 				"Importing state data from {} with {} keys, {} proof nodes.",
 				who,
 				response.entries.len(),
@@ -2577,7 +1844,7 @@ where
 			);
 			sync.import_state(*response)
 		} else {
-			debug!(target: "sync", "Ignored obsolete state response from {}", who);
+			debug!(target: LOG_TARGET, "Ignored obsolete state response from {who}");
 			return Err(BadPeer(*who, rep::NOT_REQUESTED))
 		};
 
@@ -2596,12 +1863,12 @@ where
 					skip_execution: self.skip_execution(),
 					state: Some(state),
 				};
-				debug!(target: "sync", "State download is complete. Import is queued");
+				debug!(target: LOG_TARGET, "State download is complete. Import is queued");
 				Ok(OnStateData::Import(origin, block))
 			},
 			state::ImportResult::Continue => Ok(OnStateData::Continue),
 			state::ImportResult::BadResponse => {
-				debug!(target: "sync", "Bad state data received from {}", who);
+				debug!(target: LOG_TARGET, "Bad state data received from {who}");
 				Err(BadPeer(*who, rep::BAD_BLOCK))
 			},
 		}
@@ -2616,59 +1883,39 @@ where
 		}
 		let import_result = if let Some(sync) = &mut self.warp_sync {
 			debug!(
-				target: "sync",
+				target: LOG_TARGET,
 				"Importing warp proof data from {}, {} bytes.",
 				who,
 				response.0.len(),
 			);
 			sync.import_warp_proof(response)
 		} else {
-			debug!(target: "sync", "Ignored obsolete warp sync response from {}", who);
+			debug!(target: LOG_TARGET, "Ignored obsolete warp sync response from {who}");
 			return Err(BadPeer(*who, rep::NOT_REQUESTED))
 		};
 
 		match import_result {
 			WarpProofImportResult::Success => Ok(()),
 			WarpProofImportResult::BadResponse => {
-				debug!(target: "sync", "Bad proof data received from {}", who);
-				Err(BadPeer(*who, rep::BAD_BLOCK))
-			},
-		}
-	}
-
-	fn import_blocks(&mut self, origin: BlockOrigin, blocks: Vec<IncomingBlock<B>>) {
-		if let Some(metrics) = &self.metrics {
-			metrics.import_queue_blocks_submitted.inc();
-		}
-
-		self.import_queue.import_blocks(origin, blocks);
-	}
-
-	fn import_justifications(
-		&mut self,
-		peer: PeerId,
-		hash: B::Hash,
-		number: NumberFor<B>,
-		justifications: Justifications,
-	) {
-		if let Some(metrics) = &self.metrics {
-			metrics.import_queue_justifications_submitted.inc();
+				debug!(target: LOG_TARGET, "Bad proof data received from {who}");
+				Err(BadPeer(*who, rep::BAD_BLOCK))
+			},
 		}
-
-		self.import_queue.import_justifications(peer, hash, number, justifications);
 	}
 
 	/// A batch of blocks have been processed, with or without errors.
 	///
 	/// Call this when a batch of blocks have been processed by the import
-	/// queue, with or without errors.
+	/// queue, with or without errors. If an error is returned, the pending response
+	/// from the peer must be dropped.
+	#[must_use]
 	fn on_blocks_processed(
 		&mut self,
 		imported: usize,
 		count: usize,
 		results: Vec<(Result<BlockImportStatus<NumberFor<B>>, BlockImportError>, B::Hash)>,
-	) -> Box<dyn Iterator<Item = Result<(PeerId, BlockRequest<B>), BadPeer>>> {
-		trace!(target: "sync", "Imported {} of {}", imported, count);
+	) -> Box<dyn Iterator<Item = Result<BlockRequestAction<B>, BadPeer>>> {
+		trace!(target: LOG_TARGET, "Imported {imported} of {count}");
 
 		let mut output = Vec::new();
 
@@ -2695,7 +1942,7 @@ where
 				Ok(BlockImportStatus::ImportedUnknown(number, aux, who)) => {
 					if aux.clear_justification_requests {
 						trace!(
-							target: "sync",
+							target: LOG_TARGET,
 							"Block imported clears all pending justification requests {number}: {hash:?}",
 						);
 						self.clear_justification_requests();
@@ -2703,7 +1950,7 @@ where
 
 					if aux.needs_justification {
 						trace!(
-							target: "sync",
+							target: LOG_TARGET,
 							"Block imported but requires justification {number}: {hash:?}",
 						);
 						self.request_justification(&hash, number);
@@ -2723,7 +1970,7 @@ where
 						self.state_sync.as_ref().map_or(false, |s| s.target() == hash);
 					if state_sync_complete {
 						info!(
-							target: "sync",
+							target: LOG_TARGET,
 							"State sync is complete ({} MiB), restarting block sync.",
 							self.state_sync.as_ref().map_or(0, |s| s.progress().size / (1024 * 1024)),
 						);
@@ -2737,7 +1984,7 @@ where
 						.map_or(false, |s| s.target_block_hash() == Some(hash));
 					if warp_sync_complete {
 						info!(
-							target: "sync",
+							target: LOG_TARGET,
 							"Warp sync is complete ({} MiB), restarting block sync.",
 							self.warp_sync.as_ref().map_or(0, |s| s.progress().total_bytes / (1024 * 1024)),
 						);
@@ -2749,7 +1996,7 @@ where
 						self.gap_sync.as_ref().map_or(false, |s| s.target == number);
 					if gap_sync_complete {
 						info!(
-							target: "sync",
+							target: LOG_TARGET,
 							"Block history download is complete."
 						);
 						self.gap_sync = None;
@@ -2758,7 +2005,7 @@ where
 				Err(BlockImportError::IncompleteHeader(who)) =>
 					if let Some(peer) = who {
 						warn!(
-							target: "sync",
+							target: LOG_TARGET,
 							"💔 Peer sent block with incomplete header to import",
 						);
 						output.push(Err(BadPeer(peer, rep::INCOMPLETE_HEADER)));
@@ -2769,7 +2016,7 @@ where
 						who.map_or_else(|| "".into(), |peer| format!(" received from ({peer})"));
 
 					warn!(
-						target: "sync",
+						target: LOG_TARGET,
 						"💔 Verification failed for block {hash:?}{extra_message}: {e:?}",
 					);
 
@@ -2782,7 +2029,7 @@ where
 				Err(BlockImportError::BadBlock(who)) =>
 					if let Some(peer) = who {
 						warn!(
-							target: "sync",
+							target: LOG_TARGET,
 							"💔 Block {hash:?} received from peer {peer} has been blacklisted",
 						);
 						output.push(Err(BadPeer(peer, rep::BAD_BLOCK)));
@@ -2791,10 +2038,10 @@ where
 					// This may happen if the chain we were requesting upon has been discarded
 					// in the meantime because other chain has been finalized.
 					// Don't mark it as bad as it still may be synced if explicitly requested.
-					trace!(target: "sync", "Obsolete block {hash:?}");
+					trace!(target: LOG_TARGET, "Obsolete block {hash:?}");
 				},
 				e @ Err(BlockImportError::UnknownParent) | e @ Err(BlockImportError::Other(_)) => {
-					warn!(target: "sync", "💔 Error importing block {hash:?}: {}", e.unwrap_err());
+					warn!(target: LOG_TARGET, "💔 Error importing block {hash:?}: {}", e.unwrap_err());
 					self.state_sync = None;
 					self.warp_sync = None;
 					output.extend(self.restart());
@@ -2914,7 +2161,7 @@ fn peer_block_request<B: BlockT>(
 		return None
 	} else if peer.common_number < finalized {
 		trace!(
-			target: "sync",
+			target: LOG_TARGET,
 			"Requesting pre-finalized chain from {:?}, common={}, finalized={}, peer best={}, our best={}",
 			id, peer.common_number, finalized, peer.best_number, best_num,
 		);
@@ -2993,11 +2240,21 @@ fn fork_sync_request<B: BlockT>(
 ) -> Option<(B::Hash, BlockRequest<B>)> {
 	targets.retain(|hash, r| {
 		if r.number <= finalized {
-			trace!(target: "sync", "Removed expired fork sync request {:?} (#{})", hash, r.number);
+			trace!(
+				target: LOG_TARGET,
+				"Removed expired fork sync request {:?} (#{})",
+				hash,
+				r.number,
+			);
 			return false
 		}
 		if check_block(hash) != BlockStatus::Unknown {
-			trace!(target: "sync", "Removed obsolete fork sync request {:?} (#{})", hash, r.number);
+			trace!(
+				target: LOG_TARGET,
+				"Removed obsolete fork sync request {:?} (#{})",
+				hash,
+				r.number,
+			);
 			return false
 		}
 		true
@@ -3018,7 +2275,10 @@ fn fork_sync_request<B: BlockT>(
 				// request only single block
 				1
 			};
-			trace!(target: "sync", "Downloading requested fork {:?} from {}, {} blocks", hash, id, count);
+			trace!(
+				target: LOG_TARGET,
+				"Downloading requested fork {hash:?} from {id}, {count} blocks",
+			);
 			return Some((
 				*hash,
 				BlockRequest::<B> {
@@ -3030,7 +2290,7 @@ fn fork_sync_request<B: BlockT>(
 				},
 			))
 		} else {
-			trace!(target: "sync", "Fork too far in the future: {:?} (#{})", hash, r.number);
+			trace!(target: LOG_TARGET, "Fork too far in the future: {:?} (#{})", hash, r.number);
 		}
 	}
 	None
@@ -3067,7 +2327,7 @@ fn validate_blocks<Block: BlockT>(
 	if let Some(request) = request {
 		if Some(blocks.len() as _) > request.max {
 			debug!(
-				target: "sync",
+				target: LOG_TARGET,
 				"Received more blocks than requested from {}. Expected in maximum {:?}, got {}.",
 				who,
 				request.max,
@@ -3088,7 +2348,7 @@ fn validate_blocks<Block: BlockT>(
 
 		if !expected_block {
 			debug!(
-				target: "sync",
+				target: LOG_TARGET,
 				"Received block that was not requested. Requested {:?}, got {:?}.",
 				request.from,
 				block_header,
@@ -3101,9 +2361,8 @@ fn validate_blocks<Block: BlockT>(
 			blocks.iter().any(|b| b.header.is_none())
 		{
 			trace!(
-				target: "sync",
-				"Missing requested header for a block in response from {}.",
-				who,
+				target: LOG_TARGET,
+				"Missing requested header for a block in response from {who}.",
 			);
 
 			return Err(BadPeer(*who, rep::BAD_RESPONSE))
@@ -3112,9 +2371,8 @@ fn validate_blocks<Block: BlockT>(
 		if request.fields.contains(BlockAttributes::BODY) && blocks.iter().any(|b| b.body.is_none())
 		{
 			trace!(
-				target: "sync",
-				"Missing requested body for a block in response from {}.",
-				who,
+				target: LOG_TARGET,
+				"Missing requested body for a block in response from {who}.",
 			);
 
 			return Err(BadPeer(*who, rep::BAD_RESPONSE))
@@ -3126,7 +2384,7 @@ fn validate_blocks<Block: BlockT>(
 			let hash = header.hash();
 			if hash != b.hash {
 				debug!(
-					target:"sync",
+					target:LOG_TARGET,
 					"Bad header received from {}. Expected hash {:?}, got {:?}",
 					who,
 					b.hash,
@@ -3143,7 +2401,7 @@ fn validate_blocks<Block: BlockT>(
 			);
 			if expected != got {
 				debug!(
-					target:"sync",
+					target:LOG_TARGET,
 					"Bad extrinsic root for a block {} received from {}. Expected {:?}, got {:?}",
 					b.hash,
 					who,
@@ -3162,14 +2420,10 @@ fn validate_blocks<Block: BlockT>(
 mod test {
 	use super::*;
 	use crate::service::network::NetworkServiceProvider;
-	use futures::{executor::block_on, future::poll_fn};
+	use futures::executor::block_on;
 	use sc_block_builder::BlockBuilderProvider;
-	use sc_network_common::{
-		role::Role,
-		sync::message::{BlockData, BlockState, FromBlock},
-	};
+	use sc_network_common::sync::message::{BlockAnnounce, BlockData, BlockState, FromBlock};
 	use sp_blockchain::HeaderBackend;
-	use sp_consensus::block_validation::DefaultBlockAnnounceValidator;
 	use substrate_test_runtime_client::{
 		runtime::{Block, Hash, Header},
 		BlockBuilderExt, ClientBlockImportExt, ClientExt, DefaultTestClientBuilderExt, TestClient,
@@ -3183,28 +2437,18 @@ mod test {
 		// internally we should process the response as the justification not being available.
 
 		let client = Arc::new(TestClientBuilder::new().build());
-		let block_announce_validator = Box::new(DefaultBlockAnnounceValidator);
 		let peer_id = PeerId::random();
 
-		let import_queue = Box::new(sc_consensus::import_queue::mock::MockImportQueueHandle::new());
 		let (_chain_sync_network_provider, chain_sync_network_handle) =
 			NetworkServiceProvider::new();
-		let (mut sync, _) = ChainSync::new(
+		let mut sync = ChainSync::new(
 			SyncMode::Full,
 			client.clone(),
-			ProtocolId::from("test-protocol-name"),
-			&Some(String::from("test-fork-id")),
-			Roles::from(&Role::Full),
-			block_announce_validator,
+			ProtocolName::from("test-block-announce-protocol"),
 			1,
 			64,
 			None,
-			None,
 			chain_sync_network_handle,
-			import_queue,
-			ProtocolName::from("block-request"),
-			ProtocolName::from("state-request"),
-			None,
 		)
 		.unwrap();
 
@@ -3222,7 +2466,8 @@ mod test {
 		// the justification request should be scheduled to that peer
 		assert!(sync
 			.justification_requests()
-			.any(|(who, request)| { who == peer_id && request.from == FromBlock::Hash(a1_hash) }));
+			.iter()
+			.any(|(who, request)| { *who == peer_id && request.from == FromBlock::Hash(a1_hash) }));
 
 		// there are no extra pending requests
 		assert_eq!(sync.extra_justifications.pending_requests().count(), 0);
@@ -3252,26 +2497,17 @@ mod test {
 	#[test]
 	fn restart_doesnt_affect_peers_downloading_finality_data() {
 		let mut client = Arc::new(TestClientBuilder::new().build());
-		let import_queue = Box::new(sc_consensus::import_queue::mock::MockImportQueueHandle::new());
 		let (_chain_sync_network_provider, chain_sync_network_handle) =
 			NetworkServiceProvider::new();
 
-		let (mut sync, _) = ChainSync::new(
+		let mut sync = ChainSync::new(
 			SyncMode::Full,
 			client.clone(),
-			ProtocolId::from("test-protocol-name"),
-			&Some(String::from("test-fork-id")),
-			Roles::from(&Role::Full),
-			Box::new(DefaultBlockAnnounceValidator),
+			ProtocolName::from("test-block-announce-protocol"),
 			1,
 			64,
 			None,
-			None,
 			chain_sync_network_handle,
-			import_queue,
-			ProtocolName::from("block-request"),
-			ProtocolName::from("state-request"),
-			None,
 		)
 		.unwrap();
 
@@ -3310,8 +2546,8 @@ mod test {
 
 		// the justification request should be scheduled to the
 		// new peer which is at the given block
-		assert!(sync.justification_requests().any(|(p, r)| {
-			p == peer_id3 &&
+		assert!(sync.justification_requests().iter().any(|(p, r)| {
+			*p == peer_id3 &&
 				r.fields == BlockAttributes::JUSTIFICATION &&
 				r.from == FromBlock::Hash(b1_hash)
 		}));
@@ -3325,9 +2561,11 @@ mod test {
 		let block_requests = sync.restart();
 
 		// which should make us send out block requests to the first two peers
-		assert!(block_requests
-			.map(|r| r.unwrap())
-			.all(|(p, _)| { p == peer_id1 || p == peer_id2 }));
+		assert!(block_requests.map(|r| r.unwrap()).all(|event| match event {
+			BlockRequestAction::SendRequest { peer_id, .. } =>
+				peer_id == peer_id1 || peer_id == peer_id2,
+			BlockRequestAction::RemoveStale { .. } => false,
+		}));
 
 		// peer 3 should be unaffected it was downloading finality data
 		assert_eq!(
@@ -3344,23 +2582,16 @@ mod test {
 	/// Send a block annoucnement for the given `header`.
 	fn send_block_announce(
 		header: Header,
-		peer_id: &PeerId,
+		peer_id: PeerId,
 		sync: &mut ChainSync<Block, TestClient>,
 	) {
-		let block_annnounce = BlockAnnounce {
+		let announce = BlockAnnounce {
 			header: header.clone(),
 			state: Some(BlockState::Best),
 			data: Some(Vec::new()),
 		};
 
-		sync.push_block_announce_validation(*peer_id, header.hash(), block_annnounce, true);
-
-		// Poll until we have procssed the block announcement
-		block_on(poll_fn(|cx| loop {
-			if sync.poll_block_announce_validation(cx).is_pending() {
-				break Poll::Ready(())
-			}
-		}))
+		sync.on_validated_block_announce(true, peer_id, &announce);
 	}
 
 	/// Create a block response from the given `blocks`.
@@ -3392,7 +2623,7 @@ mod test {
 	) -> BlockRequest<Block> {
 		let requests = sync.block_requests();
 
-		log::trace!(target: "sync", "Requests: {:?}", requests);
+		log::trace!(target: LOG_TARGET, "Requests: {requests:?}");
 
 		assert_eq!(1, requests.len());
 		assert_eq!(*peer, requests[0].0);
@@ -3434,26 +2665,17 @@ mod test {
 		sp_tracing::try_init_simple();
 
 		let mut client = Arc::new(TestClientBuilder::new().build());
-		let import_queue = Box::new(sc_consensus::import_queue::mock::MockImportQueueHandle::new());
 		let (_chain_sync_network_provider, chain_sync_network_handle) =
 			NetworkServiceProvider::new();
 
-		let (mut sync, _) = ChainSync::new(
+		let mut sync = ChainSync::new(
 			SyncMode::Full,
 			client.clone(),
-			ProtocolId::from("test-protocol-name"),
-			&Some(String::from("test-fork-id")),
-			Roles::from(&Role::Full),
-			Box::new(DefaultBlockAnnounceValidator),
+			ProtocolName::from("test-block-announce-protocol"),
 			5,
 			64,
 			None,
-			None,
 			chain_sync_network_handle,
-			import_queue,
-			ProtocolName::from("block-request"),
-			ProtocolName::from("state-request"),
-			None,
 		)
 		.unwrap();
 
@@ -3491,7 +2713,7 @@ mod test {
 		assert!(sync.block_requests().is_empty());
 
 		// Let peer2 announce a fork of block 3
-		send_block_announce(block3_fork.header().clone(), &peer_id2, &mut sync);
+		send_block_announce(block3_fork.header().clone(), peer_id2, &mut sync);
 
 		// Import and tell sync that we now have the fork.
 		block_on(client.import(BlockOrigin::Own, block3_fork.clone())).unwrap();
@@ -3500,13 +2722,13 @@ mod test {
 		let block4 = build_block_at(block3_fork.hash(), false);
 
 		// Let peer2 announce block 4 and check that sync wants to get the block.
-		send_block_announce(block4.header().clone(), &peer_id2, &mut sync);
+		send_block_announce(block4.header().clone(), peer_id2, &mut sync);
 
 		let request = get_block_request(&mut sync, FromBlock::Hash(block4.hash()), 2, &peer_id2);
 
 		// Peer1 announces the same block, but as the common block is still `1`, sync will request
 		// block 2 again.
-		send_block_announce(block4.header().clone(), &peer_id1, &mut sync);
+		send_block_announce(block4.header().clone(), peer_id1, &mut sync);
 
 		let request2 = get_block_request(&mut sync, FromBlock::Number(2), 1, &peer_id1);
 
@@ -3515,7 +2737,9 @@ mod test {
 
 		// We should not yet import the blocks, because there is still an open request for fetching
 		// block `2` which blocks the import.
-		assert!(matches!(res, OnBlockData::Import(_, blocks) if blocks.is_empty()));
+		assert!(
+			matches!(res, OnBlockData::Import(ImportBlocksAction{ origin: _, blocks }) if blocks.is_empty())
+		);
 
 		let request3 = get_block_request(&mut sync, FromBlock::Number(2), 1, &peer_id2);
 
@@ -3523,14 +2747,16 @@ mod test {
 		let res = sync.on_block_data(&peer_id1, Some(request2), response).unwrap();
 		assert!(matches!(
 			res,
-			OnBlockData::Import(_, blocks)
+			OnBlockData::Import(ImportBlocksAction{ origin: _, blocks })
 				if blocks.iter().all(|b| [2, 3, 4].contains(b.header.as_ref().unwrap().number()))
 		));
 
 		let response = create_block_response(vec![block2.clone()]);
 		let res = sync.on_block_data(&peer_id2, Some(request3), response).unwrap();
 		// Nothing to import
-		assert!(matches!(res, OnBlockData::Import(_, blocks) if blocks.is_empty()));
+		assert!(
+			matches!(res, OnBlockData::Import(ImportBlocksAction{ origin: _, blocks }) if blocks.is_empty())
+		);
 	}
 
 	fn unwrap_from_block_number(from: FromBlock<Hash, u64>) -> u64 {
@@ -3560,27 +2786,18 @@ mod test {
 		};
 
 		let mut client = Arc::new(TestClientBuilder::new().build());
-		let import_queue = Box::new(sc_consensus::import_queue::mock::MockImportQueueHandle::new());
 		let (_chain_sync_network_provider, chain_sync_network_handle) =
 			NetworkServiceProvider::new();
 		let info = client.info();
 
-		let (mut sync, _) = ChainSync::new(
+		let mut sync = ChainSync::new(
 			SyncMode::Full,
 			client.clone(),
-			ProtocolId::from("test-protocol-name"),
-			&Some(String::from("test-fork-id")),
-			Roles::from(&Role::Full),
-			Box::new(DefaultBlockAnnounceValidator),
+			ProtocolName::from("test-block-announce-protocol"),
 			5,
 			64,
 			None,
-			None,
 			chain_sync_network_handle,
-			import_queue,
-			ProtocolName::from("block-request"),
-			ProtocolName::from("state-request"),
-			None,
 		)
 		.unwrap();
 
@@ -3613,7 +2830,7 @@ mod test {
 			let res = sync.on_block_data(&peer_id1, Some(request), response).unwrap();
 			assert!(matches!(
 				res,
-				OnBlockData::Import(_, blocks) if blocks.len() == max_blocks_to_request as usize
+				OnBlockData::Import(ImportBlocksAction{ origin: _, blocks }) if blocks.len() == max_blocks_to_request as usize
 			),);
 
 			best_block_num += max_blocks_to_request as u32;
@@ -3647,7 +2864,7 @@ mod test {
 		sync.queue_blocks.clear();
 
 		// Let peer2 announce that it finished syncing
-		send_block_announce(best_block.header().clone(), &peer_id2, &mut sync);
+		send_block_announce(best_block.header().clone(), peer_id2, &mut sync);
 
 		let (peer1_req, peer2_req) =
 			sync.block_requests().into_iter().fold((None, None), |res, req| {
@@ -3669,7 +2886,7 @@ mod test {
 		let res = sync.on_block_data(&peer_id2, Some(peer2_req), response).unwrap();
 		assert!(matches!(
 			res,
-			OnBlockData::Import(_, blocks) if blocks.is_empty()
+			OnBlockData::Import(ImportBlocksAction{ origin: _, blocks }) if blocks.is_empty()
 		),);
 
 		let peer1_from = unwrap_from_block_number(peer1_req.unwrap().from);
@@ -3696,7 +2913,6 @@ mod test {
 	fn can_sync_huge_fork() {
 		sp_tracing::try_init_simple();
 
-		let import_queue = Box::new(sc_consensus::import_queue::mock::MockImportQueueHandle::new());
 		let (_chain_sync_network_provider, chain_sync_network_handle) =
 			NetworkServiceProvider::new();
 		let mut client = Arc::new(TestClientBuilder::new().build());
@@ -3723,22 +2939,14 @@ mod test {
 
 		let info = client.info();
 
-		let (mut sync, _) = ChainSync::new(
+		let mut sync = ChainSync::new(
 			SyncMode::Full,
 			client.clone(),
-			ProtocolId::from("test-protocol-name"),
-			&Some(String::from("test-fork-id")),
-			Roles::from(&Role::Full),
-			Box::new(DefaultBlockAnnounceValidator),
+			ProtocolName::from("test-block-announce-protocol"),
 			5,
 			64,
 			None,
-			None,
 			chain_sync_network_handle,
-			import_queue,
-			ProtocolName::from("block-request"),
-			ProtocolName::from("state-request"),
-			None,
 		)
 		.unwrap();
 
@@ -3754,7 +2962,7 @@ mod test {
 		sync.new_peer(peer_id1, common_block.hash(), *common_block.header().number())
 			.unwrap();
 
-		send_block_announce(fork_blocks.last().unwrap().header().clone(), &peer_id1, &mut sync);
+		send_block_announce(fork_blocks.last().unwrap().header().clone(), peer_id1, &mut sync);
 
 		let mut request =
 			get_block_request(&mut sync, FromBlock::Number(info.best_number), 1, &peer_id1);
@@ -3772,7 +2980,7 @@ mod test {
 				break
 			};
 
-			log::trace!(target: "sync", "Request: {:?}", request);
+			log::trace!(target: LOG_TARGET, "Request: {request:?}");
 		}
 
 		// Now request and import the fork.
@@ -3796,7 +3004,7 @@ mod test {
 			let res = sync.on_block_data(&peer_id1, Some(request), response).unwrap();
 			assert!(matches!(
 				res,
-				OnBlockData::Import(_, blocks) if blocks.len() == sync.max_blocks_per_request as usize
+				OnBlockData::Import(ImportBlocksAction{ origin: _, blocks }) if blocks.len() == sync.max_blocks_per_request as usize
 			),);
 
 			best_block_num += sync.max_blocks_per_request as u32;
@@ -3839,7 +3047,6 @@ mod test {
 	fn syncs_fork_without_duplicate_requests() {
 		sp_tracing::try_init_simple();
 
-		let import_queue = Box::new(sc_consensus::import_queue::mock::MockImportQueueHandle::new());
 		let (_chain_sync_network_provider, chain_sync_network_handle) =
 			NetworkServiceProvider::new();
 		let mut client = Arc::new(TestClientBuilder::new().build());
@@ -3866,22 +3073,14 @@ mod test {
 
 		let info = client.info();
 
-		let (mut sync, _) = ChainSync::new(
+		let mut sync = ChainSync::new(
 			SyncMode::Full,
 			client.clone(),
-			ProtocolId::from("test-protocol-name"),
-			&Some(String::from("test-fork-id")),
-			Roles::from(&Role::Full),
-			Box::new(DefaultBlockAnnounceValidator),
+			ProtocolName::from("test-block-announce-protocol"),
 			5,
 			64,
 			None,
-			None,
 			chain_sync_network_handle,
-			import_queue,
-			ProtocolName::from("block-request"),
-			ProtocolName::from("state-request"),
-			None,
 		)
 		.unwrap();
 
@@ -3897,7 +3096,7 @@ mod test {
 		sync.new_peer(peer_id1, common_block.hash(), *common_block.header().number())
 			.unwrap();
 
-		send_block_announce(fork_blocks.last().unwrap().header().clone(), &peer_id1, &mut sync);
+		send_block_announce(fork_blocks.last().unwrap().header().clone(), peer_id1, &mut sync);
 
 		let mut request =
 			get_block_request(&mut sync, FromBlock::Number(info.best_number), 1, &peer_id1);
@@ -3915,7 +3114,7 @@ mod test {
 				break
 			};
 
-			log::trace!(target: "sync", "Request: {:?}", request);
+			log::trace!(target: LOG_TARGET, "Request: {request:?}");
 		}
 
 		// Now request and import the fork.
@@ -3940,7 +3139,7 @@ mod test {
 			let res = sync.on_block_data(&peer_id1, Some(request.clone()), response).unwrap();
 			assert!(matches!(
 				res,
-				OnBlockData::Import(_, blocks) if blocks.len() == max_blocks_to_request as usize
+				OnBlockData::Import(ImportBlocksAction{ origin: _, blocks }) if blocks.len() == max_blocks_to_request as usize
 			),);
 
 			best_block_num += max_blocks_to_request as u32;
@@ -4005,28 +3204,19 @@ mod test {
 	#[test]
 	fn removes_target_fork_on_disconnect() {
 		sp_tracing::try_init_simple();
-		let import_queue = Box::new(sc_consensus::import_queue::mock::MockImportQueueHandle::new());
 		let (_chain_sync_network_provider, chain_sync_network_handle) =
 			NetworkServiceProvider::new();
 		let mut client = Arc::new(TestClientBuilder::new().build());
 		let blocks = (0..3).map(|_| build_block(&mut client, None, false)).collect::<Vec<_>>();
 
-		let (mut sync, _) = ChainSync::new(
+		let mut sync = ChainSync::new(
 			SyncMode::Full,
 			client.clone(),
-			ProtocolId::from("test-protocol-name"),
-			&Some(String::from("test-fork-id")),
-			Roles::from(&Role::Full),
-			Box::new(DefaultBlockAnnounceValidator),
+			ProtocolName::from("test-block-announce-protocol"),
 			1,
 			64,
 			None,
-			None,
 			chain_sync_network_handle,
-			import_queue,
-			ProtocolName::from("block-request"),
-			ProtocolName::from("state-request"),
-			None,
 		)
 		.unwrap();
 
@@ -4039,17 +3229,16 @@ mod test {
 		// Create a "new" header and announce it
 		let mut header = blocks[0].header().clone();
 		header.number = 4;
-		send_block_announce(header, &peer_id1, &mut sync);
+		send_block_announce(header, peer_id1, &mut sync);
 		assert!(sync.fork_targets.len() == 1);
 
-		sync.peer_disconnected(&peer_id1);
+		let _ = sync.peer_disconnected(&peer_id1);
 		assert!(sync.fork_targets.len() == 0);
 	}
 
 	#[test]
 	fn can_import_response_with_missing_blocks() {
 		sp_tracing::try_init_simple();
-		let import_queue = Box::new(sc_consensus::import_queue::mock::MockImportQueueHandle::new());
 		let (_chain_sync_network_provider, chain_sync_network_handle) =
 			NetworkServiceProvider::new();
 		let mut client2 = Arc::new(TestClientBuilder::new().build());
@@ -4057,22 +3246,14 @@ mod test {
 
 		let empty_client = Arc::new(TestClientBuilder::new().build());
 
-		let (mut sync, _) = ChainSync::new(
+		let mut sync = ChainSync::new(
 			SyncMode::Full,
 			empty_client.clone(),
-			ProtocolId::from("test-protocol-name"),
-			&Some(String::from("test-fork-id")),
-			Roles::from(&Role::Full),
-			Box::new(DefaultBlockAnnounceValidator),
+			ProtocolName::from("test-block-announce-protocol"),
 			1,
 			64,
 			None,
-			None,
 			chain_sync_network_handle,
-			import_queue,
-			ProtocolName::from("block-request"),
-			ProtocolName::from("state-request"),
-			None,
 		)
 		.unwrap();
 
@@ -4107,26 +3288,16 @@ mod test {
 	#[test]
 	fn sync_restart_removes_block_but_not_justification_requests() {
 		let mut client = Arc::new(TestClientBuilder::new().build());
-		let block_announce_validator = Box::new(DefaultBlockAnnounceValidator);
-		let import_queue = Box::new(sc_consensus::import_queue::mock::MockImportQueueHandle::new());
 		let (_chain_sync_network_provider, chain_sync_network_handle) =
 			NetworkServiceProvider::new();
-		let (mut sync, _) = ChainSync::new(
+		let mut sync = ChainSync::new(
 			SyncMode::Full,
 			client.clone(),
-			ProtocolId::from("test-protocol-name"),
-			&Some(String::from("test-fork-id")),
-			Roles::from(&Role::Full),
-			block_announce_validator,
+			ProtocolName::from("test-block-announce-protocol"),
 			1,
 			64,
 			None,
-			None,
 			chain_sync_network_handle,
-			import_queue,
-			ProtocolName::from("block-request"),
-			ProtocolName::from("state-request"),
-			None,
 		)
 		.unwrap();
 
@@ -4147,10 +3318,14 @@ mod test {
 		// add new peer and request blocks from them
 		sync.new_peer(peers[0], Hash::random(), 42).unwrap();
 
+		// we don't actually perform any requests, just keep track of peers waiting for a response
+		let mut pending_responses = HashSet::new();
+
 		// we wil send block requests to these peers
 		// for these blocks we don't know about
-		for (peer, request) in sync.block_requests() {
-			sync.send_block_request(peer, request);
+		for (peer, _request) in sync.block_requests() {
+			// "send" request
+			pending_responses.insert(peer);
 		}
 
 		// add a new peer at a known block
@@ -4161,10 +3336,11 @@ mod test {
 
 		// the justification request should be scheduled to the
 		// new peer which is at the given block
-		let mut requests = sync.justification_requests().collect::<Vec<_>>();
+		let mut requests = sync.justification_requests();
 		assert_eq!(requests.len(), 1);
-		let (peer, request) = requests.remove(0);
-		sync.send_block_request(peer, request);
+		let (peer, _request) = requests.remove(0);
+		// "send" request
+		assert!(pending_responses.insert(peer));
 
 		assert!(!std::matches!(
 			sync.peers.get(&peers[0]).unwrap().state,
@@ -4174,18 +3350,413 @@ mod test {
 			sync.peers.get(&peers[1]).unwrap().state,
 			PeerSyncState::DownloadingJustification(b1_hash),
 		);
-		assert_eq!(sync.pending_responses.len(), 2);
-
-		let requests = sync.restart().collect::<Vec<_>>();
-		assert!(requests.iter().any(|res| res.as_ref().unwrap().0 == peers[0]));
+		assert_eq!(pending_responses.len(), 2);
+
+		// restart sync
+		let request_events = sync.restart().collect::<Vec<_>>();
+		for event in request_events.iter() {
+			match event.as_ref().unwrap() {
+				BlockRequestAction::RemoveStale { peer_id } => {
+					pending_responses.remove(&peer_id);
+				},
+				BlockRequestAction::SendRequest { peer_id, .. } => {
+					// we drop obsolete response, but don't register a new request, it's checked in
+					// the `assert!` below
+					pending_responses.remove(&peer_id);
+				},
+			}
+		}
+		assert!(request_events.iter().any(|event| {
+			match event.as_ref().unwrap() {
+				BlockRequestAction::RemoveStale { .. } => false,
+				BlockRequestAction::SendRequest { peer_id, .. } => peer_id == &peers[0],
+			}
+		}));
 
-		assert_eq!(sync.pending_responses.len(), 1);
-		assert!(sync.pending_responses.get(&peers[1]).is_some());
+		assert_eq!(pending_responses.len(), 1);
+		assert!(pending_responses.contains(&peers[1]));
 		assert_eq!(
 			sync.peers.get(&peers[1]).unwrap().state,
 			PeerSyncState::DownloadingJustification(b1_hash),
 		);
-		sync.peer_disconnected(&peers[1]);
-		assert_eq!(sync.pending_responses.len(), 0);
+		let _ = sync.peer_disconnected(&peers[1]);
+		pending_responses.remove(&peers[1]);
+		assert_eq!(pending_responses.len(), 0);
+	}
+
+	#[test]
+	fn syncs_fork_with_partial_response_extends_tip() {
+		sp_tracing::try_init_simple();
+
+		// Set up: the two chains share the first 15 blocks before
+		// diverging. The other(canonical) chain fork is longer.
+		let max_blocks_per_request = 64;
+		let common_ancestor = 15;
+		let non_canonical_chain_length = common_ancestor + 3;
+		let canonical_chain_length = common_ancestor + max_blocks_per_request + 10;
+
+		let (_chain_sync_network_provider, chain_sync_network_handle) =
+			NetworkServiceProvider::new();
+		let mut client = Arc::new(TestClientBuilder::new().build());
+
+		// Blocks on the non-canonical chain.
+		let non_canonical_blocks = (0..non_canonical_chain_length)
+			.map(|_| build_block(&mut client, None, false))
+			.collect::<Vec<_>>();
+
+		// Blocks on the canonical chain.
+		let canonical_blocks = {
+			let mut client = Arc::new(TestClientBuilder::new().build());
+			let common_blocks = non_canonical_blocks[..common_ancestor as usize]
+				.into_iter()
+				.inspect(|b| block_on(client.import(BlockOrigin::Own, (*b).clone())).unwrap())
+				.cloned()
+				.collect::<Vec<_>>();
+
+			common_blocks
+				.into_iter()
+				.chain(
+					(0..(canonical_chain_length - common_ancestor as u32))
+						.map(|_| build_block(&mut client, None, true)),
+				)
+				.collect::<Vec<_>>()
+		};
+
+		let mut sync = ChainSync::new(
+			SyncMode::Full,
+			client.clone(),
+			ProtocolName::from("test-block-announce-protocol"),
+			1,
+			max_blocks_per_request,
+			None,
+			chain_sync_network_handle,
+		)
+		.unwrap();
+
+		// Connect the node we will sync from
+		let peer_id = PeerId::random();
+		let canonical_tip = canonical_blocks.last().unwrap().clone();
+		let mut request = sync
+			.new_peer(peer_id, canonical_tip.hash(), *canonical_tip.header().number())
+			.unwrap()
+			.unwrap();
+		assert_eq!(FromBlock::Number(client.info().best_number), request.from);
+		assert_eq!(Some(1), request.max);
+
+		// Do the ancestor search
+		loop {
+			let block =
+				&canonical_blocks[unwrap_from_block_number(request.from.clone()) as usize - 1];
+			let response = create_block_response(vec![block.clone()]);
+
+			let on_block_data = sync.on_block_data(&peer_id, Some(request), response).unwrap();
+			request = if let OnBlockData::Request(_peer, request) = on_block_data {
+				request
+			} else {
+				// We found the ancestor
+				break
+			};
+
+			log::trace!(target: LOG_TARGET, "Request: {request:?}");
+		}
+
+		// The response for the 64 blocks is returned in two parts:
+		// part 1: last 61 blocks [19..79], part 2: first 3 blocks [16-18].
+		// Even though the  first part extends the current chain ending at 18,
+		// it should not result in an import yet.
+		let resp_1_from = common_ancestor as u64 + max_blocks_per_request as u64;
+		let resp_2_from = common_ancestor as u64 + 3;
+
+		// No import expected.
+		let request = get_block_request(
+			&mut sync,
+			FromBlock::Number(resp_1_from),
+			max_blocks_per_request as u32,
+			&peer_id,
+		);
+
+		let from = unwrap_from_block_number(request.from.clone());
+		let mut resp_blocks = canonical_blocks[18..from as usize].to_vec();
+		resp_blocks.reverse();
+		let response = create_block_response(resp_blocks.clone());
+		let res = sync.on_block_data(&peer_id, Some(request), response).unwrap();
+		assert!(matches!(
+			res,
+			OnBlockData::Import(ImportBlocksAction{ origin: _, blocks }) if blocks.is_empty()
+		),);
+
+		// Gap filled, expect max_blocks_per_request being imported now.
+		let request = get_block_request(&mut sync, FromBlock::Number(resp_2_from), 3, &peer_id);
+		let mut resp_blocks = canonical_blocks[common_ancestor as usize..18].to_vec();
+		resp_blocks.reverse();
+		let response = create_block_response(resp_blocks.clone());
+		let res = sync.on_block_data(&peer_id, Some(request), response).unwrap();
+		let to_import: Vec<_> = match &res {
+			OnBlockData::Import(ImportBlocksAction { origin: _, blocks }) => {
+				assert_eq!(blocks.len(), sync.max_blocks_per_request as usize);
+				blocks
+					.iter()
+					.map(|b| {
+						let num = *b.header.as_ref().unwrap().number() as usize;
+						canonical_blocks[num - 1].clone()
+					})
+					.collect()
+			},
+			_ => {
+				panic!("Unexpected response: {res:?}");
+			},
+		};
+
+		let _ = sync.on_blocks_processed(
+			max_blocks_per_request as usize,
+			resp_blocks.len(),
+			resp_blocks
+				.iter()
+				.rev()
+				.map(|b| {
+					(
+						Ok(BlockImportStatus::ImportedUnknown(
+							*b.header().number(),
+							Default::default(),
+							Some(peer_id),
+						)),
+						b.hash(),
+					)
+				})
+				.collect(),
+		);
+		to_import.into_iter().for_each(|b| {
+			assert!(matches!(client.block(*b.header.parent_hash()), Ok(Some(_))));
+			block_on(client.import(BlockOrigin::Own, b)).unwrap();
+		});
+		let expected_number = common_ancestor as u32 + max_blocks_per_request as u32;
+		assert_eq!(sync.best_queued_number as u32, expected_number);
+		assert_eq!(sync.best_queued_hash, canonical_blocks[expected_number as usize - 1].hash());
+		// Sync rest of the chain.
+		let request =
+			get_block_request(&mut sync, FromBlock::Hash(canonical_tip.hash()), 10_u32, &peer_id);
+		let mut resp_blocks = canonical_blocks
+			[(canonical_chain_length - 10) as usize..canonical_chain_length as usize]
+			.to_vec();
+		resp_blocks.reverse();
+		let response = create_block_response(resp_blocks.clone());
+		let res = sync.on_block_data(&peer_id, Some(request), response).unwrap();
+		assert!(matches!(
+			res,
+			OnBlockData::Import(ImportBlocksAction{ origin: _, blocks }) if blocks.len() == 10 as usize
+		),);
+		let _ = sync.on_blocks_processed(
+			max_blocks_per_request as usize,
+			resp_blocks.len(),
+			resp_blocks
+				.iter()
+				.rev()
+				.map(|b| {
+					(
+						Ok(BlockImportStatus::ImportedUnknown(
+							*b.header().number(),
+							Default::default(),
+							Some(peer_id),
+						)),
+						b.hash(),
+					)
+				})
+				.collect(),
+		);
+		resp_blocks.into_iter().rev().for_each(|b| {
+			assert!(matches!(client.block(*b.header.parent_hash()), Ok(Some(_))));
+			block_on(client.import(BlockOrigin::Own, b)).unwrap();
+		});
+		let expected_number = canonical_chain_length as u32;
+		assert_eq!(sync.best_queued_number as u32, expected_number);
+		assert_eq!(sync.best_queued_hash, canonical_blocks[expected_number as usize - 1].hash());
+	}
+
+	#[test]
+	fn syncs_fork_with_partial_response_does_not_extend_tip() {
+		sp_tracing::try_init_simple();
+
+		// Set up: the two chains share the first 15 blocks before
+		// diverging. The other(canonical) chain fork is longer.
+		let max_blocks_per_request = 64;
+		let common_ancestor = 15;
+		let non_canonical_chain_length = common_ancestor + 3;
+		let canonical_chain_length = common_ancestor + max_blocks_per_request + 10;
+
+		let (_chain_sync_network_provider, chain_sync_network_handle) =
+			NetworkServiceProvider::new();
+		let mut client = Arc::new(TestClientBuilder::new().build());
+
+		// Blocks on the non-canonical chain.
+		let non_canonical_blocks = (0..non_canonical_chain_length)
+			.map(|_| build_block(&mut client, None, false))
+			.collect::<Vec<_>>();
+
+		// Blocks on the canonical chain.
+		let canonical_blocks = {
+			let mut client = Arc::new(TestClientBuilder::new().build());
+			let common_blocks = non_canonical_blocks[..common_ancestor as usize]
+				.into_iter()
+				.inspect(|b| block_on(client.import(BlockOrigin::Own, (*b).clone())).unwrap())
+				.cloned()
+				.collect::<Vec<_>>();
+
+			common_blocks
+				.into_iter()
+				.chain(
+					(0..(canonical_chain_length - common_ancestor as u32))
+						.map(|_| build_block(&mut client, None, true)),
+				)
+				.collect::<Vec<_>>()
+		};
+
+		let mut sync = ChainSync::new(
+			SyncMode::Full,
+			client.clone(),
+			ProtocolName::from("test-block-announce-protocol"),
+			1,
+			max_blocks_per_request,
+			None,
+			chain_sync_network_handle,
+		)
+		.unwrap();
+
+		// Connect the node we will sync from
+		let peer_id = PeerId::random();
+		let canonical_tip = canonical_blocks.last().unwrap().clone();
+		let mut request = sync
+			.new_peer(peer_id, canonical_tip.hash(), *canonical_tip.header().number())
+			.unwrap()
+			.unwrap();
+		assert_eq!(FromBlock::Number(client.info().best_number), request.from);
+		assert_eq!(Some(1), request.max);
+
+		// Do the ancestor search
+		loop {
+			let block =
+				&canonical_blocks[unwrap_from_block_number(request.from.clone()) as usize - 1];
+			let response = create_block_response(vec![block.clone()]);
+
+			let on_block_data = sync.on_block_data(&peer_id, Some(request), response).unwrap();
+			request = if let OnBlockData::Request(_peer, request) = on_block_data {
+				request
+			} else {
+				// We found the ancestor
+				break
+			};
+
+			log::trace!(target: LOG_TARGET, "Request: {request:?}");
+		}
+
+		// The response for the 64 blocks is returned in two parts:
+		// part 1: last 62 blocks [18..79], part 2: first 2 blocks [16-17].
+		// Even though the  first part extends the current chain ending at 18,
+		// it should not result in an import yet.
+		let resp_1_from = common_ancestor as u64 + max_blocks_per_request as u64;
+		let resp_2_from = common_ancestor as u64 + 2;
+
+		// No import expected.
+		let request = get_block_request(
+			&mut sync,
+			FromBlock::Number(resp_1_from),
+			max_blocks_per_request as u32,
+			&peer_id,
+		);
+
+		let from = unwrap_from_block_number(request.from.clone());
+		let mut resp_blocks = canonical_blocks[17..from as usize].to_vec();
+		resp_blocks.reverse();
+		let response = create_block_response(resp_blocks.clone());
+		let res = sync.on_block_data(&peer_id, Some(request), response).unwrap();
+		assert!(matches!(
+			res,
+			OnBlockData::Import(ImportBlocksAction{ origin: _, blocks }) if blocks.is_empty()
+		),);
+
+		// Gap filled, expect max_blocks_per_request being imported now.
+		let request = get_block_request(&mut sync, FromBlock::Number(resp_2_from), 2, &peer_id);
+		let mut resp_blocks = canonical_blocks[common_ancestor as usize..17].to_vec();
+		resp_blocks.reverse();
+		let response = create_block_response(resp_blocks.clone());
+		let res = sync.on_block_data(&peer_id, Some(request), response).unwrap();
+		let to_import: Vec<_> = match &res {
+			OnBlockData::Import(ImportBlocksAction { origin: _, blocks }) => {
+				assert_eq!(blocks.len(), sync.max_blocks_per_request as usize);
+				blocks
+					.iter()
+					.map(|b| {
+						let num = *b.header.as_ref().unwrap().number() as usize;
+						canonical_blocks[num - 1].clone()
+					})
+					.collect()
+			},
+			_ => {
+				panic!("Unexpected response: {res:?}");
+			},
+		};
+
+		let _ = sync.on_blocks_processed(
+			max_blocks_per_request as usize,
+			resp_blocks.len(),
+			resp_blocks
+				.iter()
+				.rev()
+				.map(|b| {
+					(
+						Ok(BlockImportStatus::ImportedUnknown(
+							*b.header().number(),
+							Default::default(),
+							Some(peer_id),
+						)),
+						b.hash(),
+					)
+				})
+				.collect(),
+		);
+		to_import.into_iter().for_each(|b| {
+			assert!(matches!(client.block(*b.header.parent_hash()), Ok(Some(_))));
+			block_on(client.import(BlockOrigin::Own, b)).unwrap();
+		});
+		let expected_number = common_ancestor as u32 + max_blocks_per_request as u32;
+		assert_eq!(sync.best_queued_number as u32, expected_number);
+		assert_eq!(sync.best_queued_hash, canonical_blocks[expected_number as usize - 1].hash());
+		// Sync rest of the chain.
+		let request =
+			get_block_request(&mut sync, FromBlock::Hash(canonical_tip.hash()), 10_u32, &peer_id);
+		let mut resp_blocks = canonical_blocks
+			[(canonical_chain_length - 10) as usize..canonical_chain_length as usize]
+			.to_vec();
+		resp_blocks.reverse();
+		let response = create_block_response(resp_blocks.clone());
+		let res = sync.on_block_data(&peer_id, Some(request), response).unwrap();
+		assert!(matches!(
+			res,
+			OnBlockData::Import(ImportBlocksAction{ origin: _, blocks }) if blocks.len() == 10 as usize
+		),);
+		let _ = sync.on_blocks_processed(
+			max_blocks_per_request as usize,
+			resp_blocks.len(),
+			resp_blocks
+				.iter()
+				.rev()
+				.map(|b| {
+					(
+						Ok(BlockImportStatus::ImportedUnknown(
+							*b.header().number(),
+							Default::default(),
+							Some(peer_id),
+						)),
+						b.hash(),
+					)
+				})
+				.collect(),
+		);
+		resp_blocks.into_iter().rev().for_each(|b| {
+			assert!(matches!(client.block(*b.header.parent_hash()), Ok(Some(_))));
+			block_on(client.import(BlockOrigin::Own, b)).unwrap();
+		});
+		let expected_number = canonical_chain_length as u32;
+		assert_eq!(sync.best_queued_number as u32, expected_number);
+		assert_eq!(sync.best_queued_hash, canonical_blocks[expected_number as usize - 1].hash());
 	}
 }
diff --git a/substrate/client/network/sync/src/mock.rs b/substrate/client/network/sync/src/mock.rs
index 838c6cf7667a2463a38dc093addce42577bfc89f..ed7c647c797732f0ff0c39828b52a9ec470f292e 100644
--- a/substrate/client/network/sync/src/mock.rs
+++ b/substrate/client/network/sync/src/mock.rs
@@ -16,15 +16,17 @@
 // You should have received a copy of the GNU General Public License
 // along with this program. If not, see <https://www.gnu.org/licenses/>.
 
-//! Contains a mock implementation of `ChainSync` that can be used
-//! for testing calls made to `ChainSync`.
+//! Contains mock implementations of `ChainSync` and 'BlockDownloader'.
 
-use futures::task::Poll;
+use crate::block_relay_protocol::{BlockDownloader as BlockDownloaderT, BlockResponseError};
+
+use futures::channel::oneshot;
 use libp2p::PeerId;
+use sc_network::RequestFailure;
 use sc_network_common::sync::{
 	message::{BlockAnnounce, BlockData, BlockRequest, BlockResponse},
-	BadPeer, ChainSync as ChainSyncT, Metrics, OnBlockData, OnBlockJustification,
-	OpaqueBlockResponse, PeerInfo, PollBlockAnnounceValidation, SyncStatus,
+	BadPeer, ChainSync as ChainSyncT, ImportBlocksAction, Metrics, OnBlockData,
+	OnBlockJustification, PeerInfo, SyncStatus,
 };
 use sp_runtime::traits::{Block as BlockT, NumberFor};
 
@@ -37,7 +39,6 @@ mockall::mock! {
 		fn num_sync_requests(&self) -> usize;
 		fn num_downloaded_blocks(&self) -> usize;
 		fn num_peers(&self) -> usize;
-		fn num_active_peers(&self) -> usize;
 		fn new_peer(
 			&mut self,
 			who: PeerId,
@@ -71,32 +72,31 @@ mockall::mock! {
 			success: bool,
 		);
 		fn on_block_finalized(&mut self, hash: &Block::Hash, number: NumberFor<Block>);
-		fn push_block_announce_validation(
+		fn on_validated_block_announce(
 			&mut self,
-			who: PeerId,
-			hash: Block::Hash,
-			announce: BlockAnnounce<Block::Header>,
 			is_best: bool,
+			who: PeerId,
+			announce: &BlockAnnounce<Block::Header>,
 		);
-		fn poll_block_announce_validation<'a>(
-			&mut self,
-			cx: &mut std::task::Context<'a>,
-		) -> Poll<PollBlockAnnounceValidation<Block::Header>>;
-		fn peer_disconnected(&mut self, who: &PeerId);
+		fn peer_disconnected(&mut self, who: &PeerId) -> Option<ImportBlocksAction<Block>>;
 		fn metrics(&self) -> Metrics;
-		fn block_response_into_blocks(
+	}
+}
+
+mockall::mock! {
+	pub BlockDownloader<Block: BlockT> {}
+
+	#[async_trait::async_trait]
+	impl<Block: BlockT> BlockDownloaderT<Block> for BlockDownloader<Block> {
+		async fn download_blocks(
 			&self,
-			request: &BlockRequest<Block>,
-			response: OpaqueBlockResponse,
-		) -> Result<Vec<BlockData<Block>>, String>;
-		fn poll<'a>(
-			&mut self,
-			cx: &mut std::task::Context<'a>,
-		) -> Poll<PollBlockAnnounceValidation<Block::Header>>;
-		fn send_block_request(
-			&mut self,
 			who: PeerId,
 			request: BlockRequest<Block>,
-		);
+		) -> Result<Result<Vec<u8>, RequestFailure>, oneshot::Canceled>;
+		fn block_response_into_blocks(
+			&self,
+			request: &BlockRequest<Block>,
+			response: Vec<u8>,
+		) -> Result<Vec<BlockData<Block>>, BlockResponseError>;
 	}
 }
diff --git a/substrate/client/network/sync/src/pending_responses.rs b/substrate/client/network/sync/src/pending_responses.rs
new file mode 100644
index 0000000000000000000000000000000000000000..c863267e7808f13104eacd3d30f39987946443bf
--- /dev/null
+++ b/substrate/client/network/sync/src/pending_responses.rs
@@ -0,0 +1,114 @@
+// This file is part of Substrate.
+
+// Copyright (C) Parity Technologies (UK) Ltd.
+// SPDX-License-Identifier: GPL-3.0-or-later WITH Classpath-exception-2.0
+
+// This program 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.
+
+// This program 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 this program. If not, see <https://www.gnu.org/licenses/>.
+
+//! [`PendingResponses`] is responsible for keeping track of pending responses and
+//! polling them.
+
+use futures::{
+	channel::oneshot,
+	future::BoxFuture,
+	stream::{BoxStream, Stream},
+	FutureExt, StreamExt,
+};
+use libp2p::PeerId;
+use log::error;
+use sc_network::request_responses::RequestFailure;
+use sc_network_common::sync::PeerRequest;
+use sp_runtime::traits::Block as BlockT;
+use std::task::{Context, Poll};
+use tokio_stream::StreamMap;
+
+/// Response result.
+type ResponseResult = Result<Result<Vec<u8>, RequestFailure>, oneshot::Canceled>;
+
+/// A future yielding [`ResponseResult`].
+type ResponseFuture = BoxFuture<'static, ResponseResult>;
+
+/// An event we receive once a pending response future resolves.
+pub(crate) struct ResponseEvent<B: BlockT> {
+	pub peer_id: PeerId,
+	pub request: PeerRequest<B>,
+	pub response: ResponseResult,
+}
+
+/// Stream taking care of polling pending responses.
+pub(crate) struct PendingResponses<B: BlockT> {
+	/// Pending responses
+	pending_responses: StreamMap<PeerId, BoxStream<'static, (PeerRequest<B>, ResponseResult)>>,
+}
+
+impl<B: BlockT> PendingResponses<B> {
+	pub fn new() -> Self {
+		Self { pending_responses: StreamMap::new() }
+	}
+
+	pub fn insert(
+		&mut self,
+		peer_id: PeerId,
+		request: PeerRequest<B>,
+		response_future: ResponseFuture,
+	) {
+		let request_type = request.get_type();
+
+		if self
+			.pending_responses
+			.insert(
+				peer_id,
+				Box::pin(async move { (request, response_future.await) }.into_stream()),
+			)
+			.is_some()
+		{
+			error!(
+				target: crate::LOG_TARGET,
+				"Discarded pending response from peer {peer_id}, request type: {request_type:?}.",
+			);
+			debug_assert!(false);
+		}
+	}
+
+	pub fn remove(&mut self, peer_id: &PeerId) -> bool {
+		self.pending_responses.remove(peer_id).is_some()
+	}
+
+	pub fn len(&self) -> usize {
+		self.pending_responses.len()
+	}
+}
+
+impl<B: BlockT> Unpin for PendingResponses<B> {}
+
+impl<B: BlockT> Stream for PendingResponses<B> {
+	type Item = ResponseEvent<B>;
+
+	fn poll_next(
+		mut self: std::pin::Pin<&mut Self>,
+		cx: &mut Context<'_>,
+	) -> Poll<Option<Self::Item>> {
+		match futures::ready!(self.pending_responses.poll_next_unpin(cx)) {
+			Some((peer_id, (request, response))) => {
+				// We need to manually remove the stream, because `StreamMap` doesn't know yet that
+				// it's going to yield `None`, so may not remove it before the next request is made
+				// to the same peer.
+				self.pending_responses.remove(&peer_id);
+
+				Poll::Ready(Some(ResponseEvent { peer_id, request, response }))
+			},
+			None => Poll::Ready(None),
+		}
+	}
+}
diff --git a/substrate/client/network/sync/src/state_request_handler.rs b/substrate/client/network/sync/src/state_request_handler.rs
index ed14b889cbb54d18cc421e6f812b11334cbe87c3..f78fadccc2d5fd05e9ec07435de6560cffdf6856 100644
--- a/substrate/client/network/sync/src/state_request_handler.rs
+++ b/substrate/client/network/sync/src/state_request_handler.rs
@@ -1,4 +1,4 @@
-// Copyright Parity Technologies (UK) Ltd.
+// Copyright (C) Parity Technologies (UK) Ltd.
 // This file is part of Substrate.
 
 // Substrate is free software: you can redistribute it and/or modify
diff --git a/substrate/client/network/sync/src/warp.rs b/substrate/client/network/sync/src/warp.rs
index 912ad78dfdd0800db1233786cd2cd8ebed064394..74835a6e015e3e6d8506950a794a1659ae3fdae0 100644
--- a/substrate/client/network/sync/src/warp.rs
+++ b/substrate/client/network/sync/src/warp.rs
@@ -19,36 +19,75 @@
 //! Warp sync support.
 
 use crate::{
-	oneshot,
 	schema::v1::{StateRequest, StateResponse},
 	state::{ImportResult, StateSync},
 };
-use futures::FutureExt;
+use futures::channel::oneshot;
 use log::error;
 use sc_client_api::ProofProvider;
 use sc_network_common::sync::{
 	message::{BlockAttributes, BlockData, BlockRequest, Direction, FromBlock},
 	warp::{
-		EncodedProof, VerificationResult, WarpProofRequest, WarpSyncParams, WarpSyncPhase,
-		WarpSyncProgress, WarpSyncProvider,
+		EncodedProof, VerificationResult, WarpProofRequest, WarpSyncPhase, WarpSyncProgress,
+		WarpSyncProvider,
 	},
 };
 use sp_blockchain::HeaderBackend;
 use sp_consensus_grandpa::{AuthorityList, SetId};
 use sp_runtime::traits::{Block as BlockT, Header, NumberFor, Zero};
-use std::{sync::Arc, task::Poll};
+use std::sync::Arc;
 
+/// Log target for this file.
+const LOG_TARGET: &'static str = "sync";
+
+/// The different types of warp syncing, passed to `build_network`.
+pub enum WarpSyncParams<Block: BlockT> {
+	/// Standard warp sync for the chain.
+	WithProvider(Arc<dyn WarpSyncProvider<Block>>),
+	/// Skip downloading proofs and wait for a header of the state that should be downloaded.
+	///
+	/// It is expected that the header provider ensures that the header is trusted.
+	WaitForTarget(oneshot::Receiver<<Block as BlockT>::Header>),
+}
+
+/// Warp sync configuration as accepted by [`WarpSync`].
+pub enum WarpSyncConfig<Block: BlockT> {
+	/// Standard warp sync for the chain.
+	WithProvider(Arc<dyn WarpSyncProvider<Block>>),
+	/// Skip downloading proofs and wait for a header of the state that should be downloaded.
+	///
+	/// It is expected that the header provider ensures that the header is trusted.
+	WaitForTarget,
+}
+
+impl<Block: BlockT> WarpSyncParams<Block> {
+	/// Split `WarpSyncParams` into `WarpSyncConfig` and warp sync target block header receiver.
+	pub fn split(
+		self,
+	) -> (WarpSyncConfig<Block>, Option<oneshot::Receiver<<Block as BlockT>::Header>>) {
+		match self {
+			WarpSyncParams::WithProvider(provider) =>
+				(WarpSyncConfig::WithProvider(provider), None),
+			WarpSyncParams::WaitForTarget(rx) => (WarpSyncConfig::WaitForTarget, Some(rx)),
+		}
+	}
+}
+
+/// Warp sync phase.
 enum Phase<B: BlockT, Client> {
+	/// Downloading warp proofs.
 	WarpProof {
 		set_id: SetId,
 		authorities: AuthorityList,
 		last_hash: B::Hash,
 		warp_sync_provider: Arc<dyn WarpSyncProvider<B>>,
 	},
-	PendingTargetBlock {
-		target_block: Option<oneshot::Receiver<B::Header>>,
-	},
+	/// Waiting for target block to be set externally if we skip warp proofs downloading,
+	/// and start straight from the target block (used by parachains warp sync).
+	PendingTargetBlock,
+	/// Downloading target block.
 	TargetBlock(B::Header),
+	/// Downloading state.
 	State(StateSync<B, Client>),
 }
 
@@ -83,10 +122,10 @@ where
 	/// Create a new instance. When passing a warp sync provider we will be checking for proof and
 	/// authorities. Alternatively we can pass a target block when we want to skip downloading
 	/// proofs, in this case we will continue polling until the target block is known.
-	pub fn new(client: Arc<Client>, warp_sync_params: WarpSyncParams<B>) -> Self {
+	pub fn new(client: Arc<Client>, warp_sync_config: WarpSyncConfig<B>) -> Self {
 		let last_hash = client.hash(Zero::zero()).unwrap().expect("Genesis header always exists");
-		match warp_sync_params {
-			WarpSyncParams::WithProvider(warp_sync_provider) => {
+		match warp_sync_config {
+			WarpSyncConfig::WithProvider(warp_sync_provider) => {
 				let phase = Phase::WarpProof {
 					set_id: 0,
 					authorities: warp_sync_provider.current_authorities(),
@@ -95,35 +134,23 @@ where
 				};
 				Self { client, phase, total_proof_bytes: 0 }
 			},
-			WarpSyncParams::WaitForTarget(block) => Self {
-				client,
-				phase: Phase::PendingTargetBlock { target_block: Some(block) },
-				total_proof_bytes: 0,
-			},
+			WarpSyncConfig::WaitForTarget =>
+				Self { client, phase: Phase::PendingTargetBlock, total_proof_bytes: 0 },
 		}
 	}
 
-	/// Poll to make progress.
-	///
-	/// This only makes progress when `phase = Phase::PendingTargetBlock` and the pending block was
-	/// sent.
-	pub fn poll(&mut self, cx: &mut std::task::Context) {
-		let new_phase = if let Phase::PendingTargetBlock { target_block: Some(target_block) } =
-			&mut self.phase
-		{
-			match target_block.poll_unpin(cx) {
-				Poll::Ready(Ok(target)) => Phase::TargetBlock(target),
-				Poll::Ready(Err(e)) => {
-					error!(target: "sync", "Failed to get target block. Error: {:?}",e);
-					Phase::PendingTargetBlock { target_block: None }
-				},
-				_ => return,
-			}
-		} else {
+	/// Set target block externally in case we skip warp proof downloading.
+	pub fn set_target_block(&mut self, header: B::Header) {
+		let Phase::PendingTargetBlock = self.phase else {
+			error!(
+				target: LOG_TARGET,
+				"Attempt to set warp sync target block in invalid phase.",
+			);
+			debug_assert!(false);
 			return
 		};
 
-		self.phase = new_phase;
+		self.phase = Phase::TargetBlock(header);
 	}
 
 	///  Validate and import a state response.
diff --git a/substrate/client/network/sync/src/warp_request_handler.rs b/substrate/client/network/sync/src/warp_request_handler.rs
index a49a65af51d0ba363502194066f60afc6232cee5..0e502a6dba59e55ea619ab890a0fc7b3ea34af35 100644
--- a/substrate/client/network/sync/src/warp_request_handler.rs
+++ b/substrate/client/network/sync/src/warp_request_handler.rs
@@ -1,4 +1,4 @@
-// Copyright Parity Technologies (UK) Ltd.
+// Copyright (C) Parity Technologies (UK) Ltd.
 // This file is part of Substrate.
 
 // Substrate is free software: you can redistribute it and/or modify
diff --git a/substrate/client/network/test/Cargo.toml b/substrate/client/network/test/Cargo.toml
index 1d18aa30a1bc085f052b66ecb3cfd9a7d88c9c1c..09f8f1fa9efbffd904c05c414ea9069c8410ebd2 100644
--- a/substrate/client/network/test/Cargo.toml
+++ b/substrate/client/network/test/Cargo.toml
@@ -3,11 +3,11 @@ description = "Integration tests for Substrate network protocol"
 name = "sc-network-test"
 version = "0.8.0"
 license = "GPL-3.0-or-later WITH Classpath-exception-2.0"
-authors = ["Parity Technologies <admin@parity.io>"]
-edition = "2021"
+authors.workspace = true
+edition.workspace = true
 publish = false
 homepage = "https://substrate.io"
-repository = "https://github.com/paritytech/substrate/"
+repository.workspace = true
 
 [package.metadata.docs.rs]
 targets = ["x86_64-unknown-linux-gnu"]
diff --git a/substrate/client/network/test/src/lib.rs b/substrate/client/network/test/src/lib.rs
index 2a20da5a556b7398397cd9845acdc049961f0ce2..11505903e35d70a04c5dd04d2a0935db8cfd50a3 100644
--- a/substrate/client/network/test/src/lib.rs
+++ b/substrate/client/network/test/src/lib.rs
@@ -62,15 +62,14 @@ use sc_network::{
 };
 use sc_network_common::{
 	role::Roles,
-	sync::warp::{
-		AuthorityList, EncodedProof, SetId, VerificationResult, WarpSyncParams, WarpSyncProvider,
-	},
+	sync::warp::{AuthorityList, EncodedProof, SetId, VerificationResult, WarpSyncProvider},
 };
 use sc_network_light::light_client_requests::handler::LightClientRequestHandler;
 use sc_network_sync::{
 	block_request_handler::BlockRequestHandler,
 	service::{chain_sync::SyncingService, network::NetworkServiceProvider},
 	state_request_handler::StateRequestHandler,
+	warp::WarpSyncParams,
 	warp_request_handler,
 };
 use sc_service::client::Client;
@@ -799,12 +798,18 @@ pub trait TestNetFactory: Default + Sized + Send {
 
 		let fork_id = Some(String::from("test-fork-id"));
 
-		let block_request_protocol_config = {
-			let (handler, protocol_config) =
-				BlockRequestHandler::new(&protocol_id, None, client.clone(), 50);
-			self.spawn_task(handler.run().boxed());
-			protocol_config
-		};
+		let (chain_sync_network_provider, chain_sync_network_handle) =
+			NetworkServiceProvider::new();
+		let mut block_relay_params = BlockRequestHandler::new(
+			chain_sync_network_handle.clone(),
+			&protocol_id,
+			None,
+			client.clone(),
+			50,
+		);
+		self.spawn_task(Box::pin(async move {
+			block_relay_params.server.run().await;
+		}));
 
 		let state_request_protocol_config = {
 			let (handler, protocol_config) =
@@ -849,8 +854,6 @@ pub trait TestNetFactory: Default + Sized + Send {
 		let block_announce_validator = config
 			.block_announce_validator
 			.unwrap_or_else(|| Box::new(DefaultBlockAnnounceValidator));
-		let (chain_sync_network_provider, chain_sync_network_handle) =
-			NetworkServiceProvider::new();
 
 		let (tx, rx) = sc_utils::mpsc::tracing_unbounded("mpsc_syncing_engine_protocol", 100_000);
 		let (engine, sync_service, block_announce_config) =
@@ -865,7 +868,7 @@ pub trait TestNetFactory: Default + Sized + Send {
 				Some(warp_sync_params),
 				chain_sync_network_handle,
 				import_queue.service(),
-				block_request_protocol_config.name.clone(),
+				block_relay_params.downloader,
 				state_request_protocol_config.name.clone(),
 				Some(warp_protocol_config.name.clone()),
 				rx,
@@ -878,7 +881,7 @@ pub trait TestNetFactory: Default + Sized + Send {
 			full_net_config.add_request_response_protocol(config);
 		}
 		for config in [
-			block_request_protocol_config,
+			block_relay_params.request_response_config,
 			state_request_protocol_config,
 			light_client_request_protocol_config,
 			warp_protocol_config,
diff --git a/substrate/client/network/test/src/service.rs b/substrate/client/network/test/src/service.rs
index 68e780545bb173775fc49268a704e0e37b2fa8c3..62d7f9f9d1bb1839f3f1f12bc601ecefb270d6bf 100644
--- a/substrate/client/network/test/src/service.rs
+++ b/substrate/client/network/test/src/service.rs
@@ -156,12 +156,18 @@ impl TestNetworkBuilder {
 		let fork_id = Some(String::from("test-fork-id"));
 		let mut full_net_config = FullNetworkConfiguration::new(&network_config);
 
-		let block_request_protocol_config = {
-			let (handler, protocol_config) =
-				BlockRequestHandler::new(&protocol_id, None, client.clone(), 50);
-			tokio::spawn(handler.run().boxed());
-			protocol_config
-		};
+		let (chain_sync_network_provider, chain_sync_network_handle) =
+			self.chain_sync_network.unwrap_or(NetworkServiceProvider::new());
+		let mut block_relay_params = BlockRequestHandler::new(
+			chain_sync_network_handle.clone(),
+			&protocol_id,
+			None,
+			client.clone(),
+			50,
+		);
+		tokio::spawn(Box::pin(async move {
+			block_relay_params.server.run().await;
+		}));
 
 		let state_request_protocol_config = {
 			let (handler, protocol_config) =
@@ -177,8 +183,6 @@ impl TestNetworkBuilder {
 			protocol_config
 		};
 
-		let (chain_sync_network_provider, chain_sync_network_handle) =
-			self.chain_sync_network.unwrap_or(NetworkServiceProvider::new());
 		let (tx, rx) = sc_utils::mpsc::tracing_unbounded("mpsc_syncing_engine_protocol", 100_000);
 		let (engine, chain_sync_service, block_announce_config) = SyncingEngine::new(
 			Roles::from(&config::Role::Full),
@@ -191,7 +195,7 @@ impl TestNetworkBuilder {
 			None,
 			chain_sync_network_handle,
 			import_queue.service(),
-			block_request_protocol_config.name.clone(),
+			block_relay_params.downloader,
 			state_request_protocol_config.name.clone(),
 			None,
 			rx,
@@ -214,7 +218,7 @@ impl TestNetworkBuilder {
 		}
 
 		for config in [
-			block_request_protocol_config,
+			block_relay_params.request_response_config,
 			state_request_protocol_config,
 			light_client_request_protocol_config,
 		] {
diff --git a/substrate/client/network/transactions/Cargo.toml b/substrate/client/network/transactions/Cargo.toml
index d5a0f28a7998a05c3e23639aca5d85b5ef361251..5e42465974bb33439d7c15a5fe9dd5176f78d600 100644
--- a/substrate/client/network/transactions/Cargo.toml
+++ b/substrate/client/network/transactions/Cargo.toml
@@ -3,10 +3,10 @@ description = "Substrate transaction protocol"
 name = "sc-network-transactions"
 version = "0.10.0-dev"
 license = "GPL-3.0-or-later WITH Classpath-exception-2.0"
-authors = ["Parity Technologies <admin@parity.io>"]
-edition = "2021"
+authors.workspace = true
+edition.workspace = true
 homepage = "https://substrate.io"
-repository = "https://github.com/paritytech/substrate/"
+repository.workspace = true
 documentation = "https://docs.rs/sc-network-transactions"
 
 [package.metadata.docs.rs]
diff --git a/substrate/client/offchain/Cargo.toml b/substrate/client/offchain/Cargo.toml
index 63425d0887950cd9a44e753dfea33d1a620a267e..83397f528797b322ca8f4bdaf2bbf6fc0ee547ae 100644
--- a/substrate/client/offchain/Cargo.toml
+++ b/substrate/client/offchain/Cargo.toml
@@ -3,10 +3,10 @@ description = "Substrate offchain workers"
 name = "sc-offchain"
 version = "4.0.0-dev"
 license = "GPL-3.0-or-later WITH Classpath-exception-2.0"
-authors = ["Parity Technologies <admin@parity.io>"]
-edition = "2021"
+authors.workspace = true
+edition.workspace = true
 homepage = "https://substrate.io"
-repository = "https://github.com/paritytech/substrate/"
+repository.workspace = true
 readme = "README.md"
 
 [package.metadata.docs.rs]
diff --git a/substrate/client/offchain/README.md b/substrate/client/offchain/README.md
index f7c097e8e0b2a9e3ac07bbf0a41359aadf4a758f..74d54c0c234dcf66a411447ea66ef153730e36d7 100644
--- a/substrate/client/offchain/README.md
+++ b/substrate/client/offchain/README.md
@@ -15,4 +15,4 @@ for instance via:
 2. Majority voting for results
 3. etc
 
-License: GPL-3.0-or-later WITH Classpath-exception-2.0
\ No newline at end of file
+License: GPL-3.0-or-later WITH Classpath-exception-2.0
diff --git a/substrate/client/proposer-metrics/Cargo.toml b/substrate/client/proposer-metrics/Cargo.toml
index e64a6a678bfe2d863702799bf27e9d33ea33e8b3..b6b4452ecc64edc466606d82f355b33c8bd7667c 100644
--- a/substrate/client/proposer-metrics/Cargo.toml
+++ b/substrate/client/proposer-metrics/Cargo.toml
@@ -1,11 +1,11 @@
 [package]
 name = "sc-proposer-metrics"
 version = "0.10.0-dev"
-authors = ["Parity Technologies <admin@parity.io>"]
-edition = "2021"
+authors.workspace = true
+edition.workspace = true
 license = "GPL-3.0-or-later WITH Classpath-exception-2.0"
 homepage = "https://substrate.io"
-repository = "https://github.com/paritytech/substrate/"
+repository.workspace = true
 description = "Basic metrics for block production."
 readme = "README.md"
 
diff --git a/substrate/client/proposer-metrics/README.md b/substrate/client/proposer-metrics/README.md
index 9669c7d35191dc6dc6d4c6df5878c6b4c9bea30d..27a6b726814c38088c2322e205825fb990357baa 100644
--- a/substrate/client/proposer-metrics/README.md
+++ b/substrate/client/proposer-metrics/README.md
@@ -1,3 +1,3 @@
 Prometheus basic proposer metrics.
 
-License: GPL-3.0-or-later WITH Classpath-exception-2.0
\ No newline at end of file
+License: GPL-3.0-or-later WITH Classpath-exception-2.0
diff --git a/substrate/client/rpc-api/Cargo.toml b/substrate/client/rpc-api/Cargo.toml
index 50db70f2860dc51311c1398cb6f79d083cefddfc..9dca2e72fcdd5d5d3ce6deecbd794e5b2e1c02e4 100644
--- a/substrate/client/rpc-api/Cargo.toml
+++ b/substrate/client/rpc-api/Cargo.toml
@@ -1,11 +1,11 @@
 [package]
 name = "sc-rpc-api"
 version = "0.10.0-dev"
-authors = ["Parity Technologies <admin@parity.io>"]
-edition = "2021"
+authors.workspace = true
+edition.workspace = true
 license = "GPL-3.0-or-later WITH Classpath-exception-2.0"
 homepage = "https://substrate.io"
-repository = "https://github.com/paritytech/substrate/"
+repository.workspace = true
 description = "Substrate RPC interfaces."
 readme = "README.md"
 
@@ -15,10 +15,11 @@ targets = ["x86_64-unknown-linux-gnu"]
 [dependencies]
 codec = { package = "parity-scale-codec", version = "3.6.1" }
 scale-info = { version = "2.5.0", default-features = false, features = ["derive"] }
-serde = { version = "1.0.163", features = ["derive"] }
-serde_json = "1.0.85"
+serde = { version = "1.0.188", features = ["derive"] }
+serde_json = "1.0.107"
 thiserror = "1.0"
 sc-chain-spec = { path = "../chain-spec" }
+sc-mixnet = { path = "../mixnet" }
 sc-transaction-pool-api = { path = "../transaction-pool/api" }
 sp-core = { path = "../../primitives/core" }
 sp-rpc = { path = "../../primitives/rpc" }
diff --git a/substrate/client/rpc-api/README.md b/substrate/client/rpc-api/README.md
index e860e0c2334da50e57bee241b14e2807b25bc7f3..8ea6e686c1a6450f6daef9db01ccfa4ad27309df 100644
--- a/substrate/client/rpc-api/README.md
+++ b/substrate/client/rpc-api/README.md
@@ -1,5 +1,5 @@
 Substrate RPC interfaces.
 
-A collection of RPC methods and subscriptions supported by all substrate clients.
+A collection of RPC methods and subscriptions supported by all Substrate clients.
 
-License: GPL-3.0-or-later WITH Classpath-exception-2.0
\ No newline at end of file
+License: GPL-3.0-or-later WITH Classpath-exception-2.0
diff --git a/substrate/client/rpc-api/src/error.rs b/substrate/client/rpc-api/src/error.rs
index 72941e3145b94424bc16fdd77d0dc2117e89eecb..58b75b8fb1691f4dbbb93b9adc457bf5719c596b 100644
--- a/substrate/client/rpc-api/src/error.rs
+++ b/substrate/client/rpc-api/src/error.rs
@@ -25,4 +25,5 @@ pub mod base {
 	pub const OFFCHAIN: i32 = 5000;
 	pub const DEV: i32 = 6000;
 	pub const STATEMENT: i32 = 7000;
+	pub const MIXNET: i32 = 8000;
 }
diff --git a/substrate/client/rpc-api/src/lib.rs b/substrate/client/rpc-api/src/lib.rs
index b99c237dc859bc1fd03a87c63b365956b7a6f5a1..32120d37902dd6718c2d95b5f36ef553dfc08ba1 100644
--- a/substrate/client/rpc-api/src/lib.rs
+++ b/substrate/client/rpc-api/src/lib.rs
@@ -31,6 +31,7 @@ pub mod author;
 pub mod chain;
 pub mod child_state;
 pub mod dev;
+pub mod mixnet;
 pub mod offchain;
 pub mod state;
 pub mod statement;
diff --git a/substrate/client/rpc-api/src/mixnet/error.rs b/substrate/client/rpc-api/src/mixnet/error.rs
new file mode 100644
index 0000000000000000000000000000000000000000..0dde5f32e6139acae2c867dbf24f53002dfffe56
--- /dev/null
+++ b/substrate/client/rpc-api/src/mixnet/error.rs
@@ -0,0 +1,48 @@
+// This file is part of Substrate.
+
+// Copyright (C) Parity Technologies (UK) Ltd.
+// SPDX-License-Identifier: GPL-3.0-or-later WITH Classpath-exception-2.0
+
+// This program 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.
+
+// This program 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 this program. If not, see <https://www.gnu.org/licenses/>.
+
+//! Mixnet RPC module errors.
+
+use jsonrpsee::types::error::{CallError, ErrorObject};
+use sc_mixnet::{PostErr, RemoteErr, TopologyErr};
+
+/// Mixnet RPC error type.
+pub struct Error(pub sc_mixnet::Error);
+
+/// Base code for all mixnet errors.
+const BASE_ERROR: i32 = crate::error::base::MIXNET;
+
+impl From<Error> for jsonrpsee::core::Error {
+	fn from(err: Error) -> Self {
+		let code = match err.0 {
+			sc_mixnet::Error::ServiceUnavailable => BASE_ERROR + 1,
+			sc_mixnet::Error::NoReply => BASE_ERROR + 2,
+			sc_mixnet::Error::BadReply => BASE_ERROR + 3,
+			sc_mixnet::Error::Post(PostErr::TooManyFragments) => BASE_ERROR + 101,
+			sc_mixnet::Error::Post(PostErr::SessionMixnodesNotKnown(_)) => BASE_ERROR + 102,
+			sc_mixnet::Error::Post(PostErr::SessionDisabled(_)) => BASE_ERROR + 103,
+			sc_mixnet::Error::Post(PostErr::Topology(TopologyErr::NoConnectedGatewayMixnodes)) =>
+				BASE_ERROR + 151,
+			sc_mixnet::Error::Post(PostErr::Topology(_)) => BASE_ERROR + 150,
+			sc_mixnet::Error::Post(_) => BASE_ERROR + 100,
+			sc_mixnet::Error::Remote(RemoteErr::Other(_)) => BASE_ERROR + 200,
+			sc_mixnet::Error::Remote(RemoteErr::Decode(_)) => BASE_ERROR + 201,
+		};
+		CallError::Custom(ErrorObject::owned(code, err.0.to_string(), None::<()>)).into()
+	}
+}
diff --git a/substrate/test-utils/tests/ui/too-many-func-parameters.rs b/substrate/client/rpc-api/src/mixnet/mod.rs
similarity index 70%
rename from substrate/test-utils/tests/ui/too-many-func-parameters.rs
rename to substrate/client/rpc-api/src/mixnet/mod.rs
index 0eece5f9e6130cea8b291beae2256185ae1659af..bc478cf3bf334db618b240193ae7c58d732f0cc9 100644
--- a/substrate/test-utils/tests/ui/too-many-func-parameters.rs
+++ b/substrate/client/rpc-api/src/mixnet/mod.rs
@@ -16,9 +16,16 @@
 // You should have received a copy of the GNU General Public License
 // along with this program. If not, see <https://www.gnu.org/licenses/>.
 
-#[substrate_test_utils::test]
-async fn too_many_func_parameters(_: u32) {
-	assert!(true);
-}
+//! Substrate mixnet API.
+
+pub mod error;
 
-fn main() {}
+use jsonrpsee::{core::RpcResult, proc_macros::rpc};
+use sp_core::Bytes;
+
+#[rpc(client, server)]
+pub trait MixnetApi {
+	/// Submit encoded extrinsic over the mixnet for inclusion in block.
+	#[method(name = "mixnet_submitExtrinsic")]
+	async fn submit_extrinsic(&self, extrinsic: Bytes) -> RpcResult<()>;
+}
diff --git a/substrate/client/rpc-servers/Cargo.toml b/substrate/client/rpc-servers/Cargo.toml
index 70db49390dbbe27759532a3ed83d48177bd7165d..674a8db39cb576f6a0461d43c2fe8c7e0acb2ff2 100644
--- a/substrate/client/rpc-servers/Cargo.toml
+++ b/substrate/client/rpc-servers/Cargo.toml
@@ -1,11 +1,11 @@
 [package]
 name = "sc-rpc-server"
 version = "4.0.0-dev"
-authors = ["Parity Technologies <admin@parity.io>"]
-edition = "2021"
+authors.workspace = true
+edition.workspace = true
 license = "GPL-3.0-or-later WITH Classpath-exception-2.0"
 homepage = "https://substrate.io"
-repository = "https://github.com/paritytech/substrate/"
+repository.workspace = true
 description = "Substrate RPC servers."
 readme = "README.md"
 
@@ -15,7 +15,7 @@ targets = ["x86_64-unknown-linux-gnu"]
 [dependencies]
 jsonrpsee = { version = "0.16.2", features = ["server"] }
 log = "0.4.17"
-serde_json = "1.0.85"
+serde_json = "1.0.107"
 tokio = { version = "1.22.0", features = ["parking_lot"] }
 prometheus-endpoint = { package = "substrate-prometheus-endpoint", path = "../../utils/prometheus" }
 tower-http = { version = "0.4.0", features = ["cors"] }
diff --git a/substrate/client/rpc-servers/README.md b/substrate/client/rpc-servers/README.md
index cf00b3169a6276b048b5a132d02df7c77e21dbf0..16f1bb9f2a368fa7e19c082161be0ccf3c805a37 100644
--- a/substrate/client/rpc-servers/README.md
+++ b/substrate/client/rpc-servers/README.md
@@ -1,3 +1,3 @@
 Substrate RPC servers.
 
-License: GPL-3.0-or-later WITH Classpath-exception-2.0
\ No newline at end of file
+License: GPL-3.0-or-later WITH Classpath-exception-2.0
diff --git a/substrate/client/rpc-servers/src/lib.rs b/substrate/client/rpc-servers/src/lib.rs
index 92b31937a0cbb1e018cacf17c5e19f418293877b..dc625c3d6c4cf44d37b865d9e022047066b34e58 100644
--- a/substrate/client/rpc-servers/src/lib.rs
+++ b/substrate/client/rpc-servers/src/lib.rs
@@ -145,6 +145,8 @@ fn hosts_filtering(enabled: bool, addrs: &[SocketAddr]) -> AllowHosts {
 
 fn build_rpc_api<M: Send + Sync + 'static>(mut rpc_api: RpcModule<M>) -> RpcModule<M> {
 	let mut available_methods = rpc_api.method_names().collect::<Vec<_>>();
+	// The "rpc_methods" is defined below and we want it to be part of the reported methods.
+	available_methods.push("rpc_methods");
 	available_methods.sort();
 
 	rpc_api
diff --git a/substrate/client/rpc-spec-v2/Cargo.toml b/substrate/client/rpc-spec-v2/Cargo.toml
index b63291ef3933cea4063c5eaef7efdac91f395d4a..1eaed65706e049f0e1e4765334f76b26e723e088 100644
--- a/substrate/client/rpc-spec-v2/Cargo.toml
+++ b/substrate/client/rpc-spec-v2/Cargo.toml
@@ -1,11 +1,11 @@
 [package]
 name = "sc-rpc-spec-v2"
 version = "0.10.0-dev"
-authors = ["Parity Technologies <admin@parity.io>"]
-edition = "2021"
+authors.workspace = true
+edition.workspace = true
 license = "GPL-3.0-or-later WITH Classpath-exception-2.0"
 homepage = "https://substrate.io"
-repository = "https://github.com/paritytech/substrate/"
+repository.workspace = true
 description = "Substrate RPC interface v2."
 readme = "README.md"
 
@@ -31,12 +31,11 @@ serde = "1.0"
 hex = "0.4"
 futures = "0.3.21"
 parking_lot = "0.12.1"
-tokio-stream = { version = "0.1", features = ["sync"] }
+tokio-stream = { version = "0.1.14", features = ["sync"] }
 tokio = { version = "1.22.0", features = ["sync"] }
 array-bytes = "6.1"
 log = "0.4.17"
 futures-util = { version = "0.3.19", default-features = false }
-
 [dev-dependencies]
 serde_json = "1.0"
 tokio = { version = "1.22.0", features = ["macros"] }
diff --git a/substrate/client/rpc-spec-v2/README.md b/substrate/client/rpc-spec-v2/README.md
index e860e0c2334da50e57bee241b14e2807b25bc7f3..8ea6e686c1a6450f6daef9db01ccfa4ad27309df 100644
--- a/substrate/client/rpc-spec-v2/README.md
+++ b/substrate/client/rpc-spec-v2/README.md
@@ -1,5 +1,5 @@
 Substrate RPC interfaces.
 
-A collection of RPC methods and subscriptions supported by all substrate clients.
+A collection of RPC methods and subscriptions supported by all Substrate clients.
 
-License: GPL-3.0-or-later WITH Classpath-exception-2.0
\ No newline at end of file
+License: GPL-3.0-or-later WITH Classpath-exception-2.0
diff --git a/substrate/client/rpc-spec-v2/src/archive/api.rs b/substrate/client/rpc-spec-v2/src/archive/api.rs
new file mode 100644
index 0000000000000000000000000000000000000000..0583111cb488d1eeab5a175e13c6a592b2c7df3d
--- /dev/null
+++ b/substrate/client/rpc-spec-v2/src/archive/api.rs
@@ -0,0 +1,91 @@
+// This file is part of Substrate.
+
+// Copyright (C) Parity Technologies (UK) Ltd.
+// SPDX-License-Identifier: GPL-3.0-or-later WITH Classpath-exception-2.0
+
+// This program 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.
+
+// This program 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 this program. If not, see <https://www.gnu.org/licenses/>.
+
+//! API trait of the archive methods.
+
+use crate::MethodResult;
+use jsonrpsee::{core::RpcResult, proc_macros::rpc};
+
+#[rpc(client, server)]
+pub trait ArchiveApi<Hash> {
+	/// Retrieves the body (list of transactions) of a given block hash.
+	///
+	/// Returns an array of strings containing the hexadecimal-encoded SCALE-codec-encoded
+	/// transactions in that block. If no block with that hash is found, null.
+	///
+	/// # Unstable
+	///
+	/// This method is unstable and subject to change in the future.
+	#[method(name = "archive_unstable_body")]
+	fn archive_unstable_body(&self, hash: Hash) -> RpcResult<Option<Vec<String>>>;
+
+	/// Get the chain's genesis hash.
+	///
+	/// Returns a string containing the hexadecimal-encoded hash of the genesis block of the chain.
+	///
+	/// # Unstable
+	///
+	/// This method is unstable and subject to change in the future.
+	#[method(name = "archive_unstable_genesisHash")]
+	fn archive_unstable_genesis_hash(&self) -> RpcResult<String>;
+
+	/// Get the block's header.
+	///
+	/// Returns a string containing the hexadecimal-encoded SCALE-codec encoding header of the
+	/// block.
+	///
+	/// # Unstable
+	///
+	/// This method is unstable and subject to change in the future.
+	#[method(name = "archive_unstable_header")]
+	fn archive_unstable_header(&self, hash: Hash) -> RpcResult<Option<String>>;
+
+	/// Get the height of the current finalized block.
+	///
+	/// Returns an integer height of the current finalized block of the chain.
+	///
+	/// # Unstable
+	///
+	/// This method is unstable and subject to change in the future.
+	#[method(name = "archive_unstable_finalizedHeight")]
+	fn archive_unstable_finalized_height(&self) -> RpcResult<u64>;
+
+	/// Get the hashes of blocks from the given height.
+	///
+	/// Returns an array (possibly empty) of strings containing an hexadecimal-encoded hash of a
+	/// block header.
+	///
+	/// # Unstable
+	///
+	/// This method is unstable and subject to change in the future.
+	#[method(name = "archive_unstable_hashByHeight")]
+	fn archive_unstable_hash_by_height(&self, height: u64) -> RpcResult<Vec<String>>;
+
+	/// Call into the Runtime API at a specified block's state.
+	///
+	/// # Unstable
+	///
+	/// This method is unstable and subject to change in the future.
+	#[method(name = "archive_unstable_call")]
+	fn archive_unstable_call(
+		&self,
+		hash: Hash,
+		function: String,
+		call_parameters: String,
+	) -> RpcResult<MethodResult>;
+}
diff --git a/substrate/client/rpc-spec-v2/src/archive/archive.rs b/substrate/client/rpc-spec-v2/src/archive/archive.rs
new file mode 100644
index 0000000000000000000000000000000000000000..bded842d8fd0de408b0d233af12010d41a9a7df7
--- /dev/null
+++ b/substrate/client/rpc-spec-v2/src/archive/archive.rs
@@ -0,0 +1,188 @@
+// This file is part of Substrate.
+
+// Copyright (C) Parity Technologies (UK) Ltd.
+// SPDX-License-Identifier: GPL-3.0-or-later WITH Classpath-exception-2.0
+
+// This program 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.
+
+// This program 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 this program. If not, see <https://www.gnu.org/licenses/>.
+
+//! API implementation for `archive`.
+
+use crate::{
+	archive::{error::Error as ArchiveError, ArchiveApiServer},
+	chain_head::hex_string,
+	MethodResult,
+};
+
+use codec::Encode;
+use jsonrpsee::core::{async_trait, RpcResult};
+use sc_client_api::{
+	Backend, BlockBackend, BlockchainEvents, CallExecutor, ExecutorProvider, StorageProvider,
+};
+use sp_api::{CallApiAt, CallContext, NumberFor};
+use sp_blockchain::{
+	Backend as BlockChainBackend, Error as BlockChainError, HeaderBackend, HeaderMetadata,
+};
+use sp_core::Bytes;
+use sp_runtime::{
+	traits::{Block as BlockT, Header as HeaderT},
+	SaturatedConversion,
+};
+use std::{collections::HashSet, marker::PhantomData, sync::Arc};
+
+/// An API for archive RPC calls.
+pub struct Archive<BE: Backend<Block>, Block: BlockT, Client> {
+	/// Substrate client.
+	client: Arc<Client>,
+	/// Backend of the chain.
+	backend: Arc<BE>,
+	/// The hexadecimal encoded hash of the genesis block.
+	genesis_hash: String,
+	/// Phantom member to pin the block type.
+	_phantom: PhantomData<(Block, BE)>,
+}
+
+impl<BE: Backend<Block>, Block: BlockT, Client> Archive<BE, Block, Client> {
+	/// Create a new [`Archive`].
+	pub fn new<GenesisHash: AsRef<[u8]>>(
+		client: Arc<Client>,
+		backend: Arc<BE>,
+		genesis_hash: GenesisHash,
+	) -> Self {
+		let genesis_hash = hex_string(&genesis_hash.as_ref());
+		Self { client, backend, genesis_hash, _phantom: PhantomData }
+	}
+}
+
+/// Parse hex-encoded string parameter as raw bytes.
+///
+/// If the parsing fails, returns an error propagated to the RPC method.
+fn parse_hex_param(param: String) -> Result<Vec<u8>, ArchiveError> {
+	// Methods can accept empty parameters.
+	if param.is_empty() {
+		return Ok(Default::default())
+	}
+
+	array_bytes::hex2bytes(&param).map_err(|_| ArchiveError::InvalidParam(param))
+}
+
+#[async_trait]
+impl<BE, Block, Client> ArchiveApiServer<Block::Hash> for Archive<BE, Block, Client>
+where
+	Block: BlockT + 'static,
+	Block::Header: Unpin,
+	<<Block as BlockT>::Header as HeaderT>::Number: From<u64>,
+	BE: Backend<Block> + 'static,
+	Client: BlockBackend<Block>
+		+ ExecutorProvider<Block>
+		+ HeaderBackend<Block>
+		+ HeaderMetadata<Block, Error = BlockChainError>
+		+ BlockchainEvents<Block>
+		+ CallApiAt<Block>
+		+ StorageProvider<Block, BE>
+		+ 'static,
+{
+	fn archive_unstable_body(&self, hash: Block::Hash) -> RpcResult<Option<Vec<String>>> {
+		let Ok(Some(signed_block)) = self.client.block(hash) else { return Ok(None) };
+
+		let extrinsics = signed_block
+			.block
+			.extrinsics()
+			.iter()
+			.map(|extrinsic| hex_string(&extrinsic.encode()))
+			.collect();
+
+		Ok(Some(extrinsics))
+	}
+
+	fn archive_unstable_genesis_hash(&self) -> RpcResult<String> {
+		Ok(self.genesis_hash.clone())
+	}
+
+	fn archive_unstable_header(&self, hash: Block::Hash) -> RpcResult<Option<String>> {
+		let Ok(Some(header)) = self.client.header(hash) else { return Ok(None) };
+
+		Ok(Some(hex_string(&header.encode())))
+	}
+
+	fn archive_unstable_finalized_height(&self) -> RpcResult<u64> {
+		Ok(self.client.info().finalized_number.saturated_into())
+	}
+
+	fn archive_unstable_hash_by_height(&self, height: u64) -> RpcResult<Vec<String>> {
+		let height: NumberFor<Block> = height.into();
+		let finalized_num = self.client.info().finalized_number;
+
+		if finalized_num >= height {
+			let Ok(Some(hash)) = self.client.block_hash(height.into()) else { return Ok(vec![]) };
+			return Ok(vec![hex_string(&hash.as_ref())])
+		}
+
+		let blockchain = self.backend.blockchain();
+		// Fetch all the leaves of the blockchain that are on a higher or equal height.
+		let mut headers: Vec<_> = blockchain
+			.leaves()
+			.map_err(|error| ArchiveError::FetchLeaves(error.to_string()))?
+			.into_iter()
+			.filter_map(|hash| {
+				let Ok(Some(header)) = self.client.header(hash) else { return None };
+
+				if header.number() < &height {
+					return None
+				}
+
+				Some(header)
+			})
+			.collect();
+
+		let mut result = Vec::new();
+		let mut visited = HashSet::new();
+
+		while let Some(header) = headers.pop() {
+			if header.number() == &height {
+				result.push(hex_string(&header.hash().as_ref()));
+				continue
+			}
+
+			let parent_hash = *header.parent_hash();
+
+			// Continue the iteration for unique hashes.
+			// Forks might intersect on a common chain that is not yet finalized.
+			if visited.insert(parent_hash) {
+				let Ok(Some(next_header)) = self.client.header(parent_hash) else { continue };
+				headers.push(next_header);
+			}
+		}
+
+		Ok(result)
+	}
+
+	fn archive_unstable_call(
+		&self,
+		hash: Block::Hash,
+		function: String,
+		call_parameters: String,
+	) -> RpcResult<MethodResult> {
+		let call_parameters = Bytes::from(parse_hex_param(call_parameters)?);
+
+		let result =
+			self.client
+				.executor()
+				.call(hash, &function, &call_parameters, CallContext::Offchain);
+
+		Ok(match result {
+			Ok(result) => MethodResult::ok(hex_string(&result)),
+			Err(error) => MethodResult::err(error.to_string()),
+		})
+	}
+}
diff --git a/substrate/client/rpc-spec-v2/src/archive/error.rs b/substrate/client/rpc-spec-v2/src/archive/error.rs
new file mode 100644
index 0000000000000000000000000000000000000000..b858212399ce713abbb76e2182f3ccd8cf8cd880
--- /dev/null
+++ b/substrate/client/rpc-spec-v2/src/archive/error.rs
@@ -0,0 +1,66 @@
+// This file is part of Substrate.
+
+// Copyright (C) Parity Technologies (UK) Ltd.
+// SPDX-License-Identifier: GPL-3.0-or-later WITH Classpath-exception-2.0
+
+// This program 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.
+
+// This program 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 this program. If not, see <https://www.gnu.org/licenses/>.
+
+//! Error helpers for `archive` RPC module.
+
+use jsonrpsee::{
+	core::Error as RpcError,
+	types::error::{CallError, ErrorObject},
+};
+
+/// ChainHead RPC errors.
+#[derive(Debug, thiserror::Error)]
+pub enum Error {
+	/// Invalid parameter provided to the RPC method.
+	#[error("Invalid parameter: {0}")]
+	InvalidParam(String),
+	/// Runtime call failed.
+	#[error("Runtime call: {0}")]
+	RuntimeCall(String),
+	/// Failed to fetch leaves.
+	#[error("Failed to fetch leaves of the chain: {0}")]
+	FetchLeaves(String),
+}
+
+// Base code for all `archive` errors.
+const BASE_ERROR: i32 = 3000;
+/// Invalid parameter error.
+const INVALID_PARAM_ERROR: i32 = BASE_ERROR + 1;
+/// Runtime call error.
+const RUNTIME_CALL_ERROR: i32 = BASE_ERROR + 2;
+/// Failed to fetch leaves.
+const FETCH_LEAVES_ERROR: i32 = BASE_ERROR + 3;
+
+impl From<Error> for ErrorObject<'static> {
+	fn from(e: Error) -> Self {
+		let msg = e.to_string();
+
+		match e {
+			Error::InvalidParam(_) => ErrorObject::owned(INVALID_PARAM_ERROR, msg, None::<()>),
+			Error::RuntimeCall(_) => ErrorObject::owned(RUNTIME_CALL_ERROR, msg, None::<()>),
+			Error::FetchLeaves(_) => ErrorObject::owned(FETCH_LEAVES_ERROR, msg, None::<()>),
+		}
+		.into()
+	}
+}
+
+impl From<Error> for RpcError {
+	fn from(e: Error) -> Self {
+		CallError::Custom(e.into()).into()
+	}
+}
diff --git a/substrate/test-utils/test-crate/src/main.rs b/substrate/client/rpc-spec-v2/src/archive/mod.rs
similarity index 82%
rename from substrate/test-utils/test-crate/src/main.rs
rename to substrate/client/rpc-spec-v2/src/archive/mod.rs
index cab4cc6e924d7b0d1731477f5c3d3833153690f2..eb7d71d702f616133ec037d75f97784b781307c7 100644
--- a/substrate/test-utils/test-crate/src/main.rs
+++ b/substrate/client/rpc-spec-v2/src/archive/mod.rs
@@ -16,10 +16,17 @@
 // You should have received a copy of the GNU General Public License
 // along with this program. If not, see <https://www.gnu.org/licenses/>.
 
+//! Substrate archive API.
+//!
+//! # Note
+//!
+//! Methods are prefixed by `archive`.
+
 #[cfg(test)]
-#[test_utils::test]
-async fn basic_test() {
-	assert!(true);
-}
+mod tests;
+
+pub mod api;
+pub mod archive;
+pub mod error;
 
-fn main() {}
+pub use api::ArchiveApiServer;
diff --git a/substrate/client/rpc-spec-v2/src/archive/tests.rs b/substrate/client/rpc-spec-v2/src/archive/tests.rs
new file mode 100644
index 0000000000000000000000000000000000000000..36f7716e393cee5f46d68f63e5b495ef1f98b5f7
--- /dev/null
+++ b/substrate/client/rpc-spec-v2/src/archive/tests.rs
@@ -0,0 +1,258 @@
+// This file is part of Substrate.
+
+// Copyright (C) Parity Technologies (UK) Ltd.
+// SPDX-License-Identifier: GPL-3.0-or-later WITH Classpath-exception-2.0
+
+// This program 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.
+
+// This program 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 this program. If not, see <https://www.gnu.org/licenses/>.
+
+use crate::{chain_head::hex_string, MethodResult};
+
+use super::{archive::Archive, *};
+
+use assert_matches::assert_matches;
+use codec::{Decode, Encode};
+use jsonrpsee::{
+	core::error::Error,
+	types::{error::CallError, EmptyServerParams as EmptyParams},
+	RpcModule,
+};
+use sc_block_builder::BlockBuilderProvider;
+use sp_blockchain::HeaderBackend;
+use sp_consensus::BlockOrigin;
+use sp_runtime::SaturatedConversion;
+use std::sync::Arc;
+use substrate_test_runtime::Transfer;
+use substrate_test_runtime_client::{
+	prelude::*, runtime, Backend, BlockBuilderExt, Client, ClientBlockImportExt,
+};
+
+const CHAIN_GENESIS: [u8; 32] = [0; 32];
+const INVALID_HASH: [u8; 32] = [1; 32];
+
+type Header = substrate_test_runtime_client::runtime::Header;
+type Block = substrate_test_runtime_client::runtime::Block;
+
+fn setup_api() -> (Arc<Client<Backend>>, RpcModule<Archive<Backend, Block, Client<Backend>>>) {
+	let builder = TestClientBuilder::new();
+	let backend = builder.backend();
+	let client = Arc::new(builder.build());
+
+	let api = Archive::new(client.clone(), backend, CHAIN_GENESIS).into_rpc();
+
+	(client, api)
+}
+
+#[tokio::test]
+async fn archive_genesis() {
+	let (_client, api) = setup_api();
+
+	let genesis: String =
+		api.call("archive_unstable_genesisHash", EmptyParams::new()).await.unwrap();
+	assert_eq!(genesis, hex_string(&CHAIN_GENESIS));
+}
+
+#[tokio::test]
+async fn archive_body() {
+	let (mut client, api) = setup_api();
+
+	// Invalid block hash.
+	let invalid_hash = hex_string(&INVALID_HASH);
+	let res: Option<Vec<String>> = api.call("archive_unstable_body", [invalid_hash]).await.unwrap();
+	assert!(res.is_none());
+
+	// Import a new block with an extrinsic.
+	let mut builder = client.new_block(Default::default()).unwrap();
+	builder
+		.push_transfer(runtime::Transfer {
+			from: AccountKeyring::Alice.into(),
+			to: AccountKeyring::Ferdie.into(),
+			amount: 42,
+			nonce: 0,
+		})
+		.unwrap();
+	let block = builder.build().unwrap().block;
+	let block_hash = format!("{:?}", block.header.hash());
+	client.import(BlockOrigin::Own, block.clone()).await.unwrap();
+
+	let expected_tx = hex_string(&block.extrinsics[0].encode());
+
+	let body: Vec<String> = api.call("archive_unstable_body", [block_hash]).await.unwrap();
+	assert_eq!(vec![expected_tx], body);
+}
+
+#[tokio::test]
+async fn archive_header() {
+	let (mut client, api) = setup_api();
+
+	// Invalid block hash.
+	let invalid_hash = hex_string(&INVALID_HASH);
+	let res: Option<String> = api.call("archive_unstable_header", [invalid_hash]).await.unwrap();
+	assert!(res.is_none());
+
+	// Import a new block with an extrinsic.
+	let mut builder = client.new_block(Default::default()).unwrap();
+	builder
+		.push_transfer(runtime::Transfer {
+			from: AccountKeyring::Alice.into(),
+			to: AccountKeyring::Ferdie.into(),
+			amount: 42,
+			nonce: 0,
+		})
+		.unwrap();
+	let block = builder.build().unwrap().block;
+	let block_hash = format!("{:?}", block.header.hash());
+	client.import(BlockOrigin::Own, block.clone()).await.unwrap();
+
+	let header: String = api.call("archive_unstable_header", [block_hash]).await.unwrap();
+	let bytes = array_bytes::hex2bytes(&header).unwrap();
+	let header: Header = Decode::decode(&mut &bytes[..]).unwrap();
+	assert_eq!(header, block.header);
+}
+
+#[tokio::test]
+async fn archive_finalized_height() {
+	let (client, api) = setup_api();
+
+	let client_height: u32 = client.info().finalized_number.saturated_into();
+
+	let height: u32 =
+		api.call("archive_unstable_finalizedHeight", EmptyParams::new()).await.unwrap();
+
+	assert_eq!(client_height, height);
+}
+
+#[tokio::test]
+async fn archive_hash_by_height() {
+	let (mut client, api) = setup_api();
+
+	// Genesis height.
+	let hashes: Vec<String> = api.call("archive_unstable_hashByHeight", [0]).await.unwrap();
+	assert_eq!(hashes, vec![format!("{:?}", client.genesis_hash())]);
+
+	// Block tree:
+	// genesis -> finalized -> block 1 -> block 2 -> block 3
+	//                      -> block 1 -> block 4
+	//
+	//                          ^^^ h = N
+	//                                     ^^^ h =  N + 1
+	//                                                 ^^^ h = N + 2
+	let finalized = client.new_block(Default::default()).unwrap().build().unwrap().block;
+	let finalized_hash = finalized.header.hash();
+	client.import(BlockOrigin::Own, finalized.clone()).await.unwrap();
+	client.finalize_block(finalized_hash, None).unwrap();
+
+	let block_1 = client.new_block(Default::default()).unwrap().build().unwrap().block;
+	let block_1_hash = block_1.header.hash();
+	client.import(BlockOrigin::Own, block_1.clone()).await.unwrap();
+
+	let block_2 = client.new_block(Default::default()).unwrap().build().unwrap().block;
+	let block_2_hash = block_2.header.hash();
+	client.import(BlockOrigin::Own, block_2.clone()).await.unwrap();
+	let block_3 = client.new_block(Default::default()).unwrap().build().unwrap().block;
+	let block_3_hash = block_3.header.hash();
+	client.import(BlockOrigin::Own, block_3.clone()).await.unwrap();
+
+	// Import block 4 fork.
+	let mut block_builder = client.new_block_at(block_1_hash, Default::default(), false).unwrap();
+	// This push is required as otherwise block 3 has the same hash as block 1 and won't get
+	// imported
+	block_builder
+		.push_transfer(Transfer {
+			from: AccountKeyring::Alice.into(),
+			to: AccountKeyring::Ferdie.into(),
+			amount: 41,
+			nonce: 0,
+		})
+		.unwrap();
+	let block_4 = block_builder.build().unwrap().block;
+	let block_4_hash = block_4.header.hash();
+	client.import(BlockOrigin::Own, block_4.clone()).await.unwrap();
+
+	// Check finalized height.
+	let hashes: Vec<String> = api.call("archive_unstable_hashByHeight", [1]).await.unwrap();
+	assert_eq!(hashes, vec![format!("{:?}", finalized_hash)]);
+
+	// Test nonfinalized heights.
+	// Height N must include block 1.
+	let mut height = block_1.header.number;
+	let hashes: Vec<String> = api.call("archive_unstable_hashByHeight", [height]).await.unwrap();
+	assert_eq!(hashes, vec![format!("{:?}", block_1_hash)]);
+
+	// Height (N + 1) must include block 2 and 4.
+	height += 1;
+	let hashes: Vec<String> = api.call("archive_unstable_hashByHeight", [height]).await.unwrap();
+	assert_eq!(hashes, vec![format!("{:?}", block_4_hash), format!("{:?}", block_2_hash)]);
+
+	// Height (N + 2) must include block 3.
+	height += 1;
+	let hashes: Vec<String> = api.call("archive_unstable_hashByHeight", [height]).await.unwrap();
+	assert_eq!(hashes, vec![format!("{:?}", block_3_hash)]);
+
+	// Height (N + 3) has no blocks.
+	height += 1;
+	let hashes: Vec<String> = api.call("archive_unstable_hashByHeight", [height]).await.unwrap();
+	assert!(hashes.is_empty());
+}
+
+#[tokio::test]
+async fn archive_call() {
+	let (mut client, api) = setup_api();
+	let invalid_hash = hex_string(&INVALID_HASH);
+
+	// Invalid parameter (non-hex).
+	let err = api
+		.call::<_, serde_json::Value>(
+			"archive_unstable_call",
+			[&invalid_hash, "BabeApi_current_epoch", "0x00X"],
+		)
+		.await
+		.unwrap_err();
+	assert_matches!(err, Error::Call(CallError::Custom(ref err)) if err.code() == 3001 && err.message().contains("Invalid parameter"));
+
+	// Pass an invalid parameters that cannot be decode.
+	let err = api
+		.call::<_, serde_json::Value>(
+			"archive_unstable_call",
+			// 0x0 is invalid.
+			[&invalid_hash, "BabeApi_current_epoch", "0x0"],
+		)
+		.await
+		.unwrap_err();
+	assert_matches!(err, Error::Call(CallError::Custom(ref err)) if err.code() == 3001 && err.message().contains("Invalid parameter"));
+
+	// Invalid hash.
+	let result: MethodResult = api
+		.call("archive_unstable_call", [&invalid_hash, "BabeApi_current_epoch", "0x00"])
+		.await
+		.unwrap();
+	assert_matches!(result, MethodResult::Err(_));
+
+	let block_1 = client.new_block(Default::default()).unwrap().build().unwrap().block;
+	let block_1_hash = block_1.header.hash();
+	client.import(BlockOrigin::Own, block_1.clone()).await.unwrap();
+
+	// Valid call.
+	let alice_id = AccountKeyring::Alice.to_account_id();
+	// Hex encoded scale encoded bytes representing the call parameters.
+	let call_parameters = hex_string(&alice_id.encode());
+	let result: MethodResult = api
+		.call(
+			"archive_unstable_call",
+			[&format!("{:?}", block_1_hash), "AccountNonceApi_account_nonce", &call_parameters],
+		)
+		.await
+		.unwrap();
+	let expected = MethodResult::ok("0x0000000000000000");
+	assert_eq!(result, expected);
+}
diff --git a/substrate/client/rpc-spec-v2/src/chain_head/api.rs b/substrate/client/rpc-spec-v2/src/chain_head/api.rs
index 682cd690dd10cf45bebfe73f1abbb680b87417e5..d93c4018b60faee0928204f1a6ecdfb75dab845c 100644
--- a/substrate/client/rpc-spec-v2/src/chain_head/api.rs
+++ b/substrate/client/rpc-spec-v2/src/chain_head/api.rs
@@ -30,7 +30,7 @@ pub trait ChainHeadApi<Hash> {
 	///
 	/// This method is unstable and subject to change in the future.
 	#[subscription(
-		name = "chainHead_unstable_follow",
+		name = "chainHead_unstable_follow" => "chainHead_unstable_followEvent",
 		unsubscribe = "chainHead_unstable_unfollow",
 		item = FollowEvent<Hash>,
 	)]
diff --git a/substrate/client/rpc-spec-v2/src/chain_head/chain_head.rs b/substrate/client/rpc-spec-v2/src/chain_head/chain_head.rs
index bae7c84df0ed915ebf8bb7a4add462c1905288d3..a8c1c4f7e083d86b19906d8845a5ee84b3b5ca6e 100644
--- a/substrate/client/rpc-spec-v2/src/chain_head/chain_head.rs
+++ b/substrate/client/rpc-spec-v2/src/chain_head/chain_head.rs
@@ -27,7 +27,7 @@ use crate::{
 		api::ChainHeadApiServer,
 		chain_head_follow::ChainHeadFollower,
 		error::Error as ChainHeadRpcError,
-		event::{FollowEvent, MethodResponse, OperationError, StorageQuery, StorageQueryType},
+		event::{FollowEvent, MethodResponse, OperationError, StorageQuery},
 		hex_string,
 		subscription::{SubscriptionManagement, SubscriptionManagementError},
 	},
@@ -329,19 +329,10 @@ where
 		let items = items
 			.into_iter()
 			.map(|query| {
-				if query.query_type == StorageQueryType::ClosestDescendantMerkleValue {
-					// Note: remove this once all types are implemented.
-					return Err(ChainHeadRpcError::InvalidParam(
-						"Storage query type not supported".into(),
-					))
-				}
-
-				Ok(StorageQuery {
-					key: StorageKey(parse_hex_param(query.key)?),
-					query_type: query.query_type,
-				})
+				let key = StorageKey(parse_hex_param(query.key)?);
+				Ok(StorageQuery { key, query_type: query.query_type })
 			})
-			.collect::<Result<Vec<_>, _>>()?;
+			.collect::<Result<Vec<_>, ChainHeadRpcError>>()?;
 
 		let child_trie = child_trie
 			.map(|child_trie| parse_hex_param(child_trie))
@@ -462,7 +453,8 @@ where
 		follow_subscription: String,
 		operation_id: String,
 	) -> RpcResult<()> {
-		let Some(operation) = self.subscriptions.get_operation(&follow_subscription, &operation_id) else {
+		let Some(operation) = self.subscriptions.get_operation(&follow_subscription, &operation_id)
+		else {
 			return Ok(())
 		};
 
@@ -479,7 +471,8 @@ where
 		follow_subscription: String,
 		operation_id: String,
 	) -> RpcResult<()> {
-		let Some(operation) = self.subscriptions.get_operation(&follow_subscription, &operation_id) else {
+		let Some(operation) = self.subscriptions.get_operation(&follow_subscription, &operation_id)
+		else {
 			return Ok(())
 		};
 
diff --git a/substrate/client/rpc-spec-v2/src/chain_head/chain_head_follow.rs b/substrate/client/rpc-spec-v2/src/chain_head/chain_head_follow.rs
index 0fa995ce73a094f1fb9509847357d0712cbb3bbf..b981e69f2e473a6d3dfa44a08ced9702b86eb326 100644
--- a/substrate/client/rpc-spec-v2/src/chain_head/chain_head_follow.rs
+++ b/substrate/client/rpc-spec-v2/src/chain_head/chain_head_follow.rs
@@ -158,7 +158,7 @@ where
 		let parent = match parent {
 			Some(parent) => parent,
 			// Nothing to compare against, always report.
-			None => return Some(RuntimeEvent::Valid(RuntimeVersionEvent { spec: block_rt })),
+			None => return Some(RuntimeEvent::Valid(RuntimeVersionEvent { spec: block_rt.into() })),
 		};
 
 		let parent_rt = match self.client.runtime_version_at(parent) {
@@ -168,7 +168,7 @@ where
 
 		// Report the runtime version change.
 		if block_rt != parent_rt {
-			Some(RuntimeEvent::Valid(RuntimeVersionEvent { spec: block_rt }))
+			Some(RuntimeEvent::Valid(RuntimeVersionEvent { spec: block_rt.into() }))
 		} else {
 			None
 		}
diff --git a/substrate/client/rpc-spec-v2/src/chain_head/chain_head_storage.rs b/substrate/client/rpc-spec-v2/src/chain_head/chain_head_storage.rs
index 5e1f38f9a99785cf085467fbf9d92876d1190812..6e19f59a5d68747dce1c9a9506dc4f36e662a5d3 100644
--- a/substrate/client/rpc-spec-v2/src/chain_head/chain_head_storage.rs
+++ b/substrate/client/rpc-spec-v2/src/chain_head/chain_head_storage.rs
@@ -71,8 +71,10 @@ impl<Client, Block, BE> ChainHeadStorage<Client, Block, BE> {
 
 /// Query to iterate over storage.
 struct QueryIter {
-	/// The next key from which the iteration should continue.
-	next_key: StorageKey,
+	/// The key from which the iteration was started.
+	query_key: StorageKey,
+	/// The key after which pagination should resume.
+	pagination_start_key: Option<StorageKey>,
 	/// The type of the query (either value or hash).
 	ty: IterQueryType,
 }
@@ -145,6 +147,36 @@ where
 			.unwrap_or_else(|error| QueryResult::Err(error.to_string()))
 	}
 
+	/// Fetch the closest merkle value.
+	fn query_storage_merkle_value(
+		&self,
+		hash: Block::Hash,
+		key: &StorageKey,
+		child_key: Option<&ChildInfo>,
+	) -> QueryResult {
+		let result = if let Some(child_key) = child_key {
+			self.client.child_closest_merkle_value(hash, child_key, key)
+		} else {
+			self.client.closest_merkle_value(hash, key)
+		};
+
+		result
+			.map(|opt| {
+				QueryResult::Ok(opt.map(|storage_data| {
+					let result = match &storage_data {
+						sc_client_api::MerkleValue::Node(data) => hex_string(&data.as_slice()),
+						sc_client_api::MerkleValue::Hash(hash) => hex_string(&hash.as_ref()),
+					};
+
+					StorageResult {
+						key: hex_string(&key.0),
+						result: StorageResultType::ClosestDescendantMerkleValue(result),
+					}
+				}))
+			})
+			.unwrap_or_else(|error| QueryResult::Err(error.to_string()))
+	}
+
 	/// Iterate over at most `operation_max_storage_items` keys.
 	///
 	/// Returns the storage result with a potential next key to resume iteration.
@@ -154,21 +186,26 @@ where
 		hash: Block::Hash,
 		child_key: Option<&ChildInfo>,
 	) -> QueryIterResult {
-		let QueryIter { next_key, ty } = query;
+		let QueryIter { ty, query_key, pagination_start_key } = query;
 
 		let mut keys_iter = if let Some(child_key) = child_key {
-			self.client
-				.child_storage_keys(hash, child_key.to_owned(), Some(&next_key), None)
+			self.client.child_storage_keys(
+				hash,
+				child_key.to_owned(),
+				Some(&query_key),
+				pagination_start_key.as_ref(),
+			)
 		} else {
-			self.client.storage_keys(hash, Some(&next_key), None)
+			self.client.storage_keys(hash, Some(&query_key), pagination_start_key.as_ref())
 		}
 		.map_err(|err| err.to_string())?;
 
 		let mut ret = Vec::with_capacity(self.operation_max_storage_items);
+		let mut next_pagination_key = None;
 		for _ in 0..self.operation_max_storage_items {
-			let Some(key) = keys_iter.next() else {
-				break
-			};
+			let Some(key) = keys_iter.next() else { break };
+
+			next_pagination_key = Some(key.clone());
 
 			let result = match ty {
 				IterQueryType::Value => self.query_storage_value(hash, &key, child_key),
@@ -181,7 +218,11 @@ where
 		}
 
 		// Save the next key if any to continue the iteration.
-		let maybe_next_query = keys_iter.next().map(|next_key| QueryIter { next_key, ty });
+		let maybe_next_query = keys_iter.next().map(|_| QueryIter {
+			ty,
+			query_key,
+			pagination_start_key: next_pagination_key,
+		});
 		Ok((ret, maybe_next_query))
 	}
 
@@ -288,13 +329,25 @@ where
 							return
 						},
 					},
-				StorageQueryType::DescendantsValues => self
-					.iter_operations
-					.push_back(QueryIter { next_key: item.key, ty: IterQueryType::Value }),
-				StorageQueryType::DescendantsHashes => self
-					.iter_operations
-					.push_back(QueryIter { next_key: item.key, ty: IterQueryType::Hash }),
-				_ => continue,
+				StorageQueryType::ClosestDescendantMerkleValue =>
+					match self.query_storage_merkle_value(hash, &item.key, child_key.as_ref()) {
+						Ok(Some(value)) => storage_results.push(value),
+						Ok(None) => continue,
+						Err(error) => {
+							send_error::<Block>(&sender, operation.operation_id(), error);
+							return
+						},
+					},
+				StorageQueryType::DescendantsValues => self.iter_operations.push_back(QueryIter {
+					query_key: item.key,
+					ty: IterQueryType::Value,
+					pagination_start_key: None,
+				}),
+				StorageQueryType::DescendantsHashes => self.iter_operations.push_back(QueryIter {
+					query_key: item.key,
+					ty: IterQueryType::Hash,
+					pagination_start_key: None,
+				}),
 			};
 		}
 
diff --git a/substrate/client/rpc-spec-v2/src/chain_head/error.rs b/substrate/client/rpc-spec-v2/src/chain_head/error.rs
index 3b2edb2b00c8cd63bd85d84cd01576b10c2e4ce0..811666428c5a56479ede3af21f9fadcbd305dce2 100644
--- a/substrate/client/rpc-spec-v2/src/chain_head/error.rs
+++ b/substrate/client/rpc-spec-v2/src/chain_head/error.rs
@@ -69,7 +69,6 @@ impl From<Error> for ErrorObject<'static> {
 			Error::InvalidSubscriptionID => ErrorObject::owned(INVALID_SUB_ID, msg, None::<()>),
 			Error::InvalidContinue => ErrorObject::owned(INVALID_CONTINUE, msg, None::<()>),
 		}
-		.into()
 	}
 }
 
diff --git a/substrate/client/rpc-spec-v2/src/chain_head/event.rs b/substrate/client/rpc-spec-v2/src/chain_head/event.rs
index 65bc8b247c880d392e1c1ab62272f5dfa3a53acb..b5f9d6cc2fff44800ff70a690ae347820242aac8 100644
--- a/substrate/client/rpc-spec-v2/src/chain_head/event.rs
+++ b/substrate/client/rpc-spec-v2/src/chain_head/event.rs
@@ -21,6 +21,7 @@
 use serde::{ser::SerializeStruct, Deserialize, Serialize, Serializer};
 use sp_api::ApiError;
 use sp_version::RuntimeVersion;
+use std::collections::BTreeMap;
 
 /// The operation could not be processed due to an error.
 #[derive(Debug, Clone, PartialEq, Serialize, Deserialize)]
@@ -35,11 +36,47 @@ pub struct ErrorEvent {
 /// This event is generated for:
 ///   - the first announced block by the follow subscription
 ///   - blocks that suffered a change in runtime compared with their parents
-#[derive(Debug, Clone, PartialEq, Serialize, Deserialize)]
+#[derive(Debug, Clone, Serialize, Deserialize, PartialEq)]
 #[serde(rename_all = "camelCase")]
 pub struct RuntimeVersionEvent {
 	/// The runtime version.
-	pub spec: RuntimeVersion,
+	pub spec: ChainHeadRuntimeVersion,
+}
+
+/// Simplified type clone of `sp_version::RuntimeVersion`. Used instead of
+/// `sp_version::RuntimeVersion` to conform to RPC spec V2.
+#[derive(Debug, Clone, PartialEq, Serialize, Deserialize)]
+#[serde(rename_all = "camelCase")]
+pub struct ChainHeadRuntimeVersion {
+	/// Identifies the different Substrate runtimes.
+	pub spec_name: String,
+	/// Name of the implementation of the spec.
+	pub impl_name: String,
+	/// Version of the runtime specification.
+	pub spec_version: u32,
+	/// Version of the implementation of the specification.
+	pub impl_version: u32,
+	/// Map of all supported API "features" and their versions.
+	pub apis: BTreeMap<String, u32>,
+	/// Transaction version.
+	pub transaction_version: u32,
+}
+
+impl From<RuntimeVersion> for ChainHeadRuntimeVersion {
+	fn from(val: RuntimeVersion) -> Self {
+		Self {
+			spec_name: val.spec_name.into(),
+			impl_name: val.impl_name.into(),
+			spec_version: val.spec_version,
+			impl_version: val.impl_version,
+			apis: val
+				.apis
+				.into_iter()
+				.map(|(api, version)| (sp_core::bytes::to_hex(api, false), *version))
+				.collect(),
+			transaction_version: val.transaction_version,
+		}
+	}
 }
 
 /// The runtime event generated if the `follow` subscription
@@ -380,7 +417,7 @@ mod tests {
 			..Default::default()
 		};
 
-		let runtime_event = RuntimeEvent::Valid(RuntimeVersionEvent { spec: runtime });
+		let runtime_event = RuntimeEvent::Valid(RuntimeVersionEvent { spec: runtime.into() });
 		let mut initialized = Initialized {
 			finalized_block_hash: "0x1".into(),
 			finalized_block_runtime: Some(runtime_event),
@@ -391,8 +428,8 @@ mod tests {
 		let ser = serde_json::to_string(&event).unwrap();
 		let exp = concat!(
 			r#"{"event":"initialized","finalizedBlockHash":"0x1","#,
-			r#""finalizedBlockRuntime":{"type":"valid","spec":{"specName":"ABC","implName":"Impl","authoringVersion":0,"#,
-			r#""specVersion":1,"implVersion":0,"apis":[],"transactionVersion":0,"stateVersion":0}}}"#,
+			r#""finalizedBlockRuntime":{"type":"valid","spec":{"specName":"ABC","implName":"Impl","#,
+			r#""specVersion":1,"implVersion":0,"apis":{},"transactionVersion":0}}}"#,
 		);
 		assert_eq!(ser, exp);
 
@@ -429,10 +466,11 @@ mod tests {
 			spec_name: "ABC".into(),
 			impl_name: "Impl".into(),
 			spec_version: 1,
+			apis: vec![([0, 0, 0, 0, 0, 0, 0, 0], 2), ([1, 0, 0, 0, 0, 0, 0, 0], 3)].into(),
 			..Default::default()
 		};
 
-		let runtime_event = RuntimeEvent::Valid(RuntimeVersionEvent { spec: runtime });
+		let runtime_event = RuntimeEvent::Valid(RuntimeVersionEvent { spec: runtime.into() });
 		let mut new_block = NewBlock {
 			block_hash: "0x1".into(),
 			parent_block_hash: "0x2".into(),
@@ -445,8 +483,8 @@ mod tests {
 		let ser = serde_json::to_string(&event).unwrap();
 		let exp = concat!(
 			r#"{"event":"newBlock","blockHash":"0x1","parentBlockHash":"0x2","#,
-			r#""newRuntime":{"type":"valid","spec":{"specName":"ABC","implName":"Impl","authoringVersion":0,"#,
-			r#""specVersion":1,"implVersion":0,"apis":[],"transactionVersion":0,"stateVersion":0}}}"#,
+			r#""newRuntime":{"type":"valid","spec":{"specName":"ABC","implName":"Impl","#,
+			r#""specVersion":1,"implVersion":0,"apis":{"0x0000000000000000":2,"0x0100000000000000":3},"transactionVersion":0}}}"#,
 		);
 		assert_eq!(ser, exp);
 
diff --git a/substrate/client/rpc-spec-v2/src/chain_head/test_utils.rs b/substrate/client/rpc-spec-v2/src/chain_head/test_utils.rs
index 6e92e87608b44abab9a4133e456e4f4f7272819c..a901f3039ffeabb8b4e9999e1bba28d1aa10d687 100644
--- a/substrate/client/rpc-spec-v2/src/chain_head/test_utils.rs
+++ b/substrate/client/rpc-spec-v2/src/chain_head/test_utils.rs
@@ -20,8 +20,8 @@ use parking_lot::Mutex;
 use sc_client_api::{
 	execution_extensions::ExecutionExtensions, BlockBackend, BlockImportNotification,
 	BlockchainEvents, CallExecutor, ChildInfo, ExecutorProvider, FinalityNotification,
-	FinalityNotifications, FinalizeSummary, ImportNotifications, KeysIter, PairsIter, StorageData,
-	StorageEventStream, StorageKey, StorageProvider,
+	FinalityNotifications, FinalizeSummary, ImportNotifications, KeysIter, MerkleValue, PairsIter,
+	StorageData, StorageEventStream, StorageKey, StorageProvider,
 };
 use sc_utils::mpsc::{tracing_unbounded, TracingUnboundedSender};
 use sp_api::{CallApiAt, CallApiAtParams, NumberFor, RuntimeVersion};
@@ -198,6 +198,23 @@ impl<
 	) -> sp_blockchain::Result<Option<Block::Hash>> {
 		self.client.child_storage_hash(hash, child_info, key)
 	}
+
+	fn closest_merkle_value(
+		&self,
+		hash: Block::Hash,
+		key: &StorageKey,
+	) -> sp_blockchain::Result<Option<MerkleValue<Block::Hash>>> {
+		self.client.closest_merkle_value(hash, key)
+	}
+
+	fn child_closest_merkle_value(
+		&self,
+		hash: Block::Hash,
+		child_info: &ChildInfo,
+		key: &StorageKey,
+	) -> sp_blockchain::Result<Option<MerkleValue<Block::Hash>>> {
+		self.client.child_closest_merkle_value(hash, child_info, key)
+	}
 }
 
 impl<Block: BlockT, Client: CallApiAt<Block>> CallApiAt<Block> for ChainHeadMockClient<Client> {
diff --git a/substrate/client/rpc-spec-v2/src/chain_head/tests.rs b/substrate/client/rpc-spec-v2/src/chain_head/tests.rs
index 00ed9089058eeb2b364d84b9722ae6d97728d1e9..8aaeb413cdff9a6c797bc7ea4e975edb6808dd09 100644
--- a/substrate/client/rpc-spec-v2/src/chain_head/tests.rs
+++ b/substrate/client/rpc-spec-v2/src/chain_head/tests.rs
@@ -1,3 +1,21 @@
+// This file is part of Substrate.
+
+// Copyright (C) Parity Technologies (UK) Ltd.
+// SPDX-License-Identifier: GPL-3.0-or-later WITH Classpath-exception-2.0
+
+// This program 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.
+
+// This program 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 this program. If not, see <https://www.gnu.org/licenses/>.
+
 use crate::chain_head::{
 	event::{MethodResponse, StorageQuery, StorageQueryType, StorageResultType},
 	test_utils::ChainHeadMockClient,
@@ -25,7 +43,12 @@ use sp_core::{
 	Blake2Hasher, Hasher,
 };
 use sp_version::RuntimeVersion;
-use std::{collections::HashSet, fmt::Debug, sync::Arc, time::Duration};
+use std::{
+	collections::{HashMap, HashSet},
+	fmt::Debug,
+	sync::Arc,
+	time::Duration,
+};
 use substrate_test_runtime::Transfer;
 use substrate_test_runtime_client::{
 	prelude::*, runtime, runtime::RuntimeApi, Backend, BlockBuilderExt, Client,
@@ -211,17 +234,17 @@ async fn follow_with_runtime() {
 	let event: FollowEvent<String> = get_next_event(&mut sub).await;
 
 	// it is basically json-encoded substrate_test_runtime_client::runtime::VERSION
-	let runtime_str = "{\"specName\":\"test\",\"implName\":\"parity-test\",\"authoringVersion\":1,\
+	let runtime_str = "{\"specName\":\"test\",\"implName\":\"parity-test\",\"authoringVersion\":0,\
 		\"specVersion\":2,\"implVersion\":2,\"apis\":[[\"0xdf6acb689907609b\",4],\
 		[\"0x37e397fc7c91f5e4\",2],[\"0xd2bc9897eed08f15\",3],[\"0x40fe3ad401f8959a\",6],\
 		[\"0xbc9d89904f5b923f\",1],[\"0xc6e9a76309f39b09\",2],[\"0xdd718d5cc53262d4\",1],\
 		[\"0xcbca25e39f142387\",2],[\"0xf78b278be53f454c\",2],[\"0xab3c0572291feb8b\",1],\
-		[\"0xed99c5acb25eedf5\",3],[\"0xfbc577b9d747efd6\",1]],\"transactionVersion\":1,\"stateVersion\":1}";
+		[\"0xed99c5acb25eedf5\",3],[\"0xfbc577b9d747efd6\",1]],\"transactionVersion\":1,\"stateVersion\":0}";
 
 	let runtime: RuntimeVersion = serde_json::from_str(runtime_str).unwrap();
 
 	let finalized_block_runtime =
-		Some(RuntimeEvent::Valid(RuntimeVersionEvent { spec: runtime.clone() }));
+		Some(RuntimeEvent::Valid(RuntimeVersionEvent { spec: runtime.clone().into() }));
 	// Runtime must always be reported with the first event.
 	let expected = FollowEvent::Initialized(Initialized {
 		finalized_block_hash: format!("{:?}", finalized_hash),
@@ -285,7 +308,8 @@ async fn follow_with_runtime() {
 	let best_hash = block.header.hash();
 	client.import(BlockOrigin::Own, block.clone()).await.unwrap();
 
-	let new_runtime = Some(RuntimeEvent::Valid(RuntimeVersionEvent { spec: runtime.clone() }));
+	let new_runtime =
+		Some(RuntimeEvent::Valid(RuntimeVersionEvent { spec: runtime.clone().into() }));
 	let event: FollowEvent<String> = get_next_event(&mut sub).await;
 	let expected = FollowEvent::NewBlock(NewBlock {
 		block_hash: format!("{:?}", best_hash),
@@ -2329,6 +2353,7 @@ async fn check_continue_operation() {
 	builder.push_storage_change(b":m".to_vec(), Some(b"a".to_vec())).unwrap();
 	builder.push_storage_change(b":mo".to_vec(), Some(b"ab".to_vec())).unwrap();
 	builder.push_storage_change(b":moc".to_vec(), Some(b"abc".to_vec())).unwrap();
+	builder.push_storage_change(b":moD".to_vec(), Some(b"abcmoD".to_vec())).unwrap();
 	builder.push_storage_change(b":mock".to_vec(), Some(b"abcd".to_vec())).unwrap();
 	let block = builder.build().unwrap().block;
 	let block_hash = format!("{:?}", block.header.hash());
@@ -2407,6 +2432,25 @@ async fn check_continue_operation() {
 			res.items[0].result == StorageResultType::Value(hex_string(b"ab"))
 	);
 
+	// Pagination event.
+	assert_matches!(
+		get_next_event::<FollowEvent<String>>(&mut sub).await,
+		FollowEvent::OperationWaitingForContinue(res) if res.operation_id == operation_id
+	);
+	does_not_produce_event::<FollowEvent<String>>(
+		&mut sub,
+		std::time::Duration::from_secs(DOES_NOT_PRODUCE_EVENTS_SECONDS),
+	)
+	.await;
+	let _res: () = api.call("chainHead_unstable_continue", [&sub_id, &operation_id]).await.unwrap();
+	assert_matches!(
+		get_next_event::<FollowEvent<String>>(&mut sub).await,
+		FollowEvent::OperationStorageItems(res) if res.operation_id == operation_id &&
+			res.items.len() == 1 &&
+			res.items[0].key == hex_string(b":moD") &&
+			res.items[0].result == StorageResultType::Value(hex_string(b"abcmoD"))
+	);
+
 	// Pagination event.
 	assert_matches!(
 		get_next_event::<FollowEvent<String>>(&mut sub).await,
@@ -2565,3 +2609,186 @@ async fn stop_storage_operation() {
 	)
 	.await;
 }
+
+#[tokio::test]
+async fn storage_closest_merkle_value() {
+	let (mut client, api, mut sub, sub_id, _) = setup_api().await;
+
+	/// The core of this test.
+	///
+	/// Checks keys that are exact match, keys with descedant and keys that should not return
+	/// values.
+	///
+	/// Returns (key, merkle value) pairs.
+	async fn expect_merkle_request(
+		api: &RpcModule<ChainHead<Backend, Block, Client<Backend>>>,
+		mut sub: &mut RpcSubscription,
+		sub_id: String,
+		block_hash: String,
+	) -> HashMap<String, String> {
+		// Valid call with storage at the keys.
+		let response: MethodResponse = api
+			.call(
+				"chainHead_unstable_storage",
+				rpc_params![
+					&sub_id,
+					&block_hash,
+					vec![
+						StorageQuery {
+							key: hex_string(b":AAAA"),
+							query_type: StorageQueryType::ClosestDescendantMerkleValue
+						},
+						StorageQuery {
+							key: hex_string(b":AAAB"),
+							query_type: StorageQueryType::ClosestDescendantMerkleValue
+						},
+						// Key with descedent.
+						StorageQuery {
+							key: hex_string(b":A"),
+							query_type: StorageQueryType::ClosestDescendantMerkleValue
+						},
+						StorageQuery {
+							key: hex_string(b":AA"),
+							query_type: StorageQueryType::ClosestDescendantMerkleValue
+						},
+						// Keys below this comment do not produce a result.
+						// Key that exceed the keyspace of the trie.
+						StorageQuery {
+							key: hex_string(b":AAAAX"),
+							query_type: StorageQueryType::ClosestDescendantMerkleValue
+						},
+						StorageQuery {
+							key: hex_string(b":AAABX"),
+							query_type: StorageQueryType::ClosestDescendantMerkleValue
+						},
+						// Key that are not part of the trie.
+						StorageQuery {
+							key: hex_string(b":AAX"),
+							query_type: StorageQueryType::ClosestDescendantMerkleValue
+						},
+						StorageQuery {
+							key: hex_string(b":AAAX"),
+							query_type: StorageQueryType::ClosestDescendantMerkleValue
+						},
+					]
+				],
+			)
+			.await
+			.unwrap();
+		let operation_id = match response {
+			MethodResponse::Started(started) => started.operation_id,
+			MethodResponse::LimitReached => panic!("Expected started response"),
+		};
+
+		let event = get_next_event::<FollowEvent<String>>(&mut sub).await;
+		let merkle_values: HashMap<_, _> = match event {
+			FollowEvent::OperationStorageItems(res) => {
+				assert_eq!(res.operation_id, operation_id);
+
+				res.items
+					.into_iter()
+					.map(|res| {
+						let value = match res.result {
+							StorageResultType::ClosestDescendantMerkleValue(value) => value,
+							_ => panic!("Unexpected StorageResultType"),
+						};
+						(res.key, value)
+					})
+					.collect()
+			},
+			_ => panic!("Expected OperationStorageItems event"),
+		};
+
+		// Finished.
+		assert_matches!(
+				get_next_event::<FollowEvent<String>>(&mut sub).await,
+				FollowEvent::OperationStorageDone(done) if done.operation_id == operation_id
+		);
+
+		// Response for AAAA, AAAB, A and AA.
+		assert_eq!(merkle_values.len(), 4);
+
+		// While checking for expected merkle values to align,
+		// the following will check that the returned keys are
+		// expected.
+
+		// Values for AAAA and AAAB are different.
+		assert_ne!(
+			merkle_values.get(&hex_string(b":AAAA")).unwrap(),
+			merkle_values.get(&hex_string(b":AAAB")).unwrap()
+		);
+
+		// Values for A and AA should be on the same branch node.
+		assert_eq!(
+			merkle_values.get(&hex_string(b":A")).unwrap(),
+			merkle_values.get(&hex_string(b":AA")).unwrap()
+		);
+		// The branch node value must be different than the leaf of either
+		// AAAA and AAAB.
+		assert_ne!(
+			merkle_values.get(&hex_string(b":A")).unwrap(),
+			merkle_values.get(&hex_string(b":AAAA")).unwrap()
+		);
+		assert_ne!(
+			merkle_values.get(&hex_string(b":A")).unwrap(),
+			merkle_values.get(&hex_string(b":AAAB")).unwrap()
+		);
+
+		merkle_values
+	}
+
+	// Import a new block with storage changes.
+	let mut builder = client.new_block(Default::default()).unwrap();
+	builder.push_storage_change(b":AAAA".to_vec(), Some(vec![1; 64])).unwrap();
+	builder.push_storage_change(b":AAAB".to_vec(), Some(vec![2; 64])).unwrap();
+	let block = builder.build().unwrap().block;
+	let block_hash = format!("{:?}", block.header.hash());
+	client.import(BlockOrigin::Own, block.clone()).await.unwrap();
+
+	// Ensure the imported block is propagated and pinned for this subscription.
+	assert_matches!(
+		get_next_event::<FollowEvent<String>>(&mut sub).await,
+		FollowEvent::NewBlock(_)
+	);
+	assert_matches!(
+		get_next_event::<FollowEvent<String>>(&mut sub).await,
+		FollowEvent::BestBlockChanged(_)
+	);
+
+	let merkle_values_lhs = expect_merkle_request(&api, &mut sub, sub_id.clone(), block_hash).await;
+
+	// Import a new block with and change AAAB value.
+	let mut builder = client.new_block(Default::default()).unwrap();
+	builder.push_storage_change(b":AAAA".to_vec(), Some(vec![1; 64])).unwrap();
+	builder.push_storage_change(b":AAAB".to_vec(), Some(vec![3; 64])).unwrap();
+	let block = builder.build().unwrap().block;
+	let block_hash = format!("{:?}", block.header.hash());
+	client.import(BlockOrigin::Own, block.clone()).await.unwrap();
+
+	// Ensure the imported block is propagated and pinned for this subscription.
+	assert_matches!(
+		get_next_event::<FollowEvent<String>>(&mut sub).await,
+		FollowEvent::NewBlock(_)
+	);
+	assert_matches!(
+		get_next_event::<FollowEvent<String>>(&mut sub).await,
+		FollowEvent::BestBlockChanged(_)
+	);
+
+	let merkle_values_rhs = expect_merkle_request(&api, &mut sub, sub_id.clone(), block_hash).await;
+
+	// Change propagated to the root.
+	assert_ne!(
+		merkle_values_lhs.get(&hex_string(b":A")).unwrap(),
+		merkle_values_rhs.get(&hex_string(b":A")).unwrap()
+	);
+	assert_ne!(
+		merkle_values_lhs.get(&hex_string(b":AAAB")).unwrap(),
+		merkle_values_rhs.get(&hex_string(b":AAAB")).unwrap()
+	);
+	// However the AAAA branch leaf remains unchanged.
+	assert_eq!(
+		merkle_values_lhs.get(&hex_string(b":AAAA")).unwrap(),
+		merkle_values_rhs.get(&hex_string(b":AAAA")).unwrap()
+	);
+}
diff --git a/substrate/client/rpc-spec-v2/src/chain_spec/api.rs b/substrate/client/rpc-spec-v2/src/chain_spec/api.rs
index 66c9f868047ce411fdb9050572234e911231155d..b12ba6791d7bed865eee29bc2f942e17f43943ea 100644
--- a/substrate/client/rpc-spec-v2/src/chain_spec/api.rs
+++ b/substrate/client/rpc-spec-v2/src/chain_spec/api.rs
@@ -24,30 +24,18 @@ use sc_chain_spec::Properties;
 #[rpc(client, server)]
 pub trait ChainSpecApi {
 	/// Get the chain name, as present in the chain specification.
-	///
-	/// # Unstable
-	///
-	/// This method is unstable and subject to change in the future.
-	#[method(name = "chainSpec_unstable_chainName")]
-	fn chain_spec_unstable_chain_name(&self) -> RpcResult<String>;
+	#[method(name = "chainSpec_v1_chainName")]
+	fn chain_spec_v1_chain_name(&self) -> RpcResult<String>;
 
 	/// Get the chain's genesis hash.
-	///
-	/// # Unstable
-	///
-	/// This method is unstable and subject to change in the future.
-	#[method(name = "chainSpec_unstable_genesisHash")]
-	fn chain_spec_unstable_genesis_hash(&self) -> RpcResult<String>;
+	#[method(name = "chainSpec_v1_genesisHash")]
+	fn chain_spec_v1_genesis_hash(&self) -> RpcResult<String>;
 
 	/// Get the properties of the chain, as present in the chain specification.
 	///
 	/// # Note
 	///
 	/// The json whitespaces are not guaranteed to persist.
-	///
-	/// # Unstable
-	///
-	/// This method is unstable and subject to change in the future.
-	#[method(name = "chainSpec_unstable_properties")]
-	fn chain_spec_unstable_properties(&self) -> RpcResult<Properties>;
+	#[method(name = "chainSpec_v1_properties")]
+	fn chain_spec_v1_properties(&self) -> RpcResult<Properties>;
 }
diff --git a/substrate/client/rpc-spec-v2/src/chain_spec/chain_spec.rs b/substrate/client/rpc-spec-v2/src/chain_spec/chain_spec.rs
index 99ea34521f586cec7e9fa7890938171f34f83b70..75fe14fd8be45cec26e1ae98fd9a38232182053a 100644
--- a/substrate/client/rpc-spec-v2/src/chain_spec/chain_spec.rs
+++ b/substrate/client/rpc-spec-v2/src/chain_spec/chain_spec.rs
@@ -46,15 +46,15 @@ impl ChainSpec {
 }
 
 impl ChainSpecApiServer for ChainSpec {
-	fn chain_spec_unstable_chain_name(&self) -> RpcResult<String> {
+	fn chain_spec_v1_chain_name(&self) -> RpcResult<String> {
 		Ok(self.name.clone())
 	}
 
-	fn chain_spec_unstable_genesis_hash(&self) -> RpcResult<String> {
+	fn chain_spec_v1_genesis_hash(&self) -> RpcResult<String> {
 		Ok(self.genesis_hash.clone())
 	}
 
-	fn chain_spec_unstable_properties(&self) -> RpcResult<Properties> {
+	fn chain_spec_v1_properties(&self) -> RpcResult<Properties> {
 		Ok(self.properties.clone())
 	}
 }
diff --git a/substrate/client/rpc-spec-v2/src/chain_spec/tests.rs b/substrate/client/rpc-spec-v2/src/chain_spec/tests.rs
index 74aec01a2113ee8918368c7b088484ea32f15fd9..9326fd5f3b738711c3226f5e3d1ab2c4484361e1 100644
--- a/substrate/client/rpc-spec-v2/src/chain_spec/tests.rs
+++ b/substrate/client/rpc-spec-v2/src/chain_spec/tests.rs
@@ -36,7 +36,7 @@ fn api() -> RpcModule<ChainSpec> {
 #[tokio::test]
 async fn chain_spec_chain_name_works() {
 	let name = api()
-		.call::<_, String>("chainSpec_unstable_chainName", EmptyParams::new())
+		.call::<_, String>("chainSpec_v1_chainName", EmptyParams::new())
 		.await
 		.unwrap();
 	assert_eq!(name, CHAIN_NAME);
@@ -45,7 +45,7 @@ async fn chain_spec_chain_name_works() {
 #[tokio::test]
 async fn chain_spec_genesis_hash_works() {
 	let genesis = api()
-		.call::<_, String>("chainSpec_unstable_genesisHash", EmptyParams::new())
+		.call::<_, String>("chainSpec_v1_genesisHash", EmptyParams::new())
 		.await
 		.unwrap();
 	assert_eq!(genesis, format!("0x{}", hex::encode(CHAIN_GENESIS)));
@@ -54,7 +54,7 @@ async fn chain_spec_genesis_hash_works() {
 #[tokio::test]
 async fn chain_spec_properties_works() {
 	let properties = api()
-		.call::<_, Properties>("chainSpec_unstable_properties", EmptyParams::new())
+		.call::<_, Properties>("chainSpec_v1_properties", EmptyParams::new())
 		.await
 		.unwrap();
 	assert_eq!(properties, serde_json::from_str(CHAIN_PROPERTIES).unwrap());
diff --git a/substrate/client/rpc-spec-v2/src/lib.rs b/substrate/client/rpc-spec-v2/src/lib.rs
index 7c22ef5d523189f5a2d49b150c786976bf64c5a8..d202bfef4a74ced5a9f32d50705d596a4403db42 100644
--- a/substrate/client/rpc-spec-v2/src/lib.rs
+++ b/substrate/client/rpc-spec-v2/src/lib.rs
@@ -23,9 +23,83 @@
 #![warn(missing_docs)]
 #![deny(unused_crate_dependencies)]
 
+use serde::{Deserialize, Serialize};
+
+pub mod archive;
 pub mod chain_head;
 pub mod chain_spec;
 pub mod transaction;
 
 /// Task executor that is being used by RPC subscriptions.
 pub type SubscriptionTaskExecutor = std::sync::Arc<dyn sp_core::traits::SpawnNamed>;
+
+/// The result of an RPC method.
+#[derive(Debug, Deserialize, Serialize, PartialEq)]
+#[serde(untagged)]
+pub enum MethodResult {
+	/// Method generated a result.
+	Ok(MethodResultOk),
+	/// Method ecountered an error.
+	Err(MethodResultErr),
+}
+
+impl MethodResult {
+	/// Constructs a successful result.
+	pub fn ok(result: impl Into<String>) -> MethodResult {
+		MethodResult::Ok(MethodResultOk { success: true, result: result.into() })
+	}
+
+	/// Constructs an error result.
+	pub fn err(error: impl Into<String>) -> MethodResult {
+		MethodResult::Err(MethodResultErr { success: false, error: error.into() })
+	}
+}
+
+/// The successful result of an RPC method.
+#[derive(Debug, Clone, PartialEq, Serialize, Deserialize)]
+#[serde(rename_all = "camelCase")]
+pub struct MethodResultOk {
+	/// Method was successful.
+	success: bool,
+	/// The result of the method.
+	pub result: String,
+}
+
+/// The error result of an RPC method.
+#[derive(Debug, Clone, PartialEq, Serialize, Deserialize)]
+#[serde(rename_all = "camelCase")]
+pub struct MethodResultErr {
+	/// Method encountered an error.
+	success: bool,
+	/// The error of the method.
+	pub error: String,
+}
+
+#[cfg(test)]
+mod tests {
+	use super::*;
+
+	#[test]
+	fn method_result_ok() {
+		let ok = MethodResult::ok("hello");
+
+		let ser = serde_json::to_string(&ok).unwrap();
+		let exp = r#"{"success":true,"result":"hello"}"#;
+		assert_eq!(ser, exp);
+
+		let ok_dec: MethodResult = serde_json::from_str(exp).unwrap();
+		assert_eq!(ok_dec, ok);
+	}
+
+	#[test]
+	fn method_result_error() {
+		let ok = MethodResult::err("hello");
+
+		let ser = serde_json::to_string(&ok).unwrap();
+		let exp = r#"{"success":false,"error":"hello"}"#;
+		assert_eq!(ser, exp);
+
+		let ok_dec: MethodResult = serde_json::from_str(exp).unwrap();
+		assert_eq!(ok_dec, ok);
+	}
+}
diff --git a/substrate/client/rpc-spec-v2/src/transaction/api.rs b/substrate/client/rpc-spec-v2/src/transaction/api.rs
index c226ab86787e9880438fbc780d0b604a816a1848..3eb6cb204f24db463cabe3ae4d5a9560bf624057 100644
--- a/substrate/client/rpc-spec-v2/src/transaction/api.rs
+++ b/substrate/client/rpc-spec-v2/src/transaction/api.rs
@@ -29,7 +29,7 @@ pub trait TransactionApi<Hash: Clone> {
 	/// See [`TransactionEvent`](crate::transaction::event::TransactionEvent) for details on
 	/// transaction life cycle.
 	#[subscription(
-		name = "transaction_unstable_submitAndWatch" => "transaction_unstable_submitExtrinsic",
+		name = "transaction_unstable_submitAndWatch" => "transaction_unstable_watchEvent",
 		unsubscribe = "transaction_unstable_unwatch",
 		item = TransactionEvent<Hash>,
 	)]
diff --git a/substrate/client/rpc-spec-v2/src/transaction/event.rs b/substrate/client/rpc-spec-v2/src/transaction/event.rs
index bdc126366fb9249bdb5e9b8e577f8cc2c2ae010f..8b80fcda17beb22cece35c928f10d72175fa9458 100644
--- a/substrate/client/rpc-spec-v2/src/transaction/event.rs
+++ b/substrate/client/rpc-spec-v2/src/transaction/event.rs
@@ -34,7 +34,6 @@ use serde::{Deserialize, Serialize};
 #[serde(rename_all = "camelCase")]
 pub struct TransactionBroadcasted {
 	/// The number of peers the transaction was broadcasted to.
-	#[serde(with = "as_string")]
 	pub num_peers: usize,
 }
 
@@ -45,7 +44,6 @@ pub struct TransactionBlock<Hash> {
 	/// The hash of the block the transaction was included into.
 	pub hash: Hash,
 	/// The index (zero-based) of the transaction within the body of the block.
-	#[serde(with = "as_string")]
 	pub index: usize,
 }
 
@@ -224,22 +222,6 @@ impl<Hash> From<TransactionEventIR<Hash>> for TransactionEvent<Hash> {
 	}
 }
 
-/// Serialize and deserialize helper as string.
-mod as_string {
-	use super::*;
-	use serde::{Deserializer, Serializer};
-
-	pub fn serialize<S: Serializer>(data: &usize, serializer: S) -> Result<S::Ok, S::Error> {
-		data.to_string().serialize(serializer)
-	}
-
-	pub fn deserialize<'de, D: Deserializer<'de>>(deserializer: D) -> Result<usize, D::Error> {
-		String::deserialize(deserializer)?
-			.parse()
-			.map_err(|e| serde::de::Error::custom(format!("Parsing failed: {}", e)))
-	}
-}
-
 #[cfg(test)]
 mod tests {
 	use super::*;
@@ -263,7 +245,7 @@ mod tests {
 			TransactionEvent::Broadcasted(TransactionBroadcasted { num_peers: 2 });
 		let ser = serde_json::to_string(&event).unwrap();
 
-		let exp = r#"{"event":"broadcasted","numPeers":"2"}"#;
+		let exp = r#"{"event":"broadcasted","numPeers":2}"#;
 		assert_eq!(ser, exp);
 
 		let event_dec: TransactionEvent<()> = serde_json::from_str(exp).unwrap();
@@ -288,7 +270,7 @@ mod tests {
 			}));
 		let ser = serde_json::to_string(&event).unwrap();
 
-		let exp = r#"{"event":"bestChainBlockIncluded","block":{"hash":"0x0000000000000000000000000000000000000000000000000000000000000001","index":"2"}}"#;
+		let exp = r#"{"event":"bestChainBlockIncluded","block":{"hash":"0x0000000000000000000000000000000000000000000000000000000000000001","index":2}}"#;
 		assert_eq!(ser, exp);
 
 		let event_dec: TransactionEvent<H256> = serde_json::from_str(exp).unwrap();
@@ -303,7 +285,7 @@ mod tests {
 		});
 		let ser = serde_json::to_string(&event).unwrap();
 
-		let exp = r#"{"event":"finalized","block":{"hash":"0x0000000000000000000000000000000000000000000000000000000000000001","index":"10"}}"#;
+		let exp = r#"{"event":"finalized","block":{"hash":"0x0000000000000000000000000000000000000000000000000000000000000001","index":10}}"#;
 		assert_eq!(ser, exp);
 
 		let event_dec: TransactionEvent<H256> = serde_json::from_str(exp).unwrap();
diff --git a/substrate/client/rpc-spec-v2/src/transaction/transaction.rs b/substrate/client/rpc-spec-v2/src/transaction/transaction.rs
index 44f4bd36c8b8b655d9207f8687c5ad41144a8cda..fe16310aeffa126cb66ababe68c58f445d9611fe 100644
--- a/substrate/client/rpc-spec-v2/src/transaction/transaction.rs
+++ b/substrate/client/rpc-spec-v2/src/transaction/transaction.rs
@@ -46,7 +46,7 @@ use std::sync::Arc;
 use sp_api::ProvideRuntimeApi;
 use sp_blockchain::HeaderBackend;
 use sp_core::Bytes;
-use sp_runtime::{generic, traits::Block as BlockT};
+use sp_runtime::traits::Block as BlockT;
 
 use codec::Decode;
 use futures::{FutureExt, StreamExt, TryFutureExt};
@@ -110,11 +110,7 @@ where
 
 		let submit = self
 			.pool
-			.submit_and_watch(
-				&generic::BlockId::hash(best_block_hash),
-				TX_SOURCE,
-				decoded_extrinsic,
-			)
+			.submit_and_watch(best_block_hash, TX_SOURCE, decoded_extrinsic)
 			.map_err(|e| {
 				e.into_pool_error()
 					.map(Error::from)
diff --git a/substrate/client/rpc/Cargo.toml b/substrate/client/rpc/Cargo.toml
index bd3e79503012d2da70176ece42e3a4aa68dce613..dd1120e5b0f86638ec0881716c0b7391097775ad 100644
--- a/substrate/client/rpc/Cargo.toml
+++ b/substrate/client/rpc/Cargo.toml
@@ -1,11 +1,11 @@
 [package]
 name = "sc-rpc"
 version = "4.0.0-dev"
-authors = ["Parity Technologies <admin@parity.io>"]
-edition = "2021"
+authors.workspace = true
+edition.workspace = true
 license = "GPL-3.0-or-later WITH Classpath-exception-2.0"
 homepage = "https://substrate.io"
-repository = "https://github.com/paritytech/substrate/"
+repository.workspace = true
 description = "Substrate Client RPC"
 readme = "README.md"
 
@@ -18,10 +18,11 @@ futures = "0.3.21"
 jsonrpsee = { version = "0.16.2", features = ["server"] }
 log = "0.4.17"
 parking_lot = "0.12.1"
-serde_json = "1.0.85"
+serde_json = "1.0.107"
 sc-block-builder = { path = "../block-builder" }
 sc-chain-spec = { path = "../chain-spec" }
 sc-client-api = { path = "../api" }
+sc-mixnet = { path = "../mixnet" }
 sc-rpc-api = { path = "../rpc-api" }
 sc-tracing = { path = "../tracing" }
 sc-transaction-pool-api = { path = "../transaction-pool/api" }
diff --git a/substrate/client/rpc/README.md b/substrate/client/rpc/README.md
index 6066af4da71a36ed2748f1cce2c360592e2b51ab..7490d0dc2b0910f6998900112f5cef43a44bc866 100644
--- a/substrate/client/rpc/README.md
+++ b/substrate/client/rpc/README.md
@@ -2,4 +2,4 @@ Substrate RPC implementation.
 
 A core implementation of Substrate RPC interfaces.
 
-License: GPL-3.0-or-later WITH Classpath-exception-2.0
\ No newline at end of file
+License: GPL-3.0-or-later WITH Classpath-exception-2.0
diff --git a/substrate/client/rpc/src/author/mod.rs b/substrate/client/rpc/src/author/mod.rs
index feee22641ef3469fa23d8b5bc048e985bf1f7bd7..55d0a504aa678b82a3327683b5d417d61c8ad4c5 100644
--- a/substrate/client/rpc/src/author/mod.rs
+++ b/substrate/client/rpc/src/author/mod.rs
@@ -41,7 +41,7 @@ use sp_api::{ApiExt, ProvideRuntimeApi};
 use sp_blockchain::HeaderBackend;
 use sp_core::Bytes;
 use sp_keystore::{KeystoreExt, KeystorePtr};
-use sp_runtime::{generic, traits::Block as BlockT};
+use sp_runtime::traits::Block as BlockT;
 use sp_session::SessionKeys;
 
 use self::error::{Error, Result};
@@ -97,15 +97,12 @@ where
 			Err(err) => return Err(Error::Client(Box::new(err)).into()),
 		};
 		let best_block_hash = self.client.info().best_hash;
-		self.pool
-			.submit_one(&generic::BlockId::hash(best_block_hash), TX_SOURCE, xt)
-			.await
-			.map_err(|e| {
-				e.into_pool_error()
-					.map(|e| Error::Pool(e))
-					.unwrap_or_else(|e| Error::Verification(Box::new(e)))
-					.into()
-			})
+		self.pool.submit_one(best_block_hash, TX_SOURCE, xt).await.map_err(|e| {
+			e.into_pool_error()
+				.map(|e| Error::Pool(e))
+				.unwrap_or_else(|e| Error::Verification(Box::new(e)))
+				.into()
+		})
 	}
 
 	fn insert_key(&self, key_type: String, suri: String, public: Bytes) -> RpcResult<()> {
@@ -191,14 +188,11 @@ where
 			},
 		};
 
-		let submit = self
-			.pool
-			.submit_and_watch(&generic::BlockId::hash(best_block_hash), TX_SOURCE, dxt)
-			.map_err(|e| {
-				e.into_pool_error()
-					.map(error::Error::from)
-					.unwrap_or_else(|e| error::Error::Verification(Box::new(e)))
-			});
+		let submit = self.pool.submit_and_watch(best_block_hash, TX_SOURCE, dxt).map_err(|e| {
+			e.into_pool_error()
+				.map(error::Error::from)
+				.unwrap_or_else(|e| error::Error::Verification(Box::new(e)))
+		});
 
 		let fut = async move {
 			let stream = match submit.await {
diff --git a/substrate/client/rpc/src/lib.rs b/substrate/client/rpc/src/lib.rs
index 475fc77a9b5bd37bbe9b271287e8bb806a826bd9..94fdb2d734ff01f5876ac92271f99b168d9c4ce3 100644
--- a/substrate/client/rpc/src/lib.rs
+++ b/substrate/client/rpc/src/lib.rs
@@ -34,6 +34,7 @@ pub use sc_rpc_api::DenyUnsafe;
 pub mod author;
 pub mod chain;
 pub mod dev;
+pub mod mixnet;
 pub mod offchain;
 pub mod state;
 pub mod statement;
diff --git a/substrate/test-utils/tests/basic.rs b/substrate/client/rpc/src/mixnet/mod.rs
similarity index 50%
rename from substrate/test-utils/tests/basic.rs
rename to substrate/client/rpc/src/mixnet/mod.rs
index e8c46b1e837d2f7f6cfde7ea980aabc37c998667..3f3d9c5aa4526e399a3263eb02624738f7233ebe 100644
--- a/substrate/test-utils/tests/basic.rs
+++ b/substrate/client/rpc/src/mixnet/mod.rs
@@ -16,34 +16,32 @@
 // You should have received a copy of the GNU General Public License
 // along with this program. If not, see <https://www.gnu.org/licenses/>.
 
-#[substrate_test_utils::test]
-async fn basic_test() {
-	assert!(true);
+//! Substrate mixnet API.
+
+use jsonrpsee::core::{async_trait, RpcResult};
+use sc_mixnet::Api;
+use sc_rpc_api::mixnet::error::Error;
+pub use sc_rpc_api::mixnet::MixnetApiServer;
+use sp_core::Bytes;
+
+/// Mixnet API.
+pub struct Mixnet(futures::lock::Mutex<Api>);
+
+impl Mixnet {
+	/// Create a new mixnet API instance.
+	pub fn new(api: Api) -> Self {
+		Self(futures::lock::Mutex::new(api))
+	}
 }
 
-#[substrate_test_utils::test]
-#[should_panic(expected = "boo!")]
-async fn panicking_test() {
-	panic!("boo!");
-}
-
-#[substrate_test_utils::test(flavor = "multi_thread", worker_threads = 1)]
-async fn basic_test_with_args() {
-	assert!(true);
-}
-
-// NOTE: enable this test only after setting SUBSTRATE_TEST_TIMEOUT to a smaller value
-//
-// SUBSTRATE_TEST_TIMEOUT=1 cargo test -- --ignored timeout
-#[substrate_test_utils::test]
-#[should_panic(expected = "test took too long")]
-#[ignore]
-async fn timeout() {
-	tokio::time::sleep(std::time::Duration::from_secs(
-		std::env::var("SUBSTRATE_TEST_TIMEOUT")
-			.expect("env var SUBSTRATE_TEST_TIMEOUT has been provided by the user")
-			.parse::<u64>()
-			.unwrap() + 1,
-	))
-	.await;
+#[async_trait]
+impl MixnetApiServer for Mixnet {
+	async fn submit_extrinsic(&self, extrinsic: Bytes) -> RpcResult<()> {
+		// We only hold the lock while pushing the request into the requests channel
+		let fut = {
+			let mut api = self.0.lock().await;
+			api.submit_extrinsic(extrinsic).await
+		};
+		Ok(fut.await.map_err(Error)?)
+	}
 }
diff --git a/substrate/client/service/Cargo.toml b/substrate/client/service/Cargo.toml
index a9e9f2e8139d3c889a807ee2114cea5d4f88fef8..2386bebf24d26d9ec98ab51b1bdad7d078efc734 100644
--- a/substrate/client/service/Cargo.toml
+++ b/substrate/client/service/Cargo.toml
@@ -1,11 +1,11 @@
 [package]
 name = "sc-service"
 version = "0.10.0-dev"
-authors = ["Parity Technologies <admin@parity.io>"]
-edition = "2021"
+authors.workspace = true
+edition.workspace = true
 license = "GPL-3.0-or-later WITH Classpath-exception-2.0"
 homepage = "https://substrate.io"
-repository = "https://github.com/paritytech/substrate/"
+repository.workspace = true
 description = "Substrate service. Starts a thread that spins up the network, client, and extrinsic pool. Manages communication between them."
 readme = "README.md"
 
@@ -26,7 +26,7 @@ runtime-benchmarks = [
 
 [dependencies]
 jsonrpsee = { version = "0.16.2", features = ["server"] }
-thiserror = "1.0.30"
+thiserror = "1.0.48"
 futures = "0.3.21"
 rand = "0.8.5"
 parking_lot = "0.12.1"
@@ -34,8 +34,8 @@ log = "0.4.17"
 futures-timer = "3.0.1"
 exit-future = "0.2.0"
 pin-project = "1.0.12"
-serde = "1.0.163"
-serde_json = "1.0.85"
+serde = "1.0.188"
+serde_json = "1.0.107"
 sc-keystore = { path = "../keystore" }
 sp-runtime = { path = "../../primitives/runtime" }
 sp-trie = { path = "../../primitives/trie" }
@@ -80,7 +80,7 @@ tracing-futures = { version = "0.2.4" }
 async-trait = "0.1.57"
 tokio = { version = "1.22.0", features = ["time", "rt-multi-thread", "parking_lot"] }
 tempfile = "3.1.0"
-directories = "4.0.1"
+directories = "5.0.1"
 static_init = "1.0.3"
 
 [dev-dependencies]
diff --git a/substrate/client/service/README.md b/substrate/client/service/README.md
index 26f940f16df02328ad03e728e2a033ce3013acc6..0a36138a366f4f081e2bae8bf6fa8e75f276bdfa 100644
--- a/substrate/client/service/README.md
+++ b/substrate/client/service/README.md
@@ -1,4 +1,4 @@
 Substrate service. Starts a thread that spins up the network, client, and extrinsic pool.
 Manages communication between them.
 
-License: GPL-3.0-or-later WITH Classpath-exception-2.0
\ No newline at end of file
+License: GPL-3.0-or-later WITH Classpath-exception-2.0
diff --git a/substrate/client/service/src/builder.rs b/substrate/client/service/src/builder.rs
index fe18d1d002d56c9a6ab7ae6a3175be488f660c90..3838accde02393b053943e944e86f1f02ba8944e 100644
--- a/substrate/client/service/src/builder.rs
+++ b/substrate/client/service/src/builder.rs
@@ -47,11 +47,12 @@ use sc_network::{
 	NetworkService, NetworkStateInfo, NetworkStatusProvider,
 };
 use sc_network_bitswap::BitswapRequestHandler;
-use sc_network_common::{role::Roles, sync::warp::WarpSyncParams};
+use sc_network_common::role::Roles;
 use sc_network_light::light_client_requests::handler::LightClientRequestHandler;
 use sc_network_sync::{
-	block_request_handler::BlockRequestHandler, engine::SyncingEngine,
-	service::network::NetworkServiceProvider, state_request_handler::StateRequestHandler,
+	block_relay_protocol::BlockRelayParams, block_request_handler::BlockRequestHandler,
+	engine::SyncingEngine, service::network::NetworkServiceProvider,
+	state_request_handler::StateRequestHandler, warp::WarpSyncParams,
 	warp_request_handler::RequestHandler as WarpSyncRequestHandler, SyncingService,
 };
 use sc_rpc::{
@@ -695,6 +696,9 @@ pub struct BuildNetworkParams<'a, TBl: BlockT, TExPool, TImpQu, TCl> {
 		Option<Box<dyn FnOnce(Arc<TCl>) -> Box<dyn BlockAnnounceValidator<TBl> + Send> + Send>>,
 	/// Optional warp sync params.
 	pub warp_sync_params: Option<WarpSyncParams<TBl>>,
+	/// User specified block relay params. If not specified, the default
+	/// block request handler will be used.
+	pub block_relay: Option<BlockRelayParams<TBl>>,
 }
 
 /// Build the network service, the network status sinks and an RPC sender.
@@ -733,6 +737,7 @@ where
 		import_queue,
 		block_announce_validator_builder,
 		warp_sync_params,
+		block_relay,
 	} = params;
 
 	if warp_sync_params.is_none() && config.network.sync_mode.is_warp() {
@@ -756,19 +761,26 @@ where
 		Box::new(DefaultBlockAnnounceValidator)
 	};
 
-	let (block_request_protocol_config, block_request_protocol_name) = {
-		// Allow both outgoing and incoming requests.
-		let (handler, protocol_config) = BlockRequestHandler::new(
-			&protocol_id,
-			config.chain_spec.fork_id(),
-			client.clone(),
-			net_config.network_config.default_peers_set.in_peers as usize +
-				net_config.network_config.default_peers_set.out_peers as usize,
-		);
-		let config_name = protocol_config.name.clone();
-		spawn_handle.spawn("block-request-handler", Some("networking"), handler.run());
-		(protocol_config, config_name)
+	let (chain_sync_network_provider, chain_sync_network_handle) = NetworkServiceProvider::new();
+	let (mut block_server, block_downloader, block_request_protocol_config) = match block_relay {
+		Some(params) => (params.server, params.downloader, params.request_response_config),
+		None => {
+			// Custom protocol was not specified, use the default block handler.
+			// Allow both outgoing and incoming requests.
+			let params = BlockRequestHandler::new(
+				chain_sync_network_handle.clone(),
+				&protocol_id,
+				config.chain_spec.fork_id(),
+				client.clone(),
+				config.network.default_peers_set.in_peers as usize +
+					config.network.default_peers_set.out_peers as usize,
+			);
+			(params.server, params.downloader, params.request_response_config)
+		},
 	};
+	spawn_handle.spawn("block-request-handler", Some("networking"), async move {
+		block_server.run().await;
+	});
 
 	let (state_request_protocol_config, state_request_protocol_name) = {
 		let num_peer_hint = net_config.network_config.default_peers_set_num_full as usize +
@@ -859,7 +871,6 @@ where
 	spawn_handle.spawn("peer-store", Some("networking"), peer_store.run());
 
 	let (tx, rx) = sc_utils::mpsc::tracing_unbounded("mpsc_syncing_engine_protocol", 100_000);
-	let (chain_sync_network_provider, chain_sync_network_handle) = NetworkServiceProvider::new();
 	let (engine, sync_service, block_announce_config) = SyncingEngine::new(
 		Roles::from(&config.role),
 		client.clone(),
@@ -871,7 +882,7 @@ where
 		warp_sync_params,
 		chain_sync_network_handle,
 		import_queue.service(),
-		block_request_protocol_name,
+		block_downloader,
 		state_request_protocol_name,
 		warp_request_protocol_name,
 		rx,
diff --git a/substrate/client/service/src/client/client.rs b/substrate/client/service/src/client/client.rs
index a0983d823e5b19a5758e281e91499085f9d813da..da4a4f66e2af16f85bad5f5b526956152f63d7ae 100644
--- a/substrate/client/service/src/client/client.rs
+++ b/substrate/client/service/src/client/client.rs
@@ -78,7 +78,7 @@ use sp_state_machine::{
 	ChildStorageCollection, KeyValueStates, KeyValueStorageLevel, StorageCollection,
 	MAX_NESTED_TRIE_DEPTH,
 };
-use sp_trie::{CompactProof, StorageProof};
+use sp_trie::{CompactProof, MerkleValue, StorageProof};
 use std::{
 	collections::{HashMap, HashSet},
 	marker::PhantomData,
@@ -484,8 +484,7 @@ where
 		CallExecutor::runtime_version(&self.executor, hash)
 	}
 
-	/// Apply a checked and validated block to an operation. If a justification is provided
-	/// then `finalized` *must* be true.
+	/// Apply a checked and validated block to an operation.
 	fn apply_block(
 		&self,
 		operation: &mut ClientImportOperation<Block, B>,
@@ -603,8 +602,6 @@ where
 			.block_gap
 			.map_or(false, |(start, _)| *import_headers.post().number() == start);
 
-		assert!(justifications.is_some() && finalized || justifications.is_none() || gap_block);
-
 		// the block is lower than our last finalized block so it must revert
 		// finality, refusing import.
 		if status == blockchain::BlockStatus::Unknown &&
@@ -1547,6 +1544,27 @@ where
 			.child_storage_hash(child_info, &key.0)
 			.map_err(|e| sp_blockchain::Error::from_state(Box::new(e)))
 	}
+
+	fn closest_merkle_value(
+		&self,
+		hash: <Block as BlockT>::Hash,
+		key: &StorageKey,
+	) -> blockchain::Result<Option<MerkleValue<<Block as BlockT>::Hash>>> {
+		self.state_at(hash)?
+			.closest_merkle_value(&key.0)
+			.map_err(|e| sp_blockchain::Error::from_state(Box::new(e)))
+	}
+
+	fn child_closest_merkle_value(
+		&self,
+		hash: <Block as BlockT>::Hash,
+		child_info: &ChildInfo,
+		key: &StorageKey,
+	) -> blockchain::Result<Option<MerkleValue<<Block as BlockT>::Hash>>> {
+		self.state_at(hash)?
+			.child_closest_merkle_value(child_info, &key.0)
+			.map_err(|e| sp_blockchain::Error::from_state(Box::new(e)))
+	}
 }
 
 impl<B, E, Block, RA> HeaderMetadata<Block> for Client<B, E, Block, RA>
@@ -1747,8 +1765,7 @@ where
 {
 	type Error = ConsensusError;
 
-	/// Import a checked and validated block. If a justification is provided in
-	/// `BlockImportParams` then `finalized` *must* be true.
+	/// Import a checked and validated block.
 	///
 	/// NOTE: only use this implementation when there are NO consensus-level BlockImport
 	/// objects. Otherwise, importing blocks directly into the client would be bypassing
diff --git a/substrate/client/service/src/client/wasm_substitutes.rs b/substrate/client/service/src/client/wasm_substitutes.rs
index a792ab87e771bd0b1652e5d7f4b5708f945b4346..70db0ef20f5a83907536f67d8ef36500a8065b48 100644
--- a/substrate/client/service/src/client/wasm_substitutes.rs
+++ b/substrate/client/service/src/client/wasm_substitutes.rs
@@ -126,7 +126,7 @@ where
 				let runtime_code = RuntimeCode {
 					code_fetcher: &WrappedRuntimeCode((&code).into()),
 					heap_pages: None,
-					hash: Vec::new(),
+					hash: make_hash(&code),
 				};
 				let version = Self::runtime_version(&executor, &runtime_code)?;
 				let spec_version = version.spec_version;
diff --git a/substrate/client/service/src/error.rs b/substrate/client/service/src/error.rs
index c871342c771ebfb91ea90032b85dd745ba49dee6..c0a2adf2d198cbdf5221a457c717f7a0b8c35cc9 100644
--- a/substrate/client/service/src/error.rs
+++ b/substrate/client/service/src/error.rs
@@ -54,10 +54,10 @@ pub enum Error {
 	#[error("Tasks executor hasn't been provided.")]
 	TaskExecutorRequired,
 
-	#[error("Prometheus metrics error")]
+	#[error("Prometheus metrics error: {0}")]
 	Prometheus(#[from] prometheus_endpoint::PrometheusError),
 
-	#[error("Application")]
+	#[error("Application: {0}")]
 	Application(#[from] Box<dyn std::error::Error + Send + Sync + 'static>),
 
 	#[error("Other: {0}")]
diff --git a/substrate/client/service/src/lib.rs b/substrate/client/service/src/lib.rs
index 0961967f9ca20a039e12b560b3ba6cb6cea24659..ff9eb982b862f9ebb36132c730835dc2087ef291 100644
--- a/substrate/client/service/src/lib.rs
+++ b/substrate/client/service/src/lib.rs
@@ -48,10 +48,7 @@ use sc_network_sync::SyncingService;
 use sc_utils::mpsc::TracingUnboundedReceiver;
 use sp_blockchain::HeaderMetadata;
 use sp_consensus::SyncOracle;
-use sp_runtime::{
-	generic::BlockId,
-	traits::{Block as BlockT, Header as HeaderT},
-};
+use sp_runtime::traits::{Block as BlockT, Header as HeaderT};
 
 pub use self::{
 	builder::{
@@ -79,7 +76,7 @@ pub use sc_chain_spec::{
 
 pub use sc_consensus::ImportQueue;
 pub use sc_executor::NativeExecutionDispatch;
-pub use sc_network_common::sync::warp::WarpSyncParams;
+pub use sc_network_sync::warp::WarpSyncParams;
 #[doc(hidden)]
 pub use sc_network_transactions::config::{TransactionImport, TransactionImportFuture};
 pub use sc_rpc::{
@@ -481,10 +478,8 @@ where
 			},
 		};
 
-		let best_block_id = BlockId::hash(self.client.info().best_hash);
-
 		let import_future = self.pool.submit_one(
-			&best_block_id,
+			self.client.info().best_hash,
 			sc_transaction_pool_api::TransactionSource::External,
 			uxt,
 		);
@@ -549,10 +544,9 @@ mod tests {
 			to: AccountKeyring::Bob.into(),
 		}
 		.into_unchecked_extrinsic();
-		block_on(pool.submit_one(&BlockId::hash(best.hash()), source, transaction.clone()))
-			.unwrap();
+		block_on(pool.submit_one(best.hash(), source, transaction.clone())).unwrap();
 		block_on(pool.submit_one(
-			&BlockId::hash(best.hash()),
+			best.hash(),
 			source,
 			ExtrinsicBuilder::new_call_do_not_propagate().nonce(1).build(),
 		))
diff --git a/substrate/client/service/test/Cargo.toml b/substrate/client/service/test/Cargo.toml
index 3a423abce7ad3d17dc72505dff014d8ab9787174..670312e4161aa18e56597997b7e13c65fc2d209c 100644
--- a/substrate/client/service/test/Cargo.toml
+++ b/substrate/client/service/test/Cargo.toml
@@ -1,12 +1,12 @@
 [package]
 name = "sc-service-test"
 version = "2.0.0"
-authors = ["Parity Technologies <admin@parity.io>"]
-edition = "2021"
+authors.workspace = true
+edition.workspace = true
 license = "GPL-3.0-or-later WITH Classpath-exception-2.0"
 publish = false
 homepage = "https://substrate.io"
-repository = "https://github.com/paritytech/substrate/"
+repository.workspace = true
 
 [package.metadata.docs.rs]
 targets = ["x86_64-unknown-linux-gnu"]
diff --git a/substrate/client/service/test/src/client/mod.rs b/substrate/client/service/test/src/client/mod.rs
index c40ac33da4bb9a7fe7f8f1dc512bd87426fa5ac7..f82008755874bdcba2e2d66c4edaff468c8bc648 100644
--- a/substrate/client/service/test/src/client/mod.rs
+++ b/substrate/client/service/test/src/client/mod.rs
@@ -39,7 +39,6 @@ use sp_runtime::{
 };
 use sp_state_machine::{backend::Backend as _, InMemoryBackend, OverlayedChanges, StateMachine};
 use sp_storage::{ChildInfo, StorageKey};
-use sp_trie::{LayoutV0, TrieConfiguration};
 use std::{collections::HashSet, sync::Arc};
 use substrate_test_runtime::TestAPI;
 use substrate_test_runtime_client::{
@@ -62,22 +61,17 @@ fn construct_block(
 	backend: &InMemoryBackend<BlakeTwo256>,
 	number: BlockNumber,
 	parent_hash: Hash,
-	state_root: Hash,
 	txs: Vec<Transfer>,
-) -> (Vec<u8>, Hash) {
+) -> Vec<u8> {
 	let transactions = txs.into_iter().map(|tx| tx.into_unchecked_extrinsic()).collect::<Vec<_>>();
 
-	let iter = transactions.iter().map(Encode::encode);
-	let extrinsics_root = LayoutV0::<BlakeTwo256>::ordered_trie_root(iter).into();
-
 	let mut header = Header {
 		parent_hash,
 		number,
-		state_root,
-		extrinsics_root,
+		state_root: Default::default(),
+		extrinsics_root: Default::default(),
 		digest: Digest { logs: vec![] },
 	};
-	let hash = header.hash();
 	let mut overlay = OverlayedChanges::default();
 	let backend_runtime_code = sp_state_machine::backend::BackendRuntimeCode::new(backend);
 	let runtime_code = backend_runtime_code.runtime_code().expect("Code is part of the backend");
@@ -124,19 +118,16 @@ fn construct_block(
 	.unwrap();
 	header = Header::decode(&mut &ret_data[..]).unwrap();
 
-	(vec![].and(&Block { header, extrinsics: transactions }), hash)
+	vec![].and(&Block { header, extrinsics: transactions })
 }
 
-fn block1(genesis_hash: Hash, backend: &InMemoryBackend<BlakeTwo256>) -> (Vec<u8>, Hash) {
+fn block1(genesis_hash: Hash, backend: &InMemoryBackend<BlakeTwo256>) -> Vec<u8> {
 	construct_block(
 		backend,
 		1,
 		genesis_hash,
-		array_bytes::hex_n_into_unchecked(
-			"25e5b37074063ab75c889326246640729b40d0c86932edc527bc80db0e04fe5c",
-		),
 		vec![Transfer {
-			from: AccountKeyring::Alice.into(),
+			from: AccountKeyring::One.into(),
 			to: AccountKeyring::Two.into(),
 			amount: 69 * DOLLARS,
 			nonce: 0,
@@ -175,7 +166,7 @@ fn construct_genesis_should_work_with_native() {
 	let genesis_hash = insert_genesis_block(&mut storage);
 
 	let backend = InMemoryBackend::from((storage, StateVersion::default()));
-	let (b1data, _b1hash) = block1(genesis_hash, &backend);
+	let b1data = block1(genesis_hash, &backend);
 	let backend_runtime_code = sp_state_machine::backend::BackendRuntimeCode::new(&backend);
 	let runtime_code = backend_runtime_code.runtime_code().expect("Code is part of the backend");
 
@@ -206,7 +197,7 @@ fn construct_genesis_should_work_with_wasm() {
 	let genesis_hash = insert_genesis_block(&mut storage);
 
 	let backend = InMemoryBackend::from((storage, StateVersion::default()));
-	let (b1data, _b1hash) = block1(genesis_hash, &backend);
+	let b1data = block1(genesis_hash, &backend);
 	let backend_runtime_code = sp_state_machine::backend::BackendRuntimeCode::new(&backend);
 	let runtime_code = backend_runtime_code.runtime_code().expect("Code is part of the backend");
 
diff --git a/substrate/client/service/test/src/lib.rs b/substrate/client/service/test/src/lib.rs
index 38a811acc7401986f3f4b1f07d53fae8f32d0e98..9700c7643c48514de6189fe619255516636a737a 100644
--- a/substrate/client/service/test/src/lib.rs
+++ b/substrate/client/service/test/src/lib.rs
@@ -34,7 +34,6 @@ use sc_service::{
 	RuntimeGenesis, SpawnTaskHandle, TaskManager,
 };
 use sc_transaction_pool_api::TransactionPool;
-use sp_api::BlockId;
 use sp_blockchain::HeaderBackend;
 use sp_runtime::traits::Block as BlockT;
 use std::{iter, net::Ipv4Addr, pin::Pin, sync::Arc, task::Context, time::Duration};
@@ -501,15 +500,13 @@ pub fn sync<G, E, Fb, F, B, ExF, U>(
 	info!("Checking extrinsic propagation");
 	let first_service = network.full_nodes[0].1.clone();
 	let first_user_data = &network.full_nodes[0].2;
-	let best_block = BlockId::number(first_service.client().info().best_number);
+	let best_block = first_service.client().info().best_hash;
 	let extrinsic = extrinsic_factory(&first_service, first_user_data);
 	let source = sc_transaction_pool_api::TransactionSource::External;
 
-	futures::executor::block_on(first_service.transaction_pool().submit_one(
-		&best_block,
-		source,
-		extrinsic,
-	))
+	futures::executor::block_on(
+		first_service.transaction_pool().submit_one(best_block, source, extrinsic),
+	)
 	.expect("failed to submit extrinsic");
 
 	network.run_until_all_full(|_index, service| service.transaction_pool().ready().count() == 1);
diff --git a/substrate/client/state-db/Cargo.toml b/substrate/client/state-db/Cargo.toml
index b8d238c6a2d263087d7295115d26d4d9c01174ed..c5e8272637d4cadca5fdefc51048ef6b4c6d994a 100644
--- a/substrate/client/state-db/Cargo.toml
+++ b/substrate/client/state-db/Cargo.toml
@@ -1,11 +1,11 @@
 [package]
 name = "sc-state-db"
 version = "0.10.0-dev"
-authors = ["Parity Technologies <admin@parity.io>"]
-edition = "2021"
+authors.workspace = true
+edition.workspace = true
 license = "GPL-3.0-or-later WITH Classpath-exception-2.0"
 homepage = "https://substrate.io"
-repository = "https://github.com/paritytech/substrate/"
+repository.workspace = true
 description = "State database maintenance. Handles canonicalization and pruning in the database."
 readme = "README.md"
 
diff --git a/substrate/client/state-db/README.md b/substrate/client/state-db/README.md
index a02b3929088fc8289a22d4a372101ca703cb6876..c97cc23400fae7c82132bddab19bf6bf177e1cff 100644
--- a/substrate/client/state-db/README.md
+++ b/substrate/client/state-db/README.md
@@ -2,15 +2,15 @@ State database maintenance. Handles canonicalization and pruning in the database
 this module is a `ChangeSet` which is basically a list of key-value pairs (trie nodes) that
 were added or deleted during block execution.
 
-# Canonicalization.
+# Canonicalization
 Canonicalization window tracks a tree of blocks identified by header hash. The in-memory
 overlay allows to get any node that was inserted in any of the blocks within the window.
 The tree is journaled to the backing database and rebuilt on startup.
 Canonicalization function selects one root from the top of the tree and discards all other roots and
 their subtrees.
 
-# Pruning.
+# Pruning
 See `RefWindow` for pruning algorithm details. `StateDb` prunes on each canonicalization until pruning
 constraints are satisfied.
 
-License: GPL-3.0-or-later WITH Classpath-exception-2.0
\ No newline at end of file
+License: GPL-3.0-or-later WITH Classpath-exception-2.0
diff --git a/substrate/client/statement-store/Cargo.toml b/substrate/client/statement-store/Cargo.toml
index 84cb0d38ef3ca1af7adfb4146222032edc1abb57..371d67369166b8f8448146bd6d3dfb982d0e0dc9 100644
--- a/substrate/client/statement-store/Cargo.toml
+++ b/substrate/client/statement-store/Cargo.toml
@@ -1,11 +1,11 @@
 [package]
 name = "sc-statement-store"
 version = "4.0.0-dev"
-authors = ["Parity Technologies <admin@parity.io>"]
-edition = "2021"
+authors.workspace = true
+edition.workspace = true
 license = "GPL-3.0-or-later WITH Classpath-exception-2.0"
 homepage = "https://substrate.io"
-repository = "https://github.com/paritytech/substrate/"
+repository.workspace = true
 description = "Substrate statement store."
 readme = "README.md"
 
@@ -29,4 +29,3 @@ sc-keystore = { path = "../keystore" }
 [dev-dependencies]
 tempfile = "3.1.0"
 env_logger = "0.9"
-
diff --git a/substrate/client/storage-monitor/Cargo.toml b/substrate/client/storage-monitor/Cargo.toml
index 6361a3bce819311d649e00bc7e190ca2c97cc5ec..021ee76240b980221602f0516afde1549e4e84b5 100644
--- a/substrate/client/storage-monitor/Cargo.toml
+++ b/substrate/client/storage-monitor/Cargo.toml
@@ -1,18 +1,18 @@
 [package]
 name = "sc-storage-monitor"
 version = "0.1.0"
-authors = ["Parity Technologies <admin@parity.io>"]
-edition = "2021"
+authors.workspace = true
+edition.workspace = true
 license = "GPL-3.0-or-later WITH Classpath-exception-2.0"
-repository = "https://github.com/paritytech/substrate"
+repository.workspace = true
 description = "Storage monitor service for substrate"
 homepage = "https://substrate.io"
 
 [dependencies]
-clap = { version = "4.2.5", features = ["derive", "string"] }
+clap = { version = "4.4.6", features = ["derive", "string"] }
 log = "0.4.17"
 fs4 = "0.6.3"
 sc-client-db = { path = "../db", default-features = false}
 sp-core = { path = "../../primitives/core" }
 tokio = "1.22.0"
-thiserror = "1.0.30"
+thiserror = "1.0.48"
diff --git a/substrate/client/sync-state-rpc/Cargo.toml b/substrate/client/sync-state-rpc/Cargo.toml
index e2ac87701af465ce4f50501be03a13572a1c1cef..e582d0b7e4ffc1159be31ffaf6ecf5c347db38c7 100644
--- a/substrate/client/sync-state-rpc/Cargo.toml
+++ b/substrate/client/sync-state-rpc/Cargo.toml
@@ -1,12 +1,12 @@
 [package]
 name = "sc-sync-state-rpc"
 version = "0.10.0-dev"
-authors = ["Parity Technologies <admin@parity.io>"]
+authors.workspace = true
 description = "A RPC handler to create sync states for light clients."
-edition = "2021"
+edition.workspace = true
 license = "Apache-2.0"
 homepage = "https://substrate.io"
-repository = "https://github.com/paritytech/substrate/"
+repository.workspace = true
 
 [package.metadata.docs.rs]
 targets = ["x86_64-unknown-linux-gnu"]
@@ -14,9 +14,9 @@ targets = ["x86_64-unknown-linux-gnu"]
 [dependencies]
 codec = { package = "parity-scale-codec", version = "3.6.1" }
 jsonrpsee = { version = "0.16.2", features = ["client-core", "server", "macros"] }
-serde = { version = "1.0.163", features = ["derive"] }
-serde_json = "1.0.85"
-thiserror = "1.0.30"
+serde = { version = "1.0.188", features = ["derive"] }
+serde_json = "1.0.107"
+thiserror = "1.0.48"
 sc-chain-spec = { path = "../chain-spec" }
 sc-client-api = { path = "../api" }
 sc-consensus-babe = { path = "../consensus/babe" }
diff --git a/substrate/client/sysinfo/Cargo.toml b/substrate/client/sysinfo/Cargo.toml
index 4f6df49a57f5ed5fa859d0783b7cfee3cf649ee4..fdf987ed45f265f9bd54ec0060a23e2ffac1d585 100644
--- a/substrate/client/sysinfo/Cargo.toml
+++ b/substrate/client/sysinfo/Cargo.toml
@@ -1,11 +1,11 @@
 [package]
 name = "sc-sysinfo"
 version = "6.0.0-dev"
-authors = ["Parity Technologies <admin@parity.io>"]
-edition = "2021"
+authors.workspace = true
+edition.workspace = true
 license = "GPL-3.0-or-later WITH Classpath-exception-2.0"
 homepage = "https://substrate.io"
-repository = "https://github.com/paritytech/substrate/"
+repository.workspace = true
 description = "A crate that provides basic hardware and software telemetry information."
 documentation = "https://docs.rs/sc-sysinfo"
 readme = "README.md"
@@ -20,8 +20,8 @@ log = "0.4.17"
 rand = "0.8.5"
 rand_pcg = "0.3.1"
 regex = "1"
-serde = { version = "1.0.163", features = ["derive"] }
-serde_json = "1.0.85"
+serde = { version = "1.0.188", features = ["derive"] }
+serde_json = "1.0.107"
 sc-telemetry = { path = "../telemetry" }
 sp-core = { path = "../../primitives/core" }
 sp-io = { path = "../../primitives/io" }
diff --git a/substrate/client/telemetry/Cargo.toml b/substrate/client/telemetry/Cargo.toml
index 4ca21daf6cca89bb3034ea0cdd57ba6afb09af30..6d59b9dfc1a6980fa08d1ade2cd12ec25713f358 100644
--- a/substrate/client/telemetry/Cargo.toml
+++ b/substrate/client/telemetry/Cargo.toml
@@ -1,12 +1,12 @@
 [package]
 name = "sc-telemetry"
 version = "4.0.0-dev"
-authors = ["Parity Technologies <admin@parity.io>"]
+authors.workspace = true
 description = "Telemetry utils"
-edition = "2021"
+edition.workspace = true
 license = "GPL-3.0-or-later WITH Classpath-exception-2.0"
 homepage = "https://substrate.io"
-repository = "https://github.com/paritytech/substrate/"
+repository.workspace = true
 documentation = "https://docs.rs/sc-telemetry"
 readme = "README.md"
 
@@ -14,7 +14,7 @@ readme = "README.md"
 targets = ["x86_64-unknown-linux-gnu"]
 
 [dependencies]
-chrono = "0.4.19"
+chrono = "0.4.27"
 futures = "0.3.21"
 libp2p = { version = "0.51.3", features = ["dns", "tcp", "tokio", "wasm-ext", "websocket"] }
 log = "0.4.17"
@@ -22,7 +22,7 @@ parking_lot = "0.12.1"
 pin-project = "1.0.12"
 sc-utils = { path = "../utils" }
 rand = "0.8.5"
-serde = { version = "1.0.163", features = ["derive"] }
-serde_json = "1.0.85"
-thiserror = "1.0.30"
+serde = { version = "1.0.188", features = ["derive"] }
+serde_json = "1.0.107"
+thiserror = "1.0.48"
 wasm-timer = "0.2.5"
diff --git a/substrate/client/telemetry/README.md b/substrate/client/telemetry/README.md
index 2e3e19bd2f628565dc22b6f18e24397fb4315f55..849fad8bec70c14fb7dd327446e6e8e25be85e0d 100644
--- a/substrate/client/telemetry/README.md
+++ b/substrate/client/telemetry/README.md
@@ -1,6 +1,6 @@
 # sc-telemetry
 
-Substrate's client telemetry is a part of substrate that allows ingesting telemetry data
+Substrate's client telemetry is a part of Substrate that allows ingesting telemetry data
 with for example [Polkadot telemetry](https://github.com/paritytech/substrate-telemetry).
 
 It works using Tokio's [tracing](https://github.com/tokio-rs/tracing/) library. The telemetry
@@ -9,8 +9,8 @@ tracing `Layer`. This layer will then send the data through an asynchronous chan
 background task called [`TelemetryWorker`] which will send the information to the configured
 remote telemetry servers.
 
-If multiple substrate nodes are running in the same process, it uses a `tracing::Span` to
-identify which substrate node is reporting the telemetry. Every task spawned using sc-service's
+If multiple Substrate nodes are running in the same process, it uses a `tracing::Span` to
+identify which Substrate node is reporting the telemetry. Every task spawned using sc-service's
 `TaskManager` automatically inherit this span.
 
 Substrate's nodes initialize/register with the [`TelemetryWorker`] using a [`TelemetryHandle`].
diff --git a/substrate/client/tracing/Cargo.toml b/substrate/client/tracing/Cargo.toml
index aa7bcbe13381cfa968db7881762c2797e898a4e6..ffcbf07490836318cd17ccd983823bbde2f56f78 100644
--- a/substrate/client/tracing/Cargo.toml
+++ b/substrate/client/tracing/Cargo.toml
@@ -2,10 +2,10 @@
 name = "sc-tracing"
 version = "4.0.0-dev"
 license = "GPL-3.0-or-later WITH Classpath-exception-2.0"
-authors = ["Parity Technologies <admin@parity.io>"]
-edition = "2021"
+authors.workspace = true
+edition.workspace = true
 homepage = "https://substrate.io"
-repository = "https://github.com/paritytech/substrate/"
+repository.workspace = true
 description = "Instrumentation implementation for substrate."
 readme = "README.md"
 
@@ -15,15 +15,15 @@ targets = ["x86_64-unknown-linux-gnu"]
 [dependencies]
 ansi_term = "0.12.1"
 atty = "0.2.13"
-chrono = "0.4.19"
+chrono = "0.4.27"
 lazy_static = "1.4.0"
 libc = "0.2.121"
 log = { version = "0.4.17" }
 parking_lot = "0.12.1"
 regex = "1.6.0"
 rustc-hash = "1.1.0"
-serde = "1.0.163"
-thiserror = "1.0.30"
+serde = "1.0.188"
+thiserror = "1.0.48"
 tracing = "0.1.29"
 tracing-log = "0.1.3"
 tracing-subscriber = { version = "0.2.25", features = ["parking_lot"] }
diff --git a/substrate/client/tracing/README.md b/substrate/client/tracing/README.md
index b008436df9bbedd136f79be15c10ec5a7c7b9a07..f52e9d4dbc667112e356e1864c6696497dd79e61 100644
--- a/substrate/client/tracing/README.md
+++ b/substrate/client/tracing/README.md
@@ -1,4 +1,4 @@
-Instrumentation implementation for substrate.
+Instrumentation implementation for Substrate.
 
 This crate is unstable and the API and usage may change.
 
@@ -8,4 +8,4 @@ See `sp-tracing` for examples on how to use tracing.
 
 Currently we provide `Log` (default), `Telemetry` variants for `Receiver`
 
-License: GPL-3.0-or-later WITH Classpath-exception-2.0
\ No newline at end of file
+License: GPL-3.0-or-later WITH Classpath-exception-2.0
diff --git a/substrate/client/tracing/proc-macro/Cargo.toml b/substrate/client/tracing/proc-macro/Cargo.toml
index 4ae836e608367a57ae38cdf8359fad87806a1888..b134cbce3ccf4d4472680787838fd4ad6ebcd567 100644
--- a/substrate/client/tracing/proc-macro/Cargo.toml
+++ b/substrate/client/tracing/proc-macro/Cargo.toml
@@ -1,11 +1,11 @@
 [package]
 name = "sc-tracing-proc-macro"
 version = "4.0.0-dev"
-authors = ["Parity Technologies <admin@parity.io>"]
-edition = "2021"
+authors.workspace = true
+edition.workspace = true
 license = "Apache-2.0"
 homepage = "https://substrate.io"
-repository = "https://github.com/paritytech/substrate/"
+repository.workspace = true
 description = "Helper macros for Substrate's client CLI"
 
 [package.metadata.docs.rs]
@@ -18,4 +18,4 @@ proc-macro = true
 proc-macro-crate = "1.1.3"
 proc-macro2 = "1.0.56"
 quote = { version = "1.0.28", features = ["proc-macro"] }
-syn = { version = "2.0.16", features = ["proc-macro", "full", "extra-traits", "parsing"] }
+syn = { version = "2.0.38", features = ["proc-macro", "full", "extra-traits", "parsing"] }
diff --git a/substrate/client/tracing/src/block/mod.rs b/substrate/client/tracing/src/block/mod.rs
index c0442abc125b939851fab146806733302d9f72fc..9ebf8e55c94d05f007c6fda363409e110a61c4c2 100644
--- a/substrate/client/tracing/src/block/mod.rs
+++ b/substrate/client/tracing/src/block/mod.rs
@@ -1,4 +1,4 @@
-// Copyright Parity Technologies (UK) Ltd.
+// Copyright (C) Parity Technologies (UK) Ltd.
 // This file is part of Substrate.
 
 // Substrate is free software: you can redistribute it and/or modify
diff --git a/substrate/client/tracing/src/logging/directives.rs b/substrate/client/tracing/src/logging/directives.rs
index f1caf1a13a2def082ccba51d5a37aa162034f782..a99e9c4c890976bbc935bb293ee65dec4be1402b 100644
--- a/substrate/client/tracing/src/logging/directives.rs
+++ b/substrate/client/tracing/src/logging/directives.rs
@@ -1,4 +1,4 @@
-// Copyright Parity Technologies (UK) Ltd.
+// Copyright (C) Parity Technologies (UK) Ltd.
 // This file is part of Substrate.
 
 // Substrate is free software: you can redistribute it and/or modify
diff --git a/substrate/client/transaction-pool/Cargo.toml b/substrate/client/transaction-pool/Cargo.toml
index 644465f7db159d1c0c6e6b52b17d27261e2e2505..b893dc839edd4c8a5a6d179b616d857bcd4d2e3c 100644
--- a/substrate/client/transaction-pool/Cargo.toml
+++ b/substrate/client/transaction-pool/Cargo.toml
@@ -1,11 +1,11 @@
 [package]
 name = "sc-transaction-pool"
 version = "4.0.0-dev"
-authors = ["Parity Technologies <admin@parity.io>"]
-edition = "2021"
+authors.workspace = true
+edition.workspace = true
 license = "GPL-3.0-or-later WITH Classpath-exception-2.0"
 homepage = "https://substrate.io"
-repository = "https://github.com/paritytech/substrate/"
+repository.workspace = true
 description = "Substrate transaction pool implementation."
 readme = "README.md"
 
@@ -20,8 +20,8 @@ futures-timer = "3.0.2"
 linked-hash-map = "0.5.4"
 log = "0.4.17"
 parking_lot = "0.12.1"
-serde = { version = "1.0.163", features = ["derive"] }
-thiserror = "1.0.30"
+serde = { version = "1.0.188", features = ["derive"] }
+thiserror = "1.0.48"
 prometheus-endpoint = { package = "substrate-prometheus-endpoint", path = "../../utils/prometheus" }
 sc-client-api = { path = "../api" }
 sc-transaction-pool-api = { path = "api" }
diff --git a/substrate/client/transaction-pool/README.md b/substrate/client/transaction-pool/README.md
index 4a2bbb8838f9c8e2b654c938365cedc65201f36d..b34b623b26e016c444458c66641e68adb795b45a 100644
--- a/substrate/client/transaction-pool/README.md
+++ b/substrate/client/transaction-pool/README.md
@@ -232,7 +232,7 @@ are interested in.
 
 Since the pool is expected to store more transactions than what can fit
 in a single block, validating the entire pool on every block might not be
-feasible. This means that the actual implementation might need to take some 
+feasible. This means that the actual implementation might need to take some
 shortcuts.
 
 ## Suggestions & caveats
@@ -255,7 +255,7 @@ shortcuts.
    lot of re-orgs. Make sure that transactions are never lost.
 
 1. The UTXO model is quite challenging. A transaction becomes valid right after
-   it's included in a block, however it is waiting for exactly the same inputs 
+   it's included in a block, however it is waiting for exactly the same inputs
    to be spent, so it will never really be included again.
 
 1. Note that in a non-ideal implementation the state of the pool will most
@@ -278,7 +278,7 @@ shortcuts.
 
 1. We periodically validate all transactions in the pool in batches.
 
-1. To minimize runtime calls, we introduce the batch-verify call. Note it should 
+1. To minimize runtime calls, we introduce the batch-verify call. Note it should
    reset the state (overlay) after every verification.
 
 1. Consider leveraging finality. Maybe we could verify against latest finalised
@@ -355,7 +355,7 @@ figure out what tags were satisfied by a transaction in that block. For each blo
 transaction we either call into the runtime to get it's `ValidTransaction` object,
 or we check the pool if that transaction is already known to spare the runtime
 call. From this we gather the full set of `provides` tags and perform pruning of
-the `ready` pool based on that. Also, we promote all transactions from `future` 
+the `ready` pool based on that. Also, we promote all transactions from `future`
 that have their tags satisfied.
 
 In case we remove transactions that we are unsure if they were already included
diff --git a/substrate/client/transaction-pool/api/Cargo.toml b/substrate/client/transaction-pool/api/Cargo.toml
index a39401e27aa6b0238c5ff4cea43a7c15faf429ba..5ff5a4149ca983a36d7b940b15bf10bf8c802b0f 100644
--- a/substrate/client/transaction-pool/api/Cargo.toml
+++ b/substrate/client/transaction-pool/api/Cargo.toml
@@ -1,11 +1,11 @@
 [package]
 name = "sc-transaction-pool-api"
 version = "4.0.0-dev"
-authors = ["Parity Technologies <admin@parity.io>"]
-edition = "2021"
+authors.workspace = true
+edition.workspace = true
 license = "GPL-3.0-or-later WITH Classpath-exception-2.0"
 homepage = "https://substrate.io"
-repository = "https://github.com/paritytech/substrate/"
+repository.workspace = true
 description = "Transaction pool client facing API."
 
 [dependencies]
@@ -13,8 +13,8 @@ async-trait = "0.1.57"
 codec = { package = "parity-scale-codec", version = "3.6.1" }
 futures = "0.3.21"
 log = "0.4.17"
-serde = { version = "1.0.163", features = ["derive"] }
-thiserror = "1.0.30"
+serde = { version = "1.0.188", features = ["derive"] }
+thiserror = "1.0.48"
 sp-blockchain = { path = "../../../primitives/blockchain" }
 sp-core = { path = "../../../primitives/core", default-features = false}
 sp-runtime = { path = "../../../primitives/runtime", default-features = false}
diff --git a/substrate/client/transaction-pool/api/src/lib.rs b/substrate/client/transaction-pool/api/src/lib.rs
index 32fe30f4584f0cabb9b0cc834a9d90c632bcc7ca..a795917528f9cca0831068fc77dd346fd2390838 100644
--- a/substrate/client/transaction-pool/api/src/lib.rs
+++ b/substrate/client/transaction-pool/api/src/lib.rs
@@ -22,13 +22,11 @@
 pub mod error;
 
 use async_trait::async_trait;
+use codec::Codec;
 use futures::{Future, Stream};
 use serde::{de::DeserializeOwned, Deserialize, Serialize};
 use sp_core::offchain::TransactionPoolExt;
-use sp_runtime::{
-	generic::BlockId,
-	traits::{Block as BlockT, Member, NumberFor},
-};
+use sp_runtime::traits::{Block as BlockT, Member, NumberFor};
 use std::{collections::HashMap, hash::Hash, marker::PhantomData, pin::Pin, sync::Arc};
 
 const LOG_TARGET: &str = "txpool::api";
@@ -187,7 +185,7 @@ pub trait TransactionPool: Send + Sync {
 	/// Block type.
 	type Block: BlockT;
 	/// Transaction hash type.
-	type Hash: Hash + Eq + Member + Serialize + DeserializeOwned;
+	type Hash: Hash + Eq + Member + Serialize + DeserializeOwned + Codec;
 	/// In-pool transaction type.
 	type InPoolTransaction: InPoolTransaction<
 		Transaction = TransactionFor<Self>,
@@ -201,7 +199,7 @@ pub trait TransactionPool: Send + Sync {
 	/// Returns a future that imports a bunch of unverified transactions to the pool.
 	fn submit_at(
 		&self,
-		at: &BlockId<Self::Block>,
+		at: <Self::Block as BlockT>::Hash,
 		source: TransactionSource,
 		xts: Vec<TransactionFor<Self>>,
 	) -> PoolFuture<Vec<Result<TxHash<Self>, Self::Error>>, Self::Error>;
@@ -209,7 +207,7 @@ pub trait TransactionPool: Send + Sync {
 	/// Returns a future that imports one unverified transaction to the pool.
 	fn submit_one(
 		&self,
-		at: &BlockId<Self::Block>,
+		at: <Self::Block as BlockT>::Hash,
 		source: TransactionSource,
 		xt: TransactionFor<Self>,
 	) -> PoolFuture<TxHash<Self>, Self::Error>;
@@ -218,7 +216,7 @@ pub trait TransactionPool: Send + Sync {
 	/// pool.
 	fn submit_and_watch(
 		&self,
-		at: &BlockId<Self::Block>,
+		at: <Self::Block as BlockT>::Hash,
 		source: TransactionSource,
 		xt: TransactionFor<Self>,
 	) -> PoolFuture<Pin<Box<TransactionStatusStreamFor<Self>>>, Self::Error>;
@@ -247,6 +245,9 @@ pub trait TransactionPool: Send + Sync {
 	fn remove_invalid(&self, hashes: &[TxHash<Self>]) -> Vec<Arc<Self::InPoolTransaction>>;
 
 	// *** logging
+	/// Get futures transaction list.
+	fn futures(&self) -> Vec<Self::InPoolTransaction>;
+
 	/// Returns pool status.
 	fn status(&self) -> PoolStatus;
 
diff --git a/substrate/client/transaction-pool/benches/basics.rs b/substrate/client/transaction-pool/benches/basics.rs
index d114acc343d500909ac3c64cae8580bcad922c66..0caf00bf29551d009d7c9164a9ad2067040de198 100644
--- a/substrate/client/transaction-pool/benches/basics.rs
+++ b/substrate/client/transaction-pool/benches/basics.rs
@@ -33,6 +33,7 @@ use sp_runtime::{
 		ValidTransaction,
 	},
 };
+use std::sync::Arc;
 use substrate_test_runtime::{AccountId, Block, Extrinsic, ExtrinsicBuilder, TransferData, H256};
 
 #[derive(Clone, Debug, Default)]
@@ -61,7 +62,7 @@ impl ChainApi for TestApi {
 
 	fn validate_transaction(
 		&self,
-		at: &BlockId<Self::Block>,
+		at: <Self::Block as BlockT>::Hash,
 		_source: TransactionSource,
 		uxt: <Self::Block as BlockT>::Extrinsic,
 	) -> Self::ValidationFuture {
@@ -70,7 +71,7 @@ impl ChainApi for TestApi {
 		let nonce = transfer.nonce;
 		let from = transfer.from;
 
-		match self.block_id_to_number(at) {
+		match self.block_id_to_number(&BlockId::Hash(at)) {
 			Ok(Some(num)) if num > 5 => return ready(Ok(Err(InvalidTransaction::Stale.into()))),
 			_ => {},
 		}
@@ -94,6 +95,8 @@ impl ChainApi for TestApi {
 	) -> Result<Option<NumberFor<Self::Block>>, Self::Error> {
 		Ok(match at {
 			BlockId::Number(num) => Some(*num),
+			BlockId::Hash(hash) if *hash == H256::from_low_u64_be(hash.to_low_u64_be()) =>
+				Some(hash.to_low_u64_be()),
 			BlockId::Hash(_) => None,
 		})
 	}
@@ -104,7 +107,7 @@ impl ChainApi for TestApi {
 	) -> Result<Option<<Self::Block as BlockT>::Hash>, Self::Error> {
 		Ok(match at {
 			BlockId::Number(num) => Some(H256::from_low_u64_be(*num)).into(),
-			BlockId::Hash(_) => None,
+			BlockId::Hash(hash) => Some(*hash),
 		})
 	}
 
@@ -137,7 +140,7 @@ fn uxt(transfer: TransferData) -> Extrinsic {
 	ExtrinsicBuilder::new_bench_call(transfer).build()
 }
 
-fn bench_configured(pool: Pool<TestApi>, number: u64) {
+fn bench_configured(pool: Pool<TestApi>, number: u64, api: Arc<TestApi>) {
 	let source = TransactionSource::External;
 	let mut futures = Vec::new();
 	let mut tags = Vec::new();
@@ -151,7 +154,12 @@ fn bench_configured(pool: Pool<TestApi>, number: u64) {
 		});
 
 		tags.push(to_tag(nonce, AccountId::from_h256(H256::from_low_u64_be(1))));
-		futures.push(pool.submit_one(&BlockId::Number(1), source, xt));
+
+		futures.push(pool.submit_one(
+			api.block_id_to_hash(&BlockId::Number(1)).unwrap().unwrap(),
+			source,
+			xt,
+		));
 	}
 
 	let res = block_on(futures::future::join_all(futures.into_iter()));
@@ -162,7 +170,12 @@ fn bench_configured(pool: Pool<TestApi>, number: u64) {
 
 	// Prune all transactions.
 	let block_num = 6;
-	block_on(pool.prune_tags(&BlockId::Number(block_num), tags, vec![])).expect("Prune failed");
+	block_on(pool.prune_tags(
+		api.block_id_to_hash(&BlockId::Number(block_num)).unwrap().unwrap(),
+		tags,
+		vec![],
+	))
+	.expect("Prune failed");
 
 	// pool is empty
 	assert_eq!(pool.validated_pool().status().ready, 0);
@@ -172,19 +185,15 @@ fn bench_configured(pool: Pool<TestApi>, number: u64) {
 fn benchmark_main(c: &mut Criterion) {
 	c.bench_function("sequential 50 tx", |b| {
 		b.iter(|| {
-			bench_configured(
-				Pool::new(Default::default(), true.into(), TestApi::new_dependant().into()),
-				50,
-			);
+			let api = Arc::from(TestApi::new_dependant());
+			bench_configured(Pool::new(Default::default(), true.into(), api.clone()), 50, api);
 		});
 	});
 
 	c.bench_function("random 100 tx", |b| {
 		b.iter(|| {
-			bench_configured(
-				Pool::new(Default::default(), true.into(), TestApi::default().into()),
-				100,
-			);
+			let api = Arc::from(TestApi::default());
+			bench_configured(Pool::new(Default::default(), true.into(), api.clone()), 100, api);
 		});
 	});
 }
diff --git a/substrate/client/transaction-pool/src/api.rs b/substrate/client/transaction-pool/src/api.rs
index 871d8e9c81707b9fd3454ce201f898de692f76df..cccaad7c89949cb82e7f7576edf11dc48baab41c 100644
--- a/substrate/client/transaction-pool/src/api.rs
+++ b/substrate/client/transaction-pool/src/api.rs
@@ -133,13 +133,12 @@ where
 
 	fn validate_transaction(
 		&self,
-		at: &BlockId<Self::Block>,
+		at: <Self::Block as BlockT>::Hash,
 		source: TransactionSource,
 		uxt: graph::ExtrinsicFor<Self>,
 	) -> Self::ValidationFuture {
 		let (tx, rx) = oneshot::channel();
 		let client = self.client.clone();
-		let at = *at;
 		let validation_pool = self.validation_pool.clone();
 		let metrics = self.metrics.clone();
 
@@ -151,7 +150,7 @@ where
 				.await
 				.send(
 					async move {
-						let res = validate_transaction_blocking(&*client, &at, source, uxt);
+						let res = validate_transaction_blocking(&*client, at, source, uxt);
 						let _ = tx.send(res);
 						metrics.report(|m| m.validations_finished.inc());
 					}
@@ -209,7 +208,7 @@ where
 /// This method will call into the runtime to perform the validation.
 fn validate_transaction_blocking<Client, Block>(
 	client: &Client,
-	at: &BlockId<Block>,
+	at: Block::Hash,
 	source: TransactionSource,
 	uxt: graph::ExtrinsicFor<FullChainApi<Client, Block>>,
 ) -> error::Result<TransactionValidity>
@@ -225,14 +224,10 @@ where
 {
 	sp_tracing::within_span!(sp_tracing::Level::TRACE, "validate_transaction";
 	{
-		let block_hash = client.to_hash(at)
-			.map_err(|e| Error::RuntimeApi(e.to_string()))?
-			.ok_or_else(|| Error::RuntimeApi(format!("Could not get hash for block `{:?}`.", at)))?;
-
 		let runtime_api = client.runtime_api();
 		let api_version = sp_tracing::within_span! { sp_tracing::Level::TRACE, "check_version";
 			runtime_api
-				.api_version::<dyn TaggedTransactionQueue<Block>>(block_hash)
+				.api_version::<dyn TaggedTransactionQueue<Block>>(at)
 				.map_err(|e| Error::RuntimeApi(e.to_string()))?
 				.ok_or_else(|| Error::RuntimeApi(
 					format!("Could not find `TaggedTransactionQueue` api for block `{:?}`.", at)
@@ -245,31 +240,31 @@ where
 			sp_tracing::Level::TRACE, "runtime::validate_transaction";
 		{
 			if api_version >= 3 {
-				runtime_api.validate_transaction(block_hash, source, uxt, block_hash)
+				runtime_api.validate_transaction(at, source, uxt, at)
 					.map_err(|e| Error::RuntimeApi(e.to_string()))
 			} else {
-				let block_number = client.to_number(at)
+				let block_number = client.to_number(&BlockId::Hash(at))
 					.map_err(|e| Error::RuntimeApi(e.to_string()))?
 					.ok_or_else(||
 						Error::RuntimeApi(format!("Could not get number for block `{:?}`.", at))
 					)?;
 
 				// The old versions require us to call `initialize_block` before.
-				runtime_api.initialize_block(block_hash, &sp_runtime::traits::Header::new(
+				runtime_api.initialize_block(at, &sp_runtime::traits::Header::new(
 					block_number + sp_runtime::traits::One::one(),
 					Default::default(),
 					Default::default(),
-					block_hash,
+					at,
 					Default::default()),
 				).map_err(|e| Error::RuntimeApi(e.to_string()))?;
 
 				if api_version == 2 {
 					#[allow(deprecated)] // old validate_transaction
-					runtime_api.validate_transaction_before_version_3(block_hash, source, uxt)
+					runtime_api.validate_transaction_before_version_3(at, source, uxt)
 						.map_err(|e| Error::RuntimeApi(e.to_string()))
 				} else {
 					#[allow(deprecated)] // old validate_transaction
-					runtime_api.validate_transaction_before_version_2(block_hash, uxt)
+					runtime_api.validate_transaction_before_version_2(at, uxt)
 						.map_err(|e| Error::RuntimeApi(e.to_string()))
 				}
 			}
@@ -294,7 +289,7 @@ where
 	/// the runtime locally.
 	pub fn validate_transaction_blocking(
 		&self,
-		at: &BlockId<Block>,
+		at: Block::Hash,
 		source: TransactionSource,
 		uxt: graph::ExtrinsicFor<Self>,
 	) -> error::Result<TransactionValidity> {
diff --git a/substrate/client/transaction-pool/src/graph/base_pool.rs b/substrate/client/transaction-pool/src/graph/base_pool.rs
index a9d2d6c825f61bf62b03556d1b5ec58fc6541e8e..32885622da4204f557031ce16f50bfddb6f2b87d 100644
--- a/substrate/client/transaction-pool/src/graph/base_pool.rs
+++ b/substrate/client/transaction-pool/src/graph/base_pool.rs
@@ -84,8 +84,7 @@ pub struct PruneStatus<Hash, Ex> {
 }
 
 /// Immutable transaction
-#[cfg_attr(test, derive(Clone))]
-#[derive(PartialEq, Eq)]
+#[derive(PartialEq, Eq, Clone)]
 pub struct Transaction<Hash, Extrinsic> {
 	/// Raw extrinsic representing that transaction.
 	pub data: Extrinsic,
diff --git a/substrate/client/transaction-pool/src/graph/pool.rs b/substrate/client/transaction-pool/src/graph/pool.rs
index 4d34737a7ba704d72aaad67de60f6925499db6c3..5305b5f1c12ebe99668413f87e8becfe4ba45e82 100644
--- a/substrate/client/transaction-pool/src/graph/pool.rs
+++ b/substrate/client/transaction-pool/src/graph/pool.rs
@@ -71,7 +71,7 @@ pub trait ChainApi: Send + Sync {
 	/// Verify extrinsic at given block.
 	fn validate_transaction(
 		&self,
-		at: &BlockId<Self::Block>,
+		at: <Self::Block as BlockT>::Hash,
 		source: TransactionSource,
 		uxt: ExtrinsicFor<Self>,
 	) -> Self::ValidationFuture;
@@ -154,7 +154,7 @@ impl<B: ChainApi> Pool<B> {
 	/// Imports a bunch of unverified extrinsics to the pool
 	pub async fn submit_at(
 		&self,
-		at: &BlockId<B::Block>,
+		at: <B::Block as BlockT>::Hash,
 		source: TransactionSource,
 		xts: impl IntoIterator<Item = ExtrinsicFor<B>>,
 	) -> Result<Vec<Result<ExtrinsicHash<B>, B::Error>>, B::Error> {
@@ -168,7 +168,7 @@ impl<B: ChainApi> Pool<B> {
 	/// This does not check if a transaction is banned, before we verify it again.
 	pub async fn resubmit_at(
 		&self,
-		at: &BlockId<B::Block>,
+		at: <B::Block as BlockT>::Hash,
 		source: TransactionSource,
 		xts: impl IntoIterator<Item = ExtrinsicFor<B>>,
 	) -> Result<Vec<Result<ExtrinsicHash<B>, B::Error>>, B::Error> {
@@ -180,7 +180,7 @@ impl<B: ChainApi> Pool<B> {
 	/// Imports one unverified extrinsic to the pool
 	pub async fn submit_one(
 		&self,
-		at: &BlockId<B::Block>,
+		at: <B::Block as BlockT>::Hash,
 		source: TransactionSource,
 		xt: ExtrinsicFor<B>,
 	) -> Result<ExtrinsicHash<B>, B::Error> {
@@ -191,11 +191,11 @@ impl<B: ChainApi> Pool<B> {
 	/// Import a single extrinsic and starts to watch its progress in the pool.
 	pub async fn submit_and_watch(
 		&self,
-		at: &BlockId<B::Block>,
+		at: <B::Block as BlockT>::Hash,
 		source: TransactionSource,
 		xt: ExtrinsicFor<B>,
 	) -> Result<Watcher<ExtrinsicHash<B>, ExtrinsicHash<B>>, B::Error> {
-		let block_number = self.resolve_block_number(at)?;
+		let block_number = self.resolve_block_number(&BlockId::Hash(at))?;
 		let (_, tx) = self
 			.verify_one(at, block_number, source, xt, CheckBannedBeforeVerify::Yes)
 			.await;
@@ -246,8 +246,8 @@ impl<B: ChainApi> Pool<B> {
 	/// their provided tags from there. Otherwise we query the runtime at the `parent` block.
 	pub async fn prune(
 		&self,
-		at: &BlockId<B::Block>,
-		parent: &BlockId<B::Block>,
+		at: <B::Block as BlockT>::Hash,
+		parent: <B::Block as BlockT>::Hash,
 		extrinsics: &[ExtrinsicFor<B>],
 	) -> Result<(), B::Error> {
 		log::debug!(
@@ -324,7 +324,7 @@ impl<B: ChainApi> Pool<B> {
 	/// prevent importing them in the (near) future.
 	pub async fn prune_tags(
 		&self,
-		at: &BlockId<B::Block>,
+		at: <B::Block as BlockT>::Hash,
 		tags: impl IntoIterator<Item = Tag>,
 		known_imported_hashes: impl IntoIterator<Item = ExtrinsicHash<B>> + Clone,
 	) -> Result<(), B::Error> {
@@ -351,7 +351,7 @@ impl<B: ChainApi> Pool<B> {
 		// And finally - submit reverified transactions back to the pool
 
 		self.validated_pool.resubmit_pruned(
-			at,
+			&BlockId::Hash(at),
 			known_imported_hashes,
 			pruned_hashes,
 			reverified_transactions.into_values().collect(),
@@ -373,12 +373,12 @@ impl<B: ChainApi> Pool<B> {
 	/// Returns future that validates a bunch of transactions at given block.
 	async fn verify(
 		&self,
-		at: &BlockId<B::Block>,
+		at: <B::Block as BlockT>::Hash,
 		xts: impl IntoIterator<Item = (TransactionSource, ExtrinsicFor<B>)>,
 		check: CheckBannedBeforeVerify,
 	) -> Result<HashMap<ExtrinsicHash<B>, ValidatedTransactionFor<B>>, B::Error> {
 		// we need a block number to compute tx validity
-		let block_number = self.resolve_block_number(at)?;
+		let block_number = self.resolve_block_number(&BlockId::Hash(at))?;
 
 		let res = futures::future::join_all(
 			xts.into_iter()
@@ -394,7 +394,7 @@ impl<B: ChainApi> Pool<B> {
 	/// Returns future that validates single transaction at given block.
 	async fn verify_one(
 		&self,
-		block_id: &BlockId<B::Block>,
+		block_hash: <B::Block as BlockT>::Hash,
 		block_number: NumberFor<B>,
 		source: TransactionSource,
 		xt: ExtrinsicFor<B>,
@@ -410,7 +410,7 @@ impl<B: ChainApi> Pool<B> {
 		let validation_result = self
 			.validated_pool
 			.api()
-			.validate_transaction(block_id, source, xt.clone())
+			.validate_transaction(block_hash, source, xt.clone())
 			.await;
 
 		let status = match validation_result {
@@ -458,6 +458,7 @@ mod tests {
 	use super::{super::base_pool::Limit, *};
 	use crate::tests::{pool, uxt, TestApi, INVALID_NONCE};
 	use assert_matches::assert_matches;
+	use codec::Encode;
 	use futures::executor::block_on;
 	use parking_lot::Mutex;
 	use sc_transaction_pool_api::TransactionStatus;
@@ -471,11 +472,11 @@ mod tests {
 	#[test]
 	fn should_validate_and_import_transaction() {
 		// given
-		let pool = pool();
+		let (pool, api) = pool();
 
 		// when
 		let hash = block_on(pool.submit_one(
-			&BlockId::Number(0),
+			api.expect_hash_from_number(0),
 			SOURCE,
 			uxt(Transfer {
 				from: Alice.into(),
@@ -493,7 +494,7 @@ mod tests {
 	#[test]
 	fn should_reject_if_temporarily_banned() {
 		// given
-		let pool = pool();
+		let (pool, api) = pool();
 		let uxt = uxt(Transfer {
 			from: Alice.into(),
 			to: AccountId::from_h256(H256::from_low_u64_be(2)),
@@ -503,7 +504,7 @@ mod tests {
 
 		// when
 		pool.validated_pool.ban(&Instant::now(), vec![pool.hash_of(&uxt)]);
-		let res = block_on(pool.submit_one(&BlockId::Number(0), SOURCE, uxt));
+		let res = block_on(pool.submit_one(api.expect_hash_from_number(0), SOURCE, uxt));
 		assert_eq!(pool.validated_pool().status().ready, 0);
 		assert_eq!(pool.validated_pool().status().future, 0);
 
@@ -514,18 +515,19 @@ mod tests {
 	#[test]
 	fn should_reject_unactionable_transactions() {
 		// given
+		let api = Arc::new(TestApi::default());
 		let pool = Pool::new(
 			Default::default(),
 			// the node does not author blocks
 			false.into(),
-			TestApi::default().into(),
+			api.clone(),
 		);
 
 		// after validation `IncludeData` will be set to non-propagable (validate_transaction mock)
 		let uxt = ExtrinsicBuilder::new_include_data(vec![42]).build();
 
 		// when
-		let res = block_on(pool.submit_one(&BlockId::Number(0), SOURCE, uxt));
+		let res = block_on(pool.submit_one(api.expect_hash_from_number(0), SOURCE, uxt));
 
 		// then
 		assert_matches!(res.unwrap_err(), error::Error::Unactionable);
@@ -535,12 +537,13 @@ mod tests {
 	fn should_notify_about_pool_events() {
 		let (stream, hash0, hash1) = {
 			// given
-			let pool = pool();
+			let (pool, api) = pool();
+			let hash_of_block0 = api.expect_hash_from_number(0);
 			let stream = pool.validated_pool().import_notification_stream();
 
 			// when
 			let hash0 = block_on(pool.submit_one(
-				&BlockId::Number(0),
+				hash_of_block0,
 				SOURCE,
 				uxt(Transfer {
 					from: Alice.into(),
@@ -551,7 +554,7 @@ mod tests {
 			))
 			.unwrap();
 			let hash1 = block_on(pool.submit_one(
-				&BlockId::Number(0),
+				hash_of_block0,
 				SOURCE,
 				uxt(Transfer {
 					from: Alice.into(),
@@ -563,7 +566,7 @@ mod tests {
 			.unwrap();
 			// future doesn't count
 			let _hash = block_on(pool.submit_one(
-				&BlockId::Number(0),
+				hash_of_block0,
 				SOURCE,
 				uxt(Transfer {
 					from: Alice.into(),
@@ -590,9 +593,10 @@ mod tests {
 	#[test]
 	fn should_clear_stale_transactions() {
 		// given
-		let pool = pool();
+		let (pool, api) = pool();
+		let hash_of_block0 = api.expect_hash_from_number(0);
 		let hash1 = block_on(pool.submit_one(
-			&BlockId::Number(0),
+			hash_of_block0,
 			SOURCE,
 			uxt(Transfer {
 				from: Alice.into(),
@@ -603,7 +607,7 @@ mod tests {
 		))
 		.unwrap();
 		let hash2 = block_on(pool.submit_one(
-			&BlockId::Number(0),
+			hash_of_block0,
 			SOURCE,
 			uxt(Transfer {
 				from: Alice.into(),
@@ -614,7 +618,7 @@ mod tests {
 		))
 		.unwrap();
 		let hash3 = block_on(pool.submit_one(
-			&BlockId::Number(0),
+			hash_of_block0,
 			SOURCE,
 			uxt(Transfer {
 				from: Alice.into(),
@@ -641,9 +645,9 @@ mod tests {
 	#[test]
 	fn should_ban_mined_transactions() {
 		// given
-		let pool = pool();
+		let (pool, api) = pool();
 		let hash1 = block_on(pool.submit_one(
-			&BlockId::Number(0),
+			api.expect_hash_from_number(0),
 			SOURCE,
 			uxt(Transfer {
 				from: Alice.into(),
@@ -655,12 +659,12 @@ mod tests {
 		.unwrap();
 
 		// when
-		block_on(pool.prune_tags(&BlockId::Number(1), vec![vec![0]], vec![hash1])).unwrap();
+		block_on(pool.prune_tags(api.expect_hash_from_number(1), vec![vec![0]], vec![hash1]))
+			.unwrap();
 
 		// then
 		assert!(pool.validated_pool.is_banned(&hash1));
 	}
-	use codec::Encode;
 
 	#[test]
 	fn should_limit_futures() {
@@ -678,14 +682,15 @@ mod tests {
 
 		let options = Options { ready: limit.clone(), future: limit.clone(), ..Default::default() };
 
-		let pool = Pool::new(options, true.into(), TestApi::default().into());
+		let api = Arc::new(TestApi::default());
+		let pool = Pool::new(options, true.into(), api.clone());
 
-		let hash1 = block_on(pool.submit_one(&BlockId::Number(0), SOURCE, xt)).unwrap();
+		let hash1 = block_on(pool.submit_one(api.expect_hash_from_number(0), SOURCE, xt)).unwrap();
 		assert_eq!(pool.validated_pool().status().future, 1);
 
 		// when
 		let hash2 = block_on(pool.submit_one(
-			&BlockId::Number(0),
+			api.expect_hash_from_number(0),
 			SOURCE,
 			uxt(Transfer {
 				from: Bob.into(),
@@ -709,11 +714,12 @@ mod tests {
 
 		let options = Options { ready: limit.clone(), future: limit.clone(), ..Default::default() };
 
-		let pool = Pool::new(options, true.into(), TestApi::default().into());
+		let api = Arc::new(TestApi::default());
+		let pool = Pool::new(options, true.into(), api.clone());
 
 		// when
 		block_on(pool.submit_one(
-			&BlockId::Number(0),
+			api.expect_hash_from_number(0),
 			SOURCE,
 			uxt(Transfer {
 				from: Alice.into(),
@@ -732,11 +738,11 @@ mod tests {
 	#[test]
 	fn should_reject_transactions_with_no_provides() {
 		// given
-		let pool = pool();
+		let (pool, api) = pool();
 
 		// when
 		let err = block_on(pool.submit_one(
-			&BlockId::Number(0),
+			api.expect_hash_from_number(0),
 			SOURCE,
 			uxt(Transfer {
 				from: Alice.into(),
@@ -759,9 +765,9 @@ mod tests {
 		#[test]
 		fn should_trigger_ready_and_finalized() {
 			// given
-			let pool = pool();
+			let (pool, api) = pool();
 			let watcher = block_on(pool.submit_and_watch(
-				&BlockId::Number(0),
+				api.expect_hash_from_number(0),
 				SOURCE,
 				uxt(Transfer {
 					from: Alice.into(),
@@ -774,26 +780,25 @@ mod tests {
 			assert_eq!(pool.validated_pool().status().ready, 1);
 			assert_eq!(pool.validated_pool().status().future, 0);
 
+			let hash_of_block2 = api.expect_hash_from_number(2);
+
 			// when
-			block_on(pool.prune_tags(&BlockId::Number(2), vec![vec![0u8]], vec![])).unwrap();
+			block_on(pool.prune_tags(hash_of_block2, vec![vec![0u8]], vec![])).unwrap();
 			assert_eq!(pool.validated_pool().status().ready, 0);
 			assert_eq!(pool.validated_pool().status().future, 0);
 
 			// then
 			let mut stream = futures::executor::block_on_stream(watcher.into_stream());
 			assert_eq!(stream.next(), Some(TransactionStatus::Ready));
-			assert_eq!(
-				stream.next(),
-				Some(TransactionStatus::InBlock((H256::from_low_u64_be(2).into(), 0))),
-			);
+			assert_eq!(stream.next(), Some(TransactionStatus::InBlock((hash_of_block2.into(), 0))),);
 		}
 
 		#[test]
 		fn should_trigger_ready_and_finalized_when_pruning_via_hash() {
 			// given
-			let pool = pool();
+			let (pool, api) = pool();
 			let watcher = block_on(pool.submit_and_watch(
-				&BlockId::Number(0),
+				api.expect_hash_from_number(0),
 				SOURCE,
 				uxt(Transfer {
 					from: Alice.into(),
@@ -806,8 +811,10 @@ mod tests {
 			assert_eq!(pool.validated_pool().status().ready, 1);
 			assert_eq!(pool.validated_pool().status().future, 0);
 
+			let hash_of_block2 = api.expect_hash_from_number(2);
+
 			// when
-			block_on(pool.prune_tags(&BlockId::Number(2), vec![vec![0u8]], vec![*watcher.hash()]))
+			block_on(pool.prune_tags(hash_of_block2, vec![vec![0u8]], vec![*watcher.hash()]))
 				.unwrap();
 			assert_eq!(pool.validated_pool().status().ready, 0);
 			assert_eq!(pool.validated_pool().status().future, 0);
@@ -815,18 +822,17 @@ mod tests {
 			// then
 			let mut stream = futures::executor::block_on_stream(watcher.into_stream());
 			assert_eq!(stream.next(), Some(TransactionStatus::Ready));
-			assert_eq!(
-				stream.next(),
-				Some(TransactionStatus::InBlock((H256::from_low_u64_be(2).into(), 0))),
-			);
+			assert_eq!(stream.next(), Some(TransactionStatus::InBlock((hash_of_block2.into(), 0))),);
 		}
 
 		#[test]
 		fn should_trigger_future_and_ready_after_promoted() {
 			// given
-			let pool = pool();
+			let (pool, api) = pool();
+			let hash_of_block0 = api.expect_hash_from_number(0);
+
 			let watcher = block_on(pool.submit_and_watch(
-				&BlockId::Number(0),
+				hash_of_block0,
 				SOURCE,
 				uxt(Transfer {
 					from: Alice.into(),
@@ -841,7 +847,7 @@ mod tests {
 
 			// when
 			block_on(pool.submit_one(
-				&BlockId::Number(0),
+				hash_of_block0,
 				SOURCE,
 				uxt(Transfer {
 					from: Alice.into(),
@@ -862,7 +868,7 @@ mod tests {
 		#[test]
 		fn should_trigger_invalid_and_ban() {
 			// given
-			let pool = pool();
+			let (pool, api) = pool();
 			let uxt = uxt(Transfer {
 				from: Alice.into(),
 				to: AccountId::from_h256(H256::from_low_u64_be(2)),
@@ -870,7 +876,8 @@ mod tests {
 				nonce: 0,
 			});
 			let watcher =
-				block_on(pool.submit_and_watch(&BlockId::Number(0), SOURCE, uxt)).unwrap();
+				block_on(pool.submit_and_watch(api.expect_hash_from_number(0), SOURCE, uxt))
+					.unwrap();
 			assert_eq!(pool.validated_pool().status().ready, 1);
 
 			// when
@@ -886,7 +893,7 @@ mod tests {
 		#[test]
 		fn should_trigger_broadcasted() {
 			// given
-			let pool = pool();
+			let (pool, api) = pool();
 			let uxt = uxt(Transfer {
 				from: Alice.into(),
 				to: AccountId::from_h256(H256::from_low_u64_be(2)),
@@ -894,7 +901,8 @@ mod tests {
 				nonce: 0,
 			});
 			let watcher =
-				block_on(pool.submit_and_watch(&BlockId::Number(0), SOURCE, uxt)).unwrap();
+				block_on(pool.submit_and_watch(api.expect_hash_from_number(0), SOURCE, uxt))
+					.unwrap();
 			assert_eq!(pool.validated_pool().status().ready, 1);
 
 			// when
@@ -916,7 +924,8 @@ mod tests {
 			let options =
 				Options { ready: limit.clone(), future: limit.clone(), ..Default::default() };
 
-			let pool = Pool::new(options, true.into(), TestApi::default().into());
+			let api = Arc::new(TestApi::default());
+			let pool = Pool::new(options, true.into(), api.clone());
 
 			let xt = uxt(Transfer {
 				from: Alice.into(),
@@ -924,7 +933,9 @@ mod tests {
 				amount: 5,
 				nonce: 0,
 			});
-			let watcher = block_on(pool.submit_and_watch(&BlockId::Number(0), SOURCE, xt)).unwrap();
+			let watcher =
+				block_on(pool.submit_and_watch(api.expect_hash_from_number(0), SOURCE, xt))
+					.unwrap();
 			assert_eq!(pool.validated_pool().status().ready, 1);
 
 			// when
@@ -934,7 +945,7 @@ mod tests {
 				amount: 4,
 				nonce: 1,
 			});
-			block_on(pool.submit_one(&BlockId::Number(1), SOURCE, xt)).unwrap();
+			block_on(pool.submit_one(api.expect_hash_from_number(1), SOURCE, xt)).unwrap();
 			assert_eq!(pool.validated_pool().status().ready, 1);
 
 			// then
@@ -951,12 +962,13 @@ mod tests {
 				let options =
 					Options { ready: limit.clone(), future: limit.clone(), ..Default::default() };
 
-				let pool = Pool::new(options, true.into(), TestApi::default().into());
+				let api = Arc::new(TestApi::default());
+				let pool = Pool::new(options, true.into(), api.clone());
 
 				// after validation `IncludeData` will have priority set to 9001
 				// (validate_transaction mock)
 				let xt = ExtrinsicBuilder::new_include_data(Vec::new()).build();
-				block_on(pool.submit_one(&BlockId::Number(0), SOURCE, xt)).unwrap();
+				block_on(pool.submit_one(api.expect_hash_from_number(0), SOURCE, xt)).unwrap();
 				assert_eq!(pool.validated_pool().status().ready, 1);
 
 				// then
@@ -968,7 +980,7 @@ mod tests {
 					amount: 4,
 					nonce: 1,
 				});
-				let result = block_on(pool.submit_one(&BlockId::Number(1), SOURCE, xt));
+				let result = block_on(pool.submit_one(api.expect_hash_from_number(1), SOURCE, xt));
 				assert!(matches!(
 					result,
 					Err(sc_transaction_pool_api::error::Error::ImmediatelyDropped)
@@ -980,12 +992,15 @@ mod tests {
 				let options =
 					Options { ready: limit.clone(), future: limit.clone(), ..Default::default() };
 
-				let pool = Pool::new(options, true.into(), TestApi::default().into());
+				let api = Arc::new(TestApi::default());
+				let pool = Pool::new(options, true.into(), api.clone());
+
+				let hash_of_block0 = api.expect_hash_from_number(0);
 
 				// after validation `IncludeData` will have priority set to 9001
 				// (validate_transaction mock)
 				let xt = ExtrinsicBuilder::new_include_data(Vec::new()).build();
-				block_on(pool.submit_and_watch(&BlockId::Number(0), SOURCE, xt)).unwrap();
+				block_on(pool.submit_and_watch(hash_of_block0, SOURCE, xt)).unwrap();
 				assert_eq!(pool.validated_pool().status().ready, 1);
 
 				// after validation `Transfer` will have priority set to 4 (validate_transaction
@@ -996,15 +1011,14 @@ mod tests {
 					amount: 5,
 					nonce: 0,
 				});
-				let watcher =
-					block_on(pool.submit_and_watch(&BlockId::Number(0), SOURCE, xt)).unwrap();
+				let watcher = block_on(pool.submit_and_watch(hash_of_block0, SOURCE, xt)).unwrap();
 				assert_eq!(pool.validated_pool().status().ready, 2);
 
 				// when
 				// after validation `Store` will have priority set to 9001 (validate_transaction
 				// mock)
 				let xt = ExtrinsicBuilder::new_indexed_call(Vec::new()).build();
-				block_on(pool.submit_one(&BlockId::Number(1), SOURCE, xt)).unwrap();
+				block_on(pool.submit_one(api.expect_hash_from_number(1), SOURCE, xt)).unwrap();
 				assert_eq!(pool.validated_pool().status().ready, 2);
 
 				// then
@@ -1021,7 +1035,10 @@ mod tests {
 			let (tx, rx) = std::sync::mpsc::sync_channel(1);
 			let mut api = TestApi::default();
 			api.delay = Arc::new(Mutex::new(rx.into()));
-			let pool = Arc::new(Pool::new(Default::default(), true.into(), api.into()));
+			let api = Arc::new(api);
+			let pool = Arc::new(Pool::new(Default::default(), true.into(), api.clone()));
+
+			let hash_of_block0 = api.expect_hash_from_number(0);
 
 			// when
 			let xt = uxt(Transfer {
@@ -1034,7 +1051,7 @@ mod tests {
 			// This transaction should go to future, since we use `nonce: 1`
 			let pool2 = pool.clone();
 			std::thread::spawn(move || {
-				block_on(pool2.submit_one(&BlockId::Number(0), SOURCE, xt)).unwrap();
+				block_on(pool2.submit_one(hash_of_block0, SOURCE, xt)).unwrap();
 				ready.send(()).unwrap();
 			});
 
@@ -1048,12 +1065,13 @@ mod tests {
 			});
 			// The tag the above transaction provides (TestApi is using just nonce as u8)
 			let provides = vec![0_u8];
-			block_on(pool.submit_one(&BlockId::Number(0), SOURCE, xt)).unwrap();
+			block_on(pool.submit_one(hash_of_block0, SOURCE, xt)).unwrap();
 			assert_eq!(pool.validated_pool().status().ready, 1);
 
 			// Now block import happens before the second transaction is able to finish
 			// verification.
-			block_on(pool.prune_tags(&BlockId::Number(1), vec![provides], vec![])).unwrap();
+			block_on(pool.prune_tags(api.expect_hash_from_number(1), vec![provides], vec![]))
+				.unwrap();
 			assert_eq!(pool.validated_pool().status().ready, 0);
 
 			// so when we release the verification of the previous one it will have
diff --git a/substrate/client/transaction-pool/src/graph/validated_pool.rs b/substrate/client/transaction-pool/src/graph/validated_pool.rs
index ed76d439ae71d1b42222964461274af1a11ba7fa..3d7cfeb46b0488a839c7870dec57261293887cf2 100644
--- a/substrate/client/transaction-pool/src/graph/validated_pool.rs
+++ b/substrate/client/transaction-pool/src/graph/validated_pool.rs
@@ -106,7 +106,7 @@ pub struct ValidatedPool<B: ChainApi> {
 	is_validator: IsValidator,
 	options: Options,
 	listener: RwLock<Listener<ExtrinsicHash<B>, B>>,
-	pool: RwLock<base::BasePool<ExtrinsicHash<B>, ExtrinsicFor<B>>>,
+	pub(crate) pool: RwLock<base::BasePool<ExtrinsicHash<B>, ExtrinsicFor<B>>>,
 	import_notification_sinks: Mutex<Vec<Sender<ExtrinsicHash<B>>>>,
 	rotator: PoolRotator<ExtrinsicHash<B>>,
 }
diff --git a/substrate/client/transaction-pool/src/lib.rs b/substrate/client/transaction-pool/src/lib.rs
index 80e5925194c6848291c275d7e7c80c4e239f7494..faa3f455a580c8713ced21b14818da874fd972a7 100644
--- a/substrate/client/transaction-pool/src/lib.rs
+++ b/substrate/client/transaction-pool/src/lib.rs
@@ -166,8 +166,11 @@ where
 		finalized_hash: Block::Hash,
 	) -> (Self, Pin<Box<dyn Future<Output = ()> + Send>>) {
 		let pool = Arc::new(graph::Pool::new(Default::default(), true.into(), pool_api.clone()));
-		let (revalidation_queue, background_task) =
-			revalidation::RevalidationQueue::new_background(pool_api.clone(), pool.clone());
+		let (revalidation_queue, background_task) = revalidation::RevalidationQueue::new_background(
+			pool_api.clone(),
+			pool.clone(),
+			finalized_hash,
+		);
 		(
 			Self {
 				api: pool_api,
@@ -203,8 +206,11 @@ where
 			RevalidationType::Light =>
 				(revalidation::RevalidationQueue::new(pool_api.clone(), pool.clone()), None),
 			RevalidationType::Full => {
-				let (queue, background) =
-					revalidation::RevalidationQueue::new_background(pool_api.clone(), pool.clone());
+				let (queue, background) = revalidation::RevalidationQueue::new_background(
+					pool_api.clone(),
+					pool.clone(),
+					finalized_hash,
+				);
 				(queue, Some(background))
 			},
 		};
@@ -254,46 +260,43 @@ where
 
 	fn submit_at(
 		&self,
-		at: &BlockId<Self::Block>,
+		at: <Self::Block as BlockT>::Hash,
 		source: TransactionSource,
 		xts: Vec<TransactionFor<Self>>,
 	) -> PoolFuture<Vec<Result<TxHash<Self>, Self::Error>>, Self::Error> {
 		let pool = self.pool.clone();
-		let at = *at;
 
 		self.metrics
 			.report(|metrics| metrics.submitted_transactions.inc_by(xts.len() as u64));
 
-		async move { pool.submit_at(&at, source, xts).await }.boxed()
+		async move { pool.submit_at(at, source, xts).await }.boxed()
 	}
 
 	fn submit_one(
 		&self,
-		at: &BlockId<Self::Block>,
+		at: <Self::Block as BlockT>::Hash,
 		source: TransactionSource,
 		xt: TransactionFor<Self>,
 	) -> PoolFuture<TxHash<Self>, Self::Error> {
 		let pool = self.pool.clone();
-		let at = *at;
 
 		self.metrics.report(|metrics| metrics.submitted_transactions.inc());
 
-		async move { pool.submit_one(&at, source, xt).await }.boxed()
+		async move { pool.submit_one(at, source, xt).await }.boxed()
 	}
 
 	fn submit_and_watch(
 		&self,
-		at: &BlockId<Self::Block>,
+		at: <Self::Block as BlockT>::Hash,
 		source: TransactionSource,
 		xt: TransactionFor<Self>,
 	) -> PoolFuture<Pin<Box<TransactionStatusStreamFor<Self>>>, Self::Error> {
-		let at = *at;
 		let pool = self.pool.clone();
 
 		self.metrics.report(|metrics| metrics.submitted_transactions.inc());
 
 		async move {
-			let watcher = pool.submit_and_watch(&at, source, xt).await?;
+			let watcher = pool.submit_and_watch(at, source, xt).await?;
 
 			Ok(watcher.into_stream().boxed())
 		}
@@ -358,6 +361,12 @@ where
 	fn ready(&self) -> ReadyIteratorFor<PoolApi> {
 		Box::new(self.pool.validated_pool().ready())
 	}
+
+	fn futures(&self) -> Vec<Self::InPoolTransaction> {
+		let pool = self.pool.validated_pool().pool.read();
+
+		pool.futures().cloned().collect::<Vec<_>>()
+	}
 }
 
 impl<Block, Client> FullPool<Block, Client>
@@ -427,11 +436,7 @@ where
 
 		let validity = self
 			.api
-			.validate_transaction_blocking(
-				&BlockId::hash(at),
-				TransactionSource::Local,
-				xt.clone(),
-			)?
+			.validate_transaction_blocking(at, TransactionSource::Local, xt.clone())?
 			.map_err(|e| {
 				Self::Error::Pool(match e {
 					TransactionValidityError::Invalid(i) => TxPoolError::InvalidTransaction(i),
@@ -571,10 +576,7 @@ async fn prune_known_txs_for_block<Block: BlockT, Api: graph::ChainApi<Block = B
 		},
 	};
 
-	if let Err(e) = pool
-		.prune(&BlockId::Hash(block_hash), &BlockId::hash(*header.parent_hash()), &extrinsics)
-		.await
-	{
+	if let Err(e) = pool.prune(block_hash, *header.parent_hash(), &extrinsics).await {
 		log::error!("Cannot prune known in the pool: {}", e);
 	}
 
@@ -685,7 +687,7 @@ where
 
 			if let Err(e) = pool
 				.resubmit_at(
-					&BlockId::Hash(*hash),
+					*hash,
 					// These transactions are coming from retracted blocks, we should
 					// simply consider them external.
 					TransactionSource::External,
@@ -711,7 +713,7 @@ where
 
 		if next_action.revalidate {
 			let hashes = pool.validated_pool().ready().map(|tx| tx.hash).collect();
-			self.revalidation_queue.revalidate_later(*block_number, hashes).await;
+			self.revalidation_queue.revalidate_later(*hash, hashes).await;
 
 			self.revalidation_strategy.lock().clear();
 		}
diff --git a/substrate/client/transaction-pool/src/revalidation.rs b/substrate/client/transaction-pool/src/revalidation.rs
index b2c41be92eea3cdbe55bf2db5ddfe5d23d91d8bd..488ab19d8eabc3c11cb575f588400d03ffea39b0 100644
--- a/substrate/client/transaction-pool/src/revalidation.rs
+++ b/substrate/client/transaction-pool/src/revalidation.rs
@@ -25,14 +25,12 @@ use std::{
 };
 
 use crate::{
-	graph::{ChainApi, ExtrinsicHash, NumberFor, Pool, ValidatedTransaction},
+	graph::{BlockHash, ChainApi, ExtrinsicHash, Pool, ValidatedTransaction},
 	LOG_TARGET,
 };
 use sc_utils::mpsc::{tracing_unbounded, TracingUnboundedReceiver, TracingUnboundedSender};
 use sp_runtime::{
-	generic::BlockId,
-	traits::{SaturatedConversion, Zero},
-	transaction_validity::TransactionValidityError,
+	generic::BlockId, traits::SaturatedConversion, transaction_validity::TransactionValidityError,
 };
 
 use futures::prelude::*;
@@ -44,7 +42,7 @@ const MIN_BACKGROUND_REVALIDATION_BATCH_SIZE: usize = 20;
 
 /// Payload from queue to worker.
 struct WorkerPayload<Api: ChainApi> {
-	at: NumberFor<Api>,
+	at: BlockHash<Api>,
 	transactions: Vec<ExtrinsicHash<Api>>,
 }
 
@@ -54,9 +52,9 @@ struct WorkerPayload<Api: ChainApi> {
 struct RevalidationWorker<Api: ChainApi> {
 	api: Arc<Api>,
 	pool: Arc<Pool<Api>>,
-	best_block: NumberFor<Api>,
-	block_ordered: BTreeMap<NumberFor<Api>, HashSet<ExtrinsicHash<Api>>>,
-	members: HashMap<ExtrinsicHash<Api>, NumberFor<Api>>,
+	best_block: BlockHash<Api>,
+	block_ordered: BTreeMap<BlockHash<Api>, HashSet<ExtrinsicHash<Api>>>,
+	members: HashMap<ExtrinsicHash<Api>, BlockHash<Api>>,
 }
 
 impl<Api: ChainApi> Unpin for RevalidationWorker<Api> {}
@@ -68,15 +66,30 @@ impl<Api: ChainApi> Unpin for RevalidationWorker<Api> {}
 async fn batch_revalidate<Api: ChainApi>(
 	pool: Arc<Pool<Api>>,
 	api: Arc<Api>,
-	at: NumberFor<Api>,
+	at: BlockHash<Api>,
 	batch: impl IntoIterator<Item = ExtrinsicHash<Api>>,
 ) {
+	// This conversion should work. Otherwise, for unknown block the revalidation shall be skipped,
+	// all the transactions will be kept in the validated pool, and can be scheduled for
+	// revalidation with the next request.
+	let block_number = match api.block_id_to_number(&BlockId::Hash(at)) {
+		Ok(Some(n)) => n,
+		Ok(None) => {
+			log::debug!(target: LOG_TARGET, "revalidation skipped at block {at:?}, could not get block number.");
+			return
+		},
+		Err(e) => {
+			log::debug!(target: LOG_TARGET, "revalidation skipped at block {at:?}: {e:?}.");
+			return
+		},
+	};
+
 	let mut invalid_hashes = Vec::new();
 	let mut revalidated = HashMap::new();
 
 	let validation_results = futures::future::join_all(batch.into_iter().filter_map(|ext_hash| {
 		pool.validated_pool().ready_by_hash(&ext_hash).map(|ext| {
-			api.validate_transaction(&BlockId::Number(at), ext.source, ext.data.clone())
+			api.validate_transaction(at, ext.source, ext.data.clone())
 				.map(move |validation_result| (validation_result, ext_hash, ext))
 		})
 	}))
@@ -107,7 +120,7 @@ async fn batch_revalidate<Api: ChainApi>(
 				revalidated.insert(
 					ext_hash,
 					ValidatedTransaction::valid_at(
-						at.saturated_into::<u64>(),
+						block_number.saturated_into::<u64>(),
 						ext_hash,
 						ext.source,
 						ext.data.clone(),
@@ -135,13 +148,13 @@ async fn batch_revalidate<Api: ChainApi>(
 }
 
 impl<Api: ChainApi> RevalidationWorker<Api> {
-	fn new(api: Arc<Api>, pool: Arc<Pool<Api>>) -> Self {
+	fn new(api: Arc<Api>, pool: Arc<Pool<Api>>, best_block: BlockHash<Api>) -> Self {
 		Self {
 			api,
 			pool,
+			best_block,
 			block_ordered: Default::default(),
 			members: Default::default(),
-			best_block: Zero::zero(),
 		}
 	}
 
@@ -303,10 +316,11 @@ where
 		api: Arc<Api>,
 		pool: Arc<Pool<Api>>,
 		interval: Duration,
+		best_block: BlockHash<Api>,
 	) -> (Self, Pin<Box<dyn Future<Output = ()> + Send>>) {
 		let (to_worker, from_queue) = tracing_unbounded("mpsc_revalidation_queue", 100_000);
 
-		let worker = RevalidationWorker::new(api.clone(), pool.clone());
+		let worker = RevalidationWorker::new(api.clone(), pool.clone(), best_block);
 
 		let queue = Self { api, pool, background: Some(to_worker) };
 
@@ -317,8 +331,9 @@ where
 	pub fn new_background(
 		api: Arc<Api>,
 		pool: Arc<Pool<Api>>,
+		best_block: BlockHash<Api>,
 	) -> (Self, Pin<Box<dyn Future<Output = ()> + Send>>) {
-		Self::new_with_interval(api, pool, BACKGROUND_REVALIDATION_INTERVAL)
+		Self::new_with_interval(api, pool, BACKGROUND_REVALIDATION_INTERVAL, best_block)
 	}
 
 	/// Queue some transaction for later revalidation.
@@ -328,7 +343,7 @@ where
 	/// revalidation is actually done.
 	pub async fn revalidate_later(
 		&self,
-		at: NumberFor<Api>,
+		at: BlockHash<Api>,
 		transactions: Vec<ExtrinsicHash<Api>>,
 	) {
 		if transactions.len() > 0 {
@@ -360,9 +375,8 @@ mod tests {
 	};
 	use futures::executor::block_on;
 	use sc_transaction_pool_api::TransactionSource;
-	use sp_runtime::generic::BlockId;
 	use substrate_test_runtime::{AccountId, Transfer, H256};
-	use substrate_test_runtime_client::AccountKeyring::Alice;
+	use substrate_test_runtime_client::AccountKeyring::{Alice, Bob};
 
 	#[test]
 	fn revalidation_queue_works() {
@@ -376,18 +390,63 @@ mod tests {
 			amount: 5,
 			nonce: 0,
 		});
-		let uxt_hash = block_on(pool.submit_one(
-			&BlockId::number(0),
-			TransactionSource::External,
-			uxt.clone(),
-		))
-		.expect("Should be valid");
 
-		block_on(queue.revalidate_later(0, vec![uxt_hash]));
+		let hash_of_block0 = api.expect_hash_from_number(0);
+
+		let uxt_hash =
+			block_on(pool.submit_one(hash_of_block0, TransactionSource::External, uxt.clone()))
+				.expect("Should be valid");
+
+		block_on(queue.revalidate_later(hash_of_block0, vec![uxt_hash]));
 
 		// revalidated in sync offload 2nd time
 		assert_eq!(api.validation_requests().len(), 2);
 		// number of ready
 		assert_eq!(pool.validated_pool().status().ready, 1);
 	}
+
+	#[test]
+	fn revalidation_queue_skips_revalidation_for_unknown_block_hash() {
+		let api = Arc::new(TestApi::default());
+		let pool = Arc::new(Pool::new(Default::default(), true.into(), api.clone()));
+		let queue = Arc::new(RevalidationQueue::new(api.clone(), pool.clone()));
+
+		let uxt0 = uxt(Transfer {
+			from: Alice.into(),
+			to: AccountId::from_h256(H256::from_low_u64_be(2)),
+			amount: 5,
+			nonce: 0,
+		});
+		let uxt1 = uxt(Transfer {
+			from: Bob.into(),
+			to: AccountId::from_h256(H256::from_low_u64_be(2)),
+			amount: 4,
+			nonce: 1,
+		});
+
+		let hash_of_block0 = api.expect_hash_from_number(0);
+		let unknown_block = H256::repeat_byte(0x13);
+
+		let uxt_hashes =
+			block_on(pool.submit_at(hash_of_block0, TransactionSource::External, vec![uxt0, uxt1]))
+				.expect("Should be valid")
+				.into_iter()
+				.map(|r| r.expect("Should be valid"))
+				.collect::<Vec<_>>();
+
+		assert_eq!(api.validation_requests().len(), 2);
+		assert_eq!(pool.validated_pool().status().ready, 2);
+
+		// revalidation works fine for block 0:
+		block_on(queue.revalidate_later(hash_of_block0, uxt_hashes.clone()));
+		assert_eq!(api.validation_requests().len(), 4);
+		assert_eq!(pool.validated_pool().status().ready, 2);
+
+		// revalidation shall be skipped for unknown block:
+		block_on(queue.revalidate_later(unknown_block, uxt_hashes));
+		// no revalidation shall be done
+		assert_eq!(api.validation_requests().len(), 4);
+		// number of ready shall not change
+		assert_eq!(pool.validated_pool().status().ready, 2);
+	}
 }
diff --git a/substrate/client/transaction-pool/src/tests.rs b/substrate/client/transaction-pool/src/tests.rs
index 62911d5cbb471e37f7075d5506d98b60f8f46b83..325add3fb1c5a81a56a4a2591ed12ac4630b0b06 100644
--- a/substrate/client/transaction-pool/src/tests.rs
+++ b/substrate/client/transaction-pool/src/tests.rs
@@ -32,7 +32,7 @@ use sp_runtime::{
 };
 use std::{collections::HashSet, sync::Arc};
 use substrate_test_runtime::{
-	substrate_test_pallet::pallet::Call as PalletCall, BalancesCall, Block, Extrinsic,
+	substrate_test_pallet::pallet::Call as PalletCall, BalancesCall, Block, BlockNumber, Extrinsic,
 	ExtrinsicBuilder, Hashing, RuntimeCall, Transfer, TransferData, H256,
 };
 
@@ -53,6 +53,11 @@ impl TestApi {
 	pub fn validation_requests(&self) -> Vec<Extrinsic> {
 		self.validation_requests.lock().clone()
 	}
+
+	/// Helper function for mapping block number to hash. Use if mapping shall not fail.
+	pub fn expect_hash_from_number(&self, n: BlockNumber) -> H256 {
+		self.block_id_to_hash(&BlockId::Number(n)).unwrap().unwrap()
+	}
 }
 
 impl ChainApi for TestApi {
@@ -64,13 +69,13 @@ impl ChainApi for TestApi {
 	/// Verify extrinsic at given block.
 	fn validate_transaction(
 		&self,
-		at: &BlockId<Self::Block>,
+		at: <Self::Block as BlockT>::Hash,
 		_source: TransactionSource,
 		uxt: ExtrinsicFor<Self>,
 	) -> Self::ValidationFuture {
 		self.validation_requests.lock().push(uxt.clone());
 		let hash = self.hash_and_length(&uxt).0;
-		let block_number = self.block_id_to_number(at).unwrap().unwrap();
+		let block_number = self.block_id_to_number(&BlockId::Hash(at)).unwrap().unwrap();
 
 		let res = match uxt {
 			Extrinsic {
@@ -153,6 +158,8 @@ impl ChainApi for TestApi {
 	) -> Result<Option<NumberFor<Self>>, Self::Error> {
 		Ok(match at {
 			BlockId::Number(num) => Some(*num),
+			BlockId::Hash(hash) if *hash == H256::from_low_u64_be(hash.to_low_u64_be()) =>
+				Some(hash.to_low_u64_be()),
 			BlockId::Hash(_) => None,
 		})
 	}
@@ -164,7 +171,7 @@ impl ChainApi for TestApi {
 	) -> Result<Option<<Self::Block as BlockT>::Hash>, Self::Error> {
 		Ok(match at {
 			BlockId::Number(num) => Some(H256::from_low_u64_be(*num)).into(),
-			BlockId::Hash(_) => None,
+			BlockId::Hash(hash) => Some(*hash),
 		})
 	}
 
@@ -199,6 +206,7 @@ pub(crate) fn uxt(transfer: Transfer) -> Extrinsic {
 	ExtrinsicBuilder::new_transfer(transfer).build()
 }
 
-pub(crate) fn pool() -> Pool<TestApi> {
-	Pool::new(Default::default(), true.into(), TestApi::default().into())
+pub(crate) fn pool() -> (Pool<TestApi>, Arc<TestApi>) {
+	let api = Arc::new(TestApi::default());
+	(Pool::new(Default::default(), true.into(), api.clone()), api)
 }
diff --git a/substrate/client/transaction-pool/tests/pool.rs b/substrate/client/transaction-pool/tests/pool.rs
index 4adf811b42521c165bcb777f45cc43e674940146..e5ab01ffbf09f73bb4f86632aeada334ec6dafc0 100644
--- a/substrate/client/transaction-pool/tests/pool.rs
+++ b/substrate/client/transaction-pool/tests/pool.rs
@@ -47,8 +47,9 @@ use substrate_test_runtime_transaction_pool::{uxt, TestApi};
 
 const LOG_TARGET: &str = "txpool";
 
-fn pool() -> Pool<TestApi> {
-	Pool::new(Default::default(), true.into(), TestApi::with_alice_nonce(209).into())
+fn pool() -> (Pool<TestApi>, Arc<TestApi>) {
+	let api = Arc::new(TestApi::with_alice_nonce(209));
+	(Pool::new(Default::default(), true.into(), api.clone()), api)
 }
 
 fn maintained_pool() -> (BasicPool<TestApi, Block>, Arc<TestApi>, futures::executor::ThreadPool) {
@@ -83,8 +84,8 @@ const SOURCE: TransactionSource = TransactionSource::External;
 
 #[test]
 fn submission_should_work() {
-	let pool = pool();
-	block_on(pool.submit_one(&BlockId::number(0), SOURCE, uxt(Alice, 209))).unwrap();
+	let (pool, api) = pool();
+	block_on(pool.submit_one(api.expect_hash_from_number(0), SOURCE, uxt(Alice, 209))).unwrap();
 
 	let pending: Vec<_> = pool
 		.validated_pool()
@@ -96,9 +97,9 @@ fn submission_should_work() {
 
 #[test]
 fn multiple_submission_should_work() {
-	let pool = pool();
-	block_on(pool.submit_one(&BlockId::number(0), SOURCE, uxt(Alice, 209))).unwrap();
-	block_on(pool.submit_one(&BlockId::number(0), SOURCE, uxt(Alice, 210))).unwrap();
+	let (pool, api) = pool();
+	block_on(pool.submit_one(api.expect_hash_from_number(0), SOURCE, uxt(Alice, 209))).unwrap();
+	block_on(pool.submit_one(api.expect_hash_from_number(0), SOURCE, uxt(Alice, 210))).unwrap();
 
 	let pending: Vec<_> = pool
 		.validated_pool()
@@ -111,8 +112,8 @@ fn multiple_submission_should_work() {
 #[test]
 fn early_nonce_should_be_culled() {
 	sp_tracing::try_init_simple();
-	let pool = pool();
-	block_on(pool.submit_one(&BlockId::number(0), SOURCE, uxt(Alice, 208))).unwrap();
+	let (pool, api) = pool();
+	block_on(pool.submit_one(api.expect_hash_from_number(0), SOURCE, uxt(Alice, 208))).unwrap();
 
 	let pending: Vec<_> = pool
 		.validated_pool()
@@ -124,9 +125,9 @@ fn early_nonce_should_be_culled() {
 
 #[test]
 fn late_nonce_should_be_queued() {
-	let pool = pool();
+	let (pool, api) = pool();
 
-	block_on(pool.submit_one(&BlockId::number(0), SOURCE, uxt(Alice, 210))).unwrap();
+	block_on(pool.submit_one(api.expect_hash_from_number(0), SOURCE, uxt(Alice, 210))).unwrap();
 	let pending: Vec<_> = pool
 		.validated_pool()
 		.ready()
@@ -134,7 +135,7 @@ fn late_nonce_should_be_queued() {
 		.collect();
 	assert_eq!(pending, Vec::<Nonce>::new());
 
-	block_on(pool.submit_one(&BlockId::number(0), SOURCE, uxt(Alice, 209))).unwrap();
+	block_on(pool.submit_one(api.expect_hash_from_number(0), SOURCE, uxt(Alice, 209))).unwrap();
 	let pending: Vec<_> = pool
 		.validated_pool()
 		.ready()
@@ -145,9 +146,10 @@ fn late_nonce_should_be_queued() {
 
 #[test]
 fn prune_tags_should_work() {
-	let pool = pool();
-	let hash209 = block_on(pool.submit_one(&BlockId::number(0), SOURCE, uxt(Alice, 209))).unwrap();
-	block_on(pool.submit_one(&BlockId::number(0), SOURCE, uxt(Alice, 210))).unwrap();
+	let (pool, api) = pool();
+	let hash209 =
+		block_on(pool.submit_one(api.expect_hash_from_number(0), SOURCE, uxt(Alice, 209))).unwrap();
+	block_on(pool.submit_one(api.expect_hash_from_number(0), SOURCE, uxt(Alice, 210))).unwrap();
 
 	let pending: Vec<_> = pool
 		.validated_pool()
@@ -157,7 +159,7 @@ fn prune_tags_should_work() {
 	assert_eq!(pending, vec![209, 210]);
 
 	pool.validated_pool().api().push_block(1, Vec::new(), true);
-	block_on(pool.prune_tags(&BlockId::number(1), vec![vec![209]], vec![hash209]))
+	block_on(pool.prune_tags(api.expect_hash_from_number(1), vec![vec![209]], vec![hash209]))
 		.expect("Prune tags");
 
 	let pending: Vec<_> = pool
@@ -170,11 +172,12 @@ fn prune_tags_should_work() {
 
 #[test]
 fn should_ban_invalid_transactions() {
-	let pool = pool();
+	let (pool, api) = pool();
 	let uxt = uxt(Alice, 209);
-	let hash = block_on(pool.submit_one(&BlockId::number(0), SOURCE, uxt.clone())).unwrap();
+	let hash =
+		block_on(pool.submit_one(api.expect_hash_from_number(0), SOURCE, uxt.clone())).unwrap();
 	pool.validated_pool().remove_invalid(&[hash]);
-	block_on(pool.submit_one(&BlockId::number(0), SOURCE, uxt.clone())).unwrap_err();
+	block_on(pool.submit_one(api.expect_hash_from_number(0), SOURCE, uxt.clone())).unwrap_err();
 
 	// when
 	let pending: Vec<_> = pool
@@ -185,7 +188,7 @@ fn should_ban_invalid_transactions() {
 	assert_eq!(pending, Vec::<Nonce>::new());
 
 	// then
-	block_on(pool.submit_one(&BlockId::number(0), SOURCE, uxt.clone())).unwrap_err();
+	block_on(pool.submit_one(api.expect_hash_from_number(0), SOURCE, uxt.clone())).unwrap_err();
 }
 
 #[test]
@@ -193,9 +196,9 @@ fn only_prune_on_new_best() {
 	let (pool, api, _) = maintained_pool();
 	let uxt = uxt(Alice, 209);
 
-	let _ = block_on(pool.submit_and_watch(&BlockId::number(0), SOURCE, uxt.clone()))
+	let _ = block_on(pool.submit_and_watch(api.expect_hash_from_number(0), SOURCE, uxt.clone()))
 		.expect("1. Imported");
-	pool.api().push_block(1, vec![uxt.clone()], true);
+	api.push_block(1, vec![uxt.clone()], true);
 	assert_eq!(pool.status().ready, 1);
 
 	let header = api.push_block(2, vec![uxt], true);
@@ -212,13 +215,15 @@ fn should_correctly_prune_transactions_providing_more_than_one_tag() {
 	}));
 	let pool = Pool::new(Default::default(), true.into(), api.clone());
 	let xt = uxt(Alice, 209);
-	block_on(pool.submit_one(&BlockId::number(0), SOURCE, xt.clone())).expect("1. Imported");
+	block_on(pool.submit_one(api.expect_hash_from_number(0), SOURCE, xt.clone()))
+		.expect("1. Imported");
 	assert_eq!(pool.validated_pool().status().ready, 1);
 
 	// remove the transaction that just got imported.
 	api.increment_nonce(Alice.into());
 	api.push_block(1, Vec::new(), true);
-	block_on(pool.prune_tags(&BlockId::number(1), vec![vec![209]], vec![])).expect("1. Pruned");
+	block_on(pool.prune_tags(api.expect_hash_from_number(1), vec![vec![209]], vec![]))
+		.expect("1. Pruned");
 	assert_eq!(pool.validated_pool().status().ready, 0);
 	// it's re-imported to future
 	assert_eq!(pool.validated_pool().status().future, 1);
@@ -227,7 +232,8 @@ fn should_correctly_prune_transactions_providing_more_than_one_tag() {
 	api.increment_nonce(Alice.into());
 	api.push_block(2, Vec::new(), true);
 	let xt = uxt(Alice, 211);
-	block_on(pool.submit_one(&BlockId::number(2), SOURCE, xt.clone())).expect("2. Imported");
+	block_on(pool.submit_one(api.expect_hash_from_number(2), SOURCE, xt.clone()))
+		.expect("2. Imported");
 	assert_eq!(pool.validated_pool().status().ready, 1);
 	assert_eq!(pool.validated_pool().status().future, 1);
 	let pending: Vec<_> = pool
@@ -240,7 +246,8 @@ fn should_correctly_prune_transactions_providing_more_than_one_tag() {
 	// prune it and make sure the pool is empty
 	api.increment_nonce(Alice.into());
 	api.push_block(3, Vec::new(), true);
-	block_on(pool.prune_tags(&BlockId::number(3), vec![vec![155]], vec![])).expect("2. Pruned");
+	block_on(pool.prune_tags(api.expect_hash_from_number(3), vec![vec![155]], vec![]))
+		.expect("2. Pruned");
 	assert_eq!(pool.validated_pool().status().ready, 0);
 	assert_eq!(pool.validated_pool().status().future, 2);
 }
@@ -270,7 +277,8 @@ fn should_prune_old_during_maintenance() {
 
 	let (pool, api, _guard) = maintained_pool();
 
-	block_on(pool.submit_one(&BlockId::number(0), SOURCE, xt.clone())).expect("1. Imported");
+	block_on(pool.submit_one(api.expect_hash_from_number(0), SOURCE, xt.clone()))
+		.expect("1. Imported");
 	assert_eq!(pool.status().ready, 1);
 
 	let header = api.push_block(1, vec![xt.clone()], true);
@@ -285,9 +293,11 @@ fn should_revalidate_during_maintenance() {
 	let xt2 = uxt(Alice, 210);
 
 	let (pool, api, _guard) = maintained_pool();
-	block_on(pool.submit_one(&BlockId::number(0), SOURCE, xt1.clone())).expect("1. Imported");
-	let watcher = block_on(pool.submit_and_watch(&BlockId::number(0), SOURCE, xt2.clone()))
-		.expect("2. Imported");
+	block_on(pool.submit_one(api.expect_hash_from_number(0), SOURCE, xt1.clone()))
+		.expect("1. Imported");
+	let watcher =
+		block_on(pool.submit_and_watch(api.expect_hash_from_number(0), SOURCE, xt2.clone()))
+			.expect("2. Imported");
 	assert_eq!(pool.status().ready, 2);
 	assert_eq!(api.validation_requests().len(), 2);
 
@@ -311,7 +321,8 @@ fn should_resubmit_from_retracted_during_maintenance() {
 
 	let (pool, api, _guard) = maintained_pool();
 
-	block_on(pool.submit_one(&BlockId::number(0), SOURCE, xt.clone())).expect("1. Imported");
+	block_on(pool.submit_one(api.expect_hash_from_number(0), SOURCE, xt.clone()))
+		.expect("1. Imported");
 	assert_eq!(pool.status().ready, 1);
 
 	let header = api.push_block(1, vec![], true);
@@ -329,7 +340,8 @@ fn should_not_resubmit_from_retracted_during_maintenance_if_tx_is_also_in_enacte
 
 	let (pool, api, _guard) = maintained_pool();
 
-	block_on(pool.submit_one(&BlockId::number(0), SOURCE, xt.clone())).expect("1. Imported");
+	block_on(pool.submit_one(api.expect_hash_from_number(0), SOURCE, xt.clone()))
+		.expect("1. Imported");
 	assert_eq!(pool.status().ready, 1);
 
 	let header = api.push_block(1, vec![xt.clone()], true);
@@ -347,8 +359,9 @@ fn should_not_retain_invalid_hashes_from_retracted() {
 
 	let (pool, api, _guard) = maintained_pool();
 
-	let watcher = block_on(pool.submit_and_watch(&BlockId::number(0), SOURCE, xt.clone()))
-		.expect("1. Imported");
+	let watcher =
+		block_on(pool.submit_and_watch(api.expect_hash_from_number(0), SOURCE, xt.clone()))
+			.expect("1. Imported");
 	assert_eq!(pool.status().ready, 1);
 
 	let header = api.push_block(1, vec![], true);
@@ -374,15 +387,18 @@ fn should_revalidate_across_many_blocks() {
 
 	let (pool, api, _guard) = maintained_pool();
 
-	let watcher1 = block_on(pool.submit_and_watch(&BlockId::number(0), SOURCE, xt1.clone()))
+	let watcher1 =
+		block_on(pool.submit_and_watch(api.expect_hash_from_number(0), SOURCE, xt1.clone()))
+			.expect("1. Imported");
+	block_on(pool.submit_one(api.expect_hash_from_number(0), SOURCE, xt2.clone()))
 		.expect("1. Imported");
-	block_on(pool.submit_one(&BlockId::number(0), SOURCE, xt2.clone())).expect("1. Imported");
 	assert_eq!(pool.status().ready, 2);
 
 	let header = api.push_block(1, vec![], true);
 	block_on(pool.maintain(block_event(header)));
 
-	block_on(pool.submit_one(&BlockId::number(1), SOURCE, xt3.clone())).expect("1. Imported");
+	block_on(pool.submit_one(api.expect_hash_from_number(1), SOURCE, xt3.clone()))
+		.expect("1. Imported");
 	assert_eq!(pool.status().ready, 3);
 
 	let header = api.push_block(2, vec![xt1.clone()], true);
@@ -409,19 +425,24 @@ fn should_push_watchers_during_maintenance() {
 
 	let tx0 = alice_uxt(0);
 	let watcher0 =
-		block_on(pool.submit_and_watch(&BlockId::Number(0), SOURCE, tx0.clone())).unwrap();
+		block_on(pool.submit_and_watch(api.expect_hash_from_number(0), SOURCE, tx0.clone()))
+			.unwrap();
 	let tx1 = alice_uxt(1);
 	let watcher1 =
-		block_on(pool.submit_and_watch(&BlockId::Number(0), SOURCE, tx1.clone())).unwrap();
+		block_on(pool.submit_and_watch(api.expect_hash_from_number(0), SOURCE, tx1.clone()))
+			.unwrap();
 	let tx2 = alice_uxt(2);
 	let watcher2 =
-		block_on(pool.submit_and_watch(&BlockId::Number(0), SOURCE, tx2.clone())).unwrap();
+		block_on(pool.submit_and_watch(api.expect_hash_from_number(0), SOURCE, tx2.clone()))
+			.unwrap();
 	let tx3 = alice_uxt(3);
 	let watcher3 =
-		block_on(pool.submit_and_watch(&BlockId::Number(0), SOURCE, tx3.clone())).unwrap();
+		block_on(pool.submit_and_watch(api.expect_hash_from_number(0), SOURCE, tx3.clone()))
+			.unwrap();
 	let tx4 = alice_uxt(4);
 	let watcher4 =
-		block_on(pool.submit_and_watch(&BlockId::Number(0), SOURCE, tx4.clone())).unwrap();
+		block_on(pool.submit_and_watch(api.expect_hash_from_number(0), SOURCE, tx4.clone()))
+			.unwrap();
 	assert_eq!(pool.status().ready, 5);
 
 	// when
@@ -489,11 +510,13 @@ fn finalization() {
 	let api = TestApi::with_alice_nonce(209);
 	api.push_block(1, vec![], true);
 	let pool = create_basic_pool(api);
-	let watcher = block_on(pool.submit_and_watch(&BlockId::number(1), SOURCE, xt.clone()))
-		.expect("1. Imported");
-	pool.api().push_block(2, vec![xt.clone()], true);
+	let api = pool.api();
+	let watcher =
+		block_on(pool.submit_and_watch(api.expect_hash_from_number(1), SOURCE, xt.clone()))
+			.expect("1. Imported");
+	api.push_block(2, vec![xt.clone()], true);
 
-	let header = pool.api().chain().read().block_by_number.get(&2).unwrap()[0].0.header().clone();
+	let header = api.chain().read().block_by_number.get(&2).unwrap()[0].0.header().clone();
 	let event = ChainEvent::NewBestBlock { hash: header.hash(), tree_route: None };
 	block_on(pool.maintain(event));
 
@@ -515,16 +538,17 @@ fn fork_aware_finalization() {
 	let a_header = api.push_block(1, vec![], true);
 
 	let pool = create_basic_pool(api);
+	let api = pool.api();
 	let mut canon_watchers = vec![];
 
 	let from_alice = uxt(Alice, 1);
 	let from_dave = uxt(Dave, 2);
 	let from_bob = uxt(Bob, 1);
 	let from_charlie = uxt(Charlie, 1);
-	pool.api().increment_nonce(Alice.into());
-	pool.api().increment_nonce(Dave.into());
-	pool.api().increment_nonce(Charlie.into());
-	pool.api().increment_nonce(Bob.into());
+	api.increment_nonce(Alice.into());
+	api.increment_nonce(Dave.into());
+	api.increment_nonce(Charlie.into());
+	api.increment_nonce(Bob.into());
 
 	let from_dave_watcher;
 	let from_bob_watcher;
@@ -538,10 +562,13 @@ fn fork_aware_finalization() {
 
 	// block B1
 	{
-		let watcher =
-			block_on(pool.submit_and_watch(&BlockId::number(1), SOURCE, from_alice.clone()))
-				.expect("1. Imported");
-		let header = pool.api().push_block(2, vec![from_alice.clone()], true);
+		let watcher = block_on(pool.submit_and_watch(
+			api.expect_hash_from_number(1),
+			SOURCE,
+			from_alice.clone(),
+		))
+		.expect("1. Imported");
+		let header = api.push_block(2, vec![from_alice.clone()], true);
 		canon_watchers.push((watcher, header.hash()));
 		assert_eq!(pool.status().ready, 1);
 
@@ -556,10 +583,13 @@ fn fork_aware_finalization() {
 
 	// block C2
 	{
-		let header = pool.api().push_block_with_parent(b1, vec![from_dave.clone()], true);
-		from_dave_watcher =
-			block_on(pool.submit_and_watch(&BlockId::number(1), SOURCE, from_dave.clone()))
-				.expect("1. Imported");
+		let header = api.push_block_with_parent(b1, vec![from_dave.clone()], true);
+		from_dave_watcher = block_on(pool.submit_and_watch(
+			api.expect_hash_from_number(1),
+			SOURCE,
+			from_dave.clone(),
+		))
+		.expect("1. Imported");
 		assert_eq!(pool.status().ready, 1);
 		log::trace!(target: LOG_TARGET, ">> C2: {:?} {:?}", header.hash(), header);
 		let event = ChainEvent::NewBestBlock { hash: header.hash(), tree_route: None };
@@ -570,11 +600,14 @@ fn fork_aware_finalization() {
 
 	// block D2
 	{
-		from_bob_watcher =
-			block_on(pool.submit_and_watch(&BlockId::number(1), SOURCE, from_bob.clone()))
-				.expect("1. Imported");
+		from_bob_watcher = block_on(pool.submit_and_watch(
+			api.expect_hash_from_number(1),
+			SOURCE,
+			from_bob.clone(),
+		))
+		.expect("1. Imported");
 		assert_eq!(pool.status().ready, 1);
-		let header = pool.api().push_block_with_parent(c2, vec![from_bob.clone()], true);
+		let header = api.push_block_with_parent(c2, vec![from_bob.clone()], true);
 
 		log::trace!(target: LOG_TARGET, ">> D2: {:?} {:?}", header.hash(), header);
 		let event = ChainEvent::NewBestBlock { hash: header.hash(), tree_route: None };
@@ -585,15 +618,18 @@ fn fork_aware_finalization() {
 
 	// block C1
 	{
-		let watcher =
-			block_on(pool.submit_and_watch(&BlockId::number(1), SOURCE, from_charlie.clone()))
-				.expect("1.Imported");
+		let watcher = block_on(pool.submit_and_watch(
+			api.expect_hash_from_number(1),
+			SOURCE,
+			from_charlie.clone(),
+		))
+		.expect("1.Imported");
 		assert_eq!(pool.status().ready, 1);
-		let header = pool.api().push_block_with_parent(b1, vec![from_charlie.clone()], true);
+		let header = api.push_block_with_parent(b1, vec![from_charlie.clone()], true);
 		log::trace!(target: LOG_TARGET, ">> C1: {:?} {:?}", header.hash(), header);
 		c1 = header.hash();
 		canon_watchers.push((watcher, header.hash()));
-		let event = block_event_with_retracted(header.clone(), d2, pool.api());
+		let event = block_event_with_retracted(header.clone(), d2, api);
 		block_on(pool.maintain(event));
 		assert_eq!(pool.status().ready, 2);
 
@@ -604,10 +640,10 @@ fn fork_aware_finalization() {
 	// block D1
 	{
 		let xt = uxt(Eve, 0);
-		let w = block_on(pool.submit_and_watch(&BlockId::number(1), SOURCE, xt.clone()))
+		let w = block_on(pool.submit_and_watch(api.expect_hash_from_number(1), SOURCE, xt.clone()))
 			.expect("1. Imported");
 		assert_eq!(pool.status().ready, 3);
-		let header = pool.api().push_block_with_parent(c1, vec![xt.clone()], true);
+		let header = api.push_block_with_parent(c1, vec![xt.clone()], true);
 		log::trace!(target: LOG_TARGET, ">> D1: {:?} {:?}", header.hash(), header);
 		d1 = header.hash();
 		canon_watchers.push((w, header.hash()));
@@ -623,7 +659,7 @@ fn fork_aware_finalization() {
 
 	// block E1
 	{
-		let header = pool.api().push_block_with_parent(d1, vec![from_dave, from_bob], true);
+		let header = api.push_block_with_parent(d1, vec![from_dave, from_bob], true);
 		log::trace!(target: LOG_TARGET, ">> E1: {:?} {:?}", header.hash(), header);
 		e1 = header.hash();
 		let event = ChainEvent::NewBestBlock { hash: header.hash(), tree_route: None };
@@ -673,16 +709,18 @@ fn prune_and_retract_tx_at_same_time() {
 	api.push_block(1, vec![], true);
 
 	let pool = create_basic_pool(api);
+	let api = pool.api();
 
 	let from_alice = uxt(Alice, 1);
-	pool.api().increment_nonce(Alice.into());
+	api.increment_nonce(Alice.into());
 
-	let watcher = block_on(pool.submit_and_watch(&BlockId::number(1), SOURCE, from_alice.clone()))
-		.expect("1. Imported");
+	let watcher =
+		block_on(pool.submit_and_watch(api.expect_hash_from_number(1), SOURCE, from_alice.clone()))
+			.expect("1. Imported");
 
 	// Block B1
 	let b1 = {
-		let header = pool.api().push_block(2, vec![from_alice.clone()], true);
+		let header = api.push_block(2, vec![from_alice.clone()], true);
 		assert_eq!(pool.status().ready, 1);
 
 		let event = ChainEvent::NewBestBlock { hash: header.hash(), tree_route: None };
@@ -693,10 +731,10 @@ fn prune_and_retract_tx_at_same_time() {
 
 	// Block B2
 	let b2 = {
-		let header = pool.api().push_block(2, vec![from_alice.clone()], true);
+		let header = api.push_block(2, vec![from_alice.clone()], true);
 		assert_eq!(pool.status().ready, 0);
 
-		let event = block_event_with_retracted(header.clone(), b1, pool.api());
+		let event = block_event_with_retracted(header.clone(), b1, api);
 		block_on(pool.maintain(event));
 		assert_eq!(pool.status().ready, 0);
 
@@ -739,19 +777,21 @@ fn resubmit_tx_of_fork_that_is_not_part_of_retracted() {
 	api.push_block(1, vec![], true);
 
 	let pool = create_basic_pool(api);
+	let api = pool.api();
 
 	let tx0 = uxt(Alice, 1);
 	let tx1 = uxt(Dave, 2);
-	pool.api().increment_nonce(Alice.into());
-	pool.api().increment_nonce(Dave.into());
+	api.increment_nonce(Alice.into());
+	api.increment_nonce(Dave.into());
 
 	let d0;
 
 	// Block D0
 	{
-		let _ = block_on(pool.submit_and_watch(&BlockId::number(1), SOURCE, tx0.clone()))
-			.expect("1. Imported");
-		let header = pool.api().push_block(2, vec![tx0.clone()], true);
+		let _ =
+			block_on(pool.submit_and_watch(api.expect_hash_from_number(1), SOURCE, tx0.clone()))
+				.expect("1. Imported");
+		let header = api.push_block(2, vec![tx0.clone()], true);
 		assert_eq!(pool.status().ready, 1);
 
 		let event = ChainEvent::NewBestBlock { hash: header.hash(), tree_route: None };
@@ -762,17 +802,18 @@ fn resubmit_tx_of_fork_that_is_not_part_of_retracted() {
 
 	// Block D1
 	{
-		let _ = block_on(pool.submit_and_watch(&BlockId::number(1), SOURCE, tx1.clone()))
-			.expect("1. Imported");
-		pool.api().push_block(2, vec![tx1.clone()], false);
+		let _ =
+			block_on(pool.submit_and_watch(api.expect_hash_from_number(1), SOURCE, tx1.clone()))
+				.expect("1. Imported");
+		api.push_block(2, vec![tx1.clone()], false);
 		assert_eq!(pool.status().ready, 1);
 	}
 
 	// Block D2
 	{
 		//push new best block
-		let header = pool.api().push_block(2, vec![], true);
-		let event = block_event_with_retracted(header, d0, pool.api());
+		let header = api.push_block(2, vec![], true);
+		let event = block_event_with_retracted(header, d0, api);
 		block_on(pool.maintain(event));
 		assert_eq!(pool.status().ready, 2);
 	}
@@ -786,6 +827,8 @@ fn resubmit_from_retracted_fork() {
 
 	let pool = create_basic_pool(api);
 
+	let api = pool.api();
+
 	let tx0 = uxt(Alice, 1);
 	let tx1 = uxt(Dave, 2);
 	let tx2 = uxt(Bob, 3);
@@ -795,18 +838,19 @@ fn resubmit_from_retracted_fork() {
 	let tx4 = uxt(Ferdie, 2);
 	let tx5 = uxt(One, 3);
 
-	pool.api().increment_nonce(Alice.into());
-	pool.api().increment_nonce(Dave.into());
-	pool.api().increment_nonce(Bob.into());
-	pool.api().increment_nonce(Eve.into());
-	pool.api().increment_nonce(Ferdie.into());
-	pool.api().increment_nonce(One.into());
+	api.increment_nonce(Alice.into());
+	api.increment_nonce(Dave.into());
+	api.increment_nonce(Bob.into());
+	api.increment_nonce(Eve.into());
+	api.increment_nonce(Ferdie.into());
+	api.increment_nonce(One.into());
 
 	// Block D0
 	{
-		let _ = block_on(pool.submit_and_watch(&BlockId::number(1), SOURCE, tx0.clone()))
-			.expect("1. Imported");
-		let header = pool.api().push_block(2, vec![tx0.clone()], true);
+		let _ =
+			block_on(pool.submit_and_watch(api.expect_hash_from_number(1), SOURCE, tx0.clone()))
+				.expect("1. Imported");
+		let header = api.push_block(2, vec![tx0.clone()], true);
 		assert_eq!(pool.status().ready, 1);
 
 		block_on(pool.maintain(block_event(header)));
@@ -815,18 +859,20 @@ fn resubmit_from_retracted_fork() {
 
 	// Block E0
 	{
-		let _ = block_on(pool.submit_and_watch(&BlockId::number(1), SOURCE, tx1.clone()))
-			.expect("1. Imported");
-		let header = pool.api().push_block(3, vec![tx1.clone()], true);
+		let _ =
+			block_on(pool.submit_and_watch(api.expect_hash_from_number(1), SOURCE, tx1.clone()))
+				.expect("1. Imported");
+		let header = api.push_block(3, vec![tx1.clone()], true);
 		block_on(pool.maintain(block_event(header)));
 		assert_eq!(pool.status().ready, 0);
 	}
 
 	// Block F0
 	let f0 = {
-		let _ = block_on(pool.submit_and_watch(&BlockId::number(1), SOURCE, tx2.clone()))
-			.expect("1. Imported");
-		let header = pool.api().push_block(4, vec![tx2.clone()], true);
+		let _ =
+			block_on(pool.submit_and_watch(api.expect_hash_from_number(1), SOURCE, tx2.clone()))
+				.expect("1. Imported");
+		let header = api.push_block(4, vec![tx2.clone()], true);
 		block_on(pool.maintain(block_event(header.clone())));
 		assert_eq!(pool.status().ready, 0);
 		header.hash()
@@ -834,27 +880,30 @@ fn resubmit_from_retracted_fork() {
 
 	// Block D1
 	let d1 = {
-		let _ = block_on(pool.submit_and_watch(&BlockId::number(1), SOURCE, tx3.clone()))
-			.expect("1. Imported");
-		let header = pool.api().push_block(2, vec![tx3.clone()], true);
+		let _ =
+			block_on(pool.submit_and_watch(api.expect_hash_from_number(1), SOURCE, tx3.clone()))
+				.expect("1. Imported");
+		let header = api.push_block(2, vec![tx3.clone()], true);
 		assert_eq!(pool.status().ready, 1);
 		header.hash()
 	};
 
 	// Block E1
 	let e1 = {
-		let _ = block_on(pool.submit_and_watch(&BlockId::number(1), SOURCE, tx4.clone()))
-			.expect("1. Imported");
-		let header = pool.api().push_block_with_parent(d1, vec![tx4.clone()], true);
+		let _ =
+			block_on(pool.submit_and_watch(api.expect_hash_from_number(1), SOURCE, tx4.clone()))
+				.expect("1. Imported");
+		let header = api.push_block_with_parent(d1, vec![tx4.clone()], true);
 		assert_eq!(pool.status().ready, 2);
 		header.hash()
 	};
 
 	// Block F1
 	let f1_header = {
-		let _ = block_on(pool.submit_and_watch(&BlockId::number(1), SOURCE, tx5.clone()))
-			.expect("1. Imported");
-		let header = pool.api().push_block_with_parent(e1, vec![tx5.clone()], true);
+		let _ =
+			block_on(pool.submit_and_watch(api.expect_hash_from_number(1), SOURCE, tx5.clone()))
+				.expect("1. Imported");
+		let header = api.push_block_with_parent(e1, vec![tx5.clone()], true);
 		// Don't announce the block event to the pool directly, because we will
 		// re-org to this block.
 		assert_eq!(pool.status().ready, 3);
@@ -865,7 +914,7 @@ fn resubmit_from_retracted_fork() {
 	let expected_ready = vec![tx3, tx4, tx5].iter().map(Encode::encode).collect::<BTreeSet<_>>();
 	assert_eq!(expected_ready, ready);
 
-	let event = block_event_with_retracted(f1_header, f0, pool.api());
+	let event = block_event_with_retracted(f1_header, f0, api);
 	block_on(pool.maintain(event));
 
 	assert_eq!(pool.status().ready, 3);
@@ -876,9 +925,10 @@ fn resubmit_from_retracted_fork() {
 
 #[test]
 fn ready_set_should_not_resolve_before_block_update() {
-	let (pool, _api, _guard) = maintained_pool();
+	let (pool, api, _guard) = maintained_pool();
 	let xt1 = uxt(Alice, 209);
-	block_on(pool.submit_one(&BlockId::number(0), SOURCE, xt1.clone())).expect("1. Imported");
+	block_on(pool.submit_one(api.expect_hash_from_number(0), SOURCE, xt1.clone()))
+		.expect("1. Imported");
 
 	assert!(pool.ready_at(1).now_or_never().is_none());
 }
@@ -890,7 +940,8 @@ fn ready_set_should_resolve_after_block_update() {
 
 	let xt1 = uxt(Alice, 209);
 
-	block_on(pool.submit_one(&BlockId::number(1), SOURCE, xt1.clone())).expect("1. Imported");
+	block_on(pool.submit_one(api.expect_hash_from_number(1), SOURCE, xt1.clone()))
+		.expect("1. Imported");
 	block_on(pool.maintain(block_event(header)));
 
 	assert!(pool.ready_at(1).now_or_never().is_some());
@@ -903,7 +954,8 @@ fn ready_set_should_eventually_resolve_when_block_update_arrives() {
 
 	let xt1 = uxt(Alice, 209);
 
-	block_on(pool.submit_one(&BlockId::number(1), SOURCE, xt1.clone())).expect("1. Imported");
+	block_on(pool.submit_one(api.expect_hash_from_number(1), SOURCE, xt1.clone()))
+		.expect("1. Imported");
 
 	let noop_waker = futures::task::noop_waker();
 	let mut context = futures::task::Context::from_waker(&noop_waker);
@@ -948,7 +1000,12 @@ fn import_notification_to_pool_maintain_works() {
 
 	// Prepare the extrisic, push it to the pool and check that it was added.
 	let xt = uxt(Alice, 0);
-	block_on(pool.submit_one(&BlockId::number(0), SOURCE, xt.clone())).expect("1. Imported");
+	block_on(pool.submit_one(
+		pool.api().block_id_to_hash(&BlockId::Number(0)).unwrap().unwrap(),
+		SOURCE,
+		xt.clone(),
+	))
+	.expect("1. Imported");
 	assert_eq!(pool.status().ready, 1);
 
 	let mut import_stream = block_on_stream(client.import_notification_stream());
@@ -973,7 +1030,8 @@ fn pruning_a_transaction_should_remove_it_from_best_transaction() {
 
 	let xt1 = ExtrinsicBuilder::new_include_data(Vec::new()).build();
 
-	block_on(pool.submit_one(&BlockId::number(0), SOURCE, xt1.clone())).expect("1. Imported");
+	block_on(pool.submit_one(api.expect_hash_from_number(0), SOURCE, xt1.clone()))
+		.expect("1. Imported");
 	assert_eq!(pool.status().ready, 1);
 	let header = api.push_block(1, vec![xt1.clone()], true);
 
@@ -997,8 +1055,12 @@ fn stale_transactions_are_pruned() {
 	let (pool, api, _guard) = maintained_pool();
 
 	xts.into_iter().for_each(|xt| {
-		block_on(pool.submit_one(&BlockId::number(0), SOURCE, xt.into_unchecked_extrinsic()))
-			.expect("1. Imported");
+		block_on(pool.submit_one(
+			api.expect_hash_from_number(0),
+			SOURCE,
+			xt.into_unchecked_extrinsic(),
+		))
+		.expect("1. Imported");
 	});
 	assert_eq!(pool.status().ready, 0);
 	assert_eq!(pool.status().future, 3);
@@ -1038,8 +1100,9 @@ fn finalized_only_handled_correctly() {
 
 	let (pool, api, _guard) = maintained_pool();
 
-	let watcher = block_on(pool.submit_and_watch(&BlockId::number(0), SOURCE, xt.clone()))
-		.expect("1. Imported");
+	let watcher =
+		block_on(pool.submit_and_watch(api.expect_hash_from_number(0), SOURCE, xt.clone()))
+			.expect("1. Imported");
 	assert_eq!(pool.status().ready, 1);
 
 	let header = api.push_block(1, vec![xt], true);
@@ -1066,8 +1129,9 @@ fn best_block_after_finalized_handled_correctly() {
 
 	let (pool, api, _guard) = maintained_pool();
 
-	let watcher = block_on(pool.submit_and_watch(&BlockId::number(0), SOURCE, xt.clone()))
-		.expect("1. Imported");
+	let watcher =
+		block_on(pool.submit_and_watch(api.expect_hash_from_number(0), SOURCE, xt.clone()))
+			.expect("1. Imported");
 	assert_eq!(pool.status().ready, 1);
 
 	let header = api.push_block(1, vec![xt], true);
@@ -1096,11 +1160,12 @@ fn switching_fork_with_finalized_works() {
 	let a_header = api.push_block(1, vec![], true);
 
 	let pool = create_basic_pool(api);
+	let api = pool.api();
 
 	let from_alice = uxt(Alice, 1);
 	let from_bob = uxt(Bob, 2);
-	pool.api().increment_nonce(Alice.into());
-	pool.api().increment_nonce(Bob.into());
+	api.increment_nonce(Alice.into());
+	api.increment_nonce(Bob.into());
 
 	let from_alice_watcher;
 	let from_bob_watcher;
@@ -1109,12 +1174,13 @@ fn switching_fork_with_finalized_works() {
 
 	// block B1
 	{
-		from_alice_watcher =
-			block_on(pool.submit_and_watch(&BlockId::number(1), SOURCE, from_alice.clone()))
-				.expect("1. Imported");
-		let header =
-			pool.api()
-				.push_block_with_parent(a_header.hash(), vec![from_alice.clone()], true);
+		from_alice_watcher = block_on(pool.submit_and_watch(
+			api.expect_hash_from_number(1),
+			SOURCE,
+			from_alice.clone(),
+		))
+		.expect("1. Imported");
+		let header = api.push_block_with_parent(a_header.hash(), vec![from_alice.clone()], true);
 		assert_eq!(pool.status().ready, 1);
 		log::trace!(target: LOG_TARGET, ">> B1: {:?} {:?}", header.hash(), header);
 		b1_header = header;
@@ -1122,10 +1188,13 @@ fn switching_fork_with_finalized_works() {
 
 	// block B2
 	{
-		from_bob_watcher =
-			block_on(pool.submit_and_watch(&BlockId::number(1), SOURCE, from_bob.clone()))
-				.expect("1. Imported");
-		let header = pool.api().push_block_with_parent(
+		from_bob_watcher = block_on(pool.submit_and_watch(
+			api.expect_hash_from_number(1),
+			SOURCE,
+			from_bob.clone(),
+		))
+		.expect("1. Imported");
+		let header = api.push_block_with_parent(
 			a_header.hash(),
 			vec![from_alice.clone(), from_bob.clone()],
 			true,
@@ -1174,11 +1243,12 @@ fn switching_fork_multiple_times_works() {
 	let a_header = api.push_block(1, vec![], true);
 
 	let pool = create_basic_pool(api);
+	let api = pool.api();
 
 	let from_alice = uxt(Alice, 1);
 	let from_bob = uxt(Bob, 2);
-	pool.api().increment_nonce(Alice.into());
-	pool.api().increment_nonce(Bob.into());
+	api.increment_nonce(Alice.into());
+	api.increment_nonce(Bob.into());
 
 	let from_alice_watcher;
 	let from_bob_watcher;
@@ -1187,12 +1257,13 @@ fn switching_fork_multiple_times_works() {
 
 	// block B1
 	{
-		from_alice_watcher =
-			block_on(pool.submit_and_watch(&BlockId::number(1), SOURCE, from_alice.clone()))
-				.expect("1. Imported");
-		let header =
-			pool.api()
-				.push_block_with_parent(a_header.hash(), vec![from_alice.clone()], true);
+		from_alice_watcher = block_on(pool.submit_and_watch(
+			api.expect_hash_from_number(1),
+			SOURCE,
+			from_alice.clone(),
+		))
+		.expect("1. Imported");
+		let header = api.push_block_with_parent(a_header.hash(), vec![from_alice.clone()], true);
 		assert_eq!(pool.status().ready, 1);
 		log::trace!(target: LOG_TARGET, ">> B1: {:?} {:?}", header.hash(), header);
 		b1_header = header;
@@ -1200,10 +1271,13 @@ fn switching_fork_multiple_times_works() {
 
 	// block B2
 	{
-		from_bob_watcher =
-			block_on(pool.submit_and_watch(&BlockId::number(1), SOURCE, from_bob.clone()))
-				.expect("1. Imported");
-		let header = pool.api().push_block_with_parent(
+		from_bob_watcher = block_on(pool.submit_and_watch(
+			api.expect_hash_from_number(1),
+			SOURCE,
+			from_bob.clone(),
+		))
+		.expect("1. Imported");
+		let header = api.push_block_with_parent(
 			a_header.hash(),
 			vec![from_alice.clone(), from_bob.clone()],
 			true,
@@ -1223,14 +1297,14 @@ fn switching_fork_multiple_times_works() {
 
 	{
 		// phase-1
-		let event = block_event_with_retracted(b2_header.clone(), b1_header.hash(), pool.api());
+		let event = block_event_with_retracted(b2_header.clone(), b1_header.hash(), api);
 		block_on(pool.maintain(event));
 		assert_eq!(pool.status().ready, 0);
 	}
 
 	{
 		// phase-2
-		let event = block_event_with_retracted(b1_header.clone(), b2_header.hash(), pool.api());
+		let event = block_event_with_retracted(b1_header.clone(), b2_header.hash(), api);
 		block_on(pool.maintain(event));
 		assert_eq!(pool.status().ready, 1);
 	}
@@ -1282,13 +1356,14 @@ fn two_blocks_delayed_finalization_works() {
 	let a_header = api.push_block(1, vec![], true);
 
 	let pool = create_basic_pool(api);
+	let api = pool.api();
 
 	let from_alice = uxt(Alice, 1);
 	let from_bob = uxt(Bob, 2);
 	let from_charlie = uxt(Charlie, 3);
-	pool.api().increment_nonce(Alice.into());
-	pool.api().increment_nonce(Bob.into());
-	pool.api().increment_nonce(Charlie.into());
+	api.increment_nonce(Alice.into());
+	api.increment_nonce(Bob.into());
+	api.increment_nonce(Charlie.into());
 
 	let from_alice_watcher;
 	let from_bob_watcher;
@@ -1299,12 +1374,13 @@ fn two_blocks_delayed_finalization_works() {
 
 	// block B1
 	{
-		from_alice_watcher =
-			block_on(pool.submit_and_watch(&BlockId::number(1), SOURCE, from_alice.clone()))
-				.expect("1. Imported");
-		let header =
-			pool.api()
-				.push_block_with_parent(a_header.hash(), vec![from_alice.clone()], true);
+		from_alice_watcher = block_on(pool.submit_and_watch(
+			api.expect_hash_from_number(1),
+			SOURCE,
+			from_alice.clone(),
+		))
+		.expect("1. Imported");
+		let header = api.push_block_with_parent(a_header.hash(), vec![from_alice.clone()], true);
 		assert_eq!(pool.status().ready, 1);
 
 		log::trace!(target: LOG_TARGET, ">> B1: {:?} {:?}", header.hash(), header);
@@ -1313,12 +1389,13 @@ fn two_blocks_delayed_finalization_works() {
 
 	// block C1
 	{
-		from_bob_watcher =
-			block_on(pool.submit_and_watch(&BlockId::number(1), SOURCE, from_bob.clone()))
-				.expect("1. Imported");
-		let header =
-			pool.api()
-				.push_block_with_parent(b1_header.hash(), vec![from_bob.clone()], true);
+		from_bob_watcher = block_on(pool.submit_and_watch(
+			api.expect_hash_from_number(1),
+			SOURCE,
+			from_bob.clone(),
+		))
+		.expect("1. Imported");
+		let header = api.push_block_with_parent(b1_header.hash(), vec![from_bob.clone()], true);
 		assert_eq!(pool.status().ready, 2);
 
 		log::trace!(target: LOG_TARGET, ">> C1: {:?} {:?}", header.hash(), header);
@@ -1327,12 +1404,13 @@ fn two_blocks_delayed_finalization_works() {
 
 	// block D1
 	{
-		from_charlie_watcher =
-			block_on(pool.submit_and_watch(&BlockId::number(1), SOURCE, from_charlie.clone()))
-				.expect("1. Imported");
-		let header =
-			pool.api()
-				.push_block_with_parent(c1_header.hash(), vec![from_charlie.clone()], true);
+		from_charlie_watcher = block_on(pool.submit_and_watch(
+			api.expect_hash_from_number(1),
+			SOURCE,
+			from_charlie.clone(),
+		))
+		.expect("1. Imported");
+		let header = api.push_block_with_parent(c1_header.hash(), vec![from_charlie.clone()], true);
 		assert_eq!(pool.status().ready, 3);
 
 		log::trace!(target: LOG_TARGET, ">> D1: {:?} {:?}", header.hash(), header);
@@ -1398,11 +1476,12 @@ fn delayed_finalization_does_not_retract() {
 	let a_header = api.push_block(1, vec![], true);
 
 	let pool = create_basic_pool(api);
+	let api = pool.api();
 
 	let from_alice = uxt(Alice, 1);
 	let from_bob = uxt(Bob, 2);
-	pool.api().increment_nonce(Alice.into());
-	pool.api().increment_nonce(Bob.into());
+	api.increment_nonce(Alice.into());
+	api.increment_nonce(Bob.into());
 
 	let from_alice_watcher;
 	let from_bob_watcher;
@@ -1411,12 +1490,13 @@ fn delayed_finalization_does_not_retract() {
 
 	// block B1
 	{
-		from_alice_watcher =
-			block_on(pool.submit_and_watch(&BlockId::number(1), SOURCE, from_alice.clone()))
-				.expect("1. Imported");
-		let header =
-			pool.api()
-				.push_block_with_parent(a_header.hash(), vec![from_alice.clone()], true);
+		from_alice_watcher = block_on(pool.submit_and_watch(
+			api.expect_hash_from_number(1),
+			SOURCE,
+			from_alice.clone(),
+		))
+		.expect("1. Imported");
+		let header = api.push_block_with_parent(a_header.hash(), vec![from_alice.clone()], true);
 		assert_eq!(pool.status().ready, 1);
 
 		log::trace!(target: LOG_TARGET, ">> B1: {:?} {:?}", header.hash(), header);
@@ -1425,12 +1505,13 @@ fn delayed_finalization_does_not_retract() {
 
 	// block C1
 	{
-		from_bob_watcher =
-			block_on(pool.submit_and_watch(&BlockId::number(1), SOURCE, from_bob.clone()))
-				.expect("1. Imported");
-		let header =
-			pool.api()
-				.push_block_with_parent(b1_header.hash(), vec![from_bob.clone()], true);
+		from_bob_watcher = block_on(pool.submit_and_watch(
+			api.expect_hash_from_number(1),
+			SOURCE,
+			from_bob.clone(),
+		))
+		.expect("1. Imported");
+		let header = api.push_block_with_parent(b1_header.hash(), vec![from_bob.clone()], true);
 		assert_eq!(pool.status().ready, 2);
 
 		log::trace!(target: LOG_TARGET, ">> C1: {:?} {:?}", header.hash(), header);
@@ -1493,11 +1574,12 @@ fn best_block_after_finalization_does_not_retract() {
 	let a_header = api.push_block(1, vec![], true);
 
 	let pool = create_basic_pool(api);
+	let api = pool.api();
 
 	let from_alice = uxt(Alice, 1);
 	let from_bob = uxt(Bob, 2);
-	pool.api().increment_nonce(Alice.into());
-	pool.api().increment_nonce(Bob.into());
+	api.increment_nonce(Alice.into());
+	api.increment_nonce(Bob.into());
 
 	let from_alice_watcher;
 	let from_bob_watcher;
@@ -1506,12 +1588,13 @@ fn best_block_after_finalization_does_not_retract() {
 
 	// block B1
 	{
-		from_alice_watcher =
-			block_on(pool.submit_and_watch(&BlockId::number(1), SOURCE, from_alice.clone()))
-				.expect("1. Imported");
-		let header =
-			pool.api()
-				.push_block_with_parent(a_header.hash(), vec![from_alice.clone()], true);
+		from_alice_watcher = block_on(pool.submit_and_watch(
+			api.expect_hash_from_number(1),
+			SOURCE,
+			from_alice.clone(),
+		))
+		.expect("1. Imported");
+		let header = api.push_block_with_parent(a_header.hash(), vec![from_alice.clone()], true);
 		assert_eq!(pool.status().ready, 1);
 
 		log::trace!(target: LOG_TARGET, ">> B1: {:?} {:?}", header.hash(), header);
@@ -1520,12 +1603,13 @@ fn best_block_after_finalization_does_not_retract() {
 
 	// block C1
 	{
-		from_bob_watcher =
-			block_on(pool.submit_and_watch(&BlockId::number(1), SOURCE, from_bob.clone()))
-				.expect("1. Imported");
-		let header =
-			pool.api()
-				.push_block_with_parent(b1_header.hash(), vec![from_bob.clone()], true);
+		from_bob_watcher = block_on(pool.submit_and_watch(
+			api.expect_hash_from_number(1),
+			SOURCE,
+			from_bob.clone(),
+		))
+		.expect("1. Imported");
+		let header = api.push_block_with_parent(b1_header.hash(), vec![from_bob.clone()], true);
 		assert_eq!(pool.status().ready, 2);
 
 		log::trace!(target: LOG_TARGET, ">> C1: {:?} {:?}", header.hash(), header);
diff --git a/substrate/client/utils/Cargo.toml b/substrate/client/utils/Cargo.toml
index fe6351c9d62c10390ac07c1a523d37c1be2213fc..885b1d26a8e03585a25356847d277acc5d60635c 100644
--- a/substrate/client/utils/Cargo.toml
+++ b/substrate/client/utils/Cargo.toml
@@ -1,11 +1,11 @@
 [package]
 name = "sc-utils"
 version = "4.0.0-dev"
-authors = ["Parity Technologies <admin@parity.io>"]
-edition = "2021"
+authors.workspace = true
+edition.workspace = true
 license = "Apache-2.0"
 homepage = "https://substrate.io"
-repository = "https://github.com/paritytech/substrate/"
+repository.workspace = true
 description = "I/O for Substrate runtimes"
 readme = "README.md"
 
diff --git a/substrate/client/utils/src/metrics.rs b/substrate/client/utils/src/metrics.rs
index 6bbdbe2e2e59954669c9bee51aafb6f1c25592ac..308e90cb25379d62fe02f1878a664ff44377c9df 100644
--- a/substrate/client/utils/src/metrics.rs
+++ b/substrate/client/utils/src/metrics.rs
@@ -24,7 +24,10 @@ use prometheus::{
 	Error as PrometheusError, Registry,
 };
 
-use prometheus::{core::GenericCounterVec, Opts};
+use prometheus::{
+	core::{GenericCounterVec, GenericGaugeVec},
+	Opts,
+};
 
 lazy_static! {
 	pub static ref TOKIO_THREADS_TOTAL: GenericCounter<AtomicU64> =
@@ -36,18 +39,32 @@ lazy_static! {
 }
 
 lazy_static! {
-	pub static ref UNBOUNDED_CHANNELS_COUNTER : GenericCounterVec<AtomicU64> = GenericCounterVec::new(
-		Opts::new("substrate_unbounded_channel_len", "Items in each mpsc::unbounded instance"),
-		&["entity", "action"] // 'name of channel, send|received|dropped
+	pub static ref UNBOUNDED_CHANNELS_COUNTER: GenericCounterVec<AtomicU64> = GenericCounterVec::new(
+		Opts::new(
+			"substrate_unbounded_channel_len",
+			"Items sent/received/dropped on each mpsc::unbounded instance"
+		),
+		&["entity", "action"], // name of channel, send|received|dropped
+	).expect("Creating of statics doesn't fail. qed");
+	pub static ref UNBOUNDED_CHANNELS_SIZE: GenericGaugeVec<AtomicU64> = GenericGaugeVec::new(
+		Opts::new(
+			"substrate_unbounded_channel_size",
+			"Size (number of messages to be processed) of each mpsc::unbounded instance",
+		),
+		&["entity"], // name of channel
 	).expect("Creating of statics doesn't fail. qed");
-
 }
 
+pub static SENT_LABEL: &'static str = "send";
+pub static RECEIVED_LABEL: &'static str = "received";
+pub static DROPPED_LABEL: &'static str = "dropped";
+
 /// Register the statics to report to registry
 pub fn register_globals(registry: &Registry) -> Result<(), PrometheusError> {
 	registry.register(Box::new(TOKIO_THREADS_ALIVE.clone()))?;
 	registry.register(Box::new(TOKIO_THREADS_TOTAL.clone()))?;
 	registry.register(Box::new(UNBOUNDED_CHANNELS_COUNTER.clone()))?;
+	registry.register(Box::new(UNBOUNDED_CHANNELS_SIZE.clone()))?;
 
 	Ok(())
 }
diff --git a/substrate/client/utils/src/mpsc.rs b/substrate/client/utils/src/mpsc.rs
index 36e44be5e29507d1d3445f9e35f141a7df9a4adb..c24a5bd8904afc99109acf8f5c6fe5872b5d9874 100644
--- a/substrate/client/utils/src/mpsc.rs
+++ b/substrate/client/utils/src/mpsc.rs
@@ -20,7 +20,9 @@
 
 pub use async_channel::{TryRecvError, TrySendError};
 
-use crate::metrics::UNBOUNDED_CHANNELS_COUNTER;
+use crate::metrics::{
+	DROPPED_LABEL, RECEIVED_LABEL, SENT_LABEL, UNBOUNDED_CHANNELS_COUNTER, UNBOUNDED_CHANNELS_SIZE,
+};
 use async_channel::{Receiver, Sender};
 use futures::{
 	stream::{FusedStream, Stream},
@@ -102,7 +104,10 @@ impl<T> TracingUnboundedSender<T> {
 	/// Proxy function to `async_channel::Sender::try_send`.
 	pub fn unbounded_send(&self, msg: T) -> Result<(), TrySendError<T>> {
 		self.inner.try_send(msg).map(|s| {
-			UNBOUNDED_CHANNELS_COUNTER.with_label_values(&[self.name, "send"]).inc();
+			UNBOUNDED_CHANNELS_COUNTER.with_label_values(&[self.name, SENT_LABEL]).inc();
+			UNBOUNDED_CHANNELS_SIZE
+				.with_label_values(&[self.name])
+				.set(self.inner.len().saturated_into());
 
 			if self.inner.len() >= self.queue_size_warning &&
 				self.warning_fired
@@ -123,6 +128,11 @@ impl<T> TracingUnboundedSender<T> {
 			s
 		})
 	}
+
+	/// The number of elements in the channel (proxy function to [`async_channel::Sender`]).
+	pub fn len(&self) -> usize {
+		self.inner.len()
+	}
 }
 
 impl<T> TracingUnboundedReceiver<T> {
@@ -135,24 +145,34 @@ impl<T> TracingUnboundedReceiver<T> {
 	/// that discounts the messages taken out.
 	pub fn try_recv(&mut self) -> Result<T, TryRecvError> {
 		self.inner.try_recv().map(|s| {
-			UNBOUNDED_CHANNELS_COUNTER.with_label_values(&[self.name, "received"]).inc();
+			UNBOUNDED_CHANNELS_COUNTER.with_label_values(&[self.name, RECEIVED_LABEL]).inc();
+			UNBOUNDED_CHANNELS_SIZE
+				.with_label_values(&[self.name])
+				.set(self.inner.len().saturated_into());
 			s
 		})
 	}
+
+	/// The number of elements in the channel (proxy function to [`async_channel::Receiver`]).
+	pub fn len(&self) -> usize {
+		self.inner.len()
+	}
 }
 
 impl<T> Drop for TracingUnboundedReceiver<T> {
 	fn drop(&mut self) {
 		// Close the channel to prevent any further messages to be sent into the channel
 		self.close();
-		// the number of messages about to be dropped
+		// The number of messages about to be dropped
 		let count = self.inner.len();
-		// discount the messages
+		// Discount the messages
 		if count > 0 {
 			UNBOUNDED_CHANNELS_COUNTER
-				.with_label_values(&[self.name, "dropped"])
+				.with_label_values(&[self.name, DROPPED_LABEL])
 				.inc_by(count.saturated_into());
 		}
+		// Reset the size metric to 0
+		UNBOUNDED_CHANNELS_SIZE.with_label_values(&[self.name]).set(0);
 		// Drain all the pending messages in the channel since they can never be accessed,
 		// this can be removed once https://github.com/smol-rs/async-channel/issues/23 is
 		// resolved
@@ -170,7 +190,10 @@ impl<T> Stream for TracingUnboundedReceiver<T> {
 		match Pin::new(&mut s.inner).poll_next(cx) {
 			Poll::Ready(msg) => {
 				if msg.is_some() {
-					UNBOUNDED_CHANNELS_COUNTER.with_label_values(&[s.name, "received"]).inc();
+					UNBOUNDED_CHANNELS_COUNTER.with_label_values(&[s.name, RECEIVED_LABEL]).inc();
+					UNBOUNDED_CHANNELS_SIZE
+						.with_label_values(&[s.name])
+						.set(s.inner.len().saturated_into());
 				}
 				Poll::Ready(msg)
 			},
diff --git a/substrate/docker/README.md b/substrate/docker/README.md
index 71ddb2dffd1bbe575f67d71e51db728a920ab265..f9cc7ed14653035c22c8753b61c8dd88ca24cbeb 100644
--- a/substrate/docker/README.md
+++ b/substrate/docker/README.md
@@ -1,27 +1,32 @@
 # Substrate Builder Docker Image
 
-The Docker image in this folder is a `builder` image. It is self contained and allows users to build the binaries themselves.
-There is no requirement on having Rust or any other toolchain installed but a working Docker environment.
+The Docker image in this folder is a `builder` image. It is self contained and allows users to build the binaries
+themselves. There is no requirement on having Rust or any other toolchain installed but a working Docker environment.
 
-Unlike the `parity/polkadot` image which contains a single binary (`polkadot`!) used by default, the image in this folder builds and contains several binaries and you need to provide the name of the binary to be called.
+Unlike the `parity/polkadot` image which contains a single binary (`polkadot`!) used by default, the image in this
+folder builds and contains several binaries and you need to provide the name of the binary to be called.
 
-You should refer to the [.Dockerfile](./substrate_builder.Dockerfile) for the actual list. At the time of editing, the list of included binaries is:
+You should refer to the [.Dockerfile](./substrate_builder.Dockerfile) for the actual list. At the time of editing, the
+list of included binaries is:
 
-- substrate
-- subkey
-- node-template
-- chain-spec-builder
+- `substrate`
+- `subkey`
+- `node-template`
+- `chain-spec-builder`
 
 First, install [Docker](https://docs.docker.com/get-docker/).
 
-Then to generate the latest parity/substrate image. Please run:
+Then to generate the latest `parity/substrate` image. Please run:
 ```sh
 ./build.sh
 ```
 
-> If you wish to create a debug build rather than a production build, then you may modify the [.Dockerfile](./substrate_builder.Dockerfile) replacing `cargo build --locked --release` with just `cargo build --locked` and replacing `target/release` with `target/debug`. 
+If you wish to create a debug build rather than a production build, then you may modify the
+[.Dockerfile](./substrate_builder.Dockerfile) replacing `cargo build --locked --release` with just
+`cargo build --locked` and replacing `target/release` with `target/debug`.
 
-> If you get an error that a tcp port address is already in use then find an available port to use for the host port in the [.Dockerfile](./substrate_builder.Dockerfile).
+If you get an error that a tcp port address is already in use then find an available port to use for the host port in
+the [.Dockerfile](./substrate_builder.Dockerfile).
 
 The image can be used by passing the selected binary followed by the appropriate tags for this binary.
 
@@ -32,7 +37,8 @@ Your best guess to get started is to pass the `--help flag`. Here are a few exam
 - `./run.sh node-template --version`
 - `./run.sh chain-spec-builder --help`
 
-Then try running the following command to start a single node development chain using the Substrate Node Template binary `node-template`:
+Then try running the following command to start a single node development chain using the Substrate Node Template binary
+`node-template`:
 
 ```sh
 ./run.sh node-template --dev --ws-external
diff --git a/substrate/docker/substrate_builder.Dockerfile b/substrate/docker/substrate_builder.Dockerfile
index 03b6b46caf41f31c7e290741e4da67b585cd0b4c..b37acf4d2014d11b681d7bb85b16bf4a4f855e96 100644
--- a/substrate/docker/substrate_builder.Dockerfile
+++ b/substrate/docker/substrate_builder.Dockerfile
@@ -12,8 +12,8 @@ LABEL description="Multistage Docker image for Substrate: a platform for web3" \
 	io.parity.image.authors="chevdor@gmail.com, devops-team@parity.io" \
 	io.parity.image.vendor="Parity Technologies" \
 	io.parity.image.description="Substrate is a next-generation framework for blockchain innovation 🚀" \
-	io.parity.image.source="https://github.com/paritytech/polkadot/blob/${VCS_REF}/docker/substrate_builder.Dockerfile" \
-	io.parity.image.documentation="https://github.com/paritytech/polkadot/"
+	io.parity.image.source="https://github.com/paritytech/polkadot-sdk/blob/${VCS_REF}/substrate/docker/substrate_builder.Dockerfile" \
+	io.parity.image.documentation="https://github.com/paritytech/polkadot-sdk"
 
 COPY --from=builder /substrate/target/release/substrate /usr/local/bin
 COPY --from=builder /substrate/target/release/subkey /usr/local/bin
diff --git a/substrate/docs/CHANGELOG.md b/substrate/docs/CHANGELOG.md
index 25f8e582c78fc01f3b5ca46d8f57f70413f3c2b6..8a1b245a5b0cc1cbf81b11a03897b60bb701e283 100644
--- a/substrate/docs/CHANGELOG.md
+++ b/substrate/docs/CHANGELOG.md
@@ -8,24 +8,36 @@ The format is based on [Keep a Changelog].
 
 ## 2.0.1-> 3.0.0 - Apollo 14
 
-Most notably, this is the first release of the new FRAME (2.0) with its new macro-syntax and some changes in types, and pallet versioning. This release also incorporates the faster and improve version 2.0 of the parity-scale-codec and upgraded dependencies all-around. While the `FinalityTracker` pallet has been dropped, this release marks the first public appearance of a few new pallets, too;Bounties, Lottery, Tips (extracted from the `Treasury`-pallet, see #7536) and Merkle-Mountain-Ranges (MMR).
-
-On the client side, the most notable changes are around the keystore, making it async and switching to a different signing model allowing for remote-signing to be implemented; and various changes to improve networking and light-client support, like adding the Grandpa warp sync request-response protocol (#7711).
-
-_Contracts_: Please note that the contracts pallet _is not part_ of this release. The pallet is not yet ready and will be released separately in the coming weeks. The currently released contracts pallet _is not compatible_ with the new FRAME, thus if you need the contracts pallet, we recommend you wait with the upgrade until it has been released, too.
+Most notably, this is the first release of the new FRAME (2.0) with its new macro-syntax and some changes in types, and
+pallet versioning. This release also incorporates the faster and improve version 2.0 of the `parity-scale-codec` and
+upgraded dependencies all-around. While the `FinalityTracker` pallet has been dropped, this release marks the first
+public appearance of a few new pallets, too;Bounties, Lottery, Tips (extracted from the `Treasury`-pallet, see #7536)
+and Merkle-Mountain-Ranges (MMR).
+
+On the client side, the most notable changes are around the keystore, making it async and switching to a different
+signing model allowing for remote-signing to be implemented; and various changes to improve networking and light-client
+support, like adding the Grandpa warp sync request-response protocol (#7711).
+
+_Contracts_: Please note that the contracts pallet _is not part_ of this release. The pallet is not yet ready and will
+be released separately in the coming weeks. The currently released contracts pallet _is not compatible_ with the new
+FRAME, thus if you need the contracts pallet, we recommend you wait with the upgrade until it has been released, too.
 ### Upgrade instructions
 
-Not too much has changed on the top and API level for developing Substrate between 2.0 and 3.0. The easiest and quickest path for upgrading is just to take the latest node-template and try applying your changes to it:
+Not too much has changed on the top and API level for developing Substrate between 2.0 and 3.0. The easiest and quickest
+path for upgrading is just to take the latest node-template and try applying your changes to it:
 1. take a diff between 2.0 and your changes
 2. store that diff
 3. remove everything, copy over the 3.0 node-template
 4. try re-applying your diff, manually, a hunk at a time.
 
-If that doesn't work for you, we are working on an in-depth-guide for all major changes that took place and how you need to adapt your code for it. [You can find the upgrade guide under `docs/` in the repo](https://github.com/paritytech/substrate/blob/master/docs/Upgrading-2.0-to-3.0.md), if you have further questions or problem, please [feel free to ask in the github discussion board](https://github.com/paritytech/substrate/discussions).
+If that doesn't work for you, we are working on an in-depth-guide for all major changes that took place and how you need
+to adapt your code for it. [You can find the upgrade guide under `docs/` in the
+repo](https://github.com/paritytech/substrate/blob/master/docs/Upgrading-2.0-to-3.0.md), if you have further questions
+or problem, please [feel free to ask in the github discussion
+board](https://github.com/paritytech/substrate/discussions).
 
 
-Runtime
--------
+#### Runtime
 
 * contracts: Charge rent for code storage (#7935)
 * contracts: Emit event on contract termination (#8014)
@@ -63,8 +75,7 @@ Runtime
 * Move proxies migration (#7205)
 * Introduce `cancel_proposal` to rid us of those pesky proposals (#7111)
 
-Client
-------
+#### Client
 
 * Remove backwards-compatibility networking hack (#8068)
 * Extend SS58 network identifiers (#8039)
@@ -97,8 +108,7 @@ Client
 * Refactor CurrencyToVote (#6896)
 * client/network: Stop sending noise legacy handshake (#7211)
 
-API
----
+#### API
 
 * pallet macro: easier syntax for `#[pallet::pallet]` with `struct Pallet<T>(_)` (#8091)
 * WasmExecutor takes a cache directory (#8057)
@@ -106,7 +116,7 @@ API
 * Migrate assets pallet to new macros (#7984)
 * contracts: Make ChainExtension trait generic over the runtime (#8003)
 * Decouple the session validators from im-online (#7127)
-* Update parity-scale-codec to 2.0 (#7994)
+* Update `parity-scale-codec` to 2.0 (#7994)
 * Merkle Mountain Range pallet improvements (#7891)
 * Cleaner GRANDPA RPC API for proving finality (#7339)
 * Migrate frame-system to pallet attribute macro (#7898)
@@ -136,8 +146,7 @@ API
 * SystemOrigin trait (#7226)
 * permit setting treasury pallet initial funding through genesis (#7214)
 
-Runtime Migrations
-------------------
+#### Runtime Migrations
 
 * Migrate assets pallet to new macros (#7984)
 * Fix elections-phragmen and proxy issue (#7040)
@@ -149,8 +158,7 @@ Runtime Migrations
 
 ## 2.0.0-> 2.0.1
 
-Patch release with backports to fix broken nightly builds.
-Namely contains backports of
+Patch release with backports to fix broken nightly builds. Namely contains backports of
 
 * [#7381: Make Substrate compile with latest nightly](https://github.com/paritytech/substrate/pull/7381)
 * [#7238: Fix compilation with environmental on latest nightly](https://github.com/paritytech/substrate/pull/7238)
@@ -161,8 +169,7 @@ Namely contains backports of
 
 ## 2.0.0-rc6 -> 2.0.0 – two dot 😮
 
-Runtime
--------
+### Runtime
 
 * Rename `ModuleToIndex` to `PalletRuntimeSetup` (#7148)
 * Bounties (#5715)
@@ -174,8 +181,7 @@ Runtime
 * Time-delay proxies (#6770)
 * Refcounts are now u32 (#7164)
 
-Client
-------
+### Client
 
 * Rename `inspect-key` to `inspect` (#7160)
 * Send import notification always for re-orgs (#7118)
@@ -190,8 +196,7 @@ Client
 * Fix benchmark read/write key tracker for keys in child storages. (#6905)
 * *: Update to next libp2p version 0.24.0 (#6891)
 
-API
----
+### API
 
 * grandpa-rpc: use FinalityProofProvider to check finality for rpc (#6215)
 * pow: replace the thread-base mining loop with a future-based mining worker (#7060)
@@ -204,16 +209,14 @@ API
 * Add a `LightSyncState` field to the chain spec (#6894)
 * *: Update to next libp2p version 0.24.0 (#6891)
 
-Runtime Migrations
-------------------
+### Runtime Migrations
 
 * Time-delay proxies (#6770)
 
 
 ## 2.0.0-rc5 -> 2.0.0-rc6 – Rock Hyrax
 
-Runtime
--------
+### Runtime
 
 * Custom Codec Implementation for NPoS Election (#6720)
 * Successful `note_imminent_preimage` is free (#6793)
@@ -224,8 +227,7 @@ Runtime
 * pallet-evm: add support for tuple-based precompile declarations (#6681)
 * grandpa: allow noting that the set has stalled (#6725)
 
-Client
-------
+#### Client
 
 * Merge Subkey into sc-cli (#4954)
 * RpcHandlers Refactorings (#6846)
@@ -239,8 +241,7 @@ Client
 * Name all the tasks! (#6726)
 * Child nodes can be handled by adding a child `TaskManager` to the parent's `TaskManager` (#6771)
 
-API
----
+### API
 
 * pow: add access to pre-digest for algorithm verifiers (#6900)
 * babe, aura, pow: only call check_inherents if authoring version is compatible (#6862)
@@ -254,8 +255,7 @@ API
 
 ## 2.0.0-rc4 -> 2.0.0-rc5 – River Dolphin
 
-Runtime
--------
+### Runtime
 
 * Support using system storage directly for EVM balance and nonce (#6659)
 * Properly filter out duplicate voters in elections. (#6693)
@@ -273,14 +273,13 @@ Runtime
 * pallet-evm: customizable chain id (#6537)
 * Refactor as_sub to make things clearer. (#6503)
 
-Client
-------
+### Client
 
 * Update wasmtime to (almost) latest master (#6662)
 * Update to latest sysinfo prevents leaking fd-handlers (#6708)
 * Tracing values (#6679)
 * Graceful shutdown for the task manager (#6654)
-* Update substrate-networking Grafana dashboard (#6649)
+* Update `substrate-networking` Grafana dashboard (#6649)
 * *: Update to libp2p v0.21.1 (#6559)
 * Send Status message on all newly-opened legacy substreams (#6593)
 * babe: report equivocations (#6362)
@@ -288,8 +287,7 @@ Client
 * Remove the service, replacing it with a struct of individual chain components (#6352)
 * Fix tx-pool returning the same transaction multiple times (#6535)
 
-API
----
+### API
 
 * Better handling of stable-only build (#6569)
 * Remove the service builder (#6557)
@@ -302,8 +300,7 @@ API
 
 ## 2.0.0-rc3 -> 2.0.0-rc4 (Rhinoceros)
 
-Runtime
--------
+### Runtime
 
 * Staking Payout Creates Controller (#6496)
 * `pallet-scheduler`: Check that `when` is not in the past (#6480)
@@ -321,8 +318,7 @@ Runtime
 * Add events for balance reserve and unreserve functions (#6330)
 * Introduce frozen indices. (#6307)
 
-Client
-------
+### Client
 
 * client/network/service: Add primary dimension to connection metrics (#6472)
 * Fix Babe secondary plain slots claiming (#6451)
@@ -340,8 +336,7 @@ Client
 * new crate sc-light (#6235)
 * Allow adding a prefix to the informant (#6174)
 
-API
----
+### API
 
 * seal: Remove ext_dispatch_call and ext_get_runtime_storage (#6464)
 * seal: Refactor ext_gas_price (#6478)
@@ -356,16 +351,14 @@ API
 
 ## 2.0.0-rc2 -> 2.0.0-rc3
 
-Runtime
--------
+### Runtime
 
 * Introduce stacked filtering (#6273)
 * Allow "pure" proxied accounts (#6236)
 * Allow over-weight collective proposals to be closed (#6163)
 * Fix Election when ForceNone V1 (#6166)
 
-Client
-------
+### Client
 
 * Make transaction pool prune transactions only of canonical blocks (#6123)
 * Rename all the election operations (#6245)
@@ -381,14 +374,12 @@ Client
 
 ## 2.0.0-alpha.8 -> 2.0.0-rc1
 
-Runtime
--------
+### Runtime
 
 * Allow operational recovery path if on_initialize use fullblock. (#6089)
 * Maximum extrinsic weight limit (#6067)
 
-Client
-------
+### Client
 
 * Add JSON format to import blocks and set it as default (#5816)
 * Upgrade to libp2p v0.19 - Changes the default PeerId representation (#6064)
@@ -396,17 +387,17 @@ Client
 
 ## 2.0.0-alpha.7 -> 2.0.0-alpha.8
 
-**License Changed**
-From this release forward, the code is released under a new – more relaxed – license scheme: Client (`sc-*`) is released under "GPL 3.0 or newer with the Classpath Exception", while primitives, FRAME, the pallets, utils and test-utils are released under "Apache 2.0". More details in the [Relax licensing scheme PR](https://github.com/paritytech/substrate/pull/5947).
+**License Changed** From this release forward, the code is released under a new – more relaxed – license scheme: Client
+(`sc-*`) is released under "GPL 3.0 or newer with the Classpath Exception", while primitives, FRAME, the pallets, utils
+and test-utils are released under "Apache 2.0". More details in the [Relax licensing scheme
+PR](https://github.com/paritytech/substrate/pull/5947).
 
-Runtime
--------
+### Runtime
 
 * Democracy weight (#5828)
 * Make `Digest` support `StorageAppend` (#5922)
 
-Client
-------
+### Client
 
 * Meter block import results via prometheus (#6025)
 * Added RuntimePublic for ecdsa public key. (#6029)
@@ -418,8 +409,7 @@ Client
 
 ## 2.0.0-alpha.6 -> 2.0.0-alpha.7
 
-Runtime
--------
+### Runtime
 
 * Use `storage::append` in the implementation of the storage types (#5889)
 * pallet-sudo: Store `DispatchResult` in `Sudid` event (#5804)
@@ -431,8 +421,7 @@ Runtime
 * Transaction versioning in the RuntimeVersion (#5582)
 * emit TipClosed event on success tip payout (#5656)
 
-Client
-------
+### Client
 
 * Adds `export-state` subcommand (#5842)
 * Drop ClientProvider (#5823)
@@ -454,8 +443,7 @@ Client
 * Use a Kademlia instance per `ProtocolId`. (#5045)
 * Report tasks metrics to Prometheus (#5619)
 
-API
----
+### API
 
 * Child trie api changes BREAKING (#4857)
 * Pass max-total to RewardRemainder on end_era (#5697)
@@ -463,8 +451,7 @@ API
 
 ## 2.0.0-alpha.5 -> 2.0.0-alpha.6
 
-Runtime
--------
+### Runtime
 
 * Unsigned Validation best practices (#5563)
 * Generate Unit Tests for Benchmarks (#5527)
@@ -473,8 +460,7 @@ Runtime
 * Pass transaction source to validate_transaction (#5366)
 * on_initialize return weight consumed and default cost to default DispatchInfo instead of zero (#5382)
 
-Client
-------
+### Client
 
 * Add new RPC method to get the chain type (#5576)
 * Reuse wasmtime instances, the PR (#5567)
@@ -488,10 +474,10 @@ Client
 * Make transactions and block announces use notifications substre… (#5360)
 * Adds state_queryStorageAt (#5362)
 * Offchain Phragmén BREAKING. (#4517)
-* `sc_rpc::system::SystemInfo.impl_version` now returns the full version (2.0.0-alpha.2-b950f731c-x86_64-linux-gnu) instead of the short version (1.0.0) (#5271)
+* `sc_rpc::system::SystemInfo.impl_version` now returns the full version (2.0.0-alpha.2-b950f731c-x86_64-linux-gnu)
+  instead of the short version (1.0.0) (#5271)
 
-API
----
+### API
 
 * Unsigned Validation best practices (#5563)
 * Split the Roles in three types (#5520)
@@ -501,16 +487,14 @@ API
 
 ## 2.0.0-alpha.4 -> 2.0.0-alpha.5
 
-Runtime
--------
+### Runtime
 
 * pallet-evm: configurable gasometer config (#5320)
 * Adds new event phase `Initialization` (#5302)
 
 ## 2.0.0-alpha.3 -> 2.0.0-alpha.4
 
-Runtime
--------
+### Runtime
 
 * Move runtime upgrade to `frame-executive` (#5197)
 * Split fees and tips between author and treasury independently (#5207)
@@ -520,22 +504,20 @@ Runtime
 * Adds `vested_transfer` to Vesting pallet (#5029)
 * Change extrinsic_count to extrinsic_index in pallet-utility (#5044)
 
-Client
-------
+### Client
 
 * client/finality-grandpa: Add Prometheus metrics to GossipValidator (#5237)
 * removes use of sc_client::Client from node-transaction-factory (#5158)
 * removes use of sc_client::Client from sc_network (#5147)
 * Use CLI to configure max instances cache (#5177)
 * client/service/src/builder.rs: Add build_info metric (#5192)
-* Remove substrate-ui.parity.io from CORS whitelist (#5142)
+* Remove `substrate-ui.parity.io` from CORS whitelist (#5142)
 * removes use of sc_client::Client from sc-rpc (#5063)
 * Use 128mb for db cache default (#5134)
 * Drop db-cache default from 1gig to 32mb (#5128)
 * Add more metrics to prometheus (#5034)
 
-API
----
+### API
 
 * Produce block always on updated transaction pool state (#5227)
 * Add `ext_terminate` (#5234)
diff --git a/substrate/docs/CODEOWNERS b/substrate/docs/CODEOWNERS
deleted file mode 100644
index 63294d90e9d069949614bc1c703078f6828dd70d..0000000000000000000000000000000000000000
--- a/substrate/docs/CODEOWNERS
+++ /dev/null
@@ -1,74 +0,0 @@
-# Lists some code owners.
-#
-# A codeowner just oversees some part of the codebase. If an owned file is changed then the
-# corresponding codeowner receives a review request. An approval of the codeowner is
-# not required for merging a PR though.
-#
-# **This is pretty much an experiment at the moment**. Feel free to remove yourself at any time if
-# you do not want to receive review requests any longer.
-#
-# For details about syntax, see:
-# https://help.github.com/en/articles/about-code-owners
-# But here are some important notes:
-#
-# - Glob syntax is git-like, e.g. `/core` means the core directory in the root, unlike `core` which
-#   can be everywhere.
-# - Multiple owners are supported.
-# - Either handle (e.g, @pepyakin) or email can be used. Keep in mind, that handles might work better because they
-#   are more recognizable on GitHub, you can use them for mentioning unlike an email.
-# - The latest matching rule, if multiple, takes precedence.
-
-# CI
-/.github/ @paritytech/ci
-/.gitlab-ci.yml @paritytech/ci
-/scripts/ci/ @paritytech/ci
-
-# WASM executor, low-level client <-> WASM interface and other WASM-related code
-/client/allocator/ @koute
-/client/executor/ @koute
-/primitives/panic-handler/ @koute
-/primitives/runtime-interface/ @koute
-/primitives/wasm-interface/ @koute
-/utils/wasm-builder/ @koute
-
-# Systems-related bits and bobs on the client side
-/client/sysinfo/ @koute
-/client/tracing/ @koute
-
-# Documentation audit
-/primitives/runtime @paritytech/docs-audit
-/primitives/arithmetic @paritytech/docs-audit
-# /primitives/core (to be added later)
-# /primitives/io (to be added later)
-
-# FRAME
-/frame/ @paritytech/frame-coders @paritytech/docs-audit
-/frame/nfts/ @jsidorenko @paritytech/docs-audit
-/frame/state-trie-migration/ @paritytech/frame-coders @cheme
-/frame/uniques/ @jsidorenko @paritytech/docs-audit
-
-# GRANDPA, BABE, consensus stuff
-/client/consensus/babe/ @andresilva
-/client/consensus/grandpa/ @andresilva
-/client/consensus/pow/ @sorpaas
-/client/consensus/slots/ @andresilva
-/frame/babe/ @andresilva
-/frame/grandpa/ @andresilva
-/primitives/consensus/pow/ @sorpaas
-
-# BEEFY, MMR
-/frame/beefy/ @acatangiu
-/frame/beefy-mmr/ @acatangiu
-/frame/merkle-mountain-range/ @acatangiu
-/primitives/merkle-mountain-range/ @acatangiu
-
-# Contracts
-/frame/contracts/ @athei @paritytech/docs-audit
-
-# NPoS and election
-/frame/election-provider-multi-phase/ @paritytech/staking-core @paritytech/docs-audit
-/frame/election-provider-support/ @paritytech/staking-core @paritytech/docs-audit
-/frame/elections-phragmen/ @paritytech/staking-core @paritytech/docs-audit
-/frame/nomination-pools/ @paritytech/staking-core @paritytech/docs-audit
-/frame/staking/ @paritytech/staking-core @paritytech/docs-audit
-/primitives/npos-elections/ @paritytech/staking-core @paritytech/docs-audit
diff --git a/substrate/docs/CODE_OF_CONDUCT.md b/substrate/docs/CODE_OF_CONDUCT.md
deleted file mode 100644
index 400c9b3901e26a7e5a1840816897ed31927156f5..0000000000000000000000000000000000000000
--- a/substrate/docs/CODE_OF_CONDUCT.md
+++ /dev/null
@@ -1,52 +0,0 @@
-# Contributor Covenant Code of Conduct
-
-## Our Pledge
-
-In the interest of fostering an open and welcoming environment, we as contributors and maintainers pledge to making participation in our project and our community a harassment-free experience for everyone, regardless of age, body size, disability, ethnicity, gender identity and expression, level of experience, nationality, personal appearance, race, religion, or sexual identity and orientation.
-
-## Our Standards
-
-Examples of behavior that contributes to creating a positive environment include:
-
-* Using welcoming and inclusive language
-* Being respectful of differing viewpoints and experiences
-* Gracefully accepting constructive criticism
-* Focusing on what is best for the community
-* Showing empathy towards other community members
-
-Examples of unacceptable behavior by participants include:
-
-* The use of sexualized language or imagery and unwelcome sexual attention or advances
-* Trolling, insulting/derogatory comments, and personal or political attacks
-* Public or private harassment
-* Publishing others' private information, such as a physical or electronic address, without explicit permission
-* Other conduct which could reasonably be considered inappropriate in a professional setting
-
-### Facilitation, Not Strongarming
-
-We recognise that this software is merely a tool for users to create and maintain their blockchain of preference. We see that blockchains are naturally community platforms with users being the ultimate decision makers. We assert that good software will maximise user agency by facilitate user-expression on the network. As such:
-
-* This project will strive to give users as much choice as is both reasonable and possible over what protocol they adhere to; but
-* use of the project's technical forums, commenting systems, pull requests and issue trackers as a means to express individual protocol preferences is forbidden.
-
-## Our Responsibilities
-
-Project maintainers are responsible for clarifying the standards of acceptable behavior and are expected to take appropriate and fair corrective action in response to any instances of unacceptable behavior.
-
-Project maintainers have the right and responsibility to remove, edit, or reject comments, commits, code, wiki edits, issues, and other contributions that are not aligned to this Code of Conduct, or to ban temporarily or permanently any contributor for other behaviors that they deem inappropriate, threatening, offensive, or harmful.
-
-## Scope
-
-This Code of Conduct applies both within project spaces and in public spaces when an individual is representing the project or its community. Examples of representing a project or community include using an official project e-mail address, posting via an official social media account, or acting as an appointed representative at an online or offline event. Representation of a project may be further defined and clarified by project maintainers.
-
-## Enforcement
-
-Instances of abusive, harassing, or otherwise unacceptable behavior may be reported by contacting the project team at <admin@parity.io>. The project team will review and investigate all complaints, and will respond in a way that it deems appropriate to the circumstances. The project team is obligated to maintain confidentiality with regard to the reporter of an incident. Further details of specific enforcement policies may be posted separately.
-
-Project maintainers who do not follow or enforce the Code of Conduct in good faith may face temporary or permanent repercussions as determined by other members of the project's leadership.
-
-## Attribution
-
-This Code of Conduct is adapted from the [Contributor Covenant][homepage], version 1.4, available at https://contributor-covenant.org/version/1/4
-
-[homepage]: https://contributor-covenant.org
diff --git a/substrate/docs/CONTRIBUTING.md b/substrate/docs/CONTRIBUTING.md
deleted file mode 100644
index cbaf6206e78f2a8f170dcc1e6bad721455700733..0000000000000000000000000000000000000000
--- a/substrate/docs/CONTRIBUTING.md
+++ /dev/null
@@ -1,134 +0,0 @@
-# Contributing
-
-The `Substrate` project is an ***OPENISH Open Source Project***
-
-Contributors are invited to our `#frame-contributors` channel on the Polkadot Discord for support and coordination:  
-[![Discord](https://img.shields.io/discord/722223075629727774?style=for-the-badge&logo=discord&label=Discord)](https://dot.li/discord)
-
-## What?
-
-Individuals making significant and valuable contributions are given commit-access to a project to contribute as they see fit. A project is more like an open wiki than a standard guarded open source project.
-
-## Rules
-
-There are a few basic ground-rules for contributors (including the maintainer(s) of the project):
-
-1. ***No `--force` pushes*** or modifying the master branch history in any way. If you need to rebase, ensure you do it in your own repo. No rewriting of the history after the code has been shared (e.g. through a Pull-Request).
-2. ***Non-master branches***, prefixed with a short name moniker (e.g. `gav-my-feature`) must be used for ongoing work.
-3. ***All modifications*** must be made in a ***pull-request*** to solicit feedback from other contributors.
-4. A pull-request **must not be merged until CI** has finished successfully.
-5. Contributors should adhere to the [house coding style](STYLE_GUIDE.md).
-6. Contributors should adhere to the [house documenting style](DOCUMENTATION_GUIDELINES.md), when applicable.
-
-## Merge Process
-
-**In General**
-
-A Pull Request (PR) needs to be reviewed and approved by project maintainers unless:
-
-* it does not alter any logic (e.g. comments, dependencies, docs), then it may be tagged [`insubstantial`](https://github.com/paritytech/substrate/pulls?utf8=%E2%9C%93&q=is%3Apr+is%3Aopen+label%3AA2-insubstantial) and merged by its author once CI is complete.
-* it is an urgent fix with no large change to logic, then it may be merged after a non-author contributor has approved the review once CI is complete.
-
-**Labels TLDR:**
-
-* `A-*` Pull request status. ONE REQUIRED.
-* `B-*` Changelog and/or Runtime-upgrade post composition markers. ONE REQUIRED. (used by automation)
-* `C-*` Release notes release-criticality markers. EXACTLY ONE REQUIRED. (used by automation)
-* `D-*` Audit tags denoting auditing requirements on the PR.
-
-**Process:**
-
-1. Please tag each PR with exactly one `A`, `B`, `C` and `D` label at the minimum.
-2. When tagging a PR, it should be done while keeping all downstream users in mind. Downstream users are not just Polkadot or system parachains, but also all the other parachains and solo chains that are using Substrate. The labels are used by downstream users to track changes and to include these changes properly into their own releases.
-3. Once a PR is ready for review please add the [`A0-please_review`](https://github.com/paritytech/substrate/pulls?q=is%3Apr+is%3Aopen+label%3AA0-please_review+) label. Generally PRs should sit with this label for 48 hours in order to garner feedback. It may be merged before if all relevant parties had a look at it.
-4. If the first review is not an approval, swap `A0-please_review` to any label `[A3, A5]` to indicate that the PR has received some feedback, but needs further work. For example. [`A3-in_progress`](https://github.com/paritytech/substrate/labels/A3-in_progress) is a general indicator that the PR is work in progress.
-5. PRs must be tagged with `B*` labels to signal if a change is note worthy for downstream users. The respective `T*` labels should be added to signal the component that was changed. `B0-silent` must only be used for changes that don’t require any attention by downstream users.
-6. PRs must be tagged with their release importance via the `C1-C7` labels. The release importance is only informing about how important it is to apply a release that contains the change.
-7. PRs must be tagged with their audit requirements via the `D1-D9` labels.
-8. PRs that introduce runtime migrations must be tagged with [`E0-runtime_migration`](https://github.com/paritytech/substrate/labels/E0-runtime_migration). See the [Migration Best Practices here](https://github.com/paritytech/substrate/blob/master/utils/frame/try-runtime/cli/src/lib.rs#L18) for more info about how to test runtime migrations.
-9. PRs that introduce irreversible database migrations must be tagged with [`E1-database_migration`](https://github.com/paritytech/substrate/labels/E1-database_migration).
-10. PRs that add host functions must be tagged with with [`E3-host_functions`](https://github.com/paritytech/substrate/labels/E3-host_functions).
-11. PRs that break the external API must be tagged with [`F3-breaks_API`](https://github.com/paritytech/substrate/labels/F3-breaks_API).
-12. PRs that change the mechanism for block authoring in a backwards-incompatible way must be tagged with [`F1-breaks_authoring`](https://github.com/paritytech/substrate/labels/F1-breaks_authoring).
-13. PRs that "break everything" must be tagged with [`F0-breaks_everything`](https://github.com/paritytech/substrate/labels/F0-breaks_everything).
-14. PRs should be categorized into projects.
-15. No PR should be merged until all reviews' comments are addressed and CI is successful.
-
-**Noting relevant changes:**
-
-When breaking APIs, it should be mentioned on what was changed in the PR description alongside some examples on how to change the code to make it work/compile.
-
-The PR description should also mention potential storage migrations and if they require some special setup aside adding it to the list of migrations in the runtime.
-
-**Reviewing pull requests:**
-
-When reviewing a pull request, the end-goal is to suggest useful changes to the author. Reviews should finish with approval unless there are issues that would result in:
-
-1. Buggy behavior.
-2. Undue maintenance burden.
-3. Breaking with house coding style.
-4. Pessimization (i.e. reduction of speed as measured in the projects benchmarks).
-5. Feature reduction (i.e. it removes some aspect of functionality that a significant minority of users rely on).
-6. Uselessness (i.e. it does not strictly add a feature or fix a known issue).
-
-**Reviews may not be used as an effective veto for a PR because**:
-
-1. There exists a somewhat cleaner/better/faster way of accomplishing the same feature/fix.
-2. It does not fit well with some other contributors' longer-term vision for the project.
-
-### Updating Polkadot as well
-
-***All pull requests will be checked against either Polkadot master, or your provided Polkadot companion PR***. That is, If your PR changes the external APIs or interfaces used by Polkadot. If you tagged the PR with `breaksapi` or `breaksconsensus` this is most certainly the case, in all other cases check for it by running step 1 below.
-
-To create a Polkadot companion PR:
-
-1. Pull latest Polkadot master (or clone it, if you haven’t yet).
-2. Override substrate deps to point to your local path or branch using https://github.com/bkchr/diener. (E.g. from the Polkadot clone dir run `diener patch --crates-to-patch ../substrate --substrate` assuming substrate clone is in a sibling dir. If you do use diener, ensure that you _do not_ commit the changes diener makes to the Cargo.tomls.)
-3. Make the changes required and build Polkadot locally.
-4. Submit all this as a PR against the Polkadot Repo.
-5. In the _description_ of your _Substrate_ PR add "Polkadot companion: [Polkadot_PR_URL]"
-6. Now you should see that the `check_polkadot` CI job will build your Substrate PR against the mentioned Polkadot branch in your PR description.
-7. Someone will need to approve the Polkadot PR before the Substrate CI will go green. (The Polkadot CI failing can be ignored as long as the Polkadot job in the _substrate_ PR is green).
-8. Wait for reviews on both the Substrate and the Polkadot PRs.
-9. Once the Substrate PR runs green, a member of the `parity` Github group can comment on the Substrate PR with `bot merge` which will:
-   * Merge the Substrate PR.
-   * The bot will push a commit to the Polkadot PR updating its Substrate reference. (effectively doing `cargo update -p sp-io`)
-   * If the Polkadot PR origins from a fork then a project member may need to press `approve run` on the Polkadot PR.
-   * The bot will merge the Polkadot PR once all its CI `{"build_allow_failure":false}` checks are green.
-       Note: The merge-bot currently doesn’t work with forks on org accounts, only individual accounts.
-   	(Hint: it’s recommended to use `bot merge` to merge all substrate PRs, not just ones with a Polkadot companion.)
-
-If your PR is reviewed well, but a Polkadot PR is missing, signal it with [`E6-needs_polkadot_pr`](https://github.com/paritytech/substrate/labels/E6-needs_polkadot_pr) to prevent it from getting automatically merged. In most cases the CI will add this label automatically.
-
-As there might be multiple pending PRs that might conflict with one another, a) you should not merge the substrate PR until the Polkadot PR has also been reviewed and b) both should be merged pretty quickly after another to not block others.
-
-## Helping out
-
-We use [labels](https://paritytech.github.io/labels/doc_substrate.html) to manage PRs and issues and communicate state of a PR. Please familiarize yourself with them. The best way to get started is to a pick a ticket tagged [`easy`](https://github.com/paritytech/substrate/issues?q=is%3Aissue+is%3Aopen+label%3AZ1-easy) or [`medium`](https://github.com/paritytech/substrate/issues?q=is%3Aissue+is%3Aopen+label%3AZ2-medium) and get going or [`mentor`](https://github.com/paritytech/substrate/issues?q=is%3Aissue+is%3Aopen+label%3AZ6-mentor) and get in contact with the mentor offering their support on that larger task.
-
-## Issues
-Please label issues with the following labels:
-
-1. `I-**` or `J-**` Issue severity and type. EXACTLY ONE REQUIRED.
-2. `U-*` Issue urgency, suggesting in what time manner does this issue need to be resolved. AT MOST ONE ALLOWED.
-3. `Z-*` Issue difficulty. AT MOST ONE ALLOWED.
-
-## Releases
-
-Declaring formal releases remains the prerogative of the project maintainer(s).
-
-## UI tests
-
-UI tests are used for macros to ensure that the output of a macro doesn’t change and is in the expected format. These UI tests are sensible to any changes
-in the macro generated code or to switching the rust stable version. The tests are only run when the `RUN_UI_TESTS` environment variable is set. So, when
-the CI is for example complaining about failing UI tests and it is expected that they fail these tests need to be executed locally. To simplify the updating
-of the UI test output there is the `.maintain/update-rust-stable.sh` script. This can be run with `.maintain/update-rust-stable.sh CURRENT_STABLE_VERSION`
-and then it will run all UI tests to update the expected output.
-
-## Changes to this arrangement
-
-This is an experiment and feedback is welcome! This document may also be subject to pull-requests or changes by contributors where you believe you have something valuable to add or change.
-
-## Heritage
-
-These contributing guidelines are modified from the "OPEN Open Source Project" guidelines for the Level project: https://github.com/Level/community/blob/master/CONTRIBUTING.md
diff --git a/substrate/docs/DOCUMENTATION_GUIDELINES.md b/substrate/docs/DOCUMENTATION_GUIDELINES.md
deleted file mode 100644
index 0f83f5e6445d5e6606f70dd4e0822ef8ee1e4e0b..0000000000000000000000000000000000000000
--- a/substrate/docs/DOCUMENTATION_GUIDELINES.md
+++ /dev/null
@@ -1,264 +0,0 @@
-# Substrate Documentation Guidelines
-
-This document is only focused on documenting parts of substrate that relates to its external API. The list of such crates can be found in [CODEOWNERS](./CODEOWNERS). Search for the crates that are auto-assigned to a team called `docs-audit`.
-
-These are crates that are often used by external developers and need more thorough documentation. These are the crates most concerned with FRAME development.
-
-- [Substrate Documentation Guidelines](#substrate-documentation-guidelines)
-  - [General/Non-Pallet Crates](#generalnon-pallet-crates)
-    - [What to Document?](#what-to-document)
-      - [Rust Docs vs. Code Comments](#rust-docs-vs-code-comments)
-    - [How to Document?](#how-to-document)
-      - [TLDR](#tldr)
-      - [Proc-Macros](#proc-macros)
-    - [Other Guidelines](#other-guidelines)
-      - [Document Through Code](#document-through-code)
-      - [Formatting Matters](#formatting-matters)
-  - [Pallet Crates](#pallet-crates)
-    - [Top Level Pallet Docs (`lib.rs`)](#top-level-pallet-docs-librs)
-      - [Polkadot and Substrate](#polkadot-and-substrate)
-    - [Dispatchables](#dispatchables)
-    - [Storage Items](#storage-items)
-    - [Errors and Events](#errors-and-events)
-
-
-## General/Non-Pallet Crates
-
-First, consider the case for all such crates, except for those that are pallets.
-
-### What to Document?
-
-The first question is, what should you document? Use the following filter:
-
-1. In the crates assigned to `docs-audit` in [CODEOWNERS](./CODEOWNERS),
-2. All `pub` item need to be documented. If it is not `pub`, it does not appear in the rust-docs, and is not public facing.
-    * Within `pub` items, sometimes they are only `pub` in order to be used by another internal crate, and you can foresee that this will not be used by anyone else other than you. These need **not** be documented thoroughly, and are left to your discretion to identify.
-    * Reminder: `trait` items are public by definition, if the trait is public.
-3. All public modules (`mod`) should have reasonable module-level documentation (`//!`).
-
-
-#### Rust Docs vs. Code Comments
-
-Note that anything starting with `///` is an external rust-doc, and everything starting with `//` does not appear in the rust-docs. It's important to not confuse the two in your documentation.
-
-```rust
-/// Computes the square root of the input, returning `Ok(_)` if successful.
-///
-/// # Errors
-/// ...
-///
-// Details about the complexity, how you implemented this, and some quirks that
-// are NOT relevant to the external interface, so it starts with '//'.
-// This can also be moved inside the function.
-pub fn sqrt(x: u32) -> Result<u32, ()> {
-    todo!();
-}
-```
-
-### How to Document?
-
-There are a few very good sources that you can look into:
-
-- https://doc.rust-lang.org/rustdoc/how-to-write-documentation.html
-- https://web.mit.edu/rust-lang_v1.25/arch/amd64_ubuntu1404/share/doc/rust/html/book/first-edition/documentation.html
-- https://blog.guillaume-gomez.fr/articles/2020-03-12+Guide+on+how+to+write+documentation+for+a+Rust+crate
-
-As mentioned [here](https://web.mit.edu/rust-lang_v1.25/arch/amd64_ubuntu1404/share/doc/rust/html/book/first-edition/documentation.html#writing-documentation-comments) and [here](https://blog.guillaume-gomez.fr/articles/2020-03-12+Guide+on+how+to+write+documentation+for+a+Rust+crate), always start with a **single sentence** demonstrating what is being documented. All additional documentation should be added *after a newline*. Strive to make the first sentence succinct and short. The reason for this is the first paragraph of docs about an item (everything before the first newline) is used as the excerpt that rust doc displays about this item when it appears in tables, such as the table listing all functions in a module. If this excerpt is too long, the module docs will be very difficult to read.
-
-About [special sections](https://web.mit.edu/rust-lang_v1.25/arch/amd64_ubuntu1404/share/doc/rust/html/book/first-edition/documentation.html#special-sections), we will most likely not need to think about panic and safety in any runtime related code. Our code is never `unsafe`, and will (almost) never panic.
-
-Use `# Examples as much as possible. These are great ways to further demonstrate what your APIs are doing, and add free test coverage. As an additional benefit, any code in rust-docs is treated as an "integration tests", not unit tests, which tests your crate in a different way than unit tests. So, it is both a win for "more documentation" and a win for "more test coverage".
-
-You can also consider having an `# Error` section optionally. Of course, this only applies if there is a `Result` being returned, and if the `Error` variants are overly complicated.
-
-Strive to include correct links to other items in your written docs as much as possible. In other words, avoid `` `some_func` `` and instead use ``[`some_func`]``.
-Read more about how to correctly use links in your rust-docs [here](https://doc.rust-lang.org/rustdoc/write-documentation/linking-to-items-by-name.html#valid-links) and [here](https://rust-lang.github.io/rfcs/1946-intra-rustdoc-links.html#additions-to-the-documentation-syntax).
-
-
-> While you are linking, you might become conscious of the fact that you are in need of linking to (too many) foreign items in order to explain your API. This is leaning more towards API-Design rather than documentation, but it is a warning that the subject API might be slightly wrong. For example, most "glue" traits[^1] in `frame/support` should be designed and documented without making hard assumptions about particular pallets that implement them.
-
-#### TLDR
-
-0. Have the goal of enforcing `#![deny(missing_docs)]` mentally, even if it is not enforced by the compiler 🙈.
-1. Start with a single, clear and concise sentence. Follow up with more context, after a newline, if needed.
-2. Use examples as much as reasonably possible.
-3. Use links as much as possible.
-4. Think about context. If you are explaining a lot of foreign topics while documenting a trait that should not explicitly depend on them, you have likely not designed it properly.
-
-#### Proc-Macros
-
-Note that there are special considerations when documenting proc macros. Doc links will appear to function _within_ your proc macro crate, but often will no longer function when these proc macros are re-exported elsewhere in your project. The exception is doc links to _other proc macros_ which will function just fine if they are also being re-exported. It is also often necessary to disambiguate between a proc macro and a function of the same name, which can be done using the `macro@my_macro_name` syntax in your link. Read more about how to correctly use links in your rust-docs [here](https://doc.rust-lang.org/rustdoc/write-documentation/linking-to-items-by-name.html#valid-links) and [here](https://rust-lang.github.io/rfcs/1946-intra-rustdoc-links.html#additions-to-the-documentation-syntax).
-
-
-### Other Guidelines
-
-The above five guidelines must always be reasonably respected in the documentation.
-
-The following are a set of notes that may not necessarily hold in all circumstances:
-
-
-#### Document Through Code
-
-You should make sure that your code is properly-named and well-organized so that your code functions as a form of documentation. However, within the complexity of our projects in Polkadot/Substrate that is not enough. Particularly, things like examples, errors and panics cannot be documented only through properly-named and well-organized code.
-
-> Our north star is self-documenting code that also happens to be well-documented and littered with examples.
-
-
-* Your written documents should *complement* the code, not *repeat* it. As an example, a documentation on top of a code example should never look like the following:
-
- ```rust
- /// Sends request and handles the response.
- trait SendRequestAndHandleResponse {
-
- }
- ```
-
-In the above example, the documentation has added no useful information not already contained within the properly-named trait and is redundant.
-
-
-#### Formatting Matters
-
-The way you format your documents (newlines, heading and so on) makes a difference. Consider the below examples:
-
-```rust
-/// This function works with input u32 x and multiplies it by two. If
-/// we optimize the other variant of it, we would be able to achieve more
-/// efficiency but I have to think about it. Probably can panic if the input
-/// overflows u32.
-fn multiply_by_2(x: u32) -> u32 { .. }
-```
-
-```rust
-/// Multiplies an input of type [`u32`] by two.
-///
-/// # Panics
-///
-/// Panics if the input overflows.
-///
-/// # Complexity
-///
-/// Is implemented using some algorithm that yields complexity of O(1).
-// More efficiency can be achieved if we improve this via such and such.
-fn multiply_by_2(x: u32) -> u32 { .. }
-```
-
-They are both roughly conveying the same set of facts, but one is easier to follow because it was formatted cleanly. Especially for traits and types that you can foresee will be seen and used a lot, try and write a well formatted version.
-
-Similarly, make sure your comments are wrapped at 100 characters line-width (as defined by our [`rustfmt.toml`](../rustfmt.toml)), no **more and no less**! The more is fixed by `rustfmt` and our CI, but if you (for some unknown reason) wrap your lines at 59 characters, it will pass the CI, and it will not look good 🫣. Consider using a plugin like [rewrap](https://marketplace.visualstudio.com/items?itemName=stkb.rewrap) (for Visual Studio Code) to properly do this.
-
-[^1]: Those that help two pallets talk to each other.
-
-## Pallet Crates
-
-The guidelines so far have been general in nature, and are applicable to crates that are pallets and crates that're not pallets.
-
-The following is relevant to how to document parts of a crate that is a pallet. See [`pallet-fast-unstake`](../frame/fast-unstake/src/lib.rs) as one examples of adhering these guidelines.
-
-### Top Level Pallet Docs (`lib.rs`)
-
-For the top-level pallet docs, consider the following template:
-
-```
-//! # <Pallet Name>
-//!
-//! <single-liner about the pallet>.
-//!
-//! ## Overview
-//!
-//! <should be high-level details that are relevant to the most broad audience>
-//!
-//! <The audience here is potentially non-coders who just want to know what this pallet does, not how it does it>
-//!
-//! <potentially a few paragraphs, focus on what external folks should know about the pallet>
-//!
-//! ### Example
-//!
-//! <Your pallet must have a few tests that cover important user journeys. Use https://crates.io/crates/docify to reuse these as examples>.
-//!
-//! ## Pallet API
-//!
-//! <Reminder: inside the [`pallet`] module, a template that leads the reader to the relevant items is auto-generated. There is no need to repeat things like "See Config trait for ...", which are generated inside [`pallet`] here anyways. You can use the below line as-is:>
-//!
-//! See the [`pallet`] module for more information about the interfaces this pallet exposes, including its configuration trait, dispatchables, storage items, events and errors.
-//!
-//! <The audience of this is those who want to know how this pallet works, to the extent of being able to build something on top of it, like a DApp or another pallet>
-//!
-//! This section can most often be left as-is.
-//!
-//! ## Low Level / Implementation Details
-//!
-//! <The format of this section is up to you, but we suggest the Design-oriented approach that follows>
-//!
-//! <The audience of this would be your future self, or anyone who wants to gain a deep understanding of how the pallet works so that they can eventually propose optimizations to it>
-//!
-//! ### Design Goals (optional)
-//!
-//! <Describe your goals with the pallet design.>
-//!
-//! ### Design (optional)
-//!
-//! <Describe how you've reached those goals. This should describe the storage layout of your pallet and what was your approach in designing it that way.>
-//!
-//! ### Terminology (optional)
-//!
-//! <Optionally, explain any non-obvious terminology here. You can link to it if you want to use the terminology further up>
-```
-
-This template's details (heading 3s and beyond) are left flexible, and at the discretion of the developer to make the best final choice about. For example, you might want to include `### Terminology` or not. Moreover, you might find it more useful to include it in `## Overview`.
-
-Nonetheless, the high level flow of going from the most high level explanation to the most low level explanation is important to follow.
-
-As a rule of thumb, the Heading 2s (`##`) in this template can be considered a strict rule, while the Heading 3s (`###`) and beyond are flexible.
-
-#### Polkadot and Substrate
-
-Optionally, in order to demonstrate the relation between the two, you can start the pallet documentation with:
-
-```
-//! > Made with *Substrate*, for *Polkadot*.
-//!
-//! [![github]](https://github.com/paritytech/substrate/frame/fast-unstake) -
-//! [![polkadot]](https://polkadot.network)
-//!
-//! [polkadot]: https://img.shields.io/badge/polkadot-E6007A?style=for-the-badge&logo=polkadot&logoColor=white
-//! [github]: https://img.shields.io/badge/github-8da0cb?style=for-the-badge&labelColor=555555&logo=github
-```
-
-### Dispatchables
-
-For each dispatchable (`fn` item inside `#[pallet::call]`), consider the following template:
-
-```
-/// <One-liner explaining what the dispatchable does>
-///
-/// ## Dispatch Origin
-///
-/// The dispatch origin of this call must be <details (e.g. Root, Signed, Unsigned)>
-///
-/// ## Details
-///
-/// <All other details, namely any errors that could occur within this dispatch and the events this dispatch could emit>
-///
-/// ## Errors (optional)
-///
-/// <If an extensive list of errors can be returned, list them individually instead of mentioning them in the section above>
-///
-/// ## Events (optional)
-///
-/// <Events are akin to the "return type" of dispatchables, optionally mention them>
-pub fn name_of_dispatchable(origin: OriginFor<T>, ...) -> DispatchResult {}
-```
-
-Consider the fact that these docs will be part of the metadata of the associated dispatchable, and might be used by wallets and explorers.
-
-### Storage Items
-
-1. If a map-like type is being used, always note the choice of your hashers as private code docs (`// Hasher X chosen because ...`). Recall that this is not relevant information to external people, so it must be documented as `//`.
-2. Consider explaining the crypto-economics of how a deposit is being taken in return of the storage being used.
-3. Consider explaining why it is safe for the storage item to be unbounded, if `#[pallet::unbounded]` or `#[pallet::without_storage_info]` is being used.
-
-### Errors and Events
-
-Consider the fact that, similar to dispatchables, these docs will be part of the metadata of the associated event/error, and might be used by wallets and explorers.
-
-Specifically for `error`, explain why the error has happened, and what can be done in order to avoid it.
diff --git a/substrate/docs/PULL_REQUEST_TEMPLATE.md b/substrate/docs/PULL_REQUEST_TEMPLATE.md
deleted file mode 100644
index d2bb22f6e245a31ca7a9392b424a6ef38cc27cbd..0000000000000000000000000000000000000000
--- a/substrate/docs/PULL_REQUEST_TEMPLATE.md
+++ /dev/null
@@ -1,35 +0,0 @@
-
-
-✄ -----------------------------------------------------------------------------
-
-Thank you for your Pull Request! 🙏 Please make sure it follows the contribution guidelines outlined in [this document](https://github.com/paritytech/substrate/blob/master/docs/CONTRIBUTING.md) and fill out the sections below. Once you're ready to submit your PR for review, please delete this section and leave only the text under the "Description" heading.
-
-# Description
-
-*Please include a summary of the changes and the related issue. Please also include relevant motivation and context, including:*
-
-- What does this PR do?
-- Why are these changes needed?
-- How were these changes implemented and what do they affect?
-
-*Use [Github semantic linking](https://docs.github.com/en/issues/tracking-your-work-with-issues/linking-a-pull-request-to-an-issue#linking-a-pull-request-to-an-issue-using-a-keyword) to address any open issues this PR relates to or closes.*
-
-Fixes # (issue number, *if applicable*) 
-
-Closes # (issue number, *if applicable*) 
-
-Polkadot companion: (*if applicable*)
-
-Cumulus companion: (*if applicable*)
-
-# Checklist
-
-- [ ] My PR includes a detailed description as outlined in the "Description" section above
-- [ ] My PR follows the [labeling requirements](https://github.com/paritytech/substrate/blob/master/docs/CONTRIBUTING.md#merge-process) of this project (at minimum one label for each `A`, `B`, `C` and `D` required)
-- [ ] I have made corresponding changes to the documentation (if applicable)
-- [ ] I have added tests that prove my fix is effective or that my feature works (if applicable)
-- [ ] If this PR alters any external APIs or interfaces used by Polkadot, the corresponding Polkadot PR is ready as well as the corresponding Cumulus PR (optional)
-
-You can remove the "Checklist" section once all have been checked. Thank you for your contribution!
-
-✄ -----------------------------------------------------------------------------
diff --git a/substrate/docs/README.adoc b/substrate/docs/README.adoc
deleted file mode 100644
index 3537e346a66e1697004f2e114491c03b51ffd356..0000000000000000000000000000000000000000
--- a/substrate/docs/README.adoc
+++ /dev/null
@@ -1,522 +0,0 @@
-= Substrate
-:Author: Substrate developers
-:Revision: 0.2.0
-:toc:
-:sectnums:
-
-== Intro in one sentence
-
-Substrate is a next-generation framework for blockchain innovation.
-
-== Description
-
-At its heart, Substrate is a combination of three technologies: https://webassembly.org/[WebAssembly], https://libp2p.io/[Libp2p] and GRANDPA Consensus. About GRANDPA, see this https://hackmd.io/Jd0byWX0RiqFiXUVC78Bdw?view#GRANDPA[definition], https://medium.com/polkadot-network/grandpa-block-finality-in-polkadot-an-introduction-part-1-d08a24a021b5[introduction] and https://github.com/w3f/consensus/blob/master/pdf/grandpa.pdf[formal specification]. It is both a library for building new blockchains and a "skeleton key" of a blockchain client, able to synchronize to any Substrate-based chain.
-
-Substrate chains have three distinct features that make them "next-generation": a dynamic, self-defining state-transition function; light-client functionality from day one; and a progressive consensus algorithm with fast block production and adaptive, definite finality. The STF, encoded in WebAssembly, is known as the "runtime". This defines the `execute_block` function, and can specify everything from the staking algorithm, transaction semantics, logging mechanisms and procedures for replacing any aspect of itself or of the blockchain's state ("governance"). Because the runtime is entirely dynamic all of these can be switched out or upgraded at any time. A Substrate chain is very much a "living organism".
-
-See also https://www.parity.io/what-is-substrate/.
-
-== Usage
-
-Substrate is still an early stage project, and while it has already been used as the basis of major projects like Polkadot, using it is still a significant undertaking. In particular, you should have a good knowledge of blockchain concepts and basic cryptography. Terminology like header, block, client, hash, transaction and signature should be familiar. At present you will need a working knowledge of Rust to be able to do anything interesting (though eventually, we aim for this not to be the case).
-
-Substrate is designed for use in one of three ways:
-
-**1. Trivial**: By running the Substrate binary `substrate` and configuring it with a genesis block that includes the current demonstration runtime. In this case, you just build Substrate, configure a JSON file, and launch your own blockchain. This affords you the least amount of customizability, primarily allowing you to change the genesis parameters of the various included runtime modules such as balances, staking, block-period, fees, and governance.
-
-**2. Modular**: By hacking together pallets built with Substrate FRAME into a new runtime and possibly altering or reconfiguring the Substrate client's block authoring logic. This affords you a very large amount of freedom over your blockchain's logic, letting you change data types, add or remove modules, and crucially, add your own modules. Much can be changed without touching the block authoring logic (since it is generic). If this is the case, then the existing Substrate binary can be used for block authoring and syncing. If the block authoring logic needs to be tweaked, then a new, altered block authoring binary must be built as a separate project and used by validators. This is how the Polkadot relay chain is built and should suffice for almost all circumstances in the near to mid-term.
-
-**3. Generic**: The entire FRAME can be ignored and the entire runtime designed and implemented from scratch. If desired, this can be done in a language other than Rust, provided it can target WebAssembly. If the runtime can be made compatible with the existing client's block authoring logic, then you can simply construct a new genesis block from your Wasm blob and launch your chain with the existing Rust-based Substrate client. If not, then you'll need to alter the client's block authoring logic accordingly. This is probably a useless option for most projects right now, but provides complete flexibility allowing for a long-term, far-reaching upgrade path for the Substrate paradigm.
-
-=== The Basics of Substrate
-
-Substrate is a blockchain platform with a completely generic state transition function. That said, it does come with both standards and conventions (particularly regarding the Runtime Module Library) regarding underlying data structures. Roughly speaking, these core data types correspond to +trait+s in terms of the actual non-negotiable standard and generic +struct+s in terms of the convention.
-
-```
-Header := Parent + ExtrinsicsRoot + StorageRoot + Digest
-Block := Header + Extrinsics + Justifications
-```
-
-=== Extrinsics
-
-Extrinsics in Substrate are pieces of information from "the outside world" that are contained in the blocks of the chain. You might think "ahh, that means *transactions*": in fact, no. Extrinsics fall into two broad categories of which only one is *transactions*. The other is known as *inherents*. The difference between these two is that transactions are signed and gossiped on the network and can be deemed useful *per se*. This fits the mold of what you would call transactions in Bitcoin or Ethereum.
-
-Inherents, meanwhile, are not passed on the network and are not signed. They represent data which describes the environment but which cannot call upon anything to prove it such as a signature. Rather they are assumed to be "true" simply because a sufficiently large number of validators have agreed on them being reasonable.
-
-To give an example, there is the timestamp inherent, which sets the current timestamp of the block. This is not a fixed part of Substrate, but does come as part of FRAME to be used as desired. No signature could fundamentally prove that a block were authored at a given time in quite the same way that a signature can "prove" the desire to spend some particular funds. Rather, it is the business of each validator to ensure that they believe the timestamp is set to something reasonable before they agree that the block candidate is valid.
-
-Other examples include the parachain-heads extrinsic in Polkadot and the "note-missed-proposal" extrinsic used in FRAME to determine and punish or deactivate offline validators.
-
-
-=== Runtime and API
-
-Substrate chains all have a runtime. The runtime is a WebAssembly "blob" that includes a number of entry-points. Some entry-points are required as part of the underlying Substrate specification. Others are merely convention and required for the default implementation of the Substrate client to be able to author blocks.
-
-If you want to develop a chain with Substrate, you will need to implement the `Core` trait. This `Core` trait generates an API with the minimum necessary functionality to interact with your runtime. A special macro is provided called `impl_runtime_apis!` that help you implement runtime API traits. All runtime API trait implementations need to be done in one call of the `impl_runtime_apis!` macro. All parameters and return values need to implement https://crates.io/crates/parity-codec[`parity-codec`] to be encodable and decodable.
-
-Here's a snippet of the Polkadot API implementation as of PoC-3:
-
-```rust
-impl_runtime_apis! {
-	impl client_api::Core<Block> for Runtime {
-		fn version() -> RuntimeVersion {
-			VERSION
-		}
-
-		fn execute_block(block: Block) {
-			Executive::execute_block(block)
-		}
-
-		fn initialize_block(header: <Block as BlockT>::Header) {
-			Executive::initialize_block(&header)
-		}
-	}
-	// ---snip---
-}
-```
-
-
-=== Inherent Extrinsics
-
-Substrate FRAME includes functionality for timestamps and slashing. If used, these rely on "trusted" external information being passed in via inherent extrinsics. The Substrate reference block authoring client software will expect to be able to call into the runtime API with collated data (in the case of the reference Substrate authoring client, this is merely the current timestamp and which nodes were offline) in order to return the appropriate extrinsics ready for inclusion. If new inherent extrinsic types and data are to be used in a modified runtime, then it is this function (and its argument type) that would change.
-
-=== Block-authoring Logic
-
-In Substrate, there is a major distinction between blockchain *syncing* and block *authoring* ("authoring" is a more general term for what is called "mining" in Bitcoin). The first case might be referred to as a "full node" (or "light node" - Substrate supports both): authoring necessarily requires a synced node and, therefore, all authoring clients must necessarily be able to synchronize. However, the reverse is not true. The primary functionality that authoring nodes have which is not in "sync nodes" is threefold: transaction queue logic, inherent transaction knowledge and BFT consensus logic. BFT consensus logic is provided as a core element of Substrate and can be ignored since it is only exposed in the SDK under the `authorities()` API entry.
-
-Transaction queue logic in Substrate is designed to be as generic as possible, allowing a runtime to express which transactions are fit for inclusion in a block through the `initialize_block` and `apply_extrinsic` calls. However, more subtle aspects like prioritization and replacement policy must currently be expressed "hard coded" as part of the blockchain's authoring code. That said, Substrate's reference implementation for a transaction queue should be sufficient for an initial chain implementation.
-
-Inherent extrinsic knowledge is again somewhat generic, and the actual construction of the extrinsics is, by convention, delegated to the "soft code" in the runtime. If ever there needs to be additional extrinsic information in the chain, then both the block authoring logic will need to be altered to provide it into the runtime and the runtime's `inherent_extrinsics` call will need to use this extra information in order to construct any additional extrinsic transactions for inclusion in the block.
-
-== Roadmap
-
-=== So far
-
-- 0.1 "PoC-1": PBFT consensus, Wasm runtime engine, basic runtime modules.
-- 0.2 "PoC-2": Libp2p
-
-=== In progress
-
-- AfG consensus
-- Improved PoS
-- Smart contract runtime module
-
-=== The future
-
-- Splitting out runtime modules into separate repo
-- Introduce substrate executable (the skeleton-key runtime)
-- Introduce basic but extensible transaction queue and block-builder and place them in the executable.
-- DAO runtime module
-- Audit
-
-== Trying out Substrate Node
-
-Substrate Node is Substrate's pre-baked blockchain client. You can run a development node locally or configure a new chain and launch your own global testnet.
-
-=== On Mac and Ubuntu
-
-To get going as fast as possible, there is a simple script that installs all required dependencies and installs Substrate into your path. Just open a terminal and run:
-
-[source, shell]
-----
-curl https://getsubstrate.io -sSf | bash
-----
-
-You can start a local Substrate development chain with running `substrate --dev`.
-
-To create your own global network/cryptocurrency, you'll need to make a new Substrate Node chain specification file ("chainspec").
-
-First let's get a template chainspec that you can edit. We'll use the "staging" chain, a sort of default chain that the node comes pre-configured with:
-
-[source, shell]
-----
-substrate build-spec --chain=staging > ~/chainspec.json
-----
-
-Now, edit `~/chainspec.json` in your editor. There are a lot of individual fields for each module, and one very large one which contains the WebAssembly code blob for this chain. The easiest field to edit is the block `period`. Change it to 10 (seconds):
-
-[source, json]
-----
-     "timestamp": {
-        "minimumPeriod": 10
-      },
-----
-
-Now with this new chainspec file, you can build a "raw" chain definition for your new chain:
-
-[source, shell]
-----
-substrate build-spec --chain ~/chainspec.json --raw > ~/mychain.json
-----
-
-This can be fed into Substrate:
-
-[source, shell]
-----
-substrate --chain ~/mychain.json
-----
-
-It won't do much until you start producing blocks though, so to do that you'll need to use the `--validator` option together with passing the seed for the account(s) that is configured to be the initial authorities:
-
-[source, shell]
-----
-substrate --chain ~/mychain.json --validator
-----
-
-You can distribute `mychain.json` so that everyone can synchronize and (depending on your authorities list) validate on your chain.
-
-
-== Building
-
-=== Hacking on Substrate
-
-If you'd actually like to hack on Substrate, you can just grab the source code and
-build it. Ensure you have Rust and the support software installed:
-
-==== Linux and Mac
-
-For Unix-based operating systems, you should run the following commands:
-
-[source, shell]
-----
-curl https://sh.rustup.rs -sSf | sh
-
-rustup update nightly
-rustup target add wasm32-unknown-unknown --toolchain nightly
-rustup update stable
-----
-
-You will also need to install the following packages:
-
- - Linux:
-[source, shell]
-sudo apt install cmake pkg-config libssl-dev git clang libclang-dev llvm
-
-- Linux on ARM:
-`rust-lld` is required for linking wasm, but is missing on non Tier 1 platforms.
-So, use this https://github.com/Plume-org/Plume/blob/master/script/wasm-deps.sh[script]
-to build `lld` and create the symlink `/usr/bin/rust-lld` to the build binary.
-
- - Mac:
-[source, shell]
-brew install cmake pkg-config openssl git llvm
-
-To finish installation of Substrate, jump down to <<shared-steps,shared steps>>.
-
-==== Windows
-
-If you are trying to set up Substrate on Windows, you should do the following:
-
-1. First, you will need to download and install "Build Tools for Visual Studio:"
-
-    * You can get it at this link: https://aka.ms/buildtools
-    * Run the installation file: `vs_buildtools.exe`
-    * Please ensure the Windows 10 SDK component is included when installing the Visual C++ Build Tools.
-    * image:https://i.imgur.com/zayVLmu.png[image]
-    * Restart your computer.
-
-2. Next, you need to install Rust:
-
-    * Detailed instructions are provided by the https://doc.rust-lang.org/book/ch01-01-installation.html#installing-rustup-on-windows[Rust Book].
-        * Download from: https://www.rust-lang.org/tools/install
-        * Run the installation file: `rustup-init.exe`
-        > Note that it should not prompt you to install vs_buildtools since you did it in step 1.
-        * Choose "Default Installation."
-        * To get started, you need Cargo's bin directory (%USERPROFILE%\.cargo\bin) in your PATH environment variable. Future applications will automatically have the correct environment, but you may need to restart your current shell.
-
-3. Then, you will need to run some commands in CMD to set up your Wasm Build Environment:
-
-	rustup update nightly
-	rustup update stable
-	rustup target add wasm32-unknown-unknown --toolchain nightly
-
-4. Then, you need to install LLVM: https://releases.llvm.org/download.html
-
-5. Next, you need to install OpenSSL, which we will do with `vcpkg`:
-
-	mkdir \Tools
-	cd \Tools
-	git clone https://github.com/Microsoft/vcpkg.git
-	cd vcpkg
-	.\bootstrap-vcpkg.bat
-	.\vcpkg.exe install openssl:x64-windows-static
-
-6. After, you need to add OpenSSL to your System Variables. Note that in order for the following commands to work, you need to use Windows Powershell:
-
-	$env:OPENSSL_DIR = 'C:\Tools\vcpkg\installed\x64-windows-static'
-	$env:OPENSSL_STATIC = 'Yes'
-	[System.Environment]::SetEnvironmentVariable('OPENSSL_DIR', $env:OPENSSL_DIR, [System.EnvironmentVariableTarget]::User)
-	[System.Environment]::SetEnvironmentVariable('OPENSSL_STATIC', $env:OPENSSL_STATIC, [System.EnvironmentVariableTarget]::User)
-
-7. Finally, you need to install `cmake`: https://cmake.org/download/
-
-==== Docker
-
-You can use https://github.com/paritytech/scripts/tree/master/dockerfiles/ci-linux[Parity CI docker image] with all necessary dependencies to build Substrate:
-
-[source, shell]
-----
-#run it in the folder with the Substrate source code
-docker run --rm -it -w /shellhere/substrate \
-                    -v $(pwd):/shellhere/substrate \
-                    paritytech/ci-linux:production <cargo commands>
-----
-
-You can find necessary cargo commands in <<shared-steps,shared steps>>
-
-==== Shared Steps
-
-Then, grab the Substrate source code:
-
-[source, shell]
-----
-git clone https://github.com/paritytech/substrate.git
-cd substrate
-----
-
-Then build the code:
-
-[source, shell]
-----
-cargo build                 # Builds all native code
-----
-
-You can run all the tests if you like:
-
-[source, shell]
-cargo test --all
-
-Or just run the tests of a specific package (i.e. `cargo test -p pallet-assets`)
-
-You can start a development chain with:
-
-[source, shell]
-cargo run --release -- --dev
-
-Detailed logs may be shown by running the node with the following environment variables set: `RUST_LOG=debug RUST_BACKTRACE=1 cargo run --release \-- --dev`.
-
-If you want to see the multi-node consensus algorithm in action locally, then you can create a local testnet with two validator nodes for Alice and Bob, who are the initial authorities of the genesis chain specification that have been endowed with a testnet DOTs. We'll give each node a name and expose them so they are listed on link:https://telemetry.polkadot.io/#/Local%20Testnet[Telemetry]. You'll need two terminal windows open.
-
-We'll start Alice's Substrate node first on default TCP port 30333 with their chain database stored locally at `/tmp/alice`. The Bootnode ID of Alice's node is `QmRpheLN4JWdAnY7HGJfWFNbfkQCb6tFf4vvA6hgjMZKrR`, which is generated from the `--node-key` value that we specify below:
-
-[source, shell]
-cargo run --release \-- \
-  --base-path /tmp/alice \
-  --chain=local \
-  --alice \
-  --node-key 0000000000000000000000000000000000000000000000000000000000000001 \
-  --telemetry-url 'ws://telemetry.polkadot.io:1024 0' \
-  --validator
-
-In the second terminal, we'll run the following to start Bob's Substrate node on a different TCP port of 30334, and with their chain database stored locally at `/tmp/bob`. We'll specify a value for the `--bootnodes` option that will connect Bob's node to Alice's Bootnode ID on TCP port 30333:
-
-[source, shell]
-cargo run --release \-- \
-  --base-path /tmp/bob \
-  --bootnodes /ip4/127.0.0.1/tcp/30333/p2p/QmRpheLN4JWdAnY7HGJfWFNbfkQCb6tFf4vvA6hgjMZKrR \
-  --chain=local \
-  --bob \
-  --port 30334 \
-  --telemetry-url 'ws://telemetry.polkadot.io:1024 0' \
-  --validator
-
-Additional Substrate CLI usage options are available and may be shown by running `cargo run \-- --help`.
-
-[[flaming-fir]]
-=== Joining the Flaming Fir Testnet
-
-Flaming Fir is the new testnet for Substrate master (2.0) to test the latest development features. Please note that master is not compatible with the BBQ Birch, Charred Cherry, Dried Danta or Emberic Elm testnets. Ensure you have the dependencies listed above before compiling.
-
-Since Flaming Fir is targeting the master branch we make absolutely no guarantees of stability and/or persistence of the network. We might reset the chain at any time if it is necessary to deploy new changes. Currently, the validators are running with a client built from `d013bd900`, if you build from this commit you should be able to successfully sync, later commits may not work as new breaking changes may be introduced in master.
-
-Latest known working version: `a2a0eb5398d6223e531455b4c155ef053a4a3a2b`
-
-[source, shell]
-----
-git clone https://github.com/paritytech/substrate.git
-cd substrate
-git checkout -b flaming-fir a2a0eb5398d6223e531455b4c155ef053a4a3a2b
-----
-
-You can run the tests if you like:
-
-[source, shell]
-cargo test --all
-
-Start your node:
-
-[source, shell]
-cargo run --release \--
-
-To see a list of command line options, enter:
-
-[source, shell]
-cargo run --release \-- --help
-
-For example, you can choose a custom node name:
-
-[source, shell]
-cargo run --release \-- --name my_custom_name
-
-If you are successful, you will see your node syncing at https://telemetry.polkadot.io/#/Flaming%20Fir
-
-=== Joining the Emberic Elm Testnet
-
-Emberic Elm is the testnet for Substrate 1.0. Please note that 1.0 is not compatible with the BBQ Birch, Charred Cherry, Dried Danta or Flaming Fir testnets.
-In order to join the Emberic Elm testnet you should build from the `v1.0` branch. Ensure you have the dependencies listed above before compiling.
-
-[source, shell]
-----
-git clone https://github.com/paritytech/substrate.git
-cd substrate
-git checkout -b v1.0 origin/v1.0
-----
-
-You can then follow the same steps for building and running as described above in <<flaming-fir>>.
-
-== Key management
-
-Keys in Substrate are stored in the keystore in the file system. To store keys into this keystore,
-you need to use one of the two provided RPC calls. If your keys are encrypted or should be encrypted
-by the keystore, you need to provide the key using one of the cli arguments `--password`,
-`--password-interactive` or `--password-filename`.
-
-=== Recommended RPC call
-
-For most users who want to run a validator node, the `author_rotateKeys` RPC call is sufficient.
-The RPC call will generate `N` Session keys for you and return their public keys. `N` is the number
-of session keys configured in the runtime. The output of the RPC call can be used as input for the
-`session::set_keys` transaction.
-
-```
-curl -H 'Content-Type: application/json' --data '{ "jsonrpc":"2.0", "method":"author_rotateKeys", "id":1 }' localhost:9933
-```
-
-=== Advanced RPC call
-
-If the Session keys need to match a fixed seed, they can be set individually key by key. The RPC call
-expects the key seed and the key type. The key types supported by default in Substrate are listed
-https://github.com/paritytech/substrate/blob/master/core/primitives/src/crypto.rs#L767[here], but the
-user can declare any key type.
-
-```
-curl -H 'Content-Type: application/json' --data '{ "jsonrpc":"2.0", "method":"author_insertKey", "params":["KEY_TYPE", "SEED", "PUBLIC"],"id":1 }' localhost:9933
-```
-
-`KEY_TYPE` - needs to be replaced with the 4-character key type identifier.
-`SEED` - is the seed of the key.
-`PUBLIC` - public key for the given key.
-
-== Documentation
-
-=== Viewing documentation for Substrate packages
-
-You can generate documentation for a Substrate Rust package and have it automatically open in your web browser using https://doc.rust-lang.org/rustdoc/what-is-rustdoc.html#using-rustdoc-with-cargo[rustdoc with Cargo],
-(of the The Rustdoc Book), by running the following command:
-
-```
-cargo doc --package <spec> --open
-```
-
-Replacing `<spec>` with one of the following (i.e. `cargo doc --package substrate --open`):
-
-* All Substrate Packages
-[source, shell]
-substrate
-* Substrate Core
-[source, shell]
-substrate, substrate-cli, substrate-client, substrate-client-db,
-substrate-consensus-common, substrate-consensus-rhd,
-substrate-executor, substrate-finality-grandpa, substrate-keyring, substrate-keystore, substrate-network,
-substrate-network-libp2p, substrate-primitives, substrate-rpc, substrate-rpc-servers,
-substrate-serializer, substrate-service, substrate-service-test, substrate-state-db,
-substrate-state-machine, substrate-telemetry, substrate-test-client,
-substrate-test-runtime, substrate-transaction-graph, sp-transaction-pool,
-substrate-trie
-* Substrate Runtime
-[source, shell]
-sr-api, sr-io, sr-primitives, sr-sandbox, sr-std, sr-version
-* FRAME Core
-[source, shell]
-frame-metadata, frame-support, frame-system
-* FRAME Pallets
-[source, shell]
-pallet-assets, pallet-balances, pallet-consensus, pallet-contracts, pallet-council, pallet-democracy, pallet-example,
-frame-executive,  pallet-session, pallet-staking, pallet-timestamp, pallet-treasury
-* Node
-[source, shell]
-node-cli, node-consensus, node-executor, node-network, node-primitives, kitchensink-runtime
-* Subkey
-[source, shell]
-subkey
-
-=== Contributing to documentation for Substrate packages
-
-https://doc.rust-lang.org/1.9.0/book/documentation.html[Document source code] for Substrate packages by annotating the source code with documentation comments.
-
-Example (generic):
-```markdown
-/// Summary
-///
-/// Description
-///
-/// # Panics
-///
-/// # Errors
-///
-/// # Safety
-///
-/// # Examples
-///
-/// Summary of Example 1
-///
-/// ```rust
-/// // insert example 1 code here
-/// ```
-///
-```
-
-* Important notes:
-** Documentation comments must use annotations with a triple slash `///`
-** Modules are documented using `//!`
-```
-//! Summary (of module)
-//!
-//! Description (of module)
-```
-* Special section header is indicated with a hash `#`.
-** `Panics` section requires an explanation if the function triggers a panic
-** `Errors` section is for describing conditions under which a function of method returns `Err(E)` if it returns a `Result<T, E>`
-** `Safety` section requires an explanation if the function is `unsafe`
-** `Examples` section includes examples of using the function or method
-* Code block annotations for examples are included between triple graves, as shown above.
-Instead of including the programming language to use for syntax highlighting as the annotation
-after the triple graves, alternative annotations include the `ignore`, `text`, `should_panic`, or `no_run`.
-* Summary sentence is a short high level single sentence of its functionality
-* Description paragraph is for details additional to the summary sentence
-* Missing documentation annotations may be used to identify where to generate warnings with `#![warn(missing_docs)]`
-or errors `#![deny(missing_docs)]`
-* Hide documentation for items with `#[doc(hidden)]`
-
-=== Contributing to documentation (tests, extended examples, macros) for Substrate packages
-
-The code block annotations in the `# Example` section may be used as https://doc.rust-lang.org/1.9.0/book/documentation.html#documentation-as-tests[documentation as tests and for extended examples].
-
-* Important notes:
-** Rustdoc will automatically add a `main()` wrapper around the code block to test it
-** https://doc.rust-lang.org/1.9.0/book/documentation.html#documenting-macros[Documenting macros].
-** Documentation as tests examples are included when running `cargo test`
-
-== Contributing
-
-=== Contributing Guidelines
-
-include::CONTRIBUTING.md[]
-
-=== Contributor Code of Conduct
-
-include::CODE_OF_CONDUCT.md[]
-
-== License
-
-https://github.com/paritytech/substrate/blob/master/LICENSE[LICENSE]
diff --git a/substrate/docs/SECURITY.md b/substrate/docs/SECURITY.md
index 19f5b145feb5eb30447c0f8755aa19cabb081570..0d2064863d85c885448f2caea9a113e663d61598 100644
--- a/substrate/docs/SECURITY.md
+++ b/substrate/docs/SECURITY.md
@@ -1,11 +1,14 @@
 <!-- markdown-link-check-disable -->
 # Security Policy
 
-Parity Technologies is committed to resolving security vulnerabilities in our software quickly and carefully. We take the necessary steps to minimize risk, provide timely information, and deliver vulnerability fixes and mitigations required to address security issues.
+Parity Technologies is committed to resolving security vulnerabilities in our software quickly and carefully. We take
+the necessary steps to minimize risk, provide timely information, and deliver vulnerability fixes and mitigations
+required to address security issues.
 
 ## Reporting a Vulnerability
 
-Security vulnerabilities in Parity software should be reported by email to security@parity.io. If you think your report might be eligible for the Parity Bug Bounty Program, your email should be send to bugbounty@parity.io.
+Security vulnerabilities in Parity software should be reported by email to security@parity.io. If you think your report
+might be eligible for the Parity Bug Bounty Program, your email should be send to bugbounty@parity.io.
 
 Your report should include the following:
 
@@ -16,11 +19,16 @@ Your report should include the following:
 - reproduction
 - other details
 
-Try to include as much information in your report as you can, including a description of the vulnerability, its potential impact, and steps for reproducing it. Be sure to use a descriptive subject line.
+Try to include as much information in your report as you can, including a description of the vulnerability, its
+potential impact, and steps for reproducing it. Be sure to use a descriptive subject line.
 
-You'll receive a response to your email within two business days indicating the next steps in handling your report. We encourage finders to use encrypted communication channels to protect the confidentiality of vulnerability reports. You can encrypt your report using our public key. This key is [on MIT's key server](https://pgp.mit.edu/pks/lookup?op=get&search=0x5D0F03018D07DE73) server and reproduced below.
+You'll receive a response to your email within two business days indicating the next steps in handling your report. We
+encourage finders to use encrypted communication channels to protect the confidentiality of vulnerability reports. You
+can encrypt your report using our public key. This key is [on MIT's key
+server](https://pgp.mit.edu/pks/lookup?op=get&search=0x5D0F03018D07DE73) server and reproduced below.
 
-After the initial reply to your report, our team will endeavor to keep you informed of the progress being made towards a fix. These updates will be sent at least every five business days.
+After the initial reply to your report, our team will endeavor to keep you informed of the progress being made towards a
+fix. These updates will be sent at least every five business days.
 
 Thank you for taking the time to responsibly disclose any vulnerabilities you find.
 
@@ -29,19 +37,23 @@ Thank you for taking the time to responsibly disclose any vulnerabilities you fi
 Responsible investigation and reporting includes, but isn't limited to, the following:
 
 - Don't violate the privacy of other users, destroy data, etc.
-- Don’t defraud or harm Parity Technologies Ltd or its users during your research; you should make a good faith effort to not interrupt or degrade our services.
-- Don't target our physical security measures, or attempt to use social engineering, spam, distributed denial of service (DDOS) attacks, etc.
+- Don’t defraud or harm Parity Technologies Ltd or its users during your research; you should make a good faith effort
+  to not interrupt or degrade our services.
+- Don't target our physical security measures, or attempt to use social engineering, spam, distributed denial of service
+  (DDOS) attacks, etc.
 - Initially report the bug only to us and not to anyone else.
-- Give us a reasonable amount of time to fix the bug before disclosing it to anyone else, and give us adequate written warning before disclosing it to anyone else.
-- In general, please investigate and report bugs in a way that makes a reasonable, good faith effort not to be disruptive or harmful to us or our users. Otherwise your actions might be interpreted as an attack rather than an effort to be helpful.
+- Give us a reasonable amount of time to fix the bug before disclosing it to anyone else, and give us adequate written
+  warning before disclosing it to anyone else.
+- In general, please investigate and report bugs in a way that makes a reasonable, good faith effort not to be
+  disruptive or harmful to us or our users. Otherwise your actions might be interpreted as an attack rather than an
+  effort to be helpful.
 
 ## Bug Bounty Program
 
-Our Bug Bounty Program allows us to recognize and reward members of the Parity community for helping us find and address significant bugs, in accordance with the terms of the Parity Bug Bounty Program. A detailed description on eligibility, rewards, legal information and terms & conditions for contributors can be found on [our website](https://paritytech.io/bug-bounty.html).
-
-
-
-
+Our Bug Bounty Program allows us to recognize and reward members of the Parity community for helping us find and address
+significant bugs, in accordance with the terms of the Parity Bug Bounty Program. A detailed description on eligibility,
+rewards, legal information and terms & conditions for contributors can be found on [our
+website](https://paritytech.io/bug-bounty.html).
 
 
 ## Plaintext PGP Key
diff --git a/substrate/docs/STYLE_GUIDE.md b/substrate/docs/STYLE_GUIDE.md
index a89dcf52ffc0b7778cd3b2257b8470b307ae9c6e..6ea0755d0807d4452b6f2b1347bb13999ca37fe5 100644
--- a/substrate/docs/STYLE_GUIDE.md
+++ b/substrate/docs/STYLE_GUIDE.md
@@ -2,19 +2,18 @@
 title: Style Guide for Rust in Substrate
 ---
 
-Where possible these styles are enforced by settings in `rustfmt.toml` so if you run `cargo fmt` 
-then you will adhere to most of these style guidelines automatically.
+Where possible these styles are enforced by settings in `rustfmt.toml` so if you run `cargo fmt` then you will adhere to
+most of these style guidelines automatically.
 
 # Code Formatting
 
--   Indent using tabs.
--   Lines should be longer than 100 characters long only in exceptional circumstances and certainly
-    no longer than 120. For this purpose, tabs are considered 4 characters wide.
--   Indent levels should be greater than 5 only in exceptional circumstances and certainly no
-    greater than 8. If they are greater than 5, then consider using `let` or auxiliary functions in
-    order to strip out complex inline expressions.
--   Never have spaces on a line prior to a non-whitespace character
--   Follow-on lines are only ever a single indent from the original line.
+- Indent using tabs.
+- Lines should be longer than 100 characters long only in exceptional circumstances and certainly no longer than 120.
+    For this purpose, tabs are considered 4 characters wide.
+- Indent levels should be greater than 5 only in exceptional circumstances and certainly no greater than 8. If they are
+    greater than 5, then consider using `let` or auxiliary functions in order to strip out complex inline expressions.
+- Never have spaces on a line prior to a non-whitespace character
+- Follow-on lines are only ever a single indent from the original line.
 
 ```rust
 fn calculation(some_long_variable_a: i8, some_long_variable_b: i8) -> bool {
@@ -25,8 +24,8 @@ fn calculation(some_long_variable_a: i8, some_long_variable_b: i8) -> bool {
 }
 ```
 
--   Indent level should follow open parens/brackets, but should be collapsed to the smallest number
-    of levels actually used:
+- Indent level should follow open parens/brackets, but should be collapsed to the smallest number of levels actually
+    used:
 
 ```rust
 fn calculate(
@@ -45,10 +44,10 @@ fn calculate(
 }
 ```
 
--   `where` is indented, and its items are indented one further.
--   Argument lists or function invocations that are too long to fit on one line are indented
-    similarly to code blocks, and once one param is indented in such a way, all others should be,
-    too. Run-on parameter lists are also acceptable for single-line run-ons of basic function calls.
+- `where` is indented, and its items are indented one further.
+- Argument lists or function invocations that are too long to fit on one line are indented similarly to code blocks, and
+    once one param is indented in such a way, all others should be, too. Run-on parameter lists are also acceptable for
+    single-line run-ons of basic function calls.
 
 ```rust
 // OK
@@ -92,7 +91,7 @@ fn foo(really_long_parameter_name_1: SomeLongTypeName, really_long_parameter_nam
 }
 ```
 
--   Always end last item of a multi-line comma-delimited set with `,` when legal:
+- Always end last item of a multi-line comma-delimited set with `,` when legal:
 
 ```rust
 struct Point<T> {
@@ -104,7 +103,7 @@ struct Point<T> {
 enum Meal { Breakfast, Lunch, Dinner };
 ```
 
--   Avoid trailing `;`s where unneeded.
+- Avoid trailing `;`s where unneeded.
 
 ```rust
 if condition {
@@ -112,8 +111,8 @@ if condition {
 }
 ```
 
--   `match` arms may be either blocks or have a trailing `,` but not both.
--   Blocks should not be used unnecessarily.
+- `match` arms may be either blocks or have a trailing `,` but not both.
+- Blocks should not be used unnecessarily.
 
 ```rust
 match meal {
@@ -126,9 +125,8 @@ match meal {
 
 # Style
 
--   Panickers require explicit proofs they don't trigger. Calling `unwrap` is discouraged. The
-    exception to this rule is test code. Avoiding panickers by restructuring code is preferred if
-    feasible.
+- Panickers require explicit proofs they don't trigger. Calling `unwrap` is discouraged. The exception to this rule is
+    test code. Avoiding panickers by restructuring code is preferred if feasible.
 
 ```rust
 let mut target_path =
@@ -139,21 +137,22 @@ let mut target_path =
 	);
 ```
 
--   Unsafe code requires explicit proofs just as panickers do. When introducing unsafe code,
-    consider trade-offs between efficiency on one hand and reliability, maintenance costs, and
-    security on the other. Here is a list of questions that may help evaluating the trade-off while
-    preparing or reviewing a PR:
-    -   how much more performant or compact the resulting code will be using unsafe code,
-    -   how likely is it that invariants could be violated,
-    -   are issues stemming from the use of unsafe code caught by existing tests/tooling,
-    -   what are the consequences if the problems slip into production.
+- Unsafe code requires explicit proofs just as panickers do. When introducing unsafe code, consider trade-offs between
+    efficiency on one hand and reliability, maintenance costs, and security on the other. Here is a list of questions
+    that may help evaluating the trade-off while preparing or reviewing a PR:
+    - how much more performant or compact the resulting code will be using unsafe code,
+    - how likely is it that invariants could be violated,
+    - are issues stemming from the use of unsafe code caught by existing tests/tooling,
+    - what are the consequences if the problems slip into production.
 
 # Manifest Formatting
 
-> **TLDR**
-> You can use the CLI tool [Zepter](https://crates.io/crates/zepter) to format the files: `zepter format features`
+> **TLDR** You can use the CLI tool [Zepter](https://crates.io/crates/zepter) to format the files: `zepter format
+> features`
 
-Rust `Cargo.toml` files need to respect certain formatting rules. All entries need to be alphabetically sorted. This makes it easier to read them and insert new entries. The exhaustive list of rules is enforced by the CI. The general format looks like this:
+Rust `Cargo.toml` files need to respect certain formatting rules. All entries need to be alphabetically sorted. This
+makes it easier to read them and insert new entries. The exhaustive list of rules is enforced by the CI. The general
+format looks like this:
 
 - The feature is written as a single line if it fits within 80 chars:
 ```toml
@@ -161,7 +160,8 @@ Rust `Cargo.toml` files need to respect certain formatting rules. All entries ne
 default = [ "std" ]
 ```
 
-- Otherwise the feature is broken down into multiple lines with one entry per line. Each line is padded with one tab and no trailing spaces but a trailing comma.
+- Otherwise the feature is broken down into multiple lines with one entry per line. Each line is padded with one tab and
+  no trailing spaces but a trailing comma.
 ```toml
 [features]
 default = [
diff --git a/substrate/docs/Structure.adoc b/substrate/docs/Structure.adoc
deleted file mode 100644
index 6c810a83c51b91367203ba67b532935e36c85146..0000000000000000000000000000000000000000
--- a/substrate/docs/Structure.adoc
+++ /dev/null
@@ -1,121 +0,0 @@
-= Structure
-:Author: Substrate developers
-:Revision: 0.3.0
-:toc:
-:sectnums:
-
-
-== Overview
-
-Substrate is split into multiple levels with increasing opinion and decreasing flexibility:
-
-* primitives
-* client
-* FRAME (formerly `srml`)
-
-Putting all these components together we have:
-
-* Integration Tests
-* Node
-* Node template
-* Subkey
-
-=== Runtime
-
-* _found in_: `/primitives`
-* _crates prefix_: `sp-`
-* _constraints_:
-** must be `[no_std]`
-** crates may not (dev-)depend on crates in other subfolders of this repo
-
-In the lowest level, Substrate defines primitives, interfaces and traits to implement any on-chain Substrate transition system and its interactions with the outside world. This is the lowest level of abstraction and opinion that everything else builds upon.
-
-=== Client
-
-* _found in_: `/client`
-* _crates prefix_: `sc-`
-* _constraints_:
-** crates may not (dev-)depend on any `frame-`-crates
-
-In the client you can find a set of crates to construct the outer substrate-node, implementing outer runtime interfaces, thus it depends on `runtime`. It provides the outer building blocks like transaction queue, networking layer, database backend, full* and light-client support.
-
-=== FRAME (formerly `srml`)
-
-* _found in_: `/frame`
-* _crates prefix_: `frame-` and `pallet-`
-* _constraints_:
-** all crates that go on chain must be `[no_std]`
-** must not (dev-)depend on anything in `/client`
-
-FRAME is a set of modules that implement specific transition functions and features one might want to have in their runtime.
-
-_Pallets_ are individual modules within _FRAME._ These are containers that host domain-specific logic. They have the `pallet-` prefix. For example, `pallet-staking` contains logic for staking tokens.
-
-There are a few crates with the `frame-` prefix. These do not contain domain-specific logic. Rather, they are the main FRAME support infrastructure. These are:
-
-- Executive
-- Metadata
-- Support
-- System
-- Utility
-
-=== Integration Tests
-
-* _found in_: `/test`
-* _crates prefix_: `substrate-test`
-* _constraints_:
-** only helpers may be published
-** purely testing crates must be `publish = false`
-
-All tests that have to pull (dev)-dependencies out of their subtree and would thus break the dependency rules are considered integration tests and should be stored in here. Only helper-crates in here shall be published, everything else is expected to be non-publish.
-
-=== Binaries and template
-
-* _found in_: `/bin`
-
-We also provide some binaries pulling from the components creating full applications.
-
-==== Node
-
-* _found in_: `/bin/node`
-
-The default (testing) application pulling together our recommended setup of substrate-client with a wasm-contracts-supporting frame-runtime.  The node pulls it all together, constructs the (upgradable) runtime, and wires up the client around it. You can find an example client, which includes a full wasm-contracts chain in  `node`. This is also what is being built and run if you do `cargo run`.
-
-==== Node Template
-
-* _found in_: `/bin/node-template`
-
-We also provide a template to get you started building your own node.
-
-==== Utils
-
-* _found in_: `/bin/utils`
-
-- **subkey**
-  Subkey is a client library to generate keys and sign transactions to send to a substrate node.
-- **chain-spec-builder**
-  The chain spec builder builds a chain specification that includes a Substrate runtime compiled as WASM. To ensure proper functioning of the included runtime compile (or run) the chain spec builder binary in `--release` mode.
-
-== Internal Dependency Tree
-
-[ditaa]
-....
-+---------------+       +----------------+
-|               |       |                |
-|    runtime    +<------+   frame        |
-|               |       |                |
-+------+-----+--+       +-------------+--+
-       ^     ^                        ^
-       |     +----------------+       |
-       |                      |       |
-+------+--------+             |       |
-|               |             |       |
-|   client      |          +--+-------+--------+
-|               +<---------+                   |
-+---------------+          |                   |
-                           |   test  /bin/*    |
-                           |                   |
-                           |                   |
-                           +-------------------+
-
-....
diff --git a/substrate/docs/Upgrade.md b/substrate/docs/Upgrade.md
index 4908d53f579e4028bff5615947a86b285f8f8039..08b5a7d37b647d43cb2b4f39210a4ff8d95bbb86 100644
--- a/substrate/docs/Upgrade.md
+++ b/substrate/docs/Upgrade.md
@@ -1,5 +1,7 @@
-# Upgrade path for you building on substrate
+# Upgrade path for you building on Substrate
 
 ## master
- - crate rename has been fixed `sp-application-crypto` (was `sc-application-crypto`);  `.maintain/rename-crates-for-2.0.sh` has been updated accordingly, you can use it to upgrade to latest naming convention
- - crates have been renamed, run `bash .maintain/rename-crates-for-2.0.sh`
\ No newline at end of file
+ - crate rename has been fixed `sp-application-crypto` (was `sc-application-crypto`);
+   `.maintain/rename-crates-for-2.0.sh` has been updated accordingly, you can use it to upgrade to latest naming
+   convention
+ - crates have been renamed, run `bash .maintain/rename-crates-for-2.0.sh`
diff --git a/substrate/docs/Upgrading-2.0-to-3.0.md b/substrate/docs/Upgrading-2.0-to-3.0.md
index 906018db9a707b094b6bc051dedc3aa0be4d9ff3..3f2a3e7c5be22ee738321c6589bb4ce644a6c9d4 100644
--- a/substrate/docs/Upgrading-2.0-to-3.0.md
+++ b/substrate/docs/Upgrading-2.0-to-3.0.md
@@ -4,7 +4,8 @@ An incomplete guide.
 
 ## Refreshing the node-template
 
-Not much has changed on the top and API level for developing Substrate between 2.0 and 3.0. If you've made only small changes to the node-template, we recommend to do the following - it is easiest and quickest path forward:
+Not much has changed on the top and API level for developing Substrate between 2.0 and 3.0. If you've made only small
+changes to the node-template, we recommend to do the following - it is easiest and quickest path forward:
 1. take a diff between 2.0 and your changes
 2. store that diff
 3. remove everything, copy over the 3.0 node-template
@@ -12,19 +13,30 @@ Not much has changed on the top and API level for developing Substrate between 2
 
 ## In-Depth guide on the changes
 
-If you've made significant changes or diverted from the node-template a lot, starting out with that is probably not helping. For that case, we'll take a look at all changes between 2.0 and 3.0 to the fully-implemented node and explain them one by one, so you can follow up, what needs to be changing for your node.
+If you've made significant changes or diverted from the node-template a lot, starting out with that is probably not
+helping. For that case, we'll take a look at all changes between 2.0 and 3.0 to the fully-implemented node and explain
+them one by one, so you can follow up, what needs to be changing for your node.
 
 _Note_: Of course, step 1 is to upgrade your `Cargo.toml`'s to use the latest version of Substrate and all dependencies.
 
-We'll be taking the diff from 2.0.1 to 3.0.0 on `bin/node` as the baseline of what has changed between these two versions in terms of adapting ones code base. We will not be covering the changes made on the tests and bench-marking as they are mostly reactions to the other changes.
+We'll be taking the diff from 2.0.1 to 3.0.0 on `bin/node` as the baseline of what has changed between these two
+versions in terms of adapting ones code base. We will not be covering the changes made on the tests and bench-marking as
+they are mostly reactions to the other changes.
 
 ### Versions upgrade
 
-First and foremost you have to upgrade the version pf the dependencies of course, that's `0.8.x -> 0.9.0` and `2.0.x -> 3.0.0` for all `sc-`, `sp-`, `frame-`, and `pallet-` coming from Parity. Further more this release also upgraded its own dependencies, most notably, we are now using `parity-scale-codec 2.0`, `parking_lot 0.11` and `substrate-wasm-builder 3.0.0` (as build dependency). All other dependency upgrades should resolve automatically or are just internal. However you might see some error that another dependency/type you have as a dependency and one of our upgraded crates don't match up, if so please check the version of said dependency - we've probably upgraded it.
+First and foremost you have to upgrade the version pf the dependencies of course, that's `0.8.x -> 0.9.0` and `2.0.x ->
+3.0.0` for all `sc-`, `sp-`, `frame-`, and `pallet-` coming from Parity. Further more this release also upgraded its own
+dependencies, most notably, we are now using `parity-scale-codec 2.0`, `parking_lot 0.11` and `substrate-wasm-builder
+3.0.0` (as build dependency). All other dependency upgrades should resolve automatically or are just internal. However
+you might see some error that another dependency/type you have as a dependency and one of our upgraded crates don't
+match up, if so please check the version of said dependency - we've probably upgraded it.
 
 ### WASM-Builder
 
-The new version of wasm-builder has gotten a bit smarter and a lot faster (you should definitely switch). Once you've upgraded the dependency, in most cases you just have to remove the now obsolete `with_wasm_builder_from_crates_or_path`-function and you are good to go:
+The new version of wasm-builder has gotten a bit smarter and a lot faster (you should definitely switch). Once you've
+upgraded the dependency, in most cases you just have to remove the now obsolete
+`with_wasm_builder_from_crates_or_path`-function and you are good to go:
 
 ```diff: rust
 --- a/bin/node/runtime/build.rs
@@ -49,11 +61,15 @@ The new version of wasm-builder has gotten a bit smarter and a lot faster (you s
 
 #### FRAME 2.0
 
-The new FRAME 2.0 macros are a lot nicer to use and easier to read. While we were on that change though, we also cleaned up some mainly internal names and traits. The old `macro`'s still work and also produce the new structure, however, when plugging all that together as a Runtime, there's some things we have to adapt now:
+The new FRAME 2.0 macros are a lot nicer to use and easier to read. While we were on that change though, we also cleaned
+up some mainly internal names and traits. The old `macro`'s still work and also produce the new structure, however, when
+plugging all that together as a Runtime, there's some things we have to adapt now:
 
 ##### `::Trait for Runtime` becomes `::Config for Runtime`
 
-The most visible and significant change is that the macros no longer generate the `$pallet::Trait` but now a much more aptly named `$pallet::Config`. Thus, we need to rename all `::Trait for Runtime` into`::Config for Runtime`, e.g. for the `sudo` pallet we must do:
+The most visible and significant change is that the macros no longer generate the `$pallet::Trait` but now a much more
+aptly named `$pallet::Config`. Thus, we need to rename all `::Trait for Runtime` into`::Config for Runtime`, e.g. for
+the `sudo` pallet we must do:
 
 ```diff
 -impl pallet_sudo::Trait for Runtime {
@@ -65,11 +81,15 @@ The same goes for all `<Self as frame_system::Trait>` and alike, which simply be
 #### SS58 Prefix is now a runtime param
 
 
-Since [#7810](https://github.com/paritytech/substrate/pull/7810) we don't define the ss58 prefix in the chainspec anymore but moved it into the runtime. Namely, `frame_system` now needs a new `SS58Prefix`, which in substrate node we have defined for ourselves as: `pub const SS58Prefix: u8 = 42;`. Use your own chain-specific value there.
+Since [#7810](https://github.com/paritytech/substrate/pull/7810) we don't define the ss58 prefix in the chainspec
+anymore but moved it into the runtime. Namely, `frame_system` now needs a new `SS58Prefix`, which in Substrate node we
+have defined for ourselves as: `pub const SS58Prefix: u8 = 42;`. Use your own chain-specific value there.
 
 #### Weight Definition
 
-`type WeightInfo` has changed and instead on `weights::pallet_$name::WeightInfo` is now bound to the Runtime as `pallet_$name::weights::SubstrateWeight<Runtime>`. As a result we have to the change the type definitions everywhere in our Runtime accordingly:
+`type WeightInfo` has changed and instead on `weights::pallet_$name::WeightInfo` is now bound to the Runtime as
+`pallet_$name::weights::SubstrateWeight<Runtime>`. As a result we have to the change the type definitions everywhere in
+our Runtime accordingly:
 
 ```diff
 -	type WeightInfo = weights::pallet_$name::WeightInfo;
@@ -170,24 +190,29 @@ And update the overall definition for weights on frame and a few related types a
 +	type SystemWeightInfo = frame_system::weights::SubstrateWeight<Runtime>;
 ```
 
-#### Pallets:
+#### Pallets
 
 ##### Assets
 
 The assets pallet has seen a variety of changes:
-- [Features needed for reserve-backed stablecoins #7152 ](https://github.com/paritytech/substrate/pull/7152)
-- [Freeze Assets and Asset Metadata #7346 ](https://github.com/paritytech/substrate/pull/7346)
-- [Introduces account existence providers reference counting #7363 ]((https://github.com/paritytech/substrate/pull/7363))
+- [Features needed for reserve-backed stablecoins #7152](https://github.com/paritytech/substrate/pull/7152)
+- [Freeze Assets and Asset Metadata #7346](https://github.com/paritytech/substrate/pull/7346)
+- [Introduces account existence providers reference counting #7363]((https://github.com/paritytech/substrate/pull/7363))
 
-have all altered the feature set and changed the concepts. However, it has some of the best documentation and explains the current state very well. If you are using the assets pallet and need to upgrade from an earlier version, we recommend you use the current docs to guide your way!
+have all altered the feature set and changed the concepts. However, it has some of the best documentation and explains
+the current state very well. If you are using the assets pallet and need to upgrade from an earlier version, we
+recommend you use the current docs to guide your way!
 
 ##### Contracts
 
-As noted in the changelog, the `contracts`-pallet is still undergoing massive changes and is not yet part of this release. We are expecting for it to be released a few weeks after. If your chain is dependent on this pallet, we recommend to wait until it has been released as the currently released version is not compatible with FRAME 2.0.
+As noted in the changelog, the `contracts`-pallet is still undergoing massive changes and is not yet part of this
+release. We are expecting for it to be released a few weeks after. If your chain is dependent on this pallet, we
+recommend to wait until it has been released as the currently released version is not compatible with FRAME 2.0.
 
 #### (changes) Treasury
 
-As mentioned above, Bounties, Tips and Lottery have been extracted out of treasury into their own pallets - removing these options here. Secondly we must now specify the `BurnDestination`  and `SpendFunds`, which now go the `Bounties`.
+As mentioned above, Bounties, Tips and Lottery have been extracted out of treasury into their own pallets - removing
+these options here. Secondly we must now specify the `BurnDestination`  and `SpendFunds`, which now go the `Bounties`.
 
 ```diff
 -	type Tippers = Elections;
@@ -206,9 +231,10 @@ As mentioned above, Bounties, Tips and Lottery have been extracted out of treasu
 +	type SpendFunds = Bounties;
 ```
 
-Factoring out Bounties and Tips means most of these definitions have now moved there, while the parameter types can be left as they were:
+Factoring out Bounties and Tips means most of these definitions have now moved there, while the parameter types can be
+left as they were:
 
-###### 🆕 Bounties
+##### 🆕 Bounties
 
 ```rust=
 impl pallet_bounties::Config for Runtime {
@@ -235,17 +261,22 @@ impl pallet_tips::Config for Runtime {
 	type TipCountdown = TipCountdown;
 	type TipFindersFee = TipFindersFee;
 	type TipReportDepositBase = TipReportDepositBase;
+	type MaxTipAmount = MaxTipAmount;
 	type WeightInfo = pallet_tips::weights::SubstrateWeight<Runtime>;
  }
 ```
 
 #### `FinalityTracker` removed
 
-Finality Tracker has been removed in favor of a different approach to handle the issue in GRANDPA, [see #7228 for details](https://github.com/paritytech/substrate/pull/7228). With latest GRANDPA this is not needed anymore and can be removed without worry.
+Finality Tracker has been removed in favor of a different approach to handle the issue in GRANDPA, [see #7228 for
+details](https://github.com/paritytech/substrate/pull/7228). With latest GRANDPA this is not needed anymore and can be
+removed without worry.
 
 #### (changes) Elections Phragmen
 
-The pallet has been moved to a new system in which the exact amount of deposit for each voter, candidate, member, or runner-up is now deposited on-chain. Moreover, the concept of a `defunct_voter` is removed, since votes now have adequate deposit associated with them. A number of configuration parameters has changed to reflect this, as shown below:
+The pallet has been moved to a new system in which the exact amount of deposit for each voter, candidate, member, or
+runner-up is now deposited on-chain. Moreover, the concept of a `defunct_voter` is removed, since votes now have
+adequate deposit associated with them. A number of configuration parameters has changed to reflect this, as shown below:
 
 ```diff=
  parameter_types! {
@@ -277,11 +308,16 @@ The pallet has been moved to a new system in which the exact amount of deposit f
  	type TermDuration = TermDuration;
  ```
 
- **This upgrade requires storage [migration](https://github.com/paritytech/substrate/blob/master/frame/elections-phragmen/src/migrations_3_0_0.rs)**. Further details can be found in the [pallet-specific changelog](https://github.com/paritytech/substrate/blob/master/frame/elections-phragmen/CHANGELOG.md#security).
+ **This upgrade requires storage
+ [migration](https://github.com/paritytech/substrate/blob/master/frame/elections-phragmen/src/migrations_3_0_0.rs)**.
+ Further details can be found in the [pallet-specific
+ changelog](https://github.com/paritytech/substrate/blob/master/frame/elections-phragmen/CHANGELOG.md#security).
 
 #### (changes) Democracy
 
-Democracy brings three new settings with this release, all to allow for better influx- and spam-control. Namely these allow to specify the maximum number of proposals at a time, who can blacklist and who can cancel proposals. This diff acts as a good starting point:
+Democracy brings three new settings with this release, all to allow for better influx- and spam-control. Namely these
+allow to specify the maximum number of proposals at a time, who can blacklist and who can cancel proposals. This diff
+acts as a good starting point:
 
 ```diff=
 @@ -508,6 +537,14 @@ impl pallet_democracy::Trait for Runtime {
@@ -311,7 +347,9 @@ Democracy brings three new settings with this release, all to allow for better i
 
 ### Primitives
 
-The shared primitives define the API between Client and Runtime. Usually, you don't have to touch nor directly interact with them, unless you created your own client or frame-less runtime. Therefore we'd expect you to understand whether you are effected by changes and how to update your code yourself.
+The shared primitives define the API between Client and Runtime. Usually, you don't have to touch nor directly interact
+with them, unless you created your own client or frame-less runtime. Therefore we'd expect you to understand whether you
+are effected by changes and how to update your code yourself.
 
 ----
 
@@ -321,10 +359,17 @@ The shared primitives define the API between Client and Runtime. Usually, you do
 
 A few minor things have changed in the `cli` (compared to 2.0.1):
 
-1. we've [replaced the newly added `BuildSyncSpec` subcommand with an RPC API](https://github.com/paritytech/substrate/commit/65cc9af9b8df8d36928f6144ee7474cefbd70454#diff-c57da6fbeff8c46ce15f55ea42fedaa5a4684d79578006ce4af01ae04fd6b8f8) in an on-going effort to make light-client-support smoother, see below
-2. we've [removed double accounts from our chainspec-builder](https://github.com/paritytech/substrate/commit/31499cd29ed30df932fb71b7459796f7160d0272)
-3. we [don't fallback to `--chain flaming-fir` anymore](https://github.com/paritytech/substrate/commit/13cdf1c8cd2ee62d411f82b64dc7eba860c9c6c6), if no chain is given our substrate-node will error.
-4. [the `subkey`-integration has seen a fix to the `insert`-command](https://github.com/paritytech/substrate/commit/54bde60cfd2c544c54e9e8623b6b8725b99557f8) that requires you to now add the `&cli` as a param.
+1. we've [replaced the newly added `BuildSyncSpec` subcommand with an RPC
+   API](https://github.com/paritytech/substrate/commit/65cc9af9b8df8d36928f6144ee7474cefbd70454#diff-c57da6fbeff8c46ce15f55ea42fedaa5a4684d79578006ce4af01ae04fd6b8f8)
+   in an on-going effort to make light-client-support smoother, see below
+2. we've [removed double accounts from our
+   chainspec-builder](https://github.com/paritytech/substrate/commit/31499cd29ed30df932fb71b7459796f7160d0272)
+3. we [don't fallback to `--chain flaming-fir`
+   anymore](https://github.com/paritytech/substrate/commit/13cdf1c8cd2ee62d411f82b64dc7eba860c9c6c6), if no chain is
+   given our `substrate-node` will error.
+4. [the `subkey`-integration has seen a fix to the
+   `insert`-command](https://github.com/paritytech/substrate/commit/54bde60cfd2c544c54e9e8623b6b8725b99557f8) that
+   requires you to now add the `&cli` as a param.
     ```diff=
     --- a/bin/node/cli/src/command.rs
     +++ b/bin/node/cli/src/command.rs
@@ -344,7 +389,8 @@ A few minor things have changed in the `cli` (compared to 2.0.1):
 
 ##### Light client support
 
-As said, we've added a new optional RPC service for improved light client support. For that to work, we need to pass the `chain_spec` and give access  to the `AuxStore` to our `rpc`:
+As said, we've added a new optional RPC service for improved light client support. For that to work, we need to pass the
+`chain_spec` and give access  to the `AuxStore` to our `rpc`:
 
 
 ```diff=
@@ -438,17 +484,30 @@ and add the new service:
 
 ##### Telemetry
 
-The telemetry subsystem has seen a few fixes and refactorings to allow for a more flexible handling, in particular in regards to parachains. Most notably `sc_service::spawn_tasks` now returns the `telemetry_connection_notifier` as the second member of the tuple, (`let (_rpc_handlers, telemetry_connection_notifier) = sc_service::spawn_tasks(`), which should be passed to `telemetry_on_connect` of `new_full_base` now: `telemetry_on_connect: telemetry_connection_notifier.map(|x| x.on_connect_stream()),` (see the service-section below for a full diff).
+The telemetry subsystem has seen a few fixes and refactorings to allow for a more flexible handling, in particular in
+regards to parachains. Most notably `sc_service::spawn_tasks` now returns the `telemetry_connection_notifier` as the
+second member of the tuple, (`let (_rpc_handlers, telemetry_connection_notifier) = sc_service::spawn_tasks(`), which
+should be passed to `telemetry_on_connect` of `new_full_base` now: `telemetry_on_connect:
+telemetry_connection_notifier.map(|x| x.on_connect_stream()),` (see the service-section below for a full diff).
 
 ##### Async & Remote Keystore support
 
-In order to allow for remote-keystores, the keystore-subsystem has been reworked to support async operations and generally refactored to not provide the keys itself but only sign on request. This allows for remote-keystore to never hand out keys and thus to operate any substrate-based node in a manner without ever having the private keys in the local system memory.
+In order to allow for remote-keystores, the keystore-subsystem has been reworked to support async operations and
+generally refactored to not provide the keys itself but only sign on request. This allows for remote-keystore to never
+hand out keys and thus to operate any Substrate-based node in a manner without ever having the private keys in the local
+system memory.
 
-There are some operations, however, that the keystore must be local for performance reasons and for which a remote keystore won't work (in particular around parachains). As such, the keystore has both a slot for remote but also always a local instance, where some operations hard bind to the local variant, while most subsystems just ask the generic keystore which prefers a remote signer if given. To reflect this change, `sc_service::new_full_parts` now returns a `KeystoreContainer` rather than the keystore, and the other subsystems (e.g. `sc_service::PartialComponents`) expect to be given that.
+There are some operations, however, that the keystore must be local for performance reasons and for which a remote
+keystore won't work (in particular around parachains). As such, the keystore has both a slot for remote but also always
+a local instance, where some operations hard bind to the local variant, while most subsystems just ask the generic
+keystore which prefers a remote signer if given. To reflect this change, `sc_service::new_full_parts` now returns a
+`KeystoreContainer` rather than the keystore, and the other subsystems (e.g. `sc_service::PartialComponents`) expect to
+be given that.
 
-###### on RPC:
+###### on RPC
 
-This has most visible changes for the rpc, where we are switching from the previous `KeyStorePtr` to the new `SyncCryptoStorePtr`:
+This has most visible changes for the rpc, where we are switching from the previous `KeyStorePtr` to the new
+`SyncCryptoStorePtr`:
 
 ```diff
 
@@ -483,9 +542,15 @@ This has most visible changes for the rpc, where we are switching from the previ
 
 ##### GRANDPA
 
-As already in the changelog, a few things significant things have changed in regards to GRANDPA: the finality tracker has been replaced, an RPC command has been added and WARP-sync-support for faster light client startup has been implemented. All this means we have to do a few changes to our GRANDPA setup procedures in the client.
+As already in the changelog, a few things significant things have changed in regards to GRANDPA: the finality tracker
+has been replaced, an RPC command has been added and WARP-sync-support for faster light client startup has been
+implemented. All this means we have to do a few changes to our GRANDPA setup procedures in the client.
 
-First and foremost, grandpa internalised a few aspects, and thus `new_partial` doesn't expect a tuple but only the `grandpa::SharedVoterState` as input now, and unpacking that again later is not needed anymore either. On the opposite side `grandpa::FinalityProofProvider::new_for_service` now requires the `Some(shared_authority_set)` to be passed as a new third parameter. This set also becomes relevant when adding warp-sync-support, which is added as an extra-protocol-layer to the networking as:
+First and foremost, grandpa internalised a few aspects, and thus `new_partial` doesn't expect a tuple but only the
+`grandpa::SharedVoterState` as input now, and unpacking that again later is not needed anymore either. On the opposite
+side `grandpa::FinalityProofProvider::new_for_service` now requires the `Some(shared_authority_set)` to be passed as a
+new third parameter. This set also becomes relevant when adding warp-sync-support, which is added as an
+extra-protocol-layer to the networking as:
 ```diff=
 
 +	config.network.extra_sets.push(grandpa::grandpa_peers_set_config());
@@ -496,11 +561,13 @@ First and foremost, grandpa internalised a few aspects, and thus `new_partial` d
 +	));
 ```
 
-As these changes pull through the entirety of `cli/src/service.rs`, we recommend looking at the final diff below for guidance.
+As these changes pull through the entirety of `cli/src/service.rs`, we recommend looking at the final diff below for
+guidance.
 
 ##### In a nutshell
 
-Altogether this accumulates to the following diff for `node/cli/src/service.rs`. If you want these features and have modified your chain you should probably try to apply these patches:
+Altogether this accumulates to the following diff for `node/cli/src/service.rs`. If you want these features and have
+modified your chain you should probably try to apply these patches:
 
 
 ```diff=
diff --git a/substrate/docs/node-template-release.md b/substrate/docs/node-template-release.md
index 911e6a2bbe71aa370f34648d75f77c62ccc5a795..2536d186b2d148317b0b7ce72deb4ebf105c417e 100644
--- a/substrate/docs/node-template-release.md
+++ b/substrate/docs/node-template-release.md
@@ -1,71 +1,65 @@
 # Substrate Node Template Release Process
 
-1. This release process has to be run in a github checkout Substrate directory with your work
-committed into `https://github.com/paritytech/substrate/`, because the build script will check
-the existence of your current git commit ID in the remote repository.
+## This release process has to be run in a github checkout Substrate directory with your work committed into
+`https://github.com/paritytech/polkadot-sdk/`, because the build script will check the existence of your current git commit
+ID in the remote repository.
 
-	Assume you are in root directory of Substrate. Run:
+Assume you are in root directory of Substrate. Run:
 
-	```bash
-	cd scripts/ci/
-	./node-template-release.sh <output tar.gz file>
-	```
+```bash
+cd scripts/ci/ ./node-template-release.sh <output tar.gz file>
+```
 
-2. Expand the output tar gzipped file and replace files in current Substrate Node Template
-by running the following command.
+## Expand the output tar gzipped file and replace files in current Substrate Node Template by running the following
+command.
 
-	```bash
-	# This is where the tar.gz file uncompressed
-	cd substrate-node-template
-	# rsync with force copying. Note the slash at the destination directory is important
-	rsync -avh * <destination node-template directory>/
-	# For dry-running add `-n` argument
-	# rsync -avhn * <destination node-template directory>/
-	```
+```bash
+# This is where the tar.gz file uncompressed cd substrate-node-template # rsync with force copying. Note the
+slash at the destination directory is important rsync -avh * <destination node-template directory>/ # For dry-running
+add `-n` argument # rsync -avhn * <destination node-template directory>/
+```
 
-	The above command only copies existing files from the source to the destination, but does not
-	delete files/directories that are removed from the source. So you need to manually check and
-	remove them in the destination.
+The above command only copies existing files from the source to the destination, but does not delete files/directories
+that are removed from the source. So you need to manually check and remove them in the destination.
 
-3. There is a `Cargo.toml` file in the root directory. Inside, dependencies are listed form and
-linked to a certain git commit in Substrate remote repository, such as:
+## There is a `Cargo.toml` file in the root directory. Inside, dependencies are listed form and linked to a certain git
+commit in Substrate remote repository, such as:
 
-	```toml
-	sp-core = { version = "7.0.0", git = "https://github.com/paritytech/substrate.git", rev = "de80d0107336a9c7a2efdc0199015e4d67fcbdb5", default-features = false }
-	```
+```toml
+toml sp-core = { version = "7.0.0", git = "https://github.com/paritytech/substrate.git", rev =
+"de80d0107336a9c7a2efdc0199015e4d67fcbdb5", default-features = false }
+```
 
-	We will update each of them to link to the Rust	[crate registry](https://crates.io/).
-After confirming the versioned package is published in the crate, the above will become:
+e will update each of them to link to the Rust	[crate registry](https://crates.io/). After confirming the versioned
+package is published in the crate, the above will become:
 
-	```toml
-	[workspace.dependencies]
-	sp-core = { version = "7.0.0", default-features = false }
-	```
+```toml
+[workspace.dependencies] sp-core = { version = "7.0.0", default-features = false }
+```
 
-	P.S: This step can be automated if we update `node-template-release` package in
-	`scripts/ci/node-template-release`.
+P.S: This step can be automated if we update `node-template-release` package in `scripts/ci/node-template-release`.
 
-4. Once the `Cargo.toml` is updated, compile and confirm that the Node Template builds. Then commit
-the changes to a new branch in [Substrate Node Template](https://github.com/substrate-developer-hub/substrate-node-template), and make a PR.
+## Once the `Cargo.toml` is updated, compile and confirm that the Node Template builds. Then commit the changes to a new
+branch in [Substrate Node Template](https://github.com/substrate-developer-hub/substrate-node-template), and make a PR.
 
-	> Note that there is a chance the code in Substrate Node Template works with the linked Substrate git
-	commit but not with published packages due to the latest (as yet) unpublished features. In this case,
-	rollback that section of the Node Template to its previous version to ensure the Node Template builds.
+> Note that there is a chance the code in Substrate Node Template works with the linked Substrate git commit but not
+with published packages due to the latest (as yet) unpublished features. In this case, rollback that section of the
+Node Template to its previous version to ensure the Node Template builds.
 
-5. Once the PR is merged, tag the merged commit in master branch with the version number
-`vX.Y.Z+A` (e.g. `v3.0.0+1`). The `X`(major), `Y`(minor), and `Z`(patch) version number should
-follow Substrate release version. The last digit is any significant fixes made in the Substrate
-Node Template apart from Substrate. When the Substrate version is updated, this digit is reset to 0.
+## Once the PR is merged, tag the merged commit in master branch with the version number `vX.Y.Z+A` (e.g. `v3.0.0+1`)
+The `X`(major), `Y`(minor), and `Z`(patch) version number should follow Substrate release version. The last digit is any
+significant fixes made in the Substrate Node Template apart from Substrate. When the Substrate version is updated, this
+digit is reset to 0.
 
 ## Troubleshooting
 
-- Running the script `./node-template-release.sh <output tar.gz file>`, after all tests passed
-	successfully, seeing the following error message:
+- Running the script `./node-template-release.sh <output tar.gz file>`, after all tests passed successfully, seeing the
+	following error message:
 
-	```
-	thread 'main' panicked at 'Creates output file: Os { code: 2, kind: NotFound, message: "No such file or directory" }', src/main.rs:250:10
-note: run with `RUST_BACKTRACE=1` environment variable to display a backtrace
-	```
+```
+thread 'main' panicked at 'Creates output file: Os { code: 2, kind: NotFound, message: "No such file or directory"
+}', src/main.rs:250:10 note: run with `RUST_BACKTRACE=1` environment variable to display a backtrace
+```
 
-	This is likely due to that your output path is not a valid `tar.gz` filename or you don't have write
-	permission to the destination. Try with a simple output path such as `~/node-tpl.tar.gz`.
+This is likely due to that your output path is not a valid `tar.gz` filename or you don't have write permission to the
+destination. Try with a simple output path such as `~/node-tpl.tar.gz`.
diff --git a/substrate/frame/README.md b/substrate/frame/README.md
index 47a7892c2c8d0bb702453cbecf153f62dc1d5b9d..0a6c01fd035dffb53426d1718b9638258207837b 100644
--- a/substrate/frame/README.md
+++ b/substrate/frame/README.md
@@ -1,11 +1,12 @@
 # FRAME
 
-The FRAME development environment provides modules (called "pallets") and support libraries that you can use, modify, and extend to build the runtime logic to suit the needs of your blockchain.
+The FRAME development environment provides modules (called "pallets") and support libraries that you can use, modify,
+and extend to build the runtime logic to suit the needs of your blockchain.
 
-### Documentation
+## Documentation
 
 https://docs.substrate.io/reference/frame-pallets/
 
-### Issues
+## Issues
 
 https://github.com/orgs/paritytech/projects/40
diff --git a/substrate/frame/alliance/Cargo.toml b/substrate/frame/alliance/Cargo.toml
index a518ad69eff22231c14c2bd764429f7f7a8b7006..f1ad9af50ef729ca6047b49df496d11f42c2bea3 100644
--- a/substrate/frame/alliance/Cargo.toml
+++ b/substrate/frame/alliance/Cargo.toml
@@ -1,11 +1,11 @@
 [package]
 name = "pallet-alliance"
 version = "4.0.0-dev"
-authors = ["Parity Technologies <admin@parity.io>"]
-edition = "2021"
+authors.workspace = true
+edition.workspace = true
 license = "Apache-2.0"
 homepage = "https://docs.substrate.io/"
-repository = "https://github.com/paritytech/substrate/"
+repository.workspace = true
 description = "The Alliance pallet provides a collective for standard-setting industry collaboration."
 readme = "README.md"
 
diff --git a/substrate/frame/alliance/src/benchmarking.rs b/substrate/frame/alliance/src/benchmarking.rs
index eb32c6c466c91a9ae1ef5b9b380025af2c6731ce..77294c6b6646f26532e9952c485011ba7cdf8574 100644
--- a/substrate/frame/alliance/src/benchmarking.rs
+++ b/substrate/frame/alliance/src/benchmarking.rs
@@ -17,6 +17,8 @@
 
 //! Alliance pallet benchmarking.
 
+#![cfg(feature = "runtime-benchmarks")]
+
 use sp_runtime::traits::{Bounded, Hash, StaticLookup};
 use sp_std::{
 	cmp,
@@ -25,7 +27,7 @@ use sp_std::{
 	prelude::*,
 };
 
-use frame_benchmarking::v1::{account, benchmarks_instance_pallet, BenchmarkError};
+use frame_benchmarking::{account, impl_benchmark_test_suite, v2::*, BenchmarkError};
 use frame_support::traits::{EnsureOrigin, Get, UnfilteredDispatchable};
 use frame_system::{pallet_prelude::BlockNumberFor, Pallet as System, RawOrigin as SystemOrigin};
 
@@ -94,32 +96,31 @@ fn set_members<T: Config<I>, I: 'static>() {
 	T::InitializeMembers::initialize_members(&[fellows.as_slice()].concat());
 }
 
-benchmarks_instance_pallet! {
-	// This tests when proposal is created and queued as "proposed"
-	propose_proposed {
-		let b in 1 .. MAX_BYTES;
-		let m in 2 .. T::MaxFellows::get();
-		let p in 1 .. T::MaxProposals::get();
+#[instance_benchmarks]
+mod benchmarks {
+	use super::*;
 
+	// This tests when proposal is created and queued as "proposed"
+	#[benchmark]
+	fn propose_proposed(
+		b: Linear<1, MAX_BYTES>,
+		m: Linear<2, { T::MaxFellows::get() }>,
+		p: Linear<1, { T::MaxProposals::get() }>,
+	) -> Result<(), BenchmarkError> {
 		let bytes_in_storage = b + size_of::<Cid>() as u32 + 32;
 
 		// Construct `members`.
-		let fellows = (0 .. m).map(fellow::<T, I>).collect::<Vec<_>>();
+		let fellows = (0..m).map(fellow::<T, I>).collect::<Vec<_>>();
 		let proposer = fellows[0].clone();
 
-		Alliance::<T, I>::init_members(
-			SystemOrigin::Root.into(),
-			fellows,
-			vec![],
-		)?;
+		Alliance::<T, I>::init_members(SystemOrigin::Root.into(), fellows, vec![])?;
 
 		let threshold = m;
 		// Add previous proposals.
-		for i in 0 .. p - 1 {
+		for i in 0..p - 1 {
 			// Proposals should be different so that different proposal hashes are generated
-			let proposal: T::Proposal = AllianceCall::<T, I>::set_rule {
-				rule: rule(vec![i as u8; b as usize])
-			}.into();
+			let proposal: T::Proposal =
+				AllianceCall::<T, I>::set_rule { rule: rule(vec![i as u8; b as usize]) }.into();
 			Alliance::<T, I>::propose(
 				SystemOrigin::Signed(proposer.clone()).into(),
 				threshold,
@@ -128,45 +129,45 @@ benchmarks_instance_pallet! {
 			)?;
 		}
 
-		let proposal: T::Proposal = AllianceCall::<T, I>::set_rule { rule: rule(vec![p as u8; b as usize]) }.into();
+		let proposal: T::Proposal =
+			AllianceCall::<T, I>::set_rule { rule: rule(vec![p as u8; b as usize]) }.into();
+
+		#[extrinsic_call]
+		propose(
+			SystemOrigin::Signed(proposer.clone()),
+			threshold,
+			Box::new(proposal.clone()),
+			bytes_in_storage,
+		);
 
-	}: propose(SystemOrigin::Signed(proposer.clone()), threshold, Box::new(proposal.clone()), bytes_in_storage)
-	verify {
-		// New proposal is recorded
 		let proposal_hash = T::Hashing::hash_of(&proposal);
 		assert_eq!(T::ProposalProvider::proposal_of(proposal_hash), Some(proposal));
+		Ok(())
 	}
 
-	vote {
-		// We choose 5 as a minimum so we always trigger a vote in the voting loop (`for j in ...`)
-		let m in 5 .. T::MaxFellows::get();
-
+	#[benchmark]
+	fn vote(m: Linear<5, { T::MaxFellows::get() }>) -> Result<(), BenchmarkError> {
 		let p = T::MaxProposals::get();
 		let b = MAX_BYTES;
-		let bytes_in_storage = b + size_of::<Cid>() as u32 + 32;
+		let _bytes_in_storage = b + size_of::<Cid>() as u32 + 32;
 
 		// Construct `members`.
-		let fellows = (0 .. m).map(fellow::<T, I>).collect::<Vec<_>>();
+		let fellows = (0..m).map(fellow::<T, I>).collect::<Vec<_>>();
 		let proposer = fellows[0].clone();
 
 		let members = fellows.clone();
 
-		Alliance::<T, I>::init_members(
-			SystemOrigin::Root.into(),
-			fellows,
-			vec![],
-		)?;
+		Alliance::<T, I>::init_members(SystemOrigin::Root.into(), fellows, vec![])?;
 
 		// Threshold is 1 less than the number of members so that one person can vote nay
 		let threshold = m - 1;
 
 		// Add previous proposals
 		let mut last_hash = T::Hash::default();
-		for i in 0 .. p {
+		for i in 0..p {
 			// Proposals should be different so that different proposal hashes are generated
-			let proposal: T::Proposal = AllianceCall::<T, I>::set_rule {
-				rule: rule(vec![i as u8; b as usize])
-			}.into();
+			let proposal: T::Proposal =
+				AllianceCall::<T, I>::set_rule { rule: rule(vec![i as u8; b as usize]) }.into();
 			Alliance::<T, I>::propose(
 				SystemOrigin::Signed(proposer.clone()).into(),
 				threshold,
@@ -178,7 +179,7 @@ benchmarks_instance_pallet! {
 
 		let index = p - 1;
 		// Have almost everyone vote aye on last proposal, while keeping it from passing.
-		for j in 0 .. m - 3 {
+		for j in 0..m - 3 {
 			let voter = &members[j as usize];
 			Alliance::<T, I>::vote(
 				SystemOrigin::Signed(voter.clone()).into(),
@@ -203,28 +204,28 @@ benchmarks_instance_pallet! {
 		// Whitelist voter account from further DB operations.
 		let voter_key = frame_system::Account::<T>::hashed_key_for(&voter);
 		frame_benchmarking::benchmarking::add_to_whitelist(voter_key.into());
-	}: _(SystemOrigin::Signed(voter), last_hash.clone(), index, approve)
-	verify {
-	}
 
-	close_early_disapproved {
-		// We choose 4 as a minimum so we always trigger a vote in the voting loop (`for j in ...`)
-		let m in 4 .. T::MaxFellows::get();
-		let p in 1 .. T::MaxProposals::get();
+		#[extrinsic_call]
+		_(SystemOrigin::Signed(voter), last_hash.clone(), index, approve);
 
+		//nothing to verify
+		Ok(())
+	}
+
+	#[benchmark]
+	fn close_early_disapproved(
+		m: Linear<4, { T::MaxFellows::get() }>,
+		p: Linear<1, { T::MaxProposals::get() }>,
+	) -> Result<(), BenchmarkError> {
 		let bytes = 100;
 		let bytes_in_storage = bytes + size_of::<Cid>() as u32 + 32;
 
 		// Construct `members`.
-		let fellows = (0 .. m).map(fellow::<T, I>).collect::<Vec<_>>();
+		let fellows = (0..m).map(fellow::<T, I>).collect::<Vec<_>>();
 
 		let members = fellows.clone();
 
-		Alliance::<T, I>::init_members(
-			SystemOrigin::Root.into(),
-			fellows,
-			vec![],
-		)?;
+		Alliance::<T, I>::init_members(SystemOrigin::Root.into(), fellows, vec![])?;
 
 		let proposer = members[0].clone();
 		let voter = members[1].clone();
@@ -234,11 +235,10 @@ benchmarks_instance_pallet! {
 
 		// Add previous proposals
 		let mut last_hash = T::Hash::default();
-		for i in 0 .. p {
+		for i in 0..p {
 			// Proposals should be different so that different proposal hashes are generated
-			let proposal: T::Proposal = AllianceCall::<T, I>::set_rule {
-				rule: rule(vec![i as u8; bytes as usize])
-			}.into();
+			let proposal: T::Proposal =
+				AllianceCall::<T, I>::set_rule { rule: rule(vec![i as u8; bytes as usize]) }.into();
 			Alliance::<T, I>::propose(
 				SystemOrigin::Signed(proposer.clone()).into(),
 				threshold,
@@ -251,7 +251,7 @@ benchmarks_instance_pallet! {
 
 		let index = p - 1;
 		// Have most everyone vote aye on last proposal, while keeping it from passing.
-		for j in 2 .. m - 1 {
+		for j in 2..m - 1 {
 			let voter = &members[j as usize];
 			Alliance::<T, I>::vote(
 				SystemOrigin::Signed(voter.clone()).into(),
@@ -280,44 +280,41 @@ benchmarks_instance_pallet! {
 		// Whitelist voter account from further DB operations.
 		let voter_key = frame_system::Account::<T>::hashed_key_for(&voter);
 		frame_benchmarking::benchmarking::add_to_whitelist(voter_key.into());
-	}: close(SystemOrigin::Signed(voter), last_hash.clone(), index, Weight::MAX, bytes_in_storage)
-	verify {
-		// The last proposal is removed.
+
+		#[extrinsic_call]
+		close(SystemOrigin::Signed(voter), last_hash.clone(), index, Weight::MAX, bytes_in_storage);
+
 		assert_eq!(T::ProposalProvider::proposal_of(last_hash), None);
+		Ok(())
 	}
 
-	close_early_approved {
-		let b in 1 .. MAX_BYTES;
-		// We choose 4 as a minimum so we always trigger a vote in the voting loop (`for j in ...`)
-		let m in 4 .. T::MaxFellows::get();
-		let p in 1 .. T::MaxProposals::get();
-
+	// We choose 4 as a minimum for param m, so we always trigger a vote in the voting loop (`for j
+	// in ...`)
+	#[benchmark]
+	fn close_early_approved(
+		b: Linear<1, MAX_BYTES>,
+		m: Linear<4, { T::MaxFellows::get() }>,
+		p: Linear<1, { T::MaxProposals::get() }>,
+	) -> Result<(), BenchmarkError> {
 		let bytes_in_storage = b + size_of::<Cid>() as u32 + 32;
 
 		// Construct `members`.
-		let fellows = (0 .. m).map(fellow::<T, I>).collect::<Vec<_>>();
+		let fellows = (0..m).map(fellow::<T, I>).collect::<Vec<_>>();
 
 		let members = fellows.clone();
 
-		Alliance::<T, I>::init_members(
-			SystemOrigin::Root.into(),
-			fellows,
-			vec![],
-		)?;
+		Alliance::<T, I>::init_members(SystemOrigin::Root.into(), fellows, vec![])?;
 
 		let proposer = members[0].clone();
-		let voter = members[1].clone();
-
 		// Threshold is 2 so any two ayes will approve the vote
 		let threshold = 2;
 
 		// Add previous proposals
 		let mut last_hash = T::Hash::default();
-		for i in 0 .. p {
+		for i in 0..p {
 			// Proposals should be different so that different proposal hashes are generated
-			let proposal: T::Proposal = AllianceCall::<T, I>::set_rule {
-				rule: rule(vec![i as u8; b as usize])
-			}.into();
+			let proposal: T::Proposal =
+				AllianceCall::<T, I>::set_rule { rule: rule(vec![i as u8; b as usize]) }.into();
 			Alliance::<T, I>::propose(
 				SystemOrigin::Signed(proposer.clone()).into(),
 				threshold,
@@ -329,7 +326,8 @@ benchmarks_instance_pallet! {
 		}
 
 		let index = p - 1;
-		// Caller switches vote to nay on their own proposal, allowing them to be the deciding approval vote
+		// Caller switches vote to nay on their own proposal, allowing them to be the deciding
+		// approval vote
 		Alliance::<T, I>::vote(
 			SystemOrigin::Signed(proposer.clone()).into(),
 			last_hash.clone(),
@@ -338,7 +336,7 @@ benchmarks_instance_pallet! {
 		)?;
 
 		// Have almost everyone vote nay on last proposal, while keeping it from failing.
-		for j in 2 .. m - 1 {
+		for j in 2..m - 1 {
 			let voter = &members[j as usize];
 			Alliance::<T, I>::vote(
 				SystemOrigin::Signed(voter.clone()).into(),
@@ -364,30 +362,28 @@ benchmarks_instance_pallet! {
 			index,
 			true,
 		)?;
-	}: close(SystemOrigin::Signed(voter), last_hash.clone(), index, Weight::MAX, bytes_in_storage)
-	verify {
-		// The last proposal is removed.
+
+		#[extrinsic_call]
+		close(SystemOrigin::Signed(voter), last_hash.clone(), index, Weight::MAX, bytes_in_storage);
+
 		assert_eq!(T::ProposalProvider::proposal_of(last_hash), None);
+		Ok(())
 	}
 
-	close_disapproved {
-		// We choose 4 as a minimum so we always trigger a vote in the voting loop (`for j in ...`)
-		let m in 2 .. T::MaxFellows::get();
-		let p in 1 .. T::MaxProposals::get();
-
+	#[benchmark]
+	fn close_disapproved(
+		m: Linear<2, { T::MaxFellows::get() }>,
+		p: Linear<1, { T::MaxProposals::get() }>,
+	) -> Result<(), BenchmarkError> {
 		let bytes = 100;
 		let bytes_in_storage = bytes + size_of::<Cid>() as u32 + 32;
 
 		// Construct `members`.
-		let fellows = (0 .. m).map(fellow::<T, I>).collect::<Vec<_>>();
+		let fellows = (0..m).map(fellow::<T, I>).collect::<Vec<_>>();
 
 		let members = fellows.clone();
 
-		Alliance::<T, I>::init_members(
-			SystemOrigin::Root.into(),
-			fellows,
-			vec![],
-		)?;
+		Alliance::<T, I>::init_members(SystemOrigin::Root.into(), fellows, vec![])?;
 
 		let proposer = members[0].clone();
 		let voter = members[1].clone();
@@ -397,11 +393,10 @@ benchmarks_instance_pallet! {
 
 		// Add proposals
 		let mut last_hash = T::Hash::default();
-		for i in 0 .. p {
+		for i in 0..p {
 			// Proposals should be different so that different proposal hashes are generated
-			let proposal: T::Proposal = AllianceCall::<T, I>::set_rule {
-				rule: rule(vec![i as u8; bytes as usize])
-			}.into();
+			let proposal: T::Proposal =
+				AllianceCall::<T, I>::set_rule { rule: rule(vec![i as u8; bytes as usize]) }.into();
 			Alliance::<T, I>::propose(
 				SystemOrigin::Signed(proposer.clone()).into(),
 				threshold,
@@ -415,7 +410,7 @@ benchmarks_instance_pallet! {
 		let index = p - 1;
 		// Have almost everyone vote aye on last proposal, while keeping it from passing.
 		// A few abstainers will be the nay votes needed to fail the vote.
-		for j in 2 .. m - 1 {
+		for j in 2..m - 1 {
 			let voter = &members[j as usize];
 			Alliance::<T, I>::vote(
 				SystemOrigin::Signed(voter.clone()).into(),
@@ -434,44 +429,41 @@ benchmarks_instance_pallet! {
 
 		System::<T>::set_block_number(BlockNumberFor::<T>::max_value());
 
-	}: close(SystemOrigin::Signed(voter), last_hash.clone(), index, Weight::MAX, bytes_in_storage)
-	verify {
+		#[extrinsic_call]
+		close(SystemOrigin::Signed(voter), last_hash.clone(), index, Weight::MAX, bytes_in_storage);
+
 		// The last proposal is removed.
 		assert_eq!(T::ProposalProvider::proposal_of(last_hash), None);
+		Ok(())
 	}
 
-	close_approved {
-		let b in 1 .. MAX_BYTES;
-		// We choose 4 fellows as a minimum so we always trigger a vote in the voting loop (`for j in ...`)
-		let m in 5 .. T::MaxFellows::get();
-		let p in 1 .. T::MaxProposals::get();
-
+	// We choose 5 fellows as a minimum so we always trigger a vote in the voting loop (`for j in
+	// ...`)
+	#[benchmark]
+	fn close_approved(
+		b: Linear<1, MAX_BYTES>,
+		m: Linear<5, { T::MaxFellows::get() }>,
+		p: Linear<1, { T::MaxProposals::get() }>,
+	) -> Result<(), BenchmarkError> {
 		let bytes_in_storage = b + size_of::<Cid>() as u32 + 32;
 
 		// Construct `members`.
-		let fellows = (0 .. m).map(fellow::<T, I>).collect::<Vec<_>>();
+		let fellows = (0..m).map(fellow::<T, I>).collect::<Vec<_>>();
 
 		let members = fellows.clone();
 
-		Alliance::<T, I>::init_members(
-			SystemOrigin::Root.into(),
-			fellows,
-			vec![],
-		)?;
+		Alliance::<T, I>::init_members(SystemOrigin::Root.into(), fellows, vec![])?;
 
 		let proposer = members[0].clone();
-		let voter = members[1].clone();
-
 		// Threshold is two, so any two ayes will pass the vote
 		let threshold = 2;
 
 		// Add proposals
 		let mut last_hash = T::Hash::default();
-		for i in 0 .. p {
+		for i in 0..p {
 			// Proposals should be different so that different proposal hashes are generated
-			let proposal: T::Proposal = AllianceCall::<T, I>::set_rule {
-				rule: rule(vec![i as u8; b as usize])
-			}.into();
+			let proposal: T::Proposal =
+				AllianceCall::<T, I>::set_rule { rule: rule(vec![i as u8; b as usize]) }.into();
 			Alliance::<T, I>::propose(
 				SystemOrigin::Signed(proposer.clone()).into(),
 				threshold,
@@ -487,70 +479,71 @@ benchmarks_instance_pallet! {
 			SystemOrigin::Signed(proposer.clone()).into(),
 			last_hash.clone(),
 			p - 1,
-			true // Vote aye.
+			true, // Vote aye.
 		)?;
 
 		let index = p - 1;
 		// Have almost everyone vote nay on last proposal, while keeping it from failing.
 		// A few abstainers will be the aye votes needed to pass the vote.
-		for j in 2 .. m - 1 {
+		for j in 2..m - 1 {
 			let voter = &members[j as usize];
 			Alliance::<T, I>::vote(
 				SystemOrigin::Signed(voter.clone()).into(),
 				last_hash.clone(),
 				index,
-				false
+				false,
 			)?;
 		}
 
 		// caller is prime, prime already votes aye by creating the proposal
 		System::<T>::set_block_number(BlockNumberFor::<T>::max_value());
 
-	}: close(SystemOrigin::Signed(voter), last_hash.clone(), index, Weight::MAX, bytes_in_storage)
-	verify {
-		// The last proposal is removed.
+		#[extrinsic_call]
+		close(
+			SystemOrigin::Signed(proposer),
+			last_hash.clone(),
+			index,
+			Weight::MAX,
+			bytes_in_storage,
+		);
+
 		assert_eq!(T::ProposalProvider::proposal_of(last_hash), None);
+		Ok(())
 	}
 
-	init_members {
-		// at least 1 fellow
-		let m in 1 .. T::MaxFellows::get();
-		let z in 0 .. T::MaxAllies::get();
+	#[benchmark]
+	fn init_members(
+		m: Linear<1, { T::MaxFellows::get() }>,
+		z: Linear<0, { T::MaxAllies::get() }>,
+	) -> Result<(), BenchmarkError> {
+		let mut fellows = (0..m).map(fellow::<T, I>).collect::<Vec<_>>();
+		let mut allies = (0..z).map(ally::<T, I>).collect::<Vec<_>>();
 
-		let mut fellows = (0 .. m).map(fellow::<T, I>).collect::<Vec<_>>();
-		let mut allies = (0 .. z).map(ally::<T, I>).collect::<Vec<_>>();
+		#[extrinsic_call]
+		_(SystemOrigin::Root, fellows.clone(), allies.clone());
 
-	}: _(SystemOrigin::Root, fellows.clone(), allies.clone())
-	verify {
 		fellows.sort();
 		allies.sort();
-		assert_last_event::<T, I>(Event::MembersInitialized {
-			fellows: fellows.clone(),
-			allies: allies.clone(),
-		}.into());
+		assert_last_event::<T, I>(
+			Event::MembersInitialized { fellows: fellows.clone(), allies: allies.clone() }.into(),
+		);
 		assert_eq!(Alliance::<T, I>::members(MemberRole::Fellow), fellows);
 		assert_eq!(Alliance::<T, I>::members(MemberRole::Ally), allies);
+		Ok(())
 	}
 
-	disband {
-		// at least 1 founders
-		let x in 1 .. T::MaxFellows::get();
-		let y in 0 .. T::MaxAllies::get();
-		let z in 0 .. T::MaxMembersCount::get() / 2;
-
-		let fellows = (0 .. x).map(fellow::<T, I>).collect::<Vec<_>>();
-		let allies = (0 .. y).map(ally::<T, I>).collect::<Vec<_>>();
-		let witness = DisbandWitness{
-			fellow_members: x,
-			ally_members: y,
-		};
+	#[benchmark]
+	fn disband(
+		x: Linear<1, { T::MaxFellows::get() }>,
+		y: Linear<0, { T::MaxAllies::get() }>,
+		z: Linear<0, { T::MaxMembersCount::get() / 2 }>,
+	) -> Result<(), BenchmarkError> {
+		let fellows = (0..x).map(fellow::<T, I>).collect::<Vec<_>>();
+		let allies = (0..y).map(ally::<T, I>).collect::<Vec<_>>();
+		let witness = DisbandWitness { fellow_members: x, ally_members: y };
 
 		// setting the Alliance to disband on the benchmark call
-		Alliance::<T, I>::init_members(
-			SystemOrigin::Root.into(),
-			fellows.clone(),
-			allies.clone(),
-		)?;
+		Alliance::<T, I>::init_members(SystemOrigin::Root.into(), fellows.clone(), allies.clone())?;
 
 		// reserve deposits
 		let deposit = T::AllyDeposit::get();
@@ -561,18 +554,25 @@ benchmarks_instance_pallet! {
 
 		assert_eq!(Alliance::<T, I>::voting_members_count(), x);
 		assert_eq!(Alliance::<T, I>::ally_members_count(), y);
-	}: _(SystemOrigin::Root, witness)
-	verify {
-		assert_last_event::<T, I>(Event::AllianceDisbanded {
-			fellow_members: x,
-			ally_members: y,
-			unreserved: cmp::min(z, x + y),
-		}.into());
+
+		#[extrinsic_call]
+		_(SystemOrigin::Root, witness);
+
+		assert_last_event::<T, I>(
+			Event::AllianceDisbanded {
+				fellow_members: x,
+				ally_members: y,
+				unreserved: cmp::min(z, x + y),
+			}
+			.into(),
+		);
 
 		assert!(!Alliance::<T, I>::is_initialized());
+		Ok(())
 	}
 
-	set_rule {
+	#[benchmark]
+	fn set_rule() -> Result<(), BenchmarkError> {
 		set_members::<T, I>();
 
 		let rule = rule(b"hello world");
@@ -580,61 +580,86 @@ benchmarks_instance_pallet! {
 		let call = Call::<T, I>::set_rule { rule: rule.clone() };
 		let origin =
 			T::AdminOrigin::try_successful_origin().map_err(|_| BenchmarkError::Weightless)?;
-	}: { call.dispatch_bypass_filter(origin)? }
-	verify {
+
+		#[block]
+		{
+			call.dispatch_bypass_filter(origin)?;
+		}
 		assert_eq!(Alliance::<T, I>::rule(), Some(rule.clone()));
 		assert_last_event::<T, I>(Event::NewRuleSet { rule }.into());
+		Ok(())
 	}
 
-	announce {
+	#[benchmark]
+	fn announce() -> Result<(), BenchmarkError> {
 		set_members::<T, I>();
 
 		let announcement = announcement(b"hello world");
 
 		let call = Call::<T, I>::announce { announcement: announcement.clone() };
-		let origin =
-			T::AnnouncementOrigin::try_successful_origin().map_err(|_| BenchmarkError::Weightless)?;
-	}: { call.dispatch_bypass_filter(origin)? }
-	verify {
+		let origin = T::AnnouncementOrigin::try_successful_origin()
+			.map_err(|_| BenchmarkError::Weightless)?;
+
+		#[block]
+		{
+			call.dispatch_bypass_filter(origin)?;
+		}
+
 		assert!(Alliance::<T, I>::announcements().contains(&announcement));
 		assert_last_event::<T, I>(Event::Announced { announcement }.into());
+		Ok(())
 	}
 
-	remove_announcement {
+	#[benchmark]
+	fn remove_announcement() -> Result<(), BenchmarkError> {
 		set_members::<T, I>();
 
 		let announcement = announcement(b"hello world");
-		let announcements: BoundedVec<_, T::MaxAnnouncementsCount> = BoundedVec::try_from(vec![announcement.clone()]).unwrap();
+		let announcements: BoundedVec<_, T::MaxAnnouncementsCount> =
+			BoundedVec::try_from(vec![announcement.clone()]).unwrap();
 		Announcements::<T, I>::put(announcements);
 
 		let call = Call::<T, I>::remove_announcement { announcement: announcement.clone() };
-		let origin =
-			T::AnnouncementOrigin::try_successful_origin().map_err(|_| BenchmarkError::Weightless)?;
-	}: { call.dispatch_bypass_filter(origin)? }
-	verify {
-		assert!(Alliance::<T, I>::announcements().is_empty());
+		let origin = T::AnnouncementOrigin::try_successful_origin()
+			.map_err(|_| BenchmarkError::Weightless)?;
+
+		#[block]
+		{
+			call.dispatch_bypass_filter(origin)?;
+		}
+
+		assert!(!Alliance::<T, I>::announcements().contains(&announcement));
 		assert_last_event::<T, I>(Event::AnnouncementRemoved { announcement }.into());
+		Ok(())
 	}
 
-	join_alliance {
+	#[benchmark]
+	fn join_alliance() -> Result<(), BenchmarkError> {
 		set_members::<T, I>();
 
 		let outsider = outsider::<T, I>(1);
 		assert!(!Alliance::<T, I>::is_member(&outsider));
 		assert_eq!(DepositOf::<T, I>::get(&outsider), None);
-	}: _(SystemOrigin::Signed(outsider.clone()))
-	verify {
+
+		#[extrinsic_call]
+		_(SystemOrigin::Signed(outsider.clone()));
+
 		assert!(Alliance::<T, I>::is_member_of(&outsider, MemberRole::Ally)); // outsider is now an ally
 		assert_eq!(DepositOf::<T, I>::get(&outsider), Some(T::AllyDeposit::get())); // with a deposit
 		assert!(!Alliance::<T, I>::has_voting_rights(&outsider)); // allies don't have voting rights
-		assert_last_event::<T, I>(Event::NewAllyJoined {
-			ally: outsider,
-			nominator: None,
-			reserved: Some(T::AllyDeposit::get())
-		}.into());
+		assert_last_event::<T, I>(
+			Event::NewAllyJoined {
+				ally: outsider,
+				nominator: None,
+				reserved: Some(T::AllyDeposit::get()),
+			}
+			.into(),
+		);
+		Ok(())
 	}
 
-	nominate_ally {
+	#[benchmark]
+	fn nominate_ally() -> Result<(), BenchmarkError> {
 		set_members::<T, I>();
 
 		let fellow1 = fellow::<T, I>(1);
@@ -645,19 +670,23 @@ benchmarks_instance_pallet! {
 		assert_eq!(DepositOf::<T, I>::get(&outsider), None);
 
 		let outsider_lookup = T::Lookup::unlookup(outsider.clone());
-	}: _(SystemOrigin::Signed(fellow1.clone()), outsider_lookup)
-	verify {
+
+		#[extrinsic_call]
+		_(SystemOrigin::Signed(fellow1.clone()), outsider_lookup);
+
 		assert!(Alliance::<T, I>::is_member_of(&outsider, MemberRole::Ally)); // outsider is now an ally
 		assert_eq!(DepositOf::<T, I>::get(&outsider), None); // without a deposit
 		assert!(!Alliance::<T, I>::has_voting_rights(&outsider)); // allies don't have voting rights
-		assert_last_event::<T, I>(Event::NewAllyJoined {
-			ally: outsider,
-			nominator: Some(fellow1),
-			reserved: None
-		}.into());
+		assert_last_event::<T, I>(
+			Event::NewAllyJoined { ally: outsider, nominator: Some(fellow1), reserved: None }
+				.into(),
+		);
+
+		Ok(())
 	}
 
-	elevate_ally {
+	#[benchmark]
+	fn elevate_ally() -> Result<(), BenchmarkError> {
 		set_members::<T, I>();
 
 		let ally1 = ally::<T, I>(1);
@@ -665,59 +694,69 @@ benchmarks_instance_pallet! {
 
 		let ally1_lookup = T::Lookup::unlookup(ally1.clone());
 		let call = Call::<T, I>::elevate_ally { ally: ally1_lookup };
-		let origin =
-			T::MembershipManager::try_successful_origin().map_err(|_| BenchmarkError::Weightless)?;
-	}: { call.dispatch_bypass_filter(origin)? }
-	verify {
+		let origin = T::MembershipManager::try_successful_origin()
+			.map_err(|_| BenchmarkError::Weightless)?;
+
+		#[block]
+		{
+			call.dispatch_bypass_filter(origin)?;
+		}
+
 		assert!(!Alliance::<T, I>::is_ally(&ally1));
 		assert!(Alliance::<T, I>::has_voting_rights(&ally1));
 		assert_last_event::<T, I>(Event::AllyElevated { ally: ally1 }.into());
+		Ok(())
 	}
 
-	give_retirement_notice {
+	#[benchmark]
+	fn give_retirement_notice() -> Result<(), BenchmarkError> {
 		set_members::<T, I>();
 		let fellow2 = fellow::<T, I>(2);
 
 		assert!(Alliance::<T, I>::has_voting_rights(&fellow2));
-	}: _(SystemOrigin::Signed(fellow2.clone()))
-	verify {
+
+		#[extrinsic_call]
+		_(SystemOrigin::Signed(fellow2.clone()));
+
 		assert!(Alliance::<T, I>::is_member_of(&fellow2, MemberRole::Retiring));
 
 		assert_eq!(
 			RetiringMembers::<T, I>::get(&fellow2),
 			Some(System::<T>::block_number() + T::RetirementPeriod::get())
 		);
-		assert_last_event::<T, I>(
-			Event::MemberRetirementPeriodStarted {member: fellow2}.into()
-		);
+		assert_last_event::<T, I>(Event::MemberRetirementPeriodStarted { member: fellow2 }.into());
+		Ok(())
 	}
 
-	retire {
+	#[benchmark]
+	fn retire() -> Result<(), BenchmarkError> {
 		set_members::<T, I>();
 
 		let fellow2 = fellow::<T, I>(2);
 		assert!(Alliance::<T, I>::has_voting_rights(&fellow2));
 
 		assert_eq!(
-			Alliance::<T, I>::give_retirement_notice(
-				SystemOrigin::Signed(fellow2.clone()).into()
-			),
+			Alliance::<T, I>::give_retirement_notice(SystemOrigin::Signed(fellow2.clone()).into()),
 			Ok(())
 		);
 		System::<T>::set_block_number(System::<T>::block_number() + T::RetirementPeriod::get());
 
 		assert_eq!(DepositOf::<T, I>::get(&fellow2), Some(T::AllyDeposit::get()));
-	}: _(SystemOrigin::Signed(fellow2.clone()))
-	verify {
+
+		#[extrinsic_call]
+		_(SystemOrigin::Signed(fellow2.clone()));
+
 		assert!(!Alliance::<T, I>::is_member(&fellow2));
 		assert_eq!(DepositOf::<T, I>::get(&fellow2), None);
-		assert_last_event::<T, I>(Event::MemberRetired {
-			member: fellow2,
-			unreserved: Some(T::AllyDeposit::get())
-		}.into());
+		assert_last_event::<T, I>(
+			Event::MemberRetired { member: fellow2, unreserved: Some(T::AllyDeposit::get()) }
+				.into(),
+		);
+		Ok(())
 	}
 
-	kick_member {
+	#[benchmark]
+	fn kick_member() -> Result<(), BenchmarkError> {
 		set_members::<T, I>();
 
 		let fellow2 = fellow::<T, I>(2);
@@ -726,58 +765,71 @@ benchmarks_instance_pallet! {
 
 		let fellow2_lookup = T::Lookup::unlookup(fellow2.clone());
 		let call = Call::<T, I>::kick_member { who: fellow2_lookup };
-		let origin =
-			T::MembershipManager::try_successful_origin().map_err(|_| BenchmarkError::Weightless)?;
-	}: { call.dispatch_bypass_filter(origin)? }
-	verify {
+		let origin = T::MembershipManager::try_successful_origin()
+			.map_err(|_| BenchmarkError::Weightless)?;
+
+		#[block]
+		{
+			call.dispatch_bypass_filter(origin)?;
+		}
+
 		assert!(!Alliance::<T, I>::is_member(&fellow2));
 		assert_eq!(DepositOf::<T, I>::get(&fellow2), None);
-		assert_last_event::<T, I>(Event::MemberKicked {
-			member: fellow2,
-			slashed: Some(T::AllyDeposit::get())
-		}.into());
+		assert_last_event::<T, I>(
+			Event::MemberKicked { member: fellow2, slashed: Some(T::AllyDeposit::get()) }.into(),
+		);
+		Ok(())
 	}
 
-	add_unscrupulous_items {
-		let n in 0 .. T::MaxUnscrupulousItems::get();
-		let l in 0 .. T::MaxWebsiteUrlLength::get();
-
+	#[benchmark]
+	fn add_scrupulous_items(
+		n: Linear<0, { T::MaxUnscrupulousItems::get() }>,
+		l: Linear<0, { T::MaxWebsiteUrlLength::get() }>,
+	) -> Result<(), BenchmarkError> {
 		set_members::<T, I>();
 
-		let accounts = (0 .. n)
-			.map(|i| generate_unscrupulous_account::<T, I>(i))
+		let accounts = (0..n).map(|i| generate_unscrupulous_account::<T, I>(i)).collect::<Vec<_>>();
+		let websites = (0..n)
+			.map(|i| -> BoundedVec<u8, T::MaxWebsiteUrlLength> {
+				BoundedVec::try_from(vec![i as u8; l as usize]).unwrap()
+			})
 			.collect::<Vec<_>>();
-		let websites = (0 .. n).map(|i| -> BoundedVec<u8, T::MaxWebsiteUrlLength> {
-			BoundedVec::try_from(vec![i as u8; l as usize]).unwrap()
-		}).collect::<Vec<_>>();
 
 		let mut unscrupulous_list = Vec::with_capacity(accounts.len() + websites.len());
 		unscrupulous_list.extend(accounts.into_iter().map(UnscrupulousItem::AccountId));
 		unscrupulous_list.extend(websites.into_iter().map(UnscrupulousItem::Website));
 
 		let call = Call::<T, I>::add_unscrupulous_items { items: unscrupulous_list.clone() };
-		let origin =
-			T::AnnouncementOrigin::try_successful_origin().map_err(|_| BenchmarkError::Weightless)?;
-	}: { call.dispatch_bypass_filter(origin)? }
-	verify {
+		let origin = T::AnnouncementOrigin::try_successful_origin()
+			.map_err(|_| BenchmarkError::Weightless)?;
+
+		#[block]
+		{
+			call.dispatch_bypass_filter(origin)?;
+		}
+
 		assert_last_event::<T, I>(Event::UnscrupulousItemAdded { items: unscrupulous_list }.into());
+		Ok(())
 	}
 
-	remove_unscrupulous_items {
-		let n in 0 .. T::MaxUnscrupulousItems::get();
-		let l in 0 .. T::MaxWebsiteUrlLength::get();
-
+	#[benchmark]
+	fn remove_unscrupulous_items(
+		n: Linear<0, { T::MaxUnscrupulousItems::get() }>,
+		l: Linear<0, { T::MaxWebsiteUrlLength::get() }>,
+	) -> Result<(), BenchmarkError> {
 		set_members::<T, I>();
 
-		let mut accounts = (0 .. n)
-			.map(|i| generate_unscrupulous_account::<T, I>(i))
-			.collect::<Vec<_>>();
+		let mut accounts =
+			(0..n).map(|i| generate_unscrupulous_account::<T, I>(i)).collect::<Vec<_>>();
 		accounts.sort();
 		let accounts: BoundedVec<_, T::MaxUnscrupulousItems> = accounts.try_into().unwrap();
 		UnscrupulousAccounts::<T, I>::put(accounts.clone());
 
-		let mut websites = (0 .. n).map(|i| -> BoundedVec<_, T::MaxWebsiteUrlLength>
-			{ BoundedVec::try_from(vec![i as u8; l as usize]).unwrap() }).collect::<Vec<_>>();
+		let mut websites = (0..n)
+			.map(|i| -> BoundedVec<_, T::MaxWebsiteUrlLength> {
+				BoundedVec::try_from(vec![i as u8; l as usize]).unwrap()
+			})
+			.collect::<Vec<_>>();
 		websites.sort();
 		let websites: BoundedVec<_, T::MaxUnscrupulousItems> = websites.try_into().unwrap();
 		UnscrupulousWebsites::<T, I>::put(websites.clone());
@@ -787,24 +839,31 @@ benchmarks_instance_pallet! {
 		unscrupulous_list.extend(websites.into_iter().map(UnscrupulousItem::Website));
 
 		let call = Call::<T, I>::remove_unscrupulous_items { items: unscrupulous_list.clone() };
-		let origin =
-			T::AnnouncementOrigin::try_successful_origin().map_err(|_| BenchmarkError::Weightless)?;
-	}: { call.dispatch_bypass_filter(origin)? }
-	verify {
-		assert_last_event::<T, I>(Event::UnscrupulousItemRemoved { items: unscrupulous_list }.into());
+		let origin = T::AnnouncementOrigin::try_successful_origin()
+			.map_err(|_| BenchmarkError::Weightless)?;
+
+		#[block]
+		{
+			call.dispatch_bypass_filter(origin)?;
+		}
+
+		assert_last_event::<T, I>(
+			Event::UnscrupulousItemRemoved { items: unscrupulous_list }.into(),
+		);
+		Ok(())
 	}
 
-	abdicate_fellow_status {
+	#[benchmark]
+	fn abdicate_fellow_status() -> Result<(), BenchmarkError> {
 		set_members::<T, I>();
 		let fellow2 = fellow::<T, I>(2);
 		assert!(Alliance::<T, I>::has_voting_rights(&fellow2));
-	}: _(SystemOrigin::Signed(fellow2.clone()))
-	verify {
-		assert!(Alliance::<T, I>::is_member_of(&fellow2, MemberRole::Ally));
 
-		assert_last_event::<T, I>(
-			Event::FellowAbdicated {fellow: fellow2}.into()
-		);
+		#[extrinsic_call]
+		_(SystemOrigin::Signed(fellow2.clone()));
+
+		assert_last_event::<T, I>(Event::FellowAbdicated { fellow: fellow2 }.into());
+		Ok(())
 	}
 
 	impl_benchmark_test_suite!(Alliance, crate::mock::new_bench_ext(), crate::mock::Test);
diff --git a/substrate/frame/alliance/src/lib.rs b/substrate/frame/alliance/src/lib.rs
index 1986354a0941c6659d72a190edc8c48805e1d3e8..627399f805b3115617e03dd501f2d747e27c9c77 100644
--- a/substrate/frame/alliance/src/lib.rs
+++ b/substrate/frame/alliance/src/lib.rs
@@ -98,16 +98,13 @@ use codec::{Decode, Encode, MaxEncodedLen};
 use frame_support::pallet_prelude::*;
 use frame_system::pallet_prelude::*;
 use sp_runtime::{
-	traits::{Saturating, StaticLookup, Zero},
-	RuntimeDebug,
+	traits::{Dispatchable, Saturating, StaticLookup, Zero},
+	DispatchError, RuntimeDebug,
 };
 use sp_std::{convert::TryInto, prelude::*};
 
 use frame_support::{
-	dispatch::{
-		DispatchError, DispatchResult, DispatchResultWithPostInfo, Dispatchable, GetDispatchInfo,
-		PostDispatchInfo,
-	},
+	dispatch::{DispatchResult, DispatchResultWithPostInfo, GetDispatchInfo, PostDispatchInfo},
 	ensure,
 	traits::{
 		ChangeMembers, Currency, Get, InitializeMembers, IsSubType, OnUnbalanced,
diff --git a/substrate/frame/alliance/src/mock.rs b/substrate/frame/alliance/src/mock.rs
index f04e7e414ed94dbaa930580189272cfb169c8d96..82dbbe9c0bb9102e1301001abfe9bc53e59a3b5e 100644
--- a/substrate/frame/alliance/src/mock.rs
+++ b/substrate/frame/alliance/src/mock.rs
@@ -26,7 +26,7 @@ pub use sp_runtime::{
 use sp_std::convert::{TryFrom, TryInto};
 
 pub use frame_support::{
-	assert_noop, assert_ok, ord_parameter_types, parameter_types,
+	assert_noop, assert_ok, derive_impl, ord_parameter_types, parameter_types,
 	traits::{EitherOfDiverse, SortedMembers},
 	BoundedVec,
 };
@@ -45,30 +45,11 @@ parameter_types! {
 	pub BlockWeights: frame_system::limits::BlockWeights =
 		frame_system::limits::BlockWeights::simple_max(Weight::MAX);
 }
+
+#[derive_impl(frame_system::config_preludes::TestDefaultConfig as frame_system::DefaultConfig)]
 impl frame_system::Config for Test {
-	type BaseCallFilter = frame_support::traits::Everything;
-	type BlockWeights = BlockWeights;
-	type BlockLength = ();
-	type RuntimeOrigin = RuntimeOrigin;
-	type RuntimeCall = RuntimeCall;
-	type Nonce = u64;
-	type Hash = H256;
-	type Hashing = BlakeTwo256;
-	type AccountId = AccountId;
-	type Lookup = IdentityLookup<Self::AccountId>;
 	type Block = Block;
-	type RuntimeEvent = RuntimeEvent;
-	type BlockHashCount = BlockHashCount;
-	type DbWeight = ();
-	type Version = ();
-	type PalletInfo = PalletInfo;
 	type AccountData = pallet_balances::AccountData<AccountId>;
-	type OnNewAccount = ();
-	type OnKilledAccount = ();
-	type SystemWeightInfo = ();
-	type SS58Prefix = ();
-	type OnSetCode = ();
-	type MaxConsumers = frame_support::traits::ConstU32<16>;
 }
 
 parameter_types! {
diff --git a/substrate/frame/asset-conversion/Cargo.toml b/substrate/frame/asset-conversion/Cargo.toml
index 48f6ee6d0626d283c2c0fcb1fdca4b909fe20f14..62e71663c5b37abe0d9125e8517d02547b92cc5a 100644
--- a/substrate/frame/asset-conversion/Cargo.toml
+++ b/substrate/frame/asset-conversion/Cargo.toml
@@ -1,11 +1,11 @@
 [package]
 name = "pallet-asset-conversion"
 version = "4.0.0-dev"
-authors = ["Parity Technologies <admin@parity.io>"]
-edition = "2021"
+authors.workspace = true
+edition.workspace = true
 license = "Apache-2.0"
 homepage = "https://substrate.io"
-repository = "https://github.com/paritytech/substrate/"
+repository.workspace = true
 description = "FRAME asset conversion pallet"
 readme = "README.md"
 
diff --git a/substrate/frame/asset-conversion/src/lib.rs b/substrate/frame/asset-conversion/src/lib.rs
index d1d68f3e10fbb477c3ad2654836d7352d1d85dd1..8d811473e861f10b65c3b957afbb199a377875d3 100644
--- a/substrate/frame/asset-conversion/src/lib.rs
+++ b/substrate/frame/asset-conversion/src/lib.rs
@@ -1,6 +1,6 @@
 // This file is part of Substrate.
 
-// Copyright (C) 2022 Parity Technologies (UK) Ltd.
+// Copyright (C) Parity Technologies (UK) Ltd.
 // SPDX-License-Identifier: Apache-2.0
 
 // Licensed under the Apache License, Version 2.0 (the "License");
diff --git a/substrate/frame/asset-conversion/src/mock.rs b/substrate/frame/asset-conversion/src/mock.rs
index 7fe81b814047d652f526168007a2fd136b50927a..3a19f39e7ca62d38a18b77ff143b24bde25f5ede 100644
--- a/substrate/frame/asset-conversion/src/mock.rs
+++ b/substrate/frame/asset-conversion/src/mock.rs
@@ -1,6 +1,6 @@
 // This file is part of Substrate.
 
-// Copyright (C) 2019-2022 Parity Technologies (UK) Ltd.
+// Copyright (C) Parity Technologies (UK) Ltd.
 // SPDX-License-Identifier: Apache-2.0
 
 // Licensed under the Apache License, Version 2.0 (the "License");
diff --git a/substrate/frame/asset-conversion/src/tests.rs b/substrate/frame/asset-conversion/src/tests.rs
index 450a074ec36757a95e351862ac28c1ffd39cf335..1c1267ab87b3fad874f6a06a3a917a81ac629d2d 100644
--- a/substrate/frame/asset-conversion/src/tests.rs
+++ b/substrate/frame/asset-conversion/src/tests.rs
@@ -1,6 +1,6 @@
 // This file is part of Substrate.
 
-// Copyright (C) 2022 Parity Technologies (UK) Ltd.
+// Copyright (C) Parity Technologies (UK) Ltd.
 // SPDX-License-Identifier: Apache-2.0
 
 // Licensed under the Apache License, Version 2.0 (the "License");
@@ -569,6 +569,16 @@ fn can_quote_price() {
 			),
 			Some(60)
 		);
+		// including fee so should get less out...
+		assert_eq!(
+			AssetConversion::quote_price_exact_tokens_for_tokens(
+				NativeOrAssetId::Native,
+				NativeOrAssetId::Asset(2),
+				3000,
+				true,
+			),
+			Some(46)
+		);
 		// Check it still gives same price:
 		// (if the above accidentally exchanged then it would not give same quote as before)
 		assert_eq!(
@@ -580,6 +590,16 @@ fn can_quote_price() {
 			),
 			Some(60)
 		);
+		// including fee so should get less out...
+		assert_eq!(
+			AssetConversion::quote_price_exact_tokens_for_tokens(
+				NativeOrAssetId::Native,
+				NativeOrAssetId::Asset(2),
+				3000,
+				true,
+			),
+			Some(46)
+		);
 
 		// Check inverse:
 		assert_eq!(
@@ -591,6 +611,247 @@ fn can_quote_price() {
 			),
 			Some(3000)
 		);
+		// including fee so should get less out...
+		assert_eq!(
+			AssetConversion::quote_price_exact_tokens_for_tokens(
+				NativeOrAssetId::Asset(2),
+				NativeOrAssetId::Native,
+				60,
+				true,
+			),
+			Some(2302)
+		);
+
+		//
+		// same tests as above but for quote_price_tokens_for_exact_tokens:
+		//
+		assert_eq!(
+			AssetConversion::quote_price_tokens_for_exact_tokens(
+				NativeOrAssetId::Native,
+				NativeOrAssetId::Asset(2),
+				60,
+				false,
+			),
+			Some(3000)
+		);
+		// including fee so should need to put more in...
+		assert_eq!(
+			AssetConversion::quote_price_tokens_for_exact_tokens(
+				NativeOrAssetId::Native,
+				NativeOrAssetId::Asset(2),
+				60,
+				true,
+			),
+			Some(4299)
+		);
+		// Check it still gives same price:
+		// (if the above accidentally exchanged then it would not give same quote as before)
+		assert_eq!(
+			AssetConversion::quote_price_tokens_for_exact_tokens(
+				NativeOrAssetId::Native,
+				NativeOrAssetId::Asset(2),
+				60,
+				false,
+			),
+			Some(3000)
+		);
+		// including fee so should need to put more in...
+		assert_eq!(
+			AssetConversion::quote_price_tokens_for_exact_tokens(
+				NativeOrAssetId::Native,
+				NativeOrAssetId::Asset(2),
+				60,
+				true,
+			),
+			Some(4299)
+		);
+
+		// Check inverse:
+		assert_eq!(
+			AssetConversion::quote_price_tokens_for_exact_tokens(
+				NativeOrAssetId::Asset(2),
+				NativeOrAssetId::Native,
+				3000,
+				false,
+			),
+			Some(60)
+		);
+		// including fee so should need to put more in...
+		assert_eq!(
+			AssetConversion::quote_price_tokens_for_exact_tokens(
+				NativeOrAssetId::Asset(2),
+				NativeOrAssetId::Native,
+				3000,
+				true,
+			),
+			Some(86)
+		);
+
+		//
+		// roundtrip: Without fees one should get the original number
+		//
+		let amount_in = 100;
+
+		assert_eq!(
+			AssetConversion::quote_price_exact_tokens_for_tokens(
+				NativeOrAssetId::Asset(2),
+				NativeOrAssetId::Native,
+				amount_in,
+				false,
+			)
+			.and_then(|amount| AssetConversion::quote_price_exact_tokens_for_tokens(
+				NativeOrAssetId::Native,
+				NativeOrAssetId::Asset(2),
+				amount,
+				false,
+			)),
+			Some(amount_in)
+		);
+		assert_eq!(
+			AssetConversion::quote_price_exact_tokens_for_tokens(
+				NativeOrAssetId::Native,
+				NativeOrAssetId::Asset(2),
+				amount_in,
+				false,
+			)
+			.and_then(|amount| AssetConversion::quote_price_exact_tokens_for_tokens(
+				NativeOrAssetId::Asset(2),
+				NativeOrAssetId::Native,
+				amount,
+				false,
+			)),
+			Some(amount_in)
+		);
+
+		assert_eq!(
+			AssetConversion::quote_price_tokens_for_exact_tokens(
+				NativeOrAssetId::Asset(2),
+				NativeOrAssetId::Native,
+				amount_in,
+				false,
+			)
+			.and_then(|amount| AssetConversion::quote_price_tokens_for_exact_tokens(
+				NativeOrAssetId::Native,
+				NativeOrAssetId::Asset(2),
+				amount,
+				false,
+			)),
+			Some(amount_in)
+		);
+		assert_eq!(
+			AssetConversion::quote_price_tokens_for_exact_tokens(
+				NativeOrAssetId::Native,
+				NativeOrAssetId::Asset(2),
+				amount_in,
+				false,
+			)
+			.and_then(|amount| AssetConversion::quote_price_tokens_for_exact_tokens(
+				NativeOrAssetId::Asset(2),
+				NativeOrAssetId::Native,
+				amount,
+				false,
+			)),
+			Some(amount_in)
+		);
+	});
+}
+
+#[test]
+fn quote_price_exact_tokens_for_tokens_matches_execution() {
+	new_test_ext().execute_with(|| {
+		let user = 1;
+		let user2 = 2;
+		let token_1 = NativeOrAssetId::Native;
+		let token_2 = NativeOrAssetId::Asset(2);
+
+		create_tokens(user, vec![token_2]);
+		assert_ok!(AssetConversion::create_pool(RuntimeOrigin::signed(user), token_1, token_2));
+
+		assert_ok!(Balances::force_set_balance(RuntimeOrigin::root(), user, 100000));
+		assert_ok!(Assets::mint(RuntimeOrigin::signed(user), 2, user, 1000));
+
+		assert_ok!(AssetConversion::add_liquidity(
+			RuntimeOrigin::signed(user),
+			token_1,
+			token_2,
+			10000,
+			200,
+			1,
+			1,
+			user,
+		));
+
+		let amount = 1;
+		let quoted_price = 49;
+		assert_eq!(
+			AssetConversion::quote_price_exact_tokens_for_tokens(token_2, token_1, amount, true,),
+			Some(quoted_price)
+		);
+
+		assert_ok!(Assets::mint(RuntimeOrigin::signed(user), 2, user2, amount));
+		let prior_dot_balance = 20000;
+		assert_eq!(prior_dot_balance, balance(user2, token_1));
+		assert_ok!(AssetConversion::swap_exact_tokens_for_tokens(
+			RuntimeOrigin::signed(user2),
+			bvec![token_2, token_1],
+			amount,
+			1,
+			user2,
+			false,
+		));
+
+		assert_eq!(prior_dot_balance + quoted_price, balance(user2, token_1));
+	});
+}
+
+#[test]
+fn quote_price_tokens_for_exact_tokens_matches_execution() {
+	new_test_ext().execute_with(|| {
+		let user = 1;
+		let user2 = 2;
+		let token_1 = NativeOrAssetId::Native;
+		let token_2 = NativeOrAssetId::Asset(2);
+
+		create_tokens(user, vec![token_2]);
+		assert_ok!(AssetConversion::create_pool(RuntimeOrigin::signed(user), token_1, token_2));
+
+		assert_ok!(Balances::force_set_balance(RuntimeOrigin::root(), user, 100000));
+		assert_ok!(Assets::mint(RuntimeOrigin::signed(user), 2, user, 1000));
+
+		assert_ok!(AssetConversion::add_liquidity(
+			RuntimeOrigin::signed(user),
+			token_1,
+			token_2,
+			10000,
+			200,
+			1,
+			1,
+			user,
+		));
+
+		let amount = 49;
+		let quoted_price = 1;
+		assert_eq!(
+			AssetConversion::quote_price_tokens_for_exact_tokens(token_2, token_1, amount, true,),
+			Some(quoted_price)
+		);
+
+		assert_ok!(Assets::mint(RuntimeOrigin::signed(user), 2, user2, amount));
+		let prior_dot_balance = 20000;
+		assert_eq!(prior_dot_balance, balance(user2, token_1));
+		let prior_asset_balance = 49;
+		assert_eq!(prior_asset_balance, balance(user2, token_2));
+		assert_ok!(AssetConversion::swap_tokens_for_exact_tokens(
+			RuntimeOrigin::signed(user2),
+			bvec![token_2, token_1],
+			amount,
+			1,
+			user2,
+			false,
+		));
+
+		assert_eq!(prior_dot_balance + amount, balance(user2, token_1));
+		assert_eq!(prior_asset_balance - quoted_price, balance(user2, token_2));
 	});
 }
 
@@ -1389,7 +1650,11 @@ fn cannot_block_pool_creation() {
 		let pool_account =
 			AssetConversion::get_pool_account(&AssetConversion::get_pool_id(token_2, token_1));
 		// And transfers the ED to that pool account
-		assert_ok!(Balances::transfer(RuntimeOrigin::signed(attacker), pool_account, ed));
+		assert_ok!(Balances::transfer_allow_death(
+			RuntimeOrigin::signed(attacker),
+			pool_account,
+			ed
+		));
 		// Then, the attacker creates 14 tokens and sends one of each to the pool account
 		for i in 10..25 {
 			create_tokens(attacker, vec![NativeOrAssetId::Asset(i)]);
diff --git a/substrate/frame/asset-conversion/src/types.rs b/substrate/frame/asset-conversion/src/types.rs
index 9c28bd7666b7128dcf5a37d5a98ca6a963d118c2..ffdc63ce0ce7b75c0eb111de6fb1547161fdaccf 100644
--- a/substrate/frame/asset-conversion/src/types.rs
+++ b/substrate/frame/asset-conversion/src/types.rs
@@ -1,6 +1,6 @@
 // This file is part of Substrate.
 
-// Copyright (C) 2022 Parity Technologies (UK) Ltd.
+// Copyright (C) Parity Technologies (UK) Ltd.
 // SPDX-License-Identifier: Apache-2.0
 
 // Licensed under the Apache License, Version 2.0 (the "License");
diff --git a/substrate/frame/asset-rate/Cargo.toml b/substrate/frame/asset-rate/Cargo.toml
index 6cc2fffd85aa625612d0a9336bd5422ab3ef0e57..2338e8711eda8cfa63de6cd1ac65e9f1b5574c7e 100644
--- a/substrate/frame/asset-rate/Cargo.toml
+++ b/substrate/frame/asset-rate/Cargo.toml
@@ -2,11 +2,11 @@
 name = "pallet-asset-rate"
 version = "4.0.0-dev"
 description = "Whitelist non-native assets for treasury spending and provide conversion to native balance"
-authors = ["William Freudenberger <w.freude@icloud.com>"]
+authors.workspace = true
 homepage = "https://substrate.io"
-edition = "2021"
+edition.workspace = true
 license = "Apache-2.0"
-repository = "https://github.com/paritytech/substrate/"
+repository.workspace = true
 publish = false
 
 [package.metadata.docs.rs]
diff --git a/substrate/frame/asset-rate/src/benchmarking.rs b/substrate/frame/asset-rate/src/benchmarking.rs
index 12edcf5aee025c8d88601c67583bf02affac6bbd..21d53a89e3976987a54c3ce03e8fdc91260f2330 100644
--- a/substrate/frame/asset-rate/src/benchmarking.rs
+++ b/substrate/frame/asset-rate/src/benchmarking.rs
@@ -54,7 +54,7 @@ mod benchmarks {
 	fn create() -> Result<(), BenchmarkError> {
 		let asset_kind: T::AssetKind = T::BenchmarkHelper::create_asset_kind(SEED);
 		#[extrinsic_call]
-		_(RawOrigin::Root, asset_kind.clone(), default_conversion_rate());
+		_(RawOrigin::Root, Box::new(asset_kind.clone()), default_conversion_rate());
 
 		assert_eq!(
 			pallet_asset_rate::ConversionRateToNative::<T>::get(asset_kind),
@@ -68,12 +68,12 @@ mod benchmarks {
 		let asset_kind: T::AssetKind = T::BenchmarkHelper::create_asset_kind(SEED);
 		assert_ok!(AssetRate::<T>::create(
 			RawOrigin::Root.into(),
-			asset_kind.clone(),
+			Box::new(asset_kind.clone()),
 			default_conversion_rate()
 		));
 
 		#[extrinsic_call]
-		_(RawOrigin::Root, asset_kind.clone(), FixedU128::from_u32(2));
+		_(RawOrigin::Root, Box::new(asset_kind.clone()), FixedU128::from_u32(2));
 
 		assert_eq!(
 			pallet_asset_rate::ConversionRateToNative::<T>::get(asset_kind),
@@ -87,12 +87,12 @@ mod benchmarks {
 		let asset_kind: T::AssetKind = T::BenchmarkHelper::create_asset_kind(SEED);
 		assert_ok!(AssetRate::<T>::create(
 			RawOrigin::Root.into(),
-			asset_kind.clone(),
+			Box::new(asset_kind.clone()),
 			default_conversion_rate()
 		));
 
 		#[extrinsic_call]
-		_(RawOrigin::Root, asset_kind.clone());
+		_(RawOrigin::Root, Box::new(asset_kind.clone()));
 
 		assert!(pallet_asset_rate::ConversionRateToNative::<T>::get(asset_kind).is_none());
 		Ok(())
diff --git a/substrate/frame/asset-rate/src/lib.rs b/substrate/frame/asset-rate/src/lib.rs
index 8b55f3d1d40296fb064aa8c2f450232d7eb02465..d4afca8b73c4b2978bbed954c05aee4e2a645ee5 100644
--- a/substrate/frame/asset-rate/src/lib.rs
+++ b/substrate/frame/asset-rate/src/lib.rs
@@ -61,6 +61,7 @@
 
 use frame_support::traits::{fungible::Inspect, tokens::ConversionFromAssetBalance};
 use sp_runtime::{traits::Zero, FixedPointNumber, FixedU128};
+use sp_std::boxed::Box;
 
 pub use pallet::*;
 pub use weights::WeightInfo;
@@ -155,18 +156,18 @@ pub mod pallet {
 		#[pallet::weight(T::WeightInfo::create())]
 		pub fn create(
 			origin: OriginFor<T>,
-			asset_kind: T::AssetKind,
+			asset_kind: Box<T::AssetKind>,
 			rate: FixedU128,
 		) -> DispatchResult {
 			T::CreateOrigin::ensure_origin(origin)?;
 
 			ensure!(
-				!ConversionRateToNative::<T>::contains_key(asset_kind.clone()),
+				!ConversionRateToNative::<T>::contains_key(asset_kind.as_ref()),
 				Error::<T>::AlreadyExists
 			);
-			ConversionRateToNative::<T>::set(asset_kind.clone(), Some(rate));
+			ConversionRateToNative::<T>::set(asset_kind.as_ref(), Some(rate));
 
-			Self::deposit_event(Event::AssetRateCreated { asset_kind, rate });
+			Self::deposit_event(Event::AssetRateCreated { asset_kind: *asset_kind, rate });
 			Ok(())
 		}
 
@@ -178,13 +179,13 @@ pub mod pallet {
 		#[pallet::weight(T::WeightInfo::update())]
 		pub fn update(
 			origin: OriginFor<T>,
-			asset_kind: T::AssetKind,
+			asset_kind: Box<T::AssetKind>,
 			rate: FixedU128,
 		) -> DispatchResult {
 			T::UpdateOrigin::ensure_origin(origin)?;
 
 			let mut old = FixedU128::zero();
-			ConversionRateToNative::<T>::mutate(asset_kind.clone(), |maybe_rate| {
+			ConversionRateToNative::<T>::mutate(asset_kind.as_ref(), |maybe_rate| {
 				if let Some(r) = maybe_rate {
 					old = *r;
 					*r = rate;
@@ -195,7 +196,11 @@ pub mod pallet {
 				}
 			})?;
 
-			Self::deposit_event(Event::AssetRateUpdated { asset_kind, old, new: rate });
+			Self::deposit_event(Event::AssetRateUpdated {
+				asset_kind: *asset_kind,
+				old,
+				new: rate,
+			});
 			Ok(())
 		}
 
@@ -205,16 +210,16 @@ pub mod pallet {
 		/// - O(1)
 		#[pallet::call_index(2)]
 		#[pallet::weight(T::WeightInfo::remove())]
-		pub fn remove(origin: OriginFor<T>, asset_kind: T::AssetKind) -> DispatchResult {
+		pub fn remove(origin: OriginFor<T>, asset_kind: Box<T::AssetKind>) -> DispatchResult {
 			T::RemoveOrigin::ensure_origin(origin)?;
 
 			ensure!(
-				ConversionRateToNative::<T>::contains_key(asset_kind.clone()),
+				ConversionRateToNative::<T>::contains_key(asset_kind.as_ref()),
 				Error::<T>::UnknownAssetKind
 			);
-			ConversionRateToNative::<T>::remove(asset_kind.clone());
+			ConversionRateToNative::<T>::remove(asset_kind.as_ref());
 
-			Self::deposit_event(Event::AssetRateRemoved { asset_kind });
+			Self::deposit_event(Event::AssetRateRemoved { asset_kind: *asset_kind });
 			Ok(())
 		}
 	}
@@ -235,4 +240,9 @@ where
 			.ok_or(pallet::Error::<T>::UnknownAssetKind.into())?;
 		Ok(rate.saturating_mul_int(balance))
 	}
+	/// Set a conversion rate to `1` for the `asset_id`.
+	#[cfg(feature = "runtime-benchmarks")]
+	fn ensure_successful(asset_id: AssetKindOf<T>) {
+		pallet::ConversionRateToNative::<T>::set(asset_id.clone(), Some(1.into()));
+	}
 }
diff --git a/substrate/frame/asset-rate/src/tests.rs b/substrate/frame/asset-rate/src/tests.rs
index 8990ba9fc28d658bfab2b2bf1e3f73a6373232e1..452265476093b034256907e9d2a232c91041f772 100644
--- a/substrate/frame/asset-rate/src/tests.rs
+++ b/substrate/frame/asset-rate/src/tests.rs
@@ -29,7 +29,11 @@ const ASSET_ID: u32 = 42;
 fn create_works() {
 	new_test_ext().execute_with(|| {
 		assert!(pallet_asset_rate::ConversionRateToNative::<Test>::get(ASSET_ID).is_none());
-		assert_ok!(AssetRate::create(RuntimeOrigin::root(), ASSET_ID, FixedU128::from_float(0.1)));
+		assert_ok!(AssetRate::create(
+			RuntimeOrigin::root(),
+			Box::new(ASSET_ID),
+			FixedU128::from_float(0.1)
+		));
 
 		assert_eq!(
 			pallet_asset_rate::ConversionRateToNative::<Test>::get(ASSET_ID),
@@ -42,10 +46,18 @@ fn create_works() {
 fn create_existing_throws() {
 	new_test_ext().execute_with(|| {
 		assert!(pallet_asset_rate::ConversionRateToNative::<Test>::get(ASSET_ID).is_none());
-		assert_ok!(AssetRate::create(RuntimeOrigin::root(), ASSET_ID, FixedU128::from_float(0.1)));
+		assert_ok!(AssetRate::create(
+			RuntimeOrigin::root(),
+			Box::new(ASSET_ID),
+			FixedU128::from_float(0.1)
+		));
 
 		assert_noop!(
-			AssetRate::create(RuntimeOrigin::root(), ASSET_ID, FixedU128::from_float(0.1)),
+			AssetRate::create(
+				RuntimeOrigin::root(),
+				Box::new(ASSET_ID),
+				FixedU128::from_float(0.1)
+			),
 			Error::<Test>::AlreadyExists
 		);
 	});
@@ -54,9 +66,13 @@ fn create_existing_throws() {
 #[test]
 fn remove_works() {
 	new_test_ext().execute_with(|| {
-		assert_ok!(AssetRate::create(RuntimeOrigin::root(), ASSET_ID, FixedU128::from_float(0.1)));
+		assert_ok!(AssetRate::create(
+			RuntimeOrigin::root(),
+			Box::new(ASSET_ID),
+			FixedU128::from_float(0.1)
+		));
 
-		assert_ok!(AssetRate::remove(RuntimeOrigin::root(), ASSET_ID,));
+		assert_ok!(AssetRate::remove(RuntimeOrigin::root(), Box::new(ASSET_ID),));
 		assert!(pallet_asset_rate::ConversionRateToNative::<Test>::get(ASSET_ID).is_none());
 	});
 }
@@ -65,7 +81,7 @@ fn remove_works() {
 fn remove_unknown_throws() {
 	new_test_ext().execute_with(|| {
 		assert_noop!(
-			AssetRate::remove(RuntimeOrigin::root(), ASSET_ID,),
+			AssetRate::remove(RuntimeOrigin::root(), Box::new(ASSET_ID),),
 			Error::<Test>::UnknownAssetKind
 		);
 	});
@@ -74,8 +90,16 @@ fn remove_unknown_throws() {
 #[test]
 fn update_works() {
 	new_test_ext().execute_with(|| {
-		assert_ok!(AssetRate::create(RuntimeOrigin::root(), ASSET_ID, FixedU128::from_float(0.1)));
-		assert_ok!(AssetRate::update(RuntimeOrigin::root(), ASSET_ID, FixedU128::from_float(0.5)));
+		assert_ok!(AssetRate::create(
+			RuntimeOrigin::root(),
+			Box::new(ASSET_ID),
+			FixedU128::from_float(0.1)
+		));
+		assert_ok!(AssetRate::update(
+			RuntimeOrigin::root(),
+			Box::new(ASSET_ID),
+			FixedU128::from_float(0.5)
+		));
 
 		assert_eq!(
 			pallet_asset_rate::ConversionRateToNative::<Test>::get(ASSET_ID),
@@ -88,7 +112,11 @@ fn update_works() {
 fn update_unknown_throws() {
 	new_test_ext().execute_with(|| {
 		assert_noop!(
-			AssetRate::update(RuntimeOrigin::root(), ASSET_ID, FixedU128::from_float(0.5)),
+			AssetRate::update(
+				RuntimeOrigin::root(),
+				Box::new(ASSET_ID),
+				FixedU128::from_float(0.5)
+			),
 			Error::<Test>::UnknownAssetKind
 		);
 	});
@@ -97,7 +125,11 @@ fn update_unknown_throws() {
 #[test]
 fn convert_works() {
 	new_test_ext().execute_with(|| {
-		assert_ok!(AssetRate::create(RuntimeOrigin::root(), ASSET_ID, FixedU128::from_float(2.51)));
+		assert_ok!(AssetRate::create(
+			RuntimeOrigin::root(),
+			Box::new(ASSET_ID),
+			FixedU128::from_float(2.51)
+		));
 
 		let conversion = <AssetRate as ConversionFromAssetBalance<
 			BalanceOf<Test>,
diff --git a/substrate/frame/assets/Cargo.toml b/substrate/frame/assets/Cargo.toml
index 9c0726d650809f07cbdea8b748c825919aa77031..24c7a3b32b8f1f8c9e0e3ae33ecbcda7cbf2da4f 100644
--- a/substrate/frame/assets/Cargo.toml
+++ b/substrate/frame/assets/Cargo.toml
@@ -1,11 +1,11 @@
 [package]
 name = "pallet-assets"
 version = "4.0.0-dev"
-authors = ["Parity Technologies <admin@parity.io>"]
-edition = "2021"
+authors.workspace = true
+edition.workspace = true
 license = "Apache-2.0"
 homepage = "https://substrate.io"
-repository = "https://github.com/paritytech/substrate/"
+repository.workspace = true
 description = "FRAME asset management pallet"
 readme = "README.md"
 
diff --git a/substrate/frame/assets/README.md b/substrate/frame/assets/README.md
index aae5244953e50638510569af075ca45cbe4539f0..863bcccbbaf802cb938fd90aa61ee174164bc722 100644
--- a/substrate/frame/assets/README.md
+++ b/substrate/frame/assets/README.md
@@ -4,21 +4,21 @@ A simple, secure module for dealing with fungible assets.
 
 ## Overview
 
-The Assets module provides functionality for asset management of fungible asset classes
-with a fixed supply, including:
+The Assets module provides functionality for asset management of fungible asset classes with a fixed supply, including:
 
 * Asset Issuance
 * Asset Transfer
 * Asset Destruction
 
-To use it in your runtime, you need to implement the assets [`assets::Config`](https://docs.rs/pallet-assets/latest/pallet_assets/pallet/trait.Config.html).
+To use it in your runtime, you need to implement the assets
+[`assets::Config`](https://docs.rs/pallet-assets/latest/pallet_assets/pallet/trait.Config.html).
 
-The supported dispatchable functions are documented in the [`assets::Call`](https://docs.rs/pallet-assets/latest/pallet_assets/pallet/enum.Call.html) enum.
+The supported dispatchable functions are documented in the
+[`assets::Call`](https://docs.rs/pallet-assets/latest/pallet_assets/pallet/enum.Call.html) enum.
 
 ### Terminology
 
-* **Asset issuance:** The creation of a new asset, whose total supply will belong to the
-  account that issues the asset.
+* **Asset issuance:** The creation of a new asset, whose total supply will belong to the account that issues the asset.
 * **Asset transfer:** The action of transferring assets from one account to another.
 * **Asset destruction:** The process of an account removing its entire holding of an asset.
 * **Fungible asset:** An asset whose units are interchangeable.
@@ -30,20 +30,19 @@ The assets system in Substrate is designed to make the following possible:
 
 * Issue a unique asset to its creator's account.
 * Move assets between accounts.
-* Remove an account's balance of an asset when requested by that account's owner and update
-  the asset's total supply.
+* Remove an account's balance of an asset when requested by that account's owner and update the asset's total supply.
 
 ## Interface
 
 ### Dispatchable Functions
 
 * `issue` - Issues the total supply of a new fungible asset to the account of the caller of the function.
-* `transfer` - Transfers an `amount` of units of fungible asset `id` from the balance of
-the function caller's account (`origin`) to a `target` account.
-* `destroy` - Destroys the entire holding of a fungible asset `id` associated with the account
-that called the function.
+* `transfer` - Transfers an `amount` of units of fungible asset `id` from the balance of the function caller's account
+(`origin`) to a `target` account.
+* `destroy` - Destroys the entire holding of a fungible asset `id` associated with the account that called the function.
 
-Please refer to the [`Call`](https://docs.rs/pallet-assets/latest/pallet_assets/enum.Call.html) enum and its associated variants for documentation on each function.
+Please refer to the [`Call`](https://docs.rs/pallet-assets/latest/pallet_assets/enum.Call.html) enum and its associated
+variants for documentation on each function.
 
 ### Public Functions
 <!-- Original author of descriptions: @gavofyork -->
@@ -51,7 +50,8 @@ Please refer to the [`Call`](https://docs.rs/pallet-assets/latest/pallet_assets/
 * `balance` - Get the asset `id` balance of `who`.
 * `total_supply` - Get the total supply of an asset `id`.
 
-Please refer to the [`Pallet`](https://docs.rs/pallet-assets/latest/pallet_assets/pallet/struct.Pallet.html) struct for details on publicly available functions.
+Please refer to the [`Pallet`](https://docs.rs/pallet-assets/latest/pallet_assets/pallet/struct.Pallet.html) struct for
+details on publicly available functions.
 
 ## Usage
 
@@ -111,11 +111,10 @@ pub mod pallet {
 
 ## Assumptions
 
-Below are assumptions that must be held when using this module.  If any of
-them are violated, the behavior of this module is undefined.
+Below are assumptions that must be held when using this module.  If any of them are violated, the behavior of this
+module is undefined.
 
-* The total count of assets should be less than
-  `Config::AssetId::max_value()`.
+* The total count of assets should be less than `Config::AssetId::max_value()`.
 
 ## Related Modules
 
diff --git a/substrate/frame/assets/src/benchmarking.rs b/substrate/frame/assets/src/benchmarking.rs
index 376f19139ab9b6dca29fcbb4bd6427baaffc6bd4..c9b0825542de718ddf6393a38d6819f16f6f8178 100644
--- a/substrate/frame/assets/src/benchmarking.rs
+++ b/substrate/frame/assets/src/benchmarking.rs
@@ -23,10 +23,7 @@ use super::*;
 use frame_benchmarking::v1::{
 	account, benchmarks_instance_pallet, whitelist_account, whitelisted_caller, BenchmarkError,
 };
-use frame_support::{
-	dispatch::UnfilteredDispatchable,
-	traits::{EnsureOrigin, Get},
-};
+use frame_support::traits::{EnsureOrigin, Get, UnfilteredDispatchable};
 use frame_system::RawOrigin as SystemOrigin;
 use sp_runtime::traits::Bounded;
 use sp_std::prelude::*;
diff --git a/substrate/frame/assets/src/lib.rs b/substrate/frame/assets/src/lib.rs
index 363a99701b56a1aff4178dd551a104efba7e337f..79e4fe3001872fe5c5471277c0888376d2f42e89 100644
--- a/substrate/frame/assets/src/lib.rs
+++ b/substrate/frame/assets/src/lib.rs
@@ -160,12 +160,12 @@ pub use types::*;
 use scale_info::TypeInfo;
 use sp_runtime::{
 	traits::{AtLeast32BitUnsigned, CheckedAdd, CheckedSub, Saturating, StaticLookup, Zero},
-	ArithmeticError, TokenError,
+	ArithmeticError, DispatchError, TokenError,
 };
 use sp_std::prelude::*;
 
 use frame_support::{
-	dispatch::{DispatchError, DispatchResult},
+	dispatch::DispatchResult,
 	ensure,
 	pallet_prelude::DispatchResultWithPostInfo,
 	storage::KeyPrefixIterator,
diff --git a/substrate/frame/atomic-swap/Cargo.toml b/substrate/frame/atomic-swap/Cargo.toml
index ca5ed36691024f23ac7b76217f5d6b0692e0bf10..1b4eabaf0cff5e69bbe65a118b36b4c41e740cc1 100644
--- a/substrate/frame/atomic-swap/Cargo.toml
+++ b/substrate/frame/atomic-swap/Cargo.toml
@@ -1,11 +1,11 @@
 [package]
 name = "pallet-atomic-swap"
 version = "4.0.0-dev"
-authors = ["Parity Technologies <admin@parity.io>"]
-edition = "2021"
+authors.workspace = true
+edition.workspace = true
 license = "Apache-2.0"
 homepage = "https://substrate.io"
-repository = "https://github.com/paritytech/substrate/"
+repository.workspace = true
 description = "FRAME atomic swap pallet"
 readme = "README.md"
 
diff --git a/substrate/frame/atomic-swap/README.md b/substrate/frame/atomic-swap/README.md
index 888a64ec7e0658e8cb6ffc6a95f59a300a8ae1aa..d5f924c64fc8dc90f7d946186448b23619ae83b4 100644
--- a/substrate/frame/atomic-swap/README.md
+++ b/substrate/frame/atomic-swap/README.md
@@ -16,8 +16,8 @@ claimed within a specified duration of time, the sender may cancel it.
 
 ### Dispatchable Functions
 
-* `create_swap` - called by a sender to register a new atomic swap
-* `claim_swap` - called by the target to approve a swap
-* `cancel_swap` - may be called by a sender after a specified duration
+- `create_swap` - called by a sender to register a new atomic swap
+- `claim_swap` - called by the target to approve a swap
+- `cancel_swap` - may be called by a sender after a specified duration
 
 License: Apache-2.0
diff --git a/substrate/frame/atomic-swap/src/tests.rs b/substrate/frame/atomic-swap/src/tests.rs
index 858417e8007fb8bfbf7847fa62fb67598eab0f6a..e20e1df564c7363c5a500906e35e9cdffb1ef2a3 100644
--- a/substrate/frame/atomic-swap/src/tests.rs
+++ b/substrate/frame/atomic-swap/src/tests.rs
@@ -1,3 +1,20 @@
+// 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.
+
 #![cfg(test)]
 
 use super::*;
diff --git a/substrate/frame/aura/Cargo.toml b/substrate/frame/aura/Cargo.toml
index 6a97d027b6358c168a634310e188a817f115330b..3d2879bb89f55294f8264bb31eba2ab20648e57b 100644
--- a/substrate/frame/aura/Cargo.toml
+++ b/substrate/frame/aura/Cargo.toml
@@ -1,11 +1,11 @@
 [package]
 name = "pallet-aura"
 version = "4.0.0-dev"
-authors = ["Parity Technologies <admin@parity.io>"]
-edition = "2021"
+authors.workspace = true
+edition.workspace = true
 license = "Apache-2.0"
 homepage = "https://substrate.io"
-repository = "https://github.com/paritytech/substrate/"
+repository.workspace = true
 description = "FRAME AURA consensus pallet"
 readme = "README.md"
 
diff --git a/substrate/frame/aura/README.md b/substrate/frame/aura/README.md
index 263f158d790686aa34fb2a238aad1999e4934011..3ce9652a5385c9a1fd7d781eea99e04027ac7e57 100644
--- a/substrate/frame/aura/README.md
+++ b/substrate/frame/aura/README.md
@@ -23,6 +23,7 @@ consensus rounds (via `slots`).
 If you're interested in hacking on this module, it is useful to understand the interaction with
 `substrate/primitives/inherents/src/lib.rs` and, specifically, the required implementation of
 [`ProvideInherent`](https://docs.rs/sp-inherents/latest/sp_inherents/trait.ProvideInherent.html) and
-[`ProvideInherentData`](https://docs.rs/sp-inherents/latest/sp_inherents/trait.ProvideInherentData.html) to create and check inherents.
+[`ProvideInherentData`](https://docs.rs/sp-inherents/latest/sp_inherents/trait.ProvideInherentData.html) to create and
+check inherents.
 
 License: Apache-2.0
diff --git a/substrate/frame/authority-discovery/Cargo.toml b/substrate/frame/authority-discovery/Cargo.toml
index c21a4f2356b9bcfb9880f35e1b5895478827038d..d1e37777adad8aac65e639d0b6a64f71108a3ca3 100644
--- a/substrate/frame/authority-discovery/Cargo.toml
+++ b/substrate/frame/authority-discovery/Cargo.toml
@@ -1,11 +1,11 @@
 [package]
 name = "pallet-authority-discovery"
 version = "4.0.0-dev"
-authors = ["Parity Technologies <admin@parity.io>"]
-edition = "2021"
+authors.workspace = true
+edition.workspace = true
 license = "Apache-2.0"
 homepage = "https://substrate.io"
-repository = "https://github.com/paritytech/substrate/"
+repository.workspace = true
 description = "FRAME pallet for authority discovery"
 readme = "README.md"
 
diff --git a/substrate/frame/authority-discovery/README.md b/substrate/frame/authority-discovery/README.md
index 9a534dcbeb6f8f98ec2260176ca4075f81179194..f4435a9f3161236951d4acd876df3f77598e5f51 100644
--- a/substrate/frame/authority-discovery/README.md
+++ b/substrate/frame/authority-discovery/README.md
@@ -1,6 +1,6 @@
-# Authority discovery module.
+# Authority discovery module
 
 This module is used by the `client/authority-discovery` to retrieve the
 current set of authorities.
 
-License: Apache-2.0
\ No newline at end of file
+License: Apache-2.0
diff --git a/substrate/frame/authorship/Cargo.toml b/substrate/frame/authorship/Cargo.toml
index 060d86daaeafeae8d72eef9aba50ce0d3495db2b..ff089a8e7ad2f6760edf31a50fa37e983d4cfc5d 100644
--- a/substrate/frame/authorship/Cargo.toml
+++ b/substrate/frame/authorship/Cargo.toml
@@ -2,11 +2,11 @@
 name = "pallet-authorship"
 version = "4.0.0-dev"
 description = "Block and Uncle Author tracking for the FRAME"
-authors = ["Parity Technologies <admin@parity.io>"]
-edition = "2021"
+authors.workspace = true
+edition.workspace = true
 license = "Apache-2.0"
 homepage = "https://substrate.io"
-repository = "https://github.com/paritytech/substrate/"
+repository.workspace = true
 readme = "README.md"
 
 [package.metadata.docs.rs]
diff --git a/substrate/frame/authorship/README.md b/substrate/frame/authorship/README.md
index d61747da3e101b4989b517a77c166cf98cbce6fe..db4b979319ab63f8f627f9b5707fe0560f2f2b08 100644
--- a/substrate/frame/authorship/README.md
+++ b/substrate/frame/authorship/README.md
@@ -2,4 +2,4 @@ Authorship tracking for FRAME runtimes.
 
 This tracks the current author of the block and recent uncles.
 
-License: Apache-2.0
\ No newline at end of file
+License: Apache-2.0
diff --git a/substrate/frame/authorship/src/lib.rs b/substrate/frame/authorship/src/lib.rs
index a9bd0c38cb67c0a84b142a50e3ca857fb84d0f25..56a516894dec2a430ccbbc193fe02c83adbb9597 100644
--- a/substrate/frame/authorship/src/lib.rs
+++ b/substrate/frame/authorship/src/lib.rs
@@ -97,16 +97,10 @@ mod tests {
 	use super::*;
 	use crate as pallet_authorship;
 	use codec::{Decode, Encode};
-	use frame_support::{
-		traits::{ConstU32, ConstU64},
-		ConsensusEngineId,
-	};
+	use frame_support::{derive_impl, ConsensusEngineId};
 	use sp_core::H256;
 	use sp_runtime::{
-		generic::DigestItem,
-		testing::Header,
-		traits::{BlakeTwo256, Header as HeaderT, IdentityLookup},
-		BuildStorage,
+		generic::DigestItem, testing::Header, traits::Header as HeaderT, BuildStorage,
 	};
 
 	type Block = frame_system::mocking::MockBlock<Test>;
@@ -119,30 +113,9 @@ mod tests {
 		}
 	);
 
+	#[derive_impl(frame_system::config_preludes::TestDefaultConfig as frame_system::DefaultConfig)]
 	impl frame_system::Config for Test {
-		type BaseCallFilter = frame_support::traits::Everything;
-		type BlockWeights = ();
-		type BlockLength = ();
-		type DbWeight = ();
-		type RuntimeOrigin = RuntimeOrigin;
-		type Nonce = u64;
-		type RuntimeCall = RuntimeCall;
-		type Hash = H256;
-		type Hashing = BlakeTwo256;
-		type AccountId = u64;
-		type Lookup = IdentityLookup<Self::AccountId>;
 		type Block = Block;
-		type RuntimeEvent = RuntimeEvent;
-		type BlockHashCount = ConstU64<250>;
-		type Version = ();
-		type PalletInfo = PalletInfo;
-		type AccountData = ();
-		type OnNewAccount = ();
-		type OnKilledAccount = ();
-		type SystemWeightInfo = ();
-		type SS58Prefix = ();
-		type OnSetCode = ();
-		type MaxConsumers = ConstU32<16>;
 	}
 
 	impl pallet::Config for Test {
diff --git a/substrate/frame/babe/Cargo.toml b/substrate/frame/babe/Cargo.toml
index 5ec78e313d70889d56e0dcd0427a16b11416ac0e..e610d34197b9978b3313df69143dd0fb33be8a40 100644
--- a/substrate/frame/babe/Cargo.toml
+++ b/substrate/frame/babe/Cargo.toml
@@ -1,11 +1,11 @@
 [package]
 name = "pallet-babe"
 version = "4.0.0-dev"
-authors = ["Parity Technologies <admin@parity.io>"]
-edition = "2021"
+authors.workspace = true
+edition.workspace = true
 license = "Apache-2.0"
 homepage = "https://substrate.io"
-repository = "https://github.com/paritytech/substrate/"
+repository.workspace = true
 description = "Consensus extension module for BABE consensus. Collects on-chain randomness from VRF outputs and manages epoch transitions."
 readme = "README.md"
 
diff --git a/substrate/frame/babe/README.md b/substrate/frame/babe/README.md
index 6f20be89efc0cd57bcf4ab1a082f1f5198e42fa7..3d1af534eeb63729924171421e0735d00154c077 100644
--- a/substrate/frame/babe/README.md
+++ b/substrate/frame/babe/README.md
@@ -1,4 +1,4 @@
 Consensus extension module for BABE consensus. Collects on-chain randomness
 from VRF outputs and manages epoch transitions.
 
-License: Apache-2.0
\ No newline at end of file
+License: Apache-2.0
diff --git a/substrate/frame/babe/src/lib.rs b/substrate/frame/babe/src/lib.rs
index 9549fac9fe2b629ce3968b80c8d2e424ae252dd5..4b99cd517968d8ddcf336cb5ccb022b611d57a5a 100644
--- a/substrate/frame/babe/src/lib.rs
+++ b/substrate/frame/babe/src/lib.rs
@@ -590,7 +590,6 @@ impl<T: Config> Pallet<T> {
 
 		if authorities.is_empty() {
 			log::warn!(target: LOG_TARGET, "Ignoring empty epoch change.");
-
 			return
 		}
 
@@ -664,7 +663,7 @@ impl<T: Config> Pallet<T> {
 		let next_randomness = NextRandomness::<T>::get();
 
 		let next_epoch = NextEpochDescriptor {
-			authorities: next_authorities.to_vec(),
+			authorities: next_authorities.into_inner(),
 			randomness: next_randomness,
 		};
 		Self::deposit_consensus(ConsensusLog::NextEpochData(next_epoch));
@@ -700,7 +699,7 @@ impl<T: Config> Pallet<T> {
 			epoch_index: EpochIndex::<T>::get(),
 			start_slot: Self::current_epoch_start(),
 			duration: T::EpochDuration::get(),
-			authorities: Self::authorities().to_vec(),
+			authorities: Self::authorities().into_inner(),
 			randomness: Self::randomness(),
 			config: EpochConfig::<T>::get()
 				.expect("EpochConfig is initialized in genesis; we never `take` or `kill` it; qed"),
@@ -725,7 +724,7 @@ impl<T: Config> Pallet<T> {
 			epoch_index: next_epoch_index,
 			start_slot,
 			duration: T::EpochDuration::get(),
-			authorities: NextAuthorities::<T>::get().to_vec(),
+			authorities: NextAuthorities::<T>::get().into_inner(),
 			randomness: NextRandomness::<T>::get(),
 			config: NextEpochConfig::<T>::get().unwrap_or_else(|| {
 				EpochConfig::<T>::get().expect(
@@ -778,7 +777,7 @@ impl<T: Config> Pallet<T> {
 		// we use the same values as genesis because we haven't collected any
 		// randomness yet.
 		let next = NextEpochDescriptor {
-			authorities: Self::authorities().to_vec(),
+			authorities: Self::authorities().into_inner(),
 			randomness: Self::randomness(),
 		};
 
diff --git a/substrate/frame/babe/src/mock.rs b/substrate/frame/babe/src/mock.rs
index dbffe9f312e60a25adfa67fc13b0562ca52590d7..a3f755902b598b7a55b005efcd675295991ad2a0 100644
--- a/substrate/frame/babe/src/mock.rs
+++ b/substrate/frame/babe/src/mock.rs
@@ -24,7 +24,7 @@ use frame_election_provider_support::{
 	onchain, SequentialPhragmen,
 };
 use frame_support::{
-	parameter_types,
+	derive_impl, parameter_types,
 	traits::{ConstU128, ConstU32, ConstU64, KeyOwnerProofSystem, OnInitialize},
 };
 use pallet_session::historical as pallet_session_historical;
@@ -32,14 +32,14 @@ use pallet_staking::FixedNominationsQuota;
 use sp_consensus_babe::{AuthorityId, AuthorityPair, Randomness, Slot, VrfSignature};
 use sp_core::{
 	crypto::{KeyTypeId, Pair, VrfSecret},
-	H256, U256,
+	U256,
 };
 use sp_io;
 use sp_runtime::{
 	curve::PiecewiseLinear,
 	impl_opaque_keys,
 	testing::{Digest, DigestItem, Header, TestXt},
-	traits::{Header as _, IdentityLookup, OpaqueKeys},
+	traits::{Header as _, OpaqueKeys},
 	BuildStorage, Perbill,
 };
 use sp_staking::{EraIndex, SessionIndex};
@@ -63,30 +63,10 @@ frame_support::construct_runtime!(
 	}
 );
 
+#[derive_impl(frame_system::config_preludes::TestDefaultConfig as frame_system::DefaultConfig)]
 impl frame_system::Config for Test {
-	type BaseCallFilter = frame_support::traits::Everything;
-	type BlockWeights = ();
-	type BlockLength = ();
-	type DbWeight = ();
-	type RuntimeOrigin = RuntimeOrigin;
-	type Nonce = u64;
-	type RuntimeCall = RuntimeCall;
-	type Hash = H256;
-	type Version = ();
-	type Hashing = sp_runtime::traits::BlakeTwo256;
-	type AccountId = DummyValidatorId;
-	type Lookup = IdentityLookup<Self::AccountId>;
 	type Block = Block;
-	type RuntimeEvent = RuntimeEvent;
-	type BlockHashCount = ConstU64<250>;
-	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>;
 }
 
 impl<C> frame_system::offchain::SendTransactionTypes<C> for Test
diff --git a/substrate/frame/babe/src/tests.rs b/substrate/frame/babe/src/tests.rs
index ae0c3e3873c5023f25c6ab6c6d3f1e4bdceb6d39..ec4e6fd972708a643d8daccbcf811866966fd37b 100644
--- a/substrate/frame/babe/src/tests.rs
+++ b/substrate/frame/babe/src/tests.rs
@@ -95,7 +95,7 @@ fn first_block_epoch_zero_start() {
 
 		let consensus_log = sp_consensus_babe::ConsensusLog::NextEpochData(
 			sp_consensus_babe::digests::NextEpochDescriptor {
-				authorities: Babe::authorities().to_vec(),
+				authorities: Babe::authorities().into_inner(),
 				randomness: Babe::randomness(),
 			},
 		);
diff --git a/substrate/frame/bags-list/Cargo.toml b/substrate/frame/bags-list/Cargo.toml
index 919b8749b2b2b1d84f2a521bb6722729d93e485f..f4644890e2bafd4b9a25ec25dc81dddb020fae2e 100644
--- a/substrate/frame/bags-list/Cargo.toml
+++ b/substrate/frame/bags-list/Cargo.toml
@@ -1,11 +1,11 @@
 [package]
 name = "pallet-bags-list"
 version = "4.0.0-dev"
-authors = ["Parity Technologies <admin@parity.io>"]
-edition = "2021"
+authors.workspace = true
+edition.workspace = true
 license = "Apache-2.0"
 homepage = "https://substrate.io"
-repository = "https://github.com/paritytech/substrate/"
+repository.workspace = true
 description = "FRAME pallet bags list"
 
 [package.metadata.docs.rs]
@@ -27,7 +27,7 @@ frame-election-provider-support = { path = "../election-provider-support", defau
 
 # third party
 log = { version = "0.4.17", default-features = false }
-docify = "0.2.1"
+docify = "0.2.4"
 aquamarine = { version = "0.3.2" }
 
 # Optional imports for benchmarking
diff --git a/substrate/frame/bags-list/fuzzer/Cargo.toml b/substrate/frame/bags-list/fuzzer/Cargo.toml
index 5cdc763ffcecb7f3e0c8f497f7cae58fab32ecf0..9944c8865548fff5b3578823a4bfc174559a7b69 100644
--- a/substrate/frame/bags-list/fuzzer/Cargo.toml
+++ b/substrate/frame/bags-list/fuzzer/Cargo.toml
@@ -1,11 +1,11 @@
 [package]
 name = "pallet-bags-list-fuzzer"
 version = "4.0.0-dev"
-authors = ["Parity Technologies <admin@parity.io>"]
-edition = "2021"
+authors.workspace = true
+edition.workspace = true
 license = "Apache-2.0"
 homepage = "https://substrate.io"
-repository = "https://github.com/paritytech/substrate/"
+repository.workspace = true
 description = "Fuzzer for FRAME pallet bags list"
 publish = false
 
diff --git a/substrate/frame/bags-list/remote-tests/Cargo.toml b/substrate/frame/bags-list/remote-tests/Cargo.toml
index a7f9871a894b7dbd50ca21697481ebda13cf5bd9..b7408e08d55ff08926bde2a37b286e92cee68204 100644
--- a/substrate/frame/bags-list/remote-tests/Cargo.toml
+++ b/substrate/frame/bags-list/remote-tests/Cargo.toml
@@ -1,11 +1,11 @@
 [package]
 name = "pallet-bags-list-remote-tests"
 version = "4.0.0-dev"
-authors = ["Parity Technologies <admin@parity.io>"]
-edition = "2021"
+authors.workspace = true
+edition.workspace = true
 license = "Apache-2.0"
 homepage = "https://substrate.io"
-repository = "https://github.com/paritytech/substrate/"
+repository.workspace = true
 description = "FRAME pallet bags list remote test"
 publish = false
 
diff --git a/substrate/frame/bags-list/remote-tests/src/migration.rs b/substrate/frame/bags-list/remote-tests/src/migration.rs
index 7847fdc7591c0195ec1922b7f730ff18535ca03e..dc133745afe073e33d466503307e86f834cc7382 100644
--- a/substrate/frame/bags-list/remote-tests/src/migration.rs
+++ b/substrate/frame/bags-list/remote-tests/src/migration.rs
@@ -1,4 +1,4 @@
-// Copyright Parity Technologies (UK) Ltd.
+// Copyright (C) Parity Technologies (UK) Ltd.
 // This file is part of Polkadot.
 
 // Polkadot is free software: you can redistribute it and/or modify
diff --git a/substrate/frame/bags-list/remote-tests/src/snapshot.rs b/substrate/frame/bags-list/remote-tests/src/snapshot.rs
index 78c5b4e1c7b6dbf3559543c2e776a4fd89422487..81a8905e6b4b2c6e2f89f00c84cbc421bf3ae92b 100644
--- a/substrate/frame/bags-list/remote-tests/src/snapshot.rs
+++ b/substrate/frame/bags-list/remote-tests/src/snapshot.rs
@@ -1,4 +1,4 @@
-// Copyright Parity Technologies (UK) Ltd.
+// Copyright (C) Parity Technologies (UK) Ltd.
 // This file is part of Polkadot.
 
 // Polkadot is free software: you can redistribute it and/or modify
@@ -42,8 +42,8 @@ where
 				.to_string()],
 			at: None,
 			hashed_prefixes: vec![
-				<pallet_staking::Bonded<Runtime>>::prefix_hash(),
-				<pallet_staking::Ledger<Runtime>>::prefix_hash(),
+				<pallet_staking::Bonded<Runtime>>::prefix_hash().to_vec(),
+				<pallet_staking::Ledger<Runtime>>::prefix_hash().to_vec(),
 				<pallet_staking::Validators<Runtime>>::map_storage_final_prefix(),
 				<pallet_staking::Nominators<Runtime>>::map_storage_final_prefix(),
 			],
diff --git a/substrate/frame/bags-list/remote-tests/src/try_state.rs b/substrate/frame/bags-list/remote-tests/src/try_state.rs
index 5bbac00bc75abd9610b95a4d2d44019c808201d5..83930024c89a51be8126caea07647784b8c1f66d 100644
--- a/substrate/frame/bags-list/remote-tests/src/try_state.rs
+++ b/substrate/frame/bags-list/remote-tests/src/try_state.rs
@@ -1,4 +1,4 @@
-// Copyright Parity Technologies (UK) Ltd.
+// Copyright (C) Parity Technologies (UK) Ltd.
 // This file is part of Polkadot.
 
 // Polkadot is free software: you can redistribute it and/or modify
@@ -39,8 +39,8 @@ pub async fn execute<Runtime, Block>(
 			pallets: vec![pallet_bags_list::Pallet::<Runtime, pallet_bags_list::Instance1>::name()
 				.to_string()],
 			hashed_prefixes: vec![
-				<pallet_staking::Bonded<Runtime>>::prefix_hash(),
-				<pallet_staking::Ledger<Runtime>>::prefix_hash(),
+				<pallet_staking::Bonded<Runtime>>::prefix_hash().to_vec(),
+				<pallet_staking::Ledger<Runtime>>::prefix_hash().to_vec(),
 			],
 			..Default::default()
 		}))
diff --git a/substrate/frame/bags-list/src/lib.rs b/substrate/frame/bags-list/src/lib.rs
index a5d3257b734bb644b06967540a2435eec0236aa2..8e3d4cc1f012d7c5c8fa62c8eea903ea8fa522da 100644
--- a/substrate/frame/bags-list/src/lib.rs
+++ b/substrate/frame/bags-list/src/lib.rs
@@ -17,7 +17,7 @@
 
 //! > Made with *Substrate*, for *Polkadot*.
 //!
-//! [![github]](https://github.com/paritytech/substrate/frame/fast-unstake) -
+//! [![github]](https://github.com/paritytech/polkadot-sdk/tree/master/substrate/frame/bags-list) -
 //! [![polkadot]](https://polkadot.network)
 //!
 //! [polkadot]:
diff --git a/substrate/frame/bags-list/src/mock.rs b/substrate/frame/bags-list/src/mock.rs
index ae50adabd508a8c5e429c452e9fde28159ee9f53..9946a2198ac4f94f1c9eb13104ba343f686b39dd 100644
--- a/substrate/frame/bags-list/src/mock.rs
+++ b/substrate/frame/bags-list/src/mock.rs
@@ -20,11 +20,11 @@
 use super::*;
 use crate::{self as bags_list};
 use frame_election_provider_support::VoteWeight;
-use frame_support::parameter_types;
+use frame_support::{derive_impl, parameter_types};
 use sp_runtime::BuildStorage;
 use std::collections::HashMap;
 
-pub type AccountId = u32;
+pub type AccountId = <Runtime as frame_system::Config>::AccountId;
 pub type Balance = u32;
 
 parameter_types! {
@@ -48,30 +48,10 @@ impl frame_election_provider_support::ScoreProvider<AccountId> for StakingMock {
 	}
 }
 
+#[derive_impl(frame_system::config_preludes::TestDefaultConfig as frame_system::DefaultConfig)]
 impl frame_system::Config for Runtime {
-	type SS58Prefix = ();
-	type BaseCallFilter = frame_support::traits::Everything;
-	type RuntimeOrigin = RuntimeOrigin;
-	type Nonce = u64;
-	type RuntimeCall = RuntimeCall;
-	type Hash = sp_core::H256;
-	type Hashing = sp_runtime::traits::BlakeTwo256;
-	type AccountId = AccountId;
-	type Lookup = sp_runtime::traits::IdentityLookup<Self::AccountId>;
 	type Block = Block;
-	type RuntimeEvent = RuntimeEvent;
-	type BlockHashCount = ();
-	type DbWeight = ();
-	type BlockLength = ();
-	type BlockWeights = ();
-	type Version = ();
-	type PalletInfo = PalletInfo;
 	type AccountData = pallet_balances::AccountData<Balance>;
-	type OnNewAccount = ();
-	type OnKilledAccount = ();
-	type SystemWeightInfo = ();
-	type OnSetCode = ();
-	type MaxConsumers = frame_support::traits::ConstU32<16>;
 }
 
 parameter_types! {
diff --git a/substrate/frame/bags-list/src/tests.rs b/substrate/frame/bags-list/src/tests.rs
index 9e8508698d8e8f613b1b78fb6472386d046d9c98..0b382a4fcefa98d437515ba36eccf2122b5e929d 100644
--- a/substrate/frame/bags-list/src/tests.rs
+++ b/substrate/frame/bags-list/src/tests.rs
@@ -163,7 +163,7 @@ mod pallet {
 
 			assert_eq!(Bag::<Runtime>::get(10).unwrap(), Bag::new(Some(1), Some(3), 10));
 			assert_eq!(Bag::<Runtime>::get(1_000).unwrap(), Bag::new(Some(2), Some(2), 1_000));
-			assert_eq!(get_list_as_ids(), vec![2u32, 1, 4, 3]);
+			assert_eq!(get_list_as_ids(), vec![2u64, 1, 4, 3]);
 
 			// when
 			StakingMock::set_score_of(&2, 10);
@@ -272,10 +272,10 @@ mod pallet {
 				// given
 				assert_eq!(List::<Runtime>::get_bags(), vec![(20, vec![10, 11, 12])]);
 				// 11 now has more weight than 10 and can be moved before it.
-				StakingMock::set_score_of(&11u32, 17);
+				StakingMock::set_score_of(&11u64, 17);
 
 				// when
-				assert_ok!(BagsList::put_in_front_of_other(RuntimeOrigin::signed(42), 11u32, 10));
+				assert_ok!(BagsList::put_in_front_of_other(RuntimeOrigin::signed(42), 11u64, 10));
 
 				// then
 				assert_eq!(List::<Runtime>::get_bags(), vec![(20, vec![11, 10, 12])]);
diff --git a/substrate/frame/balances/Cargo.toml b/substrate/frame/balances/Cargo.toml
index 6ca0cf9473edbbb0a011ae70e4512f1037f07cd4..8d0fc96fe5900aa0d1fe21565376d0ef11971596 100644
--- a/substrate/frame/balances/Cargo.toml
+++ b/substrate/frame/balances/Cargo.toml
@@ -1,11 +1,11 @@
 [package]
 name = "pallet-balances"
 version = "4.0.0-dev"
-authors = ["Parity Technologies <admin@parity.io>"]
-edition = "2021"
+authors.workspace = true
+edition.workspace = true
 license = "Apache-2.0"
 homepage = "https://substrate.io"
-repository = "https://github.com/paritytech/substrate/"
+repository.workspace = true
 description = "FRAME pallet to manage balances"
 readme = "README.md"
 
diff --git a/substrate/frame/balances/README.md b/substrate/frame/balances/README.md
index fa1ee622d48ce2858df0d3b9937d6645b290c7ac..1dc93a6bd8fddce5fd5912885a6aa2ed74bb9385 100644
--- a/substrate/frame/balances/README.md
+++ b/substrate/frame/balances/README.md
@@ -21,49 +21,48 @@ The Balances module provides functions for:
 
 ### Terminology
 
-- **Existential Deposit:** The minimum balance required to create or keep an account open. This prevents
-"dust accounts" from filling storage. When the free plus the reserved balance (i.e. the total balance)
-  fall below this, then the account is said to be dead; and it loses its functionality as well as any
-  prior history and all information on it is removed from the chain's state.
-  No account should ever have a total balance that is strictly between 0 and the existential
-  deposit (exclusive). If this ever happens, it indicates either a bug in this module or an
-  erroneous raw mutation of storage.
+- **Existential Deposit:** The minimum balance required to create or keep an account open. This prevents "dust accounts"
+from filling storage. When the free plus the reserved balance (i.e. the total balance) fall below this, then the account
+  is said to be dead; and it loses its functionality as well as any prior history and all information on it is removed
+  from the chain's state. No account should ever have a total balance that is strictly between 0 and the existential
+  deposit (exclusive). If this ever happens, it indicates either a bug in this module or an erroneous raw mutation of
+  storage.
 
 - **Total Issuance:** The total number of units in existence in a system.
 
-- **Reaping an account:** The act of removing an account by resetting its nonce. Happens after its
-total balance has become zero (or, strictly speaking, less than the Existential Deposit).
+- **Reaping an account:** The act of removing an account by resetting its nonce. Happens after its total balance has
+become zero (or, strictly speaking, less than the Existential Deposit).
 
-- **Free Balance:** The portion of a balance that is not reserved. The free balance is the only
-  balance that matters for most operations.
+- **Free Balance:** The portion of a balance that is not reserved. The free balance is the only balance that matters for
+  most operations.
 
-- **Reserved Balance:** Reserved balance still belongs to the account holder, but is suspended.
-  Reserved balance can still be slashed, but only after all the free balance has been slashed.
+- **Reserved Balance:** Reserved balance still belongs to the account holder, but is suspended. Reserved balance can
+  still be slashed, but only after all the free balance has been slashed.
 
-- **Imbalance:** A condition when some funds were credited or debited without equal and opposite accounting
-(i.e. a difference between total issuance and account balances). Functions that result in an imbalance will
-return an object of the `Imbalance` trait that can be managed within your runtime logic. (If an imbalance is
-simply dropped, it should automatically maintain any book-keeping such as total issuance.)
+- **Imbalance:** A condition when some funds were credited or debited without equal and opposite accounting (i.e. a
+difference between total issuance and account balances). Functions that result in an imbalance will return an object of
+the `Imbalance` trait that can be managed within your runtime logic. (If an imbalance is simply dropped, it should
+automatically maintain any book-keeping such as total issuance.)
 
-- **Lock:** A freeze on a specified amount of an account's free balance until a specified block number. Multiple
-locks always operate over the same funds, so they "overlay" rather than "stack".
+- **Lock:** A freeze on a specified amount of an account's free balance until a specified block number. Multiple locks
+always operate over the same funds, so they "overlay" rather than "stack".
 
 ### Implementations
 
-The Balances module provides implementations for the following traits. If these traits provide the functionality
-that you need, then you can avoid coupling with the Balances module.
+The Balances module provides implementations for the following traits. If these traits provide the functionality that
+you need, then you can avoid coupling with the Balances module.
 
-- [`Currency`](https://docs.rs/frame-support/latest/frame_support/traits/trait.Currency.html): Functions for dealing with a
-fungible assets system.
+- [`Currency`](https://docs.rs/frame-support/latest/frame_support/traits/trait.Currency.html): Functions for dealing
+with a fungible assets system.
 - [`ReservableCurrency`](https://docs.rs/frame-support/latest/frame_support/traits/trait.ReservableCurrency.html):
 Functions for dealing with assets that can be reserved from an account.
-- [`LockableCurrency`](https://docs.rs/frame-support/latest/frame_support/traits/trait.LockableCurrency.html): Functions for
-dealing with accounts that allow liquidity restrictions.
+- [`LockableCurrency`](https://docs.rs/frame-support/latest/frame_support/traits/trait.LockableCurrency.html): Functions
+for dealing with accounts that allow liquidity restrictions.
 - [`Imbalance`](https://docs.rs/frame-support/latest/frame_support/traits/trait.Imbalance.html): Functions for handling
-imbalances between total issuance in the system and account balances. Must be used when a function
-creates new funds (e.g. a reward) or destroys some funds (e.g. a system fee).
-- [`IsDeadAccount`](https://docs.rs/frame-support/latest/frame_support/traits/trait.IsDeadAccount.html): Determiner to say whether a
-given account is unused.
+imbalances between total issuance in the system and account balances. Must be used when a function creates new funds
+(e.g. a reward) or destroys some funds (e.g. a system fee).
+- [`IsDeadAccount`](https://docs.rs/frame-support/latest/frame_support/traits/trait.IsDeadAccount.html): Determiner to
+say whether a given account is unused.
 
 ## Interface
 
@@ -113,10 +112,11 @@ fn update_ledger<T: Config>(
 
 ## Genesis config
 
-The Balances module depends on the [`GenesisConfig`](https://docs.rs/pallet-balances/latest/pallet_balances/pallet/struct.GenesisConfig.html).
+The Balances module depends on the
+[`GenesisConfig`](https://docs.rs/pallet-balances/latest/pallet_balances/pallet/struct.GenesisConfig.html).
 
 ## Assumptions
 
-* Total issued balanced of all accounts should be less than `Config::Balance::max_value()`.
+- Total issued balanced of all accounts should be less than `Config::Balance::max_value()`.
 
 License: Apache-2.0
diff --git a/substrate/frame/balances/src/impl_currency.rs b/substrate/frame/balances/src/impl_currency.rs
index 2cbe776c51297ae51fe6b429a5f4466764f1e934..1ac882ade70dfb92df8ae5bbe3897fa7799ae53f 100644
--- a/substrate/frame/balances/src/impl_currency.rs
+++ b/substrate/frame/balances/src/impl_currency.rs
@@ -1,6 +1,6 @@
 // This file is part of Substrate.
 
-// Copyright (C) 2017-2022 Parity Technologies (UK) Ltd.
+// Copyright (C) Parity Technologies (UK) Ltd.
 // SPDX-License-Identifier: Apache-2.0
 
 // Licensed under the Apache License, Version 2.0 (the "License");
@@ -100,6 +100,11 @@ mod imbalances {
 			mem::forget(self);
 			(Self(first), Self(second))
 		}
+		fn extract(&mut self, amount: T::Balance) -> Self {
+			let new = self.0.min(amount);
+			self.0 = self.0 - new;
+			Self(new)
+		}
 		fn merge(mut self, other: Self) -> Self {
 			self.0 = self.0.saturating_add(other.0);
 			mem::forget(other);
@@ -159,6 +164,11 @@ mod imbalances {
 			mem::forget(self);
 			(Self(first), Self(second))
 		}
+		fn extract(&mut self, amount: T::Balance) -> Self {
+			let new = self.0.min(amount);
+			self.0 = self.0 - new;
+			Self(new)
+		}
 		fn merge(mut self, other: Self) -> Self {
 			self.0 = self.0.saturating_add(other.0);
 			mem::forget(other);
diff --git a/substrate/frame/balances/src/impl_fungible.rs b/substrate/frame/balances/src/impl_fungible.rs
index 03c40bb3a8401608c4c9ded644f984df962c0082..fc8c2d71f256eebd0d77b1a675f7677fc6326b43 100644
--- a/substrate/frame/balances/src/impl_fungible.rs
+++ b/substrate/frame/balances/src/impl_fungible.rs
@@ -1,6 +1,6 @@
 // This file is part of Substrate.
 
-// Copyright (C) 2017-2022 Parity Technologies (UK) Ltd.
+// Copyright (C) Parity Technologies (UK) Ltd.
 // SPDX-License-Identifier: Apache-2.0
 
 // Licensed under the Apache License, Version 2.0 (the "License");
diff --git a/substrate/frame/balances/src/lib.rs b/substrate/frame/balances/src/lib.rs
index f94b3230b917b79a046ce8f1e8fcece8ab0473d7..c294779a0e0800ff2b4d1eff5294cda4b9661f04 100644
--- a/substrate/frame/balances/src/lib.rs
+++ b/substrate/frame/balances/src/lib.rs
@@ -216,7 +216,7 @@ pub mod pallet {
 	/// Default implementations of [`DefaultConfig`], which can be used to implement [`Config`].
 	pub mod config_preludes {
 		use super::*;
-		use frame_support::derive_impl;
+		use frame_support::{derive_impl, traits::ConstU64};
 
 		pub struct TestDefaultConfig;
 
@@ -227,16 +227,21 @@ pub mod pallet {
 		impl DefaultConfig for TestDefaultConfig {
 			#[inject_runtime_type]
 			type RuntimeEvent = ();
+			#[inject_runtime_type]
+			type RuntimeHoldReason = ();
 
 			type Balance = u64;
+			type ExistentialDeposit = ConstU64<1>;
 
 			type ReserveIdentifier = ();
 			type FreezeIdentifier = ();
 
-			type MaxLocks = ();
-			type MaxReserves = ();
-			type MaxFreezes = ();
-			type MaxHolds = ();
+			type DustRemoval = ();
+
+			type MaxLocks = ConstU32<100>;
+			type MaxReserves = ConstU32<100>;
+			type MaxFreezes = ConstU32<100>;
+			type MaxHolds = ConstU32<100>;
 
 			type WeightInfo = ();
 		}
@@ -249,6 +254,10 @@ pub mod pallet {
 		type RuntimeEvent: From<Event<Self, I>>
 			+ IsType<<Self as frame_system::Config>::RuntimeEvent>;
 
+		/// The overarching hold reason.
+		#[pallet::no_default_bounds]
+		type RuntimeHoldReason: Parameter + Member + MaxEncodedLen + Copy;
+
 		/// Weight information for extrinsics in this pallet.
 		type WeightInfo: WeightInfo;
 
@@ -266,7 +275,7 @@ pub mod pallet {
 			+ FixedPointOperand;
 
 		/// Handler for the unbalanced reduction when removing a dust account.
-		#[pallet::no_default]
+		#[pallet::no_default_bounds]
 		type DustRemoval: OnUnbalanced<CreditOf<Self, I>>;
 
 		/// The minimum amount required to keep an account open. MUST BE GREATER THAN ZERO!
@@ -278,7 +287,7 @@ pub mod pallet {
 		///
 		/// Bottom line: Do yourself a favour and make it at least one!
 		#[pallet::constant]
-		#[pallet::no_default]
+		#[pallet::no_default_bounds]
 		type ExistentialDeposit: Get<Self::Balance>;
 
 		/// The means of storing the balances of an account.
@@ -290,12 +299,8 @@ pub mod pallet {
 		/// Use of reserves is deprecated in favour of holds. See `https://github.com/paritytech/substrate/pull/12951/`
 		type ReserveIdentifier: Parameter + Member + MaxEncodedLen + Ord + Copy;
 
-		/// The overarching hold reason.
-		#[pallet::no_default]
-		type RuntimeHoldReason: Parameter + Member + MaxEncodedLen + Ord + Copy;
-
 		/// The ID type for freezes.
-		type FreezeIdentifier: Parameter + Member + MaxEncodedLen + Ord + Copy;
+		type FreezeIdentifier: Parameter + Member + MaxEncodedLen + Copy;
 
 		/// The maximum number of locks that should exist on an account.
 		/// Not strictly enforced, but used for weight estimation.
@@ -563,53 +568,6 @@ pub mod pallet {
 			Ok(())
 		}
 
-		/// Set the regular balance of a given account; it also takes a reserved balance but this
-		/// must be the same as the account's current reserved balance.
-		///
-		/// The dispatch origin for this call is `root`.
-		///
-		/// WARNING: This call is DEPRECATED! Use `force_set_balance` instead.
-		#[pallet::call_index(1)]
-		#[pallet::weight(
-			T::WeightInfo::force_set_balance_creating() // Creates a new account.
-				.max(T::WeightInfo::force_set_balance_killing()) // Kills an existing account.
-		)]
-		pub fn set_balance_deprecated(
-			origin: OriginFor<T>,
-			who: AccountIdLookupOf<T>,
-			#[pallet::compact] new_free: T::Balance,
-			#[pallet::compact] old_reserved: T::Balance,
-		) -> DispatchResult {
-			ensure_root(origin)?;
-			let who = T::Lookup::lookup(who)?;
-			let existential_deposit = Self::ed();
-
-			let wipeout = new_free < existential_deposit;
-			let new_free = if wipeout { Zero::zero() } else { new_free };
-
-			// First we try to modify the account's balance to the forced balance.
-			let old_free = Self::try_mutate_account_handling_dust(
-				&who,
-				|account, _is_new| -> Result<T::Balance, DispatchError> {
-					let old_free = account.free;
-					ensure!(account.reserved == old_reserved, TokenError::Unsupported);
-					account.free = new_free;
-					Ok(old_free)
-				},
-			)?;
-
-			// This will adjust the total issuance, which was not done by the `mutate_account`
-			// above.
-			if new_free > old_free {
-				mem::drop(PositiveImbalance::<T, I>::new(new_free - old_free));
-			} else if new_free < old_free {
-				mem::drop(NegativeImbalance::<T, I>::new(old_free - new_free));
-			}
-
-			Self::deposit_event(Event::BalanceSet { who, free: new_free });
-			Ok(())
-		}
-
 		/// Exactly as `transfer_allow_death`, except the origin must be root and the source account
 		/// may be specified.
 		#[pallet::call_index(2)]
@@ -730,22 +688,6 @@ pub mod pallet {
 			}
 		}
 
-		/// Alias for `transfer_allow_death`, provided only for name-wise compatibility.
-		///
-		/// WARNING: DEPRECATED! Will be released in approximately 3 months.
-		#[pallet::call_index(7)]
-		#[pallet::weight(T::WeightInfo::transfer_allow_death())]
-		pub fn transfer(
-			origin: OriginFor<T>,
-			dest: AccountIdLookupOf<T>,
-			#[pallet::compact] value: T::Balance,
-		) -> DispatchResult {
-			let source = ensure_signed(origin)?;
-			let dest = T::Lookup::lookup(dest)?;
-			<Self as fungible::Mutate<_>>::transfer(&source, &dest, value, Expendable)?;
-			Ok(())
-		}
-
 		/// Set the regular balance of a given account.
 		///
 		/// The dispatch origin for this call is `root`.
diff --git a/substrate/frame/balances/src/migration.rs b/substrate/frame/balances/src/migration.rs
index 6a272a611c3f9c61d2cc687ffec5c66bea3b3b98..ba6819ec6e814da69807c8717a088df2451b6cb5 100644
--- a/substrate/frame/balances/src/migration.rs
+++ b/substrate/frame/balances/src/migration.rs
@@ -1,4 +1,4 @@
-// Copyright Parity Technologies (UK) Ltd.
+// Copyright (C) Parity Technologies (UK) Ltd.
 // This file is part of Polkadot.
 
 // Polkadot is free software: you can redistribute it and/or modify
diff --git a/substrate/frame/balances/src/tests/currency_tests.rs b/substrate/frame/balances/src/tests/currency_tests.rs
index c9ad19f79e36dcabce1fee9d78a10e86fe186c43..2449638788ddbfc8ea42a6d5b638a41f47ff1874 100644
--- a/substrate/frame/balances/src/tests/currency_tests.rs
+++ b/substrate/frame/balances/src/tests/currency_tests.rs
@@ -1,6 +1,6 @@
 // This file is part of Substrate.
 
-// Copyright (C) 2017-2022 Parity Technologies (UK) Ltd.
+// Copyright (C) Parity Technologies (UK) Ltd.
 // SPDX-License-Identifier: Apache-2.0
 
 // Licensed under the Apache License, Version 2.0 (the "License");
@@ -22,7 +22,7 @@ use crate::NegativeImbalance;
 use frame_support::traits::{
 	BalanceStatus::{Free, Reserved},
 	Currency,
-	ExistenceRequirement::{self, AllowDeath},
+	ExistenceRequirement::{self, AllowDeath, KeepAlive},
 	Hooks, LockIdentifier, LockableCurrency, NamedReservableCurrency, ReservableCurrency,
 	WithdrawReasons,
 };
@@ -33,6 +33,18 @@ const ID_2: LockIdentifier = *b"2       ";
 pub const CALL: &<Test as frame_system::Config>::RuntimeCall =
 	&RuntimeCall::Balances(crate::Call::transfer_allow_death { dest: 0, value: 0 });
 
+#[test]
+fn ed_should_work() {
+	ExtBuilder::default().existential_deposit(1).build_and_execute_with(|| {
+		assert_ok!(Balances::force_set_balance(RuntimeOrigin::root(), 1, 1000));
+		assert_noop!(
+			<Balances as Currency<_>>::transfer(&1, &10, 1000, KeepAlive),
+			TokenError::NotExpendable
+		);
+		assert_ok!(<Balances as Currency<_>>::transfer(&1, &10, 1000, AllowDeath));
+	});
+}
+
 #[test]
 fn set_lock_with_amount_zero_removes_lock() {
 	ExtBuilder::default()
diff --git a/substrate/frame/balances/src/tests/dispatchable_tests.rs b/substrate/frame/balances/src/tests/dispatchable_tests.rs
index 76d0961e577d2dbec24643641558c2d3e5fcd66c..8f625a189446b2982e16433db3c2ebae7e43f34d 100644
--- a/substrate/frame/balances/src/tests/dispatchable_tests.rs
+++ b/substrate/frame/balances/src/tests/dispatchable_tests.rs
@@ -1,6 +1,6 @@
 // This file is part of Substrate.
 
-// Copyright (C) 2017-2022 Parity Technologies (UK) Ltd.
+// Copyright (C) Parity Technologies (UK) Ltd.
 // SPDX-License-Identifier: Apache-2.0
 
 // Licensed under the Apache License, Version 2.0 (the "License");
diff --git a/substrate/frame/balances/src/tests/fungible_tests.rs b/substrate/frame/balances/src/tests/fungible_tests.rs
index ab2606c53ff71ce13cba779dcf58e39bb2ee351d..8bf0509d8f77e00802e0378eaa4c9ec26e341534 100644
--- a/substrate/frame/balances/src/tests/fungible_tests.rs
+++ b/substrate/frame/balances/src/tests/fungible_tests.rs
@@ -1,6 +1,6 @@
 // This file is part of Substrate.
 
-// Copyright (C) 2017-2022 Parity Technologies (UK) Ltd.
+// Copyright (C) Parity Technologies (UK) Ltd.
 // SPDX-License-Identifier: Apache-2.0
 
 // Licensed under the Apache License, Version 2.0 (the "License");
diff --git a/substrate/frame/balances/src/tests/mod.rs b/substrate/frame/balances/src/tests/mod.rs
index cefc6e9e8f51f2bf9df24f14f90a6c8205457824..d15f8e89118cc336cad226bfe1e16958cb653496 100644
--- a/substrate/frame/balances/src/tests/mod.rs
+++ b/substrate/frame/balances/src/tests/mod.rs
@@ -1,6 +1,6 @@
 // This file is part of Substrate.
 
-// Copyright (C) 2018-2022 Parity Technologies (UK) Ltd.
+// Copyright (C) Parity Technologies (UK) Ltd.
 // SPDX-License-Identifier: Apache-2.0
 
 // Licensed under the Apache License, Version 2.0 (the "License");
diff --git a/substrate/frame/balances/src/tests/reentrancy_tests.rs b/substrate/frame/balances/src/tests/reentrancy_tests.rs
index e97bf2ed2b706d582fc672f2c62c5f66afc4f74f..1afbe82c7e2a7b2c9eec65e0ad2f34a23aa025a3 100644
--- a/substrate/frame/balances/src/tests/reentrancy_tests.rs
+++ b/substrate/frame/balances/src/tests/reentrancy_tests.rs
@@ -1,6 +1,6 @@
 // This file is part of Substrate.
 
-// Copyright (C) 2017-2022 Parity Technologies (UK) Ltd.
+// Copyright (C) Parity Technologies (UK) Ltd.
 // SPDX-License-Identifier: Apache-2.0
 
 // Licensed under the Apache License, Version 2.0 (the "License");
diff --git a/substrate/frame/balances/src/types.rs b/substrate/frame/balances/src/types.rs
index cd100d0df6c6d4278b49696f3155fb9908d2f21e..af775b8eefe5c259b1f4035485b1ef217cb88749 100644
--- a/substrate/frame/balances/src/types.rs
+++ b/substrate/frame/balances/src/types.rs
@@ -1,6 +1,6 @@
 // This file is part of Substrate.
 
-// Copyright (C) 2017-2022 Parity Technologies (UK) Ltd.
+// Copyright (C) Parity Technologies (UK) Ltd.
 // SPDX-License-Identifier: Apache-2.0
 
 // Licensed under the Apache License, Version 2.0 (the "License");
diff --git a/substrate/frame/beefy-mmr/Cargo.toml b/substrate/frame/beefy-mmr/Cargo.toml
index afd7928d7077bc51b5edbd91b7f29e21ca877e6d..020ca52a277f68581479c59d9b053df3a2c672ef 100644
--- a/substrate/frame/beefy-mmr/Cargo.toml
+++ b/substrate/frame/beefy-mmr/Cargo.toml
@@ -1,11 +1,11 @@
 [package]
 name = "pallet-beefy-mmr"
 version = "4.0.0-dev"
-authors = ["Parity Technologies <admin@parity.io>"]
-edition = "2021"
+authors.workspace = true
+edition.workspace = true
 license = "Apache-2.0"
 description = "BEEFY + MMR runtime utilities"
-repository = "https://github.com/paritytech/substrate"
+repository.workspace = true
 homepage = "https://substrate.io"
 
 [dependencies]
@@ -13,7 +13,7 @@ array-bytes = { version = "6.1", optional = true }
 codec = { package = "parity-scale-codec", version = "3.6.1", default-features = false, features = ["derive"] }
 log = { version = "0.4.17", default-features = false }
 scale-info = { version = "2.5.0", default-features = false, features = ["derive"] }
-serde = { version = "1.0.163", optional = true }
+serde = { version = "1.0.188", optional = true }
 binary-merkle-tree = { path = "../../utils/binary-merkle-tree", default-features = false}
 frame-support = { path = "../support", default-features = false}
 frame-system = { path = "../system", default-features = false}
diff --git a/substrate/frame/beefy-mmr/src/lib.rs b/substrate/frame/beefy-mmr/src/lib.rs
index b12eb95f650f7b65771ba5fa7482d802f848cddd..a0bf7cdcf86a28a139693e596938169e95df029b 100644
--- a/substrate/frame/beefy-mmr/src/lib.rs
+++ b/substrate/frame/beefy-mmr/src/lib.rs
@@ -79,7 +79,7 @@ impl Convert<sp_consensus_beefy::ecdsa_crypto::AuthorityId, Vec<u8>> for BeefyEc
 			.to_eth_address()
 			.map(|v| v.to_vec())
 			.map_err(|_| {
-				log::error!(target: "runtime::beefy", "Failed to convert BEEFY PublicKey to ETH address!");
+				log::debug!(target: "runtime::beefy", "Failed to convert BEEFY PublicKey to ETH address!");
 			})
 			.unwrap_or_default()
 	}
@@ -199,7 +199,20 @@ impl<T: Config> Pallet<T> {
 			.cloned()
 			.map(T::BeefyAuthorityToMerkleLeaf::convert)
 			.collect::<Vec<_>>();
+		let default_eth_addr = [0u8; 20];
 		let len = beefy_addresses.len() as u32;
+		let uninitialized_addresses = beefy_addresses
+			.iter()
+			.filter(|&addr| addr.as_slice().eq(&default_eth_addr))
+			.count();
+		if uninitialized_addresses > 0 {
+			log::error!(
+				target: "runtime::beefy",
+				"Failed to convert {} out of {} BEEFY PublicKeys to ETH addresses!",
+				uninitialized_addresses,
+				len,
+			);
+		}
 		let keyset_commitment = binary_merkle_tree::merkle_root::<
 			<T as pallet_mmr::Config>::Hashing,
 			_,
diff --git a/substrate/frame/beefy-mmr/src/mock.rs b/substrate/frame/beefy-mmr/src/mock.rs
index b2d8758a04be6f74236d60488760292d1ac87ca8..b85096813decad50226eccf8b3f62be669327dd0 100644
--- a/substrate/frame/beefy-mmr/src/mock.rs
+++ b/substrate/frame/beefy-mmr/src/mock.rs
@@ -19,16 +19,15 @@ use std::vec;
 
 use codec::Encode;
 use frame_support::{
-	construct_runtime, parameter_types,
-	traits::{ConstU16, ConstU32, ConstU64},
+	construct_runtime, derive_impl, parameter_types,
+	traits::{ConstU32, ConstU64},
 };
 use sp_consensus_beefy::mmr::MmrLeafVersion;
-use sp_core::H256;
 use sp_io::TestExternalities;
 use sp_runtime::{
 	app_crypto::ecdsa::Public,
 	impl_opaque_keys,
-	traits::{BlakeTwo256, ConvertInto, IdentityLookup, Keccak256, OpaqueKeys},
+	traits::{ConvertInto, Keccak256, OpaqueKeys},
 	BuildStorage,
 };
 use sp_state_machine::BasicExternalities;
@@ -58,30 +57,9 @@ construct_runtime!(
 	}
 );
 
+#[derive_impl(frame_system::config_preludes::TestDefaultConfig as frame_system::DefaultConfig)]
 impl frame_system::Config for Test {
-	type BaseCallFilter = frame_support::traits::Everything;
-	type BlockWeights = ();
-	type BlockLength = ();
-	type DbWeight = ();
-	type RuntimeOrigin = RuntimeOrigin;
-	type Nonce = u64;
-	type Hash = H256;
-	type RuntimeCall = RuntimeCall;
-	type Hashing = BlakeTwo256;
-	type AccountId = u64;
-	type Lookup = IdentityLookup<Self::AccountId>;
 	type Block = Block;
-	type RuntimeEvent = RuntimeEvent;
-	type BlockHashCount = ConstU64<250>;
-	type Version = ();
-	type PalletInfo = PalletInfo;
-	type AccountData = ();
-	type OnNewAccount = ();
-	type OnKilledAccount = ();
-	type SystemWeightInfo = ();
-	type SS58Prefix = ConstU16<42>;
-	type OnSetCode = ();
-	type MaxConsumers = ConstU32<16>;
 }
 
 impl pallet_session::Config for Test {
diff --git a/substrate/frame/beefy/Cargo.toml b/substrate/frame/beefy/Cargo.toml
index 53f8305aff2331249bf2df849a76388051c66a8a..1445658bafb53bc857489e9784ef6a8a4c282949 100644
--- a/substrate/frame/beefy/Cargo.toml
+++ b/substrate/frame/beefy/Cargo.toml
@@ -1,10 +1,10 @@
 [package]
 name = "pallet-beefy"
 version = "4.0.0-dev"
-authors = ["Parity Technologies <admin@parity.io>"]
-edition = "2021"
+authors.workspace = true
+edition.workspace = true
 license = "Apache-2.0"
-repository = "https://github.com/paritytech/substrate"
+repository.workspace = true
 description = "BEEFY FRAME pallet"
 homepage = "https://substrate.io"
 
@@ -12,7 +12,7 @@ homepage = "https://substrate.io"
 codec = { package = "parity-scale-codec", version = "3.6.1", default-features = false, features = ["derive"] }
 log = { version = "0.4.17", default-features = false }
 scale-info = { version = "2.5.0", default-features = false, features = ["derive", "serde"] }
-serde = { version = "1.0.163", optional = true }
+serde = { version = "1.0.188", optional = true }
 frame-support = { path = "../support", default-features = false}
 frame-system = { path = "../system", default-features = false}
 pallet-authorship = { path = "../authorship", default-features = false}
diff --git a/substrate/frame/beefy/src/default_weights.rs b/substrate/frame/beefy/src/default_weights.rs
index 091d58f47f97888b43259bcb62c44905fae568e3..8042f0c932eb6603c88e1ff5f4525743c347b9bb 100644
--- a/substrate/frame/beefy/src/default_weights.rs
+++ b/substrate/frame/beefy/src/default_weights.rs
@@ -49,4 +49,8 @@ impl crate::WeightInfo for () {
 			// fetching set id -> session index mappings
 			.saturating_add(DbWeight::get().reads(2))
 	}
+
+	fn set_new_genesis() -> Weight {
+		DbWeight::get().writes(1)
+	}
 }
diff --git a/substrate/frame/beefy/src/lib.rs b/substrate/frame/beefy/src/lib.rs
index 77e74436dd6710416d7418f3dca2198dced68428..0760446753a688516a2c4ce75727ebb4b3cd06a8 100644
--- a/substrate/frame/beefy/src/lib.rs
+++ b/substrate/frame/beefy/src/lib.rs
@@ -33,7 +33,7 @@ use frame_system::{
 use log;
 use sp_runtime::{
 	generic::DigestItem,
-	traits::{IsMember, Member},
+	traits::{IsMember, Member, One},
 	RuntimeAppPublic,
 };
 use sp_session::{GetSessionNumber, GetValidatorCount};
@@ -62,7 +62,7 @@ const LOG_TARGET: &str = "runtime::beefy";
 #[frame_support::pallet]
 pub mod pallet {
 	use super::*;
-	use frame_system::pallet_prelude::BlockNumberFor;
+	use frame_system::{ensure_root, pallet_prelude::BlockNumberFor};
 
 	#[pallet::config]
 	pub trait Config: frame_system::Config {
@@ -152,8 +152,8 @@ pub mod pallet {
 		StorageMap<_, Twox64Concat, sp_consensus_beefy::ValidatorSetId, SessionIndex>;
 
 	/// Block number where BEEFY consensus is enabled/started.
-	/// By changing this (through governance or sudo), BEEFY consensus is effectively
-	/// restarted from the new block number.
+	/// By changing this (through privileged `set_new_genesis()`), BEEFY consensus is effectively
+	/// restarted from the newly set block number.
 	#[pallet::storage]
 	#[pallet::getter(fn genesis_block)]
 	pub(super) type GenesisBlock<T: Config> =
@@ -174,7 +174,7 @@ pub mod pallet {
 		fn default() -> Self {
 			// BEEFY genesis will be first BEEFY-MANDATORY block,
 			// use block number one instead of chain-genesis.
-			let genesis_block = Some(sp_runtime::traits::One::one());
+			let genesis_block = Some(One::one());
 			Self { authorities: Vec::new(), genesis_block }
 		}
 	}
@@ -198,6 +198,8 @@ pub mod pallet {
 		InvalidEquivocationProof,
 		/// A given equivocation report is valid but already previously reported.
 		DuplicateOffenceReport,
+		/// Submitted configuration is invalid.
+		InvalidConfiguration,
 	}
 
 	#[pallet::call]
@@ -265,6 +267,23 @@ pub mod pallet {
 			)?;
 			Ok(Pays::No.into())
 		}
+
+		/// Reset BEEFY consensus by setting a new BEEFY genesis at `delay_in_blocks` blocks in the
+		/// future.
+		///
+		/// Note: `delay_in_blocks` has to be at least 1.
+		#[pallet::call_index(2)]
+		#[pallet::weight(<T as Config>::WeightInfo::set_new_genesis())]
+		pub fn set_new_genesis(
+			origin: OriginFor<T>,
+			delay_in_blocks: BlockNumberFor<T>,
+		) -> DispatchResult {
+			ensure_root(origin)?;
+			ensure!(delay_in_blocks >= One::one(), Error::<T>::InvalidConfiguration);
+			let genesis_block = frame_system::Pallet::<T>::block_number() + delay_in_blocks;
+			GenesisBlock::<T>::put(Some(genesis_block));
+			Ok(())
+		}
 	}
 
 	#[pallet::validate_unsigned]
@@ -452,4 +471,5 @@ impl<T: Config> IsMember<T::BeefyId> for Pallet<T> {
 
 pub trait WeightInfo {
 	fn report_equivocation(validator_count: u32, max_nominators_per_validator: u32) -> Weight;
+	fn set_new_genesis() -> Weight;
 }
diff --git a/substrate/frame/beefy/src/mock.rs b/substrate/frame/beefy/src/mock.rs
index b55a65dbd73aff5210dc6f74127aa8bbcea7c268..9480fd0406d785570ca49454d819117c1f7ad49f 100644
--- a/substrate/frame/beefy/src/mock.rs
+++ b/substrate/frame/beefy/src/mock.rs
@@ -22,19 +22,15 @@ use frame_election_provider_support::{
 	onchain, SequentialPhragmen,
 };
 use frame_support::{
-	construct_runtime, parameter_types,
-	traits::{ConstU16, ConstU32, ConstU64, KeyOwnerProofSystem, OnFinalize, OnInitialize},
+	construct_runtime, derive_impl, parameter_types,
+	traits::{ConstU32, ConstU64, KeyOwnerProofSystem, OnFinalize, OnInitialize},
 };
 use pallet_session::historical as pallet_session_historical;
-use sp_core::{crypto::KeyTypeId, ConstU128, H256};
+use sp_core::{crypto::KeyTypeId, ConstU128};
 use sp_io::TestExternalities;
 use sp_runtime::{
-	app_crypto::ecdsa::Public,
-	curve::PiecewiseLinear,
-	impl_opaque_keys,
-	testing::TestXt,
-	traits::{BlakeTwo256, IdentityLookup, OpaqueKeys},
-	BuildStorage, Perbill,
+	app_crypto::ecdsa::Public, curve::PiecewiseLinear, impl_opaque_keys, testing::TestXt,
+	traits::OpaqueKeys, BuildStorage, Perbill,
 };
 use sp_staking::{EraIndex, SessionIndex};
 use sp_state_machine::BasicExternalities;
@@ -69,30 +65,10 @@ construct_runtime!(
 	}
 );
 
+#[derive_impl(frame_system::config_preludes::TestDefaultConfig as frame_system::DefaultConfig)]
 impl frame_system::Config for Test {
-	type BaseCallFilter = frame_support::traits::Everything;
-	type BlockWeights = ();
-	type BlockLength = ();
-	type DbWeight = ();
-	type RuntimeOrigin = RuntimeOrigin;
-	type Nonce = u64;
-	type Hash = H256;
-	type RuntimeCall = RuntimeCall;
-	type Hashing = BlakeTwo256;
-	type AccountId = u64;
-	type Lookup = IdentityLookup<Self::AccountId>;
 	type Block = Block;
-	type RuntimeEvent = RuntimeEvent;
-	type BlockHashCount = ConstU64<250>;
-	type Version = ();
-	type PalletInfo = PalletInfo;
 	type AccountData = pallet_balances::AccountData<u128>;
-	type OnNewAccount = ();
-	type OnKilledAccount = ();
-	type SystemWeightInfo = ();
-	type SS58Prefix = ConstU16<42>;
-	type OnSetCode = ();
-	type MaxConsumers = ConstU32<16>;
 }
 
 impl<C> frame_system::offchain::SendTransactionTypes<C> for Test
diff --git a/substrate/frame/beefy/src/tests.rs b/substrate/frame/beefy/src/tests.rs
index e04dc330d0c07cb7258323b34db0086c6226ffb2..bf1b204e0260e29a2ce473416a43d0b641f8a7b9 100644
--- a/substrate/frame/beefy/src/tests.rs
+++ b/substrate/frame/beefy/src/tests.rs
@@ -791,3 +791,25 @@ fn valid_equivocation_reports_dont_pay_fees() {
 		assert_eq!(post_info.pays_fee, Pays::Yes);
 	})
 }
+
+#[test]
+fn set_new_genesis_works() {
+	let authorities = test_authorities();
+
+	new_test_ext_raw_authorities(authorities).execute_with(|| {
+		start_era(1);
+
+		let new_genesis_delay = 10u64;
+		// the call for setting new genesis should work
+		assert_ok!(Beefy::set_new_genesis(RuntimeOrigin::root(), new_genesis_delay,));
+		let expected = System::block_number() + new_genesis_delay;
+		// verify new genesis was set
+		assert_eq!(Beefy::genesis_block(), Some(expected));
+
+		// setting delay < 1 should fail
+		assert_err!(
+			Beefy::set_new_genesis(RuntimeOrigin::root(), 0u64,),
+			Error::<Test>::InvalidConfiguration,
+		);
+	});
+}
diff --git a/substrate/frame/benchmarking/Cargo.toml b/substrate/frame/benchmarking/Cargo.toml
index 7964258af647e3f16ed25722f91fd015c012cc10..107f3b7d56fef156171de1c19295338b23b427e1 100644
--- a/substrate/frame/benchmarking/Cargo.toml
+++ b/substrate/frame/benchmarking/Cargo.toml
@@ -1,11 +1,11 @@
 [package]
 name = "frame-benchmarking"
 version = "4.0.0-dev"
-authors = ["Parity Technologies <admin@parity.io>"]
-edition = "2021"
+authors.workspace = true
+edition.workspace = true
 license = "Apache-2.0"
 homepage = "https://substrate.io"
-repository = "https://github.com/paritytech/substrate/"
+repository.workspace = true
 description = "Macro for benchmarking a FRAME runtime."
 readme = "README.md"
 
@@ -18,7 +18,7 @@ linregress = { version = "0.5.1", optional = true }
 log = { version = "0.4.17", default-features = false }
 paste = "1.0"
 scale-info = { version = "2.5.0", default-features = false, features = ["derive"] }
-serde = { version = "1.0.163", optional = true }
+serde = { version = "1.0.188", optional = true }
 frame-support = { path = "../support", default-features = false}
 frame-support-procedural = { path = "../support/procedural", default-features = false}
 frame-system = { path = "../system", default-features = false}
diff --git a/substrate/frame/benchmarking/README.md b/substrate/frame/benchmarking/README.md
index dc6a184435df6e843ac81ab5746db9b48a0f4549..bf0bde2c3df5a5dcc85a6aa61f3c0af519bc3ccf 100644
--- a/substrate/frame/benchmarking/README.md
+++ b/substrate/frame/benchmarking/README.md
@@ -1,99 +1,86 @@
 # Substrate Runtime Benchmarking Framework
 
-This crate contains a set of utilities that can be used to benchmark and weigh FRAME pallets that
-you develop for your Substrate Runtime.
+This crate contains a set of utilities that can be used to benchmark and weigh FRAME pallets that you develop for your
+Substrate Runtime.
 
 ## Overview
 
-Substrate's FRAME framework allows you to develop custom logic for your blockchain that can be
-included in your runtime. This flexibility is key to help you design complex and interactive
-pallets, but without accurate weights assigned to dispatchables, your blockchain may become
-vulnerable to denial of service (DoS) attacks by malicious actors.
+Substrate's FRAME framework allows you to develop custom logic for your blockchain that can be included in your runtime.
+This flexibility is key to help you design complex and interactive pallets, but without accurate weights assigned to
+dispatchables, your blockchain may become vulnerable to denial of service (DoS) attacks by malicious actors.
 
-The Substrate Runtime Benchmarking Framework is a tool you can use to mitigate DoS attacks against
-your blockchain network by benchmarking the computational resources required to execute different
-functions in the runtime, for example extrinsics, `on_initialize`, `verify_unsigned`, etc...
+The Substrate Runtime Benchmarking Framework is a tool you can use to mitigate DoS attacks against your blockchain
+network by benchmarking the computational resources required to execute different functions in the runtime, for example
+extrinsics, `on_initialize`, `verify_unsigned`, etc...
 
-The general philosophy behind the benchmarking system is: If your node can know ahead of time how
-long it will take to execute an extrinsic, it can safely make decisions to include or exclude that
-extrinsic based on its available resources. By doing this, it can keep the block production and
-import process running smoothly.
+The general philosophy behind the benchmarking system is: If your node can know ahead of time how long it will take to
+execute an extrinsic, it can safely make decisions to include or exclude that extrinsic based on its available
+resources. By doing this, it can keep the block production and import process running smoothly.
 
 To achieve this, we need to model how long it takes to run each function in the runtime by:
 
 * Creating custom benchmarking logic that executes a specific code path of a function.
-* Executing the benchmark in the Wasm execution environment, on a specific set of hardware, with a
-  custom runtime configuration, etc...
-* Executing the benchmark across controlled ranges of possible values that may affect the result of
-  the benchmark (called "components").
+* Executing the benchmark in the Wasm execution environment, on a specific set of hardware, with a custom runtime
+  configuration, etc...
+* Executing the benchmark across controlled ranges of possible values that may affect the result of the benchmark
+  (called "components").
 * Executing the benchmark multiple times at each point in order to isolate and remove outliers.
 * Using the results of the benchmark to create a linear model of the function across its components.
 
-With this linear model, we are able to estimate ahead of time how long it takes to execute some
-logic, and thus make informed decisions without actually spending any significant resources at
-runtime.
+With this linear model, we are able to estimate ahead of time how long it takes to execute some logic, and thus make
+informed decisions without actually spending any significant resources at runtime.
 
-Note that we assume that all extrinsics are assumed to be of linear complexity, which is why we are
-able to always fit them to a linear model. Quadratic or higher complexity functions are, in general,
-considered to be dangerous to the runtime as the weight of these functions may explode as the
-runtime state or input becomes too complex.
+Note that we assume that all extrinsics are assumed to be of linear complexity, which is why we are able to always fit
+them to a linear model. Quadratic or higher complexity functions are, in general, considered to be dangerous to the
+runtime as the weight of these functions may explode as the runtime state or input becomes too complex.
 
 The benchmarking framework comes with the following tools:
 
-* [A set of macros](./src/lib.rs) (`benchmarks!`, `add_benchmark!`, etc...) to make it easy to
-  write, test, and add runtime benchmarks.
+* [A set of macros](./src/lib.rs) (`benchmarks!`, `add_benchmark!`, etc...) to make it easy to write, test, and add
+  runtime benchmarks.
 * [A set of linear regression analysis functions](./src/analysis.rs) for processing benchmark data.
-* [A CLI extension](../../utils/frame/benchmarking-cli/README.md) to make it easy to execute benchmarks on your
-  node.
+* [A CLI extension](../../utils/frame/benchmarking-cli/README.md) to make it easy to execute benchmarks on your node.
 
-The end-to-end benchmarking pipeline is disabled by default when compiling a node. If you want to
-run benchmarks, you need to enable it by compiling with a Rust feature flag `runtime-benchmarks`.
-More details about this below.
+The end-to-end benchmarking pipeline is disabled by default when compiling a node. If you want to run benchmarks, you
+need to enable it by compiling with a Rust feature flag `runtime-benchmarks`. More details about this below.
 
 ### Weight
 
-Substrate represents computational resources using a generic unit of measurement called "Weight". It
-defines 10^12 Weight as 1 second of computation on the physical machine used for benchmarking. This
-means that the weight of a function may change based on the specific hardware used to benchmark the
-runtime functions.
+Substrate represents computational resources using a generic unit of measurement called "Weight". It defines 10^12
+Weight as 1 second of computation on the physical machine used for benchmarking. This means that the weight of a
+function may change based on the specific hardware used to benchmark the runtime functions.
 
-By modeling the expected weight of each runtime function, the blockchain is able to calculate how
-many transactions or system level functions it will be able to execute within a certain period of
-time. Often, the limiting factor for a blockchain is the fixed block production time for the
-network.
+By modeling the expected weight of each runtime function, the blockchain is able to calculate how many transactions or
+system level functions it will be able to execute within a certain period of time. Often, the limiting factor for a
+blockchain is the fixed block production time for the network.
 
-Within FRAME, each dispatchable function must have a `#[weight]` annotation with a function that can
-return the expected weight for the worst case scenario execution of that function given its inputs.
-This benchmarking framework will result in a file that automatically generates those formulas for
-you, which you can then use in your pallet.
+Within FRAME, each dispatchable function must have a `#[weight]` annotation with a function that can return the expected
+weight for the worst case scenario execution of that function given its inputs. This benchmarking framework will result
+in a file that automatically generates those formulas for you, which you can then use in your pallet.
 
 ## Writing Benchmarks
 
-Writing a runtime benchmark is much like writing a unit test for your pallet. It needs to be
-carefully crafted to execute a certain logical path in your code. In tests you want to check for
-various success and failure conditions, but with benchmarks you specifically look for the **most
-computationally heavy** path, a.k.a the "worst case scenario".
+Writing a runtime benchmark is much like writing a unit test for your pallet. It needs to be carefully crafted to
+execute a certain logical path in your code. In tests you want to check for various success and failure conditions, but
+with benchmarks you specifically look for the **most computationally heavy** path, a.k.a the "worst case scenario".
 
-This means that if there are certain storage items or runtime state that may affect the complexity
-of the function, for example triggering more iterations in a `for` loop, to get an accurate result,
-you must set up your benchmark to trigger this.
+This means that if there are certain storage items or runtime state that may affect the complexity of the function, for
+example triggering more iterations in a `for` loop, to get an accurate result, you must set up your benchmark to trigger
+this.
 
-It may be that there are multiple paths your function can go down, and it is not clear which one is
-the heaviest. In this case, you should just create a benchmark for each scenario! You may find that
-there are paths in your code where complexity may become unbounded depending on user input. This may
-be a hint that you should enforce sane boundaries for how a user can use your pallet. For example:
-limiting the number of elements in a vector, limiting the number of iterations in a `for` loop,
-etc...
+It may be that there are multiple paths your function can go down, and it is not clear which one is the heaviest. In
+this case, you should just create a benchmark for each scenario! You may find that there are paths in your code where
+complexity may become unbounded depending on user input. This may be a hint that you should enforce sane boundaries for
+how a user can use your pallet. For example: limiting the number of elements in a vector, limiting the number of
+iterations in a `for` loop, etc...
 
-Examples of end-to-end benchmarks can be found in the [pallets provided by Substrate](../), and the
-specific details on how to use the `benchmarks!` macro can be found in [its
-documentation](./src/lib.rs).
+Examples of end-to-end benchmarks can be found in the [pallets provided by Substrate](../), and the specific details on
+how to use the `benchmarks!` macro can be found in [its documentation](./src/lib.rs).
 
 ## Testing Benchmarks
 
-You can test your benchmarks using the same test runtime that you created for your pallet's unit
-tests. By creating your benchmarks in the `benchmarks!` macro, it automatically generates test
-functions for you:
+You can test your benchmarks using the same test runtime that you created for your pallet's unit tests. By creating your
+benchmarks in the `benchmarks!` macro, it automatically generates test functions for you:
 
 ```rust
 fn test_benchmark_[benchmark_name]<T>::() -> Result<(), &'static str>
@@ -101,19 +88,18 @@ fn test_benchmark_[benchmark_name]<T>::() -> Result<(), &'static str>
 
 Simply add these functions to a unit test and ensure that the result of the function is `Ok(())`.
 
-> **Note:** If your test runtime and production runtime have different configurations, you may get
-different results when testing your benchmark and actually running it.
+> **Note:** If your test runtime and production runtime have different configurations, you may get different results
+when testing your benchmark and actually running it.
 
-In general, benchmarks returning `Ok(())` is all you need to check for since it signals the executed
-extrinsic has completed successfully. However, you can optionally include a `verify` block with your
-benchmark, which can additionally verify any final conditions, such as the final state of your
-runtime.
+In general, benchmarks returning `Ok(())` is all you need to check for since it signals the executed extrinsic has
+completed successfully. However, you can optionally include a `verify` block with your benchmark, which can additionally
+verify any final conditions, such as the final state of your runtime.
 
 These additional `verify` blocks will not affect the results of your final benchmarking process.
 
-To run the tests, you need to enable the `runtime-benchmarks` feature flag. This may also mean you
-need to move into your node's binary folder. For example, with the Substrate repository, this is how
-you would test the Balances pallet's benchmarks:
+To run the tests, you need to enable the `runtime-benchmarks` feature flag. This may also mean you need to move into
+your node's binary folder. For example, with the Substrate repository, this is how you would test the Balances pallet's
+benchmarks:
 
 ```bash
 cargo test -p pallet-balances --features runtime-benchmarks
@@ -123,19 +109,20 @@ cargo test -p pallet-balances --features runtime-benchmarks
 > ```
 > error: --features is not allowed in the root of a virtual workspace`
 > ```
-> To solve this, navigate to the folder of the node (`cd bin/node/cli`) or pallet (`cd frame/pallet`) and run the command there.
+> To solve this, navigate to the folder of the node (`cd bin/node/cli`) or pallet (`cd frame/pallet`) and run the
+> command there.
 
-This will instance each linear component with different values. The number of values per component is set to six and can be changed with the `VALUES_PER_COMPONENT` environment variable.
+This will instance each linear component with different values. The number of values per component is set to six and can
+be changed with the `VALUES_PER_COMPONENT` environment variable.
 
 ## Adding Benchmarks
 
-The benchmarks included with each pallet are not automatically added to your node. To actually
-execute these benchmarks, you need to implement the `frame_benchmarking::Benchmark` trait. You can
-see an example of how to do this in the [included Substrate
-node](../../bin/node/runtime/src/lib.rs).
+The benchmarks included with each pallet are not automatically added to your node. To actually execute these benchmarks,
+you need to implement the `frame_benchmarking::Benchmark` trait. You can see an example of how to do this in the
+[included Substrate node](../../bin/node/runtime/src/lib.rs).
 
-Assuming there are already some benchmarks set up on your node, you just need to add another
-instance of the `add_benchmark!` macro:
+Assuming there are already some benchmarks set up on your node, you just need to add another instance of the
+`add_benchmark!` macro:
 
 ```rust
 ///  configuration for running benchmarks
@@ -147,22 +134,20 @@ add_benchmark!(params, batches, pallet_balances, Balances);
 ///            the `struct` created for your pallet by `construct_runtime!`
 ```
 
-Once you have done this, you will need to compile your node binary with the `runtime-benchmarks`
-feature flag:
+Once you have done this, you will need to compile your node binary with the `runtime-benchmarks` feature flag:
 
 ```bash
 cd bin/node/cli
 cargo build --profile=production --features runtime-benchmarks
 ```
 
-The production profile applies various compiler optimizations.  
-These optimizations slow down the compilation process *a lot*.  
+The production profile applies various compiler optimizations.
+These optimizations slow down the compilation process *a lot*.
 If you are just testing things out and don't need final numbers, don't include `--profile=production`.
 
 ## Running Benchmarks
 
-Finally, once you have a node binary with benchmarks enabled, you need to execute your various
-benchmarks.
+Finally, once you have a node binary with benchmarks enabled, you need to execute your various benchmarks.
 
 You can get a list of the available benchmarks by running:
 
@@ -183,24 +168,24 @@ Then you can run a benchmark like so:
     --output <path> \              # Output benchmark results into a folder or file
 ```
 
-This will output a file `pallet_name.rs` which implements the `WeightInfo` trait you should include
-in your pallet. Double colons `::` will be replaced with a `_` in the output name if you specify a directory. Each blockchain should generate their own benchmark file with their custom
-implementation of the `WeightInfo` trait. This means that you will be able to use these modular
-Substrate pallets while still keeping your network safe for your specific configuration and
+This will output a file `pallet_name.rs` which implements the `WeightInfo` trait you should include in your pallet.
+Double colons `::` will be replaced with a `_` in the output name if you specify a directory. Each blockchain should
+generate their own benchmark file with their custom implementation of the `WeightInfo` trait. This means that you will
+be able to use these modular Substrate pallets while still keeping your network safe for your specific configuration and
 requirements.
 
-The benchmarking CLI uses a Handlebars template to format the final output file. You can optionally
-pass the flag `--template` pointing to a custom template that can be used instead. Within the
-template, you have access to all the data provided by the `TemplateData` struct in the
-[benchmarking CLI writer](../../utils/frame/benchmarking-cli/src/writer.rs). You can find the
-default template used [here](../../utils/frame/benchmarking-cli/src/template.hbs).
+The benchmarking CLI uses a Handlebars template to format the final output file. You can optionally pass the flag
+`--template` pointing to a custom template that can be used instead. Within the template, you have access to all the
+data provided by the `TemplateData` struct in the [benchmarking CLI
+writer](../../utils/frame/benchmarking-cli/src/writer.rs). You can find the default template used
+[here](../../utils/frame/benchmarking-cli/src/template.hbs).
 
 There are some custom Handlebars helpers included with our output generation:
 
-* `underscore`: Add an underscore to every 3rd character from the right of a string. Primarily to be
-used for delimiting large numbers.
-* `join`: Join an array of strings into a space-separated string for the template. Primarily to be
-used for joining all the arguments passed to the CLI.
+* `underscore`: Add an underscore to every 3rd character from the right of a string. Primarily to be used for delimiting
+large numbers.
+* `join`: Join an array of strings into a space-separated string for the template. Primarily to be used for joining all
+the arguments passed to the CLI.
 
 To get a full list of available options when running benchmarks, run:
 
diff --git a/substrate/frame/benchmarking/pov/Cargo.toml b/substrate/frame/benchmarking/pov/Cargo.toml
index d1e20c63720194be650975501d61208f761d973e..3a08c7a67e192a6b8e789409299efe834d82ce38 100644
--- a/substrate/frame/benchmarking/pov/Cargo.toml
+++ b/substrate/frame/benchmarking/pov/Cargo.toml
@@ -1,11 +1,11 @@
 [package]
 name = "frame-benchmarking-pallet-pov"
 version = "4.0.0-dev"
-authors = ["Parity Technologies <admin@parity.io>"]
-edition = "2021"
+authors.workspace = true
+edition.workspace = true
 license = "Apache-2.0"
 homepage = "https://substrate.io"
-repository = "https://github.com/paritytech/substrate/"
+repository.workspace = true
 description = "Pallet for testing FRAME PoV benchmarking"
 
 [package.metadata.docs.rs]
diff --git a/substrate/frame/benchmarking/pov/src/weights.rs b/substrate/frame/benchmarking/pov/src/weights.rs
index f16ac7fbc2733c1064664e2cefb88128fb55b7ca..d84ac88c98f022d77a286c512f979eadb5c2d7a0 100644
--- a/substrate/frame/benchmarking/pov/src/weights.rs
+++ b/substrate/frame/benchmarking/pov/src/weights.rs
@@ -1,3 +1,19 @@
+// 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.
 
 //! Autogenerated weights for frame_benchmarking_pallet_pov
 //!
diff --git a/substrate/frame/benchmarking/src/utils.rs b/substrate/frame/benchmarking/src/utils.rs
index 59e5192b427b0efcbdeec7ff73628ac5c1632621..b9b3f91e2dd7bfc13b01accd15020e70f29cd7ac 100644
--- a/substrate/frame/benchmarking/src/utils.rs
+++ b/substrate/frame/benchmarking/src/utils.rs
@@ -17,16 +17,12 @@
 
 //! Interfaces, types and utils for benchmarking a FRAME runtime.
 use codec::{Decode, Encode};
-use frame_support::{
-	dispatch::{DispatchError, DispatchErrorWithPostInfo},
-	pallet_prelude::*,
-	traits::StorageInfo,
-};
+use frame_support::{dispatch::DispatchErrorWithPostInfo, pallet_prelude::*, traits::StorageInfo};
 use scale_info::TypeInfo;
 #[cfg(feature = "std")]
 use serde::{Deserialize, Serialize};
 use sp_io::hashing::blake2_256;
-use sp_runtime::traits::TrailingZeroInput;
+use sp_runtime::{traits::TrailingZeroInput, DispatchError};
 use sp_std::{prelude::Box, vec::Vec};
 use sp_storage::TrackedStorageKey;
 
diff --git a/substrate/frame/bounties/Cargo.toml b/substrate/frame/bounties/Cargo.toml
index a2f6054dd1219874f6ead5c51b9a95987ecf94fb..2fab40b3ef5c398aa3319d9e2d4292a556d280d7 100644
--- a/substrate/frame/bounties/Cargo.toml
+++ b/substrate/frame/bounties/Cargo.toml
@@ -1,11 +1,11 @@
 [package]
 name = "pallet-bounties"
 version = "4.0.0-dev"
-authors = ["Parity Technologies <admin@parity.io>"]
-edition = "2021"
+authors.workspace = true
+edition.workspace = true
 license = "Apache-2.0"
 homepage = "https://substrate.io"
-repository = "https://github.com/paritytech/substrate/"
+repository.workspace = true
 description = "FRAME pallet to manage bounties"
 readme = "README.md"
 
diff --git a/substrate/frame/bounties/src/lib.rs b/substrate/frame/bounties/src/lib.rs
index c64a35672c7f728b6c528ebb1a99646a6c631c75..c099fc48b7a3bceb94e8b026386c84aed4edf818 100644
--- a/substrate/frame/bounties/src/lib.rs
+++ b/substrate/frame/bounties/src/lib.rs
@@ -291,6 +291,14 @@ pub mod pallet {
 		BountyCanceled { index: BountyIndex },
 		/// A bounty expiry is extended.
 		BountyExtended { index: BountyIndex },
+		/// A bounty is approved.
+		BountyApproved { index: BountyIndex },
+		/// A bounty curator is proposed.
+		CuratorProposed { bounty_id: BountyIndex, curator: T::AccountId },
+		/// A bounty curator is unassigned.
+		CuratorUnassigned { bounty_id: BountyIndex },
+		/// A bounty curator is accepted.
+		CuratorAccepted { bounty_id: BountyIndex, curator: T::AccountId },
 	}
 
 	/// Number of bounty proposals that have been made.
@@ -375,10 +383,12 @@ pub mod pallet {
 
 				Ok(())
 			})?;
+
+			Self::deposit_event(Event::<T, I>::BountyApproved { index: bounty_id });
 			Ok(())
 		}
 
-		/// Assign a curator to a funded bounty.
+		/// Propose a curator to a funded bounty.
 		///
 		/// May only be called from `T::SpendOrigin`.
 		///
@@ -408,9 +418,11 @@ pub mod pallet {
 
 				ensure!(fee < bounty.value, Error::<T, I>::InvalidFee);
 
-				bounty.status = BountyStatus::CuratorProposed { curator };
+				bounty.status = BountyStatus::CuratorProposed { curator: curator.clone() };
 				bounty.fee = fee;
 
+				Self::deposit_event(Event::<T, I>::CuratorProposed { bounty_id, curator });
+
 				Ok(())
 			})?;
 			Ok(())
@@ -508,6 +520,8 @@ pub mod pallet {
 				bounty.status = BountyStatus::Funded;
 				Ok(())
 			})?;
+
+			Self::deposit_event(Event::<T, I>::CuratorUnassigned { bounty_id });
 			Ok(())
 		}
 
@@ -542,6 +556,10 @@ pub mod pallet {
 						bounty.status =
 							BountyStatus::Active { curator: curator.clone(), update_due };
 
+						Self::deposit_event(Event::<T, I>::CuratorAccepted {
+							bounty_id,
+							curator: signer,
+						});
 						Ok(())
 					},
 					_ => Err(Error::<T, I>::UnexpectedStatus.into()),
diff --git a/substrate/frame/bounties/src/tests.rs b/substrate/frame/bounties/src/tests.rs
index a6fb89bb8601228cdd6427b6f20bc89887775781..4083b05b629cd0bff61d0af62e2a940cc7e1c031 100644
--- a/substrate/frame/bounties/src/tests.rs
+++ b/substrate/frame/bounties/src/tests.rs
@@ -24,7 +24,10 @@ use crate as pallet_bounties;
 
 use frame_support::{
 	assert_noop, assert_ok, parameter_types,
-	traits::{ConstU32, ConstU64, OnInitialize},
+	traits::{
+		tokens::{PayFromAccount, UnityAssetBalanceConversion},
+		ConstU32, ConstU64, OnInitialize,
+	},
 	PalletId,
 };
 
@@ -104,6 +107,8 @@ parameter_types! {
 	pub const TreasuryPalletId2: PalletId = PalletId(*b"py/trsr2");
 	pub static SpendLimit: Balance = u64::MAX;
 	pub static SpendLimit1: Balance = u64::MAX;
+	pub TreasuryAccount: u128 = Treasury::account_id();
+	pub TreasuryInstance1Account: u128 = Treasury1::account_id();
 }
 
 impl pallet_treasury::Config for Test {
@@ -123,6 +128,14 @@ impl pallet_treasury::Config for Test {
 	type SpendFunds = Bounties;
 	type MaxApprovals = ConstU32<100>;
 	type SpendOrigin = frame_system::EnsureRootWithSuccess<Self::AccountId, SpendLimit>;
+	type AssetKind = ();
+	type Beneficiary = Self::AccountId;
+	type BeneficiaryLookup = IdentityLookup<Self::Beneficiary>;
+	type Paymaster = PayFromAccount<Balances, TreasuryAccount>;
+	type BalanceConverter = UnityAssetBalanceConversion;
+	type PayoutPeriod = ConstU64<10>;
+	#[cfg(feature = "runtime-benchmarks")]
+	type BenchmarkHelper = ();
 }
 
 impl pallet_treasury::Config<Instance1> for Test {
@@ -142,6 +155,14 @@ impl pallet_treasury::Config<Instance1> for Test {
 	type SpendFunds = Bounties1;
 	type MaxApprovals = ConstU32<100>;
 	type SpendOrigin = frame_system::EnsureRootWithSuccess<Self::AccountId, SpendLimit1>;
+	type AssetKind = ();
+	type Beneficiary = Self::AccountId;
+	type BeneficiaryLookup = IdentityLookup<Self::Beneficiary>;
+	type Paymaster = PayFromAccount<Balances, TreasuryInstance1Account>;
+	type BalanceConverter = UnityAssetBalanceConversion;
+	type PayoutPeriod = ConstU64<10>;
+	#[cfg(feature = "runtime-benchmarks")]
+	type BenchmarkHelper = ();
 }
 
 parameter_types! {
diff --git a/substrate/frame/broker/Cargo.toml b/substrate/frame/broker/Cargo.toml
index 286eca09f66d135b3a6e0a7dc58b28f6cd6f7c5b..d6c5399d56eb178fe6e35f06638bf4409604ce42 100644
--- a/substrate/frame/broker/Cargo.toml
+++ b/substrate/frame/broker/Cargo.toml
@@ -2,11 +2,11 @@
 name = "pallet-broker"
 version = "0.1.0"
 description = "Brokerage tool for managing Polkadot Core scheduling"
-authors = ["Parity Technologies <admin@parity.io>"]
+authors.workspace = true
 homepage = "https://substrate.io"
-edition = "2021"
+edition.workspace = true
 license = "Apache-2.0"
-repository = "https://github.com/paritytech/substrate"
+repository.workspace = true
 
 [package.metadata.docs.rs]
 targets = ["x86_64-unknown-linux-gnu"]
@@ -14,7 +14,7 @@ targets = ["x86_64-unknown-linux-gnu"]
 [dependencies]
 codec = { package = "parity-scale-codec", version = "3.0.0", default-features = false, features = [ "derive"] }
 scale-info = { version = "2.0.0", default-features = false, features = ["derive"] }
-bitvec = "1"
+bitvec = { version = "1.0.0", default-features = false }
 sp-std = { path = "../../primitives/std", default-features = false}
 sp-arithmetic = { path = "../../primitives/arithmetic", default-features = false}
 sp-core = { path = "../../primitives/core", default-features = false}
@@ -30,6 +30,7 @@ sp-io = { path = "../../primitives/io" }
 default = [ "std" ]
 
 std = [
+	"bitvec/std",
 	"codec/std",
 	"frame-benchmarking?/std",
 	"frame-support/std",
diff --git a/substrate/frame/broker/README.md b/substrate/frame/broker/README.md
index 65b6179863e3d9bd69f6286538ea5ff696413f5c..eae0442dbf69be30f72ed74d96ef2b052279ed4f 100644
--- a/substrate/frame/broker/README.md
+++ b/substrate/frame/broker/README.md
@@ -2,9 +2,9 @@
 
 Brokerage tool for managing Polkadot Core scheduling.
 
-Properly described in RFC-0001 Agile Coretime.
+Properly described in [RFC-0001 Agile Coretime](https://github.com/polkadot-fellows/RFCs/blob/main/text/0001-agile-coretime.md).
 
-## Implemnentation Specifics
+## Implementation Specifics
 
 ### Core Mask Bits
 
diff --git a/substrate/frame/broker/src/benchmarking.rs b/substrate/frame/broker/src/benchmarking.rs
index 663bf2f466cf3c0090cd7b832bb38ed26da90613..d22f3936c3e2435665d869cd32edc0e042cc5f55 100644
--- a/substrate/frame/broker/src/benchmarking.rs
+++ b/substrate/frame/broker/src/benchmarking.rs
@@ -852,6 +852,27 @@ mod benches {
 		}
 	}
 
+	#[benchmark]
+	fn do_tick_base() -> Result<(), BenchmarkError> {
+		setup_and_start_sale::<T>()?;
+
+		advance_to::<T>(5);
+
+		let mut status = Status::<T>::get().unwrap();
+		status.last_committed_timeslice = 3;
+		Status::<T>::put(&status);
+
+		#[block]
+		{
+			Broker::<T>::do_tick();
+		}
+
+		let updated_status = Status::<T>::get().unwrap();
+		assert_eq!(status, updated_status);
+
+		Ok(())
+	}
+
 	// Implements a test for each benchmark. Execute with:
 	// `cargo test -p pallet-broker --features runtime-benchmarks`.
 	impl_benchmark_test_suite!(Pallet, crate::mock::new_test_ext(), crate::mock::Test);
diff --git a/substrate/frame/broker/src/dispatchable_impls.rs b/substrate/frame/broker/src/dispatchable_impls.rs
index 7c1d5a786b7cfb1f5474b2a1764a36b9f6478d57..0b08a7b665b75ac1c860774762878012bf82a749 100644
--- a/substrate/frame/broker/src/dispatchable_impls.rs
+++ b/substrate/frame/broker/src/dispatchable_impls.rs
@@ -76,7 +76,7 @@ impl<T: Config> Pallet<T> {
 			last_timeslice: Self::current_timeslice(),
 		};
 		let now = frame_system::Pallet::<T>::block_number();
-		let dummy_sale = SaleInfoRecord {
+		let new_sale = SaleInfoRecord {
 			sale_start: now,
 			leadin_length: Zero::zero(),
 			price,
@@ -89,7 +89,7 @@ impl<T: Config> Pallet<T> {
 			cores_sold: 0,
 		};
 		Self::deposit_event(Event::<T>::SalesStarted { price, core_count });
-		Self::rotate_sale(dummy_sale, &config, &status);
+		Self::rotate_sale(new_sale, &config, &status);
 		Status::<T>::put(&status);
 		Ok(())
 	}
@@ -333,12 +333,8 @@ impl<T: Config> Pallet<T> {
 			region.begin = r + 1;
 			contribution.length.saturating_dec();
 
-			let Some(mut pool_record) = InstaPoolHistory::<T>::get(r) else {
-				continue;
-			};
-			let Some(total_payout) = pool_record.maybe_payout else {
-				break;
-			};
+			let Some(mut pool_record) = InstaPoolHistory::<T>::get(r) else { continue };
+			let Some(total_payout) = pool_record.maybe_payout else { break };
 			let p = total_payout
 				.saturating_mul(contributed_parts.into())
 				.checked_div(&pool_record.private_contributions.into())
diff --git a/substrate/frame/broker/src/tests.rs b/substrate/frame/broker/src/tests.rs
index 3c326010dddfc7a01396064af1e5f706ed085ce1..e1b489bbe6e67801fcae1059eb09f85d72203365 100644
--- a/substrate/frame/broker/src/tests.rs
+++ b/substrate/frame/broker/src/tests.rs
@@ -77,7 +77,9 @@ fn drop_renewal_works() {
 		let e = Error::<Test>::StillValid;
 		assert_noop!(Broker::do_drop_renewal(region.core, region.begin + 3), e);
 		advance_to(12);
+		assert_eq!(AllowedRenewals::<Test>::iter().count(), 1);
 		assert_ok!(Broker::do_drop_renewal(region.core, region.begin + 3));
+		assert_eq!(AllowedRenewals::<Test>::iter().count(), 0);
 		let e = Error::<Test>::UnknownRenewal;
 		assert_noop!(Broker::do_drop_renewal(region.core, region.begin + 3), e);
 	});
@@ -90,7 +92,10 @@ fn drop_contribution_works() {
 		advance_to(2);
 		let region = Broker::do_purchase(1, u64::max_value()).unwrap();
 		// Place region in pool. Active in pool timeslices 4, 5, 6 = rcblocks 8, 10, 12; we
-		// expect the contribution record to timeout 3 timeslices following 7 = 10
+		// expect the contribution record to timeout 3 timeslices following 7 = 14
+		//
+		// Due to the contribution_timeout being configured for 3 timeslices, the contribution
+		// can only be discarded at timeslice 10, i.e. rcblock 20.
 		assert_ok!(Broker::do_pool(region, Some(1), 1, Final));
 		assert_eq!(InstaPoolContribution::<Test>::iter().count(), 1);
 		advance_to(19);
@@ -378,6 +383,41 @@ fn instapool_partial_core_payouts_work() {
 	});
 }
 
+#[test]
+fn instapool_core_payouts_work_with_partitioned_region() {
+	TestExt::new().endow(1, 1000).execute_with(|| {
+		assert_ok!(Broker::do_start_sales(100, 1));
+		advance_to(2);
+		let region = Broker::do_purchase(1, u64::max_value()).unwrap();
+		let (region1, region2) = Broker::do_partition(region, None, 2).unwrap();
+		// `region1` duration is from rcblock 8 to rcblock 12. This means that the
+		// coretime purchased during this time period will be purchased from `region1`
+		//
+		// `region2` duration is from rcblock 12 to rcblock 14 and during this period
+		// coretime will be purchased from `region2`.
+		assert_ok!(Broker::do_pool(region1, None, 2, Final));
+		assert_ok!(Broker::do_pool(region2, None, 3, Final));
+		assert_ok!(Broker::do_purchase_credit(1, 20, 1));
+		advance_to(8);
+		assert_ok!(TestCoretimeProvider::spend_instantaneous(1, 10));
+		advance_to(11);
+		assert_eq!(pot(), 20);
+		assert_eq!(revenue(), 100);
+		assert_ok!(Broker::do_claim_revenue(region1, 100));
+		assert_eq!(pot(), 10);
+		assert_eq!(balance(2), 10);
+		advance_to(12);
+		assert_ok!(TestCoretimeProvider::spend_instantaneous(1, 10));
+		advance_to(15);
+		assert_eq!(pot(), 10);
+		assert_ok!(Broker::do_claim_revenue(region2, 100));
+		assert_eq!(pot(), 0);
+		// The balance of account `2` remains unchanged.
+		assert_eq!(balance(2), 10);
+		assert_eq!(balance(3), 10);
+	});
+}
+
 #[test]
 fn initialize_with_system_paras_works() {
 	TestExt::new().execute_with(|| {
@@ -654,6 +694,79 @@ fn partition_then_interlace_works() {
 	});
 }
 
+#[test]
+fn partitioning_after_assignment_works() {
+	TestExt::new().endow(1, 1000).execute_with(|| {
+		assert_ok!(Broker::do_start_sales(100, 1));
+		advance_to(2);
+		// We will initially allocate a task to a purchased region, and after that
+		// we will proceed to partition the region.
+		let region = Broker::do_purchase(1, u64::max_value()).unwrap();
+		assert_ok!(Broker::do_assign(region, None, 1001, Provisional));
+		let (_region, region1) = Broker::do_partition(region, None, 2).unwrap();
+		// After the partitioning if we assign a new task to `region` the other region
+		// will still be assigned to `Task(1001)`.
+		assert_ok!(Broker::do_assign(region1, None, 1002, Provisional));
+		advance_to(10);
+		assert_eq!(
+			CoretimeTrace::get(),
+			vec![
+				(
+					6,
+					AssignCore {
+						core: 0,
+						begin: 8,
+						assignment: vec![(Task(1001), 57600),],
+						end_hint: None
+					}
+				),
+				(
+					10,
+					AssignCore {
+						core: 0,
+						begin: 12,
+						assignment: vec![(Task(1002), 57600),],
+						end_hint: None
+					}
+				),
+			]
+		);
+	});
+}
+
+#[test]
+fn interlacing_after_assignment_works() {
+	TestExt::new().endow(1, 1000).execute_with(|| {
+		assert_ok!(Broker::do_start_sales(100, 1));
+		advance_to(2);
+		// We will initially allocate a task to a purchased region, and after that
+		// we will proceed to interlace the region.
+		let region = Broker::do_purchase(1, u64::max_value()).unwrap();
+		assert_ok!(Broker::do_assign(region, None, 1001, Provisional));
+		let (region1, _region) =
+			Broker::do_interlace(region, None, CoreMask::from_chunk(0, 40)).unwrap();
+		// Interlacing the region won't affect the assignment. The entire region will still
+		// be assigned to `Task(1001)`.
+		//
+		// However, after we assign a task to `region1` the `_region` won't be assigned
+		// to `Task(1001)` anymore. It will become idle.
+		assert_ok!(Broker::do_assign(region1, None, 1002, Provisional));
+		advance_to(10);
+		assert_eq!(
+			CoretimeTrace::get(),
+			vec![(
+				6,
+				AssignCore {
+					core: 0,
+					begin: 8,
+					assignment: vec![(Idle, 28800), (Task(1002), 28800)],
+					end_hint: None
+				}
+			),]
+		);
+	});
+}
+
 #[test]
 fn reservations_are_limited() {
 	TestExt::new().execute_with(|| {
@@ -866,7 +979,7 @@ fn assign_should_drop_invalid_region() {
 		advance_to(10);
 		assert_ok!(Broker::do_assign(region, Some(1), 1001, Provisional));
 		region.begin = 7;
-		System::assert_last_event(Event::RegionDropped { region_id: region, duration: 0 }.into());
+		System::assert_last_event(Event::RegionDropped { region_id: region, duration: 3 }.into());
 	});
 }
 
@@ -879,7 +992,7 @@ fn pool_should_drop_invalid_region() {
 		advance_to(10);
 		assert_ok!(Broker::do_pool(region, Some(1), 1001, Provisional));
 		region.begin = 7;
-		System::assert_last_event(Event::RegionDropped { region_id: region, duration: 0 }.into());
+		System::assert_last_event(Event::RegionDropped { region_id: region, duration: 3 }.into());
 	});
 }
 
diff --git a/substrate/frame/broker/src/tick_impls.rs b/substrate/frame/broker/src/tick_impls.rs
index 0677d2793e21acd17e3591738ec97c9df6687f7e..7df8bd39d42fe13e6cf7375442d7ddab98c60d99 100644
--- a/substrate/frame/broker/src/tick_impls.rs
+++ b/substrate/frame/broker/src/tick_impls.rs
@@ -36,13 +36,14 @@ impl<T: Config> Pallet<T> {
 	/// - Request revenue information for a previous timeslice
 	/// - Initialize an instantaneous core pool historical revenue record
 	pub(crate) fn do_tick() -> Weight {
+		let mut meter = WeightMeter::new();
+		meter.consume(T::WeightInfo::do_tick_base());
+
 		let (mut status, config) = match (Status::<T>::get(), Configuration::<T>::get()) {
 			(Some(s), Some(c)) => (s, c),
-			_ => return Weight::zero(),
+			_ => return meter.consumed(),
 		};
 
-		let mut meter = WeightMeter::max_limit();
-
 		if Self::process_core_count(&mut status) {
 			meter.consume(T::WeightInfo::process_core_count(status.core_count.into()));
 		}
@@ -95,9 +96,7 @@ impl<T: Config> Pallet<T> {
 	}
 
 	pub(crate) fn process_revenue() -> bool {
-		let Some((until, amount)) = T::Coretime::check_notify_revenue_info() else {
-			return false;
-		};
+		let Some((until, amount)) = T::Coretime::check_notify_revenue_info() else { return false };
 		let when: Timeslice =
 			(until / T::TimeslicePeriod::get()).saturating_sub(One::one()).saturated_into();
 		let mut revenue = T::ConvertBalance::convert_back(amount);
@@ -289,9 +288,7 @@ impl<T: Config> Pallet<T> {
 		rc_begin: RelayBlockNumberOf<T>,
 		core: CoreIndex,
 	) {
-		let Some(workplan) = Workplan::<T>::take((timeslice, core)) else {
-			return;
-		};
+		let Some(workplan) = Workplan::<T>::take((timeslice, core)) else { return };
 		let workload = Workload::<T>::get(core);
 		let parts_used = workplan.iter().map(|i| i.mask).fold(CoreMask::void(), |a, i| a | i);
 		let mut workplan = workplan.into_inner();
diff --git a/substrate/frame/broker/src/utility_impls.rs b/substrate/frame/broker/src/utility_impls.rs
index 99c4de32f77678f4df9568e7c5a2c442b255c4c8..2450198050b67fccc852bd06e116bcdc16628750 100644
--- a/substrate/frame/broker/src/utility_impls.rs
+++ b/substrate/frame/broker/src/utility_impls.rs
@@ -101,9 +101,9 @@ impl<T: Config> Pallet<T> {
 
 		let last_committed_timeslice = status.last_committed_timeslice;
 		if region_id.begin <= last_committed_timeslice {
+			let duration = region.end.saturating_sub(region_id.begin);
 			region_id.begin = last_committed_timeslice + 1;
 			if region_id.begin >= region.end {
-				let duration = region.end.saturating_sub(region_id.begin);
 				Self::deposit_event(Event::RegionDropped { region_id, duration });
 				return Ok(None)
 			}
diff --git a/substrate/frame/broker/src/weights.rs b/substrate/frame/broker/src/weights.rs
index 93b568bf2a035af7542056026ab3c8238bfc6cfd..b3a151c6062c45f43f9ae1ccafa513a07f70f08f 100644
--- a/substrate/frame/broker/src/weights.rs
+++ b/substrate/frame/broker/src/weights.rs
@@ -18,10 +18,10 @@
 //! Autogenerated weights for `pallet_broker`
 //!
 //! THIS FILE WAS AUTO-GENERATED USING THE SUBSTRATE BENCHMARK CLI VERSION 4.0.0-dev
-//! DATE: 2023-07-29, STEPS: `50`, REPEAT: `20`, LOW RANGE: `[]`, HIGH RANGE: `[]`
+//! DATE: 2023-09-04, STEPS: `50`, REPEAT: `20`, LOW RANGE: `[]`, HIGH RANGE: `[]`
 //! WORST CASE MAP SIZE: `1000000`
-//! HOSTNAME: `runner-ynta1nyy-project-145-concurrent-0`, CPU: `Intel(R) Xeon(R) CPU @ 2.60GHz`
-//! EXECUTION: ``, WASM-EXECUTION: `Compiled`, CHAIN: `Some("dev")`, DB CACHE: `1024`
+//! HOSTNAME: `runner-pzhd7p6z-project-674-concurrent-0`, CPU: `Intel(R) Xeon(R) CPU @ 2.60GHz`
+//! WASM-EXECUTION: `Compiled`, CHAIN: `Some("dev")`, DB CACHE: `1024`
 
 // Executed Command:
 // target/production/substrate-node
@@ -32,12 +32,12 @@
 // --extrinsic=*
 // --wasm-execution=compiled
 // --heap-pages=4096
-// --json-file=/builds/parity/mirrors/substrate/.git/.artifacts/bench.json
+// --json-file=/builds/parity/mirrors/polkadot-sdk/.git/.artifacts/bench.json
 // --pallet=pallet_broker
 // --chain=dev
-// --header=./HEADER-APACHE2
-// --output=./frame/broker/src/weights.rs
-// --template=./.maintain/frame-weight-template.hbs
+// --header=./substrate/HEADER-APACHE2
+// --output=./substrate/frame/broker/src/weights.rs
+// --template=./substrate/.maintain/frame-weight-template.hbs
 
 #![cfg_attr(rustfmt, rustfmt_skip)]
 #![allow(unused_parens)]
@@ -74,6 +74,7 @@ pub trait WeightInfo {
 	fn process_pool() -> Weight;
 	fn process_core_schedule() -> Weight;
 	fn request_revenue_info_at() -> Weight;
+	fn do_tick_base() -> Weight;
 }
 
 /// Weights for `pallet_broker` using the Substrate node and recommended hardware.
@@ -85,8 +86,8 @@ impl<T: frame_system::Config> WeightInfo for SubstrateWeight<T> {
 		// Proof Size summary in bytes:
 		//  Measured:  `0`
 		//  Estimated: `0`
-		// Minimum execution time: 3_448_000 picoseconds.
-		Weight::from_parts(3_729_000, 0)
+		// Minimum execution time: 3_040_000 picoseconds.
+		Weight::from_parts(3_344_000, 0)
 			.saturating_add(T::DbWeight::get().writes(1_u64))
 	}
 	/// Storage: `Broker::Reservations` (r:1 w:1)
@@ -95,8 +96,8 @@ impl<T: frame_system::Config> WeightInfo for SubstrateWeight<T> {
 		// Proof Size summary in bytes:
 		//  Measured:  `5016`
 		//  Estimated: `7496`
-		// Minimum execution time: 22_537_000 picoseconds.
-		Weight::from_parts(23_335_000, 7496)
+		// Minimum execution time: 21_259_000 picoseconds.
+		Weight::from_parts(22_110_000, 7496)
 			.saturating_add(T::DbWeight::get().reads(1_u64))
 			.saturating_add(T::DbWeight::get().writes(1_u64))
 	}
@@ -106,8 +107,8 @@ impl<T: frame_system::Config> WeightInfo for SubstrateWeight<T> {
 		// Proof Size summary in bytes:
 		//  Measured:  `6218`
 		//  Estimated: `7496`
-		// Minimum execution time: 21_668_000 picoseconds.
-		Weight::from_parts(22_442_000, 7496)
+		// Minimum execution time: 20_330_000 picoseconds.
+		Weight::from_parts(20_826_000, 7496)
 			.saturating_add(T::DbWeight::get().reads(1_u64))
 			.saturating_add(T::DbWeight::get().writes(1_u64))
 	}
@@ -117,8 +118,8 @@ impl<T: frame_system::Config> WeightInfo for SubstrateWeight<T> {
 		// Proof Size summary in bytes:
 		//  Measured:  `239`
 		//  Estimated: `1526`
-		// Minimum execution time: 13_606_000 picoseconds.
-		Weight::from_parts(14_104_000, 1526)
+		// Minimum execution time: 13_411_000 picoseconds.
+		Weight::from_parts(13_960_000, 1526)
 			.saturating_add(T::DbWeight::get().reads(1_u64))
 			.saturating_add(T::DbWeight::get().writes(1_u64))
 	}
@@ -137,12 +138,14 @@ impl<T: frame_system::Config> WeightInfo for SubstrateWeight<T> {
 	/// Storage: `Broker::Workplan` (r:0 w:10)
 	/// Proof: `Broker::Workplan` (`max_values`: None, `max_size`: Some(1216), added: 3691, mode: `MaxEncodedLen`)
 	/// The range of component `n` is `[0, 1000]`.
-	fn start_sales(_n: u32, ) -> Weight {
+	fn start_sales(n: u32, ) -> Weight {
 		// Proof Size summary in bytes:
 		//  Measured:  `6330`
 		//  Estimated: `8499`
-		// Minimum execution time: 64_012_000 picoseconds.
-		Weight::from_parts(67_819_922, 8499)
+		// Minimum execution time: 57_770_000 picoseconds.
+		Weight::from_parts(61_047_512, 8499)
+			// Standard Error: 165
+			.saturating_add(Weight::from_parts(3, 0).saturating_mul(n.into()))
 			.saturating_add(T::DbWeight::get().reads(6_u64))
 			.saturating_add(T::DbWeight::get().writes(16_u64))
 	}
@@ -160,8 +163,8 @@ impl<T: frame_system::Config> WeightInfo for SubstrateWeight<T> {
 		// Proof Size summary in bytes:
 		//  Measured:  `568`
 		//  Estimated: `2053`
-		// Minimum execution time: 48_110_000 picoseconds.
-		Weight::from_parts(49_234_000, 2053)
+		// Minimum execution time: 51_196_000 picoseconds.
+		Weight::from_parts(52_382_000, 2053)
 			.saturating_add(T::DbWeight::get().reads(4_u64))
 			.saturating_add(T::DbWeight::get().writes(2_u64))
 	}
@@ -183,8 +186,8 @@ impl<T: frame_system::Config> WeightInfo for SubstrateWeight<T> {
 		// Proof Size summary in bytes:
 		//  Measured:  `686`
 		//  Estimated: `4698`
-		// Minimum execution time: 69_580_000 picoseconds.
-		Weight::from_parts(70_914_000, 4698)
+		// Minimum execution time: 71_636_000 picoseconds.
+		Weight::from_parts(73_679_000, 4698)
 			.saturating_add(T::DbWeight::get().reads(6_u64))
 			.saturating_add(T::DbWeight::get().writes(4_u64))
 	}
@@ -194,8 +197,8 @@ impl<T: frame_system::Config> WeightInfo for SubstrateWeight<T> {
 		// Proof Size summary in bytes:
 		//  Measured:  `495`
 		//  Estimated: `3550`
-		// Minimum execution time: 17_687_000 picoseconds.
-		Weight::from_parts(18_573_000, 3550)
+		// Minimum execution time: 19_182_000 picoseconds.
+		Weight::from_parts(19_775_000, 3550)
 			.saturating_add(T::DbWeight::get().reads(1_u64))
 			.saturating_add(T::DbWeight::get().writes(1_u64))
 	}
@@ -205,8 +208,8 @@ impl<T: frame_system::Config> WeightInfo for SubstrateWeight<T> {
 		// Proof Size summary in bytes:
 		//  Measured:  `495`
 		//  Estimated: `3550`
-		// Minimum execution time: 19_675_000 picoseconds.
-		Weight::from_parts(20_234_000, 3550)
+		// Minimum execution time: 20_688_000 picoseconds.
+		Weight::from_parts(21_557_000, 3550)
 			.saturating_add(T::DbWeight::get().reads(1_u64))
 			.saturating_add(T::DbWeight::get().writes(2_u64))
 	}
@@ -216,8 +219,8 @@ impl<T: frame_system::Config> WeightInfo for SubstrateWeight<T> {
 		// Proof Size summary in bytes:
 		//  Measured:  `495`
 		//  Estimated: `3550`
-		// Minimum execution time: 19_426_000 picoseconds.
-		Weight::from_parts(20_414_000, 3550)
+		// Minimum execution time: 21_190_000 picoseconds.
+		Weight::from_parts(22_215_000, 3550)
 			.saturating_add(T::DbWeight::get().reads(1_u64))
 			.saturating_add(T::DbWeight::get().writes(2_u64))
 	}
@@ -233,8 +236,8 @@ impl<T: frame_system::Config> WeightInfo for SubstrateWeight<T> {
 		// Proof Size summary in bytes:
 		//  Measured:  `740`
 		//  Estimated: `4681`
-		// Minimum execution time: 31_751_000 picoseconds.
-		Weight::from_parts(32_966_000, 4681)
+		// Minimum execution time: 34_591_000 picoseconds.
+		Weight::from_parts(36_227_000, 4681)
 			.saturating_add(T::DbWeight::get().reads(4_u64))
 			.saturating_add(T::DbWeight::get().writes(2_u64))
 	}
@@ -252,8 +255,8 @@ impl<T: frame_system::Config> WeightInfo for SubstrateWeight<T> {
 		// Proof Size summary in bytes:
 		//  Measured:  `775`
 		//  Estimated: `5996`
-		// Minimum execution time: 36_709_000 picoseconds.
-		Weight::from_parts(38_930_000, 5996)
+		// Minimum execution time: 40_346_000 picoseconds.
+		Weight::from_parts(41_951_000, 5996)
 			.saturating_add(T::DbWeight::get().reads(5_u64))
 			.saturating_add(T::DbWeight::get().writes(5_u64))
 	}
@@ -261,20 +264,20 @@ impl<T: frame_system::Config> WeightInfo for SubstrateWeight<T> {
 	/// Proof: `Broker::InstaPoolContribution` (`max_values`: None, `max_size`: Some(68), added: 2543, mode: `MaxEncodedLen`)
 	/// Storage: `Broker::InstaPoolHistory` (r:3 w:1)
 	/// Proof: `Broker::InstaPoolHistory` (`max_values`: None, `max_size`: Some(45), added: 2520, mode: `MaxEncodedLen`)
-	/// Storage: `System::Account` (r:2 w:0)
+	/// Storage: `System::Account` (r:2 w:2)
 	/// Proof: `System::Account` (`max_values`: None, `max_size`: Some(128), added: 2603, mode: `MaxEncodedLen`)
 	/// The range of component `m` is `[1, 3]`.
 	fn claim_revenue(m: u32, ) -> Weight {
 		// Proof Size summary in bytes:
-		//  Measured:  `720`
+		//  Measured:  `859`
 		//  Estimated: `6196 + m * (2520 ±0)`
-		// Minimum execution time: 55_510_000 picoseconds.
-		Weight::from_parts(56_665_061, 6196)
-			// Standard Error: 61_729
-			.saturating_add(Weight::from_parts(1_724_824, 0).saturating_mul(m.into()))
+		// Minimum execution time: 75_734_000 picoseconds.
+		Weight::from_parts(78_168_395, 6196)
+			// Standard Error: 63_180
+			.saturating_add(Weight::from_parts(1_076_259, 0).saturating_mul(m.into()))
 			.saturating_add(T::DbWeight::get().reads(3_u64))
 			.saturating_add(T::DbWeight::get().reads((1_u64).saturating_mul(m.into())))
-			.saturating_add(T::DbWeight::get().writes(3_u64))
+			.saturating_add(T::DbWeight::get().writes(5_u64))
 			.saturating_add(Weight::from_parts(0, 2520).saturating_mul(m.into()))
 	}
 	/// Storage: `System::Account` (r:1 w:1)
@@ -283,8 +286,8 @@ impl<T: frame_system::Config> WeightInfo for SubstrateWeight<T> {
 		// Proof Size summary in bytes:
 		//  Measured:  `103`
 		//  Estimated: `3593`
-		// Minimum execution time: 44_992_000 picoseconds.
-		Weight::from_parts(46_225_000, 3593)
+		// Minimum execution time: 46_383_000 picoseconds.
+		Weight::from_parts(47_405_000, 3593)
 			.saturating_add(T::DbWeight::get().reads(1_u64))
 			.saturating_add(T::DbWeight::get().writes(1_u64))
 	}
@@ -296,8 +299,8 @@ impl<T: frame_system::Config> WeightInfo for SubstrateWeight<T> {
 		// Proof Size summary in bytes:
 		//  Measured:  `603`
 		//  Estimated: `3550`
-		// Minimum execution time: 28_207_000 picoseconds.
-		Weight::from_parts(28_707_000, 3550)
+		// Minimum execution time: 30_994_000 picoseconds.
+		Weight::from_parts(31_979_000, 3550)
 			.saturating_add(T::DbWeight::get().reads(2_u64))
 			.saturating_add(T::DbWeight::get().writes(1_u64))
 	}
@@ -311,8 +314,8 @@ impl<T: frame_system::Config> WeightInfo for SubstrateWeight<T> {
 		// Proof Size summary in bytes:
 		//  Measured:  `601`
 		//  Estimated: `3533`
-		// Minimum execution time: 31_813_000 picoseconds.
-		Weight::from_parts(32_612_000, 3533)
+		// Minimum execution time: 37_584_000 picoseconds.
+		Weight::from_parts(44_010_000, 3533)
 			.saturating_add(T::DbWeight::get().reads(3_u64))
 			.saturating_add(T::DbWeight::get().writes(1_u64))
 	}
@@ -326,10 +329,10 @@ impl<T: frame_system::Config> WeightInfo for SubstrateWeight<T> {
 	/// Proof: `System::Account` (`max_values`: None, `max_size`: Some(128), added: 2603, mode: `MaxEncodedLen`)
 	fn drop_history() -> Weight {
 		// Proof Size summary in bytes:
-		//  Measured:  `829`
+		//  Measured:  `830`
 		//  Estimated: `3593`
-		// Minimum execution time: 38_571_000 picoseconds.
-		Weight::from_parts(39_493_000, 3593)
+		// Minimum execution time: 45_266_000 picoseconds.
+		Weight::from_parts(48_000_000, 3593)
 			.saturating_add(T::DbWeight::get().reads(4_u64))
 			.saturating_add(T::DbWeight::get().writes(1_u64))
 	}
@@ -341,42 +344,53 @@ impl<T: frame_system::Config> WeightInfo for SubstrateWeight<T> {
 		// Proof Size summary in bytes:
 		//  Measured:  `525`
 		//  Estimated: `4698`
-		// Minimum execution time: 24_714_000 picoseconds.
-		Weight::from_parts(25_288_000, 4698)
+		// Minimum execution time: 25_365_000 picoseconds.
+		Weight::from_parts(26_920_000, 4698)
 			.saturating_add(T::DbWeight::get().reads(2_u64))
 			.saturating_add(T::DbWeight::get().writes(1_u64))
 	}
-	/// Storage: UNKNOWN KEY `0x18194fcb5c1fcace44d2d0a004272614` (r:0 w:1)
-	/// Proof: UNKNOWN KEY `0x18194fcb5c1fcace44d2d0a004272614` (r:0 w:1)
 	/// The range of component `n` is `[0, 1000]`.
-	fn request_core_count(_n: u32, ) -> Weight {
+	fn request_core_count(n: u32, ) -> Weight {
 		// Proof Size summary in bytes:
 		//  Measured:  `0`
 		//  Estimated: `0`
-		// Minimum execution time: 7_258_000 picoseconds.
-		Weight::from_parts(7_925_570, 0)
-			.saturating_add(T::DbWeight::get().writes(1_u64))
+		// Minimum execution time: 6_519_000 picoseconds.
+		Weight::from_parts(7_098_698, 0)
+			// Standard Error: 20
+			.saturating_add(Weight::from_parts(8, 0).saturating_mul(n.into()))
 	}
-	/// Storage: UNKNOWN KEY `0x18194fcb5c1fcace44d2d0a004272614` (r:1 w:0)
-	/// Proof: UNKNOWN KEY `0x18194fcb5c1fcace44d2d0a004272614` (r:1 w:0)
+	/// Storage: UNKNOWN KEY `0x18194fcb5c1fcace44d2d0a004272614` (r:1 w:1)
+	/// Proof: UNKNOWN KEY `0x18194fcb5c1fcace44d2d0a004272614` (r:1 w:1)
 	/// The range of component `n` is `[0, 1000]`.
-	fn process_core_count(_n: u32, ) -> Weight {
-		// Proof Size summary in bytes:
-		//  Measured:  `97`
-		//  Estimated: `3562`
-		// Minimum execution time: 7_136_000 picoseconds.
-		Weight::from_parts(7_788_194, 3562)
+	fn process_core_count(n: u32, ) -> Weight {
+		// Proof Size summary in bytes:
+		//  Measured:  `98`
+		//  Estimated: `3563`
+		// Minimum execution time: 7_608_000 picoseconds.
+		Weight::from_parts(8_157_815, 3563)
+			// Standard Error: 26
+			.saturating_add(Weight::from_parts(48, 0).saturating_mul(n.into()))
 			.saturating_add(T::DbWeight::get().reads(1_u64))
+			.saturating_add(T::DbWeight::get().writes(1_u64))
 	}
-	/// Storage: `Broker::InstaPoolHistory` (r:0 w:1)
+	/// Storage: UNKNOWN KEY `0xf308d869daf021a7724e69c557dd8dbe` (r:1 w:1)
+	/// Proof: UNKNOWN KEY `0xf308d869daf021a7724e69c557dd8dbe` (r:1 w:1)
+	/// Storage: `Broker::InstaPoolHistory` (r:1 w:1)
 	/// Proof: `Broker::InstaPoolHistory` (`max_values`: None, `max_size`: Some(45), added: 2520, mode: `MaxEncodedLen`)
+	/// Storage: `System::Account` (r:1 w:1)
+	/// Proof: `System::Account` (`max_values`: None, `max_size`: Some(128), added: 2603, mode: `MaxEncodedLen`)
+	/// Storage: `Authorship::Author` (r:1 w:0)
+	/// Proof: `Authorship::Author` (`max_values`: Some(1), `max_size`: Some(32), added: 527, mode: `MaxEncodedLen`)
+	/// Storage: `System::Digest` (r:1 w:0)
+	/// Proof: `System::Digest` (`max_values`: Some(1), `max_size`: None, mode: `Measured`)
 	fn process_revenue() -> Weight {
 		// Proof Size summary in bytes:
-		//  Measured:  `0`
-		//  Estimated: `0`
-		// Minimum execution time: 6_049_000 picoseconds.
-		Weight::from_parts(6_311_000, 0)
-			.saturating_add(T::DbWeight::get().writes(1_u64))
+		//  Measured:  `905`
+		//  Estimated: `4370`
+		// Minimum execution time: 59_993_000 picoseconds.
+		Weight::from_parts(61_752_000, 4370)
+			.saturating_add(T::DbWeight::get().reads(5_u64))
+			.saturating_add(T::DbWeight::get().writes(3_u64))
 	}
 	/// Storage: `Broker::InstaPoolIo` (r:3 w:3)
 	/// Proof: `Broker::InstaPoolIo` (`max_values`: None, `max_size`: Some(28), added: 2503, mode: `MaxEncodedLen`)
@@ -393,10 +407,10 @@ impl<T: frame_system::Config> WeightInfo for SubstrateWeight<T> {
 		// Proof Size summary in bytes:
 		//  Measured:  `6281`
 		//  Estimated: `8499`
-		// Minimum execution time: 47_504_000 picoseconds.
-		Weight::from_parts(49_778_098, 8499)
-			// Standard Error: 109
-			.saturating_add(Weight::from_parts(427, 0).saturating_mul(n.into()))
+		// Minimum execution time: 41_863_000 picoseconds.
+		Weight::from_parts(44_033_031, 8499)
+			// Standard Error: 116
+			.saturating_add(Weight::from_parts(764, 0).saturating_mul(n.into()))
 			.saturating_add(T::DbWeight::get().reads(5_u64))
 			.saturating_add(T::DbWeight::get().writes(15_u64))
 	}
@@ -408,8 +422,8 @@ impl<T: frame_system::Config> WeightInfo for SubstrateWeight<T> {
 		// Proof Size summary in bytes:
 		//  Measured:  `180`
 		//  Estimated: `3493`
-		// Minimum execution time: 9_573_000 picoseconds.
-		Weight::from_parts(10_034_000, 3493)
+		// Minimum execution time: 9_588_000 picoseconds.
+		Weight::from_parts(9_925_000, 3493)
 			.saturating_add(T::DbWeight::get().reads(1_u64))
 			.saturating_add(T::DbWeight::get().writes(1_u64))
 	}
@@ -421,8 +435,8 @@ impl<T: frame_system::Config> WeightInfo for SubstrateWeight<T> {
 		// Proof Size summary in bytes:
 		//  Measured:  `1423`
 		//  Estimated: `4681`
-		// Minimum execution time: 21_331_000 picoseconds.
-		Weight::from_parts(22_235_000, 4681)
+		// Minimum execution time: 19_308_000 picoseconds.
+		Weight::from_parts(20_482_000, 4681)
 			.saturating_add(T::DbWeight::get().reads(2_u64))
 			.saturating_add(T::DbWeight::get().writes(2_u64))
 	}
@@ -430,8 +444,25 @@ impl<T: frame_system::Config> WeightInfo for SubstrateWeight<T> {
 		// Proof Size summary in bytes:
 		//  Measured:  `0`
 		//  Estimated: `0`
-		// Minimum execution time: 191_000 picoseconds.
-		Weight::from_parts(234_000, 0)
+		// Minimum execution time: 147_000 picoseconds.
+		Weight::from_parts(184_000, 0)
+	}
+	/// Storage: `Broker::Status` (r:1 w:1)
+	/// Proof: `Broker::Status` (`max_values`: Some(1), `max_size`: Some(18), added: 513, mode: `MaxEncodedLen`)
+	/// Storage: `Broker::Configuration` (r:1 w:0)
+	/// Proof: `Broker::Configuration` (`max_values`: Some(1), `max_size`: Some(31), added: 526, mode: `MaxEncodedLen`)
+	/// Storage: UNKNOWN KEY `0x18194fcb5c1fcace44d2d0a004272614` (r:1 w:1)
+	/// Proof: UNKNOWN KEY `0x18194fcb5c1fcace44d2d0a004272614` (r:1 w:1)
+	/// Storage: UNKNOWN KEY `0xf308d869daf021a7724e69c557dd8dbe` (r:1 w:1)
+	/// Proof: UNKNOWN KEY `0xf308d869daf021a7724e69c557dd8dbe` (r:1 w:1)
+	fn do_tick_base() -> Weight {
+		// Proof Size summary in bytes:
+		//  Measured:  `699`
+		//  Estimated: `4164`
+		// Minimum execution time: 19_824_000 picoseconds.
+		Weight::from_parts(20_983_000, 4164)
+			.saturating_add(T::DbWeight::get().reads(4_u64))
+			.saturating_add(T::DbWeight::get().writes(3_u64))
 	}
 }
 
@@ -443,8 +474,8 @@ impl WeightInfo for () {
 		// Proof Size summary in bytes:
 		//  Measured:  `0`
 		//  Estimated: `0`
-		// Minimum execution time: 3_448_000 picoseconds.
-		Weight::from_parts(3_729_000, 0)
+		// Minimum execution time: 3_040_000 picoseconds.
+		Weight::from_parts(3_344_000, 0)
 			.saturating_add(RocksDbWeight::get().writes(1_u64))
 	}
 	/// Storage: `Broker::Reservations` (r:1 w:1)
@@ -453,8 +484,8 @@ impl WeightInfo for () {
 		// Proof Size summary in bytes:
 		//  Measured:  `5016`
 		//  Estimated: `7496`
-		// Minimum execution time: 22_537_000 picoseconds.
-		Weight::from_parts(23_335_000, 7496)
+		// Minimum execution time: 21_259_000 picoseconds.
+		Weight::from_parts(22_110_000, 7496)
 			.saturating_add(RocksDbWeight::get().reads(1_u64))
 			.saturating_add(RocksDbWeight::get().writes(1_u64))
 	}
@@ -464,8 +495,8 @@ impl WeightInfo for () {
 		// Proof Size summary in bytes:
 		//  Measured:  `6218`
 		//  Estimated: `7496`
-		// Minimum execution time: 21_668_000 picoseconds.
-		Weight::from_parts(22_442_000, 7496)
+		// Minimum execution time: 20_330_000 picoseconds.
+		Weight::from_parts(20_826_000, 7496)
 			.saturating_add(RocksDbWeight::get().reads(1_u64))
 			.saturating_add(RocksDbWeight::get().writes(1_u64))
 	}
@@ -475,8 +506,8 @@ impl WeightInfo for () {
 		// Proof Size summary in bytes:
 		//  Measured:  `239`
 		//  Estimated: `1526`
-		// Minimum execution time: 13_606_000 picoseconds.
-		Weight::from_parts(14_104_000, 1526)
+		// Minimum execution time: 13_411_000 picoseconds.
+		Weight::from_parts(13_960_000, 1526)
 			.saturating_add(RocksDbWeight::get().reads(1_u64))
 			.saturating_add(RocksDbWeight::get().writes(1_u64))
 	}
@@ -495,12 +526,14 @@ impl WeightInfo for () {
 	/// Storage: `Broker::Workplan` (r:0 w:10)
 	/// Proof: `Broker::Workplan` (`max_values`: None, `max_size`: Some(1216), added: 3691, mode: `MaxEncodedLen`)
 	/// The range of component `n` is `[0, 1000]`.
-	fn start_sales(_n: u32, ) -> Weight {
+	fn start_sales(n: u32, ) -> Weight {
 		// Proof Size summary in bytes:
 		//  Measured:  `6330`
 		//  Estimated: `8499`
-		// Minimum execution time: 64_012_000 picoseconds.
-		Weight::from_parts(67_819_922, 8499)
+		// Minimum execution time: 57_770_000 picoseconds.
+		Weight::from_parts(61_047_512, 8499)
+			// Standard Error: 165
+			.saturating_add(Weight::from_parts(3, 0).saturating_mul(n.into()))
 			.saturating_add(RocksDbWeight::get().reads(6_u64))
 			.saturating_add(RocksDbWeight::get().writes(16_u64))
 	}
@@ -518,8 +551,8 @@ impl WeightInfo for () {
 		// Proof Size summary in bytes:
 		//  Measured:  `568`
 		//  Estimated: `2053`
-		// Minimum execution time: 48_110_000 picoseconds.
-		Weight::from_parts(49_234_000, 2053)
+		// Minimum execution time: 51_196_000 picoseconds.
+		Weight::from_parts(52_382_000, 2053)
 			.saturating_add(RocksDbWeight::get().reads(4_u64))
 			.saturating_add(RocksDbWeight::get().writes(2_u64))
 	}
@@ -541,8 +574,8 @@ impl WeightInfo for () {
 		// Proof Size summary in bytes:
 		//  Measured:  `686`
 		//  Estimated: `4698`
-		// Minimum execution time: 69_580_000 picoseconds.
-		Weight::from_parts(70_914_000, 4698)
+		// Minimum execution time: 71_636_000 picoseconds.
+		Weight::from_parts(73_679_000, 4698)
 			.saturating_add(RocksDbWeight::get().reads(6_u64))
 			.saturating_add(RocksDbWeight::get().writes(4_u64))
 	}
@@ -552,8 +585,8 @@ impl WeightInfo for () {
 		// Proof Size summary in bytes:
 		//  Measured:  `495`
 		//  Estimated: `3550`
-		// Minimum execution time: 17_687_000 picoseconds.
-		Weight::from_parts(18_573_000, 3550)
+		// Minimum execution time: 19_182_000 picoseconds.
+		Weight::from_parts(19_775_000, 3550)
 			.saturating_add(RocksDbWeight::get().reads(1_u64))
 			.saturating_add(RocksDbWeight::get().writes(1_u64))
 	}
@@ -563,8 +596,8 @@ impl WeightInfo for () {
 		// Proof Size summary in bytes:
 		//  Measured:  `495`
 		//  Estimated: `3550`
-		// Minimum execution time: 19_675_000 picoseconds.
-		Weight::from_parts(20_234_000, 3550)
+		// Minimum execution time: 20_688_000 picoseconds.
+		Weight::from_parts(21_557_000, 3550)
 			.saturating_add(RocksDbWeight::get().reads(1_u64))
 			.saturating_add(RocksDbWeight::get().writes(2_u64))
 	}
@@ -574,8 +607,8 @@ impl WeightInfo for () {
 		// Proof Size summary in bytes:
 		//  Measured:  `495`
 		//  Estimated: `3550`
-		// Minimum execution time: 19_426_000 picoseconds.
-		Weight::from_parts(20_414_000, 3550)
+		// Minimum execution time: 21_190_000 picoseconds.
+		Weight::from_parts(22_215_000, 3550)
 			.saturating_add(RocksDbWeight::get().reads(1_u64))
 			.saturating_add(RocksDbWeight::get().writes(2_u64))
 	}
@@ -591,8 +624,8 @@ impl WeightInfo for () {
 		// Proof Size summary in bytes:
 		//  Measured:  `740`
 		//  Estimated: `4681`
-		// Minimum execution time: 31_751_000 picoseconds.
-		Weight::from_parts(32_966_000, 4681)
+		// Minimum execution time: 34_591_000 picoseconds.
+		Weight::from_parts(36_227_000, 4681)
 			.saturating_add(RocksDbWeight::get().reads(4_u64))
 			.saturating_add(RocksDbWeight::get().writes(2_u64))
 	}
@@ -610,8 +643,8 @@ impl WeightInfo for () {
 		// Proof Size summary in bytes:
 		//  Measured:  `775`
 		//  Estimated: `5996`
-		// Minimum execution time: 36_709_000 picoseconds.
-		Weight::from_parts(38_930_000, 5996)
+		// Minimum execution time: 40_346_000 picoseconds.
+		Weight::from_parts(41_951_000, 5996)
 			.saturating_add(RocksDbWeight::get().reads(5_u64))
 			.saturating_add(RocksDbWeight::get().writes(5_u64))
 	}
@@ -619,20 +652,20 @@ impl WeightInfo for () {
 	/// Proof: `Broker::InstaPoolContribution` (`max_values`: None, `max_size`: Some(68), added: 2543, mode: `MaxEncodedLen`)
 	/// Storage: `Broker::InstaPoolHistory` (r:3 w:1)
 	/// Proof: `Broker::InstaPoolHistory` (`max_values`: None, `max_size`: Some(45), added: 2520, mode: `MaxEncodedLen`)
-	/// Storage: `System::Account` (r:2 w:0)
+	/// Storage: `System::Account` (r:2 w:2)
 	/// Proof: `System::Account` (`max_values`: None, `max_size`: Some(128), added: 2603, mode: `MaxEncodedLen`)
 	/// The range of component `m` is `[1, 3]`.
 	fn claim_revenue(m: u32, ) -> Weight {
 		// Proof Size summary in bytes:
-		//  Measured:  `720`
+		//  Measured:  `859`
 		//  Estimated: `6196 + m * (2520 ±0)`
-		// Minimum execution time: 55_510_000 picoseconds.
-		Weight::from_parts(56_665_061, 6196)
-			// Standard Error: 61_729
-			.saturating_add(Weight::from_parts(1_724_824, 0).saturating_mul(m.into()))
+		// Minimum execution time: 75_734_000 picoseconds.
+		Weight::from_parts(78_168_395, 6196)
+			// Standard Error: 63_180
+			.saturating_add(Weight::from_parts(1_076_259, 0).saturating_mul(m.into()))
 			.saturating_add(RocksDbWeight::get().reads(3_u64))
 			.saturating_add(RocksDbWeight::get().reads((1_u64).saturating_mul(m.into())))
-			.saturating_add(RocksDbWeight::get().writes(3_u64))
+			.saturating_add(RocksDbWeight::get().writes(5_u64))
 			.saturating_add(Weight::from_parts(0, 2520).saturating_mul(m.into()))
 	}
 	/// Storage: `System::Account` (r:1 w:1)
@@ -641,8 +674,8 @@ impl WeightInfo for () {
 		// Proof Size summary in bytes:
 		//  Measured:  `103`
 		//  Estimated: `3593`
-		// Minimum execution time: 44_992_000 picoseconds.
-		Weight::from_parts(46_225_000, 3593)
+		// Minimum execution time: 46_383_000 picoseconds.
+		Weight::from_parts(47_405_000, 3593)
 			.saturating_add(RocksDbWeight::get().reads(1_u64))
 			.saturating_add(RocksDbWeight::get().writes(1_u64))
 	}
@@ -654,8 +687,8 @@ impl WeightInfo for () {
 		// Proof Size summary in bytes:
 		//  Measured:  `603`
 		//  Estimated: `3550`
-		// Minimum execution time: 28_207_000 picoseconds.
-		Weight::from_parts(28_707_000, 3550)
+		// Minimum execution time: 30_994_000 picoseconds.
+		Weight::from_parts(31_979_000, 3550)
 			.saturating_add(RocksDbWeight::get().reads(2_u64))
 			.saturating_add(RocksDbWeight::get().writes(1_u64))
 	}
@@ -669,8 +702,8 @@ impl WeightInfo for () {
 		// Proof Size summary in bytes:
 		//  Measured:  `601`
 		//  Estimated: `3533`
-		// Minimum execution time: 31_813_000 picoseconds.
-		Weight::from_parts(32_612_000, 3533)
+		// Minimum execution time: 37_584_000 picoseconds.
+		Weight::from_parts(44_010_000, 3533)
 			.saturating_add(RocksDbWeight::get().reads(3_u64))
 			.saturating_add(RocksDbWeight::get().writes(1_u64))
 	}
@@ -684,10 +717,10 @@ impl WeightInfo for () {
 	/// Proof: `System::Account` (`max_values`: None, `max_size`: Some(128), added: 2603, mode: `MaxEncodedLen`)
 	fn drop_history() -> Weight {
 		// Proof Size summary in bytes:
-		//  Measured:  `829`
+		//  Measured:  `830`
 		//  Estimated: `3593`
-		// Minimum execution time: 38_571_000 picoseconds.
-		Weight::from_parts(39_493_000, 3593)
+		// Minimum execution time: 45_266_000 picoseconds.
+		Weight::from_parts(48_000_000, 3593)
 			.saturating_add(RocksDbWeight::get().reads(4_u64))
 			.saturating_add(RocksDbWeight::get().writes(1_u64))
 	}
@@ -699,42 +732,53 @@ impl WeightInfo for () {
 		// Proof Size summary in bytes:
 		//  Measured:  `525`
 		//  Estimated: `4698`
-		// Minimum execution time: 24_714_000 picoseconds.
-		Weight::from_parts(25_288_000, 4698)
+		// Minimum execution time: 25_365_000 picoseconds.
+		Weight::from_parts(26_920_000, 4698)
 			.saturating_add(RocksDbWeight::get().reads(2_u64))
 			.saturating_add(RocksDbWeight::get().writes(1_u64))
 	}
-	/// Storage: UNKNOWN KEY `0x18194fcb5c1fcace44d2d0a004272614` (r:0 w:1)
-	/// Proof: UNKNOWN KEY `0x18194fcb5c1fcace44d2d0a004272614` (r:0 w:1)
 	/// The range of component `n` is `[0, 1000]`.
-	fn request_core_count(_n: u32, ) -> Weight {
+	fn request_core_count(n: u32, ) -> Weight {
 		// Proof Size summary in bytes:
 		//  Measured:  `0`
 		//  Estimated: `0`
-		// Minimum execution time: 7_258_000 picoseconds.
-		Weight::from_parts(7_925_570, 0)
-			.saturating_add(RocksDbWeight::get().writes(1_u64))
+		// Minimum execution time: 6_519_000 picoseconds.
+		Weight::from_parts(7_098_698, 0)
+			// Standard Error: 20
+			.saturating_add(Weight::from_parts(8, 0).saturating_mul(n.into()))
 	}
-	/// Storage: UNKNOWN KEY `0x18194fcb5c1fcace44d2d0a004272614` (r:1 w:0)
-	/// Proof: UNKNOWN KEY `0x18194fcb5c1fcace44d2d0a004272614` (r:1 w:0)
+	/// Storage: UNKNOWN KEY `0x18194fcb5c1fcace44d2d0a004272614` (r:1 w:1)
+	/// Proof: UNKNOWN KEY `0x18194fcb5c1fcace44d2d0a004272614` (r:1 w:1)
 	/// The range of component `n` is `[0, 1000]`.
-	fn process_core_count(_n: u32, ) -> Weight {
-		// Proof Size summary in bytes:
-		//  Measured:  `97`
-		//  Estimated: `3562`
-		// Minimum execution time: 7_136_000 picoseconds.
-		Weight::from_parts(7_788_194, 3562)
+	fn process_core_count(n: u32, ) -> Weight {
+		// Proof Size summary in bytes:
+		//  Measured:  `98`
+		//  Estimated: `3563`
+		// Minimum execution time: 7_608_000 picoseconds.
+		Weight::from_parts(8_157_815, 3563)
+			// Standard Error: 26
+			.saturating_add(Weight::from_parts(48, 0).saturating_mul(n.into()))
 			.saturating_add(RocksDbWeight::get().reads(1_u64))
+			.saturating_add(RocksDbWeight::get().writes(1_u64))
 	}
-	/// Storage: `Broker::InstaPoolHistory` (r:0 w:1)
+	/// Storage: UNKNOWN KEY `0xf308d869daf021a7724e69c557dd8dbe` (r:1 w:1)
+	/// Proof: UNKNOWN KEY `0xf308d869daf021a7724e69c557dd8dbe` (r:1 w:1)
+	/// Storage: `Broker::InstaPoolHistory` (r:1 w:1)
 	/// Proof: `Broker::InstaPoolHistory` (`max_values`: None, `max_size`: Some(45), added: 2520, mode: `MaxEncodedLen`)
+	/// Storage: `System::Account` (r:1 w:1)
+	/// Proof: `System::Account` (`max_values`: None, `max_size`: Some(128), added: 2603, mode: `MaxEncodedLen`)
+	/// Storage: `Authorship::Author` (r:1 w:0)
+	/// Proof: `Authorship::Author` (`max_values`: Some(1), `max_size`: Some(32), added: 527, mode: `MaxEncodedLen`)
+	/// Storage: `System::Digest` (r:1 w:0)
+	/// Proof: `System::Digest` (`max_values`: Some(1), `max_size`: None, mode: `Measured`)
 	fn process_revenue() -> Weight {
 		// Proof Size summary in bytes:
-		//  Measured:  `0`
-		//  Estimated: `0`
-		// Minimum execution time: 6_049_000 picoseconds.
-		Weight::from_parts(6_311_000, 0)
-			.saturating_add(RocksDbWeight::get().writes(1_u64))
+		//  Measured:  `905`
+		//  Estimated: `4370`
+		// Minimum execution time: 59_993_000 picoseconds.
+		Weight::from_parts(61_752_000, 4370)
+			.saturating_add(RocksDbWeight::get().reads(5_u64))
+			.saturating_add(RocksDbWeight::get().writes(3_u64))
 	}
 	/// Storage: `Broker::InstaPoolIo` (r:3 w:3)
 	/// Proof: `Broker::InstaPoolIo` (`max_values`: None, `max_size`: Some(28), added: 2503, mode: `MaxEncodedLen`)
@@ -751,10 +795,10 @@ impl WeightInfo for () {
 		// Proof Size summary in bytes:
 		//  Measured:  `6281`
 		//  Estimated: `8499`
-		// Minimum execution time: 47_504_000 picoseconds.
-		Weight::from_parts(49_778_098, 8499)
-			// Standard Error: 109
-			.saturating_add(Weight::from_parts(427, 0).saturating_mul(n.into()))
+		// Minimum execution time: 41_863_000 picoseconds.
+		Weight::from_parts(44_033_031, 8499)
+			// Standard Error: 116
+			.saturating_add(Weight::from_parts(764, 0).saturating_mul(n.into()))
 			.saturating_add(RocksDbWeight::get().reads(5_u64))
 			.saturating_add(RocksDbWeight::get().writes(15_u64))
 	}
@@ -766,8 +810,8 @@ impl WeightInfo for () {
 		// Proof Size summary in bytes:
 		//  Measured:  `180`
 		//  Estimated: `3493`
-		// Minimum execution time: 9_573_000 picoseconds.
-		Weight::from_parts(10_034_000, 3493)
+		// Minimum execution time: 9_588_000 picoseconds.
+		Weight::from_parts(9_925_000, 3493)
 			.saturating_add(RocksDbWeight::get().reads(1_u64))
 			.saturating_add(RocksDbWeight::get().writes(1_u64))
 	}
@@ -779,8 +823,8 @@ impl WeightInfo for () {
 		// Proof Size summary in bytes:
 		//  Measured:  `1423`
 		//  Estimated: `4681`
-		// Minimum execution time: 21_331_000 picoseconds.
-		Weight::from_parts(22_235_000, 4681)
+		// Minimum execution time: 19_308_000 picoseconds.
+		Weight::from_parts(20_482_000, 4681)
 			.saturating_add(RocksDbWeight::get().reads(2_u64))
 			.saturating_add(RocksDbWeight::get().writes(2_u64))
 	}
@@ -788,7 +832,24 @@ impl WeightInfo for () {
 		// Proof Size summary in bytes:
 		//  Measured:  `0`
 		//  Estimated: `0`
-		// Minimum execution time: 191_000 picoseconds.
-		Weight::from_parts(234_000, 0)
+		// Minimum execution time: 147_000 picoseconds.
+		Weight::from_parts(184_000, 0)
+	}
+	/// Storage: `Broker::Status` (r:1 w:1)
+	/// Proof: `Broker::Status` (`max_values`: Some(1), `max_size`: Some(18), added: 513, mode: `MaxEncodedLen`)
+	/// Storage: `Broker::Configuration` (r:1 w:0)
+	/// Proof: `Broker::Configuration` (`max_values`: Some(1), `max_size`: Some(31), added: 526, mode: `MaxEncodedLen`)
+	/// Storage: UNKNOWN KEY `0x18194fcb5c1fcace44d2d0a004272614` (r:1 w:1)
+	/// Proof: UNKNOWN KEY `0x18194fcb5c1fcace44d2d0a004272614` (r:1 w:1)
+	/// Storage: UNKNOWN KEY `0xf308d869daf021a7724e69c557dd8dbe` (r:1 w:1)
+	/// Proof: UNKNOWN KEY `0xf308d869daf021a7724e69c557dd8dbe` (r:1 w:1)
+	fn do_tick_base() -> Weight {
+		// Proof Size summary in bytes:
+		//  Measured:  `699`
+		//  Estimated: `4164`
+		// Minimum execution time: 19_824_000 picoseconds.
+		Weight::from_parts(20_983_000, 4164)
+			.saturating_add(RocksDbWeight::get().reads(4_u64))
+			.saturating_add(RocksDbWeight::get().writes(3_u64))
 	}
 }
diff --git a/substrate/frame/child-bounties/Cargo.toml b/substrate/frame/child-bounties/Cargo.toml
index 07dd737d3d9f1c1842d2e229e5875ed6431eb3b4..b2ca01e3781914fc49a3fd601868544c77a24a58 100644
--- a/substrate/frame/child-bounties/Cargo.toml
+++ b/substrate/frame/child-bounties/Cargo.toml
@@ -1,11 +1,11 @@
 [package]
 name = "pallet-child-bounties"
 version = "4.0.0-dev"
-authors = ["Parity Technologies <admin@parity.io>"]
-edition = "2021"
+authors.workspace = true
+edition.workspace = true
 license = "Apache-2.0"
 homepage = "https://substrate.io"
-repository = "https://github.com/paritytech/substrate/"
+repository.workspace = true
 description = "FRAME pallet to manage child bounties"
 readme = "README.md"
 
diff --git a/substrate/frame/child-bounties/README.md b/substrate/frame/child-bounties/README.md
index 695b6616b1751f087277ee8872ae6536afd560c2..cf62698dcaf91eed3adfaabc3b1530493873960d 100644
--- a/substrate/frame/child-bounties/README.md
+++ b/substrate/frame/child-bounties/README.md
@@ -8,7 +8,7 @@ With child bounties, a large bounty proposal can be divided into smaller chunks,
 for parallel execution, and for efficient governance and tracking of spent funds.
 A child bounty is a smaller piece of work, extracted from a parent bounty.
 A curator is assigned after the child bounty is created by the parent bounty curator,
-to be delegated with the responsibility of assigning a payout address once 
+to be delegated with the responsibility of assigning a payout address once
 the specified set of tasks is completed.
 
 ## Interface
diff --git a/substrate/frame/child-bounties/src/tests.rs b/substrate/frame/child-bounties/src/tests.rs
index 24a6410f29f78daf8e33edd8fe32fcbbd307d942..1fa3d944f3de153117b71817f9e5c5c17cde18e4 100644
--- a/substrate/frame/child-bounties/src/tests.rs
+++ b/substrate/frame/child-bounties/src/tests.rs
@@ -24,7 +24,10 @@ use crate as pallet_child_bounties;
 
 use frame_support::{
 	assert_noop, assert_ok, parameter_types,
-	traits::{ConstU32, ConstU64, OnInitialize},
+	traits::{
+		tokens::{PayFromAccount, UnityAssetBalanceConversion},
+		ConstU32, ConstU64, OnInitialize,
+	},
 	weights::Weight,
 	PalletId,
 };
@@ -104,6 +107,7 @@ parameter_types! {
 	pub const ProposalBond: Permill = Permill::from_percent(5);
 	pub const Burn: Permill = Permill::from_percent(50);
 	pub const TreasuryPalletId: PalletId = PalletId(*b"py/trsry");
+	pub TreasuryAccount: u128 = Treasury::account_id();
 	pub const SpendLimit: Balance = u64::MAX;
 }
 
@@ -124,6 +128,14 @@ impl pallet_treasury::Config for Test {
 	type SpendFunds = Bounties;
 	type MaxApprovals = ConstU32<100>;
 	type SpendOrigin = frame_system::EnsureRootWithSuccess<Self::AccountId, SpendLimit>;
+	type AssetKind = ();
+	type Beneficiary = Self::AccountId;
+	type BeneficiaryLookup = IdentityLookup<Self::Beneficiary>;
+	type Paymaster = PayFromAccount<Balances, TreasuryAccount>;
+	type BalanceConverter = UnityAssetBalanceConversion;
+	type PayoutPeriod = ConstU64<10>;
+	#[cfg(feature = "runtime-benchmarks")]
+	type BenchmarkHelper = ();
 }
 parameter_types! {
 	// This will be 50% of the bounty fee.
diff --git a/substrate/frame/collective/Cargo.toml b/substrate/frame/collective/Cargo.toml
index 6f9572330903e1738304f62b16093f8bf7beaf2f..c9180d2bc710749372b382b38fb6e65d5f945f3b 100644
--- a/substrate/frame/collective/Cargo.toml
+++ b/substrate/frame/collective/Cargo.toml
@@ -1,11 +1,11 @@
 [package]
 name = "pallet-collective"
 version = "4.0.0-dev"
-authors = ["Parity Technologies <admin@parity.io>"]
-edition = "2021"
+authors.workspace = true
+edition.workspace = true
 license = "Apache-2.0"
 homepage = "https://substrate.io"
-repository = "https://github.com/paritytech/substrate/"
+repository.workspace = true
 description = "Collective system: Members of a set of account IDs can make their collective feelings known through dispatched calls from one of two specialized origins."
 readme = "README.md"
 
diff --git a/substrate/frame/collective/src/lib.rs b/substrate/frame/collective/src/lib.rs
index ac6ad39eac5a44c0ae52cebef18e8352204c3d08..10f989e5c4cc6ef92c258c21455d8f227dcf3dbe 100644
--- a/substrate/frame/collective/src/lib.rs
+++ b/substrate/frame/collective/src/lib.rs
@@ -45,13 +45,15 @@
 use codec::{Decode, Encode, MaxEncodedLen};
 use scale_info::TypeInfo;
 use sp_io::storage;
-use sp_runtime::{traits::Hash, RuntimeDebug};
+use sp_runtime::{
+	traits::{Dispatchable, Hash},
+	DispatchError, RuntimeDebug,
+};
 use sp_std::{marker::PhantomData, prelude::*, result};
 
 use frame_support::{
 	dispatch::{
-		DispatchError, DispatchResult, DispatchResultWithPostInfo, Dispatchable, GetDispatchInfo,
-		Pays, PostDispatchInfo,
+		DispatchResult, DispatchResultWithPostInfo, GetDispatchInfo, Pays, PostDispatchInfo,
 	},
 	ensure, impl_ensure_origin_with_arg_ignoring_arg,
 	traits::{
diff --git a/substrate/frame/contracts/CHANGELOG.md b/substrate/frame/contracts/CHANGELOG.md
index dcb9d6d4d2b206b97cd271195f6e6a8cb86c56a0..aca94e5b149152d5c598102c633048baa17d1276 100644
--- a/substrate/frame/contracts/CHANGELOG.md
+++ b/substrate/frame/contracts/CHANGELOG.md
@@ -5,7 +5,7 @@ All notable changes to this project will be documented in this file.
 The format is based on [Keep a Changelog](https://keepachangelog.com/en/1.0.0/),
 and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0.html).
 
-The semantic versioning guarantees cover the interface to the substrate runtime which
+The semantic versioning guarantees cover the interface to the Substrate runtime which
 includes this pallet as a dependency. This module will also add storage migrations whenever
 changes require it. Stability with regard to offchain tooling is explicitly excluded from
 this guarantee: For example adding a new field to an in-storage data structure will require
diff --git a/substrate/frame/contracts/Cargo.toml b/substrate/frame/contracts/Cargo.toml
index f1bbe38a8788f3b7e846eb9be4a33ccc4c27f29f..d5c809e1bf7cf3df4b3e47c3f0995b429e392320 100644
--- a/substrate/frame/contracts/Cargo.toml
+++ b/substrate/frame/contracts/Cargo.toml
@@ -1,15 +1,15 @@
 [package]
 name = "pallet-contracts"
 version = "4.0.0-dev"
-authors = ["Parity Technologies <admin@parity.io>"]
-edition = "2021"
+authors.workspace = true
+edition.workspace = true
 build = "build.rs"
 license = "Apache-2.0"
 homepage = "https://substrate.io"
-repository = "https://github.com/paritytech/substrate/"
+repository.workspace = true
 description = "FRAME pallet for WASM contracts"
 readme = "README.md"
-include = ["src/**/*", "README.md", "CHANGELOG.md"]
+include = ["src/**/*", "build.rs", "README.md", "CHANGELOG.md"]
 
 [package.metadata.docs.rs]
 targets = ["x86_64-unknown-linux-gnu"]
@@ -26,7 +26,7 @@ serde = { version = "1", optional = true, features = ["derive"] }
 smallvec = { version = "1", default-features = false, features = [
 	"const_generics",
 ] }
-wasmi = { version = "0.30", default-features = false }
+wasmi = { version = "0.31", default-features = false }
 impl-trait-for-tuples = "0.2"
 
 # Only used in benchmarking to generate contract code
diff --git a/substrate/frame/contracts/README.md b/substrate/frame/contracts/README.md
index aeb30cef32fc8cd9cdd3d65f24fcd98be151b7dd..0b6548cf6414a2bfbe253c0b18a95814b2dfb63b 100644
--- a/substrate/frame/contracts/README.md
+++ b/substrate/frame/contracts/README.md
@@ -9,66 +9,68 @@ The Contracts module provides functionality for the runtime to deploy and execut
 
 ## Overview
 
-This module extends accounts based on the [`frame_support::traits::fungible`] traits to have smart-contract functionality. It can
-be used with other modules that implement accounts based on [`frame_support::traits::fungible`]. These "smart-contract accounts"
-have the ability to instantiate smart-contracts and make calls to other contract and non-contract accounts.
+This module extends accounts based on the [`frame_support::traits::fungible`] traits to have smart-contract
+functionality. It can be used with other modules that implement accounts based on [`frame_support::traits::fungible`].
+These "smart-contract accounts" have the ability to instantiate smart-contracts and make calls to other contract and
+non-contract accounts.
 
-The smart-contract code is stored once, and later retrievable via its `code_hash`.
-This means that multiple smart-contracts can be instantiated from the same `code`, without replicating
-the code each time.
+The smart-contract code is stored once, and later retrievable via its `code_hash`. This means that multiple
+smart-contracts can be instantiated from the same `code`, without replicating the code each time.
 
-When a smart-contract is called, its associated code is retrieved via the code hash and gets executed.
-This call can alter the storage entries of the smart-contract account, instantiate new smart-contracts,
-or call other smart-contracts.
+When a smart-contract is called, its associated code is retrieved via the code hash and gets executed. This call can
+alter the storage entries of the smart-contract account, instantiate new smart-contracts, or call other smart-contracts.
 
-Finally, when an account is reaped, its associated code and storage of the smart-contract account
-will also be deleted.
+Finally, when an account is reaped, its associated code and storage of the smart-contract account will also be deleted.
 
 ### Weight
 
-Senders must specify a [`Weight`](https://paritytech.github.io/substrate/master/sp_weights/struct.Weight.html) limit with every call, as all instructions invoked by the smart-contract require weight.
-Unused weight is refunded after the call, regardless of the execution outcome.
+Senders must specify a [`Weight`](https://paritytech.github.io/substrate/master/sp_weights/struct.Weight.html) limit
+with every call, as all instructions invoked by the smart-contract require weight. Unused weight is refunded after the
+call, regardless of the execution outcome.
 
-If the weight limit is reached, then all calls and state changes (including balance transfers) are only
-reverted at the current call's contract level. For example, if contract A calls B and B runs out of weight mid-call,
-then all of B's calls are reverted. Assuming correct error handling by contract A, A's other calls and state
-changes still persist.
+If the weight limit is reached, then all calls and state changes (including balance transfers) are only reverted at the
+current call's contract level. For example, if contract A calls B and B runs out of weight mid-call, then all of B's
+calls are reverted. Assuming correct error handling by contract A, A's other calls and state changes still persist.
 
 One `ref_time` `Weight` is defined as one picosecond of execution time on the runtime's reference machine.
 
 ### Revert Behaviour
 
-Contract call failures are not cascading. When failures occur in a sub-call, they do not "bubble up",
-and the call will only revert at the specific contract level. For example, if contract A calls contract B, and B
-fails, A can decide how to handle that failure, either proceeding or reverting A's changes.
+Contract call failures are not cascading. When failures occur in a sub-call, they do not "bubble up", and the call will
+only revert at the specific contract level. For example, if contract A calls contract B, and B fails, A can decide how
+to handle that failure, either proceeding or reverting A's changes.
 
 ### Off-chain Execution
 
-In general, a contract execution needs to be deterministic so that all nodes come to the same
-conclusion when executing it. To that end we disallow any instructions that could cause
-indeterminism. Most notable are any floating point arithmetic. That said, sometimes contracts
-are executed off-chain and hence are not subject to consensus. If code is only executed by a
-single node and implicitly trusted by other actors is such a case. Trusted execution environments
-come to mind. To that end we allow the execution of indeterminstic code for off-chain usages
-with the following constraints:
-
-1. No contract can ever be instantiated from an indeterministic code. The only way to execute
-the code is to use a delegate call from a deterministic contract.
-2. The code that wants to use this feature needs to depend on `pallet-contracts` and use [`bare_call()`](https://paritytech.github.io/substrate/master/pallet_contracts/pallet/struct.Pallet.html#method.bare_call)
+In general, a contract execution needs to be deterministic so that all nodes come to the same conclusion when executing
+it. To that end we disallow any instructions that could cause indeterminism. Most notable are any floating point
+arithmetic. That said, sometimes contracts are executed off-chain and hence are not subject to consensus. If code is
+only executed by a single node and implicitly trusted by other actors is such a case. Trusted execution environments
+come to mind. To that end we allow the execution of indeterminstic code for off-chain usages with the following
+constraints:
+
+1. No contract can ever be instantiated from an indeterministic code. The only way to execute the code is to use a
+delegate call from a deterministic contract.
+2. The code that wants to use this feature needs to depend on `pallet-contracts` and use
+[`bare_call()`](https://paritytech.github.io/substrate/master/pallet_contracts/pallet/struct.Pallet.html#method.bare_call)
 directly. This makes sure that by default `pallet-contracts` does not expose any indeterminism.
 
 #### How to use
 
-An indeterministic code can be deployed on-chain by passing `Determinism::Relaxed`
-to [`upload_code()`](https://paritytech.github.io/substrate/master/pallet_contracts/pallet/struct.Pallet.html#method.upload_code). A deterministic contract can then delegate call into it if and only if it
-is ran by using [`bare_call()`](https://paritytech.github.io/substrate/master/pallet_contracts/pallet/struct.Pallet.html#method.bare_call) and passing [`Determinism::Relaxed`](https://paritytech.github.io/substrate/master/pallet_contracts/enum.Determinism.html#variant.Relaxed) to it. **Never use
-this argument when the contract is called from an on-chain transaction.**
+An indeterministic code can be deployed on-chain by passing `Determinism::Relaxed` to
+[`upload_code()`](https://paritytech.github.io/substrate/master/pallet_contracts/pallet/struct.Pallet.html#method.upload_code).
+A deterministic contract can then delegate call into it if and only if it is ran by using
+[`bare_call()`](https://paritytech.github.io/substrate/master/pallet_contracts/pallet/struct.Pallet.html#method.bare_call)
+and passing
+[`Determinism::Relaxed`](https://paritytech.github.io/substrate/master/pallet_contracts/enum.Determinism.html#variant.Relaxed)
+to it. **Never use this argument when the contract is called from an on-chain transaction.**
 
 ## Interface
 
 ### Dispatchable functions
 
-Those are documented in the [reference documentation](https://paritytech.github.io/substrate/master/pallet_contracts/index.html#dispatchable-functions).
+Those are documented in the [reference
+documentation](https://paritytech.github.io/substrate/master/pallet_contracts/index.html#dispatchable-functions).
 
 ### Interface exposed to contracts
 
@@ -99,43 +101,43 @@ The documentation of all importable functions can be found
 
 ## Usage
 
-This module executes WebAssembly smart contracts. These can potentially be written in any language
-that compiles to Wasm. However, using a language that specifically targets this module
-will make things a lot easier. One such language is [`ink!`](https://use.ink). It enables
-writing WebAssembly-based smart-contracts in the Rust programming language.
+This module executes WebAssembly smart contracts. These can potentially be written in any language that compiles to
+Wasm. However, using a language that specifically targets this module will make things a lot easier. One such language
+is [`ink!`](https://use.ink). It enables writing WebAssembly-based smart-contracts in the Rust programming language.
 
 ## Debugging
 
-Contracts can emit messages to the client when called as RPC through the [`debug_message`](https://paritytech.github.io/substrate/master/pallet_contracts/api_doc/trait.Current.html#tymethod.debug_message)
+Contracts can emit messages to the client when called as RPC through the
+[`debug_message`](https://paritytech.github.io/substrate/master/pallet_contracts/api_doc/trait.Current.html#tymethod.debug_message)
 API. This is exposed in [ink!](https://use.ink) via
 [`ink_env::debug_message()`](https://paritytech.github.io/ink/ink_env/fn.debug_message.html).
 
-Those messages are gathered into an internal buffer and sent to the RPC client.
-It is up the the individual client if and how those messages are presented to the user.
+Those messages are gathered into an internal buffer and sent to the RPC client. It is up the the individual client if
+and how those messages are presented to the user.
 
-This buffer is also printed as a debug message. In order to see these messages on the node
-console the log level for the `runtime::contracts` target needs to be raised to at least
-the `debug` level. However, those messages are easy to overlook because of the noise generated
-by block production. A good starting point for observing them on the console is using this
-command line in the root directory of the substrate repository:
+This buffer is also printed as a debug message. In order to see these messages on the node console the log level for the
+`runtime::contracts` target needs to be raised to at least the `debug` level. However, those messages are easy to
+overlook because of the noise generated by block production. A good starting point for observing them on the console is
+using this command line in the root directory of the Substrate repository:
 
 ```bash
 cargo run --release -- --dev -lerror,runtime::contracts=debug
 ```
 
-This raises the log level of `runtime::contracts` to `debug` and all other targets
-to `error` in order to prevent them from spamming the console.
+This raises the log level of `runtime::contracts` to `debug` and all other targets to `error` in order to prevent them
+from spamming the console.
 
-`--dev`: Use a dev chain spec
-`--tmp`: Use temporary storage for chain data (the chain state is deleted on exit)
+`--dev`: Use a dev chain spec `--tmp`: Use temporary storage for chain data (the chain state is deleted on exit)
 
 ## Host function tracing
 
-For contract authors, it can be a helpful debugging tool to see which host functions are called, with which arguments, and what the result was. 
+For contract authors, it can be a helpful debugging tool to see which host functions are called, with which arguments,
+and what the result was.
 
-In order to see these messages on the node console, the log level for the `runtime::contracts::strace` target needs to be raised to the `trace` level. 
+In order to see these messages on the node console, the log level for the `runtime::contracts::strace` target needs to
+be raised to the `trace` level.
 
-Example: 
+Example:
 
 ```bash
 cargo run --release -- --dev -lerror,runtime::contracts::strace=trace,runtime::contracts=debug
@@ -143,18 +145,16 @@ cargo run --release -- --dev -lerror,runtime::contracts::strace=trace,runtime::c
 
 ## Unstable Interfaces
 
-Driven by the desire to have an iterative approach in developing new contract interfaces
-this pallet contains the concept of an unstable interface. Akin to the rust nightly compiler
-it allows us to add new interfaces but mark them as unstable so that contract languages can
-experiment with them and give feedback before we stabilize those.
+Driven by the desire to have an iterative approach in developing new contract interfaces this pallet contains the
+concept of an unstable interface. Akin to the rust nightly compiler it allows us to add new interfaces but mark them as
+unstable so that contract languages can experiment with them and give feedback before we stabilize those.
 
 In order to access interfaces marked as `#[unstable]` in [`runtime.rs`](src/wasm/runtime.rs) one need to set
-`pallet_contracts::Config::UnsafeUnstableInterface` to `ConstU32<true>`. **It should be obvious
-that any production runtime should never be compiled with this feature: In addition to be
-subject to change or removal those interfaces might not have proper weights associated with
-them and are therefore considered unsafe**.
+`pallet_contracts::Config::UnsafeUnstableInterface` to `ConstU32<true>`. **It should be obvious that any production
+runtime should never be compiled with this feature: In addition to be subject to change or removal those interfaces
+might not have proper weights associated with them and are therefore considered unsafe**.
 
-New interfaces are generally added as unstable and might go through several iterations
-before they are promoted to a stable interface.
+New interfaces are generally added as unstable and might go through several iterations before they are promoted to a
+stable interface.
 
 License: Apache-2.0
diff --git a/substrate/frame/contracts/benchmarks/README.md b/substrate/frame/contracts/benchmarks/README.md
index a621dd65d593143d48b6ca16d5820ce09eb99e3d..e4441d6bab2c425a37639830f12ca303db30d1fa 100644
--- a/substrate/frame/contracts/benchmarks/README.md
+++ b/substrate/frame/contracts/benchmarks/README.md
@@ -1,9 +1,8 @@
 # Benchmarks
 
-This directory contains real world ([ink!](https://use.ink), [solang](https://github.com/hyperledger/solang)) contracts which are used in macro benchmarks.
-Those benchmarks are not used to determine weights but rather to compare different contract
-languages and execution engines with larger wasm modules.
-
-Files in this directory are used by `#[extra]` benchmarks in `src/benchmarking`. The json
-files are for informational purposes only and are not consumed by the benchmarks.
+This directory contains real world ([ink!](https://use.ink), [solang](https://github.com/hyperledger/solang)) contracts
+which are used in macro benchmarks. Those benchmarks are not used to determine weights but rather to compare different
+contract languages and execution engines with larger wasm modules.
 
+Files in this directory are used by `#[extra]` benchmarks in `src/benchmarking`. The json files are for informational
+purposes only and are not consumed by the benchmarks.
diff --git a/substrate/frame/contracts/build.rs b/substrate/frame/contracts/build.rs
index 7817ace9c98e2e877080d05552914f39d89eec85..42bc45d563d325a605c79749f096b5048a412af5 100644
--- a/substrate/frame/contracts/build.rs
+++ b/substrate/frame/contracts/build.rs
@@ -53,7 +53,7 @@ fn get_latest_version() -> u16 {
 fn main() -> Result<(), Box<dyn std::error::Error>> {
 	let out_dir = std::env::var("OUT_DIR")?;
 	let path = std::path::Path::new(&out_dir).join("migration_codegen.rs");
-	let mut f = std::fs::File::create(&path)?;
+	let mut f = std::fs::File::create(path)?;
 	let version = get_latest_version();
 	write!(
 		f,
diff --git a/substrate/frame/contracts/fixtures/balance.wat b/substrate/frame/contracts/fixtures/balance.wat
new file mode 100644
index 0000000000000000000000000000000000000000..d86d5c4b1c60ced43282b03100bc370c60a6ebcf
--- /dev/null
+++ b/substrate/frame/contracts/fixtures/balance.wat
@@ -0,0 +1,42 @@
+(module
+	(import "seal0" "seal_balance" (func $seal_balance (param i32 i32)))
+	(import "env" "memory" (memory 1 1))
+
+	;; [0, 8) reserved for $seal_balance output
+
+	;; [8, 16) length of the buffer for $seal_balance
+	(data (i32.const 8) "\08")
+
+	;; [16, inf) zero initialized
+
+	(func $assert (param i32)
+		(block $ok
+			(br_if $ok
+				(get_local 0)
+			)
+			(unreachable)
+		)
+	)
+
+	(func (export "deploy"))
+
+	(func (export "call")
+		(call $seal_balance (i32.const 0) (i32.const 8))
+
+		;; Balance should be encoded as a u64.
+		(call $assert
+			(i32.eq
+				(i32.load (i32.const 8))
+				(i32.const 8)
+			)
+		)
+
+		;; Assert the free balance to be zero.
+		(call $assert
+			(i64.eq
+				(i64.load (i32.const 0))
+				(i64.const 0)
+			)
+		)
+	)
+)
diff --git a/substrate/frame/contracts/fixtures/drain.wat b/substrate/frame/contracts/fixtures/drain.wat
index 9f126898fac81e48d62581d61fbbfc2c8a009bc1..cb8ff0aed61fe76ea6dced1ec1fe1bd68fb708b5 100644
--- a/substrate/frame/contracts/fixtures/drain.wat
+++ b/substrate/frame/contracts/fixtures/drain.wat
@@ -1,14 +1,20 @@
 (module
 	(import "seal0" "seal_balance" (func $seal_balance (param i32 i32)))
+	(import "seal0" "seal_minimum_balance" (func $seal_minimum_balance (param i32 i32)))
 	(import "seal0" "seal_transfer" (func $seal_transfer (param i32 i32 i32 i32) (result i32)))
 	(import "env" "memory" (memory 1 1))
 
 	;; [0, 8) reserved for $seal_balance output
 
-	;; [8, 16) length of the buffer
+	;; [8, 16) length of the buffer for $seal_balance
 	(data (i32.const 8) "\08")
 
-	;; [16, inf) zero initialized
+	;; [16, 24) reserved for $seal_minimum_balance
+
+	;; [24, 32) length of the buffer for $seal_minimum_balance
+	(data (i32.const 24) "\08")
+
+	;; [32, inf) zero initialized
 
 	(func $assert (param i32)
 		(block $ok
@@ -33,13 +39,32 @@
 			)
 		)
 
-		;; Try to self-destruct by sending full balance to the 0 address.
+		;; Get the minimum balance.
+		(call $seal_minimum_balance (i32.const 16) (i32.const 24))
+
+		;; Minimum balance should be encoded as a u64.
+		(call $assert
+			(i32.eq
+				(i32.load (i32.const 24))
+				(i32.const 8)
+			)
+		)
+
+		;; Make the transferred value exceed the balance by adding the minimum balance.
+		(i64.store (i32.const 0)
+			(i64.add
+				(i64.load (i32.const 0))
+				(i64.load (i32.const 16))
+			)
+		)
+
+		;; Try to self-destruct by sending more balance to the 0 address.
 		;; The call will fail because a contract transfer has a keep alive requirement
 		(call $assert
 			(i32.eq
 				(call $seal_transfer
-					(i32.const 16)	;; Pointer to destination address
-					(i32.const 32)	;; Length of destination address
+					(i32.const 32)	;; Pointer to destination address
+					(i32.const 48)	;; Length of destination address
 					(i32.const 0)	;; Pointer to the buffer with value to transfer
 					(i32.const 8)	;; Length of the buffer with value to transfer
 				)
diff --git a/substrate/frame/contracts/fixtures/run_out_of_gas_start_fn.wat b/substrate/frame/contracts/fixtures/run_out_of_gas_start_fn.wat
new file mode 100644
index 0000000000000000000000000000000000000000..6591d7ede78c20e0d19c7c60c183b4c58e98d2dc
--- /dev/null
+++ b/substrate/frame/contracts/fixtures/run_out_of_gas_start_fn.wat
@@ -0,0 +1,10 @@
+(module
+	(import "env" "memory" (memory 1 1))
+	(start $start)
+	(func $start
+		(loop $inf (br $inf)) ;; just run out of gas
+		(unreachable)
+	)
+	(func (export "call"))
+	(func (export "deploy"))
+)
diff --git a/substrate/frame/contracts/primitives/Cargo.toml b/substrate/frame/contracts/primitives/Cargo.toml
index 4796ace915b141790c43142a80552d65b4f85c68..8a845f6db44bd68c0e8c98b35b3ff918ee23a360 100644
--- a/substrate/frame/contracts/primitives/Cargo.toml
+++ b/substrate/frame/contracts/primitives/Cargo.toml
@@ -1,11 +1,11 @@
 [package]
 name = "pallet-contracts-primitives"
 version = "24.0.0"
-authors = ["Parity Technologies <admin@parity.io>"]
-edition = "2021"
+authors.workspace = true
+edition.workspace = true
 license = "Apache-2.0"
 homepage = "https://substrate.io"
-repository = "https://github.com/paritytech/substrate/"
+repository.workspace = true
 description = "A crate that hosts a common definitions that are relevant for the pallet-contracts."
 readme = "README.md"
 
diff --git a/substrate/frame/contracts/primitives/README.md b/substrate/frame/contracts/primitives/README.md
index 12718cd86425b4820dc63ce1369c7e4d93d3bc93..c84cfbfe1a87b4fe2ca6da57d9e9fef626704b57 100644
--- a/substrate/frame/contracts/primitives/README.md
+++ b/substrate/frame/contracts/primitives/README.md
@@ -1,3 +1,3 @@
 A crate that hosts a common definitions that are relevant for the pallet-contracts.
 
-License: Apache-2.0
\ No newline at end of file
+License: Apache-2.0
diff --git a/substrate/frame/contracts/proc-macro/Cargo.toml b/substrate/frame/contracts/proc-macro/Cargo.toml
index 8a63875f2a980ad24aa97fbbe1c5602b0a28142c..3ada9e0c23dd9093aa1bb0f53b3211d46ac2eb46 100644
--- a/substrate/frame/contracts/proc-macro/Cargo.toml
+++ b/substrate/frame/contracts/proc-macro/Cargo.toml
@@ -1,11 +1,11 @@
 [package]
 name = "pallet-contracts-proc-macro"
 version = "4.0.0-dev"
-authors = ["Parity Technologies <admin@parity.io>"]
-edition = "2021"
+authors.workspace = true
+edition.workspace = true
 license = "Apache-2.0"
 homepage = "https://substrate.io"
-repository = "https://github.com/paritytech/substrate/"
+repository.workspace = true
 description = "Procedural macros used in pallet_contracts"
 
 [package.metadata.docs.rs]
@@ -17,7 +17,7 @@ proc-macro = true
 [dependencies]
 proc-macro2 = "1.0.56"
 quote = "1.0.28"
-syn = { version = "2.0.16", features = ["full"] }
+syn = { version = "2.0.38", features = ["full"] }
 
 [dev-dependencies]
 
diff --git a/substrate/frame/contracts/proc-macro/src/lib.rs b/substrate/frame/contracts/proc-macro/src/lib.rs
index b31403c29adfd10b570c068923f47974f636489e..ad9cd2dadecf93b1514fdb948509ba5318e973d9 100644
--- a/substrate/frame/contracts/proc-macro/src/lib.rs
+++ b/substrate/frame/contracts/proc-macro/src/lib.rs
@@ -608,7 +608,7 @@ fn expand_functions(def: &EnvDef, expand_blocks: bool, host_state: TokenStream2)
 		let not_deprecated = f.not_deprecated;
 
 		// wrapped host function body call with host function traces
-		// see https://github.com/paritytech/substrate/tree/master/frame/contracts#host-function-tracing
+		// see https://github.com/paritytech/polkadot-sdk/tree/master/substrate/frame/contracts#host-function-tracing
 		let wrapped_body_with_trace = {
 			let trace_fmt_args = params.clone().filter_map(|arg| match arg {
 				syn::FnArg::Receiver(_) => None,
diff --git a/substrate/frame/contracts/src/benchmarking/sandbox.rs b/substrate/frame/contracts/src/benchmarking/sandbox.rs
index 34974b02ea0c45305acfa67123663ddf10ce74c0..c3abbcad5f2b363bdda7ef2e7b5c38255220211e 100644
--- a/substrate/frame/contracts/src/benchmarking/sandbox.rs
+++ b/substrate/frame/contracts/src/benchmarking/sandbox.rs
@@ -58,7 +58,13 @@ impl<T: Config> From<&WasmModule<T>> for Sandbox {
 			.add_fuel(u64::MAX)
 			.expect("We've set up engine to fuel consuming mode; qed");
 
-		let entry_point = instance.get_export(&store, "call").unwrap().into_func().unwrap();
+		let entry_point = instance
+			.start(&mut store)
+			.unwrap()
+			.get_export(&store, "call")
+			.unwrap()
+			.into_func()
+			.unwrap();
 		Self { entry_point, store }
 	}
 }
diff --git a/substrate/frame/contracts/src/debug.rs b/substrate/frame/contracts/src/debug.rs
index a92f428c8f8a43d8d37f79220c2564eb618b4827..e22a841e6fb7f73a87c0afbd55fc24bc25129c57 100644
--- a/substrate/frame/contracts/src/debug.rs
+++ b/substrate/frame/contracts/src/debug.rs
@@ -1,11 +1,28 @@
-pub use crate::exec::ExportedFunction;
-use crate::{CodeHash, Config, LOG_TARGET};
-use pallet_contracts_primitives::ExecReturnValue;
+// 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.
+
+pub use crate::exec::{ExecResult, ExportedFunction};
+use crate::{Config, LOG_TARGET};
+pub use pallet_contracts_primitives::ExecReturnValue;
 
 /// Umbrella trait for all interfaces that serves for debugging.
-pub trait Debugger<T: Config>: Tracing<T> {}
+pub trait Debugger<T: Config>: Tracing<T> + CallInterceptor<T> {}
 
-impl<T: Config, V> Debugger<T> for V where V: Tracing<T> {}
+impl<T: Config, V> Debugger<T> for V where V: Tracing<T> + CallInterceptor<T> {}
 
 /// Defines methods to capture contract calls, enabling external observers to
 /// measure, trace, and react to contract interactions.
@@ -20,11 +37,11 @@ pub trait Tracing<T: Config> {
 	///
 	/// # Arguments
 	///
-	/// * `code_hash` - The code hash of the contract being called.
+	/// * `contract_address` - The address of the contract that is about to be executed.
 	/// * `entry_point` - Describes whether the call is the constructor or a regular call.
 	/// * `input_data` - The raw input data of the call.
 	fn new_call_span(
-		code_hash: &CodeHash<T>,
+		contract_address: &T::AccountId,
 		entry_point: ExportedFunction,
 		input_data: &[u8],
 	) -> Self::CallSpan;
@@ -43,8 +60,12 @@ pub trait CallSpan {
 impl<T: Config> Tracing<T> for () {
 	type CallSpan = ();
 
-	fn new_call_span(code_hash: &CodeHash<T>, entry_point: ExportedFunction, input_data: &[u8]) {
-		log::trace!(target: LOG_TARGET, "call {entry_point:?} hash: {code_hash:?}, input_data: {input_data:?}")
+	fn new_call_span(
+		contract_address: &T::AccountId,
+		entry_point: ExportedFunction,
+		input_data: &[u8],
+	) {
+		log::trace!(target: LOG_TARGET, "call {entry_point:?} account: {contract_address:?}, input_data: {input_data:?}")
 	}
 }
 
@@ -53,3 +74,37 @@ impl CallSpan for () {
 		log::trace!(target: LOG_TARGET, "call result {output:?}")
 	}
 }
+
+/// Provides an interface for intercepting contract calls.
+pub trait CallInterceptor<T: Config> {
+	/// Allows to intercept contract calls and decide whether they should be executed or not.
+	/// If the call is intercepted, the mocked result of the call is returned.
+	///
+	/// # Arguments
+	///
+	/// * `contract_address` - The address of the contract that is about to be executed.
+	/// * `entry_point` - Describes whether the call is the constructor or a regular call.
+	/// * `input_data` - The raw input data of the call.
+	///
+	/// # Expected behavior
+	///
+	/// This method should return:
+	/// * `Some(ExecResult)` - if the call should be intercepted and the mocked result of the call
+	/// is returned.
+	/// * `None` - otherwise, i.e. the call should be executed normally.
+	fn intercept_call(
+		contract_address: &T::AccountId,
+		entry_point: &ExportedFunction,
+		input_data: &[u8],
+	) -> Option<ExecResult>;
+}
+
+impl<T: Config> CallInterceptor<T> for () {
+	fn intercept_call(
+		_contract_address: &T::AccountId,
+		_entry_point: &ExportedFunction,
+		_input_data: &[u8],
+	) -> Option<ExecResult> {
+		None
+	}
+}
diff --git a/substrate/frame/contracts/src/exec.rs b/substrate/frame/contracts/src/exec.rs
index 1ba44220ff8dcb1448b2047eeb92f77f9af58bb2..9090aa9cb112b39623db93c007c36fffa0e2770c 100644
--- a/substrate/frame/contracts/src/exec.rs
+++ b/substrate/frame/contracts/src/exec.rs
@@ -16,23 +16,21 @@
 // limitations under the License.
 
 use crate::{
-	debug::{CallSpan, Tracing},
+	debug::{CallInterceptor, CallSpan, Tracing},
 	gas::GasMeter,
 	storage::{self, meter::Diff, WriteOutcome},
 	BalanceOf, CodeHash, CodeInfo, CodeInfoOf, Config, ContractInfo, ContractInfoOf,
 	DebugBufferVec, Determinism, Error, Event, Nonce, Origin, Pallet as Contracts, Schedule,
-	WasmBlob, LOG_TARGET,
+	LOG_TARGET,
 };
 use frame_support::{
 	crypto::ecdsa::ECDSAExt,
-	dispatch::{
-		fmt::Debug, DispatchError, DispatchResult, DispatchResultWithPostInfo, Dispatchable,
-	},
+	dispatch::{DispatchResult, DispatchResultWithPostInfo},
 	ensure,
 	storage::{with_transaction, TransactionOutcome},
 	traits::{
 		fungible::{Inspect, Mutate},
-		tokens::Preservation,
+		tokens::{Fortitude, Preservation},
 		Contains, OriginTrait, Randomness, Time,
 	},
 	weights::Weight,
@@ -47,8 +45,11 @@ use sp_core::{
 	Get,
 };
 use sp_io::{crypto::secp256k1_ecdsa_recover_compressed, hashing::blake2_256};
-use sp_runtime::traits::{Convert, Hash, Zero};
-use sp_std::{marker::PhantomData, mem, prelude::*, vec::Vec};
+use sp_runtime::{
+	traits::{Convert, Dispatchable, Hash, Zero},
+	DispatchError,
+};
+use sp_std::{fmt::Debug, marker::PhantomData, mem, prelude::*, vec::Vec};
 
 pub type AccountIdOf<T> = <T as frame_system::Config>::AccountId;
 pub type MomentOf<T> = <<T as Config>::Time as Time>::Moment;
@@ -317,6 +318,22 @@ pub trait Ext: sealing::Sealed {
 	/// Returns a nonce that is incremented for every instantiated contract.
 	fn nonce(&mut self) -> u64;
 
+	/// Increment the reference count of a of a stored code by one.
+	///
+	/// # Errors
+	///
+	/// [`Error::CodeNotFound`] is returned if no stored code found having the specified
+	/// `code_hash`.
+	fn increment_refcount(code_hash: CodeHash<Self::T>) -> Result<(), DispatchError>;
+
+	/// Decrement the reference count of a stored code by one.
+	///
+	/// # Note
+	///
+	/// A contract whose reference count dropped to zero isn't automatically removed. A
+	/// `remove_code` transaction must be submitted by the original uploader to do so.
+	fn decrement_refcount(code_hash: CodeHash<Self::T>);
+
 	/// Adds a delegate dependency to [`ContractInfo`]'s `delegate_dependencies` field.
 	///
 	/// This ensures that the delegated contract is not removed while it is still in use. It
@@ -380,22 +397,6 @@ pub trait Executable<T: Config>: Sized {
 		gas_meter: &mut GasMeter<T>,
 	) -> Result<Self, DispatchError>;
 
-	/// Increment the reference count of a of a stored code by one.
-	///
-	/// # Errors
-	///
-	/// [`Error::CodeNotFound`] is returned if no stored code found having the specified
-	/// `code_hash`.
-	fn increment_refcount(code_hash: CodeHash<T>) -> Result<(), DispatchError>;
-
-	/// Decrement the reference count of a stored code by one.
-	///
-	/// # Note
-	///
-	/// A contract whose reference count dropped to zero isn't automatically removed. A
-	/// `remove_code` transaction must be submitted by the original uploader to do so.
-	fn decrement_refcount(code_hash: CodeHash<T>);
-
 	/// Execute the specified exported function and return the result.
 	///
 	/// When the specified function is `Constructor` the executable is stored and its
@@ -907,13 +908,16 @@ where
 			// Every non delegate call or instantiate also optionally transfers the balance.
 			self.initial_transfer()?;
 
-			let call_span =
-				T::Debug::new_call_span(executable.code_hash(), entry_point, &input_data);
+			let contract_address = &top_frame!(self).account_id;
+
+			let call_span = T::Debug::new_call_span(contract_address, entry_point, &input_data);
 
-			// Call into the Wasm blob.
-			let output = executable
-				.execute(self, &entry_point, input_data)
-				.map_err(|e| ExecError { error: e.error, origin: ErrorOrigin::Callee })?;
+			let output = T::Debug::intercept_call(contract_address, &entry_point, &input_data)
+				.unwrap_or_else(|| {
+					executable
+						.execute(self, &entry_point, input_data)
+						.map_err(|e| ExecError { error: e.error, origin: ErrorOrigin::Callee })
+				})?;
 
 			call_span.after_call(&output);
 
@@ -1284,10 +1288,10 @@ where
 
 		info.queue_trie_for_deletion();
 		ContractInfoOf::<T>::remove(&frame.account_id);
-		E::decrement_refcount(info.code_hash);
+		Self::decrement_refcount(info.code_hash);
 
 		for (code_hash, deposit) in info.delegate_dependencies() {
-			E::decrement_refcount(*code_hash);
+			Self::decrement_refcount(*code_hash);
 			frame
 				.nested_storage
 				.charge_deposit(frame.account_id.clone(), StorageDeposit::Refund(*deposit));
@@ -1367,7 +1371,11 @@ where
 	}
 
 	fn balance(&self) -> BalanceOf<T> {
-		T::Currency::balance(&self.top_frame().account_id)
+		T::Currency::reducible_balance(
+			&self.top_frame().account_id,
+			Preservation::Preserve,
+			Fortitude::Polite,
+		)
 	}
 
 	fn value_transferred(&self) -> BalanceOf<T> {
@@ -1486,8 +1494,8 @@ where
 
 		frame.nested_storage.charge_deposit(frame.account_id.clone(), deposit);
 
-		E::increment_refcount(hash)?;
-		E::decrement_refcount(prev_hash);
+		Self::increment_refcount(hash)?;
+		Self::decrement_refcount(prev_hash);
 		Contracts::<Self::T>::deposit_event(
 			vec![T::Hashing::hash_of(&frame.account_id), hash, prev_hash],
 			Event::ContractCodeUpdated {
@@ -1520,6 +1528,25 @@ where
 		}
 	}
 
+	fn increment_refcount(code_hash: CodeHash<Self::T>) -> Result<(), DispatchError> {
+		<CodeInfoOf<Self::T>>::mutate(code_hash, |existing| -> Result<(), DispatchError> {
+			if let Some(info) = existing {
+				*info.refcount_mut() = info.refcount().saturating_add(1);
+				Ok(())
+			} else {
+				Err(Error::<T>::CodeNotFound.into())
+			}
+		})
+	}
+
+	fn decrement_refcount(code_hash: CodeHash<T>) {
+		<CodeInfoOf<T>>::mutate(code_hash, |existing| {
+			if let Some(info) = existing {
+				*info.refcount_mut() = info.refcount().saturating_sub(1);
+			}
+		});
+	}
+
 	fn add_delegate_dependency(
 		&mut self,
 		code_hash: CodeHash<Self::T>,
@@ -1532,7 +1559,7 @@ where
 		let deposit = T::CodeHashLockupDepositPercent::get().mul_ceil(code_info.deposit());
 
 		info.add_delegate_dependency(code_hash, deposit)?;
-		<WasmBlob<T>>::increment_refcount(code_hash)?;
+		Self::increment_refcount(code_hash)?;
 		frame
 			.nested_storage
 			.charge_deposit(frame.account_id.clone(), StorageDeposit::Charge(deposit));
@@ -1547,8 +1574,7 @@ where
 		let info = frame.contract_info.get(&frame.account_id);
 
 		let deposit = info.remove_delegate_dependency(code_hash)?;
-		<WasmBlob<T>>::decrement_refcount(*code_hash);
-
+		Self::decrement_refcount(*code_hash);
 		frame
 			.nested_storage
 			.charge_deposit(frame.account_id.clone(), StorageDeposit::Refund(deposit));
@@ -1595,11 +1621,7 @@ mod tests {
 	use pallet_contracts_primitives::ReturnFlags;
 	use pretty_assertions::assert_eq;
 	use sp_runtime::{traits::Hash, DispatchError};
-	use std::{
-		cell::RefCell,
-		collections::hash_map::{Entry, HashMap},
-		rc::Rc,
-	};
+	use std::{cell::RefCell, collections::hash_map::HashMap, rc::Rc};
 
 	type System = frame_system::Pallet<Test>;
 
@@ -1620,17 +1642,16 @@ mod tests {
 	}
 
 	struct MockCtx<'a> {
-		ext: &'a mut dyn Ext<T = Test>,
+		ext: &'a mut MockStack<'a>,
 		input_data: Vec<u8>,
 	}
 
 	#[derive(Clone)]
 	struct MockExecutable {
-		func: Rc<dyn Fn(MockCtx, &Self) -> ExecResult + 'static>,
+		func: Rc<dyn for<'a> Fn(MockCtx<'a>, &Self) -> ExecResult + 'static>,
 		func_type: ExportedFunction,
 		code_hash: CodeHash<Test>,
 		code_info: CodeInfo<Test>,
-		refcount: u64,
 	}
 
 	#[derive(Default, Clone)]
@@ -1659,37 +1680,11 @@ mod tests {
 						func_type,
 						code_hash: hash,
 						code_info: CodeInfo::<Test>::new(ALICE),
-						refcount: 1,
 					},
 				);
 				hash
 			})
 		}
-
-		fn increment_refcount(code_hash: CodeHash<Test>) -> Result<(), DispatchError> {
-			Loader::mutate(|loader| {
-				match loader.map.entry(code_hash) {
-					Entry::Vacant(_) => Err(<Error<Test>>::CodeNotFound)?,
-					Entry::Occupied(mut entry) => entry.get_mut().refcount += 1,
-				}
-				Ok(())
-			})
-		}
-
-		fn decrement_refcount(code_hash: CodeHash<Test>) {
-			use std::collections::hash_map::Entry::Occupied;
-			Loader::mutate(|loader| {
-				let mut entry = match loader.map.entry(code_hash) {
-					Occupied(e) => e,
-					_ => panic!("code_hash does not exist"),
-				};
-				let refcount = &mut entry.get_mut().refcount;
-				*refcount -= 1;
-				if *refcount == 0 {
-					entry.remove();
-				}
-			});
-		}
 	}
 
 	impl Executable<Test> for MockExecutable {
@@ -1702,14 +1697,6 @@ mod tests {
 			})
 		}
 
-		fn increment_refcount(code_hash: CodeHash<Test>) -> Result<(), DispatchError> {
-			MockLoader::increment_refcount(code_hash)
-		}
-
-		fn decrement_refcount(code_hash: CodeHash<Test>) {
-			MockLoader::decrement_refcount(code_hash);
-		}
-
 		fn execute<E: Ext<T = Test>>(
 			self,
 			ext: &mut E,
@@ -1717,8 +1704,18 @@ mod tests {
 			input_data: Vec<u8>,
 		) -> ExecResult {
 			if let &Constructor = function {
-				Self::increment_refcount(self.code_hash).unwrap();
+				E::increment_refcount(self.code_hash).unwrap();
 			}
+			// # Safety
+			//
+			// We know that we **always** call execute with a `MockStack` in this test.
+			//
+			// # Note
+			//
+			// The transmute is necessary because `execute` has to be generic over all
+			// `E: Ext`. However, `MockExecutable` can't be generic over `E` as it would
+			// constitute a cycle.
+			let ext = unsafe { mem::transmute(ext) };
 			if function == &self.func_type {
 				(self.func)(MockCtx { ext, input_data }, &self)
 			} else {
diff --git a/substrate/frame/contracts/src/gas.rs b/substrate/frame/contracts/src/gas.rs
index 7d17642d92e54f4ecad74c71faf1eae8741c3fbc..363ddfad975b1eb92c6a4ebcc23982f585eef08c 100644
--- a/substrate/frame/contracts/src/gas.rs
+++ b/substrate/frame/contracts/src/gas.rs
@@ -17,14 +17,12 @@
 
 use crate::{exec::ExecError, Config, Error};
 use frame_support::{
-	dispatch::{
-		DispatchError, DispatchErrorWithPostInfo, DispatchResultWithPostInfo, PostDispatchInfo,
-	},
+	dispatch::{DispatchErrorWithPostInfo, DispatchResultWithPostInfo, PostDispatchInfo},
 	weights::Weight,
 	DefaultNoBound,
 };
 use sp_core::Get;
-use sp_runtime::traits::Zero;
+use sp_runtime::{traits::Zero, DispatchError};
 use sp_std::marker::PhantomData;
 
 #[cfg(test)]
diff --git a/substrate/frame/contracts/src/lib.rs b/substrate/frame/contracts/src/lib.rs
index 2b9dd07b3f6fee0fa60b7140ba54e00723466b6d..7d516fbe2496cbe5e0ad67cad4e46cae7d9ba447 100644
--- a/substrate/frame/contracts/src/lib.rs
+++ b/substrate/frame/contracts/src/lib.rs
@@ -103,7 +103,9 @@ pub mod weights;
 #[cfg(test)]
 mod tests;
 use crate::{
-	exec::{AccountIdOf, ErrorOrigin, ExecError, Executable, Key, MomentOf, Stack as ExecStack},
+	exec::{
+		AccountIdOf, ErrorOrigin, ExecError, Executable, Ext, Key, MomentOf, Stack as ExecStack,
+	},
 	gas::GasMeter,
 	storage::{meter::Meter as StorageMeter, ContractInfo, DeletionQueueManager},
 	wasm::{CodeInfo, WasmBlob},
@@ -111,10 +113,7 @@ use crate::{
 use codec::{Codec, Decode, Encode, HasCompact, MaxEncodedLen};
 use environmental::*;
 use frame_support::{
-	dispatch::{
-		DispatchError, Dispatchable, GetDispatchInfo, Pays, PostDispatchInfo, RawOrigin,
-		WithPostDispatchInfo,
-	},
+	dispatch::{GetDispatchInfo, Pays, PostDispatchInfo, RawOrigin, WithPostDispatchInfo},
 	ensure,
 	error::BadOrigin,
 	traits::{
@@ -137,8 +136,8 @@ use pallet_contracts_primitives::{
 use scale_info::TypeInfo;
 use smallvec::Array;
 use sp_runtime::{
-	traits::{Convert, Hash, Saturating, StaticLookup, Zero},
-	RuntimeDebug,
+	traits::{Convert, Dispatchable, Hash, Saturating, StaticLookup, Zero},
+	DispatchError, RuntimeDebug,
 };
 use sp_std::{fmt::Debug, prelude::*};
 
@@ -661,8 +660,8 @@ pub mod pallet {
 				} else {
 					return Err(<Error<T>>::ContractNotFound.into())
 				};
-				<WasmBlob<T>>::increment_refcount(code_hash)?;
-				<WasmBlob<T>>::decrement_refcount(contract.code_hash);
+				<ExecStack<T, WasmBlob<T>>>::increment_refcount(code_hash)?;
+				<ExecStack<T, WasmBlob<T>>>::decrement_refcount(contract.code_hash);
 				Self::deposit_event(
 					vec![T::Hashing::hash_of(&dest), code_hash, contract.code_hash],
 					Event::ContractCodeUpdated {
diff --git a/substrate/frame/contracts/src/migration.rs b/substrate/frame/contracts/src/migration.rs
index 3e3d6f37884c7a757285a79a22e79065b69fc5f7..2714620731201b225485805e67a5ccc431217a2c 100644
--- a/substrate/frame/contracts/src/migration.rs
+++ b/substrate/frame/contracts/src/migration.rs
@@ -328,6 +328,32 @@ impl<T: Config, const TEST_ALL_STEPS: bool> OnRuntimeUpgrade for Migration<T, TE
 		);
 		Ok(Default::default())
 	}
+
+	#[cfg(feature = "try-runtime")]
+	fn post_upgrade(_state: Vec<u8>) -> Result<(), TryRuntimeError> {
+		if !TEST_ALL_STEPS {
+			return Ok(())
+		}
+
+		log::info!(target: LOG_TARGET, "=== POST UPGRADE CHECKS ===");
+
+		// Ensure that the hashing algorithm is correct for each storage map.
+		if let Some(hash) = crate::CodeInfoOf::<T>::iter_keys().next() {
+			crate::CodeInfoOf::<T>::get(hash).expect("CodeInfo exists for hash; qed");
+		}
+		if let Some(hash) = crate::PristineCode::<T>::iter_keys().next() {
+			crate::PristineCode::<T>::get(hash).expect("PristineCode exists for hash; qed");
+		}
+		if let Some(account_id) = crate::ContractInfoOf::<T>::iter_keys().next() {
+			crate::ContractInfoOf::<T>::get(account_id)
+				.expect("ContractInfo exists for account_id; qed");
+		}
+		if let Some(nonce) = crate::DeletionQueue::<T>::iter_keys().next() {
+			crate::DeletionQueue::<T>::get(nonce).expect("DeletionQueue exists for nonce; qed");
+		}
+
+		Ok(())
+	}
 }
 
 /// The result of running the migration.
diff --git a/substrate/frame/contracts/src/migration/v12.rs b/substrate/frame/contracts/src/migration/v12.rs
index eb045aa42e9d70d1245384768ae2db62627757e1..4ddc57584b30eb74c0ed18f7da2989d3db2ff53c 100644
--- a/substrate/frame/contracts/src/migration/v12.rs
+++ b/substrate/frame/contracts/src/migration/v12.rs
@@ -96,7 +96,7 @@ where
 
 #[storage_alias]
 pub type CodeInfoOf<T: Config, OldCurrency> =
-	StorageMap<Pallet<T>, Twox64Concat, CodeHash<T>, CodeInfo<T, OldCurrency>>;
+	StorageMap<Pallet<T>, Identity, CodeHash<T>, CodeInfo<T, OldCurrency>>;
 
 #[storage_alias]
 pub type PristineCode<T: Config> = StorageMap<Pallet<T>, Identity, CodeHash<T>, Vec<u8>>;
diff --git a/substrate/frame/contracts/src/migration/v14.rs b/substrate/frame/contracts/src/migration/v14.rs
index efb49dff4f10ac2b8a27ebae1f58541b6e7f793b..94534d05fdf889d05227149efd57ede584ecb013 100644
--- a/substrate/frame/contracts/src/migration/v14.rs
+++ b/substrate/frame/contracts/src/migration/v14.rs
@@ -70,7 +70,7 @@ mod old {
 
 	#[storage_alias]
 	pub type CodeInfoOf<T: Config, OldCurrency> =
-		StorageMap<Pallet<T>, Twox64Concat, CodeHash<T>, CodeInfo<T, OldCurrency>>;
+		StorageMap<Pallet<T>, Identity, CodeHash<T>, CodeInfo<T, OldCurrency>>;
 }
 
 #[cfg(feature = "runtime-benchmarks")]
diff --git a/substrate/frame/contracts/src/migration/v15.rs b/substrate/frame/contracts/src/migration/v15.rs
index efece62905ff8474a7288cb03d21bd8ae05eae11..180fe855ca66728ba18b17555363eeac11a340ba 100644
--- a/substrate/frame/contracts/src/migration/v15.rs
+++ b/substrate/frame/contracts/src/migration/v15.rs
@@ -28,7 +28,7 @@ use crate::{
 	AccountIdOf, BalanceOf, CodeHash, Config, HoldReason, Pallet, TrieId, Weight, LOG_TARGET,
 };
 #[cfg(feature = "try-runtime")]
-use frame_support::{dispatch::Vec, traits::fungible::InspectHold};
+use frame_support::traits::fungible::InspectHold;
 use frame_support::{
 	pallet_prelude::*,
 	storage_alias,
@@ -43,6 +43,8 @@ use sp_core::hexdisplay::HexDisplay;
 #[cfg(feature = "try-runtime")]
 use sp_runtime::TryRuntimeError;
 use sp_runtime::{traits::Zero, Saturating};
+#[cfg(feature = "try-runtime")]
+use sp_std::vec::Vec;
 
 mod old {
 	use super::*;
diff --git a/substrate/frame/contracts/src/storage.rs b/substrate/frame/contracts/src/storage.rs
index d58fd0fe9dbdf42d01dac9f048fba96ea4973664..d4d261f4ec1ffcfc68c5245864b00ea2f47928ed 100644
--- a/substrate/frame/contracts/src/storage.rs
+++ b/substrate/frame/contracts/src/storage.rs
@@ -27,7 +27,6 @@ use crate::{
 };
 use codec::{Decode, Encode, MaxEncodedLen};
 use frame_support::{
-	dispatch::DispatchError,
 	storage::child::{self, ChildInfo},
 	weights::Weight,
 	CloneNoBound, DefaultNoBound,
@@ -37,7 +36,7 @@ use sp_core::Get;
 use sp_io::KillStorageResult;
 use sp_runtime::{
 	traits::{Hash, Saturating, Zero},
-	BoundedBTreeMap, DispatchResult, RuntimeDebug,
+	BoundedBTreeMap, DispatchError, DispatchResult, RuntimeDebug,
 };
 use sp_std::{marker::PhantomData, prelude::*};
 
diff --git a/substrate/frame/contracts/src/storage/meter.rs b/substrate/frame/contracts/src/storage/meter.rs
index 2a9a083412b00f56a74d1bf2526b00a32b78848b..9f098090bc8bb1d4f42339fb619d38b909501d8a 100644
--- a/substrate/frame/contracts/src/storage/meter.rs
+++ b/substrate/frame/contracts/src/storage/meter.rs
@@ -23,7 +23,6 @@ use crate::{
 };
 
 use frame_support::{
-	dispatch::{fmt::Debug, DispatchError},
 	ensure,
 	traits::{
 		fungible::{Mutate, MutateHold},
@@ -37,9 +36,9 @@ use frame_support::{
 use sp_api::HashT;
 use sp_runtime::{
 	traits::{Saturating, Zero},
-	FixedPointNumber, FixedU128,
+	DispatchError, FixedPointNumber, FixedU128,
 };
-use sp_std::{marker::PhantomData, vec, vec::Vec};
+use sp_std::{fmt::Debug, marker::PhantomData, vec, vec::Vec};
 
 /// Deposit that uses the native fungible's balance type.
 pub type DepositOf<T> = Deposit<BalanceOf<T>>;
diff --git a/substrate/frame/contracts/src/tests.rs b/substrate/frame/contracts/src/tests.rs
index 8cc6d00b3d45d726b445210c1a20d643464dc2a3..0fea2b1559509a7719e42c9461f35733e6617efc 100644
--- a/substrate/frame/contracts/src/tests.rs
+++ b/substrate/frame/contracts/src/tests.rs
@@ -42,7 +42,7 @@ use assert_matches::assert_matches;
 use codec::Encode;
 use frame_support::{
 	assert_err, assert_err_ignore_postinfo, assert_err_with_weight, assert_noop, assert_ok,
-	dispatch::{DispatchError, DispatchErrorWithPostInfo, PostDispatchInfo},
+	dispatch::{DispatchErrorWithPostInfo, PostDispatchInfo},
 	parameter_types,
 	storage::child,
 	traits::{
@@ -61,7 +61,7 @@ use sp_keystore::{testing::MemoryKeystore, KeystoreExt};
 use sp_runtime::{
 	testing::H256,
 	traits::{BlakeTwo256, Convert, Hash, IdentityLookup},
-	AccountId32, BuildStorage, Perbill, TokenError,
+	AccountId32, BuildStorage, DispatchError, Perbill, TokenError,
 };
 
 type Block = frame_system::mocking::MockBlock<Test>;
@@ -564,7 +564,9 @@ where
 {
 	let fixture_path = [
 		// When `CARGO_MANIFEST_DIR` is not set, Rust resolves relative paths from the root folder
-		std::env::var("CARGO_MANIFEST_DIR").as_deref().unwrap_or("frame/contracts"),
+		std::env::var("CARGO_MANIFEST_DIR")
+			.as_deref()
+			.unwrap_or("substrate/frame/contracts"),
 		"/fixtures/",
 		fixture_name,
 		".wat",
@@ -860,6 +862,27 @@ fn deposit_event_max_value_limit() {
 	});
 }
 
+// Fail out of fuel (ref_time weight) inside the start function.
+#[test]
+fn run_out_of_fuel_start_fun() {
+	let (wasm, _code_hash) = compile_module::<Test>("run_out_of_gas_start_fn").unwrap();
+	ExtBuilder::default().existential_deposit(50).build().execute_with(|| {
+		let _ = <Test as Config>::Currency::set_balance(&ALICE, 1_000_000);
+		assert_err_ignore_postinfo!(
+			Contracts::instantiate_with_code(
+				RuntimeOrigin::signed(ALICE),
+				0,
+				Weight::from_parts(1_000_000_000_000, u64::MAX),
+				None,
+				wasm,
+				vec![],
+				vec![],
+			),
+			Error::<Test>::OutOfGas,
+		);
+	});
+}
+
 // Fail out of fuel (ref_time weight) in the engine.
 #[test]
 fn run_out_of_fuel_engine() {
@@ -5891,3 +5914,53 @@ fn root_cannot_instantiate() {
 		);
 	});
 }
+
+#[test]
+fn balance_api_returns_free_balance() {
+	let (wasm, _code_hash) = compile_module::<Test>("balance").unwrap();
+	ExtBuilder::default().existential_deposit(200).build().execute_with(|| {
+		let _ = <Test as Config>::Currency::set_balance(&ALICE, 1_000_000);
+
+		// Instantiate the BOB contract without any extra balance.
+		let addr = Contracts::bare_instantiate(
+			ALICE,
+			0,
+			GAS_LIMIT,
+			None,
+			Code::Upload(wasm.to_vec()),
+			vec![],
+			vec![],
+			DebugInfo::Skip,
+			CollectEvents::Skip,
+		)
+		.result
+		.unwrap()
+		.account_id;
+
+		let value = 0;
+		// Call BOB which makes it call the balance runtime API.
+		// The contract code asserts that the returned balance is 0.
+		assert_ok!(Contracts::call(
+			RuntimeOrigin::signed(ALICE),
+			addr.clone(),
+			value,
+			GAS_LIMIT,
+			None,
+			vec![]
+		));
+
+		let value = 1;
+		// Calling with value will trap the contract.
+		assert_err_ignore_postinfo!(
+			Contracts::call(
+				RuntimeOrigin::signed(ALICE),
+				addr.clone(),
+				value,
+				GAS_LIMIT,
+				None,
+				vec![]
+			),
+			<Error<Test>>::ContractTrapped
+		);
+	});
+}
diff --git a/substrate/frame/contracts/src/tests/pallet_dummy.rs b/substrate/frame/contracts/src/tests/pallet_dummy.rs
index 7f8db53bf463fba8d83ebb7c643a421148b9dfa3..2af8475d17eda39854a8b82555b2102e9d67948f 100644
--- a/substrate/frame/contracts/src/tests/pallet_dummy.rs
+++ b/substrate/frame/contracts/src/tests/pallet_dummy.rs
@@ -1,3 +1,20 @@
+// 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.
+
 pub use pallet::*;
 
 #[frame_support::pallet(dev_mode)]
diff --git a/substrate/frame/contracts/src/tests/test_debug.rs b/substrate/frame/contracts/src/tests/test_debug.rs
index ba936a4588d18954119664b1647241b736eed7e3..2d7ed4743657573469deff09630ff2b2bf3a51a2 100644
--- a/substrate/frame/contracts/src/tests/test_debug.rs
+++ b/substrate/frame/contracts/src/tests/test_debug.rs
@@ -1,5 +1,25 @@
+// 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.
+
 use super::*;
-use crate::debug::{CallSpan, ExportedFunction, Tracing};
+use crate::{
+	debug::{CallInterceptor, CallSpan, ExecResult, ExportedFunction, Tracing},
+	AccountIdOf,
+};
 use frame_support::traits::Currency;
 use pallet_contracts_primitives::ExecReturnValue;
 use pretty_assertions::assert_eq;
@@ -7,7 +27,7 @@ use std::cell::RefCell;
 
 #[derive(Clone, PartialEq, Eq, Debug)]
 struct DebugFrame {
-	code_hash: CodeHash<Test>,
+	contract_account: AccountId32,
 	call: ExportedFunction,
 	input: Vec<u8>,
 	result: Option<Vec<u8>>,
@@ -15,11 +35,12 @@ struct DebugFrame {
 
 thread_local! {
 	static DEBUG_EXECUTION_TRACE: RefCell<Vec<DebugFrame>> = RefCell::new(Vec::new());
+	static INTERCEPTED_ADDRESS: RefCell<Option<AccountId32>> = RefCell::new(None);
 }
 
 pub struct TestDebug;
 pub struct TestCallSpan {
-	code_hash: CodeHash<Test>,
+	contract_account: AccountId32,
 	call: ExportedFunction,
 	input: Vec<u8>,
 }
@@ -28,19 +49,39 @@ impl Tracing<Test> for TestDebug {
 	type CallSpan = TestCallSpan;
 
 	fn new_call_span(
-		code_hash: &CodeHash<Test>,
+		contract_account: &AccountIdOf<Test>,
 		entry_point: ExportedFunction,
 		input_data: &[u8],
 	) -> TestCallSpan {
 		DEBUG_EXECUTION_TRACE.with(|d| {
 			d.borrow_mut().push(DebugFrame {
-				code_hash: *code_hash,
+				contract_account: contract_account.clone(),
 				call: entry_point,
 				input: input_data.to_vec(),
 				result: None,
 			})
 		});
-		TestCallSpan { code_hash: *code_hash, call: entry_point, input: input_data.to_vec() }
+		TestCallSpan {
+			contract_account: contract_account.clone(),
+			call: entry_point,
+			input: input_data.to_vec(),
+		}
+	}
+}
+
+impl CallInterceptor<Test> for TestDebug {
+	fn intercept_call(
+		contract_address: &<Test as frame_system::Config>::AccountId,
+		_entry_point: &ExportedFunction,
+		_input_data: &[u8],
+	) -> Option<ExecResult> {
+		INTERCEPTED_ADDRESS.with(|i| {
+			if i.borrow().as_ref() == Some(contract_address) {
+				Some(Ok(ExecReturnValue { flags: ReturnFlags::REVERT, data: vec![] }))
+			} else {
+				None
+			}
+		})
 	}
 }
 
@@ -48,7 +89,7 @@ impl CallSpan for TestCallSpan {
 	fn after_call(self, output: &ExecReturnValue) {
 		DEBUG_EXECUTION_TRACE.with(|d| {
 			d.borrow_mut().push(DebugFrame {
-				code_hash: self.code_hash,
+				contract_account: self.contract_account,
 				call: self.call,
 				input: self.input,
 				result: Some(output.data.clone()),
@@ -58,9 +99,9 @@ impl CallSpan for TestCallSpan {
 }
 
 #[test]
-fn unsafe_debugging_works() {
-	let (wasm_caller, code_hash_caller) = compile_module::<Test>("call").unwrap();
-	let (wasm_callee, code_hash_callee) = compile_module::<Test>("store_call").unwrap();
+fn debugging_works() {
+	let (wasm_caller, _) = compile_module::<Test>("call").unwrap();
+	let (wasm_callee, _) = compile_module::<Test>("store_call").unwrap();
 
 	fn current_stack() -> Vec<DebugFrame> {
 		DEBUG_EXECUTION_TRACE.with(|stack| stack.borrow().clone())
@@ -83,18 +124,18 @@ fn unsafe_debugging_works() {
 		.account_id
 	}
 
-	fn constructor_frame(hash: CodeHash<Test>, after: bool) -> DebugFrame {
+	fn constructor_frame(contract_account: &AccountId32, after: bool) -> DebugFrame {
 		DebugFrame {
-			code_hash: hash,
+			contract_account: contract_account.clone(),
 			call: ExportedFunction::Constructor,
 			input: vec![],
 			result: if after { Some(vec![]) } else { None },
 		}
 	}
 
-	fn call_frame(hash: CodeHash<Test>, args: Vec<u8>, after: bool) -> DebugFrame {
+	fn call_frame(contract_account: &AccountId32, args: Vec<u8>, after: bool) -> DebugFrame {
 		DebugFrame {
-			code_hash: hash,
+			contract_account: contract_account.clone(),
 			call: ExportedFunction::Call,
 			input: args,
 			result: if after { Some(vec![]) } else { None },
@@ -112,19 +153,19 @@ fn unsafe_debugging_works() {
 		assert_eq!(
 			current_stack(),
 			vec![
-				constructor_frame(code_hash_caller, false),
-				constructor_frame(code_hash_caller, true),
-				constructor_frame(code_hash_callee, false),
-				constructor_frame(code_hash_callee, true),
+				constructor_frame(&addr_caller, false),
+				constructor_frame(&addr_caller, true),
+				constructor_frame(&addr_callee, false),
+				constructor_frame(&addr_callee, true),
 			]
 		);
 
-		let main_args = (100u32, &addr_callee).encode();
+		let main_args = (100u32, &addr_callee.clone()).encode();
 		let inner_args = (100u32).encode();
 
 		assert_ok!(Contracts::call(
 			RuntimeOrigin::signed(ALICE),
-			addr_caller,
+			addr_caller.clone(),
 			0,
 			GAS_LIMIT,
 			None,
@@ -135,11 +176,54 @@ fn unsafe_debugging_works() {
 		assert_eq!(
 			stack_top,
 			vec![
-				call_frame(code_hash_caller, main_args.clone(), false),
-				call_frame(code_hash_callee, inner_args.clone(), false),
-				call_frame(code_hash_callee, inner_args, true),
-				call_frame(code_hash_caller, main_args, true),
+				call_frame(&addr_caller, main_args.clone(), false),
+				call_frame(&addr_callee, inner_args.clone(), false),
+				call_frame(&addr_callee, inner_args, true),
+				call_frame(&addr_caller, main_args, true),
 			]
 		);
 	});
 }
+
+#[test]
+fn call_interception_works() {
+	let (wasm, _) = compile_module::<Test>("dummy").unwrap();
+
+	ExtBuilder::default().existential_deposit(200).build().execute_with(|| {
+		let _ = Balances::deposit_creating(&ALICE, 1_000_000);
+
+		let account_id = Contracts::bare_instantiate(
+			ALICE,
+			0,
+			GAS_LIMIT,
+			None,
+			Code::Upload(wasm),
+			vec![],
+			// some salt to ensure that the address of this contract is unique among all tests
+			vec![0x41, 0x41, 0x41, 0x41],
+			DebugInfo::Skip,
+			CollectEvents::Skip,
+		)
+		.result
+		.unwrap()
+		.account_id;
+
+		// no interception yet
+		assert_ok!(Contracts::call(
+			RuntimeOrigin::signed(ALICE),
+			account_id.clone(),
+			0,
+			GAS_LIMIT,
+			None,
+			vec![],
+		));
+
+		// intercept calls to this contract
+		INTERCEPTED_ADDRESS.with(|i| *i.borrow_mut() = Some(account_id.clone()));
+
+		assert_err_ignore_postinfo!(
+			Contracts::call(RuntimeOrigin::signed(ALICE), account_id, 0, GAS_LIMIT, None, vec![],),
+			<Error<Test>>::ContractReverted,
+		);
+	});
+}
diff --git a/substrate/frame/contracts/src/wasm/mod.rs b/substrate/frame/contracts/src/wasm/mod.rs
index 291f39f7fa797462dcfc4825234f837ac94787b6..77e94b16777b041d746746f2c0653bae3c3d5949 100644
--- a/substrate/frame/contracts/src/wasm/mod.rs
+++ b/substrate/frame/contracts/src/wasm/mod.rs
@@ -42,14 +42,14 @@ use crate::{
 };
 use codec::{Decode, Encode, MaxEncodedLen};
 use frame_support::{
-	dispatch::{DispatchError, DispatchResult},
+	dispatch::DispatchResult,
 	ensure,
 	traits::{fungible::MutateHold, tokens::Precision::BestEffort},
 };
 use sp_core::Get;
-use sp_runtime::RuntimeDebug;
+use sp_runtime::{DispatchError, RuntimeDebug};
 use sp_std::prelude::*;
-use wasmi::{Instance, Linker, Memory, MemoryType, StackLimits, Store};
+use wasmi::{InstancePre, Linker, Memory, MemoryType, StackLimits, Store};
 
 const BYTES_PER_PAGE: usize = 64 * 1024;
 
@@ -164,7 +164,30 @@ impl<T: Config> WasmBlob<T> {
 	///
 	/// Applies all necessary checks before removing the code.
 	pub fn remove(origin: &T::AccountId, code_hash: CodeHash<T>) -> DispatchResult {
-		Self::try_remove_code(origin, code_hash)
+		<CodeInfoOf<T>>::try_mutate_exists(&code_hash, |existing| {
+			if let Some(code_info) = existing {
+				ensure!(code_info.refcount == 0, <Error<T>>::CodeInUse);
+				ensure!(&code_info.owner == origin, BadOrigin);
+				let _ = T::Currency::release(
+					&HoldReason::CodeUploadDepositReserve.into(),
+					&code_info.owner,
+					code_info.deposit,
+					BestEffort,
+				);
+				let deposit_released = code_info.deposit;
+				let remover = code_info.owner.clone();
+
+				*existing = None;
+				<PristineCode<T>>::remove(&code_hash);
+				<Pallet<T>>::deposit_event(
+					vec![code_hash],
+					Event::CodeRemoved { code_hash, deposit_released, remover },
+				);
+				Ok(())
+			} else {
+				Err(<Error<T>>::CodeNotFound.into())
+			}
+		})
 	}
 
 	/// Creates and returns an instance of the supplied code.
@@ -179,7 +202,7 @@ impl<T: Config> WasmBlob<T> {
 		determinism: Determinism,
 		stack_limits: StackLimits,
 		allow_deprecated: AllowDeprecatedInterface,
-	) -> Result<(Store<H>, Memory, Instance), &'static str>
+	) -> Result<(Store<H>, Memory, InstancePre), &'static str>
 	where
 		E: Environment<H>,
 	{
@@ -217,9 +240,7 @@ impl<T: Config> WasmBlob<T> {
 
 		let instance = linker
 			.instantiate(&mut store, &contract.module)
-			.map_err(|_| "can't instantiate module with provided definitions")?
-			.ensure_no_start(&mut store)
-			.map_err(|_| "start function is forbidden but found in the module")?;
+			.map_err(|_| "can't instantiate module with provided definitions")?;
 
 		Ok((store, memory, instance))
 	}
@@ -261,45 +282,6 @@ impl<T: Config> WasmBlob<T> {
 		})
 	}
 
-	/// Try to remove code together with all associated information.
-	fn try_remove_code(origin: &T::AccountId, code_hash: CodeHash<T>) -> DispatchResult {
-		<CodeInfoOf<T>>::try_mutate_exists(&code_hash, |existing| {
-			if let Some(code_info) = existing {
-				ensure!(code_info.refcount == 0, <Error<T>>::CodeInUse);
-				ensure!(&code_info.owner == origin, BadOrigin);
-				let _ = T::Currency::release(
-					&HoldReason::CodeUploadDepositReserve.into(),
-					&code_info.owner,
-					code_info.deposit,
-					BestEffort,
-				);
-				let deposit_released = code_info.deposit;
-				let remover = code_info.owner.clone();
-
-				*existing = None;
-				<PristineCode<T>>::remove(&code_hash);
-				<Pallet<T>>::deposit_event(
-					vec![code_hash],
-					Event::CodeRemoved { code_hash, deposit_released, remover },
-				);
-				Ok(())
-			} else {
-				Err(<Error<T>>::CodeNotFound.into())
-			}
-		})
-	}
-
-	/// Load code with the given code hash.
-	fn load_code(
-		code_hash: CodeHash<T>,
-		gas_meter: &mut GasMeter<T>,
-	) -> Result<(CodeVec<T>, CodeInfo<T>), DispatchError> {
-		let code_info = <CodeInfoOf<T>>::get(code_hash).ok_or(Error::<T>::CodeNotFound)?;
-		gas_meter.charge(CodeLoadToken(code_info.code_len))?;
-		let code = <PristineCode<T>>::get(code_hash).ok_or(Error::<T>::CodeNotFound)?;
-		Ok((code, code_info))
-	}
-
 	/// Create the module without checking the passed code.
 	///
 	/// # Note
@@ -318,12 +300,6 @@ impl<T: Config> WasmBlob<T> {
 }
 
 impl<T: Config> CodeInfo<T> {
-	/// Return the refcount of the module.
-	#[cfg(test)]
-	pub fn refcount(&self) -> u64 {
-		self.refcount
-	}
-
 	#[cfg(test)]
 	pub fn new(owner: T::AccountId) -> Self {
 		CodeInfo {
@@ -335,6 +311,16 @@ impl<T: Config> CodeInfo<T> {
 		}
 	}
 
+	/// Returns reference count of the module.
+	pub fn refcount(&self) -> u64 {
+		self.refcount
+	}
+
+	/// Return mutable reference to the refcount of the module.
+	pub fn refcount_mut(&mut self) -> &mut u64 {
+		&mut self.refcount
+	}
+
 	/// Returns the deposit of the module.
 	pub fn deposit(&self) -> BalanceOf<T> {
 		self.deposit
@@ -346,29 +332,12 @@ impl<T: Config> Executable<T> for WasmBlob<T> {
 		code_hash: CodeHash<T>,
 		gas_meter: &mut GasMeter<T>,
 	) -> Result<Self, DispatchError> {
-		let (code, code_info) = Self::load_code(code_hash, gas_meter)?;
+		let code_info = <CodeInfoOf<T>>::get(code_hash).ok_or(Error::<T>::CodeNotFound)?;
+		gas_meter.charge(CodeLoadToken(code_info.code_len))?;
+		let code = <PristineCode<T>>::get(code_hash).ok_or(Error::<T>::CodeNotFound)?;
 		Ok(Self { code, code_info, code_hash })
 	}
 
-	fn increment_refcount(code_hash: CodeHash<T>) -> Result<(), DispatchError> {
-		<CodeInfoOf<T>>::mutate(code_hash, |existing| -> Result<(), DispatchError> {
-			if let Some(info) = existing {
-				info.refcount = info.refcount.saturating_add(1);
-				Ok(())
-			} else {
-				Err(Error::<T>::CodeNotFound.into())
-			}
-		})
-	}
-
-	fn decrement_refcount(code_hash: CodeHash<T>) {
-		<CodeInfoOf<T>>::mutate(code_hash, |existing| {
-			if let Some(info) = existing {
-				info.refcount = info.refcount.saturating_sub(1);
-			}
-		});
-	}
-
 	fn execute<E: Ext<T = T>>(
 		self,
 		ext: &mut E,
@@ -410,25 +379,38 @@ impl<T: Config> Executable<T> for WasmBlob<T> {
 			.add_fuel(fuel_limit)
 			.expect("We've set up engine to fuel consuming mode; qed");
 
-		let exported_func = instance
-			.get_export(&store, function.identifier())
-			.and_then(|export| export.into_func())
-			.ok_or_else(|| {
-				log::error!(target: LOG_TARGET, "failed to find entry point");
-				Error::<T>::CodeRejected
-			})?;
+		// Sync this frame's gas meter with the engine's one.
+		let process_result = |mut store: Store<Runtime<E>>, result| {
+			let engine_consumed_total =
+				store.fuel_consumed().expect("Fuel metering is enabled; qed");
+			let gas_meter = store.data_mut().ext().gas_meter_mut();
+			gas_meter.charge_fuel(engine_consumed_total)?;
+			store.into_data().to_execution_result(result)
+		};
 
+		// Start function should already see the correct refcount in case it will be ever inspected.
 		if let &ExportedFunction::Constructor = function {
-			WasmBlob::<T>::increment_refcount(self.code_hash)?;
+			E::increment_refcount(self.code_hash)?;
 		}
 
-		let result = exported_func.call(&mut store, &[], &mut []);
-		let engine_consumed_total = store.fuel_consumed().expect("Fuel metering is enabled; qed");
-		// Sync this frame's gas meter with the engine's one.
-		let gas_meter = store.data_mut().ext().gas_meter_mut();
-		gas_meter.charge_fuel(engine_consumed_total)?;
-
-		store.into_data().to_execution_result(result)
+		// Any abort in start function (includes `return` + `terminate`) will make us skip the
+		// call into the subsequent exported function. This means that calling `return` returns data
+		// from the whole contract execution.
+		match instance.start(&mut store) {
+			Ok(instance) => {
+				let exported_func = instance
+					.get_export(&store, function.identifier())
+					.and_then(|export| export.into_func())
+					.ok_or_else(|| {
+						log::error!(target: LOG_TARGET, "failed to find entry point");
+						Error::<T>::CodeRejected
+					})?;
+
+				let result = exported_func.call(&mut store, &[], &mut []);
+				process_result(store, result)
+			},
+			Err(err) => process_result(store, Err(err)),
+		}
 	}
 
 	fn code_hash(&self) -> &CodeHash<T> {
@@ -740,7 +722,10 @@ mod tests {
 		fn nonce(&mut self) -> u64 {
 			995
 		}
-
+		fn increment_refcount(_code_hash: CodeHash<Self::T>) -> Result<(), DispatchError> {
+			Ok(())
+		}
+		fn decrement_refcount(_code_hash: CodeHash<Self::T>) {}
 		fn add_delegate_dependency(
 			&mut self,
 			code: CodeHash<Self::T>,
@@ -748,7 +733,6 @@ mod tests {
 			self.delegate_dependencies.borrow_mut().insert(code);
 			Ok(())
 		}
-
 		fn remove_delegate_dependency(
 			&mut self,
 			code: &CodeHash<Self::T>,
@@ -790,11 +774,20 @@ mod tests {
 		executable.execute(ext.borrow_mut(), entry_point, input_data)
 	}
 
-	/// Execute the supplied code.
+	/// Execute the `call` function within the supplied code.
 	fn execute<E: BorrowMut<MockExt>>(wat: &str, input_data: Vec<u8>, ext: E) -> ExecResult {
 		execute_internal(wat, input_data, ext, &ExportedFunction::Call, true, false)
 	}
 
+	/// Execute the `deploy` function within the supplied code.
+	fn execute_instantiate<E: BorrowMut<MockExt>>(
+		wat: &str,
+		input_data: Vec<u8>,
+		ext: E,
+	) -> ExecResult {
+		execute_internal(wat, input_data, ext, &ExportedFunction::Constructor, true, false)
+	}
+
 	/// Execute the supplied code with disabled unstable functions.
 	///
 	/// In our test config unstable functions are disabled so that we can test them.
@@ -1878,32 +1871,47 @@ mod tests {
 		assert_ok!(execute(CODE_VALUE_TRANSFERRED, vec![], MockExt::default()));
 	}
 
-	const START_FN_ILLEGAL: &str = r#"
+	const START_FN_DOES_RUN: &str = r#"
 (module
-	(import "seal0" "seal_return" (func $seal_return (param i32 i32 i32)))
+	(import "seal0" "seal_deposit_event" (func $seal_deposit_event (param i32 i32 i32 i32)))
 	(import "env" "memory" (memory 1 1))
 
 	(start $start)
 	(func $start
-		(unreachable)
+		(call $seal_deposit_event
+			(i32.const 0) ;; Pointer to the start of topics buffer
+			(i32.const 0) ;; The length of the topics buffer.
+			(i32.const 0) ;; Pointer to the start of the data buffer
+			(i32.const 13) ;; Length of the buffer
+		)
 	)
 
-	(func (export "call")
-		(unreachable)
-	)
+	(func (export "call"))
 
-	(func (export "deploy")
-		(unreachable)
-	)
+	(func (export "deploy"))
 
-	(data (i32.const 8) "\01\02\03\04")
+	(data (i32.const 0) "\00\01\2A\00\00\00\00\00\00\00\E5\14\00")
 )
 "#;
 
 	#[test]
-	fn start_fn_illegal() {
-		let output = execute(START_FN_ILLEGAL, vec![], MockExt::default());
-		assert_err!(output, <Error<Test>>::CodeRejected,);
+	fn start_fn_does_run_on_call() {
+		let mut ext = MockExt::default();
+		execute(START_FN_DOES_RUN, vec![], &mut ext).unwrap();
+		assert_eq!(
+			ext.events[0].1,
+			[0x00_u8, 0x01, 0x2a, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0xe5, 0x14, 0x00]
+		);
+	}
+
+	#[test]
+	fn start_fn_does_run_on_deploy() {
+		let mut ext = MockExt::default();
+		execute_instantiate(START_FN_DOES_RUN, vec![], &mut ext).unwrap();
+		assert_eq!(
+			ext.events[0].1,
+			[0x00_u8, 0x01, 0x2a, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0xe5, 0x14, 0x00]
+		);
 	}
 
 	const CODE_TIMESTAMP_NOW: &str = r#"
diff --git a/substrate/frame/contracts/src/wasm/prepare.rs b/substrate/frame/contracts/src/wasm/prepare.rs
index b129c17e13eca5cbef72c40387a9f86d81fa3515..dfe8c4f8f9b91fe5e7d73032282fe50effd51d38 100644
--- a/substrate/frame/contracts/src/wasm/prepare.rs
+++ b/substrate/frame/contracts/src/wasm/prepare.rs
@@ -79,8 +79,7 @@ impl LoadedModule {
 		}
 
 		let engine = Engine::new(&config);
-		let module =
-			Module::new(&engine, code.clone()).map_err(|_| "Can't load the module into wasmi!")?;
+		let module = Module::new(&engine, code).map_err(|_| "Can't load the module into wasmi!")?;
 
 		// Return a `LoadedModule` instance with
 		// __valid__ module.
diff --git a/substrate/frame/contracts/src/wasm/runtime.rs b/substrate/frame/contracts/src/wasm/runtime.rs
index ca23ab9fe5dd0205bc437773b1628e60545ea99b..4fd52b471a0c6b41cabd364d530d2989891591d7 100644
--- a/substrate/frame/contracts/src/wasm/runtime.rs
+++ b/substrate/frame/contracts/src/wasm/runtime.rs
@@ -26,13 +26,13 @@ use crate::{
 
 use bitflags::bitflags;
 use codec::{Decode, DecodeLimit, Encode, MaxEncodedLen};
-use frame_support::{dispatch::DispatchError, ensure, traits::Get, weights::Weight};
+use frame_support::{ensure, traits::Get, weights::Weight};
 use pallet_contracts_primitives::{ExecReturnValue, ReturnFlags};
 use pallet_contracts_proc_macro::define_env;
 use sp_io::hashing::{blake2_128, blake2_256, keccak_256, sha2_256};
 use sp_runtime::{
 	traits::{Bounded, Zero},
-	RuntimeDebug,
+	DispatchError, RuntimeDebug,
 };
 use sp_std::{fmt, prelude::*};
 use wasmi::{core::HostError, errors::LinkerError, Linker, Memory, Store};
@@ -608,7 +608,7 @@ impl<'a, E: Ext + 'a> Runtime<'a, E> {
 		let mut bound_checked = memory
 			.get(ptr..ptr + D::max_encoded_len() as usize)
 			.ok_or_else(|| Error::<E::T>::OutOfBounds)?;
-		let decoded = D::decode_all_with_depth_limit(MAX_DECODE_NESTING, &mut bound_checked)
+		let decoded = D::decode_with_depth_limit(MAX_DECODE_NESTING, &mut bound_checked)
 			.map_err(|_| DispatchError::from(Error::<E::T>::DecodingFailed))?;
 		Ok(decoded)
 	}
diff --git a/substrate/frame/contracts/src/weights.rs b/substrate/frame/contracts/src/weights.rs
index 34bea8ff0a30ff0546c88c8b84895e87c4ce53ea..22e4f749313d237672677557e5969b8d4ff4296b 100644
--- a/substrate/frame/contracts/src/weights.rs
+++ b/substrate/frame/contracts/src/weights.rs
@@ -18,10 +18,10 @@
 //! Autogenerated weights for `pallet_contracts`
 //!
 //! THIS FILE WAS AUTO-GENERATED USING THE SUBSTRATE BENCHMARK CLI VERSION 4.0.0-dev
-//! DATE: 2023-08-07, STEPS: `50`, REPEAT: `20`, LOW RANGE: `[]`, HIGH RANGE: `[]`
+//! DATE: 2023-09-01, STEPS: `50`, REPEAT: `20`, LOW RANGE: `[]`, HIGH RANGE: `[]`
 //! WORST CASE MAP SIZE: `1000000`
-//! HOSTNAME: `runner-ynta1nyy-project-145-concurrent-0`, CPU: `Intel(R) Xeon(R) CPU @ 2.60GHz`
-//! EXECUTION: ``, WASM-EXECUTION: `Compiled`, CHAIN: `Some("dev")`, DB CACHE: `1024`
+//! HOSTNAME: `runner-pzhd7p6z-project-674-concurrent-0`, CPU: `Intel(R) Xeon(R) CPU @ 2.60GHz`
+//! WASM-EXECUTION: `Compiled`, CHAIN: `Some("dev")`, DB CACHE: `1024`
 
 // Executed Command:
 // target/production/substrate-node
@@ -32,12 +32,12 @@
 // --extrinsic=*
 // --wasm-execution=compiled
 // --heap-pages=4096
-// --json-file=/builds/parity/mirrors/substrate/.git/.artifacts/bench.json
+// --json-file=/builds/parity/mirrors/polkadot-sdk/.git/.artifacts/bench.json
 // --pallet=pallet_contracts
 // --chain=dev
-// --header=./HEADER-APACHE2
-// --output=./frame/contracts/src/weights.rs
-// --template=./.maintain/frame-weight-template.hbs
+// --header=./substrate/HEADER-APACHE2
+// --output=./substrate/frame/contracts/src/weights.rs
+// --template=./substrate/.maintain/frame-weight-template.hbs
 
 #![cfg_attr(rustfmt, rustfmt_skip)]
 #![allow(unused_parens)]
@@ -141,8 +141,8 @@ impl<T: frame_system::Config> WeightInfo for SubstrateWeight<T> {
 		// Proof Size summary in bytes:
 		//  Measured:  `142`
 		//  Estimated: `1627`
-		// Minimum execution time: 2_410_000 picoseconds.
-		Weight::from_parts(2_581_000, 1627)
+		// Minimum execution time: 2_548_000 picoseconds.
+		Weight::from_parts(2_670_000, 1627)
 			.saturating_add(T::DbWeight::get().reads(1_u64))
 	}
 	/// Storage: `Skipped::Metadata` (r:0 w:0)
@@ -152,10 +152,10 @@ impl<T: frame_system::Config> WeightInfo for SubstrateWeight<T> {
 		// Proof Size summary in bytes:
 		//  Measured:  `451 + k * (69 ±0)`
 		//  Estimated: `441 + k * (70 ±0)`
-		// Minimum execution time: 13_278_000 picoseconds.
-		Weight::from_parts(13_944_000, 441)
-			// Standard Error: 1_643
-			.saturating_add(Weight::from_parts(1_194_404, 0).saturating_mul(k.into()))
+		// Minimum execution time: 13_526_000 picoseconds.
+		Weight::from_parts(13_902_000, 441)
+			// Standard Error: 1_058
+			.saturating_add(Weight::from_parts(1_274_724, 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))
@@ -169,10 +169,10 @@ impl<T: frame_system::Config> WeightInfo for SubstrateWeight<T> {
 		// Proof Size summary in bytes:
 		//  Measured:  `211 + c * (1 ±0)`
 		//  Estimated: `6149 + c * (1 ±0)`
-		// Minimum execution time: 8_533_000 picoseconds.
-		Weight::from_parts(9_141_899, 6149)
+		// Minimum execution time: 8_426_000 picoseconds.
+		Weight::from_parts(8_591_621, 6149)
 			// Standard Error: 1
-			.saturating_add(Weight::from_parts(1_327, 0).saturating_mul(c.into()))
+			.saturating_add(Weight::from_parts(1_203, 0).saturating_mul(c.into()))
 			.saturating_add(T::DbWeight::get().reads(2_u64))
 			.saturating_add(T::DbWeight::get().writes(1_u64))
 			.saturating_add(Weight::from_parts(0, 1).saturating_mul(c.into()))
@@ -185,8 +185,8 @@ impl<T: frame_system::Config> WeightInfo for SubstrateWeight<T> {
 		// Proof Size summary in bytes:
 		//  Measured:  `510`
 		//  Estimated: `6450`
-		// Minimum execution time: 16_998_000 picoseconds.
-		Weight::from_parts(17_776_000, 6450)
+		// Minimum execution time: 17_008_000 picoseconds.
+		Weight::from_parts(17_742_000, 6450)
 			.saturating_add(T::DbWeight::get().reads(3_u64))
 			.saturating_add(T::DbWeight::get().writes(1_u64))
 	}
@@ -199,10 +199,10 @@ impl<T: frame_system::Config> WeightInfo for SubstrateWeight<T> {
 		// Proof Size summary in bytes:
 		//  Measured:  `171 + k * (1 ±0)`
 		//  Estimated: `3635 + k * (1 ±0)`
-		// Minimum execution time: 3_919_000 picoseconds.
-		Weight::from_parts(4_057_153, 3635)
-			// Standard Error: 1_252
-			.saturating_add(Weight::from_parts(1_151_419, 0).saturating_mul(k.into()))
+		// Minimum execution time: 3_949_000 picoseconds.
+		Weight::from_parts(4_062_000, 3635)
+			// Standard Error: 1_983
+			.saturating_add(Weight::from_parts(1_173_197, 0).saturating_mul(k.into()))
 			.saturating_add(T::DbWeight::get().reads(1_u64))
 			.saturating_add(T::DbWeight::get().writes(2_u64))
 			.saturating_add(T::DbWeight::get().writes((1_u64).saturating_mul(k.into())))
@@ -221,10 +221,10 @@ impl<T: frame_system::Config> WeightInfo for SubstrateWeight<T> {
 		// Proof Size summary in bytes:
 		//  Measured:  `325 + c * (1 ±0)`
 		//  Estimated: `6263 + c * (1 ±0)`
-		// Minimum execution time: 17_730_000 picoseconds.
-		Weight::from_parts(17_540_884, 6263)
+		// Minimum execution time: 17_094_000 picoseconds.
+		Weight::from_parts(17_338_591, 6263)
 			// Standard Error: 1
-			.saturating_add(Weight::from_parts(417, 0).saturating_mul(c.into()))
+			.saturating_add(Weight::from_parts(436, 0).saturating_mul(c.into()))
 			.saturating_add(T::DbWeight::get().reads(4_u64))
 			.saturating_add(T::DbWeight::get().writes(2_u64))
 			.saturating_add(Weight::from_parts(0, 1).saturating_mul(c.into()))
@@ -235,8 +235,8 @@ impl<T: frame_system::Config> WeightInfo for SubstrateWeight<T> {
 		// Proof Size summary in bytes:
 		//  Measured:  `440`
 		//  Estimated: `6380`
-		// Minimum execution time: 13_089_000 picoseconds.
-		Weight::from_parts(13_727_000, 6380)
+		// Minimum execution time: 12_704_000 picoseconds.
+		Weight::from_parts(13_147_000, 6380)
 			.saturating_add(T::DbWeight::get().reads(2_u64))
 			.saturating_add(T::DbWeight::get().writes(1_u64))
 	}
@@ -250,8 +250,8 @@ impl<T: frame_system::Config> WeightInfo for SubstrateWeight<T> {
 		// Proof Size summary in bytes:
 		//  Measured:  `360`
 		//  Estimated: `6300`
-		// Minimum execution time: 49_083_000 picoseconds.
-		Weight::from_parts(50_462_000, 6300)
+		// Minimum execution time: 48_387_000 picoseconds.
+		Weight::from_parts(50_024_000, 6300)
 			.saturating_add(T::DbWeight::get().reads(4_u64))
 			.saturating_add(T::DbWeight::get().writes(1_u64))
 	}
@@ -263,8 +263,8 @@ impl<T: frame_system::Config> WeightInfo for SubstrateWeight<T> {
 		// Proof Size summary in bytes:
 		//  Measured:  `594`
 		//  Estimated: `6534`
-		// Minimum execution time: 49_299_000 picoseconds.
-		Weight::from_parts(50_805_000, 6534)
+		// Minimum execution time: 59_300_000 picoseconds.
+		Weight::from_parts(61_805_000, 6534)
 			.saturating_add(T::DbWeight::get().reads(4_u64))
 			.saturating_add(T::DbWeight::get().writes(2_u64))
 	}
@@ -274,8 +274,8 @@ impl<T: frame_system::Config> WeightInfo for SubstrateWeight<T> {
 		// Proof Size summary in bytes:
 		//  Measured:  `142`
 		//  Estimated: `1627`
-		// Minimum execution time: 3_305_000 picoseconds.
-		Weight::from_parts(3_489_000, 1627)
+		// Minimum execution time: 3_327_000 picoseconds.
+		Weight::from_parts(3_502_000, 1627)
 			.saturating_add(T::DbWeight::get().reads(1_u64))
 			.saturating_add(T::DbWeight::get().writes(1_u64))
 	}
@@ -287,8 +287,8 @@ impl<T: frame_system::Config> WeightInfo for SubstrateWeight<T> {
 		// Proof Size summary in bytes:
 		//  Measured:  `166`
 		//  Estimated: `3631`
-		// Minimum execution time: 12_657_000 picoseconds.
-		Weight::from_parts(13_100_000, 3631)
+		// Minimum execution time: 12_759_000 picoseconds.
+		Weight::from_parts(13_134_000, 3631)
 			.saturating_add(T::DbWeight::get().reads(2_u64))
 			.saturating_add(T::DbWeight::get().writes(2_u64))
 	}
@@ -298,8 +298,8 @@ impl<T: frame_system::Config> WeightInfo for SubstrateWeight<T> {
 		// Proof Size summary in bytes:
 		//  Measured:  `142`
 		//  Estimated: `3607`
-		// Minimum execution time: 4_784_000 picoseconds.
-		Weight::from_parts(4_994_000, 3607)
+		// Minimum execution time: 4_775_000 picoseconds.
+		Weight::from_parts(5_084_000, 3607)
 			.saturating_add(T::DbWeight::get().reads(1_u64))
 	}
 	/// Storage: UNKNOWN KEY `0x4342193e496fab7ec59d615ed0dc55304e7b9012096b41c4eb3aaf947f6ea429` (r:1 w:0)
@@ -310,8 +310,8 @@ impl<T: frame_system::Config> WeightInfo for SubstrateWeight<T> {
 		// Proof Size summary in bytes:
 		//  Measured:  `167`
 		//  Estimated: `3632`
-		// Minimum execution time: 6_762_000 picoseconds.
-		Weight::from_parts(6_945_000, 3632)
+		// Minimum execution time: 6_663_000 picoseconds.
+		Weight::from_parts(6_855_000, 3632)
 			.saturating_add(T::DbWeight::get().reads(2_u64))
 	}
 	/// Storage: UNKNOWN KEY `0x4342193e496fab7ec59d615ed0dc55304e7b9012096b41c4eb3aaf947f6ea429` (r:1 w:0)
@@ -322,8 +322,8 @@ impl<T: frame_system::Config> WeightInfo for SubstrateWeight<T> {
 		// Proof Size summary in bytes:
 		//  Measured:  `142`
 		//  Estimated: `3607`
-		// Minimum execution time: 6_999_000 picoseconds.
-		Weight::from_parts(7_372_000, 3607)
+		// Minimum execution time: 7_212_000 picoseconds.
+		Weight::from_parts(7_426_000, 3607)
 			.saturating_add(T::DbWeight::get().reads(2_u64))
 			.saturating_add(T::DbWeight::get().writes(1_u64))
 	}
@@ -344,12 +344,12 @@ impl<T: frame_system::Config> WeightInfo for SubstrateWeight<T> {
 	/// The range of component `c` is `[0, 125952]`.
 	fn call_with_code_per_byte(c: u32, ) -> Weight {
 		// Proof Size summary in bytes:
-		//  Measured:  `759`
-		//  Estimated: `6710 + c * (1 ±0)`
-		// Minimum execution time: 304_121_000 picoseconds.
-		Weight::from_parts(288_627_840, 6710)
-			// Standard Error: 83
-			.saturating_add(Weight::from_parts(37_343, 0).saturating_mul(c.into()))
+		//  Measured:  `792`
+		//  Estimated: `6743 + c * (1 ±0)`
+		// Minimum execution time: 289_557_000 picoseconds.
+		Weight::from_parts(272_895_652, 6743)
+			// Standard Error: 80
+			.saturating_add(Weight::from_parts(39_917, 0).saturating_mul(c.into()))
 			.saturating_add(T::DbWeight::get().reads(8_u64))
 			.saturating_add(T::DbWeight::get().writes(4_u64))
 			.saturating_add(Weight::from_parts(0, 1).saturating_mul(c.into()))
@@ -377,16 +377,16 @@ impl<T: frame_system::Config> WeightInfo for SubstrateWeight<T> {
 	/// The range of component `s` is `[0, 1048576]`.
 	fn instantiate_with_code(c: u32, i: u32, s: u32, ) -> Weight {
 		// Proof Size summary in bytes:
-		//  Measured:  `290`
-		//  Estimated: `8714`
-		// Minimum execution time: 4_101_589_000 picoseconds.
-		Weight::from_parts(694_193_047, 8714)
-			// Standard Error: 334
-			.saturating_add(Weight::from_parts(108_847, 0).saturating_mul(c.into()))
-			// Standard Error: 40
-			.saturating_add(Weight::from_parts(1_677, 0).saturating_mul(i.into()))
-			// Standard Error: 40
-			.saturating_add(Weight::from_parts(1_783, 0).saturating_mul(s.into()))
+		//  Measured:  `323`
+		//  Estimated: `8747`
+		// Minimum execution time: 4_671_359_000 picoseconds.
+		Weight::from_parts(586_523_882, 8747)
+			// Standard Error: 206
+			.saturating_add(Weight::from_parts(115_402, 0).saturating_mul(c.into()))
+			// Standard Error: 24
+			.saturating_add(Weight::from_parts(1_797, 0).saturating_mul(i.into()))
+			// Standard Error: 24
+			.saturating_add(Weight::from_parts(2_046, 0).saturating_mul(s.into()))
 			.saturating_add(T::DbWeight::get().reads(11_u64))
 			.saturating_add(T::DbWeight::get().writes(10_u64))
 	}
@@ -404,22 +404,22 @@ impl<T: frame_system::Config> WeightInfo for SubstrateWeight<T> {
 	/// Proof: `Timestamp::Now` (`max_values`: Some(1), `max_size`: Some(8), added: 503, mode: `Measured`)
 	/// Storage: `System::Account` (r:1 w:1)
 	/// Proof: `System::Account` (`max_values`: None, `max_size`: Some(128), added: 2603, mode: `Measured`)
-	/// Storage: `Balances::Holds` (r:1 w:1)
-	/// Proof: `Balances::Holds` (`max_values`: None, `max_size`: Some(85), added: 2560, mode: `Measured`)
 	/// Storage: `System::EventTopics` (r:2 w:2)
 	/// Proof: `System::EventTopics` (`max_values`: None, `max_size`: None, mode: `Measured`)
+	/// Storage: `Balances::Holds` (r:1 w:1)
+	/// Proof: `Balances::Holds` (`max_values`: None, `max_size`: Some(85), added: 2560, mode: `Measured`)
 	/// The range of component `i` is `[0, 1048576]`.
 	/// The range of component `s` is `[0, 1048576]`.
 	fn instantiate(i: u32, s: u32, ) -> Weight {
 		// Proof Size summary in bytes:
-		//  Measured:  `527`
-		//  Estimated: `6471`
-		// Minimum execution time: 2_011_580_000 picoseconds.
-		Weight::from_parts(397_415_227, 6471)
-			// Standard Error: 10
-			.saturating_add(Weight::from_parts(1_689, 0).saturating_mul(i.into()))
-			// Standard Error: 10
-			.saturating_add(Weight::from_parts(1_679, 0).saturating_mul(s.into()))
+		//  Measured:  `560`
+		//  Estimated: `6504`
+		// Minimum execution time: 2_170_657_000 picoseconds.
+		Weight::from_parts(369_331_405, 6504)
+			// Standard Error: 7
+			.saturating_add(Weight::from_parts(1_940, 0).saturating_mul(i.into()))
+			// Standard Error: 7
+			.saturating_add(Weight::from_parts(1_858, 0).saturating_mul(s.into()))
 			.saturating_add(T::DbWeight::get().reads(10_u64))
 			.saturating_add(T::DbWeight::get().writes(7_u64))
 	}
@@ -439,10 +439,10 @@ impl<T: frame_system::Config> WeightInfo for SubstrateWeight<T> {
 	/// Proof: `System::EventTopics` (`max_values`: None, `max_size`: None, mode: `Measured`)
 	fn call() -> Weight {
 		// Proof Size summary in bytes:
-		//  Measured:  `793`
-		//  Estimated: `6733`
-		// Minimum execution time: 204_975_000 picoseconds.
-		Weight::from_parts(214_770_000, 6733)
+		//  Measured:  `826`
+		//  Estimated: `6766`
+		// Minimum execution time: 204_287_000 picoseconds.
+		Weight::from_parts(213_239_000, 6766)
 			.saturating_add(T::DbWeight::get().reads(8_u64))
 			.saturating_add(T::DbWeight::get().writes(4_u64))
 	}
@@ -461,10 +461,10 @@ impl<T: frame_system::Config> WeightInfo for SubstrateWeight<T> {
 		// Proof Size summary in bytes:
 		//  Measured:  `142`
 		//  Estimated: `3607`
-		// Minimum execution time: 269_545_000 picoseconds.
-		Weight::from_parts(256_054_650, 3607)
-			// Standard Error: 91
-			.saturating_add(Weight::from_parts(72_743, 0).saturating_mul(c.into()))
+		// Minimum execution time: 285_434_000 picoseconds.
+		Weight::from_parts(242_697_648, 3607)
+			// Standard Error: 128
+			.saturating_add(Weight::from_parts(76_087, 0).saturating_mul(c.into()))
 			.saturating_add(T::DbWeight::get().reads(4_u64))
 			.saturating_add(T::DbWeight::get().writes(4_u64))
 	}
@@ -482,8 +482,8 @@ impl<T: frame_system::Config> WeightInfo for SubstrateWeight<T> {
 		// Proof Size summary in bytes:
 		//  Measured:  `315`
 		//  Estimated: `3780`
-		// Minimum execution time: 47_880_000 picoseconds.
-		Weight::from_parts(49_427_000, 3780)
+		// Minimum execution time: 46_486_000 picoseconds.
+		Weight::from_parts(48_422_000, 3780)
 			.saturating_add(T::DbWeight::get().reads(4_u64))
 			.saturating_add(T::DbWeight::get().writes(4_u64))
 	}
@@ -499,8 +499,8 @@ impl<T: frame_system::Config> WeightInfo for SubstrateWeight<T> {
 		// Proof Size summary in bytes:
 		//  Measured:  `552`
 		//  Estimated: `8967`
-		// Minimum execution time: 37_898_000 picoseconds.
-		Weight::from_parts(39_826_000, 8967)
+		// Minimum execution time: 37_568_000 picoseconds.
+		Weight::from_parts(38_589_000, 8967)
 			.saturating_add(T::DbWeight::get().reads(7_u64))
 			.saturating_add(T::DbWeight::get().writes(6_u64))
 	}
@@ -521,12 +521,12 @@ impl<T: frame_system::Config> WeightInfo for SubstrateWeight<T> {
 	/// The range of component `r` is `[0, 1600]`.
 	fn seal_caller(r: u32, ) -> Weight {
 		// Proof Size summary in bytes:
-		//  Measured:  `833 + r * (6 ±0)`
-		//  Estimated: `6773 + r * (6 ±0)`
-		// Minimum execution time: 260_916_000 picoseconds.
-		Weight::from_parts(295_521_846, 6773)
-			// Standard Error: 1_126
-			.saturating_add(Weight::from_parts(348_317, 0).saturating_mul(r.into()))
+		//  Measured:  `866 + r * (6 ±0)`
+		//  Estimated: `6806 + r * (6 ±0)`
+		// Minimum execution time: 274_513_000 picoseconds.
+		Weight::from_parts(288_793_403, 6806)
+			// Standard Error: 650
+			.saturating_add(Weight::from_parts(339_309, 0).saturating_mul(r.into()))
 			.saturating_add(T::DbWeight::get().reads(8_u64))
 			.saturating_add(T::DbWeight::get().writes(3_u64))
 			.saturating_add(Weight::from_parts(0, 6).saturating_mul(r.into()))
@@ -548,12 +548,12 @@ impl<T: frame_system::Config> WeightInfo for SubstrateWeight<T> {
 	/// The range of component `r` is `[0, 1600]`.
 	fn seal_is_contract(r: u32, ) -> Weight {
 		// Proof Size summary in bytes:
-		//  Measured:  `889 + r * (209 ±0)`
-		//  Estimated: `6793 + r * (2684 ±0)`
-		// Minimum execution time: 274_335_000 picoseconds.
-		Weight::from_parts(132_998_512, 6793)
-			// Standard Error: 7_396
-			.saturating_add(Weight::from_parts(3_602_287, 0).saturating_mul(r.into()))
+		//  Measured:  `922 + r * (209 ±0)`
+		//  Estimated: `6826 + r * (2684 ±0)`
+		// Minimum execution time: 260_096_000 picoseconds.
+		Weight::from_parts(149_954_322, 6826)
+			// Standard Error: 5_713
+			.saturating_add(Weight::from_parts(3_788_924, 0).saturating_mul(r.into()))
 			.saturating_add(T::DbWeight::get().reads(8_u64))
 			.saturating_add(T::DbWeight::get().reads((1_u64).saturating_mul(r.into())))
 			.saturating_add(T::DbWeight::get().writes(3_u64))
@@ -576,12 +576,12 @@ impl<T: frame_system::Config> WeightInfo for SubstrateWeight<T> {
 	/// The range of component `r` is `[0, 1600]`.
 	fn seal_code_hash(r: u32, ) -> Weight {
 		// Proof Size summary in bytes:
-		//  Measured:  `888 + r * (213 ±0)`
-		//  Estimated: `6797 + r * (2688 ±0)`
-		// Minimum execution time: 272_514_000 picoseconds.
-		Weight::from_parts(104_825_618, 6797)
-			// Standard Error: 10_038
-			.saturating_add(Weight::from_parts(4_520_258, 0).saturating_mul(r.into()))
+		//  Measured:  `921 + r * (213 ±0)`
+		//  Estimated: `6830 + r * (2688 ±0)`
+		// Minimum execution time: 277_496_000 picoseconds.
+		Weight::from_parts(285_839_000, 6830)
+			// Standard Error: 10_076
+			.saturating_add(Weight::from_parts(4_720_110, 0).saturating_mul(r.into()))
 			.saturating_add(T::DbWeight::get().reads(8_u64))
 			.saturating_add(T::DbWeight::get().reads((1_u64).saturating_mul(r.into())))
 			.saturating_add(T::DbWeight::get().writes(3_u64))
@@ -604,12 +604,12 @@ impl<T: frame_system::Config> WeightInfo for SubstrateWeight<T> {
 	/// The range of component `r` is `[0, 1600]`.
 	fn seal_own_code_hash(r: u32, ) -> Weight {
 		// Proof Size summary in bytes:
-		//  Measured:  `840 + r * (6 ±0)`
-		//  Estimated: `6782 + r * (6 ±0)`
-		// Minimum execution time: 264_593_000 picoseconds.
-		Weight::from_parts(294_139_363, 6782)
-			// Standard Error: 907
-			.saturating_add(Weight::from_parts(432_964, 0).saturating_mul(r.into()))
+		//  Measured:  `873 + r * (6 ±0)`
+		//  Estimated: `6815 + r * (6 ±0)`
+		// Minimum execution time: 275_655_000 picoseconds.
+		Weight::from_parts(291_386_528, 6815)
+			// Standard Error: 898
+			.saturating_add(Weight::from_parts(428_765, 0).saturating_mul(r.into()))
 			.saturating_add(T::DbWeight::get().reads(8_u64))
 			.saturating_add(T::DbWeight::get().writes(3_u64))
 			.saturating_add(Weight::from_parts(0, 6).saturating_mul(r.into()))
@@ -631,12 +631,12 @@ impl<T: frame_system::Config> WeightInfo for SubstrateWeight<T> {
 	/// The range of component `r` is `[0, 1600]`.
 	fn seal_caller_is_origin(r: u32, ) -> Weight {
 		// Proof Size summary in bytes:
-		//  Measured:  `830 + r * (3 ±0)`
-		//  Estimated: `6771 + r * (3 ±0)`
-		// Minimum execution time: 260_412_000 picoseconds.
-		Weight::from_parts(284_371_703, 6771)
-			// Standard Error: 433
-			.saturating_add(Weight::from_parts(182_952, 0).saturating_mul(r.into()))
+		//  Measured:  `863 + r * (3 ±0)`
+		//  Estimated: `6804 + r * (3 ±0)`
+		// Minimum execution time: 260_323_000 picoseconds.
+		Weight::from_parts(286_371_403, 6804)
+			// Standard Error: 451
+			.saturating_add(Weight::from_parts(183_053, 0).saturating_mul(r.into()))
 			.saturating_add(T::DbWeight::get().reads(8_u64))
 			.saturating_add(T::DbWeight::get().writes(3_u64))
 			.saturating_add(Weight::from_parts(0, 3).saturating_mul(r.into()))
@@ -656,12 +656,12 @@ impl<T: frame_system::Config> WeightInfo for SubstrateWeight<T> {
 	/// The range of component `r` is `[0, 1600]`.
 	fn seal_caller_is_root(r: u32, ) -> Weight {
 		// Proof Size summary in bytes:
-		//  Measured:  `720 + r * (3 ±0)`
-		//  Estimated: `6660 + r * (3 ±0)`
-		// Minimum execution time: 255_112_000 picoseconds.
-		Weight::from_parts(273_052_488, 6660)
-			// Standard Error: 376
-			.saturating_add(Weight::from_parts(166_644, 0).saturating_mul(r.into()))
+		//  Measured:  `753 + r * (3 ±0)`
+		//  Estimated: `6693 + r * (3 ±0)`
+		// Minimum execution time: 262_974_000 picoseconds.
+		Weight::from_parts(276_571_502, 6693)
+			// Standard Error: 527
+			.saturating_add(Weight::from_parts(165_364, 0).saturating_mul(r.into()))
 			.saturating_add(T::DbWeight::get().reads(7_u64))
 			.saturating_add(T::DbWeight::get().writes(3_u64))
 			.saturating_add(Weight::from_parts(0, 3).saturating_mul(r.into()))
@@ -683,12 +683,12 @@ impl<T: frame_system::Config> WeightInfo for SubstrateWeight<T> {
 	/// The range of component `r` is `[0, 1600]`.
 	fn seal_address(r: u32, ) -> Weight {
 		// Proof Size summary in bytes:
-		//  Measured:  `834 + r * (6 ±0)`
-		//  Estimated: `6774 + r * (6 ±0)`
-		// Minimum execution time: 270_426_000 picoseconds.
-		Weight::from_parts(289_240_775, 6774)
-			// Standard Error: 748
-			.saturating_add(Weight::from_parts(344_791, 0).saturating_mul(r.into()))
+		//  Measured:  `867 + r * (6 ±0)`
+		//  Estimated: `6807 + r * (6 ±0)`
+		// Minimum execution time: 272_826_000 picoseconds.
+		Weight::from_parts(290_963_001, 6807)
+			// Standard Error: 810
+			.saturating_add(Weight::from_parts(343_762, 0).saturating_mul(r.into()))
 			.saturating_add(T::DbWeight::get().reads(8_u64))
 			.saturating_add(T::DbWeight::get().writes(3_u64))
 			.saturating_add(Weight::from_parts(0, 6).saturating_mul(r.into()))
@@ -710,12 +710,12 @@ impl<T: frame_system::Config> WeightInfo for SubstrateWeight<T> {
 	/// The range of component `r` is `[0, 1600]`.
 	fn seal_gas_left(r: u32, ) -> Weight {
 		// Proof Size summary in bytes:
-		//  Measured:  `830 + r * (6 ±0)`
-		//  Estimated: `6773 + r * (6 ±0)`
-		// Minimum execution time: 260_217_000 picoseconds.
-		Weight::from_parts(288_660_978, 6773)
-			// Standard Error: 1_199
-			.saturating_add(Weight::from_parts(550_304, 0).saturating_mul(r.into()))
+		//  Measured:  `863 + r * (6 ±0)`
+		//  Estimated: `6806 + r * (6 ±0)`
+		// Minimum execution time: 277_324_000 picoseconds.
+		Weight::from_parts(290_872_814, 6806)
+			// Standard Error: 766
+			.saturating_add(Weight::from_parts(371_542, 0).saturating_mul(r.into()))
 			.saturating_add(T::DbWeight::get().reads(8_u64))
 			.saturating_add(T::DbWeight::get().writes(3_u64))
 			.saturating_add(Weight::from_parts(0, 6).saturating_mul(r.into()))
@@ -737,12 +737,12 @@ impl<T: frame_system::Config> WeightInfo for SubstrateWeight<T> {
 	/// The range of component `r` is `[0, 1600]`.
 	fn seal_balance(r: u32, ) -> Weight {
 		// Proof Size summary in bytes:
-		//  Measured:  `974 + r * (6 ±0)`
-		//  Estimated: `6898 + r * (6 ±0)`
-		// Minimum execution time: 273_473_000 picoseconds.
-		Weight::from_parts(298_889_279, 6898)
-			// Standard Error: 4_604
-			.saturating_add(Weight::from_parts(1_630_175, 0).saturating_mul(r.into()))
+		//  Measured:  `1007 + r * (6 ±0)`
+		//  Estimated: `6931 + r * (6 ±0)`
+		// Minimum execution time: 274_460_000 picoseconds.
+		Weight::from_parts(285_748_025, 6931)
+			// Standard Error: 1_570
+			.saturating_add(Weight::from_parts(1_656_237, 0).saturating_mul(r.into()))
 			.saturating_add(T::DbWeight::get().reads(9_u64))
 			.saturating_add(T::DbWeight::get().writes(3_u64))
 			.saturating_add(Weight::from_parts(0, 6).saturating_mul(r.into()))
@@ -764,12 +764,12 @@ impl<T: frame_system::Config> WeightInfo for SubstrateWeight<T> {
 	/// The range of component `r` is `[0, 1600]`.
 	fn seal_value_transferred(r: u32, ) -> Weight {
 		// Proof Size summary in bytes:
-		//  Measured:  `844 + r * (6 ±0)`
-		//  Estimated: `6790 + r * (6 ±0)`
-		// Minimum execution time: 262_033_000 picoseconds.
-		Weight::from_parts(284_293_851, 6790)
-			// Standard Error: 591
-			.saturating_add(Weight::from_parts(369_240, 0).saturating_mul(r.into()))
+		//  Measured:  `877 + r * (6 ±0)`
+		//  Estimated: `6823 + r * (6 ±0)`
+		// Minimum execution time: 278_254_000 picoseconds.
+		Weight::from_parts(283_893_525, 6823)
+			// Standard Error: 726
+			.saturating_add(Weight::from_parts(347_368, 0).saturating_mul(r.into()))
 			.saturating_add(T::DbWeight::get().reads(8_u64))
 			.saturating_add(T::DbWeight::get().writes(3_u64))
 			.saturating_add(Weight::from_parts(0, 6).saturating_mul(r.into()))
@@ -791,12 +791,12 @@ impl<T: frame_system::Config> WeightInfo for SubstrateWeight<T> {
 	/// The range of component `r` is `[0, 1600]`.
 	fn seal_minimum_balance(r: u32, ) -> Weight {
 		// Proof Size summary in bytes:
-		//  Measured:  `842 + r * (6 ±0)`
-		//  Estimated: `6783 + r * (6 ±0)`
-		// Minimum execution time: 274_568_000 picoseconds.
-		Weight::from_parts(294_688_466, 6783)
-			// Standard Error: 768
-			.saturating_add(Weight::from_parts(349_584, 0).saturating_mul(r.into()))
+		//  Measured:  `875 + r * (6 ±0)`
+		//  Estimated: `6816 + r * (6 ±0)`
+		// Minimum execution time: 279_646_000 picoseconds.
+		Weight::from_parts(292_505_446, 6816)
+			// Standard Error: 867
+			.saturating_add(Weight::from_parts(337_202, 0).saturating_mul(r.into()))
 			.saturating_add(T::DbWeight::get().reads(8_u64))
 			.saturating_add(T::DbWeight::get().writes(3_u64))
 			.saturating_add(Weight::from_parts(0, 6).saturating_mul(r.into()))
@@ -818,12 +818,12 @@ impl<T: frame_system::Config> WeightInfo for SubstrateWeight<T> {
 	/// The range of component `r` is `[0, 1600]`.
 	fn seal_block_number(r: u32, ) -> Weight {
 		// Proof Size summary in bytes:
-		//  Measured:  `839 + r * (6 ±0)`
-		//  Estimated: `6786 + r * (6 ±0)`
-		// Minimum execution time: 264_061_000 picoseconds.
-		Weight::from_parts(287_964_188, 6786)
-			// Standard Error: 490
-			.saturating_add(Weight::from_parts(356_273, 0).saturating_mul(r.into()))
+		//  Measured:  `872 + r * (6 ±0)`
+		//  Estimated: `6819 + r * (6 ±0)`
+		// Minimum execution time: 274_522_000 picoseconds.
+		Weight::from_parts(295_135_659, 6819)
+			// Standard Error: 1_052
+			.saturating_add(Weight::from_parts(330_788, 0).saturating_mul(r.into()))
 			.saturating_add(T::DbWeight::get().reads(8_u64))
 			.saturating_add(T::DbWeight::get().writes(3_u64))
 			.saturating_add(Weight::from_parts(0, 6).saturating_mul(r.into()))
@@ -845,12 +845,12 @@ impl<T: frame_system::Config> WeightInfo for SubstrateWeight<T> {
 	/// The range of component `r` is `[0, 1600]`.
 	fn seal_now(r: u32, ) -> Weight {
 		// Proof Size summary in bytes:
-		//  Measured:  `830 + r * (6 ±0)`
-		//  Estimated: `6771 + r * (6 ±0)`
-		// Minimum execution time: 275_707_000 picoseconds.
-		Weight::from_parts(290_797_828, 6771)
-			// Standard Error: 967
-			.saturating_add(Weight::from_parts(352_839, 0).saturating_mul(r.into()))
+		//  Measured:  `863 + r * (6 ±0)`
+		//  Estimated: `6804 + r * (6 ±0)`
+		// Minimum execution time: 274_228_000 picoseconds.
+		Weight::from_parts(289_201_593, 6804)
+			// Standard Error: 752
+			.saturating_add(Weight::from_parts(337_860, 0).saturating_mul(r.into()))
 			.saturating_add(T::DbWeight::get().reads(8_u64))
 			.saturating_add(T::DbWeight::get().writes(3_u64))
 			.saturating_add(Weight::from_parts(0, 6).saturating_mul(r.into()))
@@ -874,12 +874,12 @@ impl<T: frame_system::Config> WeightInfo for SubstrateWeight<T> {
 	/// The range of component `r` is `[0, 1600]`.
 	fn seal_weight_to_fee(r: u32, ) -> Weight {
 		// Proof Size summary in bytes:
-		//  Measured:  `904 + r * (14 ±0)`
-		//  Estimated: `6839 + r * (14 ±0)`
-		// Minimum execution time: 272_492_000 picoseconds.
-		Weight::from_parts(295_010_878, 6839)
-			// Standard Error: 2_549
-			.saturating_add(Weight::from_parts(1_426_715, 0).saturating_mul(r.into()))
+		//  Measured:  `937 + r * (14 ±0)`
+		//  Estimated: `6872 + r * (14 ±0)`
+		// Minimum execution time: 277_142_000 picoseconds.
+		Weight::from_parts(296_736_114, 6872)
+			// Standard Error: 1_502
+			.saturating_add(Weight::from_parts(1_446_663, 0).saturating_mul(r.into()))
 			.saturating_add(T::DbWeight::get().reads(9_u64))
 			.saturating_add(T::DbWeight::get().writes(3_u64))
 			.saturating_add(Weight::from_parts(0, 14).saturating_mul(r.into()))
@@ -901,12 +901,12 @@ impl<T: frame_system::Config> WeightInfo for SubstrateWeight<T> {
 	/// The range of component `r` is `[0, 1600]`.
 	fn seal_input(r: u32, ) -> Weight {
 		// Proof Size summary in bytes:
-		//  Measured:  `832 + r * (6 ±0)`
-		//  Estimated: `6774 + r * (6 ±0)`
-		// Minimum execution time: 257_981_000 picoseconds.
-		Weight::from_parts(285_824_773, 6774)
-			// Standard Error: 704
-			.saturating_add(Weight::from_parts(301_327, 0).saturating_mul(r.into()))
+		//  Measured:  `865 + r * (6 ±0)`
+		//  Estimated: `6807 + r * (6 ±0)`
+		// Minimum execution time: 276_087_000 picoseconds.
+		Weight::from_parts(287_863_377, 6807)
+			// Standard Error: 495
+			.saturating_add(Weight::from_parts(282_718, 0).saturating_mul(r.into()))
 			.saturating_add(T::DbWeight::get().reads(8_u64))
 			.saturating_add(T::DbWeight::get().writes(3_u64))
 			.saturating_add(Weight::from_parts(0, 6).saturating_mul(r.into()))
@@ -928,12 +928,12 @@ impl<T: frame_system::Config> WeightInfo for SubstrateWeight<T> {
 	/// The range of component `n` is `[0, 1048576]`.
 	fn seal_input_per_byte(n: u32, ) -> Weight {
 		// Proof Size summary in bytes:
-		//  Measured:  `836`
-		//  Estimated: `6776`
-		// Minimum execution time: 259_470_000 picoseconds.
-		Weight::from_parts(232_759_442, 6776)
-			// Standard Error: 24
-			.saturating_add(Weight::from_parts(981, 0).saturating_mul(n.into()))
+		//  Measured:  `869`
+		//  Estimated: `6809`
+		// Minimum execution time: 277_128_000 picoseconds.
+		Weight::from_parts(234_478_674, 6809)
+			// Standard Error: 23
+			.saturating_add(Weight::from_parts(1_052, 0).saturating_mul(n.into()))
 			.saturating_add(T::DbWeight::get().reads(8_u64))
 			.saturating_add(T::DbWeight::get().writes(3_u64))
 	}
@@ -954,12 +954,10 @@ impl<T: frame_system::Config> WeightInfo for SubstrateWeight<T> {
 	/// The range of component `r` is `[0, 1]`.
 	fn seal_return(r: u32, ) -> Weight {
 		// Proof Size summary in bytes:
-		//  Measured:  `820 + r * (45 ±0)`
-		//  Estimated: `6760 + r * (45 ±0)`
-		// Minimum execution time: 252_740_000 picoseconds.
-		Weight::from_parts(278_155_436, 6760)
-			// Standard Error: 882_420
-			.saturating_add(Weight::from_parts(755_063, 0).saturating_mul(r.into()))
+		//  Measured:  `853 + r * (45 ±0)`
+		//  Estimated: `6793 + r * (45 ±0)`
+		// Minimum execution time: 251_983_000 picoseconds.
+		Weight::from_parts(277_986_885, 6793)
 			.saturating_add(T::DbWeight::get().reads(8_u64))
 			.saturating_add(T::DbWeight::get().writes(3_u64))
 			.saturating_add(Weight::from_parts(0, 45).saturating_mul(r.into()))
@@ -981,12 +979,12 @@ impl<T: frame_system::Config> WeightInfo for SubstrateWeight<T> {
 	/// The range of component `n` is `[0, 1048576]`.
 	fn seal_return_per_byte(n: u32, ) -> Weight {
 		// Proof Size summary in bytes:
-		//  Measured:  `830`
-		//  Estimated: `6777`
-		// Minimum execution time: 257_318_000 picoseconds.
-		Weight::from_parts(285_765_697, 6777)
-			// Standard Error: 1
-			.saturating_add(Weight::from_parts(322, 0).saturating_mul(n.into()))
+		//  Measured:  `863`
+		//  Estimated: `6810`
+		// Minimum execution time: 275_108_000 picoseconds.
+		Weight::from_parts(284_552_708, 6810)
+			// Standard Error: 0
+			.saturating_add(Weight::from_parts(391, 0).saturating_mul(n.into()))
 			.saturating_add(T::DbWeight::get().reads(8_u64))
 			.saturating_add(T::DbWeight::get().writes(3_u64))
 	}
@@ -1013,12 +1011,12 @@ impl<T: frame_system::Config> WeightInfo for SubstrateWeight<T> {
 	/// The range of component `r` is `[0, 1]`.
 	fn seal_terminate(r: u32, ) -> Weight {
 		// Proof Size summary in bytes:
-		//  Measured:  `2939 + r * (316 ±0)`
-		//  Estimated: `8879 + r * (5266 ±0)`
-		// Minimum execution time: 280_392_000 picoseconds.
-		Weight::from_parts(310_023_381, 8879)
-			// Standard Error: 1_008_026
-			.saturating_add(Weight::from_parts(130_208_818, 0).saturating_mul(r.into()))
+		//  Measured:  `2972 + r * (316 ±0)`
+		//  Estimated: `8912 + r * (5266 ±0)`
+		// Minimum execution time: 281_278_000 picoseconds.
+		Weight::from_parts(306_800_667, 8912)
+			// Standard Error: 855_257
+			.saturating_add(Weight::from_parts(126_508_132, 0).saturating_mul(r.into()))
 			.saturating_add(T::DbWeight::get().reads(8_u64))
 			.saturating_add(T::DbWeight::get().reads((7_u64).saturating_mul(r.into())))
 			.saturating_add(T::DbWeight::get().writes(3_u64))
@@ -1044,12 +1042,12 @@ impl<T: frame_system::Config> WeightInfo for SubstrateWeight<T> {
 	/// The range of component `r` is `[0, 1600]`.
 	fn seal_random(r: u32, ) -> Weight {
 		// Proof Size summary in bytes:
-		//  Measured:  `911 + r * (10 ±0)`
-		//  Estimated: `6852 + r * (10 ±0)`
-		// Minimum execution time: 270_547_000 picoseconds.
-		Weight::from_parts(295_931_189, 6852)
-			// Standard Error: 3_280
-			.saturating_add(Weight::from_parts(1_941_248, 0).saturating_mul(r.into()))
+		//  Measured:  `944 + r * (10 ±0)`
+		//  Estimated: `6885 + r * (10 ±0)`
+		// Minimum execution time: 260_609_000 picoseconds.
+		Weight::from_parts(287_385_076, 6885)
+			// Standard Error: 2_754
+			.saturating_add(Weight::from_parts(2_057_388, 0).saturating_mul(r.into()))
 			.saturating_add(T::DbWeight::get().reads(9_u64))
 			.saturating_add(T::DbWeight::get().writes(3_u64))
 			.saturating_add(Weight::from_parts(0, 10).saturating_mul(r.into()))
@@ -1071,12 +1069,12 @@ impl<T: frame_system::Config> WeightInfo for SubstrateWeight<T> {
 	/// The range of component `r` is `[0, 1600]`.
 	fn seal_deposit_event(r: u32, ) -> Weight {
 		// Proof Size summary in bytes:
-		//  Measured:  `830 + r * (10 ±0)`
-		//  Estimated: `6772 + r * (10 ±0)`
-		// Minimum execution time: 255_730_000 picoseconds.
-		Weight::from_parts(301_859_471, 6772)
-			// Standard Error: 5_401
-			.saturating_add(Weight::from_parts(3_887_632, 0).saturating_mul(r.into()))
+		//  Measured:  `863 + r * (10 ±0)`
+		//  Estimated: `6805 + r * (10 ±0)`
+		// Minimum execution time: 254_770_000 picoseconds.
+		Weight::from_parts(255_105_647, 6805)
+			// Standard Error: 5_707
+			.saturating_add(Weight::from_parts(3_808_788, 0).saturating_mul(r.into()))
 			.saturating_add(T::DbWeight::get().reads(8_u64))
 			.saturating_add(T::DbWeight::get().writes(3_u64))
 			.saturating_add(Weight::from_parts(0, 10).saturating_mul(r.into()))
@@ -1099,14 +1097,14 @@ impl<T: frame_system::Config> WeightInfo for SubstrateWeight<T> {
 	/// The range of component `n` is `[0, 16384]`.
 	fn seal_deposit_event_per_topic_and_byte(t: u32, n: u32, ) -> Weight {
 		// Proof Size summary in bytes:
-		//  Measured:  `847 + t * (32 ±0)`
-		//  Estimated: `6792 + t * (2508 ±0)`
-		// Minimum execution time: 276_643_000 picoseconds.
-		Weight::from_parts(294_275_838, 6792)
-			// Standard Error: 106_745
-			.saturating_add(Weight::from_parts(2_831_489, 0).saturating_mul(t.into()))
-			// Standard Error: 29
-			.saturating_add(Weight::from_parts(624, 0).saturating_mul(n.into()))
+		//  Measured:  `880 + t * (32 ±0)`
+		//  Estimated: `6825 + t * (2508 ±0)`
+		// Minimum execution time: 278_200_000 picoseconds.
+		Weight::from_parts(288_081_493, 6825)
+			// Standard Error: 97_535
+			.saturating_add(Weight::from_parts(3_683_455, 0).saturating_mul(t.into()))
+			// Standard Error: 27
+			.saturating_add(Weight::from_parts(731, 0).saturating_mul(n.into()))
 			.saturating_add(T::DbWeight::get().reads(8_u64))
 			.saturating_add(T::DbWeight::get().reads((1_u64).saturating_mul(t.into())))
 			.saturating_add(T::DbWeight::get().writes(3_u64))
@@ -1130,12 +1128,12 @@ impl<T: frame_system::Config> WeightInfo for SubstrateWeight<T> {
 	/// The range of component `r` is `[0, 1600]`.
 	fn seal_debug_message(r: u32, ) -> Weight {
 		// Proof Size summary in bytes:
-		//  Measured:  `829 + r * (7 ±0)`
-		//  Estimated: `6774 + r * (7 ±0)`
-		// Minimum execution time: 169_012_000 picoseconds.
-		Weight::from_parts(179_567_029, 6774)
-			// Standard Error: 534
-			.saturating_add(Weight::from_parts(249_500, 0).saturating_mul(r.into()))
+		//  Measured:  `862 + r * (7 ±0)`
+		//  Estimated: `6807 + r * (7 ±0)`
+		// Minimum execution time: 167_181_000 picoseconds.
+		Weight::from_parts(178_433_475, 6807)
+			// Standard Error: 374
+			.saturating_add(Weight::from_parts(241_240, 0).saturating_mul(r.into()))
 			.saturating_add(T::DbWeight::get().reads(8_u64))
 			.saturating_add(T::DbWeight::get().writes(3_u64))
 			.saturating_add(Weight::from_parts(0, 7).saturating_mul(r.into()))
@@ -1157,12 +1155,12 @@ impl<T: frame_system::Config> WeightInfo for SubstrateWeight<T> {
 	/// The range of component `i` is `[0, 1048576]`.
 	fn seal_debug_message_per_byte(i: u32, ) -> Weight {
 		// Proof Size summary in bytes:
-		//  Measured:  `125780`
-		//  Estimated: `131722`
-		// Minimum execution time: 408_647_000 picoseconds.
-		Weight::from_parts(387_678_006, 131722)
-			// Standard Error: 12
-			.saturating_add(Weight::from_parts(1_045, 0).saturating_mul(i.into()))
+		//  Measured:  `125813`
+		//  Estimated: `131755`
+		// Minimum execution time: 434_456_000 picoseconds.
+		Weight::from_parts(400_940_450, 131755)
+			// Standard Error: 13
+			.saturating_add(Weight::from_parts(1_102, 0).saturating_mul(i.into()))
 			.saturating_add(T::DbWeight::get().reads(8_u64))
 			.saturating_add(T::DbWeight::get().writes(3_u64))
 	}
@@ -1171,12 +1169,12 @@ impl<T: frame_system::Config> WeightInfo for SubstrateWeight<T> {
 	/// The range of component `r` is `[0, 800]`.
 	fn seal_set_storage(r: u32, ) -> Weight {
 		// Proof Size summary in bytes:
-		//  Measured:  `891 + r * (292 ±0)`
-		//  Estimated: `892 + r * (293 ±0)`
-		// Minimum execution time: 279_315_000 picoseconds.
-		Weight::from_parts(171_270_899, 892)
-			// Standard Error: 15_492
-			.saturating_add(Weight::from_parts(6_776_878, 0).saturating_mul(r.into()))
+		//  Measured:  `924 + r * (292 ±0)`
+		//  Estimated: `925 + r * (293 ±0)`
+		// Minimum execution time: 277_825_000 picoseconds.
+		Weight::from_parts(159_688_263, 925)
+			// Standard Error: 13_610
+			.saturating_add(Weight::from_parts(7_145_641, 0).saturating_mul(r.into()))
 			.saturating_add(T::DbWeight::get().reads(8_u64))
 			.saturating_add(T::DbWeight::get().reads((1_u64).saturating_mul(r.into())))
 			.saturating_add(T::DbWeight::get().writes(3_u64))
@@ -1188,12 +1186,12 @@ impl<T: frame_system::Config> WeightInfo for SubstrateWeight<T> {
 	/// The range of component `n` is `[0, 16384]`.
 	fn seal_set_storage_per_new_byte(n: u32, ) -> Weight {
 		// Proof Size summary in bytes:
-		//  Measured:  `1413`
-		//  Estimated: `1396`
-		// Minimum execution time: 289_666_000 picoseconds.
-		Weight::from_parts(348_062_625, 1396)
-			// Standard Error: 79
-			.saturating_add(Weight::from_parts(532, 0).saturating_mul(n.into()))
+		//  Measured:  `1446`
+		//  Estimated: `1429`
+		// Minimum execution time: 284_745_000 picoseconds.
+		Weight::from_parts(345_928_316, 1429)
+			// Standard Error: 70
+			.saturating_add(Weight::from_parts(547, 0).saturating_mul(n.into()))
 			.saturating_add(T::DbWeight::get().reads(12_u64))
 			.saturating_add(T::DbWeight::get().writes(8_u64))
 	}
@@ -1202,12 +1200,12 @@ impl<T: frame_system::Config> WeightInfo for SubstrateWeight<T> {
 	/// The range of component `n` is `[0, 16384]`.
 	fn seal_set_storage_per_old_byte(n: u32, ) -> Weight {
 		// Proof Size summary in bytes:
-		//  Measured:  `1219 + n * (1 ±0)`
-		//  Estimated: `1219 + n * (1 ±0)`
-		// Minimum execution time: 273_840_000 picoseconds.
-		Weight::from_parts(297_024_621, 1219)
-			// Standard Error: 55
-			.saturating_add(Weight::from_parts(945, 0).saturating_mul(n.into()))
+		//  Measured:  `1252 + n * (1 ±0)`
+		//  Estimated: `1252 + n * (1 ±0)`
+		// Minimum execution time: 275_328_000 picoseconds.
+		Weight::from_parts(300_037_010, 1252)
+			// Standard Error: 32
+			.saturating_add(Weight::from_parts(558, 0).saturating_mul(n.into()))
 			.saturating_add(T::DbWeight::get().reads(9_u64))
 			.saturating_add(T::DbWeight::get().writes(4_u64))
 			.saturating_add(Weight::from_parts(0, 1).saturating_mul(n.into()))
@@ -1217,12 +1215,12 @@ impl<T: frame_system::Config> WeightInfo for SubstrateWeight<T> {
 	/// The range of component `r` is `[0, 800]`.
 	fn seal_clear_storage(r: u32, ) -> Weight {
 		// Proof Size summary in bytes:
-		//  Measured:  `887 + r * (288 ±0)`
-		//  Estimated: `893 + r * (289 ±0)`
-		// Minimum execution time: 279_110_000 picoseconds.
-		Weight::from_parts(177_898_012, 893)
-			// Standard Error: 16_287
-			.saturating_add(Weight::from_parts(6_640_103, 0).saturating_mul(r.into()))
+		//  Measured:  `920 + r * (288 ±0)`
+		//  Estimated: `926 + r * (289 ±0)`
+		// Minimum execution time: 273_742_000 picoseconds.
+		Weight::from_parts(169_430_806, 926)
+			// Standard Error: 11_821
+			.saturating_add(Weight::from_parts(6_927_074, 0).saturating_mul(r.into()))
 			.saturating_add(T::DbWeight::get().reads(8_u64))
 			.saturating_add(T::DbWeight::get().reads((1_u64).saturating_mul(r.into())))
 			.saturating_add(T::DbWeight::get().writes(3_u64))
@@ -1234,10 +1232,12 @@ impl<T: frame_system::Config> WeightInfo for SubstrateWeight<T> {
 	/// The range of component `n` is `[0, 16384]`.
 	fn seal_clear_storage_per_byte(n: u32, ) -> Weight {
 		// Proof Size summary in bytes:
-		//  Measured:  `1215 + n * (1 ±0)`
-		//  Estimated: `1215 + n * (1 ±0)`
-		// Minimum execution time: 276_566_000 picoseconds.
-		Weight::from_parts(304_992_376, 1215)
+		//  Measured:  `1248 + n * (1 ±0)`
+		//  Estimated: `1248 + n * (1 ±0)`
+		// Minimum execution time: 275_167_000 picoseconds.
+		Weight::from_parts(301_883_655, 1248)
+			// Standard Error: 35
+			.saturating_add(Weight::from_parts(4, 0).saturating_mul(n.into()))
 			.saturating_add(T::DbWeight::get().reads(9_u64))
 			.saturating_add(T::DbWeight::get().writes(4_u64))
 			.saturating_add(Weight::from_parts(0, 1).saturating_mul(n.into()))
@@ -1247,12 +1247,12 @@ impl<T: frame_system::Config> WeightInfo for SubstrateWeight<T> {
 	/// The range of component `r` is `[0, 800]`.
 	fn seal_get_storage(r: u32, ) -> Weight {
 		// Proof Size summary in bytes:
-		//  Measured:  `887 + r * (296 ±0)`
-		//  Estimated: `889 + r * (297 ±0)`
-		// Minimum execution time: 266_285_000 picoseconds.
-		Weight::from_parts(200_488_939, 889)
-			// Standard Error: 11_193
-			.saturating_add(Weight::from_parts(5_467_725, 0).saturating_mul(r.into()))
+		//  Measured:  `920 + r * (296 ±0)`
+		//  Estimated: `922 + r * (297 ±0)`
+		// Minimum execution time: 274_628_000 picoseconds.
+		Weight::from_parts(195_255_092, 922)
+			// Standard Error: 9_109
+			.saturating_add(Weight::from_parts(5_707_060, 0).saturating_mul(r.into()))
 			.saturating_add(T::DbWeight::get().reads(8_u64))
 			.saturating_add(T::DbWeight::get().reads((1_u64).saturating_mul(r.into())))
 			.saturating_add(T::DbWeight::get().writes(3_u64))
@@ -1263,12 +1263,12 @@ impl<T: frame_system::Config> WeightInfo for SubstrateWeight<T> {
 	/// The range of component `n` is `[0, 16384]`.
 	fn seal_get_storage_per_byte(n: u32, ) -> Weight {
 		// Proof Size summary in bytes:
-		//  Measured:  `1231 + n * (1 ±0)`
-		//  Estimated: `1231 + n * (1 ±0)`
-		// Minimum execution time: 278_625_000 picoseconds.
-		Weight::from_parts(304_319_493, 1231)
-			// Standard Error: 39
-			.saturating_add(Weight::from_parts(415, 0).saturating_mul(n.into()))
+		//  Measured:  `1264 + n * (1 ±0)`
+		//  Estimated: `1264 + n * (1 ±0)`
+		// Minimum execution time: 274_202_000 picoseconds.
+		Weight::from_parts(296_440_752, 1264)
+			// Standard Error: 38
+			.saturating_add(Weight::from_parts(1_010, 0).saturating_mul(n.into()))
 			.saturating_add(T::DbWeight::get().reads(9_u64))
 			.saturating_add(T::DbWeight::get().writes(3_u64))
 			.saturating_add(Weight::from_parts(0, 1).saturating_mul(n.into()))
@@ -1278,12 +1278,12 @@ impl<T: frame_system::Config> WeightInfo for SubstrateWeight<T> {
 	/// The range of component `r` is `[0, 800]`.
 	fn seal_contains_storage(r: u32, ) -> Weight {
 		// Proof Size summary in bytes:
-		//  Measured:  `898 + r * (288 ±0)`
-		//  Estimated: `895 + r * (289 ±0)`
-		// Minimum execution time: 271_851_000 picoseconds.
-		Weight::from_parts(202_164_395, 895)
-			// Standard Error: 11_115
-			.saturating_add(Weight::from_parts(5_273_320, 0).saturating_mul(r.into()))
+		//  Measured:  `931 + r * (288 ±0)`
+		//  Estimated: `928 + r * (289 ±0)`
+		// Minimum execution time: 274_123_000 picoseconds.
+		Weight::from_parts(193_280_535, 928)
+			// Standard Error: 9_264
+			.saturating_add(Weight::from_parts(5_548_039, 0).saturating_mul(r.into()))
 			.saturating_add(T::DbWeight::get().reads(8_u64))
 			.saturating_add(T::DbWeight::get().reads((1_u64).saturating_mul(r.into())))
 			.saturating_add(T::DbWeight::get().writes(3_u64))
@@ -1294,12 +1294,12 @@ impl<T: frame_system::Config> WeightInfo for SubstrateWeight<T> {
 	/// The range of component `n` is `[0, 16384]`.
 	fn seal_contains_storage_per_byte(n: u32, ) -> Weight {
 		// Proof Size summary in bytes:
-		//  Measured:  `1218 + n * (1 ±0)`
-		//  Estimated: `1218 + n * (1 ±0)`
-		// Minimum execution time: 274_200_000 picoseconds.
-		Weight::from_parts(299_524_586, 1218)
-			// Standard Error: 33
-			.saturating_add(Weight::from_parts(272, 0).saturating_mul(n.into()))
+		//  Measured:  `1251 + n * (1 ±0)`
+		//  Estimated: `1251 + n * (1 ±0)`
+		// Minimum execution time: 276_425_000 picoseconds.
+		Weight::from_parts(300_521_806, 1251)
+			// Standard Error: 36
+			.saturating_add(Weight::from_parts(83, 0).saturating_mul(n.into()))
 			.saturating_add(T::DbWeight::get().reads(9_u64))
 			.saturating_add(T::DbWeight::get().writes(3_u64))
 			.saturating_add(Weight::from_parts(0, 1).saturating_mul(n.into()))
@@ -1309,12 +1309,12 @@ impl<T: frame_system::Config> WeightInfo for SubstrateWeight<T> {
 	/// The range of component `r` is `[0, 800]`.
 	fn seal_take_storage(r: u32, ) -> Weight {
 		// Proof Size summary in bytes:
-		//  Measured:  `880 + r * (296 ±0)`
-		//  Estimated: `885 + r * (297 ±0)`
-		// Minimum execution time: 258_535_000 picoseconds.
-		Weight::from_parts(190_468_808, 885)
-			// Standard Error: 11_940
-			.saturating_add(Weight::from_parts(6_737_079, 0).saturating_mul(r.into()))
+		//  Measured:  `913 + r * (296 ±0)`
+		//  Estimated: `918 + r * (297 ±0)`
+		// Minimum execution time: 264_860_000 picoseconds.
+		Weight::from_parts(191_561_777, 918)
+			// Standard Error: 10_678
+			.saturating_add(Weight::from_parts(6_895_457, 0).saturating_mul(r.into()))
 			.saturating_add(T::DbWeight::get().reads(8_u64))
 			.saturating_add(T::DbWeight::get().reads((1_u64).saturating_mul(r.into())))
 			.saturating_add(T::DbWeight::get().writes(3_u64))
@@ -1326,12 +1326,12 @@ impl<T: frame_system::Config> WeightInfo for SubstrateWeight<T> {
 	/// The range of component `n` is `[0, 16384]`.
 	fn seal_take_storage_per_byte(n: u32, ) -> Weight {
 		// Proof Size summary in bytes:
-		//  Measured:  `1232 + n * (1 ±0)`
-		//  Estimated: `1232 + n * (1 ±0)`
-		// Minimum execution time: 280_536_000 picoseconds.
-		Weight::from_parts(304_479_477, 1232)
+		//  Measured:  `1265 + n * (1 ±0)`
+		//  Estimated: `1265 + n * (1 ±0)`
+		// Minimum execution time: 282_501_000 picoseconds.
+		Weight::from_parts(303_351_919, 1265)
 			// Standard Error: 37
-			.saturating_add(Weight::from_parts(534, 0).saturating_mul(n.into()))
+			.saturating_add(Weight::from_parts(643, 0).saturating_mul(n.into()))
 			.saturating_add(T::DbWeight::get().reads(9_u64))
 			.saturating_add(T::DbWeight::get().writes(4_u64))
 			.saturating_add(Weight::from_parts(0, 1).saturating_mul(n.into()))
@@ -1353,12 +1353,12 @@ impl<T: frame_system::Config> WeightInfo for SubstrateWeight<T> {
 	/// The range of component `r` is `[0, 1600]`.
 	fn seal_transfer(r: u32, ) -> Weight {
 		// Proof Size summary in bytes:
-		//  Measured:  `1382 + r * (45 ±0)`
-		//  Estimated: `7274 + r * (2520 ±0)`
-		// Minimum execution time: 260_373_000 picoseconds.
-		Weight::from_parts(278_290_000, 7274)
-			// Standard Error: 25_683
-			.saturating_add(Weight::from_parts(39_264_864, 0).saturating_mul(r.into()))
+		//  Measured:  `1415 + r * (45 ±0)`
+		//  Estimated: `7307 + r * (2520 ±0)`
+		// Minimum execution time: 273_198_000 picoseconds.
+		Weight::from_parts(179_673_238, 7307)
+			// Standard Error: 34_990
+			.saturating_add(Weight::from_parts(38_468_091, 0).saturating_mul(r.into()))
 			.saturating_add(T::DbWeight::get().reads(9_u64))
 			.saturating_add(T::DbWeight::get().reads((1_u64).saturating_mul(r.into())))
 			.saturating_add(T::DbWeight::get().writes(4_u64))
@@ -1382,12 +1382,12 @@ impl<T: frame_system::Config> WeightInfo for SubstrateWeight<T> {
 	/// The range of component `r` is `[0, 800]`.
 	fn seal_call(r: u32, ) -> Weight {
 		// Proof Size summary in bytes:
-		//  Measured:  `1227 + r * (245 ±0)`
-		//  Estimated: `9407 + r * (2721 ±0)`
-		// Minimum execution time: 277_621_000 picoseconds.
-		Weight::from_parts(281_775_000, 9407)
-			// Standard Error: 110_802
-			.saturating_add(Weight::from_parts(245_363_533, 0).saturating_mul(r.into()))
+		//  Measured:  `1260 + r * (245 ±0)`
+		//  Estimated: `9440 + r * (2721 ±0)`
+		// Minimum execution time: 283_869_000 picoseconds.
+		Weight::from_parts(288_374_000, 9440)
+			// Standard Error: 137_512
+			.saturating_add(Weight::from_parts(248_206_665, 0).saturating_mul(r.into()))
 			.saturating_add(T::DbWeight::get().reads(11_u64))
 			.saturating_add(T::DbWeight::get().reads((2_u64).saturating_mul(r.into())))
 			.saturating_add(T::DbWeight::get().writes(4_u64))
@@ -1412,11 +1412,11 @@ impl<T: frame_system::Config> WeightInfo for SubstrateWeight<T> {
 	fn seal_delegate_call(r: u32, ) -> Weight {
 		// Proof Size summary in bytes:
 		//  Measured:  `0 + r * (576 ±0)`
-		//  Estimated: `6779 + r * (2637 ±3)`
-		// Minimum execution time: 267_314_000 picoseconds.
-		Weight::from_parts(279_888_000, 6779)
-			// Standard Error: 144_378
-			.saturating_add(Weight::from_parts(244_606_414, 0).saturating_mul(r.into()))
+		//  Estimated: `6812 + r * (2637 ±3)`
+		// Minimum execution time: 257_577_000 picoseconds.
+		Weight::from_parts(277_310_000, 6812)
+			// Standard Error: 150_204
+			.saturating_add(Weight::from_parts(249_943_483, 0).saturating_mul(r.into()))
 			.saturating_add(T::DbWeight::get().reads(8_u64))
 			.saturating_add(T::DbWeight::get().reads((3_u64).saturating_mul(r.into())))
 			.saturating_add(T::DbWeight::get().writes(3_u64))
@@ -1441,14 +1441,14 @@ impl<T: frame_system::Config> WeightInfo for SubstrateWeight<T> {
 	/// The range of component `c` is `[0, 1048576]`.
 	fn seal_call_per_transfer_clone_byte(t: u32, c: u32, ) -> Weight {
 		// Proof Size summary in bytes:
-		//  Measured:  `1274 + t * (277 ±0)`
-		//  Estimated: `12164 + t * (5227 ±0)`
-		// Minimum execution time: 477_589_000 picoseconds.
-		Weight::from_parts(70_712_793, 12164)
-			// Standard Error: 11_713_135
-			.saturating_add(Weight::from_parts(375_371_698, 0).saturating_mul(t.into()))
+		//  Measured:  `1307 + t * (277 ±0)`
+		//  Estimated: `12197 + t * (5227 ±0)`
+		// Minimum execution time: 471_081_000 picoseconds.
+		Weight::from_parts(79_081_122, 12197)
+			// Standard Error: 11_777_790
+			.saturating_add(Weight::from_parts(357_425_411, 0).saturating_mul(t.into()))
 			// Standard Error: 17
-			.saturating_add(Weight::from_parts(991, 0).saturating_mul(c.into()))
+			.saturating_add(Weight::from_parts(1_111, 0).saturating_mul(c.into()))
 			.saturating_add(T::DbWeight::get().reads(13_u64))
 			.saturating_add(T::DbWeight::get().reads((2_u64).saturating_mul(t.into())))
 			.saturating_add(T::DbWeight::get().writes(6_u64))
@@ -1469,19 +1469,19 @@ impl<T: frame_system::Config> WeightInfo for SubstrateWeight<T> {
 	/// Proof: `Timestamp::Now` (`max_values`: Some(1), `max_size`: Some(8), added: 503, mode: `Measured`)
 	/// Storage: `Contracts::Nonce` (r:1 w:1)
 	/// Proof: `Contracts::Nonce` (`max_values`: Some(1), `max_size`: Some(8), added: 503, mode: `Measured`)
-	/// Storage: `Balances::Holds` (r:800 w:800)
-	/// Proof: `Balances::Holds` (`max_values`: None, `max_size`: Some(85), added: 2560, mode: `Measured`)
 	/// Storage: `System::EventTopics` (r:803 w:803)
 	/// Proof: `System::EventTopics` (`max_values`: None, `max_size`: None, mode: `Measured`)
+	/// Storage: `Balances::Holds` (r:800 w:800)
+	/// Proof: `Balances::Holds` (`max_values`: None, `max_size`: Some(85), added: 2560, mode: `Measured`)
 	/// The range of component `r` is `[1, 800]`.
 	fn seal_instantiate(r: u32, ) -> Weight {
 		// Proof Size summary in bytes:
-		//  Measured:  `1245 + r * (255 ±0)`
-		//  Estimated: `9587 + r * (2731 ±0)`
-		// Minimum execution time: 662_502_000 picoseconds.
-		Weight::from_parts(671_726_000, 9587)
-			// Standard Error: 351_643
-			.saturating_add(Weight::from_parts(390_457_971, 0).saturating_mul(r.into()))
+		//  Measured:  `1278 + r * (255 ±0)`
+		//  Estimated: `9620 + r * (2731 ±0)`
+		// Minimum execution time: 672_742_000 picoseconds.
+		Weight::from_parts(680_025_000, 9620)
+			// Standard Error: 313_642
+			.saturating_add(Weight::from_parts(388_311_259, 0).saturating_mul(r.into()))
 			.saturating_add(T::DbWeight::get().reads(11_u64))
 			.saturating_add(T::DbWeight::get().reads((6_u64).saturating_mul(r.into())))
 			.saturating_add(T::DbWeight::get().writes(7_u64))
@@ -1502,25 +1502,23 @@ impl<T: frame_system::Config> WeightInfo for SubstrateWeight<T> {
 	/// Proof: `Timestamp::Now` (`max_values`: Some(1), `max_size`: Some(8), added: 503, mode: `Measured`)
 	/// Storage: `Contracts::Nonce` (r:1 w:1)
 	/// Proof: `Contracts::Nonce` (`max_values`: Some(1), `max_size`: Some(8), added: 503, mode: `Measured`)
-	/// Storage: `Balances::Holds` (r:1 w:1)
-	/// Proof: `Balances::Holds` (`max_values`: None, `max_size`: Some(85), added: 2560, mode: `Measured`)
 	/// Storage: `System::EventTopics` (r:4 w:4)
 	/// Proof: `System::EventTopics` (`max_values`: None, `max_size`: None, mode: `Measured`)
+	/// Storage: `Balances::Holds` (r:1 w:1)
+	/// Proof: `Balances::Holds` (`max_values`: None, `max_size`: Some(85), added: 2560, mode: `Measured`)
 	/// The range of component `t` is `[0, 1]`.
 	/// The range of component `i` is `[0, 983040]`.
 	/// The range of component `s` is `[0, 983040]`.
 	fn seal_instantiate_per_transfer_input_salt_byte(t: u32, i: u32, s: u32, ) -> Weight {
 		// Proof Size summary in bytes:
-		//  Measured:  `1270 + t * (104 ±0)`
-		//  Estimated: `12178 + t * (2549 ±1)`
-		// Minimum execution time: 2_675_525_000 picoseconds.
-		Weight::from_parts(851_421_242, 12178)
-			// Standard Error: 7_094_722
-			.saturating_add(Weight::from_parts(112_457_697, 0).saturating_mul(t.into()))
-			// Standard Error: 11
-			.saturating_add(Weight::from_parts(1_867, 0).saturating_mul(i.into()))
-			// Standard Error: 11
-			.saturating_add(Weight::from_parts(1_931, 0).saturating_mul(s.into()))
+		//  Measured:  `1303 + t * (104 ±0)`
+		//  Estimated: `12211 + t * (2549 ±1)`
+		// Minimum execution time: 2_733_870_000 picoseconds.
+		Weight::from_parts(1_001_793_458, 12211)
+			// Standard Error: 12
+			.saturating_add(Weight::from_parts(1_963, 0).saturating_mul(i.into()))
+			// Standard Error: 12
+			.saturating_add(Weight::from_parts(2_060, 0).saturating_mul(s.into()))
 			.saturating_add(T::DbWeight::get().reads(16_u64))
 			.saturating_add(T::DbWeight::get().reads((1_u64).saturating_mul(t.into())))
 			.saturating_add(T::DbWeight::get().writes(11_u64))
@@ -1544,12 +1542,12 @@ impl<T: frame_system::Config> WeightInfo for SubstrateWeight<T> {
 	/// The range of component `r` is `[0, 1600]`.
 	fn seal_hash_sha2_256(r: u32, ) -> Weight {
 		// Proof Size summary in bytes:
-		//  Measured:  `829 + r * (8 ±0)`
-		//  Estimated: `6768 + r * (8 ±0)`
-		// Minimum execution time: 270_818_000 picoseconds.
-		Weight::from_parts(286_520_166, 6768)
-			// Standard Error: 575
-			.saturating_add(Weight::from_parts(402_286, 0).saturating_mul(r.into()))
+		//  Measured:  `862 + r * (8 ±0)`
+		//  Estimated: `6801 + r * (8 ±0)`
+		// Minimum execution time: 272_658_000 picoseconds.
+		Weight::from_parts(282_717_645, 6801)
+			// Standard Error: 517
+			.saturating_add(Weight::from_parts(400_604, 0).saturating_mul(r.into()))
 			.saturating_add(T::DbWeight::get().reads(8_u64))
 			.saturating_add(T::DbWeight::get().writes(3_u64))
 			.saturating_add(Weight::from_parts(0, 8).saturating_mul(r.into()))
@@ -1571,12 +1569,12 @@ impl<T: frame_system::Config> WeightInfo for SubstrateWeight<T> {
 	/// The range of component `n` is `[0, 1048576]`.
 	fn seal_hash_sha2_256_per_byte(n: u32, ) -> Weight {
 		// Proof Size summary in bytes:
-		//  Measured:  `837`
-		//  Estimated: `6775`
-		// Minimum execution time: 257_134_000 picoseconds.
-		Weight::from_parts(268_214_648, 6775)
-			// Standard Error: 1
-			.saturating_add(Weight::from_parts(1_098, 0).saturating_mul(n.into()))
+		//  Measured:  `870`
+		//  Estimated: `6808`
+		// Minimum execution time: 260_969_000 picoseconds.
+		Weight::from_parts(265_206_847, 6808)
+			// Standard Error: 2
+			.saturating_add(Weight::from_parts(1_134, 0).saturating_mul(n.into()))
 			.saturating_add(T::DbWeight::get().reads(8_u64))
 			.saturating_add(T::DbWeight::get().writes(3_u64))
 	}
@@ -1597,12 +1595,12 @@ impl<T: frame_system::Config> WeightInfo for SubstrateWeight<T> {
 	/// The range of component `r` is `[0, 1600]`.
 	fn seal_hash_keccak_256(r: u32, ) -> Weight {
 		// Proof Size summary in bytes:
-		//  Measured:  `831 + r * (8 ±0)`
-		//  Estimated: `6773 + r * (8 ±0)`
-		// Minimum execution time: 259_222_000 picoseconds.
-		Weight::from_parts(283_273_283, 6773)
-			// Standard Error: 967
-			.saturating_add(Weight::from_parts(817_596, 0).saturating_mul(r.into()))
+		//  Measured:  `864 + r * (8 ±0)`
+		//  Estimated: `6806 + r * (8 ±0)`
+		// Minimum execution time: 262_351_000 picoseconds.
+		Weight::from_parts(286_974_296, 6806)
+			// Standard Error: 514
+			.saturating_add(Weight::from_parts(802_363, 0).saturating_mul(r.into()))
 			.saturating_add(T::DbWeight::get().reads(8_u64))
 			.saturating_add(T::DbWeight::get().writes(3_u64))
 			.saturating_add(Weight::from_parts(0, 8).saturating_mul(r.into()))
@@ -1624,12 +1622,12 @@ impl<T: frame_system::Config> WeightInfo for SubstrateWeight<T> {
 	/// The range of component `n` is `[0, 1048576]`.
 	fn seal_hash_keccak_256_per_byte(n: u32, ) -> Weight {
 		// Proof Size summary in bytes:
-		//  Measured:  `839`
-		//  Estimated: `6781`
-		// Minimum execution time: 260_040_000 picoseconds.
-		Weight::from_parts(283_869_860, 6781)
+		//  Measured:  `872`
+		//  Estimated: `6814`
+		// Minimum execution time: 276_907_000 picoseconds.
+		Weight::from_parts(277_928_418, 6814)
 			// Standard Error: 1
-			.saturating_add(Weight::from_parts(3_349, 0).saturating_mul(n.into()))
+			.saturating_add(Weight::from_parts(3_410, 0).saturating_mul(n.into()))
 			.saturating_add(T::DbWeight::get().reads(8_u64))
 			.saturating_add(T::DbWeight::get().writes(3_u64))
 	}
@@ -1650,12 +1648,12 @@ impl<T: frame_system::Config> WeightInfo for SubstrateWeight<T> {
 	/// The range of component `r` is `[0, 1600]`.
 	fn seal_hash_blake2_256(r: u32, ) -> Weight {
 		// Proof Size summary in bytes:
-		//  Measured:  `831 + r * (8 ±0)`
-		//  Estimated: `6775 + r * (8 ±0)`
-		// Minimum execution time: 260_698_000 picoseconds.
-		Weight::from_parts(282_900_345, 6775)
-			// Standard Error: 805
-			.saturating_add(Weight::from_parts(469_457, 0).saturating_mul(r.into()))
+		//  Measured:  `864 + r * (8 ±0)`
+		//  Estimated: `6808 + r * (8 ±0)`
+		// Minimum execution time: 263_660_000 picoseconds.
+		Weight::from_parts(285_665_916, 6808)
+			// Standard Error: 527
+			.saturating_add(Weight::from_parts(480_457, 0).saturating_mul(r.into()))
 			.saturating_add(T::DbWeight::get().reads(8_u64))
 			.saturating_add(T::DbWeight::get().writes(3_u64))
 			.saturating_add(Weight::from_parts(0, 8).saturating_mul(r.into()))
@@ -1677,12 +1675,12 @@ impl<T: frame_system::Config> WeightInfo for SubstrateWeight<T> {
 	/// The range of component `n` is `[0, 1048576]`.
 	fn seal_hash_blake2_256_per_byte(n: u32, ) -> Weight {
 		// Proof Size summary in bytes:
-		//  Measured:  `839`
-		//  Estimated: `6780`
-		// Minimum execution time: 256_967_000 picoseconds.
-		Weight::from_parts(273_024_512, 6780)
+		//  Measured:  `872`
+		//  Estimated: `6813`
+		// Minimum execution time: 262_071_000 picoseconds.
+		Weight::from_parts(270_115_341, 6813)
 			// Standard Error: 1
-			.saturating_add(Weight::from_parts(1_204, 0).saturating_mul(n.into()))
+			.saturating_add(Weight::from_parts(1_254, 0).saturating_mul(n.into()))
 			.saturating_add(T::DbWeight::get().reads(8_u64))
 			.saturating_add(T::DbWeight::get().writes(3_u64))
 	}
@@ -1703,12 +1701,12 @@ impl<T: frame_system::Config> WeightInfo for SubstrateWeight<T> {
 	/// The range of component `r` is `[0, 1600]`.
 	fn seal_hash_blake2_128(r: u32, ) -> Weight {
 		// Proof Size summary in bytes:
-		//  Measured:  `831 + r * (8 ±0)`
-		//  Estimated: `6772 + r * (8 ±0)`
-		// Minimum execution time: 272_039_000 picoseconds.
-		Weight::from_parts(289_853_116, 6772)
+		//  Measured:  `864 + r * (8 ±0)`
+		//  Estimated: `6805 + r * (8 ±0)`
+		// Minimum execution time: 265_568_000 picoseconds.
+		Weight::from_parts(285_791_811, 6805)
 			// Standard Error: 559
-			.saturating_add(Weight::from_parts(459_383, 0).saturating_mul(r.into()))
+			.saturating_add(Weight::from_parts(505_330, 0).saturating_mul(r.into()))
 			.saturating_add(T::DbWeight::get().reads(8_u64))
 			.saturating_add(T::DbWeight::get().writes(3_u64))
 			.saturating_add(Weight::from_parts(0, 8).saturating_mul(r.into()))
@@ -1730,12 +1728,12 @@ impl<T: frame_system::Config> WeightInfo for SubstrateWeight<T> {
 	/// The range of component `n` is `[0, 1048576]`.
 	fn seal_hash_blake2_128_per_byte(n: u32, ) -> Weight {
 		// Proof Size summary in bytes:
-		//  Measured:  `839`
-		//  Estimated: `6778`
-		// Minimum execution time: 253_913_000 picoseconds.
-		Weight::from_parts(274_682_010, 6778)
-			// Standard Error: 1
-			.saturating_add(Weight::from_parts(1_204, 0).saturating_mul(n.into()))
+		//  Measured:  `872`
+		//  Estimated: `6811`
+		// Minimum execution time: 271_336_000 picoseconds.
+		Weight::from_parts(272_829_313, 6811)
+			// Standard Error: 0
+			.saturating_add(Weight::from_parts(1_252, 0).saturating_mul(n.into()))
 			.saturating_add(T::DbWeight::get().reads(8_u64))
 			.saturating_add(T::DbWeight::get().writes(3_u64))
 	}
@@ -1756,12 +1754,12 @@ impl<T: frame_system::Config> WeightInfo for SubstrateWeight<T> {
 	/// The range of component `n` is `[0, 125697]`.
 	fn seal_sr25519_verify_per_byte(n: u32, ) -> Weight {
 		// Proof Size summary in bytes:
-		//  Measured:  `964 + n * (1 ±0)`
-		//  Estimated: `6901 + n * (1 ±0)`
-		// Minimum execution time: 343_955_000 picoseconds.
-		Weight::from_parts(350_777_388, 6901)
+		//  Measured:  `997 + n * (1 ±0)`
+		//  Estimated: `6934 + n * (1 ±0)`
+		// Minimum execution time: 351_146_000 picoseconds.
+		Weight::from_parts(355_368_323, 6934)
 			// Standard Error: 14
-			.saturating_add(Weight::from_parts(5_915, 0).saturating_mul(n.into()))
+			.saturating_add(Weight::from_parts(6_155, 0).saturating_mul(n.into()))
 			.saturating_add(T::DbWeight::get().reads(8_u64))
 			.saturating_add(T::DbWeight::get().writes(3_u64))
 			.saturating_add(Weight::from_parts(0, 1).saturating_mul(n.into()))
@@ -1783,12 +1781,12 @@ impl<T: frame_system::Config> WeightInfo for SubstrateWeight<T> {
 	/// The range of component `r` is `[0, 160]`.
 	fn seal_sr25519_verify(r: u32, ) -> Weight {
 		// Proof Size summary in bytes:
-		//  Measured:  `774 + r * (112 ±0)`
-		//  Estimated: `6715 + r * (112 ±0)`
-		// Minimum execution time: 268_698_000 picoseconds.
-		Weight::from_parts(336_398_814, 6715)
-			// Standard Error: 16_627
-			.saturating_add(Weight::from_parts(56_155_384, 0).saturating_mul(r.into()))
+		//  Measured:  `807 + r * (112 ±0)`
+		//  Estimated: `6748 + r * (112 ±0)`
+		// Minimum execution time: 277_250_000 picoseconds.
+		Weight::from_parts(346_490_114, 6748)
+			// Standard Error: 14_654
+			.saturating_add(Weight::from_parts(56_127_492, 0).saturating_mul(r.into()))
 			.saturating_add(T::DbWeight::get().reads(8_u64))
 			.saturating_add(T::DbWeight::get().writes(3_u64))
 			.saturating_add(Weight::from_parts(0, 112).saturating_mul(r.into()))
@@ -1810,12 +1808,12 @@ impl<T: frame_system::Config> WeightInfo for SubstrateWeight<T> {
 	/// The range of component `r` is `[0, 160]`.
 	fn seal_ecdsa_recover(r: u32, ) -> Weight {
 		// Proof Size summary in bytes:
-		//  Measured:  `874 + r * (76 ±0)`
-		//  Estimated: `6768 + r * (77 ±0)`
-		// Minimum execution time: 258_906_000 picoseconds.
-		Weight::from_parts(340_672_829, 6768)
-			// Standard Error: 18_295
-			.saturating_add(Weight::from_parts(46_106_884, 0).saturating_mul(r.into()))
+		//  Measured:  `907 + r * (76 ±0)`
+		//  Estimated: `6801 + r * (77 ±0)`
+		// Minimum execution time: 272_697_000 picoseconds.
+		Weight::from_parts(345_385_667, 6801)
+			// Standard Error: 14_226
+			.saturating_add(Weight::from_parts(46_037_637, 0).saturating_mul(r.into()))
 			.saturating_add(T::DbWeight::get().reads(8_u64))
 			.saturating_add(T::DbWeight::get().writes(3_u64))
 			.saturating_add(Weight::from_parts(0, 77).saturating_mul(r.into()))
@@ -1837,12 +1835,12 @@ impl<T: frame_system::Config> WeightInfo for SubstrateWeight<T> {
 	/// The range of component `r` is `[0, 160]`.
 	fn seal_ecdsa_to_eth_address(r: u32, ) -> Weight {
 		// Proof Size summary in bytes:
-		//  Measured:  `844 + r * (42 ±0)`
-		//  Estimated: `6783 + r * (42 ±0)`
-		// Minimum execution time: 275_105_000 picoseconds.
-		Weight::from_parts(313_700_348, 6783)
-			// Standard Error: 11_960
-			.saturating_add(Weight::from_parts(12_050_300, 0).saturating_mul(r.into()))
+		//  Measured:  `877 + r * (42 ±0)`
+		//  Estimated: `6816 + r * (42 ±0)`
+		// Minimum execution time: 271_800_000 picoseconds.
+		Weight::from_parts(314_891_136, 6816)
+			// Standard Error: 9_762
+			.saturating_add(Weight::from_parts(11_949_979, 0).saturating_mul(r.into()))
 			.saturating_add(T::DbWeight::get().reads(8_u64))
 			.saturating_add(T::DbWeight::get().writes(3_u64))
 			.saturating_add(Weight::from_parts(0, 42).saturating_mul(r.into()))
@@ -1865,11 +1863,11 @@ impl<T: frame_system::Config> WeightInfo for SubstrateWeight<T> {
 	fn seal_set_code_hash(r: u32, ) -> Weight {
 		// Proof Size summary in bytes:
 		//  Measured:  `0 + r * (965 ±0)`
-		//  Estimated: `6774 + r * (3090 ±7)`
-		// Minimum execution time: 259_178_000 picoseconds.
-		Weight::from_parts(275_643_000, 6774)
-			// Standard Error: 54_044
-			.saturating_add(Weight::from_parts(26_026_930, 0).saturating_mul(r.into()))
+		//  Estimated: `6807 + r * (3090 ±10)`
+		// Minimum execution time: 274_238_000 picoseconds.
+		Weight::from_parts(278_034_000, 6807)
+			// Standard Error: 77_011
+			.saturating_add(Weight::from_parts(27_627_005, 0).saturating_mul(r.into()))
 			.saturating_add(T::DbWeight::get().reads(8_u64))
 			.saturating_add(T::DbWeight::get().reads((3_u64).saturating_mul(r.into())))
 			.saturating_add(T::DbWeight::get().writes(3_u64))
@@ -1893,12 +1891,12 @@ impl<T: frame_system::Config> WeightInfo for SubstrateWeight<T> {
 	/// The range of component `r` is `[0, 32]`.
 	fn add_delegate_dependency(r: u32, ) -> Weight {
 		// Proof Size summary in bytes:
-		//  Measured:  `895 + r * (131 ±0)`
-		//  Estimated: `6845 + r * (2606 ±0)`
-		// Minimum execution time: 263_386_000 picoseconds.
-		Weight::from_parts(295_443_439, 6845)
-			// Standard Error: 24_422
-			.saturating_add(Weight::from_parts(6_429_537, 0).saturating_mul(r.into()))
+		//  Measured:  `928 + r * (131 ±0)`
+		//  Estimated: `6878 + r * (2606 ±0)`
+		// Minimum execution time: 271_519_000 picoseconds.
+		Weight::from_parts(292_726_476, 6878)
+			// Standard Error: 23_870
+			.saturating_add(Weight::from_parts(6_695_172, 0).saturating_mul(r.into()))
 			.saturating_add(T::DbWeight::get().reads(8_u64))
 			.saturating_add(T::DbWeight::get().reads((1_u64).saturating_mul(r.into())))
 			.saturating_add(T::DbWeight::get().writes(3_u64))
@@ -1922,12 +1920,12 @@ impl<T: frame_system::Config> WeightInfo for SubstrateWeight<T> {
 	/// The range of component `r` is `[0, 32]`.
 	fn remove_delegate_dependency(r: u32, ) -> Weight {
 		// Proof Size summary in bytes:
-		//  Measured:  `936 + r * (183 ±0)`
+		//  Measured:  `969 + r * (183 ±0)`
 		//  Estimated: `129453 + r * (2568 ±0)`
-		// Minimum execution time: 261_371_000 picoseconds.
-		Weight::from_parts(297_493_194, 129453)
-			// Standard Error: 23_734
-			.saturating_add(Weight::from_parts(5_673_169, 0).saturating_mul(r.into()))
+		// Minimum execution time: 274_675_000 picoseconds.
+		Weight::from_parts(293_727_489, 129453)
+			// Standard Error: 23_160
+			.saturating_add(Weight::from_parts(5_895_043, 0).saturating_mul(r.into()))
 			.saturating_add(T::DbWeight::get().reads(8_u64))
 			.saturating_add(T::DbWeight::get().reads((1_u64).saturating_mul(r.into())))
 			.saturating_add(T::DbWeight::get().writes(3_u64))
@@ -1951,12 +1949,12 @@ impl<T: frame_system::Config> WeightInfo for SubstrateWeight<T> {
 	/// The range of component `r` is `[0, 1600]`.
 	fn seal_reentrance_count(r: u32, ) -> Weight {
 		// Proof Size summary in bytes:
-		//  Measured:  `825 + r * (3 ±0)`
-		//  Estimated: `6771 + r * (3 ±0)`
-		// Minimum execution time: 275_558_000 picoseconds.
-		Weight::from_parts(287_220_765, 6771)
-			// Standard Error: 437
-			.saturating_add(Weight::from_parts(184_125, 0).saturating_mul(r.into()))
+		//  Measured:  `858 + r * (3 ±0)`
+		//  Estimated: `6804 + r * (3 ±0)`
+		// Minimum execution time: 253_330_000 picoseconds.
+		Weight::from_parts(281_079_564, 6804)
+			// Standard Error: 378
+			.saturating_add(Weight::from_parts(180_655, 0).saturating_mul(r.into()))
 			.saturating_add(T::DbWeight::get().reads(8_u64))
 			.saturating_add(T::DbWeight::get().writes(3_u64))
 			.saturating_add(Weight::from_parts(0, 3).saturating_mul(r.into()))
@@ -1978,12 +1976,12 @@ impl<T: frame_system::Config> WeightInfo for SubstrateWeight<T> {
 	/// The range of component `r` is `[0, 1600]`.
 	fn seal_account_reentrance_count(r: u32, ) -> Weight {
 		// Proof Size summary in bytes:
-		//  Measured:  `2076 + r * (39 ±0)`
-		//  Estimated: `7866 + r * (40 ±0)`
-		// Minimum execution time: 265_752_000 picoseconds.
-		Weight::from_parts(331_187_665, 7866)
-			// Standard Error: 1_950
-			.saturating_add(Weight::from_parts(312_262, 0).saturating_mul(r.into()))
+		//  Measured:  `2109 + r * (39 ±0)`
+		//  Estimated: `7899 + r * (40 ±0)`
+		// Minimum execution time: 276_552_000 picoseconds.
+		Weight::from_parts(368_521_088, 7899)
+			// Standard Error: 2_310
+			.saturating_add(Weight::from_parts(318_129, 0).saturating_mul(r.into()))
 			.saturating_add(T::DbWeight::get().reads(8_u64))
 			.saturating_add(T::DbWeight::get().writes(3_u64))
 			.saturating_add(Weight::from_parts(0, 40).saturating_mul(r.into()))
@@ -2007,12 +2005,12 @@ impl<T: frame_system::Config> WeightInfo for SubstrateWeight<T> {
 	/// The range of component `r` is `[0, 1600]`.
 	fn seal_instantiation_nonce(r: u32, ) -> Weight {
 		// Proof Size summary in bytes:
-		//  Measured:  `828 + r * (3 ±0)`
-		//  Estimated: `6768 + r * (3 ±0)`
-		// Minimum execution time: 257_114_000 picoseconds.
-		Weight::from_parts(286_686_654, 6768)
-			// Standard Error: 426
-			.saturating_add(Weight::from_parts(162_295, 0).saturating_mul(r.into()))
+		//  Measured:  `861 + r * (3 ±0)`
+		//  Estimated: `6801 + r * (3 ±0)`
+		// Minimum execution time: 258_953_000 picoseconds.
+		Weight::from_parts(288_222_836, 6801)
+			// Standard Error: 367
+			.saturating_add(Weight::from_parts(152_842, 0).saturating_mul(r.into()))
 			.saturating_add(T::DbWeight::get().reads(9_u64))
 			.saturating_add(T::DbWeight::get().writes(4_u64))
 			.saturating_add(Weight::from_parts(0, 3).saturating_mul(r.into()))
@@ -2022,10 +2020,10 @@ impl<T: frame_system::Config> WeightInfo for SubstrateWeight<T> {
 		// Proof Size summary in bytes:
 		//  Measured:  `0`
 		//  Estimated: `0`
-		// Minimum execution time: 1_388_000 picoseconds.
-		Weight::from_parts(1_680_408, 0)
-			// Standard Error: 21
-			.saturating_add(Weight::from_parts(10_564, 0).saturating_mul(r.into()))
+		// Minimum execution time: 1_476_000 picoseconds.
+		Weight::from_parts(2_119_717, 0)
+			// Standard Error: 28
+			.saturating_add(Weight::from_parts(9_805, 0).saturating_mul(r.into()))
 	}
 }
 
@@ -2037,8 +2035,8 @@ impl WeightInfo for () {
 		// Proof Size summary in bytes:
 		//  Measured:  `142`
 		//  Estimated: `1627`
-		// Minimum execution time: 2_410_000 picoseconds.
-		Weight::from_parts(2_581_000, 1627)
+		// Minimum execution time: 2_548_000 picoseconds.
+		Weight::from_parts(2_670_000, 1627)
 			.saturating_add(RocksDbWeight::get().reads(1_u64))
 	}
 	/// Storage: `Skipped::Metadata` (r:0 w:0)
@@ -2048,10 +2046,10 @@ impl WeightInfo for () {
 		// Proof Size summary in bytes:
 		//  Measured:  `451 + k * (69 ±0)`
 		//  Estimated: `441 + k * (70 ±0)`
-		// Minimum execution time: 13_278_000 picoseconds.
-		Weight::from_parts(13_944_000, 441)
-			// Standard Error: 1_643
-			.saturating_add(Weight::from_parts(1_194_404, 0).saturating_mul(k.into()))
+		// Minimum execution time: 13_526_000 picoseconds.
+		Weight::from_parts(13_902_000, 441)
+			// Standard Error: 1_058
+			.saturating_add(Weight::from_parts(1_274_724, 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))
@@ -2065,10 +2063,10 @@ impl WeightInfo for () {
 		// Proof Size summary in bytes:
 		//  Measured:  `211 + c * (1 ±0)`
 		//  Estimated: `6149 + c * (1 ±0)`
-		// Minimum execution time: 8_533_000 picoseconds.
-		Weight::from_parts(9_141_899, 6149)
+		// Minimum execution time: 8_426_000 picoseconds.
+		Weight::from_parts(8_591_621, 6149)
 			// Standard Error: 1
-			.saturating_add(Weight::from_parts(1_327, 0).saturating_mul(c.into()))
+			.saturating_add(Weight::from_parts(1_203, 0).saturating_mul(c.into()))
 			.saturating_add(RocksDbWeight::get().reads(2_u64))
 			.saturating_add(RocksDbWeight::get().writes(1_u64))
 			.saturating_add(Weight::from_parts(0, 1).saturating_mul(c.into()))
@@ -2081,8 +2079,8 @@ impl WeightInfo for () {
 		// Proof Size summary in bytes:
 		//  Measured:  `510`
 		//  Estimated: `6450`
-		// Minimum execution time: 16_998_000 picoseconds.
-		Weight::from_parts(17_776_000, 6450)
+		// Minimum execution time: 17_008_000 picoseconds.
+		Weight::from_parts(17_742_000, 6450)
 			.saturating_add(RocksDbWeight::get().reads(3_u64))
 			.saturating_add(RocksDbWeight::get().writes(1_u64))
 	}
@@ -2095,10 +2093,10 @@ impl WeightInfo for () {
 		// Proof Size summary in bytes:
 		//  Measured:  `171 + k * (1 ±0)`
 		//  Estimated: `3635 + k * (1 ±0)`
-		// Minimum execution time: 3_919_000 picoseconds.
-		Weight::from_parts(4_057_153, 3635)
-			// Standard Error: 1_252
-			.saturating_add(Weight::from_parts(1_151_419, 0).saturating_mul(k.into()))
+		// Minimum execution time: 3_949_000 picoseconds.
+		Weight::from_parts(4_062_000, 3635)
+			// Standard Error: 1_983
+			.saturating_add(Weight::from_parts(1_173_197, 0).saturating_mul(k.into()))
 			.saturating_add(RocksDbWeight::get().reads(1_u64))
 			.saturating_add(RocksDbWeight::get().writes(2_u64))
 			.saturating_add(RocksDbWeight::get().writes((1_u64).saturating_mul(k.into())))
@@ -2117,10 +2115,10 @@ impl WeightInfo for () {
 		// Proof Size summary in bytes:
 		//  Measured:  `325 + c * (1 ±0)`
 		//  Estimated: `6263 + c * (1 ±0)`
-		// Minimum execution time: 17_730_000 picoseconds.
-		Weight::from_parts(17_540_884, 6263)
+		// Minimum execution time: 17_094_000 picoseconds.
+		Weight::from_parts(17_338_591, 6263)
 			// Standard Error: 1
-			.saturating_add(Weight::from_parts(417, 0).saturating_mul(c.into()))
+			.saturating_add(Weight::from_parts(436, 0).saturating_mul(c.into()))
 			.saturating_add(RocksDbWeight::get().reads(4_u64))
 			.saturating_add(RocksDbWeight::get().writes(2_u64))
 			.saturating_add(Weight::from_parts(0, 1).saturating_mul(c.into()))
@@ -2131,8 +2129,8 @@ impl WeightInfo for () {
 		// Proof Size summary in bytes:
 		//  Measured:  `440`
 		//  Estimated: `6380`
-		// Minimum execution time: 13_089_000 picoseconds.
-		Weight::from_parts(13_727_000, 6380)
+		// Minimum execution time: 12_704_000 picoseconds.
+		Weight::from_parts(13_147_000, 6380)
 			.saturating_add(RocksDbWeight::get().reads(2_u64))
 			.saturating_add(RocksDbWeight::get().writes(1_u64))
 	}
@@ -2146,8 +2144,8 @@ impl WeightInfo for () {
 		// Proof Size summary in bytes:
 		//  Measured:  `360`
 		//  Estimated: `6300`
-		// Minimum execution time: 49_083_000 picoseconds.
-		Weight::from_parts(50_462_000, 6300)
+		// Minimum execution time: 48_387_000 picoseconds.
+		Weight::from_parts(50_024_000, 6300)
 			.saturating_add(RocksDbWeight::get().reads(4_u64))
 			.saturating_add(RocksDbWeight::get().writes(1_u64))
 	}
@@ -2159,8 +2157,8 @@ impl WeightInfo for () {
 		// Proof Size summary in bytes:
 		//  Measured:  `594`
 		//  Estimated: `6534`
-		// Minimum execution time: 49_299_000 picoseconds.
-		Weight::from_parts(50_805_000, 6534)
+		// Minimum execution time: 59_300_000 picoseconds.
+		Weight::from_parts(61_805_000, 6534)
 			.saturating_add(RocksDbWeight::get().reads(4_u64))
 			.saturating_add(RocksDbWeight::get().writes(2_u64))
 	}
@@ -2170,8 +2168,8 @@ impl WeightInfo for () {
 		// Proof Size summary in bytes:
 		//  Measured:  `142`
 		//  Estimated: `1627`
-		// Minimum execution time: 3_305_000 picoseconds.
-		Weight::from_parts(3_489_000, 1627)
+		// Minimum execution time: 3_327_000 picoseconds.
+		Weight::from_parts(3_502_000, 1627)
 			.saturating_add(RocksDbWeight::get().reads(1_u64))
 			.saturating_add(RocksDbWeight::get().writes(1_u64))
 	}
@@ -2183,8 +2181,8 @@ impl WeightInfo for () {
 		// Proof Size summary in bytes:
 		//  Measured:  `166`
 		//  Estimated: `3631`
-		// Minimum execution time: 12_657_000 picoseconds.
-		Weight::from_parts(13_100_000, 3631)
+		// Minimum execution time: 12_759_000 picoseconds.
+		Weight::from_parts(13_134_000, 3631)
 			.saturating_add(RocksDbWeight::get().reads(2_u64))
 			.saturating_add(RocksDbWeight::get().writes(2_u64))
 	}
@@ -2194,8 +2192,8 @@ impl WeightInfo for () {
 		// Proof Size summary in bytes:
 		//  Measured:  `142`
 		//  Estimated: `3607`
-		// Minimum execution time: 4_784_000 picoseconds.
-		Weight::from_parts(4_994_000, 3607)
+		// Minimum execution time: 4_775_000 picoseconds.
+		Weight::from_parts(5_084_000, 3607)
 			.saturating_add(RocksDbWeight::get().reads(1_u64))
 	}
 	/// Storage: UNKNOWN KEY `0x4342193e496fab7ec59d615ed0dc55304e7b9012096b41c4eb3aaf947f6ea429` (r:1 w:0)
@@ -2206,8 +2204,8 @@ impl WeightInfo for () {
 		// Proof Size summary in bytes:
 		//  Measured:  `167`
 		//  Estimated: `3632`
-		// Minimum execution time: 6_762_000 picoseconds.
-		Weight::from_parts(6_945_000, 3632)
+		// Minimum execution time: 6_663_000 picoseconds.
+		Weight::from_parts(6_855_000, 3632)
 			.saturating_add(RocksDbWeight::get().reads(2_u64))
 	}
 	/// Storage: UNKNOWN KEY `0x4342193e496fab7ec59d615ed0dc55304e7b9012096b41c4eb3aaf947f6ea429` (r:1 w:0)
@@ -2218,8 +2216,8 @@ impl WeightInfo for () {
 		// Proof Size summary in bytes:
 		//  Measured:  `142`
 		//  Estimated: `3607`
-		// Minimum execution time: 6_999_000 picoseconds.
-		Weight::from_parts(7_372_000, 3607)
+		// Minimum execution time: 7_212_000 picoseconds.
+		Weight::from_parts(7_426_000, 3607)
 			.saturating_add(RocksDbWeight::get().reads(2_u64))
 			.saturating_add(RocksDbWeight::get().writes(1_u64))
 	}
@@ -2240,12 +2238,12 @@ impl WeightInfo for () {
 	/// The range of component `c` is `[0, 125952]`.
 	fn call_with_code_per_byte(c: u32, ) -> Weight {
 		// Proof Size summary in bytes:
-		//  Measured:  `759`
-		//  Estimated: `6710 + c * (1 ±0)`
-		// Minimum execution time: 304_121_000 picoseconds.
-		Weight::from_parts(288_627_840, 6710)
-			// Standard Error: 83
-			.saturating_add(Weight::from_parts(37_343, 0).saturating_mul(c.into()))
+		//  Measured:  `792`
+		//  Estimated: `6743 + c * (1 ±0)`
+		// Minimum execution time: 289_557_000 picoseconds.
+		Weight::from_parts(272_895_652, 6743)
+			// Standard Error: 80
+			.saturating_add(Weight::from_parts(39_917, 0).saturating_mul(c.into()))
 			.saturating_add(RocksDbWeight::get().reads(8_u64))
 			.saturating_add(RocksDbWeight::get().writes(4_u64))
 			.saturating_add(Weight::from_parts(0, 1).saturating_mul(c.into()))
@@ -2273,16 +2271,16 @@ impl WeightInfo for () {
 	/// The range of component `s` is `[0, 1048576]`.
 	fn instantiate_with_code(c: u32, i: u32, s: u32, ) -> Weight {
 		// Proof Size summary in bytes:
-		//  Measured:  `290`
-		//  Estimated: `8714`
-		// Minimum execution time: 4_101_589_000 picoseconds.
-		Weight::from_parts(694_193_047, 8714)
-			// Standard Error: 334
-			.saturating_add(Weight::from_parts(108_847, 0).saturating_mul(c.into()))
-			// Standard Error: 40
-			.saturating_add(Weight::from_parts(1_677, 0).saturating_mul(i.into()))
-			// Standard Error: 40
-			.saturating_add(Weight::from_parts(1_783, 0).saturating_mul(s.into()))
+		//  Measured:  `323`
+		//  Estimated: `8747`
+		// Minimum execution time: 4_671_359_000 picoseconds.
+		Weight::from_parts(586_523_882, 8747)
+			// Standard Error: 206
+			.saturating_add(Weight::from_parts(115_402, 0).saturating_mul(c.into()))
+			// Standard Error: 24
+			.saturating_add(Weight::from_parts(1_797, 0).saturating_mul(i.into()))
+			// Standard Error: 24
+			.saturating_add(Weight::from_parts(2_046, 0).saturating_mul(s.into()))
 			.saturating_add(RocksDbWeight::get().reads(11_u64))
 			.saturating_add(RocksDbWeight::get().writes(10_u64))
 	}
@@ -2300,22 +2298,22 @@ impl WeightInfo for () {
 	/// Proof: `Timestamp::Now` (`max_values`: Some(1), `max_size`: Some(8), added: 503, mode: `Measured`)
 	/// Storage: `System::Account` (r:1 w:1)
 	/// Proof: `System::Account` (`max_values`: None, `max_size`: Some(128), added: 2603, mode: `Measured`)
-	/// Storage: `Balances::Holds` (r:1 w:1)
-	/// Proof: `Balances::Holds` (`max_values`: None, `max_size`: Some(85), added: 2560, mode: `Measured`)
 	/// Storage: `System::EventTopics` (r:2 w:2)
 	/// Proof: `System::EventTopics` (`max_values`: None, `max_size`: None, mode: `Measured`)
+	/// Storage: `Balances::Holds` (r:1 w:1)
+	/// Proof: `Balances::Holds` (`max_values`: None, `max_size`: Some(85), added: 2560, mode: `Measured`)
 	/// The range of component `i` is `[0, 1048576]`.
 	/// The range of component `s` is `[0, 1048576]`.
 	fn instantiate(i: u32, s: u32, ) -> Weight {
 		// Proof Size summary in bytes:
-		//  Measured:  `527`
-		//  Estimated: `6471`
-		// Minimum execution time: 2_011_580_000 picoseconds.
-		Weight::from_parts(397_415_227, 6471)
-			// Standard Error: 10
-			.saturating_add(Weight::from_parts(1_689, 0).saturating_mul(i.into()))
-			// Standard Error: 10
-			.saturating_add(Weight::from_parts(1_679, 0).saturating_mul(s.into()))
+		//  Measured:  `560`
+		//  Estimated: `6504`
+		// Minimum execution time: 2_170_657_000 picoseconds.
+		Weight::from_parts(369_331_405, 6504)
+			// Standard Error: 7
+			.saturating_add(Weight::from_parts(1_940, 0).saturating_mul(i.into()))
+			// Standard Error: 7
+			.saturating_add(Weight::from_parts(1_858, 0).saturating_mul(s.into()))
 			.saturating_add(RocksDbWeight::get().reads(10_u64))
 			.saturating_add(RocksDbWeight::get().writes(7_u64))
 	}
@@ -2335,10 +2333,10 @@ impl WeightInfo for () {
 	/// Proof: `System::EventTopics` (`max_values`: None, `max_size`: None, mode: `Measured`)
 	fn call() -> Weight {
 		// Proof Size summary in bytes:
-		//  Measured:  `793`
-		//  Estimated: `6733`
-		// Minimum execution time: 204_975_000 picoseconds.
-		Weight::from_parts(214_770_000, 6733)
+		//  Measured:  `826`
+		//  Estimated: `6766`
+		// Minimum execution time: 204_287_000 picoseconds.
+		Weight::from_parts(213_239_000, 6766)
 			.saturating_add(RocksDbWeight::get().reads(8_u64))
 			.saturating_add(RocksDbWeight::get().writes(4_u64))
 	}
@@ -2357,10 +2355,10 @@ impl WeightInfo for () {
 		// Proof Size summary in bytes:
 		//  Measured:  `142`
 		//  Estimated: `3607`
-		// Minimum execution time: 269_545_000 picoseconds.
-		Weight::from_parts(256_054_650, 3607)
-			// Standard Error: 91
-			.saturating_add(Weight::from_parts(72_743, 0).saturating_mul(c.into()))
+		// Minimum execution time: 285_434_000 picoseconds.
+		Weight::from_parts(242_697_648, 3607)
+			// Standard Error: 128
+			.saturating_add(Weight::from_parts(76_087, 0).saturating_mul(c.into()))
 			.saturating_add(RocksDbWeight::get().reads(4_u64))
 			.saturating_add(RocksDbWeight::get().writes(4_u64))
 	}
@@ -2378,8 +2376,8 @@ impl WeightInfo for () {
 		// Proof Size summary in bytes:
 		//  Measured:  `315`
 		//  Estimated: `3780`
-		// Minimum execution time: 47_880_000 picoseconds.
-		Weight::from_parts(49_427_000, 3780)
+		// Minimum execution time: 46_486_000 picoseconds.
+		Weight::from_parts(48_422_000, 3780)
 			.saturating_add(RocksDbWeight::get().reads(4_u64))
 			.saturating_add(RocksDbWeight::get().writes(4_u64))
 	}
@@ -2395,8 +2393,8 @@ impl WeightInfo for () {
 		// Proof Size summary in bytes:
 		//  Measured:  `552`
 		//  Estimated: `8967`
-		// Minimum execution time: 37_898_000 picoseconds.
-		Weight::from_parts(39_826_000, 8967)
+		// Minimum execution time: 37_568_000 picoseconds.
+		Weight::from_parts(38_589_000, 8967)
 			.saturating_add(RocksDbWeight::get().reads(7_u64))
 			.saturating_add(RocksDbWeight::get().writes(6_u64))
 	}
@@ -2417,12 +2415,12 @@ impl WeightInfo for () {
 	/// The range of component `r` is `[0, 1600]`.
 	fn seal_caller(r: u32, ) -> Weight {
 		// Proof Size summary in bytes:
-		//  Measured:  `833 + r * (6 ±0)`
-		//  Estimated: `6773 + r * (6 ±0)`
-		// Minimum execution time: 260_916_000 picoseconds.
-		Weight::from_parts(295_521_846, 6773)
-			// Standard Error: 1_126
-			.saturating_add(Weight::from_parts(348_317, 0).saturating_mul(r.into()))
+		//  Measured:  `866 + r * (6 ±0)`
+		//  Estimated: `6806 + r * (6 ±0)`
+		// Minimum execution time: 274_513_000 picoseconds.
+		Weight::from_parts(288_793_403, 6806)
+			// Standard Error: 650
+			.saturating_add(Weight::from_parts(339_309, 0).saturating_mul(r.into()))
 			.saturating_add(RocksDbWeight::get().reads(8_u64))
 			.saturating_add(RocksDbWeight::get().writes(3_u64))
 			.saturating_add(Weight::from_parts(0, 6).saturating_mul(r.into()))
@@ -2444,12 +2442,12 @@ impl WeightInfo for () {
 	/// The range of component `r` is `[0, 1600]`.
 	fn seal_is_contract(r: u32, ) -> Weight {
 		// Proof Size summary in bytes:
-		//  Measured:  `889 + r * (209 ±0)`
-		//  Estimated: `6793 + r * (2684 ±0)`
-		// Minimum execution time: 274_335_000 picoseconds.
-		Weight::from_parts(132_998_512, 6793)
-			// Standard Error: 7_396
-			.saturating_add(Weight::from_parts(3_602_287, 0).saturating_mul(r.into()))
+		//  Measured:  `922 + r * (209 ±0)`
+		//  Estimated: `6826 + r * (2684 ±0)`
+		// Minimum execution time: 260_096_000 picoseconds.
+		Weight::from_parts(149_954_322, 6826)
+			// Standard Error: 5_713
+			.saturating_add(Weight::from_parts(3_788_924, 0).saturating_mul(r.into()))
 			.saturating_add(RocksDbWeight::get().reads(8_u64))
 			.saturating_add(RocksDbWeight::get().reads((1_u64).saturating_mul(r.into())))
 			.saturating_add(RocksDbWeight::get().writes(3_u64))
@@ -2472,12 +2470,12 @@ impl WeightInfo for () {
 	/// The range of component `r` is `[0, 1600]`.
 	fn seal_code_hash(r: u32, ) -> Weight {
 		// Proof Size summary in bytes:
-		//  Measured:  `888 + r * (213 ±0)`
-		//  Estimated: `6797 + r * (2688 ±0)`
-		// Minimum execution time: 272_514_000 picoseconds.
-		Weight::from_parts(104_825_618, 6797)
-			// Standard Error: 10_038
-			.saturating_add(Weight::from_parts(4_520_258, 0).saturating_mul(r.into()))
+		//  Measured:  `921 + r * (213 ±0)`
+		//  Estimated: `6830 + r * (2688 ±0)`
+		// Minimum execution time: 277_496_000 picoseconds.
+		Weight::from_parts(285_839_000, 6830)
+			// Standard Error: 10_076
+			.saturating_add(Weight::from_parts(4_720_110, 0).saturating_mul(r.into()))
 			.saturating_add(RocksDbWeight::get().reads(8_u64))
 			.saturating_add(RocksDbWeight::get().reads((1_u64).saturating_mul(r.into())))
 			.saturating_add(RocksDbWeight::get().writes(3_u64))
@@ -2500,12 +2498,12 @@ impl WeightInfo for () {
 	/// The range of component `r` is `[0, 1600]`.
 	fn seal_own_code_hash(r: u32, ) -> Weight {
 		// Proof Size summary in bytes:
-		//  Measured:  `840 + r * (6 ±0)`
-		//  Estimated: `6782 + r * (6 ±0)`
-		// Minimum execution time: 264_593_000 picoseconds.
-		Weight::from_parts(294_139_363, 6782)
-			// Standard Error: 907
-			.saturating_add(Weight::from_parts(432_964, 0).saturating_mul(r.into()))
+		//  Measured:  `873 + r * (6 ±0)`
+		//  Estimated: `6815 + r * (6 ±0)`
+		// Minimum execution time: 275_655_000 picoseconds.
+		Weight::from_parts(291_386_528, 6815)
+			// Standard Error: 898
+			.saturating_add(Weight::from_parts(428_765, 0).saturating_mul(r.into()))
 			.saturating_add(RocksDbWeight::get().reads(8_u64))
 			.saturating_add(RocksDbWeight::get().writes(3_u64))
 			.saturating_add(Weight::from_parts(0, 6).saturating_mul(r.into()))
@@ -2527,12 +2525,12 @@ impl WeightInfo for () {
 	/// The range of component `r` is `[0, 1600]`.
 	fn seal_caller_is_origin(r: u32, ) -> Weight {
 		// Proof Size summary in bytes:
-		//  Measured:  `830 + r * (3 ±0)`
-		//  Estimated: `6771 + r * (3 ±0)`
-		// Minimum execution time: 260_412_000 picoseconds.
-		Weight::from_parts(284_371_703, 6771)
-			// Standard Error: 433
-			.saturating_add(Weight::from_parts(182_952, 0).saturating_mul(r.into()))
+		//  Measured:  `863 + r * (3 ±0)`
+		//  Estimated: `6804 + r * (3 ±0)`
+		// Minimum execution time: 260_323_000 picoseconds.
+		Weight::from_parts(286_371_403, 6804)
+			// Standard Error: 451
+			.saturating_add(Weight::from_parts(183_053, 0).saturating_mul(r.into()))
 			.saturating_add(RocksDbWeight::get().reads(8_u64))
 			.saturating_add(RocksDbWeight::get().writes(3_u64))
 			.saturating_add(Weight::from_parts(0, 3).saturating_mul(r.into()))
@@ -2552,12 +2550,12 @@ impl WeightInfo for () {
 	/// The range of component `r` is `[0, 1600]`.
 	fn seal_caller_is_root(r: u32, ) -> Weight {
 		// Proof Size summary in bytes:
-		//  Measured:  `720 + r * (3 ±0)`
-		//  Estimated: `6660 + r * (3 ±0)`
-		// Minimum execution time: 255_112_000 picoseconds.
-		Weight::from_parts(273_052_488, 6660)
-			// Standard Error: 376
-			.saturating_add(Weight::from_parts(166_644, 0).saturating_mul(r.into()))
+		//  Measured:  `753 + r * (3 ±0)`
+		//  Estimated: `6693 + r * (3 ±0)`
+		// Minimum execution time: 262_974_000 picoseconds.
+		Weight::from_parts(276_571_502, 6693)
+			// Standard Error: 527
+			.saturating_add(Weight::from_parts(165_364, 0).saturating_mul(r.into()))
 			.saturating_add(RocksDbWeight::get().reads(7_u64))
 			.saturating_add(RocksDbWeight::get().writes(3_u64))
 			.saturating_add(Weight::from_parts(0, 3).saturating_mul(r.into()))
@@ -2579,12 +2577,12 @@ impl WeightInfo for () {
 	/// The range of component `r` is `[0, 1600]`.
 	fn seal_address(r: u32, ) -> Weight {
 		// Proof Size summary in bytes:
-		//  Measured:  `834 + r * (6 ±0)`
-		//  Estimated: `6774 + r * (6 ±0)`
-		// Minimum execution time: 270_426_000 picoseconds.
-		Weight::from_parts(289_240_775, 6774)
-			// Standard Error: 748
-			.saturating_add(Weight::from_parts(344_791, 0).saturating_mul(r.into()))
+		//  Measured:  `867 + r * (6 ±0)`
+		//  Estimated: `6807 + r * (6 ±0)`
+		// Minimum execution time: 272_826_000 picoseconds.
+		Weight::from_parts(290_963_001, 6807)
+			// Standard Error: 810
+			.saturating_add(Weight::from_parts(343_762, 0).saturating_mul(r.into()))
 			.saturating_add(RocksDbWeight::get().reads(8_u64))
 			.saturating_add(RocksDbWeight::get().writes(3_u64))
 			.saturating_add(Weight::from_parts(0, 6).saturating_mul(r.into()))
@@ -2606,12 +2604,12 @@ impl WeightInfo for () {
 	/// The range of component `r` is `[0, 1600]`.
 	fn seal_gas_left(r: u32, ) -> Weight {
 		// Proof Size summary in bytes:
-		//  Measured:  `830 + r * (6 ±0)`
-		//  Estimated: `6773 + r * (6 ±0)`
-		// Minimum execution time: 260_217_000 picoseconds.
-		Weight::from_parts(288_660_978, 6773)
-			// Standard Error: 1_199
-			.saturating_add(Weight::from_parts(550_304, 0).saturating_mul(r.into()))
+		//  Measured:  `863 + r * (6 ±0)`
+		//  Estimated: `6806 + r * (6 ±0)`
+		// Minimum execution time: 277_324_000 picoseconds.
+		Weight::from_parts(290_872_814, 6806)
+			// Standard Error: 766
+			.saturating_add(Weight::from_parts(371_542, 0).saturating_mul(r.into()))
 			.saturating_add(RocksDbWeight::get().reads(8_u64))
 			.saturating_add(RocksDbWeight::get().writes(3_u64))
 			.saturating_add(Weight::from_parts(0, 6).saturating_mul(r.into()))
@@ -2633,12 +2631,12 @@ impl WeightInfo for () {
 	/// The range of component `r` is `[0, 1600]`.
 	fn seal_balance(r: u32, ) -> Weight {
 		// Proof Size summary in bytes:
-		//  Measured:  `974 + r * (6 ±0)`
-		//  Estimated: `6898 + r * (6 ±0)`
-		// Minimum execution time: 273_473_000 picoseconds.
-		Weight::from_parts(298_889_279, 6898)
-			// Standard Error: 4_604
-			.saturating_add(Weight::from_parts(1_630_175, 0).saturating_mul(r.into()))
+		//  Measured:  `1007 + r * (6 ±0)`
+		//  Estimated: `6931 + r * (6 ±0)`
+		// Minimum execution time: 274_460_000 picoseconds.
+		Weight::from_parts(285_748_025, 6931)
+			// Standard Error: 1_570
+			.saturating_add(Weight::from_parts(1_656_237, 0).saturating_mul(r.into()))
 			.saturating_add(RocksDbWeight::get().reads(9_u64))
 			.saturating_add(RocksDbWeight::get().writes(3_u64))
 			.saturating_add(Weight::from_parts(0, 6).saturating_mul(r.into()))
@@ -2660,12 +2658,12 @@ impl WeightInfo for () {
 	/// The range of component `r` is `[0, 1600]`.
 	fn seal_value_transferred(r: u32, ) -> Weight {
 		// Proof Size summary in bytes:
-		//  Measured:  `844 + r * (6 ±0)`
-		//  Estimated: `6790 + r * (6 ±0)`
-		// Minimum execution time: 262_033_000 picoseconds.
-		Weight::from_parts(284_293_851, 6790)
-			// Standard Error: 591
-			.saturating_add(Weight::from_parts(369_240, 0).saturating_mul(r.into()))
+		//  Measured:  `877 + r * (6 ±0)`
+		//  Estimated: `6823 + r * (6 ±0)`
+		// Minimum execution time: 278_254_000 picoseconds.
+		Weight::from_parts(283_893_525, 6823)
+			// Standard Error: 726
+			.saturating_add(Weight::from_parts(347_368, 0).saturating_mul(r.into()))
 			.saturating_add(RocksDbWeight::get().reads(8_u64))
 			.saturating_add(RocksDbWeight::get().writes(3_u64))
 			.saturating_add(Weight::from_parts(0, 6).saturating_mul(r.into()))
@@ -2687,12 +2685,12 @@ impl WeightInfo for () {
 	/// The range of component `r` is `[0, 1600]`.
 	fn seal_minimum_balance(r: u32, ) -> Weight {
 		// Proof Size summary in bytes:
-		//  Measured:  `842 + r * (6 ±0)`
-		//  Estimated: `6783 + r * (6 ±0)`
-		// Minimum execution time: 274_568_000 picoseconds.
-		Weight::from_parts(294_688_466, 6783)
-			// Standard Error: 768
-			.saturating_add(Weight::from_parts(349_584, 0).saturating_mul(r.into()))
+		//  Measured:  `875 + r * (6 ±0)`
+		//  Estimated: `6816 + r * (6 ±0)`
+		// Minimum execution time: 279_646_000 picoseconds.
+		Weight::from_parts(292_505_446, 6816)
+			// Standard Error: 867
+			.saturating_add(Weight::from_parts(337_202, 0).saturating_mul(r.into()))
 			.saturating_add(RocksDbWeight::get().reads(8_u64))
 			.saturating_add(RocksDbWeight::get().writes(3_u64))
 			.saturating_add(Weight::from_parts(0, 6).saturating_mul(r.into()))
@@ -2714,12 +2712,12 @@ impl WeightInfo for () {
 	/// The range of component `r` is `[0, 1600]`.
 	fn seal_block_number(r: u32, ) -> Weight {
 		// Proof Size summary in bytes:
-		//  Measured:  `839 + r * (6 ±0)`
-		//  Estimated: `6786 + r * (6 ±0)`
-		// Minimum execution time: 264_061_000 picoseconds.
-		Weight::from_parts(287_964_188, 6786)
-			// Standard Error: 490
-			.saturating_add(Weight::from_parts(356_273, 0).saturating_mul(r.into()))
+		//  Measured:  `872 + r * (6 ±0)`
+		//  Estimated: `6819 + r * (6 ±0)`
+		// Minimum execution time: 274_522_000 picoseconds.
+		Weight::from_parts(295_135_659, 6819)
+			// Standard Error: 1_052
+			.saturating_add(Weight::from_parts(330_788, 0).saturating_mul(r.into()))
 			.saturating_add(RocksDbWeight::get().reads(8_u64))
 			.saturating_add(RocksDbWeight::get().writes(3_u64))
 			.saturating_add(Weight::from_parts(0, 6).saturating_mul(r.into()))
@@ -2741,12 +2739,12 @@ impl WeightInfo for () {
 	/// The range of component `r` is `[0, 1600]`.
 	fn seal_now(r: u32, ) -> Weight {
 		// Proof Size summary in bytes:
-		//  Measured:  `830 + r * (6 ±0)`
-		//  Estimated: `6771 + r * (6 ±0)`
-		// Minimum execution time: 275_707_000 picoseconds.
-		Weight::from_parts(290_797_828, 6771)
-			// Standard Error: 967
-			.saturating_add(Weight::from_parts(352_839, 0).saturating_mul(r.into()))
+		//  Measured:  `863 + r * (6 ±0)`
+		//  Estimated: `6804 + r * (6 ±0)`
+		// Minimum execution time: 274_228_000 picoseconds.
+		Weight::from_parts(289_201_593, 6804)
+			// Standard Error: 752
+			.saturating_add(Weight::from_parts(337_860, 0).saturating_mul(r.into()))
 			.saturating_add(RocksDbWeight::get().reads(8_u64))
 			.saturating_add(RocksDbWeight::get().writes(3_u64))
 			.saturating_add(Weight::from_parts(0, 6).saturating_mul(r.into()))
@@ -2770,12 +2768,12 @@ impl WeightInfo for () {
 	/// The range of component `r` is `[0, 1600]`.
 	fn seal_weight_to_fee(r: u32, ) -> Weight {
 		// Proof Size summary in bytes:
-		//  Measured:  `904 + r * (14 ±0)`
-		//  Estimated: `6839 + r * (14 ±0)`
-		// Minimum execution time: 272_492_000 picoseconds.
-		Weight::from_parts(295_010_878, 6839)
-			// Standard Error: 2_549
-			.saturating_add(Weight::from_parts(1_426_715, 0).saturating_mul(r.into()))
+		//  Measured:  `937 + r * (14 ±0)`
+		//  Estimated: `6872 + r * (14 ±0)`
+		// Minimum execution time: 277_142_000 picoseconds.
+		Weight::from_parts(296_736_114, 6872)
+			// Standard Error: 1_502
+			.saturating_add(Weight::from_parts(1_446_663, 0).saturating_mul(r.into()))
 			.saturating_add(RocksDbWeight::get().reads(9_u64))
 			.saturating_add(RocksDbWeight::get().writes(3_u64))
 			.saturating_add(Weight::from_parts(0, 14).saturating_mul(r.into()))
@@ -2797,12 +2795,12 @@ impl WeightInfo for () {
 	/// The range of component `r` is `[0, 1600]`.
 	fn seal_input(r: u32, ) -> Weight {
 		// Proof Size summary in bytes:
-		//  Measured:  `832 + r * (6 ±0)`
-		//  Estimated: `6774 + r * (6 ±0)`
-		// Minimum execution time: 257_981_000 picoseconds.
-		Weight::from_parts(285_824_773, 6774)
-			// Standard Error: 704
-			.saturating_add(Weight::from_parts(301_327, 0).saturating_mul(r.into()))
+		//  Measured:  `865 + r * (6 ±0)`
+		//  Estimated: `6807 + r * (6 ±0)`
+		// Minimum execution time: 276_087_000 picoseconds.
+		Weight::from_parts(287_863_377, 6807)
+			// Standard Error: 495
+			.saturating_add(Weight::from_parts(282_718, 0).saturating_mul(r.into()))
 			.saturating_add(RocksDbWeight::get().reads(8_u64))
 			.saturating_add(RocksDbWeight::get().writes(3_u64))
 			.saturating_add(Weight::from_parts(0, 6).saturating_mul(r.into()))
@@ -2824,12 +2822,12 @@ impl WeightInfo for () {
 	/// The range of component `n` is `[0, 1048576]`.
 	fn seal_input_per_byte(n: u32, ) -> Weight {
 		// Proof Size summary in bytes:
-		//  Measured:  `836`
-		//  Estimated: `6776`
-		// Minimum execution time: 259_470_000 picoseconds.
-		Weight::from_parts(232_759_442, 6776)
-			// Standard Error: 24
-			.saturating_add(Weight::from_parts(981, 0).saturating_mul(n.into()))
+		//  Measured:  `869`
+		//  Estimated: `6809`
+		// Minimum execution time: 277_128_000 picoseconds.
+		Weight::from_parts(234_478_674, 6809)
+			// Standard Error: 23
+			.saturating_add(Weight::from_parts(1_052, 0).saturating_mul(n.into()))
 			.saturating_add(RocksDbWeight::get().reads(8_u64))
 			.saturating_add(RocksDbWeight::get().writes(3_u64))
 	}
@@ -2850,12 +2848,10 @@ impl WeightInfo for () {
 	/// The range of component `r` is `[0, 1]`.
 	fn seal_return(r: u32, ) -> Weight {
 		// Proof Size summary in bytes:
-		//  Measured:  `820 + r * (45 ±0)`
-		//  Estimated: `6760 + r * (45 ±0)`
-		// Minimum execution time: 252_740_000 picoseconds.
-		Weight::from_parts(278_155_436, 6760)
-			// Standard Error: 882_420
-			.saturating_add(Weight::from_parts(755_063, 0).saturating_mul(r.into()))
+		//  Measured:  `853 + r * (45 ±0)`
+		//  Estimated: `6793 + r * (45 ±0)`
+		// Minimum execution time: 251_983_000 picoseconds.
+		Weight::from_parts(277_986_885, 6793)
 			.saturating_add(RocksDbWeight::get().reads(8_u64))
 			.saturating_add(RocksDbWeight::get().writes(3_u64))
 			.saturating_add(Weight::from_parts(0, 45).saturating_mul(r.into()))
@@ -2877,12 +2873,12 @@ impl WeightInfo for () {
 	/// The range of component `n` is `[0, 1048576]`.
 	fn seal_return_per_byte(n: u32, ) -> Weight {
 		// Proof Size summary in bytes:
-		//  Measured:  `830`
-		//  Estimated: `6777`
-		// Minimum execution time: 257_318_000 picoseconds.
-		Weight::from_parts(285_765_697, 6777)
-			// Standard Error: 1
-			.saturating_add(Weight::from_parts(322, 0).saturating_mul(n.into()))
+		//  Measured:  `863`
+		//  Estimated: `6810`
+		// Minimum execution time: 275_108_000 picoseconds.
+		Weight::from_parts(284_552_708, 6810)
+			// Standard Error: 0
+			.saturating_add(Weight::from_parts(391, 0).saturating_mul(n.into()))
 			.saturating_add(RocksDbWeight::get().reads(8_u64))
 			.saturating_add(RocksDbWeight::get().writes(3_u64))
 	}
@@ -2909,12 +2905,12 @@ impl WeightInfo for () {
 	/// The range of component `r` is `[0, 1]`.
 	fn seal_terminate(r: u32, ) -> Weight {
 		// Proof Size summary in bytes:
-		//  Measured:  `2939 + r * (316 ±0)`
-		//  Estimated: `8879 + r * (5266 ±0)`
-		// Minimum execution time: 280_392_000 picoseconds.
-		Weight::from_parts(310_023_381, 8879)
-			// Standard Error: 1_008_026
-			.saturating_add(Weight::from_parts(130_208_818, 0).saturating_mul(r.into()))
+		//  Measured:  `2972 + r * (316 ±0)`
+		//  Estimated: `8912 + r * (5266 ±0)`
+		// Minimum execution time: 281_278_000 picoseconds.
+		Weight::from_parts(306_800_667, 8912)
+			// Standard Error: 855_257
+			.saturating_add(Weight::from_parts(126_508_132, 0).saturating_mul(r.into()))
 			.saturating_add(RocksDbWeight::get().reads(8_u64))
 			.saturating_add(RocksDbWeight::get().reads((7_u64).saturating_mul(r.into())))
 			.saturating_add(RocksDbWeight::get().writes(3_u64))
@@ -2940,12 +2936,12 @@ impl WeightInfo for () {
 	/// The range of component `r` is `[0, 1600]`.
 	fn seal_random(r: u32, ) -> Weight {
 		// Proof Size summary in bytes:
-		//  Measured:  `911 + r * (10 ±0)`
-		//  Estimated: `6852 + r * (10 ±0)`
-		// Minimum execution time: 270_547_000 picoseconds.
-		Weight::from_parts(295_931_189, 6852)
-			// Standard Error: 3_280
-			.saturating_add(Weight::from_parts(1_941_248, 0).saturating_mul(r.into()))
+		//  Measured:  `944 + r * (10 ±0)`
+		//  Estimated: `6885 + r * (10 ±0)`
+		// Minimum execution time: 260_609_000 picoseconds.
+		Weight::from_parts(287_385_076, 6885)
+			// Standard Error: 2_754
+			.saturating_add(Weight::from_parts(2_057_388, 0).saturating_mul(r.into()))
 			.saturating_add(RocksDbWeight::get().reads(9_u64))
 			.saturating_add(RocksDbWeight::get().writes(3_u64))
 			.saturating_add(Weight::from_parts(0, 10).saturating_mul(r.into()))
@@ -2967,12 +2963,12 @@ impl WeightInfo for () {
 	/// The range of component `r` is `[0, 1600]`.
 	fn seal_deposit_event(r: u32, ) -> Weight {
 		// Proof Size summary in bytes:
-		//  Measured:  `830 + r * (10 ±0)`
-		//  Estimated: `6772 + r * (10 ±0)`
-		// Minimum execution time: 255_730_000 picoseconds.
-		Weight::from_parts(301_859_471, 6772)
-			// Standard Error: 5_401
-			.saturating_add(Weight::from_parts(3_887_632, 0).saturating_mul(r.into()))
+		//  Measured:  `863 + r * (10 ±0)`
+		//  Estimated: `6805 + r * (10 ±0)`
+		// Minimum execution time: 254_770_000 picoseconds.
+		Weight::from_parts(255_105_647, 6805)
+			// Standard Error: 5_707
+			.saturating_add(Weight::from_parts(3_808_788, 0).saturating_mul(r.into()))
 			.saturating_add(RocksDbWeight::get().reads(8_u64))
 			.saturating_add(RocksDbWeight::get().writes(3_u64))
 			.saturating_add(Weight::from_parts(0, 10).saturating_mul(r.into()))
@@ -2995,14 +2991,14 @@ impl WeightInfo for () {
 	/// The range of component `n` is `[0, 16384]`.
 	fn seal_deposit_event_per_topic_and_byte(t: u32, n: u32, ) -> Weight {
 		// Proof Size summary in bytes:
-		//  Measured:  `847 + t * (32 ±0)`
-		//  Estimated: `6792 + t * (2508 ±0)`
-		// Minimum execution time: 276_643_000 picoseconds.
-		Weight::from_parts(294_275_838, 6792)
-			// Standard Error: 106_745
-			.saturating_add(Weight::from_parts(2_831_489, 0).saturating_mul(t.into()))
-			// Standard Error: 29
-			.saturating_add(Weight::from_parts(624, 0).saturating_mul(n.into()))
+		//  Measured:  `880 + t * (32 ±0)`
+		//  Estimated: `6825 + t * (2508 ±0)`
+		// Minimum execution time: 278_200_000 picoseconds.
+		Weight::from_parts(288_081_493, 6825)
+			// Standard Error: 97_535
+			.saturating_add(Weight::from_parts(3_683_455, 0).saturating_mul(t.into()))
+			// Standard Error: 27
+			.saturating_add(Weight::from_parts(731, 0).saturating_mul(n.into()))
 			.saturating_add(RocksDbWeight::get().reads(8_u64))
 			.saturating_add(RocksDbWeight::get().reads((1_u64).saturating_mul(t.into())))
 			.saturating_add(RocksDbWeight::get().writes(3_u64))
@@ -3026,12 +3022,12 @@ impl WeightInfo for () {
 	/// The range of component `r` is `[0, 1600]`.
 	fn seal_debug_message(r: u32, ) -> Weight {
 		// Proof Size summary in bytes:
-		//  Measured:  `829 + r * (7 ±0)`
-		//  Estimated: `6774 + r * (7 ±0)`
-		// Minimum execution time: 169_012_000 picoseconds.
-		Weight::from_parts(179_567_029, 6774)
-			// Standard Error: 534
-			.saturating_add(Weight::from_parts(249_500, 0).saturating_mul(r.into()))
+		//  Measured:  `862 + r * (7 ±0)`
+		//  Estimated: `6807 + r * (7 ±0)`
+		// Minimum execution time: 167_181_000 picoseconds.
+		Weight::from_parts(178_433_475, 6807)
+			// Standard Error: 374
+			.saturating_add(Weight::from_parts(241_240, 0).saturating_mul(r.into()))
 			.saturating_add(RocksDbWeight::get().reads(8_u64))
 			.saturating_add(RocksDbWeight::get().writes(3_u64))
 			.saturating_add(Weight::from_parts(0, 7).saturating_mul(r.into()))
@@ -3053,12 +3049,12 @@ impl WeightInfo for () {
 	/// The range of component `i` is `[0, 1048576]`.
 	fn seal_debug_message_per_byte(i: u32, ) -> Weight {
 		// Proof Size summary in bytes:
-		//  Measured:  `125780`
-		//  Estimated: `131722`
-		// Minimum execution time: 408_647_000 picoseconds.
-		Weight::from_parts(387_678_006, 131722)
-			// Standard Error: 12
-			.saturating_add(Weight::from_parts(1_045, 0).saturating_mul(i.into()))
+		//  Measured:  `125813`
+		//  Estimated: `131755`
+		// Minimum execution time: 434_456_000 picoseconds.
+		Weight::from_parts(400_940_450, 131755)
+			// Standard Error: 13
+			.saturating_add(Weight::from_parts(1_102, 0).saturating_mul(i.into()))
 			.saturating_add(RocksDbWeight::get().reads(8_u64))
 			.saturating_add(RocksDbWeight::get().writes(3_u64))
 	}
@@ -3067,12 +3063,12 @@ impl WeightInfo for () {
 	/// The range of component `r` is `[0, 800]`.
 	fn seal_set_storage(r: u32, ) -> Weight {
 		// Proof Size summary in bytes:
-		//  Measured:  `891 + r * (292 ±0)`
-		//  Estimated: `892 + r * (293 ±0)`
-		// Minimum execution time: 279_315_000 picoseconds.
-		Weight::from_parts(171_270_899, 892)
-			// Standard Error: 15_492
-			.saturating_add(Weight::from_parts(6_776_878, 0).saturating_mul(r.into()))
+		//  Measured:  `924 + r * (292 ±0)`
+		//  Estimated: `925 + r * (293 ±0)`
+		// Minimum execution time: 277_825_000 picoseconds.
+		Weight::from_parts(159_688_263, 925)
+			// Standard Error: 13_610
+			.saturating_add(Weight::from_parts(7_145_641, 0).saturating_mul(r.into()))
 			.saturating_add(RocksDbWeight::get().reads(8_u64))
 			.saturating_add(RocksDbWeight::get().reads((1_u64).saturating_mul(r.into())))
 			.saturating_add(RocksDbWeight::get().writes(3_u64))
@@ -3084,12 +3080,12 @@ impl WeightInfo for () {
 	/// The range of component `n` is `[0, 16384]`.
 	fn seal_set_storage_per_new_byte(n: u32, ) -> Weight {
 		// Proof Size summary in bytes:
-		//  Measured:  `1413`
-		//  Estimated: `1396`
-		// Minimum execution time: 289_666_000 picoseconds.
-		Weight::from_parts(348_062_625, 1396)
-			// Standard Error: 79
-			.saturating_add(Weight::from_parts(532, 0).saturating_mul(n.into()))
+		//  Measured:  `1446`
+		//  Estimated: `1429`
+		// Minimum execution time: 284_745_000 picoseconds.
+		Weight::from_parts(345_928_316, 1429)
+			// Standard Error: 70
+			.saturating_add(Weight::from_parts(547, 0).saturating_mul(n.into()))
 			.saturating_add(RocksDbWeight::get().reads(12_u64))
 			.saturating_add(RocksDbWeight::get().writes(8_u64))
 	}
@@ -3098,12 +3094,12 @@ impl WeightInfo for () {
 	/// The range of component `n` is `[0, 16384]`.
 	fn seal_set_storage_per_old_byte(n: u32, ) -> Weight {
 		// Proof Size summary in bytes:
-		//  Measured:  `1219 + n * (1 ±0)`
-		//  Estimated: `1219 + n * (1 ±0)`
-		// Minimum execution time: 273_840_000 picoseconds.
-		Weight::from_parts(297_024_621, 1219)
-			// Standard Error: 55
-			.saturating_add(Weight::from_parts(945, 0).saturating_mul(n.into()))
+		//  Measured:  `1252 + n * (1 ±0)`
+		//  Estimated: `1252 + n * (1 ±0)`
+		// Minimum execution time: 275_328_000 picoseconds.
+		Weight::from_parts(300_037_010, 1252)
+			// Standard Error: 32
+			.saturating_add(Weight::from_parts(558, 0).saturating_mul(n.into()))
 			.saturating_add(RocksDbWeight::get().reads(9_u64))
 			.saturating_add(RocksDbWeight::get().writes(4_u64))
 			.saturating_add(Weight::from_parts(0, 1).saturating_mul(n.into()))
@@ -3113,12 +3109,12 @@ impl WeightInfo for () {
 	/// The range of component `r` is `[0, 800]`.
 	fn seal_clear_storage(r: u32, ) -> Weight {
 		// Proof Size summary in bytes:
-		//  Measured:  `887 + r * (288 ±0)`
-		//  Estimated: `893 + r * (289 ±0)`
-		// Minimum execution time: 279_110_000 picoseconds.
-		Weight::from_parts(177_898_012, 893)
-			// Standard Error: 16_287
-			.saturating_add(Weight::from_parts(6_640_103, 0).saturating_mul(r.into()))
+		//  Measured:  `920 + r * (288 ±0)`
+		//  Estimated: `926 + r * (289 ±0)`
+		// Minimum execution time: 273_742_000 picoseconds.
+		Weight::from_parts(169_430_806, 926)
+			// Standard Error: 11_821
+			.saturating_add(Weight::from_parts(6_927_074, 0).saturating_mul(r.into()))
 			.saturating_add(RocksDbWeight::get().reads(8_u64))
 			.saturating_add(RocksDbWeight::get().reads((1_u64).saturating_mul(r.into())))
 			.saturating_add(RocksDbWeight::get().writes(3_u64))
@@ -3130,10 +3126,12 @@ impl WeightInfo for () {
 	/// The range of component `n` is `[0, 16384]`.
 	fn seal_clear_storage_per_byte(n: u32, ) -> Weight {
 		// Proof Size summary in bytes:
-		//  Measured:  `1215 + n * (1 ±0)`
-		//  Estimated: `1215 + n * (1 ±0)`
-		// Minimum execution time: 276_566_000 picoseconds.
-		Weight::from_parts(304_992_376, 1215)
+		//  Measured:  `1248 + n * (1 ±0)`
+		//  Estimated: `1248 + n * (1 ±0)`
+		// Minimum execution time: 275_167_000 picoseconds.
+		Weight::from_parts(301_883_655, 1248)
+			// Standard Error: 35
+			.saturating_add(Weight::from_parts(4, 0).saturating_mul(n.into()))
 			.saturating_add(RocksDbWeight::get().reads(9_u64))
 			.saturating_add(RocksDbWeight::get().writes(4_u64))
 			.saturating_add(Weight::from_parts(0, 1).saturating_mul(n.into()))
@@ -3143,12 +3141,12 @@ impl WeightInfo for () {
 	/// The range of component `r` is `[0, 800]`.
 	fn seal_get_storage(r: u32, ) -> Weight {
 		// Proof Size summary in bytes:
-		//  Measured:  `887 + r * (296 ±0)`
-		//  Estimated: `889 + r * (297 ±0)`
-		// Minimum execution time: 266_285_000 picoseconds.
-		Weight::from_parts(200_488_939, 889)
-			// Standard Error: 11_193
-			.saturating_add(Weight::from_parts(5_467_725, 0).saturating_mul(r.into()))
+		//  Measured:  `920 + r * (296 ±0)`
+		//  Estimated: `922 + r * (297 ±0)`
+		// Minimum execution time: 274_628_000 picoseconds.
+		Weight::from_parts(195_255_092, 922)
+			// Standard Error: 9_109
+			.saturating_add(Weight::from_parts(5_707_060, 0).saturating_mul(r.into()))
 			.saturating_add(RocksDbWeight::get().reads(8_u64))
 			.saturating_add(RocksDbWeight::get().reads((1_u64).saturating_mul(r.into())))
 			.saturating_add(RocksDbWeight::get().writes(3_u64))
@@ -3159,12 +3157,12 @@ impl WeightInfo for () {
 	/// The range of component `n` is `[0, 16384]`.
 	fn seal_get_storage_per_byte(n: u32, ) -> Weight {
 		// Proof Size summary in bytes:
-		//  Measured:  `1231 + n * (1 ±0)`
-		//  Estimated: `1231 + n * (1 ±0)`
-		// Minimum execution time: 278_625_000 picoseconds.
-		Weight::from_parts(304_319_493, 1231)
-			// Standard Error: 39
-			.saturating_add(Weight::from_parts(415, 0).saturating_mul(n.into()))
+		//  Measured:  `1264 + n * (1 ±0)`
+		//  Estimated: `1264 + n * (1 ±0)`
+		// Minimum execution time: 274_202_000 picoseconds.
+		Weight::from_parts(296_440_752, 1264)
+			// Standard Error: 38
+			.saturating_add(Weight::from_parts(1_010, 0).saturating_mul(n.into()))
 			.saturating_add(RocksDbWeight::get().reads(9_u64))
 			.saturating_add(RocksDbWeight::get().writes(3_u64))
 			.saturating_add(Weight::from_parts(0, 1).saturating_mul(n.into()))
@@ -3174,12 +3172,12 @@ impl WeightInfo for () {
 	/// The range of component `r` is `[0, 800]`.
 	fn seal_contains_storage(r: u32, ) -> Weight {
 		// Proof Size summary in bytes:
-		//  Measured:  `898 + r * (288 ±0)`
-		//  Estimated: `895 + r * (289 ±0)`
-		// Minimum execution time: 271_851_000 picoseconds.
-		Weight::from_parts(202_164_395, 895)
-			// Standard Error: 11_115
-			.saturating_add(Weight::from_parts(5_273_320, 0).saturating_mul(r.into()))
+		//  Measured:  `931 + r * (288 ±0)`
+		//  Estimated: `928 + r * (289 ±0)`
+		// Minimum execution time: 274_123_000 picoseconds.
+		Weight::from_parts(193_280_535, 928)
+			// Standard Error: 9_264
+			.saturating_add(Weight::from_parts(5_548_039, 0).saturating_mul(r.into()))
 			.saturating_add(RocksDbWeight::get().reads(8_u64))
 			.saturating_add(RocksDbWeight::get().reads((1_u64).saturating_mul(r.into())))
 			.saturating_add(RocksDbWeight::get().writes(3_u64))
@@ -3190,12 +3188,12 @@ impl WeightInfo for () {
 	/// The range of component `n` is `[0, 16384]`.
 	fn seal_contains_storage_per_byte(n: u32, ) -> Weight {
 		// Proof Size summary in bytes:
-		//  Measured:  `1218 + n * (1 ±0)`
-		//  Estimated: `1218 + n * (1 ±0)`
-		// Minimum execution time: 274_200_000 picoseconds.
-		Weight::from_parts(299_524_586, 1218)
-			// Standard Error: 33
-			.saturating_add(Weight::from_parts(272, 0).saturating_mul(n.into()))
+		//  Measured:  `1251 + n * (1 ±0)`
+		//  Estimated: `1251 + n * (1 ±0)`
+		// Minimum execution time: 276_425_000 picoseconds.
+		Weight::from_parts(300_521_806, 1251)
+			// Standard Error: 36
+			.saturating_add(Weight::from_parts(83, 0).saturating_mul(n.into()))
 			.saturating_add(RocksDbWeight::get().reads(9_u64))
 			.saturating_add(RocksDbWeight::get().writes(3_u64))
 			.saturating_add(Weight::from_parts(0, 1).saturating_mul(n.into()))
@@ -3205,12 +3203,12 @@ impl WeightInfo for () {
 	/// The range of component `r` is `[0, 800]`.
 	fn seal_take_storage(r: u32, ) -> Weight {
 		// Proof Size summary in bytes:
-		//  Measured:  `880 + r * (296 ±0)`
-		//  Estimated: `885 + r * (297 ±0)`
-		// Minimum execution time: 258_535_000 picoseconds.
-		Weight::from_parts(190_468_808, 885)
-			// Standard Error: 11_940
-			.saturating_add(Weight::from_parts(6_737_079, 0).saturating_mul(r.into()))
+		//  Measured:  `913 + r * (296 ±0)`
+		//  Estimated: `918 + r * (297 ±0)`
+		// Minimum execution time: 264_860_000 picoseconds.
+		Weight::from_parts(191_561_777, 918)
+			// Standard Error: 10_678
+			.saturating_add(Weight::from_parts(6_895_457, 0).saturating_mul(r.into()))
 			.saturating_add(RocksDbWeight::get().reads(8_u64))
 			.saturating_add(RocksDbWeight::get().reads((1_u64).saturating_mul(r.into())))
 			.saturating_add(RocksDbWeight::get().writes(3_u64))
@@ -3222,12 +3220,12 @@ impl WeightInfo for () {
 	/// The range of component `n` is `[0, 16384]`.
 	fn seal_take_storage_per_byte(n: u32, ) -> Weight {
 		// Proof Size summary in bytes:
-		//  Measured:  `1232 + n * (1 ±0)`
-		//  Estimated: `1232 + n * (1 ±0)`
-		// Minimum execution time: 280_536_000 picoseconds.
-		Weight::from_parts(304_479_477, 1232)
+		//  Measured:  `1265 + n * (1 ±0)`
+		//  Estimated: `1265 + n * (1 ±0)`
+		// Minimum execution time: 282_501_000 picoseconds.
+		Weight::from_parts(303_351_919, 1265)
 			// Standard Error: 37
-			.saturating_add(Weight::from_parts(534, 0).saturating_mul(n.into()))
+			.saturating_add(Weight::from_parts(643, 0).saturating_mul(n.into()))
 			.saturating_add(RocksDbWeight::get().reads(9_u64))
 			.saturating_add(RocksDbWeight::get().writes(4_u64))
 			.saturating_add(Weight::from_parts(0, 1).saturating_mul(n.into()))
@@ -3249,12 +3247,12 @@ impl WeightInfo for () {
 	/// The range of component `r` is `[0, 1600]`.
 	fn seal_transfer(r: u32, ) -> Weight {
 		// Proof Size summary in bytes:
-		//  Measured:  `1382 + r * (45 ±0)`
-		//  Estimated: `7274 + r * (2520 ±0)`
-		// Minimum execution time: 260_373_000 picoseconds.
-		Weight::from_parts(278_290_000, 7274)
-			// Standard Error: 25_683
-			.saturating_add(Weight::from_parts(39_264_864, 0).saturating_mul(r.into()))
+		//  Measured:  `1415 + r * (45 ±0)`
+		//  Estimated: `7307 + r * (2520 ±0)`
+		// Minimum execution time: 273_198_000 picoseconds.
+		Weight::from_parts(179_673_238, 7307)
+			// Standard Error: 34_990
+			.saturating_add(Weight::from_parts(38_468_091, 0).saturating_mul(r.into()))
 			.saturating_add(RocksDbWeight::get().reads(9_u64))
 			.saturating_add(RocksDbWeight::get().reads((1_u64).saturating_mul(r.into())))
 			.saturating_add(RocksDbWeight::get().writes(4_u64))
@@ -3278,12 +3276,12 @@ impl WeightInfo for () {
 	/// The range of component `r` is `[0, 800]`.
 	fn seal_call(r: u32, ) -> Weight {
 		// Proof Size summary in bytes:
-		//  Measured:  `1227 + r * (245 ±0)`
-		//  Estimated: `9407 + r * (2721 ±0)`
-		// Minimum execution time: 277_621_000 picoseconds.
-		Weight::from_parts(281_775_000, 9407)
-			// Standard Error: 110_802
-			.saturating_add(Weight::from_parts(245_363_533, 0).saturating_mul(r.into()))
+		//  Measured:  `1260 + r * (245 ±0)`
+		//  Estimated: `9440 + r * (2721 ±0)`
+		// Minimum execution time: 283_869_000 picoseconds.
+		Weight::from_parts(288_374_000, 9440)
+			// Standard Error: 137_512
+			.saturating_add(Weight::from_parts(248_206_665, 0).saturating_mul(r.into()))
 			.saturating_add(RocksDbWeight::get().reads(11_u64))
 			.saturating_add(RocksDbWeight::get().reads((2_u64).saturating_mul(r.into())))
 			.saturating_add(RocksDbWeight::get().writes(4_u64))
@@ -3308,11 +3306,11 @@ impl WeightInfo for () {
 	fn seal_delegate_call(r: u32, ) -> Weight {
 		// Proof Size summary in bytes:
 		//  Measured:  `0 + r * (576 ±0)`
-		//  Estimated: `6779 + r * (2637 ±3)`
-		// Minimum execution time: 267_314_000 picoseconds.
-		Weight::from_parts(279_888_000, 6779)
-			// Standard Error: 144_378
-			.saturating_add(Weight::from_parts(244_606_414, 0).saturating_mul(r.into()))
+		//  Estimated: `6812 + r * (2637 ±3)`
+		// Minimum execution time: 257_577_000 picoseconds.
+		Weight::from_parts(277_310_000, 6812)
+			// Standard Error: 150_204
+			.saturating_add(Weight::from_parts(249_943_483, 0).saturating_mul(r.into()))
 			.saturating_add(RocksDbWeight::get().reads(8_u64))
 			.saturating_add(RocksDbWeight::get().reads((3_u64).saturating_mul(r.into())))
 			.saturating_add(RocksDbWeight::get().writes(3_u64))
@@ -3337,14 +3335,14 @@ impl WeightInfo for () {
 	/// The range of component `c` is `[0, 1048576]`.
 	fn seal_call_per_transfer_clone_byte(t: u32, c: u32, ) -> Weight {
 		// Proof Size summary in bytes:
-		//  Measured:  `1274 + t * (277 ±0)`
-		//  Estimated: `12164 + t * (5227 ±0)`
-		// Minimum execution time: 477_589_000 picoseconds.
-		Weight::from_parts(70_712_793, 12164)
-			// Standard Error: 11_713_135
-			.saturating_add(Weight::from_parts(375_371_698, 0).saturating_mul(t.into()))
+		//  Measured:  `1307 + t * (277 ±0)`
+		//  Estimated: `12197 + t * (5227 ±0)`
+		// Minimum execution time: 471_081_000 picoseconds.
+		Weight::from_parts(79_081_122, 12197)
+			// Standard Error: 11_777_790
+			.saturating_add(Weight::from_parts(357_425_411, 0).saturating_mul(t.into()))
 			// Standard Error: 17
-			.saturating_add(Weight::from_parts(991, 0).saturating_mul(c.into()))
+			.saturating_add(Weight::from_parts(1_111, 0).saturating_mul(c.into()))
 			.saturating_add(RocksDbWeight::get().reads(13_u64))
 			.saturating_add(RocksDbWeight::get().reads((2_u64).saturating_mul(t.into())))
 			.saturating_add(RocksDbWeight::get().writes(6_u64))
@@ -3365,19 +3363,19 @@ impl WeightInfo for () {
 	/// Proof: `Timestamp::Now` (`max_values`: Some(1), `max_size`: Some(8), added: 503, mode: `Measured`)
 	/// Storage: `Contracts::Nonce` (r:1 w:1)
 	/// Proof: `Contracts::Nonce` (`max_values`: Some(1), `max_size`: Some(8), added: 503, mode: `Measured`)
-	/// Storage: `Balances::Holds` (r:800 w:800)
-	/// Proof: `Balances::Holds` (`max_values`: None, `max_size`: Some(85), added: 2560, mode: `Measured`)
 	/// Storage: `System::EventTopics` (r:803 w:803)
 	/// Proof: `System::EventTopics` (`max_values`: None, `max_size`: None, mode: `Measured`)
+	/// Storage: `Balances::Holds` (r:800 w:800)
+	/// Proof: `Balances::Holds` (`max_values`: None, `max_size`: Some(85), added: 2560, mode: `Measured`)
 	/// The range of component `r` is `[1, 800]`.
 	fn seal_instantiate(r: u32, ) -> Weight {
 		// Proof Size summary in bytes:
-		//  Measured:  `1245 + r * (255 ±0)`
-		//  Estimated: `9587 + r * (2731 ±0)`
-		// Minimum execution time: 662_502_000 picoseconds.
-		Weight::from_parts(671_726_000, 9587)
-			// Standard Error: 351_643
-			.saturating_add(Weight::from_parts(390_457_971, 0).saturating_mul(r.into()))
+		//  Measured:  `1278 + r * (255 ±0)`
+		//  Estimated: `9620 + r * (2731 ±0)`
+		// Minimum execution time: 672_742_000 picoseconds.
+		Weight::from_parts(680_025_000, 9620)
+			// Standard Error: 313_642
+			.saturating_add(Weight::from_parts(388_311_259, 0).saturating_mul(r.into()))
 			.saturating_add(RocksDbWeight::get().reads(11_u64))
 			.saturating_add(RocksDbWeight::get().reads((6_u64).saturating_mul(r.into())))
 			.saturating_add(RocksDbWeight::get().writes(7_u64))
@@ -3398,25 +3396,23 @@ impl WeightInfo for () {
 	/// Proof: `Timestamp::Now` (`max_values`: Some(1), `max_size`: Some(8), added: 503, mode: `Measured`)
 	/// Storage: `Contracts::Nonce` (r:1 w:1)
 	/// Proof: `Contracts::Nonce` (`max_values`: Some(1), `max_size`: Some(8), added: 503, mode: `Measured`)
-	/// Storage: `Balances::Holds` (r:1 w:1)
-	/// Proof: `Balances::Holds` (`max_values`: None, `max_size`: Some(85), added: 2560, mode: `Measured`)
 	/// Storage: `System::EventTopics` (r:4 w:4)
 	/// Proof: `System::EventTopics` (`max_values`: None, `max_size`: None, mode: `Measured`)
+	/// Storage: `Balances::Holds` (r:1 w:1)
+	/// Proof: `Balances::Holds` (`max_values`: None, `max_size`: Some(85), added: 2560, mode: `Measured`)
 	/// The range of component `t` is `[0, 1]`.
 	/// The range of component `i` is `[0, 983040]`.
 	/// The range of component `s` is `[0, 983040]`.
 	fn seal_instantiate_per_transfer_input_salt_byte(t: u32, i: u32, s: u32, ) -> Weight {
 		// Proof Size summary in bytes:
-		//  Measured:  `1270 + t * (104 ±0)`
-		//  Estimated: `12178 + t * (2549 ±1)`
-		// Minimum execution time: 2_675_525_000 picoseconds.
-		Weight::from_parts(851_421_242, 12178)
-			// Standard Error: 7_094_722
-			.saturating_add(Weight::from_parts(112_457_697, 0).saturating_mul(t.into()))
-			// Standard Error: 11
-			.saturating_add(Weight::from_parts(1_867, 0).saturating_mul(i.into()))
-			// Standard Error: 11
-			.saturating_add(Weight::from_parts(1_931, 0).saturating_mul(s.into()))
+		//  Measured:  `1303 + t * (104 ±0)`
+		//  Estimated: `12211 + t * (2549 ±1)`
+		// Minimum execution time: 2_733_870_000 picoseconds.
+		Weight::from_parts(1_001_793_458, 12211)
+			// Standard Error: 12
+			.saturating_add(Weight::from_parts(1_963, 0).saturating_mul(i.into()))
+			// Standard Error: 12
+			.saturating_add(Weight::from_parts(2_060, 0).saturating_mul(s.into()))
 			.saturating_add(RocksDbWeight::get().reads(16_u64))
 			.saturating_add(RocksDbWeight::get().reads((1_u64).saturating_mul(t.into())))
 			.saturating_add(RocksDbWeight::get().writes(11_u64))
@@ -3440,12 +3436,12 @@ impl WeightInfo for () {
 	/// The range of component `r` is `[0, 1600]`.
 	fn seal_hash_sha2_256(r: u32, ) -> Weight {
 		// Proof Size summary in bytes:
-		//  Measured:  `829 + r * (8 ±0)`
-		//  Estimated: `6768 + r * (8 ±0)`
-		// Minimum execution time: 270_818_000 picoseconds.
-		Weight::from_parts(286_520_166, 6768)
-			// Standard Error: 575
-			.saturating_add(Weight::from_parts(402_286, 0).saturating_mul(r.into()))
+		//  Measured:  `862 + r * (8 ±0)`
+		//  Estimated: `6801 + r * (8 ±0)`
+		// Minimum execution time: 272_658_000 picoseconds.
+		Weight::from_parts(282_717_645, 6801)
+			// Standard Error: 517
+			.saturating_add(Weight::from_parts(400_604, 0).saturating_mul(r.into()))
 			.saturating_add(RocksDbWeight::get().reads(8_u64))
 			.saturating_add(RocksDbWeight::get().writes(3_u64))
 			.saturating_add(Weight::from_parts(0, 8).saturating_mul(r.into()))
@@ -3467,12 +3463,12 @@ impl WeightInfo for () {
 	/// The range of component `n` is `[0, 1048576]`.
 	fn seal_hash_sha2_256_per_byte(n: u32, ) -> Weight {
 		// Proof Size summary in bytes:
-		//  Measured:  `837`
-		//  Estimated: `6775`
-		// Minimum execution time: 257_134_000 picoseconds.
-		Weight::from_parts(268_214_648, 6775)
-			// Standard Error: 1
-			.saturating_add(Weight::from_parts(1_098, 0).saturating_mul(n.into()))
+		//  Measured:  `870`
+		//  Estimated: `6808`
+		// Minimum execution time: 260_969_000 picoseconds.
+		Weight::from_parts(265_206_847, 6808)
+			// Standard Error: 2
+			.saturating_add(Weight::from_parts(1_134, 0).saturating_mul(n.into()))
 			.saturating_add(RocksDbWeight::get().reads(8_u64))
 			.saturating_add(RocksDbWeight::get().writes(3_u64))
 	}
@@ -3493,12 +3489,12 @@ impl WeightInfo for () {
 	/// The range of component `r` is `[0, 1600]`.
 	fn seal_hash_keccak_256(r: u32, ) -> Weight {
 		// Proof Size summary in bytes:
-		//  Measured:  `831 + r * (8 ±0)`
-		//  Estimated: `6773 + r * (8 ±0)`
-		// Minimum execution time: 259_222_000 picoseconds.
-		Weight::from_parts(283_273_283, 6773)
-			// Standard Error: 967
-			.saturating_add(Weight::from_parts(817_596, 0).saturating_mul(r.into()))
+		//  Measured:  `864 + r * (8 ±0)`
+		//  Estimated: `6806 + r * (8 ±0)`
+		// Minimum execution time: 262_351_000 picoseconds.
+		Weight::from_parts(286_974_296, 6806)
+			// Standard Error: 514
+			.saturating_add(Weight::from_parts(802_363, 0).saturating_mul(r.into()))
 			.saturating_add(RocksDbWeight::get().reads(8_u64))
 			.saturating_add(RocksDbWeight::get().writes(3_u64))
 			.saturating_add(Weight::from_parts(0, 8).saturating_mul(r.into()))
@@ -3520,12 +3516,12 @@ impl WeightInfo for () {
 	/// The range of component `n` is `[0, 1048576]`.
 	fn seal_hash_keccak_256_per_byte(n: u32, ) -> Weight {
 		// Proof Size summary in bytes:
-		//  Measured:  `839`
-		//  Estimated: `6781`
-		// Minimum execution time: 260_040_000 picoseconds.
-		Weight::from_parts(283_869_860, 6781)
+		//  Measured:  `872`
+		//  Estimated: `6814`
+		// Minimum execution time: 276_907_000 picoseconds.
+		Weight::from_parts(277_928_418, 6814)
 			// Standard Error: 1
-			.saturating_add(Weight::from_parts(3_349, 0).saturating_mul(n.into()))
+			.saturating_add(Weight::from_parts(3_410, 0).saturating_mul(n.into()))
 			.saturating_add(RocksDbWeight::get().reads(8_u64))
 			.saturating_add(RocksDbWeight::get().writes(3_u64))
 	}
@@ -3546,12 +3542,12 @@ impl WeightInfo for () {
 	/// The range of component `r` is `[0, 1600]`.
 	fn seal_hash_blake2_256(r: u32, ) -> Weight {
 		// Proof Size summary in bytes:
-		//  Measured:  `831 + r * (8 ±0)`
-		//  Estimated: `6775 + r * (8 ±0)`
-		// Minimum execution time: 260_698_000 picoseconds.
-		Weight::from_parts(282_900_345, 6775)
-			// Standard Error: 805
-			.saturating_add(Weight::from_parts(469_457, 0).saturating_mul(r.into()))
+		//  Measured:  `864 + r * (8 ±0)`
+		//  Estimated: `6808 + r * (8 ±0)`
+		// Minimum execution time: 263_660_000 picoseconds.
+		Weight::from_parts(285_665_916, 6808)
+			// Standard Error: 527
+			.saturating_add(Weight::from_parts(480_457, 0).saturating_mul(r.into()))
 			.saturating_add(RocksDbWeight::get().reads(8_u64))
 			.saturating_add(RocksDbWeight::get().writes(3_u64))
 			.saturating_add(Weight::from_parts(0, 8).saturating_mul(r.into()))
@@ -3573,12 +3569,12 @@ impl WeightInfo for () {
 	/// The range of component `n` is `[0, 1048576]`.
 	fn seal_hash_blake2_256_per_byte(n: u32, ) -> Weight {
 		// Proof Size summary in bytes:
-		//  Measured:  `839`
-		//  Estimated: `6780`
-		// Minimum execution time: 256_967_000 picoseconds.
-		Weight::from_parts(273_024_512, 6780)
+		//  Measured:  `872`
+		//  Estimated: `6813`
+		// Minimum execution time: 262_071_000 picoseconds.
+		Weight::from_parts(270_115_341, 6813)
 			// Standard Error: 1
-			.saturating_add(Weight::from_parts(1_204, 0).saturating_mul(n.into()))
+			.saturating_add(Weight::from_parts(1_254, 0).saturating_mul(n.into()))
 			.saturating_add(RocksDbWeight::get().reads(8_u64))
 			.saturating_add(RocksDbWeight::get().writes(3_u64))
 	}
@@ -3599,12 +3595,12 @@ impl WeightInfo for () {
 	/// The range of component `r` is `[0, 1600]`.
 	fn seal_hash_blake2_128(r: u32, ) -> Weight {
 		// Proof Size summary in bytes:
-		//  Measured:  `831 + r * (8 ±0)`
-		//  Estimated: `6772 + r * (8 ±0)`
-		// Minimum execution time: 272_039_000 picoseconds.
-		Weight::from_parts(289_853_116, 6772)
+		//  Measured:  `864 + r * (8 ±0)`
+		//  Estimated: `6805 + r * (8 ±0)`
+		// Minimum execution time: 265_568_000 picoseconds.
+		Weight::from_parts(285_791_811, 6805)
 			// Standard Error: 559
-			.saturating_add(Weight::from_parts(459_383, 0).saturating_mul(r.into()))
+			.saturating_add(Weight::from_parts(505_330, 0).saturating_mul(r.into()))
 			.saturating_add(RocksDbWeight::get().reads(8_u64))
 			.saturating_add(RocksDbWeight::get().writes(3_u64))
 			.saturating_add(Weight::from_parts(0, 8).saturating_mul(r.into()))
@@ -3626,12 +3622,12 @@ impl WeightInfo for () {
 	/// The range of component `n` is `[0, 1048576]`.
 	fn seal_hash_blake2_128_per_byte(n: u32, ) -> Weight {
 		// Proof Size summary in bytes:
-		//  Measured:  `839`
-		//  Estimated: `6778`
-		// Minimum execution time: 253_913_000 picoseconds.
-		Weight::from_parts(274_682_010, 6778)
-			// Standard Error: 1
-			.saturating_add(Weight::from_parts(1_204, 0).saturating_mul(n.into()))
+		//  Measured:  `872`
+		//  Estimated: `6811`
+		// Minimum execution time: 271_336_000 picoseconds.
+		Weight::from_parts(272_829_313, 6811)
+			// Standard Error: 0
+			.saturating_add(Weight::from_parts(1_252, 0).saturating_mul(n.into()))
 			.saturating_add(RocksDbWeight::get().reads(8_u64))
 			.saturating_add(RocksDbWeight::get().writes(3_u64))
 	}
@@ -3652,12 +3648,12 @@ impl WeightInfo for () {
 	/// The range of component `n` is `[0, 125697]`.
 	fn seal_sr25519_verify_per_byte(n: u32, ) -> Weight {
 		// Proof Size summary in bytes:
-		//  Measured:  `964 + n * (1 ±0)`
-		//  Estimated: `6901 + n * (1 ±0)`
-		// Minimum execution time: 343_955_000 picoseconds.
-		Weight::from_parts(350_777_388, 6901)
+		//  Measured:  `997 + n * (1 ±0)`
+		//  Estimated: `6934 + n * (1 ±0)`
+		// Minimum execution time: 351_146_000 picoseconds.
+		Weight::from_parts(355_368_323, 6934)
 			// Standard Error: 14
-			.saturating_add(Weight::from_parts(5_915, 0).saturating_mul(n.into()))
+			.saturating_add(Weight::from_parts(6_155, 0).saturating_mul(n.into()))
 			.saturating_add(RocksDbWeight::get().reads(8_u64))
 			.saturating_add(RocksDbWeight::get().writes(3_u64))
 			.saturating_add(Weight::from_parts(0, 1).saturating_mul(n.into()))
@@ -3679,12 +3675,12 @@ impl WeightInfo for () {
 	/// The range of component `r` is `[0, 160]`.
 	fn seal_sr25519_verify(r: u32, ) -> Weight {
 		// Proof Size summary in bytes:
-		//  Measured:  `774 + r * (112 ±0)`
-		//  Estimated: `6715 + r * (112 ±0)`
-		// Minimum execution time: 268_698_000 picoseconds.
-		Weight::from_parts(336_398_814, 6715)
-			// Standard Error: 16_627
-			.saturating_add(Weight::from_parts(56_155_384, 0).saturating_mul(r.into()))
+		//  Measured:  `807 + r * (112 ±0)`
+		//  Estimated: `6748 + r * (112 ±0)`
+		// Minimum execution time: 277_250_000 picoseconds.
+		Weight::from_parts(346_490_114, 6748)
+			// Standard Error: 14_654
+			.saturating_add(Weight::from_parts(56_127_492, 0).saturating_mul(r.into()))
 			.saturating_add(RocksDbWeight::get().reads(8_u64))
 			.saturating_add(RocksDbWeight::get().writes(3_u64))
 			.saturating_add(Weight::from_parts(0, 112).saturating_mul(r.into()))
@@ -3706,12 +3702,12 @@ impl WeightInfo for () {
 	/// The range of component `r` is `[0, 160]`.
 	fn seal_ecdsa_recover(r: u32, ) -> Weight {
 		// Proof Size summary in bytes:
-		//  Measured:  `874 + r * (76 ±0)`
-		//  Estimated: `6768 + r * (77 ±0)`
-		// Minimum execution time: 258_906_000 picoseconds.
-		Weight::from_parts(340_672_829, 6768)
-			// Standard Error: 18_295
-			.saturating_add(Weight::from_parts(46_106_884, 0).saturating_mul(r.into()))
+		//  Measured:  `907 + r * (76 ±0)`
+		//  Estimated: `6801 + r * (77 ±0)`
+		// Minimum execution time: 272_697_000 picoseconds.
+		Weight::from_parts(345_385_667, 6801)
+			// Standard Error: 14_226
+			.saturating_add(Weight::from_parts(46_037_637, 0).saturating_mul(r.into()))
 			.saturating_add(RocksDbWeight::get().reads(8_u64))
 			.saturating_add(RocksDbWeight::get().writes(3_u64))
 			.saturating_add(Weight::from_parts(0, 77).saturating_mul(r.into()))
@@ -3733,12 +3729,12 @@ impl WeightInfo for () {
 	/// The range of component `r` is `[0, 160]`.
 	fn seal_ecdsa_to_eth_address(r: u32, ) -> Weight {
 		// Proof Size summary in bytes:
-		//  Measured:  `844 + r * (42 ±0)`
-		//  Estimated: `6783 + r * (42 ±0)`
-		// Minimum execution time: 275_105_000 picoseconds.
-		Weight::from_parts(313_700_348, 6783)
-			// Standard Error: 11_960
-			.saturating_add(Weight::from_parts(12_050_300, 0).saturating_mul(r.into()))
+		//  Measured:  `877 + r * (42 ±0)`
+		//  Estimated: `6816 + r * (42 ±0)`
+		// Minimum execution time: 271_800_000 picoseconds.
+		Weight::from_parts(314_891_136, 6816)
+			// Standard Error: 9_762
+			.saturating_add(Weight::from_parts(11_949_979, 0).saturating_mul(r.into()))
 			.saturating_add(RocksDbWeight::get().reads(8_u64))
 			.saturating_add(RocksDbWeight::get().writes(3_u64))
 			.saturating_add(Weight::from_parts(0, 42).saturating_mul(r.into()))
@@ -3761,11 +3757,11 @@ impl WeightInfo for () {
 	fn seal_set_code_hash(r: u32, ) -> Weight {
 		// Proof Size summary in bytes:
 		//  Measured:  `0 + r * (965 ±0)`
-		//  Estimated: `6774 + r * (3090 ±7)`
-		// Minimum execution time: 259_178_000 picoseconds.
-		Weight::from_parts(275_643_000, 6774)
-			// Standard Error: 54_044
-			.saturating_add(Weight::from_parts(26_026_930, 0).saturating_mul(r.into()))
+		//  Estimated: `6807 + r * (3090 ±10)`
+		// Minimum execution time: 274_238_000 picoseconds.
+		Weight::from_parts(278_034_000, 6807)
+			// Standard Error: 77_011
+			.saturating_add(Weight::from_parts(27_627_005, 0).saturating_mul(r.into()))
 			.saturating_add(RocksDbWeight::get().reads(8_u64))
 			.saturating_add(RocksDbWeight::get().reads((3_u64).saturating_mul(r.into())))
 			.saturating_add(RocksDbWeight::get().writes(3_u64))
@@ -3789,12 +3785,12 @@ impl WeightInfo for () {
 	/// The range of component `r` is `[0, 32]`.
 	fn add_delegate_dependency(r: u32, ) -> Weight {
 		// Proof Size summary in bytes:
-		//  Measured:  `895 + r * (131 ±0)`
-		//  Estimated: `6845 + r * (2606 ±0)`
-		// Minimum execution time: 263_386_000 picoseconds.
-		Weight::from_parts(295_443_439, 6845)
-			// Standard Error: 24_422
-			.saturating_add(Weight::from_parts(6_429_537, 0).saturating_mul(r.into()))
+		//  Measured:  `928 + r * (131 ±0)`
+		//  Estimated: `6878 + r * (2606 ±0)`
+		// Minimum execution time: 271_519_000 picoseconds.
+		Weight::from_parts(292_726_476, 6878)
+			// Standard Error: 23_870
+			.saturating_add(Weight::from_parts(6_695_172, 0).saturating_mul(r.into()))
 			.saturating_add(RocksDbWeight::get().reads(8_u64))
 			.saturating_add(RocksDbWeight::get().reads((1_u64).saturating_mul(r.into())))
 			.saturating_add(RocksDbWeight::get().writes(3_u64))
@@ -3818,12 +3814,12 @@ impl WeightInfo for () {
 	/// The range of component `r` is `[0, 32]`.
 	fn remove_delegate_dependency(r: u32, ) -> Weight {
 		// Proof Size summary in bytes:
-		//  Measured:  `936 + r * (183 ±0)`
+		//  Measured:  `969 + r * (183 ±0)`
 		//  Estimated: `129453 + r * (2568 ±0)`
-		// Minimum execution time: 261_371_000 picoseconds.
-		Weight::from_parts(297_493_194, 129453)
-			// Standard Error: 23_734
-			.saturating_add(Weight::from_parts(5_673_169, 0).saturating_mul(r.into()))
+		// Minimum execution time: 274_675_000 picoseconds.
+		Weight::from_parts(293_727_489, 129453)
+			// Standard Error: 23_160
+			.saturating_add(Weight::from_parts(5_895_043, 0).saturating_mul(r.into()))
 			.saturating_add(RocksDbWeight::get().reads(8_u64))
 			.saturating_add(RocksDbWeight::get().reads((1_u64).saturating_mul(r.into())))
 			.saturating_add(RocksDbWeight::get().writes(3_u64))
@@ -3847,12 +3843,12 @@ impl WeightInfo for () {
 	/// The range of component `r` is `[0, 1600]`.
 	fn seal_reentrance_count(r: u32, ) -> Weight {
 		// Proof Size summary in bytes:
-		//  Measured:  `825 + r * (3 ±0)`
-		//  Estimated: `6771 + r * (3 ±0)`
-		// Minimum execution time: 275_558_000 picoseconds.
-		Weight::from_parts(287_220_765, 6771)
-			// Standard Error: 437
-			.saturating_add(Weight::from_parts(184_125, 0).saturating_mul(r.into()))
+		//  Measured:  `858 + r * (3 ±0)`
+		//  Estimated: `6804 + r * (3 ±0)`
+		// Minimum execution time: 253_330_000 picoseconds.
+		Weight::from_parts(281_079_564, 6804)
+			// Standard Error: 378
+			.saturating_add(Weight::from_parts(180_655, 0).saturating_mul(r.into()))
 			.saturating_add(RocksDbWeight::get().reads(8_u64))
 			.saturating_add(RocksDbWeight::get().writes(3_u64))
 			.saturating_add(Weight::from_parts(0, 3).saturating_mul(r.into()))
@@ -3874,12 +3870,12 @@ impl WeightInfo for () {
 	/// The range of component `r` is `[0, 1600]`.
 	fn seal_account_reentrance_count(r: u32, ) -> Weight {
 		// Proof Size summary in bytes:
-		//  Measured:  `2076 + r * (39 ±0)`
-		//  Estimated: `7866 + r * (40 ±0)`
-		// Minimum execution time: 265_752_000 picoseconds.
-		Weight::from_parts(331_187_665, 7866)
-			// Standard Error: 1_950
-			.saturating_add(Weight::from_parts(312_262, 0).saturating_mul(r.into()))
+		//  Measured:  `2109 + r * (39 ±0)`
+		//  Estimated: `7899 + r * (40 ±0)`
+		// Minimum execution time: 276_552_000 picoseconds.
+		Weight::from_parts(368_521_088, 7899)
+			// Standard Error: 2_310
+			.saturating_add(Weight::from_parts(318_129, 0).saturating_mul(r.into()))
 			.saturating_add(RocksDbWeight::get().reads(8_u64))
 			.saturating_add(RocksDbWeight::get().writes(3_u64))
 			.saturating_add(Weight::from_parts(0, 40).saturating_mul(r.into()))
@@ -3903,12 +3899,12 @@ impl WeightInfo for () {
 	/// The range of component `r` is `[0, 1600]`.
 	fn seal_instantiation_nonce(r: u32, ) -> Weight {
 		// Proof Size summary in bytes:
-		//  Measured:  `828 + r * (3 ±0)`
-		//  Estimated: `6768 + r * (3 ±0)`
-		// Minimum execution time: 257_114_000 picoseconds.
-		Weight::from_parts(286_686_654, 6768)
-			// Standard Error: 426
-			.saturating_add(Weight::from_parts(162_295, 0).saturating_mul(r.into()))
+		//  Measured:  `861 + r * (3 ±0)`
+		//  Estimated: `6801 + r * (3 ±0)`
+		// Minimum execution time: 258_953_000 picoseconds.
+		Weight::from_parts(288_222_836, 6801)
+			// Standard Error: 367
+			.saturating_add(Weight::from_parts(152_842, 0).saturating_mul(r.into()))
 			.saturating_add(RocksDbWeight::get().reads(9_u64))
 			.saturating_add(RocksDbWeight::get().writes(4_u64))
 			.saturating_add(Weight::from_parts(0, 3).saturating_mul(r.into()))
@@ -3918,9 +3914,9 @@ impl WeightInfo for () {
 		// Proof Size summary in bytes:
 		//  Measured:  `0`
 		//  Estimated: `0`
-		// Minimum execution time: 1_388_000 picoseconds.
-		Weight::from_parts(1_680_408, 0)
-			// Standard Error: 21
-			.saturating_add(Weight::from_parts(10_564, 0).saturating_mul(r.into()))
+		// Minimum execution time: 1_476_000 picoseconds.
+		Weight::from_parts(2_119_717, 0)
+			// Standard Error: 28
+			.saturating_add(Weight::from_parts(9_805, 0).saturating_mul(r.into()))
 	}
 }
diff --git a/substrate/frame/conviction-voting/Cargo.toml b/substrate/frame/conviction-voting/Cargo.toml
index 303d9f57e0984128d5e8f136de7a1bd87672b026..666a02e9b2396d83b221cbd3502281d362bba86f 100644
--- a/substrate/frame/conviction-voting/Cargo.toml
+++ b/substrate/frame/conviction-voting/Cargo.toml
@@ -1,11 +1,11 @@
 [package]
 name = "pallet-conviction-voting"
 version = "4.0.0-dev"
-authors = ["Parity Technologies <admin@parity.io>"]
-edition = "2021"
+authors.workspace = true
+edition.workspace = true
 license = "Apache-2.0"
 homepage = "https://substrate.io"
-repository = "https://github.com/paritytech/substrate/"
+repository.workspace = true
 description = "FRAME pallet for conviction voting in referenda"
 readme = "README.md"
 
@@ -19,7 +19,7 @@ codec = { package = "parity-scale-codec", version = "3.6.1", default-features =
 	"max-encoded-len",
 ] }
 scale-info = { version = "2.5.0", default-features = false, features = ["derive"] }
-serde = { version = "1.0.163", features = ["derive"], optional = true }
+serde = { version = "1.0.188", features = ["derive"], optional = true }
 frame-benchmarking = { path = "../benchmarking", default-features = false, optional = true}
 frame-support = { path = "../support", default-features = false}
 frame-system = { path = "../system", default-features = false}
@@ -51,7 +51,6 @@ std = [
 runtime-benchmarks = [
 	"frame-benchmarking/runtime-benchmarks",
 	"frame-support/runtime-benchmarks",
-	"frame-support/runtime-benchmarks",
 	"frame-system/runtime-benchmarks",
 	"pallet-balances/runtime-benchmarks",
 	"pallet-scheduler/runtime-benchmarks",
diff --git a/substrate/frame/conviction-voting/src/lib.rs b/substrate/frame/conviction-voting/src/lib.rs
index 9c2993fc5cae19215eeb973b97fe9d057983b92b..1d6fbaa38694233a6766410728bf8efec0671d0e 100644
--- a/substrate/frame/conviction-voting/src/lib.rs
+++ b/substrate/frame/conviction-voting/src/lib.rs
@@ -28,7 +28,7 @@
 #![cfg_attr(not(feature = "std"), no_std)]
 
 use frame_support::{
-	dispatch::{DispatchError, DispatchResult},
+	dispatch::DispatchResult,
 	ensure,
 	traits::{
 		fungible, Currency, Get, LockIdentifier, LockableCurrency, PollStatus, Polling,
@@ -38,7 +38,7 @@ use frame_support::{
 use frame_system::pallet_prelude::BlockNumberFor;
 use sp_runtime::{
 	traits::{AtLeast32BitUnsigned, Saturating, StaticLookup, Zero},
-	ArithmeticError, Perbill,
+	ArithmeticError, DispatchError, Perbill,
 };
 use sp_std::prelude::*;
 
@@ -86,8 +86,15 @@ type ClassOf<T, I = ()> = <<T as Config<I>>::Polls as Polling<TallyOf<T, I>>>::C
 #[frame_support::pallet]
 pub mod pallet {
 	use super::*;
-	use frame_support::{pallet_prelude::*, traits::ClassCountOf};
+	use frame_support::{
+		pallet_prelude::{
+			DispatchResultWithPostInfo, IsType, StorageDoubleMap, StorageMap, ValueQuery,
+		},
+		traits::ClassCountOf,
+		Twox64Concat,
+	};
 	use frame_system::pallet_prelude::*;
+	use sp_runtime::BoundedVec;
 
 	#[pallet::pallet]
 	pub struct Pallet<T, I = ()>(_);
diff --git a/substrate/frame/core-fellowship/Cargo.toml b/substrate/frame/core-fellowship/Cargo.toml
index f27791f9c9f5125c0987fe0bfbcffa90e35ac224..62e0186cd5c9f7a9c903ab9c2fe66ba8638d0d2b 100644
--- a/substrate/frame/core-fellowship/Cargo.toml
+++ b/substrate/frame/core-fellowship/Cargo.toml
@@ -1,11 +1,11 @@
 [package]
 name = "pallet-core-fellowship"
 version = "4.0.0-dev"
-authors = ["Parity Technologies <admin@parity.io>"]
-edition = "2021"
+authors.workspace = true
+edition.workspace = true
 license = "Apache-2.0"
 homepage = "https://substrate.io"
-repository = "https://github.com/paritytech/substrate/"
+repository.workspace = true
 description = "Logic as per the description of The Fellowship for core Polkadot technology"
 readme = "README.md"
 
diff --git a/substrate/frame/core-fellowship/README.md b/substrate/frame/core-fellowship/README.md
index 3c9b1f63e08961e7f1a0634e04018ed6b0fc85b2..97718eef7a32ca69319fc106c2284aee4deab02a 100644
--- a/substrate/frame/core-fellowship/README.md
+++ b/substrate/frame/core-fellowship/README.md
@@ -1,3 +1,3 @@
 # Core Fellowship
 
-Logic specific to the core Polkadot Fellowship.
\ No newline at end of file
+Logic specific to the core Polkadot Fellowship.
diff --git a/substrate/frame/core-fellowship/src/lib.rs b/substrate/frame/core-fellowship/src/lib.rs
index ace614d2bddb9d1fec24bb24252ebe18e8f51dec..1aa53cf08d17499bedc2fd4e6d11f78240426123 100644
--- a/substrate/frame/core-fellowship/src/lib.rs
+++ b/substrate/frame/core-fellowship/src/lib.rs
@@ -1,6 +1,6 @@
 // This file is part of Substrate.
 
-// Copyright (C) 2017-2022 Parity Technologies (UK) Ltd.
+// Copyright (C) Parity Technologies (UK) Ltd.
 // SPDX-License-Identifier: Apache-2.0
 
 // Licensed under the Apache License, Version 2.0 (the "License");
diff --git a/substrate/frame/core-fellowship/src/tests.rs b/substrate/frame/core-fellowship/src/tests.rs
index c95699e66e41be802e3163d54f5bbe6ae376c4ec..a02c010718c91c37bfdde1f9eef7878ded0013b9 100644
--- a/substrate/frame/core-fellowship/src/tests.rs
+++ b/substrate/frame/core-fellowship/src/tests.rs
@@ -1,6 +1,6 @@
 // This file is part of Substrate.
 
-// Copyright (C) 2017-2022 Parity Technologies (UK) Ltd.
+// Copyright (C) Parity Technologies (UK) Ltd.
 // SPDX-License-Identifier: Apache-2.0
 
 // Licensed under the Apache License, Version 2.0 (the "License");
diff --git a/substrate/frame/democracy/Cargo.toml b/substrate/frame/democracy/Cargo.toml
index 71cd78913eb30fcc053187871b59de714b51bee9..038e8d2cef47d7e86d69d932d67e97131b22de5c 100644
--- a/substrate/frame/democracy/Cargo.toml
+++ b/substrate/frame/democracy/Cargo.toml
@@ -1,11 +1,11 @@
 [package]
 name = "pallet-democracy"
 version = "4.0.0-dev"
-authors = ["Parity Technologies <admin@parity.io>"]
-edition = "2021"
+authors.workspace = true
+edition.workspace = true
 license = "Apache-2.0"
 homepage = "https://substrate.io"
-repository = "https://github.com/paritytech/substrate/"
+repository.workspace = true
 description = "FRAME pallet for democracy"
 readme = "README.md"
 
@@ -17,7 +17,7 @@ codec = { package = "parity-scale-codec", version = "3.6.1", default-features =
 	"derive",
 ] }
 scale-info = { version = "2.5.0", default-features = false, features = ["derive"] }
-serde = { version = "1.0.163", features = ["derive"], optional = true }
+serde = { version = "1.0.188", features = ["derive"], optional = true }
 frame-benchmarking = { path = "../benchmarking", default-features = false, optional = true}
 frame-support = { path = "../support", default-features = false}
 frame-system = { path = "../system", default-features = false}
diff --git a/substrate/frame/democracy/src/benchmarking.rs b/substrate/frame/democracy/src/benchmarking.rs
index e4a21a4e1d9b8a1a82c7b45f96bba22264383ed5..b4aa17726b8d28869110f44acbd6d21895da5218 100644
--- a/substrate/frame/democracy/src/benchmarking.rs
+++ b/substrate/frame/democracy/src/benchmarking.rs
@@ -25,7 +25,6 @@ use frame_support::{
 	traits::{Currency, EnsureOrigin, Get, OnInitialize, UnfilteredDispatchable},
 };
 use frame_system::{pallet_prelude::BlockNumberFor, RawOrigin};
-use sp_core::H256;
 use sp_runtime::{traits::Bounded, BoundedVec};
 
 use crate::Pallet as Democracy;
@@ -46,7 +45,7 @@ fn make_proposal<T: Config>(n: u32) -> BoundedCallOf<T> {
 	<T as Config>::Preimages::bound(call).unwrap()
 }
 
-fn add_proposal<T: Config>(n: u32) -> Result<H256, &'static str> {
+fn add_proposal<T: Config>(n: u32) -> Result<T::Hash, &'static str> {
 	let other = funded_account::<T>("proposer", n);
 	let value = T::MinimumDeposit::get();
 	let proposal = make_proposal::<T>(n);
@@ -55,7 +54,7 @@ fn add_proposal<T: Config>(n: u32) -> Result<H256, &'static str> {
 }
 
 // add a referendum with a metadata.
-fn add_referendum<T: Config>(n: u32) -> (ReferendumIndex, H256, PreimageHash) {
+fn add_referendum<T: Config>(n: u32) -> (ReferendumIndex, T::Hash, T::Hash) {
 	let vote_threshold = VoteThreshold::SimpleMajority;
 	let proposal = make_proposal::<T>(n);
 	let hash = proposal.hash();
@@ -85,7 +84,7 @@ fn assert_has_event<T: Config>(generic_event: <T as Config>::RuntimeEvent) {
 }
 
 // note a new preimage.
-fn note_preimage<T: Config>() -> PreimageHash {
+fn note_preimage<T: Config>() -> T::Hash {
 	use core::sync::atomic::{AtomicU8, Ordering};
 	use sp_std::borrow::Cow;
 	// note a new preimage on every function invoke.
diff --git a/substrate/frame/democracy/src/lib.rs b/substrate/frame/democracy/src/lib.rs
index e538d31c6ad0312e9a81d155786fac16ab403c54..089556191cd14eee735d12976ba6b0ed471a4eac 100644
--- a/substrate/frame/democracy/src/lib.rs
+++ b/substrate/frame/democracy/src/lib.rs
@@ -159,9 +159,8 @@ use frame_support::{
 	traits::{
 		defensive_prelude::*,
 		schedule::{v3::Named as ScheduleNamed, DispatchTime},
-		Bounded, Currency, EnsureOrigin, Get, Hash as PreimageHash, LockIdentifier,
-		LockableCurrency, OnUnbalanced, QueryPreimage, ReservableCurrency, StorePreimage,
-		WithdrawReasons,
+		Bounded, Currency, EnsureOrigin, Get, LockIdentifier, LockableCurrency, OnUnbalanced,
+		QueryPreimage, ReservableCurrency, StorePreimage, WithdrawReasons,
 	},
 	weights::Weight,
 };
@@ -203,7 +202,7 @@ type NegativeImbalanceOf<T> = <<T as Config>::Currency as Currency<
 	<T as frame_system::Config>::AccountId,
 >>::NegativeImbalance;
 pub type CallOf<T> = <T as frame_system::Config>::RuntimeCall;
-pub type BoundedCallOf<T> = Bounded<CallOf<T>>;
+pub type BoundedCallOf<T> = Bounded<CallOf<T>, <T as frame_system::Config>::Hashing>;
 type AccountIdLookupOf<T> = <<T as frame_system::Config>::Lookup as StaticLookup>::Source;
 
 #[frame_support::pallet]
@@ -211,7 +210,6 @@ pub mod pallet {
 	use super::{DispatchResult, *};
 	use frame_support::pallet_prelude::*;
 	use frame_system::pallet_prelude::*;
-	use sp_core::H256;
 
 	/// The current storage version.
 	const STORAGE_VERSION: StorageVersion = StorageVersion::new(1);
@@ -226,10 +224,15 @@ pub mod pallet {
 		type RuntimeEvent: From<Event<Self>> + IsType<<Self as frame_system::Config>::RuntimeEvent>;
 
 		/// The Scheduler.
-		type Scheduler: ScheduleNamed<BlockNumberFor<Self>, CallOf<Self>, Self::PalletsOrigin>;
+		type Scheduler: ScheduleNamed<
+			BlockNumberFor<Self>,
+			CallOf<Self>,
+			Self::PalletsOrigin,
+			Hasher = Self::Hashing,
+		>;
 
 		/// The Preimage provider.
-		type Preimages: QueryPreimage + StorePreimage;
+		type Preimages: QueryPreimage<H = Self::Hashing> + StorePreimage;
 
 		/// Currency type for this pallet.
 		type Currency: ReservableCurrency<Self::AccountId>
@@ -421,22 +424,22 @@ pub mod pallet {
 	pub type Blacklist<T: Config> = StorageMap<
 		_,
 		Identity,
-		H256,
+		T::Hash,
 		(BlockNumberFor<T>, BoundedVec<T::AccountId, T::MaxBlacklisted>),
 	>;
 
 	/// Record of all proposals that have been subject to emergency cancellation.
 	#[pallet::storage]
-	pub type Cancellations<T: Config> = StorageMap<_, Identity, H256, bool, ValueQuery>;
+	pub type Cancellations<T: Config> = StorageMap<_, Identity, T::Hash, bool, ValueQuery>;
 
 	/// General information concerning any proposal or referendum.
-	/// The `PreimageHash` refers to the preimage of the `Preimages` provider which can be a JSON
+	/// The `Hash` refers to the preimage of the `Preimages` provider which can be a JSON
 	/// dump or IPFS hash of a JSON file.
 	///
 	/// Consider a garbage collection for a metadata of finished referendums to `unrequest` (remove)
 	/// large preimages.
 	#[pallet::storage]
-	pub type MetadataOf<T: Config> = StorageMap<_, Blake2_128Concat, MetadataOwner, PreimageHash>;
+	pub type MetadataOf<T: Config> = StorageMap<_, Blake2_128Concat, MetadataOwner, T::Hash>;
 
 	#[pallet::genesis_config]
 	#[derive(frame_support::DefaultNoBound)]
@@ -476,9 +479,9 @@ pub mod pallet {
 		/// An account has cancelled a previous delegation operation.
 		Undelegated { account: T::AccountId },
 		/// An external proposal has been vetoed.
-		Vetoed { who: T::AccountId, proposal_hash: H256, until: BlockNumberFor<T> },
+		Vetoed { who: T::AccountId, proposal_hash: T::Hash, until: BlockNumberFor<T> },
 		/// A proposal_hash has been blacklisted permanently.
-		Blacklisted { proposal_hash: H256 },
+		Blacklisted { proposal_hash: T::Hash },
 		/// An account has voted in a referendum
 		Voted { voter: T::AccountId, ref_index: ReferendumIndex, vote: AccountVote<BalanceOf<T>> },
 		/// An account has secconded a proposal
@@ -490,14 +493,14 @@ pub mod pallet {
 			/// Metadata owner.
 			owner: MetadataOwner,
 			/// Preimage hash.
-			hash: PreimageHash,
+			hash: T::Hash,
 		},
 		/// Metadata for a proposal or a referendum has been cleared.
 		MetadataCleared {
 			/// Metadata owner.
 			owner: MetadataOwner,
 			/// Preimage hash.
-			hash: PreimageHash,
+			hash: T::Hash,
 		},
 		/// Metadata has been transferred to new owner.
 		MetadataTransferred {
@@ -506,7 +509,7 @@ pub mod pallet {
 			/// New metadata owner.
 			owner: MetadataOwner,
 			/// Preimage hash.
-			hash: PreimageHash,
+			hash: T::Hash,
 		},
 	}
 
@@ -775,7 +778,7 @@ pub mod pallet {
 		#[pallet::weight(T::WeightInfo::fast_track())]
 		pub fn fast_track(
 			origin: OriginFor<T>,
-			proposal_hash: H256,
+			proposal_hash: T::Hash,
 			voting_period: BlockNumberFor<T>,
 			delay: BlockNumberFor<T>,
 		) -> DispatchResult {
@@ -827,7 +830,7 @@ pub mod pallet {
 		/// Weight: `O(V + log(V))` where V is number of `existing vetoers`
 		#[pallet::call_index(8)]
 		#[pallet::weight(T::WeightInfo::veto_external())]
-		pub fn veto_external(origin: OriginFor<T>, proposal_hash: H256) -> DispatchResult {
+		pub fn veto_external(origin: OriginFor<T>, proposal_hash: T::Hash) -> DispatchResult {
 			let who = T::VetoOrigin::ensure_origin(origin)?;
 
 			if let Some((ext_proposal, _)) = NextExternal::<T>::get() {
@@ -1042,7 +1045,7 @@ pub mod pallet {
 		#[pallet::weight((T::WeightInfo::blacklist(), DispatchClass::Operational))]
 		pub fn blacklist(
 			origin: OriginFor<T>,
-			proposal_hash: H256,
+			proposal_hash: T::Hash,
 			maybe_ref_index: Option<ReferendumIndex>,
 		) -> DispatchResult {
 			T::BlacklistOrigin::ensure_origin(origin)?;
@@ -1139,7 +1142,7 @@ pub mod pallet {
 		pub fn set_metadata(
 			origin: OriginFor<T>,
 			owner: MetadataOwner,
-			maybe_hash: Option<PreimageHash>,
+			maybe_hash: Option<T::Hash>,
 		) -> DispatchResult {
 			match owner {
 				MetadataOwner::External => {
@@ -1173,15 +1176,16 @@ pub mod pallet {
 }
 
 pub trait EncodeInto: Encode {
-	fn encode_into<T: AsMut<[u8]> + Default>(&self) -> T {
+	fn encode_into<T: AsMut<[u8]> + Default, H: sp_core::Hasher>(&self) -> T {
 		let mut t = T::default();
 		self.using_encoded(|data| {
 			if data.len() <= t.as_mut().len() {
 				t.as_mut()[0..data.len()].copy_from_slice(data);
 			} else {
-				// encoded self is too big to fit into a T. hash it and use the first bytes of that
-				// instead.
-				let hash = sp_io::hashing::blake2_256(data);
+				// encoded self is too big to fit into a T.
+				// hash it and use the first bytes of that instead.
+				let hash = H::hash(&data);
+				let hash = hash.as_ref();
 				let l = t.as_mut().len().min(hash.len());
 				t.as_mut()[0..l].copy_from_slice(&hash[0..l]);
 			}
@@ -1610,7 +1614,7 @@ impl<T: Config> Pallet<T> {
 			// Earliest it can be scheduled for is next block.
 			let when = now.saturating_add(status.delay.max(One::one()));
 			if T::Scheduler::schedule_named(
-				(DEMOCRACY_ID, index).encode_into(),
+				(DEMOCRACY_ID, index).encode_into::<_, T::Hashing>(),
 				DispatchTime::At(when),
 				None,
 				63,
diff --git a/substrate/frame/democracy/src/tests.rs b/substrate/frame/democracy/src/tests.rs
index e5cfcc5b4002963387ef78126630ea7433ed63ab..ebccf32e342377a56999c49b6cdd6fa95504b943 100644
--- a/substrate/frame/democracy/src/tests.rs
+++ b/substrate/frame/democracy/src/tests.rs
@@ -111,8 +111,7 @@ impl pallet_preimage::Config for Test {
 	type WeightInfo = ();
 	type Currency = Balances;
 	type ManagerOrigin = EnsureRoot<u64>;
-	type BaseDeposit = ConstU64<0>;
-	type ByteDeposit = ConstU64<0>;
+	type Consideration = ();
 }
 
 impl pallet_scheduler::Config for Test {
@@ -278,7 +277,7 @@ fn tally(r: ReferendumIndex) -> Tally<u64> {
 }
 
 /// note a new preimage without registering.
-fn note_preimage(who: u64) -> PreimageHash {
+fn note_preimage(who: u64) -> <Test as frame_system::Config>::Hash {
 	use std::sync::atomic::{AtomicU8, Ordering};
 	// note a new preimage on every function invoke.
 	static COUNTER: AtomicU8 = AtomicU8::new(0);
diff --git a/substrate/frame/democracy/src/tests/metadata.rs b/substrate/frame/democracy/src/tests/metadata.rs
index 5a36d80b72637dbae4d931016df11484f2228256..1b6d66a8bc4486c555a5f0e1241f76280b33eeb7 100644
--- a/substrate/frame/democracy/src/tests/metadata.rs
+++ b/substrate/frame/democracy/src/tests/metadata.rs
@@ -22,9 +22,8 @@ use super::*;
 #[test]
 fn set_external_metadata_works() {
 	new_test_ext().execute_with(|| {
-		use frame_support::traits::Hash as PreimageHash;
 		// invalid preimage hash.
-		let invalid_hash: PreimageHash = [1u8; 32].into();
+		let invalid_hash: <Test as frame_system::Config>::Hash = [1u8; 32].into();
 		// metadata owner is an external proposal.
 		let owner = MetadataOwner::External;
 		// fails to set metadata if an external proposal does not exist.
@@ -83,9 +82,8 @@ fn clear_metadata_works() {
 #[test]
 fn set_proposal_metadata_works() {
 	new_test_ext().execute_with(|| {
-		use frame_support::traits::Hash as PreimageHash;
 		// invalid preimage hash.
-		let invalid_hash: PreimageHash = [1u8; 32].into();
+		let invalid_hash: <Test as frame_system::Config>::Hash = [1u8; 32].into();
 		// create an external proposal.
 		assert_ok!(propose_set_balance(1, 2, 5));
 		// metadata owner is a public proposal.
diff --git a/substrate/frame/election-provider-multi-phase/Cargo.toml b/substrate/frame/election-provider-multi-phase/Cargo.toml
index 54ae2718a8c448e6fdd88a9a228c26f884a400f3..b4a3337e41826b931a9840ca471d459daeff0e1e 100644
--- a/substrate/frame/election-provider-multi-phase/Cargo.toml
+++ b/substrate/frame/election-provider-multi-phase/Cargo.toml
@@ -1,11 +1,11 @@
 [package]
 name = "pallet-election-provider-multi-phase"
 version = "4.0.0-dev"
-authors = ["Parity Technologies <admin@parity.io>"]
-edition = "2021"
+authors.workspace = true
+edition.workspace = true
 license = "Apache-2.0"
 homepage = "https://substrate.io"
-repository = "https://github.com/paritytech/substrate/"
+repository.workspace = true
 description = "PALLET two phase election providers"
 
 [package.metadata.docs.rs]
@@ -56,7 +56,6 @@ std = [
 	"frame-support/std",
 	"frame-system/std",
 	"log/std",
-	"log/std",
 	"pallet-balances/std",
 	"pallet-election-provider-support-benchmarking?/std",
 	"rand/std",
diff --git a/substrate/frame/election-provider-multi-phase/src/lib.rs b/substrate/frame/election-provider-multi-phase/src/lib.rs
index f26a6f40d42677584d548fd2e396c5b2cac230d6..05f9b24f8f9c53f833b5de3504645c40c1df6a6d 100644
--- a/substrate/frame/election-provider-multi-phase/src/lib.rs
+++ b/substrate/frame/election-provider-multi-phase/src/lib.rs
@@ -149,7 +149,8 @@
 //! while this binary lives in the Polkadot repository, this particular subcommand of it can work
 //! against any substrate-based chain.
 //!
-//! See the `staking-miner` documentation in the Polkadot repository for more information.
+//! See the [`staking-miner`](https://github.com/paritytech/staking-miner-v2) docs for more
+//! information.
 //!
 //! ## Feasible Solution (correct solution)
 //!
@@ -278,8 +279,8 @@ use unsigned::VoterOf;
 pub use weights::WeightInfo;
 
 pub use signed::{
-	BalanceOf, NegativeImbalanceOf, PositiveImbalanceOf, SignedSubmission, SignedSubmissionOf,
-	SignedSubmissions, SubmissionIndicesOf,
+	BalanceOf, GeometricDepositBase, NegativeImbalanceOf, PositiveImbalanceOf, SignedSubmission,
+	SignedSubmissionOf, SignedSubmissions, SubmissionIndicesOf,
 };
 pub use unsigned::{Miner, MinerConfig};
 
@@ -571,6 +572,7 @@ pub mod pallet {
 	use frame_election_provider_support::{InstantElectionProvider, NposSolver};
 	use frame_support::{pallet_prelude::*, traits::EstimateCallFee};
 	use frame_system::pallet_prelude::*;
+	use sp_runtime::traits::Convert;
 
 	#[pallet::config]
 	pub trait Config: frame_system::Config + SendTransactionTypes<Call<Self>> {
@@ -648,10 +650,6 @@ pub mod pallet {
 		#[pallet::constant]
 		type SignedRewardBase: Get<BalanceOf<Self>>;
 
-		/// Base deposit for a signed solution.
-		#[pallet::constant]
-		type SignedDepositBase: Get<BalanceOf<Self>>;
-
 		/// Per-byte deposit for a signed solution.
 		#[pallet::constant]
 		type SignedDepositByte: Get<BalanceOf<Self>>;
@@ -667,6 +665,10 @@ pub mod pallet {
 		#[pallet::constant]
 		type MaxWinners: Get<u32>;
 
+		/// Something that calculates the signed deposit base based on the signed submissions queue
+		/// size.
+		type SignedDepositBase: Convert<usize, BalanceOf<Self>>;
+
 		/// The maximum number of electing voters and electable targets to put in the snapshot.
 		/// At the moment, snapshots are only over a single block, but once multi-block elections
 		/// are introduced they will take place over multiple blocks.
@@ -2363,7 +2365,7 @@ mod tests {
 			assert_eq!(MultiPhase::desired_targets().unwrap(), 2);
 
 			// mine seq_phragmen solution with 2 iters.
-			let (solution, witness) = MultiPhase::mine_solution().unwrap();
+			let (solution, witness, _) = MultiPhase::mine_solution().unwrap();
 
 			// ensure this solution is valid.
 			assert!(MultiPhase::queued_solution().is_none());
@@ -2645,7 +2647,7 @@ mod tests {
 			// set the solution balancing to get the desired score.
 			crate::mock::Balancing::set(Some(BalancingConfig { iterations: 2, tolerance: 0 }));
 
-			let (solution, _) = MultiPhase::mine_solution().unwrap();
+			let (solution, _, _) = MultiPhase::mine_solution().unwrap();
 			// Default solution's score.
 			assert!(matches!(solution.score, ElectionScore { minimal_stake: 50, .. }));
 
diff --git a/substrate/frame/election-provider-multi-phase/src/mock.rs b/substrate/frame/election-provider-multi-phase/src/mock.rs
index 05d151e51ecc5beb5cc3e5f883ac91ada10318c4..d4659eba5661a3059c8ab55b453ab8c9561f4e77 100644
--- a/substrate/frame/election-provider-multi-phase/src/mock.rs
+++ b/substrate/frame/election-provider-multi-phase/src/mock.rs
@@ -16,7 +16,7 @@
 // limitations under the License.
 
 use super::*;
-use crate::{self as multi_phase, unsigned::MinerConfig};
+use crate::{self as multi_phase, signed::GeometricDepositBase, unsigned::MinerConfig};
 use frame_election_provider_support::{
 	bounds::{DataProviderBounds, ElectionBounds},
 	data_provider, onchain, ElectionDataProvider, NposSolution, SequentialPhragmen,
@@ -44,8 +44,8 @@ use sp_npos_elections::{
 use sp_runtime::{
 	bounded_vec,
 	testing::Header,
-	traits::{BlakeTwo256, IdentityLookup},
-	BuildStorage, PerU16,
+	traits::{BlakeTwo256, Convert, IdentityLookup},
+	BuildStorage, PerU16, Percent,
 };
 use std::sync::Arc;
 
@@ -283,7 +283,11 @@ parameter_types! {
 	pub static UnsignedPhase: BlockNumber = 5;
 	pub static SignedMaxSubmissions: u32 = 5;
 	pub static SignedMaxRefunds: u32 = 1;
-	pub static SignedDepositBase: Balance = 5;
+	// for tests only. if `EnableVariableDepositBase` is true, the deposit base will be calculated
+	// by `Multiphase::DepositBase`. Otherwise the deposit base is `SignedFixedDeposit`.
+	pub static EnableVariableDepositBase: bool = false;
+	pub static SignedFixedDeposit: Balance = 5;
+	pub static SignedDepositIncreaseFactor: Percent = Percent::from_percent(10);
 	pub static SignedDepositByte: Balance = 0;
 	pub static SignedDepositWeight: Balance = 0;
 	pub static SignedRewardBase: Balance = 7;
@@ -393,7 +397,7 @@ impl crate::Config for Runtime {
 	type OffchainRepeat = OffchainRepeat;
 	type MinerTxPriority = MinerTxPriority;
 	type SignedRewardBase = SignedRewardBase;
-	type SignedDepositBase = SignedDepositBase;
+	type SignedDepositBase = Self;
 	type SignedDepositByte = ();
 	type SignedDepositWeight = ();
 	type SignedMaxWeight = SignedMaxWeight;
@@ -414,6 +418,18 @@ impl crate::Config for Runtime {
 	type ElectionBounds = ElectionsBounds;
 }
 
+impl Convert<usize, BalanceOf<Runtime>> for Runtime {
+	/// returns the geometric increase deposit fee if `EnableVariableDepositBase` is set, otherwise
+	/// the fee is `SignedFixedDeposit`.
+	fn convert(queue_len: usize) -> Balance {
+		if !EnableVariableDepositBase::get() {
+			SignedFixedDeposit::get()
+		} else {
+			GeometricDepositBase::<Balance, SignedFixedDeposit, SignedDepositIncreaseFactor>::convert(queue_len)
+		}
+	}
+}
+
 impl<LocalCall> frame_system::offchain::SendTransactionTypes<LocalCall> for Runtime
 where
 	RuntimeCall: From<LocalCall>,
@@ -553,8 +569,14 @@ impl ExtBuilder {
 		<SignedMaxSubmissions>::set(count);
 		self
 	}
+	pub fn signed_base_deposit(self, base: u64, variable: bool, increase: Percent) -> Self {
+		<EnableVariableDepositBase>::set(variable);
+		<SignedFixedDeposit>::set(base);
+		<SignedDepositIncreaseFactor>::set(increase);
+		self
+	}
 	pub fn signed_deposit(self, base: u64, byte: u64, weight: u64) -> Self {
-		<SignedDepositBase>::set(base);
+		<SignedFixedDeposit>::set(base);
 		<SignedDepositByte>::set(byte);
 		<SignedDepositWeight>::set(weight);
 		self
diff --git a/substrate/frame/election-provider-multi-phase/src/signed.rs b/substrate/frame/election-provider-multi-phase/src/signed.rs
index 76068ba99d36c97a9b1060cea4e3147e894da4dd..7e4b029ff8c80cff6a57c0868e335d11aa4a2cc6 100644
--- a/substrate/frame/election-provider-multi-phase/src/signed.rs
+++ b/substrate/frame/election-provider-multi-phase/src/signed.rs
@@ -17,6 +17,8 @@
 
 //! The signed phase implementation.
 
+use core::marker::PhantomData;
+
 use crate::{
 	unsigned::MinerConfig, Config, ElectionCompute, Pallet, QueuedSolution, RawSolution,
 	ReadySolution, SignedSubmissionIndices, SignedSubmissionNextIndex, SignedSubmissionsMap,
@@ -32,8 +34,8 @@ use sp_arithmetic::traits::SaturatedConversion;
 use sp_core::bounded::BoundedVec;
 use sp_npos_elections::ElectionScore;
 use sp_runtime::{
-	traits::{Saturating, Zero},
-	RuntimeDebug,
+	traits::{Convert, Saturating, Zero},
+	FixedPointNumber, FixedPointOperand, FixedU128, Percent, RuntimeDebug,
 };
 use sp_std::{
 	cmp::Ordering,
@@ -348,6 +350,32 @@ impl<T: Config> SignedSubmissions<T> {
 	}
 }
 
+/// Type that can be used to calculate the deposit base for signed submissions.
+///
+/// The deposit base is calculated as a geometric progression based on the number of signed
+/// submissions in the queue. The size of the queue represents the progression term.
+pub struct GeometricDepositBase<Balance, Fixed, Inc> {
+	_marker: (PhantomData<Balance>, PhantomData<Fixed>, PhantomData<Inc>),
+}
+
+impl<Balance, Fixed, Inc> Convert<usize, Balance> for GeometricDepositBase<Balance, Fixed, Inc>
+where
+	Balance: FixedPointOperand,
+	Fixed: Get<Balance>,
+	Inc: Get<Percent>,
+{
+	// Calculates the base deposit as a geometric progression based on the number of signed
+	// submissions.
+	//
+	// The nth term is obtained by calculating `base * (1 + increase_factor)^nth`. Example: factor
+	// 5, with initial deposit of 1000 and 10% of increase factor is 1000 * (1 + 0.1)^5.
+	fn convert(queue_len: usize) -> Balance {
+		let increase_factor: FixedU128 = FixedU128::from_u32(1) + Inc::get().into();
+
+		increase_factor.saturating_pow(queue_len).saturating_mul_int(Fixed::get())
+	}
+}
+
 impl<T: Config> Pallet<T> {
 	/// `Self` accessor for `SignedSubmission<T>`.
 	pub fn signed_submissions() -> SignedSubmissions<T> {
@@ -520,14 +548,14 @@ impl<T: Config> Pallet<T> {
 		size: SolutionOrSnapshotSize,
 	) -> BalanceOf<T> {
 		let encoded_len: u32 = raw_solution.encoded_size().saturated_into();
-		let encoded_len: BalanceOf<T> = encoded_len.into();
+		let encoded_len_balance: BalanceOf<T> = encoded_len.into();
 		let feasibility_weight = Self::solution_weight_of(raw_solution, size);
 
-		let len_deposit = T::SignedDepositByte::get().saturating_mul(encoded_len);
+		let len_deposit = T::SignedDepositByte::get().saturating_mul(encoded_len_balance);
 		let weight_deposit = T::SignedDepositWeight::get()
 			.saturating_mul(feasibility_weight.ref_time().saturated_into());
 
-		T::SignedDepositBase::get()
+		T::SignedDepositBase::convert(Self::signed_submissions().len())
 			.saturating_add(len_deposit)
 			.saturating_add(weight_deposit)
 	}
@@ -541,6 +569,7 @@ mod tests {
 		Phase,
 	};
 	use frame_support::{assert_noop, assert_ok, assert_storage_noop};
+	use sp_runtime::Percent;
 
 	#[test]
 	fn cannot_submit_too_early() {
@@ -779,6 +808,56 @@ mod tests {
 		})
 	}
 
+	#[test]
+	fn geometric_deposit_queue_size_works() {
+		let constant = vec![1000; 10];
+		// geometric progression with 10% increase in each iteration for 10 terms.
+		let progression_10 = vec![1000, 1100, 1210, 1331, 1464, 1610, 1771, 1948, 2143, 2357];
+		let progression_40 = vec![1000, 1400, 1960, 2744, 3841, 5378, 7529, 10541, 14757, 20661];
+
+		let check_progressive_base_fee = |expected: &Vec<u64>| {
+			for s in 0..SignedMaxSubmissions::get() {
+				let account = 99 + s as u64;
+				Balances::make_free_balance_be(&account, 10000000);
+				let mut solution = raw_solution();
+				solution.score.minimal_stake -= s as u128;
+
+				assert_ok!(MultiPhase::submit(RuntimeOrigin::signed(account), Box::new(solution)));
+				assert_eq!(balances(&account).1, expected[s as usize])
+			}
+		};
+
+		ExtBuilder::default()
+			.signed_max_submission(10)
+			.signed_base_deposit(1000, true, Percent::from_percent(0))
+			.build_and_execute(|| {
+				roll_to_signed();
+				assert!(MultiPhase::current_phase().is_signed());
+
+				check_progressive_base_fee(&constant);
+			});
+
+		ExtBuilder::default()
+			.signed_max_submission(10)
+			.signed_base_deposit(1000, true, Percent::from_percent(10))
+			.build_and_execute(|| {
+				roll_to_signed();
+				assert!(MultiPhase::current_phase().is_signed());
+
+				check_progressive_base_fee(&progression_10);
+			});
+
+		ExtBuilder::default()
+			.signed_max_submission(10)
+			.signed_base_deposit(1000, true, Percent::from_percent(40))
+			.build_and_execute(|| {
+				roll_to_signed();
+				assert!(MultiPhase::current_phase().is_signed());
+
+				check_progressive_base_fee(&progression_40);
+			});
+	}
+
 	#[test]
 	fn call_fee_refund_is_limited_by_signed_max_refunds() {
 		ExtBuilder::default().build_and_execute(|| {
@@ -1269,7 +1348,7 @@ mod tests {
 				roll_to_signed();
 				assert!(MultiPhase::current_phase().is_signed());
 
-				let (raw, witness) = MultiPhase::mine_solution().unwrap();
+				let (raw, witness, _) = MultiPhase::mine_solution().unwrap();
 				let solution_weight = <Runtime as MinerConfig>::solution_weight(
 					witness.voters,
 					witness.targets,
diff --git a/substrate/frame/election-provider-multi-phase/src/unsigned.rs b/substrate/frame/election-provider-multi-phase/src/unsigned.rs
index af8f632f8a9e3322edb2a17180f29005a5b68d98..e3d0ded97515b9cbac011956afebbc5d4f15e5d6 100644
--- a/substrate/frame/election-provider-multi-phase/src/unsigned.rs
+++ b/substrate/frame/election-provider-multi-phase/src/unsigned.rs
@@ -108,6 +108,27 @@ impl From<FeasibilityError> for MinerError {
 	}
 }
 
+/// Reports the trimming result of a mined solution
+#[derive(Debug, Clone)]
+pub struct TrimmingStatus {
+	weight: usize,
+	length: usize,
+}
+
+impl TrimmingStatus {
+	pub fn is_trimmed(&self) -> bool {
+		self.weight > 0 || self.length > 0
+	}
+
+	pub fn trimmed_weight(&self) -> usize {
+		self.weight
+	}
+
+	pub fn trimmed_length(&self) -> usize {
+		self.length
+	}
+}
+
 /// Save a given call into OCW storage.
 fn save_solution<T: Config>(call: &Call<T>) -> Result<(), MinerError> {
 	log!(debug, "saving a call to the offchain storage.");
@@ -162,16 +183,21 @@ impl<T: Config> Pallet<T> {
 	///
 	/// The Npos Solver type, `S`, must have the same AccountId and Error type as the
 	/// [`crate::Config::Solver`] in order to create a unified return type.
-	pub fn mine_solution(
-	) -> Result<(RawSolution<SolutionOf<T::MinerConfig>>, SolutionOrSnapshotSize), MinerError> {
+	pub fn mine_solution() -> Result<
+		(RawSolution<SolutionOf<T::MinerConfig>>, SolutionOrSnapshotSize, TrimmingStatus),
+		MinerError,
+	> {
 		let RoundSnapshot { voters, targets } =
 			Self::snapshot().ok_or(MinerError::SnapshotUnAvailable)?;
 		let desired_targets = Self::desired_targets().ok_or(MinerError::SnapshotUnAvailable)?;
-		let (solution, score, size) = Miner::<T::MinerConfig>::mine_solution_with_snapshot::<
-			T::Solver,
-		>(voters, targets, desired_targets)?;
+		let (solution, score, size, is_trimmed) =
+			Miner::<T::MinerConfig>::mine_solution_with_snapshot::<T::Solver>(
+				voters,
+				targets,
+				desired_targets,
+			)?;
 		let round = Self::round();
-		Ok((RawSolution { solution, score, round }, size))
+		Ok((RawSolution { solution, score, round }, size, is_trimmed))
 	}
 
 	/// Attempt to restore a solution from cache. Otherwise, compute it fresh. Either way, submit
@@ -232,7 +258,7 @@ impl<T: Config> Pallet<T> {
 	/// Mine a new solution as a call. Performs all checks.
 	pub fn mine_checked_call() -> Result<Call<T>, MinerError> {
 		// get the solution, with a load of checks to ensure if submitted, IT IS ABSOLUTELY VALID.
-		let (raw_solution, witness) = Self::mine_and_check()?;
+		let (raw_solution, witness, _) = Self::mine_and_check()?;
 
 		let score = raw_solution.score;
 		let call: Call<T> = Call::submit_unsigned { raw_solution: Box::new(raw_solution), witness };
@@ -282,11 +308,13 @@ impl<T: Config> Pallet<T> {
 	/// If you want an unchecked solution, use [`Pallet::mine_solution`].
 	/// If you want a checked solution and submit it at the same time, use
 	/// [`Pallet::mine_check_save_submit`].
-	pub fn mine_and_check(
-	) -> Result<(RawSolution<SolutionOf<T::MinerConfig>>, SolutionOrSnapshotSize), MinerError> {
-		let (raw_solution, witness) = Self::mine_solution()?;
+	pub fn mine_and_check() -> Result<
+		(RawSolution<SolutionOf<T::MinerConfig>>, SolutionOrSnapshotSize, TrimmingStatus),
+		MinerError,
+	> {
+		let (raw_solution, witness, is_trimmed) = Self::mine_solution()?;
 		Self::basic_checks(&raw_solution, "mined")?;
-		Ok((raw_solution, witness))
+		Ok((raw_solution, witness, is_trimmed))
 	}
 
 	/// Checks if an execution of the offchain worker is permitted at the given block number, or
@@ -408,7 +436,7 @@ impl<T: MinerConfig> Miner<T> {
 		voters: Vec<(T::AccountId, VoteWeight, BoundedVec<T::AccountId, T::MaxVotesPerVoter>)>,
 		targets: Vec<T::AccountId>,
 		desired_targets: u32,
-	) -> Result<(SolutionOf<T>, ElectionScore, SolutionOrSnapshotSize), MinerError>
+	) -> Result<(SolutionOf<T>, ElectionScore, SolutionOrSnapshotSize, TrimmingStatus), MinerError>
 	where
 		S: NposSolver<AccountId = T::AccountId>,
 	{
@@ -436,7 +464,8 @@ impl<T: MinerConfig> Miner<T> {
 		voters: Vec<(T::AccountId, VoteWeight, BoundedVec<T::AccountId, T::MaxVotesPerVoter>)>,
 		targets: Vec<T::AccountId>,
 		desired_targets: u32,
-	) -> Result<(SolutionOf<T>, ElectionScore, SolutionOrSnapshotSize), MinerError> {
+	) -> Result<(SolutionOf<T>, ElectionScore, SolutionOrSnapshotSize, TrimmingStatus), MinerError>
+	{
 		// now make some helper closures.
 		let cache = helpers::generate_voter_cache::<T>(&voters);
 		let voter_index = helpers::voter_index_fn::<T>(&cache);
@@ -495,13 +524,13 @@ impl<T: MinerConfig> Miner<T> {
 		// trim assignments list for weight and length.
 		let size =
 			SolutionOrSnapshotSize { voters: voters.len() as u32, targets: targets.len() as u32 };
-		Self::trim_assignments_weight(
+		let weight_trimmed = Self::trim_assignments_weight(
 			desired_targets,
 			size,
 			T::MaxWeight::get(),
 			&mut index_assignments,
 		);
-		Self::trim_assignments_length(
+		let length_trimmed = Self::trim_assignments_length(
 			T::MaxLength::get(),
 			&mut index_assignments,
 			&encoded_size_of,
@@ -513,7 +542,9 @@ impl<T: MinerConfig> Miner<T> {
 		// re-calc score.
 		let score = solution.clone().score(stake_of, voter_at, target_at)?;
 
-		Ok((solution, score, size))
+		let is_trimmed = TrimmingStatus { weight: weight_trimmed, length: length_trimmed };
+
+		Ok((solution, score, size, is_trimmed))
 	}
 
 	/// Greedily reduce the size of the solution to fit into the block w.r.t length.
@@ -534,7 +565,7 @@ impl<T: MinerConfig> Miner<T> {
 		max_allowed_length: u32,
 		assignments: &mut Vec<IndexAssignmentOf<T>>,
 		encoded_size_of: impl Fn(&[IndexAssignmentOf<T>]) -> Result<usize, sp_npos_elections::Error>,
-	) -> Result<(), MinerError> {
+	) -> Result<usize, MinerError> {
 		// Perform a binary search for the max subset of which can fit into the allowed
 		// length. Having discovered that, we can truncate efficiently.
 		let max_allowed_length: usize = max_allowed_length.saturated_into();
@@ -543,7 +574,7 @@ impl<T: MinerConfig> Miner<T> {
 
 		// not much we can do if assignments are already empty.
 		if high == low {
-			return Ok(())
+			return Ok(0)
 		}
 
 		while high - low > 1 {
@@ -577,16 +608,18 @@ impl<T: MinerConfig> Miner<T> {
 		// after this point, we never error.
 		// check before edit.
 
+		let remove = assignments.len().saturating_sub(maximum_allowed_voters);
+
 		log_no_system!(
 			debug,
 			"from {} assignments, truncating to {} for length, removing {}",
 			assignments.len(),
 			maximum_allowed_voters,
-			assignments.len().saturating_sub(maximum_allowed_voters),
+			remove
 		);
 		assignments.truncate(maximum_allowed_voters);
 
-		Ok(())
+		Ok(remove)
 	}
 
 	/// Greedily reduce the size of the solution to fit into the block w.r.t. weight.
@@ -609,7 +642,7 @@ impl<T: MinerConfig> Miner<T> {
 		size: SolutionOrSnapshotSize,
 		max_weight: Weight,
 		assignments: &mut Vec<IndexAssignmentOf<T>>,
-	) {
+	) -> usize {
 		let maximum_allowed_voters =
 			Self::maximum_voter_for_weight(desired_targets, size, max_weight);
 		let removing: usize =
@@ -622,6 +655,8 @@ impl<T: MinerConfig> Miner<T> {
 			removing,
 		);
 		assignments.truncate(maximum_allowed_voters as usize);
+
+		removing
 	}
 
 	/// Find the maximum `len` that a solution can have in order to fit into the block weight.
@@ -984,12 +1019,12 @@ mod tests {
 	};
 	use codec::Decode;
 	use frame_election_provider_support::IndexAssignment;
-	use frame_support::{assert_noop, assert_ok, dispatch::Dispatchable, traits::OffchainWorker};
+	use frame_support::{assert_noop, assert_ok, traits::OffchainWorker};
 	use sp_npos_elections::ElectionScore;
 	use sp_runtime::{
 		bounded_vec,
 		offchain::storage_lock::{BlockAndTime, StorageLock},
-		traits::{ValidateUnsigned, Zero},
+		traits::{Dispatchable, ValidateUnsigned, Zero},
 		ModuleError, PerU16, Perbill,
 	};
 
@@ -1230,7 +1265,7 @@ mod tests {
 			assert_eq!(MultiPhase::desired_targets().unwrap(), 2);
 
 			// mine seq_phragmen solution with 2 iters.
-			let (solution, witness) = MultiPhase::mine_solution().unwrap();
+			let (solution, witness, _) = MultiPhase::mine_solution().unwrap();
 
 			// ensure this solution is valid.
 			assert!(MultiPhase::queued_solution().is_none());
@@ -1268,7 +1303,7 @@ mod tests {
 				roll_to_unsigned();
 				assert!(MultiPhase::current_phase().is_unsigned());
 
-				let (raw, witness) = MultiPhase::mine_solution().unwrap();
+				let (raw, witness, t) = MultiPhase::mine_solution().unwrap();
 				let solution_weight = <Runtime as MinerConfig>::solution_weight(
 					witness.voters,
 					witness.targets,
@@ -1278,11 +1313,12 @@ mod tests {
 				// default solution will have 5 edges (5 * 5 + 10)
 				assert_eq!(solution_weight, Weight::from_parts(35, 0));
 				assert_eq!(raw.solution.voter_count(), 5);
+				assert_eq!(t.trimmed_weight(), 0);
 
 				// now reduce the max weight
 				<MinerMaxWeight>::set(Weight::from_parts(25, u64::MAX));
 
-				let (raw, witness) = MultiPhase::mine_solution().unwrap();
+				let (raw, witness, t) = MultiPhase::mine_solution().unwrap();
 				let solution_weight = <Runtime as MinerConfig>::solution_weight(
 					witness.voters,
 					witness.targets,
@@ -1292,6 +1328,7 @@ mod tests {
 				// default solution will have 5 edges (5 * 5 + 10)
 				assert_eq!(solution_weight, Weight::from_parts(25, 0));
 				assert_eq!(raw.solution.voter_count(), 3);
+				assert_eq!(t.trimmed_weight(), 2);
 			})
 	}
 
@@ -1303,7 +1340,7 @@ mod tests {
 			assert!(MultiPhase::current_phase().is_unsigned());
 
 			// Force the number of winners to be bigger to fail
-			let (mut solution, _) = MultiPhase::mine_solution().unwrap();
+			let (mut solution, _, _) = MultiPhase::mine_solution().unwrap();
 			solution.solution.votes1[0].1 = 4;
 
 			assert_eq!(
@@ -1342,7 +1379,7 @@ mod tests {
 				let RoundSnapshot { voters, targets } = MultiPhase::snapshot().unwrap();
 				let desired_targets = MultiPhase::desired_targets().unwrap();
 
-				let (raw, score, witness) =
+				let (raw, score, witness, _) =
 					Miner::<Runtime>::prepare_election_result_with_snapshot(
 						result,
 						voters.clone(),
@@ -1371,7 +1408,7 @@ mod tests {
 						},
 					],
 				};
-				let (raw, score, _) = Miner::<Runtime>::prepare_election_result_with_snapshot(
+				let (raw, score, _, _) = Miner::<Runtime>::prepare_election_result_with_snapshot(
 					result,
 					voters.clone(),
 					targets.clone(),
@@ -1400,7 +1437,7 @@ mod tests {
 						},
 					],
 				};
-				let (raw, score, witness) =
+				let (raw, score, witness, _) =
 					Miner::<Runtime>::prepare_election_result_with_snapshot(
 						result,
 						voters.clone(),
@@ -1769,7 +1806,7 @@ mod tests {
 			let solution_clone = solution.clone();
 
 			// when
-			Miner::<Runtime>::trim_assignments_length(
+			let trimmed_len = Miner::<Runtime>::trim_assignments_length(
 				encoded_len,
 				&mut assignments,
 				encoded_size_of,
@@ -1779,6 +1816,7 @@ mod tests {
 			// then
 			let solution = SolutionOf::<Runtime>::try_from(assignments.as_slice()).unwrap();
 			assert_eq!(solution, solution_clone);
+			assert_eq!(trimmed_len, 0);
 		});
 	}
 
@@ -1794,7 +1832,7 @@ mod tests {
 			let solution_clone = solution.clone();
 
 			// when
-			Miner::<Runtime>::trim_assignments_length(
+			let trimmed_len = Miner::<Runtime>::trim_assignments_length(
 				encoded_len as u32 - 1,
 				&mut assignments,
 				encoded_size_of,
@@ -1805,6 +1843,7 @@ mod tests {
 			let solution = SolutionOf::<Runtime>::try_from(assignments.as_slice()).unwrap();
 			assert_ne!(solution, solution_clone);
 			assert!(solution.encoded_size() < encoded_len);
+			assert_eq!(trimmed_len, 1);
 		});
 	}
 
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 f6bc8e60677b6a12545f27f2709b484b5ce0b27f..f2072b81723ded7be1438c87f29311ea7d3647df 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
@@ -1,11 +1,11 @@
 [package]
 name = "pallet-election-provider-e2e-test"
 version = "1.0.0"
-authors = ["Parity Technologies <admin@parity.io>"]
-edition = "2021"
+authors.workspace = true
+edition.workspace = true
 license = "Apache-2.0"
 homepage = "https://substrate.io"
-repository = "https://github.com/paritytech/substrate/"
+repository.workspace = true
 description = "FRAME election provider multi phase pallet tests with staking pallet, bags-list and session pallets"
 publish = false
 
@@ -36,4 +36,3 @@ pallet-bags-list = { path = "../../bags-list" }
 pallet-balances = { path = "../../balances" }
 pallet-timestamp = { path = "../../timestamp" }
 pallet-session = { path = "../../session" }
-
diff --git a/substrate/frame/election-provider-multi-phase/test-staking-e2e/src/lib.rs b/substrate/frame/election-provider-multi-phase/test-staking-e2e/src/lib.rs
index e40bac3e9fc44adb37b0d8e527d4ac6eae460ed2..1d3f4712b1d604988047f5643ddd86296f453878 100644
--- a/substrate/frame/election-provider-multi-phase/test-staking-e2e/src/lib.rs
+++ b/substrate/frame/election-provider-multi-phase/test-staking-e2e/src/lib.rs
@@ -338,7 +338,7 @@ fn ledger_consistency_active_balance_below_ed() {
 		ExtBuilder::default().staking(StakingExtBuilder::default()).build_offchainify();
 
 	ext.execute_with(|| {
-		assert_eq!(Staking::ledger(&11).unwrap().active, 1000);
+		assert_eq!(Staking::ledger(11.into()).unwrap().active, 1000);
 
 		// unbonding total of active stake fails because the active ledger balance would fall
 		// below the `MinNominatorBond`.
@@ -356,13 +356,13 @@ fn ledger_consistency_active_balance_below_ed() {
 
 		// the active balance of the ledger entry is 0, while total balance is 1000 until
 		// `withdraw_unbonded` is called.
-		assert_eq!(Staking::ledger(&11).unwrap().active, 0);
-		assert_eq!(Staking::ledger(&11).unwrap().total, 1000);
+		assert_eq!(Staking::ledger(11.into()).unwrap().active, 0);
+		assert_eq!(Staking::ledger(11.into()).unwrap().total, 1000);
 
 		// trying to withdraw the unbonded balance won't work yet because not enough bonding
 		// eras have passed.
 		assert_ok!(Staking::withdraw_unbonded(RuntimeOrigin::signed(11), 0));
-		assert_eq!(Staking::ledger(&11).unwrap().total, 1000);
+		assert_eq!(Staking::ledger(11.into()).unwrap().total, 1000);
 
 		// tries to reap stash after chilling, which fails since the stash total balance is
 		// above ED.
@@ -384,6 +384,6 @@ fn ledger_consistency_active_balance_below_ed() {
 			pool_state,
 		);
 		assert_ok!(Staking::withdraw_unbonded(RuntimeOrigin::signed(11), 0));
-		assert_eq!(Staking::ledger(&11), None);
+		assert!(Staking::ledger(11.into()).is_err());
 	});
 }
diff --git a/substrate/frame/election-provider-multi-phase/test-staking-e2e/src/mock.rs b/substrate/frame/election-provider-multi-phase/test-staking-e2e/src/mock.rs
index 9c3511ae35751527eb7c702eb0e51cdd7a4577e5..2e3cb15f9a4345f1a2804109c290b95166779dcd 100644
--- a/substrate/frame/election-provider-multi-phase/test-staking-e2e/src/mock.rs
+++ b/substrate/frame/election-provider-multi-phase/test-staking-e2e/src/mock.rs
@@ -1,6 +1,6 @@
 // This file is part of Substrate.
 
-// Copyright (C) 2022 Parity Technologies (UK) Ltd.
+// Copyright (C) Parity Technologies (UK) Ltd.
 // SPDX-License-Identifier: Apache-2.0
 
 // Licensed under the Apache License, Version 2.0 (the "License");
@@ -18,7 +18,8 @@
 #![allow(dead_code)]
 
 use frame_support::{
-	assert_ok, dispatch::UnfilteredDispatchable, parameter_types, traits, traits::Hooks,
+	assert_ok, parameter_types, traits,
+	traits::{Hooks, UnfilteredDispatchable},
 	weights::constants,
 };
 use frame_system::EnsureRoot;
@@ -31,7 +32,7 @@ use sp_runtime::{
 	},
 	testing,
 	traits::Zero,
-	transaction_validity, BuildStorage, PerU16, Perbill,
+	transaction_validity, BuildStorage, PerU16, Perbill, Percent,
 };
 use sp_staking::{
 	offence::{DisableStrategy, OffenceDetails, OnOffenceHandler},
@@ -46,7 +47,8 @@ use frame_election_provider_support::{
 	SequentialPhragmen, Weight,
 };
 use pallet_election_provider_multi_phase::{
-	unsigned::MinerConfig, Call, ElectionCompute, QueuedSolution, SolutionAccuracyOf,
+	unsigned::MinerConfig, Call, ElectionCompute, GeometricDepositBase, QueuedSolution,
+	SolutionAccuracyOf,
 };
 use pallet_staking::StakerStatus;
 use parking_lot::RwLock;
@@ -63,8 +65,7 @@ type Block = frame_system::mocking::MockBlockU32<Runtime>;
 type Extrinsic = testing::TestXt<RuntimeCall, ()>;
 
 frame_support::construct_runtime!(
-	pub enum Runtime
-	{
+	pub enum Runtime {
 		System: frame_system,
 		ElectionProviderMultiPhase: pallet_election_provider_multi_phase,
 		Staking: pallet_staking,
@@ -87,15 +88,8 @@ pub(crate) type Moment = u32;
 #[derive_impl(frame_system::config_preludes::TestDefaultConfig as frame_system::DefaultConfig)]
 impl frame_system::Config for Runtime {
 	type Block = Block;
-	type BlockHashCount = ConstU32<10>;
-	type BaseCallFilter = frame_support::traits::Everything;
-	type RuntimeOrigin = RuntimeOrigin;
-	type RuntimeCall = RuntimeCall;
-	type RuntimeEvent = RuntimeEvent;
-	type PalletInfo = PalletInfo;
-	type OnSetCode = ();
-
 	type AccountData = pallet_balances::AccountData<Balance>;
+	type BlockHashCount = ConstU32<10>;
 }
 
 const NORMAL_DISPATCH_RATIO: Perbill = Perbill::from_percent(75);
@@ -181,6 +175,9 @@ parameter_types! {
 	pub static TransactionPriority: transaction_validity::TransactionPriority = 1;
 	#[derive(Debug)]
 	pub static MaxWinners: u32 = 100;
+	pub static MaxVotesPerVoter: u32 = 16;
+	pub static SignedFixedDeposit: Balance = 1;
+	pub static SignedDepositIncreaseFactor: Percent = Percent::from_percent(10);
 	pub static ElectionBounds: frame_election_provider_support::bounds::ElectionBounds = ElectionBoundsBuilder::default()
 		.voters_count(1_000.into()).targets_count(1_000.into()).build();
 }
@@ -198,7 +195,8 @@ impl pallet_election_provider_multi_phase::Config for Runtime {
 	type MinerConfig = Self;
 	type SignedMaxSubmissions = ConstU32<10>;
 	type SignedRewardBase = ();
-	type SignedDepositBase = ();
+	type SignedDepositBase =
+		GeometricDepositBase<Balance, SignedFixedDeposit, SignedDepositIncreaseFactor>;
 	type SignedDepositByte = ();
 	type SignedMaxRefunds = ConstU32<3>;
 	type SignedDepositWeight = ();
diff --git a/substrate/frame/election-provider-support/Cargo.toml b/substrate/frame/election-provider-support/Cargo.toml
index d6d785e6ac428a61bb17fa4c2e817702fc667511..09e1794965cd337ee7d0c95777b9a4d666c46800 100644
--- a/substrate/frame/election-provider-support/Cargo.toml
+++ b/substrate/frame/election-provider-support/Cargo.toml
@@ -1,11 +1,11 @@
 [package]
 name = "frame-election-provider-support"
 version = "4.0.0-dev"
-authors = ["Parity Technologies <admin@parity.io>"]
-edition = "2021"
+authors.workspace = true
+edition.workspace = true
 license = "Apache-2.0"
 homepage = "https://substrate.io"
-repository = "https://github.com/paritytech/substrate/"
+repository.workspace = true
 description = "election provider supporting traits"
 
 [package.metadata.docs.rs]
diff --git a/substrate/frame/election-provider-support/benchmarking/Cargo.toml b/substrate/frame/election-provider-support/benchmarking/Cargo.toml
index 42a10a7f5e66b9335c7252f47baecf71ecabf657..a8c56b425fd905f005042270a212280d24f50acc 100644
--- a/substrate/frame/election-provider-support/benchmarking/Cargo.toml
+++ b/substrate/frame/election-provider-support/benchmarking/Cargo.toml
@@ -1,11 +1,11 @@
 [package]
 name = "pallet-election-provider-support-benchmarking"
 version = "4.0.0-dev"
-authors = ["Parity Technologies <admin@parity.io>"]
-edition = "2021"
+authors.workspace = true
+edition.workspace = true
 license = "Apache-2.0"
 homepage = "https://substrate.io"
-repository = "https://github.com/paritytech/substrate/"
+repository.workspace = true
 description = "Benchmarking for election provider support onchain config trait"
 
 [package.metadata.docs.rs]
diff --git a/substrate/frame/election-provider-support/solution-type/Cargo.toml b/substrate/frame/election-provider-support/solution-type/Cargo.toml
index 3dbb9b1f16d1d00fd8ae9c2727654da4e4a52d35..f4ea4ef6e361f13013a1f434b08ebcbdd6dfe37f 100644
--- a/substrate/frame/election-provider-support/solution-type/Cargo.toml
+++ b/substrate/frame/election-provider-support/solution-type/Cargo.toml
@@ -1,11 +1,11 @@
 [package]
 name = "frame-election-provider-solution-type"
 version = "4.0.0-dev"
-authors = ["Parity Technologies <admin@parity.io>"]
-edition = "2021"
+authors.workspace = true
+edition.workspace = true
 license = "Apache-2.0"
 homepage = "https://substrate.io"
-repository = "https://github.com/paritytech/substrate/"
+repository.workspace = true
 description = "NPoS Solution Type"
 
 [package.metadata.docs.rs]
@@ -15,7 +15,7 @@ targets = ["x86_64-unknown-linux-gnu"]
 proc-macro = true
 
 [dependencies]
-syn = { version = "2.0.16", features = ["full", "visit"] }
+syn = { version = "2.0.38", features = ["full", "visit"] }
 quote = "1.0.28"
 proc-macro2 = "1.0.56"
 proc-macro-crate = "1.1.3"
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 2871010c640daa3f5d3c0b689d513f3e7c9ac8cf..e485920145416dce3425b5e5942388c204b4d582 100644
--- a/substrate/frame/election-provider-support/solution-type/fuzzer/Cargo.toml
+++ b/substrate/frame/election-provider-support/solution-type/fuzzer/Cargo.toml
@@ -1,11 +1,11 @@
 [package]
 name = "frame-election-solution-type-fuzzer"
 version = "2.0.0-alpha.5"
-authors = ["Parity Technologies <admin@parity.io>"]
-edition = "2021"
+authors.workspace = true
+edition.workspace = true
 license = "Apache-2.0"
 homepage = "https://substrate.io"
-repository = "https://github.com/paritytech/substrate/"
+repository.workspace = true
 description = "Fuzzer for phragmén solution type implementation."
 publish = false
 
@@ -13,7 +13,7 @@ publish = false
 targets = ["x86_64-unknown-linux-gnu"]
 
 [dependencies]
-clap = { version = "4.2.5", features = ["derive"] }
+clap = { version = "4.4.6", features = ["derive"] }
 honggfuzz = "0.5"
 rand = { version = "0.8", features = ["std", "small_rng"] }
 
diff --git a/substrate/frame/election-provider-support/solution-type/fuzzer/src/compact.rs b/substrate/frame/election-provider-support/solution-type/fuzzer/src/compact.rs
index e7ef440ff21956ba0ecf8c3346c19612b57c3727..90fd9509e6f297905862cd5ff6040acd2729c276 100644
--- a/substrate/frame/election-provider-support/solution-type/fuzzer/src/compact.rs
+++ b/substrate/frame/election-provider-support/solution-type/fuzzer/src/compact.rs
@@ -1,3 +1,20 @@
+// 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.
+
 use frame_election_provider_solution_type::generate_solution_type;
 use honggfuzz::fuzz;
 use sp_arithmetic::Percent;
diff --git a/substrate/frame/election-provider-support/solution-type/tests/ui/fail/missing_accuracy.rs b/substrate/frame/election-provider-support/solution-type/tests/ui/fail/missing_accuracy.rs
index 52ae9623fd38462da2fc60f195e944d79da1e7c6..c72ad9853e2a6c03b573d7d1d6db3e90060ac0df 100644
--- a/substrate/frame/election-provider-support/solution-type/tests/ui/fail/missing_accuracy.rs
+++ b/substrate/frame/election-provider-support/solution-type/tests/ui/fail/missing_accuracy.rs
@@ -1,3 +1,20 @@
+// 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.
+
 use frame_election_provider_solution_type::generate_solution_type;
 
 generate_solution_type!(pub struct TestSolution::<
diff --git a/substrate/frame/election-provider-support/solution-type/tests/ui/fail/missing_accuracy.stderr b/substrate/frame/election-provider-support/solution-type/tests/ui/fail/missing_accuracy.stderr
index b6bb8f39ede610819e35684e50ecb8d287c29171..4ff7d479a98695c2ab56fcf03c35805aa500faf6 100644
--- a/substrate/frame/election-provider-support/solution-type/tests/ui/fail/missing_accuracy.stderr
+++ b/substrate/frame/election-provider-support/solution-type/tests/ui/fail/missing_accuracy.stderr
@@ -1,5 +1,5 @@
 error: Expected binding: `Accuracy = ...`
- --> $DIR/missing_accuracy.rs:6:2
-  |
-6 |     Perbill,
-  |     ^^^^^^^
+  --> tests/ui/fail/missing_accuracy.rs:23:2
+   |
+23 |     Perbill,
+   |     ^^^^^^^
diff --git a/substrate/frame/election-provider-support/solution-type/tests/ui/fail/missing_size_bound.rs b/substrate/frame/election-provider-support/solution-type/tests/ui/fail/missing_size_bound.rs
index fe8ac04cc8d6148bab6f1ef23139c95fe9af172e..c1dd59649724f70ee77f8380c6ed493a6dd6c654 100644
--- a/substrate/frame/election-provider-support/solution-type/tests/ui/fail/missing_size_bound.rs
+++ b/substrate/frame/election-provider-support/solution-type/tests/ui/fail/missing_size_bound.rs
@@ -1,3 +1,20 @@
+// 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.
+
 use frame_election_provider_solution_type::generate_solution_type;
 
 generate_solution_type!(pub struct TestSolution::<
diff --git a/substrate/frame/election-provider-support/solution-type/tests/ui/fail/missing_size_bound.stderr b/substrate/frame/election-provider-support/solution-type/tests/ui/fail/missing_size_bound.stderr
index c685ab816d399d47bb8d4551fe9b8b6e2cae8bd8..52fb081b3f4669139959546d7a363407be9544d9 100644
--- a/substrate/frame/election-provider-support/solution-type/tests/ui/fail/missing_size_bound.stderr
+++ b/substrate/frame/election-provider-support/solution-type/tests/ui/fail/missing_size_bound.stderr
@@ -1,5 +1,5 @@
 error: Expected binding: `MaxVoters = ...`
- --> tests/ui/fail/missing_size_bound.rs:7:2
-  |
-7 |     ConstU32::<10>,
-  |     ^^^^^^^^^^^^^^
+  --> tests/ui/fail/missing_size_bound.rs:24:2
+   |
+24 |     ConstU32::<10>,
+   |     ^^^^^^^^^^^^^^
diff --git a/substrate/frame/election-provider-support/solution-type/tests/ui/fail/missing_target.rs b/substrate/frame/election-provider-support/solution-type/tests/ui/fail/missing_target.rs
index b457c4abada6c3dc0ea8e1ab630f5a48c999565e..1747693b4e59c8c6a47850eb7495737d80363935 100644
--- a/substrate/frame/election-provider-support/solution-type/tests/ui/fail/missing_target.rs
+++ b/substrate/frame/election-provider-support/solution-type/tests/ui/fail/missing_target.rs
@@ -1,3 +1,20 @@
+// 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.
+
 use frame_election_provider_solution_type::generate_solution_type;
 
 generate_solution_type!(pub struct TestSolution::<
diff --git a/substrate/frame/election-provider-support/solution-type/tests/ui/fail/missing_target.stderr b/substrate/frame/election-provider-support/solution-type/tests/ui/fail/missing_target.stderr
index d0c92c5bbd8e9f84154cd676dd7d80f7023e4469..783af709fe2e05517db321f87876671d16432f50 100644
--- a/substrate/frame/election-provider-support/solution-type/tests/ui/fail/missing_target.stderr
+++ b/substrate/frame/election-provider-support/solution-type/tests/ui/fail/missing_target.stderr
@@ -1,5 +1,5 @@
 error: Expected binding: `TargetIndex = ...`
- --> $DIR/missing_target.rs:5:2
-  |
-5 |     u8,
-  |     ^^
+  --> tests/ui/fail/missing_target.rs:22:2
+   |
+22 |     u8,
+   |     ^^
diff --git a/substrate/frame/election-provider-support/solution-type/tests/ui/fail/missing_voter.rs b/substrate/frame/election-provider-support/solution-type/tests/ui/fail/missing_voter.rs
index 3d12e3e6b5ec4822fc044a4e2ab2c8f8b30a8b06..10e7d7577a271702ce2e4bbf0f2df48de0a99d2d 100644
--- a/substrate/frame/election-provider-support/solution-type/tests/ui/fail/missing_voter.rs
+++ b/substrate/frame/election-provider-support/solution-type/tests/ui/fail/missing_voter.rs
@@ -1,3 +1,20 @@
+// 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.
+
 use frame_election_provider_solution_type::generate_solution_type;
 
 generate_solution_type!(pub struct TestSolution::<
diff --git a/substrate/frame/election-provider-support/solution-type/tests/ui/fail/missing_voter.stderr b/substrate/frame/election-provider-support/solution-type/tests/ui/fail/missing_voter.stderr
index a825d460c2fa8c9411c5132a1c755c7e87a090ff..c8a5b92b76289b77b3fab902dbb1ac85ca496095 100644
--- a/substrate/frame/election-provider-support/solution-type/tests/ui/fail/missing_voter.stderr
+++ b/substrate/frame/election-provider-support/solution-type/tests/ui/fail/missing_voter.stderr
@@ -1,5 +1,5 @@
 error: Expected binding: `VoterIndex = ...`
- --> $DIR/missing_voter.rs:4:2
-  |
-4 |     u16,
-  |     ^^^
+  --> tests/ui/fail/missing_voter.rs:21:2
+   |
+21 |     u16,
+   |     ^^^
diff --git a/substrate/frame/election-provider-support/solution-type/tests/ui/fail/no_annotations.rs b/substrate/frame/election-provider-support/solution-type/tests/ui/fail/no_annotations.rs
index 9aab15e7ec9a1798464cca328fb89cc88dacba62..6e0a0df14cee797bac4302018d0cc7ef8641c3d3 100644
--- a/substrate/frame/election-provider-support/solution-type/tests/ui/fail/no_annotations.rs
+++ b/substrate/frame/election-provider-support/solution-type/tests/ui/fail/no_annotations.rs
@@ -1,3 +1,20 @@
+// 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.
+
 use frame_election_provider_solution_type::generate_solution_type;
 
 generate_solution_type!(pub struct TestSolution::<
diff --git a/substrate/frame/election-provider-support/solution-type/tests/ui/fail/no_annotations.stderr b/substrate/frame/election-provider-support/solution-type/tests/ui/fail/no_annotations.stderr
index 28f1c2091546fc24f2bfea8dc976fbcc979fbba4..af548a524b2795834a958ae3631751a1dc94c75a 100644
--- a/substrate/frame/election-provider-support/solution-type/tests/ui/fail/no_annotations.stderr
+++ b/substrate/frame/election-provider-support/solution-type/tests/ui/fail/no_annotations.stderr
@@ -1,5 +1,5 @@
 error: Expected binding: `VoterIndex = ...`
- --> $DIR/no_annotations.rs:4:2
-  |
-4 |     u16,
-  |     ^^^
+  --> tests/ui/fail/no_annotations.rs:21:2
+   |
+21 |     u16,
+   |     ^^^
diff --git a/substrate/frame/election-provider-support/solution-type/tests/ui/fail/swap_voter_target.rs b/substrate/frame/election-provider-support/solution-type/tests/ui/fail/swap_voter_target.rs
index 4275aae045a604f9b5e8e746b87fd830b4c0bd27..2ae1aa2b9deb740ba8ba62ed4e1cd9b4dff71702 100644
--- a/substrate/frame/election-provider-support/solution-type/tests/ui/fail/swap_voter_target.rs
+++ b/substrate/frame/election-provider-support/solution-type/tests/ui/fail/swap_voter_target.rs
@@ -1,3 +1,20 @@
+// 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.
+
 use frame_election_provider_solution_type::generate_solution_type;
 
 generate_solution_type!(pub struct TestSolution::<
diff --git a/substrate/frame/election-provider-support/solution-type/tests/ui/fail/swap_voter_target.stderr b/substrate/frame/election-provider-support/solution-type/tests/ui/fail/swap_voter_target.stderr
index 5759fee7472fab271a1a79f0a02c48684d7a5951..0a4bc7515f4e4d31b711a8d4a0f68d14f0ad3660 100644
--- a/substrate/frame/election-provider-support/solution-type/tests/ui/fail/swap_voter_target.stderr
+++ b/substrate/frame/election-provider-support/solution-type/tests/ui/fail/swap_voter_target.stderr
@@ -1,5 +1,5 @@
 error: Expected `VoterIndex`
- --> $DIR/swap_voter_target.rs:4:2
-  |
-4 |     TargetIndex = u16,
-  |     ^^^^^^^^^^^
+  --> tests/ui/fail/swap_voter_target.rs:21:2
+   |
+21 |     TargetIndex = u16,
+   |     ^^^^^^^^^^^
diff --git a/substrate/frame/election-provider-support/solution-type/tests/ui/fail/wrong_attribute.rs b/substrate/frame/election-provider-support/solution-type/tests/ui/fail/wrong_attribute.rs
index a51cc724ad1580489fc8d71335717462df67fa54..4fcd8a815c954f4e42130091803e12f89a458d5e 100644
--- a/substrate/frame/election-provider-support/solution-type/tests/ui/fail/wrong_attribute.rs
+++ b/substrate/frame/election-provider-support/solution-type/tests/ui/fail/wrong_attribute.rs
@@ -1,3 +1,20 @@
+// 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.
+
 use frame_election_provider_solution_type::generate_solution_type;
 
 generate_solution_type!(
diff --git a/substrate/frame/election-provider-support/solution-type/tests/ui/fail/wrong_attribute.stderr b/substrate/frame/election-provider-support/solution-type/tests/ui/fail/wrong_attribute.stderr
index ab700a3f2afcbf4516d695aebbfe034ce08ffc22..a18b294516bd146572d0d120356e313a6fc80730 100644
--- a/substrate/frame/election-provider-support/solution-type/tests/ui/fail/wrong_attribute.stderr
+++ b/substrate/frame/election-provider-support/solution-type/tests/ui/fail/wrong_attribute.stderr
@@ -1,5 +1,5 @@
 error: compact solution can accept only #[compact]
- --> $DIR/wrong_attribute.rs:4:2
-  |
-4 |     #[pages(1)] pub struct TestSolution::<
-  |     ^^^^^^^^^^^
+  --> tests/ui/fail/wrong_attribute.rs:21:2
+   |
+21 |     #[pages(1)] pub struct TestSolution::<
+   |     ^^^^^^^^^^^
diff --git a/substrate/frame/elections-phragmen/Cargo.toml b/substrate/frame/elections-phragmen/Cargo.toml
index 327af3f3ba56c588bc636beb9519b61ba7a84bf5..2dfe8e42151ae1ddab784e0a29a74873207bd56f 100644
--- a/substrate/frame/elections-phragmen/Cargo.toml
+++ b/substrate/frame/elections-phragmen/Cargo.toml
@@ -1,11 +1,11 @@
 [package]
 name = "pallet-elections-phragmen"
 version = "5.0.0-dev"
-authors = ["Parity Technologies <admin@parity.io>"]
-edition = "2021"
+authors.workspace = true
+edition.workspace = true
 license = "Apache-2.0"
 homepage = "https://substrate.io"
-repository = "https://github.com/paritytech/substrate/"
+repository.workspace = true
 description = "FRAME pallet based on seq-Phragmén election method."
 readme = "README.md"
 
diff --git a/substrate/frame/elections-phragmen/README.md b/substrate/frame/elections-phragmen/README.md
index 26b3f260da5635de07949d7449800e3d34c1a480..f5ed609f2129d33788652e5cf33f138471505454 100644
--- a/substrate/frame/elections-phragmen/README.md
+++ b/substrate/frame/elections-phragmen/README.md
@@ -1,64 +1,58 @@
-# Phragmén Election Module.
+# Phragmén Election Module
 
 An election module based on sequential phragmen.
 
-### Term and Round
-
-The election happens in _rounds_: every `N` blocks, all previous members are retired and a new
-set is elected (which may or may not have an intersection with the previous set). Each round
-lasts for some number of blocks defined by `TermDuration` storage item. The words _term_ and
-_round_ can be used interchangeably in this context.
-
-`TermDuration` might change during a round. This can shorten or extend the length of the round.
-The next election round's block number is never stored but rather always checked on the fly.
-Based on the current block number and `TermDuration`, the condition `BlockNumber % TermDuration
-== 0` being satisfied will always trigger a new election round.
-
-### Voting
-
-Voters can vote for any set of the candidates by providing a list of account ids. Invalid votes
-(voting for non-candidates) are ignored during election. Yet, a voter _might_ vote for a future
-candidate. Voters reserve a bond as they vote. Each vote defines a `value`. This amount is
-locked from the account of the voter and indicates the weight of the vote. Voters can update
-their votes at any time by calling `vote()` again. This keeps the bond untouched but can
-optionally change the locked `value`. After a round, votes are kept and might still be valid for
-further rounds. A voter is responsible for calling `remove_voter` once they are done to have
-their bond back and remove the lock.
-
-Voters also report other voters as being defunct to earn their bond. A voter is defunct once all
-of the candidates that they have voted for are neither a valid candidate anymore nor a member.
-Upon reporting, if the target voter is actually defunct, the reporter will be rewarded by the
-voting bond of the target. The target will lose their bond and get removed. If the target is not
-defunct, the reporter is slashed and removed. To prevent being reported, voters should manually
-submit a `remove_voter()` as soon as they are in the defunct state.
-
-### Candidacy and Members
-
-Candidates also reserve a bond as they submit candidacy. A candidate cannot take their candidacy
-back. A candidate can end up in one of the below situations:
-  - **Winner**: A winner is kept as a _member_. They must still have a bond in reserve and they
-    are automatically counted as a candidate for the next election.
-  - **Runner-up**: Runners-up are the best candidates immediately after the winners. The number
-    of runners_up to keep is configurable. Runners-up are used, in order that they are elected,
-    as replacements when a candidate is kicked by `[remove_member]`, or when an active member
-    renounces their candidacy. Runners are automatically counted as a candidate for the next
-    election.
-  - **Loser**: Any of the candidate who are not a winner are left as losers. A loser might be an
-    _outgoing member or runner_, meaning that they are an active member who failed to keep their
-    spot. An outgoing will always lose their bond.
-
-##### Renouncing candidacy.
-
-All candidates, elected or not, can renounce their candidacy. A call to [`Module::renounce_candidacy`]
-will always cause the candidacy bond to be refunded.
-
-Note that with the members being the default candidates for the next round and votes persisting
-in storage, the election system is entirely stable given no further input. This means that if
-the system has a particular set of candidates `C` and voters `V` that lead to a set of members
-`M` being elected, as long as `V` and `C` don't remove their candidacy and votes, `M` will keep
-being re-elected at the end of each round.
-
-### Module Information
+## Term and Round
+
+The election happens in _rounds_: every `N` blocks, all previous members are retired and a new set is elected (which may
+or may not have an intersection with the previous set). Each round lasts for some number of blocks defined by
+`TermDuration` storage item. The words _term_ and _round_ can be used interchangeably in this context.
+
+`TermDuration` might change during a round. This can shorten or extend the length of the round. The next election
+round's block number is never stored but rather always checked on the fly. Based on the current block number and
+`TermDuration`, the condition `BlockNumber % TermDuration == 0` being satisfied will always trigger a new election
+round.
+
+## Voting
+
+Voters can vote for any set of the candidates by providing a list of account ids. Invalid votes (voting for
+non-candidates) are ignored during election. Yet, a voter _might_ vote for a future candidate. Voters reserve a bond as
+they vote. Each vote defines a `value`. This amount is locked from the account of the voter and indicates the weight of
+the vote. Voters can update their votes at any time by calling `vote()` again. This keeps the bond untouched but can
+optionally change the locked `value`. After a round, votes are kept and might still be valid for further rounds. A voter
+is responsible for calling `remove_voter` once they are done to have their bond back and remove the lock.
+
+Voters also report other voters as being defunct to earn their bond. A voter is defunct once all of the candidates that
+they have voted for are neither a valid candidate anymore nor a member. Upon reporting, if the target voter is actually
+defunct, the reporter will be rewarded by the voting bond of the target. The target will lose their bond and get
+removed. If the target is not defunct, the reporter is slashed and removed. To prevent being reported, voters should
+manually submit a `remove_voter()` as soon as they are in the defunct state.
+
+## Candidacy and Members
+
+Candidates also reserve a bond as they submit candidacy. A candidate cannot take their candidacy back. A candidate can
+end up in one of the below situations:
+  - **Winner**: A winner is kept as a _member_. They must still have a bond in reserve and they are automatically
+    counted as a candidate for the next election.
+  - **Runner-up**: Runners-up are the best candidates immediately after the winners. The number of runners_up to keep is
+    configurable. Runners-up are used, in order that they are elected, as replacements when a candidate is kicked by
+    `[remove_member]`, or when an active member renounces their candidacy. Runners are automatically counted as a
+    candidate for the next election.
+  - **Loser**: Any of the candidate who are not a winner are left as losers. A loser might be an _outgoing member or
+    runner_, meaning that they are an active member who failed to keep their spot. An outgoing will always lose their
+    bond.
+
+### Renouncing candidacy
+
+All candidates, elected or not, can renounce their candidacy. A call to [`Module::renounce_candidacy`] will always cause
+the candidacy bond to be refunded.
+
+Note that with the members being the default candidates for the next round and votes persisting in storage, the election
+system is entirely stable given no further input. This means that if the system has a particular set of candidates `C`
+and voters `V` that lead to a set of members `M` being elected, as long as `V` and `C` don't remove their candidacy and
+votes, `M` will keep being re-elected at the end of each round.
+
+## Module Information
 
 - [`election_sp_phragmen::Config`](https://docs.rs/pallet-elections-phragmen/latest/pallet_elections_phragmen/trait.Config.html)
 - [`Call`](https://docs.rs/pallet-elections-phragmen/latest/pallet_elections_phragmen/enum.Call.html)
diff --git a/substrate/frame/elections-phragmen/src/benchmarking.rs b/substrate/frame/elections-phragmen/src/benchmarking.rs
index 56ea19578c8f5425bc9f42029659d64ebf9cba84..9878f7fd41c068329574810c3fc8edff0e6b7b4a 100644
--- a/substrate/frame/elections-phragmen/src/benchmarking.rs
+++ b/substrate/frame/elections-phragmen/src/benchmarking.rs
@@ -379,7 +379,7 @@ benchmarks! {
 		let root = RawOrigin::Root;
 	}: _(root, v, d)
 	verify {
-		assert_eq!(<Voting<T>>::iter().count() as u32, 0);
+		assert_eq!(<Voting<T>>::iter().count() as u32, v - d);
 	}
 
 	election_phragmen {
diff --git a/substrate/frame/elections-phragmen/src/lib.rs b/substrate/frame/elections-phragmen/src/lib.rs
index 6912649bd122d8d66014b9f805f54732c01bc18b..93f9fc2b6d241df1dd75f1f47c171708f6857e08 100644
--- a/substrate/frame/elections-phragmen/src/lib.rs
+++ b/substrate/frame/elections-phragmen/src/lib.rs
@@ -591,15 +591,18 @@ pub mod pallet {
 		/// ## Complexity
 		/// - Check is_defunct_voter() details.
 		#[pallet::call_index(5)]
-		#[pallet::weight(T::WeightInfo::clean_defunct_voters(*_num_voters, *_num_defunct))]
+		#[pallet::weight(T::WeightInfo::clean_defunct_voters(*num_voters, *num_defunct))]
 		pub fn clean_defunct_voters(
 			origin: OriginFor<T>,
-			_num_voters: u32,
-			_num_defunct: u32,
+			num_voters: u32,
+			num_defunct: u32,
 		) -> DispatchResult {
 			let _ = ensure_root(origin)?;
+
 			<Voting<T>>::iter()
+				.take(num_voters as usize)
 				.filter(|(_, x)| Self::is_defunct_voter(&x.votes))
+				.take(num_defunct as usize)
 				.for_each(|(dv, _)| Self::do_remove_voter(&dv));
 
 			Ok(())
diff --git a/substrate/frame/elections-phragmen/src/migrations/v5.rs b/substrate/frame/elections-phragmen/src/migrations/v5.rs
index eb35c1fae0f29645ceba82c9c38f83ad382e6561..6fac923703fec2071746c01fe9ccc6f6ad300c15 100644
--- a/substrate/frame/elections-phragmen/src/migrations/v5.rs
+++ b/substrate/frame/elections-phragmen/src/migrations/v5.rs
@@ -1,3 +1,20 @@
+// 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.
+
 use super::super::*;
 
 /// Migrate the locks and vote stake on accounts (as specified with param `to_migrate`) that have
diff --git a/substrate/frame/examples/Cargo.toml b/substrate/frame/examples/Cargo.toml
index 78bb819959afb56aa8dae1fab8b074c4a71f873c..9c47d7442111fdfa0313af5b9d1ae2048ae90b12 100644
--- a/substrate/frame/examples/Cargo.toml
+++ b/substrate/frame/examples/Cargo.toml
@@ -1,12 +1,12 @@
 [package]
 name = "pallet-examples"
 version = "4.0.0-dev"
-authors = ["Parity Technologies <admin@parity.io>"]
-edition = "2021"
+authors.workspace = true
+edition.workspace = true
 license = "Apache-2.0"
 homepage = "https://substrate.io"
-repository = "https://github.com/paritytech/substrate/"
-description = "The single package with various examples for frame pallets"
+repository.workspace = true
+description = "The single package with examples of various types of FRAME pallets"
 
 [package.metadata.docs.rs]
 targets = ["x86_64-unknown-linux-gnu"]
diff --git a/substrate/frame/examples/basic/Cargo.toml b/substrate/frame/examples/basic/Cargo.toml
index 03179affbdefce9c5553e2f2e9f5cec9298c45e4..cb3bc3f2c822a521a75f1d01cf44918424441bc5 100644
--- a/substrate/frame/examples/basic/Cargo.toml
+++ b/substrate/frame/examples/basic/Cargo.toml
@@ -1,11 +1,11 @@
 [package]
 name = "pallet-example-basic"
 version = "4.0.0-dev"
-authors = ["Parity Technologies <admin@parity.io>"]
-edition = "2021"
+authors.workspace = true
+edition.workspace = true
 license = "MIT-0"
 homepage = "https://substrate.io"
-repository = "https://github.com/paritytech/substrate/"
+repository.workspace = true
 description = "FRAME example pallet"
 readme = "README.md"
 
diff --git a/substrate/frame/examples/basic/README.md b/substrate/frame/examples/basic/README.md
index 2af50573f8075cffe03e8509cc5740ea3ebb6a0f..be787d1b6ecc1d3b20302c78a346d8f291ff4e0f 100644
--- a/substrate/frame/examples/basic/README.md
+++ b/substrate/frame/examples/basic/README.md
@@ -9,7 +9,7 @@ Run `cargo doc --package pallet-example-basic --open` to view this pallet's docu
 
 **This pallet serves as an example and is not meant to be used in production.**
 
-### Documentation Guidelines:
+## Documentation Guidelines
 
 <!-- Original author of paragraph: Various. Based on collation of review comments to PRs addressing issues with -->
 <!-- label 'S3-FRAME' in https://github.com/paritytech/substrate-developer-hub/issues -->
diff --git a/substrate/frame/examples/basic/src/lib.rs b/substrate/frame/examples/basic/src/lib.rs
index 426e9b7ec648c25dda54b27b498cbdd1d92b51d6..5eff74922cabfa8e10b747ba186b7974e81c49f4 100644
--- a/substrate/frame/examples/basic/src/lib.rs
+++ b/substrate/frame/examples/basic/src/lib.rs
@@ -15,258 +15,40 @@
 // See the License for the specific language governing permissions and
 // limitations under the License.
 
-//! <!-- markdown-link-check-disable -->
 //! # Basic Example Pallet
 //!
-//! <!-- Original author of paragraph: @gavofyork -->
-//! The Example: A simple example of a FRAME pallet demonstrating
-//! concepts, APIs and structures common to most FRAME runtimes.
-//!
-//! Run `cargo doc --package pallet-example-basic --open` to view this pallet's documentation.
+//! A pallet demonstrating concepts, APIs and structures common to most FRAME runtimes.
 //!
 //! **This pallet serves as an example and is not meant to be used in production.**
 //!
-//! ### Documentation Guidelines:
-//!
-//! <!-- Original author of paragraph: Various. Based on collation of review comments to PRs
-//! addressing issues with --> <!-- label 'S3-FRAME' in https://github.com/paritytech/substrate-developer-hub/issues -->
-//! <ul>
-//! <li>Documentation comments (i.e. <code>/// comment</code>) - should
-//! accompany pallet functions and be restricted to the pallet interface,
-//! not the internals of the pallet implementation. Only state inputs,
-//! outputs, and a brief description that mentions whether calling it
-//! requires root, but without repeating the source code details.
-//! Capitalize the first word of each documentation comment and end it with
-//! a full stop. See
-//! <a href="https://github.com/paritytech/substrate#72-contributing-to-documentation-for-substrate-packages"
-//! target="_blank"> Generic example of annotating source code with documentation comments</a></li>
-//!
-//! <li>Self-documenting code - Try to refactor code to be self-documenting.</li>
-//!
-//! <li>Code comments - Supplement complex code with a brief explanation, not every line of
-//! code.</li>
-//!
-//! <li>Identifiers - surround by backticks (i.e. <code>INHERENT_IDENTIFIER</code>,
-//! <code>InherentType</code>, <code>u64</code>)</li>
-//!
-//! <li>Usage scenarios - should be simple doctests. The compiler should ensure they stay
-//! valid.</li>
-//!
-//! <li>Extended tutorials - should be moved to external files and refer to.</li>
-//!
-//! <li>Mandatory - include all of the sections/subsections where <b>MUST</b> is specified.</li>
-//!
-//! <li>Optional - optionally include sections/subsections where <b>CAN</b> is specified.</li>
-//! </ul>
-//!
-//! ### Documentation Template:<br>
-//!
-//! Copy and paste this template from frame/examples/basic/src/lib.rs into file
-//! `frame/<INSERT_CUSTOM_PALLET_NAME>/src/lib.rs` of your own custom pallet and complete it.
-//! <details><p><pre>
-//! // Add heading with custom pallet name
-//!
-//! \# <INSERT_CUSTOM_PALLET_NAME> Pallet
-//!
-//! // Add simple description
-//!
-//! // Include the following links that shows what trait needs to be implemented to use the pallet
-//! // and the supported dispatchables that are documented in the Call enum.
-//!
-//! - \[`Config`]
-//! - \[`Call`]
-//! - \[`Pallet`]
-//!
-//! \## Overview
-//!
-//! <!-- Original author of paragraph: Various. See https://github.com/paritytech/substrate-developer-hub/issues/44 -->
-//! // Short description of pallet's purpose.
-//! // Links to Traits that should be implemented.
-//! // What this pallet is for.
-//! // What functionality the pallet provides.
-//! // When to use the pallet (use case examples).
-//! // How it is used.
-//! // Inputs it uses and the source of each input.
-//! // Outputs it produces.
-//!
-//! <!-- Original author of paragraph: @Kianenigma in PR https://github.com/paritytech/substrate/pull/1951 -->
-//! <!-- and comment https://github.com/paritytech/substrate-developer-hub/issues/44#issuecomment-471982710 -->
-//!
-//! \## Terminology
-//!
-//! // Add terminology used in the custom pallet. Include concepts, storage items, or actions that
-//! you think // deserve to be noted to give context to the rest of the documentation or pallet
-//! usage. The author needs to // use some judgment about what is included. We don't want a list of
-//! every storage item nor types - the user // can go to the code for that. For example, "transfer
-//! fee" is obvious and should not be included, but // "free balance" and "reserved balance" should
-//! be noted to give context to the pallet. // Please do not link to outside resources. The
-//! reference docs should be the ultimate source of truth.
-//!
-//! <!-- Original author of heading: @Kianenigma in PR https://github.com/paritytech/substrate/pull/1951 -->
-//!
-//! \## Goals
-//!
-//! // Add goals that the custom pallet is designed to achieve.
-//!
-//! <!-- Original author of heading: @Kianenigma in PR https://github.com/paritytech/substrate/pull/1951 -->
-//!
-//! \### Scenarios
-//!
-//! <!-- Original author of paragraph: @Kianenigma. Based on PR https://github.com/paritytech/substrate/pull/1951 -->
-//!
-//! \#### <INSERT_SCENARIO_NAME>
-//!
-//! // Describe requirements prior to interacting with the custom pallet.
-//! // Describe the process of interacting with the custom pallet for this scenario and public API
-//! functions used.
-//!
-//! \## Interface
-//!
-//! \### Supported Origins
-//!
-//! // What origins are used and supported in this pallet (root, signed, none)
-//! // i.e. root when <code>\`ensure_root\`</code> used
-//! // i.e. none when <code>\`ensure_none\`</code> used
-//! // i.e. signed when <code>\`ensure_signed\`</code> used
-//!
-//! <code>\`inherent\`</code> <INSERT_DESCRIPTION>
-//!
-//! <!-- Original author of paragraph: @Kianenigma in comment -->
-//! <!-- https://github.com/paritytech/substrate-developer-hub/issues/44#issuecomment-471982710 -->
-//!
-//! \### Types
-//!
-//! // Type aliases. Include any associated types and where the user would typically define them.
-//!
-//! <code>\`ExampleType\`</code> <INSERT_DESCRIPTION>
-//!
-//! <!-- Original author of paragraph: ??? -->
-//!
-//! // Reference documentation of aspects such as `storageItems` and `dispatchable` functions should
-//! // only be included in the <https://docs.rs> Rustdocs for Substrate and not repeated in the
-//! // README file.
-//!
-//! \### Dispatchable Functions
-//!
-//! <!-- Original author of paragraph: @AmarRSingh & @joepetrowski -->
-//!
-//! // A brief description of dispatchable functions and a link to the rustdoc with their actual
-//! documentation.
-//!
-//! // <b>MUST</b> have link to Call enum
-//! // <b>MUST</b> have origin information included in function doc
-//! // <b>CAN</b> have more info up to the user
-//!
-//! \### Public Functions
-//!
-//! <!-- Original author of paragraph: @joepetrowski -->
-//!
-//! // A link to the rustdoc and any notes about usage in the pallet, not for specific functions.
-//! // For example, in the Balances Pallet: "Note that when using the publicly exposed functions,
-//! // you (the runtime developer) are responsible for implementing any necessary checks
-//! // (e.g. that the sender is the signer) before calling a function that will affect storage."
-//!
-//! <!-- Original author of paragraph: @AmarRSingh -->
-//!
-//! // It is up to the writer of the respective pallet (with respect to how much information to
-//! provide).
-//!
-//! \#### Public Inspection functions - Immutable (getters)
-//!
-//! // Insert a subheading for each getter function signature
-//!
-//! \##### <code>\`example_getter_name()\`</code>
-//!
-//! // What it returns
-//! // Why, when, and how often to call it
-//! // When it could panic or error
-//! // When safety issues to consider
-//!
-//! \#### Public Mutable functions (changing state)
-//!
-//! // Insert a subheading for each setter function signature
-//!
-//! \##### <code>\`example_setter_name(origin, parameter_name: T::ExampleType)\`</code>
-//!
-//! // What state it changes
-//! // Why, when, and how often to call it
-//! // When it could panic or error
-//! // When safety issues to consider
-//! // What parameter values are valid and why
-//!
-//! \### Storage Items
-//!
-//! // Explain any storage items included in this pallet
-//!
-//! \### Digest Items
-//!
-//! // Explain any digest items included in this pallet
-//!
-//! \### Inherent Data
-//!
-//! // Explain what inherent data (if any) is defined in the pallet and any other related types
-//!
-//! \### Events:
-//!
-//! // Insert events for this pallet if any
-//!
-//! \### Errors:
-//!
-//! // Explain what generates errors
-//!
-//! \## Usage
-//!
-//! // Insert 2-3 examples of usage and code snippets that show how to
-//! // use <INSERT_CUSTOM_PALLET_NAME> Pallet in a custom pallet.
-//!
-//! \### Prerequisites
-//!
-//! // Show how to include necessary imports for <INSERT_CUSTOM_PALLET_NAME> and derive
-//! // your pallet configuration trait with the `INSERT_CUSTOM_PALLET_NAME` trait.
-//!
-//! \```rust
-//! use <INSERT_CUSTOM_PALLET_NAME>;
-//!
-//! pub trait Config: <INSERT_CUSTOM_PALLET_NAME>::Config { }
-//! \```
-//!
-//! \### Simple Code Snippet
-//!
-//! // Show a simple example (e.g. how to query a public getter function of
-//! <INSERT_CUSTOM_PALLET_NAME>)
-//!
-//! \### Example from FRAME
-//!
-//! // Show a usage example in an actual runtime
-//!
-//! // See:
-//! // - Substrate TCR <https://github.com/parity-samples/substrate-tcr>
-//! // - Substrate Kitties <https://shawntabrizi.github.io/substrate-collectables-workshop/#/>
-//!
-//! \## Genesis Config
-//!
-//! <!-- Original author of paragraph: @joepetrowski -->
-//!
-//! \## Dependencies
+//! > Made with *Substrate*, for *Polkadot*.
 //!
-//! // Dependencies on other FRAME pallets and the genesis config should be mentioned,
-//! // but not the Rust Standard Library.
-//! // Genesis configuration modifications that may be made to incorporate this pallet
-//! // Interaction with other pallets
+//! [![github]](https://github.com/paritytech/polkadot-sdk/tree/master/substrate/frame/examples/basic)
+//! [![polkadot]](https://polkadot.network)
 //!
-//! <!-- Original author of heading: @AmarRSingh -->
+//! [polkadot]: https://img.shields.io/badge/polkadot-E6007A?style=for-the-badge&logo=polkadot&logoColor=white
+//! [github]: https://img.shields.io/badge/github-8da0cb?style=for-the-badge&labelColor=555555&logo=github
 //!
-//! \## Related Pallets
+//! ## Pallet API
 //!
-//! // Interaction with other pallets in the form of a bullet point list
+//! See the [`pallet`] module for more information about the interfaces this pallet exposes,
+//! including its configuration trait, dispatchables, storage items, events and errors.
 //!
-//! \## References
+//! ## Overview
 //!
-//! <!-- Original author of paragraph: @joepetrowski -->
+//! This pallet provides basic examples of using:
 //!
-//! // Links to reference material, if applicable. For example, Phragmen, W3F research, etc.
-//! // that the implementation is based on.
-//! </pre></p></details>
+//! - A custom weight calculator able to classify a call's dispatch class (see:
+//!   [`frame_support::dispatch::DispatchClass`])
+//! - Pallet hooks to implement some custom logic that's executed before and after a block is
+//!   imported (see: [`frame_support::traits::Hooks`])
+//! - Inherited weight annotation for pallet calls, used to create less repetition for calls that
+//!   use the [`Config::WeightInfo`] trait to calculate call weights. This can also be overridden,
+//!   as demonstrated by [`Call::set_dummy`].
+//! - A private function that performs a storage update.
+//! - A simple signed extension implementation (see: [`sp_runtime::traits::SignedExtension`]) which
+//!   increases the priority of the [`Call::set_dummy`] if it's present and drops any transaction
+//!   with an encoded length higher than 200 bytes.
 
 // Ensure we're `no_std` when compiling for Wasm.
 #![cfg_attr(not(feature = "std"), no_std)]
@@ -381,7 +163,8 @@ pub mod pallet {
 	#[pallet::pallet]
 	pub struct Pallet<T>(_);
 
-	// Pallet implements [`Hooks`] trait to define some logic to execute in some context.
+	// This pallet implements the [`frame_support::traits::Hooks`] trait to define some logic to
+	// execute in some context.
 	#[pallet::hooks]
 	impl<T: Config> Hooks<BlockNumberFor<T>> for Pallet<T> {
 		// `on_initialize` is executed at the beginning of the block before any extrinsic are
@@ -674,7 +457,7 @@ impl<T: Config> Pallet<T> {
 // Note that a signed extension can also indicate that a particular data must be present in the
 // _signing payload_ of a transaction by providing an implementation for the `additional_signed`
 // method. This example will not cover this type of extension. See `CheckSpecVersion` in
-// [FRAME System](https://github.com/paritytech/substrate/tree/master/frame/system#signed-extensions)
+// [FRAME System](https://github.com/paritytech/polkadot-sdk/tree/master/substrate/frame/system#signed-extensions)
 // for an example.
 //
 // Using the extension, you can add some hooks to the life cycle of each transaction. Note that by
@@ -686,7 +469,7 @@ impl<T: Config> Pallet<T> {
 // sender of the transaction (if signed) are also provided.
 //
 // The full list of hooks that can be added to a signed extension can be found
-// [here](https://crates.parity.io/sp_runtime/traits/trait.SignedExtension.html).
+// [here](https://paritytech.github.io/polkadot-sdk/master/sp_runtime/traits/trait.SignedExtension.html).
 //
 // The signed extensions are aggregated in the runtime file of a substrate chain. All extensions
 // should be aggregated in a tuple and passed to the `CheckedExtrinsic` and `UncheckedExtrinsic`
diff --git a/substrate/frame/examples/default-config/Cargo.toml b/substrate/frame/examples/default-config/Cargo.toml
index 38aea49b2325ef0ea2a7a16a1e617ce3837473db..3a6b56b57fad03422b34773ebf53ae6ee3e967dd 100644
--- a/substrate/frame/examples/default-config/Cargo.toml
+++ b/substrate/frame/examples/default-config/Cargo.toml
@@ -1,11 +1,11 @@
 [package]
 name = "pallet-default-config-example"
 version = "4.0.0-dev"
-authors = ["Parity Technologies <admin@parity.io>"]
-edition = "2021"
+authors.workspace = true
+edition.workspace = true
 license = "MIT-0"
 homepage = "https://substrate.io"
-repository = "https://github.com/paritytech/substrate/"
+repository.workspace = true
 description = "FRAME example pallet demonstrating derive_impl / default_config in action"
 readme = "README.md"
 
diff --git a/substrate/frame/examples/default-config/src/lib.rs b/substrate/frame/examples/default-config/src/lib.rs
index d2eade0ccff1eeab28ada5b4af9ed3b810d0bcb8..8a1f6f9d6a82cffbd557ab2d3f1e92ad966abad0 100644
--- a/substrate/frame/examples/default-config/src/lib.rs
+++ b/substrate/frame/examples/default-config/src/lib.rs
@@ -26,7 +26,7 @@
 //! Study the following types:
 //!
 //! - [`pallet::DefaultConfig`], and how it differs from [`pallet::Config`].
-//! - [`pallet::config_preludes::TestDefaultConfig`] and how it implements
+//! - [`struct@pallet::config_preludes::TestDefaultConfig`] and how it implements
 //!   [`pallet::DefaultConfig`].
 //! - Notice how [`pallet::DefaultConfig`] is independent of [`frame_system::Config`].
 
@@ -83,11 +83,12 @@ pub mod pallet {
 		// This will help use not need to disambiguate anything when using `derive_impl`.
 		use super::*;
 		use frame_support::derive_impl;
+		use frame_system::config_preludes::TestDefaultConfig as SystemTestDefaultConfig;
 
 		/// A type providing default configurations for this pallet in testing environment.
 		pub struct TestDefaultConfig;
 
-		#[derive_impl(frame_system::config_preludes::TestDefaultConfig as frame_system::DefaultConfig, no_aggregated_types)]
+		#[derive_impl(SystemTestDefaultConfig as frame_system::DefaultConfig, no_aggregated_types)]
 		impl frame_system::DefaultConfig for TestDefaultConfig {}
 
 		#[frame_support::register_default_impl(TestDefaultConfig)]
@@ -109,7 +110,7 @@ pub mod pallet {
 		/// example, we simple derive `frame_system::config_preludes::TestDefaultConfig` again.
 		pub struct OtherDefaultConfig;
 
-		#[derive_impl(frame_system::config_preludes::TestDefaultConfig as frame_system::DefaultConfig, no_aggregated_types)]
+		#[derive_impl(SystemTestDefaultConfig as frame_system::DefaultConfig, no_aggregated_types)]
 		impl frame_system::DefaultConfig for OtherDefaultConfig {}
 
 		#[frame_support::register_default_impl(OtherDefaultConfig)]
diff --git a/substrate/frame/examples/dev-mode/Cargo.toml b/substrate/frame/examples/dev-mode/Cargo.toml
index 4d8e31186877ff1acd5b893a79f53043d1c26f19..8cd3fda671204ead77044bb156deeb751dfb162f 100644
--- a/substrate/frame/examples/dev-mode/Cargo.toml
+++ b/substrate/frame/examples/dev-mode/Cargo.toml
@@ -1,11 +1,11 @@
 [package]
 name = "pallet-dev-mode"
 version = "4.0.0-dev"
-authors = ["Parity Technologies <admin@parity.io>"]
-edition = "2021"
+authors.workspace = true
+edition.workspace = true
 license = "MIT-0"
 homepage = "https://substrate.io"
-repository = "https://github.com/paritytech/substrate/"
+repository.workspace = true
 description = "FRAME example pallet"
 readme = "README.md"
 
diff --git a/substrate/frame/examples/kitchensink/Cargo.toml b/substrate/frame/examples/kitchensink/Cargo.toml
index a152ee911eda2b7df8d85c2d0913c251f81562ec..26018ad7d97f871c6e42fe18d079710ccdb5dc96 100644
--- a/substrate/frame/examples/kitchensink/Cargo.toml
+++ b/substrate/frame/examples/kitchensink/Cargo.toml
@@ -1,11 +1,11 @@
 [package]
 name = "pallet-example-kitchensink"
 version = "4.0.0-dev"
-authors = ["Parity Technologies <admin@parity.io>"]
-edition = "2021"
+authors.workspace = true
+edition.workspace = true
 license = "MIT-0"
 homepage = "https://substrate.io"
-repository = "https://github.com/paritytech/substrate/"
+repository.workspace = true
 description = "FRAME example kitchensink pallet"
 
 [package.metadata.docs.rs]
diff --git a/substrate/frame/examples/kitchensink/src/tests.rs b/substrate/frame/examples/kitchensink/src/tests.rs
index b2af7c8983f563e5ab636ab63a9e8da102167d8f..abded83e48201ef0b518ba9f6f7a1e2d11eb3418 100644
--- a/substrate/frame/examples/kitchensink/src/tests.rs
+++ b/substrate/frame/examples/kitchensink/src/tests.rs
@@ -39,15 +39,7 @@ frame_support::construct_runtime!(
 /// details.
 #[derive_impl(frame_system::config_preludes::TestDefaultConfig as frame_system::DefaultConfig)]
 impl frame_system::Config for Test {
-	type BaseCallFilter = frame_support::traits::Everything;
 	type Block = Block;
-	type BlockHashCount = ConstU64<10>;
-	type RuntimeOrigin = RuntimeOrigin;
-	type RuntimeCall = RuntimeCall;
-	type RuntimeEvent = RuntimeEvent;
-	type PalletInfo = PalletInfo;
-	type OnSetCode = ();
-
 	type AccountData = pallet_balances::AccountData<u64>;
 }
 
diff --git a/substrate/frame/examples/kitchensink/src/weights.rs b/substrate/frame/examples/kitchensink/src/weights.rs
index 1d083a9b80eeaa69783f8a811f82b998f23f1938..43f48332ae946b684e912286b35705ac26086481 100644
--- a/substrate/frame/examples/kitchensink/src/weights.rs
+++ b/substrate/frame/examples/kitchensink/src/weights.rs
@@ -1,3 +1,19 @@
+// 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.
 
 //! Autogenerated weights for `pallet_example_kitchensink`
 //!
diff --git a/substrate/frame/examples/offchain-worker/Cargo.toml b/substrate/frame/examples/offchain-worker/Cargo.toml
index ca42a6948a0e47f47de320e9f4444dca762bf086..f33de594a2dcde7878b9fb10155182e6947a08f0 100644
--- a/substrate/frame/examples/offchain-worker/Cargo.toml
+++ b/substrate/frame/examples/offchain-worker/Cargo.toml
@@ -1,11 +1,11 @@
 [package]
 name = "pallet-example-offchain-worker"
 version = "4.0.0-dev"
-authors = ["Parity Technologies <admin@parity.io>"]
-edition = "2021"
+authors.workspace = true
+edition.workspace = true
 license = "MIT-0"
 homepage = "https://substrate.io"
-repository = "https://github.com/paritytech/substrate/"
+repository.workspace = true
 description = "FRAME example pallet for offchain worker"
 readme = "README.md"
 
diff --git a/substrate/frame/examples/split/Cargo.toml b/substrate/frame/examples/split/Cargo.toml
index e5070cd1a130d914c90ff430ddfcfc3be785ad09..e8714009c5e80fb1d9016775494a43aac5df1bc2 100644
--- a/substrate/frame/examples/split/Cargo.toml
+++ b/substrate/frame/examples/split/Cargo.toml
@@ -1,11 +1,11 @@
 [package]
 name = "pallet-example-split"
 version = "4.0.0-dev"
-authors = ["Parity Technologies <admin@parity.io>"]
-edition = "2021"
+authors.workspace = true
+edition.workspace = true
 license = "MIT-0"
 homepage = "https://substrate.io"
-repository = "https://github.com/paritytech/substrate/"
+repository.workspace = true
 description = "FRAME example splitted pallet"
 readme = "README.md"
 
diff --git a/substrate/frame/examples/split/README.md b/substrate/frame/examples/split/README.md
index 413ce9b913cb9850acb0a910297a1aa46202427c..9c4d5443ca06d04815a4392e797cdc32398c504a 100644
--- a/substrate/frame/examples/split/README.md
+++ b/substrate/frame/examples/split/README.md
@@ -3,7 +3,7 @@
 A simple example of a FRAME pallet demonstrating the ability to split sections across multiple
 files.
 
-Note that this is purely experimental at this point. 
+Note that this is purely experimental at this point.
 
 Run `cargo doc --package pallet-example-split --open` to view this pallet's documentation.
 
diff --git a/substrate/frame/examples/split/src/mock.rs b/substrate/frame/examples/split/src/mock.rs
index bee3633ef68f2c02856b70429370c34301577e32..caab4f1ae902f9be5bee10d324af96304db3a63f 100644
--- a/substrate/frame/examples/split/src/mock.rs
+++ b/substrate/frame/examples/split/src/mock.rs
@@ -17,7 +17,6 @@
 
 use crate as pallet_template;
 use frame_support::{derive_impl, sp_runtime::BuildStorage};
-use sp_core::ConstU64;
 
 type Block = frame_system::mocking::MockBlock<Test>;
 
@@ -35,13 +34,6 @@ frame_support::construct_runtime!(
 #[derive_impl(frame_system::config_preludes::TestDefaultConfig as frame_system::DefaultConfig)]
 impl frame_system::Config for Test {
 	type Block = Block;
-	type BlockHashCount = ConstU64<10>;
-	type BaseCallFilter = frame_support::traits::Everything;
-	type RuntimeOrigin = RuntimeOrigin;
-	type RuntimeCall = RuntimeCall;
-	type RuntimeEvent = RuntimeEvent;
-	type PalletInfo = PalletInfo;
-	type OnSetCode = ();
 }
 
 impl pallet_template::Config for Test {
diff --git a/substrate/frame/examples/split/src/weights.rs b/substrate/frame/examples/split/src/weights.rs
index 4219ce1e2697c1a20d396ee24085e1efa87e3ec8..58b9e2af43a1c6a1c9447e5962f53f2af331597d 100644
--- a/substrate/frame/examples/split/src/weights.rs
+++ b/substrate/frame/examples/split/src/weights.rs
@@ -1,3 +1,19 @@
+// 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.
 
 //! Autogenerated weights for pallet_template
 //!
diff --git a/substrate/frame/examples/src/lib.rs b/substrate/frame/examples/src/lib.rs
index d1cd32bb50f263429567b4872ca5049f08586ac3..a7084fc6ef9bcb465952ec1203323b3d6db99322 100644
--- a/substrate/frame/examples/src/lib.rs
+++ b/substrate/frame/examples/src/lib.rs
@@ -17,24 +17,27 @@
 
 //! # FRAME Pallet Examples
 //!
-//! This crate contains examples of FRAME pallets. It is not intended to be used in production.
+//! This crate contains a collection of simple examples of FRAME pallets, demonstrating useful
+//! features in action. It is not intended to be used in production.
 //!
 //! ## Pallets
 //!
-//! - [**`pallet_example_basic`**](./basic): A simple example of a FRAME pallet demonstrating
-//! concepts, APIs and structures common to most FRAME runtimes.
+//! - [`pallet_example_basic`]: This pallet demonstrates concepts, APIs and structures common to
+//!   most FRAME runtimes.
 //!
-//! - [**`pallet_example_offchain_worker`**](./offchain-worker): A simple example of a FRAME pallet
-//!   demonstrating concepts, APIs and structures common to most offchain workers.
+//! - [`pallet_example_offchain_worker`]: This pallet demonstrates concepts, APIs and structures
+//!   common to most offchain workers.
 //!
-//! - [**`pallet-default-config-example`**](./default-config): A simple example of a FRAME pallet
-//!   demonstrating the simpler way to implement `Config` trait of pallets.
+//! - [`pallet_default_config_example`]: This pallet demonstrates different ways to implement the
+//!   `Config` trait of pallets.
 //!
-//! - [**`pallet-dev-mode`**](./dev-mode): A simple example of a FRAME pallet demonstrating the ease
-//!   of requirements for a pallet in dev mode.
+//! - [`pallet_dev_mode`]: This pallet demonstrates the ease of requirements for a pallet in "dev
+//!   mode".
 //!
-//! - [**`pallet-example-kitchensink`**](./kitchensink): A simple example of a FRAME pallet
-//!   demonstrating a catalog of the the FRAME macros and their various syntax options.
+//! - [`pallet_example_kitchensink`]: This pallet demonstrates a catalog of all FRAME macros in use
+//!   and their various syntax options.
 //!
-//! - [**`pallet-example-split`**](./split): A simple example of a FRAME pallet demonstrating the
-//!   ability to split sections across multiple files.
+//! - [`pallet_example_split`]: A simple example of a FRAME pallet demonstrating the ability to
+//!   split sections across multiple files.
+//!
+//! **Tip**: Use `cargo doc --package <pallet-name> --open` to view each pallet's documentation.
diff --git a/substrate/frame/executive/Cargo.toml b/substrate/frame/executive/Cargo.toml
index 4cc6102263d6fc591fb9b513fbd5d82bcc6320d8..b396100912344153aceb7aebdc6596cd5731ba9a 100644
--- a/substrate/frame/executive/Cargo.toml
+++ b/substrate/frame/executive/Cargo.toml
@@ -1,11 +1,11 @@
 [package]
 name = "frame-executive"
 version = "4.0.0-dev"
-authors = ["Parity Technologies <admin@parity.io>"]
-edition = "2021"
+authors.workspace = true
+edition.workspace = true
 license = "Apache-2.0"
 homepage = "https://substrate.io"
-repository = "https://github.com/paritytech/substrate/"
+repository.workspace = true
 description = "FRAME executives engine"
 readme = "README.md"
 
diff --git a/substrate/frame/executive/README.md b/substrate/frame/executive/README.md
index c14c3912b082d940aad7e0ee848c718915242a5e..96a412a4537a3657563550558f1828d209b4b92b 100644
--- a/substrate/frame/executive/README.md
+++ b/substrate/frame/executive/README.md
@@ -1,13 +1,13 @@
 # Executive Module
 
-The Executive module acts as the orchestration layer for the runtime. It dispatches incoming
-extrinsic calls to the respective modules in the runtime.
+The Executive module acts as the orchestration layer for the runtime. It dispatches incoming extrinsic calls to the
+respective modules in the runtime.
 
 ## Overview
 
-The executive module is not a typical pallet providing functionality around a specific feature.
-It is a cross-cutting framework component for the FRAME. It works in conjunction with the
-[FRAME System module](https://docs.rs/frame-system/latest/frame_system/) to perform these cross-cutting functions.
+The executive module is not a typical pallet providing functionality around a specific feature. It is a cross-cutting
+framework component for the FRAME. It works in conjunction with the [FRAME System
+module](https://docs.rs/frame-system/latest/frame_system/) to perform these cross-cutting functions.
 
 The Executive module provides functions to:
 
@@ -26,7 +26,8 @@ The Executive module provides the following implementations:
 
 ## Usage
 
-The default Substrate node template declares the [`Executive`](https://docs.rs/frame-executive/latest/frame_executive/struct.Executive.html) type in its library.
+The default Substrate node template declares the
+[`Executive`](https://docs.rs/frame-executive/latest/frame_executive/struct.Executive.html) type in its library.
 
 ### Example
 
@@ -46,9 +47,8 @@ pub type Executive = executive::Executive<
 
 ### Custom `OnRuntimeUpgrade` logic
 
-You can add custom logic that should be called in your runtime on a runtime upgrade. This is
-done by setting an optional generic parameter. The custom logic will be called before
-the on runtime upgrade logic of all modules is called.
+You can add custom logic that should be called in your runtime on a runtime upgrade. This is done by setting an optional
+generic parameter. The custom logic will be called before the on runtime upgrade logic of all modules is called.
 
 ```rust
 #
diff --git a/substrate/frame/fast-unstake/Cargo.toml b/substrate/frame/fast-unstake/Cargo.toml
index efdcf72ba059f711d65f1b1e179fd086944ad57a..85548c6600db827f316549b91c4a120be406745d 100644
--- a/substrate/frame/fast-unstake/Cargo.toml
+++ b/substrate/frame/fast-unstake/Cargo.toml
@@ -1,11 +1,11 @@
 [package]
 name = "pallet-fast-unstake"
 version = "4.0.0-dev"
-authors = ["Parity Technologies <admin@parity.io>"]
-edition = "2021"
+authors.workspace = true
+edition.workspace = true
 license = "Apache-2.0"
 homepage = "https://substrate.io"
-repository = "https://github.com/paritytech/substrate/"
+repository.workspace = true
 description = "FRAME fast unstake pallet"
 
 [package.metadata.docs.rs]
@@ -27,7 +27,7 @@ frame-election-provider-support = { path = "../election-provider-support", defau
 
 frame-benchmarking = { path = "../benchmarking", default-features = false, optional = true}
 
-docify = "0.2.1"
+docify = "0.2.4"
 
 [dev-dependencies]
 pallet-staking-reward-curve = { path = "../staking/reward-curve" }
diff --git a/substrate/frame/fast-unstake/src/lib.rs b/substrate/frame/fast-unstake/src/lib.rs
index 39783271e6569381de242a92b6a7213e7c2d6227..2b99ad79a7dfdd16d0aae764c289d36f569011ab 100644
--- a/substrate/frame/fast-unstake/src/lib.rs
+++ b/substrate/frame/fast-unstake/src/lib.rs
@@ -17,7 +17,7 @@
 
 //! > Made with *Substrate*, for *Polkadot*.
 //!
-//! [![github]](https://github.com/paritytech/substrate/frame/fast-unstake) -
+//! [![github]](https://github.com/paritytech/polkadot-sdk/tree/master/substrate/frame/fast-unstake) -
 //! [![polkadot]](https://polkadot.network)
 //!
 //! [polkadot]: https://img.shields.io/badge/polkadot-E6007A?style=for-the-badge&logo=polkadot&logoColor=white
diff --git a/substrate/frame/fast-unstake/src/mock.rs b/substrate/frame/fast-unstake/src/mock.rs
index dc24a823c0db022ad0f625be9d6a51a3505f07b0..cf274c784f9f99b87150c1bde0845f2d867cd3a2 100644
--- a/substrate/frame/fast-unstake/src/mock.rs
+++ b/substrate/frame/fast-unstake/src/mock.rs
@@ -17,7 +17,7 @@
 
 use crate::{self as fast_unstake};
 use frame_support::{
-	assert_ok,
+	assert_ok, derive_impl,
 	pallet_prelude::*,
 	parameter_types,
 	traits::{ConstU64, Currency},
@@ -32,7 +32,6 @@ use pallet_staking::{Exposure, IndividualExposure, StakerStatus};
 use sp_std::prelude::*;
 
 pub type AccountId = u128;
-pub type Nonce = u32;
 pub type BlockNumber = u64;
 pub type Balance = u128;
 pub type T = Runtime;
@@ -44,30 +43,13 @@ parameter_types! {
 		);
 }
 
+#[derive_impl(frame_system::config_preludes::TestDefaultConfig as frame_system::DefaultConfig)]
 impl frame_system::Config for Runtime {
-	type BaseCallFilter = frame_support::traits::Everything;
-	type BlockWeights = BlockWeights;
-	type BlockLength = ();
-	type DbWeight = ();
-	type RuntimeOrigin = RuntimeOrigin;
-	type Nonce = Nonce;
-	type RuntimeCall = RuntimeCall;
-	type Hash = sp_core::H256;
-	type Hashing = sp_runtime::traits::BlakeTwo256;
-	type AccountId = AccountId;
-	type Lookup = IdentityLookup<Self::AccountId>;
 	type Block = Block;
-	type RuntimeEvent = RuntimeEvent;
-	type BlockHashCount = ();
-	type Version = ();
-	type PalletInfo = PalletInfo;
 	type AccountData = pallet_balances::AccountData<Balance>;
-	type OnNewAccount = ();
-	type OnKilledAccount = ();
-	type SystemWeightInfo = ();
-	type SS58Prefix = ();
-	type OnSetCode = ();
-	type MaxConsumers = frame_support::traits::ConstU32<16>;
+	// we use U128 account id in order to get a better iteration order out of a map.
+	type AccountId = AccountId;
+	type Lookup = IdentityLookup<Self::AccountId>;
 }
 
 impl pallet_timestamp::Config for Runtime {
diff --git a/substrate/frame/glutton/Cargo.toml b/substrate/frame/glutton/Cargo.toml
index cd609f9a62602fe59f15c2fbf28646455938ae0d..c1dc926ff5ef3efdb971ac5987cfeaf11c7ed779 100644
--- a/substrate/frame/glutton/Cargo.toml
+++ b/substrate/frame/glutton/Cargo.toml
@@ -1,11 +1,11 @@
 [package]
 name = "pallet-glutton"
 version = "4.0.0-dev"
-authors = ["Parity Technologies <admin@parity.io>"]
-edition = "2021"
+authors.workspace = true
+edition.workspace = true
 license = "Apache-2.0"
 homepage = "https://substrate.io"
-repository = "https://github.com/paritytech/substrate/"
+repository.workspace = true
 description = "FRAME pallet for pushing a chain to its weight limits"
 readme = "README.md"
 
diff --git a/substrate/frame/glutton/README.md b/substrate/frame/glutton/README.md
index 8ad4f79171820a48fe0d9d94f6793a931840e6e6..89dbe26ec7a9d7eb0ad379f0526a770b4ba45a28 100644
--- a/substrate/frame/glutton/README.md
+++ b/substrate/frame/glutton/README.md
@@ -4,6 +4,9 @@
 
 # Glutton Pallet
 
-The `Glutton` pallet gets the name from its property to consume vast amounts of resources. It can be used to push para-chains and their relay-chains to the limits. This is good for testing out theoretical limits in a practical way.
+The `Glutton` pallet gets the name from its property to consume vast amounts of resources. It can be used to push
+para-chains and their relay-chains to the limits. This is good for testing out theoretical limits in a practical way.
 
-The `Glutton` can be set to consume a fraction of the available unused weight of a chain. It accomplishes this by utilizing the `on_idle` hook and consuming a specific ration of the remaining weight. The rations can be set via `set_compute` and `set_storage`. Initially the `Glutton` needs to be initialized once with `initialize_pallet`.
+The `Glutton` can be set to consume a fraction of the available unused weight of a chain. It accomplishes this by
+utilizing the `on_idle` hook and consuming a specific ration of the remaining weight. The rations can be set via
+`set_compute` and `set_storage`. Initially the `Glutton` needs to be initialized once with `initialize_pallet`.
diff --git a/substrate/frame/glutton/src/benchmarking.rs b/substrate/frame/glutton/src/benchmarking.rs
index 587207587456a025b52f6819ff658b40007c5af3..fa93c7ccc82901608b7be9808118103064d010ee 100644
--- a/substrate/frame/glutton/src/benchmarking.rs
+++ b/substrate/frame/glutton/src/benchmarking.rs
@@ -1,6 +1,6 @@
 // This file is part of Substrate.
 
-// Copyright (C) 2022 Parity Technologies (UK) Ltd.
+// Copyright (C) Parity Technologies (UK) Ltd.
 // SPDX-License-Identifier: Apache-2.0
 
 // Licensed under the Apache License, Version 2.0 (the "License");
diff --git a/substrate/frame/glutton/src/lib.rs b/substrate/frame/glutton/src/lib.rs
index c76cc30017cf00e639c0061ff73dc6f95062ab07..f5e90a17c735ec9f4c0fcb21b35824eea33d1136 100644
--- a/substrate/frame/glutton/src/lib.rs
+++ b/substrate/frame/glutton/src/lib.rs
@@ -1,6 +1,6 @@
 // This file is part of Substrate.
 
-// Copyright (C) 2022 Parity Technologies (UK) Ltd.
+// Copyright (C) Parity Technologies (UK) Ltd.
 // SPDX-License-Identifier: Apache-2.0
 
 // Licensed under the Apache License, Version 2.0 (the "License");
@@ -188,7 +188,7 @@ pub mod pallet {
 		}
 
 		fn on_idle(_: BlockNumberFor<T>, remaining_weight: Weight) -> Weight {
-			let mut meter = WeightMeter::from_limit(remaining_weight);
+			let mut meter = WeightMeter::with_limit(remaining_weight);
 			if meter.try_consume(T::WeightInfo::empty_on_idle()).is_err() {
 				return T::WeightInfo::empty_on_idle()
 			}
@@ -197,7 +197,7 @@ pub mod pallet {
 				Storage::<T>::get().saturating_mul_int(meter.remaining().proof_size());
 			let computation_weight_limit =
 				Compute::<T>::get().saturating_mul_int(meter.remaining().ref_time());
-			let mut meter = WeightMeter::from_limit(Weight::from_parts(
+			let mut meter = WeightMeter::with_limit(Weight::from_parts(
 				computation_weight_limit,
 				proof_size_limit,
 			));
diff --git a/substrate/frame/glutton/src/mock.rs b/substrate/frame/glutton/src/mock.rs
index c79ddd53718eb5acabe6a63105a93ac725b87a35..4bc40b5478870e7640a507e5292d308d5def10c0 100644
--- a/substrate/frame/glutton/src/mock.rs
+++ b/substrate/frame/glutton/src/mock.rs
@@ -1,6 +1,6 @@
 // This file is part of Substrate.
 
-// Copyright (C) 2022 Parity Technologies (UK) Ltd.
+// Copyright (C) Parity Technologies (UK) Ltd.
 // SPDX-License-Identifier: Apache-2.0
 
 // Licensed under the Apache License, Version 2.0 (the "License");
diff --git a/substrate/frame/glutton/src/tests.rs b/substrate/frame/glutton/src/tests.rs
index 1897ff63a70fb31a88c4effd192eb6db98404dca..b72d5272772540e5106af8cec248170cfcf910d6 100644
--- a/substrate/frame/glutton/src/tests.rs
+++ b/substrate/frame/glutton/src/tests.rs
@@ -1,6 +1,6 @@
 // This file is part of Substrate.
 
-// Copyright (C) 2023 Parity Technologies (UK) Ltd.
+// Copyright (C) Parity Technologies (UK) Ltd.
 // SPDX-License-Identifier: Apache-2.0
 
 // Licensed under the Apache License, Version 2.0 (the "License");
@@ -252,7 +252,7 @@ fn on_idle_weight_over_unity_is_close_enough_works() {
 fn waste_at_most_ref_time_weight_close_enough() {
 	new_test_ext().execute_with(|| {
 		let mut meter =
-			WeightMeter::from_limit(Weight::from_parts(WEIGHT_REF_TIME_PER_SECOND, u64::MAX));
+			WeightMeter::with_limit(Weight::from_parts(WEIGHT_REF_TIME_PER_SECOND, u64::MAX));
 		// Over-spending fails defensively.
 		Glutton::waste_at_most_ref_time(&mut meter);
 
@@ -269,7 +269,7 @@ fn waste_at_most_ref_time_weight_close_enough() {
 fn waste_at_most_proof_size_weight_close_enough() {
 	new_test_ext().execute_with(|| {
 		let mut meter =
-			WeightMeter::from_limit(Weight::from_parts(u64::MAX, WEIGHT_PROOF_SIZE_PER_MB * 5));
+			WeightMeter::with_limit(Weight::from_parts(u64::MAX, WEIGHT_PROOF_SIZE_PER_MB * 5));
 		// Over-spending fails defensively.
 		Glutton::waste_at_most_proof_size(&mut meter);
 
diff --git a/substrate/frame/grandpa/Cargo.toml b/substrate/frame/grandpa/Cargo.toml
index 5fcb4f9817644d5a3bf4df30e5aa11375422977f..116e786a6c8918ffefce7606f304b1af5550f141 100644
--- a/substrate/frame/grandpa/Cargo.toml
+++ b/substrate/frame/grandpa/Cargo.toml
@@ -1,11 +1,11 @@
 [package]
 name = "pallet-grandpa"
 version = "4.0.0-dev"
-authors = ["Parity Technologies <admin@parity.io>"]
-edition = "2021"
+authors.workspace = true
+edition.workspace = true
 license = "Apache-2.0"
 homepage = "https://substrate.io"
-repository = "https://github.com/paritytech/substrate/"
+repository.workspace = true
 description = "FRAME pallet for GRANDPA finality gadget"
 readme = "README.md"
 
diff --git a/substrate/frame/grandpa/README.md b/substrate/frame/grandpa/README.md
index 84b181a8b31e1c102215f72d6a2d59724a9af596..5978931c5a85f554b0a1e036f840a71beaa7302a 100644
--- a/substrate/frame/grandpa/README.md
+++ b/substrate/frame/grandpa/README.md
@@ -9,4 +9,4 @@ finality notifications.
 For full integration with GRANDPA, the `GrandpaApi` should be implemented.
 The necessary items are re-exported via the `fg_primitives` crate.
 
-License: Apache-2.0
\ No newline at end of file
+License: Apache-2.0
diff --git a/substrate/frame/grandpa/src/lib.rs b/substrate/frame/grandpa/src/lib.rs
index 2a0e707ac4148c81777a99014fb907a23ee0ca67..95d1c8aa609495f567e23a0650365c924bad040b 100644
--- a/substrate/frame/grandpa/src/lib.rs
+++ b/substrate/frame/grandpa/src/lib.rs
@@ -129,18 +129,16 @@ pub mod pallet {
 			if let Some(pending_change) = <PendingChange<T>>::get() {
 				// emit signal if we're at the block that scheduled the change
 				if block_number == pending_change.scheduled_at {
+					let next_authorities = pending_change.next_authorities.to_vec();
 					if let Some(median) = pending_change.forced {
 						Self::deposit_log(ConsensusLog::ForcedChange(
 							median,
-							ScheduledChange {
-								delay: pending_change.delay,
-								next_authorities: pending_change.next_authorities.to_vec(),
-							},
+							ScheduledChange { delay: pending_change.delay, next_authorities },
 						))
 					} else {
 						Self::deposit_log(ConsensusLog::ScheduledChange(ScheduledChange {
 							delay: pending_change.delay,
-							next_authorities: pending_change.next_authorities.to_vec(),
+							next_authorities,
 						}));
 					}
 				}
@@ -149,7 +147,7 @@ pub mod pallet {
 				if block_number == pending_change.scheduled_at + pending_change.delay {
 					Self::set_grandpa_authorities(&pending_change.next_authorities);
 					Self::deposit_event(Event::NewAuthorities {
-						authority_set: pending_change.next_authorities.to_vec(),
+						authority_set: pending_change.next_authorities.into_inner(),
 					});
 					<PendingChange<T>>::kill();
 				}
diff --git a/substrate/frame/identity/Cargo.toml b/substrate/frame/identity/Cargo.toml
index 6063b89df0f1f54889985bdc66106ead65b48232..533e8e68374ee7d2396ec5ddb7cbab39b1f7de0f 100644
--- a/substrate/frame/identity/Cargo.toml
+++ b/substrate/frame/identity/Cargo.toml
@@ -1,11 +1,11 @@
 [package]
 name = "pallet-identity"
 version = "4.0.0-dev"
-authors = ["Parity Technologies <admin@parity.io>"]
-edition = "2021"
+authors.workspace = true
+edition.workspace = true
 license = "Apache-2.0"
 homepage = "https://substrate.io"
-repository = "https://github.com/paritytech/substrate/"
+repository.workspace = true
 description = "FRAME identity management pallet"
 readme = "README.md"
 
diff --git a/substrate/frame/identity/README.md b/substrate/frame/identity/README.md
index a67c259e2537af20118e194dbb31b66bfdbb1353..0203656eff46b6eb49726704a535e68dccad60f2 100644
--- a/substrate/frame/identity/README.md
+++ b/substrate/frame/identity/README.md
@@ -28,27 +28,27 @@ no state-bloat attack is viable.
 ### Dispatchable Functions
 
 #### For general users
-* `set_identity` - Set the associated identity of an account; a small deposit is reserved if not
+- `set_identity` - Set the associated identity of an account; a small deposit is reserved if not
   already taken.
-* `clear_identity` - Remove an account's associated identity; the deposit is returned.
-* `request_judgement` - Request a judgement from a registrar, paying a fee.
-* `cancel_request` - Cancel the previous request for a judgement.
+- `clear_identity` - Remove an account's associated identity; the deposit is returned.
+- `request_judgement` - Request a judgement from a registrar, paying a fee.
+- `cancel_request` - Cancel the previous request for a judgement.
 
 #### For general users with sub-identities
-* `set_subs` - Set the sub-accounts of an identity.
-* `add_sub` - Add a sub-identity to an identity.
-* `remove_sub` - Remove a sub-identity of an identity.
-* `rename_sub` - Rename a sub-identity of an identity.
-* `quit_sub` - Remove a sub-identity of an identity (called by the sub-identity).
+- `set_subs` - Set the sub-accounts of an identity.
+- `add_sub` - Add a sub-identity to an identity.
+- `remove_sub` - Remove a sub-identity of an identity.
+- `rename_sub` - Rename a sub-identity of an identity.
+- `quit_sub` - Remove a sub-identity of an identity (called by the sub-identity).
 
 #### For registrars
-* `set_fee` - Set the fee required to be paid for a judgement to be given by the registrar.
-* `set_fields` - Set the fields that a registrar cares about in their judgements.
-* `provide_judgement` - Provide a judgement to an identity.
+- `set_fee` - Set the fee required to be paid for a judgement to be given by the registrar.
+- `set_fields` - Set the fields that a registrar cares about in their judgements.
+- `provide_judgement` - Provide a judgement to an identity.
 
 #### For super-users
-* `add_registrar` - Add a new registrar to the system.
-* `kill_identity` - Forcibly remove the associated identity; the deposit is lost.
+- `add_registrar` - Add a new registrar to the system.
+- `kill_identity` - Forcibly remove the associated identity; the deposit is lost.
 
 [`Call`]: ./enum.Call.html
 [`Config`]: ./trait.Config.html
diff --git a/substrate/frame/identity/src/benchmarking.rs b/substrate/frame/identity/src/benchmarking.rs
index 4b51d23f6b34f99463e29bb8054628ff62bd2945..059de204bbf772fb28bd586a841bedee9c366bfb 100644
--- a/substrate/frame/identity/src/benchmarking.rs
+++ b/substrate/frame/identity/src/benchmarking.rs
@@ -22,7 +22,9 @@
 use super::*;
 
 use crate::Pallet as Identity;
-use frame_benchmarking::v1::{account, benchmarks, whitelisted_caller, BenchmarkError};
+use frame_benchmarking::{
+	account, impl_benchmark_test_suite, v2::*, whitelisted_caller, BenchmarkError,
+};
 use frame_support::{
 	ensure,
 	traits::{EnsureOrigin, Get},
@@ -118,110 +120,128 @@ fn create_identity_info<T: Config>(num_fields: u32) -> IdentityInfo<T::MaxAdditi
 	}
 }
 
-benchmarks! {
-	add_registrar {
-		let r in 1 .. T::MaxRegistrars::get() - 1 => add_registrars::<T>(r)?;
+#[benchmarks]
+mod benchmarks {
+	use super::*;
+
+	#[benchmark]
+	fn add_registrar(r: Linear<1, { T::MaxRegistrars::get() - 1 }>) -> Result<(), BenchmarkError> {
+		add_registrars::<T>(r)?;
 		ensure!(Registrars::<T>::get().len() as u32 == r, "Registrars not set up correctly.");
 		let origin =
 			T::RegistrarOrigin::try_successful_origin().map_err(|_| BenchmarkError::Weightless)?;
 		let account = T::Lookup::unlookup(account("registrar", r + 1, SEED));
-	}: _<T::RuntimeOrigin>(origin, account)
-	verify {
+
+		#[extrinsic_call]
+		_(origin as T::RuntimeOrigin, account);
+
 		ensure!(Registrars::<T>::get().len() as u32 == r + 1, "Registrars not added.");
+		Ok(())
 	}
 
-	set_identity {
-		let r in 1 .. T::MaxRegistrars::get() => add_registrars::<T>(r)?;
-		let x in 0 .. T::MaxAdditionalFields::get();
-		let caller = {
-			// The target user
-			let caller: T::AccountId = whitelisted_caller();
-			let caller_lookup = T::Lookup::unlookup(caller.clone());
-			let caller_origin: <T as frame_system::Config>::RuntimeOrigin = RawOrigin::Signed(caller.clone()).into();
-			let _ = T::Currency::make_free_balance_be(&caller, BalanceOf::<T>::max_value());
-
-			// Add an initial identity
-			let initial_info = create_identity_info::<T>(1);
-			Identity::<T>::set_identity(caller_origin.clone(), Box::new(initial_info.clone()))?;
-
-			// User requests judgement from all the registrars, and they approve
-			for i in 0..r {
-				let registrar: T::AccountId = account("registrar", i, SEED);
-				let registrar_lookup = T::Lookup::unlookup(registrar.clone());
-				let balance_to_use =  T::Currency::minimum_balance() * 10u32.into();
-				let _ = T::Currency::make_free_balance_be(&registrar, balance_to_use);
-
-				Identity::<T>::request_judgement(caller_origin.clone(), i, 10u32.into())?;
-				Identity::<T>::provide_judgement(
-					RawOrigin::Signed(registrar).into(),
-					i,
-					caller_lookup.clone(),
-					Judgement::Reasonable,
-					T::Hashing::hash_of(&initial_info),
-				)?;
-			}
-			caller
-		};
-	}: _(RawOrigin::Signed(caller.clone()), Box::new(create_identity_info::<T>(x)))
-	verify {
+	#[benchmark]
+	fn set_identity(
+		r: Linear<1, { T::MaxRegistrars::get() }>,
+		x: Linear<0, { T::MaxAdditionalFields::get() }>,
+	) -> Result<(), BenchmarkError> {
+		add_registrars::<T>(r)?;
+
+		let caller: T::AccountId = whitelisted_caller();
+		let caller_lookup = T::Lookup::unlookup(caller.clone());
+		let caller_origin: <T as frame_system::Config>::RuntimeOrigin =
+			RawOrigin::Signed(caller.clone()).into();
+		let _ = T::Currency::make_free_balance_be(&caller, BalanceOf::<T>::max_value());
+
+		// Add an initial identity
+		let initial_info = create_identity_info::<T>(1);
+		Identity::<T>::set_identity(caller_origin.clone(), Box::new(initial_info.clone()))?;
+
+		// User requests judgement from all the registrars, and they approve
+		for i in 0..r {
+			let registrar: T::AccountId = account("registrar", i, SEED);
+			let _ = T::Lookup::unlookup(registrar.clone());
+			let balance_to_use = T::Currency::minimum_balance() * 10u32.into();
+			let _ = T::Currency::make_free_balance_be(&registrar, balance_to_use);
+
+			Identity::<T>::request_judgement(caller_origin.clone(), i, 10u32.into())?;
+			Identity::<T>::provide_judgement(
+				RawOrigin::Signed(registrar).into(),
+				i,
+				caller_lookup.clone(),
+				Judgement::Reasonable,
+				T::Hashing::hash_of(&initial_info),
+			)?;
+		}
+
+		#[extrinsic_call]
+		_(RawOrigin::Signed(caller.clone()), Box::new(create_identity_info::<T>(x)));
+
 		assert_last_event::<T>(Event::<T>::IdentitySet { who: caller }.into());
+		Ok(())
 	}
 
 	// We need to split `set_subs` into two benchmarks to accurately isolate the potential
 	// writes caused by new or old sub accounts. The actual weight should simply be
 	// the sum of these two weights.
-	set_subs_new {
+	#[benchmark]
+	fn set_subs_new(s: Linear<0, { T::MaxSubAccounts::get() }>) -> Result<(), BenchmarkError> {
 		let caller: T::AccountId = whitelisted_caller();
-		// Create a new subs vec with s sub accounts
-		let s in 0 .. T::MaxSubAccounts::get() => ();
+
+		// Create a new subs vec with sub accounts
 		let subs = create_sub_accounts::<T>(&caller, s)?;
 		ensure!(SubsOf::<T>::get(&caller).1.len() == 0, "Caller already has subs");
-	}: set_subs(RawOrigin::Signed(caller.clone()), subs)
-	verify {
+
+		#[extrinsic_call]
+		set_subs(RawOrigin::Signed(caller.clone()), subs);
+
 		ensure!(SubsOf::<T>::get(&caller).1.len() as u32 == s, "Subs not added");
+		Ok(())
 	}
 
-	set_subs_old {
+	#[benchmark]
+	fn set_subs_old(p: Linear<0, { T::MaxSubAccounts::get() }>) -> Result<(), BenchmarkError> {
 		let caller: T::AccountId = whitelisted_caller();
+
 		// Give them p many previous sub accounts.
-		let p in 0 .. T::MaxSubAccounts::get() => {
-			let _ = add_sub_accounts::<T>(&caller, p)?;
-		};
+		let _ = add_sub_accounts::<T>(&caller, p)?;
+
 		// Remove all subs.
 		let subs = create_sub_accounts::<T>(&caller, 0)?;
-		ensure!(
-			SubsOf::<T>::get(&caller).1.len() as u32 == p,
-			"Caller does have subs",
-		);
-	}: set_subs(RawOrigin::Signed(caller.clone()), subs)
-	verify {
+		ensure!(SubsOf::<T>::get(&caller).1.len() as u32 == p, "Caller does have subs",);
+
+		#[extrinsic_call]
+		set_subs(RawOrigin::Signed(caller.clone()), subs);
+
 		ensure!(SubsOf::<T>::get(&caller).1.len() == 0, "Subs not removed");
+		Ok(())
 	}
 
-	clear_identity {
+	#[benchmark]
+	fn clear_identity(
+		r: Linear<1, { T::MaxRegistrars::get() }>,
+		s: Linear<0, { T::MaxSubAccounts::get() }>,
+		x: Linear<0, { T::MaxAdditionalFields::get() }>,
+	) -> Result<(), BenchmarkError> {
 		let caller: T::AccountId = whitelisted_caller();
-		let caller_origin = <T as frame_system::Config>::RuntimeOrigin::from(RawOrigin::Signed(caller.clone()));
+		let caller_origin =
+			<T as frame_system::Config>::RuntimeOrigin::from(RawOrigin::Signed(caller.clone()));
 		let caller_lookup = <T::Lookup as StaticLookup>::unlookup(caller.clone());
 		let _ = T::Currency::make_free_balance_be(&caller, BalanceOf::<T>::max_value());
 
-		let r in 1 .. T::MaxRegistrars::get() => add_registrars::<T>(r)?;
-		let s in 0 .. T::MaxSubAccounts::get() => {
-			// Give them s many sub accounts
-			let caller: T::AccountId = whitelisted_caller();
-			let _ = add_sub_accounts::<T>(&caller, s)?;
-		};
-		let x in 0 .. T::MaxAdditionalFields::get();
+		// Register the registrars
+		add_registrars::<T>(r)?;
+
+		// Add sub accounts
+		let _ = add_sub_accounts::<T>(&caller, s)?;
 
 		// Create their main identity with x additional fields
 		let info = create_identity_info::<T>(x);
-		let caller: T::AccountId = whitelisted_caller();
-		let caller_origin = <T as frame_system::Config>::RuntimeOrigin::from(RawOrigin::Signed(caller.clone()));
 		Identity::<T>::set_identity(caller_origin.clone(), Box::new(info.clone()))?;
 
 		// User requests judgement from all the registrars, and they approve
 		for i in 0..r {
 			let registrar: T::AccountId = account("registrar", i, SEED);
-			let balance_to_use =  T::Currency::minimum_balance() * 10u32.into();
+			let balance_to_use = T::Currency::minimum_balance() * 10u32.into();
 			let _ = T::Currency::make_free_balance_be(&registrar, balance_to_use);
 
 			Identity::<T>::request_judgement(caller_origin.clone(), i, 10u32.into())?;
@@ -233,111 +253,175 @@ benchmarks! {
 				T::Hashing::hash_of(&info),
 			)?;
 		}
+
 		ensure!(IdentityOf::<T>::contains_key(&caller), "Identity does not exist.");
-	}: _(RawOrigin::Signed(caller.clone()))
-	verify {
+
+		#[extrinsic_call]
+		_(RawOrigin::Signed(caller.clone()));
+
 		ensure!(!IdentityOf::<T>::contains_key(&caller), "Identity not cleared.");
+		Ok(())
 	}
 
-	request_judgement {
+	#[benchmark]
+	fn request_judgement(
+		r: Linear<1, { T::MaxRegistrars::get() }>,
+		x: Linear<0, { T::MaxAdditionalFields::get() }>,
+	) -> Result<(), BenchmarkError> {
 		let caller: T::AccountId = whitelisted_caller();
 		let _ = T::Currency::make_free_balance_be(&caller, BalanceOf::<T>::max_value());
 
-		let r in 1 .. T::MaxRegistrars::get() => add_registrars::<T>(r)?;
-		let x in 0 .. T::MaxAdditionalFields::get() => {
-			// Create their main identity with x additional fields
-			let info = create_identity_info::<T>(x);
-			let caller: T::AccountId = whitelisted_caller();
-			let caller_origin = <T as frame_system::Config>::RuntimeOrigin::from(RawOrigin::Signed(caller));
-			Identity::<T>::set_identity(caller_origin, Box::new(info))?;
-		};
-	}: _(RawOrigin::Signed(caller.clone()), r - 1, 10u32.into())
-	verify {
-		assert_last_event::<T>(Event::<T>::JudgementRequested { who: caller, registrar_index: r-1 }.into());
+		// Register the registrars
+		add_registrars::<T>(r)?;
+
+		// Create their main identity with x additional fields
+		let info = create_identity_info::<T>(x);
+		let caller_origin =
+			<T as frame_system::Config>::RuntimeOrigin::from(RawOrigin::Signed(caller.clone()));
+		Identity::<T>::set_identity(caller_origin.clone(), Box::new(info))?;
+
+		#[extrinsic_call]
+		_(RawOrigin::Signed(caller.clone()), r - 1, 10u32.into());
+
+		assert_last_event::<T>(
+			Event::<T>::JudgementRequested { who: caller, registrar_index: r - 1 }.into(),
+		);
+
+		Ok(())
 	}
 
-	cancel_request {
+	#[benchmark]
+	fn cancel_request(
+		r: Linear<1, { T::MaxRegistrars::get() }>,
+		x: Linear<0, { T::MaxAdditionalFields::get() }>,
+	) -> Result<(), BenchmarkError> {
 		let caller: T::AccountId = whitelisted_caller();
-		let caller_origin = <T as frame_system::Config>::RuntimeOrigin::from(RawOrigin::Signed(caller.clone()));
 		let _ = T::Currency::make_free_balance_be(&caller, BalanceOf::<T>::max_value());
 
-		let r in 1 .. T::MaxRegistrars::get() => add_registrars::<T>(r)?;
-		let x in 0 .. T::MaxAdditionalFields::get() => {
-			// Create their main identity with x additional fields
-			let info = create_identity_info::<T>(x);
-			let caller: T::AccountId = whitelisted_caller();
-			let caller_origin = <T as frame_system::Config>::RuntimeOrigin::from(RawOrigin::Signed(caller));
-			Identity::<T>::set_identity(caller_origin, Box::new(info))?;
-		};
-
-		Identity::<T>::request_judgement(caller_origin, r - 1, 10u32.into())?;
-	}: _(RawOrigin::Signed(caller.clone()), r - 1)
-	verify {
-		assert_last_event::<T>(Event::<T>::JudgementUnrequested { who: caller, registrar_index: r-1 }.into());
+		// Register the registrars
+		add_registrars::<T>(r)?;
+
+		// Create their main identity with x additional fields
+		let info = create_identity_info::<T>(x);
+		let caller_origin =
+			<T as frame_system::Config>::RuntimeOrigin::from(RawOrigin::Signed(caller.clone()));
+		Identity::<T>::set_identity(caller_origin.clone(), Box::new(info))?;
+
+		Identity::<T>::request_judgement(caller_origin.clone(), r - 1, 10u32.into())?;
+
+		#[extrinsic_call]
+		_(RawOrigin::Signed(caller.clone()), r - 1);
+
+		assert_last_event::<T>(
+			Event::<T>::JudgementUnrequested { who: caller, registrar_index: r - 1 }.into(),
+		);
+
+		Ok(())
 	}
 
-	set_fee {
+	#[benchmark]
+	fn set_fee(r: Linear<1, { T::MaxRegistrars::get() - 1 }>) -> Result<(), BenchmarkError> {
 		let caller: T::AccountId = whitelisted_caller();
 		let caller_lookup = T::Lookup::unlookup(caller.clone());
 
-		let r in 1 .. T::MaxRegistrars::get() - 1 => add_registrars::<T>(r)?;
+		add_registrars::<T>(r)?;
 
 		let registrar_origin = T::RegistrarOrigin::try_successful_origin()
 			.expect("RegistrarOrigin has no successful origin required for the benchmark");
 		Identity::<T>::add_registrar(registrar_origin, caller_lookup)?;
+
 		let registrars = Registrars::<T>::get();
 		ensure!(registrars[r as usize].as_ref().unwrap().fee == 0u32.into(), "Fee already set.");
-	}: _(RawOrigin::Signed(caller), r, 100u32.into())
-	verify {
-		let registrars = Registrars::<T>::get();
-		ensure!(registrars[r as usize].as_ref().unwrap().fee == 100u32.into(), "Fee not changed.");
+
+		#[extrinsic_call]
+		_(RawOrigin::Signed(caller), r, 100u32.into());
+
+		let updated_registrars = Registrars::<T>::get();
+		ensure!(
+			updated_registrars[r as usize].as_ref().unwrap().fee == 100u32.into(),
+			"Fee not changed."
+		);
+
+		Ok(())
 	}
 
-	set_account_id {
+	#[benchmark]
+	fn set_account_id(r: Linear<1, { T::MaxRegistrars::get() - 1 }>) -> Result<(), BenchmarkError> {
 		let caller: T::AccountId = whitelisted_caller();
 		let caller_lookup = T::Lookup::unlookup(caller.clone());
 		let _ = T::Currency::make_free_balance_be(&caller, BalanceOf::<T>::max_value());
 
-		let r in 1 .. T::MaxRegistrars::get() - 1 => add_registrars::<T>(r)?;
+		add_registrars::<T>(r)?;
 
 		let registrar_origin = T::RegistrarOrigin::try_successful_origin()
 			.expect("RegistrarOrigin has no successful origin required for the benchmark");
 		Identity::<T>::add_registrar(registrar_origin, caller_lookup)?;
+
 		let registrars = Registrars::<T>::get();
 		ensure!(registrars[r as usize].as_ref().unwrap().account == caller, "id not set.");
+
 		let new_account = T::Lookup::unlookup(account("new", 0, SEED));
-	}: _(RawOrigin::Signed(caller), r, new_account)
-	verify {
-		let registrars = Registrars::<T>::get();
-		ensure!(registrars[r as usize].as_ref().unwrap().account == account("new", 0, SEED), "id not changed.");
+
+		#[extrinsic_call]
+		_(RawOrigin::Signed(caller), r, new_account);
+
+		let updated_registrars = Registrars::<T>::get();
+		ensure!(
+			updated_registrars[r as usize].as_ref().unwrap().account == account("new", 0, SEED),
+			"id not changed."
+		);
+
+		Ok(())
 	}
 
-	set_fields {
+	#[benchmark]
+	fn set_fields(r: Linear<1, { T::MaxRegistrars::get() - 1 }>) -> Result<(), BenchmarkError> {
 		let caller: T::AccountId = whitelisted_caller();
 		let caller_lookup = T::Lookup::unlookup(caller.clone());
 		let _ = T::Currency::make_free_balance_be(&caller, BalanceOf::<T>::max_value());
 
-		let r in 1 .. T::MaxRegistrars::get() - 1 => add_registrars::<T>(r)?;
+		add_registrars::<T>(r)?;
 
 		let registrar_origin = T::RegistrarOrigin::try_successful_origin()
 			.expect("RegistrarOrigin has no successful origin required for the benchmark");
 		Identity::<T>::add_registrar(registrar_origin, caller_lookup)?;
-		let fields = IdentityFields(
-			IdentityField::Display | IdentityField::Legal | IdentityField::Web | IdentityField::Riot
-			| IdentityField::Email | IdentityField::PgpFingerprint | IdentityField::Image | IdentityField::Twitter
-		);
-		let registrars = Registrars::<T>::get();
-		ensure!(registrars[r as usize].as_ref().unwrap().fields == Default::default(), "fields already set.");
-	}: _(RawOrigin::Signed(caller), r, fields)
-	verify {
+
+		let fields =
+			IdentityFields(
+				IdentityField::Display |
+					IdentityField::Legal | IdentityField::Web |
+					IdentityField::Riot | IdentityField::Email |
+					IdentityField::PgpFingerprint |
+					IdentityField::Image | IdentityField::Twitter,
+			);
+
 		let registrars = Registrars::<T>::get();
-		ensure!(registrars[r as usize].as_ref().unwrap().fields != Default::default(), "fields not set.");
+		ensure!(
+			registrars[r as usize].as_ref().unwrap().fields == Default::default(),
+			"fields already set."
+		);
+
+		#[extrinsic_call]
+		_(RawOrigin::Signed(caller), r, fields);
+
+		let updated_registrars = Registrars::<T>::get();
+		ensure!(
+			updated_registrars[r as usize].as_ref().unwrap().fields != Default::default(),
+			"fields not set."
+		);
+
+		Ok(())
 	}
 
-	provide_judgement {
+	#[benchmark]
+	fn provide_judgement(
+		r: Linear<1, { T::MaxRegistrars::get() - 1 }>,
+		x: Linear<0, { T::MaxAdditionalFields::get() }>,
+	) -> Result<(), BenchmarkError> {
 		// The user
 		let user: T::AccountId = account("user", r, SEED);
-		let user_origin = <T as frame_system::Config>::RuntimeOrigin::from(RawOrigin::Signed(user.clone()));
+		let user_origin =
+			<T as frame_system::Config>::RuntimeOrigin::from(RawOrigin::Signed(user.clone()));
 		let user_lookup = <T::Lookup as StaticLookup>::unlookup(user.clone());
 		let _ = T::Currency::make_free_balance_be(&user, BalanceOf::<T>::max_value());
 
@@ -345,8 +429,7 @@ benchmarks! {
 		let caller_lookup = T::Lookup::unlookup(caller.clone());
 		let _ = T::Currency::make_free_balance_be(&caller, BalanceOf::<T>::max_value());
 
-		let r in 1 .. T::MaxRegistrars::get() - 1 => add_registrars::<T>(r)?;
-		let x in 0 .. T::MaxAdditionalFields::get();
+		add_registrars::<T>(r)?;
 
 		let info = create_identity_info::<T>(x);
 		let info_hash = T::Hashing::hash_of(&info);
@@ -356,18 +439,28 @@ benchmarks! {
 			.expect("RegistrarOrigin has no successful origin required for the benchmark");
 		Identity::<T>::add_registrar(registrar_origin, caller_lookup)?;
 		Identity::<T>::request_judgement(user_origin, r, 10u32.into())?;
-	}: _(RawOrigin::Signed(caller), r, user_lookup, Judgement::Reasonable, info_hash)
-	verify {
-		assert_last_event::<T>(Event::<T>::JudgementGiven { target: user, registrar_index: r }.into())
+
+		#[extrinsic_call]
+		_(RawOrigin::Signed(caller), r, user_lookup, Judgement::Reasonable, info_hash);
+
+		assert_last_event::<T>(
+			Event::<T>::JudgementGiven { target: user, registrar_index: r }.into(),
+		);
+
+		Ok(())
 	}
 
-	kill_identity {
-		let r in 1 .. T::MaxRegistrars::get() => add_registrars::<T>(r)?;
-		let s in 0 .. T::MaxSubAccounts::get();
-		let x in 0 .. T::MaxAdditionalFields::get();
+	#[benchmark]
+	fn kill_identity(
+		r: Linear<1, { T::MaxRegistrars::get() }>,
+		s: Linear<0, { T::MaxSubAccounts::get() }>,
+		x: Linear<0, { T::MaxAdditionalFields::get() }>,
+	) -> Result<(), BenchmarkError> {
+		add_registrars::<T>(r)?;
 
 		let target: T::AccountId = account("target", 0, SEED);
-		let target_origin: <T as frame_system::Config>::RuntimeOrigin = RawOrigin::Signed(target.clone()).into();
+		let target_origin: <T as frame_system::Config>::RuntimeOrigin =
+			RawOrigin::Signed(target.clone()).into();
 		let target_lookup = T::Lookup::unlookup(target.clone());
 		let _ = T::Currency::make_free_balance_be(&target, BalanceOf::<T>::max_value());
 
@@ -378,7 +471,7 @@ benchmarks! {
 		// User requests judgement from all the registrars, and they approve
 		for i in 0..r {
 			let registrar: T::AccountId = account("registrar", i, SEED);
-			let balance_to_use =  T::Currency::minimum_balance() * 10u32.into();
+			let balance_to_use = T::Currency::minimum_balance() * 10u32.into();
 			let _ = T::Currency::make_free_balance_be(&registrar, balance_to_use);
 
 			Identity::<T>::request_judgement(target_origin.clone(), i, 10u32.into())?;
@@ -390,62 +483,86 @@ benchmarks! {
 				T::Hashing::hash_of(&info),
 			)?;
 		}
+
 		ensure!(IdentityOf::<T>::contains_key(&target), "Identity not set");
+
 		let origin =
 			T::ForceOrigin::try_successful_origin().map_err(|_| BenchmarkError::Weightless)?;
-	}: _<T::RuntimeOrigin>(origin, target_lookup)
-	verify {
+
+		#[extrinsic_call]
+		_(origin as T::RuntimeOrigin, target_lookup);
+
 		ensure!(!IdentityOf::<T>::contains_key(&target), "Identity not removed");
-	}
 
-	add_sub {
-		let s in 0 .. T::MaxSubAccounts::get() - 1;
+		Ok(())
+	}
 
+	#[benchmark]
+	fn add_sub(s: Linear<0, { T::MaxSubAccounts::get() - 1 }>) -> Result<(), BenchmarkError> {
 		let caller: T::AccountId = whitelisted_caller();
 		let _ = add_sub_accounts::<T>(&caller, s)?;
 		let sub = account("new_sub", 0, SEED);
 		let data = Data::Raw(vec![0; 32].try_into().unwrap());
+
 		ensure!(SubsOf::<T>::get(&caller).1.len() as u32 == s, "Subs not set.");
-	}: _(RawOrigin::Signed(caller.clone()), T::Lookup::unlookup(sub), data)
-	verify {
+
+		#[extrinsic_call]
+		_(RawOrigin::Signed(caller.clone()), T::Lookup::unlookup(sub), data);
+
 		ensure!(SubsOf::<T>::get(&caller).1.len() as u32 == s + 1, "Subs not added.");
-	}
 
-	rename_sub {
-		let s in 1 .. T::MaxSubAccounts::get();
+		Ok(())
+	}
 
+	#[benchmark]
+	fn rename_sub(s: Linear<1, { T::MaxSubAccounts::get() }>) -> Result<(), BenchmarkError> {
 		let caller: T::AccountId = whitelisted_caller();
 		let (sub, _) = add_sub_accounts::<T>(&caller, s)?.remove(0);
 		let data = Data::Raw(vec![1; 32].try_into().unwrap());
+
 		ensure!(SuperOf::<T>::get(&sub).unwrap().1 != data, "data already set");
-	}: _(RawOrigin::Signed(caller), T::Lookup::unlookup(sub.clone()), data.clone())
-	verify {
+
+		#[extrinsic_call]
+		_(RawOrigin::Signed(caller), T::Lookup::unlookup(sub.clone()), data.clone());
+
 		ensure!(SuperOf::<T>::get(&sub).unwrap().1 == data, "data not set");
-	}
 
-	remove_sub {
-		let s in 1 .. T::MaxSubAccounts::get();
+		Ok(())
+	}
 
+	#[benchmark]
+	fn remove_sub(s: Linear<1, { T::MaxSubAccounts::get() }>) -> Result<(), BenchmarkError> {
 		let caller: T::AccountId = whitelisted_caller();
 		let (sub, _) = add_sub_accounts::<T>(&caller, s)?.remove(0);
 		ensure!(SuperOf::<T>::contains_key(&sub), "Sub doesn't exists");
-	}: _(RawOrigin::Signed(caller), T::Lookup::unlookup(sub.clone()))
-	verify {
+
+		#[extrinsic_call]
+		_(RawOrigin::Signed(caller), T::Lookup::unlookup(sub.clone()));
+
 		ensure!(!SuperOf::<T>::contains_key(&sub), "Sub not removed");
-	}
 
-	quit_sub {
-		let s in 0 .. T::MaxSubAccounts::get() - 1;
+		Ok(())
+	}
 
+	#[benchmark]
+	fn quit_sub(s: Linear<0, { T::MaxSubAccounts::get() - 1 }>) -> Result<(), BenchmarkError> {
 		let caller: T::AccountId = whitelisted_caller();
 		let sup = account("super", 0, SEED);
 		let _ = add_sub_accounts::<T>(&sup, s)?;
 		let sup_origin = RawOrigin::Signed(sup).into();
-		Identity::<T>::add_sub(sup_origin, T::Lookup::unlookup(caller.clone()), Data::Raw(vec![0; 32].try_into().unwrap()))?;
+		Identity::<T>::add_sub(
+			sup_origin,
+			T::Lookup::unlookup(caller.clone()),
+			Data::Raw(vec![0; 32].try_into().unwrap()),
+		)?;
 		ensure!(SuperOf::<T>::contains_key(&caller), "Sub doesn't exists");
-	}: _(RawOrigin::Signed(caller.clone()))
-	verify {
+
+		#[extrinsic_call]
+		_(RawOrigin::Signed(caller.clone()));
+
 		ensure!(!SuperOf::<T>::contains_key(&caller), "Sub not removed");
+
+		Ok(())
 	}
 
 	impl_benchmark_test_suite!(Identity, crate::tests::new_test_ext(), crate::tests::Test);
diff --git a/substrate/frame/im-online/Cargo.toml b/substrate/frame/im-online/Cargo.toml
index 9cbf0c1635b563bbb6b8395e7cd47b4feb6214e8..5f612c229f077eea56834366265c387afcf39ff8 100644
--- a/substrate/frame/im-online/Cargo.toml
+++ b/substrate/frame/im-online/Cargo.toml
@@ -1,11 +1,11 @@
 [package]
 name = "pallet-im-online"
 version = "4.0.0-dev"
-authors = ["Parity Technologies <admin@parity.io>"]
-edition = "2021"
+authors.workspace = true
+edition.workspace = true
 license = "Apache-2.0"
 homepage = "https://substrate.io"
-repository = "https://github.com/paritytech/substrate/"
+repository.workspace = true
 description = "FRAME's I'm online pallet"
 readme = "README.md"
 
diff --git a/substrate/frame/indices/Cargo.toml b/substrate/frame/indices/Cargo.toml
index 6b1af69cc6dcf8212d14a23d789cea008c6251e5..2018c7a063e79048852546359f202db957065c81 100644
--- a/substrate/frame/indices/Cargo.toml
+++ b/substrate/frame/indices/Cargo.toml
@@ -1,11 +1,11 @@
 [package]
 name = "pallet-indices"
 version = "4.0.0-dev"
-authors = ["Parity Technologies <admin@parity.io>"]
-edition = "2021"
+authors.workspace = true
+edition.workspace = true
 license = "Apache-2.0"
 homepage = "https://substrate.io"
-repository = "https://github.com/paritytech/substrate/"
+repository.workspace = true
 description = "FRAME indices management pallet"
 readme = "README.md"
 
diff --git a/substrate/frame/indices/README.md b/substrate/frame/indices/README.md
index 243392780db28e9e6b941a5bb1e7d3c79d78887d..ba4b9679a294b5969c05f0efe7a2f48645540f22 100644
--- a/substrate/frame/indices/README.md
+++ b/substrate/frame/indices/README.md
@@ -1,4 +1,4 @@
 An index is a short form of an address. This module handles allocation
 of indices for a newly created accounts.
 
-License: Apache-2.0
\ No newline at end of file
+License: Apache-2.0
diff --git a/substrate/frame/insecure-randomness-collective-flip/Cargo.toml b/substrate/frame/insecure-randomness-collective-flip/Cargo.toml
index d84c22c5aec7aeca2acd67d69fa95e413501a281..57d4da45268d20fd208cb6f6c308701c44a43f13 100644
--- a/substrate/frame/insecure-randomness-collective-flip/Cargo.toml
+++ b/substrate/frame/insecure-randomness-collective-flip/Cargo.toml
@@ -1,11 +1,11 @@
 [package]
 name = "pallet-insecure-randomness-collective-flip"
 version = "4.0.0-dev"
-authors = ["Parity Technologies <admin@parity.io>"]
-edition = "2021"
+authors.workspace = true
+edition.workspace = true
 license = "Apache-2.0"
 homepage = "https://substrate.io"
-repository = "https://github.com/paritytech/substrate/"
+repository.workspace = true
 description = "Insecure do not use in production: FRAME randomness collective flip pallet"
 readme = "README.md"
 
diff --git a/substrate/frame/insecure-randomness-collective-flip/README.md b/substrate/frame/insecure-randomness-collective-flip/README.md
index ef02e4b5c8445132be938e7b84dddc845551b49e..4f02782fa65910068ea9d0345b06156d06f8ca57 100644
--- a/substrate/frame/insecure-randomness-collective-flip/README.md
+++ b/substrate/frame/insecure-randomness-collective-flip/README.md
@@ -1,25 +1,27 @@
 # DO NOT USE IN PRODUCTION
 
-The produced values do not fulfill the cryptographic requirements for random numbers. Should not be used for high-stake production use-cases.
+The produced values do not fulfill the cryptographic requirements for random numbers. Should not be used for high-stake
+production use-cases.
 
 # Randomness Module
 
-The Randomness Collective Flip module provides a [`random`](https://docs.rs/pallet-insecure-randomness-collective-flip/latest/pallet_insecure_randomness_collective_flip/struct.Module.html#method.random)
-function that generates low-influence random values based on the block hashes from the previous
-`81` blocks. Low-influence randomness can be useful when defending against relatively weak
-adversaries. Using this pallet as a randomness source is advisable primarily in low-security
-situations like testing.
+The Randomness Collective Flip module provides a
+[`random`](https://docs.rs/pallet-insecure-randomness-collective-flip/latest/pallet_insecure_randomness_collective_flip/struct.Module.html#method.random)
+function that generates low-influence random values based on the block hashes from the previous `81` blocks.
+Low-influence randomness can be useful when defending against relatively weak adversaries. Using this pallet as a
+randomness source is advisable primarily in low-security situations like testing.
 
 ## Public Functions
 
-See the [`Module`](https://docs.rs/pallet-insecure-randomness-collective-flip/latest/pallet_insecure_randomness_collective_flip/struct.Module.html) struct for details of publicly available functions.
+See the
+[`Module`](https://docs.rs/pallet-insecure-randomness-collective-flip/latest/pallet_insecure_randomness_collective_flip/struct.Module.html)
+struct for details of publicly available functions.
 
 ## Usage
 
 ### Prerequisites
 
-Import the Randomness Collective Flip module and derive your module's configuration trait from
-the system trait.
+Import the Randomness Collective Flip module and derive your module's configuration trait from the system trait.
 
 ### Example - Get random seed for the current block
 
diff --git a/substrate/frame/lottery/Cargo.toml b/substrate/frame/lottery/Cargo.toml
index a3828fa1719e9e37fcec397bae4d2189f9b099f2..6b6109fbc53d56acf9952055292f5c4c06caee55 100644
--- a/substrate/frame/lottery/Cargo.toml
+++ b/substrate/frame/lottery/Cargo.toml
@@ -1,11 +1,11 @@
 [package]
 name = "pallet-lottery"
 version = "4.0.0-dev"
-authors = ["Parity Technologies <admin@parity.io>"]
-edition = "2021"
+authors.workspace = true
+edition.workspace = true
 license = "Apache-2.0"
 homepage = "https://substrate.io"
-repository = "https://github.com/paritytech/substrate/"
+repository.workspace = true
 description = "FRAME Participation Lottery Pallet"
 
 [package.metadata.docs.rs]
diff --git a/substrate/frame/lottery/src/lib.rs b/substrate/frame/lottery/src/lib.rs
index c9c0254042424c7d5b46b386e942c9ed662250b7..c54f6d76803fff51e820b99db1b86c82b7629ca6 100644
--- a/substrate/frame/lottery/src/lib.rs
+++ b/substrate/frame/lottery/src/lib.rs
@@ -56,7 +56,7 @@ pub mod weights;
 
 use codec::{Decode, Encode};
 use frame_support::{
-	dispatch::{DispatchResult, Dispatchable, GetDispatchInfo},
+	dispatch::{DispatchResult, GetDispatchInfo},
 	ensure,
 	pallet_prelude::MaxEncodedLen,
 	storage::bounded_vec::BoundedVec,
@@ -65,7 +65,7 @@ use frame_support::{
 };
 pub use pallet::*;
 use sp_runtime::{
-	traits::{AccountIdConversion, Saturating, Zero},
+	traits::{AccountIdConversion, Dispatchable, Saturating, Zero},
 	ArithmeticError, DispatchError, RuntimeDebug,
 };
 use sp_std::prelude::*;
diff --git a/substrate/frame/membership/Cargo.toml b/substrate/frame/membership/Cargo.toml
index adf1c500de1268071c6a189af79f1d5e17a7e8d7..52d8ee560f73ee26fcb872ab378799ac5fd7025d 100644
--- a/substrate/frame/membership/Cargo.toml
+++ b/substrate/frame/membership/Cargo.toml
@@ -1,11 +1,11 @@
 [package]
 name = "pallet-membership"
 version = "4.0.0-dev"
-authors = ["Parity Technologies <admin@parity.io>"]
-edition = "2021"
+authors.workspace = true
+edition.workspace = true
 license = "Apache-2.0"
 homepage = "https://substrate.io"
-repository = "https://github.com/paritytech/substrate/"
+repository.workspace = true
 description = "FRAME membership management pallet"
 readme = "README.md"
 
diff --git a/substrate/frame/merkle-mountain-range/Cargo.toml b/substrate/frame/merkle-mountain-range/Cargo.toml
index 92638f202b1c6a9918a5513c6cfedb2623928d9b..3a21f5bc86f154c9f11b8b9a032be7e648416c8d 100644
--- a/substrate/frame/merkle-mountain-range/Cargo.toml
+++ b/substrate/frame/merkle-mountain-range/Cargo.toml
@@ -1,11 +1,11 @@
 [package]
 name = "pallet-mmr"
 version = "4.0.0-dev"
-authors = ["Parity Technologies <admin@parity.io>"]
-edition = "2021"
+authors.workspace = true
+edition.workspace = true
 license = "Apache-2.0"
 homepage = "https://substrate.io"
-repository = "https://github.com/paritytech/substrate/"
+repository.workspace = true
 description = "FRAME Merkle Mountain Range pallet."
 
 [package.metadata.docs.rs]
diff --git a/substrate/frame/merkle-mountain-range/src/mock.rs b/substrate/frame/merkle-mountain-range/src/mock.rs
index ecc254278bf0fa1661d57e1fd2f1b97edbf181c1..d3cb4e57029727f395dcafb263a2033c5291dbe9 100644
--- a/substrate/frame/merkle-mountain-range/src/mock.rs
+++ b/substrate/frame/merkle-mountain-range/src/mock.rs
@@ -19,13 +19,9 @@ use crate as pallet_mmr;
 use crate::*;
 
 use codec::{Decode, Encode};
-use frame_support::{
-	parameter_types,
-	traits::{ConstU32, ConstU64},
-};
-use sp_core::H256;
+use frame_support::{derive_impl, parameter_types};
 use sp_mmr_primitives::{Compact, LeafDataProvider};
-use sp_runtime::traits::{BlakeTwo256, IdentityLookup, Keccak256};
+use sp_runtime::traits::Keccak256;
 
 type Block = frame_system::mocking::MockBlock<Test>;
 
@@ -37,30 +33,9 @@ frame_support::construct_runtime!(
 	}
 );
 
+#[derive_impl(frame_system::config_preludes::TestDefaultConfig as frame_system::DefaultConfig)]
 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 = sp_core::sr25519::Public;
-	type Lookup = IdentityLookup<Self::AccountId>;
 	type Block = Block;
-	type RuntimeEvent = RuntimeEvent;
-	type BlockHashCount = ConstU64<250>;
-	type DbWeight = ();
-	type BlockWeights = ();
-	type BlockLength = ();
-	type Version = ();
-	type PalletInfo = PalletInfo;
-	type AccountData = ();
-	type OnNewAccount = ();
-	type OnKilledAccount = ();
-	type SystemWeightInfo = ();
-	type SS58Prefix = ();
-	type OnSetCode = ();
-	type MaxConsumers = ConstU32<16>;
 }
 
 impl Config for Test {
diff --git a/substrate/frame/message-queue/Cargo.toml b/substrate/frame/message-queue/Cargo.toml
index 655c88c39f2ce1dd62fc3b3d6f913b8e40824658..19ea25198f3489d5e6e8d9baf970bbef376bceae 100644
--- a/substrate/frame/message-queue/Cargo.toml
+++ b/substrate/frame/message-queue/Cargo.toml
@@ -1,17 +1,17 @@
 [package]
-authors = ["Parity Technologies <admin@parity.io>"]
-edition = "2021"
+authors.workspace = true
+edition.workspace = true
 name = "pallet-message-queue"
 version = "7.0.0-dev"
 license = "Apache-2.0"
 homepage = "https://substrate.io"
-repository = "https://github.com/paritytech/substrate/"
+repository.workspace = true
 description = "FRAME pallet to queue and process messages"
 
 [dependencies]
 codec = { package = "parity-scale-codec", version = "3.6.1", default-features = false, features = ["derive"] }
 scale-info = { version = "2.5.0", default-features = false, features = ["derive"] }
-serde = { version = "1.0.163", optional = true, features = ["derive"] }
+serde = { version = "1.0.188", optional = true, features = ["derive"] }
 log = { version = "0.4.17", default-features = false }
 
 sp-core = { path = "../../primitives/core", default-features = false}
diff --git a/substrate/frame/message-queue/src/benchmarking.rs b/substrate/frame/message-queue/src/benchmarking.rs
index bbd321ceadd1abd622eff7c342170be4cf6b1376..eedaaebeca944bd8dfd1778fea82ad7504111d03 100644
--- a/substrate/frame/message-queue/src/benchmarking.rs
+++ b/substrate/frame/message-queue/src/benchmarking.rs
@@ -78,7 +78,7 @@ mod benchmarks {
 	fn service_queue_base() {
 		#[block]
 		{
-			MessageQueue::<T>::service_queue(0.into(), &mut WeightMeter::max_limit(), Weight::MAX);
+			MessageQueue::<T>::service_queue(0.into(), &mut WeightMeter::new(), Weight::MAX);
 		}
 	}
 
@@ -89,7 +89,7 @@ mod benchmarks {
 		let page = PageOf::<T>::default();
 		Pages::<T>::insert(&origin, 0, &page);
 		let mut book_state = single_page_book::<T>();
-		let mut meter = WeightMeter::max_limit();
+		let mut meter = WeightMeter::new();
 		let limit = Weight::MAX;
 
 		#[block]
@@ -108,7 +108,7 @@ mod benchmarks {
 		page.remaining = 1.into();
 		Pages::<T>::insert(&origin, 0, &page);
 		let mut book_state = single_page_book::<T>();
-		let mut meter = WeightMeter::max_limit();
+		let mut meter = WeightMeter::new();
 		let limit = Weight::MAX;
 
 		#[block]
@@ -124,7 +124,7 @@ mod benchmarks {
 		let mut page = page::<T>(&msg.clone());
 		let mut book = book_for::<T>(&page);
 		assert!(page.peek_first().is_some(), "There is one message");
-		let mut weight = WeightMeter::max_limit();
+		let mut weight = WeightMeter::new();
 
 		#[block]
 		{
@@ -158,7 +158,7 @@ mod benchmarks {
 	#[benchmark]
 	fn bump_service_head() {
 		setup_bump_service_head::<T>(0.into(), 10.into());
-		let mut weight = WeightMeter::max_limit();
+		let mut weight = WeightMeter::new();
 
 		#[block]
 		{
diff --git a/substrate/frame/message-queue/src/lib.rs b/substrate/frame/message-queue/src/lib.rs
index 5acc3e9d5a1385245e5fbe95305fd24ad2436cd5..7c38dec4b08052f0847204447938bbdac725e422 100644
--- a/substrate/frame/message-queue/src/lib.rs
+++ b/substrate/frame/message-queue/src/lib.rs
@@ -832,7 +832,7 @@ impl<T: Config> Pallet<T> {
 		);
 		ensure!(!is_processed, Error::<T>::AlreadyProcessed);
 		use MessageExecutionStatus::*;
-		let mut weight_counter = WeightMeter::from_limit(weight_limit);
+		let mut weight_counter = WeightMeter::with_limit(weight_limit);
 		match Self::process_message_payload(
 			origin.clone(),
 			page_index,
@@ -1092,7 +1092,7 @@ impl<T: Config> Pallet<T> {
 			origin.clone(),
 			page_index,
 			page.first_index,
-			payload.deref(),
+			payload,
 			weight,
 			overweight_limit,
 		) {
@@ -1150,7 +1150,7 @@ impl<T: Config> Pallet<T> {
 		//loop around this origin
 		let starting_origin = ServiceHead::<T>::get().unwrap();
 
-		while let Some(head) = Self::bump_service_head(&mut WeightMeter::max_limit()) {
+		while let Some(head) = Self::bump_service_head(&mut WeightMeter::new()) {
 			ensure!(
 				BookStateFor::<T>::contains_key(&head),
 				"Service head must point to an existing book"
@@ -1242,7 +1242,7 @@ impl<T: Config> Pallet<T> {
 					if let Some((_, processed, message)) =
 						page.peek_index(i.try_into().expect("std-only code"))
 					{
-						let msg = String::from_utf8_lossy(message.deref());
+						let msg = String::from_utf8_lossy(message);
 						if processed {
 							page_info.push('*');
 						}
@@ -1362,7 +1362,7 @@ impl<T: Config> ServiceQueues for Pallet<T> {
 	fn service_queues(weight_limit: Weight) -> Weight {
 		// The maximum weight that processing a single message may take.
 		let overweight_limit = weight_limit;
-		let mut weight = WeightMeter::from_limit(weight_limit);
+		let mut weight = WeightMeter::with_limit(weight_limit);
 
 		let mut next = match Self::bump_service_head(&mut weight) {
 			Some(h) => h,
@@ -1402,7 +1402,7 @@ impl<T: Config> ServiceQueues for Pallet<T> {
 		weight_limit: Weight,
 		(message_origin, page, index): Self::OverweightMessageAddress,
 	) -> Result<Weight, ExecuteOverweightError> {
-		let mut weight = WeightMeter::from_limit(weight_limit);
+		let mut weight = WeightMeter::with_limit(weight_limit);
 		if weight
 			.try_consume(
 				T::WeightInfo::execute_overweight_page_removed()
diff --git a/substrate/frame/message-queue/src/tests.rs b/substrate/frame/message-queue/src/tests.rs
index bcb099a6accd12b29abe5a6865e551fab5c23627..092bd1d833450502f383e30fedca033d28a22179 100644
--- a/substrate/frame/message-queue/src/tests.rs
+++ b/substrate/frame/message-queue/src/tests.rs
@@ -381,7 +381,7 @@ fn service_queue_bails() {
 	// Not enough weight for `service_queue_base`.
 	build_and_execute::<Test>(|| {
 		set_weight("service_queue_base", 2.into_weight());
-		let mut meter = WeightMeter::from_limit(1.into_weight());
+		let mut meter = WeightMeter::with_limit(1.into_weight());
 
 		assert_storage_noop!(MessageQueue::service_queue(0u32.into(), &mut meter, Weight::MAX));
 		assert!(meter.consumed().is_zero());
@@ -389,7 +389,7 @@ fn service_queue_bails() {
 	// Not enough weight for `ready_ring_unknit`.
 	build_and_execute::<Test>(|| {
 		set_weight("ready_ring_unknit", 2.into_weight());
-		let mut meter = WeightMeter::from_limit(1.into_weight());
+		let mut meter = WeightMeter::with_limit(1.into_weight());
 
 		assert_storage_noop!(MessageQueue::service_queue(0u32.into(), &mut meter, Weight::MAX));
 		assert!(meter.consumed().is_zero());
@@ -399,7 +399,7 @@ fn service_queue_bails() {
 		set_weight("service_queue_base", 2.into_weight());
 		set_weight("ready_ring_unknit", 2.into_weight());
 
-		let mut meter = WeightMeter::from_limit(3.into_weight());
+		let mut meter = WeightMeter::with_limit(3.into_weight());
 		assert_storage_noop!(MessageQueue::service_queue(0.into(), &mut meter, Weight::MAX));
 		assert!(meter.consumed().is_zero());
 	});
@@ -426,7 +426,7 @@ fn service_page_works() {
 			msgs -= process;
 
 			//  Enough weight to process `process` messages.
-			let mut meter = WeightMeter::from_limit(((2 + (3 + 1) * process) as u64).into_weight());
+			let mut meter = WeightMeter::with_limit(((2 + (3 + 1) * process) as u64).into_weight());
 			System::reset_events();
 			let (processed, status) =
 				crate::Pallet::<Test>::service_page(&Here, &mut book, &mut meter, Weight::MAX);
@@ -449,7 +449,7 @@ fn service_page_bails() {
 	// Not enough weight for `service_page_base_completion`.
 	build_and_execute::<Test>(|| {
 		set_weight("service_page_base_completion", 2.into_weight());
-		let mut meter = WeightMeter::from_limit(1.into_weight());
+		let mut meter = WeightMeter::with_limit(1.into_weight());
 
 		let (page, _) = full_page::<Test>();
 		let mut book = book_for::<Test>(&page);
@@ -466,7 +466,7 @@ fn service_page_bails() {
 	// Not enough weight for `service_page_base_no_completion`.
 	build_and_execute::<Test>(|| {
 		set_weight("service_page_base_no_completion", 2.into_weight());
-		let mut meter = WeightMeter::from_limit(1.into_weight());
+		let mut meter = WeightMeter::with_limit(1.into_weight());
 
 		let (page, _) = full_page::<Test>();
 		let mut book = book_for::<Test>(&page);
@@ -487,7 +487,7 @@ fn service_page_item_bails() {
 	build_and_execute::<Test>(|| {
 		let _guard = StorageNoopGuard::default();
 		let (mut page, _) = full_page::<Test>();
-		let mut weight = WeightMeter::from_limit(10.into_weight());
+		let mut weight = WeightMeter::with_limit(10.into_weight());
 		let overweight_limit = 10.into_weight();
 		set_weight("service_page_item", 11.into_weight());
 
@@ -518,7 +518,7 @@ fn service_page_suspension_works() {
 		Pages::<Test>::insert(Here, 0, page);
 
 		// First we process 5 messages from this page.
-		let mut meter = WeightMeter::from_limit(5.into_weight());
+		let mut meter = WeightMeter::with_limit(5.into_weight());
 		let (_, status) =
 			crate::Pallet::<Test>::service_page(&Here, &mut book, &mut meter, Weight::MAX);
 
@@ -534,7 +534,7 @@ fn service_page_suspension_works() {
 			let (_, status) = crate::Pallet::<Test>::service_page(
 				&Here,
 				&mut book,
-				&mut WeightMeter::max_limit(),
+				&mut WeightMeter::new(),
 				Weight::MAX,
 			);
 			assert_eq!(status, NoProgress);
@@ -546,7 +546,7 @@ fn service_page_suspension_works() {
 		let (_, status) = crate::Pallet::<Test>::service_page(
 			&Here,
 			&mut book,
-			&mut WeightMeter::max_limit(),
+			&mut WeightMeter::new(),
 			Weight::MAX,
 		);
 		assert_eq!(status, NoMore);
@@ -564,7 +564,7 @@ fn bump_service_head_works() {
 
 		// Bump 99 times.
 		for i in 0..99 {
-			let current = MessageQueue::bump_service_head(&mut WeightMeter::max_limit()).unwrap();
+			let current = MessageQueue::bump_service_head(&mut WeightMeter::new()).unwrap();
 			assert_eq!(current, [Here, There, Everywhere(0)][i % 3]);
 		}
 
@@ -581,7 +581,7 @@ fn bump_service_head_bails() {
 		setup_bump_service_head::<Test>(0.into(), 1.into());
 
 		let _guard = StorageNoopGuard::default();
-		let mut meter = WeightMeter::from_limit(1.into_weight());
+		let mut meter = WeightMeter::with_limit(1.into_weight());
 		assert!(MessageQueue::bump_service_head(&mut meter).is_none());
 		assert_eq!(meter.consumed(), 0.into_weight());
 	});
@@ -591,7 +591,7 @@ fn bump_service_head_bails() {
 fn bump_service_head_trivial_works() {
 	build_and_execute::<Test>(|| {
 		set_weight("bump_service_head", 2.into_weight());
-		let mut meter = WeightMeter::max_limit();
+		let mut meter = WeightMeter::new();
 
 		assert_eq!(MessageQueue::bump_service_head(&mut meter), None, "Cannot bump");
 		assert_eq!(meter.consumed(), 2.into_weight());
@@ -616,7 +616,7 @@ fn bump_service_head_no_head_noops() {
 		ServiceHead::<Test>::kill();
 
 		// Nothing happens.
-		assert_storage_noop!(MessageQueue::bump_service_head(&mut WeightMeter::max_limit()));
+		assert_storage_noop!(MessageQueue::bump_service_head(&mut WeightMeter::new()));
 	});
 }
 
@@ -624,7 +624,7 @@ fn bump_service_head_no_head_noops() {
 fn service_page_item_consumes_correct_weight() {
 	build_and_execute::<Test>(|| {
 		let mut page = page::<Test>(b"weight=3");
-		let mut weight = WeightMeter::from_limit(10.into_weight());
+		let mut weight = WeightMeter::with_limit(10.into_weight());
 		let overweight_limit = 0.into_weight();
 		set_weight("service_page_item", 2.into_weight());
 
@@ -648,7 +648,7 @@ fn service_page_item_consumes_correct_weight() {
 fn service_page_item_skips_perm_overweight_message() {
 	build_and_execute::<Test>(|| {
 		let mut page = page::<Test>(b"TooMuch");
-		let mut weight = WeightMeter::from_limit(2.into_weight());
+		let mut weight = WeightMeter::with_limit(2.into_weight());
 		let overweight_limit = 0.into_weight();
 		set_weight("service_page_item", 2.into_weight());
 
diff --git a/substrate/frame/mixnet/Cargo.toml b/substrate/frame/mixnet/Cargo.toml
new file mode 100644
index 0000000000000000000000000000000000000000..68ffdad20fcbb2478f0a47f6fccff514d9a8c85f
--- /dev/null
+++ b/substrate/frame/mixnet/Cargo.toml
@@ -0,0 +1,57 @@
+[package]
+description = "FRAME's mixnet pallet"
+name = "pallet-mixnet"
+version = "0.1.0-dev"
+license = "Apache-2.0"
+authors = ["Parity Technologies <admin@parity.io>"]
+edition = "2021"
+homepage = "https://substrate.io"
+repository = "https://github.com/paritytech/substrate/"
+readme = "README.md"
+
+[package.metadata.docs.rs]
+targets = ["x86_64-unknown-linux-gnu"]
+
+[dependencies]
+codec = { package = "parity-scale-codec", version = "3.6.1", default-features = false, features = ["derive", "max-encoded-len"] }
+frame-benchmarking = { default-features = false, optional = true, path = "../benchmarking" }
+frame-support = { default-features = false, path = "../support" }
+frame-system = { default-features = false, path = "../system" }
+log = { version = "0.4.17", default-features = false }
+scale-info = { version = "2.5.0", default-features = false, features = ["derive"] }
+serde = { version = "1.0.188", default-features = false, features = ["derive"] }
+sp-application-crypto = { default-features = false, path = "../../primitives/application-crypto" }
+sp-arithmetic = { default-features = false, path = "../../primitives/arithmetic" }
+sp-io = { default-features = false, path = "../../primitives/io" }
+sp-mixnet = { default-features = false, path = "../../primitives/mixnet" }
+sp-runtime = { default-features = false, path = "../../primitives/runtime" }
+sp-std = { default-features = false, path = "../../primitives/std" }
+
+[features]
+default = [ "std" ]
+std = [
+	"codec/std",
+	"frame-benchmarking?/std",
+	"frame-support/std",
+	"frame-system/std",
+	"log/std",
+	"scale-info/std",
+	"serde/std",
+	"sp-application-crypto/std",
+	"sp-arithmetic/std",
+	"sp-io/std",
+	"sp-mixnet/std",
+	"sp-runtime/std",
+	"sp-std/std",
+]
+runtime-benchmarks = [
+	"frame-benchmarking/runtime-benchmarks",
+	"frame-support/runtime-benchmarks",
+	"frame-system/runtime-benchmarks",
+	"sp-runtime/runtime-benchmarks",
+]
+try-runtime = [
+	"frame-support/try-runtime",
+	"frame-system/try-runtime",
+	"sp-runtime/try-runtime",
+]
diff --git a/substrate/frame/mixnet/README.md b/substrate/frame/mixnet/README.md
new file mode 100644
index 0000000000000000000000000000000000000000..59b81851ed11faa4020c49edbd74e412472e6259
--- /dev/null
+++ b/substrate/frame/mixnet/README.md
@@ -0,0 +1,4 @@
+This pallet is responsible for determining the current mixnet session and phase, and the mixnode
+set for each session.
+
+License: Apache-2.0
diff --git a/substrate/frame/mixnet/src/lib.rs b/substrate/frame/mixnet/src/lib.rs
new file mode 100644
index 0000000000000000000000000000000000000000..c7a5b624157b88610f6728fffc6f70daef59f9ad
--- /dev/null
+++ b/substrate/frame/mixnet/src/lib.rs
@@ -0,0 +1,598 @@
+// 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.
+
+//! This pallet is responsible for determining the current mixnet session and phase, and the
+//! mixnode set for each session.
+
+#![warn(missing_docs)]
+#![cfg_attr(not(feature = "std"), no_std)]
+
+use codec::{Decode, Encode, MaxEncodedLen};
+use frame_support::{
+	traits::{EstimateNextSessionRotation, Get, OneSessionHandler},
+	BoundedVec,
+};
+use frame_system::{
+	offchain::{SendTransactionTypes, SubmitTransaction},
+	pallet_prelude::BlockNumberFor,
+};
+pub use pallet::*;
+use scale_info::TypeInfo;
+use serde::{Deserialize, Serialize};
+use sp_application_crypto::RuntimeAppPublic;
+use sp_arithmetic::traits::{CheckedSub, Saturating, UniqueSaturatedInto, Zero};
+use sp_io::MultiRemovalResults;
+use sp_mixnet::types::{
+	AuthorityId, AuthoritySignature, KxPublic, Mixnode, MixnodesErr, PeerId, SessionIndex,
+	SessionPhase, SessionStatus, KX_PUBLIC_SIZE,
+};
+use sp_runtime::RuntimeDebug;
+use sp_std::{cmp::Ordering, vec::Vec};
+
+const LOG_TARGET: &str = "runtime::mixnet";
+
+/// Index of an authority in the authority list for a session.
+pub type AuthorityIndex = u32;
+
+////////////////////////////////////////////////////////////////////////////////
+// Bounded mixnode type
+////////////////////////////////////////////////////////////////////////////////
+
+/// Like [`Mixnode`], but encoded size is bounded.
+#[derive(
+	Clone, Decode, Encode, MaxEncodedLen, PartialEq, TypeInfo, RuntimeDebug, Serialize, Deserialize,
+)]
+pub struct BoundedMixnode<ExternalAddresses> {
+	/// Key-exchange public key for the mixnode.
+	pub kx_public: KxPublic,
+	/// libp2p peer ID of the mixnode.
+	pub peer_id: PeerId,
+	/// External addresses for the mixnode, in multiaddr format, UTF-8 encoded.
+	pub external_addresses: ExternalAddresses,
+}
+
+impl<MaxExternalAddressSize, MaxExternalAddresses> Into<Mixnode>
+	for BoundedMixnode<BoundedVec<BoundedVec<u8, MaxExternalAddressSize>, MaxExternalAddresses>>
+{
+	fn into(self) -> Mixnode {
+		Mixnode {
+			kx_public: self.kx_public,
+			peer_id: self.peer_id,
+			external_addresses: self
+				.external_addresses
+				.into_iter()
+				.map(BoundedVec::into_inner)
+				.collect(),
+		}
+	}
+}
+
+impl<MaxExternalAddressSize: Get<u32>, MaxExternalAddresses: Get<u32>> From<Mixnode>
+	for BoundedMixnode<BoundedVec<BoundedVec<u8, MaxExternalAddressSize>, MaxExternalAddresses>>
+{
+	fn from(mixnode: Mixnode) -> Self {
+		Self {
+			kx_public: mixnode.kx_public,
+			peer_id: mixnode.peer_id,
+			external_addresses: mixnode
+				.external_addresses
+				.into_iter()
+				.flat_map(|addr| match addr.try_into() {
+					Ok(addr) => Some(addr),
+					Err(addr) => {
+						log::debug!(
+							target: LOG_TARGET,
+							"Mixnode external address {addr:x?} too long; discarding",
+						);
+						None
+					},
+				})
+				.take(MaxExternalAddresses::get() as usize)
+				.collect::<Vec<_>>()
+				.try_into()
+				.expect("Excess external addresses discarded with take()"),
+		}
+	}
+}
+
+/// [`BoundedMixnode`] type for the given configuration.
+pub type BoundedMixnodeFor<T> = BoundedMixnode<
+	BoundedVec<
+		BoundedVec<u8, <T as Config>::MaxExternalAddressSize>,
+		<T as Config>::MaxExternalAddressesPerMixnode,
+	>,
+>;
+
+////////////////////////////////////////////////////////////////////////////////
+// Registration type
+////////////////////////////////////////////////////////////////////////////////
+
+/// A mixnode registration. A registration transaction is formed from one of these plus an
+/// [`AuthoritySignature`].
+#[derive(Clone, Decode, Encode, PartialEq, TypeInfo, RuntimeDebug)]
+pub struct Registration<BlockNumber, BoundedMixnode> {
+	/// Block number at the time of creation. When a registration transaction fails to make it on
+	/// to the chain for whatever reason, we send out another one. We want this one to have a
+	/// different hash in case the earlier transaction got banned somewhere; including the block
+	/// number is a simple way of achieving this.
+	pub block_number: BlockNumber,
+	/// The session during which this registration should be processed. Note that on success the
+	/// mixnode is registered for the _following_ session.
+	pub session_index: SessionIndex,
+	/// The index in the next session's authority list of the authority registering the mixnode.
+	pub authority_index: AuthorityIndex,
+	/// Mixnode information to register for the following session.
+	pub mixnode: BoundedMixnode,
+}
+
+/// [`Registration`] type for the given configuration.
+pub type RegistrationFor<T> = Registration<BlockNumberFor<T>, BoundedMixnodeFor<T>>;
+
+////////////////////////////////////////////////////////////////////////////////
+// Misc helper funcs
+////////////////////////////////////////////////////////////////////////////////
+
+fn check_removed_all(res: MultiRemovalResults) {
+	debug_assert!(res.maybe_cursor.is_none());
+}
+
+fn twox<BlockNumber: UniqueSaturatedInto<u64>>(
+	block_number: BlockNumber,
+	kx_public: &KxPublic,
+) -> u64 {
+	let block_number: u64 = block_number.unique_saturated_into();
+	let mut data = [0; 8 + KX_PUBLIC_SIZE];
+	data[..8].copy_from_slice(&block_number.to_le_bytes());
+	data[8..].copy_from_slice(kx_public);
+	u64::from_le_bytes(sp_io::hashing::twox_64(&data))
+}
+
+////////////////////////////////////////////////////////////////////////////////
+// The pallet
+////////////////////////////////////////////////////////////////////////////////
+
+#[frame_support::pallet(dev_mode)]
+pub mod pallet {
+	use super::*;
+	use frame_support::pallet_prelude::*;
+	use frame_system::pallet_prelude::*;
+
+	#[pallet::pallet]
+	pub struct Pallet<T>(_);
+
+	#[pallet::config]
+	pub trait Config: frame_system::Config + SendTransactionTypes<Call<Self>> {
+		/// The maximum number of authorities per session.
+		#[pallet::constant]
+		type MaxAuthorities: Get<AuthorityIndex>;
+
+		/// The maximum size of one of a mixnode's external addresses.
+		#[pallet::constant]
+		type MaxExternalAddressSize: Get<u32>;
+
+		/// The maximum number of external addresses for a mixnode.
+		#[pallet::constant]
+		type MaxExternalAddressesPerMixnode: Get<u32>;
+
+		/// Session progress/length estimation. Used to determine when to send registration
+		/// transactions and the longevity of these transactions.
+		type NextSessionRotation: EstimateNextSessionRotation<BlockNumberFor<Self>>;
+
+		/// Length of the first phase of each session (`CoverToCurrent`), in blocks.
+		#[pallet::constant]
+		type NumCoverToCurrentBlocks: Get<BlockNumberFor<Self>>;
+
+		/// Length of the second phase of each session (`RequestsToCurrent`), in blocks.
+		#[pallet::constant]
+		type NumRequestsToCurrentBlocks: Get<BlockNumberFor<Self>>;
+
+		/// Length of the third phase of each session (`CoverToPrev`), in blocks.
+		#[pallet::constant]
+		type NumCoverToPrevBlocks: Get<BlockNumberFor<Self>>;
+
+		/// The number of "slack" blocks at the start of each session, during which
+		/// [`maybe_register`](Pallet::maybe_register) will not attempt to post registration
+		/// transactions.
+		#[pallet::constant]
+		type NumRegisterStartSlackBlocks: Get<BlockNumberFor<Self>>;
+
+		/// The number of "slack" blocks at the end of each session.
+		/// [`maybe_register`](Pallet::maybe_register) will try to register before this slack
+		/// period, but may post registration transactions during the slack period as a last
+		/// resort.
+		#[pallet::constant]
+		type NumRegisterEndSlackBlocks: Get<BlockNumberFor<Self>>;
+
+		/// Priority of unsigned transactions used to register mixnodes.
+		#[pallet::constant]
+		type RegistrationPriority: Get<TransactionPriority>;
+
+		/// Minimum number of mixnodes. If there are fewer than this many mixnodes registered for a
+		/// session, the mixnet will not be active during the session.
+		#[pallet::constant]
+		type MinMixnodes: Get<u32>;
+	}
+
+	/// Index of the current session. This may be offset relative to the session index tracked by
+	/// eg `pallet_session`; mixnet session indices are independent.
+	#[pallet::storage]
+	pub(crate) type CurrentSessionIndex<T> = StorageValue<_, SessionIndex, ValueQuery>;
+
+	/// Block in which the current session started.
+	#[pallet::storage]
+	pub(crate) type CurrentSessionStartBlock<T> = StorageValue<_, BlockNumberFor<T>, ValueQuery>;
+
+	/// Authority list for the next session.
+	#[pallet::storage]
+	pub(crate) type NextAuthorityIds<T> = StorageMap<_, Identity, AuthorityIndex, AuthorityId>;
+
+	/// Mixnode sets by session index. Only the mixnode sets for the previous, current, and next
+	/// sessions are kept; older sets are discarded.
+	///
+	/// The mixnodes in each set are keyed by authority index so we can easily check if an
+	/// authority has registered a mixnode. The authority indices should only be used during
+	/// registration; the authority indices for the very first session are made up.
+	#[pallet::storage]
+	pub(crate) type Mixnodes<T> =
+		StorageDoubleMap<_, Identity, SessionIndex, Identity, AuthorityIndex, BoundedMixnodeFor<T>>;
+
+	#[pallet::genesis_config]
+	#[derive(frame_support::DefaultNoBound)]
+	pub struct GenesisConfig<T: Config> {
+		/// The mixnode set for the very first session.
+		pub mixnodes: BoundedVec<BoundedMixnodeFor<T>, T::MaxAuthorities>,
+	}
+
+	#[pallet::genesis_build]
+	impl<T: Config> BuildGenesisConfig for GenesisConfig<T> {
+		fn build(&self) {
+			assert!(
+				Mixnodes::<T>::iter_prefix_values(0).next().is_none(),
+				"Initial mixnodes already set"
+			);
+			for (i, mixnode) in self.mixnodes.iter().enumerate() {
+				// We just make up authority indices here. This doesn't matter as authority indices
+				// are only used during registration to check an authority doesn't register twice.
+				Mixnodes::<T>::insert(0, i as AuthorityIndex, mixnode);
+			}
+		}
+	}
+
+	#[pallet::call]
+	impl<T: Config> Pallet<T> {
+		/// Register a mixnode for the following session.
+		#[pallet::call_index(0)]
+		#[pallet::weight(1)] // TODO
+		pub fn register(
+			origin: OriginFor<T>,
+			registration: RegistrationFor<T>,
+			_signature: AuthoritySignature,
+		) -> DispatchResult {
+			ensure_none(origin)?;
+
+			// Checked by ValidateUnsigned
+			debug_assert_eq!(registration.session_index, CurrentSessionIndex::<T>::get());
+			debug_assert!(registration.authority_index < T::MaxAuthorities::get());
+
+			Mixnodes::<T>::insert(
+				// Registering for the _following_ session
+				registration.session_index + 1,
+				registration.authority_index,
+				registration.mixnode,
+			);
+
+			Ok(())
+		}
+	}
+
+	#[pallet::validate_unsigned]
+	impl<T: Config> ValidateUnsigned for Pallet<T> {
+		type Call = Call<T>;
+
+		fn validate_unsigned(_source: TransactionSource, call: &Self::Call) -> TransactionValidity {
+			let Self::Call::register { registration, signature } = call else {
+				return InvalidTransaction::Call.into()
+			};
+
+			// Check session index matches
+			match registration.session_index.cmp(&CurrentSessionIndex::<T>::get()) {
+				Ordering::Greater => return InvalidTransaction::Future.into(),
+				Ordering::Less => return InvalidTransaction::Stale.into(),
+				Ordering::Equal => (),
+			}
+
+			// Check authority index is valid
+			if registration.authority_index >= T::MaxAuthorities::get() {
+				return InvalidTransaction::BadProof.into()
+			}
+			let Some(authority_id) = NextAuthorityIds::<T>::get(registration.authority_index)
+			else {
+				return InvalidTransaction::BadProof.into()
+			};
+
+			// Check the authority hasn't registered a mixnode yet
+			if Self::already_registered(registration.session_index, registration.authority_index) {
+				return InvalidTransaction::Stale.into()
+			}
+
+			// Check signature. Note that we don't use regular signed transactions for registration
+			// as we don't want validators to have to pay to register. Spam is prevented by only
+			// allowing one registration per session per validator (see above).
+			let signature_ok = registration.using_encoded(|encoded_registration| {
+				authority_id.verify(&encoded_registration, signature)
+			});
+			if !signature_ok {
+				return InvalidTransaction::BadProof.into()
+			}
+
+			ValidTransaction::with_tag_prefix("MixnetRegistration")
+				.priority(T::RegistrationPriority::get())
+				// Include both authority index _and_ ID in tag in case of forks with different
+				// authority lists
+				.and_provides((
+					registration.session_index,
+					registration.authority_index,
+					authority_id,
+				))
+				.longevity(
+					(T::NextSessionRotation::average_session_length() / 2_u32.into())
+						.try_into()
+						.unwrap_or(64_u64),
+				)
+				.build()
+		}
+	}
+}
+
+impl<T: Config> Pallet<T> {
+	/// Returns the phase of the current session.
+	fn session_phase() -> SessionPhase {
+		let block_in_phase = frame_system::Pallet::<T>::block_number()
+			.saturating_sub(CurrentSessionStartBlock::<T>::get());
+		let Some(block_in_phase) = block_in_phase.checked_sub(&T::NumCoverToCurrentBlocks::get())
+		else {
+			return SessionPhase::CoverToCurrent
+		};
+		let Some(block_in_phase) =
+			block_in_phase.checked_sub(&T::NumRequestsToCurrentBlocks::get())
+		else {
+			return SessionPhase::RequestsToCurrent
+		};
+		if block_in_phase < T::NumCoverToPrevBlocks::get() {
+			SessionPhase::CoverToPrev
+		} else {
+			SessionPhase::DisconnectFromPrev
+		}
+	}
+
+	/// Returns the index and phase of the current session.
+	pub fn session_status() -> SessionStatus {
+		SessionStatus {
+			current_index: CurrentSessionIndex::<T>::get(),
+			phase: Self::session_phase(),
+		}
+	}
+
+	/// Returns the mixnode set for the given session (which should be either the previous or the
+	/// current session).
+	fn mixnodes(session_index: SessionIndex) -> Result<Vec<Mixnode>, MixnodesErr> {
+		let mixnodes: Vec<_> =
+			Mixnodes::<T>::iter_prefix_values(session_index).map(Into::into).collect();
+		if mixnodes.len() < T::MinMixnodes::get() as usize {
+			Err(MixnodesErr::InsufficientRegistrations {
+				num: mixnodes.len() as u32,
+				min: T::MinMixnodes::get(),
+			})
+		} else {
+			Ok(mixnodes)
+		}
+	}
+
+	/// Returns the mixnode set for the previous session.
+	pub fn prev_mixnodes() -> Result<Vec<Mixnode>, MixnodesErr> {
+		let Some(prev_session_index) = CurrentSessionIndex::<T>::get().checked_sub(1) else {
+			return Err(MixnodesErr::InsufficientRegistrations {
+				num: 0,
+				min: T::MinMixnodes::get(),
+			})
+		};
+		Self::mixnodes(prev_session_index)
+	}
+
+	/// Returns the mixnode set for the current session.
+	pub fn current_mixnodes() -> Result<Vec<Mixnode>, MixnodesErr> {
+		Self::mixnodes(CurrentSessionIndex::<T>::get())
+	}
+
+	/// Is now a good time to register, considering only session progress?
+	fn should_register_by_session_progress(
+		block_number: BlockNumberFor<T>,
+		mixnode: &Mixnode,
+	) -> bool {
+		// At the start of each session there are some "slack" blocks during which we avoid
+		// registering
+		let block_in_session = block_number.saturating_sub(CurrentSessionStartBlock::<T>::get());
+		if block_in_session < T::NumRegisterStartSlackBlocks::get() {
+			return false
+		}
+
+		let (Some(end_block), _weight) =
+			T::NextSessionRotation::estimate_next_session_rotation(block_number)
+		else {
+			// Things aren't going to work terribly well in this case as all the authorities will
+			// just pile in after the slack period...
+			return true
+		};
+
+		let remaining_blocks = end_block
+			.saturating_sub(block_number)
+			.saturating_sub(T::NumRegisterEndSlackBlocks::get());
+		if remaining_blocks.is_zero() {
+			// Into the slack time at the end of the session. Not necessarily too late;
+			// registrations are accepted right up until the session ends.
+			return true
+		}
+
+		// Want uniform distribution over the remaining blocks, so pick this block with probability
+		// 1/remaining_blocks. maybe_register may be called multiple times per block; ensure the
+		// same decision gets made each time by using a hash of the block number and the mixnode's
+		// public key as the "random" source. This is slightly biased as remaining_blocks most
+		// likely won't divide into 2^64, but it doesn't really matter...
+		let random = twox(block_number, &mixnode.kx_public);
+		(random % remaining_blocks.try_into().unwrap_or(u64::MAX)) == 0
+	}
+
+	fn next_local_authority() -> Option<(AuthorityIndex, AuthorityId)> {
+		// In the case where multiple local IDs are in the next authority set, we just return the
+		// first one. There's (currently at least) no point in registering multiple times.
+		let mut local_ids = AuthorityId::all();
+		local_ids.sort();
+		NextAuthorityIds::<T>::iter().find(|(_index, id)| local_ids.binary_search(id).is_ok())
+	}
+
+	/// `session_index` should be the index of the current session. `authority_index` is the
+	/// authority index in the _next_ session.
+	fn already_registered(session_index: SessionIndex, authority_index: AuthorityIndex) -> bool {
+		Mixnodes::<T>::contains_key(session_index + 1, authority_index)
+	}
+
+	/// Try to register a mixnode for the next session.
+	///
+	/// If a registration extrinsic is submitted, `true` is returned. The caller should avoid
+	/// calling `maybe_register` again for a few blocks, to give the submitted extrinsic a chance
+	/// to get included.
+	///
+	/// With the above exception, `maybe_register` is designed to be called every block. Most of
+	/// the time it will not do anything, for example:
+	///
+	/// - If it is not an appropriate time to submit a registration extrinsic.
+	/// - If the local node has already registered a mixnode for the next session.
+	/// - If the local node is not permitted to register a mixnode for the next session.
+	///
+	/// `session_index` should match `session_status().current_index`; if it does not, `false` is
+	/// returned immediately.
+	pub fn maybe_register(session_index: SessionIndex, mixnode: Mixnode) -> bool {
+		let current_session_index = CurrentSessionIndex::<T>::get();
+		if session_index != current_session_index {
+			log::trace!(
+				target: LOG_TARGET,
+				"Session {session_index} registration attempted, \
+				but current session is {current_session_index}",
+			);
+			return false
+		}
+
+		let block_number = frame_system::Pallet::<T>::block_number();
+		if !Self::should_register_by_session_progress(block_number, &mixnode) {
+			log::trace!(
+				target: LOG_TARGET,
+				"Waiting for the session to progress further before registering",
+			);
+			return false
+		}
+
+		let Some((authority_index, authority_id)) = Self::next_local_authority() else {
+			log::trace!(
+				target: LOG_TARGET,
+				"Not an authority in the next session; cannot register a mixnode",
+			);
+			return false
+		};
+
+		if Self::already_registered(session_index, authority_index) {
+			log::trace!(
+				target: LOG_TARGET,
+				"Already registered a mixnode for the next session",
+			);
+			return false
+		}
+
+		let registration =
+			Registration { block_number, session_index, authority_index, mixnode: mixnode.into() };
+		let Some(signature) = authority_id.sign(&registration.encode()) else {
+			log::debug!(target: LOG_TARGET, "Failed to sign registration");
+			return false
+		};
+		let call = Call::register { registration, signature };
+		match SubmitTransaction::<T, Call<T>>::submit_unsigned_transaction(call.into()) {
+			Ok(()) => true,
+			Err(()) => {
+				log::debug!(
+					target: LOG_TARGET,
+					"Failed to submit registration transaction",
+				);
+				false
+			},
+		}
+	}
+}
+
+impl<T: Config> sp_runtime::BoundToRuntimeAppPublic for Pallet<T> {
+	type Public = AuthorityId;
+}
+
+impl<T: Config> OneSessionHandler<T::AccountId> for Pallet<T> {
+	type Key = AuthorityId;
+
+	fn on_genesis_session<'a, I: 'a>(validators: I)
+	where
+		I: Iterator<Item = (&'a T::AccountId, Self::Key)>,
+	{
+		assert!(
+			NextAuthorityIds::<T>::iter().next().is_none(),
+			"Initial authority IDs already set"
+		);
+		for (i, (_, authority_id)) in validators.enumerate() {
+			NextAuthorityIds::<T>::insert(i as AuthorityIndex, authority_id);
+		}
+	}
+
+	fn on_new_session<'a, I: 'a>(changed: bool, _validators: I, queued_validators: I)
+	where
+		I: Iterator<Item = (&'a T::AccountId, Self::Key)>,
+	{
+		let session_index = CurrentSessionIndex::<T>::mutate(|index| {
+			*index += 1;
+			*index
+		});
+		CurrentSessionStartBlock::<T>::put(frame_system::Pallet::<T>::block_number());
+
+		// Discard the previous previous mixnode set, which we don't need any more
+		if let Some(prev_prev_session_index) = session_index.checked_sub(2) {
+			check_removed_all(Mixnodes::<T>::clear_prefix(
+				prev_prev_session_index,
+				T::MaxAuthorities::get(),
+				None,
+			));
+		}
+
+		if changed {
+			// Save authority set for the next session. Note that we don't care about the authority
+			// set for the current session; we just care about the key-exchange public keys that
+			// were registered and are stored in Mixnodes.
+			check_removed_all(NextAuthorityIds::<T>::clear(T::MaxAuthorities::get(), None));
+			for (i, (_, authority_id)) in queued_validators.enumerate() {
+				NextAuthorityIds::<T>::insert(i as AuthorityIndex, authority_id);
+			}
+		}
+	}
+
+	fn on_disabled(_i: u32) {
+		// For now, to keep things simple, just ignore
+		// TODO
+	}
+}
diff --git a/substrate/frame/multisig/Cargo.toml b/substrate/frame/multisig/Cargo.toml
index 8846fa2c23c5614265e4fa109b8ad5d6ed3cf93d..83b9a09b1f3ce0ce14e7e8926e65f3ad56b8ddd9 100644
--- a/substrate/frame/multisig/Cargo.toml
+++ b/substrate/frame/multisig/Cargo.toml
@@ -1,11 +1,11 @@
 [package]
 name = "pallet-multisig"
 version = "4.0.0-dev"
-authors = ["Parity Technologies <admin@parity.io>"]
-edition = "2021"
+authors.workspace = true
+edition.workspace = true
 license = "Apache-2.0"
 homepage = "https://substrate.io"
-repository = "https://github.com/paritytech/substrate/"
+repository.workspace = true
 description = "FRAME multi-signature dispatch pallet"
 readme = "README.md"
 
diff --git a/substrate/frame/multisig/README.md b/substrate/frame/multisig/README.md
index 5f320377d3454e5e2d09f9346ef6539a141ac76c..e9095198585b9a4fc3cc0ea5e8379ad99c12bcac 100644
--- a/substrate/frame/multisig/README.md
+++ b/substrate/frame/multisig/README.md
@@ -18,10 +18,10 @@ not available or desired.
 
 ### Dispatchable Functions
 
-* `as_multi` - Approve and if possible dispatch a call from a composite origin formed from a
+- `as_multi` - Approve and if possible dispatch a call from a composite origin formed from a
   number of signed origins.
-* `approve_as_multi` - Approve a call from a composite origin.
-* `cancel_as_multi` - Cancel a call from a composite origin.
+- `approve_as_multi` - Approve a call from a composite origin.
+- `cancel_as_multi` - Cancel a call from a composite origin.
 
 [`Call`]: ./enum.Call.html
 [`Config`]: ./trait.Config.html
diff --git a/substrate/frame/multisig/src/migrations.rs b/substrate/frame/multisig/src/migrations.rs
index 298e73c5d75762408229bfae29b7268e67a0185d..330613bb3dfda94224b223a2f3f1fdf6735179b0 100644
--- a/substrate/frame/multisig/src/migrations.rs
+++ b/substrate/frame/multisig/src/migrations.rs
@@ -19,8 +19,7 @@
 
 use super::*;
 use frame_support::{
-	dispatch::GetStorageVersion,
-	traits::{OnRuntimeUpgrade, WrapperKeepOpaque},
+	traits::{GetStorageVersion, OnRuntimeUpgrade, WrapperKeepOpaque},
 	Identity,
 };
 
@@ -44,16 +43,14 @@ pub mod v1 {
 	impl<T: Config> OnRuntimeUpgrade for MigrateToV1<T> {
 		#[cfg(feature = "try-runtime")]
 		fn pre_upgrade() -> Result<Vec<u8>, sp_runtime::TryRuntimeError> {
-			let onchain = Pallet::<T>::on_chain_storage_version();
-
-			ensure!(onchain < 1, "this migration can be deleted");
-
 			log!(info, "Number of calls to refund and delete: {}", Calls::<T>::iter().count());
 
 			Ok(Vec::new())
 		}
 
 		fn on_runtime_upgrade() -> Weight {
+			use sp_runtime::Saturating;
+
 			let current = Pallet::<T>::current_storage_version();
 			let onchain = Pallet::<T>::on_chain_storage_version();
 
@@ -62,20 +59,24 @@ pub mod v1 {
 				return T::DbWeight::get().reads(1)
 			}
 
+			let mut call_count = 0u64;
 			Calls::<T>::drain().for_each(|(_call_hash, (_data, caller, deposit))| {
 				T::Currency::unreserve(&caller, deposit);
+				call_count.saturating_inc();
 			});
 
 			current.put::<Pallet<T>>();
 
-			<T as frame_system::Config>::BlockWeights::get().max_block
+			T::DbWeight::get().reads_writes(
+				// Reads: Get Calls + Get Version
+				call_count.saturating_add(1),
+				// Writes: Drain Calls + Unreserves + Set version
+				call_count.saturating_mul(2).saturating_add(1),
+			)
 		}
 
 		#[cfg(feature = "try-runtime")]
 		fn post_upgrade(_state: Vec<u8>) -> Result<(), sp_runtime::TryRuntimeError> {
-			let onchain = Pallet::<T>::on_chain_storage_version();
-			ensure!(onchain < 2, "this migration needs to be removed");
-			ensure!(onchain == 1, "this migration needs to be run");
 			ensure!(
 				Calls::<T>::iter().count() == 0,
 				"there are some dangling calls that need to be destroyed and refunded"
diff --git a/substrate/frame/multisig/src/tests.rs b/substrate/frame/multisig/src/tests.rs
index e7fc5b3e4aaea455be251d26e59877c0ec9e765a..1798272552910e57e2bf8e8f22e0a1731a5916f3 100644
--- a/substrate/frame/multisig/src/tests.rs
+++ b/substrate/frame/multisig/src/tests.rs
@@ -31,8 +31,7 @@ use sp_runtime::{BuildStorage, TokenError};
 type Block = frame_system::mocking::MockBlockU32<Test>;
 
 frame_support::construct_runtime!(
-	pub enum Test
-	{
+	pub enum Test {
 		System: frame_system::{Pallet, Call, Config<T>, Storage, Event<T>},
 		Balances: pallet_balances::{Pallet, Call, Storage, Config<T>, Event<T>},
 		Multisig: pallet_multisig::{Pallet, Call, Storage, Event<T>},
@@ -43,24 +42,15 @@ frame_support::construct_runtime!(
 impl frame_system::Config for Test {
 	type Block = Block;
 	type BlockHashCount = ConstU32<250>;
-	type RuntimeOrigin = RuntimeOrigin;
-	type RuntimeCall = RuntimeCall;
-	type RuntimeEvent = RuntimeEvent;
-	type BaseCallFilter = TestBaseCallFilter;
-	type PalletInfo = PalletInfo;
-	type OnSetCode = ();
-
 	type AccountData = pallet_balances::AccountData<u64>;
+	// This pallet wishes to overwrite this.
+	type BaseCallFilter = TestBaseCallFilter;
 }
 
 #[derive_impl(pallet_balances::config_preludes::TestDefaultConfig as pallet_balances::DefaultConfig)]
 impl pallet_balances::Config for Test {
-	type RuntimeEvent = RuntimeEvent;
-	type RuntimeHoldReason = ();
 	type ReserveIdentifier = [u8; 8];
-	type DustRemoval = ();
 	type AccountStore = System;
-	type ExistentialDeposit = ConstU64<1>;
 }
 
 pub struct TestBaseCallFilter;
diff --git a/substrate/frame/nft-fractionalization/Cargo.toml b/substrate/frame/nft-fractionalization/Cargo.toml
index 1edbf2952c2aef37d5d4669be2b6ecfb01372dc2..0e6b85ee76ee08c97b17fe8dce3cededa2a693e3 100644
--- a/substrate/frame/nft-fractionalization/Cargo.toml
+++ b/substrate/frame/nft-fractionalization/Cargo.toml
@@ -1,11 +1,11 @@
 [package]
 name = "pallet-nft-fractionalization"
 version = "4.0.0-dev"
-authors = ["Parity Technologies <admin@parity.io>"]
-edition = "2021"
+authors.workspace = true
+edition.workspace = true
 license = "Apache-2.0"
 homepage = "https://substrate.io"
-repository = "https://github.com/paritytech/substrate/"
+repository.workspace = true
 description = "FRAME pallet to convert non-fungible to fungible tokens."
 readme = "README.md"
 
diff --git a/substrate/frame/nft-fractionalization/README.md b/substrate/frame/nft-fractionalization/README.md
index 180eef22cc46f5e1237975244b582b3be03f2200..3f83ae9d150d59415b0cc3dd3d9d8121b9390e7e 100644
--- a/substrate/frame/nft-fractionalization/README.md
+++ b/substrate/frame/nft-fractionalization/README.md
@@ -1,6 +1,8 @@
-### Lock NFT
+# Lock NFT
 
 Lock an NFT from `pallet-nfts` and mint fungible assets from `pallet-assets`.
 
-The NFT gets locked by putting a system-level attribute named `Locked`. This prevents the NFT from being transferred further.
-The NFT becomes unlocked when the `Locked` attribute is removed. In order to unify the fungible asset and unlock the NFT, an account must hold the full issuance of the asset the NFT was fractionalised into. Holding less of the fungible asset will not allow the unlocking of the NFT. 
+The NFT gets locked by putting a system-level attribute named `Locked`. This prevents the NFT from being transferred
+further. The NFT becomes unlocked when the `Locked` attribute is removed. In order to unify the fungible asset and
+unlock the NFT, an account must hold the full issuance of the asset the NFT was fractionalised into. Holding less of the
+fungible asset will not allow the unlocking of the NFT.
diff --git a/substrate/frame/nft-fractionalization/src/lib.rs b/substrate/frame/nft-fractionalization/src/lib.rs
index b1663e95d855d8af6def429236e11b55ba3ab891..e97d3802fd206ca52ee008da007b46776ea76de8 100644
--- a/substrate/frame/nft-fractionalization/src/lib.rs
+++ b/substrate/frame/nft-fractionalization/src/lib.rs
@@ -1,6 +1,6 @@
 // This file is part of Substrate.
 
-// Copyright (C) 2022 Parity Technologies (UK) Ltd.
+// Copyright (C) Parity Technologies (UK) Ltd.
 // SPDX-License-Identifier: Apache-2.0
 
 // Licensed under the Apache License, Version 2.0 (the "License");
diff --git a/substrate/frame/nft-fractionalization/src/mock.rs b/substrate/frame/nft-fractionalization/src/mock.rs
index 6565adaf6fc7e6bc1ebdcc6f7e7f223ea005e16d..c690f0e580ed6242cc68066893dc563758984ca0 100644
--- a/substrate/frame/nft-fractionalization/src/mock.rs
+++ b/substrate/frame/nft-fractionalization/src/mock.rs
@@ -1,6 +1,6 @@
 // This file is part of Substrate.
 
-// Copyright (C) 2019-2022 Parity Technologies (UK) Ltd.
+// Copyright (C) Parity Technologies (UK) Ltd.
 // SPDX-License-Identifier: Apache-2.0
 
 // Licensed under the Apache License, Version 2.0 (the "License");
diff --git a/substrate/frame/nft-fractionalization/src/tests.rs b/substrate/frame/nft-fractionalization/src/tests.rs
index b82402bda1e678a34a248378424ef02be6416e10..036cc668db2dc9b1dc6c2db4f095168668d0d7c4 100644
--- a/substrate/frame/nft-fractionalization/src/tests.rs
+++ b/substrate/frame/nft-fractionalization/src/tests.rs
@@ -1,6 +1,6 @@
 // This file is part of Substrate.
 
-// Copyright (C) 2019-2022 Parity Technologies (UK) Ltd.
+// Copyright (C) Parity Technologies (UK) Ltd.
 // SPDX-License-Identifier: Apache-2.0
 
 // Licensed under the Apache License, Version 2.0 (the "License");
diff --git a/substrate/frame/nft-fractionalization/src/types.rs b/substrate/frame/nft-fractionalization/src/types.rs
index cbaaf5f5160d3168127b1883b52e879fb92696f1..8df65b15112cb232d23b5429394860d21194ddcb 100644
--- a/substrate/frame/nft-fractionalization/src/types.rs
+++ b/substrate/frame/nft-fractionalization/src/types.rs
@@ -1,6 +1,6 @@
 // This file is part of Substrate.
 
-// Copyright (C) 2017-2022 Parity Technologies (UK) Ltd.
+// Copyright (C) Parity Technologies (UK) Ltd.
 // SPDX-License-Identifier: Apache-2.0
 
 // Licensed under the Apache License, Version 2.0 (the "License");
diff --git a/substrate/frame/nfts/Cargo.toml b/substrate/frame/nfts/Cargo.toml
index 33fb139821172d00dea934312a89f09e6f12ecf4..67113b656fd68e5a1ef1847600b9c90af9a7f0e8 100644
--- a/substrate/frame/nfts/Cargo.toml
+++ b/substrate/frame/nfts/Cargo.toml
@@ -1,11 +1,11 @@
 [package]
 name = "pallet-nfts"
 version = "4.0.0-dev"
-authors = ["Parity Technologies <admin@parity.io>"]
-edition = "2021"
+authors.workspace = true
+edition.workspace = true
 license = "Apache-2.0"
 homepage = "https://substrate.io"
-repository = "https://github.com/paritytech/substrate/"
+repository.workspace = true
 description = "FRAME NFTs pallet"
 readme = "README.md"
 
diff --git a/substrate/frame/nfts/README.md b/substrate/frame/nfts/README.md
index 7de4b9440e7f50a30aee080601df44537defc282..93ccf29498525f80af2f415476dab3805c40cffb 100644
--- a/substrate/frame/nfts/README.md
+++ b/substrate/frame/nfts/README.md
@@ -13,9 +13,11 @@ The NFTs pallet provides functionality for non-fungible tokens' management, incl
 * Attributes Management
 * NFT Burning
 
-To use it in your runtime, you need to implement [`nfts::Config`](https://paritytech.github.io/substrate/master/pallet_nfts/pallet/trait.Config.html).
+To use it in your runtime, you need to implement
+[`nfts::Config`](https://paritytech.github.io/substrate/master/pallet_nfts/pallet/trait.Config.html).
 
-The supported dispatchable functions are documented in the [`nfts::Call`](https://paritytech.github.io/substrate/master/pallet_nfts/pallet/enum.Call.html) enum.
+The supported dispatchable functions are documented in the
+[`nfts::Call`](https://paritytech.github.io/substrate/master/pallet_nfts/pallet/enum.Call.html) enum.
 
 ### Terminology
 
@@ -24,8 +26,9 @@ The supported dispatchable functions are documented in the [`nfts::Call`](https:
 * **NFT transfer:** The action of sending an item from one account to another.
 * **Atomic swap:** The action of exchanging items between accounts without needing a 3rd party service.
 * **NFT burning:** The destruction of an item.
-* **Non-fungible token (NFT):** An item for which each unit has unique characteristics. There is exactly
-  one instance of such an item in existence and there is exactly one owning account (though that owning account could be a proxy account or multi-sig account).
+* **Non-fungible token (NFT):** An item for which each unit has unique characteristics. There is exactly one instance of
+  such an item in existence and there is exactly one owning account (though that owning account could be a proxy account
+  or multi-sig account).
 * **Soul Bound NFT:** An item that is non-transferable from the account which it is minted into.
 
 ### Goals
@@ -35,10 +38,8 @@ The NFTs pallet in Substrate is designed to make the following possible:
 * Allow accounts to permissionlessly create nft collections.
 * Allow a named (permissioned) account to mint and burn unique items within a collection.
 * Move items between accounts permissionlessly.
-* Allow a named (permissioned) account to freeze and unfreeze items within a
-  collection or the entire collection.
-* Allow the owner of an item to delegate the ability to transfer the item to some
-  named third-party.
+* Allow a named (permissioned) account to freeze and unfreeze items within a collection or the entire collection.
+* Allow the owner of an item to delegate the ability to transfer the item to some named third-party.
 * Allow third-parties to store information in an NFT _without_ owning it (Eg. save game state).
 
 ## Interface
@@ -71,7 +72,8 @@ The NFTs pallet in Substrate is designed to make the following possible:
 * `clear_all_transfer_approvals`: Clears all transfer approvals set by calling the `approve_transfer`.
 * `lock_collection`: Prevent all items within a collection from being transferred (making them all `soul bound`).
 * `lock_item_properties`: Lock item's metadata or attributes.
-* `transfer_ownership`: Alter the owner of a collection, moving all associated deposits. (Ownership of individual items will not be affected.)
+* `transfer_ownership`: Alter the owner of a collection, moving all associated deposits. (Ownership of individual items
+  will not be affected.)
 * `set_team`: Alter the permissioned accounts of a collection.
 * `set_collection_max_supply`: Change the max supply of a collection.
 * `update_mint_settings`: Update the minting settings for collection.
@@ -94,8 +96,8 @@ The NFTs pallet in Substrate is designed to make the following possible:
 * `force_collection_config`: Change collection's config.
 * `force_set_attribute`: Set an attribute.
 
-Please refer to the [`Call`](https://paritytech.github.io/substrate/master/pallet_nfts/pallet/enum.Call.html) enum
-and its associated variants for documentation on each function.
+Please refer to the [`Call`](https://paritytech.github.io/substrate/master/pallet_nfts/pallet/enum.Call.html) enum and
+its associated variants for documentation on each function.
 
 ## Related Modules
 
diff --git a/substrate/frame/nfts/runtime-api/Cargo.toml b/substrate/frame/nfts/runtime-api/Cargo.toml
index b4485f6c127a5b419dbca0c28237cdbef63cd3ff..483c4bd323423e02bf538f670d045e0ed98391d8 100644
--- a/substrate/frame/nfts/runtime-api/Cargo.toml
+++ b/substrate/frame/nfts/runtime-api/Cargo.toml
@@ -1,11 +1,11 @@
 [package]
 name = "pallet-nfts-runtime-api"
 version = "4.0.0-dev"
-authors = ["Parity Technologies <admin@parity.io>"]
-edition = "2021"
+authors.workspace = true
+edition.workspace = true
 license = "Apache-2.0"
 homepage = "https://substrate.io"
-repository = "https://github.com/paritytech/substrate/"
+repository.workspace = true
 description = "Runtime API for the FRAME NFTs pallet."
 readme = "README.md"
 
@@ -14,10 +14,9 @@ targets = ["x86_64-unknown-linux-gnu"]
 
 [dependencies]
 codec = { package = "parity-scale-codec", version = "3.6.1", default-features = false, features = ["derive"] }
-frame-support = { path = "../../support", default-features = false}
 pallet-nfts = { path = "..", default-features = false}
 sp-api = { path = "../../../primitives/api", default-features = false}
 
 [features]
 default = [ "std" ]
-std = [ "codec/std", "frame-support/std", "pallet-nfts/std", "sp-api/std" ]
+std = [ "codec/std", "pallet-nfts/std", "sp-api/std" ]
diff --git a/substrate/frame/nfts/runtime-api/src/lib.rs b/substrate/frame/nfts/runtime-api/src/lib.rs
index 0c23d178107e714e44a78b41b74d1210b56178d4..cf2d444b42f8c32f3e7a0c90a9a20f0979727c3e 100644
--- a/substrate/frame/nfts/runtime-api/src/lib.rs
+++ b/substrate/frame/nfts/runtime-api/src/lib.rs
@@ -1,6 +1,6 @@
 // This file is part of Substrate.
 
-// Copyright (C) 2023 Parity Technologies (UK) Ltd.
+// Copyright (C) Parity Technologies (UK) Ltd.
 // SPDX-License-Identifier: Apache-2.0
 
 // Licensed under the Apache License, Version 2.0 (the "License");
@@ -20,7 +20,7 @@
 #![cfg_attr(not(feature = "std"), no_std)]
 
 use codec::{Decode, Encode};
-use frame_support::dispatch::Vec;
+use sp_api::vec::Vec;
 
 sp_api::decl_runtime_apis! {
 	pub trait NftsApi<AccountId, CollectionId, ItemId>
diff --git a/substrate/frame/nfts/src/benchmarking.rs b/substrate/frame/nfts/src/benchmarking.rs
index 995c842036746c86ca9ab3441a72fe4a52f2a820..8792af675fc16de7c18f07312aa74e4bab46d3db 100644
--- a/substrate/frame/nfts/src/benchmarking.rs
+++ b/substrate/frame/nfts/src/benchmarking.rs
@@ -26,8 +26,7 @@ use frame_benchmarking::v1::{
 };
 use frame_support::{
 	assert_ok,
-	dispatch::UnfilteredDispatchable,
-	traits::{EnsureOrigin, Get},
+	traits::{EnsureOrigin, Get, UnfilteredDispatchable},
 	BoundedVec,
 };
 use frame_system::{pallet_prelude::BlockNumberFor, RawOrigin as SystemOrigin};
diff --git a/substrate/frame/nfts/src/migration.rs b/substrate/frame/nfts/src/migration.rs
index f90d332062a2cbd1f12e629518847394598efdb7..94635a96aeba991fb458f2cc7830922060727dd7 100644
--- a/substrate/frame/nfts/src/migration.rs
+++ b/substrate/frame/nfts/src/migration.rs
@@ -97,9 +97,6 @@ pub mod v1 {
 
 		#[cfg(feature = "try-runtime")]
 		fn pre_upgrade() -> Result<Vec<u8>, TryRuntimeError> {
-			let current_version = Pallet::<T>::current_storage_version();
-			let onchain_version = Pallet::<T>::on_chain_storage_version();
-			ensure!(onchain_version == 0 && current_version == 1, "migration from version 0 to 1.");
 			let prev_count = Collection::<T>::iter().count();
 			Ok((prev_count as u32).encode())
 		}
@@ -115,7 +112,7 @@ pub mod v1 {
 				"the records count before and after the migration should be the same"
 			);
 
-			ensure!(Pallet::<T>::on_chain_storage_version() == 1, "wrong storage version");
+			ensure!(Pallet::<T>::on_chain_storage_version() >= 1, "wrong storage version");
 
 			Ok(())
 		}
diff --git a/substrate/frame/nfts/src/tests.rs b/substrate/frame/nfts/src/tests.rs
index f7879570a4cb74efc2714d35b0d42d2c4a80b946..a82fcca0151211b5ea0bb642889a965158e7519a 100644
--- a/substrate/frame/nfts/src/tests.rs
+++ b/substrate/frame/nfts/src/tests.rs
@@ -17,11 +17,10 @@
 
 //! Tests for Nfts pallet.
 
-use crate::{mock::*, Event, *};
+use crate::{mock::*, Event, SystemConfig, *};
 use enumflags2::BitFlags;
 use frame_support::{
 	assert_noop, assert_ok,
-	dispatch::Dispatchable,
 	traits::{
 		tokens::nonfungibles_v2::{Create, Destroy, Mutate},
 		Currency, Get,
@@ -29,7 +28,10 @@ use frame_support::{
 };
 use pallet_balances::Error as BalancesError;
 use sp_core::{bounded::BoundedVec, Pair};
-use sp_runtime::{traits::IdentifyAccount, MultiSignature, MultiSigner};
+use sp_runtime::{
+	traits::{Dispatchable, IdentifyAccount},
+	MultiSignature, MultiSigner,
+};
 use sp_std::prelude::*;
 
 type AccountIdOf<Test> = <Test as frame_system::Config>::AccountId;
diff --git a/substrate/frame/nicks/Cargo.toml b/substrate/frame/nicks/Cargo.toml
index 9756a06c580aef78d90988adc6f6b60fa90e8128..c8e8fa0467a5a5fdd39a567222577562f4fbea84 100644
--- a/substrate/frame/nicks/Cargo.toml
+++ b/substrate/frame/nicks/Cargo.toml
@@ -1,11 +1,11 @@
 [package]
 name = "pallet-nicks"
 version = "4.0.0-dev"
-authors = ["Parity Technologies <admin@parity.io>"]
-edition = "2021"
+authors.workspace = true
+edition.workspace = true
 license = "Apache-2.0"
 homepage = "https://substrate.io"
-repository = "https://github.com/paritytech/substrate/"
+repository.workspace = true
 description = "FRAME pallet for nick management"
 readme = "README.md"
 
diff --git a/substrate/frame/nicks/README.md b/substrate/frame/nicks/README.md
index 768043ffb9bf96964abbc60a2b39e124143d1e9c..2b05f32d33448e9041b041653dcb1ffd8d3fba26 100644
--- a/substrate/frame/nicks/README.md
+++ b/substrate/frame/nicks/README.md
@@ -14,10 +14,10 @@ have not been designed to be economically secure. Do not use this pallet as-is i
 
 ### Dispatchable Functions
 
-* `set_name` - Set the associated name of an account; a small deposit is reserved if not already
+- `set_name` - Set the associated name of an account; a small deposit is reserved if not already
   taken.
-* `clear_name` - Remove an account's associated name; the deposit is returned.
-* `kill_name` - Forcibly remove the associated name; the deposit is lost.
+- `clear_name` - Remove an account's associated name; the deposit is returned.
+- `kill_name` - Forcibly remove the associated name; the deposit is lost.
 
 [`Call`]: ./enum.Call.html
 [`Config`]: ./trait.Config.html
diff --git a/substrate/frame/nis/Cargo.toml b/substrate/frame/nis/Cargo.toml
index 3ca1960e89ef1c3207b357f40af8330e5e17b73c..c8465285ffa325c3ba72a8f61e6483e93dd44485 100644
--- a/substrate/frame/nis/Cargo.toml
+++ b/substrate/frame/nis/Cargo.toml
@@ -1,11 +1,11 @@
 [package]
 name = "pallet-nis"
 version = "4.0.0-dev"
-authors = ["Parity Technologies <admin@parity.io>"]
-edition = "2021"
+authors.workspace = true
+edition.workspace = true
 license = "Apache-2.0"
 homepage = "https://substrate.io"
-repository = "https://github.com/paritytech/substrate/"
+repository.workspace = true
 description = "FRAME pallet for rewarding account freezing."
 readme = "README.md"
 
diff --git a/substrate/frame/nis/README.md b/substrate/frame/nis/README.md
index 0c3f0c383a16cf9cb3bc92e201c2844acc21e1c4..032df7d01868f8643284985985fc98b3f6ccc0ac 100644
--- a/substrate/frame/nis/README.md
+++ b/substrate/frame/nis/README.md
@@ -2,4 +2,4 @@
 
 Provides a non-interactiove variant of staking.
 
-License: Apache-2.0
\ No newline at end of file
+License: Apache-2.0
diff --git a/substrate/frame/node-authorization/Cargo.toml b/substrate/frame/node-authorization/Cargo.toml
index cae46420fef3b0ef78717fe7e1c763febf2f90e4..d666437e42eab60e1bfade19eb8ad359e32b1843 100644
--- a/substrate/frame/node-authorization/Cargo.toml
+++ b/substrate/frame/node-authorization/Cargo.toml
@@ -1,11 +1,11 @@
 [package]
 name = "pallet-node-authorization"
 version = "4.0.0-dev"
-authors = ["Parity Technologies <admin@parity.io>"]
-edition = "2021"
+authors.workspace = true
+edition.workspace = true
 license = "Apache-2.0"
 homepage = "https://substrate.io"
-repository = "https://github.com/paritytech/substrate/"
+repository.workspace = true
 description = "FRAME pallet for node authorization"
 
 [package.metadata.docs.rs]
diff --git a/substrate/frame/nomination-pools/Cargo.toml b/substrate/frame/nomination-pools/Cargo.toml
index 01e998a52164fb4cffdc96c0f62e2e14cffab46b..4923af0ab0c533ac374cdf0aac0adc15c7af014d 100644
--- a/substrate/frame/nomination-pools/Cargo.toml
+++ b/substrate/frame/nomination-pools/Cargo.toml
@@ -1,11 +1,11 @@
 [package]
 name = "pallet-nomination-pools"
 version = "1.0.0"
-authors = ["Parity Technologies <admin@parity.io>"]
-edition = "2021"
+authors.workspace = true
+edition.workspace = true
 license = "Apache-2.0"
 homepage = "https://substrate.io"
-repository = "https://github.com/paritytech/substrate/"
+repository.workspace = true
 description = "FRAME nomination pools pallet"
 
 [package.metadata.docs.rs]
diff --git a/substrate/frame/nomination-pools/benchmarking/Cargo.toml b/substrate/frame/nomination-pools/benchmarking/Cargo.toml
index d9ddc828679fb76e31a954ec5311dbca76a62a53..6375411b7e239e4926b484ab08a4f63cc9c0222d 100644
--- a/substrate/frame/nomination-pools/benchmarking/Cargo.toml
+++ b/substrate/frame/nomination-pools/benchmarking/Cargo.toml
@@ -1,11 +1,11 @@
 [package]
 name = "pallet-nomination-pools-benchmarking"
 version = "1.0.0"
-authors = ["Parity Technologies <admin@parity.io>"]
-edition = "2021"
+authors.workspace = true
+edition.workspace = true
 license = "Apache-2.0"
 homepage = "https://substrate.io"
-repository = "https://github.com/paritytech/substrate/"
+repository.workspace = true
 description = "FRAME nomination pools pallet benchmarking"
 readme = "README.md"
 
diff --git a/substrate/frame/nomination-pools/benchmarking/src/lib.rs b/substrate/frame/nomination-pools/benchmarking/src/lib.rs
index 45f0ca0ecfe6ef050953f484bf98a43a1f5dd2bb..fc86a6f56c0bed09cd86963cc4d26b97219f76e6 100644
--- a/substrate/frame/nomination-pools/benchmarking/src/lib.rs
+++ b/substrate/frame/nomination-pools/benchmarking/src/lib.rs
@@ -27,7 +27,10 @@ use frame_benchmarking::v1::{account, whitelist_account};
 use frame_election_provider_support::SortedListProvider;
 use frame_support::{
 	assert_ok, ensure,
-	traits::{Currency, Get},
+	traits::{
+		fungible::{Inspect, Mutate, Unbalanced},
+		Get,
+	},
 };
 use frame_system::RawOrigin as RuntimeOrigin;
 use pallet_nomination_pools::{
@@ -67,7 +70,7 @@ fn create_funded_user_with_balance<T: pallet_nomination_pools::Config>(
 	balance: BalanceOf<T>,
 ) -> T::AccountId {
 	let user = account(string, n, USER_SEED);
-	T::Currency::make_free_balance_be(&user, balance);
+	T::Currency::set_balance(&user, balance);
 	user
 }
 
@@ -148,8 +151,7 @@ impl<T: Config> ListScenario<T> {
 		);
 
 		// Burn the entire issuance.
-		let i = CurrencyOf::<T>::burn(CurrencyOf::<T>::total_issuance());
-		sp_std::mem::forget(i);
+		CurrencyOf::<T>::set_total_issuance(Zero::zero());
 
 		// Create accounts with the origin weight
 		let (pool_creator1, pool_origin1) =
@@ -206,7 +208,7 @@ impl<T: Config> ListScenario<T> {
 
 		let joiner: T::AccountId = account("joiner", USER_SEED, 0);
 		self.origin1_member = Some(joiner.clone());
-		CurrencyOf::<T>::make_free_balance_be(&joiner, amount * 2u32.into());
+		CurrencyOf::<T>::set_balance(&joiner, amount * 2u32.into());
 
 		let original_bonded = T::Staking::active_stake(&self.origin1).unwrap();
 
@@ -254,7 +256,7 @@ frame_benchmarking::benchmarks! {
 		whitelist_account!(joiner);
 	}: _(RuntimeOrigin::Signed(joiner.clone()), max_additional, 1)
 	verify {
-		assert_eq!(CurrencyOf::<T>::free_balance(&joiner), joiner_free - max_additional);
+		assert_eq!(CurrencyOf::<T>::balance(&joiner), joiner_free - max_additional);
 		assert_eq!(
 			T::Staking::active_stake(&scenario.origin1).unwrap(),
 			scenario.dest_weight
@@ -289,7 +291,7 @@ frame_benchmarking::benchmarks! {
 		// transfer exactly `extra` to the depositor of the src pool (1),
 		let reward_account1 = Pools::<T>::create_reward_account(1);
 		assert!(extra >= CurrencyOf::<T>::minimum_balance());
-		CurrencyOf::<T>::deposit_creating(&reward_account1, extra);
+		let _ = CurrencyOf::<T>::mint_into(&reward_account1, extra);
 
 	}: _(RuntimeOrigin::Signed(claimer), T::Lookup::unlookup(scenario.creator1.clone()), BondExtra::Rewards)
 	verify {
@@ -309,7 +311,7 @@ frame_benchmarking::benchmarks! {
 		let reward_account = Pools::<T>::create_reward_account(1);
 
 		// Send funds to the reward account of the pool
-		CurrencyOf::<T>::make_free_balance_be(&reward_account, ed + origin_weight);
+		CurrencyOf::<T>::set_balance(&reward_account, ed + origin_weight);
 
 		// set claim preferences to `PermissionlessAll` so any account can claim rewards on member's
 		// behalf.
@@ -317,7 +319,7 @@ frame_benchmarking::benchmarks! {
 
 		// Sanity check
 		assert_eq!(
-			CurrencyOf::<T>::free_balance(&depositor),
+			CurrencyOf::<T>::balance(&depositor),
 			origin_weight
 		);
 
@@ -325,11 +327,11 @@ frame_benchmarking::benchmarks! {
 	}:claim_payout_other(RuntimeOrigin::Signed(claimer), depositor.clone())
 	verify {
 		assert_eq!(
-			CurrencyOf::<T>::free_balance(&depositor),
+			CurrencyOf::<T>::balance(&depositor),
 			origin_weight + commission * origin_weight
 		);
 		assert_eq!(
-			CurrencyOf::<T>::free_balance(&reward_account),
+			CurrencyOf::<T>::balance(&reward_account),
 			ed + commission * origin_weight
 		);
 	}
@@ -383,7 +385,7 @@ frame_benchmarking::benchmarks! {
 			T::Staking::active_stake(&pool_account).unwrap(),
 			min_create_bond + min_join_bond
 		);
-		assert_eq!(CurrencyOf::<T>::free_balance(&joiner), min_join_bond);
+		assert_eq!(CurrencyOf::<T>::balance(&joiner), min_join_bond);
 
 		// Unbond the new member
 		Pools::<T>::fully_unbond(RuntimeOrigin::Signed(joiner.clone()).into(), joiner.clone()).unwrap();
@@ -403,7 +405,7 @@ frame_benchmarking::benchmarks! {
 	}: _(RuntimeOrigin::Signed(pool_account.clone()), 1, s)
 	verify {
 		// The joiners funds didn't change
-		assert_eq!(CurrencyOf::<T>::free_balance(&joiner), min_join_bond);
+		assert_eq!(CurrencyOf::<T>::balance(&joiner), min_join_bond);
 		// The unlocking chunk was removed
 		assert_eq!(pallet_staking::Ledger::<T>::get(pool_account).unwrap().unlocking.len(), 0);
 	}
@@ -426,7 +428,7 @@ frame_benchmarking::benchmarks! {
 			T::Staking::active_stake(&pool_account).unwrap(),
 			min_create_bond + min_join_bond
 		);
-		assert_eq!(CurrencyOf::<T>::free_balance(&joiner), min_join_bond);
+		assert_eq!(CurrencyOf::<T>::balance(&joiner), min_join_bond);
 
 		// Unbond the new member
 		pallet_staking::CurrentEra::<T>::put(0);
@@ -447,8 +449,7 @@ frame_benchmarking::benchmarks! {
 	}: withdraw_unbonded(RuntimeOrigin::Signed(joiner.clone()), joiner_lookup, s)
 	verify {
 		assert_eq!(
-			CurrencyOf::<T>::free_balance(&joiner),
-			min_join_bond * 2u32.into()
+			CurrencyOf::<T>::balance(&joiner), min_join_bond * 2u32.into()
 		);
 		// The unlocking chunk was removed
 		assert_eq!(pallet_staking::Ledger::<T>::get(&pool_account).unwrap().unlocking.len(), 0);
@@ -485,7 +486,7 @@ frame_benchmarking::benchmarks! {
 			Zero::zero()
 		);
 		assert_eq!(
-			CurrencyOf::<T>::free_balance(&pool_account),
+			CurrencyOf::<T>::balance(&pool_account),
 			min_create_bond
 		);
 		assert_eq!(pallet_staking::Ledger::<T>::get(&pool_account).unwrap().unlocking.len(), 1);
@@ -515,7 +516,7 @@ frame_benchmarking::benchmarks! {
 
 		// Funds where transferred back correctly
 		assert_eq!(
-			CurrencyOf::<T>::free_balance(&depositor),
+			CurrencyOf::<T>::balance(&depositor),
 			// gets bond back + rewards collecting when unbonding
 			min_create_bond * 2u32.into() + CurrencyOf::<T>::minimum_balance()
 		);
@@ -527,7 +528,7 @@ frame_benchmarking::benchmarks! {
 		let depositor_lookup = T::Lookup::unlookup(depositor.clone());
 
 		// Give the depositor some balance to bond
-		CurrencyOf::<T>::make_free_balance_be(&depositor, min_create_bond * 2u32.into());
+		CurrencyOf::<T>::set_balance(&depositor, min_create_bond * 2u32.into());
 
 		// Make sure no Pools exist at a pre-condition for our verify checks
 		assert_eq!(RewardPools::<T>::count(), 0);
@@ -782,7 +783,7 @@ frame_benchmarking::benchmarks! {
 		let ed = CurrencyOf::<T>::minimum_balance();
 		let (depositor, pool_account) = create_pool_account::<T>(0, origin_weight, Some(commission));
 		let reward_account = Pools::<T>::create_reward_account(1);
-		CurrencyOf::<T>::make_free_balance_be(&reward_account, ed + origin_weight);
+		CurrencyOf::<T>::set_balance(&reward_account, ed + origin_weight);
 
 		// member claims a payout to make some commission available.
 		let _ = Pools::<T>::claim_payout(RuntimeOrigin::Signed(claimer).into());
@@ -791,15 +792,29 @@ frame_benchmarking::benchmarks! {
 	}:_(RuntimeOrigin::Signed(depositor.clone()), 1u32.into())
 	verify {
 		assert_eq!(
-			CurrencyOf::<T>::free_balance(&depositor),
+			CurrencyOf::<T>::balance(&depositor),
 			origin_weight + commission * origin_weight
 		);
 		assert_eq!(
-			CurrencyOf::<T>::free_balance(&reward_account),
+			CurrencyOf::<T>::balance(&reward_account),
 			ed + commission * origin_weight
 		);
 	}
 
+	adjust_pool_deposit {
+		// Create a pool
+		let (depositor, _) = create_pool_account::<T>(0, Pools::<T>::depositor_min_bond() * 2u32.into(), None);
+
+		// Remove ed freeze to create a scenario where the ed deposit needs to be adjusted.
+		let _ = Pools::<T>::unfreeze_pool_deposit(&Pools::<T>::create_reward_account(1));
+		assert!(&Pools::<T>::check_ed_imbalance().is_err());
+
+		whitelist_account!(depositor);
+	}:_(RuntimeOrigin::Signed(depositor), 1)
+	verify {
+		assert!(&Pools::<T>::check_ed_imbalance().is_ok());
+	}
+
 	impl_benchmark_test_suite!(
 		Pallet,
 		crate::mock::new_test_ext(),
diff --git a/substrate/frame/nomination-pools/benchmarking/src/mock.rs b/substrate/frame/nomination-pools/benchmarking/src/mock.rs
index 2d75df63b518a698c5755cb12557e6aa7cb58b9e..1e6a5c249998bb5ef604eeda69828b0441f5ee99 100644
--- a/substrate/frame/nomination-pools/benchmarking/src/mock.rs
+++ b/substrate/frame/nomination-pools/benchmarking/src/mock.rs
@@ -74,8 +74,8 @@ impl pallet_balances::Config for Runtime {
 	type ExistentialDeposit = ExistentialDeposit;
 	type AccountStore = System;
 	type WeightInfo = ();
-	type FreezeIdentifier = ();
-	type MaxFreezes = ();
+	type FreezeIdentifier = RuntimeFreezeReason;
+	type MaxFreezes = ConstU32<1>;
 	type RuntimeHoldReason = ();
 	type MaxHolds = ();
 }
@@ -160,6 +160,7 @@ impl pallet_nomination_pools::Config for Runtime {
 	type RuntimeEvent = RuntimeEvent;
 	type WeightInfo = ();
 	type Currency = Balances;
+	type RuntimeFreezeReason = RuntimeFreezeReason;
 	type RewardCounter = FixedU128;
 	type BalanceToU256 = BalanceToU256;
 	type U256ToBalance = U256ToBalance;
@@ -183,7 +184,7 @@ frame_support::construct_runtime!(
 		Balances: pallet_balances::{Pallet, Call, Storage, Config<T>, Event<T>},
 		Staking: pallet_staking::{Pallet, Call, Config<T>, Storage, Event<T>},
 		VoterList: pallet_bags_list::<Instance1>::{Pallet, Call, Storage, Event<T>},
-		Pools: pallet_nomination_pools::{Pallet, Call, Storage, Event<T>},
+		Pools: pallet_nomination_pools::{Pallet, Call, Storage, Event<T>, FreezeReason},
 	}
 );
 
diff --git a/substrate/frame/nomination-pools/fuzzer/Cargo.toml b/substrate/frame/nomination-pools/fuzzer/Cargo.toml
index 7dde8733e3f6098011ecaf7844c23786871aad26..b9d0a6197f8de8fbc1699ddadb2f66d5c29e1160 100644
--- a/substrate/frame/nomination-pools/fuzzer/Cargo.toml
+++ b/substrate/frame/nomination-pools/fuzzer/Cargo.toml
@@ -1,11 +1,11 @@
 [package]
 name = "pallet-nomination-pools-fuzzer"
 version = "2.0.0"
-authors = ["Parity Technologies <admin@parity.io>"]
-edition = "2021"
+authors.workspace = true
+edition.workspace = true
 license = "Apache-2.0"
 homepage = "https://substrate.io"
-repository = "https://github.com/paritytech/substrate/"
+repository.workspace = true
 description = "Fuzzer for fixed point arithmetic primitives."
 documentation = "https://docs.rs/sp-arithmetic-fuzzer"
 publish = false
diff --git a/substrate/frame/nomination-pools/runtime-api/Cargo.toml b/substrate/frame/nomination-pools/runtime-api/Cargo.toml
index c3ca47e824cbe95ccc10a29df2f02ec5d8124bda..c3aa8035c95aaa78063480f1158c32ae6efc1bee 100644
--- a/substrate/frame/nomination-pools/runtime-api/Cargo.toml
+++ b/substrate/frame/nomination-pools/runtime-api/Cargo.toml
@@ -1,11 +1,11 @@
 [package]
 name = "pallet-nomination-pools-runtime-api"
 version = "1.0.0-dev"
-authors = ["Parity Technologies <admin@parity.io>"]
-edition = "2021"
+authors.workspace = true
+edition.workspace = true
 license = "Apache-2.0"
 homepage = "https://substrate.io"
-repository = "https://github.com/paritytech/substrate/"
+repository.workspace = true
 description = "Runtime API for nomination-pools FRAME pallet"
 readme = "README.md"
 
diff --git a/substrate/frame/nomination-pools/runtime-api/README.md b/substrate/frame/nomination-pools/runtime-api/README.md
index af90b31733b0b306eec13f43ccbd6bb6a857f1ac..499af052a73ef06b332becc9b900857947c87d15 100644
--- a/substrate/frame/nomination-pools/runtime-api/README.md
+++ b/substrate/frame/nomination-pools/runtime-api/README.md
@@ -1,3 +1,3 @@
 Runtime API definition for nomination-pools pallet.
 
-License: Apache-2.0
\ No newline at end of file
+License: Apache-2.0
diff --git a/substrate/frame/nomination-pools/src/lib.rs b/substrate/frame/nomination-pools/src/lib.rs
index c4bebc5a1d0304070b47bbc546dd7c56e90ecf63..909a930e3821f8611b30ed39415eaab3f4b38636 100644
--- a/substrate/frame/nomination-pools/src/lib.rs
+++ b/substrate/frame/nomination-pools/src/lib.rs
@@ -353,12 +353,16 @@
 
 use codec::Codec;
 use frame_support::{
-	defensive, ensure,
+	defensive, defensive_assert, ensure,
 	pallet_prelude::{MaxEncodedLen, *},
 	storage::bounded_btree_map::BoundedBTreeMap,
 	traits::{
-		Currency, Defensive, DefensiveOption, DefensiveResult, DefensiveSaturating,
-		ExistenceRequirement, Get,
+		fungible::{
+			Inspect as FunInspect, InspectFreeze, Mutate as FunMutate,
+			MutateFreeze as FunMutateFreeze,
+		},
+		tokens::{Fortitude, Preservation},
+		Defensive, DefensiveOption, DefensiveResult, DefensiveSaturating, Get,
 	},
 	DefaultNoBound, PalletError,
 };
@@ -380,7 +384,6 @@ use sp_runtime::TryRuntimeError;
 
 /// The log target of this pallet.
 pub const LOG_TARGET: &str = "runtime::nomination-pools";
-
 // syntactic sugar for logging.
 #[macro_export]
 macro_rules! log {
@@ -405,7 +408,7 @@ pub use weights::WeightInfo;
 
 /// The balance type used by the currency system.
 pub type BalanceOf<T> =
-	<<T as Config>::Currency as Currency<<T as frame_system::Config>::AccountId>>::Balance;
+	<<T as Config>::Currency as FunInspect<<T as frame_system::Config>::AccountId>>::Balance;
 /// Type used for unique identifier of each pool.
 pub type PoolId = u32;
 
@@ -535,6 +538,31 @@ impl<T: Config> PoolMember<T> {
 		}
 	}
 
+	/// Total balance of the member, both active and unbonding.
+	/// Doesn't mutate state.
+	#[cfg(any(feature = "try-runtime", feature = "fuzzing", test, debug_assertions))]
+	fn total_balance(&self) -> BalanceOf<T> {
+		let pool = BondedPool::<T>::get(self.pool_id).unwrap();
+		let active_balance = pool.points_to_balance(self.active_points());
+
+		let sub_pools = match SubPoolsStorage::<T>::get(self.pool_id) {
+			Some(sub_pools) => sub_pools,
+			None => return active_balance,
+		};
+
+		let unbonding_balance = self.unbonding_eras.iter().fold(
+			BalanceOf::<T>::zero(),
+			|accumulator, (era, unlocked_points)| {
+				// if the `SubPools::with_era` has already been merged into the
+				// `SubPools::no_era` use this pool instead.
+				let era_pool = sub_pools.with_era.get(era).unwrap_or(&sub_pools.no_era);
+				accumulator + (era_pool.point_to_balance(*unlocked_points))
+			},
+		);
+
+		active_balance + unbonding_balance
+	}
+
 	/// Total points of this member, both active and unbonding.
 	fn total_points(&self) -> BalanceOf<T> {
 		self.active_points().saturating_add(self.unbonding_points())
@@ -1005,10 +1033,15 @@ impl<T: Config> BondedPool<T> {
 		self
 	}
 
-	/// The pools balance that is transferrable.
-	fn transferrable_balance(&self) -> BalanceOf<T> {
+	/// The pools balance that is transferable provided it is expendable by staking pallet.
+	fn transferable_balance(&self) -> BalanceOf<T> {
 		let account = self.bonded_account();
-		T::Currency::free_balance(&account)
+		// Note on why we can't use `Currency::reducible_balance`: Since pooled account has a
+		// provider (staking pallet), the account can not be set expendable by
+		// `pallet-nomination-pool`. This means reducible balance always returns balance preserving
+		// ED in the account. What we want though is transferable balance given the account can be
+		// dusted.
+		T::Currency::balance(&account)
 			.saturating_sub(T::Staking::active_stake(&account).unwrap_or_default())
 	}
 
@@ -1181,11 +1214,11 @@ impl<T: Config> BondedPool<T> {
 		Ok(())
 	}
 
-	/// Bond exactly `amount` from `who`'s funds into this pool.
+	/// Bond exactly `amount` from `who`'s funds into this pool. Increases the [`TotalValueLocked`]
+	/// by `amount`.
 	///
-	/// If the bond type is `Create`, `Staking::bond` is called, and `who`
-	/// is allowed to be killed. Otherwise, `Staking::bond_extra` is called and `who`
-	/// cannot be killed.
+	/// If the bond is [`BondType::Create`], [`Staking::bond`] is called, and `who` is allowed to be
+	/// killed. Otherwise, [`Staking::bond_extra`] is called and `who` cannot be killed.
 	///
 	/// Returns `Ok(points_issues)`, `Err` otherwise.
 	fn try_bond_funds(
@@ -1201,8 +1234,8 @@ impl<T: Config> BondedPool<T> {
 			&bonded_account,
 			amount,
 			match ty {
-				BondType::Create => ExistenceRequirement::AllowDeath,
-				BondType::Later => ExistenceRequirement::KeepAlive,
+				BondType::Create => Preservation::Expendable,
+				BondType::Later => Preservation::Preserve,
 			},
 		)?;
 		// We must calculate the points issued *before* we bond who's funds, else points:balance
@@ -1216,6 +1249,9 @@ impl<T: Config> BondedPool<T> {
 			// found, we exit early.
 			BondType::Later => T::Staking::bond_extra(&bonded_account, amount)?,
 		}
+		TotalValueLocked::<T>::mutate(|tvl| {
+			tvl.saturating_accrue(amount);
+		});
 
 		Ok(points_issued)
 	}
@@ -1231,6 +1267,27 @@ impl<T: Config> BondedPool<T> {
 			});
 		};
 	}
+
+	/// Withdraw all the funds that are already unlocked from staking for the
+	/// [`BondedPool::bonded_account`].
+	///
+	/// Also reduces the [`TotalValueLocked`] by the difference of the
+	/// [`T::Staking::total_stake`] of the [`BondedPool::bonded_account`] that might occur by
+	/// [`T::Staking::withdraw_unbonded`].
+	///
+	/// Returns the result of [`T::Staking::withdraw_unbonded`]
+	fn withdraw_from_staking(&self, num_slashing_spans: u32) -> Result<bool, DispatchError> {
+		let bonded_account = self.bonded_account();
+
+		let prev_total = T::Staking::total_stake(&bonded_account.clone()).unwrap_or_default();
+		let outcome = T::Staking::withdraw_unbonded(bonded_account.clone(), num_slashing_spans);
+		let diff = prev_total
+			.defensive_saturating_sub(T::Staking::total_stake(&bonded_account).unwrap_or_default());
+		TotalValueLocked::<T>::mutate(|tvl| {
+			tvl.saturating_reduce(diff);
+		});
+		outcome
+	}
 }
 
 /// A reward pool.
@@ -1300,13 +1357,22 @@ impl<T: Config> RewardPool<T> {
 		self.total_commission_pending =
 			self.total_commission_pending.saturating_add(new_pending_commission);
 
-		// Store the total payouts at the time of this update. Total payouts are essentially the
-		// entire historical balance of the reward pool, equating to the current balance + the total
-		// rewards that have left the pool + the total commission that has left the pool.
-		self.last_recorded_total_payouts = balance
+		// Total payouts are essentially the entire historical balance of the reward pool, equating
+		// to the current balance + the total rewards that have left the pool + the total commission
+		// that has left the pool.
+		let last_recorded_total_payouts = balance
 			.checked_add(&self.total_rewards_claimed.saturating_add(self.total_commission_claimed))
 			.ok_or(Error::<T>::OverflowRisk)?;
 
+		// Store the total payouts at the time of this update.
+		//
+		// An increase in ED could cause `last_recorded_total_payouts` to decrease but we should not
+		// allow that to happen since an already paid out reward cannot decrease. The reward account
+		// might go in deficit temporarily in this exceptional case but it will be corrected once
+		// new rewards are added to the pool.
+		self.last_recorded_total_payouts =
+			self.last_recorded_total_payouts.max(last_recorded_total_payouts);
+
 		Ok(())
 	}
 
@@ -1380,8 +1446,11 @@ impl<T: Config> RewardPool<T> {
 	///
 	/// This is sum of all the rewards that are claimable by pool members.
 	fn current_balance(id: PoolId) -> BalanceOf<T> {
-		T::Currency::free_balance(&Pallet::<T>::create_reward_account(id))
-			.saturating_sub(T::Currency::minimum_balance())
+		T::Currency::reducible_balance(
+			&Pallet::<T>::create_reward_account(id),
+			Preservation::Expendable,
+			Fortitude::Polite,
+		)
 	}
 }
 
@@ -1417,9 +1486,7 @@ impl<T: Config> UnbondPool<T> {
 	}
 
 	/// Dissolve some points from the unbonding pool, reducing the balance of the pool
-	/// proportionally.
-	///
-	/// This is the opposite of `issue`.
+	/// proportionally. This is the opposite of `issue`.
 	///
 	/// Returns the actual amount of `Balance` that was removed from the pool.
 	fn dissolve(&mut self, points: BalanceOf<T>) -> BalanceOf<T> {
@@ -1487,6 +1554,7 @@ impl<T: Config> SubPools<T> {
 /// `no_era` pool. This is guaranteed to at least be equal to the staking `UnbondingDuration`. For
 /// improved UX [`Config::PostUnbondingPoolsWindow`] should be configured to a non-zero value.
 pub struct TotalUnbondingPools<T: Config>(PhantomData<T>);
+
 impl<T: Config> Get<u32> for TotalUnbondingPools<T> {
 	fn get() -> u32 {
 		// NOTE: this may be dangerous in the scenario bonding_duration gets decreased because
@@ -1504,7 +1572,7 @@ pub mod pallet {
 	use sp_runtime::Perbill;
 
 	/// The current storage version.
-	const STORAGE_VERSION: StorageVersion = StorageVersion::new(5);
+	const STORAGE_VERSION: StorageVersion = StorageVersion::new(7);
 
 	#[pallet::pallet]
 	#[pallet::storage_version(STORAGE_VERSION)]
@@ -1518,8 +1586,12 @@ pub mod pallet {
 		/// Weight information for extrinsics in this pallet.
 		type WeightInfo: weights::WeightInfo;
 
-		/// The nominating balance.
-		type Currency: Currency<Self::AccountId>;
+		/// The currency type used for nomination pool.
+		type Currency: FunMutate<Self::AccountId>
+			+ FunMutateFreeze<Self::AccountId, Id = Self::RuntimeFreezeReason>;
+
+		/// The overarching freeze reason.
+		type RuntimeFreezeReason: From<FreezeReason>;
 
 		/// The type that is used for reward counter.
 		///
@@ -1577,6 +1649,14 @@ pub mod pallet {
 		type MaxUnbonding: Get<u32>;
 	}
 
+	/// The sum of funds across all pools.
+	///
+	/// This might be lower but never higher than the sum of `total_balance` of all [`PoolMembers`]
+	/// because calling `pool_withdraw_unbonded` might decrease the total stake of the pool's
+	/// `bonded_account` without adjusting the pallet-internal `UnbondingPool`'s.
+	#[pallet::storage]
+	pub type TotalValueLocked<T: Config> = StorageValue<_, BalanceOf<T>, ValueQuery>;
+
 	/// Minimum amount to bond to join a pool.
 	#[pallet::storage]
 	pub type MinJoinBond<T: Config> = StorageValue<_, BalanceOf<T>, ValueQuery>;
@@ -1685,6 +1765,7 @@ pub mod pallet {
 		fn build(&self) {
 			MinJoinBond::<T>::put(self.min_join_bond);
 			MinCreateBond::<T>::put(self.min_create_bond);
+
 			if let Some(max_pools) = self.max_pools {
 				MaxPools::<T>::put(max_pools);
 			}
@@ -1770,6 +1851,10 @@ pub mod pallet {
 		},
 		/// Pool commission has been claimed.
 		PoolCommissionClaimed { pool_id: PoolId, commission: BalanceOf<T> },
+		/// Topped up deficit in frozen ED of the reward pool.
+		MinBalanceDeficitAdjusted { pool_id: PoolId, amount: BalanceOf<T> },
+		/// Claimed excess frozen ED of af the reward pool.
+		MinBalanceExcessAdjusted { pool_id: PoolId, amount: BalanceOf<T> },
 	}
 
 	#[pallet::error]
@@ -1795,9 +1880,9 @@ pub mod pallet {
 		CannotWithdrawAny,
 		/// The amount does not meet the minimum bond to either join or create a pool.
 		///
-		/// The depositor can never unbond to a value less than
-		/// `Pallet::depositor_min_bond`. The caller does not have nominating
-		/// permissions for the pool. Members can never unbond to a value below `MinJoinBond`.
+		/// The depositor can never unbond to a value less than `Pallet::depositor_min_bond`. The
+		/// caller does not have nominating permissions for the pool. Members can never unbond to a
+		/// value below `MinJoinBond`.
 		MinimumBondNotMet,
 		/// The transaction could not be executed due to overflow risk for the pool.
 		OverflowRisk,
@@ -1845,6 +1930,8 @@ pub mod pallet {
 		InvalidPoolId,
 		/// Bonding extra is restricted to the exact pending reward amount.
 		BondExtraRestricted,
+		/// No imbalance in the ED deposit for the pool.
+		NothingToAdjust,
 	}
 
 	#[derive(Encode, Decode, PartialEq, TypeInfo, PalletError, RuntimeDebug)]
@@ -1868,6 +1955,14 @@ pub mod pallet {
 		}
 	}
 
+	/// A reason for freezing funds.
+	#[pallet::composite_enum]
+	pub enum FreezeReason {
+		/// Pool reward account is restricted from going below Existential Deposit.
+		#[codec(index = 0)]
+		PoolMinBalance,
+	}
+
 	#[pallet::call]
 	impl<T: Config> Pallet<T> {
 		/// Stake funds with a pool. The amount to bond is transferred from the member to the
@@ -2074,7 +2169,7 @@ pub mod pallet {
 
 		/// Call `withdraw_unbonded` for the pools account. This call can be made by any account.
 		///
-		/// This is useful if their are too many unlocking chunks to call `unbond`, and some
+		/// This is useful if there are too many unlocking chunks to call `unbond`, and some
 		/// can be cleared by withdrawing. In the case there are too many unlocking chunks, the user
 		/// would probably see an error like `NoMoreChunks` emitted from the staking system when
 		/// they attempt to unbond.
@@ -2087,10 +2182,12 @@ pub mod pallet {
 		) -> DispatchResult {
 			let _ = ensure_signed(origin)?;
 			let pool = BondedPool::<T>::get(pool_id).ok_or(Error::<T>::PoolNotFound)?;
+
 			// For now we only allow a pool to withdraw unbonded if its not destroying. If the pool
 			// is destroying then `withdraw_unbonded` can be used.
 			ensure!(pool.state != PoolState::Destroying, Error::<T>::NotDestroying);
-			T::Staking::withdraw_unbonded(pool.bonded_account(), num_slashing_spans)?;
+			pool.withdraw_from_staking(num_slashing_spans)?;
+
 			Ok(())
 		}
 
@@ -2141,8 +2238,7 @@ pub mod pallet {
 
 			// Before calculating the `balance_to_unbond`, we call withdraw unbonded to ensure the
 			// `transferrable_balance` is correct.
-			let stash_killed =
-				T::Staking::withdraw_unbonded(bonded_pool.bonded_account(), num_slashing_spans)?;
+			let stash_killed = bonded_pool.withdraw_from_staking(num_slashing_spans)?;
 
 			// defensive-only: the depositor puts enough funds into the stash so that it will only
 			// be destroyed when they are leaving.
@@ -2175,13 +2271,13 @@ pub mod pallet {
 				// don't exist. This check is also defensive in cases where the unbond pool does not
 				// update its balance (e.g. a bug in the slashing hook.) We gracefully proceed in
 				// order to ensure members can leave the pool and it can be destroyed.
-				.min(bonded_pool.transferrable_balance());
+				.min(bonded_pool.transferable_balance());
 
 			T::Currency::transfer(
 				&bonded_pool.bonded_account(),
 				&member_account,
 				balance_to_unbond,
-				ExistenceRequirement::AllowDeath,
+				Preservation::Expendable,
 			)
 			.defensive()?;
 
@@ -2237,7 +2333,7 @@ pub mod pallet {
 		/// # Note
 		///
 		/// In addition to `amount`, the caller will transfer the existential deposit; so the caller
-		/// needs at have at least `amount + existential_deposit` transferrable.
+		/// needs at have at least `amount + existential_deposit` transferable.
 		#[pallet::call_index(6)]
 		#[pallet::weight(T::WeightInfo::create())]
 		pub fn create(
@@ -2631,6 +2727,20 @@ pub mod pallet {
 			let who = ensure_signed(origin)?;
 			Self::do_claim_commission(who, pool_id)
 		}
+
+		/// Top up the deficit or withdraw the excess ED from the pool.
+		///
+		/// When a pool is created, the pool depositor transfers ED to the reward account of the
+		/// pool. ED is subject to change and over time, the deposit in the reward account may be
+		/// insufficient to cover the ED deficit of the pool or vice-versa where there is excess
+		/// deposit to the pool. This call allows anyone to adjust the ED deposit of the
+		/// pool by either topping up the deficit or claiming the excess.
+		#[pallet::call_index(21)]
+		#[pallet::weight(T::WeightInfo::adjust_pool_deposit())]
+		pub fn adjust_pool_deposit(origin: OriginFor<T>, pool_id: PoolId) -> DispatchResult {
+			let who = ensure_signed(origin)?;
+			Self::do_adjust_pool_deposit(who, pool_id)
+		}
 	}
 
 	#[pallet::hooks]
@@ -2681,6 +2791,9 @@ impl<T: Config> Pallet<T> {
 		RewardPools::<T>::remove(bonded_pool.id);
 		SubPoolsStorage::<T>::remove(bonded_pool.id);
 
+		// remove the ED restriction from the pool reward account.
+		let _ = Self::unfreeze_pool_deposit(&bonded_pool.reward_account()).defensive();
+
 		// Kill accounts from storage by making their balance go below ED. We assume that the
 		// accounts have no references that would prevent destruction once we get to this point. We
 		// don't work with the system pallet directly, but
@@ -2688,26 +2801,44 @@ impl<T: Config> Pallet<T> {
 		// consumers anyway.
 		// 2. the bonded account should become a 'killed stash' in the staking system, and all of
 		//    its consumers removed.
-		debug_assert_eq!(frame_system::Pallet::<T>::consumers(&reward_account), 0);
-		debug_assert_eq!(frame_system::Pallet::<T>::consumers(&bonded_account), 0);
-		debug_assert_eq!(
-			T::Staking::total_stake(&bonded_account).unwrap_or_default(),
-			Zero::zero()
+		defensive_assert!(
+			frame_system::Pallet::<T>::consumers(&reward_account) == 0,
+			"reward account of dissolving pool should have no consumers"
+		);
+		defensive_assert!(
+			frame_system::Pallet::<T>::consumers(&bonded_account) == 0,
+			"bonded account of dissolving pool should have no consumers"
+		);
+		defensive_assert!(
+			T::Staking::total_stake(&bonded_account).unwrap_or_default() == Zero::zero(),
+			"dissolving pool should not have any stake in the staking pallet"
 		);
 
 		// This shouldn't fail, but if it does we don't really care. Remaining balance can consist
-		// of unclaimed pending commission, errorneous transfers to the reward account, etc.
-		let reward_pool_remaining = T::Currency::free_balance(&reward_account);
+		// of unclaimed pending commission, erroneous transfers to the reward account, etc.
+		let reward_pool_remaining = T::Currency::reducible_balance(
+			&reward_account,
+			Preservation::Expendable,
+			Fortitude::Polite,
+		);
 		let _ = T::Currency::transfer(
 			&reward_account,
 			&bonded_pool.roles.depositor,
 			reward_pool_remaining,
-			ExistenceRequirement::AllowDeath,
+			Preservation::Expendable,
 		);
 
-		// NOTE: this is purely defensive.
-		T::Currency::make_free_balance_be(&reward_account, Zero::zero());
-		T::Currency::make_free_balance_be(&bonded_pool.bonded_account(), Zero::zero());
+		defensive_assert!(
+			T::Currency::total_balance(&reward_account) == Zero::zero(),
+			"could not transfer all amount to depositor while dissolving pool"
+		);
+		defensive_assert!(
+			T::Currency::total_balance(&bonded_pool.bonded_account()) == Zero::zero(),
+			"dissolving pool should not have any balance"
+		);
+		// NOTE: Defensively force set balance to zero.
+		T::Currency::set_balance(&reward_account, Zero::zero());
+		T::Currency::set_balance(&bonded_pool.bonded_account(), Zero::zero());
 
 		Self::deposit_event(Event::<T>::Destroyed { pool_id: bonded_pool.id });
 		// Remove bonded pool metadata.
@@ -2771,12 +2902,9 @@ impl<T: Config> Pallet<T> {
 			},
 			(false, false) => {
 				// Equivalent to (current_points / current_balance) * new_funds
-				balance(
-					u256(current_points)
-						.saturating_mul(u256(new_funds))
-						// We check for zero above
-						.div(u256(current_balance)),
-				)
+				balance(u256(current_points).saturating_mul(u256(new_funds)))
+					// We check for zero above
+					.div(current_balance)
 			},
 		}
 	}
@@ -2796,9 +2924,12 @@ impl<T: Config> Pallet<T> {
 		}
 
 		// Equivalent of (current_balance / current_points) * points
-		balance(u256(current_balance).saturating_mul(u256(points)))
-			// We check for zero above
-			.div(current_points)
+		balance(
+			u256(current_balance)
+				.saturating_mul(u256(points))
+				// We check for zero above
+				.div(u256(current_points)),
+		)
 	}
 
 	/// If the member has some rewards, transfer a payout from the reward pool to the member.
@@ -2838,7 +2969,7 @@ impl<T: Config> Pallet<T> {
 			pending_rewards,
 			// defensive: the depositor has put existential deposit into the pool and it stays
 			// untouched, reward account shall not die.
-			ExistenceRequirement::KeepAlive,
+			Preservation::Preserve,
 		)?;
 
 		Self::deposit_event(Event::<T>::PaidOut {
@@ -2846,7 +2977,6 @@ impl<T: Config> Pallet<T> {
 			pool_id: member.pool_id,
 			payout: pending_rewards,
 		});
-
 		Ok(pending_rewards)
 	}
 
@@ -2881,13 +3011,17 @@ impl<T: Config> Pallet<T> {
 		bonded_pool.try_inc_members()?;
 		let points = bonded_pool.try_bond_funds(&who, amount, BondType::Create)?;
 
+		// Transfer the minimum balance for the reward account.
 		T::Currency::transfer(
 			&who,
 			&bonded_pool.reward_account(),
 			T::Currency::minimum_balance(),
-			ExistenceRequirement::AllowDeath,
+			Preservation::Expendable,
 		)?;
 
+		// Restrict reward account balance from going below ED.
+		Self::freeze_pool_deposit(&bonded_pool.reward_account())?;
+
 		PoolMembers::<T>::insert(
 			who.clone(),
 			PoolMember::<T> {
@@ -2999,7 +3133,7 @@ impl<T: Config> Pallet<T> {
 			&bonded_pool.reward_account(),
 			&payee,
 			commission,
-			ExistenceRequirement::KeepAlive,
+			Preservation::Preserve,
 		)?;
 
 		// Add pending commission to total claimed counter.
@@ -3007,7 +3141,6 @@ impl<T: Config> Pallet<T> {
 			reward_pool.total_commission_claimed.saturating_add(commission);
 		// Reset total pending commission counter to zero.
 		reward_pool.total_commission_pending = Zero::zero();
-		// Commit reward pool updates
 		RewardPools::<T>::insert(pool_id, reward_pool);
 
 		Self::deposit_event(Event::<T>::PoolCommissionClaimed { pool_id, commission });
@@ -3029,6 +3162,55 @@ impl<T: Config> Pallet<T> {
 		Ok(())
 	}
 
+	fn do_adjust_pool_deposit(who: T::AccountId, pool: PoolId) -> DispatchResult {
+		let bonded_pool = BondedPool::<T>::get(pool).ok_or(Error::<T>::PoolNotFound)?;
+		let reward_acc = &bonded_pool.reward_account();
+		let pre_frozen_balance =
+			T::Currency::balance_frozen(&FreezeReason::PoolMinBalance.into(), reward_acc);
+		let min_balance = T::Currency::minimum_balance();
+
+		if pre_frozen_balance == min_balance {
+			return Err(Error::<T>::NothingToAdjust.into())
+		}
+
+		// Update frozen amount with current ED.
+		Self::freeze_pool_deposit(reward_acc)?;
+
+		if pre_frozen_balance > min_balance {
+			// Transfer excess back to depositor.
+			let excess = pre_frozen_balance.saturating_sub(min_balance);
+			T::Currency::transfer(reward_acc, &who, excess, Preservation::Preserve)?;
+			Self::deposit_event(Event::<T>::MinBalanceExcessAdjusted {
+				pool_id: pool,
+				amount: excess,
+			});
+		} else {
+			// Transfer ED deficit from depositor to the pool
+			let deficit = min_balance.saturating_sub(pre_frozen_balance);
+			T::Currency::transfer(&who, reward_acc, deficit, Preservation::Expendable)?;
+			Self::deposit_event(Event::<T>::MinBalanceDeficitAdjusted {
+				pool_id: pool,
+				amount: deficit,
+			});
+		}
+
+		Ok(())
+	}
+
+	/// Apply freeze on reward account to restrict it from going below ED.
+	pub(crate) fn freeze_pool_deposit(reward_acc: &T::AccountId) -> DispatchResult {
+		T::Currency::set_freeze(
+			&FreezeReason::PoolMinBalance.into(),
+			reward_acc,
+			T::Currency::minimum_balance(),
+		)
+	}
+
+	/// Removes the ED freeze on the reward account of `pool_id`.
+	pub fn unfreeze_pool_deposit(reward_acc: &T::AccountId) -> DispatchResult {
+		T::Currency::thaw(&FreezeReason::PoolMinBalance.into(), reward_acc)
+	}
+
 	/// Ensure the correctness of the state of this pallet.
 	///
 	/// This should be valid before or after each state transition of this pallet.
@@ -3094,14 +3276,20 @@ impl<T: Config> Pallet<T> {
 
 		for id in reward_pools {
 			let account = Self::create_reward_account(id);
-			if T::Currency::free_balance(&account) < T::Currency::minimum_balance() {
+			if T::Currency::reducible_balance(&account, Preservation::Expendable, Fortitude::Polite) <
+				T::Currency::minimum_balance()
+			{
 				log!(
 					warn,
 					"reward pool of {:?}: {:?} (ed = {:?}), should only happen because ED has \
 					changed recently. Pool operators should be notified to top up the reward \
 					account",
 					id,
-					T::Currency::free_balance(&account),
+					T::Currency::reducible_balance(
+						&account,
+						Preservation::Expendable,
+						Fortitude::Polite
+					),
 					T::Currency::minimum_balance(),
 				)
 			}
@@ -3110,6 +3298,7 @@ impl<T: Config> Pallet<T> {
 		let mut pools_members = BTreeMap::<PoolId, u32>::new();
 		let mut pools_members_pending_rewards = BTreeMap::<PoolId, BalanceOf<T>>::new();
 		let mut all_members = 0u32;
+		let mut total_balance_members = Default::default();
 		PoolMembers::<T>::iter().try_for_each(|(_, d)| -> Result<(), TryRuntimeError> {
 			let bonded_pool = BondedPools::<T>::get(d.pool_id).unwrap();
 			ensure!(!d.total_points().is_zero(), "No member should have zero points");
@@ -3125,6 +3314,7 @@ impl<T: Config> Pallet<T> {
 				let pending_rewards = d.pending_rewards(current_rc).unwrap();
 				*pools_members_pending_rewards.entry(d.pool_id).or_default() += pending_rewards;
 			} // else this pool has been heavily slashed and cannot have any rewards anymore.
+			total_balance_members += d.total_balance();
 
 			Ok(())
 		})?;
@@ -3134,6 +3324,9 @@ impl<T: Config> Pallet<T> {
 			// reward math rounds down, we might accumulate some dust here.
 			let pending_rewards_lt_leftover_bal = RewardPool::<T>::current_balance(id) >=
 				pools_members_pending_rewards.get(&id).copied().unwrap_or_default();
+
+			// If this happens, this is most likely due to an old bug and not a recent code change.
+			// We warn about this in try-runtime checks but do not panic.
 			if !pending_rewards_lt_leftover_bal {
 				log::warn!(
 					"pool {:?}, sum pending rewards = {:?}, remaining balance = {:?}",
@@ -3142,13 +3335,10 @@ impl<T: Config> Pallet<T> {
 					RewardPool::<T>::current_balance(id)
 				);
 			}
-			ensure!(
-				pending_rewards_lt_leftover_bal,
-				"The sum of the pending rewards must be less than the leftover balance."
-			);
 			Ok(())
 		})?;
 
+		let mut expected_tvl: BalanceOf<T> = Default::default();
 		BondedPools::<T>::iter().try_for_each(|(id, inner)| -> Result<(), TryRuntimeError> {
 			let bonded_pool = BondedPool { id, inner };
 			ensure!(
@@ -3169,13 +3359,28 @@ impl<T: Config> Pallet<T> {
 				"depositor must always have MinCreateBond stake in the pool, except for when the \
 				pool is being destroyed and the depositor is the last member",
 			);
+
+			expected_tvl +=
+				T::Staking::total_stake(&bonded_pool.bonded_account()).unwrap_or_default();
+
 			Ok(())
 		})?;
+
 		ensure!(
 			MaxPoolMembers::<T>::get().map_or(true, |max| all_members <= max),
 			Error::<T>::MaxPoolMembers
 		);
 
+		ensure!(
+			TotalValueLocked::<T>::get() == expected_tvl,
+			"TVL deviates from the actual sum of funds of all Pools."
+		);
+
+		ensure!(
+			TotalValueLocked::<T>::get() <= total_balance_members,
+			"TVL must be equal to or less than the total balance of all PoolMembers."
+		);
+
 		if level <= 1 {
 			return Ok(())
 		}
@@ -3199,9 +3404,39 @@ impl<T: Config> Pallet<T> {
 			);
 		}
 
+		// Warn if any pool has incorrect ED frozen. We don't want to fail hard as this could be a
+		// result of an intentional ED change.
+		let _ = Self::check_ed_imbalance()?;
+
 		Ok(())
 	}
 
+	/// Check if any pool have an incorrect amount of ED frozen.
+	///
+	/// This can happen if the ED has changed since the pool was created.
+	#[cfg(any(feature = "try-runtime", feature = "runtime-benchmarks", test, debug_assertions))]
+	pub fn check_ed_imbalance() -> Result<(), DispatchError> {
+		let mut failed: u32 = 0;
+		BondedPools::<T>::iter_keys().for_each(|id| {
+			let reward_acc = Self::create_reward_account(id);
+			let frozen_balance =
+				T::Currency::balance_frozen(&FreezeReason::PoolMinBalance.into(), &reward_acc);
+
+			let expected_frozen_balance = T::Currency::minimum_balance();
+			if frozen_balance != expected_frozen_balance {
+				failed += 1;
+				log::warn!(
+					"pool {:?} has incorrect ED frozen that can result from change in ED. Expected  = {:?},  Actual = {:?}",
+					id,
+					expected_frozen_balance,
+					frozen_balance,
+				);
+			}
+		});
+
+		ensure!(failed == 0, "Some pools do not have correct ED frozen");
+		Ok(())
+	}
 	/// Fully unbond the shares of `member`, when executed from `origin`.
 	///
 	/// This is useful for backwards compatibility with the majority of tests that only deal with
@@ -3263,20 +3498,30 @@ impl<T: Config> Pallet<T> {
 }
 
 impl<T: Config> sp_staking::OnStakingUpdate<T::AccountId, BalanceOf<T>> for Pallet<T> {
+	/// Reduces the balances of the [`SubPools`], that belong to the pool involved in the
+	/// slash, to the amount that is defined in the `slashed_unlocking` field of
+	/// [`sp_staking::OnStakingUpdate::on_slash`]
+	///
+	/// Emits the `PoolsSlashed` event.
 	fn on_slash(
 		pool_account: &T::AccountId,
 		// Bonded balance is always read directly from staking, therefore we don't need to update
 		// anything here.
 		slashed_bonded: BalanceOf<T>,
 		slashed_unlocking: &BTreeMap<EraIndex, BalanceOf<T>>,
+		total_slashed: BalanceOf<T>,
 	) {
-		if let Some(pool_id) = ReversePoolIdLookup::<T>::get(pool_account) {
-			let mut sub_pools = match SubPoolsStorage::<T>::get(pool_id).defensive() {
-				Some(sub_pools) => sub_pools,
-				None => return,
-			};
-			for (era, slashed_balance) in slashed_unlocking.iter() {
-				if let Some(pool) = sub_pools.with_era.get_mut(era) {
+		let Some(pool_id) = ReversePoolIdLookup::<T>::get(pool_account) else { return };
+		// As the slashed account belongs to a `BondedPool` the `TotalValueLocked` decreases and
+		// an event is emitted.
+		TotalValueLocked::<T>::mutate(|tvl| {
+			tvl.defensive_saturating_reduce(total_slashed);
+		});
+
+		if let Some(mut sub_pools) = SubPoolsStorage::<T>::get(pool_id) {
+			// set the reduced balance for each of the `SubPools`
+			slashed_unlocking.iter().for_each(|(era, slashed_balance)| {
+				if let Some(pool) = sub_pools.with_era.get_mut(era).defensive() {
 					pool.balance = *slashed_balance;
 					Self::deposit_event(Event::<T>::UnbondingPoolSlashed {
 						era: *era,
@@ -3284,10 +3529,11 @@ impl<T: Config> sp_staking::OnStakingUpdate<T::AccountId, BalanceOf<T>> for Pall
 						balance: *slashed_balance,
 					});
 				}
-			}
-
-			Self::deposit_event(Event::<T>::PoolSlashed { pool_id, balance: slashed_bonded });
+			});
 			SubPoolsStorage::<T>::insert(pool_id, sub_pools);
+		} else if !slashed_unlocking.is_empty() {
+			defensive!("Expected SubPools were not found");
 		}
+		Self::deposit_event(Event::<T>::PoolSlashed { pool_id, balance: slashed_bonded });
 	}
 }
diff --git a/substrate/frame/nomination-pools/src/migration.rs b/substrate/frame/nomination-pools/src/migration.rs
index 2ae4cd1b86857787ff98d72191785c8e8168339c..eef2a976f1a2550081fee5caa28ea36a9c52ee68 100644
--- a/substrate/frame/nomination-pools/src/migration.rs
+++ b/substrate/frame/nomination-pools/src/migration.rs
@@ -23,55 +23,338 @@ use sp_std::{collections::btree_map::BTreeMap, vec::Vec};
 #[cfg(feature = "try-runtime")]
 use sp_runtime::TryRuntimeError;
 
-pub mod v1 {
+/// Exports for versioned migration `type`s for this pallet.
+pub mod versioned_migrations {
+	use super::*;
+
+	/// Migration V6 to V7 wrapped in a [`frame_support::migrations::VersionedMigration`], ensuring
+	/// the migration is only performed when on-chain version is 6.
+	pub type V6ToV7<T> = frame_support::migrations::VersionedMigration<
+		6,
+		7,
+		v7::VersionUncheckedMigrateV6ToV7<T>,
+		crate::pallet::Pallet<T>,
+		<T as frame_system::Config>::DbWeight,
+	>;
+
+	/// Wrapper over `MigrateToV6` with convenience version checks.
+	pub type V5toV6<T> = frame_support::migrations::VersionedMigration<
+		5,
+		6,
+		v6::MigrateToV6<T>,
+		crate::pallet::Pallet<T>,
+		<T as frame_system::Config>::DbWeight,
+	>;
+}
+
+/// This migration accumulates and initializes the [`TotalValueLocked`] for all pools.
+///
+/// WARNING: This migration works under the assumption that the [`BondedPools`] cannot be inflated
+/// arbitrarily. Otherwise this migration could fail due to too high weight.
+mod v7 {
+	use super::*;
+
+	pub struct VersionUncheckedMigrateV6ToV7<T>(sp_std::marker::PhantomData<T>);
+	impl<T: Config> VersionUncheckedMigrateV6ToV7<T> {
+		fn calculate_tvl_by_total_stake() -> BalanceOf<T> {
+			BondedPools::<T>::iter()
+				.map(|(id, inner)| {
+					T::Staking::total_stake(
+						&BondedPool { id, inner: inner.clone() }.bonded_account(),
+					)
+					.unwrap_or_default()
+				})
+				.reduce(|acc, total_balance| acc + total_balance)
+				.unwrap_or_default()
+		}
+	}
+
+	impl<T: Config> OnRuntimeUpgrade for VersionUncheckedMigrateV6ToV7<T> {
+		fn on_runtime_upgrade() -> Weight {
+			let migrated = BondedPools::<T>::count();
+			// The TVL should be the sum of all the funds that are actively staked and in the
+			// unbonding process of the account of each pool.
+			let tvl: BalanceOf<T> = Self::calculate_tvl_by_total_stake();
+
+			TotalValueLocked::<T>::set(tvl);
+
+			log!(info, "Upgraded {} pools with a TVL of {:?}", migrated, tvl);
+
+			// reads: migrated * (BondedPools +  Staking::total_stake) + count + onchain
+			// version
+			//
+			// writes: current version + TVL
+			T::DbWeight::get().reads_writes(migrated.saturating_mul(2).saturating_add(2).into(), 2)
+		}
+
+		#[cfg(feature = "try-runtime")]
+		fn pre_upgrade() -> Result<Vec<u8>, TryRuntimeError> {
+			Ok(Vec::new())
+		}
+
+		#[cfg(feature = "try-runtime")]
+		fn post_upgrade(_data: Vec<u8>) -> Result<(), TryRuntimeError> {
+			// check that the `TotalValueLocked` written is actually the sum of `total_stake` of the
+			// `BondedPools``
+			let tvl: BalanceOf<T> = Self::calculate_tvl_by_total_stake();
+			ensure!(
+				TotalValueLocked::<T>::get() == tvl,
+				"TVL written is not equal to `Staking::total_stake` of all `BondedPools`."
+			);
+
+			// calculate the sum of `total_balance` of all `PoolMember` as the upper bound for the
+			// `TotalValueLocked`.
+			let total_balance_members: BalanceOf<T> = PoolMembers::<T>::iter()
+				.map(|(_, member)| member.total_balance())
+				.reduce(|acc, total_balance| acc + total_balance)
+				.unwrap_or_default();
+
+			ensure!(
+				TotalValueLocked::<T>::get() <= total_balance_members,
+				"TVL is greater than the balance of all PoolMembers."
+			);
+
+			ensure!(
+				Pallet::<T>::on_chain_storage_version() >= 7,
+				"nomination-pools::migration::v7: wrong storage version"
+			);
+
+			Ok(())
+		}
+	}
+}
+
+mod v6 {
+	use super::*;
+
+	/// This migration would restrict reward account of pools to go below ED by doing a named
+	/// freeze on all the existing pools.
+	pub struct MigrateToV6<T>(sp_std::marker::PhantomData<T>);
+
+	impl<T: Config> MigrateToV6<T> {
+		fn freeze_ed(pool_id: PoolId) -> Result<(), ()> {
+			let reward_acc = Pallet::<T>::create_reward_account(pool_id);
+			Pallet::<T>::freeze_pool_deposit(&reward_acc).map_err(|e| {
+				log!(error, "Failed to freeze ED for pool {} with error: {:?}", pool_id, e);
+				()
+			})
+		}
+	}
+	impl<T: Config> OnRuntimeUpgrade for MigrateToV6<T> {
+		fn on_runtime_upgrade() -> Weight {
+			let mut success = 0u64;
+			let mut fail = 0u64;
+
+			BondedPools::<T>::iter_keys().for_each(|p| {
+				if Self::freeze_ed(p).is_ok() {
+					success.saturating_inc();
+				} else {
+					fail.saturating_inc();
+				}
+			});
+
+			if fail > 0 {
+				log!(error, "Failed to freeze ED for {} pools", fail);
+			} else {
+				log!(info, "Freezing ED succeeded for {} pools", success);
+			}
+
+			let total = success.saturating_add(fail);
+			// freeze_ed = r:2 w:2
+			// reads: (freeze_ed + bonded pool key) * total
+			// writes: freeze_ed * total
+			T::DbWeight::get().reads_writes(3u64.saturating_mul(total), 2u64.saturating_mul(total))
+		}
+
+		#[cfg(feature = "try-runtime")]
+		fn post_upgrade(_data: Vec<u8>) -> Result<(), TryRuntimeError> {
+			// there should be no ED imbalances anymore..
+			Pallet::<T>::check_ed_imbalance()
+		}
+	}
+}
+pub mod v5 {
 	use super::*;
 
 	#[derive(Decode)]
-	pub struct OldPoolRoles<AccountId> {
-		pub depositor: AccountId,
-		pub root: AccountId,
-		pub nominator: AccountId,
-		pub bouncer: AccountId,
+	pub struct OldRewardPool<T: Config> {
+		last_recorded_reward_counter: T::RewardCounter,
+		last_recorded_total_payouts: BalanceOf<T>,
+		total_rewards_claimed: BalanceOf<T>,
 	}
 
-	impl<AccountId> OldPoolRoles<AccountId> {
-		fn migrate_to_v1(self) -> PoolRoles<AccountId> {
-			PoolRoles {
-				depositor: self.depositor,
-				root: Some(self.root),
-				nominator: Some(self.nominator),
-				bouncer: Some(self.bouncer),
+	impl<T: Config> OldRewardPool<T> {
+		fn migrate_to_v5(self) -> RewardPool<T> {
+			RewardPool {
+				last_recorded_reward_counter: self.last_recorded_reward_counter,
+				last_recorded_total_payouts: self.last_recorded_total_payouts,
+				total_rewards_claimed: self.total_rewards_claimed,
+				total_commission_pending: Zero::zero(),
+				total_commission_claimed: Zero::zero(),
 			}
 		}
 	}
 
+	/// This migration adds `total_commission_pending` and `total_commission_claimed` field to every
+	/// `RewardPool`, if any.
+	pub struct MigrateToV5<T>(sp_std::marker::PhantomData<T>);
+	impl<T: Config> OnRuntimeUpgrade for MigrateToV5<T> {
+		fn on_runtime_upgrade() -> Weight {
+			let current = Pallet::<T>::current_storage_version();
+			let onchain = Pallet::<T>::on_chain_storage_version();
+
+			log!(
+				info,
+				"Running migration with current storage version {:?} / onchain {:?}",
+				current,
+				onchain
+			);
+
+			if current == 5 && onchain == 4 {
+				let mut translated = 0u64;
+				RewardPools::<T>::translate::<OldRewardPool<T>, _>(|_id, old_value| {
+					translated.saturating_inc();
+					Some(old_value.migrate_to_v5())
+				});
+
+				current.put::<Pallet<T>>();
+				log!(info, "Upgraded {} pools, storage to version {:?}", translated, current);
+
+				// reads: translated + onchain version.
+				// writes: translated + current.put.
+				T::DbWeight::get().reads_writes(translated + 1, translated + 1)
+			} else {
+				log!(info, "Migration did not execute. This probably should be removed");
+				T::DbWeight::get().reads(1)
+			}
+		}
+
+		#[cfg(feature = "try-runtime")]
+		fn pre_upgrade() -> Result<Vec<u8>, TryRuntimeError> {
+			let rpool_keys = RewardPools::<T>::iter_keys().count();
+			let rpool_values = RewardPools::<T>::iter_values().count();
+			if rpool_keys != rpool_values {
+				log!(info, "🔥 There are {} undecodable RewardPools in storage. This migration will try to correct them. keys: {}, values: {}", rpool_keys.saturating_sub(rpool_values), rpool_keys, rpool_values);
+			}
+
+			ensure!(
+				PoolMembers::<T>::iter_keys().count() == PoolMembers::<T>::iter_values().count(),
+				"There are undecodable PoolMembers in storage. This migration will not fix that."
+			);
+			ensure!(
+				BondedPools::<T>::iter_keys().count() == BondedPools::<T>::iter_values().count(),
+				"There are undecodable BondedPools in storage. This migration will not fix that."
+			);
+			ensure!(
+				SubPoolsStorage::<T>::iter_keys().count() ==
+					SubPoolsStorage::<T>::iter_values().count(),
+				"There are undecodable SubPools in storage. This migration will not fix that."
+			);
+			ensure!(
+				Metadata::<T>::iter_keys().count() == Metadata::<T>::iter_values().count(),
+				"There are undecodable Metadata in storage. This migration will not fix that."
+			);
+
+			Ok((rpool_values as u64).encode())
+		}
+
+		#[cfg(feature = "try-runtime")]
+		fn post_upgrade(data: Vec<u8>) -> Result<(), TryRuntimeError> {
+			let old_rpool_values: u64 = Decode::decode(&mut &data[..]).unwrap();
+			let rpool_keys = RewardPools::<T>::iter_keys().count() as u64;
+			let rpool_values = RewardPools::<T>::iter_values().count() as u64;
+			ensure!(
+				rpool_keys == rpool_values,
+				"There are STILL undecodable RewardPools - migration failed"
+			);
+
+			if old_rpool_values != rpool_values {
+				log!(
+					info,
+					"🎉 Fixed {} undecodable RewardPools.",
+					rpool_values.saturating_sub(old_rpool_values)
+				);
+			}
+
+			// ensure all RewardPools items now contain `total_commission_pending` and
+			// `total_commission_claimed` field.
+			ensure!(
+				RewardPools::<T>::iter().all(|(_, reward_pool)| reward_pool
+					.total_commission_pending >=
+					Zero::zero() && reward_pool
+					.total_commission_claimed >=
+					Zero::zero()),
+				"a commission value has been incorrectly set"
+			);
+			ensure!(
+				Pallet::<T>::on_chain_storage_version() >= 5,
+				"nomination-pools::migration::v5: wrong storage version"
+			);
+
+			// These should not have been touched - just in case.
+			ensure!(
+				PoolMembers::<T>::iter_keys().count() == PoolMembers::<T>::iter_values().count(),
+				"There are undecodable PoolMembers in storage."
+			);
+			ensure!(
+				BondedPools::<T>::iter_keys().count() == BondedPools::<T>::iter_values().count(),
+				"There are undecodable BondedPools in storage."
+			);
+			ensure!(
+				SubPoolsStorage::<T>::iter_keys().count() ==
+					SubPoolsStorage::<T>::iter_values().count(),
+				"There are undecodable SubPools in storage."
+			);
+			ensure!(
+				Metadata::<T>::iter_keys().count() == Metadata::<T>::iter_values().count(),
+				"There are undecodable Metadata in storage."
+			);
+
+			Ok(())
+		}
+	}
+}
+
+pub mod v4 {
+	use super::*;
+
 	#[derive(Decode)]
 	pub struct OldBondedPoolInner<T: Config> {
 		pub points: BalanceOf<T>,
 		pub state: PoolState,
 		pub member_counter: u32,
-		pub roles: OldPoolRoles<T::AccountId>,
+		pub roles: PoolRoles<T::AccountId>,
 	}
 
 	impl<T: Config> OldBondedPoolInner<T> {
-		fn migrate_to_v1(self) -> BondedPoolInner<T> {
-			// Note: `commission` field not introduced to `BondedPoolInner` until
-			// migration 4.
+		fn migrate_to_v4(self) -> BondedPoolInner<T> {
 			BondedPoolInner {
-				points: self.points,
 				commission: Commission::default(),
 				member_counter: self.member_counter,
+				points: self.points,
 				state: self.state,
-				roles: self.roles.migrate_to_v1(),
+				roles: self.roles,
 			}
 		}
 	}
 
-	/// Trivial migration which makes the roles of each pool optional.
+	/// Migrates from `v3` directly to `v5` to avoid the broken `v4` migration.
+	#[allow(deprecated)]
+	pub type MigrateV3ToV5<T, U> = (v4::MigrateToV4<T, U>, v5::MigrateToV5<T>);
+
+	/// # Warning
 	///
-	/// Note: The depositor is not optional since they can never change.
-	pub struct MigrateToV1<T>(sp_std::marker::PhantomData<T>);
-	impl<T: Config> OnRuntimeUpgrade for MigrateToV1<T> {
+	/// To avoid mangled storage please use `MigrateV3ToV5` instead.
+	/// See: github.com/paritytech/substrate/pull/13715
+	///
+	/// This migration adds a `commission` field to every `BondedPoolInner`, if
+	/// any.
+	#[deprecated(
+		note = "To avoid mangled storage please use `MigrateV3ToV5` instead. See: github.com/paritytech/substrate/pull/13715"
+	)]
+	pub struct MigrateToV4<T, U>(sp_std::marker::PhantomData<(T, U)>);
+	#[allow(deprecated)]
+	impl<T: Config, U: Get<Perbill>> OnRuntimeUpgrade for MigrateToV4<T, U> {
 		fn on_runtime_upgrade() -> Weight {
 			let current = Pallet::<T>::current_storage_version();
 			let onchain = Pallet::<T>::on_chain_storage_version();
@@ -83,33 +366,128 @@ pub mod v1 {
 				onchain
 			);
 
-			if current == 1 && onchain == 0 {
-				// this is safe to execute on any runtime that has a bounded number of pools.
+			if onchain == 3 {
+				log!(warn, "Please run MigrateToV5 immediately after this migration. See github.com/paritytech/substrate/pull/13715");
+				let initial_global_max_commission = U::get();
+				GlobalMaxCommission::<T>::set(Some(initial_global_max_commission));
+				log!(
+					info,
+					"Set initial global max commission to {:?}.",
+					initial_global_max_commission
+				);
+
 				let mut translated = 0u64;
 				BondedPools::<T>::translate::<OldBondedPoolInner<T>, _>(|_key, old_value| {
 					translated.saturating_inc();
-					Some(old_value.migrate_to_v1())
+					Some(old_value.migrate_to_v4())
 				});
 
-				current.put::<Pallet<T>>();
-
+				StorageVersion::new(4).put::<Pallet<T>>();
 				log!(info, "Upgraded {} pools, storage to version {:?}", translated, current);
 
-				T::DbWeight::get().reads_writes(translated + 1, translated + 1)
+				// reads: translated + onchain version.
+				// writes: translated + current.put + initial global commission.
+				T::DbWeight::get().reads_writes(translated + 1, translated + 2)
 			} else {
-				log!(info, "Migration did not executed. This probably should be removed");
+				log!(info, "Migration did not execute. This probably should be removed");
 				T::DbWeight::get().reads(1)
 			}
 		}
 
+		#[cfg(feature = "try-runtime")]
+		fn pre_upgrade() -> Result<Vec<u8>, TryRuntimeError> {
+			Ok(Vec::new())
+		}
+
 		#[cfg(feature = "try-runtime")]
 		fn post_upgrade(_: Vec<u8>) -> Result<(), TryRuntimeError> {
-			// new version must be set.
+			// ensure all BondedPools items now contain an `inner.commission: Commission` field.
 			ensure!(
-				Pallet::<T>::on_chain_storage_version() == 1,
-				"The onchain version must be updated after the migration."
+				BondedPools::<T>::iter().all(|(_, inner)|
+					// Check current
+					(inner.commission.current.is_none() ||
+					inner.commission.current.is_some()) &&
+					// Check max
+					(inner.commission.max.is_none() || inner.commission.max.is_some()) &&
+					// Check change_rate
+					(inner.commission.change_rate.is_none() ||
+					inner.commission.change_rate.is_some()) &&
+					// Check throttle_from
+					(inner.commission.throttle_from.is_none() ||
+					inner.commission.throttle_from.is_some())),
+				"a commission value has not been set correctly"
+			);
+			ensure!(
+				GlobalMaxCommission::<T>::get() == Some(U::get()),
+				"global maximum commission error"
+			);
+			ensure!(
+				Pallet::<T>::on_chain_storage_version() >= 4,
+				"nomination-pools::migration::v4: wrong storage version"
+			);
+			Ok(())
+		}
+	}
+}
+
+pub mod v3 {
+	use super::*;
+
+	/// This migration removes stale bonded-pool metadata, if any.
+	pub struct MigrateToV3<T>(sp_std::marker::PhantomData<T>);
+	impl<T: Config> OnRuntimeUpgrade for MigrateToV3<T> {
+		fn on_runtime_upgrade() -> Weight {
+			let current = Pallet::<T>::current_storage_version();
+			let onchain = Pallet::<T>::on_chain_storage_version();
+
+			if onchain == 2 {
+				log!(
+					info,
+					"Running migration with current storage version {:?} / onchain {:?}",
+					current,
+					onchain
+				);
+
+				let mut metadata_iterated = 0u64;
+				let mut metadata_removed = 0u64;
+				Metadata::<T>::iter_keys()
+					.filter(|id| {
+						metadata_iterated += 1;
+						!BondedPools::<T>::contains_key(&id)
+					})
+					.collect::<Vec<_>>()
+					.into_iter()
+					.for_each(|id| {
+						metadata_removed += 1;
+						Metadata::<T>::remove(&id);
+					});
+				StorageVersion::new(3).put::<Pallet<T>>();
+				// metadata iterated + bonded pools read + a storage version read
+				let total_reads = metadata_iterated * 2 + 1;
+				// metadata removed + a storage version write
+				let total_writes = metadata_removed + 1;
+				T::DbWeight::get().reads_writes(total_reads, total_writes)
+			} else {
+				log!(info, "MigrateToV3 should be removed");
+				T::DbWeight::get().reads(1)
+			}
+		}
+
+		#[cfg(feature = "try-runtime")]
+		fn pre_upgrade() -> Result<Vec<u8>, TryRuntimeError> {
+			Ok(Vec::new())
+		}
+
+		#[cfg(feature = "try-runtime")]
+		fn post_upgrade(_: Vec<u8>) -> Result<(), TryRuntimeError> {
+			ensure!(
+				Metadata::<T>::iter_keys().all(|id| BondedPools::<T>::contains_key(&id)),
+				"not all of the stale metadata has been removed"
+			);
+			ensure!(
+				Pallet::<T>::on_chain_storage_version() >= 3,
+				"nomination-pools::migration::v3: wrong storage version"
 			);
-			Pallet::<T>::try_state(frame_system::Pallet::<T>::block_number())?;
 			Ok(())
 		}
 	}
@@ -127,7 +505,7 @@ pub mod v2 {
 		use crate::mock::*;
 		ExtBuilder::default().build_and_execute(|| {
 			let join = |x| {
-				Balances::make_free_balance_be(&x, Balances::minimum_balance() + 10);
+				Currency::set_balance(&x, Balances::minimum_balance() + 10);
 				frame_support::assert_ok!(Pools::join(RuntimeOrigin::signed(x), 10, 1));
 			};
 
@@ -279,7 +657,7 @@ pub mod v2 {
 								&reward_account,
 								&who,
 								last_claim,
-								ExistenceRequirement::KeepAlive,
+								Preservation::Preserve,
 							);
 
 							if let Err(reason) = outcome {
@@ -304,7 +682,7 @@ pub mod v2 {
 							&reward_account,
 							&bonded_pool.roles.depositor,
 							leftover,
-							ExistenceRequirement::KeepAlive,
+							Preservation::Preserve,
 						);
 						log!(warn, "paying {:?} leftover to the depositor: {:?}", leftover, o);
 					}
@@ -330,185 +708,14 @@ pub mod v2 {
 				total_value_locked,
 				total_points_locked,
 				current
-			);
-			current.put::<Pallet<T>>();
-
-			T::DbWeight::get().reads_writes(members_translated + 1, reward_pools_translated + 1)
-		}
-	}
-
-	impl<T: Config> OnRuntimeUpgrade for MigrateToV2<T> {
-		fn on_runtime_upgrade() -> Weight {
-			let current = Pallet::<T>::current_storage_version();
-			let onchain = Pallet::<T>::on_chain_storage_version();
-
-			log!(
-				info,
-				"Running migration with current storage version {:?} / onchain {:?}",
-				current,
-				onchain
-			);
-
-			if current == 2 && onchain == 1 {
-				Self::run(current)
-			} else {
-				log!(info, "MigrateToV2 did not executed. This probably should be removed");
-				T::DbWeight::get().reads(1)
-			}
-		}
-
-		#[cfg(feature = "try-runtime")]
-		fn pre_upgrade() -> Result<Vec<u8>, TryRuntimeError> {
-			// all reward accounts must have more than ED.
-			RewardPools::<T>::iter().try_for_each(|(id, _)| -> Result<(), TryRuntimeError> {
-				ensure!(
-					T::Currency::free_balance(&Pallet::<T>::create_reward_account(id)) >=
-						T::Currency::minimum_balance(),
-					"Reward accounts must have greater balance than ED."
-				);
-				Ok(())
-			})?;
-
-			Ok(Vec::new())
-		}
-
-		#[cfg(feature = "try-runtime")]
-		fn post_upgrade(_: Vec<u8>) -> Result<(), TryRuntimeError> {
-			// new version must be set.
-			ensure!(
-				Pallet::<T>::on_chain_storage_version() == 2,
-				"The onchain version must be updated after the migration."
-			);
-
-			// no reward or bonded pool has been skipped.
-			ensure!(
-				RewardPools::<T>::iter().count() as u32 == RewardPools::<T>::count(),
-				"The count of reward pools must remain the same after the migration."
-			);
-			ensure!(
-				BondedPools::<T>::iter().count() as u32 == BondedPools::<T>::count(),
-				"The count of reward pools must remain the same after the migration."
-			);
-
-			// all reward pools must have exactly ED in them. This means no reward can be claimed,
-			// and that setting reward counters all over the board to zero will work henceforth.
-			RewardPools::<T>::iter().try_for_each(|(id, _)| -> Result<(), TryRuntimeError> {
-				ensure!(
-					RewardPool::<T>::current_balance(id) == Zero::zero(),
-					"Reward pool balance must be zero.",
-				);
-				Ok(())
-			})?;
-
-			log!(info, "post upgrade hook for MigrateToV2 executed.");
-			Ok(())
-		}
-	}
-}
-
-pub mod v3 {
-	use super::*;
-
-	/// This migration removes stale bonded-pool metadata, if any.
-	pub struct MigrateToV3<T>(sp_std::marker::PhantomData<T>);
-	impl<T: Config> OnRuntimeUpgrade for MigrateToV3<T> {
-		fn on_runtime_upgrade() -> Weight {
-			let current = Pallet::<T>::current_storage_version();
-			let onchain = Pallet::<T>::on_chain_storage_version();
-
-			if onchain == 2 {
-				log!(
-					info,
-					"Running migration with current storage version {:?} / onchain {:?}",
-					current,
-					onchain
-				);
-
-				let mut metadata_iterated = 0u64;
-				let mut metadata_removed = 0u64;
-				Metadata::<T>::iter_keys()
-					.filter(|id| {
-						metadata_iterated += 1;
-						!BondedPools::<T>::contains_key(&id)
-					})
-					.collect::<Vec<_>>()
-					.into_iter()
-					.for_each(|id| {
-						metadata_removed += 1;
-						Metadata::<T>::remove(&id);
-					});
-				StorageVersion::new(3).put::<Pallet<T>>();
-				// metadata iterated + bonded pools read + a storage version read
-				let total_reads = metadata_iterated * 2 + 1;
-				// metadata removed + a storage version write
-				let total_writes = metadata_removed + 1;
-				T::DbWeight::get().reads_writes(total_reads, total_writes)
-			} else {
-				log!(info, "MigrateToV3 should be removed");
-				T::DbWeight::get().reads(1)
-			}
-		}
-
-		#[cfg(feature = "try-runtime")]
-		fn pre_upgrade() -> Result<Vec<u8>, TryRuntimeError> {
-			Ok(Vec::new())
-		}
-
-		#[cfg(feature = "try-runtime")]
-		fn post_upgrade(_: Vec<u8>) -> Result<(), TryRuntimeError> {
-			ensure!(
-				Metadata::<T>::iter_keys().all(|id| BondedPools::<T>::contains_key(&id)),
-				"not all of the stale metadata has been removed"
-			);
-			ensure!(
-				Pallet::<T>::on_chain_storage_version() >= 3,
-				"nomination-pools::migration::v3: wrong storage version"
-			);
-			Ok(())
-		}
-	}
-}
-
-pub mod v4 {
-	use super::*;
-
-	#[derive(Decode)]
-	pub struct OldBondedPoolInner<T: Config> {
-		pub points: BalanceOf<T>,
-		pub state: PoolState,
-		pub member_counter: u32,
-		pub roles: PoolRoles<T::AccountId>,
-	}
+			);
+			current.put::<Pallet<T>>();
 
-	impl<T: Config> OldBondedPoolInner<T> {
-		fn migrate_to_v4(self) -> BondedPoolInner<T> {
-			BondedPoolInner {
-				commission: Commission::default(),
-				member_counter: self.member_counter,
-				points: self.points,
-				state: self.state,
-				roles: self.roles,
-			}
+			T::DbWeight::get().reads_writes(members_translated + 1, reward_pools_translated + 1)
 		}
 	}
 
-	/// Migrates from `v3` directly to `v5` to avoid the broken `v4` migration.
-	#[allow(deprecated)]
-	pub type MigrateV3ToV5<T, U> = (v4::MigrateToV4<T, U>, v5::MigrateToV5<T>);
-
-	/// # Warning
-	///
-	/// To avoid mangled storage please use `MigrateV3ToV5` instead.
-	/// See: github.com/paritytech/substrate/pull/13715
-	///
-	/// This migration adds a `commission` field to every `BondedPoolInner`, if
-	/// any.
-	#[deprecated(
-		note = "To avoid mangled storage please use `MigrateV3ToV5` instead. See: github.com/paritytech/substrate/pull/13715"
-	)]
-	pub struct MigrateToV4<T, U>(sp_std::marker::PhantomData<(T, U)>);
-	#[allow(deprecated)]
-	impl<T: Config, U: Get<Perbill>> OnRuntimeUpgrade for MigrateToV4<T, U> {
+	impl<T: Config> OnRuntimeUpgrade for MigrateToV2<T> {
 		fn on_runtime_upgrade() -> Weight {
 			let current = Pallet::<T>::current_storage_version();
 			let onchain = Pallet::<T>::on_chain_storage_version();
@@ -520,96 +727,112 @@ pub mod v4 {
 				onchain
 			);
 
-			if onchain == 3 {
-				log!(warn, "Please run MigrateToV5 immediately after this migration. See github.com/paritytech/substrate/pull/13715");
-				let initial_global_max_commission = U::get();
-				GlobalMaxCommission::<T>::set(Some(initial_global_max_commission));
-				log!(
-					info,
-					"Set initial global max commission to {:?}.",
-					initial_global_max_commission
-				);
-
-				let mut translated = 0u64;
-				BondedPools::<T>::translate::<OldBondedPoolInner<T>, _>(|_key, old_value| {
-					translated.saturating_inc();
-					Some(old_value.migrate_to_v4())
-				});
-
-				StorageVersion::new(4).put::<Pallet<T>>();
-				log!(info, "Upgraded {} pools, storage to version {:?}", translated, current);
-
-				// reads: translated + onchain version.
-				// writes: translated + current.put + initial global commission.
-				T::DbWeight::get().reads_writes(translated + 1, translated + 2)
+			if current == 2 && onchain == 1 {
+				Self::run(current)
 			} else {
-				log!(info, "Migration did not execute. This probably should be removed");
+				log!(info, "MigrateToV2 did not executed. This probably should be removed");
 				T::DbWeight::get().reads(1)
 			}
 		}
 
 		#[cfg(feature = "try-runtime")]
 		fn pre_upgrade() -> Result<Vec<u8>, TryRuntimeError> {
+			// all reward accounts must have more than ED.
+			RewardPools::<T>::iter().try_for_each(|(id, _)| -> Result<(), TryRuntimeError> {
+				ensure!(
+					<T::Currency as frame_support::traits::fungible::Inspect<T::AccountId>>::balance(&Pallet::<T>::create_reward_account(id)) >=
+						T::Currency::minimum_balance(),
+					"Reward accounts must have greater balance than ED."
+				);
+				Ok(())
+			})?;
+
 			Ok(Vec::new())
 		}
 
 		#[cfg(feature = "try-runtime")]
 		fn post_upgrade(_: Vec<u8>) -> Result<(), TryRuntimeError> {
-			// ensure all BondedPools items now contain an `inner.commission: Commission` field.
+			// new version must be set.
 			ensure!(
-				BondedPools::<T>::iter().all(|(_, inner)|
-					// Check current
-					(inner.commission.current.is_none() ||
-					inner.commission.current.is_some()) &&
-					// Check max
-					(inner.commission.max.is_none() || inner.commission.max.is_some()) &&
-					// Check change_rate
-					(inner.commission.change_rate.is_none() ||
-					inner.commission.change_rate.is_some()) &&
-					// Check throttle_from
-					(inner.commission.throttle_from.is_none() ||
-					inner.commission.throttle_from.is_some())),
-				"a commission value has not been set correctly"
+				Pallet::<T>::on_chain_storage_version() == 2,
+				"The onchain version must be updated after the migration."
 			);
+
+			// no reward or bonded pool has been skipped.
 			ensure!(
-				GlobalMaxCommission::<T>::get() == Some(U::get()),
-				"global maximum commission error"
+				RewardPools::<T>::iter().count() as u32 == RewardPools::<T>::count(),
+				"The count of reward pools must remain the same after the migration."
 			);
 			ensure!(
-				Pallet::<T>::on_chain_storage_version() >= 4,
-				"nomination-pools::migration::v4: wrong storage version"
+				BondedPools::<T>::iter().count() as u32 == BondedPools::<T>::count(),
+				"The count of reward pools must remain the same after the migration."
 			);
+
+			// all reward pools must have exactly ED in them. This means no reward can be claimed,
+			// and that setting reward counters all over the board to zero will work henceforth.
+			RewardPools::<T>::iter().try_for_each(|(id, _)| -> Result<(), TryRuntimeError> {
+				ensure!(
+					RewardPool::<T>::current_balance(id) == Zero::zero(),
+					"Reward pool balance must be zero.",
+				);
+				Ok(())
+			})?;
+
+			log!(info, "post upgrade hook for MigrateToV2 executed.");
 			Ok(())
 		}
 	}
 }
 
-pub mod v5 {
+pub mod v1 {
 	use super::*;
 
 	#[derive(Decode)]
-	pub struct OldRewardPool<T: Config> {
-		last_recorded_reward_counter: T::RewardCounter,
-		last_recorded_total_payouts: BalanceOf<T>,
-		total_rewards_claimed: BalanceOf<T>,
+	pub struct OldPoolRoles<AccountId> {
+		pub depositor: AccountId,
+		pub root: AccountId,
+		pub nominator: AccountId,
+		pub bouncer: AccountId,
 	}
 
-	impl<T: Config> OldRewardPool<T> {
-		fn migrate_to_v5(self) -> RewardPool<T> {
-			RewardPool {
-				last_recorded_reward_counter: self.last_recorded_reward_counter,
-				last_recorded_total_payouts: self.last_recorded_total_payouts,
-				total_rewards_claimed: self.total_rewards_claimed,
-				total_commission_pending: Zero::zero(),
-				total_commission_claimed: Zero::zero(),
+	impl<AccountId> OldPoolRoles<AccountId> {
+		fn migrate_to_v1(self) -> PoolRoles<AccountId> {
+			PoolRoles {
+				depositor: self.depositor,
+				root: Some(self.root),
+				nominator: Some(self.nominator),
+				bouncer: Some(self.bouncer),
 			}
 		}
 	}
 
-	/// This migration adds `total_commission_pending` and `total_commission_claimed` field to every
-	/// `RewardPool`, if any.
-	pub struct MigrateToV5<T>(sp_std::marker::PhantomData<T>);
-	impl<T: Config> OnRuntimeUpgrade for MigrateToV5<T> {
+	#[derive(Decode)]
+	pub struct OldBondedPoolInner<T: Config> {
+		pub points: BalanceOf<T>,
+		pub state: PoolState,
+		pub member_counter: u32,
+		pub roles: OldPoolRoles<T::AccountId>,
+	}
+
+	impl<T: Config> OldBondedPoolInner<T> {
+		fn migrate_to_v1(self) -> BondedPoolInner<T> {
+			// Note: `commission` field not introduced to `BondedPoolInner` until
+			// migration 4.
+			BondedPoolInner {
+				points: self.points,
+				commission: Commission::default(),
+				member_counter: self.member_counter,
+				state: self.state,
+				roles: self.roles.migrate_to_v1(),
+			}
+		}
+	}
+
+	/// Trivial migration which makes the roles of each pool optional.
+	///
+	/// Note: The depositor is not optional since they can never change.
+	pub struct MigrateToV1<T>(sp_std::marker::PhantomData<T>);
+	impl<T: Config> OnRuntimeUpgrade for MigrateToV1<T> {
 		fn on_runtime_upgrade() -> Weight {
 			let current = Pallet::<T>::current_storage_version();
 			let onchain = Pallet::<T>::on_chain_storage_version();
@@ -621,106 +844,33 @@ pub mod v5 {
 				onchain
 			);
 
-			if current == 5 && onchain == 4 {
+			if current == 1 && onchain == 0 {
+				// this is safe to execute on any runtime that has a bounded number of pools.
 				let mut translated = 0u64;
-				RewardPools::<T>::translate::<OldRewardPool<T>, _>(|_id, old_value| {
+				BondedPools::<T>::translate::<OldBondedPoolInner<T>, _>(|_key, old_value| {
 					translated.saturating_inc();
-					Some(old_value.migrate_to_v5())
+					Some(old_value.migrate_to_v1())
 				});
 
 				current.put::<Pallet<T>>();
+
 				log!(info, "Upgraded {} pools, storage to version {:?}", translated, current);
 
-				// reads: translated + onchain version.
-				// writes: translated + current.put.
 				T::DbWeight::get().reads_writes(translated + 1, translated + 1)
 			} else {
-				log!(info, "Migration did not execute. This probably should be removed");
+				log!(info, "Migration did not executed. This probably should be removed");
 				T::DbWeight::get().reads(1)
 			}
 		}
 
 		#[cfg(feature = "try-runtime")]
-		fn pre_upgrade() -> Result<Vec<u8>, TryRuntimeError> {
-			let rpool_keys = RewardPools::<T>::iter_keys().count();
-			let rpool_values = RewardPools::<T>::iter_values().count();
-			if rpool_keys != rpool_values {
-				log!(info, "🔥 There are {} undecodable RewardPools in storage. This migration will try to correct them. keys: {}, values: {}", rpool_keys.saturating_sub(rpool_values), rpool_keys, rpool_values);
-			}
-
-			ensure!(
-				PoolMembers::<T>::iter_keys().count() == PoolMembers::<T>::iter_values().count(),
-				"There are undecodable PoolMembers in storage. This migration will not fix that."
-			);
-			ensure!(
-				BondedPools::<T>::iter_keys().count() == BondedPools::<T>::iter_values().count(),
-				"There are undecodable BondedPools in storage. This migration will not fix that."
-			);
-			ensure!(
-				SubPoolsStorage::<T>::iter_keys().count() ==
-					SubPoolsStorage::<T>::iter_values().count(),
-				"There are undecodable SubPools in storage. This migration will not fix that."
-			);
-			ensure!(
-				Metadata::<T>::iter_keys().count() == Metadata::<T>::iter_values().count(),
-				"There are undecodable Metadata in storage. This migration will not fix that."
-			);
-
-			Ok((rpool_values as u64).encode())
-		}
-
-		#[cfg(feature = "try-runtime")]
-		fn post_upgrade(data: Vec<u8>) -> Result<(), TryRuntimeError> {
-			let old_rpool_values: u64 = Decode::decode(&mut &data[..]).unwrap();
-			let rpool_keys = RewardPools::<T>::iter_keys().count() as u64;
-			let rpool_values = RewardPools::<T>::iter_values().count() as u64;
-			ensure!(
-				rpool_keys == rpool_values,
-				"There are STILL undecodable RewardPools - migration failed"
-			);
-
-			if old_rpool_values != rpool_values {
-				log!(
-					info,
-					"🎉 Fixed {} undecodable RewardPools.",
-					rpool_values.saturating_sub(old_rpool_values)
-				);
-			}
-
-			// ensure all RewardPools items now contain `total_commission_pending` and
-			// `total_commission_claimed` field.
-			ensure!(
-				RewardPools::<T>::iter().all(|(_, reward_pool)| reward_pool
-					.total_commission_pending >=
-					Zero::zero() && reward_pool
-					.total_commission_claimed >=
-					Zero::zero()),
-				"a commission value has been incorrectly set"
-			);
-			ensure!(
-				Pallet::<T>::on_chain_storage_version() >= 5,
-				"nomination-pools::migration::v5: wrong storage version"
-			);
-
-			// These should not have been touched - just in case.
-			ensure!(
-				PoolMembers::<T>::iter_keys().count() == PoolMembers::<T>::iter_values().count(),
-				"There are undecodable PoolMembers in storage."
-			);
-			ensure!(
-				BondedPools::<T>::iter_keys().count() == BondedPools::<T>::iter_values().count(),
-				"There are undecodable BondedPools in storage."
-			);
-			ensure!(
-				SubPoolsStorage::<T>::iter_keys().count() ==
-					SubPoolsStorage::<T>::iter_values().count(),
-				"There are undecodable SubPools in storage."
-			);
+		fn post_upgrade(_: Vec<u8>) -> Result<(), TryRuntimeError> {
+			// new version must be set.
 			ensure!(
-				Metadata::<T>::iter_keys().count() == Metadata::<T>::iter_values().count(),
-				"There are undecodable Metadata in storage."
+				Pallet::<T>::on_chain_storage_version() == 1,
+				"The onchain version must be updated after the migration."
 			);
-
+			Pallet::<T>::try_state(frame_system::Pallet::<T>::block_number())?;
 			Ok(())
 		}
 	}
diff --git a/substrate/frame/nomination-pools/src/mock.rs b/substrate/frame/nomination-pools/src/mock.rs
index 7d0d729a40d413edba5014f4cd27b507177e63f2..d806ba071bd41b5abe5a479c44093612dc3451aa 100644
--- a/substrate/frame/nomination-pools/src/mock.rs
+++ b/substrate/frame/nomination-pools/src/mock.rs
@@ -1,9 +1,26 @@
+// 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.
+
 use super::*;
 use crate::{self as pools};
-use frame_support::{assert_ok, parameter_types, PalletId};
+use frame_support::{assert_ok, parameter_types, traits::fungible::Mutate, PalletId};
 use frame_system::RawOrigin;
 use sp_runtime::{BuildStorage, FixedU128};
-use sp_staking::Stake;
+use sp_staking::{OnStakingUpdate, Stake};
 
 pub type BlockNumber = u64;
 pub type AccountId = u128;
@@ -12,6 +29,7 @@ pub type RewardCounter = FixedU128;
 // This sneaky little hack allows us to write code exactly as we would do in the pallet in the tests
 // as well, e.g. `StorageItem::<T>::get()`.
 pub type T = Runtime;
+pub type Currency = <T as Config>::Currency;
 
 // Ext builder creates a pool with id 1.
 pub fn default_bonded_account() -> AccountId {
@@ -28,20 +46,34 @@ parameter_types! {
 	pub static CurrentEra: EraIndex = 0;
 	pub static BondingDuration: EraIndex = 3;
 	pub storage BondedBalanceMap: BTreeMap<AccountId, Balance> = Default::default();
-	pub storage UnbondingBalanceMap: BTreeMap<AccountId, Balance> = Default::default();
+	// map from a user to a vec of eras and amounts being unlocked in each era.
+	pub storage UnbondingBalanceMap: BTreeMap<AccountId, Vec<(EraIndex, Balance)>> = Default::default();
 	#[derive(Clone, PartialEq)]
 	pub static MaxUnbonding: u32 = 8;
 	pub static StakingMinBond: Balance = 10;
 	pub storage Nominations: Option<Vec<AccountId>> = None;
 }
-
 pub struct StakingMock;
+
 impl StakingMock {
 	pub(crate) fn set_bonded_balance(who: AccountId, bonded: Balance) {
 		let mut x = BondedBalanceMap::get();
 		x.insert(who, bonded);
 		BondedBalanceMap::set(&x)
 	}
+	/// Mimics a slash towards a pool specified by `pool_id`.
+	/// This reduces the bonded balance of a pool by `amount` and calls [`Pools::on_slash`] to
+	/// enact changes in the nomination-pool pallet.
+	///
+	/// Does not modify any [`SubPools`] of the pool as [`Default::default`] is passed for
+	/// `slashed_unlocking`.
+	pub fn slash_by(pool_id: PoolId, amount: Balance) {
+		let acc = Pools::create_bonded_account(pool_id);
+		let bonded = BondedBalanceMap::get();
+		let pre_total = bonded.get(&acc).unwrap();
+		Self::set_bonded_balance(acc, pre_total - amount);
+		Pools::on_slash(&acc, pre_total - amount, &Default::default(), amount);
+	}
 }
 
 impl sp_staking::StakingInterface for StakingMock {
@@ -87,8 +119,11 @@ impl sp_staking::StakingInterface for StakingMock {
 		let mut x = BondedBalanceMap::get();
 		*x.get_mut(who).unwrap() = x.get_mut(who).unwrap().saturating_sub(amount);
 		BondedBalanceMap::set(&x);
+
+		let era = Self::current_era();
+		let unlocking_at = era + Self::bonding_duration();
 		let mut y = UnbondingBalanceMap::get();
-		*y.entry(*who).or_insert(Self::Balance::zero()) += amount;
+		y.entry(*who).or_insert(Default::default()).push((unlocking_at, amount));
 		UnbondingBalanceMap::set(&y);
 		Ok(())
 	}
@@ -98,11 +133,13 @@ impl sp_staking::StakingInterface for StakingMock {
 	}
 
 	fn withdraw_unbonded(who: Self::AccountId, _: u32) -> Result<bool, DispatchError> {
-		// Simulates removing unlocking chunks and only having the bonded balance locked
-		let mut x = UnbondingBalanceMap::get();
-		x.remove(&who);
-		UnbondingBalanceMap::set(&x);
+		let mut unbonding_map = UnbondingBalanceMap::get();
+		let staker_map = unbonding_map.get_mut(&who).ok_or("Nothing to unbond")?;
 
+		let current_era = Self::current_era();
+		staker_map.retain(|(unlocking_at, _amount)| *unlocking_at > current_era);
+
+		UnbondingBalanceMap::set(&unbonding_map);
 		Ok(UnbondingBalanceMap::get().is_empty() && BondedBalanceMap::get().is_empty())
 	}
 
@@ -126,14 +163,17 @@ impl sp_staking::StakingInterface for StakingMock {
 	}
 
 	fn stake(who: &Self::AccountId) -> Result<Stake<Balance>, DispatchError> {
-		match (
-			UnbondingBalanceMap::get().get(who).copied(),
-			BondedBalanceMap::get().get(who).copied(),
-		) {
+		match (UnbondingBalanceMap::get().get(who), BondedBalanceMap::get().get(who).copied()) {
 			(None, None) => Err(DispatchError::Other("balance not found")),
-			(Some(v), None) => Ok(Stake { total: v, active: 0 }),
+			(Some(v), None) => Ok(Stake {
+				total: v.into_iter().fold(0u128, |acc, &x| acc.saturating_add(x.1)),
+				active: 0,
+			}),
 			(None, Some(v)) => Ok(Stake { total: v, active: v }),
-			(Some(a), Some(b)) => Ok(Stake { total: a + b, active: b }),
+			(Some(a), Some(b)) => Ok(Stake {
+				total: a.into_iter().fold(0u128, |acc, &x| acc.saturating_add(x.1)) + b,
+				active: b,
+			}),
 		}
 	}
 
@@ -204,8 +244,8 @@ impl pallet_balances::Config for Runtime {
 	type ExistentialDeposit = ExistentialDeposit;
 	type AccountStore = System;
 	type WeightInfo = ();
-	type FreezeIdentifier = ();
-	type MaxFreezes = ();
+	type FreezeIdentifier = RuntimeFreezeReason;
+	type MaxFreezes = ConstU32<1>;
 	type RuntimeHoldReason = ();
 	type MaxHolds = ();
 }
@@ -234,6 +274,7 @@ impl pools::Config for Runtime {
 	type RuntimeEvent = RuntimeEvent;
 	type WeightInfo = ();
 	type Currency = Balances;
+	type RuntimeFreezeReason = RuntimeFreezeReason;
 	type RewardCounter = RewardCounter;
 	type BalanceToU256 = BalanceToU256;
 	type U256ToBalance = U256ToBalance;
@@ -251,7 +292,7 @@ frame_support::construct_runtime!(
 	{
 		System: frame_system::{Pallet, Call, Storage, Event<T>, Config<T>},
 		Balances: pallet_balances::{Pallet, Call, Storage, Config<T>, Event<T>},
-		Pools: pools::{Pallet, Call, Storage, Event<T>},
+		Pools: pools::{Pallet, Call, Storage, Event<T>, FreezeReason},
 	}
 );
 
@@ -339,12 +380,12 @@ impl ExtBuilder {
 
 			// make a pool
 			let amount_to_bond = Pools::depositor_min_bond();
-			Balances::make_free_balance_be(&10, amount_to_bond * 5);
+			Currency::set_balance(&10, amount_to_bond * 5);
 			assert_ok!(Pools::create(RawOrigin::Signed(10).into(), amount_to_bond, 900, 901, 902));
 			assert_ok!(Pools::set_metadata(RuntimeOrigin::signed(900), 1, vec![1, 1]));
 			let last_pool = LastPoolId::<Runtime>::get();
 			for (account_id, bonded) in self.members {
-				Balances::make_free_balance_be(&account_id, bonded * 2);
+				<Runtime as Config>::Currency::set_balance(&account_id, bonded * 2);
 				assert_ok!(Pools::join(RawOrigin::Signed(account_id).into(), bonded, last_pool));
 			}
 		});
@@ -423,6 +464,58 @@ pub fn fully_unbond_permissioned(member: AccountId) -> DispatchResult {
 	Pools::unbond(RuntimeOrigin::signed(member), member, points)
 }
 
+pub fn pending_rewards_for_delegator(delegator: AccountId) -> Balance {
+	let member = PoolMembers::<T>::get(delegator).unwrap();
+	let bonded_pool = BondedPools::<T>::get(member.pool_id).unwrap();
+	let reward_pool = RewardPools::<T>::get(member.pool_id).unwrap();
+
+	assert!(!bonded_pool.points.is_zero());
+
+	let commission = bonded_pool.commission.current();
+	let current_rc = reward_pool
+		.current_reward_counter(member.pool_id, bonded_pool.points, commission)
+		.unwrap()
+		.0;
+
+	member.pending_rewards(current_rc).unwrap_or_default()
+}
+
+#[derive(PartialEq, Debug)]
+pub enum RewardImbalance {
+	// There is no reward deficit.
+	Surplus(Balance),
+	// There is a reward deficit.
+	Deficit(Balance),
+}
+
+pub fn pool_pending_rewards(pool: PoolId) -> Result<BalanceOf<T>, sp_runtime::DispatchError> {
+	let bonded_pool = BondedPools::<T>::get(pool).ok_or(Error::<T>::PoolNotFound)?;
+	let reward_pool = RewardPools::<T>::get(pool).ok_or(Error::<T>::PoolNotFound)?;
+
+	let current_rc = if !bonded_pool.points.is_zero() {
+		let commission = bonded_pool.commission.current();
+		reward_pool.current_reward_counter(pool, bonded_pool.points, commission)?.0
+	} else {
+		Default::default()
+	};
+
+	Ok(PoolMembers::<T>::iter()
+		.filter(|(_, d)| d.pool_id == pool)
+		.map(|(_, d)| d.pending_rewards(current_rc).unwrap_or_default())
+		.fold(0u32.into(), |acc: BalanceOf<T>, x| acc.saturating_add(x)))
+}
+
+pub fn reward_imbalance(pool: PoolId) -> RewardImbalance {
+	let pending_rewards = pool_pending_rewards(pool).expect("pool should exist");
+	let current_balance = RewardPool::<Runtime>::current_balance(pool);
+
+	if pending_rewards > current_balance {
+		RewardImbalance::Deficit(pending_rewards - current_balance)
+	} else {
+		RewardImbalance::Surplus(current_balance - pending_rewards)
+	}
+}
+
 #[cfg(test)]
 mod test {
 	use super::*;
diff --git a/substrate/frame/nomination-pools/src/tests.rs b/substrate/frame/nomination-pools/src/tests.rs
index d0fe4e40a18b75d90b639271f90b249596208d84..2749e89ecff33659dc96d2ddae9f3195e557a645 100644
--- a/substrate/frame/nomination-pools/src/tests.rs
+++ b/substrate/frame/nomination-pools/src/tests.rs
@@ -40,13 +40,13 @@ pub const DEFAULT_ROLES: PoolRoles<AccountId> =
 	PoolRoles { depositor: 10, root: Some(900), nominator: Some(901), bouncer: Some(902) };
 
 fn deposit_rewards(r: u128) {
-	let b = Balances::free_balance(&default_reward_account()).checked_add(r).unwrap();
-	Balances::make_free_balance_be(&default_reward_account(), b);
+	let b = Currency::free_balance(&default_reward_account()).checked_add(r).unwrap();
+	Currency::set_balance(&default_reward_account(), b);
 }
 
 fn remove_rewards(r: u128) {
-	let b = Balances::free_balance(&default_reward_account()).checked_sub(r).unwrap();
-	Balances::make_free_balance_be(&default_reward_account(), b);
+	let b = Currency::free_balance(&default_reward_account()).checked_sub(r).unwrap();
+	Currency::set_balance(&default_reward_account(), b);
 }
 
 #[test]
@@ -59,6 +59,9 @@ fn test_setup_works() {
 		assert_eq!(StakingMock::bonding_duration(), 3);
 		assert!(Metadata::<T>::contains_key(1));
 
+		// initial member.
+		assert_eq!(TotalValueLocked::<T>::get(), 10);
+
 		let last_pool = LastPoolId::<Runtime>::get();
 		assert_eq!(
 			BondedPool::<Runtime>::get(last_pool).unwrap(),
@@ -99,7 +102,7 @@ fn test_setup_works() {
 		assert!(Nominations::get().is_none());
 
 		// reward account should have an initial ED in it.
-		assert_eq!(Balances::free_balance(&reward_account), Balances::minimum_balance());
+		assert_eq!(Currency::free_balance(&reward_account), Currency::minimum_balance());
 	})
 }
 
@@ -218,10 +221,7 @@ mod bonded_pool {
 
 			// slash half of the pool's balance. expected result of `fn api_points_to_balance`
 			// to be 1/2 of the pool's balance.
-			StakingMock::set_bonded_balance(
-				default_bonded_account(),
-				Pools::depositor_min_bond() / 2,
-			);
+			StakingMock::slash_by(1, Pools::depositor_min_bond() / 2);
 			assert_eq!(Pallet::<Runtime>::api_points_to_balance(1, 10), 5);
 
 			// if pool does not exist, points to balance ratio is 0.
@@ -238,10 +238,7 @@ mod bonded_pool {
 
 			// slash half of the pool's balance. expect result of `fn api_balance_to_points`
 			// to be 2 * of the balance to add to the pool.
-			StakingMock::set_bonded_balance(
-				default_bonded_account(),
-				Pools::depositor_min_bond() / 2,
-			);
+			StakingMock::slash_by(1, Pools::depositor_min_bond() / 2);
 			assert_eq!(Pallet::<Runtime>::api_balance_to_points(1, 10), 20);
 
 			// if pool does not exist, balance to points ratio is 0.
@@ -298,30 +295,168 @@ mod bonded_pool {
 }
 
 mod reward_pool {
+	use super::*;
+	use crate::mock::RewardImbalance::{Deficit, Surplus};
+
 	#[test]
-	fn current_balance_only_counts_balance_over_existential_deposit() {
-		use super::*;
+	fn ed_change_causes_reward_deficit() {
+		ExtBuilder::default().max_members_per_pool(Some(5)).build_and_execute(|| {
+			// original ED
+			ExistentialDeposit::set(5);
 
-		ExtBuilder::default().build_and_execute(|| {
-			let reward_account = Pools::create_reward_account(2);
+			// 11 joins the pool
+			Currency::set_balance(&11, 500);
+			assert_ok!(Pools::join(RuntimeOrigin::signed(11), 90, 1));
 
-			// Given
-			assert_eq!(Balances::free_balance(&reward_account), 0);
+			// new delegator does not have any pending rewards
+			assert_eq!(pending_rewards_for_delegator(11), 0);
 
-			// Then
-			assert_eq!(RewardPool::<Runtime>::current_balance(2), 0);
+			// give the pool some rewards
+			deposit_rewards(100);
 
-			// Given
-			Balances::make_free_balance_be(&reward_account, Balances::minimum_balance());
+			// all existing delegator has pending rewards
+			assert_eq!(pending_rewards_for_delegator(11), 90);
+			assert_eq!(pending_rewards_for_delegator(10), 10);
+			assert_eq!(reward_imbalance(1), Surplus(0));
 
-			// Then
-			assert_eq!(RewardPool::<Runtime>::current_balance(2), 0);
+			// 12 joins the pool.
+			Currency::set_balance(&12, 500);
+			assert_ok!(Pools::join(RuntimeOrigin::signed(12), 100, 1));
 
-			// Given
-			Balances::make_free_balance_be(&reward_account, Balances::minimum_balance() + 1);
+			// Current reward balance is committed to last recorded reward counter of
+			// the pool before the increase in ED.
+			let bonded_pool = BondedPools::<Runtime>::get(1).unwrap();
+			let reward_pool = RewardPools::<Runtime>::get(1).unwrap();
+			assert_eq!(
+				reward_pool.last_recorded_reward_counter,
+				reward_pool
+					.current_reward_counter(1, bonded_pool.points, Perbill::zero())
+					.unwrap()
+					.0
+			);
 
-			// Then
-			assert_eq!(RewardPool::<Runtime>::current_balance(2), 1);
+			// reward pool before ED increase and reward counter getting committed.
+			let reward_pool_1 = RewardPools::<Runtime>::get(1).unwrap();
+
+			// increase ED from 5 to 50
+			ExistentialDeposit::set(50);
+
+			// There is now an expected deficit of ed_diff
+			assert_eq!(reward_imbalance(1), Deficit(45));
+
+			// 13 joins the pool which commits the reward counter to reward pool.
+			Currency::set_balance(&13, 500);
+			assert_ok!(Pools::join(RuntimeOrigin::signed(13), 100, 1));
+
+			// still a deficit
+			assert_eq!(reward_imbalance(1), Deficit(45));
+
+			// reward pool after ED increase
+			let reward_pool_2 = RewardPools::<Runtime>::get(1).unwrap();
+
+			// last recorded total payout does not decrease even as ED increases.
+			assert_eq!(
+				reward_pool_1.last_recorded_total_payouts,
+				reward_pool_2.last_recorded_total_payouts
+			);
+
+			// Topping up pool decreases deficit
+			deposit_rewards(10);
+			assert_eq!(reward_imbalance(1), Deficit(35));
+
+			// top up the pool to remove the deficit
+			deposit_rewards(35);
+			// No deficit anymore
+			assert_eq!(reward_imbalance(1), Surplus(0));
+
+			// fix the ed deficit
+			assert_ok!(Currency::mint_into(&10, 45));
+			assert_ok!(Pools::adjust_pool_deposit(RuntimeOrigin::signed(10), 1));
+		});
+	}
+
+	#[test]
+	fn ed_adjust_fixes_reward_deficit() {
+		ExtBuilder::default().max_members_per_pool(Some(5)).build_and_execute(|| {
+			// Given: pool has a reward deficit
+
+			// original ED
+			ExistentialDeposit::set(5);
+
+			// 11 joins the pool
+			Currency::set_balance(&11, 500);
+			assert_ok!(Pools::join(RuntimeOrigin::signed(11), 90, 1));
+
+			// Pool some rewards
+			deposit_rewards(100);
+
+			// 12 joins the pool.
+			Currency::set_balance(&12, 500);
+			assert_ok!(Pools::join(RuntimeOrigin::signed(12), 10, 1));
+
+			// When: pool ends up in reward deficit
+			// increase ED
+			ExistentialDeposit::set(50);
+			assert_eq!(reward_imbalance(1), Deficit(45));
+
+			// clear events
+			pool_events_since_last_call();
+
+			// Then: Anyone can permissionlessly can adjust ED deposit.
+
+			// make sure caller has enough funds..
+			assert_ok!(Currency::mint_into(&99, 100));
+			let pre_balance = Currency::free_balance(&99);
+			// adjust ED
+			assert_ok!(Pools::adjust_pool_deposit(RuntimeOrigin::signed(99), 1));
+			// depositor's balance should decrease by 45
+			assert_eq!(Currency::free_balance(&99), pre_balance - 45);
+			assert_eq!(reward_imbalance(1), Surplus(0));
+
+			assert_eq!(
+				pool_events_since_last_call(),
+				vec![Event::MinBalanceDeficitAdjusted { pool_id: 1, amount: 45 },]
+			);
+
+			// Trying to top up again does not work
+			assert_err!(
+				Pools::adjust_pool_deposit(RuntimeOrigin::signed(10), 1),
+				Error::<T>::NothingToAdjust
+			);
+
+			// When: ED is decreased and reward account has excess ED frozen
+			ExistentialDeposit::set(5);
+
+			// And:: adjust ED deposit is called
+			let pre_balance = Currency::free_balance(&100);
+			assert_ok!(Pools::adjust_pool_deposit(RuntimeOrigin::signed(100), 1));
+
+			// Then: excess ED is claimed by the caller
+			assert_eq!(Currency::free_balance(&100), pre_balance + 45);
+
+			assert_eq!(
+				pool_events_since_last_call(),
+				vec![Event::MinBalanceExcessAdjusted { pool_id: 1, amount: 45 },]
+			);
+		});
+	}
+
+	#[test]
+	fn topping_up_does_not_work_for_pools_with_no_deficit() {
+		ExtBuilder::default().max_members_per_pool(Some(5)).build_and_execute(|| {
+			// 11 joins the pool
+			Currency::set_balance(&11, 500);
+			assert_ok!(Pools::join(RuntimeOrigin::signed(11), 90, 1));
+
+			// Pool some rewards
+			deposit_rewards(100);
+			assert_eq!(reward_imbalance(1), Surplus(0));
+
+			// Topping up fails
+			assert_err!(
+				Pools::adjust_pool_deposit(RuntimeOrigin::signed(10), 1),
+				Error::<T>::NothingToAdjust
+			);
 		});
 	}
 }
@@ -497,14 +632,14 @@ mod join {
 		};
 		ExtBuilder::default().with_check(0).build_and_execute(|| {
 			// Given
-			Balances::make_free_balance_be(&11, ExistentialDeposit::get() + 2);
+			Currency::set_balance(&11, ExistentialDeposit::get() + 2);
 			assert!(!PoolMembers::<Runtime>::contains_key(11));
+			assert_eq!(TotalValueLocked::<T>::get(), 10);
 
 			// When
 			assert_ok!(Pools::join(RuntimeOrigin::signed(11), 2, 1));
 
 			// Then
-
 			assert_eq!(
 				pool_events_since_last_call(),
 				vec![
@@ -513,6 +648,7 @@ mod join {
 					Event::Bonded { member: 11, pool_id: 1, bonded: 2, joined: true },
 				]
 			);
+			assert_eq!(TotalValueLocked::<T>::get(), 12);
 
 			assert_eq!(
 				PoolMembers::<Runtime>::get(11).unwrap(),
@@ -522,10 +658,10 @@ mod join {
 
 			// Given
 			// The bonded balance is slashed in half
-			StakingMock::set_bonded_balance(Pools::create_bonded_account(1), 6);
+			StakingMock::slash_by(1, 6);
 
 			// And
-			Balances::make_free_balance_be(&12, ExistentialDeposit::get() + 12);
+			Currency::set_balance(&12, ExistentialDeposit::get() + 12);
 			assert!(!PoolMembers::<Runtime>::contains_key(12));
 
 			// When
@@ -534,8 +670,12 @@ mod join {
 			// Then
 			assert_eq!(
 				pool_events_since_last_call(),
-				vec![Event::Bonded { member: 12, pool_id: 1, bonded: 12, joined: true }]
+				vec![
+					Event::PoolSlashed { pool_id: 1, balance: 6 },
+					Event::Bonded { member: 12, pool_id: 1, bonded: 12, joined: true }
+				]
 			);
+			assert_eq!(TotalValueLocked::<T>::get(), 18);
 
 			assert_eq!(
 				PoolMembers::<Runtime>::get(12).unwrap(),
@@ -661,12 +801,12 @@ mod join {
 			assert_eq!(MaxPoolMembersPerPool::<Runtime>::get(), Some(3));
 			for i in 1..3 {
 				let account = i + 100;
-				Balances::make_free_balance_be(&account, 100 + Balances::minimum_balance());
+				Currency::set_balance(&account, 100 + Currency::minimum_balance());
 
 				assert_ok!(Pools::join(RuntimeOrigin::signed(account), 100, 1));
 			}
 
-			Balances::make_free_balance_be(&103, 100 + Balances::minimum_balance());
+			Currency::set_balance(&103, 100 + Currency::minimum_balance());
 
 			// Then
 			assert_eq!(
@@ -688,7 +828,7 @@ mod join {
 			assert_eq!(PoolMembers::<Runtime>::count(), 3);
 			assert_eq!(MaxPoolMembers::<Runtime>::get(), Some(4));
 
-			Balances::make_free_balance_be(&104, 100 + Balances::minimum_balance());
+			Currency::set_balance(&104, 100 + Currency::minimum_balance());
 			assert_ok!(Pools::create(RuntimeOrigin::signed(104), 100, 104, 104, 104));
 
 			let pool_account = BondedPools::<Runtime>::iter()
@@ -754,13 +894,13 @@ mod claim_payout {
 			.add_members(vec![(40, 40), (50, 50)])
 			.build_and_execute(|| {
 				// Given each member currently has a free balance of
-				Balances::make_free_balance_be(&10, 0);
-				Balances::make_free_balance_be(&40, 0);
-				Balances::make_free_balance_be(&50, 0);
-				let ed = Balances::minimum_balance();
+				Currency::set_balance(&10, 0);
+				Currency::set_balance(&40, 0);
+				Currency::set_balance(&50, 0);
+				let ed = Currency::minimum_balance();
 
 				// and the reward pool has earned 100 in rewards
-				assert_eq!(Balances::free_balance(default_reward_account()), ed);
+				assert_eq!(Currency::free_balance(&default_reward_account()), ed);
 				deposit_rewards(100);
 
 				let _ = pool_events_since_last_call();
@@ -778,8 +918,8 @@ mod claim_payout {
 				// pool's 'last_recorded_reward_counter' and 'last_recorded_total_payouts' don't
 				// really change unless if someone bonds/unbonds.
 				assert_eq!(RewardPools::<Runtime>::get(1).unwrap(), rew(0, 0, 10));
-				assert_eq!(Balances::free_balance(&10), 10);
-				assert_eq!(Balances::free_balance(&default_reward_account()), ed + 90);
+				assert_eq!(Currency::free_balance(&10), 10);
+				assert_eq!(Currency::free_balance(&default_reward_account()), ed + 90);
 
 				// When
 				assert_ok!(Pools::claim_payout(RuntimeOrigin::signed(40)));
@@ -791,8 +931,8 @@ mod claim_payout {
 				);
 				assert_eq!(PoolMembers::<Runtime>::get(40).unwrap(), del(40, 1));
 				assert_eq!(RewardPools::<Runtime>::get(1).unwrap(), rew(0, 0, 50));
-				assert_eq!(Balances::free_balance(&40), 40);
-				assert_eq!(Balances::free_balance(&default_reward_account()), ed + 50);
+				assert_eq!(Currency::free_balance(&40), 40);
+				assert_eq!(Currency::free_balance(&default_reward_account()), ed + 50);
 
 				// When
 				assert_ok!(Pools::claim_payout(RuntimeOrigin::signed(50)));
@@ -804,8 +944,8 @@ mod claim_payout {
 				);
 				assert_eq!(PoolMembers::<Runtime>::get(50).unwrap(), del(50, 1));
 				assert_eq!(RewardPools::<Runtime>::get(1).unwrap(), rew(0, 0, 100));
-				assert_eq!(Balances::free_balance(&50), 50);
-				assert_eq!(Balances::free_balance(&default_reward_account()), ed);
+				assert_eq!(Currency::free_balance(&50), 50);
+				assert_eq!(Currency::free_balance(&default_reward_account()), ed);
 
 				// Given the reward pool has some new rewards
 				deposit_rewards(50);
@@ -820,8 +960,8 @@ mod claim_payout {
 				);
 				assert_eq!(PoolMembers::<Runtime>::get(10).unwrap(), del_float(10, 1.5));
 				assert_eq!(RewardPools::<Runtime>::get(1).unwrap(), rew(0, 0, 105));
-				assert_eq!(Balances::free_balance(&10), 10 + 5);
-				assert_eq!(Balances::free_balance(&default_reward_account()), ed + 45);
+				assert_eq!(Currency::free_balance(&10), 10 + 5);
+				assert_eq!(Currency::free_balance(&default_reward_account()), ed + 45);
 
 				// When
 				assert_ok!(Pools::claim_payout(RuntimeOrigin::signed(40)));
@@ -833,12 +973,12 @@ mod claim_payout {
 				);
 				assert_eq!(PoolMembers::<Runtime>::get(40).unwrap(), del_float(40, 1.5));
 				assert_eq!(RewardPools::<Runtime>::get(1).unwrap(), rew(0, 0, 125));
-				assert_eq!(Balances::free_balance(&40), 40 + 20);
-				assert_eq!(Balances::free_balance(&default_reward_account()), ed + 25);
+				assert_eq!(Currency::free_balance(&40), 40 + 20);
+				assert_eq!(Currency::free_balance(&default_reward_account()), ed + 25);
 
 				// Given del 50 hasn't claimed and the reward pools has just earned 50
 				deposit_rewards(50);
-				assert_eq!(Balances::free_balance(&default_reward_account()), ed + 75);
+				assert_eq!(Currency::free_balance(&default_reward_account()), ed + 75);
 
 				// When
 				assert_ok!(Pools::claim_payout(RuntimeOrigin::signed(50)));
@@ -850,8 +990,8 @@ mod claim_payout {
 				);
 				assert_eq!(PoolMembers::<Runtime>::get(50).unwrap(), del_float(50, 2.0));
 				assert_eq!(RewardPools::<Runtime>::get(1).unwrap(), rew(0, 0, 175));
-				assert_eq!(Balances::free_balance(&50), 50 + 50);
-				assert_eq!(Balances::free_balance(&default_reward_account()), ed + 25);
+				assert_eq!(Currency::free_balance(&50), 50 + 50);
+				assert_eq!(Currency::free_balance(&default_reward_account()), ed + 25);
 
 				// When
 				assert_ok!(Pools::claim_payout(RuntimeOrigin::signed(10)));
@@ -863,12 +1003,12 @@ mod claim_payout {
 				);
 				assert_eq!(PoolMembers::<Runtime>::get(10).unwrap(), del(10, 2));
 				assert_eq!(RewardPools::<Runtime>::get(1).unwrap(), rew(0, 0, 180));
-				assert_eq!(Balances::free_balance(&10), 15 + 5);
-				assert_eq!(Balances::free_balance(&default_reward_account()), ed + 20);
+				assert_eq!(Currency::free_balance(&10), 15 + 5);
+				assert_eq!(Currency::free_balance(&default_reward_account()), ed + 20);
 
 				// Given del 40 hasn't claimed and the reward pool has just earned 400
 				deposit_rewards(400);
-				assert_eq!(Balances::free_balance(&default_reward_account()), ed + 420);
+				assert_eq!(Currency::free_balance(&default_reward_account()), ed + 420);
 
 				// When
 				assert_ok!(Pools::claim_payout(RuntimeOrigin::signed(10)));
@@ -882,12 +1022,12 @@ mod claim_payout {
 				// We expect a payout of 40
 				assert_eq!(PoolMembers::<Runtime>::get(10).unwrap(), del(10, 6));
 				assert_eq!(RewardPools::<Runtime>::get(1).unwrap(), rew(0, 0, 220));
-				assert_eq!(Balances::free_balance(&10), 20 + 40);
-				assert_eq!(Balances::free_balance(&default_reward_account()), ed + 380);
+				assert_eq!(Currency::free_balance(&10), 20 + 40);
+				assert_eq!(Currency::free_balance(&default_reward_account()), ed + 380);
 
 				// Given del 40 + del 50 haven't claimed and the reward pool has earned 20
 				deposit_rewards(20);
-				assert_eq!(Balances::free_balance(&default_reward_account()), ed + 400);
+				assert_eq!(Currency::free_balance(&default_reward_account()), ed + 400);
 
 				// When
 				assert_ok!(Pools::claim_payout(RuntimeOrigin::signed(10)));
@@ -899,8 +1039,8 @@ mod claim_payout {
 				);
 				assert_eq!(PoolMembers::<Runtime>::get(10).unwrap(), del_float(10, 6.2));
 				assert_eq!(RewardPools::<Runtime>::get(1).unwrap(), rew(0, 0, 222));
-				assert_eq!(Balances::free_balance(&10), 60 + 2);
-				assert_eq!(Balances::free_balance(&default_reward_account()), ed + 398);
+				assert_eq!(Currency::free_balance(&10), 60 + 2);
+				assert_eq!(Currency::free_balance(&default_reward_account()), ed + 398);
 
 				// When
 				assert_ok!(Pools::claim_payout(RuntimeOrigin::signed(40)));
@@ -912,8 +1052,8 @@ mod claim_payout {
 				);
 				assert_eq!(PoolMembers::<Runtime>::get(40).unwrap(), del_float(40, 6.2));
 				assert_eq!(RewardPools::<Runtime>::get(1).unwrap(), rew(0, 0, 410));
-				assert_eq!(Balances::free_balance(&40), 60 + 188);
-				assert_eq!(Balances::free_balance(&default_reward_account()), ed + 210);
+				assert_eq!(Currency::free_balance(&40), 60 + 188);
+				assert_eq!(Currency::free_balance(&default_reward_account()), ed + 210);
 
 				// When
 				assert_ok!(Pools::claim_payout(RuntimeOrigin::signed(50)));
@@ -925,8 +1065,8 @@ mod claim_payout {
 				);
 				assert_eq!(PoolMembers::<Runtime>::get(50).unwrap(), del_float(50, 6.2));
 				assert_eq!(RewardPools::<Runtime>::get(1).unwrap(), rew(0, 0, 620));
-				assert_eq!(Balances::free_balance(&50), 100 + 210);
-				assert_eq!(Balances::free_balance(&default_reward_account()), ed);
+				assert_eq!(Currency::free_balance(&50), 100 + 210);
+				assert_eq!(Currency::free_balance(&default_reward_account()), ed);
 			});
 	}
 
@@ -960,7 +1100,7 @@ mod claim_payout {
 				Pools::get_member_with_pools(&10).unwrap();
 
 			// top up commission payee account to existential deposit
-			let _ = Balances::deposit_creating(&2, 5);
+			let _ = Currency::set_balance(&2, 5);
 
 			// Set a commission pool 1 to 75%, with a payee set to `2`
 			assert_ok!(Pools::set_commission(
@@ -1010,7 +1150,7 @@ mod claim_payout {
 		ExtBuilder::default().build_and_execute(|| {
 			let (mut member, mut bonded_pool, mut reward_pool) =
 				Pools::get_member_with_pools(&10).unwrap();
-			let ed = Balances::minimum_balance();
+			let ed = Currency::minimum_balance();
 
 			let payout =
 				Pools::do_reward_payout(&10, &mut member, &mut bonded_pool, &mut reward_pool)
@@ -1060,7 +1200,7 @@ mod claim_payout {
 			assert_eq!(member, del(1.5));
 
 			// Given the pool has earned no new rewards
-			Balances::make_free_balance_be(&default_reward_account(), ed);
+			Currency::set_balance(&default_reward_account(), ed);
 
 			// When
 			let payout =
@@ -1267,7 +1407,7 @@ mod claim_payout {
 			deposit_rewards(10);
 
 			// 20 joins afterwards.
-			Balances::make_free_balance_be(&20, Balances::minimum_balance() + 10);
+			Currency::set_balance(&20, Currency::minimum_balance() + 10);
 			assert_ok!(Pools::join(RuntimeOrigin::signed(20), 10, 1));
 
 			// reward by another 20
@@ -1310,7 +1450,7 @@ mod claim_payout {
 		ExtBuilder::default().build_and_execute(|| {
 			deposit_rewards(3);
 
-			Balances::make_free_balance_be(&20, Balances::minimum_balance() + 10);
+			Currency::set_balance(&20, Currency::minimum_balance() + 10);
 			assert_ok!(Pools::join(RuntimeOrigin::signed(20), 10, 1));
 
 			deposit_rewards(6);
@@ -1363,16 +1503,16 @@ mod claim_payout {
 	#[test]
 	fn rewards_distribution_is_fair_3() {
 		ExtBuilder::default().build_and_execute(|| {
-			let ed = Balances::minimum_balance();
+			let ed = Currency::minimum_balance();
 
 			deposit_rewards(30);
 
-			Balances::make_free_balance_be(&20, ed + 10);
+			Currency::set_balance(&20, ed + 10);
 			assert_ok!(Pools::join(RuntimeOrigin::signed(20), 10, 1));
 
 			deposit_rewards(100);
 
-			Balances::make_free_balance_be(&30, ed + 10);
+			Currency::set_balance(&30, ed + 10);
 			assert_ok!(Pools::join(RuntimeOrigin::signed(30), 10, 1));
 
 			deposit_rewards(60);
@@ -1416,14 +1556,14 @@ mod claim_payout {
 	#[test]
 	fn pending_rewards_per_member_works() {
 		ExtBuilder::default().build_and_execute(|| {
-			let ed = Balances::minimum_balance();
+			let ed = Currency::minimum_balance();
 
 			assert_eq!(Pools::api_pending_rewards(10), Some(0));
 			deposit_rewards(30);
 			assert_eq!(Pools::api_pending_rewards(10), Some(30));
 			assert_eq!(Pools::api_pending_rewards(20), None);
 
-			Balances::make_free_balance_be(&20, ed + 10);
+			Currency::set_balance(&20, ed + 10);
 			assert_ok!(Pools::join(RuntimeOrigin::signed(20), 10, 1));
 
 			assert_eq!(Pools::api_pending_rewards(10), Some(30));
@@ -1435,7 +1575,7 @@ mod claim_payout {
 			assert_eq!(Pools::api_pending_rewards(20), Some(50));
 			assert_eq!(Pools::api_pending_rewards(30), None);
 
-			Balances::make_free_balance_be(&30, ed + 10);
+			Currency::set_balance(&30, ed + 10);
 			assert_ok!(Pools::join(RuntimeOrigin::signed(30), 10, 1));
 
 			assert_eq!(Pools::api_pending_rewards(10), Some(30 + 50));
@@ -1469,11 +1609,11 @@ mod claim_payout {
 	#[test]
 	fn rewards_distribution_is_fair_bond_extra() {
 		ExtBuilder::default().build_and_execute(|| {
-			let ed = Balances::minimum_balance();
+			let ed = Currency::minimum_balance();
 
-			Balances::make_free_balance_be(&20, ed + 20);
+			Currency::set_balance(&20, ed + 20);
 			assert_ok!(Pools::join(RuntimeOrigin::signed(20), 20, 1));
-			Balances::make_free_balance_be(&30, ed + 20);
+			Currency::set_balance(&30, ed + 20);
 			assert_ok!(Pools::join(RuntimeOrigin::signed(30), 10, 1));
 
 			deposit_rewards(40);
@@ -1521,9 +1661,9 @@ mod claim_payout {
 	#[test]
 	fn rewards_distribution_is_fair_unbond() {
 		ExtBuilder::default().build_and_execute(|| {
-			let ed = Balances::minimum_balance();
+			let ed = Currency::minimum_balance();
 
-			Balances::make_free_balance_be(&20, ed + 20);
+			Currency::set_balance(&20, ed + 20);
 			assert_ok!(Pools::join(RuntimeOrigin::signed(20), 20, 1));
 
 			deposit_rewards(30);
@@ -1566,11 +1706,11 @@ mod claim_payout {
 	#[test]
 	fn unclaimed_reward_is_safe() {
 		ExtBuilder::default().build_and_execute(|| {
-			let ed = Balances::minimum_balance();
+			let ed = Currency::minimum_balance();
 
-			Balances::make_free_balance_be(&20, ed + 20);
+			Currency::set_balance(&20, ed + 20);
 			assert_ok!(Pools::join(RuntimeOrigin::signed(20), 20, 1));
-			Balances::make_free_balance_be(&30, ed + 20);
+			Currency::set_balance(&30, ed + 20);
 			assert_ok!(Pools::join(RuntimeOrigin::signed(30), 10, 1));
 
 			// 10 gets 10, 20 gets 20, 30 gets 10
@@ -1635,9 +1775,9 @@ mod claim_payout {
 	#[test]
 	fn bond_extra_and_delayed_claim() {
 		ExtBuilder::default().build_and_execute(|| {
-			let ed = Balances::minimum_balance();
+			let ed = Currency::minimum_balance();
 
-			Balances::make_free_balance_be(&20, ed + 200);
+			Currency::set_balance(&20, ed + 200);
 			assert_ok!(Pools::join(RuntimeOrigin::signed(20), 20, 1));
 
 			// 10 gets 10, 20 gets 20, 30 gets 10
@@ -1710,7 +1850,7 @@ mod claim_payout {
 			deposit_rewards(60);
 
 			// create pool 2
-			Balances::make_free_balance_be(&20, 100);
+			Currency::set_balance(&20, 100);
 			assert_ok!(Pools::create(RuntimeOrigin::signed(20), 10, 20, 20, 20));
 
 			// has no impact -- initial
@@ -1723,17 +1863,17 @@ mod claim_payout {
 			assert_eq!(member_20.last_recorded_reward_counter, 0.into());
 
 			// pre-fund the reward account of pool id 3 with some funds.
-			Balances::make_free_balance_be(&Pools::create_reward_account(3), 10);
+			Currency::set_balance(&Pools::create_reward_account(3), 10);
 
 			// create pool 3
-			Balances::make_free_balance_be(&30, 100);
+			Currency::set_balance(&30, 100);
 			assert_ok!(Pools::create(RuntimeOrigin::signed(30), 10, 30, 30, 30));
 
 			// reward counter is still the same.
 			let (member_30, _, reward_pool_30) = Pools::get_member_with_pools(&30).unwrap();
 			assert_eq!(
-				Balances::free_balance(&Pools::create_reward_account(3)),
-				10 + Balances::minimum_balance()
+				Currency::free_balance(&Pools::create_reward_account(3)),
+				10 + Currency::minimum_balance()
 			);
 
 			assert_eq!(reward_pool_30.last_recorded_total_payouts, 0);
@@ -1766,7 +1906,7 @@ mod claim_payout {
 			MaxPoolMembers::<Runtime>::set(None);
 			MaxPoolMembersPerPool::<Runtime>::set(None);
 			let join = |x, y| {
-				Balances::make_free_balance_be(&x, y + Balances::minimum_balance());
+				Currency::set_balance(&x, y + Currency::minimum_balance());
 				assert_ok!(Pools::join(RuntimeOrigin::signed(x), y, 1));
 			};
 
@@ -1844,8 +1984,8 @@ mod claim_payout {
 				assert_eq!(member_10.last_recorded_reward_counter, 0.into());
 			}
 
-			Balances::make_free_balance_be(&10, 100);
-			Balances::make_free_balance_be(&20, 100);
+			Currency::set_balance(&10, 100);
+			Currency::set_balance(&20, 100);
 
 			// 10 bonds extra without any rewards.
 			{
@@ -2063,10 +2203,10 @@ mod claim_payout {
 		ExtBuilder::default().add_members(vec![(20, 20)]).build_and_execute(|| {
 			// initial balance of 10.
 
-			assert_eq!(Balances::free_balance(&10), 35);
+			assert_eq!(Currency::free_balance(&10), 35);
 			assert_eq!(
-				Balances::free_balance(&default_reward_account()),
-				Balances::minimum_balance()
+				Currency::free_balance(&default_reward_account()),
+				Currency::minimum_balance()
 			);
 
 			// some rewards come in.
@@ -2115,7 +2255,7 @@ mod claim_payout {
 
 			assert!(!Metadata::<T>::contains_key(1));
 			// original ed + ed put into reward account + reward + bond + dust.
-			assert_eq!(Balances::free_balance(&10), 35 + 5 + 13 + 10 + 1);
+			assert_eq!(Currency::free_balance(&10), 35 + 5 + 13 + 10 + 1);
 		})
 	}
 
@@ -2131,7 +2271,7 @@ mod claim_payout {
 			.add_members(vec![(20, 1500 * unit), (21, 2500 * unit), (22, 5000 * unit)])
 			.build_and_execute(|| {
 				// some rewards come in.
-				assert_eq!(Balances::free_balance(&default_reward_account()), unit);
+				assert_eq!(Currency::free_balance(&default_reward_account()), unit);
 				deposit_rewards(unit / 1000);
 
 				// everyone claims
@@ -2180,14 +2320,14 @@ mod claim_payout {
 	#[test]
 	fn claim_payout_other_works() {
 		ExtBuilder::default().add_members(vec![(20, 20)]).build_and_execute(|| {
-			Balances::make_free_balance_be(&default_reward_account(), 8);
+			Currency::set_balance(&default_reward_account(), 8);
 			// ... of which only 3 are claimable to make sure the reward account does not die.
 			let claimable_reward = 8 - ExistentialDeposit::get();
 			// NOTE: easier to read if we use 3, so let's use the number instead of variable.
 			assert_eq!(claimable_reward, 3, "test is correct if rewards are divisible by 3");
 
 			// given
-			assert_eq!(Balances::free_balance(10), 35);
+			assert_eq!(Currency::free_balance(&10), 35);
 
 			// Permissioned by default
 			assert_noop!(
@@ -2202,8 +2342,8 @@ mod claim_payout {
 			assert_ok!(Pools::claim_payout_other(RuntimeOrigin::signed(80), 10));
 
 			// then
-			assert_eq!(Balances::free_balance(10), 36);
-			assert_eq!(Balances::free_balance(&default_reward_account()), 7);
+			assert_eq!(Currency::free_balance(&10), 36);
+			assert_eq!(Currency::free_balance(&default_reward_account()), 7);
 		})
 	}
 }
@@ -2221,11 +2361,15 @@ mod unbond {
 			.min_join_bond(10)
 			.add_members(vec![(20, 20)])
 			.build_and_execute(|| {
+				assert_eq!(TotalValueLocked::<T>::get(), 30);
 				// can unbond to above limit
 				assert_ok!(Pools::unbond(RuntimeOrigin::signed(20), 20, 5));
 				assert_eq!(PoolMembers::<Runtime>::get(20).unwrap().active_points(), 15);
 				assert_eq!(PoolMembers::<Runtime>::get(20).unwrap().unbonding_points(), 5);
 
+				// tvl remains unchanged.
+				assert_eq!(TotalValueLocked::<T>::get(), 30);
+
 				// cannot go to below 10:
 				assert_noop!(
 					Pools::unbond(RuntimeOrigin::signed(20), 20, 10),
@@ -2530,11 +2674,12 @@ mod unbond {
 		ExtBuilder::default()
 			.add_members(vec![(40, 40), (550, 550)])
 			.build_and_execute(|| {
-				let ed = Balances::minimum_balance();
-				// Given a slash from 600 -> 100
-				StakingMock::set_bonded_balance(default_bonded_account(), 100);
+				let ed = Currency::minimum_balance();
+				// Given a slash from 600 -> 500
+				StakingMock::slash_by(1, 500);
+
 				// and unclaimed rewards of 600.
-				Balances::make_free_balance_be(&default_reward_account(), ed + 600);
+				Currency::set_balance(&default_reward_account(), ed + 600);
 
 				// When
 				assert_ok!(fully_unbond_permissioned(40));
@@ -2564,8 +2709,9 @@ mod unbond {
 						Event::Bonded { member: 10, pool_id: 1, bonded: 10, joined: true },
 						Event::Bonded { member: 40, pool_id: 1, bonded: 40, joined: true },
 						Event::Bonded { member: 550, pool_id: 1, bonded: 550, joined: true },
+						Event::PoolSlashed { pool_id: 1, balance: 100 },
 						Event::PaidOut { member: 40, pool_id: 1, payout: 40 },
-						Event::Unbonded { member: 40, pool_id: 1, points: 6, balance: 6, era: 3 }
+						Event::Unbonded { member: 40, pool_id: 1, balance: 6, points: 6, era: 3 }
 					]
 				);
 
@@ -2574,7 +2720,7 @@ mod unbond {
 					PoolMembers::<Runtime>::get(40).unwrap().unbonding_eras,
 					member_unbonding_eras!(3 => 6)
 				);
-				assert_eq!(Balances::free_balance(&40), 40 + 40); // We claim rewards when unbonding
+				assert_eq!(Currency::free_balance(&40), 40 + 40); // We claim rewards when unbonding
 
 				// When
 				unsafe_set_state(1, PoolState::Destroying);
@@ -2603,7 +2749,7 @@ mod unbond {
 					PoolMembers::<Runtime>::get(550).unwrap().unbonding_eras,
 					member_unbonding_eras!(3 => 92)
 				);
-				assert_eq!(Balances::free_balance(&550), 550 + 550);
+				assert_eq!(Currency::free_balance(&550), 550 + 550);
 				assert_eq!(
 					pool_events_since_last_call(),
 					vec![
@@ -2644,7 +2790,7 @@ mod unbond {
 				);
 				assert_eq!(StakingMock::active_stake(&default_bonded_account()).unwrap(), 0);
 
-				assert_eq!(Balances::free_balance(&550), 550 + 550 + 92);
+				assert_eq!(Currency::free_balance(&550), 550 + 550 + 92);
 				assert_eq!(
 					pool_events_since_last_call(),
 					vec![
@@ -2725,6 +2871,7 @@ mod unbond {
 				);
 
 				// When the root kicks then its ok
+				// Account with ID 100 is kicked.
 				assert_ok!(Pools::fully_unbond(RuntimeOrigin::signed(900), 100));
 
 				assert_eq!(
@@ -2745,6 +2892,7 @@ mod unbond {
 				);
 
 				// When the bouncer kicks then its ok
+				// Account with ID 200 is kicked.
 				assert_ok!(Pools::fully_unbond(RuntimeOrigin::signed(902), 200));
 
 				assert_eq!(
@@ -2783,7 +2931,7 @@ mod unbond {
 				);
 				assert_eq!(
 					*UnbondingBalanceMap::get().get(&default_bonded_account()).unwrap(),
-					100 + 200
+					vec![(3, 100), (3, 200)],
 				);
 			});
 	}
@@ -2882,7 +3030,10 @@ mod unbond {
 				}
 			);
 			assert_eq!(StakingMock::active_stake(&default_bonded_account()).unwrap(), 0);
-			assert_eq!(*UnbondingBalanceMap::get().get(&default_bonded_account()).unwrap(), 10);
+			assert_eq!(
+				*UnbondingBalanceMap::get().get(&default_bonded_account()).unwrap(),
+				vec![(6, 10)]
+			);
 		});
 	}
 
@@ -3160,7 +3311,7 @@ mod unbond {
 			assert_eq!(PoolMembers::<Runtime>::get(10).unwrap().unbonding_points(), 0);
 
 			// slash the default pool
-			StakingMock::set_bonded_balance(Pools::create_bonded_account(1), 5);
+			StakingMock::slash_by(1, 5);
 
 			// cannot unbond even 7, because the value of shares is now less.
 			assert_noop!(
@@ -3173,14 +3324,11 @@ mod unbond {
 	#[test]
 	fn every_unbonding_triggers_payout() {
 		ExtBuilder::default().add_members(vec![(20, 20)]).build_and_execute(|| {
-			let initial_reward_account = Balances::free_balance(default_reward_account());
-			assert_eq!(initial_reward_account, Balances::minimum_balance());
+			let initial_reward_account = Currency::free_balance(&default_reward_account());
+			assert_eq!(initial_reward_account, Currency::minimum_balance());
 			assert_eq!(initial_reward_account, 5);
 
-			Balances::make_free_balance_be(
-				&default_reward_account(),
-				4 * Balances::minimum_balance(),
-			);
+			Currency::set_balance(&default_reward_account(), 4 * Currency::minimum_balance());
 
 			assert_ok!(Pools::unbond(RuntimeOrigin::signed(20), 20, 2));
 			assert_eq!(
@@ -3196,10 +3344,7 @@ mod unbond {
 			);
 
 			CurrentEra::set(1);
-			Balances::make_free_balance_be(
-				&default_reward_account(),
-				4 * Balances::minimum_balance(),
-			);
+			Currency::set_balance(&default_reward_account(), 4 * Currency::minimum_balance());
 
 			assert_ok!(Pools::unbond(RuntimeOrigin::signed(20), 20, 3));
 			assert_eq!(
@@ -3212,10 +3357,7 @@ mod unbond {
 			);
 
 			CurrentEra::set(2);
-			Balances::make_free_balance_be(
-				&default_reward_account(),
-				4 * Balances::minimum_balance(),
-			);
+			Currency::set_balance(&default_reward_account(), 4 * Currency::minimum_balance());
 
 			assert_ok!(Pools::unbond(RuntimeOrigin::signed(20), 20, 5));
 			assert_eq!(
@@ -3239,21 +3381,58 @@ mod pool_withdraw_unbonded {
 
 	#[test]
 	fn pool_withdraw_unbonded_works() {
-		ExtBuilder::default().build_and_execute(|| {
+		ExtBuilder::default().add_members(vec![(20, 10)]).build_and_execute(|| {
 			// Given 10 unbond'ed directly against the pool account
-			assert_ok!(StakingMock::unbond(&default_bonded_account(), 5));
-			// and the pool account only has 10 balance
-			assert_eq!(StakingMock::active_stake(&default_bonded_account()), Ok(5));
-			assert_eq!(StakingMock::total_stake(&default_bonded_account()), Ok(10));
-			assert_eq!(Balances::free_balance(&default_bonded_account()), 10);
+
+			assert_ok!(Pools::unbond(RuntimeOrigin::signed(20), 20, 5));
+
+			assert_eq!(StakingMock::active_stake(&default_bonded_account()), Ok(15));
+			assert_eq!(StakingMock::total_stake(&default_bonded_account()), Ok(20));
+			assert_eq!(Balances::free_balance(&default_bonded_account()), 20);
 
 			// When
+			CurrentEra::set(StakingMock::current_era() + StakingMock::bonding_duration() + 1);
 			assert_ok!(Pools::pool_withdraw_unbonded(RuntimeOrigin::signed(10), 1, 0));
 
-			// Then there unbonding balance is no longer locked
-			assert_eq!(StakingMock::active_stake(&default_bonded_account()), Ok(5));
-			assert_eq!(StakingMock::total_stake(&default_bonded_account()), Ok(5));
-			assert_eq!(Balances::free_balance(&default_bonded_account()), 10);
+			// Then their unbonding balance is no longer locked
+			assert_eq!(StakingMock::active_stake(&default_bonded_account()), Ok(15));
+			assert_eq!(StakingMock::total_stake(&default_bonded_account()), Ok(15));
+			assert_eq!(Balances::free_balance(&default_bonded_account()), 20);
+		});
+	}
+	#[test]
+	fn pool_withdraw_unbonded_creates_tvl_diff() {
+		ExtBuilder::default().add_members(vec![(20, 10)]).build_and_execute(|| {
+			// Given 10 unbond'ed directly against the pool account
+			assert_ok!(Pools::unbond(RuntimeOrigin::signed(20), 20, 5));
+
+			assert_eq!(StakingMock::active_stake(&default_bonded_account()), Ok(15));
+			assert_eq!(StakingMock::total_stake(&default_bonded_account()), Ok(20));
+			assert_eq!(Balances::free_balance(&default_bonded_account()), 20);
+			assert_eq!(TotalValueLocked::<T>::get(), 20);
+
+			// When
+			CurrentEra::set(StakingMock::current_era() + StakingMock::bonding_duration() + 1);
+			assert_ok!(Pools::pool_withdraw_unbonded(RuntimeOrigin::signed(10), 1, 0));
+			assert_eq!(TotalValueLocked::<T>::get(), 15);
+
+			let member_balance = PoolMembers::<T>::iter()
+				.map(|(_, member)| member.total_balance())
+				.reduce(|acc, total_balance| acc + total_balance)
+				.unwrap_or_default();
+
+			// Then their unbonding balance is no longer locked
+			assert_eq!(StakingMock::active_stake(&default_bonded_account()), Ok(15));
+			assert_eq!(StakingMock::total_stake(&default_bonded_account()), Ok(15));
+			assert_eq!(Currency::free_balance(&default_bonded_account()), 20);
+
+			// The difference between TVL and member_balance is exactly the difference between
+			// `total_stake` and the `free_balance`.
+			// This relation is not guaranteed in the wild as arbitrary transfers towards
+			// `free_balance` can be made to the pool that are not accounted for.
+			let non_locked_balance = Balances::free_balance(&default_bonded_account()) -
+				StakingMock::total_stake(&default_bonded_account()).unwrap();
+			assert_eq!(member_balance, TotalValueLocked::<T>::get() + non_locked_balance);
 		});
 	}
 }
@@ -3274,7 +3453,7 @@ mod withdraw_unbonded {
 				assert_eq!(StakingMock::bonding_duration(), 3);
 				assert_ok!(Pools::fully_unbond(RuntimeOrigin::signed(550), 550));
 				assert_ok!(Pools::fully_unbond(RuntimeOrigin::signed(40), 40));
-				assert_eq!(Balances::free_balance(&default_bonded_account()), 600);
+				assert_eq!(Currency::free_balance(&default_bonded_account()), 600);
 
 				let mut current_era = 1;
 				CurrentEra::set(current_era);
@@ -3283,24 +3462,33 @@ mod withdraw_unbonded {
 				let unbond_pool = sub_pools.with_era.get_mut(&3).unwrap();
 				// Sanity check
 				assert_eq!(*unbond_pool, UnbondPool { points: 550 + 40, balance: 550 + 40 });
+				assert_eq!(TotalValueLocked::<Runtime>::get(), 600);
 
 				// Simulate a slash to the pool with_era(current_era), decreasing the balance by
 				// half
 				{
 					unbond_pool.balance /= 2; // 295
 					SubPoolsStorage::<Runtime>::insert(1, sub_pools);
+
+					// Adjust the TVL for this non-api usage (direct sub-pool modification)
+					TotalValueLocked::<Runtime>::mutate(|x| *x -= 295);
+
 					// Update the equivalent of the unbonding chunks for the `StakingMock`
 					let mut x = UnbondingBalanceMap::get();
-					*x.get_mut(&default_bonded_account()).unwrap() /= 5;
+					x.get_mut(&default_bonded_account())
+						.unwrap()
+						.get_mut(current_era as usize)
+						.unwrap()
+						.1 /= 2;
 					UnbondingBalanceMap::set(&x);
-					Balances::make_free_balance_be(
+
+					Currency::set_balance(
 						&default_bonded_account(),
-						Balances::free_balance(&default_bonded_account()) / 2, // 300
-					);
-					StakingMock::set_bonded_balance(
-						default_bonded_account(),
-						StakingMock::active_stake(&default_bonded_account()).unwrap() / 2,
+						Currency::free_balance(&default_bonded_account()) / 2, // 300
 					);
+					assert_eq!(StakingMock::active_stake(&default_bonded_account()).unwrap(), 10);
+					StakingMock::slash_by(1, 5);
+					assert_eq!(StakingMock::active_stake(&default_bonded_account()).unwrap(), 5);
 				};
 
 				// Advance the current_era to ensure all `with_era` pools will be merged into
@@ -3336,11 +3524,12 @@ mod withdraw_unbonded {
 							era: 3
 						},
 						Event::Unbonded { member: 40, pool_id: 1, points: 40, balance: 40, era: 3 },
+						Event::PoolSlashed { pool_id: 1, balance: 5 }
 					]
 				);
 				assert_eq!(
 					balances_events_since_last_call(),
-					vec![BEvent::BalanceSet { who: default_bonded_account(), free: 300 }]
+					vec![BEvent::Burned { who: default_bonded_account(), amount: 300 }]
 				);
 
 				// When
@@ -3407,6 +3596,7 @@ mod withdraw_unbonded {
 					balances_events_since_last_call(),
 					vec![
 						BEvent::Transfer { from: default_bonded_account(), to: 10, amount: 5 },
+						BEvent::Thawed { who: default_reward_account(), amount: 5 },
 						BEvent::Transfer { from: default_reward_account(), to: 10, amount: 5 }
 					]
 				);
@@ -3422,8 +3612,8 @@ mod withdraw_unbonded {
 
 				// Given
 				// current bond is 600, we slash it all to 300.
-				StakingMock::set_bonded_balance(default_bonded_account(), 300);
-				Balances::make_free_balance_be(&default_bonded_account(), 300);
+				StakingMock::slash_by(1, 300);
+				Currency::set_balance(&default_bonded_account(), 300);
 				assert_eq!(StakingMock::total_stake(&default_bonded_account()), Ok(300));
 
 				assert_ok!(fully_unbond_permissioned(40));
@@ -3442,6 +3632,7 @@ mod withdraw_unbonded {
 						Event::Bonded { member: 10, pool_id: 1, bonded: 10, joined: true },
 						Event::Bonded { member: 40, pool_id: 1, bonded: 40, joined: true },
 						Event::Bonded { member: 550, pool_id: 1, bonded: 550, joined: true },
+						Event::PoolSlashed { pool_id: 1, balance: 300 },
 						Event::Unbonded { member: 40, pool_id: 1, balance: 20, points: 20, era: 3 },
 						Event::Unbonded {
 							member: 550,
@@ -3454,7 +3645,7 @@ mod withdraw_unbonded {
 				);
 				assert_eq!(
 					balances_events_since_last_call(),
-					vec![BEvent::BalanceSet { who: default_bonded_account(), free: 300 },]
+					vec![BEvent::Burned { who: default_bonded_account(), amount: 300 },]
 				);
 
 				CurrentEra::set(StakingMock::bonding_duration());
@@ -3517,8 +3708,8 @@ mod withdraw_unbonded {
 				assert_ok!(Pools::withdraw_unbonded(RuntimeOrigin::signed(10), 10, 0));
 
 				// then
-				assert_eq!(Balances::free_balance(&10), 10 + 35);
-				assert_eq!(Balances::free_balance(&default_bonded_account()), 0);
+				assert_eq!(Currency::free_balance(&10), 10 + 35);
+				assert_eq!(Currency::free_balance(&default_bonded_account()), 0);
 
 				// in this test 10 also gets a fair share of the slash, because the slash was
 				// applied to the bonded account.
@@ -3536,6 +3727,7 @@ mod withdraw_unbonded {
 					balances_events_since_last_call(),
 					vec![
 						BEvent::Transfer { from: default_bonded_account(), to: 10, amount: 5 },
+						BEvent::Thawed { who: default_reward_account(), amount: 5 },
 						BEvent::Transfer { from: default_reward_account(), to: 10, amount: 5 }
 					]
 				);
@@ -3546,14 +3738,14 @@ mod withdraw_unbonded {
 	fn withdraw_unbonded_handles_faulty_sub_pool_accounting() {
 		ExtBuilder::default().build_and_execute(|| {
 			// Given
-			assert_eq!(Balances::minimum_balance(), 5);
-			assert_eq!(Balances::free_balance(&10), 35);
-			assert_eq!(Balances::free_balance(&default_bonded_account()), 10);
+			assert_eq!(Currency::minimum_balance(), 5);
+			assert_eq!(Currency::free_balance(&10), 35);
+			assert_eq!(Currency::free_balance(&default_bonded_account()), 10);
 			unsafe_set_state(1, PoolState::Destroying);
 			assert_ok!(Pools::fully_unbond(RuntimeOrigin::signed(10), 10));
 
 			// Simulate a slash that is not accounted for in the sub pools.
-			Balances::make_free_balance_be(&default_bonded_account(), 5);
+			Currency::set_balance(&default_bonded_account(), 5);
 			assert_eq!(
 				SubPoolsStorage::<Runtime>::get(1).unwrap().with_era,
 				//------------------------------balance decrease is not account for
@@ -3566,8 +3758,8 @@ mod withdraw_unbonded {
 			assert_ok!(Pools::withdraw_unbonded(RuntimeOrigin::signed(10), 10, 0));
 
 			// Then
-			assert_eq!(Balances::free_balance(10), 10 + 35);
-			assert_eq!(Balances::free_balance(&default_bonded_account()), 0);
+			assert_eq!(Currency::free_balance(&10), 10 + 35);
+			assert_eq!(Currency::free_balance(&default_bonded_account()), 0);
 		});
 	}
 
@@ -3673,8 +3865,8 @@ mod withdraw_unbonded {
 				// Can kick as bouncer
 				assert_ok!(Pools::withdraw_unbonded(RuntimeOrigin::signed(900), 200, 0));
 
-				assert_eq!(Balances::free_balance(100), 100 + 100);
-				assert_eq!(Balances::free_balance(200), 200 + 200);
+				assert_eq!(Currency::free_balance(&100), 100 + 100);
+				assert_eq!(Currency::free_balance(&200), 200 + 200);
 				assert!(!PoolMembers::<Runtime>::contains_key(100));
 				assert!(!PoolMembers::<Runtime>::contains_key(200));
 				assert_eq!(SubPoolsStorage::<Runtime>::get(1).unwrap(), Default::default());
@@ -3709,7 +3901,7 @@ mod withdraw_unbonded {
 				}
 			);
 			CurrentEra::set(StakingMock::bonding_duration());
-			assert_eq!(Balances::free_balance(100), 100);
+			assert_eq!(Currency::free_balance(&100), 100);
 
 			// Cannot permissionlessly withdraw
 			assert_noop!(
@@ -3720,11 +3912,11 @@ mod withdraw_unbonded {
 			// Given
 			unsafe_set_state(1, PoolState::Destroying);
 
-			// Can permissionlesly withdraw a member that is not the depositor
+			// Can permissionlessly withdraw a member that is not the depositor
 			assert_ok!(Pools::withdraw_unbonded(RuntimeOrigin::signed(420), 100, 0));
 
 			assert_eq!(SubPoolsStorage::<Runtime>::get(1).unwrap(), Default::default(),);
-			assert_eq!(Balances::free_balance(100), 100 + 100);
+			assert_eq!(Currency::free_balance(&100), 100 + 100);
 			assert!(!PoolMembers::<Runtime>::contains_key(100));
 			assert_eq!(
 				pool_events_since_last_call(),
@@ -3920,6 +4112,7 @@ mod withdraw_unbonded {
 	#[test]
 	fn full_multi_step_withdrawing_non_depositor() {
 		ExtBuilder::default().add_members(vec![(100, 100)]).build_and_execute(|| {
+			assert_eq!(TotalValueLocked::<T>::get(), 110);
 			// given
 			assert_ok!(Pools::unbond(RuntimeOrigin::signed(100), 100, 75));
 			assert_eq!(
@@ -3927,6 +4120,9 @@ mod withdraw_unbonded {
 				member_unbonding_eras!(3 => 75)
 			);
 
+			// tvl unchanged.
+			assert_eq!(TotalValueLocked::<T>::get(), 110);
+
 			// progress one era and unbond the leftover.
 			CurrentEra::set(1);
 			assert_ok!(Pools::unbond(RuntimeOrigin::signed(100), 100, 25));
@@ -3939,6 +4135,8 @@ mod withdraw_unbonded {
 				Pools::withdraw_unbonded(RuntimeOrigin::signed(100), 100, 0),
 				Error::<Runtime>::CannotWithdrawAny
 			);
+			// tvl unchanged.
+			assert_eq!(TotalValueLocked::<T>::get(), 110);
 
 			// now the 75 should be free.
 			CurrentEra::set(3);
@@ -3958,6 +4156,8 @@ mod withdraw_unbonded {
 				PoolMembers::<Runtime>::get(100).unwrap().unbonding_eras,
 				member_unbonding_eras!(4 => 25)
 			);
+			// tvl updated
+			assert_eq!(TotalValueLocked::<T>::get(), 35);
 
 			// the 25 should be free now, and the member removed.
 			CurrentEra::set(4);
@@ -4258,20 +4458,22 @@ mod withdraw_unbonded {
 
 mod create {
 	use super::*;
+	use frame_support::traits::fungible::InspectFreeze;
 
 	#[test]
 	fn create_works() {
 		ExtBuilder::default().build_and_execute(|| {
 			// next pool id is 2.
 			let next_pool_stash = Pools::create_bonded_account(2);
-			let ed = Balances::minimum_balance();
+			let ed = Currency::minimum_balance();
 
+			assert_eq!(TotalValueLocked::<T>::get(), 10);
 			assert!(!BondedPools::<Runtime>::contains_key(2));
 			assert!(!RewardPools::<Runtime>::contains_key(2));
 			assert!(!PoolMembers::<Runtime>::contains_key(11));
 			assert_err!(StakingMock::active_stake(&next_pool_stash), "balance not found");
 
-			Balances::make_free_balance_be(&11, StakingMock::minimum_nominator_bond() + ed);
+			Currency::set_balance(&11, StakingMock::minimum_nominator_bond() + ed);
 			assert_ok!(Pools::create(
 				RuntimeOrigin::signed(11),
 				StakingMock::minimum_nominator_bond(),
@@ -4279,8 +4481,9 @@ mod create {
 				456,
 				789
 			));
+			assert_eq!(TotalValueLocked::<T>::get(), 10 + StakingMock::minimum_nominator_bond());
 
-			assert_eq!(Balances::free_balance(&11), 0);
+			assert_eq!(Currency::free_balance(&11), 0);
 			assert_eq!(
 				PoolMembers::<Runtime>::get(11).unwrap(),
 				PoolMember {
@@ -4316,6 +4519,15 @@ mod create {
 				RewardPool { ..Default::default() }
 			);
 
+			// make sure ED is frozen on pool creation.
+			assert_eq!(
+				Currency::balance_frozen(
+					&FreezeReason::PoolMinBalance.into(),
+					&default_reward_account()
+				),
+				Currency::minimum_balance()
+			);
+
 			assert_eq!(
 				pool_events_since_last_call(),
 				vec![
@@ -4380,10 +4592,10 @@ mod create {
 			assert_eq!(PoolMembers::<Runtime>::count(), 1);
 			MaxPools::<Runtime>::put(3);
 			MaxPoolMembers::<Runtime>::put(1);
-			Balances::make_free_balance_be(&11, 5 + 20);
+			Currency::set_balance(&11, 5 + 20);
 
 			// Then
-			let create = RuntimeCall::Pools(crate::Call::<Runtime>::create {
+			let create = RuntimeCall::Pools(Call::<Runtime>::create {
 				amount: 20,
 				root: 11,
 				nominator: 11,
@@ -4399,9 +4611,9 @@ mod create {
 	#[test]
 	fn create_with_pool_id_works() {
 		ExtBuilder::default().build_and_execute(|| {
-			let ed = Balances::minimum_balance();
+			let ed = Currency::minimum_balance();
 
-			Balances::make_free_balance_be(&11, StakingMock::minimum_nominator_bond() + ed);
+			Currency::set_balance(&11, StakingMock::minimum_nominator_bond() + ed);
 			assert_ok!(Pools::create(
 				RuntimeOrigin::signed(11),
 				StakingMock::minimum_nominator_bond(),
@@ -4410,7 +4622,7 @@ mod create {
 				789
 			));
 
-			assert_eq!(Balances::free_balance(&11), 0);
+			assert_eq!(Currency::free_balance(&11), 0);
 			// delete the initial pool created, then pool_Id `1` will be free
 
 			assert_noop!(
@@ -4439,7 +4651,7 @@ mod create {
 fn set_claimable_actor_works() {
 	ExtBuilder::default().build_and_execute(|| {
 		// Given
-		Balances::make_free_balance_be(&11, ExistentialDeposit::get() + 2);
+		Currency::set_balance(&11, ExistentialDeposit::get() + 2);
 		assert!(!PoolMembers::<Runtime>::contains_key(11));
 
 		// When
@@ -4560,16 +4772,17 @@ mod set_state {
 
 			// Given
 			unsafe_set_state(1, PoolState::Open);
-			let mut bonded_pool = BondedPool::<Runtime>::get(1).unwrap();
-			bonded_pool.points = 100;
-			bonded_pool.put();
+			// slash the pool to the point that `max_points_to_balance` ratio is
+			// surpassed. Making this pool destroyable by anyone.
+			StakingMock::slash_by(1, 10);
+
 			// When
 			assert_ok!(Pools::set_state(RuntimeOrigin::signed(11), 1, PoolState::Destroying));
 			// Then
 			assert_eq!(BondedPool::<Runtime>::get(1).unwrap().state, PoolState::Destroying);
 
 			// Given
-			Balances::make_free_balance_be(&default_bonded_account(), Balance::max_value() / 10);
+			Currency::set_balance(&default_bonded_account(), Balance::MAX / 10);
 			unsafe_set_state(1, PoolState::Open);
 			// When
 			assert_ok!(Pools::set_state(RuntimeOrigin::signed(11), 1, PoolState::Destroying));
@@ -4588,6 +4801,7 @@ mod set_state {
 				pool_events_since_last_call(),
 				vec![
 					Event::StateChanged { pool_id: 1, new_state: PoolState::Destroying },
+					Event::PoolSlashed { pool_id: 1, balance: 0 },
 					Event::StateChanged { pool_id: 1, new_state: PoolState::Destroying },
 					Event::StateChanged { pool_id: 1, new_state: PoolState::Destroying }
 				]
@@ -4693,18 +4907,18 @@ mod bond_extra {
 	fn bond_extra_from_free_balance_creator() {
 		ExtBuilder::default().build_and_execute(|| {
 			// 10 is the owner and a member in pool 1, give them some more funds.
-			Balances::make_free_balance_be(&10, 100);
+			Currency::set_balance(&10, 100);
 
 			// given
 			assert_eq!(PoolMembers::<Runtime>::get(10).unwrap().points, 10);
 			assert_eq!(BondedPools::<Runtime>::get(1).unwrap().points, 10);
-			assert_eq!(Balances::free_balance(10), 100);
+			assert_eq!(Currency::free_balance(&10), 100);
 
 			// when
 			assert_ok!(Pools::bond_extra(RuntimeOrigin::signed(10), BondExtra::FreeBalance(10)));
 
 			// then
-			assert_eq!(Balances::free_balance(10), 90);
+			assert_eq!(Currency::free_balance(&10), 90);
 			assert_eq!(PoolMembers::<Runtime>::get(10).unwrap().points, 20);
 			assert_eq!(BondedPools::<Runtime>::get(1).unwrap().points, 20);
 
@@ -4721,7 +4935,7 @@ mod bond_extra {
 			assert_ok!(Pools::bond_extra(RuntimeOrigin::signed(10), BondExtra::FreeBalance(20)));
 
 			// then
-			assert_eq!(Balances::free_balance(10), 70);
+			assert_eq!(Currency::free_balance(&10), 70);
 			assert_eq!(PoolMembers::<Runtime>::get(10).unwrap().points, 40);
 			assert_eq!(BondedPools::<Runtime>::get(1).unwrap().points, 40);
 
@@ -4737,20 +4951,20 @@ mod bond_extra {
 		ExtBuilder::default().build_and_execute(|| {
 			// put some money in the reward account, all of which will belong to 10 as the only
 			// member of the pool.
-			Balances::make_free_balance_be(&default_reward_account(), 7);
+			Currency::set_balance(&default_reward_account(), 7);
 			// ... if which only 2 is claimable to make sure the reward account does not die.
 			let claimable_reward = 7 - ExistentialDeposit::get();
 
 			// given
 			assert_eq!(PoolMembers::<Runtime>::get(10).unwrap().points, 10);
 			assert_eq!(BondedPools::<Runtime>::get(1).unwrap().points, 10);
-			assert_eq!(Balances::free_balance(10), 35);
+			assert_eq!(Currency::free_balance(&10), 35);
 
 			// when
 			assert_ok!(Pools::bond_extra(RuntimeOrigin::signed(10), BondExtra::Rewards));
 
 			// then
-			assert_eq!(Balances::free_balance(10), 35);
+			assert_eq!(Currency::free_balance(&10), 35);
 			assert_eq!(PoolMembers::<Runtime>::get(10).unwrap().points, 10 + claimable_reward);
 			assert_eq!(BondedPools::<Runtime>::get(1).unwrap().points, 10 + claimable_reward);
 
@@ -4776,7 +4990,7 @@ mod bond_extra {
 		ExtBuilder::default().add_members(vec![(20, 20)]).build_and_execute(|| {
 			// put some money in the reward account, all of which will belong to 10 as the only
 			// member of the pool.
-			Balances::make_free_balance_be(&default_reward_account(), 8);
+			Currency::set_balance(&default_reward_account(), 8);
 			// ... if which only 3 is claimable to make sure the reward account does not die.
 			let claimable_reward = 8 - ExistentialDeposit::get();
 			// NOTE: easier to read of we use 3, so let's use the number instead of variable.
@@ -4786,15 +5000,19 @@ mod bond_extra {
 			assert_eq!(PoolMembers::<Runtime>::get(10).unwrap().points, 10);
 			assert_eq!(PoolMembers::<Runtime>::get(20).unwrap().points, 20);
 			assert_eq!(BondedPools::<Runtime>::get(1).unwrap().points, 30);
-			assert_eq!(Balances::free_balance(10), 35);
-			assert_eq!(Balances::free_balance(20), 20);
+
+			assert_eq!(Currency::free_balance(&10), 35);
+			assert_eq!(Currency::free_balance(&20), 20);
+			assert_eq!(TotalValueLocked::<T>::get(), 30);
 
 			// when
 			assert_ok!(Pools::bond_extra(RuntimeOrigin::signed(10), BondExtra::Rewards));
-			assert_eq!(Balances::free_balance(&default_reward_account()), 7);
+			assert_eq!(Currency::free_balance(&default_reward_account()), 7);
 
 			// then
-			assert_eq!(Balances::free_balance(10), 35);
+			assert_eq!(Currency::free_balance(&10), 35);
+			assert_eq!(TotalValueLocked::<T>::get(), 31);
+
 			// 10's share of the reward is 1/3, since they gave 10/30 of the total shares.
 			assert_eq!(PoolMembers::<Runtime>::get(10).unwrap().points, 10 + 1);
 			assert_eq!(BondedPools::<Runtime>::get(1).unwrap().points, 30 + 1);
@@ -4803,7 +5021,9 @@ mod bond_extra {
 			assert_ok!(Pools::bond_extra(RuntimeOrigin::signed(20), BondExtra::Rewards));
 
 			// then
-			assert_eq!(Balances::free_balance(20), 20);
+			assert_eq!(Currency::free_balance(&20), 20);
+			assert_eq!(TotalValueLocked::<T>::get(), 33);
+
 			// 20's share of the rewards is the other 2/3 of the rewards, since they have 20/30 of
 			// the shares
 			assert_eq!(PoolMembers::<Runtime>::get(20).unwrap().points, 20 + 2);
@@ -4827,7 +5047,7 @@ mod bond_extra {
 	#[test]
 	fn bond_extra_other() {
 		ExtBuilder::default().add_members(vec![(20, 20)]).build_and_execute(|| {
-			Balances::make_free_balance_be(&default_reward_account(), 8);
+			Currency::set_balance(&default_reward_account(), 8);
 			// ... of which only 3 are claimable to make sure the reward account does not die.
 			let claimable_reward = 8 - ExistentialDeposit::get();
 			// NOTE: easier to read if we use 3, so let's use the number instead of variable.
@@ -4837,8 +5057,8 @@ mod bond_extra {
 			assert_eq!(PoolMembers::<Runtime>::get(10).unwrap().points, 10);
 			assert_eq!(PoolMembers::<Runtime>::get(20).unwrap().points, 20);
 			assert_eq!(BondedPools::<Runtime>::get(1).unwrap().points, 30);
-			assert_eq!(Balances::free_balance(10), 35);
-			assert_eq!(Balances::free_balance(20), 20);
+			assert_eq!(Currency::free_balance(&10), 35);
+			assert_eq!(Currency::free_balance(&20), 20);
 
 			// Permissioned by default
 			assert_noop!(
@@ -4851,10 +5071,10 @@ mod bond_extra {
 				ClaimPermission::PermissionlessAll
 			));
 			assert_ok!(Pools::bond_extra_other(RuntimeOrigin::signed(50), 10, BondExtra::Rewards));
-			assert_eq!(Balances::free_balance(&default_reward_account()), 7);
+			assert_eq!(Currency::free_balance(&default_reward_account()), 7);
 
 			// then
-			assert_eq!(Balances::free_balance(10), 35);
+			assert_eq!(Currency::free_balance(&10), 35);
 			assert_eq!(PoolMembers::<Runtime>::get(10).unwrap().points, 10 + 1);
 			assert_eq!(BondedPools::<Runtime>::get(1).unwrap().points, 30 + 1);
 
@@ -4872,8 +5092,8 @@ mod bond_extra {
 			));
 
 			// then
-			assert_eq!(Balances::free_balance(20), 12);
-			assert_eq!(Balances::free_balance(&default_reward_account()), 5);
+			assert_eq!(Currency::free_balance(&20), 12);
+			assert_eq!(Currency::free_balance(&default_reward_account()), 5);
 			assert_eq!(PoolMembers::<Runtime>::get(20).unwrap().points, 30);
 			assert_eq!(BondedPools::<Runtime>::get(1).unwrap().points, 41);
 		})
@@ -5107,7 +5327,7 @@ mod reward_counter_precision {
 				]
 			);
 
-			Balances::make_free_balance_be(&20, tiny_bond);
+			Currency::set_balance(&20, tiny_bond);
 			assert_ok!(Pools::join(RuntimeOrigin::signed(20), tiny_bond / 2, 1));
 
 			// Suddenly, add a shit ton of rewards.
@@ -5154,7 +5374,7 @@ mod reward_counter_precision {
 
 			// some whale now joins with the other half ot the total issuance. This will bloat all
 			// the calculation regarding current reward counter.
-			Balances::make_free_balance_be(&20, pool_bond * 2);
+			Currency::set_balance(&20, pool_bond * 2);
 			assert_ok!(Pools::join(RuntimeOrigin::signed(20), pool_bond, 1));
 
 			assert_eq!(
@@ -5176,7 +5396,7 @@ mod reward_counter_precision {
 			);
 
 			// now let a small member join with 10 DOTs.
-			Balances::make_free_balance_be(&30, 20 * DOT);
+			Currency::set_balance(&30, 20 * DOT);
 			assert_ok!(Pools::join(RuntimeOrigin::signed(30), 10 * DOT, 1));
 
 			// and give a reasonably small reward to the pool.
@@ -5213,13 +5433,13 @@ mod reward_counter_precision {
 			);
 
 			// slash this pool by 99% of that.
-			StakingMock::set_bonded_balance(default_bonded_account(), DOT + pool_bond / 100);
+			StakingMock::slash_by(1, pool_bond * 99 / 100);
 
 			// some whale now joins with the other half ot the total issuance. This will trigger an
 			// overflow. This test is actually a bit too lenient because all the reward counters are
 			// set to zero. In other tests that we want to assert a scenario won't fail, we should
 			// also set the reward counters to some large value.
-			Balances::make_free_balance_be(&20, pool_bond * 2);
+			Currency::set_balance(&20, pool_bond * 2);
 			assert_err!(
 				Pools::join(RuntimeOrigin::signed(20), pool_bond, 1),
 				Error::<T>::OverflowRisk
@@ -5248,7 +5468,7 @@ mod reward_counter_precision {
 				);
 
 				// and have a tiny fish join the pool as well..
-				Balances::make_free_balance_be(&20, 20 * DOT);
+				Currency::set_balance(&20, 20 * DOT);
 				assert_ok!(Pools::join(RuntimeOrigin::signed(20), 10 * DOT, 1));
 
 				// earn some small rewards
@@ -5316,7 +5536,7 @@ mod reward_counter_precision {
 				);
 
 				// and have a tiny fish join the pool as well..
-				Balances::make_free_balance_be(&20, 20 * DOT);
+				Currency::set_balance(&20, 20 * DOT);
 				assert_ok!(Pools::join(RuntimeOrigin::signed(20), 10 * DOT, 1));
 
 				// earn some small rewards
@@ -5602,7 +5822,7 @@ mod commission {
 			let member = 10;
 
 			// Set the pool commission to 10% to test commission shares. Pool is topped up 40 points
-			// and `member` immediately claims their pending rewards. Reward pooll should still have
+			// and `member` immediately claims their pending rewards. Reward pool should still have
 			// 10% share.
 
 			// Given:
@@ -6352,7 +6572,7 @@ mod commission {
 			let pool_id = 1;
 
 			// top up commission payee account to existential deposit
-			let _ = Balances::deposit_creating(&2, 5);
+			let _ = Currency::set_balance(&2, 5);
 
 			// Set a commission pool 1 to 33%, with a payee set to `2`
 			assert_ok!(Pools::set_commission(
@@ -6566,7 +6786,7 @@ mod commission {
 				Pools::get_member_with_pools(&10).unwrap();
 
 			// top up commission payee account to existential deposit
-			let _ = Balances::deposit_creating(&2, 5);
+			let _ = Currency::set_balance(&2, 5);
 
 			// Set a commission pool 1 to 100%, with a payee set to `2`
 			assert_ok!(Pools::set_commission(
@@ -6609,7 +6829,7 @@ mod commission {
 				Pools::get_member_with_pools(&10).unwrap();
 
 			// top up the commission payee account to existential deposit
-			let _ = Balances::deposit_creating(&2, 5);
+			let _ = Currency::set_balance(&2, 5);
 
 			// Set a commission pool 1 to 100% fails.
 			assert_noop!(
@@ -6667,7 +6887,7 @@ mod commission {
 		ExtBuilder::default().build_and_execute(|| {
 			let pool_id = 1;
 
-			let _ = Balances::deposit_creating(&900, 5);
+			let _ = Currency::set_balance(&900, 5);
 			assert_ok!(Pools::set_commission(
 				RuntimeOrigin::signed(900),
 				pool_id,
@@ -6727,3 +6947,73 @@ mod commission {
 		})
 	}
 }
+mod slash {
+	use super::*;
+
+	#[test]
+	fn slash_no_subpool_is_tracked() {
+		let bonded = |points, member_counter| BondedPool::<Runtime> {
+			id: 1,
+			inner: BondedPoolInner {
+				commission: Commission::default(),
+				member_counter,
+				points,
+				roles: DEFAULT_ROLES,
+				state: PoolState::Open,
+			},
+		};
+		ExtBuilder::default().with_check(0).build_and_execute(|| {
+			// Given
+			Currency::set_balance(&11, ExistentialDeposit::get() + 2);
+			assert!(!PoolMembers::<Runtime>::contains_key(11));
+			assert_eq!(TotalValueLocked::<T>::get(), 10);
+
+			// When
+			assert_ok!(Pools::join(RuntimeOrigin::signed(11), 2, 1));
+
+			// Then
+			assert_eq!(
+				pool_events_since_last_call(),
+				vec![
+					Event::Created { depositor: 10, pool_id: 1 },
+					Event::Bonded { member: 10, pool_id: 1, bonded: 10, joined: true },
+					Event::Bonded { member: 11, pool_id: 1, bonded: 2, joined: true },
+				]
+			);
+			assert_eq!(TotalValueLocked::<T>::get(), 12);
+
+			assert_eq!(
+				PoolMembers::<Runtime>::get(11).unwrap(),
+				PoolMember::<Runtime> { pool_id: 1, points: 2, ..Default::default() }
+			);
+			assert_eq!(BondedPool::<Runtime>::get(1).unwrap(), bonded(12, 2));
+
+			// Given
+			// The bonded balance is slashed in half
+			StakingMock::slash_by(1, 6);
+
+			// And
+			Currency::set_balance(&12, ExistentialDeposit::get() + 12);
+			assert!(!PoolMembers::<Runtime>::contains_key(12));
+
+			// When
+			assert_ok!(Pools::join(RuntimeOrigin::signed(12), 12, 1));
+
+			// Then
+			assert_eq!(
+				pool_events_since_last_call(),
+				vec![
+					Event::PoolSlashed { pool_id: 1, balance: 6 },
+					Event::Bonded { member: 12, pool_id: 1, bonded: 12, joined: true }
+				]
+			);
+			assert_eq!(TotalValueLocked::<T>::get(), 18);
+
+			assert_eq!(
+				PoolMembers::<Runtime>::get(12).unwrap(),
+				PoolMember::<Runtime> { pool_id: 1, points: 24, ..Default::default() }
+			);
+			assert_eq!(BondedPool::<Runtime>::get(1).unwrap(), bonded(12 + 24, 3));
+		});
+	}
+}
diff --git a/substrate/frame/nomination-pools/src/weights.rs b/substrate/frame/nomination-pools/src/weights.rs
index eb33c9adbbf9657a7ab71f9f33632d6e41499d4d..2cb414fc2a07f76f97a3c460c3db2a7450d10591 100644
--- a/substrate/frame/nomination-pools/src/weights.rs
+++ b/substrate/frame/nomination-pools/src/weights.rs
@@ -15,32 +15,29 @@
 // See the License for the specific language governing permissions and
 // limitations under the License.
 
-//! Autogenerated weights for pallet_nomination_pools
+//! Autogenerated weights for `pallet_nomination_pools`
 //!
 //! THIS FILE WAS AUTO-GENERATED USING THE SUBSTRATE BENCHMARK CLI VERSION 4.0.0-dev
-//! DATE: 2023-06-16, STEPS: `50`, REPEAT: `20`, LOW RANGE: `[]`, HIGH RANGE: `[]`
+//! DATE: 2023-09-19, STEPS: `50`, REPEAT: `20`, LOW RANGE: `[]`, HIGH RANGE: `[]`
 //! WORST CASE MAP SIZE: `1000000`
-//! HOSTNAME: `runner-e8ezs4ez-project-145-concurrent-0`, CPU: `Intel(R) Xeon(R) CPU @ 2.60GHz`
-//! EXECUTION: Some(Wasm), WASM-EXECUTION: Compiled, CHAIN: Some("dev"), DB CACHE: 1024
+//! HOSTNAME: `runner-guclnr1q-project-674-concurrent-0`, CPU: `Intel(R) Xeon(R) CPU @ 2.60GHz`
+//! WASM-EXECUTION: `Compiled`, CHAIN: `Some("dev")`, DB CACHE: `1024`
 
 // Executed Command:
-// ./target/production/substrate
+// target/production/substrate-node
 // benchmark
 // pallet
-// --chain=dev
 // --steps=50
 // --repeat=20
-// --pallet=pallet_nomination_pools
-// --no-storage-info
-// --no-median-slopes
-// --no-min-squares
 // --extrinsic=*
-// --execution=wasm
 // --wasm-execution=compiled
 // --heap-pages=4096
-// --output=./frame/nomination-pools/src/weights.rs
-// --header=./HEADER-APACHE2
-// --template=./.maintain/frame-weight-template.hbs
+// --json-file=/builds/parity/mirrors/polkadot-sdk/.git/.artifacts/bench.json
+// --pallet=pallet_nomination_pools
+// --chain=dev
+// --header=./substrate/HEADER-APACHE2
+// --output=./substrate/frame/nomination-pools/src/weights.rs
+// --template=./substrate/.maintain/frame-weight-template.hbs
 
 #![cfg_attr(rustfmt, rustfmt_skip)]
 #![allow(unused_parens)]
@@ -50,7 +47,7 @@
 use frame_support::{traits::Get, weights::{Weight, constants::RocksDbWeight}};
 use core::marker::PhantomData;
 
-/// Weight functions needed for pallet_nomination_pools.
+/// Weight functions needed for `pallet_nomination_pools`.
 pub trait WeightInfo {
 	fn join() -> Weight;
 	fn bond_extra_transfer() -> Weight;
@@ -72,1068 +69,1107 @@ pub trait WeightInfo {
 	fn set_commission_change_rate() -> Weight;
 	fn set_claim_permission() -> Weight;
 	fn claim_commission() -> Weight;
+	fn adjust_pool_deposit() -> Weight;
 }
 
-/// Weights for pallet_nomination_pools using the Substrate node and recommended hardware.
+/// Weights for `pallet_nomination_pools` using the Substrate node and recommended hardware.
 pub struct SubstrateWeight<T>(PhantomData<T>);
 impl<T: frame_system::Config> WeightInfo for SubstrateWeight<T> {
-	/// Storage: NominationPools MinJoinBond (r:1 w:0)
-	/// Proof: NominationPools MinJoinBond (max_values: Some(1), max_size: Some(16), added: 511, mode: MaxEncodedLen)
-	/// Storage: NominationPools PoolMembers (r:1 w:1)
-	/// Proof: NominationPools PoolMembers (max_values: None, max_size: Some(237), added: 2712, mode: MaxEncodedLen)
-	/// Storage: NominationPools BondedPools (r:1 w:1)
-	/// Proof: NominationPools BondedPools (max_values: None, max_size: Some(220), added: 2695, mode: MaxEncodedLen)
-	/// Storage: Staking Bonded (r:1 w:0)
-	/// Proof: Staking Bonded (max_values: None, max_size: Some(72), added: 2547, mode: MaxEncodedLen)
-	/// Storage: Staking Ledger (r:1 w:1)
-	/// Proof: Staking Ledger (max_values: None, max_size: Some(1091), added: 3566, mode: MaxEncodedLen)
-	/// Storage: NominationPools RewardPools (r:1 w:1)
-	/// Proof: NominationPools RewardPools (max_values: None, max_size: Some(92), added: 2567, mode: MaxEncodedLen)
-	/// Storage: NominationPools GlobalMaxCommission (r:1 w:0)
-	/// Proof: NominationPools GlobalMaxCommission (max_values: Some(1), max_size: Some(4), added: 499, mode: MaxEncodedLen)
-	/// Storage: System Account (r:2 w:1)
-	/// Proof: System Account (max_values: None, max_size: Some(128), added: 2603, mode: MaxEncodedLen)
-	/// Storage: NominationPools MaxPoolMembersPerPool (r:1 w:0)
-	/// Proof: NominationPools MaxPoolMembersPerPool (max_values: Some(1), max_size: Some(4), added: 499, mode: MaxEncodedLen)
-	/// Storage: NominationPools MaxPoolMembers (r:1 w:0)
-	/// Proof: NominationPools MaxPoolMembers (max_values: Some(1), max_size: Some(4), added: 499, mode: MaxEncodedLen)
-	/// Storage: NominationPools CounterForPoolMembers (r:1 w:1)
-	/// Proof: NominationPools CounterForPoolMembers (max_values: Some(1), max_size: Some(4), added: 499, mode: MaxEncodedLen)
-	/// Storage: Balances Locks (r:1 w:1)
-	/// Proof: Balances Locks (max_values: None, max_size: Some(1299), added: 3774, mode: MaxEncodedLen)
-	/// Storage: Balances Freezes (r:1 w:0)
-	/// Proof: Balances Freezes (max_values: None, max_size: Some(49), added: 2524, mode: MaxEncodedLen)
-	/// Storage: VoterList ListNodes (r:3 w:3)
-	/// Proof: VoterList ListNodes (max_values: None, max_size: Some(154), added: 2629, mode: MaxEncodedLen)
-	/// Storage: VoterList ListBags (r:2 w:2)
-	/// Proof: VoterList ListBags (max_values: None, max_size: Some(82), added: 2557, mode: MaxEncodedLen)
+	/// Storage: `NominationPools::MinJoinBond` (r:1 w:0)
+	/// Proof: `NominationPools::MinJoinBond` (`max_values`: Some(1), `max_size`: Some(16), added: 511, mode: `MaxEncodedLen`)
+	/// Storage: `NominationPools::PoolMembers` (r:1 w:1)
+	/// Proof: `NominationPools::PoolMembers` (`max_values`: None, `max_size`: Some(237), added: 2712, mode: `MaxEncodedLen`)
+	/// Storage: `NominationPools::BondedPools` (r:1 w:1)
+	/// Proof: `NominationPools::BondedPools` (`max_values`: None, `max_size`: Some(220), added: 2695, mode: `MaxEncodedLen`)
+	/// Storage: `Staking::Bonded` (r:1 w:0)
+	/// Proof: `Staking::Bonded` (`max_values`: None, `max_size`: Some(72), added: 2547, mode: `MaxEncodedLen`)
+	/// Storage: `Staking::Ledger` (r:1 w:1)
+	/// Proof: `Staking::Ledger` (`max_values`: None, `max_size`: Some(1091), added: 3566, mode: `MaxEncodedLen`)
+	/// Storage: `NominationPools::RewardPools` (r:1 w:1)
+	/// Proof: `NominationPools::RewardPools` (`max_values`: None, `max_size`: Some(92), added: 2567, mode: `MaxEncodedLen`)
+	/// Storage: `NominationPools::GlobalMaxCommission` (r:1 w:0)
+	/// Proof: `NominationPools::GlobalMaxCommission` (`max_values`: Some(1), `max_size`: Some(4), added: 499, mode: `MaxEncodedLen`)
+	/// Storage: `System::Account` (r:2 w:1)
+	/// Proof: `System::Account` (`max_values`: None, `max_size`: Some(128), added: 2603, mode: `MaxEncodedLen`)
+	/// Storage: `NominationPools::MaxPoolMembersPerPool` (r:1 w:0)
+	/// Proof: `NominationPools::MaxPoolMembersPerPool` (`max_values`: Some(1), `max_size`: Some(4), added: 499, mode: `MaxEncodedLen`)
+	/// Storage: `NominationPools::MaxPoolMembers` (r:1 w:0)
+	/// Proof: `NominationPools::MaxPoolMembers` (`max_values`: Some(1), `max_size`: Some(4), added: 499, mode: `MaxEncodedLen`)
+	/// Storage: `NominationPools::CounterForPoolMembers` (r:1 w:1)
+	/// Proof: `NominationPools::CounterForPoolMembers` (`max_values`: Some(1), `max_size`: Some(4), added: 499, mode: `MaxEncodedLen`)
+	/// Storage: `Balances::Locks` (r:1 w:1)
+	/// Proof: `Balances::Locks` (`max_values`: None, `max_size`: Some(1299), added: 3774, mode: `MaxEncodedLen`)
+	/// Storage: `Balances::Freezes` (r:1 w:0)
+	/// Proof: `Balances::Freezes` (`max_values`: None, `max_size`: Some(67), added: 2542, mode: `MaxEncodedLen`)
+	/// Storage: `VoterList::ListNodes` (r:3 w:3)
+	/// Proof: `VoterList::ListNodes` (`max_values`: None, `max_size`: Some(154), added: 2629, mode: `MaxEncodedLen`)
+	/// Storage: `VoterList::ListBags` (r:2 w:2)
+	/// Proof: `VoterList::ListBags` (`max_values`: None, `max_size`: Some(82), added: 2557, mode: `MaxEncodedLen`)
 	fn join() -> Weight {
 		// Proof Size summary in bytes:
-		//  Measured:  `3300`
+		//  Measured:  `3388`
 		//  Estimated: `8877`
-		// Minimum execution time: 200_966_000 picoseconds.
-		Weight::from_parts(208_322_000, 8877)
+		// Minimum execution time: 203_377_000 picoseconds.
+		Weight::from_parts(206_359_000, 8877)
 			.saturating_add(T::DbWeight::get().reads(19_u64))
 			.saturating_add(T::DbWeight::get().writes(12_u64))
 	}
-	/// Storage: NominationPools PoolMembers (r:1 w:1)
-	/// Proof: NominationPools PoolMembers (max_values: None, max_size: Some(237), added: 2712, mode: MaxEncodedLen)
-	/// Storage: NominationPools BondedPools (r:1 w:1)
-	/// Proof: NominationPools BondedPools (max_values: None, max_size: Some(220), added: 2695, mode: MaxEncodedLen)
-	/// Storage: NominationPools RewardPools (r:1 w:1)
-	/// Proof: NominationPools RewardPools (max_values: None, max_size: Some(92), added: 2567, mode: MaxEncodedLen)
-	/// Storage: NominationPools GlobalMaxCommission (r:1 w:0)
-	/// Proof: NominationPools GlobalMaxCommission (max_values: Some(1), max_size: Some(4), added: 499, mode: MaxEncodedLen)
-	/// Storage: System Account (r:3 w:2)
-	/// Proof: System Account (max_values: None, max_size: Some(128), added: 2603, mode: MaxEncodedLen)
-	/// Storage: Staking Bonded (r:1 w:0)
-	/// Proof: Staking Bonded (max_values: None, max_size: Some(72), added: 2547, mode: MaxEncodedLen)
-	/// Storage: Staking Ledger (r:1 w:1)
-	/// Proof: Staking Ledger (max_values: None, max_size: Some(1091), added: 3566, mode: MaxEncodedLen)
-	/// Storage: Balances Locks (r:1 w:1)
-	/// Proof: Balances Locks (max_values: None, max_size: Some(1299), added: 3774, mode: MaxEncodedLen)
-	/// Storage: Balances Freezes (r:1 w:0)
-	/// Proof: Balances Freezes (max_values: None, max_size: Some(49), added: 2524, mode: MaxEncodedLen)
-	/// Storage: VoterList ListNodes (r:3 w:3)
-	/// Proof: VoterList ListNodes (max_values: None, max_size: Some(154), added: 2629, mode: MaxEncodedLen)
-	/// Storage: VoterList ListBags (r:2 w:2)
-	/// Proof: VoterList ListBags (max_values: None, max_size: Some(82), added: 2557, mode: MaxEncodedLen)
+	/// Storage: `NominationPools::PoolMembers` (r:1 w:1)
+	/// Proof: `NominationPools::PoolMembers` (`max_values`: None, `max_size`: Some(237), added: 2712, mode: `MaxEncodedLen`)
+	/// Storage: `NominationPools::BondedPools` (r:1 w:1)
+	/// Proof: `NominationPools::BondedPools` (`max_values`: None, `max_size`: Some(220), added: 2695, mode: `MaxEncodedLen`)
+	/// Storage: `NominationPools::RewardPools` (r:1 w:1)
+	/// Proof: `NominationPools::RewardPools` (`max_values`: None, `max_size`: Some(92), added: 2567, mode: `MaxEncodedLen`)
+	/// Storage: `NominationPools::GlobalMaxCommission` (r:1 w:0)
+	/// Proof: `NominationPools::GlobalMaxCommission` (`max_values`: Some(1), `max_size`: Some(4), added: 499, mode: `MaxEncodedLen`)
+	/// Storage: `System::Account` (r:3 w:2)
+	/// Proof: `System::Account` (`max_values`: None, `max_size`: Some(128), added: 2603, mode: `MaxEncodedLen`)
+	/// Storage: `Staking::Bonded` (r:1 w:0)
+	/// Proof: `Staking::Bonded` (`max_values`: None, `max_size`: Some(72), added: 2547, mode: `MaxEncodedLen`)
+	/// Storage: `Staking::Ledger` (r:1 w:1)
+	/// Proof: `Staking::Ledger` (`max_values`: None, `max_size`: Some(1091), added: 3566, mode: `MaxEncodedLen`)
+	/// Storage: `Balances::Locks` (r:1 w:1)
+	/// Proof: `Balances::Locks` (`max_values`: None, `max_size`: Some(1299), added: 3774, mode: `MaxEncodedLen`)
+	/// Storage: `Balances::Freezes` (r:1 w:0)
+	/// Proof: `Balances::Freezes` (`max_values`: None, `max_size`: Some(67), added: 2542, mode: `MaxEncodedLen`)
+	/// Storage: `VoterList::ListNodes` (r:3 w:3)
+	/// Proof: `VoterList::ListNodes` (`max_values`: None, `max_size`: Some(154), added: 2629, mode: `MaxEncodedLen`)
+	/// Storage: `VoterList::ListBags` (r:2 w:2)
+	/// Proof: `VoterList::ListBags` (`max_values`: None, `max_size`: Some(82), added: 2557, mode: `MaxEncodedLen`)
 	fn bond_extra_transfer() -> Weight {
 		// Proof Size summary in bytes:
-		//  Measured:  `3310`
+		//  Measured:  `3398`
 		//  Estimated: `8877`
-		// Minimum execution time: 197_865_000 picoseconds.
-		Weight::from_parts(203_085_000, 8877)
+		// Minimum execution time: 199_792_000 picoseconds.
+		Weight::from_parts(206_871_000, 8877)
 			.saturating_add(T::DbWeight::get().reads(16_u64))
 			.saturating_add(T::DbWeight::get().writes(12_u64))
 	}
-	/// Storage: NominationPools ClaimPermissions (r:1 w:0)
-	/// Proof: NominationPools ClaimPermissions (max_values: None, max_size: Some(41), added: 2516, mode: MaxEncodedLen)
-	/// Storage: NominationPools PoolMembers (r:1 w:1)
-	/// Proof: NominationPools PoolMembers (max_values: None, max_size: Some(237), added: 2712, mode: MaxEncodedLen)
-	/// Storage: NominationPools BondedPools (r:1 w:1)
-	/// Proof: NominationPools BondedPools (max_values: None, max_size: Some(220), added: 2695, mode: MaxEncodedLen)
-	/// Storage: NominationPools RewardPools (r:1 w:1)
-	/// Proof: NominationPools RewardPools (max_values: None, max_size: Some(92), added: 2567, mode: MaxEncodedLen)
-	/// Storage: NominationPools GlobalMaxCommission (r:1 w:0)
-	/// Proof: NominationPools GlobalMaxCommission (max_values: Some(1), max_size: Some(4), added: 499, mode: MaxEncodedLen)
-	/// Storage: System Account (r:3 w:3)
-	/// Proof: System Account (max_values: None, max_size: Some(128), added: 2603, mode: MaxEncodedLen)
-	/// Storage: Staking Bonded (r:1 w:0)
-	/// Proof: Staking Bonded (max_values: None, max_size: Some(72), added: 2547, mode: MaxEncodedLen)
-	/// Storage: Staking Ledger (r:1 w:1)
-	/// Proof: Staking Ledger (max_values: None, max_size: Some(1091), added: 3566, mode: MaxEncodedLen)
-	/// Storage: Balances Locks (r:1 w:1)
-	/// Proof: Balances Locks (max_values: None, max_size: Some(1299), added: 3774, mode: MaxEncodedLen)
-	/// Storage: Balances Freezes (r:1 w:0)
-	/// Proof: Balances Freezes (max_values: None, max_size: Some(49), added: 2524, mode: MaxEncodedLen)
-	/// Storage: VoterList ListNodes (r:3 w:3)
-	/// Proof: VoterList ListNodes (max_values: None, max_size: Some(154), added: 2629, mode: MaxEncodedLen)
-	/// Storage: VoterList ListBags (r:2 w:2)
-	/// Proof: VoterList ListBags (max_values: None, max_size: Some(82), added: 2557, mode: MaxEncodedLen)
+	/// Storage: `NominationPools::ClaimPermissions` (r:1 w:0)
+	/// Proof: `NominationPools::ClaimPermissions` (`max_values`: None, `max_size`: Some(41), added: 2516, mode: `MaxEncodedLen`)
+	/// Storage: `NominationPools::PoolMembers` (r:1 w:1)
+	/// Proof: `NominationPools::PoolMembers` (`max_values`: None, `max_size`: Some(237), added: 2712, mode: `MaxEncodedLen`)
+	/// Storage: `NominationPools::BondedPools` (r:1 w:1)
+	/// Proof: `NominationPools::BondedPools` (`max_values`: None, `max_size`: Some(220), added: 2695, mode: `MaxEncodedLen`)
+	/// Storage: `NominationPools::RewardPools` (r:1 w:1)
+	/// Proof: `NominationPools::RewardPools` (`max_values`: None, `max_size`: Some(92), added: 2567, mode: `MaxEncodedLen`)
+	/// Storage: `NominationPools::GlobalMaxCommission` (r:1 w:0)
+	/// Proof: `NominationPools::GlobalMaxCommission` (`max_values`: Some(1), `max_size`: Some(4), added: 499, mode: `MaxEncodedLen`)
+	/// Storage: `System::Account` (r:3 w:3)
+	/// Proof: `System::Account` (`max_values`: None, `max_size`: Some(128), added: 2603, mode: `MaxEncodedLen`)
+	/// Storage: `Staking::Bonded` (r:1 w:0)
+	/// Proof: `Staking::Bonded` (`max_values`: None, `max_size`: Some(72), added: 2547, mode: `MaxEncodedLen`)
+	/// Storage: `Staking::Ledger` (r:1 w:1)
+	/// Proof: `Staking::Ledger` (`max_values`: None, `max_size`: Some(1091), added: 3566, mode: `MaxEncodedLen`)
+	/// Storage: `Balances::Locks` (r:1 w:1)
+	/// Proof: `Balances::Locks` (`max_values`: None, `max_size`: Some(1299), added: 3774, mode: `MaxEncodedLen`)
+	/// Storage: `Balances::Freezes` (r:1 w:0)
+	/// Proof: `Balances::Freezes` (`max_values`: None, `max_size`: Some(67), added: 2542, mode: `MaxEncodedLen`)
+	/// Storage: `VoterList::ListNodes` (r:3 w:3)
+	/// Proof: `VoterList::ListNodes` (`max_values`: None, `max_size`: Some(154), added: 2629, mode: `MaxEncodedLen`)
+	/// Storage: `VoterList::ListBags` (r:2 w:2)
+	/// Proof: `VoterList::ListBags` (`max_values`: None, `max_size`: Some(82), added: 2557, mode: `MaxEncodedLen`)
 	fn bond_extra_other() -> Weight {
 		// Proof Size summary in bytes:
-		//  Measured:  `3375`
+		//  Measured:  `3463`
 		//  Estimated: `8877`
-		// Minimum execution time: 235_496_000 picoseconds.
-		Weight::from_parts(242_104_000, 8877)
+		// Minimum execution time: 246_362_000 picoseconds.
+		Weight::from_parts(253_587_000, 8877)
 			.saturating_add(T::DbWeight::get().reads(17_u64))
 			.saturating_add(T::DbWeight::get().writes(13_u64))
 	}
-	/// Storage: NominationPools ClaimPermissions (r:1 w:0)
-	/// Proof: NominationPools ClaimPermissions (max_values: None, max_size: Some(41), added: 2516, mode: MaxEncodedLen)
-	/// Storage: NominationPools PoolMembers (r:1 w:1)
-	/// Proof: NominationPools PoolMembers (max_values: None, max_size: Some(237), added: 2712, mode: MaxEncodedLen)
-	/// Storage: NominationPools BondedPools (r:1 w:1)
-	/// Proof: NominationPools BondedPools (max_values: None, max_size: Some(220), added: 2695, mode: MaxEncodedLen)
-	/// Storage: NominationPools RewardPools (r:1 w:1)
-	/// Proof: NominationPools RewardPools (max_values: None, max_size: Some(92), added: 2567, mode: MaxEncodedLen)
-	/// Storage: NominationPools GlobalMaxCommission (r:1 w:0)
-	/// Proof: NominationPools GlobalMaxCommission (max_values: Some(1), max_size: Some(4), added: 499, mode: MaxEncodedLen)
-	/// Storage: System Account (r:1 w:1)
-	/// Proof: System Account (max_values: None, max_size: Some(128), added: 2603, mode: MaxEncodedLen)
+	/// Storage: `NominationPools::ClaimPermissions` (r:1 w:0)
+	/// Proof: `NominationPools::ClaimPermissions` (`max_values`: None, `max_size`: Some(41), added: 2516, mode: `MaxEncodedLen`)
+	/// Storage: `NominationPools::PoolMembers` (r:1 w:1)
+	/// Proof: `NominationPools::PoolMembers` (`max_values`: None, `max_size`: Some(237), added: 2712, mode: `MaxEncodedLen`)
+	/// Storage: `NominationPools::BondedPools` (r:1 w:1)
+	/// Proof: `NominationPools::BondedPools` (`max_values`: None, `max_size`: Some(220), added: 2695, mode: `MaxEncodedLen`)
+	/// Storage: `NominationPools::RewardPools` (r:1 w:1)
+	/// Proof: `NominationPools::RewardPools` (`max_values`: None, `max_size`: Some(92), added: 2567, mode: `MaxEncodedLen`)
+	/// Storage: `NominationPools::GlobalMaxCommission` (r:1 w:0)
+	/// Proof: `NominationPools::GlobalMaxCommission` (`max_values`: Some(1), `max_size`: Some(4), added: 499, mode: `MaxEncodedLen`)
+	/// Storage: `System::Account` (r:1 w:1)
+	/// Proof: `System::Account` (`max_values`: None, `max_size`: Some(128), added: 2603, mode: `MaxEncodedLen`)
 	fn claim_payout() -> Weight {
 		// Proof Size summary in bytes:
 		//  Measured:  `1171`
 		//  Estimated: `3702`
-		// Minimum execution time: 81_813_000 picoseconds.
-		Weight::from_parts(83_277_000, 3702)
+		// Minimum execution time: 81_115_000 picoseconds.
+		Weight::from_parts(83_604_000, 3702)
 			.saturating_add(T::DbWeight::get().reads(6_u64))
 			.saturating_add(T::DbWeight::get().writes(4_u64))
 	}
-	/// Storage: NominationPools PoolMembers (r:1 w:1)
-	/// Proof: NominationPools PoolMembers (max_values: None, max_size: Some(237), added: 2712, mode: MaxEncodedLen)
-	/// Storage: NominationPools BondedPools (r:1 w:1)
-	/// Proof: NominationPools BondedPools (max_values: None, max_size: Some(220), added: 2695, mode: MaxEncodedLen)
-	/// Storage: NominationPools RewardPools (r:1 w:1)
-	/// Proof: NominationPools RewardPools (max_values: None, max_size: Some(92), added: 2567, mode: MaxEncodedLen)
-	/// Storage: Staking Bonded (r:1 w:0)
-	/// Proof: Staking Bonded (max_values: None, max_size: Some(72), added: 2547, mode: MaxEncodedLen)
-	/// Storage: Staking Ledger (r:1 w:1)
-	/// Proof: Staking Ledger (max_values: None, max_size: Some(1091), added: 3566, mode: MaxEncodedLen)
-	/// Storage: NominationPools GlobalMaxCommission (r:1 w:0)
-	/// Proof: NominationPools GlobalMaxCommission (max_values: Some(1), max_size: Some(4), added: 499, mode: MaxEncodedLen)
-	/// Storage: System Account (r:2 w:1)
-	/// Proof: System Account (max_values: None, max_size: Some(128), added: 2603, mode: MaxEncodedLen)
-	/// Storage: Staking CurrentEra (r:1 w:0)
-	/// Proof: Staking CurrentEra (max_values: Some(1), max_size: Some(4), added: 499, mode: MaxEncodedLen)
-	/// Storage: Staking Nominators (r:1 w:0)
-	/// Proof: Staking Nominators (max_values: None, max_size: Some(558), added: 3033, mode: MaxEncodedLen)
-	/// Storage: Staking MinNominatorBond (r:1 w:0)
-	/// Proof: Staking MinNominatorBond (max_values: Some(1), max_size: Some(16), added: 511, mode: MaxEncodedLen)
-	/// Storage: Balances Locks (r:1 w:1)
-	/// Proof: Balances Locks (max_values: None, max_size: Some(1299), added: 3774, mode: MaxEncodedLen)
-	/// Storage: Balances Freezes (r:1 w:0)
-	/// Proof: Balances Freezes (max_values: None, max_size: Some(49), added: 2524, mode: MaxEncodedLen)
-	/// Storage: VoterList ListNodes (r:3 w:3)
-	/// Proof: VoterList ListNodes (max_values: None, max_size: Some(154), added: 2629, mode: MaxEncodedLen)
-	/// Storage: VoterList ListBags (r:2 w:2)
-	/// Proof: VoterList ListBags (max_values: None, max_size: Some(82), added: 2557, mode: MaxEncodedLen)
-	/// Storage: NominationPools SubPoolsStorage (r:1 w:1)
-	/// Proof: NominationPools SubPoolsStorage (max_values: None, max_size: Some(24382), added: 26857, mode: MaxEncodedLen)
-	/// Storage: NominationPools CounterForSubPoolsStorage (r:1 w:1)
-	/// Proof: NominationPools CounterForSubPoolsStorage (max_values: Some(1), max_size: Some(4), added: 499, mode: MaxEncodedLen)
+	/// Storage: `NominationPools::PoolMembers` (r:1 w:1)
+	/// Proof: `NominationPools::PoolMembers` (`max_values`: None, `max_size`: Some(237), added: 2712, mode: `MaxEncodedLen`)
+	/// Storage: `NominationPools::BondedPools` (r:1 w:1)
+	/// Proof: `NominationPools::BondedPools` (`max_values`: None, `max_size`: Some(220), added: 2695, mode: `MaxEncodedLen`)
+	/// Storage: `NominationPools::RewardPools` (r:1 w:1)
+	/// Proof: `NominationPools::RewardPools` (`max_values`: None, `max_size`: Some(92), added: 2567, mode: `MaxEncodedLen`)
+	/// Storage: `Staking::Bonded` (r:1 w:0)
+	/// Proof: `Staking::Bonded` (`max_values`: None, `max_size`: Some(72), added: 2547, mode: `MaxEncodedLen`)
+	/// Storage: `Staking::Ledger` (r:1 w:1)
+	/// Proof: `Staking::Ledger` (`max_values`: None, `max_size`: Some(1091), added: 3566, mode: `MaxEncodedLen`)
+	/// Storage: `NominationPools::GlobalMaxCommission` (r:1 w:0)
+	/// Proof: `NominationPools::GlobalMaxCommission` (`max_values`: Some(1), `max_size`: Some(4), added: 499, mode: `MaxEncodedLen`)
+	/// Storage: `System::Account` (r:2 w:1)
+	/// Proof: `System::Account` (`max_values`: None, `max_size`: Some(128), added: 2603, mode: `MaxEncodedLen`)
+	/// Storage: `Staking::CurrentEra` (r:1 w:0)
+	/// Proof: `Staking::CurrentEra` (`max_values`: Some(1), `max_size`: Some(4), added: 499, mode: `MaxEncodedLen`)
+	/// Storage: `Staking::Nominators` (r:1 w:0)
+	/// Proof: `Staking::Nominators` (`max_values`: None, `max_size`: Some(558), added: 3033, mode: `MaxEncodedLen`)
+	/// Storage: `Staking::MinNominatorBond` (r:1 w:0)
+	/// Proof: `Staking::MinNominatorBond` (`max_values`: Some(1), `max_size`: Some(16), added: 511, mode: `MaxEncodedLen`)
+	/// Storage: `Balances::Locks` (r:1 w:1)
+	/// Proof: `Balances::Locks` (`max_values`: None, `max_size`: Some(1299), added: 3774, mode: `MaxEncodedLen`)
+	/// Storage: `Balances::Freezes` (r:1 w:0)
+	/// Proof: `Balances::Freezes` (`max_values`: None, `max_size`: Some(67), added: 2542, mode: `MaxEncodedLen`)
+	/// Storage: `VoterList::ListNodes` (r:3 w:3)
+	/// Proof: `VoterList::ListNodes` (`max_values`: None, `max_size`: Some(154), added: 2629, mode: `MaxEncodedLen`)
+	/// Storage: `VoterList::ListBags` (r:2 w:2)
+	/// Proof: `VoterList::ListBags` (`max_values`: None, `max_size`: Some(82), added: 2557, mode: `MaxEncodedLen`)
+	/// Storage: `NominationPools::SubPoolsStorage` (r:1 w:1)
+	/// Proof: `NominationPools::SubPoolsStorage` (`max_values`: None, `max_size`: Some(24382), added: 26857, mode: `MaxEncodedLen`)
+	/// Storage: `NominationPools::CounterForSubPoolsStorage` (r:1 w:1)
+	/// Proof: `NominationPools::CounterForSubPoolsStorage` (`max_values`: Some(1), `max_size`: Some(4), added: 499, mode: `MaxEncodedLen`)
 	fn unbond() -> Weight {
 		// Proof Size summary in bytes:
-		//  Measured:  `3586`
+		//  Measured:  `3674`
 		//  Estimated: `27847`
-		// Minimum execution time: 183_935_000 picoseconds.
-		Weight::from_parts(186_920_000, 27847)
+		// Minimum execution time: 187_210_000 picoseconds.
+		Weight::from_parts(189_477_000, 27847)
 			.saturating_add(T::DbWeight::get().reads(20_u64))
 			.saturating_add(T::DbWeight::get().writes(13_u64))
 	}
-	/// Storage: NominationPools BondedPools (r:1 w:0)
-	/// Proof: NominationPools BondedPools (max_values: None, max_size: Some(220), added: 2695, mode: MaxEncodedLen)
-	/// Storage: Staking Bonded (r:1 w:0)
-	/// Proof: Staking Bonded (max_values: None, max_size: Some(72), added: 2547, mode: MaxEncodedLen)
-	/// Storage: Staking Ledger (r:1 w:1)
-	/// Proof: Staking Ledger (max_values: None, max_size: Some(1091), added: 3566, mode: MaxEncodedLen)
-	/// Storage: Staking CurrentEra (r:1 w:0)
-	/// Proof: Staking CurrentEra (max_values: Some(1), max_size: Some(4), added: 499, mode: MaxEncodedLen)
-	/// Storage: Balances Locks (r:1 w:1)
-	/// Proof: Balances Locks (max_values: None, max_size: Some(1299), added: 3774, mode: MaxEncodedLen)
-	/// Storage: Balances Freezes (r:1 w:0)
-	/// Proof: Balances Freezes (max_values: None, max_size: Some(49), added: 2524, mode: MaxEncodedLen)
+	/// Storage: `NominationPools::BondedPools` (r:1 w:0)
+	/// Proof: `NominationPools::BondedPools` (`max_values`: None, `max_size`: Some(220), added: 2695, mode: `MaxEncodedLen`)
+	/// Storage: `Staking::Bonded` (r:1 w:0)
+	/// Proof: `Staking::Bonded` (`max_values`: None, `max_size`: Some(72), added: 2547, mode: `MaxEncodedLen`)
+	/// Storage: `Staking::Ledger` (r:1 w:1)
+	/// Proof: `Staking::Ledger` (`max_values`: None, `max_size`: Some(1091), added: 3566, mode: `MaxEncodedLen`)
+	/// Storage: `Staking::CurrentEra` (r:1 w:0)
+	/// Proof: `Staking::CurrentEra` (`max_values`: Some(1), `max_size`: Some(4), added: 499, mode: `MaxEncodedLen`)
+	/// Storage: `Balances::Locks` (r:1 w:1)
+	/// Proof: `Balances::Locks` (`max_values`: None, `max_size`: Some(1299), added: 3774, mode: `MaxEncodedLen`)
+	/// Storage: `Balances::Freezes` (r:1 w:0)
+	/// Proof: `Balances::Freezes` (`max_values`: None, `max_size`: Some(67), added: 2542, mode: `MaxEncodedLen`)
 	/// The range of component `s` is `[0, 100]`.
 	fn pool_withdraw_unbonded(s: u32, ) -> Weight {
 		// Proof Size summary in bytes:
-		//  Measured:  `1687`
+		//  Measured:  `1743`
 		//  Estimated: `4764`
-		// Minimum execution time: 64_962_000 picoseconds.
-		Weight::from_parts(67_936_216, 4764)
-			// Standard Error: 1_780
-			.saturating_add(Weight::from_parts(36_110, 0).saturating_mul(s.into()))
+		// Minimum execution time: 66_384_000 picoseconds.
+		Weight::from_parts(69_498_267, 4764)
+			// Standard Error: 2_566
+			.saturating_add(Weight::from_parts(34_528, 0).saturating_mul(s.into()))
 			.saturating_add(T::DbWeight::get().reads(6_u64))
 			.saturating_add(T::DbWeight::get().writes(2_u64))
 	}
-	/// Storage: NominationPools PoolMembers (r:1 w:1)
-	/// Proof: NominationPools PoolMembers (max_values: None, max_size: Some(237), added: 2712, mode: MaxEncodedLen)
-	/// Storage: Staking CurrentEra (r:1 w:0)
-	/// Proof: Staking CurrentEra (max_values: Some(1), max_size: Some(4), added: 499, mode: MaxEncodedLen)
-	/// Storage: NominationPools BondedPools (r:1 w:1)
-	/// Proof: NominationPools BondedPools (max_values: None, max_size: Some(220), added: 2695, mode: MaxEncodedLen)
-	/// Storage: NominationPools SubPoolsStorage (r:1 w:1)
-	/// Proof: NominationPools SubPoolsStorage (max_values: None, max_size: Some(24382), added: 26857, mode: MaxEncodedLen)
-	/// Storage: Staking Bonded (r:1 w:0)
-	/// Proof: Staking Bonded (max_values: None, max_size: Some(72), added: 2547, mode: MaxEncodedLen)
-	/// Storage: Staking Ledger (r:1 w:1)
-	/// Proof: Staking Ledger (max_values: None, max_size: Some(1091), added: 3566, mode: MaxEncodedLen)
-	/// Storage: Balances Locks (r:1 w:1)
-	/// Proof: Balances Locks (max_values: None, max_size: Some(1299), added: 3774, mode: MaxEncodedLen)
-	/// Storage: Balances Freezes (r:1 w:0)
-	/// Proof: Balances Freezes (max_values: None, max_size: Some(49), added: 2524, mode: MaxEncodedLen)
-	/// Storage: System Account (r:1 w:1)
-	/// Proof: System Account (max_values: None, max_size: Some(128), added: 2603, mode: MaxEncodedLen)
-	/// Storage: NominationPools CounterForPoolMembers (r:1 w:1)
-	/// Proof: NominationPools CounterForPoolMembers (max_values: Some(1), max_size: Some(4), added: 499, mode: MaxEncodedLen)
-	/// Storage: NominationPools ClaimPermissions (r:0 w:1)
-	/// Proof: NominationPools ClaimPermissions (max_values: None, max_size: Some(41), added: 2516, mode: MaxEncodedLen)
+	/// Storage: `NominationPools::PoolMembers` (r:1 w:1)
+	/// Proof: `NominationPools::PoolMembers` (`max_values`: None, `max_size`: Some(237), added: 2712, mode: `MaxEncodedLen`)
+	/// Storage: `Staking::CurrentEra` (r:1 w:0)
+	/// Proof: `Staking::CurrentEra` (`max_values`: Some(1), `max_size`: Some(4), added: 499, mode: `MaxEncodedLen`)
+	/// Storage: `NominationPools::BondedPools` (r:1 w:1)
+	/// Proof: `NominationPools::BondedPools` (`max_values`: None, `max_size`: Some(220), added: 2695, mode: `MaxEncodedLen`)
+	/// Storage: `NominationPools::SubPoolsStorage` (r:1 w:1)
+	/// Proof: `NominationPools::SubPoolsStorage` (`max_values`: None, `max_size`: Some(24382), added: 26857, mode: `MaxEncodedLen`)
+	/// Storage: `Staking::Bonded` (r:1 w:0)
+	/// Proof: `Staking::Bonded` (`max_values`: None, `max_size`: Some(72), added: 2547, mode: `MaxEncodedLen`)
+	/// Storage: `Staking::Ledger` (r:1 w:1)
+	/// Proof: `Staking::Ledger` (`max_values`: None, `max_size`: Some(1091), added: 3566, mode: `MaxEncodedLen`)
+	/// Storage: `Balances::Locks` (r:1 w:1)
+	/// Proof: `Balances::Locks` (`max_values`: None, `max_size`: Some(1299), added: 3774, mode: `MaxEncodedLen`)
+	/// Storage: `Balances::Freezes` (r:1 w:0)
+	/// Proof: `Balances::Freezes` (`max_values`: None, `max_size`: Some(67), added: 2542, mode: `MaxEncodedLen`)
+	/// Storage: `System::Account` (r:1 w:1)
+	/// Proof: `System::Account` (`max_values`: None, `max_size`: Some(128), added: 2603, mode: `MaxEncodedLen`)
+	/// Storage: `NominationPools::CounterForPoolMembers` (r:1 w:1)
+	/// Proof: `NominationPools::CounterForPoolMembers` (`max_values`: Some(1), `max_size`: Some(4), added: 499, mode: `MaxEncodedLen`)
+	/// Storage: `NominationPools::ClaimPermissions` (r:0 w:1)
+	/// Proof: `NominationPools::ClaimPermissions` (`max_values`: None, `max_size`: Some(41), added: 2516, mode: `MaxEncodedLen`)
 	/// The range of component `s` is `[0, 100]`.
 	fn withdraw_unbonded_update(s: u32, ) -> Weight {
 		// Proof Size summary in bytes:
-		//  Measured:  `2115`
+		//  Measured:  `2171`
 		//  Estimated: `27847`
-		// Minimum execution time: 136_073_000 picoseconds.
-		Weight::from_parts(141_448_439, 27847)
-			// Standard Error: 2_472
-			.saturating_add(Weight::from_parts(75_893, 0).saturating_mul(s.into()))
+		// Minimum execution time: 137_474_000 picoseconds.
+		Weight::from_parts(142_341_215, 27847)
+			// Standard Error: 3_468
+			.saturating_add(Weight::from_parts(66_597, 0).saturating_mul(s.into()))
 			.saturating_add(T::DbWeight::get().reads(10_u64))
 			.saturating_add(T::DbWeight::get().writes(8_u64))
 	}
-	/// Storage: NominationPools PoolMembers (r:1 w:1)
-	/// Proof: NominationPools PoolMembers (max_values: None, max_size: Some(237), added: 2712, mode: MaxEncodedLen)
-	/// Storage: Staking CurrentEra (r:1 w:0)
-	/// Proof: Staking CurrentEra (max_values: Some(1), max_size: Some(4), added: 499, mode: MaxEncodedLen)
-	/// Storage: NominationPools BondedPools (r:1 w:1)
-	/// Proof: NominationPools BondedPools (max_values: None, max_size: Some(220), added: 2695, mode: MaxEncodedLen)
-	/// Storage: NominationPools SubPoolsStorage (r:1 w:1)
-	/// Proof: NominationPools SubPoolsStorage (max_values: None, max_size: Some(24382), added: 26857, mode: MaxEncodedLen)
-	/// Storage: Staking Bonded (r:1 w:1)
-	/// Proof: Staking Bonded (max_values: None, max_size: Some(72), added: 2547, mode: MaxEncodedLen)
-	/// Storage: Staking Ledger (r:1 w:1)
-	/// Proof: Staking Ledger (max_values: None, max_size: Some(1091), added: 3566, mode: MaxEncodedLen)
-	/// Storage: Staking SlashingSpans (r:1 w:0)
-	/// Proof Skipped: Staking SlashingSpans (max_values: None, max_size: None, mode: Measured)
-	/// Storage: Staking Validators (r:1 w:0)
-	/// Proof: Staking Validators (max_values: None, max_size: Some(45), added: 2520, mode: MaxEncodedLen)
-	/// Storage: Staking Nominators (r:1 w:0)
-	/// Proof: Staking Nominators (max_values: None, max_size: Some(558), added: 3033, mode: MaxEncodedLen)
-	/// Storage: System Account (r:2 w:2)
-	/// Proof: System Account (max_values: None, max_size: Some(128), added: 2603, mode: MaxEncodedLen)
-	/// Storage: Balances Locks (r:1 w:1)
-	/// Proof: Balances Locks (max_values: None, max_size: Some(1299), added: 3774, mode: MaxEncodedLen)
-	/// Storage: Balances Freezes (r:1 w:0)
-	/// Proof: Balances Freezes (max_values: None, max_size: Some(49), added: 2524, mode: MaxEncodedLen)
-	/// Storage: NominationPools CounterForPoolMembers (r:1 w:1)
-	/// Proof: NominationPools CounterForPoolMembers (max_values: Some(1), max_size: Some(4), added: 499, mode: MaxEncodedLen)
-	/// Storage: NominationPools ReversePoolIdLookup (r:1 w:1)
-	/// Proof: NominationPools ReversePoolIdLookup (max_values: None, max_size: Some(44), added: 2519, mode: MaxEncodedLen)
-	/// Storage: NominationPools CounterForReversePoolIdLookup (r:1 w:1)
-	/// Proof: NominationPools CounterForReversePoolIdLookup (max_values: Some(1), max_size: Some(4), added: 499, mode: MaxEncodedLen)
-	/// Storage: NominationPools RewardPools (r:1 w:1)
-	/// Proof: NominationPools RewardPools (max_values: None, max_size: Some(92), added: 2567, mode: MaxEncodedLen)
-	/// Storage: NominationPools CounterForRewardPools (r:1 w:1)
-	/// Proof: NominationPools CounterForRewardPools (max_values: Some(1), max_size: Some(4), added: 499, mode: MaxEncodedLen)
-	/// Storage: NominationPools CounterForSubPoolsStorage (r:1 w:1)
-	/// Proof: NominationPools CounterForSubPoolsStorage (max_values: Some(1), max_size: Some(4), added: 499, mode: MaxEncodedLen)
-	/// Storage: NominationPools Metadata (r:1 w:1)
-	/// Proof: NominationPools Metadata (max_values: None, max_size: Some(270), added: 2745, mode: MaxEncodedLen)
-	/// Storage: NominationPools CounterForBondedPools (r:1 w:1)
-	/// Proof: NominationPools CounterForBondedPools (max_values: Some(1), max_size: Some(4), added: 499, mode: MaxEncodedLen)
-	/// Storage: Staking Payee (r:0 w:1)
-	/// Proof: Staking Payee (max_values: None, max_size: Some(73), added: 2548, mode: MaxEncodedLen)
-	/// Storage: NominationPools ClaimPermissions (r:0 w:1)
-	/// Proof: NominationPools ClaimPermissions (max_values: None, max_size: Some(41), added: 2516, mode: MaxEncodedLen)
+	/// Storage: `NominationPools::PoolMembers` (r:1 w:1)
+	/// Proof: `NominationPools::PoolMembers` (`max_values`: None, `max_size`: Some(237), added: 2712, mode: `MaxEncodedLen`)
+	/// Storage: `Staking::CurrentEra` (r:1 w:0)
+	/// Proof: `Staking::CurrentEra` (`max_values`: Some(1), `max_size`: Some(4), added: 499, mode: `MaxEncodedLen`)
+	/// Storage: `NominationPools::BondedPools` (r:1 w:1)
+	/// Proof: `NominationPools::BondedPools` (`max_values`: None, `max_size`: Some(220), added: 2695, mode: `MaxEncodedLen`)
+	/// Storage: `NominationPools::SubPoolsStorage` (r:1 w:1)
+	/// Proof: `NominationPools::SubPoolsStorage` (`max_values`: None, `max_size`: Some(24382), added: 26857, mode: `MaxEncodedLen`)
+	/// Storage: `Staking::Bonded` (r:1 w:1)
+	/// Proof: `Staking::Bonded` (`max_values`: None, `max_size`: Some(72), added: 2547, mode: `MaxEncodedLen`)
+	/// Storage: `Staking::Ledger` (r:1 w:1)
+	/// Proof: `Staking::Ledger` (`max_values`: None, `max_size`: Some(1091), added: 3566, mode: `MaxEncodedLen`)
+	/// Storage: `Staking::SlashingSpans` (r:1 w:0)
+	/// Proof: `Staking::SlashingSpans` (`max_values`: None, `max_size`: None, mode: `Measured`)
+	/// Storage: `Staking::Validators` (r:1 w:0)
+	/// Proof: `Staking::Validators` (`max_values`: None, `max_size`: Some(45), added: 2520, mode: `MaxEncodedLen`)
+	/// Storage: `Staking::Nominators` (r:1 w:0)
+	/// Proof: `Staking::Nominators` (`max_values`: None, `max_size`: Some(558), added: 3033, mode: `MaxEncodedLen`)
+	/// Storage: `System::Account` (r:2 w:2)
+	/// Proof: `System::Account` (`max_values`: None, `max_size`: Some(128), added: 2603, mode: `MaxEncodedLen`)
+	/// Storage: `Balances::Locks` (r:2 w:1)
+	/// Proof: `Balances::Locks` (`max_values`: None, `max_size`: Some(1299), added: 3774, mode: `MaxEncodedLen`)
+	/// Storage: `Balances::Freezes` (r:2 w:1)
+	/// Proof: `Balances::Freezes` (`max_values`: None, `max_size`: Some(67), added: 2542, mode: `MaxEncodedLen`)
+	/// Storage: `NominationPools::CounterForPoolMembers` (r:1 w:1)
+	/// Proof: `NominationPools::CounterForPoolMembers` (`max_values`: Some(1), `max_size`: Some(4), added: 499, mode: `MaxEncodedLen`)
+	/// Storage: `NominationPools::ReversePoolIdLookup` (r:1 w:1)
+	/// Proof: `NominationPools::ReversePoolIdLookup` (`max_values`: None, `max_size`: Some(44), added: 2519, mode: `MaxEncodedLen`)
+	/// Storage: `NominationPools::CounterForReversePoolIdLookup` (r:1 w:1)
+	/// Proof: `NominationPools::CounterForReversePoolIdLookup` (`max_values`: Some(1), `max_size`: Some(4), added: 499, mode: `MaxEncodedLen`)
+	/// Storage: `NominationPools::RewardPools` (r:1 w:1)
+	/// Proof: `NominationPools::RewardPools` (`max_values`: None, `max_size`: Some(92), added: 2567, mode: `MaxEncodedLen`)
+	/// Storage: `NominationPools::CounterForRewardPools` (r:1 w:1)
+	/// Proof: `NominationPools::CounterForRewardPools` (`max_values`: Some(1), `max_size`: Some(4), added: 499, mode: `MaxEncodedLen`)
+	/// Storage: `NominationPools::CounterForSubPoolsStorage` (r:1 w:1)
+	/// Proof: `NominationPools::CounterForSubPoolsStorage` (`max_values`: Some(1), `max_size`: Some(4), added: 499, mode: `MaxEncodedLen`)
+	/// Storage: `NominationPools::Metadata` (r:1 w:1)
+	/// Proof: `NominationPools::Metadata` (`max_values`: None, `max_size`: Some(270), added: 2745, mode: `MaxEncodedLen`)
+	/// Storage: `NominationPools::CounterForBondedPools` (r:1 w:1)
+	/// Proof: `NominationPools::CounterForBondedPools` (`max_values`: Some(1), `max_size`: Some(4), added: 499, mode: `MaxEncodedLen`)
+	/// Storage: `Staking::Payee` (r:0 w:1)
+	/// Proof: `Staking::Payee` (`max_values`: None, `max_size`: Some(73), added: 2548, mode: `MaxEncodedLen`)
+	/// Storage: `NominationPools::ClaimPermissions` (r:0 w:1)
+	/// Proof: `NominationPools::ClaimPermissions` (`max_values`: None, `max_size`: Some(41), added: 2516, mode: `MaxEncodedLen`)
 	/// The range of component `s` is `[0, 100]`.
 	fn withdraw_unbonded_kill(_s: u32, ) -> Weight {
 		// Proof Size summary in bytes:
-		//  Measured:  `2470`
+		//  Measured:  `2526`
 		//  Estimated: `27847`
-		// Minimum execution time: 230_871_000 picoseconds.
-		Weight::from_parts(239_533_976, 27847)
-			.saturating_add(T::DbWeight::get().reads(21_u64))
-			.saturating_add(T::DbWeight::get().writes(18_u64))
+		// Minimum execution time: 249_135_000 picoseconds.
+		Weight::from_parts(263_632_571, 27847)
+			.saturating_add(T::DbWeight::get().reads(23_u64))
+			.saturating_add(T::DbWeight::get().writes(19_u64))
 	}
-	/// Storage: NominationPools LastPoolId (r:1 w:1)
-	/// Proof: NominationPools LastPoolId (max_values: Some(1), max_size: Some(4), added: 499, mode: MaxEncodedLen)
-	/// Storage: Staking MinNominatorBond (r:1 w:0)
-	/// Proof: Staking MinNominatorBond (max_values: Some(1), max_size: Some(16), added: 511, mode: MaxEncodedLen)
-	/// Storage: NominationPools MinCreateBond (r:1 w:0)
-	/// Proof: NominationPools MinCreateBond (max_values: Some(1), max_size: Some(16), added: 511, mode: MaxEncodedLen)
-	/// Storage: NominationPools MinJoinBond (r:1 w:0)
-	/// Proof: NominationPools MinJoinBond (max_values: Some(1), max_size: Some(16), added: 511, mode: MaxEncodedLen)
-	/// Storage: NominationPools MaxPools (r:1 w:0)
-	/// Proof: NominationPools MaxPools (max_values: Some(1), max_size: Some(4), added: 499, mode: MaxEncodedLen)
-	/// Storage: NominationPools CounterForBondedPools (r:1 w:1)
-	/// Proof: NominationPools CounterForBondedPools (max_values: Some(1), max_size: Some(4), added: 499, mode: MaxEncodedLen)
-	/// Storage: NominationPools PoolMembers (r:1 w:1)
-	/// Proof: NominationPools PoolMembers (max_values: None, max_size: Some(237), added: 2712, mode: MaxEncodedLen)
-	/// Storage: NominationPools MaxPoolMembersPerPool (r:1 w:0)
-	/// Proof: NominationPools MaxPoolMembersPerPool (max_values: Some(1), max_size: Some(4), added: 499, mode: MaxEncodedLen)
-	/// Storage: NominationPools MaxPoolMembers (r:1 w:0)
-	/// Proof: NominationPools MaxPoolMembers (max_values: Some(1), max_size: Some(4), added: 499, mode: MaxEncodedLen)
-	/// Storage: NominationPools CounterForPoolMembers (r:1 w:1)
-	/// Proof: NominationPools CounterForPoolMembers (max_values: Some(1), max_size: Some(4), added: 499, mode: MaxEncodedLen)
-	/// Storage: System Account (r:2 w:2)
-	/// Proof: System Account (max_values: None, max_size: Some(128), added: 2603, mode: MaxEncodedLen)
-	/// Storage: Staking Bonded (r:1 w:1)
-	/// Proof: Staking Bonded (max_values: None, max_size: Some(72), added: 2547, mode: MaxEncodedLen)
-	/// Storage: Staking Ledger (r:1 w:1)
-	/// Proof: Staking Ledger (max_values: None, max_size: Some(1091), added: 3566, mode: MaxEncodedLen)
-	/// Storage: Staking CurrentEra (r:1 w:0)
-	/// Proof: Staking CurrentEra (max_values: Some(1), max_size: Some(4), added: 499, mode: MaxEncodedLen)
-	/// Storage: Balances Locks (r:1 w:1)
-	/// Proof: Balances Locks (max_values: None, max_size: Some(1299), added: 3774, mode: MaxEncodedLen)
-	/// Storage: Balances Freezes (r:1 w:0)
-	/// Proof: Balances Freezes (max_values: None, max_size: Some(49), added: 2524, mode: MaxEncodedLen)
-	/// Storage: NominationPools RewardPools (r:1 w:1)
-	/// Proof: NominationPools RewardPools (max_values: None, max_size: Some(92), added: 2567, mode: MaxEncodedLen)
-	/// Storage: NominationPools CounterForRewardPools (r:1 w:1)
-	/// Proof: NominationPools CounterForRewardPools (max_values: Some(1), max_size: Some(4), added: 499, mode: MaxEncodedLen)
-	/// Storage: NominationPools ReversePoolIdLookup (r:1 w:1)
-	/// Proof: NominationPools ReversePoolIdLookup (max_values: None, max_size: Some(44), added: 2519, mode: MaxEncodedLen)
-	/// Storage: NominationPools CounterForReversePoolIdLookup (r:1 w:1)
-	/// Proof: NominationPools CounterForReversePoolIdLookup (max_values: Some(1), max_size: Some(4), added: 499, mode: MaxEncodedLen)
-	/// Storage: NominationPools BondedPools (r:1 w:1)
-	/// Proof: NominationPools BondedPools (max_values: None, max_size: Some(220), added: 2695, mode: MaxEncodedLen)
-	/// Storage: Staking Payee (r:0 w:1)
-	/// Proof: Staking Payee (max_values: None, max_size: Some(73), added: 2548, mode: MaxEncodedLen)
+	/// Storage: `NominationPools::LastPoolId` (r:1 w:1)
+	/// Proof: `NominationPools::LastPoolId` (`max_values`: Some(1), `max_size`: Some(4), added: 499, mode: `MaxEncodedLen`)
+	/// Storage: `Staking::MinNominatorBond` (r:1 w:0)
+	/// Proof: `Staking::MinNominatorBond` (`max_values`: Some(1), `max_size`: Some(16), added: 511, mode: `MaxEncodedLen`)
+	/// Storage: `NominationPools::MinCreateBond` (r:1 w:0)
+	/// Proof: `NominationPools::MinCreateBond` (`max_values`: Some(1), `max_size`: Some(16), added: 511, mode: `MaxEncodedLen`)
+	/// Storage: `NominationPools::MinJoinBond` (r:1 w:0)
+	/// Proof: `NominationPools::MinJoinBond` (`max_values`: Some(1), `max_size`: Some(16), added: 511, mode: `MaxEncodedLen`)
+	/// Storage: `NominationPools::MaxPools` (r:1 w:0)
+	/// Proof: `NominationPools::MaxPools` (`max_values`: Some(1), `max_size`: Some(4), added: 499, mode: `MaxEncodedLen`)
+	/// Storage: `NominationPools::CounterForBondedPools` (r:1 w:1)
+	/// Proof: `NominationPools::CounterForBondedPools` (`max_values`: Some(1), `max_size`: Some(4), added: 499, mode: `MaxEncodedLen`)
+	/// Storage: `NominationPools::PoolMembers` (r:1 w:1)
+	/// Proof: `NominationPools::PoolMembers` (`max_values`: None, `max_size`: Some(237), added: 2712, mode: `MaxEncodedLen`)
+	/// Storage: `NominationPools::MaxPoolMembersPerPool` (r:1 w:0)
+	/// Proof: `NominationPools::MaxPoolMembersPerPool` (`max_values`: Some(1), `max_size`: Some(4), added: 499, mode: `MaxEncodedLen`)
+	/// Storage: `NominationPools::MaxPoolMembers` (r:1 w:0)
+	/// Proof: `NominationPools::MaxPoolMembers` (`max_values`: Some(1), `max_size`: Some(4), added: 499, mode: `MaxEncodedLen`)
+	/// Storage: `NominationPools::CounterForPoolMembers` (r:1 w:1)
+	/// Proof: `NominationPools::CounterForPoolMembers` (`max_values`: Some(1), `max_size`: Some(4), added: 499, mode: `MaxEncodedLen`)
+	/// Storage: `System::Account` (r:2 w:2)
+	/// Proof: `System::Account` (`max_values`: None, `max_size`: Some(128), added: 2603, mode: `MaxEncodedLen`)
+	/// Storage: `Staking::Bonded` (r:1 w:1)
+	/// Proof: `Staking::Bonded` (`max_values`: None, `max_size`: Some(72), added: 2547, mode: `MaxEncodedLen`)
+	/// Storage: `Staking::Ledger` (r:1 w:1)
+	/// Proof: `Staking::Ledger` (`max_values`: None, `max_size`: Some(1091), added: 3566, mode: `MaxEncodedLen`)
+	/// Storage: `Staking::CurrentEra` (r:1 w:0)
+	/// Proof: `Staking::CurrentEra` (`max_values`: Some(1), `max_size`: Some(4), added: 499, mode: `MaxEncodedLen`)
+	/// Storage: `Balances::Locks` (r:2 w:1)
+	/// Proof: `Balances::Locks` (`max_values`: None, `max_size`: Some(1299), added: 3774, mode: `MaxEncodedLen`)
+	/// Storage: `Balances::Freezes` (r:2 w:1)
+	/// Proof: `Balances::Freezes` (`max_values`: None, `max_size`: Some(67), added: 2542, mode: `MaxEncodedLen`)
+	/// Storage: `NominationPools::RewardPools` (r:1 w:1)
+	/// Proof: `NominationPools::RewardPools` (`max_values`: None, `max_size`: Some(92), added: 2567, mode: `MaxEncodedLen`)
+	/// Storage: `NominationPools::CounterForRewardPools` (r:1 w:1)
+	/// Proof: `NominationPools::CounterForRewardPools` (`max_values`: Some(1), `max_size`: Some(4), added: 499, mode: `MaxEncodedLen`)
+	/// Storage: `NominationPools::ReversePoolIdLookup` (r:1 w:1)
+	/// Proof: `NominationPools::ReversePoolIdLookup` (`max_values`: None, `max_size`: Some(44), added: 2519, mode: `MaxEncodedLen`)
+	/// Storage: `NominationPools::CounterForReversePoolIdLookup` (r:1 w:1)
+	/// Proof: `NominationPools::CounterForReversePoolIdLookup` (`max_values`: Some(1), `max_size`: Some(4), added: 499, mode: `MaxEncodedLen`)
+	/// Storage: `NominationPools::BondedPools` (r:1 w:1)
+	/// Proof: `NominationPools::BondedPools` (`max_values`: None, `max_size`: Some(220), added: 2695, mode: `MaxEncodedLen`)
+	/// Storage: `Staking::Payee` (r:0 w:1)
+	/// Proof: `Staking::Payee` (`max_values`: None, `max_size`: Some(73), added: 2548, mode: `MaxEncodedLen`)
 	fn create() -> Weight {
 		// Proof Size summary in bytes:
 		//  Measured:  `1289`
-		//  Estimated: `6196`
-		// Minimum execution time: 194_272_000 picoseconds.
-		Weight::from_parts(197_933_000, 6196)
-			.saturating_add(T::DbWeight::get().reads(22_u64))
-			.saturating_add(T::DbWeight::get().writes(15_u64))
+		//  Estimated: `8538`
+		// Minimum execution time: 214_207_000 picoseconds.
+		Weight::from_parts(221_588_000, 8538)
+			.saturating_add(T::DbWeight::get().reads(24_u64))
+			.saturating_add(T::DbWeight::get().writes(16_u64))
 	}
-	/// Storage: NominationPools BondedPools (r:1 w:0)
-	/// Proof: NominationPools BondedPools (max_values: None, max_size: Some(220), added: 2695, mode: MaxEncodedLen)
-	/// Storage: Staking Bonded (r:1 w:0)
-	/// Proof: Staking Bonded (max_values: None, max_size: Some(72), added: 2547, mode: MaxEncodedLen)
-	/// Storage: Staking Ledger (r:1 w:0)
-	/// Proof: Staking Ledger (max_values: None, max_size: Some(1091), added: 3566, mode: MaxEncodedLen)
-	/// Storage: Staking MinNominatorBond (r:1 w:0)
-	/// Proof: Staking MinNominatorBond (max_values: Some(1), max_size: Some(16), added: 511, mode: MaxEncodedLen)
-	/// Storage: Staking Nominators (r:1 w:1)
-	/// Proof: Staking Nominators (max_values: None, max_size: Some(558), added: 3033, mode: MaxEncodedLen)
-	/// Storage: Staking MaxNominatorsCount (r:1 w:0)
-	/// Proof: Staking MaxNominatorsCount (max_values: Some(1), max_size: Some(4), added: 499, mode: MaxEncodedLen)
-	/// Storage: Staking Validators (r:17 w:0)
-	/// Proof: Staking Validators (max_values: None, max_size: Some(45), added: 2520, mode: MaxEncodedLen)
-	/// Storage: Staking CurrentEra (r:1 w:0)
-	/// Proof: Staking CurrentEra (max_values: Some(1), max_size: Some(4), added: 499, mode: MaxEncodedLen)
-	/// Storage: VoterList ListNodes (r:1 w:1)
-	/// Proof: VoterList ListNodes (max_values: None, max_size: Some(154), added: 2629, mode: MaxEncodedLen)
-	/// Storage: VoterList ListBags (r:1 w:1)
-	/// Proof: VoterList ListBags (max_values: None, max_size: Some(82), added: 2557, mode: MaxEncodedLen)
-	/// Storage: VoterList CounterForListNodes (r:1 w:1)
-	/// Proof: VoterList CounterForListNodes (max_values: Some(1), max_size: Some(4), added: 499, mode: MaxEncodedLen)
-	/// Storage: Staking CounterForNominators (r:1 w:1)
-	/// Proof: Staking CounterForNominators (max_values: Some(1), max_size: Some(4), added: 499, mode: MaxEncodedLen)
+	/// Storage: `NominationPools::BondedPools` (r:1 w:0)
+	/// Proof: `NominationPools::BondedPools` (`max_values`: None, `max_size`: Some(220), added: 2695, mode: `MaxEncodedLen`)
+	/// Storage: `Staking::Bonded` (r:1 w:0)
+	/// Proof: `Staking::Bonded` (`max_values`: None, `max_size`: Some(72), added: 2547, mode: `MaxEncodedLen`)
+	/// Storage: `Staking::Ledger` (r:1 w:0)
+	/// Proof: `Staking::Ledger` (`max_values`: None, `max_size`: Some(1091), added: 3566, mode: `MaxEncodedLen`)
+	/// Storage: `Staking::MinNominatorBond` (r:1 w:0)
+	/// Proof: `Staking::MinNominatorBond` (`max_values`: Some(1), `max_size`: Some(16), added: 511, mode: `MaxEncodedLen`)
+	/// Storage: `Staking::Nominators` (r:1 w:1)
+	/// Proof: `Staking::Nominators` (`max_values`: None, `max_size`: Some(558), added: 3033, mode: `MaxEncodedLen`)
+	/// Storage: `Staking::MaxNominatorsCount` (r:1 w:0)
+	/// Proof: `Staking::MaxNominatorsCount` (`max_values`: Some(1), `max_size`: Some(4), added: 499, mode: `MaxEncodedLen`)
+	/// Storage: `Staking::Validators` (r:17 w:0)
+	/// Proof: `Staking::Validators` (`max_values`: None, `max_size`: Some(45), added: 2520, mode: `MaxEncodedLen`)
+	/// Storage: `Staking::CurrentEra` (r:1 w:0)
+	/// Proof: `Staking::CurrentEra` (`max_values`: Some(1), `max_size`: Some(4), added: 499, mode: `MaxEncodedLen`)
+	/// Storage: `VoterList::ListNodes` (r:1 w:1)
+	/// Proof: `VoterList::ListNodes` (`max_values`: None, `max_size`: Some(154), added: 2629, mode: `MaxEncodedLen`)
+	/// Storage: `VoterList::ListBags` (r:1 w:1)
+	/// Proof: `VoterList::ListBags` (`max_values`: None, `max_size`: Some(82), added: 2557, mode: `MaxEncodedLen`)
+	/// Storage: `VoterList::CounterForListNodes` (r:1 w:1)
+	/// Proof: `VoterList::CounterForListNodes` (`max_values`: Some(1), `max_size`: Some(4), added: 499, mode: `MaxEncodedLen`)
+	/// Storage: `Staking::CounterForNominators` (r:1 w:1)
+	/// Proof: `Staking::CounterForNominators` (`max_values`: Some(1), `max_size`: Some(4), added: 499, mode: `MaxEncodedLen`)
 	/// The range of component `n` is `[1, 16]`.
 	fn nominate(n: u32, ) -> Weight {
 		// Proof Size summary in bytes:
 		//  Measured:  `1849`
 		//  Estimated: `4556 + n * (2520 ±0)`
-		// Minimum execution time: 70_256_000 picoseconds.
-		Weight::from_parts(71_045_351, 4556)
-			// Standard Error: 9_898
-			.saturating_add(Weight::from_parts(1_592_597, 0).saturating_mul(n.into()))
+		// Minimum execution time: 70_626_000 picoseconds.
+		Weight::from_parts(73_830_182, 4556)
+			// Standard Error: 24_496
+			.saturating_add(Weight::from_parts(1_561_416, 0).saturating_mul(n.into()))
 			.saturating_add(T::DbWeight::get().reads(12_u64))
 			.saturating_add(T::DbWeight::get().reads((1_u64).saturating_mul(n.into())))
 			.saturating_add(T::DbWeight::get().writes(5_u64))
 			.saturating_add(Weight::from_parts(0, 2520).saturating_mul(n.into()))
 	}
-	/// Storage: NominationPools BondedPools (r:1 w:1)
-	/// Proof: NominationPools BondedPools (max_values: None, max_size: Some(220), added: 2695, mode: MaxEncodedLen)
-	/// Storage: Staking Bonded (r:1 w:0)
-	/// Proof: Staking Bonded (max_values: None, max_size: Some(72), added: 2547, mode: MaxEncodedLen)
-	/// Storage: Staking Ledger (r:1 w:0)
-	/// Proof: Staking Ledger (max_values: None, max_size: Some(1091), added: 3566, mode: MaxEncodedLen)
+	/// Storage: `NominationPools::BondedPools` (r:1 w:1)
+	/// Proof: `NominationPools::BondedPools` (`max_values`: None, `max_size`: Some(220), added: 2695, mode: `MaxEncodedLen`)
+	/// Storage: `Staking::Bonded` (r:1 w:0)
+	/// Proof: `Staking::Bonded` (`max_values`: None, `max_size`: Some(72), added: 2547, mode: `MaxEncodedLen`)
+	/// Storage: `Staking::Ledger` (r:1 w:0)
+	/// Proof: `Staking::Ledger` (`max_values`: None, `max_size`: Some(1091), added: 3566, mode: `MaxEncodedLen`)
 	fn set_state() -> Weight {
 		// Proof Size summary in bytes:
 		//  Measured:  `1438`
 		//  Estimated: `4556`
-		// Minimum execution time: 36_233_000 picoseconds.
-		Weight::from_parts(37_114_000, 4556)
+		// Minimum execution time: 36_542_000 picoseconds.
+		Weight::from_parts(37_644_000, 4556)
 			.saturating_add(T::DbWeight::get().reads(3_u64))
 			.saturating_add(T::DbWeight::get().writes(1_u64))
 	}
-	/// Storage: NominationPools BondedPools (r:1 w:0)
-	/// Proof: NominationPools BondedPools (max_values: None, max_size: Some(220), added: 2695, mode: MaxEncodedLen)
-	/// Storage: NominationPools Metadata (r:1 w:1)
-	/// Proof: NominationPools Metadata (max_values: None, max_size: Some(270), added: 2745, mode: MaxEncodedLen)
-	/// Storage: NominationPools CounterForMetadata (r:1 w:1)
-	/// Proof: NominationPools CounterForMetadata (max_values: Some(1), max_size: Some(4), added: 499, mode: MaxEncodedLen)
+	/// Storage: `NominationPools::BondedPools` (r:1 w:0)
+	/// Proof: `NominationPools::BondedPools` (`max_values`: None, `max_size`: Some(220), added: 2695, mode: `MaxEncodedLen`)
+	/// Storage: `NominationPools::Metadata` (r:1 w:1)
+	/// Proof: `NominationPools::Metadata` (`max_values`: None, `max_size`: Some(270), added: 2745, mode: `MaxEncodedLen`)
+	/// Storage: `NominationPools::CounterForMetadata` (r:1 w:1)
+	/// Proof: `NominationPools::CounterForMetadata` (`max_values`: Some(1), `max_size`: Some(4), added: 499, mode: `MaxEncodedLen`)
 	/// The range of component `n` is `[1, 256]`.
 	fn set_metadata(n: u32, ) -> Weight {
 		// Proof Size summary in bytes:
 		//  Measured:  `531`
 		//  Estimated: `3735`
-		// Minimum execution time: 14_494_000 picoseconds.
-		Weight::from_parts(15_445_658, 3735)
-			// Standard Error: 211
-			.saturating_add(Weight::from_parts(1_523, 0).saturating_mul(n.into()))
+		// Minimum execution time: 15_130_000 picoseconds.
+		Weight::from_parts(16_319_671, 3735)
+			// Standard Error: 351
+			.saturating_add(Weight::from_parts(2_024, 0).saturating_mul(n.into()))
 			.saturating_add(T::DbWeight::get().reads(3_u64))
 			.saturating_add(T::DbWeight::get().writes(2_u64))
 	}
-	/// Storage: NominationPools MinJoinBond (r:0 w:1)
-	/// Proof: NominationPools MinJoinBond (max_values: Some(1), max_size: Some(16), added: 511, mode: MaxEncodedLen)
-	/// Storage: NominationPools MaxPoolMembers (r:0 w:1)
-	/// Proof: NominationPools MaxPoolMembers (max_values: Some(1), max_size: Some(4), added: 499, mode: MaxEncodedLen)
-	/// Storage: NominationPools MaxPoolMembersPerPool (r:0 w:1)
-	/// Proof: NominationPools MaxPoolMembersPerPool (max_values: Some(1), max_size: Some(4), added: 499, mode: MaxEncodedLen)
-	/// Storage: NominationPools MinCreateBond (r:0 w:1)
-	/// Proof: NominationPools MinCreateBond (max_values: Some(1), max_size: Some(16), added: 511, mode: MaxEncodedLen)
-	/// Storage: NominationPools GlobalMaxCommission (r:0 w:1)
-	/// Proof: NominationPools GlobalMaxCommission (max_values: Some(1), max_size: Some(4), added: 499, mode: MaxEncodedLen)
-	/// Storage: NominationPools MaxPools (r:0 w:1)
-	/// Proof: NominationPools MaxPools (max_values: Some(1), max_size: Some(4), added: 499, mode: MaxEncodedLen)
+	/// Storage: `NominationPools::MinJoinBond` (r:0 w:1)
+	/// Proof: `NominationPools::MinJoinBond` (`max_values`: Some(1), `max_size`: Some(16), added: 511, mode: `MaxEncodedLen`)
+	/// Storage: `NominationPools::MaxPoolMembers` (r:0 w:1)
+	/// Proof: `NominationPools::MaxPoolMembers` (`max_values`: Some(1), `max_size`: Some(4), added: 499, mode: `MaxEncodedLen`)
+	/// Storage: `NominationPools::MaxPoolMembersPerPool` (r:0 w:1)
+	/// Proof: `NominationPools::MaxPoolMembersPerPool` (`max_values`: Some(1), `max_size`: Some(4), added: 499, mode: `MaxEncodedLen`)
+	/// Storage: `NominationPools::MinCreateBond` (r:0 w:1)
+	/// Proof: `NominationPools::MinCreateBond` (`max_values`: Some(1), `max_size`: Some(16), added: 511, mode: `MaxEncodedLen`)
+	/// Storage: `NominationPools::GlobalMaxCommission` (r:0 w:1)
+	/// Proof: `NominationPools::GlobalMaxCommission` (`max_values`: Some(1), `max_size`: Some(4), added: 499, mode: `MaxEncodedLen`)
+	/// Storage: `NominationPools::MaxPools` (r:0 w:1)
+	/// Proof: `NominationPools::MaxPools` (`max_values`: Some(1), `max_size`: Some(4), added: 499, mode: `MaxEncodedLen`)
 	fn set_configs() -> Weight {
 		// Proof Size summary in bytes:
 		//  Measured:  `0`
 		//  Estimated: `0`
-		// Minimum execution time: 6_776_000 picoseconds.
-		Weight::from_parts(7_033_000, 0)
+		// Minimum execution time: 6_819_000 picoseconds.
+		Weight::from_parts(7_253_000, 0)
 			.saturating_add(T::DbWeight::get().writes(6_u64))
 	}
-	/// Storage: NominationPools BondedPools (r:1 w:1)
-	/// Proof: NominationPools BondedPools (max_values: None, max_size: Some(220), added: 2695, mode: MaxEncodedLen)
+	/// Storage: `NominationPools::BondedPools` (r:1 w:1)
+	/// Proof: `NominationPools::BondedPools` (`max_values`: None, `max_size`: Some(220), added: 2695, mode: `MaxEncodedLen`)
 	fn update_roles() -> Weight {
 		// Proof Size summary in bytes:
 		//  Measured:  `531`
 		//  Estimated: `3685`
-		// Minimum execution time: 19_586_000 picoseconds.
-		Weight::from_parts(20_287_000, 3685)
+		// Minimum execution time: 19_596_000 picoseconds.
+		Weight::from_parts(20_828_000, 3685)
 			.saturating_add(T::DbWeight::get().reads(1_u64))
 			.saturating_add(T::DbWeight::get().writes(1_u64))
 	}
-	/// Storage: NominationPools BondedPools (r:1 w:0)
-	/// Proof: NominationPools BondedPools (max_values: None, max_size: Some(220), added: 2695, mode: MaxEncodedLen)
-	/// Storage: Staking Bonded (r:1 w:0)
-	/// Proof: Staking Bonded (max_values: None, max_size: Some(72), added: 2547, mode: MaxEncodedLen)
-	/// Storage: Staking Ledger (r:1 w:0)
-	/// Proof: Staking Ledger (max_values: None, max_size: Some(1091), added: 3566, mode: MaxEncodedLen)
-	/// Storage: Staking Validators (r:1 w:0)
-	/// Proof: Staking Validators (max_values: None, max_size: Some(45), added: 2520, mode: MaxEncodedLen)
-	/// Storage: Staking Nominators (r:1 w:1)
-	/// Proof: Staking Nominators (max_values: None, max_size: Some(558), added: 3033, mode: MaxEncodedLen)
-	/// Storage: Staking CounterForNominators (r:1 w:1)
-	/// Proof: Staking CounterForNominators (max_values: Some(1), max_size: Some(4), added: 499, mode: MaxEncodedLen)
-	/// Storage: VoterList ListNodes (r:1 w:1)
-	/// Proof: VoterList ListNodes (max_values: None, max_size: Some(154), added: 2629, mode: MaxEncodedLen)
-	/// Storage: VoterList ListBags (r:1 w:1)
-	/// Proof: VoterList ListBags (max_values: None, max_size: Some(82), added: 2557, mode: MaxEncodedLen)
-	/// Storage: VoterList CounterForListNodes (r:1 w:1)
-	/// Proof: VoterList CounterForListNodes (max_values: Some(1), max_size: Some(4), added: 499, mode: MaxEncodedLen)
+	/// Storage: `NominationPools::BondedPools` (r:1 w:0)
+	/// Proof: `NominationPools::BondedPools` (`max_values`: None, `max_size`: Some(220), added: 2695, mode: `MaxEncodedLen`)
+	/// Storage: `Staking::Bonded` (r:1 w:0)
+	/// Proof: `Staking::Bonded` (`max_values`: None, `max_size`: Some(72), added: 2547, mode: `MaxEncodedLen`)
+	/// Storage: `Staking::Ledger` (r:1 w:0)
+	/// Proof: `Staking::Ledger` (`max_values`: None, `max_size`: Some(1091), added: 3566, mode: `MaxEncodedLen`)
+	/// Storage: `Staking::Validators` (r:1 w:0)
+	/// Proof: `Staking::Validators` (`max_values`: None, `max_size`: Some(45), added: 2520, mode: `MaxEncodedLen`)
+	/// Storage: `Staking::Nominators` (r:1 w:1)
+	/// Proof: `Staking::Nominators` (`max_values`: None, `max_size`: Some(558), added: 3033, mode: `MaxEncodedLen`)
+	/// Storage: `Staking::CounterForNominators` (r:1 w:1)
+	/// Proof: `Staking::CounterForNominators` (`max_values`: Some(1), `max_size`: Some(4), added: 499, mode: `MaxEncodedLen`)
+	/// Storage: `VoterList::ListNodes` (r:1 w:1)
+	/// Proof: `VoterList::ListNodes` (`max_values`: None, `max_size`: Some(154), added: 2629, mode: `MaxEncodedLen`)
+	/// Storage: `VoterList::ListBags` (r:1 w:1)
+	/// Proof: `VoterList::ListBags` (`max_values`: None, `max_size`: Some(82), added: 2557, mode: `MaxEncodedLen`)
+	/// Storage: `VoterList::CounterForListNodes` (r:1 w:1)
+	/// Proof: `VoterList::CounterForListNodes` (`max_values`: Some(1), `max_size`: Some(4), added: 499, mode: `MaxEncodedLen`)
 	fn chill() -> Weight {
 		// Proof Size summary in bytes:
 		//  Measured:  `2012`
 		//  Estimated: `4556`
-		// Minimum execution time: 68_086_000 picoseconds.
-		Weight::from_parts(70_784_000, 4556)
+		// Minimum execution time: 68_551_000 picoseconds.
+		Weight::from_parts(71_768_000, 4556)
 			.saturating_add(T::DbWeight::get().reads(9_u64))
 			.saturating_add(T::DbWeight::get().writes(5_u64))
 	}
-	/// Storage: NominationPools BondedPools (r:1 w:1)
-	/// Proof: NominationPools BondedPools (max_values: None, max_size: Some(220), added: 2695, mode: MaxEncodedLen)
-	/// Storage: NominationPools RewardPools (r:1 w:1)
-	/// Proof: NominationPools RewardPools (max_values: None, max_size: Some(92), added: 2567, mode: MaxEncodedLen)
-	/// Storage: NominationPools GlobalMaxCommission (r:1 w:0)
-	/// Proof: NominationPools GlobalMaxCommission (max_values: Some(1), max_size: Some(4), added: 499, mode: MaxEncodedLen)
-	/// Storage: System Account (r:1 w:0)
-	/// Proof: System Account (max_values: None, max_size: Some(128), added: 2603, mode: MaxEncodedLen)
+	/// Storage: `NominationPools::BondedPools` (r:1 w:1)
+	/// Proof: `NominationPools::BondedPools` (`max_values`: None, `max_size`: Some(220), added: 2695, mode: `MaxEncodedLen`)
+	/// Storage: `NominationPools::RewardPools` (r:1 w:1)
+	/// Proof: `NominationPools::RewardPools` (`max_values`: None, `max_size`: Some(92), added: 2567, mode: `MaxEncodedLen`)
+	/// Storage: `NominationPools::GlobalMaxCommission` (r:1 w:0)
+	/// Proof: `NominationPools::GlobalMaxCommission` (`max_values`: Some(1), `max_size`: Some(4), added: 499, mode: `MaxEncodedLen`)
+	/// Storage: `System::Account` (r:1 w:0)
+	/// Proof: `System::Account` (`max_values`: None, `max_size`: Some(128), added: 2603, mode: `MaxEncodedLen`)
 	fn set_commission() -> Weight {
 		// Proof Size summary in bytes:
 		//  Measured:  `770`
 		//  Estimated: `3685`
-		// Minimum execution time: 33_353_000 picoseconds.
-		Weight::from_parts(34_519_000, 3685)
+		// Minimum execution time: 36_128_000 picoseconds.
+		Weight::from_parts(38_547_000, 3685)
 			.saturating_add(T::DbWeight::get().reads(4_u64))
 			.saturating_add(T::DbWeight::get().writes(2_u64))
 	}
-	/// Storage: NominationPools BondedPools (r:1 w:1)
-	/// Proof: NominationPools BondedPools (max_values: None, max_size: Some(220), added: 2695, mode: MaxEncodedLen)
+	/// Storage: `NominationPools::BondedPools` (r:1 w:1)
+	/// Proof: `NominationPools::BondedPools` (`max_values`: None, `max_size`: Some(220), added: 2695, mode: `MaxEncodedLen`)
+	/// Storage: `NominationPools::GlobalMaxCommission` (r:1 w:0)
+	/// Proof: `NominationPools::GlobalMaxCommission` (`max_values`: Some(1), `max_size`: Some(4), added: 499, mode: `MaxEncodedLen`)
 	fn set_commission_max() -> Weight {
 		// Proof Size summary in bytes:
 		//  Measured:  `571`
 		//  Estimated: `3685`
-		// Minimum execution time: 19_020_000 picoseconds.
-		Weight::from_parts(19_630_000, 3685)
-			.saturating_add(T::DbWeight::get().reads(1_u64))
+		// Minimum execution time: 20_067_000 picoseconds.
+		Weight::from_parts(21_044_000, 3685)
+			.saturating_add(T::DbWeight::get().reads(2_u64))
 			.saturating_add(T::DbWeight::get().writes(1_u64))
 	}
-	/// Storage: NominationPools BondedPools (r:1 w:1)
-	/// Proof: NominationPools BondedPools (max_values: None, max_size: Some(220), added: 2695, mode: MaxEncodedLen)
+	/// Storage: `NominationPools::BondedPools` (r:1 w:1)
+	/// Proof: `NominationPools::BondedPools` (`max_values`: None, `max_size`: Some(220), added: 2695, mode: `MaxEncodedLen`)
 	fn set_commission_change_rate() -> Weight {
 		// Proof Size summary in bytes:
 		//  Measured:  `531`
 		//  Estimated: `3685`
-		// Minimum execution time: 19_693_000 picoseconds.
-		Weight::from_parts(20_114_000, 3685)
+		// Minimum execution time: 19_186_000 picoseconds.
+		Weight::from_parts(20_189_000, 3685)
 			.saturating_add(T::DbWeight::get().reads(1_u64))
 			.saturating_add(T::DbWeight::get().writes(1_u64))
 	}
-	/// Storage: NominationPools PoolMembers (r:1 w:0)
-	/// Proof: NominationPools PoolMembers (max_values: None, max_size: Some(237), added: 2712, mode: MaxEncodedLen)
-	/// Storage: NominationPools ClaimPermissions (r:1 w:1)
-	/// Proof: NominationPools ClaimPermissions (max_values: None, max_size: Some(41), added: 2516, mode: MaxEncodedLen)
+	/// Storage: `NominationPools::PoolMembers` (r:1 w:0)
+	/// Proof: `NominationPools::PoolMembers` (`max_values`: None, `max_size`: Some(237), added: 2712, mode: `MaxEncodedLen`)
+	/// Storage: `NominationPools::ClaimPermissions` (r:1 w:1)
+	/// Proof: `NominationPools::ClaimPermissions` (`max_values`: None, `max_size`: Some(41), added: 2516, mode: `MaxEncodedLen`)
 	fn set_claim_permission() -> Weight {
 		// Proof Size summary in bytes:
 		//  Measured:  `542`
 		//  Estimated: `3702`
-		// Minimum execution time: 14_810_000 picoseconds.
-		Weight::from_parts(15_526_000, 3702)
+		// Minimum execution time: 15_275_000 picoseconds.
+		Weight::from_parts(15_932_000, 3702)
 			.saturating_add(T::DbWeight::get().reads(2_u64))
 			.saturating_add(T::DbWeight::get().writes(1_u64))
 	}
-	/// Storage: NominationPools BondedPools (r:1 w:0)
-	/// Proof: NominationPools BondedPools (max_values: None, max_size: Some(220), added: 2695, mode: MaxEncodedLen)
-	/// Storage: NominationPools RewardPools (r:1 w:1)
-	/// Proof: NominationPools RewardPools (max_values: None, max_size: Some(92), added: 2567, mode: MaxEncodedLen)
-	/// Storage: NominationPools GlobalMaxCommission (r:1 w:0)
-	/// Proof: NominationPools GlobalMaxCommission (max_values: Some(1), max_size: Some(4), added: 499, mode: MaxEncodedLen)
-	/// Storage: System Account (r:1 w:1)
-	/// Proof: System Account (max_values: None, max_size: Some(128), added: 2603, mode: MaxEncodedLen)
+	/// Storage: `NominationPools::BondedPools` (r:1 w:0)
+	/// Proof: `NominationPools::BondedPools` (`max_values`: None, `max_size`: Some(220), added: 2695, mode: `MaxEncodedLen`)
+	/// Storage: `NominationPools::RewardPools` (r:1 w:1)
+	/// Proof: `NominationPools::RewardPools` (`max_values`: None, `max_size`: Some(92), added: 2567, mode: `MaxEncodedLen`)
+	/// Storage: `NominationPools::GlobalMaxCommission` (r:1 w:0)
+	/// Proof: `NominationPools::GlobalMaxCommission` (`max_values`: Some(1), `max_size`: Some(4), added: 499, mode: `MaxEncodedLen`)
+	/// Storage: `System::Account` (r:1 w:1)
+	/// Proof: `System::Account` (`max_values`: None, `max_size`: Some(128), added: 2603, mode: `MaxEncodedLen`)
 	fn claim_commission() -> Weight {
 		// Proof Size summary in bytes:
 		//  Measured:  `968`
 		//  Estimated: `3685`
-		// Minimum execution time: 66_400_000 picoseconds.
-		Weight::from_parts(67_707_000, 3685)
+		// Minimum execution time: 67_931_000 picoseconds.
+		Weight::from_parts(72_202_000, 3685)
+			.saturating_add(T::DbWeight::get().reads(4_u64))
+			.saturating_add(T::DbWeight::get().writes(2_u64))
+	}
+	/// Storage: `NominationPools::BondedPools` (r:1 w:0)
+	/// Proof: `NominationPools::BondedPools` (`max_values`: None, `max_size`: Some(220), added: 2695, mode: `MaxEncodedLen`)
+	/// Storage: `Balances::Freezes` (r:1 w:1)
+	/// Proof: `Balances::Freezes` (`max_values`: None, `max_size`: Some(67), added: 2542, mode: `MaxEncodedLen`)
+	/// Storage: `System::Account` (r:1 w:1)
+	/// Proof: `System::Account` (`max_values`: None, `max_size`: Some(128), added: 2603, mode: `MaxEncodedLen`)
+	/// Storage: `Balances::Locks` (r:1 w:0)
+	/// Proof: `Balances::Locks` (`max_values`: None, `max_size`: Some(1299), added: 3774, mode: `MaxEncodedLen`)
+	fn adjust_pool_deposit() -> Weight {
+		// Proof Size summary in bytes:
+		//  Measured:  `900`
+		//  Estimated: `4764`
+		// Minimum execution time: 72_783_000 picoseconds.
+		Weight::from_parts(75_841_000, 4764)
 			.saturating_add(T::DbWeight::get().reads(4_u64))
 			.saturating_add(T::DbWeight::get().writes(2_u64))
 	}
 }
 
-// For backwards compatibility and tests
+// For backwards compatibility and tests.
 impl WeightInfo for () {
-	/// Storage: NominationPools MinJoinBond (r:1 w:0)
-	/// Proof: NominationPools MinJoinBond (max_values: Some(1), max_size: Some(16), added: 511, mode: MaxEncodedLen)
-	/// Storage: NominationPools PoolMembers (r:1 w:1)
-	/// Proof: NominationPools PoolMembers (max_values: None, max_size: Some(237), added: 2712, mode: MaxEncodedLen)
-	/// Storage: NominationPools BondedPools (r:1 w:1)
-	/// Proof: NominationPools BondedPools (max_values: None, max_size: Some(220), added: 2695, mode: MaxEncodedLen)
-	/// Storage: Staking Bonded (r:1 w:0)
-	/// Proof: Staking Bonded (max_values: None, max_size: Some(72), added: 2547, mode: MaxEncodedLen)
-	/// Storage: Staking Ledger (r:1 w:1)
-	/// Proof: Staking Ledger (max_values: None, max_size: Some(1091), added: 3566, mode: MaxEncodedLen)
-	/// Storage: NominationPools RewardPools (r:1 w:1)
-	/// Proof: NominationPools RewardPools (max_values: None, max_size: Some(92), added: 2567, mode: MaxEncodedLen)
-	/// Storage: NominationPools GlobalMaxCommission (r:1 w:0)
-	/// Proof: NominationPools GlobalMaxCommission (max_values: Some(1), max_size: Some(4), added: 499, mode: MaxEncodedLen)
-	/// Storage: System Account (r:2 w:1)
-	/// Proof: System Account (max_values: None, max_size: Some(128), added: 2603, mode: MaxEncodedLen)
-	/// Storage: NominationPools MaxPoolMembersPerPool (r:1 w:0)
-	/// Proof: NominationPools MaxPoolMembersPerPool (max_values: Some(1), max_size: Some(4), added: 499, mode: MaxEncodedLen)
-	/// Storage: NominationPools MaxPoolMembers (r:1 w:0)
-	/// Proof: NominationPools MaxPoolMembers (max_values: Some(1), max_size: Some(4), added: 499, mode: MaxEncodedLen)
-	/// Storage: NominationPools CounterForPoolMembers (r:1 w:1)
-	/// Proof: NominationPools CounterForPoolMembers (max_values: Some(1), max_size: Some(4), added: 499, mode: MaxEncodedLen)
-	/// Storage: Balances Locks (r:1 w:1)
-	/// Proof: Balances Locks (max_values: None, max_size: Some(1299), added: 3774, mode: MaxEncodedLen)
-	/// Storage: Balances Freezes (r:1 w:0)
-	/// Proof: Balances Freezes (max_values: None, max_size: Some(49), added: 2524, mode: MaxEncodedLen)
-	/// Storage: VoterList ListNodes (r:3 w:3)
-	/// Proof: VoterList ListNodes (max_values: None, max_size: Some(154), added: 2629, mode: MaxEncodedLen)
-	/// Storage: VoterList ListBags (r:2 w:2)
-	/// Proof: VoterList ListBags (max_values: None, max_size: Some(82), added: 2557, mode: MaxEncodedLen)
+	/// Storage: `NominationPools::MinJoinBond` (r:1 w:0)
+	/// Proof: `NominationPools::MinJoinBond` (`max_values`: Some(1), `max_size`: Some(16), added: 511, mode: `MaxEncodedLen`)
+	/// Storage: `NominationPools::PoolMembers` (r:1 w:1)
+	/// Proof: `NominationPools::PoolMembers` (`max_values`: None, `max_size`: Some(237), added: 2712, mode: `MaxEncodedLen`)
+	/// Storage: `NominationPools::BondedPools` (r:1 w:1)
+	/// Proof: `NominationPools::BondedPools` (`max_values`: None, `max_size`: Some(220), added: 2695, mode: `MaxEncodedLen`)
+	/// Storage: `Staking::Bonded` (r:1 w:0)
+	/// Proof: `Staking::Bonded` (`max_values`: None, `max_size`: Some(72), added: 2547, mode: `MaxEncodedLen`)
+	/// Storage: `Staking::Ledger` (r:1 w:1)
+	/// Proof: `Staking::Ledger` (`max_values`: None, `max_size`: Some(1091), added: 3566, mode: `MaxEncodedLen`)
+	/// Storage: `NominationPools::RewardPools` (r:1 w:1)
+	/// Proof: `NominationPools::RewardPools` (`max_values`: None, `max_size`: Some(92), added: 2567, mode: `MaxEncodedLen`)
+	/// Storage: `NominationPools::GlobalMaxCommission` (r:1 w:0)
+	/// Proof: `NominationPools::GlobalMaxCommission` (`max_values`: Some(1), `max_size`: Some(4), added: 499, mode: `MaxEncodedLen`)
+	/// Storage: `System::Account` (r:2 w:1)
+	/// Proof: `System::Account` (`max_values`: None, `max_size`: Some(128), added: 2603, mode: `MaxEncodedLen`)
+	/// Storage: `NominationPools::MaxPoolMembersPerPool` (r:1 w:0)
+	/// Proof: `NominationPools::MaxPoolMembersPerPool` (`max_values`: Some(1), `max_size`: Some(4), added: 499, mode: `MaxEncodedLen`)
+	/// Storage: `NominationPools::MaxPoolMembers` (r:1 w:0)
+	/// Proof: `NominationPools::MaxPoolMembers` (`max_values`: Some(1), `max_size`: Some(4), added: 499, mode: `MaxEncodedLen`)
+	/// Storage: `NominationPools::CounterForPoolMembers` (r:1 w:1)
+	/// Proof: `NominationPools::CounterForPoolMembers` (`max_values`: Some(1), `max_size`: Some(4), added: 499, mode: `MaxEncodedLen`)
+	/// Storage: `Balances::Locks` (r:1 w:1)
+	/// Proof: `Balances::Locks` (`max_values`: None, `max_size`: Some(1299), added: 3774, mode: `MaxEncodedLen`)
+	/// Storage: `Balances::Freezes` (r:1 w:0)
+	/// Proof: `Balances::Freezes` (`max_values`: None, `max_size`: Some(67), added: 2542, mode: `MaxEncodedLen`)
+	/// Storage: `VoterList::ListNodes` (r:3 w:3)
+	/// Proof: `VoterList::ListNodes` (`max_values`: None, `max_size`: Some(154), added: 2629, mode: `MaxEncodedLen`)
+	/// Storage: `VoterList::ListBags` (r:2 w:2)
+	/// Proof: `VoterList::ListBags` (`max_values`: None, `max_size`: Some(82), added: 2557, mode: `MaxEncodedLen`)
 	fn join() -> Weight {
 		// Proof Size summary in bytes:
-		//  Measured:  `3300`
+		//  Measured:  `3388`
 		//  Estimated: `8877`
-		// Minimum execution time: 200_966_000 picoseconds.
-		Weight::from_parts(208_322_000, 8877)
+		// Minimum execution time: 203_377_000 picoseconds.
+		Weight::from_parts(206_359_000, 8877)
 			.saturating_add(RocksDbWeight::get().reads(19_u64))
 			.saturating_add(RocksDbWeight::get().writes(12_u64))
 	}
-	/// Storage: NominationPools PoolMembers (r:1 w:1)
-	/// Proof: NominationPools PoolMembers (max_values: None, max_size: Some(237), added: 2712, mode: MaxEncodedLen)
-	/// Storage: NominationPools BondedPools (r:1 w:1)
-	/// Proof: NominationPools BondedPools (max_values: None, max_size: Some(220), added: 2695, mode: MaxEncodedLen)
-	/// Storage: NominationPools RewardPools (r:1 w:1)
-	/// Proof: NominationPools RewardPools (max_values: None, max_size: Some(92), added: 2567, mode: MaxEncodedLen)
-	/// Storage: NominationPools GlobalMaxCommission (r:1 w:0)
-	/// Proof: NominationPools GlobalMaxCommission (max_values: Some(1), max_size: Some(4), added: 499, mode: MaxEncodedLen)
-	/// Storage: System Account (r:3 w:2)
-	/// Proof: System Account (max_values: None, max_size: Some(128), added: 2603, mode: MaxEncodedLen)
-	/// Storage: Staking Bonded (r:1 w:0)
-	/// Proof: Staking Bonded (max_values: None, max_size: Some(72), added: 2547, mode: MaxEncodedLen)
-	/// Storage: Staking Ledger (r:1 w:1)
-	/// Proof: Staking Ledger (max_values: None, max_size: Some(1091), added: 3566, mode: MaxEncodedLen)
-	/// Storage: Balances Locks (r:1 w:1)
-	/// Proof: Balances Locks (max_values: None, max_size: Some(1299), added: 3774, mode: MaxEncodedLen)
-	/// Storage: Balances Freezes (r:1 w:0)
-	/// Proof: Balances Freezes (max_values: None, max_size: Some(49), added: 2524, mode: MaxEncodedLen)
-	/// Storage: VoterList ListNodes (r:3 w:3)
-	/// Proof: VoterList ListNodes (max_values: None, max_size: Some(154), added: 2629, mode: MaxEncodedLen)
-	/// Storage: VoterList ListBags (r:2 w:2)
-	/// Proof: VoterList ListBags (max_values: None, max_size: Some(82), added: 2557, mode: MaxEncodedLen)
+	/// Storage: `NominationPools::PoolMembers` (r:1 w:1)
+	/// Proof: `NominationPools::PoolMembers` (`max_values`: None, `max_size`: Some(237), added: 2712, mode: `MaxEncodedLen`)
+	/// Storage: `NominationPools::BondedPools` (r:1 w:1)
+	/// Proof: `NominationPools::BondedPools` (`max_values`: None, `max_size`: Some(220), added: 2695, mode: `MaxEncodedLen`)
+	/// Storage: `NominationPools::RewardPools` (r:1 w:1)
+	/// Proof: `NominationPools::RewardPools` (`max_values`: None, `max_size`: Some(92), added: 2567, mode: `MaxEncodedLen`)
+	/// Storage: `NominationPools::GlobalMaxCommission` (r:1 w:0)
+	/// Proof: `NominationPools::GlobalMaxCommission` (`max_values`: Some(1), `max_size`: Some(4), added: 499, mode: `MaxEncodedLen`)
+	/// Storage: `System::Account` (r:3 w:2)
+	/// Proof: `System::Account` (`max_values`: None, `max_size`: Some(128), added: 2603, mode: `MaxEncodedLen`)
+	/// Storage: `Staking::Bonded` (r:1 w:0)
+	/// Proof: `Staking::Bonded` (`max_values`: None, `max_size`: Some(72), added: 2547, mode: `MaxEncodedLen`)
+	/// Storage: `Staking::Ledger` (r:1 w:1)
+	/// Proof: `Staking::Ledger` (`max_values`: None, `max_size`: Some(1091), added: 3566, mode: `MaxEncodedLen`)
+	/// Storage: `Balances::Locks` (r:1 w:1)
+	/// Proof: `Balances::Locks` (`max_values`: None, `max_size`: Some(1299), added: 3774, mode: `MaxEncodedLen`)
+	/// Storage: `Balances::Freezes` (r:1 w:0)
+	/// Proof: `Balances::Freezes` (`max_values`: None, `max_size`: Some(67), added: 2542, mode: `MaxEncodedLen`)
+	/// Storage: `VoterList::ListNodes` (r:3 w:3)
+	/// Proof: `VoterList::ListNodes` (`max_values`: None, `max_size`: Some(154), added: 2629, mode: `MaxEncodedLen`)
+	/// Storage: `VoterList::ListBags` (r:2 w:2)
+	/// Proof: `VoterList::ListBags` (`max_values`: None, `max_size`: Some(82), added: 2557, mode: `MaxEncodedLen`)
 	fn bond_extra_transfer() -> Weight {
 		// Proof Size summary in bytes:
-		//  Measured:  `3310`
+		//  Measured:  `3398`
 		//  Estimated: `8877`
-		// Minimum execution time: 197_865_000 picoseconds.
-		Weight::from_parts(203_085_000, 8877)
+		// Minimum execution time: 199_792_000 picoseconds.
+		Weight::from_parts(206_871_000, 8877)
 			.saturating_add(RocksDbWeight::get().reads(16_u64))
 			.saturating_add(RocksDbWeight::get().writes(12_u64))
 	}
-	/// Storage: NominationPools ClaimPermissions (r:1 w:0)
-	/// Proof: NominationPools ClaimPermissions (max_values: None, max_size: Some(41), added: 2516, mode: MaxEncodedLen)
-	/// Storage: NominationPools PoolMembers (r:1 w:1)
-	/// Proof: NominationPools PoolMembers (max_values: None, max_size: Some(237), added: 2712, mode: MaxEncodedLen)
-	/// Storage: NominationPools BondedPools (r:1 w:1)
-	/// Proof: NominationPools BondedPools (max_values: None, max_size: Some(220), added: 2695, mode: MaxEncodedLen)
-	/// Storage: NominationPools RewardPools (r:1 w:1)
-	/// Proof: NominationPools RewardPools (max_values: None, max_size: Some(92), added: 2567, mode: MaxEncodedLen)
-	/// Storage: NominationPools GlobalMaxCommission (r:1 w:0)
-	/// Proof: NominationPools GlobalMaxCommission (max_values: Some(1), max_size: Some(4), added: 499, mode: MaxEncodedLen)
-	/// Storage: System Account (r:3 w:3)
-	/// Proof: System Account (max_values: None, max_size: Some(128), added: 2603, mode: MaxEncodedLen)
-	/// Storage: Staking Bonded (r:1 w:0)
-	/// Proof: Staking Bonded (max_values: None, max_size: Some(72), added: 2547, mode: MaxEncodedLen)
-	/// Storage: Staking Ledger (r:1 w:1)
-	/// Proof: Staking Ledger (max_values: None, max_size: Some(1091), added: 3566, mode: MaxEncodedLen)
-	/// Storage: Balances Locks (r:1 w:1)
-	/// Proof: Balances Locks (max_values: None, max_size: Some(1299), added: 3774, mode: MaxEncodedLen)
-	/// Storage: Balances Freezes (r:1 w:0)
-	/// Proof: Balances Freezes (max_values: None, max_size: Some(49), added: 2524, mode: MaxEncodedLen)
-	/// Storage: VoterList ListNodes (r:3 w:3)
-	/// Proof: VoterList ListNodes (max_values: None, max_size: Some(154), added: 2629, mode: MaxEncodedLen)
-	/// Storage: VoterList ListBags (r:2 w:2)
-	/// Proof: VoterList ListBags (max_values: None, max_size: Some(82), added: 2557, mode: MaxEncodedLen)
+	/// Storage: `NominationPools::ClaimPermissions` (r:1 w:0)
+	/// Proof: `NominationPools::ClaimPermissions` (`max_values`: None, `max_size`: Some(41), added: 2516, mode: `MaxEncodedLen`)
+	/// Storage: `NominationPools::PoolMembers` (r:1 w:1)
+	/// Proof: `NominationPools::PoolMembers` (`max_values`: None, `max_size`: Some(237), added: 2712, mode: `MaxEncodedLen`)
+	/// Storage: `NominationPools::BondedPools` (r:1 w:1)
+	/// Proof: `NominationPools::BondedPools` (`max_values`: None, `max_size`: Some(220), added: 2695, mode: `MaxEncodedLen`)
+	/// Storage: `NominationPools::RewardPools` (r:1 w:1)
+	/// Proof: `NominationPools::RewardPools` (`max_values`: None, `max_size`: Some(92), added: 2567, mode: `MaxEncodedLen`)
+	/// Storage: `NominationPools::GlobalMaxCommission` (r:1 w:0)
+	/// Proof: `NominationPools::GlobalMaxCommission` (`max_values`: Some(1), `max_size`: Some(4), added: 499, mode: `MaxEncodedLen`)
+	/// Storage: `System::Account` (r:3 w:3)
+	/// Proof: `System::Account` (`max_values`: None, `max_size`: Some(128), added: 2603, mode: `MaxEncodedLen`)
+	/// Storage: `Staking::Bonded` (r:1 w:0)
+	/// Proof: `Staking::Bonded` (`max_values`: None, `max_size`: Some(72), added: 2547, mode: `MaxEncodedLen`)
+	/// Storage: `Staking::Ledger` (r:1 w:1)
+	/// Proof: `Staking::Ledger` (`max_values`: None, `max_size`: Some(1091), added: 3566, mode: `MaxEncodedLen`)
+	/// Storage: `Balances::Locks` (r:1 w:1)
+	/// Proof: `Balances::Locks` (`max_values`: None, `max_size`: Some(1299), added: 3774, mode: `MaxEncodedLen`)
+	/// Storage: `Balances::Freezes` (r:1 w:0)
+	/// Proof: `Balances::Freezes` (`max_values`: None, `max_size`: Some(67), added: 2542, mode: `MaxEncodedLen`)
+	/// Storage: `VoterList::ListNodes` (r:3 w:3)
+	/// Proof: `VoterList::ListNodes` (`max_values`: None, `max_size`: Some(154), added: 2629, mode: `MaxEncodedLen`)
+	/// Storage: `VoterList::ListBags` (r:2 w:2)
+	/// Proof: `VoterList::ListBags` (`max_values`: None, `max_size`: Some(82), added: 2557, mode: `MaxEncodedLen`)
 	fn bond_extra_other() -> Weight {
 		// Proof Size summary in bytes:
-		//  Measured:  `3375`
+		//  Measured:  `3463`
 		//  Estimated: `8877`
-		// Minimum execution time: 235_496_000 picoseconds.
-		Weight::from_parts(242_104_000, 8877)
+		// Minimum execution time: 246_362_000 picoseconds.
+		Weight::from_parts(253_587_000, 8877)
 			.saturating_add(RocksDbWeight::get().reads(17_u64))
 			.saturating_add(RocksDbWeight::get().writes(13_u64))
 	}
-	/// Storage: NominationPools ClaimPermissions (r:1 w:0)
-	/// Proof: NominationPools ClaimPermissions (max_values: None, max_size: Some(41), added: 2516, mode: MaxEncodedLen)
-	/// Storage: NominationPools PoolMembers (r:1 w:1)
-	/// Proof: NominationPools PoolMembers (max_values: None, max_size: Some(237), added: 2712, mode: MaxEncodedLen)
-	/// Storage: NominationPools BondedPools (r:1 w:1)
-	/// Proof: NominationPools BondedPools (max_values: None, max_size: Some(220), added: 2695, mode: MaxEncodedLen)
-	/// Storage: NominationPools RewardPools (r:1 w:1)
-	/// Proof: NominationPools RewardPools (max_values: None, max_size: Some(92), added: 2567, mode: MaxEncodedLen)
-	/// Storage: NominationPools GlobalMaxCommission (r:1 w:0)
-	/// Proof: NominationPools GlobalMaxCommission (max_values: Some(1), max_size: Some(4), added: 499, mode: MaxEncodedLen)
-	/// Storage: System Account (r:1 w:1)
-	/// Proof: System Account (max_values: None, max_size: Some(128), added: 2603, mode: MaxEncodedLen)
+	/// Storage: `NominationPools::ClaimPermissions` (r:1 w:0)
+	/// Proof: `NominationPools::ClaimPermissions` (`max_values`: None, `max_size`: Some(41), added: 2516, mode: `MaxEncodedLen`)
+	/// Storage: `NominationPools::PoolMembers` (r:1 w:1)
+	/// Proof: `NominationPools::PoolMembers` (`max_values`: None, `max_size`: Some(237), added: 2712, mode: `MaxEncodedLen`)
+	/// Storage: `NominationPools::BondedPools` (r:1 w:1)
+	/// Proof: `NominationPools::BondedPools` (`max_values`: None, `max_size`: Some(220), added: 2695, mode: `MaxEncodedLen`)
+	/// Storage: `NominationPools::RewardPools` (r:1 w:1)
+	/// Proof: `NominationPools::RewardPools` (`max_values`: None, `max_size`: Some(92), added: 2567, mode: `MaxEncodedLen`)
+	/// Storage: `NominationPools::GlobalMaxCommission` (r:1 w:0)
+	/// Proof: `NominationPools::GlobalMaxCommission` (`max_values`: Some(1), `max_size`: Some(4), added: 499, mode: `MaxEncodedLen`)
+	/// Storage: `System::Account` (r:1 w:1)
+	/// Proof: `System::Account` (`max_values`: None, `max_size`: Some(128), added: 2603, mode: `MaxEncodedLen`)
 	fn claim_payout() -> Weight {
 		// Proof Size summary in bytes:
 		//  Measured:  `1171`
 		//  Estimated: `3702`
-		// Minimum execution time: 81_813_000 picoseconds.
-		Weight::from_parts(83_277_000, 3702)
+		// Minimum execution time: 81_115_000 picoseconds.
+		Weight::from_parts(83_604_000, 3702)
 			.saturating_add(RocksDbWeight::get().reads(6_u64))
 			.saturating_add(RocksDbWeight::get().writes(4_u64))
 	}
-	/// Storage: NominationPools PoolMembers (r:1 w:1)
-	/// Proof: NominationPools PoolMembers (max_values: None, max_size: Some(237), added: 2712, mode: MaxEncodedLen)
-	/// Storage: NominationPools BondedPools (r:1 w:1)
-	/// Proof: NominationPools BondedPools (max_values: None, max_size: Some(220), added: 2695, mode: MaxEncodedLen)
-	/// Storage: NominationPools RewardPools (r:1 w:1)
-	/// Proof: NominationPools RewardPools (max_values: None, max_size: Some(92), added: 2567, mode: MaxEncodedLen)
-	/// Storage: Staking Bonded (r:1 w:0)
-	/// Proof: Staking Bonded (max_values: None, max_size: Some(72), added: 2547, mode: MaxEncodedLen)
-	/// Storage: Staking Ledger (r:1 w:1)
-	/// Proof: Staking Ledger (max_values: None, max_size: Some(1091), added: 3566, mode: MaxEncodedLen)
-	/// Storage: NominationPools GlobalMaxCommission (r:1 w:0)
-	/// Proof: NominationPools GlobalMaxCommission (max_values: Some(1), max_size: Some(4), added: 499, mode: MaxEncodedLen)
-	/// Storage: System Account (r:2 w:1)
-	/// Proof: System Account (max_values: None, max_size: Some(128), added: 2603, mode: MaxEncodedLen)
-	/// Storage: Staking CurrentEra (r:1 w:0)
-	/// Proof: Staking CurrentEra (max_values: Some(1), max_size: Some(4), added: 499, mode: MaxEncodedLen)
-	/// Storage: Staking Nominators (r:1 w:0)
-	/// Proof: Staking Nominators (max_values: None, max_size: Some(558), added: 3033, mode: MaxEncodedLen)
-	/// Storage: Staking MinNominatorBond (r:1 w:0)
-	/// Proof: Staking MinNominatorBond (max_values: Some(1), max_size: Some(16), added: 511, mode: MaxEncodedLen)
-	/// Storage: Balances Locks (r:1 w:1)
-	/// Proof: Balances Locks (max_values: None, max_size: Some(1299), added: 3774, mode: MaxEncodedLen)
-	/// Storage: Balances Freezes (r:1 w:0)
-	/// Proof: Balances Freezes (max_values: None, max_size: Some(49), added: 2524, mode: MaxEncodedLen)
-	/// Storage: VoterList ListNodes (r:3 w:3)
-	/// Proof: VoterList ListNodes (max_values: None, max_size: Some(154), added: 2629, mode: MaxEncodedLen)
-	/// Storage: VoterList ListBags (r:2 w:2)
-	/// Proof: VoterList ListBags (max_values: None, max_size: Some(82), added: 2557, mode: MaxEncodedLen)
-	/// Storage: NominationPools SubPoolsStorage (r:1 w:1)
-	/// Proof: NominationPools SubPoolsStorage (max_values: None, max_size: Some(24382), added: 26857, mode: MaxEncodedLen)
-	/// Storage: NominationPools CounterForSubPoolsStorage (r:1 w:1)
-	/// Proof: NominationPools CounterForSubPoolsStorage (max_values: Some(1), max_size: Some(4), added: 499, mode: MaxEncodedLen)
+	/// Storage: `NominationPools::PoolMembers` (r:1 w:1)
+	/// Proof: `NominationPools::PoolMembers` (`max_values`: None, `max_size`: Some(237), added: 2712, mode: `MaxEncodedLen`)
+	/// Storage: `NominationPools::BondedPools` (r:1 w:1)
+	/// Proof: `NominationPools::BondedPools` (`max_values`: None, `max_size`: Some(220), added: 2695, mode: `MaxEncodedLen`)
+	/// Storage: `NominationPools::RewardPools` (r:1 w:1)
+	/// Proof: `NominationPools::RewardPools` (`max_values`: None, `max_size`: Some(92), added: 2567, mode: `MaxEncodedLen`)
+	/// Storage: `Staking::Bonded` (r:1 w:0)
+	/// Proof: `Staking::Bonded` (`max_values`: None, `max_size`: Some(72), added: 2547, mode: `MaxEncodedLen`)
+	/// Storage: `Staking::Ledger` (r:1 w:1)
+	/// Proof: `Staking::Ledger` (`max_values`: None, `max_size`: Some(1091), added: 3566, mode: `MaxEncodedLen`)
+	/// Storage: `NominationPools::GlobalMaxCommission` (r:1 w:0)
+	/// Proof: `NominationPools::GlobalMaxCommission` (`max_values`: Some(1), `max_size`: Some(4), added: 499, mode: `MaxEncodedLen`)
+	/// Storage: `System::Account` (r:2 w:1)
+	/// Proof: `System::Account` (`max_values`: None, `max_size`: Some(128), added: 2603, mode: `MaxEncodedLen`)
+	/// Storage: `Staking::CurrentEra` (r:1 w:0)
+	/// Proof: `Staking::CurrentEra` (`max_values`: Some(1), `max_size`: Some(4), added: 499, mode: `MaxEncodedLen`)
+	/// Storage: `Staking::Nominators` (r:1 w:0)
+	/// Proof: `Staking::Nominators` (`max_values`: None, `max_size`: Some(558), added: 3033, mode: `MaxEncodedLen`)
+	/// Storage: `Staking::MinNominatorBond` (r:1 w:0)
+	/// Proof: `Staking::MinNominatorBond` (`max_values`: Some(1), `max_size`: Some(16), added: 511, mode: `MaxEncodedLen`)
+	/// Storage: `Balances::Locks` (r:1 w:1)
+	/// Proof: `Balances::Locks` (`max_values`: None, `max_size`: Some(1299), added: 3774, mode: `MaxEncodedLen`)
+	/// Storage: `Balances::Freezes` (r:1 w:0)
+	/// Proof: `Balances::Freezes` (`max_values`: None, `max_size`: Some(67), added: 2542, mode: `MaxEncodedLen`)
+	/// Storage: `VoterList::ListNodes` (r:3 w:3)
+	/// Proof: `VoterList::ListNodes` (`max_values`: None, `max_size`: Some(154), added: 2629, mode: `MaxEncodedLen`)
+	/// Storage: `VoterList::ListBags` (r:2 w:2)
+	/// Proof: `VoterList::ListBags` (`max_values`: None, `max_size`: Some(82), added: 2557, mode: `MaxEncodedLen`)
+	/// Storage: `NominationPools::SubPoolsStorage` (r:1 w:1)
+	/// Proof: `NominationPools::SubPoolsStorage` (`max_values`: None, `max_size`: Some(24382), added: 26857, mode: `MaxEncodedLen`)
+	/// Storage: `NominationPools::CounterForSubPoolsStorage` (r:1 w:1)
+	/// Proof: `NominationPools::CounterForSubPoolsStorage` (`max_values`: Some(1), `max_size`: Some(4), added: 499, mode: `MaxEncodedLen`)
 	fn unbond() -> Weight {
 		// Proof Size summary in bytes:
-		//  Measured:  `3586`
+		//  Measured:  `3674`
 		//  Estimated: `27847`
-		// Minimum execution time: 183_935_000 picoseconds.
-		Weight::from_parts(186_920_000, 27847)
+		// Minimum execution time: 187_210_000 picoseconds.
+		Weight::from_parts(189_477_000, 27847)
 			.saturating_add(RocksDbWeight::get().reads(20_u64))
 			.saturating_add(RocksDbWeight::get().writes(13_u64))
 	}
-	/// Storage: NominationPools BondedPools (r:1 w:0)
-	/// Proof: NominationPools BondedPools (max_values: None, max_size: Some(220), added: 2695, mode: MaxEncodedLen)
-	/// Storage: Staking Bonded (r:1 w:0)
-	/// Proof: Staking Bonded (max_values: None, max_size: Some(72), added: 2547, mode: MaxEncodedLen)
-	/// Storage: Staking Ledger (r:1 w:1)
-	/// Proof: Staking Ledger (max_values: None, max_size: Some(1091), added: 3566, mode: MaxEncodedLen)
-	/// Storage: Staking CurrentEra (r:1 w:0)
-	/// Proof: Staking CurrentEra (max_values: Some(1), max_size: Some(4), added: 499, mode: MaxEncodedLen)
-	/// Storage: Balances Locks (r:1 w:1)
-	/// Proof: Balances Locks (max_values: None, max_size: Some(1299), added: 3774, mode: MaxEncodedLen)
-	/// Storage: Balances Freezes (r:1 w:0)
-	/// Proof: Balances Freezes (max_values: None, max_size: Some(49), added: 2524, mode: MaxEncodedLen)
+	/// Storage: `NominationPools::BondedPools` (r:1 w:0)
+	/// Proof: `NominationPools::BondedPools` (`max_values`: None, `max_size`: Some(220), added: 2695, mode: `MaxEncodedLen`)
+	/// Storage: `Staking::Bonded` (r:1 w:0)
+	/// Proof: `Staking::Bonded` (`max_values`: None, `max_size`: Some(72), added: 2547, mode: `MaxEncodedLen`)
+	/// Storage: `Staking::Ledger` (r:1 w:1)
+	/// Proof: `Staking::Ledger` (`max_values`: None, `max_size`: Some(1091), added: 3566, mode: `MaxEncodedLen`)
+	/// Storage: `Staking::CurrentEra` (r:1 w:0)
+	/// Proof: `Staking::CurrentEra` (`max_values`: Some(1), `max_size`: Some(4), added: 499, mode: `MaxEncodedLen`)
+	/// Storage: `Balances::Locks` (r:1 w:1)
+	/// Proof: `Balances::Locks` (`max_values`: None, `max_size`: Some(1299), added: 3774, mode: `MaxEncodedLen`)
+	/// Storage: `Balances::Freezes` (r:1 w:0)
+	/// Proof: `Balances::Freezes` (`max_values`: None, `max_size`: Some(67), added: 2542, mode: `MaxEncodedLen`)
 	/// The range of component `s` is `[0, 100]`.
 	fn pool_withdraw_unbonded(s: u32, ) -> Weight {
 		// Proof Size summary in bytes:
-		//  Measured:  `1687`
+		//  Measured:  `1743`
 		//  Estimated: `4764`
-		// Minimum execution time: 64_962_000 picoseconds.
-		Weight::from_parts(67_936_216, 4764)
-			// Standard Error: 1_780
-			.saturating_add(Weight::from_parts(36_110, 0).saturating_mul(s.into()))
+		// Minimum execution time: 66_384_000 picoseconds.
+		Weight::from_parts(69_498_267, 4764)
+			// Standard Error: 2_566
+			.saturating_add(Weight::from_parts(34_528, 0).saturating_mul(s.into()))
 			.saturating_add(RocksDbWeight::get().reads(6_u64))
 			.saturating_add(RocksDbWeight::get().writes(2_u64))
 	}
-	/// Storage: NominationPools PoolMembers (r:1 w:1)
-	/// Proof: NominationPools PoolMembers (max_values: None, max_size: Some(237), added: 2712, mode: MaxEncodedLen)
-	/// Storage: Staking CurrentEra (r:1 w:0)
-	/// Proof: Staking CurrentEra (max_values: Some(1), max_size: Some(4), added: 499, mode: MaxEncodedLen)
-	/// Storage: NominationPools BondedPools (r:1 w:1)
-	/// Proof: NominationPools BondedPools (max_values: None, max_size: Some(220), added: 2695, mode: MaxEncodedLen)
-	/// Storage: NominationPools SubPoolsStorage (r:1 w:1)
-	/// Proof: NominationPools SubPoolsStorage (max_values: None, max_size: Some(24382), added: 26857, mode: MaxEncodedLen)
-	/// Storage: Staking Bonded (r:1 w:0)
-	/// Proof: Staking Bonded (max_values: None, max_size: Some(72), added: 2547, mode: MaxEncodedLen)
-	/// Storage: Staking Ledger (r:1 w:1)
-	/// Proof: Staking Ledger (max_values: None, max_size: Some(1091), added: 3566, mode: MaxEncodedLen)
-	/// Storage: Balances Locks (r:1 w:1)
-	/// Proof: Balances Locks (max_values: None, max_size: Some(1299), added: 3774, mode: MaxEncodedLen)
-	/// Storage: Balances Freezes (r:1 w:0)
-	/// Proof: Balances Freezes (max_values: None, max_size: Some(49), added: 2524, mode: MaxEncodedLen)
-	/// Storage: System Account (r:1 w:1)
-	/// Proof: System Account (max_values: None, max_size: Some(128), added: 2603, mode: MaxEncodedLen)
-	/// Storage: NominationPools CounterForPoolMembers (r:1 w:1)
-	/// Proof: NominationPools CounterForPoolMembers (max_values: Some(1), max_size: Some(4), added: 499, mode: MaxEncodedLen)
-	/// Storage: NominationPools ClaimPermissions (r:0 w:1)
-	/// Proof: NominationPools ClaimPermissions (max_values: None, max_size: Some(41), added: 2516, mode: MaxEncodedLen)
+	/// Storage: `NominationPools::PoolMembers` (r:1 w:1)
+	/// Proof: `NominationPools::PoolMembers` (`max_values`: None, `max_size`: Some(237), added: 2712, mode: `MaxEncodedLen`)
+	/// Storage: `Staking::CurrentEra` (r:1 w:0)
+	/// Proof: `Staking::CurrentEra` (`max_values`: Some(1), `max_size`: Some(4), added: 499, mode: `MaxEncodedLen`)
+	/// Storage: `NominationPools::BondedPools` (r:1 w:1)
+	/// Proof: `NominationPools::BondedPools` (`max_values`: None, `max_size`: Some(220), added: 2695, mode: `MaxEncodedLen`)
+	/// Storage: `NominationPools::SubPoolsStorage` (r:1 w:1)
+	/// Proof: `NominationPools::SubPoolsStorage` (`max_values`: None, `max_size`: Some(24382), added: 26857, mode: `MaxEncodedLen`)
+	/// Storage: `Staking::Bonded` (r:1 w:0)
+	/// Proof: `Staking::Bonded` (`max_values`: None, `max_size`: Some(72), added: 2547, mode: `MaxEncodedLen`)
+	/// Storage: `Staking::Ledger` (r:1 w:1)
+	/// Proof: `Staking::Ledger` (`max_values`: None, `max_size`: Some(1091), added: 3566, mode: `MaxEncodedLen`)
+	/// Storage: `Balances::Locks` (r:1 w:1)
+	/// Proof: `Balances::Locks` (`max_values`: None, `max_size`: Some(1299), added: 3774, mode: `MaxEncodedLen`)
+	/// Storage: `Balances::Freezes` (r:1 w:0)
+	/// Proof: `Balances::Freezes` (`max_values`: None, `max_size`: Some(67), added: 2542, mode: `MaxEncodedLen`)
+	/// Storage: `System::Account` (r:1 w:1)
+	/// Proof: `System::Account` (`max_values`: None, `max_size`: Some(128), added: 2603, mode: `MaxEncodedLen`)
+	/// Storage: `NominationPools::CounterForPoolMembers` (r:1 w:1)
+	/// Proof: `NominationPools::CounterForPoolMembers` (`max_values`: Some(1), `max_size`: Some(4), added: 499, mode: `MaxEncodedLen`)
+	/// Storage: `NominationPools::ClaimPermissions` (r:0 w:1)
+	/// Proof: `NominationPools::ClaimPermissions` (`max_values`: None, `max_size`: Some(41), added: 2516, mode: `MaxEncodedLen`)
 	/// The range of component `s` is `[0, 100]`.
 	fn withdraw_unbonded_update(s: u32, ) -> Weight {
 		// Proof Size summary in bytes:
-		//  Measured:  `2115`
+		//  Measured:  `2171`
 		//  Estimated: `27847`
-		// Minimum execution time: 136_073_000 picoseconds.
-		Weight::from_parts(141_448_439, 27847)
-			// Standard Error: 2_472
-			.saturating_add(Weight::from_parts(75_893, 0).saturating_mul(s.into()))
+		// Minimum execution time: 137_474_000 picoseconds.
+		Weight::from_parts(142_341_215, 27847)
+			// Standard Error: 3_468
+			.saturating_add(Weight::from_parts(66_597, 0).saturating_mul(s.into()))
 			.saturating_add(RocksDbWeight::get().reads(10_u64))
 			.saturating_add(RocksDbWeight::get().writes(8_u64))
 	}
-	/// Storage: NominationPools PoolMembers (r:1 w:1)
-	/// Proof: NominationPools PoolMembers (max_values: None, max_size: Some(237), added: 2712, mode: MaxEncodedLen)
-	/// Storage: Staking CurrentEra (r:1 w:0)
-	/// Proof: Staking CurrentEra (max_values: Some(1), max_size: Some(4), added: 499, mode: MaxEncodedLen)
-	/// Storage: NominationPools BondedPools (r:1 w:1)
-	/// Proof: NominationPools BondedPools (max_values: None, max_size: Some(220), added: 2695, mode: MaxEncodedLen)
-	/// Storage: NominationPools SubPoolsStorage (r:1 w:1)
-	/// Proof: NominationPools SubPoolsStorage (max_values: None, max_size: Some(24382), added: 26857, mode: MaxEncodedLen)
-	/// Storage: Staking Bonded (r:1 w:1)
-	/// Proof: Staking Bonded (max_values: None, max_size: Some(72), added: 2547, mode: MaxEncodedLen)
-	/// Storage: Staking Ledger (r:1 w:1)
-	/// Proof: Staking Ledger (max_values: None, max_size: Some(1091), added: 3566, mode: MaxEncodedLen)
-	/// Storage: Staking SlashingSpans (r:1 w:0)
-	/// Proof Skipped: Staking SlashingSpans (max_values: None, max_size: None, mode: Measured)
-	/// Storage: Staking Validators (r:1 w:0)
-	/// Proof: Staking Validators (max_values: None, max_size: Some(45), added: 2520, mode: MaxEncodedLen)
-	/// Storage: Staking Nominators (r:1 w:0)
-	/// Proof: Staking Nominators (max_values: None, max_size: Some(558), added: 3033, mode: MaxEncodedLen)
-	/// Storage: System Account (r:2 w:2)
-	/// Proof: System Account (max_values: None, max_size: Some(128), added: 2603, mode: MaxEncodedLen)
-	/// Storage: Balances Locks (r:1 w:1)
-	/// Proof: Balances Locks (max_values: None, max_size: Some(1299), added: 3774, mode: MaxEncodedLen)
-	/// Storage: Balances Freezes (r:1 w:0)
-	/// Proof: Balances Freezes (max_values: None, max_size: Some(49), added: 2524, mode: MaxEncodedLen)
-	/// Storage: NominationPools CounterForPoolMembers (r:1 w:1)
-	/// Proof: NominationPools CounterForPoolMembers (max_values: Some(1), max_size: Some(4), added: 499, mode: MaxEncodedLen)
-	/// Storage: NominationPools ReversePoolIdLookup (r:1 w:1)
-	/// Proof: NominationPools ReversePoolIdLookup (max_values: None, max_size: Some(44), added: 2519, mode: MaxEncodedLen)
-	/// Storage: NominationPools CounterForReversePoolIdLookup (r:1 w:1)
-	/// Proof: NominationPools CounterForReversePoolIdLookup (max_values: Some(1), max_size: Some(4), added: 499, mode: MaxEncodedLen)
-	/// Storage: NominationPools RewardPools (r:1 w:1)
-	/// Proof: NominationPools RewardPools (max_values: None, max_size: Some(92), added: 2567, mode: MaxEncodedLen)
-	/// Storage: NominationPools CounterForRewardPools (r:1 w:1)
-	/// Proof: NominationPools CounterForRewardPools (max_values: Some(1), max_size: Some(4), added: 499, mode: MaxEncodedLen)
-	/// Storage: NominationPools CounterForSubPoolsStorage (r:1 w:1)
-	/// Proof: NominationPools CounterForSubPoolsStorage (max_values: Some(1), max_size: Some(4), added: 499, mode: MaxEncodedLen)
-	/// Storage: NominationPools Metadata (r:1 w:1)
-	/// Proof: NominationPools Metadata (max_values: None, max_size: Some(270), added: 2745, mode: MaxEncodedLen)
-	/// Storage: NominationPools CounterForBondedPools (r:1 w:1)
-	/// Proof: NominationPools CounterForBondedPools (max_values: Some(1), max_size: Some(4), added: 499, mode: MaxEncodedLen)
-	/// Storage: Staking Payee (r:0 w:1)
-	/// Proof: Staking Payee (max_values: None, max_size: Some(73), added: 2548, mode: MaxEncodedLen)
-	/// Storage: NominationPools ClaimPermissions (r:0 w:1)
-	/// Proof: NominationPools ClaimPermissions (max_values: None, max_size: Some(41), added: 2516, mode: MaxEncodedLen)
+	/// Storage: `NominationPools::PoolMembers` (r:1 w:1)
+	/// Proof: `NominationPools::PoolMembers` (`max_values`: None, `max_size`: Some(237), added: 2712, mode: `MaxEncodedLen`)
+	/// Storage: `Staking::CurrentEra` (r:1 w:0)
+	/// Proof: `Staking::CurrentEra` (`max_values`: Some(1), `max_size`: Some(4), added: 499, mode: `MaxEncodedLen`)
+	/// Storage: `NominationPools::BondedPools` (r:1 w:1)
+	/// Proof: `NominationPools::BondedPools` (`max_values`: None, `max_size`: Some(220), added: 2695, mode: `MaxEncodedLen`)
+	/// Storage: `NominationPools::SubPoolsStorage` (r:1 w:1)
+	/// Proof: `NominationPools::SubPoolsStorage` (`max_values`: None, `max_size`: Some(24382), added: 26857, mode: `MaxEncodedLen`)
+	/// Storage: `Staking::Bonded` (r:1 w:1)
+	/// Proof: `Staking::Bonded` (`max_values`: None, `max_size`: Some(72), added: 2547, mode: `MaxEncodedLen`)
+	/// Storage: `Staking::Ledger` (r:1 w:1)
+	/// Proof: `Staking::Ledger` (`max_values`: None, `max_size`: Some(1091), added: 3566, mode: `MaxEncodedLen`)
+	/// Storage: `Staking::SlashingSpans` (r:1 w:0)
+	/// Proof: `Staking::SlashingSpans` (`max_values`: None, `max_size`: None, mode: `Measured`)
+	/// Storage: `Staking::Validators` (r:1 w:0)
+	/// Proof: `Staking::Validators` (`max_values`: None, `max_size`: Some(45), added: 2520, mode: `MaxEncodedLen`)
+	/// Storage: `Staking::Nominators` (r:1 w:0)
+	/// Proof: `Staking::Nominators` (`max_values`: None, `max_size`: Some(558), added: 3033, mode: `MaxEncodedLen`)
+	/// Storage: `System::Account` (r:2 w:2)
+	/// Proof: `System::Account` (`max_values`: None, `max_size`: Some(128), added: 2603, mode: `MaxEncodedLen`)
+	/// Storage: `Balances::Locks` (r:2 w:1)
+	/// Proof: `Balances::Locks` (`max_values`: None, `max_size`: Some(1299), added: 3774, mode: `MaxEncodedLen`)
+	/// Storage: `Balances::Freezes` (r:2 w:1)
+	/// Proof: `Balances::Freezes` (`max_values`: None, `max_size`: Some(67), added: 2542, mode: `MaxEncodedLen`)
+	/// Storage: `NominationPools::CounterForPoolMembers` (r:1 w:1)
+	/// Proof: `NominationPools::CounterForPoolMembers` (`max_values`: Some(1), `max_size`: Some(4), added: 499, mode: `MaxEncodedLen`)
+	/// Storage: `NominationPools::ReversePoolIdLookup` (r:1 w:1)
+	/// Proof: `NominationPools::ReversePoolIdLookup` (`max_values`: None, `max_size`: Some(44), added: 2519, mode: `MaxEncodedLen`)
+	/// Storage: `NominationPools::CounterForReversePoolIdLookup` (r:1 w:1)
+	/// Proof: `NominationPools::CounterForReversePoolIdLookup` (`max_values`: Some(1), `max_size`: Some(4), added: 499, mode: `MaxEncodedLen`)
+	/// Storage: `NominationPools::RewardPools` (r:1 w:1)
+	/// Proof: `NominationPools::RewardPools` (`max_values`: None, `max_size`: Some(92), added: 2567, mode: `MaxEncodedLen`)
+	/// Storage: `NominationPools::CounterForRewardPools` (r:1 w:1)
+	/// Proof: `NominationPools::CounterForRewardPools` (`max_values`: Some(1), `max_size`: Some(4), added: 499, mode: `MaxEncodedLen`)
+	/// Storage: `NominationPools::CounterForSubPoolsStorage` (r:1 w:1)
+	/// Proof: `NominationPools::CounterForSubPoolsStorage` (`max_values`: Some(1), `max_size`: Some(4), added: 499, mode: `MaxEncodedLen`)
+	/// Storage: `NominationPools::Metadata` (r:1 w:1)
+	/// Proof: `NominationPools::Metadata` (`max_values`: None, `max_size`: Some(270), added: 2745, mode: `MaxEncodedLen`)
+	/// Storage: `NominationPools::CounterForBondedPools` (r:1 w:1)
+	/// Proof: `NominationPools::CounterForBondedPools` (`max_values`: Some(1), `max_size`: Some(4), added: 499, mode: `MaxEncodedLen`)
+	/// Storage: `Staking::Payee` (r:0 w:1)
+	/// Proof: `Staking::Payee` (`max_values`: None, `max_size`: Some(73), added: 2548, mode: `MaxEncodedLen`)
+	/// Storage: `NominationPools::ClaimPermissions` (r:0 w:1)
+	/// Proof: `NominationPools::ClaimPermissions` (`max_values`: None, `max_size`: Some(41), added: 2516, mode: `MaxEncodedLen`)
 	/// The range of component `s` is `[0, 100]`.
 	fn withdraw_unbonded_kill(_s: u32, ) -> Weight {
 		// Proof Size summary in bytes:
-		//  Measured:  `2470`
+		//  Measured:  `2526`
 		//  Estimated: `27847`
-		// Minimum execution time: 230_871_000 picoseconds.
-		Weight::from_parts(239_533_976, 27847)
-			.saturating_add(RocksDbWeight::get().reads(21_u64))
-			.saturating_add(RocksDbWeight::get().writes(18_u64))
+		// Minimum execution time: 249_135_000 picoseconds.
+		Weight::from_parts(263_632_571, 27847)
+			.saturating_add(RocksDbWeight::get().reads(23_u64))
+			.saturating_add(RocksDbWeight::get().writes(19_u64))
 	}
-	/// Storage: NominationPools LastPoolId (r:1 w:1)
-	/// Proof: NominationPools LastPoolId (max_values: Some(1), max_size: Some(4), added: 499, mode: MaxEncodedLen)
-	/// Storage: Staking MinNominatorBond (r:1 w:0)
-	/// Proof: Staking MinNominatorBond (max_values: Some(1), max_size: Some(16), added: 511, mode: MaxEncodedLen)
-	/// Storage: NominationPools MinCreateBond (r:1 w:0)
-	/// Proof: NominationPools MinCreateBond (max_values: Some(1), max_size: Some(16), added: 511, mode: MaxEncodedLen)
-	/// Storage: NominationPools MinJoinBond (r:1 w:0)
-	/// Proof: NominationPools MinJoinBond (max_values: Some(1), max_size: Some(16), added: 511, mode: MaxEncodedLen)
-	/// Storage: NominationPools MaxPools (r:1 w:0)
-	/// Proof: NominationPools MaxPools (max_values: Some(1), max_size: Some(4), added: 499, mode: MaxEncodedLen)
-	/// Storage: NominationPools CounterForBondedPools (r:1 w:1)
-	/// Proof: NominationPools CounterForBondedPools (max_values: Some(1), max_size: Some(4), added: 499, mode: MaxEncodedLen)
-	/// Storage: NominationPools PoolMembers (r:1 w:1)
-	/// Proof: NominationPools PoolMembers (max_values: None, max_size: Some(237), added: 2712, mode: MaxEncodedLen)
-	/// Storage: NominationPools MaxPoolMembersPerPool (r:1 w:0)
-	/// Proof: NominationPools MaxPoolMembersPerPool (max_values: Some(1), max_size: Some(4), added: 499, mode: MaxEncodedLen)
-	/// Storage: NominationPools MaxPoolMembers (r:1 w:0)
-	/// Proof: NominationPools MaxPoolMembers (max_values: Some(1), max_size: Some(4), added: 499, mode: MaxEncodedLen)
-	/// Storage: NominationPools CounterForPoolMembers (r:1 w:1)
-	/// Proof: NominationPools CounterForPoolMembers (max_values: Some(1), max_size: Some(4), added: 499, mode: MaxEncodedLen)
-	/// Storage: System Account (r:2 w:2)
-	/// Proof: System Account (max_values: None, max_size: Some(128), added: 2603, mode: MaxEncodedLen)
-	/// Storage: Staking Bonded (r:1 w:1)
-	/// Proof: Staking Bonded (max_values: None, max_size: Some(72), added: 2547, mode: MaxEncodedLen)
-	/// Storage: Staking Ledger (r:1 w:1)
-	/// Proof: Staking Ledger (max_values: None, max_size: Some(1091), added: 3566, mode: MaxEncodedLen)
-	/// Storage: Staking CurrentEra (r:1 w:0)
-	/// Proof: Staking CurrentEra (max_values: Some(1), max_size: Some(4), added: 499, mode: MaxEncodedLen)
-	/// Storage: Balances Locks (r:1 w:1)
-	/// Proof: Balances Locks (max_values: None, max_size: Some(1299), added: 3774, mode: MaxEncodedLen)
-	/// Storage: Balances Freezes (r:1 w:0)
-	/// Proof: Balances Freezes (max_values: None, max_size: Some(49), added: 2524, mode: MaxEncodedLen)
-	/// Storage: NominationPools RewardPools (r:1 w:1)
-	/// Proof: NominationPools RewardPools (max_values: None, max_size: Some(92), added: 2567, mode: MaxEncodedLen)
-	/// Storage: NominationPools CounterForRewardPools (r:1 w:1)
-	/// Proof: NominationPools CounterForRewardPools (max_values: Some(1), max_size: Some(4), added: 499, mode: MaxEncodedLen)
-	/// Storage: NominationPools ReversePoolIdLookup (r:1 w:1)
-	/// Proof: NominationPools ReversePoolIdLookup (max_values: None, max_size: Some(44), added: 2519, mode: MaxEncodedLen)
-	/// Storage: NominationPools CounterForReversePoolIdLookup (r:1 w:1)
-	/// Proof: NominationPools CounterForReversePoolIdLookup (max_values: Some(1), max_size: Some(4), added: 499, mode: MaxEncodedLen)
-	/// Storage: NominationPools BondedPools (r:1 w:1)
-	/// Proof: NominationPools BondedPools (max_values: None, max_size: Some(220), added: 2695, mode: MaxEncodedLen)
-	/// Storage: Staking Payee (r:0 w:1)
-	/// Proof: Staking Payee (max_values: None, max_size: Some(73), added: 2548, mode: MaxEncodedLen)
+	/// Storage: `NominationPools::LastPoolId` (r:1 w:1)
+	/// Proof: `NominationPools::LastPoolId` (`max_values`: Some(1), `max_size`: Some(4), added: 499, mode: `MaxEncodedLen`)
+	/// Storage: `Staking::MinNominatorBond` (r:1 w:0)
+	/// Proof: `Staking::MinNominatorBond` (`max_values`: Some(1), `max_size`: Some(16), added: 511, mode: `MaxEncodedLen`)
+	/// Storage: `NominationPools::MinCreateBond` (r:1 w:0)
+	/// Proof: `NominationPools::MinCreateBond` (`max_values`: Some(1), `max_size`: Some(16), added: 511, mode: `MaxEncodedLen`)
+	/// Storage: `NominationPools::MinJoinBond` (r:1 w:0)
+	/// Proof: `NominationPools::MinJoinBond` (`max_values`: Some(1), `max_size`: Some(16), added: 511, mode: `MaxEncodedLen`)
+	/// Storage: `NominationPools::MaxPools` (r:1 w:0)
+	/// Proof: `NominationPools::MaxPools` (`max_values`: Some(1), `max_size`: Some(4), added: 499, mode: `MaxEncodedLen`)
+	/// Storage: `NominationPools::CounterForBondedPools` (r:1 w:1)
+	/// Proof: `NominationPools::CounterForBondedPools` (`max_values`: Some(1), `max_size`: Some(4), added: 499, mode: `MaxEncodedLen`)
+	/// Storage: `NominationPools::PoolMembers` (r:1 w:1)
+	/// Proof: `NominationPools::PoolMembers` (`max_values`: None, `max_size`: Some(237), added: 2712, mode: `MaxEncodedLen`)
+	/// Storage: `NominationPools::MaxPoolMembersPerPool` (r:1 w:0)
+	/// Proof: `NominationPools::MaxPoolMembersPerPool` (`max_values`: Some(1), `max_size`: Some(4), added: 499, mode: `MaxEncodedLen`)
+	/// Storage: `NominationPools::MaxPoolMembers` (r:1 w:0)
+	/// Proof: `NominationPools::MaxPoolMembers` (`max_values`: Some(1), `max_size`: Some(4), added: 499, mode: `MaxEncodedLen`)
+	/// Storage: `NominationPools::CounterForPoolMembers` (r:1 w:1)
+	/// Proof: `NominationPools::CounterForPoolMembers` (`max_values`: Some(1), `max_size`: Some(4), added: 499, mode: `MaxEncodedLen`)
+	/// Storage: `System::Account` (r:2 w:2)
+	/// Proof: `System::Account` (`max_values`: None, `max_size`: Some(128), added: 2603, mode: `MaxEncodedLen`)
+	/// Storage: `Staking::Bonded` (r:1 w:1)
+	/// Proof: `Staking::Bonded` (`max_values`: None, `max_size`: Some(72), added: 2547, mode: `MaxEncodedLen`)
+	/// Storage: `Staking::Ledger` (r:1 w:1)
+	/// Proof: `Staking::Ledger` (`max_values`: None, `max_size`: Some(1091), added: 3566, mode: `MaxEncodedLen`)
+	/// Storage: `Staking::CurrentEra` (r:1 w:0)
+	/// Proof: `Staking::CurrentEra` (`max_values`: Some(1), `max_size`: Some(4), added: 499, mode: `MaxEncodedLen`)
+	/// Storage: `Balances::Locks` (r:2 w:1)
+	/// Proof: `Balances::Locks` (`max_values`: None, `max_size`: Some(1299), added: 3774, mode: `MaxEncodedLen`)
+	/// Storage: `Balances::Freezes` (r:2 w:1)
+	/// Proof: `Balances::Freezes` (`max_values`: None, `max_size`: Some(67), added: 2542, mode: `MaxEncodedLen`)
+	/// Storage: `NominationPools::RewardPools` (r:1 w:1)
+	/// Proof: `NominationPools::RewardPools` (`max_values`: None, `max_size`: Some(92), added: 2567, mode: `MaxEncodedLen`)
+	/// Storage: `NominationPools::CounterForRewardPools` (r:1 w:1)
+	/// Proof: `NominationPools::CounterForRewardPools` (`max_values`: Some(1), `max_size`: Some(4), added: 499, mode: `MaxEncodedLen`)
+	/// Storage: `NominationPools::ReversePoolIdLookup` (r:1 w:1)
+	/// Proof: `NominationPools::ReversePoolIdLookup` (`max_values`: None, `max_size`: Some(44), added: 2519, mode: `MaxEncodedLen`)
+	/// Storage: `NominationPools::CounterForReversePoolIdLookup` (r:1 w:1)
+	/// Proof: `NominationPools::CounterForReversePoolIdLookup` (`max_values`: Some(1), `max_size`: Some(4), added: 499, mode: `MaxEncodedLen`)
+	/// Storage: `NominationPools::BondedPools` (r:1 w:1)
+	/// Proof: `NominationPools::BondedPools` (`max_values`: None, `max_size`: Some(220), added: 2695, mode: `MaxEncodedLen`)
+	/// Storage: `Staking::Payee` (r:0 w:1)
+	/// Proof: `Staking::Payee` (`max_values`: None, `max_size`: Some(73), added: 2548, mode: `MaxEncodedLen`)
 	fn create() -> Weight {
 		// Proof Size summary in bytes:
 		//  Measured:  `1289`
-		//  Estimated: `6196`
-		// Minimum execution time: 194_272_000 picoseconds.
-		Weight::from_parts(197_933_000, 6196)
-			.saturating_add(RocksDbWeight::get().reads(22_u64))
-			.saturating_add(RocksDbWeight::get().writes(15_u64))
+		//  Estimated: `8538`
+		// Minimum execution time: 214_207_000 picoseconds.
+		Weight::from_parts(221_588_000, 8538)
+			.saturating_add(RocksDbWeight::get().reads(24_u64))
+			.saturating_add(RocksDbWeight::get().writes(16_u64))
 	}
-	/// Storage: NominationPools BondedPools (r:1 w:0)
-	/// Proof: NominationPools BondedPools (max_values: None, max_size: Some(220), added: 2695, mode: MaxEncodedLen)
-	/// Storage: Staking Bonded (r:1 w:0)
-	/// Proof: Staking Bonded (max_values: None, max_size: Some(72), added: 2547, mode: MaxEncodedLen)
-	/// Storage: Staking Ledger (r:1 w:0)
-	/// Proof: Staking Ledger (max_values: None, max_size: Some(1091), added: 3566, mode: MaxEncodedLen)
-	/// Storage: Staking MinNominatorBond (r:1 w:0)
-	/// Proof: Staking MinNominatorBond (max_values: Some(1), max_size: Some(16), added: 511, mode: MaxEncodedLen)
-	/// Storage: Staking Nominators (r:1 w:1)
-	/// Proof: Staking Nominators (max_values: None, max_size: Some(558), added: 3033, mode: MaxEncodedLen)
-	/// Storage: Staking MaxNominatorsCount (r:1 w:0)
-	/// Proof: Staking MaxNominatorsCount (max_values: Some(1), max_size: Some(4), added: 499, mode: MaxEncodedLen)
-	/// Storage: Staking Validators (r:17 w:0)
-	/// Proof: Staking Validators (max_values: None, max_size: Some(45), added: 2520, mode: MaxEncodedLen)
-	/// Storage: Staking CurrentEra (r:1 w:0)
-	/// Proof: Staking CurrentEra (max_values: Some(1), max_size: Some(4), added: 499, mode: MaxEncodedLen)
-	/// Storage: VoterList ListNodes (r:1 w:1)
-	/// Proof: VoterList ListNodes (max_values: None, max_size: Some(154), added: 2629, mode: MaxEncodedLen)
-	/// Storage: VoterList ListBags (r:1 w:1)
-	/// Proof: VoterList ListBags (max_values: None, max_size: Some(82), added: 2557, mode: MaxEncodedLen)
-	/// Storage: VoterList CounterForListNodes (r:1 w:1)
-	/// Proof: VoterList CounterForListNodes (max_values: Some(1), max_size: Some(4), added: 499, mode: MaxEncodedLen)
-	/// Storage: Staking CounterForNominators (r:1 w:1)
-	/// Proof: Staking CounterForNominators (max_values: Some(1), max_size: Some(4), added: 499, mode: MaxEncodedLen)
+	/// Storage: `NominationPools::BondedPools` (r:1 w:0)
+	/// Proof: `NominationPools::BondedPools` (`max_values`: None, `max_size`: Some(220), added: 2695, mode: `MaxEncodedLen`)
+	/// Storage: `Staking::Bonded` (r:1 w:0)
+	/// Proof: `Staking::Bonded` (`max_values`: None, `max_size`: Some(72), added: 2547, mode: `MaxEncodedLen`)
+	/// Storage: `Staking::Ledger` (r:1 w:0)
+	/// Proof: `Staking::Ledger` (`max_values`: None, `max_size`: Some(1091), added: 3566, mode: `MaxEncodedLen`)
+	/// Storage: `Staking::MinNominatorBond` (r:1 w:0)
+	/// Proof: `Staking::MinNominatorBond` (`max_values`: Some(1), `max_size`: Some(16), added: 511, mode: `MaxEncodedLen`)
+	/// Storage: `Staking::Nominators` (r:1 w:1)
+	/// Proof: `Staking::Nominators` (`max_values`: None, `max_size`: Some(558), added: 3033, mode: `MaxEncodedLen`)
+	/// Storage: `Staking::MaxNominatorsCount` (r:1 w:0)
+	/// Proof: `Staking::MaxNominatorsCount` (`max_values`: Some(1), `max_size`: Some(4), added: 499, mode: `MaxEncodedLen`)
+	/// Storage: `Staking::Validators` (r:17 w:0)
+	/// Proof: `Staking::Validators` (`max_values`: None, `max_size`: Some(45), added: 2520, mode: `MaxEncodedLen`)
+	/// Storage: `Staking::CurrentEra` (r:1 w:0)
+	/// Proof: `Staking::CurrentEra` (`max_values`: Some(1), `max_size`: Some(4), added: 499, mode: `MaxEncodedLen`)
+	/// Storage: `VoterList::ListNodes` (r:1 w:1)
+	/// Proof: `VoterList::ListNodes` (`max_values`: None, `max_size`: Some(154), added: 2629, mode: `MaxEncodedLen`)
+	/// Storage: `VoterList::ListBags` (r:1 w:1)
+	/// Proof: `VoterList::ListBags` (`max_values`: None, `max_size`: Some(82), added: 2557, mode: `MaxEncodedLen`)
+	/// Storage: `VoterList::CounterForListNodes` (r:1 w:1)
+	/// Proof: `VoterList::CounterForListNodes` (`max_values`: Some(1), `max_size`: Some(4), added: 499, mode: `MaxEncodedLen`)
+	/// Storage: `Staking::CounterForNominators` (r:1 w:1)
+	/// Proof: `Staking::CounterForNominators` (`max_values`: Some(1), `max_size`: Some(4), added: 499, mode: `MaxEncodedLen`)
 	/// The range of component `n` is `[1, 16]`.
 	fn nominate(n: u32, ) -> Weight {
 		// Proof Size summary in bytes:
 		//  Measured:  `1849`
 		//  Estimated: `4556 + n * (2520 ±0)`
-		// Minimum execution time: 70_256_000 picoseconds.
-		Weight::from_parts(71_045_351, 4556)
-			// Standard Error: 9_898
-			.saturating_add(Weight::from_parts(1_592_597, 0).saturating_mul(n.into()))
+		// Minimum execution time: 70_626_000 picoseconds.
+		Weight::from_parts(73_830_182, 4556)
+			// Standard Error: 24_496
+			.saturating_add(Weight::from_parts(1_561_416, 0).saturating_mul(n.into()))
 			.saturating_add(RocksDbWeight::get().reads(12_u64))
 			.saturating_add(RocksDbWeight::get().reads((1_u64).saturating_mul(n.into())))
 			.saturating_add(RocksDbWeight::get().writes(5_u64))
 			.saturating_add(Weight::from_parts(0, 2520).saturating_mul(n.into()))
 	}
-	/// Storage: NominationPools BondedPools (r:1 w:1)
-	/// Proof: NominationPools BondedPools (max_values: None, max_size: Some(220), added: 2695, mode: MaxEncodedLen)
-	/// Storage: Staking Bonded (r:1 w:0)
-	/// Proof: Staking Bonded (max_values: None, max_size: Some(72), added: 2547, mode: MaxEncodedLen)
-	/// Storage: Staking Ledger (r:1 w:0)
-	/// Proof: Staking Ledger (max_values: None, max_size: Some(1091), added: 3566, mode: MaxEncodedLen)
+	/// Storage: `NominationPools::BondedPools` (r:1 w:1)
+	/// Proof: `NominationPools::BondedPools` (`max_values`: None, `max_size`: Some(220), added: 2695, mode: `MaxEncodedLen`)
+	/// Storage: `Staking::Bonded` (r:1 w:0)
+	/// Proof: `Staking::Bonded` (`max_values`: None, `max_size`: Some(72), added: 2547, mode: `MaxEncodedLen`)
+	/// Storage: `Staking::Ledger` (r:1 w:0)
+	/// Proof: `Staking::Ledger` (`max_values`: None, `max_size`: Some(1091), added: 3566, mode: `MaxEncodedLen`)
 	fn set_state() -> Weight {
 		// Proof Size summary in bytes:
 		//  Measured:  `1438`
 		//  Estimated: `4556`
-		// Minimum execution time: 36_233_000 picoseconds.
-		Weight::from_parts(37_114_000, 4556)
+		// Minimum execution time: 36_542_000 picoseconds.
+		Weight::from_parts(37_644_000, 4556)
 			.saturating_add(RocksDbWeight::get().reads(3_u64))
 			.saturating_add(RocksDbWeight::get().writes(1_u64))
 	}
-	/// Storage: NominationPools BondedPools (r:1 w:0)
-	/// Proof: NominationPools BondedPools (max_values: None, max_size: Some(220), added: 2695, mode: MaxEncodedLen)
-	/// Storage: NominationPools Metadata (r:1 w:1)
-	/// Proof: NominationPools Metadata (max_values: None, max_size: Some(270), added: 2745, mode: MaxEncodedLen)
-	/// Storage: NominationPools CounterForMetadata (r:1 w:1)
-	/// Proof: NominationPools CounterForMetadata (max_values: Some(1), max_size: Some(4), added: 499, mode: MaxEncodedLen)
+	/// Storage: `NominationPools::BondedPools` (r:1 w:0)
+	/// Proof: `NominationPools::BondedPools` (`max_values`: None, `max_size`: Some(220), added: 2695, mode: `MaxEncodedLen`)
+	/// Storage: `NominationPools::Metadata` (r:1 w:1)
+	/// Proof: `NominationPools::Metadata` (`max_values`: None, `max_size`: Some(270), added: 2745, mode: `MaxEncodedLen`)
+	/// Storage: `NominationPools::CounterForMetadata` (r:1 w:1)
+	/// Proof: `NominationPools::CounterForMetadata` (`max_values`: Some(1), `max_size`: Some(4), added: 499, mode: `MaxEncodedLen`)
 	/// The range of component `n` is `[1, 256]`.
 	fn set_metadata(n: u32, ) -> Weight {
 		// Proof Size summary in bytes:
 		//  Measured:  `531`
 		//  Estimated: `3735`
-		// Minimum execution time: 14_494_000 picoseconds.
-		Weight::from_parts(15_445_658, 3735)
-			// Standard Error: 211
-			.saturating_add(Weight::from_parts(1_523, 0).saturating_mul(n.into()))
+		// Minimum execution time: 15_130_000 picoseconds.
+		Weight::from_parts(16_319_671, 3735)
+			// Standard Error: 351
+			.saturating_add(Weight::from_parts(2_024, 0).saturating_mul(n.into()))
 			.saturating_add(RocksDbWeight::get().reads(3_u64))
 			.saturating_add(RocksDbWeight::get().writes(2_u64))
 	}
-	/// Storage: NominationPools MinJoinBond (r:0 w:1)
-	/// Proof: NominationPools MinJoinBond (max_values: Some(1), max_size: Some(16), added: 511, mode: MaxEncodedLen)
-	/// Storage: NominationPools MaxPoolMembers (r:0 w:1)
-	/// Proof: NominationPools MaxPoolMembers (max_values: Some(1), max_size: Some(4), added: 499, mode: MaxEncodedLen)
-	/// Storage: NominationPools MaxPoolMembersPerPool (r:0 w:1)
-	/// Proof: NominationPools MaxPoolMembersPerPool (max_values: Some(1), max_size: Some(4), added: 499, mode: MaxEncodedLen)
-	/// Storage: NominationPools MinCreateBond (r:0 w:1)
-	/// Proof: NominationPools MinCreateBond (max_values: Some(1), max_size: Some(16), added: 511, mode: MaxEncodedLen)
-	/// Storage: NominationPools GlobalMaxCommission (r:0 w:1)
-	/// Proof: NominationPools GlobalMaxCommission (max_values: Some(1), max_size: Some(4), added: 499, mode: MaxEncodedLen)
-	/// Storage: NominationPools MaxPools (r:0 w:1)
-	/// Proof: NominationPools MaxPools (max_values: Some(1), max_size: Some(4), added: 499, mode: MaxEncodedLen)
+	/// Storage: `NominationPools::MinJoinBond` (r:0 w:1)
+	/// Proof: `NominationPools::MinJoinBond` (`max_values`: Some(1), `max_size`: Some(16), added: 511, mode: `MaxEncodedLen`)
+	/// Storage: `NominationPools::MaxPoolMembers` (r:0 w:1)
+	/// Proof: `NominationPools::MaxPoolMembers` (`max_values`: Some(1), `max_size`: Some(4), added: 499, mode: `MaxEncodedLen`)
+	/// Storage: `NominationPools::MaxPoolMembersPerPool` (r:0 w:1)
+	/// Proof: `NominationPools::MaxPoolMembersPerPool` (`max_values`: Some(1), `max_size`: Some(4), added: 499, mode: `MaxEncodedLen`)
+	/// Storage: `NominationPools::MinCreateBond` (r:0 w:1)
+	/// Proof: `NominationPools::MinCreateBond` (`max_values`: Some(1), `max_size`: Some(16), added: 511, mode: `MaxEncodedLen`)
+	/// Storage: `NominationPools::GlobalMaxCommission` (r:0 w:1)
+	/// Proof: `NominationPools::GlobalMaxCommission` (`max_values`: Some(1), `max_size`: Some(4), added: 499, mode: `MaxEncodedLen`)
+	/// Storage: `NominationPools::MaxPools` (r:0 w:1)
+	/// Proof: `NominationPools::MaxPools` (`max_values`: Some(1), `max_size`: Some(4), added: 499, mode: `MaxEncodedLen`)
 	fn set_configs() -> Weight {
 		// Proof Size summary in bytes:
 		//  Measured:  `0`
 		//  Estimated: `0`
-		// Minimum execution time: 6_776_000 picoseconds.
-		Weight::from_parts(7_033_000, 0)
+		// Minimum execution time: 6_819_000 picoseconds.
+		Weight::from_parts(7_253_000, 0)
 			.saturating_add(RocksDbWeight::get().writes(6_u64))
 	}
-	/// Storage: NominationPools BondedPools (r:1 w:1)
-	/// Proof: NominationPools BondedPools (max_values: None, max_size: Some(220), added: 2695, mode: MaxEncodedLen)
+	/// Storage: `NominationPools::BondedPools` (r:1 w:1)
+	/// Proof: `NominationPools::BondedPools` (`max_values`: None, `max_size`: Some(220), added: 2695, mode: `MaxEncodedLen`)
 	fn update_roles() -> Weight {
 		// Proof Size summary in bytes:
 		//  Measured:  `531`
 		//  Estimated: `3685`
-		// Minimum execution time: 19_586_000 picoseconds.
-		Weight::from_parts(20_287_000, 3685)
+		// Minimum execution time: 19_596_000 picoseconds.
+		Weight::from_parts(20_828_000, 3685)
 			.saturating_add(RocksDbWeight::get().reads(1_u64))
 			.saturating_add(RocksDbWeight::get().writes(1_u64))
 	}
-	/// Storage: NominationPools BondedPools (r:1 w:0)
-	/// Proof: NominationPools BondedPools (max_values: None, max_size: Some(220), added: 2695, mode: MaxEncodedLen)
-	/// Storage: Staking Bonded (r:1 w:0)
-	/// Proof: Staking Bonded (max_values: None, max_size: Some(72), added: 2547, mode: MaxEncodedLen)
-	/// Storage: Staking Ledger (r:1 w:0)
-	/// Proof: Staking Ledger (max_values: None, max_size: Some(1091), added: 3566, mode: MaxEncodedLen)
-	/// Storage: Staking Validators (r:1 w:0)
-	/// Proof: Staking Validators (max_values: None, max_size: Some(45), added: 2520, mode: MaxEncodedLen)
-	/// Storage: Staking Nominators (r:1 w:1)
-	/// Proof: Staking Nominators (max_values: None, max_size: Some(558), added: 3033, mode: MaxEncodedLen)
-	/// Storage: Staking CounterForNominators (r:1 w:1)
-	/// Proof: Staking CounterForNominators (max_values: Some(1), max_size: Some(4), added: 499, mode: MaxEncodedLen)
-	/// Storage: VoterList ListNodes (r:1 w:1)
-	/// Proof: VoterList ListNodes (max_values: None, max_size: Some(154), added: 2629, mode: MaxEncodedLen)
-	/// Storage: VoterList ListBags (r:1 w:1)
-	/// Proof: VoterList ListBags (max_values: None, max_size: Some(82), added: 2557, mode: MaxEncodedLen)
-	/// Storage: VoterList CounterForListNodes (r:1 w:1)
-	/// Proof: VoterList CounterForListNodes (max_values: Some(1), max_size: Some(4), added: 499, mode: MaxEncodedLen)
+	/// Storage: `NominationPools::BondedPools` (r:1 w:0)
+	/// Proof: `NominationPools::BondedPools` (`max_values`: None, `max_size`: Some(220), added: 2695, mode: `MaxEncodedLen`)
+	/// Storage: `Staking::Bonded` (r:1 w:0)
+	/// Proof: `Staking::Bonded` (`max_values`: None, `max_size`: Some(72), added: 2547, mode: `MaxEncodedLen`)
+	/// Storage: `Staking::Ledger` (r:1 w:0)
+	/// Proof: `Staking::Ledger` (`max_values`: None, `max_size`: Some(1091), added: 3566, mode: `MaxEncodedLen`)
+	/// Storage: `Staking::Validators` (r:1 w:0)
+	/// Proof: `Staking::Validators` (`max_values`: None, `max_size`: Some(45), added: 2520, mode: `MaxEncodedLen`)
+	/// Storage: `Staking::Nominators` (r:1 w:1)
+	/// Proof: `Staking::Nominators` (`max_values`: None, `max_size`: Some(558), added: 3033, mode: `MaxEncodedLen`)
+	/// Storage: `Staking::CounterForNominators` (r:1 w:1)
+	/// Proof: `Staking::CounterForNominators` (`max_values`: Some(1), `max_size`: Some(4), added: 499, mode: `MaxEncodedLen`)
+	/// Storage: `VoterList::ListNodes` (r:1 w:1)
+	/// Proof: `VoterList::ListNodes` (`max_values`: None, `max_size`: Some(154), added: 2629, mode: `MaxEncodedLen`)
+	/// Storage: `VoterList::ListBags` (r:1 w:1)
+	/// Proof: `VoterList::ListBags` (`max_values`: None, `max_size`: Some(82), added: 2557, mode: `MaxEncodedLen`)
+	/// Storage: `VoterList::CounterForListNodes` (r:1 w:1)
+	/// Proof: `VoterList::CounterForListNodes` (`max_values`: Some(1), `max_size`: Some(4), added: 499, mode: `MaxEncodedLen`)
 	fn chill() -> Weight {
 		// Proof Size summary in bytes:
 		//  Measured:  `2012`
 		//  Estimated: `4556`
-		// Minimum execution time: 68_086_000 picoseconds.
-		Weight::from_parts(70_784_000, 4556)
+		// Minimum execution time: 68_551_000 picoseconds.
+		Weight::from_parts(71_768_000, 4556)
 			.saturating_add(RocksDbWeight::get().reads(9_u64))
 			.saturating_add(RocksDbWeight::get().writes(5_u64))
 	}
-	/// Storage: NominationPools BondedPools (r:1 w:1)
-	/// Proof: NominationPools BondedPools (max_values: None, max_size: Some(220), added: 2695, mode: MaxEncodedLen)
-	/// Storage: NominationPools RewardPools (r:1 w:1)
-	/// Proof: NominationPools RewardPools (max_values: None, max_size: Some(92), added: 2567, mode: MaxEncodedLen)
-	/// Storage: NominationPools GlobalMaxCommission (r:1 w:0)
-	/// Proof: NominationPools GlobalMaxCommission (max_values: Some(1), max_size: Some(4), added: 499, mode: MaxEncodedLen)
-	/// Storage: System Account (r:1 w:0)
-	/// Proof: System Account (max_values: None, max_size: Some(128), added: 2603, mode: MaxEncodedLen)
+	/// Storage: `NominationPools::BondedPools` (r:1 w:1)
+	/// Proof: `NominationPools::BondedPools` (`max_values`: None, `max_size`: Some(220), added: 2695, mode: `MaxEncodedLen`)
+	/// Storage: `NominationPools::RewardPools` (r:1 w:1)
+	/// Proof: `NominationPools::RewardPools` (`max_values`: None, `max_size`: Some(92), added: 2567, mode: `MaxEncodedLen`)
+	/// Storage: `NominationPools::GlobalMaxCommission` (r:1 w:0)
+	/// Proof: `NominationPools::GlobalMaxCommission` (`max_values`: Some(1), `max_size`: Some(4), added: 499, mode: `MaxEncodedLen`)
+	/// Storage: `System::Account` (r:1 w:0)
+	/// Proof: `System::Account` (`max_values`: None, `max_size`: Some(128), added: 2603, mode: `MaxEncodedLen`)
 	fn set_commission() -> Weight {
 		// Proof Size summary in bytes:
 		//  Measured:  `770`
 		//  Estimated: `3685`
-		// Minimum execution time: 33_353_000 picoseconds.
-		Weight::from_parts(34_519_000, 3685)
+		// Minimum execution time: 36_128_000 picoseconds.
+		Weight::from_parts(38_547_000, 3685)
 			.saturating_add(RocksDbWeight::get().reads(4_u64))
 			.saturating_add(RocksDbWeight::get().writes(2_u64))
 	}
-	/// Storage: NominationPools BondedPools (r:1 w:1)
-	/// Proof: NominationPools BondedPools (max_values: None, max_size: Some(220), added: 2695, mode: MaxEncodedLen)
+	/// Storage: `NominationPools::BondedPools` (r:1 w:1)
+	/// Proof: `NominationPools::BondedPools` (`max_values`: None, `max_size`: Some(220), added: 2695, mode: `MaxEncodedLen`)
+	/// Storage: `NominationPools::GlobalMaxCommission` (r:1 w:0)
+	/// Proof: `NominationPools::GlobalMaxCommission` (`max_values`: Some(1), `max_size`: Some(4), added: 499, mode: `MaxEncodedLen`)
 	fn set_commission_max() -> Weight {
 		// Proof Size summary in bytes:
 		//  Measured:  `571`
 		//  Estimated: `3685`
-		// Minimum execution time: 19_020_000 picoseconds.
-		Weight::from_parts(19_630_000, 3685)
-			.saturating_add(RocksDbWeight::get().reads(1_u64))
+		// Minimum execution time: 20_067_000 picoseconds.
+		Weight::from_parts(21_044_000, 3685)
+			.saturating_add(RocksDbWeight::get().reads(2_u64))
 			.saturating_add(RocksDbWeight::get().writes(1_u64))
 	}
-	/// Storage: NominationPools BondedPools (r:1 w:1)
-	/// Proof: NominationPools BondedPools (max_values: None, max_size: Some(220), added: 2695, mode: MaxEncodedLen)
+	/// Storage: `NominationPools::BondedPools` (r:1 w:1)
+	/// Proof: `NominationPools::BondedPools` (`max_values`: None, `max_size`: Some(220), added: 2695, mode: `MaxEncodedLen`)
 	fn set_commission_change_rate() -> Weight {
 		// Proof Size summary in bytes:
 		//  Measured:  `531`
 		//  Estimated: `3685`
-		// Minimum execution time: 19_693_000 picoseconds.
-		Weight::from_parts(20_114_000, 3685)
+		// Minimum execution time: 19_186_000 picoseconds.
+		Weight::from_parts(20_189_000, 3685)
 			.saturating_add(RocksDbWeight::get().reads(1_u64))
 			.saturating_add(RocksDbWeight::get().writes(1_u64))
 	}
-	/// Storage: NominationPools PoolMembers (r:1 w:0)
-	/// Proof: NominationPools PoolMembers (max_values: None, max_size: Some(237), added: 2712, mode: MaxEncodedLen)
-	/// Storage: NominationPools ClaimPermissions (r:1 w:1)
-	/// Proof: NominationPools ClaimPermissions (max_values: None, max_size: Some(41), added: 2516, mode: MaxEncodedLen)
+	/// Storage: `NominationPools::PoolMembers` (r:1 w:0)
+	/// Proof: `NominationPools::PoolMembers` (`max_values`: None, `max_size`: Some(237), added: 2712, mode: `MaxEncodedLen`)
+	/// Storage: `NominationPools::ClaimPermissions` (r:1 w:1)
+	/// Proof: `NominationPools::ClaimPermissions` (`max_values`: None, `max_size`: Some(41), added: 2516, mode: `MaxEncodedLen`)
 	fn set_claim_permission() -> Weight {
 		// Proof Size summary in bytes:
 		//  Measured:  `542`
 		//  Estimated: `3702`
-		// Minimum execution time: 14_810_000 picoseconds.
-		Weight::from_parts(15_526_000, 3702)
+		// Minimum execution time: 15_275_000 picoseconds.
+		Weight::from_parts(15_932_000, 3702)
 			.saturating_add(RocksDbWeight::get().reads(2_u64))
 			.saturating_add(RocksDbWeight::get().writes(1_u64))
 	}
-	/// Storage: NominationPools BondedPools (r:1 w:0)
-	/// Proof: NominationPools BondedPools (max_values: None, max_size: Some(220), added: 2695, mode: MaxEncodedLen)
-	/// Storage: NominationPools RewardPools (r:1 w:1)
-	/// Proof: NominationPools RewardPools (max_values: None, max_size: Some(92), added: 2567, mode: MaxEncodedLen)
-	/// Storage: NominationPools GlobalMaxCommission (r:1 w:0)
-	/// Proof: NominationPools GlobalMaxCommission (max_values: Some(1), max_size: Some(4), added: 499, mode: MaxEncodedLen)
-	/// Storage: System Account (r:1 w:1)
-	/// Proof: System Account (max_values: None, max_size: Some(128), added: 2603, mode: MaxEncodedLen)
+	/// Storage: `NominationPools::BondedPools` (r:1 w:0)
+	/// Proof: `NominationPools::BondedPools` (`max_values`: None, `max_size`: Some(220), added: 2695, mode: `MaxEncodedLen`)
+	/// Storage: `NominationPools::RewardPools` (r:1 w:1)
+	/// Proof: `NominationPools::RewardPools` (`max_values`: None, `max_size`: Some(92), added: 2567, mode: `MaxEncodedLen`)
+	/// Storage: `NominationPools::GlobalMaxCommission` (r:1 w:0)
+	/// Proof: `NominationPools::GlobalMaxCommission` (`max_values`: Some(1), `max_size`: Some(4), added: 499, mode: `MaxEncodedLen`)
+	/// Storage: `System::Account` (r:1 w:1)
+	/// Proof: `System::Account` (`max_values`: None, `max_size`: Some(128), added: 2603, mode: `MaxEncodedLen`)
 	fn claim_commission() -> Weight {
 		// Proof Size summary in bytes:
 		//  Measured:  `968`
 		//  Estimated: `3685`
-		// Minimum execution time: 66_400_000 picoseconds.
-		Weight::from_parts(67_707_000, 3685)
+		// Minimum execution time: 67_931_000 picoseconds.
+		Weight::from_parts(72_202_000, 3685)
+			.saturating_add(RocksDbWeight::get().reads(4_u64))
+			.saturating_add(RocksDbWeight::get().writes(2_u64))
+	}
+	/// Storage: `NominationPools::BondedPools` (r:1 w:0)
+	/// Proof: `NominationPools::BondedPools` (`max_values`: None, `max_size`: Some(220), added: 2695, mode: `MaxEncodedLen`)
+	/// Storage: `Balances::Freezes` (r:1 w:1)
+	/// Proof: `Balances::Freezes` (`max_values`: None, `max_size`: Some(67), added: 2542, mode: `MaxEncodedLen`)
+	/// Storage: `System::Account` (r:1 w:1)
+	/// Proof: `System::Account` (`max_values`: None, `max_size`: Some(128), added: 2603, mode: `MaxEncodedLen`)
+	/// Storage: `Balances::Locks` (r:1 w:0)
+	/// Proof: `Balances::Locks` (`max_values`: None, `max_size`: Some(1299), added: 3774, mode: `MaxEncodedLen`)
+	fn adjust_pool_deposit() -> Weight {
+		// Proof Size summary in bytes:
+		//  Measured:  `900`
+		//  Estimated: `4764`
+		// Minimum execution time: 72_783_000 picoseconds.
+		Weight::from_parts(75_841_000, 4764)
 			.saturating_add(RocksDbWeight::get().reads(4_u64))
 			.saturating_add(RocksDbWeight::get().writes(2_u64))
 	}
diff --git a/substrate/frame/nomination-pools/test-staking/Cargo.toml b/substrate/frame/nomination-pools/test-staking/Cargo.toml
index 70117daa60a7aebe64cb87c84c291fa12f979a87..a44d885d653223b912261a0cef39340d41d3d6ce 100644
--- a/substrate/frame/nomination-pools/test-staking/Cargo.toml
+++ b/substrate/frame/nomination-pools/test-staking/Cargo.toml
@@ -1,11 +1,11 @@
 [package]
 name = "pallet-nomination-pools-test-staking"
 version = "1.0.0"
-authors = ["Parity Technologies <admin@parity.io>"]
-edition = "2021"
+authors.workspace = true
+edition.workspace = true
 license = "Apache-2.0"
 homepage = "https://substrate.io"
-repository = "https://github.com/paritytech/substrate/"
+repository.workspace = true
 description = "FRAME nomination pools pallet tests with the staking pallet"
 publish = false
 
diff --git a/substrate/frame/nomination-pools/test-staking/src/mock.rs b/substrate/frame/nomination-pools/test-staking/src/mock.rs
index 02c253e62c018914687467b3a55d2e317f6bf6d7..54f578f861e87085902573dabd7439c7b1be850e 100644
--- a/substrate/frame/nomination-pools/test-staking/src/mock.rs
+++ b/substrate/frame/nomination-pools/test-staking/src/mock.rs
@@ -85,8 +85,8 @@ impl pallet_balances::Config for Runtime {
 	type ExistentialDeposit = ExistentialDeposit;
 	type AccountStore = System;
 	type WeightInfo = ();
-	type FreezeIdentifier = ();
-	type MaxFreezes = ();
+	type FreezeIdentifier = RuntimeFreezeReason;
+	type MaxFreezes = ConstU32<1>;
 	type RuntimeHoldReason = ();
 	type MaxHolds = ();
 }
@@ -174,6 +174,7 @@ impl pallet_nomination_pools::Config for Runtime {
 	type RuntimeEvent = RuntimeEvent;
 	type WeightInfo = ();
 	type Currency = Balances;
+	type RuntimeFreezeReason = RuntimeFreezeReason;
 	type RewardCounter = FixedU128;
 	type BalanceToU256 = BalanceToU256;
 	type U256ToBalance = U256ToBalance;
@@ -195,7 +196,7 @@ frame_support::construct_runtime!(
 		Balances: pallet_balances::{Pallet, Call, Storage, Config<T>, Event<T>},
 		Staking: pallet_staking::{Pallet, Call, Config<T>, Storage, Event<T>},
 		VoterList: pallet_bags_list::<Instance1>::{Pallet, Call, Storage, Event<T>},
-		Pools: pallet_nomination_pools::{Pallet, Call, Storage, Event<T>},
+		Pools: pallet_nomination_pools::{Pallet, Call, Storage, Event<T>, FreezeReason},
 	}
 );
 
diff --git a/substrate/frame/offences/Cargo.toml b/substrate/frame/offences/Cargo.toml
index 49a9db38a8e1a3ec5d1c33983e2501e9ad8a29c9..2cfbfe6b5d0a1a5822cdd4cc133356c60078a5fc 100644
--- a/substrate/frame/offences/Cargo.toml
+++ b/substrate/frame/offences/Cargo.toml
@@ -1,11 +1,11 @@
 [package]
 name = "pallet-offences"
 version = "4.0.0-dev"
-authors = ["Parity Technologies <admin@parity.io>"]
-edition = "2021"
+authors.workspace = true
+edition.workspace = true
 license = "Apache-2.0"
 homepage = "https://substrate.io"
-repository = "https://github.com/paritytech/substrate/"
+repository.workspace = true
 description = "FRAME offences pallet"
 readme = "README.md"
 
@@ -16,7 +16,7 @@ targets = ["x86_64-unknown-linux-gnu"]
 codec = { package = "parity-scale-codec", version = "3.6.1", default-features = false, features = ["derive"] }
 log = { version = "0.4.17", default-features = false }
 scale-info = { version = "2.5.0", default-features = false, features = ["derive"] }
-serde = { version = "1.0.163", optional = true }
+serde = { version = "1.0.188", optional = true }
 frame-support = { path = "../support", default-features = false}
 frame-system = { path = "../system", default-features = false}
 pallet-balances = { path = "../balances", default-features = false}
diff --git a/substrate/frame/offences/README.md b/substrate/frame/offences/README.md
index 454c7effaf36cc599516feb5d047606415ee68d5..e7cf302fb8a0e821c18bb90414d789b456b690e4 100644
--- a/substrate/frame/offences/README.md
+++ b/substrate/frame/offences/README.md
@@ -2,4 +2,4 @@
 
 Tracks reported offences
 
-License: Apache-2.0
\ No newline at end of file
+License: Apache-2.0
diff --git a/substrate/frame/offences/benchmarking/Cargo.toml b/substrate/frame/offences/benchmarking/Cargo.toml
index 91425154106e0df4179fbc2f65ac53c48ad6c711..141ea0cb4662951622df320228c893ddf4b4ab2b 100644
--- a/substrate/frame/offences/benchmarking/Cargo.toml
+++ b/substrate/frame/offences/benchmarking/Cargo.toml
@@ -1,11 +1,11 @@
 [package]
 name = "pallet-offences-benchmarking"
 version = "4.0.0-dev"
-authors = ["Parity Technologies <admin@parity.io>"]
-edition = "2021"
+authors.workspace = true
+edition.workspace = true
 license = "Apache-2.0"
 homepage = "https://substrate.io"
-repository = "https://github.com/paritytech/substrate/"
+repository.workspace = true
 description = "FRAME offences pallet benchmarking"
 readme = "README.md"
 
diff --git a/substrate/frame/offences/benchmarking/README.md b/substrate/frame/offences/benchmarking/README.md
index cbfe91d73a6a7cc5118f4e56a806f4c766c426d1..95892a8f344fb30048f44f6590f88a005d7db0e5 100644
--- a/substrate/frame/offences/benchmarking/README.md
+++ b/substrate/frame/offences/benchmarking/README.md
@@ -1,3 +1,3 @@
 Offences pallet benchmarking.
 
-License: Apache-2.0
\ No newline at end of file
+License: Apache-2.0
diff --git a/substrate/frame/offences/src/migration.rs b/substrate/frame/offences/src/migration.rs
index 3c0d243a55d98d4e6b47601def317939d03e40cc..3b5cf3ce926952df21248ea5b35271d6596a554b 100644
--- a/substrate/frame/offences/src/migration.rs
+++ b/substrate/frame/offences/src/migration.rs
@@ -17,10 +17,9 @@
 
 use super::{Config, Kind, OffenceDetails, Pallet, Perbill, SessionIndex, LOG_TARGET};
 use frame_support::{
-	dispatch::GetStorageVersion,
 	pallet_prelude::ValueQuery,
 	storage_alias,
-	traits::{Get, OnRuntimeUpgrade},
+	traits::{Get, GetStorageVersion, OnRuntimeUpgrade},
 	weights::Weight,
 	Twox64Concat,
 };
diff --git a/substrate/frame/paged-list/Cargo.toml b/substrate/frame/paged-list/Cargo.toml
index a145ef306cfb38c7e613427bc95722c6a87b9c46..eee099fff5f062b54085094050f55990018a7890 100644
--- a/substrate/frame/paged-list/Cargo.toml
+++ b/substrate/frame/paged-list/Cargo.toml
@@ -2,18 +2,18 @@
 name = "pallet-paged-list"
 version = "0.1.0"
 description = "FRAME pallet that provides a paged list data structure."
-authors = ["Parity Technologies <admin@parity.io>"]
+authors.workspace = true
 homepage = "https://substrate.io"
-edition = "2021"
+edition.workspace = true
 license = "Apache-2.0"
-repository = "https://github.com/paritytech/substrate"
+repository.workspace = true
 
 [package.metadata.docs.rs]
 targets = ["x86_64-unknown-linux-gnu"]
 
 [dependencies]
 codec = { package = "parity-scale-codec", version = "3.0.0", default-features = false, features = [ "derive"] }
-docify = "0.2.1"
+docify = "0.2.4"
 scale-info = { version = "2.0.0", default-features = false, features = ["derive"] }
 
 frame-benchmarking = { path = "../benchmarking", default-features = false, optional = true}
diff --git a/substrate/frame/paged-list/fuzzer/Cargo.toml b/substrate/frame/paged-list/fuzzer/Cargo.toml
index f78247f2abe53d7a21f6384f4ca4195aa3cf654a..d96c0348cf43c44d9e8617833fff64a806769c0a 100644
--- a/substrate/frame/paged-list/fuzzer/Cargo.toml
+++ b/substrate/frame/paged-list/fuzzer/Cargo.toml
@@ -1,16 +1,16 @@
 [package]
 name = "pallet-paged-list-fuzzer"
 version = "0.1.0"
-authors = ["Parity Technologies <admin@parity.io>"]
-edition = "2021"
+authors.workspace = true
+edition.workspace = true
 license = "Apache-2.0"
 homepage = "https://substrate.io"
-repository = "https://github.com/paritytech/substrate/"
+repository.workspace = true
 description = "Fuzz storage types of pallet-paged-list"
 publish = false
 
 [[bin]]
-name = "pallet-paged-list"
+name = "pallet-paged-list-fuzzer"
 path = "src/paged_list.rs"
 
 [dependencies]
diff --git a/substrate/frame/paged-list/src/paged_list.rs b/substrate/frame/paged-list/src/paged_list.rs
index 3597c3dea682313f0b56c2ae11bdfa4a85ccfebc..beea8ecc64409f9f199a94b1f8c3e0a2782e4a11 100644
--- a/substrate/frame/paged-list/src/paged_list.rs
+++ b/substrate/frame/paged-list/src/paged_list.rs
@@ -53,7 +53,7 @@ pub type ValueIndex = u32;
 /// [`Page`]s.
 ///
 /// Each [`Page`] holds at most `ValuesPerNewPage` values in its `values` vector. The last page is
-/// the only one that could have less than `ValuesPerNewPage` values.  
+/// the only one that could have less than `ValuesPerNewPage` values.
 /// **Iteration** happens by starting
 /// at [`first_page`][StoragePagedListMeta::first_page]/
 /// [`first_value_offset`][StoragePagedListMeta::first_value_offset] and incrementing these indices
@@ -373,11 +373,11 @@ where
 /// that are completely useless for prefix calculation.
 struct StoragePagedListPrefix<Prefix>(PhantomData<Prefix>);
 
-impl<Prefix> frame_support::storage::StoragePrefixedContainer for StoragePagedListPrefix<Prefix>
+impl<Prefix> StoragePrefixedContainer for StoragePagedListPrefix<Prefix>
 where
 	Prefix: StorageInstance,
 {
-	fn module_prefix() -> &'static [u8] {
+	fn pallet_prefix() -> &'static [u8] {
 		Prefix::pallet_prefix().as_bytes()
 	}
 
@@ -386,15 +386,15 @@ where
 	}
 }
 
-impl<Prefix, Value, ValuesPerNewPage> frame_support::storage::StoragePrefixedContainer
+impl<Prefix, Value, ValuesPerNewPage> StoragePrefixedContainer
 	for StoragePagedList<Prefix, Value, ValuesPerNewPage>
 where
 	Prefix: StorageInstance,
 	Value: FullCodec,
 	ValuesPerNewPage: Get<u32>,
 {
-	fn module_prefix() -> &'static [u8] {
-		StoragePagedListPrefix::<Prefix>::module_prefix()
+	fn pallet_prefix() -> &'static [u8] {
+		StoragePagedListPrefix::<Prefix>::pallet_prefix()
 	}
 
 	fn storage_prefix() -> &'static [u8] {
diff --git a/substrate/frame/preimage/Cargo.toml b/substrate/frame/preimage/Cargo.toml
index e9588887ac8667d3210862ce5891ed3707fc8580..e56110c1eaea8b75aa634fe9a61b68876fd6f6ec 100644
--- a/substrate/frame/preimage/Cargo.toml
+++ b/substrate/frame/preimage/Cargo.toml
@@ -1,11 +1,11 @@
 [package]
 name = "pallet-preimage"
 version = "4.0.0-dev"
-authors = ["Parity Technologies <admin@parity.io>"]
-edition = "2021"
+authors.workspace = true
+edition.workspace = true
 license = "Apache-2.0"
 homepage = "https://substrate.io"
-repository = "https://github.com/paritytech/substrate/"
+repository.workspace = true
 description = "FRAME pallet for storing preimages of hashes"
 
 [dependencies]
diff --git a/substrate/frame/preimage/src/benchmarking.rs b/substrate/frame/preimage/src/benchmarking.rs
index b719c28be641bb3d57086798e1cd694c826dc317..d0c3404f40a911cf32d620858b97652b242f2be8 100644
--- a/substrate/frame/preimage/src/benchmarking.rs
+++ b/substrate/frame/preimage/src/benchmarking.rs
@@ -18,7 +18,7 @@
 //! Preimage pallet benchmarking.
 
 use super::*;
-use frame_benchmarking::v1::{account, benchmarks, whitelist_account, BenchmarkError};
+use frame_benchmarking::v1::{account, benchmarks, whitelisted_caller, BenchmarkError};
 use frame_support::assert_ok;
 use frame_system::RawOrigin;
 use sp_runtime::traits::Bounded;
@@ -26,11 +26,9 @@ use sp_std::{prelude::*, vec};
 
 use crate::Pallet as Preimage;
 
-const SEED: u32 = 0;
-
-fn funded_account<T: Config>(name: &'static str, index: u32) -> T::AccountId {
-	let caller: T::AccountId = account(name, index, SEED);
-	T::Currency::make_free_balance_be(&caller, BalanceOf::<T>::max_value());
+fn funded_account<T: Config>() -> T::AccountId {
+	let caller: T::AccountId = whitelisted_caller();
+	T::Currency::make_free_balance_be(&caller, BalanceOf::<T>::max_value() / 2u32.into());
 	caller
 }
 
@@ -49,8 +47,7 @@ benchmarks! {
 	// Expensive note - will reserve.
 	note_preimage {
 		let s in 0 .. MAX_SIZE;
-		let caller = funded_account::<T>("caller", 0);
-		whitelist_account!(caller);
+		let caller = funded_account::<T>();
 		let (preimage, hash) = sized_preimage_and_hash::<T>(s);
 	}: _(RawOrigin::Signed(caller), preimage)
 	verify {
@@ -59,8 +56,7 @@ benchmarks! {
 	// Cheap note - will not reserve since it was requested.
 	note_requested_preimage {
 		let s in 0 .. MAX_SIZE;
-		let caller = funded_account::<T>("caller", 0);
-		whitelist_account!(caller);
+		let caller = funded_account::<T>();
 		let (preimage, hash) = sized_preimage_and_hash::<T>(s);
 		assert_ok!(Preimage::<T>::request_preimage(
 			T::ManagerOrigin::try_successful_origin()
@@ -89,8 +85,7 @@ benchmarks! {
 
 	// Expensive unnote - will unreserve.
 	unnote_preimage {
-		let caller = funded_account::<T>("caller", 0);
-		whitelist_account!(caller);
+		let caller = funded_account::<T>();
 		let (preimage, hash) = preimage_and_hash::<T>();
 		assert_ok!(Preimage::<T>::note_preimage(RawOrigin::Signed(caller.clone()).into(), preimage));
 	}: _(RawOrigin::Signed(caller), hash)
@@ -115,16 +110,15 @@ benchmarks! {
 	// Expensive request - will unreserve the noter's deposit.
 	request_preimage {
 		let (preimage, hash) = preimage_and_hash::<T>();
-		let noter = funded_account::<T>("noter", 0);
-		whitelist_account!(noter);
+		let noter = funded_account::<T>();
 		assert_ok!(Preimage::<T>::note_preimage(RawOrigin::Signed(noter.clone()).into(), preimage));
 	}: _<T::RuntimeOrigin>(
 		T::ManagerOrigin::try_successful_origin().map_err(|_| BenchmarkError::Weightless)?,
 		hash
 	) verify {
-		let deposit = T::BaseDeposit::get() + T::ByteDeposit::get() * MAX_SIZE.into();
-		let s = RequestStatus::Requested { deposit: Some((noter, deposit)), count: 1, len: Some(MAX_SIZE) };
-		assert_eq!(StatusFor::<T>::get(&hash), Some(s));
+		let ticket = TicketOf::<T>::new(&noter, Footprint { count: 1, size: MAX_SIZE as u64 }).unwrap();
+		let s = RequestStatus::Requested { maybe_ticket: Some((noter, ticket)), count: 1, maybe_len: Some(MAX_SIZE) };
+		assert_eq!(RequestStatusFor::<T>::get(&hash), Some(s));
 	}
 	// Cheap request - would unreserve the deposit but none was held.
 	request_no_deposit_preimage {
@@ -138,8 +132,8 @@ benchmarks! {
 		T::ManagerOrigin::try_successful_origin().map_err(|_| BenchmarkError::Weightless)?,
 		hash
 	) verify {
-		let s = RequestStatus::Requested { deposit: None, count: 2, len: Some(MAX_SIZE) };
-		assert_eq!(StatusFor::<T>::get(&hash), Some(s));
+		let s = RequestStatus::Requested { maybe_ticket: None, count: 2, maybe_len: Some(MAX_SIZE) };
+		assert_eq!(RequestStatusFor::<T>::get(&hash), Some(s));
 	}
 	// Cheap request - the preimage is not yet noted, so deposit to unreserve.
 	request_unnoted_preimage {
@@ -148,8 +142,8 @@ benchmarks! {
 		T::ManagerOrigin::try_successful_origin().map_err(|_| BenchmarkError::Weightless)?,
 		hash
 	) verify {
-		let s = RequestStatus::Requested { deposit: None, count: 1, len: None };
-		assert_eq!(StatusFor::<T>::get(&hash), Some(s));
+		let s = RequestStatus::Requested { maybe_ticket: None, count: 1, maybe_len: None };
+		assert_eq!(RequestStatusFor::<T>::get(&hash), Some(s));
 	}
 	// Cheap request - the preimage is already requested, so just a counter bump.
 	request_requested_preimage {
@@ -163,8 +157,8 @@ benchmarks! {
 		T::ManagerOrigin::try_successful_origin().map_err(|_| BenchmarkError::Weightless)?,
 		hash
 	) verify {
-		let s = RequestStatus::Requested { deposit: None, count: 2, len: None };
-		assert_eq!(StatusFor::<T>::get(&hash), Some(s));
+		let s = RequestStatus::Requested { maybe_ticket: None, count: 2, maybe_len: None };
+		assert_eq!(RequestStatusFor::<T>::get(&hash), Some(s));
 	}
 
 	// Expensive unrequest - last reference and it's noted, so will destroy the preimage.
@@ -184,7 +178,7 @@ benchmarks! {
 		T::ManagerOrigin::try_successful_origin().map_err(|_| BenchmarkError::Weightless)?,
 		hash
 	) verify {
-		assert_eq!(StatusFor::<T>::get(&hash), None);
+		assert_eq!(RequestStatusFor::<T>::get(&hash), None);
 	}
 	// Cheap unrequest - last reference, but it's not noted.
 	unrequest_unnoted_preimage {
@@ -198,7 +192,7 @@ benchmarks! {
 		T::ManagerOrigin::try_successful_origin().map_err(|_| BenchmarkError::Weightless)?,
 		hash
 	) verify {
-		assert_eq!(StatusFor::<T>::get(&hash), None);
+		assert_eq!(RequestStatusFor::<T>::get(&hash), None);
 	}
 	// Cheap unrequest - not the last reference.
 	unrequest_multi_referenced_preimage {
@@ -217,9 +211,38 @@ benchmarks! {
 		T::ManagerOrigin::try_successful_origin().map_err(|_| BenchmarkError::Weightless)?,
 		hash
 	) verify {
-		let s = RequestStatus::Requested { deposit: None, count: 1, len: None };
-		assert_eq!(StatusFor::<T>::get(&hash), Some(s));
+		let s = RequestStatus::Requested { maybe_ticket: None, count: 1, maybe_len: None };
+		assert_eq!(RequestStatusFor::<T>::get(&hash), Some(s));
+	}
+
+	ensure_updated {
+		let n in 1..MAX_HASH_UPGRADE_BULK_COUNT;
+
+		let caller = funded_account::<T>();
+		let hashes = (0..n).map(|i| insert_old_unrequested::<T>(i)).collect::<Vec<_>>();
+	}: _(RawOrigin::Signed(caller), hashes)
+	verify {
+		assert_eq!(RequestStatusFor::<T>::iter_keys().count(), n as usize);
+		#[allow(deprecated)]
+		let c = StatusFor::<T>::iter_keys().count();
+		assert_eq!(c, 0);
 	}
 
 	impl_benchmark_test_suite!(Preimage, crate::mock::new_test_ext(), crate::mock::Test);
 }
+
+fn insert_old_unrequested<T: Config>(s: u32) -> <T as frame_system::Config>::Hash {
+	let acc = account("old", s, 0);
+	T::Currency::make_free_balance_be(&acc, BalanceOf::<T>::max_value() / 2u32.into());
+
+	// The preimage size does not matter here as it is not touched.
+	let preimage = s.to_le_bytes();
+	let hash = <T as frame_system::Config>::Hashing::hash(&preimage[..]);
+
+	#[allow(deprecated)]
+	StatusFor::<T>::insert(
+		&hash,
+		OldRequestStatus::Unrequested { deposit: (acc, 123u32.into()), len: preimage.len() as u32 },
+	);
+	hash
+}
diff --git a/substrate/frame/preimage/src/lib.rs b/substrate/frame/preimage/src/lib.rs
index 5ab1e7643b2e7150c1a2f166f4ffcabf69fef882..e344bdfe2d8feff5a25ed686d7301f462fa41189 100644
--- a/substrate/frame/preimage/src/lib.rs
+++ b/substrate/frame/preimage/src/lib.rs
@@ -37,7 +37,10 @@ mod mock;
 mod tests;
 pub mod weights;
 
-use sp_runtime::traits::{BadOrigin, Hash, Saturating};
+use sp_runtime::{
+	traits::{BadOrigin, Hash, Saturating},
+	Perbill,
+};
 use sp_std::{borrow::Cow, prelude::*};
 
 use codec::{Decode, Encode, MaxEncodedLen};
@@ -46,7 +49,7 @@ use frame_support::{
 	ensure,
 	pallet_prelude::Get,
 	traits::{
-		Currency, Defensive, FetchResult, Hash as PreimageHash, PreimageProvider,
+		Consideration, Currency, Defensive, FetchResult, Footprint, PreimageProvider,
 		PreimageRecipient, QueryPreimage, ReservableCurrency, StorePreimage,
 	},
 	BoundedSlice, BoundedVec,
@@ -61,7 +64,7 @@ pub use pallet::*;
 
 /// A type to note whether a preimage is owned by a user or the system.
 #[derive(Clone, Eq, PartialEq, Encode, Decode, TypeInfo, MaxEncodedLen, RuntimeDebug)]
-pub enum RequestStatus<AccountId, Balance> {
+pub enum OldRequestStatus<AccountId, Balance> {
 	/// The associated preimage has not yet been requested by the system. The given deposit (if
 	/// some) is being held until either it becomes requested or the user retracts the preimage.
 	Unrequested { deposit: (AccountId, Balance), len: u32 },
@@ -71,13 +74,31 @@ pub enum RequestStatus<AccountId, Balance> {
 	Requested { deposit: Option<(AccountId, Balance)>, count: u32, len: Option<u32> },
 }
 
+/// A type to note whether a preimage is owned by a user or the system.
+#[derive(Clone, Eq, PartialEq, Encode, Decode, TypeInfo, MaxEncodedLen, RuntimeDebug)]
+pub enum RequestStatus<AccountId, Ticket> {
+	/// The associated preimage has not yet been requested by the system. The given deposit (if
+	/// some) is being held until either it becomes requested or the user retracts the preimage.
+	Unrequested { ticket: (AccountId, Ticket), len: u32 },
+	/// There are a non-zero number of outstanding requests for this hash by this chain. If there
+	/// is a preimage registered, then `len` is `Some` and it may be removed iff this counter
+	/// becomes zero.
+	Requested { maybe_ticket: Option<(AccountId, Ticket)>, count: u32, maybe_len: Option<u32> },
+}
+
 type BalanceOf<T> =
 	<<T as Config>::Currency as Currency<<T as frame_system::Config>::AccountId>>::Balance;
+type TicketOf<T> = <T as Config>::Consideration;
 
 /// Maximum size of preimage we can store is 4mb.
 const MAX_SIZE: u32 = 4 * 1024 * 1024;
+/// Hard-limit on the number of hashes that can be passed to `ensure_updated`.
+///
+/// Exists only for benchmarking purposes.
+pub const MAX_HASH_UPGRADE_BULK_COUNT: u32 = 1024;
 
 #[frame_support::pallet]
+#[allow(deprecated)]
 pub mod pallet {
 	use super::*;
 
@@ -93,17 +114,15 @@ pub mod pallet {
 		type WeightInfo: weights::WeightInfo;
 
 		/// Currency type for this pallet.
+		// TODO#1569: Remove.
 		type Currency: ReservableCurrency<Self::AccountId>;
 
 		/// An origin that can request a preimage be placed on-chain without a deposit or fee, or
 		/// manage existing preimages.
 		type ManagerOrigin: EnsureOrigin<Self::RuntimeOrigin>;
 
-		/// The base deposit for placing a preimage on chain.
-		type BaseDeposit: Get<BalanceOf<Self>>;
-
-		/// The per-byte deposit for placing a preimage on chain.
-		type ByteDeposit: Get<BalanceOf<Self>>;
+		/// A means of providing some cost while data is stored on-chain.
+		type Consideration: Consideration<Self::AccountId>;
 	}
 
 	#[pallet::pallet]
@@ -135,18 +154,35 @@ pub mod pallet {
 		Requested,
 		/// The preimage request cannot be removed since no outstanding requests exist.
 		NotRequested,
+		/// More than `MAX_HASH_UPGRADE_BULK_COUNT` hashes were requested to be upgraded at once.
+		TooMany,
+		/// Too few hashes were requested to be upgraded (i.e. zero).
+		TooFew,
+	}
+
+	/// A reason for this pallet placing a hold on funds.
+	#[pallet::composite_enum]
+	pub enum HoldReason {
+		/// The funds are held as storage deposit for a preimage.
+		Preimage,
 	}
 
 	/// The request status of a given hash.
+	#[deprecated = "RequestStatusFor"]
 	#[pallet::storage]
 	pub(super) type StatusFor<T: Config> =
-		StorageMap<_, Identity, T::Hash, RequestStatus<T::AccountId, BalanceOf<T>>>;
+		StorageMap<_, Identity, T::Hash, OldRequestStatus<T::AccountId, BalanceOf<T>>>;
+
+	/// The request status of a given hash.
+	#[pallet::storage]
+	pub(super) type RequestStatusFor<T: Config> =
+		StorageMap<_, Identity, T::Hash, RequestStatus<T::AccountId, TicketOf<T>>>;
 
 	#[pallet::storage]
 	pub(super) type PreimageFor<T: Config> =
 		StorageMap<_, Identity, (T::Hash, u32), BoundedVec<u8, ConstU32<MAX_SIZE>>>;
 
-	#[pallet::call]
+	#[pallet::call(weight = T::WeightInfo)]
 	impl<T: Config> Pallet<T> {
 		/// Register a preimage on-chain.
 		///
@@ -173,7 +209,6 @@ pub mod pallet {
 		/// - `hash`: The hash of the preimage to be removed from the store.
 		/// - `len`: The length of the preimage of `hash`.
 		#[pallet::call_index(1)]
-		#[pallet::weight(T::WeightInfo::unnote_preimage())]
 		pub fn unnote_preimage(origin: OriginFor<T>, hash: T::Hash) -> DispatchResult {
 			let maybe_sender = Self::ensure_signed_or_manager(origin)?;
 			Self::do_unnote_preimage(&hash, maybe_sender)
@@ -184,7 +219,6 @@ pub mod pallet {
 		/// If the preimage requests has already been provided on-chain, we unreserve any deposit
 		/// a user may have paid, and take the control of the preimage out of their hands.
 		#[pallet::call_index(2)]
-		#[pallet::weight(T::WeightInfo::request_preimage())]
 		pub fn request_preimage(origin: OriginFor<T>, hash: T::Hash) -> DispatchResult {
 			T::ManagerOrigin::ensure_origin(origin)?;
 			Self::do_request_preimage(&hash);
@@ -195,15 +229,81 @@ pub mod pallet {
 		///
 		/// NOTE: THIS MUST NOT BE CALLED ON `hash` MORE TIMES THAN `request_preimage`.
 		#[pallet::call_index(3)]
-		#[pallet::weight(T::WeightInfo::unrequest_preimage())]
 		pub fn unrequest_preimage(origin: OriginFor<T>, hash: T::Hash) -> DispatchResult {
 			T::ManagerOrigin::ensure_origin(origin)?;
 			Self::do_unrequest_preimage(&hash)
 		}
+
+		/// Ensure that the a bulk of pre-images is upgraded.
+		///
+		/// The caller pays no fee if at least 90% of pre-images were successfully updated.
+		#[pallet::call_index(4)]
+		#[pallet::weight(T::WeightInfo::ensure_updated(hashes.len() as u32))]
+		pub fn ensure_updated(
+			origin: OriginFor<T>,
+			hashes: Vec<T::Hash>,
+		) -> DispatchResultWithPostInfo {
+			ensure_signed(origin)?;
+			ensure!(hashes.len() > 0, Error::<T>::TooFew);
+			ensure!(hashes.len() <= MAX_HASH_UPGRADE_BULK_COUNT as usize, Error::<T>::TooMany);
+
+			let updated = hashes.iter().map(Self::do_ensure_updated).filter(|b| *b).count() as u32;
+			let ratio = Perbill::from_rational(updated, hashes.len() as u32);
+
+			let pays: Pays = (ratio < Perbill::from_percent(90)).into();
+			Ok(pays.into())
+		}
 	}
 }
 
 impl<T: Config> Pallet<T> {
+	fn do_ensure_updated(h: &T::Hash) -> bool {
+		#[allow(deprecated)]
+		let r = match StatusFor::<T>::take(h) {
+			Some(r) => r,
+			None => return false,
+		};
+		let n = match r {
+			OldRequestStatus::Unrequested { deposit: (who, amount), len } => {
+				// unreserve deposit
+				T::Currency::unreserve(&who, amount);
+				// take consideration
+				let Ok(ticket) =
+					T::Consideration::new(&who, Footprint::from_parts(1, len as usize))
+						.defensive_proof("Unexpected inability to take deposit after unreserved")
+				else {
+					return true
+				};
+				RequestStatus::Unrequested { ticket: (who, ticket), len }
+			},
+			OldRequestStatus::Requested { deposit: maybe_deposit, count, len: maybe_len } => {
+				let maybe_ticket = if let Some((who, deposit)) = maybe_deposit {
+					// unreserve deposit
+					T::Currency::unreserve(&who, deposit);
+					// take consideration
+					if let Some(len) = maybe_len {
+						let Ok(ticket) =
+							T::Consideration::new(&who, Footprint::from_parts(1, len as usize))
+								.defensive_proof(
+									"Unexpected inability to take deposit after unreserved",
+								)
+						else {
+							return true
+						};
+						Some((who, ticket))
+					} else {
+						None
+					}
+				} else {
+					None
+				};
+				RequestStatus::Requested { maybe_ticket, count, maybe_len }
+			},
+		};
+		RequestStatusFor::<T>::insert(h, n);
+		true
+	}
+
 	/// Ensure that the origin is either the `ManagerOrigin` or a signed origin.
 	fn ensure_signed_or_manager(
 		origin: T::RuntimeOrigin,
@@ -230,26 +330,29 @@ impl<T: Config> Pallet<T> {
 		let len = preimage.len() as u32;
 		ensure!(len <= MAX_SIZE, Error::<T>::TooBig);
 
+		Self::do_ensure_updated(&hash);
 		// We take a deposit only if there is a provided depositor and the preimage was not
 		// previously requested. This also allows the tx to pay no fee.
-		let status = match (StatusFor::<T>::get(hash), maybe_depositor) {
-			(Some(RequestStatus::Requested { count, deposit, .. }), _) =>
-				RequestStatus::Requested { count, deposit, len: Some(len) },
+		let status = match (RequestStatusFor::<T>::get(hash), maybe_depositor) {
+			(Some(RequestStatus::Requested { maybe_ticket, count, .. }), _) =>
+				RequestStatus::Requested { maybe_ticket, count, maybe_len: Some(len) },
 			(Some(RequestStatus::Unrequested { .. }), Some(_)) =>
 				return Err(Error::<T>::AlreadyNoted.into()),
-			(Some(RequestStatus::Unrequested { len, deposit }), None) =>
-				RequestStatus::Requested { deposit: Some(deposit), count: 1, len: Some(len) },
-			(None, None) => RequestStatus::Requested { count: 1, len: Some(len), deposit: None },
+			(Some(RequestStatus::Unrequested { ticket, len }), None) => RequestStatus::Requested {
+				maybe_ticket: Some(ticket),
+				count: 1,
+				maybe_len: Some(len),
+			},
+			(None, None) =>
+				RequestStatus::Requested { maybe_ticket: None, count: 1, maybe_len: Some(len) },
 			(None, Some(depositor)) => {
-				let length = preimage.len() as u32;
-				let deposit = T::BaseDeposit::get()
-					.saturating_add(T::ByteDeposit::get().saturating_mul(length.into()));
-				T::Currency::reserve(depositor, deposit)?;
-				RequestStatus::Unrequested { deposit: (depositor.clone(), deposit), len }
+				let ticket =
+					T::Consideration::new(depositor, Footprint::from_parts(1, len as usize))?;
+				RequestStatus::Unrequested { ticket: (depositor.clone(), ticket), len }
 			},
 		};
 		let was_requested = matches!(status, RequestStatus::Requested { .. });
-		StatusFor::<T>::insert(hash, status);
+		RequestStatusFor::<T>::insert(hash, status);
 
 		let _ = Self::insert(&hash, preimage)
 			.defensive_proof("Unable to insert. Logic error in `note_bytes`?");
@@ -264,15 +367,19 @@ impl<T: Config> Pallet<T> {
 	// If the preimage already exists before the request is made, the deposit for the preimage is
 	// returned to the user, and removed from their management.
 	fn do_request_preimage(hash: &T::Hash) {
-		let (count, len, deposit) =
-			StatusFor::<T>::get(hash).map_or((1, None, None), |x| match x {
-				RequestStatus::Requested { mut count, len, deposit } => {
+		Self::do_ensure_updated(&hash);
+		let (count, maybe_len, maybe_ticket) =
+			RequestStatusFor::<T>::get(hash).map_or((1, None, None), |x| match x {
+				RequestStatus::Requested { maybe_ticket, mut count, maybe_len } => {
 					count.saturating_inc();
-					(count, len, deposit)
+					(count, maybe_len, maybe_ticket)
 				},
-				RequestStatus::Unrequested { deposit, len } => (1, Some(len), Some(deposit)),
+				RequestStatus::Unrequested { ticket, len } => (1, Some(len), Some(ticket)),
 			});
-		StatusFor::<T>::insert(hash, RequestStatus::Requested { count, len, deposit });
+		RequestStatusFor::<T>::insert(
+			hash,
+			RequestStatus::Requested { maybe_ticket, count, maybe_len },
+		);
 		if count == 1 {
 			Self::deposit_event(Event::Requested { hash: *hash });
 		}
@@ -288,24 +395,25 @@ impl<T: Config> Pallet<T> {
 		hash: &T::Hash,
 		maybe_check_owner: Option<T::AccountId>,
 	) -> DispatchResult {
-		match StatusFor::<T>::get(hash).ok_or(Error::<T>::NotNoted)? {
-			RequestStatus::Requested { deposit: Some((owner, deposit)), count, len } => {
+		Self::do_ensure_updated(&hash);
+		match RequestStatusFor::<T>::get(hash).ok_or(Error::<T>::NotNoted)? {
+			RequestStatus::Requested { maybe_ticket: Some((owner, ticket)), count, maybe_len } => {
 				ensure!(maybe_check_owner.map_or(true, |c| c == owner), Error::<T>::NotAuthorized);
-				T::Currency::unreserve(&owner, deposit);
-				StatusFor::<T>::insert(
+				let _ = ticket.drop(&owner);
+				RequestStatusFor::<T>::insert(
 					hash,
-					RequestStatus::Requested { deposit: None, count, len },
+					RequestStatus::Requested { maybe_ticket: None, count, maybe_len },
 				);
 				Ok(())
 			},
-			RequestStatus::Requested { deposit: None, .. } => {
+			RequestStatus::Requested { maybe_ticket: None, .. } => {
 				ensure!(maybe_check_owner.is_none(), Error::<T>::NotAuthorized);
 				Self::do_unrequest_preimage(hash)
 			},
-			RequestStatus::Unrequested { deposit: (owner, deposit), len } => {
+			RequestStatus::Unrequested { ticket: (owner, ticket), len } => {
 				ensure!(maybe_check_owner.map_or(true, |c| c == owner), Error::<T>::NotAuthorized);
-				T::Currency::unreserve(&owner, deposit);
-				StatusFor::<T>::remove(hash);
+				let _ = ticket.drop(&owner);
+				RequestStatusFor::<T>::remove(hash);
 
 				Self::remove(hash, len);
 				Self::deposit_event(Event::Cleared { hash: *hash });
@@ -316,25 +424,32 @@ impl<T: Config> Pallet<T> {
 
 	/// Clear a preimage request.
 	fn do_unrequest_preimage(hash: &T::Hash) -> DispatchResult {
-		match StatusFor::<T>::get(hash).ok_or(Error::<T>::NotRequested)? {
-			RequestStatus::Requested { mut count, len, deposit } if count > 1 => {
+		Self::do_ensure_updated(&hash);
+		match RequestStatusFor::<T>::get(hash).ok_or(Error::<T>::NotRequested)? {
+			RequestStatus::Requested { mut count, maybe_len, maybe_ticket } if count > 1 => {
 				count.saturating_dec();
-				StatusFor::<T>::insert(hash, RequestStatus::Requested { count, len, deposit });
+				RequestStatusFor::<T>::insert(
+					hash,
+					RequestStatus::Requested { maybe_ticket, count, maybe_len },
+				);
 			},
-			RequestStatus::Requested { count, len, deposit } => {
+			RequestStatus::Requested { count, maybe_len, maybe_ticket } => {
 				debug_assert!(count == 1, "preimage request counter at zero?");
-				match (len, deposit) {
+				match (maybe_len, maybe_ticket) {
 					// Preimage was never noted.
-					(None, _) => StatusFor::<T>::remove(hash),
+					(None, _) => RequestStatusFor::<T>::remove(hash),
 					// Preimage was noted without owner - just remove it.
 					(Some(len), None) => {
 						Self::remove(hash, len);
-						StatusFor::<T>::remove(hash);
+						RequestStatusFor::<T>::remove(hash);
 						Self::deposit_event(Event::Cleared { hash: *hash });
 					},
 					// Preimage was noted with owner - move to unrequested so they can get refund.
-					(Some(len), Some(deposit)) => {
-						StatusFor::<T>::insert(hash, RequestStatus::Unrequested { deposit, len });
+					(Some(len), Some(ticket)) => {
+						RequestStatusFor::<T>::insert(
+							hash,
+							RequestStatus::Unrequested { ticket, len },
+						);
 					},
 				}
 			},
@@ -359,8 +474,10 @@ impl<T: Config> Pallet<T> {
 
 	fn len(hash: &T::Hash) -> Option<u32> {
 		use RequestStatus::*;
-		match StatusFor::<T>::get(hash) {
-			Some(Requested { len: Some(len), .. }) | Some(Unrequested { len, .. }) => Some(len),
+		Self::do_ensure_updated(&hash);
+		match RequestStatusFor::<T>::get(hash) {
+			Some(Requested { maybe_len: Some(len), .. }) | Some(Unrequested { len, .. }) =>
+				Some(len),
 			_ => None,
 		}
 	}
@@ -380,7 +497,8 @@ impl<T: Config> PreimageProvider<T::Hash> for Pallet<T> {
 	}
 
 	fn preimage_requested(hash: &T::Hash) -> bool {
-		matches!(StatusFor::<T>::get(hash), Some(RequestStatus::Requested { .. }))
+		Self::do_ensure_updated(hash);
+		matches!(RequestStatusFor::<T>::get(hash), Some(RequestStatus::Requested { .. }))
 	}
 
 	fn get_preimage(hash: &T::Hash) -> Option<Vec<u8>> {
@@ -413,7 +531,9 @@ impl<T: Config> PreimageRecipient<T::Hash> for Pallet<T> {
 	}
 }
 
-impl<T: Config<Hash = PreimageHash>> QueryPreimage for Pallet<T> {
+impl<T: Config> QueryPreimage for Pallet<T> {
+	type H = T::Hashing;
+
 	fn len(hash: &T::Hash) -> Option<u32> {
 		Pallet::<T>::len(hash)
 	}
@@ -423,7 +543,8 @@ impl<T: Config<Hash = PreimageHash>> QueryPreimage for Pallet<T> {
 	}
 
 	fn is_requested(hash: &T::Hash) -> bool {
-		matches!(StatusFor::<T>::get(hash), Some(RequestStatus::Requested { .. }))
+		Self::do_ensure_updated(&hash);
+		matches!(RequestStatusFor::<T>::get(hash), Some(RequestStatus::Requested { .. }))
 	}
 
 	fn request(hash: &T::Hash) {
@@ -436,7 +557,7 @@ impl<T: Config<Hash = PreimageHash>> QueryPreimage for Pallet<T> {
 	}
 }
 
-impl<T: Config<Hash = PreimageHash>> StorePreimage for Pallet<T> {
+impl<T: Config> StorePreimage for Pallet<T> {
 	const MAX_LENGTH: usize = MAX_SIZE as usize;
 
 	fn note(bytes: Cow<[u8]>) -> Result<T::Hash, DispatchError> {
diff --git a/substrate/frame/preimage/src/migration.rs b/substrate/frame/preimage/src/migration.rs
index 0f3337e39bf50ff742ef8a1d658e86f61939b856..a86109f892a4f5b84b6aa48e89bc869f521bf74c 100644
--- a/substrate/frame/preimage/src/migration.rs
+++ b/substrate/frame/preimage/src/migration.rs
@@ -37,7 +37,7 @@ mod v0 {
 	use super::*;
 
 	#[derive(Clone, Eq, PartialEq, Encode, Decode, TypeInfo, MaxEncodedLen, RuntimeDebug)]
-	pub enum RequestStatus<AccountId, Balance> {
+	pub enum OldRequestStatus<AccountId, Balance> {
 		Unrequested(Option<(AccountId, Balance)>),
 		Requested(u32),
 	}
@@ -55,7 +55,7 @@ mod v0 {
 		Pallet<T>,
 		Identity,
 		<T as frame_system::Config>::Hash,
-		RequestStatus<<T as frame_system::Config>::AccountId, BalanceOf<T>>,
+		OldRequestStatus<<T as frame_system::Config>::AccountId, BalanceOf<T>>,
 	>;
 
 	/// Returns the number of images or `None` if the storage is corrupted.
@@ -127,21 +127,22 @@ pub mod v1 {
 				}
 
 				let status = match status {
-					v0::RequestStatus::Unrequested(deposit) => match deposit {
-						Some(deposit) => RequestStatus::Unrequested { deposit, len },
+					v0::OldRequestStatus::Unrequested(deposit) => match deposit {
+						Some(deposit) => OldRequestStatus::Unrequested { deposit, len },
 						// `None` depositor becomes system-requested.
 						None =>
-							RequestStatus::Requested { deposit: None, count: 1, len: Some(len) },
+							OldRequestStatus::Requested { deposit: None, count: 1, len: Some(len) },
 					},
-					v0::RequestStatus::Requested(count) if count == 0 => {
+					v0::OldRequestStatus::Requested(0) => {
 						log::error!(target: TARGET, "preimage has counter of zero: {:?}", hash);
 						continue
 					},
-					v0::RequestStatus::Requested(count) =>
-						RequestStatus::Requested { deposit: None, count, len: Some(len) },
+					v0::OldRequestStatus::Requested(count) =>
+						OldRequestStatus::Requested { deposit: None, count, len: Some(len) },
 				};
 				log::trace!(target: TARGET, "Moving preimage {:?} with len {}", hash, len);
 
+				#[allow(deprecated)]
 				crate::StatusFor::<T>::insert(hash, status);
 				crate::PreimageFor::<T>::insert(&(hash, len), preimage);
 
@@ -176,6 +177,7 @@ pub mod v1 {
 	pub fn image_count<T: Config>() -> Option<u32> {
 		// Use iter_values() to ensure that the values are decodable.
 		let images = crate::PreimageFor::<T>::iter_values().count() as u32;
+		#[allow(deprecated)]
 		let status = crate::StatusFor::<T>::iter_values().count() as u32;
 
 		if images == status {
@@ -189,6 +191,7 @@ pub mod v1 {
 #[cfg(test)]
 #[cfg(feature = "try-runtime")]
 mod test {
+	#![allow(deprecated)]
 	use super::*;
 	use crate::mock::{Test as T, *};
 
@@ -203,19 +206,19 @@ mod test {
 			// Case 1: Unrequested without deposit
 			let (p, h) = preimage::<T>(128);
 			v0::PreimageFor::<T>::insert(h, p);
-			v0::StatusFor::<T>::insert(h, v0::RequestStatus::Unrequested(None));
+			v0::StatusFor::<T>::insert(h, v0::OldRequestStatus::Unrequested(None));
 			// Case 2: Unrequested with deposit
 			let (p, h) = preimage::<T>(1024);
 			v0::PreimageFor::<T>::insert(h, p);
-			v0::StatusFor::<T>::insert(h, v0::RequestStatus::Unrequested(Some((1, 1))));
+			v0::StatusFor::<T>::insert(h, v0::OldRequestStatus::Unrequested(Some((1, 1))));
 			// Case 3: Requested by 0 (invalid)
 			let (p, h) = preimage::<T>(8192);
 			v0::PreimageFor::<T>::insert(h, p);
-			v0::StatusFor::<T>::insert(h, v0::RequestStatus::Requested(0));
+			v0::StatusFor::<T>::insert(h, v0::OldRequestStatus::Requested(0));
 			// Case 4: Requested by 10
 			let (p, h) = preimage::<T>(65536);
 			v0::PreimageFor::<T>::insert(h, p);
-			v0::StatusFor::<T>::insert(h, v0::RequestStatus::Requested(10));
+			v0::StatusFor::<T>::insert(h, v0::OldRequestStatus::Requested(10));
 
 			assert_eq!(v0::image_count::<T>(), Some(4));
 			assert_eq!(v1::image_count::<T>(), None, "V1 storage should be corrupted");
@@ -234,14 +237,14 @@ mod test {
 			assert_eq!(crate::PreimageFor::<T>::get(&(h, 128)), Some(p));
 			assert_eq!(
 				crate::StatusFor::<T>::get(h),
-				Some(RequestStatus::Requested { deposit: None, count: 1, len: Some(128) })
+				Some(OldRequestStatus::Requested { deposit: None, count: 1, len: Some(128) })
 			);
 			// Case 2: Unrequested with deposit becomes unrequested
 			let (p, h) = preimage::<T>(1024);
 			assert_eq!(crate::PreimageFor::<T>::get(&(h, 1024)), Some(p));
 			assert_eq!(
 				crate::StatusFor::<T>::get(h),
-				Some(RequestStatus::Unrequested { deposit: (1, 1), len: 1024 })
+				Some(OldRequestStatus::Unrequested { deposit: (1, 1), len: 1024 })
 			);
 			// Case 3: Requested by 0 should be skipped
 			let (_, h) = preimage::<T>(8192);
@@ -252,7 +255,7 @@ mod test {
 			assert_eq!(crate::PreimageFor::<T>::get(&(h, 65536)), Some(p));
 			assert_eq!(
 				crate::StatusFor::<T>::get(h),
-				Some(RequestStatus::Requested { deposit: None, count: 10, len: Some(65536) })
+				Some(OldRequestStatus::Requested { deposit: None, count: 10, len: Some(65536) })
 			);
 		});
 	}
diff --git a/substrate/frame/preimage/src/mock.rs b/substrate/frame/preimage/src/mock.rs
index 2fb9f36dec454c85b2e1cfca1b853ec7ac507b20..2e7051a99a497008c8339251975ff66508ff15f3 100644
--- a/substrate/frame/preimage/src/mock.rs
+++ b/substrate/frame/preimage/src/mock.rs
@@ -22,13 +22,13 @@ use super::*;
 use crate as pallet_preimage;
 use frame_support::{
 	ord_parameter_types,
-	traits::{ConstU32, ConstU64, Everything},
+	traits::{fungible::HoldConsideration, ConstU32, ConstU64, Everything},
 	weights::constants::RocksDbWeight,
 };
 use frame_system::EnsureSignedBy;
 use sp_core::H256;
 use sp_runtime::{
-	traits::{BlakeTwo256, IdentityLookup},
+	traits::{BlakeTwo256, Convert, IdentityLookup},
 	BuildStorage,
 };
 
@@ -80,22 +80,28 @@ impl pallet_balances::Config for Test {
 	type MaxReserves = ConstU32<50>;
 	type ReserveIdentifier = [u8; 8];
 	type FreezeIdentifier = ();
-	type MaxFreezes = ();
+	type MaxFreezes = ConstU32<1>;
 	type RuntimeHoldReason = ();
-	type MaxHolds = ();
+	type MaxHolds = ConstU32<2>;
 }
 
 ord_parameter_types! {
 	pub const One: u64 = 1;
 }
 
+pub struct ConvertDeposit;
+impl Convert<Footprint, u64> for ConvertDeposit {
+	fn convert(a: Footprint) -> u64 {
+		a.count * 2 + a.size
+	}
+}
+
 impl Config for Test {
 	type WeightInfo = ();
 	type RuntimeEvent = RuntimeEvent;
 	type Currency = Balances;
 	type ManagerOrigin = EnsureSignedBy<One, u64>;
-	type BaseDeposit = ConstU64<2>;
-	type ByteDeposit = ConstU64<1>;
+	type Consideration = HoldConsideration<u64, Balances, (), ConvertDeposit>;
 }
 
 pub fn new_test_ext() -> sp_io::TestExternalities {
@@ -110,3 +116,20 @@ pub fn new_test_ext() -> sp_io::TestExternalities {
 pub fn hashed(data: impl AsRef<[u8]>) -> H256 {
 	BlakeTwo256::hash(data.as_ref())
 }
+
+/// Insert an un-migrated preimage.
+pub fn insert_old_unrequested<T: Config>(
+	s: u32,
+	acc: T::AccountId,
+) -> <T as frame_system::Config>::Hash {
+	// The preimage size does not matter here as it is not touched.
+	let preimage = s.to_le_bytes();
+	let hash = <T as frame_system::Config>::Hashing::hash(&preimage[..]);
+
+	#[allow(deprecated)]
+	StatusFor::<T>::insert(
+		&hash,
+		OldRequestStatus::Unrequested { deposit: (acc, 123u32.into()), len: preimage.len() as u32 },
+	);
+	hash
+}
diff --git a/substrate/frame/preimage/src/tests.rs b/substrate/frame/preimage/src/tests.rs
index fa621c8f5589e693a10d4c6694af177953375df9..7609ec83e9039a66ce22b1fbcd4c49a591c86187 100644
--- a/substrate/frame/preimage/src/tests.rs
+++ b/substrate/frame/preimage/src/tests.rs
@@ -24,26 +24,32 @@ use crate::mock::*;
 
 use frame_support::{
 	assert_err, assert_noop, assert_ok, assert_storage_noop,
-	traits::{Bounded, BoundedInline, Hash as PreimageHash},
+	traits::{fungible::InspectHold, Bounded, BoundedInline},
 	StorageNoopGuard,
 };
-use pallet_balances::Error as BalancesError;
-use sp_core::{blake2_256, H256};
-use sp_runtime::bounded_vec;
+use sp_runtime::{bounded_vec, TokenError};
 
 /// Returns one `Inline`, `Lookup` and `Legacy` item each with different data and hash.
-pub fn make_bounded_values() -> (Bounded<Vec<u8>>, Bounded<Vec<u8>>, Bounded<Vec<u8>>) {
+pub fn make_bounded_values() -> (
+	Bounded<Vec<u8>, <Test as frame_system::Config>::Hashing>,
+	Bounded<Vec<u8>, <Test as frame_system::Config>::Hashing>,
+	Bounded<Vec<u8>, <Test as frame_system::Config>::Hashing>,
+) {
 	let data: BoundedInline = bounded_vec![1];
-	let inline = Bounded::<Vec<u8>>::Inline(data);
+	let inline = Bounded::<Vec<u8>, <Test as frame_system::Config>::Hashing>::Inline(data);
 
 	let data = vec![1, 2];
-	let hash: H256 = blake2_256(&data[..]).into();
+	let hash = <Test as frame_system::Config>::Hashing::hash(&data[..]).into();
 	let len = data.len() as u32;
-	let lookup = Bounded::<Vec<u8>>::unrequested(hash, len);
+	let lookup =
+		Bounded::<Vec<u8>, <Test as frame_system::Config>::Hashing>::unrequested(hash, len);
 
 	let data = vec![1, 2, 3];
-	let hash: H256 = blake2_256(&data[..]).into();
-	let legacy = Bounded::<Vec<u8>>::Legacy { hash, dummy: Default::default() };
+	let hash = <Test as frame_system::Config>::Hashing::hash(&data[..]).into();
+	let legacy = Bounded::<Vec<u8>, <Test as frame_system::Config>::Hashing>::Legacy {
+		hash,
+		dummy: Default::default(),
+	};
 
 	(inline, lookup, legacy)
 }
@@ -52,7 +58,7 @@ pub fn make_bounded_values() -> (Bounded<Vec<u8>>, Bounded<Vec<u8>>, Bounded<Vec
 fn user_note_preimage_works() {
 	new_test_ext().execute_with(|| {
 		assert_ok!(Preimage::note_preimage(RuntimeOrigin::signed(2), vec![1]));
-		assert_eq!(Balances::reserved_balance(2), 3);
+		assert_eq!(Balances::balance_on_hold(&(), &2), 3);
 		assert_eq!(Balances::free_balance(2), 97);
 
 		let h = hashed([1]);
@@ -61,11 +67,11 @@ fn user_note_preimage_works() {
 
 		assert_noop!(
 			Preimage::note_preimage(RuntimeOrigin::signed(2), vec![1]),
-			Error::<Test>::AlreadyNoted
+			Error::<Test>::AlreadyNoted,
 		);
 		assert_noop!(
 			Preimage::note_preimage(RuntimeOrigin::signed(0), vec![2]),
-			BalancesError::<Test>::InsufficientBalance
+			TokenError::FundsUnavailable,
 		);
 	});
 }
@@ -171,7 +177,7 @@ fn request_note_order_makes_no_difference() {
 		assert_ok!(Preimage::request_preimage(RuntimeOrigin::signed(1), hashed([1])));
 		assert_ok!(Preimage::note_preimage(RuntimeOrigin::signed(2), vec![1]));
 		(
-			StatusFor::<Test>::iter().collect::<Vec<_>>(),
+			RequestStatusFor::<Test>::iter().collect::<Vec<_>>(),
 			PreimageFor::<Test>::iter().collect::<Vec<_>>(),
 		)
 	});
@@ -180,7 +186,7 @@ fn request_note_order_makes_no_difference() {
 		assert_ok!(Preimage::request_preimage(RuntimeOrigin::signed(1), hashed([1])));
 		assert_ok!(Preimage::unnote_preimage(RuntimeOrigin::signed(2), hashed([1])));
 		let other_way = (
-			StatusFor::<Test>::iter().collect::<Vec<_>>(),
+			RequestStatusFor::<Test>::iter().collect::<Vec<_>>(),
 			PreimageFor::<Test>::iter().collect::<Vec<_>>(),
 		);
 		assert_eq!(one_way, other_way);
@@ -207,7 +213,7 @@ fn request_user_note_order_makes_no_difference() {
 		assert_ok!(Preimage::request_preimage(RuntimeOrigin::signed(1), hashed([1])));
 		assert_ok!(Preimage::note_preimage(RuntimeOrigin::signed(2), vec![1]));
 		(
-			StatusFor::<Test>::iter().collect::<Vec<_>>(),
+			RequestStatusFor::<Test>::iter().collect::<Vec<_>>(),
 			PreimageFor::<Test>::iter().collect::<Vec<_>>(),
 		)
 	});
@@ -216,7 +222,7 @@ fn request_user_note_order_makes_no_difference() {
 		assert_ok!(Preimage::request_preimage(RuntimeOrigin::signed(1), hashed([1])));
 		assert_ok!(Preimage::unnote_preimage(RuntimeOrigin::signed(2), hashed([1])));
 		let other_way = (
-			StatusFor::<Test>::iter().collect::<Vec<_>>(),
+			RequestStatusFor::<Test>::iter().collect::<Vec<_>>(),
 			PreimageFor::<Test>::iter().collect::<Vec<_>>(),
 		);
 		assert_eq!(one_way, other_way);
@@ -249,13 +255,14 @@ fn unrequest_preimage_works() {
 fn user_noted_then_requested_preimage_is_refunded_once_only() {
 	new_test_ext().execute_with(|| {
 		assert_ok!(Preimage::note_preimage(RuntimeOrigin::signed(2), vec![1; 3]));
+		assert_eq!(Balances::balance_on_hold(&(), &2), 5);
 		assert_ok!(Preimage::note_preimage(RuntimeOrigin::signed(2), vec![1]));
+		assert_eq!(Balances::balance_on_hold(&(), &2), 8);
 		assert_ok!(Preimage::request_preimage(RuntimeOrigin::signed(1), hashed([1])));
 		assert_ok!(Preimage::unrequest_preimage(RuntimeOrigin::signed(1), hashed([1])));
 		assert_ok!(Preimage::unnote_preimage(RuntimeOrigin::signed(2), hashed([1])));
-		// Still have reserve from `vec[1; 3]`.
-		assert_eq!(Balances::reserved_balance(2), 5);
-		assert_eq!(Balances::free_balance(2), 95);
+		// Still have hold from `vec[1; 3]`.
+		assert_eq!(Balances::balance_on_hold(&(), &2), 5);
 	});
 }
 
@@ -270,7 +277,7 @@ fn noted_preimage_use_correct_map() {
 		assert_eq!(PreimageFor::<Test>::iter().count(), 8);
 
 		// All are present
-		assert_eq!(StatusFor::<Test>::iter().count(), 8);
+		assert_eq!(RequestStatusFor::<Test>::iter().count(), 8);
 
 		// Now start removing them again...
 		for i in 0..7 {
@@ -287,7 +294,7 @@ fn noted_preimage_use_correct_map() {
 		assert_eq!(PreimageFor::<Test>::iter().count(), 0);
 
 		// All are gone
-		assert_eq!(StatusFor::<Test>::iter().count(), 0);
+		assert_eq!(RequestStatusFor::<Test>::iter().count(), 0);
 	});
 }
 
@@ -303,7 +310,7 @@ fn query_and_store_preimage_workflow() {
 		let bound = Preimage::bound(data.clone()).unwrap();
 		let (len, hash) = (bound.len().unwrap(), bound.hash());
 
-		assert_eq!(hash, blake2_256(&encoded).into());
+		assert_eq!(hash, <Test as frame_system::Config>::Hashing::hash(&encoded).into());
 		assert_eq!(bound.len(), Some(len));
 		assert!(bound.lookup_needed(), "Should not be Inlined");
 		assert_eq!(bound.lookup_len(), Some(len));
@@ -327,20 +334,20 @@ fn query_and_store_preimage_workflow() {
 		Preimage::request(&hash);
 		// It is requested thrice.
 		assert!(matches!(
-			StatusFor::<Test>::get(&hash).unwrap(),
+			RequestStatusFor::<Test>::get(&hash).unwrap(),
 			RequestStatus::Requested { count: 3, .. }
 		));
 
 		// It can be realized and decoded correctly.
 		assert_eq!(Preimage::realize::<Vec<u8>>(&bound).unwrap(), (data.clone(), Some(len)));
 		assert!(matches!(
-			StatusFor::<Test>::get(&hash).unwrap(),
+			RequestStatusFor::<Test>::get(&hash).unwrap(),
 			RequestStatus::Requested { count: 2, .. }
 		));
 		// Dropping should unrequest.
 		Preimage::drop(&bound);
 		assert!(matches!(
-			StatusFor::<Test>::get(&hash).unwrap(),
+			RequestStatusFor::<Test>::get(&hash).unwrap(),
 			RequestStatus::Requested { count: 1, .. }
 		));
 
@@ -364,7 +371,7 @@ fn query_preimage_request_works() {
 	new_test_ext().execute_with(|| {
 		let _guard = StorageNoopGuard::default();
 		let data: Vec<u8> = vec![1; 10];
-		let hash: PreimageHash = blake2_256(&data[..]).into();
+		let hash = <Test as frame_system::Config>::Hashing::hash(&data[..]).into();
 
 		// Request the preimage.
 		<Preimage as QueryPreimage>::request(&hash);
@@ -381,7 +388,7 @@ fn query_preimage_request_works() {
 		assert!(<Preimage as QueryPreimage>::len(&hash).is_none());
 		assert_noop!(<Preimage as QueryPreimage>::fetch(&hash, None), DispatchError::Unavailable);
 		// But there is only one entry in the map.
-		assert_eq!(StatusFor::<Test>::iter().count(), 1);
+		assert_eq!(RequestStatusFor::<Test>::iter().count(), 1);
 
 		// Un-request the preimage.
 		<Preimage as QueryPreimage>::unrequest(&hash);
@@ -392,7 +399,7 @@ fn query_preimage_request_works() {
 		// It is not requested anymore.
 		assert!(!<Preimage as QueryPreimage>::is_requested(&hash));
 		// And there is no entry in the map.
-		assert_eq!(StatusFor::<Test>::iter().count(), 0);
+		assert_eq!(RequestStatusFor::<Test>::iter().count(), 0);
 	});
 }
 
@@ -413,7 +420,7 @@ fn query_preimage_hold_and_drop_work() {
 		assert!(<Preimage as QueryPreimage>::is_requested(&legacy.hash()));
 
 		// There are two values requested in total.
-		assert_eq!(StatusFor::<Test>::iter().count(), 2);
+		assert_eq!(RequestStatusFor::<Test>::iter().count(), 2);
 
 		// Cleanup by dropping both.
 		<Preimage as QueryPreimage>::drop(&lookup);
@@ -422,7 +429,7 @@ fn query_preimage_hold_and_drop_work() {
 		assert!(!<Preimage as QueryPreimage>::is_requested(&legacy.hash()));
 
 		// There are no values requested anymore.
-		assert_eq!(StatusFor::<Test>::iter().count(), 0);
+		assert_eq!(RequestStatusFor::<Test>::iter().count(), 0);
 	});
 }
 
@@ -454,7 +461,7 @@ fn store_preimage_basic_works() {
 
 		// Cleanup.
 		<Preimage as StorePreimage>::unnote(&bound.hash());
-		let data_hash = blake2_256(&data);
+		let data_hash = <Test as frame_system::Config>::Hashing::hash(&data);
 		<Preimage as StorePreimage>::unnote(&data_hash.into());
 
 		// No storage changes remain. Checked by `StorageNoopGuard`.
@@ -489,3 +496,27 @@ fn store_preimage_bound_too_large_errors() {
 		assert_ok!(<Preimage as StorePreimage>::bound(data.clone()));
 	});
 }
+
+#[test]
+fn ensure_updated_works() {
+	#![allow(deprecated)]
+	new_test_ext().execute_with(|| {
+		let alice = 2;
+
+		for i in 0..100 {
+			let hashes =
+				(0..100).map(|j| insert_old_unrequested::<Test>(j, alice)).collect::<Vec<_>>();
+			let old = hashes.iter().take(i).cloned().collect::<Vec<_>>();
+			let bad = vec![hashed([0; 32]); 100 - i];
+
+			let hashes = [old.as_slice(), bad.as_slice()].concat();
+			let res = Preimage::ensure_updated(RuntimeOrigin::signed(alice), hashes).unwrap();
+
+			// Alice pays a fee when less than 90% of the hashes are new.
+			assert_eq!(res.pays_fee, (i < 90).into());
+
+			assert_eq!(RequestStatusFor::<Test>::iter().count(), i);
+			assert_eq!(StatusFor::<Test>::iter().count(), 100 - i);
+		}
+	});
+}
diff --git a/substrate/frame/preimage/src/weights.rs b/substrate/frame/preimage/src/weights.rs
index 41e58a1027800b15672da71f7c17b624471c3ebd..c11ab74c1e551a0fcdd6e239a657ab5df0809aad 100644
--- a/substrate/frame/preimage/src/weights.rs
+++ b/substrate/frame/preimage/src/weights.rs
@@ -15,32 +15,29 @@
 // See the License for the specific language governing permissions and
 // limitations under the License.
 
-//! Autogenerated weights for pallet_preimage
+//! Autogenerated weights for `pallet_preimage`
 //!
 //! THIS FILE WAS AUTO-GENERATED USING THE SUBSTRATE BENCHMARK CLI VERSION 4.0.0-dev
-//! DATE: 2023-06-16, STEPS: `50`, REPEAT: `20`, LOW RANGE: `[]`, HIGH RANGE: `[]`
+//! DATE: 2023-09-06, STEPS: `50`, REPEAT: `20`, LOW RANGE: `[]`, HIGH RANGE: `[]`
 //! WORST CASE MAP SIZE: `1000000`
-//! HOSTNAME: `runner-e8ezs4ez-project-145-concurrent-0`, CPU: `Intel(R) Xeon(R) CPU @ 2.60GHz`
-//! EXECUTION: Some(Wasm), WASM-EXECUTION: Compiled, CHAIN: Some("dev"), DB CACHE: 1024
+//! HOSTNAME: `runner-mia4uyug-project-674-concurrent-0`, CPU: `Intel(R) Xeon(R) CPU @ 2.60GHz`
+//! WASM-EXECUTION: `Compiled`, CHAIN: `Some("dev")`, DB CACHE: `1024`
 
 // Executed Command:
-// ./target/production/substrate
+// target/production/substrate-node
 // benchmark
 // pallet
-// --chain=dev
 // --steps=50
 // --repeat=20
-// --pallet=pallet_preimage
-// --no-storage-info
-// --no-median-slopes
-// --no-min-squares
 // --extrinsic=*
-// --execution=wasm
 // --wasm-execution=compiled
 // --heap-pages=4096
-// --output=./frame/preimage/src/weights.rs
-// --header=./HEADER-APACHE2
-// --template=./.maintain/frame-weight-template.hbs
+// --json-file=/builds/parity/mirrors/polkadot-sdk/.git/.artifacts/bench.json
+// --pallet=pallet_preimage
+// --chain=dev
+// --header=./substrate/HEADER-APACHE2
+// --output=./substrate/frame/preimage/src/weights.rs
+// --template=./substrate/.maintain/frame-weight-template.hbs
 
 #![cfg_attr(rustfmt, rustfmt_skip)]
 #![allow(unused_parens)]
@@ -50,7 +47,7 @@
 use frame_support::{traits::Get, weights::{Weight, constants::RocksDbWeight}};
 use core::marker::PhantomData;
 
-/// Weight functions needed for pallet_preimage.
+/// Weight functions needed for `pallet_preimage`.
 pub trait WeightInfo {
 	fn note_preimage(s: u32, ) -> Weight;
 	fn note_requested_preimage(s: u32, ) -> Weight;
@@ -64,319 +61,410 @@ pub trait WeightInfo {
 	fn unrequest_preimage() -> Weight;
 	fn unrequest_unnoted_preimage() -> Weight;
 	fn unrequest_multi_referenced_preimage() -> Weight;
+	fn ensure_updated(n: u32, ) -> Weight;
 }
 
-/// Weights for pallet_preimage using the Substrate node and recommended hardware.
+/// Weights for `pallet_preimage` using the Substrate node and recommended hardware.
 pub struct SubstrateWeight<T>(PhantomData<T>);
 impl<T: frame_system::Config> WeightInfo for SubstrateWeight<T> {
-	/// Storage: Preimage StatusFor (r:1 w:1)
-	/// Proof: Preimage StatusFor (max_values: None, max_size: Some(91), added: 2566, mode: MaxEncodedLen)
-	/// Storage: Preimage PreimageFor (r:0 w:1)
-	/// Proof: Preimage PreimageFor (max_values: None, max_size: Some(4194344), added: 4196819, mode: MaxEncodedLen)
+	/// Storage: `Preimage::StatusFor` (r:1 w:0)
+	/// Proof: `Preimage::StatusFor` (`max_values`: None, `max_size`: Some(91), added: 2566, mode: `MaxEncodedLen`)
+	/// Storage: `Preimage::RequestStatusFor` (r:1 w:1)
+	/// Proof: `Preimage::RequestStatusFor` (`max_values`: None, `max_size`: Some(75), added: 2550, mode: `MaxEncodedLen`)
+	/// Storage: `Preimage::PreimageFor` (r:0 w:1)
+	/// Proof: `Preimage::PreimageFor` (`max_values`: None, `max_size`: Some(4194344), added: 4196819, mode: `MaxEncodedLen`)
 	/// The range of component `s` is `[0, 4194304]`.
 	fn note_preimage(s: u32, ) -> Weight {
 		// Proof Size summary in bytes:
-		//  Measured:  `143`
+		//  Measured:  `42`
 		//  Estimated: `3556`
-		// Minimum execution time: 30_479_000 picoseconds.
-		Weight::from_parts(23_381_775, 3556)
-			// Standard Error: 2
-			.saturating_add(Weight::from_parts(1_670, 0).saturating_mul(s.into()))
-			.saturating_add(T::DbWeight::get().reads(1_u64))
+		// Minimum execution time: 15_936_000 picoseconds.
+		Weight::from_parts(16_271_000, 3556)
+			// Standard Error: 1
+			.saturating_add(Weight::from_parts(1_916, 0).saturating_mul(s.into()))
+			.saturating_add(T::DbWeight::get().reads(2_u64))
 			.saturating_add(T::DbWeight::get().writes(2_u64))
 	}
-	/// Storage: Preimage StatusFor (r:1 w:1)
-	/// Proof: Preimage StatusFor (max_values: None, max_size: Some(91), added: 2566, mode: MaxEncodedLen)
-	/// Storage: Preimage PreimageFor (r:0 w:1)
-	/// Proof: Preimage PreimageFor (max_values: None, max_size: Some(4194344), added: 4196819, mode: MaxEncodedLen)
+	/// Storage: `Preimage::StatusFor` (r:1 w:0)
+	/// Proof: `Preimage::StatusFor` (`max_values`: None, `max_size`: Some(91), added: 2566, mode: `MaxEncodedLen`)
+	/// Storage: `Preimage::RequestStatusFor` (r:1 w:1)
+	/// Proof: `Preimage::RequestStatusFor` (`max_values`: None, `max_size`: Some(75), added: 2550, mode: `MaxEncodedLen`)
+	/// Storage: `Preimage::PreimageFor` (r:0 w:1)
+	/// Proof: `Preimage::PreimageFor` (`max_values`: None, `max_size`: Some(4194344), added: 4196819, mode: `MaxEncodedLen`)
 	/// The range of component `s` is `[0, 4194304]`.
 	fn note_requested_preimage(s: u32, ) -> Weight {
 		// Proof Size summary in bytes:
 		//  Measured:  `106`
 		//  Estimated: `3556`
-		// Minimum execution time: 16_104_000 picoseconds.
-		Weight::from_parts(18_393_879, 3556)
+		// Minimum execution time: 16_468_000 picoseconds.
+		Weight::from_parts(17_031_000, 3556)
 			// Standard Error: 2
-			.saturating_add(Weight::from_parts(1_669, 0).saturating_mul(s.into()))
-			.saturating_add(T::DbWeight::get().reads(1_u64))
+			.saturating_add(Weight::from_parts(1_948, 0).saturating_mul(s.into()))
+			.saturating_add(T::DbWeight::get().reads(2_u64))
 			.saturating_add(T::DbWeight::get().writes(2_u64))
 	}
-	/// Storage: Preimage StatusFor (r:1 w:1)
-	/// Proof: Preimage StatusFor (max_values: None, max_size: Some(91), added: 2566, mode: MaxEncodedLen)
-	/// Storage: Preimage PreimageFor (r:0 w:1)
-	/// Proof: Preimage PreimageFor (max_values: None, max_size: Some(4194344), added: 4196819, mode: MaxEncodedLen)
+	/// Storage: `Preimage::StatusFor` (r:1 w:0)
+	/// Proof: `Preimage::StatusFor` (`max_values`: None, `max_size`: Some(91), added: 2566, mode: `MaxEncodedLen`)
+	/// Storage: `Preimage::RequestStatusFor` (r:1 w:1)
+	/// Proof: `Preimage::RequestStatusFor` (`max_values`: None, `max_size`: Some(75), added: 2550, mode: `MaxEncodedLen`)
+	/// Storage: `Preimage::PreimageFor` (r:0 w:1)
+	/// Proof: `Preimage::PreimageFor` (`max_values`: None, `max_size`: Some(4194344), added: 4196819, mode: `MaxEncodedLen`)
 	/// The range of component `s` is `[0, 4194304]`.
 	fn note_no_deposit_preimage(s: u32, ) -> Weight {
 		// Proof Size summary in bytes:
 		//  Measured:  `106`
 		//  Estimated: `3556`
-		// Minimum execution time: 15_652_000 picoseconds.
-		Weight::from_parts(22_031_627, 3556)
-			// Standard Error: 2
-			.saturating_add(Weight::from_parts(1_672, 0).saturating_mul(s.into()))
-			.saturating_add(T::DbWeight::get().reads(1_u64))
+		// Minimum execution time: 16_342_000 picoseconds.
+		Weight::from_parts(16_535_000, 3556)
+			// Standard Error: 1
+			.saturating_add(Weight::from_parts(1_906, 0).saturating_mul(s.into()))
+			.saturating_add(T::DbWeight::get().reads(2_u64))
 			.saturating_add(T::DbWeight::get().writes(2_u64))
 	}
-	/// Storage: Preimage StatusFor (r:1 w:1)
-	/// Proof: Preimage StatusFor (max_values: None, max_size: Some(91), added: 2566, mode: MaxEncodedLen)
-	/// Storage: Preimage PreimageFor (r:0 w:1)
-	/// Proof: Preimage PreimageFor (max_values: None, max_size: Some(4194344), added: 4196819, mode: MaxEncodedLen)
+	/// Storage: `Preimage::StatusFor` (r:1 w:0)
+	/// Proof: `Preimage::StatusFor` (`max_values`: None, `max_size`: Some(91), added: 2566, mode: `MaxEncodedLen`)
+	/// Storage: `Preimage::RequestStatusFor` (r:1 w:1)
+	/// Proof: `Preimage::RequestStatusFor` (`max_values`: None, `max_size`: Some(75), added: 2550, mode: `MaxEncodedLen`)
+	/// Storage: `Preimage::PreimageFor` (r:0 w:1)
+	/// Proof: `Preimage::PreimageFor` (`max_values`: None, `max_size`: Some(4194344), added: 4196819, mode: `MaxEncodedLen`)
 	fn unnote_preimage() -> Weight {
 		// Proof Size summary in bytes:
-		//  Measured:  `289`
+		//  Measured:  `172`
 		//  Estimated: `3556`
-		// Minimum execution time: 37_148_000 picoseconds.
-		Weight::from_parts(40_247_000, 3556)
-			.saturating_add(T::DbWeight::get().reads(1_u64))
+		// Minimum execution time: 31_047_000 picoseconds.
+		Weight::from_parts(34_099_000, 3556)
+			.saturating_add(T::DbWeight::get().reads(2_u64))
 			.saturating_add(T::DbWeight::get().writes(2_u64))
 	}
-	/// Storage: Preimage StatusFor (r:1 w:1)
-	/// Proof: Preimage StatusFor (max_values: None, max_size: Some(91), added: 2566, mode: MaxEncodedLen)
-	/// Storage: Preimage PreimageFor (r:0 w:1)
-	/// Proof: Preimage PreimageFor (max_values: None, max_size: Some(4194344), added: 4196819, mode: MaxEncodedLen)
+	/// Storage: `Preimage::StatusFor` (r:1 w:0)
+	/// Proof: `Preimage::StatusFor` (`max_values`: None, `max_size`: Some(91), added: 2566, mode: `MaxEncodedLen`)
+	/// Storage: `Preimage::RequestStatusFor` (r:1 w:1)
+	/// Proof: `Preimage::RequestStatusFor` (`max_values`: None, `max_size`: Some(75), added: 2550, mode: `MaxEncodedLen`)
+	/// Storage: `Preimage::PreimageFor` (r:0 w:1)
+	/// Proof: `Preimage::PreimageFor` (`max_values`: None, `max_size`: Some(4194344), added: 4196819, mode: `MaxEncodedLen`)
 	fn unnote_no_deposit_preimage() -> Weight {
 		// Proof Size summary in bytes:
 		//  Measured:  `144`
 		//  Estimated: `3556`
-		// Minimum execution time: 19_909_000 picoseconds.
-		Weight::from_parts(21_572_000, 3556)
-			.saturating_add(T::DbWeight::get().reads(1_u64))
+		// Minimum execution time: 32_559_000 picoseconds.
+		Weight::from_parts(36_677_000, 3556)
+			.saturating_add(T::DbWeight::get().reads(2_u64))
 			.saturating_add(T::DbWeight::get().writes(2_u64))
 	}
-	/// Storage: Preimage StatusFor (r:1 w:1)
-	/// Proof: Preimage StatusFor (max_values: None, max_size: Some(91), added: 2566, mode: MaxEncodedLen)
+	/// Storage: `Preimage::StatusFor` (r:1 w:0)
+	/// Proof: `Preimage::StatusFor` (`max_values`: None, `max_size`: Some(91), added: 2566, mode: `MaxEncodedLen`)
+	/// Storage: `Preimage::RequestStatusFor` (r:1 w:1)
+	/// Proof: `Preimage::RequestStatusFor` (`max_values`: None, `max_size`: Some(75), added: 2550, mode: `MaxEncodedLen`)
 	fn request_preimage() -> Weight {
 		// Proof Size summary in bytes:
-		//  Measured:  `188`
+		//  Measured:  `172`
 		//  Estimated: `3556`
-		// Minimum execution time: 17_602_000 picoseconds.
-		Weight::from_parts(18_899_000, 3556)
-			.saturating_add(T::DbWeight::get().reads(1_u64))
+		// Minimum execution time: 27_887_000 picoseconds.
+		Weight::from_parts(30_303_000, 3556)
+			.saturating_add(T::DbWeight::get().reads(2_u64))
 			.saturating_add(T::DbWeight::get().writes(1_u64))
 	}
-	/// Storage: Preimage StatusFor (r:1 w:1)
-	/// Proof: Preimage StatusFor (max_values: None, max_size: Some(91), added: 2566, mode: MaxEncodedLen)
+	/// Storage: `Preimage::StatusFor` (r:1 w:0)
+	/// Proof: `Preimage::StatusFor` (`max_values`: None, `max_size`: Some(91), added: 2566, mode: `MaxEncodedLen`)
+	/// Storage: `Preimage::RequestStatusFor` (r:1 w:1)
+	/// Proof: `Preimage::RequestStatusFor` (`max_values`: None, `max_size`: Some(75), added: 2550, mode: `MaxEncodedLen`)
 	fn request_no_deposit_preimage() -> Weight {
 		// Proof Size summary in bytes:
 		//  Measured:  `144`
 		//  Estimated: `3556`
-		// Minimum execution time: 11_253_000 picoseconds.
-		Weight::from_parts(11_667_000, 3556)
-			.saturating_add(T::DbWeight::get().reads(1_u64))
+		// Minimum execution time: 17_256_000 picoseconds.
+		Weight::from_parts(19_481_000, 3556)
+			.saturating_add(T::DbWeight::get().reads(2_u64))
 			.saturating_add(T::DbWeight::get().writes(1_u64))
 	}
-	/// Storage: Preimage StatusFor (r:1 w:1)
-	/// Proof: Preimage StatusFor (max_values: None, max_size: Some(91), added: 2566, mode: MaxEncodedLen)
+	/// Storage: `Preimage::StatusFor` (r:1 w:0)
+	/// Proof: `Preimage::StatusFor` (`max_values`: None, `max_size`: Some(91), added: 2566, mode: `MaxEncodedLen`)
+	/// Storage: `Preimage::RequestStatusFor` (r:1 w:1)
+	/// Proof: `Preimage::RequestStatusFor` (`max_values`: None, `max_size`: Some(75), added: 2550, mode: `MaxEncodedLen`)
 	fn request_unnoted_preimage() -> Weight {
 		// Proof Size summary in bytes:
 		//  Measured:  `42`
 		//  Estimated: `3556`
-		// Minimum execution time: 14_152_000 picoseconds.
-		Weight::from_parts(14_652_000, 3556)
-			.saturating_add(T::DbWeight::get().reads(1_u64))
+		// Minimum execution time: 22_344_000 picoseconds.
+		Weight::from_parts(23_868_000, 3556)
+			.saturating_add(T::DbWeight::get().reads(2_u64))
 			.saturating_add(T::DbWeight::get().writes(1_u64))
 	}
-	/// Storage: Preimage StatusFor (r:1 w:1)
-	/// Proof: Preimage StatusFor (max_values: None, max_size: Some(91), added: 2566, mode: MaxEncodedLen)
+	/// Storage: `Preimage::StatusFor` (r:1 w:0)
+	/// Proof: `Preimage::StatusFor` (`max_values`: None, `max_size`: Some(91), added: 2566, mode: `MaxEncodedLen`)
+	/// Storage: `Preimage::RequestStatusFor` (r:1 w:1)
+	/// Proof: `Preimage::RequestStatusFor` (`max_values`: None, `max_size`: Some(75), added: 2550, mode: `MaxEncodedLen`)
 	fn request_requested_preimage() -> Weight {
 		// Proof Size summary in bytes:
 		//  Measured:  `106`
 		//  Estimated: `3556`
-		// Minimum execution time: 8_267_000 picoseconds.
-		Weight::from_parts(8_969_000, 3556)
-			.saturating_add(T::DbWeight::get().reads(1_u64))
+		// Minimum execution time: 10_542_000 picoseconds.
+		Weight::from_parts(11_571_000, 3556)
+			.saturating_add(T::DbWeight::get().reads(2_u64))
 			.saturating_add(T::DbWeight::get().writes(1_u64))
 	}
-	/// Storage: Preimage StatusFor (r:1 w:1)
-	/// Proof: Preimage StatusFor (max_values: None, max_size: Some(91), added: 2566, mode: MaxEncodedLen)
-	/// Storage: Preimage PreimageFor (r:0 w:1)
-	/// Proof: Preimage PreimageFor (max_values: None, max_size: Some(4194344), added: 4196819, mode: MaxEncodedLen)
+	/// Storage: `Preimage::StatusFor` (r:1 w:0)
+	/// Proof: `Preimage::StatusFor` (`max_values`: None, `max_size`: Some(91), added: 2566, mode: `MaxEncodedLen`)
+	/// Storage: `Preimage::RequestStatusFor` (r:1 w:1)
+	/// Proof: `Preimage::RequestStatusFor` (`max_values`: None, `max_size`: Some(75), added: 2550, mode: `MaxEncodedLen`)
+	/// Storage: `Preimage::PreimageFor` (r:0 w:1)
+	/// Proof: `Preimage::PreimageFor` (`max_values`: None, `max_size`: Some(4194344), added: 4196819, mode: `MaxEncodedLen`)
 	fn unrequest_preimage() -> Weight {
 		// Proof Size summary in bytes:
 		//  Measured:  `144`
 		//  Estimated: `3556`
-		// Minimum execution time: 18_429_000 picoseconds.
-		Weight::from_parts(18_946_000, 3556)
-			.saturating_add(T::DbWeight::get().reads(1_u64))
+		// Minimum execution time: 29_054_000 picoseconds.
+		Weight::from_parts(32_996_000, 3556)
+			.saturating_add(T::DbWeight::get().reads(2_u64))
 			.saturating_add(T::DbWeight::get().writes(2_u64))
 	}
-	/// Storage: Preimage StatusFor (r:1 w:1)
-	/// Proof: Preimage StatusFor (max_values: None, max_size: Some(91), added: 2566, mode: MaxEncodedLen)
+	/// Storage: `Preimage::StatusFor` (r:1 w:0)
+	/// Proof: `Preimage::StatusFor` (`max_values`: None, `max_size`: Some(91), added: 2566, mode: `MaxEncodedLen`)
+	/// Storage: `Preimage::RequestStatusFor` (r:1 w:1)
+	/// Proof: `Preimage::RequestStatusFor` (`max_values`: None, `max_size`: Some(75), added: 2550, mode: `MaxEncodedLen`)
 	fn unrequest_unnoted_preimage() -> Weight {
 		// Proof Size summary in bytes:
 		//  Measured:  `106`
 		//  Estimated: `3556`
-		// Minimum execution time: 7_910_000 picoseconds.
-		Weight::from_parts(8_272_000, 3556)
-			.saturating_add(T::DbWeight::get().reads(1_u64))
+		// Minimum execution time: 10_775_000 picoseconds.
+		Weight::from_parts(11_937_000, 3556)
+			.saturating_add(T::DbWeight::get().reads(2_u64))
 			.saturating_add(T::DbWeight::get().writes(1_u64))
 	}
-	/// Storage: Preimage StatusFor (r:1 w:1)
-	/// Proof: Preimage StatusFor (max_values: None, max_size: Some(91), added: 2566, mode: MaxEncodedLen)
+	/// Storage: `Preimage::StatusFor` (r:1 w:0)
+	/// Proof: `Preimage::StatusFor` (`max_values`: None, `max_size`: Some(91), added: 2566, mode: `MaxEncodedLen`)
+	/// Storage: `Preimage::RequestStatusFor` (r:1 w:1)
+	/// Proof: `Preimage::RequestStatusFor` (`max_values`: None, `max_size`: Some(75), added: 2550, mode: `MaxEncodedLen`)
 	fn unrequest_multi_referenced_preimage() -> Weight {
 		// Proof Size summary in bytes:
 		//  Measured:  `106`
 		//  Estimated: `3556`
-		// Minimum execution time: 7_936_000 picoseconds.
-		Weight::from_parts(8_504_000, 3556)
+		// Minimum execution time: 10_696_000 picoseconds.
+		Weight::from_parts(11_717_000, 3556)
+			.saturating_add(T::DbWeight::get().reads(2_u64))
+			.saturating_add(T::DbWeight::get().writes(1_u64))
+	}
+	/// Storage: `Preimage::StatusFor` (r:1024 w:1024)
+	/// Proof: `Preimage::StatusFor` (`max_values`: None, `max_size`: Some(91), added: 2566, mode: `MaxEncodedLen`)
+	/// Storage: `System::Account` (r:1 w:1)
+	/// Proof: `System::Account` (`max_values`: None, `max_size`: Some(128), added: 2603, mode: `MaxEncodedLen`)
+	/// Storage: `Preimage::RequestStatusFor` (r:0 w:1024)
+	/// Proof: `Preimage::RequestStatusFor` (`max_values`: None, `max_size`: Some(75), added: 2550, mode: `MaxEncodedLen`)
+	/// The range of component `n` is `[0, 1024]`.
+	fn ensure_updated(n: u32, ) -> Weight {
+		// Proof Size summary in bytes:
+		//  Measured:  `193 + n * (91 ±0)`
+		//  Estimated: `3593 + n * (2566 ±0)`
+		// Minimum execution time: 2_452_000 picoseconds.
+		Weight::from_parts(2_641_000, 3593)
+			// Standard Error: 19_797
+			.saturating_add(Weight::from_parts(15_620_946, 0).saturating_mul(n.into()))
 			.saturating_add(T::DbWeight::get().reads(1_u64))
+			.saturating_add(T::DbWeight::get().reads((1_u64).saturating_mul(n.into())))
 			.saturating_add(T::DbWeight::get().writes(1_u64))
+			.saturating_add(T::DbWeight::get().writes((2_u64).saturating_mul(n.into())))
+			.saturating_add(Weight::from_parts(0, 2566).saturating_mul(n.into()))
 	}
 }
 
-// For backwards compatibility and tests
+// For backwards compatibility and tests.
 impl WeightInfo for () {
-	/// Storage: Preimage StatusFor (r:1 w:1)
-	/// Proof: Preimage StatusFor (max_values: None, max_size: Some(91), added: 2566, mode: MaxEncodedLen)
-	/// Storage: Preimage PreimageFor (r:0 w:1)
-	/// Proof: Preimage PreimageFor (max_values: None, max_size: Some(4194344), added: 4196819, mode: MaxEncodedLen)
+	/// Storage: `Preimage::StatusFor` (r:1 w:0)
+	/// Proof: `Preimage::StatusFor` (`max_values`: None, `max_size`: Some(91), added: 2566, mode: `MaxEncodedLen`)
+	/// Storage: `Preimage::RequestStatusFor` (r:1 w:1)
+	/// Proof: `Preimage::RequestStatusFor` (`max_values`: None, `max_size`: Some(75), added: 2550, mode: `MaxEncodedLen`)
+	/// Storage: `Preimage::PreimageFor` (r:0 w:1)
+	/// Proof: `Preimage::PreimageFor` (`max_values`: None, `max_size`: Some(4194344), added: 4196819, mode: `MaxEncodedLen`)
 	/// The range of component `s` is `[0, 4194304]`.
 	fn note_preimage(s: u32, ) -> Weight {
 		// Proof Size summary in bytes:
-		//  Measured:  `143`
+		//  Measured:  `42`
 		//  Estimated: `3556`
-		// Minimum execution time: 30_479_000 picoseconds.
-		Weight::from_parts(23_381_775, 3556)
-			// Standard Error: 2
-			.saturating_add(Weight::from_parts(1_670, 0).saturating_mul(s.into()))
-			.saturating_add(RocksDbWeight::get().reads(1_u64))
+		// Minimum execution time: 15_936_000 picoseconds.
+		Weight::from_parts(16_271_000, 3556)
+			// Standard Error: 1
+			.saturating_add(Weight::from_parts(1_916, 0).saturating_mul(s.into()))
+			.saturating_add(RocksDbWeight::get().reads(2_u64))
 			.saturating_add(RocksDbWeight::get().writes(2_u64))
 	}
-	/// Storage: Preimage StatusFor (r:1 w:1)
-	/// Proof: Preimage StatusFor (max_values: None, max_size: Some(91), added: 2566, mode: MaxEncodedLen)
-	/// Storage: Preimage PreimageFor (r:0 w:1)
-	/// Proof: Preimage PreimageFor (max_values: None, max_size: Some(4194344), added: 4196819, mode: MaxEncodedLen)
+	/// Storage: `Preimage::StatusFor` (r:1 w:0)
+	/// Proof: `Preimage::StatusFor` (`max_values`: None, `max_size`: Some(91), added: 2566, mode: `MaxEncodedLen`)
+	/// Storage: `Preimage::RequestStatusFor` (r:1 w:1)
+	/// Proof: `Preimage::RequestStatusFor` (`max_values`: None, `max_size`: Some(75), added: 2550, mode: `MaxEncodedLen`)
+	/// Storage: `Preimage::PreimageFor` (r:0 w:1)
+	/// Proof: `Preimage::PreimageFor` (`max_values`: None, `max_size`: Some(4194344), added: 4196819, mode: `MaxEncodedLen`)
 	/// The range of component `s` is `[0, 4194304]`.
 	fn note_requested_preimage(s: u32, ) -> Weight {
 		// Proof Size summary in bytes:
 		//  Measured:  `106`
 		//  Estimated: `3556`
-		// Minimum execution time: 16_104_000 picoseconds.
-		Weight::from_parts(18_393_879, 3556)
+		// Minimum execution time: 16_468_000 picoseconds.
+		Weight::from_parts(17_031_000, 3556)
 			// Standard Error: 2
-			.saturating_add(Weight::from_parts(1_669, 0).saturating_mul(s.into()))
-			.saturating_add(RocksDbWeight::get().reads(1_u64))
+			.saturating_add(Weight::from_parts(1_948, 0).saturating_mul(s.into()))
+			.saturating_add(RocksDbWeight::get().reads(2_u64))
 			.saturating_add(RocksDbWeight::get().writes(2_u64))
 	}
-	/// Storage: Preimage StatusFor (r:1 w:1)
-	/// Proof: Preimage StatusFor (max_values: None, max_size: Some(91), added: 2566, mode: MaxEncodedLen)
-	/// Storage: Preimage PreimageFor (r:0 w:1)
-	/// Proof: Preimage PreimageFor (max_values: None, max_size: Some(4194344), added: 4196819, mode: MaxEncodedLen)
+	/// Storage: `Preimage::StatusFor` (r:1 w:0)
+	/// Proof: `Preimage::StatusFor` (`max_values`: None, `max_size`: Some(91), added: 2566, mode: `MaxEncodedLen`)
+	/// Storage: `Preimage::RequestStatusFor` (r:1 w:1)
+	/// Proof: `Preimage::RequestStatusFor` (`max_values`: None, `max_size`: Some(75), added: 2550, mode: `MaxEncodedLen`)
+	/// Storage: `Preimage::PreimageFor` (r:0 w:1)
+	/// Proof: `Preimage::PreimageFor` (`max_values`: None, `max_size`: Some(4194344), added: 4196819, mode: `MaxEncodedLen`)
 	/// The range of component `s` is `[0, 4194304]`.
 	fn note_no_deposit_preimage(s: u32, ) -> Weight {
 		// Proof Size summary in bytes:
 		//  Measured:  `106`
 		//  Estimated: `3556`
-		// Minimum execution time: 15_652_000 picoseconds.
-		Weight::from_parts(22_031_627, 3556)
-			// Standard Error: 2
-			.saturating_add(Weight::from_parts(1_672, 0).saturating_mul(s.into()))
-			.saturating_add(RocksDbWeight::get().reads(1_u64))
+		// Minimum execution time: 16_342_000 picoseconds.
+		Weight::from_parts(16_535_000, 3556)
+			// Standard Error: 1
+			.saturating_add(Weight::from_parts(1_906, 0).saturating_mul(s.into()))
+			.saturating_add(RocksDbWeight::get().reads(2_u64))
 			.saturating_add(RocksDbWeight::get().writes(2_u64))
 	}
-	/// Storage: Preimage StatusFor (r:1 w:1)
-	/// Proof: Preimage StatusFor (max_values: None, max_size: Some(91), added: 2566, mode: MaxEncodedLen)
-	/// Storage: Preimage PreimageFor (r:0 w:1)
-	/// Proof: Preimage PreimageFor (max_values: None, max_size: Some(4194344), added: 4196819, mode: MaxEncodedLen)
+	/// Storage: `Preimage::StatusFor` (r:1 w:0)
+	/// Proof: `Preimage::StatusFor` (`max_values`: None, `max_size`: Some(91), added: 2566, mode: `MaxEncodedLen`)
+	/// Storage: `Preimage::RequestStatusFor` (r:1 w:1)
+	/// Proof: `Preimage::RequestStatusFor` (`max_values`: None, `max_size`: Some(75), added: 2550, mode: `MaxEncodedLen`)
+	/// Storage: `Preimage::PreimageFor` (r:0 w:1)
+	/// Proof: `Preimage::PreimageFor` (`max_values`: None, `max_size`: Some(4194344), added: 4196819, mode: `MaxEncodedLen`)
 	fn unnote_preimage() -> Weight {
 		// Proof Size summary in bytes:
-		//  Measured:  `289`
+		//  Measured:  `172`
 		//  Estimated: `3556`
-		// Minimum execution time: 37_148_000 picoseconds.
-		Weight::from_parts(40_247_000, 3556)
-			.saturating_add(RocksDbWeight::get().reads(1_u64))
+		// Minimum execution time: 31_047_000 picoseconds.
+		Weight::from_parts(34_099_000, 3556)
+			.saturating_add(RocksDbWeight::get().reads(2_u64))
 			.saturating_add(RocksDbWeight::get().writes(2_u64))
 	}
-	/// Storage: Preimage StatusFor (r:1 w:1)
-	/// Proof: Preimage StatusFor (max_values: None, max_size: Some(91), added: 2566, mode: MaxEncodedLen)
-	/// Storage: Preimage PreimageFor (r:0 w:1)
-	/// Proof: Preimage PreimageFor (max_values: None, max_size: Some(4194344), added: 4196819, mode: MaxEncodedLen)
+	/// Storage: `Preimage::StatusFor` (r:1 w:0)
+	/// Proof: `Preimage::StatusFor` (`max_values`: None, `max_size`: Some(91), added: 2566, mode: `MaxEncodedLen`)
+	/// Storage: `Preimage::RequestStatusFor` (r:1 w:1)
+	/// Proof: `Preimage::RequestStatusFor` (`max_values`: None, `max_size`: Some(75), added: 2550, mode: `MaxEncodedLen`)
+	/// Storage: `Preimage::PreimageFor` (r:0 w:1)
+	/// Proof: `Preimage::PreimageFor` (`max_values`: None, `max_size`: Some(4194344), added: 4196819, mode: `MaxEncodedLen`)
 	fn unnote_no_deposit_preimage() -> Weight {
 		// Proof Size summary in bytes:
 		//  Measured:  `144`
 		//  Estimated: `3556`
-		// Minimum execution time: 19_909_000 picoseconds.
-		Weight::from_parts(21_572_000, 3556)
-			.saturating_add(RocksDbWeight::get().reads(1_u64))
+		// Minimum execution time: 32_559_000 picoseconds.
+		Weight::from_parts(36_677_000, 3556)
+			.saturating_add(RocksDbWeight::get().reads(2_u64))
 			.saturating_add(RocksDbWeight::get().writes(2_u64))
 	}
-	/// Storage: Preimage StatusFor (r:1 w:1)
-	/// Proof: Preimage StatusFor (max_values: None, max_size: Some(91), added: 2566, mode: MaxEncodedLen)
+	/// Storage: `Preimage::StatusFor` (r:1 w:0)
+	/// Proof: `Preimage::StatusFor` (`max_values`: None, `max_size`: Some(91), added: 2566, mode: `MaxEncodedLen`)
+	/// Storage: `Preimage::RequestStatusFor` (r:1 w:1)
+	/// Proof: `Preimage::RequestStatusFor` (`max_values`: None, `max_size`: Some(75), added: 2550, mode: `MaxEncodedLen`)
 	fn request_preimage() -> Weight {
 		// Proof Size summary in bytes:
-		//  Measured:  `188`
+		//  Measured:  `172`
 		//  Estimated: `3556`
-		// Minimum execution time: 17_602_000 picoseconds.
-		Weight::from_parts(18_899_000, 3556)
-			.saturating_add(RocksDbWeight::get().reads(1_u64))
+		// Minimum execution time: 27_887_000 picoseconds.
+		Weight::from_parts(30_303_000, 3556)
+			.saturating_add(RocksDbWeight::get().reads(2_u64))
 			.saturating_add(RocksDbWeight::get().writes(1_u64))
 	}
-	/// Storage: Preimage StatusFor (r:1 w:1)
-	/// Proof: Preimage StatusFor (max_values: None, max_size: Some(91), added: 2566, mode: MaxEncodedLen)
+	/// Storage: `Preimage::StatusFor` (r:1 w:0)
+	/// Proof: `Preimage::StatusFor` (`max_values`: None, `max_size`: Some(91), added: 2566, mode: `MaxEncodedLen`)
+	/// Storage: `Preimage::RequestStatusFor` (r:1 w:1)
+	/// Proof: `Preimage::RequestStatusFor` (`max_values`: None, `max_size`: Some(75), added: 2550, mode: `MaxEncodedLen`)
 	fn request_no_deposit_preimage() -> Weight {
 		// Proof Size summary in bytes:
 		//  Measured:  `144`
 		//  Estimated: `3556`
-		// Minimum execution time: 11_253_000 picoseconds.
-		Weight::from_parts(11_667_000, 3556)
-			.saturating_add(RocksDbWeight::get().reads(1_u64))
+		// Minimum execution time: 17_256_000 picoseconds.
+		Weight::from_parts(19_481_000, 3556)
+			.saturating_add(RocksDbWeight::get().reads(2_u64))
 			.saturating_add(RocksDbWeight::get().writes(1_u64))
 	}
-	/// Storage: Preimage StatusFor (r:1 w:1)
-	/// Proof: Preimage StatusFor (max_values: None, max_size: Some(91), added: 2566, mode: MaxEncodedLen)
+	/// Storage: `Preimage::StatusFor` (r:1 w:0)
+	/// Proof: `Preimage::StatusFor` (`max_values`: None, `max_size`: Some(91), added: 2566, mode: `MaxEncodedLen`)
+	/// Storage: `Preimage::RequestStatusFor` (r:1 w:1)
+	/// Proof: `Preimage::RequestStatusFor` (`max_values`: None, `max_size`: Some(75), added: 2550, mode: `MaxEncodedLen`)
 	fn request_unnoted_preimage() -> Weight {
 		// Proof Size summary in bytes:
 		//  Measured:  `42`
 		//  Estimated: `3556`
-		// Minimum execution time: 14_152_000 picoseconds.
-		Weight::from_parts(14_652_000, 3556)
-			.saturating_add(RocksDbWeight::get().reads(1_u64))
+		// Minimum execution time: 22_344_000 picoseconds.
+		Weight::from_parts(23_868_000, 3556)
+			.saturating_add(RocksDbWeight::get().reads(2_u64))
 			.saturating_add(RocksDbWeight::get().writes(1_u64))
 	}
-	/// Storage: Preimage StatusFor (r:1 w:1)
-	/// Proof: Preimage StatusFor (max_values: None, max_size: Some(91), added: 2566, mode: MaxEncodedLen)
+	/// Storage: `Preimage::StatusFor` (r:1 w:0)
+	/// Proof: `Preimage::StatusFor` (`max_values`: None, `max_size`: Some(91), added: 2566, mode: `MaxEncodedLen`)
+	/// Storage: `Preimage::RequestStatusFor` (r:1 w:1)
+	/// Proof: `Preimage::RequestStatusFor` (`max_values`: None, `max_size`: Some(75), added: 2550, mode: `MaxEncodedLen`)
 	fn request_requested_preimage() -> Weight {
 		// Proof Size summary in bytes:
 		//  Measured:  `106`
 		//  Estimated: `3556`
-		// Minimum execution time: 8_267_000 picoseconds.
-		Weight::from_parts(8_969_000, 3556)
-			.saturating_add(RocksDbWeight::get().reads(1_u64))
+		// Minimum execution time: 10_542_000 picoseconds.
+		Weight::from_parts(11_571_000, 3556)
+			.saturating_add(RocksDbWeight::get().reads(2_u64))
 			.saturating_add(RocksDbWeight::get().writes(1_u64))
 	}
-	/// Storage: Preimage StatusFor (r:1 w:1)
-	/// Proof: Preimage StatusFor (max_values: None, max_size: Some(91), added: 2566, mode: MaxEncodedLen)
-	/// Storage: Preimage PreimageFor (r:0 w:1)
-	/// Proof: Preimage PreimageFor (max_values: None, max_size: Some(4194344), added: 4196819, mode: MaxEncodedLen)
+	/// Storage: `Preimage::StatusFor` (r:1 w:0)
+	/// Proof: `Preimage::StatusFor` (`max_values`: None, `max_size`: Some(91), added: 2566, mode: `MaxEncodedLen`)
+	/// Storage: `Preimage::RequestStatusFor` (r:1 w:1)
+	/// Proof: `Preimage::RequestStatusFor` (`max_values`: None, `max_size`: Some(75), added: 2550, mode: `MaxEncodedLen`)
+	/// Storage: `Preimage::PreimageFor` (r:0 w:1)
+	/// Proof: `Preimage::PreimageFor` (`max_values`: None, `max_size`: Some(4194344), added: 4196819, mode: `MaxEncodedLen`)
 	fn unrequest_preimage() -> Weight {
 		// Proof Size summary in bytes:
 		//  Measured:  `144`
 		//  Estimated: `3556`
-		// Minimum execution time: 18_429_000 picoseconds.
-		Weight::from_parts(18_946_000, 3556)
-			.saturating_add(RocksDbWeight::get().reads(1_u64))
+		// Minimum execution time: 29_054_000 picoseconds.
+		Weight::from_parts(32_996_000, 3556)
+			.saturating_add(RocksDbWeight::get().reads(2_u64))
 			.saturating_add(RocksDbWeight::get().writes(2_u64))
 	}
-	/// Storage: Preimage StatusFor (r:1 w:1)
-	/// Proof: Preimage StatusFor (max_values: None, max_size: Some(91), added: 2566, mode: MaxEncodedLen)
+	/// Storage: `Preimage::StatusFor` (r:1 w:0)
+	/// Proof: `Preimage::StatusFor` (`max_values`: None, `max_size`: Some(91), added: 2566, mode: `MaxEncodedLen`)
+	/// Storage: `Preimage::RequestStatusFor` (r:1 w:1)
+	/// Proof: `Preimage::RequestStatusFor` (`max_values`: None, `max_size`: Some(75), added: 2550, mode: `MaxEncodedLen`)
 	fn unrequest_unnoted_preimage() -> Weight {
 		// Proof Size summary in bytes:
 		//  Measured:  `106`
 		//  Estimated: `3556`
-		// Minimum execution time: 7_910_000 picoseconds.
-		Weight::from_parts(8_272_000, 3556)
-			.saturating_add(RocksDbWeight::get().reads(1_u64))
+		// Minimum execution time: 10_775_000 picoseconds.
+		Weight::from_parts(11_937_000, 3556)
+			.saturating_add(RocksDbWeight::get().reads(2_u64))
 			.saturating_add(RocksDbWeight::get().writes(1_u64))
 	}
-	/// Storage: Preimage StatusFor (r:1 w:1)
-	/// Proof: Preimage StatusFor (max_values: None, max_size: Some(91), added: 2566, mode: MaxEncodedLen)
+	/// Storage: `Preimage::StatusFor` (r:1 w:0)
+	/// Proof: `Preimage::StatusFor` (`max_values`: None, `max_size`: Some(91), added: 2566, mode: `MaxEncodedLen`)
+	/// Storage: `Preimage::RequestStatusFor` (r:1 w:1)
+	/// Proof: `Preimage::RequestStatusFor` (`max_values`: None, `max_size`: Some(75), added: 2550, mode: `MaxEncodedLen`)
 	fn unrequest_multi_referenced_preimage() -> Weight {
 		// Proof Size summary in bytes:
 		//  Measured:  `106`
 		//  Estimated: `3556`
-		// Minimum execution time: 7_936_000 picoseconds.
-		Weight::from_parts(8_504_000, 3556)
+		// Minimum execution time: 10_696_000 picoseconds.
+		Weight::from_parts(11_717_000, 3556)
+			.saturating_add(RocksDbWeight::get().reads(2_u64))
+			.saturating_add(RocksDbWeight::get().writes(1_u64))
+	}
+	/// Storage: `Preimage::StatusFor` (r:1024 w:1024)
+	/// Proof: `Preimage::StatusFor` (`max_values`: None, `max_size`: Some(91), added: 2566, mode: `MaxEncodedLen`)
+	/// Storage: `System::Account` (r:1 w:1)
+	/// Proof: `System::Account` (`max_values`: None, `max_size`: Some(128), added: 2603, mode: `MaxEncodedLen`)
+	/// Storage: `Preimage::RequestStatusFor` (r:0 w:1024)
+	/// Proof: `Preimage::RequestStatusFor` (`max_values`: None, `max_size`: Some(75), added: 2550, mode: `MaxEncodedLen`)
+	/// The range of component `n` is `[0, 1024]`.
+	fn ensure_updated(n: u32, ) -> Weight {
+		// Proof Size summary in bytes:
+		//  Measured:  `193 + n * (91 ±0)`
+		//  Estimated: `3593 + n * (2566 ±0)`
+		// Minimum execution time: 2_452_000 picoseconds.
+		Weight::from_parts(2_641_000, 3593)
+			// Standard Error: 19_797
+			.saturating_add(Weight::from_parts(15_620_946, 0).saturating_mul(n.into()))
 			.saturating_add(RocksDbWeight::get().reads(1_u64))
+			.saturating_add(RocksDbWeight::get().reads((1_u64).saturating_mul(n.into())))
 			.saturating_add(RocksDbWeight::get().writes(1_u64))
+			.saturating_add(RocksDbWeight::get().writes((2_u64).saturating_mul(n.into())))
+			.saturating_add(Weight::from_parts(0, 2566).saturating_mul(n.into()))
 	}
 }
diff --git a/substrate/frame/proxy/Cargo.toml b/substrate/frame/proxy/Cargo.toml
index 9618ec006e775d625111ad7bcea8e82c3efa834e..ba30bd147bd388f5b2f12d7d46b775c87f4787a2 100644
--- a/substrate/frame/proxy/Cargo.toml
+++ b/substrate/frame/proxy/Cargo.toml
@@ -1,11 +1,11 @@
 [package]
 name = "pallet-proxy"
 version = "4.0.0-dev"
-authors = ["Parity Technologies <admin@parity.io>"]
-edition = "2021"
+authors.workspace = true
+edition.workspace = true
 license = "Apache-2.0"
 homepage = "https://substrate.io"
-repository = "https://github.com/paritytech/substrate/"
+repository.workspace = true
 description = "FRAME proxying pallet"
 readme = "README.md"
 
diff --git a/substrate/frame/proxy/src/lib.rs b/substrate/frame/proxy/src/lib.rs
index 586d52fb62bddabc0f17bd46aeb77dc60d4cd9ec..4d4da0433afa015a6c33e8ee68e1e1c90851ce97 100644
--- a/substrate/frame/proxy/src/lib.rs
+++ b/substrate/frame/proxy/src/lib.rs
@@ -35,7 +35,7 @@ pub mod weights;
 
 use codec::{Decode, Encode, MaxEncodedLen};
 use frame_support::{
-	dispatch::{DispatchError, GetDispatchInfo},
+	dispatch::GetDispatchInfo,
 	ensure,
 	traits::{Currency, Get, InstanceFilter, IsSubType, IsType, OriginTrait, ReservableCurrency},
 };
@@ -45,7 +45,7 @@ use scale_info::TypeInfo;
 use sp_io::hashing::blake2_256;
 use sp_runtime::{
 	traits::{Dispatchable, Hash, Saturating, StaticLookup, TrailingZeroInput, Zero},
-	DispatchResult, RuntimeDebug,
+	DispatchError, DispatchResult, RuntimeDebug,
 };
 use sp_std::prelude::*;
 pub use weights::WeightInfo;
diff --git a/substrate/frame/proxy/src/tests.rs b/substrate/frame/proxy/src/tests.rs
index 48a2a4ed0cc33b1d21fabb4a08d30a41046c70d3..89bd8b68f0918c1ce5ab561286102e62f19c2051 100644
--- a/substrate/frame/proxy/src/tests.rs
+++ b/substrate/frame/proxy/src/tests.rs
@@ -25,11 +25,10 @@ use crate as proxy;
 use codec::{Decode, Encode};
 use frame_support::{
 	assert_noop, assert_ok, derive_impl,
-	dispatch::DispatchError,
 	traits::{ConstU32, ConstU64, Contains},
 };
 use sp_core::H256;
-use sp_runtime::{traits::BlakeTwo256, BuildStorage, RuntimeDebug};
+use sp_runtime::{traits::BlakeTwo256, BuildStorage, DispatchError, RuntimeDebug};
 
 type Block = frame_system::mocking::MockBlock<Test>;
 
@@ -46,25 +45,14 @@ frame_support::construct_runtime!(
 #[derive_impl(frame_system::config_preludes::TestDefaultConfig as frame_system::DefaultConfig)]
 impl frame_system::Config for Test {
 	type Block = Block;
-	type BlockHashCount = ConstU64<250>;
-	type RuntimeOrigin = RuntimeOrigin;
-	type RuntimeCall = RuntimeCall;
-	type RuntimeEvent = RuntimeEvent;
-	type PalletInfo = PalletInfo;
-	type OnSetCode = ();
-
 	type BaseCallFilter = BaseFilter;
 	type AccountData = pallet_balances::AccountData<u64>;
 }
 
 #[derive_impl(pallet_balances::config_preludes::TestDefaultConfig as pallet_balances::DefaultConfig)]
 impl pallet_balances::Config for Test {
-	type RuntimeEvent = RuntimeEvent;
-	type RuntimeHoldReason = ();
 	type ReserveIdentifier = [u8; 8];
-	type DustRemoval = ();
 	type AccountStore = System;
-	type ExistentialDeposit = ConstU64<1>;
 }
 
 impl pallet_utility::Config for Test {
diff --git a/substrate/frame/ranked-collective/Cargo.toml b/substrate/frame/ranked-collective/Cargo.toml
index 613da42cb17a46815ba410d3a1b28ea2242cc701..9788b1df6302aa6ed8af70b3c1564d1c6d6b41df 100644
--- a/substrate/frame/ranked-collective/Cargo.toml
+++ b/substrate/frame/ranked-collective/Cargo.toml
@@ -1,11 +1,11 @@
 [package]
 name = "pallet-ranked-collective"
 version = "4.0.0-dev"
-authors = ["Parity Technologies <admin@parity.io>"]
-edition = "2021"
+authors.workspace = true
+edition.workspace = true
 license = "Apache-2.0"
 homepage = "https://substrate.io"
-repository = "https://github.com/paritytech/substrate/"
+repository.workspace = true
 description = "Ranked collective system: Members of a set of account IDs can make their collective feelings known through dispatched calls from one of two specialized origins."
 readme = "README.md"
 
diff --git a/substrate/frame/ranked-collective/README.md b/substrate/frame/ranked-collective/README.md
index b5fe65ef34920f3eecd6f595a0c3144ca9450d2a..e9624159d2fdabbe5c83b34cd6d0fe14772b98af 100644
--- a/substrate/frame/ranked-collective/README.md
+++ b/substrate/frame/ranked-collective/README.md
@@ -1,4 +1,4 @@
-# Ranked collective system.
+# Ranked collective system
 
 This is a membership pallet providing a `Tally` implementation ready for use with polling
 systems such as the Referenda pallet. Members each have a rank, with zero being the lowest.
diff --git a/substrate/frame/ranked-collective/src/benchmarking.rs b/substrate/frame/ranked-collective/src/benchmarking.rs
index b610d10009a0899aac26d7f832f319f00595e624..518428880e4dead922ae32609833ef506db64a43 100644
--- a/substrate/frame/ranked-collective/src/benchmarking.rs
+++ b/substrate/frame/ranked-collective/src/benchmarking.rs
@@ -24,7 +24,7 @@ use crate::Pallet as RankedCollective;
 use frame_benchmarking::v1::{
 	account, benchmarks_instance_pallet, whitelisted_caller, BenchmarkError,
 };
-use frame_support::{assert_ok, dispatch::UnfilteredDispatchable};
+use frame_support::{assert_ok, traits::UnfilteredDispatchable};
 use frame_system::RawOrigin as SystemOrigin;
 
 const SEED: u32 = 0;
diff --git a/substrate/frame/ranked-collective/src/lib.rs b/substrate/frame/ranked-collective/src/lib.rs
index d94932a1dac71a7e14afde4f96d52544b890a7b7..deb1ccf23578b797ad0ce950b3b721609010c2ff 100644
--- a/substrate/frame/ranked-collective/src/lib.rs
+++ b/substrate/frame/ranked-collective/src/lib.rs
@@ -47,12 +47,12 @@ use sp_arithmetic::traits::Saturating;
 use sp_runtime::{
 	traits::{Convert, StaticLookup},
 	ArithmeticError::Overflow,
-	Perbill, RuntimeDebug,
+	DispatchError, Perbill, RuntimeDebug,
 };
 use sp_std::{marker::PhantomData, prelude::*};
 
 use frame_support::{
-	dispatch::{DispatchError, DispatchResultWithPostInfo, PostDispatchInfo},
+	dispatch::{DispatchResultWithPostInfo, PostDispatchInfo},
 	ensure, impl_ensure_origin_with_arg_ignoring_arg,
 	traits::{EnsureOrigin, EnsureOriginWithArg, PollStatus, Polling, RankedMembers, VoteTally},
 	CloneNoBound, EqNoBound, PartialEqNoBound, RuntimeDebugNoBound,
diff --git a/substrate/frame/recovery/Cargo.toml b/substrate/frame/recovery/Cargo.toml
index e3d292e2477498e2e5c10fbc7934e7d3d53db268..38cecd5c44a4842df9c7f028eed23035dce7131b 100644
--- a/substrate/frame/recovery/Cargo.toml
+++ b/substrate/frame/recovery/Cargo.toml
@@ -1,11 +1,11 @@
 [package]
 name = "pallet-recovery"
 version = "4.0.0-dev"
-authors = ["Parity Technologies <admin@parity.io>"]
-edition = "2021"
+authors.workspace = true
+edition.workspace = true
 license = "Apache-2.0"
 homepage = "https://substrate.io"
-repository = "https://github.com/paritytech/substrate/"
+repository.workspace = true
 description = "FRAME account recovery pallet"
 readme = "README.md"
 
diff --git a/substrate/frame/recovery/README.md b/substrate/frame/recovery/README.md
index 31416c65c46a53e9aca2223321c1ee8a27c4eda8..7e2dd7a23619ac893061d0730f7813bdc7e33e98 100644
--- a/substrate/frame/recovery/README.md
+++ b/substrate/frame/recovery/README.md
@@ -16,11 +16,11 @@ friends are needed to give another account access to the recoverable account.
 
 The recovery process for each recoverable account can be configured by the account owner.
 They are able to choose:
-* `friends` - The list of friends that the account owner trusts to protect the
+- `friends` - The list of friends that the account owner trusts to protect the
   recovery process for their account.
-* `threshold` - The number of friends that need to approve a recovery process for
+- `threshold` - The number of friends that need to approve a recovery process for
   the account to be successfully recovered.
-* `delay_period` - The minimum number of blocks after the beginning of the recovery
+- `delay_period` - The minimum number of blocks after the beginning of the recovery
   process that need to pass before the account can be successfully recovered.
 
 There is a configurable deposit that all users need to pay to create a recovery
@@ -84,20 +84,20 @@ It is important to note that this is a powerful pallet that can compromise the
 security of an account if used incorrectly. Some recommended practices for users
 of this pallet are:
 
-* Configure a significant `delay_period` for your recovery process: As long as you
+- Configure a significant `delay_period` for your recovery process: As long as you
   have access to your recoverable account, you need only check the blockchain once
   every `delay_period` blocks to ensure that no recovery attempt is successful
   against your account. Using off-chain notification systems can help with this,
   but ultimately, setting a large `delay_period` means that even the most skilled
   attacker will need to wait this long before they can access your account.
-* Use a high threshold of approvals: Setting a value of 1 for the threshold means
+- Use a high threshold of approvals: Setting a value of 1 for the threshold means
   that any of your friends would be able to recover your account. They would
   simply need to start a recovery process and approve their own process. Similarly,
   a threshold of 2 would mean that any 2 friends could work together to gain
   access to your account. The only way to prevent against these kinds of attacks
   is to choose a high threshold of approvals and select from a diverse friend
   group that would not be able to reasonably coordinate with one another.
-* Reset your configuration over time: Since the entire deposit of creating a
+- Reset your configuration over time: Since the entire deposit of creating a
   recovery configuration is returned to the user, the only cost of updating
   your recovery configuration is the transaction fees for the calls. Thus,
   it is strongly encouraged to regularly update your recovery configuration
@@ -110,25 +110,25 @@ of this pallet are:
 
 #### For General Users
 
-* `create_recovery` - Create a recovery configuration for your account and make it recoverable.
-* `initiate_recovery` - Start the recovery process for a recoverable account.
+- `create_recovery` - Create a recovery configuration for your account and make it recoverable.
+- `initiate_recovery` - Start the recovery process for a recoverable account.
 
 #### For Friends of a Recoverable Account
-* `vouch_recovery` - As a `friend` of a recoverable account, vouch for a recovery attempt on the account.
+- `vouch_recovery` - As a `friend` of a recoverable account, vouch for a recovery attempt on the account.
 
 #### For a User Who Successfully Recovered an Account
 
-* `claim_recovery` - Claim access to the account that you have successfully completed the recovery process for.
-* `as_recovered` - Send a transaction as an account that you have recovered. See other functions below.
+- `claim_recovery` - Claim access to the account that you have successfully completed the recovery process for.
+- `as_recovered` - Send a transaction as an account that you have recovered. See other functions below.
 
 #### For the Recoverable Account
 
-* `close_recovery` - Close an active recovery process for your account and reclaim the recovery deposit.
-* `remove_recovery` - Remove the recovery configuration from the account, making it un-recoverable.
+- `close_recovery` - Close an active recovery process for your account and reclaim the recovery deposit.
+- `remove_recovery` - Remove the recovery configuration from the account, making it un-recoverable.
 
 #### For Super Users
 
-* `set_recovered` - The ROOT origin is able to skip the recovery process and directly allow
+- `set_recovered` - The ROOT origin is able to skip the recovery process and directly allow
   one account to access another.
 
 License: Apache-2.0
diff --git a/substrate/frame/referenda/Cargo.toml b/substrate/frame/referenda/Cargo.toml
index ee34d495733c6a8aafae54f6e0222be9f555d935..ac4f46d12df957821bde1cdc626b7ef613401648 100644
--- a/substrate/frame/referenda/Cargo.toml
+++ b/substrate/frame/referenda/Cargo.toml
@@ -1,11 +1,11 @@
 [package]
 name = "pallet-referenda"
 version = "4.0.0-dev"
-authors = ["Parity Technologies <admin@parity.io>"]
-edition = "2021"
+authors.workspace = true
+edition.workspace = true
 license = "Apache-2.0"
 homepage = "https://substrate.io"
-repository = "https://github.com/paritytech/substrate/"
+repository.workspace = true
 description = "FRAME pallet for inclusive on-chain decisions"
 readme = "README.md"
 
@@ -18,7 +18,7 @@ codec = { package = "parity-scale-codec", version = "3.6.1", default-features =
 	"derive",
 ] }
 scale-info = { version = "2.5.0", default-features = false, features = ["derive"] }
-serde = { version = "1.0.163", features = ["derive"], optional = true }
+serde = { version = "1.0.188", features = ["derive"], optional = true }
 sp-arithmetic = { path = "../../primitives/arithmetic", default-features = false}
 frame-benchmarking = { path = "../benchmarking", default-features = false, optional = true}
 frame-support = { path = "../support", default-features = false}
@@ -51,7 +51,6 @@ std = [
 	"sp-core/std",
 	"sp-io/std",
 	"sp-runtime/std",
-	"sp-runtime/std",
 	"sp-std/std",
 ]
 runtime-benchmarks = [
diff --git a/substrate/frame/referenda/src/benchmarking.rs b/substrate/frame/referenda/src/benchmarking.rs
index 78d14bd99d2ee6a3f03b94e3bcfe1293153e2d24..47d43cc0600c076b6fce0e541e0f78c97649921e 100644
--- a/substrate/frame/referenda/src/benchmarking.rs
+++ b/substrate/frame/referenda/src/benchmarking.rs
@@ -25,8 +25,7 @@ use frame_benchmarking::v1::{
 };
 use frame_support::{
 	assert_ok,
-	dispatch::UnfilteredDispatchable,
-	traits::{Bounded, Currency, EnsureOrigin, EnsureOriginWithArg},
+	traits::{Currency, EnsureOrigin, EnsureOriginWithArg, UnfilteredDispatchable},
 };
 use frame_system::RawOrigin;
 use sp_runtime::traits::Bounded as ArithBounded;
@@ -43,7 +42,7 @@ fn funded_account<T: Config<I>, I: 'static>(name: &'static str, index: u32) -> T
 	caller
 }
 
-fn dummy_call<T: Config<I>, I: 'static>() -> Bounded<<T as Config<I>>::RuntimeCall> {
+fn dummy_call<T: Config<I>, I: 'static>() -> BoundedCallOf<T, I> {
 	let inner = frame_system::Call::remark { remark: vec![] };
 	let call = <T as Config<I>>::RuntimeCall::from(inner);
 	T::Preimages::bound(call).unwrap()
diff --git a/substrate/frame/referenda/src/lib.rs b/substrate/frame/referenda/src/lib.rs
index d4dbbf8a3c998e845165fb7a3d2fa7132c1824d4..be21375f526f034d072318afefca1f99d0e99b3d 100644
--- a/substrate/frame/referenda/src/lib.rs
+++ b/substrate/frame/referenda/src/lib.rs
@@ -73,8 +73,8 @@ use frame_support::{
 			v3::{Anon as ScheduleAnon, Named as ScheduleNamed},
 			DispatchTime,
 		},
-		Currency, Hash as PreimageHash, LockIdentifier, OnUnbalanced, OriginTrait, PollStatus,
-		Polling, QueryPreimage, ReservableCurrency, StorePreimage, VoteTally,
+		Currency, LockIdentifier, OnUnbalanced, OriginTrait, PollStatus, Polling, QueryPreimage,
+		ReservableCurrency, StorePreimage, VoteTally,
 	},
 	BoundedVec,
 };
@@ -163,8 +163,17 @@ pub mod pallet {
 		/// Weight information for extrinsics in this pallet.
 		type WeightInfo: WeightInfo;
 		/// The Scheduler.
-		type Scheduler: ScheduleAnon<BlockNumberFor<Self>, CallOf<Self, I>, PalletsOriginOf<Self>>
-			+ ScheduleNamed<BlockNumberFor<Self>, CallOf<Self, I>, PalletsOriginOf<Self>>;
+		type Scheduler: ScheduleAnon<
+				BlockNumberFor<Self>,
+				CallOf<Self, I>,
+				PalletsOriginOf<Self>,
+				Hasher = Self::Hashing,
+			> + ScheduleNamed<
+				BlockNumberFor<Self>,
+				CallOf<Self, I>,
+				PalletsOriginOf<Self>,
+				Hasher = Self::Hashing,
+			>;
 		/// Currency type for this pallet.
 		type Currency: ReservableCurrency<Self::AccountId>;
 		// Origins and unbalances.
@@ -226,7 +235,7 @@ pub mod pallet {
 			>;
 
 		/// The preimage provider.
-		type Preimages: QueryPreimage + StorePreimage;
+		type Preimages: QueryPreimage<H = Self::Hashing> + StorePreimage;
 	}
 
 	/// The next free referendum index, aka the number of referenda started so far.
@@ -257,14 +266,14 @@ pub mod pallet {
 		StorageMap<_, Twox64Concat, TrackIdOf<T, I>, u32, ValueQuery>;
 
 	/// The metadata is a general information concerning the referendum.
-	/// The `PreimageHash` refers to the preimage of the `Preimages` provider which can be a JSON
+	/// The `Hash` refers to the preimage of the `Preimages` provider which can be a JSON
 	/// dump or IPFS hash of a JSON file.
 	///
 	/// Consider a garbage collection for a metadata of finished referendums to `unrequest` (remove)
 	/// large preimages.
 	#[pallet::storage]
 	pub type MetadataOf<T: Config<I>, I: 'static = ()> =
-		StorageMap<_, Blake2_128Concat, ReferendumIndex, PreimageHash>;
+		StorageMap<_, Blake2_128Concat, ReferendumIndex, T::Hash>;
 
 	#[pallet::event]
 	#[pallet::generate_deposit(pub(super) fn deposit_event)]
@@ -376,14 +385,14 @@ pub mod pallet {
 			/// Index of the referendum.
 			index: ReferendumIndex,
 			/// Preimage hash.
-			hash: PreimageHash,
+			hash: T::Hash,
 		},
 		/// Metadata for a referendum has been cleared.
 		MetadataCleared {
 			/// Index of the referendum.
 			index: ReferendumIndex,
 			/// Preimage hash.
-			hash: PreimageHash,
+			hash: T::Hash,
 		},
 	}
 
@@ -691,7 +700,7 @@ pub mod pallet {
 		pub fn set_metadata(
 			origin: OriginFor<T>,
 			index: ReferendumIndex,
-			maybe_hash: Option<PreimageHash>,
+			maybe_hash: Option<T::Hash>,
 		) -> DispatchResult {
 			let who = ensure_signed(origin)?;
 			if let Some(hash) = maybe_hash {
diff --git a/substrate/frame/referenda/src/migration.rs b/substrate/frame/referenda/src/migration.rs
index 281da83d6569ef83b348feaa18e487f9e4b26c72..a80897242eec67aad194f8deaf1cd6527533eab9 100644
--- a/substrate/frame/referenda/src/migration.rs
+++ b/substrate/frame/referenda/src/migration.rs
@@ -99,8 +99,6 @@ pub mod v1 {
 	impl<T: Config<I>, I: 'static> OnRuntimeUpgrade for MigrateV0ToV1<T, I> {
 		#[cfg(feature = "try-runtime")]
 		fn pre_upgrade() -> Result<Vec<u8>, TryRuntimeError> {
-			let onchain_version = Pallet::<T, I>::on_chain_storage_version();
-			ensure!(onchain_version == 0, "migration from version 0 to 1.");
 			let referendum_count = v0::ReferendumInfoFor::<T, I>::iter().count();
 			log::info!(
 				target: TARGET,
diff --git a/substrate/frame/referenda/src/mock.rs b/substrate/frame/referenda/src/mock.rs
index e44167ed561c591236554bc86b7be50d0709d88b..dce91f7dbfd780fbbac5d53afd0d58249853713a 100644
--- a/substrate/frame/referenda/src/mock.rs
+++ b/substrate/frame/referenda/src/mock.rs
@@ -89,8 +89,7 @@ impl pallet_preimage::Config for Test {
 	type WeightInfo = ();
 	type Currency = Balances;
 	type ManagerOrigin = EnsureRoot<u64>;
-	type BaseDeposit = ();
-	type ByteDeposit = ();
+	type Consideration = ();
 }
 impl pallet_scheduler::Config for Test {
 	type RuntimeEvent = RuntimeEvent;
@@ -474,7 +473,7 @@ impl RefState {
 }
 
 /// note a new preimage without registering.
-pub fn note_preimage(who: u64) -> PreimageHash {
+pub fn note_preimage(who: u64) -> <Test as frame_system::Config>::Hash {
 	use std::sync::atomic::{AtomicU8, Ordering};
 	// note a new preimage on every function invoke.
 	static COUNTER: AtomicU8 = AtomicU8::new(0);
diff --git a/substrate/frame/referenda/src/tests.rs b/substrate/frame/referenda/src/tests.rs
index c7469946c2dab84a6fc0f3bfa32b77c49d16596e..8f51136de0bfdb48df1a43e47dd0de63f7a0e21d 100644
--- a/substrate/frame/referenda/src/tests.rs
+++ b/substrate/frame/referenda/src/tests.rs
@@ -21,12 +21,9 @@ use super::*;
 use crate::mock::{RefState::*, *};
 use assert_matches::assert_matches;
 use codec::Decode;
-use frame_support::{
-	assert_noop, assert_ok,
-	dispatch::{DispatchError::BadOrigin, RawOrigin},
-	traits::Contains,
-};
+use frame_support::{assert_noop, assert_ok, dispatch::RawOrigin, traits::Contains};
 use pallet_balances::Error as BalancesError;
+use sp_runtime::DispatchError::BadOrigin;
 
 #[test]
 fn params_should_work() {
@@ -602,9 +599,8 @@ fn curve_handles_all_inputs() {
 #[test]
 fn set_metadata_works() {
 	ExtBuilder::default().build_and_execute(|| {
-		use frame_support::traits::Hash as PreimageHash;
 		// invalid preimage hash.
-		let invalid_hash: PreimageHash = [1u8; 32].into();
+		let invalid_hash: <Test as frame_system::Config>::Hash = [1u8; 32].into();
 		// fails to set metadata for a finished referendum.
 		assert_ok!(Referenda::submit(
 			RuntimeOrigin::signed(1),
diff --git a/substrate/frame/referenda/src/types.rs b/substrate/frame/referenda/src/types.rs
index ba89383888a7d7062267875095bbe439c01bb36b..8d6a13ef27c981b3996425b18062e2ef04a2f68b 100644
--- a/substrate/frame/referenda/src/types.rs
+++ b/substrate/frame/referenda/src/types.rs
@@ -34,7 +34,8 @@ pub type NegativeImbalanceOf<T, I> = <<T as Config<I>>::Currency as Currency<
 	<T as frame_system::Config>::AccountId,
 >>::NegativeImbalance;
 pub type CallOf<T, I> = <T as Config<I>>::RuntimeCall;
-pub type BoundedCallOf<T, I> = Bounded<<T as Config<I>>::RuntimeCall>;
+pub type BoundedCallOf<T, I> =
+	Bounded<<T as Config<I>>::RuntimeCall, <T as frame_system::Config>::Hashing>;
 pub type VotesOf<T, I> = <T as Config<I>>::Votes;
 pub type TallyOf<T, I> = <T as Config<I>>::Tally;
 pub type PalletsOriginOf<T> =
diff --git a/substrate/frame/remark/Cargo.toml b/substrate/frame/remark/Cargo.toml
index cfd34209c1ad392af687baa5d21ac7b006c44e8d..ae791011b160c47d7ec74371acccbd837050df09 100644
--- a/substrate/frame/remark/Cargo.toml
+++ b/substrate/frame/remark/Cargo.toml
@@ -1,11 +1,11 @@
 [package]
 name = "pallet-remark"
 version = "4.0.0-dev"
-authors = ["Parity Technologies <admin@parity.io>"]
-edition = "2021"
+authors.workspace = true
+edition.workspace = true
 license = "Apache-2.0"
 homepage = "https://substrate.io"
-repository = "https://github.com/paritytech/substrate/"
+repository.workspace = true
 description = "Remark storage pallet"
 readme = "README.md"
 
@@ -15,7 +15,7 @@ targets = ["x86_64-unknown-linux-gnu"]
 [dependencies]
 codec = { package = "parity-scale-codec", version = "3.6.1", default-features = false }
 scale-info = { version = "2.5.0", default-features = false, features = ["derive"] }
-serde = { version = "1.0.163", optional = true }
+serde = { version = "1.0.188", optional = true }
 frame-benchmarking = { path = "../benchmarking", default-features = false, optional = true}
 frame-support = { path = "../support", default-features = false}
 frame-system = { path = "../system", default-features = false}
diff --git a/substrate/frame/remark/README.md b/substrate/frame/remark/README.md
index f2341d6a0eaec45287957feab73a0199ddc17dff..5224f1b2882071eec72243cf3ef0ea706e57e52c 100644
--- a/substrate/frame/remark/README.md
+++ b/substrate/frame/remark/README.md
@@ -1,6 +1,6 @@
 # Remark Storage Pallet
 
-Allows storing arbitrary data off chain. 
+Allows storing arbitrary data off chain.
 
 
 License: Apache-2.0
diff --git a/substrate/frame/root-offences/Cargo.toml b/substrate/frame/root-offences/Cargo.toml
index c2df0a79e6947bd5c199194e7cc4f05d3e95a3c6..fa3cf981d7c7935fa0eab8a72f3168c799a19238 100644
--- a/substrate/frame/root-offences/Cargo.toml
+++ b/substrate/frame/root-offences/Cargo.toml
@@ -1,11 +1,11 @@
 [package]
 name = "pallet-root-offences"
 version = "1.0.0-dev"
-authors = ["Parity Technologies <admin@parity.io>"]
-edition = "2021"
+authors.workspace = true
+edition.workspace = true
 license = "Apache-2.0"
 homepage = "https://substrate.io"
-repository = "https://github.com/paritytech/substrate/"
+repository.workspace = true
 description = "FRAME root offences pallet"
 readme = "README.md"
 
diff --git a/substrate/frame/root-offences/README.md b/substrate/frame/root-offences/README.md
index c582158721816d6e16ee3d2f1a93d5daa555a1da..b4e8381df2e71e275bae10de1f6effde748cbc13 100644
--- a/substrate/frame/root-offences/README.md
+++ b/substrate/frame/root-offences/README.md
@@ -2,4 +2,4 @@
 
 Pallet that allows the root to create an offence.
 
-NOTE: This pallet should only be used for testing purposes.
\ No newline at end of file
+NOTE: This pallet should only be used for testing purposes.
diff --git a/substrate/frame/root-testing/Cargo.toml b/substrate/frame/root-testing/Cargo.toml
index 9e0c0d385119ef4bf41a03ba9aa1a15c0ec72dd0..8c6c2dc46ef12b7f1f96e2babf5de074222a7c7e 100644
--- a/substrate/frame/root-testing/Cargo.toml
+++ b/substrate/frame/root-testing/Cargo.toml
@@ -1,11 +1,11 @@
 [package]
 name = "pallet-root-testing"
 version = "1.0.0-dev"
-authors = ["Parity Technologies <admin@parity.io>"]
-edition = "2021"
+authors.workspace = true
+edition.workspace = true
 license = "Apache-2.0"
 homepage = "https://substrate.io"
-repository = "https://github.com/paritytech/substrate/"
+repository.workspace = true
 description = "FRAME root testing pallet"
 readme = "README.md"
 publish = false
diff --git a/substrate/frame/root-testing/README.md b/substrate/frame/root-testing/README.md
index 637430445a22f6046f6a20bd6fc8ba58901373bc..aa231e3ef20a06e1afd7d03939d82b4b06853dc9 100644
--- a/substrate/frame/root-testing/README.md
+++ b/substrate/frame/root-testing/README.md
@@ -2,4 +2,4 @@
 
 Pallet that contains extrinsics that can be usefull in testing.
 
-NOTE: This pallet should only be used for testing purposes and should not be used in production runtimes!
\ No newline at end of file
+NOTE: This pallet should only be used for testing purposes and should not be used in production runtimes!
diff --git a/substrate/frame/root-testing/src/lib.rs b/substrate/frame/root-testing/src/lib.rs
index e04c7bfa13d26f5e40a8d5625d234c0a7ae93de7..bbcda09c3065da2ad7b197c69b6ee7143dda1338 100644
--- a/substrate/frame/root-testing/src/lib.rs
+++ b/substrate/frame/root-testing/src/lib.rs
@@ -29,7 +29,7 @@ use sp_runtime::Perbill;
 
 pub use pallet::*;
 
-#[frame_support::pallet]
+#[frame_support::pallet(dev_mode)]
 pub mod pallet {
 	use super::*;
 	use frame_support::pallet_prelude::*;
diff --git a/substrate/frame/safe-mode/Cargo.toml b/substrate/frame/safe-mode/Cargo.toml
index cbb5f08b6cd67300a6dd58f384d65a432d43ebf7..a934092ee53dfff06e69a616d8de3a9582497d8d 100644
--- a/substrate/frame/safe-mode/Cargo.toml
+++ b/substrate/frame/safe-mode/Cargo.toml
@@ -1,11 +1,11 @@
 [package]
 name = "pallet-safe-mode"
 version = "4.0.0-dev"
-authors = ["Parity Technologies <admin@parity.io>"]
-edition = "2021"
+authors.workspace = true
+edition.workspace = true
 license = "Apache-2.0"
 homepage = "https://substrate.io"
-repository = "https://github.com/paritytech/substrate/"
+repository.workspace = true
 description = "FRAME safe-mode pallet"
 
 [package.metadata.docs.rs]
diff --git a/substrate/frame/safe-mode/src/lib.rs b/substrate/frame/safe-mode/src/lib.rs
index ff045b964afbb6bec04075314d53832451e7472c..b8e8378fa9e7cbd23c6c2f5f8d195c1648652273 100644
--- a/substrate/frame/safe-mode/src/lib.rs
+++ b/substrate/frame/safe-mode/src/lib.rs
@@ -398,7 +398,7 @@ pub mod pallet {
 		/// [`EnteredUntil`].
 		fn on_initialize(current: BlockNumberFor<T>) -> Weight {
 			let Some(limit) = EnteredUntil::<T>::get() else {
-				return T::WeightInfo::on_initialize_noop();
+				return T::WeightInfo::on_initialize_noop()
 			};
 
 			if current > limit {
diff --git a/substrate/frame/safe-mode/src/mock.rs b/substrate/frame/safe-mode/src/mock.rs
index 337b6076f84b994bde73691deb55cc80fe141747..635ee0cfedc025ec4796d95dfbdef2cd50275349 100644
--- a/substrate/frame/safe-mode/src/mock.rs
+++ b/substrate/frame/safe-mode/src/mock.rs
@@ -122,7 +122,10 @@ impl InstanceFilter<RuntimeCall> for ProxyType {
 		match self {
 			ProxyType::Any => true,
 			ProxyType::JustTransfer => {
-				matches!(c, RuntimeCall::Balances(pallet_balances::Call::transfer { .. }))
+				matches!(
+					c,
+					RuntimeCall::Balances(pallet_balances::Call::transfer_allow_death { .. })
+				)
 			},
 			ProxyType::JustUtility => matches!(c, RuntimeCall::Utility { .. }),
 		}
diff --git a/substrate/frame/safe-mode/src/tests.rs b/substrate/frame/safe-mode/src/tests.rs
index 4ce9922d3b65c70646caec497a394704973edcc9..ca1d7eb1d93400b0bad97c45ac6aee00e15e2aa9 100644
--- a/substrate/frame/safe-mode/src/tests.rs
+++ b/substrate/frame/safe-mode/src/tests.rs
@@ -22,8 +22,8 @@
 use super::*;
 use crate::mock::{RuntimeCall, *};
 
-use frame_support::{assert_err, assert_noop, assert_ok, dispatch::Dispatchable, traits::Currency};
-use sp_runtime::TransactionOutcome;
+use frame_support::{assert_err, assert_noop, assert_ok, traits::Currency};
+use sp_runtime::{traits::Dispatchable, TransactionOutcome};
 
 /// Do something hypothetically by rolling back any changes afterwards.
 ///
@@ -605,7 +605,7 @@ fn fails_when_explicit_origin_required() {
 }
 
 fn call_transfer() -> RuntimeCall {
-	RuntimeCall::Balances(pallet_balances::Call::transfer { dest: 1, value: 1 })
+	RuntimeCall::Balances(pallet_balances::Call::transfer_allow_death { dest: 1, value: 1 })
 }
 
 fn signed(who: u64) -> RuntimeOrigin {
diff --git a/substrate/frame/salary/Cargo.toml b/substrate/frame/salary/Cargo.toml
index e1a3a36a7c5fdd06b741f45cb302c3e5e8ed5849..89b92fa7e7b8cf4294251e4bcf22cfb71f91342b 100644
--- a/substrate/frame/salary/Cargo.toml
+++ b/substrate/frame/salary/Cargo.toml
@@ -1,11 +1,11 @@
 [package]
 name = "pallet-salary"
 version = "4.0.0-dev"
-authors = ["Parity Technologies <admin@parity.io>"]
-edition = "2021"
+authors.workspace = true
+edition.workspace = true
 license = "Apache-2.0"
 homepage = "https://substrate.io"
-repository = "https://github.com/paritytech/substrate/"
+repository.workspace = true
 description = "Paymaster"
 readme = "README.md"
 
diff --git a/substrate/frame/salary/README.md b/substrate/frame/salary/README.md
index 25c1be0e805d777be200a8ff8dae88199ce0935e..ec3882dd09788b3c4b02ad915d1233d0e18ae64a 100644
--- a/substrate/frame/salary/README.md
+++ b/substrate/frame/salary/README.md
@@ -1,3 +1,3 @@
 # Salary
 
-Make periodic payment to members of a ranked collective according to rank.
\ No newline at end of file
+Make periodic payment to members of a ranked collective according to rank.
diff --git a/substrate/frame/salary/src/lib.rs b/substrate/frame/salary/src/lib.rs
index 75d6fdd329ac82582edb7df0412a36bf0325a599..f2903f527f25a5c21348e8214d5a2afe5bc4f14b 100644
--- a/substrate/frame/salary/src/lib.rs
+++ b/substrate/frame/salary/src/lib.rs
@@ -1,6 +1,6 @@
 // This file is part of Substrate.
 
-// Copyright (C) 2017-2022 Parity Technologies (UK) Ltd.
+// Copyright (C) Parity Technologies (UK) Ltd.
 // SPDX-License-Identifier: Apache-2.0
 
 // Licensed under the Apache License, Version 2.0 (the "License");
diff --git a/substrate/frame/salary/src/tests.rs b/substrate/frame/salary/src/tests.rs
index 034dce24b8b3883a768a54074f73510cab02a08a..1136ea746f605cde30a4a09c651e90e8b4acae9c 100644
--- a/substrate/frame/salary/src/tests.rs
+++ b/substrate/frame/salary/src/tests.rs
@@ -1,6 +1,6 @@
 // This file is part of Substrate.
 
-// Copyright (C) 2017-2022 Parity Technologies (UK) Ltd.
+// Copyright (C) Parity Technologies (UK) Ltd.
 // SPDX-License-Identifier: Apache-2.0
 
 // Licensed under the Apache License, Version 2.0 (the "License");
diff --git a/substrate/frame/scheduler/Cargo.toml b/substrate/frame/scheduler/Cargo.toml
index b9b296cd1ea4040d3518d03dbdcbaceddc979e4f..e81b4dbeff78c53e645dd4988b86411193127ac7 100644
--- a/substrate/frame/scheduler/Cargo.toml
+++ b/substrate/frame/scheduler/Cargo.toml
@@ -1,11 +1,11 @@
 [package]
 name = "pallet-scheduler"
 version = "4.0.0-dev"
-authors = ["Parity Technologies <admin@parity.io>"]
-edition = "2021"
+authors.workspace = true
+edition.workspace = true
 license = "Apache-2.0"
 homepage = "https://substrate.io"
-repository = "https://github.com/paritytech/substrate/"
+repository.workspace = true
 description = "FRAME Scheduler pallet"
 readme = "README.md"
 
@@ -20,7 +20,7 @@ sp-io = { path = "../../primitives/io", default-features = false}
 sp-runtime = { path = "../../primitives/runtime", default-features = false}
 sp-std = { path = "../../primitives/std", default-features = false}
 sp-weights = { path = "../../primitives/weights", default-features = false}
-docify = "0.2.1"
+docify = "0.2.4"
 
 [dev-dependencies]
 pallet-preimage = { path = "../preimage" }
diff --git a/substrate/frame/scheduler/README.md b/substrate/frame/scheduler/README.md
index bdd2c2226c88e8318c54f9e61521cc6a0417a47b..6aec2ddb0e4325e8ec4bbe3987ad2ee16a12cd52 100644
--- a/substrate/frame/scheduler/README.md
+++ b/substrate/frame/scheduler/README.md
@@ -23,12 +23,12 @@ then those filter will not be used when dispatching the schedule call.
 
 ### Dispatchable Functions
 
-* `schedule` - schedule a dispatch, which may be periodic, to occur at a
+- `schedule` - schedule a dispatch, which may be periodic, to occur at a
   specified block and with a specified priority.
-* `cancel` - cancel a scheduled dispatch, specified by block number and
+- `cancel` - cancel a scheduled dispatch, specified by block number and
   index.
-* `schedule_named` - augments the `schedule` interface with an additional
+- `schedule_named` - augments the `schedule` interface with an additional
   `Vec<u8>` parameter that can be used for identification.
-* `cancel_named` - the named complement to the cancel function.
+- `cancel_named` - the named complement to the cancel function.
 
 License: Apache 2.0
diff --git a/substrate/frame/scheduler/src/benchmarking.rs b/substrate/frame/scheduler/src/benchmarking.rs
index b41cea449654c5035e0cb2024177ae0db549c71b..cc86a17973780870970a7b604b4fd5d30cffe263 100644
--- a/substrate/frame/scheduler/src/benchmarking.rs
+++ b/substrate/frame/scheduler/src/benchmarking.rs
@@ -82,13 +82,13 @@ fn make_task<T: Config>(
 	Scheduled { maybe_id, priority, call, maybe_periodic, origin, _phantom: PhantomData }
 }
 
-fn bounded<T: Config>(len: u32) -> Option<Bounded<<T as Config>::RuntimeCall>> {
+fn bounded<T: Config>(len: u32) -> Option<BoundedCallOf<T>> {
 	let call =
 		<<T as Config>::RuntimeCall>::from(SystemCall::remark { remark: vec![0; len as usize] });
 	T::Preimages::bound(call).ok()
 }
 
-fn make_call<T: Config>(maybe_lookup_len: Option<u32>) -> Bounded<<T as Config>::RuntimeCall> {
+fn make_call<T: Config>(maybe_lookup_len: Option<u32>) -> BoundedCallOf<T> {
 	let bound = BoundedInline::bound() as u32;
 	let mut len = match maybe_lookup_len {
 		Some(len) => len.min(T::Preimages::MAX_LENGTH as u32 - 2).max(bound) - 3,
@@ -131,7 +131,7 @@ benchmarks! {
 		let now = BlockNumberFor::<T>::from(BLOCK_NUMBER);
 		IncompleteSince::<T>::put(now - One::one());
 	}: {
-		Scheduler::<T>::service_agendas(&mut WeightMeter::max_limit(), now, 0);
+		Scheduler::<T>::service_agendas(&mut WeightMeter::new(), now, 0);
 	} verify {
 		assert_eq!(IncompleteSince::<T>::get(), Some(now - One::one()));
 	}
@@ -143,7 +143,7 @@ benchmarks! {
 		fill_schedule::<T>(now, s)?;
 		let mut executed = 0;
 	}: {
-		Scheduler::<T>::service_agenda(&mut WeightMeter::max_limit(), &mut executed, now, now, 0);
+		Scheduler::<T>::service_agenda(&mut WeightMeter::new(), &mut executed, now, now, 0);
 	} verify {
 		assert_eq!(executed, 0);
 	}
@@ -154,7 +154,7 @@ benchmarks! {
 		let now = BLOCK_NUMBER.into();
 		let task = make_task::<T>(false, false, false, None, 0);
 		// prevent any tasks from actually being executed as we only want the surrounding weight.
-		let mut counter = WeightMeter::from_limit(Weight::zero());
+		let mut counter = WeightMeter::with_limit(Weight::zero());
 	}: {
 		let result = Scheduler::<T>::service_task(&mut counter, now, now, 0, true, task);
 	} verify {
@@ -172,7 +172,7 @@ benchmarks! {
 		let now = BLOCK_NUMBER.into();
 		let task = make_task::<T>(false, false, false, Some(s), 0);
 		// prevent any tasks from actually being executed as we only want the surrounding weight.
-		let mut counter = WeightMeter::from_limit(Weight::zero());
+		let mut counter = WeightMeter::with_limit(Weight::zero());
 	}: {
 		let result = Scheduler::<T>::service_task(&mut counter, now, now, 0, true, task);
 	} verify {
@@ -184,7 +184,7 @@ benchmarks! {
 		let now = BLOCK_NUMBER.into();
 		let task = make_task::<T>(false, true, false, None, 0);
 		// prevent any tasks from actually being executed as we only want the surrounding weight.
-		let mut counter = WeightMeter::from_limit(Weight::zero());
+		let mut counter = WeightMeter::with_limit(Weight::zero());
 	}: {
 		let result = Scheduler::<T>::service_task(&mut counter, now, now, 0, true, task);
 	} verify {
@@ -196,7 +196,7 @@ benchmarks! {
 		let now = BLOCK_NUMBER.into();
 		let task = make_task::<T>(true, false, false, None, 0);
 		// prevent any tasks from actually being executed as we only want the surrounding weight.
-		let mut counter = WeightMeter::from_limit(Weight::zero());
+		let mut counter = WeightMeter::with_limit(Weight::zero());
 	}: {
 		let result = Scheduler::<T>::service_task(&mut counter, now, now, 0, true, task);
 	} verify {
@@ -204,7 +204,7 @@ benchmarks! {
 
 	// `execute_dispatch` when the origin is `Signed`, not counting the dispatable's weight.
 	execute_dispatch_signed {
-		let mut counter = WeightMeter::max_limit();
+		let mut counter = WeightMeter::new();
 		let origin = make_origin::<T>(true);
 		let call = T::Preimages::realize(&make_call::<T>(None)).unwrap().0;
 	}: {
@@ -215,7 +215,7 @@ benchmarks! {
 
 	// `execute_dispatch` when the origin is not `Signed`, not counting the dispatable's weight.
 	execute_dispatch_unsigned {
-		let mut counter = WeightMeter::max_limit();
+		let mut counter = WeightMeter::new();
 		let origin = make_origin::<T>(false);
 		let call = T::Preimages::realize(&make_call::<T>(None)).unwrap().0;
 	}: {
diff --git a/substrate/frame/scheduler/src/lib.rs b/substrate/frame/scheduler/src/lib.rs
index 3538331bbd4ca0ebf9a3cf00712bdc9f12914cd6..e94f154eee32f908dc449ba7ff9e54853cc4b915 100644
--- a/substrate/frame/scheduler/src/lib.rs
+++ b/substrate/frame/scheduler/src/lib.rs
@@ -17,7 +17,7 @@
 
 //! > Made with *Substrate*, for *Polkadot*.
 //!
-//! [![github]](https://github.com/paritytech/substrate/frame/fast-unstake) -
+//! [![github]](https://github.com/paritytech/polkadot-sdk/tree/master/substrate/frame/scheduler) -
 //! [![polkadot]](https://polkadot.network)
 //!
 //! [polkadot]: https://img.shields.io/badge/polkadot-E6007A?style=for-the-badge&logo=polkadot&logoColor=white
@@ -87,14 +87,12 @@ pub mod weights;
 
 use codec::{Decode, Encode, MaxEncodedLen};
 use frame_support::{
-	dispatch::{
-		DispatchError, DispatchResult, Dispatchable, GetDispatchInfo, Parameter, RawOrigin,
-	},
+	dispatch::{DispatchResult, GetDispatchInfo, Parameter, RawOrigin},
 	ensure,
 	traits::{
 		schedule::{self, DispatchTime, MaybeHashed},
-		Bounded, CallerTrait, EnsureOrigin, Get, Hash as PreimageHash, IsType, OriginTrait,
-		PalletInfoAccess, PrivilegeCmp, QueryPreimage, StorageVersion, StorePreimage,
+		Bounded, CallerTrait, EnsureOrigin, Get, IsType, OriginTrait, PalletInfoAccess,
+		PrivilegeCmp, QueryPreimage, StorageVersion, StorePreimage,
 	},
 	weights::{Weight, WeightMeter},
 };
@@ -105,8 +103,8 @@ use frame_system::{
 use scale_info::TypeInfo;
 use sp_io::hashing::blake2_256;
 use sp_runtime::{
-	traits::{BadOrigin, One, Saturating, Zero},
-	BoundedVec, RuntimeDebug,
+	traits::{BadOrigin, Dispatchable, One, Saturating, Zero},
+	BoundedVec, DispatchError, RuntimeDebug,
 };
 use sp_std::{borrow::Borrow, cmp::Ordering, marker::PhantomData, prelude::*};
 
@@ -121,6 +119,9 @@ pub type TaskAddress<BlockNumber> = (BlockNumber, u32);
 pub type CallOrHashOf<T> =
 	MaybeHashed<<T as Config>::RuntimeCall, <T as frame_system::Config>::Hash>;
 
+pub type BoundedCallOf<T> =
+	Bounded<<T as Config>::RuntimeCall, <T as frame_system::Config>::Hashing>;
+
 #[cfg_attr(any(feature = "std", test), derive(PartialEq, Eq))]
 #[derive(Clone, RuntimeDebug, Encode, Decode)]
 struct ScheduledV1<Call, BlockNumber> {
@@ -167,7 +168,7 @@ pub type ScheduledV3Of<T> = ScheduledV3<
 
 pub type ScheduledOf<T> = Scheduled<
 	TaskName,
-	Bounded<<T as Config>::RuntimeCall>,
+	BoundedCallOf<T>,
 	BlockNumberFor<T>,
 	<T as Config>::PalletsOrigin,
 	<T as frame_system::Config>::AccountId,
@@ -256,7 +257,7 @@ pub mod pallet {
 		type WeightInfo: WeightInfo;
 
 		/// The preimage provider with which we look up call hashes to get the call.
-		type Preimages: QueryPreimage + StorePreimage;
+		type Preimages: QueryPreimage<H = Self::Hashing> + StorePreimage;
 	}
 
 	#[pallet::storage]
@@ -320,7 +321,7 @@ pub mod pallet {
 	impl<T: Config> Hooks<BlockNumberFor<T>> for Pallet<T> {
 		/// Execute the scheduled calls
 		fn on_initialize(now: BlockNumberFor<T>) -> Weight {
-			let mut weight_counter = WeightMeter::from_limit(T::MaximumWeight::get());
+			let mut weight_counter = WeightMeter::with_limit(T::MaximumWeight::get());
 			Self::service_agendas(&mut weight_counter, now, u32::max_value());
 			weight_counter.consumed()
 		}
@@ -442,7 +443,7 @@ pub mod pallet {
 	}
 }
 
-impl<T: Config<Hash = PreimageHash>> Pallet<T> {
+impl<T: Config> Pallet<T> {
 	/// Migrate storage format from V1 to V4.
 	///
 	/// Returns the weight consumed by this migration.
@@ -629,7 +630,7 @@ impl<T: Config<Hash = PreimageHash>> Pallet<T> {
 										>(&bounded)
 										{
 											log::error!(
-												"Dropping undecodable call {}: {:?}",
+												"Dropping undecodable call {:?}: {:?}",
 												&h,
 												&err
 											);
@@ -697,7 +698,7 @@ impl<T: Config> Pallet<T> {
 				Option<
 					Scheduled<
 						TaskName,
-						Bounded<<T as Config>::RuntimeCall>,
+						BoundedCallOf<T>,
 						BlockNumberFor<T>,
 						OldOrigin,
 						T::AccountId,
@@ -799,7 +800,7 @@ impl<T: Config> Pallet<T> {
 		maybe_periodic: Option<schedule::Period<BlockNumberFor<T>>>,
 		priority: schedule::Priority,
 		origin: T::PalletsOrigin,
-		call: Bounded<<T as Config>::RuntimeCall>,
+		call: BoundedCallOf<T>,
 	) -> Result<TaskAddress<BlockNumberFor<T>>, DispatchError> {
 		let when = Self::resolve_time(when)?;
 
@@ -888,7 +889,7 @@ impl<T: Config> Pallet<T> {
 		maybe_periodic: Option<schedule::Period<BlockNumberFor<T>>>,
 		priority: schedule::Priority,
 		origin: T::PalletsOrigin,
-		call: Bounded<<T as Config>::RuntimeCall>,
+		call: BoundedCallOf<T>,
 	) -> Result<TaskAddress<BlockNumberFor<T>>, DispatchError> {
 		// ensure id it is unique
 		if Lookup::<T>::contains_key(&id) {
@@ -1096,7 +1097,14 @@ impl<T: Config> Pallet<T> {
 
 		let (call, lookup_len) = match T::Preimages::peek(&task.call) {
 			Ok(c) => c,
-			Err(_) => return Err((Unavailable, Some(task))),
+			Err(_) => {
+				Self::deposit_event(Event::CallUnavailable {
+					task: (when, agenda_index),
+					id: task.maybe_id,
+				});
+
+				return Err((Unavailable, Some(task)))
+			},
 		};
 
 		let _ = weight.try_consume(T::WeightInfo::service_task(
@@ -1106,15 +1114,7 @@ impl<T: Config> Pallet<T> {
 		));
 
 		match Self::execute_dispatch(weight, task.origin.clone(), call) {
-			Err(Unavailable) => {
-				debug_assert!(false, "Checked to exist with `peek`");
-				Self::deposit_event(Event::CallUnavailable {
-					task: (when, agenda_index),
-					id: task.maybe_id,
-				});
-				Err((Unavailable, Some(task)))
-			},
-			Err(Overweight) if is_first => {
+			Err(()) if is_first => {
 				T::Preimages::drop(&task.call);
 				Self::deposit_event(Event::PermanentlyOverweight {
 					task: (when, agenda_index),
@@ -1122,7 +1122,7 @@ impl<T: Config> Pallet<T> {
 				});
 				Err((Unavailable, Some(task)))
 			},
-			Err(Overweight) => Err((Overweight, Some(task))),
+			Err(()) => Err((Overweight, Some(task))),
 			Ok(result) => {
 				Self::deposit_event(Event::Dispatched {
 					task: (when, agenda_index),
@@ -1162,11 +1162,13 @@ impl<T: Config> Pallet<T> {
 	///
 	/// NOTE: Only the weight for this function will be counted (origin lookup, dispatch and the
 	/// call itself).
+	///
+	/// Returns an error if the call is overweight.
 	fn execute_dispatch(
 		weight: &mut WeightMeter,
 		origin: T::PalletsOrigin,
 		call: <T as Config>::RuntimeCall,
-	) -> Result<DispatchResult, ServiceTaskError> {
+	) -> Result<DispatchResult, ()> {
 		let base_weight = match origin.as_system_ref() {
 			Some(&RawOrigin::Signed(_)) => T::WeightInfo::execute_dispatch_signed(),
 			_ => T::WeightInfo::execute_dispatch_unsigned(),
@@ -1176,7 +1178,7 @@ impl<T: Config> Pallet<T> {
 		let max_weight = base_weight.saturating_add(call_weight);
 
 		if !weight.can_consume(max_weight) {
-			return Err(Overweight)
+			return Err(())
 		}
 
 		let dispatch_origin = origin.into();
@@ -1192,8 +1194,8 @@ impl<T: Config> Pallet<T> {
 	}
 }
 
-impl<T: Config<Hash = PreimageHash>>
-	schedule::v2::Anon<BlockNumberFor<T>, <T as Config>::RuntimeCall, T::PalletsOrigin> for Pallet<T>
+impl<T: Config> schedule::v2::Anon<BlockNumberFor<T>, <T as Config>::RuntimeCall, T::PalletsOrigin>
+	for Pallet<T>
 {
 	type Address = TaskAddress<BlockNumberFor<T>>;
 	type Hash = T::Hash;
@@ -1226,8 +1228,8 @@ impl<T: Config<Hash = PreimageHash>>
 	}
 }
 
-impl<T: Config<Hash = PreimageHash>>
-	schedule::v2::Named<BlockNumberFor<T>, <T as Config>::RuntimeCall, T::PalletsOrigin> for Pallet<T>
+impl<T: Config> schedule::v2::Named<BlockNumberFor<T>, <T as Config>::RuntimeCall, T::PalletsOrigin>
+	for Pallet<T>
 {
 	type Address = TaskAddress<BlockNumberFor<T>>;
 	type Hash = T::Hash;
@@ -1271,13 +1273,14 @@ impl<T: Config> schedule::v3::Anon<BlockNumberFor<T>, <T as Config>::RuntimeCall
 	for Pallet<T>
 {
 	type Address = TaskAddress<BlockNumberFor<T>>;
+	type Hasher = T::Hashing;
 
 	fn schedule(
 		when: DispatchTime<BlockNumberFor<T>>,
 		maybe_periodic: Option<schedule::Period<BlockNumberFor<T>>>,
 		priority: schedule::Priority,
 		origin: T::PalletsOrigin,
-		call: Bounded<<T as Config>::RuntimeCall>,
+		call: BoundedCallOf<T>,
 	) -> Result<Self::Address, DispatchError> {
 		Self::do_schedule(when, maybe_periodic, priority, origin, call)
 	}
@@ -1309,6 +1312,7 @@ impl<T: Config> schedule::v3::Named<BlockNumberFor<T>, <T as Config>::RuntimeCal
 	for Pallet<T>
 {
 	type Address = TaskAddress<BlockNumberFor<T>>;
+	type Hasher = T::Hashing;
 
 	fn schedule_named(
 		id: TaskName,
@@ -1316,7 +1320,7 @@ impl<T: Config> schedule::v3::Named<BlockNumberFor<T>, <T as Config>::RuntimeCal
 		maybe_periodic: Option<schedule::Period<BlockNumberFor<T>>>,
 		priority: schedule::Priority,
 		origin: T::PalletsOrigin,
-		call: Bounded<<T as Config>::RuntimeCall>,
+		call: BoundedCallOf<T>,
 	) -> Result<Self::Address, DispatchError> {
 		Self::do_schedule_named(id, when, maybe_periodic, priority, origin, call)
 	}
diff --git a/substrate/frame/scheduler/src/migration.rs b/substrate/frame/scheduler/src/migration.rs
index 06259768f0aa1be7ef836284c3aecf8e5070b117..9c8b0da03fc0b6368b2734c07db164a4ccc3b683 100644
--- a/substrate/frame/scheduler/src/migration.rs
+++ b/substrate/frame/scheduler/src/migration.rs
@@ -83,7 +83,7 @@ pub mod v3 {
 	/// Migrate the scheduler pallet from V3 to V4.
 	pub struct MigrateToV4<T>(sp_std::marker::PhantomData<T>);
 
-	impl<T: Config<Hash = PreimageHash>> OnRuntimeUpgrade for MigrateToV4<T> {
+	impl<T: Config> OnRuntimeUpgrade for MigrateToV4<T> {
 		#[cfg(feature = "try-runtime")]
 		fn pre_upgrade() -> Result<Vec<u8>, TryRuntimeError> {
 			ensure!(StorageVersion::get::<Pallet<T>>() == 3, "Can only upgrade from version 3");
diff --git a/substrate/frame/scheduler/src/mock.rs b/substrate/frame/scheduler/src/mock.rs
index 28e334958d924f927737a033f9e732fba66b4581..b6eb1d044fa2321935b0bbd74ae6e89b1114bf3c 100644
--- a/substrate/frame/scheduler/src/mock.rs
+++ b/substrate/frame/scheduler/src/mock.rs
@@ -100,7 +100,7 @@ frame_support::construct_runtime!(
 		System: frame_system::{Pallet, Call, Config<T>, Storage, Event<T>},
 		Logger: logger::{Pallet, Call, Event<T>},
 		Scheduler: scheduler::{Pallet, Call, Storage, Event<T>},
-		Preimage: pallet_preimage::{Pallet, Call, Storage, Event<T>},
+		Preimage: pallet_preimage::{Pallet, Call, Storage, Event<T>, HoldReason},
 	}
 );
 
@@ -155,8 +155,7 @@ impl pallet_preimage::Config for Test {
 	type WeightInfo = ();
 	type Currency = ();
 	type ManagerOrigin = EnsureRoot<u64>;
-	type BaseDeposit = ();
-	type ByteDeposit = ();
+	type Consideration = ();
 }
 
 pub struct TestWeightInfo;
diff --git a/substrate/frame/scheduler/src/tests.rs b/substrate/frame/scheduler/src/tests.rs
index 477df5579dcf1d8f5984e7fb982b406f891e3323..1bf8b3e5f3a03bd2c9d233a24351d1ae2d923c45 100644
--- a/substrate/frame/scheduler/src/tests.rs
+++ b/substrate/frame/scheduler/src/tests.rs
@@ -1019,7 +1019,7 @@ fn test_migrate_origin() {
 	new_test_ext().execute_with(|| {
 		for i in 0..3u64 {
 			let k = i.twox_64_concat();
-			let old: Vec<Option<Scheduled<[u8; 32], Bounded<RuntimeCall>, u64, u32, u64>>> = vec![
+			let old: Vec<Option<Scheduled<[u8; 32], BoundedCallOf<Test>, u64, u32, u64>>> = vec![
 				Some(Scheduled {
 					maybe_id: None,
 					priority: i as u8 + 10,
@@ -1878,3 +1878,42 @@ fn reschedule_named_last_task_removes_agenda() {
 		assert!(Agenda::<Test>::get(when).len() == 0);
 	});
 }
+
+/// Ensures that an unvailable call sends an event.
+#[test]
+fn unavailable_call_is_detected() {
+	use frame_support::traits::schedule::v3::Named;
+
+	new_test_ext().execute_with(|| {
+		let call =
+			RuntimeCall::Logger(LoggerCall::log { i: 42, weight: Weight::from_parts(10, 0) });
+		let hash = <Test as frame_system::Config>::Hashing::hash_of(&call);
+		let len = call.using_encoded(|x| x.len()) as u32;
+		// Important to use here `Bounded::Lookup` to ensure that we request the hash.
+		let bound = Bounded::Lookup { hash, len };
+
+		let name = [1u8; 32];
+
+		// Schedule a call.
+		let _address = <Scheduler as Named<_, _, _>>::schedule_named(
+			name,
+			DispatchTime::At(4),
+			None,
+			127,
+			root(),
+			bound.clone(),
+		)
+		.unwrap();
+
+		// Ensure the preimage isn't available
+		assert!(!Preimage::have(&bound));
+
+		// Executes in block 4.
+		run_to_block(4);
+
+		assert_eq!(
+			System::events().last().unwrap().event,
+			crate::Event::CallUnavailable { task: (4, 0), id: Some(name) }.into()
+		);
+	});
+}
diff --git a/substrate/frame/scored-pool/Cargo.toml b/substrate/frame/scored-pool/Cargo.toml
index 5c5f655b32ce4f5800b1d6d1b1c2918d7022ad14..5bd23ce22ce59f1147c2ad0fde36f5f4cb6ff304 100644
--- a/substrate/frame/scored-pool/Cargo.toml
+++ b/substrate/frame/scored-pool/Cargo.toml
@@ -1,11 +1,11 @@
 [package]
 name = "pallet-scored-pool"
 version = "4.0.0-dev"
-authors = ["Parity Technologies <admin@parity.io>"]
-edition = "2021"
+authors.workspace = true
+edition.workspace = true
 license = "Apache-2.0"
 homepage = "https://substrate.io"
-repository = "https://github.com/paritytech/substrate/"
+repository.workspace = true
 description = "FRAME pallet for scored pools"
 readme = "README.md"
 
diff --git a/substrate/frame/session/Cargo.toml b/substrate/frame/session/Cargo.toml
index 4d81e102f18687f6995dc62905a67bcb01424864..fa72d6c72785d4742e4b8605a7ef79a64e676056 100644
--- a/substrate/frame/session/Cargo.toml
+++ b/substrate/frame/session/Cargo.toml
@@ -1,11 +1,11 @@
 [package]
 name = "pallet-session"
 version = "4.0.0-dev"
-authors = ["Parity Technologies <admin@parity.io>"]
-edition = "2021"
+authors.workspace = true
+edition.workspace = true
 license = "Apache-2.0"
 homepage = "https://substrate.io"
-repository = "https://github.com/paritytech/substrate/"
+repository.workspace = true
 description = "FRAME sessions pallet"
 readme = "README.md"
 
diff --git a/substrate/frame/session/README.md b/substrate/frame/session/README.md
index 09132470d4433e71141b8efea9de9c5cc3eddef5..fa7c9b3f98348e4c72fac4fd44b94c492d656c09 100644
--- a/substrate/frame/session/README.md
+++ b/substrate/frame/session/README.md
@@ -1,7 +1,7 @@
 # Session Pallet
 
-The Session module allows validators to manage their session keys, provides a function for changing
-the session length, and handles session rotation.
+The Session module allows validators to manage their session keys, provides a function for changing the session length,
+and handles session rotation.
 
 - [`session::Trait`](https://docs.rs/pallet-session/latest/pallet_session/trait.Config.html)
 - [`Call`](https://docs.rs/pallet-session/latest/pallet_session/enum.Call.html)
@@ -12,34 +12,31 @@ the session length, and handles session rotation.
 ### Terminology
 <!-- Original author of paragraph: @gavofyork -->
 
-- **Session:** A session is a period of time that has a constant set of validators. Validators can only join
-or exit the validator set at a session change. It is measured in block numbers. The block where a session is
-ended is determined by the `ShouldEndSession` trait. When the session is ending, a new validator set
-can be chosen by `OnSessionEnding` implementations.
-- **Session key:** A session key is actually several keys kept together that provide the various signing
-functions required by network authorities/validators in pursuit of their duties.
-- **Validator ID:** Every account has an associated validator ID. For some simple staking systems, this
-may just be the same as the account ID. For staking systems using a stash/controller model,
-the validator ID would be the stash account ID of the controller.
-- **Session key configuration process:** Session keys are set using `set_keys` for use not in
-the next session, but the session after next. They are stored in `NextKeys`, a mapping between
-the caller's `ValidatorId` and the session keys provided. `set_keys` allows users to set their
-session key prior to being selected as validator.
-It is a public call since it uses `ensure_signed`, which checks that the origin is a signed account.
-As such, the account ID of the origin stored in `NextKeys` may not necessarily be associated with
-a block author or a validator. The session keys of accounts are removed once their account balance is zero.
-- **Session length:** This pallet does not assume anything about the length of each session.
-Rather, it relies on an implementation of `ShouldEndSession` to dictate a new session's start.
-This pallet provides the `PeriodicSessions` struct for simple periodic sessions.
-- **Session rotation configuration:** Configure as either a 'normal' (rewardable session where rewards are
-applied) or 'exceptional' (slashable) session rotation.
-- **Session rotation process:** At the beginning of each block, the `on_initialize` function
-queries the provided implementation of `ShouldEndSession`. If the session is to end the newly
-activated validator IDs and session keys are taken from storage and passed to the
-`SessionHandler`. The validator set supplied by `SessionManager::new_session` and the corresponding session
-keys, which may have been registered via `set_keys` during the previous session, are written
-to storage where they will wait one session before being passed to the `SessionHandler`
-themselves.
+- **Session:** A session is a period of time that has a constant set of validators. Validators can only join or exit the
+validator set at a session change. It is measured in block numbers. The block where a session is ended is determined by
+the `ShouldEndSession` trait. When the session is ending, a new validator set can be chosen by `OnSessionEnding`
+implementations.
+- **Session key:** A session key is actually several keys kept together that provide the various signing functions
+required by network authorities/validators in pursuit of their duties.
+- **Validator ID:** Every account has an associated validator ID. For some simple staking systems, this may just be the
+same as the account ID. For staking systems using a stash/controller model, the validator ID would be the stash account
+ID of the controller.
+- **Session key configuration process:** Session keys are set using `set_keys` for use not in the next session, but the
+session after next. They are stored in `NextKeys`, a mapping between the caller's `ValidatorId` and the session keys
+provided. `set_keys` allows users to set their session key prior to being selected as validator. It is a public call
+since it uses `ensure_signed`, which checks that the origin is a signed account. As such, the account ID of the origin
+stored in `NextKeys` may not necessarily be associated with a block author or a validator. The session keys of accounts
+are removed once their account balance is zero.
+- **Session length:** This pallet does not assume anything about the length of each session. Rather, it relies on an
+implementation of `ShouldEndSession` to dictate a new session's start. This pallet provides the `PeriodicSessions`
+struct for simple periodic sessions.
+- **Session rotation configuration:** Configure as either a 'normal' (rewardable session where rewards are applied) or
+'exceptional' (slashable) session rotation.
+- **Session rotation process:** At the beginning of each block, the `on_initialize` function queries the provided
+implementation of `ShouldEndSession`. If the session is to end the newly activated validator IDs and session keys are
+taken from storage and passed to the `SessionHandler`. The validator set supplied by `SessionManager::new_session` and
+the corresponding session keys, which may have been registered via `set_keys` during the previous session, are written
+to storage where they will wait one session before being passed to the `SessionHandler` themselves.
 
 ### Goals
 
@@ -57,8 +54,8 @@ The Session pallet is designed to make the following possible:
 
 ### Public Functions
 
-- `rotate_session` - Change to the next session. Register the new authority set. Queue changes
-for next session rotation.
+- `rotate_session` - Change to the next session. Register the new authority set. Queue changes for next session
+rotation.
 - `disable_index` - Disable a validator by index.
 - `disable` - Disable a validator by Validator ID
 
@@ -66,7 +63,8 @@ for next session rotation.
 
 ### Example from the FRAME
 
-The [Staking pallet](https://docs.rs/pallet-staking/latest/pallet_staking/) uses the Session pallet to get the validator set.
+The [Staking pallet](https://docs.rs/pallet-staking/latest/pallet_staking/) uses the Session pallet to get the validator
+set.
 
 ```rust
 use pallet_session as session;
diff --git a/substrate/frame/session/benchmarking/Cargo.toml b/substrate/frame/session/benchmarking/Cargo.toml
index f4138c077e51cb4cfe4b352ef70fea775eae4aaa..df423e162e9e7a29714c5880057b8552e7c21679 100644
--- a/substrate/frame/session/benchmarking/Cargo.toml
+++ b/substrate/frame/session/benchmarking/Cargo.toml
@@ -1,11 +1,11 @@
 [package]
 name = "pallet-session-benchmarking"
 version = "4.0.0-dev"
-authors = ["Parity Technologies <admin@parity.io>"]
-edition = "2021"
+authors.workspace = true
+edition.workspace = true
 license = "Apache-2.0"
 homepage = "https://substrate.io"
-repository = "https://github.com/paritytech/substrate/"
+repository.workspace = true
 description = "FRAME sessions pallet benchmarking"
 readme = "README.md"
 
diff --git a/substrate/frame/session/benchmarking/README.md b/substrate/frame/session/benchmarking/README.md
index d034a9ec73284fee91c5a2a8c397f5d4bc551a0e..e097f03f34a8e777df3fa149451d1624684a688b 100644
--- a/substrate/frame/session/benchmarking/README.md
+++ b/substrate/frame/session/benchmarking/README.md
@@ -1,3 +1,3 @@
 Benchmarks for the Session Pallet.
 
-License: Apache-2.0
\ No newline at end of file
+License: Apache-2.0
diff --git a/substrate/frame/session/benchmarking/src/lib.rs b/substrate/frame/session/benchmarking/src/lib.rs
index 722bb14fb56edcccf735b6554a50e8ece9023d2d..84258d84994f45233e47a1ca413cb5b89ccf306a 100644
--- a/substrate/frame/session/benchmarking/src/lib.rs
+++ b/substrate/frame/session/benchmarking/src/lib.rs
@@ -134,7 +134,7 @@ fn check_membership_proof_setup<T: Config>(
 		use rand::{RngCore, SeedableRng};
 
 		let validator = T::Lookup::lookup(who).unwrap();
-		let controller = pallet_staking::Pallet::<T>::bonded(validator).unwrap();
+		let controller = pallet_staking::Pallet::<T>::bonded(&validator).unwrap();
 
 		let keys = {
 			let mut keys = [0u8; 128];
diff --git a/substrate/frame/session/src/lib.rs b/substrate/frame/session/src/lib.rs
index 1c0093c1df64f36aaee8f8a188f7acef9ba7acce..bf4671a247f0d1677d53f3295a3ccd518bba4ce2 100644
--- a/substrate/frame/session/src/lib.rs
+++ b/substrate/frame/session/src/lib.rs
@@ -117,7 +117,7 @@ pub mod weights;
 
 use codec::{Decode, MaxEncodedLen};
 use frame_support::{
-	dispatch::{DispatchError, DispatchResult},
+	dispatch::DispatchResult,
 	ensure,
 	traits::{
 		EstimateNextNewSession, EstimateNextSessionRotation, FindAuthor, Get, OneSessionHandler,
@@ -129,7 +129,7 @@ use frame_support::{
 use frame_system::pallet_prelude::BlockNumberFor;
 use sp_runtime::{
 	traits::{AtLeast32BitUnsigned, Convert, Member, One, OpaqueKeys, Zero},
-	ConsensusEngineId, KeyTypeId, Permill, RuntimeAppPublic,
+	ConsensusEngineId, DispatchError, KeyTypeId, Permill, RuntimeAppPublic,
 };
 use sp_staking::SessionIndex;
 use sp_std::{
diff --git a/substrate/frame/society/Cargo.toml b/substrate/frame/society/Cargo.toml
index 9e2bbe3b35493a45344ff865aab3bcea91cadb40..d38875836aa254a345ecf577146f5ff2c919c208 100644
--- a/substrate/frame/society/Cargo.toml
+++ b/substrate/frame/society/Cargo.toml
@@ -1,11 +1,11 @@
 [package]
 name = "pallet-society"
 version = "4.0.0-dev"
-authors = ["Parity Technologies <admin@parity.io>"]
-edition = "2021"
+authors.workspace = true
+edition.workspace = true
 license = "Apache-2.0"
 homepage = "https://substrate.io"
-repository = "https://github.com/paritytech/substrate/"
+repository.workspace = true
 description = "FRAME society pallet"
 readme = "README.md"
 
@@ -34,8 +34,6 @@ sp-io = { path = "../../primitives/io" }
 
 [features]
 default = [ "std" ]
-# Enable `VersionedRuntimeUpgrade` for the migrations that is currently still experimental.
-experimental = [ "frame-support/experimental" ]
 std = [
 	"codec/std",
 	"frame-benchmarking?/std",
diff --git a/substrate/frame/society/README.md b/substrate/frame/society/README.md
index 80998618664297f05d4dd87405b03cbfad1c4600..c091d6c97d41b8409a0092a92ee938788b9b02b9 100644
--- a/substrate/frame/society/README.md
+++ b/substrate/frame/society/README.md
@@ -11,16 +11,16 @@ and maintain a membership society.
 ### User Types
 
 At any point, a user in the society can be one of a:
-* Bidder - A user who has submitted intention of joining the society.
-* Candidate - A user who will be voted on to join the society.
-* Suspended Candidate - A user who failed to win a vote.
-* Member - A user who is a member of the society.
-* Suspended Member - A member of the society who has accumulated too many strikes
+- Bidder - A user who has submitted intention of joining the society.
+- Candidate - A user who will be voted on to join the society.
+- Suspended Candidate - A user who failed to win a vote.
+- Member - A user who is a member of the society.
+- Suspended Member - A member of the society who has accumulated too many strikes
 or failed their membership challenge.
 
 Of the non-suspended members, there is always a:
-* Head - A member who is exempt from suspension.
-* Defender - A member whose membership is under question and voted on again.
+- Head - A member who is exempt from suspension.
+- Defender - A member whose membership is under question and voted on again.
 
 Of the non-suspended members of the society, a random set of them are chosen as
 "skeptics". The mechanics of skeptics is explained in the
@@ -201,28 +201,28 @@ future payouts slashed.
 
 #### For General Users
 
-* `bid` - A user can make a bid to join the membership society by reserving a deposit.
-* `unbid` - A user can withdraw their bid for entry, the deposit is returned.
+- `bid` - A user can make a bid to join the membership society by reserving a deposit.
+- `unbid` - A user can withdraw their bid for entry, the deposit is returned.
 
 #### For Members
 
-* `vouch` - A member can place a bid on behalf of a user to join the membership society.
-* `unvouch` - A member can revoke their vouch for a user.
-* `vote` - A member can vote to approve or reject a candidate's request to join the society.
-* `defender_vote` - A member can vote to approve or reject a defender's continued membership
+- `vouch` - A member can place a bid on behalf of a user to join the membership society.
+- `unvouch` - A member can revoke their vouch for a user.
+- `vote` - A member can vote to approve or reject a candidate's request to join the society.
+- `defender_vote` - A member can vote to approve or reject a defender's continued membership
 to the society.
-* `payout` - A member can claim their first matured payment.
-* `unfound` - Allow the founder to unfound the society when they are the only member.
+- `payout` - A member can claim their first matured payment.
+- `unfound` - Allow the founder to unfound the society when they are the only member.
 
 #### For Super Users
 
-* `found` - The founder origin can initiate this society. Useful for bootstrapping the Society
+- `found` - The founder origin can initiate this society. Useful for bootstrapping the Society
 pallet on an already running chain.
-* `judge_suspended_member` - The suspension judgement origin is able to make
+- `judge_suspended_member` - The suspension judgement origin is able to make
 judgement on a suspended member.
-* `judge_suspended_candidate` - The suspension judgement origin is able to
+- `judge_suspended_candidate` - The suspension judgement origin is able to
 make judgement on a suspended candidate.
-* `set_max_membership` - The ROOT origin can update the maximum member count for the society.
+- `set_max_membership` - The ROOT origin can update the maximum member count for the society.
 The max membership count must be greater than 1.
 
 License: Apache-2.0
diff --git a/substrate/frame/society/src/migrations.rs b/substrate/frame/society/src/migrations.rs
index 4685167dcbcfd34fb595605f14a540a1c8ec24aa..553eea1a7952f5f2e88fe43f0e972826abd206fd 100644
--- a/substrate/frame/society/src/migrations.rs
+++ b/substrate/frame/society/src/migrations.rs
@@ -93,12 +93,10 @@ impl<
 	}
 }
 
-/// [`VersionUncheckedMigrateToV2`] wrapped in a
-/// [`frame_support::migrations::VersionedRuntimeUpgrade`], ensuring the migration is only performed
-/// when on-chain version is 0.
-#[cfg(feature = "experimental")]
+/// [`VersionUncheckedMigrateToV2`] wrapped in a [`frame_support::migrations::VersionedMigration`],
+/// ensuring the migration is only performed when on-chain version is 0.
 pub type VersionCheckedMigrateToV2<T, I, PastPayouts> =
-	frame_support::migrations::VersionedRuntimeUpgrade<
+	frame_support::migrations::VersionedMigration<
 		0,
 		2,
 		VersionUncheckedMigrateToV2<T, I, PastPayouts>,
diff --git a/substrate/frame/society/src/weights.rs b/substrate/frame/society/src/weights.rs
index d113f617c886ca7f694e0601d7bc6531800296db..7c59aed8449a21c72afb39bdd11e14a315d1c659 100644
--- a/substrate/frame/society/src/weights.rs
+++ b/substrate/frame/society/src/weights.rs
@@ -1,6 +1,6 @@
 // This file is part of Substrate.
 
-// Copyright (C) 2022 Parity Technologies (UK) Ltd.
+// Copyright (C) Parity Technologies (UK) Ltd.
 // SPDX-License-Identifier: Apache-2.0
 
 // Licensed under the Apache License, Version 2.0 (the "License");
diff --git a/substrate/frame/staking/Cargo.toml b/substrate/frame/staking/Cargo.toml
index e9873ba6580dba3015057241c364feb577c5084d..5cd134471ebcd61731d943adee66199d0c6757d4 100644
--- a/substrate/frame/staking/Cargo.toml
+++ b/substrate/frame/staking/Cargo.toml
@@ -1,11 +1,11 @@
 [package]
 name = "pallet-staking"
 version = "4.0.0-dev"
-authors = ["Parity Technologies <admin@parity.io>"]
-edition = "2021"
+authors.workspace = true
+edition.workspace = true
 license = "Apache-2.0"
 homepage = "https://substrate.io"
-repository = "https://github.com/paritytech/substrate/"
+repository.workspace = true
 description = "FRAME pallet staking"
 readme = "README.md"
 
@@ -13,7 +13,7 @@ readme = "README.md"
 targets = ["x86_64-unknown-linux-gnu"]
 
 [dependencies]
-serde = { version = "1.0.163", default-features = false, features = ["alloc", "derive"]}
+serde = { version = "1.0.188", default-features = false, features = ["alloc", "derive"]}
 codec = { package = "parity-scale-codec", version = "3.6.1", default-features = false, features = [
 	"derive",
 ] }
diff --git a/substrate/frame/staking/README.md b/substrate/frame/staking/README.md
index ccb9901a6796ed3e97a139806770531ebef9f5ae..387b94b6a681f0e2dacd5c5644ee3795ea8019e7 100644
--- a/substrate/frame/staking/README.md
+++ b/substrate/frame/staking/README.md
@@ -8,25 +8,24 @@ The Staking module is used to manage funds at stake by network maintainers.
 
 ## Overview
 
-The Staking module is the means by which a set of network maintainers (known as _authorities_ in
-some contexts and _validators_ in others) are chosen based upon those who voluntarily place
-funds under deposit. Under deposit, those funds are rewarded under normal operation but are held
-at pain of _slash_ (expropriation) should the staked maintainer be found not to be discharging
-its duties properly.
+The Staking module is the means by which a set of network maintainers (known as _authorities_ in some contexts and
+_validators_ in others) are chosen based upon those who voluntarily place funds under deposit. Under deposit, those
+funds are rewarded under normal operation but are held at pain of _slash_ (expropriation) should the staked maintainer
+be found not to be discharging its duties properly.
 
 ### Terminology
 <!-- Original author of paragraph: @gavofyork -->
 
-- Staking: The process of locking up funds for some time, placing them at risk of slashing
-  (loss) in order to become a rewarded maintainer of the network.
-- Validating: The process of running a node to actively maintain the network, either by
-  producing blocks or guaranteeing finality of the chain.
-- Nominating: The process of placing staked funds behind one or more validators in order to
-  share in any reward, and punishment, they take.
+- Staking: The process of locking up funds for some time, placing them at risk of slashing (loss) in order to become a
+  rewarded maintainer of the network.
+- Validating: The process of running a node to actively maintain the network, either by producing blocks or guaranteeing
+  finality of the chain.
+- Nominating: The process of placing staked funds behind one or more validators in order to share in any reward, and
+  punishment, they take.
 - Stash account: The account holding an owner's funds used for staking.
 - Controller account: The account that controls an owner's funds for staking.
-- Era: A (whole) number of sessions, which is the period that the validator set (and each
-  validator's active nominator set) is recalculated and where rewards are paid out.
+- Era: A (whole) number of sessions, which is the period that the validator set (and each validator's active nominator
+  set) is recalculated and where rewards are paid out.
 - Slash: The punishment of a staker by reducing its funds.
 
 ### Goals
@@ -42,91 +41,90 @@ The staking system in Substrate NPoS is designed to make the following possible:
 
 #### Staking
 
-Almost any interaction with the Staking module requires a process of _**bonding**_ (also known
-as being a _staker_). To become *bonded*, a fund-holding account known as the _stash account_,
-which holds some or all of the funds that become frozen in place as part of the staking process,
-is paired with an active **controller** account, which issues instructions on how they shall be
-used.
+Almost any interaction with the Staking module requires a process of _**bonding**_ (also known as being a _staker_). To
+become *bonded*, a fund-holding account known as the _stash account_, which holds some or all of the funds that become
+frozen in place as part of the staking process, is paired with an active **controller** account, which issues
+instructions on how they shall be used.
 
-An account pair can become bonded using the [`bond`](https://docs.rs/pallet-staking/latest/pallet_staking/enum.Call.html#variant.bond) call.
+An account pair can become bonded using the
+[`bond`](https://docs.rs/pallet-staking/latest/pallet_staking/enum.Call.html#variant.bond) call.
 
 Stash accounts can update their associated controller back to their stash account using the
-[`set_controller`](https://docs.rs/pallet-staking/latest/pallet_staking/enum.Call.html#variant.set_controller)
-call. 
+[`set_controller`](https://docs.rs/pallet-staking/latest/pallet_staking/enum.Call.html#variant.set_controller) call.
 
-Note: Controller accounts are being deprecated in favor of proxy accounts, so it is no longer
-possible to set a unique address for a stash's controller.
+Note: Controller accounts are being deprecated in favor of proxy accounts, so it is no longer possible to set a unique
+address for a stash's controller.
 
-There are three possible roles that any staked account pair can be in: `Validator`, `Nominator`
-and `Idle` (defined in [`StakerStatus`](https://docs.rs/pallet-staking/latest/pallet_staking/enum.StakerStatus.html)). There are three
+There are three possible roles that any staked account pair can be in: `Validator`, `Nominator` and `Idle` (defined in
+[`StakerStatus`](https://docs.rs/pallet-staking/latest/pallet_staking/enum.StakerStatus.html)). There are three
 corresponding instructions to change between roles, namely:
 [`validate`](https://docs.rs/pallet-staking/latest/pallet_staking/enum.Call.html#variant.validate),
-[`nominate`](https://docs.rs/pallet-staking/latest/pallet_staking/enum.Call.html#variant.nominate), and [`chill`](https://docs.rs/pallet-staking/latest/pallet_staking/enum.Call.html#variant.chill).
+[`nominate`](https://docs.rs/pallet-staking/latest/pallet_staking/enum.Call.html#variant.nominate), and
+[`chill`](https://docs.rs/pallet-staking/latest/pallet_staking/enum.Call.html#variant.chill).
 
 #### Validating
 
-A **validator** takes the role of either validating blocks or ensuring their finality,
-maintaining the veracity of the network. A validator should avoid both any sort of malicious
-misbehavior and going offline. Bonded accounts that state interest in being a validator do NOT
-get immediately chosen as a validator. Instead, they are declared as a _candidate_ and they
-_might_ get elected at the _next era_ as a validator. The result of the election is determined
-by nominators and their votes.
+A **validator** takes the role of either validating blocks or ensuring their finality, maintaining the veracity of the
+network. A validator should avoid both any sort of malicious misbehavior and going offline. Bonded accounts that state
+interest in being a validator do NOT get immediately chosen as a validator. Instead, they are declared as a _candidate_
+and they _might_ get elected at the _next era_ as a validator. The result of the election is determined by nominators
+and their votes.
 
 An account can become a validator candidate via the
 [`validate`](https://docs.rs/pallet-staking/latest/pallet_staking/enum.Call.html#variant.validate) call.
 
 #### Nomination
 
-A **nominator** does not take any _direct_ role in maintaining the network, instead, it votes on
-a set of validators  to be elected. Once interest in nomination is stated by an account, it
-takes effect at the next election round. The funds in the nominator's stash account indicate the
-_weight_ of its vote. Both the rewards and any punishment that a validator earns are shared
-between the validator and its nominators. This rule incentivizes the nominators to NOT vote for
-the misbehaving/offline validators as much as possible, simply because the nominators will also
-lose funds if they vote poorly.
+A **nominator** does not take any _direct_ role in maintaining the network, instead, it votes on a set of validators  to
+be elected. Once interest in nomination is stated by an account, it takes effect at the next election round. The funds
+in the nominator's stash account indicate the _weight_ of its vote. Both the rewards and any punishment that a validator
+earns are shared between the validator and its nominators. This rule incentivizes the nominators to NOT vote for the
+misbehaving/offline validators as much as possible, simply because the nominators will also lose funds if they vote
+poorly.
 
-An account can become a nominator via the [`nominate`](https://docs.rs/pallet-staking/latest/pallet_staking/enum.Call.html#variant.nominate) call.
+An account can become a nominator via the
+[`nominate`](https://docs.rs/pallet-staking/latest/pallet_staking/enum.Call.html#variant.nominate) call.
 
 #### Rewards and Slash
 
-The **reward and slashing** procedure is the core of the Staking module, attempting to _embrace
-valid behavior_ while _punishing any misbehavior or lack of availability_.
+The **reward and slashing** procedure is the core of the Staking module, attempting to _embrace valid behavior_ while
+_punishing any misbehavior or lack of availability_.
 
-Rewards must be claimed for each era before it gets too old by `$HISTORY_DEPTH` using the
-`payout_stakers` call. Any account can call `payout_stakers`, which pays the reward to the
-validator as well as its nominators. Only the [`Config::MaxNominatorRewardedPerValidator`]
-biggest stakers can claim their reward. This is to limit the i/o cost to mutate storage for each
-nominator's account.
+Rewards must be claimed for each era before it gets too old by `$HISTORY_DEPTH` using the `payout_stakers` call. Any
+account can call `payout_stakers`, which pays the reward to the validator as well as its nominators. Only the
+[`Config::MaxNominatorRewardedPerValidator`] biggest stakers can claim their reward. This is to limit the i/o cost to
+mutate storage for each nominator's account.
 
-Slashing can occur at any point in time, once misbehavior is reported. Once slashing is
-determined, a value is deducted from the balance of the validator and all the nominators who
-voted for this validator (values are deducted from the _stash_ account of the slashed entity).
+Slashing can occur at any point in time, once misbehavior is reported. Once slashing is determined, a value is deducted
+from the balance of the validator and all the nominators who voted for this validator (values are deducted from the
+_stash_ account of the slashed entity).
 
 Slashing logic is further described in the documentation of the `slashing` module.
 
-Similar to slashing, rewards are also shared among a validator and its associated nominators.
-Yet, the reward funds are not always transferred to the stash account and can be configured. See
-[Reward Calculation](https://docs.rs/pallet-staking/latest/pallet_staking/#reward-calculation) for more details.
+Similar to slashing, rewards are also shared among a validator and its associated nominators. Yet, the reward funds are
+not always transferred to the stash account and can be configured. See [Reward
+Calculation](https://docs.rs/pallet-staking/latest/pallet_staking/#reward-calculation) for more details.
 
 #### Chilling
 
-Finally, any of the roles above can choose to step back temporarily and just chill for a while.
-This means that if they are a nominator, they will not be considered as voters anymore and if
-they are validators, they will no longer be a candidate for the next election.
+Finally, any of the roles above can choose to step back temporarily and just chill for a while. This means that if they
+are a nominator, they will not be considered as voters anymore and if they are validators, they will no longer be a
+candidate for the next election.
 
-An account can step back via the [`chill`](https://docs.rs/pallet-staking/latest/pallet_staking/enum.Call.html#variant.chill) call.
+An account can step back via the
+[`chill`](https://docs.rs/pallet-staking/latest/pallet_staking/enum.Call.html#variant.chill) call.
 
 ### Session managing
 
-The module implement the trait `SessionManager`. Which is the only API to query new validator
-set and allowing these validator set to be rewarded once their era is ended.
+The module implement the trait `SessionManager`. Which is the only API to query new validator set and allowing these
+validator set to be rewarded once their era is ended.
 
 ## Interface
 
 ### Dispatchable Functions
 
-The dispatchable functions of the Staking module enable the steps needed for entities to accept
-and change their role, alongside some helper functions to get/set the metadata of the module.
+The dispatchable functions of the Staking module enable the steps needed for entities to accept and change their role,
+alongside some helper functions to get/set the metadata of the module.
 
 ### Public Functions
 
@@ -134,7 +132,7 @@ The Staking module contains many public storage items and (im)mutable functions.
 
 ## Usage
 
-### Example: Rewarding a validator by id.
+### Example: Rewarding a validator by id
 
 ```rust
 use pallet_staking::{self as staking};
@@ -169,7 +167,8 @@ pub mod pallet {
 ### Era payout
 
 The era payout is computed using yearly inflation curve defined at
-[`T::RewardCurve`](https://docs.rs/pallet-staking/latest/pallet_staking/trait.Config.html#associatedtype.RewardCurve) as such:
+[`T::RewardCurve`](https://docs.rs/pallet-staking/latest/pallet_staking/trait.Config.html#associatedtype.RewardCurve) as
+such:
 
 ```nocompile
 staker_payout = yearly_inflation(npos_token_staked / total_tokens) * total_tokens / era_per_year
@@ -184,37 +183,38 @@ The remaining reward is send to the configurable end-point
 
 ### Reward Calculation
 
-Validators and nominators are rewarded at the end of each era. The total reward of an era is
-calculated using the era duration and the staking rate (the total amount of tokens staked by
-nominators and validators, divided by the total token supply). It aims to incentivize toward a
-defined staking rate. The full specification can be found
+Validators and nominators are rewarded at the end of each era. The total reward of an era is calculated using the era
+duration and the staking rate (the total amount of tokens staked by nominators and validators, divided by the total
+token supply). It aims to incentivize toward a defined staking rate. The full specification can be found
 [here](https://research.web3.foundation/en/latest/polkadot/economics/1-token-economics.html#inflation-model).
 
-Total reward is split among validators and their nominators depending on the number of points
-they received during the era. Points are added to a validator using
+Total reward is split among validators and their nominators depending on the number of points they received during the
+era. Points are added to a validator using
 [`reward_by_ids`](https://docs.rs/pallet-staking/latest/pallet_staking/enum.Call.html#variant.reward_by_ids) or
 [`reward_by_indices`](https://docs.rs/pallet-staking/latest/pallet_staking/enum.Call.html#variant.reward_by_indices).
 
 [`Module`](https://docs.rs/pallet-staking/latest/pallet_staking/struct.Module.html) implements
-[`pallet_authorship::EventHandler`](https://docs.rs/pallet-authorship/latest/pallet_authorship/trait.EventHandler.html) to add reward
-points to block producer and block producer of referenced uncles.
+[`pallet_authorship::EventHandler`](https://docs.rs/pallet-authorship/latest/pallet_authorship/trait.EventHandler.html)
+to add reward points to block producer and block producer of referenced uncles.
 
 The validator and its nominator split their reward as following:
 
 The validator can declare an amount, named
-[`commission`](https://docs.rs/pallet-staking/latest/pallet_staking/struct.ValidatorPrefs.html#structfield.commission), that does not get shared
-with the nominators at each reward payout through its
-[`ValidatorPrefs`](https://docs.rs/pallet-staking/latest/pallet_staking/struct.ValidatorPrefs.html). This value gets deducted from the total reward
-that is paid to the validator and its nominators. The remaining portion is split among the
-validator and all of the nominators that nominated the validator, proportional to the value
-staked behind this validator (_i.e._ dividing the
+[`commission`](https://docs.rs/pallet-staking/latest/pallet_staking/struct.ValidatorPrefs.html#structfield.commission),
+that does not get shared with the nominators at each reward payout through its
+[`ValidatorPrefs`](https://docs.rs/pallet-staking/latest/pallet_staking/struct.ValidatorPrefs.html). This value gets
+deducted from the total reward that is paid to the validator and its nominators. The remaining portion is split among
+the validator and all of the nominators that nominated the validator, proportional to the value staked behind this
+validator (_i.e._ dividing the
 [`own`](https://docs.rs/pallet-staking/latest/pallet_staking/struct.Exposure.html#structfield.own) or
 [`others`](https://docs.rs/pallet-staking/latest/pallet_staking/struct.Exposure.html#structfield.others) by
-[`total`](https://docs.rs/pallet-staking/latest/pallet_staking/struct.Exposure.html#structfield.total) in [`Exposure`](https://docs.rs/pallet-staking/latest/pallet_staking/struct.Exposure.html)).
+[`total`](https://docs.rs/pallet-staking/latest/pallet_staking/struct.Exposure.html#structfield.total) in
+[`Exposure`](https://docs.rs/pallet-staking/latest/pallet_staking/struct.Exposure.html)).
 
 All entities who receive a reward have the option to choose their reward destination through the
 [`Payee`](https://docs.rs/pallet-staking/latest/pallet_staking/struct.Payee.html) storage item (see
-[`set_payee`](https://docs.rs/pallet-staking/latest/pallet_staking/enum.Call.html#variant.set_payee)), to be one of the following:
+[`set_payee`](https://docs.rs/pallet-staking/latest/pallet_staking/enum.Call.html#variant.set_payee)), to be one of the
+following:
 
 - Controller account, (obviously) not increasing the staked value.
 - Stash account, not increasing the staked value.
@@ -225,32 +225,33 @@ All entities who receive a reward have the option to choose their reward destina
 Any funds already placed into stash can be the target of the following operations:
 
 The controller account can free a portion (or all) of the funds using the
-[`unbond`](https://docs.rs/pallet-staking/latest/pallet_staking/enum.Call.html#variant.unbond) call. Note that the funds are not immediately
-accessible. Instead, a duration denoted by [`BondingDuration`](https://docs.rs/pallet-staking/latest/pallet_staking/trait.Config.html#associatedtype.BondingDuration)
-(in number of eras) must pass until the funds can actually be removed. Once the
-`BondingDuration` is over, the [`withdraw_unbonded`](https://docs.rs/pallet-staking/latest/pallet_staking/enum.Call.html#variant.withdraw_unbonded)
+[`unbond`](https://docs.rs/pallet-staking/latest/pallet_staking/enum.Call.html#variant.unbond) call. Note that the funds
+are not immediately accessible. Instead, a duration denoted by
+[`BondingDuration`](https://docs.rs/pallet-staking/latest/pallet_staking/trait.Config.html#associatedtype.BondingDuration)
+(in number of eras) must pass until the funds can actually be removed. Once the `BondingDuration` is over, the
+[`withdraw_unbonded`](https://docs.rs/pallet-staking/latest/pallet_staking/enum.Call.html#variant.withdraw_unbonded)
 call can be used to actually withdraw the funds.
 
-Note that there is a limitation to the number of fund-chunks that can be scheduled to be
-unlocked in the future via [`unbond`](https://docs.rs/pallet-staking/latest/pallet_staking/enum.Call.html#variant.unbond). In case this maximum
-(`MAX_UNLOCKING_CHUNKS`) is reached, the bonded account _must_ first wait until a successful
-call to `withdraw_unbonded` to remove some of the chunks.
+Note that there is a limitation to the number of fund-chunks that can be scheduled to be unlocked in the future via
+[`unbond`](https://docs.rs/pallet-staking/latest/pallet_staking/enum.Call.html#variant.unbond). In case this maximum
+(`MAX_UNLOCKING_CHUNKS`) is reached, the bonded account _must_ first wait until a successful call to `withdraw_unbonded`
+to remove some of the chunks.
 
 ### Election Algorithm
 
-The current election algorithm is implemented based on Phragmén. The reference implementation
-can be found [here](https://github.com/w3f/consensus/tree/master/NPoS).
+The current election algorithm is implemented based on Phragmén. The reference implementation can be found
+[here](https://github.com/w3f/consensus/tree/master/NPoS).
 
-The election algorithm, aside from electing the validators with the most stake value and votes,
-tries to divide the nominator votes among candidates in an equal manner. To further assure this,
-an optional post-processing can be applied that iteratively normalizes the nominator staked
-values until the total difference among votes of a particular nominator are less than a
-threshold.
+The election algorithm, aside from electing the validators with the most stake value and votes, tries to divide the
+nominator votes among candidates in an equal manner. To further assure this, an optional post-processing can be applied
+that iteratively normalizes the nominator staked values until the total difference among votes of a particular nominator
+are less than a threshold.
 
 ## GenesisConfig
 
-The Staking module depends on the [`GenesisConfig`](https://docs.rs/pallet-staking/latest/pallet_staking/struct.GenesisConfig.html). The
-`GenesisConfig` is optional and allow to set some initial stakers.
+The Staking module depends on the
+[`GenesisConfig`](https://docs.rs/pallet-staking/latest/pallet_staking/struct.GenesisConfig.html). The `GenesisConfig`
+is optional and allow to set some initial stakers.
 
 ## Related Modules
 
diff --git a/substrate/frame/staking/reward-curve/Cargo.toml b/substrate/frame/staking/reward-curve/Cargo.toml
index bdffe96d97e8f10ee78cde06cba5e0722451f4ef..0a725996115990b36e81b7f538f35e2f551dfe6d 100644
--- a/substrate/frame/staking/reward-curve/Cargo.toml
+++ b/substrate/frame/staking/reward-curve/Cargo.toml
@@ -1,11 +1,11 @@
 [package]
 name = "pallet-staking-reward-curve"
 version = "4.0.0-dev"
-authors = ["Parity Technologies <admin@parity.io>"]
-edition = "2021"
+authors.workspace = true
+edition.workspace = true
 license = "Apache-2.0"
 homepage = "https://substrate.io"
-repository = "https://github.com/paritytech/substrate/"
+repository.workspace = true
 description = "Reward Curve for FRAME staking pallet"
 
 [package.metadata.docs.rs]
@@ -18,7 +18,7 @@ proc-macro = true
 proc-macro-crate = "1.1.3"
 proc-macro2 = "1.0.56"
 quote = "1.0.28"
-syn = { version = "2.0.16", features = ["full", "visit"] }
+syn = { version = "2.0.38", features = ["full", "visit"] }
 
 [dev-dependencies]
 sp-runtime = { path = "../../../primitives/runtime" }
diff --git a/substrate/frame/staking/reward-curve/src/log.rs b/substrate/frame/staking/reward-curve/src/log.rs
index 248a1e3c36a6e226b6c4f95bbff2b383c012ea17..70191180da3c3e626c203031b7135f00a252ce5f 100644
--- a/substrate/frame/staking/reward-curve/src/log.rs
+++ b/substrate/frame/staking/reward-curve/src/log.rs
@@ -1,3 +1,20 @@
+// 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.
+
 /// Simple u32 power of 2 function - simply uses a bit shift
 macro_rules! pow2 {
 	($n:expr) => {
diff --git a/substrate/frame/staking/reward-fn/Cargo.toml b/substrate/frame/staking/reward-fn/Cargo.toml
index cf77299f5ba68c01c672d60c6af20fb70232038e..25f4c33dd62bb7af47ae9666a7b41cce4d07b72b 100644
--- a/substrate/frame/staking/reward-fn/Cargo.toml
+++ b/substrate/frame/staking/reward-fn/Cargo.toml
@@ -1,11 +1,11 @@
 [package]
 name = "pallet-staking-reward-fn"
 version = "4.0.0-dev"
-authors = ["Parity Technologies <admin@parity.io>"]
-edition = "2021"
+authors.workspace = true
+edition.workspace = true
 license = "Apache-2.0"
 homepage = "https://substrate.io"
-repository = "https://github.com/paritytech/substrate/"
+repository.workspace = true
 description = "Reward function for FRAME staking pallet"
 
 [package.metadata.docs.rs]
diff --git a/substrate/frame/staking/runtime-api/Cargo.toml b/substrate/frame/staking/runtime-api/Cargo.toml
index b2972d35b68946127ac4daef12933f246716129d..5f49df254ceb3f521d665948f9d86cb3f4e1c40b 100644
--- a/substrate/frame/staking/runtime-api/Cargo.toml
+++ b/substrate/frame/staking/runtime-api/Cargo.toml
@@ -1,11 +1,11 @@
 [package]
 name = "pallet-staking-runtime-api"
 version = "4.0.0-dev"
-authors = ["Parity Technologies <admin@parity.io>"]
-edition = "2021"
+authors.workspace = true
+edition.workspace = true
 license = "Apache-2.0"
 homepage = "https://substrate.io"
-repository = "https://github.com/paritytech/substrate/"
+repository.workspace = true
 description = "RPC runtime API for transaction payment FRAME pallet"
 readme = "README.md"
 
diff --git a/substrate/frame/staking/runtime-api/src/lib.rs b/substrate/frame/staking/runtime-api/src/lib.rs
index 378599c665506007ddae5ea227829d4af2483103..c669d222ec68b2ec6305cbffc3d0003acdc78c94 100644
--- a/substrate/frame/staking/runtime-api/src/lib.rs
+++ b/substrate/frame/staking/runtime-api/src/lib.rs
@@ -1,6 +1,6 @@
 // This file is part of Substrate.
 
-// Copyright (C) 2023 Parity Technologies (UK) Ltd.
+// Copyright (C) Parity Technologies (UK) Ltd.
 // SPDX-License-Identifier: Apache-2.0
 
 // Licensed under the Apache License, Version 2.0 (the "License");
diff --git a/substrate/frame/staking/src/benchmarking.rs b/substrate/frame/staking/src/benchmarking.rs
index e72a9baf044fefdef9610ef02dac3f054ff965e4..f94d9bf4b328ab6e0635ebd24659ca437ff25477 100644
--- a/substrate/frame/staking/src/benchmarking.rs
+++ b/substrate/frame/staking/src/benchmarking.rs
@@ -24,13 +24,12 @@ use testing_utils::*;
 use codec::Decode;
 use frame_election_provider_support::{bounds::DataProviderBounds, SortedListProvider};
 use frame_support::{
-	dispatch::UnfilteredDispatchable,
 	pallet_prelude::*,
-	traits::{Currency, Get, Imbalance},
+	traits::{Currency, Get, Imbalance, UnfilteredDispatchable},
 };
 use sp_runtime::{
 	traits::{Bounded, One, StaticLookup, TrailingZeroInput, Zero},
-	Perbill, Percent,
+	Perbill, Percent, Saturating,
 };
 use sp_staking::{currency_to_vote::CurrencyToVote, SessionIndex};
 use sp_std::prelude::*;
@@ -685,13 +684,11 @@ benchmarks! {
 		let stash = scenario.origin_stash1;
 
 		add_slashing_spans::<T>(&stash, s);
-		let l = StakingLedger {
-			stash: stash.clone(),
-			active: T::Currency::minimum_balance() - One::one(),
-			total: T::Currency::minimum_balance() - One::one(),
-			unlocking: Default::default(),
-			claimed_rewards: Default::default(),
-		};
+		let l = StakingLedger::<T>::new(
+			stash.clone(),
+			T::Currency::minimum_balance() - One::one(),
+			Default::default(),
+		);
 		Ledger::<T>::insert(&controller, l);
 
 		assert!(Bonded::<T>::contains_key(&stash));
diff --git a/substrate/frame/staking/src/ledger.rs b/substrate/frame/staking/src/ledger.rs
new file mode 100644
index 0000000000000000000000000000000000000000..cf9b4635bf55a307f9906bdc161fdd443e759d47
--- /dev/null
+++ b/substrate/frame/staking/src/ledger.rs
@@ -0,0 +1,259 @@
+// 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.
+
+//! A Ledger implementation for stakers.
+//!
+//! A [`StakingLedger`] encapsulates all the state and logic related to the stake of bonded
+//! stakers, namely, it handles the following storage items:
+//! * [`Bonded`]: mutates and reads the state of the controller <> stash bond map (to be deprecated
+//! soon);
+//! * [`Ledger`]: mutates and reads the state of all the stakers. The [`Ledger`] storage item stores
+//!   instances of [`StakingLedger`] keyed by the staker's controller account and should be mutated
+//!   and read through the [`StakingLedger`] API;
+//! * [`Payee`]: mutates and reads the reward destination preferences for a bonded stash.
+//! * Staking locks: mutates the locks for staking.
+//!
+//! NOTE: All the storage operations related to the staking ledger (both reads and writes) *MUST* be
+//! performed through the methods exposed by the [`StakingLedger`] implementation in order to ensure
+//! state consistency.
+
+use frame_support::{
+	defensive,
+	traits::{LockableCurrency, WithdrawReasons},
+	BoundedVec,
+};
+use sp_staking::{EraIndex, StakingAccount};
+use sp_std::prelude::*;
+
+use crate::{
+	BalanceOf, Bonded, Config, Error, Ledger, Payee, RewardDestination, StakingLedger, STAKING_ID,
+};
+
+#[cfg(any(feature = "runtime-benchmarks", test))]
+use sp_runtime::traits::Zero;
+
+impl<T: Config> StakingLedger<T> {
+	#[cfg(any(feature = "runtime-benchmarks", test))]
+	pub fn default_from(stash: T::AccountId) -> Self {
+		Self {
+			stash: stash.clone(),
+			total: Zero::zero(),
+			active: Zero::zero(),
+			unlocking: Default::default(),
+			claimed_rewards: Default::default(),
+			controller: Some(stash),
+		}
+	}
+
+	/// Returns a new instance of a staking ledger.
+	///
+	/// The [`Ledger`] storage is not mutated. In order to store, `StakingLedger::update` must be
+	/// called on the returned staking ledger.
+	///
+	/// Note: as the controller accounts are being deprecated, the stash account is the same as the
+	/// controller account.
+	pub fn new(
+		stash: T::AccountId,
+		stake: BalanceOf<T>,
+		claimed_rewards: BoundedVec<EraIndex, T::HistoryDepth>,
+	) -> Self {
+		Self {
+			stash: stash.clone(),
+			active: stake,
+			total: stake,
+			unlocking: Default::default(),
+			claimed_rewards,
+			// controllers are deprecated and mapped 1-1 to stashes.
+			controller: Some(stash),
+		}
+	}
+
+	/// Returns the paired account, if any.
+	///
+	/// A "pair" refers to the tuple (stash, controller). If the input is a
+	/// [`StakingAccount::Stash`] variant, its pair account will be of type
+	/// [`StakingAccount::Controller`] and vice-versa.
+	///
+	/// This method is meant to abstract from the runtime development the difference between stash
+	/// and controller. This will be deprecated once the controller is fully deprecated as well.
+	pub(crate) fn paired_account(account: StakingAccount<T::AccountId>) -> Option<T::AccountId> {
+		match account {
+			StakingAccount::Stash(stash) => <Bonded<T>>::get(stash),
+			StakingAccount::Controller(controller) =>
+				<Ledger<T>>::get(&controller).map(|ledger| ledger.stash),
+		}
+	}
+
+	/// Returns whether a given account is bonded.
+	pub(crate) fn is_bonded(account: StakingAccount<T::AccountId>) -> bool {
+		match account {
+			StakingAccount::Stash(stash) => <Bonded<T>>::contains_key(stash),
+			StakingAccount::Controller(controller) => <Ledger<T>>::contains_key(controller),
+		}
+	}
+
+	/// Returns a staking ledger, if it is bonded and it exists in storage.
+	///
+	/// This getter can be called with either a controller or stash account, provided that the
+	/// account is properly wrapped in the respective [`StakingAccount`] variant. This is meant to
+	/// abstract the concept of controller/stash accounts from the caller.
+	pub(crate) fn get(account: StakingAccount<T::AccountId>) -> Result<StakingLedger<T>, Error<T>> {
+		let controller = match account {
+			StakingAccount::Stash(stash) => <Bonded<T>>::get(stash).ok_or(Error::<T>::NotStash),
+			StakingAccount::Controller(controller) => Ok(controller),
+		}?;
+
+		<Ledger<T>>::get(&controller)
+			.map(|mut ledger| {
+				ledger.controller = Some(controller.clone());
+				ledger
+			})
+			.ok_or(Error::<T>::NotController)
+	}
+
+	/// Returns the reward destination of a staking ledger, stored in [`Payee`].
+	///
+	/// Note: if the stash is not bonded and/or does not have an entry in [`Payee`], it returns the
+	/// default reward destination.
+	pub(crate) fn reward_destination(
+		account: StakingAccount<T::AccountId>,
+	) -> RewardDestination<T::AccountId> {
+		let stash = match account {
+			StakingAccount::Stash(stash) => Some(stash),
+			StakingAccount::Controller(controller) =>
+				Self::paired_account(StakingAccount::Controller(controller)),
+		};
+
+		if let Some(stash) = stash {
+			<Payee<T>>::get(stash)
+		} else {
+			defensive!("fetched reward destination from unbonded stash {}", stash);
+			RewardDestination::default()
+		}
+	}
+
+	/// Returns the controller account of a staking ledger.
+	///
+	/// Note: it will fallback into querying the [`Bonded`] storage with the ledger stash if the
+	/// controller is not set in `self`, which most likely means that self was fetched directly from
+	/// [`Ledger`] instead of through the methods exposed in [`StakingLedger`]. If the ledger does
+	/// not exist in storage, it returns `None`.
+	pub(crate) fn controller(&self) -> Option<T::AccountId> {
+		self.controller.clone().or_else(|| {
+			defensive!("fetched a controller on a ledger instance without it.");
+			Self::paired_account(StakingAccount::Stash(self.stash.clone()))
+		})
+	}
+
+	/// Inserts/updates a staking ledger account.
+	///
+	/// Bonds the ledger if it is not bonded yet, signalling that this is a new ledger. The staking
+	/// locks of the stash account are updated accordingly.
+	///
+	/// Note: To ensure lock consistency, all the [`Ledger`] storage updates should be made through
+	/// this helper function.
+	pub(crate) fn update(self) -> Result<(), Error<T>> {
+		if !<Bonded<T>>::contains_key(&self.stash) {
+			return Err(Error::<T>::NotStash)
+		}
+
+		T::Currency::set_lock(STAKING_ID, &self.stash, self.total, WithdrawReasons::all());
+		Ledger::<T>::insert(
+			&self.controller().ok_or_else(|| {
+				defensive!("update called on a ledger that is not bonded.");
+				Error::<T>::NotController
+			})?,
+			&self,
+		);
+
+		Ok(())
+	}
+
+	/// Bonds a ledger.
+	///
+	/// It sets the reward preferences for the bonded stash.
+	pub(crate) fn bond(self, payee: RewardDestination<T::AccountId>) -> Result<(), Error<T>> {
+		if <Bonded<T>>::contains_key(&self.stash) {
+			Err(Error::<T>::AlreadyBonded)
+		} else {
+			<Payee<T>>::insert(&self.stash, payee);
+			<Bonded<T>>::insert(&self.stash, &self.stash);
+			self.update()
+		}
+	}
+
+	/// Sets the ledger Payee.
+	pub(crate) fn set_payee(self, payee: RewardDestination<T::AccountId>) -> Result<(), Error<T>> {
+		if !<Bonded<T>>::contains_key(&self.stash) {
+			Err(Error::<T>::NotStash)
+		} else {
+			<Payee<T>>::insert(&self.stash, payee);
+			Ok(())
+		}
+	}
+
+	/// Clears all data related to a staking ledger and its bond in both [`Ledger`] and [`Bonded`]
+	/// storage items and updates the stash staking lock.
+	pub(crate) fn kill(stash: &T::AccountId) -> Result<(), Error<T>> {
+		let controller = <Bonded<T>>::get(stash).ok_or(Error::<T>::NotStash)?;
+
+		<Ledger<T>>::get(&controller).ok_or(Error::<T>::NotController).map(|ledger| {
+			T::Currency::remove_lock(STAKING_ID, &ledger.stash);
+			Ledger::<T>::remove(controller);
+
+			<Bonded<T>>::remove(&stash);
+			<Payee<T>>::remove(&stash);
+
+			Ok(())
+		})?
+	}
+}
+
+#[cfg(test)]
+use {
+	crate::UnlockChunk,
+	codec::{Decode, Encode, MaxEncodedLen},
+	scale_info::TypeInfo,
+};
+
+// This structs makes it easy to write tests to compare staking ledgers fetched from storage. This
+// is required because the controller field is not stored in storage and it is private.
+#[cfg(test)]
+#[derive(frame_support::DebugNoBound, Clone, Encode, Decode, TypeInfo, MaxEncodedLen)]
+pub struct StakingLedgerInspect<T: Config> {
+	pub stash: T::AccountId,
+	#[codec(compact)]
+	pub total: BalanceOf<T>,
+	#[codec(compact)]
+	pub active: BalanceOf<T>,
+	pub unlocking: BoundedVec<UnlockChunk<BalanceOf<T>>, T::MaxUnlockingChunks>,
+	pub claimed_rewards: BoundedVec<EraIndex, T::HistoryDepth>,
+}
+
+#[cfg(test)]
+impl<T: Config> PartialEq<StakingLedgerInspect<T>> for StakingLedger<T> {
+	fn eq(&self, other: &StakingLedgerInspect<T>) -> bool {
+		self.stash == other.stash &&
+			self.total == other.total &&
+			self.active == other.active &&
+			self.unlocking == other.unlocking &&
+			self.claimed_rewards == other.claimed_rewards
+	}
+}
+
+#[cfg(test)]
+impl<T: Config> codec::EncodeLike<StakingLedger<T>> for StakingLedgerInspect<T> {}
diff --git a/substrate/frame/staking/src/lib.rs b/substrate/frame/staking/src/lib.rs
index e59b2a3324a62b69aa2f0577a63e7f399076324e..227326763a9bd58a97400d8e7faf93ecaf1a552a 100644
--- a/substrate/frame/staking/src/lib.rs
+++ b/substrate/frame/staking/src/lib.rs
@@ -91,7 +91,7 @@
 //! #### Nomination
 //!
 //! A **nominator** does not take any _direct_ role in maintaining the network, instead, it votes on
-//! a set of validators  to be elected. Once interest in nomination is stated by an account, it
+//! a set of validators to be elected. Once interest in nomination is stated by an account, it
 //! takes effect at the next election round. The funds in the nominator's stash account indicate the
 //! _weight_ of its vote. Both the rewards and any punishment that a validator earns are shared
 //! between the validator and its nominators. This rule incentivizes the nominators to NOT vote for
@@ -294,6 +294,7 @@ mod tests;
 
 pub mod election_size_tracker;
 pub mod inflation;
+pub mod ledger;
 pub mod migrations;
 pub mod slashing;
 pub mod weights;
@@ -302,26 +303,27 @@ mod pallet;
 
 use codec::{Decode, Encode, HasCompact, MaxEncodedLen};
 use frame_support::{
-	traits::{ConstU32, Currency, Defensive, Get},
+	traits::{ConstU32, Currency, Defensive, Get, LockIdentifier},
 	weights::Weight,
 	BoundedVec, CloneNoBound, EqNoBound, PartialEqNoBound, RuntimeDebugNoBound,
 };
 use scale_info::TypeInfo;
 use sp_runtime::{
 	curve::PiecewiseLinear,
-	traits::{AtLeast32BitUnsigned, Convert, Saturating, StaticLookup, Zero},
-	Perbill, Perquintill, Rounding, RuntimeDebug,
+	traits::{AtLeast32BitUnsigned, Convert, StaticLookup, Zero},
+	Perbill, Perquintill, Rounding, RuntimeDebug, Saturating,
 };
 pub use sp_staking::StakerStatus;
 use sp_staking::{
 	offence::{Offence, OffenceError, ReportOffence},
-	EraIndex, OnStakingUpdate, SessionIndex,
+	EraIndex, OnStakingUpdate, SessionIndex, StakingAccount,
 };
 use sp_std::{collections::btree_map::BTreeMap, prelude::*};
 pub use weights::WeightInfo;
 
 pub use pallet::{pallet::*, UseNominatorsAndValidatorsMap, UseValidatorsMap};
 
+pub(crate) const STAKING_ID: LockIdentifier = *b"staking ";
 pub(crate) const LOG_TARGET: &str = "runtime::staking";
 
 // syntactic sugar for logging.
@@ -433,6 +435,14 @@ pub struct UnlockChunk<Balance: HasCompact + MaxEncodedLen> {
 }
 
 /// The ledger of a (bonded) stash.
+///
+/// Note: All the reads and mutations to the [`Ledger`], [`Bonded`] and [`Payee`] storage items
+/// *MUST* be performed through the methods exposed by this struct, to ensure the consistency of
+/// ledger's data and corresponding staking lock
+///
+/// TODO: move struct definition and full implementation into `/src/ledger.rs`. Currently
+/// leaving here to enforce a clean PR diff, given how critical this logic is. Tracking issue
+/// <https://github.com/paritytech/substrate/issues/14749>.
 #[derive(
 	PartialEqNoBound,
 	EqNoBound,
@@ -462,20 +472,15 @@ pub struct StakingLedger<T: Config> {
 	/// List of eras for which the stakers behind a validator have claimed rewards. Only updated
 	/// for validators.
 	pub claimed_rewards: BoundedVec<EraIndex, T::HistoryDepth>,
+	/// The controller associated with this ledger's stash.
+	///
+	/// This is not stored on-chain, and is only bundled when the ledger is read from storage.
+	/// Use [`controller`] function to get the controller associated with the ledger.
+	#[codec(skip)]
+	controller: Option<T::AccountId>,
 }
 
 impl<T: Config> StakingLedger<T> {
-	/// Initializes the default object using the given `validator`.
-	pub fn default_from(stash: T::AccountId) -> Self {
-		Self {
-			stash,
-			total: Zero::zero(),
-			active: Zero::zero(),
-			unlocking: Default::default(),
-			claimed_rewards: Default::default(),
-		}
-	}
-
 	/// Remove entries from `unlocking` that are sufficiently old and reduce the
 	/// total by the sum of their balances.
 	fn consolidate_unlocked(self, current_era: EraIndex) -> Self {
@@ -503,6 +508,7 @@ impl<T: Config> StakingLedger<T> {
 			active: self.active,
 			unlocking,
 			claimed_rewards: self.claimed_rewards,
+			controller: self.controller,
 		}
 	}
 
@@ -671,8 +677,14 @@ impl<T: Config> StakingLedger<T> {
 		// clean unlocking chunks that are set to zero.
 		self.unlocking.retain(|c| !c.value.is_zero());
 
-		T::EventListeners::on_slash(&self.stash, self.active, &slashed_unlocking);
-		pre_slash_total.saturating_sub(self.total)
+		let final_slashed_amount = pre_slash_total.saturating_sub(self.total);
+		T::EventListeners::on_slash(
+			&self.stash,
+			self.active,
+			&slashed_unlocking,
+			final_slashed_amount,
+		);
+		final_slashed_amount
 	}
 }
 
@@ -921,7 +933,7 @@ pub struct StashOf<T>(sp_std::marker::PhantomData<T>);
 
 impl<T: Config> Convert<T::AccountId, Option<T::AccountId>> for StashOf<T> {
 	fn convert(controller: T::AccountId) -> Option<T::AccountId> {
-		<Pallet<T>>::ledger(&controller).map(|l| l.stash)
+		StakingLedger::<T>::paired_account(StakingAccount::Controller(controller))
 	}
 }
 
diff --git a/substrate/frame/staking/src/migrations.rs b/substrate/frame/staking/src/migrations.rs
index 332da506f01ed6ebb2bfcf9b449cd243b83ceba6..89520028b901c07599817d371db875fb258f536a 100644
--- a/substrate/frame/staking/src/migrations.rs
+++ b/substrate/frame/staking/src/migrations.rs
@@ -19,8 +19,9 @@
 use super::*;
 use frame_election_provider_support::SortedListProvider;
 use frame_support::{
-	dispatch::GetStorageVersion, pallet_prelude::ValueQuery, storage_alias,
-	traits::OnRuntimeUpgrade,
+	pallet_prelude::ValueQuery,
+	storage_alias,
+	traits::{GetStorageVersion, OnRuntimeUpgrade},
 };
 
 #[cfg(feature = "try-runtime")]
diff --git a/substrate/frame/staking/src/mock.rs b/substrate/frame/staking/src/mock.rs
index cf08f8be1f27dec6a2d29d9343360f0a6675a2ea..26d05d3a8c878f6dd899bff3e18b6b989aa54f11 100644
--- a/substrate/frame/staking/src/mock.rs
+++ b/substrate/frame/staking/src/mock.rs
@@ -39,7 +39,10 @@ use sp_runtime::{
 	traits::{IdentityLookup, Zero},
 	BuildStorage,
 };
-use sp_staking::offence::{DisableStrategy, OffenceDetails, OnOffenceHandler};
+use sp_staking::{
+	offence::{DisableStrategy, OffenceDetails, OnOffenceHandler},
+	OnStakingUpdate,
+};
 
 pub const INIT_TIMESTAMP: u64 = 30_000;
 pub const BLOCK_TIME: u64 = 1000;
@@ -77,7 +80,7 @@ impl sp_runtime::BoundToRuntimeAppPublic for OtherSessionHandler {
 }
 
 pub fn is_disabled(controller: AccountId) -> bool {
-	let stash = Staking::ledger(&controller).unwrap().stash;
+	let stash = Ledger::<Test>::get(&controller).unwrap().stash;
 	let validator_index = match Session::validators().iter().position(|v| *v == stash) {
 		Some(index) => index as u32,
 		None => return false,
@@ -278,6 +281,7 @@ impl OnStakingUpdate<AccountId, Balance> for EventListenerMock {
 		_pool_account: &AccountId,
 		slashed_bonded: Balance,
 		slashed_chunks: &BTreeMap<EraIndex, Balance>,
+		_total_slashed: Balance,
 	) {
 		LedgerSlashPerEra::set((slashed_bonded, slashed_chunks.clone()));
 	}
@@ -777,6 +781,16 @@ pub(crate) fn make_all_reward_payment(era: EraIndex) {
 	}
 }
 
+pub(crate) fn bond_controller_stash(controller: AccountId, stash: AccountId) -> Result<(), String> {
+	<Bonded<Test>>::get(&stash).map_or(Ok(()), |_| Err("stash already bonded"))?;
+	<Ledger<Test>>::get(&controller).map_or(Ok(()), |_| Err("controller already bonded"))?;
+
+	<Bonded<Test>>::insert(stash, controller);
+	<Ledger<Test>>::insert(controller, StakingLedger::<Test>::default_from(stash));
+
+	Ok(())
+}
+
 #[macro_export]
 macro_rules! assert_session_era {
 	($session:expr, $era:expr) => {
diff --git a/substrate/frame/staking/src/pallet/impls.rs b/substrate/frame/staking/src/pallet/impls.rs
index e0f5c9558781856e97730d93ab38c769242acdd4..ad2de1d59315a0826729324707c1b60aec103cb5 100644
--- a/substrate/frame/staking/src/pallet/impls.rs
+++ b/substrate/frame/staking/src/pallet/impls.rs
@@ -27,8 +27,8 @@ use frame_support::{
 	dispatch::WithPostDispatchInfo,
 	pallet_prelude::*,
 	traits::{
-		Currency, Defensive, DefensiveResult, EstimateNextNewSession, Get, Imbalance,
-		LockableCurrency, OnUnbalanced, TryCollect, UnixTime, WithdrawReasons,
+		Currency, Defensive, DefensiveResult, EstimateNextNewSession, Get, Imbalance, OnUnbalanced,
+		TryCollect, UnixTime,
 	},
 	weights::Weight,
 };
@@ -41,7 +41,9 @@ use sp_runtime::{
 use sp_staking::{
 	currency_to_vote::CurrencyToVote,
 	offence::{DisableStrategy, OffenceDetails, OnOffenceHandler},
-	EraIndex, SessionIndex, Stake, StakingInterface,
+	EraIndex, SessionIndex, Stake,
+	StakingAccount::{self, Controller, Stash},
+	StakingInterface,
 };
 use sp_std::prelude::*;
 
@@ -52,7 +54,7 @@ use crate::{
 	SessionInterface, StakingLedger, ValidatorPrefs,
 };
 
-use super::{pallet::*, STAKING_ID};
+use super::pallet::*;
 
 #[cfg(feature = "try-runtime")]
 use frame_support::ensure;
@@ -68,10 +70,24 @@ use sp_runtime::TryRuntimeError;
 const NPOS_MAX_ITERATIONS_COEFFICIENT: u32 = 2;
 
 impl<T: Config> Pallet<T> {
+	/// Fetches the ledger associated with a controller or stash account, if any.
+	pub fn ledger(account: StakingAccount<T::AccountId>) -> Result<StakingLedger<T>, Error<T>> {
+		StakingLedger::<T>::get(account)
+	}
+
+	pub fn payee(account: StakingAccount<T::AccountId>) -> RewardDestination<T::AccountId> {
+		StakingLedger::<T>::reward_destination(account)
+	}
+
+	/// Fetches the controller bonded to a stash account, if any.
+	pub fn bonded(stash: &T::AccountId) -> Option<T::AccountId> {
+		StakingLedger::<T>::paired_account(Stash(stash.clone()))
+	}
+
 	/// The total balance that can be slashed from a stash account as of right now.
 	pub fn slashable_balance_of(stash: &T::AccountId) -> BalanceOf<T> {
 		// Weight note: consider making the stake accessible through stash.
-		Self::bonded(stash).and_then(Self::ledger).map(|l| l.active).unwrap_or_default()
+		Self::ledger(Stash(stash.clone())).map(|l| l.active).unwrap_or_default()
 	}
 
 	/// Internal impl of [`Self::slashable_balance_of`] that returns [`VoteWeight`].
@@ -105,25 +121,24 @@ impl<T: Config> Pallet<T> {
 		controller: &T::AccountId,
 		num_slashing_spans: u32,
 	) -> Result<Weight, DispatchError> {
-		let mut ledger = Self::ledger(&controller).ok_or(Error::<T>::NotController)?;
+		let mut ledger = Self::ledger(Controller(controller.clone()))?;
 		let (stash, old_total) = (ledger.stash.clone(), ledger.total);
 		if let Some(current_era) = Self::current_era() {
 			ledger = ledger.consolidate_unlocked(current_era)
 		}
+		let new_total = ledger.total;
 
 		let used_weight =
 			if ledger.unlocking.is_empty() && ledger.active < T::Currency::minimum_balance() {
 				// This account must have called `unbond()` with some value that caused the active
 				// portion to fall below existential deposit + will have no more unlocking chunks
 				// left. We can now safely remove all staking-related information.
-				Self::kill_stash(&stash, num_slashing_spans)?;
-				// Remove the lock.
-				T::Currency::remove_lock(STAKING_ID, &stash);
+				Self::kill_stash(&ledger.stash, num_slashing_spans)?;
 
 				T::WeightInfo::withdraw_unbonded_kill(num_slashing_spans)
 			} else {
 				// This was the consequence of a partial unbond. just update the ledger and move on.
-				Self::update_ledger(&controller, &ledger);
+				ledger.update()?;
 
 				// This is only an update, so we use less overall weight.
 				T::WeightInfo::withdraw_unbonded_update(num_slashing_spans)
@@ -131,9 +146,9 @@ impl<T: Config> Pallet<T> {
 
 		// `old_total` should never be less than the new total because
 		// `consolidate_unlocked` strictly subtracts balance.
-		if ledger.total < old_total {
+		if new_total < old_total {
 			// Already checked that this won't overflow by entry condition.
-			let value = old_total - ledger.total;
+			let value = old_total - new_total;
 			Self::deposit_event(Event::<T>::Withdrawn { stash, amount: value });
 		}
 
@@ -163,10 +178,15 @@ impl<T: Config> Pallet<T> {
 				.with_weight(T::WeightInfo::payout_stakers_alive_staked(0))
 		})?;
 
-		let controller = Self::bonded(&validator_stash).ok_or_else(|| {
-			Error::<T>::NotStash.with_weight(T::WeightInfo::payout_stakers_alive_staked(0))
+		let account = StakingAccount::Stash(validator_stash.clone());
+		let mut ledger = Self::ledger(account.clone()).or_else(|_| {
+			if StakingLedger::<T>::is_bonded(account) {
+				Err(Error::<T>::NotController.into())
+			} else {
+				Err(Error::<T>::NotStash.with_weight(T::WeightInfo::payout_stakers_alive_staked(0)))
+			}
 		})?;
-		let mut ledger = <Ledger<T>>::get(&controller).ok_or(Error::<T>::NotController)?;
+		let stash = ledger.stash.clone();
 
 		ledger
 			.claimed_rewards
@@ -185,11 +205,11 @@ impl<T: Config> Pallet<T> {
 				.defensive_map_err(|_| Error::<T>::BoundNotMet)?,
 		}
 
-		let exposure = <ErasStakersClipped<T>>::get(&era, &ledger.stash);
+		let exposure = <ErasStakersClipped<T>>::get(&era, &stash);
 
 		// Input data seems good, no errors allowed after this point
 
-		<Ledger<T>>::insert(&controller, &ledger);
+		ledger.update()?;
 
 		// Get Era reward points. It has TOTAL and INDIVIDUAL
 		// Find the fraction of the era reward that belongs to the validator
@@ -200,11 +220,8 @@ impl<T: Config> Pallet<T> {
 
 		let era_reward_points = <ErasRewardPoints<T>>::get(&era);
 		let total_reward_points = era_reward_points.total;
-		let validator_reward_points = era_reward_points
-			.individual
-			.get(&ledger.stash)
-			.copied()
-			.unwrap_or_else(Zero::zero);
+		let validator_reward_points =
+			era_reward_points.individual.get(&stash).copied().unwrap_or_else(Zero::zero);
 
 		// Nothing to do if they have no reward points.
 		if validator_reward_points.is_zero() {
@@ -231,18 +248,15 @@ impl<T: Config> Pallet<T> {
 
 		Self::deposit_event(Event::<T>::PayoutStarted {
 			era_index: era,
-			validator_stash: ledger.stash.clone(),
+			validator_stash: stash.clone(),
 		});
 
 		let mut total_imbalance = PositiveImbalanceOf::<T>::zero();
 		// We can now make total validator payout:
-		if let Some(imbalance) =
-			Self::make_payout(&ledger.stash, validator_staking_payout + validator_commission_payout)
+		if let Some((imbalance, dest)) =
+			Self::make_payout(&stash, validator_staking_payout + validator_commission_payout)
 		{
-			Self::deposit_event(Event::<T>::Rewarded {
-				stash: ledger.stash,
-				amount: imbalance.peek(),
-			});
+			Self::deposit_event(Event::<T>::Rewarded { stash, dest, amount: imbalance.peek() });
 			total_imbalance.subsume(imbalance);
 		}
 
@@ -259,11 +273,14 @@ impl<T: Config> Pallet<T> {
 			let nominator_reward: BalanceOf<T> =
 				nominator_exposure_part * validator_leftover_payout;
 			// We can now make nominator payout:
-			if let Some(imbalance) = Self::make_payout(&nominator.who, nominator_reward) {
+			if let Some((imbalance, dest)) = Self::make_payout(&nominator.who, nominator_reward) {
 				// Note: this logic does not count payouts for `RewardDestination::None`.
 				nominator_payout_count += 1;
-				let e =
-					Event::<T>::Rewarded { stash: nominator.who.clone(), amount: imbalance.peek() };
+				let e = Event::<T>::Rewarded {
+					stash: nominator.who.clone(),
+					dest,
+					amount: imbalance.peek(),
+				};
 				Self::deposit_event(e);
 				total_imbalance.subsume(imbalance);
 			}
@@ -274,14 +291,6 @@ impl<T: Config> Pallet<T> {
 		Ok(Some(T::WeightInfo::payout_stakers_alive_staked(nominator_payout_count)).into())
 	}
 
-	/// Update the ledger for a controller.
-	///
-	/// This will also update the stash lock.
-	pub(crate) fn update_ledger(controller: &T::AccountId, ledger: &StakingLedger<T>) {
-		T::Currency::set_lock(STAKING_ID, &ledger.stash, ledger.total, WithdrawReasons::all());
-		<Ledger<T>>::insert(controller, ledger);
-	}
-
 	/// Chill a stash account.
 	pub(crate) fn chill_stash(stash: &T::AccountId) {
 		let chilled_as_validator = Self::do_remove_validator(stash);
@@ -293,25 +302,34 @@ impl<T: Config> Pallet<T> {
 
 	/// Actually make a payment to a staker. This uses the currency's reward function
 	/// to pay the right payee for the given staker account.
-	fn make_payout(stash: &T::AccountId, amount: BalanceOf<T>) -> Option<PositiveImbalanceOf<T>> {
-		let dest = Self::payee(stash);
-		match dest {
+	fn make_payout(
+		stash: &T::AccountId,
+		amount: BalanceOf<T>,
+	) -> Option<(PositiveImbalanceOf<T>, RewardDestination<T::AccountId>)> {
+		let dest = Self::payee(StakingAccount::Stash(stash.clone()));
+		let maybe_imbalance = match dest {
 			RewardDestination::Controller => Self::bonded(stash)
 				.map(|controller| T::Currency::deposit_creating(&controller, amount)),
 			RewardDestination::Stash => T::Currency::deposit_into_existing(stash, amount).ok(),
-			RewardDestination::Staked => Self::bonded(stash)
-				.and_then(|c| Self::ledger(&c).map(|l| (c, l)))
-				.and_then(|(controller, mut l)| {
-					l.active += amount;
-					l.total += amount;
+			RewardDestination::Staked => Self::ledger(Stash(stash.clone()))
+				.and_then(|mut ledger| {
+					ledger.active += amount;
+					ledger.total += amount;
 					let r = T::Currency::deposit_into_existing(stash, amount).ok();
-					Self::update_ledger(&controller, &l);
-					r
-				}),
+
+					let _ = ledger
+						.update()
+						.defensive_proof("ledger fetched from storage, so it exists; qed.");
+
+					Ok(r)
+				})
+				.unwrap_or_default(),
 			RewardDestination::Account(dest_account) =>
 				Some(T::Currency::deposit_creating(&dest_account, amount)),
 			RewardDestination::None => None,
-		}
+		};
+		maybe_imbalance
+			.map(|imbalance| (imbalance, Self::payee(StakingAccount::Stash(stash.clone()))))
 	}
 
 	/// Plan a new session potentially trigger a new era.
@@ -400,7 +418,6 @@ impl<T: Config> Pallet<T> {
 	}
 
 	/// Start a new era. It does:
-	///
 	/// * Increment `active_era.index`,
 	/// * reset `active_era.start`,
 	/// * update `BondedEras` and apply slashes.
@@ -659,18 +676,16 @@ impl<T: Config> Pallet<T> {
 	/// - after a `withdraw_unbonded()` call that frees all of a stash's bonded balance.
 	/// - through `reap_stash()` if the balance has fallen to zero (through slashing).
 	pub(crate) fn kill_stash(stash: &T::AccountId, num_slashing_spans: u32) -> DispatchResult {
-		let controller = <Bonded<T>>::get(stash).ok_or(Error::<T>::NotStash)?;
-
-		slashing::clear_stash_metadata::<T>(stash, num_slashing_spans)?;
+		slashing::clear_stash_metadata::<T>(&stash, num_slashing_spans)?;
 
-		<Bonded<T>>::remove(stash);
-		<Ledger<T>>::remove(&controller);
+		// removes controller from `Bonded` and staking ledger from `Ledger`, as well as reward
+		// setting of the stash in `Payee`.
+		StakingLedger::<T>::kill(&stash)?;
 
-		<Payee<T>>::remove(stash);
-		Self::do_remove_validator(stash);
-		Self::do_remove_nominator(stash);
+		Self::do_remove_validator(&stash);
+		Self::do_remove_nominator(&stash);
 
-		frame_system::Pallet::<T>::dec_consumers(stash);
+		frame_system::Pallet::<T>::dec_consumers(&stash);
 
 		Ok(())
 	}
@@ -1116,13 +1131,7 @@ impl<T: Config> ElectionDataProvider for Pallet<T> {
 		<Bonded<T>>::insert(voter.clone(), voter.clone());
 		<Ledger<T>>::insert(
 			voter.clone(),
-			StakingLedger {
-				stash: voter.clone(),
-				active: stake,
-				total: stake,
-				unlocking: Default::default(),
-				claimed_rewards: Default::default(),
-			},
+			StakingLedger::<T>::new(voter.clone(), stake, Default::default()),
 		);
 
 		Self::do_add_nominator(&voter, Nominations { targets, submitted_in: 0, suppressed: false });
@@ -1134,13 +1143,7 @@ impl<T: Config> ElectionDataProvider for Pallet<T> {
 		<Bonded<T>>::insert(target.clone(), target.clone());
 		<Ledger<T>>::insert(
 			target.clone(),
-			StakingLedger {
-				stash: target.clone(),
-				active: stake,
-				total: stake,
-				unlocking: Default::default(),
-				claimed_rewards: Default::default(),
-			},
+			StakingLedger::<T>::new(target.clone(), stake, Default::default()),
 		);
 		Self::do_add_validator(
 			&target,
@@ -1175,13 +1178,7 @@ impl<T: Config> ElectionDataProvider for Pallet<T> {
 			<Bonded<T>>::insert(v.clone(), v.clone());
 			<Ledger<T>>::insert(
 				v.clone(),
-				StakingLedger {
-					stash: v.clone(),
-					active: stake,
-					total: stake,
-					unlocking: Default::default(),
-					claimed_rewards: Default::default(),
-				},
+				StakingLedger::<T>::new(v.clone(), stake, Default::default()),
 			);
 			Self::do_add_validator(
 				&v,
@@ -1196,13 +1193,7 @@ impl<T: Config> ElectionDataProvider for Pallet<T> {
 			<Bonded<T>>::insert(v.clone(), v.clone());
 			<Ledger<T>>::insert(
 				v.clone(),
-				StakingLedger {
-					stash: v.clone(),
-					active: stake,
-					total: stake,
-					unlocking: Default::default(),
-					claimed_rewards: Default::default(),
-				},
+				StakingLedger::<T>::new(v.clone(), stake, Default::default()),
 			);
 			Self::do_add_nominator(
 				&v,
@@ -1452,9 +1443,9 @@ impl<T: Config> ScoreProvider<T::AccountId> for Pallet<T> {
 		// this will clearly results in an inconsistent state, but it should not matter for a
 		// benchmark.
 		let active: BalanceOf<T> = weight.try_into().map_err(|_| ()).unwrap();
-		let mut ledger = match Self::ledger(who) {
-			None => StakingLedger::default_from(who.clone()),
-			Some(l) => l,
+		let mut ledger = match Self::ledger(StakingAccount::Stash(who.clone())) {
+			Ok(l) => l,
+			Err(_) => StakingLedger::default_from(who.clone()),
 		};
 		ledger.active = active;
 
@@ -1645,9 +1636,9 @@ impl<T: Config> StakingInterface for Pallet<T> {
 	}
 
 	fn stash_by_ctrl(controller: &Self::AccountId) -> Result<Self::AccountId, DispatchError> {
-		Self::ledger(controller)
+		Self::ledger(Controller(controller.clone()))
 			.map(|l| l.stash)
-			.ok_or(Error::<T>::NotController.into())
+			.map_err(|e| e.into())
 	}
 
 	fn is_exposed_in_era(who: &Self::AccountId, era: &EraIndex) -> bool {
@@ -1665,10 +1656,9 @@ impl<T: Config> StakingInterface for Pallet<T> {
 	}
 
 	fn stake(who: &Self::AccountId) -> Result<Stake<BalanceOf<T>>, DispatchError> {
-		Self::bonded(who)
-			.and_then(|c| Self::ledger(c))
+		Self::ledger(Stash(who.clone()))
 			.map(|l| Stake { total: l.total, active: l.active })
-			.ok_or(Error::<T>::NotStash.into())
+			.map_err(|e| e.into())
 	}
 
 	fn bond_extra(who: &Self::AccountId, extra: Self::Balance) -> DispatchResult {
@@ -1693,7 +1683,7 @@ impl<T: Config> StakingInterface for Pallet<T> {
 		who: Self::AccountId,
 		num_slashing_spans: u32,
 	) -> Result<bool, DispatchError> {
-		let ctrl = Self::bonded(who).ok_or(Error::<T>::NotStash)?;
+		let ctrl = Self::bonded(&who).ok_or(Error::<T>::NotStash)?;
 		Self::withdraw_unbonded(RawOrigin::Signed(ctrl.clone()).into(), num_slashing_spans)
 			.map(|_| !Ledger::<T>::contains_key(&ctrl))
 			.map_err(|with_post| with_post.error)
@@ -1720,8 +1710,7 @@ impl<T: Config> StakingInterface for Pallet<T> {
 	fn status(
 		who: &Self::AccountId,
 	) -> Result<sp_staking::StakerStatus<Self::AccountId>, DispatchError> {
-		let is_bonded = Self::bonded(who).is_some();
-		if !is_bonded {
+		if !StakingLedger::<T>::is_bonded(StakingAccount::Stash(who.clone())) {
 			return Err(Error::<T>::NotStash.into())
 		}
 
@@ -1875,7 +1864,8 @@ impl<T: Config> Pallet<T> {
 
 	fn ensure_ledger_consistent(ctrl: T::AccountId) -> Result<(), TryRuntimeError> {
 		// ensures ledger.total == ledger.active + sum(ledger.unlocking).
-		let ledger = Self::ledger(ctrl.clone()).ok_or("Not a controller.")?;
+		let ledger = Self::ledger(StakingAccount::Controller(ctrl.clone()))?;
+
 		let real_total: BalanceOf<T> =
 			ledger.unlocking.iter().fold(ledger.active, |a, c| a + c.value);
 		ensure!(real_total == ledger.total, "ledger.total corrupt");
diff --git a/substrate/frame/staking/src/pallet/mod.rs b/substrate/frame/staking/src/pallet/mod.rs
index 40a2f5cf73eb186d2e188cb36c7583184457a284..f084299be8e13d88b9228d123fe75a0593640c34 100644
--- a/substrate/frame/staking/src/pallet/mod.rs
+++ b/substrate/frame/staking/src/pallet/mod.rs
@@ -17,16 +17,15 @@
 
 //! Staking FRAME Pallet.
 
+use codec::Codec;
 use frame_election_provider_support::{
 	ElectionProvider, ElectionProviderBase, SortedListProvider, VoteWeight,
 };
 use frame_support::{
-	dispatch::Codec,
 	pallet_prelude::*,
 	traits::{
 		Currency, Defensive, DefensiveResult, DefensiveSaturating, EnsureOrigin,
-		EstimateNextNewSession, Get, LockIdentifier, LockableCurrency, OnUnbalanced, TryCollect,
-		UnixTime,
+		EstimateNextNewSession, Get, LockableCurrency, OnUnbalanced, TryCollect, UnixTime,
 	},
 	weights::Weight,
 	BoundedVec,
@@ -36,7 +35,10 @@ use sp_runtime::{
 	traits::{CheckedSub, SaturatedConversion, StaticLookup, Zero},
 	ArithmeticError, Perbill, Percent,
 };
-use sp_staking::{EraIndex, SessionIndex};
+use sp_staking::{
+	EraIndex, SessionIndex,
+	StakingAccount::{self, Controller, Stash},
+};
 use sp_std::prelude::*;
 
 mod impls;
@@ -50,7 +52,6 @@ use crate::{
 	UnappliedSlash, UnlockChunk, ValidatorPrefs,
 };
 
-const STAKING_ID: LockIdentifier = *b"staking ";
 // The speculative number of spans are used as an input of the weight annotation of
 // [`Call::unbond`], as the post dipatch weight may depend on the number of slashing span on the
 // account which is not provided as an input. The value set should be conservative but sensible.
@@ -295,7 +296,6 @@ pub mod pallet {
 	///
 	/// TWOX-NOTE: SAFE since `AccountId` is a secure hash.
 	#[pallet::storage]
-	#[pallet::getter(fn bonded)]
 	pub type Bonded<T: Config> = StorageMap<_, Twox64Concat, T::AccountId, T::AccountId>;
 
 	/// The minimum active bond to become and maintain the role of a nominator.
@@ -317,15 +317,16 @@ pub mod pallet {
 	pub type MinCommission<T: Config> = StorageValue<_, Perbill, ValueQuery>;
 
 	/// Map from all (unlocked) "controller" accounts to the info regarding the staking.
+	///
+	/// Note: All the reads and mutations to this storage *MUST* be done through the methods exposed
+	/// by [`StakingLedger`] to ensure data and lock consistency.
 	#[pallet::storage]
-	#[pallet::getter(fn ledger)]
 	pub type Ledger<T: Config> = StorageMap<_, Blake2_128Concat, T::AccountId, StakingLedger<T>>;
 
 	/// Where the reward payment should be made. Keyed by stash.
 	///
 	/// TWOX-NOTE: SAFE since `AccountId` is a secure hash.
 	#[pallet::storage]
-	#[pallet::getter(fn payee)]
 	pub type Payee<T: Config> =
 		StorageMap<_, Twox64Concat, T::AccountId, RewardDestination<T::AccountId>, ValueQuery>;
 
@@ -664,8 +665,12 @@ pub mod pallet {
 		/// The era payout has been set; the first balance is the validator-payout; the second is
 		/// the remainder from the maximum amount of reward.
 		EraPaid { era_index: EraIndex, validator_payout: BalanceOf<T>, remainder: BalanceOf<T> },
-		/// The nominator has been rewarded by this amount.
-		Rewarded { stash: T::AccountId, amount: BalanceOf<T> },
+		/// The nominator has been rewarded by this amount to this destination.
+		Rewarded {
+			stash: T::AccountId,
+			dest: RewardDestination<T::AccountId>,
+			amount: BalanceOf<T>,
+		},
 		/// A staker (validator or nominator) has been slashed by the given amount.
 		Slashed { staker: T::AccountId, amount: BalanceOf<T> },
 		/// A slash for the given validator, for the given percentage of their stake, at the given
@@ -837,16 +842,11 @@ pub mod pallet {
 			payee: RewardDestination<T::AccountId>,
 		) -> DispatchResult {
 			let stash = ensure_signed(origin)?;
-			let controller_to_be_deprecated = stash.clone();
 
-			if <Bonded<T>>::contains_key(&stash) {
+			if StakingLedger::<T>::is_bonded(StakingAccount::Stash(stash.clone())) {
 				return Err(Error::<T>::AlreadyBonded.into())
 			}
 
-			if <Ledger<T>>::contains_key(&controller_to_be_deprecated) {
-				return Err(Error::<T>::AlreadyPaired.into())
-			}
-
 			// Reject a bond which is considered to be _dust_.
 			if value < T::Currency::minimum_balance() {
 				return Err(Error::<T>::InsufficientBond.into())
@@ -854,11 +854,6 @@ pub mod pallet {
 
 			frame_system::Pallet::<T>::inc_consumers(&stash).map_err(|_| Error::<T>::BadState)?;
 
-			// You're auto-bonded forever, here. We might improve this by only bonding when
-			// you actually validate/nominate and remove once you unbond __everything__.
-			<Bonded<T>>::insert(&stash, &stash);
-			<Payee<T>>::insert(&stash, payee);
-
 			let current_era = CurrentEra::<T>::get().unwrap_or(0);
 			let history_depth = T::HistoryDepth::get();
 			let last_reward_era = current_era.saturating_sub(history_depth);
@@ -866,19 +861,21 @@ pub mod pallet {
 			let stash_balance = T::Currency::free_balance(&stash);
 			let value = value.min(stash_balance);
 			Self::deposit_event(Event::<T>::Bonded { stash: stash.clone(), amount: value });
-			let item = StakingLedger {
-				stash: stash.clone(),
-				total: value,
-				active: value,
-				unlocking: Default::default(),
-				claimed_rewards: (last_reward_era..current_era)
+			let ledger = StakingLedger::<T>::new(
+				stash.clone(),
+				value,
+				(last_reward_era..current_era)
 					.try_collect()
 					// Since last_reward_era is calculated as `current_era -
 					// HistoryDepth`, following bound is always expected to be
 					// satisfied.
 					.defensive_map_err(|_| Error::<T>::BoundNotMet)?,
-			};
-			Self::update_ledger(&controller_to_be_deprecated, &item);
+			);
+
+			// You're auto-bonded forever, here. We might improve this by only bonding when
+			// you actually validate/nominate and remove once you unbond __everything__.
+			ledger.bond(payee)?;
+
 			Ok(())
 		}
 
@@ -904,8 +901,7 @@ pub mod pallet {
 		) -> DispatchResult {
 			let stash = ensure_signed(origin)?;
 
-			let controller = Self::bonded(&stash).ok_or(Error::<T>::NotStash)?;
-			let mut ledger = Self::ledger(&controller).ok_or(Error::<T>::NotController)?;
+			let mut ledger = Self::ledger(StakingAccount::Stash(stash.clone()))?;
 
 			let stash_balance = T::Currency::free_balance(&stash);
 			if let Some(extra) = stash_balance.checked_sub(&ledger.total) {
@@ -919,11 +915,10 @@ pub mod pallet {
 				);
 
 				// NOTE: ledger must be updated prior to calling `Self::weight_of`.
-				Self::update_ledger(&controller, &ledger);
+				ledger.update()?;
 				// update this staker in the sorted list, if they exist in it.
 				if T::VoterList::contains(&stash) {
-					let _ =
-						T::VoterList::on_update(&stash, Self::weight_of(&ledger.stash)).defensive();
+					let _ = T::VoterList::on_update(&stash, Self::weight_of(&stash)).defensive();
 				}
 
 				Self::deposit_event(Event::<T>::Bonded { stash, amount: extra });
@@ -959,9 +954,8 @@ pub mod pallet {
 			#[pallet::compact] value: BalanceOf<T>,
 		) -> DispatchResultWithPostInfo {
 			let controller = ensure_signed(origin)?;
-			let unlocking = Self::ledger(&controller)
-				.map(|l| l.unlocking.len())
-				.ok_or(Error::<T>::NotController)?;
+			let unlocking =
+				Self::ledger(Controller(controller.clone())).map(|l| l.unlocking.len())?;
 
 			// if there are no unlocking chunks available, try to withdraw chunks older than
 			// `BondingDuration` to proceed with the unbonding.
@@ -977,8 +971,9 @@ pub mod pallet {
 
 			// we need to fetch the ledger again because it may have been mutated in the call
 			// to `Self::do_withdraw_unbonded` above.
-			let mut ledger = Self::ledger(&controller).ok_or(Error::<T>::NotController)?;
+			let mut ledger = Self::ledger(Controller(controller))?;
 			let mut value = value.min(ledger.active);
+			let stash = ledger.stash.clone();
 
 			ensure!(
 				ledger.unlocking.len() < T::MaxUnlockingChunks::get() as usize,
@@ -994,9 +989,9 @@ pub mod pallet {
 					ledger.active = Zero::zero();
 				}
 
-				let min_active_bond = if Nominators::<T>::contains_key(&ledger.stash) {
+				let min_active_bond = if Nominators::<T>::contains_key(&stash) {
 					MinNominatorBond::<T>::get()
-				} else if Validators::<T>::contains_key(&ledger.stash) {
+				} else if Validators::<T>::contains_key(&stash) {
 					MinValidatorBond::<T>::get()
 				} else {
 					Zero::zero()
@@ -1020,15 +1015,14 @@ pub mod pallet {
 						.map_err(|_| Error::<T>::NoMoreChunks)?;
 				};
 				// NOTE: ledger must be updated prior to calling `Self::weight_of`.
-				Self::update_ledger(&controller, &ledger);
+				ledger.update()?;
 
 				// update this staker in the sorted list, if they exist in it.
-				if T::VoterList::contains(&ledger.stash) {
-					let _ = T::VoterList::on_update(&ledger.stash, Self::weight_of(&ledger.stash))
-						.defensive();
+				if T::VoterList::contains(&stash) {
+					let _ = T::VoterList::on_update(&stash, Self::weight_of(&stash)).defensive();
 				}
 
-				Self::deposit_event(Event::<T>::Unbonded { stash: ledger.stash, amount: value });
+				Self::deposit_event(Event::<T>::Unbonded { stash, amount: value });
 			}
 
 			let actual_weight = if let Some(withdraw_weight) = maybe_withdraw_weight {
@@ -1085,7 +1079,7 @@ pub mod pallet {
 		pub fn validate(origin: OriginFor<T>, prefs: ValidatorPrefs) -> DispatchResult {
 			let controller = ensure_signed(origin)?;
 
-			let ledger = Self::ledger(&controller).ok_or(Error::<T>::NotController)?;
+			let ledger = Self::ledger(Controller(controller))?;
 
 			ensure!(ledger.active >= MinValidatorBond::<T>::get(), Error::<T>::InsufficientBond);
 			let stash = &ledger.stash;
@@ -1131,7 +1125,8 @@ pub mod pallet {
 		) -> DispatchResult {
 			let controller = ensure_signed(origin)?;
 
-			let ledger = Self::ledger(&controller).ok_or(Error::<T>::NotController)?;
+			let ledger = Self::ledger(StakingAccount::Controller(controller.clone()))?;
+
 			ensure!(ledger.active >= MinNominatorBond::<T>::get(), Error::<T>::InsufficientBond);
 			let stash = &ledger.stash;
 
@@ -1198,7 +1193,9 @@ pub mod pallet {
 		#[pallet::weight(T::WeightInfo::chill())]
 		pub fn chill(origin: OriginFor<T>) -> DispatchResult {
 			let controller = ensure_signed(origin)?;
-			let ledger = Self::ledger(&controller).ok_or(Error::<T>::NotController)?;
+
+			let ledger = Self::ledger(StakingAccount::Controller(controller))?;
+
 			Self::chill_stash(&ledger.stash);
 			Ok(())
 		}
@@ -1222,9 +1219,11 @@ pub mod pallet {
 			payee: RewardDestination<T::AccountId>,
 		) -> DispatchResult {
 			let controller = ensure_signed(origin)?;
-			let ledger = Self::ledger(&controller).ok_or(Error::<T>::NotController)?;
-			let stash = &ledger.stash;
-			<Payee<T>>::insert(stash, payee);
+			let ledger = Self::ledger(Controller(controller))?;
+			let _ = ledger
+				.set_payee(payee)
+				.defensive_proof("ledger was retrieved from storage, thus its bonded; qed.");
+
 			Ok(())
 		}
 
@@ -1246,18 +1245,24 @@ pub mod pallet {
 		#[pallet::weight(T::WeightInfo::set_controller())]
 		pub fn set_controller(origin: OriginFor<T>) -> DispatchResult {
 			let stash = ensure_signed(origin)?;
-			let old_controller = Self::bonded(&stash).ok_or(Error::<T>::NotStash)?;
 
-			if <Ledger<T>>::contains_key(&stash) {
-				return Err(Error::<T>::AlreadyPaired.into())
-			}
-			if old_controller != stash {
-				<Bonded<T>>::insert(&stash, &stash);
-				if let Some(l) = <Ledger<T>>::take(&old_controller) {
-					<Ledger<T>>::insert(&stash, l);
+			// the bonded map and ledger are mutated directly as this extrinsic is related to a
+			// (temporary) passive migration.
+			Self::ledger(StakingAccount::Stash(stash.clone())).map(|ledger| {
+				let controller = ledger.controller()
+                    .defensive_proof("ledger was fetched used the StakingInterface, so controller field must exist; qed.")
+                    .ok_or(Error::<T>::NotController)?;
+
+				if controller == stash {
+					// stash is already its own controller.
+					return Err(Error::<T>::AlreadyPaired.into())
 				}
-			}
-			Ok(())
+				// update bond and ledger.
+				<Ledger<T>>::remove(controller);
+				<Bonded<T>>::insert(&stash, &stash);
+				<Ledger<T>>::insert(&stash, ledger);
+				Ok(())
+			})?
 		}
 
 		/// Sets the ideal number of validators.
@@ -1405,11 +1410,9 @@ pub mod pallet {
 		) -> DispatchResult {
 			ensure_root(origin)?;
 
-			// Remove all staking-related information.
+			// Remove all staking-related information and lock.
 			Self::kill_stash(&stash, num_slashing_spans)?;
 
-			// Remove the lock.
-			T::Currency::remove_lock(STAKING_ID, &stash);
 			Ok(())
 		}
 
@@ -1498,7 +1501,7 @@ pub mod pallet {
 			#[pallet::compact] value: BalanceOf<T>,
 		) -> DispatchResultWithPostInfo {
 			let controller = ensure_signed(origin)?;
-			let ledger = Self::ledger(&controller).ok_or(Error::<T>::NotController)?;
+			let ledger = Self::ledger(Controller(controller))?;
 			ensure!(!ledger.unlocking.is_empty(), Error::<T>::NoUnlockChunk);
 
 			let initial_unlocking = ledger.unlocking.len() as u32;
@@ -1511,16 +1514,18 @@ pub mod pallet {
 				amount: rebonded_value,
 			});
 
+			let stash = ledger.stash.clone();
+			let final_unlocking = ledger.unlocking.len();
+
 			// NOTE: ledger must be updated prior to calling `Self::weight_of`.
-			Self::update_ledger(&controller, &ledger);
-			if T::VoterList::contains(&ledger.stash) {
-				let _ = T::VoterList::on_update(&ledger.stash, Self::weight_of(&ledger.stash))
-					.defensive();
+			ledger.update()?;
+			if T::VoterList::contains(&stash) {
+				let _ = T::VoterList::on_update(&stash, Self::weight_of(&stash)).defensive();
 			}
 
 			let removed_chunks = 1u32 // for the case where the last iterated chunk is not removed
 				.saturating_add(initial_unlocking)
-				.saturating_sub(ledger.unlocking.len() as u32);
+				.saturating_sub(final_unlocking as u32);
 			Ok(Some(T::WeightInfo::rebond(removed_chunks)).into())
 		}
 
@@ -1552,13 +1557,11 @@ pub mod pallet {
 
 			let ed = T::Currency::minimum_balance();
 			let reapable = T::Currency::total_balance(&stash) < ed ||
-				Self::ledger(Self::bonded(stash.clone()).ok_or(Error::<T>::NotStash)?)
-					.map(|l| l.total)
-					.unwrap_or_default() < ed;
+				Self::ledger(Stash(stash.clone())).map(|l| l.total).unwrap_or_default() < ed;
 			ensure!(reapable, Error::<T>::FundedTarget);
 
+			// Remove all staking-related information and lock.
 			Self::kill_stash(&stash, num_slashing_spans)?;
-			T::Currency::remove_lock(STAKING_ID, &stash);
 
 			Ok(Pays::No.into())
 		}
@@ -1578,7 +1581,7 @@ pub mod pallet {
 		#[pallet::weight(T::WeightInfo::kick(who.len() as u32))]
 		pub fn kick(origin: OriginFor<T>, who: Vec<AccountIdLookupOf<T>>) -> DispatchResult {
 			let controller = ensure_signed(origin)?;
-			let ledger = Self::ledger(&controller).ok_or(Error::<T>::NotController)?;
+			let ledger = Self::ledger(Controller(controller))?;
 			let stash = &ledger.stash;
 
 			for nom_stash in who
@@ -1687,7 +1690,7 @@ pub mod pallet {
 		pub fn chill_other(origin: OriginFor<T>, controller: T::AccountId) -> DispatchResult {
 			// Anyone can call this function.
 			let caller = ensure_signed(origin)?;
-			let ledger = Self::ledger(&controller).ok_or(Error::<T>::NotController)?;
+			let ledger = Self::ledger(Controller(controller.clone()))?;
 			let stash = ledger.stash;
 
 			// In order for one user to chill another user, the following conditions must be met:
diff --git a/substrate/frame/staking/src/slashing.rs b/substrate/frame/staking/src/slashing.rs
index bb02da73f6e5d5ddb96f23f61a7ac4ca463e0f03..0d84d503733e6451feb69f287d69f8655fe0b20e 100644
--- a/substrate/frame/staking/src/slashing.rs
+++ b/substrate/frame/staking/src/slashing.rs
@@ -597,15 +597,11 @@ pub fn do_slash<T: Config>(
 	slashed_imbalance: &mut NegativeImbalanceOf<T>,
 	slash_era: EraIndex,
 ) {
-	let controller = match <Pallet<T>>::bonded(stash).defensive() {
-		None => return,
-		Some(c) => c,
-	};
-
-	let mut ledger = match <Pallet<T>>::ledger(&controller) {
-		Some(ledger) => ledger,
-		None => return, // nothing to do.
-	};
+	let mut ledger =
+		match Pallet::<T>::ledger(sp_staking::StakingAccount::Stash(stash.clone())).defensive() {
+			Ok(ledger) => ledger,
+			Err(_) => return, // nothing to do.
+		};
 
 	let value = ledger.slash(value, T::Currency::minimum_balance(), slash_era);
 
@@ -618,7 +614,9 @@ pub fn do_slash<T: Config>(
 			*reward_payout = reward_payout.saturating_sub(missing);
 		}
 
-		<Pallet<T>>::update_ledger(&controller, &ledger);
+		let _ = ledger
+			.update()
+			.defensive_proof("ledger fetched from storage so it exists in storage; qed.");
 
 		// trigger the event
 		<Pallet<T>>::deposit_event(super::Event::<T>::Slashed {
diff --git a/substrate/frame/staking/src/tests.rs b/substrate/frame/staking/src/tests.rs
index fd7dabac74d8de2e17753040720e04b5476a9b5a..cb620f89f12c01c3c1816717993fb9d7bb6d1fcc 100644
--- a/substrate/frame/staking/src/tests.rs
+++ b/substrate/frame/staking/src/tests.rs
@@ -18,6 +18,7 @@
 //! Tests for the module.
 
 use super::{ConfigOp, Event, *};
+use crate::ledger::StakingLedgerInspect;
 use frame_election_provider_support::{
 	bounds::{DataProviderBounds, ElectionBoundsBuilder},
 	ElectionProvider, SortedListProvider, Support,
@@ -33,7 +34,7 @@ use pallet_balances::Error as BalancesError;
 use sp_runtime::{
 	assert_eq_error_rate, bounded_vec,
 	traits::{BadOrigin, Dispatchable},
-	Perbill, Percent, Rounding, TokenError,
+	Perbill, Percent, Perquintill, Rounding, TokenError,
 };
 use sp_staking::{
 	offence::{DisableStrategy, OffenceDetails, OnOffenceHandler},
@@ -151,8 +152,8 @@ fn basic_setup_works() {
 
 		// Account 11 controls its own stash, which is 100 * balance_factor units
 		assert_eq!(
-			Staking::ledger(&11).unwrap(),
-			StakingLedger {
+			Ledger::get(&11).unwrap(),
+			StakingLedgerInspect::<Test> {
 				stash: 11,
 				total: 1000,
 				active: 1000,
@@ -162,17 +163,17 @@ fn basic_setup_works() {
 		);
 		// Account 21 controls its own stash, which is 200 * balance_factor units
 		assert_eq!(
-			Staking::ledger(&21),
-			Some(StakingLedger {
+			Ledger::get(&21).unwrap(),
+			StakingLedgerInspect::<Test> {
 				stash: 21,
 				total: 1000,
 				active: 1000,
 				unlocking: Default::default(),
 				claimed_rewards: bounded_vec![],
-			})
+			}
 		);
 		// Account 1 does not control any stash
-		assert_eq!(Staking::ledger(&1), None);
+		assert!(Staking::ledger(1.into()).is_err());
 
 		// ValidatorPrefs are default
 		assert_eq_uvec!(
@@ -185,14 +186,14 @@ fn basic_setup_works() {
 		);
 
 		assert_eq!(
-			Staking::ledger(101),
-			Some(StakingLedger {
+			Staking::ledger(101.into()).unwrap(),
+			StakingLedgerInspect {
 				stash: 101,
 				total: 500,
 				active: 500,
 				unlocking: Default::default(),
 				claimed_rewards: bounded_vec![],
-			})
+			}
 		);
 		assert_eq!(Staking::nominators(101).unwrap().targets, vec![11, 21]);
 
@@ -265,7 +266,7 @@ fn change_controller_works() {
 #[test]
 fn change_controller_already_paired_once_stash() {
 	ExtBuilder::default().build_and_execute(|| {
-		// 10 and 11 are bonded as controller and stash respectively.
+		// 11 and 11 are bonded as controller and stash respectively.
 		assert_eq!(Staking::bonded(&11), Some(11));
 
 		// 11 is initially a validator.
@@ -460,14 +461,14 @@ fn staking_should_work() {
 
 		// Note: the stashed value of 4 is still lock
 		assert_eq!(
-			Staking::ledger(&3),
-			Some(StakingLedger {
+			Staking::ledger(3.into()).unwrap(),
+			StakingLedgerInspect {
 				stash: 3,
 				total: 1500,
 				active: 1500,
 				unlocking: Default::default(),
 				claimed_rewards: bounded_vec![0],
-			})
+			}
 		);
 		// e.g. it cannot reserve more than 500 that it has free from the total 2000
 		assert_noop!(Balances::reserve(&3, 501), BalancesError::<Test, _>::LiquidityRestrictions);
@@ -717,9 +718,9 @@ fn nominators_also_get_slashed_pro_rata() {
 		assert_eq!(initial_exposure.others.first().unwrap().who, 101);
 
 		// staked values;
-		let nominator_stake = Staking::ledger(101).unwrap().active;
+		let nominator_stake = Staking::ledger(101.into()).unwrap().active;
 		let nominator_balance = balances(&101).0;
-		let validator_stake = Staking::ledger(11).unwrap().active;
+		let validator_stake = Staking::ledger(11.into()).unwrap().active;
 		let validator_balance = balances(&11).0;
 		let exposed_stake = initial_exposure.total;
 		let exposed_validator = initial_exposure.own;
@@ -732,8 +733,8 @@ fn nominators_also_get_slashed_pro_rata() {
 		);
 
 		// both stakes must have been decreased.
-		assert!(Staking::ledger(101).unwrap().active < nominator_stake);
-		assert!(Staking::ledger(11).unwrap().active < validator_stake);
+		assert!(Staking::ledger(101.into()).unwrap().active < nominator_stake);
+		assert!(Staking::ledger(11.into()).unwrap().active < validator_stake);
 
 		let slash_amount = slash_percent * exposed_stake;
 		let validator_share =
@@ -746,8 +747,8 @@ fn nominators_also_get_slashed_pro_rata() {
 		assert!(nominator_share > 0);
 
 		// both stakes must have been decreased pro-rata.
-		assert_eq!(Staking::ledger(101).unwrap().active, nominator_stake - nominator_share);
-		assert_eq!(Staking::ledger(11).unwrap().active, validator_stake - validator_share);
+		assert_eq!(Staking::ledger(101.into()).unwrap().active, nominator_stake - nominator_share);
+		assert_eq!(Staking::ledger(11.into()).unwrap().active, validator_stake - validator_share);
 		assert_eq!(
 			balances(&101).0, // free balance
 			nominator_balance - nominator_share,
@@ -1047,14 +1048,14 @@ fn reward_destination_works() {
 		assert_eq!(Balances::free_balance(11), 1000);
 		// Check how much is at stake
 		assert_eq!(
-			Staking::ledger(&11),
-			Some(StakingLedger {
+			Staking::ledger(11.into()).unwrap(),
+			StakingLedgerInspect {
 				stash: 11,
 				total: 1000,
 				active: 1000,
 				unlocking: Default::default(),
 				claimed_rewards: bounded_vec![],
-			})
+			}
 		);
 
 		// Compute total payout now for whole duration as other parameter won't change
@@ -1065,19 +1066,19 @@ fn reward_destination_works() {
 		mock::make_all_reward_payment(0);
 
 		// Check that RewardDestination is Staked (default)
-		assert_eq!(Staking::payee(&11), RewardDestination::Staked);
+		assert_eq!(Staking::payee(11.into()), RewardDestination::Staked);
 		// Check that reward went to the stash account of validator
 		assert_eq!(Balances::free_balance(11), 1000 + total_payout_0);
 		// Check that amount at stake increased accordingly
 		assert_eq!(
-			Staking::ledger(&11),
-			Some(StakingLedger {
+			Staking::ledger(11.into()).unwrap(),
+			StakingLedgerInspect {
 				stash: 11,
 				total: 1000 + total_payout_0,
 				active: 1000 + total_payout_0,
 				unlocking: Default::default(),
 				claimed_rewards: bounded_vec![0],
-			})
+			}
 		);
 
 		// Change RewardDestination to Stash
@@ -1091,19 +1092,19 @@ fn reward_destination_works() {
 		mock::make_all_reward_payment(1);
 
 		// Check that RewardDestination is Stash
-		assert_eq!(Staking::payee(&11), RewardDestination::Stash);
+		assert_eq!(Staking::payee(11.into()), RewardDestination::Stash);
 		// Check that reward went to the stash account
 		assert_eq!(Balances::free_balance(11), 1000 + total_payout_0 + total_payout_1);
 		// Check that amount at stake is NOT increased
 		assert_eq!(
-			Staking::ledger(&11),
-			Some(StakingLedger {
+			Staking::ledger(11.into()).unwrap(),
+			StakingLedgerInspect {
 				stash: 11,
 				total: 1000 + total_payout_0,
 				active: 1000 + total_payout_0,
 				unlocking: Default::default(),
 				claimed_rewards: bounded_vec![0, 1],
-			})
+			}
 		);
 
 		// Change RewardDestination to Controller
@@ -1120,19 +1121,19 @@ fn reward_destination_works() {
 		mock::make_all_reward_payment(2);
 
 		// Check that RewardDestination is Controller
-		assert_eq!(Staking::payee(&11), RewardDestination::Controller);
+		assert_eq!(Staking::payee(11.into()), RewardDestination::Controller);
 		// Check that reward went to the controller account
 		assert_eq!(Balances::free_balance(11), 23150 + total_payout_2);
 		// Check that amount at stake is NOT increased
 		assert_eq!(
-			Staking::ledger(&11),
-			Some(StakingLedger {
+			Staking::ledger(11.into()).unwrap(),
+			StakingLedgerInspect {
 				stash: 11,
 				total: 1000 + total_payout_0,
 				active: 1000 + total_payout_0,
 				unlocking: Default::default(),
 				claimed_rewards: bounded_vec![0, 1, 2],
-			})
+			}
 		);
 	});
 }
@@ -1185,14 +1186,14 @@ fn bond_extra_works() {
 		assert_eq!(Staking::bonded(&11), Some(11));
 		// Check how much is at stake
 		assert_eq!(
-			Staking::ledger(&11),
-			Some(StakingLedger {
+			Staking::ledger(11.into()).unwrap(),
+			StakingLedgerInspect {
 				stash: 11,
 				total: 1000,
 				active: 1000,
 				unlocking: Default::default(),
 				claimed_rewards: bounded_vec![],
-			})
+			}
 		);
 
 		// Give account 11 some large free balance greater than total
@@ -1202,28 +1203,28 @@ fn bond_extra_works() {
 		assert_ok!(Staking::bond_extra(RuntimeOrigin::signed(11), 100));
 		// There should be 100 more `total` and `active` in the ledger
 		assert_eq!(
-			Staking::ledger(&11),
-			Some(StakingLedger {
+			Staking::ledger(11.into()).unwrap(),
+			StakingLedgerInspect {
 				stash: 11,
 				total: 1000 + 100,
 				active: 1000 + 100,
 				unlocking: Default::default(),
 				claimed_rewards: bounded_vec![],
-			})
+			}
 		);
 
 		// Call the bond_extra function with a large number, should handle it
 		assert_ok!(Staking::bond_extra(RuntimeOrigin::signed(11), Balance::max_value()));
 		// The full amount of the funds should now be in the total and active
 		assert_eq!(
-			Staking::ledger(&11),
-			Some(StakingLedger {
+			Staking::ledger(11.into()).unwrap(),
+			StakingLedgerInspect {
 				stash: 11,
 				total: 1000000,
 				active: 1000000,
 				unlocking: Default::default(),
 				claimed_rewards: bounded_vec![],
-			})
+			}
 		);
 	});
 }
@@ -1254,14 +1255,14 @@ fn bond_extra_and_withdraw_unbonded_works() {
 
 		// Initial state of 11
 		assert_eq!(
-			Staking::ledger(&11),
-			Some(StakingLedger {
+			Staking::ledger(11.into()).unwrap(),
+			StakingLedgerInspect {
 				stash: 11,
 				total: 1000,
 				active: 1000,
 				unlocking: Default::default(),
 				claimed_rewards: bounded_vec![],
-			})
+			}
 		);
 		assert_eq!(
 			Staking::eras_stakers(active_era(), 11),
@@ -1272,14 +1273,14 @@ fn bond_extra_and_withdraw_unbonded_works() {
 		Staking::bond_extra(RuntimeOrigin::signed(11), 100).unwrap();
 
 		assert_eq!(
-			Staking::ledger(&11),
-			Some(StakingLedger {
+			Staking::ledger(11.into()).unwrap(),
+			StakingLedgerInspect {
 				stash: 11,
 				total: 1000 + 100,
 				active: 1000 + 100,
 				unlocking: Default::default(),
 				claimed_rewards: bounded_vec![],
-			})
+			}
 		);
 		// Exposure is a snapshot! only updated after the next era update.
 		assert_ne!(
@@ -1293,14 +1294,14 @@ fn bond_extra_and_withdraw_unbonded_works() {
 
 		// ledger should be the same.
 		assert_eq!(
-			Staking::ledger(&11),
-			Some(StakingLedger {
+			Staking::ledger(11.into()).unwrap(),
+			StakingLedgerInspect {
 				stash: 11,
 				total: 1000 + 100,
 				active: 1000 + 100,
 				unlocking: Default::default(),
 				claimed_rewards: bounded_vec![],
-			})
+			}
 		);
 		// Exposure is now updated.
 		assert_eq!(
@@ -1311,27 +1312,27 @@ fn bond_extra_and_withdraw_unbonded_works() {
 		// Unbond almost all of the funds in stash.
 		Staking::unbond(RuntimeOrigin::signed(11), 1000).unwrap();
 		assert_eq!(
-			Staking::ledger(&11),
-			Some(StakingLedger {
+			Staking::ledger(11.into()).unwrap(),
+			StakingLedgerInspect {
 				stash: 11,
 				total: 1000 + 100,
 				active: 100,
 				unlocking: bounded_vec![UnlockChunk { value: 1000, era: 2 + 3 }],
 				claimed_rewards: bounded_vec![],
-			}),
+			},
 		);
 
 		// Attempting to free the balances now will fail. 2 eras need to pass.
 		assert_ok!(Staking::withdraw_unbonded(RuntimeOrigin::signed(11), 0));
 		assert_eq!(
-			Staking::ledger(&11),
-			Some(StakingLedger {
+			Staking::ledger(11.into()).unwrap(),
+			StakingLedgerInspect {
 				stash: 11,
 				total: 1000 + 100,
 				active: 100,
 				unlocking: bounded_vec![UnlockChunk { value: 1000, era: 2 + 3 }],
 				claimed_rewards: bounded_vec![],
-			}),
+			},
 		);
 
 		// trigger next era.
@@ -1340,14 +1341,14 @@ fn bond_extra_and_withdraw_unbonded_works() {
 		// nothing yet
 		assert_ok!(Staking::withdraw_unbonded(RuntimeOrigin::signed(11), 0));
 		assert_eq!(
-			Staking::ledger(&11),
-			Some(StakingLedger {
+			Staking::ledger(11.into()).unwrap(),
+			StakingLedgerInspect {
 				stash: 11,
 				total: 1000 + 100,
 				active: 100,
 				unlocking: bounded_vec![UnlockChunk { value: 1000, era: 2 + 3 }],
 				claimed_rewards: bounded_vec![],
-			}),
+			},
 		);
 
 		// trigger next era.
@@ -1356,14 +1357,14 @@ fn bond_extra_and_withdraw_unbonded_works() {
 		assert_ok!(Staking::withdraw_unbonded(RuntimeOrigin::signed(11), 0));
 		// Now the value is free and the staking ledger is updated.
 		assert_eq!(
-			Staking::ledger(&11),
-			Some(StakingLedger {
+			Staking::ledger(11.into()).unwrap(),
+			StakingLedgerInspect {
 				stash: 11,
 				total: 100,
 				active: 100,
 				unlocking: Default::default(),
 				claimed_rewards: bounded_vec![],
-			}),
+			},
 		);
 	})
 }
@@ -1390,7 +1391,7 @@ fn many_unbond_calls_should_work() {
 		// `BondingDuration` == 3).
 		assert_ok!(Staking::unbond(RuntimeOrigin::signed(11), 1));
 		assert_eq!(
-			Staking::ledger(&11).map(|l| l.unlocking.len()).unwrap(),
+			Staking::ledger(11.into()).map(|l| l.unlocking.len()).unwrap(),
 			<<Test as Config>::MaxUnlockingChunks as Get<u32>>::get() as usize
 		);
 
@@ -1405,7 +1406,7 @@ fn many_unbond_calls_should_work() {
 
 		// only slots within last `BondingDuration` are filled.
 		assert_eq!(
-			Staking::ledger(&11).map(|l| l.unlocking.len()).unwrap(),
+			Staking::ledger(11.into()).map(|l| l.unlocking.len()).unwrap(),
 			<<Test as Config>::BondingDuration>::get() as usize
 		);
 	})
@@ -1459,14 +1460,14 @@ fn rebond_works() {
 
 		// Initial state of 11
 		assert_eq!(
-			Staking::ledger(&11),
-			Some(StakingLedger {
+			Staking::ledger(11.into()).unwrap(),
+			StakingLedgerInspect {
 				stash: 11,
 				total: 1000,
 				active: 1000,
 				unlocking: Default::default(),
 				claimed_rewards: bounded_vec![],
-			})
+			}
 		);
 
 		mock::start_active_era(2);
@@ -1478,66 +1479,66 @@ fn rebond_works() {
 		// Unbond almost all of the funds in stash.
 		Staking::unbond(RuntimeOrigin::signed(11), 900).unwrap();
 		assert_eq!(
-			Staking::ledger(&11),
-			Some(StakingLedger {
+			Staking::ledger(11.into()).unwrap(),
+			StakingLedgerInspect {
 				stash: 11,
 				total: 1000,
 				active: 100,
 				unlocking: bounded_vec![UnlockChunk { value: 900, era: 2 + 3 }],
 				claimed_rewards: bounded_vec![],
-			})
+			}
 		);
 
 		// Re-bond all the funds unbonded.
 		Staking::rebond(RuntimeOrigin::signed(11), 900).unwrap();
 		assert_eq!(
-			Staking::ledger(&11),
-			Some(StakingLedger {
+			Staking::ledger(11.into()).unwrap(),
+			StakingLedgerInspect {
 				stash: 11,
 				total: 1000,
 				active: 1000,
 				unlocking: Default::default(),
 				claimed_rewards: bounded_vec![],
-			})
+			}
 		);
 
 		// Unbond almost all of the funds in stash.
 		Staking::unbond(RuntimeOrigin::signed(11), 900).unwrap();
 		assert_eq!(
-			Staking::ledger(&11),
-			Some(StakingLedger {
+			Staking::ledger(11.into()).unwrap(),
+			StakingLedgerInspect {
 				stash: 11,
 				total: 1000,
 				active: 100,
 				unlocking: bounded_vec![UnlockChunk { value: 900, era: 5 }],
 				claimed_rewards: bounded_vec![],
-			})
+			}
 		);
 
 		// Re-bond part of the funds unbonded.
 		Staking::rebond(RuntimeOrigin::signed(11), 500).unwrap();
 		assert_eq!(
-			Staking::ledger(&11),
-			Some(StakingLedger {
+			Staking::ledger(11.into()).unwrap(),
+			StakingLedgerInspect {
 				stash: 11,
 				total: 1000,
 				active: 600,
 				unlocking: bounded_vec![UnlockChunk { value: 400, era: 5 }],
 				claimed_rewards: bounded_vec![],
-			})
+			}
 		);
 
 		// Re-bond the remainder of the funds unbonded.
 		Staking::rebond(RuntimeOrigin::signed(11), 500).unwrap();
 		assert_eq!(
-			Staking::ledger(&11),
-			Some(StakingLedger {
+			Staking::ledger(11.into()).unwrap(),
+			StakingLedgerInspect {
 				stash: 11,
 				total: 1000,
 				active: 1000,
 				unlocking: Default::default(),
 				claimed_rewards: bounded_vec![],
-			})
+			}
 		);
 
 		// Unbond parts of the funds in stash.
@@ -1545,27 +1546,27 @@ fn rebond_works() {
 		Staking::unbond(RuntimeOrigin::signed(11), 300).unwrap();
 		Staking::unbond(RuntimeOrigin::signed(11), 300).unwrap();
 		assert_eq!(
-			Staking::ledger(&11),
-			Some(StakingLedger {
+			Staking::ledger(11.into()).unwrap(),
+			StakingLedgerInspect {
 				stash: 11,
 				total: 1000,
 				active: 100,
 				unlocking: bounded_vec![UnlockChunk { value: 900, era: 5 }],
 				claimed_rewards: bounded_vec![],
-			})
+			}
 		);
 
 		// Re-bond part of the funds unbonded.
 		Staking::rebond(RuntimeOrigin::signed(11), 500).unwrap();
 		assert_eq!(
-			Staking::ledger(&11),
-			Some(StakingLedger {
+			Staking::ledger(11.into()).unwrap(),
+			StakingLedgerInspect {
 				stash: 11,
 				total: 1000,
 				active: 600,
 				unlocking: bounded_vec![UnlockChunk { value: 400, era: 5 }],
 				claimed_rewards: bounded_vec![],
-			})
+			}
 		);
 	})
 }
@@ -1585,14 +1586,14 @@ fn rebond_is_fifo() {
 
 		// Initial state of 10
 		assert_eq!(
-			Staking::ledger(&11),
-			Some(StakingLedger {
+			Staking::ledger(11.into()).unwrap(),
+			StakingLedgerInspect {
 				stash: 11,
 				total: 1000,
 				active: 1000,
 				unlocking: Default::default(),
 				claimed_rewards: bounded_vec![],
-			})
+			}
 		);
 
 		mock::start_active_era(2);
@@ -1600,14 +1601,14 @@ fn rebond_is_fifo() {
 		// Unbond some of the funds in stash.
 		Staking::unbond(RuntimeOrigin::signed(11), 400).unwrap();
 		assert_eq!(
-			Staking::ledger(&11),
-			Some(StakingLedger {
+			Staking::ledger(11.into()).unwrap(),
+			StakingLedgerInspect {
 				stash: 11,
 				total: 1000,
 				active: 600,
 				unlocking: bounded_vec![UnlockChunk { value: 400, era: 2 + 3 }],
 				claimed_rewards: bounded_vec![],
-			})
+			}
 		);
 
 		mock::start_active_era(3);
@@ -1615,8 +1616,8 @@ fn rebond_is_fifo() {
 		// Unbond more of the funds in stash.
 		Staking::unbond(RuntimeOrigin::signed(11), 300).unwrap();
 		assert_eq!(
-			Staking::ledger(&11),
-			Some(StakingLedger {
+			Staking::ledger(11.into()).unwrap(),
+			StakingLedgerInspect {
 				stash: 11,
 				total: 1000,
 				active: 300,
@@ -1625,7 +1626,7 @@ fn rebond_is_fifo() {
 					UnlockChunk { value: 300, era: 3 + 3 },
 				],
 				claimed_rewards: bounded_vec![],
-			})
+			}
 		);
 
 		mock::start_active_era(4);
@@ -1633,8 +1634,8 @@ fn rebond_is_fifo() {
 		// Unbond yet more of the funds in stash.
 		Staking::unbond(RuntimeOrigin::signed(11), 200).unwrap();
 		assert_eq!(
-			Staking::ledger(&11),
-			Some(StakingLedger {
+			Staking::ledger(11.into()).unwrap(),
+			StakingLedgerInspect {
 				stash: 11,
 				total: 1000,
 				active: 100,
@@ -1644,14 +1645,14 @@ fn rebond_is_fifo() {
 					UnlockChunk { value: 200, era: 4 + 3 },
 				],
 				claimed_rewards: bounded_vec![],
-			})
+			}
 		);
 
 		// Re-bond half of the unbonding funds.
 		Staking::rebond(RuntimeOrigin::signed(11), 400).unwrap();
 		assert_eq!(
-			Staking::ledger(&11),
-			Some(StakingLedger {
+			Staking::ledger(11.into()).unwrap(),
+			StakingLedgerInspect {
 				stash: 11,
 				total: 1000,
 				active: 500,
@@ -1660,7 +1661,7 @@ fn rebond_is_fifo() {
 					UnlockChunk { value: 100, era: 3 + 3 },
 				],
 				claimed_rewards: bounded_vec![],
-			})
+			}
 		);
 	})
 }
@@ -1682,27 +1683,27 @@ fn rebond_emits_right_value_in_event() {
 		// Unbond almost all of the funds in stash.
 		Staking::unbond(RuntimeOrigin::signed(11), 900).unwrap();
 		assert_eq!(
-			Staking::ledger(&11),
-			Some(StakingLedger {
+			Staking::ledger(11.into()).unwrap(),
+			StakingLedgerInspect {
 				stash: 11,
 				total: 1000,
 				active: 100,
 				unlocking: bounded_vec![UnlockChunk { value: 900, era: 1 + 3 }],
 				claimed_rewards: bounded_vec![],
-			})
+			}
 		);
 
 		// Re-bond less than the total
 		Staking::rebond(RuntimeOrigin::signed(11), 100).unwrap();
 		assert_eq!(
-			Staking::ledger(&11),
-			Some(StakingLedger {
+			Staking::ledger(11.into()).unwrap(),
+			StakingLedgerInspect {
 				stash: 11,
 				total: 1000,
 				active: 200,
 				unlocking: bounded_vec![UnlockChunk { value: 800, era: 1 + 3 }],
 				claimed_rewards: bounded_vec![],
-			})
+			}
 		);
 		// Event emitted should be correct
 		assert_eq!(*staking_events().last().unwrap(), Event::Bonded { stash: 11, amount: 100 });
@@ -1710,14 +1711,14 @@ fn rebond_emits_right_value_in_event() {
 		// Re-bond way more than available
 		Staking::rebond(RuntimeOrigin::signed(11), 100_000).unwrap();
 		assert_eq!(
-			Staking::ledger(&11),
-			Some(StakingLedger {
+			Staking::ledger(11.into()).unwrap(),
+			StakingLedgerInspect {
 				stash: 11,
 				total: 1000,
 				active: 1000,
 				unlocking: Default::default(),
 				claimed_rewards: bounded_vec![],
-			})
+			}
 		);
 		// Event emitted should be correct, only 800
 		assert_eq!(*staking_events().last().unwrap(), Event::Bonded { stash: 11, amount: 800 });
@@ -1747,7 +1748,7 @@ fn reward_to_stake_works() {
 			ErasStakers::<Test>::insert(0, 21, Exposure { total: 69, own: 69, others: vec![] });
 			<Ledger<Test>>::insert(
 				&20,
-				StakingLedger {
+				StakingLedgerInspect {
 					stash: 21,
 					total: 69,
 					active: 69,
@@ -1806,16 +1807,7 @@ fn reap_stash_works() {
 
 			// no easy way to cause an account to go below ED, we tweak their staking ledger
 			// instead.
-			Ledger::<Test>::insert(
-				11,
-				StakingLedger {
-					stash: 11,
-					total: 5,
-					active: 5,
-					unlocking: Default::default(),
-					claimed_rewards: bounded_vec![],
-				},
-			);
+			Ledger::<Test>::insert(11, StakingLedger::<Test>::new(11, 5, bounded_vec![]));
 
 			// reap-able
 			assert_ok!(Staking::reap_stash(RuntimeOrigin::signed(20), 11, 0));
@@ -1937,14 +1929,14 @@ fn bond_with_no_staked_value() {
 			// unbonding even 1 will cause all to be unbonded.
 			assert_ok!(Staking::unbond(RuntimeOrigin::signed(1), 1));
 			assert_eq!(
-				Staking::ledger(1),
-				Some(StakingLedger {
+				Staking::ledger(1.into()).unwrap(),
+				StakingLedgerInspect {
 					stash: 1,
 					active: 0,
 					total: 5,
 					unlocking: bounded_vec![UnlockChunk { value: 5, era: 3 }],
 					claimed_rewards: bounded_vec![],
-				})
+				}
 			);
 
 			mock::start_active_era(1);
@@ -1952,14 +1944,14 @@ fn bond_with_no_staked_value() {
 
 			// not yet removed.
 			assert_ok!(Staking::withdraw_unbonded(RuntimeOrigin::signed(1), 0));
-			assert!(Staking::ledger(1).is_some());
+			assert!(Staking::ledger(1.into()).is_ok());
 			assert_eq!(Balances::locks(&1)[0].amount, 5);
 
 			mock::start_active_era(3);
 
 			// poof. Account 1 is removed from the staking system.
 			assert_ok!(Staking::withdraw_unbonded(RuntimeOrigin::signed(1), 0));
-			assert!(Staking::ledger(1).is_none());
+			assert!(Staking::ledger(1.into()).is_err());
 			assert_eq!(Balances::locks(&1).len(), 0);
 		});
 }
@@ -2044,7 +2036,7 @@ fn bond_with_duplicate_vote_should_be_ignored_by_election_provider() {
 			// ensure all have equal stake.
 			assert_eq!(
 				<Validators<Test>>::iter()
-					.map(|(v, _)| (v, Staking::ledger(v).unwrap().total))
+					.map(|(v, _)| (v, Staking::ledger(v.into()).unwrap().total))
 					.collect::<Vec<_>>(),
 				vec![(31, 1000), (21, 1000), (11, 1000)],
 			);
@@ -2096,7 +2088,7 @@ fn bond_with_duplicate_vote_should_be_ignored_by_election_provider_elected() {
 			// ensure all have equal stake.
 			assert_eq!(
 				<Validators<Test>>::iter()
-					.map(|(v, _)| (v, Staking::ledger(v).unwrap().total))
+					.map(|(v, _)| (v, Staking::ledger(v.into()).unwrap().total))
 					.collect::<Vec<_>>(),
 				vec![(31, 1000), (21, 1000), (11, 1000)],
 			);
@@ -2982,7 +2974,7 @@ fn retroactive_deferred_slashes_one_before() {
 
 		mock::start_active_era(4);
 
-		assert_eq!(Staking::ledger(11).unwrap().total, 1000);
+		assert_eq!(Staking::ledger(11.into()).unwrap().total, 1000);
 		// slash happens after the next line.
 
 		mock::start_active_era(5);
@@ -2997,9 +2989,9 @@ fn retroactive_deferred_slashes_one_before() {
 		));
 
 		// their ledger has already been slashed.
-		assert_eq!(Staking::ledger(11).unwrap().total, 900);
+		assert_eq!(Staking::ledger(11.into()).unwrap().total, 900);
 		assert_ok!(Staking::unbond(RuntimeOrigin::signed(11), 1000));
-		assert_eq!(Staking::ledger(11).unwrap().total, 900);
+		assert_eq!(Staking::ledger(11.into()).unwrap().total, 900);
 	})
 }
 
@@ -3032,7 +3024,7 @@ fn staker_cannot_bail_deferred_slash() {
 
 		assert_eq!(
 			Ledger::<Test>::get(101).unwrap(),
-			StakingLedger {
+			StakingLedgerInspect {
 				active: 0,
 				total: 500,
 				stash: 101,
@@ -3759,6 +3751,16 @@ fn test_payout_stakers() {
 		);
 		assert!(RewardOnUnbalanceWasCalled::get());
 
+		// `Rewarded` events are being executed.
+		assert!(matches!(
+			staking_events_since_last_call().as_slice(),
+			&[
+				..,
+				Event::Rewarded { stash: 1037, dest: RewardDestination::Controller, amount: 108 },
+				Event::Rewarded { stash: 1036, dest: RewardDestination::Controller, amount: 108 }
+			]
+		));
+
 		// Top 64 nominators of validator 11 automatically paid out, including the validator
 		// Validator payout goes to controller.
 		assert!(Balances::free_balance(&11) > balance);
@@ -3772,14 +3774,14 @@ fn test_payout_stakers() {
 
 		// We track rewards in `claimed_rewards` vec
 		assert_eq!(
-			Staking::ledger(&11),
-			Some(StakingLedger {
+			Staking::ledger(11.into()).unwrap(),
+			StakingLedgerInspect {
 				stash: 11,
 				total: 1000,
 				active: 1000,
 				unlocking: Default::default(),
 				claimed_rewards: bounded_vec![1]
-			})
+			}
 		);
 
 		for i in 3..16 {
@@ -3803,14 +3805,14 @@ fn test_payout_stakers() {
 
 		// We track rewards in `claimed_rewards` vec
 		assert_eq!(
-			Staking::ledger(&11),
-			Some(StakingLedger {
+			Staking::ledger(11.into()).unwrap(),
+			StakingLedgerInspect {
 				stash: 11,
 				total: 1000,
 				active: 1000,
 				unlocking: Default::default(),
 				claimed_rewards: (1..=14).collect::<Vec<_>>().try_into().unwrap()
-			})
+			}
 		);
 
 		let last_era = 99;
@@ -3836,14 +3838,14 @@ fn test_payout_stakers() {
 			expected_last_reward_era
 		));
 		assert_eq!(
-			Staking::ledger(&11),
-			Some(StakingLedger {
+			Staking::ledger(11.into()).unwrap(),
+			StakingLedgerInspect {
 				stash: 11,
 				total: 1000,
 				active: 1000,
 				unlocking: Default::default(),
 				claimed_rewards: bounded_vec![expected_start_reward_era, expected_last_reward_era]
-			})
+			}
 		);
 
 		// Out of order claims works.
@@ -3851,8 +3853,8 @@ fn test_payout_stakers() {
 		assert_ok!(Staking::payout_stakers(RuntimeOrigin::signed(1337), 11, 23));
 		assert_ok!(Staking::payout_stakers(RuntimeOrigin::signed(1337), 11, 42));
 		assert_eq!(
-			Staking::ledger(&11),
-			Some(StakingLedger {
+			Staking::ledger(11.into()).unwrap(),
+			StakingLedgerInspect {
 				stash: 11,
 				total: 1000,
 				active: 1000,
@@ -3864,7 +3866,7 @@ fn test_payout_stakers() {
 					69,
 					expected_last_reward_era
 				]
-			})
+			}
 		);
 	});
 }
@@ -4063,26 +4065,26 @@ fn bond_during_era_correctly_populates_claimed_rewards() {
 		// Era = None
 		bond_validator(9, 1000);
 		assert_eq!(
-			Staking::ledger(&9),
-			Some(StakingLedger {
+			Staking::ledger(9.into()).unwrap(),
+			StakingLedgerInspect {
 				stash: 9,
 				total: 1000,
 				active: 1000,
 				unlocking: Default::default(),
 				claimed_rewards: bounded_vec![],
-			})
+			}
 		);
 		mock::start_active_era(5);
 		bond_validator(11, 1000);
 		assert_eq!(
-			Staking::ledger(&11),
-			Some(StakingLedger {
+			Staking::ledger(11.into()).unwrap(),
+			StakingLedgerInspect {
 				stash: 11,
 				total: 1000,
 				active: 1000,
 				unlocking: Default::default(),
 				claimed_rewards: (0..5).collect::<Vec<_>>().try_into().unwrap(),
-			})
+			}
 		);
 
 		// make sure only era upto history depth is stored
@@ -4091,8 +4093,8 @@ fn bond_during_era_correctly_populates_claimed_rewards() {
 		mock::start_active_era(current_era);
 		bond_validator(13, 1000);
 		assert_eq!(
-			Staking::ledger(&13),
-			Some(StakingLedger {
+			Staking::ledger(13.into()).unwrap(),
+			StakingLedgerInspect {
 				stash: 13,
 				total: 1000,
 				active: 1000,
@@ -4101,7 +4103,7 @@ fn bond_during_era_correctly_populates_claimed_rewards() {
 					.collect::<Vec<_>>()
 					.try_into()
 					.unwrap(),
-			})
+			}
 		);
 	});
 }
@@ -4190,6 +4192,7 @@ fn payout_creates_controller() {
 			false,
 		)
 		.unwrap();
+
 		assert_ok!(Staking::nominate(RuntimeOrigin::signed(controller), vec![11]));
 
 		// kill controller
@@ -4346,8 +4349,8 @@ fn cannot_rebond_to_lower_than_ed() {
 		.build_and_execute(|| {
 			// initial stuff.
 			assert_eq!(
-				Staking::ledger(&21).unwrap(),
-				StakingLedger {
+				Staking::ledger(21.into()).unwrap(),
+				StakingLedgerInspect {
 					stash: 21,
 					total: 11 * 1000,
 					active: 11 * 1000,
@@ -4360,8 +4363,8 @@ fn cannot_rebond_to_lower_than_ed() {
 			assert_ok!(Staking::chill(RuntimeOrigin::signed(21)));
 			assert_ok!(Staking::unbond(RuntimeOrigin::signed(21), 11 * 1000));
 			assert_eq!(
-				Staking::ledger(&21).unwrap(),
-				StakingLedger {
+				Staking::ledger(21.into()).unwrap(),
+				StakingLedgerInspect {
 					stash: 21,
 					total: 11 * 1000,
 					active: 0,
@@ -4386,8 +4389,8 @@ fn cannot_bond_extra_to_lower_than_ed() {
 		.build_and_execute(|| {
 			// initial stuff.
 			assert_eq!(
-				Staking::ledger(&21).unwrap(),
-				StakingLedger {
+				Staking::ledger(21.into()).unwrap(),
+				StakingLedgerInspect {
 					stash: 21,
 					total: 11 * 1000,
 					active: 11 * 1000,
@@ -4400,8 +4403,8 @@ fn cannot_bond_extra_to_lower_than_ed() {
 			assert_ok!(Staking::chill(RuntimeOrigin::signed(21)));
 			assert_ok!(Staking::unbond(RuntimeOrigin::signed(21), 11 * 1000));
 			assert_eq!(
-				Staking::ledger(&21).unwrap(),
-				StakingLedger {
+				Staking::ledger(21.into()).unwrap(),
+				StakingLedgerInspect {
 					stash: 21,
 					total: 11 * 1000,
 					active: 0,
@@ -4427,8 +4430,8 @@ fn do_not_die_when_active_is_ed() {
 		.build_and_execute(|| {
 			// given
 			assert_eq!(
-				Staking::ledger(&21).unwrap(),
-				StakingLedger {
+				Staking::ledger(21.into()).unwrap(),
+				StakingLedgerInspect {
 					stash: 21,
 					total: 1000 * ed,
 					active: 1000 * ed,
@@ -4444,8 +4447,8 @@ fn do_not_die_when_active_is_ed() {
 
 			// then
 			assert_eq!(
-				Staking::ledger(&21).unwrap(),
-				StakingLedger {
+				Staking::ledger(21.into()).unwrap(),
+				StakingLedgerInspect {
 					stash: 21,
 					total: ed,
 					active: ed,
@@ -5520,15 +5523,14 @@ fn force_apply_min_commission_works() {
 #[test]
 fn proportional_slash_stop_slashing_if_remaining_zero() {
 	let c = |era, value| UnlockChunk::<Balance> { era, value };
+
+	// we have some chunks, but they are not affected.
+	let unlocking = bounded_vec![c(1, 10), c(2, 10)];
+
 	// Given
-	let mut ledger = StakingLedger::<Test> {
-		stash: 123,
-		total: 40,
-		active: 20,
-		// we have some chunks, but they are not affected.
-		unlocking: bounded_vec![c(1, 10), c(2, 10)],
-		claimed_rewards: bounded_vec![],
-	};
+	let mut ledger = StakingLedger::<Test>::new(123, 20, bounded_vec![]);
+	ledger.total = 40;
+	ledger.unlocking = unlocking;
 
 	assert_eq!(BondingDuration::get(), 3);
 
@@ -5540,13 +5542,7 @@ fn proportional_slash_stop_slashing_if_remaining_zero() {
 fn proportional_ledger_slash_works() {
 	let c = |era, value| UnlockChunk::<Balance> { era, value };
 	// Given
-	let mut ledger = StakingLedger::<Test> {
-		stash: 123,
-		total: 10,
-		active: 10,
-		unlocking: bounded_vec![],
-		claimed_rewards: bounded_vec![],
-	};
+	let mut ledger = StakingLedger::<Test>::new(123, 10, bounded_vec![]);
 	assert_eq!(BondingDuration::get(), 3);
 
 	// When we slash a ledger with no unlocking chunks
@@ -5785,8 +5781,8 @@ fn pre_bonding_era_cannot_be_claimed() {
 		let claimed_rewards: BoundedVec<_, _> =
 			(start_reward_era..=last_reward_era).collect::<Vec<_>>().try_into().unwrap();
 		assert_eq!(
-			Staking::ledger(&3).unwrap(),
-			StakingLedger {
+			Staking::ledger(3.into()).unwrap(),
+			StakingLedgerInspect {
 				stash: 3,
 				total: 1500,
 				active: 1500,
@@ -5813,7 +5809,7 @@ fn pre_bonding_era_cannot_be_claimed() {
 
 		// decoding will fail now since Staking Ledger is in corrupt state
 		HistoryDepth::set(history_depth - 1);
-		assert_eq!(Staking::ledger(&4), None);
+		assert!(Staking::ledger(4.into()).is_err());
 
 		// make sure stakers still cannot claim rewards that they are not meant to
 		assert_noop!(
@@ -5851,8 +5847,8 @@ fn reducing_history_depth_abrupt() {
 		let claimed_rewards: BoundedVec<_, _> =
 			(start_reward_era..=last_reward_era).collect::<Vec<_>>().try_into().unwrap();
 		assert_eq!(
-			Staking::ledger(&3).unwrap(),
-			StakingLedger {
+			Staking::ledger(3.into()).unwrap(),
+			StakingLedgerInspect {
 				stash: 3,
 				total: 1500,
 				active: 1500,
@@ -5890,8 +5886,8 @@ fn reducing_history_depth_abrupt() {
 		let claimed_rewards: BoundedVec<_, _> =
 			(start_reward_era..=last_reward_era).collect::<Vec<_>>().try_into().unwrap();
 		assert_eq!(
-			Staking::ledger(&5).unwrap(),
-			StakingLedger {
+			Staking::ledger(5.into()).unwrap(),
+			StakingLedgerInspect {
 				stash: 5,
 				total: 1200,
 				active: 1200,
@@ -5914,7 +5910,7 @@ fn reducing_max_unlocking_chunks_abrupt() {
 		MaxUnlockingChunks::set(2);
 		start_active_era(10);
 		assert_ok!(Staking::bond(RuntimeOrigin::signed(3), 300, RewardDestination::Staked));
-		assert!(matches!(Staking::ledger(3), Some(_)));
+		assert!(matches!(Staking::ledger(3.into()), Ok(_)));
 
 		// when staker unbonds
 		assert_ok!(Staking::unbond(RuntimeOrigin::signed(3), 20));
@@ -5923,8 +5919,8 @@ fn reducing_max_unlocking_chunks_abrupt() {
 		// => 10 + 3 = 13
 		let expected_unlocking: BoundedVec<UnlockChunk<Balance>, MaxUnlockingChunks> =
 			bounded_vec![UnlockChunk { value: 20 as Balance, era: 13 as EraIndex }];
-		assert!(matches!(Staking::ledger(3),
-			Some(StakingLedger {
+		assert!(matches!(Staking::ledger(3.into()),
+			Ok(StakingLedger {
 				unlocking,
 				..
 			}) if unlocking==expected_unlocking));
@@ -5935,8 +5931,8 @@ fn reducing_max_unlocking_chunks_abrupt() {
 		// then another unlock chunk is added
 		let expected_unlocking: BoundedVec<UnlockChunk<Balance>, MaxUnlockingChunks> =
 			bounded_vec![UnlockChunk { value: 20, era: 13 }, UnlockChunk { value: 50, era: 14 }];
-		assert!(matches!(Staking::ledger(3),
-			Some(StakingLedger {
+		assert!(matches!(Staking::ledger(3.into()),
+			Ok(StakingLedger {
 				unlocking,
 				..
 			}) if unlocking==expected_unlocking));
@@ -6124,3 +6120,123 @@ mod staking_interface {
 		})
 	}
 }
+
+mod ledger {
+	use super::*;
+
+	#[test]
+	fn paired_account_works() {
+		ExtBuilder::default().build_and_execute(|| {
+			assert_ok!(Staking::bond(
+				RuntimeOrigin::signed(10),
+				100,
+				RewardDestination::Controller
+			));
+
+			assert_eq!(<Bonded<Test>>::get(&10), Some(10));
+			assert_eq!(
+				StakingLedger::<Test>::paired_account(StakingAccount::Controller(10)),
+				Some(10)
+			);
+			assert_eq!(StakingLedger::<Test>::paired_account(StakingAccount::Stash(10)), Some(10));
+
+			assert_eq!(<Bonded<Test>>::get(&42), None);
+			assert_eq!(StakingLedger::<Test>::paired_account(StakingAccount::Controller(42)), None);
+			assert_eq!(StakingLedger::<Test>::paired_account(StakingAccount::Stash(42)), None);
+
+			// bond manually stash with different controller. This is deprecated but the migration
+			// has not been complete yet (controller: 100, stash: 200)
+			assert_ok!(bond_controller_stash(100, 200));
+			assert_eq!(<Bonded<Test>>::get(&200), Some(100));
+			assert_eq!(
+				StakingLedger::<Test>::paired_account(StakingAccount::Controller(100)),
+				Some(200)
+			);
+			assert_eq!(
+				StakingLedger::<Test>::paired_account(StakingAccount::Stash(200)),
+				Some(100)
+			);
+		})
+	}
+
+	#[test]
+	fn get_ledger_works() {
+		ExtBuilder::default().build_and_execute(|| {
+			// stash does not exist
+			assert!(StakingLedger::<Test>::get(StakingAccount::Stash(42)).is_err());
+
+			// bonded and paired
+			assert_eq!(<Bonded<Test>>::get(&11), Some(11));
+
+			match StakingLedger::<Test>::get(StakingAccount::Stash(11)) {
+				Ok(ledger) => {
+					assert_eq!(ledger.controller(), Some(11));
+					assert_eq!(ledger.stash, 11);
+				},
+				Err(_) => panic!("staking ledger must exist"),
+			};
+
+			// bond manually stash with different controller. This is deprecated but the migration
+			// has not been complete yet (controller: 100, stash: 200)
+			assert_ok!(bond_controller_stash(100, 200));
+			assert_eq!(<Bonded<Test>>::get(&200), Some(100));
+
+			match StakingLedger::<Test>::get(StakingAccount::Stash(200)) {
+				Ok(ledger) => {
+					assert_eq!(ledger.controller(), Some(100));
+					assert_eq!(ledger.stash, 200);
+				},
+				Err(_) => panic!("staking ledger must exist"),
+			};
+
+			match StakingLedger::<Test>::get(StakingAccount::Controller(100)) {
+				Ok(ledger) => {
+					assert_eq!(ledger.controller(), Some(100));
+					assert_eq!(ledger.stash, 200);
+				},
+				Err(_) => panic!("staking ledger must exist"),
+			};
+		})
+	}
+
+	#[test]
+	fn bond_works() {
+		ExtBuilder::default().build_and_execute(|| {
+			assert!(!StakingLedger::<Test>::is_bonded(StakingAccount::Stash(42)));
+			assert!(<Bonded<Test>>::get(&42).is_none());
+
+			let mut ledger: StakingLedger<Test> = StakingLedger::default_from(42);
+			let reward_dest = RewardDestination::Account(10);
+
+			assert_ok!(ledger.clone().bond(reward_dest));
+			assert!(StakingLedger::<Test>::is_bonded(StakingAccount::Stash(42)));
+			assert!(<Bonded<Test>>::get(&42).is_some());
+			assert_eq!(<Payee<Test>>::get(&42), reward_dest);
+
+			// cannot bond again.
+			assert!(ledger.clone().bond(reward_dest).is_err());
+
+			// once bonded, update works as expected.
+			ledger.claimed_rewards = bounded_vec![1];
+			assert_ok!(ledger.update());
+		})
+	}
+
+	#[test]
+	fn is_bonded_works() {
+		ExtBuilder::default().build_and_execute(|| {
+			assert!(!StakingLedger::<Test>::is_bonded(StakingAccount::Stash(42)));
+			assert!(!StakingLedger::<Test>::is_bonded(StakingAccount::Controller(42)));
+
+			// adds entry to Bonded without Ledger pair (should not happen).
+			<Bonded<Test>>::insert(42, 42);
+			assert!(!StakingLedger::<Test>::is_bonded(StakingAccount::Controller(42)));
+
+			assert_eq!(<Bonded<Test>>::get(&11), Some(11));
+			assert!(StakingLedger::<Test>::is_bonded(StakingAccount::Stash(11)));
+			assert!(StakingLedger::<Test>::is_bonded(StakingAccount::Controller(11)));
+
+			<Bonded<Test>>::remove(42); // ensures try-state checks pass.
+		})
+	}
+}
diff --git a/substrate/frame/state-trie-migration/Cargo.toml b/substrate/frame/state-trie-migration/Cargo.toml
index 8258562229797f2c879cc8356eb34cdefd3a8bd4..83218a131361894b955ce1c79085c93c5626c92d 100644
--- a/substrate/frame/state-trie-migration/Cargo.toml
+++ b/substrate/frame/state-trie-migration/Cargo.toml
@@ -1,11 +1,11 @@
 [package]
 name = "pallet-state-trie-migration"
 version = "4.0.0-dev"
-authors = ["Parity Technologies <admin@parity.io>"]
-edition = "2021"
+authors.workspace = true
+edition.workspace = true
 license = "Apache-2.0"
 homepage = "https://substrate.io"
-repository = "https://github.com/paritytech/substrate/"
+repository.workspace = true
 description = "FRAME pallet migration of trie"
 
 [package.metadata.docs.rs]
@@ -15,9 +15,9 @@ targets = ["x86_64-unknown-linux-gnu"]
 codec = { package = "parity-scale-codec", version = "3.6.1", default-features = false }
 log = { version = "0.4.17", default-features = false }
 scale-info = { version = "2.5.0", default-features = false, features = ["derive"] }
-serde = { version = "1.0.163", optional = true }
+serde = { version = "1.0.188", optional = true }
 thousands = { version = "0.2.0", optional = true }
-zstd = { version = "0.12.3", default-features = false, optional = true }
+zstd = { version = "0.12.4", default-features = false, optional = true }
 frame-benchmarking = { path = "../benchmarking", default-features = false, optional = true}
 frame-support = { path = "../support", default-features = false}
 frame-system = { path = "../system", default-features = false}
diff --git a/substrate/frame/state-trie-migration/src/lib.rs b/substrate/frame/state-trie-migration/src/lib.rs
index e22a47458b7d510b33baadb1894eab44ad1d8591..3e69b219bb527781ce555d48eea692cbe69f159c 100644
--- a/substrate/frame/state-trie-migration/src/lib.rs
+++ b/substrate/frame/state-trie-migration/src/lib.rs
@@ -1268,7 +1268,6 @@ mod mock {
 #[cfg(test)]
 mod test {
 	use super::{mock::*, *};
-	use frame_support::dispatch::*;
 	use sp_runtime::{bounded_vec, traits::Bounded, StateVersion};
 
 	#[test]
diff --git a/substrate/frame/statement/Cargo.toml b/substrate/frame/statement/Cargo.toml
index 18f1ec45f989e56b8c6c5e775a356cf8a54ed7cc..eded681c47cffcf1e35afd9a7e88c232409a98be 100644
--- a/substrate/frame/statement/Cargo.toml
+++ b/substrate/frame/statement/Cargo.toml
@@ -1,11 +1,11 @@
 [package]
 name = "pallet-statement"
 version = "4.0.0-dev"
-authors = ["Parity Technologies <admin@parity.io>"]
-edition = "2021"
+authors.workspace = true
+edition.workspace = true
 license = "Apache-2.0"
 homepage = "https://substrate.io"
-repository = "https://github.com/paritytech/substrate/"
+repository.workspace = true
 description = "FRAME pallet for statement store"
 
 [package.metadata.docs.rs]
diff --git a/substrate/frame/sudo/Cargo.toml b/substrate/frame/sudo/Cargo.toml
index 6bc8086a452e1edf4f4dff9de0c755ace73c4777..a4934346d5dec87d4c6f8df9a924bb1781b0039e 100644
--- a/substrate/frame/sudo/Cargo.toml
+++ b/substrate/frame/sudo/Cargo.toml
@@ -1,11 +1,11 @@
 [package]
 name = "pallet-sudo"
 version = "4.0.0-dev"
-authors = ["Parity Technologies <admin@parity.io>"]
-edition = "2021"
+authors.workspace = true
+edition.workspace = true
 license = "Apache-2.0"
 homepage = "https://substrate.io"
-repository = "https://github.com/paritytech/substrate/"
+repository.workspace = true
 description = "FRAME pallet for sudo"
 readme = "README.md"
 
@@ -22,6 +22,8 @@ sp-io = { path = "../../primitives/io", default-features = false}
 sp-runtime = { path = "../../primitives/runtime", default-features = false}
 sp-std = { path = "../../primitives/std", default-features = false}
 
+docify = "0.2.4"
+
 [dev-dependencies]
 sp-core = { path = "../../primitives/core" }
 
diff --git a/substrate/frame/sudo/README.md b/substrate/frame/sudo/README.md
index 886dc5981778d2c05dba38f6f711e23e9d5e7b50..371f89e5348c6745f92c8762a577fdb570bb9498 100644
--- a/substrate/frame/sudo/README.md
+++ b/substrate/frame/sudo/README.md
@@ -16,8 +16,8 @@ Only one account can be the sudo key at a time.
 
 Only the sudo key can call the dispatchable functions from the Sudo module.
 
-* `sudo` - Make a `Root` call to a dispatchable function.
-* `set_key` - Assign a new account to be the sudo key.
+- `sudo` - Make a `Root` call to a dispatchable function.
+- `set_key` - Assign a new account to be the sudo key.
 
 ## Usage
 
@@ -68,7 +68,7 @@ You need to set an initial superuser account as the sudo `key`.
 
 ## Related Modules
 
-* [Democracy](https://docs.rs/pallet-democracy/latest/pallet_democracy/)
+- [Democracy](https://docs.rs/pallet-democracy/latest/pallet_democracy/)
 
 [`Call`]: ./enum.Call.html
 [`Config`]: ./trait.Config.html
diff --git a/substrate/frame/sudo/src/lib.rs b/substrate/frame/sudo/src/lib.rs
index f735469558c70b18c3cb6ea93a77c39979b4cb6a..fb29c0da42a99d9f36c1470fabe2a51284f08750 100644
--- a/substrate/frame/sudo/src/lib.rs
+++ b/substrate/frame/sudo/src/lib.rs
@@ -7,7 +7,7 @@
 // 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
+//  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,
@@ -15,41 +15,32 @@
 // See the License for the specific language governing permissions and
 // limitations under the License.
 
-//! # Sudo Pallet
-//!
-//! - [`Config`]
-//! - [`Call`]
-//!
-//! ## Overview
-//!
-//! The Sudo pallet allows for a single account (called the "sudo key")
-//! to execute dispatchable functions that require a `Root` call
-//! or designate a new account to replace them as the sudo key.
-//! Only one account can be the sudo key at a time.
-//!
-//! ## Interface
+//! > Made with *Substrate*, for *Polkadot*.
 //!
-//! ### Dispatchable Functions
+//! [![github]](https://github.com/paritytech/polkadot-sdk/tree/master/substrate/frame/sudo)
+//! [![polkadot]](https://polkadot.network)
 //!
-//! Only the sudo key can call the dispatchable functions from the Sudo pallet.
+//! [github]: https://img.shields.io/badge/github-8da0cb?style=for-the-badge&labelColor=555555&logo=github
+//! [polkadot]: https://img.shields.io/badge/polkadot-E6007A?style=for-the-badge&logo=polkadot&logoColor=white
 //!
-//! * `sudo` - Make a `Root` call to a dispatchable function.
-//! * `set_key` - Assign a new account to be the sudo key.
+//! # Sudo Pallet
 //!
-//! ## Usage
+//! A pallet to provide a way to execute privileged runtime calls using a specified sudo ("superuser
+//! do") account.
 //!
-//! ### Executing Privileged Functions
+//! ## Pallet API
 //!
-//! The Sudo pallet itself is not intended to be used within other pallets.
-//! Instead, you can build "privileged functions" (i.e. functions that require `Root` origin) in
-//! other pallets. You can execute these privileged functions by calling `sudo` with the sudo key
-//! account. Privileged functions cannot be directly executed via an extrinsic.
+//! See the [`pallet`] module for more information about the interfaces this pallet exposes,
+//! including its configuration trait, dispatchables, storage items, events and errors.
 //!
-//! Learn more about privileged functions and `Root` origin in the [`Origin`] type documentation.
+//! ## Overview
 //!
-//! ### Simple Code Snippet
+//! In Substrate blockchains, pallets may contain dispatchable calls that can only be called at
+//! the system level of the chain (i.e. dispatchables that require a `Root` origin).
+//! Setting a privileged account, called the _sudo key_, allows you to make such calls as an
+//! extrinisic.
 //!
-//! This is an example of a pallet that exposes a privileged function:
+//! Here's an example of a privileged function in another pallet:
 //!
 //! ```
 //! #[frame_support::pallet]
@@ -76,27 +67,58 @@
 //!         }
 //! 	}
 //! }
-//! # fn main() {}
 //! ```
 //!
-//! ### Signed Extension
+//! With the Sudo pallet configured in your chain's runtime you can execute this privileged
+//! function by constructing a call using the [`sudo`](Pallet::sudo) dispatchable.
+//!
+//! To use this pallet in your runtime, a sudo key must be specified in the [`GenesisConfig`] of
+//! the pallet. You can change this key at anytime once your chain is live using the
+//! [`set_key`](Pallet::set_key) dispatchable, however <strong>only one sudo key can be set at a
+//! time</strong>. The pallet also allows you to make a call using
+//! [`sudo_unchecked_weight`](Pallet::sudo_unchecked_weight), which allows the sudo account to
+//! execute a call with a custom weight.
+//!
+//! <div class="example-wrap" style="display:inline-block"><pre class="compile_fail"
+//! style="white-space:normal;font:inherit;">
+//! <strong>Note:</strong> this pallet is not meant to be used inside other pallets. It is only
+//! meant to be used by constructing runtime calls from outside the runtime.
+//! </pre></div>
+//!
+//! This pallet also defines a [`SignedExtension`](sp_runtime::traits::SignedExtension) called
+//! [`CheckOnlySudoAccount`] to ensure that only signed transactions by the sudo account are
+//! accepted by the transaction pool. The intended use of this signed extension is to prevent other
+//! accounts from spamming the transaction pool for the initial phase of a chain, during which
+//! developers may only want a sudo account to be able to make transactions.
+//!
+//! Learn more about the `Root` origin in the [`RawOrigin`](frame_system::RawOrigin) type
+//! documentation.
 //!
-//! The Sudo pallet defines the following extension:
+//! ### Examples
 //!
-//!   - [`CheckOnlySudoAccount`]: Ensures that the signed transactions are only valid if they are
-//!     signed by sudo account.
+//! 1. You can make a privileged runtime call using `sudo` with an account that matches the sudo
+//!    key.
+#![doc = docify::embed!("src/tests.rs", sudo_basics)]
 //!
-//! ## Genesis Config
+//! 2. Only an existing sudo key can set a new one.
+#![doc = docify::embed!("src/tests.rs", set_key_basics)]
 //!
-//! The Sudo pallet depends on the [`GenesisConfig`].
-//! You need to set an initial superuser account as the sudo `key`.
+//! 3. You can also make non-privileged calls using `sudo_as`.
+#![doc = docify::embed!("src/tests.rs", sudo_as_emits_events_correctly)]
 //!
-//! ## Related Pallets
+//! ## Low Level / Implementation Details
 //!
-//! * [Democracy](../pallet_democracy/index.html)
+//! This pallet checks that the caller of its dispatchables is a signed account and ensures that the
+//! caller matches the sudo key in storage.
+//! A caller of this pallet's dispatchables does not pay any fees to dispatch a call. If the account
+//! making one of these calls is not the sudo key, the pallet returns a [`Error::RequireSudo`]
+//! error.
 //!
-//! [`Origin`]: https://docs.substrate.io/main-docs/build/origins/
+//! Once an origin is verified, sudo calls use `dispatch_bypass_filter` from the
+//! [`UnfilteredDispatchable`](frame_support::traits::UnfilteredDispatchable) trait to allow call
+//! execution without enforcing any further origin checks.
 
+#![deny(missing_docs)]
 #![cfg_attr(not(feature = "std"), no_std)]
 
 use sp_runtime::{traits::StaticLookup, DispatchResult};
@@ -182,14 +204,15 @@ pub mod pallet {
 		/// ## Complexity
 		/// - O(1).
 		#[pallet::call_index(1)]
-		#[pallet::weight((*_weight, call.get_dispatch_info().class))]
+		#[pallet::weight((*weight, call.get_dispatch_info().class))]
 		pub fn sudo_unchecked_weight(
 			origin: OriginFor<T>,
 			call: Box<<T as Config>::RuntimeCall>,
-			_weight: Weight,
+			weight: Weight,
 		) -> DispatchResultWithPostInfo {
 			// This is a public call, so we ensure that the origin is some signed account.
 			let sender = ensure_signed(origin)?;
+			let _ = weight; // We don't check the weight witness since it is a root call.
 			ensure!(Self::key().map_or(false, |k| sender == k), Error::<T>::RequireSudo);
 
 			let res = call.dispatch_bypass_filter(frame_system::RawOrigin::Root.into());
@@ -261,12 +284,21 @@ pub mod pallet {
 	#[pallet::event]
 	#[pallet::generate_deposit(pub(super) fn deposit_event)]
 	pub enum Event<T: Config> {
-		/// A sudo just took place. \[result\]
-		Sudid { sudo_result: DispatchResult },
-		/// The \[sudoer\] just switched identity; the old key is supplied if one existed.
-		KeyChanged { old_sudoer: Option<T::AccountId> },
-		/// A sudo just took place. \[result\]
-		SudoAsDone { sudo_result: DispatchResult },
+		/// A sudo call just took place.
+		Sudid {
+			/// The result of the call made by the sudo user.
+			sudo_result: DispatchResult,
+		},
+		/// The sudo key has been updated.
+		KeyChanged {
+			/// The old sudo key if one was previously set.
+			old_sudoer: Option<T::AccountId>,
+		},
+		/// A [sudo_as](Pallet::sudo_as) call just took place.
+		SudoAsDone {
+			/// The result of the call made by the sudo user.
+			sudo_result: DispatchResult,
+		},
 	}
 
 	#[pallet::error]
diff --git a/substrate/frame/sudo/src/tests.rs b/substrate/frame/sudo/src/tests.rs
index c854fed8f0736e7aedb523ccd6e49745dfca21b1..6963ba2e6a05133b719e546b63f2cd0c722aa264 100644
--- a/substrate/frame/sudo/src/tests.rs
+++ b/substrate/frame/sudo/src/tests.rs
@@ -34,6 +34,7 @@ fn test_setup_works() {
 	});
 }
 
+#[docify::export]
 #[test]
 fn sudo_basics() {
 	// Configure a default test environment and set the root `key` to 1.
@@ -134,6 +135,7 @@ fn sudo_unchecked_weight_emits_events_correctly() {
 	})
 }
 
+#[docify::export]
 #[test]
 fn set_key_basics() {
 	new_test_ext(1).execute_with(|| {
@@ -195,6 +197,7 @@ fn sudo_as_basics() {
 	});
 }
 
+#[docify::export]
 #[test]
 fn sudo_as_emits_events_correctly() {
 	new_test_ext(1).execute_with(|| {
diff --git a/substrate/frame/sudo/src/weights.rs b/substrate/frame/sudo/src/weights.rs
index 6a0197d1469b4ac65d786255c3973e2e575a62d4..0cdd0c8a81f2c94dc8a967d128f21b00bd0f22e2 100644
--- a/substrate/frame/sudo/src/weights.rs
+++ b/substrate/frame/sudo/src/weights.rs
@@ -15,7 +15,7 @@
 // See the License for the specific language governing permissions and
 // limitations under the License.
 
-//! Autogenerated weights for pallet_sudo
+//! Autogenerated weights for pallet_sudo.
 //!
 //! THIS FILE WAS AUTO-GENERATED USING THE SUBSTRATE BENCHMARK CLI VERSION 4.0.0-dev
 //! DATE: 2023-06-16, STEPS: `50`, REPEAT: `20`, LOW RANGE: `[]`, HIGH RANGE: `[]`
diff --git a/substrate/frame/support/Cargo.toml b/substrate/frame/support/Cargo.toml
index 24247894739577531bf1b6fbc2d5cf0b85dd85d0..65f4885b1599958da031f13ea0726ee330a65588 100644
--- a/substrate/frame/support/Cargo.toml
+++ b/substrate/frame/support/Cargo.toml
@@ -1,11 +1,11 @@
 [package]
 name = "frame-support"
 version = "4.0.0-dev"
-authors = ["Parity Technologies <admin@parity.io>"]
-edition = "2021"
+authors.workspace = true
+edition.workspace = true
 license = "Apache-2.0"
 homepage = "https://substrate.io"
-repository = "https://github.com/paritytech/substrate/"
+repository.workspace = true
 description = "Support code for the runtime."
 readme = "README.md"
 
@@ -13,7 +13,7 @@ readme = "README.md"
 targets = ["x86_64-unknown-linux-gnu"]
 
 [dependencies]
-serde = { version = "1.0.163", default-features = false, features = ["alloc", "derive"] }
+serde = { version = "1.0.188", default-features = false, features = ["alloc", "derive"] }
 codec = { package = "parity-scale-codec", version = "3.6.1", default-features = false, features = ["derive", "max-encoded-len"] }
 scale-info = { version = "2.5.0", default-features = false, features = ["derive"] }
 frame-metadata = { version = "16.0.0", default-features = false, features = ["current"] }
@@ -30,7 +30,7 @@ sp-weights = { path = "../../primitives/weights", default-features = false}
 sp-debug-derive = { path = "../../primitives/debug-derive", default-features = false}
 sp-metadata-ir = { path = "../../primitives/metadata-ir", default-features = false}
 tt-call = "1.0.8"
-macro_magic = "0.4.2"
+macro_magic = "0.5.0"
 frame-support-procedural = { path = "procedural", default-features = false}
 paste = "1.0"
 sp-state-machine = { path = "../../primitives/state-machine", default-features = false, optional = true}
@@ -42,8 +42,8 @@ sp-core-hashing-proc-macro = { path = "../../primitives/core/hashing/proc-macro"
 k256 = { version = "0.13.1", default-features = false, features = ["ecdsa"] }
 environmental = { version = "1.1.4", default-features = false }
 sp-genesis-builder = { path = "../../primitives/genesis-builder", default-features=false}
-serde_json = { version = "1.0.85", default-features = false, features = ["alloc"] }
-docify = "0.2.1"
+serde_json = { version = "1.0.107", default-features = false, features = ["alloc"] }
+docify = "0.2.4"
 static_assertions = "1.1.0"
 
 aquamarine = { version = "0.3.2" }
diff --git a/substrate/frame/support/README.md b/substrate/frame/support/README.md
index 2282870aca05ca8393e5d6bef1ddb059e0466a72..dd2a07346dda1c411cd32c0ab04518dec0c643ac 100644
--- a/substrate/frame/support/README.md
+++ b/substrate/frame/support/README.md
@@ -1,3 +1,3 @@
 Support code for the runtime.
 
-License: Apache-2.0
\ No newline at end of file
+License: Apache-2.0
diff --git a/substrate/frame/support/procedural/Cargo.toml b/substrate/frame/support/procedural/Cargo.toml
index d08b3fc2b4e2f667325e4eee7517d90200ec4778..45ed1750a52871f0d43d6e040def2fa8867d4ddd 100644
--- a/substrate/frame/support/procedural/Cargo.toml
+++ b/substrate/frame/support/procedural/Cargo.toml
@@ -1,11 +1,11 @@
 [package]
 name = "frame-support-procedural"
 version = "4.0.0-dev"
-authors = ["Parity Technologies <admin@parity.io>"]
-edition = "2021"
+authors.workspace = true
+edition.workspace = true
 license = "Apache-2.0"
 homepage = "https://substrate.io"
-repository = "https://github.com/paritytech/substrate/"
+repository.workspace = true
 description = "Proc macro of Support code for the runtime."
 
 [package.metadata.docs.rs]
@@ -17,15 +17,16 @@ proc-macro = true
 [dependencies]
 derive-syn-parse = "0.1.5"
 Inflector = "0.11.4"
-cfg-expr = "0.15.4"
+cfg-expr = "0.15.5"
 itertools = "0.10.3"
 proc-macro2 = "1.0.56"
 quote = "1.0.28"
-syn = { version = "2.0.16", features = ["full"] }
+syn = { version = "2.0.38", features = ["full"] }
 frame-support-procedural-tools = { path = "tools" }
-proc-macro-warning = { version = "0.4.1", default-features = false }
-macro_magic = { version = "0.4.2", features = ["proc_support"] }
+macro_magic = { version = "0.5.0", features = ["proc_support"] }
+proc-macro-warning = { version = "1.0.0", default-features = false }
 expander = "2.0.0"
+sp-core-hashing = { path = "../../../primitives/core/hashing" }
 
 [features]
 default = [ "std" ]
diff --git a/substrate/frame/support/procedural/src/benchmark.rs b/substrate/frame/support/procedural/src/benchmark.rs
index 6f8f1d155e1e5991038349597ee4e00516b92c0f..fb55e8c9f662cfd93a35e592e57bb2fc42f6f96f 100644
--- a/substrate/frame/support/procedural/src/benchmark.rs
+++ b/substrate/frame/support/procedural/src/benchmark.rs
@@ -18,7 +18,7 @@
 //! Home of the parsing and expansion code for the new pallet benchmarking syntax
 
 use derive_syn_parse::Parse;
-use frame_support_procedural_tools::generate_crate_access_2018;
+use frame_support_procedural_tools::generate_access_from_frame_or_crate;
 use proc_macro::TokenStream;
 use proc_macro2::{Ident, Span, TokenStream as TokenStream2};
 use quote::{quote, ToTokens};
@@ -418,7 +418,8 @@ pub fn benchmarks(
 		true => quote!(T: Config<I>, I: 'static),
 	};
 
-	let krate = generate_crate_access_2018("frame-benchmarking")?;
+	let krate = generate_access_from_frame_or_crate("frame-benchmarking")?;
+	let frame_system = generate_access_from_frame_or_crate("frame-system")?;
 
 	// benchmark name variables
 	let benchmark_names_str: Vec<String> = benchmark_names.iter().map(|n| n.to_string()).collect();
@@ -488,7 +489,7 @@ pub fn benchmarks(
 			}
 			#[cfg(any(feature = "runtime-benchmarks", test))]
 			impl<#type_impl_generics> #krate::Benchmarking for Pallet<#type_use_generics>
-			where T: frame_system::Config, #where_clause
+			where T: #frame_system::Config, #where_clause
 			{
 				fn benchmarks(
 					extra: bool,
@@ -535,7 +536,7 @@ pub fn benchmarks(
 						_ => return Err("Could not find extrinsic.".into()),
 					};
 					let mut whitelist = whitelist.to_vec();
-					let whitelisted_caller_key = <frame_system::Account<
+					let whitelisted_caller_key = <#frame_system::Account<
 						T,
 					> as #krate::__private::storage::StorageMap<_, _,>>::hashed_key_for(
 						#krate::whitelisted_caller::<T::AccountId>()
@@ -571,8 +572,8 @@ pub fn benchmarks(
 						>::instance(&selected_benchmark, c, verify)?;
 
 						// Set the block number to at least 1 so events are deposited.
-						if #krate::__private::Zero::is_zero(&frame_system::Pallet::<T>::block_number()) {
-							frame_system::Pallet::<T>::set_block_number(1u32.into());
+						if #krate::__private::Zero::is_zero(&#frame_system::Pallet::<T>::block_number()) {
+							#frame_system::Pallet::<T>::set_block_number(1u32.into());
 						}
 
 						// Commit the externalities to the database, flushing the DB cache.
@@ -654,7 +655,7 @@ pub fn benchmarks(
 			}
 
 			#[cfg(test)]
-			impl<#type_impl_generics> Pallet<#type_use_generics> where T: ::frame_system::Config, #where_clause {
+			impl<#type_impl_generics> Pallet<#type_use_generics> where T: #frame_system::Config, #where_clause {
 				/// Test a particular benchmark by name.
 				///
 				/// This isn't called `test_benchmark_by_name` just in case some end-user eventually
@@ -719,10 +720,14 @@ fn expand_benchmark(
 	where_clause: TokenStream2,
 ) -> TokenStream2 {
 	// set up variables needed during quoting
-	let krate = match generate_crate_access_2018("frame-benchmarking") {
+	let krate = match generate_access_from_frame_or_crate("frame-benchmarking") {
 		Ok(ident) => ident,
 		Err(err) => return err.to_compile_error().into(),
 	};
+	let frame_system = match generate_access_from_frame_or_crate("frame-system") {
+		Ok(path) => path,
+		Err(err) => return err.to_compile_error().into(),
+	};
 	let codec = quote!(#krate::__private::codec);
 	let traits = quote!(#krate::__private::traits);
 	let setup_stmts = benchmark_def.setup_stmts;
@@ -762,7 +767,7 @@ fn expand_benchmark(
 				Expr::Cast(t) => {
 					let ty = t.ty.clone();
 					quote! {
-						<<T as frame_system::Config>::RuntimeOrigin as From<#ty>>::from(#origin);
+						<<T as #frame_system::Config>::RuntimeOrigin as From<#ty>>::from(#origin);
 					}
 				},
 				_ => quote! {
@@ -932,7 +937,7 @@ fn expand_benchmark(
 		}
 
 		#[cfg(test)]
-		impl<#type_impl_generics> Pallet<#type_use_generics> where T: ::frame_system::Config, #where_clause {
+		impl<#type_impl_generics> Pallet<#type_use_generics> where T: #frame_system::Config, #where_clause {
 			#[allow(unused)]
 			fn #test_ident() -> Result<(), #krate::BenchmarkError> {
 				let selected_benchmark = SelectedBenchmark::#name;
@@ -951,8 +956,8 @@ fn expand_benchmark(
 					>::instance(&selected_benchmark, &c, true)?;
 
 					// Set the block number to at least 1 so events are deposited.
-					if #krate::__private::Zero::is_zero(&frame_system::Pallet::<T>::block_number()) {
-						frame_system::Pallet::<T>::set_block_number(1u32.into());
+					if #krate::__private::Zero::is_zero(&#frame_system::Pallet::<T>::block_number()) {
+						#frame_system::Pallet::<T>::set_block_number(1u32.into());
 					}
 
 					// Run execution + verification
diff --git a/substrate/frame/support/procedural/src/construct_runtime/expand/call.rs b/substrate/frame/support/procedural/src/construct_runtime/expand/call.rs
index cbf2ea9078535d87db6a92dba83870e4851b5160..859b9a327e48dc7ee8cdce9c7ff3caa8c7621457 100644
--- a/substrate/frame/support/procedural/src/construct_runtime/expand/call.rs
+++ b/substrate/frame/support/procedural/src/construct_runtime/expand/call.rs
@@ -124,16 +124,16 @@ pub fn expand_outer_dispatch(
 			}
 		}
 
-		impl #scrate::dispatch::GetCallMetadata for RuntimeCall {
-			fn get_call_metadata(&self) -> #scrate::dispatch::CallMetadata {
-				use #scrate::dispatch::GetCallName;
+		impl #scrate::traits::GetCallMetadata for RuntimeCall {
+			fn get_call_metadata(&self) -> #scrate::traits::CallMetadata {
+				use #scrate::traits::GetCallName;
 				match self {
 					#(
 						#pallet_attrs
 						#variant_patterns => {
 							let function_name = call.get_call_name();
 							let pallet_name = stringify!(#pallet_names);
-							#scrate::dispatch::CallMetadata { function_name, pallet_name }
+							#scrate::traits::CallMetadata { function_name, pallet_name }
 						}
 					)*
 				}
@@ -147,7 +147,7 @@ pub fn expand_outer_dispatch(
 			}
 
 			fn get_call_names(module: &str) -> &'static [&'static str] {
-				use #scrate::dispatch::{Callable, GetCallName};
+				use #scrate::{dispatch::Callable, traits::GetCallName};
 				match module {
 					#(
 						#pallet_attrs
@@ -159,7 +159,7 @@ pub fn expand_outer_dispatch(
 				}
 			}
 		}
-		impl #scrate::dispatch::Dispatchable for RuntimeCall {
+		impl #scrate::__private::Dispatchable for RuntimeCall {
 			type RuntimeOrigin = RuntimeOrigin;
 			type Config = RuntimeCall;
 			type Info = #scrate::dispatch::DispatchInfo;
diff --git a/substrate/frame/support/procedural/src/construct_runtime/expand/composite_helper.rs b/substrate/frame/support/procedural/src/construct_runtime/expand/composite_helper.rs
new file mode 100644
index 0000000000000000000000000000000000000000..3c81d2360cb7bec33b7da67de08bc24a34d5ea34
--- /dev/null
+++ b/substrate/frame/support/procedural/src/construct_runtime/expand/composite_helper.rs
@@ -0,0 +1,70 @@
+// 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
+
+use crate::construct_runtime::parse::PalletPath;
+use proc_macro2::{Ident, TokenStream};
+use quote::quote;
+
+pub(crate) fn expand_conversion_fn(
+	composite_name: &str,
+	path: &PalletPath,
+	instance: Option<&Ident>,
+	variant_name: &Ident,
+) -> TokenStream {
+	let composite_name = quote::format_ident!("{}", composite_name);
+	let runtime_composite_name = quote::format_ident!("Runtime{}", composite_name);
+
+	if let Some(inst) = instance {
+		quote! {
+			impl From<#path::#composite_name<#path::#inst>> for #runtime_composite_name {
+				fn from(hr: #path::#composite_name<#path::#inst>) -> Self {
+					#runtime_composite_name::#variant_name(hr)
+				}
+			}
+		}
+	} else {
+		quote! {
+			impl From<#path::#composite_name> for #runtime_composite_name {
+				fn from(hr: #path::#composite_name) -> Self {
+					#runtime_composite_name::#variant_name(hr)
+				}
+			}
+		}
+	}
+}
+
+pub(crate) fn expand_variant(
+	composite_name: &str,
+	index: u8,
+	path: &PalletPath,
+	instance: Option<&Ident>,
+	variant_name: &Ident,
+) -> TokenStream {
+	let composite_name = quote::format_ident!("{}", composite_name);
+
+	if let Some(inst) = instance {
+		quote! {
+			#[codec(index = #index)]
+			#variant_name(#path::#composite_name<#path::#inst>),
+		}
+	} else {
+		quote! {
+			#[codec(index = #index)]
+			#variant_name(#path::#composite_name),
+		}
+	}
+}
diff --git a/substrate/frame/support/procedural/src/construct_runtime/expand/freeze_reason.rs b/substrate/frame/support/procedural/src/construct_runtime/expand/freeze_reason.rs
index b142f8e84c92f1fb9d09f33b710c724c5a84eff2..18790850d6b3c7f992b9ef74dcf8b62d74912951 100644
--- a/substrate/frame/support/procedural/src/construct_runtime/expand/freeze_reason.rs
+++ b/substrate/frame/support/procedural/src/construct_runtime/expand/freeze_reason.rs
@@ -15,8 +15,9 @@
 // See the License for the specific language governing permissions and
 // limitations under the License
 
-use crate::construct_runtime::{parse::PalletPath, Pallet};
-use proc_macro2::{Ident, TokenStream};
+use super::composite_helper;
+use crate::construct_runtime::Pallet;
+use proc_macro2::TokenStream;
 use quote::quote;
 
 pub fn expand_outer_freeze_reason(pallet_decls: &[Pallet], scrate: &TokenStream) -> TokenStream {
@@ -27,17 +28,29 @@ pub fn expand_outer_freeze_reason(pallet_decls: &[Pallet], scrate: &TokenStream)
 			let variant_name = &decl.name;
 			let path = &decl.path;
 			let index = decl.index;
+			let instance = decl.instance.as_ref();
 
-			conversion_fns.push(expand_conversion_fn(path, variant_name));
+			conversion_fns.push(composite_helper::expand_conversion_fn(
+				"FreezeReason",
+				path,
+				instance,
+				variant_name,
+			));
 
-			freeze_reason_variants.push(expand_variant(index, path, variant_name));
+			freeze_reason_variants.push(composite_helper::expand_variant(
+				"FreezeReason",
+				index,
+				path,
+				instance,
+				variant_name,
+			));
 		}
 	}
 
 	quote! {
 		/// A reason for placing a freeze on funds.
 		#[derive(
-			Copy, Clone, Eq, PartialEq, Ord, PartialOrd,
+			Copy, Clone, Eq, PartialEq,
 			#scrate::__private::codec::Encode, #scrate::__private::codec::Decode, #scrate::__private::codec::MaxEncodedLen,
 			#scrate::__private::scale_info::TypeInfo,
 			#scrate::__private::RuntimeDebug,
@@ -49,20 +62,3 @@ pub fn expand_outer_freeze_reason(pallet_decls: &[Pallet], scrate: &TokenStream)
 		#( #conversion_fns )*
 	}
 }
-
-fn expand_conversion_fn(path: &PalletPath, variant_name: &Ident) -> TokenStream {
-	quote! {
-		impl From<#path::FreezeReason> for RuntimeFreezeReason {
-			fn from(hr: #path::FreezeReason) -> Self {
-				RuntimeFreezeReason::#variant_name(hr)
-			}
-		}
-	}
-}
-
-fn expand_variant(index: u8, path: &PalletPath, variant_name: &Ident) -> TokenStream {
-	quote! {
-		#[codec(index = #index)]
-		#variant_name(#path::FreezeReason),
-	}
-}
diff --git a/substrate/frame/support/procedural/src/construct_runtime/expand/hold_reason.rs b/substrate/frame/support/procedural/src/construct_runtime/expand/hold_reason.rs
index ed7183c4a150d80dcc69ab0b06a4c4fd73ff765b..1bb7462133cddc748ccf4c2023a3f56f68923854 100644
--- a/substrate/frame/support/procedural/src/construct_runtime/expand/hold_reason.rs
+++ b/substrate/frame/support/procedural/src/construct_runtime/expand/hold_reason.rs
@@ -15,8 +15,9 @@
 // See the License for the specific language governing permissions and
 // limitations under the License
 
-use crate::construct_runtime::{parse::PalletPath, Pallet};
-use proc_macro2::{Ident, TokenStream};
+use super::composite_helper;
+use crate::construct_runtime::Pallet;
+use proc_macro2::TokenStream;
 use quote::quote;
 
 pub fn expand_outer_hold_reason(pallet_decls: &[Pallet], scrate: &TokenStream) -> TokenStream {
@@ -27,17 +28,29 @@ pub fn expand_outer_hold_reason(pallet_decls: &[Pallet], scrate: &TokenStream) -
 			let variant_name = &decl.name;
 			let path = &decl.path;
 			let index = decl.index;
+			let instance = decl.instance.as_ref();
 
-			conversion_fns.push(expand_conversion_fn(path, variant_name));
+			conversion_fns.push(composite_helper::expand_conversion_fn(
+				"HoldReason",
+				path,
+				instance,
+				variant_name,
+			));
 
-			hold_reason_variants.push(expand_variant(index, path, variant_name));
+			hold_reason_variants.push(composite_helper::expand_variant(
+				"HoldReason",
+				index,
+				path,
+				instance,
+				variant_name,
+			));
 		}
 	}
 
 	quote! {
 		/// A reason for placing a hold on funds.
 		#[derive(
-			Copy, Clone, Eq, PartialEq, Ord, PartialOrd,
+			Copy, Clone, Eq, PartialEq,
 			#scrate::__private::codec::Encode, #scrate::__private::codec::Decode, #scrate::__private::codec::MaxEncodedLen,
 			#scrate::__private::scale_info::TypeInfo,
 			#scrate::__private::RuntimeDebug,
@@ -49,20 +62,3 @@ pub fn expand_outer_hold_reason(pallet_decls: &[Pallet], scrate: &TokenStream) -
 		#( #conversion_fns )*
 	}
 }
-
-fn expand_conversion_fn(path: &PalletPath, variant_name: &Ident) -> TokenStream {
-	quote! {
-		impl From<#path::HoldReason> for RuntimeHoldReason {
-			fn from(hr: #path::HoldReason) -> Self {
-				RuntimeHoldReason::#variant_name(hr)
-			}
-		}
-	}
-}
-
-fn expand_variant(index: u8, path: &PalletPath, variant_name: &Ident) -> TokenStream {
-	quote! {
-		#[codec(index = #index)]
-		#variant_name(#path::HoldReason),
-	}
-}
diff --git a/substrate/frame/support/procedural/src/construct_runtime/expand/lock_id.rs b/substrate/frame/support/procedural/src/construct_runtime/expand/lock_id.rs
index ba35147a051fbc7347be8cc45508b975b5245f25..e67c0da00ea15e42efd0bcdddab98be5844b3e3f 100644
--- a/substrate/frame/support/procedural/src/construct_runtime/expand/lock_id.rs
+++ b/substrate/frame/support/procedural/src/construct_runtime/expand/lock_id.rs
@@ -15,8 +15,9 @@
 // See the License for the specific language governing permissions and
 // limitations under the License
 
-use crate::construct_runtime::{parse::PalletPath, Pallet};
-use proc_macro2::{Ident, TokenStream};
+use super::composite_helper;
+use crate::construct_runtime::Pallet;
+use proc_macro2::TokenStream;
 use quote::quote;
 
 pub fn expand_outer_lock_id(pallet_decls: &[Pallet], scrate: &TokenStream) -> TokenStream {
@@ -27,17 +28,29 @@ pub fn expand_outer_lock_id(pallet_decls: &[Pallet], scrate: &TokenStream) -> To
 			let variant_name = &decl.name;
 			let path = &decl.path;
 			let index = decl.index;
+			let instance = decl.instance.as_ref();
 
-			conversion_fns.push(expand_conversion_fn(path, variant_name));
+			conversion_fns.push(composite_helper::expand_conversion_fn(
+				"LockId",
+				path,
+				instance,
+				variant_name,
+			));
 
-			lock_id_variants.push(expand_variant(index, path, variant_name));
+			lock_id_variants.push(composite_helper::expand_variant(
+				"LockId",
+				index,
+				path,
+				instance,
+				variant_name,
+			));
 		}
 	}
 
 	quote! {
 		/// An identifier for each lock placed on funds.
 		#[derive(
-			Copy, Clone, Eq, PartialEq, Ord, PartialOrd,
+			Copy, Clone, Eq, PartialEq,
 			#scrate::__private::codec::Encode, #scrate::__private::codec::Decode, #scrate::__private::codec::MaxEncodedLen,
 			#scrate::__private::scale_info::TypeInfo,
 			#scrate::__private::RuntimeDebug,
@@ -49,20 +62,3 @@ pub fn expand_outer_lock_id(pallet_decls: &[Pallet], scrate: &TokenStream) -> To
 		#( #conversion_fns )*
 	}
 }
-
-fn expand_conversion_fn(path: &PalletPath, variant_name: &Ident) -> TokenStream {
-	quote! {
-		impl From<#path::LockId> for RuntimeLockId {
-			fn from(hr: #path::LockId) -> Self {
-				RuntimeLockId::#variant_name(hr)
-			}
-		}
-	}
-}
-
-fn expand_variant(index: u8, path: &PalletPath, variant_name: &Ident) -> TokenStream {
-	quote! {
-		#[codec(index = #index)]
-		#variant_name(#path::LockId),
-	}
-}
diff --git a/substrate/frame/support/procedural/src/construct_runtime/expand/mod.rs b/substrate/frame/support/procedural/src/construct_runtime/expand/mod.rs
index 830338f9265ffa846aee7de1e01bc7175e908c3a..a0fc6b8130b3c0b5b8fc7ce76768bbc9b0dc9908 100644
--- a/substrate/frame/support/procedural/src/construct_runtime/expand/mod.rs
+++ b/substrate/frame/support/procedural/src/construct_runtime/expand/mod.rs
@@ -16,6 +16,7 @@
 // limitations under the License
 
 mod call;
+pub mod composite_helper;
 mod config;
 mod freeze_reason;
 mod hold_reason;
diff --git a/substrate/frame/support/procedural/src/construct_runtime/expand/slash_reason.rs b/substrate/frame/support/procedural/src/construct_runtime/expand/slash_reason.rs
index 2a3283230ad84baa02d159c74b72ec63a38230e8..892b842b174872c1d15ab39bcf0c7cc5b509c961 100644
--- a/substrate/frame/support/procedural/src/construct_runtime/expand/slash_reason.rs
+++ b/substrate/frame/support/procedural/src/construct_runtime/expand/slash_reason.rs
@@ -15,8 +15,9 @@
 // See the License for the specific language governing permissions and
 // limitations under the License
 
-use crate::construct_runtime::{parse::PalletPath, Pallet};
-use proc_macro2::{Ident, TokenStream};
+use super::composite_helper;
+use crate::construct_runtime::Pallet;
+use proc_macro2::TokenStream;
 use quote::quote;
 
 pub fn expand_outer_slash_reason(pallet_decls: &[Pallet], scrate: &TokenStream) -> TokenStream {
@@ -27,17 +28,29 @@ pub fn expand_outer_slash_reason(pallet_decls: &[Pallet], scrate: &TokenStream)
 			let variant_name = &decl.name;
 			let path = &decl.path;
 			let index = decl.index;
+			let instance = decl.instance.as_ref();
 
-			conversion_fns.push(expand_conversion_fn(path, variant_name));
+			conversion_fns.push(composite_helper::expand_conversion_fn(
+				"SlashReason",
+				path,
+				instance,
+				variant_name,
+			));
 
-			slash_reason_variants.push(expand_variant(index, path, variant_name));
+			slash_reason_variants.push(composite_helper::expand_variant(
+				"SlashReason",
+				index,
+				path,
+				instance,
+				variant_name,
+			));
 		}
 	}
 
 	quote! {
 		/// A reason for slashing funds.
 		#[derive(
-			Copy, Clone, Eq, PartialEq, Ord, PartialOrd,
+			Copy, Clone, Eq, PartialEq,
 			#scrate::__private::codec::Encode, #scrate::__private::codec::Decode, #scrate::__private::codec::MaxEncodedLen,
 			#scrate::__private::scale_info::TypeInfo,
 			#scrate::__private::RuntimeDebug,
@@ -49,20 +62,3 @@ pub fn expand_outer_slash_reason(pallet_decls: &[Pallet], scrate: &TokenStream)
 		#( #conversion_fns )*
 	}
 }
-
-fn expand_conversion_fn(path: &PalletPath, variant_name: &Ident) -> TokenStream {
-	quote! {
-		impl From<#path::SlashReason> for RuntimeSlashReason {
-			fn from(hr: #path::SlashReason) -> Self {
-				RuntimeSlashReason::#variant_name(hr)
-			}
-		}
-	}
-}
-
-fn expand_variant(index: u8, path: &PalletPath, variant_name: &Ident) -> TokenStream {
-	quote! {
-		#[codec(index = #index)]
-		#variant_name(#path::SlashReason),
-	}
-}
diff --git a/substrate/frame/support/procedural/src/construct_runtime/mod.rs b/substrate/frame/support/procedural/src/construct_runtime/mod.rs
index f42dd837e3a95978db83912d6b8298ec70ae778a..ce34694275b386e029ef5c928569220c770752cf 100644
--- a/substrate/frame/support/procedural/src/construct_runtime/mod.rs
+++ b/substrate/frame/support/procedural/src/construct_runtime/mod.rs
@@ -211,9 +211,10 @@
 mod expand;
 mod parse;
 
+use crate::pallet::parse::helper::two128_str;
 use cfg_expr::Predicate;
 use frame_support_procedural_tools::{
-	generate_crate_access, generate_crate_access_2018, generate_hidden_includes,
+	generate_access_from_frame_or_crate, generate_crate_access, generate_hidden_includes,
 };
 use itertools::Itertools;
 use parse::{ExplicitRuntimeDeclaration, ImplicitRuntimeDeclaration, Pallet, RuntimeDeclaration};
@@ -271,7 +272,7 @@ fn construct_runtime_implicit_to_explicit(
 	input: TokenStream2,
 	definition: ImplicitRuntimeDeclaration,
 ) -> Result<TokenStream2> {
-	let frame_support = generate_crate_access_2018("frame-support")?;
+	let frame_support = generate_access_from_frame_or_crate("frame-support")?;
 	let mut expansion = quote::quote!(
 		#frame_support::construct_runtime! { #input }
 	);
@@ -282,7 +283,7 @@ fn construct_runtime_implicit_to_explicit(
 		expansion = quote::quote!(
 			#frame_support::__private::tt_call! {
 				macro = [{ #pallet_path::tt_default_parts }]
-				frame_support = [{ #frame_support }]
+				your_tt_return = [{ #frame_support::__private::tt_return }]
 				~~> #frame_support::match_and_insert! {
 					target = [{ #expansion }]
 					pattern = [{ #pallet_name: #pallet_path #pallet_instance }]
@@ -307,7 +308,7 @@ fn construct_runtime_explicit_to_explicit_expanded(
 	input: TokenStream2,
 	definition: ExplicitRuntimeDeclaration,
 ) -> Result<TokenStream2> {
-	let frame_support = generate_crate_access_2018("frame-support")?;
+	let frame_support = generate_access_from_frame_or_crate("frame-support")?;
 	let mut expansion = quote::quote!(
 		#frame_support::construct_runtime! { #input }
 	);
@@ -318,7 +319,7 @@ fn construct_runtime_explicit_to_explicit_expanded(
 		expansion = quote::quote!(
 			#frame_support::__private::tt_call! {
 				macro = [{ #pallet_path::tt_extra_parts }]
-				frame_support = [{ #frame_support }]
+				your_tt_return = [{ #frame_support::__private::tt_return }]
 				~~> #frame_support::match_and_insert! {
 					target = [{ #expansion }]
 					pattern = [{ #pallet_name: #pallet_path #pallet_instance }]
@@ -371,7 +372,7 @@ fn construct_runtime_final_expansion(
 	let scrate = generate_crate_access(hidden_crate_name, "frame-support");
 	let scrate_decl = generate_hidden_includes(hidden_crate_name, "frame-support");
 
-	let frame_system = generate_crate_access_2018("frame-system")?;
+	let frame_system = generate_access_from_frame_or_crate("frame-system")?;
 	let block = quote!(<#name as #frame_system::Config>::Block);
 	let unchecked_extrinsic = quote!(<#block as #scrate::sp_runtime::traits::Block>::Extrinsic);
 
@@ -403,17 +404,19 @@ fn construct_runtime_final_expansion(
 	let integrity_test = decl_integrity_test(&scrate);
 	let static_assertions = decl_static_assertions(&name, &pallets, &scrate);
 
-	let warning =
-		where_section.map_or(None, |where_section| {
-			Some(proc_macro_warning::Warning::new_deprecated("WhereSection")
-			.old("use a `where` clause in `construct_runtime`")
-			.new("use `frame_system::Config` to set the `Block` type and delete this clause. 
-				It is planned to be removed in December 2023")
-			.help_links(&["https://github.com/paritytech/substrate/pull/14437"])
-			.span(where_section.span)
-			.build(),
+	let warning = where_section.map_or(None, |where_section| {
+		Some(
+			proc_macro_warning::Warning::new_deprecated("WhereSection")
+				.old("use a `where` clause in `construct_runtime`")
+				.new(
+					"use `frame_system::Config` to set the `Block` type and delete this clause.
+				It is planned to be removed in December 2023",
+				)
+				.help_links(&["https://github.com/paritytech/substrate/pull/14437"])
+				.span(where_section.span)
+				.build_or_panic(),
 		)
-		});
+	});
 
 	let res = quote!(
 		#warning
@@ -659,7 +662,6 @@ fn decl_all_pallets<'a>(
 		#( #all_pallets_reversed_with_system_first )*
 	)
 }
-
 fn decl_pallet_runtime_setup(
 	runtime: &Ident,
 	pallet_declarations: &[Pallet],
@@ -667,6 +669,7 @@ fn decl_pallet_runtime_setup(
 ) -> TokenStream2 {
 	let names = pallet_declarations.iter().map(|d| &d.name).collect::<Vec<_>>();
 	let name_strings = pallet_declarations.iter().map(|d| d.name.to_string());
+	let name_hashes = pallet_declarations.iter().map(|d| two128_str(&d.name.to_string()));
 	let module_names = pallet_declarations.iter().map(|d| d.path.module_name());
 	let indices = pallet_declarations.iter().map(|pallet| pallet.index as usize);
 	let pallet_structs = pallet_declarations
@@ -699,6 +702,7 @@ fn decl_pallet_runtime_setup(
 		pub struct PalletInfo;
 
 		impl #scrate::traits::PalletInfo for PalletInfo {
+
 			fn index<P: 'static>() -> Option<usize> {
 				let type_id = #scrate::__private::sp_std::any::TypeId::of::<P>();
 				#(
@@ -723,6 +727,18 @@ fn decl_pallet_runtime_setup(
 				None
 			}
 
+			fn name_hash<P: 'static>() -> Option<[u8; 16]> {
+				let type_id = #scrate::__private::sp_std::any::TypeId::of::<P>();
+				#(
+					#pallet_attrs
+					if type_id == #scrate::__private::sp_std::any::TypeId::of::<#names>() {
+						return Some(#name_hashes)
+					}
+				)*
+
+				None
+			}
+
 			fn module_name<P: 'static>() -> Option<&'static str> {
 				let type_id = #scrate::__private::sp_std::any::TypeId::of::<P>();
 				#(
@@ -783,7 +799,7 @@ fn decl_static_assertions(
 		quote! {
 			#scrate::__private::tt_call! {
 				macro = [{ #path::tt_error_token }]
-				frame_support = [{ #scrate }]
+				your_tt_return = [{ #scrate::__private::tt_return }]
 				~~> #scrate::assert_error_encoded_size! {
 					path = [{ #path }]
 					runtime = [{ #runtime }]
diff --git a/substrate/frame/support/procedural/src/crate_version.rs b/substrate/frame/support/procedural/src/crate_version.rs
index 3f728abdb0b03ef5c3c2f6aca5746e8bac8a1e66..8c8975a425971978596702af98617d93f5bfb31a 100644
--- a/substrate/frame/support/procedural/src/crate_version.rs
+++ b/substrate/frame/support/procedural/src/crate_version.rs
@@ -18,7 +18,7 @@
 //! Implementation of macros related to crate versioning.
 
 use super::get_cargo_env_var;
-use frame_support_procedural_tools::generate_crate_access_2018;
+use frame_support_procedural_tools::generate_access_from_frame_or_crate;
 use proc_macro2::{Span, TokenStream};
 use syn::{Error, Result};
 
@@ -42,7 +42,7 @@ pub fn crate_to_crate_version(input: proc_macro::TokenStream) -> Result<TokenStr
 	let patch_version = get_cargo_env_var::<u8>("CARGO_PKG_VERSION_PATCH")
 		.map_err(|_| create_error("Patch version needs to fit into `u8`"))?;
 
-	let crate_ = generate_crate_access_2018("frame-support")?;
+	let crate_ = generate_access_from_frame_or_crate("frame-support")?;
 
 	Ok(quote::quote! {
 		#crate_::traits::CrateVersion {
diff --git a/substrate/frame/support/procedural/src/dummy_part_checker.rs b/substrate/frame/support/procedural/src/dummy_part_checker.rs
index 792b17a8f775855eb4f277f76b10bbdd16c44e21..34d9a3e236b46bedf466039874922a8f8bc7dedf 100644
--- a/substrate/frame/support/procedural/src/dummy_part_checker.rs
+++ b/substrate/frame/support/procedural/src/dummy_part_checker.rs
@@ -1,3 +1,20 @@
+// 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.
+
 use crate::COUNTER;
 use proc_macro::TokenStream;
 
diff --git a/substrate/frame/support/procedural/src/key_prefix.rs b/substrate/frame/support/procedural/src/key_prefix.rs
index 6f793d0e37bde1a72e1cda44b30ca98a3c771a4c..7f1ab6866d1e869a23623b25c51e5bbb6f297887 100644
--- a/substrate/frame/support/procedural/src/key_prefix.rs
+++ b/substrate/frame/support/procedural/src/key_prefix.rs
@@ -15,6 +15,7 @@
 // See the License for the specific language governing permissions and
 // limitations under the License.
 
+use frame_support_procedural_tools::generate_access_from_frame_or_crate;
 use proc_macro2::{Span, TokenStream};
 use quote::{format_ident, quote, ToTokens};
 use syn::{Ident, Result};
@@ -27,6 +28,7 @@ pub fn impl_key_prefix_for_tuples(input: proc_macro::TokenStream) -> Result<Toke
 	}
 
 	let mut all_trait_impls = TokenStream::new();
+	let frame_support = generate_access_from_frame_or_crate("frame-support")?;
 
 	for i in 2..=MAX_IDENTS {
 		let current_tuple = (0..i)
@@ -64,7 +66,10 @@ pub fn impl_key_prefix_for_tuples(input: proc_macro::TokenStream) -> Result<Toke
 					#(#hashers: ReversibleStorageHasher,)*
 					#(#kargs: EncodeLike<#prefixes>),*
 				> HasReversibleKeyPrefix<( #( #kargs, )* )> for ( #( Key<#hashers, #current_tuple>, )* ) {
-					fn decode_partial_key(key_material: &[u8]) -> Result<Self::Suffix, codec::Error> {
+					fn decode_partial_key(key_material: &[u8]) -> Result<
+						Self::Suffix,
+						#frame_support::__private::codec::Error,
+					> {
 						<#suffix_keygen>::decode_final_key(key_material).map(|k| k.0)
 					}
 				}
diff --git a/substrate/frame/support/procedural/src/lib.rs b/substrate/frame/support/procedural/src/lib.rs
index 9957cf1cff85c821b50d132d92762eac4a70b7ac..9c551b9f23067c5402bea788791c8c6f827eb73f 100644
--- a/substrate/frame/support/procedural/src/lib.rs
+++ b/substrate/frame/support/procedural/src/lib.rs
@@ -33,8 +33,8 @@ mod storage_alias;
 mod transactional;
 mod tt_macro;
 
-use frame_support_procedural_tools::generate_crate_access_2018;
-use macro_magic::import_tokens_attr;
+use frame_support_procedural_tools::generate_access_from_frame_or_crate;
+use macro_magic::{import_tokens_attr, import_tokens_attr_verbatim};
 use proc_macro::TokenStream;
 use quote::{quote, ToTokens};
 use std::{cell::RefCell, str::FromStr};
@@ -442,8 +442,8 @@ pub fn derive_runtime_debug_no_bound(input: TokenStream) -> TokenStream {
 
 		quote::quote!(
 			const _: () = {
-				impl #impl_generics core::fmt::Debug for #name #ty_generics #where_clause {
-					fn fmt(&self, fmt: &mut core::fmt::Formatter) -> core::fmt::Result {
+				impl #impl_generics ::core::fmt::Debug for #name #ty_generics #where_clause {
+					fn fmt(&self, fmt: &mut ::core::fmt::Formatter) -> core::fmt::Result {
 						fmt.write_str("<wasm:stripped>")
 					}
 				}
@@ -473,7 +473,7 @@ pub fn derive_eq_no_bound(input: TokenStream) -> TokenStream {
 
 	quote::quote_spanned!(name.span() =>
 		const _: () = {
-			impl #impl_generics core::cmp::Eq for #name #ty_generics #where_clause {}
+			impl #impl_generics ::core::cmp::Eq for #name #ty_generics #where_clause {}
 		};
 	)
 	.into()
@@ -751,12 +751,12 @@ pub fn storage_alias(attributes: TokenStream, input: TokenStream) -> TokenStream
 /// Items that lack a `syn::Ident` for whatever reason are first checked to see if they exist,
 /// verbatim, in the local/destination trait before they are copied over, so you should not need to
 /// worry about collisions between identical unnamed items.
-#[import_tokens_attr {
+#[import_tokens_attr_verbatim {
     format!(
         "{}::macro_magic",
-        match generate_crate_access_2018("frame-support") {
+        match generate_access_from_frame_or_crate("frame-support") {
             Ok(path) => Ok(path),
-            Err(_) => generate_crate_access_2018("frame"),
+            Err(_) => generate_access_from_frame_or_crate("frame"),
         }
         .expect("Failed to find either `frame-support` or `frame` in `Cargo.toml` dependencies.")
         .to_token_stream()
@@ -864,7 +864,12 @@ pub fn register_default_impl(attrs: TokenStream, tokens: TokenStream) -> TokenSt
 	let item_impl = syn::parse_macro_input!(tokens as ItemImpl);
 
 	// internally wrap macro_magic's `#[export_tokens]` macro
-	match macro_magic::mm_core::export_tokens_internal(attrs, item_impl.to_token_stream(), true) {
+	match macro_magic::mm_core::export_tokens_internal(
+		attrs,
+		item_impl.to_token_stream(),
+		true,
+		false,
+	) {
 		Ok(tokens) => tokens.into(),
 		Err(err) => err.to_compile_error().into(),
 	}
@@ -877,6 +882,8 @@ pub fn inject_runtime_type(_: TokenStream, tokens: TokenStream) -> TokenStream {
 	if item.ident != "RuntimeCall" &&
 		item.ident != "RuntimeEvent" &&
 		item.ident != "RuntimeOrigin" &&
+		item.ident != "RuntimeHoldReason" &&
+		item.ident != "RuntimeFreezeReason" &&
 		item.ident != "PalletInfo"
 	{
 		return syn::Error::new_spanned(
@@ -1417,57 +1424,15 @@ pub fn type_value(_: TokenStream, _: TokenStream) -> TokenStream {
 	pallet_macro_stub()
 }
 
-/// The `#[pallet::genesis_config]` attribute allows you to define the genesis configuration
-/// for the pallet.
-///
-/// Item is defined as either an enum or a struct. It needs to be public and implement the
-/// trait `GenesisBuild` with [`#[pallet::genesis_build]`](`macro@genesis_build`). The type
-/// generics are constrained to be either none, or `T` or `T: Config`.
-///
-/// E.g:
-///
-/// ```ignore
-/// #[pallet::genesis_config]
-/// pub struct GenesisConfig<T: Config> {
-/// 	_myfield: BalanceOf<T>,
-/// }
-/// ```
+/// **Rust-Analyzer users**: See the documentation of the Rust item in
+/// `frame_support::pallet_macros::genesis_config`.
 #[proc_macro_attribute]
 pub fn genesis_config(_: TokenStream, _: TokenStream) -> TokenStream {
 	pallet_macro_stub()
 }
 
-/// The `#[pallet::genesis_build]` attribute allows you to define how `genesis_configuration`
-/// is built. This takes as input the `GenesisConfig` type (as `self`) and constructs the pallet's
-/// initial state.
-///
-/// The impl must be defined as:
-///
-/// ```ignore
-/// #[pallet::genesis_build]
-/// impl<T: Config> GenesisBuild<T> for GenesisConfig<$maybe_generics> {
-/// 	fn build(&self) { $expr }
-/// }
-/// ```
-///
-/// I.e. a trait implementation with generic `T: Config`, of trait `GenesisBuild<T>` on
-/// type `GenesisConfig` with generics none or `T`.
-///
-/// E.g.:
-///
-/// ```ignore
-/// #[pallet::genesis_build]
-/// impl<T: Config> GenesisBuild<T> for GenesisConfig {
-/// 	fn build(&self) {}
-/// }
-/// ```
-///
-/// ## Macro expansion
-///
-/// The macro will add the following attribute:
-/// * `#[cfg(feature = "std")]`
-///
-/// The macro will implement `sp_runtime::BuildStorage`.
+/// **Rust-Analyzer users**: See the documentation of the Rust item in
+/// `frame_support::pallet_macros::genesis_build`.
 #[proc_macro_attribute]
 pub fn genesis_build(_: TokenStream, _: TokenStream) -> TokenStream {
 	pallet_macro_stub()
@@ -1605,7 +1570,7 @@ pub fn pallet_section(attr: TokenStream, tokens: TokenStream) -> TokenStream {
 	let _mod = parse_macro_input!(tokens_clone as ItemMod);
 
 	// use macro_magic's export_tokens as the internal implementation otherwise
-	match macro_magic::mm_core::export_tokens_internal(attr, tokens, false) {
+	match macro_magic::mm_core::export_tokens_internal(attr, tokens, false, true) {
 		Ok(tokens) => tokens.into(),
 		Err(err) => err.to_compile_error().into(),
 	}
@@ -1647,9 +1612,9 @@ pub fn pallet_section(attr: TokenStream, tokens: TokenStream) -> TokenStream {
 #[import_tokens_attr {
     format!(
         "{}::macro_magic",
-        match generate_crate_access_2018("frame-support") {
+        match generate_access_from_frame_or_crate("frame-support") {
             Ok(path) => Ok(path),
-            Err(_) => generate_crate_access_2018("frame"),
+            Err(_) => generate_access_from_frame_or_crate("frame"),
         }
         .expect("Failed to find either `frame-support` or `frame` in `Cargo.toml` dependencies.")
         .to_token_stream()
diff --git a/substrate/frame/support/procedural/src/no_bound/clone.rs b/substrate/frame/support/procedural/src/no_bound/clone.rs
index bbea2feffa96fc52763c97cd812abc66a4c0c495..2c9037984f59437cf74af7f40948214fad6ccb7c 100644
--- a/substrate/frame/support/procedural/src/no_bound/clone.rs
+++ b/substrate/frame/support/procedural/src/no_bound/clone.rs
@@ -32,7 +32,7 @@ pub fn derive_clone_no_bound(input: proc_macro::TokenStream) -> proc_macro::Toke
 			syn::Fields::Named(named) => {
 				let fields = named.named.iter().map(|i| &i.ident).map(|i| {
 					quote::quote_spanned!(i.span() =>
-						#i: core::clone::Clone::clone(&self.#i)
+						#i: ::core::clone::Clone::clone(&self.#i)
 					)
 				});
 
@@ -42,7 +42,7 @@ pub fn derive_clone_no_bound(input: proc_macro::TokenStream) -> proc_macro::Toke
 				let fields =
 					unnamed.unnamed.iter().enumerate().map(|(i, _)| syn::Index::from(i)).map(|i| {
 						quote::quote_spanned!(i.span() =>
-							core::clone::Clone::clone(&self.#i)
+							::core::clone::Clone::clone(&self.#i)
 						)
 					});
 
@@ -59,8 +59,8 @@ pub fn derive_clone_no_bound(input: proc_macro::TokenStream) -> proc_macro::Toke
 					syn::Fields::Named(named) => {
 						let captured = named.named.iter().map(|i| &i.ident);
 						let cloned = captured.clone().map(|i| {
-							quote::quote_spanned!(i.span() =>
-								#i: core::clone::Clone::clone(#i)
+							::quote::quote_spanned!(i.span() =>
+								#i: ::core::clone::Clone::clone(#i)
 							)
 						});
 						quote::quote!(
@@ -75,7 +75,7 @@ pub fn derive_clone_no_bound(input: proc_macro::TokenStream) -> proc_macro::Toke
 							.map(|(i, f)| syn::Ident::new(&format!("_{}", i), f.span()));
 						let cloned = captured.clone().map(|i| {
 							quote::quote_spanned!(i.span() =>
-								core::clone::Clone::clone(#i)
+								::core::clone::Clone::clone(#i)
 							)
 						});
 						quote::quote!(
@@ -98,7 +98,7 @@ pub fn derive_clone_no_bound(input: proc_macro::TokenStream) -> proc_macro::Toke
 
 	quote::quote!(
 		const _: () = {
-			impl #impl_generics core::clone::Clone for #name #ty_generics #where_clause {
+			impl #impl_generics ::core::clone::Clone for #name #ty_generics #where_clause {
 				fn clone(&self) -> Self {
 					#impl_
 				}
diff --git a/substrate/frame/support/procedural/src/no_bound/debug.rs b/substrate/frame/support/procedural/src/no_bound/debug.rs
index ae182829a49eb14513acc3b7a6e3763af6a8db6b..88f5dfe7bec47bc90cb106d5855c6b9ae8294f3e 100644
--- a/substrate/frame/support/procedural/src/no_bound/debug.rs
+++ b/substrate/frame/support/procedural/src/no_bound/debug.rs
@@ -112,8 +112,8 @@ pub fn derive_debug_no_bound(input: proc_macro::TokenStream) -> proc_macro::Toke
 
 	quote::quote!(
 		const _: () = {
-			impl #impl_generics core::fmt::Debug for #input_ident #ty_generics #where_clause {
-				fn fmt(&self, fmt: &mut core::fmt::Formatter) -> core::fmt::Result {
+			impl #impl_generics ::core::fmt::Debug for #input_ident #ty_generics #where_clause {
+				fn fmt(&self, fmt: &mut ::core::fmt::Formatter) -> ::core::fmt::Result {
 					#impl_
 				}
 			}
diff --git a/substrate/frame/support/procedural/src/no_bound/default.rs b/substrate/frame/support/procedural/src/no_bound/default.rs
index da05f19e0f817d3b1a3c8709bee87dd39f67277d..ddaab26c44159843c3282e0e26f9f095144ad20a 100644
--- a/substrate/frame/support/procedural/src/no_bound/default.rs
+++ b/substrate/frame/support/procedural/src/no_bound/default.rs
@@ -32,7 +32,7 @@ pub fn derive_default_no_bound(input: proc_macro::TokenStream) -> proc_macro::To
 			Fields::Named(named) => {
 				let fields = named.named.iter().map(|field| &field.ident).map(|ident| {
 					quote_spanned! {ident.span() =>
-						#ident: core::default::Default::default()
+						#ident: ::core::default::Default::default()
 					}
 				});
 
@@ -41,7 +41,7 @@ pub fn derive_default_no_bound(input: proc_macro::TokenStream) -> proc_macro::To
 			Fields::Unnamed(unnamed) => {
 				let fields = unnamed.unnamed.iter().map(|field| {
 					quote_spanned! {field.span()=>
-						core::default::Default::default()
+						::core::default::Default::default()
 					}
 				});
 
@@ -66,15 +66,12 @@ pub fn derive_default_no_bound(input: proc_macro::TokenStream) -> proc_macro::To
 				.collect::<Vec<_>>();
 
 			match &*default_variants {
-				[] => {
-					return syn::Error::new(
-						name.clone().span(),
-						// writing this as a regular string breaks rustfmt for some reason
-						r#"no default declared, make a variant default by placing `#[default]` above it"#,
-					)
-					.into_compile_error()
-					.into()
-				},
+				[] => return syn::Error::new(
+					name.clone().span(),
+					"no default declared, make a variant default by placing `#[default]` above it",
+				)
+				.into_compile_error()
+				.into(),
 				// only one variant with the #[default] attribute set
 				[default_variant] => {
 					let variant_attrs = default_variant
@@ -108,7 +105,7 @@ pub fn derive_default_no_bound(input: proc_macro::TokenStream) -> proc_macro::To
 							let fields =
 								named.named.iter().map(|field| &field.ident).map(|ident| {
 									quote_spanned! {ident.span()=>
-										#ident: core::default::Default::default()
+										#ident: ::core::default::Default::default()
 									}
 								});
 
@@ -117,7 +114,7 @@ pub fn derive_default_no_bound(input: proc_macro::TokenStream) -> proc_macro::To
 						Fields::Unnamed(unnamed) => {
 							let fields = unnamed.unnamed.iter().map(|field| {
 								quote_spanned! {field.span()=>
-									core::default::Default::default()
+									::core::default::Default::default()
 								}
 							});
 
@@ -152,7 +149,7 @@ pub fn derive_default_no_bound(input: proc_macro::TokenStream) -> proc_macro::To
 
 	quote!(
 		const _: () = {
-			impl #impl_generics core::default::Default for #name #ty_generics #where_clause {
+			impl #impl_generics ::core::default::Default for #name #ty_generics #where_clause {
 				fn default() -> Self {
 					#impl_
 				}
diff --git a/substrate/frame/support/procedural/src/no_bound/partial_eq.rs b/substrate/frame/support/procedural/src/no_bound/partial_eq.rs
index 27f5e98810ec3aa209f9a4030cfd4f2527ba724a..1a4a4e50b39e0d6224e2f1108c682f2a4b7ccd0d 100644
--- a/substrate/frame/support/procedural/src/no_bound/partial_eq.rs
+++ b/substrate/frame/support/procedural/src/no_bound/partial_eq.rs
@@ -128,7 +128,7 @@ pub fn derive_partial_eq_no_bound(input: proc_macro::TokenStream) -> proc_macro:
 
 	quote::quote!(
 		const _: () = {
-			impl #impl_generics core::cmp::PartialEq for #name #ty_generics #where_clause {
+			impl #impl_generics ::core::cmp::PartialEq for #name #ty_generics #where_clause {
 				fn eq(&self, other: &Self) -> bool {
 					#impl_
 				}
diff --git a/substrate/frame/support/procedural/src/pallet/expand/call.rs b/substrate/frame/support/procedural/src/pallet/expand/call.rs
index 6489949ed5c33499038cbbe9c78138e2c109408f..ed6335159cd6edae4bf435ed60b00da655d5bda0 100644
--- a/substrate/frame/support/procedural/src/pallet/expand/call.rs
+++ b/substrate/frame/support/procedural/src/pallet/expand/call.rs
@@ -17,12 +17,14 @@
 
 use crate::{
 	pallet::{
+		expand::warnings::{weight_constant_warning, weight_witness_warning},
 		parse::call::{CallVariantDef, CallWeightDef},
 		Def,
 	},
 	COUNTER,
 };
 use proc_macro2::TokenStream as TokenStream2;
+use proc_macro_warning::Warning;
 use quote::{quote, ToTokens};
 use syn::spanned::Spanned;
 
@@ -68,7 +70,7 @@ pub fn expand_call(def: &mut Def) -> proc_macro2::TokenStream {
 			continue
 		}
 
-		let warning = proc_macro_warning::Warning::new_deprecated("ImplicitCallIndex")
+		let warning = Warning::new_deprecated("ImplicitCallIndex")
 			.index(call_index_warnings.len())
 			.old("use implicit call indices")
 			.new("ensure that all calls have a `pallet::call_index` attribute or put the pallet into `dev` mode")
@@ -77,7 +79,7 @@ pub fn expand_call(def: &mut Def) -> proc_macro2::TokenStream {
 				"https://github.com/paritytech/substrate/pull/11381"
 			])
 			.span(method.name.span())
-			.build();
+			.build_or_panic();
 		call_index_warnings.push(warning);
 	}
 
@@ -86,18 +88,12 @@ pub fn expand_call(def: &mut Def) -> proc_macro2::TokenStream {
 	for method in &methods {
 		match &method.weight {
 			CallWeightDef::DevModeDefault => fn_weight.push(syn::parse_quote!(0)),
-			CallWeightDef::Immediate(e @ syn::Expr::Lit(lit)) if !def.dev_mode => {
-				let warning = proc_macro_warning::Warning::new_deprecated("ConstantWeight")
-					.index(weight_warnings.len())
-					.old("use hard-coded constant as call weight")
-					.new("benchmark all calls or put the pallet into `dev` mode")
-					.help_link("https://github.com/paritytech/substrate/pull/13798")
-					.span(lit.span())
-					.build();
-				weight_warnings.push(warning);
+			CallWeightDef::Immediate(e) => {
+				weight_constant_warning(e, def.dev_mode, &mut weight_warnings);
+				weight_witness_warning(method, def.dev_mode, &mut weight_warnings);
+
 				fn_weight.push(e.into_token_stream());
 			},
-			CallWeightDef::Immediate(e) => fn_weight.push(e.into_token_stream()),
 			CallWeightDef::Inherited => {
 				let pallet_weight = def
 					.call
@@ -351,7 +347,7 @@ pub fn expand_call(def: &mut Def) -> proc_macro2::TokenStream {
 			}
 		}
 
-		impl<#type_impl_gen> #frame_support::dispatch::GetCallName for #call_ident<#type_use_gen>
+		impl<#type_impl_gen> #frame_support::traits::GetCallName for #call_ident<#type_use_gen>
 			#where_clause
 		{
 			fn get_call_name(&self) -> &'static str {
@@ -366,7 +362,7 @@ pub fn expand_call(def: &mut Def) -> proc_macro2::TokenStream {
 			}
 		}
 
-		impl<#type_impl_gen> #frame_support::dispatch::GetCallIndex for #call_ident<#type_use_gen>
+		impl<#type_impl_gen> #frame_support::traits::GetCallIndex for #call_ident<#type_use_gen>
 			#where_clause
 		{
 			fn get_call_index(&self) -> u8 {
diff --git a/substrate/frame/support/procedural/src/pallet/expand/doc_only.rs b/substrate/frame/support/procedural/src/pallet/expand/doc_only.rs
index 50afeb3ca88cfcb0d9ee6400b5fc2de606f01b0e..621a051acae1aab556791e55abe55c899494175e 100644
--- a/substrate/frame/support/procedural/src/pallet/expand/doc_only.rs
+++ b/substrate/frame/support/procedural/src/pallet/expand/doc_only.rs
@@ -1,6 +1,6 @@
 // This file is part of Substrate.
 
-// Copyright (C) 2023 Parity Technologies (UK) Ltd.
+// Copyright (C) Parity Technologies (UK) Ltd.
 // SPDX-License-Identifier: Apache-2.0
 
 // Licensed under the Apache License, Version 2.0 (the "License");
diff --git a/substrate/frame/support/procedural/src/pallet/expand/error.rs b/substrate/frame/support/procedural/src/pallet/expand/error.rs
index d3aa0b762bc52df2af97079574eb5dbf6616c72a..877489fd6057b85d06ba2477020776c91bf92d3c 100644
--- a/substrate/frame/support/procedural/src/pallet/expand/error.rs
+++ b/substrate/frame/support/procedural/src/pallet/expand/error.rs
@@ -42,9 +42,9 @@ pub fn expand_error(def: &mut Def) -> proc_macro2::TokenStream {
 			macro_rules! #error_token_unique_id {
 				{
 					$caller:tt
-					frame_support = [{ $($frame_support:ident)::* }]
+					your_tt_return = [{ $my_tt_return:path }]
 				} => {
-					$($frame_support::)*__private::tt_return! {
+					$my_tt_return! {
 						$caller
 					}
 				};
@@ -170,9 +170,9 @@ pub fn expand_error(def: &mut Def) -> proc_macro2::TokenStream {
 		macro_rules! #error_token_unique_id {
 			{
 				$caller:tt
-				frame_support = [{ $($frame_support:ident)::* }]
+				your_tt_return = [{ $my_tt_return:path }]
 			} => {
-				$($frame_support::)*__private::tt_return! {
+				$my_tt_return! {
 					$caller
 					error = [{ #error_ident }]
 				}
diff --git a/substrate/frame/support/procedural/src/pallet/expand/genesis_build.rs b/substrate/frame/support/procedural/src/pallet/expand/genesis_build.rs
index 15ddfcf1d49d4e81c26fe96d70589c4fa431fe0c..248e83469435c96960f34ddccd55c71ebf650566 100644
--- a/substrate/frame/support/procedural/src/pallet/expand/genesis_build.rs
+++ b/substrate/frame/support/procedural/src/pallet/expand/genesis_build.rs
@@ -38,7 +38,7 @@ pub fn expand_genesis_build(def: &mut Def) -> proc_macro2::TokenStream {
 		#[cfg(feature = "std")]
 			impl<#type_impl_gen> #frame_support::sp_runtime::BuildStorage for #gen_cfg_ident<#gen_cfg_use_gen> #where_clause
 			{
-				fn assimilate_storage(&self, storage: &mut sp_runtime::Storage) -> std::result::Result<(), std::string::String> {
+				fn assimilate_storage(&self, storage: &mut #frame_support::sp_runtime::Storage) -> std::result::Result<(), std::string::String> {
 					#frame_support::__private::BasicExternalities::execute_with_storage(storage, || {
 						self.build();
 						Ok(())
diff --git a/substrate/frame/support/procedural/src/pallet/expand/genesis_config.rs b/substrate/frame/support/procedural/src/pallet/expand/genesis_config.rs
index b00f9bcd1a662dd592a7191a80469363f1a5acb4..31d519ef2929397293514fea96d1e21b476fc4df 100644
--- a/substrate/frame/support/procedural/src/pallet/expand/genesis_config.rs
+++ b/substrate/frame/support/procedural/src/pallet/expand/genesis_config.rs
@@ -17,6 +17,7 @@
 
 use crate::{pallet::Def, COUNTER};
 use frame_support_procedural_tools::get_doc_literals;
+use quote::ToTokens;
 use syn::{spanned::Spanned, Ident};
 
 ///
@@ -79,7 +80,7 @@ pub fn expand_genesis_config(def: &mut Def) -> proc_macro2::TokenStream {
 	let genesis_config_item =
 		&mut def.item.content.as_mut().expect("Checked by def parser").1[genesis_config.index];
 
-	let serde_crate = format!("{}::__private::serde", frame_support);
+	let serde_crate = format!("{}::__private::serde", frame_support.to_token_stream());
 
 	match genesis_config_item {
 		syn::Item::Enum(syn::ItemEnum { attrs, .. }) |
diff --git a/substrate/frame/support/procedural/src/pallet/expand/mod.rs b/substrate/frame/support/procedural/src/pallet/expand/mod.rs
index 2b998227c1d841a92a2ded9f3f5b681b83d4ef65..6f32e5697512f7e87a0130ec31e69eb5201c4d89 100644
--- a/substrate/frame/support/procedural/src/pallet/expand/mod.rs
+++ b/substrate/frame/support/procedural/src/pallet/expand/mod.rs
@@ -34,6 +34,7 @@ mod store_trait;
 mod tt_default_parts;
 mod type_value;
 mod validate_unsigned;
+mod warnings;
 
 use crate::pallet::Def;
 use quote::ToTokens;
diff --git a/substrate/frame/support/procedural/src/pallet/expand/pallet_struct.rs b/substrate/frame/support/procedural/src/pallet/expand/pallet_struct.rs
index e519e34d1dfd9411d735887b4dbe0ed337772238..c2102f0284dbeeadb08fc9122e5fe824032dfb82 100644
--- a/substrate/frame/support/procedural/src/pallet/expand/pallet_struct.rs
+++ b/substrate/frame/support/procedural/src/pallet/expand/pallet_struct.rs
@@ -246,6 +246,14 @@ pub fn expand_pallet_struct(def: &mut Def) -> proc_macro2::TokenStream {
 						implemented by the runtime")
 			}
 
+			fn name_hash() -> [u8; 16] {
+				<
+					<T as #frame_system::Config>::PalletInfo as #frame_support::traits::PalletInfo
+				>::name_hash::<Self>()
+					.expect("Pallet is part of the runtime because pallet `Config` trait is \
+						implemented by the runtime")
+			}
+
 			fn module_name() -> &'static str {
 				<
 					<T as #frame_system::Config>::PalletInfo as #frame_support::traits::PalletInfo
diff --git a/substrate/frame/support/procedural/src/pallet/expand/storage.rs b/substrate/frame/support/procedural/src/pallet/expand/storage.rs
index 1a941f6cb3f5ca135081935c6b6bc21bc24bb289..e7f7cf548f0ea54008c47a5e0a92a0d0b5dd93ea 100644
--- a/substrate/frame/support/procedural/src/pallet/expand/storage.rs
+++ b/substrate/frame/support/procedural/src/pallet/expand/storage.rs
@@ -18,11 +18,13 @@
 use crate::{
 	counter_prefix,
 	pallet::{
-		parse::storage::{Metadata, QueryKind, StorageDef, StorageGenerics},
+		parse::{
+			helper::two128_str,
+			storage::{Metadata, QueryKind, StorageDef, StorageGenerics},
+		},
 		Def,
 	},
 };
-use itertools::Itertools;
 use quote::ToTokens;
 use std::{collections::HashMap, ops::IndexMut};
 use syn::spanned::Spanned;
@@ -443,11 +445,14 @@ pub fn expand_storages(def: &mut Def) -> proc_macro2::TokenStream {
 
 			let cfg_attrs = &storage.cfg_attrs;
 
-			// If the storage item is public, just link to it rather than copy-pasting the docs.
+			// If the storage item is public, link it and otherwise just mention it.
+			//
+			// We can not just copy the docs from a non-public type as it may links to internal
+			// types which makes the compiler very unhappy :(
 			let getter_doc_line = if matches!(storage.vis, syn::Visibility::Public(_)) {
 				format!("An auto-generated getter for [`{}`].", storage.ident)
 			} else {
-				storage.docs.iter().map(|d| d.into_token_stream().to_string()).join("\n")
+				format!("An auto-generated getter for `{}`.", storage.ident)
 			};
 
 			match &storage.metadata {
@@ -636,6 +641,7 @@ pub fn expand_storages(def: &mut Def) -> proc_macro2::TokenStream {
 			Metadata::CountedMap { .. } => {
 				let counter_prefix_struct_ident = counter_prefix_ident(&storage_def.ident);
 				let counter_prefix_struct_const = counter_prefix(&prefix_struct_const);
+				let storage_prefix_hash = two128_str(&counter_prefix_struct_const);
 				quote::quote_spanned!(storage_def.attr_span =>
 					#(#cfg_attrs)*
 					#[doc(hidden)]
@@ -654,7 +660,19 @@ pub fn expand_storages(def: &mut Def) -> proc_macro2::TokenStream {
 							>::name::<Pallet<#type_use_gen>>()
 								.expect("No name found for the pallet in the runtime! This usually means that the pallet wasn't added to `construct_runtime!`.")
 						}
+
+						fn pallet_prefix_hash() -> [u8; 16] {
+							<
+								<T as #frame_system::Config>::PalletInfo
+								as #frame_support::traits::PalletInfo
+							>::name_hash::<Pallet<#type_use_gen>>()
+								.expect("No name_hash found for the pallet in the runtime! This usually means that the pallet wasn't added to `construct_runtime!`.")
+						}
+
 						const STORAGE_PREFIX: &'static str = #counter_prefix_struct_const;
+						fn storage_prefix_hash() -> [u8; 16] {
+							#storage_prefix_hash
+						}
 					}
 					#(#cfg_attrs)*
 					impl<#type_impl_gen> #frame_support::storage::types::CountedStorageMapInstance
@@ -668,6 +686,7 @@ pub fn expand_storages(def: &mut Def) -> proc_macro2::TokenStream {
 			Metadata::CountedNMap { .. } => {
 				let counter_prefix_struct_ident = counter_prefix_ident(&storage_def.ident);
 				let counter_prefix_struct_const = counter_prefix(&prefix_struct_const);
+				let storage_prefix_hash = two128_str(&counter_prefix_struct_const);
 				quote::quote_spanned!(storage_def.attr_span =>
 					#(#cfg_attrs)*
 					#[doc(hidden)]
@@ -686,7 +705,17 @@ pub fn expand_storages(def: &mut Def) -> proc_macro2::TokenStream {
 							>::name::<Pallet<#type_use_gen>>()
 								.expect("No name found for the pallet in the runtime! This usually means that the pallet wasn't added to `construct_runtime!`.")
 						}
+						fn pallet_prefix_hash() -> [u8; 16] {
+							<
+								<T as #frame_system::Config>::PalletInfo
+								as #frame_support::traits::PalletInfo
+							>::name_hash::<Pallet<#type_use_gen>>()
+								.expect("No name_hash found for the pallet in the runtime! This usually means that the pallet wasn't added to `construct_runtime!`.")
+						}
 						const STORAGE_PREFIX: &'static str = #counter_prefix_struct_const;
+						fn storage_prefix_hash() -> [u8; 16] {
+							#storage_prefix_hash
+						}
 					}
 					#(#cfg_attrs)*
 					impl<#type_impl_gen> #frame_support::storage::types::CountedStorageNMapInstance
@@ -700,6 +729,7 @@ pub fn expand_storages(def: &mut Def) -> proc_macro2::TokenStream {
 			_ => proc_macro2::TokenStream::default(),
 		};
 
+		let storage_prefix_hash = two128_str(&prefix_struct_const);
 		quote::quote_spanned!(storage_def.attr_span =>
 			#maybe_counter
 
@@ -720,7 +750,19 @@ pub fn expand_storages(def: &mut Def) -> proc_macro2::TokenStream {
 					>::name::<Pallet<#type_use_gen>>()
 						.expect("No name found for the pallet in the runtime! This usually means that the pallet wasn't added to `construct_runtime!`.")
 				}
+
+				fn pallet_prefix_hash() -> [u8; 16] {
+					<
+						<T as #frame_system::Config>::PalletInfo
+						as #frame_support::traits::PalletInfo
+					>::name_hash::<Pallet<#type_use_gen>>()
+						.expect("No name_hash found for the pallet in the runtime! This usually means that the pallet wasn't added to `construct_runtime!`.")
+				}
+
 				const STORAGE_PREFIX: &'static str = #prefix_struct_const;
+				fn storage_prefix_hash() -> [u8; 16] {
+					#storage_prefix_hash
+				}
 			}
 		)
 	});
diff --git a/substrate/frame/support/procedural/src/pallet/expand/tt_default_parts.rs b/substrate/frame/support/procedural/src/pallet/expand/tt_default_parts.rs
index 86db56c776dfefbdd393ae090e59ed11472456c1..c9a776ee247527b8e76508144ece3708d110194b 100644
--- a/substrate/frame/support/procedural/src/pallet/expand/tt_default_parts.rs
+++ b/substrate/frame/support/procedural/src/pallet/expand/tt_default_parts.rs
@@ -85,18 +85,16 @@ pub fn expand_tt_default_parts(def: &mut Def) -> proc_macro2::TokenStream {
 		// wrapped inside of braces and finally prepended with double colons, to the caller inside
 		// of a key named `tokens`.
 		//
-		// We need to accept a frame_support argument here, because this macro gets expanded on the
-		// crate that called the `construct_runtime!` macro, and said crate may have renamed
-		// frame-support, and so we need to pass in the frame-support path that said crate
-		// recognizes.
+		// We need to accept a path argument here, because this macro gets expanded on the
+		// crate that called the `construct_runtime!` macro, and the actual path is unknown.
 		#[macro_export]
 		#[doc(hidden)]
 		macro_rules! #default_parts_unique_id {
 			{
 				$caller:tt
-				frame_support = [{ $($frame_support:ident)::* }]
+				your_tt_return = [{ $my_tt_return:path }]
 			} => {
-				$($frame_support)*::__private::tt_return! {
+				$my_tt_return! {
 					$caller
 					tokens = [{
 						expanded::{
@@ -112,7 +110,7 @@ pub fn expand_tt_default_parts(def: &mut Def) -> proc_macro2::TokenStream {
 		pub use #default_parts_unique_id as tt_default_parts;
 
 
-		// This macro is similar to the `tt_default_parts!`. It expands the pallets thare are declared
+		// This macro is similar to the `tt_default_parts!`. It expands the pallets that are declared
 		// explicitly (`System: frame_system::{Pallet, Call}`) with extra parts.
 		//
 		// For example, after expansion an explicit pallet would look like:
@@ -124,9 +122,9 @@ pub fn expand_tt_default_parts(def: &mut Def) -> proc_macro2::TokenStream {
 		macro_rules! #extra_parts_unique_id {
 			{
 				$caller:tt
-				frame_support = [{ $($frame_support:ident)::* }]
+				your_tt_return = [{ $my_tt_return:path }]
 			} => {
-				$($frame_support)*::__private::tt_return! {
+				$my_tt_return! {
 					$caller
 					tokens = [{
 						expanded::{
diff --git a/substrate/frame/support/procedural/src/pallet/expand/warnings.rs b/substrate/frame/support/procedural/src/pallet/expand/warnings.rs
new file mode 100644
index 0000000000000000000000000000000000000000..110c4fa51987a22105c9ce639770d5573642c2d0
--- /dev/null
+++ b/substrate/frame/support/procedural/src/pallet/expand/warnings.rs
@@ -0,0 +1,100 @@
+// 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.
+
+//! Generates warnings for undesirable pallet code.
+
+use crate::pallet::parse::call::{CallVariantDef, CallWeightDef};
+use proc_macro_warning::Warning;
+use syn::{
+	spanned::Spanned,
+	visit::{self, Visit},
+};
+
+/// Warn if any of the call arguments starts with a underscore and is used in a weight formula.
+pub(crate) fn weight_witness_warning(
+	method: &CallVariantDef,
+	dev_mode: bool,
+	warnings: &mut Vec<Warning>,
+) {
+	if dev_mode {
+		return
+	}
+
+	let CallWeightDef::Immediate(w) = &method.weight else { return };
+
+	let partial_warning = Warning::new_deprecated("UncheckedWeightWitness")
+		.old("not check weight witness data")
+		.new("ensure that all witness data for weight calculation is checked before usage")
+		.help_link("https://github.com/paritytech/polkadot-sdk/pull/1818");
+
+	for (_, arg_ident, _) in method.args.iter() {
+		if !arg_ident.to_string().starts_with('_') || !contains_ident(w.clone(), &arg_ident) {
+			continue
+		}
+
+		let warning = partial_warning
+			.clone()
+			.index(warnings.len())
+			.span(arg_ident.span())
+			.build_or_panic();
+
+		warnings.push(warning);
+	}
+}
+
+/// Warn if the weight is a constant and the pallet not in `dev_mode`.
+pub(crate) fn weight_constant_warning(
+	weight: &syn::Expr,
+	dev_mode: bool,
+	warnings: &mut Vec<Warning>,
+) {
+	if dev_mode {
+		return
+	}
+
+	let syn::Expr::Lit(lit) = weight else { return };
+
+	let warning = Warning::new_deprecated("ConstantWeight")
+		.index(warnings.len())
+		.old("use hard-coded constant as call weight")
+		.new("benchmark all calls or put the pallet into `dev` mode")
+		.help_link("https://github.com/paritytech/substrate/pull/13798")
+		.span(lit.span())
+		.build_or_panic();
+
+	warnings.push(warning);
+}
+
+/// Returns whether `expr` contains `ident`.
+fn contains_ident(mut expr: syn::Expr, ident: &syn::Ident) -> bool {
+	struct ContainsIdent {
+		ident: syn::Ident,
+		found: bool,
+	}
+
+	impl<'a> Visit<'a> for ContainsIdent {
+		fn visit_ident(&mut self, i: &syn::Ident) {
+			if *i == self.ident {
+				self.found = true;
+			}
+		}
+	}
+
+	let mut visitor = ContainsIdent { ident: ident.clone(), found: false };
+	visit::visit_expr(&mut visitor, &mut expr);
+	visitor.found
+}
diff --git a/substrate/frame/support/procedural/src/pallet/mod.rs b/substrate/frame/support/procedural/src/pallet/mod.rs
index 3618711051d7fe5649f883a5b95708d47475e5a4..42d8272fb23edb9afc7bd1a152b5d7506fd3ba99 100644
--- a/substrate/frame/support/procedural/src/pallet/mod.rs
+++ b/substrate/frame/support/procedural/src/pallet/mod.rs
@@ -26,7 +26,7 @@
 //!   to user defined types. And also crate new types and implement block.
 
 mod expand;
-mod parse;
+pub(crate) mod parse;
 
 pub use parse::{composite::keyword::CompositeKeyword, Def};
 use syn::spanned::Spanned;
diff --git a/substrate/frame/support/procedural/src/pallet/parse/composite.rs b/substrate/frame/support/procedural/src/pallet/parse/composite.rs
index cb554a116175c1f93aa2b7f5b4da447d6efb7741..6e6ea6a795c1403b64891c00507cf0f7d8dffc25 100644
--- a/substrate/frame/support/procedural/src/pallet/parse/composite.rs
+++ b/substrate/frame/support/procedural/src/pallet/parse/composite.rs
@@ -15,6 +15,7 @@
 // See the License for the specific language governing permissions and
 // limitations under the License.
 
+use super::helper;
 use quote::ToTokens;
 use syn::spanned::Spanned;
 
@@ -91,7 +92,7 @@ impl CompositeDef {
 	pub fn try_from(
 		attr_span: proc_macro2::Span,
 		index: usize,
-		scrate: &proc_macro2::Ident,
+		scrate: &syn::Path,
 		item: &mut syn::Item,
 	) -> syn::Result<Self> {
 		let item = if let syn::Item::Enum(item) = item {
@@ -108,6 +109,13 @@ impl CompositeDef {
 			return Err(syn::Error::new(item.span(), msg))
 		}
 
+		let has_instance = if item.generics.params.first().is_some() {
+			helper::check_config_def_gen(&item.generics, item.ident.span())?;
+			true
+		} else {
+			false
+		};
+
 		let has_derive_attr = item.attrs.iter().any(|attr| {
 			if let syn::Meta::List(syn::MetaList { path, .. }) = &attr.meta {
 				path.get_ident().map(|ident| ident == "derive").unwrap_or(false)
@@ -119,7 +127,7 @@ impl CompositeDef {
 		if !has_derive_attr {
 			let derive_attr: syn::Attribute = syn::parse_quote! {
 				#[derive(
-					Copy, Clone, Eq, PartialEq, Ord, PartialOrd,
+					Copy, Clone, Eq, PartialEq,
 					#scrate::__private::codec::Encode, #scrate::__private::codec::Decode, #scrate::__private::codec::MaxEncodedLen,
 					#scrate::__private::scale_info::TypeInfo,
 					#scrate::__private::RuntimeDebug,
@@ -128,6 +136,20 @@ impl CompositeDef {
 			item.attrs.push(derive_attr);
 		}
 
+		if has_instance {
+			item.attrs.push(syn::parse_quote! {
+				#[scale_info(skip_type_params(I))]
+			});
+
+			item.variants.push(syn::parse_quote! {
+				#[doc(hidden)]
+				#[codec(skip)]
+				__Ignore(
+					#scrate::__private::sp_std::marker::PhantomData<I>,
+				)
+			});
+		}
+
 		let composite_keyword =
 			syn::parse2::<keyword::CompositeKeyword>(item.ident.to_token_stream())?;
 
diff --git a/substrate/frame/support/procedural/src/pallet/parse/config.rs b/substrate/frame/support/procedural/src/pallet/parse/config.rs
index e505f8b04119bd685bb2c3dfd77521f349eb619f..fbab92db196cb33d90e88413d66e4ff75e8e3cd4 100644
--- a/substrate/frame/support/procedural/src/pallet/parse/config.rs
+++ b/substrate/frame/support/procedural/src/pallet/parse/config.rs
@@ -16,7 +16,7 @@
 // limitations under the License.
 
 use super::helper;
-use frame_support_procedural_tools::get_doc_literals;
+use frame_support_procedural_tools::{get_doc_literals, is_using_frame_crate};
 use quote::ToTokens;
 use syn::{spanned::Spanned, token, Token};
 
@@ -165,24 +165,8 @@ pub struct PalletAttr {
 	typ: PalletAttrType,
 }
 
-pub struct ConfigBoundParse(syn::Ident);
-
-impl syn::parse::Parse for ConfigBoundParse {
-	fn parse(input: syn::parse::ParseStream) -> syn::Result<Self> {
-		let ident = input.parse::<syn::Ident>()?;
-		input.parse::<syn::Token![::]>()?;
-		input.parse::<keyword::Config>()?;
-
-		if input.peek(syn::token::Lt) {
-			input.parse::<syn::AngleBracketedGenericArguments>()?;
-		}
-
-		Ok(Self(ident))
-	}
-}
-
-/// Parse for `IsType<<Sef as $ident::Config>::RuntimeEvent>` and retrieve `$ident`
-pub struct IsTypeBoundEventParse(syn::Ident);
+/// Parse for `IsType<<Self as $path>::RuntimeEvent>` and retrieve `$path`
+pub struct IsTypeBoundEventParse(syn::Path);
 
 impl syn::parse::Parse for IsTypeBoundEventParse {
 	fn parse(input: syn::parse::ParseStream) -> syn::Result<Self> {
@@ -191,15 +175,13 @@ impl syn::parse::Parse for IsTypeBoundEventParse {
 		input.parse::<syn::Token![<]>()?;
 		input.parse::<syn::Token![Self]>()?;
 		input.parse::<syn::Token![as]>()?;
-		let ident = input.parse::<syn::Ident>()?;
-		input.parse::<syn::Token![::]>()?;
-		input.parse::<keyword::Config>()?;
+		let config_path = input.parse::<syn::Path>()?;
 		input.parse::<syn::Token![>]>()?;
 		input.parse::<syn::Token![::]>()?;
 		input.parse::<keyword::RuntimeEvent>()?;
 		input.parse::<syn::Token![>]>()?;
 
-		Ok(Self(ident))
+		Ok(Self(config_path))
 	}
 }
 
@@ -237,7 +219,7 @@ impl syn::parse::Parse for FromEventParse {
 /// Check if trait_item is `type RuntimeEvent`, if so checks its bounds are those expected.
 /// (Event type is reserved type)
 fn check_event_type(
-	frame_system: &syn::Ident,
+	frame_system: &syn::Path,
 	trait_item: &syn::TraitItem,
 	trait_has_instance: bool,
 ) -> syn::Result<bool> {
@@ -249,19 +231,16 @@ fn check_event_type(
 					no generics nor where_clause";
 				return Err(syn::Error::new(trait_item.span(), msg))
 			}
-			// Check bound contains IsType and From
 
+			// Check bound contains IsType and From
 			let has_is_type_bound = type_.bounds.iter().any(|s| {
 				syn::parse2::<IsTypeBoundEventParse>(s.to_token_stream())
-					.map_or(false, |b| b.0 == *frame_system)
+					.map_or(false, |b| has_expected_system_config(b.0, frame_system))
 			});
 
 			if !has_is_type_bound {
-				let msg = format!(
-					"Invalid `type RuntimeEvent`, associated type `RuntimeEvent` is reserved and must \
-					bound: `IsType<<Self as {}::Config>::RuntimeEvent>`",
-					frame_system,
-				);
+				let msg = "Invalid `type RuntimeEvent`, associated type `RuntimeEvent` is reserved and must \
+					bound: `IsType<<Self as frame_system::Config>::RuntimeEvent>`".to_string();
 				return Err(syn::Error::new(type_.span(), msg))
 			}
 
@@ -295,6 +274,43 @@ fn check_event_type(
 	}
 }
 
+/// Check that the path to `frame_system::Config` is valid, this is that the path is just
+/// `frame_system::Config` or when using the `frame` crate it is `frame::xyz::frame_system::Config`.
+fn has_expected_system_config(path: syn::Path, frame_system: &syn::Path) -> bool {
+	// Check if `frame_system` is actually 'frame_system'.
+	if path.segments.iter().all(|s| s.ident != "frame_system") {
+		return false
+	}
+
+	let mut expected_system_config =
+		match (is_using_frame_crate(&path), is_using_frame_crate(&frame_system)) {
+			(true, false) =>
+			// We can't use the path to `frame_system` from `frame` if `frame_system` is not being
+			// in scope through `frame`.
+				return false,
+			(false, true) =>
+			// We know that the only valid frame_system path is one that is `frame_system`, as
+			// `frame` re-exports it as such.
+				syn::parse2::<syn::Path>(quote::quote!(frame_system)).expect("is a valid path; qed"),
+			(_, _) =>
+			// They are either both `frame_system` or both `frame::xyz::frame_system`.
+				frame_system.clone(),
+		};
+
+	expected_system_config
+		.segments
+		.push(syn::PathSegment::from(syn::Ident::new("Config", path.span())));
+
+	// the parse path might be something like `frame_system::Config<...>`, so we
+	// only compare the idents along the path.
+	expected_system_config
+		.segments
+		.into_iter()
+		.map(|ps| ps.ident)
+		.collect::<Vec<_>>() ==
+		path.segments.into_iter().map(|ps| ps.ident).collect::<Vec<_>>()
+}
+
 /// Replace ident `Self` by `T`
 pub fn replace_self_by_t(input: proc_macro2::TokenStream) -> proc_macro2::TokenStream {
 	input
@@ -311,7 +327,7 @@ pub fn replace_self_by_t(input: proc_macro2::TokenStream) -> proc_macro2::TokenS
 
 impl ConfigDef {
 	pub fn try_from(
-		frame_system: &syn::Ident,
+		frame_system: &syn::Path,
 		attr_span: proc_macro2::Span,
 		index: usize,
 		item: &mut syn::Item,
@@ -352,8 +368,8 @@ impl ConfigDef {
 		};
 
 		let has_frame_system_supertrait = item.supertraits.iter().any(|s| {
-			syn::parse2::<ConfigBoundParse>(s.to_token_stream())
-				.map_or(false, |b| b.0 == *frame_system)
+			syn::parse2::<syn::Path>(s.to_token_stream())
+				.map_or(false, |b| has_expected_system_config(b, frame_system))
 		});
 
 		let mut has_event_type = false;
@@ -461,7 +477,8 @@ impl ConfigDef {
 				(try `pub trait Config: frame_system::Config {{ ...` or \
 				`pub trait Config<I: 'static>: frame_system::Config {{ ...`). \
 				To disable this check, use `#[pallet::disable_frame_system_supertrait_check]`",
-				frame_system, found,
+				frame_system.to_token_stream(),
+				found,
 			);
 			return Err(syn::Error::new(item.span(), msg))
 		}
@@ -477,3 +494,97 @@ impl ConfigDef {
 		})
 	}
 }
+
+#[cfg(test)]
+mod tests {
+	use super::*;
+	#[test]
+	fn has_expected_system_config_works() {
+		let frame_system = syn::parse2::<syn::Path>(quote::quote!(frame_system)).unwrap();
+		let path = syn::parse2::<syn::Path>(quote::quote!(frame_system::Config)).unwrap();
+		assert!(has_expected_system_config(path, &frame_system));
+	}
+
+	#[test]
+	fn has_expected_system_config_works_with_assoc_type() {
+		let frame_system = syn::parse2::<syn::Path>(quote::quote!(frame_system)).unwrap();
+		let path =
+			syn::parse2::<syn::Path>(quote::quote!(frame_system::Config<RuntimeCall = Call>))
+				.unwrap();
+		assert!(has_expected_system_config(path, &frame_system));
+	}
+
+	#[test]
+	fn has_expected_system_config_works_with_frame() {
+		let frame_system =
+			syn::parse2::<syn::Path>(quote::quote!(frame::deps::frame_system)).unwrap();
+		let path = syn::parse2::<syn::Path>(quote::quote!(frame_system::Config)).unwrap();
+		assert!(has_expected_system_config(path, &frame_system));
+	}
+
+	#[test]
+	fn has_expected_system_config_works_with_frame_full_path() {
+		let frame_system =
+			syn::parse2::<syn::Path>(quote::quote!(frame::deps::frame_system)).unwrap();
+		let path =
+			syn::parse2::<syn::Path>(quote::quote!(frame::deps::frame_system::Config)).unwrap();
+		assert!(has_expected_system_config(path, &frame_system));
+	}
+
+	#[test]
+	fn has_expected_system_config_works_with_other_frame_full_path() {
+		let frame_system =
+			syn::parse2::<syn::Path>(quote::quote!(frame::xyz::frame_system)).unwrap();
+		let path =
+			syn::parse2::<syn::Path>(quote::quote!(frame::xyz::frame_system::Config)).unwrap();
+		assert!(has_expected_system_config(path, &frame_system));
+	}
+
+	#[test]
+	fn has_expected_system_config_does_not_works_with_mixed_frame_full_path() {
+		let frame_system =
+			syn::parse2::<syn::Path>(quote::quote!(frame::xyz::frame_system)).unwrap();
+		let path =
+			syn::parse2::<syn::Path>(quote::quote!(frame::deps::frame_system::Config)).unwrap();
+		assert!(!has_expected_system_config(path, &frame_system));
+	}
+
+	#[test]
+	fn has_expected_system_config_does_not_works_with_other_mixed_frame_full_path() {
+		let frame_system =
+			syn::parse2::<syn::Path>(quote::quote!(frame::deps::frame_system)).unwrap();
+		let path =
+			syn::parse2::<syn::Path>(quote::quote!(frame::xyz::frame_system::Config)).unwrap();
+		assert!(!has_expected_system_config(path, &frame_system));
+	}
+
+	#[test]
+	fn has_expected_system_config_does_not_work_with_frame_full_path_if_not_frame_crate() {
+		let frame_system = syn::parse2::<syn::Path>(quote::quote!(frame_system)).unwrap();
+		let path =
+			syn::parse2::<syn::Path>(quote::quote!(frame::deps::frame_system::Config)).unwrap();
+		assert!(!has_expected_system_config(path, &frame_system));
+	}
+
+	#[test]
+	fn has_expected_system_config_unexpected_frame_system() {
+		let frame_system =
+			syn::parse2::<syn::Path>(quote::quote!(framez::deps::frame_system)).unwrap();
+		let path = syn::parse2::<syn::Path>(quote::quote!(frame_system::Config)).unwrap();
+		assert!(!has_expected_system_config(path, &frame_system));
+	}
+
+	#[test]
+	fn has_expected_system_config_unexpected_path() {
+		let frame_system = syn::parse2::<syn::Path>(quote::quote!(frame_system)).unwrap();
+		let path = syn::parse2::<syn::Path>(quote::quote!(frame_system::ConfigSystem)).unwrap();
+		assert!(!has_expected_system_config(path, &frame_system));
+	}
+
+	#[test]
+	fn has_expected_system_config_not_frame_system() {
+		let frame_system = syn::parse2::<syn::Path>(quote::quote!(something)).unwrap();
+		let path = syn::parse2::<syn::Path>(quote::quote!(something::Config)).unwrap();
+		assert!(!has_expected_system_config(path, &frame_system));
+	}
+}
diff --git a/substrate/frame/support/procedural/src/pallet/parse/helper.rs b/substrate/frame/support/procedural/src/pallet/parse/helper.rs
index 1e6e83d7eeba7e1b63b18693ee1fce5cce72dc76..446ec203d2ba5878304f8ee081e870cc08101a4c 100644
--- a/substrate/frame/support/procedural/src/pallet/parse/helper.rs
+++ b/substrate/frame/support/procedural/src/pallet/parse/helper.rs
@@ -15,7 +15,8 @@
 // See the License for the specific language governing permissions and
 // limitations under the License.
 
-use quote::ToTokens;
+use proc_macro2::TokenStream;
+use quote::{quote, ToTokens};
 use syn::spanned::Spanned;
 
 /// List of additional token to be used for parsing.
@@ -494,7 +495,7 @@ pub fn check_type_def_gen(
 /// return the instance if found for `GenesisBuild`
 /// return None for BuildGenesisConfig
 pub fn check_genesis_builder_usage(type_: &syn::Path) -> syn::Result<Option<InstanceUsage>> {
-	let expected = "expected `GenesisBuild<T>` or `GenesisBuild<T, I>`";
+	let expected = "expected `BuildGenesisConfig` (or the deprecated `GenesisBuild<T>` or `GenesisBuild<T, I>`)";
 	pub struct Checker(Option<InstanceUsage>);
 	impl syn::parse::Parse for Checker {
 		fn parse(input: syn::parse::ParseStream) -> syn::Result<Self> {
@@ -610,3 +611,16 @@ pub fn check_pallet_call_return_type(type_: &syn::Type) -> syn::Result<()> {
 
 	syn::parse2::<Checker>(type_.to_token_stream()).map(|_| ())
 }
+
+pub(crate) fn two128_str(s: &str) -> TokenStream {
+	bytes_to_array(sp_core_hashing::twox_128(s.as_bytes()).into_iter())
+}
+
+pub(crate) fn bytes_to_array(bytes: impl IntoIterator<Item = u8>) -> TokenStream {
+	let bytes = bytes.into_iter();
+
+	quote!(
+		[ #( #bytes ),* ]
+	)
+	.into()
+}
diff --git a/substrate/frame/support/procedural/src/pallet/parse/mod.rs b/substrate/frame/support/procedural/src/pallet/parse/mod.rs
index 0f5e5f1136610e40226ba880a1b47512d2ee34a9..83a881751ef308a948e9fc69a684cd90862af145 100644
--- a/substrate/frame/support/procedural/src/pallet/parse/mod.rs
+++ b/substrate/frame/support/procedural/src/pallet/parse/mod.rs
@@ -37,7 +37,7 @@ pub mod type_value;
 pub mod validate_unsigned;
 
 use composite::{keyword::CompositeKeyword, CompositeDef};
-use frame_support_procedural_tools::generate_crate_access_2018;
+use frame_support_procedural_tools::generate_access_from_frame_or_crate;
 use syn::spanned::Spanned;
 
 /// Parsed definition of a pallet.
@@ -60,15 +60,15 @@ pub struct Def {
 	pub extra_constants: Option<extra_constants::ExtraConstantsDef>,
 	pub composites: Vec<composite::CompositeDef>,
 	pub type_values: Vec<type_value::TypeValueDef>,
-	pub frame_system: syn::Ident,
-	pub frame_support: syn::Ident,
+	pub frame_system: syn::Path,
+	pub frame_support: syn::Path,
 	pub dev_mode: bool,
 }
 
 impl Def {
 	pub fn try_from(mut item: syn::ItemMod, dev_mode: bool) -> syn::Result<Self> {
-		let frame_system = generate_crate_access_2018("frame-system")?;
-		let frame_support = generate_crate_access_2018("frame-support")?;
+		let frame_system = generate_access_from_frame_or_crate("frame-system")?;
+		let frame_support = generate_access_from_frame_or_crate("frame-support")?;
 
 		let item_span = item.span();
 		let items = &mut item
diff --git a/substrate/frame/support/procedural/src/pallet_error.rs b/substrate/frame/support/procedural/src/pallet_error.rs
index 7fd02240a628a23fdaee5ff84f89570aa1705fb2..693a1e9821c9728a7992a3d2d6741b855d2af867 100644
--- a/substrate/frame/support/procedural/src/pallet_error.rs
+++ b/substrate/frame/support/procedural/src/pallet_error.rs
@@ -15,7 +15,7 @@
 // See the License for the specific language governing permissions and
 // limitations under the License.
 
-use frame_support_procedural_tools::generate_crate_access_2018;
+use frame_support_procedural_tools::generate_access_from_frame_or_crate;
 use quote::ToTokens;
 
 // Derive `PalletError`
@@ -25,7 +25,7 @@ pub fn derive_pallet_error(input: proc_macro::TokenStream) -> proc_macro::TokenS
 		Err(e) => return e.to_compile_error().into(),
 	};
 
-	let frame_support = match generate_crate_access_2018("frame-support") {
+	let frame_support = match generate_access_from_frame_or_crate("frame-support") {
 		Ok(c) => c,
 		Err(e) => return e.into_compile_error().into(),
 	};
@@ -111,7 +111,7 @@ pub fn derive_pallet_error(input: proc_macro::TokenStream) -> proc_macro::TokenS
 
 fn generate_field_types(
 	field: &syn::Field,
-	scrate: &syn::Ident,
+	scrate: &syn::Path,
 ) -> syn::Result<Option<proc_macro2::TokenStream>> {
 	let attrs = &field.attrs;
 
@@ -143,7 +143,7 @@ fn generate_field_types(
 
 fn generate_variant_field_types(
 	variant: &syn::Variant,
-	scrate: &syn::Ident,
+	scrate: &syn::Path,
 ) -> syn::Result<Option<Vec<proc_macro2::TokenStream>>> {
 	let attrs = &variant.attrs;
 
diff --git a/substrate/frame/support/procedural/src/storage_alias.rs b/substrate/frame/support/procedural/src/storage_alias.rs
index a3f21806e18b921e07c8acdf63aa06bd51c5f2ee..c0b4089a2748f0b8be6683e591a36fb496af16a4 100644
--- a/substrate/frame/support/procedural/src/storage_alias.rs
+++ b/substrate/frame/support/procedural/src/storage_alias.rs
@@ -17,8 +17,8 @@
 
 //! Implementation of the `storage_alias` attribute macro.
 
-use crate::counter_prefix;
-use frame_support_procedural_tools::generate_crate_access_2018;
+use crate::{counter_prefix, pallet::parse::helper};
+use frame_support_procedural_tools::generate_access_from_frame_or_crate;
 use proc_macro2::{Span, TokenStream};
 use quote::{quote, ToTokens};
 use syn::{
@@ -199,7 +199,7 @@ impl StorageType {
 	/// Generate the actual type declaration.
 	fn generate_type_declaration(
 		&self,
-		crate_: &Ident,
+		crate_: &syn::Path,
 		storage_instance: &StorageInstance,
 		storage_name: &Ident,
 		storage_generics: Option<&SimpleGenerics>,
@@ -475,7 +475,7 @@ enum PrefixType {
 /// Implementation of the `storage_alias` attribute macro.
 pub fn storage_alias(attributes: TokenStream, input: TokenStream) -> Result<TokenStream> {
 	let input = syn::parse2::<Input>(input)?;
-	let crate_ = generate_crate_access_2018("frame-support")?;
+	let crate_ = generate_access_from_frame_or_crate("frame-support")?;
 
 	let prefix_type = if attributes.is_empty() {
 		PrefixType::Compatibility
@@ -527,7 +527,7 @@ struct StorageInstance {
 
 /// Generate the [`StorageInstance`] for the storage alias.
 fn generate_storage_instance(
-	crate_: &Ident,
+	crate_: &syn::Path,
 	storage_name: &Ident,
 	storage_generics: Option<&SimpleGenerics>,
 	storage_where_clause: Option<&WhereClause>,
@@ -619,6 +619,7 @@ fn generate_storage_instance(
 	let counter_code = is_counted_map.then(|| {
 		let counter_name = Ident::new(&counter_prefix(&name_str), Span::call_site());
 		let counter_storage_name_str = counter_prefix(&storage_name_str);
+		let storage_prefix_hash = helper::two128_str(&counter_storage_name_str);
 
 		quote! {
 			#visibility struct #counter_name< #impl_generics >(
@@ -633,6 +634,9 @@ fn generate_storage_instance(
 				}
 
 				const STORAGE_PREFIX: &'static str = #counter_storage_name_str;
+				fn storage_prefix_hash() -> [u8; 16] {
+					#storage_prefix_hash
+				}
 			}
 
 			impl<#impl_generics> #crate_::storage::types::CountedStorageMapInstance
@@ -643,6 +647,8 @@ fn generate_storage_instance(
 		}
 	});
 
+	let storage_prefix_hash = helper::two128_str(&storage_name_str);
+
 	// Implement `StorageInstance` trait.
 	let code = quote! {
 		#[allow(non_camel_case_types)]
@@ -658,6 +664,9 @@ fn generate_storage_instance(
 			}
 
 			const STORAGE_PREFIX: &'static str = #storage_name_str;
+			fn storage_prefix_hash() -> [u8; 16] {
+				#storage_prefix_hash
+			}
 		}
 
 		#counter_code
diff --git a/substrate/frame/support/procedural/src/transactional.rs b/substrate/frame/support/procedural/src/transactional.rs
index 23117ffa39c4e6bbd826a885fbaecff5df7f606b..e9d4f84b797a9d7da49639040e1c2658a9cedcdf 100644
--- a/substrate/frame/support/procedural/src/transactional.rs
+++ b/substrate/frame/support/procedural/src/transactional.rs
@@ -15,7 +15,7 @@
 // See the License for the specific language governing permissions and
 // limitations under the License.
 
-use frame_support_procedural_tools::generate_crate_access_2018;
+use frame_support_procedural_tools::generate_access_from_frame_or_crate;
 use proc_macro::TokenStream;
 use quote::quote;
 use syn::{ItemFn, Result};
@@ -23,7 +23,7 @@ use syn::{ItemFn, Result};
 pub fn transactional(_attr: TokenStream, input: TokenStream) -> Result<TokenStream> {
 	let ItemFn { attrs, vis, sig, block } = syn::parse(input)?;
 
-	let crate_ = generate_crate_access_2018("frame-support")?;
+	let crate_ = generate_access_from_frame_or_crate("frame-support")?;
 	let output = quote! {
 		#(#attrs)*
 		#vis #sig {
@@ -45,7 +45,7 @@ pub fn transactional(_attr: TokenStream, input: TokenStream) -> Result<TokenStre
 pub fn require_transactional(_attr: TokenStream, input: TokenStream) -> Result<TokenStream> {
 	let ItemFn { attrs, vis, sig, block } = syn::parse(input)?;
 
-	let crate_ = generate_crate_access_2018("frame-support")?;
+	let crate_ = generate_access_from_frame_or_crate("frame-support")?;
 	let output = quote! {
 		#(#attrs)*
 		#vis #sig {
diff --git a/substrate/frame/support/procedural/src/tt_macro.rs b/substrate/frame/support/procedural/src/tt_macro.rs
index 01611f5dc4a4d054de423668af2b56a1b5532035..d3712742189f8cbf78ba2fcfcd266e8e89ab4ec5 100644
--- a/substrate/frame/support/procedural/src/tt_macro.rs
+++ b/substrate/frame/support/procedural/src/tt_macro.rs
@@ -18,7 +18,6 @@
 //! Implementation of the `create_tt_return_macro` macro
 
 use crate::COUNTER;
-use frame_support_procedural_tools::generate_crate_access_2018;
 use proc_macro2::{Ident, TokenStream};
 use quote::format_ident;
 
@@ -65,9 +64,9 @@ impl syn::parse::Parse for CreateTtReturnMacroDef {
 /// macro_rules! my_tt_macro {
 ///     {
 ///         $caller:tt
-///         $(frame_support = [{ $($frame_support:ident)::* }])?
+///         $(your_tt_return = [{ $my_tt_return:path }])?
 ///     } => {
-///         frame_support::__private::tt_return! {
+///         $my_tt_return! {
 ///             $caller
 ///             foo = [{ bar }]
 ///         }
@@ -78,10 +77,6 @@ pub fn create_tt_return_macro(input: proc_macro::TokenStream) -> proc_macro::Tok
 	let CreateTtReturnMacroDef { name, args } =
 		syn::parse_macro_input!(input as CreateTtReturnMacroDef);
 
-	let frame_support = match generate_crate_access_2018("frame-support") {
-		Ok(i) => i,
-		Err(e) => return e.into_compile_error().into(),
-	};
 	let (keys, values): (Vec<_>, Vec<_>) = args.into_iter().unzip();
 	let count = COUNTER.with(|counter| counter.borrow_mut().inc());
 	let unique_name = format_ident!("{}_{}", name, count);
@@ -92,9 +87,9 @@ pub fn create_tt_return_macro(input: proc_macro::TokenStream) -> proc_macro::Tok
 		macro_rules! #unique_name {
 			{
 				$caller:tt
-				$(frame_support = [{ $($frame_support:ident)::* }])?
+				$(your_tt_return = [{ $my_tt_macro:path }])?
 			} => {
-				#frame_support::__private::tt_return! {
+				$my_tt_return! {
 					$caller
 					#(
 						#keys = [{ #values }]
diff --git a/substrate/frame/support/procedural/tools/Cargo.toml b/substrate/frame/support/procedural/tools/Cargo.toml
index 4d2e4c8756f43ab9da840e9cd39faaacb808143c..fd42e18180d396bb34050b5acd310ab5888fc6d7 100644
--- a/substrate/frame/support/procedural/tools/Cargo.toml
+++ b/substrate/frame/support/procedural/tools/Cargo.toml
@@ -1,11 +1,11 @@
 [package]
 name = "frame-support-procedural-tools"
 version = "4.0.0-dev"
-authors = ["Parity Technologies <admin@parity.io>"]
-edition = "2021"
+authors.workspace = true
+edition.workspace = true
 license = "Apache-2.0"
 homepage = "https://substrate.io"
-repository = "https://github.com/paritytech/substrate/"
+repository.workspace = true
 description = "Proc macro helpers for procedural macros"
 
 [package.metadata.docs.rs]
@@ -15,5 +15,5 @@ targets = ["x86_64-unknown-linux-gnu"]
 proc-macro-crate = "1.1.3"
 proc-macro2 = "1.0.56"
 quote = "1.0.28"
-syn = { version = "2.0.16", features = ["full", "visit", "extra-traits"] }
+syn = { version = "2.0.38", features = ["full", "visit", "extra-traits"] }
 frame-support-procedural-tools-derive = { path = "derive" }
diff --git a/substrate/frame/support/procedural/tools/derive/Cargo.toml b/substrate/frame/support/procedural/tools/derive/Cargo.toml
index 193df53f129170e10df1851422369dc500f32ffb..06f8e0f3d537a956f26dd873929f87bec86ce9e0 100644
--- a/substrate/frame/support/procedural/tools/derive/Cargo.toml
+++ b/substrate/frame/support/procedural/tools/derive/Cargo.toml
@@ -1,11 +1,11 @@
 [package]
 name = "frame-support-procedural-tools-derive"
 version = "3.0.0"
-authors = ["Parity Technologies <admin@parity.io>"]
-edition = "2021"
+authors.workspace = true
+edition.workspace = true
 license = "Apache-2.0"
 homepage = "https://substrate.io"
-repository = "https://github.com/paritytech/substrate/"
+repository.workspace = true
 description = "Use to derive parsing for parsing struct."
 
 [package.metadata.docs.rs]
@@ -17,4 +17,4 @@ proc-macro = true
 [dependencies]
 proc-macro2 = "1.0.56"
 quote = { version = "1.0.28", features = ["proc-macro"] }
-syn = { version = "2.0.16", features = ["proc-macro", "full", "extra-traits", "parsing"] }
+syn = { version = "2.0.38", features = ["proc-macro", "full", "extra-traits", "parsing"] }
diff --git a/substrate/frame/support/procedural/tools/src/lib.rs b/substrate/frame/support/procedural/tools/src/lib.rs
index 541accc8ab96a3520d6bf9edd03434459ca29bd5..62c77ef7a99aef81fb5bd653b706780291b9cd5f 100644
--- a/substrate/frame/support/procedural/tools/src/lib.rs
+++ b/substrate/frame/support/procedural/tools/src/lib.rs
@@ -39,24 +39,44 @@ fn generate_hidden_includes_mod_name(unique_id: &str) -> Ident {
 /// Generates the access to the `frame-support` crate.
 pub fn generate_crate_access(unique_id: &str, def_crate: &str) -> TokenStream {
 	if std::env::var("CARGO_PKG_NAME").unwrap() == def_crate {
-		quote::quote!(frame_support)
+		let frame_support = match generate_access_from_frame_or_crate("frame-support") {
+			Ok(c) => c,
+			Err(e) => return e.into_compile_error().into(),
+		};
+		quote::quote!(#frame_support)
 	} else {
 		let mod_name = generate_hidden_includes_mod_name(unique_id);
 		quote::quote!( self::#mod_name::hidden_include )
 	}
 }
 
+/// Check if a path is using the `frame` crate or not.
+///
+/// This will usually check the output of [`generate_access_from_frame_or_crate`].
+/// We want to know if whatever the `path` takes us to, is exported from `frame` or not. In that
+/// case `path` would start with `frame`, something like `frame::x::y:z`.
+pub fn is_using_frame_crate(path: &syn::Path) -> bool {
+	path.segments.first().map(|s| s.ident == "frame").unwrap_or(false)
+}
+
 /// Generate the crate access for the crate using 2018 syntax.
 ///
-/// for `frame-support` output will for example be `frame_support`.
-pub fn generate_crate_access_2018(def_crate: &str) -> Result<syn::Ident, Error> {
-	match crate_name(def_crate) {
-		Ok(FoundCrate::Itself) => {
-			let name = def_crate.to_string().replace("-", "_");
-			Ok(syn::Ident::new(&name, Span::call_site()))
-		},
-		Ok(FoundCrate::Name(name)) => Ok(Ident::new(&name, Span::call_site())),
-		Err(e) => Err(Error::new(Span::call_site(), e)),
+/// If `frame` is in scope, it will use `frame::deps::<def_crate>`. Else, it will try and find
+/// `<def_crate>` directly.
+pub fn generate_access_from_frame_or_crate(def_crate: &str) -> Result<syn::Path, Error> {
+	if let Some(path) = get_frame_crate_path(def_crate) {
+		Ok(path)
+	} else {
+		let ident = match crate_name(def_crate) {
+			Ok(FoundCrate::Itself) => {
+				let name = def_crate.to_string().replace("-", "_");
+				Ok(syn::Ident::new(&name, Span::call_site()))
+			},
+			Ok(FoundCrate::Name(name)) => Ok(Ident::new(&name, Span::call_site())),
+			Err(e) => Err(Error::new(Span::call_site(), e)),
+		}?;
+
+		Ok(syn::Path::from(ident))
 	}
 }
 
@@ -64,21 +84,41 @@ pub fn generate_crate_access_2018(def_crate: &str) -> Result<syn::Ident, Error>
 pub fn generate_hidden_includes(unique_id: &str, def_crate: &str) -> TokenStream {
 	let mod_name = generate_hidden_includes_mod_name(unique_id);
 
-	match crate_name(def_crate) {
-		Ok(FoundCrate::Itself) => quote!(),
-		Ok(FoundCrate::Name(name)) => {
-			let name = Ident::new(&name, Span::call_site());
-			quote::quote!(
-				#[doc(hidden)]
-				mod #mod_name {
-					pub extern crate #name as hidden_include;
-				}
-			)
-		},
-		Err(e) => {
-			let err = Error::new(Span::call_site(), e).to_compile_error();
-			quote!( #err )
-		},
+	if let Some(path) = get_frame_crate_path(def_crate) {
+		quote::quote!(
+			#[doc(hidden)]
+			mod #mod_name {
+				pub use #path as hidden_include;
+			}
+		)
+	} else {
+		match crate_name(def_crate) {
+			Ok(FoundCrate::Itself) => quote!(),
+			Ok(FoundCrate::Name(name)) => {
+				let name = Ident::new(&name, Span::call_site());
+				quote::quote!(
+					#[doc(hidden)]
+					mod #mod_name {
+						pub extern crate #name as hidden_include;
+					}
+				)
+			},
+			Err(e) => {
+				let err = Error::new(Span::call_site(), e).to_compile_error();
+				quote!( #err )
+			},
+		}
+	}
+}
+
+/// Generates the path to the frame crate deps.
+fn get_frame_crate_path(def_crate: &str) -> Option<syn::Path> {
+	// This does not work if the frame crate is renamed.
+	if let Ok(FoundCrate::Name(name)) = crate_name(&"frame") {
+		let path = format!("{}::deps::{}", name, def_crate.to_string().replace("-", "_"));
+		Some(syn::parse_str::<syn::Path>(&path).expect("is a valid path; qed"))
+	} else {
+		None
 	}
 }
 
diff --git a/substrate/frame/support/src/dispatch.rs b/substrate/frame/support/src/dispatch.rs
index 0388a9adb394895b5fbc88c3041bb4893eb11be0..75e94827fea8a142d5038d4685ede440b7b02c5c 100644
--- a/substrate/frame/support/src/dispatch.rs
+++ b/substrate/frame/support/src/dispatch.rs
@@ -18,30 +18,18 @@
 //! Dispatch system. Contains a macro for defining runtime modules and
 //! generating values representing lazy module function calls.
 
-pub use crate::traits::{
-	CallMetadata, GetCallIndex, GetCallMetadata, GetCallName, GetStorageVersion,
-	UnfilteredDispatchable,
-};
-pub use codec::{
-	Codec, Decode, Encode, EncodeAsRef, EncodeLike, HasCompact, Input, MaxEncodedLen, Output,
-};
-pub use scale_info::TypeInfo;
-pub use sp_runtime::{
-	traits::Dispatchable, transaction_validity::TransactionPriority, DispatchError, RuntimeDebug,
-};
-pub use sp_std::{
-	fmt, marker,
-	prelude::{Clone, Eq, PartialEq, Vec},
-	result,
-};
-pub use sp_weights::Weight;
-
+use crate::traits::UnfilteredDispatchable;
+use codec::{Codec, Decode, Encode, EncodeLike, MaxEncodedLen};
+use scale_info::TypeInfo;
 #[cfg(feature = "std")]
 use serde::{Deserialize, Serialize};
 use sp_runtime::{
 	generic::{CheckedExtrinsic, UncheckedExtrinsic},
 	traits::SignedExtension,
+	DispatchError, RuntimeDebug,
 };
+use sp_std::fmt;
+use sp_weights::Weight;
 
 /// The return type of a `Dispatchable` in frame. When returned explicitly from
 /// a dispatchable function it allows overriding the default `PostDispatchInfo`
@@ -150,6 +138,15 @@ impl From<Pays> for PostDispatchInfo {
 	}
 }
 
+impl From<bool> for Pays {
+	fn from(b: bool) -> Self {
+		match b {
+			true => Self::Yes,
+			false => Self::No,
+		}
+	}
+}
+
 /// A generalized group of dispatch types.
 ///
 /// NOTE whenever upgrading the enum make sure to also update
diff --git a/substrate/frame/support/src/dispatch_context.rs b/substrate/frame/support/src/dispatch_context.rs
index 31278ea9f81946baf3d57e75c50e79c5ca25d2ea..608187b72206399913e337a5fa9f5c1e42277978 100644
--- a/substrate/frame/support/src/dispatch_context.rs
+++ b/substrate/frame/support/src/dispatch_context.rs
@@ -26,11 +26,11 @@
 //!
 //! # FRAME integration
 //!
-//! The FRAME macros implement [`UnfilteredDispatchable`](crate::traits::UnfilteredDispatchable) for
-//! each pallet `Call` enum. Part of this implementation is the call to [`run_in_context`], so that
-//! each call to
+//! The FRAME macros implement
+//! [`UnfilteredDispatchable`](frame_support::traits::UnfilteredDispatchable) for each pallet `Call`
+//! enum. Part of this implementation is the call to [`run_in_context`], so that each call to
 //! [`UnfilteredDispatchable::dispatch_bypass_filter`](crate::traits::UnfilteredDispatchable::dispatch_bypass_filter)
-//! or [`Dispatchable::dispatch`](crate::dispatch::Dispatchable::dispatch) will run in a dispatch
+//! or [`Dispatchable::dispatch`](sp_runtime::traits::Dispatchable::dispatch) will run in a dispatch
 //! context.
 //!
 //! # Example
diff --git a/substrate/frame/support/src/genesis_builder_helper.rs b/substrate/frame/support/src/genesis_builder_helper.rs
index d4144a4d9fd19090cc35e50d7b216090e3908299..b2594d183ec5bdaa7ea2cae736ca57baada15459 100644
--- a/substrate/frame/support/src/genesis_builder_helper.rs
+++ b/substrate/frame/support/src/genesis_builder_helper.rs
@@ -25,7 +25,10 @@ use sp_runtime::format_runtime_string;
 
 /// Get the default `GenesisConfig` as a JSON blob. For more info refer to
 /// [`sp_genesis_builder::GenesisBuilder::create_default_config`]
-pub fn create_default_config<GC: BuildGenesisConfig>() -> sp_std::vec::Vec<u8> {
+pub fn create_default_config<GC>() -> sp_std::vec::Vec<u8>
+where
+	GC: BuildGenesisConfig + Default,
+{
 	serde_json::to_string(&GC::default())
 		.expect("serialization to json is expected to work. qed.")
 		.into_bytes()
diff --git a/substrate/frame/support/src/lib.rs b/substrate/frame/support/src/lib.rs
index a2a7e5ebc485fd01218d33ede91a9b7aa2d7150d..700d777a148184caef6b963f1abdc0bb1fcf8bf7 100644
--- a/substrate/frame/support/src/lib.rs
+++ b/substrate/frame/support/src/lib.rs
@@ -49,7 +49,7 @@ pub mod __private {
 	pub use sp_metadata_ir as metadata_ir;
 	#[cfg(feature = "std")]
 	pub use sp_runtime::{bounded_btree_map, bounded_vec};
-	pub use sp_runtime::{RuntimeDebug, StateVersion};
+	pub use sp_runtime::{traits::Dispatchable, RuntimeDebug, StateVersion};
 	#[cfg(feature = "std")]
 	pub use sp_state_machine::BasicExternalities;
 	pub use sp_std;
@@ -806,10 +806,7 @@ pub mod testing_prelude {
 /// Prelude to be used alongside pallet macro, for ease of use.
 pub mod pallet_prelude {
 	pub use crate::{
-		dispatch::{
-			DispatchClass, DispatchError, DispatchResult, DispatchResultWithPostInfo, Parameter,
-			Pays,
-		},
+		dispatch::{DispatchClass, DispatchResult, DispatchResultWithPostInfo, Parameter, Pays},
 		ensure,
 		inherent::{InherentData, InherentIdentifier, ProvideInherent},
 		storage,
@@ -855,7 +852,7 @@ pub mod pallet_prelude {
 			TransactionTag, TransactionValidity, TransactionValidityError, UnknownTransaction,
 			ValidTransaction,
 		},
-		RuntimeDebug, MAX_MODULE_ERROR_ENCODED_SIZE,
+		DispatchError, RuntimeDebug, MAX_MODULE_ERROR_ENCODED_SIZE,
 	};
 	pub use sp_std::marker::PhantomData;
 	pub use sp_weights::Weight;
@@ -1266,8 +1263,9 @@ pub mod pallet_prelude {
 /// Field types in enum variants must also implement [`PalletError`](traits::PalletError),
 /// otherwise the pallet will fail to compile. Rust primitive types have already implemented
 /// the [`PalletError`](traits::PalletError) trait along with some commonly used stdlib types
-/// such as [`Option`] and [`PhantomData`](`frame_support::dispatch::marker::PhantomData`), and
-/// hence in most use cases, a manual implementation is not necessary and is discouraged.
+/// such as [`Option`] and
+/// [`PhantomData`](`frame_support::__private::sp_std::marker::PhantomData`), and hence in most
+/// use cases, a manual implementation is not necessary and is discouraged.
 ///
 /// The generic `T` must not bound anything and a `where` clause is not allowed. That said,
 /// bounds and/or a where clause should not needed for any use-case.
@@ -1648,8 +1646,7 @@ pub mod pallet_prelude {
 /// the enum:
 ///
 /// ```ignore
-/// Copy, Clone, Eq, PartialEq, Ord, PartialOrd, Encode, Decode, MaxEncodedLen, TypeInfo,
-/// RuntimeDebug
+/// Copy, Clone, Eq, PartialEq, Encode, Decode, MaxEncodedLen, TypeInfo, RuntimeDebug
 /// ```
 ///
 /// The inverse is also true: if there are any #[derive] attributes present for the enum, then
@@ -1817,6 +1814,15 @@ pub mod pallet_prelude {
 /// 	#[pallet::origin]
 /// 	pub struct Origin<T>(PhantomData<T>);
 ///
+///     // Declare a hold reason (this is optional).
+///     //
+///     // Creates a hold reason for this pallet that is aggregated by `construct_runtime`.
+///     // A similar enum can be defined for `FreezeReason`, `LockId` or `SlashReason`.
+///     #[pallet::composite_enum]
+/// 	pub enum HoldReason {
+/// 		SomeHoldReason
+/// 	}
+///
 /// 	// Declare validate_unsigned implementation (this is optional).
 /// 	#[pallet::validate_unsigned]
 /// 	impl<T: Config> ValidateUnsigned for Pallet<T> {
@@ -1951,6 +1957,11 @@ pub mod pallet_prelude {
 /// 	#[pallet::origin]
 /// 	pub struct Origin<T, I = ()>(PhantomData<(T, I)>);
 ///
+///     #[pallet::composite_enum]
+/// 	pub enum HoldReason<I: 'static = ()> {
+/// 		SomeHoldReason
+/// 	}
+///
 /// 	#[pallet::validate_unsigned]
 /// 	impl<T: Config<I>, I: 'static> ValidateUnsigned for Pallet<T, I> {
 /// 		type Call = Call<T, I>;
@@ -2190,10 +2201,80 @@ pub mod pallet_macros {
 	pub use frame_support_procedural::{
 		call_index, compact, composite_enum, config, constant,
 		disable_frame_system_supertrait_check, error, event, extra_constants, generate_deposit,
-		generate_store, genesis_build, genesis_config, getter, hooks, import_section, inherent,
-		no_default, no_default_bounds, origin, pallet_section, storage, storage_prefix,
-		storage_version, type_value, unbounded, validate_unsigned, weight, whitelist_storage,
+		generate_store, getter, hooks, import_section, inherent, no_default, no_default_bounds,
+		origin, pallet_section, storage, storage_prefix, storage_version, type_value, unbounded,
+		validate_unsigned, weight, whitelist_storage,
 	};
+
+	/// Allows you to define the genesis configuration for the pallet.
+	///
+	/// Item is defined as either an enum or a struct. It needs to be public and implement the
+	/// trait [`frame_support::traits::BuildGenesisConfig`].
+	///
+	/// See [`genesis_build`] for an example.
+	pub use frame_support_procedural::genesis_config;
+
+	/// Allows you to define how the state of your pallet at genesis is built. This
+	/// takes as input the `GenesisConfig` type (as `self`) and constructs the pallet's initial
+	/// state.
+	///
+	/// The fields of the `GenesisConfig` can in turn be populated by the chain-spec.
+	///
+	/// ## Example:
+	///
+	/// ```
+	/// #[frame_support::pallet]
+	/// pub mod pallet {
+	/// # 	#[pallet::config]
+	/// # 	pub trait Config: frame_system::Config {}
+	/// # 	#[pallet::pallet]
+	/// # 	pub struct Pallet<T>(_);
+	/// # 	use frame_support::traits::BuildGenesisConfig;
+	///     #[pallet::genesis_config]
+	///     #[derive(frame_support::DefaultNoBound)]
+	///     pub struct GenesisConfig<T: Config> {
+	///         foo: Vec<T::AccountId>
+	///     }
+	///
+	///     #[pallet::genesis_build]
+	///     impl<T: Config> BuildGenesisConfig for GenesisConfig<T> {
+	///         fn build(&self) {
+	///             // use &self to access fields.
+	///             let foo = &self.foo;
+	///             todo!()
+	///         }
+	///     }
+	/// }
+	/// ```
+	///
+	/// ## Former Usage
+	///
+	/// Prior to <https://github.com/paritytech/substrate/pull/14306>, the following syntax was used.
+	/// This is deprecated and will soon be removed.
+	///
+	/// ```
+	/// #[frame_support::pallet]
+	/// pub mod pallet {
+	/// #     #[pallet::config]
+	/// #     pub trait Config: frame_system::Config {}
+	/// #     #[pallet::pallet]
+	/// #     pub struct Pallet<T>(_);
+	/// #     use frame_support::traits::GenesisBuild;
+	///     #[pallet::genesis_config]
+	///     #[derive(frame_support::DefaultNoBound)]
+	///     pub struct GenesisConfig<T: Config> {
+	/// 		foo: Vec<T::AccountId>
+	/// 	}
+	///
+	///     #[pallet::genesis_build]
+	///     impl<T: Config> GenesisBuild<T> for GenesisConfig<T> {
+	///         fn build(&self) {
+	///             todo!()
+	///         }
+	///     }
+	/// }
+	/// ```
+	pub use frame_support_procedural::genesis_build;
 }
 
 #[deprecated(note = "Will be removed after July 2023; Use `sp_runtime::traits` directly instead.")]
diff --git a/substrate/frame/support/src/migrations.rs b/substrate/frame/support/src/migrations.rs
index 19eec194a76ad4a2fa4a255d37aaa07882b1c013..8f490030c25b2b53b2c7ec6b3b3debdb61e7b5e8 100644
--- a/substrate/frame/support/src/migrations.rs
+++ b/substrate/frame/support/src/migrations.rs
@@ -24,13 +24,11 @@ use sp_core::Get;
 use sp_io::{hashing::twox_128, storage::clear_prefix, KillStorageResult};
 use sp_std::marker::PhantomData;
 
-/// EXPERIMENTAL: The API of this feature may change.
+/// Handles storage migration pallet versioning.
 ///
-/// Make it easier to write versioned runtime upgrades.
-///
-/// [`VersionedRuntimeUpgrade`] allows developers to write migrations without worrying about
-/// checking and setting storage versions. Instead, the developer wraps their migration in this
-/// struct which takes care of version handling using best practices.
+/// [`VersionedMigration`] allows developers to write migrations without worrying about checking and
+/// setting storage versions. Instead, the developer wraps their migration in this struct which
+/// takes care of version handling using best practices.
 ///
 /// It takes 5 type parameters:
 /// - `From`: The version being upgraded from.
@@ -39,11 +37,11 @@ use sp_std::marker::PhantomData;
 /// - `Pallet`: The Pallet being upgraded.
 /// - `Weight`: The runtime's RuntimeDbWeight implementation.
 ///
-/// When a [`VersionedRuntimeUpgrade`] `on_runtime_upgrade`, `pre_upgrade`, or `post_upgrade`
-/// method is called, the on-chain version of the pallet is compared to `From`. If they match, the
-/// `Inner` equivalent is called and the pallets on-chain version is set to `To` after the
-/// migration. Otherwise, a warning is logged notifying the developer that the upgrade was a noop
-/// and should probably be removed.
+/// When a [`VersionedMigration`] `on_runtime_upgrade`, `pre_upgrade`, or `post_upgrade` method is
+/// called, the on-chain version of the pallet is compared to `From`. If they match, the `Inner`
+/// equivalent is called and the pallets on-chain version is set to `To` after the migration.
+/// Otherwise, a warning is logged notifying the developer that the upgrade was a noop and should
+/// probably be removed.
 ///
 /// ### Examples
 /// ```ignore
@@ -54,7 +52,7 @@ use sp_std::marker::PhantomData;
 /// }
 ///
 /// pub type VersionCheckedMigrateV5ToV6<T, I> =
-/// 	VersionedRuntimeUpgrade<
+/// 	VersionedMigration<
 /// 		5,
 /// 		6,
 /// 		VersionUncheckedMigrateV5ToV6<T, I>,
@@ -69,14 +67,12 @@ use sp_std::marker::PhantomData;
 /// 	// other migrations...
 /// );
 /// ```
-#[cfg(feature = "experimental")]
-pub struct VersionedRuntimeUpgrade<const FROM: u16, const TO: u16, Inner, Pallet, Weight> {
+pub struct VersionedMigration<const FROM: u16, const TO: u16, Inner, Pallet, Weight> {
 	_marker: PhantomData<(Inner, Pallet, Weight)>,
 }
 
 /// A helper enum to wrap the pre_upgrade bytes like an Option before passing them to post_upgrade.
 /// This enum is used rather than an Option to make the API clearer to the developer.
-#[cfg(feature = "experimental")]
 #[derive(codec::Encode, codec::Decode)]
 pub enum VersionedPostUpgradeData {
 	/// The migration ran, inner vec contains pre_upgrade data.
@@ -85,20 +81,19 @@ pub enum VersionedPostUpgradeData {
 	Noop,
 }
 
-/// Implementation of the `OnRuntimeUpgrade` trait for `VersionedRuntimeUpgrade`.
+/// Implementation of the `OnRuntimeUpgrade` trait for `VersionedMigration`.
 ///
 /// Its main function is to perform the runtime upgrade in `on_runtime_upgrade` only if the on-chain
 /// version of the pallets storage matches `From`, and after the upgrade set the on-chain storage to
 /// `To`. If the versions do not match, it writes a log notifying the developer that the migration
 /// is a noop.
-#[cfg(feature = "experimental")]
 impl<
 		const FROM: u16,
 		const TO: u16,
 		Inner: crate::traits::OnRuntimeUpgrade,
 		Pallet: GetStorageVersion<CurrentStorageVersion = StorageVersion> + PalletInfoAccess,
 		DbWeight: Get<RuntimeDbWeight>,
-	> crate::traits::OnRuntimeUpgrade for VersionedRuntimeUpgrade<FROM, TO, Inner, Pallet, DbWeight>
+	> crate::traits::OnRuntimeUpgrade for VersionedMigration<FROM, TO, Inner, Pallet, DbWeight>
 {
 	/// Executes pre_upgrade if the migration will run, and wraps the pre_upgrade bytes in
 	/// [`VersionedPostUpgradeData`] before passing them to post_upgrade, so it knows whether the
@@ -158,7 +153,7 @@ impl<
 	) -> Result<(), sp_runtime::TryRuntimeError> {
 		use codec::DecodeAll;
 		match <VersionedPostUpgradeData>::decode_all(&mut &versioned_post_upgrade_data_bytes[..])
-			.map_err(|_| "VersionedRuntimeUpgrade post_upgrade failed to decode PreUpgradeData")?
+			.map_err(|_| "VersionedMigration post_upgrade failed to decode PreUpgradeData")?
 		{
 			VersionedPostUpgradeData::MigrationExecuted(inner_bytes) =>
 				Inner::post_upgrade(inner_bytes),
diff --git a/substrate/frame/support/src/storage/generator/double_map.rs b/substrate/frame/support/src/storage/generator/double_map.rs
index 00a3f1bc7c1ce3d4434766e2a32fa5d523db043d..a4c1f58203e3caf0cd200d0daf5b7b7aeba36702 100644
--- a/substrate/frame/support/src/storage/generator/double_map.rs
+++ b/substrate/frame/support/src/storage/generator/double_map.rs
@@ -33,7 +33,7 @@ use sp_std::prelude::*;
 ///
 /// Thus value for (key1, key2) is stored at:
 /// ```nocompile
-/// Twox128(module_prefix) ++ Twox128(storage_prefix) ++ Hasher1(encode(key1)) ++ Hasher2(encode(key2))
+/// Twox128(pallet_prefix) ++ Twox128(storage_prefix) ++ Hasher1(encode(key1)) ++ Hasher2(encode(key2))
 /// ```
 ///
 /// # Warning
@@ -53,18 +53,15 @@ pub trait StorageDoubleMap<K1: FullEncode, K2: FullEncode, V: FullCodec> {
 	/// Hasher for the second key.
 	type Hasher2: StorageHasher;
 
-	/// Module prefix. Used for generating final key.
-	fn module_prefix() -> &'static [u8];
+	/// Pallet prefix. Used for generating final key.
+	fn pallet_prefix() -> &'static [u8];
 
 	/// Storage prefix. Used for generating final key.
 	fn storage_prefix() -> &'static [u8];
 
-	/// The full prefix; just the hash of `module_prefix` concatenated to the hash of
+	/// The full prefix; just the hash of `pallet_prefix` concatenated to the hash of
 	/// `storage_prefix`.
-	fn prefix_hash() -> Vec<u8> {
-		let result = storage_prefix(Self::module_prefix(), Self::storage_prefix());
-		result.to_vec()
-	}
+	fn prefix_hash() -> [u8; 32];
 
 	/// Convert an optional value retrieved from storage to the type queried.
 	fn from_optional_value_to_query(v: Option<V>) -> Self::Query;
@@ -77,7 +74,7 @@ pub trait StorageDoubleMap<K1: FullEncode, K2: FullEncode, V: FullCodec> {
 	where
 		KArg1: EncodeLike<K1>,
 	{
-		let storage_prefix = storage_prefix(Self::module_prefix(), Self::storage_prefix());
+		let storage_prefix = storage_prefix(Self::pallet_prefix(), Self::storage_prefix());
 		let key_hashed = k1.using_encoded(Self::Hasher1::hash);
 
 		let mut final_key = Vec::with_capacity(storage_prefix.len() + key_hashed.as_ref().len());
@@ -94,7 +91,7 @@ pub trait StorageDoubleMap<K1: FullEncode, K2: FullEncode, V: FullCodec> {
 		KArg1: EncodeLike<K1>,
 		KArg2: EncodeLike<K2>,
 	{
-		let storage_prefix = storage_prefix(Self::module_prefix(), Self::storage_prefix());
+		let storage_prefix = storage_prefix(Self::pallet_prefix(), Self::storage_prefix());
 		let key1_hashed = k1.using_encoded(Self::Hasher1::hash);
 		let key2_hashed = k2.using_encoded(Self::Hasher2::hash);
 
@@ -334,7 +331,7 @@ where
 		key2: KeyArg2,
 	) -> Option<V> {
 		let old_key = {
-			let storage_prefix = storage_prefix(Self::module_prefix(), Self::storage_prefix());
+			let storage_prefix = storage_prefix(Self::pallet_prefix(), Self::storage_prefix());
 
 			let key1_hashed = key1.using_encoded(OldHasher1::hash);
 			let key2_hashed = key2.using_encoded(OldHasher2::hash);
@@ -419,7 +416,7 @@ where
 	}
 
 	fn iter() -> Self::Iterator {
-		let prefix = G::prefix_hash();
+		let prefix = G::prefix_hash().to_vec();
 		Self::Iterator {
 			prefix: prefix.clone(),
 			previous_key: prefix,
@@ -442,7 +439,7 @@ where
 	}
 
 	fn iter_keys() -> Self::FullKeyIterator {
-		let prefix = G::prefix_hash();
+		let prefix = G::prefix_hash().to_vec();
 		Self::FullKeyIterator {
 			prefix: prefix.clone(),
 			previous_key: prefix,
@@ -470,7 +467,7 @@ where
 	}
 
 	fn translate<O: Decode, F: FnMut(K1, K2, O) -> Option<V>>(mut f: F) {
-		let prefix = G::prefix_hash();
+		let prefix = G::prefix_hash().to_vec();
 		let mut previous_key = prefix.clone();
 		while let Some(next) =
 			sp_io::storage::next_key(&previous_key).filter(|n| n.starts_with(&prefix))
@@ -561,7 +558,7 @@ mod test_iterators {
 			type DoubleMap = self::frame_system::DoubleMap<Runtime>;
 
 			// All map iterator
-			let prefix = DoubleMap::prefix_hash();
+			let prefix = DoubleMap::prefix_hash().to_vec();
 
 			unhashed::put(&key_before_prefix(prefix.clone()), &1u64);
 			unhashed::put(&key_after_prefix(prefix.clone()), &1u64);
@@ -621,7 +618,7 @@ mod test_iterators {
 			assert_eq!(unhashed::get(&key_after_prefix(prefix.clone())), Some(1u64));
 
 			// Translate
-			let prefix = DoubleMap::prefix_hash();
+			let prefix = DoubleMap::prefix_hash().to_vec();
 
 			unhashed::put(&key_before_prefix(prefix.clone()), &1u64);
 			unhashed::put(&key_after_prefix(prefix.clone()), &1u64);
diff --git a/substrate/frame/support/src/storage/generator/map.rs b/substrate/frame/support/src/storage/generator/map.rs
index 90fac4b41c7592c29b7f38a781a39e3be186fd94..b2919bff8d134ca39c2f9c82f509c31373e4c822 100644
--- a/substrate/frame/support/src/storage/generator/map.rs
+++ b/substrate/frame/support/src/storage/generator/map.rs
@@ -21,7 +21,6 @@ use crate::{
 	Never,
 };
 use codec::{Decode, Encode, EncodeLike, FullCodec, FullEncode};
-use sp_std::borrow::Borrow;
 #[cfg(not(feature = "std"))]
 use sp_std::prelude::*;
 
@@ -29,7 +28,7 @@ use sp_std::prelude::*;
 ///
 /// By default each key value is stored at:
 /// ```nocompile
-/// Twox128(module_prefix) ++ Twox128(storage_prefix) ++ Hasher(encode(key))
+/// Twox128(pallet_prefix) ++ Twox128(storage_prefix) ++ Hasher(encode(key))
 /// ```
 ///
 /// # Warning
@@ -43,18 +42,15 @@ pub trait StorageMap<K: FullEncode, V: FullCodec> {
 	/// Hasher. Used for generating final key.
 	type Hasher: StorageHasher;
 
-	/// Module prefix. Used for generating final key.
-	fn module_prefix() -> &'static [u8];
+	/// Pallet prefix. Used for generating final key.
+	fn pallet_prefix() -> &'static [u8];
 
 	/// Storage prefix. Used for generating final key.
 	fn storage_prefix() -> &'static [u8];
 
-	/// The full prefix; just the hash of `module_prefix` concatenated to the hash of
+	/// The full prefix; just the hash of `pallet_prefix` concatenated to the hash of
 	/// `storage_prefix`.
-	fn prefix_hash() -> Vec<u8> {
-		let result = storage_prefix(Self::module_prefix(), Self::storage_prefix());
-		result.to_vec()
-	}
+	fn prefix_hash() -> [u8; 32];
 
 	/// Convert an optional value retrieved from storage to the type queried.
 	fn from_optional_value_to_query(v: Option<V>) -> Self::Query;
@@ -67,7 +63,7 @@ pub trait StorageMap<K: FullEncode, V: FullCodec> {
 	where
 		KeyArg: EncodeLike<K>,
 	{
-		let storage_prefix = storage_prefix(Self::module_prefix(), Self::storage_prefix());
+		let storage_prefix = storage_prefix(Self::pallet_prefix(), Self::storage_prefix());
 		let key_hashed = key.using_encoded(Self::Hasher::hash);
 
 		let mut final_key = Vec::with_capacity(storage_prefix.len() + key_hashed.as_ref().len());
@@ -129,7 +125,7 @@ where
 
 	/// Enumerate all elements in the map.
 	fn iter() -> Self::Iterator {
-		let prefix = G::prefix_hash();
+		let prefix = G::prefix_hash().to_vec();
 		PrefixIterator {
 			prefix: prefix.clone(),
 			previous_key: prefix,
@@ -151,7 +147,7 @@ where
 
 	/// Enumerate all keys in the map.
 	fn iter_keys() -> Self::KeyIterator {
-		let prefix = G::prefix_hash();
+		let prefix = G::prefix_hash().to_vec();
 		KeyPrefixIterator {
 			prefix: prefix.clone(),
 			previous_key: prefix,
@@ -191,7 +187,7 @@ where
 		previous_key: Option<Vec<u8>>,
 		mut f: F,
 	) -> Option<Vec<u8>> {
-		let prefix = G::prefix_hash();
+		let prefix = G::prefix_hash().to_vec();
 		let previous_key = previous_key.unwrap_or_else(|| prefix.clone());
 
 		let current_key =
@@ -297,7 +293,7 @@ impl<K: FullEncode, V: FullCodec, G: StorageMap<K, V>> storage::StorageMap<K, V>
 		let ret = f(&mut val);
 		if ret.is_ok() {
 			match G::from_query_to_optional_value(val) {
-				Some(ref val) => unhashed::put(final_key.as_ref(), &val.borrow()),
+				Some(ref val) => unhashed::put(final_key.as_ref(), &val),
 				None => unhashed::kill(final_key.as_ref()),
 			}
 		}
@@ -314,7 +310,7 @@ impl<K: FullEncode, V: FullCodec, G: StorageMap<K, V>> storage::StorageMap<K, V>
 		let ret = f(&mut val);
 		if ret.is_ok() {
 			match val {
-				Some(ref val) => unhashed::put(final_key.as_ref(), &val.borrow()),
+				Some(ref val) => unhashed::put(final_key.as_ref(), &val),
 				None => unhashed::kill(final_key.as_ref()),
 			}
 		}
@@ -340,7 +336,7 @@ impl<K: FullEncode, V: FullCodec, G: StorageMap<K, V>> storage::StorageMap<K, V>
 
 	fn migrate_key<OldHasher: StorageHasher, KeyArg: EncodeLike<K>>(key: KeyArg) -> Option<V> {
 		let old_key = {
-			let storage_prefix = storage_prefix(Self::module_prefix(), Self::storage_prefix());
+			let storage_prefix = storage_prefix(Self::pallet_prefix(), Self::storage_prefix());
 			let key_hashed = key.using_encoded(OldHasher::hash);
 
 			let mut final_key =
@@ -399,7 +395,7 @@ mod test_iterators {
 			type Map = self::frame_system::Map<Runtime>;
 
 			// All map iterator
-			let prefix = Map::prefix_hash();
+			let prefix = Map::prefix_hash().to_vec();
 
 			unhashed::put(&key_before_prefix(prefix.clone()), &1u64);
 			unhashed::put(&key_after_prefix(prefix.clone()), &1u64);
@@ -421,7 +417,7 @@ mod test_iterators {
 			assert_eq!(unhashed::get(&key_after_prefix(prefix.clone())), Some(1u64));
 
 			// Translate
-			let prefix = Map::prefix_hash();
+			let prefix = Map::prefix_hash().to_vec();
 
 			unhashed::put(&key_before_prefix(prefix.clone()), &1u64);
 			unhashed::put(&key_after_prefix(prefix.clone()), &1u64);
diff --git a/substrate/frame/support/src/storage/generator/nmap.rs b/substrate/frame/support/src/storage/generator/nmap.rs
index 5d3d689aa98a6f378666333677df77197fbc4e04..4b49ad3eb38d434a897ed2b1020156e541b02a96 100755
--- a/substrate/frame/support/src/storage/generator/nmap.rs
+++ b/substrate/frame/support/src/storage/generator/nmap.rs
@@ -61,18 +61,15 @@ pub trait StorageNMap<K: KeyGenerator, V: FullCodec> {
 	/// The type that get/take returns.
 	type Query;
 
-	/// Module prefix. Used for generating final key.
-	fn module_prefix() -> &'static [u8];
+	/// Pallet prefix. Used for generating final key.
+	fn pallet_prefix() -> &'static [u8];
 
 	/// Storage prefix. Used for generating final key.
 	fn storage_prefix() -> &'static [u8];
 
-	/// The full prefix; just the hash of `module_prefix` concatenated to the hash of
+	/// The full prefix; just the hash of `pallet_prefix` concatenated to the hash of
 	/// `storage_prefix`.
-	fn prefix_hash() -> Vec<u8> {
-		let result = storage_prefix(Self::module_prefix(), Self::storage_prefix());
-		result.to_vec()
-	}
+	fn prefix_hash() -> [u8; 32];
 
 	/// Convert an optional value retrieved from storage to the type queried.
 	fn from_optional_value_to_query(v: Option<V>) -> Self::Query;
@@ -85,7 +82,7 @@ pub trait StorageNMap<K: KeyGenerator, V: FullCodec> {
 	where
 		K: HasKeyPrefix<KP>,
 	{
-		let storage_prefix = storage_prefix(Self::module_prefix(), Self::storage_prefix());
+		let storage_prefix = storage_prefix(Self::pallet_prefix(), Self::storage_prefix());
 		let key_hashed = <K as HasKeyPrefix<KP>>::partial_key(key);
 
 		let mut final_key = Vec::with_capacity(storage_prefix.len() + key_hashed.len());
@@ -102,7 +99,7 @@ pub trait StorageNMap<K: KeyGenerator, V: FullCodec> {
 		KG: KeyGenerator,
 		KArg: EncodeLikeTuple<KG::KArg> + TupleToEncodedIter,
 	{
-		let storage_prefix = storage_prefix(Self::module_prefix(), Self::storage_prefix());
+		let storage_prefix = storage_prefix(Self::pallet_prefix(), Self::storage_prefix());
 		let key_hashed = KG::final_key(key);
 
 		let mut final_key = Vec::with_capacity(storage_prefix.len() + key_hashed.len());
@@ -299,7 +296,7 @@ where
 		KArg: EncodeLikeTuple<K::KArg> + TupleToEncodedIter,
 	{
 		let old_key = {
-			let storage_prefix = storage_prefix(Self::module_prefix(), Self::storage_prefix());
+			let storage_prefix = storage_prefix(Self::pallet_prefix(), Self::storage_prefix());
 			let key_hashed = K::migrate_key(&key, hash_fns);
 
 			let mut final_key = Vec::with_capacity(storage_prefix.len() + key_hashed.len());
@@ -386,11 +383,11 @@ impl<K: ReversibleKeyGenerator, V: FullCodec, G: StorageNMap<K, V>>
 	}
 
 	fn iter() -> Self::Iterator {
-		Self::iter_from(G::prefix_hash())
+		Self::iter_from(G::prefix_hash().to_vec())
 	}
 
 	fn iter_from(starting_raw_key: Vec<u8>) -> Self::Iterator {
-		let prefix = G::prefix_hash();
+		let prefix = G::prefix_hash().to_vec();
 		Self::Iterator {
 			prefix,
 			previous_key: starting_raw_key,
@@ -404,11 +401,11 @@ impl<K: ReversibleKeyGenerator, V: FullCodec, G: StorageNMap<K, V>>
 	}
 
 	fn iter_keys() -> Self::KeyIterator {
-		Self::iter_keys_from(G::prefix_hash())
+		Self::iter_keys_from(G::prefix_hash().to_vec())
 	}
 
 	fn iter_keys_from(starting_raw_key: Vec<u8>) -> Self::KeyIterator {
-		let prefix = G::prefix_hash();
+		let prefix = G::prefix_hash().to_vec();
 		Self::KeyIterator {
 			prefix,
 			previous_key: starting_raw_key,
@@ -427,7 +424,7 @@ impl<K: ReversibleKeyGenerator, V: FullCodec, G: StorageNMap<K, V>>
 	}
 
 	fn translate<O: Decode, F: FnMut(K::Key, O) -> Option<V>>(mut f: F) {
-		let prefix = G::prefix_hash();
+		let prefix = G::prefix_hash().to_vec();
 		let mut previous_key = prefix.clone();
 		while let Some(next) =
 			sp_io::storage::next_key(&previous_key).filter(|n| n.starts_with(&prefix))
@@ -537,7 +534,7 @@ mod test_iterators {
 			type NMap = self::frame_system::NMap<Runtime>;
 
 			// All map iterator
-			let prefix = NMap::prefix_hash();
+			let prefix = NMap::prefix_hash().to_vec();
 
 			unhashed::put(&key_before_prefix(prefix.clone()), &1u64);
 			unhashed::put(&key_after_prefix(prefix.clone()), &1u64);
@@ -594,7 +591,7 @@ mod test_iterators {
 			assert_eq!(unhashed::get(&key_after_prefix(prefix.clone())), Some(1u64));
 
 			// Translate
-			let prefix = NMap::prefix_hash();
+			let prefix = NMap::prefix_hash().to_vec();
 
 			unhashed::put(&key_before_prefix(prefix.clone()), &1u64);
 			unhashed::put(&key_after_prefix(prefix.clone()), &1u64);
diff --git a/substrate/frame/support/src/storage/generator/value.rs b/substrate/frame/support/src/storage/generator/value.rs
index 4ffe40bac53ca231f10e25cf521f3f4d7df02de3..21166b39467bb2def5ea3aee089b92af6e9ecaaf 100644
--- a/substrate/frame/support/src/storage/generator/value.rs
+++ b/substrate/frame/support/src/storage/generator/value.rs
@@ -25,14 +25,14 @@ use codec::{Decode, Encode, EncodeLike, FullCodec};
 ///
 /// By default value is stored at:
 /// ```nocompile
-/// Twox128(module_prefix) ++ Twox128(storage_prefix)
+/// Twox128(pallet_prefix) ++ Twox128(storage_prefix)
 /// ```
 pub trait StorageValue<T: FullCodec> {
 	/// The type that get/take returns.
 	type Query;
 
-	/// Module prefix. Used for generating final key.
-	fn module_prefix() -> &'static [u8];
+	/// Pallet prefix. Used for generating final key.
+	fn pallet_prefix() -> &'static [u8];
 
 	/// Storage prefix. Used for generating final key.
 	fn storage_prefix() -> &'static [u8];
@@ -44,9 +44,7 @@ pub trait StorageValue<T: FullCodec> {
 	fn from_query_to_optional_value(v: Self::Query) -> Option<T>;
 
 	/// Generate the full key used in top storage.
-	fn storage_value_final_key() -> [u8; 32] {
-		crate::storage::storage_prefix(Self::module_prefix(), Self::storage_prefix())
-	}
+	fn storage_value_final_key() -> [u8; 32];
 }
 
 impl<T: FullCodec, G: StorageValue<T>> storage::StorageValue<T> for G {
@@ -97,10 +95,6 @@ impl<T: FullCodec, G: StorageValue<T>> storage::StorageValue<T> for G {
 		}
 	}
 
-	fn kill() {
-		unhashed::kill(&Self::storage_value_final_key())
-	}
-
 	fn mutate<R, F: FnOnce(&mut G::Query) -> R>(f: F) -> R {
 		Self::try_mutate(|v| Ok::<R, Never>(f(v))).expect("`Never` can not be constructed; qed")
 	}
@@ -142,6 +136,10 @@ impl<T: FullCodec, G: StorageValue<T>> storage::StorageValue<T> for G {
 		ret
 	}
 
+	fn kill() {
+		unhashed::kill(&Self::storage_value_final_key())
+	}
+
 	fn take() -> G::Query {
 		let key = Self::storage_value_final_key();
 		let value = unhashed::get(&key);
diff --git a/substrate/frame/support/src/storage/mod.rs b/substrate/frame/support/src/storage/mod.rs
index d52908fa366c6cc144a4027bcafade19e50fe2dd..851b0687bd12268019f64987bbb92ac2a3231ccb 100644
--- a/substrate/frame/support/src/storage/mod.rs
+++ b/substrate/frame/support/src/storage/mod.rs
@@ -191,7 +191,7 @@ pub trait StorageList<V: FullCodec> {
 
 	/// Append a single element.
 	///
-	/// Should not be called repeatedly; use `append_many` instead.  
+	/// Should not be called repeatedly; use `append_many` instead.
 	/// Worst case linear `O(len)` with `len` being the number if elements in the list.
 	fn append_one<EncodeLikeValue>(item: EncodeLikeValue)
 	where
@@ -202,7 +202,7 @@ pub trait StorageList<V: FullCodec> {
 
 	/// Append many elements.
 	///
-	/// Should not be called repeatedly; use `appender` instead.  
+	/// Should not be called repeatedly; use `appender` instead.
 	/// Worst case linear `O(len + items.count())` with `len` beings the number if elements in the
 	/// list.
 	fn append_many<EncodeLikeValue, I>(items: I)
@@ -1273,15 +1273,15 @@ impl<T> Iterator for ChildTriePrefixIterator<T> {
 
 /// Trait for storage types that store all its value after a unique prefix.
 pub trait StoragePrefixedContainer {
-	/// Module prefix. Used for generating final key.
-	fn module_prefix() -> &'static [u8];
+	/// Pallet prefix. Used for generating final key.
+	fn pallet_prefix() -> &'static [u8];
 
 	/// Storage prefix. Used for generating final key.
 	fn storage_prefix() -> &'static [u8];
 
 	/// Final full prefix that prefixes all keys.
 	fn final_prefix() -> [u8; 32] {
-		crate::storage::storage_prefix(Self::module_prefix(), Self::storage_prefix())
+		crate::storage::storage_prefix(Self::pallet_prefix(), Self::storage_prefix())
 	}
 }
 
@@ -1289,18 +1289,18 @@ pub trait StoragePrefixedContainer {
 ///
 /// By default the final prefix is:
 /// ```nocompile
-/// Twox128(module_prefix) ++ Twox128(storage_prefix)
+/// Twox128(pallet_prefix) ++ Twox128(storage_prefix)
 /// ```
 pub trait StoragePrefixedMap<Value: FullCodec> {
-	/// Module prefix. Used for generating final key.
-	fn module_prefix() -> &'static [u8]; // TODO move to StoragePrefixedContainer
+	/// Pallet prefix. Used for generating final key.
+	fn pallet_prefix() -> &'static [u8]; // TODO move to StoragePrefixedContainer
 
 	/// Storage prefix. Used for generating final key.
 	fn storage_prefix() -> &'static [u8];
 
 	/// Final full prefix that prefixes all keys.
 	fn final_prefix() -> [u8; 32] {
-		crate::storage::storage_prefix(Self::module_prefix(), Self::storage_prefix())
+		crate::storage::storage_prefix(Self::pallet_prefix(), Self::storage_prefix())
 	}
 
 	/// Remove all values in the overlay and up to `limit` in the backend.
@@ -1624,7 +1624,7 @@ mod test {
 		TestExternalities::default().execute_with(|| {
 			struct MyStorage;
 			impl StoragePrefixedMap<u64> for MyStorage {
-				fn module_prefix() -> &'static [u8] {
+				fn pallet_prefix() -> &'static [u8] {
 					b"MyModule"
 				}
 
@@ -1701,7 +1701,7 @@ mod test {
 			impl generator::StorageValue<Digest> for Storage {
 				type Query = Digest;
 
-				fn module_prefix() -> &'static [u8] {
+				fn pallet_prefix() -> &'static [u8] {
 					b"MyModule"
 				}
 
@@ -1716,6 +1716,10 @@ mod test {
 				fn from_query_to_optional_value(v: Self::Query) -> Option<Digest> {
 					Some(v)
 				}
+
+				fn storage_value_final_key() -> [u8; 32] {
+					storage_prefix(Self::pallet_prefix(), Self::storage_prefix())
+				}
 			}
 
 			Storage::append(DigestItem::Other(Vec::new()));
@@ -1736,7 +1740,7 @@ mod test {
 				type Query = u64;
 				type Hasher = Twox64Concat;
 
-				fn module_prefix() -> &'static [u8] {
+				fn pallet_prefix() -> &'static [u8] {
 					b"MyModule"
 				}
 
@@ -1744,6 +1748,10 @@ mod test {
 					b"MyStorageMap"
 				}
 
+				fn prefix_hash() -> [u8; 32] {
+					storage_prefix(Self::pallet_prefix(), Self::storage_prefix())
+				}
+
 				fn from_optional_value_to_query(v: Option<u64>) -> Self::Query {
 					v.unwrap_or_default()
 				}
diff --git a/substrate/frame/support/src/storage/storage_noop_guard.rs b/substrate/frame/support/src/storage/storage_noop_guard.rs
index d00e6e18ecc484e3139ea27e25e3d580871c8c3c..c4d40fa99a35cef9a05d55b71f27de1717a72cee 100644
--- a/substrate/frame/support/src/storage/storage_noop_guard.rs
+++ b/substrate/frame/support/src/storage/storage_noop_guard.rs
@@ -37,15 +37,38 @@
 /// });
 /// ```
 #[must_use]
-pub struct StorageNoopGuard(sp_std::vec::Vec<u8>);
+pub struct StorageNoopGuard<'a> {
+	storage_root: sp_std::vec::Vec<u8>,
+	error_message: &'a str,
+}
 
-impl Default for StorageNoopGuard {
+impl<'a> Default for StorageNoopGuard<'a> {
 	fn default() -> Self {
-		Self(sp_io::storage::root(sp_runtime::StateVersion::V1))
+		Self {
+			storage_root: sp_io::storage::root(sp_runtime::StateVersion::V1),
+			error_message: "`StorageNoopGuard` detected an attempted storage change.",
+		}
+	}
+}
+
+impl<'a> StorageNoopGuard<'a> {
+	/// Alias to `default()`.
+	pub fn new() -> Self {
+		Self::default()
+	}
+
+	/// Creates a new [`StorageNoopGuard`] with a custom error message.
+	pub fn from_error_message(error_message: &'a str) -> Self {
+		Self { storage_root: sp_io::storage::root(sp_runtime::StateVersion::V1), error_message }
+	}
+
+	/// Sets a custom error message for a [`StorageNoopGuard`].
+	pub fn set_error_message(&mut self, error_message: &'a str) {
+		self.error_message = error_message;
 	}
 }
 
-impl Drop for StorageNoopGuard {
+impl<'a> Drop for StorageNoopGuard<'a> {
 	fn drop(&mut self) {
 		// No need to double panic, eg. inside a test assertion failure.
 		if sp_std::thread::panicking() {
@@ -53,8 +76,9 @@ impl Drop for StorageNoopGuard {
 		}
 		assert_eq!(
 			sp_io::storage::root(sp_runtime::StateVersion::V1),
-			self.0,
-			"StorageNoopGuard detected wrongful storage changes.",
+			self.storage_root,
+			"{}",
+			self.error_message,
 		);
 	}
 }
@@ -65,7 +89,7 @@ mod tests {
 	use sp_io::TestExternalities;
 
 	#[test]
-	#[should_panic(expected = "StorageNoopGuard detected wrongful storage changes.")]
+	#[should_panic(expected = "`StorageNoopGuard` detected an attempted storage change.")]
 	fn storage_noop_guard_panics_on_changed() {
 		TestExternalities::default().execute_with(|| {
 			let _guard = StorageNoopGuard::default();
@@ -83,7 +107,7 @@ mod tests {
 	}
 
 	#[test]
-	#[should_panic(expected = "StorageNoopGuard detected wrongful storage changes.")]
+	#[should_panic(expected = "`StorageNoopGuard` detected an attempted storage change.")]
 	fn storage_noop_guard_panics_on_early_drop() {
 		TestExternalities::default().execute_with(|| {
 			let guard = StorageNoopGuard::default();
@@ -111,4 +135,34 @@ mod tests {
 			panic!("Something else");
 		});
 	}
+
+	#[test]
+	#[should_panic(expected = "`StorageNoopGuard` found unexpected storage changes.")]
+	fn storage_noop_guard_panics_created_from_error_message() {
+		TestExternalities::default().execute_with(|| {
+			let _guard = StorageNoopGuard::from_error_message(
+				"`StorageNoopGuard` found unexpected storage changes.",
+			);
+			frame_support::storage::unhashed::put(b"key", b"value");
+		});
+	}
+
+	#[test]
+	#[should_panic(expected = "`StorageNoopGuard` found unexpected storage changes.")]
+	fn storage_noop_guard_panics_with_set_error_message() {
+		TestExternalities::default().execute_with(|| {
+			let mut guard = StorageNoopGuard::default();
+			guard.set_error_message("`StorageNoopGuard` found unexpected storage changes.");
+			frame_support::storage::unhashed::put(b"key", b"value");
+		});
+	}
+
+	#[test]
+	#[should_panic(expected = "`StorageNoopGuard` detected an attempted storage change.")]
+	fn storage_noop_guard_panics_new_alias() {
+		TestExternalities::default().execute_with(|| {
+			let _guard = StorageNoopGuard::new();
+			frame_support::storage::unhashed::put(b"key", b"value");
+		});
+	}
 }
diff --git a/substrate/frame/support/src/storage/types/counted_map.rs b/substrate/frame/support/src/storage/types/counted_map.rs
index 5b750a74098b8395a4234a7db562b52e254a8f63..50e2c678248c9aa34dddeaaec09b6ddeec0be348 100644
--- a/substrate/frame/support/src/storage/types/counted_map.rs
+++ b/substrate/frame/support/src/storage/types/counted_map.rs
@@ -107,7 +107,7 @@ where
 	/// The prefix used to generate the key of the map.
 	pub fn map_storage_final_prefix() -> Vec<u8> {
 		use crate::storage::generator::StorageMap;
-		<Self as MapWrapper>::Map::prefix_hash()
+		<Self as MapWrapper>::Map::prefix_hash().to_vec()
 	}
 
 	/// Get the storage key used to fetch a value corresponding to a specific key.
diff --git a/substrate/frame/support/src/storage/types/counted_nmap.rs b/substrate/frame/support/src/storage/types/counted_nmap.rs
index 7dbcb74f000537b0f2a6c067d7594f529763a554..5da31c05922541f0cbc7c987d09fa79894c02569 100644
--- a/substrate/frame/support/src/storage/types/counted_nmap.rs
+++ b/substrate/frame/support/src/storage/types/counted_nmap.rs
@@ -1,6 +1,6 @@
 // This file is part of Substrate.
 
-// Copyright (C) 2021-2022 Parity Technologies (UK) Ltd.
+// Copyright (C) Parity Technologies (UK) Ltd.
 // SPDX-License-Identifier: Apache-2.0
 
 // Licensed under the Apache License, Version 2.0 (the "License");
@@ -104,7 +104,7 @@ where
 	/// The prefix used to generate the key of the map.
 	pub fn map_storage_final_prefix() -> Vec<u8> {
 		use crate::storage::generator::StorageNMap;
-		<Self as MapWrapper>::Map::prefix_hash()
+		<Self as MapWrapper>::Map::prefix_hash().to_vec()
 	}
 
 	/// Get the storage key used to fetch a value corresponding to a specific key.
diff --git a/substrate/frame/support/src/storage/types/double_map.rs b/substrate/frame/support/src/storage/types/double_map.rs
index e787921841032f3f0cbada6fd0ff0d4ab665dd59..519ffcbafadee09dbfbaf4f78ea76939cf34a64b 100644
--- a/substrate/frame/support/src/storage/types/double_map.rs
+++ b/substrate/frame/support/src/storage/types/double_map.rs
@@ -117,12 +117,17 @@ where
 	type Query = QueryKind::Query;
 	type Hasher1 = Hasher1;
 	type Hasher2 = Hasher2;
-	fn module_prefix() -> &'static [u8] {
+	fn pallet_prefix() -> &'static [u8] {
 		Prefix::pallet_prefix().as_bytes()
 	}
+
 	fn storage_prefix() -> &'static [u8] {
 		Prefix::STORAGE_PREFIX.as_bytes()
 	}
+	fn prefix_hash() -> [u8; 32] {
+		Prefix::prefix_hash()
+	}
+
 	fn from_optional_value_to_query(v: Option<Value>) -> Self::Query {
 		QueryKind::from_optional_value_to_query(v)
 	}
@@ -145,8 +150,8 @@ where
 	OnEmpty: Get<QueryKind::Query> + 'static,
 	MaxValues: Get<Option<u32>>,
 {
-	fn module_prefix() -> &'static [u8] {
-		<Self as crate::storage::generator::StorageDoubleMap<Key1, Key2, Value>>::module_prefix()
+	fn pallet_prefix() -> &'static [u8] {
+		<Self as crate::storage::generator::StorageDoubleMap<Key1, Key2, Value>>::pallet_prefix()
 	}
 	fn storage_prefix() -> &'static [u8] {
 		<Self as crate::storage::generator::StorageDoubleMap<Key1, Key2, Value>>::storage_prefix()
@@ -691,7 +696,7 @@ where
 {
 	fn storage_info() -> Vec<StorageInfo> {
 		vec![StorageInfo {
-			pallet_name: Self::module_prefix().to_vec(),
+			pallet_name: Self::pallet_prefix().to_vec(),
 			storage_name: Self::storage_prefix().to_vec(),
 			prefix: Self::final_prefix().to_vec(),
 			max_values: MaxValues::get(),
@@ -722,7 +727,7 @@ where
 {
 	fn partial_storage_info() -> Vec<StorageInfo> {
 		vec![StorageInfo {
-			pallet_name: Self::module_prefix().to_vec(),
+			pallet_name: Self::pallet_prefix().to_vec(),
 			storage_name: Self::storage_prefix().to_vec(),
 			prefix: Self::final_prefix().to_vec(),
 			max_values: MaxValues::get(),
diff --git a/substrate/frame/support/src/storage/types/map.rs b/substrate/frame/support/src/storage/types/map.rs
index 816b90162f644b88b620b218bef36e6ff952c051..7f936a8a35a61c4d8d23aa3c1d0aebe315ee6229 100644
--- a/substrate/frame/support/src/storage/types/map.rs
+++ b/substrate/frame/support/src/storage/types/map.rs
@@ -83,12 +83,15 @@ where
 {
 	type Query = QueryKind::Query;
 	type Hasher = Hasher;
-	fn module_prefix() -> &'static [u8] {
+	fn pallet_prefix() -> &'static [u8] {
 		Prefix::pallet_prefix().as_bytes()
 	}
 	fn storage_prefix() -> &'static [u8] {
 		Prefix::STORAGE_PREFIX.as_bytes()
 	}
+	fn prefix_hash() -> [u8; 32] {
+		Prefix::prefix_hash()
+	}
 	fn from_optional_value_to_query(v: Option<Value>) -> Self::Query {
 		QueryKind::from_optional_value_to_query(v)
 	}
@@ -108,8 +111,8 @@ where
 	OnEmpty: Get<QueryKind::Query> + 'static,
 	MaxValues: Get<Option<u32>>,
 {
-	fn module_prefix() -> &'static [u8] {
-		<Self as crate::storage::generator::StorageMap<Key, Value>>::module_prefix()
+	fn pallet_prefix() -> &'static [u8] {
+		<Self as crate::storage::generator::StorageMap<Key, Value>>::pallet_prefix()
 	}
 	fn storage_prefix() -> &'static [u8] {
 		<Self as crate::storage::generator::StorageMap<Key, Value>>::storage_prefix()
@@ -469,7 +472,7 @@ where
 {
 	fn storage_info() -> Vec<StorageInfo> {
 		vec![StorageInfo {
-			pallet_name: Self::module_prefix().to_vec(),
+			pallet_name: Self::pallet_prefix().to_vec(),
 			storage_name: Self::storage_prefix().to_vec(),
 			prefix: Self::final_prefix().to_vec(),
 			max_values: MaxValues::get(),
@@ -497,7 +500,7 @@ where
 {
 	fn partial_storage_info() -> Vec<StorageInfo> {
 		vec![StorageInfo {
-			pallet_name: Self::module_prefix().to_vec(),
+			pallet_name: Self::pallet_prefix().to_vec(),
 			storage_name: Self::storage_prefix().to_vec(),
 			prefix: Self::final_prefix().to_vec(),
 			max_values: MaxValues::get(),
diff --git a/substrate/frame/support/src/storage/types/nmap.rs b/substrate/frame/support/src/storage/types/nmap.rs
index e9a4b12dd43a16ea6713ea59a821959bbea20e51..406fd42eaf7b3773e960f4489d5ede2b090ca0a2 100755
--- a/substrate/frame/support/src/storage/types/nmap.rs
+++ b/substrate/frame/support/src/storage/types/nmap.rs
@@ -72,12 +72,15 @@ where
 	MaxValues: Get<Option<u32>>,
 {
 	type Query = QueryKind::Query;
-	fn module_prefix() -> &'static [u8] {
+	fn pallet_prefix() -> &'static [u8] {
 		Prefix::pallet_prefix().as_bytes()
 	}
 	fn storage_prefix() -> &'static [u8] {
 		Prefix::STORAGE_PREFIX.as_bytes()
 	}
+	fn prefix_hash() -> [u8; 32] {
+		Prefix::prefix_hash()
+	}
 	fn from_optional_value_to_query(v: Option<Value>) -> Self::Query {
 		QueryKind::from_optional_value_to_query(v)
 	}
@@ -96,8 +99,8 @@ where
 	OnEmpty: Get<QueryKind::Query> + 'static,
 	MaxValues: Get<Option<u32>>,
 {
-	fn module_prefix() -> &'static [u8] {
-		<Self as crate::storage::generator::StorageNMap<Key, Value>>::module_prefix()
+	fn pallet_prefix() -> &'static [u8] {
+		<Self as crate::storage::generator::StorageNMap<Key, Value>>::pallet_prefix()
 	}
 	fn storage_prefix() -> &'static [u8] {
 		<Self as crate::storage::generator::StorageNMap<Key, Value>>::storage_prefix()
@@ -581,7 +584,7 @@ where
 {
 	fn storage_info() -> Vec<StorageInfo> {
 		vec![StorageInfo {
-			pallet_name: Self::module_prefix().to_vec(),
+			pallet_name: Self::pallet_prefix().to_vec(),
 			storage_name: Self::storage_prefix().to_vec(),
 			prefix: Self::final_prefix().to_vec(),
 			max_values: MaxValues::get(),
@@ -607,7 +610,7 @@ where
 {
 	fn partial_storage_info() -> Vec<StorageInfo> {
 		vec![StorageInfo {
-			pallet_name: Self::module_prefix().to_vec(),
+			pallet_name: Self::pallet_prefix().to_vec(),
 			storage_name: Self::storage_prefix().to_vec(),
 			prefix: Self::final_prefix().to_vec(),
 			max_values: MaxValues::get(),
diff --git a/substrate/frame/support/src/storage/types/value.rs b/substrate/frame/support/src/storage/types/value.rs
index 3c7f24715ac94026b3bea3c1aeb5eb7a775b41ed..3e1f2fe9551d3578678959b09b9a4c60fa962c07 100644
--- a/substrate/frame/support/src/storage/types/value.rs
+++ b/substrate/frame/support/src/storage/types/value.rs
@@ -49,7 +49,7 @@ where
 	OnEmpty: crate::traits::Get<QueryKind::Query> + 'static,
 {
 	type Query = QueryKind::Query;
-	fn module_prefix() -> &'static [u8] {
+	fn pallet_prefix() -> &'static [u8] {
 		Prefix::pallet_prefix().as_bytes()
 	}
 	fn storage_prefix() -> &'static [u8] {
@@ -61,6 +61,9 @@ where
 	fn from_query_to_optional_value(v: Self::Query) -> Option<Value> {
 		QueryKind::from_query_to_optional_value(v)
 	}
+	fn storage_value_final_key() -> [u8; 32] {
+		Prefix::prefix_hash()
+	}
 }
 
 impl<Prefix, Value, QueryKind, OnEmpty> StorageValue<Prefix, Value, QueryKind, OnEmpty>
@@ -251,7 +254,7 @@ where
 {
 	fn storage_info() -> Vec<StorageInfo> {
 		vec![StorageInfo {
-			pallet_name: Self::module_prefix().to_vec(),
+			pallet_name: Self::pallet_prefix().to_vec(),
 			storage_name: Self::storage_prefix().to_vec(),
 			prefix: Self::hashed_key().to_vec(),
 			max_values: Some(1),
@@ -271,7 +274,7 @@ where
 {
 	fn partial_storage_info() -> Vec<StorageInfo> {
 		vec![StorageInfo {
-			pallet_name: Self::module_prefix().to_vec(),
+			pallet_name: Self::pallet_prefix().to_vec(),
 			storage_name: Self::storage_prefix().to_vec(),
 			prefix: Self::hashed_key().to_vec(),
 			max_values: Some(1),
diff --git a/substrate/frame/support/src/tests/mod.rs b/substrate/frame/support/src/tests/mod.rs
index db458880db6836eaedacd6ad44d269adca290933..3690159c5994d98d265eadf7c0a623f4630eede3 100644
--- a/substrate/frame/support/src/tests/mod.rs
+++ b/substrate/frame/support/src/tests/mod.rs
@@ -647,3 +647,17 @@ fn check_storage_parameter_type_works() {
 		assert_eq!(300, StorageParameter::get());
 	})
 }
+
+#[test]
+fn derive_partial_eq_no_bound_core_mod() {
+	mod core {}
+
+	#[derive(
+		crate::PartialEqNoBound,
+		crate::CloneNoBound,
+		crate::DebugNoBound,
+		crate::DefaultNoBound,
+		crate::EqNoBound,
+	)]
+	struct Test;
+}
diff --git a/substrate/frame/support/src/tests/storage_alias.rs b/substrate/frame/support/src/tests/storage_alias.rs
index 05ea1b5f712c631bc731f9444621d7f8c20f8b81..6fc5cfefdad19722c68aba672fabcad9ad54f036 100644
--- a/substrate/frame/support/src/tests/storage_alias.rs
+++ b/substrate/frame/support/src/tests/storage_alias.rs
@@ -112,7 +112,7 @@ fn verbatim_attribute() {
 		assert_eq!(1, Value::get().unwrap());
 
 		// The prefix is the one we declared above.
-		assert_eq!(&b"Test"[..], Value::module_prefix());
+		assert_eq!(&b"Test"[..], Value::pallet_prefix());
 	});
 }
 
@@ -130,7 +130,7 @@ fn pallet_name_attribute() {
 
 		// The prefix is the pallet name. In this case the pallet name is `System` as declared in
 		// `construct_runtime!`.
-		assert_eq!(&b"System"[..], Value::<Runtime>::module_prefix());
+		assert_eq!(&b"System"[..], Value::<Runtime>::pallet_prefix());
 	});
 }
 
@@ -154,7 +154,7 @@ fn dynamic_attribute() {
 		assert_eq!(1, Value::<Prefix>::get().unwrap());
 
 		// The prefix is the one we declared above.
-		assert_eq!(&b"Hello"[..], Value::<Prefix>::module_prefix());
+		assert_eq!(&b"Hello"[..], Value::<Prefix>::pallet_prefix());
 	});
 }
 
@@ -166,13 +166,13 @@ fn storage_alias_guess() {
 		#[crate::storage_alias]
 		pub type Value = StorageValue<Test, u32>;
 
-		assert_eq!(&b"Test"[..], Value::module_prefix());
+		assert_eq!(&b"Test"[..], Value::pallet_prefix());
 
 		// The macro will use the pallet name as prefix.
 		#[crate::storage_alias]
 		pub type PalletValue<T: Config> = StorageValue<Pallet<T>, u32>;
 
-		assert_eq!(&b"System"[..], PalletValue::<Runtime>::module_prefix());
+		assert_eq!(&b"System"[..], PalletValue::<Runtime>::pallet_prefix());
 	});
 }
 
diff --git a/substrate/frame/support/src/traits.rs b/substrate/frame/support/src/traits.rs
index f669046f858f44d8013311abdf778b4f7be56d49..2179ee38f8481e19ce2ba3ccc83a16415a8b25c3 100644
--- a/substrate/frame/support/src/traits.rs
+++ b/substrate/frame/support/src/traits.rs
@@ -90,8 +90,8 @@ pub use hooks::{
 pub mod schedule;
 mod storage;
 pub use storage::{
-	Incrementable, Instance, PartialStorageInfoTrait, StorageInfo, StorageInfoTrait,
-	StorageInstance, TrackedStorageKey, WhitelistedStorageKeys,
+	Consideration, Footprint, Incrementable, Instance, LinearStoragePrice, PartialStorageInfoTrait,
+	StorageInfo, StorageInfoTrait, StorageInstance, TrackedStorageKey, WhitelistedStorageKeys,
 };
 
 mod dispatch;
@@ -107,13 +107,12 @@ mod voting;
 pub use voting::{ClassCountOf, PollStatus, Polling, VoteTally};
 
 mod preimages;
-pub use preimages::{Bounded, BoundedInline, FetchResult, Hash, QueryPreimage, StorePreimage};
+pub use preimages::{Bounded, BoundedInline, FetchResult, QueryPreimage, StorePreimage};
 
 mod messages;
 pub use messages::{
-	EnqueueMessage, EnqueueWithOrigin, ExecuteOverweightError, Footprint, HandleMessage,
-	NoopServiceQueues, ProcessMessage, ProcessMessageError, QueuePausedQuery, ServiceQueues,
-	TransformOrigin,
+	EnqueueMessage, EnqueueWithOrigin, ExecuteOverweightError, HandleMessage, NoopServiceQueues,
+	ProcessMessage, ProcessMessageError, QueuePausedQuery, ServiceQueues, TransformOrigin,
 };
 
 mod safe_mode;
diff --git a/substrate/frame/support/src/traits/hooks.rs b/substrate/frame/support/src/traits/hooks.rs
index 6163c048e75d854e601aaad3e50cd89e03b38d90..6acecb8928d8fa76ab122b299d27f5e626c0e6f3 100644
--- a/substrate/frame/support/src/traits/hooks.rs
+++ b/substrate/frame/support/src/traits/hooks.rs
@@ -359,7 +359,7 @@ pub trait Hooks<BlockNumber> {
 	/// done. This is helpful to prevent accidental repetitive execution of this hook, which can be
 	/// catastrophic.
 	///
-	/// Alternatively, `migrations::VersionedRuntimeUpgrade` can be used to assist with
+	/// Alternatively, [`frame_support::migrations::VersionedMigration`] can be used to assist with
 	/// this.
 	///
 	/// ## Implementation Note: Runtime Level Migration
@@ -442,7 +442,7 @@ pub trait Hooks<BlockNumber> {
 /// A trait to define the build function of a genesis config for both runtime and pallets.
 ///
 /// Replaces deprecated [`GenesisBuild<T,I>`].
-pub trait BuildGenesisConfig: Default + sp_runtime::traits::MaybeSerializeDeserialize {
+pub trait BuildGenesisConfig: sp_runtime::traits::MaybeSerializeDeserialize {
 	/// The build function puts initial `GenesisConfig` keys/values pairs into the storage.
 	fn build(&self);
 }
@@ -452,7 +452,7 @@ pub trait BuildGenesisConfig: Default + sp_runtime::traits::MaybeSerializeDeseri
 #[deprecated(
 	note = "GenesisBuild is planned to be removed in December 2023. Use BuildGenesisConfig instead of it."
 )]
-pub trait GenesisBuild<T, I = ()>: Default + sp_runtime::traits::MaybeSerializeDeserialize {
+pub trait GenesisBuild<T, I = ()>: sp_runtime::traits::MaybeSerializeDeserialize {
 	/// The build function is called within an externalities allowing storage APIs.
 	/// Thus one can write to storage using regular pallet storages.
 	fn build(&self);
diff --git a/substrate/frame/support/src/traits/messages.rs b/substrate/frame/support/src/traits/messages.rs
index 36fa7957dff7c3891053eddc1f33b29da20366de..0db163e072b179100a44c0c39dcc76b35c02b997 100644
--- a/substrate/frame/support/src/traits/messages.rs
+++ b/substrate/frame/support/src/traits/messages.rs
@@ -17,6 +17,7 @@
 
 //! Traits for managing message queuing and handling.
 
+use super::storage::Footprint;
 use codec::{Decode, Encode, FullCodec, MaxEncodedLen};
 use scale_info::TypeInfo;
 use sp_core::{ConstU32, Get, TypedGet};
@@ -115,13 +116,6 @@ impl<OverweightAddr> ServiceQueues for NoopServiceQueues<OverweightAddr> {
 	}
 }
 
-/// The resource footprint of a queue.
-#[derive(Default, Copy, Clone, Eq, PartialEq, RuntimeDebug)]
-pub struct Footprint {
-	pub count: u64,
-	pub size: u64,
-}
-
 /// Can enqueue messages for multiple origins.
 pub trait EnqueueMessage<Origin: MaxEncodedLen> {
 	/// The maximal length any enqueued message may have.
diff --git a/substrate/frame/support/src/traits/metadata.rs b/substrate/frame/support/src/traits/metadata.rs
index 85d8f9a5a74e0ddfa3bf592908d0e2fb8f434e49..bd29b600916138828d7b78a4f3c4a416598c4f3b 100644
--- a/substrate/frame/support/src/traits/metadata.rs
+++ b/substrate/frame/support/src/traits/metadata.rs
@@ -31,6 +31,8 @@ pub trait PalletInfo {
 	fn index<P: 'static>() -> Option<usize>;
 	/// Convert the given pallet `P` into its name as configured in the runtime.
 	fn name<P: 'static>() -> Option<&'static str>;
+	/// The two128 hash of name.
+	fn name_hash<P: 'static>() -> Option<[u8; 16]>;
 	/// Convert the given pallet `P` into its Rust module name as used in `construct_runtime!`.
 	fn module_name<P: 'static>() -> Option<&'static str>;
 	/// Convert the given pallet `P` into its containing crate version.
@@ -59,6 +61,8 @@ pub trait PalletInfoAccess {
 	fn index() -> usize;
 	/// Name of the pallet as configured in the runtime.
 	fn name() -> &'static str;
+	/// Two128 hash of name.
+	fn name_hash() -> [u8; 16];
 	/// Name of the Rust module containing the pallet.
 	fn module_name() -> &'static str;
 	/// Version of the crate containing the pallet.
@@ -281,6 +285,7 @@ pub trait GetStorageVersion {
 #[cfg(test)]
 mod tests {
 	use super::*;
+	use sp_core::twox_128;
 
 	struct Pallet1;
 	impl PalletInfoAccess for Pallet1 {
@@ -290,6 +295,9 @@ mod tests {
 		fn name() -> &'static str {
 			"Pallet1"
 		}
+		fn name_hash() -> [u8; 16] {
+			twox_128(Self::name().as_bytes())
+		}
 		fn module_name() -> &'static str {
 			"pallet1"
 		}
@@ -305,6 +313,11 @@ mod tests {
 		fn name() -> &'static str {
 			"Pallet2"
 		}
+
+		fn name_hash() -> [u8; 16] {
+			twox_128(Self::name().as_bytes())
+		}
+
 		fn module_name() -> &'static str {
 			"pallet2"
 		}
diff --git a/substrate/frame/support/src/traits/preimages.rs b/substrate/frame/support/src/traits/preimages.rs
index 3e78116202b4f0d0a3d85561a06bb095e56b2815..647af029c16dce07f998e34c30cb076f6a670d4c 100644
--- a/substrate/frame/support/src/traits/preimages.rs
+++ b/substrate/frame/support/src/traits/preimages.rs
@@ -15,47 +15,47 @@
 // See the License for the specific language governing permissions and
 // limitations under the License.
 
-//! Stuff for dealing with 32-byte hashed preimages.
+//! Stuff for dealing with hashed preimages.
 
 use codec::{Decode, Encode, EncodeLike, MaxEncodedLen};
-use sp_core::{RuntimeDebug, H256};
-use sp_io::hashing::blake2_256;
-use sp_runtime::{traits::ConstU32, DispatchError};
+use scale_info::TypeInfo;
+use sp_core::RuntimeDebug;
+use sp_runtime::{
+	traits::{ConstU32, Hash},
+	DispatchError,
+};
 use sp_std::borrow::Cow;
 
-pub type Hash = H256;
 pub type BoundedInline = crate::BoundedVec<u8, ConstU32<128>>;
 
 /// The maximum we expect a single legacy hash lookup to be.
 const MAX_LEGACY_LEN: u32 = 1_000_000;
 
-#[derive(
-	Encode, Decode, MaxEncodedLen, Clone, Eq, PartialEq, scale_info::TypeInfo, RuntimeDebug,
-)]
+#[derive(Encode, Decode, MaxEncodedLen, Clone, Eq, PartialEq, TypeInfo, RuntimeDebug)]
 #[codec(mel_bound())]
-pub enum Bounded<T> {
-	/// A Blake2 256 hash with no preimage length. We
-	/// do not support creation of this except for transitioning from legacy state.
-	/// In the future we will make this a pure `Dummy` item storing only the final `dummy` field.
-	Legacy { hash: Hash, dummy: sp_std::marker::PhantomData<T> },
+pub enum Bounded<T, H: Hash> {
+	/// A hash with no preimage length. We do not support creation of this except
+	/// for transitioning from legacy state. In the future we will make this a pure
+	/// `Dummy` item storing only the final `dummy` field.
+	Legacy { hash: H::Output, dummy: sp_std::marker::PhantomData<T> },
 	/// A an bounded `Call`. Its encoding must be at most 128 bytes.
 	Inline(BoundedInline),
-	/// A Blake2-256 hash of the call together with an upper limit for its size.
-	Lookup { hash: Hash, len: u32 },
+	/// A hash of the call together with an upper limit for its size.`
+	Lookup { hash: H::Output, len: u32 },
 }
 
-impl<T> Bounded<T> {
+impl<T, H: Hash> Bounded<T, H> {
 	/// Casts the wrapped type into something that encodes alike.
 	///
 	/// # Examples
 	/// ```
-	/// use frame_support::traits::Bounded;
+	/// use frame_support::{traits::Bounded, sp_runtime::traits::BlakeTwo256};
 	///
 	/// // Transmute from `String` to `&str`.
-	/// let x: Bounded<String> = Bounded::Inline(Default::default());
-	/// let _: Bounded<&str> = x.transmute();
+	/// let x: Bounded<String, BlakeTwo256> = Bounded::Inline(Default::default());
+	/// let _: Bounded<&str, BlakeTwo256> = x.transmute();
 	/// ```
-	pub fn transmute<S: Encode>(self) -> Bounded<S>
+	pub fn transmute<S: Encode>(self) -> Bounded<S, H>
 	where
 		T: Encode + EncodeLike<S>,
 	{
@@ -70,18 +70,18 @@ impl<T> Bounded<T> {
 	/// Returns the hash of the preimage.
 	///
 	/// The hash is re-calculated every time if the preimage is inlined.
-	pub fn hash(&self) -> Hash {
+	pub fn hash(&self) -> H::Output {
 		use Bounded::*;
 		match self {
 			Lookup { hash, .. } | Legacy { hash, .. } => *hash,
-			Inline(x) => blake2_256(x.as_ref()).into(),
+			Inline(x) => <H as Hash>::hash(x.as_ref()),
 		}
 	}
 
 	/// Returns the hash to lookup the preimage.
 	///
 	/// If this is a `Bounded::Inline`, `None` is returned as no lookup is required.
-	pub fn lookup_hash(&self) -> Option<Hash> {
+	pub fn lookup_hash(&self) -> Option<H::Output> {
 		use Bounded::*;
 		match self {
 			Lookup { hash, .. } | Legacy { hash, .. } => Some(*hash),
@@ -116,13 +116,13 @@ impl<T> Bounded<T> {
 	}
 
 	/// Constructs a `Lookup` bounded item.
-	pub fn unrequested(hash: Hash, len: u32) -> Self {
+	pub fn unrequested(hash: H::Output, len: u32) -> Self {
 		Self::Lookup { hash, len }
 	}
 
 	/// Constructs a `Legacy` bounded item.
 	#[deprecated = "This API is only for transitioning to Scheduler v3 API"]
-	pub fn from_legacy_hash(hash: impl Into<Hash>) -> Self {
+	pub fn from_legacy_hash(hash: impl Into<H::Output>) -> Self {
 		Self::Legacy { hash: hash.into(), dummy: sp_std::marker::PhantomData }
 	}
 }
@@ -131,24 +131,27 @@ pub type FetchResult = Result<Cow<'static, [u8]>, DispatchError>;
 
 /// A interface for looking up preimages from their hash on chain.
 pub trait QueryPreimage {
+	/// The hasher used in the runtime.
+	type H: Hash;
+
 	/// Returns whether a preimage exists for a given hash and if so its length.
-	fn len(hash: &Hash) -> Option<u32>;
+	fn len(hash: &<Self::H as sp_core::Hasher>::Out) -> Option<u32>;
 
 	/// Returns the preimage for a given hash. If given, `len` must be the size of the preimage.
-	fn fetch(hash: &Hash, len: Option<u32>) -> FetchResult;
+	fn fetch(hash: &<Self::H as sp_core::Hasher>::Out, len: Option<u32>) -> FetchResult;
 
 	/// Returns whether a preimage request exists for a given hash.
-	fn is_requested(hash: &Hash) -> bool;
+	fn is_requested(hash: &<Self::H as sp_core::Hasher>::Out) -> bool;
 
 	/// Request that someone report a preimage. Providers use this to optimise the economics for
 	/// preimage reporting.
-	fn request(hash: &Hash);
+	fn request(hash: &<Self::H as sp_core::Hasher>::Out);
 
 	/// Cancel a previous preimage request.
-	fn unrequest(hash: &Hash);
+	fn unrequest(hash: &<Self::H as sp_core::Hasher>::Out);
 
 	/// Request that the data required for decoding the given `bounded` value is made available.
-	fn hold<T>(bounded: &Bounded<T>) {
+	fn hold<T>(bounded: &Bounded<T, Self::H>) {
 		use Bounded::*;
 		match bounded {
 			Inline(..) => {},
@@ -158,7 +161,7 @@ pub trait QueryPreimage {
 
 	/// No longer request that the data required for decoding the given `bounded` value is made
 	/// available.
-	fn drop<T>(bounded: &Bounded<T>) {
+	fn drop<T>(bounded: &Bounded<T, Self::H>) {
 		use Bounded::*;
 		match bounded {
 			Inline(..) => {},
@@ -168,7 +171,7 @@ pub trait QueryPreimage {
 
 	/// Check to see if all data required for the given `bounded` value is available for its
 	/// decoding.
-	fn have<T>(bounded: &Bounded<T>) -> bool {
+	fn have<T>(bounded: &Bounded<T, Self::H>) -> bool {
 		use Bounded::*;
 		match bounded {
 			Inline(..) => true,
@@ -181,7 +184,7 @@ pub trait QueryPreimage {
 	/// It also directly requests the given `hash` using [`Self::request`].
 	///
 	/// This may not be `peek`-able or `realize`-able.
-	fn pick<T>(hash: Hash, len: u32) -> Bounded<T> {
+	fn pick<T>(hash: <Self::H as sp_core::Hasher>::Out, len: u32) -> Bounded<T, Self::H> {
 		Self::request(&hash);
 		Bounded::Lookup { hash, len }
 	}
@@ -191,7 +194,7 @@ pub trait QueryPreimage {
 	///
 	/// NOTE: This does not remove any data needed for realization. If you will no longer use the
 	/// `bounded`, call `realize` instead or call `drop` afterwards.
-	fn peek<T: Decode>(bounded: &Bounded<T>) -> Result<(T, Option<u32>), DispatchError> {
+	fn peek<T: Decode>(bounded: &Bounded<T, Self::H>) -> Result<(T, Option<u32>), DispatchError> {
 		use Bounded::*;
 		match bounded {
 			Inline(data) => T::decode(&mut &data[..]).ok().map(|x| (x, None)),
@@ -210,7 +213,9 @@ pub trait QueryPreimage {
 	/// Convert the given `bounded` value back into its original instance. If successful,
 	/// `drop` any data backing it. This will not break the realisability of independently
 	/// created instances of `Bounded` which happen to have identical data.
-	fn realize<T: Decode>(bounded: &Bounded<T>) -> Result<(T, Option<u32>), DispatchError> {
+	fn realize<T: Decode>(
+		bounded: &Bounded<T, Self::H>,
+	) -> Result<(T, Option<u32>), DispatchError> {
 		let r = Self::peek(bounded)?;
 		Self::drop(bounded);
 		Ok(r)
@@ -231,11 +236,11 @@ pub trait StorePreimage: QueryPreimage {
 	/// Request and attempt to store the bytes of a preimage on chain.
 	///
 	/// May return `DispatchError::Exhausted` if the preimage is just too big.
-	fn note(bytes: Cow<[u8]>) -> Result<Hash, DispatchError>;
+	fn note(bytes: Cow<[u8]>) -> Result<<Self::H as sp_core::Hasher>::Out, DispatchError>;
 
 	/// Attempt to clear a previously noted preimage. Exactly the same as `unrequest` but is
 	/// provided for symmetry.
-	fn unnote(hash: &Hash) {
+	fn unnote(hash: &<Self::H as sp_core::Hasher>::Out) {
 		Self::unrequest(hash)
 	}
 
@@ -245,7 +250,7 @@ pub trait StorePreimage: QueryPreimage {
 	///
 	/// NOTE: Once this API is used, you should use either `drop` or `realize`.
 	/// The value is also noted using [`Self::note`].
-	fn bound<T: Encode>(t: T) -> Result<Bounded<T>, DispatchError> {
+	fn bound<T: Encode>(t: T) -> Result<Bounded<T, Self::H>, DispatchError> {
 		let data = t.encode();
 		let len = data.len() as u32;
 		Ok(match BoundedInline::try_from(data) {
@@ -256,22 +261,24 @@ pub trait StorePreimage: QueryPreimage {
 }
 
 impl QueryPreimage for () {
-	fn len(_: &Hash) -> Option<u32> {
+	type H = sp_runtime::traits::BlakeTwo256;
+
+	fn len(_: &sp_core::H256) -> Option<u32> {
 		None
 	}
-	fn fetch(_: &Hash, _: Option<u32>) -> FetchResult {
+	fn fetch(_: &sp_core::H256, _: Option<u32>) -> FetchResult {
 		Err(DispatchError::Unavailable)
 	}
-	fn is_requested(_: &Hash) -> bool {
+	fn is_requested(_: &sp_core::H256) -> bool {
 		false
 	}
-	fn request(_: &Hash) {}
-	fn unrequest(_: &Hash) {}
+	fn request(_: &sp_core::H256) {}
+	fn unrequest(_: &sp_core::H256) {}
 }
 
 impl StorePreimage for () {
 	const MAX_LENGTH: usize = 0;
-	fn note(_: Cow<[u8]>) -> Result<Hash, DispatchError> {
+	fn note(_: Cow<[u8]>) -> Result<sp_core::H256, DispatchError> {
 		Err(DispatchError::Exhausted)
 	}
 }
@@ -280,22 +287,22 @@ impl StorePreimage for () {
 mod tests {
 	use super::*;
 	use crate::BoundedVec;
-	use sp_runtime::bounded_vec;
+	use sp_runtime::{bounded_vec, traits::BlakeTwo256};
 
 	#[test]
 	fn bounded_size_is_correct() {
-		assert_eq!(<Bounded<Vec<u8>> as MaxEncodedLen>::max_encoded_len(), 131);
+		assert_eq!(<Bounded<Vec<u8>, BlakeTwo256> as MaxEncodedLen>::max_encoded_len(), 131);
 	}
 
 	#[test]
 	fn bounded_basic_works() {
 		let data: BoundedVec<u8, _> = bounded_vec![b'a', b'b', b'c'];
 		let len = data.len() as u32;
-		let hash = blake2_256(&data).into();
+		let hash = BlakeTwo256::hash(&data).into();
 
 		// Inline works
 		{
-			let bound: Bounded<Vec<u8>> = Bounded::Inline(data.clone());
+			let bound: Bounded<Vec<u8>, BlakeTwo256> = Bounded::Inline(data.clone());
 			assert_eq!(bound.hash(), hash);
 			assert_eq!(bound.len(), Some(len));
 			assert!(!bound.lookup_needed());
@@ -303,7 +310,8 @@ mod tests {
 		}
 		// Legacy works
 		{
-			let bound: Bounded<Vec<u8>> = Bounded::Legacy { hash, dummy: Default::default() };
+			let bound: Bounded<Vec<u8>, BlakeTwo256> =
+				Bounded::Legacy { hash, dummy: Default::default() };
 			assert_eq!(bound.hash(), hash);
 			assert_eq!(bound.len(), None);
 			assert!(bound.lookup_needed());
@@ -311,7 +319,8 @@ mod tests {
 		}
 		// Lookup works
 		{
-			let bound: Bounded<Vec<u8>> = Bounded::Lookup { hash, len: data.len() as u32 };
+			let bound: Bounded<Vec<u8>, BlakeTwo256> =
+				Bounded::Lookup { hash, len: data.len() as u32 };
 			assert_eq!(bound.hash(), hash);
 			assert_eq!(bound.len(), Some(len));
 			assert!(bound.lookup_needed());
@@ -324,8 +333,8 @@ mod tests {
 		let data: BoundedVec<u8, _> = bounded_vec![b'a', b'b', b'c'];
 
 		// Transmute a `String` into a `&str`.
-		let x: Bounded<String> = Bounded::Inline(data.clone());
-		let y: Bounded<&str> = x.transmute();
+		let x: Bounded<String, BlakeTwo256> = Bounded::Inline(data.clone());
+		let y: Bounded<&str, BlakeTwo256> = x.transmute();
 		assert_eq!(y, Bounded::Inline(data));
 	}
 }
diff --git a/substrate/frame/support/src/traits/schedule.rs b/substrate/frame/support/src/traits/schedule.rs
index 74a5951142d522861b568e28023a791a493ac4e6..7a7d1357da1e7dba9588866d07d734f2a8fedda8 100644
--- a/substrate/frame/support/src/traits/schedule.rs
+++ b/substrate/frame/support/src/traits/schedule.rs
@@ -387,6 +387,8 @@ pub mod v3 {
 	pub trait Anon<BlockNumber, Call, Origin> {
 		/// An address which can be used for removing a scheduled task.
 		type Address: Codec + MaxEncodedLen + Clone + Eq + EncodeLike + Debug + TypeInfo;
+		/// The hasher used in the runtime.
+		type Hasher: sp_runtime::traits::Hash;
 
 		/// Schedule a dispatch to happen at the beginning of some block in the future.
 		///
@@ -396,7 +398,7 @@ pub mod v3 {
 			maybe_periodic: Option<Period<BlockNumber>>,
 			priority: Priority,
 			origin: Origin,
-			call: Bounded<Call>,
+			call: Bounded<Call, Self::Hasher>,
 		) -> Result<Self::Address, DispatchError>;
 
 		/// Cancel a scheduled task. If periodic, then it will cancel all further instances of that,
@@ -434,6 +436,8 @@ pub mod v3 {
 	pub trait Named<BlockNumber, Call, Origin> {
 		/// An address which can be used for removing a scheduled task.
 		type Address: Codec + MaxEncodedLen + Clone + Eq + EncodeLike + sp_std::fmt::Debug;
+		/// The hasher used in the runtime.
+		type Hasher: sp_runtime::traits::Hash;
 
 		/// Schedule a dispatch to happen at the beginning of some block in the future.
 		///
@@ -446,7 +450,7 @@ pub mod v3 {
 			maybe_periodic: Option<Period<BlockNumber>>,
 			priority: Priority,
 			origin: Origin,
-			call: Bounded<Call>,
+			call: Bounded<Call, Self::Hasher>,
 		) -> Result<Self::Address, DispatchError>;
 
 		/// Cancel a scheduled, named task. If periodic, then it will cancel all further instances
diff --git a/substrate/frame/support/src/traits/storage.rs b/substrate/frame/support/src/traits/storage.rs
index 64eddf51b7fabb160dfd9b09c2cd3c98bf7c317b..fe1b9bf13bb0209be2f44d5017e2a1af8345b58d 100644
--- a/substrate/frame/support/src/traits/storage.rs
+++ b/substrate/frame/support/src/traits/storage.rs
@@ -17,9 +17,16 @@
 
 //! Traits for encoding data related to pallet's storage items.
 
+use codec::{Encode, FullCodec, MaxEncodedLen};
+use core::marker::PhantomData;
 use impl_trait_for_tuples::impl_for_tuples;
+use scale_info::TypeInfo;
 pub use sp_core::storage::TrackedStorageKey;
-use sp_runtime::{traits::Saturating, RuntimeDebug};
+use sp_core::Get;
+use sp_runtime::{
+	traits::{Convert, Member, Saturating},
+	DispatchError, RuntimeDebug,
+};
 use sp_std::{collections::btree_set::BTreeSet, prelude::*};
 
 /// An instance of a pallet in the storage.
@@ -54,8 +61,35 @@ pub trait StorageInstance {
 	/// Prefix of a pallet to isolate it from other pallets.
 	fn pallet_prefix() -> &'static str;
 
+	/// Return the prefix hash of pallet instance.
+	///
+	/// NOTE: This hash must be `twox_128(pallet_prefix())`.
+	/// Should not impl this function by hand. Only use the default or macro generated impls.
+	fn pallet_prefix_hash() -> [u8; 16] {
+		sp_io::hashing::twox_128(Self::pallet_prefix().as_bytes())
+	}
+
 	/// Prefix given to a storage to isolate from other storages in the pallet.
 	const STORAGE_PREFIX: &'static str;
+
+	/// Return the prefix hash of storage instance.
+	///
+	/// NOTE: This hash must be `twox_128(STORAGE_PREFIX)`.
+	fn storage_prefix_hash() -> [u8; 16] {
+		sp_io::hashing::twox_128(Self::STORAGE_PREFIX.as_bytes())
+	}
+
+	/// Return the prefix hash of instance.
+	///
+	/// NOTE: This hash must be `twox_128(pallet_prefix())++twox_128(STORAGE_PREFIX)`.
+	/// Should not impl this function by hand. Only use the default or macro generated impls.
+	fn prefix_hash() -> [u8; 32] {
+		let mut final_key = [0u8; 32];
+		final_key[..16].copy_from_slice(&Self::pallet_prefix_hash());
+		final_key[16..].copy_from_slice(&Self::storage_prefix_hash());
+
+		final_key
+	}
 }
 
 /// Metadata about storage from the runtime.
@@ -127,6 +161,89 @@ impl WhitelistedStorageKeys for Tuple {
 	}
 }
 
+/// The resource footprint of a bunch of blobs. We assume only the number of blobs and their total
+/// size in bytes matter.
+#[derive(Default, Copy, Clone, Eq, PartialEq, RuntimeDebug)]
+pub struct Footprint {
+	/// The number of blobs.
+	pub count: u64,
+	/// The total size of the blobs in bytes.
+	pub size: u64,
+}
+
+impl Footprint {
+	pub fn from_parts(items: usize, len: usize) -> Self {
+		Self { count: items as u64, size: len as u64 }
+	}
+
+	pub fn from_encodable(e: impl Encode) -> Self {
+		Self::from_parts(1, e.encoded_size())
+	}
+}
+
+/// A storage price that increases linearly with the number of elements and their size.
+pub struct LinearStoragePrice<Base, Slope, Balance>(PhantomData<(Base, Slope, Balance)>);
+impl<Base, Slope, Balance> Convert<Footprint, Balance> for LinearStoragePrice<Base, Slope, Balance>
+where
+	Base: Get<Balance>,
+	Slope: Get<Balance>,
+	Balance: From<u64> + sp_runtime::Saturating,
+{
+	fn convert(a: Footprint) -> Balance {
+		let s: Balance = (a.count.saturating_mul(a.size)).into();
+		s.saturating_mul(Slope::get()).saturating_add(Base::get())
+	}
+}
+
+/// Some sort of cost taken from account temporarily in order to offset the cost to the chain of
+/// holding some data [`Footprint`] in state.
+///
+/// The cost may be increased, reduced or dropped entirely as the footprint changes.
+///
+/// A single ticket corresponding to some particular datum held in storage. This is an opaque
+/// type, but must itself be stored and generally it should be placed alongside whatever data
+/// the ticket was created for.
+///
+/// While not technically a linear type owing to the need for `FullCodec`, *this should be
+/// treated as one*. Don't type to duplicate it, and remember to drop it when you're done with
+/// it.
+#[must_use]
+pub trait Consideration<AccountId>: Member + FullCodec + TypeInfo + MaxEncodedLen {
+	/// Create a ticket for the `new` footprint attributable to `who`. This ticket *must* ultimately
+	/// be consumed through `update` or `drop` once the footprint changes or is removed.
+	fn new(who: &AccountId, new: Footprint) -> Result<Self, DispatchError>;
+
+	/// Optionally consume an old ticket and alter the footprint, enforcing the new cost to `who`
+	/// and returning the new ticket (or an error if there was an issue).
+	///
+	/// For creating tickets and dropping them, you can use the simpler `new` and `drop` instead.
+	fn update(self, who: &AccountId, new: Footprint) -> Result<Self, DispatchError>;
+
+	/// Consume a ticket for some `old` footprint attributable to `who` which should now been freed.
+	fn drop(self, who: &AccountId) -> Result<(), DispatchError>;
+
+	/// Consume a ticket for some `old` footprint attributable to `who` which should be sacrificed.
+	///
+	/// This is infallible. In the general case (and it is left unimplemented), then it is
+	/// equivalent to the consideration never being dropped. Cases which can handle this properly
+	/// should implement, but it *MUST* rely on the loss of the consideration to the owner.
+	fn burn(self, _: &AccountId) {
+		let _ = self;
+	}
+}
+
+impl<A> Consideration<A> for () {
+	fn new(_: &A, _: Footprint) -> Result<Self, DispatchError> {
+		Ok(())
+	}
+	fn update(self, _: &A, _: Footprint) -> Result<(), DispatchError> {
+		Ok(())
+	}
+	fn drop(self, _: &A) -> Result<(), DispatchError> {
+		Ok(())
+	}
+}
+
 macro_rules! impl_incrementable {
 	($($type:ty),+) => {
 		$(
@@ -165,3 +282,25 @@ where
 }
 
 impl_incrementable!(u8, u16, u32, u64, u128, i8, i16, i32, i64, i128);
+
+#[cfg(test)]
+mod tests {
+	use super::*;
+	use sp_core::ConstU64;
+
+	#[test]
+	fn linear_storage_price_works() {
+		type Linear = LinearStoragePrice<ConstU64<7>, ConstU64<3>, u64>;
+		let p = |count, size| Linear::convert(Footprint { count, size });
+
+		assert_eq!(p(0, 0), 7);
+		assert_eq!(p(0, 1), 7);
+		assert_eq!(p(1, 0), 7);
+
+		assert_eq!(p(1, 1), 10);
+		assert_eq!(p(8, 1), 31);
+		assert_eq!(p(1, 8), 31);
+
+		assert_eq!(p(u64::MAX, u64::MAX), u64::MAX);
+	}
+}
diff --git a/substrate/frame/support/src/traits/tokens.rs b/substrate/frame/support/src/traits/tokens.rs
index 253b49c6671f80fe0e05792b9095dcb3ab22032d..3635311e64357bbd2e7041d653a4268dfb65a182 100644
--- a/substrate/frame/support/src/traits/tokens.rs
+++ b/substrate/frame/support/src/traits/tokens.rs
@@ -31,6 +31,7 @@ pub mod pay;
 pub use misc::{
 	AssetId, Balance, BalanceStatus, ConversionFromAssetBalance, ConversionToAssetBalance,
 	ConvertRank, DepositConsequence, ExistenceRequirement, Fortitude, GetSalary, Locker, Precision,
-	Preservation, Provenance, Restriction, WithdrawConsequence, WithdrawReasons,
+	Preservation, Provenance, Restriction, UnityAssetBalanceConversion, WithdrawConsequence,
+	WithdrawReasons,
 };
 pub use pay::{Pay, PayFromAccount, PaymentStatus};
diff --git a/substrate/frame/support/src/traits/tokens/currency.rs b/substrate/frame/support/src/traits/tokens/currency.rs
index e6a7284a74b7ff50c4b88fa4c5d6737694bffc67..0030e1261dac1be87f572b1ee26220b2992798cd 100644
--- a/substrate/frame/support/src/traits/tokens/currency.rs
+++ b/substrate/frame/support/src/traits/tokens/currency.rs
@@ -21,11 +21,8 @@ use super::{
 	imbalance::{Imbalance, SignedImbalance},
 	misc::{Balance, ExistenceRequirement, WithdrawReasons},
 };
-use crate::{
-	dispatch::{DispatchError, DispatchResult},
-	traits::Get,
-};
-use sp_runtime::traits::MaybeSerializeDeserialize;
+use crate::{dispatch::DispatchResult, traits::Get};
+use sp_runtime::{traits::MaybeSerializeDeserialize, DispatchError};
 
 mod reservable;
 pub use reservable::{NamedReservableCurrency, ReservableCurrency};
diff --git a/substrate/frame/support/src/traits/tokens/currency/reservable.rs b/substrate/frame/support/src/traits/tokens/currency/reservable.rs
index 79129cecdd6969d56ca9cab0e7fa752469a5c4e1..ff8b0c6eea838e8ec3cd5869190bf741ca140d65 100644
--- a/substrate/frame/support/src/traits/tokens/currency/reservable.rs
+++ b/substrate/frame/support/src/traits/tokens/currency/reservable.rs
@@ -22,9 +22,10 @@ use sp_core::Get;
 
 use super::{super::misc::BalanceStatus, Currency};
 use crate::{
-	dispatch::{DispatchError, DispatchResult},
+	dispatch::DispatchResult,
 	traits::{ExistenceRequirement, SignedImbalance, WithdrawReasons},
 };
+use sp_runtime::DispatchError;
 
 /// A currency where funds can be reserved from the user.
 pub trait ReservableCurrency<AccountId>: Currency<AccountId> {
diff --git a/substrate/frame/support/src/traits/tokens/fungible/conformance_tests/mod.rs b/substrate/frame/support/src/traits/tokens/fungible/conformance_tests/mod.rs
index 88ba56a6fed0200c7b1616f0422f8a42de12610e..56166436003f3ad24e342166d67f38ff3ebe6edd 100644
--- a/substrate/frame/support/src/traits/tokens/fungible/conformance_tests/mod.rs
+++ b/substrate/frame/support/src/traits/tokens/fungible/conformance_tests/mod.rs
@@ -1 +1,18 @@
+// 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.
+
 pub mod inspect_mutate;
diff --git a/substrate/frame/support/src/traits/tokens/fungible/freeze.rs b/substrate/frame/support/src/traits/tokens/fungible/freeze.rs
index 1ec3a5fadf555cdc06d76c675a6fe770238cfba7..8b542ee4c6060e143ee58902a38e39cca38b109b 100644
--- a/substrate/frame/support/src/traits/tokens/fungible/freeze.rs
+++ b/substrate/frame/support/src/traits/tokens/fungible/freeze.rs
@@ -1,6 +1,6 @@
 // This file is part of Substrate.
 
-// Copyright (C) 2019-2022 Parity Technologies (UK) Ltd.
+// Copyright (C) Parity Technologies (UK) Ltd.
 // SPDX-License-Identifier: Apache-2.0
 
 // Licensed under the Apache License, Version 2.0 (the "License");
@@ -18,7 +18,13 @@
 //! The traits for putting freezes within a single fungible token class.
 
 use scale_info::TypeInfo;
-use sp_runtime::DispatchResult;
+use sp_arithmetic::{
+	traits::{CheckedAdd, CheckedSub},
+	ArithmeticError,
+};
+use sp_runtime::{DispatchResult, TokenError};
+
+use crate::{ensure, traits::tokens::Fortitude};
 
 /// Trait for inspecting a fungible asset which can be frozen. Freezing is essentially setting a
 /// minimum balance bellow which the total balance (inclusive of any funds placed on hold) may not
@@ -65,4 +71,53 @@ pub trait Mutate<AccountId>: Inspect<AccountId> {
 
 	/// Remove an existing lock.
 	fn thaw(id: &Self::Id, who: &AccountId) -> DispatchResult;
+
+	/// Attempt to alter the amount frozen under the given `id` to `amount`.
+	///
+	/// Fail if the account of `who` has fewer freezable funds than `amount`, unless `fortitude` is
+	/// `Fortitude::Force`.
+	fn set_frozen(
+		id: &Self::Id,
+		who: &AccountId,
+		amount: Self::Balance,
+		fortitude: Fortitude,
+	) -> DispatchResult {
+		let force = fortitude == Fortitude::Force;
+		ensure!(force || Self::balance_freezable(who) >= amount, TokenError::FundsUnavailable);
+		Self::set_freeze(id, who, amount)
+	}
+
+	/// Attempt to set the amount frozen under the given `id` to `amount`, iff this would increase
+	/// the amount frozen under `id`. Do nothing otherwise.
+	///
+	/// Fail if the account of `who` has fewer freezable funds than `amount`, unless `fortitude` is
+	/// `Fortitude::Force`.
+	fn ensure_frozen(
+		id: &Self::Id,
+		who: &AccountId,
+		amount: Self::Balance,
+		fortitude: Fortitude,
+	) -> DispatchResult {
+		let force = fortitude == Fortitude::Force;
+		ensure!(force || Self::balance_freezable(who) >= amount, TokenError::FundsUnavailable);
+		Self::extend_freeze(id, who, amount)
+	}
+
+	/// Decrease the amount which is being frozen for a particular freeze, failing in the case of
+	/// underflow.
+	fn decrease_frozen(id: &Self::Id, who: &AccountId, amount: Self::Balance) -> DispatchResult {
+		let a = Self::balance_frozen(id, who)
+			.checked_sub(&amount)
+			.ok_or(ArithmeticError::Underflow)?;
+		Self::set_freeze(id, who, a)
+	}
+
+	/// Increase the amount which is being frozen for a particular freeze, failing in the case that
+	/// too little balance is available for being frozen.
+	fn increase_frozen(id: &Self::Id, who: &AccountId, amount: Self::Balance) -> DispatchResult {
+		let a = Self::balance_frozen(id, who)
+			.checked_add(&amount)
+			.ok_or(ArithmeticError::Overflow)?;
+		Self::set_frozen(id, who, a, Fortitude::Polite)
+	}
 }
diff --git a/substrate/frame/support/src/traits/tokens/fungible/hold.rs b/substrate/frame/support/src/traits/tokens/fungible/hold.rs
index aa15e9df63a48f886883554687d13150c4c4a78d..6da652d2998dfc18dd7da5754da7faf22abab839 100644
--- a/substrate/frame/support/src/traits/tokens/fungible/hold.rs
+++ b/substrate/frame/support/src/traits/tokens/fungible/hold.rs
@@ -1,6 +1,6 @@
 // This file is part of Substrate.
 
-// Copyright (C) 2019-2022 Parity Technologies (UK) Ltd.
+// Copyright (C) Parity Technologies (UK) Ltd.
 // SPDX-License-Identifier: Apache-2.0
 
 // Licensed under the Apache License, Version 2.0 (the "License");
@@ -92,11 +92,11 @@ pub trait Inspect<AccountId>: super::Inspect<AccountId> {
 		who: &AccountId,
 		amount: Self::Balance,
 	) -> DispatchResult {
-		ensure!(Self::hold_available(reason, who), TokenError::CannotCreateHold);
 		ensure!(
 			amount <= Self::reducible_balance(who, Protect, Force),
 			TokenError::FundsUnavailable
 		);
+		ensure!(Self::hold_available(reason, who), TokenError::CannotCreateHold);
 		Ok(())
 	}
 
@@ -242,6 +242,41 @@ pub trait Mutate<AccountId>:
 		Ok(actual)
 	}
 
+	/// Hold or release funds in the account of `who` to bring the balance on hold for `reason` to
+	/// exactly `amount`.
+	fn set_on_hold(
+		reason: &Self::Reason,
+		who: &AccountId,
+		amount: Self::Balance,
+	) -> DispatchResult {
+		let current_amount = Self::balance_on_hold(reason, who);
+		if current_amount < amount {
+			Self::hold(reason, who, amount - current_amount)
+		} else if current_amount > amount {
+			Self::release(reason, who, current_amount - amount, Precision::Exact).map(|_| ())
+		} else {
+			Ok(())
+		}
+	}
+
+	/// Release all funds in the account of `who` on hold for `reason`.
+	///
+	/// The actual amount released is returned with `Ok`.
+	///
+	/// If `precision` is `BestEffort`, then the amount actually unreserved and returned as the
+	/// inner value of `Ok` may be smaller than the `amount` passed.
+	///
+	/// NOTE! The inner of the `Ok` result variant returns the *actual* amount released. This is the
+	/// opposite of the `ReservableCurrency::unreserve()` result, which gives the amount not able
+	/// to be released!
+	fn release_all(
+		reason: &Self::Reason,
+		who: &AccountId,
+		precision: Precision,
+	) -> Result<Self::Balance, DispatchError> {
+		Self::release(reason, who, Self::balance_on_hold(reason, who), precision)
+	}
+
 	/// Attempt to decrease the balance of `who` which is held for the given `reason` by `amount`.
 	///
 	/// If `precision` is `BestEffort`, then as much as possible is reduced, up to `amount`, and the
@@ -271,6 +306,25 @@ pub trait Mutate<AccountId>:
 		Ok(amount)
 	}
 
+	/// Attempt to decrease the balance of `who` which is held for the given `reason` to zero.
+	///
+	/// If `precision` is `BestEffort`, then as much as possible is reduced, up to `amount`, and the
+	/// amount of tokens reduced is returned. Otherwise, if the total amount can be reduced, then it
+	/// is and the amount returned, and if not, then nothing changes and `Err` is returned.
+	///
+	/// If `force` is `Force`, then locks/freezes will be ignored. This should only be used when
+	/// conducting slashing or other activity which materially disadvantages the account holder
+	/// since it could provide a means of circumventing freezes.
+	fn burn_all_held(
+		reason: &Self::Reason,
+		who: &AccountId,
+		precision: Precision,
+		force: Fortitude,
+	) -> Result<Self::Balance, DispatchError> {
+		let amount = Self::balance_on_hold(reason, who);
+		Self::burn_held(reason, who, amount, precision, force)
+	}
+
 	/// Transfer held funds into a destination account.
 	///
 	/// If `mode` is `OnHold`, then the destination account must already exist and the assets
diff --git a/substrate/frame/support/src/traits/tokens/fungible/imbalance.rs b/substrate/frame/support/src/traits/tokens/fungible/imbalance.rs
index de85924a4de7c75ca0c18c262ebfb28ee6605a0f..995797bc8f66b10861a68831984302057ecfbe34 100644
--- a/substrate/frame/support/src/traits/tokens/fungible/imbalance.rs
+++ b/substrate/frame/support/src/traits/tokens/fungible/imbalance.rs
@@ -23,7 +23,8 @@ use crate::traits::{
 	misc::{SameOrOther, TryDrop},
 	tokens::Balance,
 };
-use sp_runtime::{traits::Zero, RuntimeDebug};
+use frame_support_procedural::{EqNoBound, PartialEqNoBound, RuntimeDebugNoBound};
+use sp_runtime::traits::Zero;
 use sp_std::marker::PhantomData;
 
 /// Handler for when an imbalance gets dropped. This could handle either a credit (negative) or
@@ -43,7 +44,7 @@ impl<Balance> HandleImbalanceDrop<Balance> for () {
 ///
 /// Importantly, it has a special `Drop` impl, and cannot be created outside of this module.
 #[must_use]
-#[derive(RuntimeDebug, Eq, PartialEq)]
+#[derive(EqNoBound, PartialEqNoBound, RuntimeDebugNoBound)]
 pub struct Imbalance<
 	B: Balance,
 	OnDrop: HandleImbalanceDrop<B>,
@@ -112,6 +113,13 @@ impl<B: Balance, OnDrop: HandleImbalanceDrop<B>, OppositeOnDrop: HandleImbalance
 		sp_std::mem::forget(self);
 		(Imbalance::new(first), Imbalance::new(second))
 	}
+
+	fn extract(&mut self, amount: B) -> Self {
+		let new = self.amount.min(amount);
+		self.amount = self.amount - new;
+		Imbalance::new(new)
+	}
+
 	fn merge(mut self, other: Self) -> Self {
 		self.amount = self.amount.saturating_add(other.amount);
 		sp_std::mem::forget(other);
diff --git a/substrate/frame/support/src/traits/tokens/fungible/item_of.rs b/substrate/frame/support/src/traits/tokens/fungible/item_of.rs
index cf2d96ef28791aa1eef17f621045311c2e61a8af..88b9de7fdbf6461e3c89029a4d6d20734d95f9e9 100644
--- a/substrate/frame/support/src/traits/tokens/fungible/item_of.rs
+++ b/substrate/frame/support/src/traits/tokens/fungible/item_of.rs
@@ -1,6 +1,6 @@
 // This file is part of Substrate.
 
-// Copyright (C) 2019-2022 Parity Technologies (UK) Ltd.
+// Copyright (C) Parity Technologies (UK) Ltd.
 // SPDX-License-Identifier: Apache-2.0
 
 // Licensed under the Apache License, Version 2.0 (the "License");
diff --git a/substrate/frame/support/src/traits/tokens/fungible/mod.rs b/substrate/frame/support/src/traits/tokens/fungible/mod.rs
index 8ab63ad366f08318ebbd996d18d897f4a4e9e200..61b75fd6563c84659ca19adeb39217feb91524a8 100644
--- a/substrate/frame/support/src/traits/tokens/fungible/mod.rs
+++ b/substrate/frame/support/src/traits/tokens/fungible/mod.rs
@@ -1,6 +1,6 @@
 // This file is part of Substrate.
 
-// Copyright (C) 2019-2022 Parity Technologies (UK) Ltd.
+// Copyright (C) Parity Technologies (UK) Ltd.
 // SPDX-License-Identifier: Apache-2.0
 
 // Licensed under the Apache License, Version 2.0 (the "License");
@@ -45,6 +45,15 @@ mod imbalance;
 mod item_of;
 mod regular;
 
+use codec::{Decode, Encode, MaxEncodedLen};
+use frame_support_procedural::{CloneNoBound, EqNoBound, PartialEqNoBound, RuntimeDebugNoBound};
+use scale_info::TypeInfo;
+use sp_std::marker::PhantomData;
+
+use super::{
+	Fortitude::{Force, Polite},
+	Precision::BestEffort,
+};
 pub use freeze::{Inspect as InspectFreeze, Mutate as MutateFreeze};
 pub use hold::{
 	Balanced as BalancedHold, Inspect as InspectHold, Mutate as MutateHold,
@@ -55,3 +64,182 @@ pub use item_of::ItemOf;
 pub use regular::{
 	Balanced, DecreaseIssuance, Dust, IncreaseIssuance, Inspect, Mutate, Unbalanced,
 };
+use sp_arithmetic::traits::Zero;
+use sp_core::Get;
+use sp_runtime::{traits::Convert, DispatchError};
+
+use crate::{
+	ensure,
+	traits::{Consideration, Footprint},
+};
+
+/// Consideration method using a `fungible` balance frozen as the cost exacted for the footprint.
+///
+/// The aggregate amount frozen under `R::get()` for any account which has multiple tickets,
+/// is the *cumulative* amounts of each ticket's footprint (each individually determined by `D`).
+#[derive(
+	CloneNoBound,
+	EqNoBound,
+	PartialEqNoBound,
+	Encode,
+	Decode,
+	TypeInfo,
+	MaxEncodedLen,
+	RuntimeDebugNoBound,
+)]
+#[scale_info(skip_type_params(A, F, R, D))]
+#[codec(mel_bound())]
+pub struct FreezeConsideration<A, F, R, D>(F::Balance, PhantomData<fn() -> (A, R, D)>)
+where
+	F: MutateFreeze<A>;
+impl<
+		A: 'static,
+		F: 'static + MutateFreeze<A>,
+		R: 'static + Get<F::Id>,
+		D: 'static + Convert<Footprint, F::Balance>,
+	> Consideration<A> for FreezeConsideration<A, F, R, D>
+{
+	fn new(who: &A, footprint: Footprint) -> Result<Self, DispatchError> {
+		let new = D::convert(footprint);
+		F::increase_frozen(&R::get(), who, new)?;
+		Ok(Self(new, PhantomData))
+	}
+	fn update(self, who: &A, footprint: Footprint) -> Result<Self, DispatchError> {
+		let new = D::convert(footprint);
+		if self.0 > new {
+			F::decrease_frozen(&R::get(), who, self.0 - new)?;
+		} else if new > self.0 {
+			F::increase_frozen(&R::get(), who, new - self.0)?;
+		}
+		Ok(Self(new, PhantomData))
+	}
+	fn drop(self, who: &A) -> Result<(), DispatchError> {
+		F::decrease_frozen(&R::get(), who, self.0).map(|_| ())
+	}
+}
+
+/// Consideration method using a `fungible` balance frozen as the cost exacted for the footprint.
+#[derive(
+	CloneNoBound,
+	EqNoBound,
+	PartialEqNoBound,
+	Encode,
+	Decode,
+	TypeInfo,
+	MaxEncodedLen,
+	RuntimeDebugNoBound,
+)]
+#[scale_info(skip_type_params(A, F, R, D))]
+#[codec(mel_bound())]
+pub struct HoldConsideration<A, F, R, D>(F::Balance, PhantomData<fn() -> (A, R, D)>)
+where
+	F: MutateHold<A>;
+impl<
+		A: 'static,
+		F: 'static + MutateHold<A>,
+		R: 'static + Get<F::Reason>,
+		D: 'static + Convert<Footprint, F::Balance>,
+	> Consideration<A> for HoldConsideration<A, F, R, D>
+{
+	fn new(who: &A, footprint: Footprint) -> Result<Self, DispatchError> {
+		let new = D::convert(footprint);
+		F::hold(&R::get(), who, new)?;
+		Ok(Self(new, PhantomData))
+	}
+	fn update(self, who: &A, footprint: Footprint) -> Result<Self, DispatchError> {
+		let new = D::convert(footprint);
+		if self.0 > new {
+			F::release(&R::get(), who, self.0 - new, BestEffort)?;
+		} else if new > self.0 {
+			F::hold(&R::get(), who, new - self.0)?;
+		}
+		Ok(Self(new, PhantomData))
+	}
+	fn drop(self, who: &A) -> Result<(), DispatchError> {
+		F::release(&R::get(), who, self.0, BestEffort).map(|_| ())
+	}
+	fn burn(self, who: &A) {
+		let _ = F::burn_held(&R::get(), who, self.0, BestEffort, Force);
+	}
+}
+
+/// Basic consideration method using a `fungible` balance frozen as the cost exacted for the
+/// footprint.
+///
+/// NOTE: This is an optimized implementation, which can only be used for systems where each
+/// account has only a single active ticket associated with it since individual tickets do not
+/// track the specific balance which is frozen. If you are uncertain then use `FreezeConsideration`
+/// instead, since this works in all circumstances.
+#[derive(
+	CloneNoBound,
+	EqNoBound,
+	PartialEqNoBound,
+	Encode,
+	Decode,
+	TypeInfo,
+	MaxEncodedLen,
+	RuntimeDebugNoBound,
+)]
+#[scale_info(skip_type_params(A, Fx, Rx, D))]
+#[codec(mel_bound())]
+pub struct LoneFreezeConsideration<A, Fx, Rx, D>(PhantomData<fn() -> (A, Fx, Rx, D)>);
+impl<
+		A: 'static,
+		Fx: 'static + MutateFreeze<A>,
+		Rx: 'static + Get<Fx::Id>,
+		D: 'static + Convert<Footprint, Fx::Balance>,
+	> Consideration<A> for LoneFreezeConsideration<A, Fx, Rx, D>
+{
+	fn new(who: &A, footprint: Footprint) -> Result<Self, DispatchError> {
+		ensure!(Fx::balance_frozen(&Rx::get(), who).is_zero(), DispatchError::Unavailable);
+		Fx::set_frozen(&Rx::get(), who, D::convert(footprint), Polite).map(|_| Self(PhantomData))
+	}
+	fn update(self, who: &A, footprint: Footprint) -> Result<Self, DispatchError> {
+		Fx::set_frozen(&Rx::get(), who, D::convert(footprint), Polite).map(|_| Self(PhantomData))
+	}
+	fn drop(self, who: &A) -> Result<(), DispatchError> {
+		Fx::thaw(&Rx::get(), who).map(|_| ())
+	}
+}
+
+/// Basic consideration method using a `fungible` balance placed on hold as the cost exacted for the
+/// footprint.
+///
+/// NOTE: This is an optimized implementation, which can only be used for systems where each
+/// account has only a single active ticket associated with it since individual tickets do not
+/// track the specific balance which is frozen. If you are uncertain then use `FreezeConsideration`
+/// instead, since this works in all circumstances.
+#[derive(
+	CloneNoBound,
+	EqNoBound,
+	PartialEqNoBound,
+	Encode,
+	Decode,
+	TypeInfo,
+	MaxEncodedLen,
+	RuntimeDebugNoBound,
+)]
+#[scale_info(skip_type_params(A, Fx, Rx, D))]
+#[codec(mel_bound())]
+pub struct LoneHoldConsideration<A, Fx, Rx, D>(PhantomData<fn() -> (A, Fx, Rx, D)>);
+impl<
+		A: 'static,
+		F: 'static + MutateHold<A>,
+		R: 'static + Get<F::Reason>,
+		D: 'static + Convert<Footprint, F::Balance>,
+	> Consideration<A> for LoneHoldConsideration<A, F, R, D>
+{
+	fn new(who: &A, footprint: Footprint) -> Result<Self, DispatchError> {
+		ensure!(F::balance_on_hold(&R::get(), who).is_zero(), DispatchError::Unavailable);
+		F::set_on_hold(&R::get(), who, D::convert(footprint)).map(|_| Self(PhantomData))
+	}
+	fn update(self, who: &A, footprint: Footprint) -> Result<Self, DispatchError> {
+		F::set_on_hold(&R::get(), who, D::convert(footprint)).map(|_| Self(PhantomData))
+	}
+	fn drop(self, who: &A) -> Result<(), DispatchError> {
+		F::release_all(&R::get(), who, BestEffort).map(|_| ())
+	}
+	fn burn(self, who: &A) {
+		let _ = F::burn_all_held(&R::get(), who, BestEffort, Force);
+	}
+}
diff --git a/substrate/frame/support/src/traits/tokens/fungible/regular.rs b/substrate/frame/support/src/traits/tokens/fungible/regular.rs
index 2838bed540aa261e1c4b5c7a985f4b294e20dd81..fe2a1f2a14a6604bee2aaa85f80a3349d3b80043 100644
--- a/substrate/frame/support/src/traits/tokens/fungible/regular.rs
+++ b/substrate/frame/support/src/traits/tokens/fungible/regular.rs
@@ -1,6 +1,6 @@
 // This file is part of Substrate.
 
-// Copyright (C) 2019-2022 Parity Technologies (UK) Ltd.
+// Copyright (C) Parity Technologies (UK) Ltd.
 // SPDX-License-Identifier: Apache-2.0
 
 // Licensed under the Apache License, Version 2.0 (the "License");
@@ -18,7 +18,6 @@
 //! `Inspect` and `Mutate` traits for working with regular balances.
 
 use crate::{
-	dispatch::DispatchError,
 	ensure,
 	traits::{
 		tokens::{
@@ -36,7 +35,7 @@ use crate::{
 	},
 };
 use sp_arithmetic::traits::{CheckedAdd, CheckedSub, One};
-use sp_runtime::{traits::Saturating, ArithmeticError, TokenError};
+use sp_runtime::{traits::Saturating, ArithmeticError, DispatchError, TokenError};
 use sp_std::marker::PhantomData;
 
 use super::{Credit, Debt, HandleImbalanceDrop, Imbalance};
diff --git a/substrate/frame/support/src/traits/tokens/fungibles/freeze.rs b/substrate/frame/support/src/traits/tokens/fungibles/freeze.rs
index 08549c2d4b74410737984e4ce5bf9e935a06f8a7..b07d20d6c41ce48c3f4face0ea4a213a3023f5e3 100644
--- a/substrate/frame/support/src/traits/tokens/fungibles/freeze.rs
+++ b/substrate/frame/support/src/traits/tokens/fungibles/freeze.rs
@@ -1,6 +1,6 @@
 // This file is part of Substrate.
 
-// Copyright (C) 2019-2022 Parity Technologies (UK) Ltd.
+// Copyright (C) Parity Technologies (UK) Ltd.
 // SPDX-License-Identifier: Apache-2.0
 
 // Licensed under the Apache License, Version 2.0 (the "License");
@@ -17,8 +17,13 @@
 
 //! The traits for putting freezes within a single fungible token class.
 
+use crate::{ensure, traits::tokens::Fortitude};
 use scale_info::TypeInfo;
-use sp_runtime::DispatchResult;
+use sp_arithmetic::{
+	traits::{CheckedAdd, CheckedSub},
+	ArithmeticError,
+};
+use sp_runtime::{DispatchResult, TokenError};
 
 /// Trait for inspecting a fungible asset which can be frozen. Freezing is essentially setting a
 /// minimum balance below which the total balance (inclusive of any funds placed on hold) may not
@@ -75,4 +80,71 @@ pub trait Mutate<AccountId>: Inspect<AccountId> {
 
 	/// Remove an existing lock.
 	fn thaw(asset: Self::AssetId, id: &Self::Id, who: &AccountId) -> DispatchResult;
+
+	/// Attempt to alter the amount frozen under the given `id` to `amount`.
+	///
+	/// Fail if the account of `who` has fewer freezable funds than `amount`, unless `fortitude` is
+	/// `Fortitude::Force`.
+	fn set_frozen(
+		asset: Self::AssetId,
+		id: &Self::Id,
+		who: &AccountId,
+		amount: Self::Balance,
+		fortitude: Fortitude,
+	) -> DispatchResult {
+		let force = fortitude == Fortitude::Force;
+		ensure!(
+			force || Self::balance_freezable(asset.clone(), who) >= amount,
+			TokenError::FundsUnavailable
+		);
+		Self::set_freeze(asset, id, who, amount)
+	}
+
+	/// Attempt to set the amount frozen under the given `id` to `amount`, iff this would increase
+	/// the amount frozen under `id`. Do nothing otherwise.
+	///
+	/// Fail if the account of `who` has fewer freezable funds than `amount`, unless `fortitude` is
+	/// `Fortitude::Force`.
+	fn ensure_frozen(
+		asset: Self::AssetId,
+		id: &Self::Id,
+		who: &AccountId,
+		amount: Self::Balance,
+		fortitude: Fortitude,
+	) -> DispatchResult {
+		let force = fortitude == Fortitude::Force;
+		ensure!(
+			force || Self::balance_freezable(asset.clone(), who) >= amount,
+			TokenError::FundsUnavailable
+		);
+		Self::extend_freeze(asset, id, who, amount)
+	}
+
+	/// Decrease the amount which is being frozen for a particular lock, failing in the case of
+	/// underflow.
+	fn decrease_frozen(
+		asset: Self::AssetId,
+		id: &Self::Id,
+		who: &AccountId,
+		amount: Self::Balance,
+	) -> DispatchResult {
+		let a = Self::balance_frozen(asset.clone(), id, who)
+			.checked_sub(&amount)
+			.ok_or(ArithmeticError::Underflow)?;
+		Self::set_frozen(asset, id, who, a, Fortitude::Polite)
+	}
+
+	/// Increase the amount which is being frozen for a particular lock, failing in the case that
+	/// too little balance is available for being frozen.
+	fn increase_frozen(
+		asset: Self::AssetId,
+		id: &Self::Id,
+		who: &AccountId,
+		amount: Self::Balance,
+	) -> DispatchResult {
+		let a = Self::balance_frozen(asset.clone(), id, who)
+			.checked_add(&amount)
+			.ok_or(ArithmeticError::Overflow)?;
+		Self::set_frozen(asset, id, who, a, Fortitude::Polite)
+	}
 }
diff --git a/substrate/frame/support/src/traits/tokens/fungibles/hold.rs b/substrate/frame/support/src/traits/tokens/fungibles/hold.rs
index c751a836d1f4335e406ea584f5f74c85798aef68..1efd1594213c1a80eeccdd4fdf0c9f01c812794c 100644
--- a/substrate/frame/support/src/traits/tokens/fungibles/hold.rs
+++ b/substrate/frame/support/src/traits/tokens/fungibles/hold.rs
@@ -1,6 +1,6 @@
 // This file is part of Substrate.
 
-// Copyright (C) 2019-2022 Parity Technologies (UK) Ltd.
+// Copyright (C) Parity Technologies (UK) Ltd.
 // SPDX-License-Identifier: Apache-2.0
 
 // Licensed under the Apache License, Version 2.0 (the "License");
@@ -301,7 +301,8 @@ pub trait Mutate<AccountId>:
 		Ok(actual)
 	}
 
-	/// Attempt to decrease the balance of `who` which is held for the given `reason` by `amount`.
+	/// Attempt to decrease the `asset` balance of `who` which is held for the given `reason` by
+	/// `amount`.
 	///
 	/// If `precision` is true, then as much as possible is reduced, up to `amount`, and the
 	/// amount of tokens reduced is returned. Otherwise, if the total amount can be reduced, then it
@@ -334,6 +335,27 @@ pub trait Mutate<AccountId>:
 		Ok(amount)
 	}
 
+	/// Attempt to decrease the `asset` balance of `who` which is held for the given `reason` to
+	/// zero.
+	///
+	/// If `precision` is `BestEffort`, then as much as possible is reduced, up to `amount`, and the
+	/// amount of tokens reduced is returned. Otherwise, if the total amount can be reduced, then it
+	/// is and the amount returned, and if not, then nothing changes and `Err` is returned.
+	///
+	/// If `force` is `Force`, then locks/freezes will be ignored. This should only be used when
+	/// conducting slashing or other activity which materially disadvantages the account holder
+	/// since it could provide a means of circumventing freezes.
+	fn burn_all_held(
+		asset: Self::AssetId,
+		reason: &Self::Reason,
+		who: &AccountId,
+		precision: Precision,
+		force: Fortitude,
+	) -> Result<Self::Balance, DispatchError> {
+		let amount = Self::balance_on_hold(asset.clone(), reason, who);
+		Self::burn_held(asset, reason, who, amount, precision, force)
+	}
+
 	/// Transfer held funds into a destination account.
 	///
 	/// If `mode` is `OnHold`, then the destination account must already exist and the assets
diff --git a/substrate/frame/support/src/traits/tokens/fungibles/imbalance.rs b/substrate/frame/support/src/traits/tokens/fungibles/imbalance.rs
index 1668268ea2dcf232a4aaf3f6a7b4df3b67060542..7c0d7721a2e60908f1a5a4be8a8c876ff2bd1ae2 100644
--- a/substrate/frame/support/src/traits/tokens/fungibles/imbalance.rs
+++ b/substrate/frame/support/src/traits/tokens/fungibles/imbalance.rs
@@ -23,7 +23,8 @@ use crate::traits::{
 	misc::{SameOrOther, TryDrop},
 	tokens::{AssetId, Balance},
 };
-use sp_runtime::{traits::Zero, RuntimeDebug};
+use frame_support_procedural::{EqNoBound, PartialEqNoBound, RuntimeDebugNoBound};
+use sp_runtime::traits::Zero;
 use sp_std::marker::PhantomData;
 
 /// Handler for when an imbalance gets dropped. This could handle either a credit (negative) or
@@ -38,7 +39,7 @@ pub trait HandleImbalanceDrop<AssetId, Balance> {
 ///
 /// Importantly, it has a special `Drop` impl, and cannot be created outside of this module.
 #[must_use]
-#[derive(RuntimeDebug, Eq, PartialEq)]
+#[derive(EqNoBound, PartialEqNoBound, RuntimeDebugNoBound)]
 pub struct Imbalance<
 	A: AssetId,
 	B: Balance,
@@ -108,6 +109,15 @@ impl<
 		sp_std::mem::forget(self);
 		(Imbalance::new(asset.clone(), first), Imbalance::new(asset, second))
 	}
+
+	/// Mutate `self` by extracting a new instance with at most `amount` value, reducing `self`
+	/// accordingly.
+	pub fn extract(&mut self, amount: B) -> Self {
+		let new = self.amount.min(amount);
+		self.amount = self.amount - new;
+		Imbalance::new(self.asset.clone(), new)
+	}
+
 	pub fn merge(mut self, other: Self) -> Result<Self, (Self, Self)> {
 		if self.asset == other.asset {
 			self.amount = self.amount.saturating_add(other.amount);
diff --git a/substrate/frame/support/src/traits/tokens/fungibles/lifetime.rs b/substrate/frame/support/src/traits/tokens/fungibles/lifetime.rs
index 9e2c306f6f38acae211004a5b9baa63ed34b6a4d..0e195a52318b7ddb34aef57e3d8742cd36952e06 100644
--- a/substrate/frame/support/src/traits/tokens/fungibles/lifetime.rs
+++ b/substrate/frame/support/src/traits/tokens/fungibles/lifetime.rs
@@ -1,6 +1,6 @@
 // This file is part of Substrate.
 
-// Copyright (C) 2019-2022 Parity Technologies (UK) Ltd.
+// Copyright (C) Parity Technologies (UK) Ltd.
 // SPDX-License-Identifier: Apache-2.0
 
 // Licensed under the Apache License, Version 2.0 (the "License");
diff --git a/substrate/frame/support/src/traits/tokens/fungibles/mod.rs b/substrate/frame/support/src/traits/tokens/fungibles/mod.rs
index 697eff39ff7489c964328a23317871f01a137c83..4fd6ef43a15fafe91730fd1c5e01b2ca14bfd817 100644
--- a/substrate/frame/support/src/traits/tokens/fungibles/mod.rs
+++ b/substrate/frame/support/src/traits/tokens/fungibles/mod.rs
@@ -1,6 +1,6 @@
 // This file is part of Substrate.
 
-// Copyright (C) 2019-2022 Parity Technologies (UK) Ltd.
+// Copyright (C) Parity Technologies (UK) Ltd.
 // SPDX-License-Identifier: Apache-2.0
 
 // Licensed under the Apache License, Version 2.0 (the "License");
diff --git a/substrate/frame/support/src/traits/tokens/fungibles/regular.rs b/substrate/frame/support/src/traits/tokens/fungibles/regular.rs
index b6cea15284d396e3f3432581671f75124eb92b8a..7c39acdf42416d47cb27b880477e52136a97a2e6 100644
--- a/substrate/frame/support/src/traits/tokens/fungibles/regular.rs
+++ b/substrate/frame/support/src/traits/tokens/fungibles/regular.rs
@@ -1,6 +1,6 @@
 // This file is part of Substrate.
 
-// Copyright (C) 2019-2022 Parity Technologies (UK) Ltd.
+// Copyright (C) Parity Technologies (UK) Ltd.
 // SPDX-License-Identifier: Apache-2.0
 
 // Licensed under the Apache License, Version 2.0 (the "License");
@@ -20,7 +20,6 @@
 use sp_std::marker::PhantomData;
 
 use crate::{
-	dispatch::DispatchError,
 	ensure,
 	traits::{
 		tokens::{
@@ -38,7 +37,7 @@ use crate::{
 	},
 };
 use sp_arithmetic::traits::{CheckedAdd, CheckedSub, One};
-use sp_runtime::{traits::Saturating, ArithmeticError, TokenError};
+use sp_runtime::{traits::Saturating, ArithmeticError, DispatchError, TokenError};
 
 use super::{Credit, Debt, HandleImbalanceDrop, Imbalance};
 
diff --git a/substrate/frame/support/src/traits/tokens/imbalance.rs b/substrate/frame/support/src/traits/tokens/imbalance.rs
index 403321725042c6899c16d90f1ba1652965a336cb..e487b8122341062ff0e4e8ed0bbf2ca23c8edbe2 100644
--- a/substrate/frame/support/src/traits/tokens/imbalance.rs
+++ b/substrate/frame/support/src/traits/tokens/imbalance.rs
@@ -72,6 +72,10 @@ pub trait Imbalance<Balance>: Sized + TryDrop + Default {
 	/// is guaranteed to be at most `amount` and the second will be the remainder.
 	fn split(self, amount: Balance) -> (Self, Self);
 
+	/// Mutate `self` by extracting a new instance with at most `amount` value, reducing `self`
+	/// accordingly.
+	fn extract(&mut self, amount: Balance) -> Self;
+
 	/// Consume `self` and return two independent instances; the amounts returned will be in
 	/// approximately the same ratio as `first`:`second`.
 	///
@@ -190,6 +194,9 @@ impl<Balance: Default> Imbalance<Balance> for () {
 	fn split(self, _: Balance) -> (Self, Self) {
 		((), ())
 	}
+	fn extract(&mut self, _: Balance) -> Self {
+		()
+	}
 	fn ration(self, _: u32, _: u32) -> (Self, Self)
 	where
 		Balance: From<u32> + Saturating + Div<Output = Balance>,
diff --git a/substrate/frame/support/src/traits/tokens/misc.rs b/substrate/frame/support/src/traits/tokens/misc.rs
index baf3fd5f354646153679d81b6b3349762f62b5c0..fd497bc4eda6f0b66127b4fc87edacd9be76d56f 100644
--- a/substrate/frame/support/src/traits/tokens/misc.rs
+++ b/substrate/frame/support/src/traits/tokens/misc.rs
@@ -20,7 +20,10 @@
 use codec::{Decode, Encode, FullCodec, MaxEncodedLen};
 use sp_arithmetic::traits::{AtLeast32BitUnsigned, Zero};
 use sp_core::RuntimeDebug;
-use sp_runtime::{traits::Convert, ArithmeticError, DispatchError, TokenError};
+use sp_runtime::{
+	traits::{Convert, MaybeSerializeDeserialize},
+	ArithmeticError, DispatchError, TokenError,
+};
 use sp_std::fmt::Debug;
 
 /// The origin of funds to be used for a deposit operation.
@@ -231,7 +234,17 @@ impl<T: FullCodec + Clone + Eq + PartialEq + Debug + scale_info::TypeInfo + MaxE
 
 /// Simple amalgamation trait to collect together properties for a Balance under one roof.
 pub trait Balance:
-	AtLeast32BitUnsigned + FullCodec + Copy + Default + Debug + scale_info::TypeInfo + MaxEncodedLen
+	AtLeast32BitUnsigned
+	+ FullCodec
+	+ Copy
+	+ Default
+	+ Debug
+	+ scale_info::TypeInfo
+	+ MaxEncodedLen
+	+ Send
+	+ Sync
+	+ MaybeSerializeDeserialize
+	+ 'static
 {
 }
 impl<
@@ -241,7 +254,11 @@ impl<
 			+ Default
 			+ Debug
 			+ scale_info::TypeInfo
-			+ MaxEncodedLen,
+			+ MaxEncodedLen
+			+ Send
+			+ Sync
+			+ MaybeSerializeDeserialize
+			+ 'static,
 	> Balance for T
 {
 }
@@ -260,6 +277,26 @@ pub trait ConversionFromAssetBalance<AssetBalance, AssetId, OutBalance> {
 		balance: AssetBalance,
 		asset_id: AssetId,
 	) -> Result<OutBalance, Self::Error>;
+	/// Ensures that a conversion for the `asset_id` will be successful if done immediately after
+	/// this call.
+	#[cfg(feature = "runtime-benchmarks")]
+	fn ensure_successful(asset_id: AssetId);
+}
+
+/// Implements [`ConversionFromAssetBalance`], enabling a 1:1 conversion of the asset balance
+/// value to the balance.
+pub struct UnityAssetBalanceConversion;
+impl<AssetBalance, AssetId, OutBalance>
+	ConversionFromAssetBalance<AssetBalance, AssetId, OutBalance> for UnityAssetBalanceConversion
+where
+	AssetBalance: Into<OutBalance>,
+{
+	type Error = ();
+	fn from_asset_balance(balance: AssetBalance, _: AssetId) -> Result<OutBalance, Self::Error> {
+		Ok(balance.into())
+	}
+	#[cfg(feature = "runtime-benchmarks")]
+	fn ensure_successful(_: AssetId) {}
 }
 
 /// Trait to handle NFT locking mechanism to ensure interactions with the asset can be implemented
diff --git a/substrate/frame/support/src/traits/tokens/nonfungibles.rs b/substrate/frame/support/src/traits/tokens/nonfungibles.rs
index e9538d14f5471aa2877fbfdf6cd2a43442180383..615e79c29c85f4ccef502e2e50a0ecfd56a3c909 100644
--- a/substrate/frame/support/src/traits/tokens/nonfungibles.rs
+++ b/substrate/frame/support/src/traits/tokens/nonfungibles.rs
@@ -27,9 +27,9 @@
 //! Implementations of these traits may be converted to implementations of corresponding
 //! `nonfungible` traits by using the `nonfungible::ItemOf` type adapter.
 
-use crate::dispatch::{DispatchError, DispatchResult};
+use crate::dispatch::DispatchResult;
 use codec::{Decode, Encode};
-use sp_runtime::TokenError;
+use sp_runtime::{DispatchError, TokenError};
 use sp_std::prelude::*;
 
 /// Trait for providing an interface to many read-only NFT-like sets of items.
diff --git a/substrate/frame/support/src/traits/tokens/nonfungibles_v2.rs b/substrate/frame/support/src/traits/tokens/nonfungibles_v2.rs
index 345cce237b67b1955b14d2090f5a6ce07039f86c..ec064bdebf62ac2a356787f8fc302f275448116b 100644
--- a/substrate/frame/support/src/traits/tokens/nonfungibles_v2.rs
+++ b/substrate/frame/support/src/traits/tokens/nonfungibles_v2.rs
@@ -27,9 +27,9 @@
 //! Implementations of these traits may be converted to implementations of corresponding
 //! `nonfungible` traits by using the `nonfungible::ItemOf` type adapter.
 
-use crate::dispatch::{DispatchError, DispatchResult, Parameter};
+use crate::dispatch::{DispatchResult, Parameter};
 use codec::{Decode, Encode};
-use sp_runtime::TokenError;
+use sp_runtime::{DispatchError, TokenError};
 use sp_std::prelude::*;
 
 /// Trait for providing an interface to many read-only NFT-like sets of items.
diff --git a/substrate/frame/support/src/traits/tokens/pay.rs b/substrate/frame/support/src/traits/tokens/pay.rs
index 78f8e7b8734803ac163a8ed767d4daf4d1a93e10..18af7e5e54838020092a2fee52fe1a78a644858a 100644
--- a/substrate/frame/support/src/traits/tokens/pay.rs
+++ b/substrate/frame/support/src/traits/tokens/pay.rs
@@ -23,7 +23,7 @@ use sp_core::{RuntimeDebug, TypedGet};
 use sp_runtime::DispatchError;
 use sp_std::fmt::Debug;
 
-use super::{fungible, Balance, Preservation::Expendable};
+use super::{fungible, fungibles, Balance, Preservation::Expendable};
 
 /// Can be implemented by `PayFromAccount` using a `fungible` impl, but can also be implemented with
 /// XCM/MultiAsset and made generic over assets.
@@ -107,3 +107,36 @@ impl<A: TypedGet, F: fungible::Mutate<A::Type>> Pay for PayFromAccount<F, A> {
 	#[cfg(feature = "runtime-benchmarks")]
 	fn ensure_concluded(_: Self::Id) {}
 }
+
+/// Simple implementation of `Pay` for assets which makes a payment from a "pot" - i.e. a single
+/// account.
+pub struct PayAssetFromAccount<F, A>(sp_std::marker::PhantomData<(F, A)>);
+impl<A, F> frame_support::traits::tokens::Pay for PayAssetFromAccount<F, A>
+where
+	A: TypedGet,
+	F: fungibles::Mutate<A::Type> + fungibles::Create<A::Type>,
+{
+	type Balance = F::Balance;
+	type Beneficiary = A::Type;
+	type AssetKind = F::AssetId;
+	type Id = ();
+	type Error = DispatchError;
+	fn pay(
+		who: &Self::Beneficiary,
+		asset: Self::AssetKind,
+		amount: Self::Balance,
+	) -> Result<Self::Id, Self::Error> {
+		<F as fungibles::Mutate<_>>::transfer(asset, &A::get(), who, amount, Expendable)?;
+		Ok(())
+	}
+	fn check_payment(_: ()) -> PaymentStatus {
+		PaymentStatus::Success
+	}
+	#[cfg(feature = "runtime-benchmarks")]
+	fn ensure_successful(_: &Self::Beneficiary, asset: Self::AssetKind, amount: Self::Balance) {
+		<F as fungibles::Create<_>>::create(asset.clone(), A::get(), true, amount).unwrap();
+		<F as fungibles::Mutate<_>>::mint_into(asset, &A::get(), amount).unwrap();
+	}
+	#[cfg(feature = "runtime-benchmarks")]
+	fn ensure_concluded(_: Self::Id) {}
+}
diff --git a/substrate/frame/support/src/traits/voting.rs b/substrate/frame/support/src/traits/voting.rs
index 4201b8d48d157634b5cd7793dee94abd6d9483aa..f5c9e285ef3a6fb49cb7eadeffea4d44d7a813f3 100644
--- a/substrate/frame/support/src/traits/voting.rs
+++ b/substrate/frame/support/src/traits/voting.rs
@@ -18,10 +18,10 @@
 //! Traits and associated data structures concerned with voting, and moving between tokens and
 //! votes.
 
-use crate::dispatch::{DispatchError, Parameter};
+use crate::dispatch::Parameter;
 use codec::{HasCompact, MaxEncodedLen};
 use sp_arithmetic::Perbill;
-use sp_runtime::traits::Member;
+use sp_runtime::{traits::Member, DispatchError};
 use sp_std::prelude::*;
 
 pub trait VoteTally<Votes, Class> {
diff --git a/substrate/frame/support/test/Cargo.toml b/substrate/frame/support/test/Cargo.toml
index e5057d5d9864ccebb4d04d1b3e6442a16c5c34a1..8b8912799142e02fe914f7320de32c7cea8a21e9 100644
--- a/substrate/frame/support/test/Cargo.toml
+++ b/substrate/frame/support/test/Cargo.toml
@@ -1,19 +1,19 @@
 [package]
 name = "frame-support-test"
 version = "3.0.0"
-authors = ["Parity Technologies <admin@parity.io>"]
-edition = "2021"
+authors.workspace = true
+edition.workspace = true
 license = "Apache-2.0"
 publish = false
 homepage = "https://substrate.io"
-repository = "https://github.com/paritytech/substrate/"
+repository.workspace = true
 
 [package.metadata.docs.rs]
 targets = ["x86_64-unknown-linux-gnu"]
 
 [dependencies]
 static_assertions = "1.1.0"
-serde = { version = "1.0.163", default-features = false, features = ["derive"] }
+serde = { version = "1.0.188", default-features = false, features = ["derive"] }
 codec = { package = "parity-scale-codec", version = "3.6.1", default-features = false, features = ["derive"] }
 scale-info = { version = "2.5.0", default-features = false, features = ["derive"] }
 frame-metadata = { version = "16.0.0", default-features = false, features = ["current"] }
diff --git a/substrate/frame/support/test/compile_pass/Cargo.toml b/substrate/frame/support/test/compile_pass/Cargo.toml
index 444d3fbb5a81fdf48249aa35fb0c4f4ab99dabd3..167aec8a171c7773b0d4a3b10af98ff1773241d9 100644
--- a/substrate/frame/support/test/compile_pass/Cargo.toml
+++ b/substrate/frame/support/test/compile_pass/Cargo.toml
@@ -1,12 +1,12 @@
 [package]
 name = "frame-support-test-compile-pass"
 version = "4.0.0-dev"
-authors = ["Parity Technologies <admin@parity.io>"]
-edition = "2021"
+authors.workspace = true
+edition.workspace = true
 license = "Apache-2.0"
 publish = false
 homepage = "https://substrate.io"
-repository = "https://github.com/paritytech/substrate/"
+repository.workspace = true
 
 [package.metadata.docs.rs]
 targets = ["x86_64-unknown-linux-gnu"]
@@ -15,7 +15,7 @@ targets = ["x86_64-unknown-linux-gnu"]
 codec = { package = "parity-scale-codec", version = "3.6.1", default-features = false, features = ["derive"] }
 scale-info = { version = "2.5.0", default-features = false, features = ["derive"] }
 renamed-frame-support = { package = "frame-support", path = "../..", default-features = false}
-frame-system = { path = "../../../system", default-features = false}
+renamed-frame-system = { package = "frame-system", path = "../../../system", default-features = false}
 sp-core = { path = "../../../../primitives/core", default-features = false}
 sp-runtime = { path = "../../../../primitives/runtime", default-features = false}
 sp-version = { path = "../../../../primitives/version", default-features = false}
@@ -24,8 +24,8 @@ sp-version = { path = "../../../../primitives/version", default-features = false
 default = [ "std" ]
 std = [
 	"codec/std",
-	"frame-system/std",
 	"renamed-frame-support/std",
+	"renamed-frame-system/std",
 	"scale-info/std",
 	"sp-core/std",
 	"sp-runtime/std",
diff --git a/substrate/frame/support/test/compile_pass/src/lib.rs b/substrate/frame/support/test/compile_pass/src/lib.rs
index bf90d73acb320a439963ec25d8379982e1338127..6ea37fb27e72f31fe0e88e1f35815675bc33660e 100644
--- a/substrate/frame/support/test/compile_pass/src/lib.rs
+++ b/substrate/frame/support/test/compile_pass/src/lib.rs
@@ -16,7 +16,8 @@
 // You should have received a copy of the GNU General Public License
 // along with this program. If not, see <https://www.gnu.org/licenses/>.
 
-//! Test that `construct_runtime!` also works when `frame-support` is renamed in the `Cargo.toml`.
+//! Test that `construct_runtime!` also works when `frame-support` or `frame-system` are renamed in
+//! the `Cargo.toml`.
 
 #![cfg_attr(not(feature = "std"), no_std)]
 
@@ -50,7 +51,7 @@ parameter_types! {
 	pub const Version: RuntimeVersion = VERSION;
 }
 
-impl frame_system::Config for Runtime {
+impl renamed_frame_system::Config for Runtime {
 	type BaseCallFilter = Everything;
 	type BlockWeights = ();
 	type BlockLength = ();
@@ -82,6 +83,6 @@ pub type UncheckedExtrinsic = generic::UncheckedExtrinsic<u32, RuntimeCall, Sign
 
 construct_runtime!(
 	pub struct Runtime {
-		System: frame_system,
+		System: renamed_frame_system,
 	}
 );
diff --git a/substrate/frame/support/test/pallet/Cargo.toml b/substrate/frame/support/test/pallet/Cargo.toml
index 279e0fc5ae3bc629130ace843a0443a59102a91f..8db2e9ba7c4975d5e0e5b1d24a3357b35653ef09 100644
--- a/substrate/frame/support/test/pallet/Cargo.toml
+++ b/substrate/frame/support/test/pallet/Cargo.toml
@@ -1,12 +1,12 @@
 [package]
 name = "frame-support-test-pallet"
 version = "4.0.0-dev"
-authors = ["Parity Technologies <admin@parity.io>"]
-edition = "2021"
+authors.workspace = true
+edition.workspace = true
 license = "Apache-2.0"
 publish = false
 homepage = "https://substrate.io"
-repository = "https://github.com/paritytech/substrate/"
+repository.workspace = true
 
 [package.metadata.docs.rs]
 targets = ["x86_64-unknown-linux-gnu"]
@@ -14,7 +14,7 @@ targets = ["x86_64-unknown-linux-gnu"]
 [dependencies]
 codec = { package = "parity-scale-codec", version = "3.6.1", default-features = false, features = ["derive"] }
 scale-info = { version = "2.0.0", default-features = false, features = ["derive"] }
-serde = { version = "1.0.163", default-features = false, features = ["derive"] }
+serde = { version = "1.0.188", default-features = false, features = ["derive"] }
 frame-support = { path = "../..", default-features = false}
 frame-system = { path = "../../../system", default-features = false}
 sp-runtime = { path = "../../../../primitives/runtime", default-features = false}
diff --git a/substrate/frame/support/test/stg_frame_crate/Cargo.toml b/substrate/frame/support/test/stg_frame_crate/Cargo.toml
new file mode 100644
index 0000000000000000000000000000000000000000..340f08905c32e270fcfac8de2cdee185e670c452
--- /dev/null
+++ b/substrate/frame/support/test/stg_frame_crate/Cargo.toml
@@ -0,0 +1,21 @@
+[package]
+name = "frame-support-test-stg-frame-crate"
+version = "0.1.0"
+authors.workspace = true
+edition.workspace = true
+license = "Apache-2.0"
+publish = false
+homepage = "https://substrate.io"
+repository.workspace = true
+
+[package.metadata.docs.rs]
+targets = ["x86_64-unknown-linux-gnu"]
+
+[dependencies]
+codec = { package = "parity-scale-codec", version = "3.6.1", default-features = false, features = ["derive"] }
+frame = { path = "frame", default-features = false}
+scale-info = { version = "2.0.0", default-features = false, features = ["derive"] }
+
+[features]
+default = [ "std" ]
+std = [ "codec/std", "frame/std", "scale-info/std" ]
diff --git a/substrate/frame/support/test/stg_frame_crate/frame/Cargo.toml b/substrate/frame/support/test/stg_frame_crate/frame/Cargo.toml
new file mode 100644
index 0000000000000000000000000000000000000000..d99ac2d2d46ee49a2dd20f06ef07be6010ae5e0b
--- /dev/null
+++ b/substrate/frame/support/test/stg_frame_crate/frame/Cargo.toml
@@ -0,0 +1,20 @@
+[package]
+name = "frame"
+version = "0.1.0"
+authors.workspace = true
+edition.workspace = true
+license = "Apache-2.0"
+publish = false
+homepage = "https://substrate.io"
+repository.workspace = true
+
+[package.metadata.docs.rs]
+targets = ["x86_64-unknown-linux-gnu"]
+
+[dependencies]
+frame-system = { path = "../../../../system", default-features = false}
+frame-support = { path = "../../..", default-features = false}
+
+[features]
+default = [ "std" ]
+std = [ "frame-support/std", "frame-system/std" ]
diff --git a/polkadot/runtime/kusama/constants/src/weights/mod.rs b/substrate/frame/support/test/stg_frame_crate/frame/src/lib.rs
similarity index 61%
rename from polkadot/runtime/kusama/constants/src/weights/mod.rs
rename to substrate/frame/support/test/stg_frame_crate/frame/src/lib.rs
index 23812ce7ed0528c394f84042fb9842eb617a834b..dba99f1bbe73ff9aba43588a3d220bab9427b8a6 100644
--- a/polkadot/runtime/kusama/constants/src/weights/mod.rs
+++ b/substrate/frame/support/test/stg_frame_crate/frame/src/lib.rs
@@ -7,7 +7,7 @@
 // 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
+// 	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,
@@ -15,14 +15,7 @@
 // See the License for the specific language governing permissions and
 // limitations under the License.
 
-//! Expose the auto generated weight files.
-
-pub mod block_weights;
-pub mod extrinsic_weights;
-pub mod paritydb_weights;
-pub mod rocksdb_weights;
-
-pub use block_weights::BlockExecutionWeight;
-pub use extrinsic_weights::ExtrinsicBaseWeight;
-pub use paritydb_weights::constants::ParityDbWeight;
-pub use rocksdb_weights::constants::RocksDbWeight;
+pub mod deps {
+	pub use frame_support;
+	pub use frame_system;
+}
diff --git a/substrate/frame/support/test/stg_frame_crate/src/lib.rs b/substrate/frame/support/test/stg_frame_crate/src/lib.rs
new file mode 100644
index 0000000000000000000000000000000000000000..501fcf6a70d7aef01a9730455c7e84c905fe7059
--- /dev/null
+++ b/substrate/frame/support/test/stg_frame_crate/src/lib.rs
@@ -0,0 +1,75 @@
+// 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.
+
+// ! A basic pallet to test it compiles along with a runtime using it when `frame_system` and
+// `frame_support` are reexported by a `frame` crate.
+
+use frame::deps::{frame_support, frame_system};
+
+#[frame_support::pallet]
+pub mod pallet {
+	use super::*;
+	use frame_support::pallet_prelude::*;
+
+	#[pallet::pallet]
+	pub struct Pallet<T>(_);
+
+	#[pallet::config]
+	// The only valid syntax here is the following or
+	// ```
+	// pub trait Config: frame::deps::frame_system::Config {}
+	// ```
+	pub trait Config: frame_system::Config {}
+
+	#[pallet::genesis_config]
+	#[derive(frame_support::DefaultNoBound)]
+	pub struct GenesisConfig<T: Config> {
+		#[serde(skip)]
+		_config: core::marker::PhantomData<T>,
+	}
+
+	#[pallet::genesis_build]
+	impl<T: Config> BuildGenesisConfig for GenesisConfig<T> {
+		fn build(&self) {}
+	}
+}
+
+#[cfg(test)]
+// Dummy test to make sure a runtime would compile.
+mod tests {
+	use super::{
+		frame_support::{construct_runtime, derive_impl},
+		frame_system, pallet,
+	};
+
+	type Block = frame_system::mocking::MockBlock<Runtime>;
+
+	impl crate::pallet::Config for Runtime {}
+
+	#[derive_impl(frame_system::config_preludes::TestDefaultConfig as frame_system::DefaultConfig)]
+	impl frame_system::Config for Runtime {
+		type Block = Block;
+	}
+
+	construct_runtime! {
+		pub struct Runtime
+		{
+			System: frame_system::{Pallet, Call, Storage, Config<T>, Event<T>},
+			Pallet: pallet::{Pallet, Config<T>},
+		}
+	}
+}
diff --git a/substrate/frame/support/test/tests/benchmark_ui/bad_param_name.rs b/substrate/frame/support/test/tests/benchmark_ui/bad_param_name.rs
index 657e481a9430a51fdc04a01abfaad3306f4502df..17a3aa4a9eee42b39805474e10913dc19fb49c44 100644
--- a/substrate/frame/support/test/tests/benchmark_ui/bad_param_name.rs
+++ b/substrate/frame/support/test/tests/benchmark_ui/bad_param_name.rs
@@ -1,3 +1,20 @@
+// 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.
+
 use frame_benchmarking::v2::*;
 #[allow(unused_imports)]
 use frame_support_test::Config;
diff --git a/substrate/frame/support/test/tests/benchmark_ui/bad_param_name.stderr b/substrate/frame/support/test/tests/benchmark_ui/bad_param_name.stderr
index 4e2d63a6b5030f7a42a922ac95e1ee43d2032d11..c7deb67112117c0374dad30a401dc098ae24724b 100644
--- a/substrate/frame/support/test/tests/benchmark_ui/bad_param_name.stderr
+++ b/substrate/frame/support/test/tests/benchmark_ui/bad_param_name.stderr
@@ -1,5 +1,5 @@
 error: Benchmark parameter names must consist of a single lowercase letter (a-z) and no other characters.
-  --> tests/benchmark_ui/bad_param_name.rs:10:11
+  --> tests/benchmark_ui/bad_param_name.rs:27:11
    |
-10 |     fn bench(winton: Linear<1, 2>) {
+27 |     fn bench(winton: Linear<1, 2>) {
    |              ^^^^^^
diff --git a/substrate/frame/support/test/tests/benchmark_ui/bad_param_name_too_long.rs b/substrate/frame/support/test/tests/benchmark_ui/bad_param_name_too_long.rs
index f970126d12e7e6a0e2f984173309fa54a894ca19..9c3aff9ff05f097566b586d3382a96626dd9c267 100644
--- a/substrate/frame/support/test/tests/benchmark_ui/bad_param_name_too_long.rs
+++ b/substrate/frame/support/test/tests/benchmark_ui/bad_param_name_too_long.rs
@@ -1,3 +1,20 @@
+// 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.
+
 use frame_benchmarking::v2::*;
 #[allow(unused_imports)]
 use frame_support_test::Config;
diff --git a/substrate/frame/support/test/tests/benchmark_ui/bad_param_name_too_long.stderr b/substrate/frame/support/test/tests/benchmark_ui/bad_param_name_too_long.stderr
index 32f6bf8e47d09f7e8ce9d79e50f38eaa0498c7e0..bed3bc9c4b1e8b6fdfb032ffa1e7a87f718c73e8 100644
--- a/substrate/frame/support/test/tests/benchmark_ui/bad_param_name_too_long.stderr
+++ b/substrate/frame/support/test/tests/benchmark_ui/bad_param_name_too_long.stderr
@@ -1,5 +1,5 @@
 error: Benchmark parameter names must consist of a single lowercase letter (a-z) and no other characters.
- --> tests/benchmark_ui/bad_param_name_too_long.rs:8:11
-  |
-8 |     fn bench(xx: Linear<1, 2>) {
-  |              ^^
+  --> tests/benchmark_ui/bad_param_name_too_long.rs:25:11
+   |
+25 |     fn bench(xx: Linear<1, 2>) {
+   |              ^^
diff --git a/substrate/frame/support/test/tests/benchmark_ui/bad_param_name_upper_case.rs b/substrate/frame/support/test/tests/benchmark_ui/bad_param_name_upper_case.rs
index 9970f3230167244f9bbba2f705e7243f3a784a9e..dad9ee9fd1246598d990634e2bd1f13e752eb8c0 100644
--- a/substrate/frame/support/test/tests/benchmark_ui/bad_param_name_upper_case.rs
+++ b/substrate/frame/support/test/tests/benchmark_ui/bad_param_name_upper_case.rs
@@ -1,3 +1,20 @@
+// 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.
+
 use frame_benchmarking::v2::*;
 #[allow(unused_imports)]
 use frame_support_test::Config;
diff --git a/substrate/frame/support/test/tests/benchmark_ui/bad_param_name_upper_case.stderr b/substrate/frame/support/test/tests/benchmark_ui/bad_param_name_upper_case.stderr
index 48dd41d3262d75642d991e36c032ef2bdea2eb3d..43fd9d9804e0ba542c6fdbcad1571fc67e1f4bee 100644
--- a/substrate/frame/support/test/tests/benchmark_ui/bad_param_name_upper_case.stderr
+++ b/substrate/frame/support/test/tests/benchmark_ui/bad_param_name_upper_case.stderr
@@ -1,5 +1,5 @@
 error: Benchmark parameter names must consist of a single lowercase letter (a-z) and no other characters.
- --> tests/benchmark_ui/bad_param_name_upper_case.rs:8:11
-  |
-8 |     fn bench(D: Linear<1, 2>) {
-  |              ^
+  --> tests/benchmark_ui/bad_param_name_upper_case.rs:25:11
+   |
+25 |     fn bench(D: Linear<1, 2>) {
+   |              ^
diff --git a/substrate/frame/support/test/tests/benchmark_ui/bad_params.rs b/substrate/frame/support/test/tests/benchmark_ui/bad_params.rs
index 5049f2eae2c2edfe92777c5274a9bf551355f268..e92e3d2f25335c691ab618d88bcf57860f4788fb 100644
--- a/substrate/frame/support/test/tests/benchmark_ui/bad_params.rs
+++ b/substrate/frame/support/test/tests/benchmark_ui/bad_params.rs
@@ -1,3 +1,20 @@
+// 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.
+
 use frame_benchmarking::v2::*;
 #[allow(unused_imports)]
 use frame_support_test::Config;
diff --git a/substrate/frame/support/test/tests/benchmark_ui/bad_params.stderr b/substrate/frame/support/test/tests/benchmark_ui/bad_params.stderr
index 068eaedd531b9db0e867e57fa6fe462be5c23843..16aabbff15335759e49e5d37e20b391c5b534d5f 100644
--- a/substrate/frame/support/test/tests/benchmark_ui/bad_params.stderr
+++ b/substrate/frame/support/test/tests/benchmark_ui/bad_params.stderr
@@ -1,5 +1,5 @@
 error: Invalid benchmark function param. A valid example would be `x: Linear<5, 10>`.
-  --> tests/benchmark_ui/bad_params.rs:10:31
+  --> tests/benchmark_ui/bad_params.rs:27:31
    |
-10 |     fn bench(y: Linear<1, 2>, x: u32) {
+27 |     fn bench(y: Linear<1, 2>, x: u32) {
    |                                  ^^^
diff --git a/substrate/frame/support/test/tests/benchmark_ui/bad_return_non_benchmark_err.rs b/substrate/frame/support/test/tests/benchmark_ui/bad_return_non_benchmark_err.rs
index 5e332801df8307ee1a9c3c23e21a02edf37a15bf..4e70aef50ee96c0197b51f9d81c203f98ffb9468 100644
--- a/substrate/frame/support/test/tests/benchmark_ui/bad_return_non_benchmark_err.rs
+++ b/substrate/frame/support/test/tests/benchmark_ui/bad_return_non_benchmark_err.rs
@@ -1,3 +1,20 @@
+// 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.
+
 use frame_benchmarking::v2::*;
 #[allow(unused_imports)]
 use frame_support_test::Config;
diff --git a/substrate/frame/support/test/tests/benchmark_ui/bad_return_non_benchmark_err.stderr b/substrate/frame/support/test/tests/benchmark_ui/bad_return_non_benchmark_err.stderr
index ab0bff54a8a0333bd0e80d9aedb16e2c771b3a4f..f80fe997a00668e88f7ca5786ac001de597d7156 100644
--- a/substrate/frame/support/test/tests/benchmark_ui/bad_return_non_benchmark_err.stderr
+++ b/substrate/frame/support/test/tests/benchmark_ui/bad_return_non_benchmark_err.stderr
@@ -1,5 +1,5 @@
 error: expected `BenchmarkError`
-  --> tests/benchmark_ui/bad_return_non_benchmark_err.rs:10:27
+  --> tests/benchmark_ui/bad_return_non_benchmark_err.rs:27:27
    |
-10 |     fn bench() -> Result<(), BenchmarkException> {
+27 |     fn bench() -> Result<(), BenchmarkException> {
    |                              ^^^^^^^^^^^^^^^^^^
diff --git a/substrate/frame/support/test/tests/benchmark_ui/bad_return_non_type_path.rs b/substrate/frame/support/test/tests/benchmark_ui/bad_return_non_type_path.rs
index a4b0d007eeecb218daf7cbbceabca52c2afbdf83..f424fb1f9266c66c092ea0a13ecaef55abc83b3d 100644
--- a/substrate/frame/support/test/tests/benchmark_ui/bad_return_non_type_path.rs
+++ b/substrate/frame/support/test/tests/benchmark_ui/bad_return_non_type_path.rs
@@ -1,3 +1,20 @@
+// 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.
+
 use frame_benchmarking::v2::*;
 #[allow(unused_imports)]
 use frame_support_test::Config;
diff --git a/substrate/frame/support/test/tests/benchmark_ui/bad_return_non_type_path.stderr b/substrate/frame/support/test/tests/benchmark_ui/bad_return_non_type_path.stderr
index 69d61b4229155e7092ef072d6fe4e8010de50df6..405fb473090f0cba2013cc748a40e5d7e8630abe 100644
--- a/substrate/frame/support/test/tests/benchmark_ui/bad_return_non_type_path.stderr
+++ b/substrate/frame/support/test/tests/benchmark_ui/bad_return_non_type_path.stderr
@@ -1,5 +1,5 @@
 error: Only `Result<(), BenchmarkError>` or a blank return type is allowed on benchmark function definitions
-  --> tests/benchmark_ui/bad_return_non_type_path.rs:10:16
+  --> tests/benchmark_ui/bad_return_non_type_path.rs:27:16
    |
-10 |     fn bench() -> (String, u32) {
+27 |     fn bench() -> (String, u32) {
    |                   ^^^^^^^^^^^^^
diff --git a/substrate/frame/support/test/tests/benchmark_ui/bad_return_non_unit_t.rs b/substrate/frame/support/test/tests/benchmark_ui/bad_return_non_unit_t.rs
index 15289c298aec1558419a6ba9b41b8f36e9905eb9..e204e66c1294c1822b28b8f97ae500d4fb6829b6 100644
--- a/substrate/frame/support/test/tests/benchmark_ui/bad_return_non_unit_t.rs
+++ b/substrate/frame/support/test/tests/benchmark_ui/bad_return_non_unit_t.rs
@@ -1,3 +1,20 @@
+// 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.
+
 use frame_benchmarking::v2::*;
 #[allow(unused_imports)]
 use frame_support_test::Config;
diff --git a/substrate/frame/support/test/tests/benchmark_ui/bad_return_non_unit_t.stderr b/substrate/frame/support/test/tests/benchmark_ui/bad_return_non_unit_t.stderr
index 4181ea099a14ffdfa4814a1d1b05d7d74a659c82..cae0a7a0584bafda47e832de790a72eac22e19a0 100644
--- a/substrate/frame/support/test/tests/benchmark_ui/bad_return_non_unit_t.stderr
+++ b/substrate/frame/support/test/tests/benchmark_ui/bad_return_non_unit_t.stderr
@@ -1,5 +1,5 @@
 error: expected `()`
- --> tests/benchmark_ui/bad_return_non_unit_t.rs:8:23
-  |
-8 |     fn bench() -> Result<u32, BenchmarkError> {
-  |                          ^^^
+  --> tests/benchmark_ui/bad_return_non_unit_t.rs:25:23
+   |
+25 |     fn bench() -> Result<u32, BenchmarkError> {
+   |                          ^^^
diff --git a/substrate/frame/support/test/tests/benchmark_ui/bad_return_type_blank_with_question.rs b/substrate/frame/support/test/tests/benchmark_ui/bad_return_type_blank_with_question.rs
index a6a2c61127fa2c03d11268db9659ec8a659c4bd0..dd3ea73951ea0f07b4f0893a17f83708dbcb8b9e 100644
--- a/substrate/frame/support/test/tests/benchmark_ui/bad_return_type_blank_with_question.rs
+++ b/substrate/frame/support/test/tests/benchmark_ui/bad_return_type_blank_with_question.rs
@@ -1,3 +1,20 @@
+// 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.
+
 use frame_benchmarking::v2::*;
 #[allow(unused_imports)]
 use frame_support_test::Config;
diff --git a/substrate/frame/support/test/tests/benchmark_ui/bad_return_type_blank_with_question.stderr b/substrate/frame/support/test/tests/benchmark_ui/bad_return_type_blank_with_question.stderr
index 601bbd20fb73d404350205926c3d5f5f14b0e95e..7e0a02be649b4755edac171619b4808b739844a4 100644
--- a/substrate/frame/support/test/tests/benchmark_ui/bad_return_type_blank_with_question.stderr
+++ b/substrate/frame/support/test/tests/benchmark_ui/bad_return_type_blank_with_question.stderr
@@ -1,10 +1,10 @@
 error[E0277]: the `?` operator can only be used in a function that returns `Result` or `Option` (or another type that implements `FromResidual`)
-  --> tests/benchmark_ui/bad_return_type_blank_with_question.rs:15:14
+  --> tests/benchmark_ui/bad_return_type_blank_with_question.rs:32:14
    |
-5  | #[benchmarks]
+22 | #[benchmarks]
    | ------------- this function should return `Result` or `Option` to accept `?`
 ...
-15 |         something()?;
+32 |         something()?;
    |                    ^ cannot use the `?` operator in a function that returns `()`
    |
    = help: the trait `FromResidual<Result<Infallible, frame_benchmarking::BenchmarkError>>` is not implemented for `()`
diff --git a/substrate/frame/support/test/tests/benchmark_ui/bad_return_type_no_last_stmt.rs b/substrate/frame/support/test/tests/benchmark_ui/bad_return_type_no_last_stmt.rs
index 76f1299005309832dd834327ccdd60b26e6d85a9..cf4605406fa66e9cbaa8b4525aac6ae933c41e88 100644
--- a/substrate/frame/support/test/tests/benchmark_ui/bad_return_type_no_last_stmt.rs
+++ b/substrate/frame/support/test/tests/benchmark_ui/bad_return_type_no_last_stmt.rs
@@ -1,3 +1,20 @@
+// 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.
+
 use frame_benchmarking::v2::*;
 #[allow(unused_imports)]
 use frame_support_test::Config;
diff --git a/substrate/frame/support/test/tests/benchmark_ui/bad_return_type_no_last_stmt.stderr b/substrate/frame/support/test/tests/benchmark_ui/bad_return_type_no_last_stmt.stderr
index ff501a620fe33fad0b67eac73d16396cfc9f6107..9ec5a17118e94c79de9df997e7bb107a9a3a26bd 100644
--- a/substrate/frame/support/test/tests/benchmark_ui/bad_return_type_no_last_stmt.stderr
+++ b/substrate/frame/support/test/tests/benchmark_ui/bad_return_type_no_last_stmt.stderr
@@ -1,9 +1,9 @@
 error: Benchmark `#[block]` or `#[extrinsic_call]` item cannot be the last statement of your benchmark function definition if you have defined a return type. You should return something compatible with Result<(), BenchmarkError> (i.e. `Ok(())`) as the last statement or change your signature to a blank return type.
-  --> tests/benchmark_ui/bad_return_type_no_last_stmt.rs:10:43
+  --> tests/benchmark_ui/bad_return_type_no_last_stmt.rs:27:43
    |
-10 |       fn bench() -> Result<(), BenchmarkError> {
+27 |       fn bench() -> Result<(), BenchmarkError> {
    |  ______________________________________________^
-11 | |         #[block]
-12 | |         {}
-13 | |     }
+28 | |         #[block]
+29 | |         {}
+30 | |     }
    | |_____^
diff --git a/substrate/frame/support/test/tests/benchmark_ui/bad_return_type_non_result.rs b/substrate/frame/support/test/tests/benchmark_ui/bad_return_type_non_result.rs
index c206ec36a151e24f4a91d62680e6436a01e8c032..5a434aac55ce6bac3cc7b73287f0c9a9aeb264d2 100644
--- a/substrate/frame/support/test/tests/benchmark_ui/bad_return_type_non_result.rs
+++ b/substrate/frame/support/test/tests/benchmark_ui/bad_return_type_non_result.rs
@@ -1,3 +1,20 @@
+// 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.
+
 use frame_benchmarking::v2::*;
 #[allow(unused_imports)]
 use frame_support_test::Config;
diff --git a/substrate/frame/support/test/tests/benchmark_ui/bad_return_type_non_result.stderr b/substrate/frame/support/test/tests/benchmark_ui/bad_return_type_non_result.stderr
index b830b8eb59c636fe5a517271b9bd4919cc47bd8f..ff813df375db0e38af06550f65ecf5d631f8b5f2 100644
--- a/substrate/frame/support/test/tests/benchmark_ui/bad_return_type_non_result.stderr
+++ b/substrate/frame/support/test/tests/benchmark_ui/bad_return_type_non_result.stderr
@@ -1,5 +1,5 @@
 error: expected `Result`
-  --> tests/benchmark_ui/bad_return_type_non_result.rs:10:31
+  --> tests/benchmark_ui/bad_return_type_non_result.rs:27:31
    |
-10 |     fn bench(y: Linear<1, 2>) -> String {
+27 |     fn bench(y: Linear<1, 2>) -> String {
    |                                  ^^^^^^
diff --git a/substrate/frame/support/test/tests/benchmark_ui/bad_return_type_option.rs b/substrate/frame/support/test/tests/benchmark_ui/bad_return_type_option.rs
index 4b55885939747113ae1c715779c881148d142ce5..1a831e6e679bcbc1301b00b202114477d7b953a5 100644
--- a/substrate/frame/support/test/tests/benchmark_ui/bad_return_type_option.rs
+++ b/substrate/frame/support/test/tests/benchmark_ui/bad_return_type_option.rs
@@ -1,3 +1,20 @@
+// 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.
+
 use frame_benchmarking::v2::*;
 #[allow(unused_imports)]
 use frame_support_test::Config;
diff --git a/substrate/frame/support/test/tests/benchmark_ui/bad_return_type_option.stderr b/substrate/frame/support/test/tests/benchmark_ui/bad_return_type_option.stderr
index 050da1676735a55c849650b84ed821f216d50ac3..6b2f73bd666d2096c811f482c04eb5a117b0b884 100644
--- a/substrate/frame/support/test/tests/benchmark_ui/bad_return_type_option.stderr
+++ b/substrate/frame/support/test/tests/benchmark_ui/bad_return_type_option.stderr
@@ -1,5 +1,5 @@
 error: expected `Result`
-  --> tests/benchmark_ui/bad_return_type_option.rs:10:16
+  --> tests/benchmark_ui/bad_return_type_option.rs:27:16
    |
-10 |     fn bench() -> Option<BenchmarkError> {
+27 |     fn bench() -> Option<BenchmarkError> {
    |                   ^^^^^^
diff --git a/substrate/frame/support/test/tests/benchmark_ui/dup_block.rs b/substrate/frame/support/test/tests/benchmark_ui/dup_block.rs
index 2c2ef9db9a45c327d2f0aeedaf1bad42bc2b43a3..cba310adb26be511e3c2da9b7727c75106832118 100644
--- a/substrate/frame/support/test/tests/benchmark_ui/dup_block.rs
+++ b/substrate/frame/support/test/tests/benchmark_ui/dup_block.rs
@@ -1,3 +1,20 @@
+// 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.
+
 use frame_benchmarking::v2::*;
 #[allow(unused_imports)]
 use frame_support_test::Config;
diff --git a/substrate/frame/support/test/tests/benchmark_ui/dup_block.stderr b/substrate/frame/support/test/tests/benchmark_ui/dup_block.stderr
index 3d73c3d6609b15fafa543328a5a6e31f2d59fd26..f17cec0fbdfeae9551fa0f8a92f018cfee6f0ecc 100644
--- a/substrate/frame/support/test/tests/benchmark_ui/dup_block.stderr
+++ b/substrate/frame/support/test/tests/benchmark_ui/dup_block.stderr
@@ -1,5 +1,5 @@
 error: Only one #[extrinsic_call] or #[block] attribute is allowed per benchmark.
-  --> tests/benchmark_ui/dup_block.rs:14:3
+  --> tests/benchmark_ui/dup_block.rs:31:3
    |
-14 |         #[block]
+31 |         #[block]
    |         ^
diff --git a/substrate/frame/support/test/tests/benchmark_ui/dup_extrinsic_call.rs b/substrate/frame/support/test/tests/benchmark_ui/dup_extrinsic_call.rs
index 4d135d1a04f527841b4dcd8793a15fd602f37c3b..e82f6ec3d90d974161532f5b54962e52eaeb9b6a 100644
--- a/substrate/frame/support/test/tests/benchmark_ui/dup_extrinsic_call.rs
+++ b/substrate/frame/support/test/tests/benchmark_ui/dup_extrinsic_call.rs
@@ -1,3 +1,20 @@
+// 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.
+
 use frame_benchmarking::v2::*;
 #[allow(unused_imports)]
 use frame_support_test::Config;
diff --git a/substrate/frame/support/test/tests/benchmark_ui/dup_extrinsic_call.stderr b/substrate/frame/support/test/tests/benchmark_ui/dup_extrinsic_call.stderr
index 593f7072bfa512f958e8106ec8f6a55fe60c1c5c..6512c7535906cfd49d1cb85eb505df355eaecf29 100644
--- a/substrate/frame/support/test/tests/benchmark_ui/dup_extrinsic_call.stderr
+++ b/substrate/frame/support/test/tests/benchmark_ui/dup_extrinsic_call.stderr
@@ -1,5 +1,5 @@
 error: Only one #[extrinsic_call] or #[block] attribute is allowed per benchmark.
-  --> tests/benchmark_ui/dup_extrinsic_call.rs:14:3
+  --> tests/benchmark_ui/dup_extrinsic_call.rs:31:3
    |
-14 |         #[extrinsic_call]
+31 |         #[extrinsic_call]
    |         ^
diff --git a/substrate/frame/support/test/tests/benchmark_ui/empty_function.rs b/substrate/frame/support/test/tests/benchmark_ui/empty_function.rs
index bc04101dd384a04409b7d2ab26a413d05435afd4..7fcd45d1bc4fcbe47b8972a62a57533d39979ba4 100644
--- a/substrate/frame/support/test/tests/benchmark_ui/empty_function.rs
+++ b/substrate/frame/support/test/tests/benchmark_ui/empty_function.rs
@@ -1,3 +1,20 @@
+// 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.
+
 use frame_benchmarking::v2::*;
 #[allow(unused_imports)]
 use frame_support_test::Config;
diff --git a/substrate/frame/support/test/tests/benchmark_ui/empty_function.stderr b/substrate/frame/support/test/tests/benchmark_ui/empty_function.stderr
index 69d75303613d9ae5d88d71414eb626d5d3f6169a..4d73fa1835a5276ab2d192b04c2ce599d20ed0d4 100644
--- a/substrate/frame/support/test/tests/benchmark_ui/empty_function.stderr
+++ b/substrate/frame/support/test/tests/benchmark_ui/empty_function.stderr
@@ -1,5 +1,5 @@
 error: No valid #[extrinsic_call] or #[block] annotation could be found in benchmark function body.
-  --> tests/benchmark_ui/empty_function.rs:10:13
+  --> tests/benchmark_ui/empty_function.rs:27:13
    |
-10 |     fn bench() {}
+27 |     fn bench() {}
    |                ^^
diff --git a/substrate/frame/support/test/tests/benchmark_ui/extra_extra.rs b/substrate/frame/support/test/tests/benchmark_ui/extra_extra.rs
index 1aa6c9ecb7526cd8f40b88118266863e9d96c18f..d94c427451c2e5c86d5795b584722e571cdd8b37 100644
--- a/substrate/frame/support/test/tests/benchmark_ui/extra_extra.rs
+++ b/substrate/frame/support/test/tests/benchmark_ui/extra_extra.rs
@@ -1,3 +1,20 @@
+// 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.
+
 use frame_benchmarking::v2::*;
 #[allow(unused_imports)]
 use frame_support_test::Config;
diff --git a/substrate/frame/support/test/tests/benchmark_ui/extra_extra.stderr b/substrate/frame/support/test/tests/benchmark_ui/extra_extra.stderr
index bf36b4f08054a7b78b6ebc98805b0eb2907e1c05..17c67d21be1d33f6153c186895c45e967aedfe53 100644
--- a/substrate/frame/support/test/tests/benchmark_ui/extra_extra.stderr
+++ b/substrate/frame/support/test/tests/benchmark_ui/extra_extra.stderr
@@ -1,5 +1,5 @@
 error: unexpected end of input, `extra` can only be specified once
- --> tests/benchmark_ui/extra_extra.rs:9:26
-  |
-9 |     #[benchmark(extra, extra)]
-  |                             ^
+  --> tests/benchmark_ui/extra_extra.rs:26:26
+   |
+26 |     #[benchmark(extra, extra)]
+   |                             ^
diff --git a/substrate/frame/support/test/tests/benchmark_ui/extra_skip_meta.rs b/substrate/frame/support/test/tests/benchmark_ui/extra_skip_meta.rs
index 3418c7af73748f431278c154c7ca1c6699bd8614..37693c4b718bc4b25dddfe6c6dd23bdf881a329c 100644
--- a/substrate/frame/support/test/tests/benchmark_ui/extra_skip_meta.rs
+++ b/substrate/frame/support/test/tests/benchmark_ui/extra_skip_meta.rs
@@ -1,3 +1,20 @@
+// 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.
+
 use frame_benchmarking::v2::*;
 #[allow(unused_imports)]
 use frame_support_test::Config;
diff --git a/substrate/frame/support/test/tests/benchmark_ui/extra_skip_meta.stderr b/substrate/frame/support/test/tests/benchmark_ui/extra_skip_meta.stderr
index 4d48a8ad77a45a66d52cd05bd6b3046bbd2adac9..e17eba963a11fbb2114aaaee4073c7d3c5ceb64d 100644
--- a/substrate/frame/support/test/tests/benchmark_ui/extra_skip_meta.stderr
+++ b/substrate/frame/support/test/tests/benchmark_ui/extra_skip_meta.stderr
@@ -1,5 +1,5 @@
 error: unexpected end of input, `skip_meta` can only be specified once
- --> tests/benchmark_ui/extra_skip_meta.rs:9:34
-  |
-9 |     #[benchmark(skip_meta, skip_meta)]
-  |                                     ^
+  --> tests/benchmark_ui/extra_skip_meta.rs:26:34
+   |
+26 |     #[benchmark(skip_meta, skip_meta)]
+   |                                     ^
diff --git a/substrate/frame/support/test/tests/benchmark_ui/extrinsic_call_out_of_fn.rs b/substrate/frame/support/test/tests/benchmark_ui/extrinsic_call_out_of_fn.rs
index ce360ee7577f5f0503af2e9b87eb293166a7d66b..101ba73488fad7f1d1a54b0f409014c0dc5943f1 100644
--- a/substrate/frame/support/test/tests/benchmark_ui/extrinsic_call_out_of_fn.rs
+++ b/substrate/frame/support/test/tests/benchmark_ui/extrinsic_call_out_of_fn.rs
@@ -1,3 +1,20 @@
+// 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.
+
 use frame_benchmarking::v2::*;
 
 #[extrinsic_call]
diff --git a/substrate/frame/support/test/tests/benchmark_ui/extrinsic_call_out_of_fn.stderr b/substrate/frame/support/test/tests/benchmark_ui/extrinsic_call_out_of_fn.stderr
index c5194d7a66502cc980a6832d4bfe1fc407976f77..530754b723a0eb9a69582fe639611df315e56a01 100644
--- a/substrate/frame/support/test/tests/benchmark_ui/extrinsic_call_out_of_fn.stderr
+++ b/substrate/frame/support/test/tests/benchmark_ui/extrinsic_call_out_of_fn.stderr
@@ -1,7 +1,7 @@
 error: `#[extrinsic_call]` must be in a benchmark function definition labeled with `#[benchmark]`.
- --> tests/benchmark_ui/extrinsic_call_out_of_fn.rs:3:1
-  |
-3 | #[extrinsic_call]
-  | ^^^^^^^^^^^^^^^^^
-  |
-  = note: this error originates in the attribute macro `extrinsic_call` (in Nightly builds, run with -Z macro-backtrace for more info)
+  --> tests/benchmark_ui/extrinsic_call_out_of_fn.rs:20:1
+   |
+20 | #[extrinsic_call]
+   | ^^^^^^^^^^^^^^^^^
+   |
+   = note: this error originates in the attribute macro `extrinsic_call` (in Nightly builds, run with -Z macro-backtrace for more info)
diff --git a/substrate/frame/support/test/tests/benchmark_ui/invalid_origin.rs b/substrate/frame/support/test/tests/benchmark_ui/invalid_origin.rs
index cfb00e88c00c0e07abd0180386b73c2d58bca02a..ce7693fc71b5b9ae90869ee7b5fd0922694679d4 100644
--- a/substrate/frame/support/test/tests/benchmark_ui/invalid_origin.rs
+++ b/substrate/frame/support/test/tests/benchmark_ui/invalid_origin.rs
@@ -1,3 +1,20 @@
+// 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.
+
 use frame_benchmarking::v2::*;
 #[allow(unused_imports)]
 use frame_support_test::Config;
diff --git a/substrate/frame/support/test/tests/benchmark_ui/invalid_origin.stderr b/substrate/frame/support/test/tests/benchmark_ui/invalid_origin.stderr
index 115a8206f58a3683037f74fc0ce591db299327f2..87d4f476a60d1be358a31f965d9d01772082e450 100644
--- a/substrate/frame/support/test/tests/benchmark_ui/invalid_origin.stderr
+++ b/substrate/frame/support/test/tests/benchmark_ui/invalid_origin.stderr
@@ -1,8 +1,8 @@
 error[E0277]: the trait bound `<T as frame_support_test::Config>::RuntimeOrigin: From<{integer}>` is not satisfied
- --> tests/benchmark_ui/invalid_origin.rs:6:1
-  |
-6 | #[benchmarks]
-  | ^^^^^^^^^^^^^ the trait `From<{integer}>` is not implemented for `<T as frame_support_test::Config>::RuntimeOrigin`
-  |
-  = note: required for `{integer}` to implement `Into<<T as frame_support_test::Config>::RuntimeOrigin>`
-  = note: this error originates in the attribute macro `benchmarks` (in Nightly builds, run with -Z macro-backtrace for more info)
+  --> tests/benchmark_ui/invalid_origin.rs:23:1
+   |
+23 | #[benchmarks]
+   | ^^^^^^^^^^^^^ the trait `From<{integer}>` is not implemented for `<T as frame_support_test::Config>::RuntimeOrigin`
+   |
+   = note: required for `{integer}` to implement `Into<<T as frame_support_test::Config>::RuntimeOrigin>`
+   = note: this error originates in the attribute macro `benchmarks` (in Nightly builds, run with -Z macro-backtrace for more info)
diff --git a/substrate/frame/support/test/tests/benchmark_ui/missing_call.rs b/substrate/frame/support/test/tests/benchmark_ui/missing_call.rs
index f39e74286b5cbe84e9cfa16ee3526f552730621d..0e65f6867a413ac79b63a1634642a9595895a003 100644
--- a/substrate/frame/support/test/tests/benchmark_ui/missing_call.rs
+++ b/substrate/frame/support/test/tests/benchmark_ui/missing_call.rs
@@ -1,3 +1,20 @@
+// 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.
+
 use frame_benchmarking::v2::*;
 #[allow(unused_imports)]
 use frame_support_test::Config;
diff --git a/substrate/frame/support/test/tests/benchmark_ui/missing_call.stderr b/substrate/frame/support/test/tests/benchmark_ui/missing_call.stderr
index 908d9704392271d02b136237b53859dae8ab8e78..fd4d43d0a3d329c0e8fc30a55a9ff5cb734a006a 100644
--- a/substrate/frame/support/test/tests/benchmark_ui/missing_call.stderr
+++ b/substrate/frame/support/test/tests/benchmark_ui/missing_call.stderr
@@ -1,8 +1,8 @@
 error: No valid #[extrinsic_call] or #[block] annotation could be found in benchmark function body.
-  --> tests/benchmark_ui/missing_call.rs:10:13
+  --> tests/benchmark_ui/missing_call.rs:27:13
    |
-10 |       fn bench() {
+27 |       fn bench() {
    |  ________________^
-11 | |         assert_eq!(2 + 2, 4);
-12 | |     }
+28 | |         assert_eq!(2 + 2, 4);
+29 | |     }
    | |_____^
diff --git a/substrate/frame/support/test/tests/benchmark_ui/missing_origin.rs b/substrate/frame/support/test/tests/benchmark_ui/missing_origin.rs
index 2aaed756b9a46e894ee3f412b141dfa4d102ae17..15fb850dfbc5c7b85109d0feb00536cb949f9181 100644
--- a/substrate/frame/support/test/tests/benchmark_ui/missing_origin.rs
+++ b/substrate/frame/support/test/tests/benchmark_ui/missing_origin.rs
@@ -1,3 +1,20 @@
+// 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.
+
 use frame_benchmarking::v2::*;
 #[allow(unused_imports)]
 use frame_support_test::Config;
diff --git a/substrate/frame/support/test/tests/benchmark_ui/missing_origin.stderr b/substrate/frame/support/test/tests/benchmark_ui/missing_origin.stderr
index 0e72bff4747a3f4deadb96eaa0dfb19a60923749..c72f2734db52418828c655619575f45b92aee592 100644
--- a/substrate/frame/support/test/tests/benchmark_ui/missing_origin.stderr
+++ b/substrate/frame/support/test/tests/benchmark_ui/missing_origin.stderr
@@ -1,5 +1,5 @@
 error: Single-item extrinsic calls must specify their origin as the first argument.
-  --> tests/benchmark_ui/missing_origin.rs:12:3
+  --> tests/benchmark_ui/missing_origin.rs:29:3
    |
-12 |         thing();
+29 |         thing();
    |         ^^^^^
diff --git a/substrate/frame/support/test/tests/benchmark_ui/pass/valid_basic.rs b/substrate/frame/support/test/tests/benchmark_ui/pass/valid_basic.rs
index 450ce4f9c50da5eb1eb5457cff8092fe12c76d70..126cee8fa6c535f5651e083e181d58ffa13c1e73 100644
--- a/substrate/frame/support/test/tests/benchmark_ui/pass/valid_basic.rs
+++ b/substrate/frame/support/test/tests/benchmark_ui/pass/valid_basic.rs
@@ -1,3 +1,20 @@
+// 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.
+
 use frame_benchmarking::v2::*;
 use frame_support_test::Config;
 
diff --git a/substrate/frame/support/test/tests/benchmark_ui/pass/valid_complex_path_benchmark_result.rs b/substrate/frame/support/test/tests/benchmark_ui/pass/valid_complex_path_benchmark_result.rs
index 4930aedd6011e6b63848a825ae368935e71b0b6e..5cbc4aa23f19639bcf3bc2aaa378dd99c4308e2e 100644
--- a/substrate/frame/support/test/tests/benchmark_ui/pass/valid_complex_path_benchmark_result.rs
+++ b/substrate/frame/support/test/tests/benchmark_ui/pass/valid_complex_path_benchmark_result.rs
@@ -1,3 +1,20 @@
+// 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.
+
 use frame_benchmarking::v2::*;
 #[allow(unused_imports)]
 use frame_support_test::Config;
diff --git a/substrate/frame/support/test/tests/benchmark_ui/pass/valid_const_expr.rs b/substrate/frame/support/test/tests/benchmark_ui/pass/valid_const_expr.rs
index bead3bf277be269eb74aa6d17220f032cd6e1269..b1ef44be8b09dcb5e55a998b49cf38ffde7e91b3 100644
--- a/substrate/frame/support/test/tests/benchmark_ui/pass/valid_const_expr.rs
+++ b/substrate/frame/support/test/tests/benchmark_ui/pass/valid_const_expr.rs
@@ -1,3 +1,20 @@
+// 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.
+
 use frame_benchmarking::v2::*;
 use frame_support_test::Config;
 use frame_support::parameter_types;
diff --git a/substrate/frame/support/test/tests/benchmark_ui/pass/valid_no_last_stmt.rs b/substrate/frame/support/test/tests/benchmark_ui/pass/valid_no_last_stmt.rs
index ce09b437a83bd42eb023a321d9ea1e913011a327..0bbd412423a9f3f8d253c6a848ddcdf95e65ac35 100644
--- a/substrate/frame/support/test/tests/benchmark_ui/pass/valid_no_last_stmt.rs
+++ b/substrate/frame/support/test/tests/benchmark_ui/pass/valid_no_last_stmt.rs
@@ -1,3 +1,20 @@
+// 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.
+
 use frame_benchmarking::v2::*;
 #[allow(unused_imports)]
 use frame_support_test::Config;
diff --git a/substrate/frame/support/test/tests/benchmark_ui/pass/valid_path_result_benchmark_error.rs b/substrate/frame/support/test/tests/benchmark_ui/pass/valid_path_result_benchmark_error.rs
index 4930aedd6011e6b63848a825ae368935e71b0b6e..5cbc4aa23f19639bcf3bc2aaa378dd99c4308e2e 100644
--- a/substrate/frame/support/test/tests/benchmark_ui/pass/valid_path_result_benchmark_error.rs
+++ b/substrate/frame/support/test/tests/benchmark_ui/pass/valid_path_result_benchmark_error.rs
@@ -1,3 +1,20 @@
+// 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.
+
 use frame_benchmarking::v2::*;
 #[allow(unused_imports)]
 use frame_support_test::Config;
diff --git a/substrate/frame/support/test/tests/benchmark_ui/pass/valid_result.rs b/substrate/frame/support/test/tests/benchmark_ui/pass/valid_result.rs
index 33d71ece4a01812e61a7489d7cce72790050fd64..2948a2b7ebcd20397f899081f08c5c6e32cf2a4c 100644
--- a/substrate/frame/support/test/tests/benchmark_ui/pass/valid_result.rs
+++ b/substrate/frame/support/test/tests/benchmark_ui/pass/valid_result.rs
@@ -1,3 +1,20 @@
+// 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.
+
 use frame_benchmarking::v2::*;
 use frame_support_test::Config;
 
diff --git a/substrate/frame/support/test/tests/benchmark_ui/unrecognized_option.rs b/substrate/frame/support/test/tests/benchmark_ui/unrecognized_option.rs
index 18cae4d5d5c8efacc49019710b4a6ec0260f2da6..0b007741f11ef9cf8484810762ab6eb32c680d0a 100644
--- a/substrate/frame/support/test/tests/benchmark_ui/unrecognized_option.rs
+++ b/substrate/frame/support/test/tests/benchmark_ui/unrecognized_option.rs
@@ -1,3 +1,20 @@
+// 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.
+
 use frame_benchmarking::v2::*;
 #[allow(unused_imports)]
 use frame_support_test::Config;
diff --git a/substrate/frame/support/test/tests/benchmark_ui/unrecognized_option.stderr b/substrate/frame/support/test/tests/benchmark_ui/unrecognized_option.stderr
index 5cebe9eab05e905e7b0a958884427ffd9e361bc5..bea770b634e25495a9207be51d41c363848fdc1f 100644
--- a/substrate/frame/support/test/tests/benchmark_ui/unrecognized_option.stderr
+++ b/substrate/frame/support/test/tests/benchmark_ui/unrecognized_option.stderr
@@ -1,5 +1,5 @@
 error: expected `extra` or `skip_meta`
- --> tests/benchmark_ui/unrecognized_option.rs:9:32
-  |
-9 |     #[benchmark(skip_meta, extra, bad)]
-  |                                   ^^^
+  --> tests/benchmark_ui/unrecognized_option.rs:26:32
+   |
+26 |     #[benchmark(skip_meta, extra, bad)]
+   |                                   ^^^
diff --git a/substrate/frame/support/test/tests/construct_runtime.rs b/substrate/frame/support/test/tests/construct_runtime.rs
index a14276fa4d2ff5661663b9cc6a919c20f1d09d6d..9ad51ad530ebd2606f6b5cb6858b57e164b68830 100644
--- a/substrate/frame/support/test/tests/construct_runtime.rs
+++ b/substrate/frame/support/test/tests/construct_runtime.rs
@@ -578,14 +578,14 @@ fn call_weight_should_attach_to_call_enum() {
 
 #[test]
 fn call_name() {
-	use frame_support::dispatch::GetCallName;
+	use frame_support::traits::GetCallName;
 	let name = module3::Call::<Runtime>::aux_4 {}.get_call_name();
 	assert_eq!("aux_4", name);
 }
 
 #[test]
 fn call_metadata() {
-	use frame_support::dispatch::{CallMetadata, GetCallMetadata};
+	use frame_support::traits::{CallMetadata, GetCallMetadata};
 	let call = RuntimeCall::Module3(module3::Call::<Runtime>::aux_4 {});
 	let metadata = call.get_call_metadata();
 	let expected = CallMetadata { function_name: "aux_4".into(), pallet_name: "Module3".into() };
@@ -594,14 +594,14 @@ fn call_metadata() {
 
 #[test]
 fn get_call_names() {
-	use frame_support::dispatch::GetCallName;
+	use frame_support::traits::GetCallName;
 	let call_names = module3::Call::<Runtime>::get_call_names();
 	assert_eq!(["fail", "aux_1", "aux_2", "aux_3", "aux_4", "operational"], call_names);
 }
 
 #[test]
 fn get_module_names() {
-	use frame_support::dispatch::GetCallMetadata;
+	use frame_support::traits::GetCallMetadata;
 	let module_names = RuntimeCall::get_module_names();
 	assert_eq!(
 		[
diff --git a/substrate/frame/support/test/tests/construct_runtime_ui.rs b/substrate/frame/support/test/tests/construct_runtime_ui.rs
index ec6758f4b295fd9ced4c70e4f5cc27ce1ddbd3a6..0cf857e2d73c025392c96e02c3d7439690ea8c88 100644
--- a/substrate/frame/support/test/tests/construct_runtime_ui.rs
+++ b/substrate/frame/support/test/tests/construct_runtime_ui.rs
@@ -27,6 +27,10 @@ fn ui() {
 	// As trybuild is using `cargo check`, we don't need the real WASM binaries.
 	std::env::set_var("SKIP_WASM_BUILD", "1");
 
+	// Deny all warnings since we emit warnings as part of a Runtime's UI.
+	std::env::set_var("RUSTFLAGS", "--deny warnings");
+
 	let t = trybuild::TestCases::new();
 	t.compile_fail("tests/construct_runtime_ui/*.rs");
+	t.pass("tests/construct_runtime_ui/pass/*.rs");
 }
diff --git a/substrate/frame/support/test/tests/construct_runtime_ui/abundant_where_param.rs b/substrate/frame/support/test/tests/construct_runtime_ui/abundant_where_param.rs
index ab55c22e9fbf19c10befe81585c322eeede4d0aa..fddb6408ea7b3ad71e696bba3b16a2ed60f0550e 100644
--- a/substrate/frame/support/test/tests/construct_runtime_ui/abundant_where_param.rs
+++ b/substrate/frame/support/test/tests/construct_runtime_ui/abundant_where_param.rs
@@ -1,3 +1,20 @@
+// 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.
+
 use frame_support::construct_runtime;
 
 construct_runtime! {
diff --git a/substrate/frame/support/test/tests/construct_runtime_ui/abundant_where_param.stderr b/substrate/frame/support/test/tests/construct_runtime_ui/abundant_where_param.stderr
index b622adbfe65b417865827af90ab13397ddad0a85..8fd67547af933f282b6537f54cac8d1ec3cbb086 100644
--- a/substrate/frame/support/test/tests/construct_runtime_ui/abundant_where_param.stderr
+++ b/substrate/frame/support/test/tests/construct_runtime_ui/abundant_where_param.stderr
@@ -1,5 +1,5 @@
 error: `Block` was declared above. Please use exactly one declaration for `Block`.
- --> $DIR/abundant_where_param.rs:7:3
-  |
-7 |         Block = Block1,
-  |         ^^^^^
+  --> tests/construct_runtime_ui/abundant_where_param.rs:24:3
+   |
+24 |         Block = Block1,
+   |         ^^^^^
diff --git a/substrate/frame/support/test/tests/construct_runtime_ui/both_use_and_excluded_parts.rs b/substrate/frame/support/test/tests/construct_runtime_ui/both_use_and_excluded_parts.rs
index 4cb249714650e8b7dcee376e0342b13c5d273a39..d5d8553725aea1ced00f0d00e7cf18b0f40b36cc 100644
--- a/substrate/frame/support/test/tests/construct_runtime_ui/both_use_and_excluded_parts.rs
+++ b/substrate/frame/support/test/tests/construct_runtime_ui/both_use_and_excluded_parts.rs
@@ -1,3 +1,20 @@
+// 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.
+
 use frame_support::construct_runtime;
 use sp_runtime::{generic, traits::BlakeTwo256};
 use sp_core::sr25519;
diff --git a/substrate/frame/support/test/tests/construct_runtime_ui/both_use_and_excluded_parts.stderr b/substrate/frame/support/test/tests/construct_runtime_ui/both_use_and_excluded_parts.stderr
index 1ea62b7d6fd653faee0f8d111b757512047a6df1..732b8edb8211d5d4db46f658ce44a73f80a64196 100644
--- a/substrate/frame/support/test/tests/construct_runtime_ui/both_use_and_excluded_parts.stderr
+++ b/substrate/frame/support/test/tests/construct_runtime_ui/both_use_and_excluded_parts.stderr
@@ -1,22 +1,22 @@
 error: Unexpected tokens, expected one of `=`, `,`
-  --> tests/construct_runtime_ui/both_use_and_excluded_parts.rs:26:43
+  --> tests/construct_runtime_ui/both_use_and_excluded_parts.rs:43:43
    |
-26 |         Pallet: pallet exclude_parts { Pallet } use_parts { Pallet },
+43 |         Pallet: pallet exclude_parts { Pallet } use_parts { Pallet },
    |                                                 ^^^^^^^^^
 
 error[E0412]: cannot find type `RuntimeCall` in this scope
-  --> tests/construct_runtime_ui/both_use_and_excluded_parts.rs:18:64
+  --> tests/construct_runtime_ui/both_use_and_excluded_parts.rs:35:64
    |
-18 | pub type UncheckedExtrinsic = generic::UncheckedExtrinsic<u32, RuntimeCall, Signature, ()>;
+35 | pub type UncheckedExtrinsic = generic::UncheckedExtrinsic<u32, RuntimeCall, Signature, ()>;
    |                                                                ^^^^^^^^^^^ not found in this scope
    |
 help: you might be missing a type parameter
    |
-18 | pub type UncheckedExtrinsic<RuntimeCall> = generic::UncheckedExtrinsic<u32, RuntimeCall, Signature, ()>;
+35 | pub type UncheckedExtrinsic<RuntimeCall> = generic::UncheckedExtrinsic<u32, RuntimeCall, Signature, ()>;
    |                            +++++++++++++
 
 error[E0412]: cannot find type `Runtime` in this scope
-  --> tests/construct_runtime_ui/both_use_and_excluded_parts.rs:20:25
+  --> tests/construct_runtime_ui/both_use_and_excluded_parts.rs:37:25
    |
-20 | impl pallet::Config for Runtime {}
+37 | impl pallet::Config for Runtime {}
    |                         ^^^^^^^ not found in this scope
diff --git a/substrate/frame/support/test/tests/construct_runtime_ui/conflicting_index.rs b/substrate/frame/support/test/tests/construct_runtime_ui/conflicting_index.rs
index 712452d1a3a43c43daa641b78b532d3ce4bfdf30..c94d092579de98acabd7e1abf92ce4e428e529e4 100644
--- a/substrate/frame/support/test/tests/construct_runtime_ui/conflicting_index.rs
+++ b/substrate/frame/support/test/tests/construct_runtime_ui/conflicting_index.rs
@@ -1,3 +1,20 @@
+// 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.
+
 use frame_support::construct_runtime;
 
 construct_runtime! {
diff --git a/substrate/frame/support/test/tests/construct_runtime_ui/conflicting_index.stderr b/substrate/frame/support/test/tests/construct_runtime_ui/conflicting_index.stderr
index 2e2028fd1b862bb40c7854ed8b11137f426403b7..ef4fb8beba8a1468eb7ed9b4501d1b9fc640ec31 100644
--- a/substrate/frame/support/test/tests/construct_runtime_ui/conflicting_index.stderr
+++ b/substrate/frame/support/test/tests/construct_runtime_ui/conflicting_index.stderr
@@ -1,11 +1,11 @@
 error: Pallet indices are conflicting: Both pallets System and Pallet1 are at index 0
- --> $DIR/conflicting_index.rs:9:3
-  |
-9 |         System: system::{},
-  |         ^^^^^^
+  --> tests/construct_runtime_ui/conflicting_index.rs:26:3
+   |
+26 |         System: system::{},
+   |         ^^^^^^
 
 error: Pallet indices are conflicting: Both pallets System and Pallet1 are at index 0
-  --> $DIR/conflicting_index.rs:10:3
+  --> tests/construct_runtime_ui/conflicting_index.rs:27:3
    |
-10 |         Pallet1: pallet1::{} = 0,
+27 |         Pallet1: pallet1::{} = 0,
    |         ^^^^^^^
diff --git a/substrate/frame/support/test/tests/construct_runtime_ui/conflicting_index_2.rs b/substrate/frame/support/test/tests/construct_runtime_ui/conflicting_index_2.rs
index 6bc6bc5402e9aa0ee7d9f7483d5beb176ddf3245..3ba427f993cdff68da22591d52fe165c1c60c656 100644
--- a/substrate/frame/support/test/tests/construct_runtime_ui/conflicting_index_2.rs
+++ b/substrate/frame/support/test/tests/construct_runtime_ui/conflicting_index_2.rs
@@ -1,3 +1,20 @@
+// 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.
+
 use frame_support::construct_runtime;
 
 construct_runtime! {
diff --git a/substrate/frame/support/test/tests/construct_runtime_ui/conflicting_index_2.stderr b/substrate/frame/support/test/tests/construct_runtime_ui/conflicting_index_2.stderr
index bfa3706a456a4540d6e20631d43542f1099cd6ca..d771119f221b3e72eb6c9d6384f28433c390cb72 100644
--- a/substrate/frame/support/test/tests/construct_runtime_ui/conflicting_index_2.stderr
+++ b/substrate/frame/support/test/tests/construct_runtime_ui/conflicting_index_2.stderr
@@ -1,11 +1,11 @@
 error: Pallet indices are conflicting: Both pallets System and Pallet3 are at index 5
- --> $DIR/conflicting_index_2.rs:9:3
-  |
-9 |         System: system::{} = 5,
-  |         ^^^^^^
+  --> tests/construct_runtime_ui/conflicting_index_2.rs:26:3
+   |
+26 |         System: system::{} = 5,
+   |         ^^^^^^
 
 error: Pallet indices are conflicting: Both pallets System and Pallet3 are at index 5
-  --> $DIR/conflicting_index_2.rs:12:3
+  --> tests/construct_runtime_ui/conflicting_index_2.rs:29:3
    |
-12 |         Pallet3: pallet3::{},
+29 |         Pallet3: pallet3::{},
    |         ^^^^^^^
diff --git a/substrate/frame/support/test/tests/construct_runtime_ui/conflicting_module_name.rs b/substrate/frame/support/test/tests/construct_runtime_ui/conflicting_module_name.rs
index 513fbcfb5135402d7c34e4e0d4391f093eb4d4ef..133e8b1ca48b9499077c5db58b0188f9c7d0640c 100644
--- a/substrate/frame/support/test/tests/construct_runtime_ui/conflicting_module_name.rs
+++ b/substrate/frame/support/test/tests/construct_runtime_ui/conflicting_module_name.rs
@@ -1,3 +1,20 @@
+// 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.
+
 use frame_support::construct_runtime;
 
 construct_runtime! {
diff --git a/substrate/frame/support/test/tests/construct_runtime_ui/conflicting_module_name.stderr b/substrate/frame/support/test/tests/construct_runtime_ui/conflicting_module_name.stderr
index 6fb983f03a9610e66779b2d8e9011797a0b87948..20051949b2d7a1f35336f1c809496842a0f8014a 100644
--- a/substrate/frame/support/test/tests/construct_runtime_ui/conflicting_module_name.stderr
+++ b/substrate/frame/support/test/tests/construct_runtime_ui/conflicting_module_name.stderr
@@ -1,11 +1,11 @@
 error: Two pallets with the same name!
- --> tests/construct_runtime_ui/conflicting_module_name.rs:7:3
-  |
-7 |         Balance: balances::{Pallet},
-  |         ^^^^^^^
+  --> tests/construct_runtime_ui/conflicting_module_name.rs:24:3
+   |
+24 |         Balance: balances::{Pallet},
+   |         ^^^^^^^
 
 error: Two pallets with the same name!
- --> tests/construct_runtime_ui/conflicting_module_name.rs:8:3
-  |
-8 |         Balance: balances::{Pallet},
-  |         ^^^^^^^
+  --> tests/construct_runtime_ui/conflicting_module_name.rs:25:3
+   |
+25 |         Balance: balances::{Pallet},
+   |         ^^^^^^^
diff --git a/substrate/frame/support/test/tests/construct_runtime_ui/deprecated_where_block.rs b/substrate/frame/support/test/tests/construct_runtime_ui/deprecated_where_block.rs
index c0e325085b5e5b0a32c7a37cc35b81ceae11ef5b..5fd7822e8c37d412d60888a6e7f297aeed4954b6 100644
--- a/substrate/frame/support/test/tests/construct_runtime_ui/deprecated_where_block.rs
+++ b/substrate/frame/support/test/tests/construct_runtime_ui/deprecated_where_block.rs
@@ -1,3 +1,20 @@
+// 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.
+
 use frame_support::construct_runtime;
 
 construct_runtime! {
diff --git a/substrate/frame/support/test/tests/construct_runtime_ui/deprecated_where_block.stderr b/substrate/frame/support/test/tests/construct_runtime_ui/deprecated_where_block.stderr
index ec004fcf9534c388b926b0ca06b4b5f8fc9dafd5..08954bb6ab5c57982b99432ca1ea888d2e70332c 100644
--- a/substrate/frame/support/test/tests/construct_runtime_ui/deprecated_where_block.stderr
+++ b/substrate/frame/support/test/tests/construct_runtime_ui/deprecated_where_block.stderr
@@ -5,30 +5,30 @@ error: use of deprecated constant `WhereSection::_w`:
 
                For more info see:
                    <https://github.com/paritytech/substrate/pull/14437>
-  --> tests/construct_runtime_ui/deprecated_where_block.rs:3:1
+  --> tests/construct_runtime_ui/deprecated_where_block.rs:20:1
    |
-3  | / construct_runtime! {
-4  | |     pub struct Runtime where
-5  | |         Block = Block,
-6  | |         NodeBlock = Block,
+20 | / construct_runtime! {
+21 | |     pub struct Runtime where
+22 | |         Block = Block,
+23 | |         NodeBlock = Block,
 ...  |
-10 | |     }
-11 | | }
+27 | |     }
+28 | | }
    | |_^
    |
    = note: `-D deprecated` implied by `-D warnings`
    = note: this error originates in the macro `frame_support::match_and_insert` which comes from the expansion of the macro `construct_runtime` (in Nightly builds, run with -Z macro-backtrace for more info)
 
 error[E0277]: the trait bound `Runtime: Config` is not satisfied
-  --> tests/construct_runtime_ui/deprecated_where_block.rs:3:1
+  --> tests/construct_runtime_ui/deprecated_where_block.rs:20:1
    |
-3  | // construct_runtime! {
-4  | ||     pub struct Runtime where
-5  | ||         Block = Block,
-6  | ||         NodeBlock = Block,
+20 | // construct_runtime! {
+21 | ||     pub struct Runtime where
+22 | ||         Block = Block,
+23 | ||         NodeBlock = Block,
 ...  ||
-10 | ||     }
-11 | || }
+27 | ||     }
+28 | || }
    | ||_- in this macro invocation
 ...  |
    |
@@ -40,28 +40,28 @@ note: required by a bound in `frame_system::Event`
    = note: this error originates in the macro `frame_support::construct_runtime` which comes from the expansion of the macro `construct_runtime` (in Nightly builds, run with -Z macro-backtrace for more info)
 
 error[E0277]: the trait bound `Runtime: Config` is not satisfied in `RuntimeEvent`
-  --> tests/construct_runtime_ui/deprecated_where_block.rs:3:1
+  --> tests/construct_runtime_ui/deprecated_where_block.rs:20:1
    |
-3  | // construct_runtime! {
-4  | ||     pub struct Runtime where
-5  | ||         Block = Block,
-6  | ||         NodeBlock = Block,
+20 | // construct_runtime! {
+21 | ||     pub struct Runtime where
+22 | ||         Block = Block,
+23 | ||         NodeBlock = Block,
 ...  ||
-10 | ||     }
-11 | || }
+27 | ||     }
+28 | || }
    | ||_- in this macro invocation
 ...  |
    |
 note: required because it appears within the type `RuntimeEvent`
-  --> tests/construct_runtime_ui/deprecated_where_block.rs:3:1
+  --> tests/construct_runtime_ui/deprecated_where_block.rs:20:1
    |
-3  | // construct_runtime! {
-4  | ||     pub struct Runtime where
-5  | ||         Block = Block,
-6  | ||         NodeBlock = Block,
+20 | // construct_runtime! {
+21 | ||     pub struct Runtime where
+22 | ||         Block = Block,
+23 | ||         NodeBlock = Block,
 ...  ||
-10 | ||     }
-11 | || }
+27 | ||     }
+28 | || }
    | ||_- in this macro invocation
 ...  |
 note: required by a bound in `Clone`
@@ -72,28 +72,28 @@ note: required by a bound in `Clone`
    = note: this error originates in the derive macro `Clone` which comes from the expansion of the macro `construct_runtime` (in Nightly builds, run with -Z macro-backtrace for more info)
 
 error[E0277]: the trait bound `Runtime: Config` is not satisfied in `RuntimeEvent`
-  --> tests/construct_runtime_ui/deprecated_where_block.rs:3:1
+  --> tests/construct_runtime_ui/deprecated_where_block.rs:20:1
    |
-3  | // construct_runtime! {
-4  | ||     pub struct Runtime where
-5  | ||         Block = Block,
-6  | ||         NodeBlock = Block,
+20 | // construct_runtime! {
+21 | ||     pub struct Runtime where
+22 | ||         Block = Block,
+23 | ||         NodeBlock = Block,
 ...  ||
-10 | ||     }
-11 | || }
+27 | ||     }
+28 | || }
    | ||_- in this macro invocation
 ...  |
    |
 note: required because it appears within the type `RuntimeEvent`
-  --> tests/construct_runtime_ui/deprecated_where_block.rs:3:1
+  --> tests/construct_runtime_ui/deprecated_where_block.rs:20:1
    |
-3  | // construct_runtime! {
-4  | ||     pub struct Runtime where
-5  | ||         Block = Block,
-6  | ||         NodeBlock = Block,
+20 | // construct_runtime! {
+21 | ||     pub struct Runtime where
+22 | ||         Block = Block,
+23 | ||         NodeBlock = Block,
 ...  ||
-10 | ||     }
-11 | || }
+27 | ||     }
+28 | || }
    | ||_- in this macro invocation
 ...  |
 note: required by a bound in `EncodeLike`
@@ -104,28 +104,28 @@ note: required by a bound in `EncodeLike`
    = note: this error originates in the macro `frame_support::construct_runtime` which comes from the expansion of the macro `construct_runtime` (in Nightly builds, run with -Z macro-backtrace for more info)
 
 error[E0277]: the trait bound `Runtime: Config` is not satisfied in `RuntimeEvent`
-  --> tests/construct_runtime_ui/deprecated_where_block.rs:3:1
+  --> tests/construct_runtime_ui/deprecated_where_block.rs:20:1
    |
-3  | // construct_runtime! {
-4  | ||     pub struct Runtime where
-5  | ||         Block = Block,
-6  | ||         NodeBlock = Block,
+20 | // construct_runtime! {
+21 | ||     pub struct Runtime where
+22 | ||         Block = Block,
+23 | ||         NodeBlock = Block,
 ...  ||
-10 | ||     }
-11 | || }
+27 | ||     }
+28 | || }
    | ||_- in this macro invocation
 ...  |
    |
 note: required because it appears within the type `RuntimeEvent`
-  --> tests/construct_runtime_ui/deprecated_where_block.rs:3:1
+  --> tests/construct_runtime_ui/deprecated_where_block.rs:20:1
    |
-3  | // construct_runtime! {
-4  | ||     pub struct Runtime where
-5  | ||         Block = Block,
-6  | ||         NodeBlock = Block,
+20 | // construct_runtime! {
+21 | ||     pub struct Runtime where
+22 | ||         Block = Block,
+23 | ||         NodeBlock = Block,
 ...  ||
-10 | ||     }
-11 | || }
+27 | ||     }
+28 | || }
    | ||_- in this macro invocation
 ...  |
 note: required by a bound in `Decode`
@@ -136,19 +136,23 @@ note: required by a bound in `Decode`
    = note: this error originates in the macro `frame_support::construct_runtime` which comes from the expansion of the macro `construct_runtime` (in Nightly builds, run with -Z macro-backtrace for more info)
 
 error[E0277]: the trait bound `Runtime: Config` is not satisfied in `frame_system::Event<Runtime>`
-  --> tests/construct_runtime_ui/deprecated_where_block.rs:3:1
+  --> tests/construct_runtime_ui/deprecated_where_block.rs:20:1
    |
-3  | // construct_runtime! {
-4  | ||     pub struct Runtime where
-5  | ||         Block = Block,
-6  | ||         NodeBlock = Block,
+20 | // construct_runtime! {
+21 | ||     pub struct Runtime where
+22 | ||         Block = Block,
+23 | ||         NodeBlock = Block,
 ...  ||
-10 | ||     }
-11 | || }
+27 | ||     }
+28 | || }
    | ||_- in this macro invocation
 ...  |
    |
-   = note: required because it appears within the type `Event<Runtime>`
+note: required because it appears within the type `Event<Runtime>`
+  --> $WORKSPACE/substrate/frame/system/src/lib.rs
+   |
+   |     pub enum Event<T: Config> {
+   |              ^^^^^
 note: required by a bound in `From`
   --> $RUST/core/src/convert/mod.rs
    |
@@ -157,19 +161,23 @@ note: required by a bound in `From`
    = note: this error originates in the macro `frame_support::construct_runtime` which comes from the expansion of the macro `construct_runtime` (in Nightly builds, run with -Z macro-backtrace for more info)
 
 error[E0277]: the trait bound `Runtime: Config` is not satisfied in `frame_system::Event<Runtime>`
-  --> tests/construct_runtime_ui/deprecated_where_block.rs:3:1
+  --> tests/construct_runtime_ui/deprecated_where_block.rs:20:1
    |
-3  | // construct_runtime! {
-4  | ||     pub struct Runtime where
-5  | ||         Block = Block,
-6  | ||         NodeBlock = Block,
+20 | // construct_runtime! {
+21 | ||     pub struct Runtime where
+22 | ||         Block = Block,
+23 | ||         NodeBlock = Block,
 ...  ||
-10 | ||     }
-11 | || }
+27 | ||     }
+28 | || }
    | ||_- in this macro invocation
 ...  |
    |
-   = note: required because it appears within the type `Event<Runtime>`
+note: required because it appears within the type `Event<Runtime>`
+  --> $WORKSPACE/substrate/frame/system/src/lib.rs
+   |
+   |     pub enum Event<T: Config> {
+   |              ^^^^^
 note: required by a bound in `TryInto`
   --> $RUST/core/src/convert/mod.rs
    |
@@ -178,38 +186,38 @@ note: required by a bound in `TryInto`
    = note: this error originates in the macro `frame_support::construct_runtime` which comes from the expansion of the macro `construct_runtime` (in Nightly builds, run with -Z macro-backtrace for more info)
 
 error[E0277]: the trait bound `Runtime: Config` is not satisfied
-  --> tests/construct_runtime_ui/deprecated_where_block.rs:3:1
+  --> tests/construct_runtime_ui/deprecated_where_block.rs:20:1
    |
-3  | // construct_runtime! {
-4  | ||     pub struct Runtime where
-5  | ||         Block = Block,
-6  | ||         NodeBlock = Block,
+20 | // construct_runtime! {
+21 | ||     pub struct Runtime where
+22 | ||         Block = Block,
+23 | ||         NodeBlock = Block,
 ...  ||
-10 | ||     }
-11 | || }
+27 | ||     }
+28 | || }
    | ||_- in this macro invocation
 ...  |
    |
    = note: this error originates in the macro `frame_support::construct_runtime` which comes from the expansion of the macro `construct_runtime` (in Nightly builds, run with -Z macro-backtrace for more info)
 
 error[E0277]: the trait bound `Runtime: Config` is not satisfied
- --> tests/construct_runtime_ui/deprecated_where_block.rs:3:1
-  |
-3 | construct_runtime! {
-  | ^ the trait `Config` is not implemented for `Runtime`
-  |
-  = note: this error originates in the macro `frame_support::construct_runtime` which comes from the expansion of the macro `construct_runtime` (in Nightly builds, run with -Z macro-backtrace for more info)
+  --> tests/construct_runtime_ui/deprecated_where_block.rs:20:1
+   |
+20 | construct_runtime! {
+   | ^ the trait `Config` is not implemented for `Runtime`
+   |
+   = note: this error originates in the macro `frame_support::construct_runtime` which comes from the expansion of the macro `construct_runtime` (in Nightly builds, run with -Z macro-backtrace for more info)
 
 error[E0277]: the trait bound `RawOrigin<_>: TryFrom<OriginCaller>` is not satisfied
-  --> tests/construct_runtime_ui/deprecated_where_block.rs:3:1
+  --> tests/construct_runtime_ui/deprecated_where_block.rs:20:1
    |
-3  | // construct_runtime! {
-4  | ||     pub struct Runtime where
-5  | ||         Block = Block,
-6  | ||         NodeBlock = Block,
+20 | // construct_runtime! {
+21 | ||     pub struct Runtime where
+22 | ||         Block = Block,
+23 | ||         NodeBlock = Block,
 ...  ||
-10 | ||     }
-11 | || }
+27 | ||     }
+28 | || }
    | ||_- in this macro invocation
 ...  |
    |
@@ -217,15 +225,15 @@ error[E0277]: the trait bound `RawOrigin<_>: TryFrom<OriginCaller>` is not satis
    = note: this error originates in the macro `frame_support::construct_runtime` which comes from the expansion of the macro `construct_runtime` (in Nightly builds, run with -Z macro-backtrace for more info)
 
 error[E0277]: the trait bound `Runtime: Config` is not satisfied
-  --> tests/construct_runtime_ui/deprecated_where_block.rs:3:1
+  --> tests/construct_runtime_ui/deprecated_where_block.rs:20:1
    |
-3  | // construct_runtime! {
-4  | ||     pub struct Runtime where
-5  | ||         Block = Block,
-6  | ||         NodeBlock = Block,
+20 | // construct_runtime! {
+21 | ||     pub struct Runtime where
+22 | ||         Block = Block,
+23 | ||         NodeBlock = Block,
 ...  ||
-10 | ||     }
-11 | || }
+27 | ||     }
+28 | || }
    | ||_- in this macro invocation
 ...  |
    |
@@ -234,29 +242,29 @@ error[E0277]: the trait bound `Runtime: Config` is not satisfied
    = note: this error originates in the macro `frame_support::construct_runtime` which comes from the expansion of the macro `construct_runtime` (in Nightly builds, run with -Z macro-backtrace for more info)
 
 error[E0277]: the trait bound `Runtime: Config` is not satisfied
-  --> tests/construct_runtime_ui/deprecated_where_block.rs:3:1
+  --> tests/construct_runtime_ui/deprecated_where_block.rs:20:1
    |
-3  | // construct_runtime! {
-4  | ||     pub struct Runtime where
-5  | ||         Block = Block,
-6  | ||         NodeBlock = Block,
+20 | // construct_runtime! {
+21 | ||     pub struct Runtime where
+22 | ||         Block = Block,
+23 | ||         NodeBlock = Block,
 ...  ||
-10 | ||     }
-11 | || }
+27 | ||     }
+28 | || }
    | ||_- in this macro invocation
 ...  |
    |
    = note: required for `Pallet<Runtime>` to implement `Callable<Runtime>`
 note: required because it appears within the type `RuntimeCall`
-  --> tests/construct_runtime_ui/deprecated_where_block.rs:3:1
+  --> tests/construct_runtime_ui/deprecated_where_block.rs:20:1
    |
-3  | // construct_runtime! {
-4  | ||     pub struct Runtime where
-5  | ||         Block = Block,
-6  | ||         NodeBlock = Block,
+20 | // construct_runtime! {
+21 | ||     pub struct Runtime where
+22 | ||         Block = Block,
+23 | ||         NodeBlock = Block,
 ...  ||
-10 | ||     }
-11 | || }
+27 | ||     }
+28 | || }
    | ||_- in this macro invocation
 ...  |
 note: required by a bound in `Clone`
@@ -267,29 +275,29 @@ note: required by a bound in `Clone`
    = note: this error originates in the derive macro `Clone` which comes from the expansion of the macro `construct_runtime` (in Nightly builds, run with -Z macro-backtrace for more info)
 
 error[E0277]: the trait bound `Runtime: Config` is not satisfied
-  --> tests/construct_runtime_ui/deprecated_where_block.rs:3:1
+  --> tests/construct_runtime_ui/deprecated_where_block.rs:20:1
    |
-3  | // construct_runtime! {
-4  | ||     pub struct Runtime where
-5  | ||         Block = Block,
-6  | ||         NodeBlock = Block,
+20 | // construct_runtime! {
+21 | ||     pub struct Runtime where
+22 | ||         Block = Block,
+23 | ||         NodeBlock = Block,
 ...  ||
-10 | ||     }
-11 | || }
+27 | ||     }
+28 | || }
    | ||_- in this macro invocation
 ...  |
    |
    = note: required for `Pallet<Runtime>` to implement `Callable<Runtime>`
 note: required because it appears within the type `RuntimeCall`
-  --> tests/construct_runtime_ui/deprecated_where_block.rs:3:1
+  --> tests/construct_runtime_ui/deprecated_where_block.rs:20:1
    |
-3  | // construct_runtime! {
-4  | ||     pub struct Runtime where
-5  | ||         Block = Block,
-6  | ||         NodeBlock = Block,
+20 | // construct_runtime! {
+21 | ||     pub struct Runtime where
+22 | ||         Block = Block,
+23 | ||         NodeBlock = Block,
 ...  ||
-10 | ||     }
-11 | || }
+27 | ||     }
+28 | || }
    | ||_- in this macro invocation
 ...  |
 note: required by a bound in `EncodeLike`
@@ -300,29 +308,29 @@ note: required by a bound in `EncodeLike`
    = note: this error originates in the macro `frame_support::construct_runtime` which comes from the expansion of the macro `construct_runtime` (in Nightly builds, run with -Z macro-backtrace for more info)
 
 error[E0277]: the trait bound `Runtime: Config` is not satisfied
-  --> tests/construct_runtime_ui/deprecated_where_block.rs:3:1
+  --> tests/construct_runtime_ui/deprecated_where_block.rs:20:1
    |
-3  | // construct_runtime! {
-4  | ||     pub struct Runtime where
-5  | ||         Block = Block,
-6  | ||         NodeBlock = Block,
+20 | // construct_runtime! {
+21 | ||     pub struct Runtime where
+22 | ||         Block = Block,
+23 | ||         NodeBlock = Block,
 ...  ||
-10 | ||     }
-11 | || }
+27 | ||     }
+28 | || }
    | ||_- in this macro invocation
 ...  |
    |
    = note: required for `Pallet<Runtime>` to implement `Callable<Runtime>`
 note: required because it appears within the type `RuntimeCall`
-  --> tests/construct_runtime_ui/deprecated_where_block.rs:3:1
+  --> tests/construct_runtime_ui/deprecated_where_block.rs:20:1
    |
-3  | // construct_runtime! {
-4  | ||     pub struct Runtime where
-5  | ||         Block = Block,
-6  | ||         NodeBlock = Block,
+20 | // construct_runtime! {
+21 | ||     pub struct Runtime where
+22 | ||         Block = Block,
+23 | ||         NodeBlock = Block,
 ...  ||
-10 | ||     }
-11 | || }
+27 | ||     }
+28 | || }
    | ||_- in this macro invocation
 ...  |
 note: required by a bound in `Decode`
@@ -333,40 +341,40 @@ note: required by a bound in `Decode`
    = note: this error originates in the macro `frame_support::construct_runtime` which comes from the expansion of the macro `construct_runtime` (in Nightly builds, run with -Z macro-backtrace for more info)
 
 error[E0277]: the trait bound `Runtime: Config` is not satisfied
- --> tests/construct_runtime_ui/deprecated_where_block.rs:9:3
-  |
-9 |         System: frame_system::{Pallet, Call, Storage, Config<T>, Event<T>},
-  |         ^^^^^^ the trait `Config` is not implemented for `Runtime`
-  |
+  --> tests/construct_runtime_ui/deprecated_where_block.rs:26:3
+   |
+26 |         System: frame_system::{Pallet, Call, Storage, Config<T>, Event<T>},
+   |         ^^^^^^ the trait `Config` is not implemented for `Runtime`
+   |
 note: required by a bound in `frame_system::GenesisConfig`
- --> $WORKSPACE/substrate/frame/system/src/lib.rs
-  |
-  |     pub struct GenesisConfig<T: Config> {
-  |                                 ^^^^^^ required by this bound in `GenesisConfig`
+  --> $WORKSPACE/substrate/frame/system/src/lib.rs
+   |
+   |     pub struct GenesisConfig<T: Config> {
+   |                                 ^^^^^^ required by this bound in `GenesisConfig`
 
 error[E0277]: the trait bound `Runtime: Config` is not satisfied in `RuntimeEvent`
-  --> tests/construct_runtime_ui/deprecated_where_block.rs:3:1
+  --> tests/construct_runtime_ui/deprecated_where_block.rs:20:1
    |
-3  | // construct_runtime! {
-4  | ||     pub struct Runtime where
-5  | ||         Block = Block,
-6  | ||         NodeBlock = Block,
+20 | // construct_runtime! {
+21 | ||     pub struct Runtime where
+22 | ||         Block = Block,
+23 | ||         NodeBlock = Block,
 ...  ||
-10 | ||     }
-11 | || }
+27 | ||     }
+28 | || }
    | ||_- in this macro invocation
 ...  |
    |
 note: required because it appears within the type `RuntimeEvent`
-  --> tests/construct_runtime_ui/deprecated_where_block.rs:3:1
+  --> tests/construct_runtime_ui/deprecated_where_block.rs:20:1
    |
-3  | // construct_runtime! {
-4  | ||     pub struct Runtime where
-5  | ||         Block = Block,
-6  | ||         NodeBlock = Block,
+20 | // construct_runtime! {
+21 | ||     pub struct Runtime where
+22 | ||         Block = Block,
+23 | ||         NodeBlock = Block,
 ...  ||
-10 | ||     }
-11 | || }
+27 | ||     }
+28 | || }
    | ||_- in this macro invocation
 ...  |
 note: required by a bound in `Result`
@@ -377,28 +385,28 @@ note: required by a bound in `Result`
    = note: this error originates in the derive macro `self::sp_api_hidden_includes_construct_runtime::hidden_include::__private::codec::Decode` which comes from the expansion of the macro `construct_runtime` (in Nightly builds, run with -Z macro-backtrace for more info)
 
 error[E0277]: the trait bound `Runtime: Config` is not satisfied in `RuntimeEvent`
-  --> tests/construct_runtime_ui/deprecated_where_block.rs:3:1
+  --> tests/construct_runtime_ui/deprecated_where_block.rs:20:1
    |
-3  | // construct_runtime! {
-4  | ||     pub struct Runtime where
-5  | ||         Block = Block,
-6  | ||         NodeBlock = Block,
+20 | // construct_runtime! {
+21 | ||     pub struct Runtime where
+22 | ||         Block = Block,
+23 | ||         NodeBlock = Block,
 ...  ||
-10 | ||     }
-11 | || }
+27 | ||     }
+28 | || }
    | ||_- in this macro invocation
 ...  |
    |
 note: required because it appears within the type `RuntimeEvent`
-  --> tests/construct_runtime_ui/deprecated_where_block.rs:3:1
+  --> tests/construct_runtime_ui/deprecated_where_block.rs:20:1
    |
-3  | // construct_runtime! {
-4  | ||     pub struct Runtime where
-5  | ||         Block = Block,
-6  | ||         NodeBlock = Block,
+20 | // construct_runtime! {
+21 | ||     pub struct Runtime where
+22 | ||         Block = Block,
+23 | ||         NodeBlock = Block,
 ...  ||
-10 | ||     }
-11 | || }
+27 | ||     }
+28 | || }
    | ||_- in this macro invocation
 ...  |
 note: required by a bound in `TryInto`
@@ -409,29 +417,29 @@ note: required by a bound in `TryInto`
    = note: this error originates in the macro `frame_support::construct_runtime` which comes from the expansion of the macro `construct_runtime` (in Nightly builds, run with -Z macro-backtrace for more info)
 
 error[E0277]: the trait bound `Runtime: Config` is not satisfied
-  --> tests/construct_runtime_ui/deprecated_where_block.rs:3:1
+  --> tests/construct_runtime_ui/deprecated_where_block.rs:20:1
    |
-3  | // construct_runtime! {
-4  | ||     pub struct Runtime where
-5  | ||         Block = Block,
-6  | ||         NodeBlock = Block,
+20 | // construct_runtime! {
+21 | ||     pub struct Runtime where
+22 | ||         Block = Block,
+23 | ||         NodeBlock = Block,
 ...  ||
-10 | ||     }
-11 | || }
+27 | ||     }
+28 | || }
    | ||_- in this macro invocation
 ...  |
    |
    = note: required for `Pallet<Runtime>` to implement `Callable<Runtime>`
 note: required because it appears within the type `RuntimeCall`
-  --> tests/construct_runtime_ui/deprecated_where_block.rs:3:1
+  --> tests/construct_runtime_ui/deprecated_where_block.rs:20:1
    |
-3  | // construct_runtime! {
-4  | ||     pub struct Runtime where
-5  | ||         Block = Block,
-6  | ||         NodeBlock = Block,
+20 | // construct_runtime! {
+21 | ||     pub struct Runtime where
+22 | ||         Block = Block,
+23 | ||         NodeBlock = Block,
 ...  ||
-10 | ||     }
-11 | || }
+27 | ||     }
+28 | || }
    | ||_- in this macro invocation
 ...  |
 note: required by a bound in `Result`
diff --git a/substrate/frame/support/test/tests/construct_runtime_ui/double_module_parts.rs b/substrate/frame/support/test/tests/construct_runtime_ui/double_module_parts.rs
index 68a2523d3bcb2f8accc4c611bec0bb082096c431..ac5cf22ce1d8a0486cd2dec2b72cbb90aacc3112 100644
--- a/substrate/frame/support/test/tests/construct_runtime_ui/double_module_parts.rs
+++ b/substrate/frame/support/test/tests/construct_runtime_ui/double_module_parts.rs
@@ -1,3 +1,20 @@
+// 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.
+
 use frame_support::construct_runtime;
 
 construct_runtime! {
diff --git a/substrate/frame/support/test/tests/construct_runtime_ui/double_module_parts.stderr b/substrate/frame/support/test/tests/construct_runtime_ui/double_module_parts.stderr
index e3f694781441ff4e4dc55c95cbbcd05f282c5dbf..51459614ebe094d5cce24f06191efc3090764ccb 100644
--- a/substrate/frame/support/test/tests/construct_runtime_ui/double_module_parts.stderr
+++ b/substrate/frame/support/test/tests/construct_runtime_ui/double_module_parts.stderr
@@ -1,5 +1,5 @@
 error: `Config` was already declared before. Please remove the duplicate declaration
- --> tests/construct_runtime_ui/double_module_parts.rs:7:37
-  |
-7 |         Balance: balances::{Config, Call, Config<T>, Origin<T>},
-  |                                           ^^^^^^
+  --> tests/construct_runtime_ui/double_module_parts.rs:24:37
+   |
+24 |         Balance: balances::{Config, Call, Config<T>, Origin<T>},
+   |                                           ^^^^^^
diff --git a/substrate/frame/support/test/tests/construct_runtime_ui/duplicate_exclude.rs b/substrate/frame/support/test/tests/construct_runtime_ui/duplicate_exclude.rs
index 83e708841aaf2dcaf69180dac7177381c362f791..ea169c8ff24de515528d75116faf69ca44f97eb7 100644
--- a/substrate/frame/support/test/tests/construct_runtime_ui/duplicate_exclude.rs
+++ b/substrate/frame/support/test/tests/construct_runtime_ui/duplicate_exclude.rs
@@ -1,3 +1,20 @@
+// 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.
+
 use frame_support::construct_runtime;
 
 construct_runtime! {
diff --git a/substrate/frame/support/test/tests/construct_runtime_ui/duplicate_exclude.stderr b/substrate/frame/support/test/tests/construct_runtime_ui/duplicate_exclude.stderr
index 75de56076528b220c630477ff466dea2258e3765..e6d2fd4938d4b73e926a480be550f3f59517ca0c 100644
--- a/substrate/frame/support/test/tests/construct_runtime_ui/duplicate_exclude.stderr
+++ b/substrate/frame/support/test/tests/construct_runtime_ui/duplicate_exclude.stderr
@@ -1,5 +1,5 @@
 error: `Call` was already declared before. Please remove the duplicate declaration
- --> $DIR/duplicate_exclude.rs:9:46
-  |
-9 |         System: frame_system exclude_parts { Call, Call },
-  |                                                    ^^^^
+  --> tests/construct_runtime_ui/duplicate_exclude.rs:26:46
+   |
+26 |         System: frame_system exclude_parts { Call, Call },
+   |                                                    ^^^^
diff --git a/substrate/frame/support/test/tests/construct_runtime_ui/empty_pallet_path.rs b/substrate/frame/support/test/tests/construct_runtime_ui/empty_pallet_path.rs
index 23badd76276e21b780067126f74dc1a01c4bcc31..3b8497fcc2413265eb643a36aade9b0a40ebd471 100644
--- a/substrate/frame/support/test/tests/construct_runtime_ui/empty_pallet_path.rs
+++ b/substrate/frame/support/test/tests/construct_runtime_ui/empty_pallet_path.rs
@@ -1,3 +1,20 @@
+// 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.
+
 use frame_support::construct_runtime;
 
 construct_runtime! {
diff --git a/substrate/frame/support/test/tests/construct_runtime_ui/empty_pallet_path.stderr b/substrate/frame/support/test/tests/construct_runtime_ui/empty_pallet_path.stderr
index f0c0f17779d6756ce345569d4cbc6be351ddd81c..b76fa8b2fc829edd38d11801ef3c755ea37d4aff 100644
--- a/substrate/frame/support/test/tests/construct_runtime_ui/empty_pallet_path.stderr
+++ b/substrate/frame/support/test/tests/construct_runtime_ui/empty_pallet_path.stderr
@@ -1,5 +1,5 @@
 error: expected one of: `crate`, `self`, `super`, identifier
- --> tests/construct_runtime_ui/empty_pallet_path.rs:6:11
-  |
-6 |         system: ,
-  |                 ^
+  --> tests/construct_runtime_ui/empty_pallet_path.rs:23:11
+   |
+23 |         system: ,
+   |                 ^
diff --git a/substrate/frame/support/test/tests/construct_runtime_ui/exclude_missspell.rs b/substrate/frame/support/test/tests/construct_runtime_ui/exclude_missspell.rs
index 441e9c75040c530ae856855a24fe99cbb29317a9..2619b680fcf699c206d761f587db61c7fd5348d6 100644
--- a/substrate/frame/support/test/tests/construct_runtime_ui/exclude_missspell.rs
+++ b/substrate/frame/support/test/tests/construct_runtime_ui/exclude_missspell.rs
@@ -1,3 +1,20 @@
+// 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.
+
 use frame_support::construct_runtime;
 
 construct_runtime! {
diff --git a/substrate/frame/support/test/tests/construct_runtime_ui/exclude_missspell.stderr b/substrate/frame/support/test/tests/construct_runtime_ui/exclude_missspell.stderr
index 82e6aa6c8e3089a745b2581bba6907e7471a53f5..243e6618eaaab1d779db0faed43fd1c431331337 100644
--- a/substrate/frame/support/test/tests/construct_runtime_ui/exclude_missspell.stderr
+++ b/substrate/frame/support/test/tests/construct_runtime_ui/exclude_missspell.stderr
@@ -1,5 +1,5 @@
 error: Unexpected tokens, expected one of `::$ident` `::{`, `exclude_parts`, `use_parts`, `=`, `,`
- --> $DIR/exclude_missspell.rs:9:24
-  |
-9 |         System: frame_system exclude_part { Call },
-  |                              ^^^^^^^^^^^^
+  --> tests/construct_runtime_ui/exclude_missspell.rs:26:24
+   |
+26 |         System: frame_system exclude_part { Call },
+   |                              ^^^^^^^^^^^^
diff --git a/substrate/frame/support/test/tests/construct_runtime_ui/exclude_undefined_part.rs b/substrate/frame/support/test/tests/construct_runtime_ui/exclude_undefined_part.rs
index 10cda7b4e7e8a50f3f7ad1ff2eea295620868045..b4cea16d1a566a93f8057fc30ec14a63ab7a433f 100644
--- a/substrate/frame/support/test/tests/construct_runtime_ui/exclude_undefined_part.rs
+++ b/substrate/frame/support/test/tests/construct_runtime_ui/exclude_undefined_part.rs
@@ -1,3 +1,20 @@
+// 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.
+
 use frame_support::construct_runtime;
 use sp_runtime::{generic, traits::BlakeTwo256};
 use sp_core::sr25519;
diff --git a/substrate/frame/support/test/tests/construct_runtime_ui/exclude_undefined_part.stderr b/substrate/frame/support/test/tests/construct_runtime_ui/exclude_undefined_part.stderr
index 4b85613838ab5e127a740946c6e37cd6e8a53539..a6a630cf8cb80e0ef9cea858b63407d848086b24 100644
--- a/substrate/frame/support/test/tests/construct_runtime_ui/exclude_undefined_part.stderr
+++ b/substrate/frame/support/test/tests/construct_runtime_ui/exclude_undefined_part.stderr
@@ -1,22 +1,22 @@
 error: Invalid pallet part specified, the pallet `Pallet` doesn't have the `Call` part. Available parts are: `Pallet`, `Storage`.
-  --> tests/construct_runtime_ui/exclude_undefined_part.rs:31:34
+  --> tests/construct_runtime_ui/exclude_undefined_part.rs:48:34
    |
-31 |         Pallet: pallet exclude_parts { Call },
+48 |         Pallet: pallet exclude_parts { Call },
    |                                        ^^^^
 
 error[E0412]: cannot find type `RuntimeCall` in this scope
-  --> tests/construct_runtime_ui/exclude_undefined_part.rs:23:64
+  --> tests/construct_runtime_ui/exclude_undefined_part.rs:40:64
    |
-23 | pub type UncheckedExtrinsic = generic::UncheckedExtrinsic<u32, RuntimeCall, Signature, ()>;
+40 | pub type UncheckedExtrinsic = generic::UncheckedExtrinsic<u32, RuntimeCall, Signature, ()>;
    |                                                                ^^^^^^^^^^^ not found in this scope
    |
 help: you might be missing a type parameter
    |
-23 | pub type UncheckedExtrinsic<RuntimeCall> = generic::UncheckedExtrinsic<u32, RuntimeCall, Signature, ()>;
+40 | pub type UncheckedExtrinsic<RuntimeCall> = generic::UncheckedExtrinsic<u32, RuntimeCall, Signature, ()>;
    |                            +++++++++++++
 
 error[E0412]: cannot find type `Runtime` in this scope
-  --> tests/construct_runtime_ui/exclude_undefined_part.rs:25:25
+  --> tests/construct_runtime_ui/exclude_undefined_part.rs:42:25
    |
-25 | impl pallet::Config for Runtime {}
+42 | impl pallet::Config for Runtime {}
    |                         ^^^^^^^ not found in this scope
diff --git a/substrate/frame/support/test/tests/construct_runtime_ui/feature_gated_system_pallet.rs b/substrate/frame/support/test/tests/construct_runtime_ui/feature_gated_system_pallet.rs
index 35d49a4d8a23b172244e6ded301df7fc9f786e97..fbb6cad39d4481328f5bb37064309b1247223081 100644
--- a/substrate/frame/support/test/tests/construct_runtime_ui/feature_gated_system_pallet.rs
+++ b/substrate/frame/support/test/tests/construct_runtime_ui/feature_gated_system_pallet.rs
@@ -1,3 +1,20 @@
+// 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.
+
 use frame_support::construct_runtime;
 
 construct_runtime! {
diff --git a/substrate/frame/support/test/tests/construct_runtime_ui/feature_gated_system_pallet.stderr b/substrate/frame/support/test/tests/construct_runtime_ui/feature_gated_system_pallet.stderr
index 6a6c4b415888935d9a122a84881ae5bb3ebd8b4f..9e7578fdac2585e00c1d2ea8ae99e19f37027817 100644
--- a/substrate/frame/support/test/tests/construct_runtime_ui/feature_gated_system_pallet.stderr
+++ b/substrate/frame/support/test/tests/construct_runtime_ui/feature_gated_system_pallet.stderr
@@ -1,5 +1,5 @@
 error: `System` pallet declaration is feature gated, please remove any `#[cfg]` attributes
- --> tests/construct_runtime_ui/feature_gated_system_pallet.rs:7:3
-  |
-7 |         System: frame_system::{Pallet, Call, Storage, Config<T>, Event<T>},
-  |         ^^^^^^
+  --> tests/construct_runtime_ui/feature_gated_system_pallet.rs:24:3
+   |
+24 |         System: frame_system::{Pallet, Call, Storage, Config<T>, Event<T>},
+   |         ^^^^^^
diff --git a/substrate/frame/support/test/tests/construct_runtime_ui/generics_in_invalid_module.rs b/substrate/frame/support/test/tests/construct_runtime_ui/generics_in_invalid_module.rs
index 1ad1f8e0b1d5f6af667974aa67b8088d5754fbb3..3f6cb19ba6bccfef4b50402baad2493c6ab6d0c3 100644
--- a/substrate/frame/support/test/tests/construct_runtime_ui/generics_in_invalid_module.rs
+++ b/substrate/frame/support/test/tests/construct_runtime_ui/generics_in_invalid_module.rs
@@ -1,3 +1,20 @@
+// 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.
+
 use frame_support::construct_runtime;
 
 construct_runtime! {
diff --git a/substrate/frame/support/test/tests/construct_runtime_ui/generics_in_invalid_module.stderr b/substrate/frame/support/test/tests/construct_runtime_ui/generics_in_invalid_module.stderr
index a6adb37d0494999b13e0dbfd66aa48a058f2bce2..bf53f43b9ba7bccdc6e1ec0cf720bc6725a6717c 100644
--- a/substrate/frame/support/test/tests/construct_runtime_ui/generics_in_invalid_module.stderr
+++ b/substrate/frame/support/test/tests/construct_runtime_ui/generics_in_invalid_module.stderr
@@ -1,5 +1,5 @@
 error: `Call` is not allowed to have generics. Only the following pallets are allowed to have generics: `Event`, `Error`, `Origin`, `Config`.
- --> tests/construct_runtime_ui/generics_in_invalid_module.rs:7:36
-  |
-7 |         Balance: balances::<Instance1>::{Call<T>, Origin<T>},
-  |                                          ^^^^
+  --> tests/construct_runtime_ui/generics_in_invalid_module.rs:24:36
+   |
+24 |         Balance: balances::<Instance1>::{Call<T>, Origin<T>},
+   |                                          ^^^^
diff --git a/substrate/frame/support/test/tests/construct_runtime_ui/invalid_meta_literal.rs b/substrate/frame/support/test/tests/construct_runtime_ui/invalid_meta_literal.rs
index bce87c51336eb26d0ecbe05fab6a9d4440bf204b..526dd50fb7ddd627c64d387227f78fd12b704c9c 100644
--- a/substrate/frame/support/test/tests/construct_runtime_ui/invalid_meta_literal.rs
+++ b/substrate/frame/support/test/tests/construct_runtime_ui/invalid_meta_literal.rs
@@ -1,3 +1,20 @@
+// 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.
+
 use frame_support::construct_runtime;
 
 construct_runtime! {
diff --git a/substrate/frame/support/test/tests/construct_runtime_ui/invalid_meta_literal.stderr b/substrate/frame/support/test/tests/construct_runtime_ui/invalid_meta_literal.stderr
index bfee2910cd2a465ca8bb9c834a705e6cc7d7a3d7..dfb49b149461b50ee256c9f9de1427a8a9d1ceaa 100644
--- a/substrate/frame/support/test/tests/construct_runtime_ui/invalid_meta_literal.stderr
+++ b/substrate/frame/support/test/tests/construct_runtime_ui/invalid_meta_literal.stderr
@@ -1,6 +1,6 @@
 error: feature = 1
                  ^ expected one of `<key>`, `all`, `any`, `not` here
- --> tests/construct_runtime_ui/invalid_meta_literal.rs:7:3
-  |
-7 |         #[cfg(feature = 1)]
-  |         ^
+  --> tests/construct_runtime_ui/invalid_meta_literal.rs:24:3
+   |
+24 |         #[cfg(feature = 1)]
+   |         ^
diff --git a/substrate/frame/support/test/tests/construct_runtime_ui/invalid_module_details.rs b/substrate/frame/support/test/tests/construct_runtime_ui/invalid_module_details.rs
index bf6919f5a58ef51e03e09656d8e8c60a1a42f7a4..c7fcb54cd41a3b43e677370b8662077452dd9d54 100644
--- a/substrate/frame/support/test/tests/construct_runtime_ui/invalid_module_details.rs
+++ b/substrate/frame/support/test/tests/construct_runtime_ui/invalid_module_details.rs
@@ -1,3 +1,20 @@
+// 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.
+
 use frame_support::construct_runtime;
 
 construct_runtime! {
diff --git a/substrate/frame/support/test/tests/construct_runtime_ui/invalid_module_details.stderr b/substrate/frame/support/test/tests/construct_runtime_ui/invalid_module_details.stderr
index 1f9277c3f0a8ee1a639f59d701210ce5051be251..5656e2ba4dc82446fffe3b366bb7ad10bf5d0e4b 100644
--- a/substrate/frame/support/test/tests/construct_runtime_ui/invalid_module_details.stderr
+++ b/substrate/frame/support/test/tests/construct_runtime_ui/invalid_module_details.stderr
@@ -1,5 +1,5 @@
 error: Unexpected tokens, expected one of `::$ident` `::{`, `exclude_parts`, `use_parts`, `=`, `,`
- --> tests/construct_runtime_ui/invalid_module_details.rs:6:17
-  |
-6 |         system: System::(),
-  |                       ^
+  --> tests/construct_runtime_ui/invalid_module_details.rs:23:17
+   |
+23 |         system: System::(),
+   |                       ^
diff --git a/substrate/frame/support/test/tests/construct_runtime_ui/invalid_module_details_keyword.rs b/substrate/frame/support/test/tests/construct_runtime_ui/invalid_module_details_keyword.rs
index 51f14e6883e4ac5dd641e143237d9c2d9fe9d2a0..c5dc80acfcd7e3b1b129010a5febf2c4e013ceda 100644
--- a/substrate/frame/support/test/tests/construct_runtime_ui/invalid_module_details_keyword.rs
+++ b/substrate/frame/support/test/tests/construct_runtime_ui/invalid_module_details_keyword.rs
@@ -1,3 +1,20 @@
+// 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.
+
 use frame_support::construct_runtime;
 
 construct_runtime! {
diff --git a/substrate/frame/support/test/tests/construct_runtime_ui/invalid_module_details_keyword.stderr b/substrate/frame/support/test/tests/construct_runtime_ui/invalid_module_details_keyword.stderr
index dfcc9b8be42c605fc5c56dac8acb3c50cc295665..ad631de204e6766cc5d0d61106c23fc4f3fdbcb9 100644
--- a/substrate/frame/support/test/tests/construct_runtime_ui/invalid_module_details_keyword.stderr
+++ b/substrate/frame/support/test/tests/construct_runtime_ui/invalid_module_details_keyword.stderr
@@ -1,5 +1,5 @@
 error: expected one of: `Pallet`, `Call`, `Storage`, `Event`, `Error`, `Config`, `Origin`, `Inherent`, `ValidateUnsigned`, `FreezeReason`, `HoldReason`, `LockId`, `SlashReason`
- --> tests/construct_runtime_ui/invalid_module_details_keyword.rs:6:20
-  |
-6 |         system: System::{enum},
-  |                          ^^^^
+  --> tests/construct_runtime_ui/invalid_module_details_keyword.rs:23:20
+   |
+23 |         system: System::{enum},
+   |                          ^^^^
diff --git a/substrate/frame/support/test/tests/construct_runtime_ui/invalid_module_entry.rs b/substrate/frame/support/test/tests/construct_runtime_ui/invalid_module_entry.rs
index 607741d7823d4fbc390884b2ab2ec7c949e5e3ec..9a8a6c17b7cf952be4cb0105e9572cc85ff4c8d5 100644
--- a/substrate/frame/support/test/tests/construct_runtime_ui/invalid_module_entry.rs
+++ b/substrate/frame/support/test/tests/construct_runtime_ui/invalid_module_entry.rs
@@ -1,3 +1,20 @@
+// 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.
+
 use frame_support::construct_runtime;
 
 construct_runtime! {
diff --git a/substrate/frame/support/test/tests/construct_runtime_ui/invalid_module_entry.stderr b/substrate/frame/support/test/tests/construct_runtime_ui/invalid_module_entry.stderr
index 9dd849ff0412eb6a052145ccfcb317bc9a3a0020..b5b89a5a270c903b0e61198a8c05a0781cd2c7a5 100644
--- a/substrate/frame/support/test/tests/construct_runtime_ui/invalid_module_entry.stderr
+++ b/substrate/frame/support/test/tests/construct_runtime_ui/invalid_module_entry.stderr
@@ -1,5 +1,5 @@
 error: expected one of: `Pallet`, `Call`, `Storage`, `Event`, `Error`, `Config`, `Origin`, `Inherent`, `ValidateUnsigned`, `FreezeReason`, `HoldReason`, `LockId`, `SlashReason`
- --> tests/construct_runtime_ui/invalid_module_entry.rs:7:23
-  |
-7 |         Balance: balances::{Unexpected},
-  |                             ^^^^^^^^^^
+  --> tests/construct_runtime_ui/invalid_module_entry.rs:24:23
+   |
+24 |         Balance: balances::{Unexpected},
+   |                             ^^^^^^^^^^
diff --git a/substrate/frame/support/test/tests/construct_runtime_ui/invalid_token_after_module.rs b/substrate/frame/support/test/tests/construct_runtime_ui/invalid_token_after_module.rs
index c132fa01b2297273c86f1b4a58c0702a3c89535c..ddd1bada35ced5889466a4fdb65a80e9c7907670 100644
--- a/substrate/frame/support/test/tests/construct_runtime_ui/invalid_token_after_module.rs
+++ b/substrate/frame/support/test/tests/construct_runtime_ui/invalid_token_after_module.rs
@@ -1,3 +1,20 @@
+// 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.
+
 use frame_support::construct_runtime;
 
 construct_runtime! {
diff --git a/substrate/frame/support/test/tests/construct_runtime_ui/invalid_token_after_module.stderr b/substrate/frame/support/test/tests/construct_runtime_ui/invalid_token_after_module.stderr
index 80be1b8dd42fd242524e67d29060566e60b912e4..5a28b42efe0a8aac277375589f25b9a7654bf2ad 100644
--- a/substrate/frame/support/test/tests/construct_runtime_ui/invalid_token_after_module.stderr
+++ b/substrate/frame/support/test/tests/construct_runtime_ui/invalid_token_after_module.stderr
@@ -1,5 +1,5 @@
 error: Unexpected tokens, expected one of `::$ident` `::{`, `exclude_parts`, `use_parts`, `=`, `,`
- --> tests/construct_runtime_ui/invalid_token_after_module.rs:6:18
-  |
-6 |         system: System ?
-  |                        ^
+  --> tests/construct_runtime_ui/invalid_token_after_module.rs:23:18
+   |
+23 |         system: System ?
+   |                        ^
diff --git a/substrate/frame/support/test/tests/construct_runtime_ui/invalid_token_after_name.rs b/substrate/frame/support/test/tests/construct_runtime_ui/invalid_token_after_name.rs
index 42e7759f87f2bce6a552bef4e10eb7811c0b9302..07b86180ccf61f425b1612abf9e0d1cde6911993 100644
--- a/substrate/frame/support/test/tests/construct_runtime_ui/invalid_token_after_name.rs
+++ b/substrate/frame/support/test/tests/construct_runtime_ui/invalid_token_after_name.rs
@@ -1,3 +1,20 @@
+// 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.
+
 use frame_support::construct_runtime;
 
 construct_runtime! {
diff --git a/substrate/frame/support/test/tests/construct_runtime_ui/invalid_token_after_name.stderr b/substrate/frame/support/test/tests/construct_runtime_ui/invalid_token_after_name.stderr
index 8988f8a35b0a4bd1f84fa9b13a25d56ed0d963f7..bafde9b1f3ec0b33b0b1bf26459d80fc938f442c 100644
--- a/substrate/frame/support/test/tests/construct_runtime_ui/invalid_token_after_name.stderr
+++ b/substrate/frame/support/test/tests/construct_runtime_ui/invalid_token_after_name.stderr
@@ -1,5 +1,5 @@
 error: expected `:`
- --> tests/construct_runtime_ui/invalid_token_after_name.rs:6:10
-  |
-6 |         system ?
-  |                ^
+  --> tests/construct_runtime_ui/invalid_token_after_name.rs:23:10
+   |
+23 |         system ?
+   |                ^
diff --git a/substrate/frame/support/test/tests/construct_runtime_ui/invalid_where_param.rs b/substrate/frame/support/test/tests/construct_runtime_ui/invalid_where_param.rs
index 091f0644494f6e509b21cd0268b41124acaedd25..23e0b34406702a366198b76ca507b6ea04f0f9d6 100644
--- a/substrate/frame/support/test/tests/construct_runtime_ui/invalid_where_param.rs
+++ b/substrate/frame/support/test/tests/construct_runtime_ui/invalid_where_param.rs
@@ -1,3 +1,20 @@
+// 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.
+
 use frame_support::construct_runtime;
 
 construct_runtime! {
diff --git a/substrate/frame/support/test/tests/construct_runtime_ui/invalid_where_param.stderr b/substrate/frame/support/test/tests/construct_runtime_ui/invalid_where_param.stderr
index 9e358b6a21fab0f7022c11f697042299a5357c6f..02a0bb645bbd49636d93158a9cbd6fb88fe966ce 100644
--- a/substrate/frame/support/test/tests/construct_runtime_ui/invalid_where_param.stderr
+++ b/substrate/frame/support/test/tests/construct_runtime_ui/invalid_where_param.stderr
@@ -1,5 +1,5 @@
 error: expected one of: `Block`, `NodeBlock`, `UncheckedExtrinsic`
- --> $DIR/invalid_where_param.rs:7:3
-  |
-7 |         TypeX = Block,
-  |         ^^^^^
+  --> tests/construct_runtime_ui/invalid_where_param.rs:24:3
+   |
+24 |         TypeX = Block,
+   |         ^^^^^
diff --git a/substrate/frame/support/test/tests/construct_runtime_ui/missing_event_generic_on_module_with_instance.rs b/substrate/frame/support/test/tests/construct_runtime_ui/missing_event_generic_on_module_with_instance.rs
index bc2039c4e8180ee382e600acdf9c5b9c89ae80a1..985bef03a2f212ab8ba1c52b78aa6bd29b908aec 100644
--- a/substrate/frame/support/test/tests/construct_runtime_ui/missing_event_generic_on_module_with_instance.rs
+++ b/substrate/frame/support/test/tests/construct_runtime_ui/missing_event_generic_on_module_with_instance.rs
@@ -1,3 +1,20 @@
+// 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.
+
 use frame_support::construct_runtime;
 
 construct_runtime! {
diff --git a/substrate/frame/support/test/tests/construct_runtime_ui/missing_event_generic_on_module_with_instance.stderr b/substrate/frame/support/test/tests/construct_runtime_ui/missing_event_generic_on_module_with_instance.stderr
index 30fcba4c710d05d7a496d09047997c397737a149..facd83a10869424781cd1338e76301fa6152aa0c 100644
--- a/substrate/frame/support/test/tests/construct_runtime_ui/missing_event_generic_on_module_with_instance.stderr
+++ b/substrate/frame/support/test/tests/construct_runtime_ui/missing_event_generic_on_module_with_instance.stderr
@@ -1,5 +1,5 @@
 error: Instantiable pallet with no generic `Event` cannot be constructed: pallet `Balance` must have generic `Event`
- --> tests/construct_runtime_ui/missing_event_generic_on_module_with_instance.rs:7:3
-  |
-7 |         Balance: balances::<Instance1> expanded::{}::{Event},
-  |         ^^^^^^^
+  --> tests/construct_runtime_ui/missing_event_generic_on_module_with_instance.rs:24:3
+   |
+24 |         Balance: balances::<Instance1> expanded::{}::{Event},
+   |         ^^^^^^^
diff --git a/substrate/frame/support/test/tests/construct_runtime_ui/missing_module_instance.rs b/substrate/frame/support/test/tests/construct_runtime_ui/missing_module_instance.rs
index afd96a04854f28a30adaa9e034373818040ac4bb..42041419028a8b6372351b15ec3ac1f67482b290 100644
--- a/substrate/frame/support/test/tests/construct_runtime_ui/missing_module_instance.rs
+++ b/substrate/frame/support/test/tests/construct_runtime_ui/missing_module_instance.rs
@@ -1,3 +1,20 @@
+// 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.
+
 use frame_support::construct_runtime;
 
 construct_runtime! {
diff --git a/substrate/frame/support/test/tests/construct_runtime_ui/missing_module_instance.stderr b/substrate/frame/support/test/tests/construct_runtime_ui/missing_module_instance.stderr
index 5072f718db12efc3831fd2f4888435282b8c9b0a..6138a2d400831abe01a3829ae0ba9f082e6172d5 100644
--- a/substrate/frame/support/test/tests/construct_runtime_ui/missing_module_instance.stderr
+++ b/substrate/frame/support/test/tests/construct_runtime_ui/missing_module_instance.stderr
@@ -1,5 +1,5 @@
 error: expected identifier
- --> tests/construct_runtime_ui/missing_module_instance.rs:6:20
-  |
-6 |         system: System::<>,
-  |                          ^
+  --> tests/construct_runtime_ui/missing_module_instance.rs:23:20
+   |
+23 |         system: System::<>,
+   |                          ^
diff --git a/substrate/frame/support/test/tests/construct_runtime_ui/missing_origin_generic_on_module_with_instance.rs b/substrate/frame/support/test/tests/construct_runtime_ui/missing_origin_generic_on_module_with_instance.rs
index 42db63ae90a3a961530529d31d9a94db25b34538..32fc906fd052e70b39c8501ddda8080c5a38dfef 100644
--- a/substrate/frame/support/test/tests/construct_runtime_ui/missing_origin_generic_on_module_with_instance.rs
+++ b/substrate/frame/support/test/tests/construct_runtime_ui/missing_origin_generic_on_module_with_instance.rs
@@ -1,3 +1,20 @@
+// 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.
+
 use frame_support::construct_runtime;
 
 construct_runtime! {
diff --git a/substrate/frame/support/test/tests/construct_runtime_ui/missing_origin_generic_on_module_with_instance.stderr b/substrate/frame/support/test/tests/construct_runtime_ui/missing_origin_generic_on_module_with_instance.stderr
index 6c076d7b49fc04a229112756eb7e4de6b0574332..e688d80e028939feb55a1f4a1e7470e3cec7a2bf 100644
--- a/substrate/frame/support/test/tests/construct_runtime_ui/missing_origin_generic_on_module_with_instance.stderr
+++ b/substrate/frame/support/test/tests/construct_runtime_ui/missing_origin_generic_on_module_with_instance.stderr
@@ -1,5 +1,5 @@
 error: Instantiable pallet with no generic `Origin` cannot be constructed: pallet `Balance` must have generic `Origin`
- --> tests/construct_runtime_ui/missing_origin_generic_on_module_with_instance.rs:7:3
-  |
-7 |         Balance: balances::<Instance1> expanded::{}::{Origin},
-  |         ^^^^^^^
+  --> tests/construct_runtime_ui/missing_origin_generic_on_module_with_instance.rs:24:3
+   |
+24 |         Balance: balances::<Instance1> expanded::{}::{Origin},
+   |         ^^^^^^^
diff --git a/substrate/frame/support/test/tests/construct_runtime_ui/missing_system_module.rs b/substrate/frame/support/test/tests/construct_runtime_ui/missing_system_module.rs
index 685f9059b1be2c77fcb26e507924ca3ffdf667e1..fbf30cf4fe7874a5518ac1af90c7ac2be7ed89f2 100644
--- a/substrate/frame/support/test/tests/construct_runtime_ui/missing_system_module.rs
+++ b/substrate/frame/support/test/tests/construct_runtime_ui/missing_system_module.rs
@@ -1,3 +1,20 @@
+// 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.
+
 use frame_support::construct_runtime;
 
 construct_runtime! {
diff --git a/substrate/frame/support/test/tests/construct_runtime_ui/missing_system_module.stderr b/substrate/frame/support/test/tests/construct_runtime_ui/missing_system_module.stderr
index c8631f44051ca5a8bdb8cd1bfe683358e2cfb894..11ec6f33d204304bbfb1f25cc6b586e5dca9ede6 100644
--- a/substrate/frame/support/test/tests/construct_runtime_ui/missing_system_module.stderr
+++ b/substrate/frame/support/test/tests/construct_runtime_ui/missing_system_module.stderr
@@ -1,6 +1,6 @@
 error: `System` pallet declaration is missing. Please add this line: `System: frame_system::{Pallet, Call, Storage, Config<T>, Event<T>},`
- --> tests/construct_runtime_ui/missing_system_module.rs:5:2
-  |
-5 | /     {
-6 | |     }
-  | |_____^
+  --> tests/construct_runtime_ui/missing_system_module.rs:22:2
+   |
+22 | /     {
+23 | |     }
+   | |_____^
diff --git a/substrate/frame/support/test/tests/construct_runtime_ui/missing_where_param.rs b/substrate/frame/support/test/tests/construct_runtime_ui/missing_where_param.rs
index 4d2225a4afbc9e677c0f46aad7ded3d579f4c38d..249c7ba7edc14dad45f9a75dbf50971aea4ee1fd 100644
--- a/substrate/frame/support/test/tests/construct_runtime_ui/missing_where_param.rs
+++ b/substrate/frame/support/test/tests/construct_runtime_ui/missing_where_param.rs
@@ -1,3 +1,20 @@
+// 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.
+
 use frame_support::construct_runtime;
 
 construct_runtime! {
diff --git a/substrate/frame/support/test/tests/construct_runtime_ui/missing_where_param.stderr b/substrate/frame/support/test/tests/construct_runtime_ui/missing_where_param.stderr
index fb7e38b53dcd6b311ad288454ba48b0214ab1fba..92075a650b069892ec3227a64d2d51e617338137 100644
--- a/substrate/frame/support/test/tests/construct_runtime_ui/missing_where_param.stderr
+++ b/substrate/frame/support/test/tests/construct_runtime_ui/missing_where_param.stderr
@@ -1,5 +1,5 @@
 error: Missing associated type for `UncheckedExtrinsic`. Add `UncheckedExtrinsic` = ... to where section.
- --> tests/construct_runtime_ui/missing_where_param.rs:7:2
-  |
-7 |     {}
-  |     ^
+  --> tests/construct_runtime_ui/missing_where_param.rs:24:2
+   |
+24 |     {}
+   |     ^
diff --git a/substrate/frame/support/test/tests/construct_runtime_ui/more_than_256_modules.rs b/substrate/frame/support/test/tests/construct_runtime_ui/more_than_256_modules.rs
index 7dcbdb9aa4fba17321685b54aa144227496490a4..f04ac1c25f31d135d19769c6c71c013d21beb939 100644
--- a/substrate/frame/support/test/tests/construct_runtime_ui/more_than_256_modules.rs
+++ b/substrate/frame/support/test/tests/construct_runtime_ui/more_than_256_modules.rs
@@ -1,3 +1,20 @@
+// 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.
+
 use frame_support::construct_runtime;
 
 construct_runtime! {
diff --git a/substrate/frame/support/test/tests/construct_runtime_ui/more_than_256_modules.stderr b/substrate/frame/support/test/tests/construct_runtime_ui/more_than_256_modules.stderr
index 2e055f5d3726a1657f471fb4d7492537295d38b1..def06573d74dcc44f255ce312aca1e66a54f02be 100644
--- a/substrate/frame/support/test/tests/construct_runtime_ui/more_than_256_modules.stderr
+++ b/substrate/frame/support/test/tests/construct_runtime_ui/more_than_256_modules.stderr
@@ -1,5 +1,5 @@
 error: Pallet index doesn't fit into u8, index is 256
-  --> $DIR/more_than_256_modules.rs:10:3
+  --> tests/construct_runtime_ui/more_than_256_modules.rs:27:3
    |
-10 |         Pallet256: pallet256::{},
+27 |         Pallet256: pallet256::{},
    |         ^^^^^^^^^
diff --git a/substrate/frame/support/test/tests/construct_runtime_ui/no_comma_after_where.rs b/substrate/frame/support/test/tests/construct_runtime_ui/no_comma_after_where.rs
index 499f9a5cdcd5424102d5a71faa41a73e4df92d44..5442634a7ac08786bd215a37d0ad226c35256938 100644
--- a/substrate/frame/support/test/tests/construct_runtime_ui/no_comma_after_where.rs
+++ b/substrate/frame/support/test/tests/construct_runtime_ui/no_comma_after_where.rs
@@ -1,3 +1,20 @@
+// 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.
+
 use frame_support::construct_runtime;
 
 construct_runtime! {
diff --git a/substrate/frame/support/test/tests/construct_runtime_ui/no_comma_after_where.stderr b/substrate/frame/support/test/tests/construct_runtime_ui/no_comma_after_where.stderr
index caf4a7401b08ecdcd6589fa60627eeedd0aac132..5b53e455c9cea2300bfcccd7b1ebb47abe253b50 100644
--- a/substrate/frame/support/test/tests/construct_runtime_ui/no_comma_after_where.stderr
+++ b/substrate/frame/support/test/tests/construct_runtime_ui/no_comma_after_where.stderr
@@ -1,5 +1,5 @@
 error: Expected `,` or `{`
- --> $DIR/no_comma_after_where.rs:6:3
-  |
-6 |         Block = Block,
-  |         ^^^^^
+  --> tests/construct_runtime_ui/no_comma_after_where.rs:23:3
+   |
+23 |         Block = Block,
+   |         ^^^^^
diff --git a/substrate/frame/support/test/tests/construct_runtime_ui/number_of_pallets_exceeds_tuple_size.rs b/substrate/frame/support/test/tests/construct_runtime_ui/number_of_pallets_exceeds_tuple_size.rs
index 0d6afbcdc2c65aa0c4a86ba893158784528170f4..ea52293a6732534923485afbb720621dc2ba1d5e 100644
--- a/substrate/frame/support/test/tests/construct_runtime_ui/number_of_pallets_exceeds_tuple_size.rs
+++ b/substrate/frame/support/test/tests/construct_runtime_ui/number_of_pallets_exceeds_tuple_size.rs
@@ -1,3 +1,20 @@
+// 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.
+
 use frame_support::construct_runtime;
 use sp_core::sr25519;
 use sp_runtime::{generic, traits::BlakeTwo256};
diff --git a/substrate/frame/support/test/tests/construct_runtime_ui/number_of_pallets_exceeds_tuple_size.stderr b/substrate/frame/support/test/tests/construct_runtime_ui/number_of_pallets_exceeds_tuple_size.stderr
index 75d0ce0546583fb2901dbf5eeba0ee4b40fc19d0..af9069edc80df8592d12aa23bde384a053bb93a7 100644
--- a/substrate/frame/support/test/tests/construct_runtime_ui/number_of_pallets_exceeds_tuple_size.stderr
+++ b/substrate/frame/support/test/tests/construct_runtime_ui/number_of_pallets_exceeds_tuple_size.stderr
@@ -1,63 +1,63 @@
 error: The number of pallets exceeds the maximum number of tuple elements. To increase this limit, enable the tuples-96 feature of [frame_support].
-  --> tests/construct_runtime_ui/number_of_pallets_exceeds_tuple_size.rs:49:2
+  --> tests/construct_runtime_ui/number_of_pallets_exceeds_tuple_size.rs:66:2
    |
-49 |     pub struct Runtime
+66 |     pub struct Runtime
    |     ^^^
 
 error[E0412]: cannot find type `RuntimeCall` in this scope
-  --> tests/construct_runtime_ui/number_of_pallets_exceeds_tuple_size.rs:18:64
+  --> tests/construct_runtime_ui/number_of_pallets_exceeds_tuple_size.rs:35:64
    |
-18 | pub type UncheckedExtrinsic = generic::UncheckedExtrinsic<u32, RuntimeCall, Signature, ()>;
+35 | pub type UncheckedExtrinsic = generic::UncheckedExtrinsic<u32, RuntimeCall, Signature, ()>;
    |                                                                ^^^^^^^^^^^ not found in this scope
    |
 help: you might be missing a type parameter
    |
-18 | pub type UncheckedExtrinsic<RuntimeCall> = generic::UncheckedExtrinsic<u32, RuntimeCall, Signature, ()>;
+35 | pub type UncheckedExtrinsic<RuntimeCall> = generic::UncheckedExtrinsic<u32, RuntimeCall, Signature, ()>;
    |                            +++++++++++++
 
 error[E0412]: cannot find type `Runtime` in this scope
-  --> tests/construct_runtime_ui/number_of_pallets_exceeds_tuple_size.rs:20:25
+  --> tests/construct_runtime_ui/number_of_pallets_exceeds_tuple_size.rs:37:25
    |
-20 | impl pallet::Config for Runtime {}
+37 | impl pallet::Config for Runtime {}
    |                         ^^^^^^^ not found in this scope
 
 error[E0412]: cannot find type `Runtime` in this scope
-  --> tests/construct_runtime_ui/number_of_pallets_exceeds_tuple_size.rs:22:31
+  --> tests/construct_runtime_ui/number_of_pallets_exceeds_tuple_size.rs:39:31
    |
-22 | impl frame_system::Config for Runtime {
+39 | impl frame_system::Config for Runtime {
    |                               ^^^^^^^ not found in this scope
 
 error[E0412]: cannot find type `RuntimeOrigin` in this scope
-  --> tests/construct_runtime_ui/number_of_pallets_exceeds_tuple_size.rs:24:23
+  --> tests/construct_runtime_ui/number_of_pallets_exceeds_tuple_size.rs:41:23
    |
-24 |     type RuntimeOrigin = RuntimeOrigin;
+41 |     type RuntimeOrigin = RuntimeOrigin;
    |                          ^^^^^^^^^^^^^ help: you might have meant to use the associated type: `Self::RuntimeOrigin`
 
 error[E0412]: cannot find type `RuntimeCall` in this scope
-  --> tests/construct_runtime_ui/number_of_pallets_exceeds_tuple_size.rs:26:21
+  --> tests/construct_runtime_ui/number_of_pallets_exceeds_tuple_size.rs:43:21
    |
-26 |     type RuntimeCall = RuntimeCall;
+43 |     type RuntimeCall = RuntimeCall;
    |                        ^^^^^^^^^^^ help: you might have meant to use the associated type: `Self::RuntimeCall`
 
 error[E0412]: cannot find type `RuntimeEvent` in this scope
-  --> tests/construct_runtime_ui/number_of_pallets_exceeds_tuple_size.rs:32:22
+  --> tests/construct_runtime_ui/number_of_pallets_exceeds_tuple_size.rs:49:22
    |
-32 |     type RuntimeEvent = RuntimeEvent;
+49 |     type RuntimeEvent = RuntimeEvent;
    |                         ^^^^^^^^^^^^ help: you might have meant to use the associated type: `Self::RuntimeEvent`
 
 error[E0412]: cannot find type `PalletInfo` in this scope
-  --> tests/construct_runtime_ui/number_of_pallets_exceeds_tuple_size.rs:38:20
+  --> tests/construct_runtime_ui/number_of_pallets_exceeds_tuple_size.rs:55:20
    |
-38 |     type PalletInfo = PalletInfo;
+55 |     type PalletInfo = PalletInfo;
    |                       ^^^^^^^^^^
    |
 help: you might have meant to use the associated type
    |
-38 |     type PalletInfo = Self::PalletInfo;
+55 |     type PalletInfo = Self::PalletInfo;
    |                       ~~~~~~~~~~~~~~~~
 help: consider importing one of these items
    |
-1  + use frame_benchmarking::__private::traits::PalletInfo;
+18 + use frame_benchmarking::__private::traits::PalletInfo;
    |
-1  + use frame_support::traits::PalletInfo;
+18 + use frame_support::traits::PalletInfo;
    |
diff --git a/substrate/frame/support/test/tests/construct_runtime_ui/pallet_error_too_large.rs b/substrate/frame/support/test/tests/construct_runtime_ui/pallet_error_too_large.rs
index 8b3e26bc5e2e42b9f320239b3998e7275306cdbb..2834b5b8f2a8bc9c0fe6dcb58d01ff8bb778b2d4 100644
--- a/substrate/frame/support/test/tests/construct_runtime_ui/pallet_error_too_large.rs
+++ b/substrate/frame/support/test/tests/construct_runtime_ui/pallet_error_too_large.rs
@@ -1,3 +1,20 @@
+// 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.
+
 use frame_support::construct_runtime;
 use sp_core::sr25519;
 use sp_runtime::{generic, traits::BlakeTwo256};
diff --git a/substrate/frame/support/test/tests/construct_runtime_ui/pallet_error_too_large.stderr b/substrate/frame/support/test/tests/construct_runtime_ui/pallet_error_too_large.stderr
index 47504573515a22f09c8942ef6bd67e1324de3b39..0ad408b812306f1df7487768e7e6339a5e7553eb 100644
--- a/substrate/frame/support/test/tests/construct_runtime_ui/pallet_error_too_large.stderr
+++ b/substrate/frame/support/test/tests/construct_runtime_ui/pallet_error_too_large.stderr
@@ -1,13 +1,13 @@
 error[E0080]: evaluation of constant value failed
-  --> tests/construct_runtime_ui/pallet_error_too_large.rs:73:1
+  --> tests/construct_runtime_ui/pallet_error_too_large.rs:90:1
    |
-73 | / construct_runtime! {
-74 | |     pub struct Runtime
-75 | |     {
-76 | |         System: frame_system::{Pallet, Call, Storage, Config<T>, Event<T>},
-77 | |         Pallet: pallet::{Pallet},
-78 | |     }
-79 | | }
-   | |_^ the evaluated program panicked at 'The maximum encoded size of the error type in the `Pallet` pallet exceeds `MAX_MODULE_ERROR_ENCODED_SIZE`', $DIR/tests/construct_runtime_ui/pallet_error_too_large.rs:73:1
+90 | / construct_runtime! {
+91 | |     pub struct Runtime
+92 | |     {
+93 | |         System: frame_system::{Pallet, Call, Storage, Config<T>, Event<T>},
+94 | |         Pallet: pallet::{Pallet},
+95 | |     }
+96 | | }
+   | |_^ the evaluated program panicked at 'The maximum encoded size of the error type in the `Pallet` pallet exceeds `MAX_MODULE_ERROR_ENCODED_SIZE`', $DIR/tests/construct_runtime_ui/pallet_error_too_large.rs:90:1
    |
    = note: this error originates in the macro `$crate::panic::panic_2021` which comes from the expansion of the macro `construct_runtime` (in Nightly builds, run with -Z macro-backtrace for more info)
diff --git a/substrate/frame/support/test/tests/construct_runtime_ui/pass/composite_enum_instance.rs b/substrate/frame/support/test/tests/construct_runtime_ui/pass/composite_enum_instance.rs
new file mode 100644
index 0000000000000000000000000000000000000000..ad63708747694ae5935f91efa99ae28752255e40
--- /dev/null
+++ b/substrate/frame/support/test/tests/construct_runtime_ui/pass/composite_enum_instance.rs
@@ -0,0 +1,80 @@
+// 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.
+
+#![cfg_attr(not(feature = "std"), no_std)]
+
+use frame_support::derive_impl;
+
+pub use pallet::*;
+
+#[frame_support::pallet(dev_mode)]
+pub mod pallet {
+	use frame_support::pallet_prelude::*;
+
+	// The struct on which we build all of our Pallet logic.
+	#[pallet::pallet]
+	pub struct Pallet<T, I = ()>(PhantomData<(T, I)>);
+
+	// Your Pallet's configuration trait, representing custom external types and interfaces.
+	#[pallet::config]
+	pub trait Config<I: 'static = ()>: frame_system::Config {}
+	
+	#[pallet::composite_enum]
+	pub enum HoldReason<I: 'static = ()> {
+		SomeHoldReason
+	}
+
+	#[pallet::composite_enum]
+	pub enum FreezeReason<I: 'static = ()> {
+		SomeFreezeReason
+	}
+
+	#[pallet::composite_enum]
+	pub enum SlashReason<I: 'static = ()> {
+		SomeSlashReason
+	}
+
+	#[pallet::composite_enum]
+	pub enum LockId<I: 'static = ()> {
+		SomeLockId
+	}
+}
+
+#[derive_impl(frame_system::config_preludes::TestDefaultConfig as frame_system::DefaultConfig)]
+impl frame_system::Config for Runtime {
+	type Block = Block;
+}
+
+pub type Header = sp_runtime::generic::Header<u64, sp_runtime::traits::BlakeTwo256>;
+pub type UncheckedExtrinsic = sp_runtime::generic::UncheckedExtrinsic<u64, RuntimeCall, (), ()>;
+pub type Block = sp_runtime::generic::Block<Header, UncheckedExtrinsic>;
+
+frame_support::construct_runtime!(
+	pub struct Runtime
+	{
+		// Exclude part `Storage` in order not to check its metadata in tests.
+		System: frame_system,
+		Pallet1: pallet,
+		Pallet2: pallet::<Instance2>,
+	}
+);
+
+impl pallet::Config for Runtime {}
+
+impl pallet::Config<pallet::Instance2> for Runtime {}
+
+fn main() {}
diff --git a/substrate/frame/support/test/tests/construct_runtime_ui/undefined_call_part.rs b/substrate/frame/support/test/tests/construct_runtime_ui/undefined_call_part.rs
index 25cb5e93f652e0ef23632f0b69d71d6d786d855b..62c4b1327e0a16b4ee6e6efe3715f2b9efab38e3 100644
--- a/substrate/frame/support/test/tests/construct_runtime_ui/undefined_call_part.rs
+++ b/substrate/frame/support/test/tests/construct_runtime_ui/undefined_call_part.rs
@@ -1,3 +1,20 @@
+// 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.
+
 use frame_support::construct_runtime;
 use sp_core::sr25519;
 use sp_runtime::{generic, traits::BlakeTwo256};
diff --git a/substrate/frame/support/test/tests/construct_runtime_ui/undefined_call_part.stderr b/substrate/frame/support/test/tests/construct_runtime_ui/undefined_call_part.stderr
index f3f29e4c6955491dfd81694af8916fcf46ec999e..c6dfeb792b8e83aa39fb4bbd68a9243980515fc2 100644
--- a/substrate/frame/support/test/tests/construct_runtime_ui/undefined_call_part.stderr
+++ b/substrate/frame/support/test/tests/construct_runtime_ui/undefined_call_part.stderr
@@ -1,16 +1,16 @@
 error: `Pallet` does not have #[pallet::call] defined, perhaps you should remove `Call` from construct_runtime?
-  --> tests/construct_runtime_ui/undefined_call_part.rs:5:1
+  --> tests/construct_runtime_ui/undefined_call_part.rs:22:1
    |
-5  |   #[frame_support::pallet]
+22 |   #[frame_support::pallet]
    |   ^^^^^^^^^^^^^^^^^^^^^^^^
 ...
-48 | / construct_runtime! {
-49 | |     pub struct Runtime
-50 | |     {
-51 | |         System: frame_system::{Pallet, Call, Storage, Config<T>, Event<T>},
-52 | |         Pallet: pallet::{Pallet, Call},
-53 | |     }
-54 | | }
+65 | / construct_runtime! {
+66 | |     pub struct Runtime
+67 | |     {
+68 | |         System: frame_system::{Pallet, Call, Storage, Config<T>, Event<T>},
+69 | |         Pallet: pallet::{Pallet, Call},
+70 | |     }
+71 | | }
    | |_- in this macro invocation
    |
    = note: this error originates in the macro `pallet::__substrate_call_check::is_call_part_defined` which comes from the expansion of the macro `construct_runtime` (in Nightly builds, run with -Z macro-backtrace for more info)
diff --git a/substrate/frame/support/test/tests/construct_runtime_ui/undefined_event_part.rs b/substrate/frame/support/test/tests/construct_runtime_ui/undefined_event_part.rs
index c44cceef81a123ea31ae8c5a774f65fd18669527..893690501a8351d07e78f9b4fa9b7daab7413790 100644
--- a/substrate/frame/support/test/tests/construct_runtime_ui/undefined_event_part.rs
+++ b/substrate/frame/support/test/tests/construct_runtime_ui/undefined_event_part.rs
@@ -1,3 +1,20 @@
+// 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.
+
 use frame_support::construct_runtime;
 use sp_core::sr25519;
 use sp_runtime::{generic, traits::BlakeTwo256};
diff --git a/substrate/frame/support/test/tests/construct_runtime_ui/undefined_event_part.stderr b/substrate/frame/support/test/tests/construct_runtime_ui/undefined_event_part.stderr
index 81e42cec3b97a171402f3b3cb2295969ce71cd98..6dd332630adaae8971eb01ba0dccb1509071045e 100644
--- a/substrate/frame/support/test/tests/construct_runtime_ui/undefined_event_part.stderr
+++ b/substrate/frame/support/test/tests/construct_runtime_ui/undefined_event_part.stderr
@@ -1,36 +1,36 @@
 error: `Pallet` does not have #[pallet::event] defined, perhaps you should remove `Event` from construct_runtime?
-  --> tests/construct_runtime_ui/undefined_event_part.rs:5:1
+  --> tests/construct_runtime_ui/undefined_event_part.rs:22:1
    |
-5  |   #[frame_support::pallet]
+22 |   #[frame_support::pallet]
    |   ^^^^^^^^^^^^^^^^^^^^^^^^
 ...
-48 | / construct_runtime! {
-49 | |     pub struct Runtime
-50 | |     {
-51 | |         System: frame_system expanded::{}::{Pallet, Call, Storage, Config<T>, Event<T>},
-52 | |         Pallet: pallet expanded::{}::{Pallet, Event},
-53 | |     }
-54 | | }
+65 | / construct_runtime! {
+66 | |     pub struct Runtime
+67 | |     {
+68 | |         System: frame_system expanded::{}::{Pallet, Call, Storage, Config<T>, Event<T>},
+69 | |         Pallet: pallet expanded::{}::{Pallet, Event},
+70 | |     }
+71 | | }
    | |_- in this macro invocation
    |
    = note: this error originates in the macro `pallet::__substrate_event_check::is_event_part_defined` which comes from the expansion of the macro `construct_runtime` (in Nightly builds, run with -Z macro-backtrace for more info)
 
 error[E0412]: cannot find type `Event` in module `pallet`
-  --> tests/construct_runtime_ui/undefined_event_part.rs:48:1
+  --> tests/construct_runtime_ui/undefined_event_part.rs:65:1
    |
-48 | / construct_runtime! {
-49 | |     pub struct Runtime
-50 | |     {
-51 | |         System: frame_system expanded::{}::{Pallet, Call, Storage, Config<T>, Event<T>},
-52 | |         Pallet: pallet expanded::{}::{Pallet, Event},
-53 | |     }
-54 | | }
+65 | / construct_runtime! {
+66 | |     pub struct Runtime
+67 | |     {
+68 | |         System: frame_system expanded::{}::{Pallet, Call, Storage, Config<T>, Event<T>},
+69 | |         Pallet: pallet expanded::{}::{Pallet, Event},
+70 | |     }
+71 | | }
    | |_^ not found in `pallet`
    |
    = note: this error originates in the macro `construct_runtime` (in Nightly builds, run with -Z macro-backtrace for more info)
 help: consider importing one of these items
    |
-1  + use frame_support_test::Event;
+18 + use frame_support_test::Event;
    |
-1  + use frame_system::Event;
+18 + use frame_system::Event;
    |
diff --git a/substrate/frame/support/test/tests/construct_runtime_ui/undefined_genesis_config_part.rs b/substrate/frame/support/test/tests/construct_runtime_ui/undefined_genesis_config_part.rs
index 4436202f04fc7db4783e76990060b9df10e0c8cd..a3501ca31a3714ca129070df05695076df728c7e 100644
--- a/substrate/frame/support/test/tests/construct_runtime_ui/undefined_genesis_config_part.rs
+++ b/substrate/frame/support/test/tests/construct_runtime_ui/undefined_genesis_config_part.rs
@@ -1,3 +1,20 @@
+// 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.
+
 use frame_support::construct_runtime;
 use sp_core::sr25519;
 use sp_runtime::{generic, traits::BlakeTwo256};
diff --git a/substrate/frame/support/test/tests/construct_runtime_ui/undefined_genesis_config_part.stderr b/substrate/frame/support/test/tests/construct_runtime_ui/undefined_genesis_config_part.stderr
index 920785fc962911594d45c2a3c737a1bce7facd9e..00b5a1370036239fe45a9b7f7058544e62decc8f 100644
--- a/substrate/frame/support/test/tests/construct_runtime_ui/undefined_genesis_config_part.stderr
+++ b/substrate/frame/support/test/tests/construct_runtime_ui/undefined_genesis_config_part.stderr
@@ -1,36 +1,36 @@
 error: `Pallet` does not have #[pallet::genesis_config] defined, perhaps you should remove `Config` from construct_runtime?
-  --> tests/construct_runtime_ui/undefined_genesis_config_part.rs:5:1
+  --> tests/construct_runtime_ui/undefined_genesis_config_part.rs:22:1
    |
-5  |   #[frame_support::pallet]
+22 |   #[frame_support::pallet]
    |   ^^^^^^^^^^^^^^^^^^^^^^^^
 ...
-48 | / construct_runtime! {
-49 | |     pub struct Runtime
-50 | |     {
-51 | |         System: frame_system expanded::{}::{Pallet, Call, Storage, Config<T>, Event<T>},
-52 | |         Pallet: pallet expanded::{}::{Pallet, Config},
-53 | |     }
-54 | | }
+65 | / construct_runtime! {
+66 | |     pub struct Runtime
+67 | |     {
+68 | |         System: frame_system expanded::{}::{Pallet, Call, Storage, Config<T>, Event<T>},
+69 | |         Pallet: pallet expanded::{}::{Pallet, Config},
+70 | |     }
+71 | | }
    | |_- in this macro invocation
    |
    = note: this error originates in the macro `pallet::__substrate_genesis_config_check::is_genesis_config_defined` which comes from the expansion of the macro `construct_runtime` (in Nightly builds, run with -Z macro-backtrace for more info)
 
 error[E0412]: cannot find type `GenesisConfig` in module `pallet`
-  --> tests/construct_runtime_ui/undefined_genesis_config_part.rs:48:1
+  --> tests/construct_runtime_ui/undefined_genesis_config_part.rs:65:1
    |
-48 | / construct_runtime! {
-49 | |     pub struct Runtime
-50 | |     {
-51 | |         System: frame_system expanded::{}::{Pallet, Call, Storage, Config<T>, Event<T>},
-52 | |         Pallet: pallet expanded::{}::{Pallet, Config},
-53 | |     }
-54 | | }
+65 | / construct_runtime! {
+66 | |     pub struct Runtime
+67 | |     {
+68 | |         System: frame_system expanded::{}::{Pallet, Call, Storage, Config<T>, Event<T>},
+69 | |         Pallet: pallet expanded::{}::{Pallet, Config},
+70 | |     }
+71 | | }
    | |_^ not found in `pallet`
    |
    = note: this error originates in the macro `construct_runtime` (in Nightly builds, run with -Z macro-backtrace for more info)
 help: consider importing one of these items
    |
-1  + use frame_system::GenesisConfig;
+18 + use frame_system::GenesisConfig;
    |
-1  + use test_pallet::GenesisConfig;
+18 + use test_pallet::GenesisConfig;
    |
diff --git a/substrate/frame/support/test/tests/construct_runtime_ui/undefined_inherent_part.rs b/substrate/frame/support/test/tests/construct_runtime_ui/undefined_inherent_part.rs
index 8b48c4d0d6af7c1f84f4a5958b2b478c9c150627..e22745930d69a00c789075092d7a5aff11f09fb8 100644
--- a/substrate/frame/support/test/tests/construct_runtime_ui/undefined_inherent_part.rs
+++ b/substrate/frame/support/test/tests/construct_runtime_ui/undefined_inherent_part.rs
@@ -1,3 +1,20 @@
+// 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.
+
 use frame_support::construct_runtime;
 use sp_core::sr25519;
 use sp_runtime::{generic, traits::BlakeTwo256};
diff --git a/substrate/frame/support/test/tests/construct_runtime_ui/undefined_inherent_part.stderr b/substrate/frame/support/test/tests/construct_runtime_ui/undefined_inherent_part.stderr
index 659d43b151006e894f8a468f3548a1bd8ef279fe..749d2d9c159ee174e8b53a1f7782308f37e96172 100644
--- a/substrate/frame/support/test/tests/construct_runtime_ui/undefined_inherent_part.stderr
+++ b/substrate/frame/support/test/tests/construct_runtime_ui/undefined_inherent_part.stderr
@@ -1,34 +1,34 @@
 error: `Pallet` does not have #[pallet::inherent] defined, perhaps you should remove `Inherent` from construct_runtime?
-  --> tests/construct_runtime_ui/undefined_inherent_part.rs:5:1
+  --> tests/construct_runtime_ui/undefined_inherent_part.rs:22:1
    |
-5  |   #[frame_support::pallet]
+22 |   #[frame_support::pallet]
    |   ^^^^^^^^^^^^^^^^^^^^^^^^
 ...
-48 | / construct_runtime! {
-49 | |     pub struct Runtime
-50 | |     {
-51 | |         System: frame_system expanded::{}::{Pallet, Call, Storage, Config<T>, Event<T>},
-52 | |         Pallet: pallet expanded::{}::{Pallet, Inherent},
-53 | |     }
-54 | | }
+65 | / construct_runtime! {
+66 | |     pub struct Runtime
+67 | |     {
+68 | |         System: frame_system expanded::{}::{Pallet, Call, Storage, Config<T>, Event<T>},
+69 | |         Pallet: pallet expanded::{}::{Pallet, Inherent},
+70 | |     }
+71 | | }
    | |_- in this macro invocation
    |
    = note: this error originates in the macro `pallet::__substrate_inherent_check::is_inherent_part_defined` which comes from the expansion of the macro `construct_runtime` (in Nightly builds, run with -Z macro-backtrace for more info)
 
 error[E0599]: no function or associated item named `create_inherent` found for struct `pallet::Pallet` in the current scope
-  --> tests/construct_runtime_ui/undefined_inherent_part.rs:48:1
+  --> tests/construct_runtime_ui/undefined_inherent_part.rs:65:1
    |
-11 |       pub struct Pallet<T>(_);
+28 |       pub struct Pallet<T>(_);
    |       -------------------- function or associated item `create_inherent` not found for this struct
 ...
-48 |   construct_runtime! {
+65 |   construct_runtime! {
    |  _^
-49 | |     pub struct Runtime
-50 | |     {
-51 | |         System: frame_system expanded::{}::{Pallet, Call, Storage, Config<T>, Event<T>},
-52 | |         Pallet: pallet expanded::{}::{Pallet, Inherent},
-53 | |     }
-54 | | }
+66 | |     pub struct Runtime
+67 | |     {
+68 | |         System: frame_system expanded::{}::{Pallet, Call, Storage, Config<T>, Event<T>},
+69 | |         Pallet: pallet expanded::{}::{Pallet, Inherent},
+70 | |     }
+71 | | }
    | |_^ function or associated item not found in `Pallet<Runtime>`
    |
    = help: items from traits can only be used if the trait is implemented and in scope
@@ -37,19 +37,19 @@ error[E0599]: no function or associated item named `create_inherent` found for s
    = note: this error originates in the macro `construct_runtime` (in Nightly builds, run with -Z macro-backtrace for more info)
 
 error[E0599]: no function or associated item named `is_inherent` found for struct `pallet::Pallet` in the current scope
-  --> tests/construct_runtime_ui/undefined_inherent_part.rs:48:1
+  --> tests/construct_runtime_ui/undefined_inherent_part.rs:65:1
    |
-11 |       pub struct Pallet<T>(_);
+28 |       pub struct Pallet<T>(_);
    |       -------------------- function or associated item `is_inherent` not found for this struct
 ...
-48 |   construct_runtime! {
+65 |   construct_runtime! {
    |  _^
-49 | |     pub struct Runtime
-50 | |     {
-51 | |         System: frame_system expanded::{}::{Pallet, Call, Storage, Config<T>, Event<T>},
-52 | |         Pallet: pallet expanded::{}::{Pallet, Inherent},
-53 | |     }
-54 | | }
+66 | |     pub struct Runtime
+67 | |     {
+68 | |         System: frame_system expanded::{}::{Pallet, Call, Storage, Config<T>, Event<T>},
+69 | |         Pallet: pallet expanded::{}::{Pallet, Inherent},
+70 | |     }
+71 | | }
    | |_^ function or associated item not found in `Pallet<Runtime>`
    |
    = help: items from traits can only be used if the trait is implemented and in scope
@@ -58,19 +58,19 @@ error[E0599]: no function or associated item named `is_inherent` found for struc
    = note: this error originates in the macro `construct_runtime` (in Nightly builds, run with -Z macro-backtrace for more info)
 
 error[E0599]: no function or associated item named `check_inherent` found for struct `pallet::Pallet` in the current scope
-  --> tests/construct_runtime_ui/undefined_inherent_part.rs:48:1
+  --> tests/construct_runtime_ui/undefined_inherent_part.rs:65:1
    |
-11 |       pub struct Pallet<T>(_);
+28 |       pub struct Pallet<T>(_);
    |       -------------------- function or associated item `check_inherent` not found for this struct
 ...
-48 |   construct_runtime! {
+65 |   construct_runtime! {
    |  _^
-49 | |     pub struct Runtime
-50 | |     {
-51 | |         System: frame_system expanded::{}::{Pallet, Call, Storage, Config<T>, Event<T>},
-52 | |         Pallet: pallet expanded::{}::{Pallet, Inherent},
-53 | |     }
-54 | | }
+66 | |     pub struct Runtime
+67 | |     {
+68 | |         System: frame_system expanded::{}::{Pallet, Call, Storage, Config<T>, Event<T>},
+69 | |         Pallet: pallet expanded::{}::{Pallet, Inherent},
+70 | |     }
+71 | | }
    | |_^ function or associated item not found in `Pallet<Runtime>`
    |
    = help: items from traits can only be used if the trait is implemented and in scope
@@ -79,19 +79,19 @@ error[E0599]: no function or associated item named `check_inherent` found for st
    = note: this error originates in the macro `construct_runtime` (in Nightly builds, run with -Z macro-backtrace for more info)
 
 error[E0599]: no associated item named `INHERENT_IDENTIFIER` found for struct `pallet::Pallet` in the current scope
-  --> tests/construct_runtime_ui/undefined_inherent_part.rs:48:1
+  --> tests/construct_runtime_ui/undefined_inherent_part.rs:65:1
    |
-11 |       pub struct Pallet<T>(_);
+28 |       pub struct Pallet<T>(_);
    |       -------------------- associated item `INHERENT_IDENTIFIER` not found for this struct
 ...
-48 |   construct_runtime! {
+65 |   construct_runtime! {
    |  _^
-49 | |     pub struct Runtime
-50 | |     {
-51 | |         System: frame_system expanded::{}::{Pallet, Call, Storage, Config<T>, Event<T>},
-52 | |         Pallet: pallet expanded::{}::{Pallet, Inherent},
-53 | |     }
-54 | | }
+66 | |     pub struct Runtime
+67 | |     {
+68 | |         System: frame_system expanded::{}::{Pallet, Call, Storage, Config<T>, Event<T>},
+69 | |         Pallet: pallet expanded::{}::{Pallet, Inherent},
+70 | |     }
+71 | | }
    | |_^ associated item not found in `Pallet<Runtime>`
    |
    = help: items from traits can only be used if the trait is implemented and in scope
@@ -100,19 +100,19 @@ error[E0599]: no associated item named `INHERENT_IDENTIFIER` found for struct `p
    = note: this error originates in the macro `construct_runtime` (in Nightly builds, run with -Z macro-backtrace for more info)
 
 error[E0599]: no function or associated item named `is_inherent_required` found for struct `pallet::Pallet` in the current scope
-  --> tests/construct_runtime_ui/undefined_inherent_part.rs:48:1
+  --> tests/construct_runtime_ui/undefined_inherent_part.rs:65:1
    |
-11 |       pub struct Pallet<T>(_);
+28 |       pub struct Pallet<T>(_);
    |       -------------------- function or associated item `is_inherent_required` not found for this struct
 ...
-48 |   construct_runtime! {
+65 |   construct_runtime! {
    |  _^
-49 | |     pub struct Runtime
-50 | |     {
-51 | |         System: frame_system expanded::{}::{Pallet, Call, Storage, Config<T>, Event<T>},
-52 | |         Pallet: pallet expanded::{}::{Pallet, Inherent},
-53 | |     }
-54 | | }
+66 | |     pub struct Runtime
+67 | |     {
+68 | |         System: frame_system expanded::{}::{Pallet, Call, Storage, Config<T>, Event<T>},
+69 | |         Pallet: pallet expanded::{}::{Pallet, Inherent},
+70 | |     }
+71 | | }
    | |_^ function or associated item not found in `Pallet<Runtime>`
    |
    = help: items from traits can only be used if the trait is implemented and in scope
diff --git a/substrate/frame/support/test/tests/construct_runtime_ui/undefined_origin_part.rs b/substrate/frame/support/test/tests/construct_runtime_ui/undefined_origin_part.rs
index 974928785f748620cfc4b8fb642b84aa16a7e789..656365279b8867867b7ff2d2b64b055b77eead0a 100644
--- a/substrate/frame/support/test/tests/construct_runtime_ui/undefined_origin_part.rs
+++ b/substrate/frame/support/test/tests/construct_runtime_ui/undefined_origin_part.rs
@@ -1,3 +1,20 @@
+// 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.
+
 use frame_support::construct_runtime;
 use sp_core::sr25519;
 use sp_runtime::{generic, traits::BlakeTwo256};
diff --git a/substrate/frame/support/test/tests/construct_runtime_ui/undefined_origin_part.stderr b/substrate/frame/support/test/tests/construct_runtime_ui/undefined_origin_part.stderr
index c41dbe79421eae92da3134ae96f4cce1728bbc34..13612233e86888deb91ae92b53ab2f34c7aea929 100644
--- a/substrate/frame/support/test/tests/construct_runtime_ui/undefined_origin_part.stderr
+++ b/substrate/frame/support/test/tests/construct_runtime_ui/undefined_origin_part.stderr
@@ -1,36 +1,36 @@
 error: `Pallet` does not have #[pallet::origin] defined, perhaps you should remove `Origin` from construct_runtime?
-  --> tests/construct_runtime_ui/undefined_origin_part.rs:5:1
+  --> tests/construct_runtime_ui/undefined_origin_part.rs:22:1
    |
-5  |   #[frame_support::pallet]
+22 |   #[frame_support::pallet]
    |   ^^^^^^^^^^^^^^^^^^^^^^^^
 ...
-48 | / construct_runtime! {
-49 | |     pub struct Runtime
-50 | |     {
-51 | |         System: frame_system expanded::{}::{Pallet, Call, Storage, Config<T>, Event<T>},
-52 | |         Pallet: pallet expanded::{}::{Pallet, Origin},
-53 | |     }
-54 | | }
+65 | / construct_runtime! {
+66 | |     pub struct Runtime
+67 | |     {
+68 | |         System: frame_system expanded::{}::{Pallet, Call, Storage, Config<T>, Event<T>},
+69 | |         Pallet: pallet expanded::{}::{Pallet, Origin},
+70 | |     }
+71 | | }
    | |_- in this macro invocation
    |
    = note: this error originates in the macro `pallet::__substrate_origin_check::is_origin_part_defined` which comes from the expansion of the macro `construct_runtime` (in Nightly builds, run with -Z macro-backtrace for more info)
 
 error[E0412]: cannot find type `Origin` in module `pallet`
-  --> tests/construct_runtime_ui/undefined_origin_part.rs:48:1
+  --> tests/construct_runtime_ui/undefined_origin_part.rs:65:1
    |
-48 | / construct_runtime! {
-49 | |     pub struct Runtime
-50 | |     {
-51 | |         System: frame_system expanded::{}::{Pallet, Call, Storage, Config<T>, Event<T>},
-52 | |         Pallet: pallet expanded::{}::{Pallet, Origin},
-53 | |     }
-54 | | }
+65 | / construct_runtime! {
+66 | |     pub struct Runtime
+67 | |     {
+68 | |         System: frame_system expanded::{}::{Pallet, Call, Storage, Config<T>, Event<T>},
+69 | |         Pallet: pallet expanded::{}::{Pallet, Origin},
+70 | |     }
+71 | | }
    | |_^ not found in `pallet`
    |
    = note: this error originates in the macro `construct_runtime` (in Nightly builds, run with -Z macro-backtrace for more info)
 help: consider importing one of these items
    |
-1  + use frame_support_test::Origin;
+18 + use frame_support_test::Origin;
    |
-1  + use frame_system::Origin;
+18 + use frame_system::Origin;
    |
diff --git a/substrate/frame/support/test/tests/construct_runtime_ui/undefined_validate_unsigned_part.rs b/substrate/frame/support/test/tests/construct_runtime_ui/undefined_validate_unsigned_part.rs
index 505b249d92d58897a32af2cf3b2b312cc6351dd1..05545821ab0283faafae8734b2344e9fe3aad811 100644
--- a/substrate/frame/support/test/tests/construct_runtime_ui/undefined_validate_unsigned_part.rs
+++ b/substrate/frame/support/test/tests/construct_runtime_ui/undefined_validate_unsigned_part.rs
@@ -1,3 +1,20 @@
+// 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.
+
 use frame_support::construct_runtime;
 use sp_core::sr25519;
 use sp_runtime::{generic, traits::BlakeTwo256};
diff --git a/substrate/frame/support/test/tests/construct_runtime_ui/undefined_validate_unsigned_part.stderr b/substrate/frame/support/test/tests/construct_runtime_ui/undefined_validate_unsigned_part.stderr
index 007b77250736ec7f83159f6c965b18919bada40d..64677728c8b7c161c16b5beeff8804a0bef9dbcc 100644
--- a/substrate/frame/support/test/tests/construct_runtime_ui/undefined_validate_unsigned_part.stderr
+++ b/substrate/frame/support/test/tests/construct_runtime_ui/undefined_validate_unsigned_part.stderr
@@ -1,49 +1,49 @@
 error: `Pallet` does not have #[pallet::validate_unsigned] defined, perhaps you should remove `ValidateUnsigned` from construct_runtime?
-  --> tests/construct_runtime_ui/undefined_validate_unsigned_part.rs:5:1
+  --> tests/construct_runtime_ui/undefined_validate_unsigned_part.rs:22:1
    |
-5  |   #[frame_support::pallet]
+22 |   #[frame_support::pallet]
    |   ^^^^^^^^^^^^^^^^^^^^^^^^
 ...
-48 | / construct_runtime! {
-49 | |     pub struct Runtime
-50 | |     {
-51 | |         System: frame_system::{Pallet, Call, Storage, Config<T>, Event<T>},
-52 | |         Pallet: pallet::{Pallet, ValidateUnsigned},
-53 | |     }
-54 | | }
+65 | / construct_runtime! {
+66 | |     pub struct Runtime
+67 | |     {
+68 | |         System: frame_system::{Pallet, Call, Storage, Config<T>, Event<T>},
+69 | |         Pallet: pallet::{Pallet, ValidateUnsigned},
+70 | |     }
+71 | | }
    | |_- in this macro invocation
    |
    = note: this error originates in the macro `pallet::__substrate_validate_unsigned_check::is_validate_unsigned_part_defined` which comes from the expansion of the macro `construct_runtime` (in Nightly builds, run with -Z macro-backtrace for more info)
 
 error[E0599]: no variant or associated item named `Pallet` found for enum `RuntimeCall` in the current scope
-  --> tests/construct_runtime_ui/undefined_validate_unsigned_part.rs:52:3
+  --> tests/construct_runtime_ui/undefined_validate_unsigned_part.rs:69:3
    |
-48 | // construct_runtime! {
-49 | ||     pub struct Runtime
-50 | ||     {
-51 | ||         System: frame_system::{Pallet, Call, Storage, Config<T>, Event<T>},
-52 | ||         Pallet: pallet::{Pallet, ValidateUnsigned},
+65 | // construct_runtime! {
+66 | ||     pub struct Runtime
+67 | ||     {
+68 | ||         System: frame_system::{Pallet, Call, Storage, Config<T>, Event<T>},
+69 | ||         Pallet: pallet::{Pallet, ValidateUnsigned},
    | ||        -^^^^^^ variant or associated item not found in `RuntimeCall`
    | ||________|
    | |
 ...  |
 
 error[E0599]: no function or associated item named `pre_dispatch` found for struct `pallet::Pallet` in the current scope
-  --> tests/construct_runtime_ui/undefined_validate_unsigned_part.rs:48:1
+  --> tests/construct_runtime_ui/undefined_validate_unsigned_part.rs:65:1
    |
-11 |        pub struct Pallet<T>(_);
+28 |        pub struct Pallet<T>(_);
    |        -------------------- function or associated item `pre_dispatch` not found for this struct
 ...
-48 |    construct_runtime! {
+65 |    construct_runtime! {
    |  __^
    | | _|
    | ||
-49 | ||     pub struct Runtime
-50 | ||     {
-51 | ||         System: frame_system::{Pallet, Call, Storage, Config<T>, Event<T>},
-52 | ||         Pallet: pallet::{Pallet, ValidateUnsigned},
-53 | ||     }
-54 | || }
+66 | ||     pub struct Runtime
+67 | ||     {
+68 | ||         System: frame_system::{Pallet, Call, Storage, Config<T>, Event<T>},
+69 | ||         Pallet: pallet::{Pallet, ValidateUnsigned},
+70 | ||     }
+71 | || }
    | ||_- in this macro invocation
 ...  |
    |
@@ -54,21 +54,21 @@ error[E0599]: no function or associated item named `pre_dispatch` found for stru
    = note: this error originates in the macro `frame_support::construct_runtime` which comes from the expansion of the macro `construct_runtime` (in Nightly builds, run with -Z macro-backtrace for more info)
 
 error[E0599]: no function or associated item named `validate_unsigned` found for struct `pallet::Pallet` in the current scope
-  --> tests/construct_runtime_ui/undefined_validate_unsigned_part.rs:48:1
+  --> tests/construct_runtime_ui/undefined_validate_unsigned_part.rs:65:1
    |
-11 |        pub struct Pallet<T>(_);
+28 |        pub struct Pallet<T>(_);
    |        -------------------- function or associated item `validate_unsigned` not found for this struct
 ...
-48 |    construct_runtime! {
+65 |    construct_runtime! {
    |  __^
    | | _|
    | ||
-49 | ||     pub struct Runtime
-50 | ||     {
-51 | ||         System: frame_system::{Pallet, Call, Storage, Config<T>, Event<T>},
-52 | ||         Pallet: pallet::{Pallet, ValidateUnsigned},
-53 | ||     }
-54 | || }
+66 | ||     pub struct Runtime
+67 | ||     {
+68 | ||         System: frame_system::{Pallet, Call, Storage, Config<T>, Event<T>},
+69 | ||         Pallet: pallet::{Pallet, ValidateUnsigned},
+70 | ||     }
+71 | || }
    | ||_- in this macro invocation
 ...  |
    |
diff --git a/substrate/frame/support/test/tests/construct_runtime_ui/unsupported_meta_structure.rs b/substrate/frame/support/test/tests/construct_runtime_ui/unsupported_meta_structure.rs
index e4e2d3dca021ea74401e9512553ba4ef5ac6003b..30715bb04922fc4b53b074ae80794f78f2c5f0c3 100644
--- a/substrate/frame/support/test/tests/construct_runtime_ui/unsupported_meta_structure.rs
+++ b/substrate/frame/support/test/tests/construct_runtime_ui/unsupported_meta_structure.rs
@@ -1,3 +1,20 @@
+// 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.
+
 use frame_support::construct_runtime;
 
 construct_runtime! {
diff --git a/substrate/frame/support/test/tests/construct_runtime_ui/unsupported_meta_structure.stderr b/substrate/frame/support/test/tests/construct_runtime_ui/unsupported_meta_structure.stderr
index 34637269db617c7edb52091455593f45e0bda079..efaed3e97b91ec19609d1377eadc62f30917c852 100644
--- a/substrate/frame/support/test/tests/construct_runtime_ui/unsupported_meta_structure.stderr
+++ b/substrate/frame/support/test/tests/construct_runtime_ui/unsupported_meta_structure.stderr
@@ -1,6 +1,6 @@
 error: feature(test)
               ^ expected one of `=`, `,`, `)` here
- --> tests/construct_runtime_ui/unsupported_meta_structure.rs:7:3
-  |
-7 |         #[cfg(feature(test))]
-  |         ^
+  --> tests/construct_runtime_ui/unsupported_meta_structure.rs:24:3
+   |
+24 |         #[cfg(feature(test))]
+   |         ^
diff --git a/substrate/frame/support/test/tests/construct_runtime_ui/unsupported_pallet_attr.rs b/substrate/frame/support/test/tests/construct_runtime_ui/unsupported_pallet_attr.rs
index 491cc2c90533de4e1b08ed22070307e7d827b93b..d3af4a53ef0b7c2cb67f286d4e76a0b1185ad343 100644
--- a/substrate/frame/support/test/tests/construct_runtime_ui/unsupported_pallet_attr.rs
+++ b/substrate/frame/support/test/tests/construct_runtime_ui/unsupported_pallet_attr.rs
@@ -1,3 +1,20 @@
+// 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.
+
 use frame_support::construct_runtime;
 
 construct_runtime! {
diff --git a/substrate/frame/support/test/tests/construct_runtime_ui/unsupported_pallet_attr.stderr b/substrate/frame/support/test/tests/construct_runtime_ui/unsupported_pallet_attr.stderr
index da1b61b1c30782f8f3fbc2e078e49fe44595d5b8..52fbe6d466e5c0751af4b54cffe43b0a09d3e356 100644
--- a/substrate/frame/support/test/tests/construct_runtime_ui/unsupported_pallet_attr.stderr
+++ b/substrate/frame/support/test/tests/construct_runtime_ui/unsupported_pallet_attr.stderr
@@ -1,5 +1,5 @@
 error: Unsupported attribute, only #[cfg] is supported on pallet declarations in `construct_runtime`
- --> tests/construct_runtime_ui/unsupported_pallet_attr.rs:7:3
-  |
-7 |         #[attr]
-  |         ^
+  --> tests/construct_runtime_ui/unsupported_pallet_attr.rs:24:3
+   |
+24 |         #[attr]
+   |         ^
diff --git a/substrate/frame/support/test/tests/construct_runtime_ui/use_undefined_part.rs b/substrate/frame/support/test/tests/construct_runtime_ui/use_undefined_part.rs
index 8563be1008cd93473f978cd043dcbad8f2d89848..36dde76d5046c9e0eb4f5e4acb196b0ab6973173 100644
--- a/substrate/frame/support/test/tests/construct_runtime_ui/use_undefined_part.rs
+++ b/substrate/frame/support/test/tests/construct_runtime_ui/use_undefined_part.rs
@@ -1,3 +1,20 @@
+// 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.
+
 use frame_support::construct_runtime;
 use sp_runtime::{generic, traits::BlakeTwo256};
 use sp_core::sr25519;
diff --git a/substrate/frame/support/test/tests/construct_runtime_ui/use_undefined_part.stderr b/substrate/frame/support/test/tests/construct_runtime_ui/use_undefined_part.stderr
index 4058ccab2c5d7da5a836f9a5c90d89f22f285a88..802a966c02cf64d7bf4938cd1e3eb36075928cec 100644
--- a/substrate/frame/support/test/tests/construct_runtime_ui/use_undefined_part.stderr
+++ b/substrate/frame/support/test/tests/construct_runtime_ui/use_undefined_part.stderr
@@ -1,22 +1,22 @@
 error: Invalid pallet part specified, the pallet `Pallet` doesn't have the `Call` part. Available parts are: `Pallet`, `Storage`.
-  --> tests/construct_runtime_ui/use_undefined_part.rs:31:30
+  --> tests/construct_runtime_ui/use_undefined_part.rs:48:30
    |
-31 |         Pallet: pallet use_parts { Call },
+48 |         Pallet: pallet use_parts { Call },
    |                                    ^^^^
 
 error[E0412]: cannot find type `RuntimeCall` in this scope
-  --> tests/construct_runtime_ui/use_undefined_part.rs:23:64
+  --> tests/construct_runtime_ui/use_undefined_part.rs:40:64
    |
-23 | pub type UncheckedExtrinsic = generic::UncheckedExtrinsic<u32, RuntimeCall, Signature, ()>;
+40 | pub type UncheckedExtrinsic = generic::UncheckedExtrinsic<u32, RuntimeCall, Signature, ()>;
    |                                                                ^^^^^^^^^^^ not found in this scope
    |
 help: you might be missing a type parameter
    |
-23 | pub type UncheckedExtrinsic<RuntimeCall> = generic::UncheckedExtrinsic<u32, RuntimeCall, Signature, ()>;
+40 | pub type UncheckedExtrinsic<RuntimeCall> = generic::UncheckedExtrinsic<u32, RuntimeCall, Signature, ()>;
    |                            +++++++++++++
 
 error[E0412]: cannot find type `Runtime` in this scope
-  --> tests/construct_runtime_ui/use_undefined_part.rs:25:25
+  --> tests/construct_runtime_ui/use_undefined_part.rs:42:25
    |
-25 | impl pallet::Config for Runtime {}
+42 | impl pallet::Config for Runtime {}
    |                         ^^^^^^^ not found in this scope
diff --git a/substrate/frame/support/test/tests/derive_impl_ui/attached_to_non_impl.rs b/substrate/frame/support/test/tests/derive_impl_ui/attached_to_non_impl.rs
index 3b27916933865325144e02bfe7d86bfaba63f484..332e1e78730e526491b8d448858ab3ffbafab2d9 100644
--- a/substrate/frame/support/test/tests/derive_impl_ui/attached_to_non_impl.rs
+++ b/substrate/frame/support/test/tests/derive_impl_ui/attached_to_non_impl.rs
@@ -1,3 +1,20 @@
+// 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.
+
 use frame_support::*;
 
 pub trait Animal {
diff --git a/substrate/frame/support/test/tests/derive_impl_ui/attached_to_non_impl.stderr b/substrate/frame/support/test/tests/derive_impl_ui/attached_to_non_impl.stderr
index 735fd7a628e77872f62a535915d9b3c2aeb978e5..1dc575bbffa3c7422eb8b2e5f98d751b5edc794a 100644
--- a/substrate/frame/support/test/tests/derive_impl_ui/attached_to_non_impl.stderr
+++ b/substrate/frame/support/test/tests/derive_impl_ui/attached_to_non_impl.stderr
@@ -1,5 +1,5 @@
 error: expected `impl`
-  --> tests/derive_impl_ui/attached_to_non_impl.rs:39:1
+  --> tests/derive_impl_ui/attached_to_non_impl.rs:56:1
    |
-39 | struct Something {}
+56 | struct Something {}
    | ^^^^^^
diff --git a/substrate/frame/support/test/tests/derive_impl_ui/bad_default_impl_path.rs b/substrate/frame/support/test/tests/derive_impl_ui/bad_default_impl_path.rs
index 2badd1830033bdf877dd19764ba738321c953486..bc118acdf1e69745a8b890ea27fbd3f4e7375704 100644
--- a/substrate/frame/support/test/tests/derive_impl_ui/bad_default_impl_path.rs
+++ b/substrate/frame/support/test/tests/derive_impl_ui/bad_default_impl_path.rs
@@ -1,3 +1,20 @@
+// 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.
+
 use frame_support::*;
 
 pub trait Animal {
diff --git a/substrate/frame/support/test/tests/derive_impl_ui/bad_default_impl_path.stderr b/substrate/frame/support/test/tests/derive_impl_ui/bad_default_impl_path.stderr
index 1cac1662462767fc1139006041ed683eaddcb5ad..c91226ea9c31074ca5141a121a31e4d1fe1f506d 100644
--- a/substrate/frame/support/test/tests/derive_impl_ui/bad_default_impl_path.stderr
+++ b/substrate/frame/support/test/tests/derive_impl_ui/bad_default_impl_path.stderr
@@ -1,7 +1,5 @@
-error: cannot find macro `__export_tokens_tt_tiger` in this scope
-  --> tests/derive_impl_ui/bad_default_impl_path.rs:42:1
+error: cannot find macro `Tiger` in this scope
+  --> tests/derive_impl_ui/bad_default_impl_path.rs:59:15
    |
-42 | #[derive_impl(Tiger as Animal)]
-   | ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
-   |
-   = note: this error originates in the macro `frame_support::macro_magic::forward_tokens` (in Nightly builds, run with -Z macro-backtrace for more info)
+59 | #[derive_impl(Tiger as Animal)]
+   |               ^^^^^
diff --git a/substrate/frame/support/test/tests/derive_impl_ui/bad_disambiguation_path.rs b/substrate/frame/support/test/tests/derive_impl_ui/bad_disambiguation_path.rs
index adc5df23a759a0cdb43495d44261cc9e9c0f2657..9535ac3deda6b46f85178b7c9062d8cea7adfe94 100644
--- a/substrate/frame/support/test/tests/derive_impl_ui/bad_disambiguation_path.rs
+++ b/substrate/frame/support/test/tests/derive_impl_ui/bad_disambiguation_path.rs
@@ -1,3 +1,20 @@
+// 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.
+
 use frame_support::*;
 
 pub trait Animal {
diff --git a/substrate/frame/support/test/tests/derive_impl_ui/bad_disambiguation_path.stderr b/substrate/frame/support/test/tests/derive_impl_ui/bad_disambiguation_path.stderr
index 6fd4e431beb52c62c5ea2b98648f625627ab0825..664146302d299963f56999662ce567e613031c81 100644
--- a/substrate/frame/support/test/tests/derive_impl_ui/bad_disambiguation_path.stderr
+++ b/substrate/frame/support/test/tests/derive_impl_ui/bad_disambiguation_path.stderr
@@ -1,5 +1,5 @@
 error[E0405]: cannot find trait `Insect` in this scope
-  --> tests/derive_impl_ui/bad_disambiguation_path.rs:38:35
+  --> tests/derive_impl_ui/bad_disambiguation_path.rs:55:35
    |
-38 | #[derive_impl(FourLeggedAnimal as Insect)]
+55 | #[derive_impl(FourLeggedAnimal as Insect)]
    |                                   ^^^^^^ not found in this scope
diff --git a/substrate/frame/support/test/tests/derive_impl_ui/inject_runtime_type_fails_when_type_not_in_scope.rs b/substrate/frame/support/test/tests/derive_impl_ui/inject_runtime_type_fails_when_type_not_in_scope.rs
index 0d8dc8eb1d4720ed542c6a4d95bf74e932848552..7e5df20a963c8f803545e01b33aed283710eeb83 100644
--- a/substrate/frame/support/test/tests/derive_impl_ui/inject_runtime_type_fails_when_type_not_in_scope.rs
+++ b/substrate/frame/support/test/tests/derive_impl_ui/inject_runtime_type_fails_when_type_not_in_scope.rs
@@ -1,3 +1,20 @@
+// 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.
+
 use frame_support::{*, pallet_prelude::inject_runtime_type};
 use static_assertions::assert_type_eq_all;
 
diff --git a/substrate/frame/support/test/tests/derive_impl_ui/inject_runtime_type_fails_when_type_not_in_scope.stderr b/substrate/frame/support/test/tests/derive_impl_ui/inject_runtime_type_fails_when_type_not_in_scope.stderr
index 683131cceb8dce24e5a7947bc367243e58014ab8..f3ac6b2328110f0e2c6e95c7c6f995b3dea2d1dc 100644
--- a/substrate/frame/support/test/tests/derive_impl_ui/inject_runtime_type_fails_when_type_not_in_scope.stderr
+++ b/substrate/frame/support/test/tests/derive_impl_ui/inject_runtime_type_fails_when_type_not_in_scope.stderr
@@ -1,10 +1,10 @@
 error[E0412]: cannot find type `RuntimeCall` in this scope
-  --> tests/derive_impl_ui/inject_runtime_type_fails_when_type_not_in_scope.rs:13:10
+  --> tests/derive_impl_ui/inject_runtime_type_fails_when_type_not_in_scope.rs:30:10
    |
-13 |     type RuntimeCall = ();
+30 |     type RuntimeCall = ();
    |          ^^^^^^^^^^^ help: you might have meant to use the associated type: `Self::RuntimeCall`
 ...
-18 | #[derive_impl(Pallet)] // Injects type RuntimeCall = RuntimeCall;
+35 | #[derive_impl(Pallet)] // Injects type RuntimeCall = RuntimeCall;
    | ---------------------- in this macro invocation
    |
-   = note: this error originates in the macro `__export_tokens_tt_pallet` which comes from the expansion of the macro `frame_support::macro_magic::forward_tokens` (in Nightly builds, run with -Z macro-backtrace for more info)
+   = note: this error originates in the macro `Pallet` which comes from the expansion of the macro `frame_support::macro_magic::forward_tokens_verbatim` (in Nightly builds, run with -Z macro-backtrace for more info)
diff --git a/substrate/frame/support/test/tests/derive_impl_ui/inject_runtime_type_invalid.rs b/substrate/frame/support/test/tests/derive_impl_ui/inject_runtime_type_invalid.rs
index 60ec710d0154c368a222bf358a2382b4dc94665b..cb541091a97636715654d61a3259b444558cab45 100644
--- a/substrate/frame/support/test/tests/derive_impl_ui/inject_runtime_type_invalid.rs
+++ b/substrate/frame/support/test/tests/derive_impl_ui/inject_runtime_type_invalid.rs
@@ -1,3 +1,20 @@
+// 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.
+
 use frame_support::{*, pallet_prelude::inject_runtime_type};
 use static_assertions::assert_type_eq_all;
 
diff --git a/substrate/frame/support/test/tests/derive_impl_ui/inject_runtime_type_invalid.stderr b/substrate/frame/support/test/tests/derive_impl_ui/inject_runtime_type_invalid.stderr
index c3382510744a7a1912fed107abbcf29922971905..501aad0419f8e85a67f1b9cde11d5c5452feaff0 100644
--- a/substrate/frame/support/test/tests/derive_impl_ui/inject_runtime_type_invalid.stderr
+++ b/substrate/frame/support/test/tests/derive_impl_ui/inject_runtime_type_invalid.stderr
@@ -1,14 +1,14 @@
 error: `#[inject_runtime_type]` can only be attached to `RuntimeCall`, `RuntimeEvent`, `RuntimeOrigin` or `PalletInfo`
-  --> tests/derive_impl_ui/inject_runtime_type_invalid.rs:15:5
+  --> tests/derive_impl_ui/inject_runtime_type_invalid.rs:32:5
    |
-15 |     type RuntimeInfo = ();
+32 |     type RuntimeInfo = ();
    |     ^^^^^^^^^^^^^^^^^^^^^^
 
 error[E0046]: not all trait items implemented, missing: `RuntimeInfo`
-  --> tests/derive_impl_ui/inject_runtime_type_invalid.rs:13:1
+  --> tests/derive_impl_ui/inject_runtime_type_invalid.rs:30:1
    |
-5  |     type RuntimeInfo;
+22 |     type RuntimeInfo;
    |     ---------------- `RuntimeInfo` from trait
 ...
-13 | impl Config for Pallet {
+30 | impl Config for Pallet {
    | ^^^^^^^^^^^^^^^^^^^^^^ missing `RuntimeInfo` in implementation
diff --git a/substrate/frame/support/test/tests/derive_impl_ui/missing_disambiguation_path.rs b/substrate/frame/support/test/tests/derive_impl_ui/missing_disambiguation_path.rs
index 21f1cc32009a5d27a6196e99caff6b2f718af8d4..f26c28313e5154a3f0a4e66d458375d0ecf59761 100644
--- a/substrate/frame/support/test/tests/derive_impl_ui/missing_disambiguation_path.rs
+++ b/substrate/frame/support/test/tests/derive_impl_ui/missing_disambiguation_path.rs
@@ -1,3 +1,20 @@
+// 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.
+
 use frame_support::*;
 
 pub trait Animal {
diff --git a/substrate/frame/support/test/tests/derive_impl_ui/missing_disambiguation_path.stderr b/substrate/frame/support/test/tests/derive_impl_ui/missing_disambiguation_path.stderr
index 85cd94ae08ae7ee72a6a67b0c0cd113abd7b70ff..365df0331ae73a5b238cbf6437939c7cea998702 100644
--- a/substrate/frame/support/test/tests/derive_impl_ui/missing_disambiguation_path.stderr
+++ b/substrate/frame/support/test/tests/derive_impl_ui/missing_disambiguation_path.stderr
@@ -1,7 +1,7 @@
 error: unexpected end of input, expected identifier
-  --> tests/derive_impl_ui/missing_disambiguation_path.rs:38:1
+  --> tests/derive_impl_ui/missing_disambiguation_path.rs:55:1
    |
-38 | #[derive_impl(FourLeggedAnimal as)]
+55 | #[derive_impl(FourLeggedAnimal as)]
    | ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
    |
    = note: this error originates in the attribute macro `derive_impl` (in Nightly builds, run with -Z macro-backtrace for more info)
diff --git a/substrate/frame/support/test/tests/derive_impl_ui/pass/basic_overriding.rs b/substrate/frame/support/test/tests/derive_impl_ui/pass/basic_overriding.rs
index 336ddc315f8cb3f7387db6894db1106113698822..37c0742f195d786ded121a631dbd384e48aff137 100644
--- a/substrate/frame/support/test/tests/derive_impl_ui/pass/basic_overriding.rs
+++ b/substrate/frame/support/test/tests/derive_impl_ui/pass/basic_overriding.rs
@@ -1,3 +1,20 @@
+// 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.
+
 use frame_support::*;
 use static_assertions::assert_type_eq_all;
 
diff --git a/substrate/frame/support/test/tests/derive_impl_ui/pass/macro_magic_working.rs b/substrate/frame/support/test/tests/derive_impl_ui/pass/macro_magic_working.rs
index ec09bd15e01731b5c5cf544928e4dea264c8831b..e4cb94e74bd62473124bd75673aac7ab8f2cc3aa 100644
--- a/substrate/frame/support/test/tests/derive_impl_ui/pass/macro_magic_working.rs
+++ b/substrate/frame/support/test/tests/derive_impl_ui/pass/macro_magic_working.rs
@@ -1,3 +1,20 @@
+// 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.
+
 #[frame_support::macro_magic::export_tokens]
 struct MyCoolStruct {
 	field: u32,
diff --git a/substrate/frame/support/test/tests/derive_impl_ui/pass/runtime_type_working.rs b/substrate/frame/support/test/tests/derive_impl_ui/pass/runtime_type_working.rs
index 04ad008944682cc0705ed04c8b239838e67286c7..93b7309cf97146cad41c5af62e781c8c5320dc9c 100644
--- a/substrate/frame/support/test/tests/derive_impl_ui/pass/runtime_type_working.rs
+++ b/substrate/frame/support/test/tests/derive_impl_ui/pass/runtime_type_working.rs
@@ -1,3 +1,20 @@
+// 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.
+
 use frame_support::{*, pallet_prelude::inject_runtime_type};
 use static_assertions::assert_type_eq_all;
 
diff --git a/substrate/frame/support/test/tests/derive_no_bound_ui/clone.rs b/substrate/frame/support/test/tests/derive_no_bound_ui/clone.rs
index 2bc1cc492d171f695fa22334c3d53e1c4f30cae6..9da7d66fe1bd8d4453d1e3003b9dc041f4ca870d 100644
--- a/substrate/frame/support/test/tests/derive_no_bound_ui/clone.rs
+++ b/substrate/frame/support/test/tests/derive_no_bound_ui/clone.rs
@@ -1,3 +1,20 @@
+// 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.
+
 trait Config {
 	type C;
 }
diff --git a/substrate/frame/support/test/tests/derive_no_bound_ui/clone.stderr b/substrate/frame/support/test/tests/derive_no_bound_ui/clone.stderr
index 7744586e56bf4757994f2a92d373b763a3643df1..e0294d3c2fde715c7e9a65d078b4c3aa4868bd8b 100644
--- a/substrate/frame/support/test/tests/derive_no_bound_ui/clone.stderr
+++ b/substrate/frame/support/test/tests/derive_no_bound_ui/clone.stderr
@@ -1,5 +1,5 @@
 error[E0277]: the trait bound `<T as Config>::C: Clone` is not satisfied
- --> tests/derive_no_bound_ui/clone.rs:7:2
-  |
-7 |     c: T::C,
-  |     ^ the trait `Clone` is not implemented for `<T as Config>::C`
+  --> tests/derive_no_bound_ui/clone.rs:24:2
+   |
+24 |     c: T::C,
+   |     ^ the trait `Clone` is not implemented for `<T as Config>::C`
diff --git a/substrate/frame/support/test/tests/derive_no_bound_ui/debug.rs b/substrate/frame/support/test/tests/derive_no_bound_ui/debug.rs
index 6016c3e6d98b8ca71eadc645382fd997071ec22d..02215cb8d57a5011e310442d1b5078c8c50e5b50 100644
--- a/substrate/frame/support/test/tests/derive_no_bound_ui/debug.rs
+++ b/substrate/frame/support/test/tests/derive_no_bound_ui/debug.rs
@@ -1,3 +1,20 @@
+// 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.
+
 trait Config {
 	type C;
 }
diff --git a/substrate/frame/support/test/tests/derive_no_bound_ui/debug.stderr b/substrate/frame/support/test/tests/derive_no_bound_ui/debug.stderr
index acc7f80b376634e46e3301f9f76d061c9b329526..3291f658f10e1fce9877acc69f02aa67a1c974f9 100644
--- a/substrate/frame/support/test/tests/derive_no_bound_ui/debug.stderr
+++ b/substrate/frame/support/test/tests/derive_no_bound_ui/debug.stderr
@@ -1,8 +1,8 @@
 error[E0277]: `<T as Config>::C` doesn't implement `std::fmt::Debug`
- --> tests/derive_no_bound_ui/debug.rs:7:2
-  |
-7 |     c: T::C,
-  |     ^ `<T as Config>::C` cannot be formatted using `{:?}` because it doesn't implement `std::fmt::Debug`
-  |
-  = help: the trait `std::fmt::Debug` is not implemented for `<T as Config>::C`
-  = note: required for the cast from `<T as Config>::C` to the object type `dyn std::fmt::Debug`
+  --> tests/derive_no_bound_ui/debug.rs:24:2
+   |
+24 |     c: T::C,
+   |     ^ `<T as Config>::C` cannot be formatted using `{:?}` because it doesn't implement `std::fmt::Debug`
+   |
+   = help: the trait `std::fmt::Debug` is not implemented for `<T as Config>::C`
+   = note: required for the cast from `&<T as Config>::C` to `&dyn std::fmt::Debug`
diff --git a/substrate/frame/support/test/tests/derive_no_bound_ui/default.rs b/substrate/frame/support/test/tests/derive_no_bound_ui/default.rs
index 0780a88e6753daf9719aa98204b9e583f16c1b31..1a66c3b79fcf96a6a10488b0a1e4aadb7b87b0c1 100644
--- a/substrate/frame/support/test/tests/derive_no_bound_ui/default.rs
+++ b/substrate/frame/support/test/tests/derive_no_bound_ui/default.rs
@@ -1,3 +1,20 @@
+// 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.
+
 trait Config {
 	type C;
 }
diff --git a/substrate/frame/support/test/tests/derive_no_bound_ui/default.stderr b/substrate/frame/support/test/tests/derive_no_bound_ui/default.stderr
index d56dd438f2a7fa2bf100920cab12151d8737fdd6..90e976d9f6a345d729e80a8052d0ddd442dc1b02 100644
--- a/substrate/frame/support/test/tests/derive_no_bound_ui/default.stderr
+++ b/substrate/frame/support/test/tests/derive_no_bound_ui/default.stderr
@@ -1,5 +1,5 @@
 error[E0277]: the trait bound `<T as Config>::C: std::default::Default` is not satisfied
- --> tests/derive_no_bound_ui/default.rs:7:2
-  |
-7 |     c: T::C,
-  |     ^ the trait `std::default::Default` is not implemented for `<T as Config>::C`
+  --> tests/derive_no_bound_ui/default.rs:24:2
+   |
+24 |     c: T::C,
+   |     ^ the trait `std::default::Default` is not implemented for `<T as Config>::C`
diff --git a/substrate/frame/support/test/tests/derive_no_bound_ui/default_empty_enum.rs b/substrate/frame/support/test/tests/derive_no_bound_ui/default_empty_enum.rs
index 51b6137c0075537bc249424ddce61125db8bd495..48f276df68b85df0cefaf4b2c34ada8605225039 100644
--- a/substrate/frame/support/test/tests/derive_no_bound_ui/default_empty_enum.rs
+++ b/substrate/frame/support/test/tests/derive_no_bound_ui/default_empty_enum.rs
@@ -1,3 +1,20 @@
+// 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.
+
 #[derive(frame_support::DefaultNoBound)]
 enum Empty {}
 
diff --git a/substrate/frame/support/test/tests/derive_no_bound_ui/default_empty_enum.stderr b/substrate/frame/support/test/tests/derive_no_bound_ui/default_empty_enum.stderr
index 9c93b515adce51bc891f86d1fe765f9ca6ba8a5d..246fe67586b9852e0ba751e01b44f8f7923604d3 100644
--- a/substrate/frame/support/test/tests/derive_no_bound_ui/default_empty_enum.stderr
+++ b/substrate/frame/support/test/tests/derive_no_bound_ui/default_empty_enum.stderr
@@ -1,5 +1,5 @@
 error: cannot derive Default for an empty enum
- --> tests/derive_no_bound_ui/default_empty_enum.rs:2:6
-  |
-2 | enum Empty {}
-  |      ^^^^^
+  --> tests/derive_no_bound_ui/default_empty_enum.rs:19:6
+   |
+19 | enum Empty {}
+   |      ^^^^^
diff --git a/substrate/frame/support/test/tests/derive_no_bound_ui/default_no_attribute.rs b/substrate/frame/support/test/tests/derive_no_bound_ui/default_no_attribute.rs
index 185df01fe2b842341c417ba327e0fd11fb7942e8..1d40eac4c7193cb1c91268f9ccf26673f7c8149a 100644
--- a/substrate/frame/support/test/tests/derive_no_bound_ui/default_no_attribute.rs
+++ b/substrate/frame/support/test/tests/derive_no_bound_ui/default_no_attribute.rs
@@ -1,3 +1,20 @@
+// 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.
+
 trait Config {
 	type C;
 }
diff --git a/substrate/frame/support/test/tests/derive_no_bound_ui/default_no_attribute.stderr b/substrate/frame/support/test/tests/derive_no_bound_ui/default_no_attribute.stderr
index 12e0023671587784b0c00accd57f501fb05d5f02..d0c4401e8c582f62a4552ce8c098d7d463bf00aa 100644
--- a/substrate/frame/support/test/tests/derive_no_bound_ui/default_no_attribute.stderr
+++ b/substrate/frame/support/test/tests/derive_no_bound_ui/default_no_attribute.stderr
@@ -1,5 +1,5 @@
 error: no default declared, make a variant default by placing `#[default]` above it
- --> tests/derive_no_bound_ui/default_no_attribute.rs:6:6
-  |
-6 | enum Foo<T: Config> {
-  |      ^^^
+  --> tests/derive_no_bound_ui/default_no_attribute.rs:23:6
+   |
+23 | enum Foo<T: Config> {
+   |      ^^^
diff --git a/substrate/frame/support/test/tests/derive_no_bound_ui/default_too_many_attributes.rs b/substrate/frame/support/test/tests/derive_no_bound_ui/default_too_many_attributes.rs
index c3d175da6c056f917ebd33cc3fb7c70b7aaafe22..808223f2ff076083a75d7f093a8ec8beefa07ca9 100644
--- a/substrate/frame/support/test/tests/derive_no_bound_ui/default_too_many_attributes.rs
+++ b/substrate/frame/support/test/tests/derive_no_bound_ui/default_too_many_attributes.rs
@@ -1,3 +1,20 @@
+// 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.
+
 trait Config {
 	type C;
 }
diff --git a/substrate/frame/support/test/tests/derive_no_bound_ui/default_too_many_attributes.stderr b/substrate/frame/support/test/tests/derive_no_bound_ui/default_too_many_attributes.stderr
index 5430ef142c5c864581167a0db87fb78f68de02ef..775964ea42deb2a179b18309b9c18684e291f1b1 100644
--- a/substrate/frame/support/test/tests/derive_no_bound_ui/default_too_many_attributes.stderr
+++ b/substrate/frame/support/test/tests/derive_no_bound_ui/default_too_many_attributes.stderr
@@ -1,21 +1,21 @@
 error: multiple declared defaults
- --> tests/derive_no_bound_ui/default_too_many_attributes.rs:5:10
-  |
-5 | #[derive(frame_support::DefaultNoBound)]
-  |          ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
-  |
-  = note: this error originates in the derive macro `frame_support::DefaultNoBound` (in Nightly builds, run with -Z macro-backtrace for more info)
+  --> tests/derive_no_bound_ui/default_too_many_attributes.rs:22:10
+   |
+22 | #[derive(frame_support::DefaultNoBound)]
+   |          ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
+   |
+   = note: this error originates in the derive macro `frame_support::DefaultNoBound` (in Nightly builds, run with -Z macro-backtrace for more info)
 
 error: first default
- --> tests/derive_no_bound_ui/default_too_many_attributes.rs:7:2
-  |
-7 | /     #[default]
-8 | |     Bar(T::C),
-  | |_____________^
+  --> tests/derive_no_bound_ui/default_too_many_attributes.rs:24:2
+   |
+24 | /     #[default]
+25 | |     Bar(T::C),
+   | |_____________^
 
 error: additional default
-  --> tests/derive_no_bound_ui/default_too_many_attributes.rs:9:2
+  --> tests/derive_no_bound_ui/default_too_many_attributes.rs:26:2
    |
-9  | /     #[default]
-10 | |     Baz,
+26 | /     #[default]
+27 | |     Baz,
    | |_______^
diff --git a/substrate/frame/support/test/tests/derive_no_bound_ui/default_union.rs b/substrate/frame/support/test/tests/derive_no_bound_ui/default_union.rs
index 5822cda1aa64df30f604df3a8438d1daacebc36e..74e4b61df72d346199d704abb0eefbda1321f425 100644
--- a/substrate/frame/support/test/tests/derive_no_bound_ui/default_union.rs
+++ b/substrate/frame/support/test/tests/derive_no_bound_ui/default_union.rs
@@ -1,3 +1,20 @@
+// 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.
+
 #[derive(frame_support::DefaultNoBound)]
 union Foo {
 	field1: u32,
diff --git a/substrate/frame/support/test/tests/derive_no_bound_ui/default_union.stderr b/substrate/frame/support/test/tests/derive_no_bound_ui/default_union.stderr
index 1e01e1baaf8ac1793beb5b178864a5c7c32514bb..177fcce7fe1282eade894f4739e9cdfee5ce7c56 100644
--- a/substrate/frame/support/test/tests/derive_no_bound_ui/default_union.stderr
+++ b/substrate/frame/support/test/tests/derive_no_bound_ui/default_union.stderr
@@ -1,5 +1,5 @@
 error: Union type not supported by `derive(DefaultNoBound)`
- --> tests/derive_no_bound_ui/default_union.rs:2:1
-  |
-2 | union Foo {
-  | ^^^^^
+  --> tests/derive_no_bound_ui/default_union.rs:19:1
+   |
+19 | union Foo {
+   | ^^^^^
diff --git a/substrate/frame/support/test/tests/derive_no_bound_ui/eq.rs b/substrate/frame/support/test/tests/derive_no_bound_ui/eq.rs
index a48452626368c08dd9d0df1265a344caccce86e7..12636c94e69277237c3ce3f887012ae626709e87 100644
--- a/substrate/frame/support/test/tests/derive_no_bound_ui/eq.rs
+++ b/substrate/frame/support/test/tests/derive_no_bound_ui/eq.rs
@@ -1,3 +1,20 @@
+// 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.
+
 trait Config {
 	type C;
 }
diff --git a/substrate/frame/support/test/tests/derive_no_bound_ui/eq.stderr b/substrate/frame/support/test/tests/derive_no_bound_ui/eq.stderr
index eb3345eede508649c5bdaa977edf15024cd5627a..c8430210e82143aefd343c5639de6ce629edf1f9 100644
--- a/substrate/frame/support/test/tests/derive_no_bound_ui/eq.stderr
+++ b/substrate/frame/support/test/tests/derive_no_bound_ui/eq.stderr
@@ -1,12 +1,12 @@
 error[E0277]: can't compare `Foo<T>` with `Foo<T>`
- --> tests/derive_no_bound_ui/eq.rs:6:8
-  |
-6 | struct Foo<T: Config> {
-  |        ^^^^^^^^^^^^^^ no implementation for `Foo<T> == Foo<T>`
-  |
-  = help: the trait `PartialEq` is not implemented for `Foo<T>`
+  --> tests/derive_no_bound_ui/eq.rs:23:8
+   |
+23 | struct Foo<T: Config> {
+   |        ^^^^^^^^^^^^^^ no implementation for `Foo<T> == Foo<T>`
+   |
+   = help: the trait `PartialEq` is not implemented for `Foo<T>`
 note: required by a bound in `std::cmp::Eq`
- --> $RUST/core/src/cmp.rs
-  |
-  | pub trait Eq: PartialEq<Self> {
-  |               ^^^^^^^^^^^^^^^ required by this bound in `Eq`
+  --> $RUST/core/src/cmp.rs
+   |
+   | pub trait Eq: PartialEq<Self> {
+   |               ^^^^^^^^^^^^^^^ required by this bound in `Eq`
diff --git a/substrate/frame/support/test/tests/derive_no_bound_ui/partial_eq.rs b/substrate/frame/support/test/tests/derive_no_bound_ui/partial_eq.rs
index 7bd6b7ef6a2e3c5fec0ee6488356c66a76b5593d..23a910a24ea0d0121c3ec821985af65fd3a1bf3e 100644
--- a/substrate/frame/support/test/tests/derive_no_bound_ui/partial_eq.rs
+++ b/substrate/frame/support/test/tests/derive_no_bound_ui/partial_eq.rs
@@ -1,3 +1,20 @@
+// 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.
+
 trait Config {
 	type C;
 }
diff --git a/substrate/frame/support/test/tests/derive_no_bound_ui/partial_eq.stderr b/substrate/frame/support/test/tests/derive_no_bound_ui/partial_eq.stderr
index 1c230db376a49e000f848fc0e130580f7b2a7a3e..b46df2369b451237bb99e8acdb34da3cf9b41ed0 100644
--- a/substrate/frame/support/test/tests/derive_no_bound_ui/partial_eq.stderr
+++ b/substrate/frame/support/test/tests/derive_no_bound_ui/partial_eq.stderr
@@ -1,5 +1,5 @@
 error[E0369]: binary operation `==` cannot be applied to type `<T as Config>::C`
- --> tests/derive_no_bound_ui/partial_eq.rs:7:2
-  |
-7 |     c: T::C,
-  |     ^
+  --> tests/derive_no_bound_ui/partial_eq.rs:24:2
+   |
+24 |     c: T::C,
+   |     ^
diff --git a/substrate/frame/support/test/tests/pallet.rs b/substrate/frame/support/test/tests/pallet.rs
index 8c85cd56959533f0e35cdebc35d7b48b03a6b225..83ae5b9253cec41fcd661ced8cd2097465c89527 100644
--- a/substrate/frame/support/test/tests/pallet.rs
+++ b/substrate/frame/support/test/tests/pallet.rs
@@ -17,10 +17,7 @@
 
 use frame_support::{
 	assert_ok,
-	dispatch::{
-		DispatchClass, DispatchInfo, Dispatchable, GetDispatchInfo, Parameter, Pays,
-		UnfilteredDispatchable,
-	},
+	dispatch::{DispatchClass, DispatchInfo, GetDispatchInfo, Parameter, Pays},
 	dispatch_context::with_context,
 	pallet_prelude::{StorageInfoTrait, ValueQuery},
 	parameter_types,
@@ -28,6 +25,7 @@ use frame_support::{
 	traits::{
 		ConstU32, GetCallIndex, GetCallName, GetStorageVersion, OnFinalize, OnGenesis,
 		OnInitialize, OnRuntimeUpgrade, PalletError, PalletInfoAccess, StorageVersion,
+		UnfilteredDispatchable,
 	},
 	weights::{RuntimeDbWeight, Weight},
 };
@@ -37,7 +35,7 @@ use sp_io::{
 	TestExternalities,
 };
 use sp_runtime::{
-	traits::{Extrinsic as ExtrinsicT, SignaturePayload as SignaturePayloadT},
+	traits::{Dispatchable, Extrinsic as ExtrinsicT, SignaturePayload as SignaturePayloadT},
 	DispatchError, ModuleError,
 };
 
@@ -212,12 +210,13 @@ pub mod pallet {
 	{
 		/// Doc comment put in metadata
 		#[pallet::call_index(0)]
-		#[pallet::weight(Weight::from_parts(*_foo as u64, 0))]
+		#[pallet::weight(Weight::from_parts(*foo as u64, 0))]
 		pub fn foo(
 			origin: OriginFor<T>,
-			#[pallet::compact] _foo: u32,
+			#[pallet::compact] foo: u32,
 			_bar: u32,
 		) -> DispatchResultWithPostInfo {
+			let _ = foo;
 			let _ = T::AccountId::from(SomeType1); // Test for where clause
 			let _ = T::AccountId::from(SomeType3); // Test for where clause
 			let _ = origin;
@@ -1388,7 +1387,7 @@ fn metadata() {
 		}
 	}
 
-	let readme = "Support code for the runtime.\n\nLicense: Apache-2.0";
+	let readme = "Support code for the runtime.\n\nLicense: Apache-2.0\n";
 	let expected_pallet_doc = vec![" Pallet documentation", readme, readme];
 
 	let pallets = vec![
@@ -1891,7 +1890,7 @@ fn metadata_ir_pallet_runtime_docs() {
 		.find(|pallet| pallet.name == "Example")
 		.expect("Pallet should be present");
 
-	let readme = "Support code for the runtime.\n\nLicense: Apache-2.0";
+	let readme = "Support code for the runtime.\n\nLicense: Apache-2.0\n";
 	let expected = vec![" Pallet documentation", readme, readme];
 	assert_eq!(pallet.docs, expected);
 }
@@ -1921,7 +1920,7 @@ fn extrinsic_metadata_ir_types() {
 #[test]
 fn test_pallet_runtime_docs() {
 	let docs = crate::pallet::Pallet::<Runtime>::pallet_documentation_metadata();
-	let readme = "Support code for the runtime.\n\nLicense: Apache-2.0";
+	let readme = "Support code for the runtime.\n\nLicense: Apache-2.0\n";
 	let expected = vec![" Pallet documentation", readme, readme];
 	assert_eq!(docs, expected);
 }
diff --git a/substrate/frame/support/test/tests/pallet_instance.rs b/substrate/frame/support/test/tests/pallet_instance.rs
index be675a562cec5d40c7cf468c5a6b04b08202b998..724734ec4fc9dbe7eab0c6e26fc221f165a0e8c9 100644
--- a/substrate/frame/support/test/tests/pallet_instance.rs
+++ b/substrate/frame/support/test/tests/pallet_instance.rs
@@ -16,11 +16,14 @@
 // limitations under the License.
 
 use frame_support::{
-	dispatch::{DispatchClass, DispatchInfo, GetDispatchInfo, Pays, UnfilteredDispatchable},
+	dispatch::{DispatchClass, DispatchInfo, GetDispatchInfo, Pays},
 	pallet_prelude::ValueQuery,
 	parameter_types,
 	storage::unhashed,
-	traits::{ConstU32, GetCallName, OnFinalize, OnGenesis, OnInitialize, OnRuntimeUpgrade},
+	traits::{
+		ConstU32, GetCallName, OnFinalize, OnGenesis, OnInitialize, OnRuntimeUpgrade,
+		UnfilteredDispatchable,
+	},
 	weights::Weight,
 };
 use sp_io::{
@@ -84,12 +87,13 @@ pub mod pallet {
 	impl<T: Config<I>, I: 'static> Pallet<T, I> {
 		/// Doc comment put in metadata
 		#[pallet::call_index(0)]
-		#[pallet::weight(Weight::from_parts(*_foo as u64, 0))]
+		#[pallet::weight(Weight::from_parts(*foo as u64, 0))]
 		pub fn foo(
 			origin: OriginFor<T>,
-			#[pallet::compact] _foo: u32,
+			#[pallet::compact] foo: u32,
 		) -> DispatchResultWithPostInfo {
 			let _ = origin;
+			let _ = foo;
 			Self::deposit_event(Event::Something(3));
 			Ok(().into())
 		}
diff --git a/substrate/frame/support/test/tests/pallet_ui/attr_non_empty.rs b/substrate/frame/support/test/tests/pallet_ui/attr_non_empty.rs
index 5173d983bbd8e37a6df18ba4b0b7953b6a3c9e94..fb3d1a742471e9fde9ac587f0cf9f6357af10be6 100644
--- a/substrate/frame/support/test/tests/pallet_ui/attr_non_empty.rs
+++ b/substrate/frame/support/test/tests/pallet_ui/attr_non_empty.rs
@@ -1,3 +1,20 @@
+// 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.
+
 #[frame_support::pallet [foo]]
 mod foo {
 }
diff --git a/substrate/frame/support/test/tests/pallet_ui/attr_non_empty.stderr b/substrate/frame/support/test/tests/pallet_ui/attr_non_empty.stderr
index 9eac5de35db802320915c3b76a0367c03d1040f7..1a54d76c97dc65c2213b56234885891117c02981 100644
--- a/substrate/frame/support/test/tests/pallet_ui/attr_non_empty.stderr
+++ b/substrate/frame/support/test/tests/pallet_ui/attr_non_empty.stderr
@@ -1,5 +1,5 @@
 error: Invalid pallet macro call: unexpected attribute. Macro call must be bare, such as `#[frame_support::pallet]` or `#[pallet]`, or must specify the `dev_mode` attribute, such as `#[frame_support::pallet(dev_mode)]` or #[pallet(dev_mode)].
- --> tests/pallet_ui/attr_non_empty.rs:1:26
-  |
-1 | #[frame_support::pallet [foo]]
-  |                          ^^^
+  --> tests/pallet_ui/attr_non_empty.rs:18:26
+   |
+18 | #[frame_support::pallet [foo]]
+   |                          ^^^
diff --git a/substrate/frame/support/test/tests/pallet_ui/call_argument_invalid_bound.rs b/substrate/frame/support/test/tests/pallet_ui/call_argument_invalid_bound.rs
index 4f18f7281817afca45d6846339185821c4013705..06a111150172bd255648b281e80c2e7d479742fb 100644
--- a/substrate/frame/support/test/tests/pallet_ui/call_argument_invalid_bound.rs
+++ b/substrate/frame/support/test/tests/pallet_ui/call_argument_invalid_bound.rs
@@ -1,3 +1,20 @@
+// 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.
+
 #[frame_support::pallet]
 mod pallet {
 	use frame_support::pallet_prelude::{Hooks, DispatchResultWithPostInfo};
diff --git a/substrate/frame/support/test/tests/pallet_ui/call_argument_invalid_bound.stderr b/substrate/frame/support/test/tests/pallet_ui/call_argument_invalid_bound.stderr
index d10bf1359019adb1197c9bbb2c4cbd48f66fb817..08ea7c0bec3a5dfca33ff497b2981e9acb17f294 100644
--- a/substrate/frame/support/test/tests/pallet_ui/call_argument_invalid_bound.stderr
+++ b/substrate/frame/support/test/tests/pallet_ui/call_argument_invalid_bound.stderr
@@ -4,31 +4,31 @@ error: use of deprecated constant `pallet::warnings::ConstantWeight_0::_w`:
 
                For more info see:
                    <https://github.com/paritytech/substrate/pull/13798>
-  --> tests/pallet_ui/call_argument_invalid_bound.rs:19:20
+  --> tests/pallet_ui/call_argument_invalid_bound.rs:36:20
    |
-19 |         #[pallet::weight(0)]
+36 |         #[pallet::weight(0)]
    |                          ^
    |
    = note: `-D deprecated` implied by `-D warnings`
 
 error[E0277]: `<T as pallet::Config>::Bar` doesn't implement `std::fmt::Debug`
-  --> tests/pallet_ui/call_argument_invalid_bound.rs:21:36
+  --> tests/pallet_ui/call_argument_invalid_bound.rs:38:36
    |
-21 |         pub fn foo(origin: OriginFor<T>, _bar: T::Bar) -> DispatchResultWithPostInfo {
+38 |         pub fn foo(origin: OriginFor<T>, _bar: T::Bar) -> DispatchResultWithPostInfo {
    |                                          ^^^^ `<T as pallet::Config>::Bar` cannot be formatted using `{:?}` because it doesn't implement `std::fmt::Debug`
    |
    = help: the trait `std::fmt::Debug` is not implemented for `<T as pallet::Config>::Bar`
    = note: required for `&<T as pallet::Config>::Bar` to implement `std::fmt::Debug`
-   = note: required for the cast from `&<T as pallet::Config>::Bar` to the object type `dyn std::fmt::Debug`
+   = note: required for the cast from `&&<T as pallet::Config>::Bar` to `&dyn std::fmt::Debug`
 
 error[E0277]: the trait bound `<T as pallet::Config>::Bar: Clone` is not satisfied
-  --> tests/pallet_ui/call_argument_invalid_bound.rs:21:36
+  --> tests/pallet_ui/call_argument_invalid_bound.rs:38:36
    |
-21 |         pub fn foo(origin: OriginFor<T>, _bar: T::Bar) -> DispatchResultWithPostInfo {
+38 |         pub fn foo(origin: OriginFor<T>, _bar: T::Bar) -> DispatchResultWithPostInfo {
    |                                          ^^^^ the trait `Clone` is not implemented for `<T as pallet::Config>::Bar`
 
 error[E0369]: binary operation `==` cannot be applied to type `&<T as pallet::Config>::Bar`
-  --> tests/pallet_ui/call_argument_invalid_bound.rs:21:36
+  --> tests/pallet_ui/call_argument_invalid_bound.rs:38:36
    |
-21 |         pub fn foo(origin: OriginFor<T>, _bar: T::Bar) -> DispatchResultWithPostInfo {
+38 |         pub fn foo(origin: OriginFor<T>, _bar: T::Bar) -> DispatchResultWithPostInfo {
    |                                          ^^^^
diff --git a/substrate/frame/support/test/tests/pallet_ui/call_argument_invalid_bound_2.rs b/substrate/frame/support/test/tests/pallet_ui/call_argument_invalid_bound_2.rs
index 20568908e72b22a1486ac968c32b7bd37ab561db..3ce76180081b4757989b21ef8b1a92eb71d6f552 100644
--- a/substrate/frame/support/test/tests/pallet_ui/call_argument_invalid_bound_2.rs
+++ b/substrate/frame/support/test/tests/pallet_ui/call_argument_invalid_bound_2.rs
@@ -1,3 +1,20 @@
+// 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.
+
 #[frame_support::pallet]
 mod pallet {
 	use frame_support::pallet_prelude::{Hooks, DispatchResultWithPostInfo};
diff --git a/substrate/frame/support/test/tests/pallet_ui/call_argument_invalid_bound_2.stderr b/substrate/frame/support/test/tests/pallet_ui/call_argument_invalid_bound_2.stderr
index 7173cdcd47361651ca3fa4b5ae887ab9b1c94a92..80316fcd2489747ca34a9b030474c453e7f3d08d 100644
--- a/substrate/frame/support/test/tests/pallet_ui/call_argument_invalid_bound_2.stderr
+++ b/substrate/frame/support/test/tests/pallet_ui/call_argument_invalid_bound_2.stderr
@@ -4,50 +4,50 @@ error: use of deprecated constant `pallet::warnings::ConstantWeight_0::_w`:
 
                For more info see:
                    <https://github.com/paritytech/substrate/pull/13798>
-  --> tests/pallet_ui/call_argument_invalid_bound_2.rs:19:20
+  --> tests/pallet_ui/call_argument_invalid_bound_2.rs:36:20
    |
-19 |         #[pallet::weight(0)]
+36 |         #[pallet::weight(0)]
    |                          ^
    |
    = note: `-D deprecated` implied by `-D warnings`
 
 error[E0277]: `<T as pallet::Config>::Bar` doesn't implement `std::fmt::Debug`
-  --> tests/pallet_ui/call_argument_invalid_bound_2.rs:21:36
+  --> tests/pallet_ui/call_argument_invalid_bound_2.rs:38:36
    |
-21 |         pub fn foo(origin: OriginFor<T>, _bar: T::Bar) -> DispatchResultWithPostInfo {
+38 |         pub fn foo(origin: OriginFor<T>, _bar: T::Bar) -> DispatchResultWithPostInfo {
    |                                          ^^^^ `<T as pallet::Config>::Bar` cannot be formatted using `{:?}` because it doesn't implement `std::fmt::Debug`
    |
    = help: the trait `std::fmt::Debug` is not implemented for `<T as pallet::Config>::Bar`
    = note: required for `&<T as pallet::Config>::Bar` to implement `std::fmt::Debug`
-   = note: required for the cast from `&<T as pallet::Config>::Bar` to the object type `dyn std::fmt::Debug`
+   = note: required for the cast from `&&<T as pallet::Config>::Bar` to `&dyn std::fmt::Debug`
 
 error[E0277]: the trait bound `<T as pallet::Config>::Bar: Clone` is not satisfied
-  --> tests/pallet_ui/call_argument_invalid_bound_2.rs:21:36
+  --> tests/pallet_ui/call_argument_invalid_bound_2.rs:38:36
    |
-21 |         pub fn foo(origin: OriginFor<T>, _bar: T::Bar) -> DispatchResultWithPostInfo {
+38 |         pub fn foo(origin: OriginFor<T>, _bar: T::Bar) -> DispatchResultWithPostInfo {
    |                                          ^^^^ the trait `Clone` is not implemented for `<T as pallet::Config>::Bar`
 
 error[E0369]: binary operation `==` cannot be applied to type `&<T as pallet::Config>::Bar`
-  --> tests/pallet_ui/call_argument_invalid_bound_2.rs:21:36
+  --> tests/pallet_ui/call_argument_invalid_bound_2.rs:38:36
    |
-21 |         pub fn foo(origin: OriginFor<T>, _bar: T::Bar) -> DispatchResultWithPostInfo {
+38 |         pub fn foo(origin: OriginFor<T>, _bar: T::Bar) -> DispatchResultWithPostInfo {
    |                                          ^^^^
 
 error[E0277]: the trait bound `<T as pallet::Config>::Bar: WrapperTypeEncode` is not satisfied
-  --> tests/pallet_ui/call_argument_invalid_bound_2.rs:21:36
+  --> tests/pallet_ui/call_argument_invalid_bound_2.rs:38:36
    |
-1  | #[frame_support::pallet]
+18 | #[frame_support::pallet]
    | ------------------------ required by a bound introduced by this call
 ...
-21 |         pub fn foo(origin: OriginFor<T>, _bar: T::Bar) -> DispatchResultWithPostInfo {
+38 |         pub fn foo(origin: OriginFor<T>, _bar: T::Bar) -> DispatchResultWithPostInfo {
    |                                          ^^^^ the trait `WrapperTypeEncode` is not implemented for `<T as pallet::Config>::Bar`
    |
    = note: required for `<T as pallet::Config>::Bar` to implement `Encode`
 
 error[E0277]: the trait bound `<T as pallet::Config>::Bar: WrapperTypeDecode` is not satisfied
-  --> tests/pallet_ui/call_argument_invalid_bound_2.rs:17:12
+  --> tests/pallet_ui/call_argument_invalid_bound_2.rs:34:12
    |
-17 |     #[pallet::call]
+34 |     #[pallet::call]
    |               ^^^^ the trait `WrapperTypeDecode` is not implemented for `<T as pallet::Config>::Bar`
    |
    = note: required for `<T as pallet::Config>::Bar` to implement `Decode`
diff --git a/substrate/frame/support/test/tests/pallet_ui/call_argument_invalid_bound_3.rs b/substrate/frame/support/test/tests/pallet_ui/call_argument_invalid_bound_3.rs
index 64b6642b0a8787111de9454ff91c0afaedb1c131..22507b196e46b9df824b2347ccefe14907b2c07a 100644
--- a/substrate/frame/support/test/tests/pallet_ui/call_argument_invalid_bound_3.rs
+++ b/substrate/frame/support/test/tests/pallet_ui/call_argument_invalid_bound_3.rs
@@ -1,3 +1,20 @@
+// 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.
+
 #[frame_support::pallet]
 mod pallet {
 	use codec::{Decode, Encode};
diff --git a/substrate/frame/support/test/tests/pallet_ui/call_argument_invalid_bound_3.stderr b/substrate/frame/support/test/tests/pallet_ui/call_argument_invalid_bound_3.stderr
index 4cbed3709626c0fda8178e637ee02eb9fa0872c4..d45b74bad8428d57273e0cb4f0d304706dca9fd1 100644
--- a/substrate/frame/support/test/tests/pallet_ui/call_argument_invalid_bound_3.stderr
+++ b/substrate/frame/support/test/tests/pallet_ui/call_argument_invalid_bound_3.stderr
@@ -4,25 +4,25 @@ error: use of deprecated constant `pallet::warnings::ConstantWeight_0::_w`:
 
                For more info see:
                    <https://github.com/paritytech/substrate/pull/13798>
-  --> tests/pallet_ui/call_argument_invalid_bound_3.rs:21:20
+  --> tests/pallet_ui/call_argument_invalid_bound_3.rs:38:20
    |
-21 |         #[pallet::weight(0)]
+38 |         #[pallet::weight(0)]
    |                          ^
    |
    = note: `-D deprecated` implied by `-D warnings`
 
 error[E0277]: `Bar` doesn't implement `std::fmt::Debug`
-  --> tests/pallet_ui/call_argument_invalid_bound_3.rs:23:36
+  --> tests/pallet_ui/call_argument_invalid_bound_3.rs:40:36
    |
-23 |         pub fn foo(origin: OriginFor<T>, _bar: Bar) -> DispatchResultWithPostInfo {
+40 |         pub fn foo(origin: OriginFor<T>, _bar: Bar) -> DispatchResultWithPostInfo {
    |                                          ^^^^ `Bar` cannot be formatted using `{:?}`
    |
    = help: the trait `std::fmt::Debug` is not implemented for `Bar`
    = note: add `#[derive(Debug)]` to `Bar` or manually `impl std::fmt::Debug for Bar`
    = note: required for `&Bar` to implement `std::fmt::Debug`
-   = note: required for the cast from `&Bar` to the object type `dyn std::fmt::Debug`
+   = note: required for the cast from `&&Bar` to `&dyn std::fmt::Debug`
 help: consider annotating `Bar` with `#[derive(Debug)]`
    |
-17 +     #[derive(Debug)]
-18 |     struct Bar;
+34 +     #[derive(Debug)]
+35 |     struct Bar;
    |
diff --git a/substrate/frame/support/test/tests/pallet_ui/call_conflicting_indices.rs b/substrate/frame/support/test/tests/pallet_ui/call_conflicting_indices.rs
index 395766c7cd331febcc15ed9a6ea04a0cbaad3693..061f551e54c223b71033533496e6354c12c12f5d 100644
--- a/substrate/frame/support/test/tests/pallet_ui/call_conflicting_indices.rs
+++ b/substrate/frame/support/test/tests/pallet_ui/call_conflicting_indices.rs
@@ -1,3 +1,20 @@
+// 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.
+
 #[frame_support::pallet]
 mod pallet {
 	use frame_support::pallet_prelude::DispatchResultWithPostInfo;
diff --git a/substrate/frame/support/test/tests/pallet_ui/call_conflicting_indices.stderr b/substrate/frame/support/test/tests/pallet_ui/call_conflicting_indices.stderr
index 5d0c90609c2a189486fb46043fe79f201ff28a00..99970f3094e16da70c4b69a6e36a346d36b6617c 100644
--- a/substrate/frame/support/test/tests/pallet_ui/call_conflicting_indices.stderr
+++ b/substrate/frame/support/test/tests/pallet_ui/call_conflicting_indices.stderr
@@ -1,11 +1,11 @@
 error: Call indices are conflicting: Both functions foo and bar are at index 10
-  --> tests/pallet_ui/call_conflicting_indices.rs:15:10
+  --> tests/pallet_ui/call_conflicting_indices.rs:32:10
    |
-15 |         pub fn foo(origin: OriginFor<T>) -> DispatchResultWithPostInfo {}
+32 |         pub fn foo(origin: OriginFor<T>) -> DispatchResultWithPostInfo {}
    |                ^^^
 
 error: Call indices are conflicting: Both functions foo and bar are at index 10
-  --> tests/pallet_ui/call_conflicting_indices.rs:19:10
+  --> tests/pallet_ui/call_conflicting_indices.rs:36:10
    |
-19 |         pub fn bar(origin: OriginFor<T>) -> DispatchResultWithPostInfo {}
+36 |         pub fn bar(origin: OriginFor<T>) -> DispatchResultWithPostInfo {}
    |                ^^^
diff --git a/substrate/frame/support/test/tests/pallet_ui/call_index_has_suffix.rs b/substrate/frame/support/test/tests/pallet_ui/call_index_has_suffix.rs
index abe4dc199bf515e08187c192ee95f7afb42e6430..6e45aba406a6b74dd789be4711e9f3d766ef4f05 100644
--- a/substrate/frame/support/test/tests/pallet_ui/call_index_has_suffix.rs
+++ b/substrate/frame/support/test/tests/pallet_ui/call_index_has_suffix.rs
@@ -1,3 +1,20 @@
+// 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.
+
 #[frame_support::pallet]
 mod pallet {
 	use frame_support::pallet_prelude::DispatchResultWithPostInfo;
diff --git a/substrate/frame/support/test/tests/pallet_ui/call_index_has_suffix.stderr b/substrate/frame/support/test/tests/pallet_ui/call_index_has_suffix.stderr
index 2f4cead6cf70c960af51dcd72be7da239522196a..9ee626f2fcc2dcf9e56b0d0587235dde06577356 100644
--- a/substrate/frame/support/test/tests/pallet_ui/call_index_has_suffix.stderr
+++ b/substrate/frame/support/test/tests/pallet_ui/call_index_has_suffix.stderr
@@ -1,5 +1,5 @@
 error: Number literal must not have a suffix
-  --> tests/pallet_ui/call_index_has_suffix.rs:14:30
+  --> tests/pallet_ui/call_index_has_suffix.rs:31:30
    |
-14 |         #[pallet::call_index(0something)]
+31 |         #[pallet::call_index(0something)]
    |                              ^^^^^^^^^^
diff --git a/substrate/frame/support/test/tests/pallet_ui/call_invalid_attr.rs b/substrate/frame/support/test/tests/pallet_ui/call_invalid_attr.rs
index 118d3c92f360d65d8f2c79171b3d04047ac23ba2..059bea886eb1750150998a20e400e05a71836f0c 100644
--- a/substrate/frame/support/test/tests/pallet_ui/call_invalid_attr.rs
+++ b/substrate/frame/support/test/tests/pallet_ui/call_invalid_attr.rs
@@ -1,3 +1,20 @@
+// 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.
+
 #[frame_support::pallet]
 mod pallet {
 	use frame_support::pallet_prelude::DispatchResultWithPostInfo;
diff --git a/substrate/frame/support/test/tests/pallet_ui/call_invalid_attr.stderr b/substrate/frame/support/test/tests/pallet_ui/call_invalid_attr.stderr
index 3f680203a262f73e6803316622c5a104a312b6df..eec5e33ccbd937d370cf379c38f8a4fcecfa526d 100644
--- a/substrate/frame/support/test/tests/pallet_ui/call_invalid_attr.stderr
+++ b/substrate/frame/support/test/tests/pallet_ui/call_invalid_attr.stderr
@@ -1,5 +1,5 @@
 error: expected `weight` or `call_index`
-  --> tests/pallet_ui/call_invalid_attr.rs:14:13
+  --> tests/pallet_ui/call_invalid_attr.rs:31:13
    |
-14 |         #[pallet::weird_attr]
+31 |         #[pallet::weird_attr]
    |                   ^^^^^^^^^^
diff --git a/substrate/frame/support/test/tests/pallet_ui/call_invalid_const.rs b/substrate/frame/support/test/tests/pallet_ui/call_invalid_const.rs
index 1a28bc32e65c6eee61fe071561bd9ca9f180c3b5..78de6a433b9bae27dd1dd7b45852addad2f87195 100644
--- a/substrate/frame/support/test/tests/pallet_ui/call_invalid_const.rs
+++ b/substrate/frame/support/test/tests/pallet_ui/call_invalid_const.rs
@@ -1,3 +1,20 @@
+// 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.
+
 #[frame_support::pallet]
 mod pallet {
 	use frame_support::pallet_prelude::Hooks;
diff --git a/substrate/frame/support/test/tests/pallet_ui/call_invalid_const.stderr b/substrate/frame/support/test/tests/pallet_ui/call_invalid_const.stderr
index 0acb3e864a51209be716cb573af0cad9e1fceacb..152a1bdc83b22762d4958947b1328523321b18ce 100644
--- a/substrate/frame/support/test/tests/pallet_ui/call_invalid_const.stderr
+++ b/substrate/frame/support/test/tests/pallet_ui/call_invalid_const.stderr
@@ -1,5 +1,5 @@
 error: Invalid pallet::call, only method accepted
-  --> $DIR/call_invalid_const.rs:17:3
+  --> tests/pallet_ui/call_invalid_const.rs:34:3
    |
-17 |         const Foo: u8 = 3u8;
+34 |         const Foo: u8 = 3u8;
    |         ^^^^^
diff --git a/substrate/frame/support/test/tests/pallet_ui/call_invalid_index.rs b/substrate/frame/support/test/tests/pallet_ui/call_invalid_index.rs
index 0b40691ca43a37905c8ed660d70f91f133a7feec..64d1eac20d4bf55cb8ea1e9c3e51325e1cd94c53 100644
--- a/substrate/frame/support/test/tests/pallet_ui/call_invalid_index.rs
+++ b/substrate/frame/support/test/tests/pallet_ui/call_invalid_index.rs
@@ -1,3 +1,20 @@
+// 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.
+
 #[frame_support::pallet]
 mod pallet {
 	use frame_support::pallet_prelude::DispatchResultWithPostInfo;
diff --git a/substrate/frame/support/test/tests/pallet_ui/call_invalid_index.stderr b/substrate/frame/support/test/tests/pallet_ui/call_invalid_index.stderr
index 1e07a4974bf695eff67167adae5e22307719078a..78656db0ebd72dff6c383df9fc8a4f7d4b289d63 100644
--- a/substrate/frame/support/test/tests/pallet_ui/call_invalid_index.stderr
+++ b/substrate/frame/support/test/tests/pallet_ui/call_invalid_index.stderr
@@ -1,5 +1,5 @@
 error: number too large to fit in target type
-  --> tests/pallet_ui/call_invalid_index.rs:15:24
+  --> tests/pallet_ui/call_invalid_index.rs:32:24
    |
-15 |         #[pallet::call_index(256)]
+32 |         #[pallet::call_index(256)]
    |                              ^^^
diff --git a/substrate/frame/support/test/tests/pallet_ui/call_invalid_origin_type.rs b/substrate/frame/support/test/tests/pallet_ui/call_invalid_origin_type.rs
index 2502506fa6aa4a72a44376784f44c1c1fe1fada2..ee574bbbe58e8cb9a2a05d94e5991a6b7403a528 100644
--- a/substrate/frame/support/test/tests/pallet_ui/call_invalid_origin_type.rs
+++ b/substrate/frame/support/test/tests/pallet_ui/call_invalid_origin_type.rs
@@ -1,3 +1,20 @@
+// 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.
+
 #[frame_support::pallet]
 mod pallet {
 	use frame_support::pallet_prelude::Hooks;
diff --git a/substrate/frame/support/test/tests/pallet_ui/call_invalid_origin_type.stderr b/substrate/frame/support/test/tests/pallet_ui/call_invalid_origin_type.stderr
index f17cd9016a6e4b200b2a6fc767e451d5667676f1..99146c0563a98ad9c1b89ad5109849dacdab3cf2 100644
--- a/substrate/frame/support/test/tests/pallet_ui/call_invalid_origin_type.stderr
+++ b/substrate/frame/support/test/tests/pallet_ui/call_invalid_origin_type.stderr
@@ -1,11 +1,11 @@
 error: Invalid type: expected `OriginFor<T>`
-  --> $DIR/call_invalid_origin_type.rs:17:22
+  --> tests/pallet_ui/call_invalid_origin_type.rs:34:22
    |
-17 |         pub fn foo(origin: u8) {}
+34 |         pub fn foo(origin: u8) {}
    |                            ^^
 
 error: expected `OriginFor`
-  --> $DIR/call_invalid_origin_type.rs:17:22
+  --> tests/pallet_ui/call_invalid_origin_type.rs:34:22
    |
-17 |         pub fn foo(origin: u8) {}
+34 |         pub fn foo(origin: u8) {}
    |                            ^^
diff --git a/substrate/frame/support/test/tests/pallet_ui/call_invalid_return.rs b/substrate/frame/support/test/tests/pallet_ui/call_invalid_return.rs
index 1ccdff5d07374d936f426731ab8dc546aa854765..5cce3f5a6da0ff7de7ae27d0639976214f408423 100644
--- a/substrate/frame/support/test/tests/pallet_ui/call_invalid_return.rs
+++ b/substrate/frame/support/test/tests/pallet_ui/call_invalid_return.rs
@@ -1,3 +1,20 @@
+// 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.
+
 #[frame_support::pallet]
 mod pallet {
 	use frame_support::pallet_prelude::Hooks;
diff --git a/substrate/frame/support/test/tests/pallet_ui/call_invalid_return.stderr b/substrate/frame/support/test/tests/pallet_ui/call_invalid_return.stderr
index 8803bbba01326b6b33c19eb1fab9fad561ff559b..4752a1be55e6970fed2793ede71914e4b4dd60ff 100644
--- a/substrate/frame/support/test/tests/pallet_ui/call_invalid_return.stderr
+++ b/substrate/frame/support/test/tests/pallet_ui/call_invalid_return.stderr
@@ -1,5 +1,5 @@
 error: expected `DispatchResultWithPostInfo` or `DispatchResult`
-  --> tests/pallet_ui/call_invalid_return.rs:17:39
+  --> tests/pallet_ui/call_invalid_return.rs:34:39
    |
-17 |         pub fn foo(origin: OriginFor<T>) -> ::DispatchResult { todo!() }
+34 |         pub fn foo(origin: OriginFor<T>) -> ::DispatchResult { todo!() }
    |                                             ^
diff --git a/substrate/frame/support/test/tests/pallet_ui/call_invalid_vis.rs b/substrate/frame/support/test/tests/pallet_ui/call_invalid_vis.rs
index fe1c5aee453d4474104dcd6a83ff24453c6a9bf6..0f153e47e085dbf2a5131a12426edc4799c6f214 100644
--- a/substrate/frame/support/test/tests/pallet_ui/call_invalid_vis.rs
+++ b/substrate/frame/support/test/tests/pallet_ui/call_invalid_vis.rs
@@ -1,3 +1,20 @@
+// 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.
+
 #[frame_support::pallet]
 mod pallet {
 	use frame_support::pallet_prelude::{Hooks, DispatchResultWithPostInfo};
diff --git a/substrate/frame/support/test/tests/pallet_ui/call_invalid_vis.stderr b/substrate/frame/support/test/tests/pallet_ui/call_invalid_vis.stderr
index 321828a1ae28ef1645b4fdc2553cc01e900b83b0..eaac9a44df8889b3dc0a32942e38e5d467ce03a6 100644
--- a/substrate/frame/support/test/tests/pallet_ui/call_invalid_vis.stderr
+++ b/substrate/frame/support/test/tests/pallet_ui/call_invalid_vis.stderr
@@ -1,5 +1,5 @@
 error: Invalid pallet::call, dispatchable function must be public: `pub fn`
-  --> $DIR/call_invalid_vis.rs:20:3
+  --> tests/pallet_ui/call_invalid_vis.rs:37:3
    |
-20 |         fn foo(origin: OriginFor<T>) -> DispatchResultWithPostInfo {
+37 |         fn foo(origin: OriginFor<T>) -> DispatchResultWithPostInfo {
    |         ^^
diff --git a/substrate/frame/support/test/tests/pallet_ui/call_invalid_vis_2.rs b/substrate/frame/support/test/tests/pallet_ui/call_invalid_vis_2.rs
index fb25e9876dc8d89c799933fa583c7f8860be4d16..9f36083ee632727c3aa7dfd8fed1d17867cd97f2 100644
--- a/substrate/frame/support/test/tests/pallet_ui/call_invalid_vis_2.rs
+++ b/substrate/frame/support/test/tests/pallet_ui/call_invalid_vis_2.rs
@@ -1,3 +1,20 @@
+// 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.
+
 #[frame_support::pallet]
 mod pallet {
 	use frame_support::pallet_prelude::{Hooks, DispatchResultWithPostInfo};
diff --git a/substrate/frame/support/test/tests/pallet_ui/call_invalid_vis_2.stderr b/substrate/frame/support/test/tests/pallet_ui/call_invalid_vis_2.stderr
index 7d3113474af73db528c63ef3801d7438fe5f07c1..24bb848a478716173e8b0feb080c5fa6f9227603 100644
--- a/substrate/frame/support/test/tests/pallet_ui/call_invalid_vis_2.stderr
+++ b/substrate/frame/support/test/tests/pallet_ui/call_invalid_vis_2.stderr
@@ -1,5 +1,5 @@
 error: Invalid pallet::call, dispatchable function must be public: `pub fn`
-  --> $DIR/call_invalid_vis_2.rs:20:3
+  --> tests/pallet_ui/call_invalid_vis_2.rs:37:3
    |
-20 |         pub(crate) fn foo(origin: OriginFor<T>) -> DispatchResultWithPostInfo {
+37 |         pub(crate) fn foo(origin: OriginFor<T>) -> DispatchResultWithPostInfo {
    |         ^^^
diff --git a/substrate/frame/support/test/tests/pallet_ui/call_missing_index.rs b/substrate/frame/support/test/tests/pallet_ui/call_missing_index.rs
index 98c49f493e50d33dc6ff8d96af6da80761070491..a0c5c6ce4d11e89a415ea7c4acdc244c97e085c5 100644
--- a/substrate/frame/support/test/tests/pallet_ui/call_missing_index.rs
+++ b/substrate/frame/support/test/tests/pallet_ui/call_missing_index.rs
@@ -1,3 +1,20 @@
+// 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.
+
 #[frame_support::pallet]
 mod pallet {
 	use frame_support::pallet_prelude::DispatchResult;
diff --git a/substrate/frame/support/test/tests/pallet_ui/call_missing_index.stderr b/substrate/frame/support/test/tests/pallet_ui/call_missing_index.stderr
index 82dbe1d24c28e78aa62d3166418ed92aaf823b89..4d55ef798569bbd6dfa013dec3de081c6bbfa246 100644
--- a/substrate/frame/support/test/tests/pallet_ui/call_missing_index.stderr
+++ b/substrate/frame/support/test/tests/pallet_ui/call_missing_index.stderr
@@ -5,9 +5,9 @@ error: use of deprecated constant `pallet::warnings::ImplicitCallIndex_0::_w`:
                For more info see:
                    <https://github.com/paritytech/substrate/pull/12891>
                    <https://github.com/paritytech/substrate/pull/11381>
-  --> tests/pallet_ui/call_missing_index.rs:15:10
+  --> tests/pallet_ui/call_missing_index.rs:32:10
    |
-15 |         pub fn foo(_: OriginFor<T>) -> DispatchResult {
+32 |         pub fn foo(_: OriginFor<T>) -> DispatchResult {
    |                ^^^
    |
    = note: `-D deprecated` implied by `-D warnings`
@@ -19,9 +19,9 @@ error: use of deprecated constant `pallet::warnings::ImplicitCallIndex_1::_w`:
                For more info see:
                    <https://github.com/paritytech/substrate/pull/12891>
                    <https://github.com/paritytech/substrate/pull/11381>
-  --> tests/pallet_ui/call_missing_index.rs:20:10
+  --> tests/pallet_ui/call_missing_index.rs:37:10
    |
-20 |         pub fn bar(_: OriginFor<T>) -> DispatchResult {
+37 |         pub fn bar(_: OriginFor<T>) -> DispatchResult {
    |                ^^^
 
 error: use of deprecated constant `pallet::warnings::ConstantWeight_0::_w`:
@@ -30,9 +30,9 @@ error: use of deprecated constant `pallet::warnings::ConstantWeight_0::_w`:
 
                For more info see:
                    <https://github.com/paritytech/substrate/pull/13798>
-  --> tests/pallet_ui/call_missing_index.rs:14:20
+  --> tests/pallet_ui/call_missing_index.rs:31:20
    |
-14 |         #[pallet::weight(0)]
+31 |         #[pallet::weight(0)]
    |                          ^
 
 error: use of deprecated constant `pallet::warnings::ConstantWeight_1::_w`:
@@ -41,7 +41,7 @@ error: use of deprecated constant `pallet::warnings::ConstantWeight_1::_w`:
 
                For more info see:
                    <https://github.com/paritytech/substrate/pull/13798>
-  --> tests/pallet_ui/call_missing_index.rs:19:20
+  --> tests/pallet_ui/call_missing_index.rs:36:20
    |
-19 |         #[pallet::weight(0)]
+36 |         #[pallet::weight(0)]
    |                          ^
diff --git a/substrate/frame/support/test/tests/pallet_ui/call_missing_weight.rs b/substrate/frame/support/test/tests/pallet_ui/call_missing_weight.rs
index 4cdb85502b57fbe9fd0fedb8794218ab059cda7b..9845bc012dc9af210fda7b3e96caac6e2207ac98 100644
--- a/substrate/frame/support/test/tests/pallet_ui/call_missing_weight.rs
+++ b/substrate/frame/support/test/tests/pallet_ui/call_missing_weight.rs
@@ -1,3 +1,20 @@
+// 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.
+
 #[frame_support::pallet]
 mod pallet {
 	use frame_support::pallet_prelude::{Hooks, DispatchResultWithPostInfo};
diff --git a/substrate/frame/support/test/tests/pallet_ui/call_missing_weight.stderr b/substrate/frame/support/test/tests/pallet_ui/call_missing_weight.stderr
index 0a6cf16571f95cc92956f6682130e22b61e4e01c..555dd426fe2912bb44c37763b5ac0a83f1853a58 100644
--- a/substrate/frame/support/test/tests/pallet_ui/call_missing_weight.stderr
+++ b/substrate/frame/support/test/tests/pallet_ui/call_missing_weight.stderr
@@ -1,7 +1,7 @@
 error: A pallet::call requires either a concrete `#[pallet::weight($expr)]` or an
                                inherited weight from the `#[pallet:call(weight($type))]` attribute, but
                                none were given.
-  --> tests/pallet_ui/call_missing_weight.rs:17:7
+  --> tests/pallet_ui/call_missing_weight.rs:34:7
    |
-17 |         pub fn foo(origin: OriginFor<T>) -> DispatchResultWithPostInfo {}
+34 |         pub fn foo(origin: OriginFor<T>) -> DispatchResultWithPostInfo {}
    |             ^^
diff --git a/substrate/frame/support/test/tests/pallet_ui/call_multiple_call_index.rs b/substrate/frame/support/test/tests/pallet_ui/call_multiple_call_index.rs
index 5753ecd076c807875c500268877967fa144fca6f..f2b068e0765459ced13e6a9b0d74d92826162b51 100644
--- a/substrate/frame/support/test/tests/pallet_ui/call_multiple_call_index.rs
+++ b/substrate/frame/support/test/tests/pallet_ui/call_multiple_call_index.rs
@@ -1,3 +1,20 @@
+// 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.
+
 #[frame_support::pallet]
 mod pallet {
 	use frame_support::pallet_prelude::DispatchResultWithPostInfo;
diff --git a/substrate/frame/support/test/tests/pallet_ui/call_multiple_call_index.stderr b/substrate/frame/support/test/tests/pallet_ui/call_multiple_call_index.stderr
index ba22b012745c19d82542d339007c4680dfd3cdc3..14af3c7995d70be81ba70939ad3302635a7ee1f9 100644
--- a/substrate/frame/support/test/tests/pallet_ui/call_multiple_call_index.stderr
+++ b/substrate/frame/support/test/tests/pallet_ui/call_multiple_call_index.stderr
@@ -1,5 +1,5 @@
 error: Invalid pallet::call, too many call_index attributes given
-  --> tests/pallet_ui/call_multiple_call_index.rs:17:7
+  --> tests/pallet_ui/call_multiple_call_index.rs:34:7
    |
-17 |         pub fn foo(origin: OriginFor<T>) -> DispatchResultWithPostInfo {}
+34 |         pub fn foo(origin: OriginFor<T>) -> DispatchResultWithPostInfo {}
    |             ^^
diff --git a/substrate/frame/support/test/tests/pallet_ui/call_no_origin.rs b/substrate/frame/support/test/tests/pallet_ui/call_no_origin.rs
index 231c75f43f4ad8b4fccce287273b02a4098369d9..a0c18b873833b327d51279ee8a0538cd7d45a979 100644
--- a/substrate/frame/support/test/tests/pallet_ui/call_no_origin.rs
+++ b/substrate/frame/support/test/tests/pallet_ui/call_no_origin.rs
@@ -1,3 +1,20 @@
+// 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.
+
 #[frame_support::pallet]
 mod pallet {
 	use frame_support::pallet_prelude::Hooks;
diff --git a/substrate/frame/support/test/tests/pallet_ui/call_no_origin.stderr b/substrate/frame/support/test/tests/pallet_ui/call_no_origin.stderr
index 97574ea1b644c0fe017d25eddd8a96f230492b27..d7aa4ea763fb969fbfa6e051ca94da8cd8e9baf6 100644
--- a/substrate/frame/support/test/tests/pallet_ui/call_no_origin.stderr
+++ b/substrate/frame/support/test/tests/pallet_ui/call_no_origin.stderr
@@ -1,5 +1,5 @@
 error: Invalid pallet::call, must have at least origin arg
-  --> $DIR/call_no_origin.rs:17:7
+  --> tests/pallet_ui/call_no_origin.rs:34:7
    |
-17 |         pub fn foo() {}
+34 |         pub fn foo() {}
    |             ^^
diff --git a/substrate/frame/support/test/tests/pallet_ui/call_no_return.rs b/substrate/frame/support/test/tests/pallet_ui/call_no_return.rs
index 68a883c52c0722204b8c7da046a7b9e2a0a3a2d4..87b47c8b4d8f9fff5366737c9bcb37c97a4c6bee 100644
--- a/substrate/frame/support/test/tests/pallet_ui/call_no_return.rs
+++ b/substrate/frame/support/test/tests/pallet_ui/call_no_return.rs
@@ -1,3 +1,20 @@
+// 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.
+
 #[frame_support::pallet]
 mod pallet {
 	use frame_support::pallet_prelude::Hooks;
diff --git a/substrate/frame/support/test/tests/pallet_ui/call_no_return.stderr b/substrate/frame/support/test/tests/pallet_ui/call_no_return.stderr
index 18ebbaff76d9d6044cffe0accabe5d637379d4c8..e73b4c28e493263a7ef91a6567186b55f3bce2e9 100644
--- a/substrate/frame/support/test/tests/pallet_ui/call_no_return.stderr
+++ b/substrate/frame/support/test/tests/pallet_ui/call_no_return.stderr
@@ -1,5 +1,5 @@
 error: Invalid pallet::call, require return type DispatchResultWithPostInfo
-  --> $DIR/call_no_return.rs:17:7
+  --> tests/pallet_ui/call_no_return.rs:34:7
    |
-17 |         pub fn foo(origin: OriginFor<T>) {}
+34 |         pub fn foo(origin: OriginFor<T>) {}
    |             ^^
diff --git a/substrate/frame/support/test/tests/pallet_ui/call_weight_argument_has_suffix.rs b/substrate/frame/support/test/tests/pallet_ui/call_weight_argument_has_suffix.rs
index c122877e8a0757d0244e0ed71f5899032469379a..8584b5f0aacd88640380353cca9c1832dc46034f 100644
--- a/substrate/frame/support/test/tests/pallet_ui/call_weight_argument_has_suffix.rs
+++ b/substrate/frame/support/test/tests/pallet_ui/call_weight_argument_has_suffix.rs
@@ -1,3 +1,20 @@
+// 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.
+
 #[frame_support::pallet]
 mod pallet {
 	use frame_support::pallet_prelude::DispatchResult;
diff --git a/substrate/frame/support/test/tests/pallet_ui/call_weight_argument_has_suffix.stderr b/substrate/frame/support/test/tests/pallet_ui/call_weight_argument_has_suffix.stderr
index 0651f003b9e23f7dccb7d7959ef64b4056f8ca7c..cf23a76f8ea055ce4c4b0e55f228185fc4a2961b 100644
--- a/substrate/frame/support/test/tests/pallet_ui/call_weight_argument_has_suffix.stderr
+++ b/substrate/frame/support/test/tests/pallet_ui/call_weight_argument_has_suffix.stderr
@@ -1,7 +1,7 @@
 error: invalid suffix `something` for number literal
-  --> tests/pallet_ui/call_weight_argument_has_suffix.rs:15:26
+  --> tests/pallet_ui/call_weight_argument_has_suffix.rs:32:26
    |
-15 |         #[pallet::weight(10_000something)]
+32 |         #[pallet::weight(10_000something)]
    |                          ^^^^^^^^^^^^^^^ invalid suffix `something`
    |
    = help: the suffix must be one of the numeric types (`u32`, `isize`, `f32`, etc.)
@@ -12,9 +12,9 @@ error: use of deprecated constant `pallet::warnings::ConstantWeight_0::_w`:
 
                For more info see:
                    <https://github.com/paritytech/substrate/pull/13798>
-  --> tests/pallet_ui/call_weight_argument_has_suffix.rs:15:26
+  --> tests/pallet_ui/call_weight_argument_has_suffix.rs:32:26
    |
-15 |         #[pallet::weight(10_000something)]
+32 |         #[pallet::weight(10_000something)]
    |                          ^^^^^^^^^^^^^^^
    |
    = note: `-D deprecated` implied by `-D warnings`
diff --git a/substrate/frame/support/test/tests/pallet_ui/call_weight_const_warning.rs b/substrate/frame/support/test/tests/pallet_ui/call_weight_const_warning.rs
index 2e5dc2a649e709f148adfce1ff2d0c3212176cc7..e371c423ea4f60fa944027f90e9caadfb860a50f 100644
--- a/substrate/frame/support/test/tests/pallet_ui/call_weight_const_warning.rs
+++ b/substrate/frame/support/test/tests/pallet_ui/call_weight_const_warning.rs
@@ -1,3 +1,20 @@
+// 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.
+
 #[frame_support::pallet]
 mod pallet {
 	use frame_support::pallet_prelude::DispatchResult;
diff --git a/substrate/frame/support/test/tests/pallet_ui/call_weight_const_warning.stderr b/substrate/frame/support/test/tests/pallet_ui/call_weight_const_warning.stderr
index b04c3ec395ce67ab5d6616d8f9acc0756fd65faa..ccd5a935773c31d69b0b9043cf3d56d3150c7000 100644
--- a/substrate/frame/support/test/tests/pallet_ui/call_weight_const_warning.stderr
+++ b/substrate/frame/support/test/tests/pallet_ui/call_weight_const_warning.stderr
@@ -4,9 +4,9 @@ error: use of deprecated constant `pallet::warnings::ConstantWeight_0::_w`:
 
                For more info see:
                    <https://github.com/paritytech/substrate/pull/13798>
-  --> tests/pallet_ui/call_weight_const_warning.rs:15:26
+  --> tests/pallet_ui/call_weight_const_warning.rs:32:26
    |
-15 |         #[pallet::weight(123_u64)]
+32 |         #[pallet::weight(123_u64)]
    |                          ^^^^^^^
    |
    = note: `-D deprecated` implied by `-D warnings`
diff --git a/substrate/frame/support/test/tests/pallet_ui/call_weight_const_warning_twice.rs b/substrate/frame/support/test/tests/pallet_ui/call_weight_const_warning_twice.rs
index 798911dba33d9d466f80ea55131e17131580e2e0..bb880eabcd3b202f0f014b42b4e147698e755e16 100644
--- a/substrate/frame/support/test/tests/pallet_ui/call_weight_const_warning_twice.rs
+++ b/substrate/frame/support/test/tests/pallet_ui/call_weight_const_warning_twice.rs
@@ -1,3 +1,20 @@
+// 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.
+
 #[frame_support::pallet]
 mod pallet {
 	use frame_support::pallet_prelude::DispatchResult;
diff --git a/substrate/frame/support/test/tests/pallet_ui/call_weight_const_warning_twice.stderr b/substrate/frame/support/test/tests/pallet_ui/call_weight_const_warning_twice.stderr
index c656790207504df0144187a7d00daa23dc6d867e..aadb939b6454f76e042437b2427d5c950dfb3b08 100644
--- a/substrate/frame/support/test/tests/pallet_ui/call_weight_const_warning_twice.stderr
+++ b/substrate/frame/support/test/tests/pallet_ui/call_weight_const_warning_twice.stderr
@@ -1,7 +1,7 @@
 error: invalid suffix `custom_prefix` for number literal
-  --> tests/pallet_ui/call_weight_const_warning_twice.rs:19:26
+  --> tests/pallet_ui/call_weight_const_warning_twice.rs:36:26
    |
-19 |         #[pallet::weight(123_custom_prefix)]
+36 |         #[pallet::weight(123_custom_prefix)]
    |                          ^^^^^^^^^^^^^^^^^ invalid suffix `custom_prefix`
    |
    = help: the suffix must be one of the numeric types (`u32`, `isize`, `f32`, etc.)
@@ -12,9 +12,9 @@ error: use of deprecated constant `pallet::warnings::ConstantWeight_0::_w`:
 
                For more info see:
                    <https://github.com/paritytech/substrate/pull/13798>
-  --> tests/pallet_ui/call_weight_const_warning_twice.rs:15:26
+  --> tests/pallet_ui/call_weight_const_warning_twice.rs:32:26
    |
-15 |         #[pallet::weight(123)]
+32 |         #[pallet::weight(123)]
    |                          ^^^
    |
    = note: `-D deprecated` implied by `-D warnings`
@@ -25,7 +25,7 @@ error: use of deprecated constant `pallet::warnings::ConstantWeight_1::_w`:
 
                For more info see:
                    <https://github.com/paritytech/substrate/pull/13798>
-  --> tests/pallet_ui/call_weight_const_warning_twice.rs:19:26
+  --> tests/pallet_ui/call_weight_const_warning_twice.rs:36:26
    |
-19 |         #[pallet::weight(123_custom_prefix)]
+36 |         #[pallet::weight(123_custom_prefix)]
    |                          ^^^^^^^^^^^^^^^^^
diff --git a/substrate/frame/support/test/tests/pallet_ui/call_weight_inherited_invalid.rs b/substrate/frame/support/test/tests/pallet_ui/call_weight_inherited_invalid.rs
index ff235e986099f4f91c3e7a029686c8bdf6fda125..f5be788ba36ad4d846c913b123f32cec47987dbb 100644
--- a/substrate/frame/support/test/tests/pallet_ui/call_weight_inherited_invalid.rs
+++ b/substrate/frame/support/test/tests/pallet_ui/call_weight_inherited_invalid.rs
@@ -1,3 +1,20 @@
+// 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.
+
 use frame_support::pallet_prelude::*;
 
 pub trait WeightInfo {
diff --git a/substrate/frame/support/test/tests/pallet_ui/call_weight_inherited_invalid.stderr b/substrate/frame/support/test/tests/pallet_ui/call_weight_inherited_invalid.stderr
index 7eed646e7b1909ecbddaab8f84bcfe899504e048..6b30716a938b4cd3bc423fe170c346c003dbbcb6 100644
--- a/substrate/frame/support/test/tests/pallet_ui/call_weight_inherited_invalid.stderr
+++ b/substrate/frame/support/test/tests/pallet_ui/call_weight_inherited_invalid.stderr
@@ -1,11 +1,11 @@
 error: expected `weight`
-  --> tests/pallet_ui/call_weight_inherited_invalid.rs:19:17
+  --> tests/pallet_ui/call_weight_inherited_invalid.rs:36:17
    |
-19 |     #[pallet::call(invalid)]
+36 |     #[pallet::call(invalid)]
    |                    ^^^^^^^
 
 error: expected parentheses
-  --> tests/pallet_ui/call_weight_inherited_invalid.rs:40:17
+  --> tests/pallet_ui/call_weight_inherited_invalid.rs:57:17
    |
-40 |     #[pallet::call = invalid]
+57 |     #[pallet::call = invalid]
    |                    ^
diff --git a/substrate/frame/support/test/tests/pallet_ui/call_weight_inherited_invalid2.rs b/substrate/frame/support/test/tests/pallet_ui/call_weight_inherited_invalid2.rs
index 76ccf5db220194ff9c27ea38ea1a287162c9b950..771cfb5157251a8b7b5d6a786472ac9e01b222ff 100644
--- a/substrate/frame/support/test/tests/pallet_ui/call_weight_inherited_invalid2.rs
+++ b/substrate/frame/support/test/tests/pallet_ui/call_weight_inherited_invalid2.rs
@@ -1,3 +1,20 @@
+// 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.
+
 // Weight is an ident instead of a type.
 
 use frame_support::pallet_prelude::*;
diff --git a/substrate/frame/support/test/tests/pallet_ui/call_weight_inherited_invalid2.stderr b/substrate/frame/support/test/tests/pallet_ui/call_weight_inherited_invalid2.stderr
index 29f3b6bfd2b0dd942b04f662b45c9a282ffb9616..e84b0b6f3fd2d9d9b0fbd390c84112c3d94dc249 100644
--- a/substrate/frame/support/test/tests/pallet_ui/call_weight_inherited_invalid2.stderr
+++ b/substrate/frame/support/test/tests/pallet_ui/call_weight_inherited_invalid2.stderr
@@ -1,11 +1,11 @@
 error[E0412]: cannot find type `prefix` in this scope
-  --> tests/pallet_ui/call_weight_inherited_invalid2.rs:22:24
+  --> tests/pallet_ui/call_weight_inherited_invalid2.rs:39:24
    |
-22 |     #[pallet::call(weight(prefix))]
+39 |     #[pallet::call(weight(prefix))]
    |                           ^^^^^^ not found in this scope
 
 error[E0412]: cannot find type `prefix` in this scope
-  --> tests/pallet_ui/call_weight_inherited_invalid2.rs:43:26
+  --> tests/pallet_ui/call_weight_inherited_invalid2.rs:60:26
    |
-43 |     #[pallet::call(weight = prefix)]
+60 |     #[pallet::call(weight = prefix)]
    |                             ^^^^^^ not found in this scope
diff --git a/substrate/frame/support/test/tests/pallet_ui/call_weight_inherited_invalid3.rs b/substrate/frame/support/test/tests/pallet_ui/call_weight_inherited_invalid3.rs
index b31bc0ae234b27dbfa60fa254d78c353760f7345..70e57a29184c3812489fe578dccc5553a47d7a9e 100644
--- a/substrate/frame/support/test/tests/pallet_ui/call_weight_inherited_invalid3.rs
+++ b/substrate/frame/support/test/tests/pallet_ui/call_weight_inherited_invalid3.rs
@@ -1,3 +1,20 @@
+// 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.
+
 // Call weight is an LitInt instead of a type.
 
 use frame_support::pallet_prelude::*;
diff --git a/substrate/frame/support/test/tests/pallet_ui/call_weight_inherited_invalid3.stderr b/substrate/frame/support/test/tests/pallet_ui/call_weight_inherited_invalid3.stderr
index fab7acb90deafde9a61d7192efae3bcdfeeac597..e8e6f2fe6df06dec235227b06001ab191be4bb46 100644
--- a/substrate/frame/support/test/tests/pallet_ui/call_weight_inherited_invalid3.stderr
+++ b/substrate/frame/support/test/tests/pallet_ui/call_weight_inherited_invalid3.stderr
@@ -1,19 +1,19 @@
 error: expected one of: `for`, parentheses, `fn`, `unsafe`, `extern`, identifier, `::`, `<`, `dyn`, square brackets, `*`, `&`, `!`, `impl`, `_`, lifetime
-  --> tests/pallet_ui/call_weight_inherited_invalid3.rs:22:24
+  --> tests/pallet_ui/call_weight_inherited_invalid3.rs:39:24
    |
-22 |     #[pallet::call(weight(123))]
+39 |     #[pallet::call(weight(123))]
    |                           ^^^
 
 error: expected one of: `for`, parentheses, `fn`, `unsafe`, `extern`, identifier, `::`, `<`, `dyn`, square brackets, `*`, `&`, `!`, `impl`, `_`, lifetime
-  --> tests/pallet_ui/call_weight_inherited_invalid3.rs:43:26
+  --> tests/pallet_ui/call_weight_inherited_invalid3.rs:60:26
    |
-43 |     #[pallet::call(weight = 123)]
+60 |     #[pallet::call(weight = 123)]
    |                             ^^^
 
 error: unused import: `frame_system::pallet_prelude::*`
- --> tests/pallet_ui/call_weight_inherited_invalid3.rs:4:5
-  |
-4 | use frame_system::pallet_prelude::*;
-  |     ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
-  |
-  = note: `-D unused-imports` implied by `-D warnings`
+  --> tests/pallet_ui/call_weight_inherited_invalid3.rs:21:5
+   |
+21 | use frame_system::pallet_prelude::*;
+   |     ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
+   |
+   = note: `-D unused-imports` implied by `-D warnings`
diff --git a/substrate/frame/support/test/tests/pallet_ui/call_weight_inherited_invalid4.rs b/substrate/frame/support/test/tests/pallet_ui/call_weight_inherited_invalid4.rs
index 39c0929d603ad1f362243c4ededcb6af00bc31ca..c7b312b2f2ef707d4062ac9713db3f1833079058 100644
--- a/substrate/frame/support/test/tests/pallet_ui/call_weight_inherited_invalid4.rs
+++ b/substrate/frame/support/test/tests/pallet_ui/call_weight_inherited_invalid4.rs
@@ -1,3 +1,20 @@
+// 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.
+
 // Function does not exist in the trait.
 
 use frame_support::pallet_prelude::*;
diff --git a/substrate/frame/support/test/tests/pallet_ui/call_weight_inherited_invalid4.stderr b/substrate/frame/support/test/tests/pallet_ui/call_weight_inherited_invalid4.stderr
index fbde5c691c5a08c50a9a5a83b34e1107fc9a2f54..b4c0885507cfd6525ad22196654c842524939d35 100644
--- a/substrate/frame/support/test/tests/pallet_ui/call_weight_inherited_invalid4.stderr
+++ b/substrate/frame/support/test/tests/pallet_ui/call_weight_inherited_invalid4.stderr
@@ -1,11 +1,11 @@
 error[E0599]: no function or associated item named `foo` found for associated type `<T as parentheses::Config>::WeightInfo` in the current scope
-  --> tests/pallet_ui/call_weight_inherited_invalid4.rs:24:10
+  --> tests/pallet_ui/call_weight_inherited_invalid4.rs:41:10
    |
-24 |         pub fn foo(_: OriginFor<T>) -> DispatchResult {
+41 |         pub fn foo(_: OriginFor<T>) -> DispatchResult {
    |                ^^^ function or associated item not found in `<T as Config>::WeightInfo`
 
 error[E0599]: no function or associated item named `foo` found for associated type `<T as assign::Config>::WeightInfo` in the current scope
-  --> tests/pallet_ui/call_weight_inherited_invalid4.rs:45:10
+  --> tests/pallet_ui/call_weight_inherited_invalid4.rs:62:10
    |
-45 |         pub fn foo(_: OriginFor<T>) -> DispatchResult {
+62 |         pub fn foo(_: OriginFor<T>) -> DispatchResult {
    |                ^^^ function or associated item not found in `<T as Config>::WeightInfo`
diff --git a/substrate/frame/support/test/tests/pallet_ui/call_weight_inherited_invalid5.rs b/substrate/frame/support/test/tests/pallet_ui/call_weight_inherited_invalid5.rs
index a5b2f5c7f6aa6ad32b5ab872cdcbe3004983f848..dc6c43fb7a20ff63c8e43c84f78b2244caaed1be 100644
--- a/substrate/frame/support/test/tests/pallet_ui/call_weight_inherited_invalid5.rs
+++ b/substrate/frame/support/test/tests/pallet_ui/call_weight_inherited_invalid5.rs
@@ -1,3 +1,20 @@
+// 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.
+
 // Stray tokens after good input.
 
 #[frame_support::pallet]
diff --git a/substrate/frame/support/test/tests/pallet_ui/call_weight_inherited_invalid5.stderr b/substrate/frame/support/test/tests/pallet_ui/call_weight_inherited_invalid5.stderr
index c0e9ef2d9e9d82dc4d7889fc8d27a85ee4c9cddd..e12fbfcf4b48ce82fcc0863878158f707a22d130 100644
--- a/substrate/frame/support/test/tests/pallet_ui/call_weight_inherited_invalid5.stderr
+++ b/substrate/frame/support/test/tests/pallet_ui/call_weight_inherited_invalid5.stderr
@@ -1,11 +1,11 @@
 error: unexpected token
-  --> tests/pallet_ui/call_weight_inherited_invalid5.rs:14:50
+  --> tests/pallet_ui/call_weight_inherited_invalid5.rs:31:50
    |
-14 |     #[pallet::call(weight(<T as Config>::WeightInfo straycat))]
+31 |     #[pallet::call(weight(<T as Config>::WeightInfo straycat))]
    |                                                     ^^^^^^^^
 
 error: unexpected token
-  --> tests/pallet_ui/call_weight_inherited_invalid5.rs:34:52
+  --> tests/pallet_ui/call_weight_inherited_invalid5.rs:51:52
    |
-34 |     #[pallet::call(weight = <T as Config>::WeightInfo straycat)]
+51 |     #[pallet::call(weight = <T as Config>::WeightInfo straycat)]
    |                                                       ^^^^^^^^
diff --git a/substrate/frame/support/test/tests/pallet_ui/call_weight_unchecked_warning.rs b/substrate/frame/support/test/tests/pallet_ui/call_weight_unchecked_warning.rs
new file mode 100644
index 0000000000000000000000000000000000000000..8d93638f5a51e491a51f509dc602f5c41eefbf9f
--- /dev/null
+++ b/substrate/frame/support/test/tests/pallet_ui/call_weight_unchecked_warning.rs
@@ -0,0 +1,38 @@
+// 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.
+
+#[frame_support::pallet]
+mod pallet {
+	use frame_support::pallet_prelude::DispatchResult;
+	use frame_system::pallet_prelude::OriginFor;
+
+	#[pallet::config]
+	pub trait Config: frame_system::Config {}
+
+	#[pallet::pallet]
+	pub struct Pallet<T>(core::marker::PhantomData<T>);
+
+	#[pallet::call]
+	impl<T: Config> Pallet<T> {
+		#[pallet::call_index(0)]
+        #[pallet::weight(*_unused)]
+		pub fn foo(_: OriginFor<T>, _unused: u64) -> DispatchResult { Ok(()) }
+	}
+}
+
+fn main() {
+}
diff --git a/substrate/frame/support/test/tests/pallet_ui/call_weight_unchecked_warning.stderr b/substrate/frame/support/test/tests/pallet_ui/call_weight_unchecked_warning.stderr
new file mode 100644
index 0000000000000000000000000000000000000000..89fc1e0820f5ea0969b05b00efee7ca70c95e593
--- /dev/null
+++ b/substrate/frame/support/test/tests/pallet_ui/call_weight_unchecked_warning.stderr
@@ -0,0 +1,12 @@
+error: use of deprecated constant `pallet::warnings::UncheckedWeightWitness_0::_w`:
+               It is deprecated to not check weight witness data.
+               Please instead ensure that all witness data for weight calculation is checked before usage.
+
+               For more info see:
+                   <https://github.com/paritytech/polkadot-sdk/pull/1818>
+  --> tests/pallet_ui/call_weight_unchecked_warning.rs:33:31
+   |
+33 |         pub fn foo(_: OriginFor<T>, _unused: u64) -> DispatchResult { Ok(()) }
+   |                                     ^^^^^^^
+   |
+   = note: `-D deprecated` implied by `-D warnings`
diff --git a/substrate/frame/support/test/tests/pallet_ui/compare_unset_storage_version.rs b/substrate/frame/support/test/tests/pallet_ui/compare_unset_storage_version.rs
index e417c619fc45f3c623668bb15766c5ba49d0e3df..840a6dee20ccc7a836619a1ef334cca6e22e7887 100644
--- a/substrate/frame/support/test/tests/pallet_ui/compare_unset_storage_version.rs
+++ b/substrate/frame/support/test/tests/pallet_ui/compare_unset_storage_version.rs
@@ -1,3 +1,20 @@
+// 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.
+
 #[frame_support::pallet]
 mod pallet {
 	use frame_support::pallet_prelude::*;
diff --git a/substrate/frame/support/test/tests/pallet_ui/compare_unset_storage_version.stderr b/substrate/frame/support/test/tests/pallet_ui/compare_unset_storage_version.stderr
index e75aa5226153886f2e8b7c91f05b430fa9c8c5ff..1b48197cc9ed1049ea0f52bb011fbc95654c59c0 100644
--- a/substrate/frame/support/test/tests/pallet_ui/compare_unset_storage_version.stderr
+++ b/substrate/frame/support/test/tests/pallet_ui/compare_unset_storage_version.stderr
@@ -1,7 +1,7 @@
 error[E0369]: binary operation `!=` cannot be applied to type `NoStorageVersionSet`
-  --> tests/pallet_ui/compare_unset_storage_version.rs:15:39
+  --> tests/pallet_ui/compare_unset_storage_version.rs:32:39
    |
-15 |             if Self::current_storage_version() != Self::on_chain_storage_version() {
+32 |             if Self::current_storage_version() != Self::on_chain_storage_version() {
    |                ------------------------------- ^^ -------------------------------- StorageVersion
    |                |
    |                NoStorageVersionSet
diff --git a/substrate/frame/support/test/tests/pallet_ui/composite_enum_unsupported_identifier.rs b/substrate/frame/support/test/tests/pallet_ui/composite_enum_unsupported_identifier.rs
index 74692ee94efd24d7662ad9020493dd1ded50b913..ca755ff9c2ba9a1c4b1c1300e9ce086a5d021743 100644
--- a/substrate/frame/support/test/tests/pallet_ui/composite_enum_unsupported_identifier.rs
+++ b/substrate/frame/support/test/tests/pallet_ui/composite_enum_unsupported_identifier.rs
@@ -1,3 +1,20 @@
+// 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.
+
 #[frame_support::pallet]
 mod pallet {
 	#[pallet::config]
diff --git a/substrate/frame/support/test/tests/pallet_ui/composite_enum_unsupported_identifier.stderr b/substrate/frame/support/test/tests/pallet_ui/composite_enum_unsupported_identifier.stderr
index 902e8923759b2226d296272b81c559eaccfa41c6..cdc8f623142b16118d23d87165ea80562dd79900 100644
--- a/substrate/frame/support/test/tests/pallet_ui/composite_enum_unsupported_identifier.stderr
+++ b/substrate/frame/support/test/tests/pallet_ui/composite_enum_unsupported_identifier.stderr
@@ -1,5 +1,5 @@
 error: expected one of: `FreezeReason`, `HoldReason`, `LockId`, `SlashReason`
-  --> tests/pallet_ui/composite_enum_unsupported_identifier.rs:10:11
+  --> tests/pallet_ui/composite_enum_unsupported_identifier.rs:27:11
    |
-10 |     pub enum HoldReasons {}
+27 |     pub enum HoldReasons {}
    |              ^^^^^^^^^^^
diff --git a/substrate/frame/support/test/tests/pallet_ui/default_config_with_no_default_in_system.rs b/substrate/frame/support/test/tests/pallet_ui/default_config_with_no_default_in_system.rs
index 026b74c914a136cb73466d5b5926307ce1d3c8d0..aeee038fb0dcb03c591952b53264ee27af35cc73 100644
--- a/substrate/frame/support/test/tests/pallet_ui/default_config_with_no_default_in_system.rs
+++ b/substrate/frame/support/test/tests/pallet_ui/default_config_with_no_default_in_system.rs
@@ -1,3 +1,20 @@
+// 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.
+
 #[frame_support::pallet]
 mod pallet {
 	use frame_support::pallet_prelude::*;
diff --git a/substrate/frame/support/test/tests/pallet_ui/default_config_with_no_default_in_system.stderr b/substrate/frame/support/test/tests/pallet_ui/default_config_with_no_default_in_system.stderr
index 17d818113567439a60ed7db1167c6ff9c954d5f9..a86fd96ea28dcd1e9926dde8e64fe645ca3748e0 100644
--- a/substrate/frame/support/test/tests/pallet_ui/default_config_with_no_default_in_system.stderr
+++ b/substrate/frame/support/test/tests/pallet_ui/default_config_with_no_default_in_system.stderr
@@ -1,5 +1,5 @@
 error[E0220]: associated type `Block` not found for `Self`
- --> tests/pallet_ui/default_config_with_no_default_in_system.rs:8:31
-  |
-8 |         type MyGetParam2: Get<Self::Block>;
-  |                                     ^^^^^ there is a similarly named associated type `Block` in the trait `frame_system::Config`
+  --> tests/pallet_ui/default_config_with_no_default_in_system.rs:25:31
+   |
+25 |         type MyGetParam2: Get<Self::Block>;
+   |                                     ^^^^^ there is a similarly named associated type `Block` in the trait `frame_system::Config`
diff --git a/substrate/frame/support/test/tests/pallet_ui/deprecated_store_attr.rs b/substrate/frame/support/test/tests/pallet_ui/deprecated_store_attr.rs
index 0799a3fce8d58bc5beeb1ba8020204d239eccb2a..72ad7896dfec572014cb6b10dcc39bc417a275b6 100644
--- a/substrate/frame/support/test/tests/pallet_ui/deprecated_store_attr.rs
+++ b/substrate/frame/support/test/tests/pallet_ui/deprecated_store_attr.rs
@@ -1,3 +1,20 @@
+// 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.
+
 #[frame_support::pallet]
 mod pallet {
 	#[pallet::config]
diff --git a/substrate/frame/support/test/tests/pallet_ui/deprecated_store_attr.stderr b/substrate/frame/support/test/tests/pallet_ui/deprecated_store_attr.stderr
index 5d2734b4db601f4e1bf3035536e766ba33f283ef..942db0ab4699f779f8ec83b5e932a818483fe508 100644
--- a/substrate/frame/support/test/tests/pallet_ui/deprecated_store_attr.stderr
+++ b/substrate/frame/support/test/tests/pallet_ui/deprecated_store_attr.stderr
@@ -1,9 +1,9 @@
 error: use of deprecated struct `pallet::_::Store`:
                Use of `#[pallet::generate_store(pub(super) trait Store)]` will be removed after July 2023.
                Check https://github.com/paritytech/substrate/pull/13535 for more details.
- --> tests/pallet_ui/deprecated_store_attr.rs:7:3
-  |
-7 |     #[pallet::generate_store(trait Store)]
-  |      ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
-  |
-  = note: `-D deprecated` implied by `-D warnings`
+  --> tests/pallet_ui/deprecated_store_attr.rs:24:3
+   |
+24 |     #[pallet::generate_store(trait Store)]
+   |      ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
+   |
+   = note: `-D deprecated` implied by `-D warnings`
diff --git a/substrate/frame/support/test/tests/pallet_ui/dev_mode_without_arg.rs b/substrate/frame/support/test/tests/pallet_ui/dev_mode_without_arg.rs
index 2a413eea9b4aac70f299bac1c853dd43900abdb9..b75b9729d0e6f30960cb83cc04da7b09a900434a 100644
--- a/substrate/frame/support/test/tests/pallet_ui/dev_mode_without_arg.rs
+++ b/substrate/frame/support/test/tests/pallet_ui/dev_mode_without_arg.rs
@@ -1,3 +1,20 @@
+// 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.
+
 #![cfg_attr(not(feature = "std"), no_std)]
 
 #[frame_support::pallet]
diff --git a/substrate/frame/support/test/tests/pallet_ui/dev_mode_without_arg.stderr b/substrate/frame/support/test/tests/pallet_ui/dev_mode_without_arg.stderr
index 1e2011b2a30cfce1d33689c9206d7cbdffb6fe40..5aea7d83a61cacd20c3c7e24152a0cd4e4602752 100644
--- a/substrate/frame/support/test/tests/pallet_ui/dev_mode_without_arg.stderr
+++ b/substrate/frame/support/test/tests/pallet_ui/dev_mode_without_arg.stderr
@@ -1,7 +1,7 @@
 error: A pallet::call requires either a concrete `#[pallet::weight($expr)]` or an
                                inherited weight from the `#[pallet:call(weight($type))]` attribute, but
                                none were given.
-  --> tests/pallet_ui/dev_mode_without_arg.rs:22:7
+  --> tests/pallet_ui/dev_mode_without_arg.rs:39:7
    |
-22 |         pub fn my_call(_origin: OriginFor<T>) -> DispatchResult {
+39 |         pub fn my_call(_origin: OriginFor<T>) -> DispatchResult {
    |             ^^
diff --git a/substrate/frame/support/test/tests/pallet_ui/dev_mode_without_arg_call_index.rs b/substrate/frame/support/test/tests/pallet_ui/dev_mode_without_arg_call_index.rs
index 1920b6799de25f9f5e8a9fb7cb19d8ae1a38738c..06c657f2e357b93644bea9dd62b5be0ce4f69734 100644
--- a/substrate/frame/support/test/tests/pallet_ui/dev_mode_without_arg_call_index.rs
+++ b/substrate/frame/support/test/tests/pallet_ui/dev_mode_without_arg_call_index.rs
@@ -1,3 +1,20 @@
+// 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.
+
 #![cfg_attr(not(feature = "std"), no_std)]
 
 pub use pallet::*;
diff --git a/substrate/frame/support/test/tests/pallet_ui/dev_mode_without_arg_call_index.stderr b/substrate/frame/support/test/tests/pallet_ui/dev_mode_without_arg_call_index.stderr
index b75edff1ab5f3b1e633e7472445f19d678b70f8e..bcfe43d008f8c43045a90f45cdd27ae031a4e12a 100644
--- a/substrate/frame/support/test/tests/pallet_ui/dev_mode_without_arg_call_index.stderr
+++ b/substrate/frame/support/test/tests/pallet_ui/dev_mode_without_arg_call_index.stderr
@@ -5,9 +5,9 @@ error: use of deprecated constant `pallet::warnings::ImplicitCallIndex_0::_w`:
                For more info see:
                    <https://github.com/paritytech/substrate/pull/12891>
                    <https://github.com/paritytech/substrate/pull/11381>
-  --> tests/pallet_ui/dev_mode_without_arg_call_index.rs:22:10
+  --> tests/pallet_ui/dev_mode_without_arg_call_index.rs:39:10
    |
-22 |         pub fn my_call(_origin: OriginFor<T>) -> DispatchResult {
+39 |         pub fn my_call(_origin: OriginFor<T>) -> DispatchResult {
    |                ^^^^^^^
    |
    = note: `-D deprecated` implied by `-D warnings`
@@ -18,7 +18,7 @@ error: use of deprecated constant `pallet::warnings::ConstantWeight_0::_w`:
 
                For more info see:
                    <https://github.com/paritytech/substrate/pull/13798>
-  --> tests/pallet_ui/dev_mode_without_arg_call_index.rs:21:20
+  --> tests/pallet_ui/dev_mode_without_arg_call_index.rs:38:20
    |
-21 |         #[pallet::weight(0)]
+38 |         #[pallet::weight(0)]
    |                          ^
diff --git a/substrate/frame/support/test/tests/pallet_ui/dev_mode_without_arg_default_hasher.rs b/substrate/frame/support/test/tests/pallet_ui/dev_mode_without_arg_default_hasher.rs
index fb1139479566affb94bb2ddf6d326f20cf269238..60945cabc47402f98a1d57c95cf556c1847db732 100644
--- a/substrate/frame/support/test/tests/pallet_ui/dev_mode_without_arg_default_hasher.rs
+++ b/substrate/frame/support/test/tests/pallet_ui/dev_mode_without_arg_default_hasher.rs
@@ -1,3 +1,20 @@
+// 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.
+
 #![cfg_attr(not(feature = "std"), no_std)]
 
 pub use pallet::*;
diff --git a/substrate/frame/support/test/tests/pallet_ui/dev_mode_without_arg_default_hasher.stderr b/substrate/frame/support/test/tests/pallet_ui/dev_mode_without_arg_default_hasher.stderr
index e0dbc8c953b4e9054371eddfb4871f6b77daa240..81d0257ca6c675aa9401faca48ed44dfb53397d6 100644
--- a/substrate/frame/support/test/tests/pallet_ui/dev_mode_without_arg_default_hasher.stderr
+++ b/substrate/frame/support/test/tests/pallet_ui/dev_mode_without_arg_default_hasher.stderr
@@ -1,11 +1,11 @@
 error: `_` can only be used in dev_mode. Please specify an appropriate hasher.
-  --> tests/pallet_ui/dev_mode_without_arg_default_hasher.rs:21:47
+  --> tests/pallet_ui/dev_mode_without_arg_default_hasher.rs:38:47
    |
-21 |     type MyStorageMap<T: Config> = StorageMap<_, _, u32, u64>;
+38 |     type MyStorageMap<T: Config> = StorageMap<_, _, u32, u64>;
    |                                                  ^
 
 error[E0432]: unresolved import `pallet`
- --> tests/pallet_ui/dev_mode_without_arg_default_hasher.rs:3:9
-  |
-3 | pub use pallet::*;
-  |         ^^^^^^ help: a similar path exists: `test_pallet::pallet`
+  --> tests/pallet_ui/dev_mode_without_arg_default_hasher.rs:20:9
+   |
+20 | pub use pallet::*;
+   |         ^^^^^^ help: a similar path exists: `test_pallet::pallet`
diff --git a/substrate/frame/support/test/tests/pallet_ui/dev_mode_without_arg_max_encoded_len.rs b/substrate/frame/support/test/tests/pallet_ui/dev_mode_without_arg_max_encoded_len.rs
index f6efcc3fc3d7240a48857c3b046bfe582dc56571..092e06b08e3e04efa97d13a6f5b030a7616f4496 100644
--- a/substrate/frame/support/test/tests/pallet_ui/dev_mode_without_arg_max_encoded_len.rs
+++ b/substrate/frame/support/test/tests/pallet_ui/dev_mode_without_arg_max_encoded_len.rs
@@ -1,3 +1,20 @@
+// 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.
+
 #![cfg_attr(not(feature = "std"), no_std)]
 
 pub use pallet::*;
diff --git a/substrate/frame/support/test/tests/pallet_ui/dev_mode_without_arg_max_encoded_len.stderr b/substrate/frame/support/test/tests/pallet_ui/dev_mode_without_arg_max_encoded_len.stderr
index cf502ac5be475e31f3ea1184138d0af5b93da678..531e8bdffeb0c0f073e1775cdc0f683beb3d198d 100644
--- a/substrate/frame/support/test/tests/pallet_ui/dev_mode_without_arg_max_encoded_len.stderr
+++ b/substrate/frame/support/test/tests/pallet_ui/dev_mode_without_arg_max_encoded_len.stderr
@@ -5,9 +5,9 @@ error: use of deprecated constant `pallet::warnings::ImplicitCallIndex_0::_w`:
                For more info see:
                    <https://github.com/paritytech/substrate/pull/12891>
                    <https://github.com/paritytech/substrate/pull/11381>
-  --> tests/pallet_ui/dev_mode_without_arg_max_encoded_len.rs:25:10
+  --> tests/pallet_ui/dev_mode_without_arg_max_encoded_len.rs:42:10
    |
-25 |         pub fn my_call(_origin: OriginFor<T>) -> DispatchResult {
+42 |         pub fn my_call(_origin: OriginFor<T>) -> DispatchResult {
    |                ^^^^^^^
    |
    = note: `-D deprecated` implied by `-D warnings`
@@ -18,25 +18,25 @@ error: use of deprecated constant `pallet::warnings::ConstantWeight_0::_w`:
 
                For more info see:
                    <https://github.com/paritytech/substrate/pull/13798>
-  --> tests/pallet_ui/dev_mode_without_arg_max_encoded_len.rs:24:20
+  --> tests/pallet_ui/dev_mode_without_arg_max_encoded_len.rs:41:20
    |
-24 |         #[pallet::weight(0)]
+41 |         #[pallet::weight(0)]
    |                          ^
 
 error[E0277]: the trait bound `Vec<u8>: MaxEncodedLen` is not satisfied
-  --> tests/pallet_ui/dev_mode_without_arg_max_encoded_len.rs:11:12
+  --> tests/pallet_ui/dev_mode_without_arg_max_encoded_len.rs:28:12
    |
-11 |     #[pallet::pallet]
+28 |     #[pallet::pallet]
    |               ^^^^^^ the trait `MaxEncodedLen` is not implemented for `Vec<u8>`
    |
    = help: the following other types implement trait `MaxEncodedLen`:
-             ()
-             (TupleElement0, TupleElement1)
-             (TupleElement0, TupleElement1, TupleElement2)
-             (TupleElement0, TupleElement1, TupleElement2, TupleElement3)
-             (TupleElement0, TupleElement1, TupleElement2, TupleElement3, TupleElement4)
-             (TupleElement0, TupleElement1, TupleElement2, TupleElement3, TupleElement4, TupleElement5)
-             (TupleElement0, TupleElement1, TupleElement2, TupleElement3, TupleElement4, TupleElement5, TupleElement6)
-             (TupleElement0, TupleElement1, TupleElement2, TupleElement3, TupleElement4, TupleElement5, TupleElement6, TupleElement7)
+             bool
+             i8
+             i16
+             i32
+             i64
+             i128
+             u8
+             u16
            and $N others
    = note: required for `frame_support::pallet_prelude::StorageValue<_GeneratedPrefixForStorageMyStorage<T>, Vec<u8>>` to implement `StorageInfoTrait`
diff --git a/substrate/frame/support/test/tests/pallet_ui/duplicate_call_attr.rs b/substrate/frame/support/test/tests/pallet_ui/duplicate_call_attr.rs
index 6d781a19e6742cdc814353f9467afa257177ad83..76a64842105f61e8eec4a8801a7fdfc345bd10d8 100644
--- a/substrate/frame/support/test/tests/pallet_ui/duplicate_call_attr.rs
+++ b/substrate/frame/support/test/tests/pallet_ui/duplicate_call_attr.rs
@@ -1,3 +1,20 @@
+// 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.
+
 #[frame_support::pallet]
 mod pallet {
 	use frame_support::pallet_prelude::Hooks;
diff --git a/substrate/frame/support/test/tests/pallet_ui/duplicate_call_attr.stderr b/substrate/frame/support/test/tests/pallet_ui/duplicate_call_attr.stderr
index 2b03f410243511a37764220493f7281dfae2ccb3..fcaa576f8c5689d401d369b3c41bce909339ba2d 100644
--- a/substrate/frame/support/test/tests/pallet_ui/duplicate_call_attr.stderr
+++ b/substrate/frame/support/test/tests/pallet_ui/duplicate_call_attr.stderr
@@ -1,5 +1,5 @@
 error: Invalid duplicated attribute
-  --> $DIR/duplicate_call_attr.rs:22:12
+  --> tests/pallet_ui/duplicate_call_attr.rs:39:12
    |
-22 |     #[pallet::call]
+39 |     #[pallet::call]
    |               ^^^^
diff --git a/substrate/frame/support/test/tests/pallet_ui/duplicate_storage_prefix.rs b/substrate/frame/support/test/tests/pallet_ui/duplicate_storage_prefix.rs
index 543c15bd06905fc40f427410413b5b5e815846ee..d649ae300b49a91a2253bd1781e936452e13ad71 100644
--- a/substrate/frame/support/test/tests/pallet_ui/duplicate_storage_prefix.rs
+++ b/substrate/frame/support/test/tests/pallet_ui/duplicate_storage_prefix.rs
@@ -1,3 +1,20 @@
+// 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.
+
 #[frame_support::pallet]
 mod pallet {
 	use frame_support::pallet_prelude::*;
diff --git a/substrate/frame/support/test/tests/pallet_ui/duplicate_storage_prefix.stderr b/substrate/frame/support/test/tests/pallet_ui/duplicate_storage_prefix.stderr
index 75297dc5a7f79f36a7d897fdb2743c47023dec4b..1e046d85f7bef1649435f336a1c4f1a73570b5d3 100644
--- a/substrate/frame/support/test/tests/pallet_ui/duplicate_storage_prefix.stderr
+++ b/substrate/frame/support/test/tests/pallet_ui/duplicate_storage_prefix.stderr
@@ -1,47 +1,47 @@
 error: Duplicate storage prefixes found for `Foo`
-  --> $DIR/duplicate_storage_prefix.rs:15:29
+  --> tests/pallet_ui/duplicate_storage_prefix.rs:32:29
    |
-15 |     #[pallet::storage_prefix = "Foo"]
+32 |     #[pallet::storage_prefix = "Foo"]
    |                                ^^^^^
 
 error: Duplicate storage prefixes found for `Foo`
-  --> $DIR/duplicate_storage_prefix.rs:12:7
+  --> tests/pallet_ui/duplicate_storage_prefix.rs:29:7
    |
-12 |     type Foo<T> = StorageValue<_, u8>;
+29 |     type Foo<T> = StorageValue<_, u8>;
    |          ^^^
 
 error: Duplicate storage prefixes found for `CounterForBar`, used for counter associated to counted storage map
-  --> $DIR/duplicate_storage_prefix.rs:22:7
+  --> tests/pallet_ui/duplicate_storage_prefix.rs:39:7
    |
-22 |     type Bar<T> = CountedStorageMap<_, Twox64Concat, u16, u16>;
+39 |     type Bar<T> = CountedStorageMap<_, Twox64Concat, u16, u16>;
    |          ^^^
 
 error: Duplicate storage prefixes found for `CounterForBar`
-  --> $DIR/duplicate_storage_prefix.rs:19:7
+  --> tests/pallet_ui/duplicate_storage_prefix.rs:36:7
    |
-19 |     type CounterForBar<T> = StorageValue<_, u16>;
+36 |     type CounterForBar<T> = StorageValue<_, u16>;
    |          ^^^^^^^^^^^^^
 
 error[E0412]: cannot find type `_GeneratedPrefixForStorageFoo` in this scope
-  --> $DIR/duplicate_storage_prefix.rs:12:7
+  --> tests/pallet_ui/duplicate_storage_prefix.rs:29:7
    |
-12 |     type Foo<T> = StorageValue<_, u8>;
+29 |     type Foo<T> = StorageValue<_, u8>;
    |          ^^^ not found in this scope
 
 error[E0412]: cannot find type `_GeneratedPrefixForStorageNotFoo` in this scope
-  --> $DIR/duplicate_storage_prefix.rs:16:7
+  --> tests/pallet_ui/duplicate_storage_prefix.rs:33:7
    |
-16 |     type NotFoo<T> = StorageValue<_, u16>;
+33 |     type NotFoo<T> = StorageValue<_, u16>;
    |          ^^^^^^ not found in this scope
 
 error[E0412]: cannot find type `_GeneratedPrefixForStorageCounterForBar` in this scope
-  --> $DIR/duplicate_storage_prefix.rs:19:7
+  --> tests/pallet_ui/duplicate_storage_prefix.rs:36:7
    |
-19 |     type CounterForBar<T> = StorageValue<_, u16>;
+36 |     type CounterForBar<T> = StorageValue<_, u16>;
    |          ^^^^^^^^^^^^^ not found in this scope
 
 error[E0412]: cannot find type `_GeneratedPrefixForStorageBar` in this scope
-  --> $DIR/duplicate_storage_prefix.rs:22:7
+  --> tests/pallet_ui/duplicate_storage_prefix.rs:39:7
    |
-22 |     type Bar<T> = CountedStorageMap<_, Twox64Concat, u16, u16>;
+39 |     type Bar<T> = CountedStorageMap<_, Twox64Concat, u16, u16>;
    |          ^^^ not found in this scope
diff --git a/substrate/frame/support/test/tests/pallet_ui/duplicate_store_attr.rs b/substrate/frame/support/test/tests/pallet_ui/duplicate_store_attr.rs
index ab318034aca054564964cfcd3356719bbe8142f0..334fd8a46af2e14ef175acfbbdbc6a895b890595 100644
--- a/substrate/frame/support/test/tests/pallet_ui/duplicate_store_attr.rs
+++ b/substrate/frame/support/test/tests/pallet_ui/duplicate_store_attr.rs
@@ -1,3 +1,20 @@
+// 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.
+
 #[frame_support::pallet]
 mod pallet {
 	use frame_support::pallet_prelude::Hooks;
diff --git a/substrate/frame/support/test/tests/pallet_ui/duplicate_store_attr.stderr b/substrate/frame/support/test/tests/pallet_ui/duplicate_store_attr.stderr
index 1c13ee17eb75105701f330e0dd4c8ce0685abfe7..864b399326e19ea96afa8d76ccf9815b057ceef6 100644
--- a/substrate/frame/support/test/tests/pallet_ui/duplicate_store_attr.stderr
+++ b/substrate/frame/support/test/tests/pallet_ui/duplicate_store_attr.stderr
@@ -1,5 +1,5 @@
 error: Unexpected duplicated attribute
-  --> tests/pallet_ui/duplicate_store_attr.rs:12:3
+  --> tests/pallet_ui/duplicate_store_attr.rs:29:3
    |
-12 |     #[pallet::generate_store(trait Store)]
+29 |     #[pallet::generate_store(trait Store)]
    |      ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
diff --git a/substrate/frame/support/test/tests/pallet_ui/error_does_not_derive_pallet_error.rs b/substrate/frame/support/test/tests/pallet_ui/error_does_not_derive_pallet_error.rs
index 254d65866774fee7efba978b2479d7f1bc9b4621..2e92f5358eabc368fe01b517b3c90274869a079e 100644
--- a/substrate/frame/support/test/tests/pallet_ui/error_does_not_derive_pallet_error.rs
+++ b/substrate/frame/support/test/tests/pallet_ui/error_does_not_derive_pallet_error.rs
@@ -1,3 +1,20 @@
+// 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.
+
 #[frame_support::pallet]
 mod pallet {
 	#[pallet::config]
diff --git a/substrate/frame/support/test/tests/pallet_ui/error_does_not_derive_pallet_error.stderr b/substrate/frame/support/test/tests/pallet_ui/error_does_not_derive_pallet_error.stderr
index 7edb55a62d401a3c43dd3d589482ae9f1c94122d..ea1d0ed99cd39747bfc1f94a9e3433809baa82b5 100644
--- a/substrate/frame/support/test/tests/pallet_ui/error_does_not_derive_pallet_error.stderr
+++ b/substrate/frame/support/test/tests/pallet_ui/error_does_not_derive_pallet_error.stderr
@@ -1,17 +1,17 @@
 error[E0277]: the trait bound `MyError: PalletError` is not satisfied
- --> tests/pallet_ui/error_does_not_derive_pallet_error.rs:1:1
-  |
-1 | #[frame_support::pallet]
-  | ^^^^^^^^^^^^^^^^^^^^^^^^ the trait `PalletError` is not implemented for `MyError`
-  |
-  = help: the following other types implement trait `PalletError`:
-            ()
-            (TupleElement0, TupleElement1)
-            (TupleElement0, TupleElement1, TupleElement2)
-            (TupleElement0, TupleElement1, TupleElement2, TupleElement3)
-            (TupleElement0, TupleElement1, TupleElement2, TupleElement3, TupleElement4)
-            (TupleElement0, TupleElement1, TupleElement2, TupleElement3, TupleElement4, TupleElement5)
-            (TupleElement0, TupleElement1, TupleElement2, TupleElement3, TupleElement4, TupleElement5, TupleElement6)
-            (TupleElement0, TupleElement1, TupleElement2, TupleElement3, TupleElement4, TupleElement5, TupleElement6, TupleElement7)
-          and 36 others
-  = note: this error originates in the derive macro `frame_support::PalletError` (in Nightly builds, run with -Z macro-backtrace for more info)
+  --> tests/pallet_ui/error_does_not_derive_pallet_error.rs:18:1
+   |
+18 | #[frame_support::pallet]
+   | ^^^^^^^^^^^^^^^^^^^^^^^^ the trait `PalletError` is not implemented for `MyError`
+   |
+   = help: the following other types implement trait `PalletError`:
+             bool
+             i8
+             i16
+             i32
+             i64
+             i128
+             u8
+             u16
+           and $N others
+   = note: this error originates in the derive macro `frame_support::PalletError` (in Nightly builds, run with -Z macro-backtrace for more info)
diff --git a/substrate/frame/support/test/tests/pallet_ui/error_where_clause.rs b/substrate/frame/support/test/tests/pallet_ui/error_where_clause.rs
index 29d7435bc4bc850b8642c2912f79b1997d42c81c..32e74b940a2b21716cad74cd764c6c1ef859f43f 100644
--- a/substrate/frame/support/test/tests/pallet_ui/error_where_clause.rs
+++ b/substrate/frame/support/test/tests/pallet_ui/error_where_clause.rs
@@ -1,3 +1,20 @@
+// 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.
+
 #[frame_support::pallet]
 mod pallet {
 	use frame_support::pallet_prelude::Hooks;
diff --git a/substrate/frame/support/test/tests/pallet_ui/error_where_clause.stderr b/substrate/frame/support/test/tests/pallet_ui/error_where_clause.stderr
index 8e9d0e60692d8af48d8b9fbc8c7403428c4e7ca5..f9bcb61786b0011152a4a4d20ba59650ac4c633b 100644
--- a/substrate/frame/support/test/tests/pallet_ui/error_where_clause.stderr
+++ b/substrate/frame/support/test/tests/pallet_ui/error_where_clause.stderr
@@ -1,5 +1,5 @@
 error: Invalid pallet::error, where clause is not allowed on pallet error item
-  --> $DIR/error_where_clause.rs:19:20
+  --> tests/pallet_ui/error_where_clause.rs:36:20
    |
-19 |     pub enum Error<T> where u32: From<u8> {}
+36 |     pub enum Error<T> where u32: From<u8> {}
    |                       ^^^^^
diff --git a/substrate/frame/support/test/tests/pallet_ui/error_wrong_item.rs b/substrate/frame/support/test/tests/pallet_ui/error_wrong_item.rs
index 50e66dc8c0dce0bb0da8137f2652855540820f9f..fce7267224d09b74f331f9858330d97d28442132 100644
--- a/substrate/frame/support/test/tests/pallet_ui/error_wrong_item.rs
+++ b/substrate/frame/support/test/tests/pallet_ui/error_wrong_item.rs
@@ -1,3 +1,20 @@
+// 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.
+
 #[frame_support::pallet]
 mod pallet {
 	use frame_support::pallet_prelude::Hooks;
diff --git a/substrate/frame/support/test/tests/pallet_ui/error_wrong_item.stderr b/substrate/frame/support/test/tests/pallet_ui/error_wrong_item.stderr
index 8c0496782fb168e7392aac73ae49b0ef3c5a2e66..cbaac7b5d4fcc1021a8cc629857120164df64b72 100644
--- a/substrate/frame/support/test/tests/pallet_ui/error_wrong_item.stderr
+++ b/substrate/frame/support/test/tests/pallet_ui/error_wrong_item.stderr
@@ -1,5 +1,5 @@
 error: Invalid pallet::error, expected item enum
-  --> $DIR/error_wrong_item.rs:19:2
+  --> tests/pallet_ui/error_wrong_item.rs:36:2
    |
-19 |     pub struct Foo;
+36 |     pub struct Foo;
    |     ^^^
diff --git a/substrate/frame/support/test/tests/pallet_ui/error_wrong_item_name.rs b/substrate/frame/support/test/tests/pallet_ui/error_wrong_item_name.rs
index 14107fafb06eaf6591218c33c367b701d99e468a..ba4d43955af53d24a6a178a77adbad7fdc06337d 100644
--- a/substrate/frame/support/test/tests/pallet_ui/error_wrong_item_name.rs
+++ b/substrate/frame/support/test/tests/pallet_ui/error_wrong_item_name.rs
@@ -1,3 +1,20 @@
+// 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.
+
 #[frame_support::pallet]
 mod pallet {
 	use frame_support::pallet_prelude::Hooks;
diff --git a/substrate/frame/support/test/tests/pallet_ui/error_wrong_item_name.stderr b/substrate/frame/support/test/tests/pallet_ui/error_wrong_item_name.stderr
index d7e54ad8a75163097bd9253456544788ef2525a3..784ae4631af0956ed4edf52d210c165328669c37 100644
--- a/substrate/frame/support/test/tests/pallet_ui/error_wrong_item_name.stderr
+++ b/substrate/frame/support/test/tests/pallet_ui/error_wrong_item_name.stderr
@@ -1,5 +1,5 @@
 error: expected `Error`
-  --> $DIR/error_wrong_item_name.rs:19:11
+  --> tests/pallet_ui/error_wrong_item_name.rs:36:11
    |
-19 |     pub enum Foo<T> {}
+36 |     pub enum Foo<T> {}
    |              ^^^
diff --git a/substrate/frame/support/test/tests/pallet_ui/event_field_not_member.rs b/substrate/frame/support/test/tests/pallet_ui/event_field_not_member.rs
index 2b45a971788fb9b6b5ed11e5b184527b59729f93..a7e6d213318fb5e0fc00d5062f7561db9c0cf4fc 100644
--- a/substrate/frame/support/test/tests/pallet_ui/event_field_not_member.rs
+++ b/substrate/frame/support/test/tests/pallet_ui/event_field_not_member.rs
@@ -1,3 +1,20 @@
+// 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.
+
 #[frame_support::pallet]
 mod pallet {
 	use frame_support::pallet_prelude::{Hooks, IsType};
diff --git a/substrate/frame/support/test/tests/pallet_ui/event_field_not_member.stderr b/substrate/frame/support/test/tests/pallet_ui/event_field_not_member.stderr
index 1161f4a190231eb17eb23db90e9d76e09b0f867c..fc4a33b721500a09ef03f36836f7ebea832a2547 100644
--- a/substrate/frame/support/test/tests/pallet_ui/event_field_not_member.stderr
+++ b/substrate/frame/support/test/tests/pallet_ui/event_field_not_member.stderr
@@ -1,21 +1,21 @@
 error[E0277]: the trait bound `<T as pallet::Config>::Bar: Clone` is not satisfied
-  --> tests/pallet_ui/event_field_not_member.rs:23:7
+  --> tests/pallet_ui/event_field_not_member.rs:40:7
    |
-23 |         B { b: T::Bar },
+40 |         B { b: T::Bar },
    |             ^ the trait `Clone` is not implemented for `<T as pallet::Config>::Bar`
 
 error[E0369]: binary operation `==` cannot be applied to type `&<T as pallet::Config>::Bar`
-  --> tests/pallet_ui/event_field_not_member.rs:23:7
+  --> tests/pallet_ui/event_field_not_member.rs:40:7
    |
-23 |         B { b: T::Bar },
+40 |         B { b: T::Bar },
    |             ^
 
 error[E0277]: `<T as pallet::Config>::Bar` doesn't implement `std::fmt::Debug`
-  --> tests/pallet_ui/event_field_not_member.rs:23:7
+  --> tests/pallet_ui/event_field_not_member.rs:40:7
    |
-23 |         B { b: T::Bar },
+40 |         B { b: T::Bar },
    |             ^ `<T as pallet::Config>::Bar` cannot be formatted using `{:?}` because it doesn't implement `std::fmt::Debug`
    |
    = help: the trait `std::fmt::Debug` is not implemented for `<T as pallet::Config>::Bar`
    = note: required for `&<T as pallet::Config>::Bar` to implement `std::fmt::Debug`
-   = note: required for the cast from `&<T as pallet::Config>::Bar` to the object type `dyn std::fmt::Debug`
+   = note: required for the cast from `&&<T as pallet::Config>::Bar` to `&dyn std::fmt::Debug`
diff --git a/substrate/frame/support/test/tests/pallet_ui/event_not_in_trait.rs b/substrate/frame/support/test/tests/pallet_ui/event_not_in_trait.rs
index 94151ba4c3d9d7efbc901eec9d7a5f84c058ee81..405faeb6de0505c3572af72ed6692576b62d2ff4 100644
--- a/substrate/frame/support/test/tests/pallet_ui/event_not_in_trait.rs
+++ b/substrate/frame/support/test/tests/pallet_ui/event_not_in_trait.rs
@@ -1,3 +1,20 @@
+// 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.
+
 #[frame_support::pallet]
 mod pallet {
 	use frame_support::pallet_prelude::Hooks;
diff --git a/substrate/frame/support/test/tests/pallet_ui/event_not_in_trait.stderr b/substrate/frame/support/test/tests/pallet_ui/event_not_in_trait.stderr
index 2eda72eb5f72f86851af25ee2c26251a93e4ec77..eef17ffab4fef6f7d34302c0914cb17766c8e684 100644
--- a/substrate/frame/support/test/tests/pallet_ui/event_not_in_trait.stderr
+++ b/substrate/frame/support/test/tests/pallet_ui/event_not_in_trait.stderr
@@ -1,7 +1,7 @@
 error: Invalid usage of RuntimeEvent, `Config` contains no associated type `RuntimeEvent`, but enum `Event` is declared (in use of `#[pallet::event]`). An RuntimeEvent associated type must be declare on trait `Config`.
- --> $DIR/event_not_in_trait.rs:1:1
-  |
-1 | #[frame_support::pallet]
-  | ^^^^^^^^^^^^^^^^^^^^^^^^
-  |
-  = note: this error originates in the attribute macro `frame_support::pallet` (in Nightly builds, run with -Z macro-backtrace for more info)
+  --> tests/pallet_ui/event_not_in_trait.rs:18:1
+   |
+18 | #[frame_support::pallet]
+   | ^^^^^^^^^^^^^^^^^^^^^^^^
+   |
+   = note: this error originates in the attribute macro `frame_support::pallet` (in Nightly builds, run with -Z macro-backtrace for more info)
diff --git a/substrate/frame/support/test/tests/pallet_ui/event_type_invalid_bound.rs b/substrate/frame/support/test/tests/pallet_ui/event_type_invalid_bound.rs
index a02cc9b9de883e2204b22a413969e217c4a00d49..34b563ffb6433b6a156e5ace4abecd08b560ce49 100644
--- a/substrate/frame/support/test/tests/pallet_ui/event_type_invalid_bound.rs
+++ b/substrate/frame/support/test/tests/pallet_ui/event_type_invalid_bound.rs
@@ -1,3 +1,20 @@
+// 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.
+
 #[frame_support::pallet]
 mod pallet {
 	use frame_support::pallet_prelude::Hooks;
@@ -24,5 +41,4 @@ mod pallet {
 	}
 }
 
-fn main() {
-}
+fn main() {}
diff --git a/substrate/frame/support/test/tests/pallet_ui/event_type_invalid_bound.stderr b/substrate/frame/support/test/tests/pallet_ui/event_type_invalid_bound.stderr
index d54149d719a3bfc8cfa335992faaf2bae6bef8c1..e9e4c1269f29ded8534b5ea79a7f3bd3589a7e35 100644
--- a/substrate/frame/support/test/tests/pallet_ui/event_type_invalid_bound.stderr
+++ b/substrate/frame/support/test/tests/pallet_ui/event_type_invalid_bound.stderr
@@ -1,5 +1,5 @@
 error: Invalid `type RuntimeEvent`, associated type `RuntimeEvent` is reserved and must bound: `IsType<<Self as frame_system::Config>::RuntimeEvent>`
- --> $DIR/event_type_invalid_bound.rs:9:3
-  |
-9 |         type RuntimeEvent;
-  |         ^^^^
+  --> tests/pallet_ui/event_type_invalid_bound.rs:26:3
+   |
+26 |         type RuntimeEvent;
+   |         ^^^^
diff --git a/substrate/frame/support/test/tests/pallet_ui/event_type_invalid_bound_2.rs b/substrate/frame/support/test/tests/pallet_ui/event_type_invalid_bound_2.rs
index 99df89d67278ce786c094a48404aed3c5a52b2dd..23d5a3b449ec8c2cba07e8f8e504f7719a298537 100644
--- a/substrate/frame/support/test/tests/pallet_ui/event_type_invalid_bound_2.rs
+++ b/substrate/frame/support/test/tests/pallet_ui/event_type_invalid_bound_2.rs
@@ -1,3 +1,20 @@
+// 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.
+
 #[frame_support::pallet]
 mod pallet {
 	use frame_support::pallet_prelude::{Hooks, IsType};
diff --git a/substrate/frame/support/test/tests/pallet_ui/event_type_invalid_bound_2.stderr b/substrate/frame/support/test/tests/pallet_ui/event_type_invalid_bound_2.stderr
index ea8b2ff000cebf66408e06de26d48126dfc804a1..436a8651bb80d671985095130287ba612d225b29 100644
--- a/substrate/frame/support/test/tests/pallet_ui/event_type_invalid_bound_2.stderr
+++ b/substrate/frame/support/test/tests/pallet_ui/event_type_invalid_bound_2.stderr
@@ -1,5 +1,5 @@
 error: Invalid `type RuntimeEvent`, associated type `RuntimeEvent` is reserved and must bound: `From<Event>` or `From<Event<Self>>` or `From<Event<Self, I>>`
- --> $DIR/event_type_invalid_bound_2.rs:9:3
-  |
-9 |         type RuntimeEvent: IsType<<Self as frame_system::Config>::RuntimeEvent>;
-  |         ^^^^
+  --> tests/pallet_ui/event_type_invalid_bound_2.rs:26:3
+   |
+26 |         type RuntimeEvent: IsType<<Self as frame_system::Config>::RuntimeEvent>;
+   |         ^^^^
diff --git a/substrate/frame/support/test/tests/pallet_ui/event_wrong_item.rs b/substrate/frame/support/test/tests/pallet_ui/event_wrong_item.rs
index d6690557c39d85445f8f93d2f2b0cf7094015c84..4b4654cf59075efaf17f5b68fc2cab485890d262 100644
--- a/substrate/frame/support/test/tests/pallet_ui/event_wrong_item.rs
+++ b/substrate/frame/support/test/tests/pallet_ui/event_wrong_item.rs
@@ -1,3 +1,20 @@
+// 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.
+
 #[frame_support::pallet]
 mod pallet {
 	use frame_support::pallet_prelude::Hooks;
diff --git a/substrate/frame/support/test/tests/pallet_ui/event_wrong_item.stderr b/substrate/frame/support/test/tests/pallet_ui/event_wrong_item.stderr
index 0ef150dfd62e1a3a7ba40b44d3829c99cf09eb0f..155391f11edf3da7fe97cad64798fed40fd85c7a 100644
--- a/substrate/frame/support/test/tests/pallet_ui/event_wrong_item.stderr
+++ b/substrate/frame/support/test/tests/pallet_ui/event_wrong_item.stderr
@@ -1,5 +1,5 @@
 error: Invalid pallet::event, expected enum item
-  --> $DIR/event_wrong_item.rs:19:2
+  --> tests/pallet_ui/event_wrong_item.rs:36:2
    |
-19 |     pub struct Foo;
+36 |     pub struct Foo;
    |     ^^^
diff --git a/substrate/frame/support/test/tests/pallet_ui/event_wrong_item_name.rs b/substrate/frame/support/test/tests/pallet_ui/event_wrong_item_name.rs
index d828965c5173c548c9bee3b0e6d36225241c7135..3588760c3bfdacc11c9e1e26c6bf5660848d6dad 100644
--- a/substrate/frame/support/test/tests/pallet_ui/event_wrong_item_name.rs
+++ b/substrate/frame/support/test/tests/pallet_ui/event_wrong_item_name.rs
@@ -1,3 +1,20 @@
+// 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.
+
 #[frame_support::pallet]
 mod pallet {
 	use frame_support::pallet_prelude::Hooks;
diff --git a/substrate/frame/support/test/tests/pallet_ui/event_wrong_item_name.stderr b/substrate/frame/support/test/tests/pallet_ui/event_wrong_item_name.stderr
index 14e8615c5619950efd4807a9fa589ba110cb978a..b70e560e69a0c6892cb443c45240aeb7b400311a 100644
--- a/substrate/frame/support/test/tests/pallet_ui/event_wrong_item_name.stderr
+++ b/substrate/frame/support/test/tests/pallet_ui/event_wrong_item_name.stderr
@@ -1,5 +1,5 @@
 error: expected `Event`
-  --> $DIR/event_wrong_item_name.rs:19:11
+  --> tests/pallet_ui/event_wrong_item_name.rs:36:11
    |
-19 |     pub enum Foo {}
+36 |     pub enum Foo {}
    |              ^^^
diff --git a/substrate/frame/support/test/tests/pallet_ui/genesis_default_not_satisfied.rs b/substrate/frame/support/test/tests/pallet_ui/genesis_default_not_satisfied.rs
deleted file mode 100644
index a4a0eb832c9c0a8de91a76682dbbb54dcd1e4e1e..0000000000000000000000000000000000000000
--- a/substrate/frame/support/test/tests/pallet_ui/genesis_default_not_satisfied.rs
+++ /dev/null
@@ -1,26 +0,0 @@
-#[frame_support::pallet]
-mod pallet {
-	use frame_support::pallet_prelude::{BuildGenesisConfig, Hooks};
-	use frame_system::pallet_prelude::BlockNumberFor;
-
-	#[pallet::config]
-	pub trait Config: frame_system::Config {}
-
-	#[pallet::pallet]
-	pub struct Pallet<T>(core::marker::PhantomData<T>);
-
-	#[pallet::hooks]
-	impl<T: Config> Hooks<BlockNumberFor<T>> for Pallet<T> {}
-
-	#[pallet::call]
-	impl<T: Config> Pallet<T> {}
-
-	#[pallet::genesis_config]
-	pub struct GenesisConfig;
-
-	#[pallet::genesis_build]
-	impl BuildGenesisConfig for GenesisConfig {}
-}
-
-fn main() {
-}
diff --git a/substrate/frame/support/test/tests/pallet_ui/genesis_default_not_satisfied.stderr b/substrate/frame/support/test/tests/pallet_ui/genesis_default_not_satisfied.stderr
deleted file mode 100644
index 67cbe80be0da37c7d8d177e85b55aea4d8928663..0000000000000000000000000000000000000000
--- a/substrate/frame/support/test/tests/pallet_ui/genesis_default_not_satisfied.stderr
+++ /dev/null
@@ -1,16 +0,0 @@
-error[E0277]: the trait bound `pallet::GenesisConfig: std::default::Default` is not satisfied
-  --> tests/pallet_ui/genesis_default_not_satisfied.rs:22:30
-   |
-22 |     impl BuildGenesisConfig for GenesisConfig {}
-   |                                 ^^^^^^^^^^^^^ the trait `std::default::Default` is not implemented for `pallet::GenesisConfig`
-   |
-note: required by a bound in `BuildGenesisConfig`
-  --> $WORKSPACE/substrate/frame/support/src/traits/hooks.rs
-   |
-   | pub trait BuildGenesisConfig: Default + sp_runtime::traits::MaybeSerializeDeserialize {
-   |                               ^^^^^^^ required by this bound in `BuildGenesisConfig`
-help: consider annotating `pallet::GenesisConfig` with `#[derive(Default)]`
-   |
-19  +     #[derive(Default)]
-20  |     pub struct GenesisConfig;
-    |
diff --git a/substrate/frame/support/test/tests/pallet_ui/genesis_inconsistent_build_config.rs b/substrate/frame/support/test/tests/pallet_ui/genesis_inconsistent_build_config.rs
index 9ae851005acb3b7cf24846a6c4d455d90f30064e..b55620329a6a89ff7db7a4c393d181fd0eaaabaf 100644
--- a/substrate/frame/support/test/tests/pallet_ui/genesis_inconsistent_build_config.rs
+++ b/substrate/frame/support/test/tests/pallet_ui/genesis_inconsistent_build_config.rs
@@ -1,3 +1,20 @@
+// 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.
+
 #[frame_support::pallet]
 mod pallet {
 	use frame_support::pallet_prelude::Hooks;
diff --git a/substrate/frame/support/test/tests/pallet_ui/genesis_inconsistent_build_config.stderr b/substrate/frame/support/test/tests/pallet_ui/genesis_inconsistent_build_config.stderr
index 9afc1037a48ae3c27f4221ac46c4da0952dcbded..d515547ec3a0695b56db1f6be6cbf9f5e28cb13a 100644
--- a/substrate/frame/support/test/tests/pallet_ui/genesis_inconsistent_build_config.stderr
+++ b/substrate/frame/support/test/tests/pallet_ui/genesis_inconsistent_build_config.stderr
@@ -1,5 +1,5 @@
 error: `#[pallet::genesis_config]` and `#[pallet::genesis_build]` attributes must be either both used or both not used, instead genesis_config is unused and genesis_build is used
- --> $DIR/genesis_inconsistent_build_config.rs:2:1
-  |
-2 | mod pallet {
-  | ^^^
+  --> tests/pallet_ui/genesis_inconsistent_build_config.rs:19:1
+   |
+19 | mod pallet {
+   | ^^^
diff --git a/substrate/frame/support/test/tests/pallet_ui/genesis_invalid_generic.rs b/substrate/frame/support/test/tests/pallet_ui/genesis_invalid_generic.rs
index f1eae16f496009a1df92a252b793982972a96d9d..b65216f1e6b6d019b4d8a42d7131fa6e9469c758 100644
--- a/substrate/frame/support/test/tests/pallet_ui/genesis_invalid_generic.rs
+++ b/substrate/frame/support/test/tests/pallet_ui/genesis_invalid_generic.rs
@@ -1,3 +1,20 @@
+// 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.
+
 #[frame_support::pallet]
 mod pallet {
 	use frame_support::pallet_prelude::Hooks;
diff --git a/substrate/frame/support/test/tests/pallet_ui/genesis_invalid_generic.stderr b/substrate/frame/support/test/tests/pallet_ui/genesis_invalid_generic.stderr
index f57b4a61c80c5bb7ddcd8a0f6e25d028d0c2fc18..b54a23c91b4ee966cea5b0509de24ada95f41b1a 100644
--- a/substrate/frame/support/test/tests/pallet_ui/genesis_invalid_generic.stderr
+++ b/substrate/frame/support/test/tests/pallet_ui/genesis_invalid_generic.stderr
@@ -1,13 +1,13 @@
-error: Invalid genesis builder: expected `GenesisBuild<T>` or `GenesisBuild<T, I>`
-  --> $DIR/genesis_invalid_generic.rs:19:7
+error: Invalid genesis builder: expected `BuildGenesisConfig` (or the deprecated `GenesisBuild<T>` or `GenesisBuild<T, I>`)
+  --> tests/pallet_ui/genesis_invalid_generic.rs:36:7
    |
-19 |     impl GenesisBuild for GenesisConfig {}
+36 |     impl GenesisBuild for GenesisConfig {}
    |          ^^^^^^^^^^^^
 
 error: expected `<`
- --> $DIR/genesis_invalid_generic.rs:1:1
-  |
-1 | #[frame_support::pallet]
-  | ^^^^^^^^^^^^^^^^^^^^^^^^
-  |
-  = note: this error originates in the attribute macro `frame_support::pallet` (in Nightly builds, run with -Z macro-backtrace for more info)
+  --> tests/pallet_ui/genesis_invalid_generic.rs:18:1
+   |
+18 | #[frame_support::pallet]
+   | ^^^^^^^^^^^^^^^^^^^^^^^^
+   |
+   = note: this error originates in the attribute macro `frame_support::pallet` (in Nightly builds, run with -Z macro-backtrace for more info)
diff --git a/substrate/frame/support/test/tests/pallet_ui/genesis_wrong_name.rs b/substrate/frame/support/test/tests/pallet_ui/genesis_wrong_name.rs
index 5e8b297ba4ccfbd8653181506fbaaf374a6dba55..d04465321f509e8e35ce5b38645fa4bcd8bcdc50 100644
--- a/substrate/frame/support/test/tests/pallet_ui/genesis_wrong_name.rs
+++ b/substrate/frame/support/test/tests/pallet_ui/genesis_wrong_name.rs
@@ -1,3 +1,20 @@
+// 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.
+
 #[frame_support::pallet]
 mod pallet {
 	use frame_support::pallet_prelude::Hooks;
diff --git a/substrate/frame/support/test/tests/pallet_ui/genesis_wrong_name.stderr b/substrate/frame/support/test/tests/pallet_ui/genesis_wrong_name.stderr
index dd2e65588f56b62f22322547f3e161a9e97ac8b6..4d1c09ec5edf5bc51a75b2bdb3f1f6c15f11dafd 100644
--- a/substrate/frame/support/test/tests/pallet_ui/genesis_wrong_name.stderr
+++ b/substrate/frame/support/test/tests/pallet_ui/genesis_wrong_name.stderr
@@ -1,5 +1,5 @@
 error: Invalid pallet::genesis_build, expected impl<..> GenesisBuild<..> for GenesisConfig<..>
-  --> $DIR/genesis_wrong_name.rs:19:2
+  --> tests/pallet_ui/genesis_wrong_name.rs:36:2
    |
-19 |     impl Foo {}
+36 |     impl Foo {}
    |     ^^^^
diff --git a/substrate/frame/support/test/tests/pallet_ui/hold_reason_non_enum.rs b/substrate/frame/support/test/tests/pallet_ui/hold_reason_non_enum.rs
index 8008c465e61ad0f80192f4c920a2024e28cbb066..45ec8f334f223e030c693e3f261d634cd901b46c 100644
--- a/substrate/frame/support/test/tests/pallet_ui/hold_reason_non_enum.rs
+++ b/substrate/frame/support/test/tests/pallet_ui/hold_reason_non_enum.rs
@@ -1,3 +1,20 @@
+// 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.
+
 #[frame_support::pallet]
 mod pallet {
 	#[pallet::config]
diff --git a/substrate/frame/support/test/tests/pallet_ui/hold_reason_non_enum.stderr b/substrate/frame/support/test/tests/pallet_ui/hold_reason_non_enum.stderr
index 7d86b8d4f1bd52bf283fcd889f6acc5998d65f2e..45351f368796f3eaf48f5cf5d365fa1313409d54 100644
--- a/substrate/frame/support/test/tests/pallet_ui/hold_reason_non_enum.stderr
+++ b/substrate/frame/support/test/tests/pallet_ui/hold_reason_non_enum.stderr
@@ -1,5 +1,5 @@
 error: Invalid pallet::composite_enum, expected enum item
-  --> tests/pallet_ui/hold_reason_non_enum.rs:10:2
+  --> tests/pallet_ui/hold_reason_non_enum.rs:27:2
    |
-10 |     pub struct HoldReason;
+27 |     pub struct HoldReason;
    |     ^^^
diff --git a/substrate/frame/support/test/tests/pallet_ui/hold_reason_not_pub.rs b/substrate/frame/support/test/tests/pallet_ui/hold_reason_not_pub.rs
index 626dad74113194f86520f93bcfff1c18d83638e7..5c6e7415436256236195d7c5c7c468adf8b59fb3 100644
--- a/substrate/frame/support/test/tests/pallet_ui/hold_reason_not_pub.rs
+++ b/substrate/frame/support/test/tests/pallet_ui/hold_reason_not_pub.rs
@@ -1,3 +1,20 @@
+// 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.
+
 #[frame_support::pallet]
 mod pallet {
 	#[pallet::config]
diff --git a/substrate/frame/support/test/tests/pallet_ui/hold_reason_not_pub.stderr b/substrate/frame/support/test/tests/pallet_ui/hold_reason_not_pub.stderr
index e8b0c14e967dd1f4b31564dae27e1f5d1c2b4dbc..75834ad8b899ea567239e041bb7534252a8981ef 100644
--- a/substrate/frame/support/test/tests/pallet_ui/hold_reason_not_pub.stderr
+++ b/substrate/frame/support/test/tests/pallet_ui/hold_reason_not_pub.stderr
@@ -1,5 +1,5 @@
 error: Invalid pallet::composite_enum, `HoldReason` must be public
-  --> tests/pallet_ui/hold_reason_not_pub.rs:10:5
+  --> tests/pallet_ui/hold_reason_not_pub.rs:27:5
    |
-10 |     enum HoldReason {}
+27 |     enum HoldReason {}
    |     ^^^^
diff --git a/substrate/frame/support/test/tests/pallet_ui/hooks_invalid_item.rs b/substrate/frame/support/test/tests/pallet_ui/hooks_invalid_item.rs
index 7c66b3e6cecc1f45ca75d99afa770e1baaec2e8d..2b317b4b325e628fbd64d75432c13deaf969973c 100644
--- a/substrate/frame/support/test/tests/pallet_ui/hooks_invalid_item.rs
+++ b/substrate/frame/support/test/tests/pallet_ui/hooks_invalid_item.rs
@@ -1,3 +1,20 @@
+// 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.
+
 #[frame_support::pallet]
 mod pallet {
 	use frame_support::pallet_prelude::Hooks;
diff --git a/substrate/frame/support/test/tests/pallet_ui/hooks_invalid_item.stderr b/substrate/frame/support/test/tests/pallet_ui/hooks_invalid_item.stderr
index d0af35197f1d689cf38a455e85cc1f3b18c80dd3..b7327943ee20e66433326e7922a50919c530ef7c 100644
--- a/substrate/frame/support/test/tests/pallet_ui/hooks_invalid_item.stderr
+++ b/substrate/frame/support/test/tests/pallet_ui/hooks_invalid_item.stderr
@@ -1,7 +1,7 @@
 error[E0107]: missing generics for trait `Hooks`
-  --> tests/pallet_ui/hooks_invalid_item.rs:12:18
+  --> tests/pallet_ui/hooks_invalid_item.rs:29:18
    |
-12 |     impl<T: Config> Hooks for Pallet<T> {}
+29 |     impl<T: Config> Hooks for Pallet<T> {}
    |                     ^^^^^ expected 1 generic argument
    |
 note: trait defined here, with 1 generic parameter: `BlockNumber`
@@ -11,5 +11,5 @@ note: trait defined here, with 1 generic parameter: `BlockNumber`
    |           ^^^^^ -----------
 help: add missing generic argument
    |
-12 |     impl<T: Config> Hooks<BlockNumber> for Pallet<T> {}
+29 |     impl<T: Config> Hooks<BlockNumber> for Pallet<T> {}
    |                          +++++++++++++
diff --git a/substrate/frame/support/test/tests/pallet_ui/inconsistent_instance_1.rs b/substrate/frame/support/test/tests/pallet_ui/inconsistent_instance_1.rs
index 00b57a01235c37a851bb7889afb519d9bb2cbefb..4dc3e9bc745b272352efef47168c32b7a8fc9d9b 100644
--- a/substrate/frame/support/test/tests/pallet_ui/inconsistent_instance_1.rs
+++ b/substrate/frame/support/test/tests/pallet_ui/inconsistent_instance_1.rs
@@ -1,3 +1,20 @@
+// 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.
+
 #[frame_support::pallet]
 mod pallet {
 	use frame_support::pallet_prelude::Hooks;
diff --git a/substrate/frame/support/test/tests/pallet_ui/inconsistent_instance_1.stderr b/substrate/frame/support/test/tests/pallet_ui/inconsistent_instance_1.stderr
index 06c7941a0bcb99ddc7512abce6ebf697b0d1f825..89f0be401ab2fbbf1c13326fa8fd00b34534e40a 100644
--- a/substrate/frame/support/test/tests/pallet_ui/inconsistent_instance_1.stderr
+++ b/substrate/frame/support/test/tests/pallet_ui/inconsistent_instance_1.stderr
@@ -1,29 +1,29 @@
 error: Invalid generic declaration, trait is defined with instance but generic use none
-  --> $DIR/inconsistent_instance_1.rs:10:20
+  --> tests/pallet_ui/inconsistent_instance_1.rs:27:20
    |
-10 |     pub struct Pallet<T>(core::marker::PhantomData<T>);
+27 |     pub struct Pallet<T>(core::marker::PhantomData<T>);
    |                       ^
 
 error: Invalid generic declaration, trait is defined with instance but generic use none
-  --> $DIR/inconsistent_instance_1.rs:16:7
+  --> tests/pallet_ui/inconsistent_instance_1.rs:33:7
    |
-16 |     impl<T: Config> Pallet<T> {}
+33 |     impl<T: Config> Pallet<T> {}
    |          ^
 
 error: Invalid generic declaration, trait is defined with instance but generic use none
-  --> $DIR/inconsistent_instance_1.rs:16:18
+  --> tests/pallet_ui/inconsistent_instance_1.rs:33:18
    |
-16 |     impl<T: Config> Pallet<T> {}
+33 |     impl<T: Config> Pallet<T> {}
    |                     ^^^^^^
 
 error: Invalid generic declaration, trait is defined with instance but generic use none
-  --> $DIR/inconsistent_instance_1.rs:13:47
+  --> tests/pallet_ui/inconsistent_instance_1.rs:30:47
    |
-13 |     impl<T: Config> Hooks<BlockNumberFor<T>> for Pallet<T> {}
+30 |     impl<T: Config> Hooks<BlockNumberFor<T>> for Pallet<T> {}
    |                                                  ^^^^^^
 
 error: Invalid generic declaration, trait is defined with instance but generic use none
-  --> $DIR/inconsistent_instance_1.rs:13:7
+  --> tests/pallet_ui/inconsistent_instance_1.rs:30:7
    |
-13 |     impl<T: Config> Hooks<BlockNumberFor<T>> for Pallet<T> {}
+30 |     impl<T: Config> Hooks<BlockNumberFor<T>> for Pallet<T> {}
    |          ^
diff --git a/substrate/frame/support/test/tests/pallet_ui/inconsistent_instance_2.rs b/substrate/frame/support/test/tests/pallet_ui/inconsistent_instance_2.rs
index e7b51cb5ebef51975792de25686f01711ab55ac8..e05ff6cd5ed455de993c4ec9d74a03480c9f0bd8 100644
--- a/substrate/frame/support/test/tests/pallet_ui/inconsistent_instance_2.rs
+++ b/substrate/frame/support/test/tests/pallet_ui/inconsistent_instance_2.rs
@@ -1,3 +1,20 @@
+// 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.
+
 #[frame_support::pallet]
 mod pallet {
 	use frame_support::pallet_prelude::Hooks;
diff --git a/substrate/frame/support/test/tests/pallet_ui/inconsistent_instance_2.stderr b/substrate/frame/support/test/tests/pallet_ui/inconsistent_instance_2.stderr
index 9d61f2976b75a273e0dc11c7c0824e830e354aa9..703f5396b8ae204b9ac292ee3037b9d8c20dd8ee 100644
--- a/substrate/frame/support/test/tests/pallet_ui/inconsistent_instance_2.stderr
+++ b/substrate/frame/support/test/tests/pallet_ui/inconsistent_instance_2.stderr
@@ -1,29 +1,29 @@
 error: Invalid generic declaration, trait is defined without instance but generic use some
-  --> $DIR/inconsistent_instance_2.rs:10:20
+  --> tests/pallet_ui/inconsistent_instance_2.rs:27:20
    |
-10 |     pub struct Pallet<T, I = ()>(core::marker::PhantomData<(T, I)>);
+27 |     pub struct Pallet<T, I = ()>(core::marker::PhantomData<(T, I)>);
    |                       ^
 
 error: Invalid generic declaration, trait is defined without instance but generic use some
-  --> $DIR/inconsistent_instance_2.rs:16:7
+  --> tests/pallet_ui/inconsistent_instance_2.rs:33:7
    |
-16 |     impl<T: Config<I>, I: 'static> Pallet<T, I> {}
+33 |     impl<T: Config<I>, I: 'static> Pallet<T, I> {}
    |          ^
 
 error: Invalid generic declaration, trait is defined without instance but generic use some
-  --> $DIR/inconsistent_instance_2.rs:16:33
+  --> tests/pallet_ui/inconsistent_instance_2.rs:33:33
    |
-16 |     impl<T: Config<I>, I: 'static> Pallet<T, I> {}
+33 |     impl<T: Config<I>, I: 'static> Pallet<T, I> {}
    |                                    ^^^^^^
 
 error: Invalid generic declaration, trait is defined without instance but generic use some
-  --> $DIR/inconsistent_instance_2.rs:13:62
+  --> tests/pallet_ui/inconsistent_instance_2.rs:30:62
    |
-13 |     impl<T: Config<I>, I: 'static> Hooks<BlockNumberFor<T>> for Pallet<T, I> {}
+30 |     impl<T: Config<I>, I: 'static> Hooks<BlockNumberFor<T>> for Pallet<T, I> {}
    |                                                                 ^^^^^^
 
 error: Invalid generic declaration, trait is defined without instance but generic use some
-  --> $DIR/inconsistent_instance_2.rs:13:7
+  --> tests/pallet_ui/inconsistent_instance_2.rs:30:7
    |
-13 |     impl<T: Config<I>, I: 'static> Hooks<BlockNumberFor<T>> for Pallet<T, I> {}
+30 |     impl<T: Config<I>, I: 'static> Hooks<BlockNumberFor<T>> for Pallet<T, I> {}
    |          ^
diff --git a/substrate/frame/support/test/tests/pallet_ui/inherent_check_inner_span.rs b/substrate/frame/support/test/tests/pallet_ui/inherent_check_inner_span.rs
index 9704a7e1a442e19771437906b6ef2a2fbf619bb0..1bb92eaf9e8de2e3c7432298d68cca3c6a4f47d2 100644
--- a/substrate/frame/support/test/tests/pallet_ui/inherent_check_inner_span.rs
+++ b/substrate/frame/support/test/tests/pallet_ui/inherent_check_inner_span.rs
@@ -1,3 +1,20 @@
+// 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.
+
 #[frame_support::pallet]
 mod pallet {
 	use frame_support::pallet_prelude::{Hooks, ProvideInherent};
diff --git a/substrate/frame/support/test/tests/pallet_ui/inherent_check_inner_span.stderr b/substrate/frame/support/test/tests/pallet_ui/inherent_check_inner_span.stderr
index bc34c55241a7649d898be6266e6058f49cc7943a..5ea3be470a068b1468beb754b6b4caeca25d93e4 100644
--- a/substrate/frame/support/test/tests/pallet_ui/inherent_check_inner_span.stderr
+++ b/substrate/frame/support/test/tests/pallet_ui/inherent_check_inner_span.stderr
@@ -1,11 +1,11 @@
 error[E0046]: not all trait items implemented, missing: `Call`, `Error`, `INHERENT_IDENTIFIER`, `create_inherent`, `is_inherent`
-  --> $DIR/inherent_check_inner_span.rs:19:2
+  --> tests/pallet_ui/inherent_check_inner_span.rs:36:2
    |
-19 |     impl<T: Config> ProvideInherent for Pallet<T> {}
+36 |     impl<T: Config> ProvideInherent for Pallet<T> {}
    |     ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ missing `Call`, `Error`, `INHERENT_IDENTIFIER`, `create_inherent`, `is_inherent` in implementation
    |
-   = help: implement the missing item: `type Call = Type;`
-   = help: implement the missing item: `type Error = Type;`
+   = help: implement the missing item: `type Call = /* Type */;`
+   = help: implement the missing item: `type Error = /* Type */;`
    = help: implement the missing item: `const INHERENT_IDENTIFIER: [u8; 8] = value;`
    = help: implement the missing item: `fn create_inherent(_: &InherentData) -> std::option::Option<<Self as ProvideInherent>::Call> { todo!() }`
    = help: implement the missing item: `fn is_inherent(_: &<Self as ProvideInherent>::Call) -> bool { todo!() }`
diff --git a/substrate/frame/support/test/tests/pallet_ui/inherent_invalid_item.rs b/substrate/frame/support/test/tests/pallet_ui/inherent_invalid_item.rs
index 97eda447213074c3012658194f701d869ec351bd..f497ddeb6f0e1b4677474b9467457a4a05f57c0e 100644
--- a/substrate/frame/support/test/tests/pallet_ui/inherent_invalid_item.rs
+++ b/substrate/frame/support/test/tests/pallet_ui/inherent_invalid_item.rs
@@ -1,3 +1,20 @@
+// 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.
+
 #[frame_support::pallet]
 mod pallet {
 	use frame_support::pallet_prelude::Hooks;
diff --git a/substrate/frame/support/test/tests/pallet_ui/inherent_invalid_item.stderr b/substrate/frame/support/test/tests/pallet_ui/inherent_invalid_item.stderr
index b62b1234bdeb01b2c4d6de8b74ddca24544be24d..efafdf8c4f161c5e13e550babb0b5eeffb7342c5 100644
--- a/substrate/frame/support/test/tests/pallet_ui/inherent_invalid_item.stderr
+++ b/substrate/frame/support/test/tests/pallet_ui/inherent_invalid_item.stderr
@@ -1,5 +1,5 @@
 error: Invalid pallet::inherent, expected impl<..> ProvideInherent for Pallet<..>
-  --> $DIR/inherent_invalid_item.rs:19:2
+  --> tests/pallet_ui/inherent_invalid_item.rs:36:2
    |
-19 |     impl Foo {}
+36 |     impl Foo {}
    |     ^^^^
diff --git a/substrate/frame/support/test/tests/pallet_ui/lock_id_duplicate.rs b/substrate/frame/support/test/tests/pallet_ui/lock_id_duplicate.rs
index 70418efc41421a793c79b1a784829159153a70fd..f350b37a49954d3cad66ae43a3cf471c6785ecb3 100644
--- a/substrate/frame/support/test/tests/pallet_ui/lock_id_duplicate.rs
+++ b/substrate/frame/support/test/tests/pallet_ui/lock_id_duplicate.rs
@@ -1,3 +1,20 @@
+// 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.
+
 #[frame_support::pallet]
 mod pallet {
 	#[pallet::config]
diff --git a/substrate/frame/support/test/tests/pallet_ui/lock_id_duplicate.stderr b/substrate/frame/support/test/tests/pallet_ui/lock_id_duplicate.stderr
index 1b7097d0a1095fa9abebe3876d6802f55a9a6804..d298afa341bd44282ef86f02edbec42034ae0f0e 100644
--- a/substrate/frame/support/test/tests/pallet_ui/lock_id_duplicate.stderr
+++ b/substrate/frame/support/test/tests/pallet_ui/lock_id_duplicate.stderr
@@ -1,5 +1,5 @@
 error: Invalid duplicated `LockId` definition
-  --> tests/pallet_ui/lock_id_duplicate.rs:13:14
+  --> tests/pallet_ui/lock_id_duplicate.rs:30:14
    |
-13 |     pub enum LockId {}
+30 |     pub enum LockId {}
    |              ^^^^^^
diff --git a/substrate/frame/support/test/tests/pallet_ui/mod_not_inlined.rs b/substrate/frame/support/test/tests/pallet_ui/mod_not_inlined.rs
index c74c7f5ef2a2b65b98225eace8b5454207fa142b..abe356edd5fb7027f1931b3a1a4a6875b998bf74 100644
--- a/substrate/frame/support/test/tests/pallet_ui/mod_not_inlined.rs
+++ b/substrate/frame/support/test/tests/pallet_ui/mod_not_inlined.rs
@@ -1,3 +1,20 @@
+// 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.
+
 #[frame_support::pallet]
 mod foo;
 
diff --git a/substrate/frame/support/test/tests/pallet_ui/mod_not_inlined.stderr b/substrate/frame/support/test/tests/pallet_ui/mod_not_inlined.stderr
index 9ad93939d8c00f1a956fcd21283d2125a529105e..b9ce5789fd43a93756bf6eaad269613884adf609 100644
--- a/substrate/frame/support/test/tests/pallet_ui/mod_not_inlined.stderr
+++ b/substrate/frame/support/test/tests/pallet_ui/mod_not_inlined.stderr
@@ -1,13 +1,13 @@
 error[E0658]: non-inline modules in proc macro input are unstable
- --> $DIR/mod_not_inlined.rs:2:1
-  |
-2 | mod foo;
-  | ^^^^^^^^
-  |
-  = note: see issue #54727 <https://github.com/rust-lang/rust/issues/54727> for more information
+  --> tests/pallet_ui/mod_not_inlined.rs:19:1
+   |
+19 | mod foo;
+   | ^^^^^^^^
+   |
+   = note: see issue #54727 <https://github.com/rust-lang/rust/issues/54727> for more information
 
 error: Invalid pallet definition, expected mod to be inlined.
- --> $DIR/mod_not_inlined.rs:2:1
-  |
-2 | mod foo;
-  | ^^^
+  --> tests/pallet_ui/mod_not_inlined.rs:19:1
+   |
+19 | mod foo;
+   | ^^^
diff --git a/substrate/frame/support/test/tests/pallet_ui/no_default_bounds_but_missing_with_default.rs b/substrate/frame/support/test/tests/pallet_ui/no_default_bounds_but_missing_with_default.rs
index 123d79141749876ef0bb66b4685ead35b5ad9237..5892940a4cdf8de68c40a5a496795391b8aaac6f 100644
--- a/substrate/frame/support/test/tests/pallet_ui/no_default_bounds_but_missing_with_default.rs
+++ b/substrate/frame/support/test/tests/pallet_ui/no_default_bounds_but_missing_with_default.rs
@@ -1,3 +1,20 @@
+// 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.
+
 #[frame_support::pallet]
 mod pallet {
 	use frame_support::pallet_prelude::*;
diff --git a/substrate/frame/support/test/tests/pallet_ui/no_default_bounds_but_missing_with_default.stderr b/substrate/frame/support/test/tests/pallet_ui/no_default_bounds_but_missing_with_default.stderr
index cbed14bca2cd4a86737608bde1cd9504ff647e9a..6e2bc2a74094b93be114c01f8f56fbcadf7cd85b 100644
--- a/substrate/frame/support/test/tests/pallet_ui/no_default_bounds_but_missing_with_default.stderr
+++ b/substrate/frame/support/test/tests/pallet_ui/no_default_bounds_but_missing_with_default.stderr
@@ -1,5 +1,5 @@
 error: `#[pallet:no_default_bounds]` can only be used if `#[pallet::config(with_default)]` has been specified
- --> tests/pallet_ui/no_default_bounds_but_missing_with_default.rs:9:4
-  |
-9 |         #[pallet::no_default_bounds]
-  |          ^^^^^^^^^^^^^^^^^^^^^^^^^^^
+  --> tests/pallet_ui/no_default_bounds_but_missing_with_default.rs:26:4
+   |
+26 |         #[pallet::no_default_bounds]
+   |          ^^^^^^^^^^^^^^^^^^^^^^^^^^^
diff --git a/substrate/frame/support/test/tests/pallet_ui/no_default_but_missing_with_default.rs b/substrate/frame/support/test/tests/pallet_ui/no_default_but_missing_with_default.rs
index 5ffa13c22243dacd19c7b04f0bebce11364d2d53..292cb367d0961631f71ef2365be259c9a4ef06eb 100644
--- a/substrate/frame/support/test/tests/pallet_ui/no_default_but_missing_with_default.rs
+++ b/substrate/frame/support/test/tests/pallet_ui/no_default_but_missing_with_default.rs
@@ -1,3 +1,20 @@
+// 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.
+
 #[frame_support::pallet]
 mod pallet {
 	use frame_support::pallet_prelude::*;
diff --git a/substrate/frame/support/test/tests/pallet_ui/no_default_but_missing_with_default.stderr b/substrate/frame/support/test/tests/pallet_ui/no_default_but_missing_with_default.stderr
index aebde115eb80e14551da03546ea91506ec20e60d..e8df28a3046f23289bb50499d3b334028ac9bcc3 100644
--- a/substrate/frame/support/test/tests/pallet_ui/no_default_but_missing_with_default.stderr
+++ b/substrate/frame/support/test/tests/pallet_ui/no_default_but_missing_with_default.stderr
@@ -1,5 +1,5 @@
 error: `#[pallet:no_default]` can only be used if `#[pallet::config(with_default)]` has been specified
- --> tests/pallet_ui/no_default_but_missing_with_default.rs:9:4
-  |
-9 |         #[pallet::no_default]
-  |          ^^^^^^^^^^^^^^^^^^^^
+  --> tests/pallet_ui/no_default_but_missing_with_default.rs:26:4
+   |
+26 |         #[pallet::no_default]
+   |          ^^^^^^^^^^^^^^^^^^^^
diff --git a/substrate/frame/support/test/tests/pallet_ui/non_dev_mode_storage_map_explicit_key_default_hasher.rs b/substrate/frame/support/test/tests/pallet_ui/non_dev_mode_storage_map_explicit_key_default_hasher.rs
index 7d8be8ec0017456bd0c9a75c455e50314907ec30..37ad00e0fdd7275a00f2af840bad08f8d02cd75b 100644
--- a/substrate/frame/support/test/tests/pallet_ui/non_dev_mode_storage_map_explicit_key_default_hasher.rs
+++ b/substrate/frame/support/test/tests/pallet_ui/non_dev_mode_storage_map_explicit_key_default_hasher.rs
@@ -1,3 +1,20 @@
+// 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.
+
 #![cfg_attr(not(feature = "std"), no_std)]
 
 pub use pallet::*;
diff --git a/substrate/frame/support/test/tests/pallet_ui/non_dev_mode_storage_map_explicit_key_default_hasher.stderr b/substrate/frame/support/test/tests/pallet_ui/non_dev_mode_storage_map_explicit_key_default_hasher.stderr
index 68751470a3e2fcb7f5b817bdf5e87e54f9d9b229..6cb3ac9e945b2c4db7fede73435786dc742c6ddc 100644
--- a/substrate/frame/support/test/tests/pallet_ui/non_dev_mode_storage_map_explicit_key_default_hasher.stderr
+++ b/substrate/frame/support/test/tests/pallet_ui/non_dev_mode_storage_map_explicit_key_default_hasher.stderr
@@ -1,11 +1,11 @@
 error: Invalid pallet::storage, cannot find `Hasher` generic, required for `StorageMap`.
-  --> tests/pallet_ui/non_dev_mode_storage_map_explicit_key_default_hasher.rs:21:43
+  --> tests/pallet_ui/non_dev_mode_storage_map_explicit_key_default_hasher.rs:38:43
    |
-21 |     type MyStorageMap<T: Config> = StorageMap<Key = u32, Value = u64>;
+38 |     type MyStorageMap<T: Config> = StorageMap<Key = u32, Value = u64>;
    |                                              ^
 
 error[E0432]: unresolved import `pallet`
- --> tests/pallet_ui/non_dev_mode_storage_map_explicit_key_default_hasher.rs:3:9
-  |
-3 | pub use pallet::*;
-  |         ^^^^^^ help: a similar path exists: `test_pallet::pallet`
+  --> tests/pallet_ui/non_dev_mode_storage_map_explicit_key_default_hasher.rs:20:9
+   |
+20 | pub use pallet::*;
+   |         ^^^^^^ help: a similar path exists: `test_pallet::pallet`
diff --git a/substrate/frame/support/test/tests/pallet_ui/pallet_doc_arg_non_path.rs b/substrate/frame/support/test/tests/pallet_ui/pallet_doc_arg_non_path.rs
index 32df5d61836530c86c72440410fc992d203f56cb..f2fe8de464bd31d4e7cd38be40a222d8b7c59b8f 100644
--- a/substrate/frame/support/test/tests/pallet_ui/pallet_doc_arg_non_path.rs
+++ b/substrate/frame/support/test/tests/pallet_ui/pallet_doc_arg_non_path.rs
@@ -1,3 +1,20 @@
+// 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.
+
 #[frame_support::pallet]
 // Must receive a string literal pointing to a path
 #[pallet_doc(X)]
diff --git a/substrate/frame/support/test/tests/pallet_ui/pallet_doc_arg_non_path.stderr b/substrate/frame/support/test/tests/pallet_ui/pallet_doc_arg_non_path.stderr
index 9a1249dd36f37aaf2becc67c07c8826ac60bd29e..a630380b5946f1fd44608efe93f621e4ff313067 100644
--- a/substrate/frame/support/test/tests/pallet_ui/pallet_doc_arg_non_path.stderr
+++ b/substrate/frame/support/test/tests/pallet_ui/pallet_doc_arg_non_path.stderr
@@ -1,5 +1,5 @@
 error: The `pallet_doc` received an unsupported argument. Supported format: `pallet_doc("PATH")`
- --> tests/pallet_ui/pallet_doc_arg_non_path.rs:3:1
-  |
-3 | #[pallet_doc(X)]
-  | ^
+  --> tests/pallet_ui/pallet_doc_arg_non_path.rs:20:1
+   |
+20 | #[pallet_doc(X)]
+   | ^
diff --git a/substrate/frame/support/test/tests/pallet_ui/pallet_doc_empty.rs b/substrate/frame/support/test/tests/pallet_ui/pallet_doc_empty.rs
index 6ff01e9fb44b83922f3f07e1cc212ae45d47dfd9..e3a3679fb4ee11c27d776e1baf4776654a5d857a 100644
--- a/substrate/frame/support/test/tests/pallet_ui/pallet_doc_empty.rs
+++ b/substrate/frame/support/test/tests/pallet_ui/pallet_doc_empty.rs
@@ -1,3 +1,20 @@
+// 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.
+
 #[frame_support::pallet]
 // Expected one argument for the doc path.
 #[pallet_doc]
diff --git a/substrate/frame/support/test/tests/pallet_ui/pallet_doc_empty.stderr b/substrate/frame/support/test/tests/pallet_ui/pallet_doc_empty.stderr
index a220cbe9e99902790bf2974af2cd1fc3047e2834..0ef0ea9cc72c7c9362e2b26f2daede254ffef0aa 100644
--- a/substrate/frame/support/test/tests/pallet_ui/pallet_doc_empty.stderr
+++ b/substrate/frame/support/test/tests/pallet_ui/pallet_doc_empty.stderr
@@ -1,5 +1,5 @@
 error: The `pallet_doc` received an unsupported argument. Supported format: `pallet_doc("PATH")`
- --> tests/pallet_ui/pallet_doc_empty.rs:3:1
-  |
-3 | #[pallet_doc]
-  | ^
+  --> tests/pallet_ui/pallet_doc_empty.rs:20:1
+   |
+20 | #[pallet_doc]
+   | ^
diff --git a/substrate/frame/support/test/tests/pallet_ui/pallet_doc_invalid_arg.rs b/substrate/frame/support/test/tests/pallet_ui/pallet_doc_invalid_arg.rs
index c7d3b556a08e2a229e4638f4ea0f1293076cd7ce..54c5336f78933cff64baac94631b4fb3ec975264 100644
--- a/substrate/frame/support/test/tests/pallet_ui/pallet_doc_invalid_arg.rs
+++ b/substrate/frame/support/test/tests/pallet_ui/pallet_doc_invalid_arg.rs
@@ -1,3 +1,20 @@
+// 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.
+
 #[frame_support::pallet]
 // Argument expected as list, not named value.
 #[pallet_doc = "invalid"]
diff --git a/substrate/frame/support/test/tests/pallet_ui/pallet_doc_invalid_arg.stderr b/substrate/frame/support/test/tests/pallet_ui/pallet_doc_invalid_arg.stderr
index bee7c708507d229c7866ba1d2d04216e6c44ff67..8a948b1b59ddbc91d686128d7f6907e556b3db58 100644
--- a/substrate/frame/support/test/tests/pallet_ui/pallet_doc_invalid_arg.stderr
+++ b/substrate/frame/support/test/tests/pallet_ui/pallet_doc_invalid_arg.stderr
@@ -1,5 +1,5 @@
 error: The `pallet_doc` received an unsupported argument. Supported format: `pallet_doc("PATH")`
- --> tests/pallet_ui/pallet_doc_invalid_arg.rs:3:1
-  |
-3 | #[pallet_doc = "invalid"]
-  | ^
+  --> tests/pallet_ui/pallet_doc_invalid_arg.rs:20:1
+   |
+20 | #[pallet_doc = "invalid"]
+   | ^
diff --git a/substrate/frame/support/test/tests/pallet_ui/pallet_doc_multiple_args.rs b/substrate/frame/support/test/tests/pallet_ui/pallet_doc_multiple_args.rs
index a799879fe4442fadda19bddf008102b32679ba5c..4342cdf39dd9d5251e0c6f93f2879fd86913a273 100644
--- a/substrate/frame/support/test/tests/pallet_ui/pallet_doc_multiple_args.rs
+++ b/substrate/frame/support/test/tests/pallet_ui/pallet_doc_multiple_args.rs
@@ -1,3 +1,20 @@
+// 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.
+
 #[frame_support::pallet]
 // Supports only one argument.
 #[pallet_doc("A", "B")]
diff --git a/substrate/frame/support/test/tests/pallet_ui/pallet_doc_multiple_args.stderr b/substrate/frame/support/test/tests/pallet_ui/pallet_doc_multiple_args.stderr
index e769555438e13bd0d5fabf3f7edf369054fb0862..c3e05b38bbee6f792a7f2d8bd703962234fe59f0 100644
--- a/substrate/frame/support/test/tests/pallet_ui/pallet_doc_multiple_args.stderr
+++ b/substrate/frame/support/test/tests/pallet_ui/pallet_doc_multiple_args.stderr
@@ -1,5 +1,5 @@
 error: The `pallet_doc` received an unsupported argument. Supported format: `pallet_doc("PATH")`
- --> tests/pallet_ui/pallet_doc_multiple_args.rs:3:1
-  |
-3 | #[pallet_doc("A", "B")]
-  | ^
+  --> tests/pallet_ui/pallet_doc_multiple_args.rs:20:1
+   |
+20 | #[pallet_doc("A", "B")]
+   | ^
diff --git a/substrate/frame/support/test/tests/pallet_ui/pallet_invalid_arg.rs b/substrate/frame/support/test/tests/pallet_ui/pallet_invalid_arg.rs
index 1fc42f6511cfaf27fbf9d51f01fb3d8c9a7851e6..003b2479f1c5891f774e0ce15f550520a7facb91 100644
--- a/substrate/frame/support/test/tests/pallet_ui/pallet_invalid_arg.rs
+++ b/substrate/frame/support/test/tests/pallet_ui/pallet_invalid_arg.rs
@@ -1,3 +1,20 @@
+// 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.
+
 #[frame_support::pallet(foo)]
 pub mod pallet {}
 
diff --git a/substrate/frame/support/test/tests/pallet_ui/pallet_invalid_arg.stderr b/substrate/frame/support/test/tests/pallet_ui/pallet_invalid_arg.stderr
index 234dc07f2ece33c9423f282a9f8e2bf44e8a98e6..8736890f11744018c369787b3cc183d694adab79 100644
--- a/substrate/frame/support/test/tests/pallet_ui/pallet_invalid_arg.stderr
+++ b/substrate/frame/support/test/tests/pallet_ui/pallet_invalid_arg.stderr
@@ -1,5 +1,5 @@
 error: Invalid pallet macro call: unexpected attribute. Macro call must be bare, such as `#[frame_support::pallet]` or `#[pallet]`, or must specify the `dev_mode` attribute, such as `#[frame_support::pallet(dev_mode)]` or #[pallet(dev_mode)].
- --> tests/pallet_ui/pallet_invalid_arg.rs:1:25
-  |
-1 | #[frame_support::pallet(foo)]
-  |                         ^^^
+  --> tests/pallet_ui/pallet_invalid_arg.rs:18:25
+   |
+18 | #[frame_support::pallet(foo)]
+   |                         ^^^
diff --git a/substrate/frame/support/test/tests/pallet_ui/pallet_struct_invalid_attr.rs b/substrate/frame/support/test/tests/pallet_ui/pallet_struct_invalid_attr.rs
index ac52e75a5f48900e49e62b7d9f6e3175fcb0426b..3d6a5c0b0a5965ff61c5a15ac37a5b9376083c98 100644
--- a/substrate/frame/support/test/tests/pallet_ui/pallet_struct_invalid_attr.rs
+++ b/substrate/frame/support/test/tests/pallet_ui/pallet_struct_invalid_attr.rs
@@ -1,3 +1,20 @@
+// 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.
+
 #[frame_support::pallet]
 mod pallet {
 	#[pallet::config]
diff --git a/substrate/frame/support/test/tests/pallet_ui/pallet_struct_invalid_attr.stderr b/substrate/frame/support/test/tests/pallet_ui/pallet_struct_invalid_attr.stderr
index 301a73c000f079211da38d5a9ac7bdc0ace40c00..33a2d1da78608c7d97e433d03c403cf4559a79b9 100644
--- a/substrate/frame/support/test/tests/pallet_ui/pallet_struct_invalid_attr.stderr
+++ b/substrate/frame/support/test/tests/pallet_ui/pallet_struct_invalid_attr.stderr
@@ -1,5 +1,5 @@
 error: expected one of: `generate_store`, `without_storage_info`, `storage_version`
- --> tests/pallet_ui/pallet_struct_invalid_attr.rs:7:12
-  |
-7 |     #[pallet::generate_storage_info] // invalid
-  |               ^^^^^^^^^^^^^^^^^^^^^
+  --> tests/pallet_ui/pallet_struct_invalid_attr.rs:24:12
+   |
+24 |     #[pallet::generate_storage_info] // invalid
+   |               ^^^^^^^^^^^^^^^^^^^^^
diff --git a/substrate/frame/support/test/tests/pallet_ui/pass/default_config.rs b/substrate/frame/support/test/tests/pallet_ui/pass/default_config.rs
index 9f90ae67d5779a55464bf1169201b9b23f6e9546..f169ee34c9ab5542071b11c48fa101e1c16e2e95 100644
--- a/substrate/frame/support/test/tests/pallet_ui/pass/default_config.rs
+++ b/substrate/frame/support/test/tests/pallet_ui/pass/default_config.rs
@@ -1,3 +1,20 @@
+// 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.
+
 #[frame_support::pallet]
 mod pallet {
 	use frame_support::pallet_prelude::*;
diff --git a/substrate/frame/support/test/tests/pallet_ui/pass/dev_mode_valid.rs b/substrate/frame/support/test/tests/pallet_ui/pass/dev_mode_valid.rs
index ed779da80a1881d024fd34b87f50ec272b4ad298..bf26cfd95b19f861ace29855799925eb725c6aba 100644
--- a/substrate/frame/support/test/tests/pallet_ui/pass/dev_mode_valid.rs
+++ b/substrate/frame/support/test/tests/pallet_ui/pass/dev_mode_valid.rs
@@ -1,3 +1,20 @@
+// 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.
+
 #![cfg_attr(not(feature = "std"), no_std)]
 
 use frame_support::traits::ConstU32;
diff --git a/substrate/frame/support/test/tests/pallet_ui/pass/error_nested_types.rs b/substrate/frame/support/test/tests/pallet_ui/pass/error_nested_types.rs
index 1b6f584af23b9c9c84f425735e53a60fa94b3f57..2e0df1ac398af57a3c1b44fe28175d36ab4d496e 100644
--- a/substrate/frame/support/test/tests/pallet_ui/pass/error_nested_types.rs
+++ b/substrate/frame/support/test/tests/pallet_ui/pass/error_nested_types.rs
@@ -1,3 +1,20 @@
+// 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.
+
 use codec::{Decode, Encode};
 use frame_support::PalletError;
 
diff --git a/substrate/frame/support/test/tests/pallet_ui/pass/event_type_bound_system_config_assoc_type.rs b/substrate/frame/support/test/tests/pallet_ui/pass/event_type_bound_system_config_assoc_type.rs
new file mode 100644
index 0000000000000000000000000000000000000000..0a70c4a5e68a8f67fa17f09fda2d11eb6e557efc
--- /dev/null
+++ b/substrate/frame/support/test/tests/pallet_ui/pass/event_type_bound_system_config_assoc_type.rs
@@ -0,0 +1,44 @@
+// 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.
+
+#[frame_support::pallet]
+mod pallet {
+	use frame_support::pallet_prelude::{Hooks, IsType};
+	use frame_system::pallet_prelude::BlockNumberFor;
+
+	#[pallet::config]
+	pub trait Config: frame_system::Config<Hash = sp_core::H256> {
+		type Bar: Clone + std::fmt::Debug + Eq;
+		type RuntimeEvent: IsType<<Self as frame_system::Config>::RuntimeEvent> + From<Event<Self>>;
+	}
+
+	#[pallet::pallet]
+	pub struct Pallet<T>(core::marker::PhantomData<T>);
+
+	#[pallet::hooks]
+	impl<T: Config> Hooks<BlockNumberFor<T>> for Pallet<T> {}
+
+	#[pallet::call]
+	impl<T: Config> Pallet<T> {}
+
+	#[pallet::event]
+	pub enum Event<T: Config> {
+		B { b: T::Bar },
+	}
+}
+
+fn main() {}
diff --git a/substrate/frame/support/test/tests/pallet_ui/pass/inherited_call_weight.rs b/substrate/frame/support/test/tests/pallet_ui/pass/inherited_call_weight.rs
index 355a1c978df06d2783e0ce78cf2da37957122495..fdb9d8c401d1d3ffec38c1393b147b88b4acf2ac 100644
--- a/substrate/frame/support/test/tests/pallet_ui/pass/inherited_call_weight.rs
+++ b/substrate/frame/support/test/tests/pallet_ui/pass/inherited_call_weight.rs
@@ -1,3 +1,20 @@
+// 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.
+
 use frame_support::pallet_prelude::*;
 use frame_system::pallet_prelude::*;
 
diff --git a/substrate/frame/support/test/tests/pallet_ui/pass/inherited_call_weight2.rs b/substrate/frame/support/test/tests/pallet_ui/pass/inherited_call_weight2.rs
index ae70c295d8db24da7768a4c8295b74181c8ff460..208c719cdfc81d90c9fa7f56626e7f96adff0f79 100644
--- a/substrate/frame/support/test/tests/pallet_ui/pass/inherited_call_weight2.rs
+++ b/substrate/frame/support/test/tests/pallet_ui/pass/inherited_call_weight2.rs
@@ -1,3 +1,20 @@
+// 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.
+
 use frame_support::pallet_prelude::*;
 use frame_system::pallet_prelude::*;
 
diff --git a/substrate/frame/support/test/tests/pallet_ui/pass/inherited_call_weight3.rs b/substrate/frame/support/test/tests/pallet_ui/pass/inherited_call_weight3.rs
index 567fd2e5fa032f51734b4931c467faedafd26b7b..f40d1040858f5ba47c2ffb5817a02a1035b3a87b 100644
--- a/substrate/frame/support/test/tests/pallet_ui/pass/inherited_call_weight3.rs
+++ b/substrate/frame/support/test/tests/pallet_ui/pass/inherited_call_weight3.rs
@@ -1,3 +1,20 @@
+// 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.
+
 use frame_support::pallet_prelude::*;
 use frame_system::pallet_prelude::*;
 
diff --git a/substrate/frame/support/test/tests/pallet_ui/pass/inherited_call_weight_dev_mode.rs b/substrate/frame/support/test/tests/pallet_ui/pass/inherited_call_weight_dev_mode.rs
index 04ce49ee71e99fa72623c5e2052a243e37f86d2a..a78c9d8f36ebf4a506e2d45404adf7a81c340a23 100644
--- a/substrate/frame/support/test/tests/pallet_ui/pass/inherited_call_weight_dev_mode.rs
+++ b/substrate/frame/support/test/tests/pallet_ui/pass/inherited_call_weight_dev_mode.rs
@@ -1,3 +1,20 @@
+// 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.
+
 use frame_support::pallet_prelude::*;
 use frame_system::pallet_prelude::*;
 
diff --git a/substrate/frame/support/test/tests/pallet_ui/pass/no_std_genesis_config.rs b/substrate/frame/support/test/tests/pallet_ui/pass/no_std_genesis_config.rs
index 87659a0bab5136ceff1c812f62991e8fa35abd65..9ab486c718c413761f23242a2ea09fa08443255e 100644
--- a/substrate/frame/support/test/tests/pallet_ui/pass/no_std_genesis_config.rs
+++ b/substrate/frame/support/test/tests/pallet_ui/pass/no_std_genesis_config.rs
@@ -1,3 +1,20 @@
+// 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.
+
 use frame_support::construct_runtime;
 use sp_core::sr25519;
 use sp_runtime::{generic, traits::BlakeTwo256};
diff --git a/substrate/frame/support/test/tests/pallet_ui/pass/trait_constant_valid_bounds.rs b/substrate/frame/support/test/tests/pallet_ui/pass/trait_constant_valid_bounds.rs
index 71eb4f2992b39debd98ff43f0e59f28e2fd40295..83b323e3abafdaac013b232deb75e60834570abb 100644
--- a/substrate/frame/support/test/tests/pallet_ui/pass/trait_constant_valid_bounds.rs
+++ b/substrate/frame/support/test/tests/pallet_ui/pass/trait_constant_valid_bounds.rs
@@ -1,3 +1,20 @@
+// 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.
+
 #[frame_support::pallet]
 mod pallet {
 	use frame_support::pallet_prelude::*;
diff --git a/substrate/frame/support/test/tests/pallet_ui/pass/where_clause_missing_hooks.rs b/substrate/frame/support/test/tests/pallet_ui/pass/where_clause_missing_hooks.rs
index 15fff372a1dd13ffac6e3c4bf72c2354a7e0e898..560ebbb8687081bec65b52473a6508fa210dfb58 100644
--- a/substrate/frame/support/test/tests/pallet_ui/pass/where_clause_missing_hooks.rs
+++ b/substrate/frame/support/test/tests/pallet_ui/pass/where_clause_missing_hooks.rs
@@ -1,3 +1,20 @@
+// 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.
+
 #[frame_support::pallet]
 mod pallet {
 	#[pallet::config]
diff --git a/substrate/frame/support/test/tests/pallet_ui/storage_ensure_span_are_ok_on_wrong_gen.rs b/substrate/frame/support/test/tests/pallet_ui/storage_ensure_span_are_ok_on_wrong_gen.rs
index fe4682c401fa047d98fe63495eb60e406533bea4..b767d6b60dfa19c49092ee640bc565c3ed0fb9b2 100644
--- a/substrate/frame/support/test/tests/pallet_ui/storage_ensure_span_are_ok_on_wrong_gen.rs
+++ b/substrate/frame/support/test/tests/pallet_ui/storage_ensure_span_are_ok_on_wrong_gen.rs
@@ -1,3 +1,20 @@
+// 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.
+
 #[frame_support::pallet]
 mod pallet {
 	use frame_support::pallet_prelude::{Hooks, StorageValue};
diff --git a/substrate/frame/support/test/tests/pallet_ui/storage_ensure_span_are_ok_on_wrong_gen.stderr b/substrate/frame/support/test/tests/pallet_ui/storage_ensure_span_are_ok_on_wrong_gen.stderr
index bc6d98b8da84d056bfaa09cb23cf5d6827d33f4f..930af1d7fcb30af6f9dd4fa158fe760bea78082e 100644
--- a/substrate/frame/support/test/tests/pallet_ui/storage_ensure_span_are_ok_on_wrong_gen.stderr
+++ b/substrate/frame/support/test/tests/pallet_ui/storage_ensure_span_are_ok_on_wrong_gen.stderr
@@ -1,53 +1,53 @@
 error[E0277]: the trait bound `Bar: WrapperTypeDecode` is not satisfied
-  --> tests/pallet_ui/storage_ensure_span_are_ok_on_wrong_gen.rs:10:12
+  --> tests/pallet_ui/storage_ensure_span_are_ok_on_wrong_gen.rs:27:12
    |
-10 |     #[pallet::without_storage_info]
+27 |     #[pallet::without_storage_info]
    |               ^^^^^^^^^^^^^^^^^^^^ the trait `WrapperTypeDecode` is not implemented for `Bar`
    |
    = help: the following other types implement trait `WrapperTypeDecode`:
-             Arc<T>
              Box<T>
-             Rc<T>
              frame_support::sp_runtime::sp_application_crypto::sp_core::Bytes
+             Rc<T>
+             Arc<T>
    = note: required for `Bar` to implement `Decode`
    = note: required for `Bar` to implement `FullCodec`
    = note: required for `frame_support::pallet_prelude::StorageValue<_GeneratedPrefixForStorageFoo<T>, Bar>` to implement `PartialStorageInfoTrait`
 
 error[E0277]: the trait bound `Bar: EncodeLike` is not satisfied
-  --> tests/pallet_ui/storage_ensure_span_are_ok_on_wrong_gen.rs:10:12
+  --> tests/pallet_ui/storage_ensure_span_are_ok_on_wrong_gen.rs:27:12
    |
-10 |     #[pallet::without_storage_info]
+27 |     #[pallet::without_storage_info]
    |               ^^^^^^^^^^^^^^^^^^^^ the trait `EncodeLike` is not implemented for `Bar`
    |
    = help: the following other types implement trait `EncodeLike<T>`:
-             <&&T as EncodeLike<T>>
-             <&T as EncodeLike<T>>
-             <&T as EncodeLike>
-             <&[(K, V)] as EncodeLike<BTreeMap<LikeK, LikeV>>>
-             <&[(T,)] as EncodeLike<BTreeSet<LikeT>>>
-             <&[(T,)] as EncodeLike<BinaryHeap<LikeT>>>
-             <&[(T,)] as EncodeLike<LinkedList<LikeT>>>
-             <&[T] as EncodeLike<Vec<U>>>
+             <bool as EncodeLike>
+             <i8 as EncodeLike>
+             <i16 as EncodeLike>
+             <i32 as EncodeLike>
+             <i64 as EncodeLike>
+             <i128 as EncodeLike>
+             <u8 as EncodeLike>
+             <u16 as EncodeLike>
            and $N others
    = note: required for `Bar` to implement `FullEncode`
    = note: required for `Bar` to implement `FullCodec`
    = note: required for `frame_support::pallet_prelude::StorageValue<_GeneratedPrefixForStorageFoo<T>, Bar>` to implement `PartialStorageInfoTrait`
 
 error[E0277]: the trait bound `Bar: WrapperTypeEncode` is not satisfied
-  --> tests/pallet_ui/storage_ensure_span_are_ok_on_wrong_gen.rs:10:12
+  --> tests/pallet_ui/storage_ensure_span_are_ok_on_wrong_gen.rs:27:12
    |
-10 |     #[pallet::without_storage_info]
+27 |     #[pallet::without_storage_info]
    |               ^^^^^^^^^^^^^^^^^^^^ the trait `WrapperTypeEncode` is not implemented for `Bar`
    |
    = help: the following other types implement trait `WrapperTypeEncode`:
-             &T
-             &mut T
-             Arc<T>
              Box<T>
+             bytes::bytes::Bytes
              Cow<'a, T>
+             parity_scale_codec::Ref<'a, T, U>
+             frame_support::sp_runtime::sp_application_crypto::sp_core::Bytes
              Rc<T>
+             Arc<T>
              Vec<T>
-             bytes::bytes::Bytes
            and $N others
    = note: required for `Bar` to implement `Encode`
    = note: required for `Bar` to implement `FullEncode`
@@ -55,74 +55,74 @@ error[E0277]: the trait bound `Bar: WrapperTypeEncode` is not satisfied
    = note: required for `frame_support::pallet_prelude::StorageValue<_GeneratedPrefixForStorageFoo<T>, Bar>` to implement `PartialStorageInfoTrait`
 
 error[E0277]: the trait bound `Bar: TypeInfo` is not satisfied
-  --> tests/pallet_ui/storage_ensure_span_are_ok_on_wrong_gen.rs:21:12
+  --> tests/pallet_ui/storage_ensure_span_are_ok_on_wrong_gen.rs:38:12
    |
-21 |     #[pallet::storage]
+38 |     #[pallet::storage]
    |               ^^^^^^^ the trait `TypeInfo` is not implemented for `Bar`
    |
    = help: the following other types implement trait `TypeInfo`:
-             &T
-             &mut T
-             ()
-             (A, B)
-             (A, B, C)
-             (A, B, C, D)
-             (A, B, C, D, E)
-             (A, B, C, D, E, F)
+             bool
+             char
+             i8
+             i16
+             i32
+             i64
+             i128
+             u8
            and $N others
    = note: required for `Bar` to implement `StaticTypeInfo`
    = note: required for `frame_support::pallet_prelude::StorageValue<_GeneratedPrefixForStorageFoo<T>, Bar>` to implement `StorageEntryMetadataBuilder`
 
 error[E0277]: the trait bound `Bar: WrapperTypeDecode` is not satisfied
-  --> tests/pallet_ui/storage_ensure_span_are_ok_on_wrong_gen.rs:21:12
+  --> tests/pallet_ui/storage_ensure_span_are_ok_on_wrong_gen.rs:38:12
    |
-21 |     #[pallet::storage]
+38 |     #[pallet::storage]
    |               ^^^^^^^ the trait `WrapperTypeDecode` is not implemented for `Bar`
    |
    = help: the following other types implement trait `WrapperTypeDecode`:
-             Arc<T>
              Box<T>
-             Rc<T>
              frame_support::sp_runtime::sp_application_crypto::sp_core::Bytes
+             Rc<T>
+             Arc<T>
    = note: required for `Bar` to implement `Decode`
    = note: required for `Bar` to implement `FullCodec`
    = note: required for `frame_support::pallet_prelude::StorageValue<_GeneratedPrefixForStorageFoo<T>, Bar>` to implement `StorageEntryMetadataBuilder`
 
 error[E0277]: the trait bound `Bar: EncodeLike` is not satisfied
-  --> tests/pallet_ui/storage_ensure_span_are_ok_on_wrong_gen.rs:21:12
+  --> tests/pallet_ui/storage_ensure_span_are_ok_on_wrong_gen.rs:38:12
    |
-21 |     #[pallet::storage]
+38 |     #[pallet::storage]
    |               ^^^^^^^ the trait `EncodeLike` is not implemented for `Bar`
    |
    = help: the following other types implement trait `EncodeLike<T>`:
-             <&&T as EncodeLike<T>>
-             <&T as EncodeLike<T>>
-             <&T as EncodeLike>
-             <&[(K, V)] as EncodeLike<BTreeMap<LikeK, LikeV>>>
-             <&[(T,)] as EncodeLike<BTreeSet<LikeT>>>
-             <&[(T,)] as EncodeLike<BinaryHeap<LikeT>>>
-             <&[(T,)] as EncodeLike<LinkedList<LikeT>>>
-             <&[T] as EncodeLike<Vec<U>>>
+             <bool as EncodeLike>
+             <i8 as EncodeLike>
+             <i16 as EncodeLike>
+             <i32 as EncodeLike>
+             <i64 as EncodeLike>
+             <i128 as EncodeLike>
+             <u8 as EncodeLike>
+             <u16 as EncodeLike>
            and $N others
    = note: required for `Bar` to implement `FullEncode`
    = note: required for `Bar` to implement `FullCodec`
    = note: required for `frame_support::pallet_prelude::StorageValue<_GeneratedPrefixForStorageFoo<T>, Bar>` to implement `StorageEntryMetadataBuilder`
 
 error[E0277]: the trait bound `Bar: WrapperTypeEncode` is not satisfied
-  --> tests/pallet_ui/storage_ensure_span_are_ok_on_wrong_gen.rs:21:12
+  --> tests/pallet_ui/storage_ensure_span_are_ok_on_wrong_gen.rs:38:12
    |
-21 |     #[pallet::storage]
+38 |     #[pallet::storage]
    |               ^^^^^^^ the trait `WrapperTypeEncode` is not implemented for `Bar`
    |
    = help: the following other types implement trait `WrapperTypeEncode`:
-             &T
-             &mut T
-             Arc<T>
              Box<T>
+             bytes::bytes::Bytes
              Cow<'a, T>
+             parity_scale_codec::Ref<'a, T, U>
+             frame_support::sp_runtime::sp_application_crypto::sp_core::Bytes
              Rc<T>
+             Arc<T>
              Vec<T>
-             bytes::bytes::Bytes
            and $N others
    = note: required for `Bar` to implement `Encode`
    = note: required for `Bar` to implement `FullEncode`
diff --git a/substrate/frame/support/test/tests/pallet_ui/storage_ensure_span_are_ok_on_wrong_gen_unnamed.rs b/substrate/frame/support/test/tests/pallet_ui/storage_ensure_span_are_ok_on_wrong_gen_unnamed.rs
index 82512a89fb15aa7556e38622e5a79fcce84e2314..6c53bc5dc6a0d34d5768e880fcfa45ba0bd5ef11 100644
--- a/substrate/frame/support/test/tests/pallet_ui/storage_ensure_span_are_ok_on_wrong_gen_unnamed.rs
+++ b/substrate/frame/support/test/tests/pallet_ui/storage_ensure_span_are_ok_on_wrong_gen_unnamed.rs
@@ -1,3 +1,20 @@
+// 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.
+
 #[frame_support::pallet]
 mod pallet {
 	use frame_support::pallet_prelude::{Hooks, StorageValue};
diff --git a/substrate/frame/support/test/tests/pallet_ui/storage_ensure_span_are_ok_on_wrong_gen_unnamed.stderr b/substrate/frame/support/test/tests/pallet_ui/storage_ensure_span_are_ok_on_wrong_gen_unnamed.stderr
index 1c010d662d07aa34b81fca9cd54eeeaef6f953b3..79798963c8b1a5f4d44a18e6aeba93156641458d 100644
--- a/substrate/frame/support/test/tests/pallet_ui/storage_ensure_span_are_ok_on_wrong_gen_unnamed.stderr
+++ b/substrate/frame/support/test/tests/pallet_ui/storage_ensure_span_are_ok_on_wrong_gen_unnamed.stderr
@@ -1,53 +1,53 @@
 error[E0277]: the trait bound `Bar: WrapperTypeDecode` is not satisfied
-  --> tests/pallet_ui/storage_ensure_span_are_ok_on_wrong_gen_unnamed.rs:10:12
+  --> tests/pallet_ui/storage_ensure_span_are_ok_on_wrong_gen_unnamed.rs:27:12
    |
-10 |     #[pallet::without_storage_info]
+27 |     #[pallet::without_storage_info]
    |               ^^^^^^^^^^^^^^^^^^^^ the trait `WrapperTypeDecode` is not implemented for `Bar`
    |
    = help: the following other types implement trait `WrapperTypeDecode`:
-             Arc<T>
              Box<T>
-             Rc<T>
              frame_support::sp_runtime::sp_application_crypto::sp_core::Bytes
+             Rc<T>
+             Arc<T>
    = note: required for `Bar` to implement `Decode`
    = note: required for `Bar` to implement `FullCodec`
    = note: required for `frame_support::pallet_prelude::StorageValue<_GeneratedPrefixForStorageFoo<T>, Bar>` to implement `PartialStorageInfoTrait`
 
 error[E0277]: the trait bound `Bar: EncodeLike` is not satisfied
-  --> tests/pallet_ui/storage_ensure_span_are_ok_on_wrong_gen_unnamed.rs:10:12
+  --> tests/pallet_ui/storage_ensure_span_are_ok_on_wrong_gen_unnamed.rs:27:12
    |
-10 |     #[pallet::without_storage_info]
+27 |     #[pallet::without_storage_info]
    |               ^^^^^^^^^^^^^^^^^^^^ the trait `EncodeLike` is not implemented for `Bar`
    |
    = help: the following other types implement trait `EncodeLike<T>`:
-             <&&T as EncodeLike<T>>
-             <&T as EncodeLike<T>>
-             <&T as EncodeLike>
-             <&[(K, V)] as EncodeLike<BTreeMap<LikeK, LikeV>>>
-             <&[(T,)] as EncodeLike<BTreeSet<LikeT>>>
-             <&[(T,)] as EncodeLike<BinaryHeap<LikeT>>>
-             <&[(T,)] as EncodeLike<LinkedList<LikeT>>>
-             <&[T] as EncodeLike<Vec<U>>>
+             <bool as EncodeLike>
+             <i8 as EncodeLike>
+             <i16 as EncodeLike>
+             <i32 as EncodeLike>
+             <i64 as EncodeLike>
+             <i128 as EncodeLike>
+             <u8 as EncodeLike>
+             <u16 as EncodeLike>
            and $N others
    = note: required for `Bar` to implement `FullEncode`
    = note: required for `Bar` to implement `FullCodec`
    = note: required for `frame_support::pallet_prelude::StorageValue<_GeneratedPrefixForStorageFoo<T>, Bar>` to implement `PartialStorageInfoTrait`
 
 error[E0277]: the trait bound `Bar: WrapperTypeEncode` is not satisfied
-  --> tests/pallet_ui/storage_ensure_span_are_ok_on_wrong_gen_unnamed.rs:10:12
+  --> tests/pallet_ui/storage_ensure_span_are_ok_on_wrong_gen_unnamed.rs:27:12
    |
-10 |     #[pallet::without_storage_info]
+27 |     #[pallet::without_storage_info]
    |               ^^^^^^^^^^^^^^^^^^^^ the trait `WrapperTypeEncode` is not implemented for `Bar`
    |
    = help: the following other types implement trait `WrapperTypeEncode`:
-             &T
-             &mut T
-             Arc<T>
              Box<T>
+             bytes::bytes::Bytes
              Cow<'a, T>
+             parity_scale_codec::Ref<'a, T, U>
+             frame_support::sp_runtime::sp_application_crypto::sp_core::Bytes
              Rc<T>
+             Arc<T>
              Vec<T>
-             bytes::bytes::Bytes
            and $N others
    = note: required for `Bar` to implement `Encode`
    = note: required for `Bar` to implement `FullEncode`
@@ -55,74 +55,74 @@ error[E0277]: the trait bound `Bar: WrapperTypeEncode` is not satisfied
    = note: required for `frame_support::pallet_prelude::StorageValue<_GeneratedPrefixForStorageFoo<T>, Bar>` to implement `PartialStorageInfoTrait`
 
 error[E0277]: the trait bound `Bar: TypeInfo` is not satisfied
-  --> tests/pallet_ui/storage_ensure_span_are_ok_on_wrong_gen_unnamed.rs:21:12
+  --> tests/pallet_ui/storage_ensure_span_are_ok_on_wrong_gen_unnamed.rs:38:12
    |
-21 |     #[pallet::storage]
+38 |     #[pallet::storage]
    |               ^^^^^^^ the trait `TypeInfo` is not implemented for `Bar`
    |
    = help: the following other types implement trait `TypeInfo`:
-             &T
-             &mut T
-             ()
-             (A, B)
-             (A, B, C)
-             (A, B, C, D)
-             (A, B, C, D, E)
-             (A, B, C, D, E, F)
+             bool
+             char
+             i8
+             i16
+             i32
+             i64
+             i128
+             u8
            and $N others
    = note: required for `Bar` to implement `StaticTypeInfo`
    = note: required for `frame_support::pallet_prelude::StorageValue<_GeneratedPrefixForStorageFoo<T>, Bar>` to implement `StorageEntryMetadataBuilder`
 
 error[E0277]: the trait bound `Bar: WrapperTypeDecode` is not satisfied
-  --> tests/pallet_ui/storage_ensure_span_are_ok_on_wrong_gen_unnamed.rs:21:12
+  --> tests/pallet_ui/storage_ensure_span_are_ok_on_wrong_gen_unnamed.rs:38:12
    |
-21 |     #[pallet::storage]
+38 |     #[pallet::storage]
    |               ^^^^^^^ the trait `WrapperTypeDecode` is not implemented for `Bar`
    |
    = help: the following other types implement trait `WrapperTypeDecode`:
-             Arc<T>
              Box<T>
-             Rc<T>
              frame_support::sp_runtime::sp_application_crypto::sp_core::Bytes
+             Rc<T>
+             Arc<T>
    = note: required for `Bar` to implement `Decode`
    = note: required for `Bar` to implement `FullCodec`
    = note: required for `frame_support::pallet_prelude::StorageValue<_GeneratedPrefixForStorageFoo<T>, Bar>` to implement `StorageEntryMetadataBuilder`
 
 error[E0277]: the trait bound `Bar: EncodeLike` is not satisfied
-  --> tests/pallet_ui/storage_ensure_span_are_ok_on_wrong_gen_unnamed.rs:21:12
+  --> tests/pallet_ui/storage_ensure_span_are_ok_on_wrong_gen_unnamed.rs:38:12
    |
-21 |     #[pallet::storage]
+38 |     #[pallet::storage]
    |               ^^^^^^^ the trait `EncodeLike` is not implemented for `Bar`
    |
    = help: the following other types implement trait `EncodeLike<T>`:
-             <&&T as EncodeLike<T>>
-             <&T as EncodeLike<T>>
-             <&T as EncodeLike>
-             <&[(K, V)] as EncodeLike<BTreeMap<LikeK, LikeV>>>
-             <&[(T,)] as EncodeLike<BTreeSet<LikeT>>>
-             <&[(T,)] as EncodeLike<BinaryHeap<LikeT>>>
-             <&[(T,)] as EncodeLike<LinkedList<LikeT>>>
-             <&[T] as EncodeLike<Vec<U>>>
+             <bool as EncodeLike>
+             <i8 as EncodeLike>
+             <i16 as EncodeLike>
+             <i32 as EncodeLike>
+             <i64 as EncodeLike>
+             <i128 as EncodeLike>
+             <u8 as EncodeLike>
+             <u16 as EncodeLike>
            and $N others
    = note: required for `Bar` to implement `FullEncode`
    = note: required for `Bar` to implement `FullCodec`
    = note: required for `frame_support::pallet_prelude::StorageValue<_GeneratedPrefixForStorageFoo<T>, Bar>` to implement `StorageEntryMetadataBuilder`
 
 error[E0277]: the trait bound `Bar: WrapperTypeEncode` is not satisfied
-  --> tests/pallet_ui/storage_ensure_span_are_ok_on_wrong_gen_unnamed.rs:21:12
+  --> tests/pallet_ui/storage_ensure_span_are_ok_on_wrong_gen_unnamed.rs:38:12
    |
-21 |     #[pallet::storage]
+38 |     #[pallet::storage]
    |               ^^^^^^^ the trait `WrapperTypeEncode` is not implemented for `Bar`
    |
    = help: the following other types implement trait `WrapperTypeEncode`:
-             &T
-             &mut T
-             Arc<T>
              Box<T>
+             bytes::bytes::Bytes
              Cow<'a, T>
+             parity_scale_codec::Ref<'a, T, U>
+             frame_support::sp_runtime::sp_application_crypto::sp_core::Bytes
              Rc<T>
+             Arc<T>
              Vec<T>
-             bytes::bytes::Bytes
            and $N others
    = note: required for `Bar` to implement `Encode`
    = note: required for `Bar` to implement `FullEncode`
diff --git a/substrate/frame/support/test/tests/pallet_ui/storage_incomplete_item.rs b/substrate/frame/support/test/tests/pallet_ui/storage_incomplete_item.rs
index e451df8c78a02f97bbd047d87a99889c0f3533e6..df7ecbcee7cdac140244b225126dc241e5e59af6 100644
--- a/substrate/frame/support/test/tests/pallet_ui/storage_incomplete_item.rs
+++ b/substrate/frame/support/test/tests/pallet_ui/storage_incomplete_item.rs
@@ -1,3 +1,20 @@
+// 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.
+
 #[frame_support::pallet]
 mod pallet {
 	use frame_support::pallet_prelude::Hooks;
diff --git a/substrate/frame/support/test/tests/pallet_ui/storage_incomplete_item.stderr b/substrate/frame/support/test/tests/pallet_ui/storage_incomplete_item.stderr
index 57f3ab78a5382e07b824bd89774ab0e1ec12c3cf..9679c3fee8db4536bd3d0b8438c5fae649c4deb8 100644
--- a/substrate/frame/support/test/tests/pallet_ui/storage_incomplete_item.stderr
+++ b/substrate/frame/support/test/tests/pallet_ui/storage_incomplete_item.stderr
@@ -1,13 +1,13 @@
 error: free type alias without body
-  --> $DIR/storage_incomplete_item.rs:19:2
+  --> tests/pallet_ui/storage_incomplete_item.rs:36:2
    |
-19 |     type Foo;
+36 |     type Foo;
    |     ^^^^^^^^-
    |             |
    |             help: provide a definition for the type: `= <type>;`
 
 error[E0433]: failed to resolve: use of undeclared crate or module `pallet`
-  --> $DIR/storage_incomplete_item.rs:18:4
+  --> tests/pallet_ui/storage_incomplete_item.rs:35:4
    |
-18 |     #[pallet::storage]
+35 |     #[pallet::storage]
    |       ^^^^^^ use of undeclared crate or module `pallet`
diff --git a/substrate/frame/support/test/tests/pallet_ui/storage_info_unsatisfied.rs b/substrate/frame/support/test/tests/pallet_ui/storage_info_unsatisfied.rs
index 4d43e3a17a9ec80e5a1771f5ff2538e62a2d1f33..a17f85e66ac09878d999f08067ab20d41ae2775a 100644
--- a/substrate/frame/support/test/tests/pallet_ui/storage_info_unsatisfied.rs
+++ b/substrate/frame/support/test/tests/pallet_ui/storage_info_unsatisfied.rs
@@ -1,3 +1,20 @@
+// 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.
+
 #[frame_support::pallet]
 mod pallet {
 	use frame_support::pallet_prelude::{Hooks, StorageValue};
diff --git a/substrate/frame/support/test/tests/pallet_ui/storage_info_unsatisfied.stderr b/substrate/frame/support/test/tests/pallet_ui/storage_info_unsatisfied.stderr
index c17f9eaa03251bd7109fb32e640462823f65d4ee..e04de98800ec20fc449666f671bcd91058fb3335 100644
--- a/substrate/frame/support/test/tests/pallet_ui/storage_info_unsatisfied.stderr
+++ b/substrate/frame/support/test/tests/pallet_ui/storage_info_unsatisfied.stderr
@@ -1,17 +1,17 @@
 error[E0277]: the trait bound `Bar: MaxEncodedLen` is not satisfied
- --> tests/pallet_ui/storage_info_unsatisfied.rs:9:12
-  |
-9 |     #[pallet::pallet]
-  |               ^^^^^^ the trait `MaxEncodedLen` is not implemented for `Bar`
-  |
-  = help: the following other types implement trait `MaxEncodedLen`:
-            ()
-            (TupleElement0, TupleElement1)
-            (TupleElement0, TupleElement1, TupleElement2)
-            (TupleElement0, TupleElement1, TupleElement2, TupleElement3)
-            (TupleElement0, TupleElement1, TupleElement2, TupleElement3, TupleElement4)
-            (TupleElement0, TupleElement1, TupleElement2, TupleElement3, TupleElement4, TupleElement5)
-            (TupleElement0, TupleElement1, TupleElement2, TupleElement3, TupleElement4, TupleElement5, TupleElement6)
-            (TupleElement0, TupleElement1, TupleElement2, TupleElement3, TupleElement4, TupleElement5, TupleElement6, TupleElement7)
-          and $N others
-  = note: required for `frame_support::pallet_prelude::StorageValue<_GeneratedPrefixForStorageFoo<T>, Bar>` to implement `StorageInfoTrait`
+  --> tests/pallet_ui/storage_info_unsatisfied.rs:26:12
+   |
+26 |     #[pallet::pallet]
+   |               ^^^^^^ the trait `MaxEncodedLen` is not implemented for `Bar`
+   |
+   = help: the following other types implement trait `MaxEncodedLen`:
+             bool
+             i8
+             i16
+             i32
+             i64
+             i128
+             u8
+             u16
+           and $N others
+   = note: required for `frame_support::pallet_prelude::StorageValue<_GeneratedPrefixForStorageFoo<T>, Bar>` to implement `StorageInfoTrait`
diff --git a/substrate/frame/support/test/tests/pallet_ui/storage_info_unsatisfied_nmap.rs b/substrate/frame/support/test/tests/pallet_ui/storage_info_unsatisfied_nmap.rs
index dd10bc0723fe129b80dad1eb4bbbc7d394ffa3b6..be0665db7b6717ca8730191c639981f15c7547c8 100644
--- a/substrate/frame/support/test/tests/pallet_ui/storage_info_unsatisfied_nmap.rs
+++ b/substrate/frame/support/test/tests/pallet_ui/storage_info_unsatisfied_nmap.rs
@@ -1,3 +1,20 @@
+// 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.
+
 #[frame_support::pallet]
 mod pallet {
 	use frame_support::{
diff --git a/substrate/frame/support/test/tests/pallet_ui/storage_info_unsatisfied_nmap.stderr b/substrate/frame/support/test/tests/pallet_ui/storage_info_unsatisfied_nmap.stderr
index c34c796fe59c18bcfdc12b3d6283fbb1cf4ed08f..31fe3b57338968822c8f49837c5176aa859be2cf 100644
--- a/substrate/frame/support/test/tests/pallet_ui/storage_info_unsatisfied_nmap.stderr
+++ b/substrate/frame/support/test/tests/pallet_ui/storage_info_unsatisfied_nmap.stderr
@@ -1,18 +1,18 @@
 error[E0277]: the trait bound `Bar: MaxEncodedLen` is not satisfied
-  --> tests/pallet_ui/storage_info_unsatisfied_nmap.rs:12:12
+  --> tests/pallet_ui/storage_info_unsatisfied_nmap.rs:29:12
    |
-12 |     #[pallet::pallet]
+29 |     #[pallet::pallet]
    |               ^^^^^^ the trait `MaxEncodedLen` is not implemented for `Bar`
    |
    = help: the following other types implement trait `MaxEncodedLen`:
-             ()
-             (TupleElement0, TupleElement1)
-             (TupleElement0, TupleElement1, TupleElement2)
-             (TupleElement0, TupleElement1, TupleElement2, TupleElement3)
-             (TupleElement0, TupleElement1, TupleElement2, TupleElement3, TupleElement4)
-             (TupleElement0, TupleElement1, TupleElement2, TupleElement3, TupleElement4, TupleElement5)
-             (TupleElement0, TupleElement1, TupleElement2, TupleElement3, TupleElement4, TupleElement5, TupleElement6)
-             (TupleElement0, TupleElement1, TupleElement2, TupleElement3, TupleElement4, TupleElement5, TupleElement6, TupleElement7)
+             bool
+             i8
+             i16
+             i32
+             i64
+             i128
+             u8
+             u16
            and $N others
-   = note: required for `Key<frame_support::Twox64Concat, Bar>` to implement `KeyGeneratorMaxEncodedLen`
-   = note: required for `frame_support::pallet_prelude::StorageNMap<_GeneratedPrefixForStorageFoo<T>, Key<frame_support::Twox64Concat, Bar>, u32>` to implement `StorageInfoTrait`
+   = note: required for `NMapKey<frame_support::Twox64Concat, Bar>` to implement `KeyGeneratorMaxEncodedLen`
+   = note: required for `frame_support::pallet_prelude::StorageNMap<_GeneratedPrefixForStorageFoo<T>, NMapKey<frame_support::Twox64Concat, Bar>, u32>` to implement `StorageInfoTrait`
diff --git a/substrate/frame/support/test/tests/pallet_ui/storage_invalid_attribute.rs b/substrate/frame/support/test/tests/pallet_ui/storage_invalid_attribute.rs
index c6a88c083135d538b0550547f72cc4dec2c1a078..914a8d6cd4de79e954e0dd2d743b1c4bad169f85 100644
--- a/substrate/frame/support/test/tests/pallet_ui/storage_invalid_attribute.rs
+++ b/substrate/frame/support/test/tests/pallet_ui/storage_invalid_attribute.rs
@@ -1,3 +1,20 @@
+// 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.
+
 #[frame_support::pallet]
 mod pallet {
 	use frame_support::pallet_prelude::Hooks;
diff --git a/substrate/frame/support/test/tests/pallet_ui/storage_invalid_attribute.stderr b/substrate/frame/support/test/tests/pallet_ui/storage_invalid_attribute.stderr
index 80c6526bbf88897282e4d2deb576f09fe56b238d..7f125526edf26abddf82f2228da9a510200f0735 100644
--- a/substrate/frame/support/test/tests/pallet_ui/storage_invalid_attribute.stderr
+++ b/substrate/frame/support/test/tests/pallet_ui/storage_invalid_attribute.stderr
@@ -1,5 +1,5 @@
 error: expected one of: `getter`, `storage_prefix`, `unbounded`, `whitelist_storage`
-  --> $DIR/storage_invalid_attribute.rs:16:12
+  --> tests/pallet_ui/storage_invalid_attribute.rs:33:12
    |
-16 |     #[pallet::generate_store(pub trait Store)]
+33 |     #[pallet::generate_store(pub trait Store)]
    |               ^^^^^^^^^^^^^^
diff --git a/substrate/frame/support/test/tests/pallet_ui/storage_invalid_first_generic.rs b/substrate/frame/support/test/tests/pallet_ui/storage_invalid_first_generic.rs
index c8df93c9b323d350582e122e30c49b6c7164645b..62367d2da7ecca90a30b611b87dfd365fa13c84e 100644
--- a/substrate/frame/support/test/tests/pallet_ui/storage_invalid_first_generic.rs
+++ b/substrate/frame/support/test/tests/pallet_ui/storage_invalid_first_generic.rs
@@ -1,3 +1,20 @@
+// 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.
+
 #[frame_support::pallet]
 mod pallet {
 	use frame_support::pallet_prelude::Hooks;
diff --git a/substrate/frame/support/test/tests/pallet_ui/storage_invalid_first_generic.stderr b/substrate/frame/support/test/tests/pallet_ui/storage_invalid_first_generic.stderr
index b37f7e57f3552c5745fba93fe780d21b5de14b84..0b1a7273fa8cfeff198696072c7e93ae544d2dc7 100644
--- a/substrate/frame/support/test/tests/pallet_ui/storage_invalid_first_generic.stderr
+++ b/substrate/frame/support/test/tests/pallet_ui/storage_invalid_first_generic.stderr
@@ -1,11 +1,11 @@
 error: Invalid pallet::storage, for unnamed generic arguments the type first generic argument must be `_`, the argument is then replaced by macro.
-  --> $DIR/storage_invalid_first_generic.rs:19:29
+  --> tests/pallet_ui/storage_invalid_first_generic.rs:36:29
    |
-19 |     type Foo<T> = StorageValue<u8, u8>;
+36 |     type Foo<T> = StorageValue<u8, u8>;
    |                                ^^
 
 error: expected `_`
-  --> $DIR/storage_invalid_first_generic.rs:19:29
+  --> tests/pallet_ui/storage_invalid_first_generic.rs:36:29
    |
-19 |     type Foo<T> = StorageValue<u8, u8>;
+36 |     type Foo<T> = StorageValue<u8, u8>;
    |                                ^^
diff --git a/substrate/frame/support/test/tests/pallet_ui/storage_invalid_rename_value.rs b/substrate/frame/support/test/tests/pallet_ui/storage_invalid_rename_value.rs
index c3a08e05e2ac7b42c362a63b0f6e1dac79ad013d..336d81c25416ce9f9174353f1dca23370ea93e85 100644
--- a/substrate/frame/support/test/tests/pallet_ui/storage_invalid_rename_value.rs
+++ b/substrate/frame/support/test/tests/pallet_ui/storage_invalid_rename_value.rs
@@ -1,3 +1,20 @@
+// 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.
+
 #[frame_support::pallet]
 mod pallet {
 	use frame_support::pallet_prelude::Hooks;
diff --git a/substrate/frame/support/test/tests/pallet_ui/storage_invalid_rename_value.stderr b/substrate/frame/support/test/tests/pallet_ui/storage_invalid_rename_value.stderr
index 513970f98a4f7d38d3885afd1b72c5b3391e5ac2..e7cff8b468957b4b8fe322882a2784efca873528 100644
--- a/substrate/frame/support/test/tests/pallet_ui/storage_invalid_rename_value.stderr
+++ b/substrate/frame/support/test/tests/pallet_ui/storage_invalid_rename_value.stderr
@@ -1,5 +1,5 @@
 error: `pub` is not a valid identifier
-  --> $DIR/storage_invalid_rename_value.rs:13:29
+  --> tests/pallet_ui/storage_invalid_rename_value.rs:30:29
    |
-13 |     #[pallet::storage_prefix = "pub"]
+30 |     #[pallet::storage_prefix = "pub"]
    |                                ^^^^^
diff --git a/substrate/frame/support/test/tests/pallet_ui/storage_multiple_getters.rs b/substrate/frame/support/test/tests/pallet_ui/storage_multiple_getters.rs
index 309b9b24136fadae4fdda89b5283de5a198c21c4..54f0c1ef5370c9347c283d602bc489c25ba3763c 100644
--- a/substrate/frame/support/test/tests/pallet_ui/storage_multiple_getters.rs
+++ b/substrate/frame/support/test/tests/pallet_ui/storage_multiple_getters.rs
@@ -1,3 +1,20 @@
+// 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.
+
 #[frame_support::pallet]
 mod pallet {
 	use frame_support::pallet_prelude::Hooks;
diff --git a/substrate/frame/support/test/tests/pallet_ui/storage_multiple_getters.stderr b/substrate/frame/support/test/tests/pallet_ui/storage_multiple_getters.stderr
index 40f57f16e0df5a8de14ab4efb68d38574a9cc1d3..494205c2690f6f3fa6ea50598156ca2e24419453 100644
--- a/substrate/frame/support/test/tests/pallet_ui/storage_multiple_getters.stderr
+++ b/substrate/frame/support/test/tests/pallet_ui/storage_multiple_getters.stderr
@@ -1,5 +1,5 @@
 error: Invalid attribute: Duplicate attribute
-  --> $DIR/storage_multiple_getters.rs:20:3
+  --> tests/pallet_ui/storage_multiple_getters.rs:37:3
    |
-20 |     #[pallet::getter(fn foo_error)]
+37 |     #[pallet::getter(fn foo_error)]
    |      ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
diff --git a/substrate/frame/support/test/tests/pallet_ui/storage_multiple_renames.rs b/substrate/frame/support/test/tests/pallet_ui/storage_multiple_renames.rs
index f3caef80a7ee28a34ca318455c6deb7a389a9616..e338faef5c2798ec06be4559f7aecf0c1accdf2f 100644
--- a/substrate/frame/support/test/tests/pallet_ui/storage_multiple_renames.rs
+++ b/substrate/frame/support/test/tests/pallet_ui/storage_multiple_renames.rs
@@ -1,3 +1,20 @@
+// 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.
+
 #[frame_support::pallet]
 mod pallet {
 	use frame_support::pallet_prelude::Hooks;
diff --git a/substrate/frame/support/test/tests/pallet_ui/storage_multiple_renames.stderr b/substrate/frame/support/test/tests/pallet_ui/storage_multiple_renames.stderr
index 52cb7e85adf21c10591ceec5b9df997571ff358b..60720a46a2be139a324cdb7a07fd3ca6bf3f0e06 100644
--- a/substrate/frame/support/test/tests/pallet_ui/storage_multiple_renames.stderr
+++ b/substrate/frame/support/test/tests/pallet_ui/storage_multiple_renames.stderr
@@ -1,5 +1,5 @@
 error: Invalid attribute: Duplicate attribute
-  --> $DIR/storage_multiple_renames.rs:20:3
+  --> tests/pallet_ui/storage_multiple_renames.rs:37:3
    |
-20 |     #[pallet::storage_prefix = "Baz"]
+37 |     #[pallet::storage_prefix = "Baz"]
    |      ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
diff --git a/substrate/frame/support/test/tests/pallet_ui/storage_not_storage_type.rs b/substrate/frame/support/test/tests/pallet_ui/storage_not_storage_type.rs
index 03eee6fc8ec7d3990b35c7697c38fabb9293b88e..f1eb2bed2a1445f513e844f4bcaf1c0683b07c22 100644
--- a/substrate/frame/support/test/tests/pallet_ui/storage_not_storage_type.rs
+++ b/substrate/frame/support/test/tests/pallet_ui/storage_not_storage_type.rs
@@ -1,3 +1,20 @@
+// 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.
+
 #[frame_support::pallet]
 mod pallet {
 	use frame_support::pallet_prelude::Hooks;
diff --git a/substrate/frame/support/test/tests/pallet_ui/storage_not_storage_type.stderr b/substrate/frame/support/test/tests/pallet_ui/storage_not_storage_type.stderr
index 3358f00151d50dcc65a305b42753765d19187a90..27dd3a1ef4283c048fd193eec35617f9df3673e3 100644
--- a/substrate/frame/support/test/tests/pallet_ui/storage_not_storage_type.stderr
+++ b/substrate/frame/support/test/tests/pallet_ui/storage_not_storage_type.stderr
@@ -1,5 +1,5 @@
 error: Invalid pallet::storage, expected ident: `StorageValue` or `StorageMap` or `CountedStorageMap` or `StorageDoubleMap` or `StorageNMap` or `CountedStorageNMap` in order to expand metadata, found `u8`.
-  --> $DIR/storage_not_storage_type.rs:19:16
+  --> tests/pallet_ui/storage_not_storage_type.rs:36:16
    |
-19 |     type Foo<T> = u8;
+36 |     type Foo<T> = u8;
    |                   ^^
diff --git a/substrate/frame/support/test/tests/pallet_ui/storage_result_query_missing_generics.rs b/substrate/frame/support/test/tests/pallet_ui/storage_result_query_missing_generics.rs
index a051cc087db5888c98e73902c894212b2306eebf..4171596ddde7b5c7c4d77a58a427ec3ec2cad516 100644
--- a/substrate/frame/support/test/tests/pallet_ui/storage_result_query_missing_generics.rs
+++ b/substrate/frame/support/test/tests/pallet_ui/storage_result_query_missing_generics.rs
@@ -1,3 +1,20 @@
+// 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.
+
 #[frame_support::pallet]
 mod pallet {
 	use frame_support::pallet_prelude::*;
diff --git a/substrate/frame/support/test/tests/pallet_ui/storage_result_query_missing_generics.stderr b/substrate/frame/support/test/tests/pallet_ui/storage_result_query_missing_generics.stderr
index 9e63fd03db52b2e18afa17e78a5a5293bb5c6094..7ca7ec8bbb7d7269fd22d8e6594fc40ee9b2659f 100644
--- a/substrate/frame/support/test/tests/pallet_ui/storage_result_query_missing_generics.stderr
+++ b/substrate/frame/support/test/tests/pallet_ui/storage_result_query_missing_generics.stderr
@@ -1,15 +1,15 @@
 error[E0107]: missing generics for enum `pallet::Error`
-  --> tests/pallet_ui/storage_result_query_missing_generics.rs:17:56
+  --> tests/pallet_ui/storage_result_query_missing_generics.rs:34:56
    |
-17 |     type Foo<T: Config> = StorageValue<_, u8, ResultQuery<Error::NonExistentValue>>;
+34 |     type Foo<T: Config> = StorageValue<_, u8, ResultQuery<Error::NonExistentValue>>;
    |                                                           ^^^^^ expected 1 generic argument
    |
 note: enum defined here, with 1 generic parameter: `T`
-  --> tests/pallet_ui/storage_result_query_missing_generics.rs:12:11
+  --> tests/pallet_ui/storage_result_query_missing_generics.rs:29:11
    |
-12 |     pub enum Error<T> {
+29 |     pub enum Error<T> {
    |              ^^^^^ -
 help: add missing generic argument
    |
-17 |     type Foo<T: Config> = StorageValue<_, u8, ResultQuery<Error<T>::NonExistentValue>>;
+34 |     type Foo<T: Config> = StorageValue<_, u8, ResultQuery<Error<T>::NonExistentValue>>;
    |                                                                +++
diff --git a/substrate/frame/support/test/tests/pallet_ui/storage_result_query_multiple_type_args.rs b/substrate/frame/support/test/tests/pallet_ui/storage_result_query_multiple_type_args.rs
index 9e0da4b62128d85ea122723365e50098afcc3dc7..a1ce60eb21c31ae21f9961629121fc2f7667cc27 100644
--- a/substrate/frame/support/test/tests/pallet_ui/storage_result_query_multiple_type_args.rs
+++ b/substrate/frame/support/test/tests/pallet_ui/storage_result_query_multiple_type_args.rs
@@ -1,3 +1,20 @@
+// 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.
+
 #[frame_support::pallet]
 mod pallet {
 	use frame_support::pallet_prelude::*;
diff --git a/substrate/frame/support/test/tests/pallet_ui/storage_result_query_multiple_type_args.stderr b/substrate/frame/support/test/tests/pallet_ui/storage_result_query_multiple_type_args.stderr
index 4be2a36eb89e17981a3a431a8d3dbe5c8457f8ff..1e27dac745db6949629d7cb11262085696e77024 100644
--- a/substrate/frame/support/test/tests/pallet_ui/storage_result_query_multiple_type_args.stderr
+++ b/substrate/frame/support/test/tests/pallet_ui/storage_result_query_multiple_type_args.stderr
@@ -1,5 +1,5 @@
 error: Invalid pallet::storage, unexpected number of generic arguments for ResultQuery, expected 1 type argument, found 2
-  --> tests/pallet_ui/storage_result_query_multiple_type_args.rs:19:56
+  --> tests/pallet_ui/storage_result_query_multiple_type_args.rs:36:56
    |
-19 |     type Foo<T: Config> = StorageValue<_, u8, ResultQuery<Error<T>::NonExistentValue, SomeOtherError>>;
+36 |     type Foo<T: Config> = StorageValue<_, u8, ResultQuery<Error<T>::NonExistentValue, SomeOtherError>>;
    |                                                           ^^^^^
diff --git a/substrate/frame/support/test/tests/pallet_ui/storage_result_query_no_defined_pallet_error.rs b/substrate/frame/support/test/tests/pallet_ui/storage_result_query_no_defined_pallet_error.rs
index 102a2261f83338a4e9a748b515f5f4c48ea657b4..c09d094940323189beffca34a50801a51ee0085d 100644
--- a/substrate/frame/support/test/tests/pallet_ui/storage_result_query_no_defined_pallet_error.rs
+++ b/substrate/frame/support/test/tests/pallet_ui/storage_result_query_no_defined_pallet_error.rs
@@ -1,3 +1,20 @@
+// 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.
+
 #[frame_support::pallet]
 mod pallet {
 	use frame_support::pallet_prelude::*;
diff --git a/substrate/frame/support/test/tests/pallet_ui/storage_result_query_no_defined_pallet_error.stderr b/substrate/frame/support/test/tests/pallet_ui/storage_result_query_no_defined_pallet_error.stderr
index 77a7972a5b5cf7e5ad0a9cf7e2cacd0ac6deb225..1593c9820697c37f433cff7c87b79fd4eefe8477 100644
--- a/substrate/frame/support/test/tests/pallet_ui/storage_result_query_no_defined_pallet_error.stderr
+++ b/substrate/frame/support/test/tests/pallet_ui/storage_result_query_no_defined_pallet_error.stderr
@@ -1,5 +1,5 @@
 error: Invalid pallet::storage, unexpected number of path segments for the generics in ResultQuery, expected a path with at least 2 segments, found 1
-  --> tests/pallet_ui/storage_result_query_no_defined_pallet_error.rs:12:56
+  --> tests/pallet_ui/storage_result_query_no_defined_pallet_error.rs:29:56
    |
-12 |     type Foo<T: Config> = StorageValue<_, u8, ResultQuery<NonExistentValue>>;
+29 |     type Foo<T: Config> = StorageValue<_, u8, ResultQuery<NonExistentValue>>;
    |                                                           ^^^^^^^^^^^^^^^^
diff --git a/substrate/frame/support/test/tests/pallet_ui/storage_result_query_parenthesized_generics.rs b/substrate/frame/support/test/tests/pallet_ui/storage_result_query_parenthesized_generics.rs
index f30dc3b6a3cc76070bac729ed3d500ba2eef9ca4..1734a1b625ce16b36627cfbf3eff73f7aca2bd67 100644
--- a/substrate/frame/support/test/tests/pallet_ui/storage_result_query_parenthesized_generics.rs
+++ b/substrate/frame/support/test/tests/pallet_ui/storage_result_query_parenthesized_generics.rs
@@ -1,3 +1,20 @@
+// 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.
+
 #[frame_support::pallet]
 mod pallet {
 	use frame_support::pallet_prelude::*;
diff --git a/substrate/frame/support/test/tests/pallet_ui/storage_result_query_parenthesized_generics.stderr b/substrate/frame/support/test/tests/pallet_ui/storage_result_query_parenthesized_generics.stderr
index 89ddd1599ac971d805777953db879951608a05f9..926f9ad7575f21ebdfd9239b7d212fdfd52a3639 100644
--- a/substrate/frame/support/test/tests/pallet_ui/storage_result_query_parenthesized_generics.stderr
+++ b/substrate/frame/support/test/tests/pallet_ui/storage_result_query_parenthesized_generics.stderr
@@ -1,5 +1,5 @@
 error: expected `,`
-  --> tests/pallet_ui/storage_result_query_parenthesized_generics.rs:18:55
+  --> tests/pallet_ui/storage_result_query_parenthesized_generics.rs:35:55
    |
-18 |     type Foo<T: Config> = StorageValue<_, u8, ResultQuery(NonExistentValue)>;
+35 |     type Foo<T: Config> = StorageValue<_, u8, ResultQuery(NonExistentValue)>;
    |                                                          ^
diff --git a/substrate/frame/support/test/tests/pallet_ui/storage_result_query_wrong_generic_kind.rs b/substrate/frame/support/test/tests/pallet_ui/storage_result_query_wrong_generic_kind.rs
index a5065398b397063bd405c341af820294bba76694..30d1b6b48ecd55901e33195a6136a5ccb46fa6f8 100644
--- a/substrate/frame/support/test/tests/pallet_ui/storage_result_query_wrong_generic_kind.rs
+++ b/substrate/frame/support/test/tests/pallet_ui/storage_result_query_wrong_generic_kind.rs
@@ -1,3 +1,20 @@
+// 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.
+
 #[frame_support::pallet]
 mod pallet {
 	use frame_support::pallet_prelude::*;
diff --git a/substrate/frame/support/test/tests/pallet_ui/storage_result_query_wrong_generic_kind.stderr b/substrate/frame/support/test/tests/pallet_ui/storage_result_query_wrong_generic_kind.stderr
index 9f333ae28e6aa327532f4a4a562625e545a2300d..b08af8da5a895a73566f2ced47bc8231e56080a1 100644
--- a/substrate/frame/support/test/tests/pallet_ui/storage_result_query_wrong_generic_kind.stderr
+++ b/substrate/frame/support/test/tests/pallet_ui/storage_result_query_wrong_generic_kind.stderr
@@ -1,5 +1,5 @@
 error: Invalid pallet::storage, unexpected generic argument kind, expected a type path to a `PalletError` enum variant, found `'static`
-  --> tests/pallet_ui/storage_result_query_wrong_generic_kind.rs:18:56
+  --> tests/pallet_ui/storage_result_query_wrong_generic_kind.rs:35:56
    |
-18 |     type Foo<T: Config> = StorageValue<_, u8, ResultQuery<'static>>;
+35 |     type Foo<T: Config> = StorageValue<_, u8, ResultQuery<'static>>;
    |                                                           ^^^^^^^
diff --git a/substrate/frame/support/test/tests/pallet_ui/storage_value_duplicate_named_generic.rs b/substrate/frame/support/test/tests/pallet_ui/storage_value_duplicate_named_generic.rs
index 1f076b1ecbfc6b020d9ec1254938375487f8c59c..0104637115561bd12515ba8ca28c8e3336a8d2d0 100644
--- a/substrate/frame/support/test/tests/pallet_ui/storage_value_duplicate_named_generic.rs
+++ b/substrate/frame/support/test/tests/pallet_ui/storage_value_duplicate_named_generic.rs
@@ -1,3 +1,20 @@
+// 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.
+
 #[frame_support::pallet]
 mod pallet {
 	use frame_support::pallet_prelude::{Hooks, StorageValue};
diff --git a/substrate/frame/support/test/tests/pallet_ui/storage_value_duplicate_named_generic.stderr b/substrate/frame/support/test/tests/pallet_ui/storage_value_duplicate_named_generic.stderr
index 3def9061fec8a1a1bc011eaf602e717804347599..ab30a9e42bc5f84ce099ae3d2d0676dc69fb5e25 100644
--- a/substrate/frame/support/test/tests/pallet_ui/storage_value_duplicate_named_generic.stderr
+++ b/substrate/frame/support/test/tests/pallet_ui/storage_value_duplicate_named_generic.stderr
@@ -1,11 +1,11 @@
 error: Invalid pallet::storage, Duplicated named generic
-  --> $DIR/storage_value_duplicate_named_generic.rs:19:42
+  --> tests/pallet_ui/storage_value_duplicate_named_generic.rs:36:42
    |
-19 |     type Foo<T> = StorageValue<Value = u32, Value = u32>;
+36 |     type Foo<T> = StorageValue<Value = u32, Value = u32>;
    |                                             ^^^^^
 
 error: Invalid pallet::storage, Duplicated named generic
-  --> $DIR/storage_value_duplicate_named_generic.rs:19:29
+  --> tests/pallet_ui/storage_value_duplicate_named_generic.rs:36:29
    |
-19 |     type Foo<T> = StorageValue<Value = u32, Value = u32>;
+36 |     type Foo<T> = StorageValue<Value = u32, Value = u32>;
    |                                ^^^^^
diff --git a/substrate/frame/support/test/tests/pallet_ui/storage_value_generic_named_and_unnamed.rs b/substrate/frame/support/test/tests/pallet_ui/storage_value_generic_named_and_unnamed.rs
index fd0ea4794bc43421da38acbbfb966f5e81fbf55d..8e82daa62709933996fb05be32c80dcc78c7c4ee 100644
--- a/substrate/frame/support/test/tests/pallet_ui/storage_value_generic_named_and_unnamed.rs
+++ b/substrate/frame/support/test/tests/pallet_ui/storage_value_generic_named_and_unnamed.rs
@@ -1,3 +1,20 @@
+// 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.
+
 #[frame_support::pallet]
 mod pallet {
 	use frame_support::pallet_prelude::{Hooks, StorageValue, OptionQuery};
diff --git a/substrate/frame/support/test/tests/pallet_ui/storage_value_generic_named_and_unnamed.stderr b/substrate/frame/support/test/tests/pallet_ui/storage_value_generic_named_and_unnamed.stderr
index 61c01943cc3f5e1a6fcc004bdfba74ce676705f3..d58c0445188fb4d20636db300c9582d2085a234f 100644
--- a/substrate/frame/support/test/tests/pallet_ui/storage_value_generic_named_and_unnamed.stderr
+++ b/substrate/frame/support/test/tests/pallet_ui/storage_value_generic_named_and_unnamed.stderr
@@ -1,5 +1,5 @@
 error: Invalid pallet::storage, invalid generic declaration for storage. Expect only type generics or binding generics, e.g. `<Name1 = Gen1, Name2 = Gen2, ..>` or `<Gen1, Gen2, ..>`.
-  --> $DIR/storage_value_generic_named_and_unnamed.rs:19:16
+  --> tests/pallet_ui/storage_value_generic_named_and_unnamed.rs:36:16
    |
-19 |     type Foo<T> = StorageValue<u32, QueryKind = OptionQuery>;
+36 |     type Foo<T> = StorageValue<u32, QueryKind = OptionQuery>;
    |                   ^^^^^^^^^^^^
diff --git a/substrate/frame/support/test/tests/pallet_ui/storage_value_no_generic.rs b/substrate/frame/support/test/tests/pallet_ui/storage_value_no_generic.rs
index e62bdafaa2643535e436ae26114645c8507e46c3..60f83f3d803f776454da4e809198ae8e213fc430 100644
--- a/substrate/frame/support/test/tests/pallet_ui/storage_value_no_generic.rs
+++ b/substrate/frame/support/test/tests/pallet_ui/storage_value_no_generic.rs
@@ -1,3 +1,20 @@
+// 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.
+
 #[frame_support::pallet]
 mod pallet {
 	use frame_support::pallet_prelude::Hooks;
diff --git a/substrate/frame/support/test/tests/pallet_ui/storage_value_no_generic.stderr b/substrate/frame/support/test/tests/pallet_ui/storage_value_no_generic.stderr
index f7449c5ffda7d9d84a4f3f4c4d1165ed94d34178..688d7cc5ea1e75617bace28acea6c98840c698e2 100644
--- a/substrate/frame/support/test/tests/pallet_ui/storage_value_no_generic.stderr
+++ b/substrate/frame/support/test/tests/pallet_ui/storage_value_no_generic.stderr
@@ -1,5 +1,5 @@
 error: Invalid pallet::storage, invalid number of generic generic arguments, expect more that 0 generic arguments.
-  --> $DIR/storage_value_no_generic.rs:19:16
+  --> tests/pallet_ui/storage_value_no_generic.rs:36:16
    |
-19 |     type Foo<T> = StorageValue;
+36 |     type Foo<T> = StorageValue;
    |                   ^^^^^^^^^^^^
diff --git a/substrate/frame/support/test/tests/pallet_ui/storage_value_unexpected_named_generic.rs b/substrate/frame/support/test/tests/pallet_ui/storage_value_unexpected_named_generic.rs
index a3e54448e42addc61dae9a1895c3a86dc13e528a..15383c570d1f7e4e228c338381b6d818d67be7aa 100644
--- a/substrate/frame/support/test/tests/pallet_ui/storage_value_unexpected_named_generic.rs
+++ b/substrate/frame/support/test/tests/pallet_ui/storage_value_unexpected_named_generic.rs
@@ -1,3 +1,20 @@
+// 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.
+
 #[frame_support::pallet]
 mod pallet {
 	use frame_support::pallet_prelude::{Hooks, StorageValue};
diff --git a/substrate/frame/support/test/tests/pallet_ui/storage_value_unexpected_named_generic.stderr b/substrate/frame/support/test/tests/pallet_ui/storage_value_unexpected_named_generic.stderr
index f03b71ff5eb6e82434385b4069720382a7b7926e..32e12c89f1b2da81699655ac34b66766e381d8c0 100644
--- a/substrate/frame/support/test/tests/pallet_ui/storage_value_unexpected_named_generic.stderr
+++ b/substrate/frame/support/test/tests/pallet_ui/storage_value_unexpected_named_generic.stderr
@@ -1,11 +1,11 @@
 error: Invalid pallet::storage, Unexpected generic `P` for `StorageValue`. `StorageValue` expect generics `Value`, and optional generics `QueryKind`, `OnEmpty`.
-  --> $DIR/storage_value_unexpected_named_generic.rs:19:29
+  --> tests/pallet_ui/storage_value_unexpected_named_generic.rs:36:29
    |
-19 |     type Foo<T> = StorageValue<P = u32>;
+36 |     type Foo<T> = StorageValue<P = u32>;
    |                                ^
 
 error: Invalid pallet::storage, cannot find `Value` generic, required for `StorageValue`.
-  --> $DIR/storage_value_unexpected_named_generic.rs:19:28
+  --> tests/pallet_ui/storage_value_unexpected_named_generic.rs:36:28
    |
-19 |     type Foo<T> = StorageValue<P = u32>;
+36 |     type Foo<T> = StorageValue<P = u32>;
    |                               ^
diff --git a/substrate/frame/support/test/tests/pallet_ui/storage_wrong_item.rs b/substrate/frame/support/test/tests/pallet_ui/storage_wrong_item.rs
index 56c4b86f2b35a9fde7b16f37776ebef7ee59bfea..90293497a9b294bb42b32e26785a9313f2d45cc9 100644
--- a/substrate/frame/support/test/tests/pallet_ui/storage_wrong_item.rs
+++ b/substrate/frame/support/test/tests/pallet_ui/storage_wrong_item.rs
@@ -1,3 +1,20 @@
+// 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.
+
 #[frame_support::pallet]
 mod pallet {
 	use frame_support::pallet_prelude::Hooks;
diff --git a/substrate/frame/support/test/tests/pallet_ui/storage_wrong_item.stderr b/substrate/frame/support/test/tests/pallet_ui/storage_wrong_item.stderr
index d875d8acec66f6b6b91d1f987d5b462883173a98..3856d44d78e8c5cb6c9d18199dea8bec1d1a2f07 100644
--- a/substrate/frame/support/test/tests/pallet_ui/storage_wrong_item.stderr
+++ b/substrate/frame/support/test/tests/pallet_ui/storage_wrong_item.stderr
@@ -1,5 +1,5 @@
 error: Invalid pallet::storage, expect item type.
-  --> $DIR/storage_wrong_item.rs:19:2
+  --> tests/pallet_ui/storage_wrong_item.rs:36:2
    |
-19 |     impl Foo {}
+36 |     impl Foo {}
    |     ^^^^
diff --git a/substrate/frame/support/test/tests/pallet_ui/store_trait_leak_private.rs b/substrate/frame/support/test/tests/pallet_ui/store_trait_leak_private.rs
index 3ebd1cb9fa608e1526440c6cb6fd6800eb4ccbb1..55dd315fb297cdf55802e25f48b53364b394dd3d 100644
--- a/substrate/frame/support/test/tests/pallet_ui/store_trait_leak_private.rs
+++ b/substrate/frame/support/test/tests/pallet_ui/store_trait_leak_private.rs
@@ -1,3 +1,20 @@
+// 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.
+
 #[frame_support::pallet]
 mod pallet {
 	use frame_support::pallet_prelude::Hooks;
diff --git a/substrate/frame/support/test/tests/pallet_ui/store_trait_leak_private.stderr b/substrate/frame/support/test/tests/pallet_ui/store_trait_leak_private.stderr
index a8836bc0482311a2d37eb3872cd724fff951b780..20144d825e83248b97c5c53053276aab002aa4ac 100644
--- a/substrate/frame/support/test/tests/pallet_ui/store_trait_leak_private.stderr
+++ b/substrate/frame/support/test/tests/pallet_ui/store_trait_leak_private.stderr
@@ -1,18 +1,18 @@
 error: use of deprecated struct `pallet::_::Store`:
                Use of `#[pallet::generate_store(pub(super) trait Store)]` will be removed after July 2023.
                Check https://github.com/paritytech/substrate/pull/13535 for more details.
-  --> tests/pallet_ui/store_trait_leak_private.rs:11:3
+  --> tests/pallet_ui/store_trait_leak_private.rs:28:3
    |
-11 |     #[pallet::generate_store(pub trait Store)]
+28 |     #[pallet::generate_store(pub trait Store)]
    |      ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
    |
    = note: `-D deprecated` implied by `-D warnings`
 
 error[E0446]: private type `_GeneratedPrefixForStorageFoo<T>` in public interface
-  --> tests/pallet_ui/store_trait_leak_private.rs:11:37
+  --> tests/pallet_ui/store_trait_leak_private.rs:28:37
    |
-11 |     #[pallet::generate_store(pub trait Store)]
+28 |     #[pallet::generate_store(pub trait Store)]
    |                                        ^^^^^ can't leak private type
 ...
-20 |     #[pallet::storage]
+37 |     #[pallet::storage]
    |               ------- `_GeneratedPrefixForStorageFoo<T>` declared as private
diff --git a/substrate/frame/support/test/tests/pallet_ui/trait_constant_invalid_bound.rs b/substrate/frame/support/test/tests/pallet_ui/trait_constant_invalid_bound.rs
index ce599d5a31e71b09e711c59f9fb8c41accee9da5..7702de1e39e86774b0de9487db4df92d4bd393f2 100644
--- a/substrate/frame/support/test/tests/pallet_ui/trait_constant_invalid_bound.rs
+++ b/substrate/frame/support/test/tests/pallet_ui/trait_constant_invalid_bound.rs
@@ -1,3 +1,20 @@
+// 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.
+
 #[frame_support::pallet]
 mod pallet {
 	use frame_support::pallet_prelude::Hooks;
diff --git a/substrate/frame/support/test/tests/pallet_ui/trait_constant_invalid_bound.stderr b/substrate/frame/support/test/tests/pallet_ui/trait_constant_invalid_bound.stderr
index 057ec6ffb2c75211a1e34f271815159480b2bc54..a9dbdd23cb4051213ebcfe1f1cac40e0be76775e 100644
--- a/substrate/frame/support/test/tests/pallet_ui/trait_constant_invalid_bound.stderr
+++ b/substrate/frame/support/test/tests/pallet_ui/trait_constant_invalid_bound.stderr
@@ -1,5 +1,5 @@
 error: Invalid usage of `#[pallet::constant]`: `Get<T>` trait bound not found
- --> $DIR/trait_constant_invalid_bound.rs:9:3
-  |
-9 |         type U;
-  |         ^^^^
+  --> tests/pallet_ui/trait_constant_invalid_bound.rs:26:3
+   |
+26 |         type U;
+   |         ^^^^
diff --git a/substrate/frame/support/test/tests/pallet_ui/trait_constant_invalid_bound_lifetime.rs b/substrate/frame/support/test/tests/pallet_ui/trait_constant_invalid_bound_lifetime.rs
index 47303f2b20a023efbeece7e3f3c37d52723b531a..c29259762b2b406af53599753c306b7cbdb456fe 100644
--- a/substrate/frame/support/test/tests/pallet_ui/trait_constant_invalid_bound_lifetime.rs
+++ b/substrate/frame/support/test/tests/pallet_ui/trait_constant_invalid_bound_lifetime.rs
@@ -1,3 +1,20 @@
+// 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.
+
 #[frame_support::pallet]
 mod pallet {
 	use frame_support::pallet_prelude::Hooks;
diff --git a/substrate/frame/support/test/tests/pallet_ui/trait_constant_invalid_bound_lifetime.stderr b/substrate/frame/support/test/tests/pallet_ui/trait_constant_invalid_bound_lifetime.stderr
index 8d830fed8f392b267a27a74aa2ff5b0a54a1abff..7d14aad6256e5781544b3e0c83c64d587e789c0b 100644
--- a/substrate/frame/support/test/tests/pallet_ui/trait_constant_invalid_bound_lifetime.stderr
+++ b/substrate/frame/support/test/tests/pallet_ui/trait_constant_invalid_bound_lifetime.stderr
@@ -1,5 +1,5 @@
 error: Invalid usage of `#[pallet::constant]`: Expected a type argument
- --> $DIR/trait_constant_invalid_bound_lifetime.rs:9:15
-  |
-9 |         type U: Get<'static>;
-  |                     ^^^^^^^
+  --> tests/pallet_ui/trait_constant_invalid_bound_lifetime.rs:26:15
+   |
+26 |         type U: Get<'static>;
+   |                     ^^^^^^^
diff --git a/substrate/frame/support/test/tests/pallet_ui/trait_invalid_item.rs b/substrate/frame/support/test/tests/pallet_ui/trait_invalid_item.rs
index 8537659dcd037e1a488b3f08abce2a35f0cd2a80..af8589ccf64476d7b23ae9554030eb81853b7993 100644
--- a/substrate/frame/support/test/tests/pallet_ui/trait_invalid_item.rs
+++ b/substrate/frame/support/test/tests/pallet_ui/trait_invalid_item.rs
@@ -1,3 +1,20 @@
+// 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.
+
 #[frame_support::pallet]
 mod pallet {
 	use frame_support::pallet_prelude::Hooks;
diff --git a/substrate/frame/support/test/tests/pallet_ui/trait_invalid_item.stderr b/substrate/frame/support/test/tests/pallet_ui/trait_invalid_item.stderr
index e3409a819114a96f52d52732a1bf93f178fa6ada..bf0000209cf2825ae1b51f57d9d0e6e72daedafb 100644
--- a/substrate/frame/support/test/tests/pallet_ui/trait_invalid_item.stderr
+++ b/substrate/frame/support/test/tests/pallet_ui/trait_invalid_item.stderr
@@ -1,5 +1,5 @@
 error: Invalid #[pallet::constant] in #[pallet::config], expected type item
- --> tests/pallet_ui/trait_invalid_item.rs:9:3
-  |
-9 |         const U: u8 = 3;
-  |         ^^^^^
+  --> tests/pallet_ui/trait_invalid_item.rs:26:3
+   |
+26 |         const U: u8 = 3;
+   |         ^^^^^
diff --git a/substrate/frame/support/test/tests/pallet_ui/trait_item_duplicate_constant_attr.rs b/substrate/frame/support/test/tests/pallet_ui/trait_item_duplicate_constant_attr.rs
index 8f3d9f3f3e2f956f47632ceda79b627c32d3701c..ad02fe853677989dfb7c9429c83f2f0d9222c776 100644
--- a/substrate/frame/support/test/tests/pallet_ui/trait_item_duplicate_constant_attr.rs
+++ b/substrate/frame/support/test/tests/pallet_ui/trait_item_duplicate_constant_attr.rs
@@ -1,3 +1,20 @@
+// 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.
+
 #[frame_support::pallet]
 mod pallet {
 	use frame_support::pallet_prelude::*;
diff --git a/substrate/frame/support/test/tests/pallet_ui/trait_item_duplicate_constant_attr.stderr b/substrate/frame/support/test/tests/pallet_ui/trait_item_duplicate_constant_attr.stderr
index 3679b67f07b53bc9ccf999b8c737569cfc9bbfa1..75ae829f977b3702947caf15bdf438826b5bb835 100644
--- a/substrate/frame/support/test/tests/pallet_ui/trait_item_duplicate_constant_attr.stderr
+++ b/substrate/frame/support/test/tests/pallet_ui/trait_item_duplicate_constant_attr.stderr
@@ -1,5 +1,5 @@
 error: Duplicate #[pallet::constant] attribute not allowed.
- --> tests/pallet_ui/trait_item_duplicate_constant_attr.rs:9:4
-  |
-9 |         #[pallet::constant]
-  |          ^^^^^^^^^^^^^^^^^^
+  --> tests/pallet_ui/trait_item_duplicate_constant_attr.rs:26:4
+   |
+26 |         #[pallet::constant]
+   |          ^^^^^^^^^^^^^^^^^^
diff --git a/substrate/frame/support/test/tests/pallet_ui/trait_item_duplicate_no_default.rs b/substrate/frame/support/test/tests/pallet_ui/trait_item_duplicate_no_default.rs
index d2040ec74dc4edc3e123672f67ff01216990cfde..51498e663cdcfff841fb799f6042d4b181090736 100644
--- a/substrate/frame/support/test/tests/pallet_ui/trait_item_duplicate_no_default.rs
+++ b/substrate/frame/support/test/tests/pallet_ui/trait_item_duplicate_no_default.rs
@@ -1,3 +1,20 @@
+// 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.
+
 #[frame_support::pallet]
 mod pallet {
 	use frame_support::pallet_prelude::*;
diff --git a/substrate/frame/support/test/tests/pallet_ui/trait_item_duplicate_no_default.stderr b/substrate/frame/support/test/tests/pallet_ui/trait_item_duplicate_no_default.stderr
index 77a29c394d62dd1a5ca1cd7cabd8f10f7b5926ad..8162af2ea2bb4d2535c4cfe17b242806ec31a6ff 100644
--- a/substrate/frame/support/test/tests/pallet_ui/trait_item_duplicate_no_default.stderr
+++ b/substrate/frame/support/test/tests/pallet_ui/trait_item_duplicate_no_default.stderr
@@ -1,5 +1,5 @@
 error: Duplicate #[pallet::no_default] attribute not allowed.
-  --> tests/pallet_ui/trait_item_duplicate_no_default.rs:10:4
+  --> tests/pallet_ui/trait_item_duplicate_no_default.rs:27:4
    |
-10 |         #[pallet::no_default]
+27 |         #[pallet::no_default]
    |          ^^^^^^^^^^^^^^^^^^^^
diff --git a/substrate/frame/support/test/tests/pallet_ui/trait_no_supertrait.rs b/substrate/frame/support/test/tests/pallet_ui/trait_no_supertrait.rs
index 0fc987f7bbdd7d45e57b5f79d876f02cab73da1c..da3337a87dfe7e8d95ac3f55d7fb9907128152b0 100644
--- a/substrate/frame/support/test/tests/pallet_ui/trait_no_supertrait.rs
+++ b/substrate/frame/support/test/tests/pallet_ui/trait_no_supertrait.rs
@@ -1,3 +1,20 @@
+// 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.
+
 #[frame_support::pallet]
 mod pallet {
 	use frame_support::pallet_prelude::Hooks;
diff --git a/substrate/frame/support/test/tests/pallet_ui/trait_no_supertrait.stderr b/substrate/frame/support/test/tests/pallet_ui/trait_no_supertrait.stderr
index c38f43d28eb3377725bf0fb1cb15da3d74c47b1f..e18ed29daef5358c7bf741972ad8d34ee17b1f7b 100644
--- a/substrate/frame/support/test/tests/pallet_ui/trait_no_supertrait.stderr
+++ b/substrate/frame/support/test/tests/pallet_ui/trait_no_supertrait.stderr
@@ -1,5 +1,5 @@
 error: Invalid pallet::trait, expected explicit `frame_system::Config` as supertrait, found none. (try `pub trait Config: frame_system::Config { ...` or `pub trait Config<I: 'static>: frame_system::Config { ...`). To disable this check, use `#[pallet::disable_frame_system_supertrait_check]`
- --> $DIR/trait_no_supertrait.rs:7:2
-  |
-7 |     pub trait Config {
-  |     ^^^
+  --> tests/pallet_ui/trait_no_supertrait.rs:24:2
+   |
+24 |     pub trait Config {
+   |     ^^^
diff --git a/substrate/frame/support/test/tests/pallet_ui/type_value_error_in_block.rs b/substrate/frame/support/test/tests/pallet_ui/type_value_error_in_block.rs
index a13e1c7c5c2d28cad863c3b31dac236b0bdaf636..90e6893bcbb634429b2d642800f2c868fa13f0e0 100644
--- a/substrate/frame/support/test/tests/pallet_ui/type_value_error_in_block.rs
+++ b/substrate/frame/support/test/tests/pallet_ui/type_value_error_in_block.rs
@@ -1,3 +1,20 @@
+// 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.
+
 #[frame_support::pallet]
 mod pallet {
 	use frame_support::pallet_prelude::Hooks;
diff --git a/substrate/frame/support/test/tests/pallet_ui/type_value_error_in_block.stderr b/substrate/frame/support/test/tests/pallet_ui/type_value_error_in_block.stderr
index f46b89a067b061613d07ee37747b8213613ccc77..41dcd273d9620d4151bdd6e7ba65dd9c24174322 100644
--- a/substrate/frame/support/test/tests/pallet_ui/type_value_error_in_block.stderr
+++ b/substrate/frame/support/test/tests/pallet_ui/type_value_error_in_block.stderr
@@ -1,5 +1,5 @@
 error[E0599]: no function or associated item named `new` found for type `u32` in the current scope
-  --> $DIR/type_value_error_in_block.rs:20:8
+  --> tests/pallet_ui/type_value_error_in_block.rs:37:8
    |
-20 |         u32::new()
+37 |         u32::new()
    |              ^^^ function or associated item not found in `u32`
diff --git a/substrate/frame/support/test/tests/pallet_ui/type_value_forgotten_where_clause.rs b/substrate/frame/support/test/tests/pallet_ui/type_value_forgotten_where_clause.rs
index b04d8b894676d0964ed06fd966e94d89cd8650a5..20a444881d55704dc2ae120a99782baf23eb753e 100644
--- a/substrate/frame/support/test/tests/pallet_ui/type_value_forgotten_where_clause.rs
+++ b/substrate/frame/support/test/tests/pallet_ui/type_value_forgotten_where_clause.rs
@@ -1,3 +1,20 @@
+// 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.
+
 #[frame_support::pallet]
 mod pallet {
 	use frame_support::pallet_prelude::Hooks;
diff --git a/substrate/frame/support/test/tests/pallet_ui/type_value_forgotten_where_clause.stderr b/substrate/frame/support/test/tests/pallet_ui/type_value_forgotten_where_clause.stderr
index d955960c315b021063903e74411cfd03a6a7ade2..93b0caaf8d779f3c36eb98bbd2846773a39bf8fc 100644
--- a/substrate/frame/support/test/tests/pallet_ui/type_value_forgotten_where_clause.stderr
+++ b/substrate/frame/support/test/tests/pallet_ui/type_value_forgotten_where_clause.stderr
@@ -1,53 +1,53 @@
 error[E0277]: the trait bound `<T as frame_system::Config>::AccountId: From<u32>` is not satisfied
-  --> tests/pallet_ui/type_value_forgotten_where_clause.rs:24:34
+  --> tests/pallet_ui/type_value_forgotten_where_clause.rs:41:34
    |
-24 |     #[pallet::type_value] fn Foo<T: Config>() -> u32 { 3u32 }
+41 |     #[pallet::type_value] fn Foo<T: Config>() -> u32 { 3u32 }
    |                                     ^^^^^^ the trait `From<u32>` is not implemented for `<T as frame_system::Config>::AccountId`
    |
 note: required by a bound in `pallet::Config`
-  --> tests/pallet_ui/type_value_forgotten_where_clause.rs:8:51
+  --> tests/pallet_ui/type_value_forgotten_where_clause.rs:25:51
    |
-7  |     pub trait Config: frame_system::Config
+24 |     pub trait Config: frame_system::Config
    |               ------ required by a bound in this trait
-8  |     where <Self as frame_system::Config>::AccountId: From<u32>
+25 |     where <Self as frame_system::Config>::AccountId: From<u32>
    |                                                      ^^^^^^^^^ required by this bound in `Config`
 help: consider further restricting the associated type
    |
-24 |     #[pallet::type_value] fn Foo<T: Config>() -> u32 where <T as frame_system::Config>::AccountId: From<u32> { 3u32 }
+41 |     #[pallet::type_value] fn Foo<T: Config>() -> u32 where <T as frame_system::Config>::AccountId: From<u32> { 3u32 }
    |                                                      +++++++++++++++++++++++++++++++++++++++++++++++++++++++
 
 error[E0277]: the trait bound `<T as frame_system::Config>::AccountId: From<u32>` is not satisfied
-  --> tests/pallet_ui/type_value_forgotten_where_clause.rs:24:12
+  --> tests/pallet_ui/type_value_forgotten_where_clause.rs:41:12
    |
-24 |     #[pallet::type_value] fn Foo<T: Config>() -> u32 { 3u32 }
+41 |     #[pallet::type_value] fn Foo<T: Config>() -> u32 { 3u32 }
    |               ^^^^^^^^^^ the trait `From<u32>` is not implemented for `<T as frame_system::Config>::AccountId`
    |
 note: required by a bound in `pallet::Config`
-  --> tests/pallet_ui/type_value_forgotten_where_clause.rs:8:51
+  --> tests/pallet_ui/type_value_forgotten_where_clause.rs:25:51
    |
-7  |     pub trait Config: frame_system::Config
+24 |     pub trait Config: frame_system::Config
    |               ------ required by a bound in this trait
-8  |     where <Self as frame_system::Config>::AccountId: From<u32>
+25 |     where <Self as frame_system::Config>::AccountId: From<u32>
    |                                                      ^^^^^^^^^ required by this bound in `Config`
 help: consider further restricting the associated type
    |
-24 |     #[pallet::type_value where <T as frame_system::Config>::AccountId: From<u32>] fn Foo<T: Config>() -> u32 { 3u32 }
+41 |     #[pallet::type_value where <T as frame_system::Config>::AccountId: From<u32>] fn Foo<T: Config>() -> u32 { 3u32 }
    |                          +++++++++++++++++++++++++++++++++++++++++++++++++++++++
 
 error[E0277]: the trait bound `<T as frame_system::Config>::AccountId: From<u32>` is not satisfied
-  --> tests/pallet_ui/type_value_forgotten_where_clause.rs:24:12
+  --> tests/pallet_ui/type_value_forgotten_where_clause.rs:41:12
    |
-24 |     #[pallet::type_value] fn Foo<T: Config>() -> u32 { 3u32 }
+41 |     #[pallet::type_value] fn Foo<T: Config>() -> u32 { 3u32 }
    |               ^^^^^^^^^^ the trait `From<u32>` is not implemented for `<T as frame_system::Config>::AccountId`
    |
 note: required by a bound in `pallet::Config`
-  --> tests/pallet_ui/type_value_forgotten_where_clause.rs:8:51
+  --> tests/pallet_ui/type_value_forgotten_where_clause.rs:25:51
    |
-7  |     pub trait Config: frame_system::Config
+24 |     pub trait Config: frame_system::Config
    |               ------ required by a bound in this trait
-8  |     where <Self as frame_system::Config>::AccountId: From<u32>
+25 |     where <Self as frame_system::Config>::AccountId: From<u32>
    |                                                      ^^^^^^^^^ required by this bound in `Config`
 help: consider further restricting the associated type
    |
-24 |     #[pallet::type_value] fn Foo<T: Config>() -> u32 where <T as frame_system::Config>::AccountId: From<u32> { 3u32 }
+41 |     #[pallet::type_value] fn Foo<T: Config>() -> u32 where <T as frame_system::Config>::AccountId: From<u32> { 3u32 }
    |                                                      +++++++++++++++++++++++++++++++++++++++++++++++++++++++
diff --git a/substrate/frame/support/test/tests/pallet_ui/type_value_invalid_item.rs b/substrate/frame/support/test/tests/pallet_ui/type_value_invalid_item.rs
index 1b6c975b09ed1d35e10cdccb22d02a61065a4781..ea13c7f01d4482becebd64ec7bf1fc002c087982 100644
--- a/substrate/frame/support/test/tests/pallet_ui/type_value_invalid_item.rs
+++ b/substrate/frame/support/test/tests/pallet_ui/type_value_invalid_item.rs
@@ -1,3 +1,20 @@
+// 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.
+
 #[frame_support::pallet]
 mod pallet {
 	use frame_support::pallet_prelude::{Hooks, PhantomData};
diff --git a/substrate/frame/support/test/tests/pallet_ui/type_value_invalid_item.stderr b/substrate/frame/support/test/tests/pallet_ui/type_value_invalid_item.stderr
index 5ae618df8837c2a7c4bc734bf5b8b9bb27c5794d..94fe88418e6e6e787c97ffaca2ef8a8f51e63b78 100644
--- a/substrate/frame/support/test/tests/pallet_ui/type_value_invalid_item.stderr
+++ b/substrate/frame/support/test/tests/pallet_ui/type_value_invalid_item.stderr
@@ -1,5 +1,5 @@
 error: Invalid pallet::type_value, expected item fn
-  --> $DIR/type_value_invalid_item.rs:18:24
+  --> tests/pallet_ui/type_value_invalid_item.rs:35:24
    |
-18 |     #[pallet::type_value] struct Foo;
+35 |     #[pallet::type_value] struct Foo;
    |                           ^^^^^^
diff --git a/substrate/frame/support/test/tests/pallet_ui/type_value_no_return.rs b/substrate/frame/support/test/tests/pallet_ui/type_value_no_return.rs
index 82eb3b17d0393b8c7bd3bbd729dd28d01f66858f..e9c24b4b8c9454ea969cfc87e9fb0f1096248e01 100644
--- a/substrate/frame/support/test/tests/pallet_ui/type_value_no_return.rs
+++ b/substrate/frame/support/test/tests/pallet_ui/type_value_no_return.rs
@@ -1,3 +1,20 @@
+// 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.
+
 #[frame_support::pallet]
 mod pallet {
 	use frame_support::pallet_prelude::{Hooks, PhantomData};
diff --git a/substrate/frame/support/test/tests/pallet_ui/type_value_no_return.stderr b/substrate/frame/support/test/tests/pallet_ui/type_value_no_return.stderr
index 65ac0243f9f64eadf1c1f585321d608be15f194b..58c45dfe87929f9bbd36180d9135cfb5ed45ddc7 100644
--- a/substrate/frame/support/test/tests/pallet_ui/type_value_no_return.stderr
+++ b/substrate/frame/support/test/tests/pallet_ui/type_value_no_return.stderr
@@ -1,5 +1,5 @@
 error: Invalid pallet::type_value, expected return type
-  --> $DIR/type_value_no_return.rs:18:24
+  --> tests/pallet_ui/type_value_no_return.rs:35:24
    |
-18 |     #[pallet::type_value] fn Foo() {}
+35 |     #[pallet::type_value] fn Foo() {}
    |                           ^^
diff --git a/substrate/frame/support/test/tests/split_ui/import_without_pallet.rs b/substrate/frame/support/test/tests/split_ui/import_without_pallet.rs
index 874a92e4610986e807370865ab9f4d60f3f4d32f..e62828ddf3ea3eed8f4310181f47e546e8d31a6b 100644
--- a/substrate/frame/support/test/tests/split_ui/import_without_pallet.rs
+++ b/substrate/frame/support/test/tests/split_ui/import_without_pallet.rs
@@ -1,3 +1,20 @@
+// 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.
+
 #![cfg_attr(not(feature = "std"), no_std)]
 
 use frame_support::pallet_macros::*;
diff --git a/substrate/frame/support/test/tests/split_ui/import_without_pallet.stderr b/substrate/frame/support/test/tests/split_ui/import_without_pallet.stderr
index 0d7b5414b10162623db997d5921971066e5ddab0..4db71c5905056ae03f672eb839cfbf68a79e99f2 100644
--- a/substrate/frame/support/test/tests/split_ui/import_without_pallet.stderr
+++ b/substrate/frame/support/test/tests/split_ui/import_without_pallet.stderr
@@ -1,5 +1,5 @@
 error: `#[import_section]` can only be applied to a valid pallet module
-  --> tests/split_ui/import_without_pallet.rs:12:9
+  --> tests/split_ui/import_without_pallet.rs:29:9
    |
-12 | pub mod pallet {
+29 | pub mod pallet {
    |         ^^^^^^
diff --git a/substrate/frame/support/test/tests/split_ui/no_section_found.rs b/substrate/frame/support/test/tests/split_ui/no_section_found.rs
index fe12c6dc51b7295c5e6aceea784e9c21852b3b05..95b90a479169f6b9cc3d01794fbc85d214eae898 100644
--- a/substrate/frame/support/test/tests/split_ui/no_section_found.rs
+++ b/substrate/frame/support/test/tests/split_ui/no_section_found.rs
@@ -1,3 +1,20 @@
+// 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.
+
 #![cfg_attr(not(feature = "std"), no_std)]
 
 use frame_support::pallet_macros::*;
diff --git a/substrate/frame/support/test/tests/split_ui/no_section_found.stderr b/substrate/frame/support/test/tests/split_ui/no_section_found.stderr
index e0a9322b188e33372331a2293584744b6898b09f..486543c16eda248b3c214b06749f7cbb75079056 100644
--- a/substrate/frame/support/test/tests/split_ui/no_section_found.stderr
+++ b/substrate/frame/support/test/tests/split_ui/no_section_found.stderr
@@ -1,13 +1,13 @@
 error[E0432]: unresolved import `pallet`
- --> tests/split_ui/no_section_found.rs:5:9
-  |
-5 | pub use pallet::*;
-  |         ^^^^^^ help: a similar path exists: `test_pallet::pallet`
+  --> tests/split_ui/no_section_found.rs:22:9
+   |
+22 | pub use pallet::*;
+   |         ^^^^^^ help: a similar path exists: `test_pallet::pallet`
 
 error: cannot find macro `__export_tokens_tt_storages_dev` in this scope
- --> tests/split_ui/no_section_found.rs:7:1
-  |
-7 | #[import_section(storages_dev)]
-  | ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
-  |
-  = note: this error originates in the macro `frame_support::macro_magic::forward_tokens` (in Nightly builds, run with -Z macro-backtrace for more info)
+  --> tests/split_ui/no_section_found.rs:24:1
+   |
+24 | #[import_section(storages_dev)]
+   | ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
+   |
+   = note: this error originates in the macro `frame_support::macro_magic::forward_tokens` (in Nightly builds, run with -Z macro-backtrace for more info)
diff --git a/substrate/frame/support/test/tests/split_ui/pass/split_valid.rs b/substrate/frame/support/test/tests/split_ui/pass/split_valid.rs
index 8b5839ecd28a00c67fa7f8c84186ecdd43e5c413..a3ad7c2bf6f98e6f3187af95d3b29e0abc722567 100644
--- a/substrate/frame/support/test/tests/split_ui/pass/split_valid.rs
+++ b/substrate/frame/support/test/tests/split_ui/pass/split_valid.rs
@@ -1,3 +1,20 @@
+// 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.
+
 #![cfg_attr(not(feature = "std"), no_std)]
 
 use frame_support::pallet_macros::*;
diff --git a/substrate/frame/support/test/tests/split_ui/pass/split_valid_disambiguation.rs b/substrate/frame/support/test/tests/split_ui/pass/split_valid_disambiguation.rs
index 8d8d50422e9ce46ac101bfaf517a149b1f619e83..dba0eb7333a010ea66ac652e3aa85aae14c465d2 100644
--- a/substrate/frame/support/test/tests/split_ui/pass/split_valid_disambiguation.rs
+++ b/substrate/frame/support/test/tests/split_ui/pass/split_valid_disambiguation.rs
@@ -1,3 +1,20 @@
+// 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.
+
 #![cfg_attr(not(feature = "std"), no_std)]
 
 use frame_support::pallet_macros::*;
diff --git a/substrate/frame/support/test/tests/split_ui/section_not_imported.rs b/substrate/frame/support/test/tests/split_ui/section_not_imported.rs
index bcabf66256771696f17ac00bc81457b7ad3713a6..dc1e84ad28bbcf3d4a20c448194aa0acef1894c7 100644
--- a/substrate/frame/support/test/tests/split_ui/section_not_imported.rs
+++ b/substrate/frame/support/test/tests/split_ui/section_not_imported.rs
@@ -1,3 +1,20 @@
+// 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.
+
 #![cfg_attr(not(feature = "std"), no_std)]
 
 use frame_support::pallet_macros::*;
diff --git a/substrate/frame/support/test/tests/split_ui/section_not_imported.stderr b/substrate/frame/support/test/tests/split_ui/section_not_imported.stderr
index 41ac2a5f58d253b0b6a51d8706e3e64a531cfb79..f79ac938a61e65665e1cc242fafa326090f2900e 100644
--- a/substrate/frame/support/test/tests/split_ui/section_not_imported.stderr
+++ b/substrate/frame/support/test/tests/split_ui/section_not_imported.stderr
@@ -1,7 +1,7 @@
 error[E0433]: failed to resolve: use of undeclared type `MyStorageMap`
-  --> tests/split_ui/section_not_imported.rs:27:4
+  --> tests/split_ui/section_not_imported.rs:44:4
    |
-27 |             MyStorageMap::<T>::insert(1, 2);
+44 |             MyStorageMap::<T>::insert(1, 2);
    |             ^^^^^^^^^^^^
    |             |
    |             use of undeclared type `MyStorageMap`
diff --git a/substrate/frame/support/test/tests/storage_alias_ui/checks_for_valid_storage_type.rs b/substrate/frame/support/test/tests/storage_alias_ui/checks_for_valid_storage_type.rs
index 4ed9d5adfec77f1ea9bb7de1c143a767a3a420bf..362e6ead61e5e0bb5ce65df1a110423d92119878 100644
--- a/substrate/frame/support/test/tests/storage_alias_ui/checks_for_valid_storage_type.rs
+++ b/substrate/frame/support/test/tests/storage_alias_ui/checks_for_valid_storage_type.rs
@@ -1,3 +1,20 @@
+// 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.
+
 #[frame_support::storage_alias]
 type Ident = StorageValue<hello::World, u32>;
 
diff --git a/substrate/frame/support/test/tests/storage_alias_ui/checks_for_valid_storage_type.stderr b/substrate/frame/support/test/tests/storage_alias_ui/checks_for_valid_storage_type.stderr
index 726efed400715c1d9b4378a52c08056ad989df05..e793aeb85bc739ff0de116aed5b0826221c43aaf 100644
--- a/substrate/frame/support/test/tests/storage_alias_ui/checks_for_valid_storage_type.stderr
+++ b/substrate/frame/support/test/tests/storage_alias_ui/checks_for_valid_storage_type.stderr
@@ -1,5 +1,5 @@
 error: If there are no generics, the prefix is only allowed to be an identifier.
- --> tests/storage_alias_ui/checks_for_valid_storage_type.rs:2:27
-  |
-2 | type Ident = StorageValue<hello::World, u32>;
-  |                           ^^^^^^^^^^^^
+  --> tests/storage_alias_ui/checks_for_valid_storage_type.rs:19:27
+   |
+19 | type Ident = StorageValue<hello::World, u32>;
+   |                           ^^^^^^^^^^^^
diff --git a/substrate/frame/support/test/tests/storage_alias_ui/forbid_underscore_as_prefix.rs b/substrate/frame/support/test/tests/storage_alias_ui/forbid_underscore_as_prefix.rs
index 59d8004bbe620eed27573dcb3147534f85d988e5..08bc8d6cc478cb08df66d2ee9a882cf5ab14aae0 100644
--- a/substrate/frame/support/test/tests/storage_alias_ui/forbid_underscore_as_prefix.rs
+++ b/substrate/frame/support/test/tests/storage_alias_ui/forbid_underscore_as_prefix.rs
@@ -1,3 +1,20 @@
+// 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.
+
 #[frame_support::storage_alias]
 type Ident = CustomStorage<Hello, u32>;
 
diff --git a/substrate/frame/support/test/tests/storage_alias_ui/forbid_underscore_as_prefix.stderr b/substrate/frame/support/test/tests/storage_alias_ui/forbid_underscore_as_prefix.stderr
index 3b5e3e9c23cca0353c0f497f6e3eb33ebaa919b4..9f173472a8b9f93e6a58bafe02444eb95879c2b1 100644
--- a/substrate/frame/support/test/tests/storage_alias_ui/forbid_underscore_as_prefix.stderr
+++ b/substrate/frame/support/test/tests/storage_alias_ui/forbid_underscore_as_prefix.stderr
@@ -1,5 +1,5 @@
 error: expected one of: `StorageValue`, `StorageMap`, `CountedStorageMap`, `StorageDoubleMap`, `StorageNMap`
- --> tests/storage_alias_ui/forbid_underscore_as_prefix.rs:2:14
-  |
-2 | type Ident = CustomStorage<Hello, u32>;
-  |              ^^^^^^^^^^^^^
+  --> tests/storage_alias_ui/forbid_underscore_as_prefix.rs:19:14
+   |
+19 | type Ident = CustomStorage<Hello, u32>;
+   |              ^^^^^^^^^^^^^
diff --git a/substrate/frame/support/test/tests/storage_alias_ui/prefix_must_be_an_ident.rs b/substrate/frame/support/test/tests/storage_alias_ui/prefix_must_be_an_ident.rs
index 79328268dc925d7f6812474fb59ec53580bef1d6..4b0978f5f96c437b6f1f343e0b907a56cb39da0f 100644
--- a/substrate/frame/support/test/tests/storage_alias_ui/prefix_must_be_an_ident.rs
+++ b/substrate/frame/support/test/tests/storage_alias_ui/prefix_must_be_an_ident.rs
@@ -1,3 +1,20 @@
+// 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.
+
 #[frame_support::storage_alias]
 type NoUnderscore = StorageValue<_, u32>;
 
diff --git a/substrate/frame/support/test/tests/storage_alias_ui/prefix_must_be_an_ident.stderr b/substrate/frame/support/test/tests/storage_alias_ui/prefix_must_be_an_ident.stderr
index abb7bf2518f4f3cb6c158a1d0077f053c25f4141..18810f20d38459bb43296a8ef725765397f48412 100644
--- a/substrate/frame/support/test/tests/storage_alias_ui/prefix_must_be_an_ident.stderr
+++ b/substrate/frame/support/test/tests/storage_alias_ui/prefix_must_be_an_ident.stderr
@@ -1,5 +1,5 @@
 error: `_` is not allowed as prefix by `storage_alias`.
- --> tests/storage_alias_ui/prefix_must_be_an_ident.rs:2:34
-  |
-2 | type NoUnderscore = StorageValue<_, u32>;
-  |                                  ^
+  --> tests/storage_alias_ui/prefix_must_be_an_ident.rs:19:34
+   |
+19 | type NoUnderscore = StorageValue<_, u32>;
+   |                                  ^
diff --git a/substrate/frame/support/test/tests/versioned_runtime_upgrade.rs b/substrate/frame/support/test/tests/versioned_migration.rs
similarity index 93%
rename from substrate/frame/support/test/tests/versioned_runtime_upgrade.rs
rename to substrate/frame/support/test/tests/versioned_migration.rs
index 93d87df8ca185ae50041f24c8906f8696836c421..03dbd948df92a73f0567338e575000fca11ceb8d 100644
--- a/substrate/frame/support/test/tests/versioned_runtime_upgrade.rs
+++ b/substrate/frame/support/test/tests/versioned_migration.rs
@@ -15,13 +15,13 @@
 // See the License for the specific language governing permissions and
 // limitations under the License.
 
-//! Tests for VersionedRuntimeUpgrade
+//! Tests for [`VersionedMigration`]
 
-#![cfg(all(feature = "experimental", feature = "try-runtime"))]
+#![cfg(feature = "try-runtime")]
 
 use frame_support::{
 	construct_runtime, derive_impl,
-	migrations::VersionedRuntimeUpgrade,
+	migrations::VersionedMigration,
 	parameter_types,
 	traits::{GetStorageVersion, OnRuntimeUpgrade, StorageVersion},
 	weights::constants::RocksDbWeight,
@@ -90,7 +90,7 @@ pub(crate) fn new_test_ext() -> sp_io::TestExternalities {
 	ext
 }
 
-/// A dummy migration for testing the `VersionedRuntimeUpgrade` trait.
+/// A dummy migration for testing the `VersionedMigration` trait.
 /// Sets SomeStorage to S.
 struct SomeUnversionedMigration<T: Config, const S: u32>(sp_std::marker::PhantomData<T>);
 
@@ -124,13 +124,13 @@ impl<T: dummy_pallet::Config, const S: u32> OnRuntimeUpgrade for SomeUnversioned
 }
 
 type VersionedMigrationV0ToV1 =
-	VersionedRuntimeUpgrade<0, 1, SomeUnversionedMigration<Test, 1>, DummyPallet, RocksDbWeight>;
+	VersionedMigration<0, 1, SomeUnversionedMigration<Test, 1>, DummyPallet, RocksDbWeight>;
 
 type VersionedMigrationV1ToV2 =
-	VersionedRuntimeUpgrade<1, 2, SomeUnversionedMigration<Test, 2>, DummyPallet, RocksDbWeight>;
+	VersionedMigration<1, 2, SomeUnversionedMigration<Test, 2>, DummyPallet, RocksDbWeight>;
 
 type VersionedMigrationV2ToV4 =
-	VersionedRuntimeUpgrade<2, 4, SomeUnversionedMigration<Test, 4>, DummyPallet, RocksDbWeight>;
+	VersionedMigration<2, 4, SomeUnversionedMigration<Test, 4>, DummyPallet, RocksDbWeight>;
 
 #[test]
 fn successful_upgrade_path() {
diff --git a/substrate/frame/system/Cargo.toml b/substrate/frame/system/Cargo.toml
index 0fd09dabd9be035ca5a68fc1bf1efa21fb9ad67d..d1d5897ce35524adf1d2b034700bd2fc5505d39b 100644
--- a/substrate/frame/system/Cargo.toml
+++ b/substrate/frame/system/Cargo.toml
@@ -1,11 +1,11 @@
 [package]
 name = "frame-system"
 version = "4.0.0-dev"
-authors = ["Parity Technologies <admin@parity.io>"]
-edition = "2021"
+authors.workspace = true
+edition.workspace = true
 license = "Apache-2.0"
 homepage = "https://substrate.io"
-repository = "https://github.com/paritytech/substrate/"
+repository.workspace = true
 description = "FRAME system module"
 readme = "README.md"
 
@@ -17,7 +17,7 @@ cfg-if = "1.0"
 codec = { package = "parity-scale-codec", version = "3.6.1", default-features = false, features = ["derive"] }
 log = { version = "0.4.17", default-features = false }
 scale-info = { version = "2.5.0", default-features = false, features = ["derive", "serde"] }
-serde = { version = "1.0.163", default-features = false, features = ["derive", "alloc"] }
+serde = { version = "1.0.188", default-features = false, features = ["derive", "alloc"] }
 frame-support = { path = "../support", default-features = false}
 sp-core = { path = "../../primitives/core", default-features = false, features = ["serde"] }
 sp-io = { path = "../../primitives/io", default-features = false}
diff --git a/substrate/frame/system/README.md b/substrate/frame/system/README.md
index 30b2ea73720cf1fa7af62f5cd82c32fda3f0e3ac..c15281d365ba7482de57e6ce372f19b2861322bb 100644
--- a/substrate/frame/system/README.md
+++ b/substrate/frame/system/README.md
@@ -1,20 +1,20 @@
 # System Module
 
-The System module provides low-level access to core types and cross-cutting utilities.
-It acts as the base layer for other pallets to interact with the Substrate framework components.
+The System module provides low-level access to core types and cross-cutting utilities. It acts as the base layer for
+other pallets to interact with the Substrate framework components.
 
 - [`system::Config`](https://docs.rs/frame-system/latest/frame_system/pallet/trait.Config.html)
 
 ## Overview
 
-The System module defines the core data types used in a Substrate runtime.
-It also provides several utility functions (see [`Pallet`](https://docs.rs/frame-system/latest/frame_system/pallet/struct.Pallet.html)) for other FRAME pallets.
+The System module defines the core data types used in a Substrate runtime. It also provides several utility functions
+(see [`Pallet`](https://docs.rs/frame-system/latest/frame_system/pallet/struct.Pallet.html)) for other FRAME pallets.
 
-In addition, it manages the storage items for extrinsics data, indexes, event records, and digest items,
-among other things that support the execution of the current block.
+In addition, it manages the storage items for extrinsics data, indexes, event records, and digest items, among other
+things that support the execution of the current block.
 
-It also handles low-level tasks like depositing logs, basic set up and take down of
-temporary storage entries, and access to previous block hashes.
+It also handles low-level tasks like depositing logs, basic set up and take down of temporary storage entries, and
+access to previous block hashes.
 
 ## Interface
 
@@ -24,26 +24,22 @@ The System module does not implement any dispatchable functions.
 
 ### Public Functions
 
-See the [`Pallet`](https://docs.rs/frame-system/latest/frame_system/pallet/struct.Pallet.html) struct for details of publicly available functions.
+See the [`Pallet`](https://docs.rs/frame-system/latest/frame_system/pallet/struct.Pallet.html) struct for details of
+publicly available functions.
 
 ### Signed Extensions
 
 The System module defines the following extensions:
 
-  - [`CheckWeight`]: Checks the weight and length of the block and ensure that it does not
-    exceed the limits.
-  - [`CheckNonce`]: Checks the nonce of the transaction. Contains a single payload of type
-    `T::Nonce`.
+  - [`CheckWeight`]: Checks the weight and length of the block and ensure that it does not exceed the limits.
+  - [`CheckNonce`]: Checks the nonce of the transaction. Contains a single payload of type `T::Nonce`.
   - [`CheckEra`]: Checks the era of the transaction. Contains a single payload of type `Era`.
-  - [`CheckGenesis`]: Checks the provided genesis hash of the transaction. Must be a part of the
-    signed payload of the transaction.
-  - [`CheckSpecVersion`]: Checks that the runtime version is the same as the one used to sign the
-    transaction.
-  - [`CheckTxVersion`]: Checks that the transaction version is the same as the one used to sign the
+  - [`CheckGenesis`]: Checks the provided genesis hash of the transaction. Must be a part of the signed payload of the
     transaction.
+  - [`CheckSpecVersion`]: Checks that the runtime version is the same as the one used to sign the transaction.
+  - [`CheckTxVersion`]: Checks that the transaction version is the same as the one used to sign the transaction.
 
-Lookup the runtime aggregator file (e.g. `node/runtime`) to see the full list of signed
-extensions included in a chain.
+Lookup the runtime aggregator file (e.g. `node/runtime`) to see the full list of signed extensions included in a chain.
 
 ## Usage
 
diff --git a/substrate/frame/system/benchmarking/Cargo.toml b/substrate/frame/system/benchmarking/Cargo.toml
index 8a03e75fa21c7310efed10ee6e60c58c0fd3a86f..0bd9299f783c25bafba79248716f7ad4879e80c4 100644
--- a/substrate/frame/system/benchmarking/Cargo.toml
+++ b/substrate/frame/system/benchmarking/Cargo.toml
@@ -1,11 +1,11 @@
 [package]
 name = "frame-system-benchmarking"
 version = "4.0.0-dev"
-authors = ["Parity Technologies <admin@parity.io>"]
-edition = "2021"
+authors.workspace = true
+edition.workspace = true
 license = "Apache-2.0"
 homepage = "https://substrate.io"
-repository = "https://github.com/paritytech/substrate/"
+repository.workspace = true
 description = "FRAME System benchmarking"
 readme = "README.md"
 
diff --git a/substrate/frame/system/benchmarking/README.md b/substrate/frame/system/benchmarking/README.md
index 9718db58b37e9ae1c81b5b627fe27e51129cf418..811207fd8c0f916f31d08d27fc53499572b6bef4 100644
--- a/substrate/frame/system/benchmarking/README.md
+++ b/substrate/frame/system/benchmarking/README.md
@@ -1 +1 @@
-License: Apache-2.0
\ No newline at end of file
+License: Apache-2.0
diff --git a/substrate/frame/system/benchmarking/res/README.md b/substrate/frame/system/benchmarking/res/README.md
index 43bb2b5c283ef895211ed06d8e17fdcb651ab02f..6eca9229531a34c76ffcc12879518200a6cc9a4b 100644
--- a/substrate/frame/system/benchmarking/res/README.md
+++ b/substrate/frame/system/benchmarking/res/README.md
@@ -2,4 +2,5 @@ These runtimes are used for benchmarking the `set_code` intrinsic.
 
 **Don't use them in production environments!**
 
-To update the just copy the new runtime from `target/release/wbuild/kitchensink-runtime/kitchensink_runtime.compact.compressed.wasm` to here.
+To update the just copy the new runtime from
+`target/release/wbuild/kitchensink-runtime/kitchensink_runtime.compact.compressed.wasm` to here.
diff --git a/substrate/frame/system/rpc/runtime-api/Cargo.toml b/substrate/frame/system/rpc/runtime-api/Cargo.toml
index b4dcc3960977ab3fa417a3adfe23293feb8048b1..81b6d946d462f863f417b5c354226c3ab8176957 100644
--- a/substrate/frame/system/rpc/runtime-api/Cargo.toml
+++ b/substrate/frame/system/rpc/runtime-api/Cargo.toml
@@ -1,11 +1,11 @@
 [package]
 name = "frame-system-rpc-runtime-api"
 version = "4.0.0-dev"
-authors = ["Parity Technologies <admin@parity.io>"]
-edition = "2021"
+authors.workspace = true
+edition.workspace = true
 license = "Apache-2.0"
 homepage = "https://substrate.io"
-repository = "https://github.com/paritytech/substrate/"
+repository.workspace = true
 description = "Runtime API definition required by System RPC extensions."
 readme = "README.md"
 
diff --git a/substrate/frame/system/rpc/runtime-api/README.md b/substrate/frame/system/rpc/runtime-api/README.md
index ab46c22a8be3345b13dc4674f3234cb8f511851b..d418cad5a342e6bcf634def7dde600f7f6646b92 100644
--- a/substrate/frame/system/rpc/runtime-api/README.md
+++ b/substrate/frame/system/rpc/runtime-api/README.md
@@ -4,4 +4,4 @@ This API should be imported and implemented by the runtime,
 of a node that wants to use the custom RPC extension
 adding System access methods.
 
-License: Apache-2.0
\ No newline at end of file
+License: Apache-2.0
diff --git a/substrate/frame/system/src/extensions/check_nonce.rs b/substrate/frame/system/src/extensions/check_nonce.rs
index 2939fd6534c09c7e5b59816b821d781966273e81..7504a814aef13b0230e1067c0d95e0104ad74275 100644
--- a/substrate/frame/system/src/extensions/check_nonce.rs
+++ b/substrate/frame/system/src/extensions/check_nonce.rs
@@ -20,7 +20,7 @@ use codec::{Decode, Encode};
 use frame_support::dispatch::DispatchInfo;
 use scale_info::TypeInfo;
 use sp_runtime::{
-	traits::{DispatchInfoOf, Dispatchable, One, SignedExtension},
+	traits::{DispatchInfoOf, Dispatchable, One, SignedExtension, Zero},
 	transaction_validity::{
 		InvalidTransaction, TransactionLongevity, TransactionValidity, TransactionValidityError,
 		ValidTransaction,
@@ -80,6 +80,10 @@ where
 		_len: usize,
 	) -> Result<(), TransactionValidityError> {
 		let mut account = crate::Account::<T>::get(who);
+		if account.providers.is_zero() && account.sufficients.is_zero() {
+			// Nonce storage not paid for
+			return Err(InvalidTransaction::Payment.into())
+		}
 		if self.0 != account.nonce {
 			return Err(if self.0 < account.nonce {
 				InvalidTransaction::Stale
@@ -100,8 +104,11 @@ where
 		_info: &DispatchInfoOf<Self::Call>,
 		_len: usize,
 	) -> TransactionValidity {
-		// check index
 		let account = crate::Account::<T>::get(who);
+		if account.providers.is_zero() && account.sufficients.is_zero() {
+			// Nonce storage not paid for
+			return InvalidTransaction::Payment.into()
+		}
 		if self.0 < account.nonce {
 			return InvalidTransaction::Stale.into()
 		}
@@ -137,7 +144,7 @@ mod tests {
 				crate::AccountInfo {
 					nonce: 1,
 					consumers: 0,
-					providers: 0,
+					providers: 1,
 					sufficients: 0,
 					data: 0,
 				},
@@ -164,4 +171,47 @@ mod tests {
 			);
 		})
 	}
+
+	#[test]
+	fn signed_ext_check_nonce_requires_provider() {
+		new_test_ext().execute_with(|| {
+			crate::Account::<Test>::insert(
+				2,
+				crate::AccountInfo {
+					nonce: 1,
+					consumers: 0,
+					providers: 1,
+					sufficients: 0,
+					data: 0,
+				},
+			);
+			crate::Account::<Test>::insert(
+				3,
+				crate::AccountInfo {
+					nonce: 1,
+					consumers: 0,
+					providers: 0,
+					sufficients: 1,
+					data: 0,
+				},
+			);
+			let info = DispatchInfo::default();
+			let len = 0_usize;
+			// Both providers and sufficients zero
+			assert_noop!(
+				CheckNonce::<Test>(1).validate(&1, CALL, &info, len),
+				InvalidTransaction::Payment
+			);
+			assert_noop!(
+				CheckNonce::<Test>(1).pre_dispatch(&1, CALL, &info, len),
+				InvalidTransaction::Payment
+			);
+			// Non-zero providers
+			assert_ok!(CheckNonce::<Test>(1).validate(&2, CALL, &info, len));
+			assert_ok!(CheckNonce::<Test>(1).pre_dispatch(&2, CALL, &info, len));
+			// Non-zero sufficients
+			assert_ok!(CheckNonce::<Test>(1).validate(&3, CALL, &info, len));
+			assert_ok!(CheckNonce::<Test>(1).pre_dispatch(&3, CALL, &info, len));
+		})
+	}
 }
diff --git a/substrate/frame/system/src/lib.rs b/substrate/frame/system/src/lib.rs
index 84b6dc031457db67ebd9eba43b83571fb70220bf..897d3bd7ce91f6796aebccc4429e0538668cb297 100644
--- a/substrate/frame/system/src/lib.rs
+++ b/substrate/frame/system/src/lib.rs
@@ -420,8 +420,9 @@ pub mod pallet {
 		///
 		/// Can be executed by every `origin`.
 		#[pallet::call_index(0)]
-		#[pallet::weight(T::SystemWeightInfo::remark(_remark.len() as u32))]
-		pub fn remark(_origin: OriginFor<T>, _remark: Vec<u8>) -> DispatchResultWithPostInfo {
+		#[pallet::weight(T::SystemWeightInfo::remark(remark.len() as u32))]
+		pub fn remark(_origin: OriginFor<T>, remark: Vec<u8>) -> DispatchResultWithPostInfo {
+			let _ = remark; // No need to check the weight witness.
 			Ok(().into())
 		}
 
@@ -495,16 +496,16 @@ pub mod pallet {
 		/// the prefix we are removing to accurately calculate the weight of this function.
 		#[pallet::call_index(6)]
 		#[pallet::weight((
-			T::SystemWeightInfo::kill_prefix(_subkeys.saturating_add(1)),
+			T::SystemWeightInfo::kill_prefix(subkeys.saturating_add(1)),
 			DispatchClass::Operational,
 		))]
 		pub fn kill_prefix(
 			origin: OriginFor<T>,
 			prefix: Key,
-			_subkeys: u32,
+			subkeys: u32,
 		) -> DispatchResultWithPostInfo {
 			ensure_root(origin)?;
-			let _ = storage::unhashed::clear_prefix(&prefix, None, None);
+			let _ = storage::unhashed::clear_prefix(&prefix, Some(subkeys), None);
 			Ok(().into())
 		}
 
diff --git a/substrate/frame/timestamp/Cargo.toml b/substrate/frame/timestamp/Cargo.toml
index e2ae1c5dee88c8b8ae7d86ce5173fad4ef5f803e..291f6b1cf590ac0bdb751b8d5af9b6c0e22ab0e3 100644
--- a/substrate/frame/timestamp/Cargo.toml
+++ b/substrate/frame/timestamp/Cargo.toml
@@ -1,11 +1,11 @@
 [package]
 name = "pallet-timestamp"
 version = "4.0.0-dev"
-authors = ["Parity Technologies <admin@parity.io>"]
-edition = "2021"
+authors.workspace = true
+edition.workspace = true
 license = "Apache-2.0"
 homepage = "https://substrate.io"
-repository = "https://github.com/paritytech/substrate/"
+repository.workspace = true
 description = "FRAME Timestamp Module"
 documentation = "https://docs.rs/pallet-timestamp"
 readme = "README.md"
@@ -27,6 +27,8 @@ sp-std = { path = "../../primitives/std", default-features = false}
 sp-storage = { path = "../../primitives/storage", default-features = false}
 sp-timestamp = { path = "../../primitives/timestamp", default-features = false}
 
+docify = "0.2.4"
+
 [dev-dependencies]
 sp-core = { path = "../../primitives/core" }
 sp-io = { path = "../../primitives/io" }
diff --git a/substrate/frame/timestamp/README.md b/substrate/frame/timestamp/README.md
index 1546377ee67432bd2b2b42556aba096fc224185e..55c8343187b61e391f867b55320b37b147bd4b8f 100644
--- a/substrate/frame/timestamp/README.md
+++ b/substrate/frame/timestamp/README.md
@@ -22,16 +22,16 @@ because of cumulative calculation errors and hence should be avoided.
 
 ### Dispatchable Functions
 
-* `set` - Sets the current time.
+- `set` - Sets the current time.
 
 ### Public functions
 
-* `get` - Gets the current time for the current block. If this function is called prior to
+- `get` - Gets the current time for the current block. If this function is called prior to
 setting the timestamp, it will return the timestamp of the previous block.
 
 ### Config Getters
 
-* `MinimumPeriod` - Gets the minimum (and advised) period between blocks for the chain.
+- `MinimumPeriod` - Gets the minimum (and advised) period between blocks for the chain.
 
 ## Usage
 
@@ -73,11 +73,11 @@ pub mod pallet {
 
 ### Example from the FRAME
 
-The [Session module](https://github.com/paritytech/substrate/blob/master/frame/session/src/lib.rs) uses
+The [Session module](https://github.com/paritytech/polkadot-sdk/blob/master/substrate/frame/session/src/lib.rs) uses
 the Timestamp module for session management.
 
 ## Related Modules
 
-* [Session](https://docs.rs/pallet-session/latest/pallet_session/)
+- [Session](https://docs.rs/pallet-session/latest/pallet_session/)
 
 License: Apache-2.0
diff --git a/substrate/frame/timestamp/src/lib.rs b/substrate/frame/timestamp/src/lib.rs
index 4eb95941d782881778c493ea28f88492438c8be4..ad055bab004f99a49710a2e479a54910b249cc00 100644
--- a/substrate/frame/timestamp/src/lib.rs
+++ b/substrate/frame/timestamp/src/lib.rs
@@ -15,53 +15,40 @@
 // See the License for the specific language governing permissions and
 // limitations under the License.
 
-//! # Timestamp Pallet
-//!
-//! The Timestamp pallet provides functionality to get and set the on-chain time.
-//!
-//! - [`Config`]
-//! - [`Call`]
-//! - [`Pallet`]
-//!
-//! ## Overview
-//!
-//! The Timestamp pallet allows the validators to set and validate a timestamp with each block.
-//!
-//! It uses inherents for timestamp data, which is provided by the block author and
-//! validated/verified by other validators. The timestamp can be set only once per block and must be
-//! set each block. There could be a constraint on how much time must pass before setting the new
-//! timestamp.
+//! > Made with *Substrate*, for *Polkadot*.
 //!
-//! **NOTE:** The Timestamp pallet is the recommended way to query the on-chain time instead of
-//! using an approach based on block numbers. The block number based time measurement can cause
-//! issues because of cumulative calculation errors and hence should be avoided.
+//! [![github]](https://github.com/paritytech/polkadot-sdk/substrate/frame/timestamp)
+//! [![polkadot]](https://polkadot.network)
 //!
-//! ## Interface
+//! [polkadot]: https://img.shields.io/badge/polkadot-E6007A?style=for-the-badge&logo=polkadot&logoColor=white
+//! [github]: https://img.shields.io/badge/github-8da0cb?style=for-the-badge&labelColor=555555&logo=github
 //!
-//! ### Dispatchable Functions
-//!
-//! * `set` - Sets the current time.
-//!
-//! ### Public functions
+//! # Timestamp Pallet
 //!
-//! * `get` - Gets the current time for the current block. If this function is called prior to
-//! setting the timestamp, it will return the timestamp of the previous block.
+//! A pallet that provides a way for consensus systems to set and check the onchain time.
 //!
-//! ### Config Getters
+//! ## Pallet API
 //!
-//! * `MinimumPeriod` - Gets the minimum (and advised) period between blocks for the chain.
+//! See the [`pallet`] module for more information about the interfaces this pallet exposes,
+//! including its configuration trait, dispatchables, storage items, events and errors.
+//!  
+//! ## Overview
 //!
-//! ## Usage
+//! The Timestamp pallet is designed to create a consensus-based time source. This helps ensure that
+//! nodes maintain a synchronized view of time that all network participants can agree on.
 //!
-//! The following example shows how to use the Timestamp pallet in your custom pallet to query the
-//! current timestamp.
+//! It defines an _acceptable range_ using a configurable constant to specify how much time must
+//! pass before setting the new timestamp. Validator nodes in the network must verify that the
+//! timestamp falls within this acceptable range and reject blocks that do not.
 //!
-//! ### Prerequisites
+//! > **Note:** The timestamp set by this pallet is the recommended way to query the onchain time
+//! > instead of using block numbers alone. Measuring time with block numbers can cause cumulative
+//! > calculation errors if depended upon in time critical operations and hence should generally be
+//! > avoided.
 //!
-//! Import the Timestamp pallet into your custom pallet and derive the pallet configuration
-//! trait from the timestamp trait.
+//! ## Example
 //!
-//! ### Get current timestamp
+//! To get the current time for the current block in another pallet:
 //!
 //! ```
 //! use pallet_timestamp::{self as timestamp};
@@ -83,7 +70,7 @@
 //! 		#[pallet::weight(0)]
 //! 		pub fn get_time(origin: OriginFor<T>) -> DispatchResult {
 //! 			let _sender = ensure_signed(origin)?;
-//! 			let _now = <timestamp::Pallet<T>>::get();
+//! 			let _now = timestamp::Pallet::<T>::get();
 //! 			Ok(())
 //! 		}
 //! 	}
@@ -91,15 +78,52 @@
 //! # fn main() {}
 //! ```
 //!
-//! ### Example from the FRAME
+//!  If [`Pallet::get`] is called prior to setting the timestamp, it will return the timestamp of
+//! the previous block.
 //!
-//! The [Session pallet](https://github.com/paritytech/substrate/blob/master/frame/session/src/lib.rs) uses
-//! the Timestamp pallet for session management.
+//! ## Low Level / Implementation Details
 //!
-//! ## Related Pallets
+//! A timestamp is added to the chain using an _inherent extrinsic_ that only a block author can
+//! submit. Inherents are a special type of extrinsic in Substrate chains that will always be
+//! included in a block.
 //!
-//! * [Session](../pallet_session/index.html)
-
+//! To provide inherent data to the runtime, this pallet implements
+//! [`ProvideInherent`](frame_support::inherent::ProvideInherent). It will only create an inherent
+//! if the [`Call::set`] dispatchable is called, using the
+//! [`inherent`](frame_support::pallet_macros::inherent) macro which enables validator nodes to call
+//! into the runtime to check that the timestamp provided is valid.
+//! The implementation of [`ProvideInherent`](frame_support::inherent::ProvideInherent) specifies a
+//! constant called `MAX_TIMESTAMP_DRIFT_MILLIS` which is used to determine the acceptable range for
+//! a valid timestamp. If a block author sets a timestamp to anything that is more than this
+//! constant, a validator node will reject the block.
+//!
+//! The pallet also ensures that a timestamp is set at the start of each block by running an
+//! assertion in the `on_finalize` runtime hook. See [`frame_support::traits::Hooks`] for more
+//! information about how hooks work.
+//!
+//! Because inherents are applied to a block in the order they appear in the runtime
+//! construction, the index of this pallet in
+//! [`construct_runtime`](frame_support::construct_runtime) must always be less than any other
+//! pallet that depends on it.
+//!
+//! The [`Config::OnTimestampSet`] configuration trait can be set to another pallet we want to
+//! notify that the timestamp has been updated, as long as it implements [`OnTimestampSet`].
+//! Examples are the Babe and Aura pallets.
+//! This pallet also implements [`Time`] and [`UnixTime`] so it can be used to configure other
+//! pallets that require these types (e.g. in Staking pallet).
+//!
+//! ## Panics
+//!
+//! There are 3 cases where this pallet could cause the runtime to panic.
+//!
+//! 1. If no timestamp is set at the end of a block.
+//!
+//! 2. If a timestamp is set more than once per block:
+#![doc = docify::embed!("src/tests.rs", double_timestamp_should_fail)]
+//!
+//! 3. If a timestamp is set before the [`Config::MinimumPeriod`] is elapsed:
+#![doc = docify::embed!("src/tests.rs", block_period_minimum_enforced)]
+#![deny(missing_docs)]
 #![cfg_attr(not(feature = "std"), no_std)]
 
 mod benchmarking;
@@ -123,10 +147,9 @@ pub mod pallet {
 	use frame_support::pallet_prelude::*;
 	use frame_system::pallet_prelude::*;
 
-	/// The pallet configuration trait
 	#[pallet::config]
 	pub trait Config: frame_system::Config {
-		/// Type used for expressing timestamp.
+		/// Type used for expressing a timestamp.
 		type Moment: Parameter
 			+ Default
 			+ AtLeast32Bit
@@ -135,14 +158,17 @@ pub mod pallet {
 			+ MaxEncodedLen
 			+ scale_info::StaticTypeInfo;
 
-		/// Something which can be notified when the timestamp is set. Set this to `()` if not
-		/// needed.
+		/// Something which can be notified (e.g. another pallet) when the timestamp is set.
+		///
+		/// This can be set to `()` if it is not needed.
 		type OnTimestampSet: OnTimestampSet<Self::Moment>;
 
-		/// The minimum period between blocks. Beware that this is different to the *expected*
-		/// period that the block production apparatus provides. Your chosen consensus system will
-		/// generally work with this to determine a sensible block time. e.g. For Aura, it will be
-		/// double this period on default settings.
+		/// The minimum period between blocks.
+		///
+		/// Be aware that this is different to the *expected* period that the block production
+		/// apparatus provides. Your chosen consensus system will generally work with this to
+		/// determine a sensible block time. For example, in the Aura pallet it will be double this
+		/// period on default settings.
 		#[pallet::constant]
 		type MinimumPeriod: Get<Self::Moment>;
 
@@ -153,23 +179,31 @@ pub mod pallet {
 	#[pallet::pallet]
 	pub struct Pallet<T>(_);
 
-	/// Current time for the current block.
+	/// The current time for the current block.
 	#[pallet::storage]
 	#[pallet::getter(fn now)]
 	pub type Now<T: Config> = StorageValue<_, T::Moment, ValueQuery>;
 
-	/// Did the timestamp get updated in this block?
+	/// Whether the timestamp has been updated in this block.
+	///
+	/// This value is updated to `true` upon successful submission of a timestamp by a node.
+	/// It is then checked at the end of each block execution in the `on_finalize` hook.
 	#[pallet::storage]
 	pub(super) type DidUpdate<T: Config> = StorageValue<_, bool, ValueQuery>;
 
 	#[pallet::hooks]
 	impl<T: Config> Hooks<BlockNumberFor<T>> for Pallet<T> {
-		/// dummy `on_initialize` to return the weight used in `on_finalize`.
+		/// A dummy `on_initialize` to return the amount of weight that `on_finalize` requires to
+		/// execute.
 		fn on_initialize(_n: BlockNumberFor<T>) -> Weight {
 			// weight of `on_finalize`
 			T::WeightInfo::on_finalize()
 		}
 
+		/// At the end of block execution, the `on_finalize` hook checks that the timestamp was
+		/// updated. Upon success, it removes the boolean value from storage. If the value resolves
+		/// to `false`, the pallet will panic.
+		///
 		/// ## Complexity
 		/// - `O(1)`
 		fn on_finalize(_n: BlockNumberFor<T>) {
@@ -185,13 +219,17 @@ pub mod pallet {
 		/// phase, if this call hasn't been invoked by that time.
 		///
 		/// The timestamp should be greater than the previous one by the amount specified by
-		/// `MinimumPeriod`.
+		/// [`Config::MinimumPeriod`].
+		///
+		/// The dispatch origin for this call must be _None_.
 		///
-		/// The dispatch origin for this call must be `Inherent`.
+		/// This dispatch class is _Mandatory_ to ensure it gets executed in the block. Be aware
+		/// that changing the complexity of this call could result exhausting the resources in a
+		/// block to execute any other calls.
 		///
 		/// ## Complexity
 		/// - `O(1)` (Note that implementations of `OnTimestampSet` must also be `O(1)`)
-		/// - 1 storage read and 1 storage mutation (codec `O(1)`). (because of `DidUpdate::take` in
+		/// - 1 storage read and 1 storage mutation (codec `O(1)` because of `DidUpdate::take` in
 		///   `on_finalize`)
 		/// - 1 event handler `on_timestamp_set`. Must be `O(1)`.
 		#[pallet::call_index(0)]
@@ -216,6 +254,14 @@ pub mod pallet {
 		}
 	}
 
+	/// To check the inherent is valid, we simply take the max value between the current timestamp
+	/// and the current timestamp plus the [`Config::MinimumPeriod`].
+	/// We also check that the timestamp has not already been set in this block.
+	///
+	/// ## Errors:
+	/// - [`InherentError::TooFarInFuture`]: If the timestamp is larger than the current timestamp +
+	///   minimum drift period.
+	/// - [`InherentError::TooEarly`]: If the timestamp is less than the current + minimum period.
 	#[pallet::inherent]
 	impl<T: Config> ProvideInherent for Pallet<T> {
 		type Call = Call<T>;
@@ -285,9 +331,9 @@ impl<T: Config> Pallet<T> {
 }
 
 impl<T: Config> Time for Pallet<T> {
+	/// A type that represents a unit of time.
 	type Moment = T::Moment;
 
-	/// Before the first set of now with inherent the value returned is zero.
 	fn now() -> Self::Moment {
 		Self::now()
 	}
diff --git a/substrate/frame/timestamp/src/tests.rs b/substrate/frame/timestamp/src/tests.rs
index 317631eeb704843140db261925d7ed109c614211..cc49d8a3296e831ae01fd60ab28c0cf7fafbf9b5 100644
--- a/substrate/frame/timestamp/src/tests.rs
+++ b/substrate/frame/timestamp/src/tests.rs
@@ -30,6 +30,7 @@ fn timestamp_works() {
 	});
 }
 
+#[docify::export]
 #[test]
 #[should_panic(expected = "Timestamp must be updated only once in the block")]
 fn double_timestamp_should_fail() {
@@ -39,6 +40,7 @@ fn double_timestamp_should_fail() {
 	});
 }
 
+#[docify::export]
 #[test]
 #[should_panic(
 	expected = "Timestamp must increment by at least <MinimumPeriod> between sequential blocks"
diff --git a/substrate/frame/tips/Cargo.toml b/substrate/frame/tips/Cargo.toml
index 947276bb43ea92f0e31ea43b708ae326443834f6..0e9314a9f97c58f1dc44df2ab696fc263c50fb83 100644
--- a/substrate/frame/tips/Cargo.toml
+++ b/substrate/frame/tips/Cargo.toml
@@ -1,11 +1,11 @@
 [package]
 name = "pallet-tips"
 version = "4.0.0-dev"
-authors = ["Parity Technologies <admin@parity.io>"]
-edition = "2021"
+authors.workspace = true
+edition.workspace = true
 license = "Apache-2.0"
 homepage = "https://substrate.io"
-repository = "https://github.com/paritytech/substrate/"
+repository.workspace = true
 description = "FRAME pallet to manage tips"
 readme = "README.md"
 
@@ -16,7 +16,7 @@ targets = ["x86_64-unknown-linux-gnu"]
 codec = { package = "parity-scale-codec", version = "3.6.1", default-features = false, features = ["derive"] }
 log = { version = "0.4.17", default-features = false }
 scale-info = { version = "2.5.0", default-features = false, features = ["derive"] }
-serde = { version = "1.0.163", features = ["derive"], optional = true }
+serde = { version = "1.0.188", features = ["derive"], optional = true }
 frame-benchmarking = { path = "../benchmarking", default-features = false, optional = true}
 frame-support = { path = "../support", default-features = false}
 frame-system = { path = "../system", default-features = false}
diff --git a/substrate/frame/tips/README.md b/substrate/frame/tips/README.md
index d885ce770f79533c9b203f73bcf25458b644852b..1960172c497a7e8a894065bb7272936a24d7c0f6 100644
--- a/substrate/frame/tips/README.md
+++ b/substrate/frame/tips/README.md
@@ -11,7 +11,7 @@ entered where any remaining members can declare their tip amounts also. After th
 countdown period, the median of all declared tips is paid to the reported beneficiary, along with
 any finders fee, in case of a public (and bonded) original report.
 
-### Terminology
+## Terminology
 
 - **Tipping:** The process of gathering declarations of amounts to tip and taking the median amount
   to be transferred from the treasury to a beneficiary account.
@@ -30,4 +30,4 @@ any finders fee, in case of a public (and bonded) original report.
 - `tip_new` - Report an item worthy of a tip and declare a specific amount to tip.
 - `tip` - Declare or redeclare an amount to tip for a particular reason.
 - `close_tip` - Close and pay out a tip.
-- `slash_tip` - Remove and slash an already-open tip.
\ No newline at end of file
+- `slash_tip` - Remove and slash an already-open tip.
diff --git a/substrate/frame/tips/src/lib.rs b/substrate/frame/tips/src/lib.rs
index 6e8f72e0540e63bd88560fc13b778d34be740e2e..8764486d5f4fde2aafb20fa7daf919f1f1349a18 100644
--- a/substrate/frame/tips/src/lib.rs
+++ b/substrate/frame/tips/src/lib.rs
@@ -154,6 +154,10 @@ pub mod pallet {
 		#[pallet::constant]
 		type TipReportDepositBase: Get<BalanceOf<Self, I>>;
 
+		/// The maximum amount for a single tip.
+		#[pallet::constant]
+		type MaxTipAmount: Get<BalanceOf<Self, I>>;
+
 		/// Origin from which tippers must come.
 		///
 		/// `ContainsLengthBound::max_len` must be cost free (i.e. no storage read or heavy
@@ -208,6 +212,8 @@ pub mod pallet {
 		AlreadyKnown,
 		/// The tip hash is unknown.
 		UnknownTip,
+		/// The tip given was too generous.
+		MaxTipAmountExceeded,
 		/// The account attempting to retract the tip is not the finder of the tip.
 		NotFinder,
 		/// The tip cannot be claimed/closed because there are not enough tippers yet.
@@ -336,10 +342,13 @@ pub mod pallet {
 			let tipper = ensure_signed(origin)?;
 			let who = T::Lookup::lookup(who)?;
 			ensure!(T::Tippers::contains(&tipper), BadOrigin);
+
+			ensure!(T::MaxTipAmount::get() >= tip_value, Error::<T, I>::MaxTipAmountExceeded);
+
 			let reason_hash = T::Hashing::hash(&reason[..]);
 			ensure!(!Reasons::<T, I>::contains_key(&reason_hash), Error::<T, I>::AlreadyKnown);
-			let hash = T::Hashing::hash_of(&(&reason_hash, &who));
 
+			let hash = T::Hashing::hash_of(&(&reason_hash, &who));
 			Reasons::<T, I>::insert(&reason_hash, &reason);
 			Self::deposit_event(Event::NewTip { tip_hash: hash });
 			let tips = vec![(tipper.clone(), tip_value)];
@@ -387,7 +396,10 @@ pub mod pallet {
 			let tipper = ensure_signed(origin)?;
 			ensure!(T::Tippers::contains(&tipper), BadOrigin);
 
+			ensure!(T::MaxTipAmount::get() >= tip_value, Error::<T, I>::MaxTipAmountExceeded);
+
 			let mut tip = Tips::<T, I>::get(hash).ok_or(Error::<T, I>::UnknownTip)?;
+
 			if Self::insert_tip_and_check_closing(&mut tip, tipper, tip_value) {
 				Self::deposit_event(Event::TipClosing { tip_hash: hash });
 			}
diff --git a/substrate/frame/tips/src/tests.rs b/substrate/frame/tips/src/tests.rs
index a700892d42703f3560d1b6cabc1e1e7641cb1ddc..8fe111afc26a41386da1005924648606b34fa61f 100644
--- a/substrate/frame/tips/src/tests.rs
+++ b/substrate/frame/tips/src/tests.rs
@@ -29,7 +29,10 @@ use sp_storage::Storage;
 use frame_support::{
 	assert_noop, assert_ok, parameter_types,
 	storage::StoragePrefixedMap,
-	traits::{ConstU32, ConstU64, SortedMembers, StorageVersion},
+	traits::{
+		tokens::{PayFromAccount, UnityAssetBalanceConversion},
+		ConstU32, ConstU64, SortedMembers, StorageVersion,
+	},
 	PalletId,
 };
 
@@ -123,7 +126,10 @@ parameter_types! {
 	pub const Burn: Permill = Permill::from_percent(50);
 	pub const TreasuryPalletId: PalletId = PalletId(*b"py/trsry");
 	pub const TreasuryPalletId2: PalletId = PalletId(*b"py/trsr2");
+	pub TreasuryAccount: u128 = Treasury::account_id();
+	pub TreasuryInstance1Account: u128 = Treasury1::account_id();
 }
+
 impl pallet_treasury::Config for Test {
 	type PalletId = TreasuryPalletId;
 	type Currency = pallet_balances::Pallet<Test>;
@@ -141,6 +147,14 @@ impl pallet_treasury::Config for Test {
 	type SpendFunds = ();
 	type MaxApprovals = ConstU32<100>;
 	type SpendOrigin = frame_support::traits::NeverEnsureOrigin<u64>;
+	type AssetKind = ();
+	type Beneficiary = Self::AccountId;
+	type BeneficiaryLookup = IdentityLookup<Self::Beneficiary>;
+	type Paymaster = PayFromAccount<Balances, TreasuryAccount>;
+	type BalanceConverter = UnityAssetBalanceConversion;
+	type PayoutPeriod = ConstU64<10>;
+	#[cfg(feature = "runtime-benchmarks")]
+	type BenchmarkHelper = ();
 }
 
 impl pallet_treasury::Config<Instance1> for Test {
@@ -160,6 +174,14 @@ impl pallet_treasury::Config<Instance1> for Test {
 	type SpendFunds = ();
 	type MaxApprovals = ConstU32<100>;
 	type SpendOrigin = frame_support::traits::NeverEnsureOrigin<u64>;
+	type AssetKind = ();
+	type Beneficiary = Self::AccountId;
+	type BeneficiaryLookup = IdentityLookup<Self::Beneficiary>;
+	type Paymaster = PayFromAccount<Balances, TreasuryInstance1Account>;
+	type BalanceConverter = UnityAssetBalanceConversion;
+	type PayoutPeriod = ConstU64<10>;
+	#[cfg(feature = "runtime-benchmarks")]
+	type BenchmarkHelper = ();
 }
 
 parameter_types! {
@@ -172,6 +194,7 @@ impl Config for Test {
 	type TipFindersFee = TipFindersFee;
 	type TipReportDepositBase = ConstU64<1>;
 	type DataDepositPerByte = ConstU64<1>;
+	type MaxTipAmount = ConstU64<10_000_000>;
 	type RuntimeEvent = RuntimeEvent;
 	type WeightInfo = ();
 }
@@ -183,6 +206,7 @@ impl Config<Instance1> for Test {
 	type TipFindersFee = TipFindersFee;
 	type TipReportDepositBase = ConstU64<1>;
 	type DataDepositPerByte = ConstU64<1>;
+	type MaxTipAmount = ConstU64<10_000_000>;
 	type RuntimeEvent = RuntimeEvent;
 	type WeightInfo = ();
 }
@@ -396,6 +420,23 @@ fn tip_median_calculation_works() {
 	});
 }
 
+#[test]
+fn tip_large_should_fail() {
+	new_test_ext().execute_with(|| {
+		Balances::make_free_balance_be(&Treasury::account_id(), 101);
+		assert_ok!(Tips::tip_new(RuntimeOrigin::signed(10), b"awesome.dot".to_vec(), 3, 0));
+		let h = tip_hash();
+		assert_noop!(
+			Tips::tip(
+				RuntimeOrigin::signed(12),
+				h,
+				<<Test as Config>::MaxTipAmount as Get<u64>>::get() + 1
+			),
+			Error::<Test>::MaxTipAmountExceeded
+		);
+	});
+}
+
 #[test]
 fn tip_changing_works() {
 	new_test_ext().execute_with(|| {
@@ -470,7 +511,7 @@ fn test_last_reward_migration() {
 	s.top = data.into_iter().collect();
 
 	sp_io::TestExternalities::new(s).execute_with(|| {
-		let module = pallet_tips::Tips::<Test>::module_prefix();
+		let module = pallet_tips::Tips::<Test>::pallet_prefix();
 		let item = pallet_tips::Tips::<Test>::storage_prefix();
 		Tips::migrate_retract_tip_for_tip_new(module, item);
 
diff --git a/substrate/frame/transaction-payment/Cargo.toml b/substrate/frame/transaction-payment/Cargo.toml
index 4206966de0633b16550f26bc0d36867163c97edb..5c65ebd4c730a4dfd2195cd39cf7c9a55d32af31 100644
--- a/substrate/frame/transaction-payment/Cargo.toml
+++ b/substrate/frame/transaction-payment/Cargo.toml
@@ -1,11 +1,11 @@
 [package]
 name = "pallet-transaction-payment"
 version = "4.0.0-dev"
-authors = ["Parity Technologies <admin@parity.io>"]
-edition = "2021"
+authors.workspace = true
+edition.workspace = true
 license = "Apache-2.0"
 homepage = "https://substrate.io"
-repository = "https://github.com/paritytech/substrate/"
+repository.workspace = true
 description = "FRAME pallet to manage transaction payments"
 readme = "README.md"
 
@@ -17,7 +17,7 @@ codec = { package = "parity-scale-codec", version = "3.6.1", default-features =
 	"derive",
 ] }
 scale-info = { version = "2.5.0", default-features = false, features = ["derive"] }
-serde = { version = "1.0.163", optional = true }
+serde = { version = "1.0.188", optional = true }
 frame-support = { path = "../support", default-features = false}
 frame-system = { path = "../system", default-features = false}
 sp-core = { path = "../../primitives/core", default-features = false}
@@ -26,7 +26,7 @@ sp-runtime = { path = "../../primitives/runtime", default-features = false}
 sp-std = { path = "../../primitives/std", default-features = false}
 
 [dev-dependencies]
-serde_json = "1.0.85"
+serde_json = "1.0.107"
 pallet-balances = { path = "../balances" }
 
 [features]
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 1155d9c39cd089052b1dc4d0c32384412b55bcab..3ce7aa0a31b2597542e0dd534e664a2f21dbb450 100644
--- a/substrate/frame/transaction-payment/asset-conversion-tx-payment/Cargo.toml
+++ b/substrate/frame/transaction-payment/asset-conversion-tx-payment/Cargo.toml
@@ -1,11 +1,11 @@
 [package]
 name = "pallet-asset-conversion-tx-payment"
 version = "4.0.0-dev"
-authors = ["Parity Technologies <admin@parity.io>"]
-edition = "2021"
+authors.workspace = true
+edition.workspace = true
 license = "Apache-2.0"
 homepage = "https://substrate.io"
-repository = "https://github.com/paritytech/substrate/"
+repository.workspace = true
 description = "Pallet to manage transaction payments in assets by converting them to native assets."
 readme = "README.md"
 
diff --git a/substrate/frame/transaction-payment/asset-tx-payment/Cargo.toml b/substrate/frame/transaction-payment/asset-tx-payment/Cargo.toml
index 3e5a5e36abaa6de1967d491ce7d6361580d0c260..d3f040e9893fab35d397ddabbfc0eeea957436ab 100644
--- a/substrate/frame/transaction-payment/asset-tx-payment/Cargo.toml
+++ b/substrate/frame/transaction-payment/asset-tx-payment/Cargo.toml
@@ -1,11 +1,11 @@
 [package]
 name = "pallet-asset-tx-payment"
 version = "4.0.0-dev"
-authors = ["Parity Technologies <admin@parity.io>"]
-edition = "2021"
+authors.workspace = true
+edition.workspace = true
 license = "Apache-2.0"
 homepage = "https://substrate.io"
-repository = "https://github.com/paritytech/substrate/"
+repository.workspace = true
 description = "pallet to manage transaction payments in assets"
 readme = "README.md"
 
@@ -27,10 +27,10 @@ frame-benchmarking = { path = "../../benchmarking", default-features = false, op
 # Other dependencies
 codec = { package = "parity-scale-codec", version = "3.6.1", default-features = false, features = ["derive"] }
 scale-info = { version = "2.5.0", default-features = false, features = ["derive"] }
-serde = { version = "1.0.163", optional = true }
+serde = { version = "1.0.188", optional = true }
 
 [dev-dependencies]
-serde_json = "1.0.85"
+serde_json = "1.0.107"
 
 sp-storage = { path = "../../../primitives/storage", default-features = false}
 
diff --git a/substrate/frame/transaction-payment/rpc/Cargo.toml b/substrate/frame/transaction-payment/rpc/Cargo.toml
index b0183d812b9fec0b7087fbdace946361c287690f..8a0052e0337e7ca1d1761b30b61f8471e34a9f3e 100644
--- a/substrate/frame/transaction-payment/rpc/Cargo.toml
+++ b/substrate/frame/transaction-payment/rpc/Cargo.toml
@@ -1,11 +1,11 @@
 [package]
 name = "pallet-transaction-payment-rpc"
 version = "4.0.0-dev"
-authors = ["Parity Technologies <admin@parity.io>"]
-edition = "2021"
+authors.workspace = true
+edition.workspace = true
 license = "Apache-2.0"
 homepage = "https://substrate.io"
-repository = "https://github.com/paritytech/substrate/"
+repository.workspace = true
 description = "RPC interface for the transaction payment pallet."
 readme = "README.md"
 
diff --git a/substrate/frame/transaction-payment/rpc/runtime-api/Cargo.toml b/substrate/frame/transaction-payment/rpc/runtime-api/Cargo.toml
index 76adc50608e4a602d1c583e29f208f3abbe7f81b..af098fd34edc4b6ac53922a25cc457f6c1a2cb32 100644
--- a/substrate/frame/transaction-payment/rpc/runtime-api/Cargo.toml
+++ b/substrate/frame/transaction-payment/rpc/runtime-api/Cargo.toml
@@ -1,11 +1,11 @@
 [package]
 name = "pallet-transaction-payment-rpc-runtime-api"
 version = "4.0.0-dev"
-authors = ["Parity Technologies <admin@parity.io>"]
-edition = "2021"
+authors.workspace = true
+edition.workspace = true
 license = "Apache-2.0"
 homepage = "https://substrate.io"
-repository = "https://github.com/paritytech/substrate/"
+repository.workspace = true
 description = "RPC runtime API for transaction payment FRAME pallet"
 readme = "README.md"
 
diff --git a/substrate/frame/transaction-payment/src/payment.rs b/substrate/frame/transaction-payment/src/payment.rs
index bc871deafdc8bc2a56987c58c123ca8014deb671..22b0ac7c742403ac068b64a75a89e552ef06c470 100644
--- a/substrate/frame/transaction-payment/src/payment.rs
+++ b/substrate/frame/transaction-payment/src/payment.rs
@@ -1,3 +1,20 @@
+// 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.
+
 /// ! Traits and default implementation for paying transaction fees.
 use crate::Config;
 
diff --git a/substrate/frame/transaction-storage/Cargo.toml b/substrate/frame/transaction-storage/Cargo.toml
index 1a28d46c5bfee7637a81b64f04c3300c011c3ba8..a1aec7ef65a389b9a2b0e48b7ed58e87daba392d 100644
--- a/substrate/frame/transaction-storage/Cargo.toml
+++ b/substrate/frame/transaction-storage/Cargo.toml
@@ -1,11 +1,11 @@
 [package]
 name = "pallet-transaction-storage"
 version = "4.0.0-dev"
-authors = ["Parity Technologies <admin@parity.io>"]
-edition = "2021"
+authors.workspace = true
+edition.workspace = true
 license = "Apache-2.0"
 homepage = "https://substrate.io"
-repository = "https://github.com/paritytech/substrate/"
+repository.workspace = true
 description = "Storage chain pallet"
 readme = "README.md"
 
@@ -16,7 +16,7 @@ targets = ["x86_64-unknown-linux-gnu"]
 array-bytes = { version = "6.1", optional = true }
 codec = { package = "parity-scale-codec", version = "3.6.1", default-features = false }
 scale-info = { version = "2.5.0", default-features = false, features = ["derive"] }
-serde = { version = "1.0.163", optional = true }
+serde = { version = "1.0.188", optional = true }
 frame-benchmarking = { path = "../benchmarking", default-features = false, optional = true}
 frame-support = { path = "../support", default-features = false}
 frame-system = { path = "../system", default-features = false}
diff --git a/substrate/frame/transaction-storage/README.md b/substrate/frame/transaction-storage/README.md
index 0ed3ba279c2a590c4a4f10e669b9fbb74d6947ef..1066968469d4b7c629ac7243b9e7e20febdbdbab 100644
--- a/substrate/frame/transaction-storage/README.md
+++ b/substrate/frame/transaction-storage/README.md
@@ -2,8 +2,9 @@
 
 Indexes transactions and manages storage proofs.
 
-Allows storing arbitrary data on the chain. Data is automatically removed after `StoragePeriod` blocks, unless the storage is renewed.
-Validators must submit proof of storing a random chunk of data for block `N - StoragePeriod` when producing block `N`.
+Allows storing arbitrary data on the chain. Data is automatically removed after `StoragePeriod` blocks, unless the
+storage is renewed. Validators must submit proof of storing a random chunk of data for block `N - StoragePeriod` when
+producing block `N`.
 
 # Running a chain
 
@@ -15,8 +16,9 @@ Start with generating a chain spec.
 cargo run --release -- build-spec --chain=local > sc_init.json
 ```
 
-Edit the json chain spec file to customise the chain. The storage chain genesis params are configured in the `transactionStorage` section.
-Note that `storagePeriod` is specified in blocks and changing it also requires code changes at the moment.
+Edit the json chain spec file to customise the chain. The storage chain genesis params are configured in the
+`transactionStorage` section. Note that `storagePeriod` is specified in blocks and changing it also requires code
+changes at the moment.
 
 Build a raw spec from the init spec.
 
@@ -31,11 +33,11 @@ cargo run --release -- --chain=sc.json -d /tmp/alice --storage-chain --keep-bloc
 cargo run --release -- --chain=sc.json -d /tmp/bob --storage-chain --keep-blocks=100800 --ipfs-server --validator --bob
 ```
 
-`--storage-chain` enables transaction indexing.
-`--keep-blocks=100800` enables block pruning. The value here should be greater or equal than the storage period.
-`--ipfs-server` enables serving stored content over IPFS.
+`--storage-chain` enables transaction indexing. `--keep-blocks=100800` enables block pruning. The value here should be
+greater or equal than the storage period. `--ipfs-server` enables serving stored content over IPFS.
 
-Once the network is started, any other joining nodes need to sync with `--sync=fast`. Regular sync will fail because block pruning removes old blocks. The chain does not keep full block history.
+Once the network is started, any other joining nodes need to sync with `--sync=fast`. Regular sync will fail because
+block pruning removes old blocks. The chain does not keep full block history.
 
 ```bash
 cargo run --release -- --chain=sc.json -d /tmp/charlie --storage-chain --keep-blocks=100800 --ipfs-server --validator --charlie --sync=fast
@@ -43,7 +45,8 @@ cargo run --release -- --chain=sc.json -d /tmp/charlie --storage-chain --keep-bl
 
 # Making transactions
 
-To store data use the `transactionStorage.store` extrinsic. And IPFS CID can be generated from the Blake2-256 hash of the data.
+To store data use the `transactionStorage.store` extrinsic. And IPFS CID can be generated from the Blake2-256 hash of
+the data.
 
 ```js
 const util_crypto = require('@polkadot/util-crypto');
@@ -76,7 +79,8 @@ ipfs block get /ipfs/<CID> > kitten.jpeg
 ```
 
 To renew data and prevent it from being disposed after the storage period, use `transactionStorage.renew(block, index)`
-where `block` is the block number of the previous store or renew transction, and index is the index of that transaction in the block.
+where `block` is the block number of the previous store or renew transction, and index is the index of that transaction
+in the block.
 
 
 License: Apache-2.0
diff --git a/substrate/frame/transaction-storage/src/lib.rs b/substrate/frame/transaction-storage/src/lib.rs
index e784d20a0cfd76d607b8327e348dcc25f4b63734..753f5ca0c7b5238c1d51dfbec2da50d1d1b82b1a 100644
--- a/substrate/frame/transaction-storage/src/lib.rs
+++ b/substrate/frame/transaction-storage/src/lib.rs
@@ -30,10 +30,10 @@ mod tests;
 
 use codec::{Decode, Encode, MaxEncodedLen};
 use frame_support::{
-	dispatch::{Dispatchable, GetDispatchInfo},
+	dispatch::GetDispatchInfo,
 	traits::{Currency, OnUnbalanced, ReservableCurrency},
 };
-use sp_runtime::traits::{BlakeTwo256, Hash, One, Saturating, Zero};
+use sp_runtime::traits::{BlakeTwo256, Dispatchable, Hash, One, Saturating, Zero};
 use sp_std::{prelude::*, result};
 use sp_transaction_storage_proof::{
 	encode_index, random_chunk, InherentError, TransactionStorageProof, CHUNK_SIZE,
diff --git a/substrate/frame/treasury/Cargo.toml b/substrate/frame/treasury/Cargo.toml
index 039f2b402a65c6596d333114543ec2bfdb8cad9f..f7f7a6ae89c560cf3c1c89b8255b02b0e09f3196 100644
--- a/substrate/frame/treasury/Cargo.toml
+++ b/substrate/frame/treasury/Cargo.toml
@@ -1,11 +1,11 @@
 [package]
 name = "pallet-treasury"
 version = "4.0.0-dev"
-authors = ["Parity Technologies <admin@parity.io>"]
-edition = "2021"
+authors.workspace = true
+edition.workspace = true
 license = "Apache-2.0"
 homepage = "https://substrate.io"
-repository = "https://github.com/paritytech/substrate/"
+repository.workspace = true
 description = "FRAME pallet to manage treasury"
 readme = "README.md"
 
@@ -17,20 +17,22 @@ codec = { package = "parity-scale-codec", version = "3.6.1", default-features =
 	"derive",
 	"max-encoded-len",
 ] }
+docify = "0.2.0"
 impl-trait-for-tuples = "0.2.2"
 scale-info = { version = "2.5.0", default-features = false, features = ["derive"] }
-serde = { version = "1.0.163", features = ["derive"], optional = true }
+serde = { version = "1.0.188", features = ["derive"], optional = true }
 frame-benchmarking = { path = "../benchmarking", default-features = false, optional = true}
 frame-support = { path = "../support", default-features = false}
 frame-system = { path = "../system", default-features = false}
 pallet-balances = { path = "../balances", default-features = false}
 sp-runtime = { path = "../../primitives/runtime", default-features = false}
 sp-std = { path = "../../primitives/std", default-features = false}
+sp-core = { path = "../../primitives/core", default-features = false, optional = true}
 
 [dev-dependencies]
-sp-core = { path = "../../primitives/core" }
 sp-io = { path = "../../primitives/io" }
 pallet-utility = { path = "../utility" }
+sp-core = { path = "../../primitives/core", default-features = false }
 
 [features]
 default = [ "std" ]
@@ -43,12 +45,13 @@ std = [
 	"pallet-utility/std",
 	"scale-info/std",
 	"serde",
-	"sp-core/std",
+	"sp-core?/std",
 	"sp-io/std",
 	"sp-runtime/std",
 	"sp-std/std",
 ]
 runtime-benchmarks = [
+	"dep:sp-core",
 	"frame-benchmarking/runtime-benchmarks",
 	"frame-support/runtime-benchmarks",
 	"frame-system/runtime-benchmarks",
diff --git a/substrate/frame/treasury/src/benchmarking.rs b/substrate/frame/treasury/src/benchmarking.rs
index b8a53e06f2092bd4742d8ca1f7f7ab4a2bab5891..61fe29dafcae53b9b572243ca6b28da1c5a46bf0 100644
--- a/substrate/frame/treasury/src/benchmarking.rs
+++ b/substrate/frame/treasury/src/benchmarking.rs
@@ -21,13 +21,41 @@
 
 use super::{Pallet as Treasury, *};
 
-use frame_benchmarking::v1::{account, benchmarks_instance_pallet, BenchmarkError};
+use frame_benchmarking::{
+	v1::{account, BenchmarkError},
+	v2::*,
+};
 use frame_support::{
-	dispatch::UnfilteredDispatchable,
 	ensure,
-	traits::{EnsureOrigin, OnInitialize},
+	traits::{
+		tokens::{ConversionFromAssetBalance, PaymentStatus},
+		EnsureOrigin, OnInitialize,
+	},
 };
 use frame_system::RawOrigin;
+use sp_core::crypto::FromEntropy;
+
+/// Trait describing factory functions for dispatchables' parameters.
+pub trait ArgumentsFactory<AssetKind, Beneficiary> {
+	/// Factory function for an asset kind.
+	fn create_asset_kind(seed: u32) -> AssetKind;
+	/// Factory function for a beneficiary.
+	fn create_beneficiary(seed: [u8; 32]) -> Beneficiary;
+}
+
+/// Implementation that expects the parameters implement the [`FromEntropy`] trait.
+impl<AssetKind, Beneficiary> ArgumentsFactory<AssetKind, Beneficiary> for ()
+where
+	AssetKind: FromEntropy,
+	Beneficiary: FromEntropy,
+{
+	fn create_asset_kind(seed: u32) -> AssetKind {
+		AssetKind::from_entropy(&mut seed.encode().as_slice()).unwrap()
+	}
+	fn create_beneficiary(seed: [u8; 32]) -> Beneficiary {
+		Beneficiary::from_entropy(&mut seed.as_slice()).unwrap()
+	}
+}
 
 const SEED: u32 = 0;
 
@@ -67,82 +95,250 @@ fn assert_last_event<T: Config<I>, I: 'static>(generic_event: <T as Config<I>>::
 	frame_system::Pallet::<T>::assert_last_event(generic_event.into());
 }
 
-benchmarks_instance_pallet! {
+// Create the arguments for the `spend` dispatchable.
+fn create_spend_arguments<T: Config<I>, I: 'static>(
+	seed: u32,
+) -> (T::AssetKind, AssetBalanceOf<T, I>, T::Beneficiary, BeneficiaryLookupOf<T, I>) {
+	let asset_kind = T::BenchmarkHelper::create_asset_kind(seed);
+	let beneficiary = T::BenchmarkHelper::create_beneficiary([seed.try_into().unwrap(); 32]);
+	let beneficiary_lookup = T::BeneficiaryLookup::unlookup(beneficiary.clone());
+	(asset_kind, 100u32.into(), beneficiary, beneficiary_lookup)
+}
+
+#[instance_benchmarks]
+mod benchmarks {
+	use super::*;
+
 	// This benchmark is short-circuited if `SpendOrigin` cannot provide
 	// a successful origin, in which case `spend` is un-callable and can use weight=0.
-	spend {
+	#[benchmark]
+	fn spend_local() -> Result<(), BenchmarkError> {
 		let (_, value, beneficiary_lookup) = setup_proposal::<T, _>(SEED);
-		let origin = T::SpendOrigin::try_successful_origin();
+		let origin =
+			T::SpendOrigin::try_successful_origin().map_err(|_| BenchmarkError::Weightless)?;
 		let beneficiary = T::Lookup::lookup(beneficiary_lookup.clone()).unwrap();
-		let call = Call::<T, I>::spend { amount: value, beneficiary: beneficiary_lookup };
-	}: {
-		if let Ok(origin) = origin.clone() {
-			call.dispatch_bypass_filter(origin)?;
-		}
-	}
-	verify {
-		if origin.is_ok() {
-			assert_last_event::<T, I>(Event::SpendApproved { proposal_index: 0, amount: value, beneficiary }.into())
-		}
+
+		#[extrinsic_call]
+		_(origin as T::RuntimeOrigin, value, beneficiary_lookup);
+
+		assert_last_event::<T, I>(
+			Event::SpendApproved { proposal_index: 0, amount: value, beneficiary }.into(),
+		);
+		Ok(())
 	}
 
-	propose_spend {
+	#[benchmark]
+	fn propose_spend() -> Result<(), BenchmarkError> {
 		let (caller, value, beneficiary_lookup) = setup_proposal::<T, _>(SEED);
 		// Whitelist caller account from further DB operations.
 		let caller_key = frame_system::Account::<T>::hashed_key_for(&caller);
 		frame_benchmarking::benchmarking::add_to_whitelist(caller_key.into());
-	}: _(RawOrigin::Signed(caller), value, beneficiary_lookup)
 
-	reject_proposal {
+		#[extrinsic_call]
+		_(RawOrigin::Signed(caller), value, beneficiary_lookup);
+
+		Ok(())
+	}
+
+	#[benchmark]
+	fn reject_proposal() -> Result<(), BenchmarkError> {
 		let (caller, value, beneficiary_lookup) = setup_proposal::<T, _>(SEED);
 		#[allow(deprecated)]
 		Treasury::<T, _>::propose_spend(
 			RawOrigin::Signed(caller).into(),
 			value,
-			beneficiary_lookup
+			beneficiary_lookup,
 		)?;
 		let proposal_id = Treasury::<T, _>::proposal_count() - 1;
 		let reject_origin =
 			T::RejectOrigin::try_successful_origin().map_err(|_| BenchmarkError::Weightless)?;
-	}: _<T::RuntimeOrigin>(reject_origin, proposal_id)
 
-	approve_proposal {
-		let p in 0 .. T::MaxApprovals::get() - 1;
+		#[extrinsic_call]
+		_(reject_origin as T::RuntimeOrigin, proposal_id);
+
+		Ok(())
+	}
+
+	#[benchmark]
+	fn approve_proposal(
+		p: Linear<0, { T::MaxApprovals::get() - 1 }>,
+	) -> Result<(), BenchmarkError> {
 		create_approved_proposals::<T, _>(p)?;
 		let (caller, value, beneficiary_lookup) = setup_proposal::<T, _>(SEED);
 		#[allow(deprecated)]
 		Treasury::<T, _>::propose_spend(
 			RawOrigin::Signed(caller).into(),
 			value,
-			beneficiary_lookup
+			beneficiary_lookup,
 		)?;
 		let proposal_id = Treasury::<T, _>::proposal_count() - 1;
 		let approve_origin =
 			T::ApproveOrigin::try_successful_origin().map_err(|_| BenchmarkError::Weightless)?;
-	}: _<T::RuntimeOrigin>(approve_origin, proposal_id)
 
-	remove_approval {
+		#[extrinsic_call]
+		_(approve_origin as T::RuntimeOrigin, proposal_id);
+
+		Ok(())
+	}
+
+	#[benchmark]
+	fn remove_approval() -> Result<(), BenchmarkError> {
 		let (caller, value, beneficiary_lookup) = setup_proposal::<T, _>(SEED);
 		#[allow(deprecated)]
 		Treasury::<T, _>::propose_spend(
 			RawOrigin::Signed(caller).into(),
 			value,
-			beneficiary_lookup
+			beneficiary_lookup,
 		)?;
 		let proposal_id = Treasury::<T, _>::proposal_count() - 1;
 		#[allow(deprecated)]
 		Treasury::<T, I>::approve_proposal(RawOrigin::Root.into(), proposal_id)?;
 		let reject_origin =
 			T::RejectOrigin::try_successful_origin().map_err(|_| BenchmarkError::Weightless)?;
-	}: _<T::RuntimeOrigin>(reject_origin, proposal_id)
 
-	on_initialize_proposals {
-		let p in 0 .. T::MaxApprovals::get();
+		#[extrinsic_call]
+		_(reject_origin as T::RuntimeOrigin, proposal_id);
+
+		Ok(())
+	}
+
+	#[benchmark]
+	fn on_initialize_proposals(
+		p: Linear<0, { T::MaxApprovals::get() - 1 }>,
+	) -> Result<(), BenchmarkError> {
 		setup_pot_account::<T, _>();
 		create_approved_proposals::<T, _>(p)?;
-	}: {
-		Treasury::<T, _>::on_initialize(frame_system::pallet_prelude::BlockNumberFor::<T>::zero());
+
+		#[block]
+		{
+			Treasury::<T, _>::on_initialize(0u32.into());
+		}
+
+		Ok(())
+	}
+
+	#[benchmark]
+	fn spend() -> Result<(), BenchmarkError> {
+		let origin =
+			T::SpendOrigin::try_successful_origin().map_err(|_| BenchmarkError::Weightless)?;
+		let (asset_kind, amount, beneficiary, beneficiary_lookup) =
+			create_spend_arguments::<T, _>(SEED);
+		T::BalanceConverter::ensure_successful(asset_kind.clone());
+
+		#[extrinsic_call]
+		_(
+			origin as T::RuntimeOrigin,
+			Box::new(asset_kind.clone()),
+			amount,
+			Box::new(beneficiary_lookup),
+			None,
+		);
+
+		let valid_from = frame_system::Pallet::<T>::block_number();
+		let expire_at = valid_from.saturating_add(T::PayoutPeriod::get());
+		assert_last_event::<T, I>(
+			Event::AssetSpendApproved {
+				index: 0,
+				asset_kind,
+				amount,
+				beneficiary,
+				valid_from,
+				expire_at,
+			}
+			.into(),
+		);
+		Ok(())
+	}
+
+	#[benchmark]
+	fn payout() -> Result<(), BenchmarkError> {
+		let origin = T::SpendOrigin::try_successful_origin().map_err(|_| "No origin")?;
+		let (asset_kind, amount, beneficiary, beneficiary_lookup) =
+			create_spend_arguments::<T, _>(SEED);
+		T::BalanceConverter::ensure_successful(asset_kind.clone());
+		Treasury::<T, _>::spend(
+			origin,
+			Box::new(asset_kind.clone()),
+			amount,
+			Box::new(beneficiary_lookup),
+			None,
+		)?;
+		T::Paymaster::ensure_successful(&beneficiary, asset_kind, amount);
+		let caller: T::AccountId = account("caller", 0, SEED);
+
+		#[extrinsic_call]
+		_(RawOrigin::Signed(caller.clone()), 0u32);
+
+		let id = match Spends::<T, I>::get(0).unwrap().status {
+			PaymentState::Attempted { id, .. } => {
+				assert_ne!(T::Paymaster::check_payment(id), PaymentStatus::Failure);
+				id
+			},
+			_ => panic!("No payout attempt made"),
+		};
+		assert_last_event::<T, I>(Event::Paid { index: 0, payment_id: id }.into());
+		assert!(Treasury::<T, _>::payout(RawOrigin::Signed(caller).into(), 0u32).is_err());
+		Ok(())
+	}
+
+	#[benchmark]
+	fn check_status() -> Result<(), BenchmarkError> {
+		let origin = T::SpendOrigin::try_successful_origin().map_err(|_| "No origin")?;
+		let (asset_kind, amount, beneficiary, beneficiary_lookup) =
+			create_spend_arguments::<T, _>(SEED);
+		T::BalanceConverter::ensure_successful(asset_kind.clone());
+		Treasury::<T, _>::spend(
+			origin,
+			Box::new(asset_kind.clone()),
+			amount,
+			Box::new(beneficiary_lookup),
+			None,
+		)?;
+		T::Paymaster::ensure_successful(&beneficiary, asset_kind, amount);
+		let caller: T::AccountId = account("caller", 0, SEED);
+		Treasury::<T, _>::payout(RawOrigin::Signed(caller.clone()).into(), 0u32)?;
+		match Spends::<T, I>::get(0).unwrap().status {
+			PaymentState::Attempted { id, .. } => {
+				T::Paymaster::ensure_concluded(id);
+			},
+			_ => panic!("No payout attempt made"),
+		};
+
+		#[extrinsic_call]
+		_(RawOrigin::Signed(caller.clone()), 0u32);
+
+		if let Some(s) = Spends::<T, I>::get(0) {
+			assert!(!matches!(s.status, PaymentState::Attempted { .. }));
+		}
+		Ok(())
+	}
+
+	#[benchmark]
+	fn void_spend() -> Result<(), BenchmarkError> {
+		let origin = T::SpendOrigin::try_successful_origin().map_err(|_| "No origin")?;
+		let (asset_kind, amount, _, beneficiary_lookup) = create_spend_arguments::<T, _>(SEED);
+		T::BalanceConverter::ensure_successful(asset_kind.clone());
+		Treasury::<T, _>::spend(
+			origin,
+			Box::new(asset_kind.clone()),
+			amount,
+			Box::new(beneficiary_lookup),
+			None,
+		)?;
+		assert!(Spends::<T, I>::get(0).is_some());
+		let origin =
+			T::RejectOrigin::try_successful_origin().map_err(|_| BenchmarkError::Weightless)?;
+
+		#[extrinsic_call]
+		_(origin as T::RuntimeOrigin, 0u32);
+
+		assert!(Spends::<T, I>::get(0).is_none());
+		Ok(())
 	}
 
-	impl_benchmark_test_suite!(Treasury, crate::tests::new_test_ext(), crate::tests::Test);
+	impl_benchmark_test_suite!(
+		Treasury,
+		crate::tests::ExtBuilder::default().build(),
+		crate::tests::Test
+	);
 }
diff --git a/substrate/frame/treasury/src/lib.rs b/substrate/frame/treasury/src/lib.rs
index 730fae2a4e92c9b673541d25e5fca6c759ad2c91..5e429d3914bd0c60ea24eb53825c4da4b6a07fe5 100644
--- a/substrate/frame/treasury/src/lib.rs
+++ b/substrate/frame/treasury/src/lib.rs
@@ -15,46 +15,60 @@
 // See the License for the specific language governing permissions and
 // limitations under the License.
 
+//! > Made with *Substrate*, for *Polkadot*.
+//!
+//! [![github]](https://github.com/paritytech/substrate/frame/fast-unstake) -
+//! [![polkadot]](https://polkadot.network)
+//!
+//! [polkadot]: https://img.shields.io/badge/polkadot-E6007A?style=for-the-badge&logo=polkadot&logoColor=white
+//! [github]: https://img.shields.io/badge/github-8da0cb?style=for-the-badge&labelColor=555555&logo=github
+//!
 //! # Treasury Pallet
 //!
 //! The Treasury pallet provides a "pot" of funds that can be managed by stakeholders in the system
 //! and a structure for making spending proposals from this pot.
 //!
-//! - [`Config`]
-//! - [`Call`]
-//!
 //! ## Overview
 //!
 //! The Treasury Pallet itself provides the pot to store funds, and a means for stakeholders to
-//! propose, approve, and deny expenditures. The chain will need to provide a method (e.g.
-//! inflation, fees) for collecting funds.
+//! propose and claim expenditures (aka spends). The chain will need to provide a method to approve
+//! spends (e.g. public referendum) and a method for collecting funds (e.g. inflation, fees).
 //!
-//! By way of example, the Council could vote to fund the Treasury with a portion of the block
+//! By way of example, stakeholders could vote to fund the Treasury with a portion of the block
 //! reward and use the funds to pay developers.
 //!
-//!
 //! ### Terminology
 //!
 //! - **Proposal:** A suggestion to allocate funds from the pot to a beneficiary.
 //! - **Beneficiary:** An account who will receive the funds from a proposal iff the proposal is
 //!   approved.
-//! - **Deposit:** Funds that a proposer must lock when making a proposal. The deposit will be
-//!   returned or slashed if the proposal is approved or rejected respectively.
 //! - **Pot:** Unspent funds accumulated by the treasury pallet.
+//! - **Spend** An approved proposal for transferring a specific amount of funds to a designated
+//!   beneficiary.
+//!
+//! ### Example
 //!
-//! ## Interface
+//! 1. Multiple local spends approved by spend origins and received by a beneficiary.
+#![doc = docify::embed!("src/tests.rs", spend_local_origin_works)]
 //!
-//! ### Dispatchable Functions
+//! 2. Approve a spend of some asset kind and claim it.
+#![doc = docify::embed!("src/tests.rs", spend_payout_works)]
 //!
-//! General spending/proposal protocol:
-//! - `propose_spend` - Make a spending proposal and stake the required deposit.
-//! - `reject_proposal` - Reject a proposal, slashing the deposit.
-//! - `approve_proposal` - Accept the proposal, returning the deposit.
-//! - `remove_approval` - Remove an approval, the deposit will no longer be returned.
+//! ## Pallet API
 //!
-//! ## GenesisConfig
+//! See the [`pallet`] module for more information about the interfaces this pallet exposes,
+//! including its configuration trait, dispatchables, storage items, events and errors.
 //!
-//! The Treasury pallet depends on the [`GenesisConfig`].
+//! ## Low Level / Implementation Details
+//!
+//! Spends can be initiated using either the `spend_local` or `spend` dispatchable. The
+//! `spend_local` dispatchable enables the creation of spends using the native currency of the
+//! chain, utilizing the funds stored in the pot. These spends are automatically paid out every
+//! [`pallet::Config::SpendPeriod`]. On the other hand, the `spend` dispatchable allows spending of
+//! any asset kind managed by the treasury, with payment facilitated by a designated
+//! [`pallet::Config::Paymaster`]. To claim these spends, the `payout` dispatchable should be called
+//! within some temporal bounds, starting from the moment they become valid and within one
+//! [`pallet::Config::PayoutPeriod`].
 
 #![cfg_attr(not(feature = "std"), no_std)]
 
@@ -62,6 +76,8 @@ mod benchmarking;
 #[cfg(test)]
 mod tests;
 pub mod weights;
+#[cfg(feature = "runtime-benchmarks")]
+pub use benchmarking::ArgumentsFactory;
 
 use codec::{Decode, Encode, MaxEncodedLen};
 use scale_info::TypeInfo;
@@ -73,9 +89,10 @@ use sp_runtime::{
 use sp_std::{collections::btree_map::BTreeMap, prelude::*};
 
 use frame_support::{
-	print,
+	dispatch::{DispatchResult, DispatchResultWithPostInfo},
+	ensure, print,
 	traits::{
-		Currency, ExistenceRequirement::KeepAlive, Get, Imbalance, OnUnbalanced,
+		tokens::Pay, Currency, ExistenceRequirement::KeepAlive, Get, Imbalance, OnUnbalanced,
 		ReservableCurrency, WithdrawReasons,
 	},
 	weights::Weight,
@@ -87,6 +104,7 @@ pub use weights::WeightInfo;
 
 pub type BalanceOf<T, I = ()> =
 	<<T as Config<I>>::Currency as Currency<<T as frame_system::Config>::AccountId>>::Balance;
+pub type AssetBalanceOf<T, I> = <<T as Config<I>>::Paymaster as Pay>::Balance;
 pub type PositiveImbalanceOf<T, I = ()> = <<T as Config<I>>::Currency as Currency<
 	<T as frame_system::Config>::AccountId,
 >>::PositiveImbalance;
@@ -94,6 +112,7 @@ pub type NegativeImbalanceOf<T, I = ()> = <<T as Config<I>>::Currency as Currenc
 	<T as frame_system::Config>::AccountId,
 >>::NegativeImbalance;
 type AccountIdLookupOf<T> = <<T as frame_system::Config>::Lookup as StaticLookup>::Source;
+type BeneficiaryLookupOf<T, I> = <<T as Config<I>>::BeneficiaryLookup as StaticLookup>::Source;
 
 /// A trait to allow the Treasury Pallet to spend it's funds for other purposes.
 /// There is an expectation that the implementer of this trait will correctly manage
@@ -133,10 +152,47 @@ pub struct Proposal<AccountId, Balance> {
 	bond: Balance,
 }
 
+/// The state of the payment claim.
+#[cfg_attr(feature = "std", derive(serde::Serialize, serde::Deserialize))]
+#[derive(Encode, Decode, Clone, PartialEq, Eq, MaxEncodedLen, RuntimeDebug, TypeInfo)]
+pub enum PaymentState<Id> {
+	/// Pending claim.
+	Pending,
+	/// Payment attempted with a payment identifier.
+	Attempted { id: Id },
+	/// Payment failed.
+	Failed,
+}
+
+/// Info regarding an approved treasury spend.
+#[cfg_attr(feature = "std", derive(serde::Serialize, serde::Deserialize))]
+#[derive(Encode, Decode, Clone, PartialEq, Eq, MaxEncodedLen, RuntimeDebug, TypeInfo)]
+pub struct SpendStatus<AssetKind, AssetBalance, Beneficiary, BlockNumber, PaymentId> {
+	// The kind of asset to be spent.
+	asset_kind: AssetKind,
+	/// The asset amount of the spend.
+	amount: AssetBalance,
+	/// The beneficiary of the spend.
+	beneficiary: Beneficiary,
+	/// The block number from which the spend can be claimed.
+	valid_from: BlockNumber,
+	/// The block number by which the spend has to be claimed.
+	expire_at: BlockNumber,
+	/// The status of the payout/claim.
+	status: PaymentState<PaymentId>,
+}
+
+/// Index of an approved treasury spend.
+pub type SpendIndex = u32;
+
 #[frame_support::pallet]
 pub mod pallet {
 	use super::*;
-	use frame_support::{dispatch_context::with_context, pallet_prelude::*};
+	use frame_support::{
+		dispatch_context::with_context,
+		pallet_prelude::*,
+		traits::tokens::{ConversionFromAssetBalance, PaymentStatus},
+	};
 	use frame_system::pallet_prelude::*;
 
 	#[pallet::pallet]
@@ -201,9 +257,38 @@ pub mod pallet {
 		type MaxApprovals: Get<u32>;
 
 		/// The origin required for approving spends from the treasury outside of the proposal
-		/// process. The `Success` value is the maximum amount that this origin is allowed to
-		/// spend at a time.
+		/// process. The `Success` value is the maximum amount in a native asset that this origin
+		/// is allowed to spend at a time.
 		type SpendOrigin: EnsureOrigin<Self::RuntimeOrigin, Success = BalanceOf<Self, I>>;
+
+		/// Type parameter representing the asset kinds to be spent from the treasury.
+		type AssetKind: Parameter + MaxEncodedLen;
+
+		/// Type parameter used to identify the beneficiaries eligible to receive treasury spends.
+		type Beneficiary: Parameter + MaxEncodedLen;
+
+		/// Converting trait to take a source type and convert to [`Self::Beneficiary`].
+		type BeneficiaryLookup: StaticLookup<Target = Self::Beneficiary>;
+
+		/// Type for processing spends of [Self::AssetKind] in favor of [`Self::Beneficiary`].
+		type Paymaster: Pay<Beneficiary = Self::Beneficiary, AssetKind = Self::AssetKind>;
+
+		/// Type for converting the balance of an [Self::AssetKind] to the balance of the native
+		/// asset, solely for the purpose of asserting the result against the maximum allowed spend
+		/// amount of the [`Self::SpendOrigin`].
+		type BalanceConverter: ConversionFromAssetBalance<
+			<Self::Paymaster as Pay>::Balance,
+			Self::AssetKind,
+			BalanceOf<Self, I>,
+		>;
+
+		/// The period during which an approved treasury spend has to be claimed.
+		#[pallet::constant]
+		type PayoutPeriod: Get<BlockNumberFor<Self>>;
+
+		/// Helper type for benchmarks.
+		#[cfg(feature = "runtime-benchmarks")]
+		type BenchmarkHelper: ArgumentsFactory<Self::AssetKind, Self::Beneficiary>;
 	}
 
 	/// Number of proposals that have been made.
@@ -233,6 +318,27 @@ pub mod pallet {
 	pub type Approvals<T: Config<I>, I: 'static = ()> =
 		StorageValue<_, BoundedVec<ProposalIndex, T::MaxApprovals>, ValueQuery>;
 
+	/// The count of spends that have been made.
+	#[pallet::storage]
+	pub(crate) type SpendCount<T, I = ()> = StorageValue<_, SpendIndex, ValueQuery>;
+
+	/// Spends that have been approved and being processed.
+	// Hasher: Twox safe since `SpendIndex` is an internal count based index.
+	#[pallet::storage]
+	pub type Spends<T: Config<I>, I: 'static = ()> = StorageMap<
+		_,
+		Twox64Concat,
+		SpendIndex,
+		SpendStatus<
+			T::AssetKind,
+			AssetBalanceOf<T, I>,
+			T::Beneficiary,
+			BlockNumberFor<T>,
+			<T::Paymaster as Pay>::Id,
+		>,
+		OptionQuery,
+	>;
+
 	#[pallet::genesis_config]
 	#[derive(frame_support::DefaultNoBound)]
 	pub struct GenesisConfig<T: Config<I>, I: 'static = ()> {
@@ -277,6 +383,24 @@ pub mod pallet {
 		},
 		/// The inactive funds of the pallet have been updated.
 		UpdatedInactive { reactivated: BalanceOf<T, I>, deactivated: BalanceOf<T, I> },
+		/// A new asset spend proposal has been approved.
+		AssetSpendApproved {
+			index: SpendIndex,
+			asset_kind: T::AssetKind,
+			amount: AssetBalanceOf<T, I>,
+			beneficiary: T::Beneficiary,
+			valid_from: BlockNumberFor<T>,
+			expire_at: BlockNumberFor<T>,
+		},
+		/// An approved spend was voided.
+		AssetSpendVoided { index: SpendIndex },
+		/// A payment happened.
+		Paid { index: SpendIndex, payment_id: <T::Paymaster as Pay>::Id },
+		/// A payment failed and can be retried.
+		PaymentFailed { index: SpendIndex, payment_id: <T::Paymaster as Pay>::Id },
+		/// A spend was processed and removed from the storage. It might have been successfully
+		/// paid or it may have expired.
+		SpendProcessed { index: SpendIndex },
 	}
 
 	/// Error for the treasury pallet.
@@ -284,7 +408,7 @@ pub mod pallet {
 	pub enum Error<T, I = ()> {
 		/// Proposer's balance is too low.
 		InsufficientProposersBalance,
-		/// No proposal or bounty at that index.
+		/// No proposal, bounty or spend at that index.
 		InvalidIndex,
 		/// Too many approvals in the queue.
 		TooManyApprovals,
@@ -293,6 +417,20 @@ pub mod pallet {
 		InsufficientPermission,
 		/// Proposal has not been approved.
 		ProposalNotApproved,
+		/// The balance of the asset kind is not convertible to the balance of the native asset.
+		FailedToConvertBalance,
+		/// The spend has expired and cannot be claimed.
+		SpendExpired,
+		/// The spend is not yet eligible for payout.
+		EarlyPayout,
+		/// The payment has already been attempted.
+		AlreadyAttempted,
+		/// There was some issue with the mechanism of payment.
+		PayoutError,
+		/// The payout was not yet attempted/claimed.
+		NotAttempted,
+		/// The payment has neither failed nor succeeded yet.
+		Inconclusive,
 	}
 
 	#[pallet::hooks]
@@ -319,6 +457,14 @@ pub mod pallet {
 				Weight::zero()
 			}
 		}
+
+		#[cfg(feature = "try-runtime")]
+		fn try_state(
+			_: frame_system::pallet_prelude::BlockNumberFor<T>,
+		) -> Result<(), sp_runtime::TryRuntimeError> {
+			Self::do_try_state()?;
+			Ok(())
+		}
 	}
 
 	#[derive(Default)]
@@ -328,12 +474,22 @@ pub mod pallet {
 
 	#[pallet::call]
 	impl<T: Config<I>, I: 'static> Pallet<T, I> {
-		/// Put forward a suggestion for spending. A deposit proportional to the value
-		/// is reserved and slashed if the proposal is rejected. It is returned once the
-		/// proposal is awarded.
+		/// Put forward a suggestion for spending.
 		///
-		/// ## Complexity
+		/// ## Dispatch Origin
+		///
+		/// Must be signed.
+		///
+		/// ## Details
+		/// A deposit proportional to the value is reserved and slashed if the proposal is rejected.
+		/// It is returned once the proposal is awarded.
+		///
+		/// ### Complexity
 		/// - O(1)
+		///
+		/// ## Events
+		///
+		/// Emits [`Event::Proposed`] if successful.
 		#[pallet::call_index(0)]
 		#[pallet::weight(T::WeightInfo::propose_spend())]
 		#[allow(deprecated)]
@@ -360,12 +516,21 @@ pub mod pallet {
 			Ok(())
 		}
 
-		/// Reject a proposed spend. The original deposit will be slashed.
+		/// Reject a proposed spend.
 		///
-		/// May only be called from `T::RejectOrigin`.
+		/// ## Dispatch Origin
 		///
-		/// ## Complexity
+		/// Must be [`Config::RejectOrigin`].
+		///
+		/// ## Details
+		/// The original deposit will be slashed.
+		///
+		/// ### Complexity
 		/// - O(1)
+		///
+		/// ## Events
+		///
+		/// Emits [`Event::Rejected`] if successful.
 		#[pallet::call_index(1)]
 		#[pallet::weight((T::WeightInfo::reject_proposal(), DispatchClass::Operational))]
 		#[allow(deprecated)]
@@ -391,13 +556,23 @@ pub mod pallet {
 			Ok(())
 		}
 
-		/// Approve a proposal. At a later time, the proposal will be allocated to the beneficiary
-		/// and the original deposit will be returned.
+		/// Approve a proposal.
 		///
-		/// May only be called from `T::ApproveOrigin`.
+		/// ## Dispatch Origin
 		///
-		/// ## Complexity
+		/// Must be [`Config::ApproveOrigin`].
+		///
+		/// ## Details
+		///
+		/// At a later time, the proposal will be allocated to the beneficiary and the original
+		/// deposit will be returned.
+		///
+		/// ### Complexity
 		///  - O(1).
+		///
+		/// ## Events
+		///
+		/// No events are emitted from this dispatch.
 		#[pallet::call_index(2)]
 		#[pallet::weight((T::WeightInfo::approve_proposal(T::MaxApprovals::get()), DispatchClass::Operational))]
 		#[allow(deprecated)]
@@ -418,15 +593,24 @@ pub mod pallet {
 
 		/// Propose and approve a spend of treasury funds.
 		///
-		/// - `origin`: Must be `SpendOrigin` with the `Success` value being at least `amount`.
-		/// - `amount`: The amount to be transferred from the treasury to the `beneficiary`.
-		/// - `beneficiary`: The destination account for the transfer.
+		/// ## Dispatch Origin
+		///
+		/// Must be [`Config::SpendOrigin`] with the `Success` value being at least `amount`.
 		///
+		/// ### Details
 		/// NOTE: For record-keeping purposes, the proposer is deemed to be equivalent to the
 		/// beneficiary.
+		///
+		/// ### Parameters
+		/// - `amount`: The amount to be transferred from the treasury to the `beneficiary`.
+		/// - `beneficiary`: The destination account for the transfer.
+		///
+		/// ## Events
+		///
+		/// Emits [`Event::SpendApproved`] if successful.
 		#[pallet::call_index(3)]
-		#[pallet::weight(T::WeightInfo::spend())]
-		pub fn spend(
+		#[pallet::weight(T::WeightInfo::spend_local())]
+		pub fn spend_local(
 			origin: OriginFor<T>,
 			#[pallet::compact] amount: BalanceOf<T, I>,
 			beneficiary: AccountIdLookupOf<T>,
@@ -472,18 +656,26 @@ pub mod pallet {
 		}
 
 		/// Force a previously approved proposal to be removed from the approval queue.
+		///
+		/// ## Dispatch Origin
+		///
+		/// Must be [`Config::RejectOrigin`].
+		///
+		/// ## Details
+		///
 		/// The original deposit will no longer be returned.
 		///
-		/// May only be called from `T::RejectOrigin`.
+		/// ### Parameters
 		/// - `proposal_id`: The index of a proposal
 		///
-		/// ## Complexity
+		/// ### Complexity
 		/// - O(A) where `A` is the number of approvals
 		///
-		/// Errors:
-		/// - `ProposalNotApproved`: The `proposal_id` supplied was not found in the approval queue,
-		/// i.e., the proposal has not been approved. This could also mean the proposal does not
-		/// exist altogether, thus there is no way it would have been approved in the first place.
+		/// ### Errors
+		/// - [`Error::ProposalNotApproved`]: The `proposal_id` supplied was not found in the
+		///   approval queue, i.e., the proposal has not been approved. This could also mean the
+		///   proposal does not exist altogether, thus there is no way it would have been approved
+		///   in the first place.
 		#[pallet::call_index(4)]
 		#[pallet::weight((T::WeightInfo::remove_approval(), DispatchClass::Operational))]
 		pub fn remove_approval(
@@ -503,6 +695,229 @@ pub mod pallet {
 
 			Ok(())
 		}
+
+		/// Propose and approve a spend of treasury funds.
+		///
+		/// ## Dispatch Origin
+		///
+		/// Must be [`Config::SpendOrigin`] with the `Success` value being at least
+		/// `amount` of `asset_kind` in the native asset. The amount of `asset_kind` is converted
+		/// for assertion using the [`Config::BalanceConverter`].
+		///
+		/// ## Details
+		///
+		/// Create an approved spend for transferring a specific `amount` of `asset_kind` to a
+		/// designated beneficiary. The spend must be claimed using the `payout` dispatchable within
+		/// the [`Config::PayoutPeriod`].
+		///
+		/// ### Parameters
+		/// - `asset_kind`: An indicator of the specific asset class to be spent.
+		/// - `amount`: The amount to be transferred from the treasury to the `beneficiary`.
+		/// - `beneficiary`: The beneficiary of the spend.
+		/// - `valid_from`: The block number from which the spend can be claimed. It can refer to
+		///   the past if the resulting spend has not yet expired according to the
+		///   [`Config::PayoutPeriod`]. If `None`, the spend can be claimed immediately after
+		///   approval.
+		///
+		/// ## Events
+		///
+		/// Emits [`Event::AssetSpendApproved`] if successful.
+		#[pallet::call_index(5)]
+		#[pallet::weight(T::WeightInfo::spend())]
+		pub fn spend(
+			origin: OriginFor<T>,
+			asset_kind: Box<T::AssetKind>,
+			#[pallet::compact] amount: AssetBalanceOf<T, I>,
+			beneficiary: Box<BeneficiaryLookupOf<T, I>>,
+			valid_from: Option<BlockNumberFor<T>>,
+		) -> DispatchResult {
+			let max_amount = T::SpendOrigin::ensure_origin(origin)?;
+			let beneficiary = T::BeneficiaryLookup::lookup(*beneficiary)?;
+
+			let now = frame_system::Pallet::<T>::block_number();
+			let valid_from = valid_from.unwrap_or(now);
+			let expire_at = valid_from.saturating_add(T::PayoutPeriod::get());
+			ensure!(expire_at > now, Error::<T, I>::SpendExpired);
+
+			let native_amount =
+				T::BalanceConverter::from_asset_balance(amount, *asset_kind.clone())
+					.map_err(|_| Error::<T, I>::FailedToConvertBalance)?;
+
+			ensure!(native_amount <= max_amount, Error::<T, I>::InsufficientPermission);
+
+			with_context::<SpendContext<BalanceOf<T, I>>, _>(|v| {
+				let context = v.or_default();
+				// We group based on `max_amount`, to distinguish between different kind of
+				// origins. (assumes that all origins have different `max_amount`)
+				//
+				// Worst case is that we reject some "valid" request.
+				let spend = context.spend_in_context.entry(max_amount).or_default();
+
+				// Ensure that we don't overflow nor use more than `max_amount`
+				if spend.checked_add(&native_amount).map(|s| s > max_amount).unwrap_or(true) {
+					Err(Error::<T, I>::InsufficientPermission)
+				} else {
+					*spend = spend.saturating_add(native_amount);
+					Ok(())
+				}
+			})
+			.unwrap_or(Ok(()))?;
+
+			let index = SpendCount::<T, I>::get();
+			Spends::<T, I>::insert(
+				index,
+				SpendStatus {
+					asset_kind: *asset_kind.clone(),
+					amount,
+					beneficiary: beneficiary.clone(),
+					valid_from,
+					expire_at,
+					status: PaymentState::Pending,
+				},
+			);
+			SpendCount::<T, I>::put(index + 1);
+
+			Self::deposit_event(Event::AssetSpendApproved {
+				index,
+				asset_kind: *asset_kind,
+				amount,
+				beneficiary,
+				valid_from,
+				expire_at,
+			});
+			Ok(())
+		}
+
+		/// Claim a spend.
+		///
+		/// ## Dispatch Origin
+		///
+		/// Must be signed.
+		///
+		/// ## Details
+		///
+		/// Spends must be claimed within some temporal bounds. A spend may be claimed within one
+		/// [`Config::PayoutPeriod`] from the `valid_from` block.
+		/// In case of a payout failure, the spend status must be updated with the `check_status`
+		/// dispatchable before retrying with the current function.
+		///
+		/// ### Parameters
+		/// - `index`: The spend index.
+		///
+		/// ## Events
+		///
+		/// Emits [`Event::Paid`] if successful.
+		#[pallet::call_index(6)]
+		#[pallet::weight(T::WeightInfo::payout())]
+		pub fn payout(origin: OriginFor<T>, index: SpendIndex) -> DispatchResult {
+			ensure_signed(origin)?;
+			let mut spend = Spends::<T, I>::get(index).ok_or(Error::<T, I>::InvalidIndex)?;
+			let now = frame_system::Pallet::<T>::block_number();
+			ensure!(now >= spend.valid_from, Error::<T, I>::EarlyPayout);
+			ensure!(spend.expire_at > now, Error::<T, I>::SpendExpired);
+			ensure!(
+				matches!(spend.status, PaymentState::Pending | PaymentState::Failed),
+				Error::<T, I>::AlreadyAttempted
+			);
+
+			let id = T::Paymaster::pay(&spend.beneficiary, spend.asset_kind.clone(), spend.amount)
+				.map_err(|_| Error::<T, I>::PayoutError)?;
+
+			spend.status = PaymentState::Attempted { id };
+			Spends::<T, I>::insert(index, spend);
+
+			Self::deposit_event(Event::<T, I>::Paid { index, payment_id: id });
+
+			Ok(())
+		}
+
+		/// Check the status of the spend and remove it from the storage if processed.
+		///
+		/// ## Dispatch Origin
+		///
+		/// Must be signed.
+		///
+		/// ## Details
+		///
+		/// The status check is a prerequisite for retrying a failed payout.
+		/// If a spend has either succeeded or expired, it is removed from the storage by this
+		/// function. In such instances, transaction fees are refunded.
+		///
+		/// ### Parameters
+		/// - `index`: The spend index.
+		///
+		/// ## Events
+		///
+		/// Emits [`Event::PaymentFailed`] if the spend payout has failed.
+		/// Emits [`Event::SpendProcessed`] if the spend payout has succeed.
+		#[pallet::call_index(7)]
+		#[pallet::weight(T::WeightInfo::check_status())]
+		pub fn check_status(origin: OriginFor<T>, index: SpendIndex) -> DispatchResultWithPostInfo {
+			use PaymentState as State;
+			use PaymentStatus as Status;
+
+			ensure_signed(origin)?;
+			let mut spend = Spends::<T, I>::get(index).ok_or(Error::<T, I>::InvalidIndex)?;
+			let now = frame_system::Pallet::<T>::block_number();
+
+			if now > spend.expire_at && !matches!(spend.status, State::Attempted { .. }) {
+				// spend has expired and no further status update is expected.
+				Spends::<T, I>::remove(index);
+				Self::deposit_event(Event::<T, I>::SpendProcessed { index });
+				return Ok(Pays::No.into())
+			}
+
+			let payment_id = match spend.status {
+				State::Attempted { id } => id,
+				_ => return Err(Error::<T, I>::NotAttempted.into()),
+			};
+
+			match T::Paymaster::check_payment(payment_id) {
+				Status::Failure => {
+					spend.status = PaymentState::Failed;
+					Spends::<T, I>::insert(index, spend);
+					Self::deposit_event(Event::<T, I>::PaymentFailed { index, payment_id });
+				},
+				Status::Success | Status::Unknown => {
+					Spends::<T, I>::remove(index);
+					Self::deposit_event(Event::<T, I>::SpendProcessed { index });
+					return Ok(Pays::No.into())
+				},
+				Status::InProgress => return Err(Error::<T, I>::Inconclusive.into()),
+			}
+			return Ok(Pays::Yes.into())
+		}
+
+		/// Void previously approved spend.
+		///
+		/// ## Dispatch Origin
+		///
+		/// Must be [`Config::RejectOrigin`].
+		///
+		/// ## Details
+		///
+		/// A spend void is only possible if the payout has not been attempted yet.
+		///
+		/// ### Parameters
+		/// - `index`: The spend index.
+		///
+		/// ## Events
+		///
+		/// Emits [`Event::AssetSpendVoided`] if successful.
+		#[pallet::call_index(8)]
+		#[pallet::weight(T::WeightInfo::void_spend())]
+		pub fn void_spend(origin: OriginFor<T>, index: SpendIndex) -> DispatchResult {
+			T::RejectOrigin::ensure_origin(origin)?;
+			let spend = Spends::<T, I>::get(index).ok_or(Error::<T, I>::InvalidIndex)?;
+			ensure!(
+				matches!(spend.status, PaymentState::Pending | PaymentState::Failed),
+				Error::<T, I>::AlreadyAttempted
+			);
+
+			Spends::<T, I>::remove(index);
+			Self::deposit_event(Event::<T, I>::AssetSpendVoided { index });
+			Ok(())
+		}
 	}
 }
 
@@ -614,6 +1029,85 @@ impl<T: Config<I>, I: 'static> Pallet<T, I> {
 			// Must never be less than 0 but better be safe.
 			.saturating_sub(T::Currency::minimum_balance())
 	}
+
+	/// Ensure the correctness of the state of this pallet.
+	#[cfg(any(feature = "try-runtime", test))]
+	fn do_try_state() -> Result<(), sp_runtime::TryRuntimeError> {
+		Self::try_state_proposals()?;
+		Self::try_state_spends()?;
+
+		Ok(())
+	}
+
+	/// ### Invariants of proposal storage items
+	///
+	/// 1. [`ProposalCount`] >= Number of elements in [`Proposals`].
+	/// 2. Each entry in [`Proposals`] should be saved under a key stricly less than current
+	/// [`ProposalCount`].
+	/// 3. Each [`ProposalIndex`] contained in [`Approvals`] should exist in [`Proposals`].
+	/// Note, that this automatically implies [`Approvals`].count() <= [`Proposals`].count().
+	#[cfg(any(feature = "try-runtime", test))]
+	fn try_state_proposals() -> Result<(), sp_runtime::TryRuntimeError> {
+		let current_proposal_count = ProposalCount::<T, I>::get();
+		ensure!(
+			current_proposal_count as usize >= Proposals::<T, I>::iter().count(),
+			"Actual number of proposals exceeds `ProposalCount`."
+		);
+
+		Proposals::<T, I>::iter_keys().try_for_each(|proposal_index| -> DispatchResult {
+			ensure!(
+				current_proposal_count as u32 > proposal_index,
+				"`ProposalCount` should by strictly greater than any ProposalIndex used as a key for `Proposals`."
+			);
+			Ok(())
+		})?;
+
+		Approvals::<T, I>::get()
+			.iter()
+			.try_for_each(|proposal_index| -> DispatchResult {
+				ensure!(
+					Proposals::<T, I>::contains_key(proposal_index),
+					"Proposal indices in `Approvals` must also be contained in `Proposals`."
+				);
+				Ok(())
+			})?;
+
+		Ok(())
+	}
+
+	/// ## Invariants of spend storage items
+	///
+	/// 1. [`SpendCount`] >= Number of elements in [`Spends`].
+	/// 2. Each entry in [`Spends`] should be saved under a key stricly less than current
+	/// [`SpendCount`].
+	/// 3. For each spend entry contained in [`Spends`] we should have spend.expire_at
+	/// > spend.valid_from.
+	#[cfg(any(feature = "try-runtime", test))]
+	fn try_state_spends() -> Result<(), sp_runtime::TryRuntimeError> {
+		let current_spend_count = SpendCount::<T, I>::get();
+		ensure!(
+			current_spend_count as usize >= Spends::<T, I>::iter().count(),
+			"Actual number of spends exceeds `SpendCount`."
+		);
+
+		Spends::<T, I>::iter_keys().try_for_each(|spend_index| -> DispatchResult {
+			ensure!(
+				current_spend_count > spend_index,
+				"`SpendCount` should by strictly greater than any SpendIndex used as a key for `Spends`."
+			);
+			Ok(())
+		})?;
+
+		Spends::<T, I>::iter().try_for_each(|(_index, spend)| -> DispatchResult {
+			ensure!(
+				spend.valid_from < spend.expire_at,
+				"Spend cannot expire before it becomes valid."
+			);
+			Ok(())
+		})?;
+
+		Ok(())
+	}
 }
 
 impl<T: Config<I>, I: 'static> OnUnbalanced<NegativeImbalanceOf<T, I>> for Pallet<T, I> {
diff --git a/substrate/frame/treasury/src/tests.rs b/substrate/frame/treasury/src/tests.rs
index ba45d5f6ff16fb6cd40043d29e96050136ae955e..1748189723edf2ee0c95817bf211397ce6abdae6 100644
--- a/substrate/frame/treasury/src/tests.rs
+++ b/substrate/frame/treasury/src/tests.rs
@@ -19,6 +19,7 @@
 
 #![cfg(test)]
 
+use core::{cell::RefCell, marker::PhantomData};
 use sp_core::H256;
 use sp_runtime::{
 	traits::{BadOrigin, BlakeTwo256, Dispatchable, IdentityLookup},
@@ -26,8 +27,13 @@ use sp_runtime::{
 };
 
 use frame_support::{
-	assert_err_ignore_postinfo, assert_noop, assert_ok, parameter_types,
-	traits::{ConstU32, ConstU64, OnInitialize},
+	assert_err_ignore_postinfo, assert_noop, assert_ok,
+	pallet_prelude::Pays,
+	parameter_types,
+	traits::{
+		tokens::{ConversionFromAssetBalance, PaymentStatus},
+		ConstU32, ConstU64, OnInitialize,
+	},
 	PalletId,
 };
 
@@ -96,10 +102,64 @@ impl pallet_utility::Config for Test {
 	type WeightInfo = ();
 }
 
+thread_local! {
+	pub static PAID: RefCell<BTreeMap<(u128, u32), u64>> = RefCell::new(BTreeMap::new());
+	pub static STATUS: RefCell<BTreeMap<u64, PaymentStatus>> = RefCell::new(BTreeMap::new());
+	pub static LAST_ID: RefCell<u64> = RefCell::new(0u64);
+}
+
+/// paid balance for a given account and asset ids
+fn paid(who: u128, asset_id: u32) -> u64 {
+	PAID.with(|p| p.borrow().get(&(who, asset_id)).cloned().unwrap_or(0))
+}
+
+/// reduce paid balance for a given account and asset ids
+fn unpay(who: u128, asset_id: u32, amount: u64) {
+	PAID.with(|p| p.borrow_mut().entry((who, asset_id)).or_default().saturating_reduce(amount))
+}
+
+/// set status for a given payment id
+fn set_status(id: u64, s: PaymentStatus) {
+	STATUS.with(|m| m.borrow_mut().insert(id, s));
+}
+
+pub struct TestPay;
+impl Pay for TestPay {
+	type Beneficiary = u128;
+	type Balance = u64;
+	type Id = u64;
+	type AssetKind = u32;
+	type Error = ();
+
+	fn pay(
+		who: &Self::Beneficiary,
+		asset_kind: Self::AssetKind,
+		amount: Self::Balance,
+	) -> Result<Self::Id, Self::Error> {
+		PAID.with(|paid| *paid.borrow_mut().entry((*who, asset_kind)).or_default() += amount);
+		Ok(LAST_ID.with(|lid| {
+			let x = *lid.borrow();
+			lid.replace(x + 1);
+			x
+		}))
+	}
+	fn check_payment(id: Self::Id) -> PaymentStatus {
+		STATUS.with(|s| s.borrow().get(&id).cloned().unwrap_or(PaymentStatus::Unknown))
+	}
+	#[cfg(feature = "runtime-benchmarks")]
+	fn ensure_successful(_: &Self::Beneficiary, _: Self::AssetKind, _: Self::Balance) {}
+	#[cfg(feature = "runtime-benchmarks")]
+	fn ensure_concluded(id: Self::Id) {
+		set_status(id, PaymentStatus::Failure)
+	}
+}
+
 parameter_types! {
 	pub const ProposalBond: Permill = Permill::from_percent(5);
 	pub const Burn: Permill = Permill::from_percent(50);
 	pub const TreasuryPalletId: PalletId = PalletId(*b"py/trsry");
+	pub TreasuryAccount: u128 = Treasury::account_id();
+	pub const SpendPayoutPeriod: u64 = 5;
 }
 pub struct TestSpendOrigin;
 impl frame_support::traits::EnsureOrigin<RuntimeOrigin> for TestSpendOrigin {
@@ -120,6 +180,16 @@ impl frame_support::traits::EnsureOrigin<RuntimeOrigin> for TestSpendOrigin {
 	}
 }
 
+pub struct MulBy<N>(PhantomData<N>);
+impl<N: Get<u64>> ConversionFromAssetBalance<u64, u32, u64> for MulBy<N> {
+	type Error = ();
+	fn from_asset_balance(balance: u64, _asset_id: u32) -> Result<u64, Self::Error> {
+		return balance.checked_mul(N::get()).ok_or(())
+	}
+	#[cfg(feature = "runtime-benchmarks")]
+	fn ensure_successful(_: u32) {}
+}
+
 impl Config for Test {
 	type PalletId = TreasuryPalletId;
 	type Currency = pallet_balances::Pallet<Test>;
@@ -137,76 +207,107 @@ impl Config for Test {
 	type SpendFunds = ();
 	type MaxApprovals = ConstU32<100>;
 	type SpendOrigin = TestSpendOrigin;
+	type AssetKind = u32;
+	type Beneficiary = u128;
+	type BeneficiaryLookup = IdentityLookup<Self::Beneficiary>;
+	type Paymaster = TestPay;
+	type BalanceConverter = MulBy<ConstU64<2>>;
+	type PayoutPeriod = SpendPayoutPeriod;
+	#[cfg(feature = "runtime-benchmarks")]
+	type BenchmarkHelper = ();
 }
 
-pub fn new_test_ext() -> sp_io::TestExternalities {
-	let mut t = frame_system::GenesisConfig::<Test>::default().build_storage().unwrap();
-	pallet_balances::GenesisConfig::<Test> {
-		// Total issuance will be 200 with treasury account initialized at ED.
-		balances: vec![(0, 100), (1, 98), (2, 1)],
+pub struct ExtBuilder {}
+
+impl Default for ExtBuilder {
+	fn default() -> Self {
+		Self {}
+	}
+}
+
+impl ExtBuilder {
+	pub fn build(self) -> sp_io::TestExternalities {
+		let mut t = frame_system::GenesisConfig::<Test>::default().build_storage().unwrap();
+		pallet_balances::GenesisConfig::<Test> {
+			// Total issuance will be 200 with treasury account initialized at ED.
+			balances: vec![(0, 100), (1, 98), (2, 1)],
+		}
+		.assimilate_storage(&mut t)
+		.unwrap();
+		crate::GenesisConfig::<Test>::default().assimilate_storage(&mut t).unwrap();
+		let mut ext = sp_io::TestExternalities::new(t);
+		ext.execute_with(|| System::set_block_number(1));
+		ext
+	}
+}
+
+fn get_payment_id(i: SpendIndex) -> Option<u64> {
+	let spend = Spends::<Test, _>::get(i).expect("no spend");
+	match spend.status {
+		PaymentState::Attempted { id } => Some(id),
+		_ => None,
 	}
-	.assimilate_storage(&mut t)
-	.unwrap();
-	crate::GenesisConfig::<Test>::default().assimilate_storage(&mut t).unwrap();
-	t.into()
 }
 
 #[test]
 fn genesis_config_works() {
-	new_test_ext().execute_with(|| {
+	ExtBuilder::default().build().execute_with(|| {
 		assert_eq!(Treasury::pot(), 0);
 		assert_eq!(Treasury::proposal_count(), 0);
 	});
 }
 
 #[test]
-fn spend_origin_permissioning_works() {
-	new_test_ext().execute_with(|| {
-		assert_noop!(Treasury::spend(RuntimeOrigin::signed(1), 1, 1), BadOrigin);
+fn spend_local_origin_permissioning_works() {
+	ExtBuilder::default().build().execute_with(|| {
+		assert_noop!(Treasury::spend_local(RuntimeOrigin::signed(1), 1, 1), BadOrigin);
 		assert_noop!(
-			Treasury::spend(RuntimeOrigin::signed(10), 6, 1),
+			Treasury::spend_local(RuntimeOrigin::signed(10), 6, 1),
 			Error::<Test>::InsufficientPermission
 		);
 		assert_noop!(
-			Treasury::spend(RuntimeOrigin::signed(11), 11, 1),
+			Treasury::spend_local(RuntimeOrigin::signed(11), 11, 1),
 			Error::<Test>::InsufficientPermission
 		);
 		assert_noop!(
-			Treasury::spend(RuntimeOrigin::signed(12), 21, 1),
+			Treasury::spend_local(RuntimeOrigin::signed(12), 21, 1),
 			Error::<Test>::InsufficientPermission
 		);
 		assert_noop!(
-			Treasury::spend(RuntimeOrigin::signed(13), 51, 1),
+			Treasury::spend_local(RuntimeOrigin::signed(13), 51, 1),
 			Error::<Test>::InsufficientPermission
 		);
 	});
 }
 
+#[docify::export]
 #[test]
-fn spend_origin_works() {
-	new_test_ext().execute_with(|| {
+fn spend_local_origin_works() {
+	ExtBuilder::default().build().execute_with(|| {
 		// Check that accumulate works when we have Some value in Dummy already.
 		Balances::make_free_balance_be(&Treasury::account_id(), 101);
-		assert_ok!(Treasury::spend(RuntimeOrigin::signed(10), 5, 6));
-		assert_ok!(Treasury::spend(RuntimeOrigin::signed(10), 5, 6));
-		assert_ok!(Treasury::spend(RuntimeOrigin::signed(10), 5, 6));
-		assert_ok!(Treasury::spend(RuntimeOrigin::signed(10), 5, 6));
-		assert_ok!(Treasury::spend(RuntimeOrigin::signed(11), 10, 6));
-		assert_ok!(Treasury::spend(RuntimeOrigin::signed(12), 20, 6));
-		assert_ok!(Treasury::spend(RuntimeOrigin::signed(13), 50, 6));
-
+		// approve spend of some amount to beneficiary `6`.
+		assert_ok!(Treasury::spend_local(RuntimeOrigin::signed(10), 5, 6));
+		assert_ok!(Treasury::spend_local(RuntimeOrigin::signed(10), 5, 6));
+		assert_ok!(Treasury::spend_local(RuntimeOrigin::signed(10), 5, 6));
+		assert_ok!(Treasury::spend_local(RuntimeOrigin::signed(10), 5, 6));
+		assert_ok!(Treasury::spend_local(RuntimeOrigin::signed(11), 10, 6));
+		assert_ok!(Treasury::spend_local(RuntimeOrigin::signed(12), 20, 6));
+		assert_ok!(Treasury::spend_local(RuntimeOrigin::signed(13), 50, 6));
+		// free balance of `6` is zero, spend period has not passed.
 		<Treasury as OnInitialize<u64>>::on_initialize(1);
 		assert_eq!(Balances::free_balance(6), 0);
-
+		// free balance of `6` is `100`, spend period has passed.
 		<Treasury as OnInitialize<u64>>::on_initialize(2);
 		assert_eq!(Balances::free_balance(6), 100);
+		// `100` spent, `1` burned.
 		assert_eq!(Treasury::pot(), 0);
 	});
 }
 
 #[test]
 fn minting_works() {
-	new_test_ext().execute_with(|| {
+	ExtBuilder::default().build().execute_with(|| {
 		// Check that accumulate works when we have Some value in Dummy already.
 		Balances::make_free_balance_be(&Treasury::account_id(), 101);
 		assert_eq!(Treasury::pot(), 100);
@@ -215,7 +316,7 @@ fn minting_works() {
 
 #[test]
 fn spend_proposal_takes_min_deposit() {
-	new_test_ext().execute_with(|| {
+	ExtBuilder::default().build().execute_with(|| {
 		assert_ok!({
 			#[allow(deprecated)]
 			Treasury::propose_spend(RuntimeOrigin::signed(0), 1, 3)
@@ -227,7 +328,7 @@ fn spend_proposal_takes_min_deposit() {
 
 #[test]
 fn spend_proposal_takes_proportional_deposit() {
-	new_test_ext().execute_with(|| {
+	ExtBuilder::default().build().execute_with(|| {
 		assert_ok!({
 			#[allow(deprecated)]
 			Treasury::propose_spend(RuntimeOrigin::signed(0), 100, 3)
@@ -239,7 +340,7 @@ fn spend_proposal_takes_proportional_deposit() {
 
 #[test]
 fn spend_proposal_fails_when_proposer_poor() {
-	new_test_ext().execute_with(|| {
+	ExtBuilder::default().build().execute_with(|| {
 		assert_noop!(
 			{
 				#[allow(deprecated)]
@@ -252,7 +353,7 @@ fn spend_proposal_fails_when_proposer_poor() {
 
 #[test]
 fn accepted_spend_proposal_ignored_outside_spend_period() {
-	new_test_ext().execute_with(|| {
+	ExtBuilder::default().build().execute_with(|| {
 		Balances::make_free_balance_be(&Treasury::account_id(), 101);
 
 		assert_ok!({
@@ -272,7 +373,7 @@ fn accepted_spend_proposal_ignored_outside_spend_period() {
 
 #[test]
 fn unused_pot_should_diminish() {
-	new_test_ext().execute_with(|| {
+	ExtBuilder::default().build().execute_with(|| {
 		let init_total_issuance = Balances::total_issuance();
 		Balances::make_free_balance_be(&Treasury::account_id(), 101);
 		assert_eq!(Balances::total_issuance(), init_total_issuance + 100);
@@ -285,7 +386,7 @@ fn unused_pot_should_diminish() {
 
 #[test]
 fn rejected_spend_proposal_ignored_on_spend_period() {
-	new_test_ext().execute_with(|| {
+	ExtBuilder::default().build().execute_with(|| {
 		Balances::make_free_balance_be(&Treasury::account_id(), 101);
 
 		assert_ok!({
@@ -305,7 +406,7 @@ fn rejected_spend_proposal_ignored_on_spend_period() {
 
 #[test]
 fn reject_already_rejected_spend_proposal_fails() {
-	new_test_ext().execute_with(|| {
+	ExtBuilder::default().build().execute_with(|| {
 		Balances::make_free_balance_be(&Treasury::account_id(), 101);
 
 		assert_ok!({
@@ -328,7 +429,7 @@ fn reject_already_rejected_spend_proposal_fails() {
 
 #[test]
 fn reject_non_existent_spend_proposal_fails() {
-	new_test_ext().execute_with(|| {
+	ExtBuilder::default().build().execute_with(|| {
 		assert_noop!(
 			{
 				#[allow(deprecated)]
@@ -341,7 +442,7 @@ fn reject_non_existent_spend_proposal_fails() {
 
 #[test]
 fn accept_non_existent_spend_proposal_fails() {
-	new_test_ext().execute_with(|| {
+	ExtBuilder::default().build().execute_with(|| {
 		assert_noop!(
 			{
 				#[allow(deprecated)]
@@ -354,7 +455,7 @@ fn accept_non_existent_spend_proposal_fails() {
 
 #[test]
 fn accept_already_rejected_spend_proposal_fails() {
-	new_test_ext().execute_with(|| {
+	ExtBuilder::default().build().execute_with(|| {
 		Balances::make_free_balance_be(&Treasury::account_id(), 101);
 
 		assert_ok!({
@@ -377,7 +478,7 @@ fn accept_already_rejected_spend_proposal_fails() {
 
 #[test]
 fn accepted_spend_proposal_enacted_on_spend_period() {
-	new_test_ext().execute_with(|| {
+	ExtBuilder::default().build().execute_with(|| {
 		Balances::make_free_balance_be(&Treasury::account_id(), 101);
 		assert_eq!(Treasury::pot(), 100);
 
@@ -398,7 +499,7 @@ fn accepted_spend_proposal_enacted_on_spend_period() {
 
 #[test]
 fn pot_underflow_should_not_diminish() {
-	new_test_ext().execute_with(|| {
+	ExtBuilder::default().build().execute_with(|| {
 		Balances::make_free_balance_be(&Treasury::account_id(), 101);
 		assert_eq!(Treasury::pot(), 100);
 
@@ -425,7 +526,7 @@ fn pot_underflow_should_not_diminish() {
 // i.e. pot should not include existential deposit needed for account survival.
 #[test]
 fn treasury_account_doesnt_get_deleted() {
-	new_test_ext().execute_with(|| {
+	ExtBuilder::default().build().execute_with(|| {
 		Balances::make_free_balance_be(&Treasury::account_id(), 101);
 		assert_eq!(Treasury::pot(), 100);
 		let treasury_balance = Balances::free_balance(&Treasury::account_id());
@@ -524,7 +625,7 @@ fn genesis_funding_works() {
 
 #[test]
 fn max_approvals_limited() {
-	new_test_ext().execute_with(|| {
+	ExtBuilder::default().build().execute_with(|| {
 		Balances::make_free_balance_be(&Treasury::account_id(), u64::MAX);
 		Balances::make_free_balance_be(&0, u64::MAX);
 
@@ -556,7 +657,7 @@ fn max_approvals_limited() {
 
 #[test]
 fn remove_already_removed_approval_fails() {
-	new_test_ext().execute_with(|| {
+	ExtBuilder::default().build().execute_with(|| {
 		Balances::make_free_balance_be(&Treasury::account_id(), 101);
 
 		assert_ok!({
@@ -578,14 +679,49 @@ fn remove_already_removed_approval_fails() {
 	});
 }
 
+#[test]
+fn spending_local_in_batch_respects_max_total() {
+	ExtBuilder::default().build().execute_with(|| {
+		// Respect the `max_total` for the given origin.
+		assert_ok!(RuntimeCall::from(UtilityCall::batch_all {
+			calls: vec![
+				RuntimeCall::from(TreasuryCall::spend_local { amount: 2, beneficiary: 100 }),
+				RuntimeCall::from(TreasuryCall::spend_local { amount: 2, beneficiary: 101 })
+			]
+		})
+		.dispatch(RuntimeOrigin::signed(10)));
+
+		assert_err_ignore_postinfo!(
+			RuntimeCall::from(UtilityCall::batch_all {
+				calls: vec![
+					RuntimeCall::from(TreasuryCall::spend_local { amount: 2, beneficiary: 100 }),
+					RuntimeCall::from(TreasuryCall::spend_local { amount: 4, beneficiary: 101 })
+				]
+			})
+			.dispatch(RuntimeOrigin::signed(10)),
+			Error::<Test, _>::InsufficientPermission
+		);
+	})
+}
+
 #[test]
 fn spending_in_batch_respects_max_total() {
-	new_test_ext().execute_with(|| {
+	ExtBuilder::default().build().execute_with(|| {
 		// Respect the `max_total` for the given origin.
 		assert_ok!(RuntimeCall::from(UtilityCall::batch_all {
 			calls: vec![
-				RuntimeCall::from(TreasuryCall::spend { amount: 2, beneficiary: 100 }),
-				RuntimeCall::from(TreasuryCall::spend { amount: 2, beneficiary: 101 })
+				RuntimeCall::from(TreasuryCall::spend {
+					asset_kind: Box::new(1),
+					amount: 1,
+					beneficiary: Box::new(100),
+					valid_from: None,
+				}),
+				RuntimeCall::from(TreasuryCall::spend {
+					asset_kind: Box::new(1),
+					amount: 1,
+					beneficiary: Box::new(101),
+					valid_from: None,
+				})
 			]
 		})
 		.dispatch(RuntimeOrigin::signed(10)));
@@ -593,8 +729,18 @@ fn spending_in_batch_respects_max_total() {
 		assert_err_ignore_postinfo!(
 			RuntimeCall::from(UtilityCall::batch_all {
 				calls: vec![
-					RuntimeCall::from(TreasuryCall::spend { amount: 2, beneficiary: 100 }),
-					RuntimeCall::from(TreasuryCall::spend { amount: 4, beneficiary: 101 })
+					RuntimeCall::from(TreasuryCall::spend {
+						asset_kind: Box::new(1),
+						amount: 2,
+						beneficiary: Box::new(100),
+						valid_from: None,
+					}),
+					RuntimeCall::from(TreasuryCall::spend {
+						asset_kind: Box::new(1),
+						amount: 2,
+						beneficiary: Box::new(101),
+						valid_from: None,
+					})
 				]
 			})
 			.dispatch(RuntimeOrigin::signed(10)),
@@ -602,3 +748,415 @@ fn spending_in_batch_respects_max_total() {
 		);
 	})
 }
+
+#[test]
+fn spend_origin_works() {
+	ExtBuilder::default().build().execute_with(|| {
+		assert_ok!(Treasury::spend(RuntimeOrigin::signed(10), Box::new(1), 1, Box::new(6), None));
+		assert_ok!(Treasury::spend(RuntimeOrigin::signed(10), Box::new(1), 2, Box::new(6), None));
+		assert_noop!(
+			Treasury::spend(RuntimeOrigin::signed(10), Box::new(1), 3, Box::new(6), None),
+			Error::<Test, _>::InsufficientPermission
+		);
+		assert_ok!(Treasury::spend(RuntimeOrigin::signed(11), Box::new(1), 5, Box::new(6), None));
+		assert_noop!(
+			Treasury::spend(RuntimeOrigin::signed(11), Box::new(1), 6, Box::new(6), None),
+			Error::<Test, _>::InsufficientPermission
+		);
+		assert_ok!(Treasury::spend(RuntimeOrigin::signed(12), Box::new(1), 10, Box::new(6), None));
+		assert_noop!(
+			Treasury::spend(RuntimeOrigin::signed(12), Box::new(1), 11, Box::new(6), None),
+			Error::<Test, _>::InsufficientPermission
+		);
+
+		assert_eq!(SpendCount::<Test, _>::get(), 4);
+		assert_eq!(Spends::<Test, _>::iter().count(), 4);
+	});
+}
+
+#[test]
+fn spend_works() {
+	ExtBuilder::default().build().execute_with(|| {
+		System::set_block_number(1);
+		assert_ok!(Treasury::spend(RuntimeOrigin::signed(10), Box::new(1), 2, Box::new(6), None));
+
+		assert_eq!(SpendCount::<Test, _>::get(), 1);
+		assert_eq!(
+			Spends::<Test, _>::get(0).unwrap(),
+			SpendStatus {
+				asset_kind: 1,
+				amount: 2,
+				beneficiary: 6,
+				valid_from: 1,
+				expire_at: 6,
+				status: PaymentState::Pending,
+			}
+		);
+		System::assert_last_event(
+			Event::<Test, _>::AssetSpendApproved {
+				index: 0,
+				asset_kind: 1,
+				amount: 2,
+				beneficiary: 6,
+				valid_from: 1,
+				expire_at: 6,
+			}
+			.into(),
+		);
+	});
+}
+
+#[test]
+fn spend_expires() {
+	ExtBuilder::default().build().execute_with(|| {
+		assert_eq!(<Test as Config>::PayoutPeriod::get(), 5);
+
+		// spend `0` expires in 5 blocks after the creating.
+		System::set_block_number(1);
+		assert_ok!(Treasury::spend(RuntimeOrigin::signed(10), Box::new(1), 2, Box::new(6), None));
+		System::set_block_number(6);
+		assert_noop!(Treasury::payout(RuntimeOrigin::signed(1), 0), Error::<Test, _>::SpendExpired);
+
+		// spend cannot be approved since its already expired.
+		assert_noop!(
+			Treasury::spend(RuntimeOrigin::signed(10), Box::new(1), 2, Box::new(6), Some(0)),
+			Error::<Test, _>::SpendExpired
+		);
+	});
+}
+
+#[docify::export]
+#[test]
+fn spend_payout_works() {
+	ExtBuilder::default().build().execute_with(|| {
+		System::set_block_number(1);
+		// approve a `2` coins spend of asset `1` to beneficiary `6`, the spend valid from now.
+		assert_ok!(Treasury::spend(RuntimeOrigin::signed(10), Box::new(1), 2, Box::new(6), None));
+		// payout the spend.
+		assert_ok!(Treasury::payout(RuntimeOrigin::signed(1), 0));
+		// beneficiary received `2` coins of asset `1`.
+		assert_eq!(paid(6, 1), 2);
+		assert_eq!(SpendCount::<Test, _>::get(), 1);
+		let payment_id = get_payment_id(0).expect("no payment attempt");
+		System::assert_last_event(Event::<Test, _>::Paid { index: 0, payment_id }.into());
+		set_status(payment_id, PaymentStatus::Success);
+		// the payment succeed.
+		assert_ok!(Treasury::check_status(RuntimeOrigin::signed(1), 0));
+		System::assert_last_event(Event::<Test, _>::SpendProcessed { index: 0 }.into());
+		// cannot payout the same spend twice.
+		assert_noop!(Treasury::payout(RuntimeOrigin::signed(1), 0), Error::<Test, _>::InvalidIndex);
+	});
+}
+
+#[test]
+fn payout_retry_works() {
+	ExtBuilder::default().build().execute_with(|| {
+		System::set_block_number(1);
+		assert_ok!(Treasury::spend(RuntimeOrigin::signed(10), Box::new(1), 2, Box::new(6), None));
+		assert_ok!(Treasury::payout(RuntimeOrigin::signed(1), 0));
+		assert_eq!(paid(6, 1), 2);
+		let payment_id = get_payment_id(0).expect("no payment attempt");
+		// spend payment is failed
+		set_status(payment_id, PaymentStatus::Failure);
+		unpay(6, 1, 2);
+		// cannot payout a spend in the attempted state
+		assert_noop!(
+			Treasury::payout(RuntimeOrigin::signed(1), 0),
+			Error::<Test, _>::AlreadyAttempted
+		);
+		// check status and update it to retry the payout again
+		assert_ok!(Treasury::check_status(RuntimeOrigin::signed(1), 0));
+		System::assert_last_event(Event::<Test, _>::PaymentFailed { index: 0, payment_id }.into());
+		// the payout can be retried now
+		assert_ok!(Treasury::payout(RuntimeOrigin::signed(1), 0));
+		assert_eq!(paid(6, 1), 2);
+	});
+}
+
+#[test]
+fn spend_valid_from_works() {
+	ExtBuilder::default().build().execute_with(|| {
+		assert_eq!(<Test as Config>::PayoutPeriod::get(), 5);
+		System::set_block_number(1);
+
+		// spend valid from block `2`.
+		assert_ok!(Treasury::spend(
+			RuntimeOrigin::signed(10),
+			Box::new(1),
+			2,
+			Box::new(6),
+			Some(2)
+		));
+		assert_noop!(Treasury::payout(RuntimeOrigin::signed(1), 0), Error::<Test, _>::EarlyPayout);
+		System::set_block_number(2);
+		assert_ok!(Treasury::payout(RuntimeOrigin::signed(1), 0));
+
+		System::set_block_number(5);
+		// spend approved even if `valid_from` in the past since the payout period has not passed.
+		assert_ok!(Treasury::spend(
+			RuntimeOrigin::signed(10),
+			Box::new(1),
+			2,
+			Box::new(6),
+			Some(4)
+		));
+		// spend paid.
+		assert_ok!(Treasury::payout(RuntimeOrigin::signed(1), 1));
+	});
+}
+
+#[test]
+fn void_spend_works() {
+	ExtBuilder::default().build().execute_with(|| {
+		System::set_block_number(1);
+		// spend cannot be voided if already attempted.
+		assert_ok!(Treasury::spend(
+			RuntimeOrigin::signed(10),
+			Box::new(1),
+			2,
+			Box::new(6),
+			Some(1)
+		));
+		assert_ok!(Treasury::payout(RuntimeOrigin::signed(1), 0));
+		assert_noop!(
+			Treasury::void_spend(RuntimeOrigin::root(), 0),
+			Error::<Test, _>::AlreadyAttempted
+		);
+
+		// void spend.
+		assert_ok!(Treasury::spend(
+			RuntimeOrigin::signed(10),
+			Box::new(1),
+			2,
+			Box::new(6),
+			Some(10)
+		));
+		assert_ok!(Treasury::void_spend(RuntimeOrigin::root(), 1));
+		assert_eq!(Spends::<Test, _>::get(1), None);
+	});
+}
+
+#[test]
+fn check_status_works() {
+	ExtBuilder::default().build().execute_with(|| {
+		assert_eq!(<Test as Config>::PayoutPeriod::get(), 5);
+		System::set_block_number(1);
+
+		// spend `0` expired and can be removed.
+		assert_ok!(Treasury::spend(RuntimeOrigin::signed(10), Box::new(1), 2, Box::new(6), None));
+		System::set_block_number(7);
+		let info = Treasury::check_status(RuntimeOrigin::signed(1), 0).unwrap();
+		assert_eq!(info.pays_fee, Pays::No);
+		System::assert_last_event(Event::<Test, _>::SpendProcessed { index: 0 }.into());
+
+		// spend `1` payment failed and expired hence can be removed.
+		assert_ok!(Treasury::spend(RuntimeOrigin::signed(10), Box::new(1), 2, Box::new(6), None));
+		assert_noop!(
+			Treasury::check_status(RuntimeOrigin::signed(1), 1),
+			Error::<Test, _>::NotAttempted
+		);
+		assert_ok!(Treasury::payout(RuntimeOrigin::signed(1), 1));
+		let payment_id = get_payment_id(1).expect("no payment attempt");
+		set_status(payment_id, PaymentStatus::Failure);
+		// spend expired.
+		System::set_block_number(13);
+		let info = Treasury::check_status(RuntimeOrigin::signed(1), 1).unwrap();
+		assert_eq!(info.pays_fee, Pays::Yes);
+		System::assert_last_event(Event::<Test, _>::PaymentFailed { index: 1, payment_id }.into());
+		let info = Treasury::check_status(RuntimeOrigin::signed(1), 1).unwrap();
+		assert_eq!(info.pays_fee, Pays::No);
+		System::assert_last_event(Event::<Test, _>::SpendProcessed { index: 1 }.into());
+
+		// spend `2` payment succeed.
+		assert_ok!(Treasury::spend(RuntimeOrigin::signed(10), Box::new(1), 2, Box::new(6), None));
+		assert_ok!(Treasury::payout(RuntimeOrigin::signed(1), 2));
+		let payment_id = get_payment_id(2).expect("no payment attempt");
+		set_status(payment_id, PaymentStatus::Success);
+		let info = Treasury::check_status(RuntimeOrigin::signed(1), 2).unwrap();
+		assert_eq!(info.pays_fee, Pays::No);
+		System::assert_last_event(Event::<Test, _>::SpendProcessed { index: 2 }.into());
+
+		// spend `3` payment in process.
+		assert_ok!(Treasury::spend(RuntimeOrigin::signed(10), Box::new(1), 2, Box::new(6), None));
+		assert_ok!(Treasury::payout(RuntimeOrigin::signed(1), 3));
+		let payment_id = get_payment_id(3).expect("no payment attempt");
+		set_status(payment_id, PaymentStatus::InProgress);
+		assert_noop!(
+			Treasury::check_status(RuntimeOrigin::signed(1), 3),
+			Error::<Test, _>::Inconclusive
+		);
+
+		// spend `4` removed since the payment status is unknown.
+		assert_ok!(Treasury::spend(RuntimeOrigin::signed(10), Box::new(1), 2, Box::new(6), None));
+		assert_ok!(Treasury::payout(RuntimeOrigin::signed(1), 4));
+		let payment_id = get_payment_id(4).expect("no payment attempt");
+		set_status(payment_id, PaymentStatus::Unknown);
+		let info = Treasury::check_status(RuntimeOrigin::signed(1), 4).unwrap();
+		assert_eq!(info.pays_fee, Pays::No);
+		System::assert_last_event(Event::<Test, _>::SpendProcessed { index: 4 }.into());
+	});
+}
+
+#[test]
+fn try_state_proposals_invariant_1_works() {
+	ExtBuilder::default().build().execute_with(|| {
+		use frame_support::pallet_prelude::DispatchError::Other;
+		// Add a proposal using `propose_spend`
+		assert_ok!({
+			#[allow(deprecated)]
+			Treasury::propose_spend(RuntimeOrigin::signed(0), 1, 3)
+		});
+		assert_eq!(Proposals::<Test>::iter().count(), 1);
+		assert_eq!(ProposalCount::<Test>::get(), 1);
+		// Check invariant 1 holds
+		assert!(ProposalCount::<Test>::get() as usize >= Proposals::<Test>::iter().count());
+		// Break invariant 1 by decreasing `ProposalCount`
+		ProposalCount::<Test>::put(0);
+		// Invariant 1 should be violated
+		assert_eq!(
+			Treasury::do_try_state(),
+			Err(Other("Actual number of proposals exceeds `ProposalCount`."))
+		);
+	});
+}
+
+#[test]
+fn try_state_proposals_invariant_2_works() {
+	ExtBuilder::default().build().execute_with(|| {
+		use frame_support::pallet_prelude::DispatchError::Other;
+		// Add a proposal using `propose_spend`
+		assert_ok!({
+			#[allow(deprecated)]
+			Treasury::propose_spend(RuntimeOrigin::signed(0), 1, 3)
+		});
+		assert_eq!(Proposals::<Test>::iter().count(), 1);
+		let current_proposal_count = ProposalCount::<Test>::get();
+		assert_eq!(current_proposal_count, 1);
+		// Check invariant 2 holds
+		assert!(
+			Proposals::<Test>::iter_keys()
+			.all(|proposal_index| {
+					proposal_index < current_proposal_count
+			})
+		);
+		// Break invariant 2 by inserting the proposal under key = 1
+		let proposal = Proposals::<Test>::take(0).unwrap();
+		Proposals::<Test>::insert(1, proposal);
+		// Invariant 2 should be violated
+		assert_eq!(
+			Treasury::do_try_state(),
+			Err(Other("`ProposalCount` should by strictly greater than any ProposalIndex used as a key for `Proposals`."))
+		);
+	});
+}
+
+#[test]
+fn try_state_proposals_invariant_3_works() {
+	ExtBuilder::default().build().execute_with(|| {
+		use frame_support::pallet_prelude::DispatchError::Other;
+		// Add a proposal using `propose_spend`
+		assert_ok!({
+			#[allow(deprecated)]
+			Treasury::propose_spend(RuntimeOrigin::signed(0), 10, 3)
+		});
+		assert_eq!(Proposals::<Test>::iter().count(), 1);
+		// Approve the proposal
+		assert_ok!({
+			#[allow(deprecated)]
+			Treasury::approve_proposal(RuntimeOrigin::root(), 0)
+		});
+		assert_eq!(Approvals::<Test>::get().len(), 1);
+		// Check invariant 3 holds
+		assert!(Approvals::<Test>::get()
+			.iter()
+			.all(|proposal_index| { Proposals::<Test>::contains_key(proposal_index) }));
+		// Break invariant 3 by adding another key to `Approvals`
+		let mut approvals_modified = Approvals::<Test>::get();
+		approvals_modified.try_push(2).unwrap();
+		Approvals::<Test>::put(approvals_modified);
+		// Invariant 3 should be violated
+		assert_eq!(
+			Treasury::do_try_state(),
+			Err(Other("Proposal indices in `Approvals` must also be contained in `Proposals`."))
+		);
+	});
+}
+
+#[test]
+fn try_state_spends_invariant_1_works() {
+	ExtBuilder::default().build().execute_with(|| {
+		use frame_support::pallet_prelude::DispatchError::Other;
+		// Propose and approve a spend
+		assert_ok!({
+			Treasury::spend(RuntimeOrigin::signed(10), Box::new(1), 1, Box::new(6), None)
+		});
+		assert_eq!(Spends::<Test>::iter().count(), 1);
+		assert_eq!(SpendCount::<Test>::get(), 1);
+		// Check invariant 1 holds
+		assert!(SpendCount::<Test>::get() as usize >= Spends::<Test>::iter().count());
+		// Break invariant 1 by decreasing `SpendCount`
+		SpendCount::<Test>::put(0);
+		// Invariant 1 should be violated
+		assert_eq!(
+			Treasury::do_try_state(),
+			Err(Other("Actual number of spends exceeds `SpendCount`."))
+		);
+	});
+}
+
+#[test]
+fn try_state_spends_invariant_2_works() {
+	ExtBuilder::default().build().execute_with(|| {
+		use frame_support::pallet_prelude::DispatchError::Other;
+		// Propose and approve a spend
+		assert_ok!({
+			Treasury::spend(RuntimeOrigin::signed(10), Box::new(1), 1, Box::new(6), None)
+		});
+		assert_eq!(Spends::<Test>::iter().count(), 1);
+		let current_spend_count = SpendCount::<Test>::get();
+		assert_eq!(current_spend_count, 1);
+		// Check invariant 2 holds
+		assert!(
+			Spends::<Test>::iter_keys()
+			.all(|spend_index| {
+					spend_index < current_spend_count
+			})
+		);
+		// Break invariant 2 by inserting the spend under key = 1
+		let spend = Spends::<Test>::take(0).unwrap();
+		Spends::<Test>::insert(1, spend);
+		// Invariant 2 should be violated
+		assert_eq!(
+			Treasury::do_try_state(),
+			Err(Other("`SpendCount` should by strictly greater than any SpendIndex used as a key for `Spends`."))
+		);
+	});
+}
+
+#[test]
+fn try_state_spends_invariant_3_works() {
+	ExtBuilder::default().build().execute_with(|| {
+		use frame_support::pallet_prelude::DispatchError::Other;
+		// Propose and approve a spend
+		assert_ok!({
+			Treasury::spend(RuntimeOrigin::signed(10), Box::new(1), 1, Box::new(6), None)
+		});
+		assert_eq!(Spends::<Test>::iter().count(), 1);
+		let current_spend_count = SpendCount::<Test>::get();
+		assert_eq!(current_spend_count, 1);
+		// Check invariant 3 holds
+		assert!(Spends::<Test>::iter_values()
+			.all(|SpendStatus { valid_from, expire_at, .. }| { valid_from < expire_at }));
+		// Break invariant 3 by reversing spend.expire_at and spend.valid_from
+		let spend = Spends::<Test>::take(0).unwrap();
+		Spends::<Test>::insert(
+			0,
+			SpendStatus { valid_from: spend.expire_at, expire_at: spend.valid_from, ..spend },
+		);
+		// Invariant 3 should be violated
+		assert_eq!(
+			Treasury::do_try_state(),
+			Err(Other("Spend cannot expire before it becomes valid."))
+		);
+	});
+}
diff --git a/substrate/frame/treasury/src/weights.rs b/substrate/frame/treasury/src/weights.rs
index 8f1418f76d969056c83be8673671494992e27fef..030e18980eb54f8b16452691b884e6046878aaa2 100644
--- a/substrate/frame/treasury/src/weights.rs
+++ b/substrate/frame/treasury/src/weights.rs
@@ -18,28 +18,23 @@
 //! Autogenerated weights for pallet_treasury
 //!
 //! THIS FILE WAS AUTO-GENERATED USING THE SUBSTRATE BENCHMARK CLI VERSION 4.0.0-dev
-//! DATE: 2023-06-16, STEPS: `50`, REPEAT: `20`, LOW RANGE: `[]`, HIGH RANGE: `[]`
+//! DATE: 2023-07-07, STEPS: `20`, REPEAT: `2`, LOW RANGE: `[]`, HIGH RANGE: `[]`
 //! WORST CASE MAP SIZE: `1000000`
-//! HOSTNAME: `runner-e8ezs4ez-project-145-concurrent-0`, CPU: `Intel(R) Xeon(R) CPU @ 2.60GHz`
-//! EXECUTION: Some(Wasm), WASM-EXECUTION: Compiled, CHAIN: Some("dev"), DB CACHE: 1024
+//! HOSTNAME: `cob`, CPU: `<UNKNOWN>`
+//! EXECUTION: None, WASM-EXECUTION: Compiled, CHAIN: Some("dev"), DB CACHE: 1024
 
 // Executed Command:
-// ./target/production/substrate
+// ./target/debug/substrate
 // benchmark
 // pallet
 // --chain=dev
-// --steps=50
-// --repeat=20
-// --pallet=pallet_treasury
-// --no-storage-info
-// --no-median-slopes
-// --no-min-squares
+// --steps=20
+// --repeat=2
+// --pallet=pallet-treasury
 // --extrinsic=*
-// --execution=wasm
 // --wasm-execution=compiled
 // --heap-pages=4096
-// --output=./frame/treasury/src/weights.rs
-// --header=./HEADER-APACHE2
+// --output=./frame/treasury/src/._weights.rs
 // --template=./.maintain/frame-weight-template.hbs
 
 #![cfg_attr(rustfmt, rustfmt_skip)]
@@ -52,12 +47,16 @@ use core::marker::PhantomData;
 
 /// Weight functions needed for pallet_treasury.
 pub trait WeightInfo {
-	fn spend() -> Weight;
+	fn spend_local() -> Weight;
 	fn propose_spend() -> Weight;
 	fn reject_proposal() -> Weight;
 	fn approve_proposal(p: u32, ) -> Weight;
 	fn remove_approval() -> Weight;
 	fn on_initialize_proposals(p: u32, ) -> Weight;
+	fn spend() -> Weight;
+	fn payout() -> Weight;
+	fn check_status() -> Weight;
+	fn void_spend() -> Weight;
 }
 
 /// Weights for pallet_treasury using the Substrate node and recommended hardware.
@@ -69,12 +68,12 @@ impl<T: frame_system::Config> WeightInfo for SubstrateWeight<T> {
 	/// Proof: Treasury Approvals (max_values: Some(1), max_size: Some(402), added: 897, mode: MaxEncodedLen)
 	/// Storage: Treasury Proposals (r:0 w:1)
 	/// Proof: Treasury Proposals (max_values: None, max_size: Some(108), added: 2583, mode: MaxEncodedLen)
-	fn spend() -> Weight {
+	fn spend_local() -> Weight {
 		// Proof Size summary in bytes:
 		//  Measured:  `76`
 		//  Estimated: `1887`
-		// Minimum execution time: 15_057_000 picoseconds.
-		Weight::from_parts(15_803_000, 1887)
+		// Minimum execution time: 179_000_000 picoseconds.
+		Weight::from_parts(190_000_000, 1887)
 			.saturating_add(T::DbWeight::get().reads(2_u64))
 			.saturating_add(T::DbWeight::get().writes(3_u64))
 	}
@@ -86,8 +85,8 @@ impl<T: frame_system::Config> WeightInfo for SubstrateWeight<T> {
 		// Proof Size summary in bytes:
 		//  Measured:  `177`
 		//  Estimated: `1489`
-		// Minimum execution time: 28_923_000 picoseconds.
-		Weight::from_parts(29_495_000, 1489)
+		// Minimum execution time: 349_000_000 picoseconds.
+		Weight::from_parts(398_000_000, 1489)
 			.saturating_add(T::DbWeight::get().reads(1_u64))
 			.saturating_add(T::DbWeight::get().writes(2_u64))
 	}
@@ -99,8 +98,8 @@ impl<T: frame_system::Config> WeightInfo for SubstrateWeight<T> {
 		// Proof Size summary in bytes:
 		//  Measured:  `335`
 		//  Estimated: `3593`
-		// Minimum execution time: 30_539_000 picoseconds.
-		Weight::from_parts(30_986_000, 3593)
+		// Minimum execution time: 367_000_000 picoseconds.
+		Weight::from_parts(388_000_000, 3593)
 			.saturating_add(T::DbWeight::get().reads(2_u64))
 			.saturating_add(T::DbWeight::get().writes(2_u64))
 	}
@@ -111,12 +110,12 @@ impl<T: frame_system::Config> WeightInfo for SubstrateWeight<T> {
 	/// The range of component `p` is `[0, 99]`.
 	fn approve_proposal(p: u32, ) -> Weight {
 		// Proof Size summary in bytes:
-		//  Measured:  `504 + p * (8 ±0)`
+		//  Measured:  `483 + p * (9 ±0)`
 		//  Estimated: `3573`
-		// Minimum execution time: 9_320_000 picoseconds.
-		Weight::from_parts(12_606_599, 3573)
-			// Standard Error: 1_302
-			.saturating_add(Weight::from_parts(71_054, 0).saturating_mul(p.into()))
+		// Minimum execution time: 111_000_000 picoseconds.
+		Weight::from_parts(108_813_243, 3573)
+			// Standard Error: 147_887
+			.saturating_add(Weight::from_parts(683_216, 0).saturating_mul(p.into()))
 			.saturating_add(T::DbWeight::get().reads(2_u64))
 			.saturating_add(T::DbWeight::get().writes(1_u64))
 	}
@@ -126,8 +125,8 @@ impl<T: frame_system::Config> WeightInfo for SubstrateWeight<T> {
 		// Proof Size summary in bytes:
 		//  Measured:  `161`
 		//  Estimated: `1887`
-		// Minimum execution time: 7_231_000 picoseconds.
-		Weight::from_parts(7_459_000, 1887)
+		// Minimum execution time: 71_000_000 picoseconds.
+		Weight::from_parts(78_000_000, 1887)
 			.saturating_add(T::DbWeight::get().reads(1_u64))
 			.saturating_add(T::DbWeight::get().writes(1_u64))
 	}
@@ -135,27 +134,81 @@ impl<T: frame_system::Config> WeightInfo for SubstrateWeight<T> {
 	/// Proof: Treasury Deactivated (max_values: Some(1), max_size: Some(16), added: 511, mode: MaxEncodedLen)
 	/// Storage: Treasury Approvals (r:1 w:1)
 	/// Proof: Treasury Approvals (max_values: Some(1), max_size: Some(402), added: 897, mode: MaxEncodedLen)
-	/// Storage: Treasury Proposals (r:100 w:100)
+	/// Storage: Treasury Proposals (r:99 w:99)
 	/// Proof: Treasury Proposals (max_values: None, max_size: Some(108), added: 2583, mode: MaxEncodedLen)
-	/// Storage: System Account (r:200 w:200)
+	/// Storage: System Account (r:198 w:198)
 	/// Proof: System Account (max_values: None, max_size: Some(128), added: 2603, mode: MaxEncodedLen)
 	/// Storage: Bounties BountyApprovals (r:1 w:1)
 	/// Proof: Bounties BountyApprovals (max_values: Some(1), max_size: Some(402), added: 897, mode: MaxEncodedLen)
-	/// The range of component `p` is `[0, 100]`.
+	/// The range of component `p` is `[0, 99]`.
 	fn on_initialize_proposals(p: u32, ) -> Weight {
 		// Proof Size summary in bytes:
-		//  Measured:  `421 + p * (251 ±0)`
+		//  Measured:  `427 + p * (251 ±0)`
 		//  Estimated: `1887 + p * (5206 ±0)`
-		// Minimum execution time: 44_769_000 picoseconds.
-		Weight::from_parts(57_915_572, 1887)
-			// Standard Error: 59_484
-			.saturating_add(Weight::from_parts(42_343_732, 0).saturating_mul(p.into()))
+		// Minimum execution time: 614_000_000 picoseconds.
+		Weight::from_parts(498_501_558, 1887)
+			// Standard Error: 1_070_260
+			.saturating_add(Weight::from_parts(599_011_690, 0).saturating_mul(p.into()))
 			.saturating_add(T::DbWeight::get().reads(3_u64))
 			.saturating_add(T::DbWeight::get().reads((3_u64).saturating_mul(p.into())))
 			.saturating_add(T::DbWeight::get().writes(3_u64))
 			.saturating_add(T::DbWeight::get().writes((3_u64).saturating_mul(p.into())))
 			.saturating_add(Weight::from_parts(0, 5206).saturating_mul(p.into()))
 	}
+	/// Storage: AssetRate ConversionRateToNative (r:1 w:0)
+	/// Proof: AssetRate ConversionRateToNative (max_values: None, max_size: Some(36), added: 2511, mode: MaxEncodedLen)
+	/// Storage: Treasury SpendCount (r:1 w:1)
+	/// Proof: Treasury SpendCount (max_values: Some(1), max_size: Some(4), added: 499, mode: MaxEncodedLen)
+	/// Storage: Treasury Spends (r:0 w:1)
+	/// Proof: Treasury Spends (max_values: None, max_size: Some(69), added: 2544, mode: MaxEncodedLen)
+	fn spend() -> Weight {
+		// Proof Size summary in bytes:
+		//  Measured:  `140`
+		//  Estimated: `3501`
+		// Minimum execution time: 214_000_000 picoseconds.
+		Weight::from_parts(216_000_000, 3501)
+			.saturating_add(T::DbWeight::get().reads(2_u64))
+			.saturating_add(T::DbWeight::get().writes(2_u64))
+	}
+	/// Storage: Treasury Spends (r:1 w:1)
+	/// Proof: Treasury Spends (max_values: None, max_size: Some(69), added: 2544, mode: MaxEncodedLen)
+	/// 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: System Account (r:1 w:1)
+	/// Proof: System Account (max_values: None, max_size: Some(128), added: 2603, mode: MaxEncodedLen)
+	fn payout() -> Weight {
+		// Proof Size summary in bytes:
+		//  Measured:  `705`
+		//  Estimated: `6208`
+		// Minimum execution time: 760_000_000 picoseconds.
+		Weight::from_parts(822_000_000, 6208)
+			.saturating_add(T::DbWeight::get().reads(5_u64))
+			.saturating_add(T::DbWeight::get().writes(5_u64))
+	}
+	/// Storage: Treasury Spends (r:1 w:1)
+	/// Proof: Treasury Spends (max_values: None, max_size: Some(69), added: 2544, mode: MaxEncodedLen)
+	fn check_status() -> Weight {
+		// Proof Size summary in bytes:
+		//  Measured:  `194`
+		//  Estimated: `3534`
+		// Minimum execution time: 153_000_000 picoseconds.
+		Weight::from_parts(160_000_000, 3534)
+			.saturating_add(T::DbWeight::get().reads(1_u64))
+			.saturating_add(T::DbWeight::get().writes(1_u64))
+	}
+	/// Storage: Treasury Spends (r:1 w:1)
+	/// Proof: Treasury Spends (max_values: None, max_size: Some(69), added: 2544, mode: MaxEncodedLen)
+	fn void_spend() -> Weight {
+		// Proof Size summary in bytes:
+		//  Measured:  `194`
+		//  Estimated: `3534`
+		// Minimum execution time: 147_000_000 picoseconds.
+		Weight::from_parts(181_000_000, 3534)
+			.saturating_add(T::DbWeight::get().reads(1_u64))
+			.saturating_add(T::DbWeight::get().writes(1_u64))
+	}
 }
 
 // For backwards compatibility and tests
@@ -166,12 +219,12 @@ impl WeightInfo for () {
 	/// Proof: Treasury Approvals (max_values: Some(1), max_size: Some(402), added: 897, mode: MaxEncodedLen)
 	/// Storage: Treasury Proposals (r:0 w:1)
 	/// Proof: Treasury Proposals (max_values: None, max_size: Some(108), added: 2583, mode: MaxEncodedLen)
-	fn spend() -> Weight {
+	fn spend_local() -> Weight {
 		// Proof Size summary in bytes:
 		//  Measured:  `76`
 		//  Estimated: `1887`
-		// Minimum execution time: 15_057_000 picoseconds.
-		Weight::from_parts(15_803_000, 1887)
+		// Minimum execution time: 179_000_000 picoseconds.
+		Weight::from_parts(190_000_000, 1887)
 			.saturating_add(RocksDbWeight::get().reads(2_u64))
 			.saturating_add(RocksDbWeight::get().writes(3_u64))
 	}
@@ -183,8 +236,8 @@ impl WeightInfo for () {
 		// Proof Size summary in bytes:
 		//  Measured:  `177`
 		//  Estimated: `1489`
-		// Minimum execution time: 28_923_000 picoseconds.
-		Weight::from_parts(29_495_000, 1489)
+		// Minimum execution time: 349_000_000 picoseconds.
+		Weight::from_parts(398_000_000, 1489)
 			.saturating_add(RocksDbWeight::get().reads(1_u64))
 			.saturating_add(RocksDbWeight::get().writes(2_u64))
 	}
@@ -196,8 +249,8 @@ impl WeightInfo for () {
 		// Proof Size summary in bytes:
 		//  Measured:  `335`
 		//  Estimated: `3593`
-		// Minimum execution time: 30_539_000 picoseconds.
-		Weight::from_parts(30_986_000, 3593)
+		// Minimum execution time: 367_000_000 picoseconds.
+		Weight::from_parts(388_000_000, 3593)
 			.saturating_add(RocksDbWeight::get().reads(2_u64))
 			.saturating_add(RocksDbWeight::get().writes(2_u64))
 	}
@@ -208,12 +261,12 @@ impl WeightInfo for () {
 	/// The range of component `p` is `[0, 99]`.
 	fn approve_proposal(p: u32, ) -> Weight {
 		// Proof Size summary in bytes:
-		//  Measured:  `504 + p * (8 ±0)`
+		//  Measured:  `483 + p * (9 ±0)`
 		//  Estimated: `3573`
-		// Minimum execution time: 9_320_000 picoseconds.
-		Weight::from_parts(12_606_599, 3573)
-			// Standard Error: 1_302
-			.saturating_add(Weight::from_parts(71_054, 0).saturating_mul(p.into()))
+		// Minimum execution time: 111_000_000 picoseconds.
+		Weight::from_parts(108_813_243, 3573)
+			// Standard Error: 147_887
+			.saturating_add(Weight::from_parts(683_216, 0).saturating_mul(p.into()))
 			.saturating_add(RocksDbWeight::get().reads(2_u64))
 			.saturating_add(RocksDbWeight::get().writes(1_u64))
 	}
@@ -223,8 +276,8 @@ impl WeightInfo for () {
 		// Proof Size summary in bytes:
 		//  Measured:  `161`
 		//  Estimated: `1887`
-		// Minimum execution time: 7_231_000 picoseconds.
-		Weight::from_parts(7_459_000, 1887)
+		// Minimum execution time: 71_000_000 picoseconds.
+		Weight::from_parts(78_000_000, 1887)
 			.saturating_add(RocksDbWeight::get().reads(1_u64))
 			.saturating_add(RocksDbWeight::get().writes(1_u64))
 	}
@@ -232,25 +285,79 @@ impl WeightInfo for () {
 	/// Proof: Treasury Deactivated (max_values: Some(1), max_size: Some(16), added: 511, mode: MaxEncodedLen)
 	/// Storage: Treasury Approvals (r:1 w:1)
 	/// Proof: Treasury Approvals (max_values: Some(1), max_size: Some(402), added: 897, mode: MaxEncodedLen)
-	/// Storage: Treasury Proposals (r:100 w:100)
+	/// Storage: Treasury Proposals (r:99 w:99)
 	/// Proof: Treasury Proposals (max_values: None, max_size: Some(108), added: 2583, mode: MaxEncodedLen)
-	/// Storage: System Account (r:200 w:200)
+	/// Storage: System Account (r:198 w:198)
 	/// Proof: System Account (max_values: None, max_size: Some(128), added: 2603, mode: MaxEncodedLen)
 	/// Storage: Bounties BountyApprovals (r:1 w:1)
 	/// Proof: Bounties BountyApprovals (max_values: Some(1), max_size: Some(402), added: 897, mode: MaxEncodedLen)
-	/// The range of component `p` is `[0, 100]`.
+	/// The range of component `p` is `[0, 99]`.
 	fn on_initialize_proposals(p: u32, ) -> Weight {
 		// Proof Size summary in bytes:
-		//  Measured:  `421 + p * (251 ±0)`
+		//  Measured:  `427 + p * (251 ±0)`
 		//  Estimated: `1887 + p * (5206 ±0)`
-		// Minimum execution time: 44_769_000 picoseconds.
-		Weight::from_parts(57_915_572, 1887)
-			// Standard Error: 59_484
-			.saturating_add(Weight::from_parts(42_343_732, 0).saturating_mul(p.into()))
+		// Minimum execution time: 614_000_000 picoseconds.
+		Weight::from_parts(498_501_558, 1887)
+			// Standard Error: 1_070_260
+			.saturating_add(Weight::from_parts(599_011_690, 0).saturating_mul(p.into()))
 			.saturating_add(RocksDbWeight::get().reads(3_u64))
 			.saturating_add(RocksDbWeight::get().reads((3_u64).saturating_mul(p.into())))
 			.saturating_add(RocksDbWeight::get().writes(3_u64))
 			.saturating_add(RocksDbWeight::get().writes((3_u64).saturating_mul(p.into())))
 			.saturating_add(Weight::from_parts(0, 5206).saturating_mul(p.into()))
 	}
+	/// Storage: AssetRate ConversionRateToNative (r:1 w:0)
+	/// Proof: AssetRate ConversionRateToNative (max_values: None, max_size: Some(36), added: 2511, mode: MaxEncodedLen)
+	/// Storage: Treasury SpendCount (r:1 w:1)
+	/// Proof: Treasury SpendCount (max_values: Some(1), max_size: Some(4), added: 499, mode: MaxEncodedLen)
+	/// Storage: Treasury Spends (r:0 w:1)
+	/// Proof: Treasury Spends (max_values: None, max_size: Some(69), added: 2544, mode: MaxEncodedLen)
+	fn spend() -> Weight {
+		// Proof Size summary in bytes:
+		//  Measured:  `140`
+		//  Estimated: `3501`
+		// Minimum execution time: 214_000_000 picoseconds.
+		Weight::from_parts(216_000_000, 3501)
+			.saturating_add(RocksDbWeight::get().reads(2_u64))
+			.saturating_add(RocksDbWeight::get().writes(2_u64))
+	}
+	/// Storage: Treasury Spends (r:1 w:1)
+	/// Proof: Treasury Spends (max_values: None, max_size: Some(69), added: 2544, mode: MaxEncodedLen)
+	/// 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: System Account (r:1 w:1)
+	/// Proof: System Account (max_values: None, max_size: Some(128), added: 2603, mode: MaxEncodedLen)
+	fn payout() -> Weight {
+		// Proof Size summary in bytes:
+		//  Measured:  `705`
+		//  Estimated: `6208`
+		// Minimum execution time: 760_000_000 picoseconds.
+		Weight::from_parts(822_000_000, 6208)
+			.saturating_add(RocksDbWeight::get().reads(5_u64))
+			.saturating_add(RocksDbWeight::get().writes(5_u64))
+	}
+	/// Storage: Treasury Spends (r:1 w:1)
+	/// Proof: Treasury Spends (max_values: None, max_size: Some(69), added: 2544, mode: MaxEncodedLen)
+	fn check_status() -> Weight {
+		// Proof Size summary in bytes:
+		//  Measured:  `194`
+		//  Estimated: `3534`
+		// Minimum execution time: 153_000_000 picoseconds.
+		Weight::from_parts(160_000_000, 3534)
+			.saturating_add(RocksDbWeight::get().reads(1_u64))
+			.saturating_add(RocksDbWeight::get().writes(1_u64))
+	}
+	/// Storage: Treasury Spends (r:1 w:1)
+	/// Proof: Treasury Spends (max_values: None, max_size: Some(69), added: 2544, mode: MaxEncodedLen)
+	fn void_spend() -> Weight {
+		// Proof Size summary in bytes:
+		//  Measured:  `194`
+		//  Estimated: `3534`
+		// Minimum execution time: 147_000_000 picoseconds.
+		Weight::from_parts(181_000_000, 3534)
+			.saturating_add(RocksDbWeight::get().reads(1_u64))
+			.saturating_add(RocksDbWeight::get().writes(1_u64))
+	}
 }
diff --git a/substrate/frame/try-runtime/Cargo.toml b/substrate/frame/try-runtime/Cargo.toml
index 7869e0143cb18babae580e5526c9a7580fe48236..1bb3283b1de19196657d2117db1c7fae3e4b8dba 100644
--- a/substrate/frame/try-runtime/Cargo.toml
+++ b/substrate/frame/try-runtime/Cargo.toml
@@ -1,11 +1,11 @@
 [package]
 name = "frame-try-runtime"
 version = "0.10.0-dev"
-authors = ["Parity Technologies <admin@parity.io>"]
-edition = "2021"
+authors.workspace = true
+edition.workspace = true
 license = "Apache-2.0"
 homepage = "https://substrate.io"
-repository = "https://github.com/paritytech/substrate/"
+repository.workspace = true
 description = "FRAME pallet for democracy"
 
 [package.metadata.docs.rs]
diff --git a/substrate/frame/tx-pause/Cargo.toml b/substrate/frame/tx-pause/Cargo.toml
index 13d2b6a1daefeb15d727fb04ffa661bf8791d657..6d96cb8abe79924b6b23c2f509bc63f08a6bb631 100644
--- a/substrate/frame/tx-pause/Cargo.toml
+++ b/substrate/frame/tx-pause/Cargo.toml
@@ -1,13 +1,12 @@
 [package]
 name = "pallet-tx-pause"
 version = "4.0.0-dev"
-authors = ["Parity Technologies <admin@parity.io>"]
-edition = "2021"
+authors.workspace = true
+edition.workspace = true
 license = "Apache-2.0"
 homepage = "https://substrate.io"
-repository = "https://github.com/paritytech/substrate/"
+repository.workspace = true
 description = "FRAME transaction pause pallet"
-readme = "README.md"
 
 [package.metadata.docs.rs]
 targets = ["x86_64-unknown-linux-gnu"]
diff --git a/substrate/frame/tx-pause/src/benchmarking.rs b/substrate/frame/tx-pause/src/benchmarking.rs
index 81595ef9f7280f42e8b50989d3f1109280da7c5d..126c0837949d56553baf5e1a073ab082df3c4dad 100644
--- a/substrate/frame/tx-pause/src/benchmarking.rs
+++ b/substrate/frame/tx-pause/src/benchmarking.rs
@@ -1,6 +1,6 @@
 // This file is part of Substrate.
 
-// Copyright (C) 2022 Parity Technologies (UK) Ltd.
+// Copyright (C) Parity Technologies (UK) Ltd.
 // SPDX-License-Identifier: Apache-2.0
 
 // Licensed under the Apache License, Version 2.0 (the "License");
diff --git a/substrate/frame/tx-pause/src/lib.rs b/substrate/frame/tx-pause/src/lib.rs
index 36147d32a2f0e477a7bdf8b6e9df5a138ed81164..a3be0f50172707cc8c87b1dbe263350072c1c23d 100644
--- a/substrate/frame/tx-pause/src/lib.rs
+++ b/substrate/frame/tx-pause/src/lib.rs
@@ -1,6 +1,6 @@
 // This file is part of Substrate.
 
-// Copyright (C) 2022 Parity Technologies (UK) Ltd.
+// Copyright (C) Parity Technologies (UK) Ltd.
 // SPDX-License-Identifier: Apache-2.0
 
 // Licensed under the Apache License, Version 2.0 (the "License");
@@ -205,7 +205,7 @@ impl<T: Config> Pallet<T> {
 	/// Ensure that this call can be paused.
 	pub fn ensure_can_pause(full_name: &RuntimeCallNameOf<T>) -> Result<(), Error<T>> {
 		// SAFETY: The `TxPause` pallet can never pause itself.
-		if full_name.0.as_ref() == <Self as PalletInfoAccess>::name().as_bytes().to_vec() {
+		if full_name.0.as_slice() == <Self as PalletInfoAccess>::name().as_bytes() {
 			return Err(Error::<T>::Unpausable)
 		}
 
diff --git a/substrate/frame/tx-pause/src/mock.rs b/substrate/frame/tx-pause/src/mock.rs
index 70c888f3c38da2706c31c8ae775501bb1826c974..60c5fc1eced5c3b7e71eaac3a606d763ea57b175 100644
--- a/substrate/frame/tx-pause/src/mock.rs
+++ b/substrate/frame/tx-pause/src/mock.rs
@@ -1,6 +1,6 @@
 // This file is part of Substrate.
 
-// Copyright (C) 2022 Parity Technologies (UK) Ltd.
+// Copyright (C) Parity Technologies (UK) Ltd.
 // SPDX-License-Identifier: Apache-2.0
 
 // Licensed under the Apache License, Version 2.0 (the "License");
@@ -120,7 +120,10 @@ impl InstanceFilter<RuntimeCall> for ProxyType {
 		match self {
 			ProxyType::Any => true,
 			ProxyType::JustTransfer => {
-				matches!(c, RuntimeCall::Balances(pallet_balances::Call::transfer { .. }))
+				matches!(
+					c,
+					RuntimeCall::Balances(pallet_balances::Call::transfer_allow_death { .. })
+				)
 			},
 			ProxyType::JustUtility => matches!(c, RuntimeCall::Utility { .. }),
 		}
diff --git a/substrate/frame/tx-pause/src/tests.rs b/substrate/frame/tx-pause/src/tests.rs
index ca259315726b0bed7b99c526ab1a7703d05637d6..a71ff3439d902b47036632f923f944e7dd68317d 100644
--- a/substrate/frame/tx-pause/src/tests.rs
+++ b/substrate/frame/tx-pause/src/tests.rs
@@ -1,6 +1,6 @@
 // This file is part of Substrate.
 
-// Copyright (C) 2022 Parity Technologies (UK) Ltd.
+// Copyright (C) Parity Technologies (UK) Ltd.
 // SPDX-License-Identifier: Apache-2.0
 
 // Licensed under the Apache License, Version 2.0 (the "License");
@@ -20,7 +20,8 @@
 use super::*;
 use crate::mock::{RuntimeCall, *};
 
-use frame_support::{assert_err, assert_noop, assert_ok, dispatch::Dispatchable};
+use frame_support::{assert_err, assert_noop, assert_ok};
+use sp_runtime::DispatchError;
 
 // GENERAL SUCCESS/POSITIVE TESTS ---------------------
 
@@ -31,7 +32,7 @@ fn can_pause_specific_call() {
 
 		assert_ok!(TxPause::pause(
 			RuntimeOrigin::signed(mock::PauseOrigin::get()),
-			full_name::<Test>(b"Balances", b"transfer")
+			full_name::<Test>(b"Balances", b"transfer_allow_death")
 		));
 
 		assert_err!(
@@ -68,7 +69,7 @@ fn can_unpause_specific_call() {
 	new_test_ext().execute_with(|| {
 		assert_ok!(TxPause::pause(
 			RuntimeOrigin::signed(mock::PauseOrigin::get()),
-			full_name::<Test>(b"Balances", b"transfer"),
+			full_name::<Test>(b"Balances", b"transfer_allow_death"),
 		));
 		assert_err!(
 			call_transfer(2, 1).dispatch(RuntimeOrigin::signed(2)),
@@ -77,7 +78,7 @@ fn can_unpause_specific_call() {
 
 		assert_ok!(TxPause::unpause(
 			RuntimeOrigin::signed(mock::UnpauseOrigin::get()),
-			full_name::<Test>(b"Balances", b"transfer"),
+			full_name::<Test>(b"Balances", b"transfer_allow_death"),
 		));
 		assert_ok!(call_transfer(4, 1).dispatch(RuntimeOrigin::signed(0)));
 	});
@@ -91,7 +92,7 @@ fn can_filter_balance_in_batch_when_paused() {
 
 		assert_ok!(TxPause::pause(
 			RuntimeOrigin::signed(mock::PauseOrigin::get()),
-			full_name::<Test>(b"Balances", b"transfer"),
+			full_name::<Test>(b"Balances", b"transfer_allow_death"),
 		));
 
 		assert_ok!(batch_call.clone().dispatch(RuntimeOrigin::signed(0)));
@@ -110,7 +111,7 @@ fn can_filter_balance_in_proxy_when_paused() {
 	new_test_ext().execute_with(|| {
 		assert_ok!(TxPause::pause(
 			RuntimeOrigin::signed(mock::PauseOrigin::get()),
-			full_name::<Test>(b"Balances", b"transfer"),
+			full_name::<Test>(b"Balances", b"transfer_allow_death"),
 		));
 
 		assert_ok!(Proxy::add_proxy(RuntimeOrigin::signed(1), 2, ProxyType::JustTransfer, 0));
@@ -151,7 +152,7 @@ fn fails_to_pause_unpausable_call_when_other_call_is_paused() {
 
 		assert_ok!(TxPause::pause(
 			RuntimeOrigin::signed(mock::PauseOrigin::get()),
-			full_name::<Test>(b"Balances", b"transfer"),
+			full_name::<Test>(b"Balances", b"transfer_allow_death"),
 		));
 
 		assert_ok!(call_transfer_keep_alive(3, 1).dispatch(RuntimeOrigin::signed(3)));
@@ -180,13 +181,13 @@ fn fails_to_pause_already_paused_pallet() {
 	new_test_ext().execute_with(|| {
 		assert_ok!(TxPause::pause(
 			RuntimeOrigin::signed(mock::PauseOrigin::get()),
-			full_name::<Test>(b"Balances", b"transfer"),
+			full_name::<Test>(b"Balances", b"transfer_allow_death"),
 		));
 
 		assert_noop!(
 			TxPause::pause(
 				RuntimeOrigin::signed(mock::PauseOrigin::get()),
-				full_name::<Test>(b"Balances", b"transfer"),
+				full_name::<Test>(b"Balances", b"transfer_allow_death"),
 			),
 			Error::<Test>::IsPaused
 		);
@@ -207,7 +208,7 @@ fn fails_to_unpause_not_paused_pallet() {
 }
 
 pub fn call_transfer(dest: u64, value: u64) -> RuntimeCall {
-	RuntimeCall::Balances(pallet_balances::Call::transfer { dest, value })
+	RuntimeCall::Balances(pallet_balances::Call::transfer_allow_death { dest, value })
 }
 
 pub fn call_transfer_keep_alive(dest: u64, value: u64) -> RuntimeCall {
diff --git a/substrate/frame/uniques/Cargo.toml b/substrate/frame/uniques/Cargo.toml
index 77affc50b0bf5798771722a8f78224c17d9d9ad9..b0c063a83e752511c8210d652bf6c8768a6132f2 100644
--- a/substrate/frame/uniques/Cargo.toml
+++ b/substrate/frame/uniques/Cargo.toml
@@ -1,11 +1,11 @@
 [package]
 name = "pallet-uniques"
 version = "4.0.0-dev"
-authors = ["Parity Technologies <admin@parity.io>"]
-edition = "2021"
+authors.workspace = true
+edition.workspace = true
 license = "Apache-2.0"
 homepage = "https://substrate.io"
-repository = "https://github.com/paritytech/substrate/"
+repository.workspace = true
 description = "FRAME NFT asset management pallet"
 readme = "README.md"
 
diff --git a/substrate/frame/uniques/README.md b/substrate/frame/uniques/README.md
index 6cdbcf79f1c95442cd9ec602ffb482f61ba0945f..538fd9e70a26f263689ce4bcd8162ab416425bd3 100644
--- a/substrate/frame/uniques/README.md
+++ b/substrate/frame/uniques/README.md
@@ -13,9 +13,11 @@ The Uniques module provides functionality for non-fungible tokens' management, i
 * Attributes Management
 * Item Burning
 
-To use it in your runtime, you need to implement [`uniques::Config`](https://paritytech.github.io/substrate/master/pallet_uniques/pallet/trait.Config.html).
+To use it in your runtime, you need to implement
+[`uniques::Config`](https://paritytech.github.io/substrate/master/pallet_uniques/pallet/trait.Config.html).
 
-The supported dispatchable functions are documented in the [`uniques::Call`](https://paritytech.github.io/substrate/master/pallet_uniques/pallet/enum.Call.html) enum.
+The supported dispatchable functions are documented in the
+[`uniques::Call`](https://paritytech.github.io/substrate/master/pallet_uniques/pallet/enum.Call.html) enum.
 
 ### Terminology
 
@@ -23,8 +25,8 @@ The supported dispatchable functions are documented in the [`uniques::Call`](htt
 * **Item minting:** The action of creating a new item within a collection.
 * **Item transfer:** The action of sending an item from one account to another.
 * **Item burning:** The destruction of an item.
-* **Non-fungible token (NFT):** An item for which each unit has unique characteristics. There is exactly
-  one instance of such an item in existence and there is exactly one owning account.
+* **Non-fungible token (NFT):** An item for which each unit has unique characteristics. There is exactly one instance of
+  such an item in existence and there is exactly one owning account.
 
 ### Goals
 
@@ -33,10 +35,8 @@ The Uniques pallet in Substrate is designed to make the following possible:
 * Allow accounts to permissionlessly create NFT collections.
 * Allow a named (permissioned) account to mint and burn unique items within a collection.
 * Move items between accounts permissionlessly.
-* Allow a named (permissioned) account to freeze and unfreeze unique items within a
-  collection or the entire collection.
-* Allow the owner of an item to delegate the ability to transfer the item to some
-  named third-party.
+* Allow a named (permissioned) account to freeze and unfreeze unique items within a collection or the entire collection.
+* Allow the owner of an item to delegate the ability to transfer the item to some named third-party.
 
 ## Interface
 
diff --git a/substrate/frame/uniques/src/benchmarking.rs b/substrate/frame/uniques/src/benchmarking.rs
index 4e63f69281e5d431c80f21ab609ebf6d65eeeec9..821ca1794b865483d8dc3edbb7298fa15a2dd31c 100644
--- a/substrate/frame/uniques/src/benchmarking.rs
+++ b/substrate/frame/uniques/src/benchmarking.rs
@@ -24,8 +24,7 @@ use frame_benchmarking::v1::{
 	account, benchmarks_instance_pallet, whitelist_account, whitelisted_caller, BenchmarkError,
 };
 use frame_support::{
-	dispatch::UnfilteredDispatchable,
-	traits::{EnsureOrigin, Get},
+	traits::{EnsureOrigin, Get, UnfilteredDispatchable},
 	BoundedVec,
 };
 use frame_system::RawOrigin as SystemOrigin;
diff --git a/substrate/frame/uniques/src/lib.rs b/substrate/frame/uniques/src/lib.rs
index 1b75d0b078ba5e04e16e6ad9c5ad0f962324ec5c..8334a8d943e19a6aea1e6973955c6a4fc44a514f 100644
--- a/substrate/frame/uniques/src/lib.rs
+++ b/substrate/frame/uniques/src/lib.rs
@@ -69,7 +69,10 @@ pub mod pallet {
 	use frame_support::pallet_prelude::*;
 	use frame_system::pallet_prelude::*;
 
+	const STORAGE_VERSION: StorageVersion = StorageVersion::new(1);
+
 	#[pallet::pallet]
+	#[pallet::storage_version(STORAGE_VERSION)]
 	pub struct Pallet<T, I = ()>(_);
 
 	#[cfg(feature = "runtime-benchmarks")]
diff --git a/substrate/frame/uniques/src/tests.rs b/substrate/frame/uniques/src/tests.rs
index 993552c3a2aaa5b78e734ad4c53e41652d6a0ef2..52f7df3b5efbc29796a77591ac44efd32429796a 100644
--- a/substrate/frame/uniques/src/tests.rs
+++ b/substrate/frame/uniques/src/tests.rs
@@ -18,8 +18,9 @@
 //! Tests for Uniques pallet.
 
 use crate::{mock::*, Event, *};
-use frame_support::{assert_noop, assert_ok, dispatch::Dispatchable, traits::Currency};
+use frame_support::{assert_noop, assert_ok, traits::Currency};
 use pallet_balances::Error as BalancesError;
+use sp_runtime::traits::Dispatchable;
 use sp_std::prelude::*;
 
 fn items() -> Vec<(u64, u32, u32)> {
diff --git a/substrate/frame/utility/Cargo.toml b/substrate/frame/utility/Cargo.toml
index e4b73f5094f7264ced4775d3e7b4dee1df01fa22..1f803b6ca5bb779fe8835a50ba17b6fbeb3be090 100644
--- a/substrate/frame/utility/Cargo.toml
+++ b/substrate/frame/utility/Cargo.toml
@@ -1,11 +1,11 @@
 [package]
 name = "pallet-utility"
 version = "4.0.0-dev"
-authors = ["Parity Technologies <admin@parity.io>"]
-edition = "2021"
+authors.workspace = true
+edition.workspace = true
 license = "Apache-2.0"
 homepage = "https://substrate.io"
-repository = "https://github.com/paritytech/substrate/"
+repository.workspace = true
 description = "FRAME utilities pallet"
 readme = "README.md"
 
diff --git a/substrate/frame/utility/README.md b/substrate/frame/utility/README.md
index db19b0cf8cf9ed28b23f043b44be3da4e6a1dbc1..00fff76cd626bcb119f971edb910c033024b54c8 100644
--- a/substrate/frame/utility/README.md
+++ b/substrate/frame/utility/README.md
@@ -27,10 +27,10 @@ filtered by any proxy.
 ### Dispatchable Functions
 
 #### For batch dispatch
-* `batch` - Dispatch multiple calls from the sender's origin.
+- `batch` - Dispatch multiple calls from the sender's origin.
 
 #### For pseudonymal dispatch
-* `as_derivative` - Dispatch a call from a derivative signed origin.
+- `as_derivative` - Dispatch a call from a derivative signed origin.
 
 [`Call`]: ./enum.Call.html
 [`Config`]: ./trait.Config.html
diff --git a/substrate/frame/utility/src/lib.rs b/substrate/frame/utility/src/lib.rs
index af212a31eb9713a651ac9d40c44c582ffc3c1a8e..7f963e3637d6fcb606591c46e9511280ee776879 100644
--- a/substrate/frame/utility/src/lib.rs
+++ b/substrate/frame/utility/src/lib.rs
@@ -479,13 +479,15 @@ pub mod pallet {
 		///
 		/// The dispatch origin for this call must be _Root_.
 		#[pallet::call_index(5)]
-		#[pallet::weight((*_weight, call.get_dispatch_info().class))]
+		#[pallet::weight((*weight, call.get_dispatch_info().class))]
 		pub fn with_weight(
 			origin: OriginFor<T>,
 			call: Box<<T as Config>::RuntimeCall>,
-			_weight: Weight,
+			weight: Weight,
 		) -> DispatchResult {
 			ensure_root(origin)?;
+			let _ = weight; // Explicitly don't check the the weight witness.
+
 			let res = call.dispatch_bypass_filter(frame_system::RawOrigin::Root.into());
 			res.map(|_| ()).map_err(|e| e.error)
 		}
diff --git a/substrate/frame/utility/src/tests.rs b/substrate/frame/utility/src/tests.rs
index c2fd3a851c3197476a4da10c5c6e24386d9decdf..183853c4e8ac68d3f36767edfa9bc860025b4ce6 100644
--- a/substrate/frame/utility/src/tests.rs
+++ b/substrate/frame/utility/src/tests.rs
@@ -24,7 +24,7 @@ use super::*;
 use crate as utility;
 use frame_support::{
 	assert_err_ignore_postinfo, assert_noop, assert_ok,
-	dispatch::{DispatchError, DispatchErrorWithPostInfo, Dispatchable, Pays},
+	dispatch::{DispatchErrorWithPostInfo, Pays},
 	error::BadOrigin,
 	parameter_types, storage,
 	traits::{ConstU32, ConstU64, Contains},
@@ -33,8 +33,8 @@ use frame_support::{
 use pallet_collective::{EnsureProportionAtLeast, Instance1};
 use sp_core::H256;
 use sp_runtime::{
-	traits::{BlakeTwo256, Hash, IdentityLookup},
-	BuildStorage, TokenError,
+	traits::{BlakeTwo256, Dispatchable, Hash, IdentityLookup},
+	BuildStorage, DispatchError, TokenError,
 };
 
 type BlockNumber = u64;
diff --git a/substrate/frame/vesting/Cargo.toml b/substrate/frame/vesting/Cargo.toml
index f16150d95809e07d70cf73dfc1bc358fb9de9a0c..18e3a4aeaa1745bb37c7f06a4541dc33a9a8d4e5 100644
--- a/substrate/frame/vesting/Cargo.toml
+++ b/substrate/frame/vesting/Cargo.toml
@@ -1,11 +1,11 @@
 [package]
 name = "pallet-vesting"
 version = "4.0.0-dev"
-authors = ["Parity Technologies <admin@parity.io>"]
-edition = "2021"
+authors.workspace = true
+edition.workspace = true
 license = "Apache-2.0"
 homepage = "https://substrate.io"
-repository = "https://github.com/paritytech/substrate/"
+repository.workspace = true
 description = "FRAME pallet for manage vesting"
 readme = "README.md"
 
diff --git a/substrate/frame/vesting/src/lib.rs b/substrate/frame/vesting/src/lib.rs
index eb829121e979717db9af0b96d60adda2f7efbafa..ee67a038e4d7bbbf89ecf11e7d9c91837417aa31 100644
--- a/substrate/frame/vesting/src/lib.rs
+++ b/substrate/frame/vesting/src/lib.rs
@@ -58,7 +58,7 @@ pub mod weights;
 
 use codec::{Decode, Encode, MaxEncodedLen};
 use frame_support::{
-	dispatch::{DispatchError, DispatchResult},
+	dispatch::DispatchResult,
 	ensure,
 	storage::bounded_vec::BoundedVec,
 	traits::{
@@ -74,7 +74,7 @@ use sp_runtime::{
 		AtLeast32BitUnsigned, Bounded, Convert, MaybeSerializeDeserialize, One, Saturating,
 		StaticLookup, Zero,
 	},
-	RuntimeDebug,
+	DispatchError, RuntimeDebug,
 };
 use sp_std::{fmt::Debug, marker::PhantomData, prelude::*};
 
diff --git a/substrate/frame/vesting/src/tests.rs b/substrate/frame/vesting/src/tests.rs
index 46afe895f6fcc0de0d25401c22a9ecd07f3f1b57..c35686bd5146c3c951babbe9f044d53566f9766e 100644
--- a/substrate/frame/vesting/src/tests.rs
+++ b/substrate/frame/vesting/src/tests.rs
@@ -15,7 +15,8 @@
 // See the License for the specific language governing permissions and
 // limitations under the License.
 
-use frame_support::{assert_noop, assert_ok, assert_storage_noop, dispatch::EncodeLike};
+use codec::EncodeLike;
+use frame_support::{assert_noop, assert_ok, assert_storage_noop};
 use frame_system::RawOrigin;
 use sp_runtime::{
 	traits::{BadOrigin, Identity},
diff --git a/substrate/frame/whitelist/Cargo.toml b/substrate/frame/whitelist/Cargo.toml
index fade1e29e5669c4d61416e86cc006fe3e74ae249..ec78b03c08bde398b43dc0fc2e63f03b273372eb 100644
--- a/substrate/frame/whitelist/Cargo.toml
+++ b/substrate/frame/whitelist/Cargo.toml
@@ -1,11 +1,11 @@
 [package]
 name = "pallet-whitelist"
 version = "4.0.0-dev"
-authors = ["Parity Technologies <admin@parity.io>"]
-edition = "2021"
+authors.workspace = true
+edition.workspace = true
 license = "Apache-2.0"
 homepage = "https://substrate.io"
-repository = "https://github.com/paritytech/substrate/"
+repository.workspace = true
 description = "FRAME pallet for whitelisting call, and dispatch from specific origin"
 
 [package.metadata.docs.rs]
diff --git a/substrate/frame/whitelist/src/benchmarking.rs b/substrate/frame/whitelist/src/benchmarking.rs
index 1982f5eb8738e2928946ba62d066bc46a710a854..9d356f09a9d2ec411c6af5ae73940741319ab590 100644
--- a/substrate/frame/whitelist/src/benchmarking.rs
+++ b/substrate/frame/whitelist/src/benchmarking.rs
@@ -79,7 +79,7 @@ benchmarks! {
 		let call_weight = call.get_dispatch_info().weight;
 		let encoded_call = call.encode();
 		let call_encoded_len = encoded_call.len() as u32;
-		let call_hash = call.blake2_256().into();
+		let call_hash = T::Hashing::hash_of(&call);
 
 		Pallet::<T>::whitelist_call(origin.clone(), call_hash)
 			.expect("whitelisting call must be successful");
@@ -106,7 +106,7 @@ benchmarks! {
 		let remark = sp_std::vec![1u8; n as usize];
 
 		let call: <T as Config>::RuntimeCall = frame_system::Call::remark { remark }.into();
-		let call_hash = call.blake2_256().into();
+		let call_hash = T::Hashing::hash_of(&call);
 
 		Pallet::<T>::whitelist_call(origin.clone(), call_hash)
 			.expect("whitelisting call must be successful");
diff --git a/substrate/frame/whitelist/src/lib.rs b/substrate/frame/whitelist/src/lib.rs
index decf010b06757ff7ed03f101100d038078b5e67a..44551abd10715e0e4dd23d9667b2786f8ae850a1 100644
--- a/substrate/frame/whitelist/src/lib.rs
+++ b/substrate/frame/whitelist/src/lib.rs
@@ -44,12 +44,11 @@ use codec::{DecodeLimit, Encode, FullCodec};
 use frame_support::{
 	dispatch::{GetDispatchInfo, PostDispatchInfo},
 	ensure,
-	traits::{Hash as PreimageHash, QueryPreimage, StorePreimage},
+	traits::{QueryPreimage, StorePreimage},
 	weights::Weight,
-	Hashable,
 };
 use scale_info::TypeInfo;
-use sp_runtime::traits::Dispatchable;
+use sp_runtime::traits::{Dispatchable, Hash};
 use sp_std::prelude::*;
 
 pub use pallet::*;
@@ -81,7 +80,7 @@ pub mod pallet {
 		type DispatchWhitelistedOrigin: EnsureOrigin<Self::RuntimeOrigin>;
 
 		/// The handler of pre-images.
-		type Preimages: QueryPreimage + StorePreimage;
+		type Preimages: QueryPreimage<H = Self::Hashing> + StorePreimage;
 
 		/// The weight information for this pallet.
 		type WeightInfo: WeightInfo;
@@ -93,9 +92,9 @@ pub mod pallet {
 	#[pallet::event]
 	#[pallet::generate_deposit(pub(super) fn deposit_event)]
 	pub enum Event<T: Config> {
-		CallWhitelisted { call_hash: PreimageHash },
-		WhitelistedCallRemoved { call_hash: PreimageHash },
-		WhitelistedCallDispatched { call_hash: PreimageHash, result: DispatchResultWithPostInfo },
+		CallWhitelisted { call_hash: T::Hash },
+		WhitelistedCallRemoved { call_hash: T::Hash },
+		WhitelistedCallDispatched { call_hash: T::Hash, result: DispatchResultWithPostInfo },
 	}
 
 	#[pallet::error]
@@ -113,14 +112,13 @@ pub mod pallet {
 	}
 
 	#[pallet::storage]
-	pub type WhitelistedCall<T: Config> =
-		StorageMap<_, Twox64Concat, PreimageHash, (), OptionQuery>;
+	pub type WhitelistedCall<T: Config> = StorageMap<_, Twox64Concat, T::Hash, (), OptionQuery>;
 
 	#[pallet::call]
 	impl<T: Config> Pallet<T> {
 		#[pallet::call_index(0)]
 		#[pallet::weight(T::WeightInfo::whitelist_call())]
-		pub fn whitelist_call(origin: OriginFor<T>, call_hash: PreimageHash) -> DispatchResult {
+		pub fn whitelist_call(origin: OriginFor<T>, call_hash: T::Hash) -> DispatchResult {
 			T::WhitelistOrigin::ensure_origin(origin)?;
 
 			ensure!(
@@ -138,10 +136,7 @@ pub mod pallet {
 
 		#[pallet::call_index(1)]
 		#[pallet::weight(T::WeightInfo::remove_whitelisted_call())]
-		pub fn remove_whitelisted_call(
-			origin: OriginFor<T>,
-			call_hash: PreimageHash,
-		) -> DispatchResult {
+		pub fn remove_whitelisted_call(origin: OriginFor<T>, call_hash: T::Hash) -> DispatchResult {
 			T::WhitelistOrigin::ensure_origin(origin)?;
 
 			WhitelistedCall::<T>::take(call_hash).ok_or(Error::<T>::CallIsNotWhitelisted)?;
@@ -160,7 +155,7 @@ pub mod pallet {
 		)]
 		pub fn dispatch_whitelisted_call(
 			origin: OriginFor<T>,
-			call_hash: PreimageHash,
+			call_hash: T::Hash,
 			call_encoded_len: u32,
 			call_weight_witness: Weight,
 		) -> DispatchResultWithPostInfo {
@@ -206,7 +201,7 @@ pub mod pallet {
 		) -> DispatchResultWithPostInfo {
 			T::DispatchWhitelistedOrigin::ensure_origin(origin)?;
 
-			let call_hash = call.blake2_256().into();
+			let call_hash = T::Hashing::hash_of(&call).into();
 
 			ensure!(
 				WhitelistedCall::<T>::contains_key(call_hash),
@@ -227,10 +222,7 @@ impl<T: Config> Pallet<T> {
 	/// Clean whitelisting/preimage and dispatch call.
 	///
 	/// Return the call actual weight of the dispatched call if there is some.
-	fn clean_and_dispatch(
-		call_hash: PreimageHash,
-		call: <T as Config>::RuntimeCall,
-	) -> Option<Weight> {
+	fn clean_and_dispatch(call_hash: T::Hash, call: <T as Config>::RuntimeCall) -> Option<Weight> {
 		WhitelistedCall::<T>::remove(call_hash);
 
 		T::Preimages::unrequest(&call_hash);
diff --git a/substrate/frame/whitelist/src/mock.rs b/substrate/frame/whitelist/src/mock.rs
index d91f43b33af91bd8fe605bbfae6e7f4f0c09fb63..e6ddbf02bb2bf882624806df823cb49879c57314 100644
--- a/substrate/frame/whitelist/src/mock.rs
+++ b/substrate/frame/whitelist/src/mock.rs
@@ -90,8 +90,7 @@ impl pallet_preimage::Config for Test {
 	type RuntimeEvent = RuntimeEvent;
 	type Currency = Balances;
 	type ManagerOrigin = EnsureRoot<Self::AccountId>;
-	type BaseDeposit = ConstU64<1>;
-	type ByteDeposit = ConstU64<1>;
+	type Consideration = ();
 	type WeightInfo = ();
 }
 
diff --git a/substrate/primitives/api/Cargo.toml b/substrate/primitives/api/Cargo.toml
index 1f23bbed8bee1701e436e484147b03c192464602..95b5dde371394952a202575fdc61153f1c229640 100644
--- a/substrate/primitives/api/Cargo.toml
+++ b/substrate/primitives/api/Cargo.toml
@@ -1,11 +1,11 @@
 [package]
 name = "sp-api"
 version = "4.0.0-dev"
-authors = ["Parity Technologies <admin@parity.io>"]
-edition = "2021"
+authors.workspace = true
+edition.workspace = true
 license = "Apache-2.0"
 homepage = "https://substrate.io"
-repository = "https://github.com/paritytech/substrate/"
+repository.workspace = true
 description = "Substrate runtime api primitives"
 readme = "README.md"
 
@@ -23,7 +23,7 @@ sp-version = { path = "../version", default-features = false}
 sp-state-machine = { path = "../state-machine", default-features = false, optional = true}
 sp-trie = { path = "../trie", default-features = false, optional = true}
 hash-db = { version = "0.16.0", optional = true }
-thiserror = { version = "1.0.30", optional = true }
+thiserror = { version = "1.0.48", optional = true }
 scale-info = { version = "2.1.1", default-features = false, features = ["derive"] }
 sp-metadata-ir = { path = "../metadata-ir", default-features = false, optional = true}
 log = { version = "0.4.17", default-features = false }
diff --git a/substrate/primitives/api/README.md b/substrate/primitives/api/README.md
index 1cf9437373c77f878b85d8271c87fdf77bf452ec..ee0e402f9d7f08fb01bdac7ea0cc63b4d158008a 100644
--- a/substrate/primitives/api/README.md
+++ b/substrate/primitives/api/README.md
@@ -14,4 +14,4 @@ api, the [`ApiExt`] trait, the [`CallApiAt`] trait and the [`ConstructRuntimeApi
 
 On a meta level this implies, the client calls the generated API from the client perspective.
 
-License: Apache-2.0
\ No newline at end of file
+License: Apache-2.0
diff --git a/substrate/primitives/api/proc-macro/Cargo.toml b/substrate/primitives/api/proc-macro/Cargo.toml
index 862cf00fdd67cc3a580c52e21c978b0ab95bc28c..25c87b5d0a4dfa660786799dd4fd9beca9f3c1bf 100644
--- a/substrate/primitives/api/proc-macro/Cargo.toml
+++ b/substrate/primitives/api/proc-macro/Cargo.toml
@@ -1,11 +1,11 @@
 [package]
 name = "sp-api-proc-macro"
 version = "4.0.0-dev"
-authors = ["Parity Technologies <admin@parity.io>"]
-edition = "2021"
+authors.workspace = true
+edition.workspace = true
 license = "Apache-2.0"
 homepage = "https://substrate.io"
-repository = "https://github.com/paritytech/substrate/"
+repository.workspace = true
 description = "Macros for declaring and implementing runtime apis."
 documentation = "https://docs.rs/sp-api-proc-macro"
 
@@ -17,7 +17,7 @@ proc-macro = true
 
 [dependencies]
 quote = "1.0.28"
-syn = { version = "2.0.16", features = ["full", "fold", "extra-traits", "visit"] }
+syn = { version = "2.0.38", features = ["full", "fold", "extra-traits", "visit"] }
 proc-macro2 = "1.0.56"
 blake2 = { version = "0.10.4", default-features = false }
 proc-macro-crate = "1.1.3"
diff --git a/substrate/primitives/api/proc-macro/src/impl_runtime_apis.rs b/substrate/primitives/api/proc-macro/src/impl_runtime_apis.rs
index 74cfa0980623b0dd14c029c520093bd775f4da4d..e439a796e28d451ac47f7ed9858591b02dd50d7f 100644
--- a/substrate/primitives/api/proc-macro/src/impl_runtime_apis.rs
+++ b/substrate/primitives/api/proc-macro/src/impl_runtime_apis.rs
@@ -38,7 +38,7 @@ use syn::{
 	Attribute, Ident, ImplItem, ItemImpl, LitInt, LitStr, Path, Signature, Type, TypePath,
 };
 
-use std::collections::HashSet;
+use std::collections::HashMap;
 
 /// The structure used for parsing the runtime api implementations.
 struct RuntimeApiImpls {
@@ -726,7 +726,7 @@ fn populate_runtime_api_versions(
 fn generate_runtime_api_versions(impls: &[ItemImpl]) -> Result<TokenStream> {
 	let mut result = Vec::<TokenStream>::with_capacity(impls.len());
 	let mut sections = Vec::<TokenStream>::with_capacity(impls.len());
-	let mut processed_traits = HashSet::new();
+	let mut processed_traits = HashMap::new();
 
 	let c = generate_crate_access();
 
@@ -746,13 +746,17 @@ fn generate_runtime_api_versions(impls: &[ItemImpl]) -> Result<TokenStream> {
 			.ident;
 
 		let span = trait_.span();
-		if !processed_traits.insert(trait_) {
-			return Err(Error::new(
+		if let Some(other_span) = processed_traits.insert(trait_, span) {
+			let mut error = Error::new(
 				span,
 				"Two traits with the same name detected! \
 					The trait name is used to generate its ID. \
 					Please rename one trait at the declaration!",
-			))
+			);
+
+			error.combine(Error::new(other_span, "First trait implementation."));
+
+			return Err(error)
 		}
 
 		let id: Path = parse_quote!( #path ID );
diff --git a/substrate/primitives/api/test/Cargo.toml b/substrate/primitives/api/test/Cargo.toml
index 70079b8f1b0e639de02092e68491ab418458c3ac..0cc3ce7969c224339f60854b6a2b1514f923796f 100644
--- a/substrate/primitives/api/test/Cargo.toml
+++ b/substrate/primitives/api/test/Cargo.toml
@@ -1,12 +1,12 @@
 [package]
 name = "sp-api-test"
 version = "2.0.1"
-authors = ["Parity Technologies <admin@parity.io>"]
-edition = "2021"
+authors.workspace = true
+edition.workspace = true
 license = "Apache-2.0"
 publish = false
 homepage = "https://substrate.io"
-repository = "https://github.com/paritytech/substrate/"
+repository.workspace = true
 
 [package.metadata.docs.rs]
 targets = ["x86_64-unknown-linux-gnu"]
diff --git a/substrate/primitives/api/test/tests/ui/adding_self_parameter.rs b/substrate/primitives/api/test/tests/ui/adding_self_parameter.rs
index 117fa261886b9f0a740081d5d5b913a26a3d4fd2..dcd680a20793d07a0f2668d1864fae5ff787c1d2 100644
--- a/substrate/primitives/api/test/tests/ui/adding_self_parameter.rs
+++ b/substrate/primitives/api/test/tests/ui/adding_self_parameter.rs
@@ -1,3 +1,20 @@
+// 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.
+
 sp_api::decl_runtime_apis! {
 	pub trait Api {
 		fn test(&self);
diff --git a/substrate/primitives/api/test/tests/ui/adding_self_parameter.stderr b/substrate/primitives/api/test/tests/ui/adding_self_parameter.stderr
index 894713d35eef8b1e3cb79ba2c5893bb5560ac031..0260ccda12cba914c2507d8783dbc9e8f91bf280 100644
--- a/substrate/primitives/api/test/tests/ui/adding_self_parameter.stderr
+++ b/substrate/primitives/api/test/tests/ui/adding_self_parameter.stderr
@@ -1,5 +1,5 @@
 error: `self` as argument not supported.
- --> $DIR/adding_self_parameter.rs:3:11
-  |
-3 |         fn test(&self);
-  |                 ^
+  --> tests/ui/adding_self_parameter.rs:20:11
+   |
+20 |         fn test(&self);
+   |                 ^
diff --git a/substrate/primitives/api/test/tests/ui/changed_in_no_default_method.rs b/substrate/primitives/api/test/tests/ui/changed_in_no_default_method.rs
index a0bb4e2830ca7e370ccca88fc963f8575196d960..08d92b1f3720962f9dc3a2a75cf5d4ea66352afc 100644
--- a/substrate/primitives/api/test/tests/ui/changed_in_no_default_method.rs
+++ b/substrate/primitives/api/test/tests/ui/changed_in_no_default_method.rs
@@ -1,3 +1,20 @@
+// 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.
+
 /// The declaration of the `Runtime` type is done by the `construct_runtime!` macro in a real
 /// runtime.
 struct Runtime {}
diff --git a/substrate/primitives/api/test/tests/ui/changed_in_no_default_method.stderr b/substrate/primitives/api/test/tests/ui/changed_in_no_default_method.stderr
index 2140703a5d2c218948ee135a567bd64eb509394d..67eb3d90d279669f74f1657824b2eb2c0a952da0 100644
--- a/substrate/primitives/api/test/tests/ui/changed_in_no_default_method.stderr
+++ b/substrate/primitives/api/test/tests/ui/changed_in_no_default_method.stderr
@@ -1,6 +1,6 @@
 error: There is no 'default' method with this name (without `changed_in` attribute).
        The 'default' method is used to call into the latest implementation.
- --> tests/ui/changed_in_no_default_method.rs:9:6
-  |
-9 |         fn test(data: u64);
-  |            ^^^^
+  --> tests/ui/changed_in_no_default_method.rs:26:6
+   |
+26 |         fn test(data: u64);
+   |            ^^^^
diff --git a/substrate/primitives/api/test/tests/ui/changed_in_unknown_version.rs b/substrate/primitives/api/test/tests/ui/changed_in_unknown_version.rs
index 164b91d19422cdcdd31726664a596ea74ae547b9..9ad3b3914bb5ac9e1ac8652478c3f9cc91590c4b 100644
--- a/substrate/primitives/api/test/tests/ui/changed_in_unknown_version.rs
+++ b/substrate/primitives/api/test/tests/ui/changed_in_unknown_version.rs
@@ -1,3 +1,20 @@
+// 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.
+
 /// The declaration of the `Runtime` type is done by the `construct_runtime!` macro in a real
 /// runtime.
 struct Runtime {}
diff --git a/substrate/primitives/api/test/tests/ui/changed_in_unknown_version.stderr b/substrate/primitives/api/test/tests/ui/changed_in_unknown_version.stderr
index d4a03bab552e90294ddd23fa3d972735872482c6..6d17b7a5a2d6ea587e0a723298c54d894cd448f9 100644
--- a/substrate/primitives/api/test/tests/ui/changed_in_unknown_version.stderr
+++ b/substrate/primitives/api/test/tests/ui/changed_in_unknown_version.stderr
@@ -1,5 +1,5 @@
 error: `changed_in` version can not be greater than the `api_version`
- --> tests/ui/changed_in_unknown_version.rs:8:3
-  |
-8 |         fn test(data: u64);
-  |         ^^
+  --> tests/ui/changed_in_unknown_version.rs:25:3
+   |
+25 |         fn test(data: u64);
+   |         ^^
diff --git a/substrate/primitives/api/test/tests/ui/declaring_old_block.rs b/substrate/primitives/api/test/tests/ui/declaring_old_block.rs
index fb741590282249c692af3b9233f59a95fa3b0b5b..6aa0582db15ee626c7d875f2ddafcb077e4c6367 100644
--- a/substrate/primitives/api/test/tests/ui/declaring_old_block.rs
+++ b/substrate/primitives/api/test/tests/ui/declaring_old_block.rs
@@ -1,3 +1,20 @@
+// 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.
+
 sp_api::decl_runtime_apis! {
 	pub trait Api<Block: BlockT> {
 		fn test();
diff --git a/substrate/primitives/api/test/tests/ui/declaring_old_block.stderr b/substrate/primitives/api/test/tests/ui/declaring_old_block.stderr
index 50dd37582c603d5d355472e2003b1813d18ecb67..233fe2f5f1bd6a5a58c7168c6e5d84555f380952 100644
--- a/substrate/primitives/api/test/tests/ui/declaring_old_block.stderr
+++ b/substrate/primitives/api/test/tests/ui/declaring_old_block.stderr
@@ -1,11 +1,11 @@
 error: `Block: BlockT` generic parameter will be added automatically by the `decl_runtime_apis!` macro! If you try to use a different trait than the substrate `Block` trait, please rename it locally.
- --> $DIR/declaring_old_block.rs:2:23
-  |
-2 |     pub trait Api<Block: BlockT> {
-  |                          ^^^^^^
+  --> tests/ui/declaring_old_block.rs:19:23
+   |
+19 |     pub trait Api<Block: BlockT> {
+   |                          ^^^^^^
 
 error: `Block: BlockT` generic parameter will be added automatically by the `decl_runtime_apis!` macro!
- --> $DIR/declaring_old_block.rs:2:16
-  |
-2 |     pub trait Api<Block: BlockT> {
-  |                   ^^^^^
+  --> tests/ui/declaring_old_block.rs:19:16
+   |
+19 |     pub trait Api<Block: BlockT> {
+   |                   ^^^^^
diff --git a/substrate/primitives/api/test/tests/ui/declaring_own_block_with_different_name.rs b/substrate/primitives/api/test/tests/ui/declaring_own_block_with_different_name.rs
index e3c7ae8a39ab748557c5d160f35e24dfcd0a353d..b8eeef3c3e53b62fa0509ad611c10037f8f99cd2 100644
--- a/substrate/primitives/api/test/tests/ui/declaring_own_block_with_different_name.rs
+++ b/substrate/primitives/api/test/tests/ui/declaring_own_block_with_different_name.rs
@@ -1,3 +1,20 @@
+// 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.
+
 sp_api::decl_runtime_apis! {
 	pub trait Api<B: BlockT> {
 		fn test();
diff --git a/substrate/primitives/api/test/tests/ui/declaring_own_block_with_different_name.stderr b/substrate/primitives/api/test/tests/ui/declaring_own_block_with_different_name.stderr
index 778de3c9d15f7ff9caf94b858182af78ff260bd1..59a73819089eaba567105496470224ea1a36b24c 100644
--- a/substrate/primitives/api/test/tests/ui/declaring_own_block_with_different_name.stderr
+++ b/substrate/primitives/api/test/tests/ui/declaring_own_block_with_different_name.stderr
@@ -1,5 +1,5 @@
 error: `Block: BlockT` generic parameter will be added automatically by the `decl_runtime_apis!` macro! If you try to use a different trait than the substrate `Block` trait, please rename it locally.
- --> $DIR/declaring_own_block_with_different_name.rs:2:19
-  |
-2 |     pub trait Api<B: BlockT> {
-  |                      ^^^^^^
+  --> tests/ui/declaring_own_block_with_different_name.rs:19:19
+   |
+19 |     pub trait Api<B: BlockT> {
+   |                      ^^^^^^
diff --git a/substrate/primitives/api/test/tests/ui/empty_impl_runtime_apis_call.rs b/substrate/primitives/api/test/tests/ui/empty_impl_runtime_apis_call.rs
index 68d84d97fa8e25f8bf1611ae4e8598702af87b17..1dce4fed0062f3005c93ceba134f699c76a112d3 100644
--- a/substrate/primitives/api/test/tests/ui/empty_impl_runtime_apis_call.rs
+++ b/substrate/primitives/api/test/tests/ui/empty_impl_runtime_apis_call.rs
@@ -1,3 +1,20 @@
+// 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.
+
 /// The declaration of the `Runtime` type is done by the `construct_runtime!` macro in a real
 /// runtime.
 struct Runtime {}
diff --git a/substrate/primitives/api/test/tests/ui/empty_impl_runtime_apis_call.stderr b/substrate/primitives/api/test/tests/ui/empty_impl_runtime_apis_call.stderr
index 96ec09a1855446e080b36b5d4d2908b6ed5e9cc5..498a3f201c3a2a91098df6afa1b863d5b06c3eaa 100644
--- a/substrate/primitives/api/test/tests/ui/empty_impl_runtime_apis_call.stderr
+++ b/substrate/primitives/api/test/tests/ui/empty_impl_runtime_apis_call.stderr
@@ -1,7 +1,7 @@
 error: No api implementation given!
-  --> tests/ui/empty_impl_runtime_apis_call.rs:11:1
+  --> tests/ui/empty_impl_runtime_apis_call.rs:28:1
    |
-11 | sp_api::impl_runtime_apis! {}
+28 | sp_api::impl_runtime_apis! {}
    | ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
    |
    = note: this error originates in the macro `sp_api::impl_runtime_apis` (in Nightly builds, run with -Z macro-backtrace for more info)
diff --git a/substrate/primitives/api/test/tests/ui/impl_incorrect_method_signature.rs b/substrate/primitives/api/test/tests/ui/impl_incorrect_method_signature.rs
index 32501be7855c6b7c6aaff54710a8bd38d7c38581..43718e4cd04a3f25fcc805edec3c14283f1f5f56 100644
--- a/substrate/primitives/api/test/tests/ui/impl_incorrect_method_signature.rs
+++ b/substrate/primitives/api/test/tests/ui/impl_incorrect_method_signature.rs
@@ -1,3 +1,20 @@
+// 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.
+
 use sp_runtime::traits::Block as BlockT;
 use substrate_test_runtime_client::runtime::Block;
 
diff --git a/substrate/primitives/api/test/tests/ui/impl_incorrect_method_signature.stderr b/substrate/primitives/api/test/tests/ui/impl_incorrect_method_signature.stderr
index 2324be85be4f82acdbb55e17e6b1d21a95739b73..4bd64c974f29ced75ff54eb002711d728a64f258 100644
--- a/substrate/primitives/api/test/tests/ui/impl_incorrect_method_signature.stderr
+++ b/substrate/primitives/api/test/tests/ui/impl_incorrect_method_signature.stderr
@@ -1,35 +1,35 @@
 error[E0053]: method `test` has an incompatible type for trait
-  --> tests/ui/impl_incorrect_method_signature.rs:16:17
+  --> tests/ui/impl_incorrect_method_signature.rs:33:17
    |
-16 |         fn test(data: String) {}
+33 |         fn test(data: String) {}
    |                       ^^^^^^
    |                       |
    |                       expected `u64`, found `std::string::String`
    |                       help: change the parameter type to match the trait: `u64`
    |
 note: type in trait
-  --> tests/ui/impl_incorrect_method_signature.rs:10:17
+  --> tests/ui/impl_incorrect_method_signature.rs:27:17
    |
-10 |         fn test(data: u64);
+27 |         fn test(data: u64);
    |                       ^^^
    = note: expected signature `fn(u64)`
               found signature `fn(std::string::String)`
 
 error[E0308]: mismatched types
-  --> tests/ui/impl_incorrect_method_signature.rs:16:11
+  --> tests/ui/impl_incorrect_method_signature.rs:33:11
    |
-14 | / sp_api::impl_runtime_apis! {
-15 | |     impl self::Api<Block> for Runtime {
-16 | |         fn test(data: String) {}
+31 | / sp_api::impl_runtime_apis! {
+32 | |     impl self::Api<Block> for Runtime {
+33 | |         fn test(data: String) {}
    | |                 ^^^^ expected `u64`, found `String`
-17 | |     }
+34 | |     }
 ...  |
-29 | |     }
-30 | | }
+46 | |     }
+47 | | }
    | |_- arguments to this function are incorrect
    |
 note: associated function defined here
-  --> tests/ui/impl_incorrect_method_signature.rs:10:6
+  --> tests/ui/impl_incorrect_method_signature.rs:27:6
    |
-10 |         fn test(data: u64);
+27 |         fn test(data: u64);
    |            ^^^^
diff --git a/substrate/primitives/api/test/tests/ui/impl_missing_version.rs b/substrate/primitives/api/test/tests/ui/impl_missing_version.rs
index 8fd40a400922f8240cf09d46a8566be9f17390ed..560257b5168c921ce112a56fcbd7e9c303363c77 100644
--- a/substrate/primitives/api/test/tests/ui/impl_missing_version.rs
+++ b/substrate/primitives/api/test/tests/ui/impl_missing_version.rs
@@ -1,3 +1,20 @@
+// 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.
+
 use sp_runtime::traits::Block as BlockT;
 use substrate_test_runtime_client::runtime::Block;
 
diff --git a/substrate/primitives/api/test/tests/ui/impl_missing_version.stderr b/substrate/primitives/api/test/tests/ui/impl_missing_version.stderr
index 770543aa8875d7876772d6f1998a895f821d5c40..c154bb10be09041a69d1a93fa92f76454b6d8a42 100644
--- a/substrate/primitives/api/test/tests/ui/impl_missing_version.stderr
+++ b/substrate/primitives/api/test/tests/ui/impl_missing_version.stderr
@@ -1,8 +1,8 @@
 error[E0405]: cannot find trait `ApiV4` in module `self::runtime_decl_for_api`
-  --> tests/ui/impl_missing_version.rs:18:13
+  --> tests/ui/impl_missing_version.rs:35:13
    |
-8  |     pub trait Api {
+25 |     pub trait Api {
    |     ------------- similarly named trait `ApiV2` defined here
 ...
-18 |     impl self::Api<Block> for Runtime {
+35 |     impl self::Api<Block> for Runtime {
    |                ^^^ help: a trait with a similar name exists: `ApiV2`
diff --git a/substrate/primitives/api/test/tests/ui/impl_two_traits_with_same_name.rs b/substrate/primitives/api/test/tests/ui/impl_two_traits_with_same_name.rs
index cb8f2f493d74114135b3830d8adf4ac6dc823720..4647a78809ab4bcb68dfc8e367e6423e83182956 100644
--- a/substrate/primitives/api/test/tests/ui/impl_two_traits_with_same_name.rs
+++ b/substrate/primitives/api/test/tests/ui/impl_two_traits_with_same_name.rs
@@ -1,3 +1,20 @@
+// 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.
+
 /// The declaration of the `Runtime` type  is done by the `construct_runtime!` macro in a real
 /// runtime.
 struct Runtime {}
diff --git a/substrate/primitives/api/test/tests/ui/impl_two_traits_with_same_name.stderr b/substrate/primitives/api/test/tests/ui/impl_two_traits_with_same_name.stderr
index a41f59f36b1f0fa3a70c26caf19519600a5812d6..2197bbc99cfb1dcd4cd76c627a6280882c5517e2 100644
--- a/substrate/primitives/api/test/tests/ui/impl_two_traits_with_same_name.stderr
+++ b/substrate/primitives/api/test/tests/ui/impl_two_traits_with_same_name.stderr
@@ -1,5 +1,11 @@
 error: Two traits with the same name detected! The trait name is used to generate its ID. Please rename one trait at the declaration!
-  --> tests/ui/impl_two_traits_with_same_name.rs:24:15
+  --> tests/ui/impl_two_traits_with_same_name.rs:41:15
    |
-24 |     impl second::Api<Block> for Runtime {
+41 |     impl second::Api<Block> for Runtime {
    |                  ^^^
+
+error: First trait implementation.
+  --> tests/ui/impl_two_traits_with_same_name.rs:37:13
+   |
+37 |     impl self::Api<Block> for Runtime {
+   |                ^^^
diff --git a/substrate/primitives/api/test/tests/ui/invalid_api_version_1.rs b/substrate/primitives/api/test/tests/ui/invalid_api_version_1.rs
index e038dd0aa6585b03c30e39a9383dd58fecef0dac..67af9a95521f537d49bf76eab35a8d393c912602 100644
--- a/substrate/primitives/api/test/tests/ui/invalid_api_version_1.rs
+++ b/substrate/primitives/api/test/tests/ui/invalid_api_version_1.rs
@@ -1,3 +1,20 @@
+// 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.
+
 sp_api::decl_runtime_apis! {
 	#[api_version]
 	pub trait Api {
diff --git a/substrate/primitives/api/test/tests/ui/invalid_api_version_1.stderr b/substrate/primitives/api/test/tests/ui/invalid_api_version_1.stderr
index 53ffce959bb6697b861af157bbd7f78d5b2b572a..41ee4d5657c10f3f3c7ef2ee6b99fa534f35e906 100644
--- a/substrate/primitives/api/test/tests/ui/invalid_api_version_1.stderr
+++ b/substrate/primitives/api/test/tests/ui/invalid_api_version_1.stderr
@@ -1,5 +1,5 @@
 error: Unexpected `api_version` attribute. The supported format is `api_version(1)`
- --> tests/ui/invalid_api_version_1.rs:2:2
-  |
-2 |     #[api_version]
-  |     ^
+  --> tests/ui/invalid_api_version_1.rs:19:2
+   |
+19 |     #[api_version]
+   |     ^
diff --git a/substrate/primitives/api/test/tests/ui/invalid_api_version_2.rs b/substrate/primitives/api/test/tests/ui/invalid_api_version_2.rs
index bb8ed8ed11fea503c931f433c784a182987c320b..fe563023f75d12b7cdbe2ce43f37d2aa02179ed0 100644
--- a/substrate/primitives/api/test/tests/ui/invalid_api_version_2.rs
+++ b/substrate/primitives/api/test/tests/ui/invalid_api_version_2.rs
@@ -1,3 +1,20 @@
+// 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.
+
 sp_api::decl_runtime_apis! {
 	#[api_version("1")]
 	pub trait Api {
diff --git a/substrate/primitives/api/test/tests/ui/invalid_api_version_2.stderr b/substrate/primitives/api/test/tests/ui/invalid_api_version_2.stderr
index 0c5274d4680ff3dbcd83abf7619aea9d9a73357a..adfe4962ce453b854a41f6b38e44866c21656a7c 100644
--- a/substrate/primitives/api/test/tests/ui/invalid_api_version_2.stderr
+++ b/substrate/primitives/api/test/tests/ui/invalid_api_version_2.stderr
@@ -1,5 +1,5 @@
 error: Unexpected `api_version` attribute. The supported format is `api_version(1)`
- --> tests/ui/invalid_api_version_2.rs:2:2
-  |
-2 |     #[api_version("1")]
-  |     ^
+  --> tests/ui/invalid_api_version_2.rs:19:2
+   |
+19 |     #[api_version("1")]
+   |     ^
diff --git a/substrate/primitives/api/test/tests/ui/invalid_api_version_3.rs b/substrate/primitives/api/test/tests/ui/invalid_api_version_3.rs
index d010866e23731dc737e6cdd810b45b0bba3b5d34..385837067e9f7bd3b100616ff6750f23374f3dee 100644
--- a/substrate/primitives/api/test/tests/ui/invalid_api_version_3.rs
+++ b/substrate/primitives/api/test/tests/ui/invalid_api_version_3.rs
@@ -1,3 +1,20 @@
+// 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.
+
 sp_api::decl_runtime_apis! {
 	#[api_version()]
 	pub trait Api {
diff --git a/substrate/primitives/api/test/tests/ui/invalid_api_version_3.stderr b/substrate/primitives/api/test/tests/ui/invalid_api_version_3.stderr
index 4a34a7aa9b47ac666535f9b2828ab9daab3fd865..cd73a384f606411ed65da506e2d9f85d31ead2ca 100644
--- a/substrate/primitives/api/test/tests/ui/invalid_api_version_3.stderr
+++ b/substrate/primitives/api/test/tests/ui/invalid_api_version_3.stderr
@@ -1,5 +1,5 @@
 error: Unexpected `api_version` attribute. The supported format is `api_version(1)`
- --> tests/ui/invalid_api_version_3.rs:2:2
-  |
-2 |     #[api_version()]
-  |     ^
+  --> tests/ui/invalid_api_version_3.rs:19:2
+   |
+19 |     #[api_version()]
+   |     ^
diff --git a/substrate/primitives/api/test/tests/ui/invalid_api_version_4.rs b/substrate/primitives/api/test/tests/ui/invalid_api_version_4.rs
index 37b5b6ffa25d112532095b0085322e95d2501cd0..adca5f725597a6d1a1e6a4d77798ccec1de62c02 100644
--- a/substrate/primitives/api/test/tests/ui/invalid_api_version_4.rs
+++ b/substrate/primitives/api/test/tests/ui/invalid_api_version_4.rs
@@ -1,3 +1,20 @@
+// 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.
+
 sp_api::decl_runtime_apis! {
 	pub trait Api {
 		#[api_version("1")]
diff --git a/substrate/primitives/api/test/tests/ui/invalid_api_version_4.stderr b/substrate/primitives/api/test/tests/ui/invalid_api_version_4.stderr
index 57541a97f6c91b0a87a3e7d6176d73cdf8014752..a241ee028709c66c373ae45e98e075b6fae0ab19 100644
--- a/substrate/primitives/api/test/tests/ui/invalid_api_version_4.stderr
+++ b/substrate/primitives/api/test/tests/ui/invalid_api_version_4.stderr
@@ -1,5 +1,5 @@
 error: Unexpected `api_version` attribute. The supported format is `api_version(1)`
- --> tests/ui/invalid_api_version_4.rs:3:3
-  |
-3 |         #[api_version("1")]
-  |         ^
+  --> tests/ui/invalid_api_version_4.rs:20:3
+   |
+20 |         #[api_version("1")]
+   |         ^
diff --git a/substrate/primitives/api/test/tests/ui/method_ver_lower_than_trait_ver.rs b/substrate/primitives/api/test/tests/ui/method_ver_lower_than_trait_ver.rs
index b4f43cd401bba927323a1d6403f728b301ba6dc8..ca61bff5e6adca411e88988dbfbd8d70155b61e2 100644
--- a/substrate/primitives/api/test/tests/ui/method_ver_lower_than_trait_ver.rs
+++ b/substrate/primitives/api/test/tests/ui/method_ver_lower_than_trait_ver.rs
@@ -1,3 +1,20 @@
+// 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.
+
 sp_api::decl_runtime_apis! {
 	#[api_version(2)]
 	pub trait Api {
diff --git a/substrate/primitives/api/test/tests/ui/method_ver_lower_than_trait_ver.stderr b/substrate/primitives/api/test/tests/ui/method_ver_lower_than_trait_ver.stderr
index ec4b594023a05963b7ddc7119a807bfbc883b8c8..dec73775363afa1e9bcf44914cc97fb87578dded 100644
--- a/substrate/primitives/api/test/tests/ui/method_ver_lower_than_trait_ver.stderr
+++ b/substrate/primitives/api/test/tests/ui/method_ver_lower_than_trait_ver.stderr
@@ -1,11 +1,11 @@
 error: Method version `1` is older than (or equal to) trait version `2`.Methods can't define versions older than the trait version.
- --> tests/ui/method_ver_lower_than_trait_ver.rs:4:3
-  |
-4 |         #[api_version(1)]
-  |         ^
+  --> tests/ui/method_ver_lower_than_trait_ver.rs:21:3
+   |
+21 |         #[api_version(1)]
+   |         ^
 
 error: Trait version is set here.
- --> tests/ui/method_ver_lower_than_trait_ver.rs:2:2
-  |
-2 |     #[api_version(2)]
-  |     ^
+  --> tests/ui/method_ver_lower_than_trait_ver.rs:19:2
+   |
+19 |     #[api_version(2)]
+   |     ^
diff --git a/substrate/primitives/api/test/tests/ui/missing_block_generic_parameter.rs b/substrate/primitives/api/test/tests/ui/missing_block_generic_parameter.rs
index b69505bfeb098f5b04fb8c663f7d29a36e96a42e..81d4bfeda8237122c3edf238595c2e9ce90f2194 100644
--- a/substrate/primitives/api/test/tests/ui/missing_block_generic_parameter.rs
+++ b/substrate/primitives/api/test/tests/ui/missing_block_generic_parameter.rs
@@ -1,3 +1,20 @@
+// 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.
+
 /// The declaration of the `Runtime` type is done by the `construct_runtime!` macro in a real
 /// runtime.
 struct Runtime {}
diff --git a/substrate/primitives/api/test/tests/ui/missing_block_generic_parameter.stderr b/substrate/primitives/api/test/tests/ui/missing_block_generic_parameter.stderr
index 5dc2b993bb1a7345bd8621f81d075fedea998dff..4d7ead55d61ddde5906c2f873535fe5010ccee6a 100644
--- a/substrate/primitives/api/test/tests/ui/missing_block_generic_parameter.stderr
+++ b/substrate/primitives/api/test/tests/ui/missing_block_generic_parameter.stderr
@@ -1,5 +1,5 @@
 error: Missing `Block` generic parameter.
-  --> tests/ui/missing_block_generic_parameter.rs:12:13
+  --> tests/ui/missing_block_generic_parameter.rs:29:13
    |
-12 |     impl self::Api for Runtime {
+29 |     impl self::Api for Runtime {
    |                ^^^
diff --git a/substrate/primitives/api/test/tests/ui/missing_path_for_trait.rs b/substrate/primitives/api/test/tests/ui/missing_path_for_trait.rs
index e47bca1c3f6ce940a205ba79cf5599a806aaad0d..d1a0a27e20a9ffb96db7763479a276b13c59d313 100644
--- a/substrate/primitives/api/test/tests/ui/missing_path_for_trait.rs
+++ b/substrate/primitives/api/test/tests/ui/missing_path_for_trait.rs
@@ -1,3 +1,20 @@
+// 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.
+
 /// The declaration of the `Runtime` type is done by the `construct_runtime!` macro in a real
 /// runtime.
 struct Runtime {}
diff --git a/substrate/primitives/api/test/tests/ui/missing_path_for_trait.stderr b/substrate/primitives/api/test/tests/ui/missing_path_for_trait.stderr
index cca993501979e914f81b8eafdaca6b3d176f6454..9444b0041e61f1d23443fba6e1a67cd4ae547b1d 100644
--- a/substrate/primitives/api/test/tests/ui/missing_path_for_trait.stderr
+++ b/substrate/primitives/api/test/tests/ui/missing_path_for_trait.stderr
@@ -1,5 +1,5 @@
 error: The implemented trait has to be referenced with a path, e.g. `impl client::Core for Runtime`.
-  --> tests/ui/missing_path_for_trait.rs:12:7
+  --> tests/ui/missing_path_for_trait.rs:29:7
    |
-12 |     impl Api<Block> for Runtime {
+29 |     impl Api<Block> for Runtime {
    |          ^^^
diff --git a/substrate/primitives/api/test/tests/ui/missing_versioned_method.rs b/substrate/primitives/api/test/tests/ui/missing_versioned_method.rs
index 919cef055fe62682ed3d80172e556fbb60ed5cc8..6ead545f85a11e8f0382331e77145acb4a053d5e 100644
--- a/substrate/primitives/api/test/tests/ui/missing_versioned_method.rs
+++ b/substrate/primitives/api/test/tests/ui/missing_versioned_method.rs
@@ -1,3 +1,20 @@
+// 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.
+
 use sp_runtime::traits::Block as BlockT;
 use substrate_test_runtime_client::runtime::Block;
 
diff --git a/substrate/primitives/api/test/tests/ui/missing_versioned_method.stderr b/substrate/primitives/api/test/tests/ui/missing_versioned_method.stderr
index b88d903212df1ed29e2a600d6abbca1a1b568dd2..e313b7948e85fcdc8c8abcb9f7d933e7936b7c05 100644
--- a/substrate/primitives/api/test/tests/ui/missing_versioned_method.stderr
+++ b/substrate/primitives/api/test/tests/ui/missing_versioned_method.stderr
@@ -1,8 +1,8 @@
 error[E0046]: not all trait items implemented, missing: `test3`
-  --> tests/ui/missing_versioned_method.rs:18:2
+  --> tests/ui/missing_versioned_method.rs:35:2
    |
-12 |         fn test3();
+29 |         fn test3();
    |         ----------- `test3` from trait
 ...
-18 |     impl self::Api<Block> for Runtime {
+35 |     impl self::Api<Block> for Runtime {
    |     ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ missing `test3` in implementation
diff --git a/substrate/primitives/api/test/tests/ui/missing_versioned_method_multiple_vers.rs b/substrate/primitives/api/test/tests/ui/missing_versioned_method_multiple_vers.rs
index 036bba417f57d00e4a83a311351e58b3a7d3a914..8eebc1d79babcbd6fb95876a530a920397c035a6 100644
--- a/substrate/primitives/api/test/tests/ui/missing_versioned_method_multiple_vers.rs
+++ b/substrate/primitives/api/test/tests/ui/missing_versioned_method_multiple_vers.rs
@@ -1,3 +1,20 @@
+// 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.
+
 use sp_runtime::traits::Block as BlockT;
 use substrate_test_runtime_client::runtime::Block;
 
diff --git a/substrate/primitives/api/test/tests/ui/missing_versioned_method_multiple_vers.stderr b/substrate/primitives/api/test/tests/ui/missing_versioned_method_multiple_vers.stderr
index 4afa6856a58146694bf94efb3f9ca61d1dc6bb40..a45d2e6d354dddbd938d3fe09784881356d9cc18 100644
--- a/substrate/primitives/api/test/tests/ui/missing_versioned_method_multiple_vers.stderr
+++ b/substrate/primitives/api/test/tests/ui/missing_versioned_method_multiple_vers.stderr
@@ -1,8 +1,8 @@
 error[E0046]: not all trait items implemented, missing: `test3`
-  --> tests/ui/missing_versioned_method_multiple_vers.rs:20:2
+  --> tests/ui/missing_versioned_method_multiple_vers.rs:37:2
    |
-12 |         fn test3();
+29 |         fn test3();
    |         ----------- `test3` from trait
 ...
-20 |     impl self::Api<Block> for Runtime {
+37 |     impl self::Api<Block> for Runtime {
    |     ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ missing `test3` in implementation
diff --git a/substrate/primitives/api/test/tests/ui/mock_advanced_hash_by_reference.rs b/substrate/primitives/api/test/tests/ui/mock_advanced_hash_by_reference.rs
index 45e6adb2fcf948b64027c9e2241f2f519a240647..7fa3916bf20e261522fc4648dce3f7eb5ec2d27f 100644
--- a/substrate/primitives/api/test/tests/ui/mock_advanced_hash_by_reference.rs
+++ b/substrate/primitives/api/test/tests/ui/mock_advanced_hash_by_reference.rs
@@ -1,3 +1,20 @@
+// 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.
+
 use substrate_test_runtime_client::runtime::Block;
 use sp_api::ApiError;
 
diff --git a/substrate/primitives/api/test/tests/ui/mock_advanced_hash_by_reference.stderr b/substrate/primitives/api/test/tests/ui/mock_advanced_hash_by_reference.stderr
index 234331c9749bb333929fa536de73c8260da022aa..a7ea3146e8992f8d9f9709f7437503651768b928 100644
--- a/substrate/primitives/api/test/tests/ui/mock_advanced_hash_by_reference.stderr
+++ b/substrate/primitives/api/test/tests/ui/mock_advanced_hash_by_reference.stderr
@@ -1,13 +1,13 @@
 error: `Hash` needs to be taken by value and not by reference!
-  --> tests/ui/mock_advanced_hash_by_reference.rs:12:1
+  --> tests/ui/mock_advanced_hash_by_reference.rs:29:1
    |
-12 | / sp_api::mock_impl_runtime_apis! {
-13 | |     impl Api<Block> for MockApi {
-14 | |         #[advanced]
-15 | |         fn test(&self, _: &Hash) -> Result<(), ApiError> {
+29 | / sp_api::mock_impl_runtime_apis! {
+30 | |     impl Api<Block> for MockApi {
+31 | |         #[advanced]
+32 | |         fn test(&self, _: &Hash) -> Result<(), ApiError> {
 ...  |
-18 | |     }
-19 | | }
+35 | |     }
+36 | | }
    | |_^
    |
    = note: this error originates in the macro `sp_api::mock_impl_runtime_apis` (in Nightly builds, run with -Z macro-backtrace for more info)
diff --git a/substrate/primitives/api/test/tests/ui/mock_advanced_missing_hash.rs b/substrate/primitives/api/test/tests/ui/mock_advanced_missing_hash.rs
index 76bf5f1aa745967c7d3703e0f56121799a34353b..2a2eeec631346ebda3e731901637ba625be03b4f 100644
--- a/substrate/primitives/api/test/tests/ui/mock_advanced_missing_hash.rs
+++ b/substrate/primitives/api/test/tests/ui/mock_advanced_missing_hash.rs
@@ -1,3 +1,20 @@
+// 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.
+
 use substrate_test_runtime_client::runtime::Block;
 use sp_api::ApiError;
 
diff --git a/substrate/primitives/api/test/tests/ui/mock_advanced_missing_hash.stderr b/substrate/primitives/api/test/tests/ui/mock_advanced_missing_hash.stderr
index 48a94a00beae7cdc789eb445a054288d0b6bd9e2..0e45f73f3ed851180bc904a1cfe30a9ad7f82e61 100644
--- a/substrate/primitives/api/test/tests/ui/mock_advanced_missing_hash.stderr
+++ b/substrate/primitives/api/test/tests/ui/mock_advanced_missing_hash.stderr
@@ -1,5 +1,5 @@
 error: If using the `advanced` attribute, it is required that the function takes at least one argument, the `Hash`.
-  --> tests/ui/mock_advanced_missing_hash.rs:15:3
+  --> tests/ui/mock_advanced_missing_hash.rs:32:3
    |
-15 |         fn test(&self) -> Result<(), ApiError> {
+32 |         fn test(&self) -> Result<(), ApiError> {
    |         ^^
diff --git a/substrate/primitives/api/test/tests/ui/mock_only_one_block_type.rs b/substrate/primitives/api/test/tests/ui/mock_only_one_block_type.rs
index f49cafd23a00122bd53976c0656e0779f3d3fb5d..a4c98ca0cb024ee1c2dc486e6fd690bfe7140371 100644
--- a/substrate/primitives/api/test/tests/ui/mock_only_one_block_type.rs
+++ b/substrate/primitives/api/test/tests/ui/mock_only_one_block_type.rs
@@ -1,3 +1,20 @@
+// 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.
+
 struct Block2;
 
 sp_api::decl_runtime_apis! {
diff --git a/substrate/primitives/api/test/tests/ui/mock_only_one_block_type.stderr b/substrate/primitives/api/test/tests/ui/mock_only_one_block_type.stderr
index 1831d0485b473a3d33ca1bafce6c2fa67f6b78a2..cd29108e1569c2ac7a5a60f027418442aaebc272 100644
--- a/substrate/primitives/api/test/tests/ui/mock_only_one_block_type.stderr
+++ b/substrate/primitives/api/test/tests/ui/mock_only_one_block_type.stderr
@@ -1,11 +1,11 @@
 error: Block type should be the same between all runtime apis.
-  --> $DIR/mock_only_one_block_type.rs:20:12
+  --> tests/ui/mock_only_one_block_type.rs:37:12
    |
-20 |     impl Api2<Block2> for MockApi {
+37 |     impl Api2<Block2> for MockApi {
    |               ^^^^^^
 
 error: First block type found here
-  --> $DIR/mock_only_one_block_type.rs:16:11
+  --> tests/ui/mock_only_one_block_type.rs:33:11
    |
-16 |     impl Api<Block> for MockApi {
+33 |     impl Api<Block> for MockApi {
    |              ^^^^^
diff --git a/substrate/primitives/api/test/tests/ui/mock_only_one_self_type.rs b/substrate/primitives/api/test/tests/ui/mock_only_one_self_type.rs
index 617031b4d5f1a1f37c974ed8d826f43e49003233..155b3d23d91808c8a8b9af34ea8a8a132deb595b 100644
--- a/substrate/primitives/api/test/tests/ui/mock_only_one_self_type.rs
+++ b/substrate/primitives/api/test/tests/ui/mock_only_one_self_type.rs
@@ -1,3 +1,20 @@
+// 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.
+
 sp_api::decl_runtime_apis! {
 	pub trait Api {
 		fn test(data: u64);
diff --git a/substrate/primitives/api/test/tests/ui/mock_only_one_self_type.stderr b/substrate/primitives/api/test/tests/ui/mock_only_one_self_type.stderr
index 5f1e29b281c8504d39a355028882099b40298810..e9e7da2db8b0d4777340b6bd154b1acbc1c47421 100644
--- a/substrate/primitives/api/test/tests/ui/mock_only_one_self_type.stderr
+++ b/substrate/primitives/api/test/tests/ui/mock_only_one_self_type.stderr
@@ -1,11 +1,11 @@
 error: Self type should not change between runtime apis
-  --> $DIR/mock_only_one_self_type.rs:19:23
+  --> tests/ui/mock_only_one_self_type.rs:36:23
    |
-19 |     impl Api2<Block> for MockApi2 {
+36 |     impl Api2<Block> for MockApi2 {
    |                          ^^^^^^^^
 
 error: First self type found here
-  --> $DIR/mock_only_one_self_type.rs:15:22
+  --> tests/ui/mock_only_one_self_type.rs:32:22
    |
-15 |     impl Api<Block> for MockApi {
+32 |     impl Api<Block> for MockApi {
    |                         ^^^^^^^
diff --git a/substrate/primitives/api/test/tests/ui/mock_only_self_reference.rs b/substrate/primitives/api/test/tests/ui/mock_only_self_reference.rs
index 8a733f5779ce938edcd1301b535938288b66737b..061206fff73d50dec36149d68231c74d877a9f54 100644
--- a/substrate/primitives/api/test/tests/ui/mock_only_self_reference.rs
+++ b/substrate/primitives/api/test/tests/ui/mock_only_self_reference.rs
@@ -1,3 +1,20 @@
+// 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.
+
 use substrate_test_runtime_client::runtime::Block;
 
 sp_api::decl_runtime_apis! {
diff --git a/substrate/primitives/api/test/tests/ui/mock_only_self_reference.stderr b/substrate/primitives/api/test/tests/ui/mock_only_self_reference.stderr
index f088e8f2de59db08dc37554c6935c7eef54c651c..8457557718771db27ae6c0b9ae7cf59f9e4a8e78 100644
--- a/substrate/primitives/api/test/tests/ui/mock_only_self_reference.stderr
+++ b/substrate/primitives/api/test/tests/ui/mock_only_self_reference.stderr
@@ -1,50 +1,50 @@
 error: Only `&self` is supported!
-  --> tests/ui/mock_only_self_reference.rs:14:11
+  --> tests/ui/mock_only_self_reference.rs:31:11
    |
-14 |         fn test(self, data: u64) {}
+31 |         fn test(self, data: u64) {}
    |                 ^^^^
 
 error: Only `&self` is supported!
-  --> tests/ui/mock_only_self_reference.rs:16:12
+  --> tests/ui/mock_only_self_reference.rs:33:12
    |
-16 |         fn test2(&mut self, data: u64) {}
+33 |         fn test2(&mut self, data: u64) {}
    |                  ^
 
 error[E0050]: method `test` has 2 parameters but the declaration in trait `Api::test` has 3
-  --> tests/ui/mock_only_self_reference.rs:12:1
+  --> tests/ui/mock_only_self_reference.rs:29:1
    |
-3  | / sp_api::decl_runtime_apis! {
-4  | |     pub trait Api {
-5  | |         fn test(data: u64);
+20 | / sp_api::decl_runtime_apis! {
+21 | |     pub trait Api {
+22 | |         fn test(data: u64);
    | |_________________________- trait requires 3 parameters
 ...
-12 | / sp_api::mock_impl_runtime_apis! {
-13 | |     impl Api<Block> for MockApi {
-14 | |         fn test(self, data: u64) {}
-15 | |
-16 | |         fn test2(&mut self, data: u64) {}
-17 | |     }
-18 | | }
+29 | / sp_api::mock_impl_runtime_apis! {
+30 | |     impl Api<Block> for MockApi {
+31 | |         fn test(self, data: u64) {}
+32 | |
+33 | |         fn test2(&mut self, data: u64) {}
+34 | |     }
+35 | | }
    | |_^ expected 3 parameters, found 2
    |
    = note: this error originates in the macro `sp_api::mock_impl_runtime_apis` (in Nightly builds, run with -Z macro-backtrace for more info)
 
 error[E0050]: method `test2` has 2 parameters but the declaration in trait `Api::test2` has 3
-  --> tests/ui/mock_only_self_reference.rs:12:1
+  --> tests/ui/mock_only_self_reference.rs:29:1
    |
-3  | / sp_api::decl_runtime_apis! {
-4  | |     pub trait Api {
-5  | |         fn test(data: u64);
-6  | |         fn test2(data: u64);
+20 | / sp_api::decl_runtime_apis! {
+21 | |     pub trait Api {
+22 | |         fn test(data: u64);
+23 | |         fn test2(data: u64);
    | |__________________________- trait requires 3 parameters
 ...
-12 | / sp_api::mock_impl_runtime_apis! {
-13 | |     impl Api<Block> for MockApi {
-14 | |         fn test(self, data: u64) {}
-15 | |
-16 | |         fn test2(&mut self, data: u64) {}
-17 | |     }
-18 | | }
+29 | / sp_api::mock_impl_runtime_apis! {
+30 | |     impl Api<Block> for MockApi {
+31 | |         fn test(self, data: u64) {}
+32 | |
+33 | |         fn test2(&mut self, data: u64) {}
+34 | |     }
+35 | | }
    | |_^ expected 3 parameters, found 2
    |
    = note: this error originates in the macro `sp_api::mock_impl_runtime_apis` (in Nightly builds, run with -Z macro-backtrace for more info)
diff --git a/substrate/primitives/api/test/tests/ui/no_default_implementation.rs b/substrate/primitives/api/test/tests/ui/no_default_implementation.rs
index 6af93d6b865399c85b4d0756cb4357a4b71e21b2..4b96700ae3616a363a6dea034f03034bf1bc0b73 100644
--- a/substrate/primitives/api/test/tests/ui/no_default_implementation.rs
+++ b/substrate/primitives/api/test/tests/ui/no_default_implementation.rs
@@ -1,3 +1,20 @@
+// 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.
+
 sp_api::decl_runtime_apis! {
 	pub trait Api {
 		fn test() {
diff --git a/substrate/primitives/api/test/tests/ui/no_default_implementation.stderr b/substrate/primitives/api/test/tests/ui/no_default_implementation.stderr
index 0ccece1441916245bd43517842cd0335395cbdf6..0d25fe2e59fe4524f4b5df1b09d0ac362a368bea 100644
--- a/substrate/primitives/api/test/tests/ui/no_default_implementation.stderr
+++ b/substrate/primitives/api/test/tests/ui/no_default_implementation.stderr
@@ -1,8 +1,8 @@
 error: A runtime API function cannot have a default implementation!
- --> $DIR/no_default_implementation.rs:3:13
-  |
-3 |           fn test() {
-  |  ___________________^
-4 | |             println!("Hey, I'm a default implementation!");
-5 | |         }
-  | |_________^
+  --> tests/ui/no_default_implementation.rs:20:13
+   |
+20 |           fn test() {
+   |  ___________________^
+21 | |             println!("Hey, I'm a default implementation!");
+22 | |         }
+   | |_________^
diff --git a/substrate/primitives/api/test/tests/ui/positive_cases/custom_where_bound.rs b/substrate/primitives/api/test/tests/ui/positive_cases/custom_where_bound.rs
index b572a3bc30d5dd5ff3714cf29a1e08d8a84df247..594556d57be50dbd151de486dc22a63a733b933b 100644
--- a/substrate/primitives/api/test/tests/ui/positive_cases/custom_where_bound.rs
+++ b/substrate/primitives/api/test/tests/ui/positive_cases/custom_where_bound.rs
@@ -1,3 +1,20 @@
+// 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.
+
 use codec::{Decode, Encode};
 use scale_info::TypeInfo;
 use sp_runtime::traits::Block as BlockT;
diff --git a/substrate/primitives/api/test/tests/ui/positive_cases/default_impls.rs b/substrate/primitives/api/test/tests/ui/positive_cases/default_impls.rs
index 58192feb9ecac3c2b02c7a23c7ec2afada860781..ae573238ffe144d26b7e5dd4528e8a9e5ab88a9e 100644
--- a/substrate/primitives/api/test/tests/ui/positive_cases/default_impls.rs
+++ b/substrate/primitives/api/test/tests/ui/positive_cases/default_impls.rs
@@ -1,3 +1,20 @@
+// 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.
+
 use sp_runtime::traits::Block as BlockT;
 use substrate_test_runtime_client::runtime::Block;
 
diff --git a/substrate/primitives/api/test/tests/ui/type_reference_in_impl_runtime_apis_call.rs b/substrate/primitives/api/test/tests/ui/type_reference_in_impl_runtime_apis_call.rs
index 14a8fa4d4e0b1bb8eb715c86a4b165874915dca3..921bf0d04351dac4ddcdd18030619f1ebcf15008 100644
--- a/substrate/primitives/api/test/tests/ui/type_reference_in_impl_runtime_apis_call.rs
+++ b/substrate/primitives/api/test/tests/ui/type_reference_in_impl_runtime_apis_call.rs
@@ -1,3 +1,20 @@
+// 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.
+
 use sp_runtime::traits::Block as BlockT;
 use substrate_test_runtime_client::runtime::Block;
 
diff --git a/substrate/primitives/api/test/tests/ui/type_reference_in_impl_runtime_apis_call.stderr b/substrate/primitives/api/test/tests/ui/type_reference_in_impl_runtime_apis_call.stderr
index e9d550f3a3bcf841c15bba9c0422db2fcfc06e05..4c21a3afb9b6a2d13a7b3a0091dec785608c5a69 100644
--- a/substrate/primitives/api/test/tests/ui/type_reference_in_impl_runtime_apis_call.stderr
+++ b/substrate/primitives/api/test/tests/ui/type_reference_in_impl_runtime_apis_call.stderr
@@ -1,39 +1,39 @@
 error[E0053]: method `test` has an incompatible type for trait
-  --> tests/ui/type_reference_in_impl_runtime_apis_call.rs:16:17
+  --> tests/ui/type_reference_in_impl_runtime_apis_call.rs:33:17
    |
-16 |         fn test(data: &u64) {
+33 |         fn test(data: &u64) {
    |                       ^^^^
    |                       |
    |                       expected `u64`, found `&u64`
    |                       help: change the parameter type to match the trait: `u64`
    |
 note: type in trait
-  --> tests/ui/type_reference_in_impl_runtime_apis_call.rs:10:17
+  --> tests/ui/type_reference_in_impl_runtime_apis_call.rs:27:17
    |
-10 |         fn test(data: u64);
+27 |         fn test(data: u64);
    |                       ^^^
    = note: expected signature `fn(u64)`
               found signature `fn(&u64)`
 
 error[E0308]: mismatched types
-  --> tests/ui/type_reference_in_impl_runtime_apis_call.rs:16:11
+  --> tests/ui/type_reference_in_impl_runtime_apis_call.rs:33:11
    |
-14 | / sp_api::impl_runtime_apis! {
-15 | |     impl self::Api<Block> for Runtime {
-16 | |         fn test(data: &u64) {
+31 | / sp_api::impl_runtime_apis! {
+32 | |     impl self::Api<Block> for Runtime {
+33 | |         fn test(data: &u64) {
    | |                 ^^^^^^^ expected `u64`, found `&u64`
-17 | |             unimplemented!()
+34 | |             unimplemented!()
 ...  |
-31 | |     }
-32 | | }
+48 | |     }
+49 | | }
    | |_- arguments to this function are incorrect
    |
 note: associated function defined here
-  --> tests/ui/type_reference_in_impl_runtime_apis_call.rs:10:6
+  --> tests/ui/type_reference_in_impl_runtime_apis_call.rs:27:6
    |
-10 |         fn test(data: u64);
+27 |         fn test(data: u64);
    |            ^^^^
 help: consider removing the borrow
    |
-16 |         fn test(data: &u64) {
+33 |         fn test(data: &u64) {
    |
diff --git a/substrate/primitives/application-crypto/Cargo.toml b/substrate/primitives/application-crypto/Cargo.toml
index 75b3ed350256d824eac508ecb57a13032a01491f..7c5e317307790728977a1f069388dc671cceba87 100644
--- a/substrate/primitives/application-crypto/Cargo.toml
+++ b/substrate/primitives/application-crypto/Cargo.toml
@@ -1,12 +1,12 @@
 [package]
 name = "sp-application-crypto"
 version = "23.0.0"
-authors = ["Parity Technologies <admin@parity.io>"]
-edition = "2021"
+authors.workspace = true
+edition.workspace = true
 description = "Provides facilities for generating application specific crypto wrapper types."
 license = "Apache-2.0"
 homepage = "https://substrate.io"
-repository = "https://github.com/paritytech/substrate/"
+repository.workspace = true
 documentation = "https://docs.rs/sp-application-crypto"
 readme = "README.md"
 
@@ -18,7 +18,7 @@ targets = ["x86_64-unknown-linux-gnu"]
 sp-core = { path = "../core", default-features = false}
 codec = { package = "parity-scale-codec", version = "3.6.1", default-features = false, features = ["derive"] }
 scale-info = { version = "2.5.0", default-features = false, features = ["derive"] }
-serde = { version = "1.0.163", default-features = false, optional = true, features = ["derive", "alloc"]  }
+serde = { version = "1.0.188", default-features = false, optional = true, features = ["derive", "alloc"]  }
 sp-std = { path = "../std", default-features = false}
 sp-io = { path = "../io", default-features = false}
 
diff --git a/substrate/primitives/application-crypto/README.md b/substrate/primitives/application-crypto/README.md
index c86e33552f60605d5ca8e9db7e48621f24060f2f..a686b746581249c5e705eb6301c5c11dc8ffce80 100644
--- a/substrate/primitives/application-crypto/README.md
+++ b/substrate/primitives/application-crypto/README.md
@@ -1,3 +1,3 @@
 Traits and macros for constructing application specific strongly typed crypto wrappers.
 
-License: Apache-2.0
\ No newline at end of file
+License: Apache-2.0
diff --git a/substrate/primitives/application-crypto/test/Cargo.toml b/substrate/primitives/application-crypto/test/Cargo.toml
index 4b3c9f2c66f78f7122249f3d2c2a4c81cf8d913e..a6f4f108c8f1842b8e0e47f98d65644dedb83dc9 100644
--- a/substrate/primitives/application-crypto/test/Cargo.toml
+++ b/substrate/primitives/application-crypto/test/Cargo.toml
@@ -1,13 +1,13 @@
 [package]
 name = "sp-application-crypto-test"
 version = "2.0.0"
-authors = ["Parity Technologies <admin@parity.io>"]
-edition = "2021"
+authors.workspace = true
+edition.workspace = true
 description = "Integration tests for application-crypto"
 license = "Apache-2.0"
 publish = false
 homepage = "https://substrate.io"
-repository = "https://github.com/paritytech/substrate/"
+repository.workspace = true
 
 [package.metadata.docs.rs]
 targets = ["x86_64-unknown-linux-gnu"]
diff --git a/substrate/primitives/arithmetic/Cargo.toml b/substrate/primitives/arithmetic/Cargo.toml
index 13ede731b0b41f4e1535efe27571bdde1cd6db52..4c2a78aec6fbad473194dfe7acdd1e5b854a3363 100644
--- a/substrate/primitives/arithmetic/Cargo.toml
+++ b/substrate/primitives/arithmetic/Cargo.toml
@@ -1,11 +1,11 @@
 [package]
 name = "sp-arithmetic"
 version = "16.0.0"
-authors = ["Parity Technologies <admin@parity.io>"]
-edition = "2021"
+authors.workspace = true
+edition.workspace = true
 license = "Apache-2.0"
 homepage = "https://substrate.io"
-repository = "https://github.com/paritytech/substrate/"
+repository.workspace = true
 description = "Minimal fixed point arithmetic primitives and types for runtime."
 documentation = "https://docs.rs/sp-arithmetic"
 readme = "README.md"
@@ -21,7 +21,7 @@ codec = { package = "parity-scale-codec", version = "3.6.1", default-features =
 integer-sqrt = "0.1.2"
 num-traits = { version = "0.2.8", default-features = false }
 scale-info = { version = "2.5.0", default-features = false, features = ["derive"] }
-serde = { version = "1.0.163", default-features = false, features = ["derive", "alloc"], optional = true }
+serde = { version = "1.0.188", default-features = false, features = ["derive", "alloc"], optional = true }
 static_assertions = "1.1.0"
 sp-std = { path = "../std", default-features = false}
 
diff --git a/substrate/primitives/arithmetic/README.md b/substrate/primitives/arithmetic/README.md
index e6e52c2a82696ba42e756458fff5839d2d88c09f..b5dcfdb29446fe573715af60b219b8642be7c537 100644
--- a/substrate/primitives/arithmetic/README.md
+++ b/substrate/primitives/arithmetic/README.md
@@ -1,3 +1,3 @@
 Minimal fixed point arithmetic primitives and types for runtime.
 
-License: Apache-2.0
\ No newline at end of file
+License: Apache-2.0
diff --git a/substrate/primitives/arithmetic/fuzzer/Cargo.toml b/substrate/primitives/arithmetic/fuzzer/Cargo.toml
index 76b0ef266497745cc73babc46a7cc3f642f05c8a..eded5a954c5a61773a3aa3a3416ffb1355d79a89 100644
--- a/substrate/primitives/arithmetic/fuzzer/Cargo.toml
+++ b/substrate/primitives/arithmetic/fuzzer/Cargo.toml
@@ -1,11 +1,11 @@
 [package]
 name = "sp-arithmetic-fuzzer"
 version = "2.0.0"
-authors = ["Parity Technologies <admin@parity.io>"]
-edition = "2021"
+authors.workspace = true
+edition.workspace = true
 license = "Apache-2.0"
 homepage = "https://substrate.io"
-repository = "https://github.com/paritytech/substrate/"
+repository.workspace = true
 description = "Fuzzer for fixed point arithmetic primitives."
 documentation = "https://docs.rs/sp-arithmetic-fuzzer"
 publish = false
diff --git a/substrate/primitives/authority-discovery/Cargo.toml b/substrate/primitives/authority-discovery/Cargo.toml
index 1a45f08c19bdd9b467b80c340afd9ddffcb46376..024711bd94a89c733832ee3d69c2b9c5020c8192 100644
--- a/substrate/primitives/authority-discovery/Cargo.toml
+++ b/substrate/primitives/authority-discovery/Cargo.toml
@@ -1,12 +1,12 @@
 [package]
 name = "sp-authority-discovery"
 version = "4.0.0-dev"
-authors = ["Parity Technologies <admin@parity.io>"]
+authors.workspace = true
 description = "Authority discovery primitives"
-edition = "2021"
+edition.workspace = true
 license = "Apache-2.0"
 homepage = "https://substrate.io"
-repository = "https://github.com/paritytech/substrate/"
+repository.workspace = true
 readme = "README.md"
 
 [package.metadata.docs.rs]
diff --git a/substrate/primitives/authority-discovery/README.md b/substrate/primitives/authority-discovery/README.md
index 65c2e22dde004483fdcff27d9a4b4392753bff3a..3b48ddc61c51cac1a162b6576cdb15132af2972d 100644
--- a/substrate/primitives/authority-discovery/README.md
+++ b/substrate/primitives/authority-discovery/README.md
@@ -1,3 +1,3 @@
 Runtime Api to help discover authorities.
 
-License: Apache-2.0
\ No newline at end of file
+License: Apache-2.0
diff --git a/substrate/primitives/block-builder/Cargo.toml b/substrate/primitives/block-builder/Cargo.toml
index d80fa29f352bf0cd93a2331c8770bc4653483bba..269eb53953279a3ccf8940ca92e04f715ed8d2d6 100644
--- a/substrate/primitives/block-builder/Cargo.toml
+++ b/substrate/primitives/block-builder/Cargo.toml
@@ -1,11 +1,11 @@
 [package]
 name = "sp-block-builder"
 version = "4.0.0-dev"
-authors = ["Parity Technologies <admin@parity.io>"]
-edition = "2021"
+authors.workspace = true
+edition.workspace = true
 license = "Apache-2.0"
 homepage = "https://substrate.io"
-repository = "https://github.com/paritytech/substrate/"
+repository.workspace = true
 description = "The block builder runtime api."
 readme = "README.md"
 
diff --git a/substrate/primitives/block-builder/README.md b/substrate/primitives/block-builder/README.md
index 433197d3be9e4104606809bab2834e16e8bcf065..952c94798d3a2c2a6ebb100bc4a7c99829017cff 100644
--- a/substrate/primitives/block-builder/README.md
+++ b/substrate/primitives/block-builder/README.md
@@ -1,3 +1,3 @@
 The block builder runtime api.
 
-License: Apache-2.0
\ No newline at end of file
+License: Apache-2.0
diff --git a/substrate/primitives/blockchain/Cargo.toml b/substrate/primitives/blockchain/Cargo.toml
index 9a3110d7d848721dcdcb19deb08d0226042a425f..33db09ce0ac2f41897957a43b8b74497b90e93a1 100644
--- a/substrate/primitives/blockchain/Cargo.toml
+++ b/substrate/primitives/blockchain/Cargo.toml
@@ -1,11 +1,11 @@
 [package]
 name = "sp-blockchain"
 version = "4.0.0-dev"
-authors = ["Parity Technologies <admin@parity.io>"]
-edition = "2021"
+authors.workspace = true
+edition.workspace = true
 license = "Apache-2.0"
 homepage = "https://substrate.io"
-repository = "https://github.com/paritytech/substrate/"
+repository.workspace = true
 description = "Substrate blockchain traits and primitives."
 documentation = "https://docs.rs/sp-blockchain"
 readme = "README.md"
@@ -19,7 +19,7 @@ futures = "0.3.21"
 log = "0.4.17"
 parking_lot = "0.12.1"
 schnellru = "0.2.1"
-thiserror = "1.0.30"
+thiserror = "1.0.48"
 sp-api = { path = "../api" }
 sp-consensus = { path = "../consensus/common" }
 sp-database = { path = "../database" }
diff --git a/substrate/primitives/blockchain/README.md b/substrate/primitives/blockchain/README.md
index 8298bfd7ae60a5d9a6be9c24ae4c7831e72f2bd0..a0a5b2edce518005673f6066ac7e27f74e35367b 100644
--- a/substrate/primitives/blockchain/README.md
+++ b/substrate/primitives/blockchain/README.md
@@ -1,3 +1,3 @@
 Substrate blockchain traits and primitives.
 
-License: Apache-2.0
\ No newline at end of file
+License: Apache-2.0
diff --git a/substrate/primitives/consensus/aura/Cargo.toml b/substrate/primitives/consensus/aura/Cargo.toml
index 25a66d9b9b9f0f4d1e9eb4912ee12d3abab3cb73..55c81bd71ec1a39fec71629d6b83906426d691e1 100644
--- a/substrate/primitives/consensus/aura/Cargo.toml
+++ b/substrate/primitives/consensus/aura/Cargo.toml
@@ -1,12 +1,12 @@
 [package]
 name = "sp-consensus-aura"
 version = "0.10.0-dev"
-authors = ["Parity Technologies <admin@parity.io>"]
+authors.workspace = true
 description = "Primitives for Aura consensus"
-edition = "2021"
+edition.workspace = true
 license = "Apache-2.0"
 homepage = "https://substrate.io"
-repository = "https://github.com/paritytech/substrate/"
+repository.workspace = true
 readme = "README.md"
 
 [package.metadata.docs.rs]
diff --git a/substrate/primitives/consensus/aura/README.md b/substrate/primitives/consensus/aura/README.md
index 0f360ae67eb28a9145ad4c83980f6dff9a9d22f1..725c6fc6db496c7b995c967d80d3585415e005cc 100644
--- a/substrate/primitives/consensus/aura/README.md
+++ b/substrate/primitives/consensus/aura/README.md
@@ -1,3 +1,3 @@
 Primitives for Aura.
 
-License: Apache-2.0
\ No newline at end of file
+License: Apache-2.0
diff --git a/substrate/primitives/consensus/babe/Cargo.toml b/substrate/primitives/consensus/babe/Cargo.toml
index efa455b8df74b18dc950ff0f08ae871303f1c04c..764e95501801b5448abae882a4c30e30f9d0312b 100644
--- a/substrate/primitives/consensus/babe/Cargo.toml
+++ b/substrate/primitives/consensus/babe/Cargo.toml
@@ -1,12 +1,12 @@
 [package]
 name = "sp-consensus-babe"
 version = "0.10.0-dev"
-authors = ["Parity Technologies <admin@parity.io>"]
+authors.workspace = true
 description = "Primitives for BABE consensus"
-edition = "2021"
+edition.workspace = true
 license = "Apache-2.0"
 homepage = "https://substrate.io"
-repository = "https://github.com/paritytech/substrate/"
+repository.workspace = true
 readme = "README.md"
 
 [package.metadata.docs.rs]
@@ -16,7 +16,7 @@ targets = ["x86_64-unknown-linux-gnu"]
 async-trait = { version = "0.1.57", optional = true }
 codec = { package = "parity-scale-codec", version = "3.6.1", default-features = false }
 scale-info = { version = "2.5.0", default-features = false, features = ["derive"] }
-serde = { version = "1.0.163", default-features = false, features = ["derive", "alloc"], optional = true }
+serde = { version = "1.0.188", default-features = false, features = ["derive", "alloc"], optional = true }
 sp-api = { path = "../../api", default-features = false}
 sp-application-crypto = { path = "../../application-crypto", default-features = false}
 sp-consensus-slots = { path = "../slots", default-features = false}
diff --git a/substrate/primitives/consensus/babe/README.md b/substrate/primitives/consensus/babe/README.md
index 54bae05fd6db72a167bc8fd687e2d6a91a8a47ba..59f8d925af7541a6b583be3f61dd34c507482365 100644
--- a/substrate/primitives/consensus/babe/README.md
+++ b/substrate/primitives/consensus/babe/README.md
@@ -1,3 +1,3 @@
 Primitives for BABE.
 
-License: Apache-2.0
\ No newline at end of file
+License: Apache-2.0
diff --git a/substrate/primitives/consensus/beefy/Cargo.toml b/substrate/primitives/consensus/beefy/Cargo.toml
index 72ca99f3c34ac3b8b1d4cd3b0a812f04b640c3a1..6a12a5a7c7c522f9fb28740bc28544de32dc1c3d 100644
--- a/substrate/primitives/consensus/beefy/Cargo.toml
+++ b/substrate/primitives/consensus/beefy/Cargo.toml
@@ -1,11 +1,11 @@
 [package]
 name = "sp-consensus-beefy"
 version = "4.0.0-dev"
-authors = ["Parity Technologies <admin@parity.io>"]
-edition = "2021"
+authors.workspace = true
+edition.workspace = true
 license = "Apache-2.0"
 homepage = "https://substrate.io"
-repository = "https://github.com/paritytech/substrate"
+repository.workspace = true
 description = "Primitives for BEEFY protocol."
 
 [package.metadata.docs.rs]
@@ -14,7 +14,7 @@ targets = ["x86_64-unknown-linux-gnu"]
 [dependencies]
 codec = { package = "parity-scale-codec", version = "3.6.1", default-features = false, features = ["derive"] }
 scale-info = { version = "2.5.0", default-features = false, features = ["derive"] }
-serde = { version = "1.0.163", default-features = false,  optional = true, features =  ["derive", "alloc"] }
+serde = { version = "1.0.188", default-features = false,  optional = true, features =  ["derive", "alloc"] }
 sp-api = { path = "../../api", default-features = false}
 sp-application-crypto = { path = "../../application-crypto", default-features = false}
 sp-core = { path = "../../core", default-features = false}
diff --git a/substrate/primitives/consensus/common/Cargo.toml b/substrate/primitives/consensus/common/Cargo.toml
index 6e929dabb5baf3bdf0c39d8f738276db81e8bdae..e8f6b806f8c6403296e5cd95907b3a74c4e097f2 100644
--- a/substrate/primitives/consensus/common/Cargo.toml
+++ b/substrate/primitives/consensus/common/Cargo.toml
@@ -1,11 +1,11 @@
 [package]
 name = "sp-consensus"
 version = "0.10.0-dev"
-authors = ["Parity Technologies <admin@parity.io>"]
-edition = "2021"
+authors.workspace = true
+edition.workspace = true
 license = "Apache-2.0"
 homepage = "https://substrate.io"
-repository = "https://github.com/paritytech/substrate/"
+repository.workspace = true
 description = "Common utilities for building and using consensus engines in substrate."
 documentation = "https://docs.rs/sp-consensus/"
 readme = "README.md"
@@ -17,7 +17,7 @@ targets = ["x86_64-unknown-linux-gnu"]
 async-trait = "0.1.57"
 futures = { version = "0.3.21", features = ["thread-pool"] }
 log = "0.4.17"
-thiserror = "1.0.30"
+thiserror = "1.0.48"
 sp-core = { path = "../../core" }
 sp-inherents = { path = "../../inherents" }
 sp-runtime = { path = "../../runtime" }
diff --git a/substrate/primitives/consensus/common/README.md b/substrate/primitives/consensus/common/README.md
index 963bb0fbdba4af4de706c5303003f8036016291d..f61a00c42c840159e921a06982d963e4fd350522 100644
--- a/substrate/primitives/consensus/common/README.md
+++ b/substrate/primitives/consensus/common/README.md
@@ -1,7 +1,7 @@
-Common utilities for building and using consensus engines in substrate.
+Common utilities for building and using consensus engines in Substrate.
 
 Much of this crate is _unstable_ and thus the API is likely to undergo
 change. Implementors of traits should not rely on the interfaces to remain
 the same.
 
-License: Apache-2.0
\ No newline at end of file
+License: Apache-2.0
diff --git a/substrate/primitives/consensus/grandpa/Cargo.toml b/substrate/primitives/consensus/grandpa/Cargo.toml
index fb9b708706d1edae878db296c6c7150cbb6459a2..bee9092b986816a0609bf5aa490ce08135c7e1fd 100644
--- a/substrate/primitives/consensus/grandpa/Cargo.toml
+++ b/substrate/primitives/consensus/grandpa/Cargo.toml
@@ -1,11 +1,11 @@
 [package]
 name = "sp-consensus-grandpa"
 version = "4.0.0-dev"
-authors = ["Parity Technologies <admin@parity.io>"]
-edition = "2021"
+authors.workspace = true
+edition.workspace = true
 license = "Apache-2.0"
 homepage = "https://substrate.io"
-repository = "https://github.com/paritytech/substrate/"
+repository.workspace = true
 description = "Primitives for GRANDPA integration, suitable for WASM compilation."
 documentation = "https://docs.rs/sp-consensus-grandpa"
 readme = "README.md"
@@ -18,7 +18,7 @@ codec = { package = "parity-scale-codec", version = "3.6.1", default-features =
 grandpa = { package = "finality-grandpa", version = "0.16.2", default-features = false, features = ["derive-codec"] }
 log = { version = "0.4.17", default-features = false }
 scale-info = { version = "2.5.0", default-features = false, features = ["derive"] }
-serde = { version = "1.0.163", features = ["derive", "alloc"], default-features = false, optional = true }
+serde = { version = "1.0.188", features = ["derive", "alloc"], default-features = false, optional = true }
 sp-api = { path = "../../api", default-features = false}
 sp-application-crypto = { path = "../../application-crypto", default-features = false}
 sp-core = { path = "../../core", default-features = false}
diff --git a/substrate/primitives/consensus/grandpa/README.md b/substrate/primitives/consensus/grandpa/README.md
index 77a7abca2eef3fa2da9b8c2580c1c0ae7f1d184b..d357904cd1f11d4d7b649988a84cd63768c542e7 100644
--- a/substrate/primitives/consensus/grandpa/README.md
+++ b/substrate/primitives/consensus/grandpa/README.md
@@ -1,3 +1,3 @@
 Primitives for GRANDPA integration, suitable for WASM compilation.
 
-License: Apache-2.0
\ No newline at end of file
+License: Apache-2.0
diff --git a/substrate/primitives/consensus/pow/Cargo.toml b/substrate/primitives/consensus/pow/Cargo.toml
index 457de67137d5c38ac8dadfd163dc4631e8f14175..cc4e961dbb6e62fc47aa78474655b0135c088a8d 100644
--- a/substrate/primitives/consensus/pow/Cargo.toml
+++ b/substrate/primitives/consensus/pow/Cargo.toml
@@ -1,12 +1,12 @@
 [package]
 name = "sp-consensus-pow"
 version = "0.10.0-dev"
-authors = ["Parity Technologies <admin@parity.io>"]
+authors.workspace = true
 description = "Primitives for Aura consensus"
-edition = "2021"
+edition.workspace = true
 license = "Apache-2.0"
 homepage = "https://substrate.io"
-repository = "https://github.com/paritytech/substrate/"
+repository.workspace = true
 readme = "README.md"
 
 [package.metadata.docs.rs]
diff --git a/substrate/primitives/consensus/pow/README.md b/substrate/primitives/consensus/pow/README.md
index 881864377649804e610fddecce9e9a3eb8624856..390190c5d18384a8164cc1e3370b4d8cdb0248fb 100644
--- a/substrate/primitives/consensus/pow/README.md
+++ b/substrate/primitives/consensus/pow/README.md
@@ -1,3 +1,3 @@
 Primitives for Substrate Proof-of-Work (PoW) consensus.
 
-License: Apache-2.0
\ No newline at end of file
+License: Apache-2.0
diff --git a/substrate/primitives/consensus/sassafras/Cargo.toml b/substrate/primitives/consensus/sassafras/Cargo.toml
new file mode 100644
index 0000000000000000000000000000000000000000..700f5160c221d7d555de74343be328f872ca7d84
--- /dev/null
+++ b/substrate/primitives/consensus/sassafras/Cargo.toml
@@ -0,0 +1,50 @@
+[package]
+name = "sp-consensus-sassafras"
+version = "0.3.4-dev"
+authors.workspace = true
+description = "Primitives for Sassafras consensus"
+edition = "2021"
+license = "Apache-2.0"
+homepage = "https://substrate.io"
+repository = "https://github.com/paritytech/polkadot-sdk/"
+documentation = "https://docs.rs/sp-consensus-sassafras"
+readme = "README.md"
+publish = false
+
+[package.metadata.docs.rs]
+targets = ["x86_64-unknown-linux-gnu"]
+
+[dependencies]
+scale-codec = { package = "parity-scale-codec", version = "3.2.2", default-features = false }
+scale-info = { version = "2.5.0", default-features = false, features = ["derive"] }
+serde = { version = "1.0.163", default-features = false, features = ["derive"], optional = true }
+sp-api = { default-features = false, path = "../../api" }
+sp-application-crypto = { default-features = false, path = "../../application-crypto", features = ["bandersnatch-experimental"] }
+sp-consensus-slots = { default-features = false, path = "../slots" }
+sp-core = { default-features = false, path = "../../core", features = ["bandersnatch-experimental"] }
+sp-runtime = { default-features = false, path = "../../runtime" }
+sp-std = { default-features = false, path = "../../std" }
+
+[features]
+default = [ "std" ]
+std = [
+	"scale-codec/std",
+	"scale-info/std",
+	"serde/std",
+	"sp-api/std",
+	"sp-application-crypto/std",
+	"sp-consensus-slots/std",
+	"sp-core/std",
+	"sp-runtime/std",
+	"sp-std/std",
+]
+
+# Serde support without relying on std features.
+serde = [
+	"dep:serde",
+	"scale-info/serde",
+	"sp-application-crypto/serde",
+	"sp-consensus-slots/serde",
+	"sp-core/serde",
+	"sp-runtime/serde",
+]
diff --git a/substrate/primitives/consensus/sassafras/README.md b/substrate/primitives/consensus/sassafras/README.md
new file mode 100644
index 0000000000000000000000000000000000000000..b0f3685494e4e3eb8b68bf15318960f532fe22ce
--- /dev/null
+++ b/substrate/primitives/consensus/sassafras/README.md
@@ -0,0 +1,12 @@
+Primitives for SASSAFRAS.
+
+# ⚠️ WARNING ⚠️
+
+The crate interfaces and structures are highly experimental and may be subject
+to significant changes.
+
+Depends on upstream experimental feature: `bandersnatch-experimental`.
+
+These structs were mostly extracted from the main SASSAFRAS protocol PR: https://github.com/paritytech/polkadot-sdk/pull/1336.
+
+Tracking issue: https://github.com/paritytech/polkadot-sdk/issues/41
diff --git a/substrate/primitives/consensus/sassafras/src/digests.rs b/substrate/primitives/consensus/sassafras/src/digests.rs
new file mode 100644
index 0000000000000000000000000000000000000000..95a305099de553cbe263fc1acd5605d1670d638b
--- /dev/null
+++ b/substrate/primitives/consensus/sassafras/src/digests.rs
@@ -0,0 +1,98 @@
+// 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.
+
+//! Sassafras digests structures and helpers.
+
+use crate::{
+	ticket::TicketClaim, vrf::VrfSignature, AuthorityId, AuthorityIndex, AuthoritySignature,
+	EpochConfiguration, Randomness, Slot, SASSAFRAS_ENGINE_ID,
+};
+
+use scale_codec::{Decode, Encode, MaxEncodedLen};
+use scale_info::TypeInfo;
+
+use sp_runtime::{DigestItem, RuntimeDebug};
+use sp_std::vec::Vec;
+
+/// Epoch slot claim digest entry.
+///
+/// This is mandatory for each block.
+#[derive(Clone, RuntimeDebug, Encode, Decode, MaxEncodedLen, TypeInfo)]
+pub struct SlotClaim {
+	/// Authority index that claimed the slot.
+	pub authority_idx: AuthorityIndex,
+	/// Corresponding slot number.
+	pub slot: Slot,
+	/// Slot claim VRF signature.
+	pub vrf_signature: VrfSignature,
+	/// Ticket auxiliary information for claim check.
+	pub ticket_claim: Option<TicketClaim>,
+}
+
+/// Information about the next epoch.
+///
+/// This is mandatory in the first block of each epoch.
+#[derive(Clone, PartialEq, Eq, Encode, Decode, RuntimeDebug)]
+pub struct NextEpochDescriptor {
+	/// Authorities list.
+	pub authorities: Vec<AuthorityId>,
+	/// Epoch randomness.
+	pub randomness: Randomness,
+	/// Epoch configurable parameters.
+	///
+	/// If not present previous epoch parameters are used.
+	pub config: Option<EpochConfiguration>,
+}
+
+/// Runtime digest entries.
+///
+/// Entries which may be generated by on-chain code.
+#[derive(Decode, Encode, Clone, PartialEq, Eq)]
+pub enum ConsensusLog {
+	/// Provides information about the next epoch parameters.
+	#[codec(index = 1)]
+	NextEpochData(NextEpochDescriptor),
+	/// Disable the authority with given index.
+	#[codec(index = 2)]
+	OnDisabled(AuthorityIndex),
+}
+
+impl TryFrom<&DigestItem> for SlotClaim {
+	type Error = ();
+	fn try_from(item: &DigestItem) -> Result<Self, Self::Error> {
+		item.pre_runtime_try_to(&SASSAFRAS_ENGINE_ID).ok_or(())
+	}
+}
+
+impl From<&SlotClaim> for DigestItem {
+	fn from(claim: &SlotClaim) -> Self {
+		DigestItem::PreRuntime(SASSAFRAS_ENGINE_ID, claim.encode())
+	}
+}
+
+impl TryFrom<&DigestItem> for AuthoritySignature {
+	type Error = ();
+	fn try_from(item: &DigestItem) -> Result<Self, Self::Error> {
+		item.seal_try_to(&SASSAFRAS_ENGINE_ID).ok_or(())
+	}
+}
+
+impl From<&AuthoritySignature> for DigestItem {
+	fn from(signature: &AuthoritySignature) -> Self {
+		DigestItem::Seal(SASSAFRAS_ENGINE_ID, signature.encode())
+	}
+}
diff --git a/substrate/primitives/consensus/sassafras/src/lib.rs b/substrate/primitives/consensus/sassafras/src/lib.rs
new file mode 100644
index 0000000000000000000000000000000000000000..e421e771d406a197cb30429a43b5c57d7f48b9de
--- /dev/null
+++ b/substrate/primitives/consensus/sassafras/src/lib.rs
@@ -0,0 +1,169 @@
+// 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.
+
+//! Primitives for Sassafras consensus.
+
+#![deny(warnings)]
+#![forbid(unsafe_code, missing_docs, unused_variables, unused_imports)]
+#![cfg_attr(not(feature = "std"), no_std)]
+
+use scale_codec::{Decode, Encode, MaxEncodedLen};
+use scale_info::TypeInfo;
+use sp_core::crypto::KeyTypeId;
+use sp_runtime::{ConsensusEngineId, RuntimeDebug};
+use sp_std::vec::Vec;
+
+pub use sp_consensus_slots::{Slot, SlotDuration};
+
+#[cfg(feature = "serde")]
+use serde::{Deserialize, Serialize};
+
+pub mod digests;
+pub mod ticket;
+pub mod vrf;
+
+pub use ticket::{
+	ticket_id_threshold, EphemeralPublic, EphemeralSignature, TicketBody, TicketClaim,
+	TicketEnvelope, TicketId,
+};
+
+mod app {
+	use sp_application_crypto::{app_crypto, bandersnatch, key_types::SASSAFRAS};
+	app_crypto!(bandersnatch, SASSAFRAS);
+}
+
+/// Key type identifier.
+pub const KEY_TYPE: KeyTypeId = sp_application_crypto::key_types::SASSAFRAS;
+
+/// Consensus engine identifier.
+pub const SASSAFRAS_ENGINE_ID: ConsensusEngineId = *b"SASS";
+
+/// VRF output length for per-slot randomness.
+pub const RANDOMNESS_LENGTH: usize = 32;
+
+/// Index of an authority.
+pub type AuthorityIndex = u32;
+
+/// Sassafras authority keypair. Necessarily equivalent to the schnorrkel public key used in
+/// the main Sassafras module. If that ever changes, then this must, too.
+#[cfg(feature = "std")]
+pub type AuthorityPair = app::Pair;
+
+/// Sassafras authority signature.
+pub type AuthoritySignature = app::Signature;
+
+/// Sassafras authority identifier. Necessarily equivalent to the schnorrkel public key used in
+/// the main Sassafras module. If that ever changes, then this must, too.
+pub type AuthorityId = app::Public;
+
+/// Weight of a Sassafras block.
+/// Primary blocks have a weight of 1 whereas secondary blocks have a weight of 0.
+pub type SassafrasBlockWeight = u32;
+
+/// An equivocation proof for multiple block authorships on the same slot (i.e. double vote).
+pub type EquivocationProof<H> = sp_consensus_slots::EquivocationProof<H, AuthorityId>;
+
+/// Randomness required by some protocol's operations.
+pub type Randomness = [u8; RANDOMNESS_LENGTH];
+
+/// Configuration data that can be modified on epoch change.
+#[derive(
+	Copy, Clone, PartialEq, Eq, Encode, Decode, RuntimeDebug, MaxEncodedLen, TypeInfo, Default,
+)]
+#[cfg_attr(feature = "serde", derive(Serialize, Deserialize))]
+pub struct EpochConfiguration {
+	/// Tickets threshold redundancy factor.
+	pub redundancy_factor: u32,
+	/// Tickets attempts for each validator.
+	pub attempts_number: u32,
+}
+
+/// Sassafras epoch information
+#[derive(Debug, Clone, PartialEq, Eq, Encode, Decode, TypeInfo)]
+pub struct Epoch {
+	/// The epoch index.
+	pub epoch_idx: u64,
+	/// The starting slot of the epoch.
+	pub start_slot: Slot,
+	/// Slot duration in milliseconds.
+	pub slot_duration: SlotDuration,
+	/// Duration of epoch in slots.
+	pub epoch_duration: u64,
+	/// Authorities for the epoch.
+	pub authorities: Vec<AuthorityId>,
+	/// Randomness for the epoch.
+	pub randomness: Randomness,
+	/// Epoch configuration.
+	pub config: EpochConfiguration,
+}
+
+/// An opaque type used to represent the key ownership proof at the runtime API boundary.
+///
+/// The inner value is an encoded representation of the actual key ownership proof which will be
+/// parameterized when defining the runtime. At the runtime API boundary this type is unknown and
+/// as such we keep this opaque representation, implementors of the runtime API will have to make
+/// sure that all usages of `OpaqueKeyOwnershipProof` refer to the same type.
+#[derive(Decode, Encode, PartialEq, TypeInfo)]
+#[repr(transparent)]
+pub struct OpaqueKeyOwnershipProof(Vec<u8>);
+
+// Runtime API.
+sp_api::decl_runtime_apis! {
+	/// API necessary for block authorship with Sassafras.
+	pub trait SassafrasApi {
+		/// Get ring context to be used for ticket construction and verification.
+		fn ring_context() -> Option<vrf::RingContext>;
+
+		/// Submit next epoch validator tickets via an unsigned extrinsic.
+		/// This method returns `false` when creation of the extrinsics fails.
+		fn submit_tickets_unsigned_extrinsic(tickets: Vec<TicketEnvelope>) -> bool;
+
+		/// Get ticket id associated to the given slot.
+		fn slot_ticket_id(slot: Slot) -> Option<TicketId>;
+
+		/// Get ticket id and data associated to the given slot.
+		fn slot_ticket(slot: Slot) -> Option<(TicketId, TicketBody)>;
+
+		/// Current epoch information.
+		fn current_epoch() -> Epoch;
+
+		/// Next epoch information.
+		fn next_epoch() -> Epoch;
+
+		/// Generates a proof of key ownership for the given authority in the current epoch.
+		///
+		/// An example usage of this module is coupled with the session historical module to prove
+		/// that a given authority key is tied to a given staking identity during a specific
+		/// session.
+		///
+		/// Proofs of key ownership are necessary for submitting equivocation reports.
+		fn generate_key_ownership_proof(authority_id: AuthorityId) -> Option<OpaqueKeyOwnershipProof>;
+
+		/// Submits an unsigned extrinsic to report an equivocation.
+		///
+		/// The caller must provide the equivocation proof and a key ownership proof (should be
+		/// obtained using `generate_key_ownership_proof`). The extrinsic will be unsigned and
+		/// should only be accepted for local authorship (not to be broadcast to the network). This
+		/// method returns `false` when creation of the extrinsic fails.
+		///
+		/// Only useful in an offchain context.
+		fn submit_report_equivocation_unsigned_extrinsic(
+			equivocation_proof: EquivocationProof<Block::Header>,
+			key_owner_proof: OpaqueKeyOwnershipProof,
+		) -> bool;
+	}
+}
diff --git a/substrate/primitives/consensus/sassafras/src/ticket.rs b/substrate/primitives/consensus/sassafras/src/ticket.rs
new file mode 100644
index 0000000000000000000000000000000000000000..d81770c96d9bbec9dc8a625e048173d705a9f7cb
--- /dev/null
+++ b/substrate/primitives/consensus/sassafras/src/ticket.rs
@@ -0,0 +1,91 @@
+// 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.
+
+//! Primitives related to tickets.
+
+use crate::vrf::RingVrfSignature;
+use scale_codec::{Decode, Encode, MaxEncodedLen};
+use scale_info::TypeInfo;
+
+pub use sp_core::ed25519::{Public as EphemeralPublic, Signature as EphemeralSignature};
+
+/// Ticket identifier.
+///
+/// Its value is the output of a VRF whose inputs cannot be controlled by the
+/// ticket's creator (refer to [`crate::vrf::ticket_id_input`] parameters).
+/// Because of this, it is also used as the ticket score to compare against
+/// the epoch ticket's threshold to decide if the ticket is worth being considered
+/// for slot assignment (refer to [`ticket_id_threshold`]).
+pub type TicketId = u128;
+
+/// Ticket data persisted on-chain.
+#[derive(Debug, Clone, PartialEq, Eq, Encode, Decode, MaxEncodedLen, TypeInfo)]
+pub struct TicketBody {
+	/// Attempt index.
+	pub attempt_idx: u32,
+	/// Ephemeral public key which gets erased when the ticket is claimed.
+	pub erased_public: EphemeralPublic,
+	/// Ephemeral public key which gets exposed when the ticket is claimed.
+	pub revealed_public: EphemeralPublic,
+}
+
+/// Ticket ring vrf signature.
+pub type TicketSignature = RingVrfSignature;
+
+/// Ticket envelope used on during submission.
+#[derive(Debug, Clone, PartialEq, Eq, Encode, Decode, MaxEncodedLen, TypeInfo)]
+pub struct TicketEnvelope {
+	/// Ticket body.
+	pub body: TicketBody,
+	/// Ring signature.
+	pub signature: TicketSignature,
+}
+
+/// Ticket claim information filled by the block author.
+#[derive(Debug, Clone, PartialEq, Eq, Encode, Decode, MaxEncodedLen, TypeInfo)]
+pub struct TicketClaim {
+	/// Signature verified via `TicketBody::erased_public`.
+	pub erased_signature: EphemeralSignature,
+}
+
+/// Computes ticket-id maximum allowed value for a given epoch.
+///
+/// Only ticket identifiers below this threshold should be considered for slot
+/// assignment.
+///
+/// The value is computed as `TicketId::MAX*(redundancy*slots)/(attempts*validators)`
+///
+/// Where:
+/// - `redundancy`: redundancy factor;
+/// - `slots`: number of slots in epoch;
+/// - `attempts`: max number of tickets attempts per validator;
+/// - `validators`: number of validators in epoch.
+///
+/// If `attempts * validators = 0` then we return 0.
+pub fn ticket_id_threshold(
+	redundancy: u32,
+	slots: u32,
+	attempts: u32,
+	validators: u32,
+) -> TicketId {
+	let den = attempts as u64 * validators as u64;
+	let num = redundancy as u64 * slots as u64;
+	TicketId::max_value()
+		.checked_div(den.into())
+		.unwrap_or_default()
+		.saturating_mul(num.into())
+}
diff --git a/substrate/primitives/consensus/sassafras/src/vrf.rs b/substrate/primitives/consensus/sassafras/src/vrf.rs
new file mode 100644
index 0000000000000000000000000000000000000000..d25a656f9508f7090755af20cfa0418b5954015e
--- /dev/null
+++ b/substrate/primitives/consensus/sassafras/src/vrf.rs
@@ -0,0 +1,104 @@
+// 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.
+
+//! Utilities related to VRF input, output and signatures.
+
+use crate::{Randomness, TicketBody, TicketId};
+use scale_codec::Encode;
+use sp_consensus_slots::Slot;
+use sp_std::vec::Vec;
+
+pub use sp_core::bandersnatch::{
+	ring_vrf::{RingContext, RingProver, RingVerifier, RingVrfSignature},
+	vrf::{VrfInput, VrfOutput, VrfSignData, VrfSignature},
+};
+
+fn vrf_input_from_data(
+	domain: &[u8],
+	data: impl IntoIterator<Item = impl AsRef<[u8]>>,
+) -> VrfInput {
+	let buf = data.into_iter().fold(Vec::new(), |mut buf, item| {
+		let bytes = item.as_ref();
+		buf.extend_from_slice(bytes);
+		let len = u8::try_from(bytes.len()).expect("private function with well known inputs; qed");
+		buf.push(len);
+		buf
+	});
+	VrfInput::new(domain, buf)
+}
+
+/// VRF input to claim slot ownership during block production.
+pub fn slot_claim_input(randomness: &Randomness, slot: Slot, epoch: u64) -> VrfInput {
+	vrf_input_from_data(
+		b"sassafras-claim-v1.0",
+		[randomness.as_slice(), &slot.to_le_bytes(), &epoch.to_le_bytes()],
+	)
+}
+
+/// Signing-data to claim slot ownership during block production.
+pub fn slot_claim_sign_data(randomness: &Randomness, slot: Slot, epoch: u64) -> VrfSignData {
+	let input = slot_claim_input(randomness, slot, epoch);
+	VrfSignData::new_unchecked(
+		b"sassafras-slot-claim-transcript-v1.0",
+		Option::<&[u8]>::None,
+		Some(input),
+	)
+}
+
+/// VRF input to generate the ticket id.
+pub fn ticket_id_input(randomness: &Randomness, attempt: u32, epoch: u64) -> VrfInput {
+	vrf_input_from_data(
+		b"sassafras-ticket-v1.0",
+		[randomness.as_slice(), &attempt.to_le_bytes(), &epoch.to_le_bytes()],
+	)
+}
+
+/// VRF input to generate the revealed key.
+pub fn revealed_key_input(randomness: &Randomness, attempt: u32, epoch: u64) -> VrfInput {
+	vrf_input_from_data(
+		b"sassafras-revealed-v1.0",
+		[randomness.as_slice(), &attempt.to_le_bytes(), &epoch.to_le_bytes()],
+	)
+}
+
+/// Data to be signed via ring-vrf.
+pub fn ticket_body_sign_data(ticket_body: &TicketBody, ticket_id_input: VrfInput) -> VrfSignData {
+	VrfSignData::new_unchecked(
+		b"sassafras-ticket-body-transcript-v1.0",
+		Some(ticket_body.encode().as_slice()),
+		Some(ticket_id_input),
+	)
+}
+
+/// Make ticket-id from the given VRF input and output.
+///
+/// Input should have been obtained via [`ticket_id_input`].
+/// Output should have been obtained from the input directly using the vrf secret key
+/// or from the vrf signature outputs.
+pub fn make_ticket_id(input: &VrfInput, output: &VrfOutput) -> TicketId {
+	let bytes = output.make_bytes::<16>(b"ticket-id", input);
+	u128::from_le_bytes(bytes)
+}
+
+/// Make revealed key seed from a given VRF input and ouput.
+///
+/// Input should have been obtained via [`revealed_key_input`].
+/// Output should have been obtained from the input directly using the vrf secret key
+/// or from the vrf signature outputs.
+pub fn make_revealed_key_seed(input: &VrfInput, output: &VrfOutput) -> [u8; 32] {
+	output.make_bytes::<32>(b"revealed-seed", input)
+}
diff --git a/substrate/primitives/consensus/slots/Cargo.toml b/substrate/primitives/consensus/slots/Cargo.toml
index aae9fa354bb50d64a02edde7257c55c8cacf95e6..faf5a9ee956e47a13572d6b1b89c60745a96a6aa 100644
--- a/substrate/primitives/consensus/slots/Cargo.toml
+++ b/substrate/primitives/consensus/slots/Cargo.toml
@@ -1,12 +1,12 @@
 [package]
 name = "sp-consensus-slots"
 version = "0.10.0-dev"
-authors = ["Parity Technologies <admin@parity.io>"]
+authors.workspace = true
 description = "Primitives for slots-based consensus"
-edition = "2021"
+edition.workspace = true
 license = "Apache-2.0"
 homepage = "https://substrate.io"
-repository = "https://github.com/paritytech/substrate/"
+repository.workspace = true
 readme = "README.md"
 
 [package.metadata.docs.rs]
diff --git a/substrate/primitives/consensus/slots/README.md b/substrate/primitives/consensus/slots/README.md
index f451c32888a47843c1f679a17d8db06d23811272..3052131721ad8deb1ab73f5fc98e89cec4f24761 100644
--- a/substrate/primitives/consensus/slots/README.md
+++ b/substrate/primitives/consensus/slots/README.md
@@ -1,3 +1,3 @@
 Primitives for slots-based consensus engines.
 
-License: Apache-2.0
\ No newline at end of file
+License: Apache-2.0
diff --git a/substrate/primitives/consensus/slots/src/lib.rs b/substrate/primitives/consensus/slots/src/lib.rs
index 30bb42e2c7589094147f6ba2732e8c587c106302..a299ce395ea4fa79dd95bd2b9b9446e537983dd1 100644
--- a/substrate/primitives/consensus/slots/src/lib.rs
+++ b/substrate/primitives/consensus/slots/src/lib.rs
@@ -24,7 +24,7 @@ use scale_info::TypeInfo;
 use sp_timestamp::Timestamp;
 
 /// Unit type wrapper that represents a slot.
-#[derive(Debug, Encode, MaxEncodedLen, Decode, Eq, Clone, Copy, Default, Ord, TypeInfo)]
+#[derive(Debug, Encode, MaxEncodedLen, Decode, Eq, Clone, Copy, Default, Ord, Hash, TypeInfo)]
 #[cfg_attr(feature = "serde", derive(serde::Serialize, serde::Deserialize))]
 pub struct Slot(u64);
 
@@ -44,6 +44,26 @@ impl core::ops::Add for Slot {
 	}
 }
 
+impl core::ops::Sub for Slot {
+	type Output = Self;
+
+	fn sub(self, other: Self) -> Self {
+		Self(self.0 - other.0)
+	}
+}
+
+impl core::ops::AddAssign for Slot {
+	fn add_assign(&mut self, rhs: Self) {
+		self.0 += rhs.0
+	}
+}
+
+impl core::ops::SubAssign for Slot {
+	fn sub_assign(&mut self, rhs: Self) {
+		self.0 -= rhs.0
+	}
+}
+
 impl core::ops::Add<u64> for Slot {
 	type Output = Self;
 
diff --git a/substrate/primitives/core/Cargo.toml b/substrate/primitives/core/Cargo.toml
index 12360472a4e4b7f22b8cc229dc3822240f60af52..b9607eadb583e6b54324a8270c4770866614763d 100644
--- a/substrate/primitives/core/Cargo.toml
+++ b/substrate/primitives/core/Cargo.toml
@@ -1,11 +1,11 @@
 [package]
 name = "sp-core"
 version = "21.0.0"
-authors = ["Parity Technologies <admin@parity.io>"]
-edition = "2021"
+authors.workspace = true
+edition.workspace = true
 license = "Apache-2.0"
 homepage = "https://substrate.io"
-repository = "https://github.com/paritytech/substrate/"
+repository.workspace = true
 description = "Shareable Substrate types."
 documentation = "https://docs.rs/sp-core"
 
@@ -13,17 +13,16 @@ documentation = "https://docs.rs/sp-core"
 targets = ["x86_64-unknown-linux-gnu"]
 
 [dependencies]
-arrayvec = { version = "0.7.2", default-features = false }
 codec = { package = "parity-scale-codec", version = "3.6.1", default-features = false, features = ["derive","max-encoded-len"] }
 scale-info = { version = "2.5.0", default-features = false, features = ["derive"] }
 log = { version = "0.4.17", default-features = false }
-serde = { version = "1.0.163", optional = true,  default-features = false, features = ["derive", "alloc"] }
+serde = { version = "1.0.188", optional = true,  default-features = false, features = ["derive", "alloc"] }
 bounded-collections = { version = "0.1.8", default-features = false }
 primitive-types = { version = "0.12.0", default-features = false, features = ["codec", "scale-info"] }
 impl-serde = { version = "0.4.0", default-features = false, optional = true }
 hash-db = { version = "0.16.0", default-features = false }
 hash256-std-hasher = { version = "0.15.2", default-features = false }
-bs58 = { version = "0.4.0", default-features = false, optional = true }
+bs58 = { version = "0.5.0", default-features = false, optional = true }
 rand = { version = "0.8.5", features = ["small_rng"],  optional = true }
 substrate-bip39 = { version = "0.4.4", optional = true }
 tiny-bip39 = { version = "1.0.0", optional = true }
@@ -39,7 +38,7 @@ sp-storage = { path = "../storage", default-features = false}
 sp-externalities = { path = "../externalities", optional = true}
 futures = { version = "0.3.21", optional = true }
 dyn-clonable = { version = "0.9.0", optional = true }
-thiserror = { version = "1.0.30", optional = true }
+thiserror = { version = "1.0.48", optional = true }
 tracing = { version = "0.1.29", optional = true }
 bitflags = "1.3"
 paste = "1.0.7"
@@ -58,7 +57,7 @@ sp-runtime-interface = { path = "../runtime-interface", default-features = false
 # bls crypto
 w3f-bls = { version = "0.1.3", default-features = false, optional = true}
 # bandersnatch crypto
-bandersnatch_vrfs = { git = "https://github.com/w3f/ring-vrf", rev = "c86ebd4", default-features = false, optional = true }
+bandersnatch_vrfs = { git = "https://github.com/w3f/ring-vrf", rev = "4b09416", default-features = false, optional = true }
 
 [dev-dependencies]
 criterion = "0.4.0"
@@ -76,7 +75,6 @@ bench = false
 default = [ "std" ]
 std = [
 	"array-bytes",
-	"arrayvec/std",
 	"bandersnatch_vrfs/getrandom",
 	"blake2/std",
 	"bounded-collections/std",
diff --git a/substrate/primitives/core/benches/bench.rs b/substrate/primitives/core/benches/bench.rs
index e91c1758c3cbb070ea455f6d1bd4b0baeb4a85aa..ffca819b638e56fd329a3184b962ae568bae9102 100644
--- a/substrate/primitives/core/benches/bench.rs
+++ b/substrate/primitives/core/benches/bench.rs
@@ -1,4 +1,4 @@
-// Copyright Parity Technologies (UK) Ltd.
+// Copyright (C) Parity Technologies (UK) Ltd.
 //
 // Licensed under the Apache License, Version 2.0 (the "License");
 // you may not use this file except in compliance with the License.
diff --git a/substrate/primitives/core/hashing/Cargo.toml b/substrate/primitives/core/hashing/Cargo.toml
index a4ddb6363f774d643b124ec6846c4761c6c1792d..bd22bd79e7d5f83efdc20640bc01d5dd7933add2 100644
--- a/substrate/primitives/core/hashing/Cargo.toml
+++ b/substrate/primitives/core/hashing/Cargo.toml
@@ -1,11 +1,11 @@
 [package]
 name = "sp-core-hashing"
 version = "9.0.0"
-authors = ["Parity Technologies <admin@parity.io>"]
-edition = "2021"
+authors.workspace = true
+edition.workspace = true
 license = "Apache-2.0"
 homepage = "https://substrate.io"
-repository = "https://github.com/paritytech/substrate/"
+repository.workspace = true
 description = "Primitive core crate hashing implementation."
 documentation = "https://docs.rs/sp-core-hashing"
 
diff --git a/substrate/primitives/core/hashing/proc-macro/Cargo.toml b/substrate/primitives/core/hashing/proc-macro/Cargo.toml
index ffb546b07153095a41f3e8ccf650cc08e6def759..187b5559b931c27df9613b33232426fe77fe8bf0 100644
--- a/substrate/primitives/core/hashing/proc-macro/Cargo.toml
+++ b/substrate/primitives/core/hashing/proc-macro/Cargo.toml
@@ -1,11 +1,11 @@
 [package]
 name = "sp-core-hashing-proc-macro"
 version = "9.0.0"
-authors = ["Parity Technologies <admin@parity.io>"]
-edition = "2021"
+authors.workspace = true
+edition.workspace = true
 license = "Apache-2.0"
 homepage = "https://substrate.io"
-repository = "https://github.com/paritytech/substrate/"
+repository.workspace = true
 description = "This crate provides procedural macros for calculating static hash."
 documentation = "https://docs.rs/sp-core-hashing-proc-macro"
 
@@ -17,5 +17,5 @@ proc-macro = true
 
 [dependencies]
 quote = "1.0.28"
-syn = { version = "2.0.16", features = ["full", "parsing"] }
+syn = { version = "2.0.38", features = ["full", "parsing"] }
 sp-core-hashing = { path = "..", default-features = false}
diff --git a/substrate/primitives/core/src/bandersnatch.rs b/substrate/primitives/core/src/bandersnatch.rs
index c3ba7f41058e96eda10c13cf847c9137a5dcba38..78b7f12f9ffd4c5ce9faacb6990f80e091994cf7 100644
--- a/substrate/primitives/core/src/bandersnatch.rs
+++ b/substrate/primitives/core/src/bandersnatch.rs
@@ -18,7 +18,7 @@
 //! VRFs backed by [Bandersnatch](https://neuromancer.sk/std/bls/Bandersnatch),
 //! an elliptic curve built over BLS12-381 scalar field.
 //!
-//! The primitive can operate both as a traditional VRF or as an anonymized ring VRF.
+//! The primitive can operate both as a regular VRF or as an anonymized Ring VRF.
 
 #[cfg(feature = "std")]
 use crate::crypto::Ss58Codec;
@@ -31,7 +31,7 @@ use crate::crypto::{DeriveError, DeriveJunction, Pair as TraitPair, SecretString
 use bandersnatch_vrfs::CanonicalSerialize;
 #[cfg(feature = "full_crypto")]
 use bandersnatch_vrfs::SecretKey;
-use codec::{Decode, Encode, MaxEncodedLen};
+use codec::{Decode, Encode, EncodeLike, MaxEncodedLen};
 use scale_info::TypeInfo;
 
 use sp_runtime_interface::pass_by::PassByInner;
@@ -42,7 +42,7 @@ pub const CRYPTO_ID: CryptoTypeId = CryptoTypeId(*b"band");
 
 /// Context used to produce a plain signature without any VRF input/output.
 #[cfg(feature = "full_crypto")]
-pub const SIGNING_CTX: &[u8] = b"SigningContext";
+pub const SIGNING_CTX: &[u8] = b"BandersnatchSigningContext";
 
 // Max ring domain size.
 const RING_DOMAIN_SIZE: usize = 1024;
@@ -53,23 +53,14 @@ const SEED_SERIALIZED_LEN: usize = 32;
 // Short-Weierstrass form serialized sizes.
 const PUBLIC_SERIALIZED_LEN: usize = 33;
 const SIGNATURE_SERIALIZED_LEN: usize = 65;
+const RING_SIGNATURE_SERIALIZED_LEN: usize = 755;
 const PREOUT_SERIALIZED_LEN: usize = 33;
-const PEDERSEN_SIGNATURE_SERIALIZED_LEN: usize = 163;
-const RING_PROOF_SERIALIZED_LEN: usize = 592;
 
 // Max size of serialized ring-vrf context params.
 //
 // This size is dependent on the ring domain size and the actual value
 // is equal to the SCALE encoded size of the `KZG` backend.
-//
-// Some values:
-//  ring_size → ~serialized_size
-//   512        →  74 KB
-//  1024        → 147 KB
-//  2048        → 295 KB
-// NOTE: This is quite big but looks like there is an upcoming fix
-// in the backend.
-const RING_CONTEXT_SERIALIZED_LEN: usize = 147752;
+const RING_CONTEXT_SERIALIZED_LEN: usize = 147716;
 
 /// Bandersnatch public key.
 #[cfg_attr(feature = "full_crypto", derive(Hash))]
@@ -153,7 +144,8 @@ impl sp_std::fmt::Debug for Public {
 
 /// Bandersnatch signature.
 ///
-/// The signature is created via the [`VrfSecret::vrf_sign`] using [`SIGNING_CTX`] as `label`.
+/// The signature is created via the [`VrfSecret::vrf_sign`] using [`SIGNING_CTX`] as transcript
+/// `label`.
 #[cfg_attr(feature = "full_crypto", derive(Hash))]
 #[derive(Clone, Copy, PartialEq, Eq, Encode, Decode, PassByInner, MaxEncodedLen, TypeInfo)]
 pub struct Signature([u8; SIGNATURE_SERIALIZED_LEN]);
@@ -238,7 +230,7 @@ impl TraitPair for Pair {
 
 	/// Make a new key pair from secret seed material.
 	///
-	/// The slice must be 64 bytes long or it will return an error.
+	/// The slice must be 32 bytes long or it will return an error.
 	fn from_seed_slice(seed_slice: &[u8]) -> Result<Pair, SecretStringError> {
 		if seed_slice.len() != SEED_SERIALIZED_LEN {
 			return Err(SecretStringError::InvalidSeedLength)
@@ -272,33 +264,34 @@ impl TraitPair for Pair {
 		Ok((Self::from_seed(&seed), Some(seed)))
 	}
 
-	/// Get the public key.
 	fn public(&self) -> Public {
 		let public = self.secret.to_public();
 		let mut raw = [0; PUBLIC_SERIALIZED_LEN];
 		public
 			.serialize_compressed(raw.as_mut_slice())
-			.expect("key buffer length is good; qed");
+			.expect("serialization length is constant and checked by test; qed");
 		Public::unchecked_from(raw)
 	}
 
-	/// Sign raw data.
+	/// Sign a message.
+	///
+	/// In practice this produce a Schnorr signature of a transcript composed by
+	/// the constant label [`SIGNING_CTX`] and `data` without any additional data.
+	///
+	/// See [`vrf::VrfSignData`] for additional details.
 	fn sign(&self, data: &[u8]) -> Signature {
 		let data = vrf::VrfSignData::new_unchecked(SIGNING_CTX, &[data], None);
 		self.vrf_sign(&data).signature
 	}
 
-	/// Verify a signature on a message.
-	///
-	/// Returns `true` if the signature is good.
 	fn verify<M: AsRef<[u8]>>(signature: &Signature, data: M, public: &Public) -> bool {
 		let data = vrf::VrfSignData::new_unchecked(SIGNING_CTX, &[data.as_ref()], None);
 		let signature =
-			vrf::VrfSignature { signature: *signature, vrf_outputs: vrf::VrfIosVec::default() };
+			vrf::VrfSignature { signature: *signature, outputs: vrf::VrfIosVec::default() };
 		public.vrf_verify(&data, &signature)
 	}
 
-	/// Return a vector filled with seed raw data.
+	/// Return a vector filled with the seed (32 bytes).
 	fn to_raw_vec(&self) -> Vec<u8> {
 		self.seed().to_vec()
 	}
@@ -319,7 +312,8 @@ pub mod vrf {
 	};
 
 	/// Max number of inputs/outputs which can be handled by the VRF signing procedures.
-	/// The number is quite arbitrary and fullfils the current usage of the primitive.
+	///
+	/// The number is quite arbitrary and chosen to fulfill the use cases found so far.
 	/// If required it can be extended in the future.
 	pub const MAX_VRF_IOS: u32 = 3;
 
@@ -328,7 +322,7 @@ pub mod vrf {
 	/// Can contain at most [`MAX_VRF_IOS`] elements.
 	pub type VrfIosVec<T> = BoundedVec<T, ConstU32<MAX_VRF_IOS>>;
 
-	/// VRF input to construct a [`VrfOutput`] instance and embeddable within [`VrfSignData`].
+	/// VRF input to construct a [`VrfOutput`] instance and embeddable in [`VrfSignData`].
 	#[derive(Clone, Debug)]
 	pub struct VrfInput(pub(super) bandersnatch_vrfs::VrfInput);
 
@@ -342,7 +336,9 @@ pub mod vrf {
 
 	/// VRF (pre)output derived from [`VrfInput`] using a [`VrfSecret`].
 	///
-	/// This is used to produce an arbitrary number of verifiable *random* bytes.
+	/// This object is used to produce an arbitrary number of verifiable pseudo random
+	/// bytes and is often called pre-output to emphasize that this is not the actual
+	/// output of the VRF but an object capable of generating the output.
 	#[derive(Clone, Debug, PartialEq, Eq)]
 	pub struct VrfOutput(pub(super) bandersnatch_vrfs::VrfPreOut);
 
@@ -351,7 +347,7 @@ pub mod vrf {
 			let mut bytes = [0; PREOUT_SERIALIZED_LEN];
 			self.0
 				.serialize_compressed(bytes.as_mut_slice())
-				.expect("preout serialization can't fail");
+				.expect("serialization length is constant and checked by test; qed");
 			bytes.encode()
 		}
 	}
@@ -379,92 +375,102 @@ pub mod vrf {
 		}
 	}
 
-	/// A *Fiat-Shamir* transcript and a sequence of [`VrfInput`]s ready to be signed.
+	/// Data to be signed via one of the two provided vrf flavors.
 	///
-	/// The `transcript` will be used as messages for the *Fiat-Shamir*
-	/// transform part of the scheme. This data keeps the signature secure
-	/// but doesn't contribute to the actual VRF output. If unsure just give
-	/// it a unique label depending on the actual usage of the signing data.
+	/// The object contains a transcript and a sequence of [`VrfInput`]s ready to be signed.
 	///
-	/// The `vrf_inputs` is a sequence of [`VrfInput`]s to be signed and which
-	/// are used to construct the [`VrfOutput`]s in the signature.
+	/// The `transcript` summarizes a set of messages which are defining a particular
+	/// protocol by automating the Fiat-Shamir transform for challenge generation.
+	/// A good explaination of the topic can be found in Merlin [docs](https://merlin.cool/)
+	///
+	/// The `inputs` is a sequence of [`VrfInput`]s which, during the signing procedure, are
+	/// first transformed to [`VrfOutput`]s. Both inputs and outputs are then appended to
+	/// the transcript before signing the Fiat-Shamir transform result (the challenge).
+	///
+	/// In practice, as a user, all these technical details can be easily ignored.
+	/// What is important to remember is:
+	/// - *Transcript* is an object defining the protocol and used to produce the signature. This
+	///   object doesn't influence the `VrfOutput`s values.
+	/// - *Vrf inputs* is some additional data which is used to produce *vrf outputs*. This data
+	///   will contribute to the signature as well.
 	#[derive(Clone)]
 	pub struct VrfSignData {
 		/// VRF inputs to be signed.
-		pub vrf_inputs: VrfIosVec<VrfInput>,
-		/// Associated Fiat-Shamir transcript.
+		pub inputs: VrfIosVec<VrfInput>,
+		/// Associated protocol transcript.
 		pub transcript: Transcript,
 	}
 
 	impl VrfSignData {
 		/// Construct a new data to be signed.
 		///
-		/// The `transcript_data` is used to construct the *Fiat-Shamir* `Transcript`.
-		/// Fails if the `vrf_inputs` yields more elements than [`MAX_VRF_IOS`]
+		/// Fails if the `inputs` iterator yields more elements than [`MAX_VRF_IOS`]
 		///
-		/// Refer to the [`VrfSignData`] for more details about the usage of
-		/// `transcript_data` and `vrf_inputs`
+		/// Refer to [`VrfSignData`] for details about transcript and inputs.
 		pub fn new(
-			label: &'static [u8],
+			transcript_label: &'static [u8],
 			transcript_data: impl IntoIterator<Item = impl AsRef<[u8]>>,
-			vrf_inputs: impl IntoIterator<Item = VrfInput>,
+			inputs: impl IntoIterator<Item = VrfInput>,
 		) -> Result<Self, ()> {
-			let vrf_inputs: Vec<VrfInput> = vrf_inputs.into_iter().collect();
-			if vrf_inputs.len() > MAX_VRF_IOS as usize {
+			let inputs: Vec<VrfInput> = inputs.into_iter().collect();
+			if inputs.len() > MAX_VRF_IOS as usize {
 				return Err(())
 			}
-			Ok(Self::new_unchecked(label, transcript_data, vrf_inputs))
+			Ok(Self::new_unchecked(transcript_label, transcript_data, inputs))
 		}
 
 		/// Construct a new data to be signed.
 		///
-		/// The `transcript_data` is used to construct the *Fiat-Shamir* `Transcript`.
-		/// At most the first [`MAX_VRF_IOS`] elements of `vrf_inputs` are used.
+		/// At most the first [`MAX_VRF_IOS`] elements of `inputs` are used.
 		///
-		/// Refer to the [`VrfSignData`] for more details about the usage of
-		/// `transcript_data` and `vrf_inputs`
+		/// Refer to [`VrfSignData`] for details about transcript and inputs.
 		pub fn new_unchecked(
-			label: &'static [u8],
+			transcript_label: &'static [u8],
 			transcript_data: impl IntoIterator<Item = impl AsRef<[u8]>>,
-			vrf_inputs: impl IntoIterator<Item = VrfInput>,
+			inputs: impl IntoIterator<Item = VrfInput>,
 		) -> Self {
-			let vrf_inputs: Vec<VrfInput> = vrf_inputs.into_iter().collect();
-			let vrf_inputs = VrfIosVec::truncate_from(vrf_inputs);
-			let mut transcript = Transcript::new_labeled(label);
-			transcript_data
-				.into_iter()
-				.for_each(|data| transcript.append_slice(data.as_ref()));
-			VrfSignData { transcript, vrf_inputs }
+			let inputs: Vec<VrfInput> = inputs.into_iter().collect();
+			let inputs = VrfIosVec::truncate_from(inputs);
+			let mut transcript = Transcript::new_labeled(transcript_label);
+			transcript_data.into_iter().for_each(|data| transcript.append(data.as_ref()));
+			VrfSignData { transcript, inputs }
 		}
 
-		/// Append a raw message to the transcript.
+		/// Append a message to the transcript.
 		pub fn push_transcript_data(&mut self, data: &[u8]) {
-			self.transcript.append_slice(data);
+			self.transcript.append(data);
 		}
 
-		/// Append a [`VrfInput`] to the vrf inputs to be signed.
+		/// Tries to append a [`VrfInput`] to the vrf inputs list.
 		///
-		/// On failure, gives back the [`VrfInput`] parameter.
-		pub fn push_vrf_input(&mut self, vrf_input: VrfInput) -> Result<(), VrfInput> {
-			self.vrf_inputs.try_push(vrf_input)
+		/// On failure, returns back the [`VrfInput`] parameter.
+		pub fn push_vrf_input(&mut self, input: VrfInput) -> Result<(), VrfInput> {
+			self.inputs.try_push(input)
 		}
 
-		/// Create challenge from the transcript contained within the signing data.
+		/// Get the challenge associated to the `transcript` contained within the signing data.
+		///
+		/// Ignores the vrf inputs and outputs.
 		pub fn challenge<const N: usize>(&self) -> [u8; N] {
 			let mut output = [0; N];
 			let mut transcript = self.transcript.clone();
-			let mut reader = transcript.challenge(b"Prehashed for bandersnatch");
+			let mut reader = transcript.challenge(b"bandersnatch challenge");
 			reader.read_bytes(&mut output);
 			output
 		}
 	}
 
 	/// VRF signature.
+	///
+	/// Includes both the transcript `signature` and the `outputs` generated from the
+	/// [`VrfSignData::inputs`].
+	///
+	/// Refer to [`VrfSignData`] for more details.
 	#[derive(Clone, Debug, PartialEq, Eq, Encode, Decode, MaxEncodedLen, TypeInfo)]
 	pub struct VrfSignature {
 		/// VRF (pre)outputs.
-		pub vrf_outputs: VrfIosVec<VrfOutput>,
-		/// VRF signature.
+		pub outputs: VrfIosVec<VrfOutput>,
+		/// Transcript signature.
 		pub signature: Signature,
 	}
 
@@ -481,7 +487,7 @@ pub mod vrf {
 		fn vrf_sign(&self, data: &Self::VrfSignData) -> Self::VrfSignature {
 			const _: () = assert!(MAX_VRF_IOS == 3, "`MAX_VRF_IOS` expected to be 3");
 			// Workaround to overcome backend signature generic over the number of IOs.
-			match data.vrf_inputs.len() {
+			match data.inputs.len() {
 				0 => self.vrf_sign_gen::<0>(data),
 				1 => self.vrf_sign_gen::<1>(data),
 				2 => self.vrf_sign_gen::<2>(data),
@@ -491,7 +497,7 @@ pub mod vrf {
 		}
 
 		fn vrf_output(&self, input: &Self::VrfInput) -> Self::VrfOutput {
-			let output = self.secret.0.vrf_preout(&input.0);
+			let output = self.secret.vrf_preout(&input.0);
 			VrfOutput(output)
 		}
 	}
@@ -506,12 +512,12 @@ pub mod vrf {
 	impl VrfPublic for Public {
 		fn vrf_verify(&self, data: &Self::VrfSignData, signature: &Self::VrfSignature) -> bool {
 			const _: () = assert!(MAX_VRF_IOS == 3, "`MAX_VRF_IOS` expected to be 3");
-			let preouts_len = signature.vrf_outputs.len();
-			if preouts_len != data.vrf_inputs.len() {
+			let outputs_len = signature.outputs.len();
+			if outputs_len != data.inputs.len() {
 				return false
 			}
 			// Workaround to overcome backend signature generic over the number of IOs.
-			match preouts_len {
+			match outputs_len {
 				0 => self.vrf_verify_gen::<0>(data, signature),
 				1 => self.vrf_verify_gen::<1>(data, signature),
 				2 => self.vrf_verify_gen::<2>(data, signature),
@@ -524,24 +530,23 @@ pub mod vrf {
 	#[cfg(feature = "full_crypto")]
 	impl Pair {
 		fn vrf_sign_gen<const N: usize>(&self, data: &VrfSignData) -> VrfSignature {
-			let ios: Vec<_> = data
-				.vrf_inputs
-				.iter()
-				.map(|i| self.secret.clone().0.vrf_inout(i.0.clone()))
-				.collect();
+			let ios = core::array::from_fn(|i| self.secret.vrf_inout(data.inputs[i].0));
 
-			let signature: ThinVrfSignature<N> =
-				self.secret.sign_thin_vrf(data.transcript.clone(), ios.as_slice());
+			let thin_signature: ThinVrfSignature<N> =
+				self.secret.sign_thin_vrf(data.transcript.clone(), &ios);
 
-			let mut sign_bytes = [0; SIGNATURE_SERIALIZED_LEN];
-			signature
-				.signature
-				.serialize_compressed(sign_bytes.as_mut_slice())
-				.expect("serialization can't fail");
-
-			let outputs: Vec<_> = signature.preoutputs.into_iter().map(VrfOutput).collect();
+			let outputs: Vec<_> = thin_signature.preouts.into_iter().map(VrfOutput).collect();
 			let outputs = VrfIosVec::truncate_from(outputs);
-			VrfSignature { signature: Signature(sign_bytes), vrf_outputs: outputs }
+
+			let mut signature =
+				VrfSignature { signature: Signature([0; SIGNATURE_SERIALIZED_LEN]), outputs };
+
+			thin_signature
+				.proof
+				.serialize_compressed(signature.signature.0.as_mut_slice())
+				.expect("serialization length is constant and checked by test; qed");
+
+			signature
 		}
 
 		/// Generate an arbitrary number of bytes from the given `context` and VRF `input`.
@@ -551,7 +556,7 @@ pub mod vrf {
 			input: &VrfInput,
 		) -> [u8; N] {
 			let transcript = Transcript::new_labeled(context);
-			let inout = self.secret.clone().0.vrf_inout(input.0.clone());
+			let inout = self.secret.vrf_inout(input.0);
 			inout.vrf_output_bytes(transcript)
 		}
 	}
@@ -566,30 +571,23 @@ pub mod vrf {
 				return false
 			};
 
-			let Ok(preouts) = signature
-				.vrf_outputs
-				.iter()
-				.map(|o| o.0.clone())
-				.collect::<arrayvec::ArrayVec<bandersnatch_vrfs::VrfPreOut, N>>()
-				.into_inner()
-			else {
-				return false
-			};
+			let preouts: [bandersnatch_vrfs::VrfPreOut; N] =
+				core::array::from_fn(|i| signature.outputs[i].0);
 
 			// Deserialize only the proof, the rest has already been deserialized
 			// This is another hack used because backend signature type is generic over
 			// the number of ios.
-			let Ok(signature) =
+			let Ok(proof) =
 				ThinVrfSignature::<0>::deserialize_compressed(signature.signature.as_ref())
-					.map(|s| s.signature)
+					.map(|s| s.proof)
 			else {
 				return false
 			};
-			let signature = ThinVrfSignature { signature, preoutputs: preouts };
+			let signature = ThinVrfSignature { proof, preouts };
 
-			let inputs = data.vrf_inputs.iter().map(|i| i.0.clone());
+			let inputs = data.inputs.iter().map(|i| i.0);
 
-			signature.verify_thin_vrf(data.transcript.clone(), inputs, &public).is_ok()
+			public.verify_thin_vrf(data.transcript.clone(), inputs, &signature).is_ok()
 		}
 	}
 
@@ -601,8 +599,7 @@ pub mod vrf {
 			input: &VrfInput,
 		) -> [u8; N] {
 			let transcript = Transcript::new_labeled(context);
-			let inout =
-				bandersnatch_vrfs::VrfInOut { input: input.0.clone(), preoutput: self.0.clone() };
+			let inout = bandersnatch_vrfs::VrfInOut { input: input.0, preoutput: self.0 };
 			inout.vrf_output_bytes(transcript)
 		}
 	}
@@ -612,7 +609,7 @@ pub mod vrf {
 pub mod ring_vrf {
 	use super::{vrf::*, *};
 	pub use bandersnatch_vrfs::ring::{RingProof, RingProver, RingVerifier, KZG};
-	use bandersnatch_vrfs::{CanonicalDeserialize, PedersenVrfSignature, PublicKey};
+	use bandersnatch_vrfs::{CanonicalDeserialize, PublicKey};
 
 	/// Context used to produce ring signatures.
 	#[derive(Clone)]
@@ -634,7 +631,7 @@ pub mod ring_vrf {
 			let mut pks = Vec::with_capacity(public_keys.len());
 			for public_key in public_keys {
 				let pk = PublicKey::deserialize_compressed(public_key.as_slice()).ok()?;
-				pks.push(pk.0 .0.into());
+				pks.push(pk.0.into());
 			}
 
 			let prover_key = self.0.prover_key(pks);
@@ -647,7 +644,7 @@ pub mod ring_vrf {
 			let mut pks = Vec::with_capacity(public_keys.len());
 			for public_key in public_keys {
 				let pk = PublicKey::deserialize_compressed(public_key.as_slice()).ok()?;
-				pks.push(pk.0 .0.into());
+				pks.push(pk.0.into());
 			}
 
 			let verifier_key = self.0.verifier_key(pks);
@@ -661,7 +658,7 @@ pub mod ring_vrf {
 			let mut buf = Box::new([0; RING_CONTEXT_SERIALIZED_LEN]);
 			self.0
 				.serialize_compressed(buf.as_mut_slice())
-				.expect("preout serialization can't fail");
+				.expect("serialization length is constant and checked by test; qed");
 			buf.encode()
 		}
 	}
@@ -675,6 +672,8 @@ pub mod ring_vrf {
 		}
 	}
 
+	impl EncodeLike for RingContext {}
+
 	impl MaxEncodedLen for RingContext {
 		fn max_encoded_len() -> usize {
 			<[u8; RING_CONTEXT_SERIALIZED_LEN]>::max_encoded_len()
@@ -694,10 +693,8 @@ pub mod ring_vrf {
 	pub struct RingVrfSignature {
 		/// VRF (pre)outputs.
 		pub outputs: VrfIosVec<VrfOutput>,
-		/// Pedersen VRF signature.
-		signature: [u8; PEDERSEN_SIGNATURE_SERIALIZED_LEN],
-		/// Ring proof.
-		ring_proof: [u8; RING_PROOF_SERIALIZED_LEN],
+		/// Ring signature.
+		pub signature: [u8; RING_SIGNATURE_SERIALIZED_LEN],
 	}
 
 	#[cfg(feature = "full_crypto")]
@@ -710,7 +707,7 @@ pub mod ring_vrf {
 		pub fn ring_vrf_sign(&self, data: &VrfSignData, prover: &RingProver) -> RingVrfSignature {
 			const _: () = assert!(MAX_VRF_IOS == 3, "`MAX_VRF_IOS` expected to be 3");
 			// Workaround to overcome backend signature generic over the number of IOs.
-			match data.vrf_inputs.len() {
+			match data.inputs.len() {
 				0 => self.ring_vrf_sign_gen::<0>(data, prover),
 				1 => self.ring_vrf_sign_gen::<1>(data, prover),
 				2 => self.ring_vrf_sign_gen::<2>(data, prover),
@@ -724,31 +721,24 @@ pub mod ring_vrf {
 			data: &VrfSignData,
 			prover: &RingProver,
 		) -> RingVrfSignature {
-			let ios: Vec<_> = data
-				.vrf_inputs
-				.iter()
-				.map(|i| self.secret.clone().0.vrf_inout(i.0.clone()))
-				.collect();
+			let ios = core::array::from_fn(|i| self.secret.vrf_inout(data.inputs[i].0));
 
 			let ring_signature: bandersnatch_vrfs::RingVrfSignature<N> =
-				self.secret.sign_ring_vrf(data.transcript.clone(), ios.as_slice(), prover);
+				bandersnatch_vrfs::RingProver { ring_prover: prover, secret: &self.secret }
+					.sign_ring_vrf(data.transcript.clone(), &ios);
 
-			let outputs: Vec<_> = ring_signature.preoutputs.into_iter().map(VrfOutput).collect();
+			let outputs: Vec<_> = ring_signature.preouts.into_iter().map(VrfOutput).collect();
 			let outputs = VrfIosVec::truncate_from(outputs);
 
-			let mut signature = [0; PEDERSEN_SIGNATURE_SERIALIZED_LEN];
-			ring_signature
-				.signature
-				.serialize_compressed(signature.as_mut_slice())
-				.expect("ped-signature serialization can't fail");
+			let mut signature =
+				RingVrfSignature { outputs, signature: [0; RING_SIGNATURE_SERIALIZED_LEN] };
 
-			let mut ring_proof = [0; RING_PROOF_SERIALIZED_LEN];
 			ring_signature
-				.ring_proof
-				.serialize_compressed(ring_proof.as_mut_slice())
-				.expect("ring-proof serialization can't fail");
+				.proof
+				.serialize_compressed(signature.signature.as_mut_slice())
+				.expect("serialization length is constant and checked by test; qed");
 
-			RingVrfSignature { outputs, signature, ring_proof }
+			signature
 		}
 	}
 
@@ -757,51 +747,45 @@ pub mod ring_vrf {
 		///
 		/// The signature is verifiable if it has been produced by a member of the ring
 		/// from which the [`RingVerifier`] has been constructed.
-		pub fn verify(&self, data: &VrfSignData, verifier: &RingVerifier) -> bool {
+		pub fn ring_vrf_verify(&self, data: &VrfSignData, verifier: &RingVerifier) -> bool {
 			const _: () = assert!(MAX_VRF_IOS == 3, "`MAX_VRF_IOS` expected to be 3");
 			let preouts_len = self.outputs.len();
-			if preouts_len != data.vrf_inputs.len() {
+			if preouts_len != data.inputs.len() {
 				return false
 			}
 			// Workaround to overcome backend signature generic over the number of IOs.
 			match preouts_len {
-				0 => self.verify_gen::<0>(data, verifier),
-				1 => self.verify_gen::<1>(data, verifier),
-				2 => self.verify_gen::<2>(data, verifier),
-				3 => self.verify_gen::<3>(data, verifier),
+				0 => self.ring_vrf_verify_gen::<0>(data, verifier),
+				1 => self.ring_vrf_verify_gen::<1>(data, verifier),
+				2 => self.ring_vrf_verify_gen::<2>(data, verifier),
+				3 => self.ring_vrf_verify_gen::<3>(data, verifier),
 				_ => unreachable!(),
 			}
 		}
 
-		fn verify_gen<const N: usize>(&self, data: &VrfSignData, verifier: &RingVerifier) -> bool {
-			let Ok(preoutputs) = self
-				.outputs
-				.iter()
-				.map(|o| o.0.clone())
-				.collect::<arrayvec::ArrayVec<bandersnatch_vrfs::VrfPreOut, N>>()
-				.into_inner()
-			else {
-				return false
-			};
-
-			let Ok(signature) =
-				PedersenVrfSignature::deserialize_compressed(self.signature.as_slice())
+		fn ring_vrf_verify_gen<const N: usize>(
+			&self,
+			data: &VrfSignData,
+			verifier: &RingVerifier,
+		) -> bool {
+			let Ok(vrf_signature) =
+				bandersnatch_vrfs::RingVrfSignature::<0>::deserialize_compressed(
+					self.signature.as_slice(),
+				)
 			else {
 				return false
 			};
 
-			let Ok(ring_proof) = RingProof::deserialize_compressed(self.ring_proof.as_slice())
-			else {
-				return false
-			};
+			let preouts: [bandersnatch_vrfs::VrfPreOut; N] =
+				core::array::from_fn(|i| self.outputs[i].0);
 
-			let ring_signature =
-				bandersnatch_vrfs::RingVrfSignature { signature, preoutputs, ring_proof };
+			let signature =
+				bandersnatch_vrfs::RingVrfSignature { proof: vrf_signature.proof, preouts };
 
-			let inputs = data.vrf_inputs.iter().map(|i| i.0.clone());
+			let inputs = data.inputs.iter().map(|i| i.0);
 
-			ring_signature
-				.verify_ring_vrf(data.transcript.clone(), inputs, verifier)
+			bandersnatch_vrfs::RingVerifier(verifier)
+				.verify_ring_vrf(data.transcript.clone(), inputs, &signature)
 				.is_ok()
 		}
 	}
@@ -823,16 +807,41 @@ mod tests {
 	}
 
 	#[test]
-	fn assumptions_sanity_check() {
-		// Backend
-		let ring_ctx = RingContext::new_testing();
-		let pair = SecretKey::from_seed(DEV_SEED);
-		let public = pair.to_public();
+	fn backend_assumptions_sanity_check() {
+		let kzg = KZG::testing_kzg_setup([0; 32], RING_DOMAIN_SIZE as u32);
+		assert_eq!(kzg.max_keyset_size(), RING_DOMAIN_SIZE - 257);
+		assert_eq!(kzg.compressed_size(), RING_CONTEXT_SERIALIZED_LEN);
+
+		let pks: Vec<_> = (0..16)
+			.map(|i| SecretKey::from_seed(&[i as u8; 32]).to_public().0.into())
+			.collect();
 
-		assert_eq!(public.0.size_of_serialized(), PUBLIC_SERIALIZED_LEN);
-		assert_eq!(ring_ctx.max_keyset_size(), RING_DOMAIN_SIZE - 257);
+		let secret = SecretKey::from_seed(&[0u8; 32]);
 
-		// Wrapper
+		let public = secret.to_public();
+		assert_eq!(public.compressed_size(), PUBLIC_SERIALIZED_LEN);
+
+		let input = VrfInput::new(b"foo", &[]);
+		let preout = secret.vrf_preout(&input.0);
+		assert_eq!(preout.compressed_size(), PREOUT_SERIALIZED_LEN);
+
+		let prover_key = kzg.prover_key(pks);
+		let ring_prover = kzg.init_ring_prover(prover_key, 0);
+
+		let data = VrfSignData::new_unchecked(b"mydata", &[b"tdata"], None);
+
+		let thin_signature: bandersnatch_vrfs::ThinVrfSignature<0> =
+			secret.sign_thin_vrf(data.transcript.clone(), &[]);
+		assert_eq!(thin_signature.compressed_size(), SIGNATURE_SERIALIZED_LEN);
+
+		let ring_signature: bandersnatch_vrfs::RingVrfSignature<0> =
+			bandersnatch_vrfs::RingProver { ring_prover: &ring_prover, secret: &secret }
+				.sign_ring_vrf(data.transcript.clone(), &[]);
+		assert_eq!(ring_signature.compressed_size(), RING_SIGNATURE_SERIALIZED_LEN);
+	}
+
+	#[test]
+	fn max_vrf_ios_bound_respected() {
 		let inputs: Vec<_> = (0..MAX_VRF_IOS - 1).map(|_| VrfInput::new(b"", &[])).collect();
 		let mut sign_data = VrfSignData::new(b"", &[b""], inputs).unwrap();
 		let res = sign_data.push_vrf_input(VrfInput::new(b"", b""));
@@ -910,11 +919,11 @@ mod tests {
 		let signature = pair.vrf_sign(&data);
 
 		let o10 = pair.make_bytes::<32>(b"ctx1", &i1);
-		let o11 = signature.vrf_outputs[0].make_bytes::<32>(b"ctx1", &i1);
+		let o11 = signature.outputs[0].make_bytes::<32>(b"ctx1", &i1);
 		assert_eq!(o10, o11);
 
 		let o20 = pair.make_bytes::<48>(b"ctx2", &i2);
-		let o21 = signature.vrf_outputs[1].make_bytes::<48>(b"ctx2", &i2);
+		let o21 = signature.outputs[1].make_bytes::<48>(b"ctx2", &i2);
 		assert_eq!(o20, o21);
 	}
 
@@ -932,8 +941,7 @@ mod tests {
 
 		let bytes = expected.encode();
 
-		let expected_len =
-			data.vrf_inputs.len() * PREOUT_SERIALIZED_LEN + SIGNATURE_SERIALIZED_LEN + 1;
+		let expected_len = data.inputs.len() * PREOUT_SERIALIZED_LEN + SIGNATURE_SERIALIZED_LEN + 1;
 		assert_eq!(bytes.len(), expected_len);
 
 		let decoded = VrfSignature::decode(&mut bytes.as_slice()).unwrap();
@@ -971,7 +979,7 @@ mod tests {
 		let signature = pair.ring_vrf_sign(&data, &prover);
 
 		let verifier = ring_ctx.verifier(&pks).unwrap();
-		assert!(signature.verify(&data, &verifier));
+		assert!(signature.ring_vrf_verify(&data, &verifier));
 	}
 
 	#[test]
@@ -990,7 +998,36 @@ mod tests {
 		let signature = pair.ring_vrf_sign(&data, &prover);
 
 		let verifier = ring_ctx.verifier(&pks).unwrap();
-		assert!(!signature.verify(&data, &verifier));
+		assert!(!signature.ring_vrf_verify(&data, &verifier));
+	}
+
+	#[test]
+	fn ring_vrf_make_bytes_matches() {
+		let ring_ctx = RingContext::new_testing();
+
+		let mut pks: Vec<_> = (0..16).map(|i| Pair::from_seed(&[i as u8; 32]).public()).collect();
+		assert!(pks.len() <= ring_ctx.max_keyset_size());
+
+		let pair = Pair::from_seed(DEV_SEED);
+
+		// Just pick one index to patch with the actual public key
+		let prover_idx = 3;
+		pks[prover_idx] = pair.public();
+
+		let i1 = VrfInput::new(b"dom1", b"foo");
+		let i2 = VrfInput::new(b"dom2", b"bar");
+		let data = VrfSignData::new_unchecked(b"mydata", &[b"tdata"], [i1.clone(), i2.clone()]);
+
+		let prover = ring_ctx.prover(&pks, prover_idx).unwrap();
+		let signature = pair.ring_vrf_sign(&data, &prover);
+
+		let o10 = pair.make_bytes::<32>(b"ctx1", &i1);
+		let o11 = signature.outputs[0].make_bytes::<32>(b"ctx1", &i1);
+		assert_eq!(o10, o11);
+
+		let o20 = pair.make_bytes::<48>(b"ctx2", &i2);
+		let o21 = signature.outputs[1].make_bytes::<48>(b"ctx2", &i2);
+		assert_eq!(o20, o21);
 	}
 
 	#[test]
@@ -1017,10 +1054,8 @@ mod tests {
 
 		let bytes = expected.encode();
 
-		let expected_len = data.vrf_inputs.len() * PREOUT_SERIALIZED_LEN +
-			PEDERSEN_SIGNATURE_SERIALIZED_LEN +
-			RING_PROOF_SERIALIZED_LEN +
-			1;
+		let expected_len =
+			data.inputs.len() * PREOUT_SERIALIZED_LEN + RING_SIGNATURE_SERIALIZED_LEN + 1;
 		assert_eq!(bytes.len(), expected_len);
 
 		let decoded = RingVrfSignature::decode(&mut bytes.as_slice()).unwrap();
diff --git a/substrate/primitives/core/src/bls.rs b/substrate/primitives/core/src/bls.rs
index 951aa1828ea5136700ca8ee91ee1693e4b6b1e0a..8ce6eb166f868b73447b922fbe3c0434e54baa86 100644
--- a/substrate/primitives/core/src/bls.rs
+++ b/substrate/primitives/core/src/bls.rs
@@ -17,7 +17,7 @@
 
 //! Simple BLS (Boneh–Lynn–Shacham) Signature API.
 
-#[cfg(feature = "std")]
+#[cfg(feature = "serde")]
 use crate::crypto::Ss58Codec;
 use crate::crypto::{ByteArray, CryptoType, Derive, Public as TraitPublic, UncheckedFrom};
 #[cfg(feature = "full_crypto")]
@@ -28,8 +28,12 @@ use sp_std::vec::Vec;
 
 use codec::{Decode, Encode, MaxEncodedLen};
 use scale_info::TypeInfo;
-#[cfg(feature = "std")]
+
+#[cfg(feature = "serde")]
 use serde::{de, Deserialize, Deserializer, Serialize, Serializer};
+#[cfg(all(not(feature = "std"), feature = "serde"))]
+use sp_std::alloc::{format, string::String};
+
 use w3f_bls::{DoublePublicKey, DoubleSignature, EngineBLS, SerializableToBytes, TinyBLS381};
 #[cfg(feature = "full_crypto")]
 use w3f_bls::{DoublePublicKeyScheme, Keypair, Message, SecretKey};
@@ -39,6 +43,7 @@ use sp_std::{convert::TryFrom, marker::PhantomData, ops::Deref};
 
 /// BLS-377 specialized types
 pub mod bls377 {
+	pub use super::{PUBLIC_KEY_SERIALIZED_SIZE, SIGNATURE_SERIALIZED_SIZE};
 	use crate::crypto::CryptoTypeId;
 	use w3f_bls::TinyBLS377;
 
@@ -60,6 +65,7 @@ pub mod bls377 {
 
 /// BLS-381 specialized types
 pub mod bls381 {
+	pub use super::{PUBLIC_KEY_SERIALIZED_SIZE, SIGNATURE_SERIALIZED_SIZE};
 	use crate::crypto::CryptoTypeId;
 	use w3f_bls::TinyBLS381;
 
@@ -83,17 +89,17 @@ trait BlsBound: EngineBLS + HardJunctionId + Send + Sync + 'static {}
 
 impl<T: EngineBLS + HardJunctionId + Send + Sync + 'static> BlsBound for T {}
 
-// Secret key serialized size
+/// Secret key serialized size
 #[cfg(feature = "full_crypto")]
 const SECRET_KEY_SERIALIZED_SIZE: usize =
 	<SecretKey<TinyBLS381> as SerializableToBytes>::SERIALIZED_BYTES_SIZE;
 
-// Public key serialized size
-const PUBLIC_KEY_SERIALIZED_SIZE: usize =
+/// Public key serialized size
+pub const PUBLIC_KEY_SERIALIZED_SIZE: usize =
 	<DoublePublicKey<TinyBLS381> as SerializableToBytes>::SERIALIZED_BYTES_SIZE;
 
-// Signature serialized size
-const SIGNATURE_SERIALIZED_SIZE: usize =
+/// Signature serialized size
+pub const SIGNATURE_SERIALIZED_SIZE: usize =
 	<DoubleSignature<TinyBLS381> as SerializableToBytes>::SERIALIZED_BYTES_SIZE;
 
 /// A secret seed.
@@ -258,7 +264,7 @@ impl<T> sp_std::fmt::Debug for Public<T> {
 	}
 }
 
-#[cfg(feature = "std")]
+#[cfg(feature = "serde")]
 impl<T: BlsBound> Serialize for Public<T> {
 	fn serialize<S>(&self, serializer: S) -> Result<S::Ok, S::Error>
 	where
@@ -268,7 +274,7 @@ impl<T: BlsBound> Serialize for Public<T> {
 	}
 }
 
-#[cfg(feature = "std")]
+#[cfg(feature = "serde")]
 impl<'de, T: BlsBound> Deserialize<'de> for Public<T> {
 	fn deserialize<D>(deserializer: D) -> Result<Self, D::Error>
 	where
@@ -317,6 +323,10 @@ impl<T> sp_std::hash::Hash for Signature<T> {
 	}
 }
 
+impl<T> ByteArray for Signature<T> {
+	const LEN: usize = SIGNATURE_SERIALIZED_SIZE;
+}
+
 impl<T> TryFrom<&[u8]> for Signature<T> {
 	type Error = ();
 
@@ -330,7 +340,7 @@ impl<T> TryFrom<&[u8]> for Signature<T> {
 	}
 }
 
-#[cfg(feature = "std")]
+#[cfg(feature = "serde")]
 impl<T> Serialize for Signature<T> {
 	fn serialize<S>(&self, serializer: S) -> Result<S::Ok, S::Error>
 	where
@@ -340,7 +350,7 @@ impl<T> Serialize for Signature<T> {
 	}
 }
 
-#[cfg(feature = "std")]
+#[cfg(feature = "serde")]
 impl<'de, T> Deserialize<'de> for Signature<T> {
 	fn deserialize<D>(deserializer: D) -> Result<Self, D::Error>
 	where
@@ -444,10 +454,9 @@ impl<T: BlsBound> TraitPair for Pair<T> {
 		path: Iter,
 		_seed: Option<Seed>,
 	) -> Result<(Self, Option<Seed>), DeriveError> {
-		let mut acc: [u8; SECRET_KEY_SERIALIZED_SIZE] =
-			self.0.secret.to_bytes().try_into().expect(
-				"Secret key serializer returns a vector of SECRET_KEY_SERIALIZED_SIZE size",
-			);
+		let mut acc: [u8; SECRET_KEY_SERIALIZED_SIZE] = self.0.secret.to_bytes().try_into().expect(
+			"Secret key serializer returns a vector of SECRET_KEY_SERIALIZED_SIZE size; qed",
+		);
 		for j in path {
 			match j {
 				DeriveJunction::Soft(_cc) => return Err(DeriveError::SoftKeyInPath),
@@ -529,11 +538,10 @@ mod test {
 		);
 	}
 
-	// Only passes if the seed = (seed mod ScalarField)
 	#[test]
 	fn seed_and_derive_should_work() {
 		let seed = array_bytes::hex2array_unchecked(
-			"9d61b19deffd5a60ba844af492ec2cc44449c5697b326919703bac031cae7f00",
+			"9d61b19deffd5a60ba844af492ec2cc44449c5697b326919703bac031cae7f60",
 		);
 		let pair = Pair::from_seed(&seed);
 		// we are using hash to field so this is not going to work
@@ -543,7 +551,7 @@ mod test {
 		assert_eq!(
 			derived.to_raw_vec(),
 			array_bytes::hex2array_unchecked::<_, 32>(
-				"a4f2269333b3e87c577aa00c4a2cd650b3b30b2e8c286a47c251279ff3a26e0d"
+				"3a0626d095148813cd1642d38254f1cfff7eb8cc1a2fc83b2a135377c3554c12"
 			)
 		);
 	}
diff --git a/substrate/primitives/core/src/crypto.rs b/substrate/primitives/core/src/crypto.rs
index 6afe4b752a690b7b625787ca295f14e210201388..ccb61c12f3216fdffc657572c2489a91ce1f3a11 100644
--- a/substrate/primitives/core/src/crypto.rs
+++ b/substrate/primitives/core/src/crypto.rs
@@ -630,6 +630,13 @@ impl sp_std::str::FromStr for AccountId32 {
 	}
 }
 
+/// Creates an [`AccountId32`] from the input, which should contain at least 32 bytes.
+impl FromEntropy for AccountId32 {
+	fn from_entropy(input: &mut impl codec::Input) -> Result<Self, codec::Error> {
+		Ok(AccountId32::new(FromEntropy::from_entropy(input)?))
+	}
+}
+
 #[cfg(feature = "std")]
 pub use self::dummy::*;
 
@@ -1136,6 +1143,8 @@ pub mod key_types {
 
 	/// Key type for Babe module, built-in. Identified as `babe`.
 	pub const BABE: KeyTypeId = KeyTypeId(*b"babe");
+	/// Key type for Sassafras module, built-in. Identified as `sass`.
+	pub const SASSAFRAS: KeyTypeId = KeyTypeId(*b"sass");
 	/// Key type for Grandpa module, built-in. Identified as `gran`.
 	pub const GRANDPA: KeyTypeId = KeyTypeId(*b"gran");
 	/// Key type for controlling an account in a Substrate runtime, built-in. Identified as `acco`.
@@ -1152,6 +1161,8 @@ pub mod key_types {
 	pub const STAKING: KeyTypeId = KeyTypeId(*b"stak");
 	/// A key type for signing statements
 	pub const STATEMENT: KeyTypeId = KeyTypeId(*b"stmt");
+	/// Key type for Mixnet module, used to sign key-exchange public keys. Identified as `mixn`.
+	pub const MIXNET: KeyTypeId = KeyTypeId(*b"mixn");
 	/// A key type ID useful for tests.
 	pub const DUMMY: KeyTypeId = KeyTypeId(*b"dumy");
 }
@@ -1169,6 +1180,13 @@ impl FromEntropy for bool {
 	}
 }
 
+/// Create the unit type for any given input.
+impl FromEntropy for () {
+	fn from_entropy(_: &mut impl codec::Input) -> Result<Self, codec::Error> {
+		Ok(())
+	}
+}
+
 macro_rules! impl_from_entropy {
 	($type:ty , $( $others:tt )*) => {
 		impl_from_entropy!($type);
@@ -1195,7 +1213,7 @@ macro_rules! impl_from_entropy_base {
 			[$type; 17], [$type; 18], [$type; 19], [$type; 20], [$type; 21], [$type; 22], [$type; 23], [$type; 24],
 			[$type; 25], [$type; 26], [$type; 27], [$type; 28], [$type; 29], [$type; 30], [$type; 31], [$type; 32],
 			[$type; 36], [$type; 40], [$type; 44], [$type; 48], [$type; 56], [$type; 64], [$type; 72], [$type; 80],
-			[$type; 96], [$type; 112], [$type; 128], [$type; 160], [$type; 192], [$type; 224], [$type; 256]
+			[$type; 96], [$type; 112], [$type; 128], [$type; 160], [$type; 177], [$type; 192], [$type; 224], [$type; 256]
 		);
 	}
 }
diff --git a/substrate/primitives/core/src/ecdsa.rs b/substrate/primitives/core/src/ecdsa.rs
index 05bc679386c3dcf8741ade5221bc4b714693c138..603fa515a30e8b7cefc1093daa5905ccfac1320c 100644
--- a/substrate/primitives/core/src/ecdsa.rs
+++ b/substrate/primitives/core/src/ecdsa.rs
@@ -50,6 +50,12 @@ use sp_std::vec::Vec;
 /// An identifier used to match public keys against ecdsa keys
 pub const CRYPTO_ID: CryptoTypeId = CryptoTypeId(*b"ecds");
 
+/// The byte length of public key
+pub const PUBLIC_KEY_SERIALIZED_SIZE: usize = 33;
+
+/// The byte length of signature
+pub const SIGNATURE_SERIALIZED_SIZE: usize = 65;
+
 /// A secret seed (which is bytewise essentially equivalent to a SecretKey).
 ///
 /// We need it as a different type because `Seed` is expected to be AsRef<[u8]>.
@@ -71,11 +77,11 @@ type Seed = [u8; 32];
 	PartialOrd,
 	Ord,
 )]
-pub struct Public(pub [u8; 33]);
+pub struct Public(pub [u8; PUBLIC_KEY_SERIALIZED_SIZE]);
 
 impl crate::crypto::FromEntropy for Public {
 	fn from_entropy(input: &mut impl codec::Input) -> Result<Self, codec::Error> {
-		let mut result = Self([0u8; 33]);
+		let mut result = Self([0u8; PUBLIC_KEY_SERIALIZED_SIZE]);
 		input.read(&mut result.0[..])?;
 		Ok(result)
 	}
@@ -86,7 +92,7 @@ impl Public {
 	///
 	/// NOTE: No checking goes on to ensure this is a real public key. Only use it if
 	/// you are certain that the array actually is a pubkey. GIGO!
-	pub fn from_raw(data: [u8; 33]) -> Self {
+	pub fn from_raw(data: [u8; PUBLIC_KEY_SERIALIZED_SIZE]) -> Self {
 		Self(data)
 	}
 
@@ -109,7 +115,7 @@ impl Public {
 }
 
 impl ByteArray for Public {
-	const LEN: usize = 33;
+	const LEN: usize = PUBLIC_KEY_SERIALIZED_SIZE;
 }
 
 impl TraitPublic for Public {}
@@ -148,8 +154,8 @@ impl From<Pair> for Public {
 	}
 }
 
-impl UncheckedFrom<[u8; 33]> for Public {
-	fn unchecked_from(x: [u8; 33]) -> Self {
+impl UncheckedFrom<[u8; PUBLIC_KEY_SERIALIZED_SIZE]> for Public {
+	fn unchecked_from(x: [u8; PUBLIC_KEY_SERIALIZED_SIZE]) -> Self {
 		Public(x)
 	}
 }
@@ -198,14 +204,18 @@ impl<'de> Deserialize<'de> for Public {
 /// A signature (a 512-bit value, plus 8 bits for recovery ID).
 #[cfg_attr(feature = "full_crypto", derive(Hash))]
 #[derive(Encode, Decode, MaxEncodedLen, PassByInner, TypeInfo, PartialEq, Eq)]
-pub struct Signature(pub [u8; 65]);
+pub struct Signature(pub [u8; SIGNATURE_SERIALIZED_SIZE]);
+
+impl ByteArray for Signature {
+	const LEN: usize = SIGNATURE_SERIALIZED_SIZE;
+}
 
 impl TryFrom<&[u8]> for Signature {
 	type Error = ();
 
 	fn try_from(data: &[u8]) -> Result<Self, Self::Error> {
-		if data.len() == 65 {
-			let mut inner = [0u8; 65];
+		if data.len() == SIGNATURE_SERIALIZED_SIZE {
+			let mut inner = [0u8; SIGNATURE_SERIALIZED_SIZE];
 			inner.copy_from_slice(data);
 			Ok(Signature(inner))
 		} else {
@@ -239,7 +249,7 @@ impl<'de> Deserialize<'de> for Signature {
 
 impl Clone for Signature {
 	fn clone(&self) -> Self {
-		let mut r = [0u8; 65];
+		let mut r = [0u8; SIGNATURE_SERIALIZED_SIZE];
 		r.copy_from_slice(&self.0[..]);
 		Signature(r)
 	}
@@ -247,18 +257,18 @@ impl Clone for Signature {
 
 impl Default for Signature {
 	fn default() -> Self {
-		Signature([0u8; 65])
+		Signature([0u8; SIGNATURE_SERIALIZED_SIZE])
 	}
 }
 
-impl From<Signature> for [u8; 65] {
-	fn from(v: Signature) -> [u8; 65] {
+impl From<Signature> for [u8; SIGNATURE_SERIALIZED_SIZE] {
+	fn from(v: Signature) -> [u8; SIGNATURE_SERIALIZED_SIZE] {
 		v.0
 	}
 }
 
-impl AsRef<[u8; 65]> for Signature {
-	fn as_ref(&self) -> &[u8; 65] {
+impl AsRef<[u8; SIGNATURE_SERIALIZED_SIZE]> for Signature {
+	fn as_ref(&self) -> &[u8; SIGNATURE_SERIALIZED_SIZE] {
 		&self.0
 	}
 }
@@ -287,8 +297,8 @@ impl sp_std::fmt::Debug for Signature {
 	}
 }
 
-impl UncheckedFrom<[u8; 65]> for Signature {
-	fn unchecked_from(data: [u8; 65]) -> Signature {
+impl UncheckedFrom<[u8; SIGNATURE_SERIALIZED_SIZE]> for Signature {
+	fn unchecked_from(data: [u8; SIGNATURE_SERIALIZED_SIZE]) -> Signature {
 		Signature(data)
 	}
 }
@@ -298,7 +308,7 @@ impl Signature {
 	///
 	/// NOTE: No checking goes on to ensure this is a real signature. Only use it if
 	/// you are certain that the array actually is a signature. GIGO!
-	pub fn from_raw(data: [u8; 65]) -> Signature {
+	pub fn from_raw(data: [u8; SIGNATURE_SERIALIZED_SIZE]) -> Signature {
 		Signature(data)
 	}
 
@@ -307,10 +317,10 @@ impl Signature {
 	/// NOTE: No checking goes on to ensure this is a real signature. Only use it if
 	/// you are certain that the array actually is a signature. GIGO!
 	pub fn from_slice(data: &[u8]) -> Option<Self> {
-		if data.len() != 65 {
+		if data.len() != SIGNATURE_SERIALIZED_SIZE {
 			return None
 		}
-		let mut r = [0u8; 65];
+		let mut r = [0u8; SIGNATURE_SERIALIZED_SIZE];
 		r.copy_from_slice(data);
 		Some(Signature(r))
 	}
@@ -473,7 +483,7 @@ impl Pair {
 	pub fn verify_deprecated<M: AsRef<[u8]>>(sig: &Signature, message: M, pubkey: &Public) -> bool {
 		let message = libsecp256k1::Message::parse(&blake2_256(message.as_ref()));
 
-		let parse_signature_overflowing = |x: [u8; 65]| {
+		let parse_signature_overflowing = |x: [u8; SIGNATURE_SERIALIZED_SIZE]| {
 			let sig = libsecp256k1::Signature::parse_overflowing_slice(&x[..64]).ok()?;
 			let rid = libsecp256k1::RecoveryId::parse(x[64]).ok()?;
 			Some((sig, rid))
@@ -726,7 +736,7 @@ mod test {
 		let signature = pair.sign(&message[..]);
 		let serialized_signature = serde_json::to_string(&signature).unwrap();
 		// Signature is 65 bytes, so 130 chars + 2 quote chars
-		assert_eq!(serialized_signature.len(), 132);
+		assert_eq!(serialized_signature.len(), SIGNATURE_SERIALIZED_SIZE * 2 + 2);
 		let signature = serde_json::from_str(&serialized_signature).unwrap();
 		assert!(Pair::verify(&signature, &message[..], &pair.public()));
 	}
diff --git a/substrate/primitives/core/src/hexdisplay.rs b/substrate/primitives/core/src/hexdisplay.rs
index 30e045dfc52acae9bbd22fecd4a2c8a4edbae979..72bb24a186e54dbfb4deecd105065dc2b63d332d 100644
--- a/substrate/primitives/core/src/hexdisplay.rs
+++ b/substrate/primitives/core/src/hexdisplay.rs
@@ -96,7 +96,7 @@ macro_rules! impl_non_endians {
 impl_non_endians!(
 	[u8; 1], [u8; 2], [u8; 3], [u8; 4], [u8; 5], [u8; 6], [u8; 7], [u8; 8], [u8; 10], [u8; 12],
 	[u8; 14], [u8; 16], [u8; 20], [u8; 24], [u8; 28], [u8; 32], [u8; 40], [u8; 48], [u8; 56],
-	[u8; 64], [u8; 65], [u8; 80], [u8; 96], [u8; 112], [u8; 128], [u8; 144]
+	[u8; 64], [u8; 65], [u8; 80], [u8; 96], [u8; 112], [u8; 128], [u8; 144], [u8; 177]
 );
 
 /// Format into ASCII + # + hex, suitable for storage key preimages.
diff --git a/substrate/primitives/core/src/lib.rs b/substrate/primitives/core/src/lib.rs
index 3a0e1f33f16c9d5fdbded144895fa1aa38bf3d73..75b84c89ae68e70cb9aac70dc23ff52d38450b37 100644
--- a/substrate/primitives/core/src/lib.rs
+++ b/substrate/primitives/core/src/lib.rs
@@ -66,6 +66,7 @@ pub mod hash;
 #[cfg(feature = "std")]
 mod hasher;
 pub mod offchain;
+pub mod paired_crypto;
 pub mod sr25519;
 pub mod testing;
 #[cfg(feature = "std")]
diff --git a/substrate/primitives/core/src/paired_crypto.rs b/substrate/primitives/core/src/paired_crypto.rs
new file mode 100644
index 0000000000000000000000000000000000000000..355fc690779f84140a47a8c6b3155d976ced531a
--- /dev/null
+++ b/substrate/primitives/core/src/paired_crypto.rs
@@ -0,0 +1,662 @@
+// 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.
+
+//! API for using a pair of crypto schemes together.
+
+#[cfg(feature = "serde")]
+use crate::crypto::Ss58Codec;
+use crate::crypto::{ByteArray, CryptoType, Derive, Public as PublicT, UncheckedFrom};
+#[cfg(feature = "full_crypto")]
+use crate::crypto::{DeriveError, DeriveJunction, Pair as PairT, SecretStringError};
+
+#[cfg(feature = "full_crypto")]
+use sp_std::vec::Vec;
+
+use codec::{Decode, Encode, MaxEncodedLen};
+use scale_info::TypeInfo;
+#[cfg(feature = "serde")]
+use serde::{de, Deserialize, Deserializer, Serialize, Serializer};
+#[cfg(all(not(feature = "std"), feature = "serde"))]
+use sp_std::alloc::{format, string::String};
+
+use sp_runtime_interface::pass_by::PassByInner;
+use sp_std::convert::TryFrom;
+
+/// ECDSA and BLS12-377 paired crypto scheme
+#[cfg(feature = "bls-experimental")]
+pub mod ecdsa_n_bls377 {
+	use crate::{bls377, crypto::CryptoTypeId, ecdsa};
+
+	/// An identifier used to match public keys against BLS12-377 keys
+	pub const CRYPTO_ID: CryptoTypeId = CryptoTypeId(*b"ecb7");
+
+	const PUBLIC_KEY_LEN: usize =
+		ecdsa::PUBLIC_KEY_SERIALIZED_SIZE + bls377::PUBLIC_KEY_SERIALIZED_SIZE;
+	const SIGNATURE_LEN: usize =
+		ecdsa::SIGNATURE_SERIALIZED_SIZE + bls377::SIGNATURE_SERIALIZED_SIZE;
+
+	/// (ECDSA, BLS12-377) key-pair pair.
+	#[cfg(feature = "full_crypto")]
+	pub type Pair = super::Pair<ecdsa::Pair, bls377::Pair, PUBLIC_KEY_LEN, SIGNATURE_LEN>;
+	/// (ECDSA, BLS12-377) public key pair.
+	pub type Public = super::Public<PUBLIC_KEY_LEN>;
+	/// (ECDSA, BLS12-377) signature pair.
+	pub type Signature = super::Signature<SIGNATURE_LEN>;
+
+	impl super::CryptoType for Public {
+		#[cfg(feature = "full_crypto")]
+		type Pair = Pair;
+	}
+
+	impl super::CryptoType for Signature {
+		#[cfg(feature = "full_crypto")]
+		type Pair = Pair;
+	}
+
+	#[cfg(feature = "full_crypto")]
+	impl super::CryptoType for Pair {
+		type Pair = Pair;
+	}
+}
+
+/// Secure seed length.
+///
+/// Currently only supporting sub-schemes whose seed is a 32-bytes array.
+#[cfg(feature = "full_crypto")]
+const SECURE_SEED_LEN: usize = 32;
+
+/// A secret seed.
+///
+/// It's not called a "secret key" because ring doesn't expose the secret keys
+/// of the key pair (yeah, dumb); as such we're forced to remember the seed manually if we
+/// will need it later (such as for HDKD).
+#[cfg(feature = "full_crypto")]
+type Seed = [u8; SECURE_SEED_LEN];
+
+/// A public key.
+#[derive(Clone, Encode, Decode, MaxEncodedLen, TypeInfo, PartialEq, Eq, PartialOrd, Ord)]
+pub struct Public<const LEFT_PLUS_RIGHT_LEN: usize>([u8; LEFT_PLUS_RIGHT_LEN]);
+
+#[cfg(feature = "full_crypto")]
+impl<const LEFT_PLUS_RIGHT_LEN: usize> sp_std::hash::Hash for Public<LEFT_PLUS_RIGHT_LEN> {
+	fn hash<H: sp_std::hash::Hasher>(&self, state: &mut H) {
+		self.0.hash(state);
+	}
+}
+
+impl<const LEFT_PLUS_RIGHT_LEN: usize> ByteArray for Public<LEFT_PLUS_RIGHT_LEN> {
+	const LEN: usize = LEFT_PLUS_RIGHT_LEN;
+}
+
+impl<const LEFT_PLUS_RIGHT_LEN: usize> TryFrom<&[u8]> for Public<LEFT_PLUS_RIGHT_LEN> {
+	type Error = ();
+
+	fn try_from(data: &[u8]) -> Result<Self, Self::Error> {
+		if data.len() != LEFT_PLUS_RIGHT_LEN {
+			return Err(())
+		}
+		let mut inner = [0u8; LEFT_PLUS_RIGHT_LEN];
+		inner.copy_from_slice(data);
+		Ok(Public(inner))
+	}
+}
+
+impl<const LEFT_PLUS_RIGHT_LEN: usize> AsRef<[u8; LEFT_PLUS_RIGHT_LEN]>
+	for Public<LEFT_PLUS_RIGHT_LEN>
+{
+	fn as_ref(&self) -> &[u8; LEFT_PLUS_RIGHT_LEN] {
+		&self.0
+	}
+}
+
+impl<const LEFT_PLUS_RIGHT_LEN: usize> AsRef<[u8]> for Public<LEFT_PLUS_RIGHT_LEN> {
+	fn as_ref(&self) -> &[u8] {
+		&self.0[..]
+	}
+}
+
+impl<const LEFT_PLUS_RIGHT_LEN: usize> AsMut<[u8]> for Public<LEFT_PLUS_RIGHT_LEN> {
+	fn as_mut(&mut self) -> &mut [u8] {
+		&mut self.0[..]
+	}
+}
+
+impl<const LEFT_PLUS_RIGHT_LEN: usize> PassByInner for Public<LEFT_PLUS_RIGHT_LEN> {
+	type Inner = [u8; LEFT_PLUS_RIGHT_LEN];
+
+	fn into_inner(self) -> Self::Inner {
+		self.0
+	}
+
+	fn inner(&self) -> &Self::Inner {
+		&self.0
+	}
+
+	fn from_inner(inner: Self::Inner) -> Self {
+		Self(inner)
+	}
+}
+
+#[cfg(feature = "full_crypto")]
+impl<
+		LeftPair: PairT,
+		RightPair: PairT,
+		const LEFT_PLUS_RIGHT_PUBLIC_LEN: usize,
+		const SIGNATURE_LEN: usize,
+	> From<Pair<LeftPair, RightPair, LEFT_PLUS_RIGHT_PUBLIC_LEN, SIGNATURE_LEN>>
+	for Public<LEFT_PLUS_RIGHT_PUBLIC_LEN>
+where
+	Pair<LeftPair, RightPair, LEFT_PLUS_RIGHT_PUBLIC_LEN, SIGNATURE_LEN>:
+		PairT<Public = Public<LEFT_PLUS_RIGHT_PUBLIC_LEN>>,
+{
+	fn from(x: Pair<LeftPair, RightPair, LEFT_PLUS_RIGHT_PUBLIC_LEN, SIGNATURE_LEN>) -> Self {
+		x.public()
+	}
+}
+
+impl<const LEFT_PLUS_RIGHT_LEN: usize> UncheckedFrom<[u8; LEFT_PLUS_RIGHT_LEN]>
+	for Public<LEFT_PLUS_RIGHT_LEN>
+{
+	fn unchecked_from(data: [u8; LEFT_PLUS_RIGHT_LEN]) -> Self {
+		Public(data)
+	}
+}
+
+#[cfg(feature = "std")]
+impl<const LEFT_PLUS_RIGHT_LEN: usize> std::fmt::Display for Public<LEFT_PLUS_RIGHT_LEN>
+where
+	Public<LEFT_PLUS_RIGHT_LEN>: CryptoType,
+{
+	fn fmt(&self, f: &mut std::fmt::Formatter) -> std::fmt::Result {
+		write!(f, "{}", self.to_ss58check())
+	}
+}
+
+impl<const LEFT_PLUS_RIGHT_LEN: usize> sp_std::fmt::Debug for Public<LEFT_PLUS_RIGHT_LEN>
+where
+	Public<LEFT_PLUS_RIGHT_LEN>: CryptoType,
+	[u8; LEFT_PLUS_RIGHT_LEN]: crate::hexdisplay::AsBytesRef,
+{
+	#[cfg(feature = "std")]
+	fn fmt(&self, f: &mut sp_std::fmt::Formatter) -> sp_std::fmt::Result {
+		let s = self.to_ss58check();
+		write!(f, "{} ({}...)", crate::hexdisplay::HexDisplay::from(&self.0), &s[0..8])
+	}
+
+	#[cfg(not(feature = "std"))]
+	fn fmt(&self, _: &mut sp_std::fmt::Formatter) -> sp_std::fmt::Result {
+		Ok(())
+	}
+}
+
+#[cfg(feature = "serde")]
+impl<const LEFT_PLUS_RIGHT_LEN: usize> Serialize for Public<LEFT_PLUS_RIGHT_LEN>
+where
+	Public<LEFT_PLUS_RIGHT_LEN>: CryptoType,
+{
+	fn serialize<S>(&self, serializer: S) -> Result<S::Ok, S::Error>
+	where
+		S: Serializer,
+	{
+		serializer.serialize_str(&self.to_ss58check())
+	}
+}
+
+#[cfg(feature = "serde")]
+impl<'de, const LEFT_PLUS_RIGHT_LEN: usize> Deserialize<'de> for Public<LEFT_PLUS_RIGHT_LEN>
+where
+	Public<LEFT_PLUS_RIGHT_LEN>: CryptoType,
+{
+	fn deserialize<D>(deserializer: D) -> Result<Self, D::Error>
+	where
+		D: Deserializer<'de>,
+	{
+		Public::from_ss58check(&String::deserialize(deserializer)?)
+			.map_err(|e| de::Error::custom(format!("{:?}", e)))
+	}
+}
+
+impl<const LEFT_PLUS_RIGHT_LEN: usize> PublicT for Public<LEFT_PLUS_RIGHT_LEN> where
+	Public<LEFT_PLUS_RIGHT_LEN>: CryptoType
+{
+}
+
+impl<const LEFT_PLUS_RIGHT_LEN: usize> Derive for Public<LEFT_PLUS_RIGHT_LEN> {}
+
+/// Trait characterizing a signature which could be used as individual component of an
+/// `paired_crypto:Signature` pair.
+pub trait SignatureBound: ByteArray {}
+
+impl<T: ByteArray> SignatureBound for T {}
+
+/// A pair of signatures of different types
+#[derive(Encode, Decode, MaxEncodedLen, TypeInfo, PartialEq, Eq)]
+pub struct Signature<const LEFT_PLUS_RIGHT_LEN: usize>([u8; LEFT_PLUS_RIGHT_LEN]);
+
+#[cfg(feature = "full_crypto")]
+impl<const LEFT_PLUS_RIGHT_LEN: usize> sp_std::hash::Hash for Signature<LEFT_PLUS_RIGHT_LEN> {
+	fn hash<H: sp_std::hash::Hasher>(&self, state: &mut H) {
+		self.0.hash(state);
+	}
+}
+
+impl<const LEFT_PLUS_RIGHT_LEN: usize> ByteArray for Signature<LEFT_PLUS_RIGHT_LEN> {
+	const LEN: usize = LEFT_PLUS_RIGHT_LEN;
+}
+
+impl<const LEFT_PLUS_RIGHT_LEN: usize> TryFrom<&[u8]> for Signature<LEFT_PLUS_RIGHT_LEN> {
+	type Error = ();
+
+	fn try_from(data: &[u8]) -> Result<Self, Self::Error> {
+		if data.len() != LEFT_PLUS_RIGHT_LEN {
+			return Err(())
+		}
+		let mut inner = [0u8; LEFT_PLUS_RIGHT_LEN];
+		inner.copy_from_slice(data);
+		Ok(Signature(inner))
+	}
+}
+
+impl<const LEFT_PLUS_RIGHT_LEN: usize> AsMut<[u8]> for Signature<LEFT_PLUS_RIGHT_LEN> {
+	fn as_mut(&mut self) -> &mut [u8] {
+		&mut self.0[..]
+	}
+}
+
+impl<const LEFT_PLUS_RIGHT_LEN: usize> AsRef<[u8; LEFT_PLUS_RIGHT_LEN]>
+	for Signature<LEFT_PLUS_RIGHT_LEN>
+{
+	fn as_ref(&self) -> &[u8; LEFT_PLUS_RIGHT_LEN] {
+		&self.0
+	}
+}
+
+impl<const LEFT_PLUS_RIGHT_LEN: usize> AsRef<[u8]> for Signature<LEFT_PLUS_RIGHT_LEN> {
+	fn as_ref(&self) -> &[u8] {
+		&self.0[..]
+	}
+}
+
+#[cfg(feature = "serde")]
+impl<const LEFT_PLUS_RIGHT_LEN: usize> Serialize for Signature<LEFT_PLUS_RIGHT_LEN> {
+	fn serialize<S>(&self, serializer: S) -> Result<S::Ok, S::Error>
+	where
+		S: Serializer,
+	{
+		serializer.serialize_str(&array_bytes::bytes2hex("", self))
+	}
+}
+
+#[cfg(feature = "serde")]
+impl<'de, const LEFT_PLUS_RIGHT_LEN: usize> Deserialize<'de> for Signature<LEFT_PLUS_RIGHT_LEN> {
+	fn deserialize<D>(deserializer: D) -> Result<Self, D::Error>
+	where
+		D: Deserializer<'de>,
+	{
+		let bytes = array_bytes::hex2bytes(&String::deserialize(deserializer)?)
+			.map_err(|e| de::Error::custom(format!("{:?}", e)))?;
+		Signature::<LEFT_PLUS_RIGHT_LEN>::try_from(bytes.as_ref()).map_err(|e| {
+			de::Error::custom(format!("Error converting deserialized data into signature: {:?}", e))
+		})
+	}
+}
+
+impl<const LEFT_PLUS_RIGHT_LEN: usize> From<Signature<LEFT_PLUS_RIGHT_LEN>>
+	for [u8; LEFT_PLUS_RIGHT_LEN]
+{
+	fn from(signature: Signature<LEFT_PLUS_RIGHT_LEN>) -> [u8; LEFT_PLUS_RIGHT_LEN] {
+		signature.0
+	}
+}
+
+impl<const LEFT_PLUS_RIGHT_LEN: usize> sp_std::fmt::Debug for Signature<LEFT_PLUS_RIGHT_LEN>
+where
+	[u8; LEFT_PLUS_RIGHT_LEN]: crate::hexdisplay::AsBytesRef,
+{
+	#[cfg(feature = "std")]
+	fn fmt(&self, f: &mut sp_std::fmt::Formatter) -> sp_std::fmt::Result {
+		write!(f, "{}", crate::hexdisplay::HexDisplay::from(&self.0))
+	}
+
+	#[cfg(not(feature = "std"))]
+	fn fmt(&self, _: &mut sp_std::fmt::Formatter) -> sp_std::fmt::Result {
+		Ok(())
+	}
+}
+
+impl<const LEFT_PLUS_RIGHT_LEN: usize> UncheckedFrom<[u8; LEFT_PLUS_RIGHT_LEN]>
+	for Signature<LEFT_PLUS_RIGHT_LEN>
+{
+	fn unchecked_from(data: [u8; LEFT_PLUS_RIGHT_LEN]) -> Self {
+		Signature(data)
+	}
+}
+
+/// A key pair.
+#[cfg(feature = "full_crypto")]
+#[derive(Clone)]
+pub struct Pair<
+	LeftPair: PairT,
+	RightPair: PairT,
+	const PUBLIC_KEY_LEN: usize,
+	const SIGNATURE_LEN: usize,
+> {
+	left: LeftPair,
+	right: RightPair,
+}
+
+#[cfg(feature = "full_crypto")]
+impl<
+		LeftPair: PairT,
+		RightPair: PairT,
+		const PUBLIC_KEY_LEN: usize,
+		const SIGNATURE_LEN: usize,
+	> PairT for Pair<LeftPair, RightPair, PUBLIC_KEY_LEN, SIGNATURE_LEN>
+where
+	Pair<LeftPair, RightPair, PUBLIC_KEY_LEN, SIGNATURE_LEN>: CryptoType,
+	LeftPair::Signature: SignatureBound,
+	RightPair::Signature: SignatureBound,
+	Public<PUBLIC_KEY_LEN>: CryptoType,
+	LeftPair::Seed: From<Seed> + Into<Seed>,
+	RightPair::Seed: From<Seed> + Into<Seed>,
+{
+	type Seed = Seed;
+	type Public = Public<PUBLIC_KEY_LEN>;
+	type Signature = Signature<SIGNATURE_LEN>;
+
+	fn from_seed_slice(seed_slice: &[u8]) -> Result<Self, SecretStringError> {
+		if seed_slice.len() != SECURE_SEED_LEN {
+			return Err(SecretStringError::InvalidSeedLength)
+		}
+		let left = LeftPair::from_seed_slice(&seed_slice)?;
+		let right = RightPair::from_seed_slice(&seed_slice)?;
+		Ok(Pair { left, right })
+	}
+
+	/// Derive a child key from a series of given junctions.
+	///
+	/// Note: if the `LeftPair` and `RightPair` crypto schemes differ in
+	/// seed derivation, `derive` will drop the seed in the return.
+	fn derive<Iter: Iterator<Item = DeriveJunction>>(
+		&self,
+		path: Iter,
+		seed: Option<Self::Seed>,
+	) -> Result<(Self, Option<Self::Seed>), DeriveError> {
+		let path: Vec<_> = path.collect();
+
+		let left = self.left.derive(path.iter().cloned(), seed.map(|s| s.into()))?;
+		let right = self.right.derive(path.into_iter(), seed.map(|s| s.into()))?;
+
+		let seed = match (left.1, right.1) {
+			(Some(l), Some(r)) if l.as_ref() == r.as_ref() => Some(l.into()),
+			_ => None,
+		};
+
+		Ok((Self { left: left.0, right: right.0 }, seed))
+	}
+
+	fn public(&self) -> Self::Public {
+		let mut raw = [0u8; PUBLIC_KEY_LEN];
+		let left_pub = self.left.public();
+		let right_pub = self.right.public();
+		raw[..LeftPair::Public::LEN].copy_from_slice(left_pub.as_ref());
+		raw[LeftPair::Public::LEN..].copy_from_slice(right_pub.as_ref());
+		Self::Public::unchecked_from(raw)
+	}
+
+	fn sign(&self, message: &[u8]) -> Self::Signature {
+		let mut raw: [u8; SIGNATURE_LEN] = [0u8; SIGNATURE_LEN];
+		raw[..LeftPair::Signature::LEN].copy_from_slice(self.left.sign(message).as_ref());
+		raw[LeftPair::Signature::LEN..].copy_from_slice(self.right.sign(message).as_ref());
+		Self::Signature::unchecked_from(raw)
+	}
+
+	fn verify<M: AsRef<[u8]>>(sig: &Self::Signature, message: M, public: &Self::Public) -> bool {
+		let Ok(left_pub) = public.0[..LeftPair::Public::LEN].try_into() else { return false };
+		let Ok(left_sig) = sig.0[0..LeftPair::Signature::LEN].try_into() else { return false };
+		if !LeftPair::verify(&left_sig, message.as_ref(), &left_pub) {
+			return false
+		}
+
+		let Ok(right_pub) = public.0[LeftPair::Public::LEN..PUBLIC_KEY_LEN].try_into() else {
+			return false
+		};
+		let Ok(right_sig) = sig.0[LeftPair::Signature::LEN..].try_into() else { return false };
+		RightPair::verify(&right_sig, message.as_ref(), &right_pub)
+	}
+
+	/// Get the seed/secret key for each key and then concatenate them.
+	fn to_raw_vec(&self) -> Vec<u8> {
+		let mut raw = self.left.to_raw_vec();
+		raw.extend(self.right.to_raw_vec());
+		raw
+	}
+}
+
+// Test set exercising the (ECDSA, BLS12-377) implementation
+#[cfg(all(test, feature = "bls-experimental"))]
+mod test {
+	use super::*;
+	use crate::crypto::DEV_PHRASE;
+	use ecdsa_n_bls377::{Pair, Signature};
+
+	use crate::{bls377, ecdsa};
+	#[test]
+
+	fn test_length_of_paired_ecdsa_and_bls377_public_key_and_signature_is_correct() {
+		assert_eq!(
+			<Pair as PairT>::Public::LEN,
+			<ecdsa::Pair as PairT>::Public::LEN + <bls377::Pair as PairT>::Public::LEN
+		);
+		assert_eq!(
+			<Pair as PairT>::Signature::LEN,
+			<ecdsa::Pair as PairT>::Signature::LEN + <bls377::Pair as PairT>::Signature::LEN
+		);
+	}
+
+	#[test]
+	fn default_phrase_should_be_used() {
+		assert_eq!(
+			Pair::from_string("//Alice///password", None).unwrap().public(),
+			Pair::from_string(&format!("{}//Alice", DEV_PHRASE), Some("password"))
+				.unwrap()
+				.public(),
+		);
+	}
+
+	#[test]
+	fn seed_and_derive_should_work() {
+		let seed_for_right_and_left: [u8; SECURE_SEED_LEN] = array_bytes::hex2array_unchecked(
+			"9d61b19deffd5a60ba844af492ec2cc44449c5697b326919703bac031cae7f60",
+		);
+		let pair = Pair::from_seed(&seed_for_right_and_left);
+		// we are using hash to field so this is not going to work
+		// assert_eq!(pair.seed(), seed);
+		let path = vec![DeriveJunction::Hard([0u8; 32])];
+		let derived = pair.derive(path.into_iter(), None).ok().unwrap().0;
+		assert_eq!(
+			derived.to_raw_vec(),
+			[
+				array_bytes::hex2array_unchecked::<&str, SECURE_SEED_LEN>(
+					"b8eefc4937200a8382d00050e050ced2d4ab72cc2ef1b061477afb51564fdd61"
+				),
+				array_bytes::hex2array_unchecked::<&str, SECURE_SEED_LEN>(
+					"3a0626d095148813cd1642d38254f1cfff7eb8cc1a2fc83b2a135377c3554c12"
+				)
+			]
+			.concat()
+		);
+	}
+
+	#[test]
+	fn test_vector_should_work() {
+		let seed_left_and_right: [u8; SECURE_SEED_LEN] = array_bytes::hex2array_unchecked(
+			"9d61b19deffd5a60ba844af492ec2cc44449c5697b326919703bac031cae7f60",
+		);
+		let pair = Pair::from_seed(&([seed_left_and_right].concat()[..].try_into().unwrap()));
+		let public = pair.public();
+		assert_eq!(
+					public,
+					Public::unchecked_from(
+						array_bytes::hex2array_unchecked("028db55b05db86c0b1786ca49f095d76344c9e6056b2f02701a7e7f3c20aabfd917a84ca8ce4c37c93c95ecee6a3c0c9a7b9c225093cf2f12dc4f69cbfb847ef9424a18f5755d5a742247d386ff2aabb806bcf160eff31293ea9616976628f77266c8a8cc1d8753be04197bd6cdd8c5c87a148f782c4c1568d599b48833fd539001e580cff64bbc71850605433fcd051f3afc3b74819786f815ffb5272030a8d03e5df61e6183f8fd8ea85f26defa83400"),
+		    		),
+		    	);
+		let message = b"";
+		let signature =
+		array_bytes::hex2array_unchecked("3dde91174bd9359027be59a428b8146513df80a2a3c7eda2194f64de04a69ab97b753169e94db6ffd50921a2668a48b94ca11e3d32c1ff19cfe88890aa7e8f3c00d1e3013161991e142d8751017d4996209c2ff8a9ee160f373733eda3b4b785ba6edce9f45f87104bbe07aa6aa6eb2780aa705efb2c13d3b317d6409d159d23bdc7cdd5c2a832d1551cf49d811d49c901495e527dbd532e3a462335ce2686009104aba7bc11c5b22be78f3198d2727a0b"
+		);
+		let signature = Signature::unchecked_from(signature);
+		assert!(pair.sign(&message[..]) == signature);
+		assert!(Pair::verify(&signature, &message[..], &public));
+	}
+
+	#[test]
+	fn test_vector_by_string_should_work() {
+		let pair = Pair::from_string(
+			"0x9d61b19deffd5a60ba844af492ec2cc44449c5697b326919703bac031cae7f60",
+			None,
+		)
+		.unwrap();
+		let public = pair.public();
+		assert_eq!(
+				public,
+				Public::unchecked_from(
+					array_bytes::hex2array_unchecked("028db55b05db86c0b1786ca49f095d76344c9e6056b2f02701a7e7f3c20aabfd916dc6be608fab3c6bd894a606be86db346cc170db85c733853a371f3db54ae1b12052c0888d472760c81b537572a26f00db865e5963aef8634f9917571c51b538b564b2a9ceda938c8b930969ee3b832448e08e33a79e9ddd28af419a3ce45300f5dbc768b067781f44f3fe05a19e6b07b1c4196151ec3f8ea37e4f89a8963030d2101e931276bb9ebe1f20102239d780"
+	 ),
+	    		),
+	    	);
+		let message = b"";
+		let signature =
+	array_bytes::hex2array_unchecked("3dde91174bd9359027be59a428b8146513df80a2a3c7eda2194f64de04a69ab97b753169e94db6ffd50921a2668a48b94ca11e3d32c1ff19cfe88890aa7e8f3c00bbb395bbdee1a35930912034f5fde3b36df2835a0536c865501b0675776a1d5931a3bea2e66eff73b2546c6af2061a8019223e4ebbbed661b2538e0f5823f2c708eb89c406beca8fcb53a5c13dbc7c0c42e4cf2be2942bba96ea29297915a06bd2b1b979c0e2ac8fd4ec684a6b5d110c"
+	);
+		let signature = Signature::unchecked_from(signature);
+		assert!(pair.sign(&message[..]) == signature);
+		assert!(Pair::verify(&signature, &message[..], &public));
+	}
+
+	#[test]
+	fn generated_pair_should_work() {
+		let (pair, _) = Pair::generate();
+		let public = pair.public();
+		let message = b"Something important";
+		let signature = pair.sign(&message[..]);
+		assert!(Pair::verify(&signature, &message[..], &public));
+		assert!(!Pair::verify(&signature, b"Something else", &public));
+	}
+
+	#[test]
+	fn seeded_pair_should_work() {
+		let pair =
+			Pair::from_seed(&(b"12345678901234567890123456789012".as_slice().try_into().unwrap()));
+		let public = pair.public();
+		assert_eq!(
+	    		public,
+				Public::unchecked_from(
+					array_bytes::hex2array_unchecked("035676109c54b9a16d271abeb4954316a40a32bcce023ac14c8e26e958aa68fba9754d2f2bbfa67df54d7e0e951979a18a1e0f45948857752cc2bac6bbb0b1d05e8e48bcc453920bf0c4bbd5993212480112a1fb433f04d74af0a8b700d93dc957ab3207f8d071e948f5aca1a7632c00bdf6d06be05b43e2e6216dccc8a5d55a0071cb2313cfd60b7e9114619cd17c06843b352f0b607a99122f6651df8f02e1ad3697bd208e62af047ddd7b942ba80080")
+	 ),
+	    	);
+		let message =
+	    	array_bytes::hex2bytes_unchecked("2f8c6129d816cf51c374bc7f08c3e63ed156cf78aefb4a6550d97b87997977ee00000000000000000200d75a980182b10ab7d54bfed3c964073a0ee172f3daa62325af021a68f707511a4500000000000000"
+	    );
+		let signature = pair.sign(&message[..]);
+		println!("Correct signature: {:?}", signature);
+		assert!(Pair::verify(&signature, &message[..], &public));
+		assert!(!Pair::verify(&signature, "Other message", &public));
+	}
+
+	#[test]
+	fn generate_with_phrase_recovery_possible() {
+		let (pair1, phrase, _) = Pair::generate_with_phrase(None);
+		let (pair2, _) = Pair::from_phrase(&phrase, None).unwrap();
+
+		assert_eq!(pair1.public(), pair2.public());
+	}
+
+	#[test]
+	fn generate_with_password_phrase_recovery_possible() {
+		let (pair1, phrase, _) = Pair::generate_with_phrase(Some("password"));
+		let (pair2, _) = Pair::from_phrase(&phrase, Some("password")).unwrap();
+
+		assert_eq!(pair1.public(), pair2.public());
+	}
+
+	#[test]
+	fn password_does_something() {
+		let (pair1, phrase, _) = Pair::generate_with_phrase(Some("password"));
+		let (pair2, _) = Pair::from_phrase(&phrase, None).unwrap();
+
+		assert_ne!(pair1.public(), pair2.public());
+	}
+
+	#[test]
+	fn ss58check_roundtrip_works() {
+		let pair =
+			Pair::from_seed(&(b"12345678901234567890123456789012".as_slice().try_into().unwrap()));
+		let public = pair.public();
+		let s = public.to_ss58check();
+		println!("Correct: {}", s);
+		let cmp = Public::from_ss58check(&s).unwrap();
+		assert_eq!(cmp, public);
+	}
+
+	#[test]
+	fn signature_serialization_works() {
+		let pair =
+			Pair::from_seed(&(b"12345678901234567890123456789012".as_slice().try_into().unwrap()));
+		let message = b"Something important";
+		let signature = pair.sign(&message[..]);
+
+		let serialized_signature = serde_json::to_string(&signature).unwrap();
+		println!("{:?} -- {:}", signature.0, serialized_signature);
+		// Signature is 177 bytes, hexify * 2 + 2 quote charsy
+		assert_eq!(serialized_signature.len(), 356);
+		let signature = serde_json::from_str(&serialized_signature).unwrap();
+		assert!(Pair::verify(&signature, &message[..], &pair.public()));
+	}
+
+	#[test]
+	fn signature_serialization_doesnt_panic() {
+		fn deserialize_signature(text: &str) -> Result<Signature, serde_json::error::Error> {
+			serde_json::from_str(text)
+		}
+		assert!(deserialize_signature("Not valid json.").is_err());
+		assert!(deserialize_signature("\"Not an actual signature.\"").is_err());
+		// Poorly-sized
+		assert!(deserialize_signature("\"abc123\"").is_err());
+	}
+
+	#[test]
+	fn encode_and_decode_public_key_works() {
+		let pair =
+			Pair::from_seed(&(b"12345678901234567890123456789012".as_slice().try_into().unwrap()));
+		let public = pair.public();
+		let encoded_public = public.encode();
+		let decoded_public = Public::decode(&mut encoded_public.as_slice()).unwrap();
+		assert_eq!(public, decoded_public)
+	}
+
+	#[test]
+	fn encode_and_decode_signature_works() {
+		let pair =
+			Pair::from_seed(&(b"12345678901234567890123456789012".as_slice().try_into().unwrap()));
+		let message = b"Something important";
+		let signature = pair.sign(&message[..]);
+		let encoded_signature = signature.encode();
+		let decoded_signature = Signature::decode(&mut encoded_signature.as_slice()).unwrap();
+		assert_eq!(signature, decoded_signature)
+	}
+}
diff --git a/substrate/primitives/core/src/traits.rs b/substrate/primitives/core/src/traits.rs
index 40137053ab7527d5191bc2889642549989d3be30..9815c84f3396a69401be386a7a5d0b627bddd761 100644
--- a/substrate/primitives/core/src/traits.rs
+++ b/substrate/primitives/core/src/traits.rs
@@ -91,7 +91,7 @@ pub struct RuntimeCode<'a> {
 	///
 	/// If `None` are given, the default value of the executor will be used.
 	pub heap_pages: Option<u64>,
-	/// The SCALE encoded hash of `code`.
+	/// The hash of `code`.
 	///
 	/// The hashing algorithm isn't that important, as long as all runtime
 	/// code instances use the same.
diff --git a/substrate/primitives/crypto/ec-utils/Cargo.toml b/substrate/primitives/crypto/ec-utils/Cargo.toml
index 2af95948a95ee99b04755a3102f7b5a7bb315fa1..e091385071c9c3e62f77f817952d5e46dd42a1e7 100644
--- a/substrate/primitives/crypto/ec-utils/Cargo.toml
+++ b/substrate/primitives/crypto/ec-utils/Cargo.toml
@@ -1,62 +1,37 @@
 [package]
 name = "sp-crypto-ec-utils"
 version = "0.4.0"
-authors = ["Parity Technologies <admin@parity.io>"]
-description = "Host function interface for common elliptic curve operations in Substrate runtimes"
-edition = "2021"
+authors.workspace = true
+description = "Host functions for common Arkworks elliptic curve operations"
+edition.workspace = true
 license = "Apache-2.0"
 homepage = "https://substrate.io"
-repository = "https://github.com/paritytech/substrate/"
+repository.workspace = true
 
 [package.metadata.docs.rs]
 targets = ["x86_64-unknown-linux-gnu"]
 
 [dependencies]
-ark-serialize = { version = "0.4.2", default-features = false }
-ark-ff = { version = "0.4.2", default-features = false }
 ark-ec = { version = "0.4.2", default-features = false }
-ark-std = { version = "0.4.0", default-features = false }
 ark-bls12-377 = { version = "0.4.0", features = ["curve"], default-features = false }
 ark-bls12-381 = { version = "0.4.0", features = ["curve"], default-features = false }
 ark-bw6-761 = { version = "0.4.0", default-features = false }
 ark-ed-on-bls12-381-bandersnatch = { version = "0.4.0", default-features = false }
 ark-ed-on-bls12-377 = { version = "0.4.0", default-features = false }
-sp-std = { path = "../../std", default-features = false }
-codec = { package = "parity-scale-codec", version = "3.6.1", default-features = false }
-ark-scale = { version = "0.0.3", features = ["hazmat"], default-features = false }
+ark-scale = { version = "0.0.11", features = ["hazmat"], default-features = false }
 sp-runtime-interface = { path = "../../runtime-interface", default-features = false}
-
-[dev-dependencies]
-sp-io = { path = "../../io", default-features = false }
-ark-algebra-test-templates = { version = "0.4.2", default-features = false }
-sp-ark-models = { version = "0.4.0-beta", default-features = false }
-sp-ark-bls12-377 = { version = "0.4.0-beta", default-features = false }
-sp-ark-bls12-381 = { version = "0.4.0-beta", default-features = false }
-sp-ark-bw6-761 = { version = "0.4.0-beta", default-features = false }
-sp-ark-ed-on-bls12-377 = { version = "0.4.0-beta", default-features = false }
-sp-ark-ed-on-bls12-381-bandersnatch = { version = "0.4.0-beta", default-features = false }
+sp-std = { path = "../../std", default-features = false }
 
 [features]
 default = [ "std" ]
 std = [
-	"ark-algebra-test-templates/std",
 	"ark-bls12-377/std",
 	"ark-bls12-381/std",
 	"ark-bw6-761/std",
 	"ark-ec/std",
 	"ark-ed-on-bls12-377/std",
 	"ark-ed-on-bls12-381-bandersnatch/std",
-	"ark-ff/std",
 	"ark-scale/std",
-	"ark-serialize/std",
-	"ark-std/std",
-	"codec/std",
-	"sp-ark-bls12-377/std",
-	"sp-ark-bls12-381/std",
-	"sp-ark-bw6-761/std",
-	"sp-ark-ed-on-bls12-377/std",
-	"sp-ark-ed-on-bls12-381-bandersnatch/std",
-	"sp-io/std",
 	"sp-runtime-interface/std",
 	"sp-std/std",
 ]
diff --git a/substrate/primitives/crypto/ec-utils/src/bls12_377.rs b/substrate/primitives/crypto/ec-utils/src/bls12_377.rs
deleted file mode 100644
index 9230479b3bec513e2429055c975a145d91432b3b..0000000000000000000000000000000000000000
--- a/substrate/primitives/crypto/ec-utils/src/bls12_377.rs
+++ /dev/null
@@ -1,103 +0,0 @@
-// This file is part of Substrate.
-
-// Copyright (C) 2017-2022 Parity Technologies (UK) Ltd.
-// SPDX-License-Identifier: Apache-2.0
-
-// Licensed under the Apache License, Version 2.0 (the "License");
-// you may not use this file except in compliance with the License.
-// You may obtain a copy of the License at
-//
-// 	http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the License is distributed on an "AS IS" BASIS,
-// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-// See the License for the specific language governing permissions and
-// limitations under the License.
-
-//! Support functions for bls12_377 to improve the performance of
-//! multi_miller_loop, final_exponentiation, msm's and projective
-//! multiplications by host function calls
-
-use crate::utils::{
-	final_exponentiation_generic, msm_sw_generic, mul_projective_generic, multi_miller_loop_generic,
-};
-use ark_bls12_377::{g1, g2, Bls12_377};
-use sp_std::vec::Vec;
-
-/// Compute a multi miller loop through arkworks
-pub fn multi_miller_loop(a: Vec<u8>, b: Vec<u8>) -> Result<Vec<u8>, ()> {
-	multi_miller_loop_generic::<Bls12_377>(a, b)
-}
-
-/// Compute a final exponentiation through arkworks
-pub fn final_exponentiation(target: Vec<u8>) -> Result<Vec<u8>, ()> {
-	final_exponentiation_generic::<Bls12_377>(target)
-}
-
-/// Compute a multi scalar multiplication for short_weierstrass through
-/// arkworks on G1.
-pub fn msm_g1(bases: Vec<u8>, scalars: Vec<u8>) -> Result<Vec<u8>, ()> {
-	msm_sw_generic::<g1::Config>(bases, scalars)
-}
-
-/// Compute a multi scalar multiplication for short_weierstrass through
-/// arkworks on G2.
-pub fn msm_g2(bases: Vec<u8>, scalars: Vec<u8>) -> Result<Vec<u8>, ()> {
-	msm_sw_generic::<g2::Config>(bases, scalars)
-}
-
-/// Compute a projective scalar multiplication for short_weierstrass
-/// through arkworks on G1.
-pub fn mul_projective_g1(base: Vec<u8>, scalar: Vec<u8>) -> Result<Vec<u8>, ()> {
-	mul_projective_generic::<g1::Config>(base, scalar)
-}
-
-/// Compute a projective scalar multiplication for short_weierstrass
-/// through arkworks on G2.
-pub fn mul_projective_g2(base: Vec<u8>, scalar: Vec<u8>) -> Result<Vec<u8>, ()> {
-	mul_projective_generic::<g2::Config>(base, scalar)
-}
-
-#[cfg(test)]
-mod tests {
-	use super::*;
-	use ark_algebra_test_templates::*;
-	use sp_ark_bls12_377::{
-		Bls12_377 as Bls12_377Host, G1Projective as G1ProjectiveHost,
-		G2Projective as G2ProjectiveHost, HostFunctions,
-	};
-
-	#[derive(PartialEq, Eq)]
-	struct Host;
-
-	impl HostFunctions for Host {
-		fn bls12_377_multi_miller_loop(a: Vec<u8>, b: Vec<u8>) -> Result<Vec<u8>, ()> {
-			crate::elliptic_curves::bls12_377_multi_miller_loop(a, b)
-		}
-		fn bls12_377_final_exponentiation(f12: Vec<u8>) -> Result<Vec<u8>, ()> {
-			crate::elliptic_curves::bls12_377_final_exponentiation(f12)
-		}
-		fn bls12_377_msm_g1(bases: Vec<u8>, bigints: Vec<u8>) -> Result<Vec<u8>, ()> {
-			crate::elliptic_curves::bls12_377_msm_g1(bases, bigints)
-		}
-		fn bls12_377_msm_g2(bases: Vec<u8>, bigints: Vec<u8>) -> Result<Vec<u8>, ()> {
-			crate::elliptic_curves::bls12_377_msm_g2(bases, bigints)
-		}
-		fn bls12_377_mul_projective_g1(base: Vec<u8>, scalar: Vec<u8>) -> Result<Vec<u8>, ()> {
-			crate::elliptic_curves::bls12_377_mul_projective_g1(base, scalar)
-		}
-		fn bls12_377_mul_projective_g2(base: Vec<u8>, scalar: Vec<u8>) -> Result<Vec<u8>, ()> {
-			crate::elliptic_curves::bls12_377_mul_projective_g2(base, scalar)
-		}
-	}
-
-	type Bls12_377 = Bls12_377Host<Host>;
-	type G1Projective = G1ProjectiveHost<Host>;
-	type G2Projective = G2ProjectiveHost<Host>;
-
-	test_group!(g1; G1Projective; sw);
-	test_group!(g2; G2Projective; sw);
-	test_group!(pairing_output; ark_ec::pairing::PairingOutput<Bls12_377>; msm);
-	test_pairing!(pairing; super::Bls12_377);
-}
diff --git a/substrate/primitives/crypto/ec-utils/src/bls12_381.rs b/substrate/primitives/crypto/ec-utils/src/bls12_381.rs
deleted file mode 100644
index 6c707aa581458e8520ac81971b7738b4617eb051..0000000000000000000000000000000000000000
--- a/substrate/primitives/crypto/ec-utils/src/bls12_381.rs
+++ /dev/null
@@ -1,219 +0,0 @@
-// This file is part of Substrate.
-
-// Copyright (C) 2017-2022 Parity Technologies (UK) Ltd.
-// SPDX-License-Identifier: Apache-2.0
-
-// Licensed under the Apache License, Version 2.0 (the "License");
-// you may not use this file except in compliance with the License.
-// You may obtain a copy of the License at
-//
-// 	http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the License is distributed on an "AS IS" BASIS,
-// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-// See the License for the specific language governing permissions and
-// limitations under the License.
-
-//! Support functions for bls12_381 to improve the performance of
-//! multi_miller_loop, final_exponentiation, msm's and projective
-//! multiplications by host function calls
-
-use crate::utils::{
-	final_exponentiation_generic, msm_sw_generic, mul_projective_generic, multi_miller_loop_generic,
-};
-use ark_bls12_381::{g1, g2, Bls12_381};
-use sp_std::vec::Vec;
-
-/// Compute a multi miller loop through arkworks
-pub fn multi_miller_loop(a: Vec<u8>, b: Vec<u8>) -> Result<Vec<u8>, ()> {
-	multi_miller_loop_generic::<Bls12_381>(a, b)
-}
-
-/// Compute a final exponentiation through arkworks
-pub fn final_exponentiation(target: Vec<u8>) -> Result<Vec<u8>, ()> {
-	final_exponentiation_generic::<Bls12_381>(target)
-}
-
-/// Compute a multi scalar multiplication for short_weierstrass through
-/// arkworks on G1.
-pub fn msm_g1(bases: Vec<u8>, scalars: Vec<u8>) -> Result<Vec<u8>, ()> {
-	msm_sw_generic::<g1::Config>(bases, scalars)
-}
-
-/// Compute a multi scalar multiplication for short_weierstrass through
-/// arkworks on G2.
-pub fn msm_g2(bases: Vec<u8>, scalars: Vec<u8>) -> Result<Vec<u8>, ()> {
-	msm_sw_generic::<g2::Config>(bases, scalars)
-}
-
-/// Compute a projective scalar multiplication for short_weierstrass
-/// through arkworks on G1.
-pub fn mul_projective_g1(base: Vec<u8>, scalar: Vec<u8>) -> Result<Vec<u8>, ()> {
-	mul_projective_generic::<g1::Config>(base, scalar)
-}
-
-/// Compute a projective scalar multiplication for short_weierstrass
-/// through arkworks on G2.
-pub fn mul_projective_g2(base: Vec<u8>, scalar: Vec<u8>) -> Result<Vec<u8>, ()> {
-	mul_projective_generic::<g2::Config>(base, scalar)
-}
-
-#[cfg(test)]
-mod tests {
-	use super::*;
-	use ark_algebra_test_templates::*;
-	use ark_ec::{AffineRepr, CurveGroup, Group};
-	use ark_ff::{fields::Field, One, Zero};
-	use ark_serialize::{CanonicalDeserialize, CanonicalSerialize, Compress, Validate};
-	use ark_std::{rand::Rng, test_rng, vec, UniformRand};
-	use sp_ark_bls12_381::{
-		fq::Fq, fq2::Fq2, fr::Fr, Bls12_381 as Bls12_381Host, G1Affine as G1AffineHost,
-		G1Projective as G1ProjectiveHost, G2Affine as G2AffineHost,
-		G2Projective as G2ProjectiveHost, HostFunctions,
-	};
-	use sp_ark_models::pairing::PairingOutput;
-
-	#[derive(PartialEq, Eq)]
-	struct Host;
-
-	impl HostFunctions for Host {
-		fn bls12_381_multi_miller_loop(a: Vec<u8>, b: Vec<u8>) -> Result<Vec<u8>, ()> {
-			crate::elliptic_curves::bls12_381_multi_miller_loop(a, b)
-		}
-		fn bls12_381_final_exponentiation(f12: Vec<u8>) -> Result<Vec<u8>, ()> {
-			crate::elliptic_curves::bls12_381_final_exponentiation(f12)
-		}
-		fn bls12_381_msm_g1(bases: Vec<u8>, bigints: Vec<u8>) -> Result<Vec<u8>, ()> {
-			crate::elliptic_curves::bls12_381_msm_g1(bases, bigints)
-		}
-		fn bls12_381_msm_g2(bases: Vec<u8>, bigints: Vec<u8>) -> Result<Vec<u8>, ()> {
-			crate::elliptic_curves::bls12_381_msm_g2(bases, bigints)
-		}
-		fn bls12_381_mul_projective_g1(base: Vec<u8>, scalar: Vec<u8>) -> Result<Vec<u8>, ()> {
-			crate::elliptic_curves::bls12_381_mul_projective_g1(base, scalar)
-		}
-		fn bls12_381_mul_projective_g2(base: Vec<u8>, scalar: Vec<u8>) -> Result<Vec<u8>, ()> {
-			crate::elliptic_curves::bls12_381_mul_projective_g2(base, scalar)
-		}
-	}
-
-	type Bls12_381 = Bls12_381Host<Host>;
-	type G1Projective = G1ProjectiveHost<Host>;
-	type G2Projective = G2ProjectiveHost<Host>;
-	type G1Affine = G1AffineHost<Host>;
-	type G2Affine = G2AffineHost<Host>;
-
-	test_group!(g1; G1Projective; sw);
-	test_group!(g2; G2Projective; sw);
-	test_group!(pairing_output; PairingOutput<Bls12_381>; msm);
-	test_pairing!(ark_pairing; super::Bls12_381);
-
-	#[test]
-	fn test_g1_endomorphism_beta() {
-		assert!(sp_ark_bls12_381::g1::BETA.pow([3u64]).is_one());
-	}
-
-	#[test]
-	fn test_g1_subgroup_membership_via_endomorphism() {
-		let mut rng = test_rng();
-		let generator = G1Projective::rand(&mut rng).into_affine();
-		assert!(generator.is_in_correct_subgroup_assuming_on_curve());
-	}
-
-	#[test]
-	fn test_g1_subgroup_non_membership_via_endomorphism() {
-		let mut rng = test_rng();
-		loop {
-			let x = Fq::rand(&mut rng);
-			let greatest = rng.gen();
-
-			if let Some(p) = G1Affine::get_point_from_x_unchecked(x, greatest) {
-				if !<G1Projective as ark_std::Zero>::is_zero(&p.mul_bigint(Fr::characteristic())) {
-					assert!(!p.is_in_correct_subgroup_assuming_on_curve());
-					return
-				}
-			}
-		}
-	}
-
-	#[test]
-	fn test_g2_subgroup_membership_via_endomorphism() {
-		let mut rng = test_rng();
-		let generator = G2Projective::rand(&mut rng).into_affine();
-		assert!(generator.is_in_correct_subgroup_assuming_on_curve());
-	}
-
-	#[test]
-	fn test_g2_subgroup_non_membership_via_endomorphism() {
-		let mut rng = test_rng();
-		loop {
-			let x = Fq2::rand(&mut rng);
-			let greatest = rng.gen();
-
-			if let Some(p) = G2Affine::get_point_from_x_unchecked(x, greatest) {
-				if !<G2Projective as Zero>::is_zero(&p.mul_bigint(Fr::characteristic())) {
-					assert!(!p.is_in_correct_subgroup_assuming_on_curve());
-					return
-				}
-			}
-		}
-	}
-
-	// Test vectors and macro adapted from https://github.com/zkcrypto/bls12_381/blob/e224ad4ea1babfc582ccd751c2bf128611d10936/src/test-data/mod.rs
-	macro_rules! test_vectors {
-		($projective:ident, $affine:ident, $compress:expr, $expected:ident) => {
-			let mut e = $projective::zero();
-
-			let mut v = vec![];
-			{
-				let mut expected = $expected;
-				for _ in 0..1000 {
-					let e_affine = $affine::from(e);
-					let mut serialized = vec![0u8; e.serialized_size($compress)];
-					e_affine.serialize_with_mode(serialized.as_mut_slice(), $compress).unwrap();
-					v.extend_from_slice(&serialized[..]);
-
-					let mut decoded = serialized;
-					let len_of_encoding = decoded.len();
-					(&mut decoded[..]).copy_from_slice(&expected[0..len_of_encoding]);
-					expected = &expected[len_of_encoding..];
-					let decoded =
-						$affine::deserialize_with_mode(&decoded[..], $compress, Validate::Yes)
-							.unwrap();
-					assert_eq!(e_affine, decoded);
-
-					e += &$projective::generator();
-				}
-			}
-
-			assert_eq!(&v[..], $expected);
-		};
-	}
-
-	#[test]
-	fn g1_compressed_valid_test_vectors() {
-		let bytes: &'static [u8] = include_bytes!("test-data/g1_compressed_valid_test_vectors.dat");
-		test_vectors!(G1Projective, G1Affine, Compress::Yes, bytes);
-	}
-
-	#[test]
-	fn g1_uncompressed_valid_test_vectors() {
-		let bytes: &'static [u8] =
-			include_bytes!("test-data/g1_uncompressed_valid_test_vectors.dat");
-		test_vectors!(G1Projective, G1Affine, Compress::No, bytes);
-	}
-
-	#[test]
-	fn g2_compressed_valid_test_vectors() {
-		let bytes: &'static [u8] = include_bytes!("test-data/g2_compressed_valid_test_vectors.dat");
-		test_vectors!(G2Projective, G2Affine, Compress::Yes, bytes);
-	}
-
-	#[test]
-	fn g2_uncompressed_valid_test_vectors() {
-		let bytes: &'static [u8] =
-			include_bytes!("test-data/g2_uncompressed_valid_test_vectors.dat");
-		test_vectors!(G2Projective, G2Affine, Compress::No, bytes);
-	}
-}
diff --git a/substrate/primitives/crypto/ec-utils/src/bw6_761.rs b/substrate/primitives/crypto/ec-utils/src/bw6_761.rs
deleted file mode 100644
index 2f3b4c3c9c9aacdde7a11045136cb3411d7a5867..0000000000000000000000000000000000000000
--- a/substrate/primitives/crypto/ec-utils/src/bw6_761.rs
+++ /dev/null
@@ -1,103 +0,0 @@
-// This file is part of Substrate.
-
-// Copyright (C) 2017-2022 Parity Technologies (UK) Ltd.
-// SPDX-License-Identifier: Apache-2.0
-
-// Licensed under the Apache License, Version 2.0 (the "License");
-// you may not use this file except in compliance with the License.
-// You may obtain a copy of the License at
-//
-// 	http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the License is distributed on an "AS IS" BASIS,
-// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-// See the License for the specific language governing permissions and
-// limitations under the License.
-
-//! Support functions for bw6_761 to improve the performance of
-//! multi_miller_loop, final_exponentiation, msm's and projective
-//! multiplications by host function calls.
-
-use crate::utils::{
-	final_exponentiation_generic, msm_sw_generic, mul_projective_generic, multi_miller_loop_generic,
-};
-use ark_bw6_761::{g1, g2, BW6_761};
-use sp_std::vec::Vec;
-
-/// Compute a multi miller loop through arkworks
-pub fn multi_miller_loop(a: Vec<u8>, b: Vec<u8>) -> Result<Vec<u8>, ()> {
-	multi_miller_loop_generic::<BW6_761>(a, b)
-}
-
-/// Compute a final exponentiation through arkworks
-pub fn final_exponentiation(target: Vec<u8>) -> Result<Vec<u8>, ()> {
-	final_exponentiation_generic::<BW6_761>(target)
-}
-
-/// Compute a multi scalar multiplication for short_weierstrass through
-/// arkworks on G1.
-pub fn msm_g1(bases: Vec<u8>, scalars: Vec<u8>) -> Result<Vec<u8>, ()> {
-	msm_sw_generic::<g1::Config>(bases, scalars)
-}
-
-/// Compute a multi scalar multiplication for short_weierstrass through
-/// arkworks on G2.
-pub fn msm_g2(bases: Vec<u8>, scalars: Vec<u8>) -> Result<Vec<u8>, ()> {
-	msm_sw_generic::<g2::Config>(bases, scalars)
-}
-
-/// Compute a projective scalar multiplication for short_weierstrass through
-/// arkworks on G1.
-pub fn mul_projective_g1(base: Vec<u8>, scalar: Vec<u8>) -> Result<Vec<u8>, ()> {
-	mul_projective_generic::<g1::Config>(base, scalar)
-}
-
-/// Compute a projective scalar multiplication for short_weierstrass through
-/// arkworks on G2.
-pub fn mul_projective_g2(base: Vec<u8>, scalar: Vec<u8>) -> Result<Vec<u8>, ()> {
-	mul_projective_generic::<g2::Config>(base, scalar)
-}
-
-#[cfg(test)]
-mod tests {
-	use super::*;
-	use ark_algebra_test_templates::*;
-	use sp_ark_bw6_761::{
-		G1Projective as G1ProjectiveHost, G2Projective as G2ProjectiveHost, HostFunctions,
-		BW6_761 as BW6_761Host,
-	};
-
-	#[derive(PartialEq, Eq)]
-	struct Host;
-
-	impl HostFunctions for Host {
-		fn bw6_761_multi_miller_loop(a: Vec<u8>, b: Vec<u8>) -> Result<Vec<u8>, ()> {
-			crate::elliptic_curves::bw6_761_multi_miller_loop(a, b)
-		}
-		fn bw6_761_final_exponentiation(f12: Vec<u8>) -> Result<Vec<u8>, ()> {
-			crate::elliptic_curves::bw6_761_final_exponentiation(f12)
-		}
-		fn bw6_761_msm_g1(bases: Vec<u8>, bigints: Vec<u8>) -> Result<Vec<u8>, ()> {
-			crate::elliptic_curves::bw6_761_msm_g1(bases, bigints)
-		}
-		fn bw6_761_msm_g2(bases: Vec<u8>, bigints: Vec<u8>) -> Result<Vec<u8>, ()> {
-			crate::elliptic_curves::bw6_761_msm_g2(bases, bigints)
-		}
-		fn bw6_761_mul_projective_g1(base: Vec<u8>, scalar: Vec<u8>) -> Result<Vec<u8>, ()> {
-			crate::elliptic_curves::bw6_761_mul_projective_g1(base, scalar)
-		}
-		fn bw6_761_mul_projective_g2(base: Vec<u8>, scalar: Vec<u8>) -> Result<Vec<u8>, ()> {
-			crate::elliptic_curves::bw6_761_mul_projective_g2(base, scalar)
-		}
-	}
-
-	type BW6_761 = BW6_761Host<Host>;
-	type G1Projective = G1ProjectiveHost<Host>;
-	type G2Projective = G2ProjectiveHost<Host>;
-
-	test_group!(g1; G1Projective; sw);
-	test_group!(g2; G2Projective; sw);
-	test_group!(pairing_output; ark_ec::pairing::PairingOutput<BW6_761>; msm);
-	test_pairing!(pairing; super::BW6_761);
-}
diff --git a/substrate/primitives/crypto/ec-utils/src/ed_on_bls12_377.rs b/substrate/primitives/crypto/ec-utils/src/ed_on_bls12_377.rs
deleted file mode 100644
index 84a86286180f7b74a73ffce0c5cd9ece83bf0673..0000000000000000000000000000000000000000
--- a/substrate/primitives/crypto/ec-utils/src/ed_on_bls12_377.rs
+++ /dev/null
@@ -1,56 +0,0 @@
-// This file is part of Substrate.
-
-// Copyright (C) 2017-2022 Parity Technologies (UK) Ltd.
-// SPDX-License-Identifier: Apache-2.0
-
-// Licensed under the Apache License, Version 2.0 (the "License");
-// you may not use this file except in compliance with the License.
-// You may obtain a copy of the License at
-//
-// 	http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the License is distributed on an "AS IS" BASIS,
-// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-// See the License for the specific language governing permissions and
-// limitations under the License.
-
-//! Support functions for ed_on_bls12_377 to improve the performance of
-//! msm and projective multiplication by host function calls
-
-use crate::utils::{msm_te_generic, mul_projective_te_generic};
-use ark_ed_on_bls12_377::EdwardsConfig;
-use sp_std::vec::Vec;
-
-/// Compute a multi scalar mulitplication for twisted_edwards through
-/// arkworks.
-pub fn msm(bases: Vec<u8>, scalars: Vec<u8>) -> Result<Vec<u8>, ()> {
-	msm_te_generic::<EdwardsConfig>(bases, scalars)
-}
-
-/// Compute a projective scalar multiplication for twisted_edwards
-/// through arkworks.
-pub fn mul_projective(base: Vec<u8>, scalar: Vec<u8>) -> Result<Vec<u8>, ()> {
-	mul_projective_te_generic::<EdwardsConfig>(base, scalar)
-}
-
-#[cfg(test)]
-mod tests {
-	use super::*;
-	use ark_algebra_test_templates::*;
-	use sp_ark_ed_on_bls12_377::{EdwardsProjective as EdwardsProjectiveHost, HostFunctions};
-
-	struct Host {}
-
-	impl HostFunctions for Host {
-		fn ed_on_bls12_377_msm(bases: Vec<u8>, scalars: Vec<u8>) -> Result<Vec<u8>, ()> {
-			crate::elliptic_curves::ed_on_bls12_377_msm(bases, scalars)
-		}
-		fn ed_on_bls12_377_mul_projective(base: Vec<u8>, scalar: Vec<u8>) -> Result<Vec<u8>, ()> {
-			crate::elliptic_curves::ed_on_bls12_377_mul_projective(base, scalar)
-		}
-	}
-
-	type EdwardsProjective = EdwardsProjectiveHost<Host>;
-	test_group!(te; EdwardsProjective; te);
-}
diff --git a/substrate/primitives/crypto/ec-utils/src/ed_on_bls12_381_bandersnatch.rs b/substrate/primitives/crypto/ec-utils/src/ed_on_bls12_381_bandersnatch.rs
deleted file mode 100644
index 72b68c3b47182e012b25f0b5beab8cb74d05f874..0000000000000000000000000000000000000000
--- a/substrate/primitives/crypto/ec-utils/src/ed_on_bls12_381_bandersnatch.rs
+++ /dev/null
@@ -1,94 +0,0 @@
-// This file is part of Substrate.
-
-// Copyright (C) 2017-2022 Parity Technologies (UK) Ltd.
-// SPDX-License-Identifier: Apache-2.0
-
-// Licensed under the Apache License, Version 2.0 (the "License");
-// you may not use this file except in compliance with the License.
-// You may obtain a copy of the License at
-//
-// 	http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the License is distributed on an "AS IS" BASIS,
-// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-// See the License for the specific language governing permissions and
-// limitations under the License.
-
-//! Support functions for ed_on_bls12_381_bandersnatch to improve the
-//! performance of msm' and projective multiplications by host function
-//! calls.
-
-use crate::utils::{
-	msm_sw_generic, msm_te_generic, mul_projective_generic, mul_projective_te_generic,
-};
-use ark_ed_on_bls12_381_bandersnatch::BandersnatchConfig;
-use sp_std::vec::Vec;
-
-/// Compute a multi scalar multiplication for short_weierstrass through
-/// arkworks.
-pub fn sw_msm(bases: Vec<u8>, scalars: Vec<u8>) -> Result<Vec<u8>, ()> {
-	msm_sw_generic::<BandersnatchConfig>(bases, scalars)
-}
-
-/// Compute a multi scalar mulitplication for twisted_edwards through
-/// arkworks.
-pub fn te_msm(bases: Vec<u8>, scalars: Vec<u8>) -> Result<Vec<u8>, ()> {
-	msm_te_generic::<BandersnatchConfig>(bases, scalars)
-}
-
-/// Compute a projective scalar multiplication for short_weierstrass
-/// through arkworks.
-pub fn sw_mul_projective(base: Vec<u8>, scalar: Vec<u8>) -> Result<Vec<u8>, ()> {
-	mul_projective_generic::<BandersnatchConfig>(base, scalar)
-}
-
-/// Compute a projective scalar multiplication for twisted_edwards
-/// through arkworks.
-pub fn te_mul_projective(base: Vec<u8>, scalar: Vec<u8>) -> Result<Vec<u8>, ()> {
-	mul_projective_te_generic::<BandersnatchConfig>(base, scalar)
-}
-
-#[cfg(test)]
-mod tests {
-	use super::*;
-	use ark_algebra_test_templates::*;
-	use sp_ark_ed_on_bls12_381_bandersnatch::{
-		EdwardsProjective as EdwardsProjectiveHost, HostFunctions, SWProjective as SWProjectiveHost,
-	};
-
-	pub struct Host {}
-
-	impl HostFunctions for Host {
-		fn ed_on_bls12_381_bandersnatch_te_msm(
-			bases: Vec<u8>,
-			scalars: Vec<u8>,
-		) -> Result<Vec<u8>, ()> {
-			crate::elliptic_curves::ed_on_bls12_381_bandersnatch_te_msm(bases, scalars)
-		}
-		fn ed_on_bls12_381_bandersnatch_sw_msm(
-			bases: Vec<u8>,
-			scalars: Vec<u8>,
-		) -> Result<Vec<u8>, ()> {
-			crate::elliptic_curves::ed_on_bls12_381_bandersnatch_sw_msm(bases, scalars)
-		}
-		fn ed_on_bls12_381_bandersnatch_te_mul_projective(
-			base: Vec<u8>,
-			scalar: Vec<u8>,
-		) -> Result<Vec<u8>, ()> {
-			crate::elliptic_curves::ed_on_bls12_381_bandersnatch_te_mul_projective(base, scalar)
-		}
-		fn ed_on_bls12_381_bandersnatch_sw_mul_projective(
-			base: Vec<u8>,
-			scalar: Vec<u8>,
-		) -> Result<Vec<u8>, ()> {
-			crate::elliptic_curves::ed_on_bls12_381_bandersnatch_sw_mul_projective(base, scalar)
-		}
-	}
-
-	type EdwardsProjective = EdwardsProjectiveHost<Host>;
-	type SWProjective = SWProjectiveHost<Host>;
-
-	test_group!(sw; SWProjective; sw);
-	test_group!(te; EdwardsProjective; te);
-}
diff --git a/substrate/primitives/crypto/ec-utils/src/lib.rs b/substrate/primitives/crypto/ec-utils/src/lib.rs
index c1877dd5b5d727b7b63104b2d3215e9969f41fe8..c5cc85077391c9165ef192e51ebf1e492b0cffba 100644
--- a/substrate/primitives/crypto/ec-utils/src/lib.rs
+++ b/substrate/primitives/crypto/ec-utils/src/lib.rs
@@ -15,250 +15,272 @@
 // See the License for the specific language governing permissions and
 // limitations under the License.
 
-//! The main elliptic curves trait, allowing Substrate to call into host functions
-//! for operations on elliptic curves.
+//! Elliptic Curves host functions which may be used to handle some of the *Arkworks*
+//! computationally expensive operations.
 
 #![warn(missing_docs)]
 #![cfg_attr(not(feature = "std"), no_std)]
 
-pub mod bls12_377;
-pub mod bls12_381;
-pub mod bw6_761;
-pub mod ed_on_bls12_377;
-pub mod ed_on_bls12_381_bandersnatch;
 mod utils;
 
 use sp_runtime_interface::runtime_interface;
+use sp_std::vec::Vec;
+use utils::*;
 
-/// Interfaces for working with elliptic curves related types from within the runtime.
-/// All type are (de-)serialized through the wrapper types from the ark-scale trait,
-/// with ark_scale::{ArkScale, ArkScaleProjective};
+/// Interfaces for working with *Arkworks* elliptic curves related types from within the runtime.
+///
+/// All types are (de-)serialized through the wrapper types from the `ark-scale` trait,
+/// with `ark_scale::{ArkScale, ArkScaleProjective}`.
+///
+/// `ArkScale`'s `Usage` generic parameter is expected to be set to `HOST_CALL`, which is
+/// a shortcut for "not-validated" and "not-compressed".
 #[runtime_interface]
 pub trait EllipticCurves {
-	/// Compute a multi Miller loop for bls12_37
-	/// Receives encoded:
-	/// a: ArkScale<Vec<ark_ec::bls12::G1Prepared::<ark_bls12_377::Config>>>
-	/// b: ArkScale<Vec<ark_ec::bls12::G2Prepared::<ark_bls12_377::Config>>>
-	/// Returns encoded: ArkScale<MillerLoopOutput<Bls12<ark_bls12_377::Config>>>
+	/// Pairing multi Miller loop for BLS12-377.
+	///
+	/// - Receives encoded:
+	///   - `a: ArkScale<Vec<ark_ec::bls12::G1Prepared::<ark_bls12_377::Config>>>`.
+	///   - `b: ArkScale<Vec<ark_ec::bls12::G2Prepared::<ark_bls12_377::Config>>>`.
+	/// - Returns encoded: ArkScale<MillerLoopOutput<Bls12<ark_bls12_377::Config>>>.
 	fn bls12_377_multi_miller_loop(a: Vec<u8>, b: Vec<u8>) -> Result<Vec<u8>, ()> {
-		bls12_377::multi_miller_loop(a, b)
+		multi_miller_loop::<ark_bls12_377::Bls12_377>(a, b)
 	}
 
-	/// Compute a final exponentiation for bls12_377
-	/// Receives encoded: ArkScale<MillerLoopOutput<Bls12<ark_bls12_377::Config>>>
-	/// Returns encoded: ArkScale<PairingOutput<Bls12<ark_bls12_377::Config>>>
-	fn bls12_377_final_exponentiation(f12: Vec<u8>) -> Result<Vec<u8>, ()> {
-		bls12_377::final_exponentiation(f12)
+	/// Pairing final exponentiation for BLS12-377.
+	///
+	/// - Receives encoded: `ArkScale<MillerLoopOutput<Bls12<ark_bls12_377::Config>>>`.
+	/// - Returns encoded: `ArkScale<PairingOutput<Bls12<ark_bls12_377::Config>>>`.
+	fn bls12_377_final_exponentiation(f: Vec<u8>) -> Result<Vec<u8>, ()> {
+		final_exponentiation::<ark_bls12_377::Bls12_377>(f)
 	}
 
-	/// Compute a projective multiplication on G1 for bls12_377
-	/// Receives encoded:
-	/// base: ArkScaleProjective<ark_bls12_377::G1Projective>
-	/// scalar: ArkScale<&[u64]>
-	/// Returns encoded: ArkScaleProjective<ark_bls12_377::G1Projective>
+	/// Projective multiplication on G1 for BLS12-377.
+	///
+	/// - Receives encoded:
+	///   - `base`: `ArkScaleProjective<ark_bls12_377::G1Projective>`.
+	///   - `scalar`: `ArkScale<&[u64]>`.
+	/// - Returns encoded: `ArkScaleProjective<ark_bls12_377::G1Projective>`.
 	fn bls12_377_mul_projective_g1(base: Vec<u8>, scalar: Vec<u8>) -> Result<Vec<u8>, ()> {
-		bls12_377::mul_projective_g1(base, scalar)
+		mul_projective_sw::<ark_bls12_377::g1::Config>(base, scalar)
 	}
 
-	/// Compute a projective multiplication on G2 for bls12_377
-	/// through arkworks on G2
-	/// Receives encoded:
-	/// base: ArkScaleProjective<ark_bls12_377::G2Projective>
-	/// scalar: ArkScale<&[u64]>
-	/// Returns encoded: ArkScaleProjective<ark_bls12_377::G2Projective>
+	/// Projective multiplication on G2 for BLS12-377.
+	///
+	/// - Receives encoded:
+	///   - `base`: `ArkScaleProjective<ark_bls12_377::G2Projective>`.
+	///   - `scalar`: `ArkScale<&[u64]>`.
+	/// - Returns encoded: `ArkScaleProjective<ark_bls12_377::G2Projective>`.
 	fn bls12_377_mul_projective_g2(base: Vec<u8>, scalar: Vec<u8>) -> Result<Vec<u8>, ()> {
-		bls12_377::mul_projective_g2(base, scalar)
+		mul_projective_sw::<ark_bls12_377::g2::Config>(base, scalar)
 	}
 
-	/// Compute a msm on G1 for bls12_377
-	/// Receives encoded:
-	/// bases: ArkScale<&[ark_bls12_377::G1Affine]>
-	/// scalars: ArkScale<&[ark_bls12_377::Fr]>
-	/// Returns encoded: ArkScaleProjective<ark_bls12_377::G1Projective>
+	/// Multi scalar multiplication on G1 for BLS12-377.
+	///
+	/// - Receives encoded:
+	///   - `bases`: `ArkScale<&[ark_bls12_377::G1Affine]>`.
+	///   - `scalars`: `ArkScale<&[ark_bls12_377::Fr]>`.
+	/// - Returns encoded: `ArkScaleProjective<ark_bls12_377::G1Projective>`.
 	fn bls12_377_msm_g1(bases: Vec<u8>, scalars: Vec<u8>) -> Result<Vec<u8>, ()> {
-		bls12_377::msm_g1(bases, scalars)
+		msm_sw::<ark_bls12_377::g1::Config>(bases, scalars)
 	}
 
-	/// Compute a msm on G2 for bls12_377
-	/// Receives encoded:
-	/// bases: ArkScale<&[ark_bls12_377::G2Affine]>
-	/// scalars: ArkScale<&[ark_bls12_377::Fr]>
-	/// Returns encoded: ArkScaleProjective<ark_bls12_377::G2Projective>
+	/// Multi scalar multiplication on G2 for BLS12-377.
+	///
+	/// - Receives encoded:
+	///   - `bases`: `ArkScale<&[ark_bls12_377::G2Affine]>`.
+	///   - `scalars`: `ArkScale<&[ark_bls12_377::Fr]>`.
+	/// - Returns encoded: `ArkScaleProjective<ark_bls12_377::G2Projective>`.
 	fn bls12_377_msm_g2(bases: Vec<u8>, scalars: Vec<u8>) -> Result<Vec<u8>, ()> {
-		bls12_377::msm_g2(bases, scalars)
+		msm_sw::<ark_bls12_377::g2::Config>(bases, scalars)
 	}
 
-	/// Compute a multi Miller loop on bls12_381
-	/// Receives encoded:
-	/// a: ArkScale<Vec<ark_ec::bls12::G1Prepared::<ark_bls12_381::Config>>>
-	/// b: ArkScale<Vec<ark_ec::bls12::G2Prepared::<ark_bls12_381::Config>>>
-	/// Returns encoded: ArkScale<MillerLoopOutput<Bls12<ark_bls12_381::Config>>>
+	/// Pairing multi Miller loop for BLS12-381.
+	///
+	/// - Receives encoded:
+	///   - `a`: `ArkScale<Vec<ark_ec::bls12::G1Prepared::<ark_bls12_381::Config>>>`.
+	///   - `b`: `ArkScale<Vec<ark_ec::bls12::G2Prepared::<ark_bls12_381::Config>>>`.
+	/// - Returns encoded: ArkScale<MillerLoopOutput<Bls12<ark_bls12_381::Config>>>
 	fn bls12_381_multi_miller_loop(a: Vec<u8>, b: Vec<u8>) -> Result<Vec<u8>, ()> {
-		bls12_381::multi_miller_loop(a, b)
+		multi_miller_loop::<ark_bls12_381::Bls12_381>(a, b)
 	}
 
-	/// Compute a final exponentiation on bls12_381
-	/// Receives encoded: ArkScale<MillerLoopOutput<Bls12<ark_bls12_381::Config>>>
-	/// Returns encoded:ArkScale<PairingOutput<Bls12<ark_bls12_381::Config>>>
-	fn bls12_381_final_exponentiation(f12: Vec<u8>) -> Result<Vec<u8>, ()> {
-		bls12_381::final_exponentiation(f12)
+	/// Pairing final exponentiation for BLS12-381.
+	///
+	/// - Receives encoded: `ArkScale<MillerLoopOutput<Bls12<ark_bls12_381::Config>>>`.
+	/// - Returns encoded: `ArkScale<PairingOutput<Bls12<ark_bls12_381::Config>>>`.
+	fn bls12_381_final_exponentiation(f: Vec<u8>) -> Result<Vec<u8>, ()> {
+		final_exponentiation::<ark_bls12_381::Bls12_381>(f)
 	}
 
-	/// Compute a projective multiplication on G1 for bls12_381
-	/// Receives encoded:
-	/// base: ArkScaleProjective<ark_bls12_381::G1Projective>
-	/// scalar: ArkScale<&[u64]>
-	/// Returns encoded: ArkScaleProjective<ark_bls12_381::G1Projective>
+	/// Projective multiplication on G1 for BLS12-381.
+	///
+	/// - Receives encoded:
+	///   - `base`: `ArkScaleProjective<ark_bls12_381::G1Projective>`.
+	///   - `scalar`: `ArkScale<&[u64]>`.
+	/// - Returns encoded: `ArkScaleProjective<ark_bls12_381::G1Projective>`.
 	fn bls12_381_mul_projective_g1(base: Vec<u8>, scalar: Vec<u8>) -> Result<Vec<u8>, ()> {
-		bls12_381::mul_projective_g1(base, scalar)
+		mul_projective_sw::<ark_bls12_381::g1::Config>(base, scalar)
 	}
 
-	/// Compute a projective multiplication on G2 for bls12_381
-	/// Receives encoded:
-	/// base: ArkScaleProjective<ark_bls12_381::G2Projective>
-	/// scalar: ArkScale<&[u64]>
-	/// Returns encoded: ArkScaleProjective<ark_bls12_381::G2Projective>
+	/// Projective multiplication on G2 for BLS12-381.
+	///
+	/// - Receives encoded:
+	///   - `base`: `ArkScaleProjective<ark_bls12_381::G2Projective>`.
+	///   - `scalar`: `ArkScale<&[u64]>`.
+	/// - Returns encoded: `ArkScaleProjective<ark_bls12_381::G2Projective>`.
 	fn bls12_381_mul_projective_g2(base: Vec<u8>, scalar: Vec<u8>) -> Result<Vec<u8>, ()> {
-		bls12_381::mul_projective_g2(base, scalar)
+		mul_projective_sw::<ark_bls12_381::g2::Config>(base, scalar)
 	}
 
-	/// Compute a msm on G1 for bls12_381
-	/// Receives encoded:
-	/// bases: ArkScale<&[ark_bls12_381::G1Affine]>
-	/// scalars: ArkScale<&[ark_bls12_381::Fr]>
-	/// Returns encoded: ArkScaleProjective<ark_bls12_381::G1Projective>
+	/// Multi scalar multiplication on G1 for BLS12-381.
+	///
+	/// - Receives encoded:
+	///   - bases: `ArkScale<&[ark_bls12_381::G1Affine]>`.
+	///   - scalars: `ArkScale<&[ark_bls12_381::Fr]>`.
+	/// - Returns encoded: `ArkScaleProjective<ark_bls12_381::G1Projective>`.
 	fn bls12_381_msm_g1(bases: Vec<u8>, scalars: Vec<u8>) -> Result<Vec<u8>, ()> {
-		bls12_381::msm_g1(bases, scalars)
+		msm_sw::<ark_bls12_381::g1::Config>(bases, scalars)
 	}
 
-	/// Compute a msm on G2 for bls12_381
-	/// Receives encoded:
-	/// bases: ArkScale<&[ark_bls12_381::G2Affine]>
-	/// scalars: ArkScale<&[ark_bls12_381::Fr]>
-	/// Returns encoded: ArkScaleProjective<ark_bls12_381::G2Projective>
+	/// Multi scalar multiplication on G2 for BLS12-381.
+	///
+	/// - Receives encoded:
+	///   - `bases`: `ArkScale<&[ark_bls12_381::G2Affine]>`.
+	///   - `scalars`: `ArkScale<&[ark_bls12_381::Fr]>`.
+	/// - Returns encoded: `ArkScaleProjective<ark_bls12_381::G2Projective>`.
 	fn bls12_381_msm_g2(bases: Vec<u8>, scalars: Vec<u8>) -> Result<Vec<u8>, ()> {
-		bls12_381::msm_g2(bases, scalars)
+		msm_sw::<ark_bls12_381::g2::Config>(bases, scalars)
 	}
 
-	/// Compute a multi Miller loop on bw6_761
-	/// Receives encoded:
-	/// a: ArkScale<Vec<ark_ec::bw6::G1Prepared::<ark_bw6_761::Config>>>
-	/// b: ArkScale<Vec<ark_ec::bw6::G2Prepared::<ark_bw6_761::Config>>>
-	/// Returns encoded: ArkScale<MillerLoopOutput<Bls12<ark_bw6_761::Config>>>
+	/// Pairing multi Miller loop for BW6-761.
+	///
+	/// - Receives encoded:
+	///   - `a`: `ArkScale<Vec<ark_ec::bw6::G1Prepared::<ark_bw6_761::Config>>>`.
+	///   - `b`: `ArkScale<Vec<ark_ec::bw6::G2Prepared::<ark_bw6_761::Config>>>`.
+	/// - Returns encoded: `ArkScale<MillerLoopOutput<Bls12<ark_bw6_761::Config>>>`.
 	fn bw6_761_multi_miller_loop(a: Vec<u8>, b: Vec<u8>) -> Result<Vec<u8>, ()> {
-		bw6_761::multi_miller_loop(a, b)
+		multi_miller_loop::<ark_bw6_761::BW6_761>(a, b)
 	}
 
-	/// Compute a final exponentiation on bw6_761
-	/// Receives encoded: ArkScale<MillerLoopOutput<BW6<ark_bw6_761::Config>>>
-	/// Returns encoded: ArkScale<PairingOutput<BW6<ark_bw6_761::Config>>>
-	fn bw6_761_final_exponentiation(f12: Vec<u8>) -> Result<Vec<u8>, ()> {
-		bw6_761::final_exponentiation(f12)
+	/// Pairing final exponentiation for BW6-761.
+	///
+	/// - Receives encoded: `ArkScale<MillerLoopOutput<BW6<ark_bw6_761::Config>>>`.
+	/// - Returns encoded: `ArkScale<PairingOutput<BW6<ark_bw6_761::Config>>>`.
+	fn bw6_761_final_exponentiation(f: Vec<u8>) -> Result<Vec<u8>, ()> {
+		final_exponentiation::<ark_bw6_761::BW6_761>(f)
 	}
 
-	/// Compute a projective multiplication on G1 for bw6_761
-	/// Receives encoded:
-	/// base: ArkScaleProjective<ark_bw6_761::G1Projective>
-	/// scalar: ArkScale<&[u64]>
-	/// Returns encoded: ArkScaleProjective<ark_bw6_761::G1Projective>
+	/// Projective multiplication on G1 for BW6-761.
+	///
+	/// - Receives encoded:
+	///   - `base`: `ArkScaleProjective<ark_bw6_761::G1Projective>`.
+	///   - `scalar`: `ArkScale<&[u64]>`.
+	/// - Returns encoded: `ArkScaleProjective<ark_bw6_761::G1Projective>`.
 	fn bw6_761_mul_projective_g1(base: Vec<u8>, scalar: Vec<u8>) -> Result<Vec<u8>, ()> {
-		bw6_761::mul_projective_g1(base, scalar)
+		mul_projective_sw::<ark_bw6_761::g1::Config>(base, scalar)
 	}
 
-	/// Compute a projective multiplication on G2 for bw6_761
-	/// Receives encoded:
-	/// base: ArkScaleProjective<ark_bw6_761::G2Projective>
-	/// scalar: ArkScale<&[u64]>
-	/// Returns encoded: ArkScaleProjective<ark_bw6_761::G2Projective>
+	/// Projective multiplication on G2 for BW6-761.
+	///
+	/// - Receives encoded:
+	///   - `base`: `ArkScaleProjective<ark_bw6_761::G2Projective>`.
+	///   - `scalar`: `ArkScale<&[u64]>`.
+	/// - Returns encoded: `ArkScaleProjective<ark_bw6_761::G2Projective>`.
 	fn bw6_761_mul_projective_g2(base: Vec<u8>, scalar: Vec<u8>) -> Result<Vec<u8>, ()> {
-		bw6_761::mul_projective_g2(base, scalar)
+		mul_projective_sw::<ark_bw6_761::g2::Config>(base, scalar)
 	}
 
-	/// Compute a msm on G1 for bw6_761
-	/// Receives encoded:
-	/// bases: ArkScale<&[ark_bw6_761::G1Affine]>
-	/// scalars: ArkScale<&[ark_bw6_761::Fr]>
-	/// Returns encoded: ArkScaleProjective<ark_bw6_761::G1Projective>
+	/// Multi scalar multiplication on G1 for BW6-761.
+	///
+	/// - Receives encoded:
+	///   - `bases`: `ArkScale<&[ark_bw6_761::G1Affine]>`.
+	///   - `scalars`: `ArkScale<&[ark_bw6_761::Fr]>`.
+	/// - Returns encoded: `ArkScaleProjective<ark_bw6_761::G1Projective>`.
 	fn bw6_761_msm_g1(bases: Vec<u8>, bigints: Vec<u8>) -> Result<Vec<u8>, ()> {
-		bw6_761::msm_g1(bases, bigints)
+		msm_sw::<ark_bw6_761::g1::Config>(bases, bigints)
 	}
 
-	/// Compute a msm on G2 for bw6_761
-	/// Receives encoded:
-	/// bases: ArkScale<&[ark_bw6_761::G2Affine]>
-	/// scalars: ArkScale<&[ark_bw6_761::Fr]>
-	/// Returns encoded: ArkScaleProjective<ark_bw6_761::G2Projective>
+	/// Multi scalar multiplication on G2 for BW6-761.
+	///
+	/// - Receives encoded:
+	///   - `bases`: `ArkScale<&[ark_bw6_761::G2Affine]>`.
+	///   - `scalars`: `ArkScale<&[ark_bw6_761::Fr]>`.
+	/// - Returns encoded: `ArkScaleProjective<ark_bw6_761::G2Projective>`.
 	fn bw6_761_msm_g2(bases: Vec<u8>, bigints: Vec<u8>) -> Result<Vec<u8>, ()> {
-		bw6_761::msm_g2(bases, bigints)
+		msm_sw::<ark_bw6_761::g2::Config>(bases, bigints)
 	}
 
-	/// Compute projective multiplication on ed_on_bls12_377
-	/// Receives encoded:
-	/// base: ArkScaleProjective<ark_ed_on_bls12_377::EdwardsProjective>
-	/// scalar: ArkScale<&[u64]>
-	/// Returns encoded: ArkScaleProjective<ark_ed_on_bls12_377::EdwardsProjective>
+	/// Twisted Edwards projective multiplication for Ed-on-BLS12-377.
+	///
+	/// - Receives encoded:
+	///   - `base`: `ArkScaleProjective<ark_ed_on_bls12_377::EdwardsProjective>`.
+	///   - `scalar`: `ArkScale<&[u64]>`.
+	/// - Returns encoded: `ArkScaleProjective<ark_ed_on_bls12_377::EdwardsProjective>`.
 	fn ed_on_bls12_377_mul_projective(base: Vec<u8>, scalar: Vec<u8>) -> Result<Vec<u8>, ()> {
-		ed_on_bls12_377::mul_projective(base, scalar)
+		mul_projective_te::<ark_ed_on_bls12_377::EdwardsConfig>(base, scalar)
 	}
 
-	/// Compute msm on ed_on_bls12_377
-	/// Receives encoded:
-	/// bases: ArkScale<&[ark_ed_on_bls12_377::EdwardsAffine]>
-	/// scalars:
-	/// ArkScale<&[ark_ed_on_bls12_377::Fr]>
-	/// Returns encoded:
-	/// ArkScaleProjective<ark_ed_on_bls12_377::EdwardsProjective>
+	/// Twisted Edwards multi scalar multiplication for Ed-on-BLS12-377.
+	///
+	/// - Receives encoded:
+	///   - `bases`: `ArkScale<&[ark_ed_on_bls12_377::EdwardsAffine]>`.
+	///   - `scalars`: `ArkScale<&[ark_ed_on_bls12_377::Fr]>`.
+	/// - Returns encoded: `ArkScaleProjective<ark_ed_on_bls12_377::EdwardsProjective>`.
 	fn ed_on_bls12_377_msm(bases: Vec<u8>, scalars: Vec<u8>) -> Result<Vec<u8>, ()> {
-		ed_on_bls12_377::msm(bases, scalars)
+		msm_te::<ark_ed_on_bls12_377::EdwardsConfig>(bases, scalars)
 	}
 
-	/// Compute short weierstrass projective multiplication on ed_on_bls12_381_bandersnatch
-	/// Receives encoded:
-	/// base: ArkScaleProjective<ark_ed_on_bls12_381_bandersnatch::SWProjective>
-	/// scalar: ArkScale<&[u64]>
-	/// Returns encoded: ArkScaleProjective<ark_ed_on_bls12_381_bandersnatch::SWProjective>
+	/// Short Weierstrass projective multiplication for Ed-on-BLS12-381-Bandersnatch.
+	///
+	/// - Receives encoded:
+	///   - `base`: `ArkScaleProjective<ark_ed_on_bls12_381_bandersnatch::SWProjective>`.
+	///   - `scalar`: `ArkScale<&[u64]>`.
+	/// - Returns encoded: `ArkScaleProjective<ark_ed_on_bls12_381_bandersnatch::SWProjective>`.
 	fn ed_on_bls12_381_bandersnatch_sw_mul_projective(
 		base: Vec<u8>,
 		scalar: Vec<u8>,
 	) -> Result<Vec<u8>, ()> {
-		ed_on_bls12_381_bandersnatch::sw_mul_projective(base, scalar)
+		mul_projective_sw::<ark_ed_on_bls12_381_bandersnatch::SWConfig>(base, scalar)
 	}
 
-	/// Compute twisted edwards projective multiplication on ed_on_bls12_381_bandersnatch
-	/// Receives encoded:
-	/// base: ArkScaleProjective<ark_ed_on_bls12_381_bandersnatch::EdwardsProjective>
-	/// scalar: ArkScale<&[u64]>
-	/// Returns encoded: ArkScaleProjective<ark_ed_on_bls12_381_bandersnatch::EdwardsProjective>
+	/// Twisted Edwards projective multiplication for Ed-on-BLS12-381-Bandersnatch.
+	///
+	/// - Receives encoded:
+	///   - `base`: `ArkScaleProjective<ark_ed_on_bls12_381_bandersnatch::EdwardsProjective>`.
+	///   - `scalar`: `ArkScale<&[u64]>`.
+	/// - Returns encoded:
+	///   `ArkScaleProjective<ark_ed_on_bls12_381_bandersnatch::EdwardsProjective>`.
 	fn ed_on_bls12_381_bandersnatch_te_mul_projective(
 		base: Vec<u8>,
 		scalar: Vec<u8>,
 	) -> Result<Vec<u8>, ()> {
-		ed_on_bls12_381_bandersnatch::te_mul_projective(base, scalar)
+		mul_projective_te::<ark_ed_on_bls12_381_bandersnatch::EdwardsConfig>(base, scalar)
 	}
 
-	/// Compute short weierstrass msm on ed_on_bls12_381_bandersnatch
-	/// Receives encoded:
-	/// bases: ArkScale<&[ark_ed_on_bls12_381_bandersnatch::SWAffine]>
-	/// scalars: ArkScale<&[ark_ed_on_bls12_381_bandersnatch::Fr]>
-	/// Returns encoded:
-	/// ArkScaleProjective<ark_ed_on_bls12_381_bandersnatch::SWProjective>
+	/// Short Weierstrass multi scalar multiplication for Ed-on-BLS12-381-Bandersnatch.
+	///
+	/// - Receives encoded:
+	///   - `bases`: `ArkScale<&[ark_ed_on_bls12_381_bandersnatch::SWAffine]>`.
+	///   - `scalars`: `ArkScale<&[ark_ed_on_bls12_381_bandersnatch::Fr]>`.
+	/// - Returns encoded: `ArkScaleProjective<ark_ed_on_bls12_381_bandersnatch::SWProjective>`.
 	fn ed_on_bls12_381_bandersnatch_sw_msm(
 		bases: Vec<u8>,
 		scalars: Vec<u8>,
 	) -> Result<Vec<u8>, ()> {
-		ed_on_bls12_381_bandersnatch::sw_msm(bases, scalars)
+		msm_sw::<ark_ed_on_bls12_381_bandersnatch::SWConfig>(bases, scalars)
 	}
 
-	/// Compute twisted edwards msm on ed_on_bls12_381_bandersnatch
-	/// Receives encoded:
-	/// base: ArkScaleProjective<ark_ed_on_bls12_381_bandersnatch::EdwardsProjective>
-	/// scalars: ArkScale<&[ark_ed_on_bls12_381_bandersnatch::Fr]>
-	/// Returns encoded:
-	/// ArkScaleProjective<ark_ed_on_bls12_381_bandersnatch::EdwardsProjective>
+	/// Twisted Edwards multi scalar multiplication for Ed-on-BLS12-381-Bandersnatch.
+	///
+	/// - Receives encoded:
+	///   - `base`: `ArkScaleProjective<ark_ed_on_bls12_381_bandersnatch::EdwardsProjective>`.
+	///   - `scalars`: `ArkScale<&[ark_ed_on_bls12_381_bandersnatch::Fr]>`.
+	/// - Returns encoded:
+	///   `ArkScaleProjective<ark_ed_on_bls12_381_bandersnatch::EdwardsProjective>`.
 	fn ed_on_bls12_381_bandersnatch_te_msm(
 		bases: Vec<u8>,
 		scalars: Vec<u8>,
 	) -> Result<Vec<u8>, ()> {
-		ed_on_bls12_381_bandersnatch::te_msm(bases, scalars)
+		msm_te::<ark_ed_on_bls12_381_bandersnatch::EdwardsConfig>(bases, scalars)
 	}
 }
diff --git a/substrate/primitives/crypto/ec-utils/src/test-data/g1_compressed_valid_test_vectors.dat b/substrate/primitives/crypto/ec-utils/src/test-data/g1_compressed_valid_test_vectors.dat
deleted file mode 100644
index ea8cd67652d133010e79df8488452450b6f5cb17..0000000000000000000000000000000000000000
Binary files a/substrate/primitives/crypto/ec-utils/src/test-data/g1_compressed_valid_test_vectors.dat and /dev/null differ
diff --git a/substrate/primitives/crypto/ec-utils/src/test-data/g1_uncompressed_valid_test_vectors.dat b/substrate/primitives/crypto/ec-utils/src/test-data/g1_uncompressed_valid_test_vectors.dat
deleted file mode 100644
index 86abfba945c7b701750d637bffe6701330e10e88..0000000000000000000000000000000000000000
Binary files a/substrate/primitives/crypto/ec-utils/src/test-data/g1_uncompressed_valid_test_vectors.dat and /dev/null differ
diff --git a/substrate/primitives/crypto/ec-utils/src/test-data/g2_compressed_valid_test_vectors.dat b/substrate/primitives/crypto/ec-utils/src/test-data/g2_compressed_valid_test_vectors.dat
deleted file mode 100644
index a40bbe251d90e576060adb7eaa2456197878804c..0000000000000000000000000000000000000000
Binary files a/substrate/primitives/crypto/ec-utils/src/test-data/g2_compressed_valid_test_vectors.dat and /dev/null differ
diff --git a/substrate/primitives/crypto/ec-utils/src/test-data/g2_uncompressed_valid_test_vectors.dat b/substrate/primitives/crypto/ec-utils/src/test-data/g2_uncompressed_valid_test_vectors.dat
deleted file mode 100644
index 92e4bc528e8937a311b502e4940e5e363a1f7c57..0000000000000000000000000000000000000000
Binary files a/substrate/primitives/crypto/ec-utils/src/test-data/g2_uncompressed_valid_test_vectors.dat and /dev/null differ
diff --git a/substrate/primitives/crypto/ec-utils/src/utils.rs b/substrate/primitives/crypto/ec-utils/src/utils.rs
index 5560d5921160509a8f2a00b28ee29331008cc780..063b8fac7ad3fbee2058480197fbc7df931c5ec4 100644
--- a/substrate/primitives/crypto/ec-utils/src/utils.rs
+++ b/substrate/primitives/crypto/ec-utils/src/utils.rs
@@ -15,8 +15,8 @@
 // See the License for the specific language governing permissions and
 // limitations under the License.
 
-//! The generic executions of the operations on arkworks elliptic curves
-//! which get instantiatied by the corresponding curves.
+//! Generic executions of the operations for *Arkworks* elliptic curves.
+
 use ark_ec::{
 	pairing::{MillerLoopOutput, Pairing, PairingOutput},
 	short_weierstrass,
@@ -25,17 +25,18 @@ use ark_ec::{
 	twisted_edwards::TECurveConfig,
 	CurveConfig, VariableBaseMSM,
 };
-use ark_scale::hazmat::ArkScaleProjective;
-use ark_std::vec::Vec;
-use codec::{Decode, Encode};
+use ark_scale::{
+	hazmat::ArkScaleProjective,
+	scale::{Decode, Encode},
+};
+use sp_std::vec::Vec;
 
-const HOST_CALL: ark_scale::Usage = ark_scale::HOST_CALL;
-type ArkScale<T> = ark_scale::ArkScale<T, HOST_CALL>;
+// Scale codec type which is expected to be used by the host functions.
+//
+// Encoding is set to `HOST_CALL` which is a shortcut for "not-validated" and "not-compressed".
+type ArkScale<T> = ark_scale::ArkScale<T, { ark_scale::HOST_CALL }>;
 
-pub(crate) fn multi_miller_loop_generic<Curve: Pairing>(
-	g1: Vec<u8>,
-	g2: Vec<u8>,
-) -> Result<Vec<u8>, ()> {
+pub fn multi_miller_loop<Curve: Pairing>(g1: Vec<u8>, g2: Vec<u8>) -> Result<Vec<u8>, ()> {
 	let g1 = <ArkScale<Vec<<Curve as Pairing>::G1Affine>> as Decode>::decode(&mut g1.as_slice())
 		.map_err(|_| ())?;
 	let g2 = <ArkScale<Vec<<Curve as Pairing>::G2Affine>> as Decode>::decode(&mut g2.as_slice())
@@ -47,7 +48,7 @@ pub(crate) fn multi_miller_loop_generic<Curve: Pairing>(
 	Ok(result.encode())
 }
 
-pub(crate) fn final_exponentiation_generic<Curve: Pairing>(target: Vec<u8>) -> Result<Vec<u8>, ()> {
+pub fn final_exponentiation<Curve: Pairing>(target: Vec<u8>) -> Result<Vec<u8>, ()> {
 	let target =
 		<ArkScale<<Curve as Pairing>::TargetField> as Decode>::decode(&mut target.as_slice())
 			.map_err(|_| ())?;
@@ -58,10 +59,7 @@ pub(crate) fn final_exponentiation_generic<Curve: Pairing>(target: Vec<u8>) -> R
 	Ok(result.encode())
 }
 
-pub(crate) fn msm_sw_generic<Curve: SWCurveConfig>(
-	bases: Vec<u8>,
-	scalars: Vec<u8>,
-) -> Result<Vec<u8>, ()> {
+pub fn msm_sw<Curve: SWCurveConfig>(bases: Vec<u8>, scalars: Vec<u8>) -> Result<Vec<u8>, ()> {
 	let bases =
 		<ArkScale<Vec<short_weierstrass::Affine<Curve>>> as Decode>::decode(&mut bases.as_slice())
 			.map_err(|_| ())?;
@@ -78,10 +76,7 @@ pub(crate) fn msm_sw_generic<Curve: SWCurveConfig>(
 	Ok(result.encode())
 }
 
-pub(crate) fn msm_te_generic<Curve: TECurveConfig>(
-	bases: Vec<u8>,
-	scalars: Vec<u8>,
-) -> Result<Vec<u8>, ()> {
+pub fn msm_te<Curve: TECurveConfig>(bases: Vec<u8>, scalars: Vec<u8>) -> Result<Vec<u8>, ()> {
 	let bases =
 		<ArkScale<Vec<twisted_edwards::Affine<Curve>>> as Decode>::decode(&mut bases.as_slice())
 			.map_err(|_| ())?;
@@ -97,7 +92,7 @@ pub(crate) fn msm_te_generic<Curve: TECurveConfig>(
 	Ok(result.encode())
 }
 
-pub(crate) fn mul_projective_generic<Group: SWCurveConfig>(
+pub fn mul_projective_sw<Group: SWCurveConfig>(
 	base: Vec<u8>,
 	scalar: Vec<u8>,
 ) -> Result<Vec<u8>, ()> {
@@ -113,7 +108,7 @@ pub(crate) fn mul_projective_generic<Group: SWCurveConfig>(
 	Ok(result.encode())
 }
 
-pub(crate) fn mul_projective_te_generic<Group: TECurveConfig>(
+pub fn mul_projective_te<Group: TECurveConfig>(
 	base: Vec<u8>,
 	scalar: Vec<u8>,
 ) -> Result<Vec<u8>, ()> {
diff --git a/substrate/primitives/database/Cargo.toml b/substrate/primitives/database/Cargo.toml
index b1105f88ba50f4a71cd5f072e6444a60c08e15ff..430895236d4f0eec73b8939df14e8075a32cd630 100644
--- a/substrate/primitives/database/Cargo.toml
+++ b/substrate/primitives/database/Cargo.toml
@@ -1,11 +1,11 @@
 [package]
 name = "sp-database"
 version = "4.0.0-dev"
-authors = ["Parity Technologies <admin@parity.io>"]
-edition = "2021"
+authors.workspace = true
+edition.workspace = true
 license = "Apache-2.0"
 homepage = "https://substrate.io"
-repository = "https://github.com/paritytech/substrate/"
+repository.workspace = true
 description = "Substrate database trait."
 documentation = "https://docs.rs/sp-database"
 readme = "README.md"
diff --git a/substrate/primitives/database/README.md b/substrate/primitives/database/README.md
index cd0677eb9eb44ef3d26f1cfecdb1bdbbd371536a..26f58ea8d458669ae5e80853ec6cd03160708748 100644
--- a/substrate/primitives/database/README.md
+++ b/substrate/primitives/database/README.md
@@ -1,3 +1,3 @@
 The main database trait, allowing Substrate to store data persistently.
 
-License: Apache-2.0
\ No newline at end of file
+License: Apache-2.0
diff --git a/substrate/primitives/debug-derive/Cargo.toml b/substrate/primitives/debug-derive/Cargo.toml
index bbac79a8465040dcf2bc4c9701e1a6b4006501bd..c97c8a0a3991e94dd5c57f067fa26f5dbc4f091c 100644
--- a/substrate/primitives/debug-derive/Cargo.toml
+++ b/substrate/primitives/debug-derive/Cargo.toml
@@ -1,11 +1,11 @@
 [package]
 name = "sp-debug-derive"
 version = "8.0.0"
-authors = ["Parity Technologies <admin@parity.io>"]
-edition = "2021"
+authors.workspace = true
+edition.workspace = true
 license = "Apache-2.0"
 homepage = "https://substrate.io"
-repository = "https://github.com/paritytech/substrate/"
+repository.workspace = true
 description = "Macros to derive runtime debug implementation."
 documentation = "https://docs.rs/sp-debug-derive"
 
@@ -18,7 +18,7 @@ proc-macro = true
 
 [dependencies]
 quote = "1.0.28"
-syn = "2.0.16"
+syn = "2.0.38"
 proc-macro2 = "1.0.56"
 
 [features]
diff --git a/substrate/primitives/externalities/Cargo.toml b/substrate/primitives/externalities/Cargo.toml
index 7468237c2a0f0f49898e42489be5f1ef4dae8167..417eb363867b2d90d1f5be0244171f9bd4ed7bdf 100644
--- a/substrate/primitives/externalities/Cargo.toml
+++ b/substrate/primitives/externalities/Cargo.toml
@@ -2,10 +2,10 @@
 name = "sp-externalities"
 version = "0.19.0"
 license = "Apache-2.0"
-authors = ["Parity Technologies <admin@parity.io>"]
-edition = "2021"
+authors.workspace = true
+edition.workspace = true
 homepage = "https://substrate.io"
-repository = "https://github.com/paritytech/substrate/"
+repository.workspace = true
 description = "Substrate externalities abstraction"
 documentation = "https://docs.rs/sp-externalities"
 readme = "README.md"
diff --git a/substrate/primitives/externalities/README.md b/substrate/primitives/externalities/README.md
index 3141b2609e6375063dc42b089489451973393cba..543b63ecbdb6a9a34709e3a3b989b0b88b8d6800 100644
--- a/substrate/primitives/externalities/README.md
+++ b/substrate/primitives/externalities/README.md
@@ -6,4 +6,4 @@ access the node from the runtime via the runtime interfaces.
 
 This crate exposes the main [`Externalities`] trait.
 
-License: Apache-2.0
\ No newline at end of file
+License: Apache-2.0
diff --git a/substrate/primitives/externalities/src/extensions.rs b/substrate/primitives/externalities/src/extensions.rs
index 8b0bbd2c5921b217aadf889adef81dc7a63be0b0..282e6ea914a84caae6a1c63af8d9ff0e125176fc 100644
--- a/substrate/primitives/externalities/src/extensions.rs
+++ b/substrate/primitives/externalities/src/extensions.rs
@@ -35,17 +35,24 @@ use sp_std::{
 ///
 /// As extensions are stored as `Box<Any>`, this trait should give more confidence that the correct
 /// type is registered and requested.
-pub trait Extension: Send + Any {
+pub trait Extension: Send + 'static {
 	/// Return the extension as `&mut dyn Any`.
 	///
 	/// This is a trick to make the trait type castable into an `Any`.
 	fn as_mut_any(&mut self) -> &mut dyn Any;
+
+	/// Get the [`TypeId`] of this `Extension`.
+	fn type_id(&self) -> TypeId;
 }
 
 impl Extension for Box<dyn Extension> {
 	fn as_mut_any(&mut self) -> &mut dyn Any {
 		(**self).as_mut_any()
 	}
+
+	fn type_id(&self) -> TypeId {
+		(**self).type_id()
+	}
 }
 
 /// Macro for declaring an extension that usable with [`Extensions`].
@@ -74,6 +81,10 @@ macro_rules! decl_extension {
 			fn as_mut_any(&mut self) -> &mut dyn std::any::Any {
 				self
 			}
+
+			fn type_id(&self) -> std::any::TypeId {
+				std::any::Any::type_id(self)
+			}
 		}
 
 		impl std::ops::Deref for $ext_name {
@@ -107,6 +118,10 @@ macro_rules! decl_extension {
 			fn as_mut_any(&mut self) -> &mut dyn std::any::Any {
 				self
 			}
+
+			fn type_id(&self) -> std::any::TypeId {
+				std::any::Any::type_id(self)
+			}
 		}
 	}
 }
@@ -235,4 +250,25 @@ mod tests {
 
 		assert_eq!(ext_ty.0, 1);
 	}
+
+	#[test]
+	fn register_box_extension() {
+		let mut exts = Extensions::new();
+		let box1: Box<dyn Extension> = Box::new(DummyExt(1));
+		let box2: Box<dyn Extension> = Box::new(DummyExt2(2));
+		exts.register(box1);
+		exts.register(box2);
+
+		{
+			let ext = exts.get_mut(TypeId::of::<DummyExt>()).expect("Extension 1 is registered");
+			let ext_ty = ext.downcast_mut::<DummyExt>().expect("Downcasting works for Extension 1");
+			assert_eq!(ext_ty.0, 1);
+		}
+		{
+			let ext2 = exts.get_mut(TypeId::of::<DummyExt2>()).expect("Extension 2 is registered");
+			let ext_ty2 =
+				ext2.downcast_mut::<DummyExt2>().expect("Downcasting works for Extension 2");
+			assert_eq!(ext_ty2.0, 2);
+		}
+	}
 }
diff --git a/substrate/primitives/genesis-builder/Cargo.toml b/substrate/primitives/genesis-builder/Cargo.toml
index d1ee4ae0e70e4009e2295fb2d289edeaa6827e71..8f083e2d7d54ca1396d46b22e002b706fce2f406 100644
--- a/substrate/primitives/genesis-builder/Cargo.toml
+++ b/substrate/primitives/genesis-builder/Cargo.toml
@@ -1,11 +1,11 @@
 [package]
 name = "sp-genesis-builder"
 version = "0.1.0"
-authors = ["Parity Technologies <admin@parity.io>"]
-edition = "2021"
+authors.workspace = true
+edition.workspace = true
 license = "Apache-2.0"
 homepage = "https://substrate.io"
-repository = "https://github.com/paritytech/substrate/"
+repository.workspace = true
 description = "Substrate GenesisConfig builder API"
 readme = "README.md"
 
@@ -16,7 +16,7 @@ targets = ["x86_64-unknown-linux-gnu"]
 sp-api = { path = "../api", default-features = false}
 sp-runtime = { path = "../runtime", default-features = false}
 sp-std = { path = "../std", default-features = false}
-serde_json = { version = "1.0.85", default-features = false, features = ["alloc"] }
+serde_json = { version = "1.0.107", default-features = false, features = ["alloc"] }
 
 [features]
 default = [ "std" ]
diff --git a/substrate/primitives/inherents/Cargo.toml b/substrate/primitives/inherents/Cargo.toml
index 49bc15690d75302ceaf1d474c2c18fca6e370624..aa0aa95b3f8d060c909c23fb3f6bbdfeac3643ad 100644
--- a/substrate/primitives/inherents/Cargo.toml
+++ b/substrate/primitives/inherents/Cargo.toml
@@ -1,11 +1,11 @@
 [package]
 name = "sp-inherents"
 version = "4.0.0-dev"
-authors = ["Parity Technologies <admin@parity.io>"]
-edition = "2021"
+authors.workspace = true
+edition.workspace = true
 license = "Apache-2.0"
 homepage = "https://substrate.io"
-repository = "https://github.com/paritytech/substrate/"
+repository.workspace = true
 description = "Provides types and traits for creating and checking inherents."
 documentation = "https://docs.rs/sp-inherents"
 readme = "README.md"
@@ -18,7 +18,7 @@ async-trait = { version = "0.1.57", optional = true }
 codec = { package = "parity-scale-codec", version = "3.6.1", default-features = false, features = ["derive"] }
 scale-info = { version = "2.5.0", default-features = false, features = ["derive"] }
 impl-trait-for-tuples = "0.2.2"
-thiserror = { version = "1.0.30", optional = true }
+thiserror = { version = "1.0.48", optional = true }
 sp-runtime = { path = "../runtime", default-features = false, optional = true}
 sp-std = { path = "../std", default-features = false}
 
diff --git a/substrate/primitives/inherents/README.md b/substrate/primitives/inherents/README.md
index 78aa625fe85692b1d53164415a5b2086d5704186..20ceb529469182438beb29a921d117c029cbd197 100644
--- a/substrate/primitives/inherents/README.md
+++ b/substrate/primitives/inherents/README.md
@@ -14,4 +14,4 @@ A module can also just check given inherents. For using a module as inherent pro
 to be registered by the `construct_runtime!` macro. The macro documentation gives more
 information on how that is done.
 
-License: Apache-2.0
\ No newline at end of file
+License: Apache-2.0
diff --git a/substrate/primitives/io/Cargo.toml b/substrate/primitives/io/Cargo.toml
index d9bd1d5923f91f610ba97622d027aebd4d929439..ab9d26ec26f49fc4ad0097f3be71dd0e6a7c675c 100644
--- a/substrate/primitives/io/Cargo.toml
+++ b/substrate/primitives/io/Cargo.toml
@@ -1,11 +1,11 @@
 [package]
 name = "sp-io"
 version = "23.0.0"
-authors = ["Parity Technologies <admin@parity.io>"]
-edition = "2021"
+authors.workspace = true
+edition.workspace = true
 license = "Apache-2.0"
 homepage = "https://substrate.io"
-repository = "https://github.com/paritytech/substrate/"
+repository.workspace = true
 description = "I/O for Substrate runtimes"
 documentation = "https://docs.rs/sp-io"
 readme = "README.md"
@@ -33,7 +33,7 @@ tracing = { version = "0.1.29", default-features = false }
 tracing-core = { version = "0.1.28", default-features = false}
 
 # Required for backwards compatibility reason, but only used for verifying when `UseDalekExt` is set.
-ed25519-dalek = { version = "2.0.0", default-features = false, optional = true }
+ed25519-dalek = { version = "2.0", default-features = false, optional = true }
 
 [build-dependencies]
 rustversion = "1.0.6"
diff --git a/substrate/primitives/io/README.md b/substrate/primitives/io/README.md
index a24370cc566b359b2b3aeab195d185dec34f7e78..5e252eeacb0929bf46179e8115c3924c3ee4cacf 100644
--- a/substrate/primitives/io/README.md
+++ b/substrate/primitives/io/README.md
@@ -1,3 +1,3 @@
-I/O host interface for substrate runtime.
+I/O host interface for Substrate runtime.
 
-License: Apache-2.0
\ No newline at end of file
+License: Apache-2.0
diff --git a/substrate/primitives/keyring/Cargo.toml b/substrate/primitives/keyring/Cargo.toml
index 5c206da6bb75f45da60e13383bae609e36304e62..1ab78eeed453c83d157a0685d3cda452bb2fb80f 100644
--- a/substrate/primitives/keyring/Cargo.toml
+++ b/substrate/primitives/keyring/Cargo.toml
@@ -1,11 +1,11 @@
 [package]
 name = "sp-keyring"
 version = "24.0.0"
-authors = ["Parity Technologies <admin@parity.io>"]
-edition = "2021"
+authors.workspace = true
+edition.workspace = true
 license = "Apache-2.0"
 homepage = "https://substrate.io"
-repository = "https://github.com/paritytech/substrate/"
+repository.workspace = true
 description = "Keyring support code for the runtime. A set of test accounts."
 documentation = "https://docs.rs/sp-keyring"
 readme = "README.md"
diff --git a/substrate/primitives/keyring/README.md b/substrate/primitives/keyring/README.md
index 1610f237df97a8a96f5017f0c15c686661de36e4..555a35f09bc3af22db63c953feac7220ade2ca2d 100644
--- a/substrate/primitives/keyring/README.md
+++ b/substrate/primitives/keyring/README.md
@@ -1,3 +1,3 @@
 Support code for the runtime. A set of test accounts.
 
-License: Apache-2.0
\ No newline at end of file
+License: Apache-2.0
diff --git a/substrate/primitives/keystore/Cargo.toml b/substrate/primitives/keystore/Cargo.toml
index a3744d38d2ec6138193d21d46967e34d3eec3d9d..ff7c27bf5654839a37a7ab9a02081c68479692f4 100644
--- a/substrate/primitives/keystore/Cargo.toml
+++ b/substrate/primitives/keystore/Cargo.toml
@@ -1,11 +1,11 @@
 [package]
 name = "sp-keystore"
 version = "0.27.0"
-authors = ["Parity Technologies <admin@parity.io>"]
-edition = "2021"
+authors.workspace = true
+edition.workspace = true
 license = "Apache-2.0"
 homepage = "https://substrate.io"
-repository = "https://github.com/paritytech/substrate/"
+repository.workspace = true
 description = "Keystore primitives."
 documentation = "https://docs.rs/sp-core"
 
diff --git a/substrate/primitives/keystore/src/lib.rs b/substrate/primitives/keystore/src/lib.rs
index 82062fe7b40a713ca0afa934431e74a307f55108..035af7099a6f8835364c14e3150ba880e3efc2c1 100644
--- a/substrate/primitives/keystore/src/lib.rs
+++ b/substrate/primitives/keystore/src/lib.rs
@@ -17,6 +17,7 @@
 
 //! Keystore traits
 
+#[cfg(feature = "std")]
 pub mod testing;
 
 #[cfg(feature = "bandersnatch-experimental")]
@@ -631,3 +632,15 @@ impl KeystoreExt {
 		Self(Arc::new(keystore))
 	}
 }
+
+sp_core::generate_feature_enabled_macro!(
+	bandersnatch_experimental_enabled,
+	feature = "bandersnatch-experimental",
+	$
+);
+
+sp_core::generate_feature_enabled_macro!(
+	bls_experimental_enabled,
+	feature = "bls-experimental",
+	$
+);
diff --git a/substrate/primitives/maybe-compressed-blob/Cargo.toml b/substrate/primitives/maybe-compressed-blob/Cargo.toml
index 67f93c517274c3772c242cd045e9560bb51f851f..c6fa7103672fc17097a9c446ab01262612034efc 100644
--- a/substrate/primitives/maybe-compressed-blob/Cargo.toml
+++ b/substrate/primitives/maybe-compressed-blob/Cargo.toml
@@ -1,15 +1,15 @@
 [package]
 name = "sp-maybe-compressed-blob"
 version = "4.1.0-dev"
-authors = ["Parity Technologies <admin@parity.io>"]
-edition = "2021"
+authors.workspace = true
+edition.workspace = true
 license = "Apache-2.0"
 homepage = "https://substrate.io"
-repository = "https://github.com/paritytech/substrate/"
+repository.workspace = true
 description = "Handling of blobs, usually Wasm code, which may be compresed"
 documentation = "https://docs.rs/sp-maybe-compressed-blob"
 readme = "README.md"
 
 [dependencies]
 thiserror = "1.0"
-zstd = { version = "0.12.3", default-features = false }
+zstd = { version = "0.12.4", default-features = false }
diff --git a/substrate/primitives/merkle-mountain-range/Cargo.toml b/substrate/primitives/merkle-mountain-range/Cargo.toml
index b986eda2a44af404f78d2c01b17d9e92efab0613..747b967dd9ed78162840f9648c208ae55f9442fa 100644
--- a/substrate/primitives/merkle-mountain-range/Cargo.toml
+++ b/substrate/primitives/merkle-mountain-range/Cargo.toml
@@ -1,11 +1,11 @@
 [package]
 name = "sp-mmr-primitives"
 version = "4.0.0-dev"
-authors = ["Parity Technologies <admin@parity.io>"]
-edition = "2021"
+authors.workspace = true
+edition.workspace = true
 license = "Apache-2.0"
 homepage = "https://substrate.io"
-repository = "https://github.com/paritytech/substrate/"
+repository.workspace = true
 description = "Merkle Mountain Range primitives."
 
 [package.metadata.docs.rs]
@@ -16,7 +16,7 @@ codec = { package = "parity-scale-codec", version = "3.6.1", default-features =
 scale-info = { version = "2.5.0", default-features = false, features = ["derive"] }
 log = { version = "0.4.17", default-features = false }
 mmr-lib = { package = "ckb-merkle-mountain-range", version = "0.5.2", default-features = false }
-serde = { version = "1.0.163", features = ["derive", "alloc"], default-features = false, optional = true }
+serde = { version = "1.0.188", features = ["derive", "alloc"], default-features = false, optional = true }
 sp-api = { path = "../api", default-features = false}
 sp-core = { path = "../core", default-features = false}
 sp-debug-derive = { path = "../debug-derive", default-features = false}
diff --git a/substrate/primitives/metadata-ir/Cargo.toml b/substrate/primitives/metadata-ir/Cargo.toml
index d3ec0abaff6a8f72f9e2f111cc9347a5963f310d..d17c654aaf3882f3bebfe16204f5ef0f7e77ce24 100644
--- a/substrate/primitives/metadata-ir/Cargo.toml
+++ b/substrate/primitives/metadata-ir/Cargo.toml
@@ -1,11 +1,11 @@
 [package]
 name = "sp-metadata-ir"
 version = "0.1.0"
-authors = ["Parity Technologies <admin@parity.io>"]
-edition = "2021"
+authors.workspace = true
+edition.workspace = true
 license = "Apache-2.0"
 homepage = "https://substrate.io"
-repository = "https://github.com/paritytech/substrate/"
+repository.workspace = true
 description = "Intermediate representation of the runtime metadata."
 documentation = "https://docs.rs/sp-metadata-ir"
 
diff --git a/substrate/primitives/mixnet/Cargo.toml b/substrate/primitives/mixnet/Cargo.toml
new file mode 100644
index 0000000000000000000000000000000000000000..3e2dcc7ec5c4c866b6254700c97b1160ed5148af
--- /dev/null
+++ b/substrate/primitives/mixnet/Cargo.toml
@@ -0,0 +1,30 @@
+[package]
+description = "Substrate mixnet types and runtime interface"
+name = "sp-mixnet"
+version = "0.1.0-dev"
+license = "Apache-2.0"
+authors = ["Parity Technologies <admin@parity.io>"]
+edition = "2021"
+homepage = "https://substrate.io"
+repository = "https://github.com/paritytech/substrate/"
+readme = "README.md"
+
+[package.metadata.docs.rs]
+targets = ["x86_64-unknown-linux-gnu"]
+
+[dependencies]
+codec = { package = "parity-scale-codec", version = "3.6.1", default-features = false, features = ["derive"] }
+scale-info = { version = "2.5.0", default-features = false, features = ["derive"] }
+sp-api = { default-features = false, path = "../api" }
+sp-application-crypto = { default-features = false, path = "../application-crypto" }
+sp-std = { default-features = false, path = "../std" }
+
+[features]
+default = [ "std" ]
+std = [
+	"codec/std",
+	"scale-info/std",
+	"sp-api/std",
+	"sp-application-crypto/std",
+	"sp-std/std",
+]
diff --git a/substrate/primitives/mixnet/README.md b/substrate/primitives/mixnet/README.md
new file mode 100644
index 0000000000000000000000000000000000000000..47c109f6b57c6685750de2cc88678055c94a8a49
--- /dev/null
+++ b/substrate/primitives/mixnet/README.md
@@ -0,0 +1,3 @@
+Substrate mixnet types and runtime interface.
+
+License: Apache-2.0
diff --git a/polkadot/runtime/polkadot/constants/src/weights/mod.rs b/substrate/primitives/mixnet/src/lib.rs
similarity index 61%
rename from polkadot/runtime/polkadot/constants/src/weights/mod.rs
rename to substrate/primitives/mixnet/src/lib.rs
index 23812ce7ed0528c394f84042fb9842eb617a834b..58b8a10f0cd8d5d4198e6fcf7b75e09d4f639827 100644
--- a/polkadot/runtime/polkadot/constants/src/weights/mod.rs
+++ b/substrate/primitives/mixnet/src/lib.rs
@@ -7,7 +7,7 @@
 // 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
+// 	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,
@@ -15,14 +15,10 @@
 // See the License for the specific language governing permissions and
 // limitations under the License.
 
-//! Expose the auto generated weight files.
+//! Substrate mixnet types and runtime interface.
 
-pub mod block_weights;
-pub mod extrinsic_weights;
-pub mod paritydb_weights;
-pub mod rocksdb_weights;
+#![warn(missing_docs)]
+#![cfg_attr(not(feature = "std"), no_std)]
 
-pub use block_weights::BlockExecutionWeight;
-pub use extrinsic_weights::ExtrinsicBaseWeight;
-pub use paritydb_weights::constants::ParityDbWeight;
-pub use rocksdb_weights::constants::RocksDbWeight;
+pub mod runtime_api;
+pub mod types;
diff --git a/substrate/primitives/mixnet/src/runtime_api.rs b/substrate/primitives/mixnet/src/runtime_api.rs
new file mode 100644
index 0000000000000000000000000000000000000000..28ab40e633787545c4710043d746a9de3295d232
--- /dev/null
+++ b/substrate/primitives/mixnet/src/runtime_api.rs
@@ -0,0 +1,52 @@
+// 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.
+
+//! Runtime API for querying mixnet configuration and registering mixnodes.
+
+use super::types::{Mixnode, MixnodesErr, SessionIndex, SessionStatus};
+use sp_std::vec::Vec;
+
+sp_api::decl_runtime_apis! {
+	/// API to query the mixnet session status and mixnode sets, and to register mixnodes.
+	pub trait MixnetApi {
+		/// Get the index and phase of the current session.
+		fn session_status() -> SessionStatus;
+
+		/// Get the mixnode set for the previous session.
+		fn prev_mixnodes() -> Result<Vec<Mixnode>, MixnodesErr>;
+
+		/// Get the mixnode set for the current session.
+		fn current_mixnodes() -> Result<Vec<Mixnode>, MixnodesErr>;
+
+		/// Try to register a mixnode for the next session.
+		///
+		/// If a registration extrinsic is submitted, `true` is returned. The caller should avoid
+		/// calling `maybe_register` again for a few blocks, to give the submitted extrinsic a
+		/// chance to get included.
+		///
+		/// With the above exception, `maybe_register` is designed to be called every block. Most
+		/// of the time it will not do anything, for example:
+		///
+		/// - If it is not an appropriate time to submit a registration extrinsic.
+		/// - If the local node has already registered a mixnode for the next session.
+		/// - If the local node is not permitted to register a mixnode for the next session.
+		///
+		/// `session_index` should match `session_status().current_index`; if it does not, `false`
+		/// is returned immediately.
+		fn maybe_register(session_index: SessionIndex, mixnode: Mixnode) -> bool;
+	}
+}
diff --git a/substrate/primitives/mixnet/src/types.rs b/substrate/primitives/mixnet/src/types.rs
new file mode 100644
index 0000000000000000000000000000000000000000..fc214f94d1cbf2e4063efdf09dcdbc1e0aceb258
--- /dev/null
+++ b/substrate/primitives/mixnet/src/types.rs
@@ -0,0 +1,100 @@
+// 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.
+
+//! Mixnet types used by both host and runtime.
+
+use codec::{Decode, Encode};
+use scale_info::TypeInfo;
+use sp_std::vec::Vec;
+
+mod app {
+	use sp_application_crypto::{app_crypto, key_types::MIXNET, sr25519};
+	app_crypto!(sr25519, MIXNET);
+}
+
+/// Authority public session key, used to verify registration signatures.
+pub type AuthorityId = app::Public;
+/// Authority signature, attached to mixnode registrations.
+pub type AuthoritySignature = app::Signature;
+
+/// Absolute session index.
+pub type SessionIndex = u32;
+
+/// Each session should progress through these phases in order.
+#[derive(Decode, Encode, TypeInfo, PartialEq, Eq)]
+pub enum SessionPhase {
+	/// Generate cover traffic to the current session's mixnode set.
+	CoverToCurrent,
+	/// Build requests using the current session's mixnode set.
+	RequestsToCurrent,
+	/// Only send cover (and forwarded) traffic to the previous session's mixnode set.
+	CoverToPrev,
+	/// Disconnect the previous session's mixnode set.
+	DisconnectFromPrev,
+}
+
+/// The index and phase of the current session.
+#[derive(Decode, Encode, TypeInfo)]
+pub struct SessionStatus {
+	/// Index of the current session.
+	pub current_index: SessionIndex,
+	/// Current session phase.
+	pub phase: SessionPhase,
+}
+
+/// Size in bytes of a [`KxPublic`].
+pub const KX_PUBLIC_SIZE: usize = 32;
+
+/// X25519 public key, used in key exchange between message senders and mixnodes. Mixnode public
+/// keys are published on-chain and change every session. Message senders generate a new key for
+/// every message they send.
+pub type KxPublic = [u8; KX_PUBLIC_SIZE];
+
+/// Ed25519 public key of a libp2p peer.
+pub type PeerId = [u8; 32];
+
+/// Information published on-chain for each mixnode every session.
+#[derive(Decode, Encode, TypeInfo)]
+pub struct Mixnode {
+	/// Key-exchange public key for the mixnode.
+	pub kx_public: KxPublic,
+	/// libp2p peer ID of the mixnode.
+	pub peer_id: PeerId,
+	/// External addresses for the mixnode, in multiaddr format, UTF-8 encoded.
+	pub external_addresses: Vec<Vec<u8>>,
+}
+
+/// Error querying the runtime for a session's mixnode set.
+#[derive(Decode, Encode, TypeInfo)]
+pub enum MixnodesErr {
+	/// Insufficient mixnodes were registered for the session.
+	InsufficientRegistrations {
+		/// The number of mixnodes that were registered for the session.
+		num: u32,
+		/// The minimum number of mixnodes that must be registered for the mixnet to operate.
+		min: u32,
+	},
+}
+
+impl sp_std::fmt::Display for MixnodesErr {
+	fn fmt(&self, fmt: &mut sp_std::fmt::Formatter) -> sp_std::fmt::Result {
+		match self {
+			MixnodesErr::InsufficientRegistrations { num, min } =>
+				write!(fmt, "{num} mixnode(s) registered; {min} is the minimum"),
+		}
+	}
+}
diff --git a/substrate/primitives/npos-elections/Cargo.toml b/substrate/primitives/npos-elections/Cargo.toml
index da253efdc99d0ff4adc87935e07220b487ed0a43..68f1bef91665c6b168f736e8125a633a265652d9 100644
--- a/substrate/primitives/npos-elections/Cargo.toml
+++ b/substrate/primitives/npos-elections/Cargo.toml
@@ -1,11 +1,11 @@
 [package]
 name = "sp-npos-elections"
 version = "4.0.0-dev"
-authors = ["Parity Technologies <admin@parity.io>"]
-edition = "2021"
+authors.workspace = true
+edition.workspace = true
 license = "Apache-2.0"
 homepage = "https://substrate.io"
-repository = "https://github.com/paritytech/substrate/"
+repository.workspace = true
 description = "NPoS election algorithm primitives"
 readme = "README.md"
 
@@ -15,7 +15,7 @@ targets = ["x86_64-unknown-linux-gnu"]
 [dependencies]
 codec = { package = "parity-scale-codec", version = "3.6.1", default-features = false, features = ["derive"] }
 scale-info = { version = "2.5.0", default-features = false, features = ["derive"] }
-serde = { version = "1.0.163", default-features = false, features = ["derive", "alloc"], optional = true }
+serde = { version = "1.0.188", default-features = false, features = ["derive", "alloc"], optional = true }
 sp-arithmetic = { path = "../arithmetic", default-features = false}
 sp-core = { path = "../core", default-features = false}
 sp-runtime = { path = "../runtime", default-features = false}
diff --git a/substrate/primitives/npos-elections/README.md b/substrate/primitives/npos-elections/README.md
index 6881fc6418f3a93e476b097fd049e3fc354be0c7..e65f22ca271a24b341760f2d257465195a64a888 100644
--- a/substrate/primitives/npos-elections/README.md
+++ b/substrate/primitives/npos-elections/README.md
@@ -1,30 +1,29 @@
-A set of election algorithms to be used with a substrate runtime, typically within the staking
-sub-system. Notable implementation include:
+# sp-npos-elections
 
-- [`seq_phragmen`]: Implements the Phragmén Sequential Method. An un-ranked, relatively fast
-  election method that ensures PJR, but does not provide a constant factor approximation of the
-  maximin problem.
-- [`phragmms`]: Implements a hybrid approach inspired by Phragmén which is executed faster but
-  it can achieve a constant factor approximation of the maximin problem, similar to that of the
-  MMS algorithm.
-- [`balance_solution`]: Implements the star balancing algorithm. This iterative process can push
-  a solution toward being more `balanced`, which in turn can increase its score.
+A set of election algorithms to be used with a Substrate runtime, typically within the staking sub-system. Notable
+implementation include:
 
-### Terminology
+- [`seq_phragmen`]: Implements the Phragmén Sequential Method. An un-ranked, relatively fast election method that
+  ensures PJR, but does not provide a constant factor approximation of the maximin problem.
+- [`phragmms`]: Implements a hybrid approach inspired by Phragmén which is executed faster but it can achieve a constant
+  factor approximation of the maximin problem, similar to that of the MMS algorithm.
+- [`balance_solution`]: Implements the star balancing algorithm. This iterative process can push a solution toward being
+  more `balanced`, which in turn can increase its score.
 
-This crate uses context-independent words, not to be confused with staking. This is because the
-election algorithms of this crate, while designed for staking, can be used in other contexts as
-well.
+## Terminology
 
-`Voter`: The entity casting some votes to a number of `Targets`. This is the same as `Nominator`
-in the context of staking. `Target`: The entities eligible to be voted upon. This is the same as
-`Validator` in the context of staking. `Edge`: A mapping from a `Voter` to a `Target`.
+This crate uses context-independent words, not to be confused with staking. This is because the election algorithms of
+this crate, while designed for staking, can be used in other contexts as well.
+
+`Voter`: The entity casting some votes to a number of `Targets`. This is the same as `Nominator` in the context of
+staking. `Target`: The entities eligible to be voted upon. This is the same as `Validator` in the context of staking.
+`Edge`: A mapping from a `Voter` to a `Target`.
 
 The goal of an election algorithm is to provide an `ElectionResult`. A data composed of:
-- `winners`: A flat list of identifiers belonging to those who have won the election, usually
-  ordered in some meaningful way. They are zipped with their total backing stake.
-- `assignment`: A mapping from each voter to their winner-only targets, zipped with a ration
-  denoting the amount of support given to that particular target.
+- `winners`: A flat list of identifiers belonging to those who have won the election, usually ordered in some meaningful
+  way. They are zipped with their total backing stake.
+- `assignment`: A mapping from each voter to their winner-only targets, zipped with a ration denoting the amount of
+  support given to that particular target.
 
 ```rust
 // the winners.
@@ -44,16 +43,14 @@ let election_result = ElectionResult { winners, assignments };
 
 ```
 
-The `Assignment` field of the election result is voter-major, i.e. it is from the perspective of
-the voter. The struct that represents the opposite is called a `Support`. This struct is usually
-accessed in a map-like manner, i.e. keyed by voters, therefore it is stored as a mapping called
-`SupportMap`.
+The `Assignment` field of the election result is voter-major, i.e. it is from the perspective of the voter. The struct
+that represents the opposite is called a `Support`. This struct is usually accessed in a map-like manner, i.e. keyed by
+voters, therefore it is stored as a mapping called `SupportMap`.
 
-Moreover, the support is built from absolute backing values, not ratios like the example above.
-A struct similar to `Assignment` that has stake value instead of ratios is called an
-`StakedAssignment`.
+Moreover, the support is built from absolute backing values, not ratios like the example above. A struct similar to
+`Assignment` that has stake value instead of ratios is called an `StakedAssignment`.
 
 
 More information can be found at: https://arxiv.org/abs/2004.12990
 
-License: Apache-2.0
\ No newline at end of file
+License: Apache-2.0
diff --git a/substrate/primitives/npos-elections/fuzzer/Cargo.toml b/substrate/primitives/npos-elections/fuzzer/Cargo.toml
index 733b0e510609da7d803c859640b2ed3c4df40e4a..5e75f926f87cae29e7ed69621d3222ce3862680a 100644
--- a/substrate/primitives/npos-elections/fuzzer/Cargo.toml
+++ b/substrate/primitives/npos-elections/fuzzer/Cargo.toml
@@ -1,11 +1,11 @@
 [package]
 name = "sp-npos-elections-fuzzer"
 version = "2.0.0-alpha.5"
-authors = ["Parity Technologies <admin@parity.io>"]
-edition = "2021"
+authors.workspace = true
+edition.workspace = true
 license = "Apache-2.0"
 homepage = "https://substrate.io"
-repository = "https://github.com/paritytech/substrate/"
+repository.workspace = true
 description = "Fuzzer for phragmén implementation."
 documentation = "https://docs.rs/sp-npos-elections-fuzzer"
 publish = false
@@ -14,7 +14,7 @@ publish = false
 targets = ["x86_64-unknown-linux-gnu"]
 
 [dependencies]
-clap = { version = "4.2.5", features = ["derive"] }
+clap = { version = "4.4.6", features = ["derive"] }
 honggfuzz = "0.5"
 rand = { version = "0.8", features = ["std", "small_rng"] }
 sp-npos-elections = { path = ".." }
diff --git a/substrate/primitives/npos-elections/src/lib.rs b/substrate/primitives/npos-elections/src/lib.rs
index 0afe1ec5bb692346fdebbc0cd046b4238b806842..62ae0502114823c3e701c39f727d1ce8aca39e16 100644
--- a/substrate/primitives/npos-elections/src/lib.rs
+++ b/substrate/primitives/npos-elections/src/lib.rs
@@ -19,7 +19,7 @@
 //! - [`seq_phragmen`]: Implements the Phragmén Sequential Method. An un-ranked, relatively fast
 //!   election method that ensures PJR, but does not provide a constant factor approximation of the
 //!   maximin problem.
-//! - [`phragmms`](phragmms::phragmms): Implements a hybrid approach inspired by Phragmén which is
+//! - [`ghragmms`](phragmms::phragmms()): Implements a hybrid approach inspired by Phragmén which is
 //!   executed faster but it can achieve a constant factor approximation of the maximin problem,
 //!   similar to that of the MMS algorithm.
 //! - [`balance`](balancing::balance): Implements the star balancing algorithm. This iterative
diff --git a/substrate/primitives/offchain/Cargo.toml b/substrate/primitives/offchain/Cargo.toml
index 4a3549e9db88f68b62ad3a99aaf321cca58c9221..5f8821b43c7edac0cb3bd07948bf568ae0ea53da 100644
--- a/substrate/primitives/offchain/Cargo.toml
+++ b/substrate/primitives/offchain/Cargo.toml
@@ -3,10 +3,10 @@ description = "Substrate offchain workers primitives"
 name = "sp-offchain"
 version = "4.0.0-dev"
 license = "Apache-2.0"
-authors = ["Parity Technologies <admin@parity.io>"]
-edition = "2021"
+authors.workspace = true
+edition.workspace = true
 homepage = "https://substrate.io"
-repository = "https://github.com/paritytech/substrate/"
+repository.workspace = true
 readme = "README.md"
 
 [package.metadata.docs.rs]
diff --git a/substrate/primitives/offchain/README.md b/substrate/primitives/offchain/README.md
index a8620d3bb9d5b2a6d45e27404891cece853eafc8..5c239d2e0e733d239ee37751aa17b419c4551ab6 100644
--- a/substrate/primitives/offchain/README.md
+++ b/substrate/primitives/offchain/README.md
@@ -1,3 +1,3 @@
 The Offchain Worker runtime api primitives.
 
-License: Apache-2.0
\ No newline at end of file
+License: Apache-2.0
diff --git a/substrate/primitives/panic-handler/Cargo.toml b/substrate/primitives/panic-handler/Cargo.toml
index e73cfa98ca4182b93b36e0c63103606534b8e0e6..428062757c1556119c5dfe15cf7e1817f842bdd5 100644
--- a/substrate/primitives/panic-handler/Cargo.toml
+++ b/substrate/primitives/panic-handler/Cargo.toml
@@ -1,11 +1,11 @@
 [package]
 name = "sp-panic-handler"
 version = "8.0.0"
-authors = ["Parity Technologies <admin@parity.io>"]
-edition = "2021"
+authors.workspace = true
+edition.workspace = true
 license = "Apache-2.0"
 homepage = "https://substrate.io"
-repository = "https://github.com/paritytech/substrate/"
+repository.workspace = true
 description = "Custom panic hook with bug report link"
 documentation = "https://docs.rs/sp-panic-handler"
 readme = "README.md"
diff --git a/substrate/primitives/panic-handler/README.md b/substrate/primitives/panic-handler/README.md
index c08396960f4c953abda24049359cbb6649dbc7d2..f4f974ea6e1cfee0e3317a1af2ab744f8c842de1 100644
--- a/substrate/primitives/panic-handler/README.md
+++ b/substrate/primitives/panic-handler/README.md
@@ -7,4 +7,4 @@ given URL.
 By default, the panic handler aborts the process by calling [`std::process::exit`]. This can
 temporarily be disabled by using an [`AbortGuard`].
 
-License: Apache-2.0
\ No newline at end of file
+License: Apache-2.0
diff --git a/substrate/primitives/rpc/Cargo.toml b/substrate/primitives/rpc/Cargo.toml
index 273c39e7c94fbe664dc7082ed443298e5b172501..4739c96740e9ff1c72ed0aa8000437283d4000ac 100644
--- a/substrate/primitives/rpc/Cargo.toml
+++ b/substrate/primitives/rpc/Cargo.toml
@@ -1,11 +1,11 @@
 [package]
 name = "sp-rpc"
 version = "6.0.0"
-authors = ["Parity Technologies <admin@parity.io>"]
-edition = "2021"
+authors.workspace = true
+edition.workspace = true
 license = "Apache-2.0"
 homepage = "https://substrate.io"
-repository = "https://github.com/paritytech/substrate/"
+repository.workspace = true
 description = "Substrate RPC primitives and utilities."
 readme = "README.md"
 
@@ -14,8 +14,8 @@ targets = ["x86_64-unknown-linux-gnu"]
 
 [dependencies]
 rustc-hash = "1.1.0"
-serde = { version = "1.0.163", features = ["derive"] }
+serde = { version = "1.0.188", features = ["derive"] }
 sp-core = { path = "../core" }
 
 [dev-dependencies]
-serde_json = "1.0.85"
+serde_json = "1.0.107"
diff --git a/substrate/primitives/rpc/README.md b/substrate/primitives/rpc/README.md
index 8a9c17edd4755be7c9b040bde1019ea85fabb1be..4d48fc56aed9e9e0d150de7ed4189551d908ccab 100644
--- a/substrate/primitives/rpc/README.md
+++ b/substrate/primitives/rpc/README.md
@@ -1,3 +1,3 @@
 Substrate RPC primitives and utilities.
 
-License: Apache-2.0
\ No newline at end of file
+License: Apache-2.0
diff --git a/substrate/primitives/runtime-interface/Cargo.toml b/substrate/primitives/runtime-interface/Cargo.toml
index dc1efcd2dfffdf512a968f862426fd83a10af4e1..69a0d112a1621196394c374287ce9474f5934b58 100644
--- a/substrate/primitives/runtime-interface/Cargo.toml
+++ b/substrate/primitives/runtime-interface/Cargo.toml
@@ -1,11 +1,11 @@
 [package]
 name = "sp-runtime-interface"
 version = "17.0.0"
-authors = ["Parity Technologies <admin@parity.io>"]
-edition = "2021"
+authors.workspace = true
+edition.workspace = true
 license = "Apache-2.0"
 homepage = "https://substrate.io"
-repository = "https://github.com/paritytech/substrate/"
+repository.workspace = true
 description = "Substrate runtime interface"
 documentation = "https://docs.rs/sp-runtime-interface/"
 readme = "README.md"
diff --git a/substrate/primitives/runtime-interface/README.md b/substrate/primitives/runtime-interface/README.md
index 49e13f1b2e7436db5301781cf3a9ff300b6081dd..f6dfea945ddb44d6a5dbe7b93f869991c0c0aa83 100644
--- a/substrate/primitives/runtime-interface/README.md
+++ b/substrate/primitives/runtime-interface/README.md
@@ -1,43 +1,42 @@
 Substrate runtime interface
 
-This crate provides types, traits and macros around runtime interfaces. A runtime interface is
-a fixed interface between a Substrate runtime and a Substrate node. For a native runtime the
-interface maps to a direct function call of the implementation. For a wasm runtime the interface
-maps to an external function call. These external functions are exported by the wasm executor
-and they map to the same implementation as the native calls.
+This crate provides types, traits and macros around runtime interfaces. A runtime interface is a fixed interface between
+a Substrate runtime and a Substrate node. For a native runtime the interface maps to a direct function call of the
+implementation. For a wasm runtime the interface maps to an external function call. These external functions are
+exported by the wasm executor and they map to the same implementation as the native calls.
 
 # Using a type in a runtime interface
 <!-- markdown-link-check-disable -->
-Any type that should be used in a runtime interface as argument or return value needs to
-implement [`RIType`]. The associated type [`FFIType`](https:/docs.rs/sp-runtime-interface/latest/sp_runtime_interface/trait.RIType.html#associatedtype.FFIType)
-is the type that is used in the FFI function to represent the actual type. For example `[T]` is
-represented by an `u64`. The slice pointer and the length will be mapped to an `u64` value.
-For more information see this [table](https:/docs.rs/sp-runtime-interface/latest/sp_runtime_interface/#ffi-type-and-conversion).
-The FFI function definition is used when calling from the wasm runtime into the node.
+Any type that should be used in a runtime interface as argument or return value needs to implement [`RIType`]. The
+associated type
+[`FFIType`](https:/docs.rs/sp-runtime-interface/latest/sp_runtime_interface/trait.RIType.html#associatedtype.FFIType) is
+the type that is used in the FFI function to represent the actual type. For example `[T]` is represented by an `u64`.
+The slice pointer and the length will be mapped to an `u64` value. For more information see this
+[table](https:/docs.rs/sp-runtime-interface/latest/sp_runtime_interface/#ffi-type-and-conversion). The FFI function
+definition is used when calling from the wasm runtime into the node.
 
 Traits are used to convert from a type to the corresponding
 [`RIType::FFIType`](https:/docs.rs/sp-runtime-interface/latest/sp_runtime_interface/trait.RIType.html#associatedtype.FFIType).
-Depending on where and how a type should be used in a function signature, a combination of the
-following traits need to be implemented:
+Depending on where and how a type should be used in a function signature, a combination of the following traits need to
+be implemented:
 <!-- markdown-link-check-enable -->
 1. Pass as function argument: [`wasm::IntoFFIValue`] and [`host::FromFFIValue`]
 2. As function return value: [`wasm::FromFFIValue`] and [`host::IntoFFIValue`]
 3. Pass as mutable function argument: [`host::IntoPreallocatedFFIValue`]
 
-The traits are implemented for most of the common types like `[T]`, `Vec<T>`, arrays and
-primitive types.
+The traits are implemented for most of the common types like `[T]`, `Vec<T>`, arrays and primitive types.
 
-For custom types, we provide the [`PassBy`](https://docs.rs/sp-runtime-interface/latest/sp_runtime_interface/pass_by#PassBy) trait and strategies that define
-how a type is passed between the wasm runtime and the node. Each strategy also provides a derive
-macro to simplify the implementation.
+For custom types, we provide the
+[`PassBy`](https://docs.rs/sp-runtime-interface/latest/sp_runtime_interface/pass_by#PassBy) trait and strategies that
+define how a type is passed between the wasm runtime and the node. Each strategy also provides a derive macro to
+simplify the implementation.
 
 # Performance
 
-To not waste any more performance when calling into the node, not all types are SCALE encoded
-when being passed as arguments between the wasm runtime and the node. For most types that
-are raw bytes like `Vec<u8>`, `[u8]` or `[u8; N]` we pass them directly, without SCALE encoding
-them in front of. The implementation of [`RIType`] each type provides more information on how
-the data is passed.
+To not waste any more performance when calling into the node, not all types are SCALE encoded when being passed as
+arguments between the wasm runtime and the node. For most types that are raw bytes like `Vec<u8>`, `[u8]` or `[u8; N]`
+we pass them directly, without SCALE encoding them in front of. The implementation of [`RIType`] each type provides more
+information on how the data is passed.
 
 # Declaring a runtime interface
 
@@ -57,9 +56,10 @@ For more information on declaring a runtime interface, see
 
 # FFI type and conversion
 
-The following table documents how values of types are passed between the wasm and
-the host side and how they are converted into the corresponding type.
+The following table documents how values of types are passed between the wasm and the host side and how they are
+converted into the corresponding type.
 
+<!-- markdownlint-disable MD013 -->
 | Type | FFI type | Conversion |
 |----|----|----|
 | `u8` | `u8` | `Identity` |
diff --git a/substrate/primitives/runtime-interface/proc-macro/Cargo.toml b/substrate/primitives/runtime-interface/proc-macro/Cargo.toml
index 4b50dfe2a7a138d1689654f21185838fe28f2cfe..fbc49785ae97008e66fcc4b84a7111e998b8dc61 100644
--- a/substrate/primitives/runtime-interface/proc-macro/Cargo.toml
+++ b/substrate/primitives/runtime-interface/proc-macro/Cargo.toml
@@ -1,11 +1,11 @@
 [package]
 name = "sp-runtime-interface-proc-macro"
 version = "11.0.0"
-authors = ["Parity Technologies <admin@parity.io>"]
-edition = "2021"
+authors.workspace = true
+edition.workspace = true
 license = "Apache-2.0"
 homepage = "https://substrate.io"
-repository = "https://github.com/paritytech/substrate/"
+repository.workspace = true
 description = "This crate provides procedural macros for usage within the context of the Substrate runtime interface."
 documentation = "https://docs.rs/sp-runtime-interface-proc-macro"
 
@@ -20,4 +20,4 @@ Inflector = "0.11.4"
 proc-macro-crate = "1.1.3"
 proc-macro2 = "1.0.56"
 quote = "1.0.28"
-syn = { version = "2.0.16", features = ["full", "visit", "fold", "extra-traits"] }
+syn = { version = "2.0.38", features = ["full", "visit", "fold", "extra-traits"] }
diff --git a/substrate/primitives/runtime-interface/test-wasm-deprecated/Cargo.toml b/substrate/primitives/runtime-interface/test-wasm-deprecated/Cargo.toml
index ec047c279ecd9ebebc70ec4fa042b34e717d5df3..8e06aac851f9e62f82082e92bf6b797b7c919a6c 100644
--- a/substrate/primitives/runtime-interface/test-wasm-deprecated/Cargo.toml
+++ b/substrate/primitives/runtime-interface/test-wasm-deprecated/Cargo.toml
@@ -1,12 +1,12 @@
 [package]
 name = "sp-runtime-interface-test-wasm-deprecated"
 version = "2.0.0"
-authors = ["Parity Technologies <admin@parity.io>"]
-edition = "2021"
+authors.workspace = true
+edition.workspace = true
 build = "build.rs"
 license = "Apache-2.0"
 homepage = "https://substrate.io"
-repository = "https://github.com/paritytech/substrate/"
+repository.workspace = true
 publish = false
 
 [package.metadata.docs.rs]
diff --git a/substrate/primitives/runtime-interface/test-wasm/Cargo.toml b/substrate/primitives/runtime-interface/test-wasm/Cargo.toml
index ad577454ddeb212d6679d07d8931d188f48f963c..de0d6f9a13e2d513f15fa90affc80777b388485a 100644
--- a/substrate/primitives/runtime-interface/test-wasm/Cargo.toml
+++ b/substrate/primitives/runtime-interface/test-wasm/Cargo.toml
@@ -1,12 +1,12 @@
 [package]
 name = "sp-runtime-interface-test-wasm"
 version = "2.0.0"
-authors = ["Parity Technologies <admin@parity.io>"]
-edition = "2021"
+authors.workspace = true
+edition.workspace = true
 build = "build.rs"
 license = "Apache-2.0"
 homepage = "https://substrate.io"
-repository = "https://github.com/paritytech/substrate/"
+repository.workspace = true
 publish = false
 
 [package.metadata.docs.rs]
diff --git a/substrate/primitives/runtime-interface/test/Cargo.toml b/substrate/primitives/runtime-interface/test/Cargo.toml
index 417578105cb63f6c645b734e36f844b01e8dc398..feb6a454af1565a874cdec4075da9023a3232560 100644
--- a/substrate/primitives/runtime-interface/test/Cargo.toml
+++ b/substrate/primitives/runtime-interface/test/Cargo.toml
@@ -1,12 +1,12 @@
 [package]
 name = "sp-runtime-interface-test"
 version = "2.0.0"
-authors = ["Parity Technologies <admin@parity.io>"]
-edition = "2021"
+authors.workspace = true
+edition.workspace = true
 license = "Apache-2.0"
 publish = false
 homepage = "https://substrate.io"
-repository = "https://github.com/paritytech/substrate/"
+repository.workspace = true
 
 [package.metadata.docs.rs]
 targets = ["x86_64-unknown-linux-gnu"]
diff --git a/substrate/primitives/runtime-interface/tests/ui/no_duplicate_versions.rs b/substrate/primitives/runtime-interface/tests/ui/no_duplicate_versions.rs
index 948c327aa1a8b03c0b146031c013e07ca9b589f9..3dc49f7333b75441e6f57fcae3dcf78e6cdcc1f6 100644
--- a/substrate/primitives/runtime-interface/tests/ui/no_duplicate_versions.rs
+++ b/substrate/primitives/runtime-interface/tests/ui/no_duplicate_versions.rs
@@ -1,3 +1,20 @@
+// 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.
+
 use sp_runtime_interface::runtime_interface;
 
 #[runtime_interface]
diff --git a/substrate/primitives/runtime-interface/tests/ui/no_duplicate_versions.stderr b/substrate/primitives/runtime-interface/tests/ui/no_duplicate_versions.stderr
index 592dd9928c9687b875cc10d0d5ea15457c276c2d..f8dbdfbcb8f3dc6f03adbddff5e9264b046a52cd 100644
--- a/substrate/primitives/runtime-interface/tests/ui/no_duplicate_versions.stderr
+++ b/substrate/primitives/runtime-interface/tests/ui/no_duplicate_versions.stderr
@@ -1,11 +1,11 @@
 error: Duplicated version attribute
- --> $DIR/no_duplicate_versions.rs:7:2
-  |
-7 |     #[version(2)]
-  |     ^
+  --> tests/ui/no_duplicate_versions.rs:24:2
+   |
+24 |     #[version(2)]
+   |     ^
 
 error: Previous version with the same number defined here
- --> $DIR/no_duplicate_versions.rs:5:2
-  |
-5 |     #[version(2)]
-  |     ^
+  --> tests/ui/no_duplicate_versions.rs:22:2
+   |
+22 |     #[version(2)]
+   |     ^
diff --git a/substrate/primitives/runtime-interface/tests/ui/no_feature_gated_method.rs b/substrate/primitives/runtime-interface/tests/ui/no_feature_gated_method.rs
index 51e45f178f0c5d1163fd6549dacb8f16ce61bd33..836c5866459fae1aa9e39fc98355a4b2a7500051 100644
--- a/substrate/primitives/runtime-interface/tests/ui/no_feature_gated_method.rs
+++ b/substrate/primitives/runtime-interface/tests/ui/no_feature_gated_method.rs
@@ -1,3 +1,20 @@
+// 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.
+
 use sp_runtime_interface::runtime_interface;
 
 #[runtime_interface]
diff --git a/substrate/primitives/runtime-interface/tests/ui/no_feature_gated_method.stderr b/substrate/primitives/runtime-interface/tests/ui/no_feature_gated_method.stderr
index e8accd62fc68dec8680e093e7b6c0f7b0fc21291..10012ede793dee015a10279257a9d640096de0c8 100644
--- a/substrate/primitives/runtime-interface/tests/ui/no_feature_gated_method.stderr
+++ b/substrate/primitives/runtime-interface/tests/ui/no_feature_gated_method.stderr
@@ -1,5 +1,17 @@
 error[E0425]: cannot find function `bar` in module `test`
-  --> tests/ui/no_feature_gated_method.rs:16:8
+  --> tests/ui/no_feature_gated_method.rs:33:8
    |
-16 |     test::bar();
+33 |     test::bar();
    |           ^^^ not found in `test`
+   |
+note: found an item that was configured out
+  --> tests/ui/no_feature_gated_method.rs:25:5
+   |
+25 |     fn bar() {}
+   |        ^^^
+   = note: the item is gated behind the `bar-feature` feature
+note: found an item that was configured out
+  --> tests/ui/no_feature_gated_method.rs:25:5
+   |
+25 |     fn bar() {}
+   |        ^^^
diff --git a/substrate/primitives/runtime-interface/tests/ui/no_gaps_in_versions.rs b/substrate/primitives/runtime-interface/tests/ui/no_gaps_in_versions.rs
index c468f48e37462015c7426f653e0012a528313a25..8706a28782294efeee7c246259f5765d9edb63e3 100644
--- a/substrate/primitives/runtime-interface/tests/ui/no_gaps_in_versions.rs
+++ b/substrate/primitives/runtime-interface/tests/ui/no_gaps_in_versions.rs
@@ -1,3 +1,20 @@
+// 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.
+
 use sp_runtime_interface::runtime_interface;
 
 #[runtime_interface]
diff --git a/substrate/primitives/runtime-interface/tests/ui/no_gaps_in_versions.stderr b/substrate/primitives/runtime-interface/tests/ui/no_gaps_in_versions.stderr
index cdefcf60c56a8c4d27ab352e11cbd42d4198d241..142ca186c7d2923055fa7660fe6fc3a98cc07037 100644
--- a/substrate/primitives/runtime-interface/tests/ui/no_gaps_in_versions.stderr
+++ b/substrate/primitives/runtime-interface/tests/ui/no_gaps_in_versions.stderr
@@ -1,5 +1,5 @@
 error: Unexpected version attribute: missing version '2' for this function
-  --> $DIR/no_gaps_in_versions.rs:13:2
+  --> tests/ui/no_gaps_in_versions.rs:30:2
    |
-13 |     #[version(3)]
+30 |     #[version(3)]
    |     ^
diff --git a/substrate/primitives/runtime-interface/tests/ui/no_generic_parameters_method.rs b/substrate/primitives/runtime-interface/tests/ui/no_generic_parameters_method.rs
index 407942eb5ed8899d83a698f7af4b34c6f1ca4ee5..7fd61802a1ac62af9c0a4db0c7890207be1b670a 100644
--- a/substrate/primitives/runtime-interface/tests/ui/no_generic_parameters_method.rs
+++ b/substrate/primitives/runtime-interface/tests/ui/no_generic_parameters_method.rs
@@ -1,3 +1,20 @@
+// 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.
+
 use sp_runtime_interface::runtime_interface;
 
 #[runtime_interface]
diff --git a/substrate/primitives/runtime-interface/tests/ui/no_generic_parameters_method.stderr b/substrate/primitives/runtime-interface/tests/ui/no_generic_parameters_method.stderr
index 8a549753ac9f9abf5f9cf2e1e3cd4e05d1f4b2c4..f5257bdd99287d6abb41a744eeaa2a6cb1e740c6 100644
--- a/substrate/primitives/runtime-interface/tests/ui/no_generic_parameters_method.stderr
+++ b/substrate/primitives/runtime-interface/tests/ui/no_generic_parameters_method.stderr
@@ -1,5 +1,5 @@
 error: Generic parameters not supported.
- --> $DIR/no_generic_parameters_method.rs:5:10
-  |
-5 |     fn test<T>() {}
-  |             ^
+  --> tests/ui/no_generic_parameters_method.rs:22:10
+   |
+22 |     fn test<T>() {}
+   |             ^
diff --git a/substrate/primitives/runtime-interface/tests/ui/no_generic_parameters_trait.rs b/substrate/primitives/runtime-interface/tests/ui/no_generic_parameters_trait.rs
index 35efac6761ca28acae520dca795e0995994b4f11..ebb5b6f03f8c47818dc7d23b9e7aaa8447fd88a5 100644
--- a/substrate/primitives/runtime-interface/tests/ui/no_generic_parameters_trait.rs
+++ b/substrate/primitives/runtime-interface/tests/ui/no_generic_parameters_trait.rs
@@ -1,3 +1,20 @@
+// 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.
+
 use sp_runtime_interface::runtime_interface;
 
 #[runtime_interface]
diff --git a/substrate/primitives/runtime-interface/tests/ui/no_generic_parameters_trait.stderr b/substrate/primitives/runtime-interface/tests/ui/no_generic_parameters_trait.stderr
index 794e30bca767d3a3c0aed33713d7baca5d268f28..88a623c63bb6f815c43d9d59f7b0f9d1528917aa 100644
--- a/substrate/primitives/runtime-interface/tests/ui/no_generic_parameters_trait.stderr
+++ b/substrate/primitives/runtime-interface/tests/ui/no_generic_parameters_trait.stderr
@@ -1,5 +1,5 @@
 error: Generic parameters not supported.
- --> $DIR/no_generic_parameters_trait.rs:4:12
-  |
-4 | trait Test<T> {
-  |            ^
+  --> tests/ui/no_generic_parameters_trait.rs:21:12
+   |
+21 | trait Test<T> {
+   |            ^
diff --git a/substrate/primitives/runtime-interface/tests/ui/no_method_implementation.rs b/substrate/primitives/runtime-interface/tests/ui/no_method_implementation.rs
index e3cd93e4a97b224857fa34949896d7d53f67a28a..d243b0da6096e4f2f9934ae4632d1bb3495ca50d 100644
--- a/substrate/primitives/runtime-interface/tests/ui/no_method_implementation.rs
+++ b/substrate/primitives/runtime-interface/tests/ui/no_method_implementation.rs
@@ -1,3 +1,20 @@
+// 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.
+
 use sp_runtime_interface::runtime_interface;
 
 #[runtime_interface]
diff --git a/substrate/primitives/runtime-interface/tests/ui/no_method_implementation.stderr b/substrate/primitives/runtime-interface/tests/ui/no_method_implementation.stderr
index 31b2d39762340a4f09a53780a2a31f9b56def8b4..b2b570ca3079b52bbe7c11df1948a137f11636ce 100644
--- a/substrate/primitives/runtime-interface/tests/ui/no_method_implementation.stderr
+++ b/substrate/primitives/runtime-interface/tests/ui/no_method_implementation.stderr
@@ -1,5 +1,5 @@
 error: Methods need to have an implementation.
- --> $DIR/no_method_implementation.rs:5:2
-  |
-5 |     fn test();
-  |     ^^
+  --> tests/ui/no_method_implementation.rs:22:2
+   |
+22 |     fn test();
+   |     ^^
diff --git a/substrate/primitives/runtime-interface/tests/ui/no_versioned_conditional_build.rs b/substrate/primitives/runtime-interface/tests/ui/no_versioned_conditional_build.rs
index a4a8a5804bee342f5c224f7ccf886f1cda53ad72..73bb0fd3f17af1ee03d91fb0d133185be53d3868 100644
--- a/substrate/primitives/runtime-interface/tests/ui/no_versioned_conditional_build.rs
+++ b/substrate/primitives/runtime-interface/tests/ui/no_versioned_conditional_build.rs
@@ -1,3 +1,20 @@
+// 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.
+
 use sp_runtime_interface::runtime_interface;
 
 #[runtime_interface]
diff --git a/substrate/primitives/runtime-interface/tests/ui/no_versioned_conditional_build.stderr b/substrate/primitives/runtime-interface/tests/ui/no_versioned_conditional_build.stderr
index 6f50e14278de56abf824522cc5e1d63d63419d7e..6a99f4f76b523bc2a6afb7a2af4cc48fbd9716bc 100644
--- a/substrate/primitives/runtime-interface/tests/ui/no_versioned_conditional_build.stderr
+++ b/substrate/primitives/runtime-interface/tests/ui/no_versioned_conditional_build.stderr
@@ -1,5 +1,5 @@
 error: Conditional compilation is not supported for versioned functions
- --> tests/ui/no_versioned_conditional_build.rs:7:2
-  |
-7 |     #[version(2)]
-  |     ^
+  --> tests/ui/no_versioned_conditional_build.rs:24:2
+   |
+24 |     #[version(2)]
+   |     ^
diff --git a/substrate/primitives/runtime-interface/tests/ui/pass_by_enum_with_struct.rs b/substrate/primitives/runtime-interface/tests/ui/pass_by_enum_with_struct.rs
index 6f4ae37ea466e1f2f603929c557633c6d2059fcb..dcc8fb0930bdf10f93adb30a8b043be962854233 100644
--- a/substrate/primitives/runtime-interface/tests/ui/pass_by_enum_with_struct.rs
+++ b/substrate/primitives/runtime-interface/tests/ui/pass_by_enum_with_struct.rs
@@ -1,3 +1,20 @@
+// 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.
+
 use sp_runtime_interface::pass_by::PassByEnum;
 
 #[derive(PassByEnum)]
diff --git a/substrate/primitives/runtime-interface/tests/ui/pass_by_enum_with_struct.stderr b/substrate/primitives/runtime-interface/tests/ui/pass_by_enum_with_struct.stderr
index 44fb5a244e03d7a8e9cf71b7e031b00f3b5419ae..c5b69d426abf4d5f12138cdd5bb02baed6d376d6 100644
--- a/substrate/primitives/runtime-interface/tests/ui/pass_by_enum_with_struct.stderr
+++ b/substrate/primitives/runtime-interface/tests/ui/pass_by_enum_with_struct.stderr
@@ -1,7 +1,7 @@
 error: `PassByEnum` only supports enums as input type.
- --> $DIR/pass_by_enum_with_struct.rs:3:10
-  |
-3 | #[derive(PassByEnum)]
-  |          ^^^^^^^^^^
-  |
-  = note: this error originates in the derive macro `PassByEnum` (in Nightly builds, run with -Z macro-backtrace for more info)
+  --> tests/ui/pass_by_enum_with_struct.rs:20:10
+   |
+20 | #[derive(PassByEnum)]
+   |          ^^^^^^^^^^
+   |
+   = note: this error originates in the derive macro `PassByEnum` (in Nightly builds, run with -Z macro-backtrace for more info)
diff --git a/substrate/primitives/runtime-interface/tests/ui/pass_by_enum_with_value_variant.rs b/substrate/primitives/runtime-interface/tests/ui/pass_by_enum_with_value_variant.rs
index a03bfdc1aed814f180d6822a74efcc93b05a316c..b6faa46605bf731e08b0cc86fc08c769abb3afd1 100644
--- a/substrate/primitives/runtime-interface/tests/ui/pass_by_enum_with_value_variant.rs
+++ b/substrate/primitives/runtime-interface/tests/ui/pass_by_enum_with_value_variant.rs
@@ -1,3 +1,20 @@
+// 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.
+
 use sp_runtime_interface::pass_by::PassByEnum;
 
 #[derive(PassByEnum)]
diff --git a/substrate/primitives/runtime-interface/tests/ui/pass_by_enum_with_value_variant.stderr b/substrate/primitives/runtime-interface/tests/ui/pass_by_enum_with_value_variant.stderr
index 633dc3bbe8bc4829d32c72acc5ddb6dcd944480d..ad94efed3c659cfe1daa906bc5b1b7391d6a4d8a 100644
--- a/substrate/primitives/runtime-interface/tests/ui/pass_by_enum_with_value_variant.stderr
+++ b/substrate/primitives/runtime-interface/tests/ui/pass_by_enum_with_value_variant.stderr
@@ -1,7 +1,7 @@
 error: `PassByEnum` only supports unit variants.
- --> $DIR/pass_by_enum_with_value_variant.rs:3:10
-  |
-3 | #[derive(PassByEnum)]
-  |          ^^^^^^^^^^
-  |
-  = note: this error originates in the derive macro `PassByEnum` (in Nightly builds, run with -Z macro-backtrace for more info)
+  --> tests/ui/pass_by_enum_with_value_variant.rs:20:10
+   |
+20 | #[derive(PassByEnum)]
+   |          ^^^^^^^^^^
+   |
+   = note: this error originates in the derive macro `PassByEnum` (in Nightly builds, run with -Z macro-backtrace for more info)
diff --git a/substrate/primitives/runtime-interface/tests/ui/pass_by_inner_with_two_fields.rs b/substrate/primitives/runtime-interface/tests/ui/pass_by_inner_with_two_fields.rs
index f496bc3700106b27de4c72d0a3226174e751b03e..2b7e98165ba53107088a01dd8ecf22d47f8c80bb 100644
--- a/substrate/primitives/runtime-interface/tests/ui/pass_by_inner_with_two_fields.rs
+++ b/substrate/primitives/runtime-interface/tests/ui/pass_by_inner_with_two_fields.rs
@@ -1,3 +1,20 @@
+// 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.
+
 use sp_runtime_interface::pass_by::PassByInner;
 
 #[derive(PassByInner)]
diff --git a/substrate/primitives/runtime-interface/tests/ui/pass_by_inner_with_two_fields.stderr b/substrate/primitives/runtime-interface/tests/ui/pass_by_inner_with_two_fields.stderr
index 0ffee00210e795532ecbb976cb4b07147c12ecf6..3ca1362fb424ca7eaba3a37dd96b08ef5574fa84 100644
--- a/substrate/primitives/runtime-interface/tests/ui/pass_by_inner_with_two_fields.stderr
+++ b/substrate/primitives/runtime-interface/tests/ui/pass_by_inner_with_two_fields.stderr
@@ -1,7 +1,7 @@
 error: Only newtype/one field structs are supported by `PassByInner`!
- --> $DIR/pass_by_inner_with_two_fields.rs:3:10
-  |
-3 | #[derive(PassByInner)]
-  |          ^^^^^^^^^^^
-  |
-  = note: this error originates in the derive macro `PassByInner` (in Nightly builds, run with -Z macro-backtrace for more info)
+  --> tests/ui/pass_by_inner_with_two_fields.rs:20:10
+   |
+20 | #[derive(PassByInner)]
+   |          ^^^^^^^^^^^
+   |
+   = note: this error originates in the derive macro `PassByInner` (in Nightly builds, run with -Z macro-backtrace for more info)
diff --git a/substrate/primitives/runtime-interface/tests/ui/take_self_by_value.rs b/substrate/primitives/runtime-interface/tests/ui/take_self_by_value.rs
index 9c12614d9307726c01c8e3acfcb59bbd5b926abd..82227dc67ff6b2e4413f6fd7a3b4ef08f92ab2cc 100644
--- a/substrate/primitives/runtime-interface/tests/ui/take_self_by_value.rs
+++ b/substrate/primitives/runtime-interface/tests/ui/take_self_by_value.rs
@@ -1,3 +1,20 @@
+// 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.
+
 use sp_runtime_interface::runtime_interface;
 
 #[runtime_interface]
diff --git a/substrate/primitives/runtime-interface/tests/ui/take_self_by_value.stderr b/substrate/primitives/runtime-interface/tests/ui/take_self_by_value.stderr
index 9b17a63a35cbcd0e3ef6cbb209b99e435840b9de..3e9a4b74e8b81b5130cf85d7a8d66d80463e7bca 100644
--- a/substrate/primitives/runtime-interface/tests/ui/take_self_by_value.stderr
+++ b/substrate/primitives/runtime-interface/tests/ui/take_self_by_value.stderr
@@ -1,5 +1,5 @@
 error: Taking `Self` by value is not allowed.
- --> $DIR/take_self_by_value.rs:5:10
-  |
-5 |     fn test(self) {}
-  |             ^^^^
+  --> tests/ui/take_self_by_value.rs:22:10
+   |
+22 |     fn test(self) {}
+   |             ^^^^
diff --git a/substrate/primitives/runtime/Cargo.toml b/substrate/primitives/runtime/Cargo.toml
index 99315ef07ec6da78cfa08725ba1d09f9ef046d07..fa3c3ae2e6ea032447de8e0fe158e845ead2b9ec 100644
--- a/substrate/primitives/runtime/Cargo.toml
+++ b/substrate/primitives/runtime/Cargo.toml
@@ -1,11 +1,11 @@
 [package]
 name = "sp-runtime"
 version = "24.0.0"
-authors = ["Parity Technologies <admin@parity.io>"]
-edition = "2021"
+authors.workspace = true
+edition.workspace = true
 license = "Apache-2.0"
 homepage = "https://substrate.io"
-repository = "https://github.com/paritytech/substrate/"
+repository.workspace = true
 description = "Runtime Modules shared primitive types."
 documentation = "https://docs.rs/sp-runtime"
 readme = "README.md"
@@ -22,7 +22,7 @@ log = { version = "0.4.17", default-features = false }
 paste = "1.0"
 rand = { version = "0.8.5", optional = true }
 scale-info = { version = "2.5.0", default-features = false, features = ["derive"] }
-serde = { version = "1.0.163", default-features = false, features = ["derive", "alloc"], optional = true }
+serde = { version = "1.0.188", default-features = false, features = ["derive", "alloc"], optional = true }
 sp-application-crypto = { path = "../application-crypto", default-features = false}
 sp-arithmetic = { path = "../arithmetic", default-features = false}
 sp-core = { path = "../core", default-features = false}
@@ -32,8 +32,8 @@ sp-weights = { path = "../weights", default-features = false}
 
 [dev-dependencies]
 rand = "0.8.5"
-serde_json = "1.0.85"
-zstd = { version = "0.12.3", default-features = false }
+serde_json = "1.0.107"
+zstd = { version = "0.12.4", default-features = false }
 sp-api = { path = "../api" }
 sp-state-machine = { path = "../state-machine" }
 sp-tracing = { path = "../tracing" }
diff --git a/substrate/primitives/runtime/README.md b/substrate/primitives/runtime/README.md
index 1515cd8e2961b5a72fee1d39297e51305d16b0a6..2755690e4b32234b93948b0fbd352ce811392de7 100644
--- a/substrate/primitives/runtime/README.md
+++ b/substrate/primitives/runtime/README.md
@@ -1,3 +1,3 @@
 Runtime Modules shared primitive types.
 
-License: Apache-2.0
\ No newline at end of file
+License: Apache-2.0
diff --git a/substrate/primitives/session/Cargo.toml b/substrate/primitives/session/Cargo.toml
index a4326dab7ba1f9e578b6f067cff27f7b1055990d..9a5e77c9dc297ab2ca42c8f1b56b2871f1a244e2 100644
--- a/substrate/primitives/session/Cargo.toml
+++ b/substrate/primitives/session/Cargo.toml
@@ -1,11 +1,11 @@
 [package]
 name = "sp-session"
 version = "4.0.0-dev"
-authors = ["Parity Technologies <admin@parity.io>"]
-edition = "2021"
+authors.workspace = true
+edition.workspace = true
 license = "Apache-2.0"
 homepage = "https://substrate.io"
-repository = "https://github.com/paritytech/substrate/"
+repository.workspace = true
 description = "Primitives for sessions"
 readme = "README.md"
 
diff --git a/substrate/primitives/session/README.md b/substrate/primitives/session/README.md
index 2d1f9d9bc1d5b3cb77125be91d847b97c276833c..9ad3e27470343557795dff292b3f0c758dbf1999 100644
--- a/substrate/primitives/session/README.md
+++ b/substrate/primitives/session/README.md
@@ -1,3 +1,3 @@
 Substrate core types around sessions.
 
-License: Apache-2.0
\ No newline at end of file
+License: Apache-2.0
diff --git a/substrate/primitives/staking/Cargo.toml b/substrate/primitives/staking/Cargo.toml
index dcbce7ccfd03df6fc3bdef96648567594cf0faa9..825806078f6e9fde8b0a3e41d4013166cd649f96 100644
--- a/substrate/primitives/staking/Cargo.toml
+++ b/substrate/primitives/staking/Cargo.toml
@@ -1,11 +1,11 @@
 [package]
 name = "sp-staking"
 version = "4.0.0-dev"
-authors = ["Parity Technologies <admin@parity.io>"]
-edition = "2021"
+authors.workspace = true
+edition.workspace = true
 license = "Apache-2.0"
 homepage = "https://substrate.io"
-repository = "https://github.com/paritytech/substrate/"
+repository.workspace = true
 description = "A crate which contains primitives that are useful for implementation that uses staking approaches in general. Definitions related to sessions, slashing, etc go here."
 readme = "README.md"
 
@@ -13,7 +13,7 @@ readme = "README.md"
 targets = ["x86_64-unknown-linux-gnu"]
 
 [dependencies]
-serde = { version = "1.0.163", default-features = false, features = ["derive", "alloc"], optional = true }
+serde = { version = "1.0.188", default-features = false, features = ["derive", "alloc"], optional = true }
 codec = { package = "parity-scale-codec", version = "3.6.1", default-features = false, features = ["derive"] }
 scale-info = { version = "2.5.0", default-features = false, features = ["derive"] }
 impl-trait-for-tuples = "0.2.2"
diff --git a/substrate/primitives/staking/README.md b/substrate/primitives/staking/README.md
index 892e1379d9a53d9677bcc13f5f0ba42b61ae6a0b..3e0ea0ba1fa20a9589b68e6cf8ff0d19da53d7ba 100644
--- a/substrate/primitives/staking/README.md
+++ b/substrate/primitives/staking/README.md
@@ -1,4 +1,4 @@
 A crate which contains primitives that are useful for implementation that uses staking
 approaches in general. Definitions related to sessions, slashing, etc go here.
 
-License: Apache-2.0
\ No newline at end of file
+License: Apache-2.0
diff --git a/substrate/primitives/staking/src/currency_to_vote.rs b/substrate/primitives/staking/src/currency_to_vote.rs
index 556e5bd210426faeb8d774f88a8ebd5dfb1dd029..ff1253ade5fa12271da02ff671a0ea2ca5c21d0c 100644
--- a/substrate/primitives/staking/src/currency_to_vote.rs
+++ b/substrate/primitives/staking/src/currency_to_vote.rs
@@ -1,6 +1,6 @@
 // This file is part of Substrate.
 
-// Copyright (C) 2019-2022 Parity Technologies (UK) Ltd.
+// Copyright (C) Parity Technologies (UK) Ltd.
 // SPDX-License-Identifier: Apache-2.0
 
 // Licensed under the Apache License, Version 2.0 (the "License");
diff --git a/substrate/primitives/staking/src/lib.rs b/substrate/primitives/staking/src/lib.rs
index 1621af164b375cfec231777e08af83b839b45892..dfc18987d152582ecf4301798200fa52df53af25 100644
--- a/substrate/primitives/staking/src/lib.rs
+++ b/substrate/primitives/staking/src/lib.rs
@@ -37,6 +37,23 @@ pub type SessionIndex = u32;
 /// Counter for the number of eras that have passed.
 pub type EraIndex = u32;
 
+/// Representation of a staking account, which may be a stash or controller account.
+///
+/// Note: once the controller is completely deprecated, this enum can also be deprecated in favor of
+/// the stash account. Tracking issue: <https://github.com/paritytech/substrate/issues/6927>.
+#[derive(Clone, Debug)]
+pub enum StakingAccount<AccountId> {
+	Stash(AccountId),
+	Controller(AccountId),
+}
+
+#[cfg(feature = "std")]
+impl<AccountId> From<AccountId> for StakingAccount<AccountId> {
+	fn from(account: AccountId) -> Self {
+		StakingAccount::Stash(account)
+	}
+}
+
 /// Representation of the status of a staker.
 #[derive(RuntimeDebug, TypeInfo)]
 #[cfg_attr(feature = "serde", derive(serde::Serialize, serde::Deserialize, PartialEq, Eq, Clone))]
@@ -121,10 +138,12 @@ pub trait OnStakingUpdate<AccountId, Balance> {
 	/// * `slashed_active` - The new bonded balance of the staker after the slash was applied.
 	/// * `slashed_unlocking` - A map of slashed eras, and the balance of that unlocking chunk after
 	///   the slash is applied. Any era not present in the map is not affected at all.
+	/// * `slashed_total` - The aggregated balance that was lost due to the slash.
 	fn on_slash(
 		_stash: &AccountId,
 		_slashed_active: Balance,
 		_slashed_unlocking: &BTreeMap<EraIndex, Balance>,
+		_slashed_total: Balance,
 	) {
 	}
 }
diff --git a/substrate/primitives/state-machine/Cargo.toml b/substrate/primitives/state-machine/Cargo.toml
index f9793f8ddef913a22720c44c98874991f06d4200..ec5d9b5ea14e5b930130445c02c35f6a64ee9733 100644
--- a/substrate/primitives/state-machine/Cargo.toml
+++ b/substrate/primitives/state-machine/Cargo.toml
@@ -1,12 +1,12 @@
 [package]
 name = "sp-state-machine"
 version = "0.28.0"
-authors = ["Parity Technologies <admin@parity.io>"]
+authors.workspace = true
 description = "Substrate State Machine"
-edition = "2021"
+edition.workspace = true
 license = "Apache-2.0"
 homepage = "https://substrate.io"
-repository = "https://github.com/paritytech/substrate/"
+repository.workspace = true
 documentation = "https://docs.rs/sp-state-machine"
 readme = "README.md"
 
@@ -20,14 +20,14 @@ log = { version = "0.4.17", default-features = false }
 parking_lot = { version = "0.12.1", optional = true }
 rand = { version = "0.8.5", optional = true }
 smallvec = "1.11.0"
-thiserror = { version = "1.0.30", optional = true }
+thiserror = { version = "1.0.48", optional = true }
 tracing = { version = "0.1.29", optional = true }
 sp-core = { path = "../core", default-features = false}
 sp-externalities = { path = "../externalities", default-features = false}
 sp-panic-handler = { path = "../panic-handler", optional = true}
 sp-std = { path = "../std", default-features = false}
 sp-trie = { path = "../trie", default-features = false}
-trie-db = { version = "0.27.1", default-features = false }
+trie-db = { version = "0.28.0", default-features = false }
 
 [dev-dependencies]
 array-bytes = "6.1"
diff --git a/substrate/primitives/state-machine/README.md b/substrate/primitives/state-machine/README.md
index aa244da62d50fc4ee549f1431d8f1dada8b48051..91d706f860e1de1cae8a51651e532b363411c57f 100644
--- a/substrate/primitives/state-machine/README.md
+++ b/substrate/primitives/state-machine/README.md
@@ -1,3 +1,3 @@
 Substrate state machine implementation.
 
-License: Apache-2.0
\ No newline at end of file
+License: Apache-2.0
diff --git a/substrate/primitives/state-machine/src/backend.rs b/substrate/primitives/state-machine/src/backend.rs
index 2a25bdc54d9491faaf500f760aae7550dd1dadd3..ea9cd442d70ba55056d2ebdc27fa1eb26d0ba9c9 100644
--- a/substrate/primitives/state-machine/src/backend.rs
+++ b/substrate/primitives/state-machine/src/backend.rs
@@ -30,7 +30,7 @@ use sp_core::storage::{ChildInfo, StateVersion, TrackedStorageKey};
 #[cfg(feature = "std")]
 use sp_core::traits::RuntimeCode;
 use sp_std::vec::Vec;
-use sp_trie::PrefixedMemoryDB;
+use sp_trie::{MerkleValue, PrefixedMemoryDB};
 
 /// A struct containing arguments for iterating over the storage.
 #[derive(Default)]
@@ -195,7 +195,17 @@ pub trait Backend<H: Hasher>: sp_std::fmt::Debug {
 	/// Get keyed storage value hash or None if there is nothing associated.
 	fn storage_hash(&self, key: &[u8]) -> Result<Option<H::Out>, Self::Error>;
 
-	/// Get keyed child storage or None if there is nothing associated.
+	/// Get the merkle value or None if there is nothing associated.
+	fn closest_merkle_value(&self, key: &[u8]) -> Result<Option<MerkleValue<H::Out>>, Self::Error>;
+
+	/// Get the child merkle value or None if there is nothing associated.
+	fn child_closest_merkle_value(
+		&self,
+		child_info: &ChildInfo,
+		key: &[u8],
+	) -> Result<Option<MerkleValue<H::Out>>, Self::Error>;
+
+	/// Get child keyed child storage or None if there is nothing associated.
 	fn child_storage(
 		&self,
 		child_info: &ChildInfo,
diff --git a/substrate/primitives/state-machine/src/trie_backend.rs b/substrate/primitives/state-machine/src/trie_backend.rs
index cc7132181f90a0ceab30a66b2d78a54798031b25..afa80addd2bae1bb8694ded9c84f4b11a673f65f 100644
--- a/substrate/primitives/state-machine/src/trie_backend.rs
+++ b/substrate/primitives/state-machine/src/trie_backend.rs
@@ -30,7 +30,6 @@ use codec::Codec;
 use hash_db::HashDB;
 use hash_db::Hasher;
 use sp_core::storage::{ChildInfo, StateVersion};
-use sp_trie::PrefixedMemoryDB;
 #[cfg(feature = "std")]
 use sp_trie::{
 	cache::{LocalTrieCache, TrieCache},
@@ -39,6 +38,7 @@ use sp_trie::{
 };
 #[cfg(not(feature = "std"))]
 use sp_trie::{Error, NodeCodec};
+use sp_trie::{MerkleValue, PrefixedMemoryDB};
 use trie_db::TrieCache as TrieCacheT;
 #[cfg(not(feature = "std"))]
 use trie_db::{node::NodeOwned, CachedValue};
@@ -405,6 +405,18 @@ where
 		self.essence.child_storage(child_info, key)
 	}
 
+	fn closest_merkle_value(&self, key: &[u8]) -> Result<Option<MerkleValue<H::Out>>, Self::Error> {
+		self.essence.closest_merkle_value(key)
+	}
+
+	fn child_closest_merkle_value(
+		&self,
+		child_info: &ChildInfo,
+		key: &[u8],
+	) -> Result<Option<MerkleValue<H::Out>>, Self::Error> {
+		self.essence.child_closest_merkle_value(child_info, key)
+	}
+
 	fn next_storage_key(&self, key: &[u8]) -> Result<Option<StorageKey>, Self::Error> {
 		let (is_cached, mut cache) = access_cache(&self.next_storage_key_cache, Option::take)
 			.map(|cache| (cache.last_key == key, cache))
diff --git a/substrate/primitives/state-machine/src/trie_backend_essence.rs b/substrate/primitives/state-machine/src/trie_backend_essence.rs
index 4bb51f4a134370795da03d0bbfefc347d72f12cd..ad7aeab899c8887e9fcaca2af1577b51f7533b1d 100644
--- a/substrate/primitives/state-machine/src/trie_backend_essence.rs
+++ b/substrate/primitives/state-machine/src/trie_backend_essence.rs
@@ -32,11 +32,12 @@ use sp_std::{boxed::Box, marker::PhantomData, vec::Vec};
 #[cfg(feature = "std")]
 use sp_trie::recorder::Recorder;
 use sp_trie::{
-	child_delta_trie_root, delta_trie_root, empty_child_trie_root, read_child_trie_hash,
-	read_child_trie_value, read_trie_value,
+	child_delta_trie_root, delta_trie_root, empty_child_trie_root,
+	read_child_trie_first_descedant_value, read_child_trie_hash, read_child_trie_value,
+	read_trie_first_descedant_value, read_trie_value,
 	trie_types::{TrieDBBuilder, TrieError},
-	DBValue, KeySpacedDB, NodeCodec, PrefixedMemoryDB, Trie, TrieCache, TrieDBRawIterator,
-	TrieRecorder,
+	DBValue, KeySpacedDB, MerkleValue, NodeCodec, PrefixedMemoryDB, Trie, TrieCache,
+	TrieDBRawIterator, TrieRecorder,
 };
 #[cfg(feature = "std")]
 use std::{collections::HashMap, sync::Arc};
@@ -574,6 +575,39 @@ where
 		})
 	}
 
+	/// Get the closest merkle value at given key.
+	pub fn closest_merkle_value(&self, key: &[u8]) -> Result<Option<MerkleValue<H::Out>>> {
+		let map_e = |e| format!("Trie lookup error: {}", e);
+
+		self.with_recorder_and_cache(None, |recorder, cache| {
+			read_trie_first_descedant_value::<Layout<H>, _>(self, &self.root, key, recorder, cache)
+				.map_err(map_e)
+		})
+	}
+
+	/// Get the child closest merkle value at given key.
+	pub fn child_closest_merkle_value(
+		&self,
+		child_info: &ChildInfo,
+		key: &[u8],
+	) -> Result<Option<MerkleValue<H::Out>>> {
+		let Some(child_root) = self.child_root(child_info)? else { return Ok(None) };
+
+		let map_e = |e| format!("Trie lookup error: {}", e);
+
+		self.with_recorder_and_cache(Some(child_root), |recorder, cache| {
+			read_child_trie_first_descedant_value::<Layout<H>, _>(
+				child_info.keyspace(),
+				self,
+				&child_root,
+				key,
+				recorder,
+				cache,
+			)
+			.map_err(map_e)
+		})
+	}
+
 	/// Create a raw iterator over the storage.
 	pub fn raw_iter(&self, args: IterArgs) -> Result<RawIter<S, H, C>> {
 		let root = if let Some(child_info) = args.child_info.as_ref() {
diff --git a/substrate/primitives/statement-store/Cargo.toml b/substrate/primitives/statement-store/Cargo.toml
index 875e8825b6b07dd265d01c1dec5f6cb60dc83847..cf41d9f829920ee2d31b9a39960618d477df4f3a 100644
--- a/substrate/primitives/statement-store/Cargo.toml
+++ b/substrate/primitives/statement-store/Cargo.toml
@@ -1,11 +1,11 @@
 [package]
 name = "sp-statement-store"
 version = "4.0.0-dev"
-authors = ["Parity Technologies <admin@parity.io>"]
-edition = "2021"
+authors.workspace = true
+edition.workspace = true
 license = "Apache-2.0"
 homepage = "https://substrate.io"
-repository = "https://github.com/paritytech/substrate/"
+repository.workspace = true
 description = "A crate which contains primitives related to the statement store"
 readme = "README.md"
 
diff --git a/substrate/primitives/statement-store/README.md b/substrate/primitives/statement-store/README.md
index fb88aaa4ecd9c062a059cf303de3a520fa5bfed9..f224f6ce43192ed86f99935fc356b4241caa0fd8 100644
--- a/substrate/primitives/statement-store/README.md
+++ b/substrate/primitives/statement-store/README.md
@@ -1,18 +1,35 @@
+# Statement store
+
 Statement store is an off-chain data-store for signed statements accessible via RPC and OCW.
 
-Nodes hold a number of statements with a proof of authenticity owing to an account ID. OCWs can place items in the data-store (with valid signatures) for any accounts whose keys they control. Users can also submit pre-signed statements via RPC. Statements can also be submitted from on-chain logic through an on-chain event.
+Nodes hold a number of statements with a proof of authenticity owing to an account ID. OCWs can place items in the
+data-store (with valid signatures) for any accounts whose keys they control. Users can also submit pre-signed statements
+via RPC. Statements can also be submitted from on-chain logic through an on-chain event.
 
-A new system event `NewStatement` is added to the runtime. This event allows any account on-chain to declare that they want to make a statement for the store. Within the node store and for broadcasting, the statement would be accompanied with the hash of the block and index of the event within it, essentially taking the place of a real signature.
+A new system event `NewStatement` is added to the runtime. This event allows any account on-chain to declare that they
+want to make a statement for the store. Within the node store and for broadcasting, the statement would be accompanied
+with the hash of the block and index of the event within it, essentially taking the place of a real signature.
 
-Statements comprise an optional proof of authenticity (e.g. a signature) and a number of fields. For statements without a proof, nodes would gossip statements randomly with a rate-limiter to minimise the chance of being overrun by a misbehaving node. These will generally be disregarded by nodes unless they are gossiped by several different peers or if a peer pays for it somehow (e.g. gossiping something valuable).
+Statements comprise an optional proof of authenticity (e.g. a signature) and a number of fields. For statements without
+a proof, nodes would gossip statements randomly with a rate-limiter to minimise the chance of being overrun by a
+misbehaving node. These will generally be disregarded by nodes unless they are gossiped by several different peers or if
+a peer pays for it somehow (e.g. gossiping something valuable).
 
-Each field is effectively a key/value pair. Fields must be sorted and the same field type may not be repeated. Depending on which keys are present, clients may index the message for ease of retrieval.
+Each field is effectively a key/value pair. Fields must be sorted and the same field type may not be repeated. Depending
+on which keys are present, clients may index the message for ease of retrieval.
 
 Formally, `Statement` is equivalent to the type `Vec<Field>` and `Field` is the SCALE-encoded enumeration:
-- 0: `AuthenticityProof(Proof)`: The signature of the message. For cryptography where the public key cannot be derived from the signature together with the message data, then this will also include the signer's public key. The message data is all fields of the messages fields except the signature concatenated together *without the length prefix that a `Vec` would usually imply*. This is so that the signature can be derived without needing to re-encode the statement.
-- 1: `DecryptionKey([u8; 32])`: The decryption key identifier which should be used to decrypt the statement's data. In the absense of this field `Data` should be treated as not encrypted.
-- 2: `Priority(u32)`: Priority specifier. Higher priority statements should be kept around at the cost of lower priority statements if multiple statements from the same sender are competing for persistence or transport. Nodes should disregard when considering unsigned statements.
-- 3: `Channel([u8; 32])`: The channel identifier. Only one message of a given channel should be retained at once (the one of highest priority). Nodes should disregard when considering unsigned statements.
+- 0: `AuthenticityProof(Proof)`: The signature of the message. For cryptography where the public key cannot be derived
+  from the signature together with the message data, then this will also include the signer's public key. The message
+  data is all fields of the messages fields except the signature concatenated together *without the length prefix that a
+  `Vec` would usually imply*. This is so that the signature can be derived without needing to re-encode the statement.
+- 1: `DecryptionKey([u8; 32])`: The decryption key identifier which should be used to decrypt the statement's data. In
+  the absence of this field `Data` should be treated as not encrypted.
+- 2: `Priority(u32)`: Priority specifier. Higher priority statements should be kept around at the cost of lower priority
+  statements if multiple statements from the same sender are competing for persistence or transport. Nodes should
+  disregard when considering unsigned statements.
+- 3: `Channel([u8; 32])`: The channel identifier. Only one message of a given channel should be retained at once (the
+  one of highest priority). Nodes should disregard when considering unsigned statements.
 - 4: `Topic1([u8; 32]))`: First topic identifier.
 - 5: `Topic2([u8; 32]))`: Second topic identifier.
 - 6: `Topic3([u8; 32]))`: Third topic identifier.
@@ -25,7 +42,7 @@ Formally, `Statement` is equivalent to the type `Vec<Field>` and `Field` is the
 - 2: `Secp256k1Ecdsa { signature: [u8; 65], signer: [u8; 33] )`
 - 3: `OnChain { who: [u8; 32], block_hash: [u8; 32], event_index: u64 }`
 
-### Potential uses
+## Potential uses
 
 Potential use-cases are various and include:
 - ring-signature aggregation;
diff --git a/substrate/primitives/std/Cargo.toml b/substrate/primitives/std/Cargo.toml
index 4c58d147c7a7ae91a94de160f5a07e88645c80a8..2283a4a97a40f0de065d76ea6371275c6956f39c 100644
--- a/substrate/primitives/std/Cargo.toml
+++ b/substrate/primitives/std/Cargo.toml
@@ -1,11 +1,11 @@
 [package]
 name = "sp-std"
 version = "8.0.0"
-authors = ["Parity Technologies <admin@parity.io>"]
-edition = "2021"
+authors.workspace = true
+edition.workspace = true
 license = "Apache-2.0"
 homepage = "https://substrate.io"
-repository = "https://github.com/paritytech/substrate/"
+repository.workspace = true
 description = "Lowest-abstraction level for the Substrate runtime: just exports useful primitives from std or client/alloc to be used with any code that depends on the runtime."
 documentation = "https://docs.rs/sp-std"
 readme = "README.md"
diff --git a/substrate/primitives/std/README.md b/substrate/primitives/std/README.md
index 6dddd8fbbdd9d2fade460195ac2d9cee0eaf35ad..e186ccecf7b9f806b89b2e46990e227692b8789e 100644
--- a/substrate/primitives/std/README.md
+++ b/substrate/primitives/std/README.md
@@ -1,4 +1,4 @@
 Lowest-abstraction level for the Substrate runtime: just exports useful primitives from std
 or client/alloc to be used with any code that depends on the runtime.
 
-License: Apache-2.0
\ No newline at end of file
+License: Apache-2.0
diff --git a/substrate/primitives/storage/Cargo.toml b/substrate/primitives/storage/Cargo.toml
index 1f18a49befc8bdd1375066131601d52851a9cd22..11e574f1c4ced1402ec7488cce7b722bedd7cca5 100644
--- a/substrate/primitives/storage/Cargo.toml
+++ b/substrate/primitives/storage/Cargo.toml
@@ -1,12 +1,12 @@
 [package]
 name = "sp-storage"
 version = "13.0.0"
-authors = ["Parity Technologies <admin@parity.io>"]
-edition = "2021"
+authors.workspace = true
+edition.workspace = true
 description = "Storage related primitives"
 license = "Apache-2.0"
 homepage = "https://substrate.io"
-repository = "https://github.com/paritytech/substrate/"
+repository.workspace = true
 documentation = "https://docs.rs/sp-storage/"
 readme = "README.md"
 
@@ -17,7 +17,7 @@ targets = ["x86_64-unknown-linux-gnu"]
 codec = { package = "parity-scale-codec", version = "3.6.1", default-features = false, features = ["derive"] }
 impl-serde = { version = "0.4.0", optional = true, default-features = false }
 ref-cast = "1.0.0"
-serde = { version = "1.0.163", default-features = false, features = ["derive", "alloc"], optional = true }
+serde = { version = "1.0.188", default-features = false, features = ["derive", "alloc"], optional = true }
 sp-debug-derive = { path = "../debug-derive", default-features = false}
 sp-std = { path = "../std", default-features = false}
 
diff --git a/substrate/primitives/storage/README.md b/substrate/primitives/storage/README.md
index c33144fc4f66202804594d6cf0cc6886b5cad339..ac922f139ffef26a2ea725bd173e81b63347e66c 100644
--- a/substrate/primitives/storage/README.md
+++ b/substrate/primitives/storage/README.md
@@ -1,3 +1,3 @@
 Primitive types for storage related stuff.
 
-License: Apache-2.0
\ No newline at end of file
+License: Apache-2.0
diff --git a/substrate/primitives/test-primitives/Cargo.toml b/substrate/primitives/test-primitives/Cargo.toml
index 3b5dc6b4f55d0f40f41706d7b0028a22f727d4db..91d532b6e16caa2584a68eff94408ae47f26c6ff 100644
--- a/substrate/primitives/test-primitives/Cargo.toml
+++ b/substrate/primitives/test-primitives/Cargo.toml
@@ -1,11 +1,11 @@
 [package]
 name = "sp-test-primitives"
 version = "2.0.0"
-authors = ["Parity Technologies <admin@parity.io>"]
-edition = "2021"
+authors.workspace = true
+edition.workspace = true
 license = "Apache-2.0"
 homepage = "https://substrate.io"
-repository = "https://github.com/paritytech/substrate/"
+repository.workspace = true
 publish = false
 
 [package.metadata.docs.rs]
@@ -14,7 +14,7 @@ targets = ["x86_64-unknown-linux-gnu"]
 [dependencies]
 codec = { package = "parity-scale-codec", version = "3.6.1", default-features = false, features = ["derive"] }
 scale-info = { version = "2.1.1", default-features = false, features = ["derive"] }
-serde = { version = "1.0.163", default-features = false, features = ["derive"], optional = true }
+serde = { version = "1.0.188", default-features = false, features = ["derive"], optional = true }
 sp-application-crypto = { path = "../application-crypto", default-features = false}
 sp-core = { path = "../core", default-features = false}
 sp-runtime = { path = "../runtime", default-features = false}
diff --git a/substrate/primitives/timestamp/Cargo.toml b/substrate/primitives/timestamp/Cargo.toml
index 224ec542c6b70ee1431a36548a54b1c1868b61de..44b0fdd831c029fed9f1df4acbcd18705d1782f1 100644
--- a/substrate/primitives/timestamp/Cargo.toml
+++ b/substrate/primitives/timestamp/Cargo.toml
@@ -1,11 +1,11 @@
 [package]
 name = "sp-timestamp"
 version = "4.0.0-dev"
-authors = ["Parity Technologies <admin@parity.io>"]
-edition = "2021"
+authors.workspace = true
+edition.workspace = true
 license = "Apache-2.0"
 homepage = "https://substrate.io"
-repository = "https://github.com/paritytech/substrate/"
+repository.workspace = true
 description = "Substrate core types and inherents for timestamps."
 readme = "README.md"
 
@@ -15,7 +15,7 @@ targets = ["x86_64-unknown-linux-gnu"]
 [dependencies]
 async-trait = { version = "0.1.57", optional = true }
 codec = { package = "parity-scale-codec", version = "3.6.1", default-features = false, features = ["derive"] }
-thiserror = { version = "1.0.30", optional = true }
+thiserror = { version = "1.0.48", optional = true }
 sp-inherents = { path = "../inherents", default-features = false}
 sp-runtime = { path = "../runtime", default-features = false}
 sp-std = { path = "../std", default-features = false}
diff --git a/substrate/primitives/timestamp/README.md b/substrate/primitives/timestamp/README.md
index a61a776912c93b4ab55525cba2d30146466ff905..41649cdfc8e2c1e091e55101daac57d843b402ef 100644
--- a/substrate/primitives/timestamp/README.md
+++ b/substrate/primitives/timestamp/README.md
@@ -1,3 +1,3 @@
 Substrate core types and inherents for timestamps.
 
-License: Apache-2.0
\ No newline at end of file
+License: Apache-2.0
diff --git a/substrate/primitives/timestamp/src/lib.rs b/substrate/primitives/timestamp/src/lib.rs
index eeec73efbc8bee691b43c7cbfd06f4a8399fe674..d1bd2a3446e6b65ea2bf7a35942cae5f10f599be 100644
--- a/substrate/primitives/timestamp/src/lib.rs
+++ b/substrate/primitives/timestamp/src/lib.rs
@@ -140,7 +140,7 @@ pub enum InherentError {
 		error("The time since the last timestamp is lower than the minimum period.")
 	)]
 	TooEarly,
-	/// The block timestamp is too far in the future
+	/// The block timestamp is too far in the future.
 	#[cfg_attr(feature = "std", error("The timestamp of the block is too far in the future."))]
 	TooFarInFuture,
 }
diff --git a/substrate/primitives/tracing/Cargo.toml b/substrate/primitives/tracing/Cargo.toml
index 045c17627ab6c5497a7a9fe705161e71e570abde..0f7e217ec3882610afbbba4041f4f1b9a49242c9 100644
--- a/substrate/primitives/tracing/Cargo.toml
+++ b/substrate/primitives/tracing/Cargo.toml
@@ -2,10 +2,10 @@
 name = "sp-tracing"
 version = "10.0.0"
 license = "Apache-2.0"
-authors = ["Parity Technologies <admin@parity.io>"]
-edition = "2021"
+authors.workspace = true
+edition.workspace = true
 homepage = "https://substrate.io"
-repository = "https://github.com/paritytech/substrate/"
+repository.workspace = true
 description = "Instrumentation primitives and macros for Substrate."
 readme = "README.md"
 
diff --git a/substrate/primitives/tracing/README.md b/substrate/primitives/tracing/README.md
index d66bb90016c7184e7178d437ab6944e4e36faee2..4582a34d918e8d259824521e5b7691e37f928238 100644
--- a/substrate/primitives/tracing/README.md
+++ b/substrate/primitives/tracing/README.md
@@ -12,4 +12,4 @@ Additionally, we have a const: `WASM_TRACE_IDENTIFIER`, which holds a span name
 to signal that the 'actual' span name and target should be retrieved instead from
 the associated Fields mentioned above.
 
-License: Apache-2.0
\ No newline at end of file
+License: Apache-2.0
diff --git a/substrate/primitives/transaction-pool/Cargo.toml b/substrate/primitives/transaction-pool/Cargo.toml
index c78c3a317204ecde8063c35e1f81940bbd98b937..d1d38ffa1af809cf527d253661d1baa3db5b94c9 100644
--- a/substrate/primitives/transaction-pool/Cargo.toml
+++ b/substrate/primitives/transaction-pool/Cargo.toml
@@ -1,11 +1,11 @@
 [package]
 name = "sp-transaction-pool"
 version = "4.0.0-dev"
-authors = ["Parity Technologies <admin@parity.io>"]
-edition = "2021"
+authors.workspace = true
+edition.workspace = true
 license = "Apache-2.0"
 homepage = "https://substrate.io"
-repository = "https://github.com/paritytech/substrate/"
+repository.workspace = true
 description = "Transaction pool runtime facing API."
 documentation = "https://docs.rs/sp-transaction-pool"
 readme = "README.md"
diff --git a/substrate/primitives/transaction-pool/README.md b/substrate/primitives/transaction-pool/README.md
index 417565ebfce00c6a9961efa5def9bf327c37dd7f..209d23e9980fa5f733b4c3f570d663acfa9042da 100644
--- a/substrate/primitives/transaction-pool/README.md
+++ b/substrate/primitives/transaction-pool/README.md
@@ -1,3 +1,3 @@
 Transaction pool primitives types & Runtime API.
 
-License: Apache-2.0
\ No newline at end of file
+License: Apache-2.0
diff --git a/substrate/primitives/transaction-storage-proof/Cargo.toml b/substrate/primitives/transaction-storage-proof/Cargo.toml
index 1683fea254972024d68a7754ac7966d372d905ea..9efff2892bd66218f54346beb232c07c07f246ef 100644
--- a/substrate/primitives/transaction-storage-proof/Cargo.toml
+++ b/substrate/primitives/transaction-storage-proof/Cargo.toml
@@ -1,12 +1,12 @@
 [package]
 name = "sp-transaction-storage-proof"
 version = "4.0.0-dev"
-authors = ["Parity Technologies <admin@parity.io>"]
+authors.workspace = true
 description = "Transaction storage proof primitives"
-edition = "2021"
+edition.workspace = true
 license = "Apache-2.0"
 homepage = "https://substrate.io"
-repository = "https://github.com/paritytech/substrate/"
+repository.workspace = true
 readme = "README.md"
 
 [package.metadata.docs.rs]
diff --git a/substrate/primitives/trie/Cargo.toml b/substrate/primitives/trie/Cargo.toml
index 58a0f5f9659ef9e5df7378f27f19003eef39b3ff..0b54514f6003d9c10f96640ff61172cee5bf8d2b 100644
--- a/substrate/primitives/trie/Cargo.toml
+++ b/substrate/primitives/trie/Cargo.toml
@@ -1,11 +1,11 @@
 [package]
 name = "sp-trie"
 version = "22.0.0"
-authors = ["Parity Technologies <admin@parity.io>"]
+authors.workspace = true
 description = "Patricia trie stuff using a parity-scale-codec node format"
-repository = "https://github.com/paritytech/substrate/"
+repository.workspace = true
 license = "Apache-2.0"
-edition = "2021"
+edition.workspace = true
 homepage = "https://substrate.io"
 documentation = "https://docs.rs/sp-trie"
 readme = "README.md"
@@ -27,9 +27,9 @@ memory-db = { version = "0.32.0", default-features = false }
 nohash-hasher = { version = "0.2.0", optional = true }
 parking_lot = { version = "0.12.1", optional = true }
 scale-info = { version = "2.5.0", default-features = false, features = ["derive"] }
-thiserror = { version = "1.0.30", optional = true }
+thiserror = { version = "1.0.48", optional = true }
 tracing = { version = "0.1.29", optional = true }
-trie-db = { version = "0.27.0", default-features = false }
+trie-db = { version = "0.28.0", default-features = false }
 trie-root = { version = "0.18.0", default-features = false }
 sp-core = { path = "../core", default-features = false}
 sp-std = { path = "../std", default-features = false}
@@ -38,7 +38,7 @@ schnellru = { version = "0.2.1", optional = true }
 [dev-dependencies]
 array-bytes = "6.1"
 criterion = "0.4.0"
-trie-bench = "0.37.0"
+trie-bench = "0.38.0"
 trie-standardmap = "0.16.0"
 sp-runtime = { path = "../runtime" }
 
diff --git a/substrate/primitives/trie/README.md b/substrate/primitives/trie/README.md
index 634ba4bdead26d4a77e4c284866bf0cb37b3d93c..e82080da5ff899a3df6480da373612aa7b7b6c27 100644
--- a/substrate/primitives/trie/README.md
+++ b/substrate/primitives/trie/README.md
@@ -1,3 +1,3 @@
 Utility functions to interact with Substrate's Base-16 Modified Merkle Patricia tree ("trie").
 
-License: Apache-2.0
\ No newline at end of file
+License: Apache-2.0
diff --git a/substrate/primitives/trie/src/lib.rs b/substrate/primitives/trie/src/lib.rs
index 94155458569bff5dcb880aaae5c49899877a4e01..1a1ed670454dce46f72ef16ff033af1336eadf8a 100644
--- a/substrate/primitives/trie/src/lib.rs
+++ b/substrate/primitives/trie/src/lib.rs
@@ -44,7 +44,6 @@ pub use storage_proof::{CompactProof, StorageProof};
 /// Trie codec reexport, mainly child trie support
 /// for trie compact proof.
 pub use trie_codec::{decode_compact, encode_compact, Error as CompactProofError};
-pub use trie_db::proof::VerifyError;
 use trie_db::proof::{generate_proof, verify_proof};
 /// Various re-exports from the `trie-db` crate.
 pub use trie_db::{
@@ -53,6 +52,7 @@ pub use trie_db::{
 	CError, DBValue, Query, Recorder, Trie, TrieCache, TrieConfiguration, TrieDBIterator,
 	TrieDBKeyIterator, TrieDBRawIterator, TrieLayout, TrieMut, TrieRecorder,
 };
+pub use trie_db::{proof::VerifyError, MerkleValue};
 /// The Substrate format implementation of `TrieStream`.
 pub use trie_stream::TrieStream;
 
@@ -295,6 +295,25 @@ pub fn read_trie_value<L: TrieLayout, DB: hash_db::HashDBRef<L::Hash, trie_db::D
 		.get(key)
 }
 
+/// Read the [`trie_db::MerkleValue`] of the node that is the closest descendant for
+/// the provided key.
+pub fn read_trie_first_descedant_value<L: TrieLayout, DB>(
+	db: &DB,
+	root: &TrieHash<L>,
+	key: &[u8],
+	recorder: Option<&mut dyn TrieRecorder<TrieHash<L>>>,
+	cache: Option<&mut dyn TrieCache<L::Codec>>,
+) -> Result<Option<MerkleValue<TrieHash<L>>>, Box<TrieError<L>>>
+where
+	DB: hash_db::HashDBRef<L::Hash, trie_db::DBValue>,
+{
+	TrieDBBuilder::<L>::new(db, root)
+		.with_optional_cache(cache)
+		.with_optional_recorder(recorder)
+		.build()
+		.lookup_first_descendant(key)
+}
+
 /// Read a value from the trie with given Query.
 pub fn read_trie_value_with<
 	L: TrieLayout,
@@ -397,6 +416,27 @@ where
 		.get_hash(key)
 }
 
+/// Read the [`trie_db::MerkleValue`] of the node that is the closest descendant for
+/// the provided child key.
+pub fn read_child_trie_first_descedant_value<L: TrieConfiguration, DB>(
+	keyspace: &[u8],
+	db: &DB,
+	root: &TrieHash<L>,
+	key: &[u8],
+	recorder: Option<&mut dyn TrieRecorder<TrieHash<L>>>,
+	cache: Option<&mut dyn TrieCache<L::Codec>>,
+) -> Result<Option<MerkleValue<TrieHash<L>>>, Box<TrieError<L>>>
+where
+	DB: hash_db::HashDBRef<L::Hash, trie_db::DBValue>,
+{
+	let db = KeySpacedDB::new(db, keyspace);
+	TrieDBBuilder::<L>::new(&db, &root)
+		.with_optional_recorder(recorder)
+		.with_optional_cache(cache)
+		.build()
+		.lookup_first_descendant(key)
+}
+
 /// Read a value from the child trie with given query.
 pub fn read_child_trie_value_with<L, Q, DB>(
 	keyspace: &[u8],
diff --git a/substrate/primitives/trie/src/recorder.rs b/substrate/primitives/trie/src/recorder.rs
index 728dc836205b57f9d9ce7b8fd8190c0ef8eac681..154cee3f37dcba79c9eea34c3bec4bfc2fdcc0b7 100644
--- a/substrate/primitives/trie/src/recorder.rs
+++ b/substrate/primitives/trie/src/recorder.rs
@@ -379,6 +379,17 @@ impl<H: Hasher, I: DerefMut<Target = RecorderInner<H::Out>>> trie_db::TrieRecord
 				// that the value doesn't exist in the trie.
 				self.update_recorded_keys(full_key, RecordedForKey::Value);
 			},
+			TrieAccess::InlineValue { full_key } => {
+				tracing::trace!(
+					target: LOG_TARGET,
+					key = ?sp_core::hexdisplay::HexDisplay::from(&full_key),
+					"Recorded inline value access for key",
+				);
+
+				// A value was accessed that is stored inline a node and we recorded all trie nodes
+				// to access this value.
+				self.update_recorded_keys(full_key, RecordedForKey::Value);
+			},
 		};
 
 		self.encoded_size_estimation.fetch_add(encoded_size_update, Ordering::Relaxed);
diff --git a/substrate/primitives/version/Cargo.toml b/substrate/primitives/version/Cargo.toml
index 1e4449d4c44dd7571b72661d4c6b91edb19e52d1..1ab51a08bbe3ca476e58ef2501a8d3ea61eaa3c6 100644
--- a/substrate/primitives/version/Cargo.toml
+++ b/substrate/primitives/version/Cargo.toml
@@ -1,11 +1,11 @@
 [package]
 name = "sp-version"
 version = "22.0.0"
-authors = ["Parity Technologies <admin@parity.io>"]
-edition = "2021"
+authors.workspace = true
+edition.workspace = true
 license = "Apache-2.0"
 homepage = "https://substrate.io"
-repository = "https://github.com/paritytech/substrate/"
+repository.workspace = true
 description = "Version module for the Substrate runtime; Provides a function that returns the runtime version."
 documentation = "https://docs.rs/sp-version"
 readme = "README.md"
@@ -18,8 +18,8 @@ codec = { package = "parity-scale-codec", version = "3.6.1", default-features =
 impl-serde = { version = "0.4.0", default-features = false, optional = true }
 parity-wasm = { version = "0.45", optional = true }
 scale-info = { version = "2.5.0", default-features = false, features = ["derive"] }
-serde = { version = "1.0.163",  default-features = false, features = ["derive", "alloc"], optional = true }
-thiserror = { version = "1.0.30", optional = true }
+serde = { version = "1.0.188",  default-features = false, features = ["derive", "alloc"], optional = true }
+thiserror = { version = "1.0.48", optional = true }
 sp-core-hashing-proc-macro = { path = "../core/hashing/proc-macro" }
 sp-runtime = { path = "../runtime", default-features = false}
 sp-std = { path = "../std", default-features = false}
diff --git a/substrate/primitives/version/README.md b/substrate/primitives/version/README.md
index 84f0ae57d9dbeef1c84e4e01a8769b5f886e4501..8decaaa85f8c218c842d1fb81b35a4eb625b8d7c 100644
--- a/substrate/primitives/version/README.md
+++ b/substrate/primitives/version/README.md
@@ -1,3 +1,3 @@
 Version module for the Substrate runtime; Provides a function that returns the runtime version.
 
-License: Apache-2.0
\ No newline at end of file
+License: Apache-2.0
diff --git a/substrate/primitives/version/proc-macro/Cargo.toml b/substrate/primitives/version/proc-macro/Cargo.toml
index 676c9d9b44a598502c5f3e1f661dc3fc85a6540e..7fce559e3ed633aac290d5e7b550f47fe0d196ba 100644
--- a/substrate/primitives/version/proc-macro/Cargo.toml
+++ b/substrate/primitives/version/proc-macro/Cargo.toml
@@ -1,11 +1,11 @@
 [package]
 name = "sp-version-proc-macro"
 version = "8.0.0"
-authors = ["Parity Technologies <admin@parity.io>"]
-edition = "2021"
+authors.workspace = true
+edition.workspace = true
 license = "Apache-2.0"
 homepage = "https://substrate.io"
-repository = "https://github.com/paritytech/substrate/"
+repository.workspace = true
 description = "Macro for defining a runtime version."
 documentation = "https://docs.rs/sp-api-proc-macro"
 
@@ -19,7 +19,7 @@ proc-macro = true
 codec = { package = "parity-scale-codec", version = "3.6.1", features = [ "derive" ] }
 proc-macro2 = "1.0.56"
 quote = "1.0.28"
-syn = { version = "2.0.16", features = ["full", "fold", "extra-traits", "visit"] }
+syn = { version = "2.0.38", features = ["full", "fold", "extra-traits", "visit"] }
 
 [dev-dependencies]
 sp-version = { path = ".." }
diff --git a/substrate/primitives/wasm-interface/Cargo.toml b/substrate/primitives/wasm-interface/Cargo.toml
index 6f7322612e8b8b069036ef92300f86e97c3b55e0..92f884e3fd2792d1f56457d9a90dcf1c5dbbf797 100644
--- a/substrate/primitives/wasm-interface/Cargo.toml
+++ b/substrate/primitives/wasm-interface/Cargo.toml
@@ -1,11 +1,11 @@
 [package]
 name = "sp-wasm-interface"
 version = "14.0.0"
-authors = ["Parity Technologies <admin@parity.io>"]
-edition = "2021"
+authors.workspace = true
+edition.workspace = true
 license = "Apache-2.0"
 homepage = "https://substrate.io"
-repository = "https://github.com/paritytech/substrate/"
+repository.workspace = true
 description = "Types and traits for interfacing between the host and the wasm runtime."
 documentation = "https://docs.rs/sp-wasm-interface"
 readme = "README.md"
diff --git a/substrate/primitives/wasm-interface/README.md b/substrate/primitives/wasm-interface/README.md
index 7e6c46581ae43c19b3b9b73d3d2b7975017c1a38..2e584adeb83cb4fe38034eb1aa0ad59365d98c15 100644
--- a/substrate/primitives/wasm-interface/README.md
+++ b/substrate/primitives/wasm-interface/README.md
@@ -1,3 +1,3 @@
 Types and traits for interfacing between the host and the wasm runtime.
 
-License: Apache-2.0
\ No newline at end of file
+License: Apache-2.0
diff --git a/substrate/primitives/weights/Cargo.toml b/substrate/primitives/weights/Cargo.toml
index edbf68a8253c0c0baa66afc8fb861830a7264502..03e06aad086535c8b5313a81c284c0e8a90cd1cb 100644
--- a/substrate/primitives/weights/Cargo.toml
+++ b/substrate/primitives/weights/Cargo.toml
@@ -1,11 +1,11 @@
 [package]
 name = "sp-weights"
 version = "20.0.0"
-authors = ["Parity Technologies <admin@parity.io>"]
-edition = "2021"
+authors.workspace = true
+edition.workspace = true
 license = "Apache-2.0"
 homepage = "https://substrate.io"
-repository = "https://github.com/paritytech/substrate/"
+repository.workspace = true
 description = "Types and traits for interfacing between the host and the wasm runtime."
 documentation = "https://docs.rs/sp-wasm-interface"
 
@@ -15,7 +15,7 @@ targets = ["x86_64-unknown-linux-gnu"]
 [dependencies]
 codec = { package = "parity-scale-codec", version = "3.6.1", default-features = false, features = ["derive"] }
 scale-info = { version = "2.5.0", default-features = false, features = ["derive"] }
-serde = { version = "1.0.163", default-features = false, optional = true, features = ["derive", "alloc"] }
+serde = { version = "1.0.188", default-features = false, optional = true, features = ["derive", "alloc"] }
 smallvec = "1.11.0"
 sp-arithmetic = { path = "../arithmetic", default-features = false}
 sp-core = { path = "../core", default-features = false}
diff --git a/substrate/primitives/weights/src/weight_meter.rs b/substrate/primitives/weights/src/weight_meter.rs
index 3b0b21ea8799ac44d6dcc787e379b725fab628d4..584d22304c3ae33ece669bc69927a2568fb9b288 100644
--- a/substrate/primitives/weights/src/weight_meter.rs
+++ b/substrate/primitives/weights/src/weight_meter.rs
@@ -31,7 +31,7 @@ use sp_arithmetic::Perbill;
 /// use sp_weights::{Weight, WeightMeter};
 ///
 /// // The weight is limited to (10, 0).
-/// let mut meter = WeightMeter::from_limit(Weight::from_parts(10, 0));
+/// let mut meter = WeightMeter::with_limit(Weight::from_parts(10, 0));
 /// // There is enough weight remaining for an operation with (6, 0) weight.
 /// assert!(meter.try_consume(Weight::from_parts(6, 0)).is_ok());
 /// assert_eq!(meter.remaining(), Weight::from_parts(4, 0));
@@ -51,13 +51,13 @@ pub struct WeightMeter {
 
 impl WeightMeter {
 	/// Creates [`Self`] from a limit for the maximal consumable weight.
-	pub fn from_limit(limit: Weight) -> Self {
+	pub fn with_limit(limit: Weight) -> Self {
 		Self { consumed: Weight::zero(), limit }
 	}
 
 	/// Creates [`Self`] with the maximal possible limit for the consumable weight.
-	pub fn max_limit() -> Self {
-		Self::from_limit(Weight::MAX)
+	pub fn new() -> Self {
+		Self::with_limit(Weight::MAX)
 	}
 
 	/// The already consumed weight.
@@ -84,7 +84,7 @@ impl WeightMeter {
 	/// use sp_weights::{Weight, WeightMeter};
 	/// use sp_arithmetic::Perbill;
 	///
-	/// let mut meter = WeightMeter::from_limit(Weight::from_parts(10, 20));
+	/// let mut meter = WeightMeter::with_limit(Weight::from_parts(10, 20));
 	/// // Nothing consumed so far:
 	/// assert_eq!(meter.consumed_ratio(), Perbill::from_percent(0));
 	/// meter.consume(Weight::from_parts(5, 5));
@@ -158,7 +158,7 @@ mod tests {
 
 	#[test]
 	fn weight_meter_remaining_works() {
-		let mut meter = WeightMeter::from_limit(Weight::from_parts(10, 20));
+		let mut meter = WeightMeter::with_limit(Weight::from_parts(10, 20));
 
 		assert!(meter.check_accrue(Weight::from_parts(5, 0)));
 		assert_eq!(meter.consumed, Weight::from_parts(5, 0));
@@ -175,7 +175,7 @@ mod tests {
 
 	#[test]
 	fn weight_meter_can_accrue_works() {
-		let meter = WeightMeter::from_limit(Weight::from_parts(1, 1));
+		let meter = WeightMeter::with_limit(Weight::from_parts(1, 1));
 
 		assert!(meter.can_accrue(Weight::from_parts(0, 0)));
 		assert!(meter.can_accrue(Weight::from_parts(1, 1)));
@@ -186,7 +186,7 @@ mod tests {
 
 	#[test]
 	fn weight_meter_check_accrue_works() {
-		let mut meter = WeightMeter::from_limit(Weight::from_parts(2, 2));
+		let mut meter = WeightMeter::with_limit(Weight::from_parts(2, 2));
 
 		assert!(meter.check_accrue(Weight::from_parts(0, 0)));
 		assert!(meter.check_accrue(Weight::from_parts(1, 1)));
@@ -199,7 +199,7 @@ mod tests {
 
 	#[test]
 	fn weight_meter_check_and_can_accrue_works() {
-		let mut meter = WeightMeter::max_limit();
+		let mut meter = WeightMeter::new();
 
 		assert!(meter.can_accrue(Weight::from_parts(u64::MAX, 0)));
 		assert!(meter.check_accrue(Weight::from_parts(u64::MAX, 0)));
@@ -219,7 +219,7 @@ mod tests {
 
 	#[test]
 	fn consumed_ratio_works() {
-		let mut meter = WeightMeter::from_limit(Weight::from_parts(10, 20));
+		let mut meter = WeightMeter::with_limit(Weight::from_parts(10, 20));
 
 		assert!(meter.check_accrue(Weight::from_parts(5, 0)));
 		assert_eq!(meter.consumed_ratio(), Perbill::from_percent(50));
@@ -239,7 +239,7 @@ mod tests {
 
 	#[test]
 	fn try_consume_works() {
-		let mut meter = WeightMeter::from_limit(Weight::from_parts(10, 0));
+		let mut meter = WeightMeter::with_limit(Weight::from_parts(10, 0));
 
 		assert!(meter.try_consume(Weight::from_parts(11, 0)).is_err());
 		assert!(meter.consumed().is_zero(), "No modification");
@@ -253,7 +253,7 @@ mod tests {
 
 	#[test]
 	fn can_consume_works() {
-		let mut meter = WeightMeter::from_limit(Weight::from_parts(10, 0));
+		let mut meter = WeightMeter::with_limit(Weight::from_parts(10, 0));
 
 		assert!(!meter.can_consume(Weight::from_parts(11, 0)));
 		assert!(meter.consumed().is_zero(), "No modification");
@@ -267,7 +267,7 @@ mod tests {
 	#[test]
 	#[cfg(debug_assertions)]
 	fn consume_works() {
-		let mut meter = WeightMeter::from_limit(Weight::from_parts(5, 10));
+		let mut meter = WeightMeter::with_limit(Weight::from_parts(5, 10));
 
 		meter.consume(Weight::from_parts(4, 0));
 		assert_eq!(meter.remaining(), Weight::from_parts(1, 10));
@@ -281,7 +281,7 @@ mod tests {
 	#[cfg(debug_assertions)]
 	#[should_panic(expected = "Weight counter overflow")]
 	fn consume_defensive_fail() {
-		let mut meter = WeightMeter::from_limit(Weight::from_parts(10, 0));
+		let mut meter = WeightMeter::with_limit(Weight::from_parts(10, 0));
 		let _ = meter.consume(Weight::from_parts(11, 0));
 	}
 }
diff --git a/substrate/rustfmt.toml b/substrate/rustfmt.toml
deleted file mode 100644
index f6fbe80064fce44b2417af4f8a6929ce7a7a47ef..0000000000000000000000000000000000000000
--- a/substrate/rustfmt.toml
+++ /dev/null
@@ -1,24 +0,0 @@
-# Basic
-hard_tabs = true
-max_width = 100
-use_small_heuristics = "Max"
-# Imports
-imports_granularity = "Crate"
-reorder_imports = true
-# Consistency
-newline_style = "Unix"
-# Format comments
-comment_width = 100
-wrap_comments = true
-# Misc
-chain_width = 80
-spaces_around_ranges = false
-binop_separator = "Back"
-reorder_impl_items = false
-match_arm_leading_pipes = "Preserve"
-match_arm_blocks = false
-match_block_trailing_comma = true
-trailing_comma = "Vertical"
-trailing_semicolon = false
-use_field_init_shorthand = true
-edition = "2021"
diff --git a/substrate/scripts/ci/common/lib.sh b/substrate/scripts/ci/common/lib.sh
deleted file mode 100755
index 08c2fe81ada04bb6efcacb67833cfd78cccfe208..0000000000000000000000000000000000000000
--- a/substrate/scripts/ci/common/lib.sh
+++ /dev/null
@@ -1,117 +0,0 @@
-#!/bin/sh
-
-api_base="https://api.github.com/repos"
-
-# Function to take 2 git tags/commits and get any lines from commit messages
-# that contain something that looks like a PR reference: e.g., (#1234)
-sanitised_git_logs(){
-  git --no-pager log --pretty=format:"%s" "$1...$2" |
-  # Only find messages referencing a PR
-  grep -E '\(#[0-9]+\)' |
-  # Strip any asterisks
-  sed 's/^* //g' |
-  # And add them all back
-  sed 's/^/* /g'
-}
-
-# Returns the last published release on github
-# Note: we can't just use /latest because that ignores prereleases
-# repo: 'organization/repo'
-# Usage: last_github_release "$repo"
-last_github_release(){
-  i=0
-  # Iterate over releases until we find the last release that's not just a draft
-  while [ $i -lt 29 ]; do
-    out=$(curl -H "Authorization: token $GITHUB_RELEASE_TOKEN" -s "$api_base/$1/releases" | jq ".[$i]")
-    echo "$out"
-    # Ugh when echoing to jq, we need to translate newlines into spaces :/
-    if [ "$(echo "$out" | tr '\r\n' ' ' | jq '.draft')" = "false" ]; then
-      echo "$out" | tr '\r\n' ' ' | jq '.tag_name'
-      return
-    else
-      i=$((i + 1))
-    fi
-  done
-}
-
-# Checks whether a tag on github has been verified
-# repo: 'organization/repo'
-# tagver: 'v1.2.3'
-# Usage: check_tag $repo $tagver
-check_tag () {
-  repo=$1
-  tagver=$2
-  tag_out=$(curl -H "Authorization: token $GITHUB_RELEASE_TOKEN" -s "$api_base/$repo/git/refs/tags/$tagver")
-  tag_sha=$(echo "$tag_out" | jq -r .object.sha)
-  object_url=$(echo "$tag_out" | jq -r .object.url)
-  if [ "$tag_sha" = "null" ]; then
-    return 2
-  fi
-  verified_str=$(curl -H "Authorization: token $GITHUB_RELEASE_TOKEN" -s "$object_url" | jq -r .verification.verified)
-  if [ "$verified_str" = "true" ]; then
-    # Verified, everything is good
-    return 0
-  else
-    # Not verified. Bad juju.
-    return 1
-  fi
-}
-
-# Checks whether a given PR has a given label.
-# repo: 'organization/repo'
-# pr_id: 12345
-# label: B1-silent
-# Usage: has_label $repo $pr_id $label
-has_label(){
-  repo="$1"
-  pr_id="$2"
-  label="$3"
-
-  # These will exist if the function is called in Gitlab.
-  # If the function's called in Github, we should have GITHUB_ACCESS_TOKEN set
-  # already.
-  if [ -n "$GITHUB_RELEASE_TOKEN" ]; then
-    GITHUB_TOKEN="$GITHUB_RELEASE_TOKEN"
-  elif [ -n "$GITHUB_PR_TOKEN" ]; then
-    GITHUB_TOKEN="$GITHUB_PR_TOKEN"
-  fi
-
-  out=$(curl -H "Authorization: token $GITHUB_TOKEN" -s "$api_base/$repo/pulls/$pr_id")
-  [ -n "$(echo "$out" | tr -d '\r\n' | jq ".labels | .[] | select(.name==\"$label\")")" ]
-}
-
-# Formats a message into a JSON string for posting to Matrix
-# message: 'any plaintext message'
-# formatted_message: '<strong>optional message formatted in <em>html</em></strong>'
-# Usage: structure_message $content $formatted_content (optional)
-structure_message() {
-  if [ -z "$2" ]; then
-    body=$(jq -Rs --arg body "$1" '{"msgtype": "m.text", $body}' < /dev/null)
-  else
-    body=$(jq -Rs --arg body "$1" --arg formatted_body "$2" '{"msgtype": "m.text", $body, "format": "org.matrix.custom.html", $formatted_body}' < /dev/null)
-  fi
-  echo "$body"
-}
-
-# Post a message to a matrix room
-# body: '{body: "JSON string produced by structure_message"}'
-# room_id: !fsfSRjgjBWEWffws:matrix.parity.io
-# access_token: see https://matrix.org/docs/guides/client-server-api/
-# Usage: send_message $body (json formatted) $room_id $access_token
-send_message() {
-  curl -XPOST -d "$1" "https://m.parity.io/_matrix/client/r0/rooms/$2/send/m.room.message?access_token=$3"
-}
-
-# Check for runtime changes between two commits. This is defined as any changes
-# to bin/node/src/runtime, frame/ and primitives/sr_* trees.
-has_runtime_changes() {
-  from=$1
-  to=$2
-  if git diff --name-only "${from}...${to}" \
-    | grep -q -e '^frame/' -e '^primitives/'
-  then
-    return 0
-  else
-    return 1
-  fi
-}
diff --git a/substrate/scripts/ci/deny.toml b/substrate/scripts/ci/deny.toml
index 5297d07143c225b65290b22ff4728be87a0261cb..ca059e384a358b242f7ba0e524f9b534df91d74f 100644
--- a/substrate/scripts/ci/deny.toml
+++ b/substrate/scripts/ci/deny.toml
@@ -68,6 +68,7 @@ exceptions = [
     { allow = ["GPL-3.0 WITH Classpath-exception-2.0"], name = "sc-executor-wasmtime" },
     { allow = ["GPL-3.0 WITH Classpath-exception-2.0"], name = "sc-informant" },
     { allow = ["GPL-3.0 WITH Classpath-exception-2.0"], name = "sc-keystore" },
+    { allow = ["GPL-3.0 WITH Classpath-exception-2.0"], name = "sc-mixnet" },
     { allow = ["GPL-3.0 WITH Classpath-exception-2.0"], name = "sc-network" },
     { allow = ["GPL-3.0 WITH Classpath-exception-2.0"], name = "sc-network-bitswap" },
     { allow = ["GPL-3.0 WITH Classpath-exception-2.0"], name = "sc-network-common" },
diff --git a/substrate/scripts/ci/docker/subkey.Dockerfile.README.md b/substrate/scripts/ci/docker/subkey.Dockerfile.README.md
index 30a5e8212150e1035075893def8b0f13f6678fa2..fe3359d01e811ab5a0ad41385660cea593acd4e7 100644
--- a/substrate/scripts/ci/docker/subkey.Dockerfile.README.md
+++ b/substrate/scripts/ci/docker/subkey.Dockerfile.README.md
@@ -1,8 +1,11 @@
-# The `subkey` program is a key management utility for Substrate-based blockchains. You can use the `subkey` program to perform the following tasks:
+# Subkey
+
+The `subkey` program is a key management utility for Substrate-based blockchains. You can use the `subkey` program to
+perform the following tasks
 
 * Generate and inspect cryptographically-secure public and private key pairs.
 * Restore keys from secret phrases and raw seeds.
 * Sign and verify signatures on messages.
 * Sign and verify signatures for encoded transactions.
 * Derive hierarchical deterministic child key pairs.
-* [Documentation](https://docs.substrate.io/reference/command-line-tools/subkey/)
\ No newline at end of file
+* [Documentation](https://docs.substrate.io/reference/command-line-tools/subkey/)
diff --git a/substrate/scripts/ci/docker/substrate.Dockerfile.README.md b/substrate/scripts/ci/docker/substrate.Dockerfile.README.md
index 557fd8f835d73ac5628f33f1ea086b174803e69c..9e97701e92f6411658b73d1370be2f5c1ac005f0 100644
--- a/substrate/scripts/ci/docker/substrate.Dockerfile.README.md
+++ b/substrate/scripts/ci/docker/substrate.Dockerfile.README.md
@@ -1 +1 @@
-# Substrate Docker Image
\ No newline at end of file
+# Substrate Docker Image
diff --git a/substrate/scripts/ci/github/check_labels.sh b/substrate/scripts/ci/github/check_labels.sh
deleted file mode 100755
index 7b0aed9fe73455d01a15c19bba83592eb1989747..0000000000000000000000000000000000000000
--- a/substrate/scripts/ci/github/check_labels.sh
+++ /dev/null
@@ -1,68 +0,0 @@
-#!/usr/bin/env bash
-set -e
-
-#shellcheck source=../common/lib.sh
-source "$( cd "$( dirname "${BASH_SOURCE[0]}" )" >/dev/null 2>&1 && pwd )/../common/lib.sh"
-
-repo="$GITHUB_REPOSITORY"
-pr="$GITHUB_PR"
-
-ensure_labels() {
-  for label in "$@"; do
-    if has_label "$repo" "$pr" "$label"; then
-      return 0
-    fi
-  done
-  return 1
-}
-
-# Must have one of the following labels
-releasenotes_labels=(
-  'B0-silent'
-  'B3-apinoteworthy'
-  'B5-clientnoteworthy'
-  'B7-runtimenoteworthy'
-)
-
-criticality_labels=(
-  'C1-low 📌'
-  'C3-medium 📣'
-  'C7-high ❗️'
-  'C9-critical ‼️'
-)
-
-audit_labels=(
-  'D1-audited 👍'
-  'D2-notlive 💤'
-  'D3-trivial 🧸'
-  'D5-nicetohaveaudit ⚠️'
-  'D9-needsaudit 👮'
-)
-
-echo "[+] Checking release notes (B) labels"
-if ensure_labels "${releasenotes_labels[@]}";  then
-  echo "[+] Release notes label detected. All is well."
-else
-  echo "[!] Release notes label not detected. Please add one of: ${releasenotes_labels[*]}"
-  exit 1
-fi
-
-echo "[+] Checking release criticality (C) labels"
-if ensure_labels "${criticality_labels[@]}";  then
-  echo "[+] Release criticality label detected. All is well."
-else
-  echo "[!] Release criticality label not detected. Please add one of: ${criticality_labels[*]}"
-  exit 1
-fi
-
-if has_runtime_changes origin/master "${HEAD_SHA}"; then
-  echo "[+] Runtime changes detected. Checking audit (D) labels"
-  if ensure_labels "${audit_labels[@]}";  then
-    echo "[+] Release audit label detected. All is well."
-  else
-    echo "[!] Release audit label not detected. Please add one of: ${audit_labels[*]}"
-    exit 1
-  fi
-fi
-
-exit 0
diff --git a/substrate/scripts/ci/github/generate_changelog.sh b/substrate/scripts/ci/github/generate_changelog.sh
deleted file mode 100755
index 32ac1760a6117846ca5a32f7a9058db1fbf7cc5c..0000000000000000000000000000000000000000
--- a/substrate/scripts/ci/github/generate_changelog.sh
+++ /dev/null
@@ -1,85 +0,0 @@
-#!/usr/bin/env bash
-
-# shellcheck source=../common/lib.sh
-source "$( cd "$( dirname "${BASH_SOURCE[0]}" )" >/dev/null 2>&1 && pwd )/../common/lib.sh"
-
-version="$2"
-last_version="$1"
-
-all_changes="$(sanitised_git_logs "$last_version" "$version")"
-runtime_changes=""
-api_changes=""
-client_changes=""
-changes=""
-migrations=""
-
-while IFS= read -r line; do
-  pr_id=$(echo "$line" | sed -E 's/.*#([0-9]+)\)$/\1/')
-
-  # Skip if the PR has the silent label - this allows us to skip a few requests
-  if has_label 'paritytech/substrate' "$pr_id" 'B0-silent'; then
-    continue
-  fi
-  if has_label 'paritytech/substrate' "$pr_id" 'B3-apinoteworthy' ; then
-    api_changes="$api_changes
-$line"
-  fi
-  if has_label 'paritytech/substrate' "$pr_id" 'B5-clientnoteworthy'; then
-    client_changes="$client_changes
-$line"
-  fi
-  if has_label 'paritytech/substrate' "$pr_id" 'B7-runtimenoteworthy'; then
-    runtime_changes="$runtime_changes
-$line"
-  fi
-  if has_label 'paritytech/substrate' "$pr_id" 'E1-runtime-migration'; then
-    migrations="$migrations
-$line"
-  fi
-done <<< "$all_changes"
-
-# Make the substrate section if there are any substrate changes
-if [ -n "$runtime_changes" ] ||
-   [ -n "$api_changes" ] ||
-   [ -n "$client_changes" ] ||
-   [ -n "$migrations" ]; then
-  changes=$(cat << EOF
-Substrate changes
------------------
-
-EOF
-)
-  if [ -n "$runtime_changes" ]; then
-    changes="$changes
-
-Runtime
--------
-$runtime_changes"
-  fi
-  if [ -n "$client_changes" ]; then
-    changes="$changes
-
-Client
-------
-$client_changes"
-  fi
-  if [ -n "$api_changes" ]; then
-    changes="$changes
-
-API
----
-$api_changes"
-  fi
-  release_text="$release_text
-
-$changes"
-fi
-if [ -n "$migrations" ]; then
-  changes="$changes
-
-Runtime Migrations
-------------------
-$migrations"
-fi
-
-echo "$changes"
diff --git a/substrate/scripts/ci/gitlab/check-each-crate.py b/substrate/scripts/ci/gitlab/check-each-crate.py
deleted file mode 100755
index adad4f5bd583543b4610cd010a9cefbd04bc5401..0000000000000000000000000000000000000000
--- a/substrate/scripts/ci/gitlab/check-each-crate.py
+++ /dev/null
@@ -1,57 +0,0 @@
-#!/usr/bin/env python3
-
-# A script that checks each workspace crate individually.
-# It's relevant to check workspace crates individually because otherwise their compilation problems
-# due to feature misconfigurations won't be caught, as exemplified by
-# https://github.com/paritytech/substrate/issues/12705
-#
-# `check-each-crate.py target_group groups_total`
-#
-# - `target_group`: Integer starting from 1, the group this script should execute.
-# - `groups_total`: Integer starting from 1, total number of groups.
-
-import subprocess, sys
-
-# Get all crates
-output = subprocess.check_output(["cargo", "tree", "--locked", "--workspace", "--depth", "0", "--prefix", "none"])
-
-# Convert the output into a proper list
-crates = []
-for line in output.splitlines():
-	if line != b"":
-		crates.append(line.decode('utf8').split(" ")[0])
-
-# Make the list unique and sorted
-crates = list(set(crates))
-crates.sort()
-
-target_group = int(sys.argv[1]) - 1
-groups_total = int(sys.argv[2])
-
-if len(crates) == 0:
-	print("No crates detected!", file=sys.stderr)
-	sys.exit(1)
-
-print(f"Total crates: {len(crates)}", file=sys.stderr)
-
-crates_per_group = len(crates) // groups_total
-
-# If this is the last runner, we need to take care of crates
-# after the group that we lost because of the integer division.
-if target_group + 1 == groups_total:
-	overflow_crates = len(crates) % groups_total
-else:
-	overflow_crates = 0
-
-print(f"Crates per group: {crates_per_group}", file=sys.stderr)
-
-# Check each crate
-for i in range(0, crates_per_group + overflow_crates):
-	crate = crates_per_group * target_group + i
-
-	print(f"Checking {crates[crate]}", file=sys.stderr)
-
-	res = subprocess.run(["cargo", "check", "--locked", "-p", crates[crate]])
-
-	if res.returncode != 0:
-		sys.exit(1)
diff --git a/substrate/scripts/ci/gitlab/check_runtime.sh b/substrate/scripts/ci/gitlab/check_runtime.sh
deleted file mode 100755
index 71d6965ecf4fb028b7e08a507125a4ba4ca1330e..0000000000000000000000000000000000000000
--- a/substrate/scripts/ci/gitlab/check_runtime.sh
+++ /dev/null
@@ -1,121 +0,0 @@
-#!/bin/sh
-#
-#
-# check for any changes in the node/src/runtime, frame/ and primitives/sr_* trees. if
-# there are any changes found, it should mark the PR breaksconsensus and
-# "auto-fail" the PR if there isn't a change in the runtime/src/lib.rs file
-# that alters the version.
-
-set -e # fail on any error
-
-#shellcheck source=../common/lib.sh
-. "$(dirname "${0}")/../common/lib.sh"
-
-VERSIONS_FILE="bin/node/runtime/src/lib.rs"
-
-boldprint () { printf "|\n| \033[1m%s\033[0m\n|\n" "${@}"; }
-boldcat () { printf "|\n"; while read -r l; do printf "| \033[1m%s\033[0m\n" "${l}"; done; printf "|\n" ; }
-
-github_label () {
-	echo
-	echo "# run github-api job for labeling it ${1}"
-	curl -sS -X POST \
-		-F "token=${CI_JOB_TOKEN}" \
-		-F "ref=master" \
-		-F "variables[LABEL]=${1}" \
-		-F "variables[PRNO]=${CI_COMMIT_REF_NAME}" \
-		"${GITLAB_API}/projects/${GITHUB_API_PROJECT}/trigger/pipeline"
-}
-
-
-boldprint "latest 10 commits of ${CI_COMMIT_REF_NAME}"
-git log --graph --oneline --decorate=short -n 10
-
-boldprint "make sure the master branch and release tag are available in shallow clones"
-git fetch --depth="${GIT_DEPTH:-100}" origin master
-git fetch --depth="${GIT_DEPTH:-100}" origin release
-git tag -f release FETCH_HEAD
-git log -n1 release
-
-
-boldprint "check if the wasm sources changed"
-if ! has_runtime_changes origin/master "${CI_COMMIT_SHA}"
-then
-	boldcat <<-EOT
-
-	no changes to the runtime source code detected
-
-	EOT
-
-	exit 0
-fi
-
-
-
-# check for spec_version updates: if the spec versions changed, then there is
-# consensus-critical logic that has changed. the runtime wasm blobs must be
-# rebuilt.
-
-add_spec_version="$(git diff tags/release ${CI_COMMIT_SHA} -- "${VERSIONS_FILE}" \
-	| sed -n -r "s/^\+[[:space:]]+spec_version: +([0-9]+),$/\1/p")"
-sub_spec_version="$(git diff tags/release ${CI_COMMIT_SHA} -- "${VERSIONS_FILE}" \
-	| sed -n -r "s/^\-[[:space:]]+spec_version: +([0-9]+),$/\1/p")"
-
-
-
-if [ "${add_spec_version}" != "${sub_spec_version}" ]
-then
-
-	boldcat <<-EOT
-
-		changes to the runtime sources and changes in the spec version.
-
-		spec_version: ${sub_spec_version} -> ${add_spec_version}
-
-	EOT
-	exit 0
-
-else
-	# check for impl_version updates: if only the impl versions changed, we assume
-	# there is no consensus-critical logic that has changed.
-
-	add_impl_version="$(git diff tags/release ${CI_COMMIT_SHA} -- "${VERSIONS_FILE}" \
-		| sed -n -r 's/^\+[[:space:]]+impl_version: +([0-9]+),$/\1/p')"
-	sub_impl_version="$(git diff tags/release ${CI_COMMIT_SHA} -- "${VERSIONS_FILE}" \
-		| sed -n -r 's/^\-[[:space:]]+impl_version: +([0-9]+),$/\1/p')"
-
-
-	# see if the impl version changed
-	if [ "${add_impl_version}" != "${sub_impl_version}" ]
-	then
-		boldcat <<-EOT
-
-		changes to the runtime sources and changes in the impl version.
-
-		impl_version: ${sub_impl_version} -> ${add_impl_version}
-
-		EOT
-		exit 0
-	fi
-
-
-	boldcat <<-EOT
-
-	wasm source files changed but not the spec/impl version. If changes made do not alter logic,
-	just bump 'impl_version'. If they do change logic, bump 'spec_version'.
-
-	source file directories:
-	- bin/node/src/runtime
-	- frame
-	- primitives/sr-*
-
-	versions file: ${VERSIONS_FILE}
-
-	EOT
-fi
-
-# dropped through. there's something wrong;  exit 1.
-
-exit 1
-
-# vim: noexpandtab
diff --git a/substrate/scripts/ci/gitlab/check_signed.sh b/substrate/scripts/ci/gitlab/check_signed.sh
deleted file mode 100755
index 20d47c2304767e0d61e6ac7cd4b08afe27dfc97e..0000000000000000000000000000000000000000
--- a/substrate/scripts/ci/gitlab/check_signed.sh
+++ /dev/null
@@ -1,16 +0,0 @@
-#!/usr/bin/env bash
-
-# shellcheck source=../common/lib.sh
-source "$( cd "$( dirname "${BASH_SOURCE[0]}" )" >/dev/null 2>&1 && pwd )/../common/lib.sh"
-
-version="$CI_COMMIT_TAG"
-
-echo '[+] Checking tag has been signed'
-check_tag "paritytech/substrate" "$version"
-case $? in
-  0) echo '[+] Tag found and has been signed'; exit 0
-    ;;
-  1) echo '[!] Tag found but has not been signed. Aborting release.'; exit 1
-    ;;
-  2) echo '[!] Tag not found. Aborting release.'; exit 1
-esac
diff --git a/substrate/scripts/ci/gitlab/ensure-deps.sh b/substrate/scripts/ci/gitlab/ensure-deps.sh
deleted file mode 100755
index 7087200cef5185878431a89c013bacbd7417b4fd..0000000000000000000000000000000000000000
--- a/substrate/scripts/ci/gitlab/ensure-deps.sh
+++ /dev/null
@@ -1,80 +0,0 @@
-#!/usr/bin/env bash
-
-# The script is meant to check if the rules regarding packages
-# dependencies are satisfied.
-# The general format is:
-# [top-lvl-dir] MESSAGE/[other-top-dir]
-
-# For instance no crate within `./client` directory
-# is allowed to import any crate with a directory path containing `frame`.
-# Such rule is just: `client crates must not depend on anything in /frame`.
-
-# The script should be run from the main repo directory!
-
-set -u
-
-# HARD FAILING
-MUST_NOT=(
-	"client crates must not depend on anything in /frame"
-	"client crates must not depend on anything in /node"
-	"frame crates must not depend on anything in /node"
-	"frame crates must not depend on anything in /client"
-	"primitives crates must not depend on anything in /frame"
-)
-
-# ONLY DISPLAYED, script still succeeds
-PLEASE_DONT=(
-	"primitives crates should not depend on anything in /client"
-)
-
-VIOLATIONS=()
-PACKAGES=()
-
-function check_rule() {
-	rule=$1
-	from=$(echo $rule | cut -f1 -d\ )
-	to=$(echo $rule | cut -f2 -d\/)
-
-	cd $from
-	echo "Checking rule '$rule'"
-	packages=$(find -name Cargo.toml | xargs grep -wn "path.*\.\.\/$to")
-	has_references=$(echo -n $packages | wc -c)
-	if [ "$has_references" != "0" ]; then
-		VIOLATIONS+=("$rule")
-		# Find packages that violate:
-		PACKAGES+=("$packages")
-	fi
-	cd - > /dev/null
-}
-
-for rule in "${MUST_NOT[@]}"
-do
-	check_rule "$rule";
-done
-
-# Only the MUST NOT will be counted towards failure
-HARD_VIOLATIONS=${#VIOLATIONS[@]}
-
-
-for rule in "${PLEASE_DONT[@]}"
-do
-	check_rule "$rule";
-done
-
-# Display violations and fail
-I=0
-for v in "${VIOLATIONS[@]}"
-do
-	cat << EOF
-
-===========================================
-======= Violation of rule: $v
-===========================================
-${PACKAGES[$I]}
-
-
-EOF
-	I=$I+1
-done
-
-exit $HARD_VIOLATIONS
diff --git a/substrate/scripts/ci/gitlab/pipeline/build.yml b/substrate/scripts/ci/gitlab/pipeline/build.yml
deleted file mode 100644
index 8f63f6ecc3911270d5b12000e1a94ab6df35ef52..0000000000000000000000000000000000000000
--- a/substrate/scripts/ci/gitlab/pipeline/build.yml
+++ /dev/null
@@ -1,215 +0,0 @@
-# This file is part of .gitlab-ci.yml
-# Here are all jobs that are executed during "build" stage
-
-# PIPELINE_SCRIPTS_TAG can be found in the project variables
-
-.check-dependent-project:
-  stage: build
-  # DAG: this is artificial dependency
-  needs:
-    - job: cargo-clippy
-      artifacts: false
-  extends:
-    - .docker-env
-    - .test-refs-no-trigger-prs-only
-  variables:
-    RUSTFLAGS: "-D warnings"
-  script:
-    - cargo install --locked --git https://github.com/paritytech/try-runtime-cli --rev a93c9b5abe5d31a4cf1936204f7e5c489184b521
-    - git clone
-      --depth=1
-      --branch="$PIPELINE_SCRIPTS_TAG"
-      https://github.com/paritytech/pipeline-scripts
-    - ./pipeline-scripts/check_dependent_project.sh
-      --org paritytech
-      --dependent-repo "$DEPENDENT_REPO"
-      --github-api-token "$GITHUB_PR_TOKEN"
-      --extra-dependencies "$EXTRA_DEPENDENCIES"
-      --companion-overrides "$COMPANION_OVERRIDES"
-
-.check-runtime-migration:
-  extends:
-    - .check-dependent-project
-    - .test-refs-no-trigger-prs-only
-  variables:
-    DEPENDENT_REPO: polkadot
-    COMPANION_OVERRIDES: |
-      substrate: polkadot-v*
-      polkadot: release-v*
-    COMPANION_CHECK_COMMAND: >
-      time cargo build --release -p "$NETWORK"-runtime --features try-runtime &&
-      time try-runtime \
-          --runtime ./target/release/wbuild/"$NETWORK"-runtime/target/wasm32-unknown-unknown/release/"$NETWORK"_runtime.wasm \
-          on-runtime-upgrade --checks=pre-and-post live --uri wss://${NETWORK}-try-runtime-node.parity-chains.parity.io:443
-
-# Individual jobs are set up for each dependent project so that they can be ran in parallel.
-# Arguably we could generate a job for each companion in the PR's description using Gitlab's
-# parent-child pipelines but that's more complicated.
-
-check-runtime-migration-polkadot:
-  extends:
-    - .check-runtime-migration
-  variables:
-    NETWORK: polkadot
-
-check-runtime-migration-kusama:
-  extends: .check-runtime-migration
-  variables:
-    NETWORK: kusama
-
-check-runtime-migration-rococo:
-  extends: .check-runtime-migration
-  variables:
-    NETWORK: rococo
-  allow_failure: true
-
-check-runtime-migration-westend:
-  extends: .check-runtime-migration
-  variables:
-    NETWORK: westend
-
-check-dependent-polkadot:
-  extends: .check-dependent-project
-  variables:
-    DEPENDENT_REPO: polkadot
-    COMPANION_OVERRIDES: |
-      substrate: polkadot-v*
-      polkadot: release-v*
-    # enable the same feature flags as polkadot's test-linux-stable
-    COMPANION_CHECK_COMMAND: >
-      cargo check --all-targets --workspace
-      --features=runtime-benchmarks,runtime-metrics,try-runtime
-  rules:
-    - if: $CI_COMMIT_REF_NAME =~ /^[0-9]+$/ #PRs
-
-check-dependent-cumulus:
-  extends: .check-dependent-project
-  variables:
-    DEPENDENT_REPO: cumulus
-    EXTRA_DEPENDENCIES: polkadot
-    COMPANION_OVERRIDES: |
-      substrate: polkadot-v*
-      polkadot: release-v*
-  rules:
-    - if: $CI_COMMIT_REF_NAME =~ /^[0-9]+$/ #PRs
-
-build-linux-substrate:
-  stage: build
-  extends:
-    - .collect-artifacts
-    - .docker-env
-    - .build-refs
-  variables:
-    # this variable gets overriden by "rusty-cachier environment inject", use the value as default
-    CARGO_TARGET_DIR: "$CI_PROJECT_DIR/target"
-  needs:
-    - job: test-linux-stable
-      artifacts: false
-  before_script:
-    - !reference [.timestamp, before_script]
-    - !reference [.job-switcher, before_script]
-    - mkdir -p ./artifacts/substrate/
-    - !reference [.rusty-cachier, before_script]
-    # tldr: we need to checkout the branch HEAD explicitly because of our dynamic versioning approach while building the substrate binary
-    # see https://github.com/paritytech/ci_cd/issues/682#issuecomment-1340953589
-    - git checkout -B "$CI_COMMIT_REF_NAME" "$CI_COMMIT_SHA"
-  script:
-    - rusty-cachier snapshot create
-    - WASM_BUILD_NO_COLOR=1 time cargo build --locked --release -p node-cli --verbose
-    - mv $CARGO_TARGET_DIR/release/substrate-node ./artifacts/substrate/substrate
-    - echo -n "Substrate version = "
-    - if [ "${CI_COMMIT_TAG}" ]; then
-      echo "${CI_COMMIT_TAG}" | tee ./artifacts/substrate/VERSION;
-      else
-      ./artifacts/substrate/substrate --version |
-      cut -d ' ' -f 2 | tee ./artifacts/substrate/VERSION;
-      fi
-    - sha256sum ./artifacts/substrate/substrate | tee ./artifacts/substrate/substrate.sha256
-    - cp -r ./scripts/ci/docker/substrate.Dockerfile ./artifacts/substrate/
-    - printf '\n# building node-template\n\n'
-    - ./scripts/ci/node-template-release.sh ./artifacts/substrate/substrate-node-template.tar.gz
-    - rusty-cachier cache upload
-
-.build-subkey:
-  stage: build
-  extends:
-    - .collect-artifacts
-    - .docker-env
-    - .publish-refs
-  variables:
-    # this variable gets overriden by "rusty-cachier environment inject", use the value as default
-    CARGO_TARGET_DIR: "$CI_PROJECT_DIR/target"
-  before_script:
-    - !reference [.timestamp, before_script]
-    - !reference [.job-switcher, before_script]
-    - mkdir -p ./artifacts/subkey
-    - !reference [.rusty-cachier, before_script]
-  script:
-    - rusty-cachier snapshot create
-    - cd ./bin/utils/subkey
-    - SKIP_WASM_BUILD=1 time cargo build --locked --release --verbose
-    - cd -
-    - mv $CARGO_TARGET_DIR/release/subkey ./artifacts/subkey/.
-    - echo -n "Subkey version = "
-    - ./artifacts/subkey/subkey --version |
-      sed -n -E 's/^subkey ([0-9.]+.*)/\1/p' |
-      tee ./artifacts/subkey/VERSION;
-    - sha256sum ./artifacts/subkey/subkey | tee ./artifacts/subkey/subkey.sha256
-    - cp -r ./scripts/ci/docker/subkey.Dockerfile ./artifacts/subkey/
-    - rusty-cachier cache upload
-
-build-subkey-linux:
-  extends: .build-subkey
-
-build-subkey-macos:
-  extends: .build-subkey
-  # duplicating before_script & script sections from .build-subkey hidden job
-  # to overwrite rusty-cachier integration as it doesn't work on macos
-  before_script:
-    # skip timestamp script, the osx bash doesn't support printf %()T
-    - !reference [.job-switcher, before_script]
-    - mkdir -p ./artifacts/subkey
-  script:
-    - cd ./bin/utils/subkey
-    - SKIP_WASM_BUILD=1 time cargo build --locked --release --verbose
-    - cd -
-    - mv ./target/release/subkey ./artifacts/subkey/.
-    - echo -n "Subkey version = "
-    - ./artifacts/subkey/subkey --version |
-      sed -n -E 's/^subkey ([0-9.]+.*)/\1/p' |
-      tee ./artifacts/subkey/VERSION;
-    - sha256sum ./artifacts/subkey/subkey | tee ./artifacts/subkey/subkey.sha256
-    - cp -r ./scripts/ci/docker/subkey.Dockerfile ./artifacts/subkey/
-  after_script: [""]
-  tags:
-    - osx
-
-build-rustdoc:
-  stage: build
-  extends:
-    - .docker-env
-    - .test-refs
-  variables:
-    SKIP_WASM_BUILD: 1
-    DOC_INDEX_PAGE: "substrate/index.html" # default redirected page
-    # this variable gets overriden by "rusty-cachier environment inject", use the value as default
-    CARGO_TARGET_DIR: "$CI_PROJECT_DIR/target"
-  artifacts:
-    name: "${CI_JOB_NAME}_${CI_COMMIT_REF_NAME}-doc"
-    when: on_success
-    expire_in: 7 days
-    paths:
-      - ./crate-docs/
-  # DAG: this is artificial dependency
-  needs:
-    - job: cargo-clippy
-      artifacts: false
-  script:
-    - rusty-cachier snapshot create
-    - time cargo doc --locked --workspace --all-features --verbose --no-deps
-    - rm -f $CARGO_TARGET_DIR/doc/.lock
-    - mv $CARGO_TARGET_DIR/doc ./crate-docs
-    # FIXME: remove me after CI image gets nonroot
-    - chown -R nonroot:nonroot ./crate-docs
-    - echo "<meta http-equiv=refresh content=0;url=${DOC_INDEX_PAGE}>" > ./crate-docs/index.html
-    - rusty-cachier cache upload
diff --git a/substrate/scripts/ci/gitlab/pipeline/check.yml b/substrate/scripts/ci/gitlab/pipeline/check.yml
deleted file mode 100644
index 576daec9b43311ff39cb076c1f8b706b4751db85..0000000000000000000000000000000000000000
--- a/substrate/scripts/ci/gitlab/pipeline/check.yml
+++ /dev/null
@@ -1,78 +0,0 @@
-# This file is part of .gitlab-ci.yml
-# Here are all jobs that are executed during "check" stage
-
-check-runtime:
-  stage: check
-  extends:
-    - .kubernetes-env
-    - .test-refs-no-trigger-prs-only
-  variables:
-    CI_IMAGE: "paritytech/tools:latest"
-    GITLAB_API: "https://gitlab.parity.io/api/v4"
-    GITHUB_API_PROJECT: "parity%2Finfrastructure%2Fgithub-api"
-  script:
-    - ./scripts/ci/gitlab/check_runtime.sh
-  allow_failure: true
-
-check-signed-tag:
-  stage: check
-  extends: .kubernetes-env
-  variables:
-    CI_IMAGE: "paritytech/tools:latest"
-  rules:
-    - if: $CI_COMMIT_REF_NAME =~ /^ci-release-.*$/
-    - if: $CI_COMMIT_REF_NAME =~ /^v[0-9]+\.[0-9]+.*$/ # i.e. v1.0, v2.1rc1
-  script:
-    - ./scripts/ci/gitlab/check_signed.sh
-
-test-dependency-rules:
-  stage: check
-  extends:
-    - .kubernetes-env
-    - .test-refs-no-trigger-prs-only
-  variables:
-    CI_IMAGE: "paritytech/tools:latest"
-  script:
-    - ./scripts/ci/gitlab/ensure-deps.sh
-
-test-rust-features:
-  stage: check
-  extends:
-    - .kubernetes-env
-    - .test-refs-no-trigger-prs-only
-  script:
-    - git clone
-      --depth=1
-      --branch="$PIPELINE_SCRIPTS_TAG"
-      https://github.com/paritytech/pipeline-scripts
-    - bash ./pipeline-scripts/rust-features.sh .
-
-test-rust-feature-propagation:
-  stage: check
-  extends:
-    - .kubernetes-env
-    - .test-refs-no-trigger-prs-only
-  script:
-    - cargo install --locked --version 0.7.4 -q -f zepter && zepter --version
-    - echo "👉 Hello developer! If you see this CI check failing then it means that one of the crates is missing a feature for one of its dependencies. The output below tells you which feature needs to be added for which dependency to which crate. You can do this by modifying the Cargo.toml file. For more context see the MR where this check was introduced https://github.com/paritytech/substrate/pull/14660"
-    - zepter lint propagate-feature --feature try-runtime --left-side-feature-missing=ignore --workspace --feature-enables-dep="try-runtime:frame-try-runtime" --locked
-    - zepter lint propagate-feature --feature runtime-benchmarks --left-side-feature-missing=ignore --workspace --feature-enables-dep="runtime-benchmarks:frame-benchmarking" --locked
-    - zepter lint propagate-feature --feature std --left-side-feature-missing=ignore --workspace --locked
-  allow_failure: true # Experimental
-
-test-prometheus-alerting-rules:
-  stage: check
-  extends: .kubernetes-env
-  variables:
-    CI_IMAGE: "paritytech/tools:latest"
-  rules:
-    - if: $CI_PIPELINE_SOURCE == "pipeline"
-      when: never
-    - if: $CI_COMMIT_BRANCH
-      changes:
-        - .gitlab-ci.yml
-        - ./scripts/ci/monitoring/**/*
-  script:
-    - promtool check rules ./scripts/ci/monitoring/alerting-rules/alerting-rules.yaml
-    - cat ./scripts/ci/monitoring/alerting-rules/alerting-rules.yaml |
-      promtool test rules ./scripts/ci/monitoring/alerting-rules/alerting-rule-tests.yaml
diff --git a/substrate/scripts/ci/gitlab/pipeline/publish.yml b/substrate/scripts/ci/gitlab/pipeline/publish.yml
deleted file mode 100644
index c90af7ba347ba83914d35b100ec94f88886f54b1..0000000000000000000000000000000000000000
--- a/substrate/scripts/ci/gitlab/pipeline/publish.yml
+++ /dev/null
@@ -1,270 +0,0 @@
-# This file is part of .gitlab-ci.yml
-# Here are all jobs that are executed during "publish" stage
-
-.build-push-docker-image-common:
-  extends:
-    - .kubernetes-env
-  stage: publish
-  variables:
-    CI_IMAGE: $BUILDAH_IMAGE
-    GIT_STRATEGY: none
-    DOCKERFILE: $PRODUCT.Dockerfile
-    IMAGE_NAME: docker.io/$IMAGE_PATH
-  before_script:
-    - !reference [.kubernetes-env, before_script]
-    - cd ./artifacts/$PRODUCT/
-    - VERSION="$(cat ./VERSION)"
-    - echo "${PRODUCT} version = ${VERSION}"
-    - test -z "${VERSION}" && exit 1
-  script:
-    - test "$DOCKER_USER" -a "$DOCKER_PASS" ||
-      ( echo "no docker credentials provided"; exit 1 )
-    - $BUILDAH_COMMAND build
-      --format=docker
-      --build-arg VCS_REF="${CI_COMMIT_SHA}"
-      --build-arg BUILD_DATE="$(date -u '+%Y-%m-%dT%H:%M:%SZ')"
-      --build-arg IMAGE_NAME="${IMAGE_PATH}"
-      --tag "$IMAGE_NAME:$VERSION"
-      --tag "$IMAGE_NAME:latest"
-      --file "$DOCKERFILE" .
-    - echo "$DOCKER_PASS" |
-      buildah login --username "$DOCKER_USER" --password-stdin docker.io
-    - $BUILDAH_COMMAND info
-    - $BUILDAH_COMMAND push --format=v2s2 "$IMAGE_NAME:$VERSION"
-    - $BUILDAH_COMMAND push --format=v2s2 "$IMAGE_NAME:latest"
-  after_script:
-    - buildah logout --all
-    - echo "SUBSTRATE_IMAGE_NAME=${IMAGE_NAME}" | tee -a ./artifacts/$PRODUCT/build.env
-    - IMAGE_TAG="$(cat ./artifacts/$PRODUCT/VERSION)"
-    - echo "SUBSTRATE_IMAGE_TAG=${IMAGE_TAG}"   | tee -a ./artifacts/$PRODUCT/build.env
-    - cat ./artifacts/$PRODUCT/build.env
-
-.build-push-docker-image:
-  extends:
-    - .publish-refs
-    - .build-push-docker-image-common
-  variables:
-    IMAGE_PATH: parity/$PRODUCT
-    DOCKER_USER: $Docker_Hub_User_Parity
-    DOCKER_PASS: $Docker_Hub_Pass_Parity
-
-.push-docker-image-description:
-  stage: publish
-  extends:
-    - .kubernetes-env
-  variables:
-    CI_IMAGE: paritytech/dockerhub-description
-    DOCKERHUB_REPOSITORY: parity/$PRODUCT
-    DOCKER_USERNAME: $Docker_Hub_User_Parity
-    DOCKER_PASSWORD: $Docker_Hub_Pass_Parity
-    README_FILEPATH: $CI_PROJECT_DIR/scripts/ci/docker/$PRODUCT.Dockerfile.README.md
-  rules:
-    - if: $CI_COMMIT_REF_NAME == $CI_DEFAULT_BRANCH && $CI_PIPELINE_SOURCE == "push"
-      changes:
-        - scripts/ci/docker/$PRODUCT.Dockerfile.README.md
-  before_script:
-    - echo
-  script:
-    - cd / && sh entrypoint.sh
-
-# publish image to docker.io/paritypr, (e.g. for later use in zombienet testing)
-.build-push-image-temporary:
-  extends:
-    - .build-refs
-    - .build-push-docker-image-common
-  variables:
-    IMAGE_PATH: paritypr/$PRODUCT
-    DOCKER_USER: $PARITYPR_USER
-    DOCKER_PASS: $PARITYPR_PASS
-
-publish-docker-substrate:
-  extends: .build-push-docker-image
-  needs:
-    - job: build-linux-substrate
-      artifacts: true
-  variables:
-    PRODUCT: substrate
-
-publish-docker-description-substrate:
-  extends: .push-docker-image-description
-  variables:
-    PRODUCT: substrate
-    SHORT_DESCRIPTION: "Substrate Docker Image."
-
-publish-docker-substrate-temporary:
-  extends: .build-push-image-temporary
-  needs:
-    - job: build-linux-substrate
-      artifacts: true
-  variables:
-    PRODUCT: substrate
-  artifacts:
-    reports:
-      # this artifact is used in zombienet-tests job
-      # https://docs.gitlab.com/ee/ci/multi_project_pipelines.html#with-variable-inheritance
-      dotenv: ./artifacts/$PRODUCT/build.env
-    expire_in: 24h
-
-publish-docker-subkey:
-  extends: .build-push-docker-image
-  needs:
-    - job: build-subkey-linux
-      artifacts: true
-  variables:
-    PRODUCT: subkey
-
-publish-docker-description-subkey:
-  extends: .push-docker-image-description
-  variables:
-    PRODUCT: subkey
-    SHORT_DESCRIPTION: "The subkey program is a key management utility for Substrate-based blockchains."
-
-publish-s3-release:
-  stage: publish
-  extends:
-    - .publish-refs
-    - .kubernetes-env
-  needs:
-    - job: build-linux-substrate
-      artifacts: true
-    - job: build-subkey-linux
-      artifacts: true
-  image: paritytech/awscli:latest
-  variables:
-    GIT_STRATEGY: none
-    BUCKET: "releases.parity.io"
-    PREFIX: "substrate/${ARCH}-${DOCKER_OS}"
-  script:
-    - aws s3 sync ./artifacts/ s3://${BUCKET}/${PREFIX}/$(cat ./artifacts/substrate/VERSION)/
-    - echo "update objects in latest path"
-    - aws s3 sync s3://${BUCKET}/${PREFIX}/$(cat ./artifacts/substrate/VERSION)/ s3://${BUCKET}/${PREFIX}/latest/
-  after_script:
-    - aws s3 ls s3://${BUCKET}/${PREFIX}/latest/
-      --recursive --human-readable --summarize
-
-publish-rustdoc:
-  stage: publish
-  extends: .kubernetes-env
-  variables:
-    CI_IMAGE: node:16
-    GIT_DEPTH: 100
-    RUSTDOCS_DEPLOY_REFS: "master"
-  rules:
-    - if: $CI_PIPELINE_SOURCE == "pipeline"
-      when: never
-    - if: $CI_PIPELINE_SOURCE == "web" && $CI_COMMIT_REF_NAME == "master"
-    - if: $CI_COMMIT_REF_NAME == "master"
-    - if: $CI_COMMIT_REF_NAME =~ /^monthly-20[0-9]{2}-[0-9]{2}.*$/ # to support: monthly-2021-09+1
-    - if: $CI_COMMIT_REF_NAME =~ /^v[0-9]+\.[0-9]+.*$/ # i.e. v1.0, v2.1rc1
-  # `needs:` can be removed after CI image gets nonroot. In this case `needs:` stops other
-  # artifacts from being dowloaded by this job.
-  needs:
-    - job: build-rustdoc
-      artifacts: true
-  script:
-    # If $CI_COMMIT_REF_NAME doesn't match one of $RUSTDOCS_DEPLOY_REFS space-separated values, we
-    # exit immediately.
-    # Putting spaces at the front and back to ensure we are not matching just any substring, but the
-    # whole space-separated value.
-    - '[[ " ${RUSTDOCS_DEPLOY_REFS} " =~ " ${CI_COMMIT_REF_NAME} " ]] || exit 0'
-    # setup ssh
-    - eval $(ssh-agent)
-    - ssh-add - <<< ${GITHUB_SSH_PRIV_KEY}
-    - mkdir ~/.ssh && touch ~/.ssh/known_hosts
-    - ssh-keyscan -t rsa github.com >> ~/.ssh/known_hosts
-    # Set git config
-    - git config user.email "devops-team@parity.io"
-    - git config user.name "${GITHUB_USER}"
-    - git config remote.origin.url "git@github.com:/paritytech/${CI_PROJECT_NAME}.git"
-    - git config remote.origin.fetch "+refs/heads/*:refs/remotes/origin/*"
-    - git fetch origin gh-pages
-    # Save README and docs
-    - cp -r ./crate-docs/ /tmp/doc/
-    - cp README.md /tmp/doc/
-    # we don't need to commit changes because we copy docs to /tmp
-    - git checkout gh-pages --force
-    # Install `index-tpl-crud` and generate index.html based on RUSTDOCS_DEPLOY_REFS
-    - which index-tpl-crud &> /dev/null || yarn global add @substrate/index-tpl-crud
-    - index-tpl-crud upsert ./index.html ${CI_COMMIT_REF_NAME}
-    # Ensure the destination dir doesn't exist.
-    - rm -rf ${CI_COMMIT_REF_NAME}
-    - mv -f /tmp/doc ${CI_COMMIT_REF_NAME}
-    # Upload files
-    - git add --all
-    # `git commit` has an exit code of > 0 if there is nothing to commit.
-    # This causes GitLab to exit immediately and marks this job failed.
-    # We don't want to mark the entire job failed if there's nothing to
-    # publish though, hence the `|| true`.
-    - git commit -m "___Updated docs for ${CI_COMMIT_REF_NAME}___" ||
-      echo "___Nothing to commit___"
-    - git push origin gh-pages --force
-  after_script:
-    - rm -rf .git/ ./*
-
-publish-draft-release:
-  stage: publish
-  image: paritytech/tools:latest
-  rules:
-    - if: $CI_COMMIT_REF_NAME =~ /^ci-release-.*$/
-    - if: $CI_COMMIT_REF_NAME =~ /^v[0-9]+\.[0-9]+.*$/ # i.e. v1.0, v2.1rc1
-  script:
-    - ./scripts/ci/gitlab/publish_draft_release.sh
-  allow_failure: true
-
-.publish-crates-template:
-  stage: publish
-  extends:
-    - .crates-publishing-template
-    - .crates-publishing-pipeline
-  # We don't want multiple jobs racing to publish crates as it's redundant and they might overwrite
-  # the releases of one another. Use resource_group to ensure that at most one instance of this job
-  # is running at any given time.
-  resource_group: crates-publishing
-  # crates.io currently rate limits crate publishing at 1 per minute:
-  # https://github.com/paritytech/release-engineering/issues/123#issuecomment-1335509748
-  # Taking into account the 202 (as of Dec 07, 2022) publishable Substrate crates, in the worst
-  # case, due to the rate limits alone, we'd have to wait through at least 202 minutes of delay.
-  # Taking into account also the verification steps and extra synchronization delays after
-  # publishing the crate, the job needs to have a much higher timeout than average.
-  timeout: 9h
-  # A custom publishing environment is used for us to be able to set up protected secrets
-  # specifically for it
-  environment: publish-crates
-  script:
-    - rusty-cachier snapshot create
-    - git clone
-      --depth 1
-      --branch "$RELENG_SCRIPTS_BRANCH"
-      https://github.com/paritytech/releng-scripts.git
-    - CRATESIO_TARGET_INSTANCE=default ./releng-scripts/publish-crates
-    - rusty-cachier cache upload
-
-publish-crates:
-  extends: .publish-crates-template
-  # publish-crates should only be run if publish-crates-locally passes
-  needs:
-    - job: check-crate-publishing
-      artifacts: false
-
-publish-crates-manual:
-  extends: .publish-crates-template
-  when: manual
-  interruptible: false
-
-check-crate-publishing:
-  stage: publish
-  extends:
-    - .crates-publishing-template
-    - .crates-publishing-pipeline
-  # When lots of crates are taken into account (for example on master where all crates are tested)
-  # the job might take a long time, as evidenced by:
-  # https://gitlab.parity.io/parity/mirrors/substrate/-/jobs/2269364
-  timeout: 4h
-  script:
-    - rusty-cachier snapshot create
-    - git clone
-      --depth 1
-      --branch "$RELENG_SCRIPTS_BRANCH"
-      https://github.com/paritytech/releng-scripts.git
-    - CRATESIO_TARGET_INSTANCE=local ./releng-scripts/publish-crates
-    - rusty-cachier cache upload
diff --git a/substrate/scripts/ci/gitlab/pipeline/test.yml b/substrate/scripts/ci/gitlab/pipeline/test.yml
deleted file mode 100644
index ab294ccb436d823bc61c4e6dd54afffab031a1fc..0000000000000000000000000000000000000000
--- a/substrate/scripts/ci/gitlab/pipeline/test.yml
+++ /dev/null
@@ -1,494 +0,0 @@
-# This file is part of .gitlab-ci.yml
-# Here are all jobs that are executed during "test" stage
-
-# It's more like a check and it belongs to the previous stage, but we want to run this job with real tests in parallel
-find-fail-ci-phrase:
-  stage: test
-  variables:
-    CI_IMAGE: "paritytech/tools:latest"
-    ASSERT_REGEX: "FAIL-CI"
-    GIT_DEPTH: 1
-  extends:
-    - .kubernetes-env
-  script:
-    - set +e
-    - rg --line-number --hidden --type rust --glob '!{.git,target}' "$ASSERT_REGEX" .; exit_status=$?
-    - if [ $exit_status -eq 0 ]; then
-      echo "$ASSERT_REGEX was found, exiting with 1";
-      exit 1;
-      else
-      echo "No $ASSERT_REGEX was found, exiting with 0";
-      exit 0;
-      fi
-
-cargo-deny-licenses:
-  stage: test
-  extends:
-    - .docker-env
-    - .test-refs
-  variables:
-    CARGO_DENY_CMD: "cargo deny --all-features check licenses -c ./scripts/ci/deny.toml"
-  script:
-    - rusty-cachier snapshot create
-    - $CARGO_DENY_CMD --hide-inclusion-graph
-    - rusty-cachier cache upload
-  after_script:
-    - !reference [.rusty-cachier, after_script]
-    - echo "___The complete log is in the artifacts___"
-    - $CARGO_DENY_CMD 2> deny.log
-    - if [ $CI_JOB_STATUS != 'success' ]; then
-      echo 'Please check license of your crate or add an exception to scripts/ci/deny.toml';
-      fi
-  artifacts:
-    name: $CI_COMMIT_SHORT_SHA
-    expire_in: 3 days
-    when: always
-    paths:
-      - deny.log
-
-cargo-fmt:
-  stage: test
-  variables:
-    RUSTY_CACHIER_TOOLCHAIN: nightly
-  extends:
-    - .docker-env
-    - .test-refs
-  script:
-    - rusty-cachier snapshot create
-    - cargo +nightly fmt --all -- --check
-    - rusty-cachier cache upload
-
-cargo-fmt-manifest:
-  stage: test
-  extends:
-    - .docker-env
-    - .test-refs
-  script:
-    - cargo install zepter --locked --version 0.10.0 -q -f --no-default-features && zepter --version
-    - echo "👉 Hello developer! If you see this CI check failing then it means that one of the your changes in a Cargo.toml file introduced ill-formatted or unsorted features. Please take a look at 'docs/STYLE_GUIDE.md#manifest-formatting' to find out more."
-    - zepter format features --check
-  allow_failure: true # Experimental
-
-cargo-clippy:
-  stage: test
-  # this is an artificial job dependency, for pipeline optimization using GitLab's DAGs
-  needs:
-    - job: cargo-fmt
-      artifacts: false
-  extends:
-    - .docker-env
-    - .test-refs
-  script:
-    - echo $RUSTFLAGS
-    - cargo version && cargo clippy --version
-    - rusty-cachier snapshot create
-    - SKIP_WASM_BUILD=1 env -u RUSTFLAGS cargo clippy --locked --all-targets --workspace
-    - rusty-cachier cache upload
-
-cargo-check-benches:
-  stage: test
-  variables:
-    CI_JOB_NAME: "cargo-check-benches"
-  extends:
-    - .docker-env
-    - .test-refs-check-benches
-    - .collect-artifacts
-    - .pipeline-stopper-artifacts
-  before_script:
-    - !reference [.timestamp, before_script]
-    # perform rusty-cachier operations before any further modifications to the git repo to make cargo feel cheated not so much
-    - !reference [.rust-info-script, script]
-    - !reference [.job-switcher, before_script]
-    - !reference [.rusty-cachier, before_script]
-    - !reference [.pipeline-stopper-vars, script]
-    # merges in the master branch on PRs. skip if base is not master
-    - 'if [ $CI_COMMIT_REF_NAME != "master" ]; then
-      BASE=$(curl -s -H "Authorization: Bearer ${GITHUB_PR_TOKEN}" https://api.github.com/repos/paritytech/substrate/pulls/${CI_COMMIT_REF_NAME} | jq -r .base.ref);
-      printf "Merging base branch %s\n" "${BASE:=master}";
-      if [ $BASE != "master" ]; then
-      echo "$BASE is not master, skipping merge";
-      else
-      git config user.email "ci@gitlab.parity.io";
-      git fetch origin "refs/heads/${BASE}";
-      git merge --verbose --no-edit FETCH_HEAD;
-      fi
-      fi'
-  parallel: 2
-  script:
-    - rusty-cachier snapshot create
-    - mkdir -p ./artifacts/benches/$CI_COMMIT_REF_NAME-$CI_COMMIT_SHORT_SHA
-    # this job is executed in parallel on two runners
-    - echo "___Running benchmarks___";
-    - case ${CI_NODE_INDEX} in
-      1)
-      SKIP_WASM_BUILD=1 time cargo check --locked --benches --all;
-      cargo run --locked --release -p node-bench -- ::trie::read::small --json
-      | tee ./artifacts/benches/$CI_COMMIT_REF_NAME-$CI_COMMIT_SHORT_SHA/::trie::read::small.json;
-      echo "___Uploading cache for rusty-cachier___";
-      rusty-cachier cache upload
-      ;;
-      2)
-      cargo run --locked --release -p node-bench -- ::node::import::sr25519::transfer_keep_alive::paritydb::small --json
-      | tee ./artifacts/benches/$CI_COMMIT_REF_NAME-$CI_COMMIT_SHORT_SHA/::node::import::sr25519::transfer_keep_alive::paritydb::small.json
-      ;;
-      esac
-
-node-bench-regression-guard:
-  # it's not belong to `build` semantically, but dag jobs can't depend on each other
-  # within the single stage - https://gitlab.com/gitlab-org/gitlab/-/issues/30632
-  # more: https://github.com/paritytech/substrate/pull/8519#discussion_r608012402
-  stage: build
-  extends:
-    - .docker-env
-    - .test-refs-no-trigger-prs-only
-  needs:
-    # this is a DAG
-    - job: cargo-check-benches
-      artifacts: true
-    # polls artifact from master to compare with current result
-    # need to specify both parallel jobs from master because of the bug
-    # https://gitlab.com/gitlab-org/gitlab/-/issues/39063
-    - project: $CI_PROJECT_PATH
-      job: "cargo-check-benches 1/2"
-      ref: master
-      artifacts: true
-    - project: $CI_PROJECT_PATH
-      job: "cargo-check-benches 2/2"
-      ref: master
-      artifacts: true
-  variables:
-    CI_IMAGE: "paritytech/node-bench-regression-guard:latest"
-  before_script:
-    - !reference [.timestamp, before_script]
-  script:
-    - echo "------- IMPORTANT -------"
-    - echo "node-bench-regression-guard depends on the results of a cargo-check-benches job"
-    - echo "In case of this job failure, check your pipeline's cargo-check-benches"
-    - "node-bench-regression-guard --reference artifacts/benches/master-*
-      --compare-with artifacts/benches/$CI_COMMIT_REF_NAME-$CI_COMMIT_SHORT_SHA"
-  after_script: [""]
-
-cargo-check-try-runtime-and-experimental:
-  stage: test
-  extends:
-    - .docker-env
-    - .test-refs
-  script:
-    - rusty-cachier snapshot create
-    - time cargo check --workspace --locked --features try-runtime,experimental
-    - rusty-cachier cache upload
-
-test-deterministic-wasm:
-  stage: test
-  # this is an artificial job dependency, for pipeline optimization using GitLab's DAGs
-  needs:
-    - job: cargo-check-try-runtime-and-experimental
-      artifacts: false
-  extends:
-    - .docker-env
-    - .test-refs
-  variables:
-    WASM_BUILD_NO_COLOR: 1
-    # this variable gets overriden by "rusty-cachier environment inject", use the value as default
-    CARGO_TARGET_DIR: "$CI_PROJECT_DIR/target"
-  script:
-    - rusty-cachier snapshot create
-    # build runtime
-    - cargo build --locked --verbose --release -p kitchensink-runtime
-    # make checksum
-    - sha256sum $CARGO_TARGET_DIR/release/wbuild/kitchensink-runtime/target/wasm32-unknown-unknown/release/kitchensink_runtime.wasm > checksum.sha256
-    # clean up
-    - rm -rf $CARGO_TARGET_DIR/release/wbuild
-    # build again
-    - cargo build --locked --verbose --release -p kitchensink-runtime
-    # confirm checksum
-    - sha256sum -c ./checksum.sha256
-    # clean up again, don't put release binaries into the cache
-    - rm -rf $CARGO_TARGET_DIR/release/wbuild
-    - rusty-cachier cache upload
-
-test-linux-stable:
-  stage: test
-  extends:
-    - .docker-env
-    - .test-refs
-    - .pipeline-stopper-artifacts
-  variables:
-    # Enable debug assertions since we are running optimized builds for testing
-    # but still want to have debug assertions.
-    RUSTFLAGS: "-C debug-assertions -D warnings"
-    RUST_BACKTRACE: 1
-    WASM_BUILD_NO_COLOR: 1
-    WASM_BUILD_RUSTFLAGS: "-C debug-assertions -D warnings"
-    # Ensure we run the UI tests.
-    RUN_UI_TESTS: 1
-    # needed for rusty-cachier to keep cache in test-linux-stable folder and not in test-linux-stable-1/3
-    CI_JOB_NAME: "test-linux-stable"
-  parallel: 3
-  script:
-    - rusty-cachier snapshot create
-    # this job runs all tests in former runtime-benchmarks, frame-staking and wasmtime tests
-    # tests are partitioned by nextest and executed in parallel on $CI_NODE_TOTAL runners
-    - echo "Node index - ${CI_NODE_INDEX}. Total amount - ${CI_NODE_TOTAL}"
-    - time cargo nextest run --workspace
-      --locked
-      --release
-      --verbose
-      --features runtime-benchmarks,try-runtime,experimental
-      --manifest-path ./bin/node/cli/Cargo.toml
-      --partition count:${CI_NODE_INDEX}/${CI_NODE_TOTAL}
-    # run runtime-api tests with `enable-staging-api` feature
-    - time cargo nextest run -p sp-api-test --features enable-staging-api
-    # we need to update cache only from one job
-    - if [ ${CI_NODE_INDEX} == 1 ]; then rusty-cachier cache upload; fi
-    # Upload tests results to Elasticsearch
-    - echo "Upload test results to Elasticsearch"
-    - cat target/nextest/default/junit.xml | xq . > target/nextest/default/junit.json
-    - |
-      curl -v -XPOST --http1.1 \
-      -u ${ELASTIC_USERNAME}:${ELASTIC_PASSWORD} \
-      https://elasticsearch.parity-build.parity.io/unit-tests/_doc/${CI_JOB_ID} \
-      -H 'Content-Type: application/json' \
-      -d @target/nextest/default/junit.json || echo "failed to upload junit report"
-  artifacts:
-    when: always
-    paths:
-      - target/nextest/default/junit.xml
-    reports:
-      junit: target/nextest/default/junit.xml
-
-test-frame-support:
-  stage: test
-  extends:
-    - .docker-env
-    - .test-refs
-  variables:
-    # Enable debug assertions since we are running optimized builds for testing
-    # but still want to have debug assertions.
-    RUSTFLAGS: "-C debug-assertions -D warnings"
-    RUST_BACKTRACE: 1
-    WASM_BUILD_NO_COLOR: 1
-    WASM_BUILD_RUSTFLAGS: "-C debug-assertions -D warnings"
-    # Ensure we run the UI tests.
-    RUN_UI_TESTS: 1
-  script:
-    - rusty-cachier snapshot create
-    - cat /cargo_target_dir/debug/.fingerprint/memory_units-759eddf317490d2b/lib-memory_units.json || true
-    - time cargo test --verbose --locked -p frame-support-test --features=frame-feature-testing,no-metadata-docs,try-runtime,experimental --manifest-path ./frame/support/test/Cargo.toml
-    - time cargo test --verbose --locked -p frame-support-test --features=frame-feature-testing,frame-feature-testing-2,no-metadata-docs,try-runtime,experimental --manifest-path ./frame/support/test/Cargo.toml
-    - SUBSTRATE_TEST_TIMEOUT=1 time cargo test -p substrate-test-utils --release --verbose --locked -- --ignored timeout
-    - cat /cargo_target_dir/debug/.fingerprint/memory_units-759eddf317490d2b/lib-memory_units.json || true
-    - rusty-cachier cache upload
-
-# This job runs tests that don't work with cargo-nextest in test-linux-stable
-test-linux-stable-extra:
-  stage: test
-  extends:
-    - .docker-env
-    - .test-refs
-  variables:
-    # Enable debug assertions since we are running optimized builds for testing
-    # but still want to have debug assertions.
-    RUSTFLAGS: "-C debug-assertions -D warnings"
-    RUST_BACKTRACE: 1
-    WASM_BUILD_NO_COLOR: 1
-    WASM_BUILD_RUSTFLAGS: "-C debug-assertions -D warnings"
-    # Ensure we run the UI tests.
-    RUN_UI_TESTS: 1
-  script:
-    - rusty-cachier snapshot create
-    # Run node-cli tests
-    # TODO: add to test-linux-stable-nextest after fix https://github.com/paritytech/substrate/issues/11321
-    - time cargo test node-cli --workspace --locked --release --verbose --features runtime-benchmarks --manifest-path ./bin/node/cli/Cargo.toml
-    # Run doctests
-    # TODO: add to test-linux-stable-nextest after fix https://github.com/nextest-rs/nextest/issues/16
-    - time cargo test --doc --workspace --locked --release --verbose --features runtime-benchmarks --manifest-path ./bin/node/cli/Cargo.toml
-    - rusty-cachier cache upload
-
-# This job runs all benchmarks defined in the `/bin/node/runtime` once to check that there are no errors.
-quick-benchmarks:
-  stage: test
-  extends:
-    - .docker-env
-    - .test-refs
-  variables:
-    # Enable debug assertions since we are running optimized builds for testing
-    # but still want to have debug assertions.
-    RUSTFLAGS: "-C debug-assertions -D warnings"
-    RUST_BACKTRACE: "full"
-    WASM_BUILD_NO_COLOR: 1
-    WASM_BUILD_RUSTFLAGS: "-C debug-assertions -D warnings"
-  script:
-    - rusty-cachier snapshot create
-    - time cargo run --locked --release -p node-cli --features runtime-benchmarks -- benchmark pallet --wasm-execution compiled --chain dev --pallet "*" --extrinsic "*" --steps 2 --repeat 1
-    - rusty-cachier cache upload
-
-test-frame-examples-compile-to-wasm:
-  # into one job
-  stage: test
-  extends:
-    - .docker-env
-    - .test-refs
-  variables:
-    # Enable debug assertions since we are running optimized builds for testing
-    # but still want to have debug assertions.
-    RUSTFLAGS: "-C debug-assertions"
-    RUST_BACKTRACE: 1
-  script:
-    - rusty-cachier snapshot create
-    - cd ./frame/examples/offchain-worker/
-    - cargo build --locked --target=wasm32-unknown-unknown --no-default-features
-    - cd ../basic
-    - cargo build --locked --target=wasm32-unknown-unknown --no-default-features
-    - rusty-cachier cache upload
-
-test-linux-stable-int:
-  stage: test
-  extends:
-    - .docker-env
-    - .test-refs
-    - .pipeline-stopper-artifacts
-  variables:
-    # Enable debug assertions since we are running optimized builds for testing
-    # but still want to have debug assertions.
-    RUSTFLAGS: "-C debug-assertions -D warnings"
-    RUST_BACKTRACE: 1
-    WASM_BUILD_NO_COLOR: 1
-    WASM_BUILD_RUSTFLAGS: "-C debug-assertions -D warnings"
-    # Ensure we run the UI tests.
-    RUN_UI_TESTS: 1
-  script:
-    - rusty-cachier snapshot create
-    - WASM_BUILD_NO_COLOR=1
-      RUST_LOG=sync=trace,consensus=trace,client=trace,state-db=trace,db=trace,forks=trace,state_db=trace,storage_cache=trace
-      time cargo test -p node-cli --release --verbose --locked -- --ignored
-    - rusty-cachier cache upload
-
-# more information about this job can be found here:
-# https://github.com/paritytech/substrate/pull/6916
-check-tracing:
-  stage: test
-  # this is an artificial job dependency, for pipeline optimization using GitLab's DAGs
-  needs:
-    - job: test-linux-stable-int
-      artifacts: false
-  extends:
-    - .docker-env
-    - .test-refs
-    - .pipeline-stopper-artifacts
-  script:
-    - rusty-cachier snapshot create
-    # with-tracing must be explicitly activated, we run a test to ensure this works as expected in both cases
-    - time cargo test --locked --manifest-path ./primitives/tracing/Cargo.toml --no-default-features
-    - time cargo test --locked --manifest-path ./primitives/tracing/Cargo.toml --no-default-features --features=with-tracing
-    - rusty-cachier cache upload
-
-# more information about this job can be found here:
-# https://github.com/paritytech/substrate/pull/3778
-test-full-crypto-feature:
-  stage: test
-  # this is an artificial job dependency, for pipeline optimization using GitLab's DAGs
-  needs:
-    - job: check-tracing
-      artifacts: false
-  extends:
-    - .docker-env
-    - .test-refs
-  variables:
-    # Enable debug assertions since we are running optimized builds for testing
-    # but still want to have debug assertions.
-    RUSTFLAGS: "-C debug-assertions"
-    RUST_BACKTRACE: 1
-  script:
-    - rusty-cachier snapshot create
-    - cd primitives/core/
-    - time cargo build --locked --verbose --no-default-features --features full_crypto
-    - cd ../application-crypto
-    - time cargo build --locked --verbose --no-default-features --features full_crypto
-    - rusty-cachier cache upload
-
-check-rustdoc:
-  stage: test
-  extends:
-    - .docker-env
-    - .test-refs
-  variables:
-    SKIP_WASM_BUILD: 1
-    RUSTDOCFLAGS: "-Dwarnings"
-  script:
-    - rusty-cachier snapshot create
-    - time cargo doc --locked --workspace --all-features --verbose --no-deps
-    - rusty-cachier cache upload
-
-cargo-check-each-crate:
-  stage: test
-  extends:
-    - .docker-env
-    - .test-refs
-    - .collect-artifacts
-    - .pipeline-stopper-artifacts
-  variables:
-    # $CI_JOB_NAME is set manually so that rusty-cachier can share the cache for all
-    # "cargo-check-each-crate I/N" jobs
-    CI_JOB_NAME: cargo-check-each-crate
-  script:
-    - rusty-cachier snapshot create
-    - PYTHONUNBUFFERED=x time ./scripts/ci/gitlab/check-each-crate.py "$CI_NODE_INDEX" "$CI_NODE_TOTAL"
-    # need to update cache only from one job
-    - if [ "$CI_NODE_INDEX" == 1 ]; then rusty-cachier cache upload; fi
-  parallel: 2
-
-cargo-check-each-crate-macos:
-  stage: test
-  extends:
-    - .test-refs
-    - .collect-artifacts
-    - .pipeline-stopper-artifacts
-  before_script:
-    # skip timestamp script, the osx bash doesn't support printf %()T
-    - !reference [.job-switcher, before_script]
-    - !reference [.rust-info-script, script]
-    - !reference [.pipeline-stopper-vars, script]
-  variables:
-    SKIP_WASM_BUILD: 1
-  script:
-    # TODO: enable rusty-cachier once it supports Mac
-    # TODO: use parallel jobs, as per cargo-check-each-crate, once more Mac runners are available
-    # - time ./scripts/ci/gitlab/check-each-crate.py 1 1
-    - time cargo check --workspace --locked
-  tags:
-    - osx
-
-cargo-hfuzz:
-  stage: test
-  extends:
-    - .docker-env
-    - .test-refs
-    - .pipeline-stopper-artifacts
-  variables:
-    # max 10s per iteration, 60s per file
-    HFUZZ_RUN_ARGS: >
-      --exit_upon_crash
-      --exit_code_upon_crash 1
-      --timeout 10
-      --run_time 60
-    # use git version of honggfuzz-rs until v0.5.56 is out, we need a few recent changes:
-    # https://github.com/rust-fuzz/honggfuzz-rs/pull/75 to avoid breakage on debian
-    # https://github.com/rust-fuzz/honggfuzz-rs/pull/81 fix to the above pr
-    # https://github.com/rust-fuzz/honggfuzz-rs/pull/82 fix for handling rusty-cachier's absolute CARGO_TARGET_DIR
-    HFUZZ_BUILD_ARGS: >
-      --config=patch.crates-io.honggfuzz.git="https://github.com/altaua/honggfuzz-rs"
-      --config=patch.crates-io.honggfuzz.rev="205f7c8c059a0d98fe1cb912cdac84f324cb6981"
-  artifacts:
-    name: "hfuzz-$CI_COMMIT_SHORT_SHA"
-    expire_in: 7 days
-    when: on_failure
-    paths:
-      - primitives/arithmetic/fuzzer/hfuzz_workspace/
-  script:
-    - cd ./primitives/arithmetic/fuzzer
-    - rusty-cachier snapshot create
-    - cargo hfuzz build
-    - rusty-cachier cache upload
-    - for target in $(cargo read-manifest | jq -r '.targets | .[] | .name'); do
-      cargo hfuzz run "$target" || { printf "fuzzing failure for %s\n" "$target"; exit 1; }; done
diff --git a/substrate/scripts/ci/gitlab/pipeline/zombienet.yml b/substrate/scripts/ci/gitlab/pipeline/zombienet.yml
deleted file mode 100644
index 31ee510343278943838420679705212d61e75d2d..0000000000000000000000000000000000000000
--- a/substrate/scripts/ci/gitlab/pipeline/zombienet.yml
+++ /dev/null
@@ -1,67 +0,0 @@
-# This file is part of .gitlab-ci.yml
-# Here are all jobs that are executed during "zombienet" stage
-
-# common settings for all zombienet jobs
-.zombienet-common:
-  before_script:
-    - echo "Zombie-net Tests Config"
-    - echo "${ZOMBIENET_IMAGE}"
-    - echo "${SUBSTRATE_IMAGE_NAME} ${SUBSTRATE_IMAGE_TAG}"
-    - echo "${GH_DIR}"
-    - export DEBUG=zombie,zombie::network-node
-    - export ZOMBIENET_INTEGRATION_TEST_IMAGE=${SUBSTRATE_IMAGE_NAME}:${SUBSTRATE_IMAGE_TAG}
-    - echo "${ZOMBIENET_INTEGRATION_TEST_IMAGE}"
-  stage: zombienet
-  image: "${ZOMBIENET_IMAGE}"
-  needs:
-    - job: publish-docker-substrate-temporary
-  extends:
-    - .kubernetes-env
-    - .zombienet-refs
-  variables:
-    GH_DIR: "https://github.com/paritytech/substrate/tree/${CI_COMMIT_SHA}/zombienet"
-    FF_DISABLE_UMASK_FOR_DOCKER_EXECUTOR: 1
-  artifacts:
-    name: "${CI_JOB_NAME}_${CI_COMMIT_REF_NAME}"
-    when: always
-    expire_in: 2 days
-    paths:
-      - ./zombienet-logs
-  after_script:
-    - mkdir -p ./zombienet-logs
-    - cp /tmp/zombie*/logs/* ./zombienet-logs/
-  retry: 2
-  tags:
-    - zombienet-polkadot-integration-test
-
-zombienet-0000-block-building:
-  extends:
-    - .zombienet-common
-  script:
-    - /home/nonroot/zombie-net/scripts/ci/run-test-env-manager.sh
-      --github-remote-dir="${GH_DIR}/0000-block-building"
-      --test="block-building.zndsl"
-
-zombienet-0001-basic-warp-sync:
-  extends:
-    - .zombienet-common
-  script:
-    - /home/nonroot/zombie-net/scripts/ci/run-test-env-manager.sh
-      --github-remote-dir="${GH_DIR}/0001-basic-warp-sync"
-      --test="test-warp-sync.zndsl"
-
-zombienet-0002-validators-warp-sync:
-  extends:
-    - .zombienet-common
-  script:
-    - /home/nonroot/zombie-net/scripts/ci/run-test-env-manager.sh
-      --github-remote-dir="${GH_DIR}/0002-validators-warp-sync"
-      --test="test-validators-warp-sync.zndsl"
-
-zombienet-0003-block-building-warp-sync:
-  extends:
-    - .zombienet-common
-  script:
-    - /home/nonroot/zombie-net/scripts/ci/run-test-env-manager.sh
-      --github-remote-dir="${GH_DIR}/0003-block-building-warp-sync"
-      --test="test-block-building-warp-sync.zndsl"
diff --git a/substrate/scripts/ci/gitlab/prettier.sh b/substrate/scripts/ci/gitlab/prettier.sh
deleted file mode 100755
index 299bbee179dcaeff3fbadffd89fb4548ac878555..0000000000000000000000000000000000000000
--- a/substrate/scripts/ci/gitlab/prettier.sh
+++ /dev/null
@@ -1,6 +0,0 @@
-#!/bin/sh
-
-# meant to be installed via
-#   git config filter.ci-prettier.clean "scripts/ci/gitlab/prettier.sh"
-
-prettier --parser yaml
diff --git a/substrate/scripts/ci/gitlab/publish_draft_release.sh b/substrate/scripts/ci/gitlab/publish_draft_release.sh
deleted file mode 100755
index 88d1de0e04fe3c17245d5e7dd95e5dd632625ad3..0000000000000000000000000000000000000000
--- a/substrate/scripts/ci/gitlab/publish_draft_release.sh
+++ /dev/null
@@ -1,54 +0,0 @@
-#!/usr/bin/env bash
-
-# shellcheck source=../common/lib.sh
-source "$( cd "$( dirname "${BASH_SOURCE[0]}" )" >/dev/null 2>&1 && pwd )/../common/lib.sh"
-
-version="$CI_COMMIT_TAG"
-
-# Note that this is not the last *tagged* version, but the last *published* version
-last_version=$(last_github_release 'paritytech/substrate')
-
-release_text="$(./generate_release_text.sh "$last_version" "$version")"
-
-echo "[+] Pushing release to github"
-# Create release on github
-release_name="Substrate $version"
-data=$(jq -Rs --arg version "$version" \
-  --arg release_name "$release_name" \
-  --arg release_text "$release_text" \
-'{
-  "tag_name": $version,
-  "target_commitish": "master",
-  "name": $release_name,
-  "body": $release_text,
-  "draft": true,
-  "prerelease": false
-}' < /dev/null)
-
-out=$(curl -s -X POST --data "$data" -H "Authorization: token $GITHUB_RELEASE_TOKEN" "$api_base/paritytech/substrate/releases")
-
-html_url=$(echo "$out" | jq -r .html_url)
-
-if [ "$html_url" == "null" ]
-then
-  echo "[!] Something went wrong posting:"
-  echo "$out"
-else
-  echo "[+] Release draft created: $html_url"
-fi
-
-echo '[+] Sending draft release URL to Matrix'
-
-msg_body=$(cat <<EOF
-**Release pipeline for Substrate $version complete.**
-Draft release created: $html_url
-EOF
-)
-formatted_msg_body=$(cat <<EOF
-<strong>Release pipeline for Substrate $version complete.</strong><br />
-Draft release created: $html_url
-EOF
-)
-send_message "$(structure_message "$msg_body" "$formatted_msg_body")" "!aJymqQYtCjjqImFLSb:parity.io" "$RELEASENOTES_MATRIX_V2_ACCESS_TOKEN"
-
-echo "[+] Done! Maybe the release worked..."
diff --git a/substrate/scripts/ci/monitoring/alerting-rules/alerting-rules.yaml b/substrate/scripts/ci/monitoring/alerting-rules/alerting-rules.yaml
index 4171f92f68feff11d2f10cbeeea63be64f80f546..ac89c58bfc3e223831795fb160d5d51816c7f6f4 100644
--- a/substrate/scripts/ci/monitoring/alerting-rules/alerting-rules.yaml
+++ b/substrate/scripts/ci/monitoring/alerting-rules/alerting-rules.yaml
@@ -146,11 +146,7 @@ groups:
       hours.'
 
   - alert: UnboundedChannelPersistentlyLarge
-    expr: '(
-        (substrate_unbounded_channel_len{action = "send"} -
-            ignoring(action) substrate_unbounded_channel_len{action = "received"})
-        or on(instance) substrate_unbounded_channel_len{action = "send"}
-    ) >= 200'
+    expr: 'substrate_unbounded_channel_size >= 200'
     for: 5m
     labels:
       severity: warning
diff --git a/substrate/scripts/ci/monitoring/grafana-dashboards/README_dashboard.md b/substrate/scripts/ci/monitoring/grafana-dashboards/README_dashboard.md
index 50f54a107e93398f121ac4504c49ec117db3d36f..2267cfbefb7fb6ddbf773da92e34d004e242c8e6 100644
--- a/substrate/scripts/ci/monitoring/grafana-dashboards/README_dashboard.md
+++ b/substrate/scripts/ci/monitoring/grafana-dashboards/README_dashboard.md
@@ -1,4 +1,4 @@
-## Substrate Dashboard
+# Substrate Dashboard
 
 Shared templated Grafana dashboards.
 
diff --git a/substrate/scripts/ci/node-template-release/Cargo.toml b/substrate/scripts/ci/node-template-release/Cargo.toml
index 1fc35b63b1df25817525e41ef5537022ac4c7374..73ffce8645b868a07b2cc77f1f00e47d0339ae79 100644
--- a/substrate/scripts/ci/node-template-release/Cargo.toml
+++ b/substrate/scripts/ci/node-template-release/Cargo.toml
@@ -1,8 +1,8 @@
 [package]
 name = "node-template-release"
 version = "3.0.0"
-authors = ["Parity Technologies <admin@parity.io>"]
-edition = "2021"
+authors.workspace = true
+edition.workspace = true
 license = "GPL-3.0 WITH Classpath-exception-2.0"
 homepage = "https://substrate.io"
 publish = false
@@ -11,7 +11,7 @@ publish = false
 targets = ["x86_64-unknown-linux-gnu"]
 
 [dependencies]
-clap = { version = "4.2.5", features = ["derive"] }
+clap = { version = "4.4.6", features = ["derive"] }
 flate2 = "1.0"
 fs_extra = "1.3"
 glob = "0.3"
diff --git a/substrate/scripts/ci/node-template-release/src/main.rs b/substrate/scripts/ci/node-template-release/src/main.rs
index 9681d73fa6fccdea2d4db5037372f841bc4c300b..850535e4045f9fa2e63caa782ad6f66efd3ef28c 100644
--- a/substrate/scripts/ci/node-template-release/src/main.rs
+++ b/substrate/scripts/ci/node-template-release/src/main.rs
@@ -1,3 +1,21 @@
+// This file is part of Substrate.
+
+// Copyright (C) Parity Technologies (UK) Ltd.
+// SPDX-License-Identifier: GPL-3.0-or-later WITH Classpath-exception-2.0
+
+// This program 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.
+
+// This program 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 this program. If not, see <https://www.gnu.org/licenses/>.
+
 use std::{
 	collections::HashMap,
 	fs::{self, File, OpenOptions},
diff --git a/substrate/src/lib.rs b/substrate/src/lib.rs
index 16a606778965792fcfa5e9f1639ef960e47a7fe2..409515ea505bfb8bcc2f32d63d3db9b3d210c992 100644
--- a/substrate/src/lib.rs
+++ b/substrate/src/lib.rs
@@ -21,7 +21,7 @@
 //! Substrate is a Rust framework for building blockchains in a modular and extensible way. While in
 //! itself un-opinionated, it is the main engine behind the Polkadot ecosystem.
 //!
-//! [![github]](https://github.com/paritytech/substrate/) - [![polkadot]](https://polkadot.network)
+//! [![github]](https://github.com/paritytech/polkadot-sdk/tree/master/substrate/) - [![polkadot]](https://polkadot.network)
 //!
 //! This crate in itself does not contain any code and is just meant ot be a documentation hub for
 //! substrate-based crates.
@@ -157,7 +157,7 @@
 //! through which Polkadot can be utilized is by building "parachains", blockchains that are
 //! connected to Polkadot's shared security.
 //!
-//! To build a parachain, one could use [`Cumulus`](https://github.com/paritytech/cumulus/), the
+//! To build a parachain, one could use [`Cumulus`](https://github.com/paritytech/polkadot-sdk/tree/master/cumulus), the
 //! library on top of Substrate, empowering any substrate-based chain to be a Polkadot parachain.
 //!
 //! ## Where To Go Next?
diff --git a/substrate/test-utils/Cargo.toml b/substrate/test-utils/Cargo.toml
index f568223dbf1854e63d93505b94d50edf304e852d..31bdc0f663a10734d1e4775f1fb03c63ffb9f1ed 100644
--- a/substrate/test-utils/Cargo.toml
+++ b/substrate/test-utils/Cargo.toml
@@ -1,11 +1,11 @@
 [package]
 name = "substrate-test-utils"
 version = "4.0.0-dev"
-authors = ["Parity Technologies <admin@parity.io>"]
-edition = "2021"
+authors.workspace = true
+edition.workspace = true
 license = "Apache-2.0"
 homepage = "https://substrate.io"
-repository = "https://github.com/paritytech/substrate/"
+repository.workspace = true
 description = "Substrate test utilities"
 publish = false
 
@@ -15,7 +15,6 @@ targets = ["x86_64-unknown-linux-gnu"]
 [dependencies]
 futures = "0.3.16"
 tokio = { version = "1.22.0", features = ["macros", "time"] }
-substrate-test-utils-derive = { path = "derive" }
 
 [dev-dependencies]
 trybuild = { version = "1.0.74", features = [ "diff" ] }
diff --git a/substrate/test-utils/cli/Cargo.toml b/substrate/test-utils/cli/Cargo.toml
index a5f83ff9a2c37058f1d0360cd00ef4e80c7ffe08..9c4167c9b6e191a3574c6caf1004e92aeafb2640 100644
--- a/substrate/test-utils/cli/Cargo.toml
+++ b/substrate/test-utils/cli/Cargo.toml
@@ -2,11 +2,11 @@
 name = "substrate-cli-test-utils"
 description = "CLI testing utilities"
 version = "0.1.0"
-authors = ["Parity Technologies <admin@parity.io>"]
-edition = "2021"
+authors.workspace = true
+edition.workspace = true
 license = "Apache-2.0"
 homepage = "https://substrate.io"
-repository = "https://github.com/paritytech/substrate/"
+repository.workspace = true
 publish = false
 
 [package.metadata.docs.rs]
diff --git a/substrate/test-utils/client/Cargo.toml b/substrate/test-utils/client/Cargo.toml
index 1a65c60ab892e7b3dc8e5628197608a213a8346f..12863ac184c1192b3ac688ed12496ca5a6fc6928 100644
--- a/substrate/test-utils/client/Cargo.toml
+++ b/substrate/test-utils/client/Cargo.toml
@@ -2,11 +2,11 @@
 name = "substrate-test-client"
 description = "Client testing utilities"
 version = "2.0.1"
-authors = ["Parity Technologies <admin@parity.io>"]
-edition = "2021"
+authors.workspace = true
+edition.workspace = true
 license = "Apache-2.0"
 homepage = "https://substrate.io"
-repository = "https://github.com/paritytech/substrate/"
+repository.workspace = true
 publish = false
 
 [package.metadata.docs.rs]
@@ -17,8 +17,8 @@ array-bytes = "6.1"
 async-trait = "0.1.57"
 codec = { package = "parity-scale-codec", version = "3.6.1" }
 futures = "0.3.21"
-serde = "1.0.163"
-serde_json = "1.0.85"
+serde = "1.0.188"
+serde_json = "1.0.107"
 sc-client-api = { path = "../../client/api" }
 sc-client-db = { path = "../../client/db", default-features = false, features = [
 	"test-helpers",
diff --git a/substrate/test-utils/derive/Cargo.toml b/substrate/test-utils/derive/Cargo.toml
deleted file mode 100644
index b5d73b8e99396e34f861d5bf7b81484cf69cc6eb..0000000000000000000000000000000000000000
--- a/substrate/test-utils/derive/Cargo.toml
+++ /dev/null
@@ -1,19 +0,0 @@
-[package]
-name = "substrate-test-utils-derive"
-version = "0.10.0-dev"
-authors = ["Parity Technologies <admin@parity.io>"]
-edition = "2021"
-license = "Apache-2.0"
-homepage = "https://substrate.io"
-repository = "https://github.com/paritytech/substrate/"
-description = "Substrate test utilities macros"
-publish = false
-
-[dependencies]
-proc-macro-crate = "1.1.3"
-proc-macro2 = "1.0.56"
-quote = "1.0.28"
-syn = { version = "2.0.16", features = ["full"] }
-
-[lib]
-proc-macro = true
diff --git a/substrate/test-utils/derive/src/lib.rs b/substrate/test-utils/derive/src/lib.rs
deleted file mode 100644
index 0291d825e768cec16e8e5f3cb979fe7d78e8c759..0000000000000000000000000000000000000000
--- a/substrate/test-utils/derive/src/lib.rs
+++ /dev/null
@@ -1,73 +0,0 @@
-// This file is part of Substrate.
-
-// Copyright (C) Parity Technologies (UK) Ltd.
-// SPDX-License-Identifier: GPL-3.0-or-later WITH Classpath-exception-2.0
-
-// This program 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.
-
-// This program 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 this program. If not, see <https://www.gnu.org/licenses/>.
-
-use proc_macro::{Span, TokenStream};
-use proc_macro_crate::{crate_name, FoundCrate};
-use quote::quote;
-
-#[proc_macro_attribute]
-pub fn test(args: TokenStream, item: TokenStream) -> TokenStream {
-	let input = syn::parse_macro_input!(item as syn::ItemFn);
-
-	parse_knobs(input, args.into()).unwrap_or_else(|e| e.to_compile_error().into())
-}
-
-fn parse_knobs(
-	mut input: syn::ItemFn,
-	args: proc_macro2::TokenStream,
-) -> Result<TokenStream, syn::Error> {
-	let sig = &mut input.sig;
-	let body = &input.block;
-	let attrs = &input.attrs;
-	let vis = input.vis;
-
-	if !sig.inputs.is_empty() {
-		return Err(syn::Error::new_spanned(&sig, "No arguments expected for tests."))
-	}
-
-	let crate_name = match crate_name("substrate-test-utils") {
-		Ok(FoundCrate::Itself) => syn::Ident::new("substrate_test_utils", Span::call_site().into()),
-		Ok(FoundCrate::Name(crate_name)) => syn::Ident::new(&crate_name, Span::call_site().into()),
-		Err(e) => return Err(syn::Error::new_spanned(&sig, e)),
-	};
-
-	let header = {
-		quote! {
-			#[#crate_name::tokio::test( #args )]
-		}
-	};
-
-	let result = quote! {
-		#header
-		#(#attrs)*
-		#vis #sig {
-			if #crate_name::tokio::time::timeout(
-				std::time::Duration::from_secs(
-					std::env::var("SUBSTRATE_TEST_TIMEOUT")
-						.ok()
-						.and_then(|x| x.parse().ok())
-						.unwrap_or(600)),
-				async move { #body },
-			).await.is_err() {
-				panic!("The test took too long!");
-			}
-		}
-	};
-
-	Ok(result.into())
-}
diff --git a/substrate/test-utils/runtime/Cargo.toml b/substrate/test-utils/runtime/Cargo.toml
index 0a9406e8af91f0ab2bb90af68120f63ca0eb40ce..4d279c7b703dd44977287b41f8451400a768d073 100644
--- a/substrate/test-utils/runtime/Cargo.toml
+++ b/substrate/test-utils/runtime/Cargo.toml
@@ -1,12 +1,12 @@
 [package]
 name = "substrate-test-runtime"
 version = "2.0.0"
-authors = ["Parity Technologies <admin@parity.io>"]
-edition = "2021"
+authors.workspace = true
+edition.workspace = true
 build = "build.rs"
 license = "Apache-2.0"
 homepage = "https://substrate.io"
-repository = "https://github.com/paritytech/substrate/"
+repository.workspace = true
 publish = false
 
 [package.metadata.docs.rs]
@@ -40,7 +40,7 @@ pallet-timestamp = { path = "../../frame/timestamp", default-features = false}
 sp-consensus-grandpa = { path = "../../primitives/consensus/grandpa", default-features = false, features = ["serde"] }
 sp-trie = { path = "../../primitives/trie", default-features = false}
 sp-transaction-pool = { path = "../../primitives/transaction-pool", default-features = false}
-trie-db = { version = "0.27.0", default-features = false }
+trie-db = { version = "0.28.0", default-features = false }
 sc-service = { path = "../../client/service", default-features = false, features = ["test-helpers"], optional = true}
 sp-state-machine = { path = "../../primitives/state-machine", default-features = false}
 sp-externalities = { path = "../../primitives/externalities", default-features = false}
@@ -48,8 +48,8 @@ sp-externalities = { path = "../../primitives/externalities", default-features =
 # 3rd party
 array-bytes = { version = "6.1", optional = true }
 log = { version = "0.4.17", default-features = false }
-serde = { version = "1.0.163", features = ["alloc", "derive"], default-features = false }
-serde_json = { version = "1.0.85", default-features = false, features = ["alloc"] }
+serde = { version = "1.0.188", features = ["alloc", "derive"], default-features = false }
+serde_json = { version = "1.0.107", default-features = false, features = ["alloc"] }
 
 [dev-dependencies]
 futures = "0.3.21"
@@ -107,6 +107,3 @@ std = [
 ]
 # Special feature to disable logging
 disable-logging = [ "sp-api/disable-logging" ]
-
-#Enabling this flag will disable GenesisBuilder API implementation in runtime.
-disable-genesis-builder = []
diff --git a/substrate/test-utils/runtime/build.rs b/substrate/test-utils/runtime/build.rs
index 230606635f7dc5a4fa452dc7f5dfd021747a6002..dd79ce2c5ae842ad7fc1c759a14fa8dedd200a1a 100644
--- a/substrate/test-utils/runtime/build.rs
+++ b/substrate/test-utils/runtime/build.rs
@@ -15,8 +15,6 @@
 // See the License for the specific language governing permissions and
 // limitations under the License.
 
-const BUILD_NO_GENESIS_BUILDER_SUPPORT_ENV: &str = "BUILD_NO_GENESIS_BUILDER_SUPPORT";
-
 fn main() {
 	#[cfg(feature = "std")]
 	{
@@ -31,19 +29,6 @@ fn main() {
 			.build();
 	}
 
-	#[cfg(feature = "std")]
-	if std::env::var(BUILD_NO_GENESIS_BUILDER_SUPPORT_ENV).is_ok() {
-		substrate_wasm_builder::WasmBuilder::new()
-			.with_current_project()
-			.export_heap_base()
-			.append_to_rust_flags("-Clink-arg=-zstack-size=1048576")
-			.set_file_name("wasm_binary_no_genesis_builder")
-			.import_memory()
-			.enable_feature("disable-genesis-builder")
-			.build();
-	}
-	println!("cargo:rerun-if-env-changed={}", BUILD_NO_GENESIS_BUILDER_SUPPORT_ENV);
-
 	#[cfg(feature = "std")]
 	{
 		substrate_wasm_builder::WasmBuilder::new()
diff --git a/substrate/test-utils/runtime/client/Cargo.toml b/substrate/test-utils/runtime/client/Cargo.toml
index 657f648ecf237b5b29a6672ded02698b8efbc169..40cfa8ab1b7092ab2263690fba9a314e0dcd7a24 100644
--- a/substrate/test-utils/runtime/client/Cargo.toml
+++ b/substrate/test-utils/runtime/client/Cargo.toml
@@ -1,11 +1,11 @@
 [package]
 name = "substrate-test-runtime-client"
 version = "2.0.0"
-authors = ["Parity Technologies <admin@parity.io>"]
-edition = "2021"
+authors.workspace = true
+edition.workspace = true
 license = "Apache-2.0"
 homepage = "https://substrate.io"
-repository = "https://github.com/paritytech/substrate/"
+repository.workspace = true
 publish = false
 
 [package.metadata.docs.rs]
diff --git a/substrate/test-utils/runtime/src/lib.rs b/substrate/test-utils/runtime/src/lib.rs
index b116c8556815f3eef73e08252faab9d9f586ff24..687790f2ffaf8bfe13a4bb58075efc3da750114a 100644
--- a/substrate/test-utils/runtime/src/lib.rs
+++ b/substrate/test-utils/runtime/src/lib.rs
@@ -26,11 +26,10 @@ pub mod genesismap;
 pub mod substrate_test_pallet;
 
 use codec::{Decode, Encode};
-#[cfg(not(feature = "disable-genesis-builder"))]
-use frame_support::genesis_builder_helper::{build_config, create_default_config};
 use frame_support::{
 	construct_runtime,
 	dispatch::DispatchClass,
+	genesis_builder_helper::{build_config, create_default_config},
 	parameter_types,
 	traits::{ConstU32, ConstU64},
 	weights::{
@@ -722,7 +721,6 @@ impl_runtime_apis! {
 		}
 	}
 
-	#[cfg(not(feature = "disable-genesis-builder"))]
 	impl sp_genesis_builder::GenesisBuilder<Block> for Runtime {
 		fn create_default_config() -> Vec<u8> {
 			create_default_config::<RuntimeGenesisConfig>()
@@ -1203,7 +1201,6 @@ mod tests {
 		})
 	}
 
-	#[cfg(not(feature = "disable-genesis-builder"))]
 	mod genesis_builder_tests {
 		use super::*;
 		use crate::genesismap::GenesisStorageBuilder;
diff --git a/substrate/test-utils/runtime/transaction-pool/Cargo.toml b/substrate/test-utils/runtime/transaction-pool/Cargo.toml
index 2e4628ffcfabcb588d902caa7dec8e9206dccb94..cb6ee6d79f448da2c161073f1c08fc6134047537 100644
--- a/substrate/test-utils/runtime/transaction-pool/Cargo.toml
+++ b/substrate/test-utils/runtime/transaction-pool/Cargo.toml
@@ -1,11 +1,11 @@
 [package]
 name = "substrate-test-runtime-transaction-pool"
 version = "2.0.0"
-authors = ["Parity Technologies <admin@parity.io>"]
-edition = "2021"
+authors.workspace = true
+edition.workspace = true
 license = "Apache-2.0"
 homepage = "https://substrate.io"
-repository = "https://github.com/paritytech/substrate/"
+repository.workspace = true
 publish = false
 
 [package.metadata.docs.rs]
diff --git a/substrate/test-utils/runtime/transaction-pool/src/lib.rs b/substrate/test-utils/runtime/transaction-pool/src/lib.rs
index 7b529200440279a59a74bdb9d3dbf315a21d9261..8c8345b06bd32e4efbe2f721ddebe2cc2f2f9c4e 100644
--- a/substrate/test-utils/runtime/transaction-pool/src/lib.rs
+++ b/substrate/test-utils/runtime/transaction-pool/src/lib.rs
@@ -22,6 +22,7 @@
 use codec::Encode;
 use futures::future::ready;
 use parking_lot::RwLock;
+use sc_transaction_pool::ChainApi;
 use sp_blockchain::{CachedHeaderMetadata, TreeRoute};
 use sp_runtime::{
 	generic::{self, BlockId},
@@ -237,9 +238,14 @@ impl TestApi {
 	) -> Result<sp_blockchain::TreeRoute<Block>, Error> {
 		sp_blockchain::tree_route(self, from, to)
 	}
+
+	/// Helper function for mapping block number to hash. Use if mapping shall not fail.
+	pub fn expect_hash_from_number(&self, n: BlockNumber) -> Hash {
+		self.block_id_to_hash(&BlockId::Number(n)).unwrap().unwrap()
+	}
 }
 
-impl sc_transaction_pool::ChainApi for TestApi {
+impl ChainApi for TestApi {
 	type Block = Block;
 	type Error = Error;
 	type ValidationFuture = futures::future::Ready<Result<TransactionValidity, Error>>;
@@ -247,13 +253,13 @@ impl sc_transaction_pool::ChainApi for TestApi {
 
 	fn validate_transaction(
 		&self,
-		at: &BlockId<Self::Block>,
+		at: <Self::Block as BlockT>::Hash,
 		_source: TransactionSource,
 		uxt: <Self::Block as BlockT>::Extrinsic,
 	) -> Self::ValidationFuture {
 		self.validation_requests.write().push(uxt.clone());
 
-		match self.block_id_to_number(at) {
+		match self.block_id_to_number(&BlockId::Hash(at)) {
 			Ok(Some(number)) => {
 				let found_best = self
 					.chain
diff --git a/substrate/test-utils/src/lib.rs b/substrate/test-utils/src/lib.rs
index 1ad702893683f696728bc1ecfb10e832b480da22..30472e79b3f15b3ee2d252c27641bd2f9f1511bc 100644
--- a/substrate/test-utils/src/lib.rs
+++ b/substrate/test-utils/src/lib.rs
@@ -17,26 +17,6 @@
 
 //! Test utils
 
-#[doc(hidden)]
-pub use futures;
-/// Marks async function to be executed by an async runtime suitable to test environment.
-///
-/// # Requirements
-///
-/// You must have tokio in the `[dev-dependencies]` of your crate to use this macro.
-///
-/// # Example
-///
-/// ```
-/// #[substrate_test_utils::test]
-/// async fn basic_test() {
-///     assert!(true);
-/// }
-/// ```
-pub use substrate_test_utils_derive::test;
-#[doc(hidden)]
-pub use tokio;
-
 /// Panic when the vectors are different, without taking the order into account.
 ///
 /// # Examples
diff --git a/substrate/test-utils/test-crate/Cargo.toml b/substrate/test-utils/test-crate/Cargo.toml
deleted file mode 100644
index e42e2d7e9eaba27eb4038695fef78c8a2b4936d9..0000000000000000000000000000000000000000
--- a/substrate/test-utils/test-crate/Cargo.toml
+++ /dev/null
@@ -1,17 +0,0 @@
-[package]
-name = "substrate-test-utils-test-crate"
-version = "0.1.0"
-authors = ["Parity Technologies <admin@parity.io>"]
-edition = "2021"
-license = "Apache-2.0"
-homepage = "https://substrate.io"
-repository = "https://github.com/paritytech/substrate/"
-publish = false
-
-[package.metadata.docs.rs]
-targets = ["x86_64-unknown-linux-gnu"]
-
-[dev-dependencies]
-tokio = { version = "1.22.0", features = ["macros"] }
-sc-service = { path = "../../client/service" }
-test-utils = { package = "substrate-test-utils", path = ".." }
diff --git a/substrate/test-utils/tests/ui/too-many-func-parameters.stderr b/substrate/test-utils/tests/ui/too-many-func-parameters.stderr
deleted file mode 100644
index 1b1630022e4f7e48aa6ad346e756257ab9544752..0000000000000000000000000000000000000000
--- a/substrate/test-utils/tests/ui/too-many-func-parameters.stderr
+++ /dev/null
@@ -1,5 +0,0 @@
-error: No arguments expected for tests.
-  --> $DIR/too-many-func-parameters.rs:20:1
-   |
-20 | async fn too_many_func_parameters(_: u32) {
-   | ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
diff --git a/substrate/utils/binary-merkle-tree/Cargo.toml b/substrate/utils/binary-merkle-tree/Cargo.toml
index fc7566ab2404b976ecd96544232ed6b78cffaeb4..6bb1d5f0f1e69b6c3601c4a8806e2e992e977de9 100644
--- a/substrate/utils/binary-merkle-tree/Cargo.toml
+++ b/substrate/utils/binary-merkle-tree/Cargo.toml
@@ -1,10 +1,10 @@
 [package]
 name = "binary-merkle-tree"
 version = "4.0.0-dev"
-authors = ["Parity Technologies <admin@parity.io>"]
-edition = "2021"
+authors.workspace = true
+edition.workspace = true
 license = "Apache-2.0"
-repository = "https://github.com/paritytech/substrate"
+repository.workspace = true
 description = "A no-std/Substrate compatible library to construct binary merkle tree."
 homepage = "https://substrate.io"
 
diff --git a/substrate/utils/build-script-utils/Cargo.toml b/substrate/utils/build-script-utils/Cargo.toml
index 35096f282ef0ca25f04cc27def334d30f2d8d7a3..ab15d5552c29a6a17dac404537a9cfc3ee59fdfe 100644
--- a/substrate/utils/build-script-utils/Cargo.toml
+++ b/substrate/utils/build-script-utils/Cargo.toml
@@ -1,11 +1,11 @@
 [package]
 name = "substrate-build-script-utils"
 version = "3.0.0"
-authors = ["Parity Technologies <admin@parity.io>"]
-edition = "2021"
+authors.workspace = true
+edition.workspace = true
 license = "Apache-2.0"
 homepage = "https://substrate.io"
-repository = "https://github.com/paritytech/substrate/"
+repository.workspace = true
 description = "Crate with utility functions for `build.rs` scripts."
 readme = "README.md"
 
diff --git a/substrate/utils/build-script-utils/README.md b/substrate/utils/build-script-utils/README.md
index 1c184f67326e3c3170b1a92767deffbdcbfa9c70..f857d04710b182836cba71a7b40d3b762c2bddb9 100644
--- a/substrate/utils/build-script-utils/README.md
+++ b/substrate/utils/build-script-utils/README.md
@@ -1,3 +1,3 @@
 Crate with utility functions for `build.rs` scripts.
 
-License: Apache-2.0
\ No newline at end of file
+License: Apache-2.0
diff --git a/substrate/utils/build-script-utils/src/version.rs b/substrate/utils/build-script-utils/src/version.rs
index 4ee5376ed322d1a3fc3b1d5eb1677f4f93a3a3ea..309c6d71d77b1478211875fa8c06e372470c4ae0 100644
--- a/substrate/utils/build-script-utils/src/version.rs
+++ b/substrate/utils/build-script-utils/src/version.rs
@@ -41,6 +41,7 @@ pub fn generate_cargo_keys() {
 		}
 	};
 
+	println!("cargo:rustc-env=SUBSTRATE_CLI_COMMIT_HASH={commit}");
 	println!("cargo:rustc-env=SUBSTRATE_CLI_IMPL_VERSION={}", get_version(&commit))
 }
 
diff --git a/substrate/utils/fork-tree/Cargo.toml b/substrate/utils/fork-tree/Cargo.toml
index ece7cac8fd3080afac27bfdc7e9ac5f6a32c0587..eea500641fe4eaf7631f97e1adcf2cefcda87288 100644
--- a/substrate/utils/fork-tree/Cargo.toml
+++ b/substrate/utils/fork-tree/Cargo.toml
@@ -1,11 +1,11 @@
 [package]
 name = "fork-tree"
 version = "3.0.0"
-authors = ["Parity Technologies <admin@parity.io>"]
-edition = "2021"
+authors.workspace = true
+edition.workspace = true
 license = "Apache-2.0"
 homepage = "https://substrate.io"
-repository = "https://github.com/paritytech/substrate/"
+repository.workspace = true
 description = "Utility library for managing tree-like ordered data with logic for pruning the tree while finalizing nodes."
 documentation = "https://docs.rs/fork-tree"
 readme = "README.md"
diff --git a/substrate/utils/fork-tree/README.md b/substrate/utils/fork-tree/README.md
index fef7db57f68f21ed590bc6df8e3a3444dc544476..ba573dfff41d98427bacb772e892b2308beeb3bf 100644
--- a/substrate/utils/fork-tree/README.md
+++ b/substrate/utils/fork-tree/README.md
@@ -1,4 +1,4 @@
 Utility library for managing tree-like ordered data with logic for pruning
 the tree while finalizing nodes.
 
-License: Apache-2.0
\ No newline at end of file
+License: Apache-2.0
diff --git a/substrate/utils/frame/benchmarking-cli/Cargo.toml b/substrate/utils/frame/benchmarking-cli/Cargo.toml
index b3181dff15e95e64cc8568671ef7fd780621e3a9..e32fe47b729712368d4803e7d756dffd18a52476 100644
--- a/substrate/utils/frame/benchmarking-cli/Cargo.toml
+++ b/substrate/utils/frame/benchmarking-cli/Cargo.toml
@@ -1,11 +1,11 @@
 [package]
 name = "frame-benchmarking-cli"
 version = "4.0.0-dev"
-authors = ["Parity Technologies <admin@parity.io>"]
-edition = "2021"
+authors.workspace = true
+edition.workspace = true
 license = "Apache-2.0"
 homepage = "https://substrate.io"
-repository = "https://github.com/paritytech/substrate/"
+repository.workspace = true
 description = "CLI for benchmarking FRAME"
 readme = "README.md"
 
@@ -15,7 +15,7 @@ targets = ["x86_64-unknown-linux-gnu"]
 [dependencies]
 array-bytes = "6.1"
 chrono = "0.4"
-clap = { version = "4.2.5", features = ["derive"] }
+clap = { version = "4.4.6", features = ["derive"] }
 codec = { package = "parity-scale-codec", version = "3.6.1" }
 comfy-table = { version = "7.0.1", default-features = false }
 handlebars = "4.2.2"
@@ -26,9 +26,9 @@ linked-hash-map = "0.5.4"
 log = "0.4.17"
 rand = { version = "0.8.4", features = ["small_rng"] }
 rand_pcg = "0.3.1"
-serde = "1.0.163"
-serde_json = "1.0.85"
-thiserror = "1.0.30"
+serde = "1.0.188"
+serde_json = "1.0.107"
+thiserror = "1.0.48"
 thousands = "0.2.0"
 frame-benchmarking = { path = "../../../frame/benchmarking" }
 frame-support = { path = "../../../frame/support" }
diff --git a/substrate/utils/frame/benchmarking-cli/README.md b/substrate/utils/frame/benchmarking-cli/README.md
index e6a48b61fd22741f42466dae5d8ee6eccd56d035..27673ea9580d7a24bb9af4a538dda77ebf6a1ccc 100644
--- a/substrate/utils/frame/benchmarking-cli/README.md
+++ b/substrate/utils/frame/benchmarking-cli/README.md
@@ -1,10 +1,11 @@
 # The Benchmarking CLI
 
-This crate contains commands to benchmark various aspects of Substrate and the hardware.  
-All commands are exposed by the Substrate node but can be exposed by any Substrate client.  
-The goal is to have a comprehensive suite of benchmarks that cover all aspects of Substrate and the hardware that its running on.
+This crate contains commands to benchmark various aspects of Substrate and the hardware.
+All commands are exposed by the Substrate node but can be exposed by any Substrate client.
+The goal is to have a comprehensive suite of benchmarks that cover all aspects of Substrate and the hardware that its
+running on.
 
-Invoking the root benchmark command prints a help menu:  
+Invoking the root benchmark command prints a help menu:
 ```sh
 $ cargo run --profile=production -- benchmark
 
@@ -25,10 +26,12 @@ SUBCOMMANDS:
     storage     Benchmark the storage speed of a chain snapshot
 ```
 
-All examples use the `production` profile for correctness which makes the compilation *very* slow; for testing you can use `--release`.  
-For the final results the `production` profile and reference hardware should be used, otherwise the results are not comparable.
+All examples use the `production` profile for correctness which makes the compilation *very* slow; for testing you can
+use `--release`.
+For the final results the `production` profile and reference hardware should be used, otherwise the results are not
+comparable.
 
-The sub-commands are explained in depth here:  
+The sub-commands are explained in depth here:
 - [block] Compare the weight of a historic block to its actual resource usage
 - [machine] Gauges the speed of the hardware
 - [overhead] Creates weight files for the *Block*- and *Extrinsic*-base weights
diff --git a/substrate/utils/frame/benchmarking-cli/src/block/README.md b/substrate/utils/frame/benchmarking-cli/src/block/README.md
index 7e99f0df9d43b9ccfd65b61c650c2846fb168605..e03f60e76276ff9a2c8f5c6f81c3d6f0fbdd8dae 100644
--- a/substrate/utils/frame/benchmarking-cli/src/block/README.md
+++ b/substrate/utils/frame/benchmarking-cli/src/block/README.md
@@ -1,65 +1,62 @@
 # The `benchmark block` command
 
-The whole benchmarking process in Substrate aims to predict the resource usage of an unexecuted block.  
-This command measures how accurate this prediction was by executing a block and comparing the predicted weight to its actual resource usage.  
-It can be used to measure the accuracy of the pallet benchmarking.
+The whole benchmarking process in Substrate aims to predict the resource usage of an unexecuted block. This command
+measures how accurate this prediction was by executing a block and comparing the predicted weight to its actual resource
+usage. It can be used to measure the accuracy of the pallet benchmarking.
 
-In the following it will be explained once for Polkadot and once for Substrate.  
+In the following it will be explained once for Polkadot and once for Substrate.
 
 ## Polkadot # 1
 <sup>(Also works for Kusama, Westend and Rococo)</sup>
 
 
-Suppose you either have a synced Polkadot node or downloaded a snapshot from [Polkachu].  
-This example uses a pruned ParityDB snapshot from the 2022-4-19 with the last block being 9939462.  
-For pruned snapshots you need to know the number of the last block (to be improved [here]).    
-Pruned snapshots normally store the last 256 blocks, archive nodes can use any block range.  
+Suppose you either have a synced Polkadot node or downloaded a snapshot from [Polkachu]. This example uses a pruned
+ParityDB snapshot from the 2022-4-19 with the last block being 9939462. For pruned snapshots you need to know the number
+of the last block (to be improved [here]). Pruned snapshots normally store the last 256 blocks, archive nodes can use
+any block range.
 
-In this example we will benchmark just the last 10 blocks:  
+In this example we will benchmark just the last 10 blocks:
 ```sh
 cargo run --profile=production -- benchmark block --from 9939453 --to 9939462 --db paritydb
 ```
 
 Output:
 ```pre
-Block 9939453 with     2 tx used   4.57% of its weight (    26,458,801 of    579,047,053 ns)    
-Block 9939454 with     3 tx used   4.80% of its weight (    28,335,826 of    590,414,831 ns)    
-Block 9939455 with     2 tx used   4.76% of its weight (    27,889,567 of    586,484,595 ns)    
-Block 9939456 with     2 tx used   4.65% of its weight (    27,101,306 of    582,789,723 ns)    
-Block 9939457 with     2 tx used   4.62% of its weight (    26,908,882 of    582,789,723 ns)    
-Block 9939458 with     2 tx used   4.78% of its weight (    28,211,440 of    590,179,467 ns)    
-Block 9939459 with     4 tx used   4.78% of its weight (    27,866,077 of    583,260,451 ns)    
-Block 9939460 with     3 tx used   4.72% of its weight (    27,845,836 of    590,462,629 ns)    
-Block 9939461 with     2 tx used   4.58% of its weight (    26,685,119 of    582,789,723 ns)    
-Block 9939462 with     2 tx used   4.60% of its weight (    26,840,938 of    583,697,101 ns)    
+Block 9939453 with     2 tx used   4.57% of its weight (    26,458,801 of    579,047,053 ns)
+Block 9939454 with     3 tx used   4.80% of its weight (    28,335,826 of    590,414,831 ns)
+Block 9939455 with     2 tx used   4.76% of its weight (    27,889,567 of    586,484,595 ns)
+Block 9939456 with     2 tx used   4.65% of its weight (    27,101,306 of    582,789,723 ns)
+Block 9939457 with     2 tx used   4.62% of its weight (    26,908,882 of    582,789,723 ns)
+Block 9939458 with     2 tx used   4.78% of its weight (    28,211,440 of    590,179,467 ns)
+Block 9939459 with     4 tx used   4.78% of its weight (    27,866,077 of    583,260,451 ns)
+Block 9939460 with     3 tx used   4.72% of its weight (    27,845,836 of    590,462,629 ns)
+Block 9939461 with     2 tx used   4.58% of its weight (    26,685,119 of    582,789,723 ns)
+Block 9939462 with     2 tx used   4.60% of its weight (    26,840,938 of    583,697,101 ns)
 ```
 
 ### Output Interpretation
 
 <sup>(Only results from reference hardware are relevant)</sup>
 
-Each block is executed multiple times and the results are averaged.  
-The percent number is the interesting part and indicates how much weight was used as compared to how much was predicted.  
-The closer to 100% this is without exceeding 100%, the better.  
-If it exceeds 100%, the block is marked with "**OVER WEIGHT!**" to easier spot them. This is not good since then the benchmarking under-estimated the weight.  
-This would mean that an honest validator would possibly not be able to keep up with importing blocks since users did not pay for enough weight.  
-If that happens the validator could lag behind the chain and get slashed for missing deadlines.  
-It is therefore important to investigate any overweight blocks.  
+Each block is executed multiple times and the results are averaged. The percent number is the interesting part and
+indicates how much weight was used as compared to how much was predicted. The closer to 100% this is without exceeding
+100%, the better. If it exceeds 100%, the block is marked with "**OVER WEIGHT!**" to easier spot them. This is not good
+since then the benchmarking under-estimated the weight. This would mean that an honest validator would possibly not be
+able to keep up with importing blocks since users did not pay for enough weight. If that happens the validator could lag
+behind the chain and get slashed for missing deadlines. It is therefore important to investigate any overweight blocks.
 
-In this example you can see an unexpected result; only < 5% of the weight was used!  
-The measured blocks can be executed much faster than predicted.  
-This means that the benchmarking process massively over-estimated the execution time.  
-Since they are off by so much, it is an issue [polkadot#5192].  
+In this example you can see an unexpected result; only < 5% of the weight was used! The measured blocks can be executed
+much faster than predicted. This means that the benchmarking process massively over-estimated the execution time. Since
+they are off by so much, it is an issue [`polkadot#5192`].
 
 The ideal range for these results would be 85-100%.
 
 ## Polkadot # 2
 
-Let's take a more interesting example where the blocks use more of their predicted weight.  
-Every day when validators pay out rewards, the blocks are nearly full.  
-Using an archive node here is the easiest.  
+Let's take a more interesting example where the blocks use more of their predicted weight. Every day when validators pay
+out rewards, the blocks are nearly full. Using an archive node here is the easiest.
 
-The Polkadot blocks TODO-TODO for example contain large batch transactions for staking payout.  
+The Polkadot blocks TODO-TODO for example contain large batch transactions for staking payout.
 
 ```sh
 cargo run --profile=production -- benchmark block --from TODO --to TODO --db paritydb
@@ -71,21 +68,20 @@ TODO
 
 ## Substrate
 
-It is also possible to try the procedure in Substrate, although it's a bit boring.  
+It is also possible to try the procedure in Substrate, although it's a bit boring.
 
-First you need to create some blocks with either a local or dev chain.  
-This example will use the standard development spec.  
-Pick a non existing directory where the chain data will be stored, eg `/tmp/dev`.
+First you need to create some blocks with either a local or dev chain. This example will use the standard development
+spec. Pick a non existing directory where the chain data will be stored, eg `/tmp/dev`.
 ```sh
 cargo run --profile=production -- --dev -d /tmp/dev
 ```
-You should see after some seconds that it started to produce blocks:  
+You should see after some seconds that it started to produce blocks:
 ```pre
 …
 ✨ Imported #1 (0x801d…9189)
 …
 ```
-You can now kill the node with `Ctrl+C`. Then measure how long it takes to execute these blocks:  
+You can now kill the node with `Ctrl+C`. Then measure how long it takes to execute these blocks:
 ```sh
 cargo run --profile=production -- benchmark block --from 1 --to 1 --dev -d /tmp/dev --pruning archive
 ```
@@ -94,9 +90,8 @@ This will benchmark the first block. If you killed the node at a later point, yo
 Block 1 with     1 tx used  72.04% of its weight (     4,945,664 of      6,864,702 ns)
 ```
 
-In this example the block used ~72% of its weight.  
-The benchmarking therefore over-estimated the effort to execute the block.  
-Since this block is empty, its not very interesting.
+In this example the block used ~72% of its weight. The benchmarking therefore over-estimated the effort to execute the
+block. Since this block is empty, its not very interesting.
 
 ## Arguments
 
diff --git a/substrate/utils/frame/benchmarking-cli/src/machine/README.md b/substrate/utils/frame/benchmarking-cli/src/machine/README.md
index f22a8ea54b81dbf9f4336809fde0671cda2aed11..d3c9a0ec84062dd26acf5cf5b20b89e4c6bb95d0 100644
--- a/substrate/utils/frame/benchmarking-cli/src/machine/README.md
+++ b/substrate/utils/frame/benchmarking-cli/src/machine/README.md
@@ -1,17 +1,17 @@
 # The `benchmark machine` command
 
-Different Substrate chains can have different hardware requirements.  
-It is therefore important to be able to quickly gauge if a piece of hardware fits a chains' requirements.  
-The `benchmark machine` command archives this by measuring key metrics and making them comparable.  
+Different Substrate chains can have different hardware requirements.
+It is therefore important to be able to quickly gauge if a piece of hardware fits a chains' requirements.
+The `benchmark machine` command archives this by measuring key metrics and making them comparable.
 
-Invoking the command looks like this:  
+Invoking the command looks like this:
 ```sh
 cargo run --profile=production -- benchmark machine --dev
 ```
 
 ## Output
 
-The output on reference hardware:  
+The output on reference hardware:
 
 ```pre
 +----------+----------------+---------------+--------------+-------------------+
@@ -29,37 +29,49 @@ The output on reference hardware:
 +----------+----------------+---------------+--------------+-------------------+
 ```
 
-The *score* is the average result of each benchmark. It always adheres to "higher is better".  
+The *score* is the average result of each benchmark. It always adheres to "higher is better".
 
-The *category* indicate which part of the hardware was benchmarked:  
+The *category* indicate which part of the hardware was benchmarked:
 - **CPU** Processor intensive task
 - **Memory** RAM intensive task
 - **Disk** Hard drive intensive task
 
-The *function* is the concrete benchmark that was run:  
-- **BLAKE2-256** The throughput of the [Blake2-256] cryptographic hashing function with 32 KiB input. The [blake2_256 function] is used in many places in Substrate. The throughput of a hash function strongly depends on the input size, therefore we settled to use a fixed input size for comparable results.
-- **SR25519 Verify** Sr25519 is an optimized version of the [Curve25519] signature scheme. Signature verification is used by Substrate when verifying extrinsics and blocks.
+The *function* is the concrete benchmark that was run:
+- **BLAKE2-256** The throughput of the [Blake2-256] cryptographic hashing function with 32 KiB input. The [blake2_256
+  function] is used in many places in Substrate. The throughput of a hash function strongly depends on the input size,
+  therefore we settled to use a fixed input size for comparable results.
+- **SR25519 Verify** Sr25519 is an optimized version of the [Curve25519] signature scheme. Signature verification is
+  used by Substrate when verifying extrinsics and blocks.
 - **Copy** The throughput of copying memory from one place in the RAM to another.
-- **Seq Write** The throughput of writing data to the storage location sequentially. It is important that the same disk is used that will later-on be used to store the chain data.
-- **Rnd Write** The throughput of writing data to the storage location in a random order. This is normally much slower than the sequential write.
+- **Seq Write** The throughput of writing data to the storage location sequentially. It is important that the same disk
+  is used that will later-on be used to store the chain data.
+- **Rnd Write** The throughput of writing data to the storage location in a random order. This is normally much slower
+  than the sequential write.
 
-The *score* needs to reach the *minimum* in order to pass the benchmark. This can be reduced with the `--tolerance` flag.
+The *score* needs to reach the *minimum* in order to pass the benchmark. This can be reduced with the `--tolerance`
+flag.
 
-The *result* indicated if a specific benchmark was passed by the machine or not. The percent number is the relative score reached to the *minimum* that is needed. The `--tolerance` flag is taken into account for this decision. For example a benchmark that passes even with 95% since the *tolerance* was set to 10% would look like this: `✅ Pass ( 95.0 %)`.
+The *result* indicated if a specific benchmark was passed by the machine or not. The percent number is the relative
+score reached to the *minimum* that is needed. The `--tolerance` flag is taken into account for this decision. For
+example a benchmark that passes even with 95% since the *tolerance* was set to 10% would look like this: `✅ Pass ( 95.0
+%)`.
 
 ## Interpretation
 
-Ideally all results show a `Pass` and the program exits with code 0. Currently some of the benchmarks can fail even on reference hardware; they are still being improved to make them more deterministic.  
-Make sure to run nothing else on the machine when benchmarking it.  
+Ideally all results show a `Pass` and the program exits with code 0. Currently some of the benchmarks can fail even on
+reference hardware; they are still being improved to make them more deterministic.
+Make sure to run nothing else on the machine when benchmarking it.
 You can re-run them multiple times to get more reliable results.
 
 ## Arguments
 
-- `--tolerance` A percent number to reduce the *minimum* requirement. This should be used to ignore outliers of the benchmarks. The default value is 10%.
+- `--tolerance` A percent number to reduce the *minimum* requirement. This should be used to ignore outliers of the
+  benchmarks. The default value is 10%.
 - `--verify-duration` How long the verification benchmark should run.
 - `--disk-duration` How long the *read* and *write* benchmarks should run each.
 - `--allow-fail` Always exit the program with code 0.
-- `--chain` / `--dev` Specify the chain config to use. This will be used to compare the results with the requirements of the chain (WIP).
+- `--chain` / `--dev` Specify the chain config to use. This will be used to compare the results with the requirements of
+  the chain (WIP).
 - [`--base-path`]
 
 License: Apache-2.0
diff --git a/substrate/utils/frame/benchmarking-cli/src/overhead/README.md b/substrate/utils/frame/benchmarking-cli/src/overhead/README.md
index 390bc09e41701ed5b3fe03308ea3857d5ba41ed1..648908010ba04cf6b19cf2aa50c0ea68491a1e28 100644
--- a/substrate/utils/frame/benchmarking-cli/src/overhead/README.md
+++ b/substrate/utils/frame/benchmarking-cli/src/overhead/README.md
@@ -1,21 +1,21 @@
 # The `benchmark overhead` command
 
-Each time an extrinsic or a block is executed, a fixed weight is charged as "execution overhead".
-This is necessary since the weight that is calculated by the pallet benchmarks does not include this overhead.
-The exact overhead to can vary per Substrate chain and needs to be calculated per chain.
-This command calculates the exact values of these overhead weights for any Substrate chain that supports it.
+Each time an extrinsic or a block is executed, a fixed weight is charged as "execution overhead". This is necessary
+since the weight that is calculated by the pallet benchmarks does not include this overhead. The exact overhead to can
+vary per Substrate chain and needs to be calculated per chain. This command calculates the exact values of these
+overhead weights for any Substrate chain that supports it.
 
 ## How does it work?
 
-The benchmark consists of two parts; the [`BlockExecutionWeight`] and the [`ExtrinsicBaseWeight`].
-Both are executed sequentially when invoking the command.
+The benchmark consists of two parts; the [`BlockExecutionWeight`] and the [`ExtrinsicBaseWeight`]. Both are executed
+sequentially when invoking the command.
 
 ## BlockExecutionWeight
 
-The block execution weight is defined as the weight that it takes to execute an *empty block*.
-It is measured by constructing an empty block and measuring its executing time.
-The result are written to a `block_weights.rs` file which is created from a template.
-The file will contain the concrete weight value and various statistics about the measurements. For example:
+The block execution weight is defined as the weight that it takes to execute an *empty block*. It is measured by
+constructing an empty block and measuring its executing time. The result are written to a `block_weights.rs` file which
+is created from a template. The file will contain the concrete weight value and various statistics about the
+measurements. For example:
 ```rust
 /// Time to execute an empty block.
 /// Calculated by multiplying the *Average* with `1` and adding `0`.
@@ -34,16 +34,17 @@ pub const BlockExecutionWeight: Weight =
     Weight::from_parts(WEIGHT_REF_TIME_PER_NANOS.saturating_mul(3_532_484), 0);
 ```
 
-In this example it takes 3.5 ms to execute an empty block. That means that it always takes at least 3.5 ms to execute *any* block.
-This constant weight is therefore added to each block to ensure that Substrate budgets enough time to execute it.
+In this example it takes 3.5 ms to execute an empty block. That means that it always takes at least 3.5 ms to execute
+*any* block. This constant weight is therefore added to each block to ensure that Substrate budgets enough time to
+execute it.
 
 ## ExtrinsicBaseWeight
 
-The extrinsic base weight is defined as the weight that it takes to execute an *empty* extrinsic.
-An *empty* extrinsic is also called a *NO-OP*. It does nothing and is the equivalent to the empty block form above.
-The benchmark now constructs a block which is filled with only NO-OP extrinsics.
-This block is then executed many times and the weights are measured.
-The result is divided by the number of extrinsics in that block and the results are written to `extrinsic_weights.rs`.
+The extrinsic base weight is defined as the weight that it takes to execute an *empty* extrinsic. An *empty* extrinsic
+is also called a *NO-OP*. It does nothing and is the equivalent to the empty block form above. The benchmark now
+constructs a block which is filled with only NO-OP extrinsics. This block is then executed many times and the weights
+are measured. The result is divided by the number of extrinsics in that block and the results are written to
+`extrinsic_weights.rs`.
 
 The relevant section in the output file looks like this:
 ```rust
@@ -64,8 +65,9 @@ pub const ExtrinsicBaseWeight: Weight =
     Weight::from_parts(WEIGHT_REF_TIME_PER_NANOS.saturating_mul(67_745), 0);
 ```
 
-In this example it takes 67.7 µs to execute a NO-OP extrinsic. That means that it always takes at least 67.7 µs to execute *any* extrinsic.
-This constant weight is therefore added to each extrinsic to ensure that Substrate budgets enough time to execute it.
+In this example it takes 67.7 µs to execute a NO-OP extrinsic. That means that it always takes at least 67.7 µs to
+execute *any* extrinsic. This constant weight is therefore added to each extrinsic to ensure that Substrate budgets
+enough time to execute it.
 
 ## Invocation
 
@@ -106,15 +108,18 @@ The complete command for Polkadot looks like this:
 cargo run --profile=production -- benchmark overhead --chain=polkadot-dev --wasm-execution=compiled --weight-path=runtime/polkadot/constants/src/weights/
 ```
 
-This will overwrite the the [block_weights.rs](https://github.com/paritytech/polkadot/blob/c254e5975711a6497af256f6831e9a6c752d28f5/runtime/polkadot/constants/src/weights/block_weights.rs) and [extrinsic_weights.rs](https://github.com/paritytech/polkadot/blob/c254e5975711a6497af256f6831e9a6c752d28f5/runtime/polkadot/constants/src/weights/extrinsic_weights.rs) files in the Polkadot runtime directory.
-You can try the same for *Rococo* and to see that the results slightly differ.
+This will overwrite the the
+[block_weights.rs](https://github.com/paritytech/polkadot/blob/c254e5975711a6497af256f6831e9a6c752d28f5/runtime/polkadot/constants/src/weights/block_weights.rs)
+and
+[extrinsic_weights.rs](https://github.com/paritytech/polkadot/blob/c254e5975711a6497af256f6831e9a6c752d28f5/runtime/polkadot/constants/src/weights/extrinsic_weights.rs)
+files in the Polkadot runtime directory. You can try the same for *Rococo* and to see that the results slightly differ.
 👉 It is paramount to use `--profile=production` and `--wasm-execution=compiled` as the results are otherwise useless.
 
 ## Output Interpretation
 
-Lower is better. The less weight the execution overhead needs, the better.
-Since the weights of the overhead is charged per extrinsic and per block, a larger weight results in less extrinsics per block.
-Minimizing this is important to have a large transaction throughput.
+Lower is better. The less weight the execution overhead needs, the better. Since the weights of the overhead is charged
+per extrinsic and per block, a larger weight results in less extrinsics per block. Minimizing this is important to have
+a large transaction throughput.
 
 ## Arguments
 
@@ -132,7 +137,10 @@ Minimizing this is important to have a large transaction throughput.
 License: Apache-2.0
 
 <!-- LINKS -->
-[`ExtrinsicBaseWeight`]: https://github.com/paritytech/substrate/blob/580ebae17fa30082604f1c9720f6f4a1cfe95b50/frame/support/src/weights/extrinsic_weights.rs#L26
-[`BlockExecutionWeight`]: https://github.com/paritytech/substrate/blob/580ebae17fa30082604f1c9720f6f4a1cfe95b50/frame/support/src/weights/block_weights.rs#L26
+[`ExtrinsicBaseWeight`]:
+    https://github.com/paritytech/substrate/blob/580ebae17fa30082604f1c9720f6f4a1cfe95b50/frame/support/src/weights/extrinsic_weights.rs#L26
+[`BlockExecutionWeight`]:
+    https://github.com/paritytech/substrate/blob/580ebae17fa30082604f1c9720f6f4a1cfe95b50/frame/support/src/weights/block_weights.rs#L26
 
-[System::Remark]: https://github.com/paritytech/substrate/blob/580ebae17fa30082604f1c9720f6f4a1cfe95b50/frame/system/src/lib.rs#L382
+[System::Remark]:
+    https://github.com/paritytech/substrate/blob/580ebae17fa30082604f1c9720f6f4a1cfe95b50/frame/system/src/lib.rs#L382
diff --git a/substrate/utils/frame/benchmarking-cli/src/pallet/writer.rs b/substrate/utils/frame/benchmarking-cli/src/pallet/writer.rs
index 69c95d13c098530a0b1c09ef569c5ff976bf02e3..9493a693bbed321785bf0d23326d0f68b3efd534 100644
--- a/substrate/utils/frame/benchmarking-cli/src/pallet/writer.rs
+++ b/substrate/utils/frame/benchmarking-cli/src/pallet/writer.rs
@@ -779,6 +779,7 @@ fn worst_case_pov(
 
 /// A simple match statement which outputs the log 16 of some value.
 fn easy_log_16(i: u32) -> u32 {
+	#[allow(clippy::redundant_guards)]
 	match i {
 		i if i == 0 => 0,
 		i if i <= 16 => 1,
diff --git a/substrate/utils/frame/benchmarking-cli/src/shared/README.md b/substrate/utils/frame/benchmarking-cli/src/shared/README.md
index 08e25b0e08f769ad016d3422fb9215ca44a84634..0b1128bca3a6283dd3420c9675327ef7d0bffee8 100644
--- a/substrate/utils/frame/benchmarking-cli/src/shared/README.md
+++ b/substrate/utils/frame/benchmarking-cli/src/shared/README.md
@@ -10,7 +10,10 @@ Contains code that is shared among multiple sub-commands.
 - `--weight-path` Set the file or directory to write the weight files to.
 - `--db` The database backend to use. This depends on your snapshot.
 - `--pruning` Set the pruning mode of the node. Some benchmarks require you to set this to `archive`.
-- `--base-path` The location on the disk that should be used for the benchmarks. You can try this on different disks or even on a mounted RAM-disk. It is important to use the same location that will later-on be used to store the chain data to get the correct results.
-- `--header` Optional file header which will be prepended to the weight output file. Can be used for adding LICENSE headers.
+- `--base-path` The location on the disk that should be used for the benchmarks. You can try this on different disks or
+  even on a mounted RAM-disk. It is important to use the same location that will later-on be used to store the chain
+  data to get the correct results.
+- `--header` Optional file header which will be prepended to the weight output file. Can be used for adding LICENSE
+  headers.
 
 License: Apache-2.0
diff --git a/substrate/utils/frame/benchmarking-cli/src/storage/README.md b/substrate/utils/frame/benchmarking-cli/src/storage/README.md
index f61b7ba1bddd0cd324be80dd41d95a456dda9eed..95c83d2edbc5c68a00589951b0b83acd7a4adbb3 100644
--- a/substrate/utils/frame/benchmarking-cli/src/storage/README.md
+++ b/substrate/utils/frame/benchmarking-cli/src/storage/README.md
@@ -1,17 +1,19 @@
 # The `benchmark storage` command
 
-The cost of storage operations in a Substrate chain depends on the current chain state.  
-It is therefore important to regularly update these weights as the chain grows.  
-This sub-command measures the cost of storage operations for a concrete snapshot.  
+The cost of storage operations in a Substrate chain depends on the current chain state.
+It is therefore important to regularly update these weights as the chain grows.
+This sub-command measures the cost of storage operations for a concrete snapshot.
 
-For the Substrate node it looks like this (for debugging you can use `--release`):  
+For the Substrate node it looks like this (for debugging you can use `--release`):
 ```sh
 cargo run --profile=production -- benchmark storage --dev --state-version=1
 ```
 
-Running the command on Substrate itself is not verify meaningful, since the genesis state of the `--dev` chain spec is used.  
+Running the command on Substrate itself is not verify meaningful, since the genesis state of the `--dev` chain spec is
+used.
 
-The output for the Polkadot client with a recent chain snapshot will give you a better impression. A recent snapshot can be downloaded from [Polkachu].  
+The output for the Polkadot client with a recent chain snapshot will give you a better impression. A recent snapshot can
+be downloaded from [Polkachu].
 Then run (remove the `--db=paritydb` if you have a RocksDB snapshot):
 ```sh
 cargo run --profile=production -- benchmark storage --dev --state-version=0 --db=paritydb --weight-path runtime/polkadot/constants/src/weights
@@ -20,8 +22,8 @@ cargo run --profile=production -- benchmark storage --dev --state-version=0 --db
 This takes a while since reads and writes all keys from the snapshot:
 ```pre
 # The 'read' benchmark
-Preparing keys from block BlockId::Number(9939462)    
-Reading 1379083 keys    
+Preparing keys from block BlockId::Number(9939462)
+Reading 1379083 keys
 Time summary [ns]:
 Total: 19668919930
 Min: 6450, Max: 1217259
@@ -31,11 +33,11 @@ Value size summary:
 Total: 265702275
 Min: 1, Max: 1381859
 Average: 192, Median: 80, Stddev: 3427.53
-Percentiles 99th, 95th, 75th: 3368, 383, 80    
+Percentiles 99th, 95th, 75th: 3368, 383, 80
 
 # The 'write' benchmark
-Preparing keys from block BlockId::Number(9939462)    
-Writing 1379083 keys    
+Preparing keys from block BlockId::Number(9939462)
+Writing 1379083 keys
 Time summary [ns]:
 Total: 98393809781
 Min: 12969, Max: 13282577
@@ -49,12 +51,13 @@ Percentiles 99th, 95th, 75th: 3368, 383, 80
 
 Writing weights to "paritydb_weights.rs"
 ```
-You will see that the [paritydb_weights.rs] files was modified and now contains new weights. 
-The exact command for Polkadot can be seen at the top of the file.  
-This uses the most recent block from your snapshot which is printed at the top.  
-The value size summary tells us that the pruned Polkadot chain state is ~253 MiB in size.  
-Reading a value on average takes (in this examples) 14.3 µs and writing 71.3 µs.  
-The interesting part in the generated weight file tells us the weight constants and some statistics about the measurements:
+You will see that the [paritydb_weights.rs] files was modified and now contains new weights. The exact command for
+Polkadot can be seen at the top of the file.
+This uses the most recent block from your snapshot which is printed at the top.
+The value size summary tells us that the pruned Polkadot chain state is ~253 MiB in size.
+Reading a value on average takes (in this examples) 14.3 µs and writing 71.3 µs.
+The interesting part in the generated weight file tells us the weight constants and some statistics about the
+measurements:
 ```rust
 /// Time to read one storage item.
 /// Calculated by multiplying the *Average* of all values with `1.1` and adding `0`.
@@ -90,7 +93,8 @@ write: 71_347 * constants::WEIGHT_REF_TIME_PER_NANOS,
 ## Arguments
 
 - `--db` Specify which database backend to use. This greatly influences the results.
-- `--state-version` Set the version of the state encoding that this snapshot uses. Should be set to `1` for Substrate `--dev` and `0` for Polkadot et al. Using the wrong version can corrupt the snapshot.
+- `--state-version` Set the version of the state encoding that this snapshot uses. Should be set to `1` for Substrate
+  `--dev` and `0` for Polkadot et al. Using the wrong version can corrupt the snapshot.
 - [`--mul`](../shared/README.md#arguments)
 - [`--add`](../shared/README.md#arguments)
 - [`--metric`](../shared/README.md#arguments)
@@ -103,4 +107,5 @@ License: Apache-2.0
 
 <!-- LINKS -->
 [Polkachu]: https://polkachu.com/snapshots
-[paritydb_weights.rs]: https://github.com/paritytech/polkadot/blob/c254e5975711a6497af256f6831e9a6c752d28f5/runtime/polkadot/constants/src/weights/paritydb_weights.rs#L60
+[paritydb_weights.rs]:
+    https://github.com/paritytech/polkadot/blob/c254e5975711a6497af256f6831e9a6c752d28f5/runtime/polkadot/constants/src/weights/paritydb_weights.rs#L60
diff --git a/substrate/utils/frame/frame-utilities-cli/Cargo.toml b/substrate/utils/frame/frame-utilities-cli/Cargo.toml
index 4fa2356b2e7e38a2856105eed7a7fb0d4e477faf..24c04f47391e8157a45f830986a7e3f6585ebb1b 100644
--- a/substrate/utils/frame/frame-utilities-cli/Cargo.toml
+++ b/substrate/utils/frame/frame-utilities-cli/Cargo.toml
@@ -1,17 +1,17 @@
 [package]
 name = "substrate-frame-cli"
 version = "4.0.0-dev"
-authors = ["Parity Technologies <admin@parity.io>"]
-edition = "2021"
+authors.workspace = true
+edition.workspace = true
 license = "Apache-2.0"
 homepage = "https://substrate.io"
-repository = "https://github.com/paritytech/substrate/"
+repository.workspace = true
 description = "cli interface for FRAME"
 documentation = "https://docs.rs/substrate-frame-cli"
 readme = "README.md"
 
 [dependencies]
-clap = { version = "4.2.5", features = ["derive"] }
+clap = { version = "4.4.6", features = ["derive"] }
 frame-support = { path = "../../../frame/support" }
 frame-system = { path = "../../../frame/system" }
 sc-cli = { path = "../../../client/cli" }
diff --git a/substrate/utils/frame/frame-utilities-cli/README.md b/substrate/utils/frame/frame-utilities-cli/README.md
index b1e4f869af7580687e663c5bf2e3c89a1badd35a..54467a3ad7704451f4064f8334ea374b8c7f6bca 100644
--- a/substrate/utils/frame/frame-utilities-cli/README.md
+++ b/substrate/utils/frame/frame-utilities-cli/README.md
@@ -1,3 +1,3 @@
 frame-system CLI utilities
 
-License: Apache-2.0
\ No newline at end of file
+License: Apache-2.0
diff --git a/substrate/utils/frame/generate-bags/Cargo.toml b/substrate/utils/frame/generate-bags/Cargo.toml
index 798f5211226383f1bebcc6187b2dc07069ef0624..ac22197c5ac4b3fe25de85eb704572420595cb91 100644
--- a/substrate/utils/frame/generate-bags/Cargo.toml
+++ b/substrate/utils/frame/generate-bags/Cargo.toml
@@ -1,11 +1,11 @@
 [package]
 name = "generate-bags"
 version = "4.0.0-dev"
-authors = ["Parity Technologies <admin@parity.io>"]
-edition = "2021"
+authors.workspace = true
+edition.workspace = true
 license = "Apache-2.0"
 homepage = "https://substrate.io"
-repository = "https://github.com/paritytech/substrate/"
+repository.workspace = true
 description = "Bag threshold generation script for pallet-bag-list"
 
 [dependencies]
@@ -17,5 +17,5 @@ pallet-staking = { path = "../../../frame/staking" }
 sp-staking = { path = "../../../primitives/staking" }
 
 # third party
-chrono = { version = "0.4.19" }
+chrono = { version = "0.4.27" }
 num-format = "0.4.3"
diff --git a/substrate/utils/frame/generate-bags/node-runtime/Cargo.toml b/substrate/utils/frame/generate-bags/node-runtime/Cargo.toml
index c29d3272628c79fecef4e2a4eea52f9ac295a3e3..13e61138356231a4c0c56da19bc61abbbf7286cc 100644
--- a/substrate/utils/frame/generate-bags/node-runtime/Cargo.toml
+++ b/substrate/utils/frame/generate-bags/node-runtime/Cargo.toml
@@ -1,11 +1,11 @@
 [package]
 name = "node-runtime-generate-bags"
 version = "3.0.0"
-authors = ["Parity Technologies <admin@parity.io>"]
-edition = "2021"
+authors.workspace = true
+edition.workspace = true
 license = "Apache-2.0"
 homepage = "https://substrate.io"
-repository = "https://github.com/paritytech/substrate/"
+repository.workspace = true
 description = "Bag threshold generation script for pallet-bag-list and kitchensink-runtime."
 publish = false
 
@@ -14,4 +14,4 @@ kitchensink-runtime = { path = "../../../../bin/node/runtime" }
 generate-bags = { path = ".." }
 
 # third-party
-clap = { version = "4.2.5", features = ["derive"] }
+clap = { version = "4.4.6", features = ["derive"] }
diff --git a/substrate/utils/frame/remote-externalities/Cargo.toml b/substrate/utils/frame/remote-externalities/Cargo.toml
index 01c7af61e60e72d8667a54cf5f851b0abcb5cfdd..7067aed238aca08b5b03ae99f568ad1777751911 100644
--- a/substrate/utils/frame/remote-externalities/Cargo.toml
+++ b/substrate/utils/frame/remote-externalities/Cargo.toml
@@ -1,11 +1,11 @@
 [package]
 name = "frame-remote-externalities"
 version = "0.10.0-dev"
-authors = ["Parity Technologies <admin@parity.io>"]
-edition = "2021"
+authors.workspace = true
+edition.workspace = true
 license = "Apache-2.0"
 homepage = "https://substrate.io"
-repository = "https://github.com/paritytech/substrate/"
+repository.workspace = true
 description = "An externalities provided environment that can load itself from remote nodes or cached files"
 
 [package.metadata.docs.rs]
@@ -15,7 +15,7 @@ targets = ["x86_64-unknown-linux-gnu"]
 jsonrpsee = { version = "0.16.2", features = ["http-client"] }
 codec = { package = "parity-scale-codec", version = "3.6.1" }
 log = "0.4.17"
-serde = "1.0.163"
+serde = "1.0.188"
 sp-core = { path = "../../../primitives/core" }
 sp-state-machine = { path = "../../../primitives/state-machine" }
 sp-io = { path = "../../../primitives/io" }
@@ -23,7 +23,6 @@ sp-runtime = { path = "../../../primitives/runtime" }
 tokio = { version = "1.22.0", features = ["macros", "rt-multi-thread"] }
 substrate-rpc-client = { path = "../rpc/client" }
 futures = "0.3"
-async-recursion = "1.0.4"
 indicatif = "0.17.3"
 spinners = "4.1.0"
 tokio-retry = "0.3.0"
diff --git a/substrate/utils/frame/remote-externalities/src/lib.rs b/substrate/utils/frame/remote-externalities/src/lib.rs
index 072ea6ef5e5970a6fe377e742e04d623f0c34607..71e9320ebeeb272faa156d758dd6571c9cb148a9 100644
--- a/substrate/utils/frame/remote-externalities/src/lib.rs
+++ b/substrate/utils/frame/remote-externalities/src/lib.rs
@@ -20,7 +20,6 @@
 //! An equivalent of `sp_io::TestExternalities` that can load its state from a remote substrate
 //! based chain, or a local state snapshot file.
 
-use async_recursion::async_recursion;
 use codec::{Compact, Decode, Encode};
 use indicatif::{ProgressBar, ProgressStyle};
 use jsonrpsee::{
@@ -44,7 +43,7 @@ use sp_runtime::{
 use sp_state_machine::TestExternalities;
 use spinners::{Spinner, Spinners};
 use std::{
-	cmp::max,
+	cmp::{max, min},
 	fs,
 	ops::{Deref, DerefMut},
 	path::{Path, PathBuf},
@@ -353,10 +352,11 @@ where
 	const PARALLEL_REQUESTS: usize = 4;
 	const BATCH_SIZE_INCREASE_FACTOR: f32 = 1.10;
 	const BATCH_SIZE_DECREASE_FACTOR: f32 = 0.50;
-	const INITIAL_BATCH_SIZE: usize = 5000;
+	const REQUEST_DURATION_TARGET: Duration = Duration::from_secs(15);
+	const INITIAL_BATCH_SIZE: usize = 10;
 	// nodes by default will not return more than 1000 keys per request
 	const DEFAULT_KEY_DOWNLOAD_PAGE: u32 = 1000;
-	const KEYS_PAGE_MAX_RETRIES: usize = 12;
+	const MAX_RETRIES: usize = 12;
 	const KEYS_PAGE_RETRY_INTERVAL: Duration = Duration::from_secs(5);
 
 	async fn rpc_get_storage(
@@ -411,8 +411,8 @@ where
 		let keys = loop {
 			// This loop can hit the node with very rapid requests, occasionally causing it to
 			// error out in CI (https://github.com/paritytech/substrate/issues/14129), so we retry.
-			let retry_strategy = FixedInterval::new(Self::KEYS_PAGE_RETRY_INTERVAL)
-				.take(Self::KEYS_PAGE_MAX_RETRIES);
+			let retry_strategy =
+				FixedInterval::new(Self::KEYS_PAGE_RETRY_INTERVAL).take(Self::MAX_RETRIES);
 			let get_page_closure =
 				|| self.get_keys_single_page(Some(prefix.clone()), last_key.clone(), at);
 			let page = Retry::spawn(retry_strategy, get_page_closure).await?;
@@ -448,8 +448,6 @@ where
 	///
 	/// * `client` - An `Arc` wrapped `HttpClient` used for making the requests.
 	/// * `payloads` - A vector of tuples containing a JSONRPC method name and `ArrayParams`
-	/// * `batch_size` - The initial batch size to use for the request. The batch size will be
-	///   adjusted dynamically in case of failure.
 	///
 	/// # Returns
 	///
@@ -485,80 +483,107 @@ where
 	///     }
 	/// }
 	/// ```
-	#[async_recursion]
 	async fn get_storage_data_dynamic_batch_size(
 		client: &HttpClient,
 		payloads: Vec<(String, ArrayParams)>,
-		batch_size: usize,
 		bar: &ProgressBar,
 	) -> Result<Vec<Option<StorageData>>, String> {
-		// All payloads have been processed
-		if payloads.is_empty() {
-			return Ok(vec![])
-		};
-
-		log::debug!(
-			target: LOG_TARGET,
-			"Remaining payloads: {} Batch request size: {}",
-			payloads.len(),
-			batch_size,
-		);
+		let mut all_data: Vec<Option<StorageData>> = vec![];
+		let mut start_index = 0;
+		let mut retries = 0usize;
+		let mut batch_size = Self::INITIAL_BATCH_SIZE;
+		let total_payloads = payloads.len();
+
+		while start_index < total_payloads {
+			log::debug!(
+				target: LOG_TARGET,
+				"Remaining payloads: {} Batch request size: {}",
+				total_payloads - start_index,
+				batch_size,
+			);
 
-		// Payloads to attempt to process this batch
-		let page = payloads.iter().take(batch_size).cloned().collect::<Vec<_>>();
+			let end_index = usize::min(start_index + batch_size, total_payloads);
+			let page = &payloads[start_index..end_index];
 
-		// Build the batch request
-		let mut batch = BatchRequestBuilder::new();
-		for (method, params) in page.iter() {
-			batch
-				.insert(method, params.clone())
-				.map_err(|_| "Invalid batch method and/or params")?
-		}
-		let batch_response = match client.batch_request::<Option<StorageData>>(batch).await {
-			Ok(batch_response) => batch_response,
-			Err(e) => {
-				if batch_size < 2 {
-					return Err(e.to_string())
-				}
+			// Build the batch request
+			let mut batch = BatchRequestBuilder::new();
+			for (method, params) in page.iter() {
+				batch
+					.insert(method, params.clone())
+					.map_err(|_| "Invalid batch method and/or params")?;
+			}
 
-				log::debug!(
-					target: LOG_TARGET,
-					"Batch request failed, trying again with smaller batch size. {}",
-					e.to_string()
-				);
+			let request_started = Instant::now();
+			let batch_response = match client.batch_request::<Option<StorageData>>(batch).await {
+				Ok(batch_response) => {
+					retries = 0;
+					batch_response
+				},
+				Err(e) => {
+					if retries > Self::MAX_RETRIES {
+						return Err(e.to_string())
+					}
+
+					retries += 1;
+					let failure_log = format!(
+						"Batch request failed ({}/{} retries). Error: {}",
+						retries,
+						Self::MAX_RETRIES,
+						e.to_string()
+					);
+					// after 2 subsequent failures something very wrong is happening. log a warning
+					// and reset the batch size down to 1.
+					if retries >= 2 {
+						log::warn!("{}", failure_log);
+						batch_size = 1;
+					} else {
+						log::debug!("{}", failure_log);
+						// Decrease batch size by DECREASE_FACTOR
+						batch_size =
+							(batch_size as f32 * Self::BATCH_SIZE_DECREASE_FACTOR) as usize;
+					}
+					continue
+				},
+			};
 
-				return Self::get_storage_data_dynamic_batch_size(
-					client,
-					payloads,
-					max(1, (batch_size as f32 * Self::BATCH_SIZE_DECREASE_FACTOR) as usize),
-					bar,
+			let request_duration = request_started.elapsed();
+			batch_size = if request_duration > Self::REQUEST_DURATION_TARGET {
+				// Decrease batch size
+				max(1, (batch_size as f32 * Self::BATCH_SIZE_DECREASE_FACTOR) as usize)
+			} else {
+				// Increase batch size, but not more than the remaining total payloads to process
+				min(
+					total_payloads - start_index,
+					max(
+						batch_size + 1,
+						(batch_size as f32 * Self::BATCH_SIZE_INCREASE_FACTOR) as usize,
+					),
 				)
-				.await
-			},
-		};
+			};
+
+			log::debug!(
+				target: LOG_TARGET,
+				"Request duration: {:?} Target duration: {:?} Last batch size: {} Next batch size: {}",
+				request_duration,
+				Self::REQUEST_DURATION_TARGET,
+				end_index - start_index,
+				batch_size
+			);
 
-		// Collect the data from this batch
-		let mut data: Vec<Option<StorageData>> = vec![];
-		let batch_response_len = batch_response.len();
-		for item in batch_response.into_iter() {
-			match item {
-				Ok(x) => data.push(x),
-				Err(e) => return Err(e.message().to_string()),
+			let batch_response_len = batch_response.len();
+			for item in batch_response.into_iter() {
+				match item {
+					Ok(x) => all_data.push(x),
+					Err(e) => return Err(e.message().to_string()),
+				}
 			}
+			bar.inc(batch_response_len as u64);
+
+			// Update the start index for the next iteration
+			start_index = end_index;
 		}
-		bar.inc(batch_response_len as u64);
 
-		// Return this data joined with the remaining keys
-		let remaining_payloads = payloads.iter().skip(batch_size).cloned().collect::<Vec<_>>();
-		let mut rest = Self::get_storage_data_dynamic_batch_size(
-			client,
-			remaining_payloads,
-			max(batch_size + 1, (batch_size as f32 * Self::BATCH_SIZE_INCREASE_FACTOR) as usize),
-			bar,
-		)
-		.await?;
-		data.append(&mut rest);
-		Ok(data)
+		Ok(all_data)
 	}
 
 	/// Synonym of `getPairs` that uses paged queries to first get the keys, and then
@@ -605,12 +630,7 @@ where
 		);
 		let payloads_chunked = payloads.chunks((&payloads.len() / Self::PARALLEL_REQUESTS).max(1));
 		let requests = payloads_chunked.map(|payload_chunk| {
-			Self::get_storage_data_dynamic_batch_size(
-				&client,
-				payload_chunk.to_vec(),
-				Self::INITIAL_BATCH_SIZE,
-				&bar,
-			)
+			Self::get_storage_data_dynamic_batch_size(&client, payload_chunk.to_vec(), &bar)
 		});
 		// Execute the requests and move the Result outside.
 		let storage_data_result: Result<Vec<_>, _> =
@@ -683,20 +703,14 @@ where
 			.collect::<Vec<_>>();
 
 		let bar = ProgressBar::new(payloads.len() as u64);
-		let storage_data = match Self::get_storage_data_dynamic_batch_size(
-			client,
-			payloads,
-			Self::INITIAL_BATCH_SIZE,
-			&bar,
-		)
-		.await
-		{
-			Ok(storage_data) => storage_data,
-			Err(e) => {
-				log::error!(target: LOG_TARGET, "batch processing failed: {:?}", e);
-				return Err("batch processing failed")
-			},
-		};
+		let storage_data =
+			match Self::get_storage_data_dynamic_batch_size(client, payloads, &bar).await {
+				Ok(storage_data) => storage_data,
+				Err(e) => {
+					log::error!(target: LOG_TARGET, "batch processing failed: {:?}", e);
+					return Err("batch processing failed")
+				},
+			};
 
 		assert_eq!(child_keys_len, storage_data.len());
 
diff --git a/substrate/utils/frame/rpc/client/Cargo.toml b/substrate/utils/frame/rpc/client/Cargo.toml
index cf6d3c4dedb608d24303c35659cd87e71e662b4d..d0f323c096ff965daec69432e0d0278539f22bda 100644
--- a/substrate/utils/frame/rpc/client/Cargo.toml
+++ b/substrate/utils/frame/rpc/client/Cargo.toml
@@ -1,11 +1,11 @@
 [package]
 name = "substrate-rpc-client"
 version = "0.10.0-dev"
-authors = ["Parity Technologies <admin@parity.io>"]
-edition = "2021"
+authors.workspace = true
+edition.workspace = true
 license = "Apache-2.0"
 homepage = "https://substrate.io"
-repository = "https://github.com/paritytech/substrate/"
+repository.workspace = true
 description = "Shared JSON-RPC client"
 
 [package.metadata.docs.rs]
diff --git a/substrate/utils/frame/rpc/state-trie-migration-rpc/Cargo.toml b/substrate/utils/frame/rpc/state-trie-migration-rpc/Cargo.toml
index b09b0c578f305b3fa5377973e17f7561dd283f83..8ce9d06c2d11e650bb6687de70e628da3d6d4e22 100644
--- a/substrate/utils/frame/rpc/state-trie-migration-rpc/Cargo.toml
+++ b/substrate/utils/frame/rpc/state-trie-migration-rpc/Cargo.toml
@@ -1,11 +1,11 @@
 [package]
 name = "substrate-state-trie-migration-rpc"
 version = "4.0.0-dev"
-authors = ["Parity Technologies <admin@parity.io>"]
-edition = "2021"
+authors.workspace = true
+edition.workspace = true
 license = "Apache-2.0"
 homepage = "https://substrate.io"
-repository = "https://github.com/paritytech/substrate/"
+repository.workspace = true
 description = "Node-specific RPC methods for interaction with state trie migration."
 readme = "README.md"
 
@@ -19,7 +19,7 @@ serde = { version = "1", features = ["derive"] }
 sp-core = { path = "../../../../primitives/core" }
 sp-state-machine = { path = "../../../../primitives/state-machine" }
 sp-trie = { path = "../../../../primitives/trie" }
-trie-db = "0.27.0"
+trie-db = "0.28.0"
 
 jsonrpsee = { version = "0.16.2", features = ["client-core", "server", "macros"] }
 
diff --git a/substrate/utils/frame/rpc/support/Cargo.toml b/substrate/utils/frame/rpc/support/Cargo.toml
index 091732d9bf9b16b59ac008b4f70f87b95eb9ab12..b0a00e1207a653bba33506be47398acbec90d6a0 100644
--- a/substrate/utils/frame/rpc/support/Cargo.toml
+++ b/substrate/utils/frame/rpc/support/Cargo.toml
@@ -1,14 +1,11 @@
 [package]
 name = "substrate-frame-rpc-support"
 version = "3.0.0"
-authors = [
-	"Parity Technologies <admin@parity.io>",
-	"Andrew Dirksen <andrew@dirksen.com>",
-]
-edition = "2021"
+authors.workspace = true
+edition.workspace = true
 license = "Apache-2.0"
 homepage = "https://substrate.io"
-repository = "https://github.com/paritytech/substrate/"
+repository.workspace = true
 description = "Substrate RPC for FRAME's support"
 
 [package.metadata.docs.rs]
diff --git a/substrate/utils/frame/rpc/support/README.md b/substrate/utils/frame/rpc/support/README.md
index ca5750612931ce385a2251b86a350afca5dd97da..72e39b761183eaf65905ad47f2aa1f3f958abed4 100644
--- a/substrate/utils/frame/rpc/support/README.md
+++ b/substrate/utils/frame/rpc/support/README.md
@@ -1,4 +1,4 @@
 Combines [sc_rpc_api::state::StateClient] with [frame_support::storage::generator] traits
 to provide strongly typed chain state queries over rpc.
 
-License: Apache-2.0
\ No newline at end of file
+License: Apache-2.0
diff --git a/substrate/utils/frame/rpc/system/Cargo.toml b/substrate/utils/frame/rpc/system/Cargo.toml
index 8009d6b2f2d5855f6330dd2dcd5ea344ad21be5e..77c3b7eeee3c0cb04203ddc50f10558a1ff02030 100644
--- a/substrate/utils/frame/rpc/system/Cargo.toml
+++ b/substrate/utils/frame/rpc/system/Cargo.toml
@@ -1,11 +1,11 @@
 [package]
 name = "substrate-frame-rpc-system"
 version = "4.0.0-dev"
-authors = ["Parity Technologies <admin@parity.io>"]
-edition = "2021"
+authors.workspace = true
+edition.workspace = true
 license = "Apache-2.0"
 homepage = "https://substrate.io"
-repository = "https://github.com/paritytech/substrate/"
+repository.workspace = true
 description = "FRAME's system exposed over Substrate RPC"
 readme = "README.md"
 
diff --git a/substrate/utils/frame/rpc/system/README.md b/substrate/utils/frame/rpc/system/README.md
index 38986983d93c5b3794f93c56d50840de9a4ead18..4eb4a74ceceb6da883d5995ec92c90644f5e6912 100644
--- a/substrate/utils/frame/rpc/system/README.md
+++ b/substrate/utils/frame/rpc/system/README.md
@@ -1,3 +1,3 @@
 System FRAME specific RPC methods.
 
-License: Apache-2.0
\ No newline at end of file
+License: Apache-2.0
diff --git a/substrate/utils/frame/rpc/system/src/lib.rs b/substrate/utils/frame/rpc/system/src/lib.rs
index 1eff71e3390a38af2f1cd0d2ba417783a86ee5a2..f467a87989048d9cca418ba04c57d363cc05162d 100644
--- a/substrate/utils/frame/rpc/system/src/lib.rs
+++ b/substrate/utils/frame/rpc/system/src/lib.rs
@@ -219,7 +219,6 @@ mod tests {
 	use jsonrpsee::{core::Error as JsonRpseeError, types::error::CallError};
 	use sc_transaction_pool::BasicPool;
 	use sp_runtime::{
-		generic::BlockId,
 		transaction_validity::{InvalidTransaction, TransactionValidityError},
 		ApplyExtrinsicResult,
 	};
@@ -245,11 +244,12 @@ mod tests {
 			};
 			t.into_unchecked_extrinsic()
 		};
+		let hash_of_block0 = client.info().genesis_hash;
 		// Populate the pool
 		let ext0 = new_transaction(0);
-		block_on(pool.submit_one(&BlockId::number(0), source, ext0)).unwrap();
+		block_on(pool.submit_one(hash_of_block0, source, ext0)).unwrap();
 		let ext1 = new_transaction(1);
-		block_on(pool.submit_one(&BlockId::number(0), source, ext1)).unwrap();
+		block_on(pool.submit_one(hash_of_block0, source, ext1)).unwrap();
 
 		let accounts = System::new(client, pool, DenyUnsafe::Yes);
 
diff --git a/substrate/utils/frame/try-runtime/cli/Cargo.toml b/substrate/utils/frame/try-runtime/cli/Cargo.toml
index ff8ee73d1a76f5b71fd9953c638d1cf6886f8289..65380a22ce6e0adc95b837b1a7b340764c3ad775 100644
--- a/substrate/utils/frame/try-runtime/cli/Cargo.toml
+++ b/substrate/utils/frame/try-runtime/cli/Cargo.toml
@@ -1,11 +1,11 @@
 [package]
 name = "try-runtime-cli"
 version = "0.10.0-dev"
-authors = ["Parity Technologies <admin@parity.io>"]
-edition = "2021"
+authors.workspace = true
+edition.workspace = true
 license = "Apache-2.0"
 homepage = "https://substrate.io"
-repository = "https://github.com/paritytech/substrate/"
+repository.workspace = true
 description = "Cli command runtime testing and dry-running"
 
 [package.metadata.docs.rs]
@@ -35,13 +35,13 @@ frame-try-runtime = { path = "../../../../frame/try-runtime", optional = true}
 substrate-rpc-client = { path = "../../rpc/client" }
 
 async-trait = "0.1.57"
-clap = { version = "4.2.5", features = ["derive"] }
+clap = { version = "4.4.6", features = ["derive"] }
 hex = { version = "0.4.3", default-features = false }
 log = "0.4.17"
 parity-scale-codec = "3.6.1"
-serde = "1.0.163"
-serde_json = "1.0.85"
-zstd = { version = "0.12.3", default-features = false }
+serde = "1.0.188"
+serde_json = "1.0.107"
+zstd = { version = "0.12.4", default-features = false }
 
 [dev-dependencies]
 assert_cmd = "2.0.10"
diff --git a/substrate/utils/prometheus/Cargo.toml b/substrate/utils/prometheus/Cargo.toml
index e84a6f4b303415bbe869c24a081728cdc6cb4900..bf999a66111f9456ff12b02613a9eeb3af2f197e 100644
--- a/substrate/utils/prometheus/Cargo.toml
+++ b/substrate/utils/prometheus/Cargo.toml
@@ -3,10 +3,10 @@ description = "Endpoint to expose Prometheus metrics"
 name = "substrate-prometheus-endpoint"
 version = "0.10.0-dev"
 license = "Apache-2.0"
-authors = ["Parity Technologies <admin@parity.io>"]
-edition = "2021"
+authors.workspace = true
+edition.workspace = true
 homepage = "https://substrate.io"
-repository = "https://github.com/paritytech/substrate/"
+repository.workspace = true
 readme = "README.md"
 
 [package.metadata.docs.rs]
diff --git a/substrate/utils/prometheus/README.md b/substrate/utils/prometheus/README.md
index 9dd0882105c698e382c8d35b31244ca06e3127e1..507b9b24fb7e66040a3820fa65d144e6618fa796 100644
--- a/substrate/utils/prometheus/README.md
+++ b/substrate/utils/prometheus/README.md
@@ -2,15 +2,19 @@
 
 ## Introduction
 
-[Prometheus](https://prometheus.io/) is one of the most widely used monitoring tools for managing highly available services supported by [Cloud Native Computing Foundation](https://www.cncf.io/). By providing Prometheus metrics in Substrate, node operators can easily adopt widely used display/alert tools such
-as [Grafana](https://grafana.com/) and [Alertmanager](https://prometheus.io/docs/alerting/alertmanager/). Easy access to such monitoring tools will benefit parachain developers/operators and validators to have much higher availability of their services.
+[Prometheus](https://prometheus.io/) is one of the most widely used monitoring tools for managing highly available
+services supported by [Cloud Native Computing Foundation](https://www.cncf.io/). By providing Prometheus metrics in
+Substrate, node operators can easily adopt widely used display/alert tools such as [Grafana](https://grafana.com/) and
+[Alertmanager](https://prometheus.io/docs/alerting/alertmanager/). Easy access to such monitoring tools will benefit
+parachain developers/operators and validators to have much higher availability of their services.
 
 Metrics will be served under `/metrics` on TCP port 9615 by default.
 
 ## Quick Start
- 
+
 1. From the root of the repository start Substrate `cargo run --release`.
 
 2. In another terminal run `curl localhost:9615/metrics` to retrieve the metrics.
 
-To learn how to configure Prometheus see the Prometheus [Getting Started](https://prometheus.io/docs/prometheus/latest/getting_started/) guide.
\ No newline at end of file
+To learn how to configure Prometheus see the Prometheus [Getting
+Started](https://prometheus.io/docs/prometheus/latest/getting_started/) guide.
diff --git a/substrate/utils/prometheus/src/lib.rs b/substrate/utils/prometheus/src/lib.rs
index 581666635ab54698d0426bc80007e245ee8568fe..ed1f9137aec4efad97218b2340e49436a05fd577 100644
--- a/substrate/utils/prometheus/src/lib.rs
+++ b/substrate/utils/prometheus/src/lib.rs
@@ -111,10 +111,16 @@ async fn init_prometheus_with_listener(
 		}
 	});
 
-	let server = Server::builder(listener).serve(service);
+	let (signal, on_exit) = tokio::sync::oneshot::channel::<()>();
+	let server = Server::builder(listener).serve(service).with_graceful_shutdown(async {
+		let _ = on_exit.await;
+	});
 
 	let result = server.await.map_err(Into::into);
 
+	// Gracefully shutdown server, otherwise the server does not stop if it has open connections
+	let _ = signal.send(());
+
 	result
 }
 
diff --git a/substrate/utils/wasm-builder/Cargo.toml b/substrate/utils/wasm-builder/Cargo.toml
index 2e57a4b73fa2bb53c164b48e748eda7ba9aec0d3..73586ebe614e3e85fd6d73c06dbb2fa42481eaca 100644
--- a/substrate/utils/wasm-builder/Cargo.toml
+++ b/substrate/utils/wasm-builder/Cargo.toml
@@ -1,11 +1,11 @@
 [package]
 name = "substrate-wasm-builder"
 version = "5.0.0-dev"
-authors = ["Parity Technologies <admin@parity.io>"]
+authors.workspace = true
 description = "Utility for building WASM binaries"
-edition = "2021"
+edition.workspace = true
 readme = "README.md"
-repository = "https://github.com/paritytech/substrate/"
+repository.workspace = true
 license = "Apache-2.0"
 homepage = "https://substrate.io"
 
diff --git a/substrate/utils/wasm-builder/README.md b/substrate/utils/wasm-builder/README.md
index b1ccb1b35b10e9e1bc42cd1d6726a82895fc1a7c..db32f5cbc955cc36b056c612caa65c1ef45ca683 100644
--- a/substrate/utils/wasm-builder/README.md
+++ b/substrate/utils/wasm-builder/README.md
@@ -1,14 +1,15 @@
 # Wasm builder is a utility for building a project as a Wasm binary
 
-The Wasm builder is a tool that integrates the process of building the WASM binary of your project into the main
-`cargo` build process.
+The Wasm builder is a tool that integrates the process of building the WASM binary of your project into the main `cargo`
+build process.
 
 ## Project setup
 
 A project that should be compiled as a Wasm binary needs to:
 
 1. Add a `build.rs` file.
-2. Add `wasm-builder` as dependency into `build-dependencies` (can be made optional and only enabled when `std` feature is used).
+2. Add `wasm-builder` as dependency into `build-dependencies` (can be made optional and only enabled when `std` feature
+   is used).
 
 The `build.rs` file needs to contain the following code:
 
@@ -35,43 +36,40 @@ As the final step, you need to add the following to your project:
 include!(concat!(env!("OUT_DIR"), "/wasm_binary.rs"));
 ```
 
-This will include the generated Wasm binary as two constants `WASM_BINARY` and `WASM_BINARY_BLOATY`.
-The former is a compact Wasm binary and the latter is the Wasm binary as being generated by the compiler.
-Both variables have `Option<&'static [u8]>` as type.
+This will include the generated Wasm binary as two constants `WASM_BINARY` and `WASM_BINARY_BLOATY`. The former is a
+compact Wasm binary and the latter is the Wasm binary as being generated by the compiler. Both variables have
+`Option<&'static [u8]>` as type.
 
 ### Features
 
-Wasm builder supports to enable cargo features while building the Wasm binary. By default it will
-enable all features in the wasm build that are enabled for the native build except the
-`default` and `std` features. Besides that, wasm builder supports the special `runtime-wasm`
-feature. This `runtime-wasm` feature will be enabled by the wasm builder when it compiles the
-Wasm binary. If this feature is not present, it will not be enabled.
+Wasm builder supports to enable cargo features while building the Wasm binary. By default it will enable all features in
+the wasm build that are enabled for the native build except the `default` and `std` features. Besides that, wasm builder
+supports the special `runtime-wasm` feature. This `runtime-wasm` feature will be enabled by the wasm builder when it
+compiles the Wasm binary. If this feature is not present, it will not be enabled.
 
 ## Environment variables
 
 By using environment variables, you can configure which Wasm binaries are built and how:
 
-- `SKIP_WASM_BUILD` - Skips building any Wasm binary. This is useful when only native should be recompiled.
-                      If this is the first run and there doesn't exist a Wasm binary, this will set both
-                      variables to `None`.
-- `WASM_BUILD_TYPE` - Sets the build type for building Wasm binaries. Supported values are `release` or `debug`.
-                      By default the build type is equal to the build type used by the main build.
-- `FORCE_WASM_BUILD` - Can be set to force a Wasm build. On subsequent calls the value of the variable
-                       needs to change. As wasm-builder instructs `cargo` to watch for file changes
-                       this environment variable should only be required in certain circumstances.
+- `SKIP_WASM_BUILD` - Skips building any Wasm binary. This is useful when only native should be recompiled. If this is
+                      the first run and there doesn't exist a Wasm binary, this will set both variables to `None`.
+- `WASM_BUILD_TYPE` - Sets the build type for building Wasm binaries. Supported values are `release` or `debug`. By
+                      default the build type is equal to the build type used by the main build.
+- `FORCE_WASM_BUILD` - Can be set to force a Wasm build. On subsequent calls the value of the variable needs to change.
+                       As wasm-builder instructs `cargo` to watch for file changes this environment variable should only
+                       be required in certain circumstances.
 - `WASM_BUILD_RUSTFLAGS` - Extend `RUSTFLAGS` given to `cargo build` while building the wasm binary.
 - `WASM_BUILD_NO_COLOR` - Disable color output of the wasm build.
-- `WASM_TARGET_DIRECTORY` - Will copy any build Wasm binary to the given directory. The path needs
-                           to be absolute.
-- `WASM_BUILD_TOOLCHAIN` - The toolchain that should be used to build the Wasm binaries. The
-                           format needs to be the same as used by cargo, e.g. `nightly-2020-02-20`.
-- `CARGO_NET_OFFLINE` - If `true`, `--offline` will be passed to all processes launched to prevent network access. Useful in offline environments.
+- `WASM_TARGET_DIRECTORY` - Will copy any build Wasm binary to the given directory. The path needs to be absolute.
+- `WASM_BUILD_TOOLCHAIN` - The toolchain that should be used to build the Wasm binaries. The format needs to be the same
+                           as used by cargo, e.g. `nightly-2020-02-20`.
+- `CARGO_NET_OFFLINE` - If `true`, `--offline` will be passed to all processes launched to prevent network access.
+  Useful in offline environments.
 
-Each project can be skipped individually by using the environment variable `SKIP_PROJECT_NAME_WASM_BUILD`.
-Where `PROJECT_NAME` needs to be replaced by the name of the cargo project, e.g. `node-runtime` will
-be `NODE_RUNTIME`.
+Each project can be skipped individually by using the environment variable `SKIP_PROJECT_NAME_WASM_BUILD`. Where
+`PROJECT_NAME` needs to be replaced by the name of the cargo project, e.g. `node-runtime` will be `NODE_RUNTIME`.
 
-## Prerequisites:
+## Prerequisites
 
 Wasm builder requires the following prerequisites for building the Wasm binary:
 
@@ -81,9 +79,8 @@ or
 
 - rust stable and version at least 1.68.0 + `wasm32-unknown-unknown` toolchain
 
-If a specific rust is installed with `rustup`, it is important that the wasm target is
-installed as well. For example if installing the rust from 20.02.2020 using `rustup
-install nightly-2020-02-20`, the wasm target needs to be installed as well `rustup target add
-wasm32-unknown-unknown --toolchain nightly-2020-02-20`.
+If a specific rust is installed with `rustup`, it is important that the wasm target is installed as well. For example if
+installing the rust from 20.02.2020 using `rustup install nightly-2020-02-20`, the wasm target needs to be installed as
+well `rustup target add wasm32-unknown-unknown --toolchain nightly-2020-02-20`.
 
 License: Apache-2.0
diff --git a/substrate/utils/wasm-builder/src/builder.rs b/substrate/utils/wasm-builder/src/builder.rs
index 208b56077669e19d5d61c490cbcc22bfa4bff471..e0a30644b231adce3eb539a1e5226781415df17d 100644
--- a/substrate/utils/wasm-builder/src/builder.rs
+++ b/substrate/utils/wasm-builder/src/builder.rs
@@ -203,7 +203,10 @@ fn generate_crate_skip_build_env_name() -> String {
 /// Checks if the build of the WASM binary should be skipped.
 fn check_skip_build() -> bool {
 	env::var(crate::SKIP_BUILD_ENV).is_ok() ||
-		env::var(generate_crate_skip_build_env_name()).is_ok()
+		env::var(generate_crate_skip_build_env_name()).is_ok() ||
+		// If we are running in docs.rs, let's skip building.
+		// https://docs.rs/about/builds#detecting-docsrs
+		env::var("DOCS_RS").is_ok()
 }
 
 /// Provide a dummy WASM binary if there doesn't exist one.
diff --git a/substrate/zombienet/0001-basic-warp-sync/README.md b/substrate/zombienet/0001-basic-warp-sync/README.md
index 7550ca89236fbe6e50f901498376db324e594283..1f8bddee640cc08b115b1a81d25db228c833592f 100644
--- a/substrate/zombienet/0001-basic-warp-sync/README.md
+++ b/substrate/zombienet/0001-basic-warp-sync/README.md
@@ -35,8 +35,8 @@ Once the zombienet is stopped, the database snapshot
 (`{alice,bob}/data/chains/local_testnet/db/` dirs) was created using the following
 commands:
 ```bash
-mkdir -p db-snapshot/{alice,bob}/data/chains/local_testnet/db/  
-cp -r db-test-gen/alice/data/chains/local_testnet/db/full db-snapshot/alice/data/chains/local_testnet/db/  
+mkdir -p db-snapshot/{alice,bob}/data/chains/local_testnet/db/
+cp -r db-test-gen/alice/data/chains/local_testnet/db/full db-snapshot/alice/data/chains/local_testnet/db/
 cp -r db-test-gen/bob/data/chains/local_testnet/db/full   db-snapshot/bob/data/chains/local_testnet/db/
 ```
 
@@ -72,7 +72,8 @@ Chain spec was simply built with:
 substrate build-spec --chain=local > chain-spec.json
 ```
 
-Please note that `chain-spec.json` committed into repository is `raw` version produced by `zombienet` during database snapshot generation. Zombienet applies some modifications to plain versions of chain-spec.
+Please note that `chain-spec.json` committed into repository is `raw` version produced by `zombienet` during database
+snapshot generation. Zombienet applies some modifications to plain versions of chain-spec.
 
 # Run the test
 Test can be run with the following command:
@@ -91,7 +92,7 @@ index 23fb13cfb0..89f8646291 100644
 --- a/bin/node/runtime/src/constants.rs
 +++ b/bin/node/runtime/src/constants.rs
 @@ -63,7 +63,7 @@ pub mod time {
- 
+
     // NOTE: Currently it is not possible to change the epoch duration after the chain has started.
     //       Attempting to do so will brick block production.
 -   pub const EPOCH_DURATION_IN_BLOCKS: BlockNumber = 10 * MINUTES;
diff --git a/substrate/zombienet/0001-basic-warp-sync/test-warp-sync.toml b/substrate/zombienet/0001-basic-warp-sync/test-warp-sync.toml
index 272b5862e8e89fa8dbe7c0a2e7fbd116e92af1d3..773f5020bc3a33f29616762d67ccdde5132493cc 100644
--- a/substrate/zombienet/0001-basic-warp-sync/test-warp-sync.toml
+++ b/substrate/zombienet/0001-basic-warp-sync/test-warp-sync.toml
@@ -6,7 +6,7 @@ default_image = "{{ZOMBIENET_INTEGRATION_TEST_IMAGE}}"
 default_command = "substrate"
 
 chain = "gen-db"
-chain_spec_path = "zombienet/0001-basic-warp-sync/chain-spec.json"
+chain_spec_path = "chain-spec.json"
 
   [[relaychain.nodes]]
   name = "alice"
diff --git a/substrate/zombienet/0002-validators-warp-sync/README.md b/substrate/zombienet/0002-validators-warp-sync/README.md
index 662360fbf3c68adc545767963de1eeeb4f624087..99fcb73138045ab62e945fcbd1eb757b4f6e5dcc 100644
--- a/substrate/zombienet/0002-validators-warp-sync/README.md
+++ b/substrate/zombienet/0002-validators-warp-sync/README.md
@@ -1,4 +1,3 @@
-Refer to ../0001-basic-warp-sync/README.md for more details. This test is nearly a clone. We want to warp-sync validators and make sure they can build blocks.
-0001-basic-warp-sync chainspec (copied) and database are reused in this test.
-
-
+Refer to ../0001-basic-warp-sync/README.md for more details. This test is nearly a clone. We want to warp-sync
+validators and make sure they can build blocks. 0001-basic-warp-sync chainspec (copied) and database are reused in this
+test.
diff --git a/substrate/zombienet/0002-validators-warp-sync/test-validators-warp-sync.toml b/substrate/zombienet/0002-validators-warp-sync/test-validators-warp-sync.toml
index df4414f5c8b5f1ca52aec28a9a581faf4cb0ac68..12951575f4a4377c2dd36151247eb87354f9b714 100644
--- a/substrate/zombienet/0002-validators-warp-sync/test-validators-warp-sync.toml
+++ b/substrate/zombienet/0002-validators-warp-sync/test-validators-warp-sync.toml
@@ -6,7 +6,7 @@ default_image = "{{ZOMBIENET_INTEGRATION_TEST_IMAGE}}"
 default_command = "substrate"
 
 chain = "gen-db"
-chain_spec_path = "zombienet/0002-validators-warp-sync/chain-spec.json"
+chain_spec_path = "chain-spec.json"
 
   [[relaychain.nodes]]
   name = "alice"
diff --git a/substrate/zombienet/0003-block-building-warp-sync/README.md b/substrate/zombienet/0003-block-building-warp-sync/README.md
index 311d3550f766395f1294d37ecec57a2ae8f3a872..08dc730a58b6d7c43c076d3f64277eee22d526c8 100644
--- a/substrate/zombienet/0003-block-building-warp-sync/README.md
+++ b/substrate/zombienet/0003-block-building-warp-sync/README.md
@@ -1,4 +1,3 @@
-Refer to ../0001-basic-warp-sync/README.md for more details. This test is nearly a clone. We want to warp-sync full nodes in the presence of validators.
+Refer to ../0001-basic-warp-sync/README.md for more details. This test is nearly a clone. We want to warp-sync full nodes
+in the presence of validators.
 0001-basic-warp-sync chainspec (copied) and database are reused in this test.
-
-
diff --git a/substrate/zombienet/0003-block-building-warp-sync/test-block-building-warp-sync.toml b/substrate/zombienet/0003-block-building-warp-sync/test-block-building-warp-sync.toml
index 5119c919c70c4b42271ed9ae9ce2417de0b55c88..7fe9b0f065da188d2c351b9cfb804713a193e92f 100644
--- a/substrate/zombienet/0003-block-building-warp-sync/test-block-building-warp-sync.toml
+++ b/substrate/zombienet/0003-block-building-warp-sync/test-block-building-warp-sync.toml
@@ -6,7 +6,7 @@ default_image = "{{ZOMBIENET_INTEGRATION_TEST_IMAGE}}"
 default_command = "substrate"
 
 chain = "gen-db"
-chain_spec_path = "zombienet/0003-block-building-warp-sync/chain-spec.json"
+chain_spec_path = "chain-spec.json"
 
   #we need at least 3 nodes for warp sync
   [[relaychain.nodes]]